From 00dde195d9773761a638a99c9c204ce2f89c8be5 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Wed, 21 Jun 2023 11:06:37 -0700 Subject: [PATCH 001/954] Bug Fixes for NARU * Change logic to show No Data Flags instead of hiding them * willimportFill was actually undefined despite being set to null, so check for that * Only save if form is dirty --- .../naru-details/naru-details.component.html | 28 ++++++++++--------- .../naru-proposal/naru-proposal.component.ts | 4 +-- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/portal-frontend/src/app/features/application-details/naru-details/naru-details.component.html b/portal-frontend/src/app/features/application-details/naru-details/naru-details.component.html index e6105763da..73e17a217a 100644 --- a/portal-frontend/src/app/features/application-details/naru-details/naru-details.component.html +++ b/portal-frontend/src/app/features/application-details/naru-details/naru-details.component.html @@ -14,7 +14,7 @@ What is the purpose of the proposal? -
+
{{ _applicationSubmission.naruPurpose }}
@@ -24,7 +24,7 @@ What is the total floor area (m2) of the proposed additional residence?
-
+
{{ _applicationSubmission.naruFloorArea }}
@@ -34,7 +34,7 @@ or long term.
-
+
{{ _applicationSubmission.naruResidenceNecessity }}
@@ -43,7 +43,7 @@ Describe the rationale for the proposed location of the additional residence.
-
+
{{ _applicationSubmission.naruLocationRationale }}
@@ -53,7 +53,7 @@ residence.
-
+
{{ _applicationSubmission.naruInfrastructure }}
@@ -64,7 +64,7 @@ What is the total floor area (m2) of the proposed principal residence?
-
+
{{ _applicationSubmission.naruFloorArea }}
@@ -74,7 +74,7 @@ short or long term.
-
+
{{ _applicationSubmission.naruResidenceNecessity }}
@@ -83,7 +83,7 @@ Describe the rationale for the proposed location of the principal residence.
-
+
{{ _applicationSubmission.naruLocationRationale }}
@@ -93,7 +93,7 @@ residence.
-
+
{{ _applicationSubmission.naruInfrastructure }}
@@ -104,7 +104,7 @@ located on the property.
-
+
{{ _applicationSubmission.naruExistingStructures }}
@@ -122,9 +122,11 @@ the property, including gravel for construction.
-
- {{ _applicationSubmission.naruWillImportFill ? 'Yes' : 'No' }} - +
+ {{ + _applicationSubmission.naruWillImportFill ? 'Yes' : 'No' + }} +
diff --git a/portal-frontend/src/app/features/edit-submission/proposal/naru-proposal/naru-proposal.component.ts b/portal-frontend/src/app/features/edit-submission/proposal/naru-proposal/naru-proposal.component.ts index 67d26716bc..b7685e0906 100644 --- a/portal-frontend/src/app/features/edit-submission/proposal/naru-proposal/naru-proposal.component.ts +++ b/portal-frontend/src/app/features/edit-submission/proposal/naru-proposal/naru-proposal.component.ts @@ -166,7 +166,7 @@ export class NaruProposalComponent extends FilesStepComponent implements OnInit, } protected async save() { - if (this.fileId) { + if (this.fileId && this.form.dirty) { const { existingStructures, willImportFill, @@ -184,7 +184,7 @@ export class NaruProposalComponent extends FilesStepComponent implements OnInit, const updateDto: ApplicationSubmissionUpdateDto = { naruExistingStructures: existingStructures, - naruWillImportFill: willImportFill !== null ? willImportFill === 'true' : null, + naruWillImportFill: willImportFill !== undefined ? willImportFill === 'true' : null, naruFillType: fillType, naruFillOrigin: fillOrigin, naruToPlaceAverageDepth: this.fillTableData.averageDepth ?? null, From d88891a7235dbe142916306c2fa3d646849bda5e Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Wed, 21 Jun 2023 15:55:36 -0700 Subject: [PATCH 002/954] fix typo (#715) --- .../notice-of-intent.service.ts | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.ts index e7e76967df..19d9533ec3 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.ts @@ -29,21 +29,14 @@ import { NoticeOfIntent } from './notice-of-intent.entity'; @Injectable() export class NoticeOfIntentService { private CARD_RELATIONS = { - card: { - board: true, - type: true, - status: true, - assignee: true, - }, + board: true, + type: true, + status: true, + assignee: true, }; private DEFAULT_RELATIONS: FindOptionsRelations = { - card: { - board: true, - type: true, - status: true, - assignee: true, - }, + card: this.CARD_RELATIONS, localGovernment: true, region: true, subtype: true, From 4c88c444abb87ba98da673391ffed43fa9fe9668 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Wed, 21 Jun 2023 16:32:24 -0700 Subject: [PATCH 003/954] Naru Tourism Step 8 + ALCS * Also bug fixes for existing versions --- .../application-details.component.spec.ts | 2 + .../naru-details/naru-details.component.html | 43 +++++ .../application-submission.service.spec.ts | 2 + .../services/application/application.dto.ts | 2 + .../naru-details/naru-details.component.html | 57 ++++++ .../naru-proposal.component.html | 181 ++++++++++++++---- .../naru-proposal/naru-proposal.component.ts | 12 ++ .../application-submission.dto.ts | 4 + .../src/alcs/application/application.dto.ts | 6 + .../application-submission.dto.ts | 14 ++ .../application-submission.entity.ts | 16 +- .../application-submission.service.ts | 12 ++ .../1687371977194-add_naru_tourism_fields.ts | 23 +++ 13 files changed, 339 insertions(+), 35 deletions(-) create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1687371977194-add_naru_tourism_fields.ts diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.spec.ts b/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.spec.ts index 9164cc5dcb..63dd1d44c6 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.spec.ts +++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.spec.ts @@ -44,6 +44,8 @@ describe('ApplicationDetailsComponent', () => { naruToPlaceMaximumDepth: null, naruToPlaceVolume: null, naruWillImportFill: null, + naruAgriTourism: null, + naruSleepingUnits: null, nfuAgricultureSupport: null, nfuFillOriginDescription: null, nfuFillTypeDescription: null, diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/naru-details/naru-details.component.html b/alcs-frontend/src/app/features/application/applicant-info/application-details/naru-details/naru-details.component.html index 0ae8fde7dd..b7979c06cf 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/application-details/naru-details/naru-details.component.html +++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/naru-details/naru-details.component.html @@ -59,6 +59,39 @@ {{ _applicationSubmission.naruInfrastructure }}
+ + +
What is the total floor area (m2) of the proposed accommodation?
+
+ {{ _applicationSubmission.naruFloorArea }} +
+
How many "sleeping units" in total are proposed?
+
+ {{ _applicationSubmission.naruSleepingUnits }} +
+
+ Describe how the proposal for tourism accommodation will support agriculture in the short or long term. +
+
+ {{ _applicationSubmission.naruResidenceNecessity }} +
+
Describe the rationale for the proposed location of the tourism accommodation.
+
+ {{ _applicationSubmission.naruLocationRationale }} +
+
+ Provide the total area (m2) and a description of infrastructure necessary to support the tourism + accommodation. +
+
+ {{ _applicationSubmission.naruInfrastructure }} +
+
Describe any agri-tourism that is currently taking place on the property.
+
+ {{ _applicationSubmission.naruAgriTourism }} +
+ +
Describe the total floor area (m2), type, number, and occupancy of all residential structures currently located on the property. @@ -82,6 +115,16 @@ {{ _applicationSubmission.naruWillImportFill ? 'Yes' : 'No' }}
+
Describe the type and amount of fill proposed to be placed.
+
+ {{ _applicationSubmission.naruFillType }} +
+ +
Briefly describe the origin and quality of fill.
+
+ {{ _applicationSubmission.naruFillOrigin }} +
+
Fill to be Placed
Volume
diff --git a/alcs-frontend/src/app/services/application/application-submission/application-submission.service.spec.ts b/alcs-frontend/src/app/services/application/application-submission/application-submission.service.spec.ts index 4b038fd3e4..96578b4656 100644 --- a/alcs-frontend/src/app/services/application/application-submission/application-submission.service.spec.ts +++ b/alcs-frontend/src/app/services/application/application-submission/application-submission.service.spec.ts @@ -26,6 +26,8 @@ describe('ApplicationSubmissionService', () => { naruSubtype: null, naruToPlaceArea: null, naruToPlaceAverageDepth: null, + naruSleepingUnits: null, + naruAgriTourism: null, naruToPlaceMaximumDepth: null, naruToPlaceVolume: null, naruWillImportFill: null, diff --git a/alcs-frontend/src/app/services/application/application.dto.ts b/alcs-frontend/src/app/services/application/application.dto.ts index 7762e0c573..62966937a2 100644 --- a/alcs-frontend/src/app/services/application/application.dto.ts +++ b/alcs-frontend/src/app/services/application/application.dto.ts @@ -191,6 +191,8 @@ export interface ApplicationSubmissionDto { naruToPlaceArea: number | null; naruToPlaceMaximumDepth: number | null; naruToPlaceAverageDepth: number | null; + naruSleepingUnits: number | null; + naruAgriTourism: string | null; } export interface ApplicationDto { diff --git a/portal-frontend/src/app/features/application-details/naru-details/naru-details.component.html b/portal-frontend/src/app/features/application-details/naru-details/naru-details.component.html index 73e17a217a..addd2ceb07 100644 --- a/portal-frontend/src/app/features/application-details/naru-details/naru-details.component.html +++ b/portal-frontend/src/app/features/application-details/naru-details/naru-details.component.html @@ -99,6 +99,63 @@
+ +
+ What is the total floor area (m2) of the proposed accommodation? + +
+
+ {{ _applicationSubmission.naruFloorArea }} + +
+ +
+ How many "sleeping units" in total are proposed? + +
+
+ {{ _applicationSubmission.naruSleepingUnits }} + +
+ +
+ Describe how the proposal for tourism accommodation will support agriculture in the short or long term. + +
+
+ {{ _applicationSubmission.naruResidenceNecessity }} + +
+ +
+ Describe the rationale for the proposed location of the tourism accommodation. + +
+
+ {{ _applicationSubmission.naruLocationRationale }} + +
+ +
+ Provide the total area (m2) and a description of infrastructure necessary to support the tourism + accommodation. + +
+
+ {{ _applicationSubmission.naruInfrastructure }} + +
+ +
+ Describe any agri-tourism that is currently taking place on the property. + +
+
+ {{ _applicationSubmission.naruAgriTourism }} + +
+ +
Describe the total floor area (m2), type, number, and occupancy of all residential structures currently located on the property. diff --git a/portal-frontend/src/app/features/edit-submission/proposal/naru-proposal/naru-proposal.component.html b/portal-frontend/src/app/features/edit-submission/proposal/naru-proposal/naru-proposal.component.html index 6e878e25bc..f0c9783f61 100644 --- a/portal-frontend/src/app/features/edit-submission/proposal/naru-proposal/naru-proposal.component.html +++ b/portal-frontend/src/app/features/edit-submission/proposal/naru-proposal/naru-proposal.component.html @@ -157,41 +157,107 @@

Proposal

This field is required
+ + + +
+ + + + m2 + +
+ warning +
This field is required
+
+
-
+
+ + Associated Parcel + + + #{{ parcel.index + 1 }} PID: + {{ parcel.pid | mask : '000-000-000' }} + No Data + + +
Visible To:
diff --git a/alcs-frontend/src/app/features/application/documents/document-upload-dialog/document-upload-dialog.component.scss b/alcs-frontend/src/app/features/application/documents/document-upload-dialog/document-upload-dialog.component.scss index 99825bd974..de0c2bac88 100644 --- a/alcs-frontend/src/app/features/application/documents/document-upload-dialog/document-upload-dialog.component.scss +++ b/alcs-frontend/src/app/features/application/documents/document-upload-dialog/document-upload-dialog.component.scss @@ -1,3 +1,5 @@ +@use '../../../../../styles/colors'; + .form { display: grid; grid-template-columns: 1fr 1fr; @@ -41,3 +43,9 @@ a { align-items: center; } } + +.superseded-warning { + background-color: colors.$secondary-color-dark; + color: #fff; + padding: 0 4px; +} diff --git a/alcs-frontend/src/app/features/application/documents/document-upload-dialog/document-upload-dialog.component.spec.ts b/alcs-frontend/src/app/features/application/documents/document-upload-dialog/document-upload-dialog.component.spec.ts index ac1062aab4..e2c259bc1b 100644 --- a/alcs-frontend/src/app/features/application/documents/document-upload-dialog/document-upload-dialog.component.spec.ts +++ b/alcs-frontend/src/app/features/application/documents/document-upload-dialog/document-upload-dialog.component.spec.ts @@ -3,6 +3,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MAT_DIALOG_DATA, MatDialogModule, MatDialogRef } from '@angular/material/dialog'; import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { ApplicationDocumentService } from '../../../../services/application/application-document/application-document.service'; +import { ApplicationParcelService } from '../../../../services/application/application-parcel/application-parcel.service'; import { DocumentUploadDialogComponent } from './document-upload-dialog.component'; @@ -11,9 +12,11 @@ describe('DocumentUploadDialogComponent', () => { let fixture: ComponentFixture; let mockAppDocService: DeepMocked; + let mockParcelService: DeepMocked; beforeEach(async () => { mockAppDocService = createMock(); + mockParcelService = createMock(); const mockDialogRef = { close: jest.fn(), @@ -29,6 +32,10 @@ describe('DocumentUploadDialogComponent', () => { provide: ApplicationDocumentService, useValue: mockAppDocService, }, + { + provide: ApplicationParcelService, + useValue: mockParcelService, + }, { provide: MatDialogRef, useValue: mockDialogRef }, { provide: MAT_DIALOG_DATA, useValue: {} }, ], diff --git a/alcs-frontend/src/app/features/application/documents/document-upload-dialog/document-upload-dialog.component.ts b/alcs-frontend/src/app/features/application/documents/document-upload-dialog/document-upload-dialog.component.ts index 7619ce40d9..b0264511dc 100644 --- a/alcs-frontend/src/app/features/application/documents/document-upload-dialog/document-upload-dialog.component.ts +++ b/alcs-frontend/src/app/features/application/documents/document-upload-dialog/document-upload-dialog.component.ts @@ -12,6 +12,7 @@ import { DOCUMENT_SYSTEM, DOCUMENT_TYPE, } from '../../../../services/application/application-document/application-document.service'; +import { ApplicationParcelService } from '../../../../services/application/application-parcel/application-parcel.service'; @Component({ selector: 'app-document-upload-dialog', @@ -20,23 +21,26 @@ import { }) export class DocumentUploadDialogComponent implements OnInit, OnDestroy { $destroy = new Subject(); + DOCUMENT_TYPE = DOCUMENT_TYPE; title = 'Create'; isDirty = false; isSaving = false; allowsFileEdit = true; - sources = DOCUMENT_TYPE; documentTypeAhead: string | undefined = undefined; name = new FormControl('', [Validators.required]); type = new FormControl(undefined, [Validators.required]); source = new FormControl('', [Validators.required]); + parcelId = new FormControl(null); + visibleToInternal = new FormControl(false, [Validators.required]); visibleToPublic = new FormControl(false, [Validators.required]); documentTypes: ApplicationDocumentTypeDto[] = []; documentSources = Object.values(DOCUMENT_SOURCE); + selectableParcels: { uuid: string; index: number; pid?: string }[] = []; form = new FormGroup({ name: this.name, @@ -44,15 +48,18 @@ export class DocumentUploadDialogComponent implements OnInit, OnDestroy { source: this.source, visibleToInternal: this.visibleToInternal, visibleToPublic: this.visibleToPublic, + parcelId: this.parcelId, }); pendingFile: File | undefined; existingFile: { name: string; size: number } | undefined; + showCertificateOfTitleWarning = false; constructor( @Inject(MAT_DIALOG_DATA) public data: { fileId: string; existingDocument?: ApplicationDocumentDto }, protected dialog: MatDialogRef, - private applicationDocumentService: ApplicationDocumentService + private applicationDocumentService: ApplicationDocumentService, + private parcelService: ApplicationParcelService ) {} ngOnInit(): void { @@ -62,6 +69,9 @@ export class DocumentUploadDialogComponent implements OnInit, OnDestroy { const document = this.data.existingDocument; this.title = 'Edit'; this.allowsFileEdit = document.system === DOCUMENT_SYSTEM.ALCS; + if (document.type?.code === DOCUMENT_TYPE.CERTIFICATE_OF_TITLE) { + this.prepareCertificateOfTitleUpload(document.uuid); + } this.form.patchValue({ name: document.fileName, type: document.type?.code, @@ -90,6 +100,8 @@ export class DocumentUploadDialogComponent implements OnInit, OnDestroy { visibilityFlags.push('P'); } + const parcelId = await this.parcelId.value; + const dto = { file: this.pendingFile, fileName: this.name.getRawValue()!, @@ -98,7 +110,10 @@ export class DocumentUploadDialogComponent implements OnInit, OnDestroy { visibilityFlags, }; this.isSaving = true; - if (this.data.existingDocument) { + if (parcelId && dto.file && this.type.value === DOCUMENT_TYPE.CERTIFICATE_OF_TITLE) { + // @ts-ignore File is checked above to not be undefined, typescript still thinks it might be undefined + await this.applicationDocumentService.attachCertificateOfTitle(this.data.fileId, parcelId, dto); + } else if (this.data.existingDocument) { await this.applicationDocumentService.update(this.data.existingDocument.uuid, dto); } else if (dto.file !== undefined) { // @ts-ignore File is checked above to not be undefined, typescript still thinks it might be undefined @@ -127,12 +142,48 @@ export class DocumentUploadDialogComponent implements OnInit, OnDestroy { ); } - onDocTypeSelected($event?: ApplicationDocumentTypeDto) { + async prepareCertificateOfTitleUpload(uuid?: string) { + const parcels = await this.parcelService.fetchParcels(this.data.fileId); + debugger; + if (parcels.length > 0) { + this.parcelId.setValidators([Validators.required]); + this.parcelId.updateValueAndValidity(); + + this.visibleToInternal.setValue(true); + this.visibleToPublic.setValue(true); + this.source.setValue(DOCUMENT_SOURCE.APPLICANT); + + const selectedParcel = parcels.find((parcel) => parcel.certificateOfTitleUuid === uuid); + if (selectedParcel) { + this.parcelId.setValue(selectedParcel.uuid); + } else if (uuid) { + this.showCertificateOfTitleWarning = true; + } + + this.selectableParcels = parcels + .filter((parcel) => parcel.parcelType === 'application') + .map((parcel, index) => ({ + uuid: parcel.uuid, + pid: parcel.pid, + index: index, + })); + } + } + + async onDocTypeSelected($event?: ApplicationDocumentTypeDto) { if ($event) { this.type.setValue($event.code); } else { this.type.setValue(undefined); } + + if (this.type.value === DOCUMENT_TYPE.CERTIFICATE_OF_TITLE) { + await this.prepareCertificateOfTitleUpload(); + } else { + this.parcelId.setValue(null); + this.parcelId.setValidators([]); + this.parcelId.updateValueAndValidity(); + } } uploadFile(event: Event) { diff --git a/alcs-frontend/src/app/services/application/application-document/application-document.service.ts b/alcs-frontend/src/app/services/application/application-document/application-document.service.ts index fc58585972..639fe02829 100644 --- a/alcs-frontend/src/app/services/application/application-document/application-document.service.ts +++ b/alcs-frontend/src/app/services/application/application-document/application-document.service.ts @@ -137,6 +137,25 @@ export class ApplicationDocumentService { return res; } + async attachCertificateOfTitle(fileNumber: string, parcelUuid: string, createDto: CreateDocumentDto) { + const file = createDto.file; + const isValidSize = verifyFileSize(file, this.toastService); + if (!isValidSize) { + return; + } + + let formData: FormData = new FormData(); + formData.append('documentType', createDto.typeCode); + formData.append('source', createDto.source); + formData.append('visibilityFlags', createDto.visibilityFlags.join(', ')); + formData.append('fileName', createDto.fileName); + formData.append('file', file, file.name); + formData.append('parcelUuid', parcelUuid); + const res = await firstValueFrom(this.http.post(`${this.url}/application/${fileNumber}/CERT`, formData)); + this.toastService.showSuccessToast('Review document uploaded'); + return res; + } + async updateSort(sortOrder: { uuid: string; order: number }[]) { try { await firstValueFrom(this.http.post(`${this.url}/sort`, sortOrder)); diff --git a/alcs-frontend/src/app/services/application/application-parcel/application-parcel.service.spec.ts b/alcs-frontend/src/app/services/application/application-parcel/application-parcel.service.spec.ts new file mode 100644 index 0000000000..7dbe4bebaf --- /dev/null +++ b/alcs-frontend/src/app/services/application/application-parcel/application-parcel.service.spec.ts @@ -0,0 +1,43 @@ +import { HttpClient } from '@angular/common/http'; +import { TestBed } from '@angular/core/testing'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { of } from 'rxjs'; +import { ToastService } from '../../toast/toast.service'; +import { ApplicationSubmissionDto, SubmittedApplicationOwnerDto } from '../application.dto'; + +import { ApplicationParcelService } from './application-parcel.service'; + +describe('ApplicationParcelService', () => { + let service: ApplicationParcelService; + let mockToastService: DeepMocked; + let mockHttpClient: DeepMocked; + + beforeEach(() => { + mockToastService = createMock(); + mockHttpClient = createMock(); + + TestBed.configureTestingModule({ + providers: [ + { provide: ToastService, useValue: mockToastService }, + { + provide: HttpClient, + useValue: mockHttpClient, + }, + ], + }); + service = TestBed.inject(ApplicationParcelService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); + + it('should successfully fetch parcels', async () => { + mockHttpClient.get.mockReturnValue(of([])); + + const result = await service.fetchParcels('1'); + + expect(result).toEqual([]); + expect(mockHttpClient.get).toBeCalledTimes(1); + }); +}); diff --git a/alcs-frontend/src/app/services/application/application-parcel/application-parcel.service.ts b/alcs-frontend/src/app/services/application/application-parcel/application-parcel.service.ts new file mode 100644 index 0000000000..d6f872b244 --- /dev/null +++ b/alcs-frontend/src/app/services/application/application-parcel/application-parcel.service.ts @@ -0,0 +1,24 @@ +import { HttpClient } from '@angular/common/http'; +import { Injectable } from '@angular/core'; +import { firstValueFrom } from 'rxjs'; +import { environment } from '../../../../environments/environment'; +import { ToastService } from '../../toast/toast.service'; +import { ApplicationParcelDto } from '../application.dto'; + +@Injectable({ + providedIn: 'root', +}) +export class ApplicationParcelService { + private baseUrl = `${environment.apiUrl}/application-parcel`; + + constructor(private http: HttpClient, private toastService: ToastService) {} + + async fetchParcels(fileNumber: string): Promise { + try { + return firstValueFrom(this.http.get(`${this.baseUrl}/${fileNumber}`)); + } catch (e) { + this.toastService.showErrorToast('Failed to fetch Application Parcels'); + throw e; + } + } +} diff --git a/alcs-frontend/src/app/services/application/application-submission/application-submission.service.spec.ts b/alcs-frontend/src/app/services/application/application-submission/application-submission.service.spec.ts index 96578b4656..e43c60d891 100644 --- a/alcs-frontend/src/app/services/application/application-submission/application-submission.service.spec.ts +++ b/alcs-frontend/src/app/services/application/application-submission/application-submission.service.spec.ts @@ -13,6 +13,26 @@ describe('ApplicationSubmissionService', () => { let mockHttpClient: DeepMocked; const mockSubmittedApplication: ApplicationSubmissionDto = { + applicant: '', + canEdit: false, + canReview: false, + canView: false, + createdAt: '', + fileNumber: '', + lastStatusUpdate: 0, + localGovernmentUuid: '', + owners: [], + soilAlreadyRemovedArea: null, + soilAlreadyRemovedAverageDepth: null, + soilAlreadyRemovedMaximumDepth: null, + soilAlreadyRemovedVolume: null, + soilToPlaceArea: null, + soilToPlaceVolume: null, + soilToRemoveAverageDepth: null, + soilToRemoveMaximumDepth: null, + type: '', + updatedAt: '', + uuid: '', naruExistingStructures: null, naruFillOrigin: null, naruFillType: null, @@ -31,9 +51,6 @@ describe('ApplicationSubmissionService', () => { naruToPlaceMaximumDepth: null, naruToPlaceVolume: null, naruWillImportFill: null, - parcels: [], - otherParcels: [], - documents: [], primaryContact: {} as SubmittedApplicationOwnerDto, parcelsAgricultureDescription: '', parcelsAgricultureImprovementDescription: '', diff --git a/alcs-frontend/src/app/services/application/application.dto.ts b/alcs-frontend/src/app/services/application/application.dto.ts index 55f4880821..0ef7b869ba 100644 --- a/alcs-frontend/src/app/services/application/application.dto.ts +++ b/alcs-frontend/src/app/services/application/application.dto.ts @@ -2,7 +2,6 @@ import { BaseCodeDto } from '../../shared/dto/base.dto'; import { CardDto } from '../card/card.dto'; import { UserDto } from '../user/user.dto'; import { ApplicationRegionDto, ApplicationTypeDto } from './application-code.dto'; -import { ApplicationDocumentDto } from './application-document/application-document.dto'; import { ApplicationLocalGovernmentDto } from './application-local-government/application-local-government.dto'; export enum APPLICATION_SYSTEM_SOURCE_TYPES { @@ -81,7 +80,8 @@ export interface ApplicationParcelDocumentDto { documentUuid: string; } -export interface SubmittedApplicationParcelDto { +export interface ApplicationParcelDto { + uuid: string; pid?: string; pin?: string; legalDescription: string; @@ -91,50 +91,64 @@ export interface SubmittedApplicationParcelDto { ownershipType?: string; crownLandOwnerType?: string; parcelType?: string; - documentUuids: string[]; + certificateOfTitleUuid?: string; owners: SubmittedApplicationOwnerDto[]; - documents: ApplicationParcelDocumentDto[]; } export interface ApplicationSubmissionDto { - parcels: SubmittedApplicationParcelDto[]; - otherParcels: SubmittedApplicationParcelDto[]; - documents: ApplicationDocumentDto[]; + uuid: string; + fileNumber: string; + createdAt: string; + updatedAt: string; + lastStatusUpdate: number; + applicant: string; + type: string; + + typeCode: string; + localGovernmentUuid: string; + canEdit: boolean; + canReview: boolean; + canView: boolean; + owners: SubmittedApplicationOwnerDto[]; hasOtherParcelsInCommunity?: boolean | null; + returnedComment?: string; + + primaryContactOwnerUuid?: string; primaryContact?: SubmittedApplicationOwnerDto; - parcelsAgricultureDescription: string; - parcelsAgricultureImprovementDescription: string; - parcelsNonAgricultureUseDescription: string; - northLandUseType: string; - northLandUseTypeDescription: string; - eastLandUseType: string; - eastLandUseTypeDescription: string; - southLandUseType: string; - southLandUseTypeDescription: string; - westLandUseType: string; - westLandUseTypeDescription: string; - typeCode: string; - //NFU Data - nfuHectares: string | null; + parcelsAgricultureDescription?: string | null; + parcelsAgricultureImprovementDescription?: string | null; + parcelsNonAgricultureUseDescription?: string | null; + northLandUseType?: string | null; + northLandUseTypeDescription?: string | null; + eastLandUseType?: string | null; + eastLandUseTypeDescription?: string | null; + southLandUseType?: string | null; + southLandUseTypeDescription?: string | null; + westLandUseType?: string | null; + westLandUseTypeDescription?: string | null; + + //NFU Specific Fields + nfuHectares: number | null; nfuPurpose: string | null; nfuOutsideLands: string | null; nfuAgricultureSupport: string | null; nfuWillImportFill: boolean | null; - nfuTotalFillPlacement: string | null; - nfuMaxFillDepth: string | null; - nfuFillVolume: string | null; - nfuProjectDurationAmount: string | null; + nfuTotalFillPlacement: number | null; + nfuMaxFillDepth: number | null; + nfuFillVolume: number | null; + nfuProjectDurationAmount: number | null; nfuProjectDurationUnit: string | null; nfuFillTypeDescription: string | null; nfuFillOriginDescription: string | null; - //TUR Data + //TUR Fields turPurpose: string | null; - turOutsideLands: string | null; turAgriculturalActivities: string | null; turReduceNegativeImpacts: string | null; - turTotalCorridorArea: string | null; + turOutsideLands: string | null; + turTotalCorridorArea: number | null; + turAllOwnersNotified?: boolean | null; //Subdivision Fields subdPurpose: string | null; @@ -153,14 +167,14 @@ export interface ApplicationSubmissionDto { soilReduceNegativeImpacts: string | null; soilToRemoveVolume: number | null; soilToRemoveArea: number | null; - soilToRemoveMaximumDepth?: number | null; - soilToRemoveAverageDepth?: number | null; - soilAlreadyRemovedVolume?: number | null; - soilAlreadyRemovedArea?: number | null; - soilAlreadyRemovedMaximumDepth?: number | null; - soilAlreadyRemovedAverageDepth?: number | null; - soilToPlaceVolume?: number | null; - soilToPlaceArea?: number | null; + soilToRemoveMaximumDepth: number | null; + soilToRemoveAverageDepth: number | null; + soilAlreadyRemovedVolume: number | null; + soilAlreadyRemovedArea: number | null; + soilAlreadyRemovedMaximumDepth: number | null; + soilAlreadyRemovedAverageDepth: number | null; + soilToPlaceVolume: number | null; + soilToPlaceArea: number | null; soilToPlaceMaximumDepth: number | null; soilToPlaceAverageDepth: number | null; soilAlreadyPlacedVolume: number | null; diff --git a/docs/jobs.md b/docs/jobs.md index 64f7f08ada..8bce6c365c 100644 --- a/docs/jobs.md +++ b/docs/jobs.md @@ -8,7 +8,7 @@ Using the template below these jobs can be executed inside openshift. Once logge * Replace the JOB_NAME with the jobs name * Replace NAMESPACE with the project where you want to run the job * Replace VERSION_HERE with the version of the image to use -* Replace COMMAND_HERE with the command to execute such as tagDocuments +* Replace COMMAND_HERE with the command to execute such as import ## Template ``` diff --git a/services/apps/alcs/src/alcs/application/application-document/application-document.controller.spec.ts b/services/apps/alcs/src/alcs/application/application-document/application-document.controller.spec.ts index 48a91dec7f..27ac43c374 100644 --- a/services/apps/alcs/src/alcs/application/application-document/application-document.controller.spec.ts +++ b/services/apps/alcs/src/alcs/application/application-document/application-document.controller.spec.ts @@ -7,6 +7,7 @@ import { ClsService } from 'nestjs-cls'; import { mockKeyCloakProviders } from '../../../../test/mocks/mockTypes'; import { ApplicationProfile } from '../../../common/automapper/application.automapper.profile'; import { DOCUMENT_SOURCE } from '../../../document/document.dto'; +import { ApplicationParcelService } from '../../../portal/application-submission/application-parcel/application-parcel.service'; import { CodeService } from '../../code/code.service'; import { DOCUMENT_TYPE } from './application-document-code.entity'; import { ApplicationDocumentController } from './application-document.controller'; @@ -16,6 +17,7 @@ import { ApplicationDocumentService } from './application-document.service'; describe('ApplicationDocumentController', () => { let controller: ApplicationDocumentController; let appDocumentService: DeepMocked; + let mockParcelService: DeepMocked; const mockDocument = { document: { @@ -26,7 +28,8 @@ describe('ApplicationDocumentController', () => { } as ApplicationDocument; beforeEach(async () => { - appDocumentService = createMock(); + appDocumentService = createMock(); + mockParcelService = createMock(); const module: TestingModule = await Test.createTestingModule({ imports: [ @@ -45,6 +48,10 @@ describe('ApplicationDocumentController', () => { provide: ApplicationDocumentService, useValue: appDocumentService, }, + { + provide: ApplicationParcelService, + useValue: mockParcelService, + }, { provide: ClsService, useValue: {}, diff --git a/services/apps/alcs/src/alcs/application/application-document/application-document.controller.ts b/services/apps/alcs/src/alcs/application/application-document/application-document.controller.ts index 482a68e8e2..24cb516c41 100644 --- a/services/apps/alcs/src/alcs/application/application-document/application-document.controller.ts +++ b/services/apps/alcs/src/alcs/application/application-document/application-document.controller.ts @@ -20,6 +20,7 @@ import { DOCUMENT_SOURCE, DOCUMENT_SYSTEM, } from '../../../document/document.dto'; +import { ApplicationParcelService } from '../../../portal/application-submission/application-parcel/application-parcel.service'; import { ApplicationDocumentCode, DOCUMENT_TYPE, @@ -40,6 +41,7 @@ import { ApplicationDocumentService } from './application-document.service'; export class ApplicationDocumentController { constructor( private applicationDocumentService: ApplicationDocumentService, + private parcelService: ApplicationParcelService, @InjectMapper() private mapper: Mapper, ) {} @@ -65,23 +67,51 @@ export class ApplicationDocumentController { if (!req.isMultipart()) { throw new BadRequestException('Request is not multipart'); } + const savedDocument = await this.saveUploadedFile(req, fileNumber); - const documentType = req.body.documentType.value as DOCUMENT_TYPE; - const file = req.body.file; - const fileName = req.body.fileName.value as string; - const documentSource = req.body.source.value as DOCUMENT_SOURCE; - const visibilityFlags = req.body.visibilityFlags.value.split(', '); + return this.mapper.map( + savedDocument, + ApplicationDocument, + ApplicationDocumentDto, + ); + } + + @Post('/application/:fileNumber/CERT') + @UserRoles(...ANY_AUTH_ROLE) + async attachCertificateOfTitle( + @Param('fileNumber') fileNumber: string, + @Req() req, + ): Promise { + if (!req.isMultipart()) { + throw new BadRequestException('Request is not multipart'); + } + + const parcelUuid = req.body.parcelUuid.value; + if (!parcelUuid) { + throw new BadRequestException('Request is missing parcel uuid'); + } + + const savedDocument = await this.saveUploadedFile(req, fileNumber); + + const parcel = await this.parcelService.getOneOrFail(parcelUuid); + if (parcel) { + if (parcel.certificateOfTitleUuid) { + const document = await this.applicationDocumentService.get( + parcel.certificateOfTitleUuid, + ); + await this.applicationDocumentService.update({ + uuid: document.uuid, + fileName: `${document.document.fileName}_superseded`, + source: document.document.source as DOCUMENT_SOURCE, + visibilityFlags: [], + documentType: document.type!.code as DOCUMENT_TYPE, + user: document.document.uploadedBy!, + }); + } + + await this.parcelService.setCertificateOfTitle(parcel, savedDocument); + } - const savedDocument = await this.applicationDocumentService.attachDocument({ - fileNumber, - fileName, - file, - user: req.user.entity, - documentType: documentType as DOCUMENT_TYPE, - source: documentSource, - visibilityFlags, - system: DOCUMENT_SYSTEM.ALCS, - }); return this.mapper.map( savedDocument, ApplicationDocument, @@ -218,4 +248,23 @@ export class ApplicationDocumentController { ): Promise { await this.applicationDocumentService.setSorting(data); } + + private async saveUploadedFile(req, fileNumber: string) { + const documentType = req.body.documentType.value as DOCUMENT_TYPE; + const file = req.body.file; + const fileName = req.body.fileName.value as string; + const documentSource = req.body.source.value as DOCUMENT_SOURCE; + const visibilityFlags = req.body.visibilityFlags.value.split(', '); + + return await this.applicationDocumentService.attachDocument({ + fileNumber, + fileName, + file, + user: req.user.entity, + documentType: documentType as DOCUMENT_TYPE, + source: documentSource, + visibilityFlags, + system: DOCUMENT_SYSTEM.ALCS, + }); + } } diff --git a/services/apps/alcs/src/alcs/application/application-parcel/application-parcel.controller.spec.ts b/services/apps/alcs/src/alcs/application/application-parcel/application-parcel.controller.spec.ts new file mode 100644 index 0000000000..4c3822c2cb --- /dev/null +++ b/services/apps/alcs/src/alcs/application/application-parcel/application-parcel.controller.spec.ts @@ -0,0 +1,45 @@ +import { classes } from '@automapper/classes'; +import { AutomapperModule } from '@automapper/nestjs'; +import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; +import { Test, TestingModule } from '@nestjs/testing'; +import { ClsService } from 'nestjs-cls'; +import { mockKeyCloakProviders } from '../../../../test/mocks/mockTypes'; +import { ApplicationParcelService } from '../../../portal/application-submission/application-parcel/application-parcel.service'; +import { ApplicationParcelController } from './application-parcel.controller'; + +describe('ApplicationParcelController', () => { + let controller: ApplicationParcelController; + let mockParcelService: DeepMocked; + + beforeEach(async () => { + mockParcelService = createMock(); + + const module: TestingModule = await Test.createTestingModule({ + imports: [ + AutomapperModule.forRoot({ + strategyInitializer: classes(), + }), + ], + controllers: [ApplicationParcelController], + providers: [ + { + provide: ApplicationParcelService, + useValue: mockParcelService, + }, + { + provide: ClsService, + useValue: {}, + }, + ...mockKeyCloakProviders, + ], + }).compile(); + + controller = module.get( + ApplicationParcelController, + ); + }); + + it('should be defined', () => { + expect(controller).toBeDefined(); + }); +}); diff --git a/services/apps/alcs/src/alcs/application/application-parcel/application-parcel.controller.ts b/services/apps/alcs/src/alcs/application/application-parcel/application-parcel.controller.ts new file mode 100644 index 0000000000..0fd13d20ae --- /dev/null +++ b/services/apps/alcs/src/alcs/application/application-parcel/application-parcel.controller.ts @@ -0,0 +1,36 @@ +import { Mapper } from '@automapper/core'; +import { InjectMapper } from '@automapper/nestjs'; +import { Controller, Get, Param, UseGuards } from '@nestjs/common'; +import { ApiOAuth2 } from '@nestjs/swagger'; +import * as config from 'config'; +import { ANY_AUTH_ROLE } from '../../../common/authorization/roles'; +import { RolesGuard } from '../../../common/authorization/roles-guard.service'; +import { UserRoles } from '../../../common/authorization/roles.decorator'; +import { DocumentService } from '../../../document/document.service'; +import { ApplicationParcelDto } from '../../../portal/application-submission/application-parcel/application-parcel.dto'; +import { ApplicationParcel } from '../../../portal/application-submission/application-parcel/application-parcel.entity'; +import { ApplicationParcelService } from '../../../portal/application-submission/application-parcel/application-parcel.service'; +import { ApplicationSubmissionService } from '../application-submission/application-submission.service'; + +@ApiOAuth2(config.get('KEYCLOAK.SCOPES')) +@UseGuards(RolesGuard) +@Controller('application-parcel') +export class ApplicationParcelController { + constructor( + private applicationParcelService: ApplicationParcelService, + @InjectMapper() private mapper: Mapper, + ) {} + + @UserRoles(...ANY_AUTH_ROLE) + @Get('/:fileNumber') + async get(@Param('fileNumber') fileNumber: string) { + const parcels = + await this.applicationParcelService.fetchByApplicationFileId(fileNumber); + + return this.mapper.mapArray( + parcels, + ApplicationParcel, + ApplicationParcelDto, + ); + } +} diff --git a/services/apps/alcs/src/alcs/application/application-submission/application-submission.service.spec.ts b/services/apps/alcs/src/alcs/application/application-submission/application-submission.service.spec.ts index bd4fcbb4ec..12170a45ff 100644 --- a/services/apps/alcs/src/alcs/application/application-submission/application-submission.service.spec.ts +++ b/services/apps/alcs/src/alcs/application/application-submission/application-submission.service.spec.ts @@ -5,6 +5,7 @@ import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { ApplicationOwner } from '../../../portal/application-submission/application-owner/application-owner.entity'; +import { ApplicationParcel } from '../../../portal/application-submission/application-parcel/application-parcel.entity'; import { APPLICATION_STATUS } from '../../../portal/application-submission/application-status/application-status.dto'; import { ApplicationStatus } from '../../../portal/application-submission/application-status/application-status.entity'; import { ApplicationSubmission } from '../../../portal/application-submission/application-submission.entity'; @@ -18,12 +19,14 @@ describe('ApplicationSubmissionService', () => { let mockApplicationStatusRepository: DeepMocked< Repository >; + let mockAppParcelRepo: DeepMocked>; let mapper: DeepMocked; beforeEach(async () => { mockApplicationSubmissionRepository = createMock(); mapper = createMock(); mockApplicationStatusRepository = createMock(); + mockAppParcelRepo = createMock(); const module: TestingModule = await Test.createTestingModule({ providers: [ @@ -36,6 +39,10 @@ describe('ApplicationSubmissionService', () => { provide: getRepositoryToken(ApplicationStatus), useValue: mockApplicationStatusRepository, }, + { + provide: getRepositoryToken(ApplicationParcel), + useValue: mockAppParcelRepo, + }, { provide: getMapperToken(), useValue: mapper, @@ -74,15 +81,6 @@ describe('ApplicationSubmissionService', () => { document: true, }, }, - parcels: { - owners: { - type: true, - }, - certificateOfTitle: { - document: true, - }, - ownershipType: true, - }, owners: { type: true, }, diff --git a/services/apps/alcs/src/alcs/application/application-submission/application-submission.service.ts b/services/apps/alcs/src/alcs/application/application-submission/application-submission.service.ts index a99409a8f1..737dcb9c65 100644 --- a/services/apps/alcs/src/alcs/application/application-submission/application-submission.service.ts +++ b/services/apps/alcs/src/alcs/application/application-submission/application-submission.service.ts @@ -5,6 +5,7 @@ import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { ApplicationOwnerDto } from '../../../portal/application-submission/application-owner/application-owner.dto'; import { ApplicationOwner } from '../../../portal/application-submission/application-owner/application-owner.entity'; +import { ApplicationParcel } from '../../../portal/application-submission/application-parcel/application-parcel.entity'; import { APPLICATION_STATUS } from '../../../portal/application-submission/application-status/application-status.dto'; import { ApplicationStatus } from '../../../portal/application-submission/application-status/application-status.entity'; import { ApplicationSubmission } from '../../../portal/application-submission/application-submission.entity'; @@ -17,6 +18,8 @@ export class ApplicationSubmissionService { private applicationSubmissionRepository: Repository, @InjectRepository(ApplicationStatus) private applicationStatusRepository: Repository, + @InjectRepository(ApplicationParcel) + private parcelRepository: Repository, @InjectMapper() private mapper: Mapper, ) {} @@ -30,15 +33,6 @@ export class ApplicationSubmissionService { document: true, }, }, - parcels: { - owners: { - type: true, - }, - certificateOfTitle: { - document: true, - }, - ownershipType: true, - }, owners: { type: true, }, diff --git a/services/apps/alcs/src/alcs/application/application.module.ts b/services/apps/alcs/src/alcs/application/application.module.ts index 3ac9e5b012..0884085b87 100644 --- a/services/apps/alcs/src/alcs/application/application.module.ts +++ b/services/apps/alcs/src/alcs/application/application.module.ts @@ -1,14 +1,17 @@ -import { Module } from '@nestjs/common'; +import { forwardRef, Module } from '@nestjs/common'; import { TypeOrmModule } from '@nestjs/typeorm'; import { ApplicationOwnerProfile } from '../../common/automapper/application-owner.automapper.profile'; import { ApplicationParcelProfile } from '../../common/automapper/application-parcel.automapper.profile'; +import { ApplicationSubmissionProfile } from '../../common/automapper/application-submission.automapper.profile'; import { ApplicationSubtaskProfile } from '../../common/automapper/application-subtask.automapper.profile'; import { ApplicationProfile } from '../../common/automapper/application.automapper.profile'; import { DocumentModule } from '../../document/document.module'; import { FileNumberModule } from '../../file-number/file-number.module'; import { ApplicationSubmissionReview } from '../../portal/application-submission-review/application-submission-review.entity'; +import { ApplicationParcel } from '../../portal/application-submission/application-parcel/application-parcel.entity'; import { ApplicationStatus } from '../../portal/application-submission/application-status/application-status.entity'; import { ApplicationSubmission } from '../../portal/application-submission/application-submission.entity'; +import { ApplicationSubmissionModule } from '../../portal/application-submission/application-submission.module'; import { Board } from '../board/board.entity'; import { CardModule } from '../card/card.module'; import { ApplicationType } from '../code/application-code/application-type/application-type.entity'; @@ -24,6 +27,7 @@ import { ApplicationDocumentService } from './application-document/application-d import { ApplicationMeetingController } from './application-meeting/application-meeting.controller'; import { ApplicationMeeting } from './application-meeting/application-meeting.entity'; import { ApplicationMeetingService } from './application-meeting/application-meeting.service'; +import { ApplicationParcelController } from './application-parcel/application-parcel.controller'; import { ApplicationPaused } from './application-paused.entity'; import { ApplicationPausedService } from './application-paused/application-paused.service'; import { ApplicationSubmissionReviewController } from './application-submission-review/application-submission-review.controller'; @@ -45,6 +49,7 @@ import { ApplicationService } from './application.service'; ApplicationDocument, ApplicationDocumentCode, ApplicationLocalGovernment, + ApplicationParcel, Board, ApplicationSubmission, ApplicationSubmissionReview, @@ -55,6 +60,7 @@ import { ApplicationService } from './application.service'; CardModule, CodeModule, FileNumberModule, + forwardRef(() => ApplicationSubmissionModule), ], providers: [ ApplicationService, @@ -69,6 +75,7 @@ import { ApplicationService } from './application.service'; ApplicationLocalGovernmentService, ApplicationSubmissionService, ApplicationSubmissionReviewService, + ApplicationSubmissionProfile, ], controllers: [ ApplicationController, @@ -77,6 +84,7 @@ import { ApplicationService } from './application.service'; ApplicationLocalGovernmentController, ApplicationSubmissionController, ApplicationSubmissionReviewController, + ApplicationParcelController, ], exports: [ ApplicationService, diff --git a/services/apps/alcs/src/commands/tag.ts b/services/apps/alcs/src/commands/tag.ts deleted file mode 100644 index 6eaa8a6e1f..0000000000 --- a/services/apps/alcs/src/commands/tag.ts +++ /dev/null @@ -1,18 +0,0 @@ -import { NestFactory } from '@nestjs/core'; -import { NestFastifyApplication } from '@nestjs/platform-fastify'; -import { Logger } from 'nestjs-pino'; -import { MainModule } from '../main.module'; -import { DocumentService } from '../document/document.service'; - -export async function applyDefaultDocumentTags() { - const app = await NestFactory.create(MainModule, { - bufferLogs: false, - }); - app.useLogger(app.get(Logger)); - - await app.init(); - - const documentService = app.get(DocumentService); - await documentService.applyDefaultTags(); - process.exit(0); -} diff --git a/services/apps/alcs/src/common/automapper/application-submission.automapper.profile.ts b/services/apps/alcs/src/common/automapper/application-submission.automapper.profile.ts index 05b15def7d..82a094d1c4 100644 --- a/services/apps/alcs/src/common/automapper/application-submission.automapper.profile.ts +++ b/services/apps/alcs/src/common/automapper/application-submission.automapper.profile.ts @@ -1,6 +1,7 @@ import { createMap, forMember, mapFrom, Mapper } from '@automapper/core'; import { AutomapperProfile, InjectMapper } from '@automapper/nestjs'; import { Injectable } from '@nestjs/common'; +import { AlcsApplicationSubmissionDto } from '../../alcs/application/application.dto'; import { ApplicationOwnerDetailedDto, ApplicationOwnerDto, @@ -85,6 +86,36 @@ export class ApplicationSubmissionProfile extends AutomapperProfile { }), ), ); + + createMap( + mapper, + ApplicationSubmission, + AlcsApplicationSubmissionDto, + forMember( + (a) => a.lastStatusUpdate, + mapFrom((ad) => { + if (ad.statusHistory.length > 0) { + return ad.statusHistory[0].time; + } + //For older applications before status history was created + return Date.now(); + }), + ), + forMember( + (a) => a.owners, + mapFrom((ad) => { + if (ad.owners) { + return this.mapper.mapArray( + ad.owners, + ApplicationOwner, + ApplicationOwnerDetailedDto, + ); + } else { + return []; + } + }), + ), + ); }; } } diff --git a/services/apps/alcs/src/document/document.service.spec.ts b/services/apps/alcs/src/document/document.service.spec.ts index b9136b4a52..970d417347 100644 --- a/services/apps/alcs/src/document/document.service.spec.ts +++ b/services/apps/alcs/src/document/document.service.spec.ts @@ -95,4 +95,36 @@ describe('DocumentService', () => { expect(mockRepository.save).toHaveBeenCalledTimes(1); expect(res).toEqual(mockDoc); }); + + it('should call repository save on update Document', async () => { + const mockDoc = new Document({ + mimeType: 'mimeType', + fileKey: 'fileKey', + fileName: 'fileName', + uploadedBy: null, + source: DOCUMENT_SOURCE.APPLICANT, + }); + mockRepository.save.mockResolvedValue(mockDoc); + await service.update(mockDoc, { + source: DOCUMENT_SOURCE.APPLICANT, + fileName: 'file', + }); + expect(mockRepository.save).toHaveBeenCalledTimes(1); + }); + + it('should call through to repo for get', async () => { + const mockDoc = new Document({ + mimeType: 'mimeType', + fileKey: 'fileKey', + fileName: 'fileName', + uploadedBy: null, + source: DOCUMENT_SOURCE.APPLICANT, + }); + mockRepository.findOneOrFail.mockResolvedValue(mockDoc); + + const res = await service.getDocument(''); + + expect(mockRepository.findOneOrFail).toHaveBeenCalledTimes(1); + expect(res).toEqual(mockDoc); + }); }); diff --git a/services/apps/alcs/src/document/document.service.ts b/services/apps/alcs/src/document/document.service.ts index f841832c14..269c0139fd 100644 --- a/services/apps/alcs/src/document/document.service.ts +++ b/services/apps/alcs/src/document/document.service.ts @@ -147,32 +147,6 @@ export class DocumentService { }); } - //One time function used to apply default tags to existing documents - async applyDefaultTags() { - const documents = await this.documentRepository.find(); - console.warn( - `Applying default document tags to ${documents.length} Documents`, - ); - for (const document of documents) { - document.tags = DEFAULT_DB_TAGS; - const command = new PutObjectTaggingCommand({ - Bucket: this.config.get('STORAGE.BUCKET'), - Key: document.fileKey, - Tagging: { - TagSet: [ - { - Key: 'ORCS-Classification', - Value: '85100-20', - }, - ], - }, - }); - await this.dataStore.send(command); - await this.documentRepository.save(document); - } - console.warn(`${documents.length} Documents tagged successfully`); - } - async createDocumentRecord(data: CreateDocumentDto) { return this.documentRepository.save( new Document({ diff --git a/services/apps/alcs/src/main.ts b/services/apps/alcs/src/main.ts index ac36a0510d..5da3fc6e70 100644 --- a/services/apps/alcs/src/main.ts +++ b/services/apps/alcs/src/main.ts @@ -13,7 +13,6 @@ import { Logger } from 'nestjs-pino'; import { install } from 'source-map-support'; import { generateModuleGraph } from './commands/graph'; import { importNOIs } from './commands/import'; -import { applyDefaultDocumentTags } from './commands/tag'; import { MainModule } from './main.module'; const registerSwagger = (app: NestFastifyApplication) => { @@ -110,9 +109,6 @@ async function bootstrap() { if (extraArg == 'import') { await importNOIs(); } - if (extraArg == 'tagDocuments') { - await applyDefaultDocumentTags(); - } // config variables const port: number = config.get('ALCS.PORT'); diff --git a/services/apps/alcs/src/portal/application-submission-review/application-submission-review.module.ts b/services/apps/alcs/src/portal/application-submission-review/application-submission-review.module.ts index 5b5c98cbed..41f1cb4a80 100644 --- a/services/apps/alcs/src/portal/application-submission-review/application-submission-review.module.ts +++ b/services/apps/alcs/src/portal/application-submission-review/application-submission-review.module.ts @@ -11,7 +11,7 @@ import { ApplicationSubmissionReviewService } from './application-submission-rev imports: [ TypeOrmModule.forFeature([ApplicationSubmissionReview]), forwardRef(() => ApplicationSubmissionModule), - ApplicationModule, + forwardRef(() => ApplicationModule), ], providers: [ ApplicationSubmissionReviewService, diff --git a/services/apps/alcs/src/portal/application-submission/application-parcel/application-parcel.dto.ts b/services/apps/alcs/src/portal/application-submission/application-parcel/application-parcel.dto.ts index 6b1f4876a2..e77990ae9d 100644 --- a/services/apps/alcs/src/portal/application-submission/application-parcel/application-parcel.dto.ts +++ b/services/apps/alcs/src/portal/application-submission/application-parcel/application-parcel.dto.ts @@ -7,6 +7,7 @@ import { IsOptional, IsString, } from 'class-validator'; +import { Column } from 'typeorm'; import { ApplicationDocumentDto } from '../../../alcs/application/application-document/application-document.dto'; import { BaseCodeDto } from '../../../common/dtos/base.dto'; import { ApplicationOwnerDetailedDto } from '../application-owner/application-owner.dto'; @@ -20,6 +21,9 @@ export class ApplicationParcelDto { @AutoMap() applicationSubmissionUuid: string; + @AutoMap(() => String) + certificateOfTitleUuid: string | null; + @AutoMap(() => String) pid?: string | null; diff --git a/services/apps/alcs/src/portal/application-submission/application-parcel/application-parcel.entity.ts b/services/apps/alcs/src/portal/application-submission/application-parcel/application-parcel.entity.ts index d618e6872e..71e65c9661 100644 --- a/services/apps/alcs/src/portal/application-submission/application-parcel/application-parcel.entity.ts +++ b/services/apps/alcs/src/portal/application-submission/application-parcel/application-parcel.entity.ts @@ -139,4 +139,8 @@ export class ApplicationParcel extends Base { onDelete: 'SET NULL', }) certificateOfTitle?: ApplicationDocument; + + @AutoMap(() => String) + @Column({ nullable: true }) + certificateOfTitleUuid: string | null; } diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.module.ts b/services/apps/alcs/src/portal/application-submission/application-submission.module.ts index 6dd1d4a569..6b204b2ab0 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.module.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.module.ts @@ -1,4 +1,4 @@ -import { Module } from '@nestjs/common'; +import { forwardRef, Module } from '@nestjs/common'; import { TypeOrmModule } from '@nestjs/typeorm'; import { ApplicationModule } from '../../alcs/application/application.module'; import { AuthorizationModule } from '../../common/authorization/authorization.module'; @@ -34,10 +34,10 @@ import { NaruSubtype } from './naru-subtype/naru-subtype.entity'; ApplicationOwnerType, NaruSubtype, ]), - ApplicationModule, + forwardRef(() => ApplicationModule), AuthorizationModule, - DocumentModule, - PdfGenerationModule, + forwardRef(() => DocumentModule), + forwardRef(() => PdfGenerationModule), ], providers: [ ApplicationSubmissionService, diff --git a/services/package.json b/services/package.json index 0e16529817..c186dc98db 100644 --- a/services/package.json +++ b/services/package.json @@ -21,7 +21,6 @@ "alcs:start:prod": "node dist/apps/alcs/main TZ=UTC", "alcs:import": "nest start alcs TZ=UTC -- import", "alcs:graph": "nest start TZ=UTC -- graph", - "alcs:tag": "nest start TZ=UTC -- tagDocuments", "alcs:typeorm": "typeorm-ts-node-esm -d apps/alcs/src/providers/typeorm/datasource.cli.orm.config.ts", "alcs:typeorm:cli": "node --require ts-node/register ./node_modules/typeorm/cli.js", "alcs:migration:generate": "npm run alcs:typeorm -- migration:generate apps/alcs/src/providers/typeorm/migrations/$npm_config_name", From 99322d17451f302fd0c2ac774966d8dc8e4b8ee9 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Tue, 27 Jun 2023 16:11:25 -0700 Subject: [PATCH 021/954] Code Review Feedback --- .../document-upload-dialog.component.ts | 21 +++++----- .../application-submission.service.spec.ts | 40 +++++++++---------- .../application-submission.service.ts | 3 -- 3 files changed, 32 insertions(+), 32 deletions(-) diff --git a/alcs-frontend/src/app/features/application/documents/document-upload-dialog/document-upload-dialog.component.ts b/alcs-frontend/src/app/features/application/documents/document-upload-dialog/document-upload-dialog.component.ts index b0264511dc..5ac7312203 100644 --- a/alcs-frontend/src/app/features/application/documents/document-upload-dialog/document-upload-dialog.component.ts +++ b/alcs-frontend/src/app/features/application/documents/document-upload-dialog/document-upload-dialog.component.ts @@ -103,21 +103,26 @@ export class DocumentUploadDialogComponent implements OnInit, OnDestroy { const parcelId = await this.parcelId.value; const dto = { - file: this.pendingFile, fileName: this.name.getRawValue()!, source: this.source.getRawValue() as DOCUMENT_SOURCE, typeCode: this.type.getRawValue() as DOCUMENT_TYPE, visibilityFlags, }; + + const file = this.pendingFile; this.isSaving = true; - if (parcelId && dto.file && this.type.value === DOCUMENT_TYPE.CERTIFICATE_OF_TITLE) { - // @ts-ignore File is checked above to not be undefined, typescript still thinks it might be undefined - await this.applicationDocumentService.attachCertificateOfTitle(this.data.fileId, parcelId, dto); + if (parcelId && file && this.type.value === DOCUMENT_TYPE.CERTIFICATE_OF_TITLE) { + await this.applicationDocumentService.attachCertificateOfTitle(this.data.fileId, parcelId, { + ...dto, + file, + }); } else if (this.data.existingDocument) { await this.applicationDocumentService.update(this.data.existingDocument.uuid, dto); - } else if (dto.file !== undefined) { - // @ts-ignore File is checked above to not be undefined, typescript still thinks it might be undefined - await this.applicationDocumentService.upload(this.data.fileId, dto); + } else if (file !== undefined) { + await this.applicationDocumentService.upload(this.data.fileId, { + ...dto, + file, + }); } this.dialog.close(true); this.isSaving = false; @@ -144,13 +149,11 @@ export class DocumentUploadDialogComponent implements OnInit, OnDestroy { async prepareCertificateOfTitleUpload(uuid?: string) { const parcels = await this.parcelService.fetchParcels(this.data.fileId); - debugger; if (parcels.length > 0) { this.parcelId.setValidators([Validators.required]); this.parcelId.updateValueAndValidity(); this.visibleToInternal.setValue(true); - this.visibleToPublic.setValue(true); this.source.setValue(DOCUMENT_SOURCE.APPLICANT); const selectedParcel = parcels.find((parcel) => parcel.certificateOfTitleUuid === uuid); diff --git a/services/apps/alcs/src/alcs/application/application-submission/application-submission.service.spec.ts b/services/apps/alcs/src/alcs/application/application-submission/application-submission.service.spec.ts index 12170a45ff..a7aeaaaca5 100644 --- a/services/apps/alcs/src/alcs/application/application-submission/application-submission.service.spec.ts +++ b/services/apps/alcs/src/alcs/application/application-submission/application-submission.service.spec.ts @@ -1,11 +1,12 @@ -import { Mapper } from '@automapper/core'; -import { getMapperToken } from '@automapper/nestjs'; +import { classes } from '@automapper/classes'; +import { AutomapperModule } from '@automapper/nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; +import { ApplicationOwnerProfile } from '../../../common/automapper/application-owner.automapper.profile'; +import { ApplicationSubmissionProfile } from '../../../common/automapper/application-submission.automapper.profile'; import { ApplicationOwner } from '../../../portal/application-submission/application-owner/application-owner.entity'; -import { ApplicationParcel } from '../../../portal/application-submission/application-parcel/application-parcel.entity'; import { APPLICATION_STATUS } from '../../../portal/application-submission/application-status/application-status.dto'; import { ApplicationStatus } from '../../../portal/application-submission/application-status/application-status.entity'; import { ApplicationSubmission } from '../../../portal/application-submission/application-submission.entity'; @@ -19,18 +20,21 @@ describe('ApplicationSubmissionService', () => { let mockApplicationStatusRepository: DeepMocked< Repository >; - let mockAppParcelRepo: DeepMocked>; - let mapper: DeepMocked; beforeEach(async () => { mockApplicationSubmissionRepository = createMock(); - mapper = createMock(); mockApplicationStatusRepository = createMock(); - mockAppParcelRepo = createMock(); const module: TestingModule = await Test.createTestingModule({ + imports: [ + AutomapperModule.forRoot({ + strategyInitializer: classes(), + }), + ], providers: [ ApplicationSubmissionService, + ApplicationSubmissionProfile, + ApplicationOwnerProfile, { provide: getRepositoryToken(ApplicationSubmission), useValue: mockApplicationSubmissionRepository, @@ -39,14 +43,6 @@ describe('ApplicationSubmissionService', () => { provide: getRepositoryToken(ApplicationStatus), useValue: mockApplicationStatusRepository, }, - { - provide: getRepositoryToken(ApplicationParcel), - useValue: mockAppParcelRepo, - }, - { - provide: getMapperToken(), - useValue: mapper, - }, ], }).compile(); @@ -89,15 +85,19 @@ describe('ApplicationSubmissionService', () => { }); it('should properly map to dto', async () => { - mapper.mapAsync.mockResolvedValue({} as any); - - const fakeSubmission = createMock(); - fakeSubmission.owners = [new ApplicationOwner()]; + const fakeSubmission = createMock({ + primaryContactOwnerUuid: 'uuid', + }); + fakeSubmission.owners = [ + new ApplicationOwner({ + uuid: 'uuid', + }), + ]; const result = await service.mapToDto(fakeSubmission); - expect(mapper.mapAsync).toBeCalledTimes(2); expect(result).toBeDefined(); + expect(result.primaryContact).toBeDefined(); }); it('should successfully retrieve status from repo', async () => { diff --git a/services/apps/alcs/src/alcs/application/application-submission/application-submission.service.ts b/services/apps/alcs/src/alcs/application/application-submission/application-submission.service.ts index 737dcb9c65..eaa5dba45c 100644 --- a/services/apps/alcs/src/alcs/application/application-submission/application-submission.service.ts +++ b/services/apps/alcs/src/alcs/application/application-submission/application-submission.service.ts @@ -5,7 +5,6 @@ import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { ApplicationOwnerDto } from '../../../portal/application-submission/application-owner/application-owner.dto'; import { ApplicationOwner } from '../../../portal/application-submission/application-owner/application-owner.entity'; -import { ApplicationParcel } from '../../../portal/application-submission/application-parcel/application-parcel.entity'; import { APPLICATION_STATUS } from '../../../portal/application-submission/application-status/application-status.dto'; import { ApplicationStatus } from '../../../portal/application-submission/application-status/application-status.entity'; import { ApplicationSubmission } from '../../../portal/application-submission/application-submission.entity'; @@ -18,8 +17,6 @@ export class ApplicationSubmissionService { private applicationSubmissionRepository: Repository, @InjectRepository(ApplicationStatus) private applicationStatusRepository: Repository, - @InjectRepository(ApplicationParcel) - private parcelRepository: Repository, @InjectMapper() private mapper: Mapper, ) {} From f1c9d214135799a7bbc0766e8d0a756ad8101c00 Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Tue, 27 Jun 2023 16:36:54 -0700 Subject: [PATCH 022/954] Feature/alcs 767 (#734) new reconsideration fields for applications originated in portal always display review outcome date in edit window for reconsideration of type 33 --- .../decision-input-v2.component.ts | 6 +- ...edit-reconsideration-dialog.component.html | 41 ++++++++++---- ...t-reconsideration-dialog.component.spec.ts | 5 +- .../edit-reconsideration-dialog.component.ts | 54 +++++++++++++----- .../post-decision.component.html | 52 +++++++++++++----- .../post-decision.component.scss | 6 ++ .../post-decision/post-decision.component.ts | 4 +- ...create-reconsideration-dialog.component.ts | 29 ++++++++-- .../create/create-reconsideration-dialog.html | 54 +++++++++++++----- .../reconsideration-dialog.component.spec.ts | 3 +- .../application-reconsideration.dto.ts | 13 +++++ .../application-decision.dto.ts | 1 + .../pipes/boolean-to-string.pipe.spec.ts | 8 +++ .../shared/pipes/boolean-to-string.pipe.ts | 17 ++++++ alcs-frontend/src/app/shared/shared.module.ts | 3 + .../application-decision.dto.ts | 3 + .../application-reconsideration.controller.ts | 2 +- .../application-reconsideration.dto.ts | 55 ++++++++++++++++--- .../application-reconsideration.entity.ts | 37 ++++++++++--- .../application-reconsideration.service.ts | 9 +++ .../application.automapper.profile.ts | 5 +- ...687808298996-new_reconsideration_fields.ts | 43 +++++++++++++++ 22 files changed, 370 insertions(+), 80 deletions(-) create mode 100644 alcs-frontend/src/app/shared/pipes/boolean-to-string.pipe.spec.ts create mode 100644 alcs-frontend/src/app/shared/pipes/boolean-to-string.pipe.ts create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1687808298996-new_reconsideration_fields.ts diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.ts index c8457c1fe1..7c9d951799 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.ts @@ -238,7 +238,7 @@ export class DecisionInputV2Component implements OnInit, OnDestroy { .filter( (modification) => (existingDecision && existingDecision.modifies?.uuid === modification.uuid) || - (modification.reviewOutcome.code === 'PRC' && modification.resultingDecision === null) + (modification.reviewOutcome.code === 'PRC' && !modification.resultingDecision) ) .map((modification, index) => ({ label: `Modification Request #${modifications.length - index} - ${modification.modifiesDecisions @@ -247,12 +247,12 @@ export class DecisionInputV2Component implements OnInit, OnDestroy { uuid: modification.uuid, type: PostDecisionType.Modification, })); - + const mappedRecons = reconsiderations .filter( (reconsideration) => (existingDecision && existingDecision.reconsiders?.uuid === reconsideration.uuid) || - (reconsideration.reviewOutcome?.code === 'PRC' && reconsideration.resultingDecision === null) + (reconsideration.reviewOutcome?.code === 'PRC' && !reconsideration.resultingDecision) ) .map((reconsideration, index) => ({ label: `Reconsideration Request #${reconsiderations.length - index} - ${reconsideration.reconsideredDecisions diff --git a/alcs-frontend/src/app/features/application/post-decision/edit-reconsideration-dialog/edit-reconsideration-dialog.component.html b/alcs-frontend/src/app/features/application/post-decision/edit-reconsideration-dialog/edit-reconsideration-dialog.component.html index 7c3b80b56c..cd3c565515 100644 --- a/alcs-frontend/src/app/features/application/post-decision/edit-reconsideration-dialog/edit-reconsideration-dialog.component.html +++ b/alcs-frontend/src/app/features/application/post-decision/edit-reconsideration-dialog/edit-reconsideration-dialog.component.html @@ -25,7 +25,7 @@

Edit Reconsideration

-
+
Reconsideration Type * Edit Reconsideration
+
+ New Evidence* + + Yes + No + +
+ +
+ Incorrect or False Info* + + Yes + No + +
+ +
+ New Proposal* + + Yes + No + +
+
Review Outcome * @@ -46,15 +70,7 @@

Edit Reconsideration
- + Outcome Notification Date @@ -71,6 +87,11 @@

Edit Reconsideration

 + + + Request Description + +
diff --git a/alcs-frontend/src/app/features/application/post-decision/edit-reconsideration-dialog/edit-reconsideration-dialog.component.spec.ts b/alcs-frontend/src/app/features/application/post-decision/edit-reconsideration-dialog/edit-reconsideration-dialog.component.spec.ts index 6ccc361c62..a4a9fbdc39 100644 --- a/alcs-frontend/src/app/features/application/post-decision/edit-reconsideration-dialog/edit-reconsideration-dialog.component.spec.ts +++ b/alcs-frontend/src/app/features/application/post-decision/edit-reconsideration-dialog/edit-reconsideration-dialog.component.spec.ts @@ -27,7 +27,10 @@ describe('EditReconsiderationDialogComponent', () => { provide: ToastService, useValue: {}, }, - { provide: MAT_DIALOG_DATA, useValue: { existingDecision: { type: {}, reconsideredDecisions: [] } } }, + { + provide: MAT_DIALOG_DATA, + useValue: { existingRecon: { type: {}, reconsideredDecisions: [], application: { source: 'fake' } } }, + }, { provide: MatDialogRef, useValue: {} }, ], schemas: [NO_ERRORS_SCHEMA], diff --git a/alcs-frontend/src/app/features/application/post-decision/edit-reconsideration-dialog/edit-reconsideration-dialog.component.ts b/alcs-frontend/src/app/features/application/post-decision/edit-reconsideration-dialog/edit-reconsideration-dialog.component.ts index 5f2af7f12b..6bba254b83 100644 --- a/alcs-frontend/src/app/features/application/post-decision/edit-reconsideration-dialog/edit-reconsideration-dialog.component.ts +++ b/alcs-frontend/src/app/features/application/post-decision/edit-reconsideration-dialog/edit-reconsideration-dialog.component.ts @@ -11,6 +11,7 @@ import { ApplicationDecisionService } from '../../../../services/application/dec import { ToastService } from '../../../../services/toast/toast.service'; import { BaseCodeDto } from '../../../../shared/dto/base.dto'; import { formatDateForApi } from '../../../../shared/utils/api-date-formatter'; +import { parseBooleanToString, parseStringToBoolean } from '../../../../shared/utils/boolean-helper'; @Component({ selector: 'app-edit-reconsideration-dialog', @@ -24,12 +25,16 @@ export class EditReconsiderationDialogComponent implements OnInit { typeControl = new FormControl(undefined, [Validators.required]); reviewOutcomeCodeControl = new FormControl(null); - form = new FormGroup({ + form: FormGroup = new FormGroup({ submittedDate: new FormControl(undefined, [Validators.required]), type: this.typeControl, reviewOutcomeCode: this.reviewOutcomeCodeControl, reviewDate: new FormControl(null), reconsidersDecisions: new FormControl([], [Validators.required]), + description: new FormControl('', [Validators.required]), + isNewProposal: new FormControl(undefined, [Validators.required]), + isIncorrectFalseInfo: new FormControl(undefined, [Validators.required]), + isNewEvidence: new FormControl(undefined, [Validators.required]), }); decisions: { uuid: string; resolution: string }[] = []; @@ -37,7 +42,7 @@ export class EditReconsiderationDialogComponent implements OnInit { @Inject(MAT_DIALOG_DATA) public data: { fileNumber: string; - existingDecision: ApplicationReconsiderationDetailedDto; + existingRecon: ApplicationReconsiderationDetailedDto; codes: BaseCodeDto[]; }, private dialogRef: MatDialogRef, @@ -46,15 +51,20 @@ export class EditReconsiderationDialogComponent implements OnInit { private toastService: ToastService ) { this.codes = data.codes; + this.form.patchValue({ - submittedDate: new Date(data.existingDecision.submittedDate), - type: data.existingDecision.type.code, + submittedDate: new Date(data.existingRecon.submittedDate), + type: data.existingRecon.type.code, reviewOutcomeCode: - data.existingDecision.type.code === RECONSIDERATION_TYPE.T_33 - ? data.existingDecision.reviewOutcome?.code || 'PEN' + data.existingRecon.type.code === RECONSIDERATION_TYPE.T_33 + ? data.existingRecon.reviewOutcome?.code || 'PEN' : null, - reviewDate: data.existingDecision.reviewDate ? new Date(data.existingDecision.reviewDate) : null, - reconsidersDecisions: data.existingDecision.reconsideredDecisions.map((dec) => dec.uuid), + reviewDate: data.existingRecon.reviewDate ? new Date(data.existingRecon.reviewDate) : null, + reconsidersDecisions: data.existingRecon.reconsideredDecisions.map((dec) => dec.uuid), + description: data.existingRecon.description ?? null, + isNewProposal: parseBooleanToString(data.existingRecon.isNewProposal), + isIncorrectFalseInfo: parseBooleanToString(data.existingRecon.isIncorrectFalseInfo), + isNewEvidence: parseBooleanToString(data.existingRecon.isNewEvidence), }); } @@ -65,17 +75,31 @@ export class EditReconsiderationDialogComponent implements OnInit { async onSubmit() { this.isLoading = true; - const { submittedDate, type, reviewOutcomeCode, reviewDate, reconsidersDecisions } = this.form.getRawValue(); + const { + submittedDate, + type, + reviewOutcomeCode, + reviewDate, + reconsidersDecisions, + description, + isNewProposal, + isIncorrectFalseInfo, + isNewEvidence, + } = this.form.getRawValue(); const data: UpdateApplicationReconsiderationDto = { submittedDate: formatDateForApi(submittedDate!), reviewOutcomeCode: reviewOutcomeCode, typeCode: type!, reviewDate: reviewDate ? formatDateForApi(reviewDate) : reviewDate, reconsideredDecisionUuids: reconsidersDecisions || [], + description: description, + isNewProposal: parseStringToBoolean(isNewProposal), + isIncorrectFalseInfo: parseStringToBoolean(isIncorrectFalseInfo), + isNewEvidence: parseStringToBoolean(isNewEvidence), }; try { - await this.reconsiderationService.update(this.data.existingDecision.uuid, { ...data }); + await this.reconsiderationService.update(this.data.existingRecon.uuid, { ...data }); this.toastService.showSuccessToast('Reconsideration updated'); } finally { this.isLoading = false; @@ -86,10 +110,12 @@ export class EditReconsiderationDialogComponent implements OnInit { async loadDecisions(fileNumber: string) { const decisions = await this.decisionService.fetchByApplication(fileNumber); if (decisions.length > 0) { - this.decisions = decisions.map((decision) => ({ - uuid: decision.uuid, - resolution: `#${decision.resolutionNumber}/${decision.resolutionYear}`, - })); + this.decisions = decisions + .filter((e) => !e.isDraft) + .map((decision) => ({ + uuid: decision.uuid, + resolution: `#${decision.resolutionNumber}/${decision.resolutionYear}`, + })); } } diff --git a/alcs-frontend/src/app/features/application/post-decision/post-decision.component.html b/alcs-frontend/src/app/features/application/post-decision/post-decision.component.html index a9f395c2d2..2ad9a4abc4 100644 --- a/alcs-frontend/src/app/features/application/post-decision/post-decision.component.html +++ b/alcs-frontend/src/app/features/application/post-decision/post-decision.component.html @@ -40,25 +40,27 @@
Reconsideration Type
{{ reconsideration.type.label }}
-
-
Review Outcome
- - - - {{ - reconsideration.reviewOutcome.label - }} -
+
Resolutions to be Reconsidered
{{ reconsideration.reconsidersDecisionsNumbers.join(', ') }}
-
-
Resulting Resolution
- #{{ reconsideration.resultingDecision.resolutionNumber }}/{{ reconsideration.resultingDecision.resolutionYear }} + +
+
New Evidence
+ {{ reconsideration.isNewEvidence | booleanToString }}
+ +
+
Incorrect or False Info
+ {{ reconsideration.isIncorrectFalseInfo | booleanToString }} +
+ +
+
New Proposal
+ {{ reconsideration.isNewProposal | booleanToString }} +
+
Outcome Notification Date @@ -73,6 +75,28 @@
>
+ +
+
Review Outcome
+ + + + {{ + reconsideration.reviewOutcome.label + }} +
+ +
+
Resulting Resolution
+ #{{ reconsideration.resultingDecision.resolutionNumber }}/{{ reconsideration.resultingDecision.resolutionYear }} +
+ +
+
Request Description
+ {{ reconsideration.description }} +
diff --git a/alcs-frontend/src/app/features/application/post-decision/post-decision.component.scss b/alcs-frontend/src/app/features/application/post-decision/post-decision.component.scss index 77afb94fab..81b0597964 100644 --- a/alcs-frontend/src/app/features/application/post-decision/post-decision.component.scss +++ b/alcs-frontend/src/app/features/application/post-decision/post-decision.component.scss @@ -94,6 +94,7 @@ section { display: grid; grid-template-columns: 1fr 1fr; grid-row-gap: 24px; + column-gap: 12px; .subheading2 { margin-bottom: 6px !important; @@ -101,5 +102,10 @@ section { & > div { font-size: 16px; + word-wrap: break-word; + } + + .full-grid-line { + grid-column: 1 / 3; } } diff --git a/alcs-frontend/src/app/features/application/post-decision/post-decision.component.ts b/alcs-frontend/src/app/features/application/post-decision/post-decision.component.ts index 37b9c4922f..66ba09cbb6 100644 --- a/alcs-frontend/src/app/features/application/post-decision/post-decision.component.ts +++ b/alcs-frontend/src/app/features/application/post-decision/post-decision.component.ts @@ -1,6 +1,6 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; -import { Subject, combineLatestWith, takeUntil, tap } from 'rxjs'; +import { combineLatestWith, Subject, takeUntil, tap } from 'rxjs'; import { ApplicationDetailService } from '../../../services/application/application-detail.service'; import { ApplicationModificationDto } from '../../../services/application/application-modification/application-modification.dto'; import { ApplicationModificationService } from '../../../services/application/application-modification/application-modification.service'; @@ -88,7 +88,7 @@ export class PostDecisionComponent implements OnInit, OnDestroy { autoFocus: false, data: { fileNumber: this.fileNumber, - existingDecision: reconsideration, + existingRecon: reconsideration, codes: this.reconCodes, }, }) diff --git a/alcs-frontend/src/app/features/board/dialogs/reconsiderations/create/create-reconsideration-dialog.component.ts b/alcs-frontend/src/app/features/board/dialogs/reconsiderations/create/create-reconsideration-dialog.component.ts index b92a8044c4..02713c278c 100644 --- a/alcs-frontend/src/app/features/board/dialogs/reconsiderations/create/create-reconsideration-dialog.component.ts +++ b/alcs-frontend/src/app/features/board/dialogs/reconsiderations/create/create-reconsideration-dialog.component.ts @@ -16,6 +16,7 @@ import { ApplicationService } from '../../../../../services/application/applicat import { ApplicationDecisionService } from '../../../../../services/application/decision/application-decision-v1/application-decision.service'; import { CardService } from '../../../../../services/card/card.service'; import { ToastService } from '../../../../../services/toast/toast.service'; +import { parseStringToBoolean } from '../../../../../shared/utils/boolean-helper'; @Component({ selector: 'app-create', @@ -43,8 +44,12 @@ export class CreateReconsiderationDialogComponent implements OnInit, OnDestroy { reconTypeControl = new FormControl(null, [Validators.required]); localGovernmentControl = new FormControl(null, [Validators.required]); reconsidersDecisions = new FormControl([], [Validators.required]); + descriptionControl = new FormControl('', [Validators.required]); + isNewProposalControl = new FormControl(undefined, [Validators.required]); + isIncorrectFalseInfoControl = new FormControl(undefined, [Validators.required]); + isNewEvidenceControl = new FormControl(undefined, [Validators.required]); - createForm = new FormGroup({ + createForm: FormGroup = new FormGroup({ applicationType: this.applicationTypeControl, fileNumber: this.fileNumberControl, applicant: this.applicantControl, @@ -53,6 +58,10 @@ export class CreateReconsiderationDialogComponent implements OnInit, OnDestroy { submittedDate: this.submittedDateControl, reconType: this.reconTypeControl, reconsidersDecisions: this.reconsidersDecisions, + description: this.descriptionControl, + isNewProposal: this.isNewProposalControl, + isIncorrectFalseInfo: this.isIncorrectFalseInfoControl, + isNewEvidence: this.isNewEvidenceControl, }); constructor( @@ -150,6 +159,10 @@ export class CreateReconsiderationDialogComponent implements OnInit, OnDestroy { // card details boardCode: this.currentBoardCode, reconsideredDecisionUuids: formValues.reconsidersDecisions!, + description: formValues.description, + isNewProposal: parseStringToBoolean(formValues.isNewProposal), + isIncorrectFalseInfo: parseStringToBoolean(formValues.isIncorrectFalseInfo), + isNewEvidence: parseStringToBoolean(formValues.isNewEvidence), }; if (!recon.boardCode) { @@ -173,6 +186,10 @@ export class CreateReconsiderationDialogComponent implements OnInit, OnDestroy { this.submittedDateControl.reset(); this.reconTypeControl.reset(); this.reconsidersDecisions.reset(); + this.descriptionControl.reset(); + this.isIncorrectFalseInfoControl.reset(); + this.isNewEvidenceControl.reset(); + this.isNewProposalControl.reset(); this.fileNumberControl.enable(); this.applicantControl.enable(); @@ -194,10 +211,12 @@ export class CreateReconsiderationDialogComponent implements OnInit, OnDestroy { async loadDecisions(fileNumber: string) { const decisions = await this.decisionService.fetchByApplication(fileNumber); if (decisions.length > 0) { - this.decisions = decisions.map((decision) => ({ - uuid: decision.uuid, - resolution: `#${decision.resolutionNumber}/${decision.resolutionYear}`, - })); + this.decisions = decisions + .filter((e) => !e.isDraft) + .map((decision) => ({ + uuid: decision.uuid, + resolution: `#${decision.resolutionNumber}/${decision.resolutionYear}`, + })); this.reconsidersDecisions.enable(); } } diff --git a/alcs-frontend/src/app/features/board/dialogs/reconsiderations/create/create-reconsideration-dialog.html b/alcs-frontend/src/app/features/board/dialogs/reconsiderations/create/create-reconsideration-dialog.html index ff3913d327..462d733b60 100644 --- a/alcs-frontend/src/app/features/board/dialogs/reconsiderations/create/create-reconsideration-dialog.html +++ b/alcs-frontend/src/app/features/board/dialogs/reconsiderations/create/create-reconsideration-dialog.html @@ -130,8 +130,22 @@

Create Reconsideration

>
+
+ + Request Submission Date + + + + +
- Decisions to be Reconsidered + Resolutions to be Reconsidered {{decision.resolution}} @@ -150,21 +164,33 @@

Create Reconsideration

> -
- - Reconsideration Request Submitted to ALC - - - - +
+ New Evidence* + + Yes + No + +
+
+ Incorrect or False Info* + + Yes + No +
+
+ New Proposal* + + Yes + No + +
+ + Request Description + +
+
warning diff --git a/alcs-frontend/src/app/features/board/dialogs/reconsiderations/reconsideration-dialog.component.spec.ts b/alcs-frontend/src/app/features/board/dialogs/reconsiderations/reconsideration-dialog.component.spec.ts index ac1e3f696a..31b0b2b2e4 100644 --- a/alcs-frontend/src/app/features/board/dialogs/reconsiderations/reconsideration-dialog.component.spec.ts +++ b/alcs-frontend/src/app/features/board/dialogs/reconsiderations/reconsideration-dialog.component.spec.ts @@ -1,7 +1,7 @@ import { EventEmitter, NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { FormsModule } from '@angular/forms'; -import { MAT_DIALOG_DATA, MatDialogModule, MatDialogRef } from '@angular/material/dialog'; +import { MatDialogModule, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { MatMenuModule } from '@angular/material/menu'; import { MatSnackBarModule } from '@angular/material/snack-bar'; import { RouterTestingModule } from '@angular/router/testing'; @@ -52,6 +52,7 @@ describe('ReconsiderationDialogComponent', () => { } as ApplicationRegionDto, localGovernment: {} as ApplicationLocalGovernmentDto, decisionMeetings: [], + source: 'fake', }, card: { status: { diff --git a/alcs-frontend/src/app/services/application/application-reconsideration/application-reconsideration.dto.ts b/alcs-frontend/src/app/services/application/application-reconsideration/application-reconsideration.dto.ts index 37258495bc..8be327efb9 100644 --- a/alcs-frontend/src/app/services/application/application-reconsideration/application-reconsideration.dto.ts +++ b/alcs-frontend/src/app/services/application/application-reconsideration/application-reconsideration.dto.ts @@ -22,6 +22,7 @@ export interface ApplicationForReconsiderationDto { fileNumber: string; type: ApplicationTypeDto; applicant: string; + source: string; region: ApplicationRegionDto; localGovernment: ApplicationLocalGovernmentDto; decisionMeetings: ApplicationDecisionMeetingDto[]; @@ -44,6 +45,10 @@ export interface ApplicationReconsiderationDto { reviewOutcome?: ReconsiderationReviewOutcomeTypeDto | null; reconsideredDecisions: ApplicationDecisionDto[]; resultingDecision: ApplicationDecisionDto | null; + description?: string; + isNewProposal?: boolean | null; + isIncorrectFalseInfo?: boolean | null; + isNewEvidence?: boolean | null; } export interface ApplicationReconsiderationDetailedDto extends ApplicationReconsiderationDto {} @@ -58,6 +63,10 @@ export interface CreateApplicationReconsiderationDto { reconTypeCode: string; boardCode: string; reconsideredDecisionUuids: string[]; + description?: string; + isNewProposal?: boolean | null; + isIncorrectFalseInfo?: boolean | null; + isNewEvidence?: boolean | null; } export interface UpdateApplicationReconsiderationDto { @@ -66,4 +75,8 @@ export interface UpdateApplicationReconsiderationDto { reviewDate?: number | null; reviewOutcomeCode?: string | null; reconsideredDecisionUuids?: string[]; + description?: string; + isNewProposal?: boolean | null; + isIncorrectFalseInfo?: boolean | null; + isNewEvidence?: boolean | null; } diff --git a/alcs-frontend/src/app/services/application/decision/application-decision-v1/application-decision.dto.ts b/alcs-frontend/src/app/services/application/decision/application-decision-v1/application-decision.dto.ts index 1d980d8900..3f2184de92 100644 --- a/alcs-frontend/src/app/services/application/decision/application-decision-v1/application-decision.dto.ts +++ b/alcs-frontend/src/app/services/application/decision/application-decision-v1/application-decision.dto.ts @@ -54,6 +54,7 @@ export interface ApplicationDecisionDto { reconsiders?: LinkedResolutionDto; reconsideredBy?: LinkedResolutionDto[]; modifiedBy?: LinkedResolutionDto[]; + isDraft: boolean; } export interface LinkedResolutionDto { diff --git a/alcs-frontend/src/app/shared/pipes/boolean-to-string.pipe.spec.ts b/alcs-frontend/src/app/shared/pipes/boolean-to-string.pipe.spec.ts new file mode 100644 index 0000000000..2ecc0baa98 --- /dev/null +++ b/alcs-frontend/src/app/shared/pipes/boolean-to-string.pipe.spec.ts @@ -0,0 +1,8 @@ +import { BooleanToStringPipe } from './boolean-to-string.pipe'; + +describe('BooleanToStringPipe', () => { + it('create an instance', () => { + const pipe = new BooleanToStringPipe(); + expect(pipe).toBeTruthy(); + }); +}); diff --git a/alcs-frontend/src/app/shared/pipes/boolean-to-string.pipe.ts b/alcs-frontend/src/app/shared/pipes/boolean-to-string.pipe.ts new file mode 100644 index 0000000000..a496835607 --- /dev/null +++ b/alcs-frontend/src/app/shared/pipes/boolean-to-string.pipe.ts @@ -0,0 +1,17 @@ +import { Pipe, PipeTransform } from '@angular/core'; + +@Pipe({ + name: 'booleanToString', +}) +export class BooleanToStringPipe implements PipeTransform { + transform(value: boolean | undefined | null): string { + switch (value) { + case true: + return 'Yes'; + case false: + return 'No'; + default: + return ''; + } + } +} diff --git a/alcs-frontend/src/app/shared/shared.module.ts b/alcs-frontend/src/app/shared/shared.module.ts index 737d872de8..960399ce57 100644 --- a/alcs-frontend/src/app/shared/shared.module.ts +++ b/alcs-frontend/src/app/shared/shared.module.ts @@ -58,6 +58,7 @@ import { TimeTrackerComponent } from './time-tracker/time-tracker.component'; import { TimelineComponent } from './timeline/timeline.component'; import { DATE_FORMATS } from './utils/date-format'; import { ExtensionsDatepickerFormatter } from './utils/extensions-datepicker-formatter'; +import { BooleanToStringPipe } from './pipes/boolean-to-string.pipe'; @NgModule({ declarations: [ @@ -83,6 +84,7 @@ import { ExtensionsDatepickerFormatter } from './utils/extensions-datepicker-for StaffJournalNoteComponent, StaffJournalNoteInputComponent, InlineReviewOutcomeComponent, + BooleanToStringPipe, NoDataComponent, ], imports: [ @@ -164,6 +166,7 @@ import { ExtensionsDatepickerFormatter } from './utils/extensions-datepicker-for StaffJournalNoteComponent, StaffJournalNoteInputComponent, InlineReviewOutcomeComponent, + BooleanToStringPipe, NoDataComponent, ], }) diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v1/application-decision/application-decision.dto.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v1/application-decision/application-decision.dto.ts index c19a526e4a..2d61ed46eb 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v1/application-decision/application-decision.dto.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v1/application-decision/application-decision.dto.ts @@ -149,6 +149,9 @@ export class ApplicationDecisionDto { @AutoMap(() => Boolean) isOther?: boolean | null; + @AutoMap(() => Boolean) + isDraft: boolean; + reconsiders?: LinkedResolutionDto; modifies?: LinkedResolutionDto; reconsideredBy?: LinkedResolutionDto[]; diff --git a/services/apps/alcs/src/alcs/application-decision/application-reconsideration/application-reconsideration.controller.ts b/services/apps/alcs/src/alcs/application-decision/application-reconsideration/application-reconsideration.controller.ts index 5339c0596e..3c13906296 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-reconsideration/application-reconsideration.controller.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-reconsideration/application-reconsideration.controller.ts @@ -10,10 +10,10 @@ import { } from '@nestjs/common'; import { ApiOAuth2 } from '@nestjs/swagger'; import * as config from 'config'; -import { BoardService } from '../../board/board.service'; import { ROLES_ALLOWED_APPLICATIONS } from '../../../common/authorization/roles'; import { RolesGuard } from '../../../common/authorization/roles-guard.service'; import { UserRoles } from '../../../common/authorization/roles.decorator'; +import { BoardService } from '../../board/board.service'; import { ApplicationReconsiderationCreateDto, ApplicationReconsiderationUpdateDto, diff --git a/services/apps/alcs/src/alcs/application-decision/application-reconsideration/application-reconsideration.dto.ts b/services/apps/alcs/src/alcs/application-decision/application-reconsideration/application-reconsideration.dto.ts index e2f182afa0..68895acff8 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-reconsideration/application-reconsideration.dto.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-reconsideration/application-reconsideration.dto.ts @@ -2,6 +2,7 @@ import { AutoMap } from '@automapper/classes'; import { ArrayNotEmpty, IsArray, + IsBoolean, IsDefined, IsNotEmpty, IsNumber, @@ -57,6 +58,22 @@ export class ApplicationReconsiderationCreateDto { @IsArray() @ArrayNotEmpty() reconsideredDecisionUuids: string[]; + + @IsOptional() + @IsString() + description?: string; + + @IsOptional() + @IsBoolean() + isNewProposal?: boolean; + + @IsOptional() + @IsBoolean() + isIncorrectFalseInfo?: boolean; + + @IsOptional() + @IsBoolean() + isNewEvidence?: boolean; } export class ApplicationReconsiderationUpdateDto { @@ -80,6 +97,22 @@ export class ApplicationReconsiderationUpdateDto { @IsArray() @ArrayNotEmpty() reconsideredDecisionUuids?: string[]; + + @IsOptional() + @IsString() + description?: string; + + @IsOptional() + @IsBoolean() + isNewProposal?: boolean; + + @IsOptional() + @IsBoolean() + isIncorrectFalseInfo?: boolean; + + @IsOptional() + @IsBoolean() + isNewEvidence?: boolean; } export class ApplicationForReconsiderationDto { @@ -87,29 +120,37 @@ export class ApplicationForReconsiderationDto { type: ApplicationTypeDto; statusCode: string; applicant: string; + source: string; region: ApplicationRegionDto; localGovernment: string; decisionMeetings: ApplicationDecisionMeetingDto[]; } -export class ApplicationReconsiderationDto { +export class ApplicationReconsiderationWithoutApplicationDto { uuid: string; - application: ApplicationForReconsiderationDto; + applicationUuid: string; card: CardDto; type: ReconsiderationTypeDto; submittedDate: number; reviewDate: number; reviewOutcome: ApplicationReconsiderationOutcomeCodeDto | null; - reconsideredDecisions: ApplicationDecisionDto[]; - resultingDecision?: ApplicationDecisionDto; + @AutoMap(() => String) + description?: string | null; + @AutoMap(() => Boolean) + isNewProposal?: boolean | null; + @AutoMap(() => Boolean) + isIncorrectFalseInfo?: boolean | null; + @AutoMap(() => Boolean) + isNewEvidence?: boolean | null; } - -export class ApplicationReconsiderationWithoutApplicationDto { +export class ApplicationReconsiderationDto extends ApplicationReconsiderationWithoutApplicationDto { uuid: string; - applicationUuid: string; + application: ApplicationForReconsiderationDto; card: CardDto; type: ReconsiderationTypeDto; submittedDate: number; reviewDate: number; reviewOutcome: ApplicationReconsiderationOutcomeCodeDto | null; + reconsideredDecisions: ApplicationDecisionDto[]; + resultingDecision?: ApplicationDecisionDto; } diff --git a/services/apps/alcs/src/alcs/application-decision/application-reconsideration/application-reconsideration.entity.ts b/services/apps/alcs/src/alcs/application-decision/application-reconsideration/application-reconsideration.entity.ts index 438c64eaa9..5ccea0691d 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-reconsideration/application-reconsideration.entity.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-reconsideration/application-reconsideration.entity.ts @@ -30,6 +30,33 @@ export class ApplicationReconsideration extends Base { @Column({ type: 'timestamptz' }) submittedDate: Date; + @AutoMap() + @Column({ type: 'timestamptz', nullable: true }) + reviewDate: Date | null; + + @AutoMap(() => String) + @Column({ + type: 'text', + nullable: true, + comment: 'Reconsideration description provided by ALCS staff', + }) + description?: string; + + @AutoMap(() => Boolean) + @Column({ + type: 'boolean', + nullable: true, + }) + isNewProposal?: boolean; + + @AutoMap(() => Boolean) + @Column({ type: 'boolean', nullable: true }) + isIncorrectFalseInfo?: boolean; + + @AutoMap(() => Boolean) + @Column({ type: 'boolean', nullable: true }) + isNewEvidence?: boolean; + @AutoMap() @ManyToOne(() => ApplicationReconsiderationType, { nullable: false, @@ -47,8 +74,8 @@ export class ApplicationReconsideration extends Base { reviewOutcome: ApplicationReconsiderationOutcomeType | null; @AutoMap() - @Column({ type: 'timestamptz', nullable: true }) - reviewDate: Date | null; + @Column({ type: 'uuid' }) + applicationUuid: string; @AutoMap() @ManyToOne(() => Application, { cascade: ['insert'] }) @@ -56,7 +83,7 @@ export class ApplicationReconsideration extends Base { @AutoMap() @Column({ type: 'uuid' }) - applicationUuid: string; + cardUuid: string; @AutoMap() @OneToOne(() => Card, { cascade: true }) @@ -64,10 +91,6 @@ export class ApplicationReconsideration extends Base { @Type(() => Card) card: Card | null; - @AutoMap() - @Column({ type: 'uuid' }) - cardUuid: string; - @ManyToMany(() => ApplicationDecision, (decision) => decision.reconsideredBy) @JoinTable({ name: 'application_reconsidered_decisions', diff --git a/services/apps/alcs/src/alcs/application-decision/application-reconsideration/application-reconsideration.service.ts b/services/apps/alcs/src/alcs/application-decision/application-reconsideration/application-reconsideration.service.ts index cb16345a2d..44b3e4d52e 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-reconsideration/application-reconsideration.service.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-reconsideration/application-reconsideration.service.ts @@ -130,6 +130,10 @@ export class ApplicationReconsiderationService { const reconsideration = new ApplicationReconsideration({ submittedDate: new Date(createDto.submittedDate), + description: createDto.description, + isIncorrectFalseInfo: createDto.isIncorrectFalseInfo, + isNewEvidence: createDto.isNewEvidence, + isNewProposal: createDto.isNewProposal, type, }); @@ -217,6 +221,11 @@ export class ApplicationReconsiderationService { ); } + reconsideration.description = updateDto.description; + reconsideration.isIncorrectFalseInfo = updateDto.isIncorrectFalseInfo; + reconsideration.isNewEvidence = updateDto.isNewEvidence; + reconsideration.isNewProposal = updateDto.isNewProposal; + const recon = await this.reconsiderationRepository.save(reconsideration); return this.getByUuid(recon.uuid); diff --git a/services/apps/alcs/src/common/automapper/application.automapper.profile.ts b/services/apps/alcs/src/common/automapper/application.automapper.profile.ts index cbb72d3871..ce8ac72a64 100644 --- a/services/apps/alcs/src/common/automapper/application.automapper.profile.ts +++ b/services/apps/alcs/src/common/automapper/application.automapper.profile.ts @@ -18,7 +18,10 @@ import { } from '../../alcs/application/application-meeting/application-meeting.dto'; import { ApplicationMeeting } from '../../alcs/application/application-meeting/application-meeting.entity'; import { ApplicationPaused } from '../../alcs/application/application-paused.entity'; -import { ApplicationDto } from '../../alcs/application/application.dto'; +import { + AlcsApplicationSubmissionDto, + ApplicationDto, +} from '../../alcs/application/application.dto'; import { Application } from '../../alcs/application/application.entity'; import { CardDto } from '../../alcs/card/card.dto'; import { Card } from '../../alcs/card/card.entity'; diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1687808298996-new_reconsideration_fields.ts b/services/apps/alcs/src/providers/typeorm/migrations/1687808298996-new_reconsideration_fields.ts new file mode 100644 index 0000000000..abe88296c1 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1687808298996-new_reconsideration_fields.ts @@ -0,0 +1,43 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class newReconsiderationFields1687808298996 + implements MigrationInterface +{ + name = 'newReconsiderationFields1687808298996'; + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `ALTER TABLE "alcs"."application_reconsideration" ADD "description" text`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."application_reconsideration"."description" IS 'Reconsideration description provided by ALCS staff'`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_reconsideration" ADD "is_new_proposal" boolean`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_reconsideration" ADD "is_incorrect_false_info" boolean`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_reconsideration" ADD "is_new_evidence" boolean`, + ); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `ALTER TABLE "alcs"."application_reconsideration" DROP COLUMN "is_new_evidence"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_reconsideration" DROP COLUMN "is_incorrect_false_info"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_reconsideration" DROP COLUMN "is_new_proposal"`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."application_reconsideration"."description" IS 'Reconsideration description provided by ALCS staff'`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_reconsideration" DROP COLUMN "description"`, + ); + } +} From 5b8f1baa07b03b5181edba499af03218e4e6d574 Mon Sep 17 00:00:00 2001 From: "to. sandra" <76515860+sandratoh@users.noreply.github.com> Date: Tue, 27 Jun 2023 17:14:20 -0700 Subject: [PATCH 023/954] Subdivision portal proposal and ALCS app prep fix (#736) * Remove document upload UI error when file is not needed * Remove overflow scroll bar in proposed lot --- .../app/features/application/proposal/subd/sub.dcomponent.scss | 1 - .../proposal/subd-proposal/subd-proposal.component.html | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/alcs-frontend/src/app/features/application/proposal/subd/sub.dcomponent.scss b/alcs-frontend/src/app/features/application/proposal/subd/sub.dcomponent.scss index 727a1dd00e..deb66eaa6f 100644 --- a/alcs-frontend/src/app/features/application/proposal/subd/sub.dcomponent.scss +++ b/alcs-frontend/src/app/features/application/proposal/subd/sub.dcomponent.scss @@ -1,7 +1,6 @@ .parcel-table { display: grid; grid-template-columns: max-content max-content max-content; - overflow-x: auto; grid-column-gap: 36px; grid-row-gap: 12px; } diff --git a/portal-frontend/src/app/features/edit-submission/proposal/subd-proposal/subd-proposal.component.html b/portal-frontend/src/app/features/edit-submission/proposal/subd-proposal/subd-proposal.component.html index f0d9c0073c..facd717e1e 100644 --- a/portal-frontend/src/app/features/edit-submission/proposal/subd-proposal/subd-proposal.component.html +++ b/portal-frontend/src/app/features/edit-submission/proposal/subd-proposal/subd-proposal.component.html @@ -232,7 +232,7 @@
Documents needed for this step:
(deleteFile)="onDeleteFile($event)" (openFile)="openFile($event)" [showErrors]="showErrors" - [isRequired]="true" + [isRequired]="isHomeSiteSeverance.getRawValue() !== 'false'" [allowMultiple]="true" [disabled]="isHomeSiteSeverance.getRawValue() === 'false'" > From f7fb0248f64abe5c0e1f665836c39f5716f84ad4 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Wed, 28 Jun 2023 11:16:09 -0700 Subject: [PATCH 024/954] Add Owner Dropdown for Corporate Summary * Clean up logic in controller * Fix warning banner preventing edit submission submit * Load naru subtype in edit submission to enable editing of NARU --- .../parcel/parcel.component.ts | 12 +- .../document-upload-dialog.component.html | 14 +- .../document-upload-dialog.component.spec.ts | 7 + .../document-upload-dialog.component.ts | 86 +++++++++--- .../application-document.dto.ts | 2 + .../application-document.service.ts | 61 +++------ .../services/application/application.dto.ts | 13 +- .../application-details.component.html | 2 +- .../application-document.controller.spec.ts | 121 ++++++++++++++++- .../application-document.controller.ts | 125 ++++++++++++------ .../application-document.service.ts | 2 +- .../application-submission-draft.service.ts | 2 + .../application-owner.dto.ts | 6 +- .../application-owner.service.spec.ts | 8 ++ .../application-owner.service.ts | 20 +-- ...nerate-submission-document.service.spec.ts | 4 +- 16 files changed, 336 insertions(+), 149 deletions(-) diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/parcel/parcel.component.ts b/alcs-frontend/src/app/features/application/applicant-info/application-details/parcel/parcel.component.ts index 74e0bb4f6a..d3df83e4ff 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/application-details/parcel/parcel.component.ts +++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/parcel/parcel.component.ts @@ -43,17 +43,7 @@ export class ParcelComponent implements OnInit, OnChanges { async loadParcels(fileNumber: string) { const parcels = await this.parcelService.fetchParcels(fileNumber); - this.parcels = parcels - .filter((e) => e.parcelType === this.parcelType) - .map((parcel) => { - return { - ...parcel, - owners: parcel.owners.map((owner) => ({ - ...owner, - corporateSummary: this.files.find((file) => file.documentUuid === owner.corporateSummaryDocumentUuid), - })), - }; - }); + this.parcels = parcels.filter((e) => e.parcelType === this.parcelType); } ngOnChanges(changes: SimpleChanges): void { diff --git a/alcs-frontend/src/app/features/application/documents/document-upload-dialog/document-upload-dialog.component.html b/alcs-frontend/src/app/features/application/documents/document-upload-dialog/document-upload-dialog.component.html index a10af437f6..2ba3ec7b06 100644 --- a/alcs-frontend/src/app/features/application/documents/document-upload-dialog/document-upload-dialog.component.html +++ b/alcs-frontend/src/app/features/application/documents/document-upload-dialog/document-upload-dialog.component.html @@ -1,6 +1,8 @@

{{ title }} Document

- Superseded - Not associated with Applicant Submission in Portal + Superseded - Not associated with Applicant Submission in Portal
@@ -81,6 +83,16 @@

{{ title }} Document

+
+ + Associated Organization + + + {{ owner.label }} + + + +
Visible To:
diff --git a/alcs-frontend/src/app/features/application/documents/document-upload-dialog/document-upload-dialog.component.spec.ts b/alcs-frontend/src/app/features/application/documents/document-upload-dialog/document-upload-dialog.component.spec.ts index e2c259bc1b..ed346dab5c 100644 --- a/alcs-frontend/src/app/features/application/documents/document-upload-dialog/document-upload-dialog.component.spec.ts +++ b/alcs-frontend/src/app/features/application/documents/document-upload-dialog/document-upload-dialog.component.spec.ts @@ -4,6 +4,7 @@ import { MAT_DIALOG_DATA, MatDialogModule, MatDialogRef } from '@angular/materia import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { ApplicationDocumentService } from '../../../../services/application/application-document/application-document.service'; import { ApplicationParcelService } from '../../../../services/application/application-parcel/application-parcel.service'; +import { ApplicationSubmissionService } from '../../../../services/application/application-submission/application-submission.service'; import { DocumentUploadDialogComponent } from './document-upload-dialog.component'; @@ -13,10 +14,12 @@ describe('DocumentUploadDialogComponent', () => { let mockAppDocService: DeepMocked; let mockParcelService: DeepMocked; + let mockSubmissionService: DeepMocked; beforeEach(async () => { mockAppDocService = createMock(); mockParcelService = createMock(); + mockSubmissionService = createMock(); const mockDialogRef = { close: jest.fn(), @@ -36,6 +39,10 @@ describe('DocumentUploadDialogComponent', () => { provide: ApplicationParcelService, useValue: mockParcelService, }, + { + provide: ApplicationSubmissionService, + useValue: mockSubmissionService, + }, { provide: MatDialogRef, useValue: mockDialogRef }, { provide: MAT_DIALOG_DATA, useValue: {} }, ], diff --git a/alcs-frontend/src/app/features/application/documents/document-upload-dialog/document-upload-dialog.component.ts b/alcs-frontend/src/app/features/application/documents/document-upload-dialog/document-upload-dialog.component.ts index 5ac7312203..0b6cc13f9f 100644 --- a/alcs-frontend/src/app/features/application/documents/document-upload-dialog/document-upload-dialog.component.ts +++ b/alcs-frontend/src/app/features/application/documents/document-upload-dialog/document-upload-dialog.component.ts @@ -5,6 +5,7 @@ import { Subject } from 'rxjs'; import { ApplicationDocumentDto, ApplicationDocumentTypeDto, + UpdateDocumentDto, } from '../../../../services/application/application-document/application-document.dto'; import { ApplicationDocumentService, @@ -13,6 +14,8 @@ import { DOCUMENT_TYPE, } from '../../../../services/application/application-document/application-document.service'; import { ApplicationParcelService } from '../../../../services/application/application-parcel/application-parcel.service'; +import { ApplicationSubmissionService } from '../../../../services/application/application-submission/application-submission.service'; +import { SubmittedApplicationOwnerDto } from '../../../../services/application/application.dto'; @Component({ selector: 'app-document-upload-dialog', @@ -34,6 +37,7 @@ export class DocumentUploadDialogComponent implements OnInit, OnDestroy { source = new FormControl('', [Validators.required]); parcelId = new FormControl(null); + ownerId = new FormControl(null); visibleToInternal = new FormControl(false, [Validators.required]); visibleToPublic = new FormControl(false, [Validators.required]); @@ -41,6 +45,7 @@ export class DocumentUploadDialogComponent implements OnInit, OnDestroy { documentTypes: ApplicationDocumentTypeDto[] = []; documentSources = Object.values(DOCUMENT_SOURCE); selectableParcels: { uuid: string; index: number; pid?: string }[] = []; + selectableOwners: { uuid: string; label: string }[] = []; form = new FormGroup({ name: this.name, @@ -49,17 +54,20 @@ export class DocumentUploadDialogComponent implements OnInit, OnDestroy { visibleToInternal: this.visibleToInternal, visibleToPublic: this.visibleToPublic, parcelId: this.parcelId, + ownerId: this.ownerId, }); pendingFile: File | undefined; existingFile: { name: string; size: number } | undefined; - showCertificateOfTitleWarning = false; + showSupersededWarning = false; constructor( - @Inject(MAT_DIALOG_DATA) public data: { fileId: string; existingDocument?: ApplicationDocumentDto }, + @Inject(MAT_DIALOG_DATA) + public data: { fileId: string; owners: SubmittedApplicationOwnerDto[]; existingDocument?: ApplicationDocumentDto }, protected dialog: MatDialogRef, private applicationDocumentService: ApplicationDocumentService, - private parcelService: ApplicationParcelService + private parcelService: ApplicationParcelService, + private submissionService: ApplicationSubmissionService ) {} ngOnInit(): void { @@ -71,6 +79,11 @@ export class DocumentUploadDialogComponent implements OnInit, OnDestroy { this.allowsFileEdit = document.system === DOCUMENT_SYSTEM.ALCS; if (document.type?.code === DOCUMENT_TYPE.CERTIFICATE_OF_TITLE) { this.prepareCertificateOfTitleUpload(document.uuid); + this.allowsFileEdit = false; + } + if (document.type?.code === DOCUMENT_TYPE.CORPORATE_SUMMARY) { + this.allowsFileEdit = false; + this.prepareCorporateSummaryUpload(document.uuid); } this.form.patchValue({ name: document.fileName, @@ -100,23 +113,18 @@ export class DocumentUploadDialogComponent implements OnInit, OnDestroy { visibilityFlags.push('P'); } - const parcelId = await this.parcelId.value; - - const dto = { - fileName: this.name.getRawValue()!, - source: this.source.getRawValue() as DOCUMENT_SOURCE, - typeCode: this.type.getRawValue() as DOCUMENT_TYPE, + const dto: UpdateDocumentDto = { + fileName: this.name.value!, + source: this.source.value as DOCUMENT_SOURCE, + typeCode: this.type.value as DOCUMENT_TYPE, visibilityFlags, + parcelUuid: this.parcelId.value ?? undefined, + ownerUuid: this.ownerId.value ?? undefined, }; const file = this.pendingFile; this.isSaving = true; - if (parcelId && file && this.type.value === DOCUMENT_TYPE.CERTIFICATE_OF_TITLE) { - await this.applicationDocumentService.attachCertificateOfTitle(this.data.fileId, parcelId, { - ...dto, - file, - }); - } else if (this.data.existingDocument) { + if (this.data.existingDocument) { await this.applicationDocumentService.update(this.data.existingDocument.uuid, dto); } else if (file !== undefined) { await this.applicationDocumentService.upload(this.data.fileId, { @@ -128,12 +136,6 @@ export class DocumentUploadDialogComponent implements OnInit, OnDestroy { this.isSaving = false; } - private async loadDocumentTypes() { - const docTypes = await this.applicationDocumentService.fetchTypes(); - docTypes.sort((a, b) => (a.label > b.label ? 1 : -1)); - this.documentTypes = docTypes.filter((type) => type.code !== DOCUMENT_TYPE.ORIGINAL_APPLICATION); - } - ngOnDestroy(): void { this.$destroy.next(); this.$destroy.complete(); @@ -160,7 +162,7 @@ export class DocumentUploadDialogComponent implements OnInit, OnDestroy { if (selectedParcel) { this.parcelId.setValue(selectedParcel.uuid); } else if (uuid) { - this.showCertificateOfTitleWarning = true; + this.showSupersededWarning = true; } this.selectableParcels = parcels @@ -173,6 +175,32 @@ export class DocumentUploadDialogComponent implements OnInit, OnDestroy { } } + async prepareCorporateSummaryUpload(uuid?: string) { + const submission = await this.submissionService.fetchSubmission(this.data.fileId); + if (submission.owners.length > 0) { + const owners = submission.owners; + this.ownerId.setValidators([Validators.required]); + this.ownerId.updateValueAndValidity(); + + this.visibleToInternal.setValue(true); + this.source.setValue(DOCUMENT_SOURCE.APPLICANT); + + const selectedOwner = owners.find((owner) => owner.corporateSummaryUuid === uuid); + if (selectedOwner) { + this.ownerId.setValue(selectedOwner.uuid); + } else if (uuid) { + this.showSupersededWarning = true; + } + + this.selectableOwners = owners + .filter((owner) => owner.type.code === 'ORGZ') + .map((owner, index) => ({ + label: owner.organizationName ?? owner.displayName, + uuid: owner.uuid, + })); + } + } + async onDocTypeSelected($event?: ApplicationDocumentTypeDto) { if ($event) { this.type.setValue($event.code); @@ -187,6 +215,14 @@ export class DocumentUploadDialogComponent implements OnInit, OnDestroy { this.parcelId.setValidators([]); this.parcelId.updateValueAndValidity(); } + + if (this.type.value === DOCUMENT_TYPE.CORPORATE_SUMMARY) { + await this.prepareCorporateSummaryUpload(); + } else { + this.ownerId.setValue(null); + this.ownerId.setValidators([]); + this.ownerId.updateValueAndValidity(); + } } uploadFile(event: Event) { @@ -218,4 +254,10 @@ export class DocumentUploadDialogComponent implements OnInit, OnDestroy { ); } } + + private async loadDocumentTypes() { + const docTypes = await this.applicationDocumentService.fetchTypes(); + docTypes.sort((a, b) => (a.label > b.label ? 1 : -1)); + this.documentTypes = docTypes.filter((type) => type.code !== DOCUMENT_TYPE.ORIGINAL_APPLICATION); + } } diff --git a/alcs-frontend/src/app/services/application/application-document/application-document.dto.ts b/alcs-frontend/src/app/services/application/application-document/application-document.dto.ts index f9c8d24a19..a066c871c0 100644 --- a/alcs-frontend/src/app/services/application/application-document/application-document.dto.ts +++ b/alcs-frontend/src/app/services/application/application-document/application-document.dto.ts @@ -23,6 +23,8 @@ export interface ApplicationDocumentDto { export interface UpdateDocumentDto { file?: File; + parcelUuid?: string; + ownerUuid?: string; fileName: string; typeCode: DOCUMENT_TYPE; source: DOCUMENT_SOURCE; diff --git a/alcs-frontend/src/app/services/application/application-document/application-document.service.ts b/alcs-frontend/src/app/services/application/application-document/application-document.service.ts index 639fe02829..9b413c9e46 100644 --- a/alcs-frontend/src/app/services/application/application-document/application-document.service.ts +++ b/alcs-frontend/src/app/services/application/application-document/application-document.service.ts @@ -75,13 +75,8 @@ export class ApplicationDocumentService { if (!isValidSize) { return; } + let formData = this.convertDtoToFormData(createDto); - let formData: FormData = new FormData(); - formData.append('documentType', createDto.typeCode); - formData.append('source', createDto.source); - formData.append('visibilityFlags', createDto.visibilityFlags.join(', ')); - formData.append('fileName', createDto.fileName); - formData.append('file', file, file.name); const res = await firstValueFrom(this.http.post(`${this.url}/application/${fileNumber}`, formData)); this.toastService.showSuccessToast('Review document uploaded'); return res; @@ -117,45 +112,13 @@ export class ApplicationDocumentService { return firstValueFrom(this.http.get(`${this.url}/types`)); } - async update(uuid: string, createDto: UpdateDocumentDto) { - let formData: FormData = new FormData(); - - const file = createDto.file; - if (file) { - const isValidSize = verifyFileSize(file, this.toastService); - if (!isValidSize) { - return; - } - formData.append('file', file, file.name); - } - formData.append('documentType', createDto.typeCode); - formData.append('source', createDto.source); - formData.append('visibilityFlags', createDto.visibilityFlags.join(', ')); - formData.append('fileName', createDto.fileName); + async update(uuid: string, updateDto: UpdateDocumentDto) { + let formData = this.convertDtoToFormData(updateDto); const res = await firstValueFrom(this.http.post(`${this.url}/${uuid}`, formData)); this.toastService.showSuccessToast('Review document uploaded'); return res; } - async attachCertificateOfTitle(fileNumber: string, parcelUuid: string, createDto: CreateDocumentDto) { - const file = createDto.file; - const isValidSize = verifyFileSize(file, this.toastService); - if (!isValidSize) { - return; - } - - let formData: FormData = new FormData(); - formData.append('documentType', createDto.typeCode); - formData.append('source', createDto.source); - formData.append('visibilityFlags', createDto.visibilityFlags.join(', ')); - formData.append('fileName', createDto.fileName); - formData.append('file', file, file.name); - formData.append('parcelUuid', parcelUuid); - const res = await firstValueFrom(this.http.post(`${this.url}/application/${fileNumber}/CERT`, formData)); - this.toastService.showSuccessToast('Review document uploaded'); - return res; - } - async updateSort(sortOrder: { uuid: string; order: number }[]) { try { await firstValueFrom(this.http.post(`${this.url}/sort`, sortOrder)); @@ -163,4 +126,22 @@ export class ApplicationDocumentService { this.toastService.showErrorToast(`Failed to save document order`); } } + + private convertDtoToFormData(dto: UpdateDocumentDto) { + let formData: FormData = new FormData(); + formData.append('documentType', dto.typeCode); + formData.append('source', dto.source); + formData.append('visibilityFlags', dto.visibilityFlags.join(', ')); + formData.append('fileName', dto.fileName); + if (dto.file) { + formData.append('file', dto.file, dto.file.name); + } + if (dto.parcelUuid) { + formData.append('parcelUuid', dto.parcelUuid); + } + if (dto.ownerUuid) { + formData.append('ownerUuid', dto.ownerUuid); + } + return formData; + } } diff --git a/alcs-frontend/src/app/services/application/application.dto.ts b/alcs-frontend/src/app/services/application/application.dto.ts index 0ef7b869ba..ae28139a65 100644 --- a/alcs-frontend/src/app/services/application/application.dto.ts +++ b/alcs-frontend/src/app/services/application/application.dto.ts @@ -60,6 +60,7 @@ export interface ApplicationReviewDto { } export interface SubmittedApplicationOwnerDto { + uuid: string; displayName: string; firstName: string; lastName: string; @@ -67,17 +68,7 @@ export interface SubmittedApplicationOwnerDto { phoneNumber: string; email: string; type: BaseCodeDto; - corporateSummaryDocumentUuid?: string; -} - -export interface ApplicationParcelDocumentDto { - type: string; - uuid: string; - fileName: string; - fileSize: number; - uploadedBy?: string; - uploadedAt: number; - documentUuid: string; + corporateSummaryUuid?: string; } export interface ApplicationParcelDto { diff --git a/portal-frontend/src/app/features/application-details/application-details.component.html b/portal-frontend/src/app/features/application-details/application-details.component.html index f779cfbfd2..67d73bab7c 100644 --- a/portal-frontend/src/app/features/application-details/application-details.component.html +++ b/portal-frontend/src/app/features/application-details/application-details.component.html @@ -19,7 +19,7 @@

3. Primary Contact

- + Changes made to this section will not be flagged as - ensure accuracy before saving. diff --git a/services/apps/alcs/src/alcs/application/application-document/application-document.controller.spec.ts b/services/apps/alcs/src/alcs/application/application-document/application-document.controller.spec.ts index 27ac43c374..6a12aa5a95 100644 --- a/services/apps/alcs/src/alcs/application/application-document/application-document.controller.spec.ts +++ b/services/apps/alcs/src/alcs/application/application-document/application-document.controller.spec.ts @@ -7,7 +7,12 @@ import { ClsService } from 'nestjs-cls'; import { mockKeyCloakProviders } from '../../../../test/mocks/mockTypes'; import { ApplicationProfile } from '../../../common/automapper/application.automapper.profile'; import { DOCUMENT_SOURCE } from '../../../document/document.dto'; +import { Document } from '../../../document/document.entity'; +import { ApplicationOwner } from '../../../portal/application-submission/application-owner/application-owner.entity'; +import { ApplicationOwnerService } from '../../../portal/application-submission/application-owner/application-owner.service'; +import { ApplicationParcel } from '../../../portal/application-submission/application-parcel/application-parcel.entity'; import { ApplicationParcelService } from '../../../portal/application-submission/application-parcel/application-parcel.service'; +import { User } from '../../../user/user.entity'; import { CodeService } from '../../code/code.service'; import { DOCUMENT_TYPE } from './application-document-code.entity'; import { ApplicationDocumentController } from './application-document.controller'; @@ -18,18 +23,20 @@ describe('ApplicationDocumentController', () => { let controller: ApplicationDocumentController; let appDocumentService: DeepMocked; let mockParcelService: DeepMocked; + let mockOwnerService: DeepMocked; - const mockDocument = { - document: { + const mockDocument = new ApplicationDocument({ + document: new Document({ mimeType: 'mimeType', - uploadedBy: {}, + uploadedBy: new User(), uploadedAt: new Date(), - }, - } as ApplicationDocument; + }), + }); beforeEach(async () => { appDocumentService = createMock(); mockParcelService = createMock(); + mockOwnerService = createMock(); const module: TestingModule = await Test.createTestingModule({ imports: [ @@ -52,6 +59,10 @@ describe('ApplicationDocumentController', () => { provide: ApplicationParcelService, useValue: mockParcelService, }, + { + provide: ApplicationOwnerService, + useValue: mockOwnerService, + }, { provide: ClsService, useValue: {}, @@ -196,4 +207,104 @@ describe('ApplicationDocumentController', () => { expect(appDocumentService.setSorting).toHaveBeenCalledTimes(1); }); + + it('should set the certificate of title on the supplied parcel', async () => { + const mockFile = {}; + const mockUser = {}; + + appDocumentService.attachDocument.mockResolvedValue( + new ApplicationDocument({ + ...mockDocument, + typeCode: DOCUMENT_TYPE.CERTIFICATE_OF_TITLE, + }), + ); + mockParcelService.getOneOrFail.mockResolvedValue(new ApplicationParcel()); + mockParcelService.setCertificateOfTitle.mockResolvedValue( + new ApplicationParcel(), + ); + + const res = await controller.attachDocument('fileNumber', { + isMultipart: () => true, + body: { + documentType: { + value: DOCUMENT_TYPE.CERTIFICATE_OF_TITLE, + }, + fileName: { + value: 'file', + }, + source: { + value: DOCUMENT_SOURCE.APPLICANT, + }, + visibilityFlags: { + value: '', + }, + parcelUuid: { + value: 'parcel-uuid', + }, + file: mockFile, + }, + user: { + entity: mockUser, + }, + }); + + expect(res.mimeType).toEqual(mockDocument.document.mimeType); + + expect(appDocumentService.attachDocument).toHaveBeenCalledTimes(1); + const callData = appDocumentService.attachDocument.mock.calls[0][0]; + expect(callData.fileName).toEqual('file'); + expect(callData.file).toEqual(mockFile); + expect(callData.user).toEqual(mockUser); + expect(mockParcelService.getOneOrFail).toHaveBeenCalledTimes(1); + expect(mockParcelService.setCertificateOfTitle).toHaveBeenCalledTimes(1); + }); + + it('should set the corporate summary on the supplied owner', async () => { + const mockFile = {}; + const mockUser = {}; + + appDocumentService.attachDocument.mockResolvedValue( + new ApplicationDocument({ + ...mockDocument, + typeCode: DOCUMENT_TYPE.CORPORATE_SUMMARY, + }), + ); + mockOwnerService.getOwner.mockResolvedValue(new ApplicationOwner()); + mockOwnerService.save.mockResolvedValue(); + + const res = await controller.attachDocument('fileNumber', { + isMultipart: () => true, + body: { + documentType: { + value: DOCUMENT_TYPE.CORPORATE_SUMMARY, + }, + fileName: { + value: 'file', + }, + source: { + value: DOCUMENT_SOURCE.APPLICANT, + }, + visibilityFlags: { + value: '', + }, + ownerUuid: { + value: 'parcel-uuid', + }, + file: mockFile, + }, + user: { + entity: mockUser, + }, + }); + + expect(res.mimeType).toEqual(mockDocument.document.mimeType); + + expect(appDocumentService.attachDocument).toHaveBeenCalledTimes(1); + const callData = appDocumentService.attachDocument.mock.calls[0][0]; + expect(callData.fileName).toEqual('file'); + expect(callData.file).toEqual(mockFile); + expect(callData.user).toEqual(mockUser); + expect(mockOwnerService.getOwner).toHaveBeenCalledTimes(1); + expect(mockOwnerService.save).toHaveBeenCalledTimes(1); + }); }); diff --git a/services/apps/alcs/src/alcs/application/application-document/application-document.controller.ts b/services/apps/alcs/src/alcs/application/application-document/application-document.controller.ts index 24cb516c41..ebd49f02d3 100644 --- a/services/apps/alcs/src/alcs/application/application-document/application-document.controller.ts +++ b/services/apps/alcs/src/alcs/application/application-document/application-document.controller.ts @@ -20,6 +20,7 @@ import { DOCUMENT_SOURCE, DOCUMENT_SYSTEM, } from '../../../document/document.dto'; +import { ApplicationOwnerService } from '../../../portal/application-submission/application-owner/application-owner.service'; import { ApplicationParcelService } from '../../../portal/application-submission/application-parcel/application-parcel.service'; import { ApplicationDocumentCode, @@ -42,6 +43,7 @@ export class ApplicationDocumentController { constructor( private applicationDocumentService: ApplicationDocumentService, private parcelService: ApplicationParcelService, + private ownerService: ApplicationOwnerService, @InjectMapper() private mapper: Mapper, ) {} @@ -67,49 +69,23 @@ export class ApplicationDocumentController { if (!req.isMultipart()) { throw new BadRequestException('Request is not multipart'); } - const savedDocument = await this.saveUploadedFile(req, fileNumber); - - return this.mapper.map( - savedDocument, - ApplicationDocument, - ApplicationDocumentDto, - ); - } - - @Post('/application/:fileNumber/CERT') - @UserRoles(...ANY_AUTH_ROLE) - async attachCertificateOfTitle( - @Param('fileNumber') fileNumber: string, - @Req() req, - ): Promise { - if (!req.isMultipart()) { - throw new BadRequestException('Request is not multipart'); - } - - const parcelUuid = req.body.parcelUuid.value; - if (!parcelUuid) { - throw new BadRequestException('Request is missing parcel uuid'); - } const savedDocument = await this.saveUploadedFile(req, fileNumber); - const parcel = await this.parcelService.getOneOrFail(parcelUuid); - if (parcel) { - if (parcel.certificateOfTitleUuid) { - const document = await this.applicationDocumentService.get( - parcel.certificateOfTitleUuid, - ); - await this.applicationDocumentService.update({ - uuid: document.uuid, - fileName: `${document.document.fileName}_superseded`, - source: document.document.source as DOCUMENT_SOURCE, - visibilityFlags: [], - documentType: document.type!.code as DOCUMENT_TYPE, - user: document.document.uploadedBy!, - }); - } + const parcelUuid = req.body.parcelUuid?.value as string | undefined; + if ( + parcelUuid && + savedDocument.typeCode === DOCUMENT_TYPE.CERTIFICATE_OF_TITLE + ) { + await this.handleCertificateOfTitleUpdates(parcelUuid, savedDocument); + } - await this.parcelService.setCertificateOfTitle(parcel, savedDocument); + const ownerUuid = req.body.ownerUuid?.value as string | undefined; + if ( + ownerUuid && + savedDocument.typeCode === DOCUMENT_TYPE.CORPORATE_SUMMARY + ) { + await this.handleCorporateSummaryUpdates(ownerUuid, savedDocument); } return this.mapper.map( @@ -145,6 +121,22 @@ export class ApplicationDocumentController { user: req.user.entity, }); + const parcelUuid = req.body.parcelUuid?.value as string | undefined; + if ( + parcelUuid && + savedDocument.typeCode === DOCUMENT_TYPE.CERTIFICATE_OF_TITLE + ) { + await this.handleCertificateOfTitleUpdates(parcelUuid, savedDocument); + } + + const ownerUuid = req.body.ownerUuid?.value as string | undefined; + if ( + ownerUuid && + savedDocument.typeCode === DOCUMENT_TYPE.CORPORATE_SUMMARY + ) { + await this.handleCorporateSummaryUpdates(ownerUuid, savedDocument); + } + return this.mapper.map( savedDocument, ApplicationDocument, @@ -249,6 +241,61 @@ export class ApplicationDocumentController { await this.applicationDocumentService.setSorting(data); } + private async handleCertificateOfTitleUpdates( + parcelUuid: string, + savedDocument: ApplicationDocument, + ) { + const parcel = await this.parcelService.getOneOrFail(parcelUuid); + if (parcel) { + if ( + parcel.certificateOfTitleUuid && + parcel.certificateOfTitleUuid !== savedDocument.uuid + ) { + const document = await this.applicationDocumentService.get( + parcel.certificateOfTitleUuid, + ); + await this.applicationDocumentService.update({ + uuid: document.uuid, + fileName: `${document.document.fileName}_superseded`, + source: document.document.source as DOCUMENT_SOURCE, + visibilityFlags: [], + documentType: document.type!.code as DOCUMENT_TYPE, + user: document.document.uploadedBy!, + }); + } + + await this.parcelService.setCertificateOfTitle(parcel, savedDocument); + } + } + + private async handleCorporateSummaryUpdates( + ownerUuid: string, + savedDocument: ApplicationDocument, + ) { + const owner = await this.ownerService.getOwner(ownerUuid); + if (owner) { + if ( + owner.corporateSummaryUuid && + owner.corporateSummaryUuid !== savedDocument.uuid + ) { + const document = await this.applicationDocumentService.get( + owner.corporateSummaryUuid, + ); + await this.applicationDocumentService.update({ + uuid: document.uuid, + fileName: `${document.document.fileName}_superseded`, + source: document.document.source as DOCUMENT_SOURCE, + visibilityFlags: [], + documentType: document.type!.code as DOCUMENT_TYPE, + user: document.document.uploadedBy!, + }); + } + + owner.corporateSummary = savedDocument; + await this.ownerService.save(owner); + } + } + private async saveUploadedFile(req, fileNumber: string) { const documentType = req.body.documentType.value as DOCUMENT_TYPE; const file = req.body.file; diff --git a/services/apps/alcs/src/alcs/application/application-document/application-document.service.ts b/services/apps/alcs/src/alcs/application/application-document/application-document.service.ts index a271a6df08..fce35a5e9e 100644 --- a/services/apps/alcs/src/alcs/application/application-document/application-document.service.ts +++ b/services/apps/alcs/src/alcs/application/application-document/application-document.service.ts @@ -297,7 +297,7 @@ export class ApplicationDocumentService { appDocument.type = undefined; appDocument.typeCode = documentType; appDocument.visibilityFlags = visibilityFlags; - await this.applicationDocumentRepository.save(appDocument); + return await this.applicationDocumentRepository.save(appDocument); } async setSorting(data: { uuid: string; order: number }[]) { diff --git a/services/apps/alcs/src/portal/application-submission-draft/application-submission-draft.service.ts b/services/apps/alcs/src/portal/application-submission-draft/application-submission-draft.service.ts index 668aa10959..84830f932e 100644 --- a/services/apps/alcs/src/portal/application-submission-draft/application-submission-draft.service.ts +++ b/services/apps/alcs/src/portal/application-submission-draft/application-submission-draft.service.ts @@ -40,6 +40,7 @@ export class ApplicationSubmissionDraftService { isDraft: true, }, relations: { + naruSubtype: true, owners: { type: true, corporateSummary: { @@ -61,6 +62,7 @@ export class ApplicationSubmissionDraftService { isDraft: false, }, relations: { + naruSubtype: true, status: true, owners: { type: true, diff --git a/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.dto.ts b/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.dto.ts index 35440043f4..09d3377c24 100644 --- a/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.dto.ts +++ b/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.dto.ts @@ -28,6 +28,9 @@ export class ApplicationOwnerDto { @AutoMap() applicationSubmissionUuid: string; + @AutoMap(() => String) + corporateSummaryUuid?: string; + displayName: string; @AutoMap(() => String) @@ -78,7 +81,8 @@ export class ApplicationOwnerUpdateDto { email?: string; @IsString() - typeCode: string; + @IsOptional() + typeCode?: string; @IsUUID() @IsOptional() diff --git a/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.service.spec.ts b/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.service.spec.ts index b2d89351c9..48ef867b65 100644 --- a/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.service.spec.ts +++ b/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.service.spec.ts @@ -202,6 +202,14 @@ describe('ApplicationOwnerService', () => { expect(mockRepo.find).toHaveBeenCalledTimes(1); }); + it('should call through for save', async () => { + mockRepo.save.mockResolvedValue(new ApplicationOwner()); + + await service.save(new ApplicationOwner()); + + expect(mockRepo.save).toHaveBeenCalledTimes(1); + }); + it('should call update for the application with the first parcels last name', async () => { mockRepo.find.mockResolvedValue([new ApplicationOwner()]); const owners = [ diff --git a/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.service.ts b/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.service.ts index c0a7741af0..b46252a209 100644 --- a/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.service.ts +++ b/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.service.ts @@ -28,22 +28,6 @@ export class ApplicationOwnerService { private applicationDocumentService: ApplicationDocumentService, ) {} - async fetchBySubmissionUuid(uuid: string) { - return this.repository.find({ - where: { - applicationSubmission: { - uuid, - }, - }, - relations: { - type: true, - corporateSummary: { - document: true, - }, - }, - }); - } - async fetchByApplicationFileId(fileId: string) { return this.repository.find({ where: { @@ -104,6 +88,10 @@ export class ApplicationOwnerService { await this.repository.save(existingOwner); } + async save(owner: ApplicationOwner) { + await this.repository.save(owner); + } + async removeFromParcel(uuid: string, parcelUuid: string) { const existingOwner = await this.repository.findOneOrFail({ where: { diff --git a/services/apps/alcs/src/portal/pdf-generation/generate-submission-document.service.spec.ts b/services/apps/alcs/src/portal/pdf-generation/generate-submission-document.service.spec.ts index 727de053fc..f3c5c0dcc9 100644 --- a/services/apps/alcs/src/portal/pdf-generation/generate-submission-document.service.spec.ts +++ b/services/apps/alcs/src/portal/pdf-generation/generate-submission-document.service.spec.ts @@ -194,7 +194,9 @@ describe('GenerateSubmissionDocumentService', () => { const userEntity = new User({ name: user.user.entity, }); - mockApplicationDocumentService.update.mockResolvedValue(); + mockApplicationDocumentService.update.mockResolvedValue( + new ApplicationDocument(), + ); mockApplicationDocumentService.attachDocumentAsBuffer.mockResolvedValue( new ApplicationDocument(), ); From 5b8b94adec40b8e5d6339a54503a07a2d409a1d3 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Wed, 28 Jun 2023 11:42:52 -0700 Subject: [PATCH 025/954] Only show Active Decision Makers for V2 Decision --- .../application-decision/application-decision-v2.service.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service.ts index 037f544887..f6080377f8 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service.ts @@ -672,6 +672,9 @@ export class ApplicationDecisionV2Service { order: { label: 'ASC', }, + where: { + isActive: true, + }, }), this.ceoCriterionRepository.find({ order: { From 61d32bd754b3bd86c4396338531d4cd73792bada Mon Sep 17 00:00:00 2001 From: Liam Stoddard Date: Wed, 28 Jun 2023 13:55:19 -0700 Subject: [PATCH 026/954] bugfix to use uuid instead of name go brrr --- .../typeorm/migrations/1687557623816-local_gov_name_edits.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1687557623816-local_gov_name_edits.ts b/services/apps/alcs/src/providers/typeorm/migrations/1687557623816-local_gov_name_edits.ts index b25bf01a1f..f56b282fa8 100644 --- a/services/apps/alcs/src/providers/typeorm/migrations/1687557623816-local_gov_name_edits.ts +++ b/services/apps/alcs/src/providers/typeorm/migrations/1687557623816-local_gov_name_edits.ts @@ -5,7 +5,7 @@ export class localGovNameEdits1687557623816 implements MigrationInterface { public async up(queryRunner: QueryRunner): Promise { await queryRunner.query(` UPDATE "alcs"."application_local_government" SET "name" = 'Village of Masset' WHERE "name" = 'Village of Massett'; - DELETE FROM alcs.application_local_government WHERE name = 'Northern Rockies Regional Municipality'; + DELETE FROM alcs.application_local_government WHERE uuid = '33aa1f7d-3b65-4ed5-badf-11dafb0b2789'; `); } From 7deeb998f281e77c035ce1e34a2d34fb5d63def9 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Wed, 28 Jun 2023 14:47:06 -0700 Subject: [PATCH 027/954] Maintain extension when adding superseded * DRY Up code more --- .../application-document.controller.ts | 38 ++++++++----------- 1 file changed, 16 insertions(+), 22 deletions(-) diff --git a/services/apps/alcs/src/alcs/application/application-document/application-document.controller.ts b/services/apps/alcs/src/alcs/application/application-document/application-document.controller.ts index ebd49f02d3..da36e57475 100644 --- a/services/apps/alcs/src/alcs/application/application-document/application-document.controller.ts +++ b/services/apps/alcs/src/alcs/application/application-document/application-document.controller.ts @@ -13,6 +13,7 @@ import { } from '@nestjs/common'; import { ApiOAuth2 } from '@nestjs/swagger'; import * as config from 'config'; +import * as path from 'path'; import { ANY_AUTH_ROLE } from '../../../common/authorization/roles'; import { RolesGuard } from '../../../common/authorization/roles-guard.service'; import { UserRoles } from '../../../common/authorization/roles.decorator'; @@ -251,23 +252,26 @@ export class ApplicationDocumentController { parcel.certificateOfTitleUuid && parcel.certificateOfTitleUuid !== savedDocument.uuid ) { - const document = await this.applicationDocumentService.get( - parcel.certificateOfTitleUuid, - ); - await this.applicationDocumentService.update({ - uuid: document.uuid, - fileName: `${document.document.fileName}_superseded`, - source: document.document.source as DOCUMENT_SOURCE, - visibilityFlags: [], - documentType: document.type!.code as DOCUMENT_TYPE, - user: document.document.uploadedBy!, - }); + await this.supersedeDocument(parcel.certificateOfTitleUuid); } await this.parcelService.setCertificateOfTitle(parcel, savedDocument); } } + private async supersedeDocument(documentUuid: string) { + const document = await this.applicationDocumentService.get(documentUuid); + const parsedFileName = path.parse(document.document.fileName); + await this.applicationDocumentService.update({ + uuid: document.uuid, + fileName: `${parsedFileName.name}_superseded${parsedFileName.ext}`, + source: document.document.source as DOCUMENT_SOURCE, + visibilityFlags: [], + documentType: document.type!.code as DOCUMENT_TYPE, + user: document.document.uploadedBy!, + }); + } + private async handleCorporateSummaryUpdates( ownerUuid: string, savedDocument: ApplicationDocument, @@ -278,17 +282,7 @@ export class ApplicationDocumentController { owner.corporateSummaryUuid && owner.corporateSummaryUuid !== savedDocument.uuid ) { - const document = await this.applicationDocumentService.get( - owner.corporateSummaryUuid, - ); - await this.applicationDocumentService.update({ - uuid: document.uuid, - fileName: `${document.document.fileName}_superseded`, - source: document.document.source as DOCUMENT_SOURCE, - visibilityFlags: [], - documentType: document.type!.code as DOCUMENT_TYPE, - user: document.document.uploadedBy!, - }); + await this.supersedeDocument(owner.corporateSummaryUuid); } owner.corporateSummary = savedDocument; From 162dfc9e06a54efa664ea966624b4b6fbf4367a4 Mon Sep 17 00:00:00 2001 From: Liam Stoddard Date: Wed, 28 Jun 2023 15:22:44 -0700 Subject: [PATCH 028/954] updating uuid from to be deleted local gov uuid --- .../typeorm/migrations/1687557623816-local_gov_name_edits.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1687557623816-local_gov_name_edits.ts b/services/apps/alcs/src/providers/typeorm/migrations/1687557623816-local_gov_name_edits.ts index f56b282fa8..fb4d194d28 100644 --- a/services/apps/alcs/src/providers/typeorm/migrations/1687557623816-local_gov_name_edits.ts +++ b/services/apps/alcs/src/providers/typeorm/migrations/1687557623816-local_gov_name_edits.ts @@ -5,9 +5,10 @@ export class localGovNameEdits1687557623816 implements MigrationInterface { public async up(queryRunner: QueryRunner): Promise { await queryRunner.query(` UPDATE "alcs"."application_local_government" SET "name" = 'Village of Masset' WHERE "name" = 'Village of Massett'; + UPDATE "alcs"."application" SET "local_government_uuid" = '92961db6-b74c-460b-bbad-e285398fa491' WHERE "local_government_uuid" = '33aa1f7d-3b65-4ed5-badf-11dafb0b2789'; + UPDATE "alcs"."notice_of_intent" SET "local_government_uuid" = '92961db6-b74c-460b-bbad-e285398fa491' WHERE "local_government_uuid" = '33aa1f7d-3b65-4ed5-badf-11dafb0b2789'; DELETE FROM alcs.application_local_government WHERE uuid = '33aa1f7d-3b65-4ed5-badf-11dafb0b2789'; `); - } public async down(queryRunner: QueryRunner): Promise { From 9f78019678d9b3ed9efed201f4788e811831d778 Mon Sep 17 00:00:00 2001 From: Liam Stoddard Date: Wed, 28 Jun 2023 15:39:16 -0700 Subject: [PATCH 029/954] uuids were reversed, added support for covenants and planning review --- .../migrations/1687557623816-local_gov_name_edits.ts | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1687557623816-local_gov_name_edits.ts b/services/apps/alcs/src/providers/typeorm/migrations/1687557623816-local_gov_name_edits.ts index fb4d194d28..a2c3ddc0b5 100644 --- a/services/apps/alcs/src/providers/typeorm/migrations/1687557623816-local_gov_name_edits.ts +++ b/services/apps/alcs/src/providers/typeorm/migrations/1687557623816-local_gov_name_edits.ts @@ -5,9 +5,11 @@ export class localGovNameEdits1687557623816 implements MigrationInterface { public async up(queryRunner: QueryRunner): Promise { await queryRunner.query(` UPDATE "alcs"."application_local_government" SET "name" = 'Village of Masset' WHERE "name" = 'Village of Massett'; - UPDATE "alcs"."application" SET "local_government_uuid" = '92961db6-b74c-460b-bbad-e285398fa491' WHERE "local_government_uuid" = '33aa1f7d-3b65-4ed5-badf-11dafb0b2789'; - UPDATE "alcs"."notice_of_intent" SET "local_government_uuid" = '92961db6-b74c-460b-bbad-e285398fa491' WHERE "local_government_uuid" = '33aa1f7d-3b65-4ed5-badf-11dafb0b2789'; - DELETE FROM alcs.application_local_government WHERE uuid = '33aa1f7d-3b65-4ed5-badf-11dafb0b2789'; + UPDATE "alcs"."application" SET "local_government_uuid" = '33aa1f7d-3b65-4ed5-badf-11dafb0b2789' WHERE "local_government_uuid" = '92961db6-b74c-460b-bbad-e285398fa491'; + UPDATE "alcs"."notice_of_intent" SET "local_government_uuid" = '33aa1f7d-3b65-4ed5-badf-11dafb0b2789' WHERE "local_government_uuid" = '92961db6-b74c-460b-bbad-e285398fa491'; + UPDATE "alcs"."planning_review" SET "local_government_uuid" = '33aa1f7d-3b65-4ed5-badf-11dafb0b2789' WHERE "local_government_uuid" = '92961db6-b74c-460b-bbad-e285398fa491'; + UPDATE "alcs"."covenant" SET "local_government_uuid" = '33aa1f7d-3b65-4ed5-badf-11dafb0b2789' WHERE "local_government_uuid" = '92961db6-b74c-460b-bbad-e285398fa491'; + DELETE FROM alcs.application_local_government WHERE uuid = '92961db6-b74c-460b-bbad-e285398fa491'; `); } From a076d150816a2de0197047d6136fea4621f2b394 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Wed, 28 Jun 2023 16:00:52 -0700 Subject: [PATCH 030/954] Add Decision Condition Types to Admin --- .../app/features/admin/admin.component.html | 4 +- .../src/app/features/admin/admin.component.ts | 7 + .../src/app/features/admin/admin.module.ts | 4 + ...sion-condition-types-dialog.component.html | 52 ++++++ ...sion-condition-types-dialog.component.scss | 19 +++ ...n-condition-types-dialog.component.spec.ts | 37 +++++ ...cision-condition-types-dialog.component.ts | 49 ++++++ .../decision-condition-types.component.html | 35 ++++ .../decision-condition-types.component.scss | 9 + ...decision-condition-types.component.spec.ts | 53 ++++++ .../decision-condition-types.component.ts | 73 +++++++++ .../decision-condition-types.service.spec.ts | 154 ++++++++++++++++++ .../decision-condition-types.service.ts | 57 +++++++ .../apps/alcs/src/alcs/admin/admin.module.ts | 6 + ...ecision-condition-types.controller.spec.ts | 77 +++++++++ ...ion-decision-condition-types.controller.ts | 51 ++++++ ...cation-decision-condition-types.service.ts | 53 ++++++ ...application-decision-maker.service.spec.ts | 84 ++++++++++ 18 files changed, 822 insertions(+), 2 deletions(-) create mode 100644 alcs-frontend/src/app/features/admin/decision-condition-types/decision-condition-types-dialog/decision-condition-types-dialog.component.html create mode 100644 alcs-frontend/src/app/features/admin/decision-condition-types/decision-condition-types-dialog/decision-condition-types-dialog.component.scss create mode 100644 alcs-frontend/src/app/features/admin/decision-condition-types/decision-condition-types-dialog/decision-condition-types-dialog.component.spec.ts create mode 100644 alcs-frontend/src/app/features/admin/decision-condition-types/decision-condition-types-dialog/decision-condition-types-dialog.component.ts create mode 100644 alcs-frontend/src/app/features/admin/decision-condition-types/decision-condition-types.component.html create mode 100644 alcs-frontend/src/app/features/admin/decision-condition-types/decision-condition-types.component.scss create mode 100644 alcs-frontend/src/app/features/admin/decision-condition-types/decision-condition-types.component.spec.ts create mode 100644 alcs-frontend/src/app/features/admin/decision-condition-types/decision-condition-types.component.ts create mode 100644 alcs-frontend/src/app/services/decision-condition-types/decision-condition-types.service.spec.ts create mode 100644 alcs-frontend/src/app/services/decision-condition-types/decision-condition-types.service.ts create mode 100644 services/apps/alcs/src/alcs/admin/application-decision-condition-types/application-decision-condition-types.controller.spec.ts create mode 100644 services/apps/alcs/src/alcs/admin/application-decision-condition-types/application-decision-condition-types.controller.ts create mode 100644 services/apps/alcs/src/alcs/admin/application-decision-condition-types/application-decision-condition-types.service.ts create mode 100644 services/apps/alcs/src/alcs/admin/application-decision-condition-types/application-decision-maker.service.spec.ts diff --git a/alcs-frontend/src/app/features/admin/admin.component.html b/alcs-frontend/src/app/features/admin/admin.component.html index d7a3ed3394..741584d64b 100644 --- a/alcs-frontend/src/app/features/admin/admin.component.html +++ b/alcs-frontend/src/app/features/admin/admin.component.html @@ -9,8 +9,8 @@ [routerLinkActiveOptions]="{ exact: true }" class="nav-item" > - {{ route.icon }} - {{ route.menuTitle }} + {{ route.icon }}{{ route.menuTitle }}
diff --git a/alcs-frontend/src/app/features/admin/admin.component.ts b/alcs-frontend/src/app/features/admin/admin.component.ts index 6ab5aaa76b..66886e92c0 100644 --- a/alcs-frontend/src/app/features/admin/admin.component.ts +++ b/alcs-frontend/src/app/features/admin/admin.component.ts @@ -1,6 +1,7 @@ import { Component } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { CeoCriterionComponent } from './ceo-criterion/ceo-criterion.component'; +import { DecisionConditionTypesComponent } from './decision-condition-types/decision-condition-types.component'; import { DecisionMakerComponent } from './decision-maker/decision-maker.component'; import { HolidayComponent } from './holiday/holiday.component'; import { LocalGovernmentComponent } from './local-government/local-government.component'; @@ -32,6 +33,12 @@ export const childRoutes = [ icon: 'coffee_maker', component: DecisionMakerComponent, }, + { + path: 'dct', + menuTitle: 'Decision Condition Types', + icon: 'hvac', + component: DecisionConditionTypesComponent, + }, { path: 'noi', menuTitle: 'NOI Subtypes', diff --git a/alcs-frontend/src/app/features/admin/admin.module.ts b/alcs-frontend/src/app/features/admin/admin.module.ts index 4ff51a3e61..127a80f3d0 100644 --- a/alcs-frontend/src/app/features/admin/admin.module.ts +++ b/alcs-frontend/src/app/features/admin/admin.module.ts @@ -6,6 +6,8 @@ import { SharedModule } from '../../shared/shared.module'; import { AdminComponent, childRoutes } from './admin.component'; import { CeoCriterionDialogComponent } from './ceo-criterion/ceo-criterion-dialog/ceo-criterion-dialog.component'; import { CeoCriterionComponent } from './ceo-criterion/ceo-criterion.component'; +import { DecisionConditionTypesDialogComponent } from './decision-condition-types/decision-condition-types-dialog/decision-condition-types-dialog.component'; +import { DecisionConditionTypesComponent } from './decision-condition-types/decision-condition-types.component'; import { DecisionMakerDialogComponent } from './decision-maker/decision-maker-dialog/decision-maker-dialog.component'; import { DecisionMakerComponent } from './decision-maker/decision-maker.component'; import { HolidayDialogComponent } from './holiday/holiday-dialog/holiday-dialog.component'; @@ -37,6 +39,8 @@ const routes: Routes = [ UnarchiveComponent, DecisionMakerComponent, DecisionMakerDialogComponent, + DecisionConditionTypesComponent, + DecisionConditionTypesDialogComponent, ], imports: [CommonModule, SharedModule.forRoot(), RouterModule.forChild(routes), MatPaginatorModule], }) diff --git a/alcs-frontend/src/app/features/admin/decision-condition-types/decision-condition-types-dialog/decision-condition-types-dialog.component.html b/alcs-frontend/src/app/features/admin/decision-condition-types/decision-condition-types-dialog/decision-condition-types-dialog.component.html new file mode 100644 index 0000000000..29d89237fb --- /dev/null +++ b/alcs-frontend/src/app/features/admin/decision-condition-types/decision-condition-types-dialog/decision-condition-types-dialog.component.html @@ -0,0 +1,52 @@ +
+

{{ isEdit ? 'Edit' : 'Create' }} Decision Condition Type

+
+
+ +
+ + Code + + +
+ +
+ + Label + + +
+ +
+ + Description + + +
+ + + +
+ + +
+ +
diff --git a/alcs-frontend/src/app/features/admin/decision-condition-types/decision-condition-types-dialog/decision-condition-types-dialog.component.scss b/alcs-frontend/src/app/features/admin/decision-condition-types/decision-condition-types-dialog/decision-condition-types-dialog.component.scss new file mode 100644 index 0000000000..d42a3e2513 --- /dev/null +++ b/alcs-frontend/src/app/features/admin/decision-condition-types/decision-condition-types-dialog/decision-condition-types-dialog.component.scss @@ -0,0 +1,19 @@ +.dialog { + padding: 24px; + + form { + display: grid; + grid-template-columns: 1fr 1fr; + row-gap: 24px; + column-gap: 24px; + margin-bottom: 12px; + + .full-width { + grid-column: 1/3; + } + + .mat-mdc-form-field { + width: 100%; + } + } +} diff --git a/alcs-frontend/src/app/features/admin/decision-condition-types/decision-condition-types-dialog/decision-condition-types-dialog.component.spec.ts b/alcs-frontend/src/app/features/admin/decision-condition-types/decision-condition-types-dialog/decision-condition-types-dialog.component.spec.ts new file mode 100644 index 0000000000..f27ef9c36f --- /dev/null +++ b/alcs-frontend/src/app/features/admin/decision-condition-types/decision-condition-types-dialog/decision-condition-types-dialog.component.spec.ts @@ -0,0 +1,37 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { FormsModule, ReactiveFormsModule } from '@angular/forms'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; +import { CeoCriterionService } from '../../../../services/ceo-criterion/ceo-criterion.service'; +import { DecisionConditionTypesService } from '../../../../services/decision-condition-types/decision-condition-types.service'; + +import { DecisionConditionTypesDialogComponent } from './decision-condition-types-dialog.component'; + +describe('DecisionConditionTypesDialogComponent', () => { + let component: DecisionConditionTypesDialogComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [ReactiveFormsModule, FormsModule], + declarations: [DecisionConditionTypesDialogComponent], + providers: [ + { provide: MAT_DIALOG_DATA, useValue: undefined }, + { provide: MatDialogRef, useValue: {} }, + { + provide: DecisionConditionTypesService, + useValue: {}, + }, + ], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(DecisionConditionTypesDialogComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/alcs-frontend/src/app/features/admin/decision-condition-types/decision-condition-types-dialog/decision-condition-types-dialog.component.ts b/alcs-frontend/src/app/features/admin/decision-condition-types/decision-condition-types-dialog/decision-condition-types-dialog.component.ts new file mode 100644 index 0000000000..8cb9bdd4fd --- /dev/null +++ b/alcs-frontend/src/app/features/admin/decision-condition-types/decision-condition-types-dialog/decision-condition-types-dialog.component.ts @@ -0,0 +1,49 @@ +import { Component, Inject } from '@angular/core'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; +import { ApplicationDecisionConditionTypeDto } from '../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; +import { DecisionConditionTypesService } from '../../../../services/decision-condition-types/decision-condition-types.service'; + +@Component({ + selector: 'app-decision-condition-types-dialog', + templateUrl: './decision-condition-types-dialog.component.html', + styleUrls: ['./decision-condition-types-dialog.component.scss'], +}) +export class DecisionConditionTypesDialogComponent { + description = ''; + label = ''; + code = ''; + + isLoading = false; + isEdit = false; + + constructor( + @Inject(MAT_DIALOG_DATA) public data: ApplicationDecisionConditionTypeDto | undefined, + private dialogRef: MatDialogRef, + private decisionConditionTypesService: DecisionConditionTypesService + ) { + if (data) { + this.description = data.description; + this.label = data.label; + this.code = data.code; + } + this.isEdit = !!data; + } + + async onSubmit() { + this.isLoading = true; + + const dto = { + code: this.code, + label: this.label, + description: this.description, + }; + + if (this.isEdit) { + await this.decisionConditionTypesService.update(this.code, dto); + } else { + await this.decisionConditionTypesService.create(dto); + } + this.isLoading = false; + this.dialogRef.close(true); + } +} diff --git a/alcs-frontend/src/app/features/admin/decision-condition-types/decision-condition-types.component.html b/alcs-frontend/src/app/features/admin/decision-condition-types/decision-condition-types.component.html new file mode 100644 index 0000000000..914e76f0e5 --- /dev/null +++ b/alcs-frontend/src/app/features/admin/decision-condition-types/decision-condition-types.component.html @@ -0,0 +1,35 @@ +
+
+

Decision Condition Types

+ +
+ + + + + + + + + + + + + + + + + + + + + + + + +
Label{{ row.label }}Description{{ row.description }}Code{{ row.code }}Actions + +
+
diff --git a/alcs-frontend/src/app/features/admin/decision-condition-types/decision-condition-types.component.scss b/alcs-frontend/src/app/features/admin/decision-condition-types/decision-condition-types.component.scss new file mode 100644 index 0000000000..4320920313 --- /dev/null +++ b/alcs-frontend/src/app/features/admin/decision-condition-types/decision-condition-types.component.scss @@ -0,0 +1,9 @@ +.container { + .edit-btn { + color: green; + } + + .delete-btn { + color: red; + } +} diff --git a/alcs-frontend/src/app/features/admin/decision-condition-types/decision-condition-types.component.spec.ts b/alcs-frontend/src/app/features/admin/decision-condition-types/decision-condition-types.component.spec.ts new file mode 100644 index 0000000000..732defedb3 --- /dev/null +++ b/alcs-frontend/src/app/features/admin/decision-condition-types/decision-condition-types.component.spec.ts @@ -0,0 +1,53 @@ +import { HttpClientTestingModule } from '@angular/common/http/testing'; +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { MatDialog } from '@angular/material/dialog'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { CeoCriterionService } from '../../../services/ceo-criterion/ceo-criterion.service'; +import { DecisionConditionTypesService } from '../../../services/decision-condition-types/decision-condition-types.service'; +import { ConfirmationDialogService } from '../../../shared/confirmation-dialog/confirmation-dialog.service'; + +import { DecisionConditionTypesComponent } from './decision-condition-types.component'; + +describe('DecisionConditionTypesComponent', () => { + let component: DecisionConditionTypesComponent; + let fixture: ComponentFixture; + let mockDecTypesService: DeepMocked; + let mockDialog: DeepMocked; + let mockConfirmationDialogService: DeepMocked; + + beforeEach(async () => { + mockDecTypesService = createMock(); + mockDialog = createMock(); + mockConfirmationDialogService = createMock(); + + await TestBed.configureTestingModule({ + declarations: [DecisionConditionTypesComponent], + providers: [ + { + provide: DecisionConditionTypesService, + useValue: mockDecTypesService, + }, + { + provide: MatDialog, + useValue: mockDialog, + }, + { + provide: ConfirmationDialogService, + useValue: mockConfirmationDialogService, + }, + ], + schemas: [NO_ERRORS_SCHEMA], + imports: [HttpClientTestingModule], + }).compileComponents(); + + fixture = TestBed.createComponent(DecisionConditionTypesComponent); + component = fixture.componentInstance; + + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/alcs-frontend/src/app/features/admin/decision-condition-types/decision-condition-types.component.ts b/alcs-frontend/src/app/features/admin/decision-condition-types/decision-condition-types.component.ts new file mode 100644 index 0000000000..d730203f41 --- /dev/null +++ b/alcs-frontend/src/app/features/admin/decision-condition-types/decision-condition-types.component.ts @@ -0,0 +1,73 @@ +import { Component, OnInit } from '@angular/core'; +import { MatDialog } from '@angular/material/dialog'; +import { Subject } from 'rxjs'; +import { ApplicationDecisionConditionTypeDto } from '../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; +import { DecisionConditionTypesService } from '../../../services/decision-condition-types/decision-condition-types.service'; +import { ConfirmationDialogService } from '../../../shared/confirmation-dialog/confirmation-dialog.service'; +import { DecisionConditionTypesDialogComponent } from './decision-condition-types-dialog/decision-condition-types-dialog.component'; + +@Component({ + selector: 'app-decision-condition-types', + templateUrl: './decision-condition-types.component.html', + styleUrls: ['./decision-condition-types.component.scss'], +}) +export class DecisionConditionTypesComponent implements OnInit { + destroy = new Subject(); + + decisionConditionTypeDtos: ApplicationDecisionConditionTypeDto[] = []; + displayedColumns: string[] = ['label', 'description', 'code', 'actions']; + + constructor( + private decisionConditionTypesService: DecisionConditionTypesService, + public dialog: MatDialog, + private confirmationDialogService: ConfirmationDialogService + ) {} + + ngOnInit(): void { + this.fetch(); + } + + async fetch() { + this.decisionConditionTypeDtos = await this.decisionConditionTypesService.fetch(); + } + + async onCreate() { + const dialog = this.dialog.open(DecisionConditionTypesDialogComponent, { + minWidth: '600px', + maxWidth: '800px', + width: '70%', + }); + dialog.beforeClosed().subscribe(async (result) => { + if (result) { + await this.fetch(); + } + }); + } + + async onEdit(decisionConditionTypeDto: ApplicationDecisionConditionTypeDto) { + const dialog = this.dialog.open(DecisionConditionTypesDialogComponent, { + minWidth: '600px', + maxWidth: '800px', + width: '70%', + data: decisionConditionTypeDto, + }); + dialog.beforeClosed().subscribe(async (result) => { + if (result) { + await this.fetch(); + } + }); + } + + async onDelete(decisionConditionTypeDto: ApplicationDecisionConditionTypeDto) { + this.confirmationDialogService + .openDialog({ + body: `Are you sure you want to delete ${decisionConditionTypeDto.label}?`, + }) + .subscribe(async (answer) => { + if (answer) { + await this.decisionConditionTypesService.delete(decisionConditionTypeDto.code); + await this.fetch(); + } + }); + } +} diff --git a/alcs-frontend/src/app/services/decision-condition-types/decision-condition-types.service.spec.ts b/alcs-frontend/src/app/services/decision-condition-types/decision-condition-types.service.spec.ts new file mode 100644 index 0000000000..0d6ff26077 --- /dev/null +++ b/alcs-frontend/src/app/services/decision-condition-types/decision-condition-types.service.spec.ts @@ -0,0 +1,154 @@ +import { HttpClient } from '@angular/common/http'; +import { TestBed } from '@angular/core/testing'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { of, throwError } from 'rxjs'; +import { ToastService } from '../toast/toast.service'; +import { DecisionConditionTypesService } from './decision-condition-types.service'; + +describe('DecisionConditionTypesService', () => { + let service: DecisionConditionTypesService; + let mockHttpClient: DeepMocked; + let mockToastService: DeepMocked; + + beforeEach(() => { + mockHttpClient = createMock(); + mockToastService = createMock(); + + TestBed.configureTestingModule({ + providers: [ + { + provide: HttpClient, + useValue: mockHttpClient, + }, + { + provide: ToastService, + useValue: mockToastService, + }, + ], + }); + service = TestBed.inject(DecisionConditionTypesService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); + + it('should call post on create', async () => { + mockHttpClient.post.mockReturnValue( + of({ + code: 'fake', + }) + ); + + const res = await service.create({ + code: '', + label: '', + description: '', + }); + + expect(mockHttpClient.post).toHaveBeenCalledTimes(1); + expect(res).toBeDefined(); + expect(res!.code).toEqual('fake'); + }); + + it('should show toast if create fails', async () => { + mockHttpClient.post.mockReturnValue( + throwError(() => { + new Error(''); + }) + ); + + const res = await service.create({ + code: '', + label: '', + description: '', + }); + + expect(mockHttpClient.post).toHaveBeenCalledTimes(1); + expect(res).toBeUndefined(); + expect(mockToastService.showErrorToast).toHaveBeenCalledTimes(1); + }); + + it('should call patch on update', async () => { + mockHttpClient.patch.mockReturnValue( + of({ + code: 'fake', + }) + ); + + const res = await service.update('fake', { + code: '', + label: '', + description: '', + }); + + expect(mockHttpClient.patch).toHaveBeenCalledTimes(1); + expect(res).toBeDefined(); + expect(res!.code).toEqual('fake'); + }); + + it('should show toast if update fails', async () => { + mockHttpClient.patch.mockReturnValue( + throwError(() => { + new Error(''); + }) + ); + + const res = await service.update('mock', { + code: '', + label: '', + description: '', + }); + + expect(mockHttpClient.patch).toHaveBeenCalledTimes(1); + expect(mockToastService.showErrorToast).toHaveBeenCalledTimes(1); + }); + + it('should call get on fetch', async () => { + mockHttpClient.get.mockReturnValue(of([])); + + await service.fetch(); + + expect(mockHttpClient.get).toHaveBeenCalledTimes(1); + }); + + it('should show toast if get fails', async () => { + mockHttpClient.get.mockReturnValue( + throwError(() => { + new Error(''); + }) + ); + + const res = await service.fetch(); + + expect(mockHttpClient.get).toHaveBeenCalledTimes(1); + expect(mockToastService.showErrorToast).toHaveBeenCalledTimes(1); + }); + + it('should call delete on delete', async () => { + mockHttpClient.delete.mockReturnValue( + of({ + code: 'fake', + }) + ); + + const res = await service.delete('fake'); + + expect(mockHttpClient.delete).toHaveBeenCalledTimes(1); + expect(res).toBeDefined(); + expect(res!.code).toEqual('fake'); + }); + + it('should show toast if delete fails', async () => { + mockHttpClient.delete.mockReturnValue( + throwError(() => { + new Error(''); + }) + ); + + const res = await service.delete('mock'); + + expect(mockHttpClient.delete).toHaveBeenCalledTimes(1); + expect(mockToastService.showErrorToast).toHaveBeenCalledTimes(1); + }); +}); diff --git a/alcs-frontend/src/app/services/decision-condition-types/decision-condition-types.service.ts b/alcs-frontend/src/app/services/decision-condition-types/decision-condition-types.service.ts new file mode 100644 index 0000000000..094e6edc15 --- /dev/null +++ b/alcs-frontend/src/app/services/decision-condition-types/decision-condition-types.service.ts @@ -0,0 +1,57 @@ +import { HttpClient } from '@angular/common/http'; +import { Injectable } from '@angular/core'; +import { firstValueFrom } from 'rxjs'; +import { environment } from '../../../environments/environment'; +import { ApplicationDecisionConditionTypeDto } from '../application/decision/application-decision-v2/application-decision-v2.dto'; +import { ToastService } from '../toast/toast.service'; + +@Injectable({ + providedIn: 'root', +}) +export class DecisionConditionTypesService { + private url = `${environment.apiUrl}/decision-condition-types`; + + constructor(private http: HttpClient, private toastService: ToastService) {} + + async fetch() { + try { + return await firstValueFrom(this.http.get(`${this.url}`)); + } catch (err) { + console.error(err); + this.toastService.showErrorToast('Failed to fetch decision condition types'); + } + return []; + } + + async create(createDto: ApplicationDecisionConditionTypeDto) { + try { + return await firstValueFrom(this.http.post(`${this.url}`, createDto)); + } catch (e) { + this.toastService.showErrorToast('Failed to create decision condition type'); + console.log(e); + } + return; + } + + async update(code: string, updateDto: ApplicationDecisionConditionTypeDto) { + try { + return await firstValueFrom( + this.http.patch(`${this.url}/${code}`, updateDto) + ); + } catch (e) { + this.toastService.showErrorToast('Failed to update decision condition type'); + console.log(e); + } + return; + } + + async delete(code: string) { + try { + return await firstValueFrom(this.http.delete(`${this.url}/${code}`)); + } catch (e) { + this.toastService.showErrorToast('Failed to delete decision condition type'); + console.log(e); + } + return; + } +} diff --git a/services/apps/alcs/src/alcs/admin/admin.module.ts b/services/apps/alcs/src/alcs/admin/admin.module.ts index 09182186a2..23e3cf81f2 100644 --- a/services/apps/alcs/src/alcs/admin/admin.module.ts +++ b/services/apps/alcs/src/alcs/admin/admin.module.ts @@ -1,5 +1,6 @@ import { forwardRef, Module } from '@nestjs/common'; import { TypeOrmModule } from '@nestjs/typeorm'; +import { ApplicationDecisionConditionType } from '../application-decision/application-decision-condition/application-decision-condition-code.entity'; import { ApplicationDecisionMakerCode } from '../application-decision/application-decision-maker/application-decision-maker.entity'; import { ApplicationModule } from '../application/application.module'; import { CovenantModule } from '../covenant/covenant.module'; @@ -11,6 +12,8 @@ import { NoticeOfIntentModule } from '../notice-of-intent/notice-of-intent.modul import { PlanningReviewModule } from '../planning-review/planning-review.module'; import { ApplicationCeoCriterionController } from './application-ceo-criterion/application-ceo-criterion.controller'; import { ApplicationCeoCriterionService } from './application-ceo-criterion/application-ceo-criterion.service'; +import { ApplicationDecisionConditionTypesController } from './application-decision-condition-types/application-decision-condition-types.controller'; +import { ApplicationDecisionConditionTypesService } from './application-decision-condition-types/application-decision-condition-types.service'; import { ApplicationDecisionMakerController } from './application-decision-maker/application-decision-maker.controller'; import { ApplicationDecisionMakerService } from './application-decision-maker/application-decision-maker.service'; import { HolidayController } from './holiday/holiday.controller'; @@ -29,6 +32,7 @@ import { UnarchiveCardService } from './unarchive-card/unarchive-card.service'; ApplicationCeoCriterionCode, ApplicationDecisionMakerCode, NoticeOfIntentSubtype, + ApplicationDecisionConditionType, ]), ApplicationModule, forwardRef(() => ApplicationDecisionModule), @@ -44,6 +48,7 @@ import { UnarchiveCardService } from './unarchive-card/unarchive-card.service'; UnarchiveCardController, NoiSubtypeController, ApplicationDecisionMakerController, + ApplicationDecisionConditionTypesController, ], providers: [ HolidayService, @@ -51,6 +56,7 @@ import { UnarchiveCardService } from './unarchive-card/unarchive-card.service'; ApplicationDecisionMakerService, UnarchiveCardService, NoiSubtypeService, + ApplicationDecisionConditionTypesService, ], }) export class AdminModule {} diff --git a/services/apps/alcs/src/alcs/admin/application-decision-condition-types/application-decision-condition-types.controller.spec.ts b/services/apps/alcs/src/alcs/admin/application-decision-condition-types/application-decision-condition-types.controller.spec.ts new file mode 100644 index 0000000000..78977b4d27 --- /dev/null +++ b/services/apps/alcs/src/alcs/admin/application-decision-condition-types/application-decision-condition-types.controller.spec.ts @@ -0,0 +1,77 @@ +import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; +import { ConfigModule } from '@nestjs/config'; +import { Test, TestingModule } from '@nestjs/testing'; +import { ClsService } from 'nestjs-cls'; +import { mockKeyCloakProviders } from '../../../../test/mocks/mockTypes'; +import { ApplicationDecisionConditionType } from '../../application-decision/application-decision-condition/application-decision-condition-code.entity'; +import { ApplicationDecisionConditionTypesController } from './application-decision-condition-types.controller'; +import { ApplicationDecisionConditionTypesService } from './application-decision-condition-types.service'; + +describe('ApplicationDecisionConditionTypesController', () => { + let controller: ApplicationDecisionConditionTypesController; + let mockDecTypesService: DeepMocked; + + beforeEach(async () => { + mockDecTypesService = createMock(); + + const module: TestingModule = await Test.createTestingModule({ + controllers: [ApplicationDecisionConditionTypesController], + providers: [ + { + provide: ApplicationDecisionConditionTypesService, + useValue: mockDecTypesService, + }, + { + provide: ClsService, + useValue: {}, + }, + ...mockKeyCloakProviders, + ], + imports: [ConfigModule], + }).compile(); + + controller = module.get( + ApplicationDecisionConditionTypesController, + ); + }); + + it('should be defined', () => { + expect(controller).toBeDefined(); + }); + + it('should call out to service when fetching ceo criterion', async () => { + mockDecTypesService.fetch.mockResolvedValue([]); + + const applicationDecisionConditionTypes = await controller.fetch(); + + expect(applicationDecisionConditionTypes).toBeDefined(); + expect(mockDecTypesService.fetch).toHaveBeenCalledTimes(1); + }); + + it('should call out to service when updating ceo criterion', async () => { + mockDecTypesService.update.mockResolvedValue( + new ApplicationDecisionConditionType(), + ); + + const applicationDecisionConditionType = await controller.update( + 'fake', + new ApplicationDecisionConditionType(), + ); + + expect(applicationDecisionConditionType).toBeDefined(); + expect(mockDecTypesService.update).toHaveBeenCalledTimes(1); + }); + + it('should call out to service when creating ceo criterion', async () => { + mockDecTypesService.create.mockResolvedValue( + new ApplicationDecisionConditionType(), + ); + + const applicationDecisionConditionType = await controller.create( + new ApplicationDecisionConditionType(), + ); + + expect(applicationDecisionConditionType).toBeDefined(); + expect(mockDecTypesService.create).toHaveBeenCalledTimes(1); + }); +}); diff --git a/services/apps/alcs/src/alcs/admin/application-decision-condition-types/application-decision-condition-types.controller.ts b/services/apps/alcs/src/alcs/admin/application-decision-condition-types/application-decision-condition-types.controller.ts new file mode 100644 index 0000000000..8441783428 --- /dev/null +++ b/services/apps/alcs/src/alcs/admin/application-decision-condition-types/application-decision-condition-types.controller.ts @@ -0,0 +1,51 @@ +import { + Body, + Controller, + Get, + Param, + Patch, + Post, + UseGuards, +} from '@nestjs/common'; +import { ApiOAuth2 } from '@nestjs/swagger'; +import * as config from 'config'; +import { AUTH_ROLE } from '../../../common/authorization/roles'; +import { RolesGuard } from '../../../common/authorization/roles-guard.service'; +import { UserRoles } from '../../../common/authorization/roles.decorator'; +import { ApplicationDecisionConditionTypeDto } from '../../application-decision/application-decision-condition/application-decision-condition.dto'; +import { ApplicationDecisionConditionTypesService } from './application-decision-condition-types.service'; + +@Controller('decision-condition-types') +@ApiOAuth2(config.get('KEYCLOAK.SCOPES')) +@UseGuards(RolesGuard) +export class ApplicationDecisionConditionTypesController { + constructor( + private applicationDecisionConditionTypesService: ApplicationDecisionConditionTypesService, + ) {} + + @Get() + @UserRoles(AUTH_ROLE.ADMIN) + async fetch() { + return await this.applicationDecisionConditionTypesService.fetch(); + } + + @Patch('/:code') + @UserRoles(AUTH_ROLE.ADMIN) + async update( + @Param('code') code: string, + @Body() updateDto: ApplicationDecisionConditionTypeDto, + ) { + return await this.applicationDecisionConditionTypesService.update( + code, + updateDto, + ); + } + + @Post('') + @UserRoles(AUTH_ROLE.ADMIN) + async create(@Body() createDto: ApplicationDecisionConditionTypeDto) { + return await this.applicationDecisionConditionTypesService.create( + createDto, + ); + } +} diff --git a/services/apps/alcs/src/alcs/admin/application-decision-condition-types/application-decision-condition-types.service.ts b/services/apps/alcs/src/alcs/admin/application-decision-condition-types/application-decision-condition-types.service.ts new file mode 100644 index 0000000000..3011dad527 --- /dev/null +++ b/services/apps/alcs/src/alcs/admin/application-decision-condition-types/application-decision-condition-types.service.ts @@ -0,0 +1,53 @@ +import { Injectable } from '@nestjs/common'; +import { InjectRepository } from '@nestjs/typeorm'; +import { Repository } from 'typeorm'; +import { ApplicationDecisionConditionType } from '../../application-decision/application-decision-condition/application-decision-condition-code.entity'; +import { ApplicationDecisionConditionTypeDto } from '../../application-decision/application-decision-condition/application-decision-condition.dto'; + +@Injectable() +export class ApplicationDecisionConditionTypesService { + constructor( + @InjectRepository(ApplicationDecisionConditionType) + private applicationDecisionMakerCodeRepository: Repository, + ) {} + + async fetch() { + return await this.applicationDecisionMakerCodeRepository.find({ + order: { label: 'ASC' }, + select: { + code: true, + label: true, + description: true, + }, + }); + } + + async getOneOrFail(code: string) { + return await this.applicationDecisionMakerCodeRepository.findOneOrFail({ + where: { code }, + }); + } + + async update(code: string, updateDto: ApplicationDecisionConditionTypeDto) { + const decisionMakerCode = await this.getOneOrFail(code); + + decisionMakerCode.description = updateDto.description; + decisionMakerCode.label = updateDto.label; + + return await this.applicationDecisionMakerCodeRepository.save( + decisionMakerCode, + ); + } + + async create(createDto: ApplicationDecisionConditionTypeDto) { + const decisionMakerCode = new ApplicationDecisionConditionType(); + + decisionMakerCode.code = createDto.code; + decisionMakerCode.description = createDto.description; + decisionMakerCode.label = createDto.label; + + return await this.applicationDecisionMakerCodeRepository.save( + decisionMakerCode, + ); + } +} diff --git a/services/apps/alcs/src/alcs/admin/application-decision-condition-types/application-decision-maker.service.spec.ts b/services/apps/alcs/src/alcs/admin/application-decision-condition-types/application-decision-maker.service.spec.ts new file mode 100644 index 0000000000..ac68baa379 --- /dev/null +++ b/services/apps/alcs/src/alcs/admin/application-decision-condition-types/application-decision-maker.service.spec.ts @@ -0,0 +1,84 @@ +import { classes } from '@automapper/classes'; +import { AutomapperModule } from '@automapper/nestjs'; +import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; +import { Test, TestingModule } from '@nestjs/testing'; +import { getRepositoryToken } from '@nestjs/typeorm'; +import { Repository } from 'typeorm'; +import { ApplicationDecisionConditionType } from '../../application-decision/application-decision-condition/application-decision-condition-code.entity'; +import { ApplicationDecisionConditionTypesService } from './application-decision-condition-types.service'; + +describe('ApplicationDecisionConditionTypesService', () => { + let service: ApplicationDecisionConditionTypesService; + let mockRepository: DeepMocked>; + + const decisionMakerCode = new ApplicationDecisionConditionType(); + + beforeEach(async () => { + mockRepository = createMock(); + + const module: TestingModule = await Test.createTestingModule({ + imports: [ + AutomapperModule.forRoot({ + strategyInitializer: classes(), + }), + ], + providers: [ + ApplicationDecisionConditionTypesService, + { + provide: getRepositoryToken(ApplicationDecisionConditionType), + useValue: mockRepository, + }, + ], + }).compile(); + + service = module.get( + ApplicationDecisionConditionTypesService, + ); + }); + + it('should be defined', () => { + expect(service).toBeDefined(); + }); + + it('should successfully create decision maker entry', async () => { + mockRepository.save.mockResolvedValue( + new ApplicationDecisionConditionType(), + ); + + const result = await service.create({ + code: '', + description: '', + label: '', + }); + + expect(mockRepository.save).toBeCalledTimes(1); + expect(result).toBeDefined(); + }); + + it('should successfully update decision maker entry if it exists', async () => { + mockRepository.save.mockResolvedValue(decisionMakerCode); + mockRepository.findOneOrFail.mockResolvedValue(decisionMakerCode); + + const result = await service.update(decisionMakerCode.code, { + code: '', + description: '', + label: '', + }); + + expect(mockRepository.save).toBeCalledTimes(1); + expect(mockRepository.findOneOrFail).toBeCalledTimes(1); + expect(mockRepository.findOneOrFail).toBeCalledWith({ + where: { uuid: decisionMakerCode.code }, + }); + expect(result).toBeDefined(); + }); + + it('should successfully fetch decision maker', async () => { + mockRepository.find.mockResolvedValue([decisionMakerCode]); + + const result = await service.fetch(); + + expect(mockRepository.find).toBeCalledTimes(1); + expect(result).toBeDefined(); + }); +}); From 64e61adbbfd4a75ab69e0845e6b0b2e37b1b59d9 Mon Sep 17 00:00:00 2001 From: "to. sandra" <76515860+sandratoh@users.noreply.github.com> Date: Thu, 29 Jun 2023 09:51:13 -0700 Subject: [PATCH 031/954] Show primary contact field validations in review if no contact is selected (#743) --- .../application-details.component.html | 64 +++++++++---------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/portal-frontend/src/app/features/application-details/application-details.component.html b/portal-frontend/src/app/features/application-details/application-details.component.html index 67d73bab7c..06061e4614 100644 --- a/portal-frontend/src/app/features/application-details/application-details.component.html +++ b/portal-frontend/src/app/features/application-details/application-details.component.html @@ -25,38 +25,38 @@

3. Primary Contact

- -
First Name
-
- {{ primaryContact.firstName }} - -
-
Last Name
-
- {{ primaryContact.lastName }} - -
-
- Organization (optional) - Ministry/Department Responsible -
-
- {{ primaryContact.organizationName }} - -
-
Phone
-
- {{ primaryContact.phoneNumber }} - - Invalid Format -
-
Email
-
- {{ primaryContact.email }} - - Invalid Format -
- +
First Name
+
+ {{ primaryContact?.firstName }} + +
+
Last Name
+
+ {{ primaryContact?.lastName }} + +
+
+ Organization (optional) + Ministry/Department Responsible +
+
+ {{ primaryContact?.organizationName }} + +
+
Phone
+
+ {{ primaryContact?.phoneNumber }} + + Invalid Format +
+
Email
+
+ {{ primaryContact?.email }} + + Invalid Format +
Authorization Letter(s)
From 9c8b3ace06c7cdd4e7acaedda1dea7bbb7a2df59 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Thu, 29 Jun 2023 11:07:30 -0700 Subject: [PATCH 032/954] Code Review Feedback --- .../decision-condition-types.component.spec.ts | 1 - .../application-decision-condition-types.controller.spec.ts | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/alcs-frontend/src/app/features/admin/decision-condition-types/decision-condition-types.component.spec.ts b/alcs-frontend/src/app/features/admin/decision-condition-types/decision-condition-types.component.spec.ts index 732defedb3..68d15c3272 100644 --- a/alcs-frontend/src/app/features/admin/decision-condition-types/decision-condition-types.component.spec.ts +++ b/alcs-frontend/src/app/features/admin/decision-condition-types/decision-condition-types.component.spec.ts @@ -3,7 +3,6 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MatDialog } from '@angular/material/dialog'; import { createMock, DeepMocked } from '@golevelup/ts-jest'; -import { CeoCriterionService } from '../../../services/ceo-criterion/ceo-criterion.service'; import { DecisionConditionTypesService } from '../../../services/decision-condition-types/decision-condition-types.service'; import { ConfirmationDialogService } from '../../../shared/confirmation-dialog/confirmation-dialog.service'; diff --git a/services/apps/alcs/src/alcs/admin/application-decision-condition-types/application-decision-condition-types.controller.spec.ts b/services/apps/alcs/src/alcs/admin/application-decision-condition-types/application-decision-condition-types.controller.spec.ts index 78977b4d27..c405165089 100644 --- a/services/apps/alcs/src/alcs/admin/application-decision-condition-types/application-decision-condition-types.controller.spec.ts +++ b/services/apps/alcs/src/alcs/admin/application-decision-condition-types/application-decision-condition-types.controller.spec.ts @@ -39,7 +39,7 @@ describe('ApplicationDecisionConditionTypesController', () => { expect(controller).toBeDefined(); }); - it('should call out to service when fetching ceo criterion', async () => { + it('should call out to service when fetching decision condition type', async () => { mockDecTypesService.fetch.mockResolvedValue([]); const applicationDecisionConditionTypes = await controller.fetch(); @@ -48,7 +48,7 @@ describe('ApplicationDecisionConditionTypesController', () => { expect(mockDecTypesService.fetch).toHaveBeenCalledTimes(1); }); - it('should call out to service when updating ceo criterion', async () => { + it('should call out to service when updating decision condition type', async () => { mockDecTypesService.update.mockResolvedValue( new ApplicationDecisionConditionType(), ); @@ -62,7 +62,7 @@ describe('ApplicationDecisionConditionTypesController', () => { expect(mockDecTypesService.update).toHaveBeenCalledTimes(1); }); - it('should call out to service when creating ceo criterion', async () => { + it('should call out to service when creating decision condition type', async () => { mockDecTypesService.create.mockResolvedValue( new ApplicationDecisionConditionType(), ); From ef06244a5c1576e15bd67259bc6eb8398a0b5c34 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Thu, 29 Jun 2023 11:31:34 -0700 Subject: [PATCH 033/954] Copy local government from Submission to Application when updating --- .../apps/alcs/src/alcs/application/application.dto.ts | 1 + .../application-submission.service.spec.ts | 3 +++ .../application-submission.service.ts | 9 +++++++++ 3 files changed, 13 insertions(+) diff --git a/services/apps/alcs/src/alcs/application/application.dto.ts b/services/apps/alcs/src/alcs/application/application.dto.ts index 9ca8c020b9..86b9adc71d 100644 --- a/services/apps/alcs/src/alcs/application/application.dto.ts +++ b/services/apps/alcs/src/alcs/application/application.dto.ts @@ -278,6 +278,7 @@ export class ApplicationUpdateServiceDto { proposalEndDate?: Date | null; proposalExpiryDate?: Date | null; staffObservations?: string | null; + localGovernmentUuid?: string; } export class CreateApplicationServiceDto { diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.service.spec.ts b/services/apps/alcs/src/portal/application-submission/application-submission.service.spec.ts index 04b041f46b..7f81d6e29e 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.service.spec.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.service.spec.ts @@ -400,6 +400,9 @@ describe('ApplicationSubmissionService', () => { mockRepository.findOne.mockResolvedValue(mockApplication); mockRepository.save.mockResolvedValue(mockApplication); + mockApplicationService.updateByFileNumber.mockResolvedValue( + new Application(), + ); const result = await service.update(fileNumber, { applicant, diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.service.ts b/services/apps/alcs/src/portal/application-submission/application-submission.service.ts index 7efd55cc6c..14e425a730 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.service.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.service.ts @@ -160,6 +160,15 @@ export class ApplicationSubmissionService { await this.applicationSubmissionRepository.save(applicationSubmission); + if (!applicationSubmission.isDraft && updateDto.localGovernmentUuid) { + await this.applicationService.updateByFileNumber( + applicationSubmission.fileNumber, + { + localGovernmentUuid: updateDto.localGovernmentUuid, + }, + ); + } + return this.getOrFailByFileNumber(applicationSubmission.fileNumber); } From dd8b7e6c8cfc81f217e4a7aad35947a2be196f55 Mon Sep 17 00:00:00 2001 From: Liam Stoddard Date: Thu, 29 Jun 2023 14:55:22 -0700 Subject: [PATCH 034/954] local gov bug fixed --- .../sql/insert-batch-application.sql | 153 +++++++++--------- .../1687546406729-seed_add_adl_loc_gov.ts | 1 - .../1687810457499-seed_inactive_local_gov.ts | 1 + 3 files changed, 78 insertions(+), 77 deletions(-) diff --git a/bin/migrate-oats-data/sql/insert-batch-application.sql b/bin/migrate-oats-data/sql/insert-batch-application.sql index bdb992cbf5..2fe3d63bc4 100644 --- a/bin/migrate-oats-data/sql/insert-batch-application.sql +++ b/bin/migrate-oats-data/sql/insert-batch-application.sql @@ -1,4 +1,3 @@ - -- Step 1: Perform a lookup to retrieve the applicant's name or organization for each application ID WITH applicant_lookup AS ( @@ -26,82 +25,84 @@ WITH GROUP BY oaap.alr_application_id ), - --- Step 2: get local gov application name & match to uuid -oats_gov AS ( - SELECT - oaap.alr_application_id AS application_id, - oo.organization_name AS oats_gov_name - FROM - oats.oats_alr_application_parties oaap - JOIN oats.oats_person_organizations opo ON oaap.person_organization_id = opo.person_organization_id - JOIN oats.oats_organizations oo ON opo.organization_id = oo.organization_id - WHERE - oo.organization_type_cd = 'MUNI' - OR oo.organization_type_cd = 'FN' -), - -alcs_gov AS ( - SELECT - oats_gov.application_id AS application_id, - alg.uuid AS gov_uuid - FROM - oats_gov - JOIN alcs.application_local_government alg on ( + -- Step 2: get local gov application name & match to uuid + oats_gov AS ( + SELECT + oaap.alr_application_id AS application_id, + oo.organization_name AS oats_gov_name + FROM + oats.oats_alr_application_parties oaap + JOIN oats.oats_person_organizations opo ON oaap.person_organization_id = opo.person_organization_id + JOIN oats.oats_organizations oo ON opo.organization_id = oo.organization_id + WHERE + oo.organization_type_cd = 'MUNI' + OR oo.organization_type_cd = 'FN' + OR oo.organization_type_cd = 'RD' + ), + alcs_gov AS ( + SELECT + oats_gov.application_id AS application_id, + alg.uuid AS gov_uuid + FROM + oats_gov + JOIN alcs.application_local_government alg on ( + CASE + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Gabriola Island' THEN 'Islands Trust Gabriola Island (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Galiano Island' THEN 'Islands Trust Galiano Island (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Gambier Island' THEN 'Islands Trust Gambier Island (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Hornby Island' THEN 'Islands Trust Hornby Island (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Lasqueti Island' THEN 'Islands Trust Lasqueti Island (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Mayne Island' THEN 'Islands Trust Mayne Island (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Pender Island' THEN 'Islands Trust Pender Island (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Quadra Island' THEN 'Islands Trust Quadra Island (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Salt Spring Island' THEN 'Islands Trust Salt Spring Island (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Saturna Island' THEN 'Islands Trust Saturna Island (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Sidney Island' THEN 'Islands Trust Sidney Island (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust- Comox Strathcona' THEN 'Islands Trust Comox Strathcona (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust- Nanaimo' THEN 'Islands Trust Nanaimo (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust-Capital' THEN 'Islands Trust Capital (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust-Powell River' THEN 'Islands Trust Powell River (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust-Sunshine Coast' THEN 'Islands Trust Sunshine Coast (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Bowen Island' THEN 'Bowen Island (Island Municipality)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Denman Island' THEN 'Islands Trust Denman Island (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust - Cowichan Valley' THEN 'Islands Trust Cowichan Valley (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Northern Rockies' THEN 'Northern Rockies (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Sliammon%' THEN 'Tla''amin Nation' + ELSE oats_gov.oats_gov_name + END + ) = alg."name" + ), + -- Step 3: Perform a lookup to retrieve the region code for each application ID + panel_lookup AS ( + SELECT DISTINCT + oaap.alr_application_id AS application_id, CASE - WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Gabriola Island' THEN 'Islands Trust Gabriola Island (Historical)' - WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Galiano Island' THEN 'Islands Trust Galiano Island (Historical)' - WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Gambier Island' THEN 'Islands Trust Gambier Island (Historical)' - WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Hornby Island' THEN 'Islands Trust Hornby Island (Historical)' - WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Lasqueti Island' THEN 'Islands Trust Lasqueti Island (Historical)' - WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Mayne Island' THEN 'Islands Trust Mayne Island (Historical)' - WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Pender Island' THEN 'Islands Trust Pender Island (Historical)' - WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Quadra Island' THEN 'Islands Trust Quadra Island (Historical)' - WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Salt Spring Island' THEN 'Islands Trust Salt Spring Island (Historical)' - WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Saturna Island' THEN 'Islands Trust Saturna Island (Historical)' - WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Sidney Island' THEN 'Islands Trust Sidney Island (Historical)' - WHEN oats_gov.oats_gov_name LIKE 'Islands Trust- Comox Strathcona' THEN 'Islands Trust Comox Strathcona (Historical)' - WHEN oats_gov.oats_gov_name LIKE 'Islands Trust- Nanaimo' THEN 'Islands Trust Nanaimo (Historical)' - WHEN oats_gov.oats_gov_name LIKE 'Islands Trust-Capital' THEN 'Islands Trust Capital (Historical)' - WHEN oats_gov.oats_gov_name LIKE 'Islands Trust-Powell River' THEN 'Islands Trust Powell River (Historical)' - WHEN oats_gov.oats_gov_name LIKE 'Islands Trust-Sunshine Coast' THEN 'Islands Trust Sunshine Coast (Historical)' - WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Bowen Island' THEN 'Bowen Island (Island Municipality)' - WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Denman Island' THEN 'Islands Trust Denman Island (Historical)' - WHEN oats_gov.oats_gov_name LIKE 'Islands Trust - Cowichan Valley' THEN 'Islands Trust Cowichan Valley (Historical)' - WHEN oats_gov.oats_gov_name LIKE 'Northern Rockies' THEN 'Northern Rockies (Historical)' - WHEN oats_gov.oats_gov_name LIKE 'Sliammon%' THEN 'Tla''amin Nation' - ELSE oats_gov.oats_gov_name - END - ) = alg."name" -), --- Step 3: Perform a lookup to retrieve the region code for each application ID -panel_lookup AS ( - SELECT DISTINCT - oaap.alr_application_id AS application_id, - oo2.organization_name AS panel_region - FROM - oats.oats_alr_application_parties oaap - JOIN oats.oats_person_organizations opo ON oaap.person_organization_id = opo.person_organization_id - JOIN oats.oats_organizations oo ON opo.organization_id = oo.organization_id - JOIN oats.oats_organizations oo2 ON oo.parent_organization_id = oo2.organization_id - WHERE - oo2.organization_type_cd = 'PANEL' -), - --- Step 4: Perform lookup to retrieve type code -application_type_lookup AS ( - SELECT - oaac.alr_application_id AS application_id, - oacc."description" AS "description", - oaac.alr_change_code AS code - FROM - oats.oats_alr_appl_components AS oaac - JOIN oats.oats_alr_change_codes oacc ON oaac.alr_change_code = oacc.alr_change_code - LEFT JOIN oats.alcs_etl_application_exclude aee ON oaac.alr_appl_component_id = aee.component_id - WHERE - aee.component_id IS NULL -) - + WHEN oo2.parent_organization_id isnull then oo2.organization_name + WHEN oo3.parent_organization_id isnull then oo3.organization_name + ELSE 'NONE' + END AS panel_region + FROM + oats.oats_alr_application_parties oaap + JOIN oats.oats_person_organizations opo ON oaap.person_organization_id = opo.person_organization_id + JOIN oats.oats_organizations oo ON opo.organization_id = oo.organization_id + LEFT JOIN oats.oats_organizations oo2 ON oo.parent_organization_id = oo2.organization_id + LEFT JOIN oats.oats_organizations oo3 ON oo2.parent_organization_id = oo3.organization_id + WHERE + oo2.organization_type_cd = 'PANEL' OR oo3.organization_type_cd = 'PANEL' + ), + -- Step 4: Perform lookup to retrieve type code + application_type_lookup AS ( + SELECT + oaac.alr_application_id AS application_id, + oacc."description" AS "description", + oaac.alr_change_code AS code + FROM + oats.oats_alr_appl_components AS oaac + JOIN oats.oats_alr_change_codes oacc ON oaac.alr_change_code = oacc.alr_change_code + LEFT JOIN oats.alcs_etl_application_exclude aee ON oaac.alr_appl_component_id = aee.component_id + WHERE + aee.component_id IS NULL + ) -- Step 5: Insert new records into the alcs_applications table SELECT oa.alr_application_id :: text AS file_number, diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1687546406729-seed_add_adl_loc_gov.ts b/services/apps/alcs/src/providers/typeorm/migrations/1687546406729-seed_add_adl_loc_gov.ts index ec15f01b62..aeba419435 100644 --- a/services/apps/alcs/src/providers/typeorm/migrations/1687546406729-seed_add_adl_loc_gov.ts +++ b/services/apps/alcs/src/providers/typeorm/migrations/1687546406729-seed_add_adl_loc_gov.ts @@ -8,7 +8,6 @@ export class seedAddAdlLocGov1687546406729 implements MigrationInterface { ('b8a622d7-66da-4598-9687-2e8727fb2561',NULL,NOW(),NULL,'migration_seed',NULL,'City of Port Alberni','ISLR',NULL,false,true,'{}'), ('18bd941a-7c0f-44fe-9d12-a084d2a5f372',NULL,NOW(),NULL,'migration_seed',NULL,'Village of Port Clements','NORR',NULL,false,true,'{}'), ('0235ecdb-95fc-47f9-b7f6-e05e1e388d5b',NULL,NOW(),NULL,'migration_seed',NULL,'Village of Slocan','KOOR',NULL,false,true,'{}'), - ('0136a261-6237-4332-ae6a-1c7d7f49f0e8',NULL,NOW(),NULL,'migration_seed',NULL,'Village of Chase','INTR',NULL,false,true,'{}'), ('5b5b05d3-df2e-403c-9cf5-3c52c68ab559',NULL,NOW(),NULL,'migration_seed',NULL,'Village of Cumberland','ISLR',NULL,false,true,'{}'), ('e0684ddf-fa61-47c2-87b3-1c72bed5c365',NULL,NOW(),NULL,'migration_seed',NULL,'District of Fort St. James','NORR',NULL,false,true,'{}'), ('5dc1a21a-a740-402e-a56f-8f6c85991739',NULL,NOW(),NULL,'migration_seed',NULL,'District of Wells','INTR',NULL,false,true,'{}'), diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1687810457499-seed_inactive_local_gov.ts b/services/apps/alcs/src/providers/typeorm/migrations/1687810457499-seed_inactive_local_gov.ts index 0a7dd674a3..9afe363fbf 100644 --- a/services/apps/alcs/src/providers/typeorm/migrations/1687810457499-seed_inactive_local_gov.ts +++ b/services/apps/alcs/src/providers/typeorm/migrations/1687810457499-seed_inactive_local_gov.ts @@ -24,6 +24,7 @@ export class seedInactiveLocalGov1687810457499 implements MigrationInterface { ('476febec-ca88-4615-810c-fcae936867ef',NULL,NOW(),NULL,'migration_seed',NULL,'Multiple Jurisdictions for Sunshine','SOUR',NULL,false,false,'{}'), ('f0bd3817-5825-4656-b685-d306ddd1fa70',NULL,NOW(),NULL,'migration_seed',NULL,'Multiple Jurisdictions for Thompson-Nicola','INTR',NULL,false,false,'{}'), ('927ece9d-b4e3-4862-aa85-67539d9abb0d',NULL,NOW(),NULL,'migration_seed',NULL,'Islands Trust Gabriola Island (Historical)','ISLR',NULL,false,false,'{}'), + ('e2540566-52a8-4a3c-b373-58e1744703af',NULL,NOW(),NULL,'migration_seed',NULL,'Islands Trust Galiano Island (Historical)','ISLR',NULL,false,false,'{}'), ('9ff02b37-9046-48c8-aa96-01977fb3d1b9',NULL,NOW(),NULL,'migration_seed',NULL,'Islands Trust Gambier Island (Historical)','SOUR',NULL,false,false,'{}'), ('d325a7a4-fe68-49b0-9df2-599beb06766e',NULL,NOW(),NULL,'migration_seed',NULL,'Islands Trust Hornby Island (Historical)','ISLR',NULL,false,false,'{}'), ('9f0bdb45-c212-4aee-8413-3cf3c79e988c',NULL,NOW(),NULL,'migration_seed',NULL,'Islands Trust Lasqueti Island (Historical)','ISLR',NULL,false,false,'{}'), From e89b36a9a48aabac2d770436e48cede2d483f691 Mon Sep 17 00:00:00 2001 From: Liam Stoddard Date: Thu, 29 Jun 2023 15:01:23 -0700 Subject: [PATCH 035/954] Regions and local govs are working togethergit add sql/insert-batch-application.sql --- .../sql/insert-batch-application.sql | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/bin/migrate-oats-data/sql/insert-batch-application.sql b/bin/migrate-oats-data/sql/insert-batch-application.sql index 2fe3d63bc4..9f06f4b581 100644 --- a/bin/migrate-oats-data/sql/insert-batch-application.sql +++ b/bin/migrate-oats-data/sql/insert-batch-application.sql @@ -68,6 +68,33 @@ WITH WHEN oats_gov.oats_gov_name LIKE 'Islands Trust - Cowichan Valley' THEN 'Islands Trust Cowichan Valley (Historical)' WHEN oats_gov.oats_gov_name LIKE 'Northern Rockies' THEN 'Northern Rockies (Historical)' WHEN oats_gov.oats_gov_name LIKE 'Sliammon%' THEN 'Tla''amin Nation' + WHEN oats_gov.oats_gov_name LIKE 'Thompson Nicola%' THEN 'Thompson Nicola Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Cariboo%' THEN 'Cariboo Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Fraser Valley%' THEN 'Fraser Valley Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Columbia Shuswap%' THEN 'Columbia Shuswap Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Central Okanagan%' THEN 'Central Okanagan Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Squamish Lillooet%' THEN 'Squamish Lillooet Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Alberni-Clayoquot%' THEN 'Alberni-Clayoquot Regional District' + WHEN oats_gov.oats_gov_name LIKE 'qathet%' THEN 'qathet Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Peace River%' THEN 'Peace River Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Okanagan Similkameen%' THEN 'Okanagan Similkameen Regional District' + WHEN oats_gov.oats_gov_name LIKE 'East Kootenay%' THEN 'East Kootenay Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Bulkley-Nechako%' THEN 'Bulkley-Nechako Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Sunshine Coast%' THEN 'Sunshine Coast Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Nanaimo%' THEN 'Nanaimo Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Kitimat Stikine%' THEN 'Kitimat Stikine Regional District' + WHEN oats_gov.oats_gov_name LIKE 'North Okanagan%' THEN 'North Okanagan Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Fraser Fort George%' THEN 'Fraser Fort George Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Cowichan Valley%' THEN 'Cowichan Valley Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Kootenay Boundary%' THEN 'Kootenay Boundary Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Comox Valley%' THEN 'Comox Valley Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Central Kootenay%' THEN 'Central Kootenay Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Capital%' THEN 'Capital Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Metro Vancouver%' THEN 'Metro Vancouver Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Central Coast%' THEN 'Central Coast Regional District' + WHEN oats_gov.oats_gov_name LIKE 'North Coast%' THEN 'North Coast Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Strathcona%' THEN 'Strathcona Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Mount Waddington%' THEN 'Mount Waddington Regional District' ELSE oats_gov.oats_gov_name END ) = alg."name" From acd4be28d3074e69c5c52532f3109c7cc6dfba16 Mon Sep 17 00:00:00 2001 From: Liam Stoddard Date: Thu, 29 Jun 2023 16:21:34 -0700 Subject: [PATCH 036/954] MR feedback updates --- bin/migrate-oats-data/sql/insert-batch-application.sql | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/bin/migrate-oats-data/sql/insert-batch-application.sql b/bin/migrate-oats-data/sql/insert-batch-application.sql index 9f06f4b581..499a817fd5 100644 --- a/bin/migrate-oats-data/sql/insert-batch-application.sql +++ b/bin/migrate-oats-data/sql/insert-batch-application.sql @@ -35,9 +35,7 @@ WITH JOIN oats.oats_person_organizations opo ON oaap.person_organization_id = opo.person_organization_id JOIN oats.oats_organizations oo ON opo.organization_id = oo.organization_id WHERE - oo.organization_type_cd = 'MUNI' - OR oo.organization_type_cd = 'FN' - OR oo.organization_type_cd = 'RD' + oo.organization_type_cd IN ('MUNI','FN','RD') ), alcs_gov AS ( SELECT @@ -104,8 +102,8 @@ WITH SELECT DISTINCT oaap.alr_application_id AS application_id, CASE - WHEN oo2.parent_organization_id isnull then oo2.organization_name - WHEN oo3.parent_organization_id isnull then oo3.organization_name + WHEN oo2.parent_organization_id IS NULL THEN oo2.organization_name + WHEN oo3.parent_organization_id IS NULL THEN oo3.organization_name ELSE 'NONE' END AS panel_region FROM From 55cc2024fcb6054d9de611af6db387c87a97893e Mon Sep 17 00:00:00 2001 From: Liam Stoddard Date: Thu, 29 Jun 2023 16:39:53 -0700 Subject: [PATCH 037/954] revert file to prev Migration --- .../1687810457499-seed_inactive_local_gov.ts | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1687810457499-seed_inactive_local_gov.ts b/services/apps/alcs/src/providers/typeorm/migrations/1687810457499-seed_inactive_local_gov.ts index 9afe363fbf..d57b15c352 100644 --- a/services/apps/alcs/src/providers/typeorm/migrations/1687810457499-seed_inactive_local_gov.ts +++ b/services/apps/alcs/src/providers/typeorm/migrations/1687810457499-seed_inactive_local_gov.ts @@ -24,7 +24,6 @@ export class seedInactiveLocalGov1687810457499 implements MigrationInterface { ('476febec-ca88-4615-810c-fcae936867ef',NULL,NOW(),NULL,'migration_seed',NULL,'Multiple Jurisdictions for Sunshine','SOUR',NULL,false,false,'{}'), ('f0bd3817-5825-4656-b685-d306ddd1fa70',NULL,NOW(),NULL,'migration_seed',NULL,'Multiple Jurisdictions for Thompson-Nicola','INTR',NULL,false,false,'{}'), ('927ece9d-b4e3-4862-aa85-67539d9abb0d',NULL,NOW(),NULL,'migration_seed',NULL,'Islands Trust Gabriola Island (Historical)','ISLR',NULL,false,false,'{}'), - ('e2540566-52a8-4a3c-b373-58e1744703af',NULL,NOW(),NULL,'migration_seed',NULL,'Islands Trust Galiano Island (Historical)','ISLR',NULL,false,false,'{}'), ('9ff02b37-9046-48c8-aa96-01977fb3d1b9',NULL,NOW(),NULL,'migration_seed',NULL,'Islands Trust Gambier Island (Historical)','SOUR',NULL,false,false,'{}'), ('d325a7a4-fe68-49b0-9df2-599beb06766e',NULL,NOW(),NULL,'migration_seed',NULL,'Islands Trust Hornby Island (Historical)','ISLR',NULL,false,false,'{}'), ('9f0bdb45-c212-4aee-8413-3cf3c79e988c',NULL,NOW(),NULL,'migration_seed',NULL,'Islands Trust Lasqueti Island (Historical)','ISLR',NULL,false,false,'{}'), @@ -34,13 +33,13 @@ export class seedInactiveLocalGov1687810457499 implements MigrationInterface { ('dc0357b1-aacd-45ba-8fa9-0e62cbe88e9f',NULL,NOW(),NULL,'migration_seed',NULL,'Islands Trust Salt Spring Island (Historical)','ISLR',NULL,false,false,'{}'), ('3890ccf8-94e3-4b9a-9a1c-4d33518e1b5d',NULL,NOW(),NULL,'migration_seed',NULL,'Islands Trust Saturna Island (Historical)','ISLR',NULL,false,false,'{}'), ('538b895f-f0e1-4388-93cb-9eeb7cfa987e',NULL,NOW(),NULL,'migration_seed',NULL,'Islands Trust Sidney Island (Historical)','ISLR',NULL,false,false,'{}'), - ('88532d18-3059-4720-986a-363d9bce6be0',NULL,NOW(),NULL,'migration_seed',NULL,'Islands Trust Comox Strathcona (Historical)','ISLR',NULL,false,false,'{}'), - ('4e721d39-09b3-4f9b-ad1f-601a69315808',NULL,NOW(),NULL,'migration_seed',NULL,'Islands Trust Nanaimo (Historical)','ISLR',NULL,false,false,'{}'), - ('9355bf78-280a-4695-adad-fafa06969c99',NULL,NOW(),NULL,'migration_seed',NULL,'Islands Trust Capital (Historical)','ISLR',NULL,false,false,'{}'), - ('8017df89-8e71-41c3-bee9-1a48f042e157',NULL,NOW(),NULL,'migration_seed',NULL,'Islands Trust Powell River (Historical)','ISLR',NULL,false,false,'{}'), - ('26f395a1-44ab-4812-9e0d-f2dbc815859d',NULL,NOW(),NULL,'migration_seed',NULL,'Islands Trust Sunshine Coast (Historical)','SOUR',NULL,false,false,'{}'), - ('b9056ee1-5ba3-4d7c-9029-2cec57ba75d5',NULL,NOW(),NULL,'migration_seed',NULL,'Islands Trust Cowichan Valley (Historical)','ISLR',NULL,false,false,'{}'), - ('55f665bc-c91b-4bbb-85c2-39691088b297',NULL,NOW(),NULL,'migration_seed',NULL,'Northern Rockies (Historical)','NORR',NULL,false,false,'{}'), + ('88532d18-3059-4720-986a-363d9bce6be0',NULL,NOW(),NULL,'migration_seed',NULL,'Islands Trust- Comox Strathcona (Historical)','ISLR',NULL,false,false,'{}'), + ('4e721d39-09b3-4f9b-ad1f-601a69315808',NULL,NOW(),NULL,'migration_seed',NULL,'Islands Trust- Nanaimo (Historical)','ISLR',NULL,false,false,'{}'), + ('9355bf78-280a-4695-adad-fafa06969c99',NULL,NOW(),NULL,'migration_seed',NULL,'Islands Trust-Capital (Historical)','ISLR',NULL,false,false,'{}'), + ('8017df89-8e71-41c3-bee9-1a48f042e157',NULL,NOW(),NULL,'migration_seed',NULL,'Islands Trust-Powell River (Historical)','ISLR',NULL,false,false,'{}'), + ('26f395a1-44ab-4812-9e0d-f2dbc815859d',NULL,NOW(),NULL,'migration_seed',NULL,'Islands Trust-Sunshine Coast (Historical)','SOUR',NULL,false,false,'{}'), + ('b9056ee1-5ba3-4d7c-9029-2cec57ba75d5',NULL,NOW(),NULL,'migration_seed',NULL,'Islands Trust - Cowichan Valley (Historical)','ISLR',NULL,false,false,'{}'), + ('55f665bc-c91b-4bbb-85c2-39691088b297',NULL,NOW(),NULL,'migration_seed',NULL,'Islands Trust Bowen Island (Historical)','SOUR',NULL,false,false,'{}'), ('7577c7e9-d65b-4051-a0b1-bc95c462bdc3',NULL,NOW(),NULL,'migration_seed',NULL,'Islands Trust Denman Island (Historical)','ISLR',NULL,false,false,'{}'); `); } From ed9bdf83be8d8512c167f856f354ab0c87cedd55 Mon Sep 17 00:00:00 2001 From: Liam Stoddard Date: Thu, 29 Jun 2023 16:47:06 -0700 Subject: [PATCH 038/954] removed other modified migration file --- .../typeorm/migrations/1687546406729-seed_add_adl_loc_gov.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1687546406729-seed_add_adl_loc_gov.ts b/services/apps/alcs/src/providers/typeorm/migrations/1687546406729-seed_add_adl_loc_gov.ts index aeba419435..ec15f01b62 100644 --- a/services/apps/alcs/src/providers/typeorm/migrations/1687546406729-seed_add_adl_loc_gov.ts +++ b/services/apps/alcs/src/providers/typeorm/migrations/1687546406729-seed_add_adl_loc_gov.ts @@ -8,6 +8,7 @@ export class seedAddAdlLocGov1687546406729 implements MigrationInterface { ('b8a622d7-66da-4598-9687-2e8727fb2561',NULL,NOW(),NULL,'migration_seed',NULL,'City of Port Alberni','ISLR',NULL,false,true,'{}'), ('18bd941a-7c0f-44fe-9d12-a084d2a5f372',NULL,NOW(),NULL,'migration_seed',NULL,'Village of Port Clements','NORR',NULL,false,true,'{}'), ('0235ecdb-95fc-47f9-b7f6-e05e1e388d5b',NULL,NOW(),NULL,'migration_seed',NULL,'Village of Slocan','KOOR',NULL,false,true,'{}'), + ('0136a261-6237-4332-ae6a-1c7d7f49f0e8',NULL,NOW(),NULL,'migration_seed',NULL,'Village of Chase','INTR',NULL,false,true,'{}'), ('5b5b05d3-df2e-403c-9cf5-3c52c68ab559',NULL,NOW(),NULL,'migration_seed',NULL,'Village of Cumberland','ISLR',NULL,false,true,'{}'), ('e0684ddf-fa61-47c2-87b3-1c72bed5c365',NULL,NOW(),NULL,'migration_seed',NULL,'District of Fort St. James','NORR',NULL,false,true,'{}'), ('5dc1a21a-a740-402e-a56f-8f6c85991739',NULL,NOW(),NULL,'migration_seed',NULL,'District of Wells','INTR',NULL,false,true,'{}'), From 5a582d881c24d2eb7b265b4450e421d0c9072332 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Fri, 30 Jun 2023 10:54:34 -0700 Subject: [PATCH 039/954] Add Parcel Prep Table to App Prep * Add editable ALR Area * Add new column for it * Add new component with table for display --- .../applicant-info.component.ts | 1 + .../parcel/parcel.component.html | 2 +- .../parcel/parcel.component.spec.ts | 10 ++- .../parcel/parcel.component.ts | 31 +++++++++- .../application/application.module.ts | 2 + .../parcel-prep/parcel-prep.component.html | 62 +++++++++++++++++++ .../parcel-prep/parcel-prep.component.scss | 17 +++++ .../parcel-prep/parcel-prep.component.spec.ts | 33 ++++++++++ .../parcel-prep/parcel-prep.component.ts | 50 +++++++++++++++ .../proposal/proposal.component.html | 6 +- .../application-parcel.service.ts | 16 +++++ .../services/application/application.dto.ts | 1 + .../application-parcel.controller.spec.ts | 22 +++++++ .../application-parcel.controller.ts | 21 ++++++- .../application-parcel.dto.ts | 13 +++- .../application-parcel.entity.ts | 11 ++++ .../application-parcel.service.ts | 7 ++- .../1688078238188-add_parcel_alr_area.ts | 17 +++++ 18 files changed, 310 insertions(+), 12 deletions(-) create mode 100644 alcs-frontend/src/app/features/application/proposal/parcel-prep/parcel-prep.component.html create mode 100644 alcs-frontend/src/app/features/application/proposal/parcel-prep/parcel-prep.component.scss create mode 100644 alcs-frontend/src/app/features/application/proposal/parcel-prep/parcel-prep.component.spec.ts create mode 100644 alcs-frontend/src/app/features/application/proposal/parcel-prep/parcel-prep.component.ts create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1688078238188-add_parcel_alr_area.ts diff --git a/alcs-frontend/src/app/features/application/applicant-info/applicant-info.component.ts b/alcs-frontend/src/app/features/application/applicant-info/applicant-info.component.ts index f302553db1..8fd982baba 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/applicant-info.component.ts +++ b/alcs-frontend/src/app/features/application/applicant-info/applicant-info.component.ts @@ -1,4 +1,5 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; +import { ActivatedRoute } from '@angular/router'; import { Subject, takeUntil } from 'rxjs'; import { ApplicationDetailService } from '../../../services/application/application-detail.service'; import { DOCUMENT_TYPE } from '../../../services/application/application-document/application-document.service'; diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/parcel/parcel.component.html b/alcs-frontend/src/app/features/application/applicant-info/application-details/parcel/parcel.component.html index a561191781..2847f9dcd6 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/application-details/parcel/parcel.component.html +++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/parcel/parcel.component.html @@ -13,7 +13,7 @@

-

Parcel {{ parcelInd + 1 }}: Parcel and Owner Information

+

Parcel {{ parcelInd + 1 }}: Parcel and Owner Information

Parcel Information
Ownership Type
diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/parcel/parcel.component.spec.ts b/alcs-frontend/src/app/features/application/applicant-info/application-details/parcel/parcel.component.spec.ts index b2df3aa9a4..c9b6ee0c52 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/application-details/parcel/parcel.component.spec.ts +++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/parcel/parcel.component.spec.ts @@ -1,7 +1,8 @@ -import { HttpClient } from '@angular/common/http'; import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { ActivatedRoute } from '@angular/router'; import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { Observable } from 'rxjs'; import { ApplicationDocumentService } from '../../../../../services/application/application-document/application-document.service'; import { SharedModule } from '../../../../../shared/shared.module'; import { ParcelComponent } from './parcel.component'; @@ -10,10 +11,13 @@ describe('ParcelComponent', () => { let component: ParcelComponent; let fixture: ComponentFixture; + let mockRoute: DeepMocked; let mockAppDocumentService: DeepMocked; beforeEach(async () => { mockAppDocumentService = createMock(); + mockRoute = createMock(); + mockRoute.fragment = new Observable(); await TestBed.configureTestingModule({ declarations: [ParcelComponent], @@ -22,6 +26,10 @@ describe('ParcelComponent', () => { provides: ApplicationDocumentService, useValue: mockAppDocumentService, }, + { + provide: ActivatedRoute, + useValue: mockRoute, + }, ], schemas: [NO_ERRORS_SCHEMA], imports: [SharedModule], diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/parcel/parcel.component.ts b/alcs-frontend/src/app/features/application/applicant-info/application-details/parcel/parcel.component.ts index d3df83e4ff..77d5dada58 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/application-details/parcel/parcel.component.ts +++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/parcel/parcel.component.ts @@ -1,4 +1,6 @@ -import { Component, Input, OnChanges, OnInit, SimpleChanges } from '@angular/core'; +import { Component, Input, OnChanges, OnDestroy, OnInit, SimpleChanges } from '@angular/core'; +import { ActivatedRoute, Router } from '@angular/router'; +import { Subject, takeUntil } from 'rxjs'; import { ApplicationDocumentDto } from '../../../../../services/application/application-document/application-document.dto'; import { ApplicationDocumentService } from '../../../../../services/application/application-document/application-document.service'; import { ApplicationParcelService } from '../../../../../services/application/application-parcel/application-parcel.service'; @@ -9,7 +11,9 @@ import { ApplicationSubmissionDto, PARCEL_OWNERSHIP_TYPE } from '../../../../../ templateUrl: './parcel.component.html', styleUrls: ['./parcel.component.scss'], }) -export class ParcelComponent implements OnInit, OnChanges { +export class ParcelComponent implements OnInit, OnChanges, OnDestroy { + $destroy = new Subject(); + @Input() application!: ApplicationSubmissionDto; @Input() files: ApplicationDocumentDto[] = []; @Input() parcelType!: string; @@ -24,7 +28,8 @@ export class ParcelComponent implements OnInit, OnChanges { constructor( private applicationDocumentService: ApplicationDocumentService, - private parcelService: ApplicationParcelService + private parcelService: ApplicationParcelService, + private route: ActivatedRoute ) {} ngOnInit(): void { @@ -32,6 +37,21 @@ export class ParcelComponent implements OnInit, OnChanges { this.pageTitle = 'Other Parcels in the Community'; this.showCertificateOfTitle = false; } + + this.route.fragment.pipe(takeUntil(this.$destroy)).subscribe((fragment) => { + if (fragment) { + setTimeout(() => { + const el = document.getElementById(fragment); + if (el) { + el.scrollIntoView({ + behavior: 'smooth', + block: 'start', + inline: 'start', + }); + } + }, 200); + } + }); } async onOpenFile(uuid: string) { @@ -49,4 +69,9 @@ export class ParcelComponent implements OnInit, OnChanges { ngOnChanges(changes: SimpleChanges): void { this.loadParcels(this.application.fileNumber); } + + ngOnDestroy(): void { + this.$destroy.next(); + this.$destroy.complete(); + } } diff --git a/alcs-frontend/src/app/features/application/application.module.ts b/alcs-frontend/src/app/features/application/application.module.ts index e6bb5d3e84..f9e4f39e9e 100644 --- a/alcs-frontend/src/app/features/application/application.module.ts +++ b/alcs-frontend/src/app/features/application/application.module.ts @@ -23,6 +23,7 @@ import { EditReconsiderationDialogComponent } from './post-decision/edit-reconsi import { PostDecisionComponent } from './post-decision/post-decision.component'; import { NaruProposalComponent } from './proposal/naru/naru.component'; import { NfuProposalComponent } from './proposal/nfu/nfu.component'; +import { ParcelPrepComponent } from './proposal/parcel-prep/parcel-prep.component'; import { ProposalComponent } from './proposal/proposal.component'; import { SoilProposalComponent } from './proposal/soil/soil.component'; import { SubdProposalComponent } from './proposal/subd/subd.component'; @@ -72,6 +73,7 @@ const routes: Routes = [ SoilProposalComponent, TurProposalComponent, NaruProposalComponent, + ParcelPrepComponent, ], imports: [SharedModule, RouterModule.forChild(routes), ApplicationDetailsModule, DecisionModule], }) diff --git a/alcs-frontend/src/app/features/application/proposal/parcel-prep/parcel-prep.component.html b/alcs-frontend/src/app/features/application/proposal/parcel-prep/parcel-prep.component.html new file mode 100644 index 0000000000..b53344d89b --- /dev/null +++ b/alcs-frontend/src/app/features/application/proposal/parcel-prep/parcel-prep.component.html @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
#1PID + {{ row.pid }} + + PIN + {{ row.pin }} + + Civic Address + {{ row.civicAddress }} + Area (ha){{ row.mapAreaHectares }}ALR Area (ha) + + Owner(s) + {{ row.owners }} + Actions + +
diff --git a/alcs-frontend/src/app/features/application/proposal/parcel-prep/parcel-prep.component.scss b/alcs-frontend/src/app/features/application/proposal/parcel-prep/parcel-prep.component.scss new file mode 100644 index 0000000000..c68304cfac --- /dev/null +++ b/alcs-frontend/src/app/features/application/proposal/parcel-prep/parcel-prep.component.scss @@ -0,0 +1,17 @@ +@use '../../../../../styles/colors'; + +.link-button { + color: colors.$link-color; +} + +:host::ng-deep { + th { + font-weight: 700; + } +} + +.civic-address { + white-space: nowrap; + overflow: hidden; + text-overflow: clip; +} diff --git a/alcs-frontend/src/app/features/application/proposal/parcel-prep/parcel-prep.component.spec.ts b/alcs-frontend/src/app/features/application/proposal/parcel-prep/parcel-prep.component.spec.ts new file mode 100644 index 0000000000..784da28e39 --- /dev/null +++ b/alcs-frontend/src/app/features/application/proposal/parcel-prep/parcel-prep.component.spec.ts @@ -0,0 +1,33 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { ApplicationParcelService } from '../../../../services/application/application-parcel/application-parcel.service'; + +import { ParcelPrepComponent } from './parcel-prep.component'; + +describe('ParcelPrepComponent', () => { + let component: ParcelPrepComponent; + let fixture: ComponentFixture; + let mockAppParcelService: DeepMocked; + + beforeEach(async () => { + mockAppParcelService = createMock(); + + await TestBed.configureTestingModule({ + declarations: [ParcelPrepComponent], + providers: [ + { + provide: ApplicationParcelService, + useValue: mockAppParcelService, + }, + ], + }).compileComponents(); + + fixture = TestBed.createComponent(ParcelPrepComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/alcs-frontend/src/app/features/application/proposal/parcel-prep/parcel-prep.component.ts b/alcs-frontend/src/app/features/application/proposal/parcel-prep/parcel-prep.component.ts new file mode 100644 index 0000000000..5bf3bce19a --- /dev/null +++ b/alcs-frontend/src/app/features/application/proposal/parcel-prep/parcel-prep.component.ts @@ -0,0 +1,50 @@ +import { Component, Input, OnChanges } from '@angular/core'; +import { Router } from '@angular/router'; +import { ApplicationParcelService } from '../../../../services/application/application-parcel/application-parcel.service'; + +@Component({ + selector: 'app-parcel-prep[fileNumber]', + templateUrl: './parcel-prep.component.html', + styleUrls: ['./parcel-prep.component.scss'], +}) +export class ParcelPrepComponent implements OnChanges { + @Input() fileNumber = ''; + + displayedColumns = ['number', 'pid', 'pin', 'civicAddress', 'area', 'alrArea', 'owners', 'actions']; + parcels: { + pin?: string; + pid?: string; + mapAreaHectares: string; + alrArea: number; + owners: string; + fullOwners: string; + hasManyOwners: boolean; + uuid: string; + }[] = []; + + constructor(private parcelService: ApplicationParcelService, private router: Router) {} + + async loadParcels(fileNumber: string) { + const parcels = await this.parcelService.fetchParcels(fileNumber); + this.parcels = parcels.map((parcel) => ({ + ...parcel, + owners: `${parcel.owners[0].displayName} ${parcel.owners.length > 1 ? ' et al.' : ''}`, + fullOwners: parcel.owners.map((owner) => owner.displayName).join(', '), + hasManyOwners: parcel.owners.length > 1, + })); + } + + async saveParcel(uuid: string, alrArea: string | null) { + await this.parcelService.setParcelArea(uuid, alrArea ? parseFloat(alrArea) : null); + } + + ngOnChanges(): void { + this.loadParcels(this.fileNumber); + } + + async navigateToParcelDetails(uuid: any) { + await this.router.navigate(['application', this.fileNumber, 'applicant-info'], { + fragment: uuid, + }); + } +} diff --git a/alcs-frontend/src/app/features/application/proposal/proposal.component.html b/alcs-frontend/src/app/features/application/proposal/proposal.component.html index 14c4105fb8..65e2e600ae 100644 --- a/alcs-frontend/src/app/features/application/proposal/proposal.component.html +++ b/alcs-frontend/src/app/features/application/proposal/proposal.component.html @@ -3,7 +3,7 @@

Application Prep

Proposal Components - {{ application?.type?.label }}
-
ALR Area (ha)
+
Proposal ALR Area (ha)
@@ -45,6 +45,10 @@
Proposal Components - {{ application?.type?.label }}
> +
+
Application Parcels
+ +
Staff Comments and Observations
{ + try { + const res = await firstValueFrom( + this.http.post(`${this.baseUrl}/${uuid}`, { + alrArea, + }) + ); + this.toastService.showSuccessToast('Application updated'); + + return res; + } catch (e) { + this.toastService.showErrorToast('Failed to update Application Parcel'); + throw e; + } + } } diff --git a/alcs-frontend/src/app/services/application/application.dto.ts b/alcs-frontend/src/app/services/application/application.dto.ts index ae28139a65..e98b27f16d 100644 --- a/alcs-frontend/src/app/services/application/application.dto.ts +++ b/alcs-frontend/src/app/services/application/application.dto.ts @@ -84,6 +84,7 @@ export interface ApplicationParcelDto { parcelType?: string; certificateOfTitleUuid?: string; owners: SubmittedApplicationOwnerDto[]; + alrArea: number; } export interface ApplicationSubmissionDto { diff --git a/services/apps/alcs/src/alcs/application/application-parcel/application-parcel.controller.spec.ts b/services/apps/alcs/src/alcs/application/application-parcel/application-parcel.controller.spec.ts index 4c3822c2cb..f196b0c069 100644 --- a/services/apps/alcs/src/alcs/application/application-parcel/application-parcel.controller.spec.ts +++ b/services/apps/alcs/src/alcs/application/application-parcel/application-parcel.controller.spec.ts @@ -42,4 +42,26 @@ describe('ApplicationParcelController', () => { it('should be defined', () => { expect(controller).toBeDefined(); }); + + it('should call through to service for get', async () => { + mockParcelService.fetchByApplicationFileId.mockResolvedValue([]); + + await controller.get(''); + expect(mockParcelService.fetchByApplicationFileId).toHaveBeenCalledTimes(1); + }); + + it('should call through to service for update', async () => { + mockParcelService.update.mockResolvedValue([]); + + await controller.update('12', { + alrArea: 5, + }); + expect(mockParcelService.update).toHaveBeenCalledTimes(1); + expect(mockParcelService.update).toHaveBeenCalledWith([ + { + uuid: '12', + alrArea: 5, + }, + ]); + }); }); diff --git a/services/apps/alcs/src/alcs/application/application-parcel/application-parcel.controller.ts b/services/apps/alcs/src/alcs/application/application-parcel/application-parcel.controller.ts index 0fd13d20ae..632dc4c510 100644 --- a/services/apps/alcs/src/alcs/application/application-parcel/application-parcel.controller.ts +++ b/services/apps/alcs/src/alcs/application/application-parcel/application-parcel.controller.ts @@ -1,16 +1,14 @@ import { Mapper } from '@automapper/core'; import { InjectMapper } from '@automapper/nestjs'; -import { Controller, Get, Param, UseGuards } from '@nestjs/common'; +import { Body, Controller, Get, Param, Post, UseGuards } from '@nestjs/common'; import { ApiOAuth2 } from '@nestjs/swagger'; import * as config from 'config'; import { ANY_AUTH_ROLE } from '../../../common/authorization/roles'; import { RolesGuard } from '../../../common/authorization/roles-guard.service'; import { UserRoles } from '../../../common/authorization/roles.decorator'; -import { DocumentService } from '../../../document/document.service'; import { ApplicationParcelDto } from '../../../portal/application-submission/application-parcel/application-parcel.dto'; import { ApplicationParcel } from '../../../portal/application-submission/application-parcel/application-parcel.entity'; import { ApplicationParcelService } from '../../../portal/application-submission/application-parcel/application-parcel.service'; -import { ApplicationSubmissionService } from '../application-submission/application-submission.service'; @ApiOAuth2(config.get('KEYCLOAK.SCOPES')) @UseGuards(RolesGuard) @@ -33,4 +31,21 @@ export class ApplicationParcelController { ApplicationParcelDto, ); } + + @UserRoles(...ANY_AUTH_ROLE) + @Post('/:uuid') + async update(@Param('uuid') uuid: string, @Body() body: { alrArea: number }) { + const parcels = await this.applicationParcelService.update([ + { + uuid, + alrArea: body.alrArea, + }, + ]); + + return this.mapper.mapArray( + parcels, + ApplicationParcel, + ApplicationParcelDto, + )[0]; + } } diff --git a/services/apps/alcs/src/portal/application-submission/application-parcel/application-parcel.dto.ts b/services/apps/alcs/src/portal/application-submission/application-parcel/application-parcel.dto.ts index e77990ae9d..b00a1195fb 100644 --- a/services/apps/alcs/src/portal/application-submission/application-parcel/application-parcel.dto.ts +++ b/services/apps/alcs/src/portal/application-submission/application-parcel/application-parcel.dto.ts @@ -59,6 +59,9 @@ export class ApplicationParcelDto { @AutoMap(() => String) parcelType: string; + @AutoMap(() => Number) + alrArea: number | null; + certificateOfTitle?: ApplicationDocumentDto; owners: ApplicationOwnerDetailedDto[]; } @@ -110,7 +113,8 @@ export class ApplicationParcelUpdateDto { isFarm?: boolean | null; @IsBoolean() - isConfirmedByApplicant: boolean; + @IsOptional() + isConfirmedByApplicant?: boolean; @IsString() @IsOptional() @@ -121,7 +125,12 @@ export class ApplicationParcelUpdateDto { crownLandOwnerType?: string | null; @IsArray() - ownerUuids: string[] | null; + @IsOptional() + ownerUuids?: string[] | null; + + @IsNumber() + @IsOptional() + alrArea?: number | null; } export enum PARCEL_TYPE { diff --git a/services/apps/alcs/src/portal/application-submission/application-parcel/application-parcel.entity.ts b/services/apps/alcs/src/portal/application-submission/application-parcel/application-parcel.entity.ts index 71e65c9661..3fd81342d6 100644 --- a/services/apps/alcs/src/portal/application-submission/application-parcel/application-parcel.entity.ts +++ b/services/apps/alcs/src/portal/application-submission/application-parcel/application-parcel.entity.ts @@ -10,6 +10,7 @@ import { import { ApplicationDocumentDto } from '../../../alcs/application/application-document/application-document.dto'; import { ApplicationDocument } from '../../../alcs/application/application-document/application-document.entity'; import { Base } from '../../../common/entities/base.entity'; +import { ColumnNumericTransformer } from '../../../utils/column-numeric-transform'; import { ApplicationOwner } from '../application-owner/application-owner.entity'; import { ApplicationSubmission } from '../application-submission.entity'; import { ApplicationParcelOwnershipType } from './application-parcel-ownership-type/application-parcel-ownership-type.entity'; @@ -143,4 +144,14 @@ export class ApplicationParcel extends Base { @AutoMap(() => String) @Column({ nullable: true }) certificateOfTitleUuid: string | null; + + @AutoMap(() => Number) + @Column({ + type: 'decimal', + nullable: true, + precision: 12, + scale: 2, + transformer: new ColumnNumericTransformer(), + }) + alrArea?: number | null; } diff --git a/services/apps/alcs/src/portal/application-submission/application-parcel/application-parcel.service.ts b/services/apps/alcs/src/portal/application-submission/application-parcel/application-parcel.service.ts index 64de5f87d2..1ecad9f688 100644 --- a/services/apps/alcs/src/portal/application-submission/application-parcel/application-parcel.service.ts +++ b/services/apps/alcs/src/portal/application-submission/application-parcel/application-parcel.service.ts @@ -4,6 +4,7 @@ import { InjectRepository } from '@nestjs/typeorm'; import { In, Repository } from 'typeorm'; import { ApplicationDocument } from '../../../alcs/application/application-document/application-document.entity'; import { formatIncomingDate } from '../../../utils/incoming-date.formatter'; +import { filterUndefined } from '../../../utils/undefined'; import { ApplicationOwnerService } from '../application-owner/application-owner.service'; import { ApplicationParcelUpdateDto } from './application-parcel.dto'; import { ApplicationParcel } from './application-parcel.entity'; @@ -89,8 +90,12 @@ export class ApplicationParcelService { parcel.isFarm = updateDto.isFarm; parcel.purchasedDate = formatIncomingDate(updateDto.purchasedDate); parcel.ownershipTypeCode = updateDto.ownershipTypeCode; - parcel.isConfirmedByApplicant = updateDto.isConfirmedByApplicant; + parcel.isConfirmedByApplicant = filterUndefined( + updateDto.isConfirmedByApplicant, + parcel.isConfirmedByApplicant, + ); parcel.crownLandOwnerType = updateDto.crownLandOwnerType; + parcel.alrArea = updateDto.alrArea; if (updateDto.ownerUuids) { hasOwnerUpdate = true; diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1688078238188-add_parcel_alr_area.ts b/services/apps/alcs/src/providers/typeorm/migrations/1688078238188-add_parcel_alr_area.ts new file mode 100644 index 0000000000..2be91975e2 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1688078238188-add_parcel_alr_area.ts @@ -0,0 +1,17 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class addParcelAlrArea1688078238188 implements MigrationInterface { + name = 'addParcelAlrArea1688078238188'; + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `ALTER TABLE "alcs"."application_parcel" ADD "alr_area" numeric(12,2)`, + ); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `ALTER TABLE "alcs"."application_parcel" DROP COLUMN "alr_area"`, + ); + } +} From 9d5b429ef594867a7f1a479e2ad60400b2bb98c5 Mon Sep 17 00:00:00 2001 From: Liam Stoddard Date: Fri, 30 Jun 2023 11:08:39 -0700 Subject: [PATCH 040/954] fixing errors in migrations --- .../1688144882418-local_gov_corrections.ts | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1688144882418-local_gov_corrections.ts diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1688144882418-local_gov_corrections.ts b/services/apps/alcs/src/providers/typeorm/migrations/1688144882418-local_gov_corrections.ts new file mode 100644 index 0000000000..12c9abfc32 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1688144882418-local_gov_corrections.ts @@ -0,0 +1,25 @@ +import { MigrationInterface, QueryRunner } from "typeorm" + +export class localGovCorrections1688144882418 implements MigrationInterface { + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query(` + UPDATE "alcs"."application_local_government" SET "name" = 'Islands Trust Comox Strathcona (Historical)' WHERE "name" = 'Islands Trust- Comox Strathcona (Historical)'; + UPDATE "alcs"."application_local_government" SET "name" = 'Islands Trust Nanaimo (Historical)' WHERE "name" = 'Islands Trust- Nanaimo (Historical)'; + UPDATE "alcs"."application_local_government" SET "name" = 'Islands Trust Capital (Historical)' WHERE "name" = 'Islands Trust-Capital (Historical)'; + UPDATE "alcs"."application_local_government" SET "name" = 'Islands Trust Powell River (Historical)' WHERE "name" = 'Islands Trust-Powell River (Historical)'; + UPDATE "alcs"."application_local_government" SET "name" = 'Islands Trust Sunshine Coast (Historical)' WHERE "name" = 'Islands Trust-Sunshine Coast (Historical)'; + UPDATE "alcs"."application_local_government" SET "name" = 'Islands Trust Cowichan Valley (Historical)' WHERE "name" = 'Islands Trust - Cowichan Valley (Historical)'; + UPDATE "alcs"."application_local_government" SET "name" = 'Northern Rockies (Historical)' WHERE "uuid" = '55f665bc-c91b-4bbb-85c2-39691088b297'; + UPDATE "alcs"."application_local_government" SET "preferred_region_code" = 'NORR' WHERE "uuid" = '55f665bc-c91b-4bbb-85c2-39691088b297'; + DELETE FROM alcs.application_local_government WHERE uuid = '0136a261-6237-4332-ae6a-1c7d7f49f0e8'; + INSERT INTO alcs.application_local_government (uuid,audit_deleted_date_at,audit_created_at,audit_updated_at,audit_created_by,audit_updated_by,"name",preferred_region_code,bceid_business_guid,is_first_nation,is_active,emails) VALUES + ('e2540566-52a8-4a3c-b373-58e1744703af',NULL,NOW(),NULL,'migration_seed',NULL,'Islands Trust Galiano Island (Historical)','ISLR',NULL,false,false,'{}'); + `); + } + + public async down(queryRunner: QueryRunner): Promise { + //N/A + } + +} From 659fd95e140585496382bc580f5b67a77b799f08 Mon Sep 17 00:00:00 2001 From: Liam Stoddard Date: Tue, 27 Jun 2023 15:53:37 -0700 Subject: [PATCH 041/954] updated migration & implemented case-when for historical IslTrst --- .../sql/insert-batch-application.sql | 23 +++++++++++++++++-- .../1687810457499-seed_inactive_local_gov.ts | 14 +++++------ 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/bin/migrate-oats-data/sql/insert-batch-application.sql b/bin/migrate-oats-data/sql/insert-batch-application.sql index 2358d2c521..bdb992cbf5 100644 --- a/bin/migrate-oats-data/sql/insert-batch-application.sql +++ b/bin/migrate-oats-data/sql/insert-batch-application.sql @@ -49,12 +49,31 @@ alcs_gov AS ( oats_gov JOIN alcs.application_local_government alg on ( CASE - WHEN oats_gov.oats_gov_name LIKE 'Islands Trust%' THEN 'Islands Trust' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Gabriola Island' THEN 'Islands Trust Gabriola Island (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Galiano Island' THEN 'Islands Trust Galiano Island (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Gambier Island' THEN 'Islands Trust Gambier Island (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Hornby Island' THEN 'Islands Trust Hornby Island (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Lasqueti Island' THEN 'Islands Trust Lasqueti Island (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Mayne Island' THEN 'Islands Trust Mayne Island (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Pender Island' THEN 'Islands Trust Pender Island (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Quadra Island' THEN 'Islands Trust Quadra Island (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Salt Spring Island' THEN 'Islands Trust Salt Spring Island (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Saturna Island' THEN 'Islands Trust Saturna Island (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Sidney Island' THEN 'Islands Trust Sidney Island (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust- Comox Strathcona' THEN 'Islands Trust Comox Strathcona (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust- Nanaimo' THEN 'Islands Trust Nanaimo (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust-Capital' THEN 'Islands Trust Capital (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust-Powell River' THEN 'Islands Trust Powell River (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust-Sunshine Coast' THEN 'Islands Trust Sunshine Coast (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Bowen Island' THEN 'Bowen Island (Island Municipality)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Denman Island' THEN 'Islands Trust Denman Island (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust - Cowichan Valley' THEN 'Islands Trust Cowichan Valley (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Northern Rockies' THEN 'Northern Rockies (Historical)' WHEN oats_gov.oats_gov_name LIKE 'Sliammon%' THEN 'Tla''amin Nation' ELSE oats_gov.oats_gov_name END ) = alg."name" -), +), -- Step 3: Perform a lookup to retrieve the region code for each application ID panel_lookup AS ( SELECT DISTINCT diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1687810457499-seed_inactive_local_gov.ts b/services/apps/alcs/src/providers/typeorm/migrations/1687810457499-seed_inactive_local_gov.ts index d57b15c352..0a7dd674a3 100644 --- a/services/apps/alcs/src/providers/typeorm/migrations/1687810457499-seed_inactive_local_gov.ts +++ b/services/apps/alcs/src/providers/typeorm/migrations/1687810457499-seed_inactive_local_gov.ts @@ -33,13 +33,13 @@ export class seedInactiveLocalGov1687810457499 implements MigrationInterface { ('dc0357b1-aacd-45ba-8fa9-0e62cbe88e9f',NULL,NOW(),NULL,'migration_seed',NULL,'Islands Trust Salt Spring Island (Historical)','ISLR',NULL,false,false,'{}'), ('3890ccf8-94e3-4b9a-9a1c-4d33518e1b5d',NULL,NOW(),NULL,'migration_seed',NULL,'Islands Trust Saturna Island (Historical)','ISLR',NULL,false,false,'{}'), ('538b895f-f0e1-4388-93cb-9eeb7cfa987e',NULL,NOW(),NULL,'migration_seed',NULL,'Islands Trust Sidney Island (Historical)','ISLR',NULL,false,false,'{}'), - ('88532d18-3059-4720-986a-363d9bce6be0',NULL,NOW(),NULL,'migration_seed',NULL,'Islands Trust- Comox Strathcona (Historical)','ISLR',NULL,false,false,'{}'), - ('4e721d39-09b3-4f9b-ad1f-601a69315808',NULL,NOW(),NULL,'migration_seed',NULL,'Islands Trust- Nanaimo (Historical)','ISLR',NULL,false,false,'{}'), - ('9355bf78-280a-4695-adad-fafa06969c99',NULL,NOW(),NULL,'migration_seed',NULL,'Islands Trust-Capital (Historical)','ISLR',NULL,false,false,'{}'), - ('8017df89-8e71-41c3-bee9-1a48f042e157',NULL,NOW(),NULL,'migration_seed',NULL,'Islands Trust-Powell River (Historical)','ISLR',NULL,false,false,'{}'), - ('26f395a1-44ab-4812-9e0d-f2dbc815859d',NULL,NOW(),NULL,'migration_seed',NULL,'Islands Trust-Sunshine Coast (Historical)','SOUR',NULL,false,false,'{}'), - ('b9056ee1-5ba3-4d7c-9029-2cec57ba75d5',NULL,NOW(),NULL,'migration_seed',NULL,'Islands Trust - Cowichan Valley (Historical)','ISLR',NULL,false,false,'{}'), - ('55f665bc-c91b-4bbb-85c2-39691088b297',NULL,NOW(),NULL,'migration_seed',NULL,'Islands Trust Bowen Island (Historical)','SOUR',NULL,false,false,'{}'), + ('88532d18-3059-4720-986a-363d9bce6be0',NULL,NOW(),NULL,'migration_seed',NULL,'Islands Trust Comox Strathcona (Historical)','ISLR',NULL,false,false,'{}'), + ('4e721d39-09b3-4f9b-ad1f-601a69315808',NULL,NOW(),NULL,'migration_seed',NULL,'Islands Trust Nanaimo (Historical)','ISLR',NULL,false,false,'{}'), + ('9355bf78-280a-4695-adad-fafa06969c99',NULL,NOW(),NULL,'migration_seed',NULL,'Islands Trust Capital (Historical)','ISLR',NULL,false,false,'{}'), + ('8017df89-8e71-41c3-bee9-1a48f042e157',NULL,NOW(),NULL,'migration_seed',NULL,'Islands Trust Powell River (Historical)','ISLR',NULL,false,false,'{}'), + ('26f395a1-44ab-4812-9e0d-f2dbc815859d',NULL,NOW(),NULL,'migration_seed',NULL,'Islands Trust Sunshine Coast (Historical)','SOUR',NULL,false,false,'{}'), + ('b9056ee1-5ba3-4d7c-9029-2cec57ba75d5',NULL,NOW(),NULL,'migration_seed',NULL,'Islands Trust Cowichan Valley (Historical)','ISLR',NULL,false,false,'{}'), + ('55f665bc-c91b-4bbb-85c2-39691088b297',NULL,NOW(),NULL,'migration_seed',NULL,'Northern Rockies (Historical)','NORR',NULL,false,false,'{}'), ('7577c7e9-d65b-4051-a0b1-bc95c462bdc3',NULL,NOW(),NULL,'migration_seed',NULL,'Islands Trust Denman Island (Historical)','ISLR',NULL,false,false,'{}'); `); } From b61f06774a958010ab8e7d210ac3e288b777d442 Mon Sep 17 00:00:00 2001 From: Liam Stoddard Date: Thu, 29 Jun 2023 14:55:22 -0700 Subject: [PATCH 042/954] local gov bug fixed --- .../sql/insert-batch-application.sql | 153 +++++++++--------- .../1687546406729-seed_add_adl_loc_gov.ts | 1 - .../1687810457499-seed_inactive_local_gov.ts | 1 + 3 files changed, 78 insertions(+), 77 deletions(-) diff --git a/bin/migrate-oats-data/sql/insert-batch-application.sql b/bin/migrate-oats-data/sql/insert-batch-application.sql index bdb992cbf5..2fe3d63bc4 100644 --- a/bin/migrate-oats-data/sql/insert-batch-application.sql +++ b/bin/migrate-oats-data/sql/insert-batch-application.sql @@ -1,4 +1,3 @@ - -- Step 1: Perform a lookup to retrieve the applicant's name or organization for each application ID WITH applicant_lookup AS ( @@ -26,82 +25,84 @@ WITH GROUP BY oaap.alr_application_id ), - --- Step 2: get local gov application name & match to uuid -oats_gov AS ( - SELECT - oaap.alr_application_id AS application_id, - oo.organization_name AS oats_gov_name - FROM - oats.oats_alr_application_parties oaap - JOIN oats.oats_person_organizations opo ON oaap.person_organization_id = opo.person_organization_id - JOIN oats.oats_organizations oo ON opo.organization_id = oo.organization_id - WHERE - oo.organization_type_cd = 'MUNI' - OR oo.organization_type_cd = 'FN' -), - -alcs_gov AS ( - SELECT - oats_gov.application_id AS application_id, - alg.uuid AS gov_uuid - FROM - oats_gov - JOIN alcs.application_local_government alg on ( + -- Step 2: get local gov application name & match to uuid + oats_gov AS ( + SELECT + oaap.alr_application_id AS application_id, + oo.organization_name AS oats_gov_name + FROM + oats.oats_alr_application_parties oaap + JOIN oats.oats_person_organizations opo ON oaap.person_organization_id = opo.person_organization_id + JOIN oats.oats_organizations oo ON opo.organization_id = oo.organization_id + WHERE + oo.organization_type_cd = 'MUNI' + OR oo.organization_type_cd = 'FN' + OR oo.organization_type_cd = 'RD' + ), + alcs_gov AS ( + SELECT + oats_gov.application_id AS application_id, + alg.uuid AS gov_uuid + FROM + oats_gov + JOIN alcs.application_local_government alg on ( + CASE + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Gabriola Island' THEN 'Islands Trust Gabriola Island (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Galiano Island' THEN 'Islands Trust Galiano Island (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Gambier Island' THEN 'Islands Trust Gambier Island (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Hornby Island' THEN 'Islands Trust Hornby Island (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Lasqueti Island' THEN 'Islands Trust Lasqueti Island (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Mayne Island' THEN 'Islands Trust Mayne Island (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Pender Island' THEN 'Islands Trust Pender Island (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Quadra Island' THEN 'Islands Trust Quadra Island (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Salt Spring Island' THEN 'Islands Trust Salt Spring Island (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Saturna Island' THEN 'Islands Trust Saturna Island (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Sidney Island' THEN 'Islands Trust Sidney Island (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust- Comox Strathcona' THEN 'Islands Trust Comox Strathcona (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust- Nanaimo' THEN 'Islands Trust Nanaimo (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust-Capital' THEN 'Islands Trust Capital (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust-Powell River' THEN 'Islands Trust Powell River (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust-Sunshine Coast' THEN 'Islands Trust Sunshine Coast (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Bowen Island' THEN 'Bowen Island (Island Municipality)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Denman Island' THEN 'Islands Trust Denman Island (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust - Cowichan Valley' THEN 'Islands Trust Cowichan Valley (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Northern Rockies' THEN 'Northern Rockies (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Sliammon%' THEN 'Tla''amin Nation' + ELSE oats_gov.oats_gov_name + END + ) = alg."name" + ), + -- Step 3: Perform a lookup to retrieve the region code for each application ID + panel_lookup AS ( + SELECT DISTINCT + oaap.alr_application_id AS application_id, CASE - WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Gabriola Island' THEN 'Islands Trust Gabriola Island (Historical)' - WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Galiano Island' THEN 'Islands Trust Galiano Island (Historical)' - WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Gambier Island' THEN 'Islands Trust Gambier Island (Historical)' - WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Hornby Island' THEN 'Islands Trust Hornby Island (Historical)' - WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Lasqueti Island' THEN 'Islands Trust Lasqueti Island (Historical)' - WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Mayne Island' THEN 'Islands Trust Mayne Island (Historical)' - WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Pender Island' THEN 'Islands Trust Pender Island (Historical)' - WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Quadra Island' THEN 'Islands Trust Quadra Island (Historical)' - WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Salt Spring Island' THEN 'Islands Trust Salt Spring Island (Historical)' - WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Saturna Island' THEN 'Islands Trust Saturna Island (Historical)' - WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Sidney Island' THEN 'Islands Trust Sidney Island (Historical)' - WHEN oats_gov.oats_gov_name LIKE 'Islands Trust- Comox Strathcona' THEN 'Islands Trust Comox Strathcona (Historical)' - WHEN oats_gov.oats_gov_name LIKE 'Islands Trust- Nanaimo' THEN 'Islands Trust Nanaimo (Historical)' - WHEN oats_gov.oats_gov_name LIKE 'Islands Trust-Capital' THEN 'Islands Trust Capital (Historical)' - WHEN oats_gov.oats_gov_name LIKE 'Islands Trust-Powell River' THEN 'Islands Trust Powell River (Historical)' - WHEN oats_gov.oats_gov_name LIKE 'Islands Trust-Sunshine Coast' THEN 'Islands Trust Sunshine Coast (Historical)' - WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Bowen Island' THEN 'Bowen Island (Island Municipality)' - WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Denman Island' THEN 'Islands Trust Denman Island (Historical)' - WHEN oats_gov.oats_gov_name LIKE 'Islands Trust - Cowichan Valley' THEN 'Islands Trust Cowichan Valley (Historical)' - WHEN oats_gov.oats_gov_name LIKE 'Northern Rockies' THEN 'Northern Rockies (Historical)' - WHEN oats_gov.oats_gov_name LIKE 'Sliammon%' THEN 'Tla''amin Nation' - ELSE oats_gov.oats_gov_name - END - ) = alg."name" -), --- Step 3: Perform a lookup to retrieve the region code for each application ID -panel_lookup AS ( - SELECT DISTINCT - oaap.alr_application_id AS application_id, - oo2.organization_name AS panel_region - FROM - oats.oats_alr_application_parties oaap - JOIN oats.oats_person_organizations opo ON oaap.person_organization_id = opo.person_organization_id - JOIN oats.oats_organizations oo ON opo.organization_id = oo.organization_id - JOIN oats.oats_organizations oo2 ON oo.parent_organization_id = oo2.organization_id - WHERE - oo2.organization_type_cd = 'PANEL' -), - --- Step 4: Perform lookup to retrieve type code -application_type_lookup AS ( - SELECT - oaac.alr_application_id AS application_id, - oacc."description" AS "description", - oaac.alr_change_code AS code - FROM - oats.oats_alr_appl_components AS oaac - JOIN oats.oats_alr_change_codes oacc ON oaac.alr_change_code = oacc.alr_change_code - LEFT JOIN oats.alcs_etl_application_exclude aee ON oaac.alr_appl_component_id = aee.component_id - WHERE - aee.component_id IS NULL -) - + WHEN oo2.parent_organization_id isnull then oo2.organization_name + WHEN oo3.parent_organization_id isnull then oo3.organization_name + ELSE 'NONE' + END AS panel_region + FROM + oats.oats_alr_application_parties oaap + JOIN oats.oats_person_organizations opo ON oaap.person_organization_id = opo.person_organization_id + JOIN oats.oats_organizations oo ON opo.organization_id = oo.organization_id + LEFT JOIN oats.oats_organizations oo2 ON oo.parent_organization_id = oo2.organization_id + LEFT JOIN oats.oats_organizations oo3 ON oo2.parent_organization_id = oo3.organization_id + WHERE + oo2.organization_type_cd = 'PANEL' OR oo3.organization_type_cd = 'PANEL' + ), + -- Step 4: Perform lookup to retrieve type code + application_type_lookup AS ( + SELECT + oaac.alr_application_id AS application_id, + oacc."description" AS "description", + oaac.alr_change_code AS code + FROM + oats.oats_alr_appl_components AS oaac + JOIN oats.oats_alr_change_codes oacc ON oaac.alr_change_code = oacc.alr_change_code + LEFT JOIN oats.alcs_etl_application_exclude aee ON oaac.alr_appl_component_id = aee.component_id + WHERE + aee.component_id IS NULL + ) -- Step 5: Insert new records into the alcs_applications table SELECT oa.alr_application_id :: text AS file_number, diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1687546406729-seed_add_adl_loc_gov.ts b/services/apps/alcs/src/providers/typeorm/migrations/1687546406729-seed_add_adl_loc_gov.ts index ec15f01b62..aeba419435 100644 --- a/services/apps/alcs/src/providers/typeorm/migrations/1687546406729-seed_add_adl_loc_gov.ts +++ b/services/apps/alcs/src/providers/typeorm/migrations/1687546406729-seed_add_adl_loc_gov.ts @@ -8,7 +8,6 @@ export class seedAddAdlLocGov1687546406729 implements MigrationInterface { ('b8a622d7-66da-4598-9687-2e8727fb2561',NULL,NOW(),NULL,'migration_seed',NULL,'City of Port Alberni','ISLR',NULL,false,true,'{}'), ('18bd941a-7c0f-44fe-9d12-a084d2a5f372',NULL,NOW(),NULL,'migration_seed',NULL,'Village of Port Clements','NORR',NULL,false,true,'{}'), ('0235ecdb-95fc-47f9-b7f6-e05e1e388d5b',NULL,NOW(),NULL,'migration_seed',NULL,'Village of Slocan','KOOR',NULL,false,true,'{}'), - ('0136a261-6237-4332-ae6a-1c7d7f49f0e8',NULL,NOW(),NULL,'migration_seed',NULL,'Village of Chase','INTR',NULL,false,true,'{}'), ('5b5b05d3-df2e-403c-9cf5-3c52c68ab559',NULL,NOW(),NULL,'migration_seed',NULL,'Village of Cumberland','ISLR',NULL,false,true,'{}'), ('e0684ddf-fa61-47c2-87b3-1c72bed5c365',NULL,NOW(),NULL,'migration_seed',NULL,'District of Fort St. James','NORR',NULL,false,true,'{}'), ('5dc1a21a-a740-402e-a56f-8f6c85991739',NULL,NOW(),NULL,'migration_seed',NULL,'District of Wells','INTR',NULL,false,true,'{}'), diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1687810457499-seed_inactive_local_gov.ts b/services/apps/alcs/src/providers/typeorm/migrations/1687810457499-seed_inactive_local_gov.ts index 0a7dd674a3..9afe363fbf 100644 --- a/services/apps/alcs/src/providers/typeorm/migrations/1687810457499-seed_inactive_local_gov.ts +++ b/services/apps/alcs/src/providers/typeorm/migrations/1687810457499-seed_inactive_local_gov.ts @@ -24,6 +24,7 @@ export class seedInactiveLocalGov1687810457499 implements MigrationInterface { ('476febec-ca88-4615-810c-fcae936867ef',NULL,NOW(),NULL,'migration_seed',NULL,'Multiple Jurisdictions for Sunshine','SOUR',NULL,false,false,'{}'), ('f0bd3817-5825-4656-b685-d306ddd1fa70',NULL,NOW(),NULL,'migration_seed',NULL,'Multiple Jurisdictions for Thompson-Nicola','INTR',NULL,false,false,'{}'), ('927ece9d-b4e3-4862-aa85-67539d9abb0d',NULL,NOW(),NULL,'migration_seed',NULL,'Islands Trust Gabriola Island (Historical)','ISLR',NULL,false,false,'{}'), + ('e2540566-52a8-4a3c-b373-58e1744703af',NULL,NOW(),NULL,'migration_seed',NULL,'Islands Trust Galiano Island (Historical)','ISLR',NULL,false,false,'{}'), ('9ff02b37-9046-48c8-aa96-01977fb3d1b9',NULL,NOW(),NULL,'migration_seed',NULL,'Islands Trust Gambier Island (Historical)','SOUR',NULL,false,false,'{}'), ('d325a7a4-fe68-49b0-9df2-599beb06766e',NULL,NOW(),NULL,'migration_seed',NULL,'Islands Trust Hornby Island (Historical)','ISLR',NULL,false,false,'{}'), ('9f0bdb45-c212-4aee-8413-3cf3c79e988c',NULL,NOW(),NULL,'migration_seed',NULL,'Islands Trust Lasqueti Island (Historical)','ISLR',NULL,false,false,'{}'), From d8ef1c73207cd7d68a90794bc2fc077ac35c3c85 Mon Sep 17 00:00:00 2001 From: Liam Stoddard Date: Thu, 29 Jun 2023 15:01:23 -0700 Subject: [PATCH 043/954] Regions and local govs are working togethergit add sql/insert-batch-application.sql --- .../sql/insert-batch-application.sql | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/bin/migrate-oats-data/sql/insert-batch-application.sql b/bin/migrate-oats-data/sql/insert-batch-application.sql index 2fe3d63bc4..9f06f4b581 100644 --- a/bin/migrate-oats-data/sql/insert-batch-application.sql +++ b/bin/migrate-oats-data/sql/insert-batch-application.sql @@ -68,6 +68,33 @@ WITH WHEN oats_gov.oats_gov_name LIKE 'Islands Trust - Cowichan Valley' THEN 'Islands Trust Cowichan Valley (Historical)' WHEN oats_gov.oats_gov_name LIKE 'Northern Rockies' THEN 'Northern Rockies (Historical)' WHEN oats_gov.oats_gov_name LIKE 'Sliammon%' THEN 'Tla''amin Nation' + WHEN oats_gov.oats_gov_name LIKE 'Thompson Nicola%' THEN 'Thompson Nicola Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Cariboo%' THEN 'Cariboo Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Fraser Valley%' THEN 'Fraser Valley Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Columbia Shuswap%' THEN 'Columbia Shuswap Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Central Okanagan%' THEN 'Central Okanagan Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Squamish Lillooet%' THEN 'Squamish Lillooet Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Alberni-Clayoquot%' THEN 'Alberni-Clayoquot Regional District' + WHEN oats_gov.oats_gov_name LIKE 'qathet%' THEN 'qathet Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Peace River%' THEN 'Peace River Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Okanagan Similkameen%' THEN 'Okanagan Similkameen Regional District' + WHEN oats_gov.oats_gov_name LIKE 'East Kootenay%' THEN 'East Kootenay Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Bulkley-Nechako%' THEN 'Bulkley-Nechako Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Sunshine Coast%' THEN 'Sunshine Coast Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Nanaimo%' THEN 'Nanaimo Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Kitimat Stikine%' THEN 'Kitimat Stikine Regional District' + WHEN oats_gov.oats_gov_name LIKE 'North Okanagan%' THEN 'North Okanagan Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Fraser Fort George%' THEN 'Fraser Fort George Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Cowichan Valley%' THEN 'Cowichan Valley Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Kootenay Boundary%' THEN 'Kootenay Boundary Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Comox Valley%' THEN 'Comox Valley Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Central Kootenay%' THEN 'Central Kootenay Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Capital%' THEN 'Capital Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Metro Vancouver%' THEN 'Metro Vancouver Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Central Coast%' THEN 'Central Coast Regional District' + WHEN oats_gov.oats_gov_name LIKE 'North Coast%' THEN 'North Coast Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Strathcona%' THEN 'Strathcona Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Mount Waddington%' THEN 'Mount Waddington Regional District' ELSE oats_gov.oats_gov_name END ) = alg."name" From 6d3c34850247ef2de6ebdfc557b16a4578109737 Mon Sep 17 00:00:00 2001 From: Liam Stoddard Date: Thu, 29 Jun 2023 16:21:34 -0700 Subject: [PATCH 044/954] MR feedback updates --- bin/migrate-oats-data/sql/insert-batch-application.sql | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/bin/migrate-oats-data/sql/insert-batch-application.sql b/bin/migrate-oats-data/sql/insert-batch-application.sql index 9f06f4b581..499a817fd5 100644 --- a/bin/migrate-oats-data/sql/insert-batch-application.sql +++ b/bin/migrate-oats-data/sql/insert-batch-application.sql @@ -35,9 +35,7 @@ WITH JOIN oats.oats_person_organizations opo ON oaap.person_organization_id = opo.person_organization_id JOIN oats.oats_organizations oo ON opo.organization_id = oo.organization_id WHERE - oo.organization_type_cd = 'MUNI' - OR oo.organization_type_cd = 'FN' - OR oo.organization_type_cd = 'RD' + oo.organization_type_cd IN ('MUNI','FN','RD') ), alcs_gov AS ( SELECT @@ -104,8 +102,8 @@ WITH SELECT DISTINCT oaap.alr_application_id AS application_id, CASE - WHEN oo2.parent_organization_id isnull then oo2.organization_name - WHEN oo3.parent_organization_id isnull then oo3.organization_name + WHEN oo2.parent_organization_id IS NULL THEN oo2.organization_name + WHEN oo3.parent_organization_id IS NULL THEN oo3.organization_name ELSE 'NONE' END AS panel_region FROM From d223c86dcbbe49adb3b017d243cd91d22ea89f3f Mon Sep 17 00:00:00 2001 From: Liam Stoddard Date: Thu, 29 Jun 2023 16:39:53 -0700 Subject: [PATCH 045/954] revert file to prev Migration --- .../1687810457499-seed_inactive_local_gov.ts | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1687810457499-seed_inactive_local_gov.ts b/services/apps/alcs/src/providers/typeorm/migrations/1687810457499-seed_inactive_local_gov.ts index 9afe363fbf..d57b15c352 100644 --- a/services/apps/alcs/src/providers/typeorm/migrations/1687810457499-seed_inactive_local_gov.ts +++ b/services/apps/alcs/src/providers/typeorm/migrations/1687810457499-seed_inactive_local_gov.ts @@ -24,7 +24,6 @@ export class seedInactiveLocalGov1687810457499 implements MigrationInterface { ('476febec-ca88-4615-810c-fcae936867ef',NULL,NOW(),NULL,'migration_seed',NULL,'Multiple Jurisdictions for Sunshine','SOUR',NULL,false,false,'{}'), ('f0bd3817-5825-4656-b685-d306ddd1fa70',NULL,NOW(),NULL,'migration_seed',NULL,'Multiple Jurisdictions for Thompson-Nicola','INTR',NULL,false,false,'{}'), ('927ece9d-b4e3-4862-aa85-67539d9abb0d',NULL,NOW(),NULL,'migration_seed',NULL,'Islands Trust Gabriola Island (Historical)','ISLR',NULL,false,false,'{}'), - ('e2540566-52a8-4a3c-b373-58e1744703af',NULL,NOW(),NULL,'migration_seed',NULL,'Islands Trust Galiano Island (Historical)','ISLR',NULL,false,false,'{}'), ('9ff02b37-9046-48c8-aa96-01977fb3d1b9',NULL,NOW(),NULL,'migration_seed',NULL,'Islands Trust Gambier Island (Historical)','SOUR',NULL,false,false,'{}'), ('d325a7a4-fe68-49b0-9df2-599beb06766e',NULL,NOW(),NULL,'migration_seed',NULL,'Islands Trust Hornby Island (Historical)','ISLR',NULL,false,false,'{}'), ('9f0bdb45-c212-4aee-8413-3cf3c79e988c',NULL,NOW(),NULL,'migration_seed',NULL,'Islands Trust Lasqueti Island (Historical)','ISLR',NULL,false,false,'{}'), @@ -34,13 +33,13 @@ export class seedInactiveLocalGov1687810457499 implements MigrationInterface { ('dc0357b1-aacd-45ba-8fa9-0e62cbe88e9f',NULL,NOW(),NULL,'migration_seed',NULL,'Islands Trust Salt Spring Island (Historical)','ISLR',NULL,false,false,'{}'), ('3890ccf8-94e3-4b9a-9a1c-4d33518e1b5d',NULL,NOW(),NULL,'migration_seed',NULL,'Islands Trust Saturna Island (Historical)','ISLR',NULL,false,false,'{}'), ('538b895f-f0e1-4388-93cb-9eeb7cfa987e',NULL,NOW(),NULL,'migration_seed',NULL,'Islands Trust Sidney Island (Historical)','ISLR',NULL,false,false,'{}'), - ('88532d18-3059-4720-986a-363d9bce6be0',NULL,NOW(),NULL,'migration_seed',NULL,'Islands Trust Comox Strathcona (Historical)','ISLR',NULL,false,false,'{}'), - ('4e721d39-09b3-4f9b-ad1f-601a69315808',NULL,NOW(),NULL,'migration_seed',NULL,'Islands Trust Nanaimo (Historical)','ISLR',NULL,false,false,'{}'), - ('9355bf78-280a-4695-adad-fafa06969c99',NULL,NOW(),NULL,'migration_seed',NULL,'Islands Trust Capital (Historical)','ISLR',NULL,false,false,'{}'), - ('8017df89-8e71-41c3-bee9-1a48f042e157',NULL,NOW(),NULL,'migration_seed',NULL,'Islands Trust Powell River (Historical)','ISLR',NULL,false,false,'{}'), - ('26f395a1-44ab-4812-9e0d-f2dbc815859d',NULL,NOW(),NULL,'migration_seed',NULL,'Islands Trust Sunshine Coast (Historical)','SOUR',NULL,false,false,'{}'), - ('b9056ee1-5ba3-4d7c-9029-2cec57ba75d5',NULL,NOW(),NULL,'migration_seed',NULL,'Islands Trust Cowichan Valley (Historical)','ISLR',NULL,false,false,'{}'), - ('55f665bc-c91b-4bbb-85c2-39691088b297',NULL,NOW(),NULL,'migration_seed',NULL,'Northern Rockies (Historical)','NORR',NULL,false,false,'{}'), + ('88532d18-3059-4720-986a-363d9bce6be0',NULL,NOW(),NULL,'migration_seed',NULL,'Islands Trust- Comox Strathcona (Historical)','ISLR',NULL,false,false,'{}'), + ('4e721d39-09b3-4f9b-ad1f-601a69315808',NULL,NOW(),NULL,'migration_seed',NULL,'Islands Trust- Nanaimo (Historical)','ISLR',NULL,false,false,'{}'), + ('9355bf78-280a-4695-adad-fafa06969c99',NULL,NOW(),NULL,'migration_seed',NULL,'Islands Trust-Capital (Historical)','ISLR',NULL,false,false,'{}'), + ('8017df89-8e71-41c3-bee9-1a48f042e157',NULL,NOW(),NULL,'migration_seed',NULL,'Islands Trust-Powell River (Historical)','ISLR',NULL,false,false,'{}'), + ('26f395a1-44ab-4812-9e0d-f2dbc815859d',NULL,NOW(),NULL,'migration_seed',NULL,'Islands Trust-Sunshine Coast (Historical)','SOUR',NULL,false,false,'{}'), + ('b9056ee1-5ba3-4d7c-9029-2cec57ba75d5',NULL,NOW(),NULL,'migration_seed',NULL,'Islands Trust - Cowichan Valley (Historical)','ISLR',NULL,false,false,'{}'), + ('55f665bc-c91b-4bbb-85c2-39691088b297',NULL,NOW(),NULL,'migration_seed',NULL,'Islands Trust Bowen Island (Historical)','SOUR',NULL,false,false,'{}'), ('7577c7e9-d65b-4051-a0b1-bc95c462bdc3',NULL,NOW(),NULL,'migration_seed',NULL,'Islands Trust Denman Island (Historical)','ISLR',NULL,false,false,'{}'); `); } From 62e3138d51d6efeeb9387e7fdb844c7f0015ee16 Mon Sep 17 00:00:00 2001 From: Liam Stoddard Date: Thu, 29 Jun 2023 16:47:06 -0700 Subject: [PATCH 046/954] removed other modified migration file --- .../typeorm/migrations/1687546406729-seed_add_adl_loc_gov.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1687546406729-seed_add_adl_loc_gov.ts b/services/apps/alcs/src/providers/typeorm/migrations/1687546406729-seed_add_adl_loc_gov.ts index aeba419435..ec15f01b62 100644 --- a/services/apps/alcs/src/providers/typeorm/migrations/1687546406729-seed_add_adl_loc_gov.ts +++ b/services/apps/alcs/src/providers/typeorm/migrations/1687546406729-seed_add_adl_loc_gov.ts @@ -8,6 +8,7 @@ export class seedAddAdlLocGov1687546406729 implements MigrationInterface { ('b8a622d7-66da-4598-9687-2e8727fb2561',NULL,NOW(),NULL,'migration_seed',NULL,'City of Port Alberni','ISLR',NULL,false,true,'{}'), ('18bd941a-7c0f-44fe-9d12-a084d2a5f372',NULL,NOW(),NULL,'migration_seed',NULL,'Village of Port Clements','NORR',NULL,false,true,'{}'), ('0235ecdb-95fc-47f9-b7f6-e05e1e388d5b',NULL,NOW(),NULL,'migration_seed',NULL,'Village of Slocan','KOOR',NULL,false,true,'{}'), + ('0136a261-6237-4332-ae6a-1c7d7f49f0e8',NULL,NOW(),NULL,'migration_seed',NULL,'Village of Chase','INTR',NULL,false,true,'{}'), ('5b5b05d3-df2e-403c-9cf5-3c52c68ab559',NULL,NOW(),NULL,'migration_seed',NULL,'Village of Cumberland','ISLR',NULL,false,true,'{}'), ('e0684ddf-fa61-47c2-87b3-1c72bed5c365',NULL,NOW(),NULL,'migration_seed',NULL,'District of Fort St. James','NORR',NULL,false,true,'{}'), ('5dc1a21a-a740-402e-a56f-8f6c85991739',NULL,NOW(),NULL,'migration_seed',NULL,'District of Wells','INTR',NULL,false,true,'{}'), From bfddf48d213d2b1ee5c89313bb5b6e89fb9e76b8 Mon Sep 17 00:00:00 2001 From: Liam Stoddard Date: Fri, 30 Jun 2023 11:20:02 -0700 Subject: [PATCH 047/954] ensuring no migration errors --- .../typeorm/migrations/1688144882418-local_gov_corrections.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1688144882418-local_gov_corrections.ts b/services/apps/alcs/src/providers/typeorm/migrations/1688144882418-local_gov_corrections.ts index 12c9abfc32..76180a4bd7 100644 --- a/services/apps/alcs/src/providers/typeorm/migrations/1688144882418-local_gov_corrections.ts +++ b/services/apps/alcs/src/providers/typeorm/migrations/1688144882418-local_gov_corrections.ts @@ -12,6 +12,10 @@ export class localGovCorrections1688144882418 implements MigrationInterface { UPDATE "alcs"."application_local_government" SET "name" = 'Islands Trust Cowichan Valley (Historical)' WHERE "name" = 'Islands Trust - Cowichan Valley (Historical)'; UPDATE "alcs"."application_local_government" SET "name" = 'Northern Rockies (Historical)' WHERE "uuid" = '55f665bc-c91b-4bbb-85c2-39691088b297'; UPDATE "alcs"."application_local_government" SET "preferred_region_code" = 'NORR' WHERE "uuid" = '55f665bc-c91b-4bbb-85c2-39691088b297'; + UPDATE "alcs"."application" SET "local_government_uuid" = '360b05b3-55d4-4f57-a5ea-e0ffd6125db4' WHERE "local_government_uuid" = '0136a261-6237-4332-ae6a-1c7d7f49f0e8'; + UPDATE "alcs"."notice_of_intent" SET "local_government_uuid" = '360b05b3-55d4-4f57-a5ea-e0ffd6125db4' WHERE "local_government_uuid" = '0136a261-6237-4332-ae6a-1c7d7f49f0e8'; + UPDATE "alcs"."planning_review" SET "local_government_uuid" = '360b05b3-55d4-4f57-a5ea-e0ffd6125db4' WHERE "local_government_uuid" = '0136a261-6237-4332-ae6a-1c7d7f49f0e8'; + UPDATE "alcs"."covenant" SET "local_government_uuid" = '360b05b3-55d4-4f57-a5ea-e0ffd6125db4' WHERE "local_government_uuid" = '0136a261-6237-4332-ae6a-1c7d7f49f0e8'; DELETE FROM alcs.application_local_government WHERE uuid = '0136a261-6237-4332-ae6a-1c7d7f49f0e8'; INSERT INTO alcs.application_local_government (uuid,audit_deleted_date_at,audit_created_at,audit_updated_at,audit_created_by,audit_updated_by,"name",preferred_region_code,bceid_business_guid,is_first_nation,is_active,emails) VALUES ('e2540566-52a8-4a3c-b373-58e1744703af',NULL,NOW(),NULL,'migration_seed',NULL,'Islands Trust Galiano Island (Historical)','ISLR',NULL,false,false,'{}'); From df79b6bd2a53e125381781fd64653c568909f393 Mon Sep 17 00:00:00 2001 From: Liam Stoddard Date: Fri, 30 Jun 2023 11:31:54 -0700 Subject: [PATCH 048/954] ensure any used uuids are not deleted/ changed improperly --- .../typeorm/migrations/1688144882418-local_gov_corrections.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1688144882418-local_gov_corrections.ts b/services/apps/alcs/src/providers/typeorm/migrations/1688144882418-local_gov_corrections.ts index 76180a4bd7..b33cac8790 100644 --- a/services/apps/alcs/src/providers/typeorm/migrations/1688144882418-local_gov_corrections.ts +++ b/services/apps/alcs/src/providers/typeorm/migrations/1688144882418-local_gov_corrections.ts @@ -10,6 +10,10 @@ export class localGovCorrections1688144882418 implements MigrationInterface { UPDATE "alcs"."application_local_government" SET "name" = 'Islands Trust Powell River (Historical)' WHERE "name" = 'Islands Trust-Powell River (Historical)'; UPDATE "alcs"."application_local_government" SET "name" = 'Islands Trust Sunshine Coast (Historical)' WHERE "name" = 'Islands Trust-Sunshine Coast (Historical)'; UPDATE "alcs"."application_local_government" SET "name" = 'Islands Trust Cowichan Valley (Historical)' WHERE "name" = 'Islands Trust - Cowichan Valley (Historical)'; + UPDATE "alcs"."application" SET "local_government_uuid" = '6e5da7c6-9a72-44c5-8b8d-690439fb7cd1' WHERE "local_government_uuid" = '55f665bc-c91b-4bbb-85c2-39691088b297'; + UPDATE "alcs"."notice_of_intent" SET "local_government_uuid" = '6e5da7c6-9a72-44c5-8b8d-690439fb7cd1' WHERE "local_government_uuid" = '55f665bc-c91b-4bbb-85c2-39691088b297'; + UPDATE "alcs"."planning_review" SET "local_government_uuid" = '6e5da7c6-9a72-44c5-8b8d-690439fb7cd1' WHERE "local_government_uuid" = '55f665bc-c91b-4bbb-85c2-39691088b297'; + UPDATE "alcs"."covenant" SET "local_government_uuid" = '6e5da7c6-9a72-44c5-8b8d-690439fb7cd1' WHERE "local_government_uuid" = '55f665bc-c91b-4bbb-85c2-39691088b297'; UPDATE "alcs"."application_local_government" SET "name" = 'Northern Rockies (Historical)' WHERE "uuid" = '55f665bc-c91b-4bbb-85c2-39691088b297'; UPDATE "alcs"."application_local_government" SET "preferred_region_code" = 'NORR' WHERE "uuid" = '55f665bc-c91b-4bbb-85c2-39691088b297'; UPDATE "alcs"."application" SET "local_government_uuid" = '360b05b3-55d4-4f57-a5ea-e0ffd6125db4' WHERE "local_government_uuid" = '0136a261-6237-4332-ae6a-1c7d7f49f0e8'; From 0585816fe0db2ae4ecb8eab909268b574de8f72c Mon Sep 17 00:00:00 2001 From: Liam Stoddard Date: Fri, 30 Jun 2023 11:34:35 -0700 Subject: [PATCH 049/954] fixing git thinking file was changed --- .../sql/insert-batch-application.sql | 159 +++++++----------- 1 file changed, 57 insertions(+), 102 deletions(-) diff --git a/bin/migrate-oats-data/sql/insert-batch-application.sql b/bin/migrate-oats-data/sql/insert-batch-application.sql index 499a817fd5..2358d2c521 100644 --- a/bin/migrate-oats-data/sql/insert-batch-application.sql +++ b/bin/migrate-oats-data/sql/insert-batch-application.sql @@ -1,3 +1,4 @@ + -- Step 1: Perform a lookup to retrieve the applicant's name or organization for each application ID WITH applicant_lookup AS ( @@ -25,109 +26,63 @@ WITH GROUP BY oaap.alr_application_id ), - -- Step 2: get local gov application name & match to uuid - oats_gov AS ( - SELECT - oaap.alr_application_id AS application_id, - oo.organization_name AS oats_gov_name - FROM - oats.oats_alr_application_parties oaap - JOIN oats.oats_person_organizations opo ON oaap.person_organization_id = opo.person_organization_id - JOIN oats.oats_organizations oo ON opo.organization_id = oo.organization_id - WHERE - oo.organization_type_cd IN ('MUNI','FN','RD') - ), - alcs_gov AS ( - SELECT - oats_gov.application_id AS application_id, - alg.uuid AS gov_uuid - FROM - oats_gov - JOIN alcs.application_local_government alg on ( - CASE - WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Gabriola Island' THEN 'Islands Trust Gabriola Island (Historical)' - WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Galiano Island' THEN 'Islands Trust Galiano Island (Historical)' - WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Gambier Island' THEN 'Islands Trust Gambier Island (Historical)' - WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Hornby Island' THEN 'Islands Trust Hornby Island (Historical)' - WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Lasqueti Island' THEN 'Islands Trust Lasqueti Island (Historical)' - WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Mayne Island' THEN 'Islands Trust Mayne Island (Historical)' - WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Pender Island' THEN 'Islands Trust Pender Island (Historical)' - WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Quadra Island' THEN 'Islands Trust Quadra Island (Historical)' - WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Salt Spring Island' THEN 'Islands Trust Salt Spring Island (Historical)' - WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Saturna Island' THEN 'Islands Trust Saturna Island (Historical)' - WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Sidney Island' THEN 'Islands Trust Sidney Island (Historical)' - WHEN oats_gov.oats_gov_name LIKE 'Islands Trust- Comox Strathcona' THEN 'Islands Trust Comox Strathcona (Historical)' - WHEN oats_gov.oats_gov_name LIKE 'Islands Trust- Nanaimo' THEN 'Islands Trust Nanaimo (Historical)' - WHEN oats_gov.oats_gov_name LIKE 'Islands Trust-Capital' THEN 'Islands Trust Capital (Historical)' - WHEN oats_gov.oats_gov_name LIKE 'Islands Trust-Powell River' THEN 'Islands Trust Powell River (Historical)' - WHEN oats_gov.oats_gov_name LIKE 'Islands Trust-Sunshine Coast' THEN 'Islands Trust Sunshine Coast (Historical)' - WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Bowen Island' THEN 'Bowen Island (Island Municipality)' - WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Denman Island' THEN 'Islands Trust Denman Island (Historical)' - WHEN oats_gov.oats_gov_name LIKE 'Islands Trust - Cowichan Valley' THEN 'Islands Trust Cowichan Valley (Historical)' - WHEN oats_gov.oats_gov_name LIKE 'Northern Rockies' THEN 'Northern Rockies (Historical)' - WHEN oats_gov.oats_gov_name LIKE 'Sliammon%' THEN 'Tla''amin Nation' - WHEN oats_gov.oats_gov_name LIKE 'Thompson Nicola%' THEN 'Thompson Nicola Regional District' - WHEN oats_gov.oats_gov_name LIKE 'Cariboo%' THEN 'Cariboo Regional District' - WHEN oats_gov.oats_gov_name LIKE 'Fraser Valley%' THEN 'Fraser Valley Regional District' - WHEN oats_gov.oats_gov_name LIKE 'Columbia Shuswap%' THEN 'Columbia Shuswap Regional District' - WHEN oats_gov.oats_gov_name LIKE 'Central Okanagan%' THEN 'Central Okanagan Regional District' - WHEN oats_gov.oats_gov_name LIKE 'Squamish Lillooet%' THEN 'Squamish Lillooet Regional District' - WHEN oats_gov.oats_gov_name LIKE 'Alberni-Clayoquot%' THEN 'Alberni-Clayoquot Regional District' - WHEN oats_gov.oats_gov_name LIKE 'qathet%' THEN 'qathet Regional District' - WHEN oats_gov.oats_gov_name LIKE 'Peace River%' THEN 'Peace River Regional District' - WHEN oats_gov.oats_gov_name LIKE 'Okanagan Similkameen%' THEN 'Okanagan Similkameen Regional District' - WHEN oats_gov.oats_gov_name LIKE 'East Kootenay%' THEN 'East Kootenay Regional District' - WHEN oats_gov.oats_gov_name LIKE 'Bulkley-Nechako%' THEN 'Bulkley-Nechako Regional District' - WHEN oats_gov.oats_gov_name LIKE 'Sunshine Coast%' THEN 'Sunshine Coast Regional District' - WHEN oats_gov.oats_gov_name LIKE 'Nanaimo%' THEN 'Nanaimo Regional District' - WHEN oats_gov.oats_gov_name LIKE 'Kitimat Stikine%' THEN 'Kitimat Stikine Regional District' - WHEN oats_gov.oats_gov_name LIKE 'North Okanagan%' THEN 'North Okanagan Regional District' - WHEN oats_gov.oats_gov_name LIKE 'Fraser Fort George%' THEN 'Fraser Fort George Regional District' - WHEN oats_gov.oats_gov_name LIKE 'Cowichan Valley%' THEN 'Cowichan Valley Regional District' - WHEN oats_gov.oats_gov_name LIKE 'Kootenay Boundary%' THEN 'Kootenay Boundary Regional District' - WHEN oats_gov.oats_gov_name LIKE 'Comox Valley%' THEN 'Comox Valley Regional District' - WHEN oats_gov.oats_gov_name LIKE 'Central Kootenay%' THEN 'Central Kootenay Regional District' - WHEN oats_gov.oats_gov_name LIKE 'Capital%' THEN 'Capital Regional District' - WHEN oats_gov.oats_gov_name LIKE 'Metro Vancouver%' THEN 'Metro Vancouver Regional District' - WHEN oats_gov.oats_gov_name LIKE 'Central Coast%' THEN 'Central Coast Regional District' - WHEN oats_gov.oats_gov_name LIKE 'North Coast%' THEN 'North Coast Regional District' - WHEN oats_gov.oats_gov_name LIKE 'Strathcona%' THEN 'Strathcona Regional District' - WHEN oats_gov.oats_gov_name LIKE 'Mount Waddington%' THEN 'Mount Waddington Regional District' - ELSE oats_gov.oats_gov_name - END - ) = alg."name" - ), - -- Step 3: Perform a lookup to retrieve the region code for each application ID - panel_lookup AS ( - SELECT DISTINCT - oaap.alr_application_id AS application_id, + +-- Step 2: get local gov application name & match to uuid +oats_gov AS ( + SELECT + oaap.alr_application_id AS application_id, + oo.organization_name AS oats_gov_name + FROM + oats.oats_alr_application_parties oaap + JOIN oats.oats_person_organizations opo ON oaap.person_organization_id = opo.person_organization_id + JOIN oats.oats_organizations oo ON opo.organization_id = oo.organization_id + WHERE + oo.organization_type_cd = 'MUNI' + OR oo.organization_type_cd = 'FN' +), + +alcs_gov AS ( + SELECT + oats_gov.application_id AS application_id, + alg.uuid AS gov_uuid + FROM + oats_gov + JOIN alcs.application_local_government alg on ( CASE - WHEN oo2.parent_organization_id IS NULL THEN oo2.organization_name - WHEN oo3.parent_organization_id IS NULL THEN oo3.organization_name - ELSE 'NONE' - END AS panel_region - FROM - oats.oats_alr_application_parties oaap - JOIN oats.oats_person_organizations opo ON oaap.person_organization_id = opo.person_organization_id - JOIN oats.oats_organizations oo ON opo.organization_id = oo.organization_id - LEFT JOIN oats.oats_organizations oo2 ON oo.parent_organization_id = oo2.organization_id - LEFT JOIN oats.oats_organizations oo3 ON oo2.parent_organization_id = oo3.organization_id - WHERE - oo2.organization_type_cd = 'PANEL' OR oo3.organization_type_cd = 'PANEL' - ), - -- Step 4: Perform lookup to retrieve type code - application_type_lookup AS ( - SELECT - oaac.alr_application_id AS application_id, - oacc."description" AS "description", - oaac.alr_change_code AS code - FROM - oats.oats_alr_appl_components AS oaac - JOIN oats.oats_alr_change_codes oacc ON oaac.alr_change_code = oacc.alr_change_code - LEFT JOIN oats.alcs_etl_application_exclude aee ON oaac.alr_appl_component_id = aee.component_id - WHERE - aee.component_id IS NULL - ) + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust%' THEN 'Islands Trust' + WHEN oats_gov.oats_gov_name LIKE 'Sliammon%' THEN 'Tla''amin Nation' + ELSE oats_gov.oats_gov_name + END + ) = alg."name" +), +-- Step 3: Perform a lookup to retrieve the region code for each application ID +panel_lookup AS ( + SELECT DISTINCT + oaap.alr_application_id AS application_id, + oo2.organization_name AS panel_region + FROM + oats.oats_alr_application_parties oaap + JOIN oats.oats_person_organizations opo ON oaap.person_organization_id = opo.person_organization_id + JOIN oats.oats_organizations oo ON opo.organization_id = oo.organization_id + JOIN oats.oats_organizations oo2 ON oo.parent_organization_id = oo2.organization_id + WHERE + oo2.organization_type_cd = 'PANEL' +), + +-- Step 4: Perform lookup to retrieve type code +application_type_lookup AS ( + SELECT + oaac.alr_application_id AS application_id, + oacc."description" AS "description", + oaac.alr_change_code AS code + FROM + oats.oats_alr_appl_components AS oaac + JOIN oats.oats_alr_change_codes oacc ON oaac.alr_change_code = oacc.alr_change_code + LEFT JOIN oats.alcs_etl_application_exclude aee ON oaac.alr_appl_component_id = aee.component_id + WHERE + aee.component_id IS NULL +) + -- Step 5: Insert new records into the alcs_applications table SELECT oa.alr_application_id :: text AS file_number, From 38805b15adda760862d4c9c70b9002b4afd72455 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Fri, 30 Jun 2023 12:44:09 -0700 Subject: [PATCH 050/954] Code Review Feedback --- .../parcel/parcel.component.ts | 30 +++++++++++-------- .../parcel-prep/parcel-prep.component.html | 2 +- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/parcel/parcel.component.ts b/alcs-frontend/src/app/features/application/applicant-info/application-details/parcel/parcel.component.ts index 77d5dada58..e7b7bb695d 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/application-details/parcel/parcel.component.ts +++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/parcel/parcel.component.ts @@ -1,4 +1,4 @@ -import { Component, Input, OnChanges, OnDestroy, OnInit, SimpleChanges } from '@angular/core'; +import { AfterContentChecked, Component, Input, OnChanges, OnDestroy, OnInit, SimpleChanges } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; import { Subject, takeUntil } from 'rxjs'; import { ApplicationDocumentDto } from '../../../../../services/application/application-document/application-document.dto'; @@ -11,7 +11,7 @@ import { ApplicationSubmissionDto, PARCEL_OWNERSHIP_TYPE } from '../../../../../ templateUrl: './parcel.component.html', styleUrls: ['./parcel.component.scss'], }) -export class ParcelComponent implements OnInit, OnChanges, OnDestroy { +export class ParcelComponent implements OnInit, OnChanges, OnDestroy, AfterContentChecked { $destroy = new Subject(); @Input() application!: ApplicationSubmissionDto; @@ -25,6 +25,7 @@ export class ParcelComponent implements OnInit, OnChanges, OnDestroy { parcels: any[] = []; PARCEL_OWNERSHIP_TYPES = PARCEL_OWNERSHIP_TYPE; + private anchorededParcelUuid: string | undefined; constructor( private applicationDocumentService: ApplicationDocumentService, @@ -40,16 +41,7 @@ export class ParcelComponent implements OnInit, OnChanges, OnDestroy { this.route.fragment.pipe(takeUntil(this.$destroy)).subscribe((fragment) => { if (fragment) { - setTimeout(() => { - const el = document.getElementById(fragment); - if (el) { - el.scrollIntoView({ - behavior: 'smooth', - block: 'start', - inline: 'start', - }); - } - }, 200); + this.anchorededParcelUuid = fragment; } }); } @@ -74,4 +66,18 @@ export class ParcelComponent implements OnInit, OnChanges, OnDestroy { this.$destroy.next(); this.$destroy.complete(); } + + ngAfterContentChecked(): void { + if (this.anchorededParcelUuid) { + const el = document.getElementById(this.anchorededParcelUuid); + if (el) { + this.anchorededParcelUuid = undefined; + el.scrollIntoView({ + behavior: 'smooth', + block: 'start', + inline: 'start', + }); + } + } + } } diff --git a/alcs-frontend/src/app/features/application/proposal/parcel-prep/parcel-prep.component.html b/alcs-frontend/src/app/features/application/proposal/parcel-prep/parcel-prep.component.html index b53344d89b..91cfbd81db 100644 --- a/alcs-frontend/src/app/features/application/proposal/parcel-prep/parcel-prep.component.html +++ b/alcs-frontend/src/app/features/application/proposal/parcel-prep/parcel-prep.component.html @@ -4,7 +4,7 @@ # - 1 + {{ i + 1 }} From 0cca1f3e8416ebe03541d488df6fee0d175721d6 Mon Sep 17 00:00:00 2001 From: "to. sandra" <76515860+sandratoh@users.noreply.github.com> Date: Tue, 4 Jul 2023 09:36:42 -0700 Subject: [PATCH 051/954] Fix empty agents creation/deletion and auth letter validation (#748) * Delete empty agents before creating new one and fix auth letter validation * Fix authorization letter validation if user changes selection from agent --- .../primary-contact/primary-contact.component.ts | 5 +++-- .../application-owner/application-owner.controller.spec.ts | 2 ++ .../application-owner/application-owner.controller.ts | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/portal-frontend/src/app/features/edit-submission/primary-contact/primary-contact.component.ts b/portal-frontend/src/app/features/edit-submission/primary-contact/primary-contact.component.ts index b3f2f49ece..4e8871f591 100644 --- a/portal-frontend/src/app/features/edit-submission/primary-contact/primary-contact.component.ts +++ b/portal-frontend/src/app/features/edit-submission/primary-contact/primary-contact.component.ts @@ -135,9 +135,10 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni this.isCrownOwner = selectedOwner.type.code === APPLICATION_OWNER.CROWN; } } - this.needsAuthorizationLetter = !( - this.owners.length === 1 && this.owners[0].type.code === APPLICATION_OWNER.INDIVIDUAL + this.owners[0].type.code === APPLICATION_OWNER.INDIVIDUAL && + (this.owners.length === 1 || + (this.owners.length === 2 && this.owners[1].type.code === APPLICATION_OWNER.AGENT && !hasSelectedAgent)) ); this.files = this.files.map((file) => ({ ...file, diff --git a/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.controller.spec.ts b/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.controller.spec.ts index d8e6bd913e..fdd19fd8df 100644 --- a/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.controller.spec.ts +++ b/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.controller.spec.ts @@ -255,6 +255,7 @@ describe('ApplicationOwnerController', () => { }); it('should create a new owner when setting primary contact to third party agent that doesnt exist', async () => { + mockAppOwnerService.deleteAgents.mockResolvedValue([]); mockAppOwnerService.create.mockResolvedValue(new ApplicationOwner()); mockAppOwnerService.setPrimaryContact.mockResolvedValue(); mockApplicationSubmissionService.verifyAccessByUuid.mockResolvedValue( @@ -270,6 +271,7 @@ describe('ApplicationOwnerController', () => { }, ); + expect(mockAppOwnerService.deleteAgents).toHaveBeenCalledTimes(1); expect(mockAppOwnerService.create).toHaveBeenCalledTimes(1); expect(mockAppOwnerService.setPrimaryContact).toHaveBeenCalledTimes(1); expect( diff --git a/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.controller.ts b/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.controller.ts index 4620c22463..1349a1d89f 100644 --- a/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.controller.ts +++ b/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.controller.ts @@ -161,6 +161,7 @@ export class ApplicationOwnerController { //Create Owner if (!data.ownerUuid) { + await this.ownerService.deleteAgents(applicationSubmission); const agentOwner = await this.ownerService.create( { email: data.agentEmail, From f9fde1eaf63b21e044b83229877aad5934552c9a Mon Sep 17 00:00:00 2001 From: "to. sandra" <76515860+sandratoh@users.noreply.github.com> Date: Tue, 4 Jul 2023 12:10:13 -0700 Subject: [PATCH 052/954] Allow portal submission by non-creator with access (#752) --- .../application-submission.controller.spec.ts | 6 +++--- .../application-submission.controller.ts | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.controller.spec.ts b/services/apps/alcs/src/portal/application-submission/application-submission.controller.spec.ts index dcac2d03f6..314f631fce 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.controller.spec.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.controller.spec.ts @@ -302,7 +302,7 @@ describe('ApplicationSubmissionController', () => { }, }); - expect(mockAppService.getIfCreatorByUuid).toHaveBeenCalledTimes(1); + expect(mockAppService.verifyAccessByUuid).toHaveBeenCalledTimes(1); expect(mockAppService.submitToAlcs).toHaveBeenCalledTimes(1); expect(mockAppService.updateStatus).toHaveBeenCalledTimes(1); }); @@ -328,13 +328,13 @@ describe('ApplicationSubmissionController', () => { }, }); - expect(mockAppService.getIfCreatorByUuid).toHaveBeenCalledTimes(1); + expect(mockAppService.verifyAccessByUuid).toHaveBeenCalledTimes(1); expect(mockAppService.submitToLg).toHaveBeenCalledTimes(1); }); it('should throw an exception if application fails validation', async () => { const mockFileId = 'file-id'; - mockAppService.getIfCreatorByUuid.mockResolvedValue( + mockAppService.verifyAccessByUuid.mockResolvedValue( new ApplicationSubmission({ typeCode: 'NOT-TURP', }), diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.controller.ts b/services/apps/alcs/src/portal/application-submission/application-submission.controller.ts index fb69a3c5ba..07b0167178 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.controller.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.controller.ts @@ -185,7 +185,7 @@ export class ApplicationSubmissionController { @Post('/alcs/submit/:uuid') async submitAsApplicant(@Param('uuid') uuid: string, @Req() req) { const applicationSubmission = - await this.applicationSubmissionService.getIfCreatorByUuid( + await this.applicationSubmissionService.verifyAccessByUuid( uuid, req.user.entity, ); From 6ff013dfd99d96e9039141d6e4041b83aee33421 Mon Sep 17 00:00:00 2001 From: "to. sandra" <76515860+sandratoh@users.noreply.github.com> Date: Wed, 5 Jul 2023 13:56:20 -0700 Subject: [PATCH 053/954] Match ngif directive to other btns to fix click action (#754) --- .../application-details/application-details.component.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/portal-frontend/src/app/features/application-details/application-details.component.html b/portal-frontend/src/app/features/application-details/application-details.component.html index 06061e4614..6dee41c5ba 100644 --- a/portal-frontend/src/app/features/application-details/application-details.component.html +++ b/portal-frontend/src/app/features/application-details/application-details.component.html @@ -304,8 +304,8 @@

7. Optional Documents

-
- +
+
From c987057826cbf9b691a709d1d57fc69d8dc49bf0 Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Thu, 6 Jul 2023 12:53:49 -0700 Subject: [PATCH 054/954] Feature/alcs 502 (#753) conditions view pate transform single component link to condition into multi-select --- alcs-frontend/src/app/app.module.ts | 2 +- .../condition/condition.component.html | 68 ++++++++ .../condition/condition.component.scss | 0 .../condition/condition.component.spec.ts | 48 ++++++ .../condition/condition.component.ts | 96 +++++++++++ .../conditions/conditions.component.html | 78 +++++++++ .../conditions/conditions.component.scss | 90 +++++++++++ .../conditions/conditions.component.spec.ts | 55 +++++++ .../conditions/conditions.component.ts | 151 ++++++++++++++++++ .../decision-condition.component.html | 19 +-- .../decision-condition.component.ts | 49 +++--- .../decision-conditions.component.spec.ts | 7 +- .../decision-conditions.component.ts | 17 +- .../decision-v2/decision-v2.component.html | 15 +- .../decision-v2/decision-v2.component.spec.ts | 12 +- .../decision-v2/decision-v2.component.ts | 48 ++++-- .../application/decision/decision.module.ts | 24 ++- ...ication-decision-condition.service.spec.ts | 66 ++++++++ .../application-decision-condition.service.ts | 30 ++++ .../application-decision-v2.dto.ts | 20 ++- .../application-decision-v2.service.ts | 16 +- .../application-type-pill.constants.ts | 24 +++ alcs-frontend/src/app/shared/shared.module.ts | 2 +- alcs-frontend/src/styles.scss | 16 ++ ...tion-decision-condition.controller.spec.ts | 109 +++++++++++++ ...plication-decision-condition.controller.ts | 48 ++++++ .../application-decision-condition.dto.ts | 46 +++++- .../application-decision-condition.entity.ts | 38 ++++- ...ication-decision-condition.service.spec.ts | 2 + .../application-decision-condition.service.ts | 56 ++++--- .../application-decision-v2.module.ts | 2 + .../application-decision-v2.service.spec.ts | 2 + .../application-decision-v2.service.ts | 6 + .../application-decision-component.entity.ts | 9 +- ...lication-decision-v2.automapper.profile.ts | 22 ++- ...ion_and_superseded_dates_for_conditions.ts | 37 +++++ ...15958-many_to_many_component_conditions.ts | 55 +++++++ ...03477-many_to_many_component_conditions.ts | 25 +++ services/apps/alcs/test/mocks/mockEntities.ts | 17 +- 39 files changed, 1308 insertions(+), 119 deletions(-) create mode 100644 alcs-frontend/src/app/features/application/decision/conditions/condition/condition.component.html create mode 100644 alcs-frontend/src/app/features/application/decision/conditions/condition/condition.component.scss create mode 100644 alcs-frontend/src/app/features/application/decision/conditions/condition/condition.component.spec.ts create mode 100644 alcs-frontend/src/app/features/application/decision/conditions/condition/condition.component.ts create mode 100644 alcs-frontend/src/app/features/application/decision/conditions/conditions.component.html create mode 100644 alcs-frontend/src/app/features/application/decision/conditions/conditions.component.scss create mode 100644 alcs-frontend/src/app/features/application/decision/conditions/conditions.component.spec.ts create mode 100644 alcs-frontend/src/app/features/application/decision/conditions/conditions.component.ts create mode 100644 alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-condition/application-decision-condition.service.spec.ts create mode 100644 alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-condition/application-decision-condition.service.ts create mode 100644 services/apps/alcs/src/alcs/application-decision/application-decision-condition/application-decision-condition.controller.spec.ts create mode 100644 services/apps/alcs/src/alcs/application-decision/application-decision-condition/application-decision-condition.controller.ts create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1688064562389-completion_and_superseded_dates_for_conditions.ts create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1688150315958-many_to_many_component_conditions.ts create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1688150503477-many_to_many_component_conditions.ts diff --git a/alcs-frontend/src/app/app.module.ts b/alcs-frontend/src/app/app.module.ts index 0e624a156d..03a4d798a7 100644 --- a/alcs-frontend/src/app/app.module.ts +++ b/alcs-frontend/src/app/app.module.ts @@ -5,7 +5,7 @@ import { MAT_DIALOG_DEFAULT_OPTIONS } from '@angular/material/dialog'; import { BrowserModule } from '@angular/platform-browser'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { NgSelectConfig } from '@ng-select/ng-select'; -import { provideEnvironmentNgxMask, provideNgxMask } from 'ngx-mask'; +import { provideEnvironmentNgxMask } from 'ngx-mask'; import { AppRoutingModule } from './app-routing.module'; import { AppComponent } from './app.component'; import { AuthorizationComponent } from './features/authorization/authorization.component'; diff --git a/alcs-frontend/src/app/features/application/decision/conditions/condition/condition.component.html b/alcs-frontend/src/app/features/application/decision/conditions/condition/condition.component.html new file mode 100644 index 0000000000..c1fac6d8bd --- /dev/null +++ b/alcs-frontend/src/app/features/application/decision/conditions/condition/condition.component.html @@ -0,0 +1,68 @@ +
+

{{ condition.type.label }}

+ + + + + + + + + +
+
+
+
Component to Condition
+ {{ condition.componentLabels }} +
+ +
+
Approval Dependent
+ {{ condition.approvalDependant | booleanToString }} +
+ +
+
Security Amount
+ {{ condition.securityAmount }} + +
+ +
+
Admin Fee
+ {{ condition.administrativeFee }} + +
+ +
+
Completion Date
+ +
+ +
+
Superseded Date
+ +
+ +
+
Description
+ {{ + condition.description + }} + + +
+ {{ isReadMoreClicked ? 'Read Less' : 'Read More' }} +
+
+
diff --git a/alcs-frontend/src/app/features/application/decision/conditions/condition/condition.component.scss b/alcs-frontend/src/app/features/application/decision/conditions/condition/condition.component.scss new file mode 100644 index 0000000000..e69de29bb2 diff --git a/alcs-frontend/src/app/features/application/decision/conditions/condition/condition.component.spec.ts b/alcs-frontend/src/app/features/application/decision/conditions/condition/condition.component.spec.ts new file mode 100644 index 0000000000..4d75e7fec6 --- /dev/null +++ b/alcs-frontend/src/app/features/application/decision/conditions/condition/condition.component.spec.ts @@ -0,0 +1,48 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { ApplicationDecisionConditionService } from '../../../../../services/application/decision/application-decision-v2/application-decision-condition/application-decision-condition.service'; +import { ApplicationDecisionConditionDto } from '../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; +import { SharedModule } from '../../../../../shared/shared.module'; + +import { ConditionComponent } from './condition.component'; + +describe('ConditionComponent', () => { + let component: ConditionComponent; + let fixture: ComponentFixture; + let mockApplicationDecisionConditionService: DeepMocked; + + beforeEach(async () => { + mockApplicationDecisionConditionService = createMock(); + + await TestBed.configureTestingModule({ + declarations: [ConditionComponent], + providers: [ + { + provide: ApplicationDecisionConditionService, + useValue: mockApplicationDecisionConditionService, + }, + ], + schemas: [NO_ERRORS_SCHEMA], + imports: [SharedModule, BrowserAnimationsModule], + }).compileComponents(); + + fixture = TestBed.createComponent(ConditionComponent); + component = fixture.componentInstance; + + component.condition = createMock< + ApplicationDecisionConditionDto & { + conditionComponentsLabels?: string[]; + status: string; + } + >(); + component.condition.conditionComponentsLabels = []; + + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/alcs-frontend/src/app/features/application/decision/conditions/condition/condition.component.ts b/alcs-frontend/src/app/features/application/decision/conditions/condition/condition.component.ts new file mode 100644 index 0000000000..d090247a4e --- /dev/null +++ b/alcs-frontend/src/app/features/application/decision/conditions/condition/condition.component.ts @@ -0,0 +1,96 @@ +import { AfterViewInit, Component, Input, OnInit } from '@angular/core'; +import moment from 'moment'; +import { ApplicationDecisionConditionService } from '../../../../../services/application/decision/application-decision-v2/application-decision-condition/application-decision-condition.service'; +import { UpdateApplicationDecisionConditionDto } from '../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; +import { + DECISION_CONDITION_COMPLETE_LABEL, + DECISION_CONDITION_INCOMPLETE_LABEL, + DECISION_CONDITION_SUPERSEDED_LABEL, +} from '../../../../../shared/application-type-pill/application-type-pill.constants'; +import { ApplicationDecisionConditionWithStatus, CONDITION_STATUS } from '../conditions.component'; + +type Condition = ApplicationDecisionConditionWithStatus & { + componentLabels?: string; +}; + +@Component({ + selector: 'app-condition', + templateUrl: './condition.component.html', + styleUrls: ['./condition.component.scss'], +}) +export class ConditionComponent implements OnInit, AfterViewInit { + @Input() condition!: Condition; + @Input() isDraftDecision!: boolean; + + incompleteLabel = DECISION_CONDITION_INCOMPLETE_LABEL; + completeLabel = DECISION_CONDITION_COMPLETE_LABEL; + supersededLabel = DECISION_CONDITION_SUPERSEDED_LABEL; + + CONDITION_STATUS = CONDITION_STATUS; + + isReadMoreClicked = false; + isReadMoreVisible = false; + conditionStatus: string = ''; + + constructor(private conditionService: ApplicationDecisionConditionService) {} + + ngOnInit() { + this.updateStatus(); + if (this.condition) { + this.condition = { + ...this.condition, + componentLabels: this.condition.conditionComponentsLabels?.join(', '), + }; + } + } + + ngAfterViewInit(): void { + setTimeout(() => (this.isReadMoreVisible = this.checkIfReadMoreVisible())); + } + + async onUpdateCondition( + field: keyof UpdateApplicationDecisionConditionDto, + value: string[] | string | number | null + ) { + const condition = this.condition; + + if (condition) { + const update = await this.conditionService.update(condition.uuid, { + [field]: value, + }); + + const labels = this.condition.componentLabels; + this.condition = { ...update, componentLabels: labels } as Condition; + + this.updateStatus(); + } + } + + onToggleReadMore() { + this.isReadMoreClicked = !this.isReadMoreClicked; + } + + isEllipsisActive(e: string): boolean { + const el = document.getElementById(e); + // + 2 required as adjustment to height + return el ? el.clientHeight + 2 < el.scrollHeight : false; + } + + checkIfReadMoreVisible(): boolean { + return this.isReadMoreClicked || this.isEllipsisActive(this.condition.uuid + 'Description'); + } + + updateStatus() { + const today = moment().startOf('day').toDate().getTime(); + + if (this.condition.supersededDate && this.condition.supersededDate <= today) { + this.conditionStatus = CONDITION_STATUS.SUPERSEDED; + } else if (this.condition.completionDate && this.condition.completionDate <= today) { + this.conditionStatus = CONDITION_STATUS.COMPLETE; + } else if (this.isDraftDecision === false) { + this.conditionStatus = CONDITION_STATUS.INCOMPLETE; + } else { + this.conditionStatus = ''; + } + } +} diff --git a/alcs-frontend/src/app/features/application/decision/conditions/conditions.component.html b/alcs-frontend/src/app/features/application/decision/conditions/conditions.component.html new file mode 100644 index 0000000000..fff731fabf --- /dev/null +++ b/alcs-frontend/src/app/features/application/decision/conditions/conditions.component.html @@ -0,0 +1,78 @@ +
+
+

View Conditions

+ +
+
+
+
+
+ Modified By:  + {{ decision.modifiedByResolutions?.join(', ') }} + N/A +
+
+ Reconsidered By:  + {{ decision.reconsideredByResolutions?.join(', ') }} + N/A +
+
+
+
+
Decision #{{ decision.index }}
+
+ + calendar_month + {{ application.activeDays }} + + + pause + {{ application.pausedDays }} + +
+ + + + + + + Res #{{ decision.resolutionNumber }}/{{ decision.resolutionYear }} + + + + +
+
+
+ +
+
+
+
+ +
+
diff --git a/alcs-frontend/src/app/features/application/decision/conditions/conditions.component.scss b/alcs-frontend/src/app/features/application/decision/conditions/conditions.component.scss new file mode 100644 index 0000000000..cf53302c55 --- /dev/null +++ b/alcs-frontend/src/app/features/application/decision/conditions/conditions.component.scss @@ -0,0 +1,90 @@ +@use '../../../../../styles/colors.scss'; + +h3, +div, +span, +p { + color: colors.$black; +} + +.header, +.footer { + display: flex; + padding-left: 16px; +} + +.header { + justify-content: space-between; +} + +.footer { + justify-content: flex-end; +} + +:host ::ng-deep { + .display-none { + display: none !important; + } + + .read-more { + display: flex; + justify-content: flex-end; + } + + .decision-container { + padding: 28px 0; + + .post-decisions { + padding: 8px 16px; + background-color: colors.$grey-light; + grid-template-columns: 50% 50%; + display: grid; + min-height: 36px; + text-transform: uppercase; + border-radius: 4px 4px 0 0; + } + + .header { + margin: 0; + display: flex; + justify-content: space-between; + padding: 0 16px; + + .title { + display: flex; + align-items: center; + justify-content: space-between; + gap: 16px; + } + } + + .even-condition { + background-color: colors.$grey-light; + } + + .condition-container { + display: block; + padding: 24px 16px; + + .header { + display: flex; + padding: 0px; + gap: 16px; + padding-bottom: 16px; + + color: colors.$black; + justify-content: flex-start; + } + + .grid-3 { + display: grid; + grid-template-columns: 33% 33% 33%; + grid-row-gap: 24px; + + .full-width { + grid-column: 1/4; + } + } + } + } +} diff --git a/alcs-frontend/src/app/features/application/decision/conditions/conditions.component.spec.ts b/alcs-frontend/src/app/features/application/decision/conditions/conditions.component.spec.ts new file mode 100644 index 0000000000..f3116b4875 --- /dev/null +++ b/alcs-frontend/src/app/features/application/decision/conditions/conditions.component.spec.ts @@ -0,0 +1,55 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { ActivatedRoute, convertToParamMap } from '@angular/router'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { BehaviorSubject } from 'rxjs'; +import { ApplicationDetailService } from '../../../../services/application/application-detail.service'; +import { ApplicationDto } from '../../../../services/application/application.dto'; +import { ApplicationDecisionV2Service } from '../../../../services/application/decision/application-decision-v2/application-decision-v2.service'; + +import { ConditionsComponent } from './conditions.component'; + +describe('ConditionsComponent', () => { + let component: ConditionsComponent; + let fixture: ComponentFixture; + let mockApplicationDetailService: DeepMocked; + let mockApplicationDecisionV2Service: DeepMocked; + + beforeEach(async () => { + mockApplicationDetailService = createMock(); + mockApplicationDetailService.$application = new BehaviorSubject(undefined); + + mockApplicationDecisionV2Service = createMock(); + + await TestBed.configureTestingModule({ + declarations: [ConditionsComponent], + providers: [ + { + provide: ApplicationDetailService, + useValue: mockApplicationDetailService, + }, + { + provide: ApplicationDecisionV2Service, + useValue: mockApplicationDecisionV2Service, + }, + { + provide: ActivatedRoute, + useValue: { + snapshot: { + paramMap: convertToParamMap({ uuid: 'fake' }), + }, + }, + }, + ], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(ConditionsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/alcs-frontend/src/app/features/application/decision/conditions/conditions.component.ts b/alcs-frontend/src/app/features/application/decision/conditions/conditions.component.ts new file mode 100644 index 0000000000..977dc47ae1 --- /dev/null +++ b/alcs-frontend/src/app/features/application/decision/conditions/conditions.component.ts @@ -0,0 +1,151 @@ +import { Component, OnInit } from '@angular/core'; +import { ActivatedRoute } from '@angular/router'; +import moment from 'moment'; +import { Subject, takeUntil } from 'rxjs'; +import { ApplicationDetailService } from '../../../../services/application/application-detail.service'; +import { ApplicationDto } from '../../../../services/application/application.dto'; +import { + ApplicationDecisionConditionDto, + ApplicationDecisionDto, + ApplicationDecisionWithLinkedResolutionDto, + DecisionCodesDto, +} from '../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; +import { ApplicationDecisionV2Service } from '../../../../services/application/decision/application-decision-v2/application-decision-v2.service'; +import { + DRAFT_DECISION_TYPE_LABEL, + MODIFICATION_TYPE_LABEL, + RECON_TYPE_LABEL, + RELEASED_DECISION_TYPE_LABEL, +} from '../../../../shared/application-type-pill/application-type-pill.constants'; + +export type ApplicationDecisionConditionWithStatus = ApplicationDecisionConditionDto & { + conditionComponentsLabels?: string[]; + status: string; +}; + +export type ApplicationDecisionWithConditionComponentLabels = ApplicationDecisionWithLinkedResolutionDto & { + conditions: ApplicationDecisionConditionWithStatus[]; +}; + +export const CONDITION_STATUS = { + INCOMPLETE: 'incomplete', + COMPLETE: 'complete', + SUPERSEDED: 'superseded', +}; + +@Component({ + selector: 'app-conditions', + templateUrl: './conditions.component.html', + styleUrls: ['./conditions.component.scss'], +}) +export class ConditionsComponent implements OnInit { + $destroy = new Subject(); + + decisionUuid: string = ''; + fileNumber: string = ''; + decisions: ApplicationDecisionWithConditionComponentLabels[] = []; + decision!: ApplicationDecisionWithConditionComponentLabels; + conditionDecision!: ApplicationDecisionDto; + application: ApplicationDto | undefined; + codes!: DecisionCodesDto; + today!: number; + + dratDecisionLabel = DRAFT_DECISION_TYPE_LABEL; + releasedDecisionLabel = RELEASED_DECISION_TYPE_LABEL; + reconLabel = RECON_TYPE_LABEL; + modificationLabel = MODIFICATION_TYPE_LABEL; + + constructor( + private applicationDetailService: ApplicationDetailService, + private decisionService: ApplicationDecisionV2Service, + private activatedRouter: ActivatedRoute + ) { + this.today = moment().startOf('day').toDate().getTime(); + } + + ngOnInit(): void { + this.fileNumber = this.activatedRouter.parent?.parent?.snapshot.paramMap.get('fileNumber')!; + this.decisionUuid = this.activatedRouter.snapshot.paramMap.get('uuid')!; + + this.applicationDetailService.$application.pipe(takeUntil(this.$destroy)).subscribe((application) => { + if (application) { + this.application = application; + this.loadDecisions(application.fileNumber); + } + }); + } + + async loadDecisions(fileNumber: string) { + this.codes = await this.decisionService.fetchCodes(); + this.decisionService.$decisions.pipe(takeUntil(this.$destroy)).subscribe((decisions) => { + this.decisions = decisions.map((decision) => { + if (decision.uuid === this.decisionUuid) { + const conditions = this.mapConditions(decision); + + this.sortConditions(decision, conditions); + + this.decision = decision as ApplicationDecisionWithConditionComponentLabels; + } + + return decision as ApplicationDecisionWithConditionComponentLabels; + }); + }); + + this.decisionService.loadDecisions(fileNumber); + } + + private sortConditions( + decision: ApplicationDecisionWithLinkedResolutionDto, + conditions: ApplicationDecisionConditionWithStatus[] + ) { + decision.conditions = conditions.sort((a, b) => { + const order = [CONDITION_STATUS.INCOMPLETE, CONDITION_STATUS.COMPLETE, CONDITION_STATUS.SUPERSEDED]; + if (a.status === b.status) { + if (a.type && b.type) { + return a.type?.label.localeCompare(b.type.label); + } else { + return -1; + } + } else { + return order.indexOf(a.status) - order.indexOf(b.status); + } + }); + } + + private mapConditions(decision: ApplicationDecisionWithLinkedResolutionDto) { + return decision.conditions.map((condition) => { + const status = this.getStatus(condition, decision); + + return { + ...condition, + status, + conditionComponentsLabels: condition.components?.map((c) => { + const matchingType = this.codes.decisionComponentTypes.find( + (type) => type.code === c.applicationDecisionComponentTypeCode + ); + + const label = + decision.resolutionNumber && decision.resolutionYear + ? `#${decision.resolutionNumber}/${decision.resolutionYear} ${matchingType?.label}` + : `Draft ${matchingType?.label}`; + + return label; + }), + } as ApplicationDecisionConditionWithStatus; + }); + } + + private getStatus(condition: ApplicationDecisionConditionDto, decision: ApplicationDecisionWithLinkedResolutionDto) { + let status = ''; + if (condition.supersededDate && condition.supersededDate <= this.today) { + status = CONDITION_STATUS.SUPERSEDED; + } else if (condition.completionDate && condition.completionDate <= this.today) { + status = CONDITION_STATUS.COMPLETE; + } else if (decision.isDraft === false) { + status = CONDITION_STATUS.INCOMPLETE; + } else { + status = ''; + } + return status; + } +} diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-condition/decision-condition.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-condition/decision-condition.component.html index 281c030708..1d1ec85e2b 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-condition/decision-condition.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-condition/decision-condition.component.html @@ -13,17 +13,14 @@ [clearable]="false" > - + + Component to Condition + + {{ + component.label + }} + +
Approval Dependent* diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-condition/decision-condition.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-condition/decision-condition.component.ts index c1cfaba7d7..3e280f37b6 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-condition/decision-condition.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-condition/decision-condition.component.ts @@ -17,7 +17,7 @@ export class DecisionConditionComponent implements OnInit, OnChanges { @Input() selectableComponents: SelectableComponent[] = []; type = new FormControl(null, [Validators.required]); - componentToCondition = new FormControl(null, [Validators.required]); + componentToConditions = new FormControl(null, [Validators.required]); approvalDependant = new FormControl(null, [Validators.required]); securityAmount = new FormControl(null); @@ -30,7 +30,7 @@ export class DecisionConditionComponent implements OnInit, OnChanges { securityAmount: this.securityAmount, administrativeFee: this.administrativeFee, description: this.description, - componentToCondition: this.componentToCondition, + componentToCondition: this.componentToConditions, }); ngOnInit(): void { @@ -40,15 +40,15 @@ export class DecisionConditionComponent implements OnInit, OnChanges { approvalDependant = this.data.approvalDependant ? 'true' : 'false'; } - const selectedOption = this.selectableComponents.find( - (component) => - this.data.componentToConditionType && - this.data.componentToConditionType === component.code && - this.data.componentDecisionUuid && - this.data.componentDecisionUuid === component.decisionUuid - ); + const selectedOptions = this.selectableComponents + .filter((component) => this.data.componentToConditions?.map((e) => e.tempId)?.includes(component.tempId)) + .map((e) => ({ + componentDecisionUuid: e.decisionUuid, + componentToConditionType: e.code, + tempId: e.tempId, + })); - this.componentToCondition.setValue(selectedOption?.tempId ?? null); + this.componentToConditions.setValue(selectedOptions.map((e) => e.tempId) ?? null); this.form.patchValue({ type: this.data.type?.code ?? null, @@ -61,9 +61,14 @@ export class DecisionConditionComponent implements OnInit, OnChanges { this.form.valueChanges.subscribe((changes) => { const matchingType = this.codes.find((code) => code.code === this.type.value); - const selectedOption = this.selectableComponents.find( - (component) => this.componentToCondition.value && component.tempId === this.componentToCondition.value - ); + + const selectedOptions = this.selectableComponents + .filter((component) => this.componentToConditions.value?.includes(component.tempId)) + .map((e) => ({ + componentDecisionUuid: e.decisionUuid, + componentToConditionType: e.code, + })); + this.dataChange.emit({ tempUuid: this.data.tempUuid, uuid: this.data.uuid, @@ -72,20 +77,22 @@ export class DecisionConditionComponent implements OnInit, OnChanges { securityAmount: this.securityAmount.value !== null ? parseFloat(this.securityAmount.value) : undefined, administrativeFee: this.administrativeFee.value !== null ? parseFloat(this.administrativeFee.value) : undefined, description: this.description.value ?? undefined, - componentToConditionType: selectedOption?.code, - componentDecisionUuid: selectedOption?.decisionUuid, + componentToConditions: selectedOptions, }); }); } ngOnChanges(changes: SimpleChanges): void { if (changes['selectableComponents']) { - const selectedValue = this.componentToCondition.value; - const selectedOption = this.selectableComponents.find( - (component) => selectedValue && component.tempId === selectedValue - ); - if (!selectedOption) { - this.componentToCondition.setValue(null); + const selectedOptions = this.selectableComponents + .filter((component) => this.componentToConditions.value?.includes(component.tempId)) + .map((e) => ({ + componentDecisionUuid: e.decisionUuid, + componentToConditionType: e.code, + })); + + if (selectedOptions && selectedOptions.length < 1) { + this.componentToConditions.setValue(null); } } } diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-conditions.component.spec.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-conditions.component.spec.ts index 8f1ef52428..7d5a8dabd0 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-conditions.component.spec.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-conditions.component.spec.ts @@ -2,7 +2,10 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { createMock } from '@golevelup/ts-jest'; import { BehaviorSubject } from 'rxjs'; -import { ApplicationDecisionDto } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; +import { + ApplicationDecisionDto, + ApplicationDecisionWithLinkedResolutionDto, +} from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; import { ApplicationDecisionV2Service } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.service'; import { DecisionConditionsComponent } from './decision-conditions.component'; @@ -15,7 +18,7 @@ describe('DecisionConditionComponent', () => { beforeEach(async () => { mockDecisionService = createMock(); mockDecisionService.$decision = new BehaviorSubject(undefined); - mockDecisionService.$decisions = new BehaviorSubject([]); + mockDecisionService.$decisions = new BehaviorSubject([]); await TestBed.configureTestingModule({ providers: [ diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-conditions.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-conditions.component.ts index 43dee69a9f..fbceb95c1a 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-conditions.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-conditions.component.ts @@ -76,17 +76,24 @@ export class DecisionConditionsComponent implements OnInit, OnChanges, OnDestroy this.selectableComponents = [...this.allComponents, ...updatedComponents]; this.decision = selectedDecision; + this.mappedConditions = selectedDecision.conditions.map((condition) => { - const selectedComponent = this.selectableComponents.find( - (component) => component.uuid === condition.componentUuid - ); + const selectedComponents = this.selectableComponents + .filter((component) => + condition.components?.map((conditionComponent) => conditionComponent.uuid).includes(component.uuid) + ) + .map((e) => ({ + componentDecisionUuid: e.decisionUuid, + componentToConditionType: e.code, + tempId: e.tempId, + })); return { ...condition, - componentToConditionType: selectedComponent?.code, - componentDecisionUuid: selectedComponent?.decisionUuid, + componentToConditions: selectedComponents, }; }); + this.onChanges(); } }); diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.html index 5c76145e3a..1312d17e2d 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.html @@ -5,12 +5,13 @@

Decision

- + + @@ -30,16 +31,16 @@

Condition Compliance

-
+
Modified By:  - {{ decision.modifiedByResolutions.join(', ') }} + {{ decision.modifiedByResolutions?.join(', ') }} N/A
Reconsidered By:  - {{ decision.reconsideredByResolutions.join(', ') }} + {{ decision.reconsideredByResolutions?.join(', ') }} N/A
@@ -47,7 +48,7 @@

Condition Compliance

- Decision #{{ decisions.length - i }} + Decision #{{ decision.index }}
calendar_month @@ -250,7 +251,7 @@
Decision Components and Conditions
>

Conditions

diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.spec.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.spec.ts index 379dcbeac2..25930efded 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.spec.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.spec.ts @@ -2,12 +2,16 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MatDialog, MatDialogRef } from '@angular/material/dialog'; import { MatSnackBarModule } from '@angular/material/snack-bar'; +import { ActivatedRoute } from '@angular/router'; import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { BehaviorSubject } from 'rxjs'; import { ApplicationDetailService } from '../../../../services/application/application-detail.service'; import { ApplicationDto } from '../../../../services/application/application.dto'; import { ApplicationDecisionComponentService } from '../../../../services/application/decision/application-decision-v2/application-decision-component/application-decision-component.service'; -import { ApplicationDecisionDto } from '../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; +import { + ApplicationDecisionDto, + ApplicationDecisionWithLinkedResolutionDto, +} from '../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; import { ApplicationDecisionV2Service } from '../../../../services/application/decision/application-decision-v2/application-decision-v2.service'; import { ToastService } from '../../../../services/toast/toast.service'; import { ConfirmationDialogService } from '../../../../shared/confirmation-dialog/confirmation-dialog.service'; @@ -24,7 +28,7 @@ describe('DecisionV2Component', () => { beforeEach(async () => { mockApplicationDecisionService = createMock(); mockApplicationDecisionService.$decision = new BehaviorSubject(undefined); - mockApplicationDecisionService.$decisions = new BehaviorSubject([]); + mockApplicationDecisionService.$decisions = new BehaviorSubject([]); mockAppDetailService = createMock(); mockAppDetailService.$application = new BehaviorSubject(undefined); @@ -63,6 +67,10 @@ describe('DecisionV2Component', () => { provide: ApplicationDecisionComponentService, useValue: mockApplicationDecisionComponentService, }, + { + provide: ActivatedRoute, + useValue: {}, + }, ], schemas: [NO_ERRORS_SCHEMA], }).compileComponents(); diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.ts index 69308bb1bd..3c3a81ec91 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.ts @@ -1,12 +1,12 @@ -import { Component, OnDestroy, OnInit } from '@angular/core'; +import { Component, ElementRef, OnDestroy, OnInit } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; -import { Router } from '@angular/router'; +import { ActivatedRoute, Router } from '@angular/router'; import { Subject, takeUntil } from 'rxjs'; import { ApplicationDetailService } from '../../../../services/application/application-detail.service'; import { ApplicationDto } from '../../../../services/application/application.dto'; import { ApplicationDecisionComponentService } from '../../../../services/application/decision/application-decision-v2/application-decision-component/application-decision-component.service'; import { - ApplicationDecisionDto, + ApplicationDecisionWithLinkedResolutionDto, APPLICATION_DECISION_COMPONENT_TYPE, CeoCriterionDto, DecisionMakerDto, @@ -25,9 +25,7 @@ import { formatDateForApi } from '../../../../shared/utils/api-date-formatter'; import { decisionChildRoutes } from '../decision.module'; import { RevertToDraftDialogComponent } from './revert-to-draft-dialog/revert-to-draft-dialog.component'; -type LoadingDecision = ApplicationDecisionDto & { - reconsideredByResolutions: string[]; - modifiedByResolutions: string[]; +type LoadingDecision = ApplicationDecisionWithLinkedResolutionDto & { loading: boolean; }; @@ -65,7 +63,9 @@ export class DecisionV2Component implements OnInit, OnDestroy { private toastService: ToastService, private confirmationDialogService: ConfirmationDialogService, private applicationDecisionComponentService: ApplicationDecisionComponentService, - private router: Router + private router: Router, + private activatedRouter: ActivatedRoute, + private elementRef: ElementRef ) {} ngOnInit(): void { @@ -90,11 +90,11 @@ export class DecisionV2Component implements OnInit, OnDestroy { this.decisionService.$decisions.pipe(takeUntil(this.$destroy)).subscribe((decisions) => { this.decisions = decisions.map((decision) => ({ ...decision, - reconsideredByResolutions: decision.reconsideredBy?.flatMap((r) => r.linkedResolutions) || [], - modifiedByResolutions: decision.modifiedBy?.flatMap((r) => r.linkedResolutions) || [], loading: false, })); + this.scrollToDecision(); + this.isDraftExists = this.decisions.some((d) => d.isDraft); this.disabledCreateBtnTooltip = this.isPaused ? 'This application is currently paused. Only active applications can have decisions.' @@ -102,6 +102,16 @@ export class DecisionV2Component implements OnInit, OnDestroy { }); } + scrollToDecision() { + const decisionUuid = this.activatedRouter.snapshot.queryParamMap.get('uuid'); + + setTimeout(() => { + if (this.decisions.length > 0 && decisionUuid) { + this.scrollToElement(decisionUuid); + } + }); + } + async onCreate() { const newDecision = await this.decisionService.create({ resolutionYear: new Date().getFullYear(), @@ -116,7 +126,7 @@ export class DecisionV2Component implements OnInit, OnDestroy { await this.router.navigate([`/application/${this.fileNumber}/decision/draft/${newDecision.uuid}/edit`]); } - async onEdit(decision: LoadingDecision) { + async onEdit(decision: ApplicationDecisionWithLinkedResolutionDto) { await this.router.navigate([`/application/${this.fileNumber}/decision/draft/${decision.uuid}/edit`]); } @@ -215,14 +225,22 @@ export class DecisionV2Component implements OnInit, OnDestroy { await this.loadDecisions(this.fileNumber); } - onNavigateToConditions() { - // some other ticket - return false; - } - ngOnDestroy(): void { this.decisionService.clearDecisions(); this.$destroy.next(); this.$destroy.complete(); } + + scrollToElement(elementId: string) { + const id = `#${CSS.escape(elementId)}`; + const element = this.elementRef.nativeElement.querySelector(id); + + if (element) { + element.scrollIntoView({ + behavior: 'smooth', + block: 'start', + inline: 'start', + }); + } + } } diff --git a/alcs-frontend/src/app/features/application/decision/decision.module.ts b/alcs-frontend/src/app/features/application/decision/decision.module.ts index 4edb3d5bdd..8f823aa052 100644 --- a/alcs-frontend/src/app/features/application/decision/decision.module.ts +++ b/alcs-frontend/src/app/features/application/decision/decision.module.ts @@ -2,15 +2,21 @@ import { NgModule } from '@angular/core'; import { MatTabsModule } from '@angular/material/tabs'; import { RouterModule } from '@angular/router'; import { SharedModule } from '../../../shared/shared.module'; +import { ConditionComponent } from './conditions/condition/condition.component'; +import { ConditionsComponent } from './conditions/conditions.component'; import { DecisionV1DialogComponent } from './decision-v1/decision-v1-dialog/decision-v1-dialog.component'; import { DecisionV1Component } from './decision-v1/decision-v1.component'; +import { NaruComponent } from './decision-v2/decision-component/naru/naru.component'; import { NfupComponent } from './decision-v2/decision-component/nfup/nfup.component'; +import { PfrsComponent } from './decision-v2/decision-component/pfrs/pfrs.component'; import { PofoComponent } from './decision-v2/decision-component/pofo/pofo.component'; import { RosoComponent } from './decision-v2/decision-component/roso/roso.component'; import { TurpComponent } from './decision-v2/decision-component/turp/turp.component'; import { DecisionDocumentsComponent } from './decision-v2/decision-documents/decision-documents.component'; import { DecisionComponentComponent } from './decision-v2/decision-input/decision-components/decision-component/decision-component.component'; +import { NaruInputComponent } from './decision-v2/decision-input/decision-components/decision-component/naru-input/naru-input.component'; import { NfuInputComponent } from './decision-v2/decision-input/decision-components/decision-component/nfu-input/nfu-input.component'; +import { PfrsInputComponent } from './decision-v2/decision-input/decision-components/decision-component/pfrs-input/pfrs-input.component'; import { PofoInputComponent } from './decision-v2/decision-input/decision-components/decision-component/pofo-input/pofo-input.component'; import { RosoInputComponent } from './decision-v2/decision-input/decision-components/decision-component/roso-input/roso-input.component'; import { TurpInputComponent } from './decision-v2/decision-input/decision-components/decision-component/turp-input/turp-input.component'; @@ -23,29 +29,31 @@ import { DecisionV2Component } from './decision-v2/decision-v2.component'; import { ReleaseDialogComponent } from './decision-v2/release-dialog/release-dialog.component'; import { RevertToDraftDialogComponent } from './decision-v2/revert-to-draft-dialog/revert-to-draft-dialog.component'; import { DecisionComponent } from './decision.component'; -import { PfrsInputComponent } from './decision-v2/decision-input/decision-components/decision-component/pfrs-input/pfrs-input.component'; -import { PfrsComponent } from './decision-v2/decision-component/pfrs/pfrs.component'; -import { NaruComponent } from './decision-v2/decision-component/naru/naru.component'; -import { NaruInputComponent } from './decision-v2/decision-input/decision-components/decision-component/naru-input/naru-input.component'; export const decisionChildRoutes = [ { path: '', menuTitle: 'Decision', component: DecisionComponent, - portalOnly: true, + portalOnly: false, }, { path: 'create', menuTitle: 'Decision', component: DecisionInputV2Component, - portalOnly: true, + portalOnly: false, }, { path: 'draft/:uuid/edit', menuTitle: 'Decision', component: DecisionInputV2Component, - portalOnly: true, + portalOnly: false, + }, + { + path: 'conditions/:uuid', + menuTitle: 'Conditions', + component: ConditionsComponent, + portalOnly: false, }, ]; @@ -76,6 +84,8 @@ export const decisionChildRoutes = [ PfrsComponent, NaruComponent, NaruInputComponent, + ConditionsComponent, + ConditionComponent, ], imports: [SharedModule.forRoot(), RouterModule.forChild(decisionChildRoutes), MatTabsModule], }) diff --git a/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-condition/application-decision-condition.service.spec.ts b/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-condition/application-decision-condition.service.spec.ts new file mode 100644 index 0000000000..f778a957d6 --- /dev/null +++ b/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-condition/application-decision-condition.service.spec.ts @@ -0,0 +1,66 @@ +import { HttpClient } from '@angular/common/http'; +import { TestBed } from '@angular/core/testing'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { ToastService } from '../../../../toast/toast.service'; +import { of, throwError } from 'rxjs'; + +import { ApplicationDecisionConditionService } from './application-decision-condition.service'; + +describe('ApplicationDecisionConditionService', () => { + let service: ApplicationDecisionConditionService; + let mockHttpClient: DeepMocked; + let mockToastService: DeepMocked; + + beforeEach(() => { + mockHttpClient = createMock() + mockToastService = createMock() + + TestBed.configureTestingModule({ + providers: [ + { + provide: HttpClient, + useValue: mockHttpClient, + }, + { + provide: ToastService, + useValue: mockToastService, + }, + ], + }); + service = TestBed.inject(ApplicationDecisionConditionService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); + + it('should make an http patch and show a success toast when updating', async () => { + mockHttpClient.patch.mockReturnValue( + of({ + applicationFileNumber: '1', + }) + ); + + await service.update('1', {}); + + expect(mockHttpClient.patch).toHaveBeenCalledTimes(1); + expect(mockToastService.showSuccessToast).toHaveBeenCalledTimes(1); + }); + + it('should show a toast message if update fails', async () => { + mockHttpClient.patch.mockReturnValue( + throwError(() => { + new Error(''); + }) + ); + + try { + await service.update('1', {}); + } catch (e) { + //OM NOM NOM + } + + expect(mockHttpClient.patch).toHaveBeenCalledTimes(1); + expect(mockToastService.showErrorToast).toHaveBeenCalledTimes(1); + }); +}); diff --git a/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-condition/application-decision-condition.service.ts b/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-condition/application-decision-condition.service.ts new file mode 100644 index 0000000000..ccc6c838b5 --- /dev/null +++ b/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-condition/application-decision-condition.service.ts @@ -0,0 +1,30 @@ +import { HttpClient, HttpErrorResponse } from '@angular/common/http'; +import { Injectable } from '@angular/core'; +import { firstValueFrom } from 'rxjs'; +import { environment } from '../../../../../../environments/environment'; +import { ToastService } from '../../../../toast/toast.service'; +import { ApplicationDecisionConditionDto, UpdateApplicationDecisionConditionDto } from '../application-decision-v2.dto'; + +@Injectable({ + providedIn: 'root', +}) +export class ApplicationDecisionConditionService { + private url = `${environment.apiUrl}/v2/application-decision-condition`; + + constructor(private http: HttpClient, private toastService: ToastService) {} + + async update(uuid: string, data: UpdateApplicationDecisionConditionDto) { + try { + const res = await firstValueFrom(this.http.patch(`${this.url}/${uuid}`, data)); + this.toastService.showSuccessToast('Condition updated'); + return res; + } catch (e) { + if (e instanceof HttpErrorResponse && e.status === 400 && e.error?.message) { + this.toastService.showErrorToast(e.error.message); + } else { + this.toastService.showErrorToast('Failed to update condition'); + } + throw e; + } + } +} diff --git a/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-v2.dto.ts b/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-v2.dto.ts index bbab2f3216..3f3b7c2f24 100644 --- a/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-v2.dto.ts +++ b/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-v2.dto.ts @@ -84,6 +84,12 @@ export interface LinkedResolutionDto { linkedResolutions: string[]; } +export interface ApplicationDecisionWithLinkedResolutionDto extends ApplicationDecisionDto { + reconsideredByResolutions?: string[]; + modifiedByResolutions?: string[]; + index: number; +} + export interface DecisionDocumentDto { uuid: string; fileName: string; @@ -156,6 +162,7 @@ export interface DecisionComponentDto applicationDecisionComponentTypeCode: string; applicationDecisionComponentType?: DecisionComponentTypeDto; applicationDecisionUuid?: string; + conditionComponentsLabels?: string; } export interface DecisionCodesDto { @@ -188,16 +195,25 @@ export interface ApplicationDecisionConditionDto { securityAmount?: number | null; administrativeFee?: number | null; description?: string | null; + completionDate?: number | null; + supersededDate?: number | null; type?: ApplicationDecisionConditionTypeDto | null; + components?: DecisionComponentDto[] | null; } -export interface UpdateApplicationDecisionConditionDto { - uuid?: string; +export interface ComponentToCondition { componentDecisionUuid?: string; componentToConditionType?: string; + tempId?: string; +} +export interface UpdateApplicationDecisionConditionDto { + uuid?: string; + componentToConditions?: ComponentToCondition[] | null; approvalDependant?: boolean | null; securityAmount?: number | null; administrativeFee?: number | null; description?: string | null; + completionDate?: number | null; + supersededDate?: number | null; type?: ApplicationDecisionConditionTypeDto | null; } diff --git a/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-v2.service.ts b/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-v2.service.ts index fbf8c8d146..9f8c895f3d 100644 --- a/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-v2.service.ts +++ b/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-v2.service.ts @@ -7,6 +7,7 @@ import { verifyFileSize } from '../../../../shared/utils/file-size-checker'; import { ToastService } from '../../../toast/toast.service'; import { ApplicationDecisionDto, + ApplicationDecisionWithLinkedResolutionDto, CreateApplicationDecisionDto, DecisionCodesDto, UpdateApplicationDecisionDto, @@ -18,9 +19,9 @@ import { export class ApplicationDecisionV2Service { private url = `${environment.apiUrl}/v2/application-decision`; private decision: ApplicationDecisionDto | undefined; - private decisions: ApplicationDecisionDto[] = []; + private decisions: ApplicationDecisionWithLinkedResolutionDto[] = []; $decision = new BehaviorSubject(undefined); - $decisions = new BehaviorSubject([]); + $decisions = new BehaviorSubject([]); constructor(private http: HttpClient, private toastService: ToastService) {} @@ -139,7 +140,16 @@ export class ApplicationDecisionV2Service { async loadDecisions(fileNumber: string) { this.clearDecisions(); - this.decisions = await this.fetchByApplication(fileNumber); + const decisions = await this.fetchByApplication(fileNumber); + const decisionsLength = decisions.length; + + this.decisions = decisions.map((decision, ind) => ({ + ...decision, + reconsideredByResolutions: decision.reconsideredBy?.flatMap((r) => r.linkedResolutions) || [], + modifiedByResolutions: decision.modifiedBy?.flatMap((r) => r.linkedResolutions) || [], + index: decisionsLength - ind, + })); + this.$decisions.next(this.decisions); } diff --git a/alcs-frontend/src/app/shared/application-type-pill/application-type-pill.constants.ts b/alcs-frontend/src/app/shared/application-type-pill/application-type-pill.constants.ts index 432820b9c4..998afea8b4 100644 --- a/alcs-frontend/src/app/shared/application-type-pill/application-type-pill.constants.ts +++ b/alcs-frontend/src/app/shared/application-type-pill/application-type-pill.constants.ts @@ -65,3 +65,27 @@ export const RELEASED_DECISION_TYPE_LABEL = { description: 'Draft', textColor: '#000', }; + +export const DECISION_CONDITION_INCOMPLETE_LABEL = { + label: 'Incomplete', + shortLabel: 'INCD', + backgroundColor: '#fff', + borderColor: '#fcba19', + textColor: '#000', +}; + +export const DECISION_CONDITION_COMPLETE_LABEL = { + label: 'Complete', + shortLabel: 'COMD', + backgroundColor: '#fff', + borderColor: '#c08106', + textColor: '#000', +}; + +export const DECISION_CONDITION_SUPERSEDED_LABEL = { + label: 'Superseded', + shortLabel: 'SUPD', + backgroundColor: '#fff', + borderColor: '#C08106', + textColor: '#000', +}; diff --git a/alcs-frontend/src/app/shared/shared.module.ts b/alcs-frontend/src/app/shared/shared.module.ts index 960399ce57..70c5e60efd 100644 --- a/alcs-frontend/src/app/shared/shared.module.ts +++ b/alcs-frontend/src/app/shared/shared.module.ts @@ -47,6 +47,7 @@ import { InlineTextComponent } from './inline-text/inline-text.component'; import { InlineTextareaComponent } from './inline-textarea/inline-textarea.component'; import { MeetingOverviewComponent } from './meeting-overview/meeting-overview.component'; import { NoDataComponent } from './no-data/no-data.component'; +import { BooleanToStringPipe } from './pipes/boolean-to-string.pipe'; import { FileSizePipe } from './pipes/fileSize.pipe'; import { MomentPipe } from './pipes/moment.pipe'; import { SafePipe } from './pipes/safe.pipe'; @@ -58,7 +59,6 @@ import { TimeTrackerComponent } from './time-tracker/time-tracker.component'; import { TimelineComponent } from './timeline/timeline.component'; import { DATE_FORMATS } from './utils/date-format'; import { ExtensionsDatepickerFormatter } from './utils/extensions-datepicker-formatter'; -import { BooleanToStringPipe } from './pipes/boolean-to-string.pipe'; @NgModule({ declarations: [ diff --git a/alcs-frontend/src/styles.scss b/alcs-frontend/src/styles.scss index fef0f91808..a9fadb0cd9 100644 --- a/alcs-frontend/src/styles.scss +++ b/alcs-frontend/src/styles.scss @@ -300,3 +300,19 @@ mat-button-toggle-group { .mat-mdc-form-field-subscript-wrapper { display: none !important; } + +@mixin text-ellipsis($lines: 1) { + text-overflow: ellipsis; + overflow: hidden; + @if ($lines > 1) { + display: -webkit-box; + -webkit-line-clamp: $lines; + -webkit-box-orient: vertical; + } @else { + white-space: nowrap; + } +} + +.ellipsis-3 { + @include text-ellipsis($lines: 3); +} \ No newline at end of file diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-condition/application-decision-condition.controller.spec.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-condition/application-decision-condition.controller.spec.ts new file mode 100644 index 0000000000..2f56b6f470 --- /dev/null +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-condition/application-decision-condition.controller.spec.ts @@ -0,0 +1,109 @@ +import { classes } from '@automapper/classes'; +import { AutomapperModule } from '@automapper/nestjs'; +import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; +import { Test, TestingModule } from '@nestjs/testing'; +import { ClsService } from 'nestjs-cls'; +import { mockKeyCloakProviders } from '../../../../test/mocks/mockTypes'; +import { ApplicationDecisionProfile } from '../../../common/automapper/application-decision-v2.automapper.profile'; +import { ApplicationDecisionConditionController } from './application-decision-condition.controller'; +import { UpdateApplicationDecisionConditionDto } from './application-decision-condition.dto'; +import { ApplicationDecisionCondition } from './application-decision-condition.entity'; +import { ApplicationDecisionConditionService } from './application-decision-condition.service'; + +describe('ApplicationDecisionConditionController', () => { + let controller: ApplicationDecisionConditionController; + let mockApplicationDecisionConditionService: DeepMocked; + + beforeEach(async () => { + mockApplicationDecisionConditionService = createMock(); + + const module: TestingModule = await Test.createTestingModule({ + imports: [ + AutomapperModule.forRoot({ + strategyInitializer: classes(), + }), + ], + controllers: [ApplicationDecisionConditionController], + providers: [ + ApplicationDecisionProfile, + { + provide: ApplicationDecisionConditionService, + useValue: mockApplicationDecisionConditionService, + }, + { + provide: ClsService, + useValue: {}, + }, + ...mockKeyCloakProviders, + ], + }).compile(); + + controller = module.get( + ApplicationDecisionConditionController, + ); + }); + + it('should be defined', () => { + expect(controller).toBeDefined(); + }); + + describe('update', () => { + it('should update the condition and return updated condition', async () => { + // Arrange + const uuid = 'example-uuid'; + const date = new Date(); + const updates: UpdateApplicationDecisionConditionDto = { + approvalDependant: true, + securityAmount: 1000, + administrativeFee: 50, + description: 'example description', + completionDate: date.getTime(), + supersededDate: date.getTime(), + }; + + const condition = new ApplicationDecisionCondition({ + uuid, + approvalDependant: false, + securityAmount: 500, + administrativeFee: 25, + description: 'existing description', + completionDate: new Date(), + supersededDate: new Date(), + }); + + const updated = new ApplicationDecisionCondition({ + uuid, + approvalDependant: updates.approvalDependant, + securityAmount: updates.securityAmount, + administrativeFee: updates.administrativeFee, + description: updates.description, + completionDate: date, + supersededDate: date, + }); + + mockApplicationDecisionConditionService.getOneOrFail.mockResolvedValue( + condition, + ); + mockApplicationDecisionConditionService.update.mockResolvedValue(updated); + + const result = await controller.update(uuid, updates); + + expect( + mockApplicationDecisionConditionService.getOneOrFail, + ).toHaveBeenCalledWith(uuid); + expect( + mockApplicationDecisionConditionService.update, + ).toHaveBeenCalledWith(condition, { + ...updates, + completionDate: date, + supersededDate: date, + }); + expect(new Date(result.completionDate!)).toEqual(updated.completionDate); + expect(new Date(result.supersededDate!)).toEqual(updated.supersededDate); + expect(result.description).toEqual(updated.description); + expect(result.administrativeFee).toEqual(updated.administrativeFee); + expect(result.securityAmount).toEqual(updated.securityAmount); + expect(result.approvalDependant).toEqual(updated.approvalDependant); + }); + }); +}); diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-condition/application-decision-condition.controller.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-condition/application-decision-condition.controller.ts new file mode 100644 index 0000000000..c38a6b7e34 --- /dev/null +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-condition/application-decision-condition.controller.ts @@ -0,0 +1,48 @@ +import { Mapper } from '@automapper/core'; +import { InjectMapper } from '@automapper/nestjs'; +import { Body, Controller, Param, Patch, UseGuards } from '@nestjs/common'; +import { ApiOAuth2 } from '@nestjs/swagger'; +import * as config from 'config'; +import { ANY_AUTH_ROLE } from '../../../common/authorization/roles'; +import { RolesGuard } from '../../../common/authorization/roles-guard.service'; +import { UserRoles } from '../../../common/authorization/roles.decorator'; +import { formatIncomingDate } from '../../../utils/incoming-date.formatter'; +import { + ApplicationDecisionConditionDto, + UpdateApplicationDecisionConditionDto, +} from './application-decision-condition.dto'; +import { ApplicationDecisionCondition } from './application-decision-condition.entity'; +import { ApplicationDecisionConditionService } from './application-decision-condition.service'; + +@ApiOAuth2(config.get('KEYCLOAK.SCOPES')) +@Controller('application-decision-condition') +@UseGuards(RolesGuard) +export class ApplicationDecisionConditionController { + constructor( + private conditionService: ApplicationDecisionConditionService, + @InjectMapper() private mapper: Mapper, + ) {} + + @Patch('/:uuid') + @UserRoles(...ANY_AUTH_ROLE) + async update( + @Param('uuid') uuid: string, + @Body() updates: UpdateApplicationDecisionConditionDto, + ) { + const condition = await this.conditionService.getOneOrFail(uuid); + + const updatedCondition = await this.conditionService.update(condition, { + approvalDependant: updates.approvalDependant, + securityAmount: updates.securityAmount, + administrativeFee: updates.administrativeFee, + description: updates.description, + completionDate: formatIncomingDate(updates.completionDate), + supersededDate: formatIncomingDate(updates.supersededDate), + }); + return await this.mapper.mapAsync( + updatedCondition, + ApplicationDecisionCondition, + ApplicationDecisionConditionDto, + ); + } +} diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-condition/application-decision-condition.dto.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-condition/application-decision-condition.dto.ts index 9ee0a58ec6..c05683ab2e 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-condition/application-decision-condition.dto.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-condition/application-decision-condition.dto.ts @@ -1,5 +1,6 @@ import { AutoMap } from '@automapper/classes'; import { + IsArray, IsBoolean, IsNumber, IsOptional, @@ -7,6 +8,7 @@ import { IsUUID, } from 'class-validator'; import { BaseCodeDto } from '../../../common/dtos/base.dto'; +import { ApplicationDecisionComponentDto } from '../application-decision-v2/application-decision/component/application-decision-component.dto'; export class ApplicationDecisionConditionTypeDto extends BaseCodeDto {} export class ApplicationDecisionConditionDto { @@ -30,13 +32,18 @@ export class ApplicationDecisionConditionDto { @AutoMap(() => String) componentUuid: string | null; -} -export class UpdateApplicationDecisionConditionDto { - @IsOptional() - @IsString() - uuid?: string; + @AutoMap() + completionDate?: number; + + @AutoMap() + supersededDate?: number; + @AutoMap() + components?: ApplicationDecisionComponentDto[]; +} + +export class ComponentToConditionDto { @IsOptional() @IsUUID() componentDecisionUuid?: string; @@ -44,6 +51,16 @@ export class UpdateApplicationDecisionConditionDto { @IsOptional() @IsString() componentToConditionType?: string; +} + +export class UpdateApplicationDecisionConditionDto { + @IsOptional() + @IsString() + uuid?: string; + + @IsOptional() + @IsArray() + componentToConditions?: ComponentToConditionDto[]; @IsOptional() @IsBoolean() @@ -64,4 +81,23 @@ export class UpdateApplicationDecisionConditionDto { @IsOptional() @IsString() type?: ApplicationDecisionConditionTypeDto; + + @IsOptional() + @IsNumber() + completionDate?: number; + + @IsOptional() + @IsNumber() + supersededDate?: number; +} + +export class UpdateApplicationDecisionConditionServiceDto { + componentDecisionUuid?: string; + componentToConditionType?: string; + approvalDependant?: boolean; + securityAmount?: number; + administrativeFee?: number; + description?: string; + completionDate?: Date | null; + supersededDate?: Date | null; } diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-condition/application-decision-condition.entity.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-condition/application-decision-condition.entity.ts index 8a876ed209..b3cc1f7031 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-condition/application-decision-condition.entity.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-condition/application-decision-condition.entity.ts @@ -1,9 +1,9 @@ import { AutoMap } from '@automapper/classes'; -import { Column, Entity, ManyToOne } from 'typeorm'; +import { Column, Entity, JoinTable, ManyToMany, ManyToOne } from 'typeorm'; import { Base } from '../../../common/entities/base.entity'; import { ColumnNumericTransformer } from '../../../utils/column-numeric-transform'; -import { ApplicationDecision } from '../application-decision.entity'; import { ApplicationDecisionComponent } from '../application-decision-v2/application-decision/component/application-decision-component.entity'; +import { ApplicationDecision } from '../application-decision.entity'; import { ApplicationDecisionConditionType } from './application-decision-condition-code.entity'; @Entity() @@ -15,6 +15,7 @@ export class ApplicationDecisionCondition extends Base { } } + @AutoMap(() => Boolean) @Column({ type: 'boolean', nullable: true }) approvalDependant: boolean | null; @@ -38,24 +39,47 @@ export class ApplicationDecisionCondition extends Base { }) administrativeFee: number | null; + @AutoMap(() => String) @Column({ type: 'text', nullable: true }) description: string | null; + @AutoMap(() => String) + @Column({ + type: 'timestamptz', + comment: 'Condition Completion date', + nullable: true, + }) + completionDate?: Date | null; + + @AutoMap() + @Column({ + type: 'timestamptz', + comment: 'Condition Superseded date', + nullable: true, + }) + supersededDate?: Date | null; + @ManyToOne(() => ApplicationDecisionConditionType) type: ApplicationDecisionConditionType; + @AutoMap(() => String) @Column({ type: 'text', nullable: true }) typeCode: string | null; @ManyToOne(() => ApplicationDecision, { nullable: false }) decision: ApplicationDecision; + @AutoMap(() => String) @Column() decisionUuid: string; - @ManyToOne(() => ApplicationDecisionComponent) - component: ApplicationDecisionComponent | null; - - @Column({ type: 'uuid', nullable: true }) - componentUuid: string | null; + @ManyToMany( + () => ApplicationDecisionComponent, + (component) => component.conditions, + { nullable: true }, + ) + @JoinTable({ + name: 'application_decision_condition_component', + }) + components: ApplicationDecisionComponent[] | null; } diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-condition/application-decision-condition.service.spec.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-condition/application-decision-condition.service.spec.ts index 6fd22039ba..63b309e1d4 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-condition/application-decision-condition.service.spec.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-condition/application-decision-condition.service.spec.ts @@ -48,6 +48,7 @@ describe('ApplicationDecisionConditionService', () => { mockApplicationDecisionConditionRepository.findOneOrFail, ).toBeCalledWith({ where: { uuid: 'fake' }, + relations: { type: true }, }); expect(result).toBeDefined(); }); @@ -107,6 +108,7 @@ describe('ApplicationDecisionConditionService', () => { mockApplicationDecisionConditionRepository.findOneOrFail, ).toBeCalledWith({ where: { uuid: 'uuid' }, + relations: { type: true }, }); expect(result[0].uuid).toEqual(mockDto.uuid); }); diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-condition/application-decision-condition.service.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-condition/application-decision-condition.service.ts index 6a0979fc9f..c6b3bfa1a5 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-condition/application-decision-condition.service.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-condition/application-decision-condition.service.ts @@ -1,10 +1,12 @@ -import { ServiceValidationException } from '@app/common/exceptions/base.exception'; import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { CreateApplicationDecisionComponentDto } from '../application-decision-v2/application-decision/component/application-decision-component.dto'; +import { ServiceValidationException } from '../../../../../../libs/common/src/exceptions/base.exception'; import { ApplicationDecisionComponent } from '../application-decision-v2/application-decision/component/application-decision-component.entity'; -import { UpdateApplicationDecisionConditionDto } from './application-decision-condition.dto'; +import { + UpdateApplicationDecisionConditionDto, + UpdateApplicationDecisionConditionServiceDto, +} from './application-decision-condition.dto'; import { ApplicationDecisionCondition } from './application-decision-condition.entity'; @Injectable() @@ -17,6 +19,9 @@ export class ApplicationDecisionConditionService { async getOneOrFail(uuid: string) { return this.repository.findOneOrFail({ where: { uuid }, + relations: { + type: true, + }, }); } @@ -43,38 +48,41 @@ export class ApplicationDecisionConditionService { condition.approvalDependant = updateDto.approvalDependant ?? null; if ( - updateDto.componentDecisionUuid && - updateDto.componentToConditionType + updateDto.componentToConditions !== undefined && + updateDto.componentToConditions.length > 0 ) { - const matchingComponent = allComponents.find( + const matchingComponent = allComponents.filter( (component) => - component.applicationDecisionUuid === - updateDto.componentDecisionUuid && - component.applicationDecisionComponentType.code === - updateDto.componentToConditionType, + updateDto.componentToConditions + ?.flatMap((e) => e.componentDecisionUuid) + .includes(component.applicationDecisionUuid) && + updateDto.componentToConditions + ?.flatMap((e) => e.componentToConditionType) + .includes(component.applicationDecisionComponentTypeCode), ); - if (matchingComponent) { - condition.componentUuid = matchingComponent.uuid; + + if (matchingComponent && matchingComponent.length > 0) { + condition.components = matchingComponent; updatedConditions.push(condition); continue; } - const matchingComponent2 = newComponents.find( - (component) => - component.applicationDecisionComponentTypeCode === - updateDto.componentToConditionType, + const matchingComponent2 = newComponents.filter((component) => + updateDto.componentToConditions + ?.flatMap((e) => e.componentToConditionType) + .includes(component.applicationDecisionComponentTypeCode), ); - if (matchingComponent2) { - condition.component = matchingComponent2; + + if (matchingComponent2 && matchingComponent2.length > 0) { + condition.components = matchingComponent2; updatedConditions.push(condition); continue; } - throw new ServiceValidationException( 'Failed to find matching component', ); } else { - condition.componentUuid = null; + condition.components = null; updatedConditions.push(condition); } } @@ -89,4 +97,12 @@ export class ApplicationDecisionConditionService { async remove(components: ApplicationDecisionCondition[]) { await this.repository.remove(components); } + + async update( + existingCondition: ApplicationDecisionCondition, + updates: UpdateApplicationDecisionConditionServiceDto, + ) { + await this.repository.update(existingCondition.uuid, updates); + return await this.getOneOrFail(existingCondition.uuid); + } } diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision-v2.module.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision-v2.module.ts index 2a5891e1e4..124775e2a6 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision-v2.module.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision-v2.module.ts @@ -32,6 +32,7 @@ import { ApplicationDecisionComponentService } from './application-decision/comp import { LinkedResolutionOutcomeType } from './application-decision/linked-resolution-outcome-type.entity'; import { ApplicationDecisionComponentController } from './application-decision/component/application-decision-component.controller'; import { NaruSubtype } from '../../../portal/application-submission/naru-subtype/naru-subtype.entity'; +import { ApplicationDecisionConditionController } from '../application-decision-condition/application-decision-condition.controller'; @Module({ imports: [ @@ -76,6 +77,7 @@ import { NaruSubtype } from '../../../portal/application-submission/naru-subtype controllers: [ ApplicationDecisionV2Controller, ApplicationDecisionComponentController, + ApplicationDecisionConditionController, ], exports: [ApplicationDecisionV2Service], }) diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service.spec.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service.spec.ts index 2a602d60ae..40856e89cc 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service.spec.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service.spec.ts @@ -171,6 +171,8 @@ describe('ApplicationDecisionV2Service', () => { mockNaruSubtypeRepository.find.mockResolvedValue([]); mockDecisionComponentService.createOrUpdate.mockResolvedValue([]); + + mockDecisionConditionService.remove.mockResolvedValue({} as any); }); describe('ApplicationDecisionService Core Tests', () => { diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service.ts index f6080377f8..af671e4126 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service.ts @@ -113,6 +113,10 @@ export class ApplicationDecisionV2Service { applicationDecisionComponentType: true, naruSubtype: true, }, + conditions: { + type: true, + components: true, + }, }, }); @@ -203,6 +207,7 @@ export class ApplicationDecisionV2Service { }, conditions: { type: true, + components: true, }, chairReviewOutcome: true, }, @@ -217,6 +222,7 @@ export class ApplicationDecisionV2Service { decision.documents = decision.documents.filter( (document) => !!document.document, ); + return decision; } diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.entity.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.entity.ts index 9532ad09ba..2a4ec38d7f 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.entity.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.entity.ts @@ -1,8 +1,9 @@ import { AutoMap } from '@automapper/classes'; -import { Column, Entity, Index, ManyToOne } from 'typeorm'; +import { Column, Entity, Index, ManyToMany, ManyToOne } from 'typeorm'; import { Base } from '../../../../../common/entities/base.entity'; import { NaruSubtype } from '../../../../../portal/application-submission/naru-subtype/naru-subtype.entity'; import { ColumnNumericTransformer } from '../../../../../utils/column-numeric-transform'; +import { ApplicationDecisionCondition } from '../../../application-decision-condition/application-decision-condition.entity'; import { ApplicationDecision } from '../../../application-decision.entity'; import { ApplicationDecisionComponentType } from './application-decision-component-type.entity'; @@ -202,4 +203,10 @@ export class ApplicationDecisionComponent extends Base { @AutoMap() @ManyToOne(() => ApplicationDecision, { nullable: false }) applicationDecision: ApplicationDecision; + + @ManyToMany( + () => ApplicationDecisionCondition, + (condition) => condition.components, + ) + conditions: ApplicationDecisionCondition[]; } diff --git a/services/apps/alcs/src/common/automapper/application-decision-v2.automapper.profile.ts b/services/apps/alcs/src/common/automapper/application-decision-v2.automapper.profile.ts index c91472184c..35153cd374 100644 --- a/services/apps/alcs/src/common/automapper/application-decision-v2.automapper.profile.ts +++ b/services/apps/alcs/src/common/automapper/application-decision-v2.automapper.profile.ts @@ -31,8 +31,8 @@ import { ApplicationDecisionComponent } from '../../alcs/application-decision/ap import { LinkedResolutionOutcomeType } from '../../alcs/application-decision/application-decision-v2/application-decision/linked-resolution-outcome-type.entity'; import { ApplicationDecision } from '../../alcs/application-decision/application-decision.entity'; import { PortalDecisionDto } from '../../portal/application-decision/application-decision.dto'; -import { NaruSubtype } from '../../portal/application-submission/naru-subtype/naru-subtype.entity'; import { NaruSubtypeDto } from '../../portal/application-submission/application-submission.dto'; +import { NaruSubtype } from '../../portal/application-submission/naru-subtype/naru-subtype.entity'; @Injectable() export class ApplicationDecisionProfile extends AutomapperProfile { @@ -214,6 +214,26 @@ export class ApplicationDecisionProfile extends AutomapperProfile { mapper, ApplicationDecisionCondition, ApplicationDecisionConditionDto, + forMember( + (ad) => ad.completionDate, + mapFrom((a) => a.completionDate?.getTime()), + ), + forMember( + (ad) => ad.supersededDate, + mapFrom((a) => a.supersededDate?.getTime()), + ), + forMember( + (ad) => ad.components, + mapFrom((a) => + a.components && a.components.length > 0 + ? this.mapper.mapArray( + a.components, + ApplicationDecisionComponent, + ApplicationDecisionComponentDto, + ) + : [], + ), + ), ); createMap( diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1688064562389-completion_and_superseded_dates_for_conditions.ts b/services/apps/alcs/src/providers/typeorm/migrations/1688064562389-completion_and_superseded_dates_for_conditions.ts new file mode 100644 index 0000000000..7e76188b2a --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1688064562389-completion_and_superseded_dates_for_conditions.ts @@ -0,0 +1,37 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class completionAndSupersededDatesForConditions1688064562389 + implements MigrationInterface +{ + name = 'completionAndSupersededDatesForConditions1688064562389'; + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `ALTER TABLE "alcs"."application_decision_condition" ADD "completion_date" TIMESTAMP WITH TIME ZONE`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."application_decision_condition"."completion_date" IS 'Condition Completion date'`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_decision_condition" ADD "superseded_date" TIMESTAMP WITH TIME ZONE`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."application_decision_condition"."superseded_date" IS 'Condition Superseded date'`, + ); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."application_decision_condition"."superseded_date" IS 'Condition Superseded date'`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_decision_condition" DROP COLUMN "superseded_date"`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."application_decision_condition"."completion_date" IS 'Condition Completion date'`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_decision_condition" DROP COLUMN "completion_date"`, + ); + } +} diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1688150315958-many_to_many_component_conditions.ts b/services/apps/alcs/src/providers/typeorm/migrations/1688150315958-many_to_many_component_conditions.ts new file mode 100644 index 0000000000..3d04e90f3a --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1688150315958-many_to_many_component_conditions.ts @@ -0,0 +1,55 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class manyToManyComponentConditions1688150315958 + implements MigrationInterface +{ + name = 'manyToManyComponentConditions1688150315958'; + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `ALTER TABLE "alcs"."application_decision_condition" DROP CONSTRAINT "FK_9745fcca6616819f804a129fef4"`, + ); + await queryRunner.query( + `CREATE TABLE "alcs"."application_decision_condition_component" ("application_decision_condition_uuid" uuid NOT NULL, "application_decision_component_uuid" uuid NOT NULL, CONSTRAINT "PK_5794bea9870c0f65417a3de5e78" PRIMARY KEY ("application_decision_condition_uuid", "application_decision_component_uuid"))`, + ); + await queryRunner.query( + `CREATE INDEX "IDX_9471c8341a43328f1705e5cc2b" ON "alcs"."application_decision_condition_component" ("application_decision_condition_uuid") `, + ); + await queryRunner.query( + `CREATE INDEX "IDX_a26a88960a996c58891c744beb" ON "alcs"."application_decision_condition_component" ("application_decision_component_uuid") `, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_decision_condition" DROP COLUMN "component_uuid"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_decision_condition_component" ADD CONSTRAINT "FK_9471c8341a43328f1705e5cc2bf" FOREIGN KEY ("application_decision_condition_uuid") REFERENCES "alcs"."application_decision_condition"("uuid") ON DELETE CASCADE ON UPDATE CASCADE`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_decision_condition_component" ADD CONSTRAINT "FK_a26a88960a996c58891c744beba" FOREIGN KEY ("application_decision_component_uuid") REFERENCES "alcs"."application_decision_component"("uuid") ON DELETE CASCADE ON UPDATE CASCADE`, + ); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `ALTER TABLE "alcs"."application_decision_condition_component" DROP CONSTRAINT "FK_a26a88960a996c58891c744beba"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_decision_condition_component" DROP CONSTRAINT "FK_9471c8341a43328f1705e5cc2bf"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_decision_condition" ADD "component_uuid" uuid`, + ); + await queryRunner.query( + `DROP INDEX "alcs"."IDX_a26a88960a996c58891c744beb"`, + ); + await queryRunner.query( + `DROP INDEX "alcs"."IDX_9471c8341a43328f1705e5cc2b"`, + ); + await queryRunner.query( + `DROP TABLE "alcs"."application_decision_condition_component"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_decision_condition" ADD CONSTRAINT "FK_9745fcca6616819f804a129fef4" FOREIGN KEY ("component_uuid") REFERENCES "alcs"."application_decision_component"("uuid") ON DELETE NO ACTION ON UPDATE NO ACTION`, + ); + } +} diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1688150503477-many_to_many_component_conditions.ts b/services/apps/alcs/src/providers/typeorm/migrations/1688150503477-many_to_many_component_conditions.ts new file mode 100644 index 0000000000..46e3e39147 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1688150503477-many_to_many_component_conditions.ts @@ -0,0 +1,25 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class manyToManyComponentConditions1688150503477 + implements MigrationInterface +{ + name = 'manyToManyComponentConditions1688150503477'; + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `ALTER TABLE "alcs"."application_decision_condition_component" DROP CONSTRAINT "FK_a26a88960a996c58891c744beba"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_decision_condition_component" ADD CONSTRAINT "FK_a26a88960a996c58891c744beba" FOREIGN KEY ("application_decision_component_uuid") REFERENCES "alcs"."application_decision_component"("uuid") ON DELETE NO ACTION ON UPDATE NO ACTION`, + ); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `ALTER TABLE "alcs"."application_decision_condition_component" DROP CONSTRAINT "FK_a26a88960a996c58891c744beba"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_decision_condition_component" ADD CONSTRAINT "FK_a26a88960a996c58891c744beba" FOREIGN KEY ("application_decision_component_uuid") REFERENCES "alcs"."application_decision_component"("uuid") ON DELETE CASCADE ON UPDATE CASCADE`, + ); + } +} diff --git a/services/apps/alcs/test/mocks/mockEntities.ts b/services/apps/alcs/test/mocks/mockEntities.ts index 3be83e4dc9..543d73a0f2 100644 --- a/services/apps/alcs/test/mocks/mockEntities.ts +++ b/services/apps/alcs/test/mocks/mockEntities.ts @@ -1,3 +1,11 @@ +import { ApplicationDecisionOutcomeCode } from '../../src/alcs/application-decision/application-decision-outcome.entity'; +import { ApplicationDecisionMeeting } from '../../src/alcs/application-decision/application-decision-v1/application-decision-meeting/application-decision-meeting.entity'; +import { ApplicationDecision } from '../../src/alcs/application-decision/application-decision.entity'; +import { ApplicationModificationOutcomeType } from '../../src/alcs/application-decision/application-modification/application-modification-outcome-type/application-modification-outcome-type.entity'; +import { ApplicationModification } from '../../src/alcs/application-decision/application-modification/application-modification.entity'; +import { ApplicationReconsideration } from '../../src/alcs/application-decision/application-reconsideration/application-reconsideration.entity'; +import { ApplicationReconsiderationOutcomeType } from '../../src/alcs/application-decision/application-reconsideration/reconsideration-outcome-type/application-reconsideration-outcome-type.entity'; +import { ApplicationReconsiderationType } from '../../src/alcs/application-decision/application-reconsideration/reconsideration-type/application-reconsideration-type.entity'; import { ApplicationMeeting } from '../../src/alcs/application/application-meeting/application-meeting.entity'; import { ApplicationPaused } from '../../src/alcs/application/application-paused.entity'; import { Application } from '../../src/alcs/application/application.entity'; @@ -12,14 +20,6 @@ import { ApplicationRegion } from '../../src/alcs/code/application-code/applicat import { ApplicationType } from '../../src/alcs/code/application-code/application-type/application-type.entity'; import { Comment } from '../../src/alcs/comment/comment.entity'; import { CommentMention } from '../../src/alcs/comment/mention/comment-mention.entity'; -import { ApplicationDecisionOutcomeCode } from '../../src/alcs/application-decision/application-decision-outcome.entity'; -import { ApplicationDecision } from '../../src/alcs/application-decision/application-decision.entity'; -import { ApplicationModification } from '../../src/alcs/application-decision/application-modification/application-modification.entity'; -import { ApplicationModificationOutcomeType } from '../../src/alcs/application-decision/application-modification/application-modification-outcome-type/application-modification-outcome-type.entity'; -import { ApplicationReconsideration } from '../../src/alcs/application-decision/application-reconsideration/application-reconsideration.entity'; -import { ApplicationReconsiderationOutcomeType } from '../../src/alcs/application-decision/application-reconsideration/reconsideration-outcome-type/application-reconsideration-outcome-type.entity'; -import { ApplicationReconsiderationType } from '../../src/alcs/application-decision/application-reconsideration/reconsideration-type/application-reconsideration-type.entity'; -import { ApplicationDecisionMeeting } from '../../src/alcs/application-decision/application-decision-v1/application-decision-meeting/application-decision-meeting.entity'; import { AssigneeDto, UserDto } from '../../src/user/user.dto'; import { User } from '../../src/user/user.entity'; @@ -291,6 +291,7 @@ const initApplicationDecisionMock = (application?: Application) => { applicationUuid: application ? application.uuid : 'fake-application-uuid', application, documents: [], + conditions: [], }); }; From 04adc6b4dd4f37db7441d567a4b19f531520d2d1 Mon Sep 17 00:00:00 2001 From: "to. sandra" <76515860+sandratoh@users.noreply.github.com> Date: Thu, 6 Jul 2023 16:11:59 -0700 Subject: [PATCH 055/954] Show toggle button validation on parcel search (#756) * Show toggle button validation on parcel search * Fix farm validation on form click and search --- .../parcel-details/parcel-entry/parcel-entry.component.html | 4 ++-- .../parcel-details/parcel-entry/parcel-entry.component.ts | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/portal-frontend/src/app/features/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html b/portal-frontend/src/app/features/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html index 533bcab509..cbfa6a50b5 100644 --- a/portal-frontend/src/app/features/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html +++ b/portal-frontend/src/app/features/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html @@ -154,7 +154,7 @@
Parcel Lookup
>No -
+
warning
This field is required
@@ -243,7 +243,7 @@
Owner Information
Date: Mon, 10 Jul 2023 09:14:30 -0700 Subject: [PATCH 056/954] Only set visibility when changing document types * Do not set on load/edit --- .../document-upload-dialog.component.ts | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/alcs-frontend/src/app/features/application/documents/document-upload-dialog/document-upload-dialog.component.ts b/alcs-frontend/src/app/features/application/documents/document-upload-dialog/document-upload-dialog.component.ts index 0b6cc13f9f..ed36bc8f65 100644 --- a/alcs-frontend/src/app/features/application/documents/document-upload-dialog/document-upload-dialog.component.ts +++ b/alcs-frontend/src/app/features/application/documents/document-upload-dialog/document-upload-dialog.component.ts @@ -154,8 +154,6 @@ export class DocumentUploadDialogComponent implements OnInit, OnDestroy { if (parcels.length > 0) { this.parcelId.setValidators([Validators.required]); this.parcelId.updateValueAndValidity(); - - this.visibleToInternal.setValue(true); this.source.setValue(DOCUMENT_SOURCE.APPLICANT); const selectedParcel = parcels.find((parcel) => parcel.certificateOfTitleUuid === uuid); @@ -181,8 +179,6 @@ export class DocumentUploadDialogComponent implements OnInit, OnDestroy { const owners = submission.owners; this.ownerId.setValidators([Validators.required]); this.ownerId.updateValueAndValidity(); - - this.visibleToInternal.setValue(true); this.source.setValue(DOCUMENT_SOURCE.APPLICANT); const selectedOwner = owners.find((owner) => owner.corporateSummaryUuid === uuid); @@ -210,6 +206,7 @@ export class DocumentUploadDialogComponent implements OnInit, OnDestroy { if (this.type.value === DOCUMENT_TYPE.CERTIFICATE_OF_TITLE) { await this.prepareCertificateOfTitleUpload(); + this.visibleToInternal.setValue(true); } else { this.parcelId.setValue(null); this.parcelId.setValidators([]); @@ -218,6 +215,7 @@ export class DocumentUploadDialogComponent implements OnInit, OnDestroy { if (this.type.value === DOCUMENT_TYPE.CORPORATE_SUMMARY) { await this.prepareCorporateSummaryUpload(); + this.visibleToInternal.setValue(true); } else { this.ownerId.setValue(null); this.ownerId.setValidators([]); From 2dce88b22340b3ddeecb7ca2f072efdcca480799 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Mon, 10 Jul 2023 12:58:02 -0700 Subject: [PATCH 057/954] Add card statuses to Admin * Allow creation/edit/deletion of card statuses * Add special logic for deletion --- .../src/app/features/admin/admin.component.ts | 7 + .../src/app/features/admin/admin.module.ts | 4 + .../card-status-dialog.component.html | 56 +++++++ .../card-status-dialog.component.scss | 19 +++ .../card-status-dialog.component.spec.ts | 37 +++++ .../card-status-dialog.component.ts | 63 +++++++ .../card-status/card-status.component.html | 35 ++++ .../card-status/card-status.component.scss | 9 + .../card-status/card-status.component.spec.ts | 53 ++++++ .../card-status/card-status.component.ts | 73 +++++++++ .../card-status/card-status.service.spec.ts | 154 ++++++++++++++++++ .../card/card-status/card-status.service.ts | 65 ++++++++ .../apps/alcs/src/alcs/admin/admin.module.ts | 6 + .../card-status.controller.spec.ts | 125 ++++++++++++++ .../card-status/card-status.controller.ts | 89 ++++++++++ .../apps/alcs/src/alcs/board/board.service.ts | 18 +- .../card-status.controller.spec.ts | 49 ------ .../card-status/card-status.controller.ts | 26 --- .../card/card-status/card-status.entity.ts | 1 + .../card-status/card-status.service.spec.ts | 83 +++++++--- .../card/card-status/card-status.service.ts | 52 ++++-- .../apps/alcs/src/alcs/card/card.module.ts | 3 +- .../apps/alcs/src/alcs/card/card.service.ts | 7 + 23 files changed, 922 insertions(+), 112 deletions(-) create mode 100644 alcs-frontend/src/app/features/admin/card-status/card-status-dialog/card-status-dialog.component.html create mode 100644 alcs-frontend/src/app/features/admin/card-status/card-status-dialog/card-status-dialog.component.scss create mode 100644 alcs-frontend/src/app/features/admin/card-status/card-status-dialog/card-status-dialog.component.spec.ts create mode 100644 alcs-frontend/src/app/features/admin/card-status/card-status-dialog/card-status-dialog.component.ts create mode 100644 alcs-frontend/src/app/features/admin/card-status/card-status.component.html create mode 100644 alcs-frontend/src/app/features/admin/card-status/card-status.component.scss create mode 100644 alcs-frontend/src/app/features/admin/card-status/card-status.component.spec.ts create mode 100644 alcs-frontend/src/app/features/admin/card-status/card-status.component.ts create mode 100644 alcs-frontend/src/app/services/card/card-status/card-status.service.spec.ts create mode 100644 alcs-frontend/src/app/services/card/card-status/card-status.service.ts create mode 100644 services/apps/alcs/src/alcs/admin/card-status/card-status.controller.spec.ts create mode 100644 services/apps/alcs/src/alcs/admin/card-status/card-status.controller.ts delete mode 100644 services/apps/alcs/src/alcs/card/card-status/card-status.controller.spec.ts delete mode 100644 services/apps/alcs/src/alcs/card/card-status/card-status.controller.ts diff --git a/alcs-frontend/src/app/features/admin/admin.component.ts b/alcs-frontend/src/app/features/admin/admin.component.ts index 66886e92c0..87c6eeb1e1 100644 --- a/alcs-frontend/src/app/features/admin/admin.component.ts +++ b/alcs-frontend/src/app/features/admin/admin.component.ts @@ -1,5 +1,6 @@ import { Component } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; +import { CardStatusComponent } from './card-status/card-status.component'; import { CeoCriterionComponent } from './ceo-criterion/ceo-criterion.component'; import { DecisionConditionTypesComponent } from './decision-condition-types/decision-condition-types.component'; import { DecisionMakerComponent } from './decision-maker/decision-maker.component'; @@ -51,6 +52,12 @@ export const childRoutes = [ icon: 'unarchive', component: UnarchiveComponent, }, + { + path: 'card-status', + menuTitle: 'Columns', + icon: 'view_week', + component: CardStatusComponent, + }, ]; @Component({ diff --git a/alcs-frontend/src/app/features/admin/admin.module.ts b/alcs-frontend/src/app/features/admin/admin.module.ts index 127a80f3d0..61defb2f23 100644 --- a/alcs-frontend/src/app/features/admin/admin.module.ts +++ b/alcs-frontend/src/app/features/admin/admin.module.ts @@ -4,6 +4,8 @@ import { MatPaginatorModule } from '@angular/material/paginator'; import { RouterModule, Routes } from '@angular/router'; import { SharedModule } from '../../shared/shared.module'; import { AdminComponent, childRoutes } from './admin.component'; +import { CardStatusDialogComponent } from './card-status/card-status-dialog/card-status-dialog.component'; +import { CardStatusComponent } from './card-status/card-status.component'; import { CeoCriterionDialogComponent } from './ceo-criterion/ceo-criterion-dialog/ceo-criterion-dialog.component'; import { CeoCriterionComponent } from './ceo-criterion/ceo-criterion.component'; import { DecisionConditionTypesDialogComponent } from './decision-condition-types/decision-condition-types-dialog/decision-condition-types-dialog.component'; @@ -41,6 +43,8 @@ const routes: Routes = [ DecisionMakerDialogComponent, DecisionConditionTypesComponent, DecisionConditionTypesDialogComponent, + CardStatusComponent, + CardStatusDialogComponent, ], imports: [CommonModule, SharedModule.forRoot(), RouterModule.forChild(routes), MatPaginatorModule], }) diff --git a/alcs-frontend/src/app/features/admin/card-status/card-status-dialog/card-status-dialog.component.html b/alcs-frontend/src/app/features/admin/card-status/card-status-dialog/card-status-dialog.component.html new file mode 100644 index 0000000000..221f66fe25 --- /dev/null +++ b/alcs-frontend/src/app/features/admin/card-status/card-status-dialog/card-status-dialog.component.html @@ -0,0 +1,56 @@ +
+

{{ isEdit ? 'Edit' : 'Create' }} Column

+
+
+
+
+ + Code + + +
+ +
+ + Label + + + Note: The change will be reflected on all boards +
+ +
+ + Description + + +
+
+ +
+
+ +
+
+ + +
+
+
diff --git a/alcs-frontend/src/app/features/admin/card-status/card-status-dialog/card-status-dialog.component.scss b/alcs-frontend/src/app/features/admin/card-status/card-status-dialog/card-status-dialog.component.scss new file mode 100644 index 0000000000..60e066882d --- /dev/null +++ b/alcs-frontend/src/app/features/admin/card-status/card-status-dialog/card-status-dialog.component.scss @@ -0,0 +1,19 @@ +.dialog { + padding: 24px; + + form { + display: grid; + grid-template-columns: 1fr; + row-gap: 24px; + column-gap: 24px; + margin-bottom: 12px; + + .mat-mdc-form-field { + width: 100%; + } + } +} + +.split { + margin-top: 36px; +} diff --git a/alcs-frontend/src/app/features/admin/card-status/card-status-dialog/card-status-dialog.component.spec.ts b/alcs-frontend/src/app/features/admin/card-status/card-status-dialog/card-status-dialog.component.spec.ts new file mode 100644 index 0000000000..ef7e3af3d4 --- /dev/null +++ b/alcs-frontend/src/app/features/admin/card-status/card-status-dialog/card-status-dialog.component.spec.ts @@ -0,0 +1,37 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { FormsModule, ReactiveFormsModule } from '@angular/forms'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; +import { CardStatusService } from '../../../../services/card/card-status/card-status.service'; +import { DecisionConditionTypesService } from '../../../../services/decision-condition-types/decision-condition-types.service'; + +import { CardStatusDialogComponent } from './card-status-dialog.component'; + +describe('CardStatusDialogComponent', () => { + let component: CardStatusDialogComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [ReactiveFormsModule, FormsModule], + declarations: [CardStatusDialogComponent], + providers: [ + { provide: MAT_DIALOG_DATA, useValue: undefined }, + { provide: MatDialogRef, useValue: {} }, + { + provide: CardStatusService, + useValue: {}, + }, + ], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(CardStatusDialogComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/alcs-frontend/src/app/features/admin/card-status/card-status-dialog/card-status-dialog.component.ts b/alcs-frontend/src/app/features/admin/card-status/card-status-dialog/card-status-dialog.component.ts new file mode 100644 index 0000000000..c05c5a1d04 --- /dev/null +++ b/alcs-frontend/src/app/features/admin/card-status/card-status-dialog/card-status-dialog.component.ts @@ -0,0 +1,63 @@ +import { Component, Inject, OnInit } from '@angular/core'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; +import { CardStatusDto } from '../../../../services/application/application-code.dto'; +import { CardStatusService } from '../../../../services/card/card-status/card-status.service'; + +@Component({ + selector: 'app-decision-condition-types-dialog', + templateUrl: './card-status-dialog.component.html', + styleUrls: ['./card-status-dialog.component.scss'], +}) +export class CardStatusDialogComponent implements OnInit { + description = ''; + label = ''; + code = ''; + + isLoading = false; + isEdit = false; + canDelete = false; + canDeleteReason = ''; + + constructor( + @Inject(MAT_DIALOG_DATA) public data: CardStatusDto | undefined, + private dialogRef: MatDialogRef, + private cardStatusService: CardStatusService + ) { + if (data) { + this.description = data.description; + this.label = data.label; + this.code = data.code; + } + this.isEdit = !!data; + } + + async onSubmit() { + this.isLoading = true; + + const dto = { + code: this.code, + label: this.label, + description: this.description, + }; + + if (this.isEdit) { + await this.cardStatusService.update(this.code, dto); + } else { + await this.cardStatusService.create(dto); + } + this.isLoading = false; + this.dialogRef.close(true); + } + + ngOnInit(): void { + this.loadCanDelete(); + } + + private async loadCanDelete() { + const res = await this.cardStatusService.canDelete(this.code); + if (res) { + this.canDelete = res.canDelete; + this.canDeleteReason = res.reason; + } + } +} diff --git a/alcs-frontend/src/app/features/admin/card-status/card-status.component.html b/alcs-frontend/src/app/features/admin/card-status/card-status.component.html new file mode 100644 index 0000000000..0126c89c37 --- /dev/null +++ b/alcs-frontend/src/app/features/admin/card-status/card-status.component.html @@ -0,0 +1,35 @@ +
+
+

Columns

+ +
+ + + + + + + + + + + + + + + + + + + + + + + + +
Label{{ row.label }}Description{{ row.description }}Code{{ row.code }}Actions + +
+
diff --git a/alcs-frontend/src/app/features/admin/card-status/card-status.component.scss b/alcs-frontend/src/app/features/admin/card-status/card-status.component.scss new file mode 100644 index 0000000000..4320920313 --- /dev/null +++ b/alcs-frontend/src/app/features/admin/card-status/card-status.component.scss @@ -0,0 +1,9 @@ +.container { + .edit-btn { + color: green; + } + + .delete-btn { + color: red; + } +} diff --git a/alcs-frontend/src/app/features/admin/card-status/card-status.component.spec.ts b/alcs-frontend/src/app/features/admin/card-status/card-status.component.spec.ts new file mode 100644 index 0000000000..d038f664e1 --- /dev/null +++ b/alcs-frontend/src/app/features/admin/card-status/card-status.component.spec.ts @@ -0,0 +1,53 @@ +import { HttpClientTestingModule } from '@angular/common/http/testing'; +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { MatDialog } from '@angular/material/dialog'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { CardStatusService } from '../../../services/card/card-status/card-status.service'; +import { DecisionConditionTypesService } from '../../../services/decision-condition-types/decision-condition-types.service'; +import { ConfirmationDialogService } from '../../../shared/confirmation-dialog/confirmation-dialog.service'; + +import { CardStatusComponent } from './card-status.component'; + +describe('CardStatusComponent', () => { + let component: CardStatusComponent; + let fixture: ComponentFixture; + let mockCardStatusService: DeepMocked; + let mockDialog: DeepMocked; + let mockConfirmationDialogService: DeepMocked; + + beforeEach(async () => { + mockCardStatusService = createMock(); + mockDialog = createMock(); + mockConfirmationDialogService = createMock(); + + await TestBed.configureTestingModule({ + declarations: [CardStatusComponent], + providers: [ + { + provide: CardStatusService, + useValue: mockCardStatusService, + }, + { + provide: MatDialog, + useValue: mockDialog, + }, + { + provide: ConfirmationDialogService, + useValue: mockConfirmationDialogService, + }, + ], + schemas: [NO_ERRORS_SCHEMA], + imports: [HttpClientTestingModule], + }).compileComponents(); + + fixture = TestBed.createComponent(CardStatusComponent); + component = fixture.componentInstance; + + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/alcs-frontend/src/app/features/admin/card-status/card-status.component.ts b/alcs-frontend/src/app/features/admin/card-status/card-status.component.ts new file mode 100644 index 0000000000..a0bc8ce223 --- /dev/null +++ b/alcs-frontend/src/app/features/admin/card-status/card-status.component.ts @@ -0,0 +1,73 @@ +import { Component, OnInit } from '@angular/core'; +import { MatDialog } from '@angular/material/dialog'; +import { Subject } from 'rxjs'; +import { CardStatusDto } from '../../../services/application/application-code.dto'; +import { CardStatusService } from '../../../services/card/card-status/card-status.service'; +import { ConfirmationDialogService } from '../../../shared/confirmation-dialog/confirmation-dialog.service'; +import { CardStatusDialogComponent } from './card-status-dialog/card-status-dialog.component'; + +@Component({ + selector: 'app-card-status', + templateUrl: './card-status.component.html', + styleUrls: ['./card-status.component.scss'], +}) +export class CardStatusComponent implements OnInit { + destroy = new Subject(); + + cardStatusDtos: CardStatusDto[] = []; + displayedColumns: string[] = ['label', 'description', 'code', 'actions']; + + constructor( + private cardStatusService: CardStatusService, + public dialog: MatDialog, + private confirmationDialogService: ConfirmationDialogService + ) {} + + ngOnInit(): void { + this.fetch(); + } + + async fetch() { + this.cardStatusDtos = await this.cardStatusService.fetch(); + } + + async onCreate() { + const dialog = this.dialog.open(CardStatusDialogComponent, { + minWidth: '600px', + maxWidth: '800px', + width: '70%', + }); + dialog.beforeClosed().subscribe(async (result) => { + if (result) { + await this.fetch(); + } + }); + } + + async onEdit(cardStatusDto: CardStatusDto) { + const dialog = this.dialog.open(CardStatusDialogComponent, { + minWidth: '600px', + maxWidth: '800px', + width: '70%', + data: cardStatusDto, + }); + dialog.beforeClosed().subscribe(async (result) => { + if (result) { + await this.fetch(); + } + }); + } + + async onDelete(cardStatusDto: CardStatusDto) { + this.confirmationDialogService + .openDialog({ + body: `Are you sure you want to delete ${cardStatusDto.label}?`, + }) + .subscribe(async (answer) => { + if (answer) { + await this.cardStatusService.delete(cardStatusDto.code); + await this.fetch(); + } + }); + } +} diff --git a/alcs-frontend/src/app/services/card/card-status/card-status.service.spec.ts b/alcs-frontend/src/app/services/card/card-status/card-status.service.spec.ts new file mode 100644 index 0000000000..5afb06f74d --- /dev/null +++ b/alcs-frontend/src/app/services/card/card-status/card-status.service.spec.ts @@ -0,0 +1,154 @@ +import { HttpClient } from '@angular/common/http'; +import { TestBed } from '@angular/core/testing'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { of, throwError } from 'rxjs'; +import { ToastService } from '../../toast/toast.service'; +import { CardStatusService } from './card-status.service'; + +describe('CardStatusService', () => { + let service: CardStatusService; + let mockHttpClient: DeepMocked; + let mockToastService: DeepMocked; + + beforeEach(() => { + mockHttpClient = createMock(); + mockToastService = createMock(); + + TestBed.configureTestingModule({ + providers: [ + { + provide: HttpClient, + useValue: mockHttpClient, + }, + { + provide: ToastService, + useValue: mockToastService, + }, + ], + }); + service = TestBed.inject(CardStatusService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); + + it('should call post on create', async () => { + mockHttpClient.post.mockReturnValue( + of({ + code: 'fake', + }) + ); + + const res = await service.create({ + code: '', + label: '', + description: '', + }); + + expect(mockHttpClient.post).toHaveBeenCalledTimes(1); + expect(res).toBeDefined(); + expect(res!.code).toEqual('fake'); + }); + + it('should show toast if create fails', async () => { + mockHttpClient.post.mockReturnValue( + throwError(() => { + new Error(''); + }) + ); + + const res = await service.create({ + code: '', + label: '', + description: '', + }); + + expect(mockHttpClient.post).toHaveBeenCalledTimes(1); + expect(res).toBeUndefined(); + expect(mockToastService.showErrorToast).toHaveBeenCalledTimes(1); + }); + + it('should call patch on update', async () => { + mockHttpClient.patch.mockReturnValue( + of({ + code: 'fake', + }) + ); + + const res = await service.update('fake', { + code: '', + label: '', + description: '', + }); + + expect(mockHttpClient.patch).toHaveBeenCalledTimes(1); + expect(res).toBeDefined(); + expect(res!.code).toEqual('fake'); + }); + + it('should show toast if update fails', async () => { + mockHttpClient.patch.mockReturnValue( + throwError(() => { + new Error(''); + }) + ); + + const res = await service.update('mock', { + code: '', + label: '', + description: '', + }); + + expect(mockHttpClient.patch).toHaveBeenCalledTimes(1); + expect(mockToastService.showErrorToast).toHaveBeenCalledTimes(1); + }); + + it('should call get on fetch', async () => { + mockHttpClient.get.mockReturnValue(of([])); + + await service.fetch(); + + expect(mockHttpClient.get).toHaveBeenCalledTimes(1); + }); + + it('should show toast if get fails', async () => { + mockHttpClient.get.mockReturnValue( + throwError(() => { + new Error(''); + }) + ); + + const res = await service.fetch(); + + expect(mockHttpClient.get).toHaveBeenCalledTimes(1); + expect(mockToastService.showErrorToast).toHaveBeenCalledTimes(1); + }); + + it('should call delete on delete', async () => { + mockHttpClient.delete.mockReturnValue( + of({ + code: 'fake', + }) + ); + + const res = await service.delete('fake'); + + expect(mockHttpClient.delete).toHaveBeenCalledTimes(1); + expect(res).toBeDefined(); + expect(res!.code).toEqual('fake'); + }); + + it('should show toast if delete fails', async () => { + mockHttpClient.delete.mockReturnValue( + throwError(() => { + new Error(''); + }) + ); + + const res = await service.delete('mock'); + + expect(mockHttpClient.delete).toHaveBeenCalledTimes(1); + expect(mockToastService.showErrorToast).toHaveBeenCalledTimes(1); + }); +}); diff --git a/alcs-frontend/src/app/services/card/card-status/card-status.service.ts b/alcs-frontend/src/app/services/card/card-status/card-status.service.ts new file mode 100644 index 0000000000..53dfa4cd05 --- /dev/null +++ b/alcs-frontend/src/app/services/card/card-status/card-status.service.ts @@ -0,0 +1,65 @@ +import { HttpClient } from '@angular/common/http'; +import { Injectable } from '@angular/core'; +import { firstValueFrom } from 'rxjs'; +import { environment } from '../../../../environments/environment'; +import { CardStatusDto } from '../../application/application-code.dto'; +import { ToastService } from '../../toast/toast.service'; + +@Injectable({ + providedIn: 'root', +}) +export class CardStatusService { + private url = `${environment.apiUrl}/card-status`; + + constructor(private http: HttpClient, private toastService: ToastService) {} + + async fetch() { + try { + return await firstValueFrom(this.http.get(`${this.url}`)); + } catch (err) { + console.error(err); + this.toastService.showErrorToast('Failed to fetch card statuses'); + } + return []; + } + + async create(createDto: CardStatusDto) { + try { + return await firstValueFrom(this.http.post(`${this.url}`, createDto)); + } catch (e) { + this.toastService.showErrorToast('Failed to create card status'); + console.log(e); + } + return; + } + + async update(code: string, updateDto: CardStatusDto) { + try { + return await firstValueFrom(this.http.patch(`${this.url}/${code}`, updateDto)); + } catch (e) { + this.toastService.showErrorToast('Failed to update ceo criterion'); + console.log(e); + } + return; + } + + async delete(code: string) { + try { + return await firstValueFrom(this.http.delete(`${this.url}/${code}`)); + } catch (e) { + this.toastService.showErrorToast('Failed to delete card status'); + console.log(e); + } + return; + } + + async canDelete(code: string) { + try { + return await firstValueFrom(this.http.get<{ canDelete: boolean; reason: string }>(`${this.url}/${code}`)); + } catch (e) { + this.toastService.showErrorToast('Failed to delete card status'); + console.log(e); + } + return; + } +} diff --git a/services/apps/alcs/src/alcs/admin/admin.module.ts b/services/apps/alcs/src/alcs/admin/admin.module.ts index 23e3cf81f2..9bce9fb8a6 100644 --- a/services/apps/alcs/src/alcs/admin/admin.module.ts +++ b/services/apps/alcs/src/alcs/admin/admin.module.ts @@ -3,6 +3,8 @@ import { TypeOrmModule } from '@nestjs/typeorm'; import { ApplicationDecisionConditionType } from '../application-decision/application-decision-condition/application-decision-condition-code.entity'; import { ApplicationDecisionMakerCode } from '../application-decision/application-decision-maker/application-decision-maker.entity'; import { ApplicationModule } from '../application/application.module'; +import { BoardModule } from '../board/board.module'; +import { CardModule } from '../card/card.module'; import { CovenantModule } from '../covenant/covenant.module'; import { ApplicationCeoCriterionCode } from '../application-decision/application-ceo-criterion/application-ceo-criterion.entity'; import { ApplicationDecisionModule } from '../application-decision/application-decision.module'; @@ -16,6 +18,7 @@ import { ApplicationDecisionConditionTypesController } from './application-decis import { ApplicationDecisionConditionTypesService } from './application-decision-condition-types/application-decision-condition-types.service'; import { ApplicationDecisionMakerController } from './application-decision-maker/application-decision-maker.controller'; import { ApplicationDecisionMakerService } from './application-decision-maker/application-decision-maker.service'; +import { CardStatusController } from './card-status/card-status.controller'; import { HolidayController } from './holiday/holiday.controller'; import { HolidayEntity } from './holiday/holiday.entity'; import { HolidayService } from './holiday/holiday.service'; @@ -40,6 +43,8 @@ import { UnarchiveCardService } from './unarchive-card/unarchive-card.service'; forwardRef(() => CovenantModule), NoticeOfIntentModule, NoticeOfIntentDecisionModule, + CardModule, + BoardModule, ], controllers: [ HolidayController, @@ -49,6 +54,7 @@ import { UnarchiveCardService } from './unarchive-card/unarchive-card.service'; NoiSubtypeController, ApplicationDecisionMakerController, ApplicationDecisionConditionTypesController, + CardStatusController, ], providers: [ HolidayService, diff --git a/services/apps/alcs/src/alcs/admin/card-status/card-status.controller.spec.ts b/services/apps/alcs/src/alcs/admin/card-status/card-status.controller.spec.ts new file mode 100644 index 0000000000..243b9ba436 --- /dev/null +++ b/services/apps/alcs/src/alcs/admin/card-status/card-status.controller.spec.ts @@ -0,0 +1,125 @@ +import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; +import { ConfigModule } from '@nestjs/config'; +import { Test, TestingModule } from '@nestjs/testing'; +import { ClsService } from 'nestjs-cls'; +import { mockKeyCloakProviders } from '../../../../test/mocks/mockTypes'; +import { BoardStatus } from '../../board/board-status.entity'; +import { Board } from '../../board/board.entity'; +import { BoardService } from '../../board/board.service'; +import { + CARD_STATUS, + CardStatus, +} from '../../card/card-status/card-status.entity'; +import { CardStatusService } from '../../card/card-status/card-status.service'; +import { CardStatusController } from './card-status.controller'; + +describe('CardStatusController', () => { + let controller: CardStatusController; + let mockCardStatusService: DeepMocked; + let mockBoardService: DeepMocked; + + beforeEach(async () => { + mockCardStatusService = createMock(); + mockBoardService = createMock(); + + const module: TestingModule = await Test.createTestingModule({ + controllers: [CardStatusController], + providers: [ + { + provide: CardStatusService, + useValue: mockCardStatusService, + }, + { + provide: BoardService, + useValue: mockBoardService, + }, + { + provide: ClsService, + useValue: {}, + }, + ...mockKeyCloakProviders, + ], + imports: [ConfigModule], + }).compile(); + + controller = module.get(CardStatusController); + }); + + it('should be defined', () => { + expect(controller).toBeDefined(); + }); + + it('should call out to service when fetching card statuses', async () => { + mockCardStatusService.fetch.mockResolvedValue([]); + + const cardStatuses = await controller.fetch(); + + expect(cardStatuses).toBeDefined(); + expect(mockCardStatusService.fetch).toHaveBeenCalledTimes(1); + }); + + it('should call out to service when updating card status', async () => { + mockCardStatusService.update.mockResolvedValue(new CardStatus()); + + const holiday = await controller.update('fake', new CardStatus()); + + expect(holiday).toBeDefined(); + expect(mockCardStatusService.update).toHaveBeenCalledTimes(1); + }); + + it('should call out to service when creating a card status', async () => { + mockCardStatusService.create.mockResolvedValue(new CardStatus()); + + const holiday = await controller.create(new CardStatus()); + + expect(holiday).toBeDefined(); + expect(mockCardStatusService.create).toHaveBeenCalledTimes(1); + }); + + it('should return false when trying to delete a critical column', async () => { + const res = await controller.canDelete(CARD_STATUS.READY_FOR_REVIEW); + + expect(res).toBeDefined(); + expect(res.canDelete).toBeFalsy(); + }); + + it('should return false when trying to delete a column with cards in it', async () => { + mockCardStatusService.getCardCountByStatus.mockResolvedValue(3); + + const res = await controller.canDelete('FAKE-CODE' as CARD_STATUS); + + expect(res).toBeDefined(); + expect(res.canDelete).toBeFalsy(); + expect(mockCardStatusService.getCardCountByStatus).toHaveBeenCalledTimes(1); + }); + + it('should return false when it is the last status on a board', async () => { + mockCardStatusService.getCardCountByStatus.mockResolvedValue(0); + mockBoardService.getBoardsWithStatus.mockResolvedValue([ + new Board({ + statuses: [new BoardStatus()], + }), + ]); + + const res = await controller.canDelete('FAKE-CODE' as CARD_STATUS); + + expect(res).toBeDefined(); + expect(res.canDelete).toBeFalsy(); + expect(mockBoardService.getBoardsWithStatus).toHaveBeenCalledTimes(1); + }); + + it('should return true for the happy path', async () => { + mockCardStatusService.getCardCountByStatus.mockResolvedValue(0); + mockBoardService.getBoardsWithStatus.mockResolvedValue([ + new Board({ + statuses: [new BoardStatus(), new BoardStatus()], + }), + ]); + + const res = await controller.canDelete('FAKE-CODE' as CARD_STATUS); + + expect(res).toBeDefined(); + expect(res.canDelete).toBeTruthy(); + expect(mockBoardService.getBoardsWithStatus).toHaveBeenCalledTimes(1); + }); +}); diff --git a/services/apps/alcs/src/alcs/admin/card-status/card-status.controller.ts b/services/apps/alcs/src/alcs/admin/card-status/card-status.controller.ts new file mode 100644 index 0000000000..65de8f7ec0 --- /dev/null +++ b/services/apps/alcs/src/alcs/admin/card-status/card-status.controller.ts @@ -0,0 +1,89 @@ +import { + Body, + Controller, + Get, + Param, + Patch, + Post, + UseGuards, +} from '@nestjs/common'; +import { ApiOAuth2 } from '@nestjs/swagger'; +import * as config from 'config'; +import { AUTH_ROLE } from '../../../common/authorization/roles'; +import { RolesGuard } from '../../../common/authorization/roles-guard.service'; +import { UserRoles } from '../../../common/authorization/roles.decorator'; +import { BoardService } from '../../board/board.service'; +import { CardStatusDto } from '../../card/card-status/card-status.dto'; +import { CARD_STATUS } from '../../card/card-status/card-status.entity'; +import { CardStatusService } from '../../card/card-status/card-status.service'; + +@Controller('card-status') +@ApiOAuth2(config.get('KEYCLOAK.SCOPES')) +@UseGuards(RolesGuard) +export class CardStatusController { + constructor( + private cardStatusService: CardStatusService, + private boardService: BoardService, + ) {} + + @Get() + @UserRoles(AUTH_ROLE.ADMIN) + async fetch() { + return await this.cardStatusService.fetch(); + } + + @Get('/:code') + @UserRoles(AUTH_ROLE.ADMIN) + async canDelete(@Param('code') code: CARD_STATUS) { + //If its Decision Released, Ready for Review, Cancelled + if ( + [ + CARD_STATUS.CANCELLED, + CARD_STATUS.DECISION_RELEASED, + CARD_STATUS.READY_FOR_REVIEW, + ].includes(code) + ) { + return { + canDelete: false, + reason: + 'Column is critical to application functionality and can never be deleted', + }; + } + + //If it has any cards + const cardCount = await this.cardStatusService.getCardCountByStatus(code); + if (cardCount > 0) { + return { + canDelete: false, + reason: 'Column has cards in it, please move cards in order to delete', + }; + } + + //Is boards only status + const boardsUsingStatus = await this.boardService.getBoardsWithStatus(code); + const boardsWithOnlyStatus = boardsUsingStatus.filter( + (board) => board.statuses.length === 1, + ); + if (boardsWithOnlyStatus.length > 0) { + return { + canDelete: false, + reason: `Column is only status on board ${boardsWithOnlyStatus[0].title} and cannot be deleted`, + }; + } + return { + canDelete: true, + }; + } + + @Patch('/:code') + @UserRoles(AUTH_ROLE.ADMIN) + async update(@Param('code') code: string, @Body() updateDto: CardStatusDto) { + return await this.cardStatusService.update(code, updateDto); + } + + @Post('') + @UserRoles(AUTH_ROLE.ADMIN) + async create(@Body() createDto: CardStatusDto) { + return await this.cardStatusService.create(createDto); + } +} diff --git a/services/apps/alcs/src/alcs/board/board.service.ts b/services/apps/alcs/src/alcs/board/board.service.ts index 34c8d40f40..2fb3fa6797 100644 --- a/services/apps/alcs/src/alcs/board/board.service.ts +++ b/services/apps/alcs/src/alcs/board/board.service.ts @@ -1,8 +1,9 @@ import { ServiceNotFoundException } from '@app/common/exceptions/base.exception'; import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; -import { FindOptionsWhere, Repository } from 'typeorm'; +import { Any, FindOptionsWhere, Repository } from 'typeorm'; import { FindOptionsRelations } from 'typeorm/find-options/FindOptionsRelations'; +import { CARD_STATUS } from '../card/card-status/card-status.entity'; import { CardService } from '../card/card.service'; import { Board } from './board.entity'; @@ -71,4 +72,19 @@ export class BoardService { card.board = board; return this.cardService.save(card); } + + async getBoardsWithStatus(code: CARD_STATUS) { + return this.boardRepository.find({ + where: { + statuses: { + status: { + code, + }, + }, + }, + relations: { + statuses: true, + }, + }); + } } diff --git a/services/apps/alcs/src/alcs/card/card-status/card-status.controller.spec.ts b/services/apps/alcs/src/alcs/card/card-status/card-status.controller.spec.ts deleted file mode 100644 index d13a1896bb..0000000000 --- a/services/apps/alcs/src/alcs/card/card-status/card-status.controller.spec.ts +++ /dev/null @@ -1,49 +0,0 @@ -import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; -import { Test, TestingModule } from '@nestjs/testing'; -import { ClsService } from 'nestjs-cls'; -import { initCardStatusMockEntity } from '../../../../test/mocks/mockEntities'; -import { mockKeyCloakProviders } from '../../../../test/mocks/mockTypes'; -import { CardStatusController } from './card-status.controller'; -import { CardStatusDto } from './card-status.dto'; -import { CardStatusService } from './card-status.service'; - -describe('CardStatusController', () => { - let controller: CardStatusController; - let mockCardStatusService: DeepMocked; - const mockCardStatusEntity = initCardStatusMockEntity(); - const cardStatusDto: CardStatusDto = { - code: mockCardStatusEntity.code, - description: mockCardStatusEntity.description, - label: mockCardStatusEntity.label, - }; - - beforeEach(async () => { - mockCardStatusService = createMock(); - - const module: TestingModule = await Test.createTestingModule({ - controllers: [CardStatusController], - providers: [ - { - provide: CardStatusService, - useValue: mockCardStatusService, - }, - { - provide: ClsService, - useValue: {}, - }, - ...mockKeyCloakProviders, - ], - }).compile(); - - controller = module.get(CardStatusController); - }); - - it('should be defined', () => { - expect(controller).toBeDefined(); - }); - - it('should add', async () => { - mockCardStatusService.create.mockResolvedValue(mockCardStatusEntity); - expect(await controller.add(cardStatusDto)).toStrictEqual(cardStatusDto); - }); -}); diff --git a/services/apps/alcs/src/alcs/card/card-status/card-status.controller.ts b/services/apps/alcs/src/alcs/card/card-status/card-status.controller.ts deleted file mode 100644 index d1898c2d82..0000000000 --- a/services/apps/alcs/src/alcs/card/card-status/card-status.controller.ts +++ /dev/null @@ -1,26 +0,0 @@ -import { Body, Controller, Post, UseGuards } from '@nestjs/common'; -import { ApiOAuth2 } from '@nestjs/swagger'; -import * as config from 'config'; -import { AUTH_ROLE } from '../../../common/authorization/roles'; -import { RolesGuard } from '../../../common/authorization/roles-guard.service'; -import { UserRoles } from '../../../common/authorization/roles.decorator'; -import { CardStatusDto } from './card-status.dto'; -import { CardStatusService } from './card-status.service'; - -@ApiOAuth2(config.get('KEYCLOAK.SCOPES')) -@Controller('card-status') -@UseGuards(RolesGuard) -export class CardStatusController { - constructor(private cardStatusService: CardStatusService) {} - - @Post() - @UserRoles(AUTH_ROLE.ADMIN) - async add(@Body() card: CardStatusDto): Promise { - const newCard = await this.cardStatusService.create(card); - return { - code: newCard.code, - description: newCard.description, - label: newCard.label, - }; - } -} diff --git a/services/apps/alcs/src/alcs/card/card-status/card-status.entity.ts b/services/apps/alcs/src/alcs/card/card-status/card-status.entity.ts index 1d5e5be4f3..8679487ea7 100644 --- a/services/apps/alcs/src/alcs/card/card-status/card-status.entity.ts +++ b/services/apps/alcs/src/alcs/card/card-status/card-status.entity.ts @@ -4,6 +4,7 @@ import { BaseCodeEntity } from '../../../common/entities/base.code.entity'; export enum CARD_STATUS { CANCELLED = 'CNCL', DECISION_RELEASED = 'RELE', + READY_FOR_REVIEW = 'READ', } @Entity() diff --git a/services/apps/alcs/src/alcs/card/card-status/card-status.service.spec.ts b/services/apps/alcs/src/alcs/card/card-status/card-status.service.spec.ts index 25e8f57258..e91f407819 100644 --- a/services/apps/alcs/src/alcs/card/card-status/card-status.service.spec.ts +++ b/services/apps/alcs/src/alcs/card/card-status/card-status.service.spec.ts @@ -1,51 +1,88 @@ +import { classes } from '@automapper/classes'; +import { AutomapperModule } from '@automapper/nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { initCardStatusMockEntity } from '../../../../test/mocks/mockEntities'; -import { CardStatusDto } from './card-status.dto'; +import { ApplicationDecisionMakerCode } from '../../application-decision/application-decision-maker/application-decision-maker.entity'; +import { CardService } from '../card.service'; import { CardStatus } from './card-status.entity'; import { CardStatusService } from './card-status.service'; describe('CardStatusService', () => { - let cardStatusService: CardStatusService; - let cardStatusRepositoryMock: DeepMocked>; + let service: CardStatusService; + let mockRepository: DeepMocked>; + let mockCardService: DeepMocked; - const cardStatusDto: CardStatusDto = { - code: 'app_1', - description: 'app desc 1', - label: 'app_label', - }; - const cardStatusMockEntity = initCardStatusMockEntity(); + const cardStatus = new CardStatus(); beforeEach(async () => { - cardStatusRepositoryMock = createMock>(); + mockRepository = createMock(); + mockCardService = createMock(); const module: TestingModule = await Test.createTestingModule({ + imports: [ + AutomapperModule.forRoot({ + strategyInitializer: classes(), + }), + ], providers: [ CardStatusService, { provide: getRepositoryToken(CardStatus), - useValue: cardStatusRepositoryMock, + useValue: mockRepository, + }, + { + provide: CardService, + useValue: mockCardService, }, ], }).compile(); - cardStatusRepositoryMock = module.get(getRepositoryToken(CardStatus)); - cardStatusService = module.get(CardStatusService); - - cardStatusRepositoryMock.findOne.mockResolvedValue(cardStatusMockEntity); - cardStatusRepositoryMock.save.mockResolvedValue(cardStatusMockEntity); - cardStatusRepositoryMock.find.mockResolvedValue([cardStatusMockEntity]); + service = module.get(CardStatusService); }); it('should be defined', () => { - expect(cardStatusService).toBeDefined(); + expect(service).toBeDefined(); + }); + + it('should successfully create card status', async () => { + mockRepository.save.mockResolvedValue(new ApplicationDecisionMakerCode()); + + const result = await service.create({ + code: '', + description: '', + label: '', + }); + + expect(mockRepository.save).toBeCalledTimes(1); + expect(result).toBeDefined(); }); - it('should create card_status', async () => { - expect(await cardStatusService.create(cardStatusDto)).toStrictEqual( - cardStatusMockEntity, - ); + it('should successfully update card status if it exists', async () => { + mockRepository.save.mockResolvedValue(cardStatus); + mockRepository.findOneOrFail.mockResolvedValue(cardStatus); + + const result = await service.update(cardStatus.code, { + code: '', + description: '', + label: '', + }); + + expect(mockRepository.save).toBeCalledTimes(1); + expect(mockRepository.findOneOrFail).toBeCalledTimes(1); + expect(mockRepository.findOneOrFail).toBeCalledWith({ + where: { uuid: cardStatus.code }, + }); + expect(result).toBeDefined(); + }); + + it('should successfully fetch card status', async () => { + mockRepository.find.mockResolvedValue([cardStatus]); + + const result = await service.fetch(); + + expect(mockRepository.find).toBeCalledTimes(1); + expect(result).toBeDefined(); }); }); diff --git a/services/apps/alcs/src/alcs/card/card-status/card-status.service.ts b/services/apps/alcs/src/alcs/card/card-status/card-status.service.ts index 43dcf7468d..85659cd05c 100644 --- a/services/apps/alcs/src/alcs/card/card-status/card-status.service.ts +++ b/services/apps/alcs/src/alcs/card/card-status/card-status.service.ts @@ -1,26 +1,56 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; +import { CardService } from '../card.service'; import { CardStatusDto } from './card-status.dto'; -import { CardStatus } from './card-status.entity'; - -export const defaultApplicationStatus = { - id: '46235264-9529-4e52-9c2d-6ed2b8b9edb8', - code: 'TODO', -}; +import { CARD_STATUS, CardStatus } from './card-status.entity'; @Injectable() export class CardStatusService { constructor( @InjectRepository(CardStatus) private cardStatusRepository: Repository, + private cardService: CardService, ) {} - async create(card: CardStatusDto): Promise { - const cardEntity = new CardStatus(); - cardEntity.code = card.code; - cardEntity.description = card.description; + async fetch() { + return await this.cardStatusRepository.find({ + order: { label: 'ASC' }, + select: { + code: true, + label: true, + description: true, + }, + }); + } + + async getOneOrFail(code: string) { + return await this.cardStatusRepository.findOneOrFail({ + where: { code }, + }); + } + + async update(code: string, updateDto: CardStatusDto) { + const cardStatus = await this.getOneOrFail(code); + + cardStatus.description = updateDto.description; + cardStatus.label = updateDto.label; + + return await this.cardStatusRepository.save(cardStatus); + } + + async create(createDto: CardStatusDto) { + const cardStatus = new CardStatus(); + + cardStatus.code = createDto.code; + cardStatus.description = createDto.description; + cardStatus.label = createDto.label; + + return await this.cardStatusRepository.save(cardStatus); + } - return await this.cardStatusRepository.save(cardEntity); + async getCardCountByStatus(code: CARD_STATUS) { + const cards = await this.cardService.getByCardStatus(code); + return cards.length; } } diff --git a/services/apps/alcs/src/alcs/card/card.module.ts b/services/apps/alcs/src/alcs/card/card.module.ts index 0ef0061253..4cb2525d26 100644 --- a/services/apps/alcs/src/alcs/card/card.module.ts +++ b/services/apps/alcs/src/alcs/card/card.module.ts @@ -5,7 +5,6 @@ import { CardProfile } from '../../common/automapper/card.automapper.profile'; import { NotificationModule } from '../notification/notification.module'; import { CardHistory } from './card-history/card-history.entity'; import { CardSubscriber } from './card-history/card.subscriber'; -import { CardStatusController } from './card-status/card-status.controller'; import { CardStatus } from './card-status/card-status.entity'; import { CardStatusService } from './card-status/card-status.service'; import { CardSubtaskType } from './card-subtask/card-subtask-type/card-subtask-type.entity'; @@ -30,7 +29,7 @@ import { CardService } from './card.service'; CodeModule, NotificationModule, ], - controllers: [CardStatusController, CardSubtaskController, CardController], + controllers: [CardSubtaskController, CardController], providers: [ CardStatusService, CardService, diff --git a/services/apps/alcs/src/alcs/card/card.service.ts b/services/apps/alcs/src/alcs/card/card.service.ts index a72d682a7d..1cc3ff4ec7 100644 --- a/services/apps/alcs/src/alcs/card/card.service.ts +++ b/services/apps/alcs/src/alcs/card/card.service.ts @@ -200,4 +200,11 @@ export class CardService { await this.cardRepository.save(card); await this.cardRepository.recover(card); } + + async getByCardStatus(code: string) { + return this.cardRepository.find({ + where: { statusCode: code }, + relations: this.DEFAULT_RELATIONS, + }); + } } From c9691ba74ea78f3ff547fac982813585d85e51a4 Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Mon, 10 Jul 2023 15:46:15 -0700 Subject: [PATCH 058/954] Bugfix/alcs 502 (#764) updated colours for condition labels new logic for incomplete fix condition to component link on reset --- .../decision/conditions/condition/condition.component.html | 3 ++- .../decision/conditions/condition/condition.component.scss | 3 +++ .../decision/conditions/condition/condition.component.ts | 6 ++---- .../decision/conditions/conditions.component.scss | 1 + .../application-type-pill.constants.ts | 2 +- .../application-decision/application-decision-v2.service.ts | 2 +- 6 files changed, 10 insertions(+), 7 deletions(-) diff --git a/alcs-frontend/src/app/features/application/decision/conditions/condition/condition.component.html b/alcs-frontend/src/app/features/application/decision/conditions/condition/condition.component.html index c1fac6d8bd..c211c1c758 100644 --- a/alcs-frontend/src/app/features/application/decision/conditions/condition/condition.component.html +++ b/alcs-frontend/src/app/features/application/decision/conditions/condition/condition.component.html @@ -13,7 +13,8 @@

{{ condition.type.label }}

Component to Condition
- {{ condition.componentLabels }} + {{ condition.componentLabels }} +
diff --git a/alcs-frontend/src/app/features/application/decision/conditions/condition/condition.component.scss b/alcs-frontend/src/app/features/application/decision/conditions/condition/condition.component.scss index e69de29bb2..b1976e0872 100644 --- a/alcs-frontend/src/app/features/application/decision/conditions/condition/condition.component.scss +++ b/alcs-frontend/src/app/features/application/decision/conditions/condition/condition.component.scss @@ -0,0 +1,3 @@ +.component-labels { + white-space: pre-wrap; +} diff --git a/alcs-frontend/src/app/features/application/decision/conditions/condition/condition.component.ts b/alcs-frontend/src/app/features/application/decision/conditions/condition/condition.component.ts index d090247a4e..c9e640878f 100644 --- a/alcs-frontend/src/app/features/application/decision/conditions/condition/condition.component.ts +++ b/alcs-frontend/src/app/features/application/decision/conditions/condition/condition.component.ts @@ -39,7 +39,7 @@ export class ConditionComponent implements OnInit, AfterViewInit { if (this.condition) { this.condition = { ...this.condition, - componentLabels: this.condition.conditionComponentsLabels?.join(', '), + componentLabels: this.condition.conditionComponentsLabels?.join(';\n'), }; } } @@ -87,10 +87,8 @@ export class ConditionComponent implements OnInit, AfterViewInit { this.conditionStatus = CONDITION_STATUS.SUPERSEDED; } else if (this.condition.completionDate && this.condition.completionDate <= today) { this.conditionStatus = CONDITION_STATUS.COMPLETE; - } else if (this.isDraftDecision === false) { - this.conditionStatus = CONDITION_STATUS.INCOMPLETE; } else { - this.conditionStatus = ''; + this.conditionStatus = CONDITION_STATUS.INCOMPLETE; } } } diff --git a/alcs-frontend/src/app/features/application/decision/conditions/conditions.component.scss b/alcs-frontend/src/app/features/application/decision/conditions/conditions.component.scss index cf53302c55..c1e422c958 100644 --- a/alcs-frontend/src/app/features/application/decision/conditions/conditions.component.scss +++ b/alcs-frontend/src/app/features/application/decision/conditions/conditions.component.scss @@ -80,6 +80,7 @@ p { display: grid; grid-template-columns: 33% 33% 33%; grid-row-gap: 24px; + grid-column-gap: 16px; .full-width { grid-column: 1/4; diff --git a/alcs-frontend/src/app/shared/application-type-pill/application-type-pill.constants.ts b/alcs-frontend/src/app/shared/application-type-pill/application-type-pill.constants.ts index 998afea8b4..9543a8ccfd 100644 --- a/alcs-frontend/src/app/shared/application-type-pill/application-type-pill.constants.ts +++ b/alcs-frontend/src/app/shared/application-type-pill/application-type-pill.constants.ts @@ -78,7 +78,7 @@ export const DECISION_CONDITION_COMPLETE_LABEL = { label: 'Complete', shortLabel: 'COMD', backgroundColor: '#fff', - borderColor: '#c08106', + borderColor: '#065a2f', textColor: '#000', }; diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service.ts index af671e4126..6fad7ff617 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service.ts @@ -412,7 +412,7 @@ export class ApplicationDecisionV2Service { existingDecision.components ?? [], false, ); - } else if (existingDecision.conditions) { + } else if (updateDto.conditions === null && existingDecision.conditions) { await this.decisionConditionService.remove(existingDecision.conditions); } } From 20ac9602afde26917ea70b8390d0913b3933aeb0 Mon Sep 17 00:00:00 2001 From: "to. sandra" <76515860+sandratoh@users.noreply.github.com> Date: Mon, 10 Jul 2023 15:59:27 -0700 Subject: [PATCH 059/954] ALCS View of under/pending LFNG Review and returned applications (#762) * Retrieve app status and render lfng menu * Show lfng banner or comment by status * Rename variables to improve code readability * Update and pass frontend tests * Rename again to clarify intent --- .../application-details.component.spec.ts | 3 +- .../application/application.component.html | 17 +++++- .../application/application.component.spec.ts | 7 +++ .../application/application.component.ts | 61 +++++++++++++++++-- .../lfng-info/lfng-info.component.html | 10 ++- .../lfng-info/lfng-info.component.scss | 22 +++++++ .../lfng-info/lfng-info.component.spec.ts | 7 +++ .../lfng-info/lfng-info.component.ts | 14 ++++- .../application-submission.service.spec.ts | 3 +- .../services/application/application.dto.ts | 19 +++++- 10 files changed, 152 insertions(+), 11 deletions(-) diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.spec.ts b/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.spec.ts index c1821e6903..1b59d4f078 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.spec.ts +++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.spec.ts @@ -2,7 +2,7 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { ApplicationDocumentService } from '../../../../services/application/application-document/application-document.service'; -import { SubmittedApplicationOwnerDto } from '../../../../services/application/application.dto'; +import { ApplicationStatus, SubmittedApplicationOwnerDto } from '../../../../services/application/application.dto'; import { ApplicationDetailsComponent } from './application-details.component'; @@ -45,6 +45,7 @@ describe('ApplicationDetailsComponent', () => { soilToPlaceVolume: null, soilToRemoveAverageDepth: null, soilToRemoveMaximumDepth: null, + status: {} as ApplicationStatus, type: '', updatedAt: '', uuid: '', diff --git a/alcs-frontend/src/app/features/application/application.component.html b/alcs-frontend/src/app/features/application/application.component.html index 73db1279f1..3be9c441d8 100644 --- a/alcs-frontend/src/app/features/application/application.component.html +++ b/alcs-frontend/src/app/features/application/application.component.html @@ -8,7 +8,7 @@ heading="Application" >
-
+
-
+
+
+
+ {{ route.icon }} + {{ route.menuTitle }} +
+
+
+
{ let mockReconsiderationService: DeepMocked; let mockModificationService: DeepMocked; let mockReviewService: DeepMocked; + let mockAppSubmissionService: DeepMocked; beforeEach(async () => { mockAppDetailService = createMock(); @@ -33,6 +35,7 @@ describe('ApplicationComponent', () => { mockModificationService.$modifications = new BehaviorSubject([]); mockReviewService = createMock(); + mockAppSubmissionService = createMock(); await TestBed.configureTestingModule({ providers: [ @@ -56,6 +59,10 @@ describe('ApplicationComponent', () => { provide: ApplicationReviewService, useValue: mockReviewService, }, + { + provide: ApplicationSubmissionService, + useValue: mockAppSubmissionService, + }, { provide: ActivatedRoute, useValue: { diff --git a/alcs-frontend/src/app/features/application/application.component.ts b/alcs-frontend/src/app/features/application/application.component.ts index 45658a857e..69c6799da1 100644 --- a/alcs-frontend/src/app/features/application/application.component.ts +++ b/alcs-frontend/src/app/features/application/application.component.ts @@ -8,7 +8,13 @@ import { ApplicationModificationDto } from '../../services/application/applicati import { ApplicationModificationService } from '../../services/application/application-modification/application-modification.service'; import { ApplicationReconsiderationDto } from '../../services/application/application-reconsideration/application-reconsideration.dto'; import { ApplicationReconsiderationService } from '../../services/application/application-reconsideration/application-reconsideration.service'; -import { APPLICATION_SYSTEM_SOURCE_TYPES, ApplicationDto } from '../../services/application/application.dto'; +import { ApplicationSubmissionService } from '../../services/application/application-submission/application-submission.service'; +import { + APPLICATION_STATUS, + APPLICATION_SYSTEM_SOURCE_TYPES, + ApplicationDto, + ApplicationSubmissionDto, +} from '../../services/application/application.dto'; import { ApplicantInfoComponent } from './applicant-info/applicant-info.component'; import { ApplicationMeetingComponent } from './application-meeting/application-meeting.component'; import { decisionChildRoutes, DecisionModule } from './decision/decision.module'; @@ -38,6 +44,37 @@ export const unsubmittedRoutes = [ }, ]; +export const submittedLfngRoutes = [ + { + path: '', + menuTitle: 'Overview', + icon: 'summarize', + component: OverviewComponent, + portalOnly: true, + }, + { + path: 'applicant-info', + menuTitle: 'Applicant Info', + icon: 'persons', + component: ApplicantInfoComponent, + portalOnly: true, + }, + { + path: 'lfng-info', + menuTitle: 'L/FNG Info', + icon: 'account_balance', + component: LfngInfoComponent, + portalOnly: true, + }, + { + path: 'documents', + menuTitle: 'Documents', + icon: 'description', + component: DocumentsComponent, + portalOnly: false, + }, +]; + export const appChildRoutes = [ { path: '', @@ -128,17 +165,21 @@ export class ApplicationComponent implements OnInit, OnDestroy { destroy = new Subject(); childRoutes = appChildRoutes; unsubmittedRoutes = unsubmittedRoutes; + submittedLfngRoutes = submittedLfngRoutes; fileNumber?: string; application: ApplicationDto | undefined; reconsiderations: ApplicationReconsiderationDto[] = []; modifications: ApplicationModificationDto[] = []; + submission?: ApplicationSubmissionDto; isApplicantSubmission = false; - isSubmitted = false; + isSubmittedToAlc = false; + wasSubmittedToLfng = false; constructor( private applicationDetailService: ApplicationDetailService, + private applicationSubmissionService: ApplicationSubmissionService, private reconsiderationService: ApplicationReconsiderationService, private modificationService: ApplicationModificationService, private route: ActivatedRoute, @@ -152,14 +193,26 @@ export class ApplicationComponent implements OnInit, OnDestroy { this.loadApplication(); }); - this.applicationDetailService.$application.pipe(takeUntil(this.destroy)).subscribe((application) => { + this.applicationDetailService.$application.pipe(takeUntil(this.destroy)).subscribe(async (application) => { if (application) { this.titleService.setTitle(`${environment.siteName} | ${application.fileNumber} (${application.applicant})`); this.application = application; this.reconsiderationService.fetchByApplication(application.fileNumber); this.modificationService.fetchByApplication(application.fileNumber); this.isApplicantSubmission = application.source === APPLICATION_SYSTEM_SOURCE_TYPES.APPLICANT; - this.isSubmitted = this.isApplicantSubmission ? !!application.dateSubmittedToAlc : true; + + this.submission = await this.applicationSubmissionService.fetchSubmission(application.fileNumber); + + this.isSubmittedToAlc = this.isApplicantSubmission ? !!application.dateSubmittedToAlc : true; + + this.wasSubmittedToLfng = + this.isApplicantSubmission && + [ + APPLICATION_STATUS.SUBMITTED_TO_LG, + APPLICATION_STATUS.IN_REVIEW, + APPLICATION_STATUS.WRONG_GOV, + APPLICATION_STATUS.INCOMPLETE, + ].includes(this.submission?.status?.code); } }); diff --git a/alcs-frontend/src/app/features/application/lfng-info/lfng-info.component.html b/alcs-frontend/src/app/features/application/lfng-info/lfng-info.component.html index e5a90d19d4..a78a46d295 100644 --- a/alcs-frontend/src/app/features/application/lfng-info/lfng-info.component.html +++ b/alcs-frontend/src/app/features/application/lfng-info/lfng-info.component.html @@ -1,7 +1,15 @@

L/FNG Info

- Application not subjected to Local/First Nation Government Review. + infoApplication not subjected to Local/First Nation Government Review. +
+
+ infoPending Local/First Nation Government review. +
+
+
Comment for Applicant
+ {{ submission?.returnedComment }} + No comment added

Government File & Contact

diff --git a/alcs-frontend/src/app/features/application/lfng-info/lfng-info.component.scss b/alcs-frontend/src/app/features/application/lfng-info/lfng-info.component.scss index 01ceb3bdb5..3e371bf572 100644 --- a/alcs-frontend/src/app/features/application/lfng-info/lfng-info.component.scss +++ b/alcs-frontend/src/app/features/application/lfng-info/lfng-info.component.scss @@ -10,7 +10,29 @@ h4 { .warning { background-color: colors.$secondary-color-light; + border-radius: 4px; padding: 16px; + display: flex; + align-items: center; + + mat-icon { + margin-right: 12px; + } +} + +.comment-container { + @extend .warning; + flex-direction: column; + align-items: flex-start; + + div { + margin-bottom: 4px; + } +} + +.no-comment { + color: colors.$grey-dark; + font-style: italic; } .review-table { diff --git a/alcs-frontend/src/app/features/application/lfng-info/lfng-info.component.spec.ts b/alcs-frontend/src/app/features/application/lfng-info/lfng-info.component.spec.ts index 0f58cc2cff..5a8d1ea043 100644 --- a/alcs-frontend/src/app/features/application/lfng-info/lfng-info.component.spec.ts +++ b/alcs-frontend/src/app/features/application/lfng-info/lfng-info.component.spec.ts @@ -4,6 +4,7 @@ import { BehaviorSubject } from 'rxjs'; import { ApplicationDetailService } from '../../../services/application/application-detail.service'; import { ApplicationDocumentService } from '../../../services/application/application-document/application-document.service'; import { ApplicationReviewService } from '../../../services/application/application-review/application-review.service'; +import { ApplicationSubmissionService } from '../../../services/application/application-submission/application-submission.service'; import { ApplicationDto } from '../../../services/application/application.dto'; import { LfngInfoComponent } from './lfng-info.component'; @@ -14,11 +15,13 @@ describe('LfngInfoComponent', () => { let mockApplicationDetailService: DeepMocked; let mockAppDocumentService: DeepMocked; let mockApplicationReviewService: DeepMocked; + let mockAppSubmissionService: DeepMocked; beforeEach(async () => { mockApplicationDetailService = createMock(); mockAppDocumentService = createMock(); mockApplicationReviewService = createMock(); + mockAppSubmissionService = createMock(); mockApplicationDetailService.$application = new BehaviorSubject(undefined); await TestBed.configureTestingModule({ @@ -32,6 +35,10 @@ describe('LfngInfoComponent', () => { provide: ApplicationDocumentService, useValue: mockAppDocumentService, }, + { + provide: ApplicationSubmissionService, + useValue: mockAppSubmissionService, + }, { provide: ApplicationReviewService, useValue: mockApplicationReviewService, diff --git a/alcs-frontend/src/app/features/application/lfng-info/lfng-info.component.ts b/alcs-frontend/src/app/features/application/lfng-info/lfng-info.component.ts index 6bc191756f..e13cda9b4d 100644 --- a/alcs-frontend/src/app/features/application/lfng-info/lfng-info.component.ts +++ b/alcs-frontend/src/app/features/application/lfng-info/lfng-info.component.ts @@ -6,7 +6,12 @@ import { DOCUMENT_TYPE, } from '../../../services/application/application-document/application-document.service'; import { ApplicationReviewService } from '../../../services/application/application-review/application-review.service'; -import { ApplicationReviewDto } from '../../../services/application/application.dto'; +import { + APPLICATION_STATUS, + ApplicationReviewDto, + ApplicationSubmissionDto, +} from '../../../services/application/application.dto'; +import { ApplicationSubmissionService } from '../../../services/application/application-submission/application-submission.service'; @Component({ selector: 'app-lfng-info', @@ -18,10 +23,13 @@ export class LfngInfoComponent implements OnInit { resolutionDocument: ApplicationDocumentDto | undefined; staffReport: ApplicationDocumentDto | undefined; otherAttachments: ApplicationDocumentDto[] = []; + submission?: ApplicationSubmissionDto; requiresReview = true; + showComment = false; constructor( private applicationDetailService: ApplicationDetailService, + private applicationSubmissionService: ApplicationSubmissionService, private applicationDocumentService: ApplicationDocumentService, private applicationReviewService: ApplicationReviewService ) {} @@ -31,6 +39,10 @@ export class LfngInfoComponent implements OnInit { if (application) { this.requiresReview = application.type.code !== 'TURP'; this.applicationReview = await this.applicationReviewService.fetchReview(application.fileNumber); + this.submission = await this.applicationSubmissionService.fetchSubmission(application.fileNumber); + this.showComment = [APPLICATION_STATUS.WRONG_GOV, APPLICATION_STATUS.INCOMPLETE].includes( + this.submission?.status?.code + ); this.loadDocuments(application.fileNumber); } }); diff --git a/alcs-frontend/src/app/services/application/application-submission/application-submission.service.spec.ts b/alcs-frontend/src/app/services/application/application-submission/application-submission.service.spec.ts index e43c60d891..9ab51f9b97 100644 --- a/alcs-frontend/src/app/services/application/application-submission/application-submission.service.spec.ts +++ b/alcs-frontend/src/app/services/application/application-submission/application-submission.service.spec.ts @@ -3,7 +3,7 @@ import { TestBed } from '@angular/core/testing'; import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { of } from 'rxjs'; import { ToastService } from '../../toast/toast.service'; -import { ApplicationSubmissionDto, SubmittedApplicationOwnerDto } from '../application.dto'; +import { ApplicationStatus, ApplicationSubmissionDto, SubmittedApplicationOwnerDto } from '../application.dto'; import { ApplicationSubmissionService } from './application-submission.service'; @@ -30,6 +30,7 @@ describe('ApplicationSubmissionService', () => { soilToPlaceVolume: null, soilToRemoveAverageDepth: null, soilToRemoveMaximumDepth: null, + status: {} as ApplicationStatus, type: '', updatedAt: '', uuid: '', diff --git a/alcs-frontend/src/app/services/application/application.dto.ts b/alcs-frontend/src/app/services/application/application.dto.ts index e98b27f16d..06e61be068 100644 --- a/alcs-frontend/src/app/services/application/application.dto.ts +++ b/alcs-frontend/src/app/services/application/application.dto.ts @@ -14,6 +14,19 @@ export enum PARCEL_OWNERSHIP_TYPE { CROWN = 'CRWN', } +export enum APPLICATION_STATUS { + IN_PROGRESS = 'PROG', + SUBMITTED_TO_ALC = 'SUBM', + SUBMITTED_TO_LG = 'SUBG', + IN_REVIEW = 'REVW', + REFUSED_TO_FORWARD = 'REFU', + INCOMPLETE = 'INCM', + WRONG_GOV = 'WRNG', + CANCELLED = 'CANC', + ALC_DECISION = 'ALCD', + CEO_DECISION = 'CEOD', +} + export interface StatusHistory { type: 'status_change'; label: string; @@ -21,6 +34,10 @@ export interface StatusHistory { time: number; } +export interface ApplicationStatus extends BaseCodeDto { + code: APPLICATION_STATUS; +} + export interface CreateApplicationDto { fileNumber: string; applicant: string; @@ -95,7 +112,7 @@ export interface ApplicationSubmissionDto { lastStatusUpdate: number; applicant: string; type: string; - + status: ApplicationStatus; typeCode: string; localGovernmentUuid: string; canEdit: boolean; From b9003254151fadd98938f39dbee1b264a872ffd7 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Tue, 11 Jul 2023 09:20:09 -0700 Subject: [PATCH 060/954] Load Create Card Types from Backend * Move which boards allow creating which cards to the DB so it can be configured by Admin later --- .../src/app/features/board/board.component.ts | 14 +++--- .../src/app/services/board/board.dto.ts | 4 +- .../src/app/services/card/card.dto.ts | 7 +-- .../apps/alcs/src/alcs/board/board.dto.ts | 1 + .../apps/alcs/src/alcs/board/board.entity.ts | 8 ++-- .../apps/alcs/src/alcs/board/board.service.ts | 1 + .../automapper/board.automapper.profile.ts | 4 ++ ...31991682-add_create_card_types_to_board.ts | 43 +++++++++++++++++++ .../1689032043442-seed_create_card_types.ts | 38 ++++++++++++++++ ...89033590520-remove_board_decision_maker.ts | 19 ++++++++ 10 files changed, 124 insertions(+), 15 deletions(-) create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1689031991682-add_create_card_types_to_board.ts create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1689032043442-seed_create_card_types.ts create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1689033590520-remove_board_decision_maker.ts diff --git a/alcs-frontend/src/app/features/board/board.component.ts b/alcs-frontend/src/app/features/board/board.component.ts index ce9259e5f2..b7f6491ea9 100644 --- a/alcs-frontend/src/app/features/board/board.component.ts +++ b/alcs-frontend/src/app/features/board/board.component.ts @@ -216,13 +216,13 @@ export class BoardComponent implements OnInit, OnDestroy { this.loadCards(board.code); this.boardTitle = board.title; this.boardIsFavourite = board.isFavourite; - this.boardHasCreateApplication = board.code === BOARD_TYPE_CODES.VETT; - this.boardHasCreatePlanningReview = board.code === BOARD_TYPE_CODES.EXEC; - this.boardHasCreateReconsideration = ![BOARD_TYPE_CODES.VETT, BOARD_TYPE_CODES.NOI].includes(board.code); - this.boardHasCreateAppModification = board.code === BOARD_TYPE_CODES.CEO; - this.boardHasCreateCovenant = ![BOARD_TYPE_CODES.VETT, BOARD_TYPE_CODES.NOI].includes(board.code); - this.boardHasCreateNOI = board.code === BOARD_TYPE_CODES.VETT; - this.boardHasCreateNOIModification = board.code === BOARD_TYPE_CODES.NOI; + this.boardHasCreateApplication = board.createCardTypes.includes(CardType.APP); + this.boardHasCreatePlanningReview = board.createCardTypes.includes(CardType.PLAN); + this.boardHasCreateReconsideration = board.createCardTypes.includes(CardType.RECON); + this.boardHasCreateAppModification = board.createCardTypes.includes(CardType.MODI); + this.boardHasCreateCovenant = board.createCardTypes.includes(CardType.COV); + this.boardHasCreateNOI = board.createCardTypes.includes(CardType.NOI); + this.boardHasCreateNOIModification = board.createCardTypes.includes(CardType.NOI_MODI); const allStatuses = board.statuses.map((status) => status.statusCode); diff --git a/alcs-frontend/src/app/services/board/board.dto.ts b/alcs-frontend/src/app/services/board/board.dto.ts index b2bb9fbd39..0a09ae7b61 100644 --- a/alcs-frontend/src/app/services/board/board.dto.ts +++ b/alcs-frontend/src/app/services/board/board.dto.ts @@ -1,3 +1,4 @@ +import { CardType } from '../../shared/card/card.component'; import { ApplicationModificationDto } from '../application/application-modification/application-modification.dto'; import { ApplicationReconsiderationDto } from '../application/application-reconsideration/application-reconsideration.dto'; import { ApplicationDto } from '../application/application.dto'; @@ -11,7 +12,8 @@ export interface BoardDto { title: string; decisionMaker: string; statuses: BoardStatusDto[]; - allowedCardTypes: string[]; + allowedCardTypes: CardType[]; + createCardTypes: CardType[]; } export interface BoardStatusDto { diff --git a/alcs-frontend/src/app/services/card/card.dto.ts b/alcs-frontend/src/app/services/card/card.dto.ts index aa131c038d..5422242a60 100644 --- a/alcs-frontend/src/app/services/card/card.dto.ts +++ b/alcs-frontend/src/app/services/card/card.dto.ts @@ -1,3 +1,4 @@ +import { CardType } from '../../shared/card/card.component'; import { CardStatusDto } from '../application/application-code.dto'; import { BoardDto } from '../board/board.dto'; import { AssigneeDto } from '../user/user.dto'; @@ -6,7 +7,7 @@ export interface CardUpdateDto { uuid: string; assigneeUuid?: string | null; boardCode?: string; - typeCode?: string; + typeCode?: CardType; statusCode?: string; highPriority?: boolean; } @@ -14,7 +15,7 @@ export interface CardUpdateDto { export interface CardFlatDto { uuid: string; assigneeUuid: string; - typeCode: string; + typeCode: CardType; highPriority: boolean; statusCode: string; boardUuid: string; @@ -22,7 +23,7 @@ export interface CardFlatDto { export interface CardDto { uuid: string; - type: string; + type: CardType; highPriority: boolean; status: CardStatusDto; assignee?: AssigneeDto; diff --git a/services/apps/alcs/src/alcs/board/board.dto.ts b/services/apps/alcs/src/alcs/board/board.dto.ts index aea9dc0171..024ffc7cb6 100644 --- a/services/apps/alcs/src/alcs/board/board.dto.ts +++ b/services/apps/alcs/src/alcs/board/board.dto.ts @@ -20,6 +20,7 @@ export class BoardDto { statuses: BoardStatusDto[]; allowedCardTypes: string[]; + createCardTypes: string[]; } export class BoardSmallDto { diff --git a/services/apps/alcs/src/alcs/board/board.entity.ts b/services/apps/alcs/src/alcs/board/board.entity.ts index 865f0524f6..4de68cfde9 100644 --- a/services/apps/alcs/src/alcs/board/board.entity.ts +++ b/services/apps/alcs/src/alcs/board/board.entity.ts @@ -22,10 +22,6 @@ export class Board extends Base { @Column() title: string; - @AutoMap() - @Column() - decisionMaker: string; - @AutoMap() @OneToMany(() => BoardStatus, (status) => status.board, { eager: true, @@ -38,4 +34,8 @@ export class Board extends Base { @ManyToMany(() => CardType) @JoinTable() allowedCardTypes: CardType[]; + + @ManyToMany(() => CardType) + @JoinTable() + createCardTypes: CardType[]; } diff --git a/services/apps/alcs/src/alcs/board/board.service.ts b/services/apps/alcs/src/alcs/board/board.service.ts index 2fb3fa6797..735316d51e 100644 --- a/services/apps/alcs/src/alcs/board/board.service.ts +++ b/services/apps/alcs/src/alcs/board/board.service.ts @@ -14,6 +14,7 @@ export class BoardService { status: true, }, allowedCardTypes: true, + createCardTypes: true, }; constructor( diff --git a/services/apps/alcs/src/common/automapper/board.automapper.profile.ts b/services/apps/alcs/src/common/automapper/board.automapper.profile.ts index 2239b33c20..001971e570 100644 --- a/services/apps/alcs/src/common/automapper/board.automapper.profile.ts +++ b/services/apps/alcs/src/common/automapper/board.automapper.profile.ts @@ -37,6 +37,10 @@ export class BoardAutomapperProfile extends AutomapperProfile { (ad) => ad.allowedCardTypes, mapFrom((a) => a.allowedCardTypes.map((cardType) => cardType.code)), ), + forMember( + (ad) => ad.createCardTypes, + mapFrom((a) => a.createCardTypes.map((cardType) => cardType.code)), + ), ); createMap( diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1689031991682-add_create_card_types_to_board.ts b/services/apps/alcs/src/providers/typeorm/migrations/1689031991682-add_create_card_types_to_board.ts new file mode 100644 index 0000000000..6bd2c35b00 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1689031991682-add_create_card_types_to_board.ts @@ -0,0 +1,43 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class addCreateCardTypesToBoard1689031991682 + implements MigrationInterface +{ + name = 'addCreateCardTypesToBoard1689031991682'; + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `CREATE TABLE "alcs"."board_create_card_types_card_type" ("board_uuid" uuid NOT NULL, "card_type_code" text NOT NULL, CONSTRAINT "PK_4a9535896f19ec7870e6e376bf8" PRIMARY KEY ("board_uuid", "card_type_code"))`, + ); + await queryRunner.query( + `CREATE INDEX "IDX_6bab6507fdfd4c78ad0c0ef795" ON "alcs"."board_create_card_types_card_type" ("board_uuid") `, + ); + await queryRunner.query( + `CREATE INDEX "IDX_0539f751e12ae24da450a36a1e" ON "alcs"."board_create_card_types_card_type" ("card_type_code") `, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."board_create_card_types_card_type" ADD CONSTRAINT "FK_6bab6507fdfd4c78ad0c0ef795c" FOREIGN KEY ("board_uuid") REFERENCES "alcs"."board"("uuid") ON DELETE CASCADE ON UPDATE CASCADE`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."board_create_card_types_card_type" ADD CONSTRAINT "FK_0539f751e12ae24da450a36a1e5" FOREIGN KEY ("card_type_code") REFERENCES "alcs"."card_type"("code") ON DELETE CASCADE ON UPDATE CASCADE`, + ); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `ALTER TABLE "alcs"."board_create_card_types_card_type" DROP CONSTRAINT "FK_0539f751e12ae24da450a36a1e5"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."board_create_card_types_card_type" DROP CONSTRAINT "FK_6bab6507fdfd4c78ad0c0ef795c"`, + ); + await queryRunner.query( + `DROP INDEX "alcs"."IDX_0539f751e12ae24da450a36a1e"`, + ); + await queryRunner.query( + `DROP INDEX "alcs"."IDX_6bab6507fdfd4c78ad0c0ef795"`, + ); + await queryRunner.query( + `DROP TABLE "alcs"."board_create_card_types_card_type"`, + ); + } +} diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1689032043442-seed_create_card_types.ts b/services/apps/alcs/src/providers/typeorm/migrations/1689032043442-seed_create_card_types.ts new file mode 100644 index 0000000000..adc5a62d6b --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1689032043442-seed_create_card_types.ts @@ -0,0 +1,38 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class seedCreateCardTypes1689032043442 implements MigrationInterface { + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query(` + INSERT INTO "alcs"."board_create_card_types_card_type" ("board_uuid", "card_type_code") VALUES + ('b3b483b6-becd-43c2-92ed-b02e1864f039', 'RECON'), ---CEO + ('b3b483b6-becd-43c2-92ed-b02e1864f039', 'MODI'), + ('b3b483b6-becd-43c2-92ed-b02e1864f039', 'COV'), + ('d8c18278-cb41-474e-a180-534a101243ab', 'RECON'), ---Executive Committee + ('d8c18278-cb41-474e-a180-534a101243ab', 'PLAN'), + ('d8c18278-cb41-474e-a180-534a101243ab', 'COV'), + ('30a432ce-fd7b-40fd-9b6e-4d9df305b57f', 'RECON'), ---Film + ('30a432ce-fd7b-40fd-9b6e-4d9df305b57f', 'COV'), + ('46a8294f-27fd-477e-a722-50121d907bb1', 'RECON'), ---Interior + ('46a8294f-27fd-477e-a722-50121d907bb1', 'COV'), + ('325b6f2f-5612-47cb-b039-d934b180f417', 'RECON'), ---Island + ('325b6f2f-5612-47cb-b039-d934b180f417', 'COV'), + ('93b54e2c-6c1f-4fae-8cff-2b49da223dd2', 'RECON'), ---Kootenay + ('93b54e2c-6c1f-4fae-8cff-2b49da223dd2', 'COV'), + ('7eb6947b-0ef0-4e0b-aa21-5195817b6261', 'NOIM'), ---NOI + ('978bb70a-dbea-4285-9165-91efb141d619', 'RECON'), ---North + ('978bb70a-dbea-4285-9165-91efb141d619', 'COV'), + ('88fefa0b-98db-4cb4-af42-17f169f1c7ed', 'RECON'), ---Okanagan + ('88fefa0b-98db-4cb4-af42-17f169f1c7ed', 'COV'), + ('76fb47cf-7695-4a6e-8c71-c25a255cbcae', 'RECON'), ---Soil & Fill + ('76fb47cf-7695-4a6e-8c71-c25a255cbcae', 'COV'), + ('b31621ec-2d65-4d9a-be76-d05a49bd5ebf', 'RECON'), ---South Coast + ('b31621ec-2d65-4d9a-be76-d05a49bd5ebf', 'COV'), + ('bb70eb85-6250-49b9-9a5c-e3c2e0b9f3a2', 'APP'), ---Vetting + ('bb70eb85-6250-49b9-9a5c-e3c2e0b9f3a2', 'NOI'); + `); + } + + public async down(): Promise { + //Not Needed + } +} diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1689033590520-remove_board_decision_maker.ts b/services/apps/alcs/src/providers/typeorm/migrations/1689033590520-remove_board_decision_maker.ts new file mode 100644 index 0000000000..6cfb25fb57 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1689033590520-remove_board_decision_maker.ts @@ -0,0 +1,19 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class removeBoardDecisionMaker1689033590520 + implements MigrationInterface +{ + name = 'removeBoardDecisionMaker1689033590520'; + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `ALTER TABLE "alcs"."board" DROP COLUMN "decision_maker"`, + ); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `ALTER TABLE "alcs"."board" ADD "decision_maker" character varying NOT NULL`, + ); + } +} From bf06d0f0b2a81c3b9088b38786c67e31271bb1eb Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Tue, 11 Jul 2023 13:08:47 -0700 Subject: [PATCH 061/954] fix labels (#766) --- .../decision/conditions/conditions.component.ts | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/alcs-frontend/src/app/features/application/decision/conditions/conditions.component.ts b/alcs-frontend/src/app/features/application/decision/conditions/conditions.component.ts index 977dc47ae1..c2cb587941 100644 --- a/alcs-frontend/src/app/features/application/decision/conditions/conditions.component.ts +++ b/alcs-frontend/src/app/features/application/decision/conditions/conditions.component.ts @@ -80,7 +80,7 @@ export class ConditionsComponent implements OnInit { this.decisionService.$decisions.pipe(takeUntil(this.$destroy)).subscribe((decisions) => { this.decisions = decisions.map((decision) => { if (decision.uuid === this.decisionUuid) { - const conditions = this.mapConditions(decision); + const conditions = this.mapConditions(decision, decisions); this.sortConditions(decision, conditions); @@ -112,7 +112,10 @@ export class ConditionsComponent implements OnInit { }); } - private mapConditions(decision: ApplicationDecisionWithLinkedResolutionDto) { + private mapConditions( + decision: ApplicationDecisionWithLinkedResolutionDto, + decisions: ApplicationDecisionWithLinkedResolutionDto[] + ) { return decision.conditions.map((condition) => { const status = this.getStatus(condition, decision); @@ -124,6 +127,12 @@ export class ConditionsComponent implements OnInit { (type) => type.code === c.applicationDecisionComponentTypeCode ); + const componentsDecision = decisions.find((d) => d.uuid === c.applicationDecisionUuid); + + if (componentsDecision) { + decision = componentsDecision; + } + const label = decision.resolutionNumber && decision.resolutionYear ? `#${decision.resolutionNumber}/${decision.resolutionYear} ${matchingType?.label}` From aaca6604f20565df93e98ec72bda615b22b95a7d Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Tue, 11 Jul 2023 16:40:02 -0700 Subject: [PATCH 062/954] Add Boards to Admin Pt 1 * Add Boards to admin! --- .../src/app/features/admin/admin.component.ts | 7 + .../src/app/features/admin/admin.module.ts | 7 +- .../board-management-dialog.component.html | 104 ++++++++++ .../board-management-dialog.component.scss | 52 +++++ .../board-management-dialog.component.spec.ts | 65 +++++++ .../board-management-dialog.component.ts | 179 ++++++++++++++++++ .../board-management.component.html | 34 ++++ .../board-management.component.scss | 9 + .../board-management.component.spec.ts | 64 +++++++ .../board-management.component.ts | 99 ++++++++++ .../card-status/card-status.component.ts | 2 - .../app/features/board/board.component.html | 46 ++--- .../features/board/board.component.spec.ts | 66 ++----- ...create-planning-review-dialog.component.ts | 3 +- .../admin-board-management.service.spec.ts | 125 ++++++++++++ .../admin-board-management.service.ts | 76 ++++++++ .../admin-local-government.service.spec.ts | 2 +- .../src/app/services/board/board.dto.ts | 1 - .../src/app/services/board/board.service.ts | 8 +- .../app/services/card/card.service.spec.ts | 5 +- .../meeting-overview.component.spec.ts | 3 +- .../apps/alcs/src/alcs/admin/admin.module.ts | 2 + .../board-management.controller.spec.ts | 47 +++++ .../board-management.controller.ts | 96 ++++++++++ .../src/alcs/board/board-status.entity.ts | 10 + .../apps/alcs/src/alcs/board/board.dto.ts | 10 +- .../alcs/src/alcs/board/board.service.spec.ts | 28 ++- .../apps/alcs/src/alcs/board/board.service.ts | 64 ++++++- .../apps/alcs/src/alcs/card/card.service.ts | 9 + .../src/portal/code/code.controller.spec.ts | 2 +- .../alcs/src/portal/code/code.controller.ts | 2 +- 31 files changed, 1125 insertions(+), 102 deletions(-) create mode 100644 alcs-frontend/src/app/features/admin/board-management/board-management-dialog/board-management-dialog.component.html create mode 100644 alcs-frontend/src/app/features/admin/board-management/board-management-dialog/board-management-dialog.component.scss create mode 100644 alcs-frontend/src/app/features/admin/board-management/board-management-dialog/board-management-dialog.component.spec.ts create mode 100644 alcs-frontend/src/app/features/admin/board-management/board-management-dialog/board-management-dialog.component.ts create mode 100644 alcs-frontend/src/app/features/admin/board-management/board-management.component.html create mode 100644 alcs-frontend/src/app/features/admin/board-management/board-management.component.scss create mode 100644 alcs-frontend/src/app/features/admin/board-management/board-management.component.spec.ts create mode 100644 alcs-frontend/src/app/features/admin/board-management/board-management.component.ts create mode 100644 alcs-frontend/src/app/services/admin-board-management/admin-board-management.service.spec.ts create mode 100644 alcs-frontend/src/app/services/admin-board-management/admin-board-management.service.ts create mode 100644 services/apps/alcs/src/alcs/admin/board-management/board-management.controller.spec.ts create mode 100644 services/apps/alcs/src/alcs/admin/board-management/board-management.controller.ts diff --git a/alcs-frontend/src/app/features/admin/admin.component.ts b/alcs-frontend/src/app/features/admin/admin.component.ts index 87c6eeb1e1..90568adfc6 100644 --- a/alcs-frontend/src/app/features/admin/admin.component.ts +++ b/alcs-frontend/src/app/features/admin/admin.component.ts @@ -1,5 +1,6 @@ import { Component } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; +import { BoardManagementComponent } from './board-management/board-management.component'; import { CardStatusComponent } from './card-status/card-status.component'; import { CeoCriterionComponent } from './ceo-criterion/ceo-criterion.component'; import { DecisionConditionTypesComponent } from './decision-condition-types/decision-condition-types.component'; @@ -52,6 +53,12 @@ export const childRoutes = [ icon: 'unarchive', component: UnarchiveComponent, }, + { + path: 'boards', + menuTitle: 'Boards', + icon: 'view_kanban', + component: BoardManagementComponent, + }, { path: 'card-status', menuTitle: 'Columns', diff --git a/alcs-frontend/src/app/features/admin/admin.module.ts b/alcs-frontend/src/app/features/admin/admin.module.ts index 61defb2f23..137c8fa1da 100644 --- a/alcs-frontend/src/app/features/admin/admin.module.ts +++ b/alcs-frontend/src/app/features/admin/admin.module.ts @@ -1,9 +1,12 @@ +import { CdkDropList, DragDropModule } from '@angular/cdk/drag-drop'; import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { MatPaginatorModule } from '@angular/material/paginator'; import { RouterModule, Routes } from '@angular/router'; import { SharedModule } from '../../shared/shared.module'; import { AdminComponent, childRoutes } from './admin.component'; +import { BoardManagementDialogComponent } from './board-management/board-management-dialog/board-management-dialog.component'; +import { BoardManagementComponent } from './board-management/board-management.component'; import { CardStatusDialogComponent } from './card-status/card-status-dialog/card-status-dialog.component'; import { CardStatusComponent } from './card-status/card-status.component'; import { CeoCriterionDialogComponent } from './ceo-criterion/ceo-criterion-dialog/ceo-criterion-dialog.component'; @@ -45,7 +48,9 @@ const routes: Routes = [ DecisionConditionTypesDialogComponent, CardStatusComponent, CardStatusDialogComponent, + BoardManagementComponent, + BoardManagementDialogComponent, ], - imports: [CommonModule, SharedModule.forRoot(), RouterModule.forChild(routes), MatPaginatorModule], + imports: [CommonModule, SharedModule.forRoot(), RouterModule.forChild(routes), MatPaginatorModule, DragDropModule], }) export class AdminModule {} diff --git a/alcs-frontend/src/app/features/admin/board-management/board-management-dialog/board-management-dialog.component.html b/alcs-frontend/src/app/features/admin/board-management/board-management-dialog/board-management-dialog.component.html new file mode 100644 index 0000000000..017a910c67 --- /dev/null +++ b/alcs-frontend/src/app/features/admin/board-management/board-management-dialog/board-management-dialog.component.html @@ -0,0 +1,104 @@ +
+

{{ isEdit ? 'Edit' : 'Create' }} Board

+
+
+
+ +
+ + Name + + + Note: The change will be reflected on all boards +
+ +
+ + Code + + +
+ +
+ + Permitted Card Types + + + {{ cardType.label }} + + + +
+ +
+
Click to add columns*
+
+
    +
  • + + + +
    • +
+
+
+
+
Columns Added to Board: {{ selectedCardStatuses.length }}
+
+ Drag and drop to re-arrange the columns. Top column is the left most column on the board. +
+
+
+ drag_indicator +
+
+
+ + +
+ + Create Card Types + + + {{ cardTypeMap[cardType] }} + + + +
+ +
+ +
+
+ +
+
+ + + + + + + + +
+
+
diff --git a/alcs-frontend/src/app/features/admin/board-management/board-management-dialog/board-management-dialog.component.scss b/alcs-frontend/src/app/features/admin/board-management/board-management-dialog/board-management-dialog.component.scss new file mode 100644 index 0000000000..da528aec6b --- /dev/null +++ b/alcs-frontend/src/app/features/admin/board-management/board-management-dialog/board-management-dialog.component.scss @@ -0,0 +1,52 @@ +@use '../../../../../styles/colors'; + +.dialog { + padding: 24px; + + form { + max-width: 100%; + max-height: 75vh; + display: grid; + grid-template-columns: 48% 48%; + row-gap: 24px; + column-gap: 24px; + margin-bottom: 12px; + padding-top: 5px; + + overflow-y: auto; + + .full-width { + grid-column: 1/3; + } + + .mat-mdc-form-field { + width: 100%; + } + } + + li { + list-style: none; + } + + ul { + margin: 0; + padding: 0; + } + + .draggable { + padding: 4px; + margin: 4px 0; + background-color: colors.$grey-light; + + .mat-icon { + color: #000; + float: right; + } + } +} + +.cdk-drag-preview { + box-sizing: border-box; + border-radius: 4px; + background-color: colors.$grey-light; +} diff --git a/alcs-frontend/src/app/features/admin/board-management/board-management-dialog/board-management-dialog.component.spec.ts b/alcs-frontend/src/app/features/admin/board-management/board-management-dialog/board-management-dialog.component.spec.ts new file mode 100644 index 0000000000..315c4ac6db --- /dev/null +++ b/alcs-frontend/src/app/features/admin/board-management/board-management-dialog/board-management-dialog.component.spec.ts @@ -0,0 +1,65 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { FormBuilder, FormsModule, ReactiveFormsModule } from '@angular/forms'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; +import { MatSelectModule } from '@angular/material/select'; +import { NoopAnimationsModule } from '@angular/platform-browser/animations'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { AdminBoardManagementService } from '../../../../services/admin-board-management/admin-board-management.service'; +import { CardStatusService } from '../../../../services/card/card-status/card-status.service'; +import { SharedModule } from '../../../../shared/shared.module'; + +import { BoardManagementDialogComponent } from './board-management-dialog.component'; + +describe('BoardManagementDialogComponent', () => { + let component: BoardManagementDialogComponent; + let fixture: ComponentFixture; + let mockCardStatusService: DeepMocked; + let mockAdminBoardService: DeepMocked; + let mockFormBuilder: DeepMocked; + + beforeEach(async () => { + mockCardStatusService = createMock(); + mockAdminBoardService = createMock(); + mockFormBuilder = createMock(); + + await TestBed.configureTestingModule({ + imports: [SharedModule, NoopAnimationsModule], + declarations: [BoardManagementDialogComponent], + providers: [ + { + provide: MAT_DIALOG_DATA, + useValue: { + cardTypes: [ + { + code: 'CODE', + }, + ], + }, + }, + { provide: MatDialogRef, useValue: {} }, + { + provide: CardStatusService, + useValue: mockCardStatusService, + }, + { + provide: AdminBoardManagementService, + useValue: mockAdminBoardService, + }, + { + provide: FormBuilder, + useValue: {}, + }, + ], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(BoardManagementDialogComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/alcs-frontend/src/app/features/admin/board-management/board-management-dialog/board-management-dialog.component.ts b/alcs-frontend/src/app/features/admin/board-management/board-management-dialog/board-management-dialog.component.ts new file mode 100644 index 0000000000..9b2ae7669d --- /dev/null +++ b/alcs-frontend/src/app/features/admin/board-management/board-management-dialog/board-management-dialog.component.ts @@ -0,0 +1,179 @@ +import { CdkDragDrop, moveItemInArray } from '@angular/cdk/drag-drop'; +import { Component, Inject, OnInit } from '@angular/core'; +import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms'; +import { MatCheckboxChange } from '@angular/material/checkbox'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; +import { AdminBoardManagementService } from '../../../../services/admin-board-management/admin-board-management.service'; +import { CardStatusDto } from '../../../../services/application/application-code.dto'; +import { BoardDto, BoardStatusDto } from '../../../../services/board/board.dto'; +import { CardStatusService } from '../../../../services/card/card-status/card-status.service'; +import { CardType } from '../../../../shared/card/card.component'; +import { BaseCodeDto } from '../../../../shared/dto/base.dto'; + +@Component({ + selector: 'app-decision-condition-types-dialog', + templateUrl: './board-management-dialog.component.html', + styleUrls: ['./board-management-dialog.component.scss'], +}) +export class BoardManagementDialogComponent implements OnInit { + title = new FormControl(null, [Validators.required]); + code = new FormControl(null, [Validators.required]); + permittedCardTypes = new FormControl([], [Validators.required]); + createCardTypes = new FormControl([], [Validators.required]); + + step = 1; + + form = new FormGroup({ + title: this.title, + code: this.code, + permittedCardTypes: this.permittedCardTypes, + createCardTypes: this.createCardTypes, + }); + + isLoading = false; + isEdit = false; + canDelete = false; + canDeleteReason = ''; + cardTypes: BaseCodeDto[] = []; + cardStatuses: CardStatusDto[] = []; + selectedCardStatuses: CardStatusDto[] = []; + cardTypeMap: Record = {}; + cardCounts: Record = {}; + + constructor( + @Inject(MAT_DIALOG_DATA) + public data: { + board: BoardDto | undefined; + cardTypes: BaseCodeDto[]; + }, + private dialogRef: MatDialogRef, + private cardStatusService: CardStatusService, + private adminBoardManagementService: AdminBoardManagementService, + private formBuilder: FormBuilder + ) { + if (data.board) { + this.isEdit = true; + this.form.controls.code.disable(); + this.form.patchValue({ + code: data.board.code, + title: data.board.title, + createCardTypes: data.board.createCardTypes, + permittedCardTypes: data.board.allowedCardTypes, + }); + } + this.cardTypes = data.cardTypes; + + for (const type of this.cardTypes) { + this.cardTypeMap[type.code] = type.label; + } + } + + ngOnInit(): void { + this.loadCanDelete(); + this.loadCardStatuses(); + } + + onNextStep() { + this.step++; + } + + onPreviousStep() { + this.step--; + } + + async onDelete() { + const board = this.data.board; + if (board) { + await this.adminBoardManagementService.delete(board.code); + this.dialogRef.close(true); + } + } + + onSelectCardStatus(status: CardStatusDto, $event: MatCheckboxChange) { + if ($event.checked) { + this.selectedCardStatuses.push(status); + } else { + this.selectedCardStatuses = this.selectedCardStatuses.filter((value) => value.code !== status.code); + } + } + + drop(event: CdkDragDrop) { + moveItemInArray(this.selectedCardStatuses, event.previousIndex, event.currentIndex); + } + + async onSubmit() { + this.isLoading = true; + + const mappedStatuses: BoardStatusDto[] = this.selectedCardStatuses.map((status, index) => { + return { + order: index, + label: status.label, + statusCode: status.code, + }; + }); + + const dto: BoardDto = { + code: this.code.value!, + title: this.title.value!, + statuses: mappedStatuses, + allowedCardTypes: this.permittedCardTypes.value ?? [], + createCardTypes: this.createCardTypes.value ?? [], + }; + + if (this.isEdit) { + await this.adminBoardManagementService.update(this.data.board!.code, dto); + } else { + await this.adminBoardManagementService.create(dto); + } + this.isLoading = false; + this.dialogRef.close(true); + } + + private async loadCanDelete() { + if (this.data.board) { + const res = await this.adminBoardManagementService.canDelete(this.data.board?.code); + if (res) { + this.canDelete = res.canDelete; + this.canDeleteReason = res.reason; + } + } + } + + private async loadCardStatuses() { + this.cardStatuses = await this.cardStatusService.fetch(); + + const board = this.data.board; + const boardStatusCodes = board + ? board.statuses + .sort((a, b) => { + return a.order - b.order; + }) + .map((status) => status.statusCode) + : []; + + if (board) { + const cardCounts = await this.adminBoardManagementService.getCardCounts(board.code); + if (cardCounts) { + this.cardCounts = cardCounts; + } + } + + this.cardStatuses.forEach((status) => { + const isSelected = boardStatusCodes.includes(status.code); + const control = this.formBuilder.control(isSelected); + if (this.cardCounts[status.code] > 0) { + control.disable(); + } + + // @ts-ignore Angular wants a strictly typed form, we don't have that as the control names are dynamic + this.form.addControl(status.label, control); + }); + + boardStatusCodes.forEach((code) => { + const cardStatus = this.cardStatuses.find((cardStatus) => cardStatus.code === code); + if (cardStatus) { + this.selectedCardStatuses.push(cardStatus); + } + }); + } +} diff --git a/alcs-frontend/src/app/features/admin/board-management/board-management.component.html b/alcs-frontend/src/app/features/admin/board-management/board-management.component.html new file mode 100644 index 0000000000..005b2438e7 --- /dev/null +++ b/alcs-frontend/src/app/features/admin/board-management/board-management.component.html @@ -0,0 +1,34 @@ +
+
+

All Boards

+ +
+ + + + + + + + + + + + + + + + + + + +
Boards{{ row.title }}Permitted Card Types + + {{ cardTypeMap[cardType] }}, + + Action + +
+
diff --git a/alcs-frontend/src/app/features/admin/board-management/board-management.component.scss b/alcs-frontend/src/app/features/admin/board-management/board-management.component.scss new file mode 100644 index 0000000000..4320920313 --- /dev/null +++ b/alcs-frontend/src/app/features/admin/board-management/board-management.component.scss @@ -0,0 +1,9 @@ +.container { + .edit-btn { + color: green; + } + + .delete-btn { + color: red; + } +} diff --git a/alcs-frontend/src/app/features/admin/board-management/board-management.component.spec.ts b/alcs-frontend/src/app/features/admin/board-management/board-management.component.spec.ts new file mode 100644 index 0000000000..e32c69b79c --- /dev/null +++ b/alcs-frontend/src/app/features/admin/board-management/board-management.component.spec.ts @@ -0,0 +1,64 @@ +import { HttpClientTestingModule } from '@angular/common/http/testing'; +import { EventEmitter, NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { MatDialog } from '@angular/material/dialog'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { BehaviorSubject, Observable } from 'rxjs'; +import { AdminBoardManagementService } from '../../../services/admin-board-management/admin-board-management.service'; +import { BoardService, BoardWithFavourite } from '../../../services/board/board.service'; +import { ConfirmationDialogService } from '../../../shared/confirmation-dialog/confirmation-dialog.service'; + +import { BoardManagementComponent } from './board-management.component'; + +describe('BoardManagementComponent', () => { + let component: BoardManagementComponent; + let fixture: ComponentFixture; + + let mockBoardService: DeepMocked; + let mockBoardAdminService: DeepMocked; + + let mockDialog: DeepMocked; + let mockConfirmationDialogService: DeepMocked; + + beforeEach(async () => { + mockBoardService = createMock(); + mockBoardAdminService = createMock(); + mockDialog = createMock(); + mockConfirmationDialogService = createMock(); + + mockBoardService.$boards = new BehaviorSubject([]); + + await TestBed.configureTestingModule({ + declarations: [BoardManagementComponent], + providers: [ + { + provide: BoardService, + useValue: mockBoardService, + }, + { + provide: AdminBoardManagementService, + useValue: mockBoardAdminService, + }, + { + provide: MatDialog, + useValue: mockDialog, + }, + { + provide: ConfirmationDialogService, + useValue: mockConfirmationDialogService, + }, + ], + schemas: [NO_ERRORS_SCHEMA], + imports: [HttpClientTestingModule], + }).compileComponents(); + + fixture = TestBed.createComponent(BoardManagementComponent); + component = fixture.componentInstance; + + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/alcs-frontend/src/app/features/admin/board-management/board-management.component.ts b/alcs-frontend/src/app/features/admin/board-management/board-management.component.ts new file mode 100644 index 0000000000..65df0605a7 --- /dev/null +++ b/alcs-frontend/src/app/features/admin/board-management/board-management.component.ts @@ -0,0 +1,99 @@ +import { Component, OnDestroy, OnInit } from '@angular/core'; +import { MatDialog } from '@angular/material/dialog'; +import { Subject, takeUntil } from 'rxjs'; +import { AdminBoardManagementService } from '../../../services/admin-board-management/admin-board-management.service'; +import { BoardDto } from '../../../services/board/board.dto'; +import { BoardService } from '../../../services/board/board.service'; +import { ConfirmationDialogService } from '../../../shared/confirmation-dialog/confirmation-dialog.service'; +import { BaseCodeDto } from '../../../shared/dto/base.dto'; +import { BoardManagementDialogComponent } from './board-management-dialog/board-management-dialog.component'; + +@Component({ + selector: 'app-board-management', + templateUrl: './board-management.component.html', + styleUrls: ['./board-management.component.scss'], +}) +export class BoardManagementComponent implements OnInit, OnDestroy { + $destroy = new Subject(); + + boards: BoardDto[] = []; + displayedColumns: string[] = ['boards', 'cardTypes', 'actions']; + private cardTypes: BaseCodeDto[] = []; + cardTypeMap: Record = {}; + + constructor( + private boardService: BoardService, + public dialog: MatDialog, + private confirmationDialogService: ConfirmationDialogService, + private adminBoardManagementService: AdminBoardManagementService + ) {} + + ngOnInit(): void { + this.boardService.$boards.pipe(takeUntil(this.$destroy)).subscribe((boards) => { + this.boards = boards; + this.boards.sort((a, b) => (a.title > b.title ? 1 : -1)); + }); + this.loadCardTypes(); + } + + async onCreate() { + const dialog = this.dialog.open(BoardManagementDialogComponent, { + minWidth: '800px', + maxWidth: '1200px', + width: '90%', + data: { + cardTypes: this.cardTypes, + }, + }); + dialog.beforeClosed().subscribe(async (result) => { + if (result) { + await this.boardService.reloadBoards(); + } + }); + } + + async onEdit(boardDto: BoardDto) { + const dialog = this.dialog.open(BoardManagementDialogComponent, { + minWidth: '800px', + maxWidth: '1200px', + width: '90%', + data: { + board: boardDto, + cardTypes: this.cardTypes, + }, + }); + dialog.beforeClosed().subscribe(async (result) => { + if (result) { + await this.boardService.reloadBoards(); + } + }); + } + + async onDelete(boardDto: BoardDto) { + this.confirmationDialogService + .openDialog({ + body: `Are you sure you want to delete ${boardDto.title}?`, + }) + .subscribe(async (answer) => { + if (answer) { + //TODO: Delete + await this.boardService.reloadBoards(); + } + }); + } + + ngOnDestroy(): void { + this.$destroy.next(); + this.$destroy.complete(); + } + + private async loadCardTypes() { + const res = await this.adminBoardManagementService.getCardTypes(); + if (res) { + this.cardTypes = res; + for (const type of res) { + this.cardTypeMap[type.code] = type.label; + } + } + } +} diff --git a/alcs-frontend/src/app/features/admin/card-status/card-status.component.ts b/alcs-frontend/src/app/features/admin/card-status/card-status.component.ts index a0bc8ce223..f301482b68 100644 --- a/alcs-frontend/src/app/features/admin/card-status/card-status.component.ts +++ b/alcs-frontend/src/app/features/admin/card-status/card-status.component.ts @@ -12,8 +12,6 @@ import { CardStatusDialogComponent } from './card-status-dialog/card-status-dial styleUrls: ['./card-status.component.scss'], }) export class CardStatusComponent implements OnInit { - destroy = new Subject(); - cardStatusDtos: CardStatusDto[] = []; displayedColumns: string[] = ['label', 'description', 'code', 'actions']; diff --git a/alcs-frontend/src/app/features/board/board.component.html b/alcs-frontend/src/app/features/board/board.component.html index c85ef0c8c7..185018f3da 100644 --- a/alcs-frontend/src/app/features/board/board.component.html +++ b/alcs-frontend/src/app/features/board/board.component.html @@ -7,34 +7,24 @@

- - - - - - - - - - - - + + + + + + + + + +
diff --git a/alcs-frontend/src/app/features/board/board.component.spec.ts b/alcs-frontend/src/app/features/board/board.component.spec.ts index 89f1c5df9c..f7e4a2f7ba 100644 --- a/alcs-frontend/src/app/features/board/board.component.spec.ts +++ b/alcs-frontend/src/app/features/board/board.component.spec.ts @@ -69,6 +69,15 @@ describe('BoardComponent', () => { let queryParamMapEmitter: BehaviorSubject>; + const mockBoard: BoardWithFavourite = { + code: 'boardCode', + title: 'boardTitle', + isFavourite: false, + statuses: [], + allowedCardTypes: [], + createCardTypes: [], + }; + beforeEach(async () => { applicationService = createMock(); boardService = createMock(); @@ -99,6 +108,7 @@ describe('BoardComponent', () => { const params = { boardCode: 'boardCode', }; + queryParamMapEmitter = new BehaviorSubject(new Map()); await TestBed.configureTestingModule({ @@ -182,16 +192,7 @@ describe('BoardComponent', () => { }); it('should set the title when provided a board code', async () => { - boardEmitter.next([ - { - code: 'boardCode', - title: 'boardTitle', - isFavourite: false, - decisionMaker: '', - statuses: [], - allowedCardTypes: [], - }, - ]); + boardEmitter.next([mockBoard]); await fixture.whenStable(); @@ -200,18 +201,20 @@ describe('BoardComponent', () => { expect(component.currentBoardCode).toEqual('boardCode'); }); - it('should enable covenants when not the vetting board', () => { + it('should enable covenants when the board supports it', async () => { boardEmitter.next([ { code: 'boardCode', - title: 'boardTitle', - isFavourite: false, - decisionMaker: '', statuses: [], - allowedCardTypes: [], + createCardTypes: [CardType.COV], + title: '', + isFavourite: false, + allowedCardTypes: [CardType.COV], }, ]); + await fixture.whenStable(); + expect(component.boardHasCreateCovenant).toBeTruthy(); }); @@ -226,16 +229,7 @@ describe('BoardComponent', () => { noiModifications: [], }); - boardEmitter.next([ - { - code: 'boardCode', - title: 'boardTitle', - isFavourite: false, - decisionMaker: '', - statuses: [], - allowedCardTypes: [], - }, - ]); + boardEmitter.next([mockBoard]); await sleep(1); @@ -254,16 +248,7 @@ describe('BoardComponent', () => { noiModifications: [], }); - boardEmitter.next([ - { - code: 'boardCode', - title: 'boardTitle', - isFavourite: false, - decisionMaker: '', - statuses: [], - allowedCardTypes: [], - }, - ]); + boardEmitter.next([mockBoard]); await sleep(1); @@ -304,16 +289,7 @@ describe('BoardComponent', () => { noiModifications: [], }); - boardEmitter.next([ - { - code: 'boardCode', - title: 'boardTitle', - isFavourite: false, - decisionMaker: '', - statuses: [], - allowedCardTypes: [], - }, - ]); + boardEmitter.next([mockBoard]); await sleep(1); diff --git a/alcs-frontend/src/app/features/board/dialogs/planning-review/create/create-planning-review-dialog.component.ts b/alcs-frontend/src/app/features/board/dialogs/planning-review/create/create-planning-review-dialog.component.ts index 42deb43e3a..48120c9db0 100644 --- a/alcs-frontend/src/app/features/board/dialogs/planning-review/create/create-planning-review-dialog.component.ts +++ b/alcs-frontend/src/app/features/board/dialogs/planning-review/create/create-planning-review-dialog.component.ts @@ -40,8 +40,7 @@ export class CreatePlanningReviewDialogComponent implements OnInit, OnDestroy { private planningReviewService: PlanningReviewService, private cardService: CardService, private applicationService: ApplicationService, - private localGovernmentService: ApplicationLocalGovernmentService, - private toastService: ToastService + private localGovernmentService: ApplicationLocalGovernmentService ) {} ngOnInit(): void { diff --git a/alcs-frontend/src/app/services/admin-board-management/admin-board-management.service.spec.ts b/alcs-frontend/src/app/services/admin-board-management/admin-board-management.service.spec.ts new file mode 100644 index 0000000000..d5bec4db91 --- /dev/null +++ b/alcs-frontend/src/app/services/admin-board-management/admin-board-management.service.spec.ts @@ -0,0 +1,125 @@ +import { HttpClient } from '@angular/common/http'; +import { TestBed } from '@angular/core/testing'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { of, throwError } from 'rxjs'; +import { SharedModule } from '../../shared/shared.module'; +import { BoardDto } from '../board/board.dto'; +import { ToastService } from '../toast/toast.service'; +import { AdminBoardManagementService } from './admin-board-management.service'; + +describe('AdminBoardManagementService', () => { + let service: AdminBoardManagementService; + let mockHttpClient: DeepMocked; + let mockToastService: DeepMocked; + + let mockBoard: BoardDto = { allowedCardTypes: [], code: '', createCardTypes: [], statuses: [], title: '' }; + + beforeEach(() => { + mockHttpClient = createMock(); + mockToastService = createMock(); + + TestBed.configureTestingModule({ + providers: [ + { + provide: HttpClient, + useValue: mockHttpClient, + }, + { + provide: ToastService, + useValue: mockToastService, + }, + ], + }); + service = TestBed.inject(AdminBoardManagementService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); + + it('should call post on create', async () => { + mockHttpClient.post.mockReturnValue( + of({ + uuid: 'fake', + }) + ); + + await service.create(mockBoard); + + expect(mockHttpClient.post).toHaveBeenCalledTimes(1); + }); + + it('should show toast if create fails', async () => { + mockHttpClient.post.mockReturnValue( + throwError(() => { + new Error(''); + }) + ); + + await service.create(mockBoard); + + expect(mockHttpClient.post).toHaveBeenCalledTimes(1); + expect(mockToastService.showErrorToast).toHaveBeenCalledTimes(1); + }); + + it('should call put on update', async () => { + mockHttpClient.put.mockReturnValue( + of({ + uuid: 'fake', + }) + ); + + await service.update('fake', mockBoard); + + expect(mockHttpClient.put).toHaveBeenCalledTimes(1); + }); + + it('should show toast if update fails', async () => { + mockHttpClient.put.mockReturnValue( + throwError(() => { + new Error(''); + }) + ); + + await service.update('mock', mockBoard); + + expect(mockHttpClient.put).toHaveBeenCalledTimes(1); + expect(mockToastService.showErrorToast).toHaveBeenCalledTimes(1); + }); + + it('should call get for can delete', async () => { + mockHttpClient.get.mockReturnValue( + of({ + uuid: 'fake', + }) + ); + + await service.canDelete('fake'); + + expect(mockHttpClient.get).toHaveBeenCalledTimes(1); + }); + + it('should call get for getCardTypes', async () => { + mockHttpClient.get.mockReturnValue( + of({ + uuid: 'fake', + }) + ); + + await service.getCardTypes(); + + expect(mockHttpClient.get).toHaveBeenCalledTimes(1); + }); + + it('should call get for getCardCounts', async () => { + mockHttpClient.get.mockReturnValue( + of({ + uuid: 'fake', + }) + ); + + await service.getCardCounts('board'); + + expect(mockHttpClient.get).toHaveBeenCalledTimes(1); + }); +}); diff --git a/alcs-frontend/src/app/services/admin-board-management/admin-board-management.service.ts b/alcs-frontend/src/app/services/admin-board-management/admin-board-management.service.ts new file mode 100644 index 0000000000..033701da34 --- /dev/null +++ b/alcs-frontend/src/app/services/admin-board-management/admin-board-management.service.ts @@ -0,0 +1,76 @@ +import { HttpClient } from '@angular/common/http'; +import { Injectable } from '@angular/core'; +import { firstValueFrom } from 'rxjs'; +import { environment } from '../../../environments/environment'; +import { BaseCodeDto } from '../../shared/dto/base.dto'; +import { BoardDto } from '../board/board.dto'; +import { ToastService } from '../toast/toast.service'; + +@Injectable({ + providedIn: 'root', +}) +export class AdminBoardManagementService { + private url = `${environment.apiUrl}/board-management`; + + constructor(private http: HttpClient, private toastService: ToastService) {} + + async getCardTypes() { + try { + return await firstValueFrom(this.http.get(`${this.url}/card-types`)); + } catch (e) { + this.toastService.showErrorToast('Failed to fetch card types'); + console.log(e); + } + return; + } + + async getCardCounts(boardCode: string) { + try { + return await firstValueFrom(this.http.get>(`${this.url}/card-counts/${boardCode}`)); + } catch (e) { + this.toastService.showErrorToast('Failed to fetch card types'); + console.log(e); + } + return; + } + + async create(dto: BoardDto) { + try { + return await firstValueFrom(this.http.post(`${this.url}`, dto)); + } catch (e) { + this.toastService.showErrorToast('Failed to create local government'); + console.log(e); + } + return; + } + + async update(uuid: string, dto: BoardDto) { + try { + return await firstValueFrom(this.http.put(`${this.url}/${uuid}`, dto)); + } catch (e) { + this.toastService.showErrorToast('Failed to update local government'); + console.log(e); + } + return; + } + + async canDelete(code: string) { + try { + return await firstValueFrom(this.http.get<{ canDelete: boolean; reason: string }>(`${this.url}/${code}`)); + } catch (e) { + this.toastService.showErrorToast('Failed to delete card status'); + console.log(e); + } + return; + } + + async delete(code: string) { + try { + return await firstValueFrom(this.http.delete(`${this.url}/${code}`)); + } catch (e) { + this.toastService.showErrorToast('Failed to delete board'); + console.log(e); + } + return; + } +} diff --git a/alcs-frontend/src/app/services/admin-local-government/admin-local-government.service.spec.ts b/alcs-frontend/src/app/services/admin-local-government/admin-local-government.service.spec.ts index ab3f57cff2..d05165a498 100644 --- a/alcs-frontend/src/app/services/admin-local-government/admin-local-government.service.spec.ts +++ b/alcs-frontend/src/app/services/admin-local-government/admin-local-government.service.spec.ts @@ -5,7 +5,7 @@ import { of, throwError } from 'rxjs'; import { ToastService } from '../toast/toast.service'; import { AdminLocalGovernmentService } from './admin-local-government.service'; -describe('HolidayService', () => { +describe('AdminLocalGovernmentService', () => { let service: AdminLocalGovernmentService; let mockHttpClient: DeepMocked; let mockToastService: DeepMocked; diff --git a/alcs-frontend/src/app/services/board/board.dto.ts b/alcs-frontend/src/app/services/board/board.dto.ts index 0a09ae7b61..5407811358 100644 --- a/alcs-frontend/src/app/services/board/board.dto.ts +++ b/alcs-frontend/src/app/services/board/board.dto.ts @@ -10,7 +10,6 @@ import { PlanningReviewDto } from '../planning-review/planning-review.dto'; export interface BoardDto { code: string; title: string; - decisionMaker: string; statuses: BoardStatusDto[]; allowedCardTypes: CardType[]; createCardTypes: CardType[]; diff --git a/alcs-frontend/src/app/services/board/board.service.ts b/alcs-frontend/src/app/services/board/board.service.ts index ee6b21c1c1..0ebbcb90dd 100644 --- a/alcs-frontend/src/app/services/board/board.service.ts +++ b/alcs-frontend/src/app/services/board/board.service.ts @@ -27,9 +27,13 @@ export class BoardService { }); } - private async publishBoards() { + async reloadBoards() { + await this.publishBoards(true); + } + + private async publishBoards(reload = false) { if (this.userProfile !== undefined) { - if (!this.boards) { + if (!this.boards || reload) { this.boards = await firstValueFrom(this.http.get(`${environment.apiUrl}/board`)); } const mappedBoards = this.boards.map((board) => ({ diff --git a/alcs-frontend/src/app/services/card/card.service.spec.ts b/alcs-frontend/src/app/services/card/card.service.spec.ts index 81efb81065..f218ee15dc 100644 --- a/alcs-frontend/src/app/services/card/card.service.spec.ts +++ b/alcs-frontend/src/app/services/card/card.service.spec.ts @@ -2,6 +2,7 @@ import { HttpClient } from '@angular/common/http'; import { TestBed } from '@angular/core/testing'; import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { firstValueFrom, of, throwError } from 'rxjs'; +import { CardType } from '../../shared/card/card.component'; import { ToastService } from '../toast/toast.service'; import { CardService } from './card.service'; @@ -47,7 +48,7 @@ describe('CardService', () => { boardCode: '', highPriority: false, statusCode: '', - typeCode: '', + typeCode: CardType.APP, uuid: '', }); @@ -66,7 +67,7 @@ describe('CardService', () => { boardCode: '', highPriority: false, statusCode: '', - typeCode: '', + typeCode: CardType.NOI_MODI, uuid: '', }); diff --git a/alcs-frontend/src/app/shared/meeting-overview/meeting-overview.component.spec.ts b/alcs-frontend/src/app/shared/meeting-overview/meeting-overview.component.spec.ts index 1fcae30370..0e9e79ce61 100644 --- a/alcs-frontend/src/app/shared/meeting-overview/meeting-overview.component.spec.ts +++ b/alcs-frontend/src/app/shared/meeting-overview/meeting-overview.component.spec.ts @@ -4,7 +4,6 @@ import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { BehaviorSubject } from 'rxjs'; import { sleep } from '../../../../test/sleep'; import { ApplicationDocumentService } from '../../services/application/application-document/application-document.service'; -import { BoardDto } from '../../services/board/board.dto'; import { BoardService, BoardWithFavourite } from '../../services/board/board.service'; import { DecisionMeetingService } from '../../services/decision-meeting/decision-meeting.service'; import { ToastService } from '../../services/toast/toast.service'; @@ -85,11 +84,11 @@ describe('MeetingOverviewComponent', () => { boardEmitter.next([ { statuses: [], - decisionMaker: '', isFavourite: true, title: '', code: 'boardCode', allowedCardTypes: [], + createCardTypes: [], }, ]); diff --git a/services/apps/alcs/src/alcs/admin/admin.module.ts b/services/apps/alcs/src/alcs/admin/admin.module.ts index 9bce9fb8a6..575669dfb3 100644 --- a/services/apps/alcs/src/alcs/admin/admin.module.ts +++ b/services/apps/alcs/src/alcs/admin/admin.module.ts @@ -18,6 +18,7 @@ import { ApplicationDecisionConditionTypesController } from './application-decis import { ApplicationDecisionConditionTypesService } from './application-decision-condition-types/application-decision-condition-types.service'; import { ApplicationDecisionMakerController } from './application-decision-maker/application-decision-maker.controller'; import { ApplicationDecisionMakerService } from './application-decision-maker/application-decision-maker.service'; +import { BoardManagementController } from './board-management/board-management.controller'; import { CardStatusController } from './card-status/card-status.controller'; import { HolidayController } from './holiday/holiday.controller'; import { HolidayEntity } from './holiday/holiday.entity'; @@ -55,6 +56,7 @@ import { UnarchiveCardService } from './unarchive-card/unarchive-card.service'; ApplicationDecisionMakerController, ApplicationDecisionConditionTypesController, CardStatusController, + BoardManagementController, ], providers: [ HolidayService, diff --git a/services/apps/alcs/src/alcs/admin/board-management/board-management.controller.spec.ts b/services/apps/alcs/src/alcs/admin/board-management/board-management.controller.spec.ts new file mode 100644 index 0000000000..645912a24f --- /dev/null +++ b/services/apps/alcs/src/alcs/admin/board-management/board-management.controller.spec.ts @@ -0,0 +1,47 @@ +import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; +import { ConfigModule } from '@nestjs/config'; +import { Test, TestingModule } from '@nestjs/testing'; +import { ClsService } from 'nestjs-cls'; +import { mockKeyCloakProviders } from '../../../../test/mocks/mockTypes'; +import { BoardService } from '../../board/board.service'; +import { CardService } from '../../card/card.service'; +import { BoardManagementController } from './board-management.controller'; + +describe('BoardManagementController', () => { + let controller: BoardManagementController; + let mockCardService: DeepMocked; + let mockBoardService: DeepMocked; + + beforeEach(async () => { + mockCardService = createMock(); + mockBoardService = createMock(); + + const module: TestingModule = await Test.createTestingModule({ + controllers: [BoardManagementController], + providers: [ + { + provide: CardService, + useValue: mockCardService, + }, + { + provide: BoardService, + useValue: mockBoardService, + }, + { + provide: ClsService, + useValue: {}, + }, + ...mockKeyCloakProviders, + ], + imports: [ConfigModule], + }).compile(); + + controller = module.get( + BoardManagementController, + ); + }); + + it('should be defined', () => { + expect(controller).toBeDefined(); + }); +}); diff --git a/services/apps/alcs/src/alcs/admin/board-management/board-management.controller.ts b/services/apps/alcs/src/alcs/admin/board-management/board-management.controller.ts new file mode 100644 index 0000000000..e41da3086e --- /dev/null +++ b/services/apps/alcs/src/alcs/admin/board-management/board-management.controller.ts @@ -0,0 +1,96 @@ +import { ServiceValidationException } from '@app/common/exceptions/base.exception'; +import { + Body, + Controller, + Delete, + Get, + Param, + Post, + Put, + UseGuards, +} from '@nestjs/common'; +import { ApiOAuth2 } from '@nestjs/swagger'; +import * as config from 'config'; +import { AUTH_ROLE } from '../../../common/authorization/roles'; +import { RolesGuard } from '../../../common/authorization/roles-guard.service'; +import { UserRoles } from '../../../common/authorization/roles.decorator'; +import { BoardDto } from '../../board/board.dto'; +import { BoardService } from '../../board/board.service'; +import { CardService } from '../../card/card.service'; + +@Controller('board-management') +@ApiOAuth2(config.get('KEYCLOAK.SCOPES')) +@UseGuards(RolesGuard) +export class BoardManagementController { + constructor( + private cardService: CardService, + private boardService: BoardService, + ) {} + + @Get('/card-types') + @UserRoles(AUTH_ROLE.ADMIN) + async fetchCardTypes() { + return await this.cardService.getCardTypes(); + } + + @Get('/card-counts/:code') + @UserRoles(AUTH_ROLE.ADMIN) + async fetchCardCount(@Param('code') code: string) { + const cardsOnBoard = await this.cardService.getByBoard(code); + const finalCount: Record = {}; + return cardsOnBoard.reduce((previousValue, currentValue) => { + const cardCount = previousValue[currentValue.statusCode] ?? 0; + previousValue[currentValue.statusCode] = cardCount + 1; + return previousValue; + }, finalCount); + } + + @Get('/:code') + @UserRoles(AUTH_ROLE.ADMIN) + async canDelete(@Param('code') code: string) { + //If it's the vetting board + if (code === 'vett') { + return { + canDelete: false, + reason: + 'Board is critical to application functionality and can never be deleted', + }; + } + + //If it has any cards + const cardCount = await this.cardService.getByBoard(code); + if (cardCount.length > 0) { + return { + canDelete: false, + reason: 'Board has cards on it, please move cards in order to delete', + }; + } + + return { + canDelete: true, + }; + } + + @Put('/:code') + @UserRoles(AUTH_ROLE.ADMIN) + async update(@Param('code') code: string, @Body() updateDto: BoardDto) { + return await this.boardService.update(code, updateDto); + } + + @Delete('/:code') + @UserRoles(AUTH_ROLE.ADMIN) + async delete(@Param('code') code: string) { + const cardCount = await this.cardService.getByBoard(code); + if (cardCount.length > 0) { + throw new ServiceValidationException('Cannot delete boards with cards'); + } + + return await this.boardService.delete(code); + } + + @Post('') + @UserRoles(AUTH_ROLE.ADMIN) + async create(@Body() createDto: BoardDto) { + return await this.boardService.create(createDto); + } +} diff --git a/services/apps/alcs/src/alcs/board/board-status.entity.ts b/services/apps/alcs/src/alcs/board/board-status.entity.ts index 8658c64b4d..9e7e4c3a57 100644 --- a/services/apps/alcs/src/alcs/board/board-status.entity.ts +++ b/services/apps/alcs/src/alcs/board/board-status.entity.ts @@ -7,6 +7,13 @@ import { Board } from './board.entity'; @Entity() @Unique(['board', 'status']) export class BoardStatus extends Base { + constructor(data?: Partial) { + super(); + if (data) { + Object.assign(this, data); + } + } + @AutoMap() @ManyToOne(() => Board, (board) => board.statuses, { nullable: false }) board: Board; @@ -18,4 +25,7 @@ export class BoardStatus extends Base { @AutoMap() @ManyToOne(() => CardStatus, { eager: true, nullable: false }) status: CardStatus; + + @Column() + statusCode: string; } diff --git a/services/apps/alcs/src/alcs/board/board.dto.ts b/services/apps/alcs/src/alcs/board/board.dto.ts index 024ffc7cb6..b4bb07aa84 100644 --- a/services/apps/alcs/src/alcs/board/board.dto.ts +++ b/services/apps/alcs/src/alcs/board/board.dto.ts @@ -1,4 +1,5 @@ import { AutoMap } from '@automapper/classes'; +import { IsArray, IsString } from 'class-validator'; export enum BOARD_CODES { CEO = 'ceo', @@ -8,18 +9,21 @@ export enum BOARD_CODES { export class BoardDto { @AutoMap() + @IsString() code: string; @AutoMap() + @IsString() title: string; @AutoMap() - decisionMaker: string; - - @AutoMap() + @IsArray() statuses: BoardStatusDto[]; + @IsArray() allowedCardTypes: string[]; + + @IsArray() createCardTypes: string[]; } diff --git a/services/apps/alcs/src/alcs/board/board.service.spec.ts b/services/apps/alcs/src/alcs/board/board.service.spec.ts index b07c19de93..a1f1baba87 100644 --- a/services/apps/alcs/src/alcs/board/board.service.spec.ts +++ b/services/apps/alcs/src/alcs/board/board.service.spec.ts @@ -6,6 +6,8 @@ import { Repository } from 'typeorm'; import { ApplicationService } from '../application/application.service'; import { Card } from '../card/card.entity'; import { CardService } from '../card/card.service'; +import { BoardStatus } from './board-status.entity'; +import { BoardStatusDto } from './board.dto'; import { Board } from './board.entity'; import { BoardService } from './board.service'; @@ -13,12 +15,14 @@ describe('BoardsService', () => { let service: BoardService; let applicationService: DeepMocked; let cardService: DeepMocked; - let mockRepository: DeepMocked>; + let mockBoardRepository: DeepMocked>; + let mockBoardStatusRepository: DeepMocked>; beforeEach(async () => { - applicationService = createMock(); - mockRepository = createMock>(); - cardService = createMock(); + applicationService = createMock(); + mockBoardRepository = createMock(); + cardService = createMock(); + mockBoardStatusRepository = createMock(); const module: TestingModule = await Test.createTestingModule({ providers: [ @@ -33,7 +37,11 @@ describe('BoardsService', () => { }, { provide: getRepositoryToken(Board), - useValue: mockRepository, + useValue: mockBoardRepository, + }, + { + provide: getRepositoryToken(BoardStatus), + useValue: mockBoardStatusRepository, }, ], }).compile(); @@ -46,10 +54,10 @@ describe('BoardsService', () => { }); it('should call repo when list is called', async () => { - mockRepository.find.mockResolvedValue([]); + mockBoardRepository.find.mockResolvedValue([]); await service.list(); - expect(mockRepository.find).toHaveBeenCalledTimes(1); + expect(mockBoardRepository.find).toHaveBeenCalledTimes(1); }); it('should set the applications status to the 0 rank when changing board', async () => { @@ -73,12 +81,12 @@ describe('BoardsService', () => { board: { uuid: 'fake-board' }, } as Card); cardService.save.mockResolvedValue(new Card()); - mockRepository.findOne.mockResolvedValue(mockBoard); + mockBoardRepository.findOne.mockResolvedValue(mockBoard); cardService.update.mockResolvedValue({} as Card); await service.changeBoard(cardUuid, boardCode); expect(cardService.get).toHaveBeenCalledTimes(1); - expect(mockRepository.findOne).toHaveBeenCalledTimes(1); + expect(mockBoardRepository.findOne).toHaveBeenCalledTimes(1); expect(cardService.save).toHaveBeenCalledTimes(1); const updatedCard = cardService.save.mock.calls[0][0]; @@ -98,7 +106,7 @@ describe('BoardsService', () => { it("should throw an exception when trying to set a board that doesn't exist", async () => { cardService.get.mockResolvedValue({} as Card); - mockRepository.findOne.mockResolvedValue(null); + mockBoardRepository.findOne.mockResolvedValue(null); await expect( service.changeBoard('file-number', 'board-code'), diff --git a/services/apps/alcs/src/alcs/board/board.service.ts b/services/apps/alcs/src/alcs/board/board.service.ts index 735316d51e..2f382fa983 100644 --- a/services/apps/alcs/src/alcs/board/board.service.ts +++ b/services/apps/alcs/src/alcs/board/board.service.ts @@ -1,10 +1,13 @@ import { ServiceNotFoundException } from '@app/common/exceptions/base.exception'; import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; -import { Any, FindOptionsWhere, Repository } from 'typeorm'; +import { FindOptionsWhere, Repository } from 'typeorm'; import { FindOptionsRelations } from 'typeorm/find-options/FindOptionsRelations'; import { CARD_STATUS } from '../card/card-status/card-status.entity'; +import { CardType } from '../card/card-type/card-type.entity'; import { CardService } from '../card/card.service'; +import { BoardStatus } from './board-status.entity'; +import { BoardDto } from './board.dto'; import { Board } from './board.entity'; @Injectable() @@ -20,6 +23,8 @@ export class BoardService { constructor( @InjectRepository(Board) private boardRepository: Repository, + @InjectRepository(BoardStatus) + private boardStatusRepository: Repository, private cardService: CardService, ) {} @@ -88,4 +93,61 @@ export class BoardService { }, }); } + + async delete(code: string) { + const board = await this.getOneOrFail({ + code, + }); + + //Un-link all statuses first + await this.boardStatusRepository.delete({ + board: { + uuid: board.uuid, + }, + }); + + await this.boardRepository.remove(board); + } + + async create(createDto: BoardDto) { + await this.saveUpdates(new Board(), createDto); + } + + async update(code: string, updateDto: BoardDto) { + const board = await this.getOneOrFail({ + code, + }); + await this.saveUpdates(board, updateDto); + } + + private async saveUpdates(board: Board, updateDto: BoardDto) { + const cardTypes = await this.cardService.getCardTypes(); + + board.title = updateDto.title; + board.allowedCardTypes = updateDto.allowedCardTypes.map( + (code) => cardTypes.find((cardType) => cardType.code === code)!, + ); + board.createCardTypes = updateDto.createCardTypes.map( + (code) => cardTypes.find((cardType) => cardType.code === code)!, + ); + + await this.boardRepository.save(board); + + await this.boardStatusRepository.delete({ + board: { + uuid: board.uuid, + }, + }); + + const newStatuses = updateDto.statuses.map( + (status) => + new BoardStatus({ + board, + order: status.order, + statusCode: status.statusCode, + }), + ); + + await this.boardStatusRepository.save(newStatuses); + } } diff --git a/services/apps/alcs/src/alcs/card/card.service.ts b/services/apps/alcs/src/alcs/card/card.service.ts index 1cc3ff4ec7..68bbd49257 100644 --- a/services/apps/alcs/src/alcs/card/card.service.ts +++ b/services/apps/alcs/src/alcs/card/card.service.ts @@ -35,6 +35,15 @@ export class CardService { ) {} async getCardTypes() { + return await this.cardTypeRepository.find({ + select: { + code: true, + label: true, + }, + }); + } + + async getPortalCardTypes() { return await this.cardTypeRepository.find({ select: { code: true, diff --git a/services/apps/alcs/src/portal/code/code.controller.spec.ts b/services/apps/alcs/src/portal/code/code.controller.spec.ts index a62f22400b..7898cf4884 100644 --- a/services/apps/alcs/src/portal/code/code.controller.spec.ts +++ b/services/apps/alcs/src/portal/code/code.controller.spec.ts @@ -76,7 +76,7 @@ describe('CodeController', () => { ]); mockAppService.fetchApplicationTypes.mockResolvedValue([]); - mockCardService.getCardTypes.mockResolvedValue([ + mockCardService.getPortalCardTypes.mockResolvedValue([ new CardType({ code: 'fake-code', portalHtmlDescription: 'fake-html', diff --git a/services/apps/alcs/src/portal/code/code.controller.ts b/services/apps/alcs/src/portal/code/code.controller.ts index ff57851766..228a6967ea 100644 --- a/services/apps/alcs/src/portal/code/code.controller.ts +++ b/services/apps/alcs/src/portal/code/code.controller.ts @@ -36,7 +36,7 @@ export class CodeController { await this.applicationService.fetchApplicationTypes(); const applicationDocumentTypes = await this.applicationDocumentService.fetchTypes(); - const submissionTypes = await this.cardService.getCardTypes(); + const submissionTypes = await this.cardService.getPortalCardTypes(); const naruSubtypes = await this.applicationSubmissionService.listNaruSubtypes(); From dfa2fb590ab87b608e53c890a7386e0b3ace3f14 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Wed, 12 Jul 2023 09:18:02 -0700 Subject: [PATCH 063/954] Code Review Feedback --- .../board-management/board-management.component.ts | 13 ------------- .../src/app/services/board/board.service.ts | 1 + services/apps/alcs/src/alcs/board/board.service.ts | 3 +++ .../alcs/test/pgtap/test_calculate_paused_time.sql | 4 ++-- 4 files changed, 6 insertions(+), 15 deletions(-) diff --git a/alcs-frontend/src/app/features/admin/board-management/board-management.component.ts b/alcs-frontend/src/app/features/admin/board-management/board-management.component.ts index 65df0605a7..36f016e6af 100644 --- a/alcs-frontend/src/app/features/admin/board-management/board-management.component.ts +++ b/alcs-frontend/src/app/features/admin/board-management/board-management.component.ts @@ -69,19 +69,6 @@ export class BoardManagementComponent implements OnInit, OnDestroy { }); } - async onDelete(boardDto: BoardDto) { - this.confirmationDialogService - .openDialog({ - body: `Are you sure you want to delete ${boardDto.title}?`, - }) - .subscribe(async (answer) => { - if (answer) { - //TODO: Delete - await this.boardService.reloadBoards(); - } - }); - } - ngOnDestroy(): void { this.$destroy.next(); this.$destroy.complete(); diff --git a/alcs-frontend/src/app/services/board/board.service.ts b/alcs-frontend/src/app/services/board/board.service.ts index 0ebbcb90dd..824bd30c71 100644 --- a/alcs-frontend/src/app/services/board/board.service.ts +++ b/alcs-frontend/src/app/services/board/board.service.ts @@ -28,6 +28,7 @@ export class BoardService { } async reloadBoards() { + this.boardsEmitter.next([]); await this.publishBoards(true); } diff --git a/services/apps/alcs/src/alcs/board/board.service.ts b/services/apps/alcs/src/alcs/board/board.service.ts index 2f382fa983..d908b91c04 100644 --- a/services/apps/alcs/src/alcs/board/board.service.ts +++ b/services/apps/alcs/src/alcs/board/board.service.ts @@ -132,7 +132,10 @@ export class BoardService { ); await this.boardRepository.save(board); + await this.setBoardStatuses(board, updateDto); + } + private async setBoardStatuses(board: Board, updateDto: BoardDto) { await this.boardStatusRepository.delete({ board: { uuid: board.uuid, diff --git a/services/apps/alcs/test/pgtap/test_calculate_paused_time.sql b/services/apps/alcs/test/pgtap/test_calculate_paused_time.sql index 24ec6d115a..eefbcbc847 100644 --- a/services/apps/alcs/test/pgtap/test_calculate_paused_time.sql +++ b/services/apps/alcs/test/pgtap/test_calculate_paused_time.sql @@ -45,8 +45,8 @@ SELECT lives_ok('insert_card_status_in_test_calculate_paused', 'should insert ca -- create board prepare insert_board_in_test_calculate_paused AS -INSERT INTO alcs.board (uuid,audit_deleted_date_at,audit_created_at,audit_updated_at,audit_created_by,audit_updated_by,code,title,decision_maker) VALUES - ('11111111-1111-1111-1111-111111111111',NULL,'2022-08-24 13:49:58.829', NULL,'unit_test',NULL,'mock','Mock Panel','Mock Panel'); +INSERT INTO alcs.board (uuid,audit_deleted_date_at,audit_created_at,audit_updated_at,audit_created_by,audit_updated_by,code,title) VALUES + ('11111111-1111-1111-1111-111111111111',NULL,'2022-08-24 13:49:58.829', NULL,'unit_test',NULL,'mock','Mock Panel'); SELECT lives_ok('insert_board_in_test_calculate_paused', 'should insert board'); -- create card type From 8ef759c9126af5e82efac5fc1defbe59061640dd Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Wed, 12 Jul 2023 12:35:10 -0700 Subject: [PATCH 064/954] Add ability to show/hide boards from the Schedule page * Bug fixes for other stuff --- .../board-management-dialog.component.html | 14 ++++++-- .../board-management-dialog.component.scss | 6 +++- .../board-management-dialog.component.ts | 14 +++++--- .../pfrs-input/pfrs-input.component.spec.ts | 7 ++-- .../pofo-input/pofo-input.component.spec.ts | 7 ++-- .../roso-input/roso-input.component.spec.ts | 7 ++-- .../turp-input/turp-input.component.spec.ts | 7 ++-- .../lfng-info/lfng-info.component.spec.ts | 2 ++ .../parcel-prep/parcel-prep.component.spec.ts | 2 ++ .../proposal/proposal.component.spec.ts | 2 ++ .../features/board/board.component.spec.ts | 2 ++ .../admin-board-management.service.spec.ts | 10 ++++-- .../admin-board-management.service.ts | 6 ++-- .../src/app/services/board/board.dto.ts | 1 + .../notifications.component.spec.ts | 2 ++ .../meeting-overview.component.spec.ts | 1 + .../meeting-overview.component.ts | 4 +-- .../apps/alcs/src/alcs/board/board.dto.ts | 6 +++- .../apps/alcs/src/alcs/board/board.entity.ts | 4 +++ .../apps/alcs/src/alcs/board/board.service.ts | 8 ++++- ...89182264768-add_schedule_flag_to_boards.ts | 19 +++++++++++ .../1689182339001-seed_schedule_flags.ts | 32 +++++++++++++++++++ 22 files changed, 133 insertions(+), 30 deletions(-) create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1689182264768-add_schedule_flag_to_boards.ts create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1689182339001-seed_schedule_flags.ts diff --git a/alcs-frontend/src/app/features/admin/board-management/board-management-dialog/board-management-dialog.component.html b/alcs-frontend/src/app/features/admin/board-management/board-management-dialog/board-management-dialog.component.html index 017a910c67..692aa9ead9 100644 --- a/alcs-frontend/src/app/features/admin/board-management/board-management-dialog/board-management-dialog.component.html +++ b/alcs-frontend/src/app/features/admin/board-management/board-management-dialog/board-management-dialog.component.html @@ -30,12 +30,20 @@

{{ isEdit ? 'Edit' : 'Create' }} Board

+
+ Visible on Commissioner Schedule Page + + Yes + No + +
+
Click to add columns*

-
+
This section will update after the application is submitted.
-
+
Application not subject to Local/First Nation Government review.
@@ -50,8 +51,8 @@

Local/First Nation Gov Review

@@ -59,7 +60,11 @@

Local/First Nation Gov Review

{{ application.returnedComment }} No comment added
-
+

Contact Information

diff --git a/portal-frontend/src/app/features/view-submission/lfng-review/lfng-review.component.ts b/portal-frontend/src/app/features/view-submission/lfng-review/lfng-review.component.ts index 7f0a03317b..2e50a0957b 100644 --- a/portal-frontend/src/app/features/view-submission/lfng-review/lfng-review.component.ts +++ b/portal-frontend/src/app/features/view-submission/lfng-review/lfng-review.component.ts @@ -11,7 +11,7 @@ import { ApplicationSubmissionReviewDto } from '../../../services/application-su import { ApplicationSubmissionReviewService } from '../../../services/application-submission-review/application-submission-review.service'; import { ApplicationSubmissionDetailedDto, - APPLICATION_STATUS, + SUBMISSION_STATUS, } from '../../../services/application-submission/application-submission.dto'; import { PdfGenerationService } from '../../../services/pdf-generation/pdf-generation.service'; @@ -30,7 +30,7 @@ export class LfngReviewComponent implements OnInit, OnDestroy { application: ApplicationSubmissionDetailedDto | undefined; applicationReview: ApplicationSubmissionReviewDto | undefined; - APPLICATION_STATUS = APPLICATION_STATUS; + SUBMISSION_STATUS = SUBMISSION_STATUS; staffReport: ApplicationDocumentDto[] = []; resolutionDocument: ApplicationDocumentDto[] = []; governmentOtherAttachments: ApplicationDocumentDto[] = []; @@ -84,10 +84,10 @@ export class LfngReviewComponent implements OnInit, OnDestroy { if ( this.application && this.application.typeCode !== 'TURP' && - ([APPLICATION_STATUS.SUBMITTED_TO_ALC, APPLICATION_STATUS.REFUSED_TO_FORWARD].includes( + ([SUBMISSION_STATUS.SUBMITTED_TO_ALC, SUBMISSION_STATUS.REFUSED_TO_FORWARD_LG].includes( this.application.status.code ) || - (this.application.status.code === APPLICATION_STATUS.IN_REVIEW && this.application.canReview)) + (this.application.status.code === SUBMISSION_STATUS.IN_REVIEW_BY_LG && this.application.canReview)) ) { await this.applicationReviewService.getByFileId(this.application.fileNumber); } else { @@ -103,7 +103,7 @@ export class LfngReviewComponent implements OnInit, OnDestroy { } async onReview(fileId: string) { - if (this.application?.status.code === APPLICATION_STATUS.SUBMITTED_TO_LG) { + if (this.application?.status.code === SUBMISSION_STATUS.SUBMITTED_TO_LG) { const review = await this.applicationReviewService.startReview(fileId); if (!review) { return; diff --git a/portal-frontend/src/app/features/view-submission/view-submission.component.html b/portal-frontend/src/app/features/view-submission/view-submission.component.html index 367e444f31..3990a744a8 100644 --- a/portal-frontend/src/app/features/view-submission/view-submission.component.html +++ b/portal-frontend/src/app/features/view-submission/view-submission.component.html @@ -243,13 +243,13 @@

Application

diff --git a/alcs-frontend/src/app/features/application/review/decision-meeting/decision-meeting.component.scss b/alcs-frontend/src/app/features/application/review/decision-meeting/decision-meeting.component.scss index ff7aaca559..c4b9b5fafb 100644 --- a/alcs-frontend/src/app/features/application/review/decision-meeting/decision-meeting.component.scss +++ b/alcs-frontend/src/app/features/application/review/decision-meeting/decision-meeting.component.scss @@ -38,3 +38,15 @@ width: 21%; text-align: right; } + +.icon { + margin-top: 4px; + height: 20px; + width: 20px; + font-size: 20px; +} + +.label-wrapper { + display: flex; + gap: 8px; +} diff --git a/alcs-frontend/src/app/features/application/review/review.component.html b/alcs-frontend/src/app/features/application/review/review.component.html index e3c4f11bc7..daec1fc246 100644 --- a/alcs-frontend/src/app/features/application/review/review.component.html +++ b/alcs-frontend/src/app/features/application/review/review.component.html @@ -1,10 +1,7 @@

Review

-
'Ready for Review' Notification Sent to Applicant
- +
Applicant Notified to Review Evidentiary Record
+
From 009de2ec11f54015b9e366ba84f3f47087ab3c4e Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Mon, 17 Jul 2023 16:02:13 -0700 Subject: [PATCH 081/954] added statuses controller (#788) --- .../application-submission-status.dto.ts | 21 ++++++ ...lication-submission-status.service.spec.ts | 68 +++++++++++++++++++ .../application-submission-status.service.ts | 27 ++++++++ .../details-header.component.html | 4 ++ services/apps/alcs/src/alcs/alcs.module.ts | 2 + ...ation-submission-status.controller.spec.ts | 67 ++++++++++++++++++ ...pplication-submission-status.controller.ts | 31 +++++++++ .../application-submission-status.module.ts | 2 + .../submission-status.dto.ts | 18 +++++ ...plication-submission.automapper.profile.ts | 27 +++++++- 10 files changed, 266 insertions(+), 1 deletion(-) create mode 100644 alcs-frontend/src/app/services/application/application-submission-status/application-submission-status.dto.ts create mode 100644 alcs-frontend/src/app/services/application/application-submission-status/application-submission-status.service.spec.ts create mode 100644 alcs-frontend/src/app/services/application/application-submission-status/application-submission-status.service.ts create mode 100644 services/apps/alcs/src/application-submission-status/application-submission-status.controller.spec.ts create mode 100644 services/apps/alcs/src/application-submission-status/application-submission-status.controller.ts diff --git a/alcs-frontend/src/app/services/application/application-submission-status/application-submission-status.dto.ts b/alcs-frontend/src/app/services/application/application-submission-status/application-submission-status.dto.ts new file mode 100644 index 0000000000..41d2d17381 --- /dev/null +++ b/alcs-frontend/src/app/services/application/application-submission-status/application-submission-status.dto.ts @@ -0,0 +1,21 @@ +import { BaseCodeDto } from '../../../shared/dto/base.dto'; + +export interface ApplicationStatusDto extends BaseCodeDto { + alcsBackgroundColor: string; + + alcsColor: string; + + portalBackgroundColor: string; + + portalColor: string; +} + +export interface ApplicationSubmissionToSubmissionStatusDto { + submissionUuid: string; + + effectiveDate: number; + + statusTypeCode: string; + + status: ApplicationStatusDto; +} diff --git a/alcs-frontend/src/app/services/application/application-submission-status/application-submission-status.service.spec.ts b/alcs-frontend/src/app/services/application/application-submission-status/application-submission-status.service.spec.ts new file mode 100644 index 0000000000..56843beb9d --- /dev/null +++ b/alcs-frontend/src/app/services/application/application-submission-status/application-submission-status.service.spec.ts @@ -0,0 +1,68 @@ +import { HttpClient } from '@angular/common/http'; +import { TestBed } from '@angular/core/testing'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { of, throwError } from 'rxjs'; +import { ToastService } from '../../toast/toast.service'; +import { ApplicationSubmissionStatusService } from './application-submission-status.service'; + +describe('ApplicationSubmissionStatusService', () => { + let service: ApplicationSubmissionStatusService; + let mockHttpClient: DeepMocked; + let mockToastService: DeepMocked; + + beforeEach(() => { + mockToastService = createMock(); + mockHttpClient = createMock(); + + TestBed.configureTestingModule({ + providers: [ + { + provide: HttpClient, + useValue: mockHttpClient, + }, + { + provide: ToastService, + useValue: mockToastService, + }, + ], + }); + service = TestBed.inject(ApplicationSubmissionStatusService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); + + it('should fetch statuses by fileNumber', async () => { + mockHttpClient.get.mockReturnValue( + of([ + { + submissionUuid: 'fake', + }, + ]) + ); + + const res = await service.fetchSubmissionStatusesByFileNumber('1'); + + expect(mockHttpClient.get).toHaveBeenCalledTimes(1); + expect(res.length).toEqual(1); + expect(res[0].submissionUuid).toEqual('fake'); + }); + + it('should show a toast message if fetch statuses by fileNumber fails', async () => { + mockHttpClient.get.mockReturnValue( + throwError(() => { + new Error(''); + }) + ); + + try { + await service.fetchSubmissionStatusesByFileNumber('1'); + } catch { + // suppress error message + } + + expect(mockHttpClient.get).toHaveBeenCalledTimes(1); + expect(mockToastService.showErrorToast).toHaveBeenCalledTimes(1); + }); +}); diff --git a/alcs-frontend/src/app/services/application/application-submission-status/application-submission-status.service.ts b/alcs-frontend/src/app/services/application/application-submission-status/application-submission-status.service.ts new file mode 100644 index 0000000000..ff9bcb460a --- /dev/null +++ b/alcs-frontend/src/app/services/application/application-submission-status/application-submission-status.service.ts @@ -0,0 +1,27 @@ +import { HttpClient } from '@angular/common/http'; +import { Injectable } from '@angular/core'; +import { firstValueFrom } from 'rxjs'; +import { environment } from '../../../../environments/environment'; +import { ToastService } from '../../toast/toast.service'; +import { ApplicationSubmissionToSubmissionStatusDto } from './application-submission-status.dto'; + +@Injectable({ + providedIn: 'root', +}) +export class ApplicationSubmissionStatusService { + private baseUrl = `${environment.apiUrl}/application-submission-status`; + + constructor(private http: HttpClient, private toastService: ToastService) {} + + async fetchSubmissionStatusesByFileNumber(fileNumber: string): Promise { + try { + const result = await firstValueFrom( + this.http.get(`${this.baseUrl}/${fileNumber}`) + ); + return result + } catch (e) { + this.toastService.showErrorToast('Failed to fetch Application Submission Statuses'); + throw e; + } + } +} diff --git a/alcs-frontend/src/app/shared/details-header/details-header.component.html b/alcs-frontend/src/app/shared/details-header/details-header.component.html index 4b92906c85..c6042d1263 100644 --- a/alcs-frontend/src/app/shared/details-header/details-header.component.html +++ b/alcs-frontend/src/app/shared/details-header/details-header.component.html @@ -49,5 +49,9 @@
{{ _application.fileNumber }} ({{ _application.applicant }})
{{ days }}:
+
+ + +
diff --git a/services/apps/alcs/src/alcs/alcs.module.ts b/services/apps/alcs/src/alcs/alcs.module.ts index e39d3c03ed..645cbe05ec 100644 --- a/services/apps/alcs/src/alcs/alcs.module.ts +++ b/services/apps/alcs/src/alcs/alcs.module.ts @@ -1,5 +1,6 @@ import { Module } from '@nestjs/common'; import { RouterModule } from '@nestjs/core'; +import { ApplicationSubmissionStatusModule } from '../application-submission-status/application-submission-status.module'; import { AdminModule } from './admin/admin.module'; import { ApplicationDecisionModule } from './application-decision/application-decision.module'; import { ApplicationModule } from './application/application.module'; @@ -54,6 +55,7 @@ import { StaffJournalModule } from './staff-journal/staff-journal.module'; { path: 'alcs', module: NoticeOfIntentDecisionModule }, { path: 'alcs', module: StaffJournalModule }, { path: 'alcs', module: SearchModule }, + { path: 'alcs', module: ApplicationSubmissionStatusModule }, ]), ], controllers: [], diff --git a/services/apps/alcs/src/application-submission-status/application-submission-status.controller.spec.ts b/services/apps/alcs/src/application-submission-status/application-submission-status.controller.spec.ts new file mode 100644 index 0000000000..c883e5ac65 --- /dev/null +++ b/services/apps/alcs/src/application-submission-status/application-submission-status.controller.spec.ts @@ -0,0 +1,67 @@ +import { classes } from '@automapper/classes'; +import { AutomapperModule } from '@automapper/nestjs'; +import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; +import { Test, TestingModule } from '@nestjs/testing'; +import { ClsService } from 'nestjs-cls'; +import { mockKeyCloakProviders } from '../../test/mocks/mockTypes'; +import { ApplicationSubmissionProfile } from '../common/automapper/application-submission.automapper.profile'; +import { ApplicationSubmissionStatusController } from './application-submission-status.controller'; +import { ApplicationSubmissionStatusService } from './application-submission-status.service'; +import { ApplicationSubmissionToSubmissionStatus } from './submission-status.entity'; + +describe('ApplicationSubmissionStatusController', () => { + let controller: ApplicationSubmissionStatusController; + let mockApplicationSubmissionStatusService: DeepMocked; + + beforeEach(async () => { + mockApplicationSubmissionStatusService = createMock(); + + const module: TestingModule = await Test.createTestingModule({ + controllers: [ApplicationSubmissionStatusController], + providers: [ + ApplicationSubmissionProfile, + { + provide: ApplicationSubmissionStatusService, + useValue: mockApplicationSubmissionStatusService, + }, + { + provide: ClsService, + useValue: {}, + }, + ...mockKeyCloakProviders, + ], + imports: [ + AutomapperModule.forRoot({ + strategyInitializer: classes(), + }), + ], + }).compile(); + + controller = module.get( + ApplicationSubmissionStatusController, + ); + }); + + it('should be defined', () => { + expect(controller).toBeDefined(); + }); + + it('should call service to get statuses by file number', async () => { + const fakeFileNumber = 'fake'; + + mockApplicationSubmissionStatusService.getCurrentStatusesByFileNumber.mockResolvedValue( + [new ApplicationSubmissionToSubmissionStatus()], + ); + + const result = await controller.getStatusesByFileNumber(fakeFileNumber); + + expect( + mockApplicationSubmissionStatusService.getCurrentStatusesByFileNumber, + ).toBeCalledTimes(1); + expect( + mockApplicationSubmissionStatusService.getCurrentStatusesByFileNumber, + ).toBeCalledWith(fakeFileNumber); + expect(result.length).toEqual(1); + expect(result).toBeDefined(); + }); +}); diff --git a/services/apps/alcs/src/application-submission-status/application-submission-status.controller.ts b/services/apps/alcs/src/application-submission-status/application-submission-status.controller.ts new file mode 100644 index 0000000000..edb6112fdb --- /dev/null +++ b/services/apps/alcs/src/application-submission-status/application-submission-status.controller.ts @@ -0,0 +1,31 @@ +import { Mapper } from '@automapper/core'; +import { InjectMapper } from '@automapper/nestjs'; +import { Controller, Get, Param } from '@nestjs/common'; +import { ANY_AUTH_ROLE } from '../common/authorization/roles'; +import { UserRoles } from '../common/authorization/roles.decorator'; +import { ApplicationSubmissionStatusService } from './application-submission-status.service'; +import { ApplicationSubmissionToSubmissionStatusDto } from './submission-status.dto'; +import { ApplicationSubmissionToSubmissionStatus } from './submission-status.entity'; + +@Controller('application-submission-status') +@UserRoles(...ANY_AUTH_ROLE) +export class ApplicationSubmissionStatusController { + constructor( + private applicationSubmissionStatusService: ApplicationSubmissionStatusService, + @InjectMapper() private mapper: Mapper, + ) {} + + @Get('/:fileNumber') + async getStatusesByFileNumber(@Param('fileNumber') fileNumber) { + const statuses = + await this.applicationSubmissionStatusService.getCurrentStatusesByFileNumber( + fileNumber, + ); + + return this.mapper.mapArrayAsync( + statuses, + ApplicationSubmissionToSubmissionStatus, + ApplicationSubmissionToSubmissionStatusDto, + ); + } +} diff --git a/services/apps/alcs/src/application-submission-status/application-submission-status.module.ts b/services/apps/alcs/src/application-submission-status/application-submission-status.module.ts index 201148ae4f..bc55e7395d 100644 --- a/services/apps/alcs/src/application-submission-status/application-submission-status.module.ts +++ b/services/apps/alcs/src/application-submission-status/application-submission-status.module.ts @@ -4,6 +4,7 @@ import { ApplicationSubmission } from '../portal/application-submission/applicat import { ApplicationSubmissionStatusService } from './application-submission-status.service'; import { ApplicationSubmissionStatusType } from './submission-status-type.entity'; import { ApplicationSubmissionToSubmissionStatus } from './submission-status.entity'; +import { ApplicationSubmissionStatusController } from './application-submission-status.controller'; @Module({ imports: [ @@ -15,5 +16,6 @@ import { ApplicationSubmissionToSubmissionStatus } from './submission-status.ent ], providers: [ApplicationSubmissionStatusService], exports: [ApplicationSubmissionStatusService], + controllers: [ApplicationSubmissionStatusController], }) export class ApplicationSubmissionStatusModule {} diff --git a/services/apps/alcs/src/application-submission-status/submission-status.dto.ts b/services/apps/alcs/src/application-submission-status/submission-status.dto.ts index b05a18baa1..17ae9b3b7d 100644 --- a/services/apps/alcs/src/application-submission-status/submission-status.dto.ts +++ b/services/apps/alcs/src/application-submission-status/submission-status.dto.ts @@ -16,6 +16,7 @@ export enum SUBMISSION_STATUS { CANCELLED = 'CANC', } +// TODO rename to better reflect the origin? export class ApplicationStatusDto extends BaseCodeDto { @AutoMap() alcsBackgroundColor: string; @@ -28,4 +29,21 @@ export class ApplicationStatusDto extends BaseCodeDto { @AutoMap() portalColor: string; + + @AutoMap() + weight: number; +} + +export class ApplicationSubmissionToSubmissionStatusDto { + @AutoMap() + submissionUuid: string; + + @AutoMap() + effectiveDate: number; + + @AutoMap() + statusTypeCode: string; + + @AutoMap(() => ApplicationStatusDto) + status: ApplicationStatusDto; } diff --git a/services/apps/alcs/src/common/automapper/application-submission.automapper.profile.ts b/services/apps/alcs/src/common/automapper/application-submission.automapper.profile.ts index eff296ef30..412c0bde4d 100644 --- a/services/apps/alcs/src/common/automapper/application-submission.automapper.profile.ts +++ b/services/apps/alcs/src/common/automapper/application-submission.automapper.profile.ts @@ -3,7 +3,11 @@ import { AutomapperProfile, InjectMapper } from '@automapper/nestjs'; import { Injectable } from '@nestjs/common'; import { AlcsApplicationSubmissionDto } from '../../alcs/application/application.dto'; import { ApplicationSubmissionStatusType } from '../../application-submission-status/submission-status-type.entity'; -import { ApplicationStatusDto } from '../../application-submission-status/submission-status.dto'; +import { + ApplicationStatusDto, + ApplicationSubmissionToSubmissionStatusDto, +} from '../../application-submission-status/submission-status.dto'; +import { ApplicationSubmissionToSubmissionStatus } from '../../application-submission-status/submission-status.entity'; import { ApplicationOwnerDetailedDto, ApplicationOwnerDto, @@ -147,6 +151,27 @@ export class ApplicationSubmissionProfile extends AutomapperProfile { }), ), ); + createMap( + mapper, + ApplicationSubmissionToSubmissionStatus, + ApplicationSubmissionToSubmissionStatusDto, + forMember( + (a) => a.effectiveDate, + mapFrom((ad) => { + return ad.effectiveDate?.getTime(); + }), + ), + forMember( + (a) => a.status, + mapFrom((ad) => { + return this.mapper.map( + ad.statusType, + ApplicationSubmissionStatusType, + ApplicationStatusDto, + ); + }), + ), + ); }; } } From fc898217f9bd893711bd188eaeb86201222b29e9 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Mon, 17 Jul 2023 16:34:40 -0700 Subject: [PATCH 082/954] Add Cancel / Uncancel Application --- .../release-dialog.component.spec.ts | 4 +- .../release-dialog.component.ts | 5 +-- .../revert-to-draft-dialog.component.spec.ts | 4 +- .../revert-to-draft-dialog.component.ts | 4 +- .../overview/overview.component.html | 14 +++++- .../overview/overview.component.spec.ts | 10 +++++ .../overview/overview.component.ts | 45 ++++++++++++++++++- .../application/application-code.dto.ts | 7 ++- .../application/application-detail.service.ts | 8 ++++ .../application-reconsideration.dto.ts | 8 +++- .../services/application/application.dto.ts | 1 + .../application/application.service.ts | 26 +++++++++-- .../application-type-pill.component.ts | 2 +- .../confirmation-dialog.component.html | 4 +- .../confirmation-dialog.component.ts | 2 + .../application.controller.spec.ts | 14 ++++++ .../application/application.controller.ts | 12 +++++ .../application/application.service.spec.ts | 29 ++++++++++++ .../alcs/application/application.service.ts | 17 +++++++ 19 files changed, 194 insertions(+), 22 deletions(-) diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/release-dialog/release-dialog.component.spec.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/release-dialog/release-dialog.component.spec.ts index 5592ff43ef..8d84a61e44 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/release-dialog/release-dialog.component.spec.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/release-dialog/release-dialog.component.spec.ts @@ -3,7 +3,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { BehaviorSubject } from 'rxjs'; -import { ApplicationStatusTypeDto } from '../../../../../services/application/application-reconsideration/application-reconsideration.dto'; +import { ApplicationStatusDto } from '../../../../../services/application/application-reconsideration/application-reconsideration.dto'; import { ApplicationService } from '../../../../../services/application/application.service'; import { ReleaseDialogComponent } from './release-dialog.component'; @@ -15,7 +15,7 @@ describe('ReleaseDialogComponent', () => { beforeEach(async () => { mockApplicationService = createMock(); - mockApplicationService.$applicationStatuses = new BehaviorSubject([]); + mockApplicationService.$applicationStatuses = new BehaviorSubject([]); await TestBed.configureTestingModule({ declarations: [ReleaseDialogComponent], diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/release-dialog/release-dialog.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/release-dialog/release-dialog.component.ts index 8030370c17..7f4a3dddbf 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/release-dialog/release-dialog.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/release-dialog/release-dialog.component.ts @@ -1,9 +1,8 @@ import { Component, Inject, OnDestroy, OnInit } from '@angular/core'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { Subject, takeUntil } from 'rxjs'; -import { ApplicationStatusTypeDto } from '../../../../../services/application/application-reconsideration/application-reconsideration.dto'; +import { ApplicationStatusDto } from '../../../../../services/application/application-reconsideration/application-reconsideration.dto'; import { ApplicationService } from '../../../../../services/application/application.service'; -import { CeoCriterionDto } from '../../../../../services/application/decision/application-decision-v1/application-decision.dto'; @Component({ selector: 'app-release-dialog', @@ -13,7 +12,7 @@ import { CeoCriterionDto } from '../../../../../services/application/decision/ap export class ReleaseDialogComponent implements OnInit, OnDestroy { $destroy = new Subject(); - statuses: ApplicationStatusTypeDto[] = []; + statuses: ApplicationStatusDto[] = []; selectedApplicationStatus = ''; wasReleased = false; diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/revert-to-draft-dialog/revert-to-draft-dialog.component.spec.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/revert-to-draft-dialog/revert-to-draft-dialog.component.spec.ts index 217f6750bc..e35aa1b6ad 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/revert-to-draft-dialog/revert-to-draft-dialog.component.spec.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/revert-to-draft-dialog/revert-to-draft-dialog.component.spec.ts @@ -3,7 +3,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MatDialogRef } from '@angular/material/dialog'; import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { BehaviorSubject } from 'rxjs'; -import { ApplicationStatusTypeDto } from '../../../../../services/application/application-reconsideration/application-reconsideration.dto'; +import { ApplicationStatusDto } from '../../../../../services/application/application-reconsideration/application-reconsideration.dto'; import { ApplicationService } from '../../../../../services/application/application.service'; import { RevertToDraftDialogComponent } from './revert-to-draft-dialog.component'; @@ -15,7 +15,7 @@ describe('RevertToDraftDialogComponent', () => { beforeEach(async () => { mockApplicationService = createMock(); - mockApplicationService.$applicationStatuses = new BehaviorSubject([]); + mockApplicationService.$applicationStatuses = new BehaviorSubject([]); await TestBed.configureTestingModule({ declarations: [RevertToDraftDialogComponent], diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/revert-to-draft-dialog/revert-to-draft-dialog.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/revert-to-draft-dialog/revert-to-draft-dialog.component.ts index 248d3abe08..f19da034e5 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/revert-to-draft-dialog/revert-to-draft-dialog.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/revert-to-draft-dialog/revert-to-draft-dialog.component.ts @@ -1,7 +1,7 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; import { MatDialogRef } from '@angular/material/dialog'; import { Subject, takeUntil } from 'rxjs'; -import { ApplicationStatusTypeDto } from '../../../../../services/application/application-reconsideration/application-reconsideration.dto'; +import { ApplicationStatusDto } from '../../../../../services/application/application-reconsideration/application-reconsideration.dto'; import { ApplicationService } from '../../../../../services/application/application.service'; @Component({ @@ -12,7 +12,7 @@ import { ApplicationService } from '../../../../../services/application/applicat export class RevertToDraftDialogComponent implements OnInit, OnDestroy { $destroy = new Subject(); - statuses: ApplicationStatusTypeDto[] = []; + statuses: ApplicationStatusDto[] = []; selectedApplicationStatus = ''; constructor( diff --git a/alcs-frontend/src/app/features/application/overview/overview.component.html b/alcs-frontend/src/app/features/application/overview/overview.component.html index b0245dfe5a..939a9f5ed1 100644 --- a/alcs-frontend/src/app/features/application/overview/overview.component.html +++ b/alcs-frontend/src/app/features/application/overview/overview.component.html @@ -1,4 +1,14 @@ -

Overview

+
+

Overview

+
+ + +
+
Proposal Summary
Proposal Summary >
- +
Application Event Timeline
diff --git a/alcs-frontend/src/app/features/application/overview/overview.component.spec.ts b/alcs-frontend/src/app/features/application/overview/overview.component.spec.ts index 5dc73f26e6..260dcac99c 100644 --- a/alcs-frontend/src/app/features/application/overview/overview.component.spec.ts +++ b/alcs-frontend/src/app/features/application/overview/overview.component.spec.ts @@ -1,5 +1,6 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { MatDialog } from '@angular/material/dialog'; import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { BehaviorSubject } from 'rxjs'; import { ApplicationDetailService } from '../../../services/application/application-detail.service'; @@ -7,6 +8,7 @@ import { ApplicationMeetingService } from '../../../services/application/applica import { ApplicationModificationService } from '../../../services/application/application-modification/application-modification.service'; import { ApplicationReconsiderationService } from '../../../services/application/application-reconsideration/application-reconsideration.service'; import { ApplicationReviewService } from '../../../services/application/application-review/application-review.service'; +import { ApplicationSubmissionStatusService } from '../../../services/application/application-submission-status/application-submission-status.service'; import { ApplicationDto } from '../../../services/application/application.dto'; import { ApplicationDecisionService } from '../../../services/application/decision/application-decision-v1/application-decision.service'; @@ -49,6 +51,14 @@ describe('OverviewComponent', () => { fetch: jest.fn(), }, }, + { + provide: MatDialog, + useValue: {}, + }, + { + provide: ApplicationSubmissionStatusService, + useValue: {}, + }, ], declarations: [OverviewComponent], schemas: [NO_ERRORS_SCHEMA], diff --git a/alcs-frontend/src/app/features/application/overview/overview.component.ts b/alcs-frontend/src/app/features/application/overview/overview.component.ts index c53ea841f0..e1b9537014 100644 --- a/alcs-frontend/src/app/features/application/overview/overview.component.ts +++ b/alcs-frontend/src/app/features/application/overview/overview.component.ts @@ -8,9 +8,11 @@ import { ApplicationModificationService } from '../../../services/application/ap import { ApplicationReconsiderationDto } from '../../../services/application/application-reconsideration/application-reconsideration.dto'; import { ApplicationReconsiderationService } from '../../../services/application/application-reconsideration/application-reconsideration.service'; import { ApplicationReviewService } from '../../../services/application/application-review/application-review.service'; -import { ApplicationDto, ApplicationReviewDto } from '../../../services/application/application.dto'; +import { ApplicationSubmissionStatusService } from '../../../services/application/application-submission-status/application-submission-status.service'; +import { ApplicationDto, ApplicationReviewDto, SUBMISSION_STATUS } from '../../../services/application/application.dto'; import { ApplicationDecisionDto } from '../../../services/application/decision/application-decision-v1/application-decision.dto'; import { ApplicationDecisionService } from '../../../services/application/decision/application-decision-v1/application-decision.service'; +import { ConfirmationDialogService } from '../../../shared/confirmation-dialog/confirmation-dialog.service'; import { TimelineEvent } from '../../../shared/timeline/timeline.component'; const editLink = new Map([ @@ -48,6 +50,7 @@ export class OverviewComponent implements OnInit, OnDestroy { private $review = new BehaviorSubject(undefined); events: TimelineEvent[] = []; summary = ''; + isCancelled = false; constructor( private applicationDetailService: ApplicationDetailService, @@ -55,7 +58,9 @@ export class OverviewComponent implements OnInit, OnDestroy { private decisionService: ApplicationDecisionService, private reconsiderationService: ApplicationReconsiderationService, private modificationService: ApplicationModificationService, - private reviewService: ApplicationReviewService + private reviewService: ApplicationReviewService, + private confirmationDialogService: ConfirmationDialogService, + private applicationSubmissionStatusService: ApplicationSubmissionStatusService ) {} ngOnInit(): void { @@ -66,6 +71,7 @@ export class OverviewComponent implements OnInit, OnDestroy { if (app) { this.clearComponentData(); + this.loadStatusHistory(app.fileNumber); this.meetingService.fetch(app.fileNumber); this.decisionService.fetchByApplication(app.fileNumber).then((res) => { this.$decisions.next(res); @@ -114,6 +120,34 @@ export class OverviewComponent implements OnInit, OnDestroy { this.$review.next(undefined); } + async onCancelApplication() { + this.confirmationDialogService + .openDialog({ + body: `Are you sure you want to cancel this Application?`, + cancelButtonText: 'No', + }) + .subscribe(async (didConfirm) => { + if (didConfirm && this.application) { + await this.applicationDetailService.cancelApplication(this.application.fileNumber); + await this.loadStatusHistory(this.application.fileNumber); + } + }); + } + + async onUncancelApplication() { + this.confirmationDialogService + .openDialog({ + body: `Are you sure you want to uncancel this Application?`, + cancelButtonText: 'No', + }) + .subscribe(async (didConfirm) => { + if (didConfirm && this.application) { + await this.applicationDetailService.uncancelApplication(this.application.fileNumber); + await this.loadStatusHistory(this.application.fileNumber); + } + }); + } + private mapApplicationToEvents( application: ApplicationDto, meetings: ApplicationMeetingDto[], @@ -310,4 +344,11 @@ export class OverviewComponent implements OnInit, OnDestroy { }); } } + + private async loadStatusHistory(fileNumber: string) { + const statusHistory = await this.applicationSubmissionStatusService.fetchSubmissionStatusesByFileNumber(fileNumber); + this.isCancelled = + statusHistory.filter((status) => status.effectiveDate && status.statusTypeCode === SUBMISSION_STATUS.CANCELLED) + .length > 0; + } } diff --git a/alcs-frontend/src/app/services/application/application-code.dto.ts b/alcs-frontend/src/app/services/application/application-code.dto.ts index cd1b3c5b80..670140a87f 100644 --- a/alcs-frontend/src/app/services/application/application-code.dto.ts +++ b/alcs-frontend/src/app/services/application/application-code.dto.ts @@ -1,5 +1,8 @@ import { BaseCodeDto } from '../../shared/dto/base.dto'; -import { ApplicationStatusTypeDto, ReconsiderationTypeDto } from './application-reconsideration/application-reconsideration.dto'; +import { + ApplicationStatusDto, + ReconsiderationTypeDto, +} from './application-reconsideration/application-reconsideration.dto'; export interface CardStatusDto extends BaseCodeDto {} export interface ApplicationRegionDto extends BaseCodeDto {} @@ -15,5 +18,5 @@ export interface ApplicationMasterCodesDto { status: CardStatusDto[]; region: ApplicationRegionDto[]; reconsiderationType: ReconsiderationTypeDto[]; - applicationStatusType: ApplicationStatusTypeDto[]; + applicationStatusType: ApplicationStatusDto[]; } diff --git a/alcs-frontend/src/app/services/application/application-detail.service.ts b/alcs-frontend/src/app/services/application/application-detail.service.ts index 28c887eaaf..98a3619396 100644 --- a/alcs-frontend/src/app/services/application/application-detail.service.ts +++ b/alcs-frontend/src/app/services/application/application-detail.service.ts @@ -31,4 +31,12 @@ export class ApplicationDetailService { } return updatedApp; } + + cancelApplication(fileNumber: string) { + return this.applicationService.cancelApplication(fileNumber); + } + + uncancelApplication(fileNumber: string) { + return this.applicationService.uncancelApplication(fileNumber); + } } diff --git a/alcs-frontend/src/app/services/application/application-reconsideration/application-reconsideration.dto.ts b/alcs-frontend/src/app/services/application/application-reconsideration/application-reconsideration.dto.ts index 8be327efb9..f88364d34e 100644 --- a/alcs-frontend/src/app/services/application/application-reconsideration/application-reconsideration.dto.ts +++ b/alcs-frontend/src/app/services/application/application-reconsideration/application-reconsideration.dto.ts @@ -16,7 +16,13 @@ export interface ReconsiderationTypeDto extends BaseCodeDto { export interface ReconsiderationReviewOutcomeTypeDto extends BaseCodeDto {} -export interface ApplicationStatusTypeDto extends BaseCodeDto {} +export interface ApplicationStatusDto extends BaseCodeDto { + alcsBackgroundColor: string; + alcsColor: string; + portalBackgroundColor: string; + portalColor: string; + weight: number; +} export interface ApplicationForReconsiderationDto { fileNumber: string; diff --git a/alcs-frontend/src/app/services/application/application.dto.ts b/alcs-frontend/src/app/services/application/application.dto.ts index 21fff0b0a2..2054b4edcc 100644 --- a/alcs-frontend/src/app/services/application/application.dto.ts +++ b/alcs-frontend/src/app/services/application/application.dto.ts @@ -26,6 +26,7 @@ export enum SUBMISSION_STATUS { IN_REVIEW_BY_ALC = 'REVA', //new Under Review by ALC ALC_DECISION = 'ALCD', // Decision Released REFUSED_TO_FORWARD_LG = 'RFFG', //new L/FNG Refused to Forward + CANCELLED = 'CANC', //Cancelled } export interface ApplicationStatus extends BaseCodeDto { diff --git a/alcs-frontend/src/app/services/application/application.service.ts b/alcs-frontend/src/app/services/application/application.service.ts index b3ad66e892..67e5d5f54d 100644 --- a/alcs-frontend/src/app/services/application/application.service.ts +++ b/alcs-frontend/src/app/services/application/application.service.ts @@ -9,7 +9,7 @@ import { ApplicationTypeDto, CardStatusDto, } from './application-code.dto'; -import { ApplicationStatusTypeDto } from './application-reconsideration/application-reconsideration.dto'; +import { ApplicationStatusDto } from './application-reconsideration/application-reconsideration.dto'; import { ApplicationDto, CreateApplicationDto, UpdateApplicationDto } from './application.dto'; @Injectable({ @@ -21,13 +21,13 @@ export class ApplicationService { public $cardStatuses = new BehaviorSubject([]); public $applicationTypes = new BehaviorSubject([]); public $applicationRegions = new BehaviorSubject([]); - public $applicationStatuses = new BehaviorSubject([]); + public $applicationStatuses = new BehaviorSubject([]); private baseUrl = `${environment.apiUrl}/application`; private statuses: CardStatusDto[] = []; private types: ApplicationTypeDto[] = []; private regions: ApplicationRegionDto[] = []; - private applicationStatuses: ApplicationStatusTypeDto[] = []; + private applicationStatuses: ApplicationStatusDto[] = []; private isInitialized = false; async fetchApplication(fileNumber: string): Promise { @@ -100,4 +100,24 @@ export class ApplicationService { this.applicationStatuses = codes.applicationStatusType; this.$applicationStatuses.next(this.applicationStatuses); } + + async cancelApplication(fileNumber: string) { + await this.setup(); + try { + return await firstValueFrom(this.http.post(`${this.baseUrl}/${fileNumber}/cancel`, {})); + } catch (e) { + this.toastService.showErrorToast('Failed to cancel Application'); + } + return; + } + + async uncancelApplication(fileNumber: string) { + await this.setup(); + try { + return await firstValueFrom(this.http.post(`${this.baseUrl}/${fileNumber}/uncancel`, {})); + } catch (e) { + this.toastService.showErrorToast('Failed to uncancel Application'); + } + return; + } } diff --git a/alcs-frontend/src/app/shared/application-type-pill/application-type-pill.component.ts b/alcs-frontend/src/app/shared/application-type-pill/application-type-pill.component.ts index 76f52e6d01..ca9df0977f 100644 --- a/alcs-frontend/src/app/shared/application-type-pill/application-type-pill.component.ts +++ b/alcs-frontend/src/app/shared/application-type-pill/application-type-pill.component.ts @@ -9,7 +9,7 @@ export type ApplicationPill = { }; @Component({ - selector: 'app-application-type-pill', + selector: 'app-application-type-pill[type]', templateUrl: './application-type-pill.component.html', styleUrls: ['./application-type-pill.component.scss'], }) diff --git a/alcs-frontend/src/app/shared/confirmation-dialog/confirmation-dialog.component.html b/alcs-frontend/src/app/shared/confirmation-dialog/confirmation-dialog.component.html index a7c1a758a2..1385a75812 100644 --- a/alcs-frontend/src/app/shared/confirmation-dialog/confirmation-dialog.component.html +++ b/alcs-frontend/src/app/shared/confirmation-dialog/confirmation-dialog.component.html @@ -2,6 +2,6 @@

{{ data.body }}

- - + +
diff --git a/alcs-frontend/src/app/shared/confirmation-dialog/confirmation-dialog.component.ts b/alcs-frontend/src/app/shared/confirmation-dialog/confirmation-dialog.component.ts index cca86acfcf..4795215ad0 100644 --- a/alcs-frontend/src/app/shared/confirmation-dialog/confirmation-dialog.component.ts +++ b/alcs-frontend/src/app/shared/confirmation-dialog/confirmation-dialog.component.ts @@ -3,6 +3,8 @@ import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; export interface DialogData { body: string; + yesButtonText?: string; + cancelButtonText?: string; } @Component({ diff --git a/services/apps/alcs/src/alcs/application/application.controller.spec.ts b/services/apps/alcs/src/alcs/application/application.controller.spec.ts index a58326ec84..b519566dbe 100644 --- a/services/apps/alcs/src/alcs/application/application.controller.spec.ts +++ b/services/apps/alcs/src/alcs/application/application.controller.spec.ts @@ -367,4 +367,18 @@ describe('ApplicationController', () => { expect(applicationService.getOrFail).toBeCalledTimes(1); expect(applicationService.mapToDtos).toBeCalledTimes(1); }); + + it('should call through for cancel', async () => { + applicationService.cancel.mockResolvedValue(); + await controller.cancel(mockApplicationEntity.uuid); + + expect(applicationService.cancel).toBeCalledTimes(1); + }); + + it('should call through for uncancel', async () => { + applicationService.uncancel.mockResolvedValue(); + await controller.uncancel(mockApplicationEntity.uuid); + + expect(applicationService.uncancel).toBeCalledTimes(1); + }); }); diff --git a/services/apps/alcs/src/alcs/application/application.controller.ts b/services/apps/alcs/src/alcs/application/application.controller.ts index 1f44f4fc41..0dc5422c0e 100644 --- a/services/apps/alcs/src/alcs/application/application.controller.ts +++ b/services/apps/alcs/src/alcs/application/application.controller.ts @@ -118,6 +118,18 @@ export class ApplicationController { await this.applicationService.delete(applicationNumber); } + @Post('/:fileNumber/cancel') + @UserRoles(...ROLES_ALLOWED_APPLICATIONS) + async cancel(@Param('fileNumber') fileNumber): Promise { + await this.applicationService.cancel(fileNumber); + } + + @Post('/:fileNumber/uncancel') + @UserRoles(...ROLES_ALLOWED_APPLICATIONS) + async uncancel(@Param('fileNumber') fileNumber): Promise { + await this.applicationService.uncancel(fileNumber); + } + @Get('/card/:uuid') @UserRoles(...ROLES_ALLOWED_APPLICATIONS) async getByCardUuid(@Param('uuid') cardUuid): Promise { diff --git a/services/apps/alcs/src/alcs/application/application.service.spec.ts b/services/apps/alcs/src/alcs/application/application.service.spec.ts index a35a18f8ee..68fbb111ac 100644 --- a/services/apps/alcs/src/alcs/application/application.service.spec.ts +++ b/services/apps/alcs/src/alcs/application/application.service.spec.ts @@ -7,6 +7,9 @@ import { getRepositoryToken } from '@nestjs/typeorm'; import { FindOptionsRelations, Repository } from 'typeorm'; import { initApplicationMockEntity } from '../../../test/mocks/mockEntities'; import { ApplicationSubmissionStatusService } from '../../application-submission-status/application-submission-status.service'; +import { ApplicationSubmissionStatusType } from '../../application-submission-status/submission-status-type.entity'; +import { SUBMISSION_STATUS } from '../../application-submission-status/submission-status.dto'; +import { ApplicationSubmissionToSubmissionStatus } from '../../application-submission-status/submission-status.entity'; import { FileNumberService } from '../../file-number/file-number.service'; import { Card } from '../card/card.entity'; import { ApplicationRegion } from '../code/application-code/application-region/application-region.entity'; @@ -311,4 +314,30 @@ describe('ApplicationService', () => { relations: BOARD_RELATIONS, }); }); + + it('should set the cancelled status for cancel', async () => { + mockApplicationSubmissionStatusService.setStatusDateByFileNumber.mockResolvedValue( + new ApplicationSubmissionToSubmissionStatus(), + ); + await applicationService.cancel(''); + expect( + mockApplicationSubmissionStatusService.setStatusDateByFileNumber, + ).toHaveBeenCalledTimes(1); + expect( + mockApplicationSubmissionStatusService.setStatusDateByFileNumber, + ).toHaveBeenCalledWith('', SUBMISSION_STATUS.CANCELLED); + }); + + it('should clear the cancelled status for uncancel', async () => { + mockApplicationSubmissionStatusService.setStatusDateByFileNumber.mockResolvedValue( + new ApplicationSubmissionToSubmissionStatus(), + ); + await applicationService.uncancel(''); + expect( + mockApplicationSubmissionStatusService.setStatusDateByFileNumber, + ).toHaveBeenCalledTimes(1); + expect( + mockApplicationSubmissionStatusService.setStatusDateByFileNumber, + ).toHaveBeenCalledWith('', SUBMISSION_STATUS.CANCELLED, null); + }); }); diff --git a/services/apps/alcs/src/alcs/application/application.service.ts b/services/apps/alcs/src/alcs/application/application.service.ts index eca2c3b770..7ef4744334 100644 --- a/services/apps/alcs/src/alcs/application/application.service.ts +++ b/services/apps/alcs/src/alcs/application/application.service.ts @@ -241,6 +241,23 @@ export class ApplicationService { return; } + async cancel(fileNumber: string): Promise { + await this.applicationSubmissionStatusService.setStatusDateByFileNumber( + fileNumber, + SUBMISSION_STATUS.CANCELLED, + ); + return; + } + + async uncancel(fileNumber: string) { + await this.applicationSubmissionStatusService.setStatusDateByFileNumber( + fileNumber, + SUBMISSION_STATUS.CANCELLED, + null, + ); + return; + } + async getMany( findOptions?: FindOptionsWhere, sortOptions?: FindOptionsOrder, From 27a5ba7d3f24d7abb160c53135bd98cc82d63291 Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Tue, 18 Jul 2023 10:49:53 -0700 Subject: [PATCH 083/954] Feature/alcs 909 (#790) - Portal statuses in alcs - card detailed view - application detailed view - Status pill --- .../application/application.component.html | 1 + .../application-dialog.component.html | 4 +++ .../application-dialog.component.ts | 18 +++++++++-- ...lication-submission-status.service.spec.ts | 30 +++++++++++++++++++ .../application-submission-status.service.ts | 14 ++++++++- ...submission-status-type-pill.component.html | 12 ++++++++ ...submission-status-type-pill.component.scss | 15 ++++++++++ ...mission-status-type-pill.component.spec.ts | 27 +++++++++++++++++ ...n-submission-status-type-pill.component.ts | 20 +++++++++++++ .../details-header.component.html | 14 +++++++-- .../details-header.component.scss | 9 +++++- .../details-header.component.spec.ts | 11 +++++++ .../details-header.component.ts | 17 ++++++++++- alcs-frontend/src/app/shared/shared.module.ts | 3 ++ ...ation-submission-status.controller.spec.ts | 20 +++++++++++++ ...pplication-submission-status.controller.ts | 14 +++++++++ ...lication-submission-status.service.spec.ts | 28 +++++++++++++++++ .../application-submission-status.service.ts | 6 ++++ 18 files changed, 255 insertions(+), 8 deletions(-) create mode 100644 alcs-frontend/src/app/shared/application-submission-status-type-pill/application-submission-status-type-pill.component.html create mode 100644 alcs-frontend/src/app/shared/application-submission-status-type-pill/application-submission-status-type-pill.component.scss create mode 100644 alcs-frontend/src/app/shared/application-submission-status-type-pill/application-submission-status-type-pill.component.spec.ts create mode 100644 alcs-frontend/src/app/shared/application-submission-status-type-pill/application-submission-status-type-pill.component.ts diff --git a/alcs-frontend/src/app/features/application/application.component.html b/alcs-frontend/src/app/features/application/application.component.html index 3be9c441d8..9fa5a76717 100644 --- a/alcs-frontend/src/app/features/application/application.component.html +++ b/alcs-frontend/src/app/features/application/application.component.html @@ -6,6 +6,7 @@ [modifications]="modifications" days="Business Days" heading="Application" + [showStatus]="true" >
diff --git a/alcs-frontend/src/app/features/board/dialogs/application/application-dialog.component.html b/alcs-frontend/src/app/features/board/dialogs/application/application-dialog.component.html index 10c352832f..67298c3bb5 100644 --- a/alcs-frontend/src/app/features/board/dialogs/application/application-dialog.component.html +++ b/alcs-frontend/src/app/features/board/dialogs/application/application-dialog.component.html @@ -41,6 +41,10 @@

+
-
-
{{ days }}:
- +
+ +
{{ days }}:
+ + +
+
+
diff --git a/alcs-frontend/src/app/shared/details-header/details-header.component.scss b/alcs-frontend/src/app/shared/details-header/details-header.component.scss index 6eb8a2ba1f..bb8b0dfe37 100644 --- a/alcs-frontend/src/app/shared/details-header/details-header.component.scss +++ b/alcs-frontend/src/app/shared/details-header/details-header.component.scss @@ -46,7 +46,8 @@ margin-top: 16px; margin-bottom: 8px; display: grid; - grid-template-columns: 1fr 1fr; + grid-template-columns: 1fr 1fr 1fr; + gap: 8px; } .subheading2 { @@ -57,3 +58,9 @@ .inactive-timer { opacity: 0.3; } + +.status-wrapper { + display: flex; + flex-direction: row-reverse; + align-items: flex-end; +} diff --git a/alcs-frontend/src/app/shared/details-header/details-header.component.spec.ts b/alcs-frontend/src/app/shared/details-header/details-header.component.spec.ts index 781145a082..e60103b521 100644 --- a/alcs-frontend/src/app/shared/details-header/details-header.component.spec.ts +++ b/alcs-frontend/src/app/shared/details-header/details-header.component.spec.ts @@ -1,16 +1,27 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { ApplicationSubmissionStatusService } from '../../services/application/application-submission-status/application-submission-status.service'; import { DetailsHeaderComponent } from './details-header.component'; describe('DetailsHeaderComponent', () => { let component: DetailsHeaderComponent; let fixture: ComponentFixture; + let mockApplicationSubmissionStatusService: DeepMocked; beforeEach(async () => { + mockApplicationSubmissionStatusService = createMock(); + await TestBed.configureTestingModule({ imports: [RouterTestingModule], declarations: [DetailsHeaderComponent], + providers: [ + { + provide: ApplicationSubmissionStatusService, + useValue: mockApplicationSubmissionStatusService, + }, + ], }).compileComponents(); fixture = TestBed.createComponent(DetailsHeaderComponent); diff --git a/alcs-frontend/src/app/shared/details-header/details-header.component.ts b/alcs-frontend/src/app/shared/details-header/details-header.component.ts index 172819615f..94a66557d4 100644 --- a/alcs-frontend/src/app/shared/details-header/details-header.component.ts +++ b/alcs-frontend/src/app/shared/details-header/details-header.component.ts @@ -4,11 +4,13 @@ import { Subject } from 'rxjs'; import { ApplicationTypeDto } from '../../services/application/application-code.dto'; import { ApplicationModificationDto } from '../../services/application/application-modification/application-modification.dto'; import { ApplicationReconsiderationDto } from '../../services/application/application-reconsideration/application-reconsideration.dto'; +import { ApplicationSubmissionStatusService } from '../../services/application/application-submission-status/application-submission-status.service'; import { ApplicationDto } from '../../services/application/application.dto'; import { CardDto } from '../../services/card/card.dto'; import { CommissionerApplicationDto } from '../../services/commissioner/commissioner.dto'; import { NoticeOfIntentModificationDto } from '../../services/notice-of-intent/notice-of-intent-modification/notice-of-intent-modification.dto'; import { NoticeOfIntentDto } from '../../services/notice-of-intent/notice-of-intent.dto'; +import { ApplicationSubmissionStatusPill } from '../application-submission-status-type-pill/application-submission-status-type-pill.component'; import { MODIFICATION_TYPE_LABEL, RECON_TYPE_LABEL, @@ -26,6 +28,7 @@ export class DetailsHeaderComponent { @Input() heading = 'Title Here'; @Input() types: ApplicationTypeDto[] = []; @Input() days = 'Calendar Days'; + @Input() showStatus = false; _application: ApplicationDto | CommissionerApplicationDto | NoticeOfIntentDto | undefined; @@ -50,6 +53,17 @@ export class DetailsHeaderComponent { if ('retroactive' in application) { this.showRetroLabel = !!application.retroactive; } + + if (this.showStatus) { + this.submissionStatusService.fetchCurrentStatusByFileNumber(application.fileNumber).then( + (status) => + (this.currentStatus = { + label: status.status.label, + backgroundColor: status.status.alcsBackgroundColor, + textColor: status.status.alcsColor, + }) + ); + } } } @@ -77,8 +91,9 @@ export class DetailsHeaderComponent { showRetroLabel = false; linkedCards: (CardDto & { displayName: string })[] = []; isNOI = false; + currentStatus?: ApplicationSubmissionStatusPill; - constructor(private router: Router) {} + constructor(private router: Router, private submissionStatusService: ApplicationSubmissionStatusService) {} async onGoToCard(card: CardDto) { const boardCode = card.board.code; diff --git a/alcs-frontend/src/app/shared/shared.module.ts b/alcs-frontend/src/app/shared/shared.module.ts index 70c5e60efd..c6a7131dc8 100644 --- a/alcs-frontend/src/app/shared/shared.module.ts +++ b/alcs-frontend/src/app/shared/shared.module.ts @@ -34,6 +34,7 @@ import { NgOptionHighlightModule } from '@ng-select/ng-option-highlight'; import { NgSelectModule } from '@ng-select/ng-select'; import { NgxMaskDirective, NgxMaskPipe } from 'ngx-mask'; import { ApplicationDocumentComponent } from './application-document/application-document.component'; +import { ApplicationSubmissionStatusTypePillComponent } from './application-submission-status-type-pill/application-submission-status-type-pill.component'; import { ApplicationTypePillComponent } from './application-type-pill/application-type-pill.component'; import { AvatarCircleComponent } from './avatar-circle/avatar-circle.component'; import { DetailsHeaderComponent } from './details-header/details-header.component'; @@ -86,6 +87,7 @@ import { ExtensionsDatepickerFormatter } from './utils/extensions-datepicker-for InlineReviewOutcomeComponent, BooleanToStringPipe, NoDataComponent, + ApplicationSubmissionStatusTypePillComponent, ], imports: [ CommonModule, @@ -168,6 +170,7 @@ import { ExtensionsDatepickerFormatter } from './utils/extensions-datepicker-for InlineReviewOutcomeComponent, BooleanToStringPipe, NoDataComponent, + ApplicationSubmissionStatusTypePillComponent, ], }) export class SharedModule { diff --git a/services/apps/alcs/src/application-submission-status/application-submission-status.controller.spec.ts b/services/apps/alcs/src/application-submission-status/application-submission-status.controller.spec.ts index c883e5ac65..8bd30c694a 100644 --- a/services/apps/alcs/src/application-submission-status/application-submission-status.controller.spec.ts +++ b/services/apps/alcs/src/application-submission-status/application-submission-status.controller.spec.ts @@ -64,4 +64,24 @@ describe('ApplicationSubmissionStatusController', () => { expect(result.length).toEqual(1); expect(result).toBeDefined(); }); + + it('should call service to get current submission status by file number', async () => { + const fakeFileNumber = 'fake'; + + mockApplicationSubmissionStatusService.getCurrentStatusByFileNumber.mockResolvedValue( + new ApplicationSubmissionToSubmissionStatus(), + ); + + const result = await controller.getCurrentStatusByFileNumber( + fakeFileNumber, + ); + + expect( + mockApplicationSubmissionStatusService.getCurrentStatusByFileNumber, + ).toBeCalledTimes(1); + expect( + mockApplicationSubmissionStatusService.getCurrentStatusByFileNumber, + ).toBeCalledWith(fakeFileNumber); + expect(result).toBeDefined(); + }); }); diff --git a/services/apps/alcs/src/application-submission-status/application-submission-status.controller.ts b/services/apps/alcs/src/application-submission-status/application-submission-status.controller.ts index edb6112fdb..b156b282dd 100644 --- a/services/apps/alcs/src/application-submission-status/application-submission-status.controller.ts +++ b/services/apps/alcs/src/application-submission-status/application-submission-status.controller.ts @@ -28,4 +28,18 @@ export class ApplicationSubmissionStatusController { ApplicationSubmissionToSubmissionStatusDto, ); } + + @Get('/current-status/:fileNumber') + async getCurrentStatusByFileNumber(@Param('fileNumber') fileNumber) { + const status = + await this.applicationSubmissionStatusService.getCurrentStatusByFileNumber( + fileNumber, + ); + + return this.mapper.mapAsync( + status, + ApplicationSubmissionToSubmissionStatus, + ApplicationSubmissionToSubmissionStatusDto, + ); + } } diff --git a/services/apps/alcs/src/application-submission-status/application-submission-status.service.spec.ts b/services/apps/alcs/src/application-submission-status/application-submission-status.service.spec.ts index f2aada9304..e45d5da18a 100644 --- a/services/apps/alcs/src/application-submission-status/application-submission-status.service.spec.ts +++ b/services/apps/alcs/src/application-submission-status/application-submission-status.service.spec.ts @@ -325,4 +325,32 @@ describe('ApplicationSubmissionStatusService', () => { fileNumber: fakeFileNumber, }); }); + + it('Should return current status by fileNumber', async () => { + const fakeSubmissionUuid = 'fake'; + const fakeFileNumber = 'fake-number'; + const mockStatus = new ApplicationSubmissionToSubmissionStatus({ + submissionUuid: fakeSubmissionUuid, + statusTypeCode: SUBMISSION_STATUS.IN_PROGRESS, + effectiveDate: new Date(), + }); + + mockApplicationSubmissionRepository.findOneBy.mockResolvedValue( + new ApplicationSubmission({ + uuid: fakeSubmissionUuid, + fileNumber: fakeFileNumber, + status: mockStatus, + }), + ); + + const status = await service.getCurrentStatusByFileNumber(fakeFileNumber); + + expect(status).toEqual(mockStatus); + expect(mockApplicationSubmissionRepository.findOneBy).toHaveBeenCalledTimes( + 1, + ); + expect(mockApplicationSubmissionRepository.findOneBy).toHaveBeenCalledWith({ + fileNumber: fakeFileNumber, + }); + }); }); diff --git a/services/apps/alcs/src/application-submission-status/application-submission-status.service.ts b/services/apps/alcs/src/application-submission-status/application-submission-status.service.ts index 75f9b50763..aeb2b7b8d4 100644 --- a/services/apps/alcs/src/application-submission-status/application-submission-status.service.ts +++ b/services/apps/alcs/src/application-submission-status/application-submission-status.service.ts @@ -94,6 +94,12 @@ export class ApplicationSubmissionStatusService { }); } + async getCurrentStatusByFileNumber(fileNumber: string) { + const submission = await this.getSubmission(fileNumber); + + return submission.status; + } + private async getSubmission(fileNumber: string) { const submission = await this.applicationSubmissionRepository.findOneBy({ fileNumber, From 359bfb8b5ed138130d45f07b0805451c527b32d2 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Tue, 18 Jul 2023 11:04:59 -0700 Subject: [PATCH 084/954] Add Cancel/Uncancel Application * Add pill to revert to draft decision dialog --- .../application/application.module.ts | 2 + .../decision-input-v2.component.ts | 10 +--- .../decision-v2/decision-v2.component.ts | 8 ++- .../release-dialog.component.html | 27 +++------ .../release-dialog.component.ts | 27 +++++---- .../revert-to-draft-dialog.component.html | 19 +++--- .../revert-to-draft-dialog.component.spec.ts | 17 ++---- .../revert-to-draft-dialog.component.ts | 58 ++++++++++--------- .../overview/overview.component.ts | 32 ++++++---- ...uncancel-application-dialog.component.html | 19 ++++++ ...uncancel-application-dialog.component.scss | 6 ++ ...ancel-application-dialog.component.spec.ts | 34 +++++++++++ .../uncancel-application-dialog.component.ts | 46 +++++++++++++++ .../application-decision-v2.dto.ts | 1 - .../confirmation-dialog.component.html | 3 + .../confirmation-dialog.component.scss | 6 ++ .../confirmation-dialog.component.ts | 1 + alcs-frontend/src/app/shared/shared.module.ts | 3 + .../warning-banner.component.html | 8 +++ .../warning-banner.component.scss | 20 +++++++ .../warning-banner.component.spec.ts | 24 ++++++++ .../warning-banner.component.ts | 10 ++++ 22 files changed, 276 insertions(+), 105 deletions(-) create mode 100644 alcs-frontend/src/app/features/application/overview/uncancel-application-dialog/uncancel-application-dialog.component.html create mode 100644 alcs-frontend/src/app/features/application/overview/uncancel-application-dialog/uncancel-application-dialog.component.scss create mode 100644 alcs-frontend/src/app/features/application/overview/uncancel-application-dialog/uncancel-application-dialog.component.spec.ts create mode 100644 alcs-frontend/src/app/features/application/overview/uncancel-application-dialog/uncancel-application-dialog.component.ts create mode 100644 alcs-frontend/src/app/shared/warning-banner/warning-banner.component.html create mode 100644 alcs-frontend/src/app/shared/warning-banner/warning-banner.component.scss create mode 100644 alcs-frontend/src/app/shared/warning-banner/warning-banner.component.spec.ts create mode 100644 alcs-frontend/src/app/shared/warning-banner/warning-banner.component.ts diff --git a/alcs-frontend/src/app/features/application/application.module.ts b/alcs-frontend/src/app/features/application/application.module.ts index f9e4f39e9e..11e45346cc 100644 --- a/alcs-frontend/src/app/features/application/application.module.ts +++ b/alcs-frontend/src/app/features/application/application.module.ts @@ -18,6 +18,7 @@ import { InfoRequestDialogComponent } from './info-requests/info-rquest-dialog/i import { IntakeComponent } from './intake/intake.component'; import { LfngInfoComponent } from './lfng-info/lfng-info.component'; import { OverviewComponent } from './overview/overview.component'; +import { UncancelApplicationDialogComponent } from './overview/uncancel-application-dialog/uncancel-application-dialog.component'; import { EditModificationDialogComponent } from './post-decision/edit-modification-dialog/edit-modification-dialog.component'; import { EditReconsiderationDialogComponent } from './post-decision/edit-reconsideration-dialog/edit-reconsideration-dialog.component'; import { PostDecisionComponent } from './post-decision/post-decision.component'; @@ -74,6 +75,7 @@ const routes: Routes = [ TurProposalComponent, NaruProposalComponent, ParcelPrepComponent, + UncancelApplicationDialogComponent, ], imports: [SharedModule, RouterModule.forChild(routes), ApplicationDetailsModule, DecisionModule], }) diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.ts index deb2336a44..661e7d5051 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.ts @@ -11,6 +11,7 @@ import { ApplicationModificationService } from '../../../../../services/applicat import { ApplicationReconsiderationDto } from '../../../../../services/application/application-reconsideration/application-reconsideration.dto'; import { ApplicationReconsiderationService } from '../../../../../services/application/application-reconsideration/application-reconsideration.service'; import { ApplicationSubmissionService } from '../../../../../services/application/application-submission/application-submission.service'; +import { SUBMISSION_STATUS } from '../../../../../services/application/application.dto'; import { ApplicationDecisionConditionDto, ApplicationDecisionDto, @@ -531,16 +532,11 @@ export class DecisionInputV2Component implements OnInit, OnDestroy { maxHeight: '80vh', width: '90%', autoFocus: false, - data: { - wasReleased: this.existingDecision?.wasReleased, - }, }) .afterClosed() - .subscribe(async (submissionType) => { - if (submissionType) { + .subscribe(async (didAccept) => { + if (didAccept) { await this.onSubmit(false, false); - //FIXME Do not need this since decision released will be based on the date and not status - await this.applicationSubmissionService.setSubmissionStatus(this.fileNumber, submissionType); await this.applicationService.loadApplication(this.fileNumber); } }); diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.ts index 3c3a81ec91..8f33eb75fc 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.ts @@ -132,10 +132,12 @@ export class DecisionV2Component implements OnInit, OnDestroy { async onRevertToDraft(uuid: string) { this.dialog - .open(RevertToDraftDialogComponent) + .open(RevertToDraftDialogComponent, { + data: { fileNumber: this.fileNumber }, + }) .beforeClosed() - .subscribe(async (result) => { - if (result) { + .subscribe(async (didConfirm) => { + if (didConfirm) { await this.decisionService.update(uuid, { isDraft: true, }); diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/release-dialog/release-dialog.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/release-dialog/release-dialog.component.html index 48e990bd08..a798af428d 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/release-dialog/release-dialog.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/release-dialog/release-dialog.component.html @@ -1,6 +1,5 @@
-

Confirm Release Decision

-

Confirm Decision Re-release

+

Confirm Release Decision

@@ -8,22 +7,12 @@

Confirm Decision Re-release

This decision and document will be immediately visible to the Applicant and Local/First Nation Government. The decision will be visible to the Public after the prescribed amount of days is exhausted.

- - - -

- Applicant and Local/First Nation Government will receive an automatic email notification from the Portal. +

+ Upon releasing the decision, the application will be will be updated to the status: +

-

+ If there is more than one decision, the status will not change +

The Applicant and Local/First Nation Government will not receive an auto-email notification. Please complete any notification manually.

@@ -33,8 +22,6 @@

Confirm Decision Re-release

- +
diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/release-dialog/release-dialog.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/release-dialog/release-dialog.component.ts index 7f4a3dddbf..f2376b3ba6 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/release-dialog/release-dialog.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/release-dialog/release-dialog.component.ts @@ -1,8 +1,9 @@ import { Component, Inject, OnDestroy, OnInit } from '@angular/core'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { Subject, takeUntil } from 'rxjs'; -import { ApplicationStatusDto } from '../../../../../services/application/application-reconsideration/application-reconsideration.dto'; +import { SUBMISSION_STATUS } from '../../../../../services/application/application.dto'; import { ApplicationService } from '../../../../../services/application/application.service'; +import { ApplicationPill } from '../../../../../shared/application-type-pill/application-type-pill.component'; @Component({ selector: 'app-release-dialog', @@ -11,23 +12,27 @@ import { ApplicationService } from '../../../../../services/application/applicat }) export class ReleaseDialogComponent implements OnInit, OnDestroy { $destroy = new Subject(); - - statuses: ApplicationStatusDto[] = []; - selectedApplicationStatus = ''; - wasReleased = false; + mappedType?: ApplicationPill; constructor( private applicationService: ApplicationService, public matDialogRef: MatDialogRef, - @Inject(MAT_DIALOG_DATA) data: { wasReleased: boolean } - ) { - this.wasReleased = data.wasReleased; - } + @Inject(MAT_DIALOG_DATA) data: any + ) {} ngOnInit(): void { this.applicationService.$applicationStatuses.pipe(takeUntil(this.$destroy)).subscribe((statuses) => { if (statuses) { - this.statuses = statuses.filter((e) => ['ALCD', 'CEOD'].includes(e.code)); + const releasedStatus = statuses.find((status) => status.code === SUBMISSION_STATUS.ALC_DECISION); + if (releasedStatus) { + this.mappedType = { + label: releasedStatus.label, + backgroundColor: releasedStatus.alcsBackgroundColor, + borderColor: releasedStatus.alcsBackgroundColor, + textColor: releasedStatus.alcsColor, + shortLabel: releasedStatus.label, + }; + } } }); } @@ -38,6 +43,6 @@ export class ReleaseDialogComponent implements OnInit, OnDestroy { } onRelease() { - this.matDialogRef.close(this.selectedApplicationStatus); + this.matDialogRef.close(true); } } diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/revert-to-draft-dialog/revert-to-draft-dialog.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/revert-to-draft-dialog/revert-to-draft-dialog.component.html index 9b7db6512b..d13f607781 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/revert-to-draft-dialog/revert-to-draft-dialog.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/revert-to-draft-dialog/revert-to-draft-dialog.component.html @@ -7,17 +7,14 @@

Confirm Revert to Draft

This decision and document will be reverted into draft form, providing you with full editing capabilities but hiding it from the Applicant, Local/First Nation Government, and the Public.

- - - +

+ Upon reverting the decision to draft, the application will be will be updated to the status: + +

+ If there is more than one decision, the status will not change

The Applicant and Local/First Nation Government will not receive an auto-email notification. Please complete any notification manually. diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/revert-to-draft-dialog/revert-to-draft-dialog.component.spec.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/revert-to-draft-dialog/revert-to-draft-dialog.component.spec.ts index e35aa1b6ad..715b315854 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/revert-to-draft-dialog/revert-to-draft-dialog.component.spec.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/revert-to-draft-dialog/revert-to-draft-dialog.component.spec.ts @@ -1,30 +1,21 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { MatDialogRef } from '@angular/material/dialog'; -import { createMock, DeepMocked } from '@golevelup/ts-jest'; -import { BehaviorSubject } from 'rxjs'; -import { ApplicationStatusDto } from '../../../../../services/application/application-reconsideration/application-reconsideration.dto'; -import { ApplicationService } from '../../../../../services/application/application.service'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; +import { ApplicationSubmissionStatusService } from '../../../../../services/application/application-submission-status/application-submission-status.service'; import { RevertToDraftDialogComponent } from './revert-to-draft-dialog.component'; describe('RevertToDraftDialogComponent', () => { let component: RevertToDraftDialogComponent; let fixture: ComponentFixture; - let mockApplicationService: DeepMocked; beforeEach(async () => { - mockApplicationService = createMock(); - mockApplicationService.$applicationStatuses = new BehaviorSubject([]); - await TestBed.configureTestingModule({ declarations: [RevertToDraftDialogComponent], providers: [ - { - provide: ApplicationService, - useValue: mockApplicationService, - }, { provide: MatDialogRef, useValue: {} }, + { provide: ApplicationSubmissionStatusService, useValue: {} }, + { provide: MAT_DIALOG_DATA, useValue: {} }, ], schemas: [NO_ERRORS_SCHEMA], }).compileComponents(); diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/revert-to-draft-dialog/revert-to-draft-dialog.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/revert-to-draft-dialog/revert-to-draft-dialog.component.ts index f19da034e5..db8d7bb9be 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/revert-to-draft-dialog/revert-to-draft-dialog.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/revert-to-draft-dialog/revert-to-draft-dialog.component.ts @@ -1,42 +1,46 @@ -import { Component, OnDestroy, OnInit } from '@angular/core'; -import { MatDialogRef } from '@angular/material/dialog'; -import { Subject, takeUntil } from 'rxjs'; -import { ApplicationStatusDto } from '../../../../../services/application/application-reconsideration/application-reconsideration.dto'; -import { ApplicationService } from '../../../../../services/application/application.service'; +import { Component, Inject } from '@angular/core'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; +import { ApplicationSubmissionStatusService } from '../../../../../services/application/application-submission-status/application-submission-status.service'; +import { SUBMISSION_STATUS } from '../../../../../services/application/application.dto'; +import { ApplicationSubmissionStatusPill } from '../../../../../shared/application-submission-status-type-pill/application-submission-status-type-pill.component'; @Component({ selector: 'app-revert-to-draft-dialog', templateUrl: './revert-to-draft-dialog.component.html', styleUrls: ['./revert-to-draft-dialog.component.scss'], }) -export class RevertToDraftDialogComponent implements OnInit, OnDestroy { - $destroy = new Subject(); - - statuses: ApplicationStatusDto[] = []; - selectedApplicationStatus = ''; +export class RevertToDraftDialogComponent { + mappedType?: ApplicationSubmissionStatusPill; constructor( - private applicationService: ApplicationService, - public matDialogRef: MatDialogRef - ) {} - - ngOnInit(): void { - this.applicationService.$applicationStatuses.pipe(takeUntil(this.$destroy)).subscribe((statuses) => { - if (statuses) { - //TODO: This will be done in a future ticket - //this.statuses = statuses.filter((e) => ['ALCD', 'CEOD'].includes(e.code)); - } - }); + public matDialogRef: MatDialogRef, + private applicationSubmissionStatusService: ApplicationSubmissionStatusService, + @Inject(MAT_DIALOG_DATA) data: { fileNumber: string } + ) { + this.calculateStatusChange(data.fileNumber); } - ngOnDestroy(): void { - this.$destroy.next(); - this.$destroy.complete(); + async calculateStatusChange(fileNumber: string) { + const statusHistory = await this.applicationSubmissionStatusService.fetchSubmissionStatusesByFileNumber(fileNumber); + const validStatuses = statusHistory + .filter( + (status) => + status.effectiveDate && + status.statusTypeCode !== SUBMISSION_STATUS.ALC_DECISION && + status.effectiveDate < Date.now() + ) + .sort((a, b) => a.effectiveDate - b.effectiveDate); + if (validStatuses && validStatuses.length > 0) { + const newStatus = validStatuses[0].status; + this.mappedType = { + label: newStatus.label, + backgroundColor: newStatus.alcsBackgroundColor, + textColor: newStatus.alcsColor, + }; + } } onConfirm() { - this.matDialogRef.close({ - status: '', - }); + this.matDialogRef.close(true); } } diff --git a/alcs-frontend/src/app/features/application/overview/overview.component.ts b/alcs-frontend/src/app/features/application/overview/overview.component.ts index e1b9537014..037ef8f700 100644 --- a/alcs-frontend/src/app/features/application/overview/overview.component.ts +++ b/alcs-frontend/src/app/features/application/overview/overview.component.ts @@ -1,4 +1,5 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; +import { MatDialog } from '@angular/material/dialog'; import { BehaviorSubject, combineLatestWith, Subject, takeUntil, tap } from 'rxjs'; import { ApplicationDetailService } from '../../../services/application/application-detail.service'; import { ApplicationMeetingDto } from '../../../services/application/application-meeting/application-meeting.dto'; @@ -14,6 +15,7 @@ import { ApplicationDecisionDto } from '../../../services/application/decision/a import { ApplicationDecisionService } from '../../../services/application/decision/application-decision-v1/application-decision.service'; import { ConfirmationDialogService } from '../../../shared/confirmation-dialog/confirmation-dialog.service'; import { TimelineEvent } from '../../../shared/timeline/timeline.component'; +import { UncancelApplicationDialogComponent } from './uncancel-application-dialog/uncancel-application-dialog.component'; const editLink = new Map([ ['IR', './info-request'], @@ -60,7 +62,8 @@ export class OverviewComponent implements OnInit, OnDestroy { private modificationService: ApplicationModificationService, private reviewService: ApplicationReviewService, private confirmationDialogService: ConfirmationDialogService, - private applicationSubmissionStatusService: ApplicationSubmissionStatusService + private applicationSubmissionStatusService: ApplicationSubmissionStatusService, + private dialog: MatDialog ) {} ngOnInit(): void { @@ -125,6 +128,7 @@ export class OverviewComponent implements OnInit, OnDestroy { .openDialog({ body: `Are you sure you want to cancel this Application?`, cancelButtonText: 'No', + title: 'Cancel Application', }) .subscribe(async (didConfirm) => { if (didConfirm && this.application) { @@ -135,17 +139,21 @@ export class OverviewComponent implements OnInit, OnDestroy { } async onUncancelApplication() { - this.confirmationDialogService - .openDialog({ - body: `Are you sure you want to uncancel this Application?`, - cancelButtonText: 'No', - }) - .subscribe(async (didConfirm) => { - if (didConfirm && this.application) { - await this.applicationDetailService.uncancelApplication(this.application.fileNumber); - await this.loadStatusHistory(this.application.fileNumber); - } - }); + if (this.application) { + this.dialog + .open(UncancelApplicationDialogComponent, { + data: { + fileNumber: this.application.fileNumber, + }, + }) + .beforeClosed() + .subscribe(async (didConfirm) => { + if (didConfirm && this.application) { + await this.applicationDetailService.uncancelApplication(this.application.fileNumber); + await this.loadStatusHistory(this.application.fileNumber); + } + }); + } } private mapApplicationToEvents( diff --git a/alcs-frontend/src/app/features/application/overview/uncancel-application-dialog/uncancel-application-dialog.component.html b/alcs-frontend/src/app/features/application/overview/uncancel-application-dialog/uncancel-application-dialog.component.html new file mode 100644 index 0000000000..65bba51b4d --- /dev/null +++ b/alcs-frontend/src/app/features/application/overview/uncancel-application-dialog/uncancel-application-dialog.component.html @@ -0,0 +1,19 @@ +

+

Uncancel Application

+
+ +
+

+ The application's portal status will revert back to:

+ +

+

Are you sure you want to undo cancellation?

+
+ + + +
+ + +
+ diff --git a/alcs-frontend/src/app/features/application/overview/uncancel-application-dialog/uncancel-application-dialog.component.scss b/alcs-frontend/src/app/features/application/overview/uncancel-application-dialog/uncancel-application-dialog.component.scss new file mode 100644 index 0000000000..756d26e192 --- /dev/null +++ b/alcs-frontend/src/app/features/application/overview/uncancel-application-dialog/uncancel-application-dialog.component.scss @@ -0,0 +1,6 @@ +.grid { + display: grid; + grid-template-columns: 1fr; + grid-column-gap: 24px; + grid-row-gap: 24px; +} diff --git a/alcs-frontend/src/app/features/application/overview/uncancel-application-dialog/uncancel-application-dialog.component.spec.ts b/alcs-frontend/src/app/features/application/overview/uncancel-application-dialog/uncancel-application-dialog.component.spec.ts new file mode 100644 index 0000000000..e479195f9d --- /dev/null +++ b/alcs-frontend/src/app/features/application/overview/uncancel-application-dialog/uncancel-application-dialog.component.spec.ts @@ -0,0 +1,34 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; +import { ApplicationSubmissionStatusService } from '../../../../services/application/application-submission-status/application-submission-status.service'; + +import { UncancelApplicationDialogComponent } from './uncancel-application-dialog.component'; + +describe('UncancelApplicationDialogComponent', () => { + let component: UncancelApplicationDialogComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [UncancelApplicationDialogComponent], + providers: [ + { provide: MatDialogRef, useValue: {} }, + { + provide: ApplicationSubmissionStatusService, + useValue: {}, + }, + { provide: MAT_DIALOG_DATA, useValue: {} }, + ], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(UncancelApplicationDialogComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/alcs-frontend/src/app/features/application/overview/uncancel-application-dialog/uncancel-application-dialog.component.ts b/alcs-frontend/src/app/features/application/overview/uncancel-application-dialog/uncancel-application-dialog.component.ts new file mode 100644 index 0000000000..edbf3c27e7 --- /dev/null +++ b/alcs-frontend/src/app/features/application/overview/uncancel-application-dialog/uncancel-application-dialog.component.ts @@ -0,0 +1,46 @@ +import { Component, Inject } from '@angular/core'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; +import { ApplicationSubmissionStatusService } from '../../../../services/application/application-submission-status/application-submission-status.service'; +import { SUBMISSION_STATUS } from '../../../../services/application/application.dto'; +import { ApplicationSubmissionStatusPill } from '../../../../shared/application-submission-status-type-pill/application-submission-status-type-pill.component'; + +@Component({ + selector: 'app-uncancel-application-dialog', + templateUrl: './uncancel-application-dialog.component.html', + styleUrls: ['./uncancel-application-dialog.component.scss'], +}) +export class UncancelApplicationDialogComponent { + status?: ApplicationSubmissionStatusPill; + + constructor( + public matDialogRef: MatDialogRef, + private applicationSubmissionStatusService: ApplicationSubmissionStatusService, + @Inject(MAT_DIALOG_DATA) data: { fileNumber: string } + ) { + this.calculateStatusChange(data.fileNumber); + } + + async calculateStatusChange(fileNumber: string) { + const statusHistory = await this.applicationSubmissionStatusService.fetchSubmissionStatusesByFileNumber(fileNumber); + const validStatuses = statusHistory + .filter( + (status) => + status.effectiveDate && + status.statusTypeCode !== SUBMISSION_STATUS.CANCELLED && + status.effectiveDate < Date.now() + ) + .sort((a, b) => a.effectiveDate - b.effectiveDate); + if (validStatuses && validStatuses.length > 0) { + const validStatus = validStatuses[0].status; + this.status = { + backgroundColor: validStatus.alcsBackgroundColor, + textColor: validStatus.alcsColor, + label: validStatus.label, + }; + } + } + + onConfirm() { + this.matDialogRef.close(true); + } +} diff --git a/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-v2.dto.ts b/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-v2.dto.ts index 1402ca29c6..da363fc6d8 100644 --- a/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-v2.dto.ts +++ b/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-v2.dto.ts @@ -64,7 +64,6 @@ export interface ApplicationDecisionDto { isTimeExtension?: boolean | null; isOther?: boolean | null; isDraft: boolean; - wasReleased: boolean; isSubjectToConditions?: boolean | null; decisionDescription?: string | null; isStatsRequired?: boolean | null; diff --git a/alcs-frontend/src/app/shared/confirmation-dialog/confirmation-dialog.component.html b/alcs-frontend/src/app/shared/confirmation-dialog/confirmation-dialog.component.html index 1385a75812..ffb274bff3 100644 --- a/alcs-frontend/src/app/shared/confirmation-dialog/confirmation-dialog.component.html +++ b/alcs-frontend/src/app/shared/confirmation-dialog/confirmation-dialog.component.html @@ -1,3 +1,6 @@ +
+

{{ data.title }}

+

{{ data.body }}

diff --git a/alcs-frontend/src/app/shared/confirmation-dialog/confirmation-dialog.component.scss b/alcs-frontend/src/app/shared/confirmation-dialog/confirmation-dialog.component.scss index 2261cbad7f..a93c024a68 100644 --- a/alcs-frontend/src/app/shared/confirmation-dialog/confirmation-dialog.component.scss +++ b/alcs-frontend/src/app/shared/confirmation-dialog/confirmation-dialog.component.scss @@ -1,3 +1,9 @@ .mat-dialog-actions { justify-content: flex-end; } + +.card-title { + align-items: center; + margin-right: 2rem !important; + margin-bottom: 2rem; +} diff --git a/alcs-frontend/src/app/shared/confirmation-dialog/confirmation-dialog.component.ts b/alcs-frontend/src/app/shared/confirmation-dialog/confirmation-dialog.component.ts index 4795215ad0..fe21a99ac3 100644 --- a/alcs-frontend/src/app/shared/confirmation-dialog/confirmation-dialog.component.ts +++ b/alcs-frontend/src/app/shared/confirmation-dialog/confirmation-dialog.component.ts @@ -3,6 +3,7 @@ import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; export interface DialogData { body: string; + title?: string; yesButtonText?: string; cancelButtonText?: string; } diff --git a/alcs-frontend/src/app/shared/shared.module.ts b/alcs-frontend/src/app/shared/shared.module.ts index c6a7131dc8..7b44c0669f 100644 --- a/alcs-frontend/src/app/shared/shared.module.ts +++ b/alcs-frontend/src/app/shared/shared.module.ts @@ -60,6 +60,7 @@ import { TimeTrackerComponent } from './time-tracker/time-tracker.component'; import { TimelineComponent } from './timeline/timeline.component'; import { DATE_FORMATS } from './utils/date-format'; import { ExtensionsDatepickerFormatter } from './utils/extensions-datepicker-formatter'; +import { WarningBannerComponent } from './warning-banner/warning-banner.component'; @NgModule({ declarations: [ @@ -88,6 +89,7 @@ import { ExtensionsDatepickerFormatter } from './utils/extensions-datepicker-for BooleanToStringPipe, NoDataComponent, ApplicationSubmissionStatusTypePillComponent, + WarningBannerComponent, ], imports: [ CommonModule, @@ -171,6 +173,7 @@ import { ExtensionsDatepickerFormatter } from './utils/extensions-datepicker-for BooleanToStringPipe, NoDataComponent, ApplicationSubmissionStatusTypePillComponent, + WarningBannerComponent, ], }) export class SharedModule { diff --git a/alcs-frontend/src/app/shared/warning-banner/warning-banner.component.html b/alcs-frontend/src/app/shared/warning-banner/warning-banner.component.html new file mode 100644 index 0000000000..580abf8f33 --- /dev/null +++ b/alcs-frontend/src/app/shared/warning-banner/warning-banner.component.html @@ -0,0 +1,8 @@ +
+
+ info +
+
+ +
+
diff --git a/alcs-frontend/src/app/shared/warning-banner/warning-banner.component.scss b/alcs-frontend/src/app/shared/warning-banner/warning-banner.component.scss new file mode 100644 index 0000000000..d3ecf9715d --- /dev/null +++ b/alcs-frontend/src/app/shared/warning-banner/warning-banner.component.scss @@ -0,0 +1,20 @@ +@use '../../../styles/colors'; + +.warning-banner { + background-color: colors.$secondary-color-light; + padding: 8px; + display: flex; + margin: 16px 0; + align-items: center; + + .warning-description { + min-width: 0; + word-break: break-word; + } + + .icon { + display: flex; + justify-content: center; + padding: 21px; + } +} diff --git a/alcs-frontend/src/app/shared/warning-banner/warning-banner.component.spec.ts b/alcs-frontend/src/app/shared/warning-banner/warning-banner.component.spec.ts new file mode 100644 index 0000000000..8572eda3c7 --- /dev/null +++ b/alcs-frontend/src/app/shared/warning-banner/warning-banner.component.spec.ts @@ -0,0 +1,24 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { WarningBannerComponent } from './warning-banner.component'; + +describe('WarningBannerComponent', () => { + let component: WarningBannerComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [WarningBannerComponent], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(WarningBannerComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/alcs-frontend/src/app/shared/warning-banner/warning-banner.component.ts b/alcs-frontend/src/app/shared/warning-banner/warning-banner.component.ts new file mode 100644 index 0000000000..62f570ec02 --- /dev/null +++ b/alcs-frontend/src/app/shared/warning-banner/warning-banner.component.ts @@ -0,0 +1,10 @@ +import { Component } from '@angular/core'; + +@Component({ + selector: 'app-warning-banner', + templateUrl: './warning-banner.component.html', + styleUrls: ['./warning-banner.component.scss'], +}) +export class WarningBannerComponent { + constructor() {} +} From f0c89ec898f014961cda5330453d782629fff646 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Tue, 18 Jul 2023 11:40:38 -0700 Subject: [PATCH 085/954] Constrain dialogs to stay inside the screen * Remove manual scroll bac from board dialog * Change max-height to 80vh so the dialog stays on the screen --- .../board-management-dialog.component.scss | 3 --- alcs-frontend/src/styles.scss | 5 +++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/alcs-frontend/src/app/features/admin/board-management/board-management-dialog/board-management-dialog.component.scss b/alcs-frontend/src/app/features/admin/board-management/board-management-dialog/board-management-dialog.component.scss index c03d9f6ae5..d83912b82f 100644 --- a/alcs-frontend/src/app/features/admin/board-management/board-management-dialog/board-management-dialog.component.scss +++ b/alcs-frontend/src/app/features/admin/board-management/board-management-dialog/board-management-dialog.component.scss @@ -5,7 +5,6 @@ form { max-width: 100%; - max-height: 75vh; display: grid; grid-template-columns: 48% 48%; row-gap: 24px; @@ -13,8 +12,6 @@ margin-bottom: 12px; padding-top: 5px; - overflow-y: auto; - .full-width { grid-column: 1/3; } diff --git a/alcs-frontend/src/styles.scss b/alcs-frontend/src/styles.scss index a9fadb0cd9..a7059bdbbf 100644 --- a/alcs-frontend/src/styles.scss +++ b/alcs-frontend/src/styles.scss @@ -169,10 +169,11 @@ body { flex-direction: column; height: 100%; } + mat-dialog-content, div[mat-dialog-content] { flex-grow: 1; - max-height: unset; + max-height: 80vh; } } } @@ -315,4 +316,4 @@ mat-button-toggle-group { .ellipsis-3 { @include text-ellipsis($lines: 3); -} \ No newline at end of file +} From 7adcdd0f99fd61b5b913744e81202a109fdd4718 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Tue, 18 Jul 2023 11:42:55 -0700 Subject: [PATCH 086/954] Code Review Feedback --- .../decision-v2/release-dialog/release-dialog.component.html | 2 +- .../revert-to-draft-dialog.component.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/release-dialog/release-dialog.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/release-dialog/release-dialog.component.html index a798af428d..bbaceaf9c6 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/release-dialog/release-dialog.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/release-dialog/release-dialog.component.html @@ -8,7 +8,7 @@

Confirm Release Decision

decision will be visible to the Public after the prescribed amount of days is exhausted.

- Upon releasing the decision, the application will be will be updated to the status: + Upon releasing the decision, the application will be updated to the status:

If there is more than one decision, the status will not change diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/revert-to-draft-dialog/revert-to-draft-dialog.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/revert-to-draft-dialog/revert-to-draft-dialog.component.html index d13f607781..379160738a 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/revert-to-draft-dialog/revert-to-draft-dialog.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/revert-to-draft-dialog/revert-to-draft-dialog.component.html @@ -8,7 +8,7 @@

Confirm Revert to Draft

hiding it from the Applicant, Local/First Nation Government, and the Public.

- Upon reverting the decision to draft, the application will be will be updated to the status: + Upon reverting the decision to draft, the application will be updated to the status: Date: Tue, 18 Jul 2023 13:19:07 -0700 Subject: [PATCH 087/954] adjust menu items visibility based on new status (#794) * adjust menu items visibility based on new status --- .../application-details.component.spec.ts | 1 + .../application/application.component.html | 6 +++--- .../features/application/application.component.ts | 15 +++++++++++---- .../application-submission.service.spec.ts | 1 + .../app/services/application/application.dto.ts | 2 ++ .../application-submission.dto.ts | 8 +++++++- 6 files changed, 25 insertions(+), 8 deletions(-) diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.spec.ts b/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.spec.ts index 8e7f3ea991..a72111b842 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.spec.ts +++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.spec.ts @@ -125,6 +125,7 @@ describe('ApplicationDetailsComponent', () => { westLandUseTypeDescription: '', subdProposedLots: [], typeCode: '', + submissionStatuses: [], }; component.applicationType = 'NFUP'; component.fileNumber = 'fake'; diff --git a/alcs-frontend/src/app/features/application/application.component.html b/alcs-frontend/src/app/features/application/application.component.html index 9fa5a76717..88d26342b3 100644 --- a/alcs-frontend/src/app/features/application/application.component.html +++ b/alcs-frontend/src/app/features/application/application.component.html @@ -9,7 +9,7 @@ [showStatus]="true" >

-
+
-
+
-
+
s.statusTypeCode === SUBMISSION_STATUS.SUBMITTED_TO_ALC && !!s.effectiveDate + ); + this.showSubmittedToLfngMenuItems = wasSubmittedToLfng && !submittedToAlcsStatus; + + this.showSubmittedToAlcMenuItems = this.isApplicantSubmission ? !!submittedToAlcsStatus : true; } }); diff --git a/alcs-frontend/src/app/services/application/application-submission/application-submission.service.spec.ts b/alcs-frontend/src/app/services/application/application-submission/application-submission.service.spec.ts index 0981f320b6..7de907cfb9 100644 --- a/alcs-frontend/src/app/services/application/application-submission/application-submission.service.spec.ts +++ b/alcs-frontend/src/app/services/application/application-submission/application-submission.service.spec.ts @@ -106,6 +106,7 @@ describe('ApplicationSubmissionService', () => { turPurpose: null, turReduceNegativeImpacts: null, turTotalCorridorArea: null, + submissionStatuses: [], }; beforeEach(() => { diff --git a/alcs-frontend/src/app/services/application/application.dto.ts b/alcs-frontend/src/app/services/application/application.dto.ts index 2054b4edcc..a9f1a77bad 100644 --- a/alcs-frontend/src/app/services/application/application.dto.ts +++ b/alcs-frontend/src/app/services/application/application.dto.ts @@ -3,6 +3,7 @@ import { CardDto } from '../card/card.dto'; import { UserDto } from '../user/user.dto'; import { ApplicationRegionDto, ApplicationTypeDto } from './application-code.dto'; import { ApplicationLocalGovernmentDto } from './application-local-government/application-local-government.dto'; +import { ApplicationSubmissionToSubmissionStatusDto } from './application-submission-status/application-submission-status.dto'; export enum APPLICATION_SYSTEM_SOURCE_TYPES { APPLICANT = 'APPLICANT', @@ -114,6 +115,7 @@ export interface ApplicationSubmissionDto { owners: SubmittedApplicationOwnerDto[]; hasOtherParcelsInCommunity?: boolean | null; returnedComment?: string; + submissionStatuses: ApplicationSubmissionToSubmissionStatusDto[]; primaryContactOwnerUuid?: string; primaryContact?: SubmittedApplicationOwnerDto; diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.dto.ts b/services/apps/alcs/src/portal/application-submission/application-submission.dto.ts index 6c41a825ee..5789d698dc 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.dto.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.dto.ts @@ -9,7 +9,10 @@ import { IsUUID, MaxLength, } from 'class-validator'; -import { ApplicationStatusDto } from '../../application-submission-status/submission-status.dto'; +import { + ApplicationStatusDto, + ApplicationSubmissionToSubmissionStatusDto, +} from '../../application-submission-status/submission-status.dto'; import { BaseCodeDto } from '../../common/dtos/base.dto'; import { ApplicationOwnerDto } from './application-owner/application-owner.dto'; import { ProposedLot } from './application-submission.entity'; @@ -296,6 +299,9 @@ export class ApplicationSubmissionDetailedDto extends ApplicationSubmissionDto { @AutoMap(() => String) naruAgriTourism: string | null; + + @AutoMap(() => ApplicationSubmissionToSubmissionStatusDto) + submissionStatuses: ApplicationSubmissionToSubmissionStatusDto[]; } export class ApplicationSubmissionCreateDto { From 6671810a67207b75f7b399ea437c92de314a6caa Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Tue, 18 Jul 2023 13:42:39 -0700 Subject: [PATCH 088/954] Change buttons to primary --- .../revert-to-draft-dialog.component.html | 4 ++-- .../uncancel-application-dialog.component.html | 9 ++++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/revert-to-draft-dialog/revert-to-draft-dialog.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/revert-to-draft-dialog/revert-to-draft-dialog.component.html index 379160738a..af89c6851d 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/revert-to-draft-dialog/revert-to-draft-dialog.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/revert-to-draft-dialog/revert-to-draft-dialog.component.html @@ -24,7 +24,7 @@

Confirm Revert to Draft

- - + +
diff --git a/alcs-frontend/src/app/features/application/overview/uncancel-application-dialog/uncancel-application-dialog.component.html b/alcs-frontend/src/app/features/application/overview/uncancel-application-dialog/uncancel-application-dialog.component.html index 65bba51b4d..13d86672a1 100644 --- a/alcs-frontend/src/app/features/application/overview/uncancel-application-dialog/uncancel-application-dialog.component.html +++ b/alcs-frontend/src/app/features/application/overview/uncancel-application-dialog/uncancel-application-dialog.component.html @@ -5,7 +5,10 @@

Uncancel Application

The application's portal status will revert back to:

- +

Are you sure you want to undo cancellation?

@@ -13,7 +16,7 @@

Uncancel Application

- - + +
From 15990c28de690abc9b6b76924abf9660b475922b Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Tue, 18 Jul 2023 13:51:18 -0700 Subject: [PATCH 089/954] Reload application when cancelling / uncancelling --- .../application/application-detail.service.spec.ts | 4 ---- .../application/application-detail.service.ts | 12 +++++++----- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/alcs-frontend/src/app/services/application/application-detail.service.spec.ts b/alcs-frontend/src/app/services/application/application-detail.service.spec.ts index 19e386dc36..47ea7b1cdf 100644 --- a/alcs-frontend/src/app/services/application/application-detail.service.spec.ts +++ b/alcs-frontend/src/app/services/application/application-detail.service.spec.ts @@ -20,10 +20,6 @@ describe('ApplicationDetailService', () => { provide: ApplicationService, useValue: applicationService, }, - { - provide: ToastService, - useValue: {}, - }, ], }); service = TestBed.inject(ApplicationDetailService); diff --git a/alcs-frontend/src/app/services/application/application-detail.service.ts b/alcs-frontend/src/app/services/application/application-detail.service.ts index 98a3619396..d2c52ed659 100644 --- a/alcs-frontend/src/app/services/application/application-detail.service.ts +++ b/alcs-frontend/src/app/services/application/application-detail.service.ts @@ -10,7 +10,7 @@ export class ApplicationDetailService { private selectedFileNumber: string | undefined; - constructor(private applicationService: ApplicationService, private toastService: ToastService) {} + constructor(private applicationService: ApplicationService) {} async loadApplication(fileNumber: string) { this.clearApplication(); @@ -32,11 +32,13 @@ export class ApplicationDetailService { return updatedApp; } - cancelApplication(fileNumber: string) { - return this.applicationService.cancelApplication(fileNumber); + async cancelApplication(fileNumber: string) { + await this.applicationService.cancelApplication(fileNumber); + await this.loadApplication(fileNumber); } - uncancelApplication(fileNumber: string) { - return this.applicationService.uncancelApplication(fileNumber); + async uncancelApplication(fileNumber: string) { + await this.applicationService.uncancelApplication(fileNumber); + await this.loadApplication(fileNumber); } } From b51bd405d2b8139c7179f85e38a2a17f4896a29b Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Tue, 18 Jul 2023 16:36:26 -0700 Subject: [PATCH 090/954] Don't re-populate conditions on component changes * Only need to update validity, not the actual conditions --- .../decision-conditions/decision-conditions.component.ts | 1 - .../decision-v2/decision-input/decision-input-v2.component.ts | 1 - 2 files changed, 2 deletions(-) diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-conditions.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-conditions.component.ts index b4b08d5497..0bb8e80571 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-conditions.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-conditions.component.ts @@ -116,7 +116,6 @@ export class DecisionConditionsComponent implements OnInit, OnChanges, OnDestroy this.decision.resolutionYear ); this.selectableComponents = [...this.allComponents, ...updatedComponents]; - this.populateConditions(this.conditions); this.onChanges(); } diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.ts index 661e7d5051..014e30bed1 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.ts @@ -11,7 +11,6 @@ import { ApplicationModificationService } from '../../../../../services/applicat import { ApplicationReconsiderationDto } from '../../../../../services/application/application-reconsideration/application-reconsideration.dto'; import { ApplicationReconsiderationService } from '../../../../../services/application/application-reconsideration/application-reconsideration.service'; import { ApplicationSubmissionService } from '../../../../../services/application/application-submission/application-submission.service'; -import { SUBMISSION_STATUS } from '../../../../../services/application/application.dto'; import { ApplicationDecisionConditionDto, ApplicationDecisionDto, From 4c63d9b09592275a7262993ab0a8c04661c70713 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Wed, 19 Jul 2023 11:57:38 -0700 Subject: [PATCH 091/954] Update Overview timeline with new statuses * Update mapping of statuses and new HTML labels --- .../release-dialog.component.spec.ts | 2 +- .../revert-to-draft-dialog.component.ts | 2 +- .../overview/overview.component.ts | 116 ++++++++++-------- .../uncancel-application-dialog.component.ts | 2 +- .../overview/overview.component.ts | 22 ++-- .../application/application-code.dto.ts | 8 +- .../application-reconsideration.dto.ts | 8 -- .../application-submission-status.dto.ts | 7 +- .../services/application/application.dto.ts | 2 +- .../application/application.service.ts | 4 +- .../shared/timeline/timeline.component.html | 2 +- .../app/shared/timeline/timeline.component.ts | 2 +- ...lication-decision-v1.automapper.profile.ts | 4 + 13 files changed, 95 insertions(+), 86 deletions(-) diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/release-dialog/release-dialog.component.spec.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/release-dialog/release-dialog.component.spec.ts index 8d84a61e44..b2df1b452e 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/release-dialog/release-dialog.component.spec.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/release-dialog/release-dialog.component.spec.ts @@ -3,7 +3,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { BehaviorSubject } from 'rxjs'; -import { ApplicationStatusDto } from '../../../../../services/application/application-reconsideration/application-reconsideration.dto'; +import { ApplicationStatusDto } from '../../../../../services/application/application-submission-status/application-submission-status.dto'; import { ApplicationService } from '../../../../../services/application/application.service'; import { ReleaseDialogComponent } from './release-dialog.component'; diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/revert-to-draft-dialog/revert-to-draft-dialog.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/revert-to-draft-dialog/revert-to-draft-dialog.component.ts index db8d7bb9be..874f314f32 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/revert-to-draft-dialog/revert-to-draft-dialog.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/revert-to-draft-dialog/revert-to-draft-dialog.component.ts @@ -29,7 +29,7 @@ export class RevertToDraftDialogComponent { status.statusTypeCode !== SUBMISSION_STATUS.ALC_DECISION && status.effectiveDate < Date.now() ) - .sort((a, b) => a.effectiveDate - b.effectiveDate); + .sort((a, b) => a.effectiveDate! - b.effectiveDate!); if (validStatuses && validStatuses.length > 0) { const newStatus = validStatuses[0].status; this.mappedType = { diff --git a/alcs-frontend/src/app/features/application/overview/overview.component.ts b/alcs-frontend/src/app/features/application/overview/overview.component.ts index 037ef8f700..3dfc476a53 100644 --- a/alcs-frontend/src/app/features/application/overview/overview.component.ts +++ b/alcs-frontend/src/app/features/application/overview/overview.component.ts @@ -9,6 +9,7 @@ import { ApplicationModificationService } from '../../../services/application/ap import { ApplicationReconsiderationDto } from '../../../services/application/application-reconsideration/application-reconsideration.dto'; import { ApplicationReconsiderationService } from '../../../services/application/application-reconsideration/application-reconsideration.service'; import { ApplicationReviewService } from '../../../services/application/application-review/application-review.service'; +import { ApplicationSubmissionToSubmissionStatusDto } from '../../../services/application/application-submission-status/application-submission-status.dto'; import { ApplicationSubmissionStatusService } from '../../../services/application/application-submission-status/application-submission-status.service'; import { ApplicationDto, ApplicationReviewDto, SUBMISSION_STATUS } from '../../../services/application/application.dto'; import { ApplicationDecisionDto } from '../../../services/application/decision/application-decision-v1/application-decision.dto'; @@ -49,7 +50,7 @@ export class OverviewComponent implements OnInit, OnDestroy { $destroy = new Subject(); application?: ApplicationDto; private $decisions = new BehaviorSubject([]); - private $review = new BehaviorSubject(undefined); + private $statusHistory = new BehaviorSubject([]); events: TimelineEvent[] = []; summary = ''; isCancelled = false; @@ -79,9 +80,6 @@ export class OverviewComponent implements OnInit, OnDestroy { this.decisionService.fetchByApplication(app.fileNumber).then((res) => { this.$decisions.next(res); }); - this.reviewService.fetchReview(app.fileNumber).then((res) => { - this.$review.next(res); - }); } }) ) @@ -91,10 +89,10 @@ export class OverviewComponent implements OnInit, OnDestroy { this.$decisions, this.reconsiderationService.$reconsiderations, this.modificationService.$modifications, - this.$review + this.$statusHistory ) ) - .subscribe(([application, meetings, decisions, reconsiderations, modifications, applicationReview]) => { + .subscribe(([application, meetings, decisions, reconsiderations, modifications, statusHistory]) => { if (application) { this.summary = application.summary || ''; this.application = application; @@ -105,7 +103,7 @@ export class OverviewComponent implements OnInit, OnDestroy { decisions, reconsiderations, modifications, - applicationReview + statusHistory ); } }); @@ -120,7 +118,7 @@ export class OverviewComponent implements OnInit, OnDestroy { private async clearComponentData() { this.$decisions.next([]); - this.$review.next(undefined); + this.$statusHistory.next([]); } async onCancelApplication() { @@ -162,31 +160,40 @@ export class OverviewComponent implements OnInit, OnDestroy { decisions: ApplicationDecisionDto[], reconsiderations: ApplicationReconsiderationDto[], modifications: ApplicationModificationDto[], - applicationReview: ApplicationReviewDto | undefined + statusHistory: ApplicationSubmissionToSubmissionStatusDto[] ): TimelineEvent[] { const mappedEvents: TimelineEvent[] = []; - if (application.dateSubmittedToAlc) { - mappedEvents.push({ - name: - applicationReview && applicationReview.isAuthorized === false - ? 'L/FNG Refused to Forward' - : 'Submitted to ALC', - startDate: new Date(application.dateSubmittedToAlc + SORTING_ORDER.SUBMITTED), - isFulfilled: true, - }); - } - if (application.dateAcknowledgedIncomplete) { - mappedEvents.push({ - name: 'Acknowledged Incomplete', - startDate: new Date(application.dateAcknowledgedIncomplete + SORTING_ORDER.ACKNOWLEDGED_INCOMPLETE), - isFulfilled: true, - }); + const statusesToInclude = statusHistory.filter( + (status) => ![SUBMISSION_STATUS.IN_REVIEW_BY_ALC].includes(status.status.code) + ); + for (const status of statusesToInclude) { + if (status.effectiveDate) { + let htmlText = `${status.status.label}`; + + if (status.status.code === SUBMISSION_STATUS.RECEIVED_BY_ALC) { + htmlText = 'Received All Items - Received by ALC'; + } + + if (status.status.code === SUBMISSION_STATUS.IN_PROGRESS) { + htmlText = 'Created - In Progress'; + } + + if (status.status.code === SUBMISSION_STATUS.SUBMITTED_TO_ALC_INCOMPLETE) { + htmlText = 'Acknowledge Incomplete - Submitted to ALC - Incomplete'; + } + + mappedEvents.push({ + htmlText, + startDate: new Date(status.effectiveDate + status.status.weight), + isFulfilled: true, + }); + } } if (application.dateAcknowledgedComplete) { mappedEvents.push({ - name: 'Acknowledged Complete', + htmlText: 'Acknowledged Complete', startDate: new Date(application.dateAcknowledgedComplete + SORTING_ORDER.ACKNOWLEDGE_COMPLETE), isFulfilled: true, }); @@ -194,29 +201,27 @@ export class OverviewComponent implements OnInit, OnDestroy { if (application.feePaidDate) { mappedEvents.push({ - name: 'Fee Received Date', + htmlText: 'Fee Received Date', startDate: new Date(application.feePaidDate + SORTING_ORDER.FEE_RECEIVED), isFulfilled: true, }); } - if (application.decisionMeetings.length) { - const events: TimelineEvent[] = application.decisionMeetings.map((meeting, index) => ({ - name: `Review Discussion #${index + 1}`, - startDate: new Date(meeting.date), - isFulfilled: true, - })); - mappedEvents.push(...events); - } + const events: TimelineEvent[] = application.decisionMeetings + .sort((a, b) => a.date - b.date) + .map((meeting, index) => { + let htmlText = `Review Discussion #${index + 1}`; + if (index === 0) { + htmlText += ` - Under Review by ALC`; + } - // TODO this will be covered in next status tickets - // for (const event of application.statusHistory) { - // mappedEvents.push({ - // name: event.label, - // startDate: new Date(event.time), - // isFulfilled: true, - // }); - // } + return { + htmlText, + startDate: new Date(meeting.date), + isFulfilled: true, + }; + }); + mappedEvents.push(...events); for (const [index, decision] of decisions.entries()) { if (decision.isDraft) { @@ -225,7 +230,7 @@ export class OverviewComponent implements OnInit, OnDestroy { if (decision.auditDate) { mappedEvents.push({ - name: `Audited Decision #${decisions.length - index}`, + htmlText: `Audited Decision #${decisions.length - index}`, startDate: new Date(decision.auditDate + SORTING_ORDER.AUDITED_DECISION), isFulfilled: true, }); @@ -233,14 +238,14 @@ export class OverviewComponent implements OnInit, OnDestroy { if (decision.chairReviewDate) { mappedEvents.push({ - name: `Chair Reviewed Decision #${decisions.length - index}`, + htmlText: `Chair Reviewed Decision #${decisions.length - index}`, startDate: new Date(decision.chairReviewDate + SORTING_ORDER.CHAIR_REVIEW_DECISION), isFulfilled: true, }); } mappedEvents.push({ - name: `Decision #${decisions.length - index} Made${ + htmlText: `Decision #${decisions.length - index} Made${ decisions.length - 1 === index ? ` - Active Days: ${application.activeDays}` : '' }`, startDate: new Date(decision.date + SORTING_ORDER.DECISION_MADE), @@ -250,7 +255,7 @@ export class OverviewComponent implements OnInit, OnDestroy { if (application.notificationSentDate) { mappedEvents.push({ - name: "'Ready for Review' Notification Sent to Applicant", + htmlText: "'Ready for Review' Notification Sent to Applicant", startDate: new Date(application.notificationSentDate), isFulfilled: true, }); @@ -262,7 +267,7 @@ export class OverviewComponent implements OnInit, OnDestroy { const count = typeCount.get(meeting.meetingType.code) || 0; mappedEvents.push({ - name: `${meeting.meetingType.label} #${count + 1}`, + htmlText: `${meeting.meetingType.label} #${count + 1}`, startDate: new Date(meeting.meetingStartDate + SORTING_ORDER.VISIT_REQUESTS), fulfilledDate: meeting.meetingEndDate ? new Date(meeting.meetingEndDate) : undefined, isFulfilled: !!meeting.meetingEndDate, @@ -271,7 +276,7 @@ export class OverviewComponent implements OnInit, OnDestroy { if (meeting.reportStartDate) { mappedEvents.push({ - name: `${meeting.meetingType.label} #${count + 1} Report Sent to Applicant`, + htmlText: `${meeting.meetingType.label} #${count + 1} Report Sent to Applicant`, startDate: new Date(meeting.reportStartDate + SORTING_ORDER.VISIT_REPORTS), fulfilledDate: meeting.reportEndDate ? new Date(meeting.reportEndDate) : undefined, isFulfilled: !!meeting.reportEndDate, @@ -300,19 +305,19 @@ export class OverviewComponent implements OnInit, OnDestroy { .entries()) { if (reconsideration.type.code === '33.1') { events.push({ - name: `Reconsideration Request #${reconsiderations.length - index} - ${reconsideration.type.code}`, + htmlText: `Reconsideration Request #${reconsiderations.length - index} - ${reconsideration.type.code}`, startDate: new Date(reconsideration.submittedDate + SORTING_ORDER.RECON_REQUEST), isFulfilled: true, }); } else { events.push({ - name: `Reconsideration Requested #${reconsiderations.length - index} - ${reconsideration.type.code}`, + htmlText: `Reconsideration Requested #${reconsiderations.length - index} - ${reconsideration.type.code}`, startDate: new Date(reconsideration.submittedDate + SORTING_ORDER.RECON_REQUEST), isFulfilled: true, }); if (reconsideration.reviewDate) { events.push({ - name: `Reconsideration Request Reviewed #${reconsiderations.length - index} - ${ + htmlText: `Reconsideration Request Reviewed #${reconsiderations.length - index} - ${ reconsideration.reviewOutcome?.label }`, startDate: new Date(reconsideration.reviewDate + SORTING_ORDER.RECON_REVIEW), @@ -328,7 +333,7 @@ export class OverviewComponent implements OnInit, OnDestroy { const events: TimelineEvent[] = []; for (const [index, modification] of modifications.sort((a, b) => b.submittedDate - a.submittedDate).entries()) { events.push({ - name: `Modification Requested #${modifications.length - index} - ${ + htmlText: `Modification Requested #${modifications.length - index} - ${ modification.isTimeExtension ? 'Time Extension' : 'Other' }`, startDate: new Date(modification.submittedDate + SORTING_ORDER.MODIFICATION_REQUEST), @@ -336,7 +341,9 @@ export class OverviewComponent implements OnInit, OnDestroy { }); if (modification.reviewDate) { events.push({ - name: `Modification Request Reviewed #${modifications.length - index} - ${modification.reviewOutcome?.label}`, + htmlText: `Modification Request Reviewed #${modifications.length - index} - ${ + modification.reviewOutcome?.label + }`, startDate: new Date(modification.reviewDate + SORTING_ORDER.MODIFICATION_REVIEW), isFulfilled: true, }); @@ -358,5 +365,6 @@ export class OverviewComponent implements OnInit, OnDestroy { this.isCancelled = statusHistory.filter((status) => status.effectiveDate && status.statusTypeCode === SUBMISSION_STATUS.CANCELLED) .length > 0; + this.$statusHistory.next(statusHistory); } } diff --git a/alcs-frontend/src/app/features/application/overview/uncancel-application-dialog/uncancel-application-dialog.component.ts b/alcs-frontend/src/app/features/application/overview/uncancel-application-dialog/uncancel-application-dialog.component.ts index edbf3c27e7..1ca143957d 100644 --- a/alcs-frontend/src/app/features/application/overview/uncancel-application-dialog/uncancel-application-dialog.component.ts +++ b/alcs-frontend/src/app/features/application/overview/uncancel-application-dialog/uncancel-application-dialog.component.ts @@ -29,7 +29,7 @@ export class UncancelApplicationDialogComponent { status.statusTypeCode !== SUBMISSION_STATUS.CANCELLED && status.effectiveDate < Date.now() ) - .sort((a, b) => a.effectiveDate - b.effectiveDate); + .sort((a, b) => a.effectiveDate! - b.effectiveDate!); if (validStatuses && validStatuses.length > 0) { const validStatus = validStatuses[0].status; this.status = { diff --git a/alcs-frontend/src/app/features/notice-of-intent/overview/overview.component.ts b/alcs-frontend/src/app/features/notice-of-intent/overview/overview.component.ts index 58dc33ca1d..4eebf2cea9 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/overview/overview.component.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/overview/overview.component.ts @@ -101,7 +101,7 @@ export class OverviewComponent implements OnInit, OnDestroy { const mappedEvents: TimelineEvent[] = []; if (noticeOfIntent.dateSubmittedToAlc) { mappedEvents.push({ - name: 'Submitted to ALC', + htmlText: 'Submitted to ALC', startDate: new Date(noticeOfIntent.dateSubmittedToAlc + SORTING_ORDER.SUBMITTED), isFulfilled: true, }); @@ -109,7 +109,7 @@ export class OverviewComponent implements OnInit, OnDestroy { if (noticeOfIntent.dateAcknowledgedIncomplete) { mappedEvents.push({ - name: 'Acknowledged Incomplete', + htmlText: 'Acknowledged Incomplete', startDate: new Date(noticeOfIntent.dateAcknowledgedIncomplete + SORTING_ORDER.ACKNOWLEDGED_INCOMPLETE), isFulfilled: true, }); @@ -117,7 +117,7 @@ export class OverviewComponent implements OnInit, OnDestroy { if (noticeOfIntent.dateAcknowledgedComplete) { mappedEvents.push({ - name: 'Acknowledged Complete', + htmlText: 'Acknowledged Complete', startDate: new Date(noticeOfIntent.dateAcknowledgedComplete + SORTING_ORDER.ACKNOWLEDGE_COMPLETE), isFulfilled: true, }); @@ -125,7 +125,7 @@ export class OverviewComponent implements OnInit, OnDestroy { if (noticeOfIntent.feePaidDate) { mappedEvents.push({ - name: 'Fee Received Date', + htmlText: 'Fee Received Date', startDate: new Date(noticeOfIntent.feePaidDate + SORTING_ORDER.FEE_RECEIVED), isFulfilled: true, }); @@ -133,7 +133,7 @@ export class OverviewComponent implements OnInit, OnDestroy { if (noticeOfIntent.dateReceivedAllItems) { mappedEvents.push({ - name: 'Received All Items', + htmlText: 'Received All Items', startDate: new Date(noticeOfIntent.dateReceivedAllItems + SORTING_ORDER.FEE_RECEIVED), isFulfilled: true, }); @@ -142,14 +142,14 @@ export class OverviewComponent implements OnInit, OnDestroy { for (const [index, decision] of decisions.entries()) { if (decision.auditDate) { mappedEvents.push({ - name: `Audited Decision #${decisions.length - index}`, + htmlText: `Audited Decision #${decisions.length - index}`, startDate: new Date(decision.auditDate + SORTING_ORDER.AUDITED_DECISION), isFulfilled: true, }); } mappedEvents.push({ - name: `Decision #${decisions.length - index} Made${ + htmlText: `Decision #${decisions.length - index} Made${ decisions.length - 1 === index ? ` - Active Days: ${noticeOfIntent.activeDays}` : '' }`, startDate: new Date(decision.date + SORTING_ORDER.DECISION_MADE), @@ -162,7 +162,7 @@ export class OverviewComponent implements OnInit, OnDestroy { meetings.forEach((meeting) => { const count = typeCount.get(meeting.meetingType.code) || 0; mappedEvents.push({ - name: `${meeting.meetingType.label} #${count + 1}`, + htmlText: `${meeting.meetingType.label} #${count + 1}`, startDate: new Date(meeting.meetingStartDate + SORTING_ORDER.VISIT_REQUESTS), fulfilledDate: meeting.meetingEndDate ? new Date(meeting.meetingEndDate) : undefined, isFulfilled: !!meeting.meetingEndDate, @@ -184,14 +184,16 @@ export class OverviewComponent implements OnInit, OnDestroy { const events: TimelineEvent[] = []; for (const [index, modification] of modifications.sort((a, b) => b.submittedDate - a.submittedDate).entries()) { events.push({ - name: `Modification Requested #${modifications.length - index}`, + htmlText: `Modification Requested #${modifications.length - index}`, startDate: new Date(modification.submittedDate + SORTING_ORDER.MODIFICATION_REQUEST), isFulfilled: true, }); if (modification.outcomeNotificationDate) { events.push({ - name: `Modification Request Reviewed #${modifications.length - index} - ${modification.reviewOutcome.label}`, + htmlText: `Modification Request Reviewed #${modifications.length - index} - ${ + modification.reviewOutcome.label + }`, startDate: new Date(modification.submittedDate + SORTING_ORDER.MODIFICATION_REQUEST), isFulfilled: true, }); diff --git a/alcs-frontend/src/app/services/application/application-code.dto.ts b/alcs-frontend/src/app/services/application/application-code.dto.ts index 670140a87f..ff201daca9 100644 --- a/alcs-frontend/src/app/services/application/application-code.dto.ts +++ b/alcs-frontend/src/app/services/application/application-code.dto.ts @@ -1,8 +1,6 @@ import { BaseCodeDto } from '../../shared/dto/base.dto'; -import { - ApplicationStatusDto, - ReconsiderationTypeDto, -} from './application-reconsideration/application-reconsideration.dto'; +import { ReconsiderationTypeDto } from './application-reconsideration/application-reconsideration.dto'; +import { ApplicationStatusDto } from './application-submission-status/application-submission-status.dto'; export interface CardStatusDto extends BaseCodeDto {} export interface ApplicationRegionDto extends BaseCodeDto {} @@ -18,5 +16,5 @@ export interface ApplicationMasterCodesDto { status: CardStatusDto[]; region: ApplicationRegionDto[]; reconsiderationType: ReconsiderationTypeDto[]; - applicationStatusType: ApplicationStatusDto[]; + applicationStatuses: ApplicationStatusDto[]; } diff --git a/alcs-frontend/src/app/services/application/application-reconsideration/application-reconsideration.dto.ts b/alcs-frontend/src/app/services/application/application-reconsideration/application-reconsideration.dto.ts index f88364d34e..a61462469e 100644 --- a/alcs-frontend/src/app/services/application/application-reconsideration/application-reconsideration.dto.ts +++ b/alcs-frontend/src/app/services/application/application-reconsideration/application-reconsideration.dto.ts @@ -16,14 +16,6 @@ export interface ReconsiderationTypeDto extends BaseCodeDto { export interface ReconsiderationReviewOutcomeTypeDto extends BaseCodeDto {} -export interface ApplicationStatusDto extends BaseCodeDto { - alcsBackgroundColor: string; - alcsColor: string; - portalBackgroundColor: string; - portalColor: string; - weight: number; -} - export interface ApplicationForReconsiderationDto { fileNumber: string; type: ApplicationTypeDto; diff --git a/alcs-frontend/src/app/services/application/application-submission-status/application-submission-status.dto.ts b/alcs-frontend/src/app/services/application/application-submission-status/application-submission-status.dto.ts index 41d2d17381..afdc12ca34 100644 --- a/alcs-frontend/src/app/services/application/application-submission-status/application-submission-status.dto.ts +++ b/alcs-frontend/src/app/services/application/application-submission-status/application-submission-status.dto.ts @@ -1,4 +1,5 @@ import { BaseCodeDto } from '../../../shared/dto/base.dto'; +import { SUBMISSION_STATUS } from '../application.dto'; export interface ApplicationStatusDto extends BaseCodeDto { alcsBackgroundColor: string; @@ -8,12 +9,16 @@ export interface ApplicationStatusDto extends BaseCodeDto { portalBackgroundColor: string; portalColor: string; + + code: SUBMISSION_STATUS; + + weight: number; } export interface ApplicationSubmissionToSubmissionStatusDto { submissionUuid: string; - effectiveDate: number; + effectiveDate: number | null; statusTypeCode: string; diff --git a/alcs-frontend/src/app/services/application/application.dto.ts b/alcs-frontend/src/app/services/application/application.dto.ts index a9f1a77bad..85dafca899 100644 --- a/alcs-frontend/src/app/services/application/application.dto.ts +++ b/alcs-frontend/src/app/services/application/application.dto.ts @@ -44,7 +44,7 @@ export interface CreateApplicationDto { } export interface ApplicationDecisionMeetingDto { - date: Date; + date: number; } export interface ProposedLot { diff --git a/alcs-frontend/src/app/services/application/application.service.ts b/alcs-frontend/src/app/services/application/application.service.ts index 67e5d5f54d..3e04215beb 100644 --- a/alcs-frontend/src/app/services/application/application.service.ts +++ b/alcs-frontend/src/app/services/application/application.service.ts @@ -9,7 +9,7 @@ import { ApplicationTypeDto, CardStatusDto, } from './application-code.dto'; -import { ApplicationStatusDto } from './application-reconsideration/application-reconsideration.dto'; +import { ApplicationStatusDto } from './application-submission-status/application-submission-status.dto'; import { ApplicationDto, CreateApplicationDto, UpdateApplicationDto } from './application.dto'; @Injectable({ @@ -97,7 +97,7 @@ export class ApplicationService { this.regions = codes.region; this.$applicationRegions.next(this.regions); - this.applicationStatuses = codes.applicationStatusType; + this.applicationStatuses = codes.applicationStatuses; this.$applicationStatuses.next(this.applicationStatuses); } diff --git a/alcs-frontend/src/app/shared/timeline/timeline.component.html b/alcs-frontend/src/app/shared/timeline/timeline.component.html index 3bce7bcdd6..b4f3721b49 100644 --- a/alcs-frontend/src/app/shared/timeline/timeline.component.html +++ b/alcs-frontend/src/app/shared/timeline/timeline.component.html @@ -23,7 +23,7 @@ Add date - {{ event.name }} + diff --git a/alcs-frontend/src/app/shared/timeline/timeline.component.ts b/alcs-frontend/src/app/shared/timeline/timeline.component.ts index 5327b67b9a..f0303d3d6c 100644 --- a/alcs-frontend/src/app/shared/timeline/timeline.component.ts +++ b/alcs-frontend/src/app/shared/timeline/timeline.component.ts @@ -4,7 +4,7 @@ export interface TimelineEvent { startDate: Date; fulfilledDate?: Date; isFulfilled: boolean; - name: string; + htmlText: string; link?: string; } diff --git a/services/apps/alcs/src/common/automapper/application-decision-v1.automapper.profile.ts b/services/apps/alcs/src/common/automapper/application-decision-v1.automapper.profile.ts index bc8afa55e5..362a4c5ff5 100644 --- a/services/apps/alcs/src/common/automapper/application-decision-v1.automapper.profile.ts +++ b/services/apps/alcs/src/common/automapper/application-decision-v1.automapper.profile.ts @@ -160,6 +160,10 @@ export class ApplicationDecisionProfile extends AutomapperProfile { mapper, ApplicationDecisionMeeting, ApplicationDecisionMeetingDto, + forMember( + (a) => a.date, + mapFrom((ad) => ad.date.getTime()), + ), ); createMap( mapper, From af9c2ab6019e05674d53449c0732dca9297fe206 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Wed, 19 Jul 2023 14:14:05 -0700 Subject: [PATCH 092/954] Code Review Feedback Co-authored-by: to. sandra <76515860+sandratoh@users.noreply.github.com> --- .../app/features/application/overview/overview.component.ts | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/alcs-frontend/src/app/features/application/overview/overview.component.ts b/alcs-frontend/src/app/features/application/overview/overview.component.ts index 3dfc476a53..ce0e893608 100644 --- a/alcs-frontend/src/app/features/application/overview/overview.component.ts +++ b/alcs-frontend/src/app/features/application/overview/overview.component.ts @@ -8,10 +8,9 @@ import { ApplicationModificationDto } from '../../../services/application/applic import { ApplicationModificationService } from '../../../services/application/application-modification/application-modification.service'; import { ApplicationReconsiderationDto } from '../../../services/application/application-reconsideration/application-reconsideration.dto'; import { ApplicationReconsiderationService } from '../../../services/application/application-reconsideration/application-reconsideration.service'; -import { ApplicationReviewService } from '../../../services/application/application-review/application-review.service'; import { ApplicationSubmissionToSubmissionStatusDto } from '../../../services/application/application-submission-status/application-submission-status.dto'; import { ApplicationSubmissionStatusService } from '../../../services/application/application-submission-status/application-submission-status.service'; -import { ApplicationDto, ApplicationReviewDto, SUBMISSION_STATUS } from '../../../services/application/application.dto'; +import { ApplicationDto, SUBMISSION_STATUS } from '../../../services/application/application.dto'; import { ApplicationDecisionDto } from '../../../services/application/decision/application-decision-v1/application-decision.dto'; import { ApplicationDecisionService } from '../../../services/application/decision/application-decision-v1/application-decision.service'; import { ConfirmationDialogService } from '../../../shared/confirmation-dialog/confirmation-dialog.service'; @@ -61,7 +60,6 @@ export class OverviewComponent implements OnInit, OnDestroy { private decisionService: ApplicationDecisionService, private reconsiderationService: ApplicationReconsiderationService, private modificationService: ApplicationModificationService, - private reviewService: ApplicationReviewService, private confirmationDialogService: ConfirmationDialogService, private applicationSubmissionStatusService: ApplicationSubmissionStatusService, private dialog: MatDialog @@ -180,7 +178,7 @@ export class OverviewComponent implements OnInit, OnDestroy { } if (status.status.code === SUBMISSION_STATUS.SUBMITTED_TO_ALC_INCOMPLETE) { - htmlText = 'Acknowledge Incomplete - Submitted to ALC - Incomplete'; + htmlText = 'Acknowledged Incomplete - Submitted to ALC - Incomplete'; } mappedEvents.push({ From be6c7271306bf4f9ffcd79d0d6c0b07b4a4babec Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Wed, 19 Jul 2023 15:29:02 -0700 Subject: [PATCH 093/954] Filter mapped conditions to remove any deleted components on change --- .../decision-conditions.component.ts | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-conditions.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-conditions.component.ts index 0bb8e80571..6fcf5886e3 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-conditions.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-conditions.component.ts @@ -116,6 +116,25 @@ export class DecisionConditionsComponent implements OnInit, OnChanges, OnDestroy this.decision.resolutionYear ); this.selectableComponents = [...this.allComponents, ...updatedComponents]; + + this.mappedConditions = this.mappedConditions.map((condition) => { + const selectedComponents = this.selectableComponents + .filter((component) => + condition.componentsToCondition + ?.map((conditionComponent) => conditionComponent.tempId) + .includes(component.tempId) + ) + .map((e) => ({ + componentDecisionUuid: e.decisionUuid, + componentToConditionType: e.code, + tempId: e.tempId, + })); + + return { + ...condition, + componentsToCondition: selectedComponents, + }; + }); this.onChanges(); } From ac4571f4a873fd677b439a85da7bb8ad9489486e Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Wed, 19 Jul 2023 14:25:16 -0700 Subject: [PATCH 094/954] Add Local Government options for LG Users * Replace owners with their own contact name * Create new Government type Owner * Update set primary contact to accept multiple types --- .../application-details.component.html | 9 +- .../application-details.component.ts | 11 +- .../other-parcels/other-parcels.component.ts | 4 +- .../application-owners-dialog.component.ts | 6 +- .../parcel-details.component.ts | 12 +- .../primary-contact.component.html | 58 ++++++--- .../primary-contact.component.spec.ts | 10 ++ .../primary-contact.component.ts | 115 ++++++++++++------ .../application-owner.dto.ts | 12 +- .../auth-interceptor.service.spec.ts | 2 +- .../authentication/authentication.dto.ts | 10 ++ .../authentication/authentication.service.ts | 12 +- .../authentication/token-refresh.service.ts | 2 +- .../shared/header/header.component.spec.ts | 2 +- .../src/app/shared/header/header.component.ts | 2 +- .../application-local-government.service.ts | 1 - services/apps/alcs/src/main.module.ts | 6 +- .../application-owner.controller.spec.ts | 8 +- .../application-owner.controller.ts | 41 ++++--- .../application-owner.dto.ts | 16 ++- .../application-owner.service.ts | 24 ++-- ...ation-submission-validator.service.spec.ts | 34 ++++++ ...pplication-submission-validator.service.ts | 10 +- ...1689806720586-add_government_owner_type.ts | 17 +++ .../alcs/src/user/user.controller.spec.ts | 35 ++++-- .../apps/alcs/src/user/user.controller.ts | 7 +- services/apps/alcs/src/user/user.dto.ts | 2 + services/apps/alcs/src/user/user.module.ts | 6 +- .../apps/alcs/src/user/user.service.spec.ts | 66 +++++++--- services/apps/alcs/src/user/user.service.ts | 16 ++- 30 files changed, 401 insertions(+), 155 deletions(-) create mode 100644 portal-frontend/src/app/services/authentication/authentication.dto.ts create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1689806720586-add_government_owner_type.ts diff --git a/portal-frontend/src/app/features/application-details/application-details.component.html b/portal-frontend/src/app/features/application-details/application-details.component.html index 6dee41c5ba..5b108b7b3f 100644 --- a/portal-frontend/src/app/features/application-details/application-details.component.html +++ b/portal-frontend/src/app/features/application-details/application-details.component.html @@ -36,8 +36,15 @@

3. Primary Contact

- Organization (optional) + Organization (optional) Ministry/Department Responsible + Department
{{ primaryContact?.organizationName }} diff --git a/portal-frontend/src/app/features/application-details/application-details.component.ts b/portal-frontend/src/app/features/application-details/application-details.component.ts index 4dc14c1e2d..071fe7ed2f 100644 --- a/portal-frontend/src/app/features/application-details/application-details.component.ts +++ b/portal-frontend/src/app/features/application-details/application-details.component.ts @@ -55,9 +55,14 @@ export class ApplicationDetailsComponent implements OnInit, OnDestroy { if (app) { this.primaryContact = app.owners.find((owner) => owner.uuid === app.primaryContactOwnerUuid); this.populateLocalGovernment(app.localGovernmentUuid); - this.needsAuthorizationLetter = !( - app.owners.length === 1 && app.owners[0].type.code === APPLICATION_OWNER.INDIVIDUAL - ); + + this.needsAuthorizationLetter = + !(this.primaryContact?.type.code === APPLICATION_OWNER.GOVERNMENT) && + !( + app.owners.length === 1 && + (app.owners[0].type.code === APPLICATION_OWNER.INDIVIDUAL || + app.owners[0].type.code === APPLICATION_OWNER.GOVERNMENT) + ); } }); diff --git a/portal-frontend/src/app/features/edit-submission/other-parcels/other-parcels.component.ts b/portal-frontend/src/app/features/edit-submission/other-parcels/other-parcels.component.ts index d710e033dd..b576c4b562 100644 --- a/portal-frontend/src/app/features/edit-submission/other-parcels/other-parcels.component.ts +++ b/portal-frontend/src/app/features/edit-submission/other-parcels/other-parcels.component.ts @@ -70,7 +70,9 @@ export class OtherParcelsComponent extends StepComponent implements OnInit, OnDe this.application = application; this.fileId = application.fileNumber; this.submissionUuid = application.uuid; - const nonAgentOwners = application.owners.filter((owner) => owner.type.code !== APPLICATION_OWNER.AGENT); + const nonAgentOwners = application.owners.filter( + (owner) => ![APPLICATION_OWNER.AGENT, APPLICATION_OWNER.GOVERNMENT].includes(owner.type.code) + ); this.owners = nonAgentOwners.map((o) => ({ ...o, parcels: o.parcels.filter((p) => p.parcelType === PARCEL_TYPE.OTHER), diff --git a/portal-frontend/src/app/features/edit-submission/parcel-details/application-owners-dialog/application-owners-dialog.component.ts b/portal-frontend/src/app/features/edit-submission/parcel-details/application-owners-dialog/application-owners-dialog.component.ts index c44bfa2a41..53ae86801d 100644 --- a/portal-frontend/src/app/features/edit-submission/parcel-details/application-owners-dialog/application-owners-dialog.component.ts +++ b/portal-frontend/src/app/features/edit-submission/parcel-details/application-owners-dialog/application-owners-dialog.component.ts @@ -1,6 +1,6 @@ import { Component, Inject } from '@angular/core'; import { MAT_DIALOG_DATA } from '@angular/material/dialog'; -import { ApplicationOwnerDto, APPLICATION_OWNER } from '../../../../services/application-owner/application-owner.dto'; +import { APPLICATION_OWNER, ApplicationOwnerDto } from '../../../../services/application-owner/application-owner.dto'; import { ApplicationOwnerService } from '../../../../services/application-owner/application-owner.service'; @Component({ @@ -31,7 +31,9 @@ export class ApplicationOwnersDialogComponent { async onUpdated() { const updatedOwners = await this.applicationOwnerService.fetchBySubmissionId(this.submissionUuid); if (updatedOwners) { - this.owners = updatedOwners.filter((owner) => owner.type.code !== APPLICATION_OWNER.AGENT); + this.owners = updatedOwners.filter( + (owner) => ![APPLICATION_OWNER.AGENT, APPLICATION_OWNER.GOVERNMENT].includes(owner.type.code) + ); this.isDirty = true; } } diff --git a/portal-frontend/src/app/features/edit-submission/parcel-details/parcel-details.component.ts b/portal-frontend/src/app/features/edit-submission/parcel-details/parcel-details.component.ts index db42a3ea8c..dcc2ee3388 100644 --- a/portal-frontend/src/app/features/edit-submission/parcel-details/parcel-details.component.ts +++ b/portal-frontend/src/app/features/edit-submission/parcel-details/parcel-details.component.ts @@ -48,10 +48,10 @@ export class ParcelDetailsComponent extends StepComponent implements OnInit, Aft this.fileId = applicationSubmission.fileNumber; this.submissionUuid = applicationSubmission.uuid; this.loadParcels(); - const nonAgentOwners = applicationSubmission.owners.filter( - (owner) => owner.type.code !== APPLICATION_OWNER.AGENT + const parcelOwners = applicationSubmission.owners.filter( + (owner) => ![APPLICATION_OWNER.AGENT, APPLICATION_OWNER.GOVERNMENT].includes(owner.type.code) ); - this.$owners.next(nonAgentOwners); + this.$owners.next(parcelOwners); } }); @@ -159,8 +159,10 @@ export class ParcelDetailsComponent extends StepComponent implements OnInit, Aft async onOwnersUpdated() { const owners = await this.applicationOwnerService.fetchBySubmissionId(this.submissionUuid); if (owners) { - const nonAgentOwners = owners.filter((owner) => owner.type.code !== APPLICATION_OWNER.AGENT); - this.$owners.next(nonAgentOwners); + const parcelOwners = owners.filter( + (owner) => ![APPLICATION_OWNER.AGENT, APPLICATION_OWNER.GOVERNMENT].includes(owner.type.code) + ); + this.$owners.next(parcelOwners); } } diff --git a/portal-frontend/src/app/features/edit-submission/primary-contact/primary-contact.component.html b/portal-frontend/src/app/features/edit-submission/primary-contact/primary-contact.component.html index 6f9528b20d..313af24e69 100644 --- a/portal-frontend/src/app/features/edit-submission/primary-contact/primary-contact.component.html +++ b/portal-frontend/src/app/features/edit-submission/primary-contact/primary-contact.component.html @@ -1,17 +1,21 @@

Primary Contact

-

Select from the listed parcel owners or identify a third party agent

+

Select from the listed parcel owners or identify a third party agent

+

+ Identify staff from the local or first nation government listed below or a third-party agent to act as the primary + contact. +

*All fields are required unless stated optional.

Documents needed for this step:
    -
  • Authorization Letter (if applicable)
    • +
  • Authorization Letters (if applicable)
- +
{{ owner.displayName }}

checkPrimary Contact
-
Third Party Agent on behalf of Owner(s)
+ +
{{governmentName}} Staff
+ +
checkPrimary Contact
+ +
Third-Party Agent
- + + @@ -109,19 +127,25 @@

Primary Contact Information

Primary Contact Authorization Letters

An authorization letter must be provided if: -
    -
  1. the parcel under application is owned by more than one person;
    2. -
  2. the parcel(s) is owned by an organization; or
    3. -
  3. the parcel(s) is owned by a corporation (private, Crown, local government, First Nations); or
    4. -
  4. the application is being submitted by a third-party agent on behalf of the land owner(s)
    5. -
-

- The authorization letter must be signed by all individual land owners and the majority of directors in - organization land owners listed in Step 1. Please consult the Supporting Documentation page of ALC website for - further instruction and an Authorization Letter template. -

+ +
    +
  1. the parcel under application is owned by more than one person;
    2. +
  2. the parcel(s) is owned by an organization; or
    3. +
  3. the parcel(s) is owned by a corporation (private, Crown, local government, First Nations); or
    4. +
  4. the application is being submitted by a third-party agent on behalf of the land owner(s)
    5. +
+

+ The authorization letter must be signed by all individual land owners and the majority of directors in + organization land owners listed in Step 1. Please consult the Supporting Documentation page of ALC website for + further instruction and an Authorization Letter template. +

+ + + An authorization letter must be provided only if the application is being submitted by a third-party agent. Please + consult the Supporting Documentation page of the TODO: FIX THIS: ALC website for further instruction. +
-
Authorization Letters
+
Authorization Letters (if applicable)
{ let mockAppService: DeepMocked; let mockAppDocumentService: DeepMocked; let mockAppOwnerService: DeepMocked; + let mockAuthService: DeepMocked; let applicationDocumentPipe = new BehaviorSubject([]); @@ -24,6 +27,9 @@ describe('PrimaryContactComponent', () => { mockAppService = createMock(); mockAppDocumentService = createMock(); mockAppOwnerService = createMock(); + mockAuthService = createMock(); + + mockAuthService.$currentProfile = new BehaviorSubject(undefined); await TestBed.configureTestingModule({ providers: [ @@ -43,6 +49,10 @@ describe('PrimaryContactComponent', () => { provide: MatDialog, useValue: {}, }, + { + provide: AuthenticationService, + useValue: mockAuthService, + }, ], declarations: [PrimaryContactComponent], schemas: [NO_ERRORS_SCHEMA], diff --git a/portal-frontend/src/app/features/edit-submission/primary-contact/primary-contact.component.ts b/portal-frontend/src/app/features/edit-submission/primary-contact/primary-contact.component.ts index 4e8871f591..71d0d984a6 100644 --- a/portal-frontend/src/app/features/edit-submission/primary-contact/primary-contact.component.ts +++ b/portal-frontend/src/app/features/edit-submission/primary-contact/primary-contact.component.ts @@ -1,19 +1,16 @@ -import { Component, Input, OnDestroy, OnInit } from '@angular/core'; +import { Component, OnDestroy, OnInit } from '@angular/core'; import { FormControl, FormGroup, Validators } from '@angular/forms'; import { MatDialog } from '@angular/material/dialog'; import { Router } from '@angular/router'; -import { BehaviorSubject, takeUntil } from 'rxjs'; +import { takeUntil } from 'rxjs'; import { ApplicationDocumentDto, DOCUMENT_TYPE } from '../../../services/application-document/application-document.dto'; import { ApplicationDocumentService } from '../../../services/application-document/application-document.service'; import { APPLICATION_OWNER, ApplicationOwnerDto } from '../../../services/application-owner/application-owner.dto'; import { ApplicationOwnerService } from '../../../services/application-owner/application-owner.service'; -import { ApplicationSubmissionDetailedDto } from '../../../services/application-submission/application-submission.dto'; import { ApplicationSubmissionService } from '../../../services/application-submission/application-submission.service'; -import { FileHandle } from '../../../shared/file-drag-drop/drag-drop.directive'; -import { RemoveFileConfirmationDialogComponent } from '../../alcs-edit-submission/remove-file-confirmation-dialog/remove-file-confirmation-dialog.component'; +import { AuthenticationService } from '../../../services/authentication/authentication.service'; import { EditApplicationSteps } from '../edit-submission.component'; import { FilesStepComponent } from '../files-step.partial'; -import { StepComponent } from '../step.partial'; @Component({ selector: 'app-primary-contact', @@ -23,14 +20,17 @@ import { StepComponent } from '../step.partial'; export class PrimaryContactComponent extends FilesStepComponent implements OnInit, OnDestroy { currentStep = EditApplicationSteps.PrimaryContact; - nonAgentOwners: ApplicationOwnerDto[] = []; + parcelOwners: ApplicationOwnerDto[] = []; owners: ApplicationOwnerDto[] = []; files: (ApplicationDocumentDto & { errorMessage?: string })[] = []; needsAuthorizationLetter = false; selectedThirdPartyAgent = false; + selectedLocalGovernment = false; selectedOwnerUuid: string | undefined = undefined; isCrownOwner = false; + isLocalGovernmentUser = false; + governmentName: string | undefined; firstName = new FormControl('', [Validators.required]); lastName = new FormControl('', [Validators.required]); @@ -53,6 +53,7 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni private applicationService: ApplicationSubmissionService, applicationDocumentService: ApplicationDocumentService, private applicationOwnerService: ApplicationOwnerService, + private authenticationService: AuthenticationService, dialog: MatDialog ) { super(applicationDocumentService, dialog); @@ -67,6 +68,14 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni } }); + this.authenticationService.$currentProfile.pipe(takeUntil(this.$destroy)).subscribe((profile) => { + this.isLocalGovernmentUser = !!profile?.government; + this.governmentName = profile?.government; + if (this.isLocalGovernmentUser) { + this.prepareGovernmentOwners(); + } + }); + this.$applicationDocuments.pipe(takeUntil(this.$destroy)).subscribe((documents) => { this.files = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.AUTHORIZATION_LETTER); }); @@ -76,41 +85,28 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni await this.save(); } - protected async save() { - let selectedOwner: ApplicationOwnerDto | undefined = this.owners.find( - (owner) => owner.uuid === this.selectedOwnerUuid - ); + onSelectAgent() { + this.onSelectOwner('agent'); + } - if (this.selectedThirdPartyAgent) { - await this.applicationOwnerService.setPrimaryContact({ - applicationSubmissionUuid: this.submissionUuid, - agentOrganization: this.organizationName.getRawValue() ?? '', - agentFirstName: this.firstName.getRawValue() ?? '', - agentLastName: this.lastName.getRawValue() ?? '', - agentEmail: this.email.getRawValue() ?? '', - agentPhoneNumber: this.phoneNumber.getRawValue() ?? '', - ownerUuid: selectedOwner?.uuid, - }); - } else if (selectedOwner) { - await this.applicationOwnerService.setPrimaryContact({ - applicationSubmissionUuid: this.submissionUuid, - ownerUuid: selectedOwner.uuid, - }); - } + onSelectGovernment() { + this.onSelectOwner('government'); } onSelectOwner(uuid: string) { this.selectedOwnerUuid = uuid; - const selectedOwner = this.nonAgentOwners.find((owner) => owner.uuid === uuid); - this.nonAgentOwners = this.nonAgentOwners.map((owner) => ({ + const selectedOwner = this.parcelOwners.find((owner) => owner.uuid === uuid); + this.parcelOwners = this.parcelOwners.map((owner) => ({ ...owner, isSelected: owner.uuid === uuid, })); - const hasSelectedAgent = (selectedOwner && selectedOwner.type.code === APPLICATION_OWNER.AGENT) || uuid == 'agent'; - this.selectedThirdPartyAgent = hasSelectedAgent; + this.selectedThirdPartyAgent = + (selectedOwner && selectedOwner.type.code === APPLICATION_OWNER.AGENT) || uuid == 'agent'; + this.selectedLocalGovernment = + (selectedOwner && selectedOwner.type.code === APPLICATION_OWNER.GOVERNMENT) || uuid == 'government'; this.form.reset(); - if (hasSelectedAgent) { + if (this.selectedThirdPartyAgent || this.selectedLocalGovernment) { this.firstName.enable(); this.lastName.enable(); this.organizationName.enable(); @@ -135,10 +131,17 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni this.isCrownOwner = selectedOwner.type.code === APPLICATION_OWNER.CROWN; } } + + const isSelfApplicant = + this.owners[0].type.code === APPLICATION_OWNER.INDIVIDUAL || + this.owners[0].type.code === APPLICATION_OWNER.GOVERNMENT; + this.needsAuthorizationLetter = !( - this.owners[0].type.code === APPLICATION_OWNER.INDIVIDUAL && + isSelfApplicant && (this.owners.length === 1 || - (this.owners.length === 2 && this.owners[1].type.code === APPLICATION_OWNER.AGENT && !hasSelectedAgent)) + (this.owners.length === 2 && + this.owners[1].type.code === APPLICATION_OWNER.AGENT && + !this.selectedThirdPartyAgent)) ); this.files = this.files.map((file) => ({ ...file, @@ -148,20 +151,46 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni })); } - onSelectAgent() { - this.onSelectOwner('agent'); + protected async save() { + let selectedOwner: ApplicationOwnerDto | undefined = this.owners.find( + (owner) => owner.uuid === this.selectedOwnerUuid + ); + + if (this.selectedThirdPartyAgent || this.selectedLocalGovernment) { + await this.applicationOwnerService.setPrimaryContact({ + applicationSubmissionUuid: this.submissionUuid, + organization: this.organizationName.getRawValue() ?? '', + firstName: this.firstName.getRawValue() ?? '', + lastName: this.lastName.getRawValue() ?? '', + email: this.email.getRawValue() ?? '', + phoneNumber: this.phoneNumber.getRawValue() ?? '', + ownerUuid: selectedOwner?.uuid, + type: this.selectedThirdPartyAgent ? APPLICATION_OWNER.AGENT : APPLICATION_OWNER.GOVERNMENT, + }); + } else if (selectedOwner) { + await this.applicationOwnerService.setPrimaryContact({ + applicationSubmissionUuid: this.submissionUuid, + ownerUuid: selectedOwner.uuid, + }); + } } private async loadOwners(submissionUuid: string, primaryContactOwnerUuid?: string) { const owners = await this.applicationOwnerService.fetchBySubmissionId(submissionUuid); if (owners) { const selectedOwner = owners.find((owner) => owner.uuid === primaryContactOwnerUuid); - this.nonAgentOwners = owners.filter((owner) => owner.type.code !== APPLICATION_OWNER.AGENT); + this.parcelOwners = owners.filter( + (owner) => ![APPLICATION_OWNER.AGENT, APPLICATION_OWNER.GOVERNMENT].includes(owner.type.code) + ); this.owners = owners; - if (selectedOwner && selectedOwner.type.code === APPLICATION_OWNER.AGENT) { + if (selectedOwner) { + this.selectedThirdPartyAgent = selectedOwner.type.code === APPLICATION_OWNER.AGENT; + this.selectedLocalGovernment = selectedOwner.type.code === APPLICATION_OWNER.GOVERNMENT; + } + + if (selectedOwner && (this.selectedThirdPartyAgent || this.selectedLocalGovernment)) { this.selectedOwnerUuid = selectedOwner.uuid; - this.selectedThirdPartyAgent = true; this.form.patchValue({ firstName: selectedOwner.firstName, lastName: selectedOwner.lastName, @@ -179,9 +208,17 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni this.phoneNumber.disable(); } + if (this.isLocalGovernmentUser) { + this.prepareGovernmentOwners(); + } + if (this.showErrors) { this.form.markAllAsTouched(); } } } + + private prepareGovernmentOwners() { + this.parcelOwners = []; + } } diff --git a/portal-frontend/src/app/services/application-owner/application-owner.dto.ts b/portal-frontend/src/app/services/application-owner/application-owner.dto.ts index c053632910..090698c4d0 100644 --- a/portal-frontend/src/app/services/application-owner/application-owner.dto.ts +++ b/portal-frontend/src/app/services/application-owner/application-owner.dto.ts @@ -7,6 +7,7 @@ export enum APPLICATION_OWNER { ORGANIZATION = 'ORGZ', AGENT = 'AGEN', CROWN = 'CRWN', + GOVERNMENT = 'GOVR', } export interface ApplicationOwnerTypeDto extends BaseCodeDto { @@ -45,11 +46,12 @@ export interface ApplicationOwnerCreateDto extends ApplicationOwnerUpdateDto { } export interface SetPrimaryContactDto { - agentFirstName?: string; - agentLastName?: string; - agentOrganization?: string; - agentPhoneNumber?: string; - agentEmail?: string; + firstName?: string; + lastName?: string; + organization?: string; + phoneNumber?: string; + email?: string; + type?: APPLICATION_OWNER; ownerUuid?: string; applicationSubmissionUuid: string; } diff --git a/portal-frontend/src/app/services/authentication/auth-interceptor.service.spec.ts b/portal-frontend/src/app/services/authentication/auth-interceptor.service.spec.ts index 372ca00461..4c59fd8cc1 100644 --- a/portal-frontend/src/app/services/authentication/auth-interceptor.service.spec.ts +++ b/portal-frontend/src/app/services/authentication/auth-interceptor.service.spec.ts @@ -13,7 +13,7 @@ describe('AuthInterceptorService', () => { beforeEach(() => { mockAuthService = createMock(); - mockAuthService.$currentUser = new BehaviorSubject(undefined); + mockAuthService.$currentTokenUser = new BehaviorSubject(undefined); TestBed.configureTestingModule({ providers: [ diff --git a/portal-frontend/src/app/services/authentication/authentication.dto.ts b/portal-frontend/src/app/services/authentication/authentication.dto.ts new file mode 100644 index 0000000000..c62bc621f6 --- /dev/null +++ b/portal-frontend/src/app/services/authentication/authentication.dto.ts @@ -0,0 +1,10 @@ +export interface UserDto { + uuid: string; + initials: string; + name: string; + identityProvider: string; + idirUserName?: string | null; + bceidUserName?: string | null; + prettyName?: string | null; + government?: string; +} diff --git a/portal-frontend/src/app/services/authentication/authentication.service.ts b/portal-frontend/src/app/services/authentication/authentication.service.ts index 4705cf01d5..f531c799c1 100644 --- a/portal-frontend/src/app/services/authentication/authentication.service.ts +++ b/portal-frontend/src/app/services/authentication/authentication.service.ts @@ -4,6 +4,7 @@ import { Router } from '@angular/router'; import jwtDecode, { JwtPayload } from 'jwt-decode'; import { BehaviorSubject, firstValueFrom } from 'rxjs'; import { environment } from '../../../environments/environment'; +import { UserDto } from './authentication.dto'; const JWT_TOKEN_KEY = 'jwt_token'; const REFRESH_TOKEN_KEY = 'refresh_token'; @@ -23,7 +24,8 @@ export class AuthenticationService { private refreshExpires: number | undefined; isInitialized = false; - $currentUser = new BehaviorSubject(undefined); + $currentTokenUser = new BehaviorSubject(undefined); + $currentProfile = new BehaviorSubject(undefined); currentUser: ICurrentUser | undefined; constructor(private http: HttpClient, private router: Router) {} @@ -41,7 +43,8 @@ export class AuthenticationService { this.refreshExpires = decodedRefreshToken.exp! * 1000; this.expires = decodedToken.exp! * 1000; this.currentUser = decodedToken as ICurrentUser; - this.$currentUser.next(this.currentUser); + this.$currentTokenUser.next(this.currentUser); + this.loadUser(); } clearTokens() { @@ -137,4 +140,9 @@ export class AuthenticationService { private async getLogoutUrl() { return firstValueFrom(this.http.get<{ url: string }>(`${environment.authUrl}/logout/portal`)); } + + private async loadUser() { + const user = await firstValueFrom(this.http.get(`${environment.authUrl}/user/profile`)); + this.$currentProfile.next(user); + } } diff --git a/portal-frontend/src/app/services/authentication/token-refresh.service.ts b/portal-frontend/src/app/services/authentication/token-refresh.service.ts index 1d8177ee0e..96e420c40a 100644 --- a/portal-frontend/src/app/services/authentication/token-refresh.service.ts +++ b/portal-frontend/src/app/services/authentication/token-refresh.service.ts @@ -12,7 +12,7 @@ export class TokenRefreshService { constructor(private authenticationService: AuthenticationService) {} init() { - this.authenticationService.$currentUser.subscribe((user) => { + this.authenticationService.$currentTokenUser.subscribe((user) => { if (user) { if (this.interval) { clearInterval(this.interval); diff --git a/portal-frontend/src/app/shared/header/header.component.spec.ts b/portal-frontend/src/app/shared/header/header.component.spec.ts index bfbbe7d67a..cc8c34d530 100644 --- a/portal-frontend/src/app/shared/header/header.component.spec.ts +++ b/portal-frontend/src/app/shared/header/header.component.spec.ts @@ -12,7 +12,7 @@ describe('HeaderComponent', () => { beforeEach(async () => { mockAuthService = createMock(); - mockAuthService.$currentUser = new BehaviorSubject(undefined); + mockAuthService.$currentTokenUser = new BehaviorSubject(undefined); await TestBed.configureTestingModule({ declarations: [HeaderComponent], diff --git a/portal-frontend/src/app/shared/header/header.component.ts b/portal-frontend/src/app/shared/header/header.component.ts index b695a7cb75..79817826b0 100644 --- a/portal-frontend/src/app/shared/header/header.component.ts +++ b/portal-frontend/src/app/shared/header/header.component.ts @@ -16,7 +16,7 @@ export class HeaderComponent implements OnInit, OnDestroy { constructor(private authenticationService: AuthenticationService, private router: Router) {} ngOnInit(): void { - this.authenticationService.$currentUser.pipe(takeUntil(this.$destroy)).subscribe((user) => { + this.authenticationService.$currentTokenUser.pipe(takeUntil(this.$destroy)).subscribe((user) => { if (user) { this.isAuthenticated = true; } diff --git a/services/apps/alcs/src/alcs/application/application-code/application-local-government/application-local-government.service.ts b/services/apps/alcs/src/alcs/application/application-code/application-local-government/application-local-government.service.ts index 4d4a126dd4..c9f542e873 100644 --- a/services/apps/alcs/src/alcs/application/application-code/application-local-government/application-local-government.service.ts +++ b/services/apps/alcs/src/alcs/application/application-code/application-local-government/application-local-government.service.ts @@ -1,7 +1,6 @@ import { Injectable, Logger } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { FindOptionsWhere, ILike, Repository } from 'typeorm'; -import { ApplicationSubmissionReview } from '../../../../portal/application-submission-review/application-submission-review.entity'; import { HolidayEntity } from '../../../admin/holiday/holiday.entity'; import { LocalGovernmentCreateDto, diff --git a/services/apps/alcs/src/main.module.ts b/services/apps/alcs/src/main.module.ts index 3200e044c1..045e0d91b7 100644 --- a/services/apps/alcs/src/main.module.ts +++ b/services/apps/alcs/src/main.module.ts @@ -11,7 +11,6 @@ import { ClsModule } from 'nestjs-cls'; import { LoggerModule } from 'nestjs-pino'; import { CdogsModule } from '../../../libs/common/src/cdogs/cdogs.module'; import { AlcsModule } from './alcs/alcs.module'; -import { ApplicationSubmissionStatusModule } from './application-submission-status/application-submission-status.module'; import { AuthorizationFilter } from './common/authorization/authorization.filter'; import { AuthorizationModule } from './common/authorization/authorization.module'; import { AuditSubscriber } from './common/entities/audit.subscriber'; @@ -23,15 +22,13 @@ import { MainController } from './main.controller'; import { MainService } from './main.service'; import { PortalModule } from './portal/portal.module'; import { TypeormConfigService } from './providers/typeorm/typeorm.service'; -import { User } from './user/user.entity'; import { UserModule } from './user/user.module'; -import { UserService } from './user/user.service'; @Module({ imports: [ ConfigModule, TypeOrmModule.forRootAsync({ useClass: TypeormConfigService }), - TypeOrmModule.forFeature([HealthCheck, User]), + TypeOrmModule.forFeature([HealthCheck]), AutomapperModule.forRoot({ strategyInitializer: classes(), }), @@ -69,7 +66,6 @@ import { UserService } from './user/user.service'; controllers: [MainController, LogoutController], providers: [ MainService, - UserService, AuditSubscriber, { provide: APP_GUARD, diff --git a/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.controller.spec.ts b/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.controller.spec.ts index fdd19fd8df..8aa0a7ddcb 100644 --- a/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.controller.spec.ts +++ b/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.controller.spec.ts @@ -255,7 +255,7 @@ describe('ApplicationOwnerController', () => { }); it('should create a new owner when setting primary contact to third party agent that doesnt exist', async () => { - mockAppOwnerService.deleteAgents.mockResolvedValue([]); + mockAppOwnerService.deleteNonParcelOwners.mockResolvedValue([]); mockAppOwnerService.create.mockResolvedValue(new ApplicationOwner()); mockAppOwnerService.setPrimaryContact.mockResolvedValue(); mockApplicationSubmissionService.verifyAccessByUuid.mockResolvedValue( @@ -271,7 +271,7 @@ describe('ApplicationOwnerController', () => { }, ); - expect(mockAppOwnerService.deleteAgents).toHaveBeenCalledTimes(1); + expect(mockAppOwnerService.deleteNonParcelOwners).toHaveBeenCalledTimes(1); expect(mockAppOwnerService.create).toHaveBeenCalledTimes(1); expect(mockAppOwnerService.setPrimaryContact).toHaveBeenCalledTimes(1); expect( @@ -288,7 +288,7 @@ describe('ApplicationOwnerController', () => { }), ); mockAppOwnerService.setPrimaryContact.mockResolvedValue(); - mockAppOwnerService.deleteAgents.mockResolvedValue({} as any); + mockAppOwnerService.deleteNonParcelOwners.mockResolvedValue({} as any); mockApplicationSubmissionService.verifyAccessByUuid.mockResolvedValue( new ApplicationSubmission(), ); @@ -306,7 +306,7 @@ describe('ApplicationOwnerController', () => { expect( mockApplicationSubmissionService.verifyAccessByUuid, ).toHaveBeenCalledTimes(1); - expect(mockAppOwnerService.deleteAgents).toHaveBeenCalledTimes(1); + expect(mockAppOwnerService.deleteNonParcelOwners).toHaveBeenCalledTimes(1); }); it('should update the agent owner when calling set primary contact', async () => { diff --git a/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.controller.ts b/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.controller.ts index 1349a1d89f..03b0576c78 100644 --- a/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.controller.ts +++ b/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.controller.ts @@ -161,41 +161,44 @@ export class ApplicationOwnerController { //Create Owner if (!data.ownerUuid) { - await this.ownerService.deleteAgents(applicationSubmission); - const agentOwner = await this.ownerService.create( + await this.ownerService.deleteNonParcelOwners(applicationSubmission); + const newOwner = await this.ownerService.create( { - email: data.agentEmail, - typeCode: APPLICATION_OWNER.AGENT, - lastName: data.agentLastName, - firstName: data.agentFirstName, - phoneNumber: data.agentPhoneNumber, - organizationName: data.agentOrganization, + email: data.email, + typeCode: data.type, + lastName: data.lastName, + firstName: data.firstName, + phoneNumber: data.phoneNumber, + organizationName: data.organization, applicationSubmissionUuid: data.applicationSubmissionUuid, }, applicationSubmission, ); await this.ownerService.setPrimaryContact( applicationSubmission.uuid, - agentOwner, + newOwner, ); } else if (data.ownerUuid) { const primaryContactOwner = await this.ownerService.getOwner( data.ownerUuid, ); - if (primaryContactOwner.type.code === APPLICATION_OWNER.AGENT) { - //Update Fields for existing agent + if ( + primaryContactOwner.type.code === APPLICATION_OWNER.AGENT || + primaryContactOwner.type.code === APPLICATION_OWNER.GOVERNMENT + ) { + //Update Fields for non parcel owners await this.ownerService.update(primaryContactOwner.uuid, { - email: data.agentEmail, - typeCode: APPLICATION_OWNER.AGENT, - lastName: data.agentLastName, - firstName: data.agentFirstName, - phoneNumber: data.agentPhoneNumber, - organizationName: data.agentOrganization, + email: data.email, + typeCode: primaryContactOwner.type.code, + lastName: data.lastName, + firstName: data.firstName, + phoneNumber: data.phoneNumber, + organizationName: data.organization, }); } else { - //Delete Agents if we aren't using one - await this.ownerService.deleteAgents(applicationSubmission); + //Delete Non parcel owners if we aren't using one + await this.ownerService.deleteNonParcelOwners(applicationSubmission); } await this.ownerService.setPrimaryContact( diff --git a/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.dto.ts b/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.dto.ts index 09d3377c24..10ec1bdac7 100644 --- a/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.dto.ts +++ b/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.dto.ts @@ -6,7 +6,6 @@ import { IsUUID, Matches, } from 'class-validator'; -import { DOCUMENT_TYPE } from '../../../alcs/application/application-document/application-document-code.entity'; import { ApplicationDocumentDto } from '../../../alcs/application/application-document/application-document.dto'; import { BaseCodeDto } from '../../../common/dtos/base.dto'; import { emailRegex } from '../../../utils/email.helper'; @@ -17,6 +16,7 @@ export enum APPLICATION_OWNER { ORGANIZATION = 'ORGZ', AGENT = 'AGEN', CROWN = 'CRWN', + GOVERNMENT = 'GOVR', } export class ApplicationOwnerTypeDto extends BaseCodeDto {} @@ -97,23 +97,27 @@ export class ApplicationOwnerCreateDto extends ApplicationOwnerUpdateDto { export class SetPrimaryContactDto { @IsString() @IsOptional() - agentFirstName?: string; + firstName?: string; @IsString() @IsOptional() - agentLastName?: string; + lastName?: string; @IsString() @IsOptional() - agentOrganization?: string; + organization?: string; @IsString() @IsOptional() - agentPhoneNumber?: string; + phoneNumber?: string; + + @IsString() + @IsOptional() + email?: string; @IsString() @IsOptional() - agentEmail?: string; + type?: APPLICATION_OWNER; @IsUUID() @IsOptional() diff --git a/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.service.ts b/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.service.ts index b46252a209..51abcd1584 100644 --- a/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.service.ts +++ b/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.service.ts @@ -214,16 +214,26 @@ export class ApplicationOwnerService { }); } - async deleteAgents(application: ApplicationSubmission) { + async deleteNonParcelOwners(application: ApplicationSubmission) { const agentOwners = await this.repository.find({ - where: { - applicationSubmission: { - fileNumber: application.fileNumber, + where: [ + { + applicationSubmission: { + fileNumber: application.fileNumber, + }, + type: { + code: APPLICATION_OWNER.AGENT, + }, }, - type: { - code: APPLICATION_OWNER.AGENT, + { + applicationSubmission: { + fileNumber: application.fileNumber, + }, + type: { + code: APPLICATION_OWNER.GOVERNMENT, + }, }, - }, + ], }); return await this.repository.remove(agentOwners); } diff --git a/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.spec.ts b/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.spec.ts index 0d5cd4e44f..d9937bf19c 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.spec.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.spec.ts @@ -314,6 +314,40 @@ describe('ApplicationSubmissionValidatorService', () => { ).toBe(false); }); + it('should not require an authorization letter when contact is goverment', async () => { + const mockOwner = new ApplicationOwner({ + uuid: 'owner-uuid', + type: new ApplicationOwnerType({ + code: APPLICATION_OWNER.INDIVIDUAL, + }), + firstName: 'Bruce', + lastName: 'Wayne', + }); + + const governmentOwner = new ApplicationOwner({ + uuid: 'government-owner-uuid', + type: new ApplicationOwnerType({ + code: APPLICATION_OWNER.GOVERNMENT, + }), + firstName: 'Govern', + lastName: 'Ment', + }); + + const applicationSubmission = new ApplicationSubmission({ + owners: [mockOwner, governmentOwner], + primaryContactOwnerUuid: governmentOwner.uuid, + }); + + const res = await service.validateSubmission(applicationSubmission); + + expect( + includesError( + res.errors, + new Error(`Application has no authorization letters`), + ), + ).toBe(false); + }); + it('should not have an authorization letter error when one is provided', async () => { const mockOwner = new ApplicationOwner({ uuid: 'owner-uuid', diff --git a/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.ts b/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.ts index c2238c4a71..4f9305f0e3 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.ts @@ -243,7 +243,10 @@ export class ApplicationSubmissionValidatorService { applicationSubmission.owners[0].type.code === APPLICATION_OWNER.INDIVIDUAL; - if (!onlyHasIndividualOwner) { + const isGovernmentContact = + primaryOwner.type.code === APPLICATION_OWNER.GOVERNMENT; + + if (!onlyHasIndividualOwner && !isGovernmentContact) { const authorizationLetters = documents.filter( (document) => document.type?.code === DOCUMENT_TYPE.AUTHORIZATION_LETTER, @@ -257,7 +260,10 @@ export class ApplicationSubmissionValidatorService { } } - if (primaryOwner.type.code === APPLICATION_OWNER.AGENT) { + if ( + primaryOwner.type.code === APPLICATION_OWNER.AGENT || + isGovernmentContact + ) { if ( !primaryOwner.firstName || !primaryOwner.lastName || diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1689806720586-add_government_owner_type.ts b/services/apps/alcs/src/providers/typeorm/migrations/1689806720586-add_government_owner_type.ts new file mode 100644 index 0000000000..26c7609782 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1689806720586-add_government_owner_type.ts @@ -0,0 +1,17 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class addGovernmentOwnerType1689806720586 implements MigrationInterface { + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query(` + INSERT INTO "alcs"."application_owner_type" + ("audit_deleted_date_at", "audit_created_at", "audit_updated_at", "audit_created_by", "audit_updated_by", "label", "code", "description") VALUES + (NULL, NOW(), NULL, 'migration_seed', NULL, 'Government', 'GOVR', 'For use by LFNG to select themselves'); + `); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `DELETE FROM "alcs"."application_owner_type" WHERE "code" = 'GOVR'`, + ); + } +} diff --git a/services/apps/alcs/src/user/user.controller.spec.ts b/services/apps/alcs/src/user/user.controller.spec.ts index be89cfd84c..f4390447e1 100644 --- a/services/apps/alcs/src/user/user.controller.spec.ts +++ b/services/apps/alcs/src/user/user.controller.spec.ts @@ -3,6 +3,7 @@ import { AutomapperModule } from '@automapper/nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { ClsService } from 'nestjs-cls'; +import { ApplicationLocalGovernment } from '../alcs/application/application-code/application-local-government/application-local-government.entity'; import { UserProfile } from '../common/automapper/user.automapper.profile'; import { initMockUserDto, @@ -16,13 +17,13 @@ import { UserService } from './user.service'; describe('UserController', () => { let controller: UserController; - let mockService: DeepMocked; + let mockUserService: DeepMocked; let mockUser: Partial; let mockUserDto: UserDto; let request; beforeEach(async () => { - mockService = createMock(); + mockUserService = createMock(); const module: TestingModule = await Test.createTestingModule({ controllers: [UserController, UserProfile], @@ -35,7 +36,7 @@ describe('UserController', () => { //Keep this below mockKeyCloak as it overrides the one from there { provide: UserService, - useValue: mockService, + useValue: mockUserService, }, ], imports: [ @@ -86,37 +87,37 @@ describe('UserController', () => { expect(controller).toBeDefined(); }); it('should call getAssignableUsers on the service', async () => { - mockService.getAssignableUsers.mockResolvedValue([mockUser as User]); + mockUserService.getAssignableUsers.mockResolvedValue([mockUser as User]); const res = await controller.getAssignableUsers(); expect(res[0].name).toEqual(mockUserDto.name); expect(res[0].initials).toEqual(mockUserDto.initials); - expect(mockService.getAssignableUsers).toHaveBeenCalledTimes(1); + expect(mockUserService.getAssignableUsers).toHaveBeenCalledTimes(1); }); it('should call deleteUser on the service', async () => { - mockService.delete.mockResolvedValue(mockUser as User); + mockUserService.delete.mockResolvedValue(mockUser as User); const res = await controller.deleteUser(''); expect(res).toBeTruthy(); - expect(mockService.delete).toHaveBeenCalledTimes(1); + expect(mockUserService.delete).toHaveBeenCalledTimes(1); }); it('should call update user on the service', async () => { const mockUserDto = initMockUserDto(); - mockService.getByUuid.mockResolvedValueOnce(mockUser as User); - mockService.update.mockResolvedValueOnce({} as any); + mockUserService.getByUuid.mockResolvedValueOnce(mockUser as User); + mockUserService.update.mockResolvedValueOnce({} as any); request.user.entity.uuid = mockUser.uuid = mockUserDto.uuid; await controller.update(mockUserDto.uuid, mockUserDto, request); - expect(mockService.update).toBeCalledTimes(1); + expect(mockUserService.update).toBeCalledTimes(1); }); it('should fail on user update if user not found', async () => { - mockService.getByUuid.mockResolvedValueOnce(null); + mockUserService.getByUuid.mockResolvedValueOnce(null); const mockUserDto = initMockUserDto(); request.user.entity.uuid = mockUser.uuid = mockUserDto.uuid; @@ -129,8 +130,8 @@ describe('UserController', () => { it('should fail on user update if current user does not mach updating user', async () => { const mockUserDto = initMockUserDto(); - mockService.getByUuid.mockResolvedValueOnce(mockUser as User); - mockService.update.mockResolvedValueOnce({} as any); + mockUserService.getByUuid.mockResolvedValueOnce(mockUser as User); + mockUserService.update.mockResolvedValueOnce({} as any); await expect( controller.update(mockUserDto.uuid, mockUserDto, request), @@ -141,6 +142,13 @@ describe('UserController', () => { it('return the current user', async () => { const mockEntity = initUserMockEntity(); + const governmentName = 'Government'; + + mockUserService.getUserLocalGovernment.mockResolvedValue( + new ApplicationLocalGovernment({ + name: governmentName, + }), + ); const res = await controller.getMyself({ user: { @@ -148,6 +156,7 @@ describe('UserController', () => { }, }); expect(res.name).toEqual(mockEntity.name); + expect(res.government).toEqual(governmentName); expect(res.identityProvider).toEqual(mockEntity.identityProvider); }); }); diff --git a/services/apps/alcs/src/user/user.controller.ts b/services/apps/alcs/src/user/user.controller.ts index be0737da54..f7cf70c275 100644 --- a/services/apps/alcs/src/user/user.controller.ts +++ b/services/apps/alcs/src/user/user.controller.ts @@ -31,10 +31,13 @@ export class UserController { ) {} @Get('/profile') - @UserRoles(...ANY_AUTH_ROLE) + @UserRoles() async getMyself(@Req() req) { const user = req.user.entity; - return this.userMapper.mapAsync(user, User, UserDto); + const mappedUser = await this.userMapper.mapAsync(user, User, UserDto); + const government = await this.userService.getUserLocalGovernment(user); + mappedUser.government = government ? government.name : undefined; + return mappedUser; } @Get('/assignable') diff --git a/services/apps/alcs/src/user/user.dto.ts b/services/apps/alcs/src/user/user.dto.ts index 9c1f895d7d..4b768f00d7 100644 --- a/services/apps/alcs/src/user/user.dto.ts +++ b/services/apps/alcs/src/user/user.dto.ts @@ -38,6 +38,8 @@ export class UserDto extends UpdateUserDto { @AutoMap() prettyName?: string | null; + + government?: string; } export class CreateUserDto { diff --git a/services/apps/alcs/src/user/user.module.ts b/services/apps/alcs/src/user/user.module.ts index 7acae6e908..9269c64bdb 100644 --- a/services/apps/alcs/src/user/user.module.ts +++ b/services/apps/alcs/src/user/user.module.ts @@ -1,5 +1,6 @@ import { Module } from '@nestjs/common'; import { TypeOrmModule } from '@nestjs/typeorm'; +import { ApplicationLocalGovernment } from '../alcs/application/application-code/application-local-government/application-local-government.entity'; import { UserProfile } from '../common/automapper/user.automapper.profile'; import { EmailModule } from '../providers/email/email.module'; import { UserController } from './user.controller'; @@ -7,7 +8,10 @@ import { User } from './user.entity'; import { UserService } from './user.service'; @Module({ - imports: [TypeOrmModule.forFeature([User]), EmailModule], + imports: [ + TypeOrmModule.forFeature([ApplicationLocalGovernment, User]), + EmailModule, + ], providers: [UserService, UserProfile], exports: [UserService, EmailModule], controllers: [UserController], diff --git a/services/apps/alcs/src/user/user.service.spec.ts b/services/apps/alcs/src/user/user.service.spec.ts index aa3fc94031..fe94069eb8 100644 --- a/services/apps/alcs/src/user/user.service.spec.ts +++ b/services/apps/alcs/src/user/user.service.spec.ts @@ -8,6 +8,7 @@ import { getRepositoryToken } from '@nestjs/typeorm'; import * as config from 'config'; import { Repository } from 'typeorm'; import { initUserMockEntity } from '../../test/mocks/mockEntities'; +import { ApplicationLocalGovernment } from '../alcs/application/application-code/application-local-government/application-local-government.entity'; import { UserProfile } from '../common/automapper/user.automapper.profile'; import { EmailService } from '../providers/email/email.service'; import { User } from './user.entity'; @@ -15,7 +16,10 @@ import { UserService } from './user.service'; describe('UserService', () => { let service: UserService; - let repositoryMock = createMock>(); + let mockUserRepository: DeepMocked>; + let mockGovernmentRepository: DeepMocked< + Repository + >; let emailServiceMock: DeepMocked; const email = 'bruce.wayne@gotham.com'; @@ -23,14 +27,20 @@ describe('UserService', () => { mockUser.email = email; beforeEach(async () => { - emailServiceMock = createMock(); + emailServiceMock = createMock(); + mockUserRepository = createMock(); + mockGovernmentRepository = createMock(); const module: TestingModule = await Test.createTestingModule({ providers: [ UserService, { provide: getRepositoryToken(User), - useValue: repositoryMock, + useValue: mockUserRepository, + }, + { + provide: getRepositoryToken(ApplicationLocalGovernment), + useValue: mockGovernmentRepository, }, { provide: EmailService, useValue: emailServiceMock }, UserProfile, @@ -46,13 +56,13 @@ describe('UserService', () => { ], }).compile(); - repositoryMock = module.get(getRepositoryToken(User)); + mockUserRepository = module.get(getRepositoryToken(User)); service = module.get(UserService); - repositoryMock.findOne.mockResolvedValue(mockUser); - repositoryMock.save.mockResolvedValue(mockUser); - repositoryMock.find.mockResolvedValue([mockUser]); - repositoryMock.softRemove.mockResolvedValue(mockUser); + mockUserRepository.findOne.mockResolvedValue(mockUser); + mockUserRepository.save.mockResolvedValue(mockUser); + mockUserRepository.find.mockResolvedValue([mockUser]); + mockUserRepository.softRemove.mockResolvedValue(mockUser); emailServiceMock.sendEmail.mockResolvedValue(); }); @@ -72,12 +82,12 @@ describe('UserService', () => { describe('createUser', () => { it('should save a user when user does not exist', async () => { - repositoryMock.findOne.mockResolvedValue(null); + mockUserRepository.findOne.mockResolvedValue(null); const user = await service.create(mockUser); expect(user).toEqual(mockUser); - expect(repositoryMock.save).toHaveBeenCalledTimes(1); + expect(mockUserRepository.save).toHaveBeenCalledTimes(1); }); it('should reject if user already exists', async () => { @@ -91,12 +101,12 @@ describe('UserService', () => { it('should call delete user on the repository', async () => { await service.delete(mockUser.uuid); - expect(repositoryMock.softRemove).toHaveBeenCalledTimes(1); - expect(repositoryMock.softRemove).toHaveBeenCalledWith(mockUser); + expect(mockUserRepository.softRemove).toHaveBeenCalledTimes(1); + expect(mockUserRepository.softRemove).toHaveBeenCalledWith(mockUser); }); it('should reject when user does not exist', async () => { - repositoryMock.findOne.mockResolvedValue(null); + mockUserRepository.findOne.mockResolvedValue(null); await expect(service.delete(mockUser.uuid)).rejects.toMatchObject( new Error(`User with provided uuid ${mockUser.uuid} was not found`), @@ -116,7 +126,7 @@ describe('UserService', () => { }); it('should fail when user does not exist', async () => { - repositoryMock.findOne.mockResolvedValue(null); + mockUserRepository.findOne.mockResolvedValue(null); await expect(service.update('fake-uuid', mockUser)).rejects.toMatchObject( new ServiceNotFoundException(`User not found fake-uuid`), @@ -130,7 +140,7 @@ describe('UserService', () => { const prefix = env === 'production' ? '' : `[${env}]`; const subject = `${prefix} Access Requested to ALCS`; const body = `A new user ${email}: ${userIdentifier} has requested access to ALCS.
-CSS`; +CSS`; await service.sendNewUserRequestEmail(email, userIdentifier); @@ -140,4 +150,30 @@ describe('UserService', () => { subject, }); }); + + it('should not call repository if user does not have a bc business guid', async () => { + mockGovernmentRepository.findOne.mockResolvedValue( + new ApplicationLocalGovernment(), + ); + + const res = await service.getUserLocalGovernment(new User()); + + expect(res).toBeUndefined(); + expect(mockGovernmentRepository.findOne).toHaveBeenCalledTimes(0); + }); + + it('should call repository if user has a bc business guid', async () => { + mockGovernmentRepository.findOne.mockResolvedValue( + new ApplicationLocalGovernment(), + ); + + const res = await service.getUserLocalGovernment( + new User({ + bceidBusinessGuid: 'guid', + }), + ); + + expect(res).toBeDefined(); + expect(mockGovernmentRepository.findOne).toHaveBeenCalledTimes(1); + }); }); diff --git a/services/apps/alcs/src/user/user.service.ts b/services/apps/alcs/src/user/user.service.ts index 3a66b707f1..d5a9e99450 100644 --- a/services/apps/alcs/src/user/user.service.ts +++ b/services/apps/alcs/src/user/user.service.ts @@ -6,6 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { IConfig } from 'config'; import { Repository } from 'typeorm'; +import { ApplicationLocalGovernment } from '../alcs/application/application-code/application-local-government/application-local-government.entity'; import { EmailService } from '../providers/email/email.service'; import { CreateUserDto } from './user.dto'; import { User } from './user.entity'; @@ -22,6 +23,8 @@ export class UserService { private userRepository: Repository, @InjectMapper() private userMapper: Mapper, private emailService: EmailService, + @InjectRepository(ApplicationLocalGovernment) + private localGovernmentRepository: Repository, @Inject(CONFIG_TOKEN) private config: IConfig, ) {} @@ -88,12 +91,23 @@ export class UserService { return this.userRepository.save(updatedUser); } + async getUserLocalGovernment(user: User) { + if (user.bceidBusinessGuid) { + return await this.localGovernmentRepository.findOne({ + where: { bceidBusinessGuid: user.bceidBusinessGuid }, + select: { + name: true, + }, + }); + } + } + async sendNewUserRequestEmail(email: string, userIdentifier: string) { const env = this.config.get('ENV'); const prefix = env === 'production' ? '' : `[${env}]`; const subject = `${prefix} Access Requested to ALCS`; const body = `A new user ${email}: ${userIdentifier} has requested access to ALCS.
-CSS`; +CSS`; await this.emailService.sendEmail({ to: this.config.get('EMAIL.DEFAULT_ADMINS'), From ab7fb70b6cecee4f6847121df4817ab1bfb0388e Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Thu, 20 Jul 2023 10:46:29 -0700 Subject: [PATCH 095/954] Show warning banner when user selects their own government --- .../application-details.component.html | 8 ++++ .../select-government.component.html | 5 +++ .../select-government.component.ts | 4 ++ .../src/app/services/code/code.dto.ts | 1 + .../src/portal/code/code.controller.spec.ts | 42 +++++++++++++++++-- .../alcs/src/portal/code/code.controller.ts | 15 +++++-- 6 files changed, 69 insertions(+), 6 deletions(-) diff --git a/portal-frontend/src/app/features/application-details/application-details.component.html b/portal-frontend/src/app/features/application-details/application-details.component.html index 6dee41c5ba..46d5a225fb 100644 --- a/portal-frontend/src/app/features/application-details/application-details.component.html +++ b/portal-frontend/src/app/features/application-details/application-details.component.html @@ -93,6 +93,14 @@

4. Government

>ALC.Portal@gov.bc.ca / 236-468-3342 + + 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 application is + submitted. +
diff --git a/portal-frontend/src/app/features/edit-submission/select-government/select-government.component.html b/portal-frontend/src/app/features/edit-submission/select-government/select-government.component.html index 1fb17aad70..3ad9accac8 100644 --- a/portal-frontend/src/app/features/edit-submission/select-government/select-government.component.html +++ b/portal-frontend/src/app/features/edit-submission/select-government/select-government.component.html @@ -45,6 +45,11 @@

Government

will need to contact the ALC directly:  ALC.Portal@gov.bc.ca / 236-468-3342 + + 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 application is + submitted. +

Please Note: If your Local or First Nation Government is not listed, please contact the ALC directly. ALC.Portal@gov.bc.ca / 236-468-3342 diff --git a/portal-frontend/src/app/features/edit-submission/select-government/select-government.component.ts b/portal-frontend/src/app/features/edit-submission/select-government/select-government.component.ts index 11ab4211a1..ef052485f1 100644 --- a/portal-frontend/src/app/features/edit-submission/select-government/select-government.component.ts +++ b/portal-frontend/src/app/features/edit-submission/select-government/select-government.component.ts @@ -22,6 +22,7 @@ export class SelectGovernmentComponent extends StepComponent implements OnInit, localGovernment = new FormControl('', [Validators.required]); showWarning = false; + selectedOwnGovernment = false; selectGovernmentUuid = ''; localGovernments: LocalGovernmentDto[] = []; filteredLocalGovernments!: Observable; @@ -73,6 +74,8 @@ export class SelectGovernmentComponent extends StepComponent implements OnInit, } else { this.localGovernment.setErrors({ invalid: localGovernment.hasGuid }); } + + this.selectedOwnGovernment = localGovernment.matchesUserGuid; } } } @@ -134,6 +137,7 @@ export class SelectGovernmentComponent extends StepComponent implements OnInit, if (!lg.hasGuid) { this.localGovernment.setErrors({ invalid: true }); } + this.selectedOwnGovernment = lg.matchesUserGuid; } } } diff --git a/portal-frontend/src/app/services/code/code.dto.ts b/portal-frontend/src/app/services/code/code.dto.ts index a9054735ba..e00e33c8ea 100644 --- a/portal-frontend/src/app/services/code/code.dto.ts +++ b/portal-frontend/src/app/services/code/code.dto.ts @@ -4,6 +4,7 @@ export interface LocalGovernmentDto { uuid: string; name: string; hasGuid: boolean; + matchesUserGuid: boolean; } export interface ApplicationTypeDto { diff --git a/services/apps/alcs/src/portal/code/code.controller.spec.ts b/services/apps/alcs/src/portal/code/code.controller.spec.ts index 7898cf4884..671d02300c 100644 --- a/services/apps/alcs/src/portal/code/code.controller.spec.ts +++ b/services/apps/alcs/src/portal/code/code.controller.spec.ts @@ -10,6 +10,7 @@ import { ApplicationDocumentService } from '../../alcs/application/application-d import { ApplicationService } from '../../alcs/application/application.service'; import { CardType } from '../../alcs/card/card-type/card-type.entity'; import { CardService } from '../../alcs/card/card.service'; +import { User } from '../../user/user.entity'; import { ApplicationSubmissionService } from '../application-submission/application-submission.service'; import { CodeController } from './code.controller'; @@ -89,15 +90,50 @@ describe('CodeController', () => { }); it('should call out to local government service for fetching codes', async () => { - const codes = await portalController.loadCodes(); + const codes = await portalController.loadCodes({ + user: { + entity: new User(), + }, + }); expect(codes.localGovernments).toBeDefined(); expect(codes.localGovernments.length).toBe(1); expect(codes.localGovernments[0].name).toEqual('fake-name'); - expect(mockAppService.fetchApplicationTypes).toHaveBeenCalledTimes(1); + expect(codes.localGovernments[0].matchesUserGuid).toBeFalsy(); + expect(mockLgService.listActive).toHaveBeenCalledTimes(1); + }); + + it('should set the matches flag correctly when users guid matches government', async () => { + const matchingGuid = 'guid'; + mockLgService.listActive.mockResolvedValue([ + new ApplicationLocalGovernment({ + uuid: 'fake-uuid', + name: 'fake-name', + isFirstNation: false, + bceidBusinessGuid: matchingGuid, + }), + ]); + + const codes = await portalController.loadCodes({ + user: { + entity: new User({ + bceidBusinessGuid: matchingGuid, + }), + }, + }); + + expect(codes.localGovernments).toBeDefined(); + expect(codes.localGovernments.length).toBe(1); + expect(codes.localGovernments[0].name).toEqual('fake-name'); + expect(codes.localGovernments[0].matchesUserGuid).toBeTruthy(); + expect(mockLgService.listActive).toHaveBeenCalledTimes(1); }); it('should call out to local submission service for fetching codes', async () => { - const codes = await portalController.loadCodes(); + const codes = await portalController.loadCodes({ + user: { + entity: new User(), + }, + }); expect(codes.submissionTypes).toBeDefined(); expect(codes.submissionTypes.length).toBe(1); expect(codes.submissionTypes[0].code).toEqual('fake-code'); diff --git a/services/apps/alcs/src/portal/code/code.controller.ts b/services/apps/alcs/src/portal/code/code.controller.ts index 228a6967ea..e77d619fed 100644 --- a/services/apps/alcs/src/portal/code/code.controller.ts +++ b/services/apps/alcs/src/portal/code/code.controller.ts @@ -1,6 +1,6 @@ import { Mapper } from '@automapper/core'; import { InjectMapper } from '@automapper/nestjs'; -import { Controller, Get, UseGuards } from '@nestjs/common'; +import { Controller, Get, Req, UseGuards } from '@nestjs/common'; import { ApplicationLocalGovernment } from '../../alcs/application/application-code/application-local-government/application-local-government.entity'; import { ApplicationLocalGovernmentService } from '../../alcs/application/application-code/application-local-government/application-local-government.service'; import { ApplicationDocumentCode } from '../../alcs/application/application-document/application-document-code.entity'; @@ -9,12 +9,14 @@ import { ApplicationDocumentService } from '../../alcs/application/application-d import { ApplicationService } from '../../alcs/application/application.service'; import { CardService } from '../../alcs/card/card.service'; import { PortalAuthGuard } from '../../common/authorization/portal-auth-guard.service'; +import { User } from '../../user/user.entity'; import { ApplicationSubmissionService } from '../application-submission/application-submission.service'; export interface LocalGovernmentDto { uuid: string; name: string; hasGuid: boolean; + matchesUserGuid: boolean; } @Controller('/portal/code') @@ -30,7 +32,7 @@ export class CodeController { ) {} @Get() - async loadCodes() { + async loadCodes(@Req() req) { const localGovernments = await this.localGovernmentService.listActive(); const applicationTypes = await this.applicationService.fetchApplicationTypes(); @@ -51,7 +53,10 @@ export class CodeController { ); }); return { - localGovernments: this.mapLocalGovernments(localGovernments), + localGovernments: this.mapLocalGovernments( + localGovernments, + req.user.entity, + ), applicationTypes, submissionTypes, applicationDocumentTypes: mappedDocTypes, @@ -61,11 +66,15 @@ export class CodeController { private mapLocalGovernments( governments: ApplicationLocalGovernment[], + user: User, ): LocalGovernmentDto[] { return governments.map((government) => ({ name: government.name, uuid: government.uuid, hasGuid: government.bceidBusinessGuid !== null, + matchesUserGuid: + !!government.bceidBusinessGuid && + government.bceidBusinessGuid === user.bceidBusinessGuid, })); } } From 8c6301a3243a2a2c1c87d9718243dfc7dc9d78df Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Thu, 20 Jul 2023 11:36:29 -0700 Subject: [PATCH 096/954] Add Confirmation Dialog to Portal Submission --- .../edit-submission-base.module.ts | 2 + .../review-and-submit.component.spec.ts | 5 +++ .../review-and-submit.component.ts | 14 +++++- .../submit-confirmation-dialog.component.html | 43 +++++++++++++++++++ .../submit-confirmation-dialog.component.scss | 18 ++++++++ ...bmit-confirmation-dialog.component.spec.ts | 35 +++++++++++++++ .../submit-confirmation-dialog.component.ts | 19 ++++++++ 7 files changed, 134 insertions(+), 2 deletions(-) create mode 100644 portal-frontend/src/app/features/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.html create mode 100644 portal-frontend/src/app/features/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.scss create mode 100644 portal-frontend/src/app/features/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.spec.ts create mode 100644 portal-frontend/src/app/features/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.ts diff --git a/portal-frontend/src/app/features/edit-submission/edit-submission-base.module.ts b/portal-frontend/src/app/features/edit-submission/edit-submission-base.module.ts index 24936e0644..13b593d51f 100644 --- a/portal-frontend/src/app/features/edit-submission/edit-submission-base.module.ts +++ b/portal-frontend/src/app/features/edit-submission/edit-submission-base.module.ts @@ -34,6 +34,7 @@ import { SoilTableComponent } from './proposal/soil-table/soil-table.component'; import { SubdProposalComponent } from './proposal/subd-proposal/subd-proposal.component'; import { TurProposalComponent } from './proposal/tur-proposal/tur-proposal.component'; import { ReviewAndSubmitComponent } from './review-and-submit/review-and-submit.component'; +import { SubmitConfirmationDialogComponent } from './review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component'; import { SelectGovernmentComponent } from './select-government/select-government.component'; @NgModule({ @@ -54,6 +55,7 @@ import { SelectGovernmentComponent } from './select-government/select-government OtherAttachmentsComponent, PrimaryContactComponent, ReviewAndSubmitComponent, + SubmitConfirmationDialogComponent, OtherParcelConfirmationDialogComponent, NfuProposalComponent, TurProposalComponent, diff --git a/portal-frontend/src/app/features/edit-submission/review-and-submit/review-and-submit.component.spec.ts b/portal-frontend/src/app/features/edit-submission/review-and-submit/review-and-submit.component.spec.ts index 78f8be8cca..c1072da656 100644 --- a/portal-frontend/src/app/features/edit-submission/review-and-submit/review-and-submit.component.spec.ts +++ b/portal-frontend/src/app/features/edit-submission/review-and-submit/review-and-submit.component.spec.ts @@ -1,5 +1,6 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { MatDialog } from '@angular/material/dialog'; import { Router } from '@angular/router'; import { DeepMocked, createMock } from '@golevelup/ts-jest'; import { BehaviorSubject } from 'rxjs'; @@ -42,6 +43,10 @@ describe('ReviewAndSubmitComponent', () => { provide: PdfGenerationService, useValue: {}, }, + { + provide: MatDialog, + useValue: {}, + }, ], }).compileComponents(); diff --git a/portal-frontend/src/app/features/edit-submission/review-and-submit/review-and-submit.component.ts b/portal-frontend/src/app/features/edit-submission/review-and-submit/review-and-submit.component.ts index 824735471b..ba85493352 100644 --- a/portal-frontend/src/app/features/edit-submission/review-and-submit/review-and-submit.component.ts +++ b/portal-frontend/src/app/features/edit-submission/review-and-submit/review-and-submit.component.ts @@ -1,4 +1,5 @@ import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core'; +import { MatDialog } from '@angular/material/dialog'; import { Router } from '@angular/router'; import { BehaviorSubject, takeUntil } from 'rxjs'; import { ApplicationDocumentDto } from '../../../services/application-document/application-document.dto'; @@ -7,6 +8,7 @@ import { ApplicationSubmissionService } from '../../../services/application-subm import { PdfGenerationService } from '../../../services/pdf-generation/pdf-generation.service'; import { ToastService } from '../../../services/toast/toast.service'; import { StepComponent } from '../step.partial'; +import { SubmitConfirmationDialogComponent } from './submit-confirmation-dialog/submit-confirmation-dialog.component'; @Component({ selector: 'app-review-and-submit', @@ -25,7 +27,8 @@ export class ReviewAndSubmitComponent extends StepComponent implements OnInit, O private router: Router, private toastService: ToastService, private applicationService: ApplicationSubmissionService, - private pdfGenerationService: PdfGenerationService + private pdfGenerationService: PdfGenerationService, + private dialog: MatDialog ) { super(); } @@ -55,7 +58,14 @@ export class ReviewAndSubmitComponent extends StepComponent implements OnInit, O }); this.toastService.showErrorToast('Please correct all errors before submitting the form'); } else { - this.submit.emit(); + this.dialog + .open(SubmitConfirmationDialogComponent) + .beforeClosed() + .subscribe((didConfirm) => { + if (didConfirm) { + this.submit.emit(); + } + }); } } diff --git a/portal-frontend/src/app/features/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.html b/portal-frontend/src/app/features/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.html new file mode 100644 index 0000000000..16b1d105f9 --- /dev/null +++ b/portal-frontend/src/app/features/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.html @@ -0,0 +1,43 @@ +

+

Submit Application

+
+ +
+

+ Your application will be submitted to the [L/FNG]. After submission, you will be auto-directed to complete the local + or first nation government review form in order to submit this application to the Agricultural Land Commission. +

+
+
Terms and Conditions:
+ + I/we consent to the use of the information provided in the application and all supporting documents to process the + application in accordance with the Agricultural Land Commission Act, the Agricultural Land Reserve General + Regulation, and the Agricultural Land Reserve Use Regulation. + + + I/we declare that the information provided in the application and all the supporting documents are, to the best of + my/our knowledge, true and correct. + + + I/we understand that the Agricultural Land Commission will take the steps necessary to confirm the accuracy of the + information and documents provided. This information will be available for review by any member of the public. + +
+

+ If you have any questions about the collection or use of this information, please contact the Agricultural Land + Commission. +

+
+
+ + +
+
+
diff --git a/portal-frontend/src/app/features/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.scss b/portal-frontend/src/app/features/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.scss new file mode 100644 index 0000000000..d4f7e0ae48 --- /dev/null +++ b/portal-frontend/src/app/features/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.scss @@ -0,0 +1,18 @@ +@use '../../../../../styles/functions' as *; + +.checkbox { + margin: rem(10) 0; +} + +p { + margin: rem(28) 0 !important; +} + +.step-controls { + display: flex; + justify-content: flex-end; + + button:not(:last-child) { + margin-right: rem(16) !important; + } +} diff --git a/portal-frontend/src/app/features/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.spec.ts b/portal-frontend/src/app/features/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.spec.ts new file mode 100644 index 0000000000..0f7741443b --- /dev/null +++ b/portal-frontend/src/app/features/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.spec.ts @@ -0,0 +1,35 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { MatDialog, MatDialogRef } from '@angular/material/dialog'; +import { SubmitConfirmationDialogComponent } from './submit-confirmation-dialog.component'; + +describe('OtherParcelConfirmationDialogComponent', () => { + let component: SubmitConfirmationDialogComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [SubmitConfirmationDialogComponent], + providers: [ + { + provide: MatDialog, + useValue: {}, + }, + { + provide: MatDialogRef, + useValue: {}, + }, + ], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(SubmitConfirmationDialogComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.ts b/portal-frontend/src/app/features/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.ts new file mode 100644 index 0000000000..fc8779c3f5 --- /dev/null +++ b/portal-frontend/src/app/features/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.ts @@ -0,0 +1,19 @@ +import { Component } from '@angular/core'; +import { MatDialogRef } from '@angular/material/dialog'; + +@Component({ + selector: 'app-submit-confirmation-dialog', + templateUrl: './submit-confirmation-dialog.component.html', + styleUrls: ['./submit-confirmation-dialog.component.scss'], +}) +export class SubmitConfirmationDialogComponent { + constructor(private dialogRef: MatDialogRef) {} + + async onCancel(dialogResult: boolean = false) { + this.dialogRef.close(dialogResult); + } + + async onSubmit() { + this.dialogRef.close(true); + } +} From 0c456862eab3c33576da0a1e715ecb5e66b4d306 Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Thu, 20 Jul 2023 11:44:10 -0700 Subject: [PATCH 097/954] Bugix/alcs 908 various fixes (#800) fix edit submission from alcs fix wrong government and incomplete statuses fix to include mask date into decision released status date (V2 only) --- ...plication-submission-draft.service.spec.ts | 2 - .../application-decision-v2.service.ts | 22 ++++- ...lication-submission-status.service.spec.ts | 80 +++++++++++++++++++ .../application-submission-status.service.ts | 34 +++++++- .../application-submission-draft.module.ts | 2 + ...plication-submission-draft.service.spec.ts | 28 ++++++- .../application-submission-draft.service.ts | 24 +++++- ...ation-submission-review.controller.spec.ts | 7 +- ...pplication-submission-review.controller.ts | 39 ++++++--- 9 files changed, 211 insertions(+), 27 deletions(-) diff --git a/portal-frontend/src/app/services/application-submission/application-submission-draft.service.spec.ts b/portal-frontend/src/app/services/application-submission/application-submission-draft.service.spec.ts index b1e4071c77..2f9f7b164d 100644 --- a/portal-frontend/src/app/services/application-submission/application-submission-draft.service.spec.ts +++ b/portal-frontend/src/app/services/application-submission/application-submission-draft.service.spec.ts @@ -6,8 +6,6 @@ import { of, throwError } from 'rxjs'; import { ToastService } from '../toast/toast.service'; import { ApplicationSubmissionDraftService } from './application-submission-draft.service'; -import { ApplicationSubmissionService } from './application-submission.service'; - describe('ApplicationSubmissionDraftService', () => { let service: ApplicationSubmissionDraftService; let mockToastService: DeepMocked; diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service.ts index 1b49a2621e..b67a513d27 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service.ts @@ -701,12 +701,26 @@ export class ApplicationDecisionV2Service { }, ); - await this.applicationSubmissionStatusService.setStatusDateByFileNumber( - applicationDecision.application.fileNumber, - SUBMISSION_STATUS.ALC_DECISION, - decisionDate, + await this.setDecisionReleasedStatus(decisionDate, applicationDecision); + } + } + + private async setDecisionReleasedStatus( + decisionDate: Date | null, + applicationDecision: ApplicationDecision, + ) { + const statusDate = decisionDate; + if (applicationDecision.daysHideFromPublic) { + statusDate?.setDate( + statusDate.getDate() + applicationDecision.daysHideFromPublic, ); } + + await this.applicationSubmissionStatusService.setStatusDateByFileNumber( + applicationDecision.application.fileNumber, + SUBMISSION_STATUS.ALC_DECISION, + statusDate, + ); } private async getDecisionDocumentOrFail(decisionDocumentUuid: string) { diff --git a/services/apps/alcs/src/application-submission-status/application-submission-status.service.spec.ts b/services/apps/alcs/src/application-submission-status/application-submission-status.service.spec.ts index e45d5da18a..8186208768 100644 --- a/services/apps/alcs/src/application-submission-status/application-submission-status.service.spec.ts +++ b/services/apps/alcs/src/application-submission-status/application-submission-status.service.spec.ts @@ -353,4 +353,84 @@ describe('ApplicationSubmissionStatusService', () => { fileNumber: fakeFileNumber, }); }); + + it('Should remove statuses', async () => { + const fakeSubmissionUuid = 'fake'; + const mockStatuses = [ + new ApplicationSubmissionToSubmissionStatus({ + submissionUuid: fakeSubmissionUuid, + statusTypeCode: SUBMISSION_STATUS.IN_PROGRESS, + effectiveDate: new Date(), + }), + ]; + + mockApplicationSubmissionToSubmissionStatusRepository.findBy.mockResolvedValue( + mockStatuses, + ); + mockApplicationSubmissionToSubmissionStatusRepository.remove.mockResolvedValue( + {} as any, + ); + + await service.removeStatuses(fakeSubmissionUuid); + + expect( + mockApplicationSubmissionToSubmissionStatusRepository.findBy, + ).toHaveBeenCalledTimes(1); + expect( + mockApplicationSubmissionToSubmissionStatusRepository.findBy, + ).toHaveBeenCalledWith({ + submissionUuid: fakeSubmissionUuid, + }); + expect( + mockApplicationSubmissionToSubmissionStatusRepository.remove, + ).toBeCalledTimes(1); + expect( + mockApplicationSubmissionToSubmissionStatusRepository.remove, + ).toBeCalledWith(mockStatuses); + }); + + it('should return copied statuses', async () => { + const fakeSubmissionUuid = 'fake'; + const fakeUpdatedSubmissionUuid = 'fake-updated'; + + const mockStatuses = [ + new ApplicationSubmissionToSubmissionStatus({ + submissionUuid: fakeSubmissionUuid, + statusTypeCode: SUBMISSION_STATUS.ALC_DECISION, + }), + new ApplicationSubmissionToSubmissionStatus({ + submissionUuid: fakeSubmissionUuid, + statusTypeCode: SUBMISSION_STATUS.IN_PROGRESS, + effectiveDate: new Date(), + }), + ]; + + const copiedStatuses = mockStatuses.map( + (s) => + new ApplicationSubmissionToSubmissionStatus({ + ...s, + submissionUuid: fakeUpdatedSubmissionUuid, + }), + ); + + mockApplicationSubmissionToSubmissionStatusRepository.find.mockResolvedValue( + mockStatuses, + ); + + const result = await service.getCopiedStatuses( + fakeSubmissionUuid, + fakeUpdatedSubmissionUuid, + ); + + expect( + mockApplicationSubmissionToSubmissionStatusRepository.find, + ).toBeCalledTimes(1); + expect( + mockApplicationSubmissionToSubmissionStatusRepository.find, + ).toBeCalledWith({ + where: { submissionUuid: fakeSubmissionUuid }, + }); + + expect(result).toMatchObject(copiedStatuses); + }); }); diff --git a/services/apps/alcs/src/application-submission-status/application-submission-status.service.ts b/services/apps/alcs/src/application-submission-status/application-submission-status.service.ts index aeb2b7b8d4..a1c31bc8a7 100644 --- a/services/apps/alcs/src/application-submission-status/application-submission-status.service.ts +++ b/services/apps/alcs/src/application-submission-status/application-submission-status.service.ts @@ -24,7 +24,7 @@ export class ApplicationSubmissionStatusService { private applicationSubmissionRepository: Repository, ) {} - async setInitialStatuses(submissionUuid: string) { + async setInitialStatuses(submissionUuid: string, persist = true) { const statuses = await this.submissionStatusTypeRepository.find(); const newStatuses: ApplicationSubmissionToSubmissionStatus[] = []; @@ -42,7 +42,11 @@ export class ApplicationSubmissionStatusService { newStatuses.push(newStatus); } - return await this.statusesRepository.save(newStatuses); + if (persist) { + return await this.statusesRepository.save(newStatuses); + } + + return newStatuses; } async setStatusDate( @@ -113,4 +117,30 @@ export class ApplicationSubmissionStatusService { return submission; } + + //Note: do not use fileNumber as identifier since there maybe multiple submissions with + // the same fileNumber due to isDraft flag + async removeStatuses(submissionUuid: string) { + const statusesToRemove = await this.getCurrentStatusesBy(submissionUuid); + + return await this.statusesRepository.remove(statusesToRemove); + } + + async getCopiedStatuses( + sourceSubmissionUuid: string, + destinationSubmissionUuid, + ) { + const statuses = await this.statusesRepository.find({ + where: { submissionUuid: sourceSubmissionUuid }, + }); + const newStatuses = statuses.map( + (s) => + new ApplicationSubmissionToSubmissionStatus({ + ...s, + submissionUuid: destinationSubmissionUuid, + }), + ); + + return newStatuses; + } } diff --git a/services/apps/alcs/src/portal/application-submission-draft/application-submission-draft.module.ts b/services/apps/alcs/src/portal/application-submission-draft/application-submission-draft.module.ts index 8a77f5d9bf..6856f35af0 100644 --- a/services/apps/alcs/src/portal/application-submission-draft/application-submission-draft.module.ts +++ b/services/apps/alcs/src/portal/application-submission-draft/application-submission-draft.module.ts @@ -1,5 +1,6 @@ import { Module } from '@nestjs/common'; import { TypeOrmModule } from '@nestjs/typeorm'; +import { ApplicationSubmissionStatusModule } from '../../application-submission-status/application-submission-status.module'; import { ApplicationSubmissionStatusType } from '../../application-submission-status/submission-status-type.entity'; import { ApplicationOwnerType } from '../application-submission/application-owner/application-owner-type/application-owner-type.entity'; import { ApplicationOwner } from '../application-submission/application-owner/application-owner.entity'; @@ -23,6 +24,7 @@ import { ApplicationSubmissionDraftService } from './application-submission-draf ]), ApplicationSubmissionModule, PdfGenerationModule, + ApplicationSubmissionStatusModule, ], providers: [ApplicationSubmissionDraftService], controllers: [ApplicationSubmissionDraftController], diff --git a/services/apps/alcs/src/portal/application-submission-draft/application-submission-draft.service.spec.ts b/services/apps/alcs/src/portal/application-submission-draft/application-submission-draft.service.spec.ts index 885eb11c03..10d11cf2c2 100644 --- a/services/apps/alcs/src/portal/application-submission-draft/application-submission-draft.service.spec.ts +++ b/services/apps/alcs/src/portal/application-submission-draft/application-submission-draft.service.spec.ts @@ -2,13 +2,13 @@ import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; +import { ApplicationSubmissionStatusService } from '../../application-submission-status/application-submission-status.service'; import { User } from '../../user/user.entity'; import { ApplicationOwnerService } from '../application-submission/application-owner/application-owner.service'; import { ApplicationParcelService } from '../application-submission/application-parcel/application-parcel.service'; import { ApplicationSubmission } from '../application-submission/application-submission.entity'; import { ApplicationSubmissionService } from '../application-submission/application-submission.service'; import { GenerateSubmissionDocumentService } from '../pdf-generation/generate-submission-document.service'; -import { ApplicationSubmissionDraftModule } from './application-submission-draft.module'; import { ApplicationSubmissionDraftService } from './application-submission-draft.service'; describe('ApplicationSubmissionDraftService', () => { @@ -18,6 +18,7 @@ describe('ApplicationSubmissionDraftService', () => { let mockParcelService: DeepMocked; let mockAppOwnerService: DeepMocked; let mockGenerateSubmissionDocumentService: DeepMocked; + let mockApplicationSubmissionStatusService: DeepMocked; beforeEach(async () => { mockSubmissionRepo = createMock(); @@ -25,6 +26,7 @@ describe('ApplicationSubmissionDraftService', () => { mockParcelService = createMock(); mockAppOwnerService = createMock(); mockGenerateSubmissionDocumentService = createMock(); + mockApplicationSubmissionStatusService = createMock(); const module: TestingModule = await Test.createTestingModule({ providers: [ @@ -49,6 +51,10 @@ describe('ApplicationSubmissionDraftService', () => { provide: GenerateSubmissionDocumentService, useValue: mockGenerateSubmissionDocumentService, }, + { + provide: ApplicationSubmissionStatusService, + useValue: mockApplicationSubmissionStatusService, + }, ], }).compile(); @@ -83,11 +89,19 @@ describe('ApplicationSubmissionDraftService', () => { mockSubmissionRepo.save.mockResolvedValue(new ApplicationSubmission()); mockParcelService.update.mockResolvedValue([]); + const mockTransaction = jest.fn(); + mockSubmissionRepo.manager.transaction = mockTransaction; + mockApplicationSubmissionStatusService.getCopiedStatuses.mockResolvedValue( + [], + ); const draft = await service.getOrCreateDraft('fileNumber'); expect(mockSubmissionRepo.findOne).toHaveBeenCalledTimes(3); expect(mockSubmissionRepo.save).toHaveBeenCalledTimes(1); + expect( + mockApplicationSubmissionStatusService.getCopiedStatuses, + ).toHaveBeenCalledTimes(1); expect(draft).toBeDefined(); }); @@ -112,22 +126,30 @@ describe('ApplicationSubmissionDraftService', () => { it('should load two submissions and save one as not draft when publishing', async () => { mockSubmissionRepo.findOne.mockResolvedValue( new ApplicationSubmission({ + uuid: 'fake', owners: [], parcels: [], }), ); - mockSubmissionRepo.remove.mockResolvedValue(new ApplicationSubmission()); + mockSubmissionRepo.delete.mockResolvedValue({} as any); mockSubmissionRepo.save.mockResolvedValue(new ApplicationSubmission()); mockParcelService.deleteMany.mockResolvedValueOnce([]); mockGenerateSubmissionDocumentService.generateUpdate.mockResolvedValue(); + mockApplicationSubmissionStatusService.removeStatuses.mockResolvedValue( + {} as any, + ); await service.publish('fileNumber', new User()); expect(mockSubmissionRepo.findOne).toHaveBeenCalledTimes(2); - expect(mockSubmissionRepo.remove).toHaveBeenCalledTimes(1); + expect(mockSubmissionRepo.delete).toHaveBeenCalledTimes(1); + expect(mockSubmissionRepo.delete).toBeCalledWith({ uuid: 'fake' }); expect(mockParcelService.deleteMany).toHaveBeenCalledTimes(1); expect(mockSubmissionRepo.save).toHaveBeenCalledTimes(1); + expect( + mockApplicationSubmissionStatusService.removeStatuses, + ).toHaveBeenCalledTimes(1); expect(mockSubmissionRepo.save.mock.calls[0][0].isDraft).toEqual(false); expect( mockGenerateSubmissionDocumentService.generateUpdate, diff --git a/services/apps/alcs/src/portal/application-submission-draft/application-submission-draft.service.ts b/services/apps/alcs/src/portal/application-submission-draft/application-submission-draft.service.ts index f58ab6066c..d044c6bef4 100644 --- a/services/apps/alcs/src/portal/application-submission-draft/application-submission-draft.service.ts +++ b/services/apps/alcs/src/portal/application-submission-draft/application-submission-draft.service.ts @@ -2,6 +2,7 @@ import { BaseServiceException } from '@app/common/exceptions/base.exception'; import { BadRequestException, Injectable, Logger } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; +import { ApplicationSubmissionStatusService } from '../../application-submission-status/application-submission-status.service'; import { User } from '../../user/user.entity'; import { ApplicationOwnerService } from '../application-submission/application-owner/application-owner.service'; import { ApplicationParcelUpdateDto } from '../application-submission/application-parcel/application-parcel.dto'; @@ -21,6 +22,7 @@ export class ApplicationSubmissionDraftService { private applicationParcelService: ApplicationParcelService, private applicationOwnerService: ApplicationOwnerService, private generateSubmissionDocumentService: GenerateSubmissionDocumentService, + private applicationSubmissionStatusService: ApplicationSubmissionStatusService, ) {} async getOrCreateDraft(fileNumber: string) { @@ -79,7 +81,7 @@ export class ApplicationSubmissionDraftService { ); } - const newReview = new ApplicationSubmission({ + const newSubmission = new ApplicationSubmission({ ...originalSubmission, uuid: undefined, auditCreatedAt: undefined, @@ -89,7 +91,20 @@ export class ApplicationSubmissionDraftService { owners: [], }); const savedSubmission = await this.applicationSubmissionRepository.save( - newReview, + newSubmission, + ); + const statuses = + await this.applicationSubmissionStatusService.getCopiedStatuses( + originalSubmission.uuid, + newSubmission.uuid, + ); + + this.applicationSubmissionRepository.manager.transaction( + async (transactionalEntityManager) => { + await transactionalEntityManager.save(newSubmission); + + await transactionalEntityManager.save(statuses); + }, ); const ownerUuidMap = new Map(); @@ -176,6 +191,7 @@ export class ApplicationSubmissionDraftService { relations: { owners: true, parcels: true, + createdBy: true, }, }); @@ -191,8 +207,10 @@ export class ApplicationSubmissionDraftService { } const parcelUuids = original.parcels.map((parcel) => parcel.uuid); await this.applicationParcelService.deleteMany(parcelUuids); - await this.applicationSubmissionRepository.remove(original); + await this.applicationSubmissionStatusService.removeStatuses(original.uuid); + await this.applicationSubmissionRepository.delete({ uuid: original.uuid }); + draft.createdBy = original.createdBy; draft.isDraft = false; await this.applicationSubmissionRepository.save(draft); diff --git a/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.spec.ts b/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.spec.ts index 676789998b..066087443d 100644 --- a/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.spec.ts +++ b/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.spec.ts @@ -509,12 +509,15 @@ describe('ApplicationSubmissionReviewController', () => { mockAppSubmissionService.getForGovernmentByFileId, ).toHaveBeenCalledTimes(1); expect(mockAppReviewService.getByFileNumber).toHaveBeenCalledTimes(1); - expect(mockAppSubmissionService.updateStatus).toHaveBeenCalledTimes(1); + expect(mockAppSubmissionService.updateStatus).toHaveBeenCalledTimes(2); expect(mockAppDocService.delete).toHaveBeenCalledTimes(1); expect(mockAppReviewService.delete).toHaveBeenCalledTimes(1); - expect(mockAppSubmissionService.updateStatus.mock.calls[0][1]).toEqual( + expect(mockAppSubmissionService.updateStatus.mock.calls[1][1]).toEqual( SUBMISSION_STATUS.INCOMPLETE, ); + expect(mockAppSubmissionService.updateStatus.mock.calls[0][1]).toEqual( + SUBMISSION_STATUS.WRONG_GOV, + ); expect(mockAppSubmissionService.update).toHaveBeenCalledTimes(1); expect(mockAppSubmissionService.update.mock.calls[0][0]).toEqual( 'submission-uuid', diff --git a/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.ts b/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.ts index 801b05692f..c64d4ce2c2 100644 --- a/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.ts +++ b/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.ts @@ -371,22 +371,39 @@ export class ApplicationSubmissionReviewController { ); } - if (returnDto.reasonForReturn === 'incomplete') { - await this.applicationSubmissionService.updateStatus( - applicationSubmission, - SUBMISSION_STATUS.INCOMPLETE, - ); - } else { - await this.applicationSubmissionService.updateStatus( - applicationSubmission, - SUBMISSION_STATUS.WRONG_GOV, - ); - } + await this.setReturnedStatus(returnDto, applicationSubmission); } else { throw new BaseServiceException('Application not in correct status'); } } + private async setReturnedStatus( + returnDto: ReturnApplicationSubmissionDto, + applicationSubmission: ApplicationSubmission, + ) { + if (returnDto.reasonForReturn === 'incomplete') { + await this.applicationSubmissionService.updateStatus( + applicationSubmission, + SUBMISSION_STATUS.WRONG_GOV, + null, + ); + await this.applicationSubmissionService.updateStatus( + applicationSubmission, + SUBMISSION_STATUS.INCOMPLETE, + ); + } else { + await this.applicationSubmissionService.updateStatus( + applicationSubmission, + SUBMISSION_STATUS.INCOMPLETE, + null, + ); + await this.applicationSubmissionService.updateStatus( + applicationSubmission, + SUBMISSION_STATUS.WRONG_GOV, + ); + } + } + private async getUserGovernmentOrFail(user: User) { const userGovernment = await this.getUserGovernment(user); if (!userGovernment) { From e6f2b76cc7a4e3389b069cfb44bfdb24e446d28a Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Thu, 20 Jul 2023 12:26:06 -0700 Subject: [PATCH 098/954] Code Review Feedback * Add test for deleteNonParcelOwners * Change to use submission uuid to not impact draft/non-draft submissions --- .../application-owner/application-owner.controller.ts | 6 ++++-- .../application-owner.service.spec.ts | 10 ++++++++++ .../application-owner/application-owner.service.ts | 6 +++--- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.controller.ts b/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.controller.ts index 03b0576c78..4a900a8353 100644 --- a/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.controller.ts +++ b/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.controller.ts @@ -161,7 +161,7 @@ export class ApplicationOwnerController { //Create Owner if (!data.ownerUuid) { - await this.ownerService.deleteNonParcelOwners(applicationSubmission); + await this.ownerService.deleteNonParcelOwners(applicationSubmission.uuid); const newOwner = await this.ownerService.create( { email: data.email, @@ -198,7 +198,9 @@ export class ApplicationOwnerController { }); } else { //Delete Non parcel owners if we aren't using one - await this.ownerService.deleteNonParcelOwners(applicationSubmission); + await this.ownerService.deleteNonParcelOwners( + applicationSubmission.uuid, + ); } await this.ownerService.setPrimaryContact( diff --git a/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.service.spec.ts b/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.service.spec.ts index 48ef867b65..b78ca5feb0 100644 --- a/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.service.spec.ts +++ b/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.service.spec.ts @@ -329,4 +329,14 @@ describe('ApplicationOwnerService', () => { 'A et al.', ); }); + + it('should load then delete non application owners', async () => { + mockRepo.find.mockResolvedValue([new ApplicationOwner()]); + mockRepo.remove.mockResolvedValue([] as any); + + await service.deleteNonParcelOwners('uuid'); + + expect(mockRepo.find).toHaveBeenCalledTimes(1); + expect(mockRepo.remove).toHaveBeenCalledTimes(1); + }); }); diff --git a/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.service.ts b/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.service.ts index 51abcd1584..ddc745c66a 100644 --- a/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.service.ts +++ b/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.service.ts @@ -214,12 +214,12 @@ export class ApplicationOwnerService { }); } - async deleteNonParcelOwners(application: ApplicationSubmission) { + async deleteNonParcelOwners(submissionUuid: string) { const agentOwners = await this.repository.find({ where: [ { applicationSubmission: { - fileNumber: application.fileNumber, + uuid: submissionUuid, }, type: { code: APPLICATION_OWNER.AGENT, @@ -227,7 +227,7 @@ export class ApplicationOwnerService { }, { applicationSubmission: { - fileNumber: application.fileNumber, + uuid: submissionUuid, }, type: { code: APPLICATION_OWNER.GOVERNMENT, From ae96a15f0eabc49bf2d9d1422234318e6e101ed5 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Thu, 20 Jul 2023 12:39:11 -0700 Subject: [PATCH 099/954] Code Review Feedback --- .../review-and-submit.component.spec.ts | 5 ++ .../review-and-submit.component.ts | 53 +++++++++++++------ .../submit-confirmation-dialog.component.html | 5 +- ...bmit-confirmation-dialog.component.spec.ts | 8 ++- .../submit-confirmation-dialog.component.ts | 19 +++---- .../select-government.component.ts | 6 +-- 6 files changed, 59 insertions(+), 37 deletions(-) diff --git a/portal-frontend/src/app/features/edit-submission/review-and-submit/review-and-submit.component.spec.ts b/portal-frontend/src/app/features/edit-submission/review-and-submit/review-and-submit.component.spec.ts index c1072da656..69089069ef 100644 --- a/portal-frontend/src/app/features/edit-submission/review-and-submit/review-and-submit.component.spec.ts +++ b/portal-frontend/src/app/features/edit-submission/review-and-submit/review-and-submit.component.spec.ts @@ -6,6 +6,7 @@ import { DeepMocked, createMock } from '@golevelup/ts-jest'; import { BehaviorSubject } from 'rxjs'; import { ApplicationSubmissionDetailedDto } from '../../../services/application-submission/application-submission.dto'; import { ApplicationSubmissionService } from '../../../services/application-submission/application-submission.service'; +import { CodeService } from '../../../services/code/code.service'; import { PdfGenerationService } from '../../../services/pdf-generation/pdf-generation.service'; import { ToastService } from '../../../services/toast/toast.service'; @@ -47,6 +48,10 @@ describe('ReviewAndSubmitComponent', () => { provide: MatDialog, useValue: {}, }, + { + provide: CodeService, + useValue: {}, + }, ], }).compileComponents(); diff --git a/portal-frontend/src/app/features/edit-submission/review-and-submit/review-and-submit.component.ts b/portal-frontend/src/app/features/edit-submission/review-and-submit/review-and-submit.component.ts index ba85493352..6c69c84fd8 100644 --- a/portal-frontend/src/app/features/edit-submission/review-and-submit/review-and-submit.component.ts +++ b/portal-frontend/src/app/features/edit-submission/review-and-submit/review-and-submit.component.ts @@ -5,6 +5,7 @@ import { BehaviorSubject, takeUntil } from 'rxjs'; import { ApplicationDocumentDto } from '../../../services/application-document/application-document.dto'; import { ApplicationSubmissionDetailedDto } from '../../../services/application-submission/application-submission.dto'; import { ApplicationSubmissionService } from '../../../services/application-submission/application-submission.service'; +import { CodeService } from '../../../services/code/code.service'; import { PdfGenerationService } from '../../../services/pdf-generation/pdf-generation.service'; import { ToastService } from '../../../services/toast/toast.service'; import { StepComponent } from '../step.partial'; @@ -28,14 +29,15 @@ export class ReviewAndSubmitComponent extends StepComponent implements OnInit, O private toastService: ToastService, private applicationService: ApplicationSubmissionService, private pdfGenerationService: PdfGenerationService, + private codeService: CodeService, private dialog: MatDialog ) { super(); } ngOnInit(): void { - this.$applicationSubmission.pipe(takeUntil(this.$destroy)).subscribe((app) => { - this.applicationSubmission = app; + this.$applicationSubmission.pipe(takeUntil(this.$destroy)).subscribe((submission) => { + this.applicationSubmission = submission; }); } @@ -50,22 +52,29 @@ export class ReviewAndSubmitComponent extends StepComponent implements OnInit, O } async onSubmitToAlcs() { - const el = document.getElementsByClassName('error'); - if (el && el.length > 0) { - el[0].scrollIntoView({ - behavior: 'smooth', - block: 'center', - }); - this.toastService.showErrorToast('Please correct all errors before submitting the form'); - } else { - this.dialog - .open(SubmitConfirmationDialogComponent) - .beforeClosed() - .subscribe((didConfirm) => { - if (didConfirm) { - this.submit.emit(); - } + if (this.applicationSubmission) { + const el = document.getElementsByClassName('error'); + if (el && el.length > 0) { + el[0].scrollIntoView({ + behavior: 'smooth', + block: 'center', }); + this.toastService.showErrorToast('Please correct all errors before submitting the form'); + } else { + const governmentName = await this.loadGovernmentName(this.applicationSubmission.localGovernmentUuid); + this.dialog + .open(SubmitConfirmationDialogComponent, { + data: { + governmentName: governmentName, + }, + }) + .beforeClosed() + .subscribe((didConfirm) => { + if (didConfirm) { + this.submit.emit(); + } + }); + } } } @@ -74,4 +83,14 @@ export class ReviewAndSubmitComponent extends StepComponent implements OnInit, O await this.pdfGenerationService.generateSubmission(fileNumber); } } + + private async loadGovernmentName(uuid: string) { + const codes = await this.codeService.loadCodes(); + const localGovernment = codes.localGovernments.find((a) => a.uuid === uuid); + if (localGovernment) { + return localGovernment.name; + } else { + return 'selected local / first nation government'; + } + } } diff --git a/portal-frontend/src/app/features/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.html b/portal-frontend/src/app/features/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.html index 16b1d105f9..7ffc11dbaf 100644 --- a/portal-frontend/src/app/features/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.html +++ b/portal-frontend/src/app/features/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.html @@ -4,8 +4,9 @@

Submit Application

- Your application will be submitted to the [L/FNG]. After submission, you will be auto-directed to complete the local - or first nation government review form in order to submit this application to the Agricultural Land Commission. + Your application will be submitted to the {{ data.governmentName }}. After submission, you will be auto-directed to + complete the local or first nation government review form in order to submit this application to the Agricultural + Land Commission.

Terms and Conditions:
diff --git a/portal-frontend/src/app/features/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.spec.ts b/portal-frontend/src/app/features/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.spec.ts index 0f7741443b..7d6d06ed68 100644 --- a/portal-frontend/src/app/features/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.spec.ts +++ b/portal-frontend/src/app/features/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.spec.ts @@ -1,10 +1,10 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { NO_ERRORS_SCHEMA } from '@angular/core'; -import { MatDialog, MatDialogRef } from '@angular/material/dialog'; +import { MAT_DIALOG_DATA, MatDialog, MatDialogRef } from '@angular/material/dialog'; import { SubmitConfirmationDialogComponent } from './submit-confirmation-dialog.component'; -describe('OtherParcelConfirmationDialogComponent', () => { +describe('SubmitConfirmationDialogComponent', () => { let component: SubmitConfirmationDialogComponent; let fixture: ComponentFixture; @@ -20,6 +20,10 @@ describe('OtherParcelConfirmationDialogComponent', () => { provide: MatDialogRef, useValue: {}, }, + { + provide: MAT_DIALOG_DATA, + useValue: {}, + }, ], schemas: [NO_ERRORS_SCHEMA], }).compileComponents(); diff --git a/portal-frontend/src/app/features/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.ts b/portal-frontend/src/app/features/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.ts index fc8779c3f5..cf84e55daa 100644 --- a/portal-frontend/src/app/features/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.ts +++ b/portal-frontend/src/app/features/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.ts @@ -1,5 +1,5 @@ -import { Component } from '@angular/core'; -import { MatDialogRef } from '@angular/material/dialog'; +import { Component, Inject } from '@angular/core'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; @Component({ selector: 'app-submit-confirmation-dialog', @@ -7,13 +7,10 @@ import { MatDialogRef } from '@angular/material/dialog'; styleUrls: ['./submit-confirmation-dialog.component.scss'], }) export class SubmitConfirmationDialogComponent { - constructor(private dialogRef: MatDialogRef) {} - - async onCancel(dialogResult: boolean = false) { - this.dialogRef.close(dialogResult); - } - - async onSubmit() { - this.dialogRef.close(true); - } + constructor( + @Inject(MAT_DIALOG_DATA) + protected data: { + governmentName: string; + } + ) {} } diff --git a/portal-frontend/src/app/features/edit-submission/select-government/select-government.component.ts b/portal-frontend/src/app/features/edit-submission/select-government/select-government.component.ts index 11ab4211a1..9d7ad511a5 100644 --- a/portal-frontend/src/app/features/edit-submission/select-government/select-government.component.ts +++ b/portal-frontend/src/app/features/edit-submission/select-government/select-government.component.ts @@ -30,11 +30,7 @@ export class SelectGovernmentComponent extends StepComponent implements OnInit, localGovernment: this.localGovernment, }); - constructor( - private codeService: CodeService, - private applicationSubmissionService: ApplicationSubmissionService, - private router: Router - ) { + constructor(private codeService: CodeService, private applicationSubmissionService: ApplicationSubmissionService) { super(); } From 4d3fb7f31a876a85100a4c2e37bd2a8652e0728b Mon Sep 17 00:00:00 2001 From: "to. sandra" <76515860+sandratoh@users.noreply.github.com> Date: Thu, 20 Jul 2023 14:11:27 -0700 Subject: [PATCH 100/954] Show uneditable app info if app was submitted to lfng (#803) * Show uneditable app info if app was submitted to lfng * Use onChanges to handle input property changes * Add onChanges fn argument * Rename variable to clarify app status * Refactor code --- .../applicant-info.component.html | 5 ++-- .../applicant-info.component.ts | 19 +++++++++++---- .../application-details.component.html | 24 ++++++++++++------- .../application-details.component.ts | 14 ++++++++--- 4 files changed, 44 insertions(+), 18 deletions(-) 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 index fd5c9dff83..3bcbdddc5c 100644 --- 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 @@ -4,8 +4,9 @@ [submission]="submission" [fileNumber]="fileNumber" [applicationType]="application.type.code" - [isSubmitted]='isSubmitted' - [showEdit]='true' + [isSubmittedToAlc]="isSubmittedToAlc" + [wasSubmittedToLfng]="wasSubmittedToLfng" + [showEdit]="true" >
diff --git a/alcs-frontend/src/app/features/application/applicant-info/applicant-info.component.ts b/alcs-frontend/src/app/features/application/applicant-info/applicant-info.component.ts index 8fd982baba..583d97e0c9 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/applicant-info.component.ts +++ b/alcs-frontend/src/app/features/application/applicant-info/applicant-info.component.ts @@ -1,5 +1,4 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; -import { ActivatedRoute } from '@angular/router'; import { Subject, takeUntil } from 'rxjs'; import { ApplicationDetailService } from '../../../services/application/application-detail.service'; import { DOCUMENT_TYPE } from '../../../services/application/application-document/application-document.service'; @@ -8,6 +7,7 @@ import { APPLICATION_SYSTEM_SOURCE_TYPES, ApplicationDto, ApplicationSubmissionDto, + SUBMISSION_STATUS, } from '../../../services/application/application.dto'; @Component({ @@ -22,7 +22,8 @@ export class ApplicantInfoComponent implements OnInit, OnDestroy { DOCUMENT_TYPE = DOCUMENT_TYPE; application: ApplicationDto | undefined; submission?: ApplicationSubmissionDto = undefined; - isSubmitted = false; + isSubmittedToAlc = false; + wasSubmittedToLfng = false; constructor( private applicationDetailService: ApplicationDetailService, @@ -36,8 +37,18 @@ export class ApplicantInfoComponent implements OnInit, OnDestroy { this.fileNumber = application.fileNumber; this.submission = await this.applicationSubmissionService.fetchSubmission(this.fileNumber); - this.isSubmitted = - application.source === APPLICATION_SYSTEM_SOURCE_TYPES.APPLICANT ? !!application.dateSubmittedToAlc : true; + const isApplicantSubmission = application.source === APPLICATION_SYSTEM_SOURCE_TYPES.APPLICANT; + + this.isSubmittedToAlc = isApplicantSubmission ? !!application.dateSubmittedToAlc : true; + + this.wasSubmittedToLfng = + isApplicantSubmission && + [ + SUBMISSION_STATUS.SUBMITTED_TO_LG, + SUBMISSION_STATUS.IN_REVIEW_BY_LG, + SUBMISSION_STATUS.WRONG_GOV, + SUBMISSION_STATUS.INCOMPLETE, + ].includes(this.submission?.status?.code); } }); } diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.html b/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.html index c95a6a337d..cda1a72718 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.html +++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.html @@ -7,7 +7,7 @@ >
-
@@ -17,7 +17,7 @@
-
@@ -63,13 +63,13 @@

Primary Contact Information

-
-
+

Land Use

@@ -130,11 +130,13 @@

Land Use of Adjacent Parcels

- +
-
+

Proposal

Proposal >
- +
-
+

Optional Documents

@@ -197,7 +201,9 @@

Optional Documents

No optional attachments
- +
diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.ts b/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.ts index 420725db83..c176d6e37a 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.ts +++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.ts @@ -1,4 +1,4 @@ -import { Component, Input, OnDestroy, OnInit } from '@angular/core'; +import { Component, Input, OnChanges, OnDestroy, OnInit, SimpleChanges } from '@angular/core'; import { Subject } from 'rxjs'; import { environment } from '../../../../../environments/environment'; import { ApplicationDocumentDto } from '../../../../services/application/application-document/application-document.dto'; @@ -13,18 +13,21 @@ import { ApplicationSubmissionDto } from '../../../../services/application/appli templateUrl: './application-details.component.html', styleUrls: ['./application-details.component.scss'], }) -export class ApplicationDetailsComponent implements OnInit, OnDestroy { +export class ApplicationDetailsComponent implements OnInit, OnChanges, OnDestroy { $destroy = new Subject(); @Input() submission!: ApplicationSubmissionDto; @Input() applicationType!: string; @Input() fileNumber!: string; @Input() showEdit = false; - @Input() isSubmitted = true; + @Input() isSubmittedToAlc = true; + @Input() wasSubmittedToLfng = false; authorizationLetters: ApplicationDocumentDto[] = []; otherFiles: ApplicationDocumentDto[] = []; files: ApplicationDocumentDto[] | undefined; + disableEdit = false; + showFullApp = false; constructor(private applicationDocumentService: ApplicationDocumentService) {} @@ -32,6 +35,11 @@ export class ApplicationDetailsComponent implements OnInit, OnDestroy { this.loadDocuments(); } + ngOnChanges(changes: SimpleChanges): void { + this.disableEdit = this.wasSubmittedToLfng || !this.isSubmittedToAlc; + this.showFullApp = this.wasSubmittedToLfng || this.isSubmittedToAlc; + } + ngOnDestroy(): void { this.$destroy.next(); this.$destroy.complete(); From 9b77e7345eb4f31913460e9dfa3f1396ea7db7ed Mon Sep 17 00:00:00 2001 From: Liam Stoddard Date: Thu, 20 Jul 2023 14:34:50 -0700 Subject: [PATCH 101/954] upload non-noi files to application folder --- bin/migrate-files/app_docs.sql | 72 ++++++++++++++++++++ bin/migrate-files/migrate-files.py | 19 +++++- bin/migrate-files/noi_docs.sql | 104 +++++++++++++++++++++++++++++ 3 files changed, 193 insertions(+), 2 deletions(-) create mode 100644 bin/migrate-files/app_docs.sql create mode 100644 bin/migrate-files/noi_docs.sql diff --git a/bin/migrate-files/app_docs.sql b/bin/migrate-files/app_docs.sql new file mode 100644 index 0000000000..15a6592c3a --- /dev/null +++ b/bin/migrate-files/app_docs.sql @@ -0,0 +1,72 @@ +DROP TABLE IF EXISTS oats.alcs_etl_app_docs; + +CREATE TABLE + oats.alcs_etl_app_docs ( + document_id INT, + document_code VARCHAR, + alr_application_id INT, + issue_id INT, + planning_review_id INT, + file_name VARCHAR, + "description" VARCHAR, + document_blob BYTEA, + referenced_in_staff_rpt_ind VARCHAR, + document_source_code VARCHAR, + subject_property_id INT, + publicly_viewable_ind VARCHAR, + app_lg_viewable_ind VARCHAR, + uploaded_date TIMESTAMP, + who_created VARCHAR, + when_created TIMESTAMP, + who_updated VARCHAR, + when_updated TIMESTAMP, + revision_count INT + ); + +INSERT INTO + oats.alcs_etl_app_docs ( + document_id, + document_code, + alr_application_id, + issue_id, + planning_review_id, + file_name, + "description", + document_blob, + referenced_in_staff_rpt_ind, + document_source_code, + subject_property_id, + publicly_viewable_ind, + app_lg_viewable_ind, + uploaded_date, + who_created, + when_created, + who_updated, + when_updated, + revision_count + ) +select + ad.document_id, + ad.document_code, + ad.alr_application_id, + ad.issue_id, + ad.planning_review_id, + ad.file_name, + ad."description", + ad.document_blob, + ad.referenced_in_staff_rpt_ind, + ad.document_source_code, + ad.subject_property_id, + ad.publicly_viewable_ind, + ad.app_lg_viewable_ind, + ad.uploaded_date, + ad.who_created, + ad.when_created, + ad.who_updated, + ad.when_updated, + ad.revision_count +from + oats.alcs_etl_noi_docs nd + right join oats.oats_documents ad on nd.document_id = ad.document_id +where + nd.document_id is null \ No newline at end of file diff --git a/bin/migrate-files/migrate-files.py b/bin/migrate-files/migrate-files.py index e3aef390aa..0ca8743905 100644 --- a/bin/migrate-files/migrate-files.py +++ b/bin/migrate-files/migrate-files.py @@ -54,10 +54,25 @@ count = cursor.fetchone()[0] print('Count =', count) + +with open( + "noi_docs.sql", "r", encoding="utf-8" +) as sql_file: + create_noi_table = sql_file.read() + cursor.execute(create_noi_table) +conn.commit() + +with open( + "app_docs.sql", "r", encoding="utf-8" +) as sql_file: + create_app_table = sql_file.read() + cursor.execute(create_app_table) +conn.commit() + # # Execute the SQL query to retrieve the BLOB data and key column cursor.execute(f""" SELECT DOCUMENT_ID, ALR_APPLICATION_ID, FILE_NAME, DOCUMENT_BLOB, DOCUMENT_CODE, DESCRIPTION, DOCUMENT_SOURCE_CODE, UPLOADED_DATE, WHEN_UPDATED, REVISION_COUNT, dbms_lob.getLength(DOCUMENT_BLOB) as LENGTH -FROM OATS.OATS_DOCUMENTS +FROM OATS.ALCS_ETL_APP_DOCS WHERE dbms_lob.getLength(DOCUMENT_BLOB) > 0 AND DOCUMENT_ID > {starting_document_id} ORDER BY DOCUMENT_ID ASC @@ -82,7 +97,7 @@ tqdm.write(f"{application_id}/{document_id}_{filename}") with tqdm(total=length, unit="B", unit_scale=True, desc=filename) as pbar2: - s3.upload_fileobj(file, ecs_bucket, f"migrate/{application_id}/{document_id}_{filename}", + s3.upload_fileobj(file, ecs_bucket, f"migrate/application/{application_id}/{document_id}_{filename}", Callback=lambda bytes_transferred: pbar2.update(bytes_transferred),) pbar.update(1) last_document_id = document_id diff --git a/bin/migrate-files/noi_docs.sql b/bin/migrate-files/noi_docs.sql new file mode 100644 index 0000000000..c543831a15 --- /dev/null +++ b/bin/migrate-files/noi_docs.sql @@ -0,0 +1,104 @@ +DROP TABLE IF EXISTS oats.alcs_etl_noi_docs; + +CREATE TABLE + oats.alcs_etl_noi_docs ( + document_id INT, + document_code VARCHAR, + alr_application_id INT, + issue_id INT, + planning_review_id INT, + file_name VARCHAR, + "description" VARCHAR, + document_blob BYTEA, + referenced_in_staff_rpt_ind VARCHAR, + document_source_code VARCHAR, + subject_property_id INT, + publicly_viewable_ind VARCHAR, + app_lg_viewable_ind VARCHAR, + uploaded_date TIMESTAMP, + who_created VARCHAR, + when_created TIMESTAMP, + who_updated VARCHAR, + when_updated TIMESTAMP, + revision_count INT + ); + +INSERT INTO + oats.alcs_etl_noi_docs ( + document_id, + document_code, + alr_application_id, + issue_id, + planning_review_id, + file_name, + "description", + document_blob, + referenced_in_staff_rpt_ind, + document_source_code, + subject_property_id, + publicly_viewable_ind, + app_lg_viewable_ind, + uploaded_date, + who_created, + when_created, + who_updated, + when_updated, + revision_count + ) +WITH + noi AS ( + SELECT + od.alr_application_id AS app_id, + od.issue_id AS tissue_id + FROM + oats.oats_documents od + WHERE + document_code = 'NOI' + ), + appl AS ( + SELECT + * + FROM + oats.oats_documents od2 + JOIN noi ON od2.alr_application_id = noi.app_id + ), + issue AS ( + SELECT + * + FROM + oats.oats_documents od3 + JOIN noi ON od3.issue_id = noi.tissue_id + ), + noi_docs AS ( + SELECT + * + FROM + appl + UNION + SELECT + * + FROM + issue + ) +SELECT + nd.document_id, + nd.document_code, + nd.alr_application_id, + nd.issue_id, + nd.planning_review_id, + nd.file_name, + nd."description", + nd.document_blob, + nd.referenced_in_staff_rpt_ind, + nd.document_source_code, + nd.subject_property_id, + nd.publicly_viewable_ind, + nd.app_lg_viewable_ind, + nd.uploaded_date, + nd.who_created, + nd.when_created, + nd.who_updated, + nd.when_updated, + nd.revision_count +FROM + noi_docs nd \ No newline at end of file From 72552b00f0bea6e1085e6bc943b5efdb232474fc Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Thu, 20 Jul 2023 15:22:32 -0700 Subject: [PATCH 102/954] Start FNLG review when submitting to yourself * Immediately redirect to start review URL when submitting to your own LG * When creating a review if the primary contact is Government, copy over the contact details --- .../application-details.component.html | 5 +- .../edit-submission.component.spec.ts | 5 ++ .../edit-submission.component.ts | 30 +++++--- .../review-and-submit.component.ts | 12 ++-- .../submit-confirmation-dialog.component.html | 8 ++- .../submit-confirmation-dialog.component.ts | 1 + ...ation-submission-review.controller.spec.ts | 2 + ...pplication-submission-review.controller.ts | 72 ++++++++++++------- ...lication-submission-review.service.spec.ts | 4 +- .../application-submission-review.service.ts | 5 +- .../application-submission.service.ts | 2 +- 11 files changed, 93 insertions(+), 53 deletions(-) diff --git a/portal-frontend/src/app/features/application-details/application-details.component.html b/portal-frontend/src/app/features/application-details/application-details.component.html index 1acd593578..2f955132ec 100644 --- a/portal-frontend/src/app/features/application-details/application-details.component.html +++ b/portal-frontend/src/app/features/application-details/application-details.component.html @@ -100,10 +100,7 @@

4. Government

>ALC.Portal@gov.bc.ca / 236-468-3342 - + 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 application is submitted. diff --git a/portal-frontend/src/app/features/edit-submission/edit-submission.component.spec.ts b/portal-frontend/src/app/features/edit-submission/edit-submission.component.spec.ts index 6261818bec..4c6636f950 100644 --- a/portal-frontend/src/app/features/edit-submission/edit-submission.component.spec.ts +++ b/portal-frontend/src/app/features/edit-submission/edit-submission.component.spec.ts @@ -3,6 +3,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MatAutocompleteModule } from '@angular/material/autocomplete'; import { RouterTestingModule } from '@angular/router/testing'; import { ApplicationDocumentService } from '../../services/application-document/application-document.service'; +import { ApplicationSubmissionReviewService } from '../../services/application-submission-review/application-submission-review.service'; import { ApplicationSubmissionService } from '../../services/application-submission/application-submission.service'; import { CodeService } from '../../services/code/code.service'; import { MatDialogModule } from '@angular/material/dialog'; @@ -38,6 +39,10 @@ describe('EditSubmissionComponent', () => { provide: PdfGenerationService, useValue: {}, }, + { + provide: ApplicationSubmissionReviewService, + useValue: {}, + }, ], imports: [RouterTestingModule, MatAutocompleteModule, MatDialogModule], schemas: [NO_ERRORS_SCHEMA], diff --git a/portal-frontend/src/app/features/edit-submission/edit-submission.component.ts b/portal-frontend/src/app/features/edit-submission/edit-submission.component.ts index 67d10f5442..dd8608f3b0 100644 --- a/portal-frontend/src/app/features/edit-submission/edit-submission.component.ts +++ b/portal-frontend/src/app/features/edit-submission/edit-submission.component.ts @@ -5,28 +5,29 @@ import { ActivatedRoute, Router } from '@angular/router'; import { BehaviorSubject, combineLatest, Observable, of, Subject, takeUntil } from 'rxjs'; import { ApplicationDocumentDto } from '../../services/application-document/application-document.dto'; import { ApplicationDocumentService } from '../../services/application-document/application-document.service'; +import { APPLICATION_OWNER } from '../../services/application-owner/application-owner.dto'; +import { ApplicationSubmissionReviewService } from '../../services/application-submission-review/application-submission-review.service'; import { ApplicationSubmissionDetailedDto } from '../../services/application-submission/application-submission.dto'; import { ApplicationSubmissionService } from '../../services/application-submission/application-submission.service'; -import { ApplicationTypeDto } from '../../services/code/code.dto'; import { PdfGenerationService } from '../../services/pdf-generation/pdf-generation.service'; import { ToastService } from '../../services/toast/toast.service'; import { CustomStepperComponent } from '../../shared/custom-stepper/custom-stepper.component'; import { OverlaySpinnerService } from '../../shared/overlay-spinner/overlay-spinner.service'; +import { scrollToElement } from '../../shared/utils/scroll-helper'; import { ChangeApplicationTypeDialogComponent } from './change-application-type-dialog/change-application-type-dialog.component'; import { LandUseComponent } from './land-use/land-use.component'; -import { NaruProposalComponent } from './proposal/naru-proposal/naru-proposal.component'; -import { NfuProposalComponent } from './proposal/nfu-proposal/nfu-proposal.component'; import { OtherAttachmentsComponent } from './other-attachments/other-attachments.component'; import { OtherParcelsComponent } from './other-parcels/other-parcels.component'; import { ParcelDetailsComponent } from './parcel-details/parcel-details.component'; import { PrimaryContactComponent } from './primary-contact/primary-contact.component'; +import { NaruProposalComponent } from './proposal/naru-proposal/naru-proposal.component'; +import { NfuProposalComponent } from './proposal/nfu-proposal/nfu-proposal.component'; import { PfrsProposalComponent } from './proposal/pfrs-proposal/pfrs-proposal.component'; import { PofoProposalComponent } from './proposal/pofo-proposal/pofo-proposal.component'; import { RosoProposalComponent } from './proposal/roso-proposal/roso-proposal.component'; import { SubdProposalComponent } from './proposal/subd-proposal/subd-proposal.component'; -import { SelectGovernmentComponent } from './select-government/select-government.component'; import { TurProposalComponent } from './proposal/tur-proposal/tur-proposal.component'; -import { scrollToElement } from '../../shared/utils/scroll-helper'; +import { SelectGovernmentComponent } from './select-government/select-government.component'; export enum EditApplicationSteps { AppParcel = 0, @@ -82,7 +83,8 @@ export class EditSubmissionComponent implements OnInit, OnDestroy, AfterViewInit private toastService: ToastService, private overlayService: OverlaySpinnerService, private router: Router, - private pdfGenerationService: PdfGenerationService + private pdfGenerationService: PdfGenerationService, + private applicationReviewService: ApplicationSubmissionReviewService ) {} ngOnInit(): void { @@ -247,9 +249,19 @@ export class EditSubmissionComponent implements OnInit, OnDestroy, AfterViewInit } async onSubmit() { - if (this.applicationSubmission) { - await this.applicationSubmissionService.submitToAlcs(this.applicationSubmission.uuid); - await this.router.navigateByUrl(`/application/${this.applicationSubmission?.fileNumber}`); + const submission = this.applicationSubmission; + if (submission) { + await this.applicationSubmissionService.submitToAlcs(submission.uuid); + + const primaryContact = submission.owners.find((owner) => owner.uuid === submission?.primaryContactOwnerUuid); + if (primaryContact && primaryContact.type.code === APPLICATION_OWNER.GOVERNMENT) { + const review = await this.applicationReviewService.startReview(submission.fileNumber); + if (review) { + await this.router.navigateByUrl(`/application/${submission?.fileNumber}/review`); + } + } else { + await this.router.navigateByUrl(`/application/${submission?.fileNumber}`); + } } } } diff --git a/portal-frontend/src/app/features/edit-submission/review-and-submit/review-and-submit.component.ts b/portal-frontend/src/app/features/edit-submission/review-and-submit/review-and-submit.component.ts index 6c69c84fd8..5331a49f0b 100644 --- a/portal-frontend/src/app/features/edit-submission/review-and-submit/review-and-submit.component.ts +++ b/portal-frontend/src/app/features/edit-submission/review-and-submit/review-and-submit.component.ts @@ -61,11 +61,12 @@ export class ReviewAndSubmitComponent extends StepComponent implements OnInit, O }); this.toastService.showErrorToast('Please correct all errors before submitting the form'); } else { - const governmentName = await this.loadGovernmentName(this.applicationSubmission.localGovernmentUuid); + const government = await this.loadGovernment(this.applicationSubmission.localGovernmentUuid); this.dialog .open(SubmitConfirmationDialogComponent, { data: { - governmentName: governmentName, + governmentName: government?.name ?? 'selected local / first nation government', + userIsGovernment: government?.matchesUserGuid ?? false, }, }) .beforeClosed() @@ -84,13 +85,12 @@ export class ReviewAndSubmitComponent extends StepComponent implements OnInit, O } } - private async loadGovernmentName(uuid: string) { + private async loadGovernment(uuid: string) { const codes = await this.codeService.loadCodes(); const localGovernment = codes.localGovernments.find((a) => a.uuid === uuid); if (localGovernment) { - return localGovernment.name; - } else { - return 'selected local / first nation government'; + return localGovernment; } + return; } } diff --git a/portal-frontend/src/app/features/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.html b/portal-frontend/src/app/features/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.html index 7ffc11dbaf..493c5eb5d2 100644 --- a/portal-frontend/src/app/features/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.html +++ b/portal-frontend/src/app/features/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.html @@ -4,9 +4,11 @@

Submit Application

- Your application will be submitted to the {{ data.governmentName }}. After submission, you will be auto-directed to - complete the local or first nation government review form in order to submit this application to the Agricultural - Land Commission. + Your application will be submitted to the {{ data.governmentName }}. + After submission, you will be auto-directed to complete the local or first nation government review form in order + to submit this application to the Agricultural Land Commission. +

Terms and Conditions:
diff --git a/portal-frontend/src/app/features/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.ts b/portal-frontend/src/app/features/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.ts index cf84e55daa..8fc05d73b8 100644 --- a/portal-frontend/src/app/features/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.ts +++ b/portal-frontend/src/app/features/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.ts @@ -11,6 +11,7 @@ export class SubmitConfirmationDialogComponent { @Inject(MAT_DIALOG_DATA) protected data: { governmentName: string; + userIsGovernment: boolean; } ) {} } diff --git a/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.spec.ts b/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.spec.ts index 066087443d..0d752399b0 100644 --- a/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.spec.ts +++ b/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.spec.ts @@ -21,6 +21,7 @@ import { DOCUMENT_SOURCE } from '../../document/document.dto'; import { Document } from '../../document/document.entity'; import { EmailService } from '../../providers/email/email.service'; import { User } from '../../user/user.entity'; +import { ApplicationOwnerType } from '../application-submission/application-owner/application-owner-type/application-owner-type.entity'; import { ApplicationOwner } from '../application-submission/application-owner/application-owner.entity'; import { ApplicationSubmissionValidatorService, @@ -243,6 +244,7 @@ describe('ApplicationSubmissionReviewController', () => { new ApplicationOwner({ uuid: 'uuid', email: 'fake-email', + type: new ApplicationOwnerType(), }), ], primaryContactOwnerUuid: 'uuid', diff --git a/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.ts b/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.ts index c64d4ce2c2..3448114556 100644 --- a/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.ts +++ b/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.ts @@ -24,6 +24,7 @@ import { PortalAuthGuard } from '../../common/authorization/portal-auth-guard.se import { DOCUMENT_SOURCE } from '../../document/document.dto'; import { EmailService } from '../../providers/email/email.service'; import { User } from '../../user/user.entity'; +import { APPLICATION_OWNER } from '../application-submission/application-owner/application-owner.dto'; import { ApplicationOwner } from '../application-submission/application-owner/application-owner.entity'; import { ApplicationSubmissionValidatorService } from '../application-submission/application-submission-validator.service'; import { ApplicationSubmission } from '../application-submission/application-submission.entity'; @@ -43,7 +44,7 @@ export class ApplicationSubmissionReviewController { constructor( private applicationSubmissionService: ApplicationSubmissionService, - private applicationReviewService: ApplicationSubmissionReviewService, + private applicationSubmissionReviewService: ApplicationSubmissionReviewService, private applicationDocumentService: ApplicationDocumentService, private localGovernmentService: ApplicationLocalGovernmentService, private applicationValidatorService: ApplicationSubmissionValidatorService, @@ -69,7 +70,9 @@ export class ApplicationSubmissionReviewController { } const applicationReview = - await this.applicationReviewService.getByFileNumber(fileNumber); + await this.applicationSubmissionReviewService.getByFileNumber( + fileNumber, + ); if (applicationReview.createdBy) { const reviewGovernment = await this.localGovernmentService.getByGuid( @@ -77,21 +80,21 @@ export class ApplicationSubmissionReviewController { ); if (reviewGovernment) { - return this.applicationReviewService.mapToDto( + return this.applicationSubmissionReviewService.mapToDto( applicationReview, reviewGovernment, ); } } - return this.applicationReviewService.mapToDto( + return this.applicationSubmissionReviewService.mapToDto( applicationReview, userLocalGovernment, ); } const applicationReview = - await this.applicationReviewService.getByFileNumber(fileNumber); + await this.applicationSubmissionReviewService.getByFileNumber(fileNumber); const applicationSubmission = await this.applicationSubmissionService.getByFileNumber( @@ -124,7 +127,7 @@ export class ApplicationSubmissionReviewController { throw new BaseServiceException('Failed to load Local Government'); } - return this.applicationReviewService.mapToDto( + return this.applicationSubmissionReviewService.mapToDto( applicationReview, matchingGovernment, ); @@ -153,13 +156,13 @@ export class ApplicationSubmissionReviewController { ); } - const applicationReview = await this.applicationReviewService.update( - fileNumber, - userLocalGovernment, - updateDto, - ); + const applicationReview = + await this.applicationSubmissionReviewService.update( + fileNumber, + updateDto, + ); - return this.applicationReviewService.mapToDto( + return this.applicationSubmissionReviewService.mapToDto( applicationReview, userLocalGovernment, ); @@ -177,10 +180,11 @@ export class ApplicationSubmissionReviewController { userLocalGovernment, ); - const applicationReview = await this.applicationReviewService.startReview( - applicationSubmission, - req.user.entity, - ); + const applicationReview = + await this.applicationSubmissionReviewService.startReview( + applicationSubmission, + req.user.entity, + ); await this.applicationSubmissionService.updateStatus( applicationSubmission, @@ -200,7 +204,24 @@ export class ApplicationSubmissionReviewController { ); } - return this.applicationReviewService.mapToDto( + if ( + primaryContact && + primaryContact.type.code === APPLICATION_OWNER.GOVERNMENT + ) { + //Copy contact details over to government form + await this.applicationSubmissionReviewService.update( + applicationSubmission.fileNumber, + { + firstName: primaryContact.firstName, + lastName: primaryContact.lastName, + email: primaryContact.email, + department: primaryContact.organizationName, + phoneNumber: primaryContact.phoneNumber, + }, + ); + } + + return this.applicationSubmissionReviewService.mapToDto( applicationReview, userLocalGovernment, ); @@ -258,7 +279,7 @@ export class ApplicationSubmissionReviewController { ); const applicationReview = - await this.applicationReviewService.getByFileNumber( + await this.applicationSubmissionReviewService.getByFileNumber( application.fileNumber, ); @@ -270,11 +291,12 @@ export class ApplicationSubmissionReviewController { applicationReview.applicationFileNumber, ); - const completedReview = this.applicationReviewService.verifyComplete( - applicationReview, - applicationDocuments, - userLocalGovernment.isFirstNation, - ); + const completedReview = + this.applicationSubmissionReviewService.verifyComplete( + applicationReview, + applicationDocuments, + userLocalGovernment.isFirstNation, + ); const validationResult = await this.applicationValidatorService.validateSubmission(application); @@ -326,7 +348,7 @@ export class ApplicationSubmissionReviewController { ); const applicationReview = - await this.applicationReviewService.getByFileNumber( + await this.applicationSubmissionReviewService.getByFileNumber( applicationSubmission.fileNumber, ); @@ -348,7 +370,7 @@ export class ApplicationSubmissionReviewController { await this.applicationDocumentService.delete(document); } - await this.applicationReviewService.delete(applicationReview); + await this.applicationSubmissionReviewService.delete(applicationReview); await this.applicationSubmissionStatusService.setStatusDate( applicationSubmission.uuid, diff --git a/services/apps/alcs/src/portal/application-submission-review/application-submission-review.service.spec.ts b/services/apps/alcs/src/portal/application-submission-review/application-submission-review.service.spec.ts index be98c241a1..62e0f2ce73 100644 --- a/services/apps/alcs/src/portal/application-submission-review/application-submission-review.service.spec.ts +++ b/services/apps/alcs/src/portal/application-submission-review/application-submission-review.service.spec.ts @@ -97,7 +97,7 @@ describe('ApplicationSubmissionReviewService', () => { mockRepository.findOneOrFail.mockResolvedValue(appReview); mockRepository.save.mockResolvedValue({} as any); - const res = await service.update('', mockLocalGovernment, {}); + const res = await service.update('', {}); expect(res).toBeDefined(); expect(mockRepository.save).toHaveBeenCalledTimes(1); @@ -112,7 +112,7 @@ describe('ApplicationSubmissionReviewService', () => { mockRepository.save.mockResolvedValue({} as any); mockAppService.getUuid.mockResolvedValue(''); - const res = await service.update('', mockLocalGovernment, { + const res = await service.update('', { isOCPDesignation: false, isSubjectToZoning: false, }); diff --git a/services/apps/alcs/src/portal/application-submission-review/application-submission-review.service.ts b/services/apps/alcs/src/portal/application-submission-review/application-submission-review.service.ts index da5a5c9d7a..e0753d92e1 100644 --- a/services/apps/alcs/src/portal/application-submission-review/application-submission-review.service.ts +++ b/services/apps/alcs/src/portal/application-submission-review/application-submission-review.service.ts @@ -41,9 +41,9 @@ export class ApplicationSubmissionReviewService { }); } - async startReview(application: ApplicationSubmission, createdBy: User) { + async startReview(submission: ApplicationSubmission, createdBy: User) { const applicationReview = new ApplicationSubmissionReview({ - applicationFileNumber: application.fileNumber, + applicationFileNumber: submission.fileNumber, createdBy, }); return await this.applicationSubmissionReviewRepository.save( @@ -53,7 +53,6 @@ export class ApplicationSubmissionReviewService { async update( fileNumber: string, - localGovernment: ApplicationLocalGovernment, updateDto: UpdateApplicationSubmissionReviewDto, ) { const applicationReview = await this.getByFileNumber(fileNumber); diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.service.ts b/services/apps/alcs/src/portal/application-submission/application-submission.service.ts index 8410a7ea9b..871274d24a 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.service.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.service.ts @@ -188,7 +188,7 @@ export class ApplicationSubmissionService { } async submitToLg(submission: ApplicationSubmission) { - this.updateStatus(submission, SUBMISSION_STATUS.SUBMITTED_TO_LG); + await this.updateStatus(submission, SUBMISSION_STATUS.SUBMITTED_TO_LG); } async updateStatus( From 35c540682bbb0c767fef9c9020963c188df47651 Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Fri, 21 Jul 2023 10:02:06 -0700 Subject: [PATCH 103/954] Feature/alcs 879 (#805) no data on decision v2 fields no conditions no components --- .../condition/condition.component.html | 8 ++-- .../conditions/conditions.component.html | 3 ++ .../conditions/conditions.component.scss | 5 +++ .../basic/basic.component.html | 2 + .../naru/naru.component.html | 3 ++ .../nfup/nfup.component.html | 3 ++ .../pfrs/pfrs.component.html | 11 +++++ .../pofo/pofo.component.html | 6 +++ .../roso/roso.component.html | 6 +++ .../turp/turp.component.html | 1 + .../decision-v2/decision-v2.component.html | 45 ++++++++++++++----- .../decision-v2/decision-v2.component.scss | 5 +++ .../app/shared/no-data/no-data.component.html | 2 +- .../app/shared/no-data/no-data.component.scss | 3 +- 14 files changed, 87 insertions(+), 16 deletions(-) diff --git a/alcs-frontend/src/app/features/application/decision/conditions/condition/condition.component.html b/alcs-frontend/src/app/features/application/decision/conditions/condition/condition.component.html index c211c1c758..a4b9466b4c 100644 --- a/alcs-frontend/src/app/features/application/decision/conditions/condition/condition.component.html +++ b/alcs-frontend/src/app/features/application/decision/conditions/condition/condition.component.html @@ -20,18 +20,19 @@

{{ condition.type.label }}

Approval Dependent
{{ condition.approvalDependant | booleanToString }} +
Security Amount
{{ condition.securityAmount }} - +
Admin Fee
{{ condition.administrativeFee }} - +
@@ -55,8 +56,7 @@

{{ condition.type.label }}

{{ condition.description }} - - +
Decision #{{ decision.index }}
+
+ +
Ag Cap Map
{{ component.agCapMap }} +
Ag Cap Consultant
{{ component.agCapConsultant }} +
diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/naru/naru.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/naru/naru.component.html index c5b1b488c0..32fd73fb85 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/naru/naru.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/naru/naru.component.html @@ -5,14 +5,17 @@
Residential Use Type
{{ component.naruSubtype?.label }} +
Expiry Date
{{ component.expiryDate | date }} +
Use End Date
{{ component.endDate | date }} +
diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/nfup/nfup.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/nfup/nfup.component.html index 17ca43885d..f1651e9ac5 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/nfup/nfup.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/nfup/nfup.component.html @@ -4,12 +4,15 @@
Non-Farm Use Type
{{ component.nfuType }} +
Non-Farm Use Sub-Type
{{ component.nfuSubType }} +
Use End Date
{{ component.endDate | date }} +
diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pfrs/pfrs.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pfrs/pfrs.component.html index 9ab242d759..076a4c03bf 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pfrs/pfrs.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pfrs/pfrs.component.html @@ -9,15 +9,18 @@
Use End Date
{{ component.endDate | date }} +
Type of soil approved to be removed.
{{ component.soilTypeRemoved }}
+
Type, origin and quality of fill proposed to be placed.
{{ component.soilFillTypeToPlace }}
+
@@ -30,7 +33,9 @@ + + + + + + + +
Volume {{ component.soilToRemoveVolume }} m3 {{ component.soilToPlaceVolume }} m3
@@ -38,17 +43,23 @@
Note: 0.01 ha is 100m2
 {{ component.soilToRemoveArea }} ha {{ component.soilToPlaceArea }} ha
Maximum Depth {{ component.soilToRemoveMaximumDepth }} m {{ component.soilToPlaceMaximumDepth }} m
Average Depth {{ component.soilToRemoveAverageDepth }} m {{ component.soilToPlaceAverageDepth }} m
diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pofo/pofo.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pofo/pofo.component.html index ebd7029307..9cda6ebd15 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pofo/pofo.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pofo/pofo.component.html @@ -9,11 +9,13 @@
Use End Date
{{ component.endDate | date }} +
Type, origin and quality of fill proposed to be placed.
{{ component.soilFillTypeToPlace }}
+
@@ -25,6 +27,7 @@ + + + +
Volume {{ component.soilToPlaceVolume }} m3
@@ -32,14 +35,17 @@
Note: 0.01 ha is 100m2
 {{ component.soilToPlaceArea }} ha
Maximum Depth {{ component.soilToPlaceMaximumDepth }} m
Average Depth {{ component.soilToPlaceAverageDepth }} m
diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/roso/roso.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/roso/roso.component.html index d23dc50c2b..14ae67a69d 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/roso/roso.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/roso/roso.component.html @@ -9,11 +9,13 @@
Use End Date
{{ component.endDate | date }} +
Type of soil approved to be removed.
{{ component.soilTypeRemoved }}
+
@@ -25,18 +27,22 @@ + + + +
Volume {{ component.soilToRemoveVolume }} m3
Area {{ component.soilToRemoveArea }} ha
Maximum Depth {{ component.soilToRemoveMaximumDepth }} m
Average Depth {{ component.soilToRemoveAverageDepth }} m
diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/turp/turp.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/turp/turp.component.html index d4a34841d6..d6fc3ab2e5 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/turp/turp.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/turp/turp.component.html @@ -9,5 +9,6 @@
Expiry Date
{{ component.expiryDate | date }} +
diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.html index e5f6fdde97..1e62004cb3 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.html @@ -98,10 +98,14 @@

Condition Compliance

Decision Date
{{ decision.date | momentFormat }} +
Decision Maker
- {{ decision.decisionMaker ? decision.decisionMaker.label : '(Unset)' }} + {{ decision.decisionMaker?.label }} +
@@ -123,7 +127,10 @@

Condition Compliance

Modification Outcome Reconsideration Outcome
- {{ decision.linkedResolutionOutcome ? decision.linkedResolutionOutcome.label : 'No Data' }} + {{ decision.linkedResolutionOutcome?.label }} + {{ decision.modifies?.linkedResolutions?.join(', ') }} {{ decision.reconsiders?.linkedResolutions?.join(', ') }}
@@ -131,13 +138,16 @@

Condition Compliance

Decision Description
- {{ decision.decisionDescription ? decision.decisionDescription : 'No Data' }} + {{ decision.decisionDescription }} +
Days To Hide From Public
- {{ decision.daysHideFromPublic ? decision.daysHideFromPublic : 'No Data' }} + {{ decision.daysHideFromPublic }}
Stats Required
@@ -149,13 +159,18 @@

Condition Compliance

Rescinded Date
{{ decision.rescindedDate | momentFormat }} - No Data +
Rescinded Comment
- {{ decision.rescindedComment ? decision.rescindedComment : 'No Data' }} + {{ decision.rescindedComment }} +
@@ -167,11 +182,17 @@

Condition Compliance

-
+
Decision Components and Conditions
- +
{{ component.applicationDecisionComponentType?.label }} Component @@ -188,10 +209,14 @@
Decision Components and Conditions
Agri Cap
{{ component.agCap }} +
Agri Cap Source
{{ component.agCapSource }} +
@@ -235,7 +260,7 @@
Decision Components and Conditions

Conditions

@@ -266,7 +291,7 @@

Conditions

Chair Review Outcome
{{ decision.chairReviewOutcome.label }} - No Data +
diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.scss b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.scss index 501bd5b8e1..3700bfe1df 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.scss +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.scss @@ -83,6 +83,11 @@ font-size: 16px; } + .components-wrapper, + .conditions-wrapper { + margin-bottom: 36px; + } + .subheading2 { margin-bottom: 6px !important; } diff --git a/alcs-frontend/src/app/shared/no-data/no-data.component.html b/alcs-frontend/src/app/shared/no-data/no-data.component.html index ad21442101..f9145f7327 100644 --- a/alcs-frontend/src/app/shared/no-data/no-data.component.html +++ b/alcs-frontend/src/app/shared/no-data/no-data.component.html @@ -1,5 +1,5 @@
-
No Data
+
{{ text ? text : 'No Data' }}
warning Required Field diff --git a/alcs-frontend/src/app/shared/no-data/no-data.component.scss b/alcs-frontend/src/app/shared/no-data/no-data.component.scss index 6f25dbaad2..f3f71b5650 100644 --- a/alcs-frontend/src/app/shared/no-data/no-data.component.scss +++ b/alcs-frontend/src/app/shared/no-data/no-data.component.scss @@ -1,7 +1,8 @@ @use '../../../styles/colors'; .text { - color: colors.$grey-dark; + color: colors.$grey; + font-weight: 400; } .error { From 3a7b491325a4ac373467f54aad1d3bd2470601d4 Mon Sep 17 00:00:00 2001 From: Liam Stoddard Date: Fri, 21 Jul 2023 13:06:42 -0700 Subject: [PATCH 104/954] revamped logic --- bin/migrate-files/migrate-files.py | 185 +++++++++++++++++++++++++---- 1 file changed, 164 insertions(+), 21 deletions(-) diff --git a/bin/migrate-files/migrate-files.py b/bin/migrate-files/migrate-files.py index 0ca8743905..f117a06971 100644 --- a/bin/migrate-files/migrate-files.py +++ b/bin/migrate-files/migrate-files.py @@ -39,40 +39,45 @@ with open('last-file.pickle', 'rb') as file: starting_document_id = pickle.load(file) -print('Starting from:', starting_document_id) +print('Starting applications from:', starting_document_id) + +starting_planning_document_id = 0 +# Determine job resume status +if os.path.isfile('last-planning-file.pickle'): + with open('last-planning-file.pickle', 'rb') as file: + starting_planning_document_id = pickle.load(file) + #ignore imported files before failure + starting_document_id = 999999 + +print('Starting planning_review from:', starting_planning_document_id) + +starting_issue_document_id = 0 +# Determine job resume status +if os.path.isfile('last-issue-file.pickle'): + with open('last-issue-file.pickle', 'rb') as file: + starting_issue_document_id = pickle.load(file) + #ignore imported files before failure + starting_document_id = 999999 + starting_planning_document_id = 999999 +print('Starting issues from:', starting_issue_document_id) # Get total number of files cursor = conn.cursor() try: - cursor.execute ('SELECT COUNT(*) FROM OATS.OATS_DOCUMENTS WHERE dbms_lob.getLength(DOCUMENT_BLOB) > 0') + cursor.execute ('SELECT COUNT(*) FROM OATS.OATS_DOCUMENTS WHERE dbms_lob.getLength(DOCUMENT_BLOB) > 0 AND ALR_APPLICATION_ID IS NOT NULL') except cx_Oracle.Error as e: error, = e.args print(error.message) -count = cursor.fetchone()[0] -print('Count =', count) - - -with open( - "noi_docs.sql", "r", encoding="utf-8" -) as sql_file: - create_noi_table = sql_file.read() - cursor.execute(create_noi_table) -conn.commit() - -with open( - "app_docs.sql", "r", encoding="utf-8" -) as sql_file: - create_app_table = sql_file.read() - cursor.execute(create_app_table) -conn.commit() +application_count = cursor.fetchone()[0] +print('Count =', application_count) # # Execute the SQL query to retrieve the BLOB data and key column cursor.execute(f""" SELECT DOCUMENT_ID, ALR_APPLICATION_ID, FILE_NAME, DOCUMENT_BLOB, DOCUMENT_CODE, DESCRIPTION, DOCUMENT_SOURCE_CODE, UPLOADED_DATE, WHEN_UPDATED, REVISION_COUNT, dbms_lob.getLength(DOCUMENT_BLOB) as LENGTH -FROM OATS.ALCS_ETL_APP_DOCS +FROM OATS.OATS_DOCUMENTS WHERE dbms_lob.getLength(DOCUMENT_BLOB) > 0 AND DOCUMENT_ID > {starting_document_id} ORDER BY DOCUMENT_ID ASC @@ -84,6 +89,7 @@ # Track progress documents_processed = 0 last_document_id = 0 +max_file = 0 try: with tqdm(total=count, unit="file", desc="Uploading files to S3") as pbar: @@ -102,6 +108,9 @@ pbar.update(1) last_document_id = document_id documents_processed += 1 + max_file += 1 + if max_file > 4: + break except Exception as e: print("Something went wrong:",e) print("Processed", documents_processed, "files") @@ -117,6 +126,140 @@ # Display results print("Process complete: Successfully migrated", documents_processed, "files.") +# Close the database cursor and connection +# cursor.close() +# conn.close() + +# cursor = conn.cursor() + +try: + cursor.execute ('SELECT COUNT(*) FROM OATS.OATS_DOCUMENTS WHERE dbms_lob.getLength(DOCUMENT_BLOB) > 0 AND PLANNING_REVIEW_ID IS NOT NULL') +except cx_Oracle.Error as e: + error, = e.args + print(error.message) + +planning_review_count = cursor.fetchone()[0] +print('Count =', planning_review_count) + +# # Execute the SQL query to retrieve the BLOB data and key column +cursor.execute(f""" +SELECT DOCUMENT_ID, PLANNING_REVIEW_ID, FILE_NAME, DOCUMENT_BLOB, DOCUMENT_CODE, DESCRIPTION, DOCUMENT_SOURCE_CODE, UPLOADED_DATE, WHEN_UPDATED, REVISION_COUNT, dbms_lob.getLength(DOCUMENT_BLOB) as LENGTH +FROM OATS.OATS_DOCUMENTS +WHERE dbms_lob.getLength(DOCUMENT_BLOB) > 0 +AND DOCUMENT_ID > {starting_planning_document_id} +ORDER BY DOCUMENT_ID ASC +""") + +# Set the batch size +BATCH_SIZE = 10 + +# Track progress +documents_processed = 0 +last_planning_document_id = 0 +max_file = 0 + +try: + with tqdm(total=planning_review_count, unit="file", desc="Uploading files to S3") as pbar: + while True: + # Fetch the next batch of BLOB data + data = cursor.fetchmany(BATCH_SIZE) + if not data: + break + # Upload the batch to S3 with a progress bar + for document_id, planning_review_id, filename, file, code, description, source, created, updated, revision, length in data: + tqdm.write(f"{planning_review_id}/{document_id}_{filename}") + + with tqdm(total=length, unit="B", unit_scale=True, desc=filename) as pbar2: + s3.upload_fileobj(file, ecs_bucket, f"migrate/planning_review/{planning_review_id}/{document_id}_{filename}", + Callback=lambda bytes_transferred: pbar2.update(bytes_transferred),) + pbar.update(1) + last_planning_document_id = document_id + documents_processed += 1 + max_file += 1 + if max_file > 4: + break +except Exception as e: + print("Something went wrong:",e) + print("Processed", documents_processed, "files") + + # Set resume status in case of interuption + with open('last-planning-file.pickle', 'wb') as file: + pickle.dump(last_planning_document_id, file) + + cursor.close() + conn.close() + exit() + +# Display results +print("Process complete: Successfully migrated", documents_processed, "files.") + +# Close the database cursor and connection +# cursor.close() +# conn.close() + +# cursor = conn.cursor() + +try: + cursor.execute ('SELECT COUNT(*) FROM OATS.OATS_DOCUMENTS WHERE dbms_lob.getLength(DOCUMENT_BLOB) > 0 AND ISSUE_ID IS NOT NULL') +except cx_Oracle.Error as e: + error, = e.args + print(error.message) + +issue_count = cursor.fetchone()[0] +print('Count =', issue_count) + +# # Execute the SQL query to retrieve the BLOB data and key column +cursor.execute(f""" +SELECT DOCUMENT_ID, ISSUE_ID, FILE_NAME, DOCUMENT_BLOB, DOCUMENT_CODE, DESCRIPTION, DOCUMENT_SOURCE_CODE, UPLOADED_DATE, WHEN_UPDATED, REVISION_COUNT, dbms_lob.getLength(DOCUMENT_BLOB) as LENGTH +FROM OATS.OATS_DOCUMENTS +WHERE dbms_lob.getLength(DOCUMENT_BLOB) > 0 +AND DOCUMENT_ID > {starting_issue_document_id} +ORDER BY DOCUMENT_ID ASC +""") + +# Set the batch size +BATCH_SIZE = 10 + +# Track progress +documents_processed = 0 +last_issue_document_id = 0 +max_file = 0 + +try: + with tqdm(total=issue_count, unit="file", desc="Uploading files to S3") as pbar: + while True: + # Fetch the next batch of BLOB data + data = cursor.fetchmany(BATCH_SIZE) + if not data: + break + # Upload the batch to S3 with a progress bar + for document_id, issue_id, filename, file, code, description, source, created, updated, revision, length in data: + tqdm.write(f"{issue_id}/{document_id}_{filename}") + + with tqdm(total=length, unit="B", unit_scale=True, desc=filename) as pbar2: + s3.upload_fileobj(file, ecs_bucket, f"migrate/issue/{issue_id}/{document_id}_{filename}", + Callback=lambda bytes_transferred: pbar2.update(bytes_transferred),) + pbar.update(1) + last_issue_document_id = document_id + documents_processed += 1 + max_file += 1 + if max_file > 4: + break +except Exception as e: + print("Something went wrong:",e) + print("Processed", documents_processed, "files") + + # Set resume status in case of interuption + with open('last-issue-file.pickle', 'wb') as file: + pickle.dump(last_issue_document_id, file) + + cursor.close() + conn.close() + exit() + +# Display results +print("Process complete: Successfully migrated", documents_processed, "files.") + # Close the database cursor and connection cursor.close() -conn.close() +conn.close() \ No newline at end of file From 53ac5f646b5e3f5023c0efc772fdcf40f712fce6 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Fri, 21 Jul 2023 13:16:24 -0700 Subject: [PATCH 105/954] Add Prescribed Body step to Create & Change Dialogs * Add new step to both create and change application dialogs * Hardcode government options * Send to frontend whether use isFirstNation or isLocalGovernment --- .../create-application-dialog.component.html | 149 ++++++++++-------- .../create-application-dialog.component.ts | 21 ++- ...nge-application-type-dialog.component.html | 13 +- ...hange-application-type-dialog.component.ts | 24 ++- .../application-submission.dto.ts | 3 + .../application-submission.service.ts | 3 +- .../authentication/authentication.dto.ts | 2 + .../presribed-body.component.html | 23 +++ .../presribed-body.component.scss | 8 + .../presribed-body.component.spec.ts | 36 +++++ .../presribed-body.component.ts | 77 +++++++++ .../src/app/shared/shared.module.ts | 32 ++-- portal-frontend/src/styles/typography.scss | 1 + .../alcs/src/user/user.controller.spec.ts | 2 + .../apps/alcs/src/user/user.controller.ts | 3 + services/apps/alcs/src/user/user.dto.ts | 2 + services/apps/alcs/src/user/user.service.ts | 1 + 17 files changed, 317 insertions(+), 83 deletions(-) create mode 100644 portal-frontend/src/app/shared/presribed-body/presribed-body.component.html create mode 100644 portal-frontend/src/app/shared/presribed-body/presribed-body.component.scss create mode 100644 portal-frontend/src/app/shared/presribed-body/presribed-body.component.spec.ts create mode 100644 portal-frontend/src/app/shared/presribed-body/presribed-body.component.ts diff --git a/portal-frontend/src/app/features/create-application-dialog/create-application-dialog.component.html b/portal-frontend/src/app/features/create-application-dialog/create-application-dialog.component.html index c48fb7c1e3..8b840722d3 100644 --- a/portal-frontend/src/app/features/create-application-dialog/create-application-dialog.component.html +++ b/portal-frontend/src/app/features/create-application-dialog/create-application-dialog.component.html @@ -1,81 +1,94 @@
-

Create New

+

Create New

+

+ The governmental or prescribed public body that is applying to exclude land: +

-
- Select an option to learn more about the {{ currentStepIndex === 0 ? 'submission type' : 'application type' }}. -
-
- - - {{ subType.label }} - - -
-
- - - {{ appType.portalLabel }} - - -
- -
-
- {{ - selectedSubmissionType?.label - }} - -
+ +
+ Select an option to learn more about the {{ currentStepIndex === 0 ? 'submission type' : 'application type' }}. +
+
+ + + {{ subType.label }} + +
-
- {{ selectedAppType?.portalLabel }} + + + {{ appType.portalLabel }} + +
+
- Read {{ readMoreClicked ? 'Less' : 'More' }} -
+
+ {{ + selectedSubmissionType?.label + }} + +
+
+
+ {{ selectedAppType?.portalLabel }} +
+
+ Read {{ readMoreClicked ? 'Less' : 'More' }} +
+ + + +
-
+
@@ -88,7 +101,19 @@

Create New

(click)="onSubmit()" [disabled]="!selectedAppType || !selectedSubmissionType" > - create + next + create + +
+
+ +
diff --git a/portal-frontend/src/app/features/create-application-dialog/create-application-dialog.component.ts b/portal-frontend/src/app/features/create-application-dialog/create-application-dialog.component.ts index 3ce1bf8725..6a59ee5472 100644 --- a/portal-frontend/src/app/features/create-application-dialog/create-application-dialog.component.ts +++ b/portal-frontend/src/app/features/create-application-dialog/create-application-dialog.component.ts @@ -10,6 +10,7 @@ import { scrollToElement } from '../../shared/utils/scroll-helper'; export enum ApplicationCreateDialogStepsEnum { submissionType = 0, applicationType = 1, + prescribedBody = 2, } @Component({ @@ -21,6 +22,7 @@ export enum ApplicationCreateDialogStepsEnum { export class CreateApplicationDialogComponent implements OnInit, AfterViewChecked { submissionStep = ApplicationCreateDialogStepsEnum.submissionType; applicationStep = ApplicationCreateDialogStepsEnum.applicationType; + prescribedBodyStep = ApplicationCreateDialogStepsEnum.prescribedBody; applicationTypes: ApplicationTypeDto[] = []; selectedAppType: ApplicationTypeDto | undefined = undefined; @@ -31,6 +33,7 @@ export class CreateApplicationDialogComponent implements OnInit, AfterViewChecke readMoreClicked: boolean = false; isReadMoreVisible: boolean = false; currentStepIndex: number = 0; + prescribedBody: string | undefined; constructor( private dialogRef: MatDialogRef, @@ -61,7 +64,19 @@ export class CreateApplicationDialogComponent implements OnInit, AfterViewChecke } async onSubmit() { - const res = await this.applicationService.create(this.selectedAppType!.code); + if (this.selectedAppType! && ['INCL', 'EXCL'].includes(this.selectedAppType!.code)) { + this.currentStepIndex++; + } else { + await this.createApplication(); + } + } + + async onSubmitInlcExcl() { + await this.createApplication(); + } + + private async createApplication() { + const res = await this.applicationService.create(this.selectedAppType!.code, this.prescribedBody); if (res) { await this.router.navigateByUrl(`/application/${res.fileId}/edit`); this.dialogRef.close(true); @@ -111,4 +126,8 @@ export class CreateApplicationDialogComponent implements OnInit, AfterViewChecke return true; } } + + onSelectPrescribedBody(name: string) { + this.prescribedBody = name; + } } diff --git a/portal-frontend/src/app/features/edit-submission/change-application-type-dialog/change-application-type-dialog.component.html b/portal-frontend/src/app/features/edit-submission/change-application-type-dialog/change-application-type-dialog.component.html index 1aa97808ef..001d0a0494 100644 --- a/portal-frontend/src/app/features/edit-submission/change-application-type-dialog/change-application-type-dialog.component.html +++ b/portal-frontend/src/app/features/edit-submission/change-application-type-dialog/change-application-type-dialog.component.html @@ -53,12 +53,16 @@

Change Application Type

Are you sure you want to change your application type?
+ + + +
- +
@@ -78,4 +82,11 @@
Are you sure you want to change your application type?
+ +
+ + +
diff --git a/portal-frontend/src/app/features/edit-submission/change-application-type-dialog/change-application-type-dialog.component.ts b/portal-frontend/src/app/features/edit-submission/change-application-type-dialog/change-application-type-dialog.component.ts index 8e8916ce50..a39aeae077 100644 --- a/portal-frontend/src/app/features/edit-submission/change-application-type-dialog/change-application-type-dialog.component.ts +++ b/portal-frontend/src/app/features/edit-submission/change-application-type-dialog/change-application-type-dialog.component.ts @@ -9,7 +9,8 @@ import { scrollToElement } from '../../../shared/utils/scroll-helper'; export enum ApplicationChangeTypeStepsEnum { warning = 0, applicationType = 1, - confirmation = 2, + prescribedBody = 2, + confirmation = 3, } @Component({ @@ -30,8 +31,10 @@ export class ChangeApplicationTypeDialogComponent implements OnInit, AfterViewCh warningStep = ApplicationChangeTypeStepsEnum.warning; applicationTypeStep = ApplicationChangeTypeStepsEnum.applicationType; confirmationStep = ApplicationChangeTypeStepsEnum.confirmation; + prescribedBodyStep = ApplicationChangeTypeStepsEnum.prescribedBody; stepIdx = 0; + prescribedBody: string | undefined; constructor( private dialogRef: MatDialogRef, @@ -59,16 +62,17 @@ export class ChangeApplicationTypeDialogComponent implements OnInit, AfterViewCh .sort((a, b) => (a.portalLabel > b.portalLabel ? 1 : -1)); } - async onCancel(dialogResult: boolean = false) { + async closeDialog(dialogResult: boolean = false) { this.dialogRef.close(dialogResult); } async onSubmit() { const result = await this.applicationSubmissionService.updatePending(this.submissionUuid, { typeCode: this.selectedAppType!.code, + prescribedBody: this.prescribedBody, }); if (result) { - this.onCancel(true); + await this.closeDialog(true); } } @@ -101,10 +105,22 @@ export class ChangeApplicationTypeDialogComponent implements OnInit, AfterViewCh } async next() { - this.stepIdx += 1; + if (this.stepIdx === ApplicationChangeTypeStepsEnum.applicationType) { + if (this.selectedAppType && ['INCL', 'EXCL'].includes(this.selectedAppType.code)) { + this.stepIdx = ApplicationChangeTypeStepsEnum.prescribedBody; + } else { + this.stepIdx = ApplicationChangeTypeStepsEnum.confirmation; + } + } else { + this.stepIdx += 1; + } } async back() { this.stepIdx -= 1; } + + onSelectPrescribedBody(name: string) { + this.prescribedBody = name; + } } diff --git a/portal-frontend/src/app/services/application-submission/application-submission.dto.ts b/portal-frontend/src/app/services/application-submission/application-submission.dto.ts index c852ad723e..39f4700d61 100644 --- a/portal-frontend/src/app/services/application-submission/application-submission.dto.ts +++ b/portal-frontend/src/app/services/application-submission/application-submission.dto.ts @@ -243,4 +243,7 @@ export interface ApplicationSubmissionUpdateDto { naruToPlaceAverageDepth?: number | null; naruSleepingUnits?: number | null; naruAgriTourism?: string | null; + + //Inclusion / Exclusion Fields + prescribedBody?: string | null; } diff --git a/portal-frontend/src/app/services/application-submission/application-submission.service.ts b/portal-frontend/src/app/services/application-submission/application-submission.service.ts index 1f31776d7f..0a48f3faa2 100644 --- a/portal-frontend/src/app/services/application-submission/application-submission.service.ts +++ b/portal-frontend/src/app/services/application-submission/application-submission.service.ts @@ -54,12 +54,13 @@ export class ApplicationSubmissionService { } } - async create(type: string) { + async create(type: string, prescribedBody?: string) { try { this.overlayService.showSpinner(); return await firstValueFrom( this.httpClient.post<{ fileId: string }>(`${this.serviceUrl}`, { type, + prescribedBody, }) ); } catch (e) { diff --git a/portal-frontend/src/app/services/authentication/authentication.dto.ts b/portal-frontend/src/app/services/authentication/authentication.dto.ts index c62bc621f6..0ca335f035 100644 --- a/portal-frontend/src/app/services/authentication/authentication.dto.ts +++ b/portal-frontend/src/app/services/authentication/authentication.dto.ts @@ -7,4 +7,6 @@ export interface UserDto { bceidUserName?: string | null; prettyName?: string | null; government?: string; + isLocalGovernment: boolean; + isFirstNationGovernment: boolean; } diff --git a/portal-frontend/src/app/shared/presribed-body/presribed-body.component.html b/portal-frontend/src/app/shared/presribed-body/presribed-body.component.html new file mode 100644 index 0000000000..6ca6072e75 --- /dev/null +++ b/portal-frontend/src/app/shared/presribed-body/presribed-body.component.html @@ -0,0 +1,23 @@ +

Individual landowners may not submit exclusion applications to the ALC.

+
+ + {{ body.label }} + +
+ + This option is selected because your BCeID is associated with a local government. + + + This option is selected because your BCeID is associated with a first nation government. + + + In order to proceed, you must either use a BCeID that is associated with a {{ selectedValue }} or change your + selection above. + diff --git a/portal-frontend/src/app/shared/presribed-body/presribed-body.component.scss b/portal-frontend/src/app/shared/presribed-body/presribed-body.component.scss new file mode 100644 index 0000000000..fcb5d63cc2 --- /dev/null +++ b/portal-frontend/src/app/shared/presribed-body/presribed-body.component.scss @@ -0,0 +1,8 @@ +@use '../../../styles/functions' as *; + +.radio-group { + display: flex; + flex-direction: column; + margin: rem(8) 0; + align-items: flex-start; +} diff --git a/portal-frontend/src/app/shared/presribed-body/presribed-body.component.spec.ts b/portal-frontend/src/app/shared/presribed-body/presribed-body.component.spec.ts new file mode 100644 index 0000000000..3c301dfc04 --- /dev/null +++ b/portal-frontend/src/app/shared/presribed-body/presribed-body.component.spec.ts @@ -0,0 +1,36 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { BehaviorSubject } from 'rxjs'; +import { UserDto } from '../../services/authentication/authentication.dto'; +import { AuthenticationService } from '../../services/authentication/authentication.service'; + +import { PresribedBodyComponent } from './presribed-body.component'; + +describe('PresribedBodyComponent', () => { + let component: PresribedBodyComponent; + let fixture: ComponentFixture; + let mockAuthService: DeepMocked; + + beforeEach(async () => { + mockAuthService = createMock(); + mockAuthService.$currentProfile = new BehaviorSubject(undefined); + + await TestBed.configureTestingModule({ + declarations: [PresribedBodyComponent], + providers: [ + { + provide: AuthenticationService, + useValue: mockAuthService, + }, + ], + }).compileComponents(); + + fixture = TestBed.createComponent(PresribedBodyComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/shared/presribed-body/presribed-body.component.ts b/portal-frontend/src/app/shared/presribed-body/presribed-body.component.ts new file mode 100644 index 0000000000..0fd431de42 --- /dev/null +++ b/portal-frontend/src/app/shared/presribed-body/presribed-body.component.ts @@ -0,0 +1,77 @@ +import { Component, EventEmitter, OnInit, Output } from '@angular/core'; +import { AuthenticationService } from '../../services/authentication/authentication.service'; + +const FIRST_NATION = 'First Nation Government'; +const LOCAL = 'Local Government'; + +@Component({ + selector: 'app-presribed-body', + templateUrl: './presribed-body.component.html', + styleUrls: ['./presribed-body.component.scss'], +}) +export class PresribedBodyComponent implements OnInit { + @Output() select = new EventEmitter(); + + PRESCRIBED_BODIES = [ + 'Regional Health Board (as per s.4(1) Health Authorities Act)', + 'Educational Body (as per the Freedom of Information and Protection of Privacy Act)', + 'An Improvement District (as per the Local Government Act)', + 'The BC Transportation Financing Authority', + 'The BC Housing Management Commission', + 'The BC Hydro and Power Authority', + 'The South Coast BC Transportation Authority', + 'The BC Transit Corporation', + 'The Columbia Power Corporation', + 'The Province of BC', + FIRST_NATION, + LOCAL, + ]; + prescribedBodies: { label: string; enabled: boolean; selected: boolean }[] = []; + isLocalGovernmentUser = false; + isFirstNationUser = false; + showGovernmentWarning = false; + selectedValue: string | undefined; + + constructor(private authenticationService: AuthenticationService) {} + + ngOnInit(): void { + this.prescribedBodies = this.PRESCRIBED_BODIES.map((body) => ({ + label: body, + enabled: true, + selected: false, + })); + + this.authenticationService.$currentProfile.subscribe((profile) => { + if (profile && profile.government) { + this.isLocalGovernmentUser = profile.isLocalGovernment; + this.isFirstNationUser = profile.isFirstNationGovernment; + + if (this.isLocalGovernmentUser) { + this.onSelect(LOCAL); + } else { + this.onSelect(FIRST_NATION); + } + + this.prescribedBodies = this.PRESCRIBED_BODIES.map((body) => ({ + label: body, + enabled: body === this.selectedValue, + selected: body === this.selectedValue, + })); + } + }); + } + + onSelect(chosenValue: string) { + this.selectedValue = chosenValue; + if ( + (chosenValue === LOCAL && !this.isLocalGovernmentUser) || + (chosenValue === FIRST_NATION && !this.isFirstNationUser) + ) { + this.showGovernmentWarning = true; + this.select.emit(undefined); + } else { + this.showGovernmentWarning = false; + this.select.emit(this.selectedValue); + } + } +} diff --git a/portal-frontend/src/app/shared/shared.module.ts b/portal-frontend/src/app/shared/shared.module.ts index 1a229de1cf..3d55310071 100644 --- a/portal-frontend/src/app/shared/shared.module.ts +++ b/portal-frontend/src/app/shared/shared.module.ts @@ -35,6 +35,7 @@ import { EmailValidPipe } from './pipes/emailValid.pipe'; import { FileSizePipe } from './pipes/fileSize.pipe'; import { MomentPipe } from './pipes/moment.pipe'; import { PhoneValidPipe } from './pipes/phoneValid.pipe'; +import { PresribedBodyComponent } from './presribed-body/presribed-body.component'; import { UpdatedBannerComponent } from './updated-banner/updated-banner.component'; import { DATE_FORMATS } from './utils/date-format'; import { ValidationErrorComponent } from './validation-error/validation-error.component'; @@ -57,6 +58,22 @@ import { WarningBannerComponent } from './warning-banner/warning-banner.componen CdkStepperModule, NgxMaskDirective, NgxMaskPipe, + MatRadioModule, + ], + declarations: [ + FileDragDropComponent, + FileSizePipe, + EmailValidPipe, + PhoneValidPipe, + DragDropDirective, + WarningBannerComponent, + InfoBannerComponent, + NoDataComponent, + UpdatedBannerComponent, + ValidationErrorComponent, + CustomStepperComponent, + MomentPipe, + PresribedBodyComponent, ], exports: [ CommonModule, @@ -98,20 +115,7 @@ import { WarningBannerComponent } from './warning-banner/warning-banner.componen NgxMaskDirective, NgxMaskPipe, MomentPipe, - ], - declarations: [ - FileDragDropComponent, - FileSizePipe, - EmailValidPipe, - PhoneValidPipe, - DragDropDirective, - WarningBannerComponent, - InfoBannerComponent, - NoDataComponent, - UpdatedBannerComponent, - ValidationErrorComponent, - CustomStepperComponent, - MomentPipe, + PresribedBodyComponent, ], }) export class SharedModule { diff --git a/portal-frontend/src/styles/typography.scss b/portal-frontend/src/styles/typography.scss index 914bac6533..8e965ee917 100644 --- a/portal-frontend/src/styles/typography.scss +++ b/portal-frontend/src/styles/typography.scss @@ -33,6 +33,7 @@ h3 { h4 { @include typography-style(rem(18), 700); + line-height: 1.5rem !important; } h5 { diff --git a/services/apps/alcs/src/user/user.controller.spec.ts b/services/apps/alcs/src/user/user.controller.spec.ts index f4390447e1..25e4bffa35 100644 --- a/services/apps/alcs/src/user/user.controller.spec.ts +++ b/services/apps/alcs/src/user/user.controller.spec.ts @@ -78,6 +78,8 @@ describe('UserController', () => { settings: { favoriteBoards: ['cats'], }, + isFirstNationGovernment: false, + isLocalGovernment: false, }; controller = module.get(UserController); diff --git a/services/apps/alcs/src/user/user.controller.ts b/services/apps/alcs/src/user/user.controller.ts index f7cf70c275..b82a71d37e 100644 --- a/services/apps/alcs/src/user/user.controller.ts +++ b/services/apps/alcs/src/user/user.controller.ts @@ -37,6 +37,9 @@ export class UserController { const mappedUser = await this.userMapper.mapAsync(user, User, UserDto); const government = await this.userService.getUserLocalGovernment(user); mappedUser.government = government ? government.name : undefined; + mappedUser.isLocalGovernment = !!government && !government.isFirstNation; + mappedUser.isFirstNationGovernment = + !!government && government.isFirstNation; return mappedUser; } diff --git a/services/apps/alcs/src/user/user.dto.ts b/services/apps/alcs/src/user/user.dto.ts index 4b768f00d7..b14b6b22d0 100644 --- a/services/apps/alcs/src/user/user.dto.ts +++ b/services/apps/alcs/src/user/user.dto.ts @@ -40,6 +40,8 @@ export class UserDto extends UpdateUserDto { prettyName?: string | null; government?: string; + isLocalGovernment: boolean; + isFirstNationGovernment: boolean; } export class CreateUserDto { diff --git a/services/apps/alcs/src/user/user.service.ts b/services/apps/alcs/src/user/user.service.ts index d5a9e99450..be498d7f86 100644 --- a/services/apps/alcs/src/user/user.service.ts +++ b/services/apps/alcs/src/user/user.service.ts @@ -97,6 +97,7 @@ export class UserService { where: { bceidBusinessGuid: user.bceidBusinessGuid }, select: { name: true, + isFirstNation: true, }, }); } From 44087d6d8347f810f1275f56a827f9452b1769dd Mon Sep 17 00:00:00 2001 From: "to. sandra" <76515860+sandratoh@users.noreply.github.com> Date: Fri, 21 Jul 2023 13:54:42 -0700 Subject: [PATCH 106/954] Fix portal LFNG review tab and update banner (#806) * Add icon to portal lfng banner matching alcs * Show LFNG review or banner for apps submitted to ALC * Remove @extend as per MR feedback --- .../lfng-info/lfng-info.component.scss | 7 +++-- .../lfng-review/lfng-review.component.html | 18 ++++++++----- .../lfng-review/lfng-review.component.scss | 26 +++++++++++++++++++ .../lfng-review/lfng-review.component.ts | 8 +++--- .../application-submission.dto.ts | 8 ++++++ 5 files changed, 56 insertions(+), 11 deletions(-) diff --git a/alcs-frontend/src/app/features/application/lfng-info/lfng-info.component.scss b/alcs-frontend/src/app/features/application/lfng-info/lfng-info.component.scss index 3e371bf572..dfcc95d763 100644 --- a/alcs-frontend/src/app/features/application/lfng-info/lfng-info.component.scss +++ b/alcs-frontend/src/app/features/application/lfng-info/lfng-info.component.scss @@ -21,9 +21,12 @@ h4 { } .comment-container { - @extend .warning; - flex-direction: column; align-items: flex-start; + background-color: colors.$secondary-color-light; + border-radius: 4px; + display: flex; + flex-direction: column; + padding: 16px; div { margin-bottom: 4px; diff --git a/portal-frontend/src/app/features/view-submission/lfng-review/lfng-review.component.html b/portal-frontend/src/app/features/view-submission/lfng-review/lfng-review.component.html index e32262058f..5afec266c1 100644 --- a/portal-frontend/src/app/features/view-submission/lfng-review/lfng-review.component.html +++ b/portal-frontend/src/app/features/view-submission/lfng-review/lfng-review.component.html @@ -35,10 +35,10 @@

Local/First Nation Gov Review

- This section will update after the application is submitted. + infoThis section will update after the application is submitted.
-
- Application not subject to Local/First Nation Government review. +
+ infoApplication not subject to Local/First Nation Government review.
- Pending Local/First Nation Government review. + infoPending Local/First Nation Government review.
Comment for Applicant
{{ application.returnedComment }} @@ -259,7 +259,13 @@

Attachments

-
+
Resolution Document
{{ diff --git a/portal-frontend/src/app/features/view-submission/lfng-review/lfng-review.component.scss b/portal-frontend/src/app/features/view-submission/lfng-review/lfng-review.component.scss index b94d3abdeb..9d4b7c0db9 100644 --- a/portal-frontend/src/app/features/view-submission/lfng-review/lfng-review.component.scss +++ b/portal-frontend/src/app/features/view-submission/lfng-review/lfng-review.component.scss @@ -2,9 +2,35 @@ @use '../../../../styles/colors'; .warning { + align-items: center; background-color: rgba(colors.$accent-color-light, 0.5); + border-radius: rem(4); + display: flex; padding: rem(16); margin-bottom: rem(24); + + mat-icon { + margin-right: 12px; + } +} + +.comment-container { + align-items: flex-start; + background-color: rgba(colors.$accent-color-light, 0.5); + border-radius: rem(4); + display: flex; + flex-direction: column; + margin-bottom: rem(24); + padding: rem(16); + + div { + margin-bottom: rem(4); + } +} + +.no-comment { + color: colors.$grey-dark; + font-style: italic; } .link { diff --git a/portal-frontend/src/app/features/view-submission/lfng-review/lfng-review.component.ts b/portal-frontend/src/app/features/view-submission/lfng-review/lfng-review.component.ts index 26df0a2c84..8305093ae2 100644 --- a/portal-frontend/src/app/features/view-submission/lfng-review/lfng-review.component.ts +++ b/portal-frontend/src/app/features/view-submission/lfng-review/lfng-review.component.ts @@ -35,6 +35,7 @@ export class LfngReviewComponent implements OnInit, OnDestroy { resolutionDocument: ApplicationDocumentDto[] = []; governmentOtherAttachments: ApplicationDocumentDto[] = []; hasCompletedStepsBeforeDocuments = false; + submittedToAlcStatus = false; constructor( private applicationReviewService: ApplicationSubmissionReviewService, @@ -61,6 +62,9 @@ export class LfngReviewComponent implements OnInit, OnDestroy { this.$application.pipe(takeUntil(this.$destroy)).subscribe((application) => { this.application = application; + this.submittedToAlcStatus = !!this.application?.submissionStatuses.find( + (s) => s.statusTypeCode === SUBMISSION_STATUS.SUBMITTED_TO_ALC && !!s.effectiveDate + ); this.loadReview(); }); @@ -85,9 +89,7 @@ export class LfngReviewComponent implements OnInit, OnDestroy { if ( this.application && this.application.typeCode !== 'TURP' && - ([SUBMISSION_STATUS.SUBMITTED_TO_ALC, SUBMISSION_STATUS.REFUSED_TO_FORWARD_LG].includes( - this.application.status.code - ) || + (this.submittedToAlcStatus || (this.application.status.code === SUBMISSION_STATUS.IN_REVIEW_BY_LG && this.application.canReview)) ) { await this.applicationReviewService.getByFileId(this.application.fileNumber); diff --git a/portal-frontend/src/app/services/application-submission/application-submission.dto.ts b/portal-frontend/src/app/services/application-submission/application-submission.dto.ts index c852ad723e..1ce7a5e57e 100644 --- a/portal-frontend/src/app/services/application-submission/application-submission.dto.ts +++ b/portal-frontend/src/app/services/application-submission/application-submission.dto.ts @@ -22,6 +22,13 @@ export interface ApplicationStatusDto extends BaseCodeDto { portalColor: string; } +export interface ApplicationSubmissionToSubmissionStatusDto { + submissionUuid: string; + effectiveDate: number | null; + statusTypeCode: string; + status: ApplicationStatusDto; +} + export interface NaruSubtypeDto extends BaseCodeDto {} export interface ProposedLot { @@ -46,6 +53,7 @@ export interface ApplicationSubmissionDto { owners: ApplicationOwnerDetailedDto[]; hasOtherParcelsInCommunity?: boolean | null; returnedComment?: string; + submissionStatuses: ApplicationSubmissionToSubmissionStatusDto[]; } export interface ApplicationSubmissionDetailedDto extends ApplicationSubmissionDto { From 0a98416e4de84dc0c0d2498096a228ec1f9a2bdd Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Fri, 21 Jul 2023 14:41:39 -0700 Subject: [PATCH 107/954] Combine Purpose Fields * Add incl/excl fields --- .../application-details.component.spec.ts | 6 +- .../naru-details/naru-details.component.html | 2 +- .../nfu-details/nfu-details.component.html | 2 +- .../pfrs-details/pfrs-details.component.html | 2 +- .../pofo-details/pofo-details.component.html | 2 +- .../roso-details/roso-details.component.html | 2 +- .../subd-details/subd-details.component.html | 2 +- .../tur-details/tur-details.component.html | 2 +- .../application-submission.service.spec.ts | 6 +- .../services/application/application.dto.ts | 6 +- .../naru-details/naru-details.component.html | 6 +- .../nfu-details/nfu-details.component.html | 6 +- .../pfrs-details/pfrs-details.component.html | 6 +- .../pofo-details/pofo-details.component.html | 6 +- .../roso-details/roso-details.component.html | 6 +- .../subd-details/subd-details.component.html | 6 +- .../tur-details/tur-details.component.html | 6 +- .../naru-proposal/naru-proposal.component.ts | 4 +- .../nfu-proposal/nfu-proposal.component.ts | 6 +- .../pfrs-proposal/pfrs-proposal.component.ts | 6 +- .../pofo-proposal/pofo-proposal.component.ts | 6 +- .../roso-proposal/roso-proposal.component.ts | 6 +- .../subd-proposal/subd-proposal.component.ts | 6 +- .../tur-proposal/tur-proposal.component.ts | 6 +- .../application-submission.dto.ts | 12 +-- ...ation-submission-validator.service.spec.ts | 23 +++-- ...pplication-submission-validator.service.ts | 10 +-- .../application-submission.dto.ts | 47 ++-------- .../application-submission.entity.ts | 48 +++++++---- .../application-submission.service.ts | 14 +-- .../generate-submission-document.service.ts | 4 +- ...55105-add_inclexcl_fields_to_submission.ts | 85 +++++++++++++++++++ 32 files changed, 197 insertions(+), 160 deletions(-) create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1689973655105-add_inclexcl_fields_to_submission.ts diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.spec.ts b/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.spec.ts index a72111b842..4607f83461 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.spec.ts +++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.spec.ts @@ -29,6 +29,7 @@ describe('ApplicationDetailsComponent', () => { component = fixture.componentInstance; component.submission = { applicant: '', + purpose: '', canEdit: false, canReview: false, canView: false, @@ -55,7 +56,6 @@ describe('ApplicationDetailsComponent', () => { naruLocationRationale: null, naruProjectDurationAmount: null, naruProjectDurationUnit: null, - naruPurpose: null, naruResidenceNecessity: null, naruSubtype: null, naruToPlaceArea: null, @@ -74,7 +74,6 @@ describe('ApplicationDetailsComponent', () => { nfuOutsideLands: null, nfuProjectDurationAmount: null, nfuProjectDurationUnit: null, - nfuPurpose: null, nfuTotalFillPlacement: null, nfuWillImportFill: null, soilAlreadyPlacedArea: null, @@ -91,7 +90,6 @@ describe('ApplicationDetailsComponent', () => { soilNOIIDs: null, soilProjectDurationAmount: null, soilProjectDurationUnit: null, - soilPurpose: null, soilReduceNegativeImpacts: null, soilToPlaceAverageDepth: null, soilToPlaceMaximumDepth: null, @@ -100,11 +98,9 @@ describe('ApplicationDetailsComponent', () => { soilTypeRemoved: null, subdAgricultureSupport: null, subdIsHomeSiteSeverance: null, - subdPurpose: null, subdSuitability: null, turAgriculturalActivities: null, turOutsideLands: null, - turPurpose: null, turReduceNegativeImpacts: null, turTotalCorridorArea: null, primaryContact: { diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/naru-details/naru-details.component.html b/alcs-frontend/src/app/features/application/applicant-info/application-details/naru-details/naru-details.component.html index b7979c06cf..e3ab6ad57b 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/application-details/naru-details/naru-details.component.html +++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/naru-details/naru-details.component.html @@ -5,7 +5,7 @@
What is the purpose of the proposal?
- {{ _applicationSubmission.naruPurpose }} + {{ _applicationSubmission.purpose }}
diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/nfu-details/nfu-details.component.html b/alcs-frontend/src/app/features/application/applicant-info/application-details/nfu-details/nfu-details.component.html index 734caeec4a..ac66739155 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/application-details/nfu-details/nfu-details.component.html +++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/nfu-details/nfu-details.component.html @@ -5,7 +5,7 @@
What is the purpose of the proposal?
- {{ applicationSubmission.nfuPurpose }} + {{ applicationSubmission.purpose }}
Could this proposal be accommodated on lands outside of the ALR? Please justify why the proposal cannot be carried diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/pfrs-details/pfrs-details.component.html b/alcs-frontend/src/app/features/application/applicant-info/application-details/pfrs-details/pfrs-details.component.html index 82060ed931..882787ab3d 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/application-details/pfrs-details/pfrs-details.component.html +++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/pfrs-details/pfrs-details.component.html @@ -19,7 +19,7 @@
What is the purpose of the proposal?
- {{ _applicationSubmission.soilPurpose }} + {{ _applicationSubmission.purpose }}
diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/pofo-details/pofo-details.component.html b/alcs-frontend/src/app/features/application/applicant-info/application-details/pofo-details/pofo-details.component.html index 05507c46ef..4cb7818358 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/application-details/pofo-details/pofo-details.component.html +++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/pofo-details/pofo-details.component.html @@ -19,7 +19,7 @@
What is the purpose of the proposal?
- {{ _applicationSubmission.soilPurpose }} + {{ _applicationSubmission.purpose }}
Fill to be Placed
diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/roso-details/roso-details.component.html b/alcs-frontend/src/app/features/application/applicant-info/application-details/roso-details/roso-details.component.html index e353058262..4a9638f911 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/application-details/roso-details/roso-details.component.html +++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/roso-details/roso-details.component.html @@ -19,7 +19,7 @@
What is the purpose of the proposal?
- {{ _applicationSubmission.soilPurpose }} + {{ _applicationSubmission.purpose }}
Soil to be Removed
diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/subd-details/subd-details.component.html b/alcs-frontend/src/app/features/application/applicant-info/application-details/subd-details/subd-details.component.html index f472075d88..c5a0d3c446 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/application-details/subd-details/subd-details.component.html +++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/subd-details/subd-details.component.html @@ -18,7 +18,7 @@
What is the purpose of the proposal?
- {{ _applicationSubmission.subdPurpose }} + {{ _applicationSubmission.purpose }}
Why do you believe this parcel is suitable for subdivision?
diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/tur-details/tur-details.component.html b/alcs-frontend/src/app/features/application/applicant-info/application-details/tur-details/tur-details.component.html index 787d8f97b0..f71a0bd172 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/application-details/tur-details/tur-details.component.html +++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/tur-details/tur-details.component.html @@ -1,7 +1,7 @@
What is the purpose of the proposal?
- {{ _application.turPurpose }} + {{ _application.purpose }}
Specify any agricultural activities such as livestock operations, greenhouses or horticultural activities in diff --git a/alcs-frontend/src/app/services/application/application-submission/application-submission.service.spec.ts b/alcs-frontend/src/app/services/application/application-submission/application-submission.service.spec.ts index 7de907cfb9..61863069f0 100644 --- a/alcs-frontend/src/app/services/application/application-submission/application-submission.service.spec.ts +++ b/alcs-frontend/src/app/services/application/application-submission/application-submission.service.spec.ts @@ -40,7 +40,6 @@ describe('ApplicationSubmissionService', () => { naruLocationRationale: null, naruProjectDurationAmount: null, naruProjectDurationUnit: null, - naruPurpose: null, naruResidenceNecessity: null, naruSubtype: null, naruToPlaceArea: null, @@ -74,7 +73,7 @@ describe('ApplicationSubmissionService', () => { nfuOutsideLands: null, nfuProjectDurationAmount: null, nfuProjectDurationUnit: null, - nfuPurpose: null, + purpose: '', nfuTotalFillPlacement: null, nfuWillImportFill: null, soilAlreadyPlacedArea: null, @@ -90,7 +89,6 @@ describe('ApplicationSubmissionService', () => { soilNOIIDs: null, soilProjectDurationAmount: null, soilProjectDurationUnit: null, - soilPurpose: null, soilReduceNegativeImpacts: null, soilToPlaceAverageDepth: null, soilToPlaceMaximumDepth: null, @@ -99,11 +97,9 @@ describe('ApplicationSubmissionService', () => { soilTypeRemoved: null, subdAgricultureSupport: null, subdIsHomeSiteSeverance: null, - subdPurpose: null, subdSuitability: null, turAgriculturalActivities: null, turOutsideLands: null, - turPurpose: null, turReduceNegativeImpacts: null, turTotalCorridorArea: null, submissionStatuses: [], diff --git a/alcs-frontend/src/app/services/application/application.dto.ts b/alcs-frontend/src/app/services/application/application.dto.ts index 85dafca899..7775c4c030 100644 --- a/alcs-frontend/src/app/services/application/application.dto.ts +++ b/alcs-frontend/src/app/services/application/application.dto.ts @@ -105,6 +105,7 @@ export interface ApplicationSubmissionDto { fileNumber: string; lastStatusUpdate: number; applicant: string; + purpose: string | null; type: string; status: ApplicationStatus; typeCode: string; @@ -134,7 +135,6 @@ export interface ApplicationSubmissionDto { //NFU Specific Fields nfuHectares: number | null; - nfuPurpose: string | null; nfuOutsideLands: string | null; nfuAgricultureSupport: string | null; nfuWillImportFill: boolean | null; @@ -147,7 +147,6 @@ export interface ApplicationSubmissionDto { nfuFillOriginDescription: string | null; //TUR Fields - turPurpose: string | null; turAgriculturalActivities: string | null; turReduceNegativeImpacts: string | null; turOutsideLands: string | null; @@ -155,7 +154,6 @@ export interface ApplicationSubmissionDto { turAllOwnersNotified?: boolean | null; //Subdivision Fields - subdPurpose: string | null; subdSuitability: string | null; subdAgricultureSupport: string | null; subdIsHomeSiteSeverance: boolean | null; @@ -166,7 +164,6 @@ export interface ApplicationSubmissionDto { soilNOIIDs: string | null; soilHasPreviousALCAuthorization: boolean | null; soilApplicationIDs: string | null; - soilPurpose: string | null; soilTypeRemoved: string | null; soilReduceNegativeImpacts: string | null; soilToRemoveVolume: number | null; @@ -194,7 +191,6 @@ export interface ApplicationSubmissionDto { //NARU Fields naruSubtype: BaseCodeDto | null; - naruPurpose: string | null; naruFloorArea: number | null; naruResidenceNecessity: string | null; naruLocationRationale: string | null; diff --git a/portal-frontend/src/app/features/application-details/naru-details/naru-details.component.html b/portal-frontend/src/app/features/application-details/naru-details/naru-details.component.html index addd2ceb07..92acfe1eec 100644 --- a/portal-frontend/src/app/features/application-details/naru-details/naru-details.component.html +++ b/portal-frontend/src/app/features/application-details/naru-details/naru-details.component.html @@ -12,11 +12,11 @@
What is the purpose of the proposal? - +
- {{ _applicationSubmission.naruPurpose }} - + {{ _applicationSubmission.purpose }} +
diff --git a/portal-frontend/src/app/features/application-details/nfu-details/nfu-details.component.html b/portal-frontend/src/app/features/application-details/nfu-details/nfu-details.component.html index e03a7f7493..5af77d22fa 100644 --- a/portal-frontend/src/app/features/application-details/nfu-details/nfu-details.component.html +++ b/portal-frontend/src/app/features/application-details/nfu-details/nfu-details.component.html @@ -8,12 +8,12 @@
What is the purpose of the proposal? - +
- {{ applicationSubmission.nfuPurpose }} + {{ applicationSubmission.purpose }} - +
Could this proposal be accommodated on lands outside of the ALR? Please justify why the proposal cannot be carried diff --git a/portal-frontend/src/app/features/application-details/pfrs-details/pfrs-details.component.html b/portal-frontend/src/app/features/application-details/pfrs-details/pfrs-details.component.html index b4b82a1100..a36bbf8c87 100644 --- a/portal-frontend/src/app/features/application-details/pfrs-details/pfrs-details.component.html +++ b/portal-frontend/src/app/features/application-details/pfrs-details/pfrs-details.component.html @@ -44,11 +44,11 @@
What is the purpose of the proposal? - +
- {{ _applicationSubmission.soilPurpose }} - + {{ _applicationSubmission.purpose }} +
diff --git a/portal-frontend/src/app/features/application-details/pofo-details/pofo-details.component.html b/portal-frontend/src/app/features/application-details/pofo-details/pofo-details.component.html index bbd093de01..21b534141a 100644 --- a/portal-frontend/src/app/features/application-details/pofo-details/pofo-details.component.html +++ b/portal-frontend/src/app/features/application-details/pofo-details/pofo-details.component.html @@ -44,11 +44,11 @@
What is the purpose of the proposal? - +
- {{ _applicationSubmission.soilPurpose }} - + {{ _applicationSubmission.purpose }} +
diff --git a/portal-frontend/src/app/features/application-details/roso-details/roso-details.component.html b/portal-frontend/src/app/features/application-details/roso-details/roso-details.component.html index ac1f26938f..792234b5c2 100644 --- a/portal-frontend/src/app/features/application-details/roso-details/roso-details.component.html +++ b/portal-frontend/src/app/features/application-details/roso-details/roso-details.component.html @@ -44,11 +44,11 @@
What is the purpose of the proposal? - +
- {{ _applicationSubmission.soilPurpose }} - + {{ _applicationSubmission.purpose }} +
diff --git a/portal-frontend/src/app/features/application-details/subd-details/subd-details.component.html b/portal-frontend/src/app/features/application-details/subd-details/subd-details.component.html index b147b001f4..b3ee95d67a 100644 --- a/portal-frontend/src/app/features/application-details/subd-details/subd-details.component.html +++ b/portal-frontend/src/app/features/application-details/subd-details/subd-details.component.html @@ -30,11 +30,11 @@
What is the purpose of the proposal? - +
- {{ _applicationSubmission.subdPurpose }} - + {{ _applicationSubmission.purpose }} +
Why do you believe this parcel is suitable for subdivision? diff --git a/portal-frontend/src/app/features/application-details/tur-details/tur-details.component.html b/portal-frontend/src/app/features/application-details/tur-details/tur-details.component.html index ca804d4077..c3a2d98db8 100644 --- a/portal-frontend/src/app/features/application-details/tur-details/tur-details.component.html +++ b/portal-frontend/src/app/features/application-details/tur-details/tur-details.component.html @@ -1,11 +1,11 @@
What is the purpose of the proposal? - +
- {{ _applicationSubmission.turPurpose }} - + {{ _applicationSubmission.purpose }} +
Specify any agricultural activities such as livestock operations, greenhouses or horticultural activities in diff --git a/portal-frontend/src/app/features/edit-submission/proposal/naru-proposal/naru-proposal.component.ts b/portal-frontend/src/app/features/edit-submission/proposal/naru-proposal/naru-proposal.component.ts index 7fcb9cf724..74642f793d 100644 --- a/portal-frontend/src/app/features/edit-submission/proposal/naru-proposal/naru-proposal.component.ts +++ b/portal-frontend/src/app/features/edit-submission/proposal/naru-proposal/naru-proposal.component.ts @@ -98,7 +98,7 @@ export class NaruProposalComponent extends FilesStepComponent implements OnInit, ? applicationSubmission.naruProjectDurationAmount.toString() : null, projectDurationUnit: applicationSubmission.naruProjectDurationUnit, - purpose: applicationSubmission.naruPurpose, + purpose: applicationSubmission.purpose, residenceNecessity: applicationSubmission.naruResidenceNecessity, agriTourism: applicationSubmission.naruAgriTourism, sleepingUnits: applicationSubmission.naruSleepingUnits @@ -206,7 +206,7 @@ export class NaruProposalComponent extends FilesStepComponent implements OnInit, naruLocationRationale: locationRationale, naruProjectDurationAmount: projectDurationAmount ? parseFloat(projectDurationAmount) : null, naruProjectDurationUnit: projectDurationUnit, - naruPurpose: purpose, + purpose: purpose, naruResidenceNecessity: residenceNecessity, naruSubtypeCode: subtype, naruSleepingUnits: sleepingUnits ? parseFloat(sleepingUnits) : null, diff --git a/portal-frontend/src/app/features/edit-submission/proposal/nfu-proposal/nfu-proposal.component.ts b/portal-frontend/src/app/features/edit-submission/proposal/nfu-proposal/nfu-proposal.component.ts index da80e5605e..4cd97a36c1 100644 --- a/portal-frontend/src/app/features/edit-submission/proposal/nfu-proposal/nfu-proposal.component.ts +++ b/portal-frontend/src/app/features/edit-submission/proposal/nfu-proposal/nfu-proposal.component.ts @@ -61,7 +61,7 @@ export class NfuProposalComponent extends StepComponent implements OnInit, OnDes this.form.patchValue({ hectares: applicationSubmission.nfuHectares?.toString(), - purpose: applicationSubmission.nfuPurpose, + purpose: applicationSubmission.purpose, outsideLands: applicationSubmission.nfuOutsideLands, agricultureSupport: applicationSubmission.nfuAgricultureSupport, totalFillPlacement: applicationSubmission.nfuTotalFillPlacement?.toString(), @@ -92,7 +92,7 @@ export class NfuProposalComponent extends StepComponent implements OnInit, OnDes private async save() { if (this.fileId) { const nfuHectares = this.hectares.getRawValue(); - const nfuPurpose = this.purpose.getRawValue(); + const purpose = this.purpose.getRawValue(); const nfuOutsideLands = this.outsideLands.getRawValue(); const nfuAgricultureSupport = this.agricultureSupport.getRawValue(); const nfuWillImportFill = this.willImportFill.getRawValue(); @@ -106,7 +106,7 @@ export class NfuProposalComponent extends StepComponent implements OnInit, OnDes const updateDto: ApplicationSubmissionUpdateDto = { nfuHectares: nfuHectares ? parseFloat(nfuHectares) : null, - nfuPurpose, + purpose, nfuOutsideLands, nfuAgricultureSupport, nfuWillImportFill: parseStringToBoolean(nfuWillImportFill), diff --git a/portal-frontend/src/app/features/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.ts b/portal-frontend/src/app/features/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.ts index b8627b09f2..042cafd6b4 100644 --- a/portal-frontend/src/app/features/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.ts +++ b/portal-frontend/src/app/features/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.ts @@ -157,7 +157,7 @@ export class PfrsProposalComponent extends FilesStepComponent implements OnInit, hasALCAuthorization: hasALCAuthorization, NOIIDs: applicationSubmission.soilNOIIDs, applicationIDs: applicationSubmission.soilApplicationIDs, - purpose: applicationSubmission.soilPurpose, + purpose: applicationSubmission.purpose, soilTypeRemoved: applicationSubmission.soilTypeRemoved, reduceNegativeImpacts: applicationSubmission.soilReduceNegativeImpacts, alternativeMeasures: applicationSubmission.soilAlternativeMeasures, @@ -191,14 +191,14 @@ export class PfrsProposalComponent extends FilesStepComponent implements OnInit, const soilNOIIDs = this.NOIIDs.getRawValue(); const hasALCAuthorization = this.hasALCAuthorization.getRawValue(); const soilApplicationIDs = this.applicationIDs.getRawValue(); - const soilPurpose = this.purpose.getRawValue(); + const purpose = this.purpose.getRawValue(); const soilTypeRemoved = this.soilTypeRemoved.getRawValue(); const soilReduceNegativeImpacts = this.reduceNegativeImpacts.getRawValue(); const soilFillTypeToPlace = this.fillTypeToPlace.getRawValue(); const soilAlternativeMeasures = this.alternativeMeasures.getRawValue(); const updateDto: ApplicationSubmissionUpdateDto = { - soilPurpose, + purpose, soilTypeRemoved, soilFillTypeToPlace, soilReduceNegativeImpacts, diff --git a/portal-frontend/src/app/features/edit-submission/proposal/pofo-proposal/pofo-proposal.component.ts b/portal-frontend/src/app/features/edit-submission/proposal/pofo-proposal/pofo-proposal.component.ts index 41824b14c9..5536e09cec 100644 --- a/portal-frontend/src/app/features/edit-submission/proposal/pofo-proposal/pofo-proposal.component.ts +++ b/portal-frontend/src/app/features/edit-submission/proposal/pofo-proposal/pofo-proposal.component.ts @@ -106,7 +106,7 @@ export class PofoProposalComponent extends FilesStepComponent implements OnInit, hasALCAuthorization: hasALCAuthorization, NOIIDs: applicationSubmission.soilNOIIDs, applicationIDs: applicationSubmission.soilApplicationIDs, - purpose: applicationSubmission.soilPurpose, + purpose: applicationSubmission.purpose, fillTypeToPlace: applicationSubmission.soilFillTypeToPlace, alternativeMeasures: applicationSubmission.soilAlternativeMeasures, reduceNegativeImpacts: applicationSubmission.soilReduceNegativeImpacts, @@ -136,13 +136,13 @@ export class PofoProposalComponent extends FilesStepComponent implements OnInit, const soilNOIIDs = this.NOIIDs.getRawValue(); const hasALCAuthorization = this.hasALCAuthorization.getRawValue(); const soilApplicationIDs = this.applicationIDs.getRawValue(); - const soilPurpose = this.purpose.getRawValue(); + const purpose = this.purpose.getRawValue(); const soilFillTypeToPlace = this.fillTypeToPlace.getRawValue(); const soilAlternativeMeasures = this.alternativeMeasures.getRawValue(); const soilReduceNegativeImpacts = this.reduceNegativeImpacts.getRawValue(); const updateDto: ApplicationSubmissionUpdateDto = { - soilPurpose, + purpose, soilFillTypeToPlace, soilAlternativeMeasures, soilReduceNegativeImpacts, diff --git a/portal-frontend/src/app/features/edit-submission/proposal/roso-proposal/roso-proposal.component.ts b/portal-frontend/src/app/features/edit-submission/proposal/roso-proposal/roso-proposal.component.ts index 72ad4ee6a0..216e12b954 100644 --- a/portal-frontend/src/app/features/edit-submission/proposal/roso-proposal/roso-proposal.component.ts +++ b/portal-frontend/src/app/features/edit-submission/proposal/roso-proposal/roso-proposal.component.ts @@ -105,7 +105,7 @@ export class RosoProposalComponent extends FilesStepComponent implements OnInit, hasALCAuthorization: hasALCAuthorization, NOIIDs: applicationSubmission.soilNOIIDs, applicationIDs: applicationSubmission.soilApplicationIDs, - purpose: applicationSubmission.soilPurpose, + purpose: applicationSubmission.purpose, soilTypeRemoved: applicationSubmission.soilTypeRemoved, reduceNegativeImpacts: applicationSubmission.soilReduceNegativeImpacts, projectDurationAmount: applicationSubmission.soilProjectDurationAmount?.toString() ?? null, @@ -134,12 +134,12 @@ export class RosoProposalComponent extends FilesStepComponent implements OnInit, const soilNOIIDs = this.NOIIDs.getRawValue(); const hasALCAuthorization = this.hasALCAuthorization.getRawValue(); const soilApplicationIDs = this.applicationIDs.getRawValue(); - const soilPurpose = this.purpose.getRawValue(); + const purpose = this.purpose.getRawValue(); const soilTypeRemoved = this.soilTypeRemoved.getRawValue(); const soilReduceNegativeImpacts = this.reduceNegativeImpacts.getRawValue(); const updateDto: ApplicationSubmissionUpdateDto = { - soilPurpose, + purpose, soilTypeRemoved, soilReduceNegativeImpacts, soilIsNOIFollowUp: parseStringToBoolean(isNOIFollowUp), diff --git a/portal-frontend/src/app/features/edit-submission/proposal/subd-proposal/subd-proposal.component.ts b/portal-frontend/src/app/features/edit-submission/proposal/subd-proposal/subd-proposal.component.ts index 9d02217609..6e73edff80 100644 --- a/portal-frontend/src/app/features/edit-submission/proposal/subd-proposal/subd-proposal.component.ts +++ b/portal-frontend/src/app/features/edit-submission/proposal/subd-proposal/subd-proposal.component.ts @@ -72,7 +72,7 @@ export class SubdProposalComponent extends FilesStepComponent implements OnInit, } this.form.patchValue({ - purpose: applicationSubmission.subdPurpose, + purpose: applicationSubmission.purpose, suitability: applicationSubmission.subdSuitability, agriculturalSupport: applicationSubmission.subdAgricultureSupport, lotsProposed: applicationSubmission.subdProposedLots.length.toString(10), @@ -105,13 +105,13 @@ export class SubdProposalComponent extends FilesStepComponent implements OnInit, protected async save() { if (this.fileId) { - const subdPurpose = this.purpose.getRawValue(); + const purpose = this.purpose.getRawValue(); const subdSuitability = this.suitability.getRawValue(); const subdAgricultureSupport = this.agriculturalSupport.getRawValue(); const subdIsHomeSiteSeverance = this.isHomeSiteSeverance.getRawValue(); const updateDto: ApplicationSubmissionUpdateDto = { - subdPurpose, + purpose, subdSuitability, subdAgricultureSupport, subdIsHomeSiteSeverance: subdIsHomeSiteSeverance !== null ? subdIsHomeSiteSeverance === 'true' : null, diff --git a/portal-frontend/src/app/features/edit-submission/proposal/tur-proposal/tur-proposal.component.ts b/portal-frontend/src/app/features/edit-submission/proposal/tur-proposal/tur-proposal.component.ts index b67e523f9e..30b4b08fa0 100644 --- a/portal-frontend/src/app/features/edit-submission/proposal/tur-proposal/tur-proposal.component.ts +++ b/portal-frontend/src/app/features/edit-submission/proposal/tur-proposal/tur-proposal.component.ts @@ -59,7 +59,7 @@ export class TurProposalComponent extends FilesStepComponent implements OnInit, this.submissionUuid = applicationSubmission.uuid; this.form.patchValue({ - purpose: applicationSubmission.turPurpose, + purpose: applicationSubmission.purpose, outsideLands: applicationSubmission.turOutsideLands, agriculturalActivities: applicationSubmission.turAgriculturalActivities, reduceNegativeImpacts: applicationSubmission.turReduceNegativeImpacts, @@ -85,7 +85,7 @@ export class TurProposalComponent extends FilesStepComponent implements OnInit, protected async save() { if (this.fileId) { - const turPurpose = this.purpose.getRawValue(); + const purpose = this.purpose.getRawValue(); const turOutsideLands = this.outsideLands.getRawValue(); const turAgriculturalActivities = this.agriculturalActivities.getRawValue(); const turReduceNegativeImpacts = this.reduceNegativeImpacts.getRawValue(); @@ -93,7 +93,7 @@ export class TurProposalComponent extends FilesStepComponent implements OnInit, const turAllOwnersNotified = this.allOwnersNotified.getRawValue(); const updateDto: ApplicationSubmissionUpdateDto = { - turPurpose, + purpose, turOutsideLands, turAgriculturalActivities, turReduceNegativeImpacts, diff --git a/portal-frontend/src/app/services/application-submission/application-submission.dto.ts b/portal-frontend/src/app/services/application-submission/application-submission.dto.ts index 39f4700d61..513e8b1965 100644 --- a/portal-frontend/src/app/services/application-submission/application-submission.dto.ts +++ b/portal-frontend/src/app/services/application-submission/application-submission.dto.ts @@ -36,6 +36,7 @@ export interface ApplicationSubmissionDto { updatedAt: string; lastStatusUpdate: number; applicant: string; + purpose: string | null; type: string; typeCode: string; localGovernmentUuid: string; @@ -65,7 +66,6 @@ export interface ApplicationSubmissionDetailedDto extends ApplicationSubmissionD //NFU Specific Fields nfuHectares: number | null; - nfuPurpose: string | null; nfuOutsideLands: string | null; nfuAgricultureSupport: string | null; nfuWillImportFill: boolean | null; @@ -78,7 +78,6 @@ export interface ApplicationSubmissionDetailedDto extends ApplicationSubmissionD nfuFillOriginDescription: string | null; //TUR Fields - turPurpose: string | null; turAgriculturalActivities: string | null; turReduceNegativeImpacts: string | null; turOutsideLands: string | null; @@ -86,7 +85,6 @@ export interface ApplicationSubmissionDetailedDto extends ApplicationSubmissionD turAllOwnersNotified?: boolean | null; //Subdivision Fields - subdPurpose: string | null; subdSuitability: string | null; subdAgricultureSupport: string | null; subdIsHomeSiteSeverance: boolean | null; @@ -97,7 +95,6 @@ export interface ApplicationSubmissionDetailedDto extends ApplicationSubmissionD soilNOIIDs: string | null; soilHasPreviousALCAuthorization: boolean | null; soilApplicationIDs: string | null; - soilPurpose: string | null; soilTypeRemoved: string | null; soilReduceNegativeImpacts: string | null; soilToRemoveVolume: number | null; @@ -125,7 +122,6 @@ export interface ApplicationSubmissionDetailedDto extends ApplicationSubmissionD //NARU Fields naruSubtype: NaruSubtypeDto | null; - naruPurpose: string | null; naruFloorArea: number | null; naruResidenceNecessity: string | null; naruLocationRationale: string | null; @@ -146,6 +142,7 @@ export interface ApplicationSubmissionDetailedDto extends ApplicationSubmissionD export interface ApplicationSubmissionUpdateDto { applicant?: string; + purpose?: string | null; localGovernmentUuid?: string; typeCode?: string; primaryContactOwnerUuid?: string; @@ -166,7 +163,6 @@ export interface ApplicationSubmissionUpdateDto { //NFU Specific Fields nfuHectares?: number | null; - nfuPurpose?: string | null; nfuOutsideLands?: string | null; nfuAgricultureSupport?: string | null; nfuWillImportFill?: boolean | null; @@ -179,7 +175,6 @@ export interface ApplicationSubmissionUpdateDto { nfuFillOriginDescription?: string | null; //TUR Fields - turPurpose?: string | null; turAgriculturalActivities?: string | null; turReduceNegativeImpacts?: string | null; turOutsideLands?: string | null; @@ -187,7 +182,6 @@ export interface ApplicationSubmissionUpdateDto { turAllOwnersNotified?: boolean | null; //Subdivision Fields - subdPurpose?: string | null; subdSuitability?: string | null; subdAgricultureSupport?: string | null; subdIsHomeSiteSeverance?: boolean | null; @@ -198,7 +192,6 @@ export interface ApplicationSubmissionUpdateDto { soilNOIIDs?: string | null; soilHasPreviousALCAuthorization?: boolean | null; soilApplicationIDs?: string | null; - soilPurpose?: string | null; soilTypeRemoved?: string | null; soilReduceNegativeImpacts?: string | null; soilToRemoveVolume?: number | null; @@ -226,7 +219,6 @@ export interface ApplicationSubmissionUpdateDto { //NARU Fields naruSubtypeCode?: string | null; - naruPurpose?: string | null; naruFloorArea?: number | null; naruResidenceNecessity?: string | null; naruLocationRationale?: string | null; diff --git a/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.spec.ts b/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.spec.ts index d9937bf19c..d8ed4a4351 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.spec.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.spec.ts @@ -78,6 +78,16 @@ describe('ApplicationSubmissionValidatorService', () => { ); }); + it('should return an error for missing purpose', async () => { + const applicationSubmission = new ApplicationSubmission({ + owners: [], + }); + + const res = await service.validateSubmission(applicationSubmission); + + expect(includesError(res.errors, new Error('Missing purpose'))).toBe(true); + }); + it('should return an error for no parcels', async () => { const applicationSubmission = new ApplicationSubmission({ owners: [], @@ -531,7 +541,7 @@ describe('ApplicationSubmissionValidatorService', () => { const application = new ApplicationSubmission({ owners: [], nfuHectares: 1.5125, - nfuPurpose: 'VALID', + purpose: 'VALID', nfuOutsideLands: 'VALID', nfuAgricultureSupport: 'VALID', nfuWillImportFill: true, @@ -559,7 +569,7 @@ describe('ApplicationSubmissionValidatorService', () => { const application = new ApplicationSubmission({ owners: [], nfuHectares: 1.5125, - nfuPurpose: 'VALID', + purpose: 'VALID', nfuOutsideLands: 'VALID', nfuAgricultureSupport: 'VALID', nfuWillImportFill: false, @@ -580,7 +590,6 @@ describe('ApplicationSubmissionValidatorService', () => { const application = new ApplicationSubmission({ owners: [], nfuHectares: null, - nfuPurpose: 'VALID', nfuOutsideLands: 'VALID', nfuAgricultureSupport: 'VALID', nfuWillImportFill: true, @@ -627,7 +636,6 @@ describe('ApplicationSubmissionValidatorService', () => { it('should not have an error when base information is filled correctly', async () => { const application = new ApplicationSubmission({ owners: [], - soilPurpose: 'soilPurpose', soilReduceNegativeImpacts: 'soilReduceNegativeImpacts', soilHasPreviousALCAuthorization: false, soilIsNOIFollowUp: false, @@ -653,7 +661,6 @@ describe('ApplicationSubmissionValidatorService', () => { it('should report errors when information is missing', async () => { const application = new ApplicationSubmission({ owners: [], - soilPurpose: 'soilPurpose', soilReduceNegativeImpacts: null, soilToRemoveVolume: null, typeCode: 'ROSO', @@ -729,7 +736,6 @@ describe('ApplicationSubmissionValidatorService', () => { it('should not have errors when base information is filled correctly', async () => { const application = new ApplicationSubmission({ owners: [], - soilPurpose: 'soilPurpose', soilReduceNegativeImpacts: 'soilReduceNegativeImpacts', soilHasPreviousALCAuthorization: false, soilIsNOIFollowUp: false, @@ -760,7 +766,6 @@ describe('ApplicationSubmissionValidatorService', () => { it('should report errors when information is missing', async () => { const application = new ApplicationSubmission({ owners: [], - soilPurpose: 'soilPurpose', soilFillTypeToPlace: null, soilReduceNegativeImpacts: 'soilReduceNegativeImpacts', soilToPlaceArea: null, @@ -837,7 +842,7 @@ describe('ApplicationSubmissionValidatorService', () => { it('should not have errors when base information is filled correctly', async () => { const application = new ApplicationSubmission({ owners: [], - soilPurpose: 'soilPurpose', + purpose: 'purpose', soilReduceNegativeImpacts: 'soilReduceNegativeImpacts', soilHasPreviousALCAuthorization: false, soilIsNOIFollowUp: false, @@ -868,7 +873,7 @@ describe('ApplicationSubmissionValidatorService', () => { it('should report errors when information is missing', async () => { const application = new ApplicationSubmission({ owners: [], - soilPurpose: 'soilPurpose', + purpose: 'purpose', soilFillTypeToPlace: null, soilReduceNegativeImpacts: 'soilReduceNegativeImpacts', soilToPlaceArea: null, diff --git a/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.ts b/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.ts index 4f9305f0e3..b902f52f8d 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.ts @@ -49,6 +49,10 @@ export class ApplicationSubmissionValidatorService { errors.push(new ServiceValidationException('Missing applicant')); } + if (!applicationSubmission.purpose) { + errors.push(new ServiceValidationException('Missing purpose')); + } + const validatedParcels = await this.validateParcels( applicationSubmission, errors, @@ -381,7 +385,6 @@ export class ApplicationSubmissionValidatorService { ) { if ( !applicationSubmission.nfuHectares || - !applicationSubmission.nfuPurpose || !applicationSubmission.nfuOutsideLands || !applicationSubmission.nfuAgricultureSupport || applicationSubmission.nfuWillImportFill === null @@ -411,7 +414,6 @@ export class ApplicationSubmissionValidatorService { errors: Error[], ) { if ( - !applicationSubmission.turPurpose || !applicationSubmission.turOutsideLands || !applicationSubmission.turAgriculturalActivities || !applicationSubmission.turReduceNegativeImpacts || @@ -433,7 +435,6 @@ export class ApplicationSubmissionValidatorService { ); } if ( - !applicationSubmission.subdPurpose || !applicationSubmission.subdSuitability || !applicationSubmission.subdAgricultureSupport ) { @@ -470,7 +471,6 @@ export class ApplicationSubmissionValidatorService { errors: Error[], ) { if ( - applicationSubmission.soilPurpose === null || applicationSubmission.soilTypeRemoved === null || applicationSubmission.soilReduceNegativeImpacts === null ) { @@ -511,7 +511,6 @@ export class ApplicationSubmissionValidatorService { errors: Error[], ) { if ( - applicationSubmission.soilPurpose === null || applicationSubmission.soilFillTypeToPlace === null || applicationSubmission.soilAlternativeMeasures === null || applicationSubmission.soilReduceNegativeImpacts === null @@ -560,7 +559,6 @@ export class ApplicationSubmissionValidatorService { if ( applicationSubmission.soilIsNOIFollowUp === null || applicationSubmission.soilHasPreviousALCAuthorization === null || - !applicationSubmission.soilPurpose || applicationSubmission.soilReduceNegativeImpacts === null ) { errors.push( diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.dto.ts b/services/apps/alcs/src/portal/application-submission/application-submission.dto.ts index 5789d698dc..6883fb6f1e 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.dto.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.dto.ts @@ -61,6 +61,8 @@ export class ApplicationSubmissionDto { } export class ApplicationSubmissionDetailedDto extends ApplicationSubmissionDto { + @AutoMap(() => String) + purpose: string | null; @AutoMap() parcelsAgricultureDescription: string; @AutoMap() @@ -90,9 +92,6 @@ export class ApplicationSubmissionDetailedDto extends ApplicationSubmissionDto { @AutoMap(() => Number) nfuHectares?: number | null; - @AutoMap(() => String) - nfuPurpose?: string | null; - @AutoMap(() => String) nfuOutsideLands?: string | null; @@ -124,9 +123,6 @@ export class ApplicationSubmissionDetailedDto extends ApplicationSubmissionDto { nfuFillOriginDescription?: string | null; //TUR Fields - @AutoMap(() => String) - turPurpose?: string | null; - @AutoMap(() => String) turAgriculturalActivities?: string | null; @@ -143,9 +139,6 @@ export class ApplicationSubmissionDetailedDto extends ApplicationSubmissionDto { turAllOwnersNotified?: boolean | null; //Subdivision Fields - @AutoMap(() => String) - subdPurpose?: string | null; - @AutoMap(() => String) subdSuitability?: string | null; @@ -170,9 +163,6 @@ export class ApplicationSubmissionDetailedDto extends ApplicationSubmissionDto { @AutoMap(() => String) soilApplicationIDs: string | null; - @AutoMap(() => String) - soilPurpose: string | null; - @AutoMap(() => String) soilTypeRemoved: string | null; @@ -249,9 +239,6 @@ export class ApplicationSubmissionDetailedDto extends ApplicationSubmissionDto { @AutoMap(() => [NaruSubtypeDto]) naruSubtype: NaruSubtypeDto | null; - @AutoMap(() => String) - naruPurpose: string | null; - @AutoMap(() => Number) naruFloorArea: number | null; @@ -315,6 +302,11 @@ export class ApplicationSubmissionUpdateDto { @IsOptional() applicant?: string; + @IsString() + @IsOptional() + @MaxLength(MAX_DESCRIPTION_FIELD_LENGTH) + purpose?: string; + @IsUUID() @IsOptional() localGovernmentUuid?: string; @@ -383,11 +375,6 @@ export class ApplicationSubmissionUpdateDto { @IsOptional() nfuHectares?: number | null; - @IsString() - @MaxLength(MAX_DESCRIPTION_FIELD_LENGTH) - @IsOptional() - nfuPurpose?: string | null; - @IsString() @MaxLength(MAX_DESCRIPTION_FIELD_LENGTH) @IsOptional() @@ -432,12 +419,6 @@ export class ApplicationSubmissionUpdateDto { @IsOptional() nfuFillOriginDescription?: string | null; - //TUR Fields - @IsString() - @MaxLength(MAX_DESCRIPTION_FIELD_LENGTH) - @IsOptional() - turPurpose?: string | null; - @IsString() @MaxLength(MAX_DESCRIPTION_FIELD_LENGTH) @IsOptional() @@ -462,11 +443,6 @@ export class ApplicationSubmissionUpdateDto { turAllOwnersNotified?: boolean | null; //Subdivision Fields - @IsString() - @MaxLength(MAX_DESCRIPTION_FIELD_LENGTH) - @IsOptional() - subdPurpose?: string | null; - @IsString() @MaxLength(MAX_DESCRIPTION_FIELD_LENGTH) @IsOptional() @@ -504,11 +480,6 @@ export class ApplicationSubmissionUpdateDto { @IsOptional() soilApplicationIDs?: string | null; - @IsString() - @MaxLength(MAX_DESCRIPTION_FIELD_LENGTH) - @IsOptional() - soilPurpose?: string | null; - @IsString() @MaxLength(MAX_DESCRIPTION_FIELD_LENGTH) @IsOptional() @@ -612,10 +583,6 @@ export class ApplicationSubmissionUpdateDto { @IsOptional() naruSubtypeCode?: string | null; - @IsString() - @IsOptional() - naruPurpose?: string | null; - @IsNumber() @IsOptional() naruFloorArea?: number | null; diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts b/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts index 670bb36d17..5893038f79 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts @@ -214,7 +214,7 @@ export class ApplicationSubmission extends Base { @AutoMap(() => String) @Column({ type: 'text', nullable: true }) - nfuPurpose: string | null; + purpose: string | null; @AutoMap(() => String) @Column({ type: 'text', nullable: true }) @@ -281,10 +281,6 @@ export class ApplicationSubmission extends Base { nfuFillOriginDescription: string | null; //TUR Specific Fields - @AutoMap(() => String) - @Column({ type: 'text', nullable: true }) - turPurpose: string | null; - @AutoMap(() => String) @Column({ type: 'text', nullable: true }) turAgriculturalActivities: string | null; @@ -315,10 +311,6 @@ export class ApplicationSubmission extends Base { turAllOwnersNotified?: boolean | null; //Subdivision Fields - @AutoMap(() => String) - @Column({ type: 'text', nullable: true }) - subdPurpose: string | null; - @AutoMap(() => String) @Column({ type: 'text', nullable: true }) subdSuitability: string | null; @@ -357,10 +349,6 @@ export class ApplicationSubmission extends Base { @Column({ type: 'text', nullable: true, name: 'soil_application_ids' }) soilApplicationIDs: string | null; - @AutoMap(() => String) - @Column({ type: 'text', nullable: true }) - soilPurpose: string | null; - @AutoMap(() => String) @Column({ type: 'text', nullable: true }) soilTypeRemoved: string | null; @@ -568,10 +556,6 @@ export class ApplicationSubmission extends Base { @Column({ type: 'text', nullable: true }) naruSubtypeCode: string | null; - @AutoMap(() => String) - @Column({ type: 'text', nullable: true }) - naruPurpose: string | null; - @AutoMap(() => Number) @Column({ type: 'decimal', @@ -678,6 +662,36 @@ export class ApplicationSubmission extends Base { @Column({ type: 'text', nullable: true }) naruAgriTourism: string | null; + //Inclusion / Exclusion Fields + + @AutoMap(() => String) + @Column({ type: 'text', nullable: true }) + prescribedBody: string | null; + + @AutoMap(() => Number) + @Column({ + type: 'decimal', + nullable: true, + precision: 12, + scale: 2, + transformer: new ColumnNumericTransformer(), + }) + inclExclHectares: number | null; + + @AutoMap(() => String) + @Column({ type: 'text', nullable: true }) + exclWhyLand: string | null; + + @AutoMap(() => String) + @Column({ type: 'text', nullable: true }) + inclAgricultureSupport: string | null; + + @AutoMap(() => String) + @Column({ type: 'text', nullable: true }) + inclImprovements: string | null; + + //END SUBMISSION FIELDS + @AutoMap(() => Application) @ManyToOne(() => Application) @JoinColumn({ diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.service.ts b/services/apps/alcs/src/portal/application-submission/application-submission.service.ts index 871274d24a..41ae69b8da 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.service.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.service.ts @@ -153,6 +153,8 @@ export class ApplicationSubmissionService { const applicationSubmission = await this.getOrFailByUuid(submissionUuid); applicationSubmission.applicant = updateDto.applicant; + applicationSubmission.purpose = + updateDto.purpose || applicationSubmission.purpose; applicationSubmission.typeCode = updateDto.typeCode || applicationSubmission.typeCode; applicationSubmission.localGovernmentUuid = updateDto.localGovernmentUuid; @@ -636,7 +638,6 @@ export class ApplicationSubmissionService { updateDto: ApplicationSubmissionUpdateDto, ) { application.nfuHectares = updateDto.nfuHectares || application.nfuHectares; - application.nfuPurpose = updateDto.nfuPurpose || application.nfuPurpose; application.nfuOutsideLands = updateDto.nfuOutsideLands || application.nfuOutsideLands; application.nfuAgricultureSupport = @@ -681,7 +682,6 @@ export class ApplicationSubmissionService { application: ApplicationSubmission, updateDto: ApplicationSubmissionUpdateDto, ) { - application.turPurpose = updateDto.turPurpose || application.turPurpose; application.turAgriculturalActivities = updateDto.turAgriculturalActivities || application.turAgriculturalActivities; @@ -703,8 +703,6 @@ export class ApplicationSubmissionService { applicationSubmission: ApplicationSubmission, updateDto: ApplicationSubmissionUpdateDto, ) { - applicationSubmission.subdPurpose = - updateDto.subdPurpose || applicationSubmission.subdPurpose; applicationSubmission.subdSuitability = updateDto.subdSuitability || applicationSubmission.subdSuitability; applicationSubmission.subdAgricultureSupport = @@ -748,10 +746,6 @@ export class ApplicationSubmissionService { updateDto.soilApplicationIDs, applicationSubmission.soilApplicationIDs, ); - applicationSubmission.soilPurpose = filterUndefined( - updateDto.soilPurpose, - applicationSubmission.soilPurpose, - ); applicationSubmission.soilTypeRemoved = filterUndefined( updateDto.soilTypeRemoved, applicationSubmission.soilTypeRemoved, @@ -874,10 +868,6 @@ export class ApplicationSubmissionService { updateDto.naruSubtypeCode, applicationSubmission.naruSubtypeCode, ); - applicationSubmission.naruPurpose = filterUndefined( - updateDto.naruPurpose, - applicationSubmission.naruPurpose, - ); applicationSubmission.naruFloorArea = filterUndefined( updateDto.naruFloorArea, applicationSubmission.naruFloorArea, diff --git a/services/apps/alcs/src/portal/pdf-generation/generate-submission-document.service.ts b/services/apps/alcs/src/portal/pdf-generation/generate-submission-document.service.ts index bab896b69a..4b69a074bb 100644 --- a/services/apps/alcs/src/portal/pdf-generation/generate-submission-document.service.ts +++ b/services/apps/alcs/src/portal/pdf-generation/generate-submission-document.service.ts @@ -211,6 +211,7 @@ export class GenerateSubmissionDocumentService { .tz(new Date(), 'Canada/Pacific') .format('MMM DD, YYYY hh:mm:ss Z'), + purpose: submission.purpose, fileNumber: submission.fileNumber, localGovernment: localGovernment?.name, status: submission.status.statusType, @@ -279,7 +280,6 @@ export class GenerateSubmissionDocumentService { // NFU Proposal nfuHectares: submission.nfuHectares, - nfuPurpose: submission.nfuPurpose, nfuOutsideLands: submission.nfuOutsideLands, nfuAgricultureSupport: submission.nfuAgricultureSupport, showImportFill: submission.nfuWillImportFill, @@ -313,7 +313,6 @@ export class GenerateSubmissionDocumentService { ...pdfData, // TUR Proposal - turPurpose: submission.turPurpose, turAgriculturalActivities: submission.turAgriculturalActivities, turReduceNegativeImpacts: submission.turReduceNegativeImpacts, turOutsideLands: submission.turOutsideLands, @@ -341,7 +340,6 @@ export class GenerateSubmissionDocumentService { ...pdfData, // SUBD Proposal - subdPurpose: submission.subdPurpose, subdSuitability: submission.subdSuitability, subdAgricultureSupport: submission.subdAgricultureSupport, subdIsHomeSiteSeverance: formatBooleanToYesNoString( diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1689973655105-add_inclexcl_fields_to_submission.ts b/services/apps/alcs/src/providers/typeorm/migrations/1689973655105-add_inclexcl_fields_to_submission.ts new file mode 100644 index 0000000000..2961622db3 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1689973655105-add_inclexcl_fields_to_submission.ts @@ -0,0 +1,85 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class addInclexclFieldsToSubmission1689973655105 + implements MigrationInterface +{ + name = 'addInclexclFieldsToSubmission1689973655105'; + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" ADD "purpose" text`, + ); + + await queryRunner.query( + `UPDATE "alcs"."application_submission" SET "purpose" = CONCAT(nfu_purpose, tur_purpose, subd_purpose, soil_purpose, naru_purpose)`, + ); + + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" DROP COLUMN "nfu_purpose"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" DROP COLUMN "tur_purpose"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" DROP COLUMN "subd_purpose"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" DROP COLUMN "soil_purpose"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" DROP COLUMN "naru_purpose"`, + ); + + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" ADD "prescribed_body" text`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" ADD "incl_excl_hectares" numeric(12,2)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" ADD "excl_why_land" text`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" ADD "incl_agriculture_support" text`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" ADD "incl_improvements" text`, + ); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" DROP COLUMN "incl_improvements"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" DROP COLUMN "incl_agriculture_support"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" DROP COLUMN "excl_why_land"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" DROP COLUMN "incl_excl_hectares"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" DROP COLUMN "prescribed_body"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" DROP COLUMN "purpose"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" ADD "naru_purpose" text`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" ADD "soil_purpose" text`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" ADD "subd_purpose" text`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" ADD "tur_purpose" text`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" ADD "nfu_purpose" text`, + ); + } +} From 8e73c23e49bdc6ebec95b00b57507c4d424c8716 Mon Sep 17 00:00:00 2001 From: Liam Stoddard Date: Fri, 21 Jul 2023 17:12:22 -0700 Subject: [PATCH 108/954] upload is working --- bin/migrate-files/migrate-files.py | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/bin/migrate-files/migrate-files.py b/bin/migrate-files/migrate-files.py index f117a06971..1940cd65d9 100644 --- a/bin/migrate-files/migrate-files.py +++ b/bin/migrate-files/migrate-files.py @@ -12,8 +12,10 @@ db_username = os.getenv("DB_USERNAME") db_password = os.getenv("DB_PASSWORD") db_dsn = os.getenv("DB_DSN") +db_path = os.getenv("DB_PATH") # Connect to the Oracle database +cx_Oracle.init_oracle_client(lib_dir=db_path) conn = cx_Oracle.connect( user=db_username, password=db_password, dsn=db_dsn, encoding="UTF-8" ) @@ -29,7 +31,7 @@ "s3", aws_access_key_id=ecs_access_key, aws_secret_access_key=ecs_secret_key, - use_ssl=True, + use_ssl=False, endpoint_url=ecs_host, ) @@ -38,7 +40,7 @@ if os.path.isfile('last-file.pickle'): with open('last-file.pickle', 'rb') as file: starting_document_id = pickle.load(file) - +# starting_document_id = 999999 print('Starting applications from:', starting_document_id) starting_planning_document_id = 0 @@ -80,6 +82,7 @@ FROM OATS.OATS_DOCUMENTS WHERE dbms_lob.getLength(DOCUMENT_BLOB) > 0 AND DOCUMENT_ID > {starting_document_id} +AND ALR_APPLICATION_ID IS NOT NULL ORDER BY DOCUMENT_ID ASC """) @@ -90,9 +93,10 @@ documents_processed = 0 last_document_id = 0 max_file = 0 +breakout = False try: - with tqdm(total=count, unit="file", desc="Uploading files to S3") as pbar: + with tqdm(total=application_count, unit="file", desc="Uploading files to S3") as pbar: while True: # Fetch the next batch of BLOB data data = cursor.fetchmany(BATCH_SIZE) @@ -109,8 +113,11 @@ last_document_id = document_id documents_processed += 1 max_file += 1 + print("number of files", max_file) if max_file > 4: - break + breakout = True + if breakout: + break except Exception as e: print("Something went wrong:",e) print("Processed", documents_processed, "files") @@ -147,6 +154,7 @@ FROM OATS.OATS_DOCUMENTS WHERE dbms_lob.getLength(DOCUMENT_BLOB) > 0 AND DOCUMENT_ID > {starting_planning_document_id} +AND PLANNING_REVIEW_ID IS NOT NULL ORDER BY DOCUMENT_ID ASC """) @@ -176,6 +184,7 @@ last_planning_document_id = document_id documents_processed += 1 max_file += 1 + print("number of files", max_file) if max_file > 4: break except Exception as e: @@ -214,6 +223,7 @@ FROM OATS.OATS_DOCUMENTS WHERE dbms_lob.getLength(DOCUMENT_BLOB) > 0 AND DOCUMENT_ID > {starting_issue_document_id} +AND ISSUE_ID IS NOT NULL ORDER BY DOCUMENT_ID ASC """) @@ -243,6 +253,7 @@ last_issue_document_id = document_id documents_processed += 1 max_file += 1 + print("number of files", max_file) if max_file > 4: break except Exception as e: From 5d4f8415897fab719aa227c94186d18b8ae38da2 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Mon, 24 Jul 2023 09:28:27 -0700 Subject: [PATCH 109/954] Add Exclusion Step 6 to Portal * Add Step 6 with Validation to Portal * Hook up new document types * Add migration for missed field in last MR --- .../application-details.component.spec.ts | 6 + .../application-submission.service.spec.ts | 6 + .../services/application/application.dto.ts | 8 + .../edit-submission-base.module.ts | 2 + .../edit-submission.component.html | 8 + .../edit-submission.component.ts | 9 +- .../excl-proposal.component.html | 199 ++++++++++++++++++ .../excl-proposal.component.scss | 5 + .../excl-proposal.component.spec.ts | 59 ++++++ .../excl-proposal/excl-proposal.component.ts | 111 ++++++++++ .../nfu-proposal/nfu-proposal.component.ts | 9 +- .../application-document.dto.ts | 3 + .../application-submission.dto.ts | 14 ++ .../application-document-code.entity.ts | 3 + .../application-submission.controller.ts | 3 +- .../application-submission.dto.ts | 48 +++++ .../application-submission.entity.ts | 4 + .../application-submission.service.ts | 34 ++- ...291162-add_share_property_to_submission.ts | 19 ++ 19 files changed, 541 insertions(+), 9 deletions(-) create mode 100644 portal-frontend/src/app/features/edit-submission/proposal/excl-proposal/excl-proposal.component.html create mode 100644 portal-frontend/src/app/features/edit-submission/proposal/excl-proposal/excl-proposal.component.scss create mode 100644 portal-frontend/src/app/features/edit-submission/proposal/excl-proposal/excl-proposal.component.spec.ts create mode 100644 portal-frontend/src/app/features/edit-submission/proposal/excl-proposal/excl-proposal.component.ts create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1689980291162-add_share_property_to_submission.ts diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.spec.ts b/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.spec.ts index 4607f83461..33e28b6222 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.spec.ts +++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.spec.ts @@ -28,6 +28,12 @@ describe('ApplicationDetailsComponent', () => { fixture = TestBed.createComponent(ApplicationDetailsComponent); component = fixture.componentInstance; component.submission = { + exclShareGovernmentBorders: null, + exclWhyLand: null, + inclAgricultureSupport: null, + inclExclHectares: null, + inclImprovements: null, + prescribedBody: null, applicant: '', purpose: '', canEdit: false, diff --git a/alcs-frontend/src/app/services/application/application-submission/application-submission.service.spec.ts b/alcs-frontend/src/app/services/application/application-submission/application-submission.service.spec.ts index 61863069f0..2db85d84bd 100644 --- a/alcs-frontend/src/app/services/application/application-submission/application-submission.service.spec.ts +++ b/alcs-frontend/src/app/services/application/application-submission/application-submission.service.spec.ts @@ -102,6 +102,12 @@ describe('ApplicationSubmissionService', () => { turOutsideLands: null, turReduceNegativeImpacts: null, turTotalCorridorArea: null, + inclAgricultureSupport: null, + inclImprovements: null, + exclShareGovernmentBorders: null, + exclWhyLand: null, + inclExclHectares: null, + prescribedBody: null, submissionStatuses: [], }; diff --git a/alcs-frontend/src/app/services/application/application.dto.ts b/alcs-frontend/src/app/services/application/application.dto.ts index 7775c4c030..90421efad0 100644 --- a/alcs-frontend/src/app/services/application/application.dto.ts +++ b/alcs-frontend/src/app/services/application/application.dto.ts @@ -207,6 +207,14 @@ export interface ApplicationSubmissionDto { naruToPlaceAverageDepth: number | null; naruSleepingUnits: number | null; naruAgriTourism: string | null; + + //Inclusion / Exclusion Fields + prescribedBody: string | null; + inclExclHectares: number | null; + exclWhyLand: string | null; + inclAgricultureSupport: string | null; + inclImprovements: string | null; + exclShareGovernmentBorders: boolean | null; } export interface ApplicationDto { diff --git a/portal-frontend/src/app/features/edit-submission/edit-submission-base.module.ts b/portal-frontend/src/app/features/edit-submission/edit-submission-base.module.ts index 13b593d51f..6f0889f931 100644 --- a/portal-frontend/src/app/features/edit-submission/edit-submission-base.module.ts +++ b/portal-frontend/src/app/features/edit-submission/edit-submission-base.module.ts @@ -24,6 +24,7 @@ import { ParcelEntryConfirmationDialogComponent } from './parcel-details/parcel- import { ParcelEntryComponent } from './parcel-details/parcel-entry/parcel-entry.component'; import { ParcelOwnersComponent } from './parcel-details/parcel-owners/parcel-owners.component'; import { PrimaryContactComponent } from './primary-contact/primary-contact.component'; +import { ExclProposalComponent } from './proposal/excl-proposal/excl-proposal.component'; import { ChangeSubtypeConfirmationDialogComponent } from './proposal/naru-proposal/change-subtype-confirmation-dialog/change-subtype-confirmation-dialog.component'; import { NaruProposalComponent } from './proposal/naru-proposal/naru-proposal.component'; import { NfuProposalComponent } from './proposal/nfu-proposal/nfu-proposal.component'; @@ -66,6 +67,7 @@ import { SelectGovernmentComponent } from './select-government/select-government NaruProposalComponent, ChangeSubtypeConfirmationDialogComponent, SoilTableComponent, + ExclProposalComponent, ], imports: [ CommonModule, diff --git a/portal-frontend/src/app/features/edit-submission/edit-submission.component.html b/portal-frontend/src/app/features/edit-submission/edit-submission.component.html index b7eb604fdc..f484aff4db 100644 --- a/portal-frontend/src/app/features/edit-submission/edit-submission.component.html +++ b/portal-frontend/src/app/features/edit-submission/edit-submission.component.html @@ -146,6 +146,14 @@
(navigateToStep)="onBeforeSwitchStep($event)" (exit)="onExit()" > +
diff --git a/portal-frontend/src/app/features/edit-submission/edit-submission.component.ts b/portal-frontend/src/app/features/edit-submission/edit-submission.component.ts index dd8608f3b0..9034b4075d 100644 --- a/portal-frontend/src/app/features/edit-submission/edit-submission.component.ts +++ b/portal-frontend/src/app/features/edit-submission/edit-submission.component.ts @@ -1,5 +1,5 @@ import { StepperSelectionEvent } from '@angular/cdk/stepper'; -import { AfterViewInit, Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; +import { AfterViewInit, Component, ContentChildren, OnDestroy, OnInit, ViewChild, ViewChildren } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; import { ActivatedRoute, Router } from '@angular/router'; import { BehaviorSubject, combineLatest, Observable, of, Subject, takeUntil } from 'rxjs'; @@ -20,6 +20,7 @@ import { OtherAttachmentsComponent } from './other-attachments/other-attachments import { OtherParcelsComponent } from './other-parcels/other-parcels.component'; import { ParcelDetailsComponent } from './parcel-details/parcel-details.component'; import { PrimaryContactComponent } from './primary-contact/primary-contact.component'; +import { ExclProposalComponent } from './proposal/excl-proposal/excl-proposal.component'; import { NaruProposalComponent } from './proposal/naru-proposal/naru-proposal.component'; import { NfuProposalComponent } from './proposal/nfu-proposal/nfu-proposal.component'; import { PfrsProposalComponent } from './proposal/pfrs-proposal/pfrs-proposal.component'; @@ -28,6 +29,7 @@ import { RosoProposalComponent } from './proposal/roso-proposal/roso-proposal.co import { SubdProposalComponent } from './proposal/subd-proposal/subd-proposal.component'; import { TurProposalComponent } from './proposal/tur-proposal/tur-proposal.component'; import { SelectGovernmentComponent } from './select-government/select-government.component'; +import { StepComponent } from './step.partial'; export enum EditApplicationSteps { AppParcel = 0, @@ -73,6 +75,7 @@ export class EditSubmissionComponent implements OnInit, OnDestroy, AfterViewInit @ViewChild(PofoProposalComponent) pofoProposalComponent?: RosoProposalComponent; @ViewChild(PfrsProposalComponent) pfrsProposalComponent?: PfrsProposalComponent; @ViewChild(NaruProposalComponent) naruProposalComponent?: NaruProposalComponent; + @ViewChild(ExclProposalComponent) exclProposalComponent?: ExclProposalComponent; @ViewChild(OtherAttachmentsComponent) otherAttachmentsComponent!: OtherAttachmentsComponent; constructor( @@ -205,6 +208,7 @@ export class EditSubmissionComponent implements OnInit, OnDestroy, AfterViewInit } private async saveProposalSteps() { + debugger; if (this.nfuProposalComponent) { await this.nfuProposalComponent.onSave(); } @@ -226,6 +230,9 @@ export class EditSubmissionComponent implements OnInit, OnDestroy, AfterViewInit if (this.naruProposalComponent) { await this.naruProposalComponent.onSave(); } + if (this.exclProposalComponent) { + await this.exclProposalComponent.onSave(); + } } async onBeforeSwitchStep(index: number) { diff --git a/portal-frontend/src/app/features/edit-submission/proposal/excl-proposal/excl-proposal.component.html b/portal-frontend/src/app/features/edit-submission/proposal/excl-proposal/excl-proposal.component.html new file mode 100644 index 0000000000..0949656217 --- /dev/null +++ b/portal-frontend/src/app/features/edit-submission/proposal/excl-proposal/excl-proposal.component.html @@ -0,0 +1,199 @@ +
+

Proposal

+

+ Considerations are subject to + Section 6 of the ALC Act. +

+

*All fields are required unless stated optional.

+
+ + Please consult the ' + + What the Commission Considers + + ' page of the ALC website for more information. + +
+
+
+ +
+ Note: To change this selection, you will need to use the 'Change Application Type' button at the top right of + the form. +
+ + + +
+
+ + + + ha + +
+ warning +
This field is required
+
+
+
+ + + Yes + No + +
+ warning +
This field is required
+
+
+
+ + + + + Characters left: {{ 4000 - purposeText.textLength }} +
+ warning +
This field is required
+
+
+
+ + + + + Characters left: {{ 4000 - outsideLandsText.textLength }} +
+ warning +
This field is required
+
+
+
+ +
A visual representation of your proposal.
+ +
+
+
+
+

Notification and Public Hearing Requirements

+

+ A printed copy of the application will need to be used for notification. Please ensure all prior fields are complete + and correct before downloading the PDF of the application (Step 8 of this application form will flag outstanding + fields). +

+ Please refer to Exclusion page on the ALC website for more information. + + + You will not be able to complete the remaining portion of the application until the notification and public hearing + process is complete. + +
+
+
+ +
+ Proof that notice of the application was provided in a form and manner acceptable to the Commission +
+
+
+ +
+
+ +
+ Proof that a sign, in a form and manner acceptable to the Commission, was posted on the land that is the + subject of the application +
+ +
+
+ +
Public hearing report and any other public comments received
+ +
+
+
+
+
+ + +
+ + +
+
diff --git a/portal-frontend/src/app/features/edit-submission/proposal/excl-proposal/excl-proposal.component.scss b/portal-frontend/src/app/features/edit-submission/proposal/excl-proposal/excl-proposal.component.scss new file mode 100644 index 0000000000..8223c57759 --- /dev/null +++ b/portal-frontend/src/app/features/edit-submission/proposal/excl-proposal/excl-proposal.component.scss @@ -0,0 +1,5 @@ +@use '../../../../../styles/functions' as *; + +section { + margin-top: rem(36); +} diff --git a/portal-frontend/src/app/features/edit-submission/proposal/excl-proposal/excl-proposal.component.spec.ts b/portal-frontend/src/app/features/edit-submission/proposal/excl-proposal/excl-proposal.component.spec.ts new file mode 100644 index 0000000000..38c8bc753e --- /dev/null +++ b/portal-frontend/src/app/features/edit-submission/proposal/excl-proposal/excl-proposal.component.spec.ts @@ -0,0 +1,59 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { MatDialog } from '@angular/material/dialog'; +import { Router } from '@angular/router'; +import { DeepMocked, createMock } from '@golevelup/ts-jest'; +import { BehaviorSubject } from 'rxjs'; +import { ApplicationDocumentDto } from '../../../../services/application-document/application-document.dto'; +import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; +import { ApplicationSubmissionDetailedDto } from '../../../../services/application-submission/application-submission.dto'; +import { ApplicationSubmissionService } from '../../../../services/application-submission/application-submission.service'; + +import { ExclProposalComponent } from './excl-proposal.component'; + +describe('ExclProposalComponent', () => { + let component: ExclProposalComponent; + let fixture: ComponentFixture; + let mockApplicationService: DeepMocked; + let mockAppDocumentService: DeepMocked; + let mockRouter: DeepMocked; + + beforeEach(async () => { + mockApplicationService = createMock(); + mockAppDocumentService = createMock(); + mockRouter = createMock(); + + await TestBed.configureTestingModule({ + providers: [ + { + provide: ApplicationSubmissionService, + useValue: mockApplicationService, + }, + { + provide: ApplicationDocumentService, + useValue: mockAppDocumentService, + }, + { + provide: Router, + useValue: mockRouter, + }, + { + provide: MatDialog, + useValue: {}, + }, + ], + declarations: [ExclProposalComponent], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(ExclProposalComponent); + component = fixture.componentInstance; + component.$applicationSubmission = new BehaviorSubject(undefined); + component.$applicationDocuments = new BehaviorSubject([]); + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/edit-submission/proposal/excl-proposal/excl-proposal.component.ts b/portal-frontend/src/app/features/edit-submission/proposal/excl-proposal/excl-proposal.component.ts new file mode 100644 index 0000000000..aa6e46f03a --- /dev/null +++ b/portal-frontend/src/app/features/edit-submission/proposal/excl-proposal/excl-proposal.component.ts @@ -0,0 +1,111 @@ +import { Component, OnDestroy, OnInit } from '@angular/core'; +import { FormControl, FormGroup, Validators } from '@angular/forms'; +import { MatDialog } from '@angular/material/dialog'; +import { Router } from '@angular/router'; +import { takeUntil } from 'rxjs'; +import { + ApplicationDocumentDto, + DOCUMENT_TYPE, +} from '../../../../services/application-document/application-document.dto'; +import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; +import { ApplicationSubmissionUpdateDto } from '../../../../services/application-submission/application-submission.dto'; +import { ApplicationSubmissionService } from '../../../../services/application-submission/application-submission.service'; +import { parseStringToBoolean } from '../../../../shared/utils/string-helper'; +import { EditApplicationSteps } from '../../edit-submission.component'; +import { FilesStepComponent } from '../../files-step.partial'; + +@Component({ + selector: 'app-excl-proposal', + templateUrl: './excl-proposal.component.html', + styleUrls: ['./excl-proposal.component.scss'], +}) +export class ExclProposalComponent extends FilesStepComponent implements OnInit, OnDestroy { + DOCUMENT = DOCUMENT_TYPE; + + currentStep = EditApplicationSteps.Proposal; + prescribedBody: string | null = null; + + hectares = new FormControl(null, [Validators.required]); + shareProperty = new FormControl(null, [Validators.required]); + purpose = new FormControl(null, [Validators.required]); + whyExclude = new FormControl(null, [Validators.required]); + + form = new FormGroup({ + hectares: this.hectares, + purpose: this.purpose, + shareProperty: this.shareProperty, + whyExclude: this.whyExclude, + }); + private submissionUuid = ''; + proposalMap: ApplicationDocumentDto[] = []; + noticeOfPublicHearing: ApplicationDocumentDto[] = []; + proofOfSignage: ApplicationDocumentDto[] = []; + reportOfPublicHearing: ApplicationDocumentDto[] = []; + + constructor( + private router: Router, + private applicationSubmissionService: ApplicationSubmissionService, + applicationDocumentService: ApplicationDocumentService, + dialog: MatDialog + ) { + super(applicationDocumentService, dialog); + } + + ngOnInit(): void { + this.$applicationSubmission.pipe(takeUntil(this.$destroy)).subscribe((applicationSubmission) => { + if (applicationSubmission) { + this.fileId = applicationSubmission.fileNumber; + this.submissionUuid = applicationSubmission.uuid; + this.prescribedBody = applicationSubmission.prescribedBody; + + this.form.patchValue({ + hectares: applicationSubmission.inclExclHectares?.toString(), + purpose: applicationSubmission.purpose, + whyExclude: applicationSubmission.exclWhyLand, + }); + + if (applicationSubmission.exclShareGovernmentBorders !== null) { + this.shareProperty.setValue(applicationSubmission.exclShareGovernmentBorders ? 'true' : 'false'); + } + + if (this.showErrors) { + this.form.markAllAsTouched(); + } + } + }); + + this.$applicationDocuments.pipe(takeUntil(this.$destroy)).subscribe((documents) => { + this.proposalMap = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.PROPOSAL_MAP); + this.noticeOfPublicHearing = documents.filter( + (document) => document.type?.code === DOCUMENT_TYPE.PROOF_OF_ADVERTISING + ); + this.proofOfSignage = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.PROOF_OF_SIGNAGE); + this.reportOfPublicHearing = documents.filter( + (document) => document.type?.code === DOCUMENT_TYPE.REPORT_OF_PUBLIC_HEARING + ); + }); + } + + async onSave() { + await this.save(); + } + + protected async save() { + if (this.fileId) { + const inclExclHectares = this.hectares.value; + const purpose = this.purpose.value; + const exclWhyLand = this.whyExclude.value; + const shareProperty = this.shareProperty.value; + + const updateDto: ApplicationSubmissionUpdateDto = { + inclExclHectares: inclExclHectares ? parseFloat(inclExclHectares) : null, + purpose, + exclWhyLand, + exclShareGovernmentBorders: parseStringToBoolean(shareProperty), + }; + + const updatedApp = await this.applicationSubmissionService.updatePending(this.submissionUuid, updateDto); + this.$applicationSubmission.next(updatedApp); + } + } +} diff --git a/portal-frontend/src/app/features/edit-submission/proposal/nfu-proposal/nfu-proposal.component.ts b/portal-frontend/src/app/features/edit-submission/proposal/nfu-proposal/nfu-proposal.component.ts index 4cd97a36c1..c2f9e5573a 100644 --- a/portal-frontend/src/app/features/edit-submission/proposal/nfu-proposal/nfu-proposal.component.ts +++ b/portal-frontend/src/app/features/edit-submission/proposal/nfu-proposal/nfu-proposal.component.ts @@ -1,11 +1,8 @@ -import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core'; +import { Component, OnDestroy, OnInit } from '@angular/core'; import { FormControl, FormGroup, Validators } from '@angular/forms'; import { Router } from '@angular/router'; -import { BehaviorSubject, Subject, takeUntil } from 'rxjs'; -import { - ApplicationSubmissionDetailedDto, - ApplicationSubmissionUpdateDto, -} from '../../../../services/application-submission/application-submission.dto'; +import { takeUntil } from 'rxjs'; +import { ApplicationSubmissionUpdateDto } from '../../../../services/application-submission/application-submission.dto'; import { ApplicationSubmissionService } from '../../../../services/application-submission/application-submission.service'; import { parseStringToBoolean } from '../../../../shared/utils/string-helper'; import { EditApplicationSteps } from '../../edit-submission.component'; diff --git a/portal-frontend/src/app/services/application-document/application-document.dto.ts b/portal-frontend/src/app/services/application-document/application-document.dto.ts index 0fdb44eaa1..f5762d92fe 100644 --- a/portal-frontend/src/app/services/application-document/application-document.dto.ts +++ b/portal-frontend/src/app/services/application-document/application-document.dto.ts @@ -23,6 +23,9 @@ export enum DOCUMENT_TYPE { CROSS_SECTIONS = 'SPCS', RECLAMATION_PLAN = 'RECP', NOTICE_OF_WORK = 'NOWE', + PROOF_OF_SIGNAGE = 'POSA', + REPORT_OF_PUBLIC_HEARING = 'ROPH', + PROOF_OF_ADVERTISING = 'POAA', } export enum DOCUMENT_SOURCE { diff --git a/portal-frontend/src/app/services/application-submission/application-submission.dto.ts b/portal-frontend/src/app/services/application-submission/application-submission.dto.ts index 513e8b1965..60fa775b03 100644 --- a/portal-frontend/src/app/services/application-submission/application-submission.dto.ts +++ b/portal-frontend/src/app/services/application-submission/application-submission.dto.ts @@ -138,6 +138,14 @@ export interface ApplicationSubmissionDetailedDto extends ApplicationSubmissionD naruToPlaceAverageDepth: number | null; naruSleepingUnits: number | null; naruAgriTourism: string | null; + + //Inclusion / Exclusion Fields + prescribedBody: string | null; + inclExclHectares: number | null; + exclWhyLand: string | null; + inclAgricultureSupport: string | null; + inclImprovements: string | null; + exclShareGovernmentBorders: boolean | null; } export interface ApplicationSubmissionUpdateDto { @@ -236,6 +244,12 @@ export interface ApplicationSubmissionUpdateDto { naruSleepingUnits?: number | null; naruAgriTourism?: string | null; + //Inclusion / Exclusion Fields //Inclusion / Exclusion Fields prescribedBody?: string | null; + inclExclHectares?: number | null; + exclWhyLand?: string | null; + inclAgricultureSupport?: string | null; + inclImprovements?: string | null; + exclShareGovernmentBorders?: boolean | null; } diff --git a/services/apps/alcs/src/alcs/application/application-document/application-document-code.entity.ts b/services/apps/alcs/src/alcs/application/application-document/application-document-code.entity.ts index ed3b75e5d0..3e5ddb7e44 100644 --- a/services/apps/alcs/src/alcs/application/application-document/application-document-code.entity.ts +++ b/services/apps/alcs/src/alcs/application/application-document/application-document-code.entity.ts @@ -23,6 +23,9 @@ export enum DOCUMENT_TYPE { CROSS_SECTIONS = 'SPCS', RECLAMATION_PLAN = 'RECP', NOTICE_OF_WORK = 'NOWE', + PROOF_OF_SIGNAGE = 'POSA', + REPORT_OF_PUBLIC_HEARING = 'ROPH', + PROOF_OF_ADVERTISING = 'POAA', ORIGINAL_SUBMISSION = 'SUBO', UPDATED_SUBMISSION = 'SUBU', diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.controller.ts b/services/apps/alcs/src/portal/application-submission/application-submission.controller.ts index f1b14ac2b0..70defa84b2 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.controller.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.controller.ts @@ -117,11 +117,12 @@ export class ApplicationSubmissionController { @Post() async create(@Req() req, @Body() body: ApplicationSubmissionCreateDto) { - const { type } = body; + const { type, prescribedBody } = body; const user = req.user.entity as User; const newFileNumber = await this.applicationSubmissionService.create( type, user, + prescribedBody, ); return { fileId: newFileNumber, diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.dto.ts b/services/apps/alcs/src/portal/application-submission/application-submission.dto.ts index 6883fb6f1e..2959014317 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.dto.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.dto.ts @@ -289,12 +289,35 @@ export class ApplicationSubmissionDetailedDto extends ApplicationSubmissionDto { @AutoMap(() => ApplicationSubmissionToSubmissionStatusDto) submissionStatuses: ApplicationSubmissionToSubmissionStatusDto[]; + + //Inclusion / Exclusion Fields + @AutoMap(() => String) + prescribedBody: string | null; + + @AutoMap(() => Number) + inclExclHectares: number | null; + + @AutoMap(() => String) + exclWhyLand: string | null; + + @AutoMap(() => String) + inclAgricultureSupport: string | null; + + @AutoMap(() => String) + inclImprovements: string | null; + + @AutoMap(() => Boolean) + exclShareGovernmentBorders: boolean | null; } export class ApplicationSubmissionCreateDto { @IsString() @IsNotEmpty() type: string; + + @IsString() + @IsOptional() + prescribedBody?: string; } export class ApplicationSubmissionUpdateDto { @@ -646,4 +669,29 @@ export class ApplicationSubmissionUpdateDto { @IsString() @IsOptional() naruAgriTourism?: string | null; + + //Inclusion / Exclusion Fields + @IsString() + @IsOptional() + prescribedBody?: string | null; + + @IsNumber() + @IsOptional() + inclExclHectares?: number | null; + + @IsString() + @IsOptional() + exclWhyLand?: string | null; + + @IsString() + @IsOptional() + inclAgricultureSupport?: string | null; + + @IsString() + @IsOptional() + inclImprovements?: string | null; + + @IsBoolean() + @IsOptional() + exclShareGovernmentBorders?: boolean | null; } diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts b/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts index 5893038f79..41c10c042e 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts @@ -690,6 +690,10 @@ export class ApplicationSubmission extends Base { @Column({ type: 'text', nullable: true }) inclImprovements: string | null; + @AutoMap(() => Boolean) + @Column({ type: 'boolean', nullable: true }) + exclShareGovernmentBorders: boolean | null; + //END SUBMISSION FIELDS @AutoMap(() => Application) diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.service.ts b/services/apps/alcs/src/portal/application-submission/application-submission.service.ts index 41ae69b8da..b87504f608 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.service.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.service.ts @@ -102,7 +102,7 @@ export class ApplicationSubmissionService { return application; } - async create(type: string, createdBy: User) { + async create(type: string, createdBy: User, prescribedBody?: string) { const fileNumber = await this.applicationService.generateNextFileNumber(); await this.applicationService.create( @@ -132,6 +132,7 @@ export class ApplicationSubmissionService { fileNumber, typeCode: type, createdBy, + prescribedBody, }); const submission = await this.applicationSubmissionRepository.save( @@ -168,6 +169,7 @@ export class ApplicationSubmissionService { await this.setSUBDFields(applicationSubmission, updateDto); await this.setSoilFields(applicationSubmission, updateDto); this.setNARUFields(applicationSubmission, updateDto); + this.setInclusionExclusionFields(applicationSubmission, updateDto); await this.applicationSubmissionRepository.save(applicationSubmission); @@ -934,6 +936,36 @@ export class ApplicationSubmissionService { ); } + private setInclusionExclusionFields( + applicationSubmission: ApplicationSubmission, + updateDto: ApplicationSubmissionUpdateDto, + ) { + applicationSubmission.prescribedBody = filterUndefined( + updateDto.prescribedBody, + applicationSubmission.prescribedBody, + ); + applicationSubmission.inclExclHectares = filterUndefined( + updateDto.inclExclHectares, + applicationSubmission.inclExclHectares, + ); + applicationSubmission.exclWhyLand = filterUndefined( + updateDto.exclWhyLand, + applicationSubmission.exclWhyLand, + ); + applicationSubmission.inclAgricultureSupport = filterUndefined( + updateDto.inclAgricultureSupport, + applicationSubmission.inclAgricultureSupport, + ); + applicationSubmission.inclImprovements = filterUndefined( + updateDto.inclImprovements, + applicationSubmission.inclImprovements, + ); + applicationSubmission.exclShareGovernmentBorders = filterUndefined( + updateDto.exclShareGovernmentBorders, + applicationSubmission.exclShareGovernmentBorders, + ); + } + async listNaruSubtypes() { return this.naruSubtypeRepository.find({ select: { diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1689980291162-add_share_property_to_submission.ts b/services/apps/alcs/src/providers/typeorm/migrations/1689980291162-add_share_property_to_submission.ts new file mode 100644 index 0000000000..92421374b2 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1689980291162-add_share_property_to_submission.ts @@ -0,0 +1,19 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class addSharePropertyToSubmission1689980291162 + implements MigrationInterface +{ + name = 'addSharePropertyToSubmission1689980291162'; + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" ADD "excl_share_government_borders" boolean`, + ); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" DROP COLUMN "excl_share_government_borders"`, + ); + } +} From 89dc139ce7f55839a8fc9ada0d90ef9986bb22da Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Mon, 24 Jul 2023 09:32:37 -0700 Subject: [PATCH 110/954] Feature/alcs 880 decision v2 errors (#809) errors on decision v2 highlight buttons scroll to error update SUBM status colour --- .../decision-documents.component.html | 12 ++- .../decision-documents.component.ts | 1 + .../decision-components.component.html | 21 ++++- .../decision-components.component.ts | 5 ++ .../decision-conditions.component.html | 11 ++- .../decision-conditions.component.ts | 5 ++ .../decision-input-v2.component.html | 85 ++++++++++--------- .../decision-input-v2.component.scss | 17 ++++ .../decision-input-v2.component.ts | 84 ++++++++++++++---- .../error-message.component.html | 4 + .../error-message.component.scss | 17 ++++ .../error-message.component.spec.ts | 23 +++++ .../error-message/error-message.component.ts | 10 +++ alcs-frontend/src/app/shared/shared.module.ts | 3 + alcs-frontend/src/styles/ngselect.scss | 20 +++++ ...0214633898-alcs_submission_status_color.ts | 20 +++++ 16 files changed, 276 insertions(+), 62 deletions(-) create mode 100644 alcs-frontend/src/app/shared/error-message/error-message.component.html create mode 100644 alcs-frontend/src/app/shared/error-message/error-message.component.scss create mode 100644 alcs-frontend/src/app/shared/error-message/error-message.component.spec.ts create mode 100644 alcs-frontend/src/app/shared/error-message/error-message.component.ts create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1690214633898-alcs_submission_status_color.ts diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-documents/decision-documents.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-documents/decision-documents.component.html index 9298139c2f..78377b19d1 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-documents/decision-documents.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-documents/decision-documents.component.html @@ -3,7 +3,17 @@
Decision Documents *
- + +
diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-documents/decision-documents.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-documents/decision-documents.component.ts index c5a3c8356c..2010e9202f 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-documents/decision-documents.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-documents/decision-documents.component.ts @@ -21,6 +21,7 @@ export class DecisionDocumentsComponent implements OnInit, OnDestroy { @Input() editable = true; @Input() loadData = true; @Input() decision: ApplicationDecisionDto | undefined; + @Input() showError = false; @Output() beforeDocumentUpload = new EventEmitter(); displayedColumns: string[] = ['type', 'fileName', 'source', 'visibilityFlags', 'uploadedAt', 'actions']; diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-components.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-components.component.html index 8074dc379e..b3a243ca19 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-components.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-components.component.html @@ -4,7 +4,11 @@
Decision Components
- +
- +
+ + +
diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-components.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-components.component.ts index 403da2fa6b..8fa1564740 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-components.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-components.component.ts @@ -34,6 +34,7 @@ export class DecisionComponentsComponent implements OnInit, OnDestroy, AfterView @Input() codes!: DecisionCodesDto; @Input() fileNumber!: string; + @Input() showError = false; @Input() components: DecisionComponentDto[] = []; @Output() componentsChange = new EventEmitter<{ @@ -225,4 +226,8 @@ export class DecisionComponentsComponent implements OnInit, OnDestroy, AfterView isValid, }); } + + onValidate() { + this.childComponents.forEach((component) => component.form.markAllAsTouched()); + } } diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-conditions.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-conditions.component.html index f31d852659..34dd8b0936 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-conditions.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-conditions.component.html @@ -12,6 +12,15 @@
Decision Conditions
- + +
diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-conditions.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-conditions.component.ts index 6fcf5886e3..0bf0b99623 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-conditions.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-conditions.component.ts @@ -34,6 +34,7 @@ export class DecisionConditionsComponent implements OnInit, OnChanges, OnDestroy @Input() codes!: DecisionCodesDto; @Input() components: DecisionComponentDto[] = []; @Input() conditions: ApplicationDecisionConditionDto[] = []; + @Input() showError = false; @ViewChildren(DecisionConditionComponent) conditionComponents: DecisionConditionComponent[] = []; @Output() conditionsChange = new EventEmitter<{ @@ -197,4 +198,8 @@ export class DecisionConditionsComponent implements OnInit, OnChanges, OnDestroy isValid: this.conditionComponents.reduce((isValid, component) => isValid && component.form.valid, true), }); } + + onValidate() { + this.conditionComponents.forEach((component) => component.form.markAllAsTouched()); + } } diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.html index 4c425eb490..f0bb7692b7 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.html @@ -18,17 +18,22 @@

Decisions > Edit Decision Draft

- +
+ + +
Res #{{ resolutionNumberControl.getRawValue() }} / {{ resolutionYearControl.getRawValue() }} @@ -138,16 +143,21 @@

Decisions > Edit Decision Draft

>
- Subject to Conditions* - - Yes - No - +
+ Subject to Conditions* + + Yes + No + +
@@ -159,7 +169,14 @@

Decisions > Edit Decision Draft

Stats required* - + Yes No @@ -191,7 +208,10 @@

Decisions > Edit Decision Draft

- +
Decisions > Edit Decision Draft [fileNumber]="fileNumber" [components]="components" (componentsChange)="onComponentChange($event)" + [showError]="form.touched && components.length < 1" > @@ -210,6 +231,7 @@

Decisions > Edit Decision Draft

[components]="components" [conditions]="conditions" (conditionsChange)="onConditionsChange($event)" + [showError]="form.touched && conditionUpdates.length < 1 && showConditions" >
@@ -270,25 +292,12 @@

Audit and Chair Review Info

- +
-
diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.scss b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.scss index 9ab9319b14..e6e203b157 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.scss +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.scss @@ -26,6 +26,9 @@ .resolution-number-wrapper { display: grid; grid-template-columns: 1fr 16px 0.7fr; + .resolution-number-btn-wrapper { + width: 100%; + } } .row-no-flex, @@ -143,4 +146,18 @@ color: #565656 !important; margin: 24px 0 !important; } + + .error-field-outlined.ng-invalid { + border-color: colors.$error-color !important; + + .mat-button-toggle { + border-color: colors.$error-color; + color: colors.$error-color !important; + } + + &.upload-button { + border: 2px solid colors.$error-color; + margin-bottom: 0px !important; + } + } } diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.ts index 014e30bed1..f2e92007fa 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.ts @@ -1,4 +1,4 @@ -import { Component, OnDestroy, OnInit } from '@angular/core'; +import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { FormControl, FormGroup, Validators } from '@angular/forms'; import { MatButtonToggleChange } from '@angular/material/button-toggle'; import { MatDialog } from '@angular/material/dialog'; @@ -10,7 +10,6 @@ import { ApplicationModificationDto } from '../../../../../services/application/ import { ApplicationModificationService } from '../../../../../services/application/application-modification/application-modification.service'; import { ApplicationReconsiderationDto } from '../../../../../services/application/application-reconsideration/application-reconsideration.dto'; import { ApplicationReconsiderationService } from '../../../../../services/application/application-reconsideration/application-reconsideration.service'; -import { ApplicationSubmissionService } from '../../../../../services/application/application-submission/application-submission.service'; import { ApplicationDecisionConditionDto, ApplicationDecisionDto, @@ -30,6 +29,8 @@ import { ToastService } from '../../../../../services/toast/toast.service'; import { formatDateForApi } from '../../../../../shared/utils/api-date-formatter'; import { parseBooleanToString, parseStringToBoolean } from '../../../../../shared/utils/boolean-helper'; import { ReleaseDialogComponent } from '../release-dialog/release-dialog.component'; +import { DecisionComponentsComponent } from './decision-components/decision-components.component'; +import { DecisionConditionsComponent } from './decision-conditions/decision-conditions.component'; export enum PostDecisionType { Modification = 'modification', @@ -76,6 +77,9 @@ export class DecisionInputV2Component implements OnInit, OnDestroy { conditions: ApplicationDecisionConditionDto[] = []; conditionUpdates: UpdateApplicationDecisionConditionDto[] = []; + @ViewChild(DecisionComponentsComponent) decisionComponentsComponent?: DecisionComponentsComponent; + @ViewChild(DecisionConditionsComponent) decisionConditionsComponent?: DecisionConditionsComponent; + form = new FormGroup({ outcome: new FormControl(null, [Validators.required]), date: new FormControl(undefined, [Validators.required]), @@ -105,7 +109,6 @@ export class DecisionInputV2Component implements OnInit, OnDestroy { public router: Router, private route: ActivatedRoute, private toastService: ToastService, - private applicationSubmissionService: ApplicationSubmissionService, private applicationService: ApplicationDetailService, public dialog: MatDialog ) {} @@ -523,22 +526,66 @@ export class DecisionInputV2Component implements OnInit, OnDestroy { this.resolutionYearControl.enable(); } + private runValidation() { + this.form.markAllAsTouched(); + this.componentsValid = this.componentsValid && this.components.length > 0; + this.conditionsValid = this.conditionsValid && this.conditionUpdates.length > 0; + + if (this.decisionComponentsComponent) { + this.decisionComponentsComponent.onValidate(); + } + + if (this.decisionConditionsComponent) { + this.decisionConditionsComponent.onValidate(); + } + + if ( + !this.form.valid || + !this.conditionsValid || + !this.componentsValid || + (this.components.length === 0 && this.showComponents) || + (this.conditionUpdates.length === 0 && this.showConditions) + ) { + this.form.controls.decisionMaker.markAsDirty(); + this.toastService.showErrorToast('Please correct all errors before submitting the form'); + + // this will ensure that error rendering complete + setTimeout(() => this.scrollToError()); + + return false; + } else { + return true; + } + } + + private scrollToError() { + let elements = document.getElementsByClassName('ng-invalid'); + let elArray = Array.from(elements).filter((el) => el.nodeName !== 'FORM'); + + elArray[0]?.scrollIntoView({ + behavior: 'smooth', + block: 'center', + }); + } + async onRelease() { - this.dialog - .open(ReleaseDialogComponent, { - minWidth: '600px', - maxWidth: '900px', - maxHeight: '80vh', - width: '90%', - autoFocus: false, - }) - .afterClosed() - .subscribe(async (didAccept) => { - if (didAccept) { - await this.onSubmit(false, false); - await this.applicationService.loadApplication(this.fileNumber); - } - }); + if (this.runValidation()) { + this.dialog + .open(ReleaseDialogComponent, { + minWidth: '600px', + maxWidth: '900px', + maxHeight: '80vh', + width: '90%', + autoFocus: false, + }) + .afterClosed() + .subscribe(async (didAccept) => { + if (didAccept) { + await this.onSubmit(false, false); + await this.applicationService.loadApplication(this.fileNumber); + } + }); + } } onComponentChange($event: { components: DecisionComponentDto[]; isValid: boolean }) { @@ -549,6 +596,7 @@ export class DecisionInputV2Component implements OnInit, OnDestroy { onConditionsChange($event: { conditions: UpdateApplicationDecisionConditionDto[]; isValid: boolean }) { this.conditionUpdates = $event.conditions; this.conditionsValid = $event.isValid; + this.conditionUpdates = Array.from($event.conditions); } onChangeDecisionOutcome(selectedOutcome: DecisionOutcomeCodeDto) { diff --git a/alcs-frontend/src/app/shared/error-message/error-message.component.html b/alcs-frontend/src/app/shared/error-message/error-message.component.html new file mode 100644 index 0000000000..0d7922d2e4 --- /dev/null +++ b/alcs-frontend/src/app/shared/error-message/error-message.component.html @@ -0,0 +1,4 @@ +
+ warning + This field is required +
diff --git a/alcs-frontend/src/app/shared/error-message/error-message.component.scss b/alcs-frontend/src/app/shared/error-message/error-message.component.scss new file mode 100644 index 0000000000..e0fdc68d29 --- /dev/null +++ b/alcs-frontend/src/app/shared/error-message/error-message.component.scss @@ -0,0 +1,17 @@ +@use '../../../styles/colors'; + +.error { + margin-top: 4px !important; + color: colors.$error-color; + display: flex; + align-items: center; + font-weight: 700 !important; + font-size: 14px; + + .mat-icon { + margin-right: 4px; + font-size: 14px; + width: 14px; + height: 14px; + } +} diff --git a/alcs-frontend/src/app/shared/error-message/error-message.component.spec.ts b/alcs-frontend/src/app/shared/error-message/error-message.component.spec.ts new file mode 100644 index 0000000000..8a9bf041c0 --- /dev/null +++ b/alcs-frontend/src/app/shared/error-message/error-message.component.spec.ts @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { ErrorMessageComponent } from './error-message.component'; + +describe('ErrorMessageComponent', () => { + let component: ErrorMessageComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ ErrorMessageComponent ] + }) + .compileComponents(); + + fixture = TestBed.createComponent(ErrorMessageComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/alcs-frontend/src/app/shared/error-message/error-message.component.ts b/alcs-frontend/src/app/shared/error-message/error-message.component.ts new file mode 100644 index 0000000000..f8b636425f --- /dev/null +++ b/alcs-frontend/src/app/shared/error-message/error-message.component.ts @@ -0,0 +1,10 @@ +import { Component } from '@angular/core'; + +@Component({ + selector: 'app-error-message', + templateUrl: './error-message.component.html', + styleUrls: ['./error-message.component.scss'] +}) +export class ErrorMessageComponent { + +} diff --git a/alcs-frontend/src/app/shared/shared.module.ts b/alcs-frontend/src/app/shared/shared.module.ts index 7b44c0669f..53d08a1cb0 100644 --- a/alcs-frontend/src/app/shared/shared.module.ts +++ b/alcs-frontend/src/app/shared/shared.module.ts @@ -38,6 +38,7 @@ import { ApplicationSubmissionStatusTypePillComponent } from './application-subm import { ApplicationTypePillComponent } from './application-type-pill/application-type-pill.component'; import { AvatarCircleComponent } from './avatar-circle/avatar-circle.component'; import { DetailsHeaderComponent } from './details-header/details-header.component'; +import { ErrorMessageComponent } from './error-message/error-message.component'; import { FavoriteButtonComponent } from './favorite-button/favorite-button.component'; import { InlineBooleanComponent } from './inline-boolean/inline-boolean.component'; import { InlineDatepickerComponent } from './inline-datepicker/inline-datepicker.component'; @@ -90,6 +91,7 @@ import { WarningBannerComponent } from './warning-banner/warning-banner.componen NoDataComponent, ApplicationSubmissionStatusTypePillComponent, WarningBannerComponent, + ErrorMessageComponent, ], imports: [ CommonModule, @@ -174,6 +176,7 @@ import { WarningBannerComponent } from './warning-banner/warning-banner.componen NoDataComponent, ApplicationSubmissionStatusTypePillComponent, WarningBannerComponent, + ErrorMessageComponent, ], }) export class SharedModule { diff --git a/alcs-frontend/src/styles/ngselect.scss b/alcs-frontend/src/styles/ngselect.scss index 5ec0ce3465..fe0fb471c4 100644 --- a/alcs-frontend/src/styles/ngselect.scss +++ b/alcs-frontend/src/styles/ngselect.scss @@ -76,3 +76,23 @@ .ng-select.ng-select-single .ng-select-container:not(.ng-appearance-outline) .ng-arrow-wrapper { bottom: 15px !important; } + +.ng-select.ng-invalid.ng-touched { + border-color: colors.$error-color !important; +} + +.ng-select.ng-select-focused.ng-invalid.ng-touched .ng-select-container:after { + border-color: colors.$error-color; +} + +.ng-select.ng-invalid.ng-touched .ng-select-container { + border-color: colors.$error-color !important; +} + +.ng-select.ng-invalid.ng-touched .ng-select-container.ng-appearance-outline:after { + border-color: colors.$error-color !important; +} + +.ng-select.ng-invalid.ng-touched .ng-value-container .ng-placeholder { + color: colors.$error-color !important; +} diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1690214633898-alcs_submission_status_color.ts b/services/apps/alcs/src/providers/typeorm/migrations/1690214633898-alcs_submission_status_color.ts new file mode 100644 index 0000000000..210d78c0c3 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1690214633898-alcs_submission_status_color.ts @@ -0,0 +1,20 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class alcsSubmissionStatusColor1690214633898 + implements MigrationInterface +{ + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query( + ` + UPDATE "alcs"."application_submission_status_type" + SET "alcs_background_color" = '#94c6ac', + "alcs_color" = '#002f17' + WHERE "code" IN ('SUBM'); + `, + ); + } + + public async down(queryRunner: QueryRunner): Promise { + // nope + } +} From 224ab8d957c004fbd64520c6e5c2df49ba160935 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Mon, 24 Jul 2023 09:58:40 -0700 Subject: [PATCH 111/954] Code Review Feedback --- .../app/features/edit-submission/edit-submission.component.ts | 1 - .../application-submission/application-submission.dto.ts | 1 - 2 files changed, 2 deletions(-) diff --git a/portal-frontend/src/app/features/edit-submission/edit-submission.component.ts b/portal-frontend/src/app/features/edit-submission/edit-submission.component.ts index 9034b4075d..60790c333b 100644 --- a/portal-frontend/src/app/features/edit-submission/edit-submission.component.ts +++ b/portal-frontend/src/app/features/edit-submission/edit-submission.component.ts @@ -208,7 +208,6 @@ export class EditSubmissionComponent implements OnInit, OnDestroy, AfterViewInit } private async saveProposalSteps() { - debugger; if (this.nfuProposalComponent) { await this.nfuProposalComponent.onSave(); } diff --git a/portal-frontend/src/app/services/application-submission/application-submission.dto.ts b/portal-frontend/src/app/services/application-submission/application-submission.dto.ts index 60fa775b03..44fb25220b 100644 --- a/portal-frontend/src/app/services/application-submission/application-submission.dto.ts +++ b/portal-frontend/src/app/services/application-submission/application-submission.dto.ts @@ -244,7 +244,6 @@ export interface ApplicationSubmissionUpdateDto { naruSleepingUnits?: number | null; naruAgriTourism?: string | null; - //Inclusion / Exclusion Fields //Inclusion / Exclusion Fields prescribedBody?: string | null; inclExclHectares?: number | null; From 9de0b64299d667dadb0e2b07c341d0f0da6fde87 Mon Sep 17 00:00:00 2001 From: Liam Stoddard Date: Mon, 24 Jul 2023 10:29:04 -0700 Subject: [PATCH 112/954] added break out logig to not download everything on local --- bin/migrate-files/migrate-files.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/bin/migrate-files/migrate-files.py b/bin/migrate-files/migrate-files.py index 1940cd65d9..caf86efabb 100644 --- a/bin/migrate-files/migrate-files.py +++ b/bin/migrate-files/migrate-files.py @@ -165,6 +165,7 @@ documents_processed = 0 last_planning_document_id = 0 max_file = 0 +breakout = False try: with tqdm(total=planning_review_count, unit="file", desc="Uploading files to S3") as pbar: @@ -186,7 +187,9 @@ max_file += 1 print("number of files", max_file) if max_file > 4: - break + breakout = True + if breakout: + break except Exception as e: print("Something went wrong:",e) print("Processed", documents_processed, "files") @@ -234,6 +237,7 @@ documents_processed = 0 last_issue_document_id = 0 max_file = 0 +breakout = False try: with tqdm(total=issue_count, unit="file", desc="Uploading files to S3") as pbar: @@ -255,7 +259,9 @@ max_file += 1 print("number of files", max_file) if max_file > 4: - break + breakout = True + if breakout: + break except Exception as e: print("Something went wrong:",e) print("Processed", documents_processed, "files") From 4614e022d46cc0d8ea4a428132a845a9dcf1d0c1 Mon Sep 17 00:00:00 2001 From: Liam Stoddard Date: Mon, 24 Jul 2023 11:02:35 -0700 Subject: [PATCH 113/954] removed local db restrictions --- bin/migrate-files/migrate-files.py | 47 +++++------------------------- 1 file changed, 7 insertions(+), 40 deletions(-) diff --git a/bin/migrate-files/migrate-files.py b/bin/migrate-files/migrate-files.py index caf86efabb..edb46e8745 100644 --- a/bin/migrate-files/migrate-files.py +++ b/bin/migrate-files/migrate-files.py @@ -12,10 +12,10 @@ db_username = os.getenv("DB_USERNAME") db_password = os.getenv("DB_PASSWORD") db_dsn = os.getenv("DB_DSN") -db_path = os.getenv("DB_PATH") +# db_path = os.getenv("DB_PATH") # only necessary if running on local M1 # Connect to the Oracle database -cx_Oracle.init_oracle_client(lib_dir=db_path) +# cx_Oracle.init_oracle_client(lib_dir=db_path) # only necessary if running on local M1 conn = cx_Oracle.connect( user=db_username, password=db_password, dsn=db_dsn, encoding="UTF-8" ) @@ -31,7 +31,7 @@ "s3", aws_access_key_id=ecs_access_key, aws_secret_access_key=ecs_secret_key, - use_ssl=False, + use_ssl=True, endpoint_url=ecs_host, ) @@ -40,7 +40,7 @@ if os.path.isfile('last-file.pickle'): with open('last-file.pickle', 'rb') as file: starting_document_id = pickle.load(file) -# starting_document_id = 999999 + print('Starting applications from:', starting_document_id) starting_planning_document_id = 0 @@ -92,8 +92,6 @@ # Track progress documents_processed = 0 last_document_id = 0 -max_file = 0 -breakout = False try: with tqdm(total=application_count, unit="file", desc="Uploading files to S3") as pbar: @@ -112,12 +110,7 @@ pbar.update(1) last_document_id = document_id documents_processed += 1 - max_file += 1 - print("number of files", max_file) - if max_file > 4: - breakout = True - if breakout: - break + except Exception as e: print("Something went wrong:",e) print("Processed", documents_processed, "files") @@ -133,12 +126,6 @@ # Display results print("Process complete: Successfully migrated", documents_processed, "files.") -# Close the database cursor and connection -# cursor.close() -# conn.close() - -# cursor = conn.cursor() - try: cursor.execute ('SELECT COUNT(*) FROM OATS.OATS_DOCUMENTS WHERE dbms_lob.getLength(DOCUMENT_BLOB) > 0 AND PLANNING_REVIEW_ID IS NOT NULL') except cx_Oracle.Error as e: @@ -164,8 +151,6 @@ # Track progress documents_processed = 0 last_planning_document_id = 0 -max_file = 0 -breakout = False try: with tqdm(total=planning_review_count, unit="file", desc="Uploading files to S3") as pbar: @@ -184,12 +169,7 @@ pbar.update(1) last_planning_document_id = document_id documents_processed += 1 - max_file += 1 - print("number of files", max_file) - if max_file > 4: - breakout = True - if breakout: - break + except Exception as e: print("Something went wrong:",e) print("Processed", documents_processed, "files") @@ -205,12 +185,6 @@ # Display results print("Process complete: Successfully migrated", documents_processed, "files.") -# Close the database cursor and connection -# cursor.close() -# conn.close() - -# cursor = conn.cursor() - try: cursor.execute ('SELECT COUNT(*) FROM OATS.OATS_DOCUMENTS WHERE dbms_lob.getLength(DOCUMENT_BLOB) > 0 AND ISSUE_ID IS NOT NULL') except cx_Oracle.Error as e: @@ -236,8 +210,6 @@ # Track progress documents_processed = 0 last_issue_document_id = 0 -max_file = 0 -breakout = False try: with tqdm(total=issue_count, unit="file", desc="Uploading files to S3") as pbar: @@ -256,12 +228,7 @@ pbar.update(1) last_issue_document_id = document_id documents_processed += 1 - max_file += 1 - print("number of files", max_file) - if max_file > 4: - breakout = True - if breakout: - break + except Exception as e: print("Something went wrong:",e) print("Processed", documents_processed, "files") From 11e30fa36f46de735da77dd5ecac061a3b846a29 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Mon, 24 Jul 2023 11:14:28 -0700 Subject: [PATCH 114/954] Bug Fixes for L/FNG as Applicant * Only redirect to LFNG review is submitting as same government * Make department mandatory on Step 3 * Always show authorization letter errors --- .../edit-submission.component.ts | 38 ++++-- .../primary-contact.component.html | 25 ++-- .../primary-contact.component.ts | 48 +++++--- .../application-document.service.ts | 2 +- .../application-submission.service.ts | 4 +- .../application-submission.controller.spec.ts | 110 +++++++++++------- .../application-submission.service.ts | 7 +- 7 files changed, 150 insertions(+), 84 deletions(-) diff --git a/portal-frontend/src/app/features/edit-submission/edit-submission.component.ts b/portal-frontend/src/app/features/edit-submission/edit-submission.component.ts index 60790c333b..59dfe11d14 100644 --- a/portal-frontend/src/app/features/edit-submission/edit-submission.component.ts +++ b/portal-frontend/src/app/features/edit-submission/edit-submission.component.ts @@ -1,14 +1,14 @@ import { StepperSelectionEvent } from '@angular/cdk/stepper'; -import { AfterViewInit, Component, ContentChildren, OnDestroy, OnInit, ViewChild, ViewChildren } from '@angular/core'; +import { AfterViewInit, Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; import { ActivatedRoute, Router } from '@angular/router'; import { BehaviorSubject, combineLatest, Observable, of, Subject, takeUntil } from 'rxjs'; import { ApplicationDocumentDto } from '../../services/application-document/application-document.dto'; import { ApplicationDocumentService } from '../../services/application-document/application-document.service'; -import { APPLICATION_OWNER } from '../../services/application-owner/application-owner.dto'; import { ApplicationSubmissionReviewService } from '../../services/application-submission-review/application-submission-review.service'; import { ApplicationSubmissionDetailedDto } from '../../services/application-submission/application-submission.dto'; import { ApplicationSubmissionService } from '../../services/application-submission/application-submission.service'; +import { CodeService } from '../../services/code/code.service'; import { PdfGenerationService } from '../../services/pdf-generation/pdf-generation.service'; import { ToastService } from '../../services/toast/toast.service'; import { CustomStepperComponent } from '../../shared/custom-stepper/custom-stepper.component'; @@ -29,7 +29,6 @@ import { RosoProposalComponent } from './proposal/roso-proposal/roso-proposal.co import { SubdProposalComponent } from './proposal/subd-proposal/subd-proposal.component'; import { TurProposalComponent } from './proposal/tur-proposal/tur-proposal.component'; import { SelectGovernmentComponent } from './select-government/select-government.component'; -import { StepComponent } from './step.partial'; export enum EditApplicationSteps { AppParcel = 0, @@ -87,7 +86,8 @@ export class EditSubmissionComponent implements OnInit, OnDestroy, AfterViewInit private overlayService: OverlaySpinnerService, private router: Router, private pdfGenerationService: PdfGenerationService, - private applicationReviewService: ApplicationSubmissionReviewService + private applicationReviewService: ApplicationSubmissionReviewService, + private codeService: CodeService ) {} ngOnInit(): void { @@ -257,17 +257,31 @@ export class EditSubmissionComponent implements OnInit, OnDestroy, AfterViewInit async onSubmit() { const submission = this.applicationSubmission; if (submission) { - await this.applicationSubmissionService.submitToAlcs(submission.uuid); + const didSubmit = await this.applicationSubmissionService.submitToAlcs(submission.uuid); + if (didSubmit) { + let government; + if (this.applicationSubmission?.localGovernmentUuid) { + government = await this.loadGovernment(this.applicationSubmission?.localGovernmentUuid); + } - const primaryContact = submission.owners.find((owner) => owner.uuid === submission?.primaryContactOwnerUuid); - if (primaryContact && primaryContact.type.code === APPLICATION_OWNER.GOVERNMENT) { - const review = await this.applicationReviewService.startReview(submission.fileNumber); - if (review) { - await this.router.navigateByUrl(`/application/${submission?.fileNumber}/review`); + if (government && government.matchesUserGuid) { + const review = await this.applicationReviewService.startReview(submission.fileNumber); + if (review) { + await this.router.navigateByUrl(`/application/${submission?.fileNumber}/review`); + } + } else { + await this.router.navigateByUrl(`/application/${submission?.fileNumber}`); } - } else { - await this.router.navigateByUrl(`/application/${submission?.fileNumber}`); } } } + + private async loadGovernment(uuid: string) { + const codes = await this.codeService.loadCodes(); + const localGovernment = codes.localGovernments.find((a) => a.uuid === uuid); + if (localGovernment) { + return localGovernment; + } + return; + } } diff --git a/portal-frontend/src/app/features/edit-submission/primary-contact/primary-contact.component.html b/portal-frontend/src/app/features/edit-submission/primary-contact/primary-contact.component.html index 313af24e69..dd83477975 100644 --- a/portal-frontend/src/app/features/edit-submission/primary-contact/primary-contact.component.html +++ b/portal-frontend/src/app/features/edit-submission/primary-contact/primary-contact.component.html @@ -1,7 +1,7 @@

Primary Contact

-

Select from the listed parcel owners or identify a third party agent

-

+

Select from the listed parcel owners or identify a third party agent

+

Identify staff from the local or first nation government listed below or a third-party agent to act as the primary contact.

@@ -28,8 +28,8 @@
{{ owner.displayName }}
checkPrimary Contact
- -
{{governmentName}} Staff
+ +
{{ governmentName }} Staff
@@ -126,8 +133,8 @@

Primary Contact Information

Primary Contact Authorization Letters

- An authorization letter must be provided if: - + + An authorization letter must be provided if:
  1. the parcel under application is owned by more than one person;
  2. the parcel(s) is owned by an organization; or
    3. @@ -140,7 +147,7 @@

    Primary Contact Authorization Letters

    further instruction and an Authorization Letter template.

    - + An authorization letter must be provided only if the application is being submitted by a third-party agent. Please consult the Supporting Documentation page of the TODO: FIX THIS: ALC website for further instruction. @@ -153,8 +160,8 @@
    Authorization Letters (if applicable)
    (uploadFiles)="attachFile($event, DOCUMENT_TYPE.AUTHORIZATION_LETTER)" (deleteFile)="onDeleteFile($event)" (openFile)="openFile($event)" - [showErrors]="showErrors" - [isRequired]="needsAuthorizationLetter || selectedThirdPartyAgent" + [showErrors]="showErrors || selectedLocalGovernment" + [isRequired]="needsAuthorizationLetter" >
diff --git a/portal-frontend/src/app/features/edit-submission/primary-contact/primary-contact.component.ts b/portal-frontend/src/app/features/edit-submission/primary-contact/primary-contact.component.ts index 71d0d984a6..7efc0ae9f5 100644 --- a/portal-frontend/src/app/features/edit-submission/primary-contact/primary-contact.component.ts +++ b/portal-frontend/src/app/features/edit-submission/primary-contact/primary-contact.component.ts @@ -29,7 +29,7 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni selectedLocalGovernment = false; selectedOwnerUuid: string | undefined = undefined; isCrownOwner = false; - isLocalGovernmentUser = false; + isGovernmentUser = false; governmentName: string | undefined; firstName = new FormControl('', [Validators.required]); @@ -69,9 +69,9 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni }); this.authenticationService.$currentProfile.pipe(takeUntil(this.$destroy)).subscribe((profile) => { - this.isLocalGovernmentUser = !!profile?.government; + this.isGovernmentUser = !!profile?.isLocalGovernment || !!profile?.isFirstNationGovernment; this.governmentName = profile?.government; - if (this.isLocalGovernmentUser) { + if (this.isGovernmentUser) { this.prepareGovernmentOwners(); } }); @@ -106,6 +106,12 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni (selectedOwner && selectedOwner.type.code === APPLICATION_OWNER.GOVERNMENT) || uuid == 'government'; this.form.reset(); + if (this.selectedLocalGovernment) { + this.organizationName.setValidators([Validators.required]); + } else { + this.organizationName.setValidators([]); + } + if (this.selectedThirdPartyAgent || this.selectedLocalGovernment) { this.firstName.enable(); this.lastName.enable(); @@ -131,23 +137,29 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni this.isCrownOwner = selectedOwner.type.code === APPLICATION_OWNER.CROWN; } } + this.calculateLetterRequired(); + } + private calculateLetterRequired() { const isSelfApplicant = this.owners[0].type.code === APPLICATION_OWNER.INDIVIDUAL || this.owners[0].type.code === APPLICATION_OWNER.GOVERNMENT; - this.needsAuthorizationLetter = !( - isSelfApplicant && - (this.owners.length === 1 || - (this.owners.length === 2 && - this.owners[1].type.code === APPLICATION_OWNER.AGENT && - !this.selectedThirdPartyAgent)) - ); + this.needsAuthorizationLetter = + this.selectedThirdPartyAgent || + !( + isSelfApplicant && + (this.owners.length === 1 || + (this.owners.length === 2 && + this.owners[1].type.code === APPLICATION_OWNER.AGENT && + !this.selectedThirdPartyAgent)) + ); + this.files = this.files.map((file) => ({ ...file, - errorMessage: this.needsAuthorizationLetter - ? undefined - : 'Authorization Letter not required. Please remove this file.', + errorMessage: !this.needsAuthorizationLetter + ? 'Authorization Letter not required. Please remove this file.' + : undefined, })); } @@ -189,6 +201,12 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni this.selectedLocalGovernment = selectedOwner.type.code === APPLICATION_OWNER.GOVERNMENT; } + if (this.selectedLocalGovernment) { + this.organizationName.setValidators([Validators.required]); + } else { + this.organizationName.setValidators([]); + } + if (selectedOwner && (this.selectedThirdPartyAgent || this.selectedLocalGovernment)) { this.selectedOwnerUuid = selectedOwner.uuid; this.form.patchValue({ @@ -198,6 +216,8 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni phoneNumber: selectedOwner.phoneNumber, email: selectedOwner.email, }); + + this.calculateLetterRequired(); } else if (selectedOwner) { this.onSelectOwner(selectedOwner.uuid); } else { @@ -208,7 +228,7 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni this.phoneNumber.disable(); } - if (this.isLocalGovernmentUser) { + if (this.isGovernmentUser) { this.prepareGovernmentOwners(); } diff --git a/portal-frontend/src/app/services/application-document/application-document.service.ts b/portal-frontend/src/app/services/application-document/application-document.service.ts index 9990a477fa..34020c3ebe 100644 --- a/portal-frontend/src/app/services/application-document/application-document.service.ts +++ b/portal-frontend/src/app/services/application-document/application-document.service.ts @@ -88,7 +88,7 @@ export class ApplicationDocumentService { ); } catch (e) { console.error(e); - this.toastService.showErrorToast('Failed to update documents, please try again'); + this.toastService.showErrorToast('Failed to fetch documents, please try again'); } return undefined; } diff --git a/portal-frontend/src/app/services/application-submission/application-submission.service.ts b/portal-frontend/src/app/services/application-submission/application-submission.service.ts index 0a48f3faa2..47c54836c5 100644 --- a/portal-frontend/src/app/services/application-submission/application-submission.service.ts +++ b/portal-frontend/src/app/services/application-submission/application-submission.service.ts @@ -104,9 +104,10 @@ export class ApplicationSubmissionService { } async submitToAlcs(uuid: string) { + let res; try { this.overlayService.showSpinner(); - await firstValueFrom( + res = await firstValueFrom( this.httpClient.post(`${this.serviceUrl}/alcs/submit/${uuid}`, {}) ); this.toastService.showSuccessToast('Application Submitted'); @@ -116,5 +117,6 @@ export class ApplicationSubmissionService { } finally { this.overlayService.hideSpinner(); } + return res; } } diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.controller.spec.ts b/services/apps/alcs/src/portal/application-submission/application-submission.controller.spec.ts index 19fe26901d..cc28740ba7 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.controller.spec.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.controller.spec.ts @@ -28,7 +28,7 @@ import { ApplicationSubmissionService } from './application-submission.service'; describe('ApplicationSubmissionController', () => { let controller: ApplicationSubmissionController; - let mockAppService: DeepMocked; + let mockAppSubmissionService: DeepMocked; let mockDocumentService: DeepMocked; let mockLgService: DeepMocked; let mockAppValidationService: DeepMocked; @@ -38,7 +38,7 @@ describe('ApplicationSubmissionController', () => { const bceidBusinessGuid = 'business-guid'; beforeEach(async () => { - mockAppService = createMock(); + mockAppSubmissionService = createMock(); mockDocumentService = createMock(); mockLgService = createMock(); mockAppValidationService = createMock(); @@ -49,7 +49,7 @@ describe('ApplicationSubmissionController', () => { ApplicationProfile, { provide: ApplicationSubmissionService, - useValue: mockAppService, + useValue: mockAppSubmissionService, }, { provide: ApplicationDocumentService, @@ -80,25 +80,25 @@ describe('ApplicationSubmissionController', () => { ApplicationSubmissionController, ); - mockAppService.update.mockResolvedValue( + mockAppSubmissionService.update.mockResolvedValue( new ApplicationSubmission({ applicant: applicant, localGovernmentUuid, }), ); - mockAppService.create.mockResolvedValue('2'); - mockAppService.getIfCreatorByFileNumber.mockResolvedValue( + mockAppSubmissionService.create.mockResolvedValue('2'); + mockAppSubmissionService.getIfCreatorByFileNumber.mockResolvedValue( new ApplicationSubmission(), ); - mockAppService.verifyAccessByFileId.mockResolvedValue( + mockAppSubmissionService.verifyAccessByFileId.mockResolvedValue( new ApplicationSubmission(), ); - mockAppService.verifyAccessByUuid.mockResolvedValue( + mockAppSubmissionService.verifyAccessByUuid.mockResolvedValue( new ApplicationSubmission(), ); - mockAppService.mapToDTOs.mockResolvedValue([]); + mockAppSubmissionService.mapToDTOs.mockResolvedValue([]); mockLgService.list.mockResolvedValue([ new ApplicationLocalGovernment({ uuid: localGovernmentUuid, @@ -114,7 +114,7 @@ describe('ApplicationSubmissionController', () => { }); it('should call out to service when fetching applications', async () => { - mockAppService.getByUser.mockResolvedValue([]); + mockAppSubmissionService.getByUser.mockResolvedValue([]); const applications = await controller.getApplications({ user: { @@ -123,11 +123,11 @@ describe('ApplicationSubmissionController', () => { }); expect(applications).toBeDefined(); - expect(mockAppService.getByUser).toHaveBeenCalledTimes(1); + expect(mockAppSubmissionService.getByUser).toHaveBeenCalledTimes(1); }); it('should fetch by bceid if user has same guid as a local government', async () => { - mockAppService.getForGovernment.mockResolvedValue([]); + mockAppSubmissionService.getForGovernment.mockResolvedValue([]); const applications = await controller.getApplications({ user: { @@ -138,7 +138,7 @@ describe('ApplicationSubmissionController', () => { }); expect(applications).toBeDefined(); - expect(mockAppService.getForGovernment).toHaveBeenCalledTimes(1); + expect(mockAppSubmissionService.getForGovernment).toHaveBeenCalledTimes(1); }); it('should call out to service when cancelling an application', async () => { @@ -150,11 +150,13 @@ describe('ApplicationSubmissionController', () => { }), }); - mockAppService.mapToDTOs.mockResolvedValue([ + mockAppSubmissionService.mapToDTOs.mockResolvedValue([ {} as ApplicationSubmissionDto, ]); - mockAppService.verifyAccessByUuid.mockResolvedValue(mockApplication); - mockAppService.cancel.mockResolvedValue(); + mockAppSubmissionService.verifyAccessByUuid.mockResolvedValue( + mockApplication, + ); + mockAppSubmissionService.cancel.mockResolvedValue(); const application = await controller.cancel('file-id', { user: { @@ -163,9 +165,11 @@ describe('ApplicationSubmissionController', () => { }); expect(application).toBeDefined(); - expect(mockAppService.cancel).toHaveBeenCalledTimes(1); - expect(mockAppService.verifyAccessByUuid).toHaveBeenCalledTimes(1); - expect(mockAppService.verifyAccessByUuid).toHaveBeenCalledWith( + expect(mockAppSubmissionService.cancel).toHaveBeenCalledTimes(1); + expect(mockAppSubmissionService.verifyAccessByUuid).toHaveBeenCalledTimes( + 1, + ); + expect(mockAppSubmissionService.verifyAccessByUuid).toHaveBeenCalledWith( 'file-id', new User(), ); @@ -173,7 +177,7 @@ describe('ApplicationSubmissionController', () => { it('should throw an exception when trying to cancel an application that is not in progress', async () => { const mockApp = new ApplicationSubmission(); - mockAppService.verifyAccessByUuid.mockResolvedValue({ + mockAppSubmissionService.verifyAccessByUuid.mockResolvedValue({ ...mockApp, status: new ApplicationSubmissionStatusType({ code: SUBMISSION_STATUS.CANCELLED, @@ -189,16 +193,18 @@ describe('ApplicationSubmissionController', () => { await expect(promise).rejects.toMatchObject( new BadRequestException('Can only cancel in progress Applications'), ); - expect(mockAppService.cancel).toHaveBeenCalledTimes(0); - expect(mockAppService.verifyAccessByUuid).toHaveBeenCalledTimes(1); - expect(mockAppService.verifyAccessByUuid).toHaveBeenCalledWith( + expect(mockAppSubmissionService.cancel).toHaveBeenCalledTimes(0); + expect(mockAppSubmissionService.verifyAccessByUuid).toHaveBeenCalledTimes( + 1, + ); + expect(mockAppSubmissionService.verifyAccessByUuid).toHaveBeenCalledWith( 'file-id', new User(), ); }); it('should call out to service when fetching an application', async () => { - mockAppService.mapToDetailedDTO.mockResolvedValue( + mockAppSubmissionService.mapToDetailedDTO.mockResolvedValue( {} as ApplicationSubmissionDetailedDto, ); @@ -212,14 +218,16 @@ describe('ApplicationSubmissionController', () => { ); expect(application).toBeDefined(); - expect(mockAppService.verifyAccessByUuid).toHaveBeenCalledTimes(1); + expect(mockAppSubmissionService.verifyAccessByUuid).toHaveBeenCalledTimes( + 1, + ); }); it('should fetch application by bceid if user has same guid as a local government', async () => { - mockAppService.mapToDetailedDTO.mockResolvedValue( + mockAppSubmissionService.mapToDetailedDTO.mockResolvedValue( {} as ApplicationSubmissionDetailedDto, ); - mockAppService.verifyAccessByUuid.mockResolvedValue( + mockAppSubmissionService.verifyAccessByUuid.mockResolvedValue( new ApplicationSubmission({ localGovernmentUuid: '', }), @@ -237,12 +245,14 @@ describe('ApplicationSubmissionController', () => { ); expect(application).toBeDefined(); - expect(mockAppService.verifyAccessByUuid).toHaveBeenCalledTimes(1); + expect(mockAppSubmissionService.verifyAccessByUuid).toHaveBeenCalledTimes( + 1, + ); }); it('should call out to service when creating an application', async () => { - mockAppService.create.mockResolvedValue(''); - mockAppService.mapToDTOs.mockResolvedValue([ + mockAppSubmissionService.create.mockResolvedValue(''); + mockAppSubmissionService.mapToDTOs.mockResolvedValue([ {} as ApplicationSubmissionDto, ]); @@ -258,11 +268,11 @@ describe('ApplicationSubmissionController', () => { ); expect(application).toBeDefined(); - expect(mockAppService.create).toHaveBeenCalledTimes(1); + expect(mockAppSubmissionService.create).toHaveBeenCalledTimes(1); }); it('should call out to service for update and map', async () => { - mockAppService.mapToDetailedDTO.mockResolvedValue( + mockAppSubmissionService.mapToDetailedDTO.mockResolvedValue( {} as ApplicationSubmissionDetailedDto, ); @@ -279,19 +289,23 @@ describe('ApplicationSubmissionController', () => { }, ); - expect(mockAppService.verifyAccessByUuid).toHaveBeenCalledTimes(1); - expect(mockAppService.mapToDetailedDTO).toHaveBeenCalledTimes(1); + expect(mockAppSubmissionService.verifyAccessByUuid).toHaveBeenCalledTimes( + 1, + ); + expect(mockAppSubmissionService.mapToDetailedDTO).toHaveBeenCalledTimes(1); }); it('should call out to service on submitAlcs if application type is TURP', async () => { const mockFileId = 'file-id'; - mockAppService.submitToAlcs.mockResolvedValue(new Application()); - mockAppService.getIfCreatorByUuid.mockResolvedValue( + mockAppSubmissionService.submitToAlcs.mockResolvedValue(new Application()); + mockAppSubmissionService.getIfCreatorByUuid.mockResolvedValue( new ApplicationSubmission({ typeCode: 'TURP', }), ); - mockAppService.updateStatus.mockResolvedValue(); + mockAppSubmissionService.updateStatus.mockResolvedValue( + new ApplicationSubmissionToSubmissionStatus(), + ); mockAppValidationService.validateSubmission.mockResolvedValue({ application: new ApplicationSubmission({ typeCode: 'TURP', @@ -305,15 +319,19 @@ describe('ApplicationSubmissionController', () => { }, }); - expect(mockAppService.verifyAccessByUuid).toHaveBeenCalledTimes(1); - expect(mockAppService.submitToAlcs).toHaveBeenCalledTimes(1); - expect(mockAppService.updateStatus).toHaveBeenCalledTimes(1); + expect(mockAppSubmissionService.verifyAccessByUuid).toHaveBeenCalledTimes( + 1, + ); + expect(mockAppSubmissionService.submitToAlcs).toHaveBeenCalledTimes(1); + expect(mockAppSubmissionService.updateStatus).toHaveBeenCalledTimes(1); }); it('should submit to LG if application type is NOT-TURP', async () => { const mockFileId = 'file-id'; - mockAppService.submitToLg.mockResolvedValue(); - mockAppService.getIfCreatorByUuid.mockResolvedValue( + mockAppSubmissionService.submitToLg.mockResolvedValue( + new ApplicationSubmissionToSubmissionStatus(), + ); + mockAppSubmissionService.getIfCreatorByUuid.mockResolvedValue( new ApplicationSubmission({ typeCode: 'NOT-TURP', localGovernmentUuid, @@ -331,13 +349,15 @@ describe('ApplicationSubmissionController', () => { }, }); - expect(mockAppService.verifyAccessByUuid).toHaveBeenCalledTimes(1); - expect(mockAppService.submitToLg).toHaveBeenCalledTimes(1); + expect(mockAppSubmissionService.verifyAccessByUuid).toHaveBeenCalledTimes( + 1, + ); + expect(mockAppSubmissionService.submitToLg).toHaveBeenCalledTimes(1); }); it('should throw an exception if application fails validation', async () => { const mockFileId = 'file-id'; - mockAppService.verifyAccessByUuid.mockResolvedValue( + mockAppSubmissionService.verifyAccessByUuid.mockResolvedValue( new ApplicationSubmission({ typeCode: 'NOT-TURP', }), diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.service.ts b/services/apps/alcs/src/portal/application-submission/application-submission.service.ts index b87504f608..764b880842 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.service.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.service.ts @@ -192,7 +192,10 @@ export class ApplicationSubmissionService { } async submitToLg(submission: ApplicationSubmission) { - await this.updateStatus(submission, SUBMISSION_STATUS.SUBMITTED_TO_LG); + return await this.updateStatus( + submission, + SUBMISSION_STATUS.SUBMITTED_TO_LG, + ); } async updateStatus( @@ -200,7 +203,7 @@ export class ApplicationSubmissionService { statusCode: SUBMISSION_STATUS, effectiveDate?: Date | null, ) { - await this.applicationSubmissionStatusService.setStatusDate( + return await this.applicationSubmissionStatusService.setStatusDate( applicationSubmission.uuid, statusCode, effectiveDate, From b8dd7335acac9a9e36e1a9c9a25f1af77c167d1e Mon Sep 17 00:00:00 2001 From: Liam Stoddard Date: Mon, 24 Jul 2023 11:25:43 -0700 Subject: [PATCH 115/954] updated readme --- bin/migrate-files/README.md | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/bin/migrate-files/README.md b/bin/migrate-files/README.md index 51bb0bd6ce..691a63087d 100644 --- a/bin/migrate-files/README.md +++ b/bin/migrate-files/README.md @@ -2,9 +2,11 @@ This is a Python script for uploading files from the OATS database to the Dell ECS object storage service. -The files are uploaded in the format `/migrate/{application_id}/{document_id}_{filename}` where: +The files are uploaded in the format `/migrate/application||issue||planning_review/{application_id}||{issue_id}||{planning_review_id}/{document_id}_{filename}` where: - `application_id` is the associated OATS application ID +- `issue_id` is the associated OATS issue ID +- `planning_review_id` is the associated OATS planning_review ID - `document_id` is the primary key from the documents table - `filename` is the filename metadata from the documents table @@ -32,10 +34,24 @@ ECS_ACCESS_KEY: Dell ECS access key ECS_SECRET_KEY: Dell ECS secret key These variables can be stored in the .env file. +## Arm64 quirks + +### If running on M1: + +DB_PATH: Path to oracle instant client driver folder +example `DB_PATH=/Users/user/Downloads/instantclient_19_8` + +Force run python in emulation mode and reinstall requirements +`python3-intel64 -m pip install -r requirements.txt` + ## Running the Script To run the script, run the following command: `python migrate-files.py` +M1: + +`python3-intel64 migrate-files.py` + The script will start uploading files from the Oracle database to DELL ECS. The upload progress will be displayed in a progress bar. The script will also save the last uploaded document id, so the upload process can be resumed from where it left off in case of any interruption. From e22e72d78bae45ba8ce9189c67e0a4558811abd8 Mon Sep 17 00:00:00 2001 From: Liam Stoddard Date: Mon, 24 Jul 2023 11:28:01 -0700 Subject: [PATCH 116/954] remove unused files --- bin/migrate-files/app_docs.sql | 72 ----------------------- bin/migrate-files/noi_docs.sql | 104 --------------------------------- 2 files changed, 176 deletions(-) delete mode 100644 bin/migrate-files/app_docs.sql delete mode 100644 bin/migrate-files/noi_docs.sql diff --git a/bin/migrate-files/app_docs.sql b/bin/migrate-files/app_docs.sql deleted file mode 100644 index 15a6592c3a..0000000000 --- a/bin/migrate-files/app_docs.sql +++ /dev/null @@ -1,72 +0,0 @@ -DROP TABLE IF EXISTS oats.alcs_etl_app_docs; - -CREATE TABLE - oats.alcs_etl_app_docs ( - document_id INT, - document_code VARCHAR, - alr_application_id INT, - issue_id INT, - planning_review_id INT, - file_name VARCHAR, - "description" VARCHAR, - document_blob BYTEA, - referenced_in_staff_rpt_ind VARCHAR, - document_source_code VARCHAR, - subject_property_id INT, - publicly_viewable_ind VARCHAR, - app_lg_viewable_ind VARCHAR, - uploaded_date TIMESTAMP, - who_created VARCHAR, - when_created TIMESTAMP, - who_updated VARCHAR, - when_updated TIMESTAMP, - revision_count INT - ); - -INSERT INTO - oats.alcs_etl_app_docs ( - document_id, - document_code, - alr_application_id, - issue_id, - planning_review_id, - file_name, - "description", - document_blob, - referenced_in_staff_rpt_ind, - document_source_code, - subject_property_id, - publicly_viewable_ind, - app_lg_viewable_ind, - uploaded_date, - who_created, - when_created, - who_updated, - when_updated, - revision_count - ) -select - ad.document_id, - ad.document_code, - ad.alr_application_id, - ad.issue_id, - ad.planning_review_id, - ad.file_name, - ad."description", - ad.document_blob, - ad.referenced_in_staff_rpt_ind, - ad.document_source_code, - ad.subject_property_id, - ad.publicly_viewable_ind, - ad.app_lg_viewable_ind, - ad.uploaded_date, - ad.who_created, - ad.when_created, - ad.who_updated, - ad.when_updated, - ad.revision_count -from - oats.alcs_etl_noi_docs nd - right join oats.oats_documents ad on nd.document_id = ad.document_id -where - nd.document_id is null \ No newline at end of file diff --git a/bin/migrate-files/noi_docs.sql b/bin/migrate-files/noi_docs.sql deleted file mode 100644 index c543831a15..0000000000 --- a/bin/migrate-files/noi_docs.sql +++ /dev/null @@ -1,104 +0,0 @@ -DROP TABLE IF EXISTS oats.alcs_etl_noi_docs; - -CREATE TABLE - oats.alcs_etl_noi_docs ( - document_id INT, - document_code VARCHAR, - alr_application_id INT, - issue_id INT, - planning_review_id INT, - file_name VARCHAR, - "description" VARCHAR, - document_blob BYTEA, - referenced_in_staff_rpt_ind VARCHAR, - document_source_code VARCHAR, - subject_property_id INT, - publicly_viewable_ind VARCHAR, - app_lg_viewable_ind VARCHAR, - uploaded_date TIMESTAMP, - who_created VARCHAR, - when_created TIMESTAMP, - who_updated VARCHAR, - when_updated TIMESTAMP, - revision_count INT - ); - -INSERT INTO - oats.alcs_etl_noi_docs ( - document_id, - document_code, - alr_application_id, - issue_id, - planning_review_id, - file_name, - "description", - document_blob, - referenced_in_staff_rpt_ind, - document_source_code, - subject_property_id, - publicly_viewable_ind, - app_lg_viewable_ind, - uploaded_date, - who_created, - when_created, - who_updated, - when_updated, - revision_count - ) -WITH - noi AS ( - SELECT - od.alr_application_id AS app_id, - od.issue_id AS tissue_id - FROM - oats.oats_documents od - WHERE - document_code = 'NOI' - ), - appl AS ( - SELECT - * - FROM - oats.oats_documents od2 - JOIN noi ON od2.alr_application_id = noi.app_id - ), - issue AS ( - SELECT - * - FROM - oats.oats_documents od3 - JOIN noi ON od3.issue_id = noi.tissue_id - ), - noi_docs AS ( - SELECT - * - FROM - appl - UNION - SELECT - * - FROM - issue - ) -SELECT - nd.document_id, - nd.document_code, - nd.alr_application_id, - nd.issue_id, - nd.planning_review_id, - nd.file_name, - nd."description", - nd.document_blob, - nd.referenced_in_staff_rpt_ind, - nd.document_source_code, - nd.subject_property_id, - nd.publicly_viewable_ind, - nd.app_lg_viewable_ind, - nd.uploaded_date, - nd.who_created, - nd.when_created, - nd.who_updated, - nd.when_updated, - nd.revision_count -FROM - noi_docs nd \ No newline at end of file From f919cd04fecd5b2cabb1681ef616828622ab023f Mon Sep 17 00:00:00 2001 From: "to. sandra" <76515860+sandratoh@users.noreply.github.com> Date: Mon, 24 Jul 2023 13:29:12 -0700 Subject: [PATCH 117/954] Add Inclusion form fields to portal and update description (#813) * Create inclusion proposal component and template * Save inclusion proposal fields and document on form edit * Add migration script for inclusion text update * Update inclusion portal frontend test * Fix typo --- .../edit-submission-base.module.ts | 2 + .../edit-submission.component.html | 8 ++ .../edit-submission.component.ts | 5 + .../incl-proposal.component.html | 135 ++++++++++++++++++ .../incl-proposal.component.scss | 0 .../incl-proposal.component.spec.ts | 48 +++++++ .../incl-proposal/incl-proposal.component.ts | 93 ++++++++++++ ...-change_inclusion_legislative_reference.ts | 21 +++ 8 files changed, 312 insertions(+) create mode 100644 portal-frontend/src/app/features/edit-submission/proposal/incl-proposal/incl-proposal.component.html create mode 100644 portal-frontend/src/app/features/edit-submission/proposal/incl-proposal/incl-proposal.component.scss create mode 100644 portal-frontend/src/app/features/edit-submission/proposal/incl-proposal/incl-proposal.component.spec.ts create mode 100644 portal-frontend/src/app/features/edit-submission/proposal/incl-proposal/incl-proposal.component.ts create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1690225882322-change_inclusion_legislative_reference.ts diff --git a/portal-frontend/src/app/features/edit-submission/edit-submission-base.module.ts b/portal-frontend/src/app/features/edit-submission/edit-submission-base.module.ts index 6f0889f931..acea5917c7 100644 --- a/portal-frontend/src/app/features/edit-submission/edit-submission-base.module.ts +++ b/portal-frontend/src/app/features/edit-submission/edit-submission-base.module.ts @@ -25,6 +25,7 @@ import { ParcelEntryComponent } from './parcel-details/parcel-entry/parcel-entry import { ParcelOwnersComponent } from './parcel-details/parcel-owners/parcel-owners.component'; import { PrimaryContactComponent } from './primary-contact/primary-contact.component'; import { ExclProposalComponent } from './proposal/excl-proposal/excl-proposal.component'; +import { InclProposalComponent } from './proposal/incl-proposal/incl-proposal.component'; import { ChangeSubtypeConfirmationDialogComponent } from './proposal/naru-proposal/change-subtype-confirmation-dialog/change-subtype-confirmation-dialog.component'; import { NaruProposalComponent } from './proposal/naru-proposal/naru-proposal.component'; import { NfuProposalComponent } from './proposal/nfu-proposal/nfu-proposal.component'; @@ -68,6 +69,7 @@ import { SelectGovernmentComponent } from './select-government/select-government ChangeSubtypeConfirmationDialogComponent, SoilTableComponent, ExclProposalComponent, + InclProposalComponent, ], imports: [ CommonModule, diff --git a/portal-frontend/src/app/features/edit-submission/edit-submission.component.html b/portal-frontend/src/app/features/edit-submission/edit-submission.component.html index f484aff4db..ce6c77d023 100644 --- a/portal-frontend/src/app/features/edit-submission/edit-submission.component.html +++ b/portal-frontend/src/app/features/edit-submission/edit-submission.component.html @@ -154,6 +154,14 @@
(navigateToStep)="onBeforeSwitchStep($event)" (exit)="onExit()" > +
diff --git a/portal-frontend/src/app/features/edit-submission/edit-submission.component.ts b/portal-frontend/src/app/features/edit-submission/edit-submission.component.ts index 59dfe11d14..5e42bb0b17 100644 --- a/portal-frontend/src/app/features/edit-submission/edit-submission.component.ts +++ b/portal-frontend/src/app/features/edit-submission/edit-submission.component.ts @@ -21,6 +21,7 @@ import { OtherParcelsComponent } from './other-parcels/other-parcels.component'; import { ParcelDetailsComponent } from './parcel-details/parcel-details.component'; import { PrimaryContactComponent } from './primary-contact/primary-contact.component'; import { ExclProposalComponent } from './proposal/excl-proposal/excl-proposal.component'; +import { InclProposalComponent } from './proposal/incl-proposal/incl-proposal.component'; import { NaruProposalComponent } from './proposal/naru-proposal/naru-proposal.component'; import { NfuProposalComponent } from './proposal/nfu-proposal/nfu-proposal.component'; import { PfrsProposalComponent } from './proposal/pfrs-proposal/pfrs-proposal.component'; @@ -75,6 +76,7 @@ export class EditSubmissionComponent implements OnInit, OnDestroy, AfterViewInit @ViewChild(PfrsProposalComponent) pfrsProposalComponent?: PfrsProposalComponent; @ViewChild(NaruProposalComponent) naruProposalComponent?: NaruProposalComponent; @ViewChild(ExclProposalComponent) exclProposalComponent?: ExclProposalComponent; + @ViewChild(InclProposalComponent) inclProposalComponent?: InclProposalComponent; @ViewChild(OtherAttachmentsComponent) otherAttachmentsComponent!: OtherAttachmentsComponent; constructor( @@ -232,6 +234,9 @@ export class EditSubmissionComponent implements OnInit, OnDestroy, AfterViewInit if (this.exclProposalComponent) { await this.exclProposalComponent.onSave(); } + if (this.inclProposalComponent) { + await this.inclProposalComponent.onSave(); + } } async onBeforeSwitchStep(index: number) { diff --git a/portal-frontend/src/app/features/edit-submission/proposal/incl-proposal/incl-proposal.component.html b/portal-frontend/src/app/features/edit-submission/proposal/incl-proposal/incl-proposal.component.html new file mode 100644 index 0000000000..17d3efc0de --- /dev/null +++ b/portal-frontend/src/app/features/edit-submission/proposal/incl-proposal/incl-proposal.component.html @@ -0,0 +1,135 @@ +
+

Proposal

+

+ Considerations are subject to + Section 6 of the ALC Act. +

+

*All fields are required unless stated optional.

+
+ + Please consult the ' + + What the Commission Considers + + ' page of the ALC website for more information. + +
+
+
+ +
Note: 0.01 ha is 100m2
+ + + ha + +
+ warning +
This field is required
+
+
+
+ +
+ Be clear and concise in describing the proposal. Include why you are applying for inclusion and what the + proposal will achieve. +
+ + + + Characters left: {{ 4000 - purposeText.textLength }} +
+ warning +
This field is required
+
+
+
+ + + + + Characters left: {{ 4000 - outsideLandsText.textLength }} +
+ warning +
This field is required
+
+
+
+ +
+ Describe any irrigation, drainage, fencing, material enhancement, clearing, or other improvements that have been + completed, are in progress, or are planned for the subject parcel(s). If there have not been any agricultural + improvements on the parcel(s), please specify "No Agricultural Improvements". +
+ + + +
Example: 40 ha of grazing land fenced in 2010.
+ Characters left: {{ 4000 - outsideLandsText.textLength }} +
+ warning +
This field is required
+
+
+
+ +
A visual representation of your proposal.
+ +
+
+ + +
+ + +
+ + +
+
diff --git a/portal-frontend/src/app/features/edit-submission/proposal/incl-proposal/incl-proposal.component.scss b/portal-frontend/src/app/features/edit-submission/proposal/incl-proposal/incl-proposal.component.scss new file mode 100644 index 0000000000..e69de29bb2 diff --git a/portal-frontend/src/app/features/edit-submission/proposal/incl-proposal/incl-proposal.component.spec.ts b/portal-frontend/src/app/features/edit-submission/proposal/incl-proposal/incl-proposal.component.spec.ts new file mode 100644 index 0000000000..a0b183b23d --- /dev/null +++ b/portal-frontend/src/app/features/edit-submission/proposal/incl-proposal/incl-proposal.component.spec.ts @@ -0,0 +1,48 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { MatDialog } from '@angular/material/dialog'; +import { DeepMocked } from '@golevelup/ts-jest'; +import { BehaviorSubject } from 'rxjs'; +import { InclProposalComponent } from './incl-proposal.component'; +import { ApplicationSubmissionService } from '../../../../services/application-submission/application-submission.service'; +import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; +import { ApplicationSubmissionDetailedDto } from '../../../../services/application-submission/application-submission.dto'; +import { ApplicationDocumentDto } from '../../../../services/application-document/application-document.dto'; + +describe('InclProposalComponent', () => { + let component: InclProposalComponent; + let fixture: ComponentFixture; + let mockApplicationService: DeepMocked; + let mockAppDocumentService: DeepMocked; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + providers: [ + { + provide: ApplicationSubmissionService, + useValue: mockApplicationService, + }, + { + provide: ApplicationDocumentService, + useValue: mockAppDocumentService, + }, + { + provide: MatDialog, + useValue: {}, + }, + ], + declarations: [InclProposalComponent], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(InclProposalComponent); + component = fixture.componentInstance; + component.$applicationSubmission = new BehaviorSubject(undefined); + component.$applicationDocuments = new BehaviorSubject([]); + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/edit-submission/proposal/incl-proposal/incl-proposal.component.ts b/portal-frontend/src/app/features/edit-submission/proposal/incl-proposal/incl-proposal.component.ts new file mode 100644 index 0000000000..6f320455a1 --- /dev/null +++ b/portal-frontend/src/app/features/edit-submission/proposal/incl-proposal/incl-proposal.component.ts @@ -0,0 +1,93 @@ +import { Component, OnDestroy, OnInit } from '@angular/core'; +import { FilesStepComponent } from '../../files-step.partial'; +import { ApplicationSubmissionService } from '../../../../services/application-submission/application-submission.service'; +import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; +import { MatDialog } from '@angular/material/dialog'; +import { FormControl, FormGroup, Validators } from '@angular/forms'; +import { + ApplicationDocumentDto, + DOCUMENT_TYPE, +} from '../../../../services/application-document/application-document.dto'; +import { EditApplicationSteps } from '../../edit-submission.component'; +import { takeUntil } from 'rxjs'; +import { ApplicationSubmissionUpdateDto } from '../../../../services/application-submission/application-submission.dto'; + +@Component({ + selector: 'app-incl-proposal', + templateUrl: './incl-proposal.component.html', + styleUrls: ['./incl-proposal.component.scss'], +}) +export class InclProposalComponent extends FilesStepComponent implements OnInit, OnDestroy { + DOCUMENT = DOCUMENT_TYPE; + + currentStep = EditApplicationSteps.Proposal; + + hectares = new FormControl(null, [Validators.required]); + purpose = new FormControl(null, [Validators.required]); + agSupport = new FormControl(null, [Validators.required]); + improvements = new FormControl(null, [Validators.required]); + + form = new FormGroup({ + hectares: this.hectares, + purpose: this.purpose, + agSupport: this.agSupport, + improvements: this.improvements, + }); + private submissionUuid = ''; + proposalMap: ApplicationDocumentDto[] = []; + + constructor( + private applicationSubmissionService: ApplicationSubmissionService, + applicationDocumentService: ApplicationDocumentService, + dialog: MatDialog + ) { + super(applicationDocumentService, dialog); + } + + ngOnInit(): void { + this.$applicationSubmission.pipe(takeUntil(this.$destroy)).subscribe((applicationSubmission) => { + if (applicationSubmission) { + this.fileId = applicationSubmission.fileNumber; + this.submissionUuid = applicationSubmission.uuid; + + this.form.patchValue({ + hectares: applicationSubmission.inclExclHectares?.toString(), + purpose: applicationSubmission.purpose, + agSupport: applicationSubmission.inclAgricultureSupport, + improvements: applicationSubmission.inclImprovements, + }); + + if (this.showErrors) { + this.form.markAllAsTouched(); + } + } + }); + + this.$applicationDocuments.pipe(takeUntil(this.$destroy)).subscribe((documents) => { + this.proposalMap = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.PROPOSAL_MAP); + }); + } + + async onSave() { + await this.save(); + } + + protected async save() { + if (this.fileId) { + const inclExclHectares = this.hectares.value; + const purpose = this.purpose.value; + const inclAgricultureSupport = this.agSupport.value; + const inclImprovements = this.improvements.value; + + const updateDto: ApplicationSubmissionUpdateDto = { + inclExclHectares: inclExclHectares ? parseFloat(inclExclHectares) : null, + purpose, + inclAgricultureSupport, + inclImprovements, + }; + + const updatedApp = await this.applicationSubmissionService.updatePending(this.submissionUuid, updateDto); + this.$applicationSubmission.next(updatedApp); + } + } +} diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1690225882322-change_inclusion_legislative_reference.ts b/services/apps/alcs/src/providers/typeorm/migrations/1690225882322-change_inclusion_legislative_reference.ts new file mode 100644 index 0000000000..38760fc0be --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1690225882322-change_inclusion_legislative_reference.ts @@ -0,0 +1,21 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class changeInclusionLegislativeReference1690225882322 + implements MigrationInterface +{ + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `UPDATE "alcs"."application_type" SET "html_description"='Choose this option if you are proposing to include land into the Agricultural Land Reserve under + Section 17 of the Agricultural Land Commission Act. + ' WHERE "code"='INCL'`, + ); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `UPDATE "alcs"."application_type" SET "html_description"='Choose this option if you are proposing to include land into the Agricultural Land Reserve under + Section 17(3) of the Agricultural Land Commission Act. + ' WHERE "code"='INCL'`, + ); + } +} From 65bbbaf9dd86c63958d2f8269447b28b4d82cf29 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Mon, 24 Jul 2023 15:40:41 -0700 Subject: [PATCH 118/954] Reduce Network Calls / Loads for Edit Submission * Only save/load the application when components are dirty * Remove logic to auto-save on every step navigation * Add logging to help debug stepper issues --- .../edit-submission.component.html | 2 + .../edit-submission.component.ts | 25 +++++---- .../land-use/land-use.component.ts | 33 +++++++----- .../other-parcels/other-parcels.component.ts | 52 ++++++++++--------- .../parcel-details.component.ts | 40 +++++++------- .../primary-contact.component.ts | 49 ++++++++++------- .../select-government.component.ts | 20 ++++--- .../review-submission.component.ts | 2 +- .../application-submission.service.ts | 6 ++- 9 files changed, 133 insertions(+), 96 deletions(-) diff --git a/portal-frontend/src/app/features/edit-submission/edit-submission.component.html b/portal-frontend/src/app/features/edit-submission/edit-submission.component.html index f484aff4db..3e7250145e 100644 --- a/portal-frontend/src/app/features/edit-submission/edit-submission.component.html +++ b/portal-frontend/src/app/features/edit-submission/edit-submission.component.html @@ -41,6 +41,7 @@
[showErrors]="showValidationErrors" (navigateToStep)="onBeforeSwitchStep($event)" (componentInitialized)="onParcelDetailsInitialized()" + (exit)="onExit()" >
@@ -51,6 +52,7 @@
[showErrors]="showValidationErrors" [$applicationSubmission]="$applicationSubmission" (navigateToStep)="onBeforeSwitchStep($event)" + (exit)="onExit()" >
diff --git a/portal-frontend/src/app/features/edit-submission/edit-submission.component.ts b/portal-frontend/src/app/features/edit-submission/edit-submission.component.ts index 60790c333b..6dfbfba6c9 100644 --- a/portal-frontend/src/app/features/edit-submission/edit-submission.component.ts +++ b/portal-frontend/src/app/features/edit-submission/edit-submission.component.ts @@ -64,7 +64,7 @@ export class EditSubmissionComponent implements OnInit, OnDestroy, AfterViewInit @ViewChild('cdkStepper') public customStepper!: CustomStepperComponent; @ViewChild(ParcelDetailsComponent) parcelDetailsComponent!: ParcelDetailsComponent; - @ViewChild(OtherParcelsComponent) otherParcelsComponent!: OtherAttachmentsComponent; + @ViewChild(OtherParcelsComponent) otherParcelsComponent!: OtherParcelsComponent; @ViewChild(PrimaryContactComponent) primaryContactComponent!: PrimaryContactComponent; @ViewChild(SelectGovernmentComponent) selectGovernmentComponent!: SelectGovernmentComponent; @ViewChild(LandUseComponent) landUseComponent!: LandUseComponent; @@ -109,10 +109,12 @@ export class EditSubmissionComponent implements OnInit, OnDestroy, AfterViewInit } if (stepInd) { + const randomInt = Math.random() * 100; + console.debug(`Setting timeout for navigation ${randomInt}`); // setTimeout is required for stepper to be initialized setTimeout(() => { this.customStepper.navigateToStep(parseInt(stepInd), true); - + console.debug(`Emitted step ${randomInt}`); if (parcelUuid) { this.expandedParcelUuid = parcelUuid; } @@ -133,15 +135,17 @@ export class EditSubmissionComponent implements OnInit, OnDestroy, AfterViewInit } private async loadApplication(fileId: string) { - this.overlayService.showSpinner(); - this.applicationSubmission = await this.applicationSubmissionService.getByFileId(fileId); - const documents = await this.applicationDocumentService.getByFileId(fileId); - if (documents) { - this.$applicationDocuments.next(documents); + if (!this.applicationSubmission) { + this.overlayService.showSpinner(); + this.applicationSubmission = await this.applicationSubmissionService.getByFileId(fileId); + const documents = await this.applicationDocumentService.getByFileId(fileId); + if (documents) { + this.$applicationDocuments.next(documents); + } + this.fileId = fileId; + this.$applicationSubmission.next(this.applicationSubmission); + this.overlayService.hideSpinner(); } - this.fileId = fileId; - this.$applicationSubmission.next(this.applicationSubmission); - this.overlayService.hideSpinner(); } async onApplicationTypeChangeClicked() { @@ -167,6 +171,7 @@ export class EditSubmissionComponent implements OnInit, OnDestroy, AfterViewInit // this gets fired whenever applicant navigates away from edit page async canDeactivate(): Promise> { + console.debug('DEACTIVATING'); await this.saveApplication(this.customStepper.selectedIndex); return of(true); diff --git a/portal-frontend/src/app/features/edit-submission/land-use/land-use.component.ts b/portal-frontend/src/app/features/edit-submission/land-use/land-use.component.ts index ffe5cea54e..6701fb7145 100644 --- a/portal-frontend/src/app/features/edit-submission/land-use/land-use.component.ts +++ b/portal-frontend/src/app/features/edit-submission/land-use/land-use.component.ts @@ -92,20 +92,25 @@ export class LandUseComponent extends StepComponent implements OnInit, OnDestroy } async saveProgress() { - const formValues = this.landUseForm.getRawValue(); - await this.applicationService.updatePending(this.submissionUuid, { - parcelsAgricultureDescription: formValues.parcelsAgricultureDescription, - parcelsAgricultureImprovementDescription: formValues.parcelsAgricultureImprovementDescription, - parcelsNonAgricultureUseDescription: formValues.parcelsNonAgricultureUseDescription, - northLandUseType: formValues.northLandUseType, - northLandUseTypeDescription: formValues.northLandUseTypeDescription, - eastLandUseType: formValues.eastLandUseType, - eastLandUseTypeDescription: formValues.eastLandUseTypeDescription, - southLandUseType: formValues.southLandUseType, - southLandUseTypeDescription: formValues.southLandUseTypeDescription, - westLandUseType: formValues.westLandUseType, - westLandUseTypeDescription: formValues.westLandUseTypeDescription, - }); + if (this.landUseForm.dirty) { + const formValues = this.landUseForm.getRawValue(); + const updatedSubmission = await this.applicationService.updatePending(this.submissionUuid, { + parcelsAgricultureDescription: formValues.parcelsAgricultureDescription, + parcelsAgricultureImprovementDescription: formValues.parcelsAgricultureImprovementDescription, + parcelsNonAgricultureUseDescription: formValues.parcelsNonAgricultureUseDescription, + northLandUseType: formValues.northLandUseType, + northLandUseTypeDescription: formValues.northLandUseTypeDescription, + eastLandUseType: formValues.eastLandUseType, + eastLandUseTypeDescription: formValues.eastLandUseTypeDescription, + southLandUseType: formValues.southLandUseType, + southLandUseTypeDescription: formValues.southLandUseTypeDescription, + westLandUseType: formValues.westLandUseType, + westLandUseTypeDescription: formValues.westLandUseTypeDescription, + }); + if (updatedSubmission) { + this.$applicationSubmission.next(updatedSubmission); + } + } } async onSave() { diff --git a/portal-frontend/src/app/features/edit-submission/other-parcels/other-parcels.component.ts b/portal-frontend/src/app/features/edit-submission/other-parcels/other-parcels.component.ts index b576c4b562..0af4fccb8a 100644 --- a/portal-frontend/src/app/features/edit-submission/other-parcels/other-parcels.component.ts +++ b/portal-frontend/src/app/features/edit-submission/other-parcels/other-parcels.component.ts @@ -129,35 +129,37 @@ export class OtherParcelsComponent extends StepComponent implements OnInit, OnDe // replace placeholder uuid with the real one before saving await this.replacePlaceholderParcel(); - // delete all OTHER parcels if user answered 'NO' on 'Is there other parcels in the community' - if (!parseStringToBoolean(this.hasOtherParcelsInCommunity.getRawValue())) { - if (this.otherParcels.some((e) => e.uuid !== PLACE_HOLDER_UUID_FOR_INITIAL_PARCEL)) { - await this.applicationParcelService.deleteMany( - this.otherParcels.filter((e) => e.uuid !== PLACE_HOLDER_UUID_FOR_INITIAL_PARCEL).map((e) => e.uuid) - ); + if (this.parcelEntryChanged) { + // delete all OTHER parcels if user answered 'NO' on 'Is there other parcels in the community' + if (!parseStringToBoolean(this.hasOtherParcelsInCommunity.getRawValue())) { + if (this.otherParcels.some((e) => e.uuid !== PLACE_HOLDER_UUID_FOR_INITIAL_PARCEL)) { + await this.applicationParcelService.deleteMany( + this.otherParcels.filter((e) => e.uuid !== PLACE_HOLDER_UUID_FOR_INITIAL_PARCEL).map((e) => e.uuid) + ); + } + + return; } - return; - } + for (const parcel of this.otherParcels) { + parcelsToUpdate.push({ + uuid: parcel.uuid, + pid: parcel.pid?.toString() || null, + pin: parcel.pin?.toString() || null, + legalDescription: parcel.legalDescription, + civicAddress: parcel.civicAddress, + isFarm: parcel.isFarm, + purchasedDate: parcel.purchasedDate, + mapAreaHectares: parcel.mapAreaHectares, + ownershipTypeCode: parcel.ownershipTypeCode, + crownLandOwnerType: parcel.crownLandOwnerType, + isConfirmedByApplicant: false, + ownerUuids: parcel.owners.map((owner) => owner.uuid), + }); + } - for (const parcel of this.otherParcels) { - parcelsToUpdate.push({ - uuid: parcel.uuid, - pid: parcel.pid?.toString() || null, - pin: parcel.pin?.toString() || null, - legalDescription: parcel.legalDescription, - civicAddress: parcel.civicAddress, - isFarm: parcel.isFarm, - purchasedDate: parcel.purchasedDate, - mapAreaHectares: parcel.mapAreaHectares, - ownershipTypeCode: parcel.ownershipTypeCode, - crownLandOwnerType: parcel.crownLandOwnerType, - isConfirmedByApplicant: false, - ownerUuids: parcel.owners.map((owner) => owner.uuid), - }); + await this.applicationParcelService.update(parcelsToUpdate); } - - await this.applicationParcelService.update(parcelsToUpdate); } async onSave() { diff --git a/portal-frontend/src/app/features/edit-submission/parcel-details/parcel-details.component.ts b/portal-frontend/src/app/features/edit-submission/parcel-details/parcel-details.component.ts index dcc2ee3388..52fb6bbc48 100644 --- a/portal-frontend/src/app/features/edit-submission/parcel-details/parcel-details.component.ts +++ b/portal-frontend/src/app/features/edit-submission/parcel-details/parcel-details.component.ts @@ -31,6 +31,7 @@ export class ParcelDetailsComponent extends StepComponent implements OnInit, Aft parcels: ApplicationParcelDto[] = []; $owners = new BehaviorSubject([]); newParcelAdded = false; + isDirty = false; constructor( private router: Router, @@ -93,6 +94,7 @@ export class ParcelDetailsComponent extends StepComponent implements OnInit, Aft return; } + this.isDirty = true; parcel.pid = formData.pid !== undefined ? formData.pid : parcel.pid; parcel.pin = formData.pid !== undefined ? formData.pin : parcel.pin; parcel.civicAddress = formData.civicAddress !== undefined ? formData.civicAddress : parcel.civicAddress; @@ -113,25 +115,27 @@ export class ParcelDetailsComponent extends StepComponent implements OnInit, Aft } private async saveProgress() { - const parcelsToUpdate: ApplicationParcelUpdateDto[] = []; - for (const parcel of this.parcels) { - parcelsToUpdate.push({ - uuid: parcel.uuid, - pid: parcel.pid?.toString() || null, - pin: parcel.pin?.toString() || null, - civicAddress: parcel.civicAddress ?? null, - legalDescription: parcel.legalDescription, - isFarm: parcel.isFarm, - purchasedDate: parcel.purchasedDate, - mapAreaHectares: parcel.mapAreaHectares, - ownershipTypeCode: parcel.ownershipTypeCode, - isConfirmedByApplicant: parcel.isConfirmedByApplicant, - crownLandOwnerType: parcel.crownLandOwnerType, - ownerUuids: parcel.owners.map((owner) => owner.uuid), - }); + if (this.isDirty || this.newParcelAdded) { + const parcelsToUpdate: ApplicationParcelUpdateDto[] = []; + for (const parcel of this.parcels) { + parcelsToUpdate.push({ + uuid: parcel.uuid, + pid: parcel.pid?.toString() || null, + pin: parcel.pin?.toString() || null, + civicAddress: parcel.civicAddress ?? null, + legalDescription: parcel.legalDescription, + isFarm: parcel.isFarm, + purchasedDate: parcel.purchasedDate, + mapAreaHectares: parcel.mapAreaHectares, + ownershipTypeCode: parcel.ownershipTypeCode, + isConfirmedByApplicant: parcel.isConfirmedByApplicant, + crownLandOwnerType: parcel.crownLandOwnerType, + ownerUuids: parcel.owners.map((owner) => owner.uuid), + }); + } + await this.applicationParcelService.update(parcelsToUpdate); + //TODO: Do we need to reload submission? } - - await this.applicationParcelService.update(parcelsToUpdate); } async onSave() { diff --git a/portal-frontend/src/app/features/edit-submission/primary-contact/primary-contact.component.ts b/portal-frontend/src/app/features/edit-submission/primary-contact/primary-contact.component.ts index 71d0d984a6..5993e5c9c3 100644 --- a/portal-frontend/src/app/features/edit-submission/primary-contact/primary-contact.component.ts +++ b/portal-frontend/src/app/features/edit-submission/primary-contact/primary-contact.component.ts @@ -31,6 +31,7 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni isCrownOwner = false; isLocalGovernmentUser = false; governmentName: string | undefined; + isDirty = false; firstName = new FormControl('', [Validators.required]); lastName = new FormControl('', [Validators.required]); @@ -94,6 +95,7 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni } onSelectOwner(uuid: string) { + this.isDirty = true; this.selectedOwnerUuid = uuid; const selectedOwner = this.parcelOwners.find((owner) => owner.uuid === uuid); this.parcelOwners = this.parcelOwners.map((owner) => ({ @@ -152,29 +154,37 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni } protected async save() { - let selectedOwner: ApplicationOwnerDto | undefined = this.owners.find( - (owner) => owner.uuid === this.selectedOwnerUuid - ); + if (this.isDirty || this.form.dirty) { + let selectedOwner: ApplicationOwnerDto | undefined = this.owners.find( + (owner) => owner.uuid === this.selectedOwnerUuid + ); - if (this.selectedThirdPartyAgent || this.selectedLocalGovernment) { - await this.applicationOwnerService.setPrimaryContact({ - applicationSubmissionUuid: this.submissionUuid, - organization: this.organizationName.getRawValue() ?? '', - firstName: this.firstName.getRawValue() ?? '', - lastName: this.lastName.getRawValue() ?? '', - email: this.email.getRawValue() ?? '', - phoneNumber: this.phoneNumber.getRawValue() ?? '', - ownerUuid: selectedOwner?.uuid, - type: this.selectedThirdPartyAgent ? APPLICATION_OWNER.AGENT : APPLICATION_OWNER.GOVERNMENT, - }); - } else if (selectedOwner) { - await this.applicationOwnerService.setPrimaryContact({ - applicationSubmissionUuid: this.submissionUuid, - ownerUuid: selectedOwner.uuid, - }); + if (this.selectedThirdPartyAgent || this.selectedLocalGovernment) { + await this.applicationOwnerService.setPrimaryContact({ + applicationSubmissionUuid: this.submissionUuid, + organization: this.organizationName.getRawValue() ?? '', + firstName: this.firstName.getRawValue() ?? '', + lastName: this.lastName.getRawValue() ?? '', + email: this.email.getRawValue() ?? '', + phoneNumber: this.phoneNumber.getRawValue() ?? '', + ownerUuid: selectedOwner?.uuid, + type: this.selectedThirdPartyAgent ? APPLICATION_OWNER.AGENT : APPLICATION_OWNER.GOVERNMENT, + }); + } else if (selectedOwner) { + await this.applicationOwnerService.setPrimaryContact({ + applicationSubmissionUuid: this.submissionUuid, + ownerUuid: selectedOwner.uuid, + }); + } + await this.reloadApplication(); } } + private async reloadApplication() { + const application = await this.applicationService.getByUuid(this.submissionUuid); + this.$applicationSubmission.next(application); + } + private async loadOwners(submissionUuid: string, primaryContactOwnerUuid?: string) { const owners = await this.applicationOwnerService.fetchBySubmissionId(submissionUuid); if (owners) { @@ -215,6 +225,7 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni if (this.showErrors) { this.form.markAllAsTouched(); } + this.isDirty = false; } } diff --git a/portal-frontend/src/app/features/edit-submission/select-government/select-government.component.ts b/portal-frontend/src/app/features/edit-submission/select-government/select-government.component.ts index 830d2a8ae5..9acdf56fd4 100644 --- a/portal-frontend/src/app/features/edit-submission/select-government/select-government.component.ts +++ b/portal-frontend/src/app/features/edit-submission/select-government/select-government.component.ts @@ -26,6 +26,7 @@ export class SelectGovernmentComponent extends StepComponent implements OnInit, selectGovernmentUuid = ''; localGovernments: LocalGovernmentDto[] = []; filteredLocalGovernments!: Observable; + isDirty = false; form = new FormGroup({ localGovernment: this.localGovernment, @@ -58,6 +59,7 @@ export class SelectGovernmentComponent extends StepComponent implements OnInit, } onChange($event: MatAutocompleteSelectedEvent) { + this.isDirty = true; const localGovernmentName = $event.option.value; if (localGovernmentName) { const localGovernment = this.localGovernments.find((lg) => lg.name == localGovernmentName); @@ -95,15 +97,19 @@ export class SelectGovernmentComponent extends StepComponent implements OnInit, } private async save() { - const localGovernmentName = this.localGovernment.getRawValue(); - if (localGovernmentName) { - const localGovernment = this.localGovernments.find((lg) => lg.name == localGovernmentName); + if (this.isDirty) { + const localGovernmentName = this.localGovernment.getRawValue(); + if (localGovernmentName) { + const localGovernment = this.localGovernments.find((lg) => lg.name == localGovernmentName); - if (localGovernment) { - await this.applicationSubmissionService.updatePending(this.submissionUuid, { - localGovernmentUuid: localGovernment.uuid, - }); + if (localGovernment) { + const res = await this.applicationSubmissionService.updatePending(this.submissionUuid, { + localGovernmentUuid: localGovernment.uuid, + }); + this.$applicationSubmission.next(res); + } } + this.isDirty = false; } } diff --git a/portal-frontend/src/app/features/review-submission/review-submission.component.ts b/portal-frontend/src/app/features/review-submission/review-submission.component.ts index f5ba423738..dc6a512380 100644 --- a/portal-frontend/src/app/features/review-submission/review-submission.component.ts +++ b/portal-frontend/src/app/features/review-submission/review-submission.component.ts @@ -97,7 +97,7 @@ export class ReviewSubmissionComponent implements OnInit, OnDestroy { // setTimeout is required for stepper to be initialized setTimeout(() => { const stepInt = parseInt(stepInd); - this.customStepper.navigateToStep(stepInt, true); + //this.customStepper.navigateToStep(stepInt, true); this.showDownloadPdf = this.isFirstNationGovernment ? stepInt === ReviewApplicationFngSteps.ReviewAndSubmitFng diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.service.ts b/services/apps/alcs/src/portal/application-submission/application-submission.service.ts index b87504f608..db0be19151 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.service.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.service.ts @@ -154,8 +154,10 @@ export class ApplicationSubmissionService { const applicationSubmission = await this.getOrFailByUuid(submissionUuid); applicationSubmission.applicant = updateDto.applicant; - applicationSubmission.purpose = - updateDto.purpose || applicationSubmission.purpose; + applicationSubmission.purpose = filterUndefined( + updateDto.purpose, + applicationSubmission.purpose, + ); applicationSubmission.typeCode = updateDto.typeCode || applicationSubmission.typeCode; applicationSubmission.localGovernmentUuid = updateDto.localGovernmentUuid; From 5492018a12e3b9d2de4f5b36a36cdbf41c0cb13d Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Mon, 24 Jul 2023 16:41:50 -0700 Subject: [PATCH 119/954] Copy over TempID when re-mapping and simplify filter logic * Copy over temp ID when we re-map components so that we can easily filter using TempID whenever their inputs change. --- .../decision-condition.component.ts | 1 + .../decision-conditions.component.ts | 24 +++++++------------ .../application-decision-v2.dto.ts | 2 +- 3 files changed, 10 insertions(+), 17 deletions(-) diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-condition/decision-condition.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-condition/decision-condition.component.ts index 1cf99cb340..fc566f39e6 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-condition/decision-condition.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-condition/decision-condition.component.ts @@ -67,6 +67,7 @@ export class DecisionConditionComponent implements OnInit, OnChanges { .map((e) => ({ componentDecisionUuid: e.decisionUuid, componentToConditionType: e.code, + tempId: e.tempId, })); this.dataChange.emit({ diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-conditions.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-conditions.component.ts index 0bf0b99623..631a758310 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-conditions.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-conditions.component.ts @@ -117,24 +117,15 @@ export class DecisionConditionsComponent implements OnInit, OnChanges, OnDestroy this.decision.resolutionYear ); this.selectableComponents = [...this.allComponents, ...updatedComponents]; + const validComponentIds = this.selectableComponents.map((component) => component.tempId); this.mappedConditions = this.mappedConditions.map((condition) => { - const selectedComponents = this.selectableComponents - .filter((component) => - condition.componentsToCondition - ?.map((conditionComponent) => conditionComponent.tempId) - .includes(component.tempId) - ) - .map((e) => ({ - componentDecisionUuid: e.decisionUuid, - componentToConditionType: e.code, - tempId: e.tempId, - })); - - return { - ...condition, - componentsToCondition: selectedComponents, - }; + if (condition.componentsToCondition) { + condition.componentsToCondition = condition.componentsToCondition.filter((component) => + validComponentIds.includes(component.tempId) + ); + } + return condition; }); this.onChanges(); } @@ -155,6 +146,7 @@ export class DecisionConditionsComponent implements OnInit, OnChanges, OnDestroy componentDecisionUuid: e.decisionUuid, componentToConditionType: e.code, tempId: e.tempId, + uuid: e.uuid, })); return { diff --git a/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-v2.dto.ts b/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-v2.dto.ts index da363fc6d8..40183d8d27 100644 --- a/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-v2.dto.ts +++ b/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-v2.dto.ts @@ -203,7 +203,7 @@ export interface ApplicationDecisionConditionDto { export interface ComponentToCondition { componentDecisionUuid?: string; componentToConditionType?: string; - tempId?: string; + tempId: string; } export interface UpdateApplicationDecisionConditionDto { uuid?: string; From 1380ebe009fdb39e51a28acca669368e2eaf0926 Mon Sep 17 00:00:00 2001 From: Liam Stoddard Date: Mon, 24 Jul 2023 16:43:00 -0700 Subject: [PATCH 120/954] changed to functions --- bin/migrate-files/migrate-files.py | 384 +++++++++++++++-------------- 1 file changed, 196 insertions(+), 188 deletions(-) diff --git a/bin/migrate-files/migrate-files.py b/bin/migrate-files/migrate-files.py index edb46e8745..92a04ff354 100644 --- a/bin/migrate-files/migrate-files.py +++ b/bin/migrate-files/migrate-files.py @@ -5,6 +5,188 @@ from tqdm import tqdm import pickle +def application_docs(starting_document_id,batch): + # Get total number of files + try: + cursor.execute ('SELECT COUNT(*) FROM OATS.OATS_DOCUMENTS WHERE dbms_lob.getLength(DOCUMENT_BLOB) > 0 AND ALR_APPLICATION_ID IS NOT NULL') + except cx_Oracle.Error as e: + error, = e.args + print(error.message) + + application_count = cursor.fetchone()[0] + print('Count =', application_count) + + # # Execute the SQL query to retrieve the BLOB data and key column + cursor.execute(f""" + SELECT DOCUMENT_ID, ALR_APPLICATION_ID, FILE_NAME, DOCUMENT_BLOB, DOCUMENT_CODE, DESCRIPTION, DOCUMENT_SOURCE_CODE, UPLOADED_DATE, WHEN_UPDATED, REVISION_COUNT, dbms_lob.getLength(DOCUMENT_BLOB) as LENGTH + FROM OATS.OATS_DOCUMENTS + WHERE dbms_lob.getLength(DOCUMENT_BLOB) > 0 + AND DOCUMENT_ID > {starting_document_id} + AND ALR_APPLICATION_ID IS NOT NULL + ORDER BY DOCUMENT_ID ASC + """) + + # Set the batch size + BATCH_SIZE = batch + + # Track progress + documents_processed = 0 + last_document_id = 0 + + try: + with tqdm(total=application_count, unit="file", desc="Uploading files to S3") as pbar: + while True: + # Fetch the next batch of BLOB data + data = cursor.fetchmany(BATCH_SIZE) + if not data: + break + # Upload the batch to S3 with a progress bar + for document_id, application_id, filename, file, code, description, source, created, updated, revision, length in data: + tqdm.write(f"{application_id}/{document_id}_{filename}") + + with tqdm(total=length, unit="B", unit_scale=True, desc=filename) as pbar2: + s3.upload_fileobj(file, ecs_bucket, f"migrate/application/{application_id}/{document_id}_{filename}", + Callback=lambda bytes_transferred: pbar2.update(bytes_transferred),) + pbar.update(1) + last_document_id = document_id + documents_processed += 1 + + except Exception as e: + print("Something went wrong:",e) + print("Processed", documents_processed, "files") + + # Set resume status in case of interuption + with open('last-file.pickle', 'wb') as file: + pickle.dump(last_document_id, file) + + cursor.close() + conn.close() + exit() + + # Display results + print("Process complete: Successfully migrated", documents_processed, "files.") + +def planning_docs(starting_planning_document_id,batch): + # Get total number of files + try: + cursor.execute ('SELECT COUNT(*) FROM OATS.OATS_DOCUMENTS WHERE dbms_lob.getLength(DOCUMENT_BLOB) > 0 AND PLANNING_REVIEW_ID IS NOT NULL') + except cx_Oracle.Error as e: + error, = e.args + print(error.message) + + planning_review_count = cursor.fetchone()[0] + print('Count =', planning_review_count) + + # # Execute the SQL query to retrieve the BLOB data and key column + cursor.execute(f""" + SELECT DOCUMENT_ID, PLANNING_REVIEW_ID, FILE_NAME, DOCUMENT_BLOB, DOCUMENT_CODE, DESCRIPTION, DOCUMENT_SOURCE_CODE, UPLOADED_DATE, WHEN_UPDATED, REVISION_COUNT, dbms_lob.getLength(DOCUMENT_BLOB) as LENGTH + FROM OATS.OATS_DOCUMENTS + WHERE dbms_lob.getLength(DOCUMENT_BLOB) > 0 + AND DOCUMENT_ID > {starting_planning_document_id} + AND PLANNING_REVIEW_ID IS NOT NULL + ORDER BY DOCUMENT_ID ASC + """) + + # Set the batch size + BATCH_SIZE = batch + + # Track progress + documents_processed = 0 + last_planning_document_id = 0 + + try: + with tqdm(total=planning_review_count, unit="file", desc="Uploading files to S3") as pbar: + while True: + # Fetch the next batch of BLOB data + data = cursor.fetchmany(BATCH_SIZE) + if not data: + break + # Upload the batch to S3 with a progress bar + for document_id, planning_review_id, filename, file, code, description, source, created, updated, revision, length in data: + tqdm.write(f"{planning_review_id}/{document_id}_{filename}") + + with tqdm(total=length, unit="B", unit_scale=True, desc=filename) as pbar2: + s3.upload_fileobj(file, ecs_bucket, f"migrate/planning_review/{planning_review_id}/{document_id}_{filename}", + Callback=lambda bytes_transferred: pbar2.update(bytes_transferred),) + pbar.update(1) + last_planning_document_id = document_id + documents_processed += 1 + + except Exception as e: + print("Something went wrong:",e) + print("Processed", documents_processed, "files") + + # Set resume status in case of interuption + with open('last-planning-file.pickle', 'wb') as file: + pickle.dump(last_planning_document_id, file) + + cursor.close() + conn.close() + exit() + + # Display results + print("Process complete: Successfully migrated", documents_processed, "files.") + +def issue_docs(starting_issue_document_id,batch): + # Get total number of files + try: + cursor.execute ('SELECT COUNT(*) FROM OATS.OATS_DOCUMENTS WHERE dbms_lob.getLength(DOCUMENT_BLOB) > 0 AND ISSUE_ID IS NOT NULL') + except cx_Oracle.Error as e: + error, = e.args + print(error.message) + + issue_count = cursor.fetchone()[0] + print('Count =', issue_count) + + # # Execute the SQL query to retrieve the BLOB data and key column + cursor.execute(f""" + SELECT DOCUMENT_ID, ISSUE_ID, FILE_NAME, DOCUMENT_BLOB, DOCUMENT_CODE, DESCRIPTION, DOCUMENT_SOURCE_CODE, UPLOADED_DATE, WHEN_UPDATED, REVISION_COUNT, dbms_lob.getLength(DOCUMENT_BLOB) as LENGTH + FROM OATS.OATS_DOCUMENTS + WHERE dbms_lob.getLength(DOCUMENT_BLOB) > 0 + AND DOCUMENT_ID > {starting_issue_document_id} + AND ISSUE_ID IS NOT NULL + ORDER BY DOCUMENT_ID ASC + """) + + # Set the batch size + BATCH_SIZE = batch + + # Track progress + documents_processed = 0 + last_issue_document_id = 0 + + try: + with tqdm(total=issue_count, unit="file", desc="Uploading files to S3") as pbar: + while True: + # Fetch the next batch of BLOB data + data = cursor.fetchmany(BATCH_SIZE) + if not data: + break + # Upload the batch to S3 with a progress bar + for document_id, issue_id, filename, file, code, description, source, created, updated, revision, length in data: + tqdm.write(f"{issue_id}/{document_id}_{filename}") + + with tqdm(total=length, unit="B", unit_scale=True, desc=filename) as pbar2: + s3.upload_fileobj(file, ecs_bucket, f"migrate/issue/{issue_id}/{document_id}_{filename}", + Callback=lambda bytes_transferred: pbar2.update(bytes_transferred),) + pbar.update(1) + last_issue_document_id = document_id + documents_processed += 1 + + except Exception as e: + print("Something went wrong:",e) + print("Processed", documents_processed, "files") + + # Set resume status in case of interuption + with open('last-issue-file.pickle', 'wb') as file: + pickle.dump(last_issue_document_id, file) + + cursor.close() + conn.close() + exit() + + # Display results + print("Process complete: Successfully migrated", documents_processed, "files.") # Load environment variables from .env file load_dotenv() @@ -41,208 +223,34 @@ with open('last-file.pickle', 'rb') as file: starting_document_id = pickle.load(file) -print('Starting applications from:', starting_document_id) - starting_planning_document_id = 0 # Determine job resume status if os.path.isfile('last-planning-file.pickle'): with open('last-planning-file.pickle', 'rb') as file: starting_planning_document_id = pickle.load(file) - #ignore imported files before failure - starting_document_id = 999999 - -print('Starting planning_review from:', starting_planning_document_id) + print('Starting planning_review from:', starting_planning_document_id) starting_issue_document_id = 0 # Determine job resume status if os.path.isfile('last-issue-file.pickle'): with open('last-issue-file.pickle', 'rb') as file: starting_issue_document_id = pickle.load(file) - #ignore imported files before failure - starting_document_id = 999999 - starting_planning_document_id = 999999 -print('Starting issues from:', starting_issue_document_id) - -# Get total number of files + print('Starting issues from:', starting_issue_document_id) cursor = conn.cursor() -try: - cursor.execute ('SELECT COUNT(*) FROM OATS.OATS_DOCUMENTS WHERE dbms_lob.getLength(DOCUMENT_BLOB) > 0 AND ALR_APPLICATION_ID IS NOT NULL') -except cx_Oracle.Error as e: - error, = e.args - print(error.message) - -application_count = cursor.fetchone()[0] -print('Count =', application_count) - -# # Execute the SQL query to retrieve the BLOB data and key column -cursor.execute(f""" -SELECT DOCUMENT_ID, ALR_APPLICATION_ID, FILE_NAME, DOCUMENT_BLOB, DOCUMENT_CODE, DESCRIPTION, DOCUMENT_SOURCE_CODE, UPLOADED_DATE, WHEN_UPDATED, REVISION_COUNT, dbms_lob.getLength(DOCUMENT_BLOB) as LENGTH -FROM OATS.OATS_DOCUMENTS -WHERE dbms_lob.getLength(DOCUMENT_BLOB) > 0 -AND DOCUMENT_ID > {starting_document_id} -AND ALR_APPLICATION_ID IS NOT NULL -ORDER BY DOCUMENT_ID ASC -""") - -# Set the batch size -BATCH_SIZE = 10 - -# Track progress -documents_processed = 0 -last_document_id = 0 - -try: - with tqdm(total=application_count, unit="file", desc="Uploading files to S3") as pbar: - while True: - # Fetch the next batch of BLOB data - data = cursor.fetchmany(BATCH_SIZE) - if not data: - break - # Upload the batch to S3 with a progress bar - for document_id, application_id, filename, file, code, description, source, created, updated, revision, length in data: - tqdm.write(f"{application_id}/{document_id}_{filename}") - - with tqdm(total=length, unit="B", unit_scale=True, desc=filename) as pbar2: - s3.upload_fileobj(file, ecs_bucket, f"migrate/application/{application_id}/{document_id}_{filename}", - Callback=lambda bytes_transferred: pbar2.update(bytes_transferred),) - pbar.update(1) - last_document_id = document_id - documents_processed += 1 - -except Exception as e: - print("Something went wrong:",e) - print("Processed", documents_processed, "files") - - # Set resume status in case of interuption - with open('last-file.pickle', 'wb') as file: - pickle.dump(last_document_id, file) - - cursor.close() - conn.close() - exit() - -# Display results -print("Process complete: Successfully migrated", documents_processed, "files.") - -try: - cursor.execute ('SELECT COUNT(*) FROM OATS.OATS_DOCUMENTS WHERE dbms_lob.getLength(DOCUMENT_BLOB) > 0 AND PLANNING_REVIEW_ID IS NOT NULL') -except cx_Oracle.Error as e: - error, = e.args - print(error.message) - -planning_review_count = cursor.fetchone()[0] -print('Count =', planning_review_count) - -# # Execute the SQL query to retrieve the BLOB data and key column -cursor.execute(f""" -SELECT DOCUMENT_ID, PLANNING_REVIEW_ID, FILE_NAME, DOCUMENT_BLOB, DOCUMENT_CODE, DESCRIPTION, DOCUMENT_SOURCE_CODE, UPLOADED_DATE, WHEN_UPDATED, REVISION_COUNT, dbms_lob.getLength(DOCUMENT_BLOB) as LENGTH -FROM OATS.OATS_DOCUMENTS -WHERE dbms_lob.getLength(DOCUMENT_BLOB) > 0 -AND DOCUMENT_ID > {starting_planning_document_id} -AND PLANNING_REVIEW_ID IS NOT NULL -ORDER BY DOCUMENT_ID ASC -""") - -# Set the batch size -BATCH_SIZE = 10 - -# Track progress -documents_processed = 0 -last_planning_document_id = 0 - -try: - with tqdm(total=planning_review_count, unit="file", desc="Uploading files to S3") as pbar: - while True: - # Fetch the next batch of BLOB data - data = cursor.fetchmany(BATCH_SIZE) - if not data: - break - # Upload the batch to S3 with a progress bar - for document_id, planning_review_id, filename, file, code, description, source, created, updated, revision, length in data: - tqdm.write(f"{planning_review_id}/{document_id}_{filename}") - - with tqdm(total=length, unit="B", unit_scale=True, desc=filename) as pbar2: - s3.upload_fileobj(file, ecs_bucket, f"migrate/planning_review/{planning_review_id}/{document_id}_{filename}", - Callback=lambda bytes_transferred: pbar2.update(bytes_transferred),) - pbar.update(1) - last_planning_document_id = document_id - documents_processed += 1 - -except Exception as e: - print("Something went wrong:",e) - print("Processed", documents_processed, "files") - - # Set resume status in case of interuption - with open('last-planning-file.pickle', 'wb') as file: - pickle.dump(last_planning_document_id, file) - - cursor.close() - conn.close() - exit() - -# Display results -print("Process complete: Successfully migrated", documents_processed, "files.") - -try: - cursor.execute ('SELECT COUNT(*) FROM OATS.OATS_DOCUMENTS WHERE dbms_lob.getLength(DOCUMENT_BLOB) > 0 AND ISSUE_ID IS NOT NULL') -except cx_Oracle.Error as e: - error, = e.args - print(error.message) - -issue_count = cursor.fetchone()[0] -print('Count =', issue_count) - -# # Execute the SQL query to retrieve the BLOB data and key column -cursor.execute(f""" -SELECT DOCUMENT_ID, ISSUE_ID, FILE_NAME, DOCUMENT_BLOB, DOCUMENT_CODE, DESCRIPTION, DOCUMENT_SOURCE_CODE, UPLOADED_DATE, WHEN_UPDATED, REVISION_COUNT, dbms_lob.getLength(DOCUMENT_BLOB) as LENGTH -FROM OATS.OATS_DOCUMENTS -WHERE dbms_lob.getLength(DOCUMENT_BLOB) > 0 -AND DOCUMENT_ID > {starting_issue_document_id} -AND ISSUE_ID IS NOT NULL -ORDER BY DOCUMENT_ID ASC -""") - -# Set the batch size -BATCH_SIZE = 10 - -# Track progress -documents_processed = 0 -last_issue_document_id = 0 - -try: - with tqdm(total=issue_count, unit="file", desc="Uploading files to S3") as pbar: - while True: - # Fetch the next batch of BLOB data - data = cursor.fetchmany(BATCH_SIZE) - if not data: - break - # Upload the batch to S3 with a progress bar - for document_id, issue_id, filename, file, code, description, source, created, updated, revision, length in data: - tqdm.write(f"{issue_id}/{document_id}_{filename}") - - with tqdm(total=length, unit="B", unit_scale=True, desc=filename) as pbar2: - s3.upload_fileobj(file, ecs_bucket, f"migrate/issue/{issue_id}/{document_id}_{filename}", - Callback=lambda bytes_transferred: pbar2.update(bytes_transferred),) - pbar.update(1) - last_issue_document_id = document_id - documents_processed += 1 - -except Exception as e: - print("Something went wrong:",e) - print("Processed", documents_processed, "files") - - # Set resume status in case of interuption - with open('last-issue-file.pickle', 'wb') as file: - pickle.dump(last_issue_document_id, file) - - cursor.close() - conn.close() - exit() - -# Display results -print("Process complete: Successfully migrated", documents_processed, "files.") +batch_size = 10 + +if starting_issue_document_id > 0: + issue_docs(starting_issue_document_id,batch_size) +elif starting_planning_document_id > 0: + planning_docs(starting_planning_document_id,batch_size) + issue_docs(0,batch_size) +else: + print('Starting applications from:', starting_document_id) + application_docs(starting_document_id,batch_size) + planning_docs(0,batch_size) + issue_docs(0,batch_size) # Close the database cursor and connection cursor.close() From 22a72d4452ade3ecab8e5101fd7318191c7af066 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Mon, 24 Jul 2023 16:35:09 -0700 Subject: [PATCH 121/954] Revert "Merge pull request #814 from bcgov/feature/ALCS-937" This reverts commit db38f88a6e23a6647a347a13d304b0f755defeef. --- .../edit-submission.component.html | 2 - .../edit-submission.component.ts | 25 ++++----- .../land-use/land-use.component.ts | 33 +++++------- .../other-parcels/other-parcels.component.ts | 52 +++++++++---------- .../parcel-details.component.ts | 40 +++++++------- .../primary-contact.component.ts | 49 +++++++---------- .../select-government.component.ts | 20 +++---- .../review-submission.component.ts | 2 +- .../application-submission.service.ts | 6 +-- 9 files changed, 96 insertions(+), 133 deletions(-) diff --git a/portal-frontend/src/app/features/edit-submission/edit-submission.component.html b/portal-frontend/src/app/features/edit-submission/edit-submission.component.html index 704d34ef5f..ce6c77d023 100644 --- a/portal-frontend/src/app/features/edit-submission/edit-submission.component.html +++ b/portal-frontend/src/app/features/edit-submission/edit-submission.component.html @@ -41,7 +41,6 @@
[showErrors]="showValidationErrors" (navigateToStep)="onBeforeSwitchStep($event)" (componentInitialized)="onParcelDetailsInitialized()" - (exit)="onExit()" >
@@ -52,7 +51,6 @@
[showErrors]="showValidationErrors" [$applicationSubmission]="$applicationSubmission" (navigateToStep)="onBeforeSwitchStep($event)" - (exit)="onExit()" >
diff --git a/portal-frontend/src/app/features/edit-submission/edit-submission.component.ts b/portal-frontend/src/app/features/edit-submission/edit-submission.component.ts index d77fe68f2b..5e42bb0b17 100644 --- a/portal-frontend/src/app/features/edit-submission/edit-submission.component.ts +++ b/portal-frontend/src/app/features/edit-submission/edit-submission.component.ts @@ -64,7 +64,7 @@ export class EditSubmissionComponent implements OnInit, OnDestroy, AfterViewInit @ViewChild('cdkStepper') public customStepper!: CustomStepperComponent; @ViewChild(ParcelDetailsComponent) parcelDetailsComponent!: ParcelDetailsComponent; - @ViewChild(OtherParcelsComponent) otherParcelsComponent!: OtherParcelsComponent; + @ViewChild(OtherParcelsComponent) otherParcelsComponent!: OtherAttachmentsComponent; @ViewChild(PrimaryContactComponent) primaryContactComponent!: PrimaryContactComponent; @ViewChild(SelectGovernmentComponent) selectGovernmentComponent!: SelectGovernmentComponent; @ViewChild(LandUseComponent) landUseComponent!: LandUseComponent; @@ -111,12 +111,10 @@ export class EditSubmissionComponent implements OnInit, OnDestroy, AfterViewInit } if (stepInd) { - const randomInt = Math.random() * 100; - console.debug(`Setting timeout for navigation ${randomInt}`); // setTimeout is required for stepper to be initialized setTimeout(() => { this.customStepper.navigateToStep(parseInt(stepInd), true); - console.debug(`Emitted step ${randomInt}`); + if (parcelUuid) { this.expandedParcelUuid = parcelUuid; } @@ -137,17 +135,15 @@ export class EditSubmissionComponent implements OnInit, OnDestroy, AfterViewInit } private async loadApplication(fileId: string) { - if (!this.applicationSubmission) { - this.overlayService.showSpinner(); - this.applicationSubmission = await this.applicationSubmissionService.getByFileId(fileId); - const documents = await this.applicationDocumentService.getByFileId(fileId); - if (documents) { - this.$applicationDocuments.next(documents); - } - this.fileId = fileId; - this.$applicationSubmission.next(this.applicationSubmission); - this.overlayService.hideSpinner(); + this.overlayService.showSpinner(); + this.applicationSubmission = await this.applicationSubmissionService.getByFileId(fileId); + const documents = await this.applicationDocumentService.getByFileId(fileId); + if (documents) { + this.$applicationDocuments.next(documents); } + this.fileId = fileId; + this.$applicationSubmission.next(this.applicationSubmission); + this.overlayService.hideSpinner(); } async onApplicationTypeChangeClicked() { @@ -173,7 +169,6 @@ export class EditSubmissionComponent implements OnInit, OnDestroy, AfterViewInit // this gets fired whenever applicant navigates away from edit page async canDeactivate(): Promise> { - console.debug('DEACTIVATING'); await this.saveApplication(this.customStepper.selectedIndex); return of(true); diff --git a/portal-frontend/src/app/features/edit-submission/land-use/land-use.component.ts b/portal-frontend/src/app/features/edit-submission/land-use/land-use.component.ts index 6701fb7145..ffe5cea54e 100644 --- a/portal-frontend/src/app/features/edit-submission/land-use/land-use.component.ts +++ b/portal-frontend/src/app/features/edit-submission/land-use/land-use.component.ts @@ -92,25 +92,20 @@ export class LandUseComponent extends StepComponent implements OnInit, OnDestroy } async saveProgress() { - if (this.landUseForm.dirty) { - const formValues = this.landUseForm.getRawValue(); - const updatedSubmission = await this.applicationService.updatePending(this.submissionUuid, { - parcelsAgricultureDescription: formValues.parcelsAgricultureDescription, - parcelsAgricultureImprovementDescription: formValues.parcelsAgricultureImprovementDescription, - parcelsNonAgricultureUseDescription: formValues.parcelsNonAgricultureUseDescription, - northLandUseType: formValues.northLandUseType, - northLandUseTypeDescription: formValues.northLandUseTypeDescription, - eastLandUseType: formValues.eastLandUseType, - eastLandUseTypeDescription: formValues.eastLandUseTypeDescription, - southLandUseType: formValues.southLandUseType, - southLandUseTypeDescription: formValues.southLandUseTypeDescription, - westLandUseType: formValues.westLandUseType, - westLandUseTypeDescription: formValues.westLandUseTypeDescription, - }); - if (updatedSubmission) { - this.$applicationSubmission.next(updatedSubmission); - } - } + const formValues = this.landUseForm.getRawValue(); + await this.applicationService.updatePending(this.submissionUuid, { + parcelsAgricultureDescription: formValues.parcelsAgricultureDescription, + parcelsAgricultureImprovementDescription: formValues.parcelsAgricultureImprovementDescription, + parcelsNonAgricultureUseDescription: formValues.parcelsNonAgricultureUseDescription, + northLandUseType: formValues.northLandUseType, + northLandUseTypeDescription: formValues.northLandUseTypeDescription, + eastLandUseType: formValues.eastLandUseType, + eastLandUseTypeDescription: formValues.eastLandUseTypeDescription, + southLandUseType: formValues.southLandUseType, + southLandUseTypeDescription: formValues.southLandUseTypeDescription, + westLandUseType: formValues.westLandUseType, + westLandUseTypeDescription: formValues.westLandUseTypeDescription, + }); } async onSave() { diff --git a/portal-frontend/src/app/features/edit-submission/other-parcels/other-parcels.component.ts b/portal-frontend/src/app/features/edit-submission/other-parcels/other-parcels.component.ts index 0af4fccb8a..b576c4b562 100644 --- a/portal-frontend/src/app/features/edit-submission/other-parcels/other-parcels.component.ts +++ b/portal-frontend/src/app/features/edit-submission/other-parcels/other-parcels.component.ts @@ -129,37 +129,35 @@ export class OtherParcelsComponent extends StepComponent implements OnInit, OnDe // replace placeholder uuid with the real one before saving await this.replacePlaceholderParcel(); - if (this.parcelEntryChanged) { - // delete all OTHER parcels if user answered 'NO' on 'Is there other parcels in the community' - if (!parseStringToBoolean(this.hasOtherParcelsInCommunity.getRawValue())) { - if (this.otherParcels.some((e) => e.uuid !== PLACE_HOLDER_UUID_FOR_INITIAL_PARCEL)) { - await this.applicationParcelService.deleteMany( - this.otherParcels.filter((e) => e.uuid !== PLACE_HOLDER_UUID_FOR_INITIAL_PARCEL).map((e) => e.uuid) - ); - } - - return; + // delete all OTHER parcels if user answered 'NO' on 'Is there other parcels in the community' + if (!parseStringToBoolean(this.hasOtherParcelsInCommunity.getRawValue())) { + if (this.otherParcels.some((e) => e.uuid !== PLACE_HOLDER_UUID_FOR_INITIAL_PARCEL)) { + await this.applicationParcelService.deleteMany( + this.otherParcels.filter((e) => e.uuid !== PLACE_HOLDER_UUID_FOR_INITIAL_PARCEL).map((e) => e.uuid) + ); } - for (const parcel of this.otherParcels) { - parcelsToUpdate.push({ - uuid: parcel.uuid, - pid: parcel.pid?.toString() || null, - pin: parcel.pin?.toString() || null, - legalDescription: parcel.legalDescription, - civicAddress: parcel.civicAddress, - isFarm: parcel.isFarm, - purchasedDate: parcel.purchasedDate, - mapAreaHectares: parcel.mapAreaHectares, - ownershipTypeCode: parcel.ownershipTypeCode, - crownLandOwnerType: parcel.crownLandOwnerType, - isConfirmedByApplicant: false, - ownerUuids: parcel.owners.map((owner) => owner.uuid), - }); - } + return; + } - await this.applicationParcelService.update(parcelsToUpdate); + for (const parcel of this.otherParcels) { + parcelsToUpdate.push({ + uuid: parcel.uuid, + pid: parcel.pid?.toString() || null, + pin: parcel.pin?.toString() || null, + legalDescription: parcel.legalDescription, + civicAddress: parcel.civicAddress, + isFarm: parcel.isFarm, + purchasedDate: parcel.purchasedDate, + mapAreaHectares: parcel.mapAreaHectares, + ownershipTypeCode: parcel.ownershipTypeCode, + crownLandOwnerType: parcel.crownLandOwnerType, + isConfirmedByApplicant: false, + ownerUuids: parcel.owners.map((owner) => owner.uuid), + }); } + + await this.applicationParcelService.update(parcelsToUpdate); } async onSave() { diff --git a/portal-frontend/src/app/features/edit-submission/parcel-details/parcel-details.component.ts b/portal-frontend/src/app/features/edit-submission/parcel-details/parcel-details.component.ts index 52fb6bbc48..dcc2ee3388 100644 --- a/portal-frontend/src/app/features/edit-submission/parcel-details/parcel-details.component.ts +++ b/portal-frontend/src/app/features/edit-submission/parcel-details/parcel-details.component.ts @@ -31,7 +31,6 @@ export class ParcelDetailsComponent extends StepComponent implements OnInit, Aft parcels: ApplicationParcelDto[] = []; $owners = new BehaviorSubject([]); newParcelAdded = false; - isDirty = false; constructor( private router: Router, @@ -94,7 +93,6 @@ export class ParcelDetailsComponent extends StepComponent implements OnInit, Aft return; } - this.isDirty = true; parcel.pid = formData.pid !== undefined ? formData.pid : parcel.pid; parcel.pin = formData.pid !== undefined ? formData.pin : parcel.pin; parcel.civicAddress = formData.civicAddress !== undefined ? formData.civicAddress : parcel.civicAddress; @@ -115,27 +113,25 @@ export class ParcelDetailsComponent extends StepComponent implements OnInit, Aft } private async saveProgress() { - if (this.isDirty || this.newParcelAdded) { - const parcelsToUpdate: ApplicationParcelUpdateDto[] = []; - for (const parcel of this.parcels) { - parcelsToUpdate.push({ - uuid: parcel.uuid, - pid: parcel.pid?.toString() || null, - pin: parcel.pin?.toString() || null, - civicAddress: parcel.civicAddress ?? null, - legalDescription: parcel.legalDescription, - isFarm: parcel.isFarm, - purchasedDate: parcel.purchasedDate, - mapAreaHectares: parcel.mapAreaHectares, - ownershipTypeCode: parcel.ownershipTypeCode, - isConfirmedByApplicant: parcel.isConfirmedByApplicant, - crownLandOwnerType: parcel.crownLandOwnerType, - ownerUuids: parcel.owners.map((owner) => owner.uuid), - }); - } - await this.applicationParcelService.update(parcelsToUpdate); - //TODO: Do we need to reload submission? + const parcelsToUpdate: ApplicationParcelUpdateDto[] = []; + for (const parcel of this.parcels) { + parcelsToUpdate.push({ + uuid: parcel.uuid, + pid: parcel.pid?.toString() || null, + pin: parcel.pin?.toString() || null, + civicAddress: parcel.civicAddress ?? null, + legalDescription: parcel.legalDescription, + isFarm: parcel.isFarm, + purchasedDate: parcel.purchasedDate, + mapAreaHectares: parcel.mapAreaHectares, + ownershipTypeCode: parcel.ownershipTypeCode, + isConfirmedByApplicant: parcel.isConfirmedByApplicant, + crownLandOwnerType: parcel.crownLandOwnerType, + ownerUuids: parcel.owners.map((owner) => owner.uuid), + }); } + + await this.applicationParcelService.update(parcelsToUpdate); } async onSave() { diff --git a/portal-frontend/src/app/features/edit-submission/primary-contact/primary-contact.component.ts b/portal-frontend/src/app/features/edit-submission/primary-contact/primary-contact.component.ts index 56f837e845..7efc0ae9f5 100644 --- a/portal-frontend/src/app/features/edit-submission/primary-contact/primary-contact.component.ts +++ b/portal-frontend/src/app/features/edit-submission/primary-contact/primary-contact.component.ts @@ -31,7 +31,6 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni isCrownOwner = false; isGovernmentUser = false; governmentName: string | undefined; - isDirty = false; firstName = new FormControl('', [Validators.required]); lastName = new FormControl('', [Validators.required]); @@ -95,7 +94,6 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni } onSelectOwner(uuid: string) { - this.isDirty = true; this.selectedOwnerUuid = uuid; const selectedOwner = this.parcelOwners.find((owner) => owner.uuid === uuid); this.parcelOwners = this.parcelOwners.map((owner) => ({ @@ -166,37 +164,29 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni } protected async save() { - if (this.isDirty || this.form.dirty) { - let selectedOwner: ApplicationOwnerDto | undefined = this.owners.find( - (owner) => owner.uuid === this.selectedOwnerUuid - ); + let selectedOwner: ApplicationOwnerDto | undefined = this.owners.find( + (owner) => owner.uuid === this.selectedOwnerUuid + ); - if (this.selectedThirdPartyAgent || this.selectedLocalGovernment) { - await this.applicationOwnerService.setPrimaryContact({ - applicationSubmissionUuid: this.submissionUuid, - organization: this.organizationName.getRawValue() ?? '', - firstName: this.firstName.getRawValue() ?? '', - lastName: this.lastName.getRawValue() ?? '', - email: this.email.getRawValue() ?? '', - phoneNumber: this.phoneNumber.getRawValue() ?? '', - ownerUuid: selectedOwner?.uuid, - type: this.selectedThirdPartyAgent ? APPLICATION_OWNER.AGENT : APPLICATION_OWNER.GOVERNMENT, - }); - } else if (selectedOwner) { - await this.applicationOwnerService.setPrimaryContact({ - applicationSubmissionUuid: this.submissionUuid, - ownerUuid: selectedOwner.uuid, - }); - } - await this.reloadApplication(); + if (this.selectedThirdPartyAgent || this.selectedLocalGovernment) { + await this.applicationOwnerService.setPrimaryContact({ + applicationSubmissionUuid: this.submissionUuid, + organization: this.organizationName.getRawValue() ?? '', + firstName: this.firstName.getRawValue() ?? '', + lastName: this.lastName.getRawValue() ?? '', + email: this.email.getRawValue() ?? '', + phoneNumber: this.phoneNumber.getRawValue() ?? '', + ownerUuid: selectedOwner?.uuid, + type: this.selectedThirdPartyAgent ? APPLICATION_OWNER.AGENT : APPLICATION_OWNER.GOVERNMENT, + }); + } else if (selectedOwner) { + await this.applicationOwnerService.setPrimaryContact({ + applicationSubmissionUuid: this.submissionUuid, + ownerUuid: selectedOwner.uuid, + }); } } - private async reloadApplication() { - const application = await this.applicationService.getByUuid(this.submissionUuid); - this.$applicationSubmission.next(application); - } - private async loadOwners(submissionUuid: string, primaryContactOwnerUuid?: string) { const owners = await this.applicationOwnerService.fetchBySubmissionId(submissionUuid); if (owners) { @@ -245,7 +235,6 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni if (this.showErrors) { this.form.markAllAsTouched(); } - this.isDirty = false; } } diff --git a/portal-frontend/src/app/features/edit-submission/select-government/select-government.component.ts b/portal-frontend/src/app/features/edit-submission/select-government/select-government.component.ts index 9acdf56fd4..830d2a8ae5 100644 --- a/portal-frontend/src/app/features/edit-submission/select-government/select-government.component.ts +++ b/portal-frontend/src/app/features/edit-submission/select-government/select-government.component.ts @@ -26,7 +26,6 @@ export class SelectGovernmentComponent extends StepComponent implements OnInit, selectGovernmentUuid = ''; localGovernments: LocalGovernmentDto[] = []; filteredLocalGovernments!: Observable; - isDirty = false; form = new FormGroup({ localGovernment: this.localGovernment, @@ -59,7 +58,6 @@ export class SelectGovernmentComponent extends StepComponent implements OnInit, } onChange($event: MatAutocompleteSelectedEvent) { - this.isDirty = true; const localGovernmentName = $event.option.value; if (localGovernmentName) { const localGovernment = this.localGovernments.find((lg) => lg.name == localGovernmentName); @@ -97,19 +95,15 @@ export class SelectGovernmentComponent extends StepComponent implements OnInit, } private async save() { - if (this.isDirty) { - const localGovernmentName = this.localGovernment.getRawValue(); - if (localGovernmentName) { - const localGovernment = this.localGovernments.find((lg) => lg.name == localGovernmentName); + const localGovernmentName = this.localGovernment.getRawValue(); + if (localGovernmentName) { + const localGovernment = this.localGovernments.find((lg) => lg.name == localGovernmentName); - if (localGovernment) { - const res = await this.applicationSubmissionService.updatePending(this.submissionUuid, { - localGovernmentUuid: localGovernment.uuid, - }); - this.$applicationSubmission.next(res); - } + if (localGovernment) { + await this.applicationSubmissionService.updatePending(this.submissionUuid, { + localGovernmentUuid: localGovernment.uuid, + }); } - this.isDirty = false; } } diff --git a/portal-frontend/src/app/features/review-submission/review-submission.component.ts b/portal-frontend/src/app/features/review-submission/review-submission.component.ts index dc6a512380..f5ba423738 100644 --- a/portal-frontend/src/app/features/review-submission/review-submission.component.ts +++ b/portal-frontend/src/app/features/review-submission/review-submission.component.ts @@ -97,7 +97,7 @@ export class ReviewSubmissionComponent implements OnInit, OnDestroy { // setTimeout is required for stepper to be initialized setTimeout(() => { const stepInt = parseInt(stepInd); - //this.customStepper.navigateToStep(stepInt, true); + this.customStepper.navigateToStep(stepInt, true); this.showDownloadPdf = this.isFirstNationGovernment ? stepInt === ReviewApplicationFngSteps.ReviewAndSubmitFng diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.service.ts b/services/apps/alcs/src/portal/application-submission/application-submission.service.ts index fff750c23b..764b880842 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.service.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.service.ts @@ -154,10 +154,8 @@ export class ApplicationSubmissionService { const applicationSubmission = await this.getOrFailByUuid(submissionUuid); applicationSubmission.applicant = updateDto.applicant; - applicationSubmission.purpose = filterUndefined( - updateDto.purpose, - applicationSubmission.purpose, - ); + applicationSubmission.purpose = + updateDto.purpose || applicationSubmission.purpose; applicationSubmission.typeCode = updateDto.typeCode || applicationSubmission.typeCode; applicationSubmission.localGovernmentUuid = updateDto.localGovernmentUuid; From 354f0c4309d4aed299de902bf99cebd77c880547 Mon Sep 17 00:00:00 2001 From: Liam Stoddard Date: Tue, 25 Jul 2023 10:34:28 -0700 Subject: [PATCH 122/954] add file before testing --- bin/migrate-files/migrate-files.py | 96 ++++++++++++++---------------- 1 file changed, 46 insertions(+), 50 deletions(-) diff --git a/bin/migrate-files/migrate-files.py b/bin/migrate-files/migrate-files.py index 92a04ff354..04883b2c9a 100644 --- a/bin/migrate-files/migrate-files.py +++ b/bin/migrate-files/migrate-files.py @@ -5,7 +5,37 @@ from tqdm import tqdm import pickle -def application_docs(starting_document_id,batch): +# Load environment variables from .env file +load_dotenv() + +# Load the database connection secrets from environment variables +db_username = os.getenv("DB_USERNAME") +db_password = os.getenv("DB_PASSWORD") +db_dsn = os.getenv("DB_DSN") +# db_path = os.getenv("DB_PATH") # only necessary if running on M1 + +# Connect to the Oracle database +# cx_Oracle.init_oracle_client(lib_dir=db_path) # only necessary if running on M1 +conn = cx_Oracle.connect( + user=db_username, password=db_password, dsn=db_dsn, encoding="UTF-8" +) + +# Load the ECS connection secrets from environment variables +ecs_host = os.getenv("ECS_HOSTNAME") +ecs_bucket = os.getenv("ECS_BUCKET") +ecs_access_key = os.getenv("ECS_ACCESS_KEY") +ecs_secret_key = os.getenv("ECS_SECRET_KEY") + +# Connect to S3 +s3 = boto3.client( + "s3", + aws_access_key_id=ecs_access_key, + aws_secret_access_key=ecs_secret_key, + use_ssl=True, + endpoint_url=ecs_host, +) + +def application_docs(starting_document_id,batch,cursor): # Get total number of files try: cursor.execute ('SELECT COUNT(*) FROM OATS.OATS_DOCUMENTS WHERE dbms_lob.getLength(DOCUMENT_BLOB) > 0 AND ALR_APPLICATION_ID IS NOT NULL') @@ -26,9 +56,6 @@ def application_docs(starting_document_id,batch): ORDER BY DOCUMENT_ID ASC """) - # Set the batch size - BATCH_SIZE = batch - # Track progress documents_processed = 0 last_document_id = 0 @@ -37,7 +64,7 @@ def application_docs(starting_document_id,batch): with tqdm(total=application_count, unit="file", desc="Uploading files to S3") as pbar: while True: # Fetch the next batch of BLOB data - data = cursor.fetchmany(BATCH_SIZE) + data = cursor.fetchmany(batch) if not data: break # Upload the batch to S3 with a progress bar @@ -65,8 +92,9 @@ def application_docs(starting_document_id,batch): # Display results print("Process complete: Successfully migrated", documents_processed, "files.") + return -def planning_docs(starting_planning_document_id,batch): +def planning_docs(starting_planning_document_id,batch,cursor): # Get total number of files try: cursor.execute ('SELECT COUNT(*) FROM OATS.OATS_DOCUMENTS WHERE dbms_lob.getLength(DOCUMENT_BLOB) > 0 AND PLANNING_REVIEW_ID IS NOT NULL') @@ -87,9 +115,6 @@ def planning_docs(starting_planning_document_id,batch): ORDER BY DOCUMENT_ID ASC """) - # Set the batch size - BATCH_SIZE = batch - # Track progress documents_processed = 0 last_planning_document_id = 0 @@ -98,7 +123,7 @@ def planning_docs(starting_planning_document_id,batch): with tqdm(total=planning_review_count, unit="file", desc="Uploading files to S3") as pbar: while True: # Fetch the next batch of BLOB data - data = cursor.fetchmany(BATCH_SIZE) + data = cursor.fetchmany(batch) if not data: break # Upload the batch to S3 with a progress bar @@ -126,8 +151,9 @@ def planning_docs(starting_planning_document_id,batch): # Display results print("Process complete: Successfully migrated", documents_processed, "files.") + return -def issue_docs(starting_issue_document_id,batch): +def issue_docs(starting_issue_document_id,batch,cursor): # Get total number of files try: cursor.execute ('SELECT COUNT(*) FROM OATS.OATS_DOCUMENTS WHERE dbms_lob.getLength(DOCUMENT_BLOB) > 0 AND ISSUE_ID IS NOT NULL') @@ -148,9 +174,6 @@ def issue_docs(starting_issue_document_id,batch): ORDER BY DOCUMENT_ID ASC """) - # Set the batch size - BATCH_SIZE = batch - # Track progress documents_processed = 0 last_issue_document_id = 0 @@ -159,7 +182,7 @@ def issue_docs(starting_issue_document_id,batch): with tqdm(total=issue_count, unit="file", desc="Uploading files to S3") as pbar: while True: # Fetch the next batch of BLOB data - data = cursor.fetchmany(BATCH_SIZE) + data = cursor.fetchmany(batch) if not data: break # Upload the batch to S3 with a progress bar @@ -187,35 +210,7 @@ def issue_docs(starting_issue_document_id,batch): # Display results print("Process complete: Successfully migrated", documents_processed, "files.") -# Load environment variables from .env file -load_dotenv() - -# Load the database connection secrets from environment variables -db_username = os.getenv("DB_USERNAME") -db_password = os.getenv("DB_PASSWORD") -db_dsn = os.getenv("DB_DSN") -# db_path = os.getenv("DB_PATH") # only necessary if running on local M1 - -# Connect to the Oracle database -# cx_Oracle.init_oracle_client(lib_dir=db_path) # only necessary if running on local M1 -conn = cx_Oracle.connect( - user=db_username, password=db_password, dsn=db_dsn, encoding="UTF-8" -) - -# Load the ECS connection secrets from environment variables -ecs_host = os.getenv("ECS_HOSTNAME") -ecs_bucket = os.getenv("ECS_BUCKET") -ecs_access_key = os.getenv("ECS_ACCESS_KEY") -ecs_secret_key = os.getenv("ECS_SECRET_KEY") - -# Connect to S3 -s3 = boto3.client( - "s3", - aws_access_key_id=ecs_access_key, - aws_secret_access_key=ecs_secret_key, - use_ssl=True, - endpoint_url=ecs_host, -) + return starting_document_id = 0 # Determine job resume status @@ -239,18 +234,19 @@ def issue_docs(starting_issue_document_id,batch): cursor = conn.cursor() +# Set batch size batch_size = 10 if starting_issue_document_id > 0: - issue_docs(starting_issue_document_id,batch_size) + issue_docs(starting_issue_document_id,batch_size,cursor) elif starting_planning_document_id > 0: - planning_docs(starting_planning_document_id,batch_size) - issue_docs(0,batch_size) + planning_docs(starting_planning_document_id,batch_size,cursor) + issue_docs(0,batch_size,cursor) else: print('Starting applications from:', starting_document_id) - application_docs(starting_document_id,batch_size) - planning_docs(0,batch_size) - issue_docs(0,batch_size) + application_docs(starting_document_id,batch_size,cursor) + planning_docs(0,batch_size,cursor) + issue_docs(0,batch_size,cursor) # Close the database cursor and connection cursor.close() From 0aa064a441d7962bbae68bbb188956dc3a8db1f1 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Tue, 25 Jul 2023 09:52:34 -0700 Subject: [PATCH 123/954] Improve Board Performance * Break get boards call to load less data * Add get board detail call to get full board details --- .../board-management-dialog.component.html | 3 ++ .../board-management-dialog.component.ts | 42 +++++++++++++------ .../board-management.component.ts | 4 +- .../features/board/board.component.spec.ts | 39 +++++++---------- .../src/app/features/board/board.component.ts | 33 +++++++++------ .../app-modification-dialog.component.html | 2 +- .../app-modification-dialog.component.spec.ts | 4 +- .../app-modification-dialog.component.ts | 2 +- .../application-dialog.component.html | 2 +- .../application-dialog.component.spec.ts | 14 +++++-- .../application-dialog.component.ts | 2 +- .../card-dialog/card-dialog.component.ts | 10 ++--- .../covenant/covenant-dialog.component.html | 2 +- .../covenant-dialog.component.spec.ts | 4 +- .../covenant/covenant-dialog.component.ts | 2 +- .../noi-modification-dialog.component.html | 2 +- .../noi-modification-dialog.component.spec.ts | 4 +- .../noi-modification-dialog.component.ts | 2 +- .../notice-of-intent-dialog.component.html | 2 +- .../notice-of-intent-dialog.component.spec.ts | 4 +- .../notice-of-intent-dialog.component.ts | 2 +- .../planning-review-dialog.component.html | 2 +- .../planning-review-dialog.component.spec.ts | 4 +- .../planning-review-dialog.component.ts | 2 +- .../reconsideration-dialog.component.html | 2 +- .../reconsideration-dialog.component.spec.ts | 4 +- .../reconsideration-dialog.component.ts | 2 +- .../assigned-table.component.ts | 2 +- .../subtask-table/subtask-table.component.ts | 2 +- .../src/app/services/board/board.dto.ts | 10 +++-- .../src/app/services/board/board.service.ts | 16 ++++--- .../src/app/services/card/card.dto.ts | 2 +- .../details-header.component.ts | 2 +- .../meeting-overview.component.spec.ts | 2 - .../application.controller.spec.ts | 3 +- .../src/alcs/board/board.controller.spec.ts | 8 ++-- .../alcs/src/alcs/board/board.controller.ts | 17 ++++++-- .../apps/alcs/src/alcs/board/board.dto.ts | 23 +++++----- .../apps/alcs/src/alcs/board/board.service.ts | 15 ++----- services/apps/alcs/src/alcs/card/card.dto.ts | 4 +- .../automapper/board.automapper.profile.ts | 12 +++++- .../automapper/card.automapper.profile.ts | 4 ++ 42 files changed, 175 insertions(+), 144 deletions(-) diff --git a/alcs-frontend/src/app/features/admin/board-management/board-management-dialog/board-management-dialog.component.html b/alcs-frontend/src/app/features/admin/board-management/board-management-dialog/board-management-dialog.component.html index 692aa9ead9..173ec575be 100644 --- a/alcs-frontend/src/app/features/admin/board-management/board-management-dialog/board-management-dialog.component.html +++ b/alcs-frontend/src/app/features/admin/board-management/board-management-dialog/board-management-dialog.component.html @@ -40,6 +40,9 @@

{{ isEdit ? 'Edit' : 'Create' }} Board

Click to add columns*
+
+ Disabled columns have cards and cannot be removed from the board +
  • diff --git a/alcs-frontend/src/app/features/admin/board-management/board-management-dialog/board-management-dialog.component.ts b/alcs-frontend/src/app/features/admin/board-management/board-management-dialog/board-management-dialog.component.ts index bf667a208f..bed89d78fb 100644 --- a/alcs-frontend/src/app/features/admin/board-management/board-management-dialog/board-management-dialog.component.ts +++ b/alcs-frontend/src/app/features/admin/board-management/board-management-dialog/board-management-dialog.component.ts @@ -5,7 +5,8 @@ import { MatCheckboxChange } from '@angular/material/checkbox'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { AdminBoardManagementService } from '../../../../services/admin-board-management/admin-board-management.service'; import { CardStatusDto } from '../../../../services/application/application-code.dto'; -import { BoardDto, BoardStatusDto } from '../../../../services/board/board.dto'; +import { BoardDto, BoardStatusDto, MinimalBoardDto } from '../../../../services/board/board.dto'; +import { BoardService } from '../../../../services/board/board.service'; import { CardStatusService } from '../../../../services/card/card-status/card-status.service'; import { CardType } from '../../../../shared/card/card.component'; import { BaseCodeDto } from '../../../../shared/dto/base.dto'; @@ -45,24 +46,18 @@ export class BoardManagementDialogComponent implements OnInit { constructor( @Inject(MAT_DIALOG_DATA) public data: { - board: BoardDto | undefined; + board: MinimalBoardDto | undefined; cardTypes: BaseCodeDto[]; }, private dialogRef: MatDialogRef, private cardStatusService: CardStatusService, private adminBoardManagementService: AdminBoardManagementService, - private formBuilder: FormBuilder + private formBuilder: FormBuilder, + private boardService: BoardService ) { if (data.board) { this.isEdit = true; this.form.controls.code.disable(); - this.form.patchValue({ - code: data.board.code, - title: data.board.title, - createCardTypes: data.board.createCardTypes, - permittedCardTypes: data.board.allowedCardTypes, - showOnSchedule: data.board.showOnSchedule ? 'true' : 'false', - }); } this.cardTypes = data.cardTypes; @@ -71,9 +66,31 @@ export class BoardManagementDialogComponent implements OnInit { } } + async loadBoard(code: string) { + return await this.boardService.fetchBoardDetail(code); + } + ngOnInit(): void { this.loadCanDelete(); - this.loadCardStatuses(); + this.prepareDialog(); + } + + private async prepareDialog() { + if (this.data.board) { + const board = await this.loadBoard(this.data.board.code); + + this.form.patchValue({ + code: board.code, + title: board.title, + createCardTypes: board.createCardTypes, + permittedCardTypes: board.allowedCardTypes, + showOnSchedule: board.showOnSchedule ? 'true' : 'false', + }); + + await this.loadCardStatuses(board); + } else { + await this.loadCardStatuses(); + } } onNextStep() { @@ -143,10 +160,9 @@ export class BoardManagementDialogComponent implements OnInit { } } - private async loadCardStatuses() { + private async loadCardStatuses(board?: BoardDto) { const cardStatuses = await this.cardStatusService.fetch(); - const board = this.data.board; const boardStatusCodes = board ? board.statuses .sort((a, b) => { diff --git a/alcs-frontend/src/app/features/admin/board-management/board-management.component.ts b/alcs-frontend/src/app/features/admin/board-management/board-management.component.ts index 36f016e6af..a5ad222f95 100644 --- a/alcs-frontend/src/app/features/admin/board-management/board-management.component.ts +++ b/alcs-frontend/src/app/features/admin/board-management/board-management.component.ts @@ -2,7 +2,7 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; import { Subject, takeUntil } from 'rxjs'; import { AdminBoardManagementService } from '../../../services/admin-board-management/admin-board-management.service'; -import { BoardDto } from '../../../services/board/board.dto'; +import { BoardDto, MinimalBoardDto } from '../../../services/board/board.dto'; import { BoardService } from '../../../services/board/board.service'; import { ConfirmationDialogService } from '../../../shared/confirmation-dialog/confirmation-dialog.service'; import { BaseCodeDto } from '../../../shared/dto/base.dto'; @@ -16,7 +16,7 @@ import { BoardManagementDialogComponent } from './board-management-dialog/board- export class BoardManagementComponent implements OnInit, OnDestroy { $destroy = new Subject(); - boards: BoardDto[] = []; + boards: MinimalBoardDto[] = []; displayedColumns: string[] = ['boards', 'cardTypes', 'actions']; private cardTypes: BaseCodeDto[] = []; cardTypeMap: Record = {}; diff --git a/alcs-frontend/src/app/features/board/board.component.spec.ts b/alcs-frontend/src/app/features/board/board.component.spec.ts index 6a7744762b..89e328f90b 100644 --- a/alcs-frontend/src/app/features/board/board.component.spec.ts +++ b/alcs-frontend/src/app/features/board/board.component.spec.ts @@ -13,6 +13,7 @@ import { ApplicationReconsiderationDto } from '../../services/application/applic import { ApplicationReconsiderationService } from '../../services/application/application-reconsideration/application-reconsideration.service'; import { ApplicationDto } from '../../services/application/application.dto'; import { ApplicationService } from '../../services/application/application.service'; +import { BoardDto } from '../../services/board/board.dto'; import { BoardService, BoardWithFavourite } from '../../services/board/board.service'; import { CardDto } from '../../services/card/card.dto'; import { CardService } from '../../services/card/card.service'; @@ -73,17 +74,22 @@ describe('BoardComponent', () => { code: 'boardCode', title: 'boardTitle', isFavourite: false, - statuses: [], allowedCardTypes: [], - createCardTypes: [], showOnSchedule: true, }; + const mockDetailBoard: BoardDto = { + ...mockBoard, + statuses: [], + createCardTypes: [], + }; + beforeEach(async () => { applicationService = createMock(); boardService = createMock(); boardService.$boards = boardEmitter; - boardService.fetchCards.mockResolvedValue({ + boardService.fetchBoardWithCards.mockResolvedValue({ + board: mockDetailBoard, applications: [], covenants: [], modifications: [], @@ -202,26 +208,9 @@ describe('BoardComponent', () => { expect(component.currentBoardCode).toEqual('boardCode'); }); - it('should enable covenants when the board supports it', async () => { - boardEmitter.next([ - { - code: 'boardCode', - statuses: [], - createCardTypes: [CardType.COV], - title: '', - isFavourite: false, - allowedCardTypes: [CardType.COV], - showOnSchedule: true, - }, - ]); - - await fixture.whenStable(); - - expect(component.boardHasCreateCovenant).toBeTruthy(); - }); - it('should map an application into a card', async () => { - boardService.fetchCards.mockResolvedValue({ + boardService.fetchBoardWithCards.mockResolvedValue({ + board: mockDetailBoard, applications: [mockApplication], covenants: [], modifications: [], @@ -240,7 +229,8 @@ describe('BoardComponent', () => { }); it('should map a reconsideration into a card', async () => { - boardService.fetchCards.mockResolvedValue({ + boardService.fetchBoardWithCards.mockResolvedValue({ + board: mockDetailBoard, applications: [], covenants: [], modifications: [], @@ -281,7 +271,8 @@ describe('BoardComponent', () => { }, }, } as ApplicationDto; - boardService.fetchCards.mockResolvedValue({ + boardService.fetchBoardWithCards.mockResolvedValue({ + board: mockDetailBoard, applications: [mockApplication, highPriorityApplication, highActiveDays], covenants: [], modifications: [], diff --git a/alcs-frontend/src/app/features/board/board.component.ts b/alcs-frontend/src/app/features/board/board.component.ts index b7f6491ea9..526c511722 100644 --- a/alcs-frontend/src/app/features/board/board.component.ts +++ b/alcs-frontend/src/app/features/board/board.component.ts @@ -12,6 +12,7 @@ import { ApplicationReconsiderationDto } from '../../services/application/applic import { ApplicationReconsiderationService } from '../../services/application/application-reconsideration/application-reconsideration.service'; import { ApplicationDto } from '../../services/application/application.dto'; import { ApplicationService } from '../../services/application/application.service'; +import { CardsDto } from '../../services/board/board.dto'; import { BoardService, BoardWithFavourite } from '../../services/board/board.service'; import { CardService } from '../../services/card/card.service'; import { CovenantDto } from '../../services/covenant/covenant.dto'; @@ -208,14 +209,20 @@ export class BoardComponent implements OnInit, OnDestroy { } } - private setupBoard(board: BoardWithFavourite) { + private async setupBoard(board: BoardWithFavourite) { // clear cards to remove flickering this.cards = []; this.titleService.setTitle(`${environment.siteName} | ${board.title} Board`); + this.boardIsFavourite = board.isFavourite; + + this.loadBoard(board.code); + } + + private async loadBoard(boardCode: string) { + const response = await this.boardService.fetchBoardWithCards(boardCode); + const board = response.board; - this.loadCards(board.code); this.boardTitle = board.title; - this.boardIsFavourite = board.isFavourite; this.boardHasCreateApplication = board.createCardTypes.includes(CardType.APP); this.boardHasCreatePlanningReview = board.createCardTypes.includes(CardType.PLAN); this.boardHasCreateReconsideration = board.createCardTypes.includes(CardType.RECON); @@ -231,17 +238,17 @@ export class BoardComponent implements OnInit, OnDestroy { name: status.label, allowedTransitions: allStatuses, })); + this.mapAndSortCards(response, boardCode); } - private async loadCards(boardCode: string) { - const thingsWithCards = await this.boardService.fetchCards(boardCode); - const mappedApps = thingsWithCards.applications.map(this.mapApplicationDtoToCard.bind(this)); - const mappedRecons = thingsWithCards.reconsiderations.map(this.mapReconsiderationDtoToCard.bind(this)); - const mappedReviewMeetings = thingsWithCards.planningReviews.map(this.mapPlanningReviewToCard.bind(this)); - const mappedModifications = thingsWithCards.modifications.map(this.mapModificationToCard.bind(this)); - const mappedCovenants = thingsWithCards.covenants.map(this.mapCovenantToCard.bind(this)); - const mappedNoticeOfIntents = thingsWithCards.noticeOfIntents.map(this.mapNoticeOfIntentToCard.bind(this)); - const mappedNoticeOfIntentModifications = thingsWithCards.noiModifications.map( + private mapAndSortCards(response: CardsDto, boardCode: string) { + const mappedApps = response.applications.map(this.mapApplicationDtoToCard.bind(this)); + const mappedRecons = response.reconsiderations.map(this.mapReconsiderationDtoToCard.bind(this)); + const mappedReviewMeetings = response.planningReviews.map(this.mapPlanningReviewToCard.bind(this)); + const mappedModifications = response.modifications.map(this.mapModificationToCard.bind(this)); + const mappedCovenants = response.covenants.map(this.mapCovenantToCard.bind(this)); + const mappedNoticeOfIntents = response.noticeOfIntents.map(this.mapNoticeOfIntentToCard.bind(this)); + const mappedNoticeOfIntentModifications = response.noiModifications.map( this.mapNoticeOfIntentModificationToCard.bind(this) ); if (boardCode === BOARD_TYPE_CODES.VETT) { @@ -456,7 +463,7 @@ export class BoardComponent implements OnInit, OnDestroy { this.setUrl(); if (isDirty && this.selectedBoardCode) { - this.loadCards(this.selectedBoardCode); + this.loadBoard(this.selectedBoardCode); } }); } diff --git a/alcs-frontend/src/app/features/board/dialogs/app-modification/app-modification-dialog.component.html b/alcs-frontend/src/app/features/board/dialogs/app-modification/app-modification-dialog.component.html index 2a26449772..c9fe6bef85 100644 --- a/alcs-frontend/src/app/features/board/dialogs/app-modification/app-modification-dialog.component.html +++ b/alcs-frontend/src/app/features/board/dialogs/app-modification/app-modification-dialog.component.html @@ -44,7 +44,7 @@

    >star {{ board.title }} - check

diff --git a/alcs-frontend/src/app/features/board/dialogs/app-modification/app-modification-dialog.component.spec.ts b/alcs-frontend/src/app/features/board/dialogs/app-modification/app-modification-dialog.component.spec.ts index e351c8efa5..2a51ed79ee 100644 --- a/alcs-frontend/src/app/features/board/dialogs/app-modification/app-modification-dialog.component.spec.ts +++ b/alcs-frontend/src/app/features/board/dialogs/app-modification/app-modification-dialog.component.spec.ts @@ -51,9 +51,7 @@ describe('ModificationDialogComponent', () => { status: { code: 'FAKE_STATUS', }, - board: { - code: 'FAKE_BOARD', - }, + boardCode: 'FAKE_BOARD', } as CardDto, }; diff --git a/alcs-frontend/src/app/features/board/dialogs/app-modification/app-modification-dialog.component.ts b/alcs-frontend/src/app/features/board/dialogs/app-modification/app-modification-dialog.component.ts index 1e2f56834d..bbde078894 100644 --- a/alcs-frontend/src/app/features/board/dialogs/app-modification/app-modification-dialog.component.ts +++ b/alcs-frontend/src/app/features/board/dialogs/app-modification/app-modification-dialog.component.ts @@ -58,7 +58,7 @@ export class AppModificationDialogComponent extends CardDialogComponent implemen this.selectedBoard = board.code; try { await this.boardService.changeBoard(this.data.card.uuid, board.code); - const loadedBoard = this.boards.find((board) => board.code === this.selectedBoard); + const loadedBoard = await this.boardService.fetchBoardDetail(board.code); if (loadedBoard) { this.boardStatuses = loadedBoard.statuses; } diff --git a/alcs-frontend/src/app/features/board/dialogs/application/application-dialog.component.html b/alcs-frontend/src/app/features/board/dialogs/application/application-dialog.component.html index 67298c3bb5..614288178e 100644 --- a/alcs-frontend/src/app/features/board/dialogs/application/application-dialog.component.html +++ b/alcs-frontend/src/app/features/board/dialogs/application/application-dialog.component.html @@ -57,7 +57,7 @@

>star {{ board.title }} - check

diff --git a/alcs-frontend/src/app/features/board/dialogs/application/application-dialog.component.spec.ts b/alcs-frontend/src/app/features/board/dialogs/application/application-dialog.component.spec.ts index fe4df27895..cfb9d225fd 100644 --- a/alcs-frontend/src/app/features/board/dialogs/application/application-dialog.component.spec.ts +++ b/alcs-frontend/src/app/features/board/dialogs/application/application-dialog.component.spec.ts @@ -7,6 +7,7 @@ import { RouterTestingModule } from '@angular/router/testing'; import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { ApplicationRegionDto, ApplicationTypeDto } from '../../../../services/application/application-code.dto'; import { APPLICATION_SYSTEM_SOURCE_TYPES, ApplicationDto } from '../../../../services/application/application.dto'; +import { BoardDto } from '../../../../services/board/board.dto'; import { BoardService } from '../../../../services/board/board.service'; import { CardDto } from '../../../../services/card/card.dto'; import { AssigneeDto } from '../../../../services/user/user.dto'; @@ -62,11 +63,9 @@ describe('ApplicationDialogComponent', () => { decisionMeetings: [], dateSubmittedToAlc: Date.now(), card: { + boardCode: 'a', assignee: mockAssignee, highPriority: false, - board: { - code: 'board-code', - }, status: { code: 'card-status', }, @@ -84,6 +83,14 @@ describe('ApplicationDialogComponent', () => { mockBoardService = createMock(); mockBoardService.$boards = new EventEmitter(); + mockBoardService.fetchBoardDetail.mockResolvedValue({ + allowedCardTypes: [], + code: '', + createCardTypes: [], + showOnSchedule: false, + statuses: [], + title: '', + }); await TestBed.configureTestingModule({ declarations: [ApplicationDialogComponent], @@ -106,6 +113,7 @@ describe('ApplicationDialogComponent', () => { fixture = TestBed.createComponent(ApplicationDialogComponent); component = fixture.componentInstance; component.data = mockApplication; + component.boardStatuses = []; fixture.detectChanges(); }); diff --git a/alcs-frontend/src/app/features/board/dialogs/application/application-dialog.component.ts b/alcs-frontend/src/app/features/board/dialogs/application/application-dialog.component.ts index fb452c47e9..8963a37698 100644 --- a/alcs-frontend/src/app/features/board/dialogs/application/application-dialog.component.ts +++ b/alcs-frontend/src/app/features/board/dialogs/application/application-dialog.component.ts @@ -68,7 +68,7 @@ export class ApplicationDialogComponent extends CardDialogComponent implements O this.selectedBoard = board.code; try { await this.boardService.changeBoard(this.application.card!.uuid, board.code); - const loadedBoard = this.boards.find((board) => board.code === this.selectedBoard); + const loadedBoard = await this.boardService.fetchBoardDetail(board.code); if (loadedBoard) { this.boardStatuses = loadedBoard.statuses; } diff --git a/alcs-frontend/src/app/features/board/dialogs/card-dialog/card-dialog.component.ts b/alcs-frontend/src/app/features/board/dialogs/card-dialog/card-dialog.component.ts index afafa9862a..626f270139 100644 --- a/alcs-frontend/src/app/features/board/dialogs/card-dialog/card-dialog.component.ts +++ b/alcs-frontend/src/app/features/board/dialogs/card-dialog/card-dialog.component.ts @@ -44,12 +44,8 @@ export class CardDialogComponent implements OnInit, OnDestroy { ngOnInit(): void { this.boardService.$boards.pipe(takeUntil(this.$destroy)).subscribe((boards) => { - const loadedBoard = boards.find((board) => board.code === this.selectedBoard); this.boards = boards; this.allowedBoards = this.boards.filter((board) => this.card && board.allowedCardTypes.includes(this.card.type)); - if (loadedBoard) { - this.boardStatuses = loadedBoard.statuses; - } }); this.authService.$currentUser.pipe(takeUntil(this.$destroy)).subscribe((currentUser) => { @@ -64,18 +60,18 @@ export class CardDialogComponent implements OnInit, OnDestroy { }); } - populateCardData(card: CardDto) { + async populateCardData(card: CardDto) { this.card = card; this.selectedAssignee = card.assignee; this.selectedAssigneeName = this.selectedAssignee?.prettyName; this.selectedApplicationStatus = card.status.code; - this.selectedBoard = card.board.code; + this.selectedBoard = card.boardCode; this.allowedBoards = this.boards.filter((board) => this.card && board.allowedCardTypes.includes(this.card.type)); this.$users = this.userService.$assignableUsers; this.userService.fetchAssignableUsers(); - const loadedBoard = this.boards.find((board) => board.code === this.selectedBoard); + const loadedBoard = await this.boardService.fetchBoardDetail(this.selectedBoard); if (loadedBoard) { this.boardStatuses = loadedBoard.statuses; } diff --git a/alcs-frontend/src/app/features/board/dialogs/covenant/covenant-dialog.component.html b/alcs-frontend/src/app/features/board/dialogs/covenant/covenant-dialog.component.html index 23e0edf7fe..388c1e5061 100644 --- a/alcs-frontend/src/app/features/board/dialogs/covenant/covenant-dialog.component.html +++ b/alcs-frontend/src/app/features/board/dialogs/covenant/covenant-dialog.component.html @@ -29,7 +29,7 @@

>star {{ board.title }} - check + check diff --git a/alcs-frontend/src/app/features/board/dialogs/covenant/covenant-dialog.component.spec.ts b/alcs-frontend/src/app/features/board/dialogs/covenant/covenant-dialog.component.spec.ts index c190f65daa..57771dd0f8 100644 --- a/alcs-frontend/src/app/features/board/dialogs/covenant/covenant-dialog.component.spec.ts +++ b/alcs-frontend/src/app/features/board/dialogs/covenant/covenant-dialog.component.spec.ts @@ -44,9 +44,7 @@ describe('CovenantDialogComponent', () => { status: { code: 'FAKE_STATUS', }, - board: { - code: 'FAKE_BOARD', - }, + boardCode: 'FAKE_BOARD', } as CardDto, }; diff --git a/alcs-frontend/src/app/features/board/dialogs/covenant/covenant-dialog.component.ts b/alcs-frontend/src/app/features/board/dialogs/covenant/covenant-dialog.component.ts index dda29b228a..02bc3ba6dd 100644 --- a/alcs-frontend/src/app/features/board/dialogs/covenant/covenant-dialog.component.ts +++ b/alcs-frontend/src/app/features/board/dialogs/covenant/covenant-dialog.component.ts @@ -66,7 +66,7 @@ export class CovenantDialogComponent extends CardDialogComponent implements OnIn this.selectedBoard = board.code; try { await this.boardService.changeBoard(this.covenant.card.uuid, board.code); - const loadedBoard = this.boards.find((board) => board.code === this.selectedBoard); + const loadedBoard = await this.boardService.fetchBoardDetail(board.code); if (loadedBoard) { this.boardStatuses = loadedBoard.statuses; } diff --git a/alcs-frontend/src/app/features/board/dialogs/noi-modification/noi-modification-dialog.component.html b/alcs-frontend/src/app/features/board/dialogs/noi-modification/noi-modification-dialog.component.html index f9c38358bc..5767c928f4 100644 --- a/alcs-frontend/src/app/features/board/dialogs/noi-modification/noi-modification-dialog.component.html +++ b/alcs-frontend/src/app/features/board/dialogs/noi-modification/noi-modification-dialog.component.html @@ -48,7 +48,7 @@

>star {{ board.title }} - check diff --git a/alcs-frontend/src/app/features/board/dialogs/noi-modification/noi-modification-dialog.component.spec.ts b/alcs-frontend/src/app/features/board/dialogs/noi-modification/noi-modification-dialog.component.spec.ts index 1de12a3416..60caf2d8dc 100644 --- a/alcs-frontend/src/app/features/board/dialogs/noi-modification/noi-modification-dialog.component.spec.ts +++ b/alcs-frontend/src/app/features/board/dialogs/noi-modification/noi-modification-dialog.component.spec.ts @@ -50,9 +50,7 @@ describe('NoiModificationDialogComponent', () => { status: { code: 'FAKE_STATUS', }, - board: { - code: 'FAKE_BOARD', - }, + boardCode: 'FAKE_BOARD', } as CardDto, }; diff --git a/alcs-frontend/src/app/features/board/dialogs/noi-modification/noi-modification-dialog.component.ts b/alcs-frontend/src/app/features/board/dialogs/noi-modification/noi-modification-dialog.component.ts index 989efddd63..7f11bdb0a8 100644 --- a/alcs-frontend/src/app/features/board/dialogs/noi-modification/noi-modification-dialog.component.ts +++ b/alcs-frontend/src/app/features/board/dialogs/noi-modification/noi-modification-dialog.component.ts @@ -62,7 +62,7 @@ export class NoiModificationDialogComponent extends CardDialogComponent implemen this.selectedBoard = board.code; try { await this.boardService.changeBoard(this.data.card.uuid, board.code); - const loadedBoard = this.boards.find((board) => board.code === this.selectedBoard); + const loadedBoard = await this.boardService.fetchBoardDetail(board.code); if (loadedBoard) { this.boardStatuses = loadedBoard.statuses; } diff --git a/alcs-frontend/src/app/features/board/dialogs/notice-of-intent/notice-of-intent-dialog.component.html b/alcs-frontend/src/app/features/board/dialogs/notice-of-intent/notice-of-intent-dialog.component.html index 7c989eac30..56fb88abcc 100644 --- a/alcs-frontend/src/app/features/board/dialogs/notice-of-intent/notice-of-intent-dialog.component.html +++ b/alcs-frontend/src/app/features/board/dialogs/notice-of-intent/notice-of-intent-dialog.component.html @@ -53,7 +53,7 @@

>star {{ board.title }} - check diff --git a/alcs-frontend/src/app/features/board/dialogs/notice-of-intent/notice-of-intent-dialog.component.spec.ts b/alcs-frontend/src/app/features/board/dialogs/notice-of-intent/notice-of-intent-dialog.component.spec.ts index 30ae14c4e2..5029260cb1 100644 --- a/alcs-frontend/src/app/features/board/dialogs/notice-of-intent/notice-of-intent-dialog.component.spec.ts +++ b/alcs-frontend/src/app/features/board/dialogs/notice-of-intent/notice-of-intent-dialog.component.spec.ts @@ -45,9 +45,7 @@ describe('NoticeOfIntentDialogComponent', () => { status: { code: 'FAKE_STATUS', }, - board: { - code: 'FAKE_BOARD', - }, + boardCode: 'FAKE_BOARD', } as CardDto, activeDays: 0, paused: false, diff --git a/alcs-frontend/src/app/features/board/dialogs/notice-of-intent/notice-of-intent-dialog.component.ts b/alcs-frontend/src/app/features/board/dialogs/notice-of-intent/notice-of-intent-dialog.component.ts index 8b00d1282c..db731c1ea6 100644 --- a/alcs-frontend/src/app/features/board/dialogs/notice-of-intent/notice-of-intent-dialog.component.ts +++ b/alcs-frontend/src/app/features/board/dialogs/notice-of-intent/notice-of-intent-dialog.component.ts @@ -66,7 +66,7 @@ export class NoticeOfIntentDialogComponent extends CardDialogComponent implement this.selectedBoard = board.code; try { await this.boardService.changeBoard(this.noticeOfIntent.card.uuid, board.code); - const loadedBoard = this.boards.find((board) => board.code === this.selectedBoard); + const loadedBoard = await this.boardService.fetchBoardDetail(board.code); if (loadedBoard) { this.boardStatuses = loadedBoard.statuses; } diff --git a/alcs-frontend/src/app/features/board/dialogs/planning-review/planning-review-dialog.component.html b/alcs-frontend/src/app/features/board/dialogs/planning-review/planning-review-dialog.component.html index b39f343727..df9bac4e20 100644 --- a/alcs-frontend/src/app/features/board/dialogs/planning-review/planning-review-dialog.component.html +++ b/alcs-frontend/src/app/features/board/dialogs/planning-review/planning-review-dialog.component.html @@ -26,7 +26,7 @@

>star {{ board.title }} - check diff --git a/alcs-frontend/src/app/features/board/dialogs/planning-review/planning-review-dialog.component.spec.ts b/alcs-frontend/src/app/features/board/dialogs/planning-review/planning-review-dialog.component.spec.ts index d0f2ccb5a8..f43ca33382 100644 --- a/alcs-frontend/src/app/features/board/dialogs/planning-review/planning-review-dialog.component.spec.ts +++ b/alcs-frontend/src/app/features/board/dialogs/planning-review/planning-review-dialog.component.spec.ts @@ -42,9 +42,7 @@ describe('PlanningReviewDialogComponent', () => { status: { code: 'FAKE_STATUS', }, - board: { - code: 'FAKE_BOARD', - }, + boardCode: 'FAKE_BOARD', } as CardDto, }; diff --git a/alcs-frontend/src/app/features/board/dialogs/planning-review/planning-review-dialog.component.ts b/alcs-frontend/src/app/features/board/dialogs/planning-review/planning-review-dialog.component.ts index e05c6d40db..9a45cdee10 100644 --- a/alcs-frontend/src/app/features/board/dialogs/planning-review/planning-review-dialog.component.ts +++ b/alcs-frontend/src/app/features/board/dialogs/planning-review/planning-review-dialog.component.ts @@ -63,7 +63,7 @@ export class PlanningReviewDialogComponent extends CardDialogComponent implement this.selectedBoard = board.code; try { await this.boardService.changeBoard(this.planningReview.card.uuid, board.code); - const loadedBoard = this.boards.find((board) => board.code === this.selectedBoard); + const loadedBoard = await this.boardService.fetchBoardDetail(board.code); if (loadedBoard) { this.boardStatuses = loadedBoard.statuses; } diff --git a/alcs-frontend/src/app/features/board/dialogs/reconsiderations/reconsideration-dialog.component.html b/alcs-frontend/src/app/features/board/dialogs/reconsiderations/reconsideration-dialog.component.html index 1db134e514..01047723a5 100644 --- a/alcs-frontend/src/app/features/board/dialogs/reconsiderations/reconsideration-dialog.component.html +++ b/alcs-frontend/src/app/features/board/dialogs/reconsiderations/reconsideration-dialog.component.html @@ -42,7 +42,7 @@

>star {{ board.title }} - check diff --git a/alcs-frontend/src/app/features/board/dialogs/reconsiderations/reconsideration-dialog.component.spec.ts b/alcs-frontend/src/app/features/board/dialogs/reconsiderations/reconsideration-dialog.component.spec.ts index 31b0b2b2e4..e3222c716c 100644 --- a/alcs-frontend/src/app/features/board/dialogs/reconsiderations/reconsideration-dialog.component.spec.ts +++ b/alcs-frontend/src/app/features/board/dialogs/reconsiderations/reconsideration-dialog.component.spec.ts @@ -58,9 +58,7 @@ describe('ReconsiderationDialogComponent', () => { status: { code: 'FAKE_STATUS', }, - board: { - code: 'FAKE_BOARD', - }, + boardCode: 'FAKE_BOARD', } as CardDto, resultingDecision: null, }; diff --git a/alcs-frontend/src/app/features/board/dialogs/reconsiderations/reconsideration-dialog.component.ts b/alcs-frontend/src/app/features/board/dialogs/reconsiderations/reconsideration-dialog.component.ts index 23cf74a11d..086d778bc8 100644 --- a/alcs-frontend/src/app/features/board/dialogs/reconsiderations/reconsideration-dialog.component.ts +++ b/alcs-frontend/src/app/features/board/dialogs/reconsiderations/reconsideration-dialog.component.ts @@ -58,7 +58,7 @@ export class ReconsiderationDialogComponent extends CardDialogComponent implemen this.selectedBoard = board.code; try { await this.boardService.changeBoard(this.recon.card.uuid, board.code); - const loadedBoard = this.boards.find((board) => board.code === this.selectedBoard); + const loadedBoard = await this.boardService.fetchBoardDetail(board.code); if (loadedBoard) { this.boardStatuses = loadedBoard.statuses; } diff --git a/alcs-frontend/src/app/features/home/assigned/assigned-table/assigned-table.component.ts b/alcs-frontend/src/app/features/home/assigned/assigned-table/assigned-table.component.ts index 8ca8422441..4fa9491715 100644 --- a/alcs-frontend/src/app/features/home/assigned/assigned-table/assigned-table.component.ts +++ b/alcs-frontend/src/app/features/home/assigned/assigned-table/assigned-table.component.ts @@ -27,6 +27,6 @@ export class AssignedTableComponent { constructor(private router: Router) {} async onSelectCard(card: CardDto) { - await this.router.navigateByUrl(`/board/${card.board.code}?card=${card.uuid}&type=${card.type}`); + await this.router.navigateByUrl(`/board/${card.boardCode}?card=${card.uuid}&type=${card.type}`); } } diff --git a/alcs-frontend/src/app/features/home/subtask/subtask-table/subtask-table.component.ts b/alcs-frontend/src/app/features/home/subtask/subtask-table/subtask-table.component.ts index 89d6858454..bca19a4e76 100644 --- a/alcs-frontend/src/app/features/home/subtask/subtask-table/subtask-table.component.ts +++ b/alcs-frontend/src/app/features/home/subtask/subtask-table/subtask-table.component.ts @@ -38,7 +38,7 @@ export class SubtaskTableComponent { async openCard(subtask: HomepageSubtaskDto) { await this.router.navigateByUrl( - `/board/${subtask.card.board.code}?card=${subtask.card.uuid}&type=${subtask.card.type}` + `/board/${subtask.card.boardCode}?card=${subtask.card.uuid}&type=${subtask.card.type}` ); } diff --git a/alcs-frontend/src/app/services/board/board.dto.ts b/alcs-frontend/src/app/services/board/board.dto.ts index 4be8f2a724..6832f731b8 100644 --- a/alcs-frontend/src/app/services/board/board.dto.ts +++ b/alcs-frontend/src/app/services/board/board.dto.ts @@ -7,13 +7,16 @@ import { NoticeOfIntentModificationDto } from '../notice-of-intent/notice-of-int import { NoticeOfIntentDto } from '../notice-of-intent/notice-of-intent.dto'; import { PlanningReviewDto } from '../planning-review/planning-review.dto'; -export interface BoardDto { +export interface MinimalBoardDto { code: string; title: string; - statuses: BoardStatusDto[]; + showOnSchedule: boolean; allowedCardTypes: CardType[]; +} + +export interface BoardDto extends MinimalBoardDto { + statuses: BoardStatusDto[]; createCardTypes: CardType[]; - showOnSchedule: boolean; } export interface BoardStatusDto { @@ -23,6 +26,7 @@ export interface BoardStatusDto { } export interface CardsDto { + board: BoardDto; applications: ApplicationDto[]; reconsiderations: ApplicationReconsiderationDto[]; planningReviews: PlanningReviewDto[]; diff --git a/alcs-frontend/src/app/services/board/board.service.ts b/alcs-frontend/src/app/services/board/board.service.ts index 824bd30c71..1048d73913 100644 --- a/alcs-frontend/src/app/services/board/board.service.ts +++ b/alcs-frontend/src/app/services/board/board.service.ts @@ -5,9 +5,9 @@ import { environment } from '../../../environments/environment'; import { ApplicationDto } from '../application/application.dto'; import { UserDto } from '../user/user.dto'; import { UserService } from '../user/user.service'; -import { BoardDto, CardsDto } from './board.dto'; +import { BoardDto, CardsDto, MinimalBoardDto } from './board.dto'; -export interface BoardWithFavourite extends BoardDto { +export interface BoardWithFavourite extends MinimalBoardDto { isFavourite: boolean; } @@ -15,7 +15,7 @@ export interface BoardWithFavourite extends BoardDto { providedIn: 'root', }) export class BoardService { - private boards?: BoardDto[]; + private boards?: MinimalBoardDto[]; private userProfile?: UserDto; private boardsEmitter = new BehaviorSubject([]); $boards = this.boardsEmitter.asObservable(); @@ -35,7 +35,7 @@ export class BoardService { private async publishBoards(reload = false) { if (this.userProfile !== undefined) { if (!this.boards || reload) { - this.boards = await firstValueFrom(this.http.get(`${environment.apiUrl}/board`)); + this.boards = await firstValueFrom(this.http.get(`${environment.apiUrl}/board`)); } const mappedBoards = this.boards.map((board) => ({ ...board, @@ -46,8 +46,12 @@ export class BoardService { return; } - fetchCards(boardCode: string) { - return firstValueFrom(this.http.get(`${environment.apiUrl}/board/${boardCode}`)); + fetchBoardDetail(boardCode: string) { + return firstValueFrom(this.http.get(`${environment.apiUrl}/board/${boardCode}`)); + } + + fetchBoardWithCards(boardCode: string) { + return firstValueFrom(this.http.get(`${environment.apiUrl}/board/${boardCode}/cards`)); } changeBoard(cardUuid: string, boardCode: string) { diff --git a/alcs-frontend/src/app/services/card/card.dto.ts b/alcs-frontend/src/app/services/card/card.dto.ts index 5422242a60..da30dd66a0 100644 --- a/alcs-frontend/src/app/services/card/card.dto.ts +++ b/alcs-frontend/src/app/services/card/card.dto.ts @@ -27,6 +27,6 @@ export interface CardDto { highPriority: boolean; status: CardStatusDto; assignee?: AssigneeDto; - board: BoardDto; + boardCode: string; createdAt: number; } diff --git a/alcs-frontend/src/app/shared/details-header/details-header.component.ts b/alcs-frontend/src/app/shared/details-header/details-header.component.ts index 94a66557d4..302115e4c5 100644 --- a/alcs-frontend/src/app/shared/details-header/details-header.component.ts +++ b/alcs-frontend/src/app/shared/details-header/details-header.component.ts @@ -96,7 +96,7 @@ export class DetailsHeaderComponent { constructor(private router: Router, private submissionStatusService: ApplicationSubmissionStatusService) {} async onGoToCard(card: CardDto) { - const boardCode = card.board.code; + const boardCode = card.boardCode; const cardUuid = card.uuid; const cardTypeCode = card.type; await this.router.navigateByUrl(`/board/${boardCode}?card=${cardUuid}&type=${cardTypeCode}`); diff --git a/alcs-frontend/src/app/shared/meeting-overview/meeting-overview.component.spec.ts b/alcs-frontend/src/app/shared/meeting-overview/meeting-overview.component.spec.ts index 71f79a9692..ddf39f1ceb 100644 --- a/alcs-frontend/src/app/shared/meeting-overview/meeting-overview.component.spec.ts +++ b/alcs-frontend/src/app/shared/meeting-overview/meeting-overview.component.spec.ts @@ -83,12 +83,10 @@ describe('MeetingOverviewComponent', () => { boardEmitter.next([ { - statuses: [], isFavourite: true, title: '', code: 'boardCode', allowedCardTypes: [], - createCardTypes: [], showOnSchedule: true, }, ]); diff --git a/services/apps/alcs/src/alcs/application/application.controller.spec.ts b/services/apps/alcs/src/alcs/application/application.controller.spec.ts index b519566dbe..83173e98d7 100644 --- a/services/apps/alcs/src/alcs/application/application.controller.spec.ts +++ b/services/apps/alcs/src/alcs/application/application.controller.spec.ts @@ -11,7 +11,6 @@ import { import { mockKeyCloakProviders } from '../../../test/mocks/mockTypes'; import { ApplicationProfile } from '../../common/automapper/application.automapper.profile'; import { UserProfile } from '../../common/automapper/user.automapper.profile'; -import { BoardSmallDto } from '../board/board.dto'; import { CardStatusDto } from '../card/card-status/card-status.dto'; import { CardDto } from '../card/card.dto'; import { Card } from '../card/card.entity'; @@ -58,7 +57,7 @@ describe('ApplicationController', () => { type: 'fake', uuid: 'fake', highPriority: false, - board: {} as BoardSmallDto, + boardCode: 'boardCode', } as CardDto, source: 'ALCS', }; diff --git a/services/apps/alcs/src/alcs/board/board.controller.spec.ts b/services/apps/alcs/src/alcs/board/board.controller.spec.ts index 718f18b72f..978d3e7f42 100644 --- a/services/apps/alcs/src/alcs/board/board.controller.spec.ts +++ b/services/apps/alcs/src/alcs/board/board.controller.spec.ts @@ -46,6 +46,8 @@ describe('BoardController', () => { noiModificationService = createMock(); mockBoard = new Board({ allowedCardTypes: [], + statuses: [], + createCardTypes: [], uuid: 'fake-board', }); @@ -128,7 +130,7 @@ describe('BoardController', () => { }), ]; - await controller.getCards(mockBoard.uuid); + await controller.getBoardWithCards(mockBoard.uuid); expect(appService.getByBoard).toHaveBeenCalledTimes(1); expect(appService.getByBoard).toBeCalledWith(mockBoard.uuid); @@ -148,7 +150,7 @@ describe('BoardController', () => { }), ]; - await controller.getCards(boardCode); + await controller.getBoardWithCards(boardCode); expect(planningReviewService.getByBoard).toHaveBeenCalledTimes(1); expect(planningReviewService.mapToDtos).toHaveBeenCalledTimes(1); @@ -162,7 +164,7 @@ describe('BoardController', () => { }), ]; - await controller.getCards(boardCode); + await controller.getBoardWithCards(boardCode); expect(modificationService.getByBoard).toHaveBeenCalledTimes(1); expect(modificationService.mapToDtos).toHaveBeenCalledTimes(1); diff --git a/services/apps/alcs/src/alcs/board/board.controller.ts b/services/apps/alcs/src/alcs/board/board.controller.ts index 3849541813..8fa661e398 100644 --- a/services/apps/alcs/src/alcs/board/board.controller.ts +++ b/services/apps/alcs/src/alcs/board/board.controller.ts @@ -20,7 +20,7 @@ import { CovenantService } from '../covenant/covenant.service'; import { NoticeOfIntentModificationService } from '../notice-of-intent-decision/notice-of-intent-modification/notice-of-intent-modification.service'; import { NoticeOfIntentService } from '../notice-of-intent/notice-of-intent.service'; import { PlanningReviewService } from '../planning-review/planning-review.service'; -import { BoardDto } from './board.dto'; +import { BoardDto, MinimalBoardDto } from './board.dto'; import { Board } from './board.entity'; import { BoardService } from './board.service'; @@ -45,12 +45,22 @@ export class BoardController { @UserRoles(...ANY_AUTH_ROLE) async getBoards() { const boards = await this.boardService.list(); - return this.autoMapper.mapArray(boards, Board, BoardDto); + return this.autoMapper.mapArray(boards, Board, MinimalBoardDto); } @Get('/:boardCode') @UserRoles(...ROLES_ALLOWED_BOARDS) - async getCards(@Param('boardCode') boardCode: string) { + async getBoardDetail(@Param('boardCode') boardCode: string) { + const board = await this.boardService.getOneOrFail({ + code: boardCode, + }); + + return await this.autoMapper.mapAsync(board, Board, BoardDto); + } + + @Get('/:boardCode/cards') + @UserRoles(...ROLES_ALLOWED_BOARDS) + async getBoardWithCards(@Param('boardCode') boardCode: string) { const board = await this.boardService.getOneOrFail({ code: boardCode, }); @@ -86,6 +96,7 @@ export class BoardController { : []; return { + board: await this.autoMapper.mapAsync(board, Board, BoardDto), applications: await this.applicationService.mapToDtos(applications), reconsiderations: await this.reconsiderationService.mapToDtos(recons), planningReviews: await this.planningReviewService.mapToDtos( diff --git a/services/apps/alcs/src/alcs/board/board.dto.ts b/services/apps/alcs/src/alcs/board/board.dto.ts index b305a78e6b..1852f60048 100644 --- a/services/apps/alcs/src/alcs/board/board.dto.ts +++ b/services/apps/alcs/src/alcs/board/board.dto.ts @@ -7,7 +7,7 @@ export enum BOARD_CODES { EXECUTIVE_COMMITTEE = 'exec', } -export class BoardDto { +export class MinimalBoardDto { @AutoMap() @IsString() code: string; @@ -17,29 +17,28 @@ export class BoardDto { title: string; @AutoMap() - @IsArray() - statuses: BoardStatusDto[]; + @IsBoolean() + showOnSchedule: boolean; @IsArray() allowedCardTypes: string[]; - - @IsArray() - createCardTypes: string[]; - - @AutoMap() - @IsBoolean() - showOnSchedule: boolean; } -export class BoardSmallDto { +export class BoardDto extends MinimalBoardDto { @AutoMap() + @IsString() code: string; @AutoMap() + @IsString() title: string; @AutoMap() - decisionMaker: string; + @IsArray() + statuses: BoardStatusDto[]; + + @IsArray() + createCardTypes: string[]; } export class BoardStatusDto { diff --git a/services/apps/alcs/src/alcs/board/board.service.ts b/services/apps/alcs/src/alcs/board/board.service.ts index 33fe030ef1..1640907d6d 100644 --- a/services/apps/alcs/src/alcs/board/board.service.ts +++ b/services/apps/alcs/src/alcs/board/board.service.ts @@ -4,7 +4,6 @@ import { InjectRepository } from '@nestjs/typeorm'; import { FindOptionsWhere, Repository } from 'typeorm'; import { FindOptionsRelations } from 'typeorm/find-options/FindOptionsRelations'; import { CARD_STATUS } from '../card/card-status/card-status.entity'; -import { CardType } from '../card/card-type/card-type.entity'; import { CardService } from '../card/card.service'; import { BoardStatus } from './board-status.entity'; import { BoardDto } from './board.dto'; @@ -36,16 +35,10 @@ export class BoardService { } async list() { - const boards = await this.boardRepository.find({ - relations: this.DEFAULT_RELATIONS, - }); - - //Sort board statuses - return boards.map((board) => { - board.statuses.sort((statusA, statusB) => { - return statusA.order - statusB.order; - }); - return board; + return await this.boardRepository.find({ + relations: { + allowedCardTypes: true, + }, }); } diff --git a/services/apps/alcs/src/alcs/card/card.dto.ts b/services/apps/alcs/src/alcs/card/card.dto.ts index 0b7ea58a10..64460b7e21 100644 --- a/services/apps/alcs/src/alcs/card/card.dto.ts +++ b/services/apps/alcs/src/alcs/card/card.dto.ts @@ -1,7 +1,7 @@ import { AutoMap } from '@automapper/classes'; import { IsBoolean, IsNotEmpty, IsOptional, IsString } from 'class-validator'; -import { BoardSmallDto } from '../board/board.dto'; import { AssigneeDto } from '../../user/user.dto'; +import { MinimalBoardDto } from '../board/board.dto'; import { CardStatusDto, CardTypeDto } from './card-status/card-status.dto'; import { CARD_TYPE } from './card-type/card-type.entity'; @@ -80,7 +80,7 @@ export class CardDto { highPriority?: boolean; @AutoMap() - board: BoardSmallDto; + boardCode: string; @AutoMap() createdAt: number; diff --git a/services/apps/alcs/src/common/automapper/board.automapper.profile.ts b/services/apps/alcs/src/common/automapper/board.automapper.profile.ts index 001971e570..5e3037c840 100644 --- a/services/apps/alcs/src/common/automapper/board.automapper.profile.ts +++ b/services/apps/alcs/src/common/automapper/board.automapper.profile.ts @@ -4,8 +4,8 @@ import { Injectable } from '@nestjs/common'; import { BoardStatus } from '../../alcs/board/board-status.entity'; import { BoardDto, - BoardSmallDto, BoardStatusDto, + MinimalBoardDto, } from '../../alcs/board/board.dto'; import { Board } from '../../alcs/board/board.entity'; import { CardStatusDto } from '../../alcs/card/card-status/card-status.dto'; @@ -21,7 +21,15 @@ export class BoardAutomapperProfile extends AutomapperProfile { override get profile() { return (mapper) => { - createMap(mapper, Board, BoardSmallDto); + createMap( + mapper, + Board, + MinimalBoardDto, + forMember( + (ad) => ad.allowedCardTypes, + mapFrom((a) => a.allowedCardTypes.map((cardType) => cardType.code)), + ), + ); createMap( mapper, diff --git a/services/apps/alcs/src/common/automapper/card.automapper.profile.ts b/services/apps/alcs/src/common/automapper/card.automapper.profile.ts index 48daa040db..fbcabf6d84 100644 --- a/services/apps/alcs/src/common/automapper/card.automapper.profile.ts +++ b/services/apps/alcs/src/common/automapper/card.automapper.profile.ts @@ -37,6 +37,10 @@ export class CardProfile extends AutomapperProfile { (cd) => cd.createdAt, mapFrom((c) => c.createdAt.getTime()), ), + forMember( + (cd) => cd.boardCode, + mapFrom((c) => c.board?.code), + ), forMember( (ad) => ad.assignee, mapFrom((a) => this.mapper.map(a.assignee, User, AssigneeDto)), From 5f3bd4e7a65f1a85f062b8d2a605c9b94aaab568 Mon Sep 17 00:00:00 2001 From: Liam Stoddard Date: Tue, 25 Jul 2023 11:47:14 -0700 Subject: [PATCH 124/954] changed logic to upload last file each time + more descriptive console messages --- bin/migrate-files/migrate-files.py | 52 +++++++++++++++++------------- 1 file changed, 30 insertions(+), 22 deletions(-) diff --git a/bin/migrate-files/migrate-files.py b/bin/migrate-files/migrate-files.py index 04883b2c9a..da82ea0632 100644 --- a/bin/migrate-files/migrate-files.py +++ b/bin/migrate-files/migrate-files.py @@ -44,7 +44,7 @@ def application_docs(starting_document_id,batch,cursor): print(error.message) application_count = cursor.fetchone()[0] - print('Count =', application_count) + print('Application count =', application_count) # # Execute the SQL query to retrieve the BLOB data and key column cursor.execute(f""" @@ -61,7 +61,7 @@ def application_docs(starting_document_id,batch,cursor): last_document_id = 0 try: - with tqdm(total=application_count, unit="file", desc="Uploading files to S3") as pbar: + with tqdm(total=application_count, unit="file", desc="Uploading application files to S3") as pbar: while True: # Fetch the next batch of BLOB data data = cursor.fetchmany(batch) @@ -80,7 +80,7 @@ def application_docs(starting_document_id,batch,cursor): except Exception as e: print("Something went wrong:",e) - print("Processed", documents_processed, "files") + print("Processed", documents_processed, "application files") # Set resume status in case of interuption with open('last-file.pickle', 'wb') as file: @@ -91,7 +91,11 @@ def application_docs(starting_document_id,batch,cursor): exit() # Display results - print("Process complete: Successfully migrated", documents_processed, "files.") + print("Process complete: Successfully migrated", documents_processed, "out of", application_count, "application files.") + + with open('last-file.pickle', 'wb') as file: + pickle.dump(last_document_id, file) + return def planning_docs(starting_planning_document_id,batch,cursor): @@ -103,7 +107,7 @@ def planning_docs(starting_planning_document_id,batch,cursor): print(error.message) planning_review_count = cursor.fetchone()[0] - print('Count =', planning_review_count) + print('Planning_review count =', planning_review_count) # # Execute the SQL query to retrieve the BLOB data and key column cursor.execute(f""" @@ -120,7 +124,7 @@ def planning_docs(starting_planning_document_id,batch,cursor): last_planning_document_id = 0 try: - with tqdm(total=planning_review_count, unit="file", desc="Uploading files to S3") as pbar: + with tqdm(total=planning_review_count, unit="file", desc="Uploading planning_revie files to S3") as pbar: while True: # Fetch the next batch of BLOB data data = cursor.fetchmany(batch) @@ -139,7 +143,7 @@ def planning_docs(starting_planning_document_id,batch,cursor): except Exception as e: print("Something went wrong:",e) - print("Processed", documents_processed, "files") + print("Processed", documents_processed, "planning_review files") # Set resume status in case of interuption with open('last-planning-file.pickle', 'wb') as file: @@ -150,7 +154,11 @@ def planning_docs(starting_planning_document_id,batch,cursor): exit() # Display results - print("Process complete: Successfully migrated", documents_processed, "files.") + print("Process complete: Successfully migrated", documents_processed, "out of", planning_review_count, "planning_review files.") + + with open('last-planning-file.pickle', 'wb') as file: + pickle.dump(last_planning_document_id, file) + return def issue_docs(starting_issue_document_id,batch,cursor): @@ -162,7 +170,7 @@ def issue_docs(starting_issue_document_id,batch,cursor): print(error.message) issue_count = cursor.fetchone()[0] - print('Count =', issue_count) + print('Issue count =', issue_count) # # Execute the SQL query to retrieve the BLOB data and key column cursor.execute(f""" @@ -198,7 +206,7 @@ def issue_docs(starting_issue_document_id,batch,cursor): except Exception as e: print("Something went wrong:",e) - print("Processed", documents_processed, "files") + print("Processed", documents_processed, "issue files") # Set resume status in case of interuption with open('last-issue-file.pickle', 'wb') as file: @@ -209,7 +217,11 @@ def issue_docs(starting_issue_document_id,batch,cursor): exit() # Display results - print("Process complete: Successfully migrated", documents_processed, "files.") + print("Process complete: Successfully migrated", documents_processed, "out of", issue_count, "issue files.") + + with open('last-issue-file.pickle', 'wb') as file: + pickle.dump(last_issue_document_id, file) + return starting_document_id = 0 @@ -217,13 +229,14 @@ def issue_docs(starting_issue_document_id,batch,cursor): if os.path.isfile('last-file.pickle'): with open('last-file.pickle', 'rb') as file: starting_document_id = pickle.load(file) + print('Starting applications from:', starting_document_id) starting_planning_document_id = 0 # Determine job resume status if os.path.isfile('last-planning-file.pickle'): with open('last-planning-file.pickle', 'rb') as file: starting_planning_document_id = pickle.load(file) - print('Starting planning_review from:', starting_planning_document_id) + print('Starting planning_reviews from:', starting_planning_document_id) starting_issue_document_id = 0 # Determine job resume status @@ -237,16 +250,11 @@ def issue_docs(starting_issue_document_id,batch,cursor): # Set batch size batch_size = 10 -if starting_issue_document_id > 0: - issue_docs(starting_issue_document_id,batch_size,cursor) -elif starting_planning_document_id > 0: - planning_docs(starting_planning_document_id,batch_size,cursor) - issue_docs(0,batch_size,cursor) -else: - print('Starting applications from:', starting_document_id) - application_docs(starting_document_id,batch_size,cursor) - planning_docs(0,batch_size,cursor) - issue_docs(0,batch_size,cursor) +application_docs(starting_document_id,batch_size,cursor) +planning_docs(starting_planning_document_id,batch_size,cursor) +issue_docs(starting_issue_document_id,batch_size,cursor) + +print('File upload complete, closing connection') # Close the database cursor and connection cursor.close() From 572bb000f11e72bcf8181fcf2e0c0ffecf29713d Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Mon, 24 Jul 2023 15:40:41 -0700 Subject: [PATCH 125/954] Reduce Network Calls / Loads for Edit Submission * Only save/load the application when components are dirty * Remove logic to auto-save on every step navigation * Add logging to help debug stepper issues --- .../alcs-edit-submission.component.ts | 22 ++++---- .../edit-submission.component.html | 2 + .../edit-submission.component.ts | 20 +++---- .../land-use/land-use.component.ts | 33 +++++++----- .../other-parcels/other-parcels.component.ts | 52 ++++++++++--------- .../parcel-details.component.ts | 40 +++++++------- .../primary-contact.component.ts | 49 ++++++++++------- .../excl-proposal/excl-proposal.component.ts | 2 +- .../nfu-proposal/nfu-proposal.component.ts | 2 +- .../pfrs-proposal.component.html | 20 ++++++- .../pfrs-proposal/pfrs-proposal.component.ts | 7 ++- .../pofo-proposal.component.html | 12 ++++- .../pofo-proposal/pofo-proposal.component.ts | 7 ++- .../roso-proposal.component.html | 12 ++++- .../roso-proposal/roso-proposal.component.ts | 7 ++- .../subd-proposal/subd-proposal.component.ts | 2 +- .../tur-proposal/tur-proposal.component.ts | 2 +- .../select-government.component.ts | 20 ++++--- .../application-submission.service.ts | 6 ++- 19 files changed, 200 insertions(+), 117 deletions(-) diff --git a/portal-frontend/src/app/features/alcs-edit-submission/alcs-edit-submission.component.ts b/portal-frontend/src/app/features/alcs-edit-submission/alcs-edit-submission.component.ts index 4c02b0faaf..5dd7fb0286 100644 --- a/portal-frontend/src/app/features/alcs-edit-submission/alcs-edit-submission.component.ts +++ b/portal-frontend/src/app/features/alcs-edit-submission/alcs-edit-submission.component.ts @@ -54,7 +54,7 @@ export class AlcsEditSubmissionComponent implements OnInit, OnDestroy, AfterView @ViewChild('cdkStepper') public customStepper!: CustomStepperComponent; @ViewChild(ParcelDetailsComponent) parcelDetailsComponent!: ParcelDetailsComponent; - @ViewChild(OtherParcelsComponent) otherParcelsComponent!: OtherAttachmentsComponent; + @ViewChild(OtherParcelsComponent) otherParcelsComponent!: OtherParcelsComponent; @ViewChild(PrimaryContactComponent) primaryContactComponent!: PrimaryContactComponent; @ViewChild(SelectGovernmentComponent) selectGovernmentComponent!: SelectGovernmentComponent; @ViewChild(LandUseComponent) landUseComponent!: LandUseComponent; @@ -135,16 +135,18 @@ export class AlcsEditSubmissionComponent implements OnInit, OnDestroy, AfterView } private async loadDraftSubmission(fileId: string) { - this.overlayService.showSpinner(); - this.applicationSubmission = await this.applicationSubmissionDraftService.getByFileId(fileId); - this.loadOriginalSubmission(fileId); - const documents = await this.applicationDocumentService.getByFileId(fileId); - if (documents) { - this.$applicationDocuments.next(documents); + if (!this.applicationSubmission) { + this.overlayService.showSpinner(); + this.applicationSubmission = await this.applicationSubmissionDraftService.getByFileId(fileId); + this.loadOriginalSubmission(fileId); + const documents = await this.applicationDocumentService.getByFileId(fileId); + if (documents) { + this.$applicationDocuments.next(documents); + } + this.fileId = fileId; + this.$applicationSubmission.next(this.applicationSubmission); + this.overlayService.hideSpinner(); } - this.fileId = fileId; - this.$applicationSubmission.next(this.applicationSubmission); - this.overlayService.hideSpinner(); } // this gets fired whenever applicant navigates away from edit page diff --git a/portal-frontend/src/app/features/edit-submission/edit-submission.component.html b/portal-frontend/src/app/features/edit-submission/edit-submission.component.html index f484aff4db..3e7250145e 100644 --- a/portal-frontend/src/app/features/edit-submission/edit-submission.component.html +++ b/portal-frontend/src/app/features/edit-submission/edit-submission.component.html @@ -41,6 +41,7 @@
[showErrors]="showValidationErrors" (navigateToStep)="onBeforeSwitchStep($event)" (componentInitialized)="onParcelDetailsInitialized()" + (exit)="onExit()" > @@ -51,6 +52,7 @@
[showErrors]="showValidationErrors" [$applicationSubmission]="$applicationSubmission" (navigateToStep)="onBeforeSwitchStep($event)" + (exit)="onExit()" > diff --git a/portal-frontend/src/app/features/edit-submission/edit-submission.component.ts b/portal-frontend/src/app/features/edit-submission/edit-submission.component.ts index 60790c333b..9c60d9f655 100644 --- a/portal-frontend/src/app/features/edit-submission/edit-submission.component.ts +++ b/portal-frontend/src/app/features/edit-submission/edit-submission.component.ts @@ -64,7 +64,7 @@ export class EditSubmissionComponent implements OnInit, OnDestroy, AfterViewInit @ViewChild('cdkStepper') public customStepper!: CustomStepperComponent; @ViewChild(ParcelDetailsComponent) parcelDetailsComponent!: ParcelDetailsComponent; - @ViewChild(OtherParcelsComponent) otherParcelsComponent!: OtherAttachmentsComponent; + @ViewChild(OtherParcelsComponent) otherParcelsComponent!: OtherParcelsComponent; @ViewChild(PrimaryContactComponent) primaryContactComponent!: PrimaryContactComponent; @ViewChild(SelectGovernmentComponent) selectGovernmentComponent!: SelectGovernmentComponent; @ViewChild(LandUseComponent) landUseComponent!: LandUseComponent; @@ -133,15 +133,17 @@ export class EditSubmissionComponent implements OnInit, OnDestroy, AfterViewInit } private async loadApplication(fileId: string) { - this.overlayService.showSpinner(); - this.applicationSubmission = await this.applicationSubmissionService.getByFileId(fileId); - const documents = await this.applicationDocumentService.getByFileId(fileId); - if (documents) { - this.$applicationDocuments.next(documents); + if (!this.applicationSubmission) { + this.overlayService.showSpinner(); + this.applicationSubmission = await this.applicationSubmissionService.getByFileId(fileId); + const documents = await this.applicationDocumentService.getByFileId(fileId); + if (documents) { + this.$applicationDocuments.next(documents); + } + this.fileId = fileId; + this.$applicationSubmission.next(this.applicationSubmission); + this.overlayService.hideSpinner(); } - this.fileId = fileId; - this.$applicationSubmission.next(this.applicationSubmission); - this.overlayService.hideSpinner(); } async onApplicationTypeChangeClicked() { diff --git a/portal-frontend/src/app/features/edit-submission/land-use/land-use.component.ts b/portal-frontend/src/app/features/edit-submission/land-use/land-use.component.ts index ffe5cea54e..6701fb7145 100644 --- a/portal-frontend/src/app/features/edit-submission/land-use/land-use.component.ts +++ b/portal-frontend/src/app/features/edit-submission/land-use/land-use.component.ts @@ -92,20 +92,25 @@ export class LandUseComponent extends StepComponent implements OnInit, OnDestroy } async saveProgress() { - const formValues = this.landUseForm.getRawValue(); - await this.applicationService.updatePending(this.submissionUuid, { - parcelsAgricultureDescription: formValues.parcelsAgricultureDescription, - parcelsAgricultureImprovementDescription: formValues.parcelsAgricultureImprovementDescription, - parcelsNonAgricultureUseDescription: formValues.parcelsNonAgricultureUseDescription, - northLandUseType: formValues.northLandUseType, - northLandUseTypeDescription: formValues.northLandUseTypeDescription, - eastLandUseType: formValues.eastLandUseType, - eastLandUseTypeDescription: formValues.eastLandUseTypeDescription, - southLandUseType: formValues.southLandUseType, - southLandUseTypeDescription: formValues.southLandUseTypeDescription, - westLandUseType: formValues.westLandUseType, - westLandUseTypeDescription: formValues.westLandUseTypeDescription, - }); + if (this.landUseForm.dirty) { + const formValues = this.landUseForm.getRawValue(); + const updatedSubmission = await this.applicationService.updatePending(this.submissionUuid, { + parcelsAgricultureDescription: formValues.parcelsAgricultureDescription, + parcelsAgricultureImprovementDescription: formValues.parcelsAgricultureImprovementDescription, + parcelsNonAgricultureUseDescription: formValues.parcelsNonAgricultureUseDescription, + northLandUseType: formValues.northLandUseType, + northLandUseTypeDescription: formValues.northLandUseTypeDescription, + eastLandUseType: formValues.eastLandUseType, + eastLandUseTypeDescription: formValues.eastLandUseTypeDescription, + southLandUseType: formValues.southLandUseType, + southLandUseTypeDescription: formValues.southLandUseTypeDescription, + westLandUseType: formValues.westLandUseType, + westLandUseTypeDescription: formValues.westLandUseTypeDescription, + }); + if (updatedSubmission) { + this.$applicationSubmission.next(updatedSubmission); + } + } } async onSave() { diff --git a/portal-frontend/src/app/features/edit-submission/other-parcels/other-parcels.component.ts b/portal-frontend/src/app/features/edit-submission/other-parcels/other-parcels.component.ts index b576c4b562..0af4fccb8a 100644 --- a/portal-frontend/src/app/features/edit-submission/other-parcels/other-parcels.component.ts +++ b/portal-frontend/src/app/features/edit-submission/other-parcels/other-parcels.component.ts @@ -129,35 +129,37 @@ export class OtherParcelsComponent extends StepComponent implements OnInit, OnDe // replace placeholder uuid with the real one before saving await this.replacePlaceholderParcel(); - // delete all OTHER parcels if user answered 'NO' on 'Is there other parcels in the community' - if (!parseStringToBoolean(this.hasOtherParcelsInCommunity.getRawValue())) { - if (this.otherParcels.some((e) => e.uuid !== PLACE_HOLDER_UUID_FOR_INITIAL_PARCEL)) { - await this.applicationParcelService.deleteMany( - this.otherParcels.filter((e) => e.uuid !== PLACE_HOLDER_UUID_FOR_INITIAL_PARCEL).map((e) => e.uuid) - ); + if (this.parcelEntryChanged) { + // delete all OTHER parcels if user answered 'NO' on 'Is there other parcels in the community' + if (!parseStringToBoolean(this.hasOtherParcelsInCommunity.getRawValue())) { + if (this.otherParcels.some((e) => e.uuid !== PLACE_HOLDER_UUID_FOR_INITIAL_PARCEL)) { + await this.applicationParcelService.deleteMany( + this.otherParcels.filter((e) => e.uuid !== PLACE_HOLDER_UUID_FOR_INITIAL_PARCEL).map((e) => e.uuid) + ); + } + + return; } - return; - } + for (const parcel of this.otherParcels) { + parcelsToUpdate.push({ + uuid: parcel.uuid, + pid: parcel.pid?.toString() || null, + pin: parcel.pin?.toString() || null, + legalDescription: parcel.legalDescription, + civicAddress: parcel.civicAddress, + isFarm: parcel.isFarm, + purchasedDate: parcel.purchasedDate, + mapAreaHectares: parcel.mapAreaHectares, + ownershipTypeCode: parcel.ownershipTypeCode, + crownLandOwnerType: parcel.crownLandOwnerType, + isConfirmedByApplicant: false, + ownerUuids: parcel.owners.map((owner) => owner.uuid), + }); + } - for (const parcel of this.otherParcels) { - parcelsToUpdate.push({ - uuid: parcel.uuid, - pid: parcel.pid?.toString() || null, - pin: parcel.pin?.toString() || null, - legalDescription: parcel.legalDescription, - civicAddress: parcel.civicAddress, - isFarm: parcel.isFarm, - purchasedDate: parcel.purchasedDate, - mapAreaHectares: parcel.mapAreaHectares, - ownershipTypeCode: parcel.ownershipTypeCode, - crownLandOwnerType: parcel.crownLandOwnerType, - isConfirmedByApplicant: false, - ownerUuids: parcel.owners.map((owner) => owner.uuid), - }); + await this.applicationParcelService.update(parcelsToUpdate); } - - await this.applicationParcelService.update(parcelsToUpdate); } async onSave() { diff --git a/portal-frontend/src/app/features/edit-submission/parcel-details/parcel-details.component.ts b/portal-frontend/src/app/features/edit-submission/parcel-details/parcel-details.component.ts index dcc2ee3388..52fb6bbc48 100644 --- a/portal-frontend/src/app/features/edit-submission/parcel-details/parcel-details.component.ts +++ b/portal-frontend/src/app/features/edit-submission/parcel-details/parcel-details.component.ts @@ -31,6 +31,7 @@ export class ParcelDetailsComponent extends StepComponent implements OnInit, Aft parcels: ApplicationParcelDto[] = []; $owners = new BehaviorSubject([]); newParcelAdded = false; + isDirty = false; constructor( private router: Router, @@ -93,6 +94,7 @@ export class ParcelDetailsComponent extends StepComponent implements OnInit, Aft return; } + this.isDirty = true; parcel.pid = formData.pid !== undefined ? formData.pid : parcel.pid; parcel.pin = formData.pid !== undefined ? formData.pin : parcel.pin; parcel.civicAddress = formData.civicAddress !== undefined ? formData.civicAddress : parcel.civicAddress; @@ -113,25 +115,27 @@ export class ParcelDetailsComponent extends StepComponent implements OnInit, Aft } private async saveProgress() { - const parcelsToUpdate: ApplicationParcelUpdateDto[] = []; - for (const parcel of this.parcels) { - parcelsToUpdate.push({ - uuid: parcel.uuid, - pid: parcel.pid?.toString() || null, - pin: parcel.pin?.toString() || null, - civicAddress: parcel.civicAddress ?? null, - legalDescription: parcel.legalDescription, - isFarm: parcel.isFarm, - purchasedDate: parcel.purchasedDate, - mapAreaHectares: parcel.mapAreaHectares, - ownershipTypeCode: parcel.ownershipTypeCode, - isConfirmedByApplicant: parcel.isConfirmedByApplicant, - crownLandOwnerType: parcel.crownLandOwnerType, - ownerUuids: parcel.owners.map((owner) => owner.uuid), - }); + if (this.isDirty || this.newParcelAdded) { + const parcelsToUpdate: ApplicationParcelUpdateDto[] = []; + for (const parcel of this.parcels) { + parcelsToUpdate.push({ + uuid: parcel.uuid, + pid: parcel.pid?.toString() || null, + pin: parcel.pin?.toString() || null, + civicAddress: parcel.civicAddress ?? null, + legalDescription: parcel.legalDescription, + isFarm: parcel.isFarm, + purchasedDate: parcel.purchasedDate, + mapAreaHectares: parcel.mapAreaHectares, + ownershipTypeCode: parcel.ownershipTypeCode, + isConfirmedByApplicant: parcel.isConfirmedByApplicant, + crownLandOwnerType: parcel.crownLandOwnerType, + ownerUuids: parcel.owners.map((owner) => owner.uuid), + }); + } + await this.applicationParcelService.update(parcelsToUpdate); + //TODO: Do we need to reload submission? } - - await this.applicationParcelService.update(parcelsToUpdate); } async onSave() { diff --git a/portal-frontend/src/app/features/edit-submission/primary-contact/primary-contact.component.ts b/portal-frontend/src/app/features/edit-submission/primary-contact/primary-contact.component.ts index 71d0d984a6..5993e5c9c3 100644 --- a/portal-frontend/src/app/features/edit-submission/primary-contact/primary-contact.component.ts +++ b/portal-frontend/src/app/features/edit-submission/primary-contact/primary-contact.component.ts @@ -31,6 +31,7 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni isCrownOwner = false; isLocalGovernmentUser = false; governmentName: string | undefined; + isDirty = false; firstName = new FormControl('', [Validators.required]); lastName = new FormControl('', [Validators.required]); @@ -94,6 +95,7 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni } onSelectOwner(uuid: string) { + this.isDirty = true; this.selectedOwnerUuid = uuid; const selectedOwner = this.parcelOwners.find((owner) => owner.uuid === uuid); this.parcelOwners = this.parcelOwners.map((owner) => ({ @@ -152,29 +154,37 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni } protected async save() { - let selectedOwner: ApplicationOwnerDto | undefined = this.owners.find( - (owner) => owner.uuid === this.selectedOwnerUuid - ); + if (this.isDirty || this.form.dirty) { + let selectedOwner: ApplicationOwnerDto | undefined = this.owners.find( + (owner) => owner.uuid === this.selectedOwnerUuid + ); - if (this.selectedThirdPartyAgent || this.selectedLocalGovernment) { - await this.applicationOwnerService.setPrimaryContact({ - applicationSubmissionUuid: this.submissionUuid, - organization: this.organizationName.getRawValue() ?? '', - firstName: this.firstName.getRawValue() ?? '', - lastName: this.lastName.getRawValue() ?? '', - email: this.email.getRawValue() ?? '', - phoneNumber: this.phoneNumber.getRawValue() ?? '', - ownerUuid: selectedOwner?.uuid, - type: this.selectedThirdPartyAgent ? APPLICATION_OWNER.AGENT : APPLICATION_OWNER.GOVERNMENT, - }); - } else if (selectedOwner) { - await this.applicationOwnerService.setPrimaryContact({ - applicationSubmissionUuid: this.submissionUuid, - ownerUuid: selectedOwner.uuid, - }); + if (this.selectedThirdPartyAgent || this.selectedLocalGovernment) { + await this.applicationOwnerService.setPrimaryContact({ + applicationSubmissionUuid: this.submissionUuid, + organization: this.organizationName.getRawValue() ?? '', + firstName: this.firstName.getRawValue() ?? '', + lastName: this.lastName.getRawValue() ?? '', + email: this.email.getRawValue() ?? '', + phoneNumber: this.phoneNumber.getRawValue() ?? '', + ownerUuid: selectedOwner?.uuid, + type: this.selectedThirdPartyAgent ? APPLICATION_OWNER.AGENT : APPLICATION_OWNER.GOVERNMENT, + }); + } else if (selectedOwner) { + await this.applicationOwnerService.setPrimaryContact({ + applicationSubmissionUuid: this.submissionUuid, + ownerUuid: selectedOwner.uuid, + }); + } + await this.reloadApplication(); } } + private async reloadApplication() { + const application = await this.applicationService.getByUuid(this.submissionUuid); + this.$applicationSubmission.next(application); + } + private async loadOwners(submissionUuid: string, primaryContactOwnerUuid?: string) { const owners = await this.applicationOwnerService.fetchBySubmissionId(submissionUuid); if (owners) { @@ -215,6 +225,7 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni if (this.showErrors) { this.form.markAllAsTouched(); } + this.isDirty = false; } } diff --git a/portal-frontend/src/app/features/edit-submission/proposal/excl-proposal/excl-proposal.component.ts b/portal-frontend/src/app/features/edit-submission/proposal/excl-proposal/excl-proposal.component.ts index aa6e46f03a..9205eb6159 100644 --- a/portal-frontend/src/app/features/edit-submission/proposal/excl-proposal/excl-proposal.component.ts +++ b/portal-frontend/src/app/features/edit-submission/proposal/excl-proposal/excl-proposal.component.ts @@ -91,7 +91,7 @@ export class ExclProposalComponent extends FilesStepComponent implements OnInit, } protected async save() { - if (this.fileId) { + if (this.fileId && this.form.dirty) { const inclExclHectares = this.hectares.value; const purpose = this.purpose.value; const exclWhyLand = this.whyExclude.value; diff --git a/portal-frontend/src/app/features/edit-submission/proposal/nfu-proposal/nfu-proposal.component.ts b/portal-frontend/src/app/features/edit-submission/proposal/nfu-proposal/nfu-proposal.component.ts index c2f9e5573a..b063aff119 100644 --- a/portal-frontend/src/app/features/edit-submission/proposal/nfu-proposal/nfu-proposal.component.ts +++ b/portal-frontend/src/app/features/edit-submission/proposal/nfu-proposal/nfu-proposal.component.ts @@ -87,7 +87,7 @@ export class NfuProposalComponent extends StepComponent implements OnInit, OnDes } private async save() { - if (this.fileId) { + if (this.fileId && this.form.dirty) { const nfuHectares = this.hectares.getRawValue(); const purpose = this.purpose.getRawValue(); const nfuOutsideLands = this.outsideLands.getRawValue(); diff --git a/portal-frontend/src/app/features/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.html b/portal-frontend/src/app/features/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.html index f589f11490..c011f7ad47 100644 --- a/portal-frontend/src/app/features/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.html +++ b/portal-frontend/src/app/features/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.html @@ -148,9 +148,21 @@

Proposal

tableHeader2="Fill to be Placed" [(data)]="removalTableData" [(data2)]="fillTableData" + (dataChange)="markDirty()" + (data2Change)="markDirty()" + > + + - -
tableHeader2="Fill already Placed" [(data)]="alreadyRemovedTableData" [(data2)]="alreadyFilledTableData" + (dataChange)="markDirty()" + (data2Change)="markDirty()" > diff --git a/portal-frontend/src/app/features/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.ts b/portal-frontend/src/app/features/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.ts index 042cafd6b4..a61ca5a1e3 100644 --- a/portal-frontend/src/app/features/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.ts +++ b/portal-frontend/src/app/features/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.ts @@ -35,6 +35,7 @@ export class PfrsProposalComponent extends FilesStepComponent implements OnInit, crossSections: ApplicationDocumentDto[] = []; reclamationPlan: ApplicationDocumentDto[] = []; noticeOfWork: ApplicationDocumentDto[] = []; + areComponentsDirty = false; isNOIFollowUp = new FormControl(null, [Validators.required]); NOIIDs = new FormControl({ value: null, disabled: true }, [Validators.required]); @@ -186,7 +187,7 @@ export class PfrsProposalComponent extends FilesStepComponent implements OnInit, } protected async save() { - if (this.fileId) { + if (this.fileId && (this.form.dirty || this.areComponentsDirty)) { const isNOIFollowUp = this.isNOIFollowUp.getRawValue(); const soilNOIIDs = this.NOIIDs.getRawValue(); const hasALCAuthorization = this.hasALCAuthorization.getRawValue(); @@ -266,4 +267,8 @@ export class PfrsProposalComponent extends FilesStepComponent implements OnInit, onChangeNoticeOfWork(selectedValue: string) { this.requiresNoticeOfWork = selectedValue === 'true'; } + + markDirty() { + this.areComponentsDirty = true; + } } diff --git a/portal-frontend/src/app/features/edit-submission/proposal/pofo-proposal/pofo-proposal.component.html b/portal-frontend/src/app/features/edit-submission/proposal/pofo-proposal/pofo-proposal.component.html index 4c0b01cccc..417b8a580a 100644 --- a/portal-frontend/src/app/features/edit-submission/proposal/pofo-proposal/pofo-proposal.component.html +++ b/portal-frontend/src/app/features/edit-submission/proposal/pofo-proposal/pofo-proposal.component.html @@ -142,14 +142,22 @@

Proposal

Please refer to Contact Us on the ALC website for more detail. - +
If no proposed fill has already been placed, please leave 0 in the fields below
- +
diff --git a/portal-frontend/src/app/features/edit-submission/proposal/pofo-proposal/pofo-proposal.component.ts b/portal-frontend/src/app/features/edit-submission/proposal/pofo-proposal/pofo-proposal.component.ts index 5536e09cec..1fac888d36 100644 --- a/portal-frontend/src/app/features/edit-submission/proposal/pofo-proposal/pofo-proposal.component.ts +++ b/portal-frontend/src/app/features/edit-submission/proposal/pofo-proposal/pofo-proposal.component.ts @@ -53,6 +53,7 @@ export class PofoProposalComponent extends FilesStepComponent implements OnInit, }); private submissionUuid = ''; + private areComponentsDirty = false; fillTableData: SoilTableData = {}; alreadyFilledTableData: SoilTableData = {}; @@ -131,7 +132,7 @@ export class PofoProposalComponent extends FilesStepComponent implements OnInit, } protected async save() { - if (this.fileId) { + if (this.fileId && this.form.dirty) { const isNOIFollowUp = this.isNOIFollowUp.getRawValue(); const soilNOIIDs = this.NOIIDs.getRawValue(); const hasALCAuthorization = this.hasALCAuthorization.getRawValue(); @@ -186,4 +187,8 @@ export class PofoProposalComponent extends FilesStepComponent implements OnInit, this.applicationIDs.setValue(null); } } + + markDirty() { + this.areComponentsDirty = true; + } } diff --git a/portal-frontend/src/app/features/edit-submission/proposal/roso-proposal/roso-proposal.component.html b/portal-frontend/src/app/features/edit-submission/proposal/roso-proposal/roso-proposal.component.html index 60488655d4..1719a9f3fd 100644 --- a/portal-frontend/src/app/features/edit-submission/proposal/roso-proposal/roso-proposal.component.html +++ b/portal-frontend/src/app/features/edit-submission/proposal/roso-proposal/roso-proposal.component.html @@ -142,7 +142,11 @@

Proposal

Please refer to Contact Us on the ALC website for more detail. - +

removed.
If no proposed soil has already been removed, please leave 0 in the fields below
- +
diff --git a/portal-frontend/src/app/features/edit-submission/proposal/roso-proposal/roso-proposal.component.ts b/portal-frontend/src/app/features/edit-submission/proposal/roso-proposal/roso-proposal.component.ts index 216e12b954..e3934f7b86 100644 --- a/portal-frontend/src/app/features/edit-submission/proposal/roso-proposal/roso-proposal.component.ts +++ b/portal-frontend/src/app/features/edit-submission/proposal/roso-proposal/roso-proposal.component.ts @@ -38,6 +38,7 @@ export class RosoProposalComponent extends FilesStepComponent implements OnInit, reduceNegativeImpacts = new FormControl(null, [Validators.required]); projectDurationAmount = new FormControl(null, [Validators.required]); projectDurationUnit = new FormControl(null, [Validators.required]); + areComponentsDirty = false; form = new FormGroup({ isNOIFollowUp: this.isNOIFollowUp, @@ -129,7 +130,7 @@ export class RosoProposalComponent extends FilesStepComponent implements OnInit, } protected async save() { - if (this.fileId) { + if (this.fileId && this.form.dirty) { const isNOIFollowUp = this.isNOIFollowUp.getRawValue(); const soilNOIIDs = this.NOIIDs.getRawValue(); const hasALCAuthorization = this.hasALCAuthorization.getRawValue(); @@ -182,4 +183,8 @@ export class RosoProposalComponent extends FilesStepComponent implements OnInit, this.applicationIDs.setValue(null); } } + + markDirty() { + this.areComponentsDirty = true; + } } diff --git a/portal-frontend/src/app/features/edit-submission/proposal/subd-proposal/subd-proposal.component.ts b/portal-frontend/src/app/features/edit-submission/proposal/subd-proposal/subd-proposal.component.ts index 6e73edff80..86b663dcd1 100644 --- a/portal-frontend/src/app/features/edit-submission/proposal/subd-proposal/subd-proposal.component.ts +++ b/portal-frontend/src/app/features/edit-submission/proposal/subd-proposal/subd-proposal.component.ts @@ -104,7 +104,7 @@ export class SubdProposalComponent extends FilesStepComponent implements OnInit, } protected async save() { - if (this.fileId) { + if (this.fileId && this.form.dirty) { const purpose = this.purpose.getRawValue(); const subdSuitability = this.suitability.getRawValue(); const subdAgricultureSupport = this.agriculturalSupport.getRawValue(); diff --git a/portal-frontend/src/app/features/edit-submission/proposal/tur-proposal/tur-proposal.component.ts b/portal-frontend/src/app/features/edit-submission/proposal/tur-proposal/tur-proposal.component.ts index 30b4b08fa0..f0f9a2e831 100644 --- a/portal-frontend/src/app/features/edit-submission/proposal/tur-proposal/tur-proposal.component.ts +++ b/portal-frontend/src/app/features/edit-submission/proposal/tur-proposal/tur-proposal.component.ts @@ -84,7 +84,7 @@ export class TurProposalComponent extends FilesStepComponent implements OnInit, } protected async save() { - if (this.fileId) { + if (this.fileId && this.form.dirty) { const purpose = this.purpose.getRawValue(); const turOutsideLands = this.outsideLands.getRawValue(); const turAgriculturalActivities = this.agriculturalActivities.getRawValue(); diff --git a/portal-frontend/src/app/features/edit-submission/select-government/select-government.component.ts b/portal-frontend/src/app/features/edit-submission/select-government/select-government.component.ts index 830d2a8ae5..9acdf56fd4 100644 --- a/portal-frontend/src/app/features/edit-submission/select-government/select-government.component.ts +++ b/portal-frontend/src/app/features/edit-submission/select-government/select-government.component.ts @@ -26,6 +26,7 @@ export class SelectGovernmentComponent extends StepComponent implements OnInit, selectGovernmentUuid = ''; localGovernments: LocalGovernmentDto[] = []; filteredLocalGovernments!: Observable; + isDirty = false; form = new FormGroup({ localGovernment: this.localGovernment, @@ -58,6 +59,7 @@ export class SelectGovernmentComponent extends StepComponent implements OnInit, } onChange($event: MatAutocompleteSelectedEvent) { + this.isDirty = true; const localGovernmentName = $event.option.value; if (localGovernmentName) { const localGovernment = this.localGovernments.find((lg) => lg.name == localGovernmentName); @@ -95,15 +97,19 @@ export class SelectGovernmentComponent extends StepComponent implements OnInit, } private async save() { - const localGovernmentName = this.localGovernment.getRawValue(); - if (localGovernmentName) { - const localGovernment = this.localGovernments.find((lg) => lg.name == localGovernmentName); + if (this.isDirty) { + const localGovernmentName = this.localGovernment.getRawValue(); + if (localGovernmentName) { + const localGovernment = this.localGovernments.find((lg) => lg.name == localGovernmentName); - if (localGovernment) { - await this.applicationSubmissionService.updatePending(this.submissionUuid, { - localGovernmentUuid: localGovernment.uuid, - }); + if (localGovernment) { + const res = await this.applicationSubmissionService.updatePending(this.submissionUuid, { + localGovernmentUuid: localGovernment.uuid, + }); + this.$applicationSubmission.next(res); + } } + this.isDirty = false; } } diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.service.ts b/services/apps/alcs/src/portal/application-submission/application-submission.service.ts index b87504f608..db0be19151 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.service.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.service.ts @@ -154,8 +154,10 @@ export class ApplicationSubmissionService { const applicationSubmission = await this.getOrFailByUuid(submissionUuid); applicationSubmission.applicant = updateDto.applicant; - applicationSubmission.purpose = - updateDto.purpose || applicationSubmission.purpose; + applicationSubmission.purpose = filterUndefined( + updateDto.purpose, + applicationSubmission.purpose, + ); applicationSubmission.typeCode = updateDto.typeCode || applicationSubmission.typeCode; applicationSubmission.localGovernmentUuid = updateDto.localGovernmentUuid; From 97ada8f6205f6622d9cb5e929ebcee7155ba33c7 Mon Sep 17 00:00:00 2001 From: Liam Stoddard Date: Tue, 25 Jul 2023 13:06:59 -0700 Subject: [PATCH 126/954] added detail to 'something went wrong' --- bin/migrate-files/migrate-files.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/bin/migrate-files/migrate-files.py b/bin/migrate-files/migrate-files.py index da82ea0632..40e8e29676 100644 --- a/bin/migrate-files/migrate-files.py +++ b/bin/migrate-files/migrate-files.py @@ -79,7 +79,7 @@ def application_docs(starting_document_id,batch,cursor): documents_processed += 1 except Exception as e: - print("Something went wrong:",e) + print("Something went wrong with application document upload:",e) print("Processed", documents_processed, "application files") # Set resume status in case of interuption @@ -124,7 +124,7 @@ def planning_docs(starting_planning_document_id,batch,cursor): last_planning_document_id = 0 try: - with tqdm(total=planning_review_count, unit="file", desc="Uploading planning_revie files to S3") as pbar: + with tqdm(total=planning_review_count, unit="file", desc="Uploading planning_review files to S3") as pbar: while True: # Fetch the next batch of BLOB data data = cursor.fetchmany(batch) @@ -142,7 +142,7 @@ def planning_docs(starting_planning_document_id,batch,cursor): documents_processed += 1 except Exception as e: - print("Something went wrong:",e) + print("Something went wrong with planning_review document upload:",e) print("Processed", documents_processed, "planning_review files") # Set resume status in case of interuption @@ -187,7 +187,7 @@ def issue_docs(starting_issue_document_id,batch,cursor): last_issue_document_id = 0 try: - with tqdm(total=issue_count, unit="file", desc="Uploading files to S3") as pbar: + with tqdm(total=issue_count, unit="file", desc="Uploading issue files to S3") as pbar: while True: # Fetch the next batch of BLOB data data = cursor.fetchmany(batch) @@ -205,7 +205,7 @@ def issue_docs(starting_issue_document_id,batch,cursor): documents_processed += 1 except Exception as e: - print("Something went wrong:",e) + print("Something went wrong with issue document upload:",e) print("Processed", documents_processed, "issue files") # Set resume status in case of interuption From 3858bf95c83b4d16e15f29be2dfaf3481fb85a60 Mon Sep 17 00:00:00 2001 From: "to. sandra" <76515860+sandratoh@users.noreply.github.com> Date: Tue, 25 Jul 2023 14:53:08 -0700 Subject: [PATCH 127/954] Add Exclusion Step 8 Review & View section (#819) * Fix empty purpose update * Add exclusion proposal review section * Add missing field descriptions and update styling to match design * Fix dialog action buttons layout to be on the right --- .../application-details.component.html | 9 ++ .../application-details.module.ts | 2 + .../excl-details/excl-details.component.html | 86 +++++++++++++++++++ .../excl-details/excl-details.component.scss | 0 .../excl-details.component.spec.ts | 37 ++++++++ .../excl-details/excl-details.component.ts | 58 +++++++++++++ .../create-application-dialog.component.html | 2 +- .../excl-proposal.component.html | 13 ++- .../excl-proposal.component.scss | 4 + 9 files changed, 207 insertions(+), 4 deletions(-) create mode 100644 portal-frontend/src/app/features/application-details/excl-details/excl-details.component.html create mode 100644 portal-frontend/src/app/features/application-details/excl-details/excl-details.component.scss create mode 100644 portal-frontend/src/app/features/application-details/excl-details/excl-details.component.spec.ts create mode 100644 portal-frontend/src/app/features/application-details/excl-details/excl-details.component.ts diff --git a/portal-frontend/src/app/features/application-details/application-details.component.html b/portal-frontend/src/app/features/application-details/application-details.component.html index 2f955132ec..65529b59be 100644 --- a/portal-frontend/src/app/features/application-details/application-details.component.html +++ b/portal-frontend/src/app/features/application-details/application-details.component.html @@ -291,6 +291,15 @@

6. Proposal

[applicationDocuments]="appDocuments" [updatedFields]="updatedFields" > +

7. Optional Documents

diff --git a/portal-frontend/src/app/features/application-details/application-details.module.ts b/portal-frontend/src/app/features/application-details/application-details.module.ts index 18e913017f..c92b3d1b1b 100644 --- a/portal-frontend/src/app/features/application-details/application-details.module.ts +++ b/portal-frontend/src/app/features/application-details/application-details.module.ts @@ -11,6 +11,7 @@ import { PofoDetailsComponent } from './pofo-details/pofo-details.component'; 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'; @NgModule({ declarations: [ @@ -23,6 +24,7 @@ import { TurDetailsComponent } from './tur-details/tur-details.component'; PofoDetailsComponent, PfrsDetailsComponent, NaruDetailsComponent, + ExclDetailsComponent, ], imports: [CommonModule, SharedModule, NgxMaskPipe], exports: [ApplicationDetailsComponent], diff --git a/portal-frontend/src/app/features/application-details/excl-details/excl-details.component.html b/portal-frontend/src/app/features/application-details/excl-details/excl-details.component.html new file mode 100644 index 0000000000..808b49d80d --- /dev/null +++ b/portal-frontend/src/app/features/application-details/excl-details/excl-details.component.html @@ -0,0 +1,86 @@ +
+
+ The governmental or prescribed public body that is applying to exclude land + +
+
+ {{ _applicationSubmission.prescribedBody }} +
+ +
+ How many hectares are you proposing to exclude? (hectares) + +
+
+ {{ _applicationSubmission.inclExclHectares }} + +
+ +
+ Does any land under application share a common property line with land in another Local or First Nation Government? + +
+
+ + {{ _applicationSubmission.exclShareGovernmentBorders ? 'Yes' : 'No' }} + + +
+ +
+ What is the purpose of the proposal? + +
+
+ {{ _applicationSubmission.purpose }} + +
+ +
+ Explain why you believe that the parcel(s) should be excluded from the ALR + +
+
+ {{ _applicationSubmission.exclWhyLand }} + +
+ +
Proposal Map / Site Plan
+
+ + {{ map.fileName }} + + +
+ +
Notice of Public Hearing (Advertisement)
+
+ + {{ file.fileName }} + + +
+ +
Proof of Signage
+
+ + {{ file.fileName }} + + +
+ +
Report of Public Hearing
+
+ + {{ file.fileName }} + + +
+ +
+ +
+
diff --git a/portal-frontend/src/app/features/application-details/excl-details/excl-details.component.scss b/portal-frontend/src/app/features/application-details/excl-details/excl-details.component.scss new file mode 100644 index 0000000000..e69de29bb2 diff --git a/portal-frontend/src/app/features/application-details/excl-details/excl-details.component.spec.ts b/portal-frontend/src/app/features/application-details/excl-details/excl-details.component.spec.ts new file mode 100644 index 0000000000..e021e28723 --- /dev/null +++ b/portal-frontend/src/app/features/application-details/excl-details/excl-details.component.spec.ts @@ -0,0 +1,37 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { DeepMocked } from '@golevelup/ts-jest'; + +import { ExclDetailsComponent } from './excl-details.component'; +import { ApplicationDocumentService } from '../../../services/application-document/application-document.service'; +import { ApplicationParcelService } from '../../../services/application-parcel/application-parcel.service'; + +describe('ExclDetailsComponent', () => { + let component: ExclDetailsComponent; + let fixture: ComponentFixture; + let mockAppDocumentService: DeepMocked; + let mockAppParcelService: DeepMocked; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ExclDetailsComponent], + providers: [ + { + provide: ApplicationDocumentService, + useValue: mockAppDocumentService, + }, + { + provide: ApplicationParcelService, + useValue: mockAppParcelService, + }, + ], + }).compileComponents(); + + fixture = TestBed.createComponent(ExclDetailsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/application-details/excl-details/excl-details.component.ts b/portal-frontend/src/app/features/application-details/excl-details/excl-details.component.ts new file mode 100644 index 0000000000..d7ea9ecdf9 --- /dev/null +++ b/portal-frontend/src/app/features/application-details/excl-details/excl-details.component.ts @@ -0,0 +1,58 @@ +import { Component, Input } from '@angular/core'; +import { Router } from '@angular/router'; +import { ApplicationDocumentService } from '../../../services/application-document/application-document.service'; +import { ApplicationSubmissionDetailedDto } from '../../../services/application-submission/application-submission.dto'; +import { ApplicationDocumentDto, DOCUMENT_TYPE } from '../../../services/application-document/application-document.dto'; + +@Component({ + selector: 'app-excl-details', + templateUrl: './excl-details.component.html', + styleUrls: ['./excl-details.component.scss'], +}) +export class ExclDetailsComponent { + @Input() showErrors = true; + @Input() showEdit = true; + @Input() draftMode = false; + @Input() updatedFields: string[] = []; + + _applicationSubmission: ApplicationSubmissionDetailedDto | undefined; + + @Input() set applicationSubmission(applicationSubmission: ApplicationSubmissionDetailedDto | undefined) { + if (applicationSubmission) { + this._applicationSubmission = applicationSubmission; + } + } + + @Input() set applicationDocuments(documents: ApplicationDocumentDto[]) { + this.proposalMap = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.PROPOSAL_MAP); + this.noticeOfPublicHearing = documents.filter( + (document) => document.type?.code === DOCUMENT_TYPE.PROOF_OF_ADVERTISING + ); + this.proofOfSignage = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.PROOF_OF_SIGNAGE); + this.reportOfPublicHearing = documents.filter( + (document) => document.type?.code === DOCUMENT_TYPE.REPORT_OF_PUBLIC_HEARING + ); + } + + proposalMap: ApplicationDocumentDto[] = []; + noticeOfPublicHearing: ApplicationDocumentDto[] = []; + proofOfSignage: ApplicationDocumentDto[] = []; + reportOfPublicHearing: ApplicationDocumentDto[] = []; + + constructor(private router: Router, private applicationDocumentService: ApplicationDocumentService) {} + + async onEditSection(step: number) { + if (this.draftMode) { + await this.router.navigateByUrl( + `/alcs/application/${this._applicationSubmission?.fileNumber}/edit/${step}?errors=t` + ); + } else { + await this.router.navigateByUrl(`application/${this._applicationSubmission?.fileNumber}/edit/${step}?errors=t`); + } + } + + async openFile(uuid: string) { + const res = await this.applicationDocumentService.openFile(uuid); + window.open(res?.url, '_blank'); + } +} diff --git a/portal-frontend/src/app/features/create-application-dialog/create-application-dialog.component.html b/portal-frontend/src/app/features/create-application-dialog/create-application-dialog.component.html index 8b840722d3..5cfbd26303 100644 --- a/portal-frontend/src/app/features/create-application-dialog/create-application-dialog.component.html +++ b/portal-frontend/src/app/features/create-application-dialog/create-application-dialog.component.html @@ -88,7 +88,7 @@

-
+
diff --git a/portal-frontend/src/app/features/edit-submission/proposal/excl-proposal/excl-proposal.component.html b/portal-frontend/src/app/features/edit-submission/proposal/excl-proposal/excl-proposal.component.html index 0949656217..16e5546590 100644 --- a/portal-frontend/src/app/features/edit-submission/proposal/excl-proposal/excl-proposal.component.html +++ b/portal-frontend/src/app/features/edit-submission/proposal/excl-proposal/excl-proposal.component.html @@ -30,6 +30,7 @@

Proposal

+
Note: 0.01 ha is 100m2
Proposal

Does any land under application share a common property line with land in another Local or First Nation Government? +
+ If any property under application shares a common boundary with a neighbouring Local or First Nation Government, + then that government must be notified of the application and given the opportunity to comment. +
Proposal
+
+ Be clear and concise in describing the proposal. Include why you are applying for exclusion and what the + proposal will achieve. +
Example: 40 ha of grazing land fenced in 2010.
- Characters left: {{ 4000 - outsideLandsText.textLength }} + Characters left: {{ 4000 - improvementsText.textLength }}
warning
This field is required
@@ -118,9 +118,119 @@

Proposal

[isRequired]="true" >
+
+ +
+ The ALR General Regulation does not require the {{ governmentName }} to complete a public hearing if all + inclusion application parcel(s) are owned by the {{ governmentName }}. +
+ Please refer to Inclusion page on the ALC website for more information. + + Yes + No + +
+ warning +
This field is required
+
+
+
+

Notification and Public Hearing Requirements

+

+ A printed copy of the application will need to be used for notification. Please ensure all prior fields are complete + and correct before downloading the PDF of the application (Step 8 of this application form will flag outstanding + fields). +

+ + + + You will not be able to complete the remaining portion of the application until the notification and public hearing + process is complete. + +
+
+
+ +
+ Proof that notice of the application was provided in a form and manner acceptable to the Commission +
+ +
+
+ +
+ Proof that a sign, in a form and manner acceptable to the Commission, was posted on the land that is the + subject of the application +
+ +
+
+ +
Public hearing report and any other public comments received
+ +
+
+ +
+
diff --git a/portal-frontend/src/app/features/edit-submission/proposal/incl-proposal/incl-proposal.component.scss b/portal-frontend/src/app/features/edit-submission/proposal/incl-proposal/incl-proposal.component.scss index e69de29bb2..b435af700d 100644 --- a/portal-frontend/src/app/features/edit-submission/proposal/incl-proposal/incl-proposal.component.scss +++ b/portal-frontend/src/app/features/edit-submission/proposal/incl-proposal/incl-proposal.component.scss @@ -0,0 +1,9 @@ +@use '../../../../../styles/functions' as *; + +section { + margin-top: rem(32); +} + +.requirement-description { + margin: rem(8) 0 !important; +} diff --git a/portal-frontend/src/app/features/edit-submission/proposal/incl-proposal/incl-proposal.component.spec.ts b/portal-frontend/src/app/features/edit-submission/proposal/incl-proposal/incl-proposal.component.spec.ts index a0b183b23d..bda063fcdc 100644 --- a/portal-frontend/src/app/features/edit-submission/proposal/incl-proposal/incl-proposal.component.spec.ts +++ b/portal-frontend/src/app/features/edit-submission/proposal/incl-proposal/incl-proposal.component.spec.ts @@ -1,8 +1,10 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MatDialog } from '@angular/material/dialog'; -import { DeepMocked } from '@golevelup/ts-jest'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { BehaviorSubject } from 'rxjs'; +import { UserDto } from '../../../../services/authentication/authentication.dto'; +import { AuthenticationService } from '../../../../services/authentication/authentication.service'; import { InclProposalComponent } from './incl-proposal.component'; import { ApplicationSubmissionService } from '../../../../services/application-submission/application-submission.service'; import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; @@ -14,8 +16,14 @@ describe('InclProposalComponent', () => { let fixture: ComponentFixture; let mockApplicationService: DeepMocked; let mockAppDocumentService: DeepMocked; + let mockAuthService: DeepMocked; beforeEach(async () => { + mockApplicationService = createMock(); + mockAppDocumentService = createMock(); + mockAuthService = createMock(); + mockAuthService.$currentProfile = new BehaviorSubject(undefined); + await TestBed.configureTestingModule({ providers: [ { @@ -26,6 +34,10 @@ describe('InclProposalComponent', () => { provide: ApplicationDocumentService, useValue: mockAppDocumentService, }, + { + provide: AuthenticationService, + useValue: mockAuthService, + }, { provide: MatDialog, useValue: {}, diff --git a/portal-frontend/src/app/features/edit-submission/proposal/incl-proposal/incl-proposal.component.ts b/portal-frontend/src/app/features/edit-submission/proposal/incl-proposal/incl-proposal.component.ts index 6f320455a1..1716091ead 100644 --- a/portal-frontend/src/app/features/edit-submission/proposal/incl-proposal/incl-proposal.component.ts +++ b/portal-frontend/src/app/features/edit-submission/proposal/incl-proposal/incl-proposal.component.ts @@ -1,4 +1,8 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; +import { MatButtonToggleChange } from '@angular/material/button-toggle'; +import { AuthenticationService } from '../../../../services/authentication/authentication.service'; +import { formatBooleanToString } from '../../../../shared/utils/boolean-helper'; +import { parseStringToBoolean } from '../../../../shared/utils/string-helper'; import { FilesStepComponent } from '../../files-step.partial'; import { ApplicationSubmissionService } from '../../../../services/application-submission/application-submission.service'; import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; @@ -19,13 +23,17 @@ import { ApplicationSubmissionUpdateDto } from '../../../../services/application }) export class InclProposalComponent extends FilesStepComponent implements OnInit, OnDestroy { DOCUMENT = DOCUMENT_TYPE; - currentStep = EditApplicationSteps.Proposal; + private submissionUuid = ''; + isGovernmentUser = false; + governmentName? = ''; + disableNotificationFileUploads = false; hectares = new FormControl(null, [Validators.required]); purpose = new FormControl(null, [Validators.required]); agSupport = new FormControl(null, [Validators.required]); improvements = new FormControl(null, [Validators.required]); + governmentOwnsAllParcels = new FormControl(undefined, [Validators.required]); form = new FormGroup({ hectares: this.hectares, @@ -33,11 +41,15 @@ export class InclProposalComponent extends FilesStepComponent implements OnInit, agSupport: this.agSupport, improvements: this.improvements, }); - private submissionUuid = ''; + proposalMap: ApplicationDocumentDto[] = []; + noticeOfPublicHearing: ApplicationDocumentDto[] = []; + proofOfSignage: ApplicationDocumentDto[] = []; + reportOfPublicHearing: ApplicationDocumentDto[] = []; constructor( private applicationSubmissionService: ApplicationSubmissionService, + private authenticationService: AuthenticationService, applicationDocumentService: ApplicationDocumentService, dialog: MatDialog ) { @@ -57,6 +69,13 @@ export class InclProposalComponent extends FilesStepComponent implements OnInit, improvements: applicationSubmission.inclImprovements, }); + if (applicationSubmission.inclGovernmentOwnsAllParcels !== null) { + this.governmentOwnsAllParcels.setValue( + formatBooleanToString(applicationSubmission.inclGovernmentOwnsAllParcels) + ); + this.disableNotificationFileUploads = applicationSubmission.inclGovernmentOwnsAllParcels; + } + if (this.showErrors) { this.form.markAllAsTouched(); } @@ -65,6 +84,23 @@ export class InclProposalComponent extends FilesStepComponent implements OnInit, this.$applicationDocuments.pipe(takeUntil(this.$destroy)).subscribe((documents) => { this.proposalMap = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.PROPOSAL_MAP); + this.noticeOfPublicHearing = documents.filter( + (document) => document.type?.code === DOCUMENT_TYPE.PROOF_OF_ADVERTISING + ); + this.proofOfSignage = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.PROOF_OF_SIGNAGE); + this.reportOfPublicHearing = documents.filter( + (document) => document.type?.code === DOCUMENT_TYPE.REPORT_OF_PUBLIC_HEARING + ); + }); + + this.authenticationService.$currentProfile.pipe(takeUntil(this.$destroy)).subscribe((userProfile) => { + if (userProfile) { + this.isGovernmentUser = userProfile?.isLocalGovernment || userProfile?.isFirstNationGovernment; + this.governmentName = userProfile.government; + + // @ts-ignore Angular / Typescript hate dynamic controls + this.form.addControl('isLFNGOwnerOfAllParcels', this.governmentOwnsAllParcels); + } }); } @@ -78,16 +114,22 @@ export class InclProposalComponent extends FilesStepComponent implements OnInit, const purpose = this.purpose.value; const inclAgricultureSupport = this.agSupport.value; const inclImprovements = this.improvements.value; + const inclGovernmentOwnsAllParcels = this.governmentOwnsAllParcels.value; const updateDto: ApplicationSubmissionUpdateDto = { inclExclHectares: inclExclHectares ? parseFloat(inclExclHectares) : null, purpose, inclAgricultureSupport, inclImprovements, + inclGovernmentOwnsAllParcels: parseStringToBoolean(inclGovernmentOwnsAllParcels), }; const updatedApp = await this.applicationSubmissionService.updatePending(this.submissionUuid, updateDto); this.$applicationSubmission.next(updatedApp); } } + + onSelectLocalGovernmentParcelOwner($event: MatButtonToggleChange) { + this.disableNotificationFileUploads = $event.value === 'true'; + } } diff --git a/portal-frontend/src/app/services/application-submission/application-submission.dto.ts b/portal-frontend/src/app/services/application-submission/application-submission.dto.ts index 29056823d8..c831b683f0 100644 --- a/portal-frontend/src/app/services/application-submission/application-submission.dto.ts +++ b/portal-frontend/src/app/services/application-submission/application-submission.dto.ts @@ -154,6 +154,7 @@ export interface ApplicationSubmissionDetailedDto extends ApplicationSubmissionD inclAgricultureSupport: string | null; inclImprovements: string | null; exclShareGovernmentBorders: boolean | null; + inclGovernmentOwnsAllParcels: boolean | null; } export interface ApplicationSubmissionUpdateDto { @@ -259,4 +260,5 @@ export interface ApplicationSubmissionUpdateDto { inclAgricultureSupport?: string | null; inclImprovements?: string | null; exclShareGovernmentBorders?: boolean | null; + inclGovernmentOwnsAllParcels?: boolean | null; } diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.dto.ts b/services/apps/alcs/src/portal/application-submission/application-submission.dto.ts index 2959014317..3f37b8f3d8 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.dto.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.dto.ts @@ -308,6 +308,9 @@ export class ApplicationSubmissionDetailedDto extends ApplicationSubmissionDto { @AutoMap(() => Boolean) exclShareGovernmentBorders: boolean | null; + + @AutoMap(() => Boolean) + inclGovernmentOwnsAllParcels?: boolean | null; } export class ApplicationSubmissionCreateDto { @@ -694,4 +697,8 @@ export class ApplicationSubmissionUpdateDto { @IsBoolean() @IsOptional() exclShareGovernmentBorders?: boolean | null; + + @IsBoolean() + @IsOptional() + inclGovernmentOwnsAllParcels?: boolean | null; } diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts b/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts index 41c10c042e..38a3c29e61 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts @@ -694,6 +694,10 @@ export class ApplicationSubmission extends Base { @Column({ type: 'boolean', nullable: true }) exclShareGovernmentBorders: boolean | null; + @AutoMap(() => Boolean) + @Column({ type: 'boolean', nullable: true }) + inclGovernmentOwnsAllParcels: boolean | null; + //END SUBMISSION FIELDS @AutoMap(() => Application) diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.service.ts b/services/apps/alcs/src/portal/application-submission/application-submission.service.ts index fff750c23b..7406abff08 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.service.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.service.ts @@ -969,6 +969,10 @@ export class ApplicationSubmissionService { updateDto.exclShareGovernmentBorders, applicationSubmission.exclShareGovernmentBorders, ); + applicationSubmission.inclGovernmentOwnsAllParcels = filterUndefined( + updateDto.inclGovernmentOwnsAllParcels, + applicationSubmission.inclGovernmentOwnsAllParcels, + ); } async listNaruSubtypes() { diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1690414066995-add_government_incl_fields_to_submission.ts b/services/apps/alcs/src/providers/typeorm/migrations/1690414066995-add_government_incl_fields_to_submission.ts new file mode 100644 index 0000000000..f4264e8c35 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1690414066995-add_government_incl_fields_to_submission.ts @@ -0,0 +1,19 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class addGovernmentInclFieldsToSubmission1690414066995 + implements MigrationInterface +{ + name = 'addGovernmentInclFieldsToSubmission1690414066995'; + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" ADD "incl_government_owns_all_parcels" boolean`, + ); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" DROP COLUMN "incl_government_owns_all_parcels"`, + ); + } +} From 68fa41ac8e66cabef4f182f4d6fc54027a43f923 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Wed, 26 Jul 2023 16:55:51 -0700 Subject: [PATCH 136/954] Code review feedback * Remove debuggers * DRY up function --- .../decision-component/subd/subd.component.ts | 1 - .../decision-component.component.ts | 1 - .../application-submission.service.ts | 29 +++++++------------ 3 files changed, 11 insertions(+), 20 deletions(-) diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/subd/subd.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/subd/subd.component.ts index f18314215f..634656fa3e 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/subd/subd.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/subd/subd.component.ts @@ -16,7 +16,6 @@ export class SubdComponent { const lots = this.component.subdApprovedLots; if (lots && this.component.uuid) { lots[i].alrArea = alrArea ? parseFloat(alrArea) : null; - debugger; await this.componentService.update(this.component.uuid, { uuid: this.component.uuid, subdApprovedLots: lots, diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.ts index 5d9829cc72..968dfb1857 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.ts @@ -243,7 +243,6 @@ export class DecisionComponentComponent implements OnInit { private patchSubdFields() { this.form.addControl('subdApprovedLots', this.subdApprovedLots); - debugger; this.subdApprovedLots.setValue(this.data.subdApprovedLots ?? null); } diff --git a/services/apps/alcs/src/alcs/application/application-submission/application-submission.service.ts b/services/apps/alcs/src/alcs/application/application-submission/application-submission.service.ts index 4b7eb988d0..255473cab4 100644 --- a/services/apps/alcs/src/alcs/application/application-submission/application-submission.service.ts +++ b/services/apps/alcs/src/alcs/application/application-submission/application-submission.service.ts @@ -71,15 +71,7 @@ export class ApplicationSubmissionService { } async updateStatus(fileNumber: string, statusCode: SUBMISSION_STATUS) { - //Load submission without relations to prevent save from crazy cascading - const submission = await this.applicationSubmissionRepository.findOneOrFail( - { - where: { - fileNumber: fileNumber, - }, - }, - ); - + const submission = await this.loadBarebonesSubmission(fileNumber); await this.applicationSubmissionStatusService.setStatusDate( submission.uuid, statusCode, @@ -90,15 +82,7 @@ export class ApplicationSubmissionService { fileNumber: string, updateDto: AlcsApplicationSubmissionUpdateDto, ) { - //Load submission without relations to prevent save from crazy cascading - const submission = await this.applicationSubmissionRepository.findOneOrFail( - { - where: { - fileNumber: fileNumber, - }, - }, - ); - + const submission = await this.loadBarebonesSubmission(fileNumber); submission.subdProposedLots = filterUndefined( updateDto.subProposedLots, submission.subdProposedLots, @@ -106,4 +90,13 @@ export class ApplicationSubmissionService { await this.applicationSubmissionRepository.save(submission); } + + private loadBarebonesSubmission(fileNumber: string) { + //Load submission without relations to prevent save from crazy cascading + return this.applicationSubmissionRepository.findOneOrFail({ + where: { + fileNumber, + }, + }); + } } From 79ce2562baa217aca82dcbc2a5d241b93950327a Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Wed, 26 Jul 2023 17:16:19 -0700 Subject: [PATCH 137/954] Feature/alcs 875 part 2 (#823) new nfu-subtypes app-prep mapping fixes app-prep validation improvements --- .../nfu-input/nfu-input.component.ts | 2 +- .../application/proposal/nfu/nfu.component.ts | 116 +------- .../application/proposal/nfu/nfu.constants.ts | 139 ++++++++++ bin/.gitignore | 3 +- .../applications/app_prep.py | 75 +++--- .../application_prep_basic_validation.sql | 30 ++- bin/migrate-oats-data/common/__init__.py | 2 +- .../common/oats_application_code_values.py | 251 ++++++++++++++++++ .../common/oats_application_enum.py | 29 -- bin/migrate-oats-data/migrate.py | 31 +++ 10 files changed, 487 insertions(+), 191 deletions(-) create mode 100644 alcs-frontend/src/app/features/application/proposal/nfu/nfu.constants.ts create mode 100644 bin/migrate-oats-data/common/oats_application_code_values.py delete mode 100644 bin/migrate-oats-data/common/oats_application_enum.py diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/nfu-input/nfu-input.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/nfu-input/nfu-input.component.ts index 0c165ca2a4..c0bd834ab5 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/nfu-input/nfu-input.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/nfu-input/nfu-input.component.ts @@ -1,6 +1,6 @@ import { Component, Input } from '@angular/core'; import { FormGroup } from '@angular/forms'; -import { NFU_SUBTYPES_OPTIONS, NFU_TYPES_OPTIONS } from '../../../../../../proposal/nfu/nfu.component'; +import { NFU_SUBTYPES_OPTIONS, NFU_TYPES_OPTIONS } from '../../../../../../proposal/nfu/nfu.constants'; @Component({ selector: 'app-nfu-input', diff --git a/alcs-frontend/src/app/features/application/proposal/nfu/nfu.component.ts b/alcs-frontend/src/app/features/application/proposal/nfu/nfu.component.ts index fa6ec1a6ab..50dcd08a74 100644 --- a/alcs-frontend/src/app/features/application/proposal/nfu/nfu.component.ts +++ b/alcs-frontend/src/app/features/application/proposal/nfu/nfu.component.ts @@ -3,121 +3,7 @@ import { Subject, takeUntil } from 'rxjs'; import { ApplicationDetailService } from '../../../../services/application/application-detail.service'; import { ApplicationDto, UpdateApplicationDto } from '../../../../services/application/application.dto'; import { ToastService } from '../../../../services/toast/toast.service'; - -// TODO move to code tables? -export const NFU_TYPES_OPTIONS = [ - { - label: 'Agricultural / Farm', - value: 'Agricultural / Farm', - }, - { - label: 'Civic / Institutional', - value: 'Civic / Institutional', - }, - { - label: 'Commercial / Retail', - value: 'Commercial / Retail', - }, - { - label: 'Industrial', - value: 'Industrial', - }, - { - label: 'Other', - value: 'Other', - }, - { - label: 'Recreational', - value: 'Recreational', - }, - { - label: 'Residential', - value: 'Residential', - }, - { - label: 'Transportation / Utilities', - value: 'Transportation / Utilities', - }, - { - label: 'Unused', - value: 'Unused', - }, -]; - -export const NFU_SUBTYPES_OPTIONS = [ - { - label: 'Alcohol Processing', - value: 'Alcohol Processing', - }, - { - label: 'Cement / Asphalt / Concrete Plants', - value: 'Cement / Asphalt / Concrete Plants', - }, - { - label: 'Commercial / Retail', - value: 'Commercial / Retail', - }, - { - label: 'Deposition / Fill (All Types)', - value: 'Deposition / Fill (All Types)', - }, - { - label: 'Energy Production', - value: 'Energy Production', - }, - { - label: 'Recreational', - value: 'Recreational', - }, - { - label: 'Food Processing (Non-Meat)', - value: 'Food Processing (Non-Meat)', - }, - { - label: 'Industrial - Other', - value: 'Industrial - Other', - }, - { - label: 'Logging Operations', - value: 'Logging Operations', - }, - { - label: 'Lumber Manufacturing and Re-Manufacturing', - value: 'Lumber Manufacturing and Re-Manufacturing', - }, - { - label: 'Meat and Fish Processing (+ Abattoir)', - value: 'Meat and Fish Processing (+ Abattoir)', - }, - { - label: 'Mining', - value: 'Mining', - }, - { - label: 'Miscellaneous Processing', - value: 'Miscellaneous Processing', - }, - { - label: 'Oil and Gas Activities', - value: 'Oil and Gas Activities', - }, - { - label: 'Sand & Gravel', - value: 'Sand & Gravel', - }, - { - label: 'Sawmill', - value: 'Sawmill', - }, - { - label: 'Storage and Warehouse Facilities (Indoor/Outdoor - Large Scale Structures)', - value: 'Storage and Warehouse Facilities (Indoor/Outdoor - Large Scale Structures)', - }, - { - label: 'Work Camps or Associated Use', - value: 'Work Camps or Associated Use', - }, -]; +import { NFU_SUBTYPES_OPTIONS, NFU_TYPES_OPTIONS } from './nfu.constants'; @Component({ selector: 'app-proposal-nfu', diff --git a/alcs-frontend/src/app/features/application/proposal/nfu/nfu.constants.ts b/alcs-frontend/src/app/features/application/proposal/nfu/nfu.constants.ts new file mode 100644 index 0000000000..850f513867 --- /dev/null +++ b/alcs-frontend/src/app/features/application/proposal/nfu/nfu.constants.ts @@ -0,0 +1,139 @@ +export const NFU_SUBTYPES_OPTIONS = [ + { label: 'Accessory Buildings', value: 'Accessory Buildings' }, + { label: 'Additional Dwelling(s)', value: 'Additional Dwelling(s)' }, + { label: 'Additional Structures for Farm Help', value: 'Additional Structures for Farm Help' }, + { label: 'Agricultural Land Use Remnant', value: 'Agricultural Land Use Remnant' }, + { label: 'Agricultural Lease', value: 'Agricultural Lease' }, + { label: 'Agricultural Subdivision Remnant', value: 'Agricultural Subdivision Remnant' }, + { label: 'Airports and Aviation related', value: 'Airports and Aviation related' }, + { label: 'Alcohol Processing', value: 'Alcohol Processing' }, + { label: 'Alcohol Production Associated Uses', value: 'Alcohol Production Associated Uses' }, + { label: 'Animal Boarding and Services', value: 'Animal Boarding and Services' }, + { label: 'Auto Services', value: 'Auto Services' }, + { label: 'Beef', value: 'Beef' }, + { label: 'Campground (Private) & RV Park', value: 'Campground (Private) & RV Park' }, + { label: 'Cannabis Related Uses', value: 'Cannabis Related Uses' }, + { label: 'Care Facilities', value: 'Care Facilities' }, + { label: 'Cement/ Asphalt/Concrete Plants', value: 'Cement/ Asphalt/Concrete Plants' }, + { label: 'Cemeteries', value: 'Cemeteries' }, + { label: 'Churches & Bible Schools', value: 'Churches & Bible Schools' }, + { label: 'Civic Facilities and Buildings', value: 'Civic Facilities and Buildings' }, + { label: 'Civic - other', value: 'Civic - other' }, + { label: 'Commercial - other', value: 'Commercial - other' }, + { label: 'Composting', value: 'Composting' }, + { label: 'Dairy', value: 'Dairy' }, + { label: 'Deposition/Fill (All Types)', value: 'Deposition/Fill (All Types)' }, + { label: 'Electrical Power Distribution Systems', value: 'Electrical Power Distribution Systems' }, + { label: 'Electrical Power Facilities', value: 'Electrical Power Facilities' }, + { label: 'Energy Production', value: 'Energy Production' }, + { label: 'Energy Production', value: 'Energy Production' }, + { label: 'Events', value: 'Events' }, + { label: 'Exhibitions and Festivals', value: 'Exhibitions and Festivals' }, + { label: 'Farm Help Accommodation', value: 'Farm Help Accommodation' }, + { label: 'Fire Hall and associated uses', value: 'Fire Hall and associated uses' }, + { label: 'Food and Beverage Services', value: 'Food and Beverage Services' }, + { label: 'Food Processing (non-meat)', value: 'Food Processing (non-meat)' }, + { label: 'Gas and Other Distribution Pipelines', value: 'Gas and Other Distribution Pipelines' }, + { label: 'Golf Course', value: 'Golf Course' }, + { label: 'Grain & Forage', value: 'Grain & Forage' }, + { label: 'Greenhouses', value: 'Greenhouses' }, + { label: 'Hall/Lodge (private)_', value: 'Hall/Lodge (private)_' }, + { label: 'Hospitals, Health Centres (Incl Private)', value: 'Hospitals, Health Centres (Incl Private)' }, + { label: 'Industrial - other', value: 'Industrial - other' }, + { label: 'Land Use Remnant', value: 'Land Use Remnant' }, + { label: 'Lease', value: 'Lease' }, + { label: 'Livestock-Unspecified', value: 'Livestock-Unspecified' }, + { label: 'Logging Operations', value: 'Logging Operations' }, + { label: 'Lumber Manufacturing and Re-manufacturing', value: 'Lumber Manufacturing and Re-manufacturing' }, + { label: 'Meat and Fish Processing (+abattoir)', value: 'Meat and Fish Processing (+abattoir)' }, + { label: 'Mining', value: 'Mining' }, + { label: 'Misc. Agricultural Use', value: 'Misc. Agricultural Use' }, + { label: 'Miscellaneous Processing', value: 'Miscellaneous Processing' }, + { label: 'Mixed Ag Uses', value: 'Mixed Ag Uses' }, + { label: 'Mixed Uses', value: 'Mixed Uses' }, + { label: 'Mobile Home Park', value: 'Mobile Home Park' }, + { label: 'Multi Family-Apartments/Condominiums', value: 'Multi Family-Apartments/Condominiums' }, + { label: 'Office Building (Primary Use)', value: 'Office Building (Primary Use)' }, + { label: 'Oil and Gas Activities', value: 'Oil and Gas Activities' }, + { label: 'Other-Undefined', value: 'Other-Undefined' }, + { label: 'Other Uses', value: 'Other Uses' }, + { label: "Parks-All Types operated by Local Gov't", value: "Parks-All Types operated by Local Gov't" }, + { label: 'Parks & Playing Fields', value: 'Parks & Playing Fields' }, + { label: 'Pigs/Hogs', value: 'Pigs/Hogs' }, + { label: 'Poultry', value: 'Poultry' }, + { label: 'Public Transportation Facilities', value: 'Public Transportation Facilities' }, + { label: 'Railway', value: 'Railway' }, + { label: 'Recreational - other', value: 'Recreational - other' }, + { label: 'Research Facilities', value: 'Research Facilities' }, + { label: 'Residential - other', value: 'Residential - other' }, + { label: 'Roads', value: 'Roads' }, + { label: 'Sand & Gravel', value: 'Sand & Gravel' }, + { label: 'Sanitary Land Fills', value: 'Sanitary Land Fills' }, + { label: 'Sawmill', value: 'Sawmill' }, + { label: 'Schools & Universities', value: 'Schools & Universities' }, + { label: 'Sewage Treatment Facilities', value: 'Sewage Treatment Facilities' }, + { label: 'Sewer Distribution Systems', value: 'Sewer Distribution Systems' }, + { label: 'Shopping Centre', value: 'Shopping Centre' }, + { label: 'Small Fruits-Berries', value: 'Small Fruits-Berries' }, + { label: 'Sports Facilities - commercial', value: 'Sports Facilities - commercial' }, + { label: 'Sports Facilities - municipal', value: 'Sports Facilities - municipal' }, + { + label: 'Storage and Warehouse Facilities (Indoor/Outdoor- Large Scale Structures)', + value: 'Storage and Warehouse Facilities (Indoor/Outdoor- Large Scale Structures)', + }, + { label: 'Storage & Warehouse', value: 'Storage & Warehouse' }, + { label: 'Store (Retail - All Types)', value: 'Store (Retail - All Types)' }, + { label: 'Subdivision Special Categories', value: 'Subdivision Special Categories' }, + { label: 'Subdivision Special Categories (Lease)', value: 'Subdivision Special Categories (Lease)' }, + { label: 'Telephone and Telecommunications', value: 'Telephone and Telecommunications' }, + { label: 'Tourist Accommodations', value: 'Tourist Accommodations' }, + { label: 'Trails', value: 'Trails' }, + { label: 'Transportation - other', value: 'Transportation - other' }, + { label: 'Tree Fruits', value: 'Tree Fruits' }, + { label: 'Turf Farm', value: 'Turf Farm' }, + { label: 'Vegetable & Truck', value: 'Vegetable & Truck' }, + { label: 'Vineyard and Associated Uses', value: 'Vineyard and Associated Uses' }, + { label: 'Water Distribution Systems', value: 'Water Distribution Systems' }, + { label: 'Water or Sewer Distribution Systems (inactive)', value: 'Water or Sewer Distribution Systems (inactive)' }, + { label: 'Water Treatment Facilities', value: 'Water Treatment Facilities' }, + { label: 'Work Camps or Associated Use', value: 'Work Camps or Associated Use' }, +]; + +export const NFU_TYPES_OPTIONS = [ + { + label: 'Agricultural / Farm', + value: 'Agricultural / Farm', + }, + { + label: 'Civic / Institutional', + value: 'Civic / Institutional', + }, + { + label: 'Commercial / Retail', + value: 'Commercial / Retail', + }, + { + label: 'Industrial', + value: 'Industrial', + }, + { + label: 'Other', + value: 'Other', + }, + { + label: 'Recreational', + value: 'Recreational', + }, + { + label: 'Residential', + value: 'Residential', + }, + { + label: 'Transportation / Utilities', + value: 'Transportation / Utilities', + }, + { + label: 'Unused', + value: 'Unused', + }, +]; diff --git a/bin/.gitignore b/bin/.gitignore index 6d655a1e07..12cddf3cc0 100644 --- a/bin/.gitignore +++ b/bin/.gitignore @@ -1,4 +1,5 @@ .env out tmp -*.pickle \ No newline at end of file +*.pickle +*etl_log.txt \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/app_prep.py b/bin/migrate-oats-data/applications/app_prep.py index 06fe243535..88bacb10a2 100644 --- a/bin/migrate-oats-data/applications/app_prep.py +++ b/bin/migrate-oats-data/applications/app_prep.py @@ -4,6 +4,7 @@ AlcsNfuSubTypeCode, OatsCapabilitySourceCode, OatsAgriCapabilityCodes, + OATS_NFU_SUBTYPES, AlcsAgCap, AlcsAgCapSource, log_end, @@ -20,29 +21,29 @@ class OatsToAlcsNfuTypes(Enum): - AGR = AlcsNfuTypeCode.Agricultural_Farm - CIV = AlcsNfuTypeCode.Civic_Institutional - COM = AlcsNfuTypeCode.Commercial_Retail - IND = AlcsNfuTypeCode.Industrial - OTH = AlcsNfuTypeCode.Other - REC = AlcsNfuTypeCode.Recreational - RES = AlcsNfuTypeCode.Residential - TRA = AlcsNfuTypeCode.Transportation_Utilities - UNU = AlcsNfuTypeCode.Unused + AGR = AlcsNfuTypeCode.Agricultural_Farm.value + CIV = AlcsNfuTypeCode.Civic_Institutional.value + COM = AlcsNfuTypeCode.Commercial_Retail.value + IND = AlcsNfuTypeCode.Industrial.value + OTH = AlcsNfuTypeCode.Other.value + REC = AlcsNfuTypeCode.Recreational.value + RES = AlcsNfuTypeCode.Residential.value + TRA = AlcsNfuTypeCode.Transportation_Utilities.value + UNU = AlcsNfuTypeCode.Unused.value class OatsToAlcsAgCapSource(Enum): - BCLI = AlcsAgCapSource.BCLI - CLI = AlcsAgCapSource.CLI - ONSI = AlcsAgCapSource.On_site + BCLI = AlcsAgCapSource.BCLI.value + CLI = AlcsAgCapSource.CLI.value + ONSI = AlcsAgCapSource.On_site.value class OatsToAlcsAgCap(Enum): - P = AlcsAgCap.Prime - PD = AlcsAgCap.Prime_Dominant - MIX = AlcsAgCap.Mixed_Prime_Secondary - S = AlcsAgCap.Secondary - U = AlcsAgCap.Unclassified + P = AlcsAgCap.Prime.value + PD = AlcsAgCap.Prime_Dominant.value + MIX = AlcsAgCap.Mixed_Prime_Secondary.value + S = AlcsAgCap.Secondary.value + U = AlcsAgCap.Unclassified.value @inject_conn_pool @@ -54,6 +55,7 @@ def process_alcs_application_prep_fields(conn=None, batch_size=BATCH_UPLOAD_SIZE conn (psycopg2.extensions.connection): PostgreSQL database connection. Provided by the decorator. batch_size (int): The number of items to process at once. Defaults to BATCH_UPLOAD_SIZE. """ + log_start(etl_name) with conn.cursor(cursor_factory=RealDictCursor) as cursor: with open( @@ -201,14 +203,14 @@ def prepare_app_prep_data(app_prep_raw_data_list): data = dict(row) data = map_basic_field(data) - if data["alr_change_code"] == ALRChangeCode.NFU: + if data["alr_change_code"] == ALRChangeCode.NFU.value: data = mapOatsToAlcsAppPrep(data) nfu_data_list.append(data) - elif data["alr_change_code"] == ALRChangeCode.NAR: + elif data["alr_change_code"] == ALRChangeCode.NAR.value: nar_data_list.append(data) - elif data["alr_change_code"] == ALRChangeCode.EXC: + elif data["alr_change_code"] == ALRChangeCode.EXC.value: exc_data_list.append(data) - elif data["alr_change_code"] == ALRChangeCode.INC: + elif data["alr_change_code"] == ALRChangeCode.INC.value: inc_data_list.append(data) else: other_data_list.append(data) @@ -217,14 +219,18 @@ def prepare_app_prep_data(app_prep_raw_data_list): def mapOatsToAlcsAppPrep(data): + oats_type_code = data["nonfarm_use_type_code"] + oats_subtype_code = data["nonfarm_use_subtype_code"] + if data["nonfarm_use_type_code"]: data["nonfarm_use_type_code"] = str( OatsToAlcsNfuTypes[data["nonfarm_use_type_code"]].value ) if data["nonfarm_use_subtype_code"]: data["nonfarm_use_subtype_code"] = map_oats_to_alcs_nfu_subtypes( - data["nonfarm_use_subtype_code"] + oats_type_code, oats_subtype_code ) + return data @@ -314,22 +320,15 @@ def get_update_query_for_other(): return query -def map_oats_to_alcs_nfu_subtypes(oats_code): - # TODO this is work in progress and will be finished later - if oats_code == 1: - return "Accessory Buildings" - if oats_code == 2: - return "Additional Dwelling(s)" - if oats_code == 3: - return "Additional Structures for Farm Help" - if oats_code == 4: - return "Agricultural Land Use Remnant" - if oats_code == 5: - return "Agricultural Lease" - if oats_code == 6: - return "Agricultural Subdivision Remnant" - - return "" +def map_oats_to_alcs_nfu_subtypes(nfu_type_code, nfu_subtype_code): + for dict_obj in OATS_NFU_SUBTYPES: + if str(dict_obj["type_key"]) == str(nfu_type_code) and str( + dict_obj["subtype_key"] + ) == str(nfu_subtype_code): + return dict_obj["value"] + + # Return None when no matching key found + return None def map_basic_field(data): diff --git a/bin/migrate-oats-data/applications/sql/application-prep/application_prep_basic_validation.sql b/bin/migrate-oats-data/applications/sql/application-prep/application_prep_basic_validation.sql index d0d720f259..c2523a58f3 100644 --- a/bin/migrate-oats-data/applications/sql/application-prep/application_prep_basic_validation.sql +++ b/bin/migrate-oats-data/applications/sql/application-prep/application_prep_basic_validation.sql @@ -14,33 +14,51 @@ oats_app_prep_data AS ( oaac.agri_cap_consultant, oaac.component_area, oaac.capability_source_code, - oaac.nonfarm_use_type_code, - oaac.nonfarm_use_subtype_code, oaac.nonfarm_use_end_date, oaac.rsdntl_use_type_code, oaac.rsdntl_use_end_date, oaa.staff_comment_observations, oaac.alr_change_code, - oaac.exclsn_app_type_code + oaac.exclsn_app_type_code, + oaac.nonfarm_use_type_code, + oaac.nonfarm_use_subtype_code, + onutc.description AS nonfarm_use_type_description, + onusc.description AS nonfarm_use_subtype_description, + -- ALCS has typos fixed and this is required for proper validation + CASE + WHEN onusc.description = 'Water Distribtion Systems' THEN 'Water Distribution Systems' + WHEN onusc.description = 'Tourist Accomodations' THEN 'Tourist Accommodations' + WHEN onusc.description = 'Office Buiding (Primary Use)' THEN 'Office Building (Primary Use)' + ELSE onusc.description + END AS mapped_nonfarm_use_subtype_description FROM appl_components_grouped acg JOIN oats.oats_alr_appl_components oaac ON oaac.alr_application_id = acg.alr_application_id JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = acg.alr_application_id + JOIN oats.oats_nonfarm_use_subtype_codes onusc ON onusc.nonfarm_use_subtype_code = oaac.nonfarm_use_subtype_code + AND oaac.nonfarm_use_type_code = onusc.nonfarm_use_type_code + JOIN oats.oats_nonfarm_use_type_codes onutc ON onutc.nonfarm_use_type_code = oaac.nonfarm_use_type_code ) -SELECT a.alr_area, +SELECT oapd.alr_application_id, + a.alr_area, a.ag_cap, a.ag_cap_source, a.ag_cap_map, a.ag_cap_consultant, a.staff_observations, + a.nfu_use_type, + a.nfu_use_sub_type, oapd.component_area, oapd.agri_capability_code, oapd.capability_source_code, oapd.agri_cap_map, oapd.agri_cap_consultant, - oapd.staff_comment_observations + oapd.staff_comment_observations, + oapd.nonfarm_use_type_description, + oapd.mapped_nonfarm_use_subtype_description FROM alcs.application a LEFT JOIN oats_app_prep_data AS oapd ON a.file_number = oapd.alr_application_id::TEXT WHERE a.alr_area != oapd.component_area OR a.ag_cap_map != oapd.agri_cap_map OR a.ag_cap_consultant != oapd.agri_cap_consultant - OR a.staff_observations != oapd.staff_comment_observations \ No newline at end of file + OR a.staff_observations != oapd.staff_comment_observations + OR a.nfu_use_sub_type != oapd.mapped_nonfarm_use_subtype_description \ No newline at end of file diff --git a/bin/migrate-oats-data/common/__init__.py b/bin/migrate-oats-data/common/__init__.py index 77c58f32c9..26c07e6d74 100644 --- a/bin/migrate-oats-data/common/__init__.py +++ b/bin/migrate-oats-data/common/__init__.py @@ -1,3 +1,3 @@ -from .oats_application_enum import * +from .oats_application_code_values import * from .alcs_application_enum import * from .etl_logger import log_start, log_end diff --git a/bin/migrate-oats-data/common/oats_application_code_values.py b/bin/migrate-oats-data/common/oats_application_code_values.py new file mode 100644 index 0000000000..da8b8139bc --- /dev/null +++ b/bin/migrate-oats-data/common/oats_application_code_values.py @@ -0,0 +1,251 @@ +from enum import Enum + + +class ALRChangeCode(Enum): + TUR = "TUR" # Transport, Utility, and Recreation + INC = "INC" # Inclusion + EXC = "EXC" # Exclusion + SDV = "SDV" # Subdivision + NFU = "NFU" # Non Farm Use + SCH = "SCH" # Extraction and Fill + EXT = "EXT" # Extraction + FILL = "FILL" # Fill + SRW = "SRW" # Notification of Statutory Right of Way + CSC = "CSC" # Conservation Covenant + NAR = "NAR" # Non-Adhering Residential Use + + +class OatsCapabilitySourceCode(Enum): + BCLI = "BCLI" + CLI = "CLI" + ONSI = "ONSI" + + +class OatsAgriCapabilityCodes(Enum): + P = "P" + PD = "PD" + MIX = "MIX" + S = "S" + U = "U" + +OATS_NFU_SUBTYPES = [ + {"type_key": "AGR", "subtype_key": "1", "value": "Accessory Buildings"}, + {"type_key": "RES", "subtype_key": "2", "value": "Additional Dwelling(s)"}, + { + "type_key": "AGR", + "subtype_key": "3", + "value": "Additional Structures for Farm Help", + }, + { + "type_key": "AGR", + "subtype_key": "4", + "value": "Agricultural Land Use Remnant", + }, + {"type_key": "AGR", "subtype_key": "5", "value": "Agricultural Lease"}, + { + "type_key": "AGR", + "subtype_key": "6", + "value": "Agricultural Subdivision Remnant", + }, + { + "type_key": "TRA", + "subtype_key": "7", + "value": "Airports and Aviation related", + }, + {"type_key": "IND", "subtype_key": "8", "value": "Alcohol Processing"}, + { + "type_key": "COM", + "subtype_key": "9", + "value": "Animal Boarding and Services", + }, + {"type_key": "COM", "subtype_key": "11", "value": "Auto Services"}, + {"type_key": "AGR", "subtype_key": "12", "value": "Beef"}, + { + "type_key": "COM", + "subtype_key": "13", + "value": "Campground (Private) & RV Park", + }, + {"type_key": "COM", "subtype_key": "14", "value": "Care Facilities"}, + { + "type_key": "IND", + "subtype_key": "15", + "value": "Cement/ Asphalt/Concrete Plants", + }, + {"type_key": "CIV", "subtype_key": "16", "value": "Cemeteries"}, + {"type_key": "CIV", "subtype_key": "17", "value": "Churches & Bible Schools"}, + {"type_key": "CIV", "subtype_key": "18", "value": "Civic - other"}, + { + "type_key": "CIV", + "subtype_key": "19", + "value": "Civic Facilities and Buildings", + }, + {"type_key": "COM", "subtype_key": "20", "value": "Commercial - other"}, + {"type_key": "IND", "subtype_key": "21", "value": "Composting"}, + {"type_key": "AGR", "subtype_key": "22", "value": "Dairy"}, + { + "type_key": "IND", + "subtype_key": "23", + "value": "Deposition/Fill (All Types)", + }, + {"type_key": "COM", "subtype_key": "24", "value": "Golf Course"}, + {"type_key": "AGR", "subtype_key": "25", "value": "Grain & Forage"}, + { + "type_key": "TRA", + "subtype_key": "25", + "value": "Electrical Power Distribution Systems", + }, + {"type_key": "AGR", "subtype_key": "26", "value": "Greenhouses"}, + { + "type_key": "TRA", + "subtype_key": "26", + "value": "Electrical Power Facilities", + }, + {"type_key": "COM", "subtype_key": "28", "value": "Exhibitions and Festivals"}, + { + "type_key": "RES", + "subtype_key": "29", + "value": "Subdivision Special Categories", + }, + {"type_key": "COM", "subtype_key": "30", "value": "Food and Beverage Services"}, + { + "type_key": "RES", + "subtype_key": "30", + "value": "Subdivision Special Categories (Lease)", + }, + {"type_key": "IND", "subtype_key": "31", "value": "Food Processing (non-meat)"}, + {"type_key": "IND", "subtype_key": "32", "value": "Industrial - other"}, + {"type_key": "AGR", "subtype_key": "33", "value": "Land Use Remnant"}, + {"type_key": "AGR", "subtype_key": "34", "value": "Livestock-Unspecified"}, + {"type_key": "IND", "subtype_key": "35", "value": "Logging Operations"}, + { + "type_key": "IND", + "subtype_key": "36", + "value": "Lumber Manufacturing and Re-manufacturing", + }, + { + "type_key": "IND", + "subtype_key": "37", + "value": "Meat and Fish Processing (+abattoir)", + }, + {"type_key": "IND", "subtype_key": "38", "value": "Mining"}, + {"type_key": "AGR", "subtype_key": "39", "value": "Misc. Agricultural Use"}, + {"type_key": "AGR", "subtype_key": "40", "value": "Mixed Ag Uses"}, + {"type_key": "OTH", "subtype_key": "41", "value": "Mixed Uses"}, + {"type_key": "RES", "subtype_key": "42", "value": "Mobile Home Park"}, + { + "type_key": "RES", + "subtype_key": "43", + "value": "Multi Family-Apartments/Condominiums", + }, + { + "type_key": "COM", + "subtype_key": "44", + "value": "Office Building (Primary Use)", + }, + {"type_key": "IND", "subtype_key": "45", "value": "Oil and Gas Activities"}, + {"type_key": "OTH", "subtype_key": "46", "value": "Other Uses"}, + {"type_key": "AGR", "subtype_key": "47", "value": "Other-Undefined"}, + {"type_key": "REC", "subtype_key": "48", "value": "Parks & Playing Fields"}, + { + "type_key": "CIV", + "subtype_key": "49", + "value": "Parks-All Types operated by Local Gov't", + }, + {"type_key": "AGR", "subtype_key": "50", "value": "Pigs/Hogs"}, + {"type_key": "AGR", "subtype_key": "51", "value": "Poultry"}, + { + "type_key": "TRA", + "subtype_key": "52", + "value": "Public Transportation Facilities", + }, + {"type_key": "TRA", "subtype_key": "53", "value": "Railway"}, + {"type_key": "REC", "subtype_key": "54", "value": "Recreational - other"}, + {"type_key": "CIV", "subtype_key": "55", "value": "Research Facilities"}, + {"type_key": "RES", "subtype_key": "56", "value": "Residential - other"}, + {"type_key": "TRA", "subtype_key": "57", "value": "Roads"}, + {"type_key": "IND", "subtype_key": "58", "value": "Sand & Gravel"}, + {"type_key": "CIV", "subtype_key": "59", "value": "Sanitary Land Fills"}, + {"type_key": "CIV", "subtype_key": "60", "value": "Schools & Universities"}, + { + "type_key": "TRA", + "subtype_key": "61", + "value": "Sewage Treatment Facilities", + }, + {"type_key": "TRA", "subtype_key": "62", "value": "Sewer Distribution Systems"}, + {"type_key": "COM", "subtype_key": "63", "value": "Shopping Centre"}, + {"type_key": "AGR", "subtype_key": "64", "value": "Small Fruits-Berries"}, + { + "type_key": "COM", + "subtype_key": "65", + "value": "Sports Facilities - commercial", + }, + { + "type_key": "REC", + "subtype_key": "66", + "value": "Sports Facilities - municipal", + }, + {"type_key": "COM", "subtype_key": "67", "value": "Storage & Warehouse"}, + {"type_key": "COM", "subtype_key": "68", "value": "Store (Retail - All Types)"}, + { + "type_key": "TRA", + "subtype_key": "69", + "value": "Telephone and Telecommunications", + }, + {"type_key": "COM", "subtype_key": "70", "value": "Tourist Accommodations"}, + {"type_key": "REC", "subtype_key": "71", "value": "Trails"}, + {"type_key": "TRA", "subtype_key": "72", "value": "Transportation - other"}, + {"type_key": "AGR", "subtype_key": "73", "value": "Tree Fruits"}, + {"type_key": "AGR", "subtype_key": "74", "value": "Turf Farm"}, + {"type_key": "AGR", "subtype_key": "75", "value": "Vegetable & Truck"}, + { + "type_key": "AGR", + "subtype_key": "76", + "value": "Vineyard and Associated Uses", + }, + {"type_key": "TRA", "subtype_key": "77", "value": "Water Distribution Systems"}, + { + "type_key": "TRA", + "subtype_key": "78", + "value": "Water or Sewer Distribution Systems (inactive)", + }, + {"type_key": "TRA", "subtype_key": "79", "value": "Water Treatment Facilities"}, + {"type_key": "COM", "subtype_key": "80", "value": "Hall/Lodge (private)_"}, + { + "type_key": "CIV", + "subtype_key": "81", + "value": "Hospitals, Health Centres (Incl Private)", + }, + {"type_key": "RES", "subtype_key": "82", "value": "Farm Help Accommodation"}, + { + "type_key": "TRA", + "subtype_key": "27", + "value": "Gas and Other Distribution Pipelines", + }, + {"type_key": "AGR", "subtype_key": "23", "value": "Energy Production"}, + {"type_key": "IND", "subtype_key": "25", "value": "Energy Production"}, + {"type_key": "RES", "subtype_key": "83", "value": "Lease"}, + { + "type_key": "IND", + "subtype_key": "86", + "value": "Storage and Warehouse Facilities (Indoor/Outdoor- Large Scale Structures)", + }, + { + "type_key": "IND", + "subtype_key": "84", + "value": "Work Camps or Associated Use", + }, + {"type_key": "IND", "subtype_key": "85", "value": "Miscellaneous Processing"}, + {"type_key": "COM", "subtype_key": "87", "value": "Events"}, + {"type_key": "IND", "subtype_key": "88", "value": "Sawmill"}, + { + "type_key": "CIV", + "subtype_key": "89", + "value": "Fire Hall and associated uses", + }, + { + "type_key": "AGR", + "subtype_key": "90", + "value": "Alcohol Production Associated Uses", + }, + {"type_key": "AGR", "subtype_key": "91", "value": "Cannabis Related Uses"}, + ] \ No newline at end of file diff --git a/bin/migrate-oats-data/common/oats_application_enum.py b/bin/migrate-oats-data/common/oats_application_enum.py deleted file mode 100644 index 1a88319a57..0000000000 --- a/bin/migrate-oats-data/common/oats_application_enum.py +++ /dev/null @@ -1,29 +0,0 @@ -from enum import Enum - - -class ALRChangeCode(Enum): - TUR = "TUR" # Transport, Utility, and Recreation - INC = "INC" # Inclusion - EXC = "EXC" # Exclusion - SDV = "SDV" # Subdivision - NFU = "NFU" # Non Farm Use - SCH = "SCH" # Extraction and Fill - EXT = "EXT" # Extraction - FILL = "FILL" # Fill - SRW = "SRW" # Notification of Statutory Right of Way - CSC = "CSC" # Conservation Covenant - NAR = "NAR" # Non-Adhering Residential Use - - -class OatsCapabilitySourceCode(Enum): - BCLI = "BCLI" - CLI = "CLI" - ONSI = "ONSI" - - -class OatsAgriCapabilityCodes(Enum): - P = "P" - PD = "PD" - MIX = "MIX" - S = "S" - U = "U" diff --git a/bin/migrate-oats-data/migrate.py b/bin/migrate-oats-data/migrate.py index 2c2d6748ee..86e7e4fa8b 100644 --- a/bin/migrate-oats-data/migrate.py +++ b/bin/migrate-oats-data/migrate.py @@ -17,6 +17,8 @@ import_batch_size = BATCH_UPLOAD_SIZE +# TODO tidy import menu setup + def application_import_command_parser(import_batch_size, subparsers): application_import_command = subparsers.add_parser( @@ -63,6 +65,21 @@ def application_document_import_command_parser(import_batch_size, subparsers): application_document_import_command.set_defaults(func=import_batch_size) +def app_prep_import_command_parser(import_batch_size, subparsers): + app_prep_import_command = subparsers.add_parser( + "app-prep-import", + help=f"Import App prep into ALCS (update applications table) in specified batch size: (default: {import_batch_size})", + ) + app_prep_import_command.add_argument( + "--batch-size", + type=int, + default=import_batch_size, + metavar="", + help=f"batch size (default: {import_batch_size})", + ) + app_prep_import_command.set_defaults(func=import_batch_size) + + def import_command_parser(subparsers): import_command = subparsers.add_parser( "import", @@ -86,6 +103,7 @@ def setup_menu_args_parser(import_batch_size): application_import_command_parser(import_batch_size, subparsers) document_import_command_parser(import_batch_size, subparsers) application_document_import_command_parser(import_batch_size, subparsers) + app_prep_import_command_parser(import_batch_size, subparsers) import_command_parser(subparsers) subparsers.add_parser("clean", help="Clean all imported data") @@ -167,6 +185,19 @@ def setup_menu_args_parser(import_batch_size): ) process_application_documents(batch_size=import_batch_size) + case "app-prep-import": + console.log("Beginning OATS -> ALCS app-prep import process") + with console.status( + "[bold green]App prep import (applications table update in ALCS)..." + ) as status: + if args.batch_size: + import_batch_size = args.batch_size + + console.log( + f"Processing app-prep import in batch size = {import_batch_size}" + ) + + process_alcs_application_prep_fields(batch_size=import_batch_size) finally: if connection_pool: From ba01273bb2b612cc7c87d4720db0d29104b5384d Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Wed, 26 Jul 2023 17:24:35 -0700 Subject: [PATCH 138/954] LFNG As applicant bug fixes * Check if submission is to own users government to control copying * Add error to step 8 when missing Department * Fix logic in primary contact to show errors at the right time --- .../application-details/application-details.component.html | 5 ++++- .../primary-contact/primary-contact.component.html | 2 +- .../primary-contact/primary-contact.component.ts | 7 ++----- .../application-submission-review.controller.ts | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/portal-frontend/src/app/features/application-details/application-details.component.html b/portal-frontend/src/app/features/application-details/application-details.component.html index 65529b59be..fc85a50f39 100644 --- a/portal-frontend/src/app/features/application-details/application-details.component.html +++ b/portal-frontend/src/app/features/application-details/application-details.component.html @@ -48,7 +48,10 @@

3. Primary Contact

{{ primaryContact?.organizationName }} - +
Phone
diff --git a/portal-frontend/src/app/features/edit-submission/primary-contact/primary-contact.component.html b/portal-frontend/src/app/features/edit-submission/primary-contact/primary-contact.component.html index dd83477975..8a32cf1e4b 100644 --- a/portal-frontend/src/app/features/edit-submission/primary-contact/primary-contact.component.html +++ b/portal-frontend/src/app/features/edit-submission/primary-contact/primary-contact.component.html @@ -160,7 +160,7 @@
Authorization Letters (if applicable)
(uploadFiles)="attachFile($event, DOCUMENT_TYPE.AUTHORIZATION_LETTER)" (deleteFile)="onDeleteFile($event)" (openFile)="openFile($event)" - [showErrors]="showErrors || selectedLocalGovernment" + [showErrors]="showErrors" [isRequired]="needsAuthorizationLetter" >
diff --git a/portal-frontend/src/app/features/edit-submission/primary-contact/primary-contact.component.ts b/portal-frontend/src/app/features/edit-submission/primary-contact/primary-contact.component.ts index 56f837e845..bd05e3c1a7 100644 --- a/portal-frontend/src/app/features/edit-submission/primary-contact/primary-contact.component.ts +++ b/portal-frontend/src/app/features/edit-submission/primary-contact/primary-contact.component.ts @@ -143,9 +143,7 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni } private calculateLetterRequired() { - const isSelfApplicant = - this.owners[0].type.code === APPLICATION_OWNER.INDIVIDUAL || - this.owners[0].type.code === APPLICATION_OWNER.GOVERNMENT; + const isSelfApplicant = this.owners[0].type.code === APPLICATION_OWNER.INDIVIDUAL || this.selectedLocalGovernment; this.needsAuthorizationLetter = this.selectedThirdPartyAgent || @@ -226,8 +224,6 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni phoneNumber: selectedOwner.phoneNumber, email: selectedOwner.email, }); - - this.calculateLetterRequired(); } else if (selectedOwner) { this.onSelectOwner(selectedOwner.uuid); } else { @@ -246,6 +242,7 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni this.form.markAllAsTouched(); } this.isDirty = false; + this.calculateLetterRequired(); } } diff --git a/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.ts b/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.ts index 3448114556..16fa1c1ae8 100644 --- a/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.ts +++ b/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.ts @@ -205,8 +205,8 @@ export class ApplicationSubmissionReviewController { } if ( - primaryContact && - primaryContact.type.code === APPLICATION_OWNER.GOVERNMENT + userLocalGovernment.uuid === applicationSubmission.localGovernmentUuid && + primaryContact ) { //Copy contact details over to government form await this.applicationSubmissionReviewService.update( From 10bf32802afee0e509d9d2e1ff24baaf005d4241 Mon Sep 17 00:00:00 2001 From: Liam Stoddard Date: Thu, 27 Jul 2023 09:22:14 -0700 Subject: [PATCH 139/954] adding wip changes --- bin/migrate-oats-data/noi/noi.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/migrate-oats-data/noi/noi.py b/bin/migrate-oats-data/noi/noi.py index 2d3d291e94..8084020e21 100644 --- a/bin/migrate-oats-data/noi/noi.py +++ b/bin/migrate-oats-data/noi/noi.py @@ -46,7 +46,7 @@ def process_nois(conn=None, batch_size=10000): try: applications_to_be_inserted_count = len(rows) - insert_query = compile_application_insert_query( + insert_query = noi_insert_query( applications_to_be_inserted_count ) cursor.execute(insert_query, rows) From 0dd5b0278b3e38f086f7a0f3dc41dc4767072767 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Thu, 27 Jul 2023 10:43:15 -0700 Subject: [PATCH 140/954] Bug fixes for L/FNG again --- .../edit-submission.component.ts | 4 +++ .../primary-contact.component.ts | 25 +++++++++++-------- .../application-submission.service.ts | 4 +-- 3 files changed, 19 insertions(+), 14 deletions(-) diff --git a/portal-frontend/src/app/features/edit-submission/edit-submission.component.ts b/portal-frontend/src/app/features/edit-submission/edit-submission.component.ts index 17cc530fdd..527a09d860 100644 --- a/portal-frontend/src/app/features/edit-submission/edit-submission.component.ts +++ b/portal-frontend/src/app/features/edit-submission/edit-submission.component.ts @@ -94,6 +94,10 @@ export class EditSubmissionComponent implements OnInit, OnDestroy, AfterViewInit ngOnInit(): void { this.expandedParcelUuid = undefined; + + this.$applicationSubmission.pipe(takeUntil(this.$destroy)).subscribe((submission) => { + this.applicationSubmission = submission; + }); } ngAfterViewInit(): void { diff --git a/portal-frontend/src/app/features/edit-submission/primary-contact/primary-contact.component.ts b/portal-frontend/src/app/features/edit-submission/primary-contact/primary-contact.component.ts index bd05e3c1a7..fedf84f5fa 100644 --- a/portal-frontend/src/app/features/edit-submission/primary-contact/primary-contact.component.ts +++ b/portal-frontend/src/app/features/edit-submission/primary-contact/primary-contact.component.ts @@ -143,17 +143,20 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni } private calculateLetterRequired() { - const isSelfApplicant = this.owners[0].type.code === APPLICATION_OWNER.INDIVIDUAL || this.selectedLocalGovernment; - - this.needsAuthorizationLetter = - this.selectedThirdPartyAgent || - !( - isSelfApplicant && - (this.owners.length === 1 || - (this.owners.length === 2 && - this.owners[1].type.code === APPLICATION_OWNER.AGENT && - !this.selectedThirdPartyAgent)) - ); + if (this.selectedLocalGovernment) { + this.needsAuthorizationLetter = false; + } else { + const isSelfApplicant = this.owners[0].type.code === APPLICATION_OWNER.INDIVIDUAL; + this.needsAuthorizationLetter = + this.selectedThirdPartyAgent || + !( + isSelfApplicant && + (this.owners.length === 1 || + (this.owners.length === 2 && + this.owners[1].type.code === APPLICATION_OWNER.AGENT && + !this.selectedThirdPartyAgent)) + ); + } this.files = this.files.map((file) => ({ ...file, diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.service.ts b/services/apps/alcs/src/portal/application-submission/application-submission.service.ts index fff750c23b..c14b769569 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.service.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.service.ts @@ -77,9 +77,7 @@ export class ApplicationSubmissionService { fileNumber, isDraft: false, }, - relations: { - naruSubtype: true, - }, + relations: this.DEFAULT_RELATIONS, }); if (!application) { throw new Error('Failed to find document'); From 75abcde2126a268f266d8693b20bf20a36aaf136 Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Thu, 27 Jul 2023 10:48:54 -0700 Subject: [PATCH 141/954] nfu subtype with inline ng select (#826) --- .../proposal/nfu/nfu.component.html | 6 +- .../proposal/nfu/nfu.component.scss | 4 ++ .../inline-ng-select.component.html | 36 ++++++++++++ .../inline-ng-select.component.scss | 58 +++++++++++++++++++ .../inline-ng-select.component.spec.ts | 24 ++++++++ .../inline-ng-select.component.ts | 54 +++++++++++++++++ alcs-frontend/src/app/shared/shared.module.ts | 4 ++ 7 files changed, 183 insertions(+), 3 deletions(-) create mode 100644 alcs-frontend/src/app/shared/inline-editors/inline-ng-select/inline-ng-select.component.html create mode 100644 alcs-frontend/src/app/shared/inline-editors/inline-ng-select/inline-ng-select.component.scss create mode 100644 alcs-frontend/src/app/shared/inline-editors/inline-ng-select/inline-ng-select.component.spec.ts create mode 100644 alcs-frontend/src/app/shared/inline-editors/inline-ng-select/inline-ng-select.component.ts diff --git a/alcs-frontend/src/app/features/application/proposal/nfu/nfu.component.html b/alcs-frontend/src/app/features/application/proposal/nfu/nfu.component.html index 6b81c0bf65..5d270e97f9 100644 --- a/alcs-frontend/src/app/features/application/proposal/nfu/nfu.component.html +++ b/alcs-frontend/src/app/features/application/proposal/nfu/nfu.component.html @@ -6,13 +6,13 @@ (save)="updateApplicationValue('nfuUseType', $event)" > -
+
Non-Farm Use Sub-Type
- + >
Use End Date
diff --git a/alcs-frontend/src/app/features/application/proposal/nfu/nfu.component.scss b/alcs-frontend/src/app/features/application/proposal/nfu/nfu.component.scss index 229ba6c084..2f69c7774f 100644 --- a/alcs-frontend/src/app/features/application/proposal/nfu/nfu.component.scss +++ b/alcs-frontend/src/app/features/application/proposal/nfu/nfu.component.scss @@ -1,3 +1,7 @@ div { margin: 32px 0; } + +.nfu-subtype-wrapper { + width: 25%; +} diff --git a/alcs-frontend/src/app/shared/inline-editors/inline-ng-select/inline-ng-select.component.html b/alcs-frontend/src/app/shared/inline-editors/inline-ng-select/inline-ng-select.component.html new file mode 100644 index 0000000000..d49670474e --- /dev/null +++ b/alcs-frontend/src/app/shared/inline-editors/inline-ng-select/inline-ng-select.component.html @@ -0,0 +1,36 @@ +
+ + Select an option + Select option(s) + + {{ value }} + + + {{ coerceArray(value)?.join(', ') }} + + + +
+
+ +
+
+ + +
+
+
diff --git a/alcs-frontend/src/app/shared/inline-editors/inline-ng-select/inline-ng-select.component.scss b/alcs-frontend/src/app/shared/inline-editors/inline-ng-select/inline-ng-select.component.scss new file mode 100644 index 0000000000..1eef4be4cd --- /dev/null +++ b/alcs-frontend/src/app/shared/inline-editors/inline-ng-select/inline-ng-select.component.scss @@ -0,0 +1,58 @@ +@use '../../../../styles/colors'; + +.inline-number-wrapper { + padding-top: 4px; +} + +.editing { + display: inline-block; + width: 100%; +} + +.editing.hidden { + display: none; +} + +.edit-button { + height: 24px; + width: 24px; + display: flex; + align-items: center; +} + +.edit-icon { + font-size: inherit; + line-height: 22px; +} + +.button-container { + display: flex; + justify-content: flex-end; + + button:not(:last-child) { + margin-right: 2px !important; + } +} + +.add { + cursor: pointer; +} + +.save { + color: colors.$primary-color; +} + +:host::ng-deep { + .mat-form-field-wrapper { + padding: 0 !important; + margin: 0 !important; + } + + button mat-icon { + overflow: visible; + } + + .mat-mdc-icon-button.mat-mdc-button-base { + padding: 0 !important; + } +} diff --git a/alcs-frontend/src/app/shared/inline-editors/inline-ng-select/inline-ng-select.component.spec.ts b/alcs-frontend/src/app/shared/inline-editors/inline-ng-select/inline-ng-select.component.spec.ts new file mode 100644 index 0000000000..7984b8d927 --- /dev/null +++ b/alcs-frontend/src/app/shared/inline-editors/inline-ng-select/inline-ng-select.component.spec.ts @@ -0,0 +1,24 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { InlineNgSelectComponent } from './inline-ng-select.component'; + +describe('InlineDropdownComponent', () => { + let component: InlineNgSelectComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [InlineNgSelectComponent], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(InlineNgSelectComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/alcs-frontend/src/app/shared/inline-editors/inline-ng-select/inline-ng-select.component.ts b/alcs-frontend/src/app/shared/inline-editors/inline-ng-select/inline-ng-select.component.ts new file mode 100644 index 0000000000..1d6e2c709b --- /dev/null +++ b/alcs-frontend/src/app/shared/inline-editors/inline-ng-select/inline-ng-select.component.ts @@ -0,0 +1,54 @@ +import { AfterContentChecked, Component, ElementRef, EventEmitter, Input, Output, ViewChild } from '@angular/core'; + +@Component({ + selector: 'app-inline-ng-select[options][value]', + templateUrl: './inline-ng-select.component.html', + styleUrls: ['./inline-ng-select.component.scss'], +}) +export class InlineNgSelectComponent implements AfterContentChecked { + @Input() value?: string | string[] | undefined; + @Input() placeholder: string = 'Enter a value'; + @Input() options: { label: string; value: string }[] = []; + @Input() multiple = false; + + @Output() save = new EventEmitter(); + + @ViewChild('editInput') textInput!: ElementRef; + + isEditing = false; + pendingValue: undefined | string | string[]; + + constructor() {} + + startEdit() { + this.isEditing = true; + this.pendingValue = this.value; + } + + ngAfterContentChecked(): void { + if (this.textInput) { + this.textInput.nativeElement.focus(); + } + } + + confirmEdit() { + if (this.pendingValue !== this.value) { + this.save.emit(this.pendingValue ?? null); + this.value = this.pendingValue; + } + + this.isEditing = false; + } + + cancelEdit() { + this.isEditing = false; + this.pendingValue = this.value; + } + + coerceArray(value: string | string[] | undefined) { + if (value instanceof Array) { + return value; + } + return undefined; + } +} diff --git a/alcs-frontend/src/app/shared/shared.module.ts b/alcs-frontend/src/app/shared/shared.module.ts index d60257ce20..756471ca40 100644 --- a/alcs-frontend/src/app/shared/shared.module.ts +++ b/alcs-frontend/src/app/shared/shared.module.ts @@ -47,6 +47,7 @@ import { InlineNumberComponent } from './inline-editors/inline-number/inline-num import { InlineReviewOutcomeComponent } from './inline-editors/inline-review-outcome/inline-review-outcome.component'; import { InlineTextComponent } from './inline-editors/inline-text/inline-text.component'; import { InlineTextareaComponent } from './inline-editors/inline-textarea/inline-textarea.component'; +import { InlineNgSelectComponent } from './inline-editors/inline-ng-select/inline-ng-select.component'; import { LotsTableFormComponent } from './lots-table/lots-table-form.component'; import { MeetingOverviewComponent } from './meeting-overview/meeting-overview.component'; import { NoDataComponent } from './no-data/no-data.component'; @@ -94,6 +95,7 @@ import { WarningBannerComponent } from './warning-banner/warning-banner.componen WarningBannerComponent, ErrorMessageComponent, LotsTableFormComponent, + InlineNgSelectComponent, ], imports: [ CommonModule, @@ -117,6 +119,7 @@ import { WarningBannerComponent } from './warning-banner/warning-banner.componen RouterModule, MatDatepickerModule, MatDialogModule, + NgSelectModule, ], exports: [ CommonModule, @@ -150,6 +153,7 @@ import { WarningBannerComponent } from './warning-banner/warning-banner.componen InlineNumberComponent, InlineTextComponent, InlineDropdownComponent, + InlineNgSelectComponent, MatAutocompleteModule, MatButtonToggleModule, DetailsHeaderComponent, From 40f0d48adcae6fa88cb5dab53fa6f12490f92f09 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Thu, 27 Jul 2023 11:46:55 -0700 Subject: [PATCH 142/954] Fix Styling for SUBD, Fix Decisions with no components or conditions * Bug fix for header change after checked --- .../decision-input-v2.component.ts | 11 ++++--- .../lots-table/lots-table-form.component.scss | 4 +++ .../lots-table/lots-table-form.component.ts | 30 +++++++++++-------- .../app/shared/header/header.component.html | 10 ++----- .../src/app/shared/header/header.component.ts | 13 ++++---- 5 files changed, 37 insertions(+), 31 deletions(-) diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.ts index f2e92007fa..2bc38b496b 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.ts @@ -528,8 +528,8 @@ export class DecisionInputV2Component implements OnInit, OnDestroy { private runValidation() { this.form.markAllAsTouched(); - this.componentsValid = this.componentsValid && this.components.length > 0; - this.conditionsValid = this.conditionsValid && this.conditionUpdates.length > 0; + const requiresConditions = this.showConditions; + const requiresComponents = this.showComponents; if (this.decisionComponentsComponent) { this.decisionComponentsComponent.onValidate(); @@ -543,8 +543,8 @@ export class DecisionInputV2Component implements OnInit, OnDestroy { !this.form.valid || !this.conditionsValid || !this.componentsValid || - (this.components.length === 0 && this.showComponents) || - (this.conditionUpdates.length === 0 && this.showConditions) + (this.components.length === 0 && requiresComponents) || + (this.conditionUpdates.length === 0 && requiresConditions) ) { this.form.controls.decisionMaker.markAsDirty(); this.toastService.showErrorToast('Please correct all errors before submitting the form'); @@ -594,9 +594,8 @@ export class DecisionInputV2Component implements OnInit, OnDestroy { } onConditionsChange($event: { conditions: UpdateApplicationDecisionConditionDto[]; isValid: boolean }) { - this.conditionUpdates = $event.conditions; - this.conditionsValid = $event.isValid; this.conditionUpdates = Array.from($event.conditions); + this.conditionsValid = $event.isValid; } onChangeDecisionOutcome(selectedOutcome: DecisionOutcomeCodeDto) { diff --git a/alcs-frontend/src/app/shared/lots-table/lots-table-form.component.scss b/alcs-frontend/src/app/shared/lots-table/lots-table-form.component.scss index e69de29bb2..5aa07a5e2e 100644 --- a/alcs-frontend/src/app/shared/lots-table/lots-table-form.component.scss +++ b/alcs-frontend/src/app/shared/lots-table/lots-table-form.component.scss @@ -0,0 +1,4 @@ +fieldset { + border: none; + padding: 0; +} diff --git a/alcs-frontend/src/app/shared/lots-table/lots-table-form.component.ts b/alcs-frontend/src/app/shared/lots-table/lots-table-form.component.ts index 9979b53925..c9a65c177e 100644 --- a/alcs-frontend/src/app/shared/lots-table/lots-table-form.component.ts +++ b/alcs-frontend/src/app/shared/lots-table/lots-table-form.component.ts @@ -33,7 +33,7 @@ type ProposedLot = { type: 'Lot' | 'Road Dedication' | null; size: string | null export class LotsTableFormComponent implements ControlValueAccessor, Validator { displayedColumns = ['index', 'type', 'size', 'alrArea']; lotsSource = new MatTableDataSource([]); - lotCount = 0; + lotCount: number | null = null; touched = false; disabled = false; @@ -99,12 +99,14 @@ export class LotsTableFormComponent implements ControlValueAccessor, Validator { this.disabled = disabled; } - writeValue(proposedLots: ProposedLot[]) { + writeValue(proposedLots: ProposedLot[] | null) { this.resetForm(proposedLots ?? []); - this.lotCount = proposedLots.length; + this.lotCount = proposedLots?.length ?? null; let lots = this.mapFormToLots(); this.lotsSource = new MatTableDataSource(lots); - this.count.setValue(this.lotCount.toString()); + if (this.lotCount !== null) { + this.count.setValue(this.lotCount.toString()); + } } validate(control: AbstractControl) { @@ -135,15 +137,17 @@ export class LotsTableFormComponent implements ControlValueAccessor, Validator { private mapFormToLots() { const proposedLots: ProposedLot[] = []; - for (let index = 0; index < this.lotCount; index++) { - const lotType = this.form.controls[`${index}-lotType`].value; - const lotSize = this.form.controls[`${index}-lotSize`].value; - const lotAlrArea = this.form.controls[`${index}-lotAlrArea`].value; - proposedLots.push({ - size: lotSize, - type: lotType, - alrArea: lotAlrArea, - }); + if (this.lotCount !== null) { + for (let index = 0; index < this.lotCount; index++) { + const lotType = this.form.controls[`${index}-lotType`].value; + const lotSize = this.form.controls[`${index}-lotSize`].value; + const lotAlrArea = this.form.controls[`${index}-lotAlrArea`].value; + proposedLots.push({ + size: lotSize, + type: lotType, + alrArea: lotAlrArea, + }); + } } return proposedLots; } diff --git a/portal-frontend/src/app/shared/header/header.component.html b/portal-frontend/src/app/shared/header/header.component.html index a6c5058f6c..acbc8394dc 100644 --- a/portal-frontend/src/app/shared/header/header.component.html +++ b/portal-frontend/src/app/shared/header/header.component.html @@ -9,15 +9,11 @@
Provincial Agricultural Land Commission Portal
- - + +
-
+

Portal Inbox

Log Out

diff --git a/portal-frontend/src/app/shared/header/header.component.ts b/portal-frontend/src/app/shared/header/header.component.ts index 79817826b0..8b86d4843d 100644 --- a/portal-frontend/src/app/shared/header/header.component.ts +++ b/portal-frontend/src/app/shared/header/header.component.ts @@ -1,4 +1,4 @@ -import { Component, OnDestroy, OnInit } from '@angular/core'; +import { ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core'; import { Router } from '@angular/router'; import { Subject, takeUntil } from 'rxjs'; import { AuthenticationService } from '../../services/authentication/authentication.service'; @@ -13,13 +13,16 @@ export class HeaderComponent implements OnInit, OnDestroy { isAuthenticated = false; isMenuOpen = false; - constructor(private authenticationService: AuthenticationService, private router: Router) {} + constructor( + private authenticationService: AuthenticationService, + private router: Router, + private changeDetectorRef: ChangeDetectorRef + ) {} ngOnInit(): void { this.authenticationService.$currentTokenUser.pipe(takeUntil(this.$destroy)).subscribe((user) => { - if (user) { - this.isAuthenticated = true; - } + this.isAuthenticated = !!user; + this.changeDetectorRef.detectChanges(); }); } From 9d1baccc086e91d2a4a561f14268ab8eeb64a311 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Thu, 27 Jul 2023 15:55:44 -0700 Subject: [PATCH 143/954] Load the full type and set it instead of just code * Setting just the code will not trump the actual value so saving a changed code doe not work --- .../application-decision-condition.service.spec.ts | 9 +++++++++ .../application-decision-condition.service.ts | 12 +++++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-condition/application-decision-condition.service.spec.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-condition/application-decision-condition.service.spec.ts index 63b309e1d4..e1df986106 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-condition/application-decision-condition.service.spec.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-condition/application-decision-condition.service.spec.ts @@ -2,6 +2,7 @@ import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; +import { ApplicationDecisionConditionType } from './application-decision-condition-code.entity'; import { UpdateApplicationDecisionConditionDto } from './application-decision-condition.dto'; import { ApplicationDecisionCondition } from './application-decision-condition.entity'; import { ApplicationDecisionConditionService } from './application-decision-condition.service'; @@ -11,9 +12,13 @@ describe('ApplicationDecisionConditionService', () => { let mockApplicationDecisionConditionRepository: DeepMocked< Repository >; + let mockAppDecCondTypeRepository: DeepMocked< + Repository + >; beforeEach(async () => { mockApplicationDecisionConditionRepository = createMock(); + mockAppDecCondTypeRepository = createMock(); const module: TestingModule = await Test.createTestingModule({ providers: [ @@ -22,6 +27,10 @@ describe('ApplicationDecisionConditionService', () => { provide: getRepositoryToken(ApplicationDecisionCondition), useValue: mockApplicationDecisionConditionRepository, }, + { + provide: getRepositoryToken(ApplicationDecisionConditionType), + useValue: mockAppDecCondTypeRepository, + }, ], }).compile(); diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-condition/application-decision-condition.service.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-condition/application-decision-condition.service.ts index 7c71d98fed..ad9698e8a8 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-condition/application-decision-condition.service.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-condition/application-decision-condition.service.ts @@ -3,6 +3,7 @@ import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { ServiceValidationException } from '../../../../../../libs/common/src/exceptions/base.exception'; import { ApplicationDecisionComponent } from '../application-decision-v2/application-decision/component/application-decision-component.entity'; +import { ApplicationDecisionConditionType } from './application-decision-condition-code.entity'; import { UpdateApplicationDecisionConditionDto, UpdateApplicationDecisionConditionServiceDto, @@ -14,6 +15,8 @@ export class ApplicationDecisionConditionService { constructor( @InjectRepository(ApplicationDecisionCondition) private repository: Repository, + @InjectRepository(ApplicationDecisionConditionType) + private typeRepository: Repository, ) {} async getOneOrFail(uuid: string) { @@ -41,7 +44,14 @@ export class ApplicationDecisionConditionService { } else { condition = new ApplicationDecisionCondition(); } - condition.typeCode = updateDto.type?.code ?? null; + if (updateDto.type?.code) { + condition.type = await this.typeRepository.findOneOrFail({ + where: { + code: updateDto.type.code, + }, + }); + } + condition.administrativeFee = updateDto.administrativeFee ?? null; condition.description = updateDto.description ?? null; condition.securityAmount = updateDto.securityAmount ?? null; From 34f9305e9b3309be11d17231a2931fc4b8977be7 Mon Sep 17 00:00:00 2001 From: "to. sandra" <76515860+sandratoh@users.noreply.github.com> Date: Thu, 27 Jul 2023 16:00:56 -0700 Subject: [PATCH 144/954] Add Exclusion applications in ALCS and fix LFNG info (#829) * Add exclusion detail in alcs * Fix LFNG sections in ALCS and portal * Add excl and incl proposal to alcs edit submission * Init excl proposal component and add to app prep * Select and save inclExclApplicantType with inline selector * Update frontend tests * Clean up conditional view to boolean variable --- .../application-details.component.html | 6 ++ .../application-details.module.ts | 2 + .../excl-details/excl-details.component.html | 56 +++++++++++ .../excl-details/excl-details.component.scss | 0 .../excl-details.component.spec.ts | 31 ++++++ .../excl-details/excl-details.component.ts | 45 +++++++++ .../application/application.module.ts | 2 + .../lfng-info/lfng-info.component.html | 99 +++++++++++++++---- .../lfng-info/lfng-info.component.ts | 20 ++++ .../proposal/excl/excl.component.html | 7 ++ .../proposal/excl/excl.component.scss | 0 .../proposal/excl/excl.component.spec.ts | 42 ++++++++ .../proposal/excl/excl.component.ts | 44 +++++++++ .../proposal/proposal.component.html | 1 + .../application-dialog.component.spec.ts | 1 + .../covenant-dialog.component.spec.ts | 1 + .../notice-of-intent-dialog.component.spec.ts | 1 + .../planning-review-dialog.component.spec.ts | 1 + .../application-document.service.ts | 3 + .../application-local-government.dto.ts | 1 + .../services/application/application.dto.ts | 2 + .../application/application.service.spec.ts | 1 + .../inline-applicant-type.component.html | 23 +++++ .../inline-applicant-type.component.scss | 45 +++++++++ .../inline-applicant-type.component.spec.ts | 28 ++++++ .../inline-applicant-type.component.ts | 37 +++++++ alcs-frontend/src/app/shared/shared.module.ts | 3 + .../alcs-edit-submission.component.html | 16 +++ .../alcs-edit-submission.component.ts | 10 ++ .../edit-submission-base.module.ts | 2 + .../review-submit.component.html | 16 ++- .../lfng-review/lfng-review.component.html | 8 +- .../lfng-review/lfng-review.component.ts | 8 ++ .../application/application.controller.ts | 1 + .../src/alcs/application/application.dto.ts | 8 ++ .../alcs/application/application.entity.ts | 8 ++ ...incl_excl_applicant_type_to_application.ts | 23 +++++ 37 files changed, 573 insertions(+), 29 deletions(-) create mode 100644 alcs-frontend/src/app/features/application/applicant-info/application-details/excl-details/excl-details.component.html create mode 100644 alcs-frontend/src/app/features/application/applicant-info/application-details/excl-details/excl-details.component.scss create mode 100644 alcs-frontend/src/app/features/application/applicant-info/application-details/excl-details/excl-details.component.spec.ts create mode 100644 alcs-frontend/src/app/features/application/applicant-info/application-details/excl-details/excl-details.component.ts create mode 100644 alcs-frontend/src/app/features/application/proposal/excl/excl.component.html create mode 100644 alcs-frontend/src/app/features/application/proposal/excl/excl.component.scss create mode 100644 alcs-frontend/src/app/features/application/proposal/excl/excl.component.spec.ts create mode 100644 alcs-frontend/src/app/features/application/proposal/excl/excl.component.ts create mode 100644 alcs-frontend/src/app/shared/inline-applicant-type/inline-applicant-type.component.html create mode 100644 alcs-frontend/src/app/shared/inline-applicant-type/inline-applicant-type.component.scss create mode 100644 alcs-frontend/src/app/shared/inline-applicant-type/inline-applicant-type.component.spec.ts create mode 100644 alcs-frontend/src/app/shared/inline-applicant-type/inline-applicant-type.component.ts create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1690485189579-add_incl_excl_applicant_type_to_application.ts diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.html b/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.html index cda1a72718..0a5a4d1b62 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.html +++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.html @@ -172,6 +172,12 @@

Proposal

[applicationSubmission]="submission" [files]="files" > + +
+ +
+
+ + Land Owner + L/FNG Initiated + + +
+ + +
+
+
diff --git a/alcs-frontend/src/app/shared/inline-applicant-type/inline-applicant-type.component.scss b/alcs-frontend/src/app/shared/inline-applicant-type/inline-applicant-type.component.scss new file mode 100644 index 0000000000..9b074fdc29 --- /dev/null +++ b/alcs-frontend/src/app/shared/inline-applicant-type/inline-applicant-type.component.scss @@ -0,0 +1,45 @@ +@use '../../../styles/colors'; + +.inline-applicant-type-wrapper { + padding-top: 4px; +} + +.editing.hidden { + display: none; +} + +.button-container { + button:not(:last-child) { + margin-right: 2px !important; + } + .save { + color: colors.$primary-color; + } +} + +.edit-button { + height: 24px; + width: 24px; + display: flex; + align-items: center; +} + +.edit-icon { + font-size: inherit; + line-height: 22px; +} + +:host::ng-deep { + .mat-form-field-wrapper { + padding: 0 !important; + margin: 0 !important; + } + + button mat-icon { + overflow: visible; + } + + .mat-mdc-icon-button.mat-mdc-button-base { + padding: 0 !important; + } +} diff --git a/alcs-frontend/src/app/shared/inline-applicant-type/inline-applicant-type.component.spec.ts b/alcs-frontend/src/app/shared/inline-applicant-type/inline-applicant-type.component.spec.ts new file mode 100644 index 0000000000..b692b19be4 --- /dev/null +++ b/alcs-frontend/src/app/shared/inline-applicant-type/inline-applicant-type.component.spec.ts @@ -0,0 +1,28 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { FormsModule, ReactiveFormsModule } from '@angular/forms'; +import { MatButtonToggleModule } from '@angular/material/button-toggle'; +import { SharedModule } from '../shared.module'; + +import { InlineApplicantTypeComponent } from './inline-applicant-type.component'; + +describe('InlineApplicantTypeComponent', () => { + let component: InlineApplicantTypeComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [SharedModule, FormsModule, ReactiveFormsModule, MatButtonToggleModule], + declarations: [InlineApplicantTypeComponent], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(InlineApplicantTypeComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/alcs-frontend/src/app/shared/inline-applicant-type/inline-applicant-type.component.ts b/alcs-frontend/src/app/shared/inline-applicant-type/inline-applicant-type.component.ts new file mode 100644 index 0000000000..1c4e6e238f --- /dev/null +++ b/alcs-frontend/src/app/shared/inline-applicant-type/inline-applicant-type.component.ts @@ -0,0 +1,37 @@ +import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; +import { FormBuilder, FormGroup } from '@angular/forms'; + +@Component({ + selector: 'app-inline-applicant-type', + templateUrl: './inline-applicant-type.component.html', + styleUrls: ['./inline-applicant-type.component.scss'], +}) +export class InlineApplicantTypeComponent implements OnInit { + @Input() selectedValue?: string | null; + @Input() value?: string | null; + + @Output() save = new EventEmitter(); + + form!: FormGroup; + isEditing = false; + pendingApplicantType?: string | null; + + constructor(private fb: FormBuilder) { + this.pendingApplicantType = this.selectedValue; + } + + ngOnInit(): void { + this.form = this.fb.group({ + applicantType: this.value || this.selectedValue, + }); + } + + toggleEdit() { + this.isEditing = !this.isEditing; + } + + onSave() { + this.save.emit(this.form.get('applicantType')!.value); + this.isEditing = false; + } +} diff --git a/alcs-frontend/src/app/shared/shared.module.ts b/alcs-frontend/src/app/shared/shared.module.ts index 756471ca40..36ea036d66 100644 --- a/alcs-frontend/src/app/shared/shared.module.ts +++ b/alcs-frontend/src/app/shared/shared.module.ts @@ -40,6 +40,7 @@ import { AvatarCircleComponent } from './avatar-circle/avatar-circle.component'; import { DetailsHeaderComponent } from './details-header/details-header.component'; import { ErrorMessageComponent } from './error-message/error-message.component'; import { FavoriteButtonComponent } from './favorite-button/favorite-button.component'; +import { InlineApplicantTypeComponent } from './inline-applicant-type/inline-applicant-type.component'; import { InlineBooleanComponent } from './inline-editors/inline-boolean/inline-boolean.component'; import { InlineDatepickerComponent } from './inline-editors/inline-datepicker/inline-datepicker.component'; import { InlineDropdownComponent } from './inline-editors/inline-dropdown/inline-dropdown.component'; @@ -72,6 +73,7 @@ import { WarningBannerComponent } from './warning-banner/warning-banner.componen MomentPipe, StartOfDayPipe, MeetingOverviewComponent, + InlineApplicantTypeComponent, InlineTextareaComponent, InlineBooleanComponent, InlineNumberComponent, @@ -148,6 +150,7 @@ import { WarningBannerComponent } from './warning-banner/warning-banner.componen MtxButtonModule, StartOfDayPipe, MatTooltipModule, + InlineApplicantTypeComponent, InlineTextareaComponent, InlineBooleanComponent, InlineNumberComponent, diff --git a/portal-frontend/src/app/features/alcs-edit-submission/alcs-edit-submission.component.html b/portal-frontend/src/app/features/alcs-edit-submission/alcs-edit-submission.component.html index 406803dac5..74ccaa5382 100644 --- a/portal-frontend/src/app/features/alcs-edit-submission/alcs-edit-submission.component.html +++ b/portal-frontend/src/app/features/alcs-edit-submission/alcs-edit-submission.component.html @@ -137,6 +137,22 @@
(navigateToStep)="switchStep($event)" (exit)="onExit()" > + +
diff --git a/portal-frontend/src/app/features/alcs-edit-submission/alcs-edit-submission.component.ts b/portal-frontend/src/app/features/alcs-edit-submission/alcs-edit-submission.component.ts index 5dd7fb0286..32486f33ba 100644 --- a/portal-frontend/src/app/features/alcs-edit-submission/alcs-edit-submission.component.ts +++ b/portal-frontend/src/app/features/alcs-edit-submission/alcs-edit-submission.component.ts @@ -29,6 +29,8 @@ import { TurProposalComponent } from '../edit-submission/proposal/tur-proposal/t import { SelectGovernmentComponent } from '../edit-submission/select-government/select-government.component'; import { ConfirmPublishDialogComponent } from './confirm-publish-dialog/confirm-publish-dialog.component'; import { scrollToElement } from '../../shared/utils/scroll-helper'; +import { ExclProposalComponent } from '../edit-submission/proposal/excl-proposal/excl-proposal.component'; +import { InclProposalComponent } from '../edit-submission/proposal/incl-proposal/incl-proposal.component'; @Component({ selector: 'app-alcs-edit-submission', @@ -64,6 +66,8 @@ export class AlcsEditSubmissionComponent implements OnInit, OnDestroy, AfterView @ViewChild(RosoProposalComponent) rosoProposalComponent?: RosoProposalComponent; @ViewChild(PofoProposalComponent) profoProposalComponent?: PofoProposalComponent; @ViewChild(PfrsProposalComponent) pfrsProposalComponent?: PfrsProposalComponent; + @ViewChild(ExclProposalComponent) exclProposalComponent?: ExclProposalComponent; + @ViewChild(InclProposalComponent) inclProposalComponent?: InclProposalComponent; @ViewChild(OtherAttachmentsComponent) otherAttachmentsComponent!: OtherAttachmentsComponent; constructor( @@ -209,6 +213,12 @@ export class AlcsEditSubmissionComponent implements OnInit, OnDestroy, AfterView if (this.pfrsProposalComponent) { await this.pfrsProposalComponent.onSave(); } + if (this.exclProposalComponent) { + await this.exclProposalComponent.onSave(); + } + if (this.inclProposalComponent) { + await this.inclProposalComponent.onSave(); + } } async switchStep(index: number) { diff --git a/portal-frontend/src/app/features/edit-submission/edit-submission-base.module.ts b/portal-frontend/src/app/features/edit-submission/edit-submission-base.module.ts index acea5917c7..71801160f1 100644 --- a/portal-frontend/src/app/features/edit-submission/edit-submission-base.module.ts +++ b/portal-frontend/src/app/features/edit-submission/edit-submission-base.module.ts @@ -110,6 +110,8 @@ import { SelectGovernmentComponent } from './select-government/select-government PfrsProposalComponent, NaruProposalComponent, SoilTableComponent, + ExclProposalComponent, + InclProposalComponent, ], }) export class EditSubmissionBaseModule {} diff --git a/portal-frontend/src/app/features/review-submission/review-submit/review-submit.component.html b/portal-frontend/src/app/features/review-submission/review-submit/review-submit.component.html index cb01882b58..70f9d717a5 100644 --- a/portal-frontend/src/app/features/review-submission/review-submit/review-submit.component.html +++ b/portal-frontend/src/app/features/review-submission/review-submit/review-submit.component.html @@ -179,7 +179,11 @@

4. Resolution

The only option available to you is to forward this application on to the ALC.
Resolution for Application to Proceed to the ALC
@@ -191,7 +195,7 @@

4. Resolution

@@ -423,7 +427,11 @@

4. Resolution

The only option available to you is to forward this application on to the ALC.
Resolution for Application to Proceed to the ALC
@@ -435,7 +443,7 @@

4. Resolution

diff --git a/portal-frontend/src/app/features/view-submission/lfng-review/lfng-review.component.html b/portal-frontend/src/app/features/view-submission/lfng-review/lfng-review.component.html index 5afec266c1..4a8902487a 100644 --- a/portal-frontend/src/app/features/view-submission/lfng-review/lfng-review.component.html +++ b/portal-frontend/src/app/features/view-submission/lfng-review/lfng-review.component.html @@ -224,13 +224,7 @@

Resolution

no authorizing resolution is required as per S. 25 (3) or S. 29 (4) of the ALC Act. The only option available is to forward this application on to the ALC.
-
+
Resolution for Application to Proceed to the ALC
{{ diff --git a/portal-frontend/src/app/features/view-submission/lfng-review/lfng-review.component.ts b/portal-frontend/src/app/features/view-submission/lfng-review/lfng-review.component.ts index 8305093ae2..d893645219 100644 --- a/portal-frontend/src/app/features/view-submission/lfng-review/lfng-review.component.ts +++ b/portal-frontend/src/app/features/view-submission/lfng-review/lfng-review.component.ts @@ -34,6 +34,7 @@ export class LfngReviewComponent implements OnInit, OnDestroy { staffReport: ApplicationDocumentDto[] = []; resolutionDocument: ApplicationDocumentDto[] = []; governmentOtherAttachments: ApplicationDocumentDto[] = []; + hasCompletedStepsBeforeResolution = false; hasCompletedStepsBeforeDocuments = false; submittedToAlcStatus = false; @@ -49,6 +50,13 @@ export class LfngReviewComponent implements OnInit, OnDestroy { if (appReview) { this.applicationReview = appReview; + this.hasCompletedStepsBeforeResolution = + appReview.isFirstNationGovernment || + (!appReview.isFirstNationGovernment && + appReview.isOCPDesignation !== null && + appReview.isSubjectToZoning !== null && + (appReview.isOCPDesignation === true || appReview.isSubjectToZoning === true)); + this.hasCompletedStepsBeforeDocuments = (appReview.isAuthorized !== null && appReview.isFirstNationGovernment) || (appReview.isAuthorized !== null && diff --git a/services/apps/alcs/src/alcs/application/application.controller.ts b/services/apps/alcs/src/alcs/application/application.controller.ts index 0dc5422c0e..19532b1390 100644 --- a/services/apps/alcs/src/alcs/application/application.controller.ts +++ b/services/apps/alcs/src/alcs/application/application.controller.ts @@ -102,6 +102,7 @@ export class ApplicationController { proposalExpiryDate: formatIncomingDate(updates.proposalExpiryDate), nfuUseSubType: updates.nfuUseSubType, nfuUseType: updates.nfuUseType, + inclExclApplicantType: updates.inclExclApplicantType, staffObservations: updates.staffObservations, }, ); diff --git a/services/apps/alcs/src/alcs/application/application.dto.ts b/services/apps/alcs/src/alcs/application/application.dto.ts index e836e2a8fc..c756dda3c2 100644 --- a/services/apps/alcs/src/alcs/application/application.dto.ts +++ b/services/apps/alcs/src/alcs/application/application.dto.ts @@ -147,6 +147,10 @@ export class UpdateApplicationDto { @IsString() nfuUseSubType?: string; + @IsOptional() + @IsString() + inclExclApplicantType?: string; + @IsOptional() @IsNumber() proposalEndDate?: number; @@ -245,6 +249,9 @@ export class ApplicationDto { @AutoMap(() => String) nfuUseSubType?: string; + @AutoMap(() => String) + inclExclApplicantType?: string; + proposalEndDate?: number; proposalExpiryDate?: number; } @@ -271,6 +278,7 @@ export class ApplicationUpdateServiceDto { agCapConsultant?: string; nfuUseType?: string; nfuUseSubType?: string; + inclExclApplicantType?: string; proposalEndDate?: Date | null; proposalExpiryDate?: Date | null; staffObservations?: string | null; diff --git a/services/apps/alcs/src/alcs/application/application.entity.ts b/services/apps/alcs/src/alcs/application/application.entity.ts index ffe1c314c2..9955871366 100644 --- a/services/apps/alcs/src/alcs/application/application.entity.ts +++ b/services/apps/alcs/src/alcs/application/application.entity.ts @@ -226,6 +226,14 @@ export class Application extends Base { }) nfuUseSubType?: string | null; + @AutoMap(() => String) + @Column({ + type: 'text', + comment: 'Inclusion Exclusion Applicant Type', + nullable: true, + }) + inclExclApplicantType?: string | null; + @Column({ type: 'timestamptz', comment: 'The date at which the proposal use ends', diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1690485189579-add_incl_excl_applicant_type_to_application.ts b/services/apps/alcs/src/providers/typeorm/migrations/1690485189579-add_incl_excl_applicant_type_to_application.ts new file mode 100644 index 0000000000..7fce8cd0ea --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1690485189579-add_incl_excl_applicant_type_to_application.ts @@ -0,0 +1,23 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class addInclExclApplicantTypeToApplication1690485189579 + implements MigrationInterface +{ + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `ALTER TABLE "alcs"."application" ADD "incl_excl_applicant_type" text`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."application"."incl_excl_applicant_type" IS 'Inclusion Exclusion Applicant Type'`, + ); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."application"."incl_excl_applicant_type" IS 'Inclusion Exclusion Applicant Type'`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application" DROP COLUMN "incl_excl_applicant_type"`, + ); + } +} From e46318682148017d11c9746133a4c26c804338fe Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Wed, 26 Jul 2023 16:25:29 -0700 Subject: [PATCH 145/954] no data for tables with units (#821) * no data for tables with units --- .../pfrs/pfrs.component.html | 88 +++++++++++++++---- .../pofo/pofo.component.html | 44 ++++++++-- .../roso/roso.component.html | 40 +++++++-- 3 files changed, 138 insertions(+), 34 deletions(-) diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pfrs/pfrs.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pfrs/pfrs.component.html index 076a4c03bf..6c9016cb7b 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pfrs/pfrs.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pfrs/pfrs.component.html @@ -20,7 +20,9 @@
Type, origin and quality of fill proposed to be placed.
{{ component.soilFillTypeToPlace }}
- +
@@ -32,34 +34,86 @@ - - - - + + + - - - - + + + - - - - + + + - - - - + + +
Volume{{ component.soilToRemoveVolume }} m3{{ component.soilToPlaceVolume }} m3 + {{ component.soilToRemoveVolume }} m3 + + + {{ component.soilToPlaceVolume }} m3 + +
Area
Note: 0.01 ha is 100m2
{{ component.soilToRemoveArea }} ha{{ component.soilToPlaceArea }} ha + + {{ component.soilToRemoveArea }} ha + + + {{ component.soilToPlaceArea }} ha + +
Maximum Depth{{ component.soilToRemoveMaximumDepth }} m{{ component.soilToPlaceMaximumDepth }} m + {{ component.soilToRemoveMaximumDepth }} m + + + {{ component.soilToPlaceMaximumDepth }} m + +
Average Depth{{ component.soilToRemoveAverageDepth }} m{{ component.soilToPlaceAverageDepth }} m + {{ component.soilToRemoveAverageDepth }} m + + + + {{ component.soilToPlaceAverageDepth }} m + +
diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pofo/pofo.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pofo/pofo.component.html index 9cda6ebd15..658d1947cf 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pofo/pofo.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pofo/pofo.component.html @@ -15,7 +15,9 @@
Type, origin and quality of fill proposed to be placed.
{{ component.soilFillTypeToPlace }}
- +
@@ -26,26 +28,50 @@ - - + - - + - - + - - +
Volume{{ component.soilToPlaceVolume }} m3 + + {{ component.soilToPlaceVolume }} m3 + + +
Area
Note: 0.01 ha is 100m2
{{ component.soilToPlaceArea }} ha + + {{ component.soilToPlaceArea }} ha + + +
Maximum Depth{{ component.soilToPlaceMaximumDepth }} m + + {{ component.soilToPlaceMaximumDepth }} m + + +
Average Depth{{ component.soilToPlaceAverageDepth }} m + {{ component.soilToPlaceAverageDepth }} m + +
diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/roso/roso.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/roso/roso.component.html index 14ae67a69d..732fd4cd46 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/roso/roso.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/roso/roso.component.html @@ -26,23 +26,47 @@ Volume - {{ component.soilToRemoveVolume }} m3 - + + {{ component.soilToRemoveVolume }} m3 + + Area - {{ component.soilToRemoveArea }} ha - + + + {{ component.soilToRemoveArea }} ha + + + Maximum Depth - {{ component.soilToRemoveMaximumDepth }} m - + + {{ component.soilToRemoveMaximumDepth }} m + + Average Depth - {{ component.soilToRemoveAverageDepth }} m - + + {{ component.soilToRemoveAverageDepth }} m + + From 1ae87a12c224bc2d923c15063338fcf9c10ccfb6 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Wed, 26 Jul 2023 14:57:52 -0700 Subject: [PATCH 146/954] Add Subdivision Decision Components * Add Subdivision decision component with new lot-input-form component * Update Subdivision proposal component with new labels / fields * Add new DB field for storing decision component approved lots * Move inline component to their own folder to better organize shared --- .../subd/subd.component.html | 32 ++++ .../subd/subd.component.scss | 0 .../subd/subd.component.spec.ts | 24 +++ .../decision-component/subd/subd.component.ts | 11 ++ .../decision-component.component.html | 6 + .../decision-component.component.ts | 32 +++- .../subd-input/subd-input.component.html | 3 + .../subd-input/subd-input.component.scss | 10 ++ .../subd-input/subd-input.component.spec.ts | 24 +++ .../subd-input/subd-input.component.ts | 17 ++ .../decision-components.component.ts | 9 +- .../decision-v2/decision-v2.component.html | 6 + .../application/decision/decision.module.ts | 28 +++- .../proposal/subd/sub.dcomponent.scss | 2 +- .../proposal/subd/subd.component.html | 24 +-- .../proposal/subd/subd.component.ts | 18 +- .../application-submission.service.ts | 11 +- .../services/application/application.dto.ts | 5 + .../application-decision-v2.dto.ts | 9 +- .../inline-boolean.component.html | 0 .../inline-boolean.component.scss | 2 +- .../inline-boolean.component.spec.ts | 0 .../inline-boolean.component.ts | 0 .../inline-datepicker.component.html | 0 .../inline-datepicker.component.scss | 2 +- .../inline-datepicker.component.spec.ts | 2 +- .../inline-datepicker.component.ts | 4 +- .../inline-dropdown.component.html | 0 .../inline-dropdown.component.scss | 2 +- .../inline-dropdown.component.spec.ts | 0 .../inline-dropdown.component.ts | 0 .../inline-number.component.html | 0 .../inline-number.component.scss | 2 +- .../inline-number.component.spec.ts | 0 .../inline-number/inline-number.component.ts | 0 .../inline-review-outcome.component.html | 0 .../inline-review-outcome.component.scss | 2 +- .../inline-review-outcome.component.spec.ts | 2 +- .../inline-review-outcome.component.ts | 0 .../inline-text/inline-text.component.html | 0 .../inline-text/inline-text.component.scss | 2 +- .../inline-text/inline-text.component.spec.ts | 0 .../inline-text/inline-text.component.ts | 0 .../inline-textarea.component.html | 0 .../inline-textarea.component.scss | 2 +- .../inline-textarea.component.spec.ts | 0 .../inline-textarea.component.ts | 0 .../lots-table/lots-table-form.component.html | 85 ++++++++++ .../lots-table/lots-table-form.component.scss | 0 .../lots-table-form.component.spec.ts | 22 +++ .../lots-table/lots-table-form.component.ts | 157 ++++++++++++++++++ alcs-frontend/src/app/shared/shared.module.ts | 17 +- .../application-decision.dto.ts | 4 +- .../application-decision-component.dto.ts | 10 +- .../application-decision-component.entity.ts | 10 ++ .../application-decision-component.service.ts | 5 + .../application-submission.controller.ts | 14 ++ .../application-submission.dto.ts | 8 + .../application-submission.service.ts | 24 +++ .../application-submission.dto.ts | 1 + .../application-submission.entity.ts | 5 +- .../1690323153558-add_subd_dec_components.ts | 16 ++ .../1690406098396-add_subd_decision_lots.ts | 23 +++ 63 files changed, 652 insertions(+), 42 deletions(-) create mode 100644 alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/subd/subd.component.html create mode 100644 alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/subd/subd.component.scss create mode 100644 alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/subd/subd.component.spec.ts create mode 100644 alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/subd/subd.component.ts create mode 100644 alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/subd-input/subd-input.component.html create mode 100644 alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/subd-input/subd-input.component.scss create mode 100644 alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/subd-input/subd-input.component.spec.ts create mode 100644 alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/subd-input/subd-input.component.ts rename alcs-frontend/src/app/shared/{ => inline-editors}/inline-boolean/inline-boolean.component.html (100%) rename alcs-frontend/src/app/shared/{ => inline-editors}/inline-boolean/inline-boolean.component.scss (95%) rename alcs-frontend/src/app/shared/{ => inline-editors}/inline-boolean/inline-boolean.component.spec.ts (100%) rename alcs-frontend/src/app/shared/{ => inline-editors}/inline-boolean/inline-boolean.component.ts (100%) rename alcs-frontend/src/app/shared/{ => inline-editors}/inline-datepicker/inline-datepicker.component.html (100%) rename alcs-frontend/src/app/shared/{ => inline-editors}/inline-datepicker/inline-datepicker.component.scss (95%) rename alcs-frontend/src/app/shared/{ => inline-editors}/inline-datepicker/inline-datepicker.component.spec.ts (93%) rename alcs-frontend/src/app/shared/{ => inline-editors}/inline-datepicker/inline-datepicker.component.ts (92%) rename alcs-frontend/src/app/shared/{ => inline-editors}/inline-dropdown/inline-dropdown.component.html (100%) rename alcs-frontend/src/app/shared/{ => inline-editors}/inline-dropdown/inline-dropdown.component.scss (95%) rename alcs-frontend/src/app/shared/{ => inline-editors}/inline-dropdown/inline-dropdown.component.spec.ts (100%) rename alcs-frontend/src/app/shared/{ => inline-editors}/inline-dropdown/inline-dropdown.component.ts (100%) rename alcs-frontend/src/app/shared/{ => inline-editors}/inline-number/inline-number.component.html (100%) rename alcs-frontend/src/app/shared/{ => inline-editors}/inline-number/inline-number.component.scss (95%) rename alcs-frontend/src/app/shared/{ => inline-editors}/inline-number/inline-number.component.spec.ts (100%) rename alcs-frontend/src/app/shared/{ => inline-editors}/inline-number/inline-number.component.ts (100%) rename alcs-frontend/src/app/shared/{ => inline-editors}/inline-review-outcome/inline-review-outcome.component.html (100%) rename alcs-frontend/src/app/shared/{ => inline-editors}/inline-review-outcome/inline-review-outcome.component.scss (83%) rename alcs-frontend/src/app/shared/{ => inline-editors}/inline-review-outcome/inline-review-outcome.component.spec.ts (94%) rename alcs-frontend/src/app/shared/{ => inline-editors}/inline-review-outcome/inline-review-outcome.component.ts (100%) rename alcs-frontend/src/app/shared/{ => inline-editors}/inline-text/inline-text.component.html (100%) rename alcs-frontend/src/app/shared/{ => inline-editors}/inline-text/inline-text.component.scss (95%) rename alcs-frontend/src/app/shared/{ => inline-editors}/inline-text/inline-text.component.spec.ts (100%) rename alcs-frontend/src/app/shared/{ => inline-editors}/inline-text/inline-text.component.ts (100%) rename alcs-frontend/src/app/shared/{ => inline-editors}/inline-textarea/inline-textarea.component.html (100%) rename alcs-frontend/src/app/shared/{ => inline-editors}/inline-textarea/inline-textarea.component.scss (96%) rename alcs-frontend/src/app/shared/{ => inline-editors}/inline-textarea/inline-textarea.component.spec.ts (100%) rename alcs-frontend/src/app/shared/{ => inline-editors}/inline-textarea/inline-textarea.component.ts (100%) create mode 100644 alcs-frontend/src/app/shared/lots-table/lots-table-form.component.html create mode 100644 alcs-frontend/src/app/shared/lots-table/lots-table-form.component.scss create mode 100644 alcs-frontend/src/app/shared/lots-table/lots-table-form.component.spec.ts create mode 100644 alcs-frontend/src/app/shared/lots-table/lots-table-form.component.ts create mode 100644 services/apps/alcs/src/alcs/application/application-submission/application-submission.dto.ts create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1690323153558-add_subd_dec_components.ts create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1690406098396-add_subd_decision_lots.ts diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/subd/subd.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/subd/subd.component.html new file mode 100644 index 0000000000..f731dfa356 --- /dev/null +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/subd/subd.component.html @@ -0,0 +1,32 @@ +
+ +
+
Total Number of Lots Approved
+ {{ component.subdApprovedLots?.length }} + +
+
+
+ + + + + + + + + + + + + + + +
#TypeSize (ha)ALR Area (ha)
{{ i + 1 }}{{ lot.type }}{{ lot.size }}{{ lot.alrArea }}
+
diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/subd/subd.component.scss b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/subd/subd.component.scss new file mode 100644 index 0000000000..e69de29bb2 diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/subd/subd.component.spec.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/subd/subd.component.spec.ts new file mode 100644 index 0000000000..5634294fcf --- /dev/null +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/subd/subd.component.spec.ts @@ -0,0 +1,24 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { DecisionComponentDto } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; + +import { SubdComponent } from './subd.component'; + +describe('PfrsComponent', () => { + let component: SubdComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [SubdComponent], + }).compileComponents(); + + fixture = TestBed.createComponent(SubdComponent); + component = fixture.componentInstance; + component.component = {} as DecisionComponentDto; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/subd/subd.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/subd/subd.component.ts new file mode 100644 index 0000000000..c197412739 --- /dev/null +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/subd/subd.component.ts @@ -0,0 +1,11 @@ +import { Component, Input } from '@angular/core'; +import { DecisionComponentDto } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; + +@Component({ + selector: 'app-subd[component]', + templateUrl: './subd.component.html', + styleUrls: ['./subd.component.scss'], +}) +export class SubdComponent { + @Input() component!: DecisionComponentDto; +} diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.html index 4cdc8a3f17..004bd7bfd4 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.html @@ -96,4 +96,10 @@ [codes]="codes" >
+
+ +
diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.ts index ea748febec..5d9829cc72 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.ts @@ -1,5 +1,6 @@ -import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; +import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core'; import { FormControl, FormGroup, Validators } from '@angular/forms'; +import { ProposedLot } from '../../../../../../../services/application/application.dto'; import { APPLICATION_DECISION_COMPONENT_TYPE, DecisionCodesDto, @@ -9,11 +10,13 @@ import { NfuDecisionComponentDto, PofoDecisionComponentDto, RosoDecisionComponentDto, + SubdDecisionComponentDto, TurpDecisionComponentDto, } from '../../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; import { ToastService } from '../../../../../../../services/toast/toast.service'; import { formatDateForApi } from '../../../../../../../shared/utils/api-date-formatter'; import { AG_CAP_OPTIONS, AG_CAP_SOURCE_OPTIONS } from '../../../../../proposal/proposal.component'; +import { SubdInputComponent } from './subd-input/subd-input.component'; @Component({ selector: 'app-decision-component', @@ -25,6 +28,8 @@ export class DecisionComponentComponent implements OnInit { @Input() codes!: DecisionCodesDto; @Output() dataChange = new EventEmitter(); + @ViewChild(SubdInputComponent) subdInputComponent?: SubdInputComponent; + COMPONENT_TYPE = APPLICATION_DECISION_COMPONENT_TYPE; agCapOptions = AG_CAP_OPTIONS; @@ -56,6 +61,9 @@ export class DecisionComponentComponent implements OnInit { naruSubtypeCode = new FormControl(null, [Validators.required]); naruEndDate = new FormControl(null); + //subd + subdApprovedLots = new FormControl([], [Validators.required]); + // general alrArea = new FormControl(null, [Validators.required]); agCap = new FormControl(null, [Validators.required]); @@ -101,6 +109,9 @@ export class DecisionComponentComponent implements OnInit { case APPLICATION_DECISION_COMPONENT_TYPE.NARU: this.patchNaruFields(); break; + case APPLICATION_DECISION_COMPONENT_TYPE.SUBD: + this.patchSubdFields(); + break; default: this.toastService.showErrorToast('Wrong decision component type'); break; @@ -162,6 +173,9 @@ export class DecisionComponentComponent implements OnInit { case APPLICATION_DECISION_COMPONENT_TYPE.NARU: dataChange = { ...dataChange, ...this.getNaruDataChange() }; break; + case APPLICATION_DECISION_COMPONENT_TYPE.SUBD: + dataChange = { ...dataChange, ...this.getSubdDataChange() }; + break; default: this.toastService.showErrorToast('Wrong decision component type'); break; @@ -227,6 +241,12 @@ export class DecisionComponentComponent implements OnInit { this.naruSubtypeCode.setValue(this.data.naruSubtypeCode ?? null); } + private patchSubdFields() { + this.form.addControl('subdApprovedLots', this.subdApprovedLots); + debugger; + this.subdApprovedLots.setValue(this.data.subdApprovedLots ?? null); + } + private getNfuDataChange(): NfuDecisionComponentDto { return { nfuType: this.nfuType.value ? this.nfuType.value : null, @@ -286,4 +306,14 @@ export class DecisionComponentComponent implements OnInit { naruSubtypeCode: this.naruSubtypeCode.value ?? null, }; } + + private getSubdDataChange(): SubdDecisionComponentDto { + return { + subdApprovedLots: this.subdApprovedLots.value ?? undefined, + }; + } + + markTouched() { + this.subdInputComponent?.markAllAsTouched(); + } } diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/subd-input/subd-input.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/subd-input/subd-input.component.html new file mode 100644 index 0000000000..84d52339b1 --- /dev/null +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/subd-input/subd-input.component.html @@ -0,0 +1,3 @@ +
+ +
diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/subd-input/subd-input.component.scss b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/subd-input/subd-input.component.scss new file mode 100644 index 0000000000..4b9601d65d --- /dev/null +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/subd-input/subd-input.component.scss @@ -0,0 +1,10 @@ + +:host::ng-deep { + .mat-mdc-form-field { + width: 100%; + } + + .mat-mdc-table .mdc-data-table__row { + height: 78px; + } +} diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/subd-input/subd-input.component.spec.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/subd-input/subd-input.component.spec.ts new file mode 100644 index 0000000000..d8f14022eb --- /dev/null +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/subd-input/subd-input.component.spec.ts @@ -0,0 +1,24 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { SubdInputComponent } from './subd-input.component'; + +describe('RosoInputComponent', () => { + let component: SubdInputComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [SubdInputComponent], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(SubdInputComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/subd-input/subd-input.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/subd-input/subd-input.component.ts new file mode 100644 index 0000000000..63bd2c5206 --- /dev/null +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/subd-input/subd-input.component.ts @@ -0,0 +1,17 @@ +import { Component, Input, ViewChild } from '@angular/core'; +import { FormGroup } from '@angular/forms'; +import { LotsTableFormComponent } from '../../../../../../../../shared/lots-table/lots-table-form.component'; + +@Component({ + selector: 'app-subd-input', + templateUrl: './subd-input.component.html', + styleUrls: ['./subd-input.component.scss'], +}) +export class SubdInputComponent { + @Input() form!: FormGroup; + @ViewChild(LotsTableFormComponent) lotsTableFormComponent?: LotsTableFormComponent; + + markAllAsTouched() { + this.lotsTableFormComponent?.markTouched(); + } +} diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-components.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-components.component.ts index 8fa1564740..19b14d17fc 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-components.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-components.component.ts @@ -116,6 +116,7 @@ export class DecisionComponentsComponent implements OnInit, OnDestroy, AfterView applicationDecisionComponentType: this.decisionComponentTypes.find( (e) => e.code === typeCode && e.uiCode !== 'COPY' ), + subdApprovedLots: this.application.submittedApplication?.subdProposedLots, }; if (typeCode === APPLICATION_DECISION_COMPONENT_TYPE.NFUP) { @@ -151,6 +152,7 @@ export class DecisionComponentsComponent implements OnInit, OnDestroy, AfterView case APPLICATION_DECISION_COMPONENT_TYPE.ROSO: case APPLICATION_DECISION_COMPONENT_TYPE.PFRS: case APPLICATION_DECISION_COMPONENT_TYPE.NARU: + case APPLICATION_DECISION_COMPONENT_TYPE.SUBD: this.components.push({ applicationDecisionComponentTypeCode: typeCode, applicationDecisionComponentType: this.decisionComponentTypes.find( @@ -228,6 +230,11 @@ export class DecisionComponentsComponent implements OnInit, OnDestroy, AfterView } onValidate() { - this.childComponents.forEach((component) => component.form.markAllAsTouched()); + this.childComponents.forEach((component) => { + component.form.markAllAsTouched(); + if ('markTouched' in component) { + component.markTouched(); + } + }); } } diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.html index 1e62004cb3..1cc2816ba7 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.html @@ -255,6 +255,12 @@
Decision Components and Conditions
*ngIf="component.applicationDecisionComponentTypeCode === COMPONENT_TYPE.NARU" [component]="component" > + +
diff --git a/alcs-frontend/src/app/features/application/decision/decision.module.ts b/alcs-frontend/src/app/features/application/decision/decision.module.ts index ad64698c9b..adf3641992 100644 --- a/alcs-frontend/src/app/features/application/decision/decision.module.ts +++ b/alcs-frontend/src/app/features/application/decision/decision.module.ts @@ -1,6 +1,14 @@ +import { NgIf } from '@angular/common'; import { NgModule } from '@angular/core'; +import { ReactiveFormsModule } from '@angular/forms'; +import { MatOptionModule } from '@angular/material/core'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatInputModule } from '@angular/material/input'; +import { MatSelectModule } from '@angular/material/select'; +import { MatTableModule } from '@angular/material/table'; import { MatTabsModule } from '@angular/material/tabs'; import { RouterModule } from '@angular/router'; +import { NgxMaskDirective } from 'ngx-mask'; import { SharedModule } from '../../../shared/shared.module'; import { ConditionComponent } from './conditions/condition/condition.component'; import { ConditionsComponent } from './conditions/conditions.component'; @@ -11,6 +19,7 @@ import { NfupComponent } from './decision-v2/decision-component/nfup/nfup.compon import { PfrsComponent } from './decision-v2/decision-component/pfrs/pfrs.component'; import { PofoComponent } from './decision-v2/decision-component/pofo/pofo.component'; import { RosoComponent } from './decision-v2/decision-component/roso/roso.component'; +import { SubdComponent } from './decision-v2/decision-component/subd/subd.component'; import { TurpComponent } from './decision-v2/decision-component/turp/turp.component'; import { DecisionDocumentsComponent } from './decision-v2/decision-documents/decision-documents.component'; import { DecisionComponentComponent } from './decision-v2/decision-input/decision-components/decision-component/decision-component.component'; @@ -19,6 +28,7 @@ import { NfuInputComponent } from './decision-v2/decision-input/decision-compone import { PfrsInputComponent } from './decision-v2/decision-input/decision-components/decision-component/pfrs-input/pfrs-input.component'; import { PofoInputComponent } from './decision-v2/decision-input/decision-components/decision-component/pofo-input/pofo-input.component'; import { RosoInputComponent } from './decision-v2/decision-input/decision-components/decision-component/roso-input/roso-input.component'; +import { SubdInputComponent } from './decision-v2/decision-input/decision-components/decision-component/subd-input/subd-input.component'; import { TurpInputComponent } from './decision-v2/decision-input/decision-components/decision-component/turp-input/turp-input.component'; import { DecisionComponentsComponent } from './decision-v2/decision-input/decision-components/decision-components.component'; import { DecisionConditionComponent } from './decision-v2/decision-input/decision-conditions/decision-condition/decision-condition.component'; @@ -82,13 +92,29 @@ export const decisionChildRoutes = [ RosoComponent, RosoInputComponent, PfrsInputComponent, + SubdInputComponent, PfrsComponent, NaruComponent, + SubdComponent, NaruInputComponent, ConditionsComponent, ConditionComponent, BasicComponent, ], - imports: [SharedModule.forRoot(), RouterModule.forChild(decisionChildRoutes), MatTabsModule], + imports: [ + SharedModule.forRoot(), + RouterModule.forChild(decisionChildRoutes), + MatTabsModule, + MatFormFieldModule, + MatInputModule, + MatOptionModule, + MatSelectModule, + MatTableModule, + NgIf, + NgxMaskDirective, + ReactiveFormsModule, + MatInputModule, + MatFormFieldModule, + ], }) export class DecisionModule {} diff --git a/alcs-frontend/src/app/features/application/proposal/subd/sub.dcomponent.scss b/alcs-frontend/src/app/features/application/proposal/subd/sub.dcomponent.scss index deb66eaa6f..9fe6dba7ef 100644 --- a/alcs-frontend/src/app/features/application/proposal/subd/sub.dcomponent.scss +++ b/alcs-frontend/src/app/features/application/proposal/subd/sub.dcomponent.scss @@ -1,6 +1,6 @@ .parcel-table { display: grid; - grid-template-columns: max-content max-content max-content; + grid-template-columns: max-content max-content max-content max-content; grid-column-gap: 36px; grid-row-gap: 12px; } diff --git a/alcs-frontend/src/app/features/application/proposal/subd/subd.component.html b/alcs-frontend/src/app/features/application/proposal/subd/subd.component.html index 2a73f6f527..cdf92af9a2 100644 --- a/alcs-frontend/src/app/features/application/proposal/subd/subd.component.html +++ b/alcs-frontend/src/app/features/application/proposal/subd/subd.component.html @@ -1,19 +1,23 @@ -
-
Proposed Lot Areas
-
-
#
-
Type
-
Size
- -
+
+
Proposed Lot Areas
+
+
#
+
Type
+
Size (ha)
+
ALR Area (ha)
+ +
{{ i + 1 }}
-
+
{{ lot.type }}
-
+
{{ lot.size }}
+
+ +
diff --git a/alcs-frontend/src/app/features/application/proposal/subd/subd.component.ts b/alcs-frontend/src/app/features/application/proposal/subd/subd.component.ts index f1a1e3a7f8..981b75da43 100644 --- a/alcs-frontend/src/app/features/application/proposal/subd/subd.component.ts +++ b/alcs-frontend/src/app/features/application/proposal/subd/subd.component.ts @@ -2,7 +2,7 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; import { Subject, takeUntil } from 'rxjs'; import { ApplicationDetailService } from '../../../../services/application/application-detail.service'; import { ApplicationSubmissionService } from '../../../../services/application/application-submission/application-submission.service'; -import { ApplicationSubmissionDto } from '../../../../services/application/application.dto'; +import { ApplicationSubmissionDto, ProposedLot } from '../../../../services/application/application.dto'; @Component({ selector: 'app-proposal-subd', @@ -11,7 +11,8 @@ import { ApplicationSubmissionDto } from '../../../../services/application/appli }) export class SubdProposalComponent implements OnInit, OnDestroy { $destroy = new Subject(); - applicationSubmission: ApplicationSubmissionDto | undefined; + proposedLots: ProposedLot[] = []; + private fileNumber: string | undefined; constructor( private applicationDetailService: ApplicationDetailService, @@ -21,17 +22,28 @@ export class SubdProposalComponent implements OnInit, OnDestroy { ngOnInit(): void { this.applicationDetailService.$application.pipe(takeUntil(this.$destroy)).subscribe((application) => { if (application) { + this.fileNumber = application.fileNumber; this.loadSubmission(application.fileNumber); } }); } async loadSubmission(fileNumber: string) { - this.applicationSubmission = await this.applicationSubmissionService.fetchSubmission(fileNumber); + const submission = await this.applicationSubmissionService.fetchSubmission(fileNumber); + this.proposedLots = submission.subdProposedLots; } ngOnDestroy(): void { this.$destroy.next(); this.$destroy.complete(); } + + async saveALRArea(i: number, $event: string | null) { + if (this.fileNumber) { + this.proposedLots[i].alrArea = $event ? parseFloat($event) : null; + await this.applicationSubmissionService.update(this.fileNumber, { + subProposedLots: this.proposedLots, + }); + } + } } diff --git a/alcs-frontend/src/app/services/application/application-submission/application-submission.service.ts b/alcs-frontend/src/app/services/application/application-submission/application-submission.service.ts index 8630599896..9ec1e88d94 100644 --- a/alcs-frontend/src/app/services/application/application-submission/application-submission.service.ts +++ b/alcs-frontend/src/app/services/application/application-submission/application-submission.service.ts @@ -4,7 +4,7 @@ import { firstValueFrom } from 'rxjs'; import { environment } from '../../../../environments/environment'; import { openFileInline } from '../../../shared/utils/file'; import { ToastService } from '../../toast/toast.service'; -import { ApplicationSubmissionDto } from '../application.dto'; +import { ApplicationSubmissionDto, UpdateApplicationSubmissionDto } from '../application.dto'; @Injectable({ providedIn: 'root', @@ -35,4 +35,13 @@ export class ApplicationSubmissionService { throw e; } } + + update(fileNumber: string, update: UpdateApplicationSubmissionDto) { + try { + return firstValueFrom(this.http.patch(`${this.baseUrl}/${fileNumber}`, update)); + } catch (e) { + this.toastService.showErrorToast('Failed to update Application Submission'); + throw e; + } + } } diff --git a/alcs-frontend/src/app/services/application/application.dto.ts b/alcs-frontend/src/app/services/application/application.dto.ts index 90421efad0..41f4445cb3 100644 --- a/alcs-frontend/src/app/services/application/application.dto.ts +++ b/alcs-frontend/src/app/services/application/application.dto.ts @@ -50,6 +50,7 @@ export interface ApplicationDecisionMeetingDto { export interface ProposedLot { type: 'Lot' | 'Road Dedication' | null; size: number | null; + alrArea?: number | null; } export interface ApplicationReviewDto { @@ -100,6 +101,10 @@ export interface ApplicationParcelDto { alrArea: number; } +export interface UpdateApplicationSubmissionDto { + subProposedLots?: ProposedLot[]; +} + export interface ApplicationSubmissionDto { uuid: string; fileNumber: string; diff --git a/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-v2.dto.ts b/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-v2.dto.ts index 40183d8d27..838db7e479 100644 --- a/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-v2.dto.ts +++ b/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-v2.dto.ts @@ -1,4 +1,5 @@ import { BaseCodeDto } from '../../../../shared/dto/base.dto'; +import { ProposedLot } from '../../application.dto'; export enum DecisionMaker { CEO = 'CEOP', @@ -146,12 +147,17 @@ export interface RosoDecisionComponentDto { soilToRemoveAverageDepth?: number | null; } +export interface SubdDecisionComponentDto { + subdApprovedLots?: ProposedLot[]; +} + export interface DecisionComponentDto extends NfuDecisionComponentDto, TurpDecisionComponentDto, PofoDecisionComponentDto, RosoDecisionComponentDto, - NaruDecisionComponentDto { + NaruDecisionComponentDto, + SubdDecisionComponentDto { uuid?: string; alrArea?: number | null; agCap?: string | null; @@ -181,6 +187,7 @@ export enum APPLICATION_DECISION_COMPONENT_TYPE { ROSO = 'ROSO', PFRS = 'PFRS', NARU = 'NARU', + SUBD = 'SUBD', } export interface ApplicationDecisionConditionTypeDto extends BaseCodeDto {} diff --git a/alcs-frontend/src/app/shared/inline-boolean/inline-boolean.component.html b/alcs-frontend/src/app/shared/inline-editors/inline-boolean/inline-boolean.component.html similarity index 100% rename from alcs-frontend/src/app/shared/inline-boolean/inline-boolean.component.html rename to alcs-frontend/src/app/shared/inline-editors/inline-boolean/inline-boolean.component.html diff --git a/alcs-frontend/src/app/shared/inline-boolean/inline-boolean.component.scss b/alcs-frontend/src/app/shared/inline-editors/inline-boolean/inline-boolean.component.scss similarity index 95% rename from alcs-frontend/src/app/shared/inline-boolean/inline-boolean.component.scss rename to alcs-frontend/src/app/shared/inline-editors/inline-boolean/inline-boolean.component.scss index 2ed9b06eab..82f5256a6c 100644 --- a/alcs-frontend/src/app/shared/inline-boolean/inline-boolean.component.scss +++ b/alcs-frontend/src/app/shared/inline-editors/inline-boolean/inline-boolean.component.scss @@ -1,4 +1,4 @@ -@use '../../../styles/colors'; +@use '../../../../styles/colors'; .inline-date-picker-wrapper { padding-top: 4px; diff --git a/alcs-frontend/src/app/shared/inline-boolean/inline-boolean.component.spec.ts b/alcs-frontend/src/app/shared/inline-editors/inline-boolean/inline-boolean.component.spec.ts similarity index 100% rename from alcs-frontend/src/app/shared/inline-boolean/inline-boolean.component.spec.ts rename to alcs-frontend/src/app/shared/inline-editors/inline-boolean/inline-boolean.component.spec.ts diff --git a/alcs-frontend/src/app/shared/inline-boolean/inline-boolean.component.ts b/alcs-frontend/src/app/shared/inline-editors/inline-boolean/inline-boolean.component.ts similarity index 100% rename from alcs-frontend/src/app/shared/inline-boolean/inline-boolean.component.ts rename to alcs-frontend/src/app/shared/inline-editors/inline-boolean/inline-boolean.component.ts diff --git a/alcs-frontend/src/app/shared/inline-datepicker/inline-datepicker.component.html b/alcs-frontend/src/app/shared/inline-editors/inline-datepicker/inline-datepicker.component.html similarity index 100% rename from alcs-frontend/src/app/shared/inline-datepicker/inline-datepicker.component.html rename to alcs-frontend/src/app/shared/inline-editors/inline-datepicker/inline-datepicker.component.html diff --git a/alcs-frontend/src/app/shared/inline-datepicker/inline-datepicker.component.scss b/alcs-frontend/src/app/shared/inline-editors/inline-datepicker/inline-datepicker.component.scss similarity index 95% rename from alcs-frontend/src/app/shared/inline-datepicker/inline-datepicker.component.scss rename to alcs-frontend/src/app/shared/inline-editors/inline-datepicker/inline-datepicker.component.scss index 7839a3f8cb..5ec04b385b 100644 --- a/alcs-frontend/src/app/shared/inline-datepicker/inline-datepicker.component.scss +++ b/alcs-frontend/src/app/shared/inline-editors/inline-datepicker/inline-datepicker.component.scss @@ -1,4 +1,4 @@ -@use '../../../styles/colors'; +@use '../../../../styles/colors'; .inline-date-picker-wrapper { padding-top: 4px; diff --git a/alcs-frontend/src/app/shared/inline-datepicker/inline-datepicker.component.spec.ts b/alcs-frontend/src/app/shared/inline-editors/inline-datepicker/inline-datepicker.component.spec.ts similarity index 93% rename from alcs-frontend/src/app/shared/inline-datepicker/inline-datepicker.component.spec.ts rename to alcs-frontend/src/app/shared/inline-editors/inline-datepicker/inline-datepicker.component.spec.ts index 1e30f6a434..678b774f4e 100644 --- a/alcs-frontend/src/app/shared/inline-datepicker/inline-datepicker.component.spec.ts +++ b/alcs-frontend/src/app/shared/inline-editors/inline-datepicker/inline-datepicker.component.spec.ts @@ -1,7 +1,7 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; -import { StartOfDayPipe } from '../pipes/startOfDay.pipe'; +import { StartOfDayPipe } from '../../pipes/startOfDay.pipe'; import { InlineDatepickerComponent } from './inline-datepicker.component'; diff --git a/alcs-frontend/src/app/shared/inline-datepicker/inline-datepicker.component.ts b/alcs-frontend/src/app/shared/inline-editors/inline-datepicker/inline-datepicker.component.ts similarity index 92% rename from alcs-frontend/src/app/shared/inline-datepicker/inline-datepicker.component.ts rename to alcs-frontend/src/app/shared/inline-editors/inline-datepicker/inline-datepicker.component.ts index 4a046f0df4..719d0ca627 100644 --- a/alcs-frontend/src/app/shared/inline-datepicker/inline-datepicker.component.ts +++ b/alcs-frontend/src/app/shared/inline-editors/inline-datepicker/inline-datepicker.component.ts @@ -2,8 +2,8 @@ import { Component, EventEmitter, Input, OnChanges, OnInit, Output, ViewChild } import { FormControl } from '@angular/forms'; import { MatDatepicker } from '@angular/material/datepicker'; import moment from 'moment'; -import { environment } from '../../../environments/environment'; -import { formatDateForApi } from '../utils/api-date-formatter'; +import { environment } from '../../../../environments/environment'; +import { formatDateForApi } from '../../utils/api-date-formatter'; @Component({ selector: 'app-inline-datepicker', diff --git a/alcs-frontend/src/app/shared/inline-dropdown/inline-dropdown.component.html b/alcs-frontend/src/app/shared/inline-editors/inline-dropdown/inline-dropdown.component.html similarity index 100% rename from alcs-frontend/src/app/shared/inline-dropdown/inline-dropdown.component.html rename to alcs-frontend/src/app/shared/inline-editors/inline-dropdown/inline-dropdown.component.html diff --git a/alcs-frontend/src/app/shared/inline-dropdown/inline-dropdown.component.scss b/alcs-frontend/src/app/shared/inline-editors/inline-dropdown/inline-dropdown.component.scss similarity index 95% rename from alcs-frontend/src/app/shared/inline-dropdown/inline-dropdown.component.scss rename to alcs-frontend/src/app/shared/inline-editors/inline-dropdown/inline-dropdown.component.scss index f1779f748d..6487e5e781 100644 --- a/alcs-frontend/src/app/shared/inline-dropdown/inline-dropdown.component.scss +++ b/alcs-frontend/src/app/shared/inline-editors/inline-dropdown/inline-dropdown.component.scss @@ -1,4 +1,4 @@ -@use '../../../styles/colors'; +@use '../../../../styles/colors'; .inline-number-wrapper { padding-top: 4px; diff --git a/alcs-frontend/src/app/shared/inline-dropdown/inline-dropdown.component.spec.ts b/alcs-frontend/src/app/shared/inline-editors/inline-dropdown/inline-dropdown.component.spec.ts similarity index 100% rename from alcs-frontend/src/app/shared/inline-dropdown/inline-dropdown.component.spec.ts rename to alcs-frontend/src/app/shared/inline-editors/inline-dropdown/inline-dropdown.component.spec.ts diff --git a/alcs-frontend/src/app/shared/inline-dropdown/inline-dropdown.component.ts b/alcs-frontend/src/app/shared/inline-editors/inline-dropdown/inline-dropdown.component.ts similarity index 100% rename from alcs-frontend/src/app/shared/inline-dropdown/inline-dropdown.component.ts rename to alcs-frontend/src/app/shared/inline-editors/inline-dropdown/inline-dropdown.component.ts diff --git a/alcs-frontend/src/app/shared/inline-number/inline-number.component.html b/alcs-frontend/src/app/shared/inline-editors/inline-number/inline-number.component.html similarity index 100% rename from alcs-frontend/src/app/shared/inline-number/inline-number.component.html rename to alcs-frontend/src/app/shared/inline-editors/inline-number/inline-number.component.html diff --git a/alcs-frontend/src/app/shared/inline-number/inline-number.component.scss b/alcs-frontend/src/app/shared/inline-editors/inline-number/inline-number.component.scss similarity index 95% rename from alcs-frontend/src/app/shared/inline-number/inline-number.component.scss rename to alcs-frontend/src/app/shared/inline-editors/inline-number/inline-number.component.scss index f1779f748d..6487e5e781 100644 --- a/alcs-frontend/src/app/shared/inline-number/inline-number.component.scss +++ b/alcs-frontend/src/app/shared/inline-editors/inline-number/inline-number.component.scss @@ -1,4 +1,4 @@ -@use '../../../styles/colors'; +@use '../../../../styles/colors'; .inline-number-wrapper { padding-top: 4px; diff --git a/alcs-frontend/src/app/shared/inline-number/inline-number.component.spec.ts b/alcs-frontend/src/app/shared/inline-editors/inline-number/inline-number.component.spec.ts similarity index 100% rename from alcs-frontend/src/app/shared/inline-number/inline-number.component.spec.ts rename to alcs-frontend/src/app/shared/inline-editors/inline-number/inline-number.component.spec.ts diff --git a/alcs-frontend/src/app/shared/inline-number/inline-number.component.ts b/alcs-frontend/src/app/shared/inline-editors/inline-number/inline-number.component.ts similarity index 100% rename from alcs-frontend/src/app/shared/inline-number/inline-number.component.ts rename to alcs-frontend/src/app/shared/inline-editors/inline-number/inline-number.component.ts diff --git a/alcs-frontend/src/app/shared/inline-review-outcome/inline-review-outcome.component.html b/alcs-frontend/src/app/shared/inline-editors/inline-review-outcome/inline-review-outcome.component.html similarity index 100% rename from alcs-frontend/src/app/shared/inline-review-outcome/inline-review-outcome.component.html rename to alcs-frontend/src/app/shared/inline-editors/inline-review-outcome/inline-review-outcome.component.html diff --git a/alcs-frontend/src/app/shared/inline-review-outcome/inline-review-outcome.component.scss b/alcs-frontend/src/app/shared/inline-editors/inline-review-outcome/inline-review-outcome.component.scss similarity index 83% rename from alcs-frontend/src/app/shared/inline-review-outcome/inline-review-outcome.component.scss rename to alcs-frontend/src/app/shared/inline-editors/inline-review-outcome/inline-review-outcome.component.scss index 6643b30b9d..820f56a50d 100644 --- a/alcs-frontend/src/app/shared/inline-review-outcome/inline-review-outcome.component.scss +++ b/alcs-frontend/src/app/shared/inline-editors/inline-review-outcome/inline-review-outcome.component.scss @@ -1,4 +1,4 @@ -@use '../../../styles/colors'; +@use '../../../../styles/colors'; .editing.hidden { display: none; diff --git a/alcs-frontend/src/app/shared/inline-review-outcome/inline-review-outcome.component.spec.ts b/alcs-frontend/src/app/shared/inline-editors/inline-review-outcome/inline-review-outcome.component.spec.ts similarity index 94% rename from alcs-frontend/src/app/shared/inline-review-outcome/inline-review-outcome.component.spec.ts rename to alcs-frontend/src/app/shared/inline-editors/inline-review-outcome/inline-review-outcome.component.spec.ts index e2a194606c..a3783275a9 100644 --- a/alcs-frontend/src/app/shared/inline-review-outcome/inline-review-outcome.component.spec.ts +++ b/alcs-frontend/src/app/shared/inline-editors/inline-review-outcome/inline-review-outcome.component.spec.ts @@ -1,7 +1,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { MatButtonToggleModule } from '@angular/material/button-toggle'; -import { SharedModule } from '../shared.module'; +import { SharedModule } from '../../shared.module'; import { InlineReviewOutcomeComponent } from './inline-review-outcome.component'; diff --git a/alcs-frontend/src/app/shared/inline-review-outcome/inline-review-outcome.component.ts b/alcs-frontend/src/app/shared/inline-editors/inline-review-outcome/inline-review-outcome.component.ts similarity index 100% rename from alcs-frontend/src/app/shared/inline-review-outcome/inline-review-outcome.component.ts rename to alcs-frontend/src/app/shared/inline-editors/inline-review-outcome/inline-review-outcome.component.ts diff --git a/alcs-frontend/src/app/shared/inline-text/inline-text.component.html b/alcs-frontend/src/app/shared/inline-editors/inline-text/inline-text.component.html similarity index 100% rename from alcs-frontend/src/app/shared/inline-text/inline-text.component.html rename to alcs-frontend/src/app/shared/inline-editors/inline-text/inline-text.component.html diff --git a/alcs-frontend/src/app/shared/inline-text/inline-text.component.scss b/alcs-frontend/src/app/shared/inline-editors/inline-text/inline-text.component.scss similarity index 95% rename from alcs-frontend/src/app/shared/inline-text/inline-text.component.scss rename to alcs-frontend/src/app/shared/inline-editors/inline-text/inline-text.component.scss index f1779f748d..6487e5e781 100644 --- a/alcs-frontend/src/app/shared/inline-text/inline-text.component.scss +++ b/alcs-frontend/src/app/shared/inline-editors/inline-text/inline-text.component.scss @@ -1,4 +1,4 @@ -@use '../../../styles/colors'; +@use '../../../../styles/colors'; .inline-number-wrapper { padding-top: 4px; diff --git a/alcs-frontend/src/app/shared/inline-text/inline-text.component.spec.ts b/alcs-frontend/src/app/shared/inline-editors/inline-text/inline-text.component.spec.ts similarity index 100% rename from alcs-frontend/src/app/shared/inline-text/inline-text.component.spec.ts rename to alcs-frontend/src/app/shared/inline-editors/inline-text/inline-text.component.spec.ts diff --git a/alcs-frontend/src/app/shared/inline-text/inline-text.component.ts b/alcs-frontend/src/app/shared/inline-editors/inline-text/inline-text.component.ts similarity index 100% rename from alcs-frontend/src/app/shared/inline-text/inline-text.component.ts rename to alcs-frontend/src/app/shared/inline-editors/inline-text/inline-text.component.ts diff --git a/alcs-frontend/src/app/shared/inline-textarea/inline-textarea.component.html b/alcs-frontend/src/app/shared/inline-editors/inline-textarea/inline-textarea.component.html similarity index 100% rename from alcs-frontend/src/app/shared/inline-textarea/inline-textarea.component.html rename to alcs-frontend/src/app/shared/inline-editors/inline-textarea/inline-textarea.component.html diff --git a/alcs-frontend/src/app/shared/inline-textarea/inline-textarea.component.scss b/alcs-frontend/src/app/shared/inline-editors/inline-textarea/inline-textarea.component.scss similarity index 96% rename from alcs-frontend/src/app/shared/inline-textarea/inline-textarea.component.scss rename to alcs-frontend/src/app/shared/inline-editors/inline-textarea/inline-textarea.component.scss index a3e30967b1..cc09826d94 100644 --- a/alcs-frontend/src/app/shared/inline-textarea/inline-textarea.component.scss +++ b/alcs-frontend/src/app/shared/inline-editors/inline-textarea/inline-textarea.component.scss @@ -1,4 +1,4 @@ -@use '../../../styles/colors'; +@use '../../../../styles/colors'; .editable { display: inline-block; diff --git a/alcs-frontend/src/app/shared/inline-textarea/inline-textarea.component.spec.ts b/alcs-frontend/src/app/shared/inline-editors/inline-textarea/inline-textarea.component.spec.ts similarity index 100% rename from alcs-frontend/src/app/shared/inline-textarea/inline-textarea.component.spec.ts rename to alcs-frontend/src/app/shared/inline-editors/inline-textarea/inline-textarea.component.spec.ts diff --git a/alcs-frontend/src/app/shared/inline-textarea/inline-textarea.component.ts b/alcs-frontend/src/app/shared/inline-editors/inline-textarea/inline-textarea.component.ts similarity index 100% rename from alcs-frontend/src/app/shared/inline-textarea/inline-textarea.component.ts rename to alcs-frontend/src/app/shared/inline-editors/inline-textarea/inline-textarea.component.ts diff --git a/alcs-frontend/src/app/shared/lots-table/lots-table-form.component.html b/alcs-frontend/src/app/shared/lots-table/lots-table-form.component.html new file mode 100644 index 0000000000..4506f99631 --- /dev/null +++ b/alcs-frontend/src/app/shared/lots-table/lots-table-form.component.html @@ -0,0 +1,85 @@ +
+
+ + Total Number of Proposed Lots + + lots + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
#{{ i + 1 }}Type + + + Lot + Road Dedication + + + Size (ha)* + + + ha + + Alr Area (ha)* + + + ha + +
No Proposed Lots Entered
+
+
diff --git a/alcs-frontend/src/app/shared/lots-table/lots-table-form.component.scss b/alcs-frontend/src/app/shared/lots-table/lots-table-form.component.scss new file mode 100644 index 0000000000..e69de29bb2 diff --git a/alcs-frontend/src/app/shared/lots-table/lots-table-form.component.spec.ts b/alcs-frontend/src/app/shared/lots-table/lots-table-form.component.spec.ts new file mode 100644 index 0000000000..ffde6b07e5 --- /dev/null +++ b/alcs-frontend/src/app/shared/lots-table/lots-table-form.component.spec.ts @@ -0,0 +1,22 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { LotsTableFormComponent } from './lots-table-form.component'; + +describe('LotsTableComponent', () => { + let component: LotsTableFormComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [LotsTableFormComponent], + }).compileComponents(); + + fixture = TestBed.createComponent(LotsTableFormComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/alcs-frontend/src/app/shared/lots-table/lots-table-form.component.ts b/alcs-frontend/src/app/shared/lots-table/lots-table-form.component.ts new file mode 100644 index 0000000000..9979b53925 --- /dev/null +++ b/alcs-frontend/src/app/shared/lots-table/lots-table-form.component.ts @@ -0,0 +1,157 @@ +import { Component, OnInit } from '@angular/core'; +import { + AbstractControl, + ControlValueAccessor, + FormControl, + FormGroup, + NG_VALIDATORS, + NG_VALUE_ACCESSOR, + Validator, + Validators, +} from '@angular/forms'; +import { MatTableDataSource } from '@angular/material/table'; + +type ProposedLot = { type: 'Lot' | 'Road Dedication' | null; size: string | null; alrArea: string | null }; + +@Component({ + selector: 'app-lots-table', + templateUrl: './lots-table-form.component.html', + styleUrls: ['./lots-table-form.component.scss'], + providers: [ + { + provide: NG_VALUE_ACCESSOR, + multi: true, + useExisting: LotsTableFormComponent, + }, + { + provide: NG_VALIDATORS, + multi: true, + useExisting: LotsTableFormComponent, + }, + ], +}) +export class LotsTableFormComponent implements ControlValueAccessor, Validator { + displayedColumns = ['index', 'type', 'size', 'alrArea']; + lotsSource = new MatTableDataSource([]); + lotCount = 0; + + touched = false; + disabled = false; + + count = new FormControl(null, [Validators.required]); + form = new FormGroup({ + count: this.count, + } as any); + + private onTouched: Function | undefined; + private onChange: Function | undefined; + + markTouched() { + this.touched = true; + this.form.markAllAsTouched(); + } + + onChangeLotCount(event: Event) { + this.markAsTouched(); + const targetString = (event.target as HTMLInputElement).value; + const targetCount = parseInt(targetString); + + let lots = this.mapFormToLots(); + lots = lots.slice(0, targetCount); + while (lots.length < targetCount) { + lots.push({ + size: null, + alrArea: null, + type: null, + }); + } + + this.lotCount = targetCount; + this.resetForm(lots); + + this.lotsSource = new MatTableDataSource(lots); + this.fireChanged(); + } + + resetForm(lots: ProposedLot[]) { + for (const controlName of Object.keys(this.form.controls)) { + if (controlName.includes('lot')) { + this.form.removeControl(controlName); + } + } + + lots.forEach((lot, index) => { + this.form.addControl(`${index}-lotType`, new FormControl(lot.type, [Validators.required])); + this.form.addControl(`${index}-lotSize`, new FormControl(lot.size, [Validators.required])); + this.form.addControl(`${index}-lotAlrArea`, new FormControl(lot.alrArea, [Validators.required])); + }); + } + + registerOnChange(onChange: any) { + this.onChange = onChange; + } + + registerOnTouched(onTouched: Function) { + this.onTouched = onTouched; + } + + setDisabledState(disabled: boolean) { + this.disabled = disabled; + } + + writeValue(proposedLots: ProposedLot[]) { + this.resetForm(proposedLots ?? []); + this.lotCount = proposedLots.length; + let lots = this.mapFormToLots(); + this.lotsSource = new MatTableDataSource(lots); + this.count.setValue(this.lotCount.toString()); + } + + validate(control: AbstractControl) { + if (this.form.valid) { + return null; + } + + let errors: any = {}; + for (const controlName of Object.keys(this.form.controls)) { + const controlErrors = this.form.controls[controlName].errors; + + if (controlErrors) { + errors[controlName] = controlErrors; + } + } + + return errors; + } + + private markAsTouched() { + if (!this.touched) { + if (this.onTouched) { + this.onTouched(); + } + this.touched = true; + } + } + + private mapFormToLots() { + const proposedLots: ProposedLot[] = []; + for (let index = 0; index < this.lotCount; index++) { + const lotType = this.form.controls[`${index}-lotType`].value; + const lotSize = this.form.controls[`${index}-lotSize`].value; + const lotAlrArea = this.form.controls[`${index}-lotAlrArea`].value; + proposedLots.push({ + size: lotSize, + type: lotType, + alrArea: lotAlrArea, + }); + } + return proposedLots; + } + + fireChanged() { + if (this.onChange) { + const mappedLots = this.mapFormToLots(); + this.onChange(mappedLots); + } + } +} diff --git a/alcs-frontend/src/app/shared/shared.module.ts b/alcs-frontend/src/app/shared/shared.module.ts index 53d08a1cb0..d60257ce20 100644 --- a/alcs-frontend/src/app/shared/shared.module.ts +++ b/alcs-frontend/src/app/shared/shared.module.ts @@ -40,13 +40,14 @@ import { AvatarCircleComponent } from './avatar-circle/avatar-circle.component'; import { DetailsHeaderComponent } from './details-header/details-header.component'; import { ErrorMessageComponent } from './error-message/error-message.component'; import { FavoriteButtonComponent } from './favorite-button/favorite-button.component'; -import { InlineBooleanComponent } from './inline-boolean/inline-boolean.component'; -import { InlineDatepickerComponent } from './inline-datepicker/inline-datepicker.component'; -import { InlineDropdownComponent } from './inline-dropdown/inline-dropdown.component'; -import { InlineNumberComponent } from './inline-number/inline-number.component'; -import { InlineReviewOutcomeComponent } from './inline-review-outcome/inline-review-outcome.component'; -import { InlineTextComponent } from './inline-text/inline-text.component'; -import { InlineTextareaComponent } from './inline-textarea/inline-textarea.component'; +import { InlineBooleanComponent } from './inline-editors/inline-boolean/inline-boolean.component'; +import { InlineDatepickerComponent } from './inline-editors/inline-datepicker/inline-datepicker.component'; +import { InlineDropdownComponent } from './inline-editors/inline-dropdown/inline-dropdown.component'; +import { InlineNumberComponent } from './inline-editors/inline-number/inline-number.component'; +import { InlineReviewOutcomeComponent } from './inline-editors/inline-review-outcome/inline-review-outcome.component'; +import { InlineTextComponent } from './inline-editors/inline-text/inline-text.component'; +import { InlineTextareaComponent } from './inline-editors/inline-textarea/inline-textarea.component'; +import { LotsTableFormComponent } from './lots-table/lots-table-form.component'; import { MeetingOverviewComponent } from './meeting-overview/meeting-overview.component'; import { NoDataComponent } from './no-data/no-data.component'; import { BooleanToStringPipe } from './pipes/boolean-to-string.pipe'; @@ -92,6 +93,7 @@ import { WarningBannerComponent } from './warning-banner/warning-banner.componen ApplicationSubmissionStatusTypePillComponent, WarningBannerComponent, ErrorMessageComponent, + LotsTableFormComponent, ], imports: [ CommonModule, @@ -177,6 +179,7 @@ import { WarningBannerComponent } from './warning-banner/warning-banner.componen ApplicationSubmissionStatusTypePillComponent, WarningBannerComponent, ErrorMessageComponent, + LotsTableFormComponent, ], }) export class SharedModule { diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision.dto.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision.dto.ts index b0b5f3a706..c0e8132722 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision.dto.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision.dto.ts @@ -16,7 +16,7 @@ import { ApplicationDecisionMakerCodeDto } from '../../application-decision-make import { CeoCriterionCodeDto } from './ceo-criterion/ceo-criterion.dto'; import { ApplicationDecisionComponentDto, - CreateApplicationDecisionComponentDto, + UpdateApplicationDecisionComponentDto, } from './component/application-decision-component.dto'; export class UpdateApplicationDecisionDto { @@ -108,7 +108,7 @@ export class UpdateApplicationDecisionDto { isDraft: boolean; @IsOptional() - decisionComponents?: CreateApplicationDecisionComponentDto[]; + decisionComponents?: UpdateApplicationDecisionComponentDto[]; @IsOptional() @IsArray() diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.dto.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.dto.ts index 5b06536b9d..1fa5cd93b5 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.dto.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.dto.ts @@ -1,7 +1,8 @@ import { AutoMap } from '@automapper/classes'; -import { IsNumber, IsOptional, IsString } from 'class-validator'; +import { IsArray, IsNumber, IsOptional, IsString } from 'class-validator'; import { BaseCodeDto } from '../../../../../common/dtos/base.dto'; import { NaruSubtypeDto } from '../../../../../portal/application-submission/application-submission.dto'; +import { ProposedLot } from '../../../../../portal/application-submission/application-submission.entity'; export class ApplicationDecisionComponentTypeDto extends BaseCodeDto {} @@ -91,6 +92,10 @@ export class UpdateApplicationDecisionComponentDto { @IsString() @IsOptional() naruSubtypeCode: string; + + @IsArray() + @IsOptional() + subdApprovedLots?: ProposedLot[]; } export class CreateApplicationDecisionComponentDto extends UpdateApplicationDecisionComponentDto { @@ -174,6 +179,9 @@ export class ApplicationDecisionComponentDto { @AutoMap(() => NaruSubtypeDto) naruSubtype: NaruSubtypeDto; + + @AutoMap(() => [ProposedLot]) + subdApprovedLots: ProposedLot[]; } export enum APPLICATION_DECISION_COMPONENT_TYPE { diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.entity.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.entity.ts index 2a4ec38d7f..51a31a9206 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.entity.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.entity.ts @@ -1,6 +1,7 @@ import { AutoMap } from '@automapper/classes'; import { Column, Entity, Index, ManyToMany, ManyToOne } from 'typeorm'; import { Base } from '../../../../../common/entities/base.entity'; +import { ProposedLot } from '../../../../../portal/application-submission/application-submission.entity'; import { NaruSubtype } from '../../../../../portal/application-submission/naru-subtype/naru-subtype.entity'; import { ColumnNumericTransformer } from '../../../../../utils/column-numeric-transform'; import { ApplicationDecisionCondition } from '../../../application-decision-condition/application-decision-condition.entity'; @@ -189,6 +190,15 @@ export class ApplicationDecisionComponent extends Base { @ManyToOne(() => NaruSubtype) naruSubtype: NaruSubtype; + @AutoMap(() => [ProposedLot]) + @Column({ + comment: 'JSONB Column containing the approved subdivision lots', + type: 'jsonb', + array: false, + default: () => `'[]'`, + }) + subdApprovedLots: ProposedLot[]; + @AutoMap() @Column({ nullable: false }) applicationDecisionComponentTypeCode: string; diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.service.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.service.ts index 46052fd7ef..096b502cd0 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.service.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.service.ts @@ -50,6 +50,11 @@ export class ApplicationDecisionComponentService { this.patchRosoFields(component, updateDto); this.patchNaruFields(component, updateDto); + //SUBD + if (updateDto.subdApprovedLots) { + component.subdApprovedLots = updateDto.subdApprovedLots; + } + updatedComponents.push(component); } diff --git a/services/apps/alcs/src/alcs/application/application-submission/application-submission.controller.ts b/services/apps/alcs/src/alcs/application/application-submission/application-submission.controller.ts index 978837b2d6..9f37588d3a 100644 --- a/services/apps/alcs/src/alcs/application/application-submission/application-submission.controller.ts +++ b/services/apps/alcs/src/alcs/application/application-submission/application-submission.controller.ts @@ -7,6 +7,7 @@ import { ANY_AUTH_ROLE } from '../../../common/authorization/roles'; import { RolesGuard } from '../../../common/authorization/roles-guard.service'; import { UserRoles } from '../../../common/authorization/roles.decorator'; import { DocumentService } from '../../../document/document.service'; +import { AlcsApplicationSubmissionUpdateDto } from './application-submission.dto'; import { ApplicationSubmissionService } from './application-submission.service'; @ApiOAuth2(config.get('KEYCLOAK.SCOPES')) @@ -49,4 +50,17 @@ export class ApplicationSubmissionController { ); return this.get(fileNumber); } + + @UserRoles(...ANY_AUTH_ROLE) + @Patch('/:fileNumber') + async updateSubmission( + @Param('fileNumber') fileNumber: string, + @Body() updateDto: AlcsApplicationSubmissionUpdateDto, + ) { + if (!fileNumber) { + throw new ServiceValidationException('File number is required'); + } + await this.applicationSubmissionService.update(fileNumber, updateDto); + return this.get(fileNumber); + } } diff --git a/services/apps/alcs/src/alcs/application/application-submission/application-submission.dto.ts b/services/apps/alcs/src/alcs/application/application-submission/application-submission.dto.ts new file mode 100644 index 0000000000..8473d4c30f --- /dev/null +++ b/services/apps/alcs/src/alcs/application/application-submission/application-submission.dto.ts @@ -0,0 +1,8 @@ +import { IsArray, IsOptional } from 'class-validator'; +import { ProposedLot } from '../../../portal/application-submission/application-submission.entity'; + +export class AlcsApplicationSubmissionUpdateDto { + @IsArray() + @IsOptional() + subProposedLots?: ProposedLot[]; +} diff --git a/services/apps/alcs/src/alcs/application/application-submission/application-submission.service.ts b/services/apps/alcs/src/alcs/application/application-submission/application-submission.service.ts index 933388c497..4b7eb988d0 100644 --- a/services/apps/alcs/src/alcs/application/application-submission/application-submission.service.ts +++ b/services/apps/alcs/src/alcs/application/application-submission/application-submission.service.ts @@ -8,8 +8,11 @@ import { ApplicationSubmissionStatusType } from '../../../application-submission import { SUBMISSION_STATUS } from '../../../application-submission-status/submission-status.dto'; import { ApplicationOwnerDto } from '../../../portal/application-submission/application-owner/application-owner.dto'; import { ApplicationOwner } from '../../../portal/application-submission/application-owner/application-owner.entity'; +import { ApplicationSubmissionUpdateDto } from '../../../portal/application-submission/application-submission.dto'; import { ApplicationSubmission } from '../../../portal/application-submission/application-submission.entity'; +import { filterUndefined } from '../../../utils/undefined'; import { AlcsApplicationSubmissionDto } from '../application.dto'; +import { AlcsApplicationSubmissionUpdateDto } from './application-submission.dto'; @Injectable() export class ApplicationSubmissionService { @@ -82,4 +85,25 @@ export class ApplicationSubmissionService { statusCode, ); } + + async update( + fileNumber: string, + updateDto: AlcsApplicationSubmissionUpdateDto, + ) { + //Load submission without relations to prevent save from crazy cascading + const submission = await this.applicationSubmissionRepository.findOneOrFail( + { + where: { + fileNumber: fileNumber, + }, + }, + ); + + submission.subdProposedLots = filterUndefined( + updateDto.subProposedLots, + submission.subdProposedLots, + ); + + await this.applicationSubmissionRepository.save(submission); + } } diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.dto.ts b/services/apps/alcs/src/portal/application-submission/application-submission.dto.ts index 2959014317..e8e271ddf0 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.dto.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.dto.ts @@ -148,6 +148,7 @@ export class ApplicationSubmissionDetailedDto extends ApplicationSubmissionDto { @AutoMap(() => Boolean) subdIsHomeSiteSeverance?: boolean | null; + @AutoMap(() => [ProposedLot]) subdProposedLots?: ProposedLot[]; //Soil Fields diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts b/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts index 41c10c042e..8c53d774e7 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts @@ -18,8 +18,9 @@ import { ApplicationParcel } from './application-parcel/application-parcel.entit import { NaruSubtype } from './naru-subtype/naru-subtype.entity'; export class ProposedLot { - type: 'Lot' | 'Road Dedication'; - size: number; + type: 'Lot' | 'Road Dedication' | null; + alrArea?: number | null; + size: number | null; } @Entity() diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1690323153558-add_subd_dec_components.ts b/services/apps/alcs/src/providers/typeorm/migrations/1690323153558-add_subd_dec_components.ts new file mode 100644 index 0000000000..87af5b6cff --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1690323153558-add_subd_dec_components.ts @@ -0,0 +1,16 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class addSubdDecComponents1690323153558 implements MigrationInterface { + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query( + ` + INSERT INTO alcs.application_decision_component_type + (audit_deleted_date_at, audit_created_at, audit_updated_at, audit_created_by, audit_updated_by, "label", code, description) + values + (null , now(), now(), 'seed-migration','seed-migration' , 'Subdivision', 'SUBD', 'Subdivision'); + `, + ); + } + + public async down(queryRunner: QueryRunner): Promise {} +} diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1690406098396-add_subd_decision_lots.ts b/services/apps/alcs/src/providers/typeorm/migrations/1690406098396-add_subd_decision_lots.ts new file mode 100644 index 0000000000..ccbef26744 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1690406098396-add_subd_decision_lots.ts @@ -0,0 +1,23 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class addSubdDecisionLots1690406098396 implements MigrationInterface { + name = 'addSubdDecisionLots1690406098396'; + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `ALTER TABLE "alcs"."application_decision_component" ADD "subd_approved_lots" jsonb NOT NULL DEFAULT '[]'`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."application_decision_component"."subd_approved_lots" IS 'JSONB Column containing the approved subdivision lots'`, + ); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."application_decision_component"."subd_approved_lots" IS 'JSONB Column containing the approved subdivision lots'`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_decision_component" DROP COLUMN "subd_approved_lots"`, + ); + } +} From 4dbdacce3ae65fd7014687514f4fede2efc8b283 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Wed, 26 Jul 2023 15:27:22 -0700 Subject: [PATCH 147/954] Add inline ALR Area editing --- .../decision-component/subd/subd.component.html | 4 +++- .../subd/subd.component.spec.ts | 13 +++++++++++++ .../decision-component/subd/subd.component.ts | 16 ++++++++++++++++ 3 files changed, 32 insertions(+), 1 deletion(-) diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/subd/subd.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/subd/subd.component.html index f731dfa356..295fe38210 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/subd/subd.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/subd/subd.component.html @@ -25,7 +25,9 @@ {{ i + 1 }} {{ lot.type }} {{ lot.size }} - {{ lot.alrArea }} + + + diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/subd/subd.component.spec.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/subd/subd.component.spec.ts index 5634294fcf..42e60e27ef 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/subd/subd.component.spec.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/subd/subd.component.spec.ts @@ -1,4 +1,7 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { ApplicationDecisionComponentService } from '../../../../../../services/application/decision/application-decision-v2/application-decision-component/application-decision-component.service'; import { DecisionComponentDto } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; import { SubdComponent } from './subd.component'; @@ -6,10 +9,20 @@ import { SubdComponent } from './subd.component'; describe('PfrsComponent', () => { let component: SubdComponent; let fixture: ComponentFixture; + let mockAppDecService: DeepMocked; beforeEach(async () => { + mockAppDecService = createMock(); + await TestBed.configureTestingModule({ declarations: [SubdComponent], + providers: [ + { + provide: ApplicationDecisionComponentService, + useValue: mockAppDecService, + }, + ], + schemas: [NO_ERRORS_SCHEMA], }).compileComponents(); fixture = TestBed.createComponent(SubdComponent); diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/subd/subd.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/subd/subd.component.ts index c197412739..f18314215f 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/subd/subd.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/subd/subd.component.ts @@ -1,4 +1,5 @@ import { Component, Input } from '@angular/core'; +import { ApplicationDecisionComponentService } from '../../../../../../services/application/decision/application-decision-v2/application-decision-component/application-decision-component.service'; import { DecisionComponentDto } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; @Component({ @@ -7,5 +8,20 @@ import { DecisionComponentDto } from '../../../../../../services/application/dec styleUrls: ['./subd.component.scss'], }) export class SubdComponent { + constructor(private componentService: ApplicationDecisionComponentService) {} + @Input() component!: DecisionComponentDto; + + async onSaveAlrArea(i: number, alrArea: string | null) { + const lots = this.component.subdApprovedLots; + if (lots && this.component.uuid) { + lots[i].alrArea = alrArea ? parseFloat(alrArea) : null; + debugger; + await this.componentService.update(this.component.uuid, { + uuid: this.component.uuid, + subdApprovedLots: lots, + applicationDecisionComponentTypeCode: this.component.applicationDecisionComponentTypeCode, + }); + } + } } From b7aace20fcd0a4d0f29929c3b011e76c77164c78 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Wed, 26 Jul 2023 16:55:51 -0700 Subject: [PATCH 148/954] Code review feedback * Remove debuggers * DRY up function --- .../decision-component/subd/subd.component.ts | 1 - .../decision-component.component.ts | 1 - .../application-submission.service.ts | 29 +++++++------------ 3 files changed, 11 insertions(+), 20 deletions(-) diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/subd/subd.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/subd/subd.component.ts index f18314215f..634656fa3e 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/subd/subd.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/subd/subd.component.ts @@ -16,7 +16,6 @@ export class SubdComponent { const lots = this.component.subdApprovedLots; if (lots && this.component.uuid) { lots[i].alrArea = alrArea ? parseFloat(alrArea) : null; - debugger; await this.componentService.update(this.component.uuid, { uuid: this.component.uuid, subdApprovedLots: lots, diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.ts index 5d9829cc72..968dfb1857 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.ts @@ -243,7 +243,6 @@ export class DecisionComponentComponent implements OnInit { private patchSubdFields() { this.form.addControl('subdApprovedLots', this.subdApprovedLots); - debugger; this.subdApprovedLots.setValue(this.data.subdApprovedLots ?? null); } diff --git a/services/apps/alcs/src/alcs/application/application-submission/application-submission.service.ts b/services/apps/alcs/src/alcs/application/application-submission/application-submission.service.ts index 4b7eb988d0..255473cab4 100644 --- a/services/apps/alcs/src/alcs/application/application-submission/application-submission.service.ts +++ b/services/apps/alcs/src/alcs/application/application-submission/application-submission.service.ts @@ -71,15 +71,7 @@ export class ApplicationSubmissionService { } async updateStatus(fileNumber: string, statusCode: SUBMISSION_STATUS) { - //Load submission without relations to prevent save from crazy cascading - const submission = await this.applicationSubmissionRepository.findOneOrFail( - { - where: { - fileNumber: fileNumber, - }, - }, - ); - + const submission = await this.loadBarebonesSubmission(fileNumber); await this.applicationSubmissionStatusService.setStatusDate( submission.uuid, statusCode, @@ -90,15 +82,7 @@ export class ApplicationSubmissionService { fileNumber: string, updateDto: AlcsApplicationSubmissionUpdateDto, ) { - //Load submission without relations to prevent save from crazy cascading - const submission = await this.applicationSubmissionRepository.findOneOrFail( - { - where: { - fileNumber: fileNumber, - }, - }, - ); - + const submission = await this.loadBarebonesSubmission(fileNumber); submission.subdProposedLots = filterUndefined( updateDto.subProposedLots, submission.subdProposedLots, @@ -106,4 +90,13 @@ export class ApplicationSubmissionService { await this.applicationSubmissionRepository.save(submission); } + + private loadBarebonesSubmission(fileNumber: string) { + //Load submission without relations to prevent save from crazy cascading + return this.applicationSubmissionRepository.findOneOrFail({ + where: { + fileNumber, + }, + }); + } } From 37ab19f7e147997fb639e52f2e27361e22fd92f4 Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Wed, 26 Jul 2023 17:16:19 -0700 Subject: [PATCH 149/954] Feature/alcs 875 part 2 (#823) new nfu-subtypes app-prep mapping fixes app-prep validation improvements --- .../nfu-input/nfu-input.component.ts | 2 +- .../application/proposal/nfu/nfu.component.ts | 116 +------- .../application/proposal/nfu/nfu.constants.ts | 139 ++++++++++ bin/.gitignore | 3 +- .../applications/app_prep.py | 75 +++--- .../application_prep_basic_validation.sql | 30 ++- bin/migrate-oats-data/common/__init__.py | 2 +- .../common/oats_application_code_values.py | 251 ++++++++++++++++++ .../common/oats_application_enum.py | 29 -- bin/migrate-oats-data/migrate.py | 31 +++ 10 files changed, 487 insertions(+), 191 deletions(-) create mode 100644 alcs-frontend/src/app/features/application/proposal/nfu/nfu.constants.ts create mode 100644 bin/migrate-oats-data/common/oats_application_code_values.py delete mode 100644 bin/migrate-oats-data/common/oats_application_enum.py diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/nfu-input/nfu-input.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/nfu-input/nfu-input.component.ts index 0c165ca2a4..c0bd834ab5 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/nfu-input/nfu-input.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/nfu-input/nfu-input.component.ts @@ -1,6 +1,6 @@ import { Component, Input } from '@angular/core'; import { FormGroup } from '@angular/forms'; -import { NFU_SUBTYPES_OPTIONS, NFU_TYPES_OPTIONS } from '../../../../../../proposal/nfu/nfu.component'; +import { NFU_SUBTYPES_OPTIONS, NFU_TYPES_OPTIONS } from '../../../../../../proposal/nfu/nfu.constants'; @Component({ selector: 'app-nfu-input', diff --git a/alcs-frontend/src/app/features/application/proposal/nfu/nfu.component.ts b/alcs-frontend/src/app/features/application/proposal/nfu/nfu.component.ts index fa6ec1a6ab..50dcd08a74 100644 --- a/alcs-frontend/src/app/features/application/proposal/nfu/nfu.component.ts +++ b/alcs-frontend/src/app/features/application/proposal/nfu/nfu.component.ts @@ -3,121 +3,7 @@ import { Subject, takeUntil } from 'rxjs'; import { ApplicationDetailService } from '../../../../services/application/application-detail.service'; import { ApplicationDto, UpdateApplicationDto } from '../../../../services/application/application.dto'; import { ToastService } from '../../../../services/toast/toast.service'; - -// TODO move to code tables? -export const NFU_TYPES_OPTIONS = [ - { - label: 'Agricultural / Farm', - value: 'Agricultural / Farm', - }, - { - label: 'Civic / Institutional', - value: 'Civic / Institutional', - }, - { - label: 'Commercial / Retail', - value: 'Commercial / Retail', - }, - { - label: 'Industrial', - value: 'Industrial', - }, - { - label: 'Other', - value: 'Other', - }, - { - label: 'Recreational', - value: 'Recreational', - }, - { - label: 'Residential', - value: 'Residential', - }, - { - label: 'Transportation / Utilities', - value: 'Transportation / Utilities', - }, - { - label: 'Unused', - value: 'Unused', - }, -]; - -export const NFU_SUBTYPES_OPTIONS = [ - { - label: 'Alcohol Processing', - value: 'Alcohol Processing', - }, - { - label: 'Cement / Asphalt / Concrete Plants', - value: 'Cement / Asphalt / Concrete Plants', - }, - { - label: 'Commercial / Retail', - value: 'Commercial / Retail', - }, - { - label: 'Deposition / Fill (All Types)', - value: 'Deposition / Fill (All Types)', - }, - { - label: 'Energy Production', - value: 'Energy Production', - }, - { - label: 'Recreational', - value: 'Recreational', - }, - { - label: 'Food Processing (Non-Meat)', - value: 'Food Processing (Non-Meat)', - }, - { - label: 'Industrial - Other', - value: 'Industrial - Other', - }, - { - label: 'Logging Operations', - value: 'Logging Operations', - }, - { - label: 'Lumber Manufacturing and Re-Manufacturing', - value: 'Lumber Manufacturing and Re-Manufacturing', - }, - { - label: 'Meat and Fish Processing (+ Abattoir)', - value: 'Meat and Fish Processing (+ Abattoir)', - }, - { - label: 'Mining', - value: 'Mining', - }, - { - label: 'Miscellaneous Processing', - value: 'Miscellaneous Processing', - }, - { - label: 'Oil and Gas Activities', - value: 'Oil and Gas Activities', - }, - { - label: 'Sand & Gravel', - value: 'Sand & Gravel', - }, - { - label: 'Sawmill', - value: 'Sawmill', - }, - { - label: 'Storage and Warehouse Facilities (Indoor/Outdoor - Large Scale Structures)', - value: 'Storage and Warehouse Facilities (Indoor/Outdoor - Large Scale Structures)', - }, - { - label: 'Work Camps or Associated Use', - value: 'Work Camps or Associated Use', - }, -]; +import { NFU_SUBTYPES_OPTIONS, NFU_TYPES_OPTIONS } from './nfu.constants'; @Component({ selector: 'app-proposal-nfu', diff --git a/alcs-frontend/src/app/features/application/proposal/nfu/nfu.constants.ts b/alcs-frontend/src/app/features/application/proposal/nfu/nfu.constants.ts new file mode 100644 index 0000000000..850f513867 --- /dev/null +++ b/alcs-frontend/src/app/features/application/proposal/nfu/nfu.constants.ts @@ -0,0 +1,139 @@ +export const NFU_SUBTYPES_OPTIONS = [ + { label: 'Accessory Buildings', value: 'Accessory Buildings' }, + { label: 'Additional Dwelling(s)', value: 'Additional Dwelling(s)' }, + { label: 'Additional Structures for Farm Help', value: 'Additional Structures for Farm Help' }, + { label: 'Agricultural Land Use Remnant', value: 'Agricultural Land Use Remnant' }, + { label: 'Agricultural Lease', value: 'Agricultural Lease' }, + { label: 'Agricultural Subdivision Remnant', value: 'Agricultural Subdivision Remnant' }, + { label: 'Airports and Aviation related', value: 'Airports and Aviation related' }, + { label: 'Alcohol Processing', value: 'Alcohol Processing' }, + { label: 'Alcohol Production Associated Uses', value: 'Alcohol Production Associated Uses' }, + { label: 'Animal Boarding and Services', value: 'Animal Boarding and Services' }, + { label: 'Auto Services', value: 'Auto Services' }, + { label: 'Beef', value: 'Beef' }, + { label: 'Campground (Private) & RV Park', value: 'Campground (Private) & RV Park' }, + { label: 'Cannabis Related Uses', value: 'Cannabis Related Uses' }, + { label: 'Care Facilities', value: 'Care Facilities' }, + { label: 'Cement/ Asphalt/Concrete Plants', value: 'Cement/ Asphalt/Concrete Plants' }, + { label: 'Cemeteries', value: 'Cemeteries' }, + { label: 'Churches & Bible Schools', value: 'Churches & Bible Schools' }, + { label: 'Civic Facilities and Buildings', value: 'Civic Facilities and Buildings' }, + { label: 'Civic - other', value: 'Civic - other' }, + { label: 'Commercial - other', value: 'Commercial - other' }, + { label: 'Composting', value: 'Composting' }, + { label: 'Dairy', value: 'Dairy' }, + { label: 'Deposition/Fill (All Types)', value: 'Deposition/Fill (All Types)' }, + { label: 'Electrical Power Distribution Systems', value: 'Electrical Power Distribution Systems' }, + { label: 'Electrical Power Facilities', value: 'Electrical Power Facilities' }, + { label: 'Energy Production', value: 'Energy Production' }, + { label: 'Energy Production', value: 'Energy Production' }, + { label: 'Events', value: 'Events' }, + { label: 'Exhibitions and Festivals', value: 'Exhibitions and Festivals' }, + { label: 'Farm Help Accommodation', value: 'Farm Help Accommodation' }, + { label: 'Fire Hall and associated uses', value: 'Fire Hall and associated uses' }, + { label: 'Food and Beverage Services', value: 'Food and Beverage Services' }, + { label: 'Food Processing (non-meat)', value: 'Food Processing (non-meat)' }, + { label: 'Gas and Other Distribution Pipelines', value: 'Gas and Other Distribution Pipelines' }, + { label: 'Golf Course', value: 'Golf Course' }, + { label: 'Grain & Forage', value: 'Grain & Forage' }, + { label: 'Greenhouses', value: 'Greenhouses' }, + { label: 'Hall/Lodge (private)_', value: 'Hall/Lodge (private)_' }, + { label: 'Hospitals, Health Centres (Incl Private)', value: 'Hospitals, Health Centres (Incl Private)' }, + { label: 'Industrial - other', value: 'Industrial - other' }, + { label: 'Land Use Remnant', value: 'Land Use Remnant' }, + { label: 'Lease', value: 'Lease' }, + { label: 'Livestock-Unspecified', value: 'Livestock-Unspecified' }, + { label: 'Logging Operations', value: 'Logging Operations' }, + { label: 'Lumber Manufacturing and Re-manufacturing', value: 'Lumber Manufacturing and Re-manufacturing' }, + { label: 'Meat and Fish Processing (+abattoir)', value: 'Meat and Fish Processing (+abattoir)' }, + { label: 'Mining', value: 'Mining' }, + { label: 'Misc. Agricultural Use', value: 'Misc. Agricultural Use' }, + { label: 'Miscellaneous Processing', value: 'Miscellaneous Processing' }, + { label: 'Mixed Ag Uses', value: 'Mixed Ag Uses' }, + { label: 'Mixed Uses', value: 'Mixed Uses' }, + { label: 'Mobile Home Park', value: 'Mobile Home Park' }, + { label: 'Multi Family-Apartments/Condominiums', value: 'Multi Family-Apartments/Condominiums' }, + { label: 'Office Building (Primary Use)', value: 'Office Building (Primary Use)' }, + { label: 'Oil and Gas Activities', value: 'Oil and Gas Activities' }, + { label: 'Other-Undefined', value: 'Other-Undefined' }, + { label: 'Other Uses', value: 'Other Uses' }, + { label: "Parks-All Types operated by Local Gov't", value: "Parks-All Types operated by Local Gov't" }, + { label: 'Parks & Playing Fields', value: 'Parks & Playing Fields' }, + { label: 'Pigs/Hogs', value: 'Pigs/Hogs' }, + { label: 'Poultry', value: 'Poultry' }, + { label: 'Public Transportation Facilities', value: 'Public Transportation Facilities' }, + { label: 'Railway', value: 'Railway' }, + { label: 'Recreational - other', value: 'Recreational - other' }, + { label: 'Research Facilities', value: 'Research Facilities' }, + { label: 'Residential - other', value: 'Residential - other' }, + { label: 'Roads', value: 'Roads' }, + { label: 'Sand & Gravel', value: 'Sand & Gravel' }, + { label: 'Sanitary Land Fills', value: 'Sanitary Land Fills' }, + { label: 'Sawmill', value: 'Sawmill' }, + { label: 'Schools & Universities', value: 'Schools & Universities' }, + { label: 'Sewage Treatment Facilities', value: 'Sewage Treatment Facilities' }, + { label: 'Sewer Distribution Systems', value: 'Sewer Distribution Systems' }, + { label: 'Shopping Centre', value: 'Shopping Centre' }, + { label: 'Small Fruits-Berries', value: 'Small Fruits-Berries' }, + { label: 'Sports Facilities - commercial', value: 'Sports Facilities - commercial' }, + { label: 'Sports Facilities - municipal', value: 'Sports Facilities - municipal' }, + { + label: 'Storage and Warehouse Facilities (Indoor/Outdoor- Large Scale Structures)', + value: 'Storage and Warehouse Facilities (Indoor/Outdoor- Large Scale Structures)', + }, + { label: 'Storage & Warehouse', value: 'Storage & Warehouse' }, + { label: 'Store (Retail - All Types)', value: 'Store (Retail - All Types)' }, + { label: 'Subdivision Special Categories', value: 'Subdivision Special Categories' }, + { label: 'Subdivision Special Categories (Lease)', value: 'Subdivision Special Categories (Lease)' }, + { label: 'Telephone and Telecommunications', value: 'Telephone and Telecommunications' }, + { label: 'Tourist Accommodations', value: 'Tourist Accommodations' }, + { label: 'Trails', value: 'Trails' }, + { label: 'Transportation - other', value: 'Transportation - other' }, + { label: 'Tree Fruits', value: 'Tree Fruits' }, + { label: 'Turf Farm', value: 'Turf Farm' }, + { label: 'Vegetable & Truck', value: 'Vegetable & Truck' }, + { label: 'Vineyard and Associated Uses', value: 'Vineyard and Associated Uses' }, + { label: 'Water Distribution Systems', value: 'Water Distribution Systems' }, + { label: 'Water or Sewer Distribution Systems (inactive)', value: 'Water or Sewer Distribution Systems (inactive)' }, + { label: 'Water Treatment Facilities', value: 'Water Treatment Facilities' }, + { label: 'Work Camps or Associated Use', value: 'Work Camps or Associated Use' }, +]; + +export const NFU_TYPES_OPTIONS = [ + { + label: 'Agricultural / Farm', + value: 'Agricultural / Farm', + }, + { + label: 'Civic / Institutional', + value: 'Civic / Institutional', + }, + { + label: 'Commercial / Retail', + value: 'Commercial / Retail', + }, + { + label: 'Industrial', + value: 'Industrial', + }, + { + label: 'Other', + value: 'Other', + }, + { + label: 'Recreational', + value: 'Recreational', + }, + { + label: 'Residential', + value: 'Residential', + }, + { + label: 'Transportation / Utilities', + value: 'Transportation / Utilities', + }, + { + label: 'Unused', + value: 'Unused', + }, +]; diff --git a/bin/.gitignore b/bin/.gitignore index 6d655a1e07..12cddf3cc0 100644 --- a/bin/.gitignore +++ b/bin/.gitignore @@ -1,4 +1,5 @@ .env out tmp -*.pickle \ No newline at end of file +*.pickle +*etl_log.txt \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/app_prep.py b/bin/migrate-oats-data/applications/app_prep.py index 06fe243535..88bacb10a2 100644 --- a/bin/migrate-oats-data/applications/app_prep.py +++ b/bin/migrate-oats-data/applications/app_prep.py @@ -4,6 +4,7 @@ AlcsNfuSubTypeCode, OatsCapabilitySourceCode, OatsAgriCapabilityCodes, + OATS_NFU_SUBTYPES, AlcsAgCap, AlcsAgCapSource, log_end, @@ -20,29 +21,29 @@ class OatsToAlcsNfuTypes(Enum): - AGR = AlcsNfuTypeCode.Agricultural_Farm - CIV = AlcsNfuTypeCode.Civic_Institutional - COM = AlcsNfuTypeCode.Commercial_Retail - IND = AlcsNfuTypeCode.Industrial - OTH = AlcsNfuTypeCode.Other - REC = AlcsNfuTypeCode.Recreational - RES = AlcsNfuTypeCode.Residential - TRA = AlcsNfuTypeCode.Transportation_Utilities - UNU = AlcsNfuTypeCode.Unused + AGR = AlcsNfuTypeCode.Agricultural_Farm.value + CIV = AlcsNfuTypeCode.Civic_Institutional.value + COM = AlcsNfuTypeCode.Commercial_Retail.value + IND = AlcsNfuTypeCode.Industrial.value + OTH = AlcsNfuTypeCode.Other.value + REC = AlcsNfuTypeCode.Recreational.value + RES = AlcsNfuTypeCode.Residential.value + TRA = AlcsNfuTypeCode.Transportation_Utilities.value + UNU = AlcsNfuTypeCode.Unused.value class OatsToAlcsAgCapSource(Enum): - BCLI = AlcsAgCapSource.BCLI - CLI = AlcsAgCapSource.CLI - ONSI = AlcsAgCapSource.On_site + BCLI = AlcsAgCapSource.BCLI.value + CLI = AlcsAgCapSource.CLI.value + ONSI = AlcsAgCapSource.On_site.value class OatsToAlcsAgCap(Enum): - P = AlcsAgCap.Prime - PD = AlcsAgCap.Prime_Dominant - MIX = AlcsAgCap.Mixed_Prime_Secondary - S = AlcsAgCap.Secondary - U = AlcsAgCap.Unclassified + P = AlcsAgCap.Prime.value + PD = AlcsAgCap.Prime_Dominant.value + MIX = AlcsAgCap.Mixed_Prime_Secondary.value + S = AlcsAgCap.Secondary.value + U = AlcsAgCap.Unclassified.value @inject_conn_pool @@ -54,6 +55,7 @@ def process_alcs_application_prep_fields(conn=None, batch_size=BATCH_UPLOAD_SIZE conn (psycopg2.extensions.connection): PostgreSQL database connection. Provided by the decorator. batch_size (int): The number of items to process at once. Defaults to BATCH_UPLOAD_SIZE. """ + log_start(etl_name) with conn.cursor(cursor_factory=RealDictCursor) as cursor: with open( @@ -201,14 +203,14 @@ def prepare_app_prep_data(app_prep_raw_data_list): data = dict(row) data = map_basic_field(data) - if data["alr_change_code"] == ALRChangeCode.NFU: + if data["alr_change_code"] == ALRChangeCode.NFU.value: data = mapOatsToAlcsAppPrep(data) nfu_data_list.append(data) - elif data["alr_change_code"] == ALRChangeCode.NAR: + elif data["alr_change_code"] == ALRChangeCode.NAR.value: nar_data_list.append(data) - elif data["alr_change_code"] == ALRChangeCode.EXC: + elif data["alr_change_code"] == ALRChangeCode.EXC.value: exc_data_list.append(data) - elif data["alr_change_code"] == ALRChangeCode.INC: + elif data["alr_change_code"] == ALRChangeCode.INC.value: inc_data_list.append(data) else: other_data_list.append(data) @@ -217,14 +219,18 @@ def prepare_app_prep_data(app_prep_raw_data_list): def mapOatsToAlcsAppPrep(data): + oats_type_code = data["nonfarm_use_type_code"] + oats_subtype_code = data["nonfarm_use_subtype_code"] + if data["nonfarm_use_type_code"]: data["nonfarm_use_type_code"] = str( OatsToAlcsNfuTypes[data["nonfarm_use_type_code"]].value ) if data["nonfarm_use_subtype_code"]: data["nonfarm_use_subtype_code"] = map_oats_to_alcs_nfu_subtypes( - data["nonfarm_use_subtype_code"] + oats_type_code, oats_subtype_code ) + return data @@ -314,22 +320,15 @@ def get_update_query_for_other(): return query -def map_oats_to_alcs_nfu_subtypes(oats_code): - # TODO this is work in progress and will be finished later - if oats_code == 1: - return "Accessory Buildings" - if oats_code == 2: - return "Additional Dwelling(s)" - if oats_code == 3: - return "Additional Structures for Farm Help" - if oats_code == 4: - return "Agricultural Land Use Remnant" - if oats_code == 5: - return "Agricultural Lease" - if oats_code == 6: - return "Agricultural Subdivision Remnant" - - return "" +def map_oats_to_alcs_nfu_subtypes(nfu_type_code, nfu_subtype_code): + for dict_obj in OATS_NFU_SUBTYPES: + if str(dict_obj["type_key"]) == str(nfu_type_code) and str( + dict_obj["subtype_key"] + ) == str(nfu_subtype_code): + return dict_obj["value"] + + # Return None when no matching key found + return None def map_basic_field(data): diff --git a/bin/migrate-oats-data/applications/sql/application-prep/application_prep_basic_validation.sql b/bin/migrate-oats-data/applications/sql/application-prep/application_prep_basic_validation.sql index d0d720f259..c2523a58f3 100644 --- a/bin/migrate-oats-data/applications/sql/application-prep/application_prep_basic_validation.sql +++ b/bin/migrate-oats-data/applications/sql/application-prep/application_prep_basic_validation.sql @@ -14,33 +14,51 @@ oats_app_prep_data AS ( oaac.agri_cap_consultant, oaac.component_area, oaac.capability_source_code, - oaac.nonfarm_use_type_code, - oaac.nonfarm_use_subtype_code, oaac.nonfarm_use_end_date, oaac.rsdntl_use_type_code, oaac.rsdntl_use_end_date, oaa.staff_comment_observations, oaac.alr_change_code, - oaac.exclsn_app_type_code + oaac.exclsn_app_type_code, + oaac.nonfarm_use_type_code, + oaac.nonfarm_use_subtype_code, + onutc.description AS nonfarm_use_type_description, + onusc.description AS nonfarm_use_subtype_description, + -- ALCS has typos fixed and this is required for proper validation + CASE + WHEN onusc.description = 'Water Distribtion Systems' THEN 'Water Distribution Systems' + WHEN onusc.description = 'Tourist Accomodations' THEN 'Tourist Accommodations' + WHEN onusc.description = 'Office Buiding (Primary Use)' THEN 'Office Building (Primary Use)' + ELSE onusc.description + END AS mapped_nonfarm_use_subtype_description FROM appl_components_grouped acg JOIN oats.oats_alr_appl_components oaac ON oaac.alr_application_id = acg.alr_application_id JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = acg.alr_application_id + JOIN oats.oats_nonfarm_use_subtype_codes onusc ON onusc.nonfarm_use_subtype_code = oaac.nonfarm_use_subtype_code + AND oaac.nonfarm_use_type_code = onusc.nonfarm_use_type_code + JOIN oats.oats_nonfarm_use_type_codes onutc ON onutc.nonfarm_use_type_code = oaac.nonfarm_use_type_code ) -SELECT a.alr_area, +SELECT oapd.alr_application_id, + a.alr_area, a.ag_cap, a.ag_cap_source, a.ag_cap_map, a.ag_cap_consultant, a.staff_observations, + a.nfu_use_type, + a.nfu_use_sub_type, oapd.component_area, oapd.agri_capability_code, oapd.capability_source_code, oapd.agri_cap_map, oapd.agri_cap_consultant, - oapd.staff_comment_observations + oapd.staff_comment_observations, + oapd.nonfarm_use_type_description, + oapd.mapped_nonfarm_use_subtype_description FROM alcs.application a LEFT JOIN oats_app_prep_data AS oapd ON a.file_number = oapd.alr_application_id::TEXT WHERE a.alr_area != oapd.component_area OR a.ag_cap_map != oapd.agri_cap_map OR a.ag_cap_consultant != oapd.agri_cap_consultant - OR a.staff_observations != oapd.staff_comment_observations \ No newline at end of file + OR a.staff_observations != oapd.staff_comment_observations + OR a.nfu_use_sub_type != oapd.mapped_nonfarm_use_subtype_description \ No newline at end of file diff --git a/bin/migrate-oats-data/common/__init__.py b/bin/migrate-oats-data/common/__init__.py index 77c58f32c9..26c07e6d74 100644 --- a/bin/migrate-oats-data/common/__init__.py +++ b/bin/migrate-oats-data/common/__init__.py @@ -1,3 +1,3 @@ -from .oats_application_enum import * +from .oats_application_code_values import * from .alcs_application_enum import * from .etl_logger import log_start, log_end diff --git a/bin/migrate-oats-data/common/oats_application_code_values.py b/bin/migrate-oats-data/common/oats_application_code_values.py new file mode 100644 index 0000000000..da8b8139bc --- /dev/null +++ b/bin/migrate-oats-data/common/oats_application_code_values.py @@ -0,0 +1,251 @@ +from enum import Enum + + +class ALRChangeCode(Enum): + TUR = "TUR" # Transport, Utility, and Recreation + INC = "INC" # Inclusion + EXC = "EXC" # Exclusion + SDV = "SDV" # Subdivision + NFU = "NFU" # Non Farm Use + SCH = "SCH" # Extraction and Fill + EXT = "EXT" # Extraction + FILL = "FILL" # Fill + SRW = "SRW" # Notification of Statutory Right of Way + CSC = "CSC" # Conservation Covenant + NAR = "NAR" # Non-Adhering Residential Use + + +class OatsCapabilitySourceCode(Enum): + BCLI = "BCLI" + CLI = "CLI" + ONSI = "ONSI" + + +class OatsAgriCapabilityCodes(Enum): + P = "P" + PD = "PD" + MIX = "MIX" + S = "S" + U = "U" + +OATS_NFU_SUBTYPES = [ + {"type_key": "AGR", "subtype_key": "1", "value": "Accessory Buildings"}, + {"type_key": "RES", "subtype_key": "2", "value": "Additional Dwelling(s)"}, + { + "type_key": "AGR", + "subtype_key": "3", + "value": "Additional Structures for Farm Help", + }, + { + "type_key": "AGR", + "subtype_key": "4", + "value": "Agricultural Land Use Remnant", + }, + {"type_key": "AGR", "subtype_key": "5", "value": "Agricultural Lease"}, + { + "type_key": "AGR", + "subtype_key": "6", + "value": "Agricultural Subdivision Remnant", + }, + { + "type_key": "TRA", + "subtype_key": "7", + "value": "Airports and Aviation related", + }, + {"type_key": "IND", "subtype_key": "8", "value": "Alcohol Processing"}, + { + "type_key": "COM", + "subtype_key": "9", + "value": "Animal Boarding and Services", + }, + {"type_key": "COM", "subtype_key": "11", "value": "Auto Services"}, + {"type_key": "AGR", "subtype_key": "12", "value": "Beef"}, + { + "type_key": "COM", + "subtype_key": "13", + "value": "Campground (Private) & RV Park", + }, + {"type_key": "COM", "subtype_key": "14", "value": "Care Facilities"}, + { + "type_key": "IND", + "subtype_key": "15", + "value": "Cement/ Asphalt/Concrete Plants", + }, + {"type_key": "CIV", "subtype_key": "16", "value": "Cemeteries"}, + {"type_key": "CIV", "subtype_key": "17", "value": "Churches & Bible Schools"}, + {"type_key": "CIV", "subtype_key": "18", "value": "Civic - other"}, + { + "type_key": "CIV", + "subtype_key": "19", + "value": "Civic Facilities and Buildings", + }, + {"type_key": "COM", "subtype_key": "20", "value": "Commercial - other"}, + {"type_key": "IND", "subtype_key": "21", "value": "Composting"}, + {"type_key": "AGR", "subtype_key": "22", "value": "Dairy"}, + { + "type_key": "IND", + "subtype_key": "23", + "value": "Deposition/Fill (All Types)", + }, + {"type_key": "COM", "subtype_key": "24", "value": "Golf Course"}, + {"type_key": "AGR", "subtype_key": "25", "value": "Grain & Forage"}, + { + "type_key": "TRA", + "subtype_key": "25", + "value": "Electrical Power Distribution Systems", + }, + {"type_key": "AGR", "subtype_key": "26", "value": "Greenhouses"}, + { + "type_key": "TRA", + "subtype_key": "26", + "value": "Electrical Power Facilities", + }, + {"type_key": "COM", "subtype_key": "28", "value": "Exhibitions and Festivals"}, + { + "type_key": "RES", + "subtype_key": "29", + "value": "Subdivision Special Categories", + }, + {"type_key": "COM", "subtype_key": "30", "value": "Food and Beverage Services"}, + { + "type_key": "RES", + "subtype_key": "30", + "value": "Subdivision Special Categories (Lease)", + }, + {"type_key": "IND", "subtype_key": "31", "value": "Food Processing (non-meat)"}, + {"type_key": "IND", "subtype_key": "32", "value": "Industrial - other"}, + {"type_key": "AGR", "subtype_key": "33", "value": "Land Use Remnant"}, + {"type_key": "AGR", "subtype_key": "34", "value": "Livestock-Unspecified"}, + {"type_key": "IND", "subtype_key": "35", "value": "Logging Operations"}, + { + "type_key": "IND", + "subtype_key": "36", + "value": "Lumber Manufacturing and Re-manufacturing", + }, + { + "type_key": "IND", + "subtype_key": "37", + "value": "Meat and Fish Processing (+abattoir)", + }, + {"type_key": "IND", "subtype_key": "38", "value": "Mining"}, + {"type_key": "AGR", "subtype_key": "39", "value": "Misc. Agricultural Use"}, + {"type_key": "AGR", "subtype_key": "40", "value": "Mixed Ag Uses"}, + {"type_key": "OTH", "subtype_key": "41", "value": "Mixed Uses"}, + {"type_key": "RES", "subtype_key": "42", "value": "Mobile Home Park"}, + { + "type_key": "RES", + "subtype_key": "43", + "value": "Multi Family-Apartments/Condominiums", + }, + { + "type_key": "COM", + "subtype_key": "44", + "value": "Office Building (Primary Use)", + }, + {"type_key": "IND", "subtype_key": "45", "value": "Oil and Gas Activities"}, + {"type_key": "OTH", "subtype_key": "46", "value": "Other Uses"}, + {"type_key": "AGR", "subtype_key": "47", "value": "Other-Undefined"}, + {"type_key": "REC", "subtype_key": "48", "value": "Parks & Playing Fields"}, + { + "type_key": "CIV", + "subtype_key": "49", + "value": "Parks-All Types operated by Local Gov't", + }, + {"type_key": "AGR", "subtype_key": "50", "value": "Pigs/Hogs"}, + {"type_key": "AGR", "subtype_key": "51", "value": "Poultry"}, + { + "type_key": "TRA", + "subtype_key": "52", + "value": "Public Transportation Facilities", + }, + {"type_key": "TRA", "subtype_key": "53", "value": "Railway"}, + {"type_key": "REC", "subtype_key": "54", "value": "Recreational - other"}, + {"type_key": "CIV", "subtype_key": "55", "value": "Research Facilities"}, + {"type_key": "RES", "subtype_key": "56", "value": "Residential - other"}, + {"type_key": "TRA", "subtype_key": "57", "value": "Roads"}, + {"type_key": "IND", "subtype_key": "58", "value": "Sand & Gravel"}, + {"type_key": "CIV", "subtype_key": "59", "value": "Sanitary Land Fills"}, + {"type_key": "CIV", "subtype_key": "60", "value": "Schools & Universities"}, + { + "type_key": "TRA", + "subtype_key": "61", + "value": "Sewage Treatment Facilities", + }, + {"type_key": "TRA", "subtype_key": "62", "value": "Sewer Distribution Systems"}, + {"type_key": "COM", "subtype_key": "63", "value": "Shopping Centre"}, + {"type_key": "AGR", "subtype_key": "64", "value": "Small Fruits-Berries"}, + { + "type_key": "COM", + "subtype_key": "65", + "value": "Sports Facilities - commercial", + }, + { + "type_key": "REC", + "subtype_key": "66", + "value": "Sports Facilities - municipal", + }, + {"type_key": "COM", "subtype_key": "67", "value": "Storage & Warehouse"}, + {"type_key": "COM", "subtype_key": "68", "value": "Store (Retail - All Types)"}, + { + "type_key": "TRA", + "subtype_key": "69", + "value": "Telephone and Telecommunications", + }, + {"type_key": "COM", "subtype_key": "70", "value": "Tourist Accommodations"}, + {"type_key": "REC", "subtype_key": "71", "value": "Trails"}, + {"type_key": "TRA", "subtype_key": "72", "value": "Transportation - other"}, + {"type_key": "AGR", "subtype_key": "73", "value": "Tree Fruits"}, + {"type_key": "AGR", "subtype_key": "74", "value": "Turf Farm"}, + {"type_key": "AGR", "subtype_key": "75", "value": "Vegetable & Truck"}, + { + "type_key": "AGR", + "subtype_key": "76", + "value": "Vineyard and Associated Uses", + }, + {"type_key": "TRA", "subtype_key": "77", "value": "Water Distribution Systems"}, + { + "type_key": "TRA", + "subtype_key": "78", + "value": "Water or Sewer Distribution Systems (inactive)", + }, + {"type_key": "TRA", "subtype_key": "79", "value": "Water Treatment Facilities"}, + {"type_key": "COM", "subtype_key": "80", "value": "Hall/Lodge (private)_"}, + { + "type_key": "CIV", + "subtype_key": "81", + "value": "Hospitals, Health Centres (Incl Private)", + }, + {"type_key": "RES", "subtype_key": "82", "value": "Farm Help Accommodation"}, + { + "type_key": "TRA", + "subtype_key": "27", + "value": "Gas and Other Distribution Pipelines", + }, + {"type_key": "AGR", "subtype_key": "23", "value": "Energy Production"}, + {"type_key": "IND", "subtype_key": "25", "value": "Energy Production"}, + {"type_key": "RES", "subtype_key": "83", "value": "Lease"}, + { + "type_key": "IND", + "subtype_key": "86", + "value": "Storage and Warehouse Facilities (Indoor/Outdoor- Large Scale Structures)", + }, + { + "type_key": "IND", + "subtype_key": "84", + "value": "Work Camps or Associated Use", + }, + {"type_key": "IND", "subtype_key": "85", "value": "Miscellaneous Processing"}, + {"type_key": "COM", "subtype_key": "87", "value": "Events"}, + {"type_key": "IND", "subtype_key": "88", "value": "Sawmill"}, + { + "type_key": "CIV", + "subtype_key": "89", + "value": "Fire Hall and associated uses", + }, + { + "type_key": "AGR", + "subtype_key": "90", + "value": "Alcohol Production Associated Uses", + }, + {"type_key": "AGR", "subtype_key": "91", "value": "Cannabis Related Uses"}, + ] \ No newline at end of file diff --git a/bin/migrate-oats-data/common/oats_application_enum.py b/bin/migrate-oats-data/common/oats_application_enum.py deleted file mode 100644 index 1a88319a57..0000000000 --- a/bin/migrate-oats-data/common/oats_application_enum.py +++ /dev/null @@ -1,29 +0,0 @@ -from enum import Enum - - -class ALRChangeCode(Enum): - TUR = "TUR" # Transport, Utility, and Recreation - INC = "INC" # Inclusion - EXC = "EXC" # Exclusion - SDV = "SDV" # Subdivision - NFU = "NFU" # Non Farm Use - SCH = "SCH" # Extraction and Fill - EXT = "EXT" # Extraction - FILL = "FILL" # Fill - SRW = "SRW" # Notification of Statutory Right of Way - CSC = "CSC" # Conservation Covenant - NAR = "NAR" # Non-Adhering Residential Use - - -class OatsCapabilitySourceCode(Enum): - BCLI = "BCLI" - CLI = "CLI" - ONSI = "ONSI" - - -class OatsAgriCapabilityCodes(Enum): - P = "P" - PD = "PD" - MIX = "MIX" - S = "S" - U = "U" diff --git a/bin/migrate-oats-data/migrate.py b/bin/migrate-oats-data/migrate.py index 2c2d6748ee..86e7e4fa8b 100644 --- a/bin/migrate-oats-data/migrate.py +++ b/bin/migrate-oats-data/migrate.py @@ -17,6 +17,8 @@ import_batch_size = BATCH_UPLOAD_SIZE +# TODO tidy import menu setup + def application_import_command_parser(import_batch_size, subparsers): application_import_command = subparsers.add_parser( @@ -63,6 +65,21 @@ def application_document_import_command_parser(import_batch_size, subparsers): application_document_import_command.set_defaults(func=import_batch_size) +def app_prep_import_command_parser(import_batch_size, subparsers): + app_prep_import_command = subparsers.add_parser( + "app-prep-import", + help=f"Import App prep into ALCS (update applications table) in specified batch size: (default: {import_batch_size})", + ) + app_prep_import_command.add_argument( + "--batch-size", + type=int, + default=import_batch_size, + metavar="", + help=f"batch size (default: {import_batch_size})", + ) + app_prep_import_command.set_defaults(func=import_batch_size) + + def import_command_parser(subparsers): import_command = subparsers.add_parser( "import", @@ -86,6 +103,7 @@ def setup_menu_args_parser(import_batch_size): application_import_command_parser(import_batch_size, subparsers) document_import_command_parser(import_batch_size, subparsers) application_document_import_command_parser(import_batch_size, subparsers) + app_prep_import_command_parser(import_batch_size, subparsers) import_command_parser(subparsers) subparsers.add_parser("clean", help="Clean all imported data") @@ -167,6 +185,19 @@ def setup_menu_args_parser(import_batch_size): ) process_application_documents(batch_size=import_batch_size) + case "app-prep-import": + console.log("Beginning OATS -> ALCS app-prep import process") + with console.status( + "[bold green]App prep import (applications table update in ALCS)..." + ) as status: + if args.batch_size: + import_batch_size = args.batch_size + + console.log( + f"Processing app-prep import in batch size = {import_batch_size}" + ) + + process_alcs_application_prep_fields(batch_size=import_batch_size) finally: if connection_pool: From 4b76e81a7a51c57f56664959be838fa91bd654e8 Mon Sep 17 00:00:00 2001 From: Liam Stoddard Date: Fri, 28 Jul 2023 09:21:53 -0700 Subject: [PATCH 150/954] commit python changes --- .../applications/noi_temp.py | 4 ++ bin/migrate-oats-data/noi/noi.py | 54 ++++++++++++++++++- bin/migrate-oats-data/noi/sql/insert_noi.sql | 39 ++++++-------- 3 files changed, 74 insertions(+), 23 deletions(-) create mode 100644 bin/migrate-oats-data/applications/noi_temp.py diff --git a/bin/migrate-oats-data/applications/noi_temp.py b/bin/migrate-oats-data/applications/noi_temp.py new file mode 100644 index 0000000000..d114d3333b --- /dev/null +++ b/bin/migrate-oats-data/applications/noi_temp.py @@ -0,0 +1,4 @@ + +LG_DICT = [ {"key" : 'Islands Trust Gabriola Island', "value" : 'Islands Trust Gabriola Island (Historical)'}, + {"key" : 'Islands Trust Galiano Island', "value" : 'Islands Trust Galiano Island (Historical)'}, + {"key" : 'Islands Trust Gambier Island', "value" : 'Islands Trust Gambier Island (Historical)'}] \ No newline at end of file diff --git a/bin/migrate-oats-data/noi/noi.py b/bin/migrate-oats-data/noi/noi.py index 8084020e21..16170c3623 100644 --- a/bin/migrate-oats-data/noi/noi.py +++ b/bin/migrate-oats-data/noi/noi.py @@ -69,4 +69,56 @@ def process_nois(conn=None, batch_size=10000): print("Total amount of successful inserts:", successful_inserts_count) - print("Total failed inserts:", failed_inserts) \ No newline at end of file + print("Total failed inserts:", failed_inserts) + +def applicant_lookup(): + query = """ + SELECT DISTINCT + oaap.alr_application_id AS application_id, + string_agg (DISTINCT oo.organization_name, ', ') FILTER ( + WHERE + oo.organization_name IS NOT NULL + ) AS orgs, + string_agg ( + DISTINCT concat (op.first_name || ' ' || op.last_name), + ', ' + ) FILTER ( + WHERE + op.last_name IS NOT NULL + OR op.first_name IS NOT NULL + ) AS persons + FROM + oats.oats_alr_application_parties oaap + LEFT JOIN oats.oats_person_organizations opo ON oaap.person_organization_id = opo.person_organization_id + LEFT JOIN oats.oats_persons op ON op.person_id = opo.person_id + LEFT JOIN oats.oats_organizations oo ON opo.organization_id = oo.organization_id + WHERE + oaap.alr_appl_role_code = 'APPL' + GROUP BY + oaap.alr_application_id + """ + return query + +def oats_gov(): + query = """ + SELECT + oaap.alr_application_id AS application_id, + oo.organization_name AS oats_gov_name + FROM + oats.oats_alr_application_parties oaap + JOIN oats.oats_person_organizations opo ON oaap.person_organization_id = opo.person_organization_id + JOIN oats.oats_organizations oo ON opo.organization_id = oo.organization_id + WHERE + oo.organization_type_cd IN ('MUNI','FN','RD') + """ + return query + +def alcs_gov(): + query = """ + SELECT + oats_gov.application_id AS application_id, + alg.uuid AS gov_uuid + FROM + oats_gov + JOIN alcs.application_local_government alg on oats_gov.oats_gov_name = alg."name" + """ \ No newline at end of file diff --git a/bin/migrate-oats-data/noi/sql/insert_noi.sql b/bin/migrate-oats-data/noi/sql/insert_noi.sql index 5022345d80..7644a2347d 100644 --- a/bin/migrate-oats-data/noi/sql/insert_noi.sql +++ b/bin/migrate-oats-data/noi/sql/insert_noi.sql @@ -1,26 +1,21 @@ WITH - applicant_lookup AS ( - SELECT DISTINCT - oaap.alr_application_id AS application_id, - string_agg (DISTINCT oo.organization_name, ', ') FILTER ( - WHERE - oo.organization_name IS NOT NULL - ) AS orgs, - string_agg ( - DISTINCT concat (op.first_name || ' ' || op.last_name), - ', ' - ) FILTER ( - WHERE - op.last_name IS NOT NULL - OR op.first_name IS NOT NULL - ) AS persons + noi_grouped AS ( + SELECT + oaac.alr_application_id FROM - oats.oats_alr_application_parties oaap - LEFT JOIN oats.oats_person_organizations opo ON oaap.person_organization_id = opo.person_organization_id - LEFT JOIN oats.oats_persons op ON op.person_id = opo.person_id - LEFT JOIN oats.oats_organizations oo ON opo.organization_id = oo.organization_id + oats.oats_alr_appl_components oaac + JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id WHERE - oaap.alr_appl_role_code = 'APPL' + oaa.application_class_code IN ('NOI') GROUP BY - oaap.alr_application_id - ), \ No newline at end of file + oaac.alr_application_id + HAVING + count(oaac.alr_application_id) < 2 -- ignore all applications wit multiple components + ) +SELECT + oaa.alr_application_id, + oaac.alr_change_code +FROM + noi_grouped noi + JOIN oats.oats_alr_appl_components oaac ON oaac.alr_application_id = noi.alr_application_id + JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = noi.alr_application_id \ No newline at end of file From 1e2c000706743e9700c2d54dc42b190131ec2e2c Mon Sep 17 00:00:00 2001 From: Liam Stoddard Date: Fri, 28 Jul 2023 09:43:07 -0700 Subject: [PATCH 151/954] starting sql implementation --- bin/migrate-oats-data/noi/sql/insert_noi.sql | 131 ++++++++++++++++++- 1 file changed, 130 insertions(+), 1 deletion(-) diff --git a/bin/migrate-oats-data/noi/sql/insert_noi.sql b/bin/migrate-oats-data/noi/sql/insert_noi.sql index 7644a2347d..6074746059 100644 --- a/bin/migrate-oats-data/noi/sql/insert_noi.sql +++ b/bin/migrate-oats-data/noi/sql/insert_noi.sql @@ -1,7 +1,7 @@ WITH noi_grouped AS ( SELECT - oaac.alr_application_id + oaac.alr_application_id as noi_application_id FROM oats.oats_alr_appl_components oaac JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id @@ -11,6 +11,135 @@ WITH oaac.alr_application_id HAVING count(oaac.alr_application_id) < 2 -- ignore all applications wit multiple components + ), + applicant_lookup AS ( + SELECT DISTINCT + oaap.alr_application_id AS application_id, + string_agg (DISTINCT oo.organization_name, ', ') FILTER ( + WHERE + oo.organization_name IS NOT NULL + ) AS orgs, + string_agg ( + DISTINCT concat (op.first_name || ' ' || op.last_name), + ', ' + ) FILTER ( + WHERE + op.last_name IS NOT NULL + OR op.first_name IS NOT NULL + ) AS persons + FROM + oats.oats_alr_application_parties oaap + LEFT JOIN oats.oats_person_organizations opo ON oaap.person_organization_id = opo.person_organization_id + LEFT JOIN oats.oats_persons op ON op.person_id = opo.person_id + LEFT JOIN oats.oats_organizations oo ON opo.organization_id = oo.organization_id + WHERE + oaap.alr_appl_role_code = 'APPL' + GROUP BY + oaap.alr_application_id + ), + -- Step 2: get local gov application name & match to uuid + oats_gov AS ( + SELECT + oaap.alr_application_id AS application_id, + oo.organization_name AS oats_gov_name + FROM + oats.oats_alr_application_parties oaap + JOIN oats.oats_person_organizations opo ON oaap.person_organization_id = opo.person_organization_id + JOIN oats.oats_organizations oo ON opo.organization_id = oo.organization_id + WHERE + oo.organization_type_cd IN ('MUNI', 'FN', 'RD') + ), + alcs_gov AS ( + SELECT + oats_gov.application_id AS application_id, + alg.uuid AS gov_uuid + FROM + oats_gov + JOIN alcs.application_local_government alg on ( + CASE + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Gabriola Island' THEN 'Islands Trust Gabriola Island (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Galiano Island' THEN 'Islands Trust Galiano Island (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Gambier Island' THEN 'Islands Trust Gambier Island (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Hornby Island' THEN 'Islands Trust Hornby Island (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Lasqueti Island' THEN 'Islands Trust Lasqueti Island (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Mayne Island' THEN 'Islands Trust Mayne Island (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Pender Island' THEN 'Islands Trust Pender Island (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Quadra Island' THEN 'Islands Trust Quadra Island (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Salt Spring Island' THEN 'Islands Trust Salt Spring Island (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Saturna Island' THEN 'Islands Trust Saturna Island (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Sidney Island' THEN 'Islands Trust Sidney Island (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust- Comox Strathcona' THEN 'Islands Trust Comox Strathcona (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust- Nanaimo' THEN 'Islands Trust Nanaimo (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust-Capital' THEN 'Islands Trust Capital (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust-Powell River' THEN 'Islands Trust Powell River (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust-Sunshine Coast' THEN 'Islands Trust Sunshine Coast (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Bowen Island' THEN 'Bowen Island (Island Municipality)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Denman Island' THEN 'Islands Trust Denman Island (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust - Cowichan Valley' THEN 'Islands Trust Cowichan Valley (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Northern Rockies' THEN 'Northern Rockies (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Sliammon%' THEN 'Tla''amin Nation' + WHEN oats_gov.oats_gov_name LIKE 'Thompson Nicola%' THEN 'Thompson Nicola Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Cariboo%' THEN 'Cariboo Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Fraser Valley%' THEN 'Fraser Valley Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Columbia Shuswap%' THEN 'Columbia Shuswap Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Central Okanagan%' THEN 'Central Okanagan Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Squamish Lillooet%' THEN 'Squamish Lillooet Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Alberni-Clayoquot%' THEN 'Alberni-Clayoquot Regional District' + WHEN oats_gov.oats_gov_name LIKE 'qathet%' THEN 'qathet Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Peace River%' THEN 'Peace River Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Okanagan Similkameen%' THEN 'Okanagan Similkameen Regional District' + WHEN oats_gov.oats_gov_name LIKE 'East Kootenay%' THEN 'East Kootenay Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Bulkley-Nechako%' THEN 'Bulkley-Nechako Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Sunshine Coast%' THEN 'Sunshine Coast Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Nanaimo%' THEN 'Nanaimo Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Kitimat Stikine%' THEN 'Kitimat Stikine Regional District' + WHEN oats_gov.oats_gov_name LIKE 'North Okanagan%' THEN 'North Okanagan Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Fraser Fort George%' THEN 'Fraser Fort George Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Cowichan Valley%' THEN 'Cowichan Valley Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Kootenay Boundary%' THEN 'Kootenay Boundary Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Comox Valley%' THEN 'Comox Valley Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Central Kootenay%' THEN 'Central Kootenay Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Capital%' THEN 'Capital Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Metro Vancouver%' THEN 'Metro Vancouver Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Central Coast%' THEN 'Central Coast Regional District' + WHEN oats_gov.oats_gov_name LIKE 'North Coast%' THEN 'North Coast Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Strathcona%' THEN 'Strathcona Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Mount Waddington%' THEN 'Mount Waddington Regional District' + ELSE oats_gov.oats_gov_name + END + ) = alg."name" + ), + -- Step 3: Perform a lookup to retrieve the region code for each application ID + panel_lookup AS ( + SELECT DISTINCT + oaap.alr_application_id AS application_id, + CASE + WHEN oo2.parent_organization_id IS NULL THEN oo2.organization_name + WHEN oo3.parent_organization_id IS NULL THEN oo3.organization_name + ELSE 'NONE' + END AS panel_region + FROM + oats.oats_alr_application_parties oaap + JOIN oats.oats_person_organizations opo ON oaap.person_organization_id = opo.person_organization_id + JOIN oats.oats_organizations oo ON opo.organization_id = oo.organization_id + LEFT JOIN oats.oats_organizations oo2 ON oo.parent_organization_id = oo2.organization_id + LEFT JOIN oats.oats_organizations oo3 ON oo2.parent_organization_id = oo3.organization_id + WHERE + oo2.organization_type_cd = 'PANEL' + OR oo3.organization_type_cd = 'PANEL' + ), + -- Step 4: Perform lookup to retrieve type code + application_type_lookup AS ( + SELECT + oaac.alr_application_id AS application_id, + oacc."description" AS "description", + oaac.alr_change_code AS code + FROM + oats.oats_alr_appl_components AS oaac + JOIN oats.oats_alr_change_codes oacc ON oaac.alr_change_code = oacc.alr_change_code + LEFT JOIN oats.alcs_etl_application_exclude aee ON oaac.alr_appl_component_id = aee.component_id + WHERE + aee.component_id IS NULL ) SELECT oaa.alr_application_id, From a1cfae2b73e3d78c3c7cd478df516bdec51cf1d4 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Wed, 26 Jul 2023 17:24:35 -0700 Subject: [PATCH 152/954] LFNG As applicant bug fixes * Check if submission is to own users government to control copying * Add error to step 8 when missing Department * Fix logic in primary contact to show errors at the right time --- .../application-details/application-details.component.html | 5 ++++- .../primary-contact/primary-contact.component.html | 2 +- .../primary-contact/primary-contact.component.ts | 7 ++----- .../application-submission-review.controller.ts | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/portal-frontend/src/app/features/application-details/application-details.component.html b/portal-frontend/src/app/features/application-details/application-details.component.html index 65529b59be..fc85a50f39 100644 --- a/portal-frontend/src/app/features/application-details/application-details.component.html +++ b/portal-frontend/src/app/features/application-details/application-details.component.html @@ -48,7 +48,10 @@

3. Primary Contact

{{ primaryContact?.organizationName }} - +
Phone
diff --git a/portal-frontend/src/app/features/edit-submission/primary-contact/primary-contact.component.html b/portal-frontend/src/app/features/edit-submission/primary-contact/primary-contact.component.html index dd83477975..8a32cf1e4b 100644 --- a/portal-frontend/src/app/features/edit-submission/primary-contact/primary-contact.component.html +++ b/portal-frontend/src/app/features/edit-submission/primary-contact/primary-contact.component.html @@ -160,7 +160,7 @@
Authorization Letters (if applicable)
(uploadFiles)="attachFile($event, DOCUMENT_TYPE.AUTHORIZATION_LETTER)" (deleteFile)="onDeleteFile($event)" (openFile)="openFile($event)" - [showErrors]="showErrors || selectedLocalGovernment" + [showErrors]="showErrors" [isRequired]="needsAuthorizationLetter" >
diff --git a/portal-frontend/src/app/features/edit-submission/primary-contact/primary-contact.component.ts b/portal-frontend/src/app/features/edit-submission/primary-contact/primary-contact.component.ts index 56f837e845..bd05e3c1a7 100644 --- a/portal-frontend/src/app/features/edit-submission/primary-contact/primary-contact.component.ts +++ b/portal-frontend/src/app/features/edit-submission/primary-contact/primary-contact.component.ts @@ -143,9 +143,7 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni } private calculateLetterRequired() { - const isSelfApplicant = - this.owners[0].type.code === APPLICATION_OWNER.INDIVIDUAL || - this.owners[0].type.code === APPLICATION_OWNER.GOVERNMENT; + const isSelfApplicant = this.owners[0].type.code === APPLICATION_OWNER.INDIVIDUAL || this.selectedLocalGovernment; this.needsAuthorizationLetter = this.selectedThirdPartyAgent || @@ -226,8 +224,6 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni phoneNumber: selectedOwner.phoneNumber, email: selectedOwner.email, }); - - this.calculateLetterRequired(); } else if (selectedOwner) { this.onSelectOwner(selectedOwner.uuid); } else { @@ -246,6 +242,7 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni this.form.markAllAsTouched(); } this.isDirty = false; + this.calculateLetterRequired(); } } diff --git a/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.ts b/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.ts index 3448114556..16fa1c1ae8 100644 --- a/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.ts +++ b/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.ts @@ -205,8 +205,8 @@ export class ApplicationSubmissionReviewController { } if ( - primaryContact && - primaryContact.type.code === APPLICATION_OWNER.GOVERNMENT + userLocalGovernment.uuid === applicationSubmission.localGovernmentUuid && + primaryContact ) { //Copy contact details over to government form await this.applicationSubmissionReviewService.update( From 6f65cd536d7919d04d70de9de93a91c5131717a9 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Wed, 26 Jul 2023 16:40:21 -0700 Subject: [PATCH 153/954] Add inclusion fields when user is LFNG * Add question to indicate parcel ownership and store in DB * Add more file uploads if the answer is no --- .../application-details.component.spec.ts | 1 + .../application-submission.service.spec.ts | 1 + .../services/application/application.dto.ts | 1 + .../incl-proposal.component.html | 114 +++++++++++++++++- .../incl-proposal.component.scss | 9 ++ .../incl-proposal.component.spec.ts | 14 ++- .../incl-proposal/incl-proposal.component.ts | 46 ++++++- .../application-submission.dto.ts | 2 + .../application-submission.dto.ts | 7 ++ .../application-submission.entity.ts | 4 + .../application-submission.service.ts | 4 + ...dd_government_incl_fields_to_submission.ts | 19 +++ 12 files changed, 217 insertions(+), 5 deletions(-) create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1690414066995-add_government_incl_fields_to_submission.ts diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.spec.ts b/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.spec.ts index 33e28b6222..39de635f82 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.spec.ts +++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.spec.ts @@ -29,6 +29,7 @@ describe('ApplicationDetailsComponent', () => { component = fixture.componentInstance; component.submission = { exclShareGovernmentBorders: null, + inclGovernmentOwnsAllParcels: null, exclWhyLand: null, inclAgricultureSupport: null, inclExclHectares: null, diff --git a/alcs-frontend/src/app/services/application/application-submission/application-submission.service.spec.ts b/alcs-frontend/src/app/services/application/application-submission/application-submission.service.spec.ts index 2db85d84bd..63630b4421 100644 --- a/alcs-frontend/src/app/services/application/application-submission/application-submission.service.spec.ts +++ b/alcs-frontend/src/app/services/application/application-submission/application-submission.service.spec.ts @@ -105,6 +105,7 @@ describe('ApplicationSubmissionService', () => { inclAgricultureSupport: null, inclImprovements: null, exclShareGovernmentBorders: null, + inclGovernmentOwnsAllParcels: null, exclWhyLand: null, inclExclHectares: null, prescribedBody: null, diff --git a/alcs-frontend/src/app/services/application/application.dto.ts b/alcs-frontend/src/app/services/application/application.dto.ts index 41f4445cb3..91199eea36 100644 --- a/alcs-frontend/src/app/services/application/application.dto.ts +++ b/alcs-frontend/src/app/services/application/application.dto.ts @@ -220,6 +220,7 @@ export interface ApplicationSubmissionDto { inclAgricultureSupport: string | null; inclImprovements: string | null; exclShareGovernmentBorders: boolean | null; + inclGovernmentOwnsAllParcels: boolean | null; } export interface ApplicationDto { diff --git a/portal-frontend/src/app/features/edit-submission/proposal/incl-proposal/incl-proposal.component.html b/portal-frontend/src/app/features/edit-submission/proposal/incl-proposal/incl-proposal.component.html index 17d3efc0de..c7463b9985 100644 --- a/portal-frontend/src/app/features/edit-submission/proposal/incl-proposal/incl-proposal.component.html +++ b/portal-frontend/src/app/features/edit-submission/proposal/incl-proposal/incl-proposal.component.html @@ -91,7 +91,7 @@

Proposal

Example: 40 ha of grazing land fenced in 2010.
- Characters left: {{ 4000 - outsideLandsText.textLength }} + Characters left: {{ 4000 - improvementsText.textLength }}
warning
This field is required
@@ -118,9 +118,119 @@

Proposal

[isRequired]="true" >
+
+ +
+ The ALR General Regulation does not require the {{ governmentName }} to complete a public hearing if all + inclusion application parcel(s) are owned by the {{ governmentName }}. +
+ Please refer to Inclusion page on the ALC website for more information. + + Yes + No + +
+ warning +
This field is required
+
+
+
+

Notification and Public Hearing Requirements

+

+ A printed copy of the application will need to be used for notification. Please ensure all prior fields are complete + and correct before downloading the PDF of the application (Step 8 of this application form will flag outstanding + fields). +

+ + + + You will not be able to complete the remaining portion of the application until the notification and public hearing + process is complete. + +
+
+
+ +
+ Proof that notice of the application was provided in a form and manner acceptable to the Commission +
+ +
+
+ +
+ Proof that a sign, in a form and manner acceptable to the Commission, was posted on the land that is the + subject of the application +
+ +
+
+ +
Public hearing report and any other public comments received
+ +
+
+
+
+
diff --git a/portal-frontend/src/app/features/edit-submission/proposal/incl-proposal/incl-proposal.component.scss b/portal-frontend/src/app/features/edit-submission/proposal/incl-proposal/incl-proposal.component.scss index e69de29bb2..b435af700d 100644 --- a/portal-frontend/src/app/features/edit-submission/proposal/incl-proposal/incl-proposal.component.scss +++ b/portal-frontend/src/app/features/edit-submission/proposal/incl-proposal/incl-proposal.component.scss @@ -0,0 +1,9 @@ +@use '../../../../../styles/functions' as *; + +section { + margin-top: rem(32); +} + +.requirement-description { + margin: rem(8) 0 !important; +} diff --git a/portal-frontend/src/app/features/edit-submission/proposal/incl-proposal/incl-proposal.component.spec.ts b/portal-frontend/src/app/features/edit-submission/proposal/incl-proposal/incl-proposal.component.spec.ts index a0b183b23d..bda063fcdc 100644 --- a/portal-frontend/src/app/features/edit-submission/proposal/incl-proposal/incl-proposal.component.spec.ts +++ b/portal-frontend/src/app/features/edit-submission/proposal/incl-proposal/incl-proposal.component.spec.ts @@ -1,8 +1,10 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MatDialog } from '@angular/material/dialog'; -import { DeepMocked } from '@golevelup/ts-jest'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { BehaviorSubject } from 'rxjs'; +import { UserDto } from '../../../../services/authentication/authentication.dto'; +import { AuthenticationService } from '../../../../services/authentication/authentication.service'; import { InclProposalComponent } from './incl-proposal.component'; import { ApplicationSubmissionService } from '../../../../services/application-submission/application-submission.service'; import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; @@ -14,8 +16,14 @@ describe('InclProposalComponent', () => { let fixture: ComponentFixture; let mockApplicationService: DeepMocked; let mockAppDocumentService: DeepMocked; + let mockAuthService: DeepMocked; beforeEach(async () => { + mockApplicationService = createMock(); + mockAppDocumentService = createMock(); + mockAuthService = createMock(); + mockAuthService.$currentProfile = new BehaviorSubject(undefined); + await TestBed.configureTestingModule({ providers: [ { @@ -26,6 +34,10 @@ describe('InclProposalComponent', () => { provide: ApplicationDocumentService, useValue: mockAppDocumentService, }, + { + provide: AuthenticationService, + useValue: mockAuthService, + }, { provide: MatDialog, useValue: {}, diff --git a/portal-frontend/src/app/features/edit-submission/proposal/incl-proposal/incl-proposal.component.ts b/portal-frontend/src/app/features/edit-submission/proposal/incl-proposal/incl-proposal.component.ts index 6f320455a1..1716091ead 100644 --- a/portal-frontend/src/app/features/edit-submission/proposal/incl-proposal/incl-proposal.component.ts +++ b/portal-frontend/src/app/features/edit-submission/proposal/incl-proposal/incl-proposal.component.ts @@ -1,4 +1,8 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; +import { MatButtonToggleChange } from '@angular/material/button-toggle'; +import { AuthenticationService } from '../../../../services/authentication/authentication.service'; +import { formatBooleanToString } from '../../../../shared/utils/boolean-helper'; +import { parseStringToBoolean } from '../../../../shared/utils/string-helper'; import { FilesStepComponent } from '../../files-step.partial'; import { ApplicationSubmissionService } from '../../../../services/application-submission/application-submission.service'; import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; @@ -19,13 +23,17 @@ import { ApplicationSubmissionUpdateDto } from '../../../../services/application }) export class InclProposalComponent extends FilesStepComponent implements OnInit, OnDestroy { DOCUMENT = DOCUMENT_TYPE; - currentStep = EditApplicationSteps.Proposal; + private submissionUuid = ''; + isGovernmentUser = false; + governmentName? = ''; + disableNotificationFileUploads = false; hectares = new FormControl(null, [Validators.required]); purpose = new FormControl(null, [Validators.required]); agSupport = new FormControl(null, [Validators.required]); improvements = new FormControl(null, [Validators.required]); + governmentOwnsAllParcels = new FormControl(undefined, [Validators.required]); form = new FormGroup({ hectares: this.hectares, @@ -33,11 +41,15 @@ export class InclProposalComponent extends FilesStepComponent implements OnInit, agSupport: this.agSupport, improvements: this.improvements, }); - private submissionUuid = ''; + proposalMap: ApplicationDocumentDto[] = []; + noticeOfPublicHearing: ApplicationDocumentDto[] = []; + proofOfSignage: ApplicationDocumentDto[] = []; + reportOfPublicHearing: ApplicationDocumentDto[] = []; constructor( private applicationSubmissionService: ApplicationSubmissionService, + private authenticationService: AuthenticationService, applicationDocumentService: ApplicationDocumentService, dialog: MatDialog ) { @@ -57,6 +69,13 @@ export class InclProposalComponent extends FilesStepComponent implements OnInit, improvements: applicationSubmission.inclImprovements, }); + if (applicationSubmission.inclGovernmentOwnsAllParcels !== null) { + this.governmentOwnsAllParcels.setValue( + formatBooleanToString(applicationSubmission.inclGovernmentOwnsAllParcels) + ); + this.disableNotificationFileUploads = applicationSubmission.inclGovernmentOwnsAllParcels; + } + if (this.showErrors) { this.form.markAllAsTouched(); } @@ -65,6 +84,23 @@ export class InclProposalComponent extends FilesStepComponent implements OnInit, this.$applicationDocuments.pipe(takeUntil(this.$destroy)).subscribe((documents) => { this.proposalMap = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.PROPOSAL_MAP); + this.noticeOfPublicHearing = documents.filter( + (document) => document.type?.code === DOCUMENT_TYPE.PROOF_OF_ADVERTISING + ); + this.proofOfSignage = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.PROOF_OF_SIGNAGE); + this.reportOfPublicHearing = documents.filter( + (document) => document.type?.code === DOCUMENT_TYPE.REPORT_OF_PUBLIC_HEARING + ); + }); + + this.authenticationService.$currentProfile.pipe(takeUntil(this.$destroy)).subscribe((userProfile) => { + if (userProfile) { + this.isGovernmentUser = userProfile?.isLocalGovernment || userProfile?.isFirstNationGovernment; + this.governmentName = userProfile.government; + + // @ts-ignore Angular / Typescript hate dynamic controls + this.form.addControl('isLFNGOwnerOfAllParcels', this.governmentOwnsAllParcels); + } }); } @@ -78,16 +114,22 @@ export class InclProposalComponent extends FilesStepComponent implements OnInit, const purpose = this.purpose.value; const inclAgricultureSupport = this.agSupport.value; const inclImprovements = this.improvements.value; + const inclGovernmentOwnsAllParcels = this.governmentOwnsAllParcels.value; const updateDto: ApplicationSubmissionUpdateDto = { inclExclHectares: inclExclHectares ? parseFloat(inclExclHectares) : null, purpose, inclAgricultureSupport, inclImprovements, + inclGovernmentOwnsAllParcels: parseStringToBoolean(inclGovernmentOwnsAllParcels), }; const updatedApp = await this.applicationSubmissionService.updatePending(this.submissionUuid, updateDto); this.$applicationSubmission.next(updatedApp); } } + + onSelectLocalGovernmentParcelOwner($event: MatButtonToggleChange) { + this.disableNotificationFileUploads = $event.value === 'true'; + } } diff --git a/portal-frontend/src/app/services/application-submission/application-submission.dto.ts b/portal-frontend/src/app/services/application-submission/application-submission.dto.ts index 29056823d8..c831b683f0 100644 --- a/portal-frontend/src/app/services/application-submission/application-submission.dto.ts +++ b/portal-frontend/src/app/services/application-submission/application-submission.dto.ts @@ -154,6 +154,7 @@ export interface ApplicationSubmissionDetailedDto extends ApplicationSubmissionD inclAgricultureSupport: string | null; inclImprovements: string | null; exclShareGovernmentBorders: boolean | null; + inclGovernmentOwnsAllParcels: boolean | null; } export interface ApplicationSubmissionUpdateDto { @@ -259,4 +260,5 @@ export interface ApplicationSubmissionUpdateDto { inclAgricultureSupport?: string | null; inclImprovements?: string | null; exclShareGovernmentBorders?: boolean | null; + inclGovernmentOwnsAllParcels?: boolean | null; } diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.dto.ts b/services/apps/alcs/src/portal/application-submission/application-submission.dto.ts index e8e271ddf0..249009cbc4 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.dto.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.dto.ts @@ -309,6 +309,9 @@ export class ApplicationSubmissionDetailedDto extends ApplicationSubmissionDto { @AutoMap(() => Boolean) exclShareGovernmentBorders: boolean | null; + + @AutoMap(() => Boolean) + inclGovernmentOwnsAllParcels?: boolean | null; } export class ApplicationSubmissionCreateDto { @@ -695,4 +698,8 @@ export class ApplicationSubmissionUpdateDto { @IsBoolean() @IsOptional() exclShareGovernmentBorders?: boolean | null; + + @IsBoolean() + @IsOptional() + inclGovernmentOwnsAllParcels?: boolean | null; } diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts b/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts index 8c53d774e7..9e67aabbc1 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts @@ -695,6 +695,10 @@ export class ApplicationSubmission extends Base { @Column({ type: 'boolean', nullable: true }) exclShareGovernmentBorders: boolean | null; + @AutoMap(() => Boolean) + @Column({ type: 'boolean', nullable: true }) + inclGovernmentOwnsAllParcels: boolean | null; + //END SUBMISSION FIELDS @AutoMap(() => Application) diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.service.ts b/services/apps/alcs/src/portal/application-submission/application-submission.service.ts index fff750c23b..7406abff08 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.service.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.service.ts @@ -969,6 +969,10 @@ export class ApplicationSubmissionService { updateDto.exclShareGovernmentBorders, applicationSubmission.exclShareGovernmentBorders, ); + applicationSubmission.inclGovernmentOwnsAllParcels = filterUndefined( + updateDto.inclGovernmentOwnsAllParcels, + applicationSubmission.inclGovernmentOwnsAllParcels, + ); } async listNaruSubtypes() { diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1690414066995-add_government_incl_fields_to_submission.ts b/services/apps/alcs/src/providers/typeorm/migrations/1690414066995-add_government_incl_fields_to_submission.ts new file mode 100644 index 0000000000..f4264e8c35 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1690414066995-add_government_incl_fields_to_submission.ts @@ -0,0 +1,19 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class addGovernmentInclFieldsToSubmission1690414066995 + implements MigrationInterface +{ + name = 'addGovernmentInclFieldsToSubmission1690414066995'; + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" ADD "incl_government_owns_all_parcels" boolean`, + ); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" DROP COLUMN "incl_government_owns_all_parcels"`, + ); + } +} From d6b6465a74386cee2af628c11158071060d07709 Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Thu, 27 Jul 2023 10:48:54 -0700 Subject: [PATCH 154/954] nfu subtype with inline ng select (#826) --- .../proposal/nfu/nfu.component.html | 6 +- .../proposal/nfu/nfu.component.scss | 4 ++ .../inline-ng-select.component.html | 36 ++++++++++++ .../inline-ng-select.component.scss | 58 +++++++++++++++++++ .../inline-ng-select.component.spec.ts | 24 ++++++++ .../inline-ng-select.component.ts | 54 +++++++++++++++++ alcs-frontend/src/app/shared/shared.module.ts | 4 ++ 7 files changed, 183 insertions(+), 3 deletions(-) create mode 100644 alcs-frontend/src/app/shared/inline-editors/inline-ng-select/inline-ng-select.component.html create mode 100644 alcs-frontend/src/app/shared/inline-editors/inline-ng-select/inline-ng-select.component.scss create mode 100644 alcs-frontend/src/app/shared/inline-editors/inline-ng-select/inline-ng-select.component.spec.ts create mode 100644 alcs-frontend/src/app/shared/inline-editors/inline-ng-select/inline-ng-select.component.ts diff --git a/alcs-frontend/src/app/features/application/proposal/nfu/nfu.component.html b/alcs-frontend/src/app/features/application/proposal/nfu/nfu.component.html index 6b81c0bf65..5d270e97f9 100644 --- a/alcs-frontend/src/app/features/application/proposal/nfu/nfu.component.html +++ b/alcs-frontend/src/app/features/application/proposal/nfu/nfu.component.html @@ -6,13 +6,13 @@ (save)="updateApplicationValue('nfuUseType', $event)" >
-
+
Non-Farm Use Sub-Type
- + >
Use End Date
diff --git a/alcs-frontend/src/app/features/application/proposal/nfu/nfu.component.scss b/alcs-frontend/src/app/features/application/proposal/nfu/nfu.component.scss index 229ba6c084..2f69c7774f 100644 --- a/alcs-frontend/src/app/features/application/proposal/nfu/nfu.component.scss +++ b/alcs-frontend/src/app/features/application/proposal/nfu/nfu.component.scss @@ -1,3 +1,7 @@ div { margin: 32px 0; } + +.nfu-subtype-wrapper { + width: 25%; +} diff --git a/alcs-frontend/src/app/shared/inline-editors/inline-ng-select/inline-ng-select.component.html b/alcs-frontend/src/app/shared/inline-editors/inline-ng-select/inline-ng-select.component.html new file mode 100644 index 0000000000..d49670474e --- /dev/null +++ b/alcs-frontend/src/app/shared/inline-editors/inline-ng-select/inline-ng-select.component.html @@ -0,0 +1,36 @@ +
+ + Select an option + Select option(s) + + {{ value }} + + + {{ coerceArray(value)?.join(', ') }} + + + +
+
+ +
+
+ + +
+
+
diff --git a/alcs-frontend/src/app/shared/inline-editors/inline-ng-select/inline-ng-select.component.scss b/alcs-frontend/src/app/shared/inline-editors/inline-ng-select/inline-ng-select.component.scss new file mode 100644 index 0000000000..1eef4be4cd --- /dev/null +++ b/alcs-frontend/src/app/shared/inline-editors/inline-ng-select/inline-ng-select.component.scss @@ -0,0 +1,58 @@ +@use '../../../../styles/colors'; + +.inline-number-wrapper { + padding-top: 4px; +} + +.editing { + display: inline-block; + width: 100%; +} + +.editing.hidden { + display: none; +} + +.edit-button { + height: 24px; + width: 24px; + display: flex; + align-items: center; +} + +.edit-icon { + font-size: inherit; + line-height: 22px; +} + +.button-container { + display: flex; + justify-content: flex-end; + + button:not(:last-child) { + margin-right: 2px !important; + } +} + +.add { + cursor: pointer; +} + +.save { + color: colors.$primary-color; +} + +:host::ng-deep { + .mat-form-field-wrapper { + padding: 0 !important; + margin: 0 !important; + } + + button mat-icon { + overflow: visible; + } + + .mat-mdc-icon-button.mat-mdc-button-base { + padding: 0 !important; + } +} diff --git a/alcs-frontend/src/app/shared/inline-editors/inline-ng-select/inline-ng-select.component.spec.ts b/alcs-frontend/src/app/shared/inline-editors/inline-ng-select/inline-ng-select.component.spec.ts new file mode 100644 index 0000000000..7984b8d927 --- /dev/null +++ b/alcs-frontend/src/app/shared/inline-editors/inline-ng-select/inline-ng-select.component.spec.ts @@ -0,0 +1,24 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { InlineNgSelectComponent } from './inline-ng-select.component'; + +describe('InlineDropdownComponent', () => { + let component: InlineNgSelectComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [InlineNgSelectComponent], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(InlineNgSelectComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/alcs-frontend/src/app/shared/inline-editors/inline-ng-select/inline-ng-select.component.ts b/alcs-frontend/src/app/shared/inline-editors/inline-ng-select/inline-ng-select.component.ts new file mode 100644 index 0000000000..1d6e2c709b --- /dev/null +++ b/alcs-frontend/src/app/shared/inline-editors/inline-ng-select/inline-ng-select.component.ts @@ -0,0 +1,54 @@ +import { AfterContentChecked, Component, ElementRef, EventEmitter, Input, Output, ViewChild } from '@angular/core'; + +@Component({ + selector: 'app-inline-ng-select[options][value]', + templateUrl: './inline-ng-select.component.html', + styleUrls: ['./inline-ng-select.component.scss'], +}) +export class InlineNgSelectComponent implements AfterContentChecked { + @Input() value?: string | string[] | undefined; + @Input() placeholder: string = 'Enter a value'; + @Input() options: { label: string; value: string }[] = []; + @Input() multiple = false; + + @Output() save = new EventEmitter(); + + @ViewChild('editInput') textInput!: ElementRef; + + isEditing = false; + pendingValue: undefined | string | string[]; + + constructor() {} + + startEdit() { + this.isEditing = true; + this.pendingValue = this.value; + } + + ngAfterContentChecked(): void { + if (this.textInput) { + this.textInput.nativeElement.focus(); + } + } + + confirmEdit() { + if (this.pendingValue !== this.value) { + this.save.emit(this.pendingValue ?? null); + this.value = this.pendingValue; + } + + this.isEditing = false; + } + + cancelEdit() { + this.isEditing = false; + this.pendingValue = this.value; + } + + coerceArray(value: string | string[] | undefined) { + if (value instanceof Array) { + return value; + } + return undefined; + } +} diff --git a/alcs-frontend/src/app/shared/shared.module.ts b/alcs-frontend/src/app/shared/shared.module.ts index d60257ce20..756471ca40 100644 --- a/alcs-frontend/src/app/shared/shared.module.ts +++ b/alcs-frontend/src/app/shared/shared.module.ts @@ -47,6 +47,7 @@ import { InlineNumberComponent } from './inline-editors/inline-number/inline-num import { InlineReviewOutcomeComponent } from './inline-editors/inline-review-outcome/inline-review-outcome.component'; import { InlineTextComponent } from './inline-editors/inline-text/inline-text.component'; import { InlineTextareaComponent } from './inline-editors/inline-textarea/inline-textarea.component'; +import { InlineNgSelectComponent } from './inline-editors/inline-ng-select/inline-ng-select.component'; import { LotsTableFormComponent } from './lots-table/lots-table-form.component'; import { MeetingOverviewComponent } from './meeting-overview/meeting-overview.component'; import { NoDataComponent } from './no-data/no-data.component'; @@ -94,6 +95,7 @@ import { WarningBannerComponent } from './warning-banner/warning-banner.componen WarningBannerComponent, ErrorMessageComponent, LotsTableFormComponent, + InlineNgSelectComponent, ], imports: [ CommonModule, @@ -117,6 +119,7 @@ import { WarningBannerComponent } from './warning-banner/warning-banner.componen RouterModule, MatDatepickerModule, MatDialogModule, + NgSelectModule, ], exports: [ CommonModule, @@ -150,6 +153,7 @@ import { WarningBannerComponent } from './warning-banner/warning-banner.componen InlineNumberComponent, InlineTextComponent, InlineDropdownComponent, + InlineNgSelectComponent, MatAutocompleteModule, MatButtonToggleModule, DetailsHeaderComponent, From 9e8af39990a000a46fe4c674e5bde7178daaf05c Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Thu, 27 Jul 2023 10:43:15 -0700 Subject: [PATCH 155/954] Bug fixes for L/FNG again --- .../edit-submission.component.ts | 4 +++ .../primary-contact.component.ts | 25 +++++++++++-------- .../application-submission.service.ts | 4 +-- 3 files changed, 19 insertions(+), 14 deletions(-) diff --git a/portal-frontend/src/app/features/edit-submission/edit-submission.component.ts b/portal-frontend/src/app/features/edit-submission/edit-submission.component.ts index 17cc530fdd..527a09d860 100644 --- a/portal-frontend/src/app/features/edit-submission/edit-submission.component.ts +++ b/portal-frontend/src/app/features/edit-submission/edit-submission.component.ts @@ -94,6 +94,10 @@ export class EditSubmissionComponent implements OnInit, OnDestroy, AfterViewInit ngOnInit(): void { this.expandedParcelUuid = undefined; + + this.$applicationSubmission.pipe(takeUntil(this.$destroy)).subscribe((submission) => { + this.applicationSubmission = submission; + }); } ngAfterViewInit(): void { diff --git a/portal-frontend/src/app/features/edit-submission/primary-contact/primary-contact.component.ts b/portal-frontend/src/app/features/edit-submission/primary-contact/primary-contact.component.ts index bd05e3c1a7..fedf84f5fa 100644 --- a/portal-frontend/src/app/features/edit-submission/primary-contact/primary-contact.component.ts +++ b/portal-frontend/src/app/features/edit-submission/primary-contact/primary-contact.component.ts @@ -143,17 +143,20 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni } private calculateLetterRequired() { - const isSelfApplicant = this.owners[0].type.code === APPLICATION_OWNER.INDIVIDUAL || this.selectedLocalGovernment; - - this.needsAuthorizationLetter = - this.selectedThirdPartyAgent || - !( - isSelfApplicant && - (this.owners.length === 1 || - (this.owners.length === 2 && - this.owners[1].type.code === APPLICATION_OWNER.AGENT && - !this.selectedThirdPartyAgent)) - ); + if (this.selectedLocalGovernment) { + this.needsAuthorizationLetter = false; + } else { + const isSelfApplicant = this.owners[0].type.code === APPLICATION_OWNER.INDIVIDUAL; + this.needsAuthorizationLetter = + this.selectedThirdPartyAgent || + !( + isSelfApplicant && + (this.owners.length === 1 || + (this.owners.length === 2 && + this.owners[1].type.code === APPLICATION_OWNER.AGENT && + !this.selectedThirdPartyAgent)) + ); + } this.files = this.files.map((file) => ({ ...file, diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.service.ts b/services/apps/alcs/src/portal/application-submission/application-submission.service.ts index 7406abff08..95a463ec5b 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.service.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.service.ts @@ -77,9 +77,7 @@ export class ApplicationSubmissionService { fileNumber, isDraft: false, }, - relations: { - naruSubtype: true, - }, + relations: this.DEFAULT_RELATIONS, }); if (!application) { throw new Error('Failed to find document'); From c642e1f6eec4bc405e22a123b2a487bfcc02c453 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Thu, 27 Jul 2023 11:46:55 -0700 Subject: [PATCH 156/954] Fix Styling for SUBD, Fix Decisions with no components or conditions * Bug fix for header change after checked --- .../decision-input-v2.component.ts | 11 ++++--- .../lots-table/lots-table-form.component.scss | 4 +++ .../lots-table/lots-table-form.component.ts | 30 +++++++++++-------- .../app/shared/header/header.component.html | 10 ++----- .../src/app/shared/header/header.component.ts | 13 ++++---- 5 files changed, 37 insertions(+), 31 deletions(-) diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.ts index f2e92007fa..2bc38b496b 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.ts @@ -528,8 +528,8 @@ export class DecisionInputV2Component implements OnInit, OnDestroy { private runValidation() { this.form.markAllAsTouched(); - this.componentsValid = this.componentsValid && this.components.length > 0; - this.conditionsValid = this.conditionsValid && this.conditionUpdates.length > 0; + const requiresConditions = this.showConditions; + const requiresComponents = this.showComponents; if (this.decisionComponentsComponent) { this.decisionComponentsComponent.onValidate(); @@ -543,8 +543,8 @@ export class DecisionInputV2Component implements OnInit, OnDestroy { !this.form.valid || !this.conditionsValid || !this.componentsValid || - (this.components.length === 0 && this.showComponents) || - (this.conditionUpdates.length === 0 && this.showConditions) + (this.components.length === 0 && requiresComponents) || + (this.conditionUpdates.length === 0 && requiresConditions) ) { this.form.controls.decisionMaker.markAsDirty(); this.toastService.showErrorToast('Please correct all errors before submitting the form'); @@ -594,9 +594,8 @@ export class DecisionInputV2Component implements OnInit, OnDestroy { } onConditionsChange($event: { conditions: UpdateApplicationDecisionConditionDto[]; isValid: boolean }) { - this.conditionUpdates = $event.conditions; - this.conditionsValid = $event.isValid; this.conditionUpdates = Array.from($event.conditions); + this.conditionsValid = $event.isValid; } onChangeDecisionOutcome(selectedOutcome: DecisionOutcomeCodeDto) { diff --git a/alcs-frontend/src/app/shared/lots-table/lots-table-form.component.scss b/alcs-frontend/src/app/shared/lots-table/lots-table-form.component.scss index e69de29bb2..5aa07a5e2e 100644 --- a/alcs-frontend/src/app/shared/lots-table/lots-table-form.component.scss +++ b/alcs-frontend/src/app/shared/lots-table/lots-table-form.component.scss @@ -0,0 +1,4 @@ +fieldset { + border: none; + padding: 0; +} diff --git a/alcs-frontend/src/app/shared/lots-table/lots-table-form.component.ts b/alcs-frontend/src/app/shared/lots-table/lots-table-form.component.ts index 9979b53925..c9a65c177e 100644 --- a/alcs-frontend/src/app/shared/lots-table/lots-table-form.component.ts +++ b/alcs-frontend/src/app/shared/lots-table/lots-table-form.component.ts @@ -33,7 +33,7 @@ type ProposedLot = { type: 'Lot' | 'Road Dedication' | null; size: string | null export class LotsTableFormComponent implements ControlValueAccessor, Validator { displayedColumns = ['index', 'type', 'size', 'alrArea']; lotsSource = new MatTableDataSource([]); - lotCount = 0; + lotCount: number | null = null; touched = false; disabled = false; @@ -99,12 +99,14 @@ export class LotsTableFormComponent implements ControlValueAccessor, Validator { this.disabled = disabled; } - writeValue(proposedLots: ProposedLot[]) { + writeValue(proposedLots: ProposedLot[] | null) { this.resetForm(proposedLots ?? []); - this.lotCount = proposedLots.length; + this.lotCount = proposedLots?.length ?? null; let lots = this.mapFormToLots(); this.lotsSource = new MatTableDataSource(lots); - this.count.setValue(this.lotCount.toString()); + if (this.lotCount !== null) { + this.count.setValue(this.lotCount.toString()); + } } validate(control: AbstractControl) { @@ -135,15 +137,17 @@ export class LotsTableFormComponent implements ControlValueAccessor, Validator { private mapFormToLots() { const proposedLots: ProposedLot[] = []; - for (let index = 0; index < this.lotCount; index++) { - const lotType = this.form.controls[`${index}-lotType`].value; - const lotSize = this.form.controls[`${index}-lotSize`].value; - const lotAlrArea = this.form.controls[`${index}-lotAlrArea`].value; - proposedLots.push({ - size: lotSize, - type: lotType, - alrArea: lotAlrArea, - }); + if (this.lotCount !== null) { + for (let index = 0; index < this.lotCount; index++) { + const lotType = this.form.controls[`${index}-lotType`].value; + const lotSize = this.form.controls[`${index}-lotSize`].value; + const lotAlrArea = this.form.controls[`${index}-lotAlrArea`].value; + proposedLots.push({ + size: lotSize, + type: lotType, + alrArea: lotAlrArea, + }); + } } return proposedLots; } diff --git a/portal-frontend/src/app/shared/header/header.component.html b/portal-frontend/src/app/shared/header/header.component.html index a6c5058f6c..acbc8394dc 100644 --- a/portal-frontend/src/app/shared/header/header.component.html +++ b/portal-frontend/src/app/shared/header/header.component.html @@ -9,15 +9,11 @@
Provincial Agricultural Land Commission Portal
- - + +
-
+

Portal Inbox

Log Out

diff --git a/portal-frontend/src/app/shared/header/header.component.ts b/portal-frontend/src/app/shared/header/header.component.ts index 79817826b0..8b86d4843d 100644 --- a/portal-frontend/src/app/shared/header/header.component.ts +++ b/portal-frontend/src/app/shared/header/header.component.ts @@ -1,4 +1,4 @@ -import { Component, OnDestroy, OnInit } from '@angular/core'; +import { ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core'; import { Router } from '@angular/router'; import { Subject, takeUntil } from 'rxjs'; import { AuthenticationService } from '../../services/authentication/authentication.service'; @@ -13,13 +13,16 @@ export class HeaderComponent implements OnInit, OnDestroy { isAuthenticated = false; isMenuOpen = false; - constructor(private authenticationService: AuthenticationService, private router: Router) {} + constructor( + private authenticationService: AuthenticationService, + private router: Router, + private changeDetectorRef: ChangeDetectorRef + ) {} ngOnInit(): void { this.authenticationService.$currentTokenUser.pipe(takeUntil(this.$destroy)).subscribe((user) => { - if (user) { - this.isAuthenticated = true; - } + this.isAuthenticated = !!user; + this.changeDetectorRef.detectChanges(); }); } From 5163e35a8e2db56331dc4b1ce1c549c85079a7bf Mon Sep 17 00:00:00 2001 From: "to. sandra" <76515860+sandratoh@users.noreply.github.com> Date: Thu, 27 Jul 2023 16:00:56 -0700 Subject: [PATCH 157/954] Add Exclusion applications in ALCS and fix LFNG info (#829) * Add exclusion detail in alcs * Fix LFNG sections in ALCS and portal * Add excl and incl proposal to alcs edit submission * Init excl proposal component and add to app prep * Select and save inclExclApplicantType with inline selector * Update frontend tests * Clean up conditional view to boolean variable --- .../application-details.component.html | 6 ++ .../application-details.module.ts | 2 + .../excl-details/excl-details.component.html | 56 +++++++++++ .../excl-details/excl-details.component.scss | 0 .../excl-details.component.spec.ts | 31 ++++++ .../excl-details/excl-details.component.ts | 45 +++++++++ .../application/application.module.ts | 2 + .../lfng-info/lfng-info.component.html | 99 +++++++++++++++---- .../lfng-info/lfng-info.component.ts | 20 ++++ .../proposal/excl/excl.component.html | 7 ++ .../proposal/excl/excl.component.scss | 0 .../proposal/excl/excl.component.spec.ts | 42 ++++++++ .../proposal/excl/excl.component.ts | 44 +++++++++ .../proposal/proposal.component.html | 1 + .../application-dialog.component.spec.ts | 1 + .../covenant-dialog.component.spec.ts | 1 + .../notice-of-intent-dialog.component.spec.ts | 1 + .../planning-review-dialog.component.spec.ts | 1 + .../application-document.service.ts | 3 + .../application-local-government.dto.ts | 1 + .../services/application/application.dto.ts | 2 + .../application/application.service.spec.ts | 1 + .../inline-applicant-type.component.html | 23 +++++ .../inline-applicant-type.component.scss | 45 +++++++++ .../inline-applicant-type.component.spec.ts | 28 ++++++ .../inline-applicant-type.component.ts | 37 +++++++ alcs-frontend/src/app/shared/shared.module.ts | 3 + .../alcs-edit-submission.component.html | 16 +++ .../alcs-edit-submission.component.ts | 10 ++ .../edit-submission-base.module.ts | 2 + .../review-submit.component.html | 16 ++- .../lfng-review/lfng-review.component.html | 8 +- .../lfng-review/lfng-review.component.ts | 8 ++ .../application/application.controller.ts | 1 + .../src/alcs/application/application.dto.ts | 8 ++ .../alcs/application/application.entity.ts | 8 ++ ...incl_excl_applicant_type_to_application.ts | 23 +++++ 37 files changed, 573 insertions(+), 29 deletions(-) create mode 100644 alcs-frontend/src/app/features/application/applicant-info/application-details/excl-details/excl-details.component.html create mode 100644 alcs-frontend/src/app/features/application/applicant-info/application-details/excl-details/excl-details.component.scss create mode 100644 alcs-frontend/src/app/features/application/applicant-info/application-details/excl-details/excl-details.component.spec.ts create mode 100644 alcs-frontend/src/app/features/application/applicant-info/application-details/excl-details/excl-details.component.ts create mode 100644 alcs-frontend/src/app/features/application/proposal/excl/excl.component.html create mode 100644 alcs-frontend/src/app/features/application/proposal/excl/excl.component.scss create mode 100644 alcs-frontend/src/app/features/application/proposal/excl/excl.component.spec.ts create mode 100644 alcs-frontend/src/app/features/application/proposal/excl/excl.component.ts create mode 100644 alcs-frontend/src/app/shared/inline-applicant-type/inline-applicant-type.component.html create mode 100644 alcs-frontend/src/app/shared/inline-applicant-type/inline-applicant-type.component.scss create mode 100644 alcs-frontend/src/app/shared/inline-applicant-type/inline-applicant-type.component.spec.ts create mode 100644 alcs-frontend/src/app/shared/inline-applicant-type/inline-applicant-type.component.ts create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1690485189579-add_incl_excl_applicant_type_to_application.ts diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.html b/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.html index cda1a72718..0a5a4d1b62 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.html +++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.html @@ -172,6 +172,12 @@

Proposal

[applicationSubmission]="submission" [files]="files" > + +
+ +
+
+ + Land Owner + L/FNG Initiated + +
+
+ + +
+
+
diff --git a/alcs-frontend/src/app/shared/inline-applicant-type/inline-applicant-type.component.scss b/alcs-frontend/src/app/shared/inline-applicant-type/inline-applicant-type.component.scss new file mode 100644 index 0000000000..9b074fdc29 --- /dev/null +++ b/alcs-frontend/src/app/shared/inline-applicant-type/inline-applicant-type.component.scss @@ -0,0 +1,45 @@ +@use '../../../styles/colors'; + +.inline-applicant-type-wrapper { + padding-top: 4px; +} + +.editing.hidden { + display: none; +} + +.button-container { + button:not(:last-child) { + margin-right: 2px !important; + } + .save { + color: colors.$primary-color; + } +} + +.edit-button { + height: 24px; + width: 24px; + display: flex; + align-items: center; +} + +.edit-icon { + font-size: inherit; + line-height: 22px; +} + +:host::ng-deep { + .mat-form-field-wrapper { + padding: 0 !important; + margin: 0 !important; + } + + button mat-icon { + overflow: visible; + } + + .mat-mdc-icon-button.mat-mdc-button-base { + padding: 0 !important; + } +} diff --git a/alcs-frontend/src/app/shared/inline-applicant-type/inline-applicant-type.component.spec.ts b/alcs-frontend/src/app/shared/inline-applicant-type/inline-applicant-type.component.spec.ts new file mode 100644 index 0000000000..b692b19be4 --- /dev/null +++ b/alcs-frontend/src/app/shared/inline-applicant-type/inline-applicant-type.component.spec.ts @@ -0,0 +1,28 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { FormsModule, ReactiveFormsModule } from '@angular/forms'; +import { MatButtonToggleModule } from '@angular/material/button-toggle'; +import { SharedModule } from '../shared.module'; + +import { InlineApplicantTypeComponent } from './inline-applicant-type.component'; + +describe('InlineApplicantTypeComponent', () => { + let component: InlineApplicantTypeComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [SharedModule, FormsModule, ReactiveFormsModule, MatButtonToggleModule], + declarations: [InlineApplicantTypeComponent], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(InlineApplicantTypeComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/alcs-frontend/src/app/shared/inline-applicant-type/inline-applicant-type.component.ts b/alcs-frontend/src/app/shared/inline-applicant-type/inline-applicant-type.component.ts new file mode 100644 index 0000000000..1c4e6e238f --- /dev/null +++ b/alcs-frontend/src/app/shared/inline-applicant-type/inline-applicant-type.component.ts @@ -0,0 +1,37 @@ +import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; +import { FormBuilder, FormGroup } from '@angular/forms'; + +@Component({ + selector: 'app-inline-applicant-type', + templateUrl: './inline-applicant-type.component.html', + styleUrls: ['./inline-applicant-type.component.scss'], +}) +export class InlineApplicantTypeComponent implements OnInit { + @Input() selectedValue?: string | null; + @Input() value?: string | null; + + @Output() save = new EventEmitter(); + + form!: FormGroup; + isEditing = false; + pendingApplicantType?: string | null; + + constructor(private fb: FormBuilder) { + this.pendingApplicantType = this.selectedValue; + } + + ngOnInit(): void { + this.form = this.fb.group({ + applicantType: this.value || this.selectedValue, + }); + } + + toggleEdit() { + this.isEditing = !this.isEditing; + } + + onSave() { + this.save.emit(this.form.get('applicantType')!.value); + this.isEditing = false; + } +} diff --git a/alcs-frontend/src/app/shared/shared.module.ts b/alcs-frontend/src/app/shared/shared.module.ts index 756471ca40..36ea036d66 100644 --- a/alcs-frontend/src/app/shared/shared.module.ts +++ b/alcs-frontend/src/app/shared/shared.module.ts @@ -40,6 +40,7 @@ import { AvatarCircleComponent } from './avatar-circle/avatar-circle.component'; import { DetailsHeaderComponent } from './details-header/details-header.component'; import { ErrorMessageComponent } from './error-message/error-message.component'; import { FavoriteButtonComponent } from './favorite-button/favorite-button.component'; +import { InlineApplicantTypeComponent } from './inline-applicant-type/inline-applicant-type.component'; import { InlineBooleanComponent } from './inline-editors/inline-boolean/inline-boolean.component'; import { InlineDatepickerComponent } from './inline-editors/inline-datepicker/inline-datepicker.component'; import { InlineDropdownComponent } from './inline-editors/inline-dropdown/inline-dropdown.component'; @@ -72,6 +73,7 @@ import { WarningBannerComponent } from './warning-banner/warning-banner.componen MomentPipe, StartOfDayPipe, MeetingOverviewComponent, + InlineApplicantTypeComponent, InlineTextareaComponent, InlineBooleanComponent, InlineNumberComponent, @@ -148,6 +150,7 @@ import { WarningBannerComponent } from './warning-banner/warning-banner.componen MtxButtonModule, StartOfDayPipe, MatTooltipModule, + InlineApplicantTypeComponent, InlineTextareaComponent, InlineBooleanComponent, InlineNumberComponent, diff --git a/portal-frontend/src/app/features/alcs-edit-submission/alcs-edit-submission.component.html b/portal-frontend/src/app/features/alcs-edit-submission/alcs-edit-submission.component.html index 406803dac5..74ccaa5382 100644 --- a/portal-frontend/src/app/features/alcs-edit-submission/alcs-edit-submission.component.html +++ b/portal-frontend/src/app/features/alcs-edit-submission/alcs-edit-submission.component.html @@ -137,6 +137,22 @@
(navigateToStep)="switchStep($event)" (exit)="onExit()" > + +
diff --git a/portal-frontend/src/app/features/alcs-edit-submission/alcs-edit-submission.component.ts b/portal-frontend/src/app/features/alcs-edit-submission/alcs-edit-submission.component.ts index 5dd7fb0286..32486f33ba 100644 --- a/portal-frontend/src/app/features/alcs-edit-submission/alcs-edit-submission.component.ts +++ b/portal-frontend/src/app/features/alcs-edit-submission/alcs-edit-submission.component.ts @@ -29,6 +29,8 @@ import { TurProposalComponent } from '../edit-submission/proposal/tur-proposal/t import { SelectGovernmentComponent } from '../edit-submission/select-government/select-government.component'; import { ConfirmPublishDialogComponent } from './confirm-publish-dialog/confirm-publish-dialog.component'; import { scrollToElement } from '../../shared/utils/scroll-helper'; +import { ExclProposalComponent } from '../edit-submission/proposal/excl-proposal/excl-proposal.component'; +import { InclProposalComponent } from '../edit-submission/proposal/incl-proposal/incl-proposal.component'; @Component({ selector: 'app-alcs-edit-submission', @@ -64,6 +66,8 @@ export class AlcsEditSubmissionComponent implements OnInit, OnDestroy, AfterView @ViewChild(RosoProposalComponent) rosoProposalComponent?: RosoProposalComponent; @ViewChild(PofoProposalComponent) profoProposalComponent?: PofoProposalComponent; @ViewChild(PfrsProposalComponent) pfrsProposalComponent?: PfrsProposalComponent; + @ViewChild(ExclProposalComponent) exclProposalComponent?: ExclProposalComponent; + @ViewChild(InclProposalComponent) inclProposalComponent?: InclProposalComponent; @ViewChild(OtherAttachmentsComponent) otherAttachmentsComponent!: OtherAttachmentsComponent; constructor( @@ -209,6 +213,12 @@ export class AlcsEditSubmissionComponent implements OnInit, OnDestroy, AfterView if (this.pfrsProposalComponent) { await this.pfrsProposalComponent.onSave(); } + if (this.exclProposalComponent) { + await this.exclProposalComponent.onSave(); + } + if (this.inclProposalComponent) { + await this.inclProposalComponent.onSave(); + } } async switchStep(index: number) { diff --git a/portal-frontend/src/app/features/edit-submission/edit-submission-base.module.ts b/portal-frontend/src/app/features/edit-submission/edit-submission-base.module.ts index acea5917c7..71801160f1 100644 --- a/portal-frontend/src/app/features/edit-submission/edit-submission-base.module.ts +++ b/portal-frontend/src/app/features/edit-submission/edit-submission-base.module.ts @@ -110,6 +110,8 @@ import { SelectGovernmentComponent } from './select-government/select-government PfrsProposalComponent, NaruProposalComponent, SoilTableComponent, + ExclProposalComponent, + InclProposalComponent, ], }) export class EditSubmissionBaseModule {} diff --git a/portal-frontend/src/app/features/review-submission/review-submit/review-submit.component.html b/portal-frontend/src/app/features/review-submission/review-submit/review-submit.component.html index cb01882b58..70f9d717a5 100644 --- a/portal-frontend/src/app/features/review-submission/review-submit/review-submit.component.html +++ b/portal-frontend/src/app/features/review-submission/review-submit/review-submit.component.html @@ -179,7 +179,11 @@

4. Resolution

The only option available to you is to forward this application on to the ALC.
Resolution for Application to Proceed to the ALC
@@ -191,7 +195,7 @@

4. Resolution

@@ -423,7 +427,11 @@

4. Resolution

The only option available to you is to forward this application on to the ALC.
Resolution for Application to Proceed to the ALC
@@ -435,7 +443,7 @@

4. Resolution

diff --git a/portal-frontend/src/app/features/view-submission/lfng-review/lfng-review.component.html b/portal-frontend/src/app/features/view-submission/lfng-review/lfng-review.component.html index 5afec266c1..4a8902487a 100644 --- a/portal-frontend/src/app/features/view-submission/lfng-review/lfng-review.component.html +++ b/portal-frontend/src/app/features/view-submission/lfng-review/lfng-review.component.html @@ -224,13 +224,7 @@

Resolution

no authorizing resolution is required as per S. 25 (3) or S. 29 (4) of the ALC Act. The only option available is to forward this application on to the ALC.
-
+
Resolution for Application to Proceed to the ALC
{{ diff --git a/portal-frontend/src/app/features/view-submission/lfng-review/lfng-review.component.ts b/portal-frontend/src/app/features/view-submission/lfng-review/lfng-review.component.ts index 8305093ae2..d893645219 100644 --- a/portal-frontend/src/app/features/view-submission/lfng-review/lfng-review.component.ts +++ b/portal-frontend/src/app/features/view-submission/lfng-review/lfng-review.component.ts @@ -34,6 +34,7 @@ export class LfngReviewComponent implements OnInit, OnDestroy { staffReport: ApplicationDocumentDto[] = []; resolutionDocument: ApplicationDocumentDto[] = []; governmentOtherAttachments: ApplicationDocumentDto[] = []; + hasCompletedStepsBeforeResolution = false; hasCompletedStepsBeforeDocuments = false; submittedToAlcStatus = false; @@ -49,6 +50,13 @@ export class LfngReviewComponent implements OnInit, OnDestroy { if (appReview) { this.applicationReview = appReview; + this.hasCompletedStepsBeforeResolution = + appReview.isFirstNationGovernment || + (!appReview.isFirstNationGovernment && + appReview.isOCPDesignation !== null && + appReview.isSubjectToZoning !== null && + (appReview.isOCPDesignation === true || appReview.isSubjectToZoning === true)); + this.hasCompletedStepsBeforeDocuments = (appReview.isAuthorized !== null && appReview.isFirstNationGovernment) || (appReview.isAuthorized !== null && diff --git a/services/apps/alcs/src/alcs/application/application.controller.ts b/services/apps/alcs/src/alcs/application/application.controller.ts index 0dc5422c0e..19532b1390 100644 --- a/services/apps/alcs/src/alcs/application/application.controller.ts +++ b/services/apps/alcs/src/alcs/application/application.controller.ts @@ -102,6 +102,7 @@ export class ApplicationController { proposalExpiryDate: formatIncomingDate(updates.proposalExpiryDate), nfuUseSubType: updates.nfuUseSubType, nfuUseType: updates.nfuUseType, + inclExclApplicantType: updates.inclExclApplicantType, staffObservations: updates.staffObservations, }, ); diff --git a/services/apps/alcs/src/alcs/application/application.dto.ts b/services/apps/alcs/src/alcs/application/application.dto.ts index e836e2a8fc..c756dda3c2 100644 --- a/services/apps/alcs/src/alcs/application/application.dto.ts +++ b/services/apps/alcs/src/alcs/application/application.dto.ts @@ -147,6 +147,10 @@ export class UpdateApplicationDto { @IsString() nfuUseSubType?: string; + @IsOptional() + @IsString() + inclExclApplicantType?: string; + @IsOptional() @IsNumber() proposalEndDate?: number; @@ -245,6 +249,9 @@ export class ApplicationDto { @AutoMap(() => String) nfuUseSubType?: string; + @AutoMap(() => String) + inclExclApplicantType?: string; + proposalEndDate?: number; proposalExpiryDate?: number; } @@ -271,6 +278,7 @@ export class ApplicationUpdateServiceDto { agCapConsultant?: string; nfuUseType?: string; nfuUseSubType?: string; + inclExclApplicantType?: string; proposalEndDate?: Date | null; proposalExpiryDate?: Date | null; staffObservations?: string | null; diff --git a/services/apps/alcs/src/alcs/application/application.entity.ts b/services/apps/alcs/src/alcs/application/application.entity.ts index ffe1c314c2..9955871366 100644 --- a/services/apps/alcs/src/alcs/application/application.entity.ts +++ b/services/apps/alcs/src/alcs/application/application.entity.ts @@ -226,6 +226,14 @@ export class Application extends Base { }) nfuUseSubType?: string | null; + @AutoMap(() => String) + @Column({ + type: 'text', + comment: 'Inclusion Exclusion Applicant Type', + nullable: true, + }) + inclExclApplicantType?: string | null; + @Column({ type: 'timestamptz', comment: 'The date at which the proposal use ends', diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1690485189579-add_incl_excl_applicant_type_to_application.ts b/services/apps/alcs/src/providers/typeorm/migrations/1690485189579-add_incl_excl_applicant_type_to_application.ts new file mode 100644 index 0000000000..7fce8cd0ea --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1690485189579-add_incl_excl_applicant_type_to_application.ts @@ -0,0 +1,23 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class addInclExclApplicantTypeToApplication1690485189579 + implements MigrationInterface +{ + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `ALTER TABLE "alcs"."application" ADD "incl_excl_applicant_type" text`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."application"."incl_excl_applicant_type" IS 'Inclusion Exclusion Applicant Type'`, + ); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."application"."incl_excl_applicant_type" IS 'Inclusion Exclusion Applicant Type'`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application" DROP COLUMN "incl_excl_applicant_type"`, + ); + } +} From e4eba8eb067c0d55863fa8b2086011448c9360df Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Thu, 27 Jul 2023 15:55:44 -0700 Subject: [PATCH 158/954] Load the full type and set it instead of just code * Setting just the code will not trump the actual value so saving a changed code doe not work --- .../application-decision-condition.service.spec.ts | 9 +++++++++ .../application-decision-condition.service.ts | 12 +++++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-condition/application-decision-condition.service.spec.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-condition/application-decision-condition.service.spec.ts index 63b309e1d4..e1df986106 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-condition/application-decision-condition.service.spec.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-condition/application-decision-condition.service.spec.ts @@ -2,6 +2,7 @@ import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; +import { ApplicationDecisionConditionType } from './application-decision-condition-code.entity'; import { UpdateApplicationDecisionConditionDto } from './application-decision-condition.dto'; import { ApplicationDecisionCondition } from './application-decision-condition.entity'; import { ApplicationDecisionConditionService } from './application-decision-condition.service'; @@ -11,9 +12,13 @@ describe('ApplicationDecisionConditionService', () => { let mockApplicationDecisionConditionRepository: DeepMocked< Repository >; + let mockAppDecCondTypeRepository: DeepMocked< + Repository + >; beforeEach(async () => { mockApplicationDecisionConditionRepository = createMock(); + mockAppDecCondTypeRepository = createMock(); const module: TestingModule = await Test.createTestingModule({ providers: [ @@ -22,6 +27,10 @@ describe('ApplicationDecisionConditionService', () => { provide: getRepositoryToken(ApplicationDecisionCondition), useValue: mockApplicationDecisionConditionRepository, }, + { + provide: getRepositoryToken(ApplicationDecisionConditionType), + useValue: mockAppDecCondTypeRepository, + }, ], }).compile(); diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-condition/application-decision-condition.service.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-condition/application-decision-condition.service.ts index 7c71d98fed..ad9698e8a8 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-condition/application-decision-condition.service.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-condition/application-decision-condition.service.ts @@ -3,6 +3,7 @@ import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { ServiceValidationException } from '../../../../../../libs/common/src/exceptions/base.exception'; import { ApplicationDecisionComponent } from '../application-decision-v2/application-decision/component/application-decision-component.entity'; +import { ApplicationDecisionConditionType } from './application-decision-condition-code.entity'; import { UpdateApplicationDecisionConditionDto, UpdateApplicationDecisionConditionServiceDto, @@ -14,6 +15,8 @@ export class ApplicationDecisionConditionService { constructor( @InjectRepository(ApplicationDecisionCondition) private repository: Repository, + @InjectRepository(ApplicationDecisionConditionType) + private typeRepository: Repository, ) {} async getOneOrFail(uuid: string) { @@ -41,7 +44,14 @@ export class ApplicationDecisionConditionService { } else { condition = new ApplicationDecisionCondition(); } - condition.typeCode = updateDto.type?.code ?? null; + if (updateDto.type?.code) { + condition.type = await this.typeRepository.findOneOrFail({ + where: { + code: updateDto.type.code, + }, + }); + } + condition.administrativeFee = updateDto.administrativeFee ?? null; condition.description = updateDto.description ?? null; condition.securityAmount = updateDto.securityAmount ?? null; From 73eb6835a312bd5245247bc7f390ca6363c4dd02 Mon Sep 17 00:00:00 2001 From: Liam Stoddard Date: Fri, 28 Jul 2023 09:48:03 -0700 Subject: [PATCH 159/954] trying to fix git issues --- bin/migrate-oats-data/noi/noi.py | 54 +------------------------------- 1 file changed, 1 insertion(+), 53 deletions(-) diff --git a/bin/migrate-oats-data/noi/noi.py b/bin/migrate-oats-data/noi/noi.py index 16170c3623..8084020e21 100644 --- a/bin/migrate-oats-data/noi/noi.py +++ b/bin/migrate-oats-data/noi/noi.py @@ -69,56 +69,4 @@ def process_nois(conn=None, batch_size=10000): print("Total amount of successful inserts:", successful_inserts_count) - print("Total failed inserts:", failed_inserts) - -def applicant_lookup(): - query = """ - SELECT DISTINCT - oaap.alr_application_id AS application_id, - string_agg (DISTINCT oo.organization_name, ', ') FILTER ( - WHERE - oo.organization_name IS NOT NULL - ) AS orgs, - string_agg ( - DISTINCT concat (op.first_name || ' ' || op.last_name), - ', ' - ) FILTER ( - WHERE - op.last_name IS NOT NULL - OR op.first_name IS NOT NULL - ) AS persons - FROM - oats.oats_alr_application_parties oaap - LEFT JOIN oats.oats_person_organizations opo ON oaap.person_organization_id = opo.person_organization_id - LEFT JOIN oats.oats_persons op ON op.person_id = opo.person_id - LEFT JOIN oats.oats_organizations oo ON opo.organization_id = oo.organization_id - WHERE - oaap.alr_appl_role_code = 'APPL' - GROUP BY - oaap.alr_application_id - """ - return query - -def oats_gov(): - query = """ - SELECT - oaap.alr_application_id AS application_id, - oo.organization_name AS oats_gov_name - FROM - oats.oats_alr_application_parties oaap - JOIN oats.oats_person_organizations opo ON oaap.person_organization_id = opo.person_organization_id - JOIN oats.oats_organizations oo ON opo.organization_id = oo.organization_id - WHERE - oo.organization_type_cd IN ('MUNI','FN','RD') - """ - return query - -def alcs_gov(): - query = """ - SELECT - oats_gov.application_id AS application_id, - alg.uuid AS gov_uuid - FROM - oats_gov - JOIN alcs.application_local_government alg on oats_gov.oats_gov_name = alg."name" - """ \ No newline at end of file + print("Total failed inserts:", failed_inserts) \ No newline at end of file From 83d77aeb8e13084185203ff26c3d7b87d64e5ade Mon Sep 17 00:00:00 2001 From: Liam Stoddard Date: Fri, 28 Jul 2023 09:48:03 -0700 Subject: [PATCH 160/954] sql complete --- bin/migrate-oats-data/noi/noi.py | 6 +-- bin/migrate-oats-data/noi/sql/insert_noi.sql | 41 +++++++++++-------- .../noi/sql/insert_noi_count.sql | 21 +++++++--- 3 files changed, 41 insertions(+), 27 deletions(-) diff --git a/bin/migrate-oats-data/noi/noi.py b/bin/migrate-oats-data/noi/noi.py index 8084020e21..da82b8aa86 100644 --- a/bin/migrate-oats-data/noi/noi.py +++ b/bin/migrate-oats-data/noi/noi.py @@ -2,16 +2,14 @@ def noi_insert_query(number_of_rows_to_insert): nois_to_insert = ",".join(["%s"] * number_of_rows_to_insert) - # need to update for noi's return f""" - INSERT INTO alcs.notice_of_intent (file_number, summary, + INSERT INTO alcs.notice_of_intent (file_number, applicant, region_code, local_government_uuid, audit_created_by) VALUES{nois_to_insert} ON CONFLICT (file_number) DO UPDATE SET file_number = EXCLUDED.file_number, - type_code = EXCLUDED.type_code, - summary = EXCLUDED.summary, + applicant = EXCLUDED.applicant, region_code = EXCLUDED.region_code, local_government_uuid = EXCLUDED.local_government_uuid, audit_created_by = EXCLUDED.audit_created_by diff --git a/bin/migrate-oats-data/noi/sql/insert_noi.sql b/bin/migrate-oats-data/noi/sql/insert_noi.sql index 6074746059..a53ecca430 100644 --- a/bin/migrate-oats-data/noi/sql/insert_noi.sql +++ b/bin/migrate-oats-data/noi/sql/insert_noi.sql @@ -127,24 +127,29 @@ WITH WHERE oo2.organization_type_cd = 'PANEL' OR oo3.organization_type_cd = 'PANEL' - ), - -- Step 4: Perform lookup to retrieve type code - application_type_lookup AS ( - SELECT - oaac.alr_application_id AS application_id, - oacc."description" AS "description", - oaac.alr_change_code AS code - FROM - oats.oats_alr_appl_components AS oaac - JOIN oats.oats_alr_change_codes oacc ON oaac.alr_change_code = oacc.alr_change_code - LEFT JOIN oats.alcs_etl_application_exclude aee ON oaac.alr_appl_component_id = aee.component_id - WHERE - aee.component_id IS NULL ) SELECT - oaa.alr_application_id, - oaac.alr_change_code + ng.noi_application_id :: text AS file_number, + CASE + WHEN applicant_lookup.orgs IS NOT NULL THEN applicant_lookup.orgs + WHEN applicant_lookup.persons IS NOT NULL THEN applicant_lookup.persons + ELSE 'Unknown' + END AS applicant, + ar.code AS region_code, + alcs_gov.gov_uuid AS local_government_uuid, + 'oats_etl' AS audit_created_by FROM - noi_grouped noi - JOIN oats.oats_alr_appl_components oaac ON oaac.alr_application_id = noi.alr_application_id - JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = noi.alr_application_id \ No newline at end of file + noi_grouped AS ng + -- JOIN oats.alcs_etl_application_duplicate AS ae ON oa.alr_application_id = ae.application_id + -- AND ae.duplicated IS false + LEFT JOIN applicant_lookup ON ng.noi_application_id = applicant_lookup.application_id + LEFT JOIN panel_lookup ON ng.noi_application_id = panel_lookup.application_id + LEFT JOIN alcs.application_region ar ON panel_lookup.panel_region = ar."label" + LEFT JOIN alcs_gov ON ng.noi_application_id = alcs_gov.application_id + -- SELECT + -- oaa.alr_application_id, + -- oaac.alr_change_code + -- FROM + -- noi_grouped noi + -- JOIN oats.oats_alr_appl_components oaac ON oaac.alr_application_id = noi.alr_application_id + -- JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = noi.alr_application_id \ No newline at end of file diff --git a/bin/migrate-oats-data/noi/sql/insert_noi_count.sql b/bin/migrate-oats-data/noi/sql/insert_noi_count.sql index 3d98e1766b..0081cc65ca 100644 --- a/bin/migrate-oats-data/noi/sql/insert_noi_count.sql +++ b/bin/migrate-oats-data/noi/sql/insert_noi_count.sql @@ -1,7 +1,18 @@ +WITH + noi_grouped AS ( + SELECT + oaac.alr_application_id as noi_application_id + FROM + oats.oats_alr_appl_components oaac + JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id + WHERE + oaa.application_class_code IN ('NOI') + GROUP BY + oaac.alr_application_id + HAVING + count(oaac.alr_application_id) < 2 -- ignore all applications wit multiple components + ) SELECT count(*) -From - oats.oats_alr_applications AS oa - -- JOIN oats.alcs_etl_application_duplicate AS ae ON oa.alr_application_id = ae.application_id AND ae.duplicated IS false -WHERE - oa.application_class_code \ No newline at end of file +FROM + noi_grouped ng \ No newline at end of file From bb7eed85791678129ef7c8ad90405e9b0d5dce3e Mon Sep 17 00:00:00 2001 From: Liam Stoddard Date: Wed, 26 Jul 2023 14:10:24 -0700 Subject: [PATCH 161/954] noi files --- bin/migrate-oats-data/noi/__init__.py | 0 bin/migrate-oats-data/noi/noi.py | 72 +++++++++++++++++++ bin/migrate-oats-data/noi/sql/insert_noi.sql | 26 +++++++ .../noi/sql/insert_noi_count.sql | 7 ++ 4 files changed, 105 insertions(+) create mode 100644 bin/migrate-oats-data/noi/__init__.py create mode 100644 bin/migrate-oats-data/noi/noi.py create mode 100644 bin/migrate-oats-data/noi/sql/insert_noi.sql create mode 100644 bin/migrate-oats-data/noi/sql/insert_noi_count.sql diff --git a/bin/migrate-oats-data/noi/__init__.py b/bin/migrate-oats-data/noi/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/bin/migrate-oats-data/noi/noi.py b/bin/migrate-oats-data/noi/noi.py new file mode 100644 index 0000000000..2d3d291e94 --- /dev/null +++ b/bin/migrate-oats-data/noi/noi.py @@ -0,0 +1,72 @@ +from db import inject_conn_pool + +def noi_insert_query(number_of_rows_to_insert): + nois_to_insert = ",".join(["%s"] * number_of_rows_to_insert) + # need to update for noi's + return f""" + INSERT INTO alcs.notice_of_intent (file_number, summary, + applicant, region_code, local_government_uuid, audit_created_by) + + VALUES{nois_to_insert} + ON CONFLICT (file_number) DO UPDATE SET + file_number = EXCLUDED.file_number, + type_code = EXCLUDED.type_code, + summary = EXCLUDED.summary, + region_code = EXCLUDED.region_code, + local_government_uuid = EXCLUDED.local_government_uuid, + audit_created_by = EXCLUDED.audit_created_by + """ + +@inject_conn_pool +def process_nois(conn=None, batch_size=10000): + with conn.cursor() as cursor: + + with open( + "sql/insert_noi_count.sql", "r", encoding="utf-8" + ) as sql_file: + count_query = sql_file.read() + cursor.execute(count_query) + count_total = cursor.fetchone()[0] + print("- Applications to insert: ", count_total) + + failed_inserts = 0 + successful_inserts_count = 0 + last_application_id = 0 + + with open("sql/insert-batch-application.sql", "r", encoding="utf-8") as sql_file: + application_sql = sql_file.read() + while True: + cursor.execute( + f"{application_sql} WHERE ae.application_id > {last_application_id} ORDER by ae.application_id;" + ) + + rows = cursor.fetchmany(batch_size) + if not rows: + break + try: + applications_to_be_inserted_count = len(rows) + + insert_query = compile_application_insert_query( + applications_to_be_inserted_count + ) + cursor.execute(insert_query, rows) + conn.commit() + + last_application_id = rows[-1][0] + successful_inserts_count = ( + successful_inserts_count + applications_to_be_inserted_count + ) + + print( + f"retrieved/inserted items count: {applications_to_be_inserted_count}; total successfully inserted/updated applications so far {successful_inserts_count}; last inserted applidation_id: {last_application_id}" + + ) + except Exception as e: + conn.rollback() + print("Error", e) + failed_inserts = count_total - successful_inserts_count + last_application_id = last_application_id +1 + + + print("Total amount of successful inserts:", successful_inserts_count) + print("Total failed inserts:", failed_inserts) \ No newline at end of file diff --git a/bin/migrate-oats-data/noi/sql/insert_noi.sql b/bin/migrate-oats-data/noi/sql/insert_noi.sql new file mode 100644 index 0000000000..5022345d80 --- /dev/null +++ b/bin/migrate-oats-data/noi/sql/insert_noi.sql @@ -0,0 +1,26 @@ +WITH + applicant_lookup AS ( + SELECT DISTINCT + oaap.alr_application_id AS application_id, + string_agg (DISTINCT oo.organization_name, ', ') FILTER ( + WHERE + oo.organization_name IS NOT NULL + ) AS orgs, + string_agg ( + DISTINCT concat (op.first_name || ' ' || op.last_name), + ', ' + ) FILTER ( + WHERE + op.last_name IS NOT NULL + OR op.first_name IS NOT NULL + ) AS persons + FROM + oats.oats_alr_application_parties oaap + LEFT JOIN oats.oats_person_organizations opo ON oaap.person_organization_id = opo.person_organization_id + LEFT JOIN oats.oats_persons op ON op.person_id = opo.person_id + LEFT JOIN oats.oats_organizations oo ON opo.organization_id = oo.organization_id + WHERE + oaap.alr_appl_role_code = 'APPL' + GROUP BY + oaap.alr_application_id + ), \ No newline at end of file diff --git a/bin/migrate-oats-data/noi/sql/insert_noi_count.sql b/bin/migrate-oats-data/noi/sql/insert_noi_count.sql new file mode 100644 index 0000000000..3d98e1766b --- /dev/null +++ b/bin/migrate-oats-data/noi/sql/insert_noi_count.sql @@ -0,0 +1,7 @@ +SELECT + count(*) +From + oats.oats_alr_applications AS oa + -- JOIN oats.alcs_etl_application_duplicate AS ae ON oa.alr_application_id = ae.application_id AND ae.duplicated IS false +WHERE + oa.application_class_code \ No newline at end of file From bee19699e74e7c9a4717106258f323fa1101e78b Mon Sep 17 00:00:00 2001 From: Liam Stoddard Date: Wed, 26 Jul 2023 14:22:25 -0700 Subject: [PATCH 162/954] ignoring NOIs --- bin/migrate-oats-data/applications/base_applications.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/migrate-oats-data/applications/base_applications.py b/bin/migrate-oats-data/applications/base_applications.py index f0ca30ec7c..a8b93f4222 100644 --- a/bin/migrate-oats-data/applications/base_applications.py +++ b/bin/migrate-oats-data/applications/base_applications.py @@ -73,7 +73,7 @@ def process_applications(conn=None, batch_size=10000): application_sql = sql_file.read() while True: cursor.execute( - f"{application_sql} WHERE ae.application_id > {last_application_id} ORDER by ae.application_id;" + f"{application_sql} WHERE ae.application_id > {last_application_id} AND oa.application_class_code <> 'NOI' ORDER by ae.application_id;" ) rows = cursor.fetchmany(batch_size) From b8a960e1c917358062199b5d8fba9abd9e6adc9c Mon Sep 17 00:00:00 2001 From: Liam Stoddard Date: Wed, 26 Jul 2023 15:44:55 -0700 Subject: [PATCH 163/954] updated to only catch LOA and BLK --- bin/migrate-oats-data/applications/base_applications.py | 2 +- .../applications/sql/insert_batch_application_count.sql | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/bin/migrate-oats-data/applications/base_applications.py b/bin/migrate-oats-data/applications/base_applications.py index a8b93f4222..4d5be73c85 100644 --- a/bin/migrate-oats-data/applications/base_applications.py +++ b/bin/migrate-oats-data/applications/base_applications.py @@ -73,7 +73,7 @@ def process_applications(conn=None, batch_size=10000): application_sql = sql_file.read() while True: cursor.execute( - f"{application_sql} WHERE ae.application_id > {last_application_id} AND oa.application_class_code <> 'NOI' ORDER by ae.application_id;" + f"{application_sql} WHERE ae.application_id > {last_application_id} AND (oa.application_class_code = 'LOA' OR oa.application_class_code = 'BLK') ORDER by ae.application_id;" ) rows = cursor.fetchmany(batch_size) diff --git a/bin/migrate-oats-data/applications/sql/insert_batch_application_count.sql b/bin/migrate-oats-data/applications/sql/insert_batch_application_count.sql index 8b03c80863..a6e4a047f4 100644 --- a/bin/migrate-oats-data/applications/sql/insert_batch_application_count.sql +++ b/bin/migrate-oats-data/applications/sql/insert_batch_application_count.sql @@ -1,7 +1,9 @@ - SELECT count(*) From oats.oats_alr_applications AS oa - JOIN oats.alcs_etl_application_duplicate AS ae ON oa.alr_application_id = ae.application_id AND ae.duplicated IS false - \ No newline at end of file + JOIN oats.alcs_etl_application_duplicate AS ae ON oa.alr_application_id = ae.application_id + AND ae.duplicated IS false +WHERE + oa.application_class_code = 'LOA' + OR oa.application_class_code = 'BLK' \ No newline at end of file From 5c17171bd1d07bac4084dd160031e73c6ba66e42 Mon Sep 17 00:00:00 2001 From: Liam Stoddard Date: Thu, 27 Jul 2023 09:22:14 -0700 Subject: [PATCH 164/954] adding wip changes --- bin/migrate-oats-data/noi/noi.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/migrate-oats-data/noi/noi.py b/bin/migrate-oats-data/noi/noi.py index 2d3d291e94..8084020e21 100644 --- a/bin/migrate-oats-data/noi/noi.py +++ b/bin/migrate-oats-data/noi/noi.py @@ -46,7 +46,7 @@ def process_nois(conn=None, batch_size=10000): try: applications_to_be_inserted_count = len(rows) - insert_query = compile_application_insert_query( + insert_query = noi_insert_query( applications_to_be_inserted_count ) cursor.execute(insert_query, rows) From 84b14302a052bf95e930020715587fce16f62e89 Mon Sep 17 00:00:00 2001 From: Liam Stoddard Date: Fri, 28 Jul 2023 09:21:53 -0700 Subject: [PATCH 165/954] commit python changes --- .../applications/noi_temp.py | 4 ++ bin/migrate-oats-data/noi/noi.py | 54 ++++++++++++++++++- bin/migrate-oats-data/noi/sql/insert_noi.sql | 39 ++++++-------- 3 files changed, 74 insertions(+), 23 deletions(-) create mode 100644 bin/migrate-oats-data/applications/noi_temp.py diff --git a/bin/migrate-oats-data/applications/noi_temp.py b/bin/migrate-oats-data/applications/noi_temp.py new file mode 100644 index 0000000000..d114d3333b --- /dev/null +++ b/bin/migrate-oats-data/applications/noi_temp.py @@ -0,0 +1,4 @@ + +LG_DICT = [ {"key" : 'Islands Trust Gabriola Island', "value" : 'Islands Trust Gabriola Island (Historical)'}, + {"key" : 'Islands Trust Galiano Island', "value" : 'Islands Trust Galiano Island (Historical)'}, + {"key" : 'Islands Trust Gambier Island', "value" : 'Islands Trust Gambier Island (Historical)'}] \ No newline at end of file diff --git a/bin/migrate-oats-data/noi/noi.py b/bin/migrate-oats-data/noi/noi.py index 8084020e21..16170c3623 100644 --- a/bin/migrate-oats-data/noi/noi.py +++ b/bin/migrate-oats-data/noi/noi.py @@ -69,4 +69,56 @@ def process_nois(conn=None, batch_size=10000): print("Total amount of successful inserts:", successful_inserts_count) - print("Total failed inserts:", failed_inserts) \ No newline at end of file + print("Total failed inserts:", failed_inserts) + +def applicant_lookup(): + query = """ + SELECT DISTINCT + oaap.alr_application_id AS application_id, + string_agg (DISTINCT oo.organization_name, ', ') FILTER ( + WHERE + oo.organization_name IS NOT NULL + ) AS orgs, + string_agg ( + DISTINCT concat (op.first_name || ' ' || op.last_name), + ', ' + ) FILTER ( + WHERE + op.last_name IS NOT NULL + OR op.first_name IS NOT NULL + ) AS persons + FROM + oats.oats_alr_application_parties oaap + LEFT JOIN oats.oats_person_organizations opo ON oaap.person_organization_id = opo.person_organization_id + LEFT JOIN oats.oats_persons op ON op.person_id = opo.person_id + LEFT JOIN oats.oats_organizations oo ON opo.organization_id = oo.organization_id + WHERE + oaap.alr_appl_role_code = 'APPL' + GROUP BY + oaap.alr_application_id + """ + return query + +def oats_gov(): + query = """ + SELECT + oaap.alr_application_id AS application_id, + oo.organization_name AS oats_gov_name + FROM + oats.oats_alr_application_parties oaap + JOIN oats.oats_person_organizations opo ON oaap.person_organization_id = opo.person_organization_id + JOIN oats.oats_organizations oo ON opo.organization_id = oo.organization_id + WHERE + oo.organization_type_cd IN ('MUNI','FN','RD') + """ + return query + +def alcs_gov(): + query = """ + SELECT + oats_gov.application_id AS application_id, + alg.uuid AS gov_uuid + FROM + oats_gov + JOIN alcs.application_local_government alg on oats_gov.oats_gov_name = alg."name" + """ \ No newline at end of file diff --git a/bin/migrate-oats-data/noi/sql/insert_noi.sql b/bin/migrate-oats-data/noi/sql/insert_noi.sql index 5022345d80..7644a2347d 100644 --- a/bin/migrate-oats-data/noi/sql/insert_noi.sql +++ b/bin/migrate-oats-data/noi/sql/insert_noi.sql @@ -1,26 +1,21 @@ WITH - applicant_lookup AS ( - SELECT DISTINCT - oaap.alr_application_id AS application_id, - string_agg (DISTINCT oo.organization_name, ', ') FILTER ( - WHERE - oo.organization_name IS NOT NULL - ) AS orgs, - string_agg ( - DISTINCT concat (op.first_name || ' ' || op.last_name), - ', ' - ) FILTER ( - WHERE - op.last_name IS NOT NULL - OR op.first_name IS NOT NULL - ) AS persons + noi_grouped AS ( + SELECT + oaac.alr_application_id FROM - oats.oats_alr_application_parties oaap - LEFT JOIN oats.oats_person_organizations opo ON oaap.person_organization_id = opo.person_organization_id - LEFT JOIN oats.oats_persons op ON op.person_id = opo.person_id - LEFT JOIN oats.oats_organizations oo ON opo.organization_id = oo.organization_id + oats.oats_alr_appl_components oaac + JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id WHERE - oaap.alr_appl_role_code = 'APPL' + oaa.application_class_code IN ('NOI') GROUP BY - oaap.alr_application_id - ), \ No newline at end of file + oaac.alr_application_id + HAVING + count(oaac.alr_application_id) < 2 -- ignore all applications wit multiple components + ) +SELECT + oaa.alr_application_id, + oaac.alr_change_code +FROM + noi_grouped noi + JOIN oats.oats_alr_appl_components oaac ON oaac.alr_application_id = noi.alr_application_id + JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = noi.alr_application_id \ No newline at end of file From a419215112825debfb818323506f7d6484317056 Mon Sep 17 00:00:00 2001 From: Liam Stoddard Date: Fri, 28 Jul 2023 09:43:07 -0700 Subject: [PATCH 166/954] starting sql implementation --- bin/migrate-oats-data/noi/sql/insert_noi.sql | 131 ++++++++++++++++++- 1 file changed, 130 insertions(+), 1 deletion(-) diff --git a/bin/migrate-oats-data/noi/sql/insert_noi.sql b/bin/migrate-oats-data/noi/sql/insert_noi.sql index 7644a2347d..6074746059 100644 --- a/bin/migrate-oats-data/noi/sql/insert_noi.sql +++ b/bin/migrate-oats-data/noi/sql/insert_noi.sql @@ -1,7 +1,7 @@ WITH noi_grouped AS ( SELECT - oaac.alr_application_id + oaac.alr_application_id as noi_application_id FROM oats.oats_alr_appl_components oaac JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id @@ -11,6 +11,135 @@ WITH oaac.alr_application_id HAVING count(oaac.alr_application_id) < 2 -- ignore all applications wit multiple components + ), + applicant_lookup AS ( + SELECT DISTINCT + oaap.alr_application_id AS application_id, + string_agg (DISTINCT oo.organization_name, ', ') FILTER ( + WHERE + oo.organization_name IS NOT NULL + ) AS orgs, + string_agg ( + DISTINCT concat (op.first_name || ' ' || op.last_name), + ', ' + ) FILTER ( + WHERE + op.last_name IS NOT NULL + OR op.first_name IS NOT NULL + ) AS persons + FROM + oats.oats_alr_application_parties oaap + LEFT JOIN oats.oats_person_organizations opo ON oaap.person_organization_id = opo.person_organization_id + LEFT JOIN oats.oats_persons op ON op.person_id = opo.person_id + LEFT JOIN oats.oats_organizations oo ON opo.organization_id = oo.organization_id + WHERE + oaap.alr_appl_role_code = 'APPL' + GROUP BY + oaap.alr_application_id + ), + -- Step 2: get local gov application name & match to uuid + oats_gov AS ( + SELECT + oaap.alr_application_id AS application_id, + oo.organization_name AS oats_gov_name + FROM + oats.oats_alr_application_parties oaap + JOIN oats.oats_person_organizations opo ON oaap.person_organization_id = opo.person_organization_id + JOIN oats.oats_organizations oo ON opo.organization_id = oo.organization_id + WHERE + oo.organization_type_cd IN ('MUNI', 'FN', 'RD') + ), + alcs_gov AS ( + SELECT + oats_gov.application_id AS application_id, + alg.uuid AS gov_uuid + FROM + oats_gov + JOIN alcs.application_local_government alg on ( + CASE + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Gabriola Island' THEN 'Islands Trust Gabriola Island (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Galiano Island' THEN 'Islands Trust Galiano Island (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Gambier Island' THEN 'Islands Trust Gambier Island (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Hornby Island' THEN 'Islands Trust Hornby Island (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Lasqueti Island' THEN 'Islands Trust Lasqueti Island (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Mayne Island' THEN 'Islands Trust Mayne Island (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Pender Island' THEN 'Islands Trust Pender Island (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Quadra Island' THEN 'Islands Trust Quadra Island (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Salt Spring Island' THEN 'Islands Trust Salt Spring Island (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Saturna Island' THEN 'Islands Trust Saturna Island (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Sidney Island' THEN 'Islands Trust Sidney Island (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust- Comox Strathcona' THEN 'Islands Trust Comox Strathcona (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust- Nanaimo' THEN 'Islands Trust Nanaimo (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust-Capital' THEN 'Islands Trust Capital (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust-Powell River' THEN 'Islands Trust Powell River (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust-Sunshine Coast' THEN 'Islands Trust Sunshine Coast (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Bowen Island' THEN 'Bowen Island (Island Municipality)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Denman Island' THEN 'Islands Trust Denman Island (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust - Cowichan Valley' THEN 'Islands Trust Cowichan Valley (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Northern Rockies' THEN 'Northern Rockies (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Sliammon%' THEN 'Tla''amin Nation' + WHEN oats_gov.oats_gov_name LIKE 'Thompson Nicola%' THEN 'Thompson Nicola Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Cariboo%' THEN 'Cariboo Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Fraser Valley%' THEN 'Fraser Valley Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Columbia Shuswap%' THEN 'Columbia Shuswap Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Central Okanagan%' THEN 'Central Okanagan Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Squamish Lillooet%' THEN 'Squamish Lillooet Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Alberni-Clayoquot%' THEN 'Alberni-Clayoquot Regional District' + WHEN oats_gov.oats_gov_name LIKE 'qathet%' THEN 'qathet Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Peace River%' THEN 'Peace River Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Okanagan Similkameen%' THEN 'Okanagan Similkameen Regional District' + WHEN oats_gov.oats_gov_name LIKE 'East Kootenay%' THEN 'East Kootenay Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Bulkley-Nechako%' THEN 'Bulkley-Nechako Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Sunshine Coast%' THEN 'Sunshine Coast Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Nanaimo%' THEN 'Nanaimo Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Kitimat Stikine%' THEN 'Kitimat Stikine Regional District' + WHEN oats_gov.oats_gov_name LIKE 'North Okanagan%' THEN 'North Okanagan Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Fraser Fort George%' THEN 'Fraser Fort George Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Cowichan Valley%' THEN 'Cowichan Valley Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Kootenay Boundary%' THEN 'Kootenay Boundary Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Comox Valley%' THEN 'Comox Valley Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Central Kootenay%' THEN 'Central Kootenay Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Capital%' THEN 'Capital Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Metro Vancouver%' THEN 'Metro Vancouver Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Central Coast%' THEN 'Central Coast Regional District' + WHEN oats_gov.oats_gov_name LIKE 'North Coast%' THEN 'North Coast Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Strathcona%' THEN 'Strathcona Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Mount Waddington%' THEN 'Mount Waddington Regional District' + ELSE oats_gov.oats_gov_name + END + ) = alg."name" + ), + -- Step 3: Perform a lookup to retrieve the region code for each application ID + panel_lookup AS ( + SELECT DISTINCT + oaap.alr_application_id AS application_id, + CASE + WHEN oo2.parent_organization_id IS NULL THEN oo2.organization_name + WHEN oo3.parent_organization_id IS NULL THEN oo3.organization_name + ELSE 'NONE' + END AS panel_region + FROM + oats.oats_alr_application_parties oaap + JOIN oats.oats_person_organizations opo ON oaap.person_organization_id = opo.person_organization_id + JOIN oats.oats_organizations oo ON opo.organization_id = oo.organization_id + LEFT JOIN oats.oats_organizations oo2 ON oo.parent_organization_id = oo2.organization_id + LEFT JOIN oats.oats_organizations oo3 ON oo2.parent_organization_id = oo3.organization_id + WHERE + oo2.organization_type_cd = 'PANEL' + OR oo3.organization_type_cd = 'PANEL' + ), + -- Step 4: Perform lookup to retrieve type code + application_type_lookup AS ( + SELECT + oaac.alr_application_id AS application_id, + oacc."description" AS "description", + oaac.alr_change_code AS code + FROM + oats.oats_alr_appl_components AS oaac + JOIN oats.oats_alr_change_codes oacc ON oaac.alr_change_code = oacc.alr_change_code + LEFT JOIN oats.alcs_etl_application_exclude aee ON oaac.alr_appl_component_id = aee.component_id + WHERE + aee.component_id IS NULL ) SELECT oaa.alr_application_id, From 44f1266fd732854b24784f76bf073c25e002c151 Mon Sep 17 00:00:00 2001 From: Liam Stoddard Date: Fri, 28 Jul 2023 09:48:03 -0700 Subject: [PATCH 167/954] trying to fix git issues --- bin/migrate-oats-data/noi/noi.py | 54 +------------------------------- 1 file changed, 1 insertion(+), 53 deletions(-) diff --git a/bin/migrate-oats-data/noi/noi.py b/bin/migrate-oats-data/noi/noi.py index 16170c3623..8084020e21 100644 --- a/bin/migrate-oats-data/noi/noi.py +++ b/bin/migrate-oats-data/noi/noi.py @@ -69,56 +69,4 @@ def process_nois(conn=None, batch_size=10000): print("Total amount of successful inserts:", successful_inserts_count) - print("Total failed inserts:", failed_inserts) - -def applicant_lookup(): - query = """ - SELECT DISTINCT - oaap.alr_application_id AS application_id, - string_agg (DISTINCT oo.organization_name, ', ') FILTER ( - WHERE - oo.organization_name IS NOT NULL - ) AS orgs, - string_agg ( - DISTINCT concat (op.first_name || ' ' || op.last_name), - ', ' - ) FILTER ( - WHERE - op.last_name IS NOT NULL - OR op.first_name IS NOT NULL - ) AS persons - FROM - oats.oats_alr_application_parties oaap - LEFT JOIN oats.oats_person_organizations opo ON oaap.person_organization_id = opo.person_organization_id - LEFT JOIN oats.oats_persons op ON op.person_id = opo.person_id - LEFT JOIN oats.oats_organizations oo ON opo.organization_id = oo.organization_id - WHERE - oaap.alr_appl_role_code = 'APPL' - GROUP BY - oaap.alr_application_id - """ - return query - -def oats_gov(): - query = """ - SELECT - oaap.alr_application_id AS application_id, - oo.organization_name AS oats_gov_name - FROM - oats.oats_alr_application_parties oaap - JOIN oats.oats_person_organizations opo ON oaap.person_organization_id = opo.person_organization_id - JOIN oats.oats_organizations oo ON opo.organization_id = oo.organization_id - WHERE - oo.organization_type_cd IN ('MUNI','FN','RD') - """ - return query - -def alcs_gov(): - query = """ - SELECT - oats_gov.application_id AS application_id, - alg.uuid AS gov_uuid - FROM - oats_gov - JOIN alcs.application_local_government alg on oats_gov.oats_gov_name = alg."name" - """ \ No newline at end of file + print("Total failed inserts:", failed_inserts) \ No newline at end of file From b06ddbc797bef47dd9d046068ca9833afc3d7e3c Mon Sep 17 00:00:00 2001 From: Liam Stoddard Date: Fri, 28 Jul 2023 09:48:03 -0700 Subject: [PATCH 168/954] sql complete --- bin/migrate-oats-data/noi/noi.py | 6 +-- bin/migrate-oats-data/noi/sql/insert_noi.sql | 41 +++++++++++-------- .../noi/sql/insert_noi_count.sql | 21 +++++++--- 3 files changed, 41 insertions(+), 27 deletions(-) diff --git a/bin/migrate-oats-data/noi/noi.py b/bin/migrate-oats-data/noi/noi.py index 8084020e21..da82b8aa86 100644 --- a/bin/migrate-oats-data/noi/noi.py +++ b/bin/migrate-oats-data/noi/noi.py @@ -2,16 +2,14 @@ def noi_insert_query(number_of_rows_to_insert): nois_to_insert = ",".join(["%s"] * number_of_rows_to_insert) - # need to update for noi's return f""" - INSERT INTO alcs.notice_of_intent (file_number, summary, + INSERT INTO alcs.notice_of_intent (file_number, applicant, region_code, local_government_uuid, audit_created_by) VALUES{nois_to_insert} ON CONFLICT (file_number) DO UPDATE SET file_number = EXCLUDED.file_number, - type_code = EXCLUDED.type_code, - summary = EXCLUDED.summary, + applicant = EXCLUDED.applicant, region_code = EXCLUDED.region_code, local_government_uuid = EXCLUDED.local_government_uuid, audit_created_by = EXCLUDED.audit_created_by diff --git a/bin/migrate-oats-data/noi/sql/insert_noi.sql b/bin/migrate-oats-data/noi/sql/insert_noi.sql index 6074746059..a53ecca430 100644 --- a/bin/migrate-oats-data/noi/sql/insert_noi.sql +++ b/bin/migrate-oats-data/noi/sql/insert_noi.sql @@ -127,24 +127,29 @@ WITH WHERE oo2.organization_type_cd = 'PANEL' OR oo3.organization_type_cd = 'PANEL' - ), - -- Step 4: Perform lookup to retrieve type code - application_type_lookup AS ( - SELECT - oaac.alr_application_id AS application_id, - oacc."description" AS "description", - oaac.alr_change_code AS code - FROM - oats.oats_alr_appl_components AS oaac - JOIN oats.oats_alr_change_codes oacc ON oaac.alr_change_code = oacc.alr_change_code - LEFT JOIN oats.alcs_etl_application_exclude aee ON oaac.alr_appl_component_id = aee.component_id - WHERE - aee.component_id IS NULL ) SELECT - oaa.alr_application_id, - oaac.alr_change_code + ng.noi_application_id :: text AS file_number, + CASE + WHEN applicant_lookup.orgs IS NOT NULL THEN applicant_lookup.orgs + WHEN applicant_lookup.persons IS NOT NULL THEN applicant_lookup.persons + ELSE 'Unknown' + END AS applicant, + ar.code AS region_code, + alcs_gov.gov_uuid AS local_government_uuid, + 'oats_etl' AS audit_created_by FROM - noi_grouped noi - JOIN oats.oats_alr_appl_components oaac ON oaac.alr_application_id = noi.alr_application_id - JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = noi.alr_application_id \ No newline at end of file + noi_grouped AS ng + -- JOIN oats.alcs_etl_application_duplicate AS ae ON oa.alr_application_id = ae.application_id + -- AND ae.duplicated IS false + LEFT JOIN applicant_lookup ON ng.noi_application_id = applicant_lookup.application_id + LEFT JOIN panel_lookup ON ng.noi_application_id = panel_lookup.application_id + LEFT JOIN alcs.application_region ar ON panel_lookup.panel_region = ar."label" + LEFT JOIN alcs_gov ON ng.noi_application_id = alcs_gov.application_id + -- SELECT + -- oaa.alr_application_id, + -- oaac.alr_change_code + -- FROM + -- noi_grouped noi + -- JOIN oats.oats_alr_appl_components oaac ON oaac.alr_application_id = noi.alr_application_id + -- JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = noi.alr_application_id \ No newline at end of file diff --git a/bin/migrate-oats-data/noi/sql/insert_noi_count.sql b/bin/migrate-oats-data/noi/sql/insert_noi_count.sql index 3d98e1766b..0081cc65ca 100644 --- a/bin/migrate-oats-data/noi/sql/insert_noi_count.sql +++ b/bin/migrate-oats-data/noi/sql/insert_noi_count.sql @@ -1,7 +1,18 @@ +WITH + noi_grouped AS ( + SELECT + oaac.alr_application_id as noi_application_id + FROM + oats.oats_alr_appl_components oaac + JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id + WHERE + oaa.application_class_code IN ('NOI') + GROUP BY + oaac.alr_application_id + HAVING + count(oaac.alr_application_id) < 2 -- ignore all applications wit multiple components + ) SELECT count(*) -From - oats.oats_alr_applications AS oa - -- JOIN oats.alcs_etl_application_duplicate AS ae ON oa.alr_application_id = ae.application_id AND ae.duplicated IS false -WHERE - oa.application_class_code \ No newline at end of file +FROM + noi_grouped ng \ No newline at end of file From 8ffb37eef2b26f20029b71b19dcdfeaf791a5b5f Mon Sep 17 00:00:00 2001 From: Liam Stoddard Date: Fri, 28 Jul 2023 10:47:48 -0700 Subject: [PATCH 169/954] noi part implemented --- bin/migrate-oats-data/noi/noi.py | 19 ++++++++++++++----- bin/migrate-oats-data/noi/sql/insert_noi.sql | 9 +-------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/bin/migrate-oats-data/noi/noi.py b/bin/migrate-oats-data/noi/noi.py index da82b8aa86..b03a19a03c 100644 --- a/bin/migrate-oats-data/noi/noi.py +++ b/bin/migrate-oats-data/noi/noi.py @@ -25,17 +25,17 @@ def process_nois(conn=None, batch_size=10000): count_query = sql_file.read() cursor.execute(count_query) count_total = cursor.fetchone()[0] - print("- Applications to insert: ", count_total) + print("- NOIs to insert: ", count_total) failed_inserts = 0 successful_inserts_count = 0 last_application_id = 0 - with open("sql/insert-batch-application.sql", "r", encoding="utf-8") as sql_file: + with open("sql/insert_noi.sql", "r", encoding="utf-8") as sql_file: application_sql = sql_file.read() while True: cursor.execute( - f"{application_sql} WHERE ae.application_id > {last_application_id} ORDER by ae.application_id;" + f"{application_sql} WHERE ng._noi_application_id > {last_application_id} ORDER by ng.noi_application_id;" ) rows = cursor.fetchmany(batch_size) @@ -56,7 +56,7 @@ def process_nois(conn=None, batch_size=10000): ) print( - f"retrieved/inserted items count: {applications_to_be_inserted_count}; total successfully inserted/updated applications so far {successful_inserts_count}; last inserted applidation_id: {last_application_id}" + f"retrieved/inserted items count: {applications_to_be_inserted_count}; total successfully inserted/updated NOIs so far {successful_inserts_count}; last inserted noi_applidation_id: {last_application_id}" ) except Exception as e: @@ -67,4 +67,13 @@ def process_nois(conn=None, batch_size=10000): print("Total amount of successful inserts:", successful_inserts_count) - print("Total failed inserts:", failed_inserts) \ No newline at end of file + print("Total failed inserts:", failed_inserts) + +@inject_conn_pool +def clean_nois(conn=None): + print("Start NOI cleaning") + with conn.cursor() as cursor: + cursor.execute( + "DELETE FROM alcs.notice_of_intent a WHERE a.audit_created_by = 'oats_etl'" + ) + print(f"Deleted items count = {cursor.rowcount}") \ No newline at end of file diff --git a/bin/migrate-oats-data/noi/sql/insert_noi.sql b/bin/migrate-oats-data/noi/sql/insert_noi.sql index a53ecca430..ce3dab4c03 100644 --- a/bin/migrate-oats-data/noi/sql/insert_noi.sql +++ b/bin/migrate-oats-data/noi/sql/insert_noi.sql @@ -145,11 +145,4 @@ FROM LEFT JOIN applicant_lookup ON ng.noi_application_id = applicant_lookup.application_id LEFT JOIN panel_lookup ON ng.noi_application_id = panel_lookup.application_id LEFT JOIN alcs.application_region ar ON panel_lookup.panel_region = ar."label" - LEFT JOIN alcs_gov ON ng.noi_application_id = alcs_gov.application_id - -- SELECT - -- oaa.alr_application_id, - -- oaac.alr_change_code - -- FROM - -- noi_grouped noi - -- JOIN oats.oats_alr_appl_components oaac ON oaac.alr_application_id = noi.alr_application_id - -- JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = noi.alr_application_id \ No newline at end of file + LEFT JOIN alcs_gov ON ng.noi_application_id = alcs_gov.application_id \ No newline at end of file From d3a1168572a672e9548aabe77e74979fb65ce125 Mon Sep 17 00:00:00 2001 From: Liam Stoddard Date: Fri, 28 Jul 2023 11:00:10 -0700 Subject: [PATCH 170/954] ready to test --- bin/migrate-oats-data/migrate.py | 36 +++++++++++++++++++++++++++ bin/migrate-oats-data/noi/__init__.py | 1 + 2 files changed, 37 insertions(+) diff --git a/bin/migrate-oats-data/migrate.py b/bin/migrate-oats-data/migrate.py index 86e7e4fa8b..79fcd3ab7f 100644 --- a/bin/migrate-oats-data/migrate.py +++ b/bin/migrate-oats-data/migrate.py @@ -13,6 +13,10 @@ clean_applications, process_alcs_application_prep_fields, ) +from noi import ( + process_nois, + clean_nois, +) from constants import BATCH_UPLOAD_SIZE import_batch_size = BATCH_UPLOAD_SIZE @@ -79,6 +83,20 @@ def app_prep_import_command_parser(import_batch_size, subparsers): ) app_prep_import_command.set_defaults(func=import_batch_size) +def noi_import_command_parser(import_batch_size, subparsers): + application_import_command = subparsers.add_parser( + "noi-import", + help=f"Import NOI with specified batch size: (default: {import_batch_size})", + ) + application_import_command.add_argument( + "--batch-size", + type=int, + default=import_batch_size, + metavar="", + help=f"batch size (default: {import_batch_size})", + ) + application_import_command.set_defaults(func=process_applications) + def import_command_parser(subparsers): import_command = subparsers.add_parser( @@ -104,6 +122,7 @@ def setup_menu_args_parser(import_batch_size): document_import_command_parser(import_batch_size, subparsers) application_document_import_command_parser(import_batch_size, subparsers) app_prep_import_command_parser(import_batch_size, subparsers) + noi_import_command_parser(import_batch_size, subparsers) import_command_parser(subparsers) subparsers.add_parser("clean", help="Clean all imported data") @@ -150,6 +169,9 @@ def setup_menu_args_parser(import_batch_size): console.log("Processing application prep:") process_alcs_application_prep_fields(batch_size=import_batch_size) + console.log("Processing NOIs:") + process_nois(batch_size=import_batch_size) + console.log("Done") case "clean": with console.status("[bold green]Cleaning previous ETL...") as status: @@ -159,6 +181,7 @@ def setup_menu_args_parser(import_batch_size): clean_application_documents() clean_documents() clean_applications() + clean_nois() console.log("Done") case "document-import": @@ -198,6 +221,19 @@ def setup_menu_args_parser(import_batch_size): ) process_alcs_application_prep_fields(batch_size=import_batch_size) + case "noi-import": + console.log("Beginning OATS -> ALCS NOI import process") + with console.status( + "[bold green]NOI import (notice_of_intent table update in ALCS)..." + ) as status: + if args.batch_size: + import_batch_size = args.batch_size + + console.log( + f"Processing NOI import in batch size = {import_batch_size}" + ) + + process_nois(batch_size=import_batch_size) finally: if connection_pool: diff --git a/bin/migrate-oats-data/noi/__init__.py b/bin/migrate-oats-data/noi/__init__.py index e69de29bb2..57d7c89a17 100644 --- a/bin/migrate-oats-data/noi/__init__.py +++ b/bin/migrate-oats-data/noi/__init__.py @@ -0,0 +1 @@ +from .noi import * \ No newline at end of file From 6bbb7357770fefcfb0ac49de5059439a61c0fe93 Mon Sep 17 00:00:00 2001 From: Liam Stoddard Date: Fri, 28 Jul 2023 11:32:20 -0700 Subject: [PATCH 171/954] nois importing --- bin/migrate-oats-data/noi/noi.py | 6 +++--- bin/migrate-oats-data/noi/sql/insert_noi.sql | 5 ++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/bin/migrate-oats-data/noi/noi.py b/bin/migrate-oats-data/noi/noi.py index b03a19a03c..c7ce704e89 100644 --- a/bin/migrate-oats-data/noi/noi.py +++ b/bin/migrate-oats-data/noi/noi.py @@ -20,7 +20,7 @@ def process_nois(conn=None, batch_size=10000): with conn.cursor() as cursor: with open( - "sql/insert_noi_count.sql", "r", encoding="utf-8" + "noi/sql/insert_noi_count.sql", "r", encoding="utf-8" ) as sql_file: count_query = sql_file.read() cursor.execute(count_query) @@ -31,11 +31,11 @@ def process_nois(conn=None, batch_size=10000): successful_inserts_count = 0 last_application_id = 0 - with open("sql/insert_noi.sql", "r", encoding="utf-8") as sql_file: + with open("noi/sql/insert_noi.sql", "r", encoding="utf-8") as sql_file: application_sql = sql_file.read() while True: cursor.execute( - f"{application_sql} WHERE ng._noi_application_id > {last_application_id} ORDER by ng.noi_application_id;" + f"{application_sql} WHERE ng.noi_application_id > {last_application_id} ORDER by ng.noi_application_id;" ) rows = cursor.fetchmany(batch_size) diff --git a/bin/migrate-oats-data/noi/sql/insert_noi.sql b/bin/migrate-oats-data/noi/sql/insert_noi.sql index ce3dab4c03..e44cbc17dc 100644 --- a/bin/migrate-oats-data/noi/sql/insert_noi.sql +++ b/bin/migrate-oats-data/noi/sql/insert_noi.sql @@ -136,7 +136,10 @@ SELECT ELSE 'Unknown' END AS applicant, ar.code AS region_code, - alcs_gov.gov_uuid AS local_government_uuid, + CASE + WHEN alcs_gov.gov_uuid IS NOT NULL THEN alcs_gov.gov_uuid + ELSE '001cfdad-bc6e-4d25-9294-1550603da980' --Peace River + END AS local_government_uuid, 'oats_etl' AS audit_created_by FROM noi_grouped AS ng From b56fc23ff741a744c7fd6cec97b6d070d235c420 Mon Sep 17 00:00:00 2001 From: Liam Stoddard Date: Fri, 28 Jul 2023 11:58:10 -0700 Subject: [PATCH 172/954] cleaned up code and added application to migrate.py --- bin/migrate-oats-data/migrate.py | 13 +++++++++++++ bin/migrate-oats-data/noi/sql/insert_noi.sql | 12 ++++++------ 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/bin/migrate-oats-data/migrate.py b/bin/migrate-oats-data/migrate.py index 79fcd3ab7f..cf23629726 100644 --- a/bin/migrate-oats-data/migrate.py +++ b/bin/migrate-oats-data/migrate.py @@ -234,6 +234,19 @@ def setup_menu_args_parser(import_batch_size): ) process_nois(batch_size=import_batch_size) + case "application-import": + console.log("Beginning OATS -> ALCS application import process") + with console.status( + "[bold green]application import (application table update in ALCS)..." + ) as status: + if args.batch_size: + import_batch_size = args.batch_size + + console.log( + f"Processing applications import in batch size = {import_batch_size}" + ) + + process_applications(batch_size=import_batch_size) finally: if connection_pool: diff --git a/bin/migrate-oats-data/noi/sql/insert_noi.sql b/bin/migrate-oats-data/noi/sql/insert_noi.sql index e44cbc17dc..1cb4f5c966 100644 --- a/bin/migrate-oats-data/noi/sql/insert_noi.sql +++ b/bin/migrate-oats-data/noi/sql/insert_noi.sql @@ -1,4 +1,5 @@ WITH + -- Step 1: filter out multiple component NOIs noi_grouped AS ( SELECT oaac.alr_application_id as noi_application_id @@ -10,8 +11,9 @@ WITH GROUP BY oaac.alr_application_id HAVING - count(oaac.alr_application_id) < 2 -- ignore all applications wit multiple components + count(oaac.alr_application_id) < 2 ), + -- Step 2: get applicant applicant_lookup AS ( SELECT DISTINCT oaap.alr_application_id AS application_id, @@ -37,7 +39,7 @@ WITH GROUP BY oaap.alr_application_id ), - -- Step 2: get local gov application name & match to uuid + -- Step 3: get local gov application name & match to uuid oats_gov AS ( SELECT oaap.alr_application_id AS application_id, @@ -109,7 +111,7 @@ WITH END ) = alg."name" ), - -- Step 3: Perform a lookup to retrieve the region code for each application ID + -- Step 4: Perform a lookup to retrieve the region code for each application ID panel_lookup AS ( SELECT DISTINCT oaap.alr_application_id AS application_id, @@ -138,13 +140,11 @@ SELECT ar.code AS region_code, CASE WHEN alcs_gov.gov_uuid IS NOT NULL THEN alcs_gov.gov_uuid - ELSE '001cfdad-bc6e-4d25-9294-1550603da980' --Peace River + ELSE '001cfdad-bc6e-4d25-9294-1550603da980' --Peace River if unable to find uuid END AS local_government_uuid, 'oats_etl' AS audit_created_by FROM noi_grouped AS ng - -- JOIN oats.alcs_etl_application_duplicate AS ae ON oa.alr_application_id = ae.application_id - -- AND ae.duplicated IS false LEFT JOIN applicant_lookup ON ng.noi_application_id = applicant_lookup.application_id LEFT JOIN panel_lookup ON ng.noi_application_id = panel_lookup.application_id LEFT JOIN alcs.application_region ar ON panel_lookup.panel_region = ar."label" From 22f52c30d43afc0d41de589d883ad2b95dfe8300 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Fri, 28 Jul 2023 11:51:45 -0700 Subject: [PATCH 173/954] Incl/Excl Features * Add Incl/Excl to Submission Validator * Add Incl to Portal and ALCS App Details * Update Incl form with interface to remove ts-ignore * Change it so Incl does not have the prescribed body select * --- .../application-details.component.html | 6 + .../application-details.module.ts | 4 +- .../incl-details/incl-details.component.html | 62 +++++ .../incl-details/incl-details.component.scss | 0 .../incl-details.component.spec.ts | 31 +++ .../incl-details/incl-details.component.ts | 45 +++ .../application-details.component.html | 9 + .../application-details.module.ts | 2 + .../incl-details/incl-details.component.html | 89 ++++++ .../incl-details/incl-details.component.scss | 0 .../incl-details.component.spec.ts | 41 +++ .../incl-details/incl-details.component.ts | 81 ++++++ .../create-application-dialog.component.html | 4 +- .../create-application-dialog.component.ts | 2 +- .../incl-proposal/incl-proposal.component.ts | 14 +- ...ation-submission-validator.service.spec.ts | 261 ++++++++++++++++++ ...pplication-submission-validator.service.ts | 145 ++++++++++ 17 files changed, 789 insertions(+), 7 deletions(-) create mode 100644 alcs-frontend/src/app/features/application/applicant-info/application-details/incl-details/incl-details.component.html create mode 100644 alcs-frontend/src/app/features/application/applicant-info/application-details/incl-details/incl-details.component.scss create mode 100644 alcs-frontend/src/app/features/application/applicant-info/application-details/incl-details/incl-details.component.spec.ts create mode 100644 alcs-frontend/src/app/features/application/applicant-info/application-details/incl-details/incl-details.component.ts create mode 100644 portal-frontend/src/app/features/application-details/incl-details/incl-details.component.html create mode 100644 portal-frontend/src/app/features/application-details/incl-details/incl-details.component.scss create mode 100644 portal-frontend/src/app/features/application-details/incl-details/incl-details.component.spec.ts create mode 100644 portal-frontend/src/app/features/application-details/incl-details/incl-details.component.ts diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.html b/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.html index 0a5a4d1b62..0562fc8de0 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.html +++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.html @@ -178,6 +178,12 @@

Proposal

[files]="files" > + +
+
+
diff --git a/portal-frontend/src/app/features/application-details/incl-details/incl-details.component.scss b/portal-frontend/src/app/features/application-details/incl-details/incl-details.component.scss new file mode 100644 index 0000000000..e69de29bb2 diff --git a/portal-frontend/src/app/features/application-details/incl-details/incl-details.component.spec.ts b/portal-frontend/src/app/features/application-details/incl-details/incl-details.component.spec.ts new file mode 100644 index 0000000000..beb030ce61 --- /dev/null +++ b/portal-frontend/src/app/features/application-details/incl-details/incl-details.component.spec.ts @@ -0,0 +1,41 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { BehaviorSubject } from 'rxjs'; +import { ApplicationDocumentService } from '../../../services/application-document/application-document.service'; +import { UserDto } from '../../../services/authentication/authentication.dto'; +import { AuthenticationService } from '../../../services/authentication/authentication.service'; +import { InclDetailsComponent } from './incl-details.component'; + +describe('InclDetailsComponent', () => { + let component: InclDetailsComponent; + let fixture: ComponentFixture; + let mockAppDocumentService: DeepMocked; + let mockAuthService: DeepMocked; + + beforeEach(async () => { + mockAuthService = createMock(); + mockAuthService.$currentProfile = new BehaviorSubject(undefined); + + await TestBed.configureTestingModule({ + declarations: [InclDetailsComponent], + providers: [ + { + provide: ApplicationDocumentService, + useValue: mockAppDocumentService, + }, + { + provide: AuthenticationService, + useValue: mockAuthService, + }, + ], + }).compileComponents(); + + fixture = TestBed.createComponent(InclDetailsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/application-details/incl-details/incl-details.component.ts b/portal-frontend/src/app/features/application-details/incl-details/incl-details.component.ts new file mode 100644 index 0000000000..0e66fb9817 --- /dev/null +++ b/portal-frontend/src/app/features/application-details/incl-details/incl-details.component.ts @@ -0,0 +1,81 @@ +import { Component, Input, OnDestroy, OnInit } from '@angular/core'; +import { Router } from '@angular/router'; +import { Subject, takeUntil } from 'rxjs'; +import { ApplicationDocumentService } from '../../../services/application-document/application-document.service'; +import { ApplicationSubmissionDetailedDto } from '../../../services/application-submission/application-submission.dto'; +import { ApplicationDocumentDto, DOCUMENT_TYPE } from '../../../services/application-document/application-document.dto'; +import { AuthenticationService } from '../../../services/authentication/authentication.service'; + +@Component({ + selector: 'app-incl-details', + templateUrl: './incl-details.component.html', + styleUrls: ['./incl-details.component.scss'], +}) +export class InclDetailsComponent implements OnInit, OnDestroy { + $destroy = new Subject(); + + @Input() showErrors = true; + @Input() showEdit = true; + @Input() draftMode = false; + @Input() updatedFields: string[] = []; + + governmentName = 'applying government'; + + _applicationSubmission: ApplicationSubmissionDetailedDto | undefined; + + @Input() set applicationSubmission(applicationSubmission: ApplicationSubmissionDetailedDto | undefined) { + if (applicationSubmission) { + this._applicationSubmission = applicationSubmission; + } + } + + @Input() set applicationDocuments(documents: ApplicationDocumentDto[]) { + this.proposalMap = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.PROPOSAL_MAP); + this.noticeOfPublicHearing = documents.filter( + (document) => document.type?.code === DOCUMENT_TYPE.PROOF_OF_ADVERTISING + ); + this.proofOfSignage = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.PROOF_OF_SIGNAGE); + this.reportOfPublicHearing = documents.filter( + (document) => document.type?.code === DOCUMENT_TYPE.REPORT_OF_PUBLIC_HEARING + ); + } + + proposalMap: ApplicationDocumentDto[] = []; + noticeOfPublicHearing: ApplicationDocumentDto[] = []; + proofOfSignage: ApplicationDocumentDto[] = []; + reportOfPublicHearing: ApplicationDocumentDto[] = []; + + constructor( + private router: Router, + private applicationDocumentService: ApplicationDocumentService, + private authenticationService: AuthenticationService + ) {} + + ngOnInit(): void { + this.authenticationService.$currentProfile.pipe(takeUntil(this.$destroy)).subscribe((userProfile) => { + if (userProfile && userProfile.government && this.showEdit) { + this.governmentName = userProfile.government; + } + }); + } + + async onEditSection(step: number) { + if (this.draftMode) { + await this.router.navigateByUrl( + `/alcs/application/${this._applicationSubmission?.fileNumber}/edit/${step}?errors=t` + ); + } else { + await this.router.navigateByUrl(`application/${this._applicationSubmission?.fileNumber}/edit/${step}?errors=t`); + } + } + + async openFile(uuid: string) { + const res = await this.applicationDocumentService.openFile(uuid); + window.open(res?.url, '_blank'); + } + + ngOnDestroy(): void { + this.$destroy.next(); + this.$destroy.complete(); + } +} diff --git a/portal-frontend/src/app/features/create-application-dialog/create-application-dialog.component.html b/portal-frontend/src/app/features/create-application-dialog/create-application-dialog.component.html index 5cfbd26303..ed0c6a90db 100644 --- a/portal-frontend/src/app/features/create-application-dialog/create-application-dialog.component.html +++ b/portal-frontend/src/app/features/create-application-dialog/create-application-dialog.component.html @@ -101,8 +101,8 @@

(click)="onSubmit()" [disabled]="!selectedAppType || !selectedSubmissionType" > - next - create + next + create

diff --git a/portal-frontend/src/app/features/create-application-dialog/create-application-dialog.component.ts b/portal-frontend/src/app/features/create-application-dialog/create-application-dialog.component.ts index 6a59ee5472..126f5c57a9 100644 --- a/portal-frontend/src/app/features/create-application-dialog/create-application-dialog.component.ts +++ b/portal-frontend/src/app/features/create-application-dialog/create-application-dialog.component.ts @@ -64,7 +64,7 @@ export class CreateApplicationDialogComponent implements OnInit, AfterViewChecke } async onSubmit() { - if (this.selectedAppType! && ['INCL', 'EXCL'].includes(this.selectedAppType!.code)) { + if (this.selectedAppType && this.selectedAppType.code === 'EXCL') { this.currentStepIndex++; } else { await this.createApplication(); diff --git a/portal-frontend/src/app/features/edit-submission/proposal/incl-proposal/incl-proposal.component.ts b/portal-frontend/src/app/features/edit-submission/proposal/incl-proposal/incl-proposal.component.ts index 1716091ead..5284e66a3c 100644 --- a/portal-frontend/src/app/features/edit-submission/proposal/incl-proposal/incl-proposal.component.ts +++ b/portal-frontend/src/app/features/edit-submission/proposal/incl-proposal/incl-proposal.component.ts @@ -16,6 +16,14 @@ import { EditApplicationSteps } from '../../edit-submission.component'; import { takeUntil } from 'rxjs'; import { ApplicationSubmissionUpdateDto } from '../../../../services/application-submission/application-submission.dto'; +interface InclForm { + hectares: FormControl; + purpose: FormControl; + agSupport: FormControl; + improvements: FormControl; + isLFNGOwnerOfAllParcels?: FormControl; +} + @Component({ selector: 'app-incl-proposal', templateUrl: './incl-proposal.component.html', @@ -35,7 +43,7 @@ export class InclProposalComponent extends FilesStepComponent implements OnInit, improvements = new FormControl(null, [Validators.required]); governmentOwnsAllParcels = new FormControl(undefined, [Validators.required]); - form = new FormGroup({ + form = new FormGroup({ hectares: this.hectares, purpose: this.purpose, agSupport: this.agSupport, @@ -74,6 +82,7 @@ export class InclProposalComponent extends FilesStepComponent implements OnInit, formatBooleanToString(applicationSubmission.inclGovernmentOwnsAllParcels) ); this.disableNotificationFileUploads = applicationSubmission.inclGovernmentOwnsAllParcels; + this.form.setControl('isLFNGOwnerOfAllParcels', this.governmentOwnsAllParcels); } if (this.showErrors) { @@ -98,8 +107,7 @@ export class InclProposalComponent extends FilesStepComponent implements OnInit, this.isGovernmentUser = userProfile?.isLocalGovernment || userProfile?.isFirstNationGovernment; this.governmentName = userProfile.government; - // @ts-ignore Angular / Typescript hate dynamic controls - this.form.addControl('isLFNGOwnerOfAllParcels', this.governmentOwnsAllParcels); + this.form.setControl('isLFNGOwnerOfAllParcels', this.governmentOwnsAllParcels); } }); } diff --git a/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.spec.ts b/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.spec.ts index d8ed4a4351..4b162e1a1c 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.spec.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.spec.ts @@ -967,4 +967,265 @@ describe('ApplicationSubmissionValidatorService', () => { ).toBe(true); }); }); + + describe('INCL Applications', () => { + it('should require basic fields to be complete', async () => { + const application = new ApplicationSubmission({ + owners: [], + typeCode: 'INCL', + inclImprovements: null, + }); + + const res = await service.validateSubmission(application); + + expect( + includesError( + res.errors, + new Error(`INCL proposal missing inclusion fields`), + ), + ).toBe(true); + }); + + it('should be happy if submission is complete', async () => { + const application = new ApplicationSubmission({ + owners: [], + applicant: 'applicant', + purpose: 'purpose', + typeCode: 'INCL', + inclImprovements: 'inclImprovements', + inclAgricultureSupport: 'inclAgricultureSupport', + inclExclHectares: 2, + inclGovernmentOwnsAllParcels: true, + }); + + const documents = [ + new ApplicationDocument({ + typeCode: DOCUMENT_TYPE.PROPOSAL_MAP, + type: new ApplicationDocumentCode({ + code: DOCUMENT_TYPE.PROPOSAL_MAP, + }), + }), + ]; + mockAppDocumentService.getApplicantDocuments.mockResolvedValue(documents); + + const res = await service.validateSubmission(application); + + expect( + includesError( + res.errors, + new Error(`INCL proposal missing inclusion fields`), + ), + ).toBe(false); + + expect( + includesError( + res.errors, + new Error(`INCL proposal is missing proposal map / site plan`), + ), + ).toBe(false); + }); + + it('should require documents when government does not own all parcels', async () => { + const application = new ApplicationSubmission({ + owners: [], + inclGovernmentOwnsAllParcels: false, + typeCode: 'INCL', + }); + + const res = await service.validateSubmission(application); + + expect( + includesError( + res.errors, + new Error(`INCL proposal is missing proof of advertising`), + ), + ).toBe(true); + + expect( + includesError( + res.errors, + new Error(`INCL proposal is missing proof of signage`), + ), + ).toBe(true); + + expect( + includesError( + res.errors, + new Error(`INCL proposal is missing report of public hearing`), + ), + ).toBe(true); + }); + + it('should note require documents when government owns all parcels', async () => { + const application = new ApplicationSubmission({ + owners: [], + inclGovernmentOwnsAllParcels: true, + typeCode: 'INCL', + }); + + const res = await service.validateSubmission(application); + + expect( + includesError( + res.errors, + new Error(`INCL proposal is missing proof of advertising`), + ), + ).toBe(false); + + expect( + includesError( + res.errors, + new Error(`INCL proposal is missing proof of signage`), + ), + ).toBe(false); + + expect( + includesError( + res.errors, + new Error(`INCL proposal is missing report of public hearing`), + ), + ).toBe(false); + }); + }); + + describe('EXCL Applications', () => { + it('should require basic fields to be complete', async () => { + const application = new ApplicationSubmission({ + owners: [], + typeCode: 'EXCL', + prescribedBody: null, + }); + + const res = await service.validateSubmission(application); + + expect( + includesError( + res.errors, + new Error(`EXCL proposal missing exclusion fields`), + ), + ).toBe(true); + }); + + it('should be happy if basic fields are complete', async () => { + const application = new ApplicationSubmission({ + owners: [], + applicant: 'applicant', + purpose: 'purpose', + typeCode: 'EXCL', + prescribedBody: 'inclImprovements', + exclShareGovernmentBorders: false, + inclExclHectares: 2, + exclWhyLand: 'exclWhyLand', + }); + + const documents = [ + new ApplicationDocument({ + typeCode: DOCUMENT_TYPE.PROPOSAL_MAP, + type: new ApplicationDocumentCode({ + code: DOCUMENT_TYPE.PROPOSAL_MAP, + }), + }), + ]; + mockAppDocumentService.getApplicantDocuments.mockResolvedValue(documents); + + const res = await service.validateSubmission(application); + + expect( + includesError( + res.errors, + new Error(`EXCL proposal missing inclusion fields`), + ), + ).toBe(false); + + expect( + includesError( + res.errors, + new Error(`EXCL proposal is missing proposal map / site plan`), + ), + ).toBe(false); + }); + + it('should require all documents', async () => { + const application = new ApplicationSubmission({ + owners: [], + typeCode: 'EXCL', + }); + + const res = await service.validateSubmission(application); + + expect( + includesError( + res.errors, + new Error(`EXCL proposal is missing proof of advertising`), + ), + ).toBe(true); + + expect( + includesError( + res.errors, + new Error(`EXCL proposal is missing proof of signage`), + ), + ).toBe(true); + + expect( + includesError( + res.errors, + new Error(`EXCL proposal is missing report of public hearing`), + ), + ).toBe(true); + }); + + it('should be happy if all documents are provided', async () => { + const application = new ApplicationSubmission({ + owners: [], + inclGovernmentOwnsAllParcels: true, + typeCode: 'EXCL', + }); + + const documents = [ + new ApplicationDocument({ + typeCode: DOCUMENT_TYPE.PROOF_OF_ADVERTISING, + type: new ApplicationDocumentCode({ + code: DOCUMENT_TYPE.PROOF_OF_ADVERTISING, + }), + }), + new ApplicationDocument({ + typeCode: DOCUMENT_TYPE.PROOF_OF_SIGNAGE, + type: new ApplicationDocumentCode({ + code: DOCUMENT_TYPE.PROOF_OF_SIGNAGE, + }), + }), + new ApplicationDocument({ + typeCode: DOCUMENT_TYPE.REPORT_OF_PUBLIC_HEARING, + type: new ApplicationDocumentCode({ + code: DOCUMENT_TYPE.REPORT_OF_PUBLIC_HEARING, + }), + }), + ]; + mockAppDocumentService.getApplicantDocuments.mockResolvedValue(documents); + + const res = await service.validateSubmission(application); + + expect( + includesError( + res.errors, + new Error(`EXCL proposal is missing proof of advertising`), + ), + ).toBe(false); + + expect( + includesError( + res.errors, + new Error(`EXCL proposal is missing proof of signage`), + ), + ).toBe(false); + + expect( + includesError( + res.errors, + new Error(`EXCL proposal is missing report of public hearing`), + ), + ).toBe(false); + }); + }); }); diff --git a/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.ts b/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.ts index b902f52f8d..70a7013a65 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.ts @@ -117,6 +117,22 @@ export class ApplicationSubmissionValidatorService { ); } + if (applicationSubmission.typeCode === 'EXCL') { + await this.validateExclProposal( + applicationSubmission, + applicantDocuments, + errors, + ); + } + + if (applicationSubmission.typeCode === 'INCL') { + await this.validateInclProposal( + applicationSubmission, + applicantDocuments, + errors, + ); + } + const validatedApplication = validatedParcels && validatedPrimaryContact ? ({ @@ -658,4 +674,133 @@ export class ApplicationSubmissionValidatorService { ); } } + + private async validateExclProposal( + applicationSubmission: ApplicationSubmission, + applicantDocuments: ApplicationDocument[], + errors: Error[], + ) { + if ( + applicationSubmission.prescribedBody === null || + applicationSubmission.exclShareGovernmentBorders === null || + applicationSubmission.exclWhyLand === null || + applicationSubmission.inclExclHectares === null + ) { + errors.push( + new ServiceValidationException( + `${applicationSubmission.typeCode} proposal missing exclusion fields`, + ), + ); + } + + const proposalMap = applicantDocuments.filter( + (document) => document.typeCode === DOCUMENT_TYPE.PROPOSAL_MAP, + ); + if (proposalMap.length === 0) { + errors.push( + new ServiceValidationException( + `${applicationSubmission.typeCode} proposal is missing proposal map / site plan`, + ), + ); + } + + const proofOfAdvertising = applicantDocuments.filter( + (document) => document.typeCode === DOCUMENT_TYPE.PROOF_OF_ADVERTISING, + ); + if (proofOfAdvertising.length === 0) { + errors.push( + new ServiceValidationException( + `${applicationSubmission.typeCode} proposal is missing proof of advertising`, + ), + ); + } + + const proofOfSignage = applicantDocuments.filter( + (document) => document.typeCode === DOCUMENT_TYPE.PROOF_OF_SIGNAGE, + ); + if (proofOfSignage.length === 0) { + errors.push( + new ServiceValidationException( + `${applicationSubmission.typeCode} proposal is missing proof of signage`, + ), + ); + } + + const reportOfHearing = applicantDocuments.filter( + (document) => + document.typeCode === DOCUMENT_TYPE.REPORT_OF_PUBLIC_HEARING, + ); + if (reportOfHearing.length === 0) { + errors.push( + new ServiceValidationException( + `${applicationSubmission.typeCode} proposal is missing report of public hearing`, + ), + ); + } + } + + private async validateInclProposal( + applicationSubmission: ApplicationSubmission, + applicantDocuments: ApplicationDocument[], + errors: Error[], + ) { + if ( + applicationSubmission.inclImprovements === null || + applicationSubmission.inclAgricultureSupport === null || + applicationSubmission.inclExclHectares === null + ) { + errors.push( + new ServiceValidationException( + `${applicationSubmission.typeCode} proposal missing inclusion fields`, + ), + ); + } + + const proposalMap = applicantDocuments.filter( + (document) => document.typeCode === DOCUMENT_TYPE.PROPOSAL_MAP, + ); + if (proposalMap.length === 0) { + errors.push( + new ServiceValidationException( + `${applicationSubmission.typeCode} proposal is missing proposal map / site plan`, + ), + ); + } + + if (applicationSubmission.inclGovernmentOwnsAllParcels === false) { + const proofOfAdvertising = applicantDocuments.filter( + (document) => document.typeCode === DOCUMENT_TYPE.PROOF_OF_ADVERTISING, + ); + if (proofOfAdvertising.length === 0) { + errors.push( + new ServiceValidationException( + `${applicationSubmission.typeCode} proposal is missing proof of advertising`, + ), + ); + } + + const proofOfSignage = applicantDocuments.filter( + (document) => document.typeCode === DOCUMENT_TYPE.PROOF_OF_SIGNAGE, + ); + if (proofOfSignage.length === 0) { + errors.push( + new ServiceValidationException( + `${applicationSubmission.typeCode} proposal is missing proof of signage`, + ), + ); + } + + const reportOfHearing = applicantDocuments.filter( + (document) => + document.typeCode === DOCUMENT_TYPE.REPORT_OF_PUBLIC_HEARING, + ); + if (reportOfHearing.length === 0) { + errors.push( + new ServiceValidationException( + `${applicationSubmission.typeCode} proposal is missing report of public hearing`, + ), + ); + } + } + } } From 0606c5d957c60fefa873db1faa92c8a008622c54 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Fri, 28 Jul 2023 14:31:35 -0700 Subject: [PATCH 174/954] Add INCL Proposal Component --- .../application/application.module.ts | 2 + .../proposal/incl/incl.component.html | 4 ++ .../proposal/incl/incl.component.scss | 3 ++ .../proposal/incl/incl.component.spec.ts | 49 +++++++++++++++++++ .../proposal/incl/incl.component.ts | 41 ++++++++++++++++ .../proposal/proposal.component.html | 1 + 6 files changed, 100 insertions(+) create mode 100644 alcs-frontend/src/app/features/application/proposal/incl/incl.component.html create mode 100644 alcs-frontend/src/app/features/application/proposal/incl/incl.component.scss create mode 100644 alcs-frontend/src/app/features/application/proposal/incl/incl.component.spec.ts create mode 100644 alcs-frontend/src/app/features/application/proposal/incl/incl.component.ts diff --git a/alcs-frontend/src/app/features/application/application.module.ts b/alcs-frontend/src/app/features/application/application.module.ts index c60c905f04..a26b8f313c 100644 --- a/alcs-frontend/src/app/features/application/application.module.ts +++ b/alcs-frontend/src/app/features/application/application.module.ts @@ -22,6 +22,7 @@ import { UncancelApplicationDialogComponent } from './overview/uncancel-applicat import { EditModificationDialogComponent } from './post-decision/edit-modification-dialog/edit-modification-dialog.component'; import { EditReconsiderationDialogComponent } from './post-decision/edit-reconsideration-dialog/edit-reconsideration-dialog.component'; import { PostDecisionComponent } from './post-decision/post-decision.component'; +import { InclProposalComponent } from './proposal/incl/incl.component'; import { NaruProposalComponent } from './proposal/naru/naru.component'; import { NfuProposalComponent } from './proposal/nfu/nfu.component'; import { ParcelPrepComponent } from './proposal/parcel-prep/parcel-prep.component'; @@ -76,6 +77,7 @@ const routes: Routes = [ TurProposalComponent, ExclProposalComponent, NaruProposalComponent, + InclProposalComponent, ParcelPrepComponent, UncancelApplicationDialogComponent, ], diff --git a/alcs-frontend/src/app/features/application/proposal/incl/incl.component.html b/alcs-frontend/src/app/features/application/proposal/incl/incl.component.html new file mode 100644 index 0000000000..3aab1c4713 --- /dev/null +++ b/alcs-frontend/src/app/features/application/proposal/incl/incl.component.html @@ -0,0 +1,4 @@ +
+
Applicant Type
+ {{ applicantType }} +
diff --git a/alcs-frontend/src/app/features/application/proposal/incl/incl.component.scss b/alcs-frontend/src/app/features/application/proposal/incl/incl.component.scss new file mode 100644 index 0000000000..bdb73c1e94 --- /dev/null +++ b/alcs-frontend/src/app/features/application/proposal/incl/incl.component.scss @@ -0,0 +1,3 @@ +span { + margin-top: 6px; +} diff --git a/alcs-frontend/src/app/features/application/proposal/incl/incl.component.spec.ts b/alcs-frontend/src/app/features/application/proposal/incl/incl.component.spec.ts new file mode 100644 index 0000000000..93d08cd915 --- /dev/null +++ b/alcs-frontend/src/app/features/application/proposal/incl/incl.component.spec.ts @@ -0,0 +1,49 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { ApplicationSubmissionService } from '../../../../services/application/application-submission/application-submission.service'; +import { InclProposalComponent } from './incl.component'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { ApplicationDetailService } from '../../../../services/application/application-detail.service'; +import { ToastService } from '../../../../services/toast/toast.service'; +import { BehaviorSubject } from 'rxjs'; +import { ApplicationDto } from '../../../../services/application/application.dto'; + +describe('InclProposalComponent', () => { + let component: InclProposalComponent; + let fixture: ComponentFixture; + let mockApplicationDetailService: DeepMocked; + let mockAppSubmissionService: DeepMocked; + let mockToastService: DeepMocked; + + beforeEach(async () => { + mockApplicationDetailService = createMock(); + mockToastService = createMock(); + mockAppSubmissionService = createMock(); + + await TestBed.configureTestingModule({ + declarations: [InclProposalComponent], + providers: [ + { provide: ToastService, useValue: mockToastService }, + { + provide: ApplicationDetailService, + useValue: mockApplicationDetailService, + }, + { + provide: ApplicationSubmissionService, + useValue: mockAppSubmissionService, + }, + ], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + mockApplicationDetailService.$application = new BehaviorSubject(undefined); + + fixture = TestBed.createComponent(InclProposalComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/alcs-frontend/src/app/features/application/proposal/incl/incl.component.ts b/alcs-frontend/src/app/features/application/proposal/incl/incl.component.ts new file mode 100644 index 0000000000..1aae10eb8a --- /dev/null +++ b/alcs-frontend/src/app/features/application/proposal/incl/incl.component.ts @@ -0,0 +1,41 @@ +import { Component, OnDestroy, OnInit } from '@angular/core'; +import { ApplicationDetailService } from '../../../../services/application/application-detail.service'; +import { ApplicationSubmissionService } from '../../../../services/application/application-submission/application-submission.service'; +import { ToastService } from '../../../../services/toast/toast.service'; +import { Subject, takeUntil } from 'rxjs'; +import { ApplicationDto, UpdateApplicationDto } from '../../../../services/application/application.dto'; + +@Component({ + selector: 'app-proposal-incl', + templateUrl: './incl.component.html', + styleUrls: ['./incl.component.scss'], +}) +export class InclProposalComponent implements OnInit, OnDestroy { + $destroy = new Subject(); + application: ApplicationDto | undefined; + applicantType: string | undefined; + + constructor( + private applicationDetailService: ApplicationDetailService, + private applicationSubmissionService: ApplicationSubmissionService + ) {} + + ngOnInit(): void { + this.applicationDetailService.$application.pipe(takeUntil(this.$destroy)).subscribe((application) => { + if (application) { + this.applicationSubmissionService + .fetchSubmission(application.fileNumber) + .then( + (submission) => + (this.applicantType = + submission.inclGovernmentOwnsAllParcels === false ? 'L/FNG Initiated' : 'Land Owner') + ); + } + }); + } + + ngOnDestroy(): void { + this.$destroy.next(); + this.$destroy.complete(); + } +} diff --git a/alcs-frontend/src/app/features/application/proposal/proposal.component.html b/alcs-frontend/src/app/features/application/proposal/proposal.component.html index a6da77d0b8..3d9bbde10a 100644 --- a/alcs-frontend/src/app/features/application/proposal/proposal.component.html +++ b/alcs-frontend/src/app/features/application/proposal/proposal.component.html @@ -38,6 +38,7 @@
Proposal Components - {{ application?.type?.label }}
+
From 57bbf33966e2c063cc2fc477b48141faee1121a7 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Fri, 28 Jul 2023 15:40:57 -0700 Subject: [PATCH 175/954] Add Incl/Excl Decision Components * Add Inclusion and Exclusion Decision Components with Copy Feature * Add new decision component column to store applicant type --- .../incl-excl/incl-excl.component.html | 17 +++++++++++ .../incl-excl/incl-excl.component.scss | 0 .../incl-excl/incl-excl.component.spec.ts | 26 ++++++++++++++++ .../incl-excl/incl-excl.component.ts | 11 +++++++ .../decision-component.component.html | 9 ++++++ .../decision-component.component.ts | 30 +++++++++++++++++++ .../incl-excl-input.component.html | 24 +++++++++++++++ .../incl-excl-input.component.scss | 0 .../incl-excl-input.component.spec.ts | 24 +++++++++++++++ .../incl-excl-input.component.ts | 11 +++++++ .../decision-components.component.ts | 20 +++++++++++++ .../decision-input-v2.component.scss | 6 ++++ .../decision-v2/decision-v2.component.html | 9 ++++++ .../application/decision/decision.module.ts | 4 +++ .../application-decision-v2.dto.ts | 9 +++++- .../application-decision-component.dto.ts | 7 +++++ .../application-decision-component.entity.ts | 8 +++++ .../application-decision-component.service.ts | 8 +++++ ...580462566-add_incl_excl_component_types.ts | 21 +++++++++++++ ...90580680063-add_dec_comp_applicant_type.ts | 25 ++++++++++++++++ 20 files changed, 268 insertions(+), 1 deletion(-) create mode 100644 alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/incl-excl/incl-excl.component.html create mode 100644 alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/incl-excl/incl-excl.component.scss create mode 100644 alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/incl-excl/incl-excl.component.spec.ts create mode 100644 alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/incl-excl/incl-excl.component.ts create mode 100644 alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/incl-excl-input/incl-excl-input.component.html create mode 100644 alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/incl-excl-input/incl-excl-input.component.scss create mode 100644 alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/incl-excl-input/incl-excl-input.component.spec.ts create mode 100644 alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/incl-excl-input/incl-excl-input.component.ts create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1690580462566-add_incl_excl_component_types.ts create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1690580680063-add_dec_comp_applicant_type.ts diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/incl-excl/incl-excl.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/incl-excl/incl-excl.component.html new file mode 100644 index 0000000000..abf3a14f1e --- /dev/null +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/incl-excl/incl-excl.component.html @@ -0,0 +1,17 @@ +
+ +
+ +
+
Applicant Type
+ {{ component.inclExclApplicantType }} + +
+ +
+
Expiry Date
+ {{ component.expiryDate | date }} + +
diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/incl-excl/incl-excl.component.scss b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/incl-excl/incl-excl.component.scss new file mode 100644 index 0000000000..e69de29bb2 diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/incl-excl/incl-excl.component.spec.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/incl-excl/incl-excl.component.spec.ts new file mode 100644 index 0000000000..9681c2d6ab --- /dev/null +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/incl-excl/incl-excl.component.spec.ts @@ -0,0 +1,26 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { DecisionComponentDto } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; + +import { InclExclComponent } from './incl-excl.component'; + +describe('NaruComponent', () => { + let component: InclExclComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [InclExclComponent], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(InclExclComponent); + component = fixture.componentInstance; + component.component = {} as DecisionComponentDto; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/incl-excl/incl-excl.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/incl-excl/incl-excl.component.ts new file mode 100644 index 0000000000..d183fc72d9 --- /dev/null +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/incl-excl/incl-excl.component.ts @@ -0,0 +1,11 @@ +import { Component, Input } from '@angular/core'; +import { DecisionComponentDto } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; + +@Component({ + selector: 'app-incl-excl', + templateUrl: './incl-excl.component.html', + styleUrls: ['./incl-excl.component.scss'], +}) +export class InclExclComponent { + @Input() component!: DecisionComponentDto; +} diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.html index 004bd7bfd4..543ab647d2 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.html @@ -102,4 +102,13 @@ [form]="form" >
+
+ +
diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.ts index 968dfb1857..73c0e0b70f 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.ts @@ -64,6 +64,9 @@ export class DecisionComponentComponent implements OnInit { //subd subdApprovedLots = new FormControl([], [Validators.required]); + //incl/excl + applicantType = new FormControl(null, [Validators.required]); + // general alrArea = new FormControl(null, [Validators.required]); agCap = new FormControl(null, [Validators.required]); @@ -112,6 +115,12 @@ export class DecisionComponentComponent implements OnInit { case APPLICATION_DECISION_COMPONENT_TYPE.SUBD: this.patchSubdFields(); break; + case APPLICATION_DECISION_COMPONENT_TYPE.INCL: + this.patchInclExclFields(); + break; + case APPLICATION_DECISION_COMPONENT_TYPE.EXCL: + this.patchInclExclFields(); + break; default: this.toastService.showErrorToast('Wrong decision component type'); break; @@ -176,6 +185,12 @@ export class DecisionComponentComponent implements OnInit { case APPLICATION_DECISION_COMPONENT_TYPE.SUBD: dataChange = { ...dataChange, ...this.getSubdDataChange() }; break; + case APPLICATION_DECISION_COMPONENT_TYPE.INCL: + dataChange = { ...dataChange, ...this.getInclExclDataChange() }; + break; + case APPLICATION_DECISION_COMPONENT_TYPE.EXCL: + dataChange = { ...dataChange, ...this.getInclExclDataChange() }; + break; default: this.toastService.showErrorToast('Wrong decision component type'); break; @@ -246,6 +261,14 @@ export class DecisionComponentComponent implements OnInit { this.subdApprovedLots.setValue(this.data.subdApprovedLots ?? null); } + private patchInclExclFields() { + this.form.addControl('applicantType', this.applicantType); + this.form.addControl('expiryDate', this.expiryDate); + + this.applicantType.setValue(this.data.inclExclApplicantType ?? null); + this.expiryDate.setValue(this.data.expiryDate ? new Date(this.data.expiryDate) : null); + } + private getNfuDataChange(): NfuDecisionComponentDto { return { nfuType: this.nfuType.value ? this.nfuType.value : null, @@ -315,4 +338,11 @@ export class DecisionComponentComponent implements OnInit { markTouched() { this.subdInputComponent?.markAllAsTouched(); } + + private getInclExclDataChange() { + return { + inclExclApplicantType: this.applicantType.value ?? undefined, + expiryDate: this.expiryDate.value ? formatDateForApi(this.expiryDate.value) : null, + }; + } } diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/incl-excl-input/incl-excl-input.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/incl-excl-input/incl-excl-input.component.html new file mode 100644 index 0000000000..b4203dc864 --- /dev/null +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/incl-excl-input/incl-excl-input.component.html @@ -0,0 +1,24 @@ +
+
+
+ Applicant Type* + + Land Owner + L/FNG Initiated + +
+ + + Expiry Date + + + + +
+
diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/incl-excl-input/incl-excl-input.component.scss b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/incl-excl-input/incl-excl-input.component.scss new file mode 100644 index 0000000000..e69de29bb2 diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/incl-excl-input/incl-excl-input.component.spec.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/incl-excl-input/incl-excl-input.component.spec.ts new file mode 100644 index 0000000000..23c3b96223 --- /dev/null +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/incl-excl-input/incl-excl-input.component.spec.ts @@ -0,0 +1,24 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { InclExclInputComponent } from './incl-excl-input.component'; + +describe('InclExclInputComponent', () => { + let component: InclExclInputComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [InclExclInputComponent], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(InclExclInputComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/incl-excl-input/incl-excl-input.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/incl-excl-input/incl-excl-input.component.ts new file mode 100644 index 0000000000..6da5009f8c --- /dev/null +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/incl-excl-input/incl-excl-input.component.ts @@ -0,0 +1,11 @@ +import { Component, Input } from '@angular/core'; +import { FormGroup } from '@angular/forms'; + +@Component({ + selector: 'app-incl-excl-input', + templateUrl: './incl-excl-input.component.html', + styleUrls: ['./incl-excl-input.component.scss'], +}) +export class InclExclInputComponent { + @Input() form!: FormGroup; +} diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-components.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-components.component.ts index 19b14d17fc..1e9c5e205e 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-components.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-components.component.ts @@ -144,6 +144,13 @@ export class DecisionComponentsComponent implements OnInit, OnDestroy, AfterView this.patchNaruFields(component); } + if ( + typeCode === APPLICATION_DECISION_COMPONENT_TYPE.INCL || + typeCode === APPLICATION_DECISION_COMPONENT_TYPE.EXCL + ) { + this.patchInclExclFields(component); + } + this.components.push(component); break; case APPLICATION_DECISION_COMPONENT_TYPE.NFUP: @@ -153,6 +160,8 @@ export class DecisionComponentsComponent implements OnInit, OnDestroy, AfterView case APPLICATION_DECISION_COMPONENT_TYPE.PFRS: case APPLICATION_DECISION_COMPONENT_TYPE.NARU: case APPLICATION_DECISION_COMPONENT_TYPE.SUBD: + case APPLICATION_DECISION_COMPONENT_TYPE.INCL: + case APPLICATION_DECISION_COMPONENT_TYPE.EXCL: this.components.push({ applicationDecisionComponentTypeCode: typeCode, applicationDecisionComponentType: this.decisionComponentTypes.find( @@ -201,6 +210,17 @@ export class DecisionComponentsComponent implements OnInit, OnDestroy, AfterView component.naruSubtypeCode = this.application.submittedApplication?.naruSubtype?.code; } + private patchInclExclFields(component: DecisionComponentDto) { + if (this.application.inclExclApplicantType) { + component.inclExclApplicantType = this.application.inclExclApplicantType; + } else { + component.inclExclApplicantType = + this.application.submittedApplication?.inclGovernmentOwnsAllParcels === false + ? 'L/FNG Initiated' + : 'Land Owner'; + } + } + private updateComponentsMenuItems() { this.decisionComponentTypes = this.decisionComponentTypes.map((e) => ({ ...e, diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.scss b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.scss index e6e203b157..e2bbee1da8 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.scss +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.scss @@ -160,4 +160,10 @@ margin-bottom: 0px !important; } } + + .toggle-label { + color: colors.$grey-dark; + display: block; + margin-bottom: 3px; + } } diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.html index 1cc2816ba7..b912c09605 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.html @@ -261,6 +261,15 @@
Decision Components and Conditions
*ngIf="component.applicationDecisionComponentTypeCode === COMPONENT_TYPE.SUBD" [component]="component" > + +
diff --git a/alcs-frontend/src/app/features/application/decision/decision.module.ts b/alcs-frontend/src/app/features/application/decision/decision.module.ts index adf3641992..5e656899df 100644 --- a/alcs-frontend/src/app/features/application/decision/decision.module.ts +++ b/alcs-frontend/src/app/features/application/decision/decision.module.ts @@ -14,6 +14,7 @@ import { ConditionComponent } from './conditions/condition/condition.component'; import { ConditionsComponent } from './conditions/conditions.component'; import { DecisionV1DialogComponent } from './decision-v1/decision-v1-dialog/decision-v1-dialog.component'; import { DecisionV1Component } from './decision-v1/decision-v1.component'; +import { InclExclComponent } from './decision-v2/decision-component/incl-excl/incl-excl.component'; import { NaruComponent } from './decision-v2/decision-component/naru/naru.component'; import { NfupComponent } from './decision-v2/decision-component/nfup/nfup.component'; import { PfrsComponent } from './decision-v2/decision-component/pfrs/pfrs.component'; @@ -23,6 +24,7 @@ import { SubdComponent } from './decision-v2/decision-component/subd/subd.compon import { TurpComponent } from './decision-v2/decision-component/turp/turp.component'; import { DecisionDocumentsComponent } from './decision-v2/decision-documents/decision-documents.component'; import { DecisionComponentComponent } from './decision-v2/decision-input/decision-components/decision-component/decision-component.component'; +import { InclExclInputComponent } from './decision-v2/decision-input/decision-components/decision-component/incl-excl-input/incl-excl-input.component'; import { NaruInputComponent } from './decision-v2/decision-input/decision-components/decision-component/naru-input/naru-input.component'; import { NfuInputComponent } from './decision-v2/decision-input/decision-components/decision-component/nfu-input/nfu-input.component'; import { PfrsInputComponent } from './decision-v2/decision-input/decision-components/decision-component/pfrs-input/pfrs-input.component'; @@ -96,6 +98,8 @@ export const decisionChildRoutes = [ PfrsComponent, NaruComponent, SubdComponent, + InclExclComponent, + InclExclInputComponent, NaruInputComponent, ConditionsComponent, ConditionComponent, diff --git a/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-v2.dto.ts b/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-v2.dto.ts index 838db7e479..81df88bcf9 100644 --- a/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-v2.dto.ts +++ b/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-v2.dto.ts @@ -151,13 +151,18 @@ export interface SubdDecisionComponentDto { subdApprovedLots?: ProposedLot[]; } +export interface InclExclDecisionComponentDto { + inclExclApplicantType?: string | null; +} + export interface DecisionComponentDto extends NfuDecisionComponentDto, TurpDecisionComponentDto, PofoDecisionComponentDto, RosoDecisionComponentDto, NaruDecisionComponentDto, - SubdDecisionComponentDto { + SubdDecisionComponentDto, + InclExclDecisionComponentDto { uuid?: string; alrArea?: number | null; agCap?: string | null; @@ -188,6 +193,8 @@ export enum APPLICATION_DECISION_COMPONENT_TYPE { PFRS = 'PFRS', NARU = 'NARU', SUBD = 'SUBD', + INCL = 'INCL', + EXCL = 'EXCL', } export interface ApplicationDecisionConditionTypeDto extends BaseCodeDto {} diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.dto.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.dto.ts index 1fa5cd93b5..a77ad3f11c 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.dto.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.dto.ts @@ -96,6 +96,10 @@ export class UpdateApplicationDecisionComponentDto { @IsArray() @IsOptional() subdApprovedLots?: ProposedLot[]; + + @IsString() + @IsOptional() + inclExclApplicantType?: string | null; } export class CreateApplicationDecisionComponentDto extends UpdateApplicationDecisionComponentDto { @@ -182,6 +186,9 @@ export class ApplicationDecisionComponentDto { @AutoMap(() => [ProposedLot]) subdApprovedLots: ProposedLot[]; + + @AutoMap(() => String) + inclExclApplicantType?: string; } export enum APPLICATION_DECISION_COMPONENT_TYPE { diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.entity.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.entity.ts index 51a31a9206..9005f4db9c 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.entity.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.entity.ts @@ -199,6 +199,14 @@ export class ApplicationDecisionComponent extends Base { }) subdApprovedLots: ProposedLot[]; + @AutoMap(() => String) + @Column({ + nullable: true, + type: 'text', + comment: 'Stores the applicant type for inclusion and exclusion components', + }) + inclExclApplicantType: string | null; + @AutoMap() @Column({ nullable: false }) applicationDecisionComponentTypeCode: string; diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.service.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.service.ts index 096b502cd0..d5cd62582d 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.service.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.service.ts @@ -55,6 +55,14 @@ export class ApplicationDecisionComponentService { component.subdApprovedLots = updateDto.subdApprovedLots; } + //INCL / EXCL + if (updateDto.inclExclApplicantType !== undefined) { + component.inclExclApplicantType = updateDto.inclExclApplicantType; + component.expiryDate = updateDto.expiryDate + ? new Date(updateDto.expiryDate) + : null; + } + updatedComponents.push(component); } diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1690580462566-add_incl_excl_component_types.ts b/services/apps/alcs/src/providers/typeorm/migrations/1690580462566-add_incl_excl_component_types.ts new file mode 100644 index 0000000000..961cc8cb44 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1690580462566-add_incl_excl_component_types.ts @@ -0,0 +1,21 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class addInclExclComponentTypes1690580462566 + implements MigrationInterface +{ + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query( + ` + INSERT INTO alcs.application_decision_component_type + (audit_deleted_date_at, audit_created_at, audit_updated_at, audit_created_by, audit_updated_by, "label", code, description) + values + (null , now(), now(), 'seed-migration','seed-migration' , 'Inclusion', 'INCL', 'Inclusion'), + (null , now(), now(), 'seed-migration','seed-migration' , 'Exclusion', 'EXCL', 'Exclusion'); + `, + ); + } + + public async down(): Promise { + //No + } +} diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1690580680063-add_dec_comp_applicant_type.ts b/services/apps/alcs/src/providers/typeorm/migrations/1690580680063-add_dec_comp_applicant_type.ts new file mode 100644 index 0000000000..63e6704a76 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1690580680063-add_dec_comp_applicant_type.ts @@ -0,0 +1,25 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class addDecCompApplicantType1690580680063 + implements MigrationInterface +{ + name = 'addDecCompApplicantType1690580680063'; + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `ALTER TABLE "alcs"."application_decision_component" ADD "incl_excl_applicant_type" text`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."application_decision_component"."incl_excl_applicant_type" IS 'Stores the applicant type for inclusion and exclusion components'`, + ); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."application_decision_component"."incl_excl_applicant_type" IS 'Stores the applicant type for inclusion and exclusion components'`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_decision_component" DROP COLUMN "incl_excl_applicant_type"`, + ); + } +} From 821dbd72414245a9134f1124fc9372285c74e491 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Fri, 28 Jul 2023 15:57:56 -0700 Subject: [PATCH 176/954] Code review feedback --- .../decision-component/decision-component.component.ts | 4 ---- 1 file changed, 4 deletions(-) diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.ts index 73c0e0b70f..7aebabd00a 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.ts @@ -116,8 +116,6 @@ export class DecisionComponentComponent implements OnInit { this.patchSubdFields(); break; case APPLICATION_DECISION_COMPONENT_TYPE.INCL: - this.patchInclExclFields(); - break; case APPLICATION_DECISION_COMPONENT_TYPE.EXCL: this.patchInclExclFields(); break; @@ -186,8 +184,6 @@ export class DecisionComponentComponent implements OnInit { dataChange = { ...dataChange, ...this.getSubdDataChange() }; break; case APPLICATION_DECISION_COMPONENT_TYPE.INCL: - dataChange = { ...dataChange, ...this.getInclExclDataChange() }; - break; case APPLICATION_DECISION_COMPONENT_TYPE.EXCL: dataChange = { ...dataChange, ...this.getInclExclDataChange() }; break; From d7fc7c34b63d9314ed0577a9e7cdbe2edb55191e Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Mon, 31 Jul 2023 09:27:47 -0700 Subject: [PATCH 177/954] Allow changing prescribed body with change app type dialog --- ...nge-application-type-dialog.component.html | 2 +- .../edit-submission.component.ts | 20 +++++++++---------- .../application-submission.service.ts | 4 ++++ 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/portal-frontend/src/app/features/edit-submission/change-application-type-dialog/change-application-type-dialog.component.html b/portal-frontend/src/app/features/edit-submission/change-application-type-dialog/change-application-type-dialog.component.html index 001d0a0494..12191c3f0d 100644 --- a/portal-frontend/src/app/features/edit-submission/change-application-type-dialog/change-application-type-dialog.component.html +++ b/portal-frontend/src/app/features/edit-submission/change-application-type-dialog/change-application-type-dialog.component.html @@ -71,7 +71,7 @@
Are you sure you want to change your application type?
You will not be able to complete the remaining portion of the application until the notification and public hearing diff --git a/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.ts b/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.ts index 16fa1c1ae8..eaf916546f 100644 --- a/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.ts +++ b/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.ts @@ -204,11 +204,17 @@ export class ApplicationSubmissionReviewController { ); } + const creatingGuid = applicationSubmission.createdBy.bceidBusinessGuid; + const creatingGovernment = await this.localGovernmentService.getByGuid( + creatingGuid, + ); + if ( - userLocalGovernment.uuid === applicationSubmission.localGovernmentUuid && - primaryContact + creatingGovernment?.uuid === applicationSubmission.localGovernmentUuid && + primaryContact && + primaryContact.type.code === APPLICATION_OWNER.GOVERNMENT ) { - //Copy contact details over to government form + //Copy contact details over to government form when applying to self await this.applicationSubmissionReviewService.update( applicationSubmission.fileNumber, { From 72ca60e43840b6e85d1d445724e579e585aeda09 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Mon, 31 Jul 2023 10:40:48 -0700 Subject: [PATCH 179/954] Add FIXME to all placeholder links --- .../proposal/incl-proposal/incl-proposal.component.html | 2 +- .../proposal/naru-proposal/naru-proposal.component.html | 2 +- .../proposal/pfrs-proposal/pfrs-proposal.component.html | 8 ++++---- .../proposal/pofo-proposal/pofo-proposal.component.html | 6 +++--- .../proposal/roso-proposal/roso-proposal.component.html | 6 +++--- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/portal-frontend/src/app/features/edit-submission/proposal/incl-proposal/incl-proposal.component.html b/portal-frontend/src/app/features/edit-submission/proposal/incl-proposal/incl-proposal.component.html index c7463b9985..9ae514abbd 100644 --- a/portal-frontend/src/app/features/edit-submission/proposal/incl-proposal/incl-proposal.component.html +++ b/portal-frontend/src/app/features/edit-submission/proposal/incl-proposal/incl-proposal.component.html @@ -126,7 +126,7 @@

Proposal

The ALR General Regulation does not require the {{ governmentName }} to complete a public hearing if all inclusion application parcel(s) are owned by the {{ governmentName }}.
- Please refer to Inclusion page on the ALC website for more information. + Please refer to FIXME: Inclusion page on the ALC website for more information. Proposal
Agri-tourism activities are defined in the Agricultural Land Reserve Use Regulation.
- Please refer to the Non-Adhering Residential Use page on the ALC website for more information + Please refer to the FIXME: Non-Adhering Residential Use page on the ALC website for more information - Characters left: {{ 4000 - fillTypeDescriptionText.textLength }} + Characters left: {{ 4000 - fillTypeToPlaceText.textLength }}
Soil & Fill Components warning
This field is required
+
Example: Aggregate, topsoil, structural fill, sand, gravel, etc
+
+ +
- + - Characters left: {{ 4000 - fillOriginDescriptionText.textLength }} + Characters left: {{ 4000 - fillOriginToPlaceText.textLength }}
Soil & Fill Components
This field is required
-
-

Project Dimensions

-
-
- -
- Enter area in hectares (ha) (Note: 0.01 ha is 100 m2) -
- - - ha - -
- warning -
This field is required
-
-
-
- -
- Enter depth in meters (m)  -
- - - m - -
- warning -
This field is required
-
-
-
- -
- Enter volume in cubic meters (m3) without a comma -
- - - m3 - -
- warning -
This field is required
-
-
+ + +

Project Duration

+
Estimated duration of the project
diff --git a/portal-frontend/src/app/features/edit-submission/proposal/nfu-proposal/nfu-proposal.component.ts b/portal-frontend/src/app/features/edit-submission/proposal/nfu-proposal/nfu-proposal.component.ts index b063aff119..a69d6e39d9 100644 --- a/portal-frontend/src/app/features/edit-submission/proposal/nfu-proposal/nfu-proposal.component.ts +++ b/portal-frontend/src/app/features/edit-submission/proposal/nfu-proposal/nfu-proposal.component.ts @@ -7,6 +7,7 @@ import { ApplicationSubmissionService } from '../../../../services/application-s import { parseStringToBoolean } from '../../../../shared/utils/string-helper'; import { EditApplicationSteps } from '../../edit-submission.component'; import { StepComponent } from '../../step.partial'; +import { SoilTableData } from '../soil-table/soil-table.component'; @Component({ selector: 'app-nfu-proposal', @@ -16,14 +17,13 @@ import { StepComponent } from '../../step.partial'; export class NfuProposalComponent extends StepComponent implements OnInit, OnDestroy { currentStep = EditApplicationSteps.Proposal; + fillTableData: SoilTableData = {}; + hectares = new FormControl(null, [Validators.required]); purpose = new FormControl(null, [Validators.required]); outsideLands = new FormControl(null, [Validators.required]); agricultureSupport = new FormControl(null, [Validators.required]); willImportFill = new FormControl(null, [Validators.required]); - totalFillPlacement = new FormControl(null, [Validators.required]); - maxFillDepth = new FormControl(null, [Validators.required]); - fillVolume = new FormControl(null, [Validators.required]); projectDurationAmount = new FormControl(null, [Validators.required]); projectDurationUnit = new FormControl(null, [Validators.required]); fillTypeDescription = new FormControl(null, [Validators.required]); @@ -35,9 +35,6 @@ export class NfuProposalComponent extends StepComponent implements OnInit, OnDes outsideLands: this.outsideLands, agricultureSupport: this.agricultureSupport, willImportFill: this.willImportFill, - totalFillPlacement: this.totalFillPlacement, - maxFillDepth: this.maxFillDepth, - fillVolume: this.fillVolume, projectDurationAmount: this.projectDurationAmount, projectDurationUnit: this.projectDurationUnit, fillTypeDescription: this.fillTypeDescription, @@ -61,15 +58,19 @@ export class NfuProposalComponent extends StepComponent implements OnInit, OnDes purpose: applicationSubmission.purpose, outsideLands: applicationSubmission.nfuOutsideLands, agricultureSupport: applicationSubmission.nfuAgricultureSupport, - totalFillPlacement: applicationSubmission.nfuTotalFillPlacement?.toString(), - maxFillDepth: applicationSubmission.nfuMaxFillDepth?.toString(), - fillVolume: applicationSubmission.nfuFillVolume?.toString(), projectDurationAmount: applicationSubmission.nfuProjectDurationAmount?.toString(), projectDurationUnit: applicationSubmission.nfuProjectDurationUnit, fillTypeDescription: applicationSubmission.nfuFillTypeDescription, fillOriginDescription: applicationSubmission.nfuFillOriginDescription, }); + this.fillTableData = { + volume: applicationSubmission.nfuFillVolume ?? undefined, + area: applicationSubmission.nfuTotalFillPlacement ?? undefined, + maximumDepth: applicationSubmission.nfuMaxFillDepth ?? undefined, + averageDepth: applicationSubmission.nfuAverageFillDepth ?? undefined, + }; + if (applicationSubmission.nfuWillImportFill !== null) { this.willImportFill.setValue(applicationSubmission.nfuWillImportFill ? 'true' : 'false'); this.onChangeFill(applicationSubmission.nfuWillImportFill ? 'true' : 'false'); @@ -93,9 +94,6 @@ export class NfuProposalComponent extends StepComponent implements OnInit, OnDes const nfuOutsideLands = this.outsideLands.getRawValue(); const nfuAgricultureSupport = this.agricultureSupport.getRawValue(); const nfuWillImportFill = this.willImportFill.getRawValue(); - const nfuTotalFillPlacement = this.totalFillPlacement.getRawValue(); - const nfuMaxFillDepth = this.maxFillDepth.getRawValue(); - const nfuFillVolume = this.fillVolume.getRawValue(); const nfuProjectDurationAmount = this.projectDurationAmount.getRawValue(); const nfuProjectDurationUnit = this.projectDurationUnit.getRawValue(); const nfuFillTypeDescription = this.fillTypeDescription.getRawValue(); @@ -107,9 +105,10 @@ export class NfuProposalComponent extends StepComponent implements OnInit, OnDes nfuOutsideLands, nfuAgricultureSupport, nfuWillImportFill: parseStringToBoolean(nfuWillImportFill), - nfuTotalFillPlacement: nfuTotalFillPlacement ? parseFloat(nfuTotalFillPlacement) : null, - nfuMaxFillDepth: nfuMaxFillDepth ? parseFloat(nfuMaxFillDepth) : null, - nfuFillVolume: nfuFillVolume ? parseFloat(nfuFillVolume) : null, + nfuTotalFillPlacement: this.fillTableData.area ?? null, + nfuMaxFillDepth: this.fillTableData.maximumDepth ?? null, + nfuAverageFillDepth: this.fillTableData.averageDepth ?? null, + nfuFillVolume: this.fillTableData.volume ?? null, nfuProjectDurationAmount: nfuProjectDurationAmount ? parseFloat(nfuProjectDurationAmount) : null, nfuProjectDurationUnit, nfuFillTypeDescription, @@ -123,29 +122,24 @@ export class NfuProposalComponent extends StepComponent implements OnInit, OnDes onChangeFill(value: string) { if (value === 'true') { - this.totalFillPlacement.enable(); - this.maxFillDepth.enable(); - this.fillVolume.enable(); this.projectDurationAmount.enable(); this.projectDurationUnit.enable(); this.fillTypeDescription.enable(); this.fillOriginDescription.enable(); } else { - this.totalFillPlacement.disable(); - this.maxFillDepth.disable(); - this.fillVolume.disable(); this.projectDurationAmount.disable(); this.projectDurationUnit.disable(); this.fillTypeDescription.disable(); this.fillOriginDescription.disable(); - this.totalFillPlacement.setValue(null); - this.maxFillDepth.setValue(null); - this.fillVolume.setValue(null); this.projectDurationAmount.setValue(null); this.projectDurationUnit.setValue(null); this.fillTypeDescription.setValue(null); this.fillOriginDescription.setValue(null); } } + + markDirty() { + this.form.markAsDirty(); + } } diff --git a/portal-frontend/src/app/services/application-submission/application-submission.dto.ts b/portal-frontend/src/app/services/application-submission/application-submission.dto.ts index c831b683f0..d597bc128e 100644 --- a/portal-frontend/src/app/services/application-submission/application-submission.dto.ts +++ b/portal-frontend/src/app/services/application-submission/application-submission.dto.ts @@ -79,6 +79,7 @@ export interface ApplicationSubmissionDetailedDto extends ApplicationSubmissionD nfuWillImportFill: boolean | null; nfuTotalFillPlacement: number | null; nfuMaxFillDepth: number | null; + nfuAverageFillDepth: number | null; nfuFillVolume: number | null; nfuProjectDurationAmount: number | null; nfuProjectDurationUnit: string | null; @@ -185,6 +186,7 @@ export interface ApplicationSubmissionUpdateDto { nfuWillImportFill?: boolean | null; nfuTotalFillPlacement?: number | null; nfuMaxFillDepth?: number | null; + nfuAverageFillDepth?: number | null; nfuFillVolume?: number | null; nfuProjectDurationAmount?: number | null; nfuProjectDurationUnit?: string | null; diff --git a/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.spec.ts b/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.spec.ts index 4b162e1a1c..b54f16ba38 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.spec.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.spec.ts @@ -549,6 +549,7 @@ describe('ApplicationSubmissionValidatorService', () => { nfuFillOriginDescription: 'VALID', nfuTotalFillPlacement: 0.0, nfuMaxFillDepth: 1.5125, + nfuAverageFillDepth: 1261.21, nfuFillVolume: 742.1, nfuProjectDurationAmount: 12, nfuProjectDurationUnit: 'VALID', @@ -597,6 +598,7 @@ describe('ApplicationSubmissionValidatorService', () => { nfuFillOriginDescription: null, nfuTotalFillPlacement: 0.0, nfuMaxFillDepth: 1.5125, + nfuAverageFillDepth: 121, nfuFillVolume: 742.1, nfuProjectDurationAmount: 12, nfuProjectDurationUnit: 'VALID', diff --git a/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.ts b/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.ts index 70a7013a65..ab7e22cbf1 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.ts @@ -414,6 +414,7 @@ export class ApplicationSubmissionValidatorService { !applicationSubmission.nfuFillOriginDescription || applicationSubmission.nfuTotalFillPlacement === null || applicationSubmission.nfuMaxFillDepth === null || + applicationSubmission.nfuAverageFillDepth === null || applicationSubmission.nfuFillVolume === null || applicationSubmission.nfuProjectDurationAmount === null || !applicationSubmission.nfuProjectDurationUnit diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.dto.ts b/services/apps/alcs/src/portal/application-submission/application-submission.dto.ts index 249009cbc4..244b7d5935 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.dto.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.dto.ts @@ -107,6 +107,9 @@ export class ApplicationSubmissionDetailedDto extends ApplicationSubmissionDto { @AutoMap(() => Number) nfuMaxFillDepth?: number | null; + @AutoMap(() => Number) + nfuAverageFillDepth?: number | null; + @AutoMap(() => Number) nfuFillVolume?: number | null; @@ -424,6 +427,10 @@ export class ApplicationSubmissionUpdateDto { @IsOptional() nfuMaxFillDepth?: number | null; + @IsNumber() + @IsOptional() + nfuAverageFillDepth?: number | null; + @IsNumber() @IsOptional() nfuFillVolume?: number | null; diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts b/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts index e13c5a21ba..69e14f3e61 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts @@ -239,6 +239,16 @@ export class ApplicationSubmission extends Base { }) nfuTotalFillPlacement: number | null; + @AutoMap(() => Number) + @Column({ + type: 'decimal', + nullable: true, + precision: 12, + scale: 2, + transformer: new ColumnNumericTransformer(), + }) + nfuAverageFillDepth: number | null; + @AutoMap(() => Number) @Column({ type: 'decimal', diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.service.ts b/services/apps/alcs/src/portal/application-submission/application-submission.service.ts index 76f9406ca3..d9da41cd68 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.service.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.service.ts @@ -655,38 +655,42 @@ export class ApplicationSubmissionService { updateDto.nfuOutsideLands || application.nfuOutsideLands; application.nfuAgricultureSupport = updateDto.nfuAgricultureSupport || application.nfuAgricultureSupport; - application.nfuWillImportFill = - updateDto.nfuWillImportFill !== undefined - ? updateDto.nfuWillImportFill - : application.nfuWillImportFill; - application.nfuTotalFillPlacement = - updateDto.nfuTotalFillPlacement !== undefined - ? updateDto.nfuTotalFillPlacement - : application.nfuTotalFillPlacement; - application.nfuMaxFillDepth = - updateDto.nfuMaxFillDepth !== undefined - ? updateDto.nfuMaxFillDepth - : application.nfuMaxFillDepth; - application.nfuFillVolume = - updateDto.nfuFillVolume !== undefined - ? updateDto.nfuFillVolume - : application.nfuFillVolume; - application.nfuProjectDurationUnit = - updateDto.nfuProjectDurationUnit !== undefined - ? updateDto.nfuProjectDurationUnit - : application.nfuProjectDurationUnit; - application.nfuProjectDurationAmount = - updateDto.nfuProjectDurationAmount !== undefined - ? updateDto.nfuProjectDurationAmount - : application.nfuProjectDurationAmount; - application.nfuFillTypeDescription = - updateDto.nfuFillTypeDescription !== undefined - ? updateDto.nfuFillTypeDescription - : application.nfuFillTypeDescription; - application.nfuFillOriginDescription = - updateDto.nfuFillOriginDescription !== undefined - ? updateDto.nfuFillOriginDescription - : application.nfuFillOriginDescription; + application.nfuWillImportFill = filterUndefined( + updateDto.nfuWillImportFill, + application.nfuWillImportFill, + ); + application.nfuTotalFillPlacement = filterUndefined( + updateDto.nfuTotalFillPlacement, + application.nfuTotalFillPlacement, + ); + application.nfuMaxFillDepth = filterUndefined( + updateDto.nfuMaxFillDepth, + application.nfuMaxFillDepth, + ); + application.nfuAverageFillDepth = filterUndefined( + updateDto.nfuAverageFillDepth, + application.nfuAverageFillDepth, + ); + application.nfuFillVolume = filterUndefined( + updateDto.nfuFillVolume, + application.nfuFillVolume, + ); + application.nfuProjectDurationUnit = filterUndefined( + updateDto.nfuProjectDurationUnit, + application.nfuProjectDurationUnit, + ); + application.nfuProjectDurationAmount = filterUndefined( + updateDto.nfuProjectDurationAmount, + application.nfuProjectDurationAmount, + ); + application.nfuFillTypeDescription = filterUndefined( + updateDto.nfuFillTypeDescription, + application.nfuFillTypeDescription, + ); + application.nfuFillOriginDescription = filterUndefined( + updateDto.nfuFillOriginDescription, + application.nfuFillOriginDescription, + ); return application; } diff --git a/services/apps/alcs/src/portal/pdf-generation/generate-submission-document.service.ts b/services/apps/alcs/src/portal/pdf-generation/generate-submission-document.service.ts index 4b69a074bb..1bbc88e37a 100644 --- a/services/apps/alcs/src/portal/pdf-generation/generate-submission-document.service.ts +++ b/services/apps/alcs/src/portal/pdf-generation/generate-submission-document.service.ts @@ -291,6 +291,7 @@ export class GenerateSubmissionDocumentService { nfuFillOriginDescription: submission.nfuFillOriginDescription, nfuTotalFillPlacement: submission.nfuTotalFillPlacement, nfuMaxFillDepth: submission.nfuMaxFillDepth, + nfuAverageFillDepth: submission.nfuAverageFillDepth, nfuFillVolume: submission.nfuFillVolume, nfuProjectDurationAmount: submission.nfuProjectDurationAmount, nfuProjectDurationUnit: submission.nfuProjectDurationUnit, diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1690999583806-add_average_fill_depth.ts b/services/apps/alcs/src/providers/typeorm/migrations/1690999583806-add_average_fill_depth.ts new file mode 100644 index 0000000000..0d766bfd73 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1690999583806-add_average_fill_depth.ts @@ -0,0 +1,17 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class addAverageFillDepth1690999583806 implements MigrationInterface { + name = 'addAverageFillDepth1690999583806'; + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" ADD "nfu_average_fill_depth" numeric(12,2)`, + ); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" DROP COLUMN "nfu_average_fill_depth"`, + ); + } +} From dc8e95251d7f065ac1960920123fc914eca711dd Mon Sep 17 00:00:00 2001 From: Liam Stoddard Date: Wed, 2 Aug 2023 12:56:40 -0700 Subject: [PATCH 192/954] noi docs --- .../noi/documents/documents_noi.py | 93 +++++++++++++++++ .../noi/documents/documents_noi.sql | 33 +++++++ .../documents/documents_noi_total_count.sql | 22 +++++ .../noi/documents/noi_documents.py | 99 +++++++++++++++++++ .../noi/documents/noi_documents.sql | 30 +++--- .../documents/noi_documents_total_count.sql | 23 +++++ .../sql/documents/documents.sql | 3 +- 7 files changed, 286 insertions(+), 17 deletions(-) create mode 100644 bin/migrate-oats-data/noi/documents/documents_noi.py create mode 100644 bin/migrate-oats-data/noi/documents/documents_noi.sql create mode 100644 bin/migrate-oats-data/noi/documents/documents_noi_total_count.sql create mode 100644 bin/migrate-oats-data/noi/documents/noi_documents.py create mode 100644 bin/migrate-oats-data/noi/documents/noi_documents_total_count.sql diff --git a/bin/migrate-oats-data/noi/documents/documents_noi.py b/bin/migrate-oats-data/noi/documents/documents_noi.py new file mode 100644 index 0000000000..e03bdaee79 --- /dev/null +++ b/bin/migrate-oats-data/noi/documents/documents_noi.py @@ -0,0 +1,93 @@ +from db import inject_conn_pool + +""" + This script connects to postgress version of OATS DB and transfers data from OATS documents table to ALCS document_noi table. + + NOTE: + Before performing document import you need to import applications from oats. +""" + + +def compile_document_insert_query(number_of_rows_to_insert): + """ + function takes the number of rows to insert and generates an SQL insert statement with upserts using the ON CONFLICT clause + """ + documents_to_insert = ",".join(["%s"] * number_of_rows_to_insert) + return f""" + INSERT INTO alcs."document_noi" (oats_document_id, file_name, oats_application_id, "source", + audit_created_by, file_key, mime_type, tags, "system") + VALUES {documents_to_insert} + ON CONFLICT (oats_document_id) DO UPDATE SET + oats_document_id = EXCLUDED.oats_document_id, + file_name = EXCLUDED.file_name, + oats_application_id = EXCLUDED.oats_application_id, + "source" = EXCLUDED."source", + audit_created_by = EXCLUDED.audit_created_by, + file_key = EXCLUDED.file_key, + mime_type = EXCLUDED.mime_type, + tags = EXCLUDED.tags, + "system" = EXCLUDED."system" + """ + + +@inject_conn_pool +def process_documents_noi(conn=None, batch_size=10000): + """ + function uses a decorator pattern @inject_conn_pool to inject a database connection pool to the function. It fetches the total count of documents and prints it to the console. Then, it fetches the documents to insert in batches using document IDs, constructs an insert query, and processes them. + """ + with conn.cursor() as cursor: + with open( + "noi/documents/documents_noi_total_count.sql", "r", encoding="utf-8" + ) as sql_file: + count_query = sql_file.read() + cursor.execute(count_query) + total_count = cursor.fetchone()[0] + print("Total count of noi documents to transfer:", total_count) + + failed_inserts = 0 + successful_inserts_count = 0 + last_document_id = 0 + + with open("noi/documents/documents_noi.sql", "r", encoding="utf-8") as sql_file: + documents_to_insert_sql = sql_file.read() + while True: + cursor.execute( + f"{documents_to_insert_sql} WHERE document_id > {last_document_id} ORDER BY document_id" + ) + rows = cursor.fetchmany(batch_size) + if not rows: + break + try: + documents_to_be_inserted_count = len(rows) + + insert_query = compile_document_insert_query( + documents_to_be_inserted_count + ) + cursor.execute(insert_query, rows) + conn.commit() + + last_document_id = rows[-1][0] + successful_inserts_count = ( + successful_inserts_count + documents_to_be_inserted_count + ) + + print( + f"retrieved/inserted items count: {documents_to_be_inserted_count}; total successfully inserted/updated documents so far {successful_inserts_count}; last inserted oats_document_id: {last_document_id}" + ) + except Exception as e: + conn.rollback() + print("Error", e) + failed_inserts += len(rows) + last_document_id = last_document_id + 1 + + print("Total amount of successful inserts:", successful_inserts_count) + print("Total amount of failed inserts:", failed_inserts) + + +@inject_conn_pool +def clean_documents_noi(conn=None): + print("Start documents_noi cleaning") + with conn.cursor() as cursor: + cursor.execute("DELETE FROM alcs.document_noi WHERE audit_created_by = 'oats_etl';") + conn.commit() + print(f"Deleted items count = {cursor.rowcount}") diff --git a/bin/migrate-oats-data/noi/documents/documents_noi.sql b/bin/migrate-oats-data/noi/documents/documents_noi.sql new file mode 100644 index 0000000000..23b362ef56 --- /dev/null +++ b/bin/migrate-oats-data/noi/documents/documents_noi.sql @@ -0,0 +1,33 @@ + WITH oats_documents_to_insert AS ( + SELECT + od.alr_application_id , + document_id , + document_code , + file_name , od.who_created + + from oats.oats_documents od + LEFT JOIN oats.oats_subject_properties osp + ON osp.subject_property_id = od.subject_property_id + AND osp.alr_application_id = od.alr_application_id + WHERE od.alr_application_id IS NOT NULL + AND document_code IS NOT NULL + AND od.issue_id IS NULL + AND od.planning_review_id IS NULL +) + SELECT + document_id::TEXT AS oats_document_id, + file_name, + alr_application_id::TEXT AS oats_application_id, + 'oats_etl' AS "source", + 'oats_etl' AS audit_created_by, + '/migrate/application/' || alr_application_id || '/' || document_id || '_' || file_name AS file_key, + 'pdf' AS mime_type, + '{"ORCS Classification: 85100-20"}'::TEXT[] AS tags, + CASE + WHEN who_created = 'PROXY_OATS_LOCGOV' THEN 'OATS_P' + WHEN who_created = 'PROXY_OATS_APPLICANT' THEN 'OATS_P' + ELSE 'OATS' + END AS "system" + FROM + oats_documents_to_insert oti + JOIN alcs.notice_of_intent noi ON noi.file_number = oti.alr_application_id::TEXT \ No newline at end of file diff --git a/bin/migrate-oats-data/noi/documents/documents_noi_total_count.sql b/bin/migrate-oats-data/noi/documents/documents_noi_total_count.sql new file mode 100644 index 0000000000..f2c098300e --- /dev/null +++ b/bin/migrate-oats-data/noi/documents/documents_noi_total_count.sql @@ -0,0 +1,22 @@ +WITH + oats_documents_to_insert AS ( + SELECT + od.alr_application_id, + document_id, + document_code, + file_name + FROM + oats.oats_documents od + LEFT JOIN oats.oats_subject_properties osp ON osp.subject_property_id = od.subject_property_id + AND osp.alr_application_id = od.alr_application_id + WHERE + od.alr_application_id IS NOT NULL + AND document_code IS NOT NULL + AND od.issue_id IS NULL + AND od.planning_review_id IS NULL + ) +SELECT + count(*) +FROM + oats_documents_to_insert oti + JOIN alcs.notice_of_intent a ON a.file_number = oti.alr_application_id::TEXT \ No newline at end of file diff --git a/bin/migrate-oats-data/noi/documents/noi_documents.py b/bin/migrate-oats-data/noi/documents/noi_documents.py new file mode 100644 index 0000000000..6000d41d09 --- /dev/null +++ b/bin/migrate-oats-data/noi/documents/noi_documents.py @@ -0,0 +1,99 @@ +from db import inject_conn_pool + +""" + This script links data from ALCS documents table to ALCS noi_documents table based on data from OATS. +""" + + +def compile_document_insert_query(number_of_rows_to_insert): + """ + function takes the number of rows to insert and generates an SQL insert statement with upserts using the ON CONFLICT clause + """ + documents_to_insert = ",".join(["%s"] * number_of_rows_to_insert) + return f""" + insert into alcs.noi_document + ( + application_uuid , + document_uuid , + type_code , + visibility_flags, + oats_document_id, + oats_application_id, + audit_created_by + ) + VALUES {documents_to_insert} + ON CONFLICT (oats_document_id, oats_application_id) DO UPDATE SET + application_uuid = EXCLUDED.application_uuid, + document_uuid = EXCLUDED.document_uuid, + type_code = EXCLUDED.type_code, + visibility_flags = EXCLUDED.visibility_flags, + audit_created_by = EXCLUDED.audit_created_by; + """ + + +@inject_conn_pool +def process_noi_documents(conn=None, batch_size=10000): + """ + function uses a decorator pattern @inject_conn_pool to inject a database connection pool to the function. It fetches the total count of documents and prints it to the console. Then, it fetches the documents to insert in batches using document IDs, constructs an insert query, and processes them. + """ + with conn.cursor() as cursor: + with open( + "noi/documents/noi_documents_total_count.sql", "r", encoding="utf-8" + ) as sql_file: + count_query = sql_file.read() + cursor.execute(count_query) + total_count = cursor.fetchone()[0] + print("Total count of noi documents to transfer:", total_count) + + failed_inserts = 0 + successful_inserts_count = 0 + last_document_id = 0 + + with open( + "noi/documents/noi_documents.sql", "r", encoding="utf-8" + ) as sql_file: + documents_to_insert_sql = sql_file.read() + while True: + cursor.execute( + f"{documents_to_insert_sql} WHERE oats_document_id > {last_document_id} ORDER BY oats_document_id" + ) + rows = cursor.fetchmany(batch_size) + if not rows: + break + try: + documents_to_be_inserted_count = len(rows) + + insert_query = compile_document_insert_query( + documents_to_be_inserted_count + ) + + cursor.execute(insert_query, rows) + conn.commit() + + last_document_id = rows[-1][4] + successful_inserts_count = ( + successful_inserts_count + documents_to_be_inserted_count + ) + + print( + f"retrieved/inserted items count: {documents_to_be_inserted_count}; total successfully inserted/updated items so far {successful_inserts_count}; last inserted oats_document_id: {last_document_id}" + ) + except Exception as e: + conn.rollback() + print("Error", e) + failed_inserts += len(rows) + last_document_id = last_document_id + 1 + + print("Total amount of successful inserts:", successful_inserts_count) + print("Total amount of failed inserts:", failed_inserts) + + +@inject_conn_pool +def clean_noi_documents(conn=None): + print("Start noi documents cleaning") + with conn.cursor() as cursor: + cursor.execute( + "DELETE FROM alcs.noi_document WHERE audit_created_by = 'oats_etl';" + ) + conn.commit() + print(f"Deleted items count = {cursor.rowcount}") diff --git a/bin/migrate-oats-data/noi/documents/noi_documents.sql b/bin/migrate-oats-data/noi/documents/noi_documents.sql index 732053abd4..2c62187162 100644 --- a/bin/migrate-oats-data/noi/documents/noi_documents.sql +++ b/bin/migrate-oats-data/noi/documents/noi_documents.sql @@ -1,36 +1,36 @@ WITH oats_documents_to_map AS ( SELECT - a.uuid AS application_uuid, + a.uuid AS noi_uuid, d.uuid AS document_uuid, adc.code, publicly_viewable_ind AS is_public, app_lg_viewable_ind AS is_app_lg, od.document_id AS oats_document_id, od.alr_application_id AS oats_application_id - from + FROM oats.oats_documents od - JOIN alcs."document" d + JOIN alcs."document_noi" d ON d.oats_document_id = od.document_id::TEXT - JOIN alcs.application_document_code adc + JOIN alcs.application_document_code adc -- using adc as it is the same mapping ON adc.oats_code = od.document_code - JOIN alcs.application a + JOIN alcs.notice_of_intent a ON a.file_number = od.alr_application_id::TEXT ) SELECT - otm.application_uuid, + otm.noi_uuid, otm.document_uuid, otm.code AS type_code, - (case when is_public = 'Y' and is_app_lg = 'Y' - then '{P, A, C, G}'::TEXT[] - when is_public = 'Y' - then '{P}'::TEXT[] - when is_app_lg='Y' - then '{A, C, G}'::TEXT[] - else '{}'::TEXT[] - end) AS visibility_flags, + (CASE WHEN is_public = 'Y' and is_app_lg = 'Y' + THEN '{P, A, C, G}'::TEXT[] + WHEN is_public = 'Y' + THEN '{P}'::TEXT[] + WHEN is_app_lg='Y' + THEN '{A, C, G}'::TEXT[] + ELSE '{}'::TEXT[] + END) AS visibility_flags, oats_document_id, oats_application_id, 'oats_etl' AS audit_created_by -from +FROM oats_documents_to_map otm \ No newline at end of file diff --git a/bin/migrate-oats-data/noi/documents/noi_documents_total_count.sql b/bin/migrate-oats-data/noi/documents/noi_documents_total_count.sql new file mode 100644 index 0000000000..21165ab8e1 --- /dev/null +++ b/bin/migrate-oats-data/noi/documents/noi_documents_total_count.sql @@ -0,0 +1,23 @@ +with oats_documents_to_map as ( + select + a.uuid AS application_uuid, + d.uuid AS document_uuid, + adc.code, + publicly_viewable_ind AS is_public, + app_lg_viewable_ind AS is_app_lg, + od.document_id AS oats_document_id, + od.alr_application_id AS oats_application_id + FROM oats.oats_documents od + + JOIN alcs."document_noi" d + ON d.oats_document_id = od.document_id::TEXT + + JOIN alcs.application_document_code adc -- reusing application table mapping + ON adc.oats_code = od.document_code + + JOIN alcs.notice_of_intent a + ON a.file_number = od.alr_application_id::TEXT +) +SELECT + count(*) +FROM oats_documents_to_map otm \ No newline at end of file diff --git a/bin/migrate-oats-data/sql/documents/documents.sql b/bin/migrate-oats-data/sql/documents/documents.sql index 703f9acecf..95ed0a0cda 100644 --- a/bin/migrate-oats-data/sql/documents/documents.sql +++ b/bin/migrate-oats-data/sql/documents/documents.sql @@ -30,5 +30,4 @@ END AS "system" FROM oats_documents_to_insert oti - JOIN alcs.application a ON a.file_number = oti.alr_application_id::text - JOIN alcs.notice_of_intent noi ON noi.file_number = oti.alr_application_id::text + JOIN alcs.application a ON a.file_number = oti.alr_application_id::text From 0c1c510b6e87ceacffe948cd1f240f746b991c51 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Wed, 2 Aug 2023 14:33:30 -0700 Subject: [PATCH 193/954] Add more subtexts and tooltips to Portal --- .../alcs-edit-submission.component.scss | 1 - .../edit-submission.component.scss | 1 - .../land-use/land-use.component.html | 22 +++++++++++++++++++ .../land-use/land-use.component.scss | 5 +++++ .../parcel-entry/parcel-entry.component.html | 9 ++++++-- .../tur-proposal/tur-proposal.component.html | 4 +--- 6 files changed, 35 insertions(+), 7 deletions(-) diff --git a/portal-frontend/src/app/features/alcs-edit-submission/alcs-edit-submission.component.scss b/portal-frontend/src/app/features/alcs-edit-submission/alcs-edit-submission.component.scss index 5dde460aa7..172d15447c 100644 --- a/portal-frontend/src/app/features/alcs-edit-submission/alcs-edit-submission.component.scss +++ b/portal-frontend/src/app/features/alcs-edit-submission/alcs-edit-submission.component.scss @@ -336,7 +336,6 @@ .land-use-form { display: grid; grid-template-columns: 1fr; - row-gap: rem(24); .land-use-type-wrapper { display: flex; diff --git a/portal-frontend/src/app/features/edit-submission/edit-submission.component.scss b/portal-frontend/src/app/features/edit-submission/edit-submission.component.scss index d2b9828254..cb18914260 100644 --- a/portal-frontend/src/app/features/edit-submission/edit-submission.component.scss +++ b/portal-frontend/src/app/features/edit-submission/edit-submission.component.scss @@ -349,7 +349,6 @@ .land-use-form { display: grid; grid-template-columns: 1fr; - row-gap: rem(24); .land-use-type-wrapper { display: flex; diff --git a/portal-frontend/src/app/features/edit-submission/land-use/land-use.component.html b/portal-frontend/src/app/features/edit-submission/land-use/land-use.component.html index 4d44599ce1..8343869399 100644 --- a/portal-frontend/src/app/features/edit-submission/land-use/land-use.component.html +++ b/portal-frontend/src/app/features/edit-submission/land-use/land-use.component.html @@ -20,6 +20,7 @@
Land Use of Parcel(s) under Application
+
You may describe multiple parcels collectively or individually.
+
+ + +
+
+
diff --git a/alcs-frontend/src/app/shared/inline-editors/inline-textarea-edit/inline-textarea-edit.component.scss b/alcs-frontend/src/app/shared/inline-editors/inline-textarea-edit/inline-textarea-edit.component.scss new file mode 100644 index 0000000000..cc09826d94 --- /dev/null +++ b/alcs-frontend/src/app/shared/inline-editors/inline-textarea-edit/inline-textarea-edit.component.scss @@ -0,0 +1,73 @@ +@use '../../../../styles/colors'; + +.editable { + display: inline-block; + cursor: pointer; + border: 2px solid colors.$primary-color-dark; + padding: 8px; + border-radius: 2px; + font-size: 16px; + width: 100%; + min-height: 96px; + margin-left: -8px; + margin-right: -8px; +} + +.content { + display: flex; + align-items: stretch; + justify-content: space-between; + border-radius: 2px; + font-size: 16px; + border: 2px solid transparent; + margin-left: -8px; + margin-right: -8px; + min-height: 28px; +} + +.text { + padding: 8px; +} + +.content:hover { + border: 2px solid colors.$grey; + border-radius: 4px; + cursor: pointer; + + .edit-button { + color: colors.$white; + background-color: colors.$grey; + } + + mat-icon { + display: inline-block; + } +} + +.edit-button { + min-width: 32px; + display: flex; + align-items: center; + justify-content: center; + + mat-icon { + display: none; + } +} + +.editing.hidden { + display: none; +} + +.placeholder { + font-style: italic; + color: colors.$grey; +} + +.editable:hover { + border: 2px solid colors.$primary-color; +} + +.save { + color: colors.$primary-color; +} diff --git a/alcs-frontend/src/app/shared/inline-editors/inline-textarea-edit/inline-textarea-edit.component.spec.ts b/alcs-frontend/src/app/shared/inline-editors/inline-textarea-edit/inline-textarea-edit.component.spec.ts new file mode 100644 index 0000000000..a2dcf4e500 --- /dev/null +++ b/alcs-frontend/src/app/shared/inline-editors/inline-textarea-edit/inline-textarea-edit.component.spec.ts @@ -0,0 +1,24 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { InlineTextareaEditComponent } from './inline-textarea-edit.component'; + +describe('InlineTextareaComponent', () => { + let component: InlineTextareaEditComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [InlineTextareaEditComponent], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(InlineTextareaEditComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/alcs-frontend/src/app/shared/inline-editors/inline-textarea-edit/inline-textarea-edit.component.ts b/alcs-frontend/src/app/shared/inline-editors/inline-textarea-edit/inline-textarea-edit.component.ts new file mode 100644 index 0000000000..5f6daba83c --- /dev/null +++ b/alcs-frontend/src/app/shared/inline-editors/inline-textarea-edit/inline-textarea-edit.component.ts @@ -0,0 +1,45 @@ +import { Component, ElementRef, EventEmitter, Input, Output, ViewChild } from '@angular/core'; + +@Component({ + selector: 'app-inline-edit[value]', + templateUrl: './inline-textarea-edit.component.html', + styleUrls: ['./inline-textarea-edit.component.scss'], +}) +export class InlineTextareaEditComponent { + @Input() value: string = ''; + @Input() placeholder: string = 'Enter a value'; + @Output() save = new EventEmitter(); + + @ViewChild('editInput') textInput!: ElementRef; + + isEditing = false; + hasFocused = false; + pendingValue: undefined | string; + + constructor() {} + + startEdit() { + this.isEditing = true; + this.hasFocused = false; + this.pendingValue = this.value; + setTimeout(() => { + if (this.textInput) { + this.textInput.nativeElement.focus(); + } + }, 300); + } + + confirmEdit() { + if (this.pendingValue !== this.value && this.pendingValue !== undefined) { + this.save.emit(this.pendingValue); + this.value = this.pendingValue; + } + + this.isEditing = false; + } + + cancelEdit() { + this.isEditing = false; + this.pendingValue = this.value; + } +} diff --git a/alcs-frontend/src/app/shared/inline-editors/inline-textarea/inline-textarea.component.html b/alcs-frontend/src/app/shared/inline-editors/inline-textarea/inline-textarea.component.html index b3031b168b..8b4e4583c7 100644 --- a/alcs-frontend/src/app/shared/inline-editors/inline-textarea/inline-textarea.component.html +++ b/alcs-frontend/src/app/shared/inline-editors/inline-textarea/inline-textarea.component.html @@ -1,13 +1,13 @@ -
-
-
- {{ placeholder}} +
+ + Add text + {{ value }} -
-
- edit -
-
+ + +
+
diff --git a/alcs-frontend/src/app/shared/inline-editors/inline-textarea/inline-textarea.component.scss b/alcs-frontend/src/app/shared/inline-editors/inline-textarea/inline-textarea.component.scss index cc09826d94..5775eff0d0 100644 --- a/alcs-frontend/src/app/shared/inline-editors/inline-textarea/inline-textarea.component.scss +++ b/alcs-frontend/src/app/shared/inline-editors/inline-textarea/inline-textarea.component.scss @@ -1,73 +1,72 @@ @use '../../../../styles/colors'; -.editable { - display: inline-block; - cursor: pointer; - border: 2px solid colors.$primary-color-dark; - padding: 8px; - border-radius: 2px; - font-size: 16px; - width: 100%; - min-height: 96px; - margin-left: -8px; - margin-right: -8px; +.inline-number-wrapper { + padding-top: 4px; } -.content { - display: flex; - align-items: stretch; - justify-content: space-between; - border-radius: 2px; - font-size: 16px; - border: 2px solid transparent; - margin-left: -8px; - margin-right: -8px; - min-height: 28px; +.editing { + width: 100%; + display: inline-block; } -.text { - padding: 8px; +.editing.hidden { + display: none; } -.content:hover { - border: 2px solid colors.$grey; - border-radius: 4px; - cursor: pointer; - - .edit-button { - color: colors.$white; - background-color: colors.$grey; - } +.edit-button { + height: 24px; + width: 24px; + display: flex; + align-items: center; +} - mat-icon { - display: inline-block; - } +.edit-icon { + font-size: inherit; + line-height: 22px; } -.edit-button { - min-width: 32px; +.button-container { display: flex; - align-items: center; - justify-content: center; + justify-content: flex-end; - mat-icon { - display: none; + button:not(:last-child) { + margin-right: 2px !important; } } -.editing.hidden { - display: none; +.add { + cursor: pointer; } -.placeholder { - font-style: italic; - color: colors.$grey; +.save { + color: colors.$primary-color; } -.editable:hover { - border: 2px solid colors.$primary-color; +:host::ng-deep { + .mat-form-field-wrapper { + padding: 0 !important; + margin: 0 !important; + } + + button mat-icon { + overflow: visible; + } + + .mat-mdc-icon-button.mat-mdc-button-base { + padding: 0 !important; + } } -.save { - color: colors.$primary-color; +.editable { + width: 100%; + display: inline-block; + border: 2px solid colors.$primary-color-dark; + padding: 8px; + border-radius: 2px; + font-size: 16px; + width: 100%; + min-height: 96px; + margin-left: -8px; + margin-right: -8px; + background: none; } diff --git a/alcs-frontend/src/app/shared/inline-editors/inline-textarea/inline-textarea.component.ts b/alcs-frontend/src/app/shared/inline-editors/inline-textarea/inline-textarea.component.ts index 4320990c37..34d879ecc0 100644 --- a/alcs-frontend/src/app/shared/inline-editors/inline-textarea/inline-textarea.component.ts +++ b/alcs-frontend/src/app/shared/inline-editors/inline-textarea/inline-textarea.component.ts @@ -1,14 +1,14 @@ -import { Component, ElementRef, EventEmitter, Input, Output, ViewChild } from '@angular/core'; +import { AfterContentChecked, Component, ElementRef, EventEmitter, Input, Output, ViewChild } from '@angular/core'; @Component({ - selector: 'app-inline-edit[value]', + selector: 'app-inline-textarea[value]', templateUrl: './inline-textarea.component.html', styleUrls: ['./inline-textarea.component.scss'], }) export class InlineTextareaComponent { - @Input() value: string = ''; + @Input() value?: string | undefined; @Input() placeholder: string = 'Enter a value'; - @Output() save = new EventEmitter(); + @Output() save = new EventEmitter(); @ViewChild('editInput') textInput!: ElementRef; @@ -30,8 +30,8 @@ export class InlineTextareaComponent { } confirmEdit() { - if (this.pendingValue !== this.value && this.pendingValue !== undefined) { - this.save.emit(this.pendingValue); + if (this.pendingValue !== this.value) { + this.save.emit(this.pendingValue?.toString() ?? null); this.value = this.pendingValue; } diff --git a/alcs-frontend/src/app/shared/lots-table/lots-table-form.component.html b/alcs-frontend/src/app/shared/lots-table/lots-table-form.component.html index 4506f99631..cb89e20f9d 100644 --- a/alcs-frontend/src/app/shared/lots-table/lots-table-form.component.html +++ b/alcs-frontend/src/app/shared/lots-table/lots-table-form.component.html @@ -28,7 +28,7 @@ Type - + Lot Road Dedication @@ -48,7 +48,7 @@ separatorLimit="9999999999" min="0.01" formControlName="{{ i }}-lotSize" - (change)='fireChanged()' + (change)="fireChanged()" /> ha @@ -67,13 +67,22 @@ separatorLimit="9999999999" min="0.01" formControlName="{{ i }}-lotAlrArea" - (change)='fireChanged()' + (change)="fireChanged()" /> ha + + diff --git a/alcs-frontend/src/app/shared/lots-table/lots-table-form.component.ts b/alcs-frontend/src/app/shared/lots-table/lots-table-form.component.ts index c9a65c177e..0606104c47 100644 --- a/alcs-frontend/src/app/shared/lots-table/lots-table-form.component.ts +++ b/alcs-frontend/src/app/shared/lots-table/lots-table-form.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; import { AbstractControl, ControlValueAccessor, @@ -11,7 +11,12 @@ import { } from '@angular/forms'; import { MatTableDataSource } from '@angular/material/table'; -type ProposedLot = { type: 'Lot' | 'Road Dedication' | null; size: string | null; alrArea: string | null }; +type ProposedLot = { + type: 'Lot' | 'Road Dedication' | null; + size: string | null; + alrArea: string | null; + uuid: string | null; +}; @Component({ selector: 'app-lots-table', @@ -63,6 +68,7 @@ export class LotsTableFormComponent implements ControlValueAccessor, Validator { size: null, alrArea: null, type: null, + uuid: null, }); } @@ -84,6 +90,7 @@ export class LotsTableFormComponent implements ControlValueAccessor, Validator { this.form.addControl(`${index}-lotType`, new FormControl(lot.type, [Validators.required])); this.form.addControl(`${index}-lotSize`, new FormControl(lot.size, [Validators.required])); this.form.addControl(`${index}-lotAlrArea`, new FormControl(lot.alrArea, [Validators.required])); + this.form.addControl(`${index}-lotUuid`, new FormControl(lot.uuid)); }); } @@ -142,10 +149,12 @@ export class LotsTableFormComponent implements ControlValueAccessor, Validator { const lotType = this.form.controls[`${index}-lotType`].value; const lotSize = this.form.controls[`${index}-lotSize`].value; const lotAlrArea = this.form.controls[`${index}-lotAlrArea`].value; + const lotUuid = this.form.controls[`${index}-lotUuid`].value; proposedLots.push({ size: lotSize, type: lotType, alrArea: lotAlrArea, + uuid: lotUuid, }); } } diff --git a/alcs-frontend/src/app/shared/shared.module.ts b/alcs-frontend/src/app/shared/shared.module.ts index 36ea036d66..f80164609a 100644 --- a/alcs-frontend/src/app/shared/shared.module.ts +++ b/alcs-frontend/src/app/shared/shared.module.ts @@ -44,11 +44,12 @@ import { InlineApplicantTypeComponent } from './inline-applicant-type/inline-app import { InlineBooleanComponent } from './inline-editors/inline-boolean/inline-boolean.component'; import { InlineDatepickerComponent } from './inline-editors/inline-datepicker/inline-datepicker.component'; import { InlineDropdownComponent } from './inline-editors/inline-dropdown/inline-dropdown.component'; +import { InlineNgSelectComponent } from './inline-editors/inline-ng-select/inline-ng-select.component'; import { InlineNumberComponent } from './inline-editors/inline-number/inline-number.component'; import { InlineReviewOutcomeComponent } from './inline-editors/inline-review-outcome/inline-review-outcome.component'; import { InlineTextComponent } from './inline-editors/inline-text/inline-text.component'; +import { InlineTextareaEditComponent } from './inline-editors/inline-textarea-edit/inline-textarea-edit.component'; import { InlineTextareaComponent } from './inline-editors/inline-textarea/inline-textarea.component'; -import { InlineNgSelectComponent } from './inline-editors/inline-ng-select/inline-ng-select.component'; import { LotsTableFormComponent } from './lots-table/lots-table-form.component'; import { MeetingOverviewComponent } from './meeting-overview/meeting-overview.component'; import { NoDataComponent } from './no-data/no-data.component'; @@ -74,6 +75,7 @@ import { WarningBannerComponent } from './warning-banner/warning-banner.componen StartOfDayPipe, MeetingOverviewComponent, InlineApplicantTypeComponent, + InlineTextareaEditComponent, InlineTextareaComponent, InlineBooleanComponent, InlineNumberComponent, @@ -151,6 +153,7 @@ import { WarningBannerComponent } from './warning-banner/warning-banner.componen StartOfDayPipe, MatTooltipModule, InlineApplicantTypeComponent, + InlineTextareaEditComponent, InlineTextareaComponent, InlineBooleanComponent, InlineNumberComponent, diff --git a/services/apps/alcs/src/alcs/application-decision/application-component-lot/application-decision-component-lot.controller.spec.ts b/services/apps/alcs/src/alcs/application-decision/application-component-lot/application-decision-component-lot.controller.spec.ts new file mode 100644 index 0000000000..d5b3509c72 --- /dev/null +++ b/services/apps/alcs/src/alcs/application-decision/application-component-lot/application-decision-component-lot.controller.spec.ts @@ -0,0 +1,73 @@ +import { classes } from '@automapper/classes'; +import { AutomapperModule } from '@automapper/nestjs'; +import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; +import { Test, TestingModule } from '@nestjs/testing'; +import { ClsService } from 'nestjs-cls'; +import { mockKeyCloakProviders } from '../../../../test/mocks/mockTypes'; +import { ApplicationDecisionProfile } from '../../../common/automapper/application-decision-v2.automapper.profile'; +import { ApplicationDecisionComponentLotController } from './application-decision-component-lot.controller'; +import { UpdateApplicationDecisionComponentLotDto } from './application-decision-component-lot.dto'; +import { ApplicationDecisionComponentLot } from './application-decision-component-lot.entity'; +import { ApplicationDecisionComponentLotService } from './application-decision-component-lot.service'; + +describe('ApplicationDecisionComponentLotController', () => { + let controller: ApplicationDecisionComponentLotController; + let mockApplicationDecisionComponentLotService: DeepMocked; + + beforeEach(async () => { + mockApplicationDecisionComponentLotService = createMock(); + + const module: TestingModule = await Test.createTestingModule({ + controllers: [ApplicationDecisionComponentLotController], + imports: [ + AutomapperModule.forRoot({ + strategyInitializer: classes(), + }), + ], + providers: [ + ApplicationDecisionProfile, + { + provide: ApplicationDecisionComponentLotService, + useValue: mockApplicationDecisionComponentLotService, + }, + { + provide: ClsService, + useValue: {}, + }, + ...mockKeyCloakProviders, + ], + }).compile(); + + controller = module.get( + ApplicationDecisionComponentLotController, + ); + }); + + it('should be defined', () => { + expect(controller).toBeDefined(); + }); + + it('should successfully call service to update', async () => { + mockApplicationDecisionComponentLotService.update.mockResolvedValue( + new ApplicationDecisionComponentLot(), + ); + + const updateDto = { + type: 'Lot', + alrArea: 1, + size: 1, + uuid: 'fake', + } as UpdateApplicationDecisionComponentLotDto; + + const result = await controller.update('fake', updateDto); + + expect(result).toBeDefined(); + expect(mockApplicationDecisionComponentLotService.update).toBeCalledTimes( + 1, + ); + expect(mockApplicationDecisionComponentLotService.update).toBeCalledWith( + 'fake', + updateDto, + ); + }); +}); diff --git a/services/apps/alcs/src/alcs/application-decision/application-component-lot/application-decision-component-lot.controller.ts b/services/apps/alcs/src/alcs/application-decision/application-component-lot/application-decision-component-lot.controller.ts new file mode 100644 index 0000000000..673f5e7582 --- /dev/null +++ b/services/apps/alcs/src/alcs/application-decision/application-component-lot/application-decision-component-lot.controller.ts @@ -0,0 +1,33 @@ +import { Mapper } from '@automapper/core'; +import { InjectMapper } from '@automapper/nestjs'; +import { Body, Controller, Param, Patch } from '@nestjs/common'; +import { ANY_AUTH_ROLE } from '../../../common/authorization/roles'; +import { UserRoles } from '../../../common/authorization/roles.decorator'; +import { + ApplicationDecisionComponentLotDto, + UpdateApplicationDecisionComponentLotDto, +} from './application-decision-component-lot.dto'; +import { ApplicationDecisionComponentLot } from './application-decision-component-lot.entity'; +import { ApplicationDecisionComponentLotService } from './application-decision-component-lot.service'; + +@Controller('application-decision-component-lot') +@UserRoles(...ANY_AUTH_ROLE) +export class ApplicationDecisionComponentLotController { + constructor( + private componentLotService: ApplicationDecisionComponentLotService, + @InjectMapper() private mapper: Mapper, + ) {} + + @Patch('/:uuid') + async update( + @Param('uuid') uuid: string, + @Body() updateDto: UpdateApplicationDecisionComponentLotDto, + ) { + const updatedLot = await this.componentLotService.update(uuid, updateDto); + return this.mapper.mapAsync( + updatedLot, + ApplicationDecisionComponentLot, + ApplicationDecisionComponentLotDto, + ); + } +} diff --git a/services/apps/alcs/src/alcs/application-decision/application-component-lot/application-decision-component-lot.dto.ts b/services/apps/alcs/src/alcs/application-decision/application-component-lot/application-decision-component-lot.dto.ts new file mode 100644 index 0000000000..35f604b2f0 --- /dev/null +++ b/services/apps/alcs/src/alcs/application-decision/application-component-lot/application-decision-component-lot.dto.ts @@ -0,0 +1,27 @@ +import { IsNumber, IsOptional, IsString } from 'class-validator'; + +export class UpdateApplicationDecisionComponentLotDto { + @IsString() + @IsOptional() + type: 'Lot' | 'Road Dedication' | null; + + @IsNumber() + @IsOptional() + alrArea: number | null; + + @IsNumber() + @IsOptional() + size: number | null; + + @IsString() + uuid: string; +} + +export class ApplicationDecisionComponentLotDto { + index: number; + componentUuid: string; + type: 'Lot' | 'Road Dedication' | null; + alrArea: number | null; + size: number | null; + uuid: string; +} diff --git a/services/apps/alcs/src/alcs/application-decision/application-component-lot/application-decision-component-lot.entity.ts b/services/apps/alcs/src/alcs/application-decision/application-component-lot/application-decision-component-lot.entity.ts new file mode 100644 index 0000000000..a8b4b7cab3 --- /dev/null +++ b/services/apps/alcs/src/alcs/application-decision/application-component-lot/application-decision-component-lot.entity.ts @@ -0,0 +1,73 @@ +import { AutoMap } from '@automapper/classes'; +import { Type } from 'class-transformer'; +import { Column, Entity, ManyToMany, ManyToOne } from 'typeorm'; +import { Base } from '../../../common/entities/base.entity'; +import { ColumnNumericTransformer } from '../../../utils/column-numeric-transform'; +import { ApplicationDecisionConditionToComponentLot } from '../application-condition-to-component-lot/application-decision-condition-to-component-lot.entity'; +import { ApplicationDecisionComponent } from '../application-decision-v2/application-decision/component/application-decision-component.entity'; + +export class ProposedLot { + type: 'Lot' | 'Road Dedication' | null; + alrArea?: number | null; + size: number | null; + planNumbers: string | null; +} + +//Contains the approved subdivision lots +@Entity() +export class ApplicationDecisionComponentLot extends Base { + constructor(data?: Partial) { + super(); + if (data) { + Object.assign(this, data); + } + } + + @AutoMap() + @Column({ type: 'int' }) + index: number; + + @AutoMap(() => String) + @Column({ + type: 'text', + nullable: true, + }) + type: 'Lot' | 'Road Dedication' | null; + + @AutoMap(() => Number) + @Column({ + type: 'decimal', + nullable: true, + precision: 12, + scale: 2, + transformer: new ColumnNumericTransformer(), + }) + alrArea?: number | null; + + @AutoMap(() => Number) + @Column({ + type: 'decimal', + nullable: true, + precision: 12, + scale: 2, + transformer: new ColumnNumericTransformer(), + }) + size?: number | null; + + @AutoMap() + @Column() + componentUuid: string; + + @ManyToOne(() => ApplicationDecisionComponent) + @Type(() => ApplicationDecisionComponent) + component: ApplicationDecisionComponent; + + @ManyToMany( + () => ApplicationDecisionConditionToComponentLot, + (e) => e.componentLot, + { + cascade: ['soft-remove', 'insert', 'update', 'remove'], + }, + ) + conditionLots: ApplicationDecisionConditionToComponentLot[]; +} diff --git a/services/apps/alcs/src/alcs/application-decision/application-component-lot/application-decision-component-lot.service.spec.ts b/services/apps/alcs/src/alcs/application-decision/application-component-lot/application-decision-component-lot.service.spec.ts new file mode 100644 index 0000000000..cd43b14592 --- /dev/null +++ b/services/apps/alcs/src/alcs/application-decision/application-component-lot/application-decision-component-lot.service.spec.ts @@ -0,0 +1,123 @@ +import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; +import { Test, TestingModule } from '@nestjs/testing'; +import { getRepositoryToken } from '@nestjs/typeorm'; +import { In, Repository } from 'typeorm'; +import { UpdateApplicationDecisionComponentLotDto } from './application-decision-component-lot.dto'; +import { ApplicationDecisionComponentLot } from './application-decision-component-lot.entity'; +import { ApplicationDecisionComponentLotService } from './application-decision-component-lot.service'; + +describe('ApplicationDecisionComponentLotService', () => { + let service: ApplicationDecisionComponentLotService; + let mockApplicationDecisionComponentLotRepository: DeepMocked< + Repository + >; + + beforeEach(async () => { + mockApplicationDecisionComponentLotRepository = createMock(); + + const module: TestingModule = await Test.createTestingModule({ + providers: [ + ApplicationDecisionComponentLotService, + { + provide: getRepositoryToken(ApplicationDecisionComponentLot), + useValue: mockApplicationDecisionComponentLotRepository, + }, + ], + }).compile(); + + service = module.get( + ApplicationDecisionComponentLotService, + ); + }); + + it('should be defined', () => { + expect(service).toBeDefined(); + }); + + it('should update component lot', async () => { + const dto = { + alrArea: 1, + uuid: '1', + } as UpdateApplicationDecisionComponentLotDto; + + const lot = new ApplicationDecisionComponentLot(); + mockApplicationDecisionComponentLotRepository.findOneByOrFail.mockResolvedValue( + lot, + ); + const updatedLot = new ApplicationDecisionComponentLot({ + alrArea: dto.alrArea, + }); + mockApplicationDecisionComponentLotRepository.save.mockResolvedValue( + updatedLot, + ); + + const result = await service.update('1', dto); + + expect(result).toEqual(updatedLot); + expect(mockApplicationDecisionComponentLotRepository.save).toBeCalledWith( + updatedLot, + ); + expect(mockApplicationDecisionComponentLotRepository.save).toBeCalledTimes( + 1, + ); + expect( + mockApplicationDecisionComponentLotRepository.findOneByOrFail, + ).toBeCalledTimes(1); + expect( + mockApplicationDecisionComponentLotRepository.findOneByOrFail, + ).toBeCalledWith({ uuid: dto.uuid }); + }); + + it('should soft remove by componentUuid', async () => { + const lots = [ + new ApplicationDecisionComponentLot(), + new ApplicationDecisionComponentLot(), + ]; + mockApplicationDecisionComponentLotRepository.findBy.mockResolvedValue( + lots, + ); + mockApplicationDecisionComponentLotRepository.softRemove.mockResolvedValue( + [] as any, + ); + await service.softRemoveBy('1'); + expect(mockApplicationDecisionComponentLotRepository.findBy).toBeCalledWith( + { componentUuid: '1' }, + ); + expect( + mockApplicationDecisionComponentLotRepository.findBy, + ).toBeCalledTimes(1); + expect( + mockApplicationDecisionComponentLotRepository.softRemove, + ).toBeCalledTimes(1); + expect( + mockApplicationDecisionComponentLotRepository.softRemove, + ).toBeCalledWith(lots); + }); + + it('should soft remove by uuids', async () => { + const lots = [ + new ApplicationDecisionComponentLot(), + new ApplicationDecisionComponentLot(), + ]; + mockApplicationDecisionComponentLotRepository.findBy.mockResolvedValue( + lots, + ); + mockApplicationDecisionComponentLotRepository.softRemove.mockResolvedValue( + [] as any, + ); + await service.softRemove(['1', '2']); + + expect(mockApplicationDecisionComponentLotRepository.findBy).toBeCalledWith( + { uuid: In(['1', '2']) }, + ); + expect( + mockApplicationDecisionComponentLotRepository.findBy, + ).toBeCalledTimes(1); + expect( + mockApplicationDecisionComponentLotRepository.softRemove, + ).toBeCalledTimes(1); + expect( + mockApplicationDecisionComponentLotRepository.softRemove, + ).toBeCalledWith(lots); + }); +}); diff --git a/services/apps/alcs/src/alcs/application-decision/application-component-lot/application-decision-component-lot.service.ts b/services/apps/alcs/src/alcs/application-decision/application-component-lot/application-decision-component-lot.service.ts new file mode 100644 index 0000000000..98dc5f46eb --- /dev/null +++ b/services/apps/alcs/src/alcs/application-decision/application-component-lot/application-decision-component-lot.service.ts @@ -0,0 +1,41 @@ +import { Injectable } from '@nestjs/common'; +import { InjectRepository } from '@nestjs/typeorm'; +import { In, Repository } from 'typeorm'; +import { UpdateApplicationDecisionComponentLotDto } from './application-decision-component-lot.dto'; +import { ApplicationDecisionComponentLot } from './application-decision-component-lot.entity'; + +@Injectable() +export class ApplicationDecisionComponentLotService { + constructor( + @InjectRepository(ApplicationDecisionComponentLot) + private componentLotRepository: Repository, + ) {} + + async update( + uuid: string, + updateDto: UpdateApplicationDecisionComponentLotDto, + ) { + const existingLot = await this.componentLotRepository.findOneByOrFail({ + uuid, + }); + + existingLot.alrArea = updateDto.alrArea; + return await this.componentLotRepository.save(existingLot); + } + + async softRemoveBy(componentUuid: string) { + const componentLots = await this.componentLotRepository.findBy({ + componentUuid, + }); + + return await this.componentLotRepository.softRemove(componentLots); + } + + async softRemove(uuids: string[]) { + const componentLots = await this.componentLotRepository.findBy({ + uuid: In(uuids), + }); + + return await this.componentLotRepository.softRemove(componentLots); + } +} diff --git a/services/apps/alcs/src/alcs/application-decision/application-condition-to-component-lot/application-condition-to-component-lot.controller.dto.ts b/services/apps/alcs/src/alcs/application-decision/application-condition-to-component-lot/application-condition-to-component-lot.controller.dto.ts new file mode 100644 index 0000000000..92d5d2b0c8 --- /dev/null +++ b/services/apps/alcs/src/alcs/application-decision/application-condition-to-component-lot/application-condition-to-component-lot.controller.dto.ts @@ -0,0 +1,7 @@ +export class ApplicationDecisionConditionToComponentLotDto { + componentLotUuid: string; + + conditionUuid: string; + + planNumbers: string; +} diff --git a/services/apps/alcs/src/alcs/application-decision/application-condition-to-component-lot/application-condition-to-component-lot.controller.spec.ts b/services/apps/alcs/src/alcs/application-decision/application-condition-to-component-lot/application-condition-to-component-lot.controller.spec.ts new file mode 100644 index 0000000000..464275aca8 --- /dev/null +++ b/services/apps/alcs/src/alcs/application-decision/application-condition-to-component-lot/application-condition-to-component-lot.controller.spec.ts @@ -0,0 +1,81 @@ +import { classes } from '@automapper/classes'; +import { AutomapperModule } from '@automapper/nestjs'; +import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; +import { Test, TestingModule } from '@nestjs/testing'; +import { ClsService } from 'nestjs-cls'; +import { mockKeyCloakProviders } from '../../../../test/mocks/mockTypes'; +import { ApplicationDecisionProfile } from '../../../common/automapper/application-decision-v2.automapper.profile'; +import { ApplicationConditionToComponentLotController } from './application-condition-to-component-lot.controller'; +import { ApplicationConditionToComponentLotService } from './application-condition-to-component-lot.service'; +import { ApplicationDecisionConditionToComponentLot } from './application-decision-condition-to-component-lot.entity'; + +describe('ApplicationConditionToComponentLotController', () => { + let controller: ApplicationConditionToComponentLotController; + let mockApplicationConditionToComponentLotService: DeepMocked; + + beforeEach(async () => { + mockApplicationConditionToComponentLotService = createMock(); + + const module: TestingModule = await Test.createTestingModule({ + imports: [ + AutomapperModule.forRoot({ + strategyInitializer: classes(), + }), + ], + controllers: [ApplicationConditionToComponentLotController], + providers: [ + ApplicationDecisionProfile, + { + provide: ApplicationConditionToComponentLotService, + useValue: mockApplicationConditionToComponentLotService, + }, + { + provide: ClsService, + useValue: {}, + }, + ...mockKeyCloakProviders, + ], + }).compile(); + + controller = module.get( + ApplicationConditionToComponentLotController, + ); + }); + + it('should be defined', () => { + expect(controller).toBeDefined(); + }); + + it('should successfully call service to update lot', async () => { + mockApplicationConditionToComponentLotService.createOrUpdate.mockResolvedValue( + new ApplicationDecisionConditionToComponentLot(), + ); + + const result = await controller.update('fake-1', 'fake-2', {} as any); + + expect(result).toBeDefined(); + expect( + mockApplicationConditionToComponentLotService.createOrUpdate, + ).toBeCalledTimes(1); + expect( + mockApplicationConditionToComponentLotService.createOrUpdate, + ).toBeCalledWith('fake-2', 'fake-1', {}); + }); + + it('should successfully call service to fetch lots', async () => { + mockApplicationConditionToComponentLotService.fetch.mockResolvedValue([ + new ApplicationDecisionConditionToComponentLot(), + ]); + + const result = await controller.get('fake-1', 'fake-2'); + + expect(result).toBeDefined(); + expect(mockApplicationConditionToComponentLotService.fetch).toBeCalledTimes( + 1, + ); + expect(mockApplicationConditionToComponentLotService.fetch).toBeCalledWith( + 'fake-1', + 'fake-2', + ); + }); +}); diff --git a/services/apps/alcs/src/alcs/application-decision/application-condition-to-component-lot/application-condition-to-component-lot.controller.ts b/services/apps/alcs/src/alcs/application-decision/application-condition-to-component-lot/application-condition-to-component-lot.controller.ts new file mode 100644 index 0000000000..b945567a54 --- /dev/null +++ b/services/apps/alcs/src/alcs/application-decision/application-condition-to-component-lot/application-condition-to-component-lot.controller.ts @@ -0,0 +1,51 @@ +import { Mapper } from '@automapper/core'; +import { InjectMapper } from '@automapper/nestjs'; +import { Body, Controller, Get, Param, Patch } from '@nestjs/common'; +import { ANY_AUTH_ROLE } from '../../../common/authorization/roles'; +import { UserRoles } from '../../../common/authorization/roles.decorator'; +import { ApplicationDecisionConditionToComponentLotDto } from './application-condition-to-component-lot.controller.dto'; +import { ApplicationConditionToComponentLotService } from './application-condition-to-component-lot.service'; +import { ApplicationDecisionConditionToComponentLot } from './application-decision-condition-to-component-lot.entity'; + +@Controller('application-condition-to-component-lot') +@UserRoles(...ANY_AUTH_ROLE) +export class ApplicationConditionToComponentLotController { + constructor( + private conditionLotService: ApplicationConditionToComponentLotService, + @InjectMapper() private mapper: Mapper, + ) {} + + @Patch('/condition/:conditionUuid/component-lot/:lotUuid') + async update( + @Param('conditionUuid') conditionUuid: string, + @Param('lotUuid') lotUuid: string, + @Body() planNumbers: string | null, + ) { + const updatedLot = await this.conditionLotService.createOrUpdate( + lotUuid, + conditionUuid, + planNumbers, + ); + return this.mapper.mapAsync( + updatedLot, + ApplicationDecisionConditionToComponentLot, + ApplicationDecisionConditionToComponentLotDto, + ); + } + + @Get('/component/:componentUuid/condition/:conditionUuid') + async get( + @Param('componentUuid') componentUuid: string, + @Param('conditionUuid') conditionUuid: string, + ) { + const updatedLot = await this.conditionLotService.fetch( + componentUuid, + conditionUuid, + ); + return await this.mapper.mapArrayAsync( + updatedLot, + ApplicationDecisionConditionToComponentLot, + ApplicationDecisionConditionToComponentLotDto, + ); + } +} diff --git a/services/apps/alcs/src/alcs/application-decision/application-condition-to-component-lot/application-condition-to-component-lot.service.spec.ts b/services/apps/alcs/src/alcs/application-decision/application-condition-to-component-lot/application-condition-to-component-lot.service.spec.ts new file mode 100644 index 0000000000..576d274d74 --- /dev/null +++ b/services/apps/alcs/src/alcs/application-decision/application-condition-to-component-lot/application-condition-to-component-lot.service.spec.ts @@ -0,0 +1,145 @@ +import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; +import { Test, TestingModule } from '@nestjs/testing'; +import { getRepositoryToken } from '@nestjs/typeorm'; +import { Repository } from 'typeorm'; +import { ApplicationConditionToComponentLotService } from './application-condition-to-component-lot.service'; +import { ApplicationDecisionConditionToComponentLot } from './application-decision-condition-to-component-lot.entity'; + +describe('ApplicationConditionToComponentLotService', () => { + let service: ApplicationConditionToComponentLotService; + let mockApplicationDecisionConditionToComponentLotRepository: DeepMocked< + Repository + >; + + beforeEach(async () => { + mockApplicationDecisionConditionToComponentLotRepository = createMock(); + + const module: TestingModule = await Test.createTestingModule({ + providers: [ + ApplicationConditionToComponentLotService, + { + provide: getRepositoryToken( + ApplicationDecisionConditionToComponentLot, + ), + useValue: mockApplicationDecisionConditionToComponentLotRepository, + }, + ], + }).compile(); + + service = module.get( + ApplicationConditionToComponentLotService, + ); + }); + + it('should be defined', () => { + expect(service).toBeDefined(); + }); + + it(' it should successfully call repo to find data', async () => { + mockApplicationDecisionConditionToComponentLotRepository.find.mockResolvedValue( + [], + ); + + const result = await service.fetch('fake-1', 'fake-2'); + + expect(result).toBeDefined; + expect( + mockApplicationDecisionConditionToComponentLotRepository.find, + ).toBeCalledTimes(1); + expect( + mockApplicationDecisionConditionToComponentLotRepository.find, + ).toBeCalledWith({ + where: { + conditionUuid: 'fake-2', + componentLot: { + componentUuid: 'fake-1', + }, + }, + }); + }); + + it('should create new conditionLot', async () => { + mockApplicationDecisionConditionToComponentLotRepository.findOne.mockResolvedValue( + new ApplicationDecisionConditionToComponentLot({ + componentLotUuid: '1', + conditionUuid: '1', + }), + ); + + mockApplicationDecisionConditionToComponentLotRepository.save.mockImplementation( + (data: ApplicationDecisionConditionToComponentLot) => + Promise.resolve(data), + ); + + const result = await service.createOrUpdate('1', '1', 'plan1'); + + expect(result.planNumbers).toEqual('plan1'); + expect(result.componentLotUuid).toEqual('1'); + expect(result.conditionUuid).toEqual('1'); + expect( + mockApplicationDecisionConditionToComponentLotRepository.findOne, + ).toBeCalledTimes(1); + expect( + mockApplicationDecisionConditionToComponentLotRepository.findOne, + ).toBeCalledWith({ + where: { + componentLotUuid: '1', + conditionUuid: '1', + }, + }); + expect( + mockApplicationDecisionConditionToComponentLotRepository.save, + ).toBeCalledTimes(1); + expect( + mockApplicationDecisionConditionToComponentLotRepository.save, + ).toBeCalledWith( + new ApplicationDecisionConditionToComponentLot({ + componentLotUuid: '1', + conditionUuid: '1', + planNumbers: 'plan1', + }), + ); + }); + + it('should update an existing conditionLot', async () => { + const existingConditionLot = new ApplicationDecisionConditionToComponentLot( + { + conditionUuid: '2', + componentLotUuid: '2', + planNumbers: 'plan2', + }, + ); + + mockApplicationDecisionConditionToComponentLotRepository.findOne.mockResolvedValue( + existingConditionLot, + ); + + mockApplicationDecisionConditionToComponentLotRepository.save.mockImplementation( + (data: ApplicationDecisionConditionToComponentLot) => + Promise.resolve(data), + ); + + const result = await service.createOrUpdate('2', '2', 'updatedPlan'); + + expect(result.planNumbers).toEqual('updatedPlan'); + expect(result.componentLotUuid).toEqual('2'); + expect(result.conditionUuid).toEqual('2'); + expect( + mockApplicationDecisionConditionToComponentLotRepository.findOne, + ).toBeCalledTimes(1); + expect( + mockApplicationDecisionConditionToComponentLotRepository.findOne, + ).toBeCalledWith({ + where: { + componentLotUuid: '2', + conditionUuid: '2', + }, + }); + expect( + mockApplicationDecisionConditionToComponentLotRepository.save, + ).toBeCalledTimes(1); + expect( + mockApplicationDecisionConditionToComponentLotRepository.save, + ).toBeCalledWith(existingConditionLot); + }); +}); diff --git a/services/apps/alcs/src/alcs/application-decision/application-condition-to-component-lot/application-condition-to-component-lot.service.ts b/services/apps/alcs/src/alcs/application-decision/application-condition-to-component-lot/application-condition-to-component-lot.service.ts new file mode 100644 index 0000000000..7b7a17f466 --- /dev/null +++ b/services/apps/alcs/src/alcs/application-decision/application-condition-to-component-lot/application-condition-to-component-lot.service.ts @@ -0,0 +1,48 @@ +import { Injectable } from '@nestjs/common'; +import { InjectRepository } from '@nestjs/typeorm'; +import { Repository } from 'typeorm'; +import { ApplicationDecisionConditionToComponentLot } from './application-decision-condition-to-component-lot.entity'; + +@Injectable() +export class ApplicationConditionToComponentLotService { + constructor( + @InjectRepository(ApplicationDecisionConditionToComponentLot) + private conditionLotRepository: Repository, + ) {} + + async createOrUpdate( + componentLotUuid: string, + conditionUuid: string, + planNumbers: string | null, + ) { + let conditionLot = await this.conditionLotRepository.findOne({ + where: { + componentLotUuid, + conditionUuid, + }, + }); + + if (!conditionLot) { + conditionLot = new ApplicationDecisionConditionToComponentLot({ + conditionUuid, + componentLotUuid, + planNumbers, + }); + } else { + conditionLot.planNumbers = planNumbers; + } + + return await this.conditionLotRepository.save(conditionLot); + } + + async fetch(componentUuid: string, conditionUuid: string) { + return await this.conditionLotRepository.find({ + where: { + conditionUuid, + componentLot: { + componentUuid, + }, + }, + }); + } +} diff --git a/services/apps/alcs/src/alcs/application-decision/application-condition-to-component-lot/application-decision-condition-to-component-lot.entity.ts b/services/apps/alcs/src/alcs/application-decision/application-condition-to-component-lot/application-decision-condition-to-component-lot.entity.ts new file mode 100644 index 0000000000..9c034b8a71 --- /dev/null +++ b/services/apps/alcs/src/alcs/application-decision/application-condition-to-component-lot/application-decision-condition-to-component-lot.entity.ts @@ -0,0 +1,40 @@ +import { AutoMap } from '@automapper/classes'; +import { Column, Entity, ManyToOne } from 'typeorm'; +import { Base } from '../../../common/entities/base.entity'; +import { ApplicationDecisionComponentLot } from '../application-component-lot/application-decision-component-lot.entity'; +import { ApplicationDecisionCondition } from '../application-decision-condition/application-decision-condition.entity'; + +@Entity() +export class ApplicationDecisionConditionToComponentLot extends Base { + constructor(data?: Partial) { + super(); + if (data) { + Object.assign(this, data); + } + } + + @AutoMap(() => String) + @Column({ + type: 'text', + }) + planNumbers?: string | null; + + @AutoMap() + @Column({ nullable: true }) + conditionUuid: string; + + @ManyToOne(() => ApplicationDecisionCondition, { + nullable: true, + persistence: false, + }) + condition: ApplicationDecisionCondition; + + @AutoMap() + @Column() + componentLotUuid: string; + + @ManyToOne(() => ApplicationDecisionComponentLot, { + persistence: false, + }) + componentLot: ApplicationDecisionComponentLot; +} diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-component-to-condition/application-decision-component-to-condition-plan-number.entity.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-component-to-condition/application-decision-component-to-condition-plan-number.entity.ts new file mode 100644 index 0000000000..9bf4b6b3b3 --- /dev/null +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-component-to-condition/application-decision-component-to-condition-plan-number.entity.ts @@ -0,0 +1,62 @@ +import { AutoMap } from '@automapper/classes'; +import { + BaseEntity, + Column, + Entity, + JoinColumn, + ManyToOne, + PrimaryColumn, +} from 'typeorm'; +import { ApplicationDecisionCondition } from '../application-decision-condition/application-decision-condition.entity'; +import { ApplicationDecisionComponent } from '../application-decision-v2/application-decision/component/application-decision-component.entity'; + +@Entity() +export class ApplicationDecisionConditionComponentPlanNumber extends BaseEntity { + constructor(data?: Partial) { + super(); + if (data) { + Object.assign(this, data); + } + } + + @AutoMap() + @PrimaryColumn({ + type: 'uuid', + }) + applicationDecisionConditionUuid: string; + + @AutoMap() + @PrimaryColumn({ + type: 'uuid', + }) + applicationDecisionComponentUuid: string; + + @AutoMap(() => String) + @Column({ + type: 'text', + nullable: true, + }) + planNumbers?: string | null; + + @ManyToOne( + () => ApplicationDecisionCondition, + (c) => c.conditionToComponentsWithPlanNumber, + { persistence: false }, + ) + @JoinColumn({ + name: 'application_decision_condition_uuid', + referencedColumnName: 'uuid', + }) + condition: ApplicationDecisionCondition; + + @ManyToOne( + () => ApplicationDecisionComponent, + (c) => c.componentToConditions, + { persistence: false }, + ) + @JoinColumn({ + name: 'application_decision_component_uuid', + referencedColumnName: 'uuid', + }) + component: ApplicationDecisionComponent; +} diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-condition/application-decision-condition.controller.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-condition/application-decision-condition.controller.ts index c38a6b7e34..d21d03ac91 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-condition/application-decision-condition.controller.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-condition/application-decision-condition.controller.ts @@ -1,13 +1,15 @@ import { Mapper } from '@automapper/core'; import { InjectMapper } from '@automapper/nestjs'; -import { Body, Controller, Param, Patch, UseGuards } from '@nestjs/common'; +import { Body, Controller, Get, Param, Patch, UseGuards } from '@nestjs/common'; import { ApiOAuth2 } from '@nestjs/swagger'; import * as config from 'config'; import { ANY_AUTH_ROLE } from '../../../common/authorization/roles'; import { RolesGuard } from '../../../common/authorization/roles-guard.service'; import { UserRoles } from '../../../common/authorization/roles.decorator'; import { formatIncomingDate } from '../../../utils/incoming-date.formatter'; +import { ApplicationDecisionConditionComponentPlanNumber } from '../application-decision-component-to-condition/application-decision-component-to-condition-plan-number.entity'; import { + ApplicationDecisionConditionComponentDto, ApplicationDecisionConditionDto, UpdateApplicationDecisionConditionDto, } from './application-decision-condition.dto'; @@ -45,4 +47,36 @@ export class ApplicationDecisionConditionController { ApplicationDecisionConditionDto, ); } + + @Get('/plan-numbers/:uuid') + @UserRoles(...ANY_AUTH_ROLE) + async getPlanNumbers(@Param('uuid') uuid: string) { + const planNumbers = await this.conditionService.getPlanNumbers(uuid); + + return await this.mapper.mapArrayAsync( + planNumbers, + ApplicationDecisionConditionComponentPlanNumber, + ApplicationDecisionConditionComponentDto, + ); + } + + @Patch('/plan-numbers/condition/:conditionUuid/component/:componentUuid') + @UserRoles(...ANY_AUTH_ROLE) + async updateConditionPlanNumbers( + @Param('conditionUuid') conditionUuid: string, + @Param('componentUuid') componentUuid: string, + @Body() planNumbers: string | null, + ) { + const planNumber = await this.conditionService.updateConditionPlanNumbers( + conditionUuid, + componentUuid, + planNumbers, + ); + + return await this.mapper.mapAsync( + planNumber, + ApplicationDecisionConditionComponentPlanNumber, + ApplicationDecisionConditionComponentDto, + ); + } } diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-condition/application-decision-condition.dto.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-condition/application-decision-condition.dto.ts index 6afa2209ed..2314b9dffe 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-condition/application-decision-condition.dto.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-condition/application-decision-condition.dto.ts @@ -101,3 +101,21 @@ export class UpdateApplicationDecisionConditionServiceDto { completionDate?: Date | null; supersededDate?: Date | null; } + +export class ApplicationDecisionConditionComponentDto { + applicationDecisionConditionUuid: string; + applicationDecisionComponentUuid: string; + planNumbers: string | null; +} + +export class UpdateApplicationDecisionConditionComponentDto { + @IsString() + applicationDecisionConditionUuid: string; + + @IsString() + applicationDecisionComponentUuid: string; + + @IsString() + @IsOptional() + planNumbers: string | null; +} diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-condition/application-decision-condition.entity.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-condition/application-decision-condition.entity.ts index b3cc1f7031..f9fe054b38 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-condition/application-decision-condition.entity.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-condition/application-decision-condition.entity.ts @@ -1,7 +1,16 @@ import { AutoMap } from '@automapper/classes'; -import { Column, Entity, JoinTable, ManyToMany, ManyToOne } from 'typeorm'; +import { + Column, + Entity, + JoinTable, + ManyToMany, + ManyToOne, + OneToMany, +} from 'typeorm'; import { Base } from '../../../common/entities/base.entity'; import { ColumnNumericTransformer } from '../../../utils/column-numeric-transform'; +import { ApplicationDecisionConditionToComponentLot } from '../application-condition-to-component-lot/application-decision-condition-to-component-lot.entity'; +import { ApplicationDecisionConditionComponentPlanNumber } from '../application-decision-component-to-condition/application-decision-component-to-condition-plan-number.entity'; import { ApplicationDecisionComponent } from '../application-decision-v2/application-decision/component/application-decision-component.entity'; import { ApplicationDecision } from '../application-decision.entity'; import { ApplicationDecisionConditionType } from './application-decision-condition-code.entity'; @@ -82,4 +91,15 @@ export class ApplicationDecisionCondition extends Base { name: 'application_decision_condition_component', }) components: ApplicationDecisionComponent[] | null; + + @OneToMany( + () => ApplicationDecisionConditionComponentPlanNumber, + (c) => c.condition, + { + cascade: ['insert', 'update', 'remove'], + }, + ) + conditionToComponentsWithPlanNumber: + | ApplicationDecisionConditionComponentPlanNumber[] + | null; } diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-condition/application-decision-condition.service.spec.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-condition/application-decision-condition.service.spec.ts index e1df986106..b0dc5475b8 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-condition/application-decision-condition.service.spec.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-condition/application-decision-condition.service.spec.ts @@ -2,6 +2,8 @@ import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; +import { ApplicationDecisionConditionToComponentLot } from '../application-condition-to-component-lot/application-decision-condition-to-component-lot.entity'; +import { ApplicationDecisionConditionComponentPlanNumber } from '../application-decision-component-to-condition/application-decision-component-to-condition-plan-number.entity'; import { ApplicationDecisionConditionType } from './application-decision-condition-code.entity'; import { UpdateApplicationDecisionConditionDto } from './application-decision-condition.dto'; import { ApplicationDecisionCondition } from './application-decision-condition.entity'; @@ -15,10 +17,18 @@ describe('ApplicationDecisionConditionService', () => { let mockAppDecCondTypeRepository: DeepMocked< Repository >; + let mockApplicationDecisionConditionComponentPlanNumber: DeepMocked< + Repository + >; + let mockApplicationDecisionConditionToComponentLot: DeepMocked< + Repository + >; beforeEach(async () => { mockApplicationDecisionConditionRepository = createMock(); mockAppDecCondTypeRepository = createMock(); + mockApplicationDecisionConditionComponentPlanNumber = createMock(); + mockApplicationDecisionConditionToComponentLot = createMock(); const module: TestingModule = await Test.createTestingModule({ providers: [ @@ -31,6 +41,18 @@ describe('ApplicationDecisionConditionService', () => { provide: getRepositoryToken(ApplicationDecisionConditionType), useValue: mockAppDecCondTypeRepository, }, + { + provide: getRepositoryToken( + ApplicationDecisionConditionComponentPlanNumber, + ), + useValue: mockApplicationDecisionConditionComponentPlanNumber, + }, + { + provide: getRepositoryToken( + ApplicationDecisionConditionToComponentLot, + ), + useValue: mockApplicationDecisionConditionToComponentLot, + }, ], }).compile(); @@ -68,15 +90,18 @@ describe('ApplicationDecisionConditionService', () => { new ApplicationDecisionCondition(), ]; + const mockTransaction = jest.fn(); + mockApplicationDecisionConditionRepository.manager.transaction = + mockTransaction; + mockApplicationDecisionConditionRepository.remove.mockResolvedValue( {} as ApplicationDecisionCondition, ); + mockApplicationDecisionConditionToComponentLot.find.mockResolvedValue([]); await service.remove(conditions); - expect( - mockApplicationDecisionConditionRepository.remove, - ).toHaveBeenCalledWith(conditions); + expect(mockTransaction).toBeCalledTimes(1); }); it('should create new components when given a DTO without a UUID', async () => { diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-condition/application-decision-condition.service.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-condition/application-decision-condition.service.ts index ad9698e8a8..30b1301417 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-condition/application-decision-condition.service.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-condition/application-decision-condition.service.ts @@ -1,7 +1,9 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; -import { Repository } from 'typeorm'; +import { In, Repository } from 'typeorm'; import { ServiceValidationException } from '../../../../../../libs/common/src/exceptions/base.exception'; +import { ApplicationDecisionConditionToComponentLot } from '../application-condition-to-component-lot/application-decision-condition-to-component-lot.entity'; +import { ApplicationDecisionConditionComponentPlanNumber } from '../application-decision-component-to-condition/application-decision-component-to-condition-plan-number.entity'; import { ApplicationDecisionComponent } from '../application-decision-v2/application-decision/component/application-decision-component.entity'; import { ApplicationDecisionConditionType } from './application-decision-condition-code.entity'; import { @@ -17,6 +19,10 @@ export class ApplicationDecisionConditionService { private repository: Repository, @InjectRepository(ApplicationDecisionConditionType) private typeRepository: Repository, + @InjectRepository(ApplicationDecisionConditionComponentPlanNumber) + private conditionComponentPlanNumbersRepository: Repository, + @InjectRepository(ApplicationDecisionConditionToComponentLot) + private conditionComponentLotRepository: Repository, ) {} async getOneOrFail(uuid: string) { @@ -92,6 +98,7 @@ export class ApplicationDecisionConditionService { 'Failed to find matching component', ); } + condition.components = mappedComponents; } else { condition.components = null; @@ -106,8 +113,19 @@ export class ApplicationDecisionConditionService { return updatedConditions; } - async remove(components: ApplicationDecisionCondition[]) { - await this.repository.remove(components); + async remove(conditions: ApplicationDecisionCondition[]) { + const lots = await this.conditionComponentLotRepository.find({ + where: { + conditionUuid: In(conditions.map((e) => e.uuid)), + }, + }); + + await this.repository.manager.transaction( + async (transactionalEntityManager) => { + await transactionalEntityManager.remove(lots); + await transactionalEntityManager.remove(conditions); + }, + ); } async update( @@ -117,4 +135,37 @@ export class ApplicationDecisionConditionService { await this.repository.update(existingCondition.uuid, updates); return await this.getOneOrFail(existingCondition.uuid); } + + async getPlanNumbers(uuid: string) { + return await this.conditionComponentPlanNumbersRepository.findBy({ + applicationDecisionConditionUuid: uuid, + }); + } + + async updateConditionPlanNumbers( + conditionUuid: string, + componentUuid: string, + planNumbers: string | null, + ) { + let conditionToComponent = + await this.conditionComponentPlanNumbersRepository.findOneBy({ + applicationDecisionComponentUuid: componentUuid, + applicationDecisionConditionUuid: conditionUuid, + }); + + if (conditionToComponent) { + conditionToComponent.planNumbers = planNumbers; + } else { + conditionToComponent = + new ApplicationDecisionConditionComponentPlanNumber({ + applicationDecisionComponentUuid: componentUuid, + applicationDecisionConditionUuid: conditionUuid, + planNumbers, + }); + } + + await this.conditionComponentPlanNumbersRepository.save( + conditionToComponent, + ); + } } diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision-v2.module.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision-v2.module.ts index e9434b44f2..d2d1f47997 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision-v2.module.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision-v2.module.ts @@ -13,6 +13,13 @@ import { ApplicationModule } from '../../application/application.module'; import { BoardModule } from '../../board/board.module'; import { CardModule } from '../../card/card.module'; import { ApplicationCeoCriterionCode } from '../application-ceo-criterion/application-ceo-criterion.entity'; +import { ApplicationDecisionComponentLotController } from '../application-component-lot/application-decision-component-lot.controller'; +import { ApplicationDecisionComponentLot } from '../application-component-lot/application-decision-component-lot.entity'; +import { ApplicationDecisionComponentLotService } from '../application-component-lot/application-decision-component-lot.service'; +import { ApplicationConditionToComponentLotController } from '../application-condition-to-component-lot/application-condition-to-component-lot.controller'; +import { ApplicationConditionToComponentLotService } from '../application-condition-to-component-lot/application-condition-to-component-lot.service'; +import { ApplicationDecisionConditionToComponentLot } from '../application-condition-to-component-lot/application-decision-condition-to-component-lot.entity'; +import { ApplicationDecisionConditionComponentPlanNumber } from '../application-decision-component-to-condition/application-decision-component-to-condition-plan-number.entity'; import { ApplicationDecisionConditionType } from '../application-decision-condition/application-decision-condition-code.entity'; import { ApplicationDecisionConditionController } from '../application-decision-condition/application-decision-condition.controller'; import { ApplicationDecisionCondition } from '../application-decision-condition/application-decision-condition.entity'; @@ -61,6 +68,9 @@ import { LinkedResolutionOutcomeType } from './application-decision/linked-resol ApplicationSubmissionToSubmissionStatus, ApplicationSubmission, ApplicationSubmissionStatusType, + ApplicationDecisionComponentLot, + ApplicationDecisionConditionToComponentLot, + ApplicationDecisionConditionComponentPlanNumber, ]), forwardRef(() => BoardModule), ApplicationModule, @@ -81,11 +91,15 @@ import { LinkedResolutionOutcomeType } from './application-decision/linked-resol ApplicationDecisionProfile, ApplicationDecisionComponentService, ApplicationDecisionConditionService, + ApplicationDecisionComponentLotService, + ApplicationConditionToComponentLotService, ], controllers: [ ApplicationDecisionV2Controller, ApplicationDecisionComponentController, ApplicationDecisionConditionController, + ApplicationDecisionComponentLotController, + ApplicationConditionToComponentLotController, ], exports: [ApplicationDecisionV2Service], }) diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service.ts index b67a513d27..886114eca1 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service.ts @@ -115,10 +115,13 @@ export class ApplicationDecisionV2Service { components: { applicationDecisionComponentType: true, naruSubtype: true, + lots: true, }, conditions: { type: true, - components: true, + components: { + lots: true, + }, }, }, }); @@ -207,6 +210,7 @@ export class ApplicationDecisionV2Service { }, components: { applicationDecisionComponentType: true, + lots: true, }, conditions: { type: true, diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.dto.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.dto.ts index a77ad3f11c..0cd48a06f7 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.dto.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.dto.ts @@ -2,7 +2,7 @@ import { AutoMap } from '@automapper/classes'; import { IsArray, IsNumber, IsOptional, IsString } from 'class-validator'; import { BaseCodeDto } from '../../../../../common/dtos/base.dto'; import { NaruSubtypeDto } from '../../../../../portal/application-submission/application-submission.dto'; -import { ProposedLot } from '../../../../../portal/application-submission/application-submission.entity'; +import { ApplicationDecisionComponentLotDto } from '../../../application-component-lot/application-decision-component-lot.dto'; export class ApplicationDecisionComponentTypeDto extends BaseCodeDto {} @@ -95,7 +95,7 @@ export class UpdateApplicationDecisionComponentDto { @IsArray() @IsOptional() - subdApprovedLots?: ProposedLot[]; + lots?: ApplicationDecisionComponentLotDto[]; @IsString() @IsOptional() @@ -184,8 +184,8 @@ export class ApplicationDecisionComponentDto { @AutoMap(() => NaruSubtypeDto) naruSubtype: NaruSubtypeDto; - @AutoMap(() => [ProposedLot]) - subdApprovedLots: ProposedLot[]; + @AutoMap(() => [ApplicationDecisionComponentLotDto]) + lots?: ApplicationDecisionComponentLotDto[]; @AutoMap(() => String) inclExclApplicantType?: string; diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.entity.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.entity.ts index 9005f4db9c..0cbfd0ce42 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.entity.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.entity.ts @@ -1,9 +1,17 @@ import { AutoMap } from '@automapper/classes'; -import { Column, Entity, Index, ManyToMany, ManyToOne } from 'typeorm'; +import { + Column, + Entity, + Index, + ManyToMany, + ManyToOne, + OneToMany, +} from 'typeorm'; import { Base } from '../../../../../common/entities/base.entity'; -import { ProposedLot } from '../../../../../portal/application-submission/application-submission.entity'; import { NaruSubtype } from '../../../../../portal/application-submission/naru-subtype/naru-subtype.entity'; import { ColumnNumericTransformer } from '../../../../../utils/column-numeric-transform'; +import { ApplicationDecisionComponentLot } from '../../../application-component-lot/application-decision-component-lot.entity'; +import { ApplicationDecisionConditionComponentPlanNumber } from '../../../application-decision-component-to-condition/application-decision-component-to-condition-plan-number.entity'; import { ApplicationDecisionCondition } from '../../../application-decision-condition/application-decision-condition.entity'; import { ApplicationDecision } from '../../../application-decision.entity'; import { ApplicationDecisionComponentType } from './application-decision-component-type.entity'; @@ -190,15 +198,6 @@ export class ApplicationDecisionComponent extends Base { @ManyToOne(() => NaruSubtype) naruSubtype: NaruSubtype; - @AutoMap(() => [ProposedLot]) - @Column({ - comment: 'JSONB Column containing the approved subdivision lots', - type: 'jsonb', - array: false, - default: () => `'[]'`, - }) - subdApprovedLots: ProposedLot[]; - @AutoMap(() => String) @Column({ nullable: true, @@ -227,4 +226,21 @@ export class ApplicationDecisionComponent extends Base { (condition) => condition.components, ) conditions: ApplicationDecisionCondition[]; + + @AutoMap(() => [ApplicationDecisionComponentLot]) + @OneToMany(() => ApplicationDecisionComponentLot, (lot) => lot.component, { + cascade: ['soft-remove', 'insert', 'update'], + }) + lots: ApplicationDecisionComponentLot[]; + + @OneToMany( + () => ApplicationDecisionConditionComponentPlanNumber, + (c) => c.component, + { + cascade: ['insert', 'update'], + }, + ) + componentToConditions: + | ApplicationDecisionConditionComponentPlanNumber[] + | null; } diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.service.spec.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.service.spec.ts index 4bba9495f1..c0a4f19563 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.service.spec.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.service.spec.ts @@ -3,9 +3,12 @@ import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { ServiceValidationException } from '../../../../../../../../libs/common/src/exceptions/base.exception'; +import { ApplicationDecisionComponentLot } from '../../../application-component-lot/application-decision-component-lot.entity'; +import { ApplicationDecisionComponentLotService } from '../../../application-component-lot/application-decision-component-lot.service'; import { APPLICATION_DECISION_COMPONENT_TYPE, CreateApplicationDecisionComponentDto, + UpdateApplicationDecisionComponentDto, } from './application-decision-component.dto'; import { ApplicationDecisionComponent } from './application-decision-component.entity'; import { ApplicationDecisionComponentService } from './application-decision-component.service'; @@ -15,9 +18,11 @@ describe('ApplicationDecisionComponentService', () => { let mockApplicationDecisionComponentRepository: DeepMocked< Repository >; + let mockApplicationDecisionComponentLotService: DeepMocked; beforeEach(async () => { mockApplicationDecisionComponentRepository = createMock(); + mockApplicationDecisionComponentLotService = createMock(); const module: TestingModule = await Test.createTestingModule({ providers: [ @@ -26,6 +31,10 @@ describe('ApplicationDecisionComponentService', () => { provide: getRepositoryToken(ApplicationDecisionComponent), useValue: mockApplicationDecisionComponentRepository, }, + { + provide: ApplicationDecisionComponentLotService, + useValue: mockApplicationDecisionComponentLotService, + }, ], }).compile(); @@ -52,6 +61,9 @@ describe('ApplicationDecisionComponentService', () => { mockApplicationDecisionComponentRepository.findOneOrFail, ).toBeCalledWith({ where: { uuid: 'fake' }, + relations: { + lots: true, + }, }); expect(result).toBeDefined(); }); @@ -169,6 +181,9 @@ describe('ApplicationDecisionComponentService', () => { mockApplicationDecisionComponentRepository.findOneOrFail, ).toBeCalledWith({ where: { uuid: 'fake' }, + relations: { + lots: true, + }, }); expect(result[0].uuid).toEqual(mockDto.uuid); expect(result[0].alrArea).toEqual(mockDto.alrArea); @@ -248,6 +263,9 @@ describe('ApplicationDecisionComponentService', () => { mockApplicationDecisionComponentRepository.findOneOrFail, ).toBeCalledWith({ where: { uuid: 'fake' }, + relations: { + lots: true, + }, }); expect(result[0].uuid).toEqual(mockDto.uuid); expect(result[0].alrArea).toEqual(mockDto.alrArea); @@ -281,4 +299,40 @@ describe('ApplicationDecisionComponentService', () => { expect(mockValidationWrapper).toThrow(ServiceValidationException); }); + + it('should call lot service if there any lots to remove', async () => { + mockApplicationDecisionComponentRepository.findOneOrFail.mockResolvedValue({ + lots: [new ApplicationDecisionComponentLot({ uuid: 'remove' })], + } as ApplicationDecisionComponent); + mockApplicationDecisionComponentRepository.save.mockResolvedValue( + {} as ApplicationDecisionComponent, + ); + mockApplicationDecisionComponentLotService.softRemove.mockResolvedValue([]); + + const updateDtos = [ + { + uuid: 'fake', + lots: [ + { + index: 1, + componentUuid: '2', + type: null, + alrArea: null, + size: null, + }, + ], + } as UpdateApplicationDecisionComponentDto, + ]; + + const result = await service.createOrUpdate(updateDtos); + + expect(result).toBeDefined(); + expect( + mockApplicationDecisionComponentRepository.findOneOrFail, + ).toBeCalledTimes(1); + expect( + mockApplicationDecisionComponentLotService.softRemove, + ).toBeCalledTimes(1); + expect(mockApplicationDecisionComponentRepository.save).toBeCalledTimes(1); + }); }); diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.service.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.service.ts index d5cd62582d..979a69bf59 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.service.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.service.ts @@ -2,6 +2,8 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { ServiceValidationException } from '../../../../../../../../libs/common/src/exceptions/base.exception'; +import { ApplicationDecisionComponentLot } from '../../../application-component-lot/application-decision-component-lot.entity'; +import { ApplicationDecisionComponentLotService } from '../../../application-component-lot/application-decision-component-lot.service'; import { APPLICATION_DECISION_COMPONENT_TYPE, CreateApplicationDecisionComponentDto, @@ -13,11 +15,15 @@ export class ApplicationDecisionComponentService { constructor( @InjectRepository(ApplicationDecisionComponent) private componentRepository: Repository, + private componentLotService: ApplicationDecisionComponentLotService, ) {} async getOneOrFail(uuid: string) { return this.componentRepository.findOneOrFail({ where: { uuid }, + relations: { + lots: true, + }, }); } @@ -51,9 +57,7 @@ export class ApplicationDecisionComponentService { this.patchNaruFields(component, updateDto); //SUBD - if (updateDto.subdApprovedLots) { - component.subdApprovedLots = updateDto.subdApprovedLots; - } + this.updateComponentLots(component, updateDto); //INCL / EXCL if (updateDto.inclExclApplicantType !== undefined) { @@ -73,6 +77,60 @@ export class ApplicationDecisionComponentService { return updatedComponents; } + private async updateComponentLots( + component: ApplicationDecisionComponent, + updateDto: CreateApplicationDecisionComponentDto, + ) { + if (updateDto.lots) { + if (updateDto.uuid) { + const lotsToRemove = component.lots + .filter((l1) => !updateDto.lots?.some((l2) => l1.uuid === l2.uuid)) + .map((l) => l.uuid); + + component.lots = component.lots.filter( + (l) => !lotsToRemove.includes(l.uuid), + ); + + updateDto.lots?.forEach((lot, index) => { + if (lot.uuid) { + const lotToUpdate = component.lots.find((e) => e.uuid === lot.uuid); + if (lotToUpdate) { + lotToUpdate.alrArea = lot.alrArea; + lotToUpdate.type = lot.type; + lotToUpdate.size = lot.size; + } + } else { + component.lots.push( + new ApplicationDecisionComponentLot({ + componentUuid: updateDto.uuid, + alrArea: lot.alrArea, + size: lot.size, + type: lot.type, + index: index + 1, + }), + ); + } + }); + + if (lotsToRemove.length > 0) { + await this.componentLotService.softRemove(lotsToRemove); + } + } else { + // this is a new component so it does not have lots and the lot is simply created + component.lots = updateDto.lots.map( + (e, index) => + new ApplicationDecisionComponentLot({ + componentUuid: updateDto.uuid, + alrArea: e.alrArea, + size: e.size, + type: e.type, + index: index + 1, + }), + ); + } + } + } + private patchNfuFields( component: ApplicationDecisionComponent, updateDto: CreateApplicationDecisionComponentDto, @@ -166,6 +224,9 @@ export class ApplicationDecisionComponentService { async softRemove(components: ApplicationDecisionComponent[]) { await this.componentRepository.softRemove(components); + components.forEach( + async (e) => await this.componentLotService.softRemoveBy(e.uuid), + ); } async getAllByApplicationUuid(applicationUuid: string) { diff --git a/services/apps/alcs/src/alcs/application/application-submission/application-submission.controller.ts b/services/apps/alcs/src/alcs/application/application-submission/application-submission.controller.ts index 9f37588d3a..d87f034145 100644 --- a/services/apps/alcs/src/alcs/application/application-submission/application-submission.controller.ts +++ b/services/apps/alcs/src/alcs/application/application-submission/application-submission.controller.ts @@ -60,6 +60,7 @@ export class ApplicationSubmissionController { if (!fileNumber) { throw new ServiceValidationException('File number is required'); } + await this.applicationSubmissionService.update(fileNumber, updateDto); return this.get(fileNumber); } diff --git a/services/apps/alcs/src/common/automapper/application-decision-v2.automapper.profile.ts b/services/apps/alcs/src/common/automapper/application-decision-v2.automapper.profile.ts index 055c1fd8a2..c777a7f6d6 100644 --- a/services/apps/alcs/src/common/automapper/application-decision-v2.automapper.profile.ts +++ b/services/apps/alcs/src/common/automapper/application-decision-v2.automapper.profile.ts @@ -4,6 +4,7 @@ import { Injectable } from '@nestjs/common'; import { ApplicationCeoCriterionCode } from '../../alcs/application-decision/application-ceo-criterion/application-ceo-criterion.entity'; import { ApplicationDecisionConditionType } from '../../alcs/application-decision/application-decision-condition/application-decision-condition-code.entity'; import { + ApplicationDecisionConditionComponentDto, ApplicationDecisionConditionDto, ApplicationDecisionConditionTypeDto, } from '../../alcs/application-decision/application-decision-condition/application-decision-condition.dto'; @@ -12,6 +13,8 @@ import { ApplicationDecisionDocument } from '../../alcs/application-decision/app import { ApplicationDecisionMakerCode } from '../../alcs/application-decision/application-decision-maker/application-decision-maker.entity'; import { ApplicationDecisionChairReviewOutcomeType } from '../../alcs/application-decision/application-decision-outcome-type/application-decision-outcome-type.entity'; +import { ApplicationDecisionComponentLotDto } from '../../alcs/application-decision/application-component-lot/application-decision-component-lot.dto'; +import { ApplicationDecisionComponentLot } from '../../alcs/application-decision/application-component-lot/application-decision-component-lot.entity'; import { ApplicationDecisionMakerCodeDto } from '../../alcs/application-decision/application-decision-maker/decision-maker.dto'; import { ApplicationDecisionOutcomeCode } from '../../alcs/application-decision/application-decision-outcome.entity'; import { @@ -33,6 +36,9 @@ import { ApplicationDecision } from '../../alcs/application-decision/application import { PortalDecisionDto } from '../../portal/application-decision/application-decision.dto'; import { NaruSubtypeDto } from '../../portal/application-submission/application-submission.dto'; import { NaruSubtype } from '../../portal/application-submission/naru-subtype/naru-subtype.entity'; +import { ApplicationDecisionConditionToComponentLotDto } from '../../alcs/application-decision/application-condition-to-component-lot/application-condition-to-component-lot.controller.dto'; +import { ApplicationDecisionConditionToComponentLot } from '../../alcs/application-decision/application-condition-to-component-lot/application-decision-condition-to-component-lot.entity'; +import { ApplicationDecisionConditionComponentPlanNumber } from '../../alcs/application-decision/application-decision-component-to-condition/application-decision-component-to-condition-plan-number.entity'; @Injectable() export class ApplicationDecisionProfile extends AutomapperProfile { @@ -56,6 +62,16 @@ export class ApplicationDecisionProfile extends AutomapperProfile { ), ), ), + forMember( + (ad) => ad.documents, + mapFrom((a) => + this.mapper.mapArray( + a.documents || [], + ApplicationDecisionDocument, + DecisionDocumentDto, + ), + ), + ), forMember( (a) => a.reconsiders, mapFrom((dec) => @@ -170,6 +186,18 @@ export class ApplicationDecisionProfile extends AutomapperProfile { this.mapper.map(a.naruSubtype, NaruSubtype, NaruSubtypeDto), ), ), + forMember( + (ad) => ad.lots, + mapFrom((a) => + a.lots + ? this.mapper.mapArray( + a.lots, + ApplicationDecisionComponentLot, + ApplicationDecisionComponentLotDto, + ) + : [], + ), + ), ); createMap( mapper, @@ -281,6 +309,28 @@ export class ApplicationDecisionProfile extends AutomapperProfile { LinkedResolutionOutcomeType, LinkedResolutionOutcomeTypeDto, ); + + createMap( + mapper, + ApplicationDecisionComponentLot, + ApplicationDecisionComponentLotDto, + forMember( + (a) => a.type, + mapFrom((ac) => ac.type), + ), + ); + + createMap( + mapper, + ApplicationDecisionConditionToComponentLot, + ApplicationDecisionConditionToComponentLotDto, + ); + + createMap( + mapper, + ApplicationDecisionConditionComponentPlanNumber, + ApplicationDecisionConditionComponentDto, + ); }; } } diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts b/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts index fcc7ba8cd9..59bb911eb4 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts @@ -21,6 +21,7 @@ export class ProposedLot { type: 'Lot' | 'Road Dedication' | null; alrArea?: number | null; size: number | null; + planNumbers: string | null; } @Entity() diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1691021151956-plan_number.ts b/services/apps/alcs/src/providers/typeorm/migrations/1691021151956-plan_number.ts new file mode 100644 index 0000000000..4bfede09a9 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1691021151956-plan_number.ts @@ -0,0 +1,77 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class planNumber1691021151956 implements MigrationInterface { + name = 'planNumber1691021151956'; + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `ALTER TABLE "alcs"."application_decision" DROP CONSTRAINT "FK_e88e4a5dc4db0a7ba934b99dbe0"`, + ); + await queryRunner.query( + `CREATE TABLE "alcs"."application_decision_condition_to_component_lot" ("audit_deleted_date_at" TIMESTAMP WITH TIME ZONE, "audit_created_at" TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now(), "audit_updated_at" TIMESTAMP WITH TIME ZONE DEFAULT now(), "audit_created_by" character varying NOT NULL, "audit_updated_by" character varying, "uuid" uuid NOT NULL DEFAULT gen_random_uuid(), "plan_numbers" text NOT NULL, "condition_uuid" uuid, "component_lot_uuid" uuid NOT NULL, CONSTRAINT "PK_9c03e6af9a3996fcccf250ca610" PRIMARY KEY ("uuid"))`, + ); + await queryRunner.query( + `CREATE TABLE "alcs"."application_decision_component_lot" ("audit_deleted_date_at" TIMESTAMP WITH TIME ZONE, "audit_created_at" TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now(), "audit_updated_at" TIMESTAMP WITH TIME ZONE DEFAULT now(), "audit_created_by" character varying NOT NULL, "audit_updated_by" character varying, "uuid" uuid NOT NULL DEFAULT gen_random_uuid(), "index" integer NOT NULL, "type" text, "alr_area" numeric(12,2), "size" numeric(12,2), "component_uuid" uuid NOT NULL, CONSTRAINT "PK_5572331a2f8315a1efffa08928d" PRIMARY KEY ("uuid"))`, + ); + await queryRunner.query( + `CREATE TABLE "alcs"."application_decision_condition_component_plan_number" ("application_decision_condition_uuid" uuid NOT NULL, "application_decision_component_uuid" uuid NOT NULL, "plan_numbers" text, CONSTRAINT "PK_272dd82d4108601a66fcc786715" PRIMARY KEY ("application_decision_condition_uuid", "application_decision_component_uuid"))`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_decision_component" DROP COLUMN "subd_approved_lots"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_decision_condition_to_component_lot" ADD CONSTRAINT "FK_6b5ee63fc75f3a551029c07bc38" FOREIGN KEY ("condition_uuid") REFERENCES "alcs"."application_decision_condition"("uuid") ON DELETE NO ACTION ON UPDATE NO ACTION`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_decision_condition_to_component_lot" ADD CONSTRAINT "FK_c41ec91b3f32c215e495770a2e1" FOREIGN KEY ("component_lot_uuid") REFERENCES "alcs"."application_decision_component_lot"("uuid") ON DELETE NO ACTION ON UPDATE NO ACTION`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_decision_component_lot" ADD CONSTRAINT "FK_040a878c55a37efa00fbb10e196" FOREIGN KEY ("component_uuid") REFERENCES "alcs"."application_decision_component"("uuid") ON DELETE NO ACTION ON UPDATE NO ACTION`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_decision_condition_component_plan_number" ADD CONSTRAINT "FK_e9c8eae0a03c6816475ece8a702" FOREIGN KEY ("application_decision_condition_uuid") REFERENCES "alcs"."application_decision_condition"("uuid") ON DELETE NO ACTION ON UPDATE NO ACTION`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_decision_condition_component_plan_number" ADD CONSTRAINT "FK_0a2a0d208d27cd9d9a5577ac89b" FOREIGN KEY ("application_decision_component_uuid") REFERENCES "alcs"."application_decision_component"("uuid") ON DELETE NO ACTION ON UPDATE NO ACTION`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_decision" ADD CONSTRAINT "FK_dc34f50291af0299bd44e8d0448" FOREIGN KEY ("chair_review_outcome_code") REFERENCES "alcs"."application_decision_chair_review_outcome_type"("code") ON DELETE NO ACTION ON UPDATE NO ACTION`, + ); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `ALTER TABLE "alcs"."application_decision" DROP CONSTRAINT "FK_dc34f50291af0299bd44e8d0448"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_decision_condition_component_plan_number" DROP CONSTRAINT "FK_0a2a0d208d27cd9d9a5577ac89b"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_decision_condition_component_plan_number" DROP CONSTRAINT "FK_e9c8eae0a03c6816475ece8a702"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_decision_component_lot" DROP CONSTRAINT "FK_040a878c55a37efa00fbb10e196"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_decision_condition_to_component_lot" DROP CONSTRAINT "FK_c41ec91b3f32c215e495770a2e1"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_decision_condition_to_component_lot" DROP CONSTRAINT "FK_6b5ee63fc75f3a551029c07bc38"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_decision_component" ADD "subd_approved_lots" jsonb NOT NULL DEFAULT '[]'`, + ); + await queryRunner.query( + `DROP TABLE "alcs"."application_decision_condition_component_plan_number"`, + ); + await queryRunner.query( + `DROP TABLE "alcs"."application_decision_component_lot"`, + ); + await queryRunner.query( + `DROP TABLE "alcs"."application_decision_condition_to_component_lot"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_decision" ADD CONSTRAINT "FK_e88e4a5dc4db0a7ba934b99dbe0" FOREIGN KEY ("chair_review_outcome_code") REFERENCES "alcs"."application_decision_chair_review_outcome_type"("code") ON DELETE NO ACTION ON UPDATE NO ACTION`, + ); + } +} diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1691094096225-table_comments.ts b/services/apps/alcs/src/providers/typeorm/migrations/1691094096225-table_comments.ts new file mode 100644 index 0000000000..419e5f6faa --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1691094096225-table_comments.ts @@ -0,0 +1,18 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class tableComments1691094096225 implements MigrationInterface { + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query( + ` + COMMENT ON TABLE "alcs"."application_decision_condition_component_plan_number" IS 'Survey plan numbers associated with survey plan conditions on decision components'; + COMMENT ON TABLE "alcs"."application_decision_condition_component" IS 'Join table to link decision conditions with decision components'; + COMMENT ON TABLE "alcs"."application_decision_condition_to_component_lot" IS 'Join table to link approved subdivision lots between condition and components and provide plan numbers associated with survey plan per lot'; + COMMENT ON TABLE "alcs"."application_decision_component_lot" IS 'Approved lots on the subdivision decision component'; + `, + ); + } + + public async down(queryRunner: QueryRunner): Promise { + // not needed + } +} From 207fcead6174dbf8e7c31c3abbab444766e291bc Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Thu, 3 Aug 2023 15:51:15 -0700 Subject: [PATCH 205/954] Code Review Feedback --- .../notice-of-intent-document.service.spec.ts | 1 + .../notice-of-intent-meeting.controller.ts | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.service.spec.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.service.spec.ts index ebff119377..d9cdd8ca16 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.service.spec.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.service.spec.ts @@ -248,6 +248,7 @@ describe('NoticeOfIntentDocumentService', () => { expect(res).toBeDefined(); }); + // TODO: Re-enabled when adding Step 7 // it('should set the type and description for multiple files', async () => { // const mockDocument1 = new NoticeOfIntentDocument({ // typeCode: DOCUMENT_TYPE.DECISION_DOCUMENT, diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-meeting/notice-of-intent-meeting.controller.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-meeting/notice-of-intent-meeting.controller.ts index 5bbda2e010..f0d00b7ef8 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-meeting/notice-of-intent-meeting.controller.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-meeting/notice-of-intent-meeting.controller.ts @@ -80,10 +80,10 @@ export class NoticeOfIntentMeetingController { } private async validateAndPrepareCreateData( - fileNumber: string, + uuid: string, meeting: CreateNoticeOfIntentMeetingDto, ) { - const noi = await this.noiService.getOrFailByUuid(fileNumber); + const noi = await this.noiService.getOrFailByUuid(uuid); const meetingType = ( await this.noiMeetingService.fetNoticeOfIntentMeetingTypes() ).find((e) => e.code === meeting.meetingTypeCode); From 664039f859385b5b9d74b101a720847d79fe9a8a Mon Sep 17 00:00:00 2001 From: Liam Stoddard Date: Thu, 3 Aug 2023 15:53:38 -0700 Subject: [PATCH 206/954] removed migration & tweaked names to work with ALCS-1001 --- .../documents/noi_documents.py | 8 ++-- .../sql/documents_noi/noi_documents.sql | 2 +- .../noi_documents_total_count.sql | 4 +- .../migrations/1691007382208-add_noi_docs.ts | 47 ------------------- 4 files changed, 7 insertions(+), 54 deletions(-) delete mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1691007382208-add_noi_docs.ts diff --git a/bin/migrate-oats-data/documents/noi_documents.py b/bin/migrate-oats-data/documents/noi_documents.py index 8d70741607..6a6e7ba727 100644 --- a/bin/migrate-oats-data/documents/noi_documents.py +++ b/bin/migrate-oats-data/documents/noi_documents.py @@ -11,9 +11,9 @@ def compile_document_insert_query(number_of_rows_to_insert): """ documents_to_insert = ",".join(["%s"] * number_of_rows_to_insert) return f""" - insert into alcs.noi_document + insert into alcs.notice_of_intent_document ( - application_uuid , + notice_of_intent_uuid , document_uuid , type_code , visibility_flags, @@ -23,7 +23,7 @@ def compile_document_insert_query(number_of_rows_to_insert): ) VALUES {documents_to_insert} ON CONFLICT (oats_document_id, oats_application_id) DO UPDATE SET - application_uuid = EXCLUDED.application_uuid, + notice_of_intent_uuid = EXCLUDED.notice_of_intnent_uuid, document_uuid = EXCLUDED.document_uuid, type_code = EXCLUDED.type_code, visibility_flags = EXCLUDED.visibility_flags, @@ -93,7 +93,7 @@ def clean_noi_documents(conn=None): print("Start noi documents cleaning") with conn.cursor() as cursor: cursor.execute( - "DELETE FROM alcs.noi_document WHERE audit_created_by = 'oats_etl';" + "DELETE FROM alcs.notice_of_intent_document WHERE audit_created_by = 'oats_etl';" ) conn.commit() print(f"Deleted items count = {cursor.rowcount}") diff --git a/bin/migrate-oats-data/sql/documents_noi/noi_documents.sql b/bin/migrate-oats-data/sql/documents_noi/noi_documents.sql index 1a91a46a6f..36998bc167 100644 --- a/bin/migrate-oats-data/sql/documents_noi/noi_documents.sql +++ b/bin/migrate-oats-data/sql/documents_noi/noi_documents.sql @@ -12,7 +12,7 @@ WITH oats.oats_documents od JOIN alcs."document" d ON d.oats_document_id = od.document_id::TEXT - JOIN alcs.application_document_code adc -- using adc as it is the same mapping + JOIN alcs.document_code adc ON adc.oats_code = od.document_code JOIN alcs.notice_of_intent a ON a.file_number = od.alr_application_id::TEXT diff --git a/bin/migrate-oats-data/sql/documents_noi/noi_documents_total_count.sql b/bin/migrate-oats-data/sql/documents_noi/noi_documents_total_count.sql index 3ad3fd9825..30bdd294ee 100644 --- a/bin/migrate-oats-data/sql/documents_noi/noi_documents_total_count.sql +++ b/bin/migrate-oats-data/sql/documents_noi/noi_documents_total_count.sql @@ -1,6 +1,6 @@ with oats_documents_to_map as ( select - a.uuid AS application_uuid, + a.uuid AS noi_uuid, d.uuid AS document_uuid, adc.code, publicly_viewable_ind AS is_public, @@ -12,7 +12,7 @@ with oats_documents_to_map as ( JOIN alcs."document" d ON d.oats_document_id = od.document_id::TEXT - JOIN alcs.application_document_code adc -- reusing application table mapping + JOIN alcs.document_code adc ON adc.oats_code = od.document_code JOIN alcs.notice_of_intent a diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1691007382208-add_noi_docs.ts b/services/apps/alcs/src/providers/typeorm/migrations/1691007382208-add_noi_docs.ts deleted file mode 100644 index ba7bb34be8..0000000000 --- a/services/apps/alcs/src/providers/typeorm/migrations/1691007382208-add_noi_docs.ts +++ /dev/null @@ -1,47 +0,0 @@ -import { MigrationInterface, QueryRunner } from "typeorm" - -export class addNoiDocs1691007382208 implements MigrationInterface { - - public async up(queryRunner: QueryRunner): Promise { - await queryRunner.query( - `CREATE TABLE "alcs"."noi_document" ("uuid" uuid NOT NULL DEFAULT gen_random_uuid(), "audit_created_by" text, "evidentiary_record_sorting" integer, "oats_document_id" text, "oats_application_id" text, "type_code" character varying NOT NULL, "visibility_flags" text array NOT NULL DEFAULT '{}', "application_uuid" uuid NOT NULL, "description" text, "document_uuid" uuid, CONSTRAINT "REL_17be9d534322486d932567196a62725e" UNIQUE ("document_uuid"), CONSTRAINT "PK_aa8a0b4ce8474054afe73e949c2d88f5" PRIMARY KEY ("uuid"))`, - ); - await queryRunner.query( - `ALTER TABLE "alcs"."noi_document" ADD CONSTRAINT "FK_703514379dc945f3bfc0d8e897d88086" FOREIGN KEY ("application_uuid") REFERENCES "alcs"."notice_of_intent"("uuid") ON DELETE NO ACTION ON UPDATE NO ACTION`, - ); - await queryRunner.query( - `ALTER TABLE "alcs"."noi_document" ADD CONSTRAINT "FK_be9edc8bd1864d20be37058fba08199b" FOREIGN KEY ("document_uuid") REFERENCES "alcs"."document"("uuid") ON DELETE NO ACTION ON UPDATE NO ACTION`, - ); - await queryRunner.query( - `ALTER TABLE "alcs"."noi_document" ALTER COLUMN "type_code" DROP NOT NULL`, - ); - await queryRunner.query( - `ALTER TABLE "alcs"."noi_document" ADD CONSTRAINT "FK_d5b10b5343374bf58cde7be5cefdcbdd" FOREIGN KEY ("type_code") REFERENCES "alcs"."application_document_code"("code") ON DELETE NO ACTION ON UPDATE NO ACTION`, - ); - await queryRunner.query(` - COMMENT ON COLUMN "alcs"."noi_document"."oats_document_id" IS 'used only for oats etl process'; - COMMENT ON COLUMN "alcs"."noi_document"."oats_application_id" IS 'used only for oats etl process'; - COMMENT ON COLUMN "alcs"."noi_document"."audit_created_by" IS 'used only for oats etl process'; - COMMENT ON TABLE "alcs"."noi_document" IS 'Links noi documents with the noi they''re saved to and logs other attributes'; - `, - ); - await queryRunner.query( - `ALTER TABLE "alcs"."noi_document" ADD CONSTRAINT "OATS_UNQ_DOCUMENTS" UNIQUE ("oats_document_id", "oats_application_id")`, - ); - } - - public async down(queryRunner: QueryRunner): Promise { - await queryRunner.query(` - ALTER TABLE "alcs"."noi_document" DROP CONSTRAINT "REL_17be9d534322486d932567196a62725e"; - ALTER TABLE "alcs"."noi_document" DROP CONSTRAINT "PK_aa8a0b4ce8474054afe73e949c2d88f5"; - ALTER TABLE "alcs"."noi_document" DROP CONSTRAINT "FK_703514379dc945f3bfc0d8e897d88086"; - ALTER TABLE "alcs"."noi_document" DROP CONSTRAINT "FK_be9edc8bd1864d20be37058fba08199b"; - ALTER TABLE "alcs"."noi_document" DROP CONSTRAINT "FK_d5b10b5343374bf58cde7be5cefdcbdd"; - ALTER TABLE "alcs"."noi_document" DROP CONSTRAINT "OATS_UNQ_DOCUMENTS"; - DROP TABLE "alcs"."noi_document" - `, - - ); - } - -} From 4dd1ea9064bc294182aa83b5ee8ad31328a77a7a Mon Sep 17 00:00:00 2001 From: "to. sandra" <76515860+sandratoh@users.noreply.github.com> Date: Thu, 3 Aug 2023 15:54:13 -0700 Subject: [PATCH 207/954] Remove expiry date from naru and tur proposals (#851) - Delete blank tur proposal component after removing only field - Update modules from non-existent tur component --- .../application/application.module.ts | 2 - .../proposal/naru/naru.component.html | 8 ---- .../proposal/proposal.component.html | 1 - .../proposal/tur/tur.component.html | 7 --- .../proposal/tur/tur.component.scss | 0 .../proposal/tur/tur.component.spec.ts | 43 ------------------- .../application/proposal/tur/tur.component.ts | 42 ------------------ 7 files changed, 103 deletions(-) delete mode 100644 alcs-frontend/src/app/features/application/proposal/tur/tur.component.html delete mode 100644 alcs-frontend/src/app/features/application/proposal/tur/tur.component.scss delete mode 100644 alcs-frontend/src/app/features/application/proposal/tur/tur.component.spec.ts delete mode 100644 alcs-frontend/src/app/features/application/proposal/tur/tur.component.ts diff --git a/alcs-frontend/src/app/features/application/application.module.ts b/alcs-frontend/src/app/features/application/application.module.ts index a26b8f313c..829b1b8818 100644 --- a/alcs-frontend/src/app/features/application/application.module.ts +++ b/alcs-frontend/src/app/features/application/application.module.ts @@ -30,7 +30,6 @@ import { ProposalComponent } from './proposal/proposal.component'; import { ExclProposalComponent } from './proposal/excl/excl.component'; import { SoilProposalComponent } from './proposal/soil/soil.component'; import { SubdProposalComponent } from './proposal/subd/subd.component'; -import { TurProposalComponent } from './proposal/tur/tur.component'; import { DecisionMeetingDialogComponent } from './review/decision-meeting-dialog/decision-meeting-dialog.component'; import { DecisionMeetingComponent } from './review/decision-meeting/decision-meeting.component'; import { ReviewComponent } from './review/review.component'; @@ -74,7 +73,6 @@ const routes: Routes = [ NfuProposalComponent, SubdProposalComponent, SoilProposalComponent, - TurProposalComponent, ExclProposalComponent, NaruProposalComponent, InclProposalComponent, diff --git a/alcs-frontend/src/app/features/application/proposal/naru/naru.component.html b/alcs-frontend/src/app/features/application/proposal/naru/naru.component.html index 461ba76b51..aeb7253ea3 100644 --- a/alcs-frontend/src/app/features/application/proposal/naru/naru.component.html +++ b/alcs-frontend/src/app/features/application/proposal/naru/naru.component.html @@ -1,11 +1,3 @@ -
-
Expiry Date
- -
-
Use End Date
Proposal Components - {{ application?.type?.label }} (save)="updateApplicationValue('agCapConsultant', $event)" >
-
diff --git a/alcs-frontend/src/app/features/application/proposal/tur/tur.component.html b/alcs-frontend/src/app/features/application/proposal/tur/tur.component.html deleted file mode 100644 index 13bf973675..0000000000 --- a/alcs-frontend/src/app/features/application/proposal/tur/tur.component.html +++ /dev/null @@ -1,7 +0,0 @@ -
-
Expiry Date
- -
diff --git a/alcs-frontend/src/app/features/application/proposal/tur/tur.component.scss b/alcs-frontend/src/app/features/application/proposal/tur/tur.component.scss deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/alcs-frontend/src/app/features/application/proposal/tur/tur.component.spec.ts b/alcs-frontend/src/app/features/application/proposal/tur/tur.component.spec.ts deleted file mode 100644 index 3a0ad21212..0000000000 --- a/alcs-frontend/src/app/features/application/proposal/tur/tur.component.spec.ts +++ /dev/null @@ -1,43 +0,0 @@ -import { NO_ERRORS_SCHEMA } from '@angular/core'; -import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { createMock, DeepMocked } from '@golevelup/ts-jest'; -import { BehaviorSubject } from 'rxjs'; -import { ApplicationDetailService } from '../../../../services/application/application-detail.service'; -import { ApplicationDto } from '../../../../services/application/application.dto'; -import { ToastService } from '../../../../services/toast/toast.service'; - -import { TurProposalComponent } from './tur.component'; - -describe('TurComponent', () => { - let component: TurProposalComponent; - let fixture: ComponentFixture; - let mockApplicationDetailService: DeepMocked; - let mockToastService: DeepMocked; - - beforeEach(async () => { - mockApplicationDetailService = createMock(); - mockToastService = createMock(); - - await TestBed.configureTestingModule({ - declarations: [TurProposalComponent], - providers: [ - { provide: ToastService, useValue: mockToastService }, - { - provide: ApplicationDetailService, - useValue: mockApplicationDetailService, - }, - ], - schemas: [NO_ERRORS_SCHEMA], - }).compileComponents(); - - mockApplicationDetailService.$application = new BehaviorSubject(undefined); - - fixture = TestBed.createComponent(TurProposalComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/alcs-frontend/src/app/features/application/proposal/tur/tur.component.ts b/alcs-frontend/src/app/features/application/proposal/tur/tur.component.ts deleted file mode 100644 index eda82878a1..0000000000 --- a/alcs-frontend/src/app/features/application/proposal/tur/tur.component.ts +++ /dev/null @@ -1,42 +0,0 @@ -import { Component, OnDestroy, OnInit } from '@angular/core'; -import { Subject, takeUntil } from 'rxjs'; -import { ApplicationDetailService } from '../../../../services/application/application-detail.service'; -import { ApplicationDto, UpdateApplicationDto } from '../../../../services/application/application.dto'; -import { ToastService } from '../../../../services/toast/toast.service'; - -@Component({ - selector: 'app-proposal-tur', - templateUrl: './tur.component.html', - styleUrls: ['./tur.component.scss'], -}) -export class TurProposalComponent implements OnInit, OnDestroy { - $destroy = new Subject(); - application: ApplicationDto | undefined; - - constructor(private applicationDetailService: ApplicationDetailService, private toastService: ToastService) {} - - ngOnInit(): void { - this.applicationDetailService.$application.pipe(takeUntil(this.$destroy)).subscribe((application) => { - if (application) { - this.application = application; - } - }); - } - - async updateApplicationValue(field: keyof UpdateApplicationDto, value: string[] | string | number | null) { - const application = this.application; - if (application) { - const update = await this.applicationDetailService.updateApplication(application.fileNumber, { - [field]: value, - }); - if (update) { - this.toastService.showSuccessToast('Application updated'); - } - } - } - - ngOnDestroy(): void { - this.$destroy.next(); - this.$destroy.complete(); - } -} From 8fbe58f0532a3a888d384333cf6fdfd76745c3ca Mon Sep 17 00:00:00 2001 From: Liam Stoddard Date: Thu, 3 Aug 2023 16:09:21 -0700 Subject: [PATCH 208/954] updated comment to specify noi --- bin/migrate-oats-data/documents/documents_noi.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/migrate-oats-data/documents/documents_noi.py b/bin/migrate-oats-data/documents/documents_noi.py index 1f5bd12047..b2e2fe638e 100644 --- a/bin/migrate-oats-data/documents/documents_noi.py +++ b/bin/migrate-oats-data/documents/documents_noi.py @@ -4,7 +4,7 @@ This script connects to postgress version of OATS DB and transfers data from OATS documents table to ALCS document table. NOTE: - Before performing document import you need to import applications from oats. + Before performing document_noi import you need to import noi from oats. """ From 6e21e2ce34bee95413104166ef60fa5adab4a601 Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Thu, 3 Aug 2023 16:26:29 -0700 Subject: [PATCH 209/954] fix inconsistency in FK name between initial migration and dev/test (#852) --- .../typeorm/migrations/1691021151956-plan_number.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1691021151956-plan_number.ts b/services/apps/alcs/src/providers/typeorm/migrations/1691021151956-plan_number.ts index 4bfede09a9..9d761f800c 100644 --- a/services/apps/alcs/src/providers/typeorm/migrations/1691021151956-plan_number.ts +++ b/services/apps/alcs/src/providers/typeorm/migrations/1691021151956-plan_number.ts @@ -5,7 +5,10 @@ export class planNumber1691021151956 implements MigrationInterface { public async up(queryRunner: QueryRunner): Promise { await queryRunner.query( - `ALTER TABLE "alcs"."application_decision" DROP CONSTRAINT "FK_e88e4a5dc4db0a7ba934b99dbe0"`, + `ALTER TABLE "alcs"."application_decision" DROP CONSTRAINT IF EXISTS "FK_e88e4a5dc4db0a7ba934b99dbe0"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_decision" DROP CONSTRAINT IF EXISTS "FK_dc34f50291af0299bd44e8d0448"`, ); await queryRunner.query( `CREATE TABLE "alcs"."application_decision_condition_to_component_lot" ("audit_deleted_date_at" TIMESTAMP WITH TIME ZONE, "audit_created_at" TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now(), "audit_updated_at" TIMESTAMP WITH TIME ZONE DEFAULT now(), "audit_created_by" character varying NOT NULL, "audit_updated_by" character varying, "uuid" uuid NOT NULL DEFAULT gen_random_uuid(), "plan_numbers" text NOT NULL, "condition_uuid" uuid, "component_lot_uuid" uuid NOT NULL, CONSTRAINT "PK_9c03e6af9a3996fcccf250ca610" PRIMARY KEY ("uuid"))`, From 4cd48c9040944f8fdea63bfa1259243c532e1a84 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Thu, 3 Aug 2023 16:36:56 -0700 Subject: [PATCH 210/954] Bug Fixes for Edit Submission * Update toasts for some reason * Stop red toast / error returning from Submit when the PDF generation fails. --- .../application-owner.service.ts | 6 ++-- ...nerate-submission-document.service.spec.ts | 7 ++-- .../generate-submission-document.service.ts | 36 +++++++++++++------ .../pdf-generation.controller.ts | 6 ++-- 4 files changed, 34 insertions(+), 21 deletions(-) diff --git a/portal-frontend/src/app/services/application-owner/application-owner.service.ts b/portal-frontend/src/app/services/application-owner/application-owner.service.ts index 2942812ab9..debb0ae2c4 100644 --- a/portal-frontend/src/app/services/application-owner/application-owner.service.ts +++ b/portal-frontend/src/app/services/application-owner/application-owner.service.ts @@ -53,7 +53,7 @@ export class ApplicationOwnerService { const res = await firstValueFrom( this.httpClient.patch(`${this.serviceUrl}/${uuid}`, updateDto) ); - this.toastService.showSuccessToast('Owner updated'); + this.toastService.showSuccessToast('Owner saved'); return res; } catch (e) { console.error(e); @@ -67,11 +67,11 @@ export class ApplicationOwnerService { const res = await firstValueFrom( this.httpClient.post(`${this.serviceUrl}/setPrimaryContact`, updateDto) ); - this.toastService.showSuccessToast('Primary Contact Updated'); + this.toastService.showSuccessToast('Application saved'); return res; } catch (e) { console.error(e); - this.toastService.showErrorToast('Failed to update Primary Contact, please try again later'); + this.toastService.showErrorToast('Failed to update Application, please try again later'); return undefined; } } diff --git a/services/apps/alcs/src/portal/pdf-generation/generate-submission-document.service.spec.ts b/services/apps/alcs/src/portal/pdf-generation/generate-submission-document.service.spec.ts index 72a1fd31d0..69cf57d39a 100644 --- a/services/apps/alcs/src/portal/pdf-generation/generate-submission-document.service.spec.ts +++ b/services/apps/alcs/src/portal/pdf-generation/generate-submission-document.service.spec.ts @@ -166,12 +166,9 @@ describe('GenerateSubmissionDocumentService', () => { name: user.user.entity, }); - await expect(service.generate('fake', userEntity)).rejects.toMatchObject( - new ServiceNotFoundException( - `Could not find template for application submission type not a type`, - ), - ); + const res = await service.generate('fake', userEntity); + expect(res).toBeUndefined(); expect(mockCdogsService.generateDocument).toBeCalledTimes(0); }); diff --git a/services/apps/alcs/src/portal/pdf-generation/generate-submission-document.service.ts b/services/apps/alcs/src/portal/pdf-generation/generate-submission-document.service.ts index e95c1ed148..43ccf334f5 100644 --- a/services/apps/alcs/src/portal/pdf-generation/generate-submission-document.service.ts +++ b/services/apps/alcs/src/portal/pdf-generation/generate-submission-document.service.ts @@ -1,6 +1,12 @@ import { CdogsService } from '@app/common/cdogs/cdogs.service'; import { ServiceNotFoundException } from '@app/common/exceptions/base.exception'; -import { forwardRef, HttpStatus, Inject, Injectable } from '@nestjs/common'; +import { + forwardRef, + HttpStatus, + Inject, + Injectable, + Logger, +} from '@nestjs/common'; import * as config from 'config'; import * as dayjs from 'dayjs'; import { ApplicationLocalGovernmentService } from '../../alcs/application/application-code/application-local-government/application-local-government.service'; @@ -37,6 +43,8 @@ const NO_DATA = 'No Data'; @Injectable() export class GenerateSubmissionDocumentService { + private logger = new Logger(GenerateSubmissionDocumentService.name); + constructor( private documentGenerationService: CdogsService, @Inject(forwardRef(() => ApplicationSubmissionService)) @@ -59,19 +67,24 @@ export class GenerateSubmissionDocumentService { const template = await this.getPdfTemplateBySubmissionType(submission); - const pdf = await this.documentGenerationService.generateDocument( - `${fileNumber}_submission_Date_Time`, - `${config.get('CDOGS.TEMPLATE_FOLDER')}/${template.templateName}`, - template.payload, - ); + if (template) { + const pdf = await this.documentGenerationService.generateDocument( + `${fileNumber}_submission_Date_Time`, + `${config.get('CDOGS.TEMPLATE_FOLDER')}/${ + template.templateName + }`, + template.payload, + ); - return pdf; + return pdf; + } + return; } async generateAndAttach(fileNumber: string, user: User) { const generatedRes = await this.generate(fileNumber, user); - if (generatedRes.status === HttpStatus.OK) { + if (generatedRes && generatedRes.status === HttpStatus.OK) { await this.applicationDocumentService.attachDocumentAsBuffer({ fileNumber: fileNumber, fileName: `${fileNumber}_APP_Submission.pdf`, @@ -94,7 +107,7 @@ export class GenerateSubmissionDocumentService { async generateUpdate(fileNumber: string, user: User) { const generatedRes = await this.generate(fileNumber, user); - if (generatedRes.status === HttpStatus.OK) { + if (generatedRes && generatedRes.status === HttpStatus.OK) { const documents = await this.applicationDocumentService.list(fileNumber); const submissionDocuments = documents.filter( @@ -141,7 +154,7 @@ export class GenerateSubmissionDocumentService { private async getPdfTemplateBySubmissionType( submission: ApplicationSubmission, - ): Promise { + ): Promise { const documents = await this.applicationDocumentService.list( submission.fileNumber, ); @@ -162,9 +175,10 @@ export class GenerateSubmissionDocumentService { payload = this.populateSubdData(payload, submission, documents); return { payload, templateName: 'subd-submission-template.docx' }; default: - throw new ServiceNotFoundException( + this.logger.error( `Could not find template for application submission type ${submission.typeCode}`, ); + return; } } diff --git a/services/apps/alcs/src/portal/pdf-generation/pdf-generation.controller.ts b/services/apps/alcs/src/portal/pdf-generation/pdf-generation.controller.ts index 2f08599eb6..d488a8ab44 100644 --- a/services/apps/alcs/src/portal/pdf-generation/pdf-generation.controller.ts +++ b/services/apps/alcs/src/portal/pdf-generation/pdf-generation.controller.ts @@ -25,8 +25,10 @@ export class PdfGenerationController { user, ); - resp.type('application/pdf'); - resp.send(result.data); + if (result) { + resp.type('application/pdf'); + resp.send(result.data); + } } @Get(':fileNumber/review') From 099cd708a56c359ebbe27ac62a9fd26295f20c70 Mon Sep 17 00:00:00 2001 From: Liam Stoddard Date: Thu, 3 Aug 2023 17:01:29 -0700 Subject: [PATCH 211/954] renamed files --- bin/migrate-oats-data/documents/__init__.py | 8 ++++---- ...on_documents.py => alcs_documents_to_app_documents.py} | 4 ++-- ...oi_documents.py => alcs_documents_to_noi_documents.py} | 6 +++--- ...cuments.py => oats_documents_to_alcs_documents_app.py} | 4 ++-- ...nts_noi.py => oats_documents_to_alcs_documents_noi.py} | 4 ++-- .../alcs_documents_to_app_documents.sql} | 0 .../alcs_documents_to_app_documents_total_count.sql} | 0 .../oats_documents_to_alcs_documents_app.sql} | 0 .../oats_documents_to_alcs_documents_app_total_count.sql} | 0 ..._documents.sql => alcs_documents_to_noi_documents.sql} | 0 ...ql => alcs_documents_to_noi_documents_total_count.sql} | 0 ...s_noi.sql => oats_documents_to_alcs_documents_noi.sql} | 0 ... oats_documents_to_alcs_documents_noi_total_count.sql} | 0 13 files changed, 13 insertions(+), 13 deletions(-) rename bin/migrate-oats-data/documents/{application_documents.py => alcs_documents_to_app_documents.py} (95%) rename bin/migrate-oats-data/documents/{noi_documents.py => alcs_documents_to_noi_documents.py} (92%) rename bin/migrate-oats-data/documents/{documents.py => oats_documents_to_alcs_documents_app.py} (94%) rename bin/migrate-oats-data/documents/{documents_noi.py => oats_documents_to_alcs_documents_noi.py} (94%) rename bin/migrate-oats-data/sql/{documents/application_documents.sql => documents_app/alcs_documents_to_app_documents.sql} (100%) rename bin/migrate-oats-data/sql/{documents/application_documents_total_count.sql => documents_app/alcs_documents_to_app_documents_total_count.sql} (100%) rename bin/migrate-oats-data/sql/{documents/documents.sql => documents_app/oats_documents_to_alcs_documents_app.sql} (100%) rename bin/migrate-oats-data/sql/{documents/documents_total_count.sql => documents_app/oats_documents_to_alcs_documents_app_total_count.sql} (100%) rename bin/migrate-oats-data/sql/documents_noi/{noi_documents.sql => alcs_documents_to_noi_documents.sql} (100%) rename bin/migrate-oats-data/sql/documents_noi/{noi_documents_total_count.sql => alcs_documents_to_noi_documents_total_count.sql} (100%) rename bin/migrate-oats-data/sql/documents_noi/{documents_noi.sql => oats_documents_to_alcs_documents_noi.sql} (100%) rename bin/migrate-oats-data/sql/documents_noi/{documents_noi_total_count.sql => oats_documents_to_alcs_documents_noi_total_count.sql} (100%) diff --git a/bin/migrate-oats-data/documents/__init__.py b/bin/migrate-oats-data/documents/__init__.py index 95beb4bba2..5038d11bb9 100644 --- a/bin/migrate-oats-data/documents/__init__.py +++ b/bin/migrate-oats-data/documents/__init__.py @@ -1,4 +1,4 @@ -from .documents import * -from .application_documents import * -from .documents_noi import * -from .noi_documents import * +from .alcs_documents_to_app_documents import * +from .oats_documents_to_alcs_documents_app import * +from .alcs_documents_to_noi_documents import * +from .oats_documents_to_alcs_documents_noi import * diff --git a/bin/migrate-oats-data/documents/application_documents.py b/bin/migrate-oats-data/documents/alcs_documents_to_app_documents.py similarity index 95% rename from bin/migrate-oats-data/documents/application_documents.py rename to bin/migrate-oats-data/documents/alcs_documents_to_app_documents.py index ea8b34c715..1eeb7124f6 100644 --- a/bin/migrate-oats-data/documents/application_documents.py +++ b/bin/migrate-oats-data/documents/alcs_documents_to_app_documents.py @@ -38,7 +38,7 @@ def process_application_documents(conn=None, batch_size=10000): """ with conn.cursor() as cursor: with open( - "sql/documents/application_documents_total_count.sql", "r", encoding="utf-8" + "sql/documents_app/alcs_documents_to_app_documents_total_count.sql", "r", encoding="utf-8" ) as sql_file: count_query = sql_file.read() cursor.execute(count_query) @@ -50,7 +50,7 @@ def process_application_documents(conn=None, batch_size=10000): last_document_id = 0 with open( - "sql/documents/application_documents.sql", "r", encoding="utf-8" + "sql/documents_app/alcs_documents_to_app_documents.sql", "r", encoding="utf-8" ) as sql_file: documents_to_insert_sql = sql_file.read() while True: diff --git a/bin/migrate-oats-data/documents/noi_documents.py b/bin/migrate-oats-data/documents/alcs_documents_to_noi_documents.py similarity index 92% rename from bin/migrate-oats-data/documents/noi_documents.py rename to bin/migrate-oats-data/documents/alcs_documents_to_noi_documents.py index 6a6e7ba727..b06b2101e1 100644 --- a/bin/migrate-oats-data/documents/noi_documents.py +++ b/bin/migrate-oats-data/documents/alcs_documents_to_noi_documents.py @@ -1,7 +1,7 @@ from db import inject_conn_pool """ - This script links data from ALCS documents table to ALCS noi_documents table based on data from OATS. + This script links data from ALCS documents table to ALCS notice_of_intent_document table based on data from OATS. """ @@ -38,7 +38,7 @@ def process_noi_documents(conn=None, batch_size=10000): """ with conn.cursor() as cursor: with open( - "sql/documents_noi/noi_documents_total_count.sql", "r", encoding="utf-8" + "sql/documents_noi/alcs_documents_to_noi_documents_total_count.sql", "r", encoding="utf-8" ) as sql_file: count_query = sql_file.read() cursor.execute(count_query) @@ -50,7 +50,7 @@ def process_noi_documents(conn=None, batch_size=10000): last_document_id = 0 with open( - "sql/documents_noi/noi_documents.sql", "r", encoding="utf-8" + "sql/documents_noi/alcs_documents_to_noi_documents.sql", "r", encoding="utf-8" ) as sql_file: documents_to_insert_sql = sql_file.read() while True: diff --git a/bin/migrate-oats-data/documents/documents.py b/bin/migrate-oats-data/documents/oats_documents_to_alcs_documents_app.py similarity index 94% rename from bin/migrate-oats-data/documents/documents.py rename to bin/migrate-oats-data/documents/oats_documents_to_alcs_documents_app.py index e8af18e96a..ecc953969f 100644 --- a/bin/migrate-oats-data/documents/documents.py +++ b/bin/migrate-oats-data/documents/oats_documents_to_alcs_documents_app.py @@ -37,7 +37,7 @@ def process_documents(conn=None, batch_size=10000): """ with conn.cursor() as cursor: with open( - "sql/documents/documents_total_count.sql", "r", encoding="utf-8" + "sql/documents_app/oats_documents_to_alcs_documents_app_total_count.sql", "r", encoding="utf-8" ) as sql_file: count_query = sql_file.read() cursor.execute(count_query) @@ -48,7 +48,7 @@ def process_documents(conn=None, batch_size=10000): successful_inserts_count = 0 last_document_id = 0 - with open("sql/documents/documents.sql", "r", encoding="utf-8") as sql_file: + with open("sql/documents_app/oats_documents_to_alcs_documents_app.sql", "r", encoding="utf-8") as sql_file: documents_to_insert_sql = sql_file.read() while True: cursor.execute( diff --git a/bin/migrate-oats-data/documents/documents_noi.py b/bin/migrate-oats-data/documents/oats_documents_to_alcs_documents_noi.py similarity index 94% rename from bin/migrate-oats-data/documents/documents_noi.py rename to bin/migrate-oats-data/documents/oats_documents_to_alcs_documents_noi.py index b2e2fe638e..294538da15 100644 --- a/bin/migrate-oats-data/documents/documents_noi.py +++ b/bin/migrate-oats-data/documents/oats_documents_to_alcs_documents_noi.py @@ -37,7 +37,7 @@ def process_documents_noi(conn=None, batch_size=10000): """ with conn.cursor() as cursor: with open( - "sql/documents_noi/documents_noi_total_count.sql", "r", encoding="utf-8" + "sql/documents_noi/oats_documents_to_alcs_documents_noi_total_count.sql", "r", encoding="utf-8" ) as sql_file: count_query = sql_file.read() cursor.execute(count_query) @@ -48,7 +48,7 @@ def process_documents_noi(conn=None, batch_size=10000): successful_inserts_count = 0 last_document_id = 0 - with open("sql/documents_noi/documents_noi.sql", "r", encoding="utf-8") as sql_file: + with open("sql/documents_noi/oats_documents_to_alcs_documents_noi.sql", "r", encoding="utf-8") as sql_file: documents_to_insert_sql = sql_file.read() while True: cursor.execute( diff --git a/bin/migrate-oats-data/sql/documents/application_documents.sql b/bin/migrate-oats-data/sql/documents_app/alcs_documents_to_app_documents.sql similarity index 100% rename from bin/migrate-oats-data/sql/documents/application_documents.sql rename to bin/migrate-oats-data/sql/documents_app/alcs_documents_to_app_documents.sql diff --git a/bin/migrate-oats-data/sql/documents/application_documents_total_count.sql b/bin/migrate-oats-data/sql/documents_app/alcs_documents_to_app_documents_total_count.sql similarity index 100% rename from bin/migrate-oats-data/sql/documents/application_documents_total_count.sql rename to bin/migrate-oats-data/sql/documents_app/alcs_documents_to_app_documents_total_count.sql diff --git a/bin/migrate-oats-data/sql/documents/documents.sql b/bin/migrate-oats-data/sql/documents_app/oats_documents_to_alcs_documents_app.sql similarity index 100% rename from bin/migrate-oats-data/sql/documents/documents.sql rename to bin/migrate-oats-data/sql/documents_app/oats_documents_to_alcs_documents_app.sql diff --git a/bin/migrate-oats-data/sql/documents/documents_total_count.sql b/bin/migrate-oats-data/sql/documents_app/oats_documents_to_alcs_documents_app_total_count.sql similarity index 100% rename from bin/migrate-oats-data/sql/documents/documents_total_count.sql rename to bin/migrate-oats-data/sql/documents_app/oats_documents_to_alcs_documents_app_total_count.sql diff --git a/bin/migrate-oats-data/sql/documents_noi/noi_documents.sql b/bin/migrate-oats-data/sql/documents_noi/alcs_documents_to_noi_documents.sql similarity index 100% rename from bin/migrate-oats-data/sql/documents_noi/noi_documents.sql rename to bin/migrate-oats-data/sql/documents_noi/alcs_documents_to_noi_documents.sql diff --git a/bin/migrate-oats-data/sql/documents_noi/noi_documents_total_count.sql b/bin/migrate-oats-data/sql/documents_noi/alcs_documents_to_noi_documents_total_count.sql similarity index 100% rename from bin/migrate-oats-data/sql/documents_noi/noi_documents_total_count.sql rename to bin/migrate-oats-data/sql/documents_noi/alcs_documents_to_noi_documents_total_count.sql diff --git a/bin/migrate-oats-data/sql/documents_noi/documents_noi.sql b/bin/migrate-oats-data/sql/documents_noi/oats_documents_to_alcs_documents_noi.sql similarity index 100% rename from bin/migrate-oats-data/sql/documents_noi/documents_noi.sql rename to bin/migrate-oats-data/sql/documents_noi/oats_documents_to_alcs_documents_noi.sql diff --git a/bin/migrate-oats-data/sql/documents_noi/documents_noi_total_count.sql b/bin/migrate-oats-data/sql/documents_noi/oats_documents_to_alcs_documents_noi_total_count.sql similarity index 100% rename from bin/migrate-oats-data/sql/documents_noi/documents_noi_total_count.sql rename to bin/migrate-oats-data/sql/documents_noi/oats_documents_to_alcs_documents_noi_total_count.sql From d99b9555850f2324208d48dec95e97288a8c9f56 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Fri, 4 Aug 2023 10:25:03 -0700 Subject: [PATCH 212/954] Re-organize Error Fields, Hints, and Character Limits * Update order for all proposal / input component steps. --- .../land-use/land-use.component.html | 22 ++++++-------- .../parcel-entry/parcel-entry.component.html | 13 ++++---- .../excl-proposal.component.html | 4 +-- .../incl-proposal.component.html | 8 ++--- .../naru-proposal.component.html | 30 +++++++++---------- .../nfu-proposal/nfu-proposal.component.html | 12 ++++---- .../pfrs-proposal.component.html | 18 +++++------ .../pofo-proposal.component.html | 18 +++++------ .../roso-proposal.component.html | 14 +++++---- .../subd-proposal.component.html | 10 +++---- .../tur-proposal/tur-proposal.component.html | 8 ++--- 11 files changed, 78 insertions(+), 79 deletions(-) diff --git a/portal-frontend/src/app/features/edit-submission/land-use/land-use.component.html b/portal-frontend/src/app/features/edit-submission/land-use/land-use.component.html index 8343869399..72130d0cf4 100644 --- a/portal-frontend/src/app/features/edit-submission/land-use/land-use.component.html +++ b/portal-frontend/src/app/features/edit-submission/land-use/land-use.component.html @@ -32,7 +32,6 @@
Land Use of Parcel(s) under Application
maxlength="4000" > - Characters left: {{ 4000 - parcelsAgricultureDescriptionText.textLength }}
This field is required
-
- Example 1: PID 001-002-003: 60 ha hay crop, 40 ha grazing, 200 sheep.
Example 2: Parcel 1: 10% - blueberry crop, 30% vegetables, 60% hay. Parcel 2: 100% hay. - -
+ Example 1: PID 001-002-003: 60 ha hay crop, 40 ha grazing, 200 sheep. Example 2: Parcel 1: 10% + blueberry crop, 30% vegetables, 60% hay. Parcel 2: 100% hay. + +
Characters left: {{ 4000 - parcelsAgricultureDescriptionText.textLength }}
@@ -72,9 +70,6 @@
maxlength="4000" > - Characters left: {{ 4000 - parcelsAgricultureImprovementDescriptionText.textLength }}
This field is required
-
Example: 40 ha of grazing land fenced in 2010.
+ Example: 40 ha of grazing land fenced in 2010. +
Characters left: {{ 4000 - parcelsAgricultureImprovementDescriptionText.textLength }}
-
Example: House and 100 square metre detached auto repair shop.
+ Example: House and 100 square metre detached auto repair shop. +
Characters left: {{ 4000 - parcelsNonAgricultureUseDescriptionText.textLength }}
Identify the land uses surrounding the parcel(s) under application.
diff --git a/portal-frontend/src/app/features/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html b/portal-frontend/src/app/features/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html index a5bc951032..0cdffa38c9 100644 --- a/portal-frontend/src/app/features/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html +++ b/portal-frontend/src/app/features/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html @@ -83,6 +83,7 @@
Parcel Lookup
+
The area of the entire parcel in hectares, not just the area under application.
Parcel Lookup
-
+
@@ -133,19 +134,20 @@
Parcel Lookup
 -
- Example: 2020-Mar-01 -
warning
This field is required
+
+ Example: 2020-Mar-01 +
- As determined by BC Assessment + As determined by + BC Assessment
Owner Information isConfirmedByApplicant.invalid && (isConfirmedByApplicant.dirty || isConfirmedByApplicant.touched) }" - class="" >I confirm that the owner information provided above matches the current Certificate of Title. Mismatched information can cause significant delays to processing time. diff --git a/portal-frontend/src/app/features/edit-submission/proposal/excl-proposal/excl-proposal.component.html b/portal-frontend/src/app/features/edit-submission/proposal/excl-proposal/excl-proposal.component.html index c5afa0cf74..02917af9e0 100644 --- a/portal-frontend/src/app/features/edit-submission/proposal/excl-proposal/excl-proposal.component.html +++ b/portal-frontend/src/app/features/edit-submission/proposal/excl-proposal/excl-proposal.component.html @@ -91,11 +91,11 @@

Proposal

placeholder="Type comment" > - Characters left: {{ 4000 - purposeText.textLength }}
warning
This field is required
+
Characters left: {{ 4000 - purposeText.textLength }}
@@ -109,7 +109,7 @@

Proposal

placeholder="Type comment" > - Characters left: {{ 4000 - outsideLandsText.textLength }} +
Characters left: {{ 4000 - outsideLandsText.textLength }}
warning
This field is required
diff --git a/portal-frontend/src/app/features/edit-submission/proposal/incl-proposal/incl-proposal.component.html b/portal-frontend/src/app/features/edit-submission/proposal/incl-proposal/incl-proposal.component.html index b48dd099ea..c3d52c3413 100644 --- a/portal-frontend/src/app/features/edit-submission/proposal/incl-proposal/incl-proposal.component.html +++ b/portal-frontend/src/app/features/edit-submission/proposal/incl-proposal/incl-proposal.component.html @@ -55,11 +55,11 @@

Proposal

placeholder="Type comment" > - Characters left: {{ 4000 - purposeText.textLength }}
warning
This field is required
+
Characters left: {{ 4000 - purposeText.textLength }}
@@ -73,11 +73,11 @@

Proposal

placeholder="Type comment" > - Characters left: {{ 4000 - outsideLandsText.textLength }}
warning
This field is required
+
Characters left: {{ 4000 - outsideLandsText.textLength }}
diff --git a/portal-frontend/src/app/features/edit-submission/proposal/naru-proposal/naru-proposal.component.html b/portal-frontend/src/app/features/edit-submission/proposal/naru-proposal/naru-proposal.component.html index 9ae2050053..52abf7c448 100644 --- a/portal-frontend/src/app/features/edit-submission/proposal/naru-proposal/naru-proposal.component.html +++ b/portal-frontend/src/app/features/edit-submission/proposal/naru-proposal/naru-proposal.component.html @@ -50,11 +50,11 @@

Proposal

- Characters left: {{ 4000 - purposeText.textLength }}
warning
This field is required
+
Characters left: {{ 4000 - purposeText.textLength }}
@@ -97,7 +97,6 @@

Proposal

matInput > - Characters left: {{ 4000 - residenceNecessityText.textLength }}
Proposal warning
This field is required
+
Characters left: {{ 4000 - residenceNecessityText.textLength }}
@@ -123,7 +123,6 @@

Proposal

matInput > - Characters left: {{ 4000 - locationRationaleText.textLength }}
Proposal warning
This field is required
+
Characters left: {{ 4000 - locationRationaleText.textLength }}
@@ -151,11 +151,11 @@

Proposal

matInput > - Characters left: {{ 4000 - infrastructureText.textLength }}
warning
This field is required
+
Characters left: {{ 4000 - infrastructureText.textLength }}
@@ -196,7 +196,6 @@

Proposal

matInput > - Characters left: {{ 4000 - residenceNecessityText.textLength }}
Proposal warning
This field is required
+
Characters left: {{ 4000 - residenceNecessityText.textLength }}
@@ -219,7 +219,6 @@

Proposal

matInput > - Characters left: {{ 4000 - locationRationaleText.textLength }}
Proposal warning
This field is required
+
Characters left: {{ 4000 - locationRationaleText.textLength }}
@@ -247,11 +247,11 @@

Proposal

matInput > - Characters left: {{ 4000 - infrastructureText.textLength }}
warning
This field is required
+
Characters left: {{ 4000 - infrastructureText.textLength }}
@@ -316,7 +316,6 @@

Proposal

matInput > - Characters left: {{ 4000 - residenceNecessityText.textLength }}
Proposal warning
This field is required
+
Characters left: {{ 4000 - residenceNecessityText.textLength }}
@@ -339,7 +339,6 @@

Proposal

matInput > - Characters left: {{ 4000 - locationRationaleText.textLength }}
Proposal warning
This field is required
+
Characters left: {{ 4000 - locationRationaleText.textLength }}
@@ -367,11 +367,11 @@

Proposal

matInput > - Characters left: {{ 4000 - infrastructureText.textLength }}
warning
This field is required
+
Characters left: {{ 4000 - infrastructureText.textLength }}
@@ -389,11 +389,11 @@

Proposal

matInput > - Characters left: {{ 4000 - agriTourismText.textLength }}
warning
This field is required
+
Characters left: {{ 4000 - agriTourismText.textLength }}
@@ -415,7 +415,6 @@

Proposal

matInput > - Characters left: {{ 4000 - existingStructuresText.textLength }}
Proposal warning
This field is required
+
Characters left: {{ 4000 - existingStructuresText.textLength }}
@@ -477,12 +477,12 @@

Soil & Fill Components

- Characters left: {{ 4000 - fillTypeToPlaceText.textLength }}
warning
This field is required
-
Example: Aggregate, topsoil, structural fill, sand, gravel, etc
+ Example: Aggregate, topsoil, structural fill, sand, gravel, etc +
Characters left: {{ 4000 - fillTypeToPlaceText.textLength }}
@@ -498,11 +498,11 @@

Soil & Fill Components

matInput > - Characters left: {{ 4000 - fillOriginToPlaceText.textLength }}
warning
This field is required
+
Characters left: {{ 4000 - fillOriginToPlaceText.textLength }}
diff --git a/portal-frontend/src/app/features/edit-submission/proposal/nfu-proposal/nfu-proposal.component.html b/portal-frontend/src/app/features/edit-submission/proposal/nfu-proposal/nfu-proposal.component.html index c9d089321a..58ab5ea83a 100644 --- a/portal-frontend/src/app/features/edit-submission/proposal/nfu-proposal/nfu-proposal.component.html +++ b/portal-frontend/src/app/features/edit-submission/proposal/nfu-proposal/nfu-proposal.component.html @@ -50,11 +50,11 @@

Proposal

placeholder="Type comment" > - Characters left: {{ 4000 - purposeText.textLength }}
warning
This field is required
+
Characters left: {{ 4000 - purposeText.textLength }}
@@ -167,7 +167,6 @@

Soil & Fill Components

matInput > - Characters left: {{ 4000 - fillOriginToPlaceText.textLength }}
Soil & Fill Components warning
This field is required
+
Characters left: {{ 4000 - fillOriginToPlaceText.textLength }}
diff --git a/portal-frontend/src/app/features/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.html b/portal-frontend/src/app/features/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.html index cd61be54b1..d795b5f5f6 100644 --- a/portal-frontend/src/app/features/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.html +++ b/portal-frontend/src/app/features/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.html @@ -209,12 +209,12 @@

Project Duration

placeholder="Type comment" > - Characters left: {{ 4000 - fillTypeToPlaceText.textLength }}
warning
This field is required
-
Example: Aggregate, Extraction, Placer Mining, Peat Extraction, Soil etc.
+ Example: Aggregate, Extraction, Placer Mining, Peat Extraction, Soil etc. +
Characters left: {{ 4000 - fillTypeToPlaceText.textLength }}
@@ -230,12 +230,12 @@

Project Duration

placeholder="Type comment" > - Characters left: {{ 4000 - soilTypeRemovedText.textLength }}
warning
This field is required
-
Example: Aggregate, Extraction, Placer Mining, Peat Extraction, Soil etc.
+ Example: Aggregate, Extraction, Placer Mining, Peat Extraction, Soil etc. +
Characters left: {{ 4000 - soilTypeRemovedText.textLength }}
@@ -256,7 +256,6 @@

Project Duration

placeholder="Type comment" > - Characters left: {{ 4000 - soilAlternativeMeasuresText.textLength }}
Project Duration warning
This field is required
-
Example: Aggregate, Extraction, Placer Mining, Peat Extraction, Soil etc.
+ Example: Aggregate, Extraction, Placer Mining, Peat Extraction, Soil etc. +
Characters left: {{ 4000 - soilAlternativeMeasuresText.textLength }}
@@ -282,7 +282,6 @@

Project Duration

placeholder="Type comment" > - Characters left: {{ 4000 - reduceNegativeImpactsText.textLength }}
Project Duration warning
This field is required
-
+ Example: Project phasing, providing landscape screening, fencing, buffering, erosion and sediment control, temporary or permanent drainage, etc. -
+ +
Characters left: {{ 4000 - reduceNegativeImpactsText.textLength }}
diff --git a/portal-frontend/src/app/features/edit-submission/proposal/pofo-proposal/pofo-proposal.component.html b/portal-frontend/src/app/features/edit-submission/proposal/pofo-proposal/pofo-proposal.component.html index b5fa496a1e..4568248baf 100644 --- a/portal-frontend/src/app/features/edit-submission/proposal/pofo-proposal/pofo-proposal.component.html +++ b/portal-frontend/src/app/features/edit-submission/proposal/pofo-proposal/pofo-proposal.component.html @@ -82,11 +82,11 @@

Proposal

placeholder="Type comment" > - Characters left: {{ 4000 - purposeText.textLength }}
warning
This field is required
+
Characters left: {{ 4000 - purposeText.textLength }}
@@ -175,12 +175,12 @@

Project Duration

placeholder="Type comment" > - Characters left: {{ 4000 - fillTypeToPlaceText.textLength }}
warning
This field is required
-
Example: Aggregate, topsoil, structural fill, sand, gravel, etc
+ Example: Aggregate, topsoil, structural fill, sand, gravel, etc + Characters left: {{ 4000 - fillTypeToPlaceText.textLength }}
diff --git a/portal-frontend/src/app/features/edit-submission/proposal/roso-proposal/roso-proposal.component.html b/portal-frontend/src/app/features/edit-submission/proposal/roso-proposal/roso-proposal.component.html index ed68d2b5e5..6364510f0f 100644 --- a/portal-frontend/src/app/features/edit-submission/proposal/roso-proposal/roso-proposal.component.html +++ b/portal-frontend/src/app/features/edit-submission/proposal/roso-proposal/roso-proposal.component.html @@ -83,11 +83,11 @@

Proposal

placeholder="Type comment" > - Characters left: {{ 4000 - purposeText.textLength }}
warning
This field is required
+
Characters left: {{ 4000 - purposeText.textLength }}
@@ -175,13 +175,14 @@

Project Duration

placeholder="Type comment" > - Characters left: {{ 4000 - suitabilityText.textLength }}
warning
This field is required
-
Example: Aggregate, Extraction, Placer Mining, Peat Extraction, Soil etc.
+ Example: Aggregate, Extraction, Placer Mining, Peat Extraction, Soil etc. +
Characters left: {{ 4000 - suitabilityText.textLength }}
+
+
A visual representation of your proposal.
diff --git a/portal-frontend/src/app/features/edit-submission/proposal/subd-proposal/subd-proposal.component.html b/portal-frontend/src/app/features/edit-submission/proposal/subd-proposal/subd-proposal.component.html index facd717e1e..8defadda06 100644 --- a/portal-frontend/src/app/features/edit-submission/proposal/subd-proposal/subd-proposal.component.html +++ b/portal-frontend/src/app/features/edit-submission/proposal/subd-proposal/subd-proposal.component.html @@ -54,10 +54,10 @@
Documents needed for this step:
warning
This field is required
-
+ Example: If the proposal is to subdivide a 5 ha lot with road dedication from a 20 ha parcel, the total number of lots proposed is three. -
+
@@ -125,11 +125,11 @@
Documents needed for this step:
placeholder="Type comment" > - Characters left: {{ 4000 - purposeText.textLength }}
warning
This field is required
+
Characters left: {{ 4000 - purposeText.textLength }}
@@ -147,11 +147,11 @@
Documents needed for this step:
placeholder="Type comment" > - Characters left: {{ 4000 - suitabilityText.textLength }}
warning
This field is required
+
Characters left: {{ 4000 - suitabilityText.textLength }}
diff --git a/portal-frontend/src/app/features/edit-submission/proposal/tur-proposal/tur-proposal.component.html b/portal-frontend/src/app/features/edit-submission/proposal/tur-proposal/tur-proposal.component.html index b719d744a2..0de9433b72 100644 --- a/portal-frontend/src/app/features/edit-submission/proposal/tur-proposal/tur-proposal.component.html +++ b/portal-frontend/src/app/features/edit-submission/proposal/tur-proposal/tur-proposal.component.html @@ -43,11 +43,11 @@
Documents needed for this step:
placeholder="Type comment" > - Characters left: {{ 4000 - purposeText.textLength }}
warning
This field is required
+
Characters left: {{ 4000 - purposeText.textLength }}
@@ -108,11 +108,11 @@
Documents needed for this step:
placeholder="Type comment" > - Characters left: {{ 4000 - outsideLandsText.textLength }}
warning
This field is required
+
Characters left: {{ 4000 - outsideLandsText.textLength }}
From b80e09ff766646de15d400e2c6cdd78929878cb9 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Fri, 4 Aug 2023 11:06:52 -0700 Subject: [PATCH 213/954] Sort columns and implement column delete * Sort columns while mapping them * Hook up delete button and add to controller --- .../card-status-dialog/card-status-dialog.component.html | 2 +- .../card-status-dialog/card-status-dialog.component.ts | 5 +++++ .../admin/card-status/card-status.controller.spec.ts | 9 +++++++++ .../src/alcs/admin/card-status/card-status.controller.ts | 7 +++++++ .../src/alcs/card/card-status/card-status.service.ts | 6 ++++++ .../src/common/automapper/board.automapper.profile.ts | 4 +++- 6 files changed, 31 insertions(+), 2 deletions(-) diff --git a/alcs-frontend/src/app/features/admin/card-status/card-status-dialog/card-status-dialog.component.html b/alcs-frontend/src/app/features/admin/card-status/card-status-dialog/card-status-dialog.component.html index 221f66fe25..1aff4398cc 100644 --- a/alcs-frontend/src/app/features/admin/card-status/card-status-dialog/card-status-dialog.component.html +++ b/alcs-frontend/src/app/features/admin/card-status/card-status-dialog/card-status-dialog.component.html @@ -37,7 +37,7 @@

{{ isEdit ? 'Edit' : 'Create' }} Column

- +
diff --git a/alcs-frontend/src/app/features/admin/card-status/card-status-dialog/card-status-dialog.component.ts b/alcs-frontend/src/app/features/admin/card-status/card-status-dialog/card-status-dialog.component.ts index c05c5a1d04..1f28c8751f 100644 --- a/alcs-frontend/src/app/features/admin/card-status/card-status-dialog/card-status-dialog.component.ts +++ b/alcs-frontend/src/app/features/admin/card-status/card-status-dialog/card-status-dialog.component.ts @@ -60,4 +60,9 @@ export class CardStatusDialogComponent implements OnInit { this.canDeleteReason = res.reason; } } + + async onDelete() { + await this.cardStatusService.delete(this.code); + this.dialogRef.close(true); + } } diff --git a/services/apps/alcs/src/alcs/admin/card-status/card-status.controller.spec.ts b/services/apps/alcs/src/alcs/admin/card-status/card-status.controller.spec.ts index 243b9ba436..ff9a9ce666 100644 --- a/services/apps/alcs/src/alcs/admin/card-status/card-status.controller.spec.ts +++ b/services/apps/alcs/src/alcs/admin/card-status/card-status.controller.spec.ts @@ -122,4 +122,13 @@ describe('CardStatusController', () => { expect(res.canDelete).toBeTruthy(); expect(mockBoardService.getBoardsWithStatus).toHaveBeenCalledTimes(1); }); + + it('should call the service for delete', async () => { + mockCardStatusService.delete.mockResolvedValue({} as any); + + const res = await controller.delete('FAKE-CODE'); + + expect(res).toBeDefined(); + expect(mockCardStatusService.delete).toHaveBeenCalledTimes(1); + }); }); diff --git a/services/apps/alcs/src/alcs/admin/card-status/card-status.controller.ts b/services/apps/alcs/src/alcs/admin/card-status/card-status.controller.ts index 65de8f7ec0..ec87e8f11b 100644 --- a/services/apps/alcs/src/alcs/admin/card-status/card-status.controller.ts +++ b/services/apps/alcs/src/alcs/admin/card-status/card-status.controller.ts @@ -1,6 +1,7 @@ import { Body, Controller, + Delete, Get, Param, Patch, @@ -81,6 +82,12 @@ export class CardStatusController { return await this.cardStatusService.update(code, updateDto); } + @Delete('/:code') + @UserRoles(AUTH_ROLE.ADMIN) + async delete(@Param('code') code: string) { + return await this.cardStatusService.delete(code); + } + @Post('') @UserRoles(AUTH_ROLE.ADMIN) async create(@Body() createDto: CardStatusDto) { diff --git a/services/apps/alcs/src/alcs/card/card-status/card-status.service.ts b/services/apps/alcs/src/alcs/card/card-status/card-status.service.ts index 85659cd05c..fb3338ea81 100644 --- a/services/apps/alcs/src/alcs/card/card-status/card-status.service.ts +++ b/services/apps/alcs/src/alcs/card/card-status/card-status.service.ts @@ -53,4 +53,10 @@ export class CardStatusService { const cards = await this.cardService.getByCardStatus(code); return cards.length; } + + async delete(code: string) { + const cardStatus = await this.getOneOrFail(code); + + return await this.cardStatusRepository.remove(cardStatus); + } } diff --git a/services/apps/alcs/src/common/automapper/board.automapper.profile.ts b/services/apps/alcs/src/common/automapper/board.automapper.profile.ts index 5e3037c840..396aaf7b67 100644 --- a/services/apps/alcs/src/common/automapper/board.automapper.profile.ts +++ b/services/apps/alcs/src/common/automapper/board.automapper.profile.ts @@ -38,7 +38,9 @@ export class BoardAutomapperProfile extends AutomapperProfile { forMember( (ad) => ad.statuses, mapFrom((a) => - this.mapper.mapArray(a.statuses, BoardStatus, BoardStatusDto), + this.mapper + .mapArray(a.statuses, BoardStatus, BoardStatusDto) + .sort((a1, b) => a1.order - b.order), ), ), forMember( From 709c6b37f2a90319a0755d6b24876c42c95efe54 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Fri, 4 Aug 2023 12:00:27 -0700 Subject: [PATCH 214/954] Adjust field alignment for incl/excl decision components * Use correct field for null checks on conditions page for no data --- .../condition/condition.component.html | 2 +- .../incl-excl/incl-excl.component.html | 32 ++++++++++++------- .../decision-v2/decision-v2.component.scss | 3 +- 3 files changed, 24 insertions(+), 13 deletions(-) diff --git a/alcs-frontend/src/app/features/application/decision/conditions/condition/condition.component.html b/alcs-frontend/src/app/features/application/decision/conditions/condition/condition.component.html index 62fba64e36..30a7671c59 100644 --- a/alcs-frontend/src/app/features/application/decision/conditions/condition/condition.component.html +++ b/alcs-frontend/src/app/features/application/decision/conditions/condition/condition.component.html @@ -14,7 +14,7 @@

{{ condition.type.label }}

Component to Condition
{{ condition.componentLabelsStr }} - +
diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/incl-excl/incl-excl.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/incl-excl/incl-excl.component.html index abf3a14f1e..3dadcfd6c4 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/incl-excl/incl-excl.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/incl-excl/incl-excl.component.html @@ -1,16 +1,26 @@ -
- +
+ +
+
Applicant Type
+ {{ component.inclExclApplicantType }} + +
+
+
Expiry Date
+ {{ component.expiryDate | date }} + +
-
-
Applicant Type
- {{ component.inclExclApplicantType }} - -
- -
+
Expiry Date
{{ component.expiryDate | date }} diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.scss b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.scss index 8474044aec..09b54fbebb 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.scss +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.scss @@ -155,6 +155,7 @@ .mdc-tab__text-label { color: colors.$black !important; } + .mdc-tab { margin-left: 8px; } @@ -178,7 +179,7 @@ } .lot-table { - margin-top:12px; + margin-top: 12px; display: grid; grid-template-columns: max-content max-content max-content 0.8fr; grid-column-gap: 36px; From 01b89cb30568f40178e1903db17cba56d65b6547 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Fri, 4 Aug 2023 16:01:34 -0700 Subject: [PATCH 215/954] Add NOI Submission Entities * Add backend for NOI Submissions * Rename ApplicationLocalGovernment -> LocalGovernment and move to own module * Move file number generation to the fileNumber service --- .../create-application-dialog.component.ts | 1 + .../local-government.controller.spec.ts | 6 +- .../local-government.controller.ts | 6 +- services/apps/alcs/src/alcs/alcs.module.ts | 3 + .../application-modification.dto.ts | 4 +- .../src/alcs/application/application.dto.ts | 6 +- .../alcs/application/application.entity.ts | 11 +- .../alcs/application/application.module.ts | 16 +- .../application/application.service.spec.ts | 22 +- .../alcs/application/application.service.ts | 29 +- .../notice-of-intent-type.dto.ts | 13 + .../notice-of-intent-type.entity.ts | 25 ++ .../src/alcs/commissioner/commissioner.dto.ts | 4 +- .../alcs/src/alcs/covenant/covenant.dto.ts | 4 +- .../alcs/src/alcs/covenant/covenant.entity.ts | 6 +- .../import/application-import.service.spec.ts | 15 +- .../alcs/import/application-import.service.ts | 4 +- .../src/alcs/import/noi-import.service.ts | 8 +- .../local-government.controller.spec.ts} | 26 +- .../local-government.controller.ts} | 16 +- .../local-government.dto.ts} | 2 +- .../local-government.entity.ts} | 8 +- .../local-government.module.ts | 12 + .../local-government.service.spec.ts} | 30 +- .../local-government.service.ts} | 16 +- .../notice-of-intent-modification.dto.ts | 4 +- .../notice-of-intent.controller.spec.ts | 1 + .../notice-of-intent.controller.ts | 6 +- .../notice-of-intent/notice-of-intent.dto.ts | 23 +- .../notice-of-intent.entity.ts | 29 +- .../notice-of-intent.module.ts | 12 +- .../notice-of-intent.service.spec.ts | 32 +- .../notice-of-intent.service.ts | 98 ++++- .../alcs-application.controller.spec.ts | 11 +- .../alcs-application.controller.ts | 6 +- .../planning-review/planning-review.dto.ts | 4 +- .../planning-review/planning-review.entity.ts | 6 +- .../alcs/src/alcs/search/search.module.ts | 4 +- .../application.automapper.profile.ts | 10 +- .../modification.automapper.profile.ts | 8 +- ...e-of-intent-decision.automapper.profile.ts | 8 +- ...of-intent-submission.automapper.profile.ts | 55 +++ .../src/file-number/file-number.constants.ts | 1 + .../file-number/file-number.service.spec.ts | 12 + .../src/file-number/file-number.service.ts | 8 + services/apps/alcs/src/main.module.ts | 5 + ...ation-submission-review.controller.spec.ts | 10 +- ...pplication-submission-review.controller.ts | 8 +- ...lication-submission-review.service.spec.ts | 4 +- .../application-submission-review.service.ts | 4 +- ...ation-submission-validator.service.spec.ts | 10 +- ...pplication-submission-validator.service.ts | 4 +- .../application-submission.controller.spec.ts | 10 +- .../application-submission.controller.ts | 8 +- .../application-submission.module.ts | 2 + .../application-submission.service.spec.ts | 19 +- .../application-submission.service.ts | 23 +- .../src/portal/code/code.controller.spec.ts | 12 +- .../alcs/src/portal/code/code.controller.ts | 8 +- ...ce-of-intent-submission.controller.spec.ts | 284 +++++++++++++++ .../notice-of-intent-submission.controller.ts | 152 ++++++++ .../notice-of-intent-submission.dto.ts | 146 ++++++++ .../notice-of-intent-submission.entity.ts | 186 ++++++++++ .../notice-of-intent-submission.module.ts | 26 ++ ...otice-of-intent-submission.service.spec.ts | 244 +++++++++++++ .../notice-of-intent-submission.service.ts | 344 ++++++++++++++++++ .../generate-review-document.service.spec.ts | 6 +- .../generate-review-document.service.ts | 4 +- ...nerate-submission-document.service.spec.ts | 6 +- .../generate-submission-document.service.ts | 4 +- .../1691185932823-add_noi_submissions.ts | 179 +++++++++ .../alcs/src/user/user.controller.spec.ts | 4 +- services/apps/alcs/src/user/user.module.ts | 7 +- .../apps/alcs/src/user/user.service.spec.ts | 16 +- services/apps/alcs/src/user/user.service.ts | 6 +- 75 files changed, 2084 insertions(+), 288 deletions(-) create mode 100644 services/apps/alcs/src/alcs/code/application-code/notice-of-intent-type/notice-of-intent-type.dto.ts create mode 100644 services/apps/alcs/src/alcs/code/application-code/notice-of-intent-type/notice-of-intent-type.entity.ts rename services/apps/alcs/src/alcs/{application/application-code/application-local-government/application-local-government.controller.spec.ts => local-government/local-government.controller.spec.ts} (59%) rename services/apps/alcs/src/alcs/{application/application-code/application-local-government/application-local-government.controller.ts => local-government/local-government.controller.ts} (51%) rename services/apps/alcs/src/alcs/{application/application-code/application-local-government/application-local-government.dto.ts => local-government/local-government.dto.ts} (66%) rename services/apps/alcs/src/alcs/{application/application-code/application-local-government/application-local-government.entity.ts => local-government/local-government.entity.ts} (70%) create mode 100644 services/apps/alcs/src/alcs/local-government/local-government.module.ts rename services/apps/alcs/src/alcs/{application/application-code/application-local-government/application-local-government.service.spec.ts => local-government/local-government.service.spec.ts} (65%) rename services/apps/alcs/src/alcs/{application/application-code/application-local-government/application-local-government.service.ts => local-government/local-government.service.ts} (84%) create mode 100644 services/apps/alcs/src/common/automapper/notice-of-intent-submission.automapper.profile.ts create mode 100644 services/apps/alcs/src/file-number/file-number.constants.ts create mode 100644 services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.controller.spec.ts create mode 100644 services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.controller.ts create mode 100644 services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.dto.ts create mode 100644 services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.entity.ts create mode 100644 services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.module.ts create mode 100644 services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts create mode 100644 services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1691185932823-add_noi_submissions.ts diff --git a/alcs-frontend/src/app/features/board/dialogs/application/create/create-application-dialog.component.ts b/alcs-frontend/src/app/features/board/dialogs/application/create/create-application-dialog.component.ts index d23960b1ab..00381c5b77 100644 --- a/alcs-frontend/src/app/features/board/dialogs/application/create/create-application-dialog.component.ts +++ b/alcs-frontend/src/app/features/board/dialogs/application/create/create-application-dialog.component.ts @@ -49,6 +49,7 @@ export class CreateApplicationDialogComponent implements OnInit, OnDestroy { }); this.localGovernmentService.list().then((res) => { + debugger; this.localGovernments = res; }); } diff --git a/services/apps/alcs/src/alcs/admin/local-government/local-government.controller.spec.ts b/services/apps/alcs/src/alcs/admin/local-government/local-government.controller.spec.ts index 6394a72a37..fd6230947b 100644 --- a/services/apps/alcs/src/alcs/admin/local-government/local-government.controller.spec.ts +++ b/services/apps/alcs/src/alcs/admin/local-government/local-government.controller.spec.ts @@ -3,12 +3,12 @@ import { ConfigModule } from '@nestjs/config'; import { Test, TestingModule } from '@nestjs/testing'; import { ClsService } from 'nestjs-cls'; import { mockKeyCloakProviders } from '../../../../test/mocks/mockTypes'; -import { ApplicationLocalGovernmentService } from '../../application/application-code/application-local-government/application-local-government.service'; +import { LocalGovernmentService } from '../../local-government/local-government.service'; import { LocalGovernmentController } from './local-government.controller'; describe('LocalGovernmentController', () => { let controller: LocalGovernmentController; - let mockLgService: DeepMocked; + let mockLgService: DeepMocked; beforeEach(async () => { mockLgService = createMock(); @@ -17,7 +17,7 @@ describe('LocalGovernmentController', () => { controllers: [LocalGovernmentController], providers: [ { - provide: ApplicationLocalGovernmentService, + provide: LocalGovernmentService, useValue: mockLgService, }, { diff --git a/services/apps/alcs/src/alcs/admin/local-government/local-government.controller.ts b/services/apps/alcs/src/alcs/admin/local-government/local-government.controller.ts index df10d37802..1109ab79d8 100644 --- a/services/apps/alcs/src/alcs/admin/local-government/local-government.controller.ts +++ b/services/apps/alcs/src/alcs/admin/local-government/local-government.controller.ts @@ -10,7 +10,7 @@ import { } from '@nestjs/common'; import { ApiOAuth2 } from '@nestjs/swagger'; import * as config from 'config'; -import { ApplicationLocalGovernmentService } from '../../application/application-code/application-local-government/application-local-government.service'; +import { LocalGovernmentService } from '../../local-government/local-government.service'; import { AUTH_ROLE } from '../../../common/authorization/roles'; import { RolesGuard } from '../../../common/authorization/roles-guard.service'; import { UserRoles } from '../../../common/authorization/roles.decorator'; @@ -23,9 +23,7 @@ import { @ApiOAuth2(config.get('KEYCLOAK.SCOPES')) @UseGuards(RolesGuard) export class LocalGovernmentController { - constructor( - private localGovernmentService: ApplicationLocalGovernmentService, - ) {} + constructor(private localGovernmentService: LocalGovernmentService) {} @Get('/:pageIndex/:itemsPerPage') @UserRoles(AUTH_ROLE.ADMIN) diff --git a/services/apps/alcs/src/alcs/alcs.module.ts b/services/apps/alcs/src/alcs/alcs.module.ts index 645cbe05ec..65ab46e1ec 100644 --- a/services/apps/alcs/src/alcs/alcs.module.ts +++ b/services/apps/alcs/src/alcs/alcs.module.ts @@ -12,6 +12,7 @@ import { CommissionerModule } from './commissioner/commissioner.module'; import { CovenantModule } from './covenant/covenant.module'; import { HomeModule } from './home/home.module'; import { ImportModule } from './import/import.module'; +import { LocalGovernmentModule } from './local-government/local-government.module'; import { NoticeOfIntentDecisionModule } from './notice-of-intent-decision/notice-of-intent-decision.module'; import { NoticeOfIntentModule } from './notice-of-intent/notice-of-intent.module'; import { NotificationModule } from './notification/notification.module'; @@ -38,6 +39,7 @@ import { StaffJournalModule } from './staff-journal/staff-journal.module'; StaffJournalModule, NoticeOfIntentDecisionModule, SearchModule, + LocalGovernmentModule, RouterModule.register([ { path: 'alcs', module: ApplicationModule }, { path: 'alcs', module: CommentModule }, @@ -56,6 +58,7 @@ import { StaffJournalModule } from './staff-journal/staff-journal.module'; { path: 'alcs', module: StaffJournalModule }, { path: 'alcs', module: SearchModule }, { path: 'alcs', module: ApplicationSubmissionStatusModule }, + { path: 'alcs', module: LocalGovernmentModule }, ]), ], controllers: [], diff --git a/services/apps/alcs/src/alcs/application-decision/application-modification/application-modification.dto.ts b/services/apps/alcs/src/alcs/application-decision/application-modification/application-modification.dto.ts index 9fbb6c16b5..155bf25c58 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-modification/application-modification.dto.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-modification/application-modification.dto.ts @@ -10,7 +10,7 @@ import { IsString, } from 'class-validator'; import { BaseCodeDto } from '../../../common/dtos/base.dto'; -import { ApplicationLocalGovernmentDto } from '../../application/application-code/application-local-government/application-local-government.dto'; +import { LocalGovernmentDto } from '../../local-government/local-government.dto'; import { CardDto } from '../../card/card.dto'; import { ApplicationRegionDto } from '../../code/application-code/application-region/application-region.dto'; import { ApplicationTypeDto } from '../../code/application-code/application-type/application-type.dto'; @@ -88,7 +88,7 @@ export class ApplicationForModificationDto { statusCode: string; applicant: string; region: ApplicationRegionDto; - localGovernment: ApplicationLocalGovernmentDto; + localGovernment: LocalGovernmentDto; decisionMeetings: ApplicationDecisionMeetingDto[]; } diff --git a/services/apps/alcs/src/alcs/application/application.dto.ts b/services/apps/alcs/src/alcs/application/application.dto.ts index c756dda3c2..db902aeb43 100644 --- a/services/apps/alcs/src/alcs/application/application.dto.ts +++ b/services/apps/alcs/src/alcs/application/application.dto.ts @@ -14,7 +14,7 @@ import { ApplicationDecisionMeetingDto } from '../application-decision/applicati import { CardDto } from '../card/card.dto'; import { ApplicationRegionDto } from '../code/application-code/application-region/application-region.dto'; import { ApplicationTypeDto } from '../code/application-code/application-type/application-type.dto'; -import { ApplicationLocalGovernmentDto } from './application-code/application-local-government/application-local-government.dto'; +import { LocalGovernmentDto } from '../local-government/local-government.dto'; export class AlcsApplicationSubmissionDto extends ApplicationSubmissionDetailedDto { primaryContact?: ApplicationOwnerDto; @@ -208,8 +208,8 @@ export class ApplicationDto { @AutoMap(() => ApplicationRegionDto) region: ApplicationRegionDto; - @AutoMap(() => ApplicationLocalGovernmentDto) - localGovernment: ApplicationLocalGovernmentDto; + @AutoMap(() => LocalGovernmentDto) + localGovernment: LocalGovernmentDto; @AutoMap(() => ApplicationDecisionMeetingDto) decisionMeetings: ApplicationDecisionMeetingDto[]; diff --git a/services/apps/alcs/src/alcs/application/application.entity.ts b/services/apps/alcs/src/alcs/application/application.entity.ts index 9955871366..423c222b3d 100644 --- a/services/apps/alcs/src/alcs/application/application.entity.ts +++ b/services/apps/alcs/src/alcs/application/application.entity.ts @@ -11,6 +11,7 @@ import { OneToOne, } from 'typeorm'; import { Base } from '../../common/entities/base.entity'; +import { FILE_NUMBER_SEQUENCE } from '../../file-number/file-number.constants'; import { ApplicationSubmissionReview } from '../../portal/application-submission-review/application-submission-review.entity'; import { ColumnNumericTransformer } from '../../utils/column-numeric-transform'; import { ApplicationDecisionMeeting } from '../application-decision/application-decision-v1/application-decision-meeting/application-decision-meeting.entity'; @@ -18,13 +19,11 @@ import { ApplicationReconsideration } from '../application-decision/application- import { Card } from '../card/card.entity'; import { ApplicationRegion } from '../code/application-code/application-region/application-region.entity'; import { ApplicationType } from '../code/application-code/application-type/application-type.entity'; -import { ApplicationLocalGovernment } from './application-code/application-local-government/application-local-government.entity'; +import { LocalGovernment } from '../local-government/local-government.entity'; import { ApplicationDocument } from './application-document/application-document.entity'; import { ApplicationMeeting } from './application-meeting/application-meeting.entity'; import { ApplicationPaused } from './application-paused.entity'; -export const APPLICATION_FILE_NUMBER_SEQUENCE = 'alcs.alcs_file_number_seq'; - @Entity() export class Application extends Base { constructor(data?: Partial) { @@ -38,7 +37,7 @@ export class Application extends Base { @AutoMap() @Column({ unique: true, - default: () => `NEXTVAL('${APPLICATION_FILE_NUMBER_SEQUENCE}')`, + default: () => `NEXTVAL('${FILE_NUMBER_SEQUENCE}')`, }) fileNumber: string; @@ -141,8 +140,8 @@ export class Application extends Base { @Column({ nullable: true }) regionCode?: string; - @ManyToOne(() => ApplicationLocalGovernment, { nullable: true }) - localGovernment?: ApplicationLocalGovernment; + @ManyToOne(() => LocalGovernment, { nullable: true }) + localGovernment?: LocalGovernment; @Index() @Column({ diff --git a/services/apps/alcs/src/alcs/application/application.module.ts b/services/apps/alcs/src/alcs/application/application.module.ts index ba6ee7d797..6b678833f7 100644 --- a/services/apps/alcs/src/alcs/application/application.module.ts +++ b/services/apps/alcs/src/alcs/application/application.module.ts @@ -18,10 +18,11 @@ import { Board } from '../board/board.entity'; import { CardModule } from '../card/card.module'; import { ApplicationType } from '../code/application-code/application-type/application-type.entity'; import { CodeModule } from '../code/code.module'; +import { LocalGovernment } from '../local-government/local-government.entity'; +import { LocalGovernmentModule } from '../local-government/local-government.module'; import { NotificationModule } from '../notification/notification.module'; -import { ApplicationLocalGovernmentController } from './application-code/application-local-government/application-local-government.controller'; -import { ApplicationLocalGovernment } from './application-code/application-local-government/application-local-government.entity'; -import { ApplicationLocalGovernmentService } from './application-code/application-local-government/application-local-government.service'; +import { LocalGovernmentController } from '../local-government/local-government.controller'; +import { LocalGovernmentService } from '../local-government/local-government.service'; import { DocumentCode } from '../../document/document-code.entity'; import { ApplicationDocumentController } from './application-document/application-document.controller'; import { ApplicationDocument } from './application-document/application-document.entity'; @@ -50,13 +51,13 @@ import { ApplicationService } from './application.service'; ApplicationMeeting, ApplicationDocument, DocumentCode, - ApplicationLocalGovernment, ApplicationParcel, Board, ApplicationSubmission, ApplicationSubmissionReview, ApplicationSubmissionStatusType, ApplicationSubmissionToSubmissionStatus, + LocalGovernment, ]), NotificationModule, DocumentModule, @@ -65,6 +66,7 @@ import { ApplicationService } from './application.service'; FileNumberModule, forwardRef(() => ApplicationSubmissionModule), ApplicationSubmissionStatusModule, + LocalGovernmentModule, ], providers: [ ApplicationService, @@ -76,7 +78,7 @@ import { ApplicationService } from './application.service'; ApplicationMeetingService, ApplicationPausedService, ApplicationDocumentService, - ApplicationLocalGovernmentService, + LocalGovernmentService, ApplicationSubmissionService, ApplicationSubmissionReviewService, ApplicationSubmissionProfile, @@ -85,7 +87,7 @@ import { ApplicationService } from './application.service'; ApplicationController, ApplicationMeetingController, ApplicationDocumentController, - ApplicationLocalGovernmentController, + LocalGovernmentController, ApplicationSubmissionController, ApplicationSubmissionReviewController, ApplicationParcelController, @@ -97,7 +99,7 @@ import { ApplicationService } from './application.service'; ApplicationSubtaskProfile, ApplicationMeetingService, ApplicationPausedService, - ApplicationLocalGovernmentService, + LocalGovernmentService, ApplicationDocumentService, ], }) diff --git a/services/apps/alcs/src/alcs/application/application.service.spec.ts b/services/apps/alcs/src/alcs/application/application.service.spec.ts index 68fbb111ac..794dc2aaa4 100644 --- a/services/apps/alcs/src/alcs/application/application.service.spec.ts +++ b/services/apps/alcs/src/alcs/application/application.service.spec.ts @@ -7,7 +7,6 @@ import { getRepositoryToken } from '@nestjs/typeorm'; import { FindOptionsRelations, Repository } from 'typeorm'; import { initApplicationMockEntity } from '../../../test/mocks/mockEntities'; import { ApplicationSubmissionStatusService } from '../../application-submission-status/application-submission-status.service'; -import { ApplicationSubmissionStatusType } from '../../application-submission-status/submission-status-type.entity'; import { SUBMISSION_STATUS } from '../../application-submission-status/submission-status.dto'; import { ApplicationSubmissionToSubmissionStatus } from '../../application-submission-status/submission-status.entity'; import { FileNumberService } from '../../file-number/file-number.service'; @@ -15,7 +14,7 @@ import { Card } from '../card/card.entity'; import { ApplicationRegion } from '../code/application-code/application-region/application-region.entity'; import { ApplicationType } from '../code/application-code/application-type/application-type.entity'; import { CodeService } from '../code/code.service'; -import { ApplicationLocalGovernmentService } from './application-code/application-local-government/application-local-government.service'; +import { LocalGovernmentService } from '../local-government/local-government.service'; import { ApplicationTimeData, ApplicationTimeTrackingService, @@ -33,7 +32,7 @@ describe('ApplicationService', () => { let applicationTypeRepositoryMock: DeepMocked>; let applicationMockEntity; let mockApplicationTimeService: DeepMocked; - let mockApplicationLocalGovernmentService: DeepMocked; + let mockApplicationLocalGovernmentService: DeepMocked; let mockCodeService: DeepMocked; let mockFileNumberService: DeepMocked; let mockApplicationSubmissionStatusService: DeepMocked; @@ -82,7 +81,7 @@ describe('ApplicationService', () => { useValue: mockCodeService, }, { - provide: ApplicationLocalGovernmentService, + provide: LocalGovernmentService, useValue: mockApplicationLocalGovernmentService, }, { @@ -259,21 +258,6 @@ describe('ApplicationService', () => { expect(applicationRepositoryMock.save).toHaveBeenCalledTimes(0); }); - it('should generate and return new fileNumber', async () => { - applicationRepositoryMock.findOne - .mockResolvedValueOnce({} as Application) - .mockResolvedValue(null); - applicationRepositoryMock.query.mockResolvedValue([ - { nextval: applicationMockEntity.uuid }, - ]); - - const result = await applicationService.generateNextFileNumber(); - - expect(applicationRepositoryMock.findOne).toHaveBeenCalledTimes(2); - expect(applicationRepositoryMock.query).toBeCalledTimes(2); - expect(result).toEqual(applicationMockEntity.uuid); - }); - it('should load deleted card', async () => { applicationRepositoryMock.findOne.mockResolvedValue(null); diff --git a/services/apps/alcs/src/alcs/application/application.service.ts b/services/apps/alcs/src/alcs/application/application.service.ts index 7ef4744334..117f581f24 100644 --- a/services/apps/alcs/src/alcs/application/application.service.ts +++ b/services/apps/alcs/src/alcs/application/application.service.ts @@ -22,7 +22,7 @@ import { FileNumberService } from '../../file-number/file-number.service'; import { Card } from '../card/card.entity'; import { ApplicationType } from '../code/application-code/application-type/application-type.entity'; import { CodeService } from '../code/code.service'; -import { ApplicationLocalGovernmentService } from './application-code/application-local-government/application-local-government.service'; +import { LocalGovernmentService } from '../local-government/local-government.service'; import { ApplicationTimeData, ApplicationTimeTrackingService, @@ -32,10 +32,7 @@ import { ApplicationUpdateServiceDto, CreateApplicationServiceDto, } from './application.dto'; -import { - Application, - APPLICATION_FILE_NUMBER_SEQUENCE, -} from './application.entity'; +import { Application } from './application.entity'; export const APPLICATION_EXPIRATION_DAY_RANGES = { ACTIVE_DAYS_START: 55, @@ -84,7 +81,7 @@ export class ApplicationService { private applicationTypeRepository: Repository, private applicationTimeTrackingService: ApplicationTimeTrackingService, private codeService: CodeService, - private localGovernmentService: ApplicationLocalGovernmentService, + private localGovernmentService: LocalGovernmentService, private fileNumberService: FileNumberService, private applicationSubmissionStatusService: ApplicationSubmissionStatusService, @InjectMapper() private applicationMapper: Mapper, @@ -424,26 +421,6 @@ export class ApplicationService { }); } - private async getNextFileNumber() { - const fileNumberArr = await this.applicationRepository.query( - `select nextval('${APPLICATION_FILE_NUMBER_SEQUENCE}') limit 1`, - ); - return fileNumberArr[0].nextval; - } - - async generateNextFileNumber(): Promise { - let fileNumber: string; - let application: Application | null = null; - do { - fileNumber = await this.getNextFileNumber(); - application = await this.applicationRepository.findOne({ - where: { fileNumber }, - }); - } while (application); - - return fileNumber; - } - async getUuid(fileNumber: string) { const application = await this.applicationRepository.findOneOrFail({ where: { diff --git a/services/apps/alcs/src/alcs/code/application-code/notice-of-intent-type/notice-of-intent-type.dto.ts b/services/apps/alcs/src/alcs/code/application-code/notice-of-intent-type/notice-of-intent-type.dto.ts new file mode 100644 index 0000000000..0f555620b9 --- /dev/null +++ b/services/apps/alcs/src/alcs/code/application-code/notice-of-intent-type/notice-of-intent-type.dto.ts @@ -0,0 +1,13 @@ +import { AutoMap } from '@automapper/classes'; +import { BaseCodeDto } from '../../../../common/dtos/base.dto'; + +export class NoticeOfIntentTypeDto extends BaseCodeDto { + @AutoMap() + shortLabel: string; + + @AutoMap() + backgroundColor: string; + + @AutoMap() + textColor: string; +} diff --git a/services/apps/alcs/src/alcs/code/application-code/notice-of-intent-type/notice-of-intent-type.entity.ts b/services/apps/alcs/src/alcs/code/application-code/notice-of-intent-type/notice-of-intent-type.entity.ts new file mode 100644 index 0000000000..ca9959746a --- /dev/null +++ b/services/apps/alcs/src/alcs/code/application-code/notice-of-intent-type/notice-of-intent-type.entity.ts @@ -0,0 +1,25 @@ +import { AutoMap } from '@automapper/classes'; +import { Column, Entity } from 'typeorm'; +import { BaseCodeEntity } from '../../../../common/entities/base.code.entity'; + +@Entity() +export class NoticeOfIntentType extends BaseCodeEntity { + constructor(data?: Partial) { + super(); + if (data) { + Object.assign(this, data); + } + } + + @AutoMap() + @Column() + shortLabel: string; + + @AutoMap() + @Column({ type: 'text', default: '' }) + htmlDescription: string; + + @AutoMap() + @Column({ type: 'text', default: '' }) + portalLabel: string; +} diff --git a/services/apps/alcs/src/alcs/commissioner/commissioner.dto.ts b/services/apps/alcs/src/alcs/commissioner/commissioner.dto.ts index 815cfd0f75..5ca3594a2c 100644 --- a/services/apps/alcs/src/alcs/commissioner/commissioner.dto.ts +++ b/services/apps/alcs/src/alcs/commissioner/commissioner.dto.ts @@ -1,5 +1,5 @@ import { AutoMap } from '@automapper/classes'; -import { ApplicationLocalGovernmentDto } from '../application/application-code/application-local-government/application-local-government.dto'; +import { LocalGovernmentDto } from '../local-government/local-government.dto'; import { ApplicationRegionDto } from '../code/application-code/application-region/application-region.dto'; import { ApplicationTypeDto } from '../code/application-code/application-type/application-type.dto'; @@ -26,7 +26,7 @@ export class CommissionerApplicationDto { region: ApplicationRegionDto; @AutoMap() - localGovernment: ApplicationLocalGovernmentDto; + localGovernment: LocalGovernmentDto; @AutoMap() decisionDate: number; diff --git a/services/apps/alcs/src/alcs/covenant/covenant.dto.ts b/services/apps/alcs/src/alcs/covenant/covenant.dto.ts index b66b50cf6e..d379c8d120 100644 --- a/services/apps/alcs/src/alcs/covenant/covenant.dto.ts +++ b/services/apps/alcs/src/alcs/covenant/covenant.dto.ts @@ -1,6 +1,6 @@ import { AutoMap } from '@automapper/classes'; import { IsNotEmpty, IsString } from 'class-validator'; -import { ApplicationLocalGovernmentDto } from '../application/application-code/application-local-government/application-local-government.dto'; +import { LocalGovernmentDto } from '../local-government/local-government.dto'; import { CardDto } from '../card/card.dto'; import { ApplicationRegionDto } from '../code/application-code/application-region/application-region.dto'; @@ -37,7 +37,7 @@ export class CovenantDto { card: CardDto; @AutoMap() - localGovernment: ApplicationLocalGovernmentDto; + localGovernment: LocalGovernmentDto; @AutoMap() region: ApplicationRegionDto; diff --git a/services/apps/alcs/src/alcs/covenant/covenant.entity.ts b/services/apps/alcs/src/alcs/covenant/covenant.entity.ts index 459305d994..4ac7f0e1c6 100644 --- a/services/apps/alcs/src/alcs/covenant/covenant.entity.ts +++ b/services/apps/alcs/src/alcs/covenant/covenant.entity.ts @@ -8,9 +8,9 @@ import { OneToOne, } from 'typeorm'; import { Base } from '../../common/entities/base.entity'; -import { ApplicationLocalGovernment } from '../application/application-code/application-local-government/application-local-government.entity'; import { Card } from '../card/card.entity'; import { ApplicationRegion } from '../code/application-code/application-region/application-region.entity'; +import { LocalGovernment } from '../local-government/local-government.entity'; @Entity() export class Covenant extends Base { @@ -36,8 +36,8 @@ export class Covenant extends Base { @Type(() => Card) card: Card; - @ManyToOne(() => ApplicationLocalGovernment) - localGovernment: ApplicationLocalGovernment; + @ManyToOne(() => LocalGovernment) + localGovernment: LocalGovernment; @Index() @Column({ diff --git a/services/apps/alcs/src/alcs/import/application-import.service.spec.ts b/services/apps/alcs/src/alcs/import/application-import.service.spec.ts index b91edaf761..7205be8798 100644 --- a/services/apps/alcs/src/alcs/import/application-import.service.spec.ts +++ b/services/apps/alcs/src/alcs/import/application-import.service.spec.ts @@ -5,8 +5,8 @@ import * as timezone from 'dayjs/plugin/timezone'; import * as utc from 'dayjs/plugin/utc'; import { Volume, fs } from 'memfs'; import * as path from 'path'; -import { ApplicationLocalGovernment } from '../application/application-code/application-local-government/application-local-government.entity'; -import { ApplicationLocalGovernmentService } from '../application/application-code/application-local-government/application-local-government.service'; +import { LocalGovernment } from '../local-government/local-government.entity'; +import { LocalGovernmentService } from '../local-government/local-government.service'; import { ApplicationMeeting } from '../application/application-meeting/application-meeting.entity'; import { ApplicationMeetingService } from '../application/application-meeting/application-meeting.service'; import { ApplicationPaused } from '../application/application-paused.entity'; @@ -33,7 +33,7 @@ describe('ImportService', () => { let mockApplicationservice: DeepMocked; let mockApplicationMeetingService: DeepMocked; let mockPausedService: DeepMocked; - let mockLocalGovernmentService: DeepMocked; + let mockLocalGovernmentService: DeepMocked; let mockBoardService: DeepMocked; let mockDataRow; @@ -45,8 +45,7 @@ describe('ImportService', () => { mockApplicationservice = createMock(); mockApplicationMeetingService = createMock(); mockPausedService = createMock(); - mockLocalGovernmentService = - createMock(); + mockLocalGovernmentService = createMock(); mockBoardService = createMock(); const module: TestingModule = await Test.createTestingModule({ @@ -65,7 +64,7 @@ describe('ImportService', () => { useValue: mockPausedService, }, { - provide: ApplicationLocalGovernmentService, + provide: LocalGovernmentService, useValue: mockLocalGovernmentService, }, { @@ -92,7 +91,7 @@ describe('ImportService', () => { mockLocalGovernmentService.getByName.mockResolvedValue({ uuid: 'government-uuid', - } as ApplicationLocalGovernment); + } as LocalGovernment); }); it('should be defined', () => { @@ -168,7 +167,7 @@ describe('ImportService', () => { it('should should do a fallback search for local government', async () => { mockLocalGovernmentService.getByName.mockResolvedValueOnce(null); mockLocalGovernmentService.getByName.mockResolvedValueOnce( - {} as ApplicationLocalGovernment, + {} as LocalGovernment, ); await service.parseRow( mockDataRow, diff --git a/services/apps/alcs/src/alcs/import/application-import.service.ts b/services/apps/alcs/src/alcs/import/application-import.service.ts index c81b753cae..93039630a0 100644 --- a/services/apps/alcs/src/alcs/import/application-import.service.ts +++ b/services/apps/alcs/src/alcs/import/application-import.service.ts @@ -5,7 +5,7 @@ import * as timezone from 'dayjs/plugin/timezone'; import * as utc from 'dayjs/plugin/utc'; import * as fs from 'fs'; import * as path from 'path'; -import { ApplicationLocalGovernmentService } from '../application/application-code/application-local-government/application-local-government.service'; +import { LocalGovernmentService } from '../local-government/local-government.service'; import { ApplicationMeetingService } from '../application/application-meeting/application-meeting.service'; import { ApplicationPausedService } from '../application/application-paused/application-paused.service'; import { Application } from '../application/application.entity'; @@ -94,7 +94,7 @@ export class ApplicationImportService { private meetingService: ApplicationMeetingService, private pausedService: ApplicationPausedService, private boardService: BoardService, - private localGovernmentService: ApplicationLocalGovernmentService, + private localGovernmentService: LocalGovernmentService, ) {} importCsv() { diff --git a/services/apps/alcs/src/alcs/import/noi-import.service.ts b/services/apps/alcs/src/alcs/import/noi-import.service.ts index 2f11a38207..66732d1add 100644 --- a/services/apps/alcs/src/alcs/import/noi-import.service.ts +++ b/services/apps/alcs/src/alcs/import/noi-import.service.ts @@ -5,7 +5,7 @@ import * as timezone from 'dayjs/plugin/timezone'; import * as utc from 'dayjs/plugin/utc'; import * as fs from 'fs'; import * as path from 'path'; -import { ApplicationLocalGovernmentService } from '../application/application-code/application-local-government/application-local-government.service'; +import { LocalGovernmentService } from '../local-government/local-government.service'; import { BoardService } from '../board/board.service'; import { CardService } from '../card/card.service'; import { NoticeOfIntentDecisionService } from '../notice-of-intent-decision/notice-of-intent-decision.service'; @@ -79,7 +79,7 @@ export class NoticeOfIntentImportService { private noticeOfIntentService: NoticeOfIntentService, private meetingService: NoticeOfIntentMeetingService, private boardService: BoardService, - private localGovernmentService: ApplicationLocalGovernmentService, + private localGovernmentService: LocalGovernmentService, private cardService: CardService, private noticeOfIntentDecisionService: NoticeOfIntentDecisionService, ) {} @@ -164,12 +164,12 @@ export class NoticeOfIntentImportService { const noticeOfIntent = await this.noticeOfIntentService.create( { + typeCode: '', fileNumber: mappedRow.fileNumber, applicant: mappedRow.applicant || 'Unknown', - dateSubmittedToAlc: mappedRow.submittedToAlc.getTime(), + dateSubmittedToAlc: mappedRow.submittedToAlc, localGovernmentUuid: localGovernment.uuid, regionCode: regionCode, - boardCode: 'noi', }, vettingBoard, ); diff --git a/services/apps/alcs/src/alcs/application/application-code/application-local-government/application-local-government.controller.spec.ts b/services/apps/alcs/src/alcs/local-government/local-government.controller.spec.ts similarity index 59% rename from services/apps/alcs/src/alcs/application/application-code/application-local-government/application-local-government.controller.spec.ts rename to services/apps/alcs/src/alcs/local-government/local-government.controller.spec.ts index 1fa45f7008..33d5d787b8 100644 --- a/services/apps/alcs/src/alcs/application/application-code/application-local-government/application-local-government.controller.spec.ts +++ b/services/apps/alcs/src/alcs/local-government/local-government.controller.spec.ts @@ -3,27 +3,27 @@ import { AutomapperModule } from '@automapper/nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { ClsService } from 'nestjs-cls'; -import { mockKeyCloakProviders } from '../../../../../test/mocks/mockTypes'; -import { ApplicationLocalGovernmentController } from './application-local-government.controller'; -import { ApplicationLocalGovernment } from './application-local-government.entity'; -import { ApplicationLocalGovernmentService } from './application-local-government.service'; +import { mockKeyCloakProviders } from '../../../test/mocks/mockTypes'; +import { LocalGovernmentController } from './local-government.controller'; +import { LocalGovernment } from './local-government.entity'; +import { LocalGovernmentService } from './local-government.service'; -describe('ApplicationLocalGovernmentController', () => { - let controller: ApplicationLocalGovernmentController; - let mockService: DeepMocked; +describe('LocalGovernmentController', () => { + let controller: LocalGovernmentController; + let mockService: DeepMocked; beforeEach(async () => { - mockService = createMock(); + mockService = createMock(); const module: TestingModule = await Test.createTestingModule({ imports: [ AutomapperModule.forRoot({ strategyInitializer: classes(), }), ], - controllers: [ApplicationLocalGovernmentController], + controllers: [LocalGovernmentController], providers: [ { - provide: ApplicationLocalGovernmentService, + provide: LocalGovernmentService, useValue: mockService, }, { @@ -34,8 +34,8 @@ describe('ApplicationLocalGovernmentController', () => { ], }).compile(); - controller = module.get( - ApplicationLocalGovernmentController, + controller = module.get( + LocalGovernmentController, ); }); @@ -51,7 +51,7 @@ describe('ApplicationLocalGovernmentController', () => { code: 'code', label: 'label', }, - } as ApplicationLocalGovernment; + } as LocalGovernment; mockService.list.mockResolvedValue([mockGovernment]); const res = await mockService.list(); diff --git a/services/apps/alcs/src/alcs/application/application-code/application-local-government/application-local-government.controller.ts b/services/apps/alcs/src/alcs/local-government/local-government.controller.ts similarity index 51% rename from services/apps/alcs/src/alcs/application/application-code/application-local-government/application-local-government.controller.ts rename to services/apps/alcs/src/alcs/local-government/local-government.controller.ts index 33f876093f..e5a20081e2 100644 --- a/services/apps/alcs/src/alcs/application/application-code/application-local-government/application-local-government.controller.ts +++ b/services/apps/alcs/src/alcs/local-government/local-government.controller.ts @@ -1,23 +1,23 @@ import { Controller, Get, UseGuards } from '@nestjs/common'; import { ApiOAuth2 } from '@nestjs/swagger'; import * as config from 'config'; -import { ANY_AUTH_ROLE } from '../../../../common/authorization/roles'; -import { RolesGuard } from '../../../../common/authorization/roles-guard.service'; -import { UserRoles } from '../../../../common/authorization/roles.decorator'; -import { ApplicationLocalGovernmentDto } from './application-local-government.dto'; -import { ApplicationLocalGovernmentService } from './application-local-government.service'; +import { ANY_AUTH_ROLE } from '../../common/authorization/roles'; +import { RolesGuard } from '../../common/authorization/roles-guard.service'; +import { UserRoles } from '../../common/authorization/roles.decorator'; +import { LocalGovernmentDto } from './local-government.dto'; +import { LocalGovernmentService } from './local-government.service'; @ApiOAuth2(config.get('KEYCLOAK.SCOPES')) @Controller('application-local-government') @UseGuards(RolesGuard) -export class ApplicationLocalGovernmentController { +export class LocalGovernmentController { constructor( - private applicationLocalGovernmentService: ApplicationLocalGovernmentService, + private applicationLocalGovernmentService: LocalGovernmentService, ) {} @Get() @UserRoles(...ANY_AUTH_ROLE) - async list(): Promise { + async list(): Promise { const localGovernments = await this.applicationLocalGovernmentService.listActive(); diff --git a/services/apps/alcs/src/alcs/application/application-code/application-local-government/application-local-government.dto.ts b/services/apps/alcs/src/alcs/local-government/local-government.dto.ts similarity index 66% rename from services/apps/alcs/src/alcs/application/application-code/application-local-government/application-local-government.dto.ts rename to services/apps/alcs/src/alcs/local-government/local-government.dto.ts index f902c2794e..6ea96f59e0 100644 --- a/services/apps/alcs/src/alcs/application/application-code/application-local-government/application-local-government.dto.ts +++ b/services/apps/alcs/src/alcs/local-government/local-government.dto.ts @@ -1,4 +1,4 @@ -export class ApplicationLocalGovernmentDto { +export class LocalGovernmentDto { uuid: string; name: string; preferredRegionCode: string; diff --git a/services/apps/alcs/src/alcs/application/application-code/application-local-government/application-local-government.entity.ts b/services/apps/alcs/src/alcs/local-government/local-government.entity.ts similarity index 70% rename from services/apps/alcs/src/alcs/application/application-code/application-local-government/application-local-government.entity.ts rename to services/apps/alcs/src/alcs/local-government/local-government.entity.ts index 59f98dcce6..11f31377f0 100644 --- a/services/apps/alcs/src/alcs/application/application-code/application-local-government/application-local-government.entity.ts +++ b/services/apps/alcs/src/alcs/local-government/local-government.entity.ts @@ -1,11 +1,11 @@ import { AutoMap } from '@automapper/classes'; import { Column, Entity, ManyToOne } from 'typeorm'; -import { Base } from '../../../../common/entities/base.entity'; -import { ApplicationRegion } from '../../../code/application-code/application-region/application-region.entity'; +import { Base } from '../../common/entities/base.entity'; +import { ApplicationRegion } from '../code/application-code/application-region/application-region.entity'; @Entity() -export class ApplicationLocalGovernment extends Base { - constructor(data?: Partial) { +export class LocalGovernment extends Base { + constructor(data?: Partial) { super(); if (data) { Object.assign(this, data); diff --git a/services/apps/alcs/src/alcs/local-government/local-government.module.ts b/services/apps/alcs/src/alcs/local-government/local-government.module.ts new file mode 100644 index 0000000000..2ea7c3af0a --- /dev/null +++ b/services/apps/alcs/src/alcs/local-government/local-government.module.ts @@ -0,0 +1,12 @@ +import { Module } from '@nestjs/common'; +import { TypeOrmModule } from '@nestjs/typeorm'; +import { LocalGovernment } from './local-government.entity'; +import { LocalGovernmentService } from './local-government.service'; + +@Module({ + imports: [TypeOrmModule.forFeature([LocalGovernment])], + providers: [LocalGovernmentService], + controllers: [], + exports: [LocalGovernmentService], +}) +export class LocalGovernmentModule {} diff --git a/services/apps/alcs/src/alcs/application/application-code/application-local-government/application-local-government.service.spec.ts b/services/apps/alcs/src/alcs/local-government/local-government.service.spec.ts similarity index 65% rename from services/apps/alcs/src/alcs/application/application-code/application-local-government/application-local-government.service.spec.ts rename to services/apps/alcs/src/alcs/local-government/local-government.service.spec.ts index 55b19fb52c..6ea3b6cc2e 100644 --- a/services/apps/alcs/src/alcs/application/application-code/application-local-government/application-local-government.service.spec.ts +++ b/services/apps/alcs/src/alcs/local-government/local-government.service.spec.ts @@ -2,13 +2,13 @@ import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { ApplicationLocalGovernment } from './application-local-government.entity'; -import { ApplicationLocalGovernmentService } from './application-local-government.service'; +import { LocalGovernment } from './local-government.entity'; +import { LocalGovernmentService } from './local-government.service'; -describe('ApplicationLocalGovernmentService', () => { - let mockRepository: DeepMocked>; +describe('LocalGovernmentService', () => { + let mockRepository: DeepMocked>; - let service: ApplicationLocalGovernmentService; + let service: LocalGovernmentService; const mockLocalGovernments = [ { @@ -18,22 +18,20 @@ describe('ApplicationLocalGovernmentService', () => { ]; beforeEach(async () => { - mockRepository = createMock>(); + mockRepository = createMock>(); mockRepository.find.mockResolvedValue(mockLocalGovernments); const module: TestingModule = await Test.createTestingModule({ providers: [ - ApplicationLocalGovernmentService, + LocalGovernmentService, { - provide: getRepositoryToken(ApplicationLocalGovernment), + provide: getRepositoryToken(LocalGovernment), useValue: mockRepository, }, ], }).compile(); - service = module.get( - ApplicationLocalGovernmentService, - ); + service = module.get(LocalGovernmentService); }); it('should be defined', () => { @@ -50,7 +48,7 @@ describe('ApplicationLocalGovernmentService', () => { it('should call repository on getByUuId', async () => { const uuid = 'fake'; - mockRepository.findOne.mockResolvedValue({} as ApplicationLocalGovernment); + mockRepository.findOne.mockResolvedValue(new LocalGovernment()); await service.getByUuid(uuid); @@ -66,7 +64,7 @@ describe('ApplicationLocalGovernmentService', () => { }); it('should call repository on create', async () => { - mockRepository.save.mockResolvedValue({} as ApplicationLocalGovernment); + mockRepository.save.mockResolvedValue(new LocalGovernment()); await service.create({ name: 'name', @@ -81,10 +79,8 @@ describe('ApplicationLocalGovernmentService', () => { }); it('should call repository on update', async () => { - mockRepository.findOneOrFail.mockResolvedValue( - new ApplicationLocalGovernment(), - ); - mockRepository.save.mockResolvedValue({} as ApplicationLocalGovernment); + mockRepository.findOneOrFail.mockResolvedValue(new LocalGovernment()); + mockRepository.save.mockResolvedValue(new LocalGovernment()); await service.update('', { name: 'name', diff --git a/services/apps/alcs/src/alcs/application/application-code/application-local-government/application-local-government.service.ts b/services/apps/alcs/src/alcs/local-government/local-government.service.ts similarity index 84% rename from services/apps/alcs/src/alcs/application/application-code/application-local-government/application-local-government.service.ts rename to services/apps/alcs/src/alcs/local-government/local-government.service.ts index c9f542e873..7c85715163 100644 --- a/services/apps/alcs/src/alcs/application/application-code/application-local-government/application-local-government.service.ts +++ b/services/apps/alcs/src/alcs/local-government/local-government.service.ts @@ -1,20 +1,20 @@ import { Injectable, Logger } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { FindOptionsWhere, ILike, Repository } from 'typeorm'; -import { HolidayEntity } from '../../../admin/holiday/holiday.entity'; +import { HolidayEntity } from '../admin/holiday/holiday.entity'; import { LocalGovernmentCreateDto, LocalGovernmentUpdateDto, -} from '../../../admin/local-government/local-government.dto'; -import { ApplicationLocalGovernment } from './application-local-government.entity'; +} from '../admin/local-government/local-government.dto'; +import { LocalGovernment } from './local-government.entity'; @Injectable() -export class ApplicationLocalGovernmentService { - private logger: Logger = new Logger(ApplicationLocalGovernmentService.name); +export class LocalGovernmentService { + private logger: Logger = new Logger(LocalGovernmentService.name); constructor( - @InjectRepository(ApplicationLocalGovernment) - private repository: Repository, + @InjectRepository(LocalGovernment) + private repository: Repository, ) {} async list() { @@ -79,7 +79,7 @@ export class ApplicationLocalGovernmentService { } async create(createDto: LocalGovernmentCreateDto) { - const newGovernment = new ApplicationLocalGovernment(); + const newGovernment = new LocalGovernment(); newGovernment.name = createDto.name; newGovernment.bceidBusinessGuid = createDto.bceidBusinessGuid; newGovernment.isFirstNation = createDto.isFirstNation; diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-modification/notice-of-intent-modification.dto.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-modification/notice-of-intent-modification.dto.ts index f7618f13d8..385ca4c487 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-modification/notice-of-intent-modification.dto.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-modification/notice-of-intent-modification.dto.ts @@ -8,7 +8,7 @@ import { IsString, } from 'class-validator'; import { BaseCodeDto } from '../../../common/dtos/base.dto'; -import { ApplicationLocalGovernmentDto } from '../../application/application-code/application-local-government/application-local-government.dto'; +import { LocalGovernmentDto } from '../../local-government/local-government.dto'; import { CardDto } from '../../card/card.dto'; import { ApplicationRegionDto } from '../../code/application-code/application-region/application-region.dto'; import { ApplicationTypeDto } from '../../code/application-code/application-type/application-type.dto'; @@ -75,7 +75,7 @@ export class NoticeOfIntentForModificationDto { applicant: string; region: ApplicationRegionDto; retroactive: boolean; - localGovernment: ApplicationLocalGovernmentDto; + localGovernment: LocalGovernmentDto; } export class NoticeOfIntentModificationDto { diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.controller.spec.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.controller.spec.ts index cf6a8602e5..30483de2fb 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.controller.spec.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.controller.spec.ts @@ -62,6 +62,7 @@ describe('NoticeOfIntentController', () => { regionCode: 'region-code', boardCode: 'fake', dateSubmittedToAlc: 0, + typeCode: '', }); expect(mockBoardService.getOneOrFail).toHaveBeenCalledTimes(1); diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.controller.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.controller.ts index 4310e21267..ee68803698 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.controller.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.controller.ts @@ -6,6 +6,7 @@ import { ROLES_ALLOWED_BOARDS, } from '../../common/authorization/roles'; import { UserRoles } from '../../common/authorization/roles.decorator'; +import { formatIncomingDate } from '../../utils/incoming-date.formatter'; import { BoardService } from '../board/board.service'; import { NoticeOfIntentSubtype } from './notice-of-intent-subtype.entity'; import { @@ -52,7 +53,10 @@ export class NoticeOfIntentController { }); const createdNoi = await this.noticeOfIntentService.create( - createDto, + { + ...createDto, + dateSubmittedToAlc: formatIncomingDate(createDto.dateSubmittedToAlc), + }, board, ); diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.dto.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.dto.ts index acd45e2cdf..55747821fc 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.dto.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.dto.ts @@ -6,9 +6,10 @@ import { IsNumber, IsOptional, IsString, + IsUUID, } from 'class-validator'; import { BaseCodeDto } from '../../common/dtos/base.dto'; -import { ApplicationLocalGovernmentDto } from '../application/application-code/application-local-government/application-local-government.dto'; +import { LocalGovernmentDto } from '../local-government/local-government.dto'; import { CardDto } from '../card/card.dto'; import { ApplicationRegionDto } from '../code/application-code/application-region/application-region.dto'; @@ -41,6 +42,10 @@ export class CreateNoticeOfIntentDto { @IsString() @IsNotEmpty() boardCode: string; + + @IsString() + @IsOptional() + typeCode: string; } export class NoticeOfIntentDto { @@ -57,7 +62,7 @@ export class NoticeOfIntentDto { card: CardDto; @AutoMap() - localGovernment: ApplicationLocalGovernmentDto; + localGovernment: LocalGovernmentDto; @AutoMap() region: ApplicationRegionDto; @@ -103,6 +108,10 @@ export class UpdateNoticeOfIntentDto { @IsNumber() dateAcknowledgedComplete?: number; + @IsOptional() + @IsUUID() + localGovernmentUuid?: string; + @IsString() @IsOptional() summary?: string; @@ -115,3 +124,13 @@ export class UpdateNoticeOfIntentDto { @IsOptional() retroactive?: boolean; } + +export class CreateNoticeOfIntentServiceDto { + fileNumber: string; + applicant: string; + typeCode: string; + dateSubmittedToAlc?: Date | null | undefined; + regionCode?: string; + localGovernmentUuid?: string; + source?: 'ALCS' | 'APPLICANT'; +} diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.entity.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.entity.ts index f3cb99e4b9..f36dfc11ac 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.entity.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.entity.ts @@ -11,9 +11,11 @@ import { OneToOne, } from 'typeorm'; import { Base } from '../../common/entities/base.entity'; -import { ApplicationLocalGovernment } from '../application/application-code/application-local-government/application-local-government.entity'; +import { LocalGovernment } from '../local-government/local-government.entity'; import { Card } from '../card/card.entity'; import { ApplicationRegion } from '../code/application-code/application-region/application-region.entity'; +import { ApplicationType } from '../code/application-code/application-type/application-type.entity'; +import { NoticeOfIntentType } from '../code/application-code/notice-of-intent-type/notice-of-intent-type.entity'; import { NoticeOfIntentSubtype } from './notice-of-intent-subtype.entity'; @Entity() @@ -40,26 +42,27 @@ export class NoticeOfIntent extends Base { @Type(() => Card) card: Card | null; - @ManyToOne(() => ApplicationLocalGovernment) - localGovernment: ApplicationLocalGovernment; + @ManyToOne(() => LocalGovernment, { nullable: true }) + localGovernment?: LocalGovernment; @Index() @Column({ type: 'uuid', + nullable: true, }) - localGovernmentUuid: string; + localGovernmentUuid?: string; + + @ManyToOne(() => ApplicationRegion, { nullable: true }) + region?: ApplicationRegion; - @ManyToOne(() => ApplicationRegion) - region: ApplicationRegion; + @Column({ nullable: true }) + regionCode?: string; @ManyToMany(() => NoticeOfIntentSubtype) @JoinTable() @AutoMap(() => [NoticeOfIntentSubtype]) subtype: NoticeOfIntentSubtype[]; - @Column() - regionCode: string; - @AutoMap(() => String) @Column({ type: 'text', nullable: true }) summary: string | null; @@ -108,4 +111,12 @@ export class NoticeOfIntent extends Base { nullable: true, }) decisionDate: Date | null; + + @ManyToOne(() => NoticeOfIntentType, { + nullable: false, + }) + type: NoticeOfIntentType; + + @Column() + typeCode: string; } diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.module.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.module.ts index 5f72b652b5..8876b3f228 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.module.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.module.ts @@ -6,6 +6,9 @@ import { DocumentModule } from '../../document/document.module'; import { FileNumberModule } from '../../file-number/file-number.module'; import { BoardModule } from '../board/board.module'; import { CardModule } from '../card/card.module'; +import { NoticeOfIntentType } from '../code/application-code/notice-of-intent-type/notice-of-intent-type.entity'; +import { CodeModule } from '../code/code.module'; +import { LocalGovernmentModule } from '../local-government/local-government.module'; import { NoticeOfIntentDocumentController } from './notice-of-intent-document/notice-of-intent-document.controller'; import { NoticeOfIntentDocument } from './notice-of-intent-document/notice-of-intent-document.entity'; import { NoticeOfIntentDocumentService } from './notice-of-intent-document/notice-of-intent-document.service'; @@ -27,6 +30,7 @@ import { NoticeOfIntentService } from './notice-of-intent.service'; NoticeOfIntent, NoticeOfIntentMeeting, NoticeOfIntentMeetingType, + NoticeOfIntentType, NoticeOfIntentSubtype, NoticeOfIntentDocument, DocumentCode, @@ -35,6 +39,8 @@ import { NoticeOfIntentService } from './notice-of-intent.service'; CardModule, FileNumberModule, DocumentModule, + CodeModule, + LocalGovernmentModule, ], providers: [ NoticeOfIntentService, @@ -47,6 +53,10 @@ import { NoticeOfIntentService } from './notice-of-intent.service'; NoticeOfIntentMeetingController, NoticeOfIntentDocumentController, ], - exports: [NoticeOfIntentService, NoticeOfIntentMeetingService], + exports: [ + NoticeOfIntentService, + NoticeOfIntentMeetingService, + NoticeOfIntentDocumentService, + ], }) export class NoticeOfIntentModule {} diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.spec.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.spec.ts index b048168233..eb5d47adc1 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.spec.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.spec.ts @@ -9,6 +9,11 @@ import { FileNumberService } from '../../file-number/file-number.service'; import { Board } from '../board/board.entity'; import { Card } from '../card/card.entity'; import { CardService } from '../card/card.service'; +import { ApplicationRegion } from '../code/application-code/application-region/application-region.entity'; +import { NoticeOfIntentType } from '../code/application-code/notice-of-intent-type/notice-of-intent-type.entity'; +import { CodeService } from '../code/code.service'; +import { LocalGovernment } from '../local-government/local-government.entity'; +import { LocalGovernmentService } from '../local-government/local-government.service'; import { NoticeOfIntentSubtype } from './notice-of-intent-subtype.entity'; import { NoticeOfIntent } from './notice-of-intent.entity'; import { NoticeOfIntentService } from './notice-of-intent.service'; @@ -17,14 +22,20 @@ describe('NoticeOfIntentService', () => { let service: NoticeOfIntentService; let mockCardService: DeepMocked; let mockRepository: DeepMocked>; + let mockTypeRepository: DeepMocked>; let mockSubtypeRepository: DeepMocked>; let mockFileNumberService: DeepMocked; + let mockLocalGovernmentService: DeepMocked; + let mockCodeService: DeepMocked; beforeEach(async () => { mockCardService = createMock(); mockRepository = createMock(); mockFileNumberService = createMock(); mockSubtypeRepository = createMock(); + mockTypeRepository = createMock(); + mockLocalGovernmentService = createMock(); + mockCodeService = createMock(); const module: TestingModule = await Test.createTestingModule({ imports: [ @@ -39,6 +50,10 @@ describe('NoticeOfIntentService', () => { provide: getRepositoryToken(NoticeOfIntent), useValue: mockRepository, }, + { + provide: getRepositoryToken(NoticeOfIntentType), + useValue: mockTypeRepository, + }, { provide: getRepositoryToken(NoticeOfIntentSubtype), useValue: mockSubtypeRepository, @@ -51,6 +66,14 @@ describe('NoticeOfIntentService', () => { provide: FileNumberService, useValue: mockFileNumberService, }, + { + provide: LocalGovernmentService, + useValue: mockLocalGovernmentService, + }, + { + provide: CodeService, + useValue: mockCodeService, + }, ], }).compile(); @@ -69,6 +92,10 @@ describe('NoticeOfIntentService', () => { mockRepository.save.mockResolvedValue(new NoticeOfIntent()); mockCardService.create.mockResolvedValue(mockCard); mockFileNumberService.checkValidFileNumber.mockResolvedValue(true); + mockCodeService.fetchRegion.mockResolvedValue(new ApplicationRegion()); + mockTypeRepository.findOneOrFail.mockResolvedValue( + new NoticeOfIntentType(), + ); const res = await service.create( { @@ -76,8 +103,8 @@ describe('NoticeOfIntentService', () => { fileNumber: '1512311', localGovernmentUuid: 'fake-uuid', regionCode: 'region-code', - boardCode: 'fake', - dateSubmittedToAlc: 0, + typeCode: '', + dateSubmittedToAlc: new Date(0), }, fakeBoard, ); @@ -87,6 +114,7 @@ describe('NoticeOfIntentService', () => { expect(mockCardService.create).toHaveBeenCalledTimes(1); expect(mockRepository.save).toHaveBeenCalledTimes(1); expect(mockRepository.save.mock.calls[0][0].card).toBe(mockCard); + expect(mockTypeRepository.findOneOrFail).toHaveBeenCalledTimes(1); }); it('should call through to the repo for get by card', async () => { diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.ts index 2283615faa..862e199ffd 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.ts @@ -1,4 +1,7 @@ -import { ServiceNotFoundException } from '@app/common/exceptions/base.exception'; +import { + ServiceNotFoundException, + ServiceValidationException, +} from '@app/common/exceptions/base.exception'; import { Mapper } from '@automapper/core'; import { InjectMapper } from '@automapper/nestjs'; import { Injectable } from '@nestjs/common'; @@ -14,13 +17,17 @@ import { import { FileNumberService } from '../../file-number/file-number.service'; import { formatIncomingDate } from '../../utils/incoming-date.formatter'; import { filterUndefined } from '../../utils/undefined'; +import { LocalGovernmentService } from '../local-government/local-government.service'; import { ApplicationTimeData } from '../application/application-time-tracking.service'; import { Board } from '../board/board.entity'; import { CARD_TYPE } from '../card/card-type/card-type.entity'; +import { Card } from '../card/card.entity'; import { CardService } from '../card/card.service'; +import { NoticeOfIntentType } from '../code/application-code/notice-of-intent-type/notice-of-intent-type.entity'; +import { CodeService } from '../code/code.service'; import { NoticeOfIntentSubtype } from './notice-of-intent-subtype.entity'; import { - CreateNoticeOfIntentDto, + CreateNoticeOfIntentServiceDto, NoticeOfIntentDto, UpdateNoticeOfIntentDto, } from './notice-of-intent.dto'; @@ -46,31 +53,52 @@ export class NoticeOfIntentService { private cardService: CardService, @InjectRepository(NoticeOfIntent) private repository: Repository, + @InjectRepository(NoticeOfIntentType) + private typeRepository: Repository, @InjectRepository(NoticeOfIntentSubtype) private subtypeRepository: Repository, @InjectMapper() private mapper: Mapper, private fileNumberService: FileNumberService, + private codeService: CodeService, + private localGovernmentService: LocalGovernmentService, ) {} - async create(createDto: CreateNoticeOfIntentDto, board: Board) { + async create( + createDto: CreateNoticeOfIntentServiceDto, + board?: Board, + persist = true, + ) { await this.fileNumberService.checkValidFileNumber(createDto.fileNumber); + const type = await this.typeRepository.findOneOrFail({ + where: { + code: createDto.typeCode, + }, + }); + const noticeOfIntent = new NoticeOfIntent({ localGovernmentUuid: createDto.localGovernmentUuid, fileNumber: createDto.fileNumber, regionCode: createDto.regionCode, applicant: createDto.applicant, - dateSubmittedToAlc: formatIncomingDate(createDto.dateSubmittedToAlc), + dateSubmittedToAlc: createDto.dateSubmittedToAlc, + type, }); - noticeOfIntent.card = await this.cardService.create( - CARD_TYPE.NOI, - board, - false, - ); - const savedNoticeOfIntent = await this.repository.save(noticeOfIntent); + if (board) { + noticeOfIntent.card = await this.cardService.create( + CARD_TYPE.NOI, + board, + false, + ); + } + + if (persist) { + const savedNoticeOfIntent = await this.repository.save(noticeOfIntent); - return this.getOrFailByUuid(savedNoticeOfIntent.uuid); + return this.getOrFailByUuid(savedNoticeOfIntent.uuid); + } + return noticeOfIntent; } async getOrFailByUuid(uuid: string) { @@ -187,6 +215,9 @@ export class NoticeOfIntentService { updateDto.summary, noticeOfIntent.summary, ); + if (updateDto.localGovernmentUuid) { + noticeOfIntent.localGovernmentUuid = updateDto.localGovernmentUuid; + } if (updateDto.subtype) { const subtypes = await this.listSubtypes(); @@ -311,4 +342,49 @@ export class NoticeOfIntentService { }); return noticeOfIntent.fileNumber; } + + async fetchTypes() { + return this.typeRepository.find(); + } + + async submit(createDto: CreateNoticeOfIntentServiceDto) { + const existingNoticeOfIntent = await this.repository.findOne({ + where: { fileNumber: createDto.fileNumber }, + }); + + if (!existingNoticeOfIntent) { + throw new ServiceValidationException( + `Notice of Intent with file number does not exist ${createDto.fileNumber}`, + ); + } + + if (!createDto.localGovernmentUuid) { + throw new ServiceValidationException( + `Local government is not set for notice of intent ${createDto.fileNumber}`, + ); + } + + let region = createDto.regionCode + ? await this.codeService.fetchRegion(createDto.regionCode) + : undefined; + + if (!region) { + const localGov = await this.localGovernmentService.getByUuid( + createDto.localGovernmentUuid, + ); + region = localGov?.preferredRegion; + } + + existingNoticeOfIntent.fileNumber = createDto.fileNumber; + existingNoticeOfIntent.applicant = createDto.applicant; + existingNoticeOfIntent.dateSubmittedToAlc = + createDto.dateSubmittedToAlc || null; + existingNoticeOfIntent.localGovernmentUuid = createDto.localGovernmentUuid; + existingNoticeOfIntent.typeCode = createDto.typeCode; + existingNoticeOfIntent.region = region; + existingNoticeOfIntent.card = new Card(); + + await this.repository.save(existingNoticeOfIntent); + return this.getByFileNumber(createDto.fileNumber); + } } diff --git a/services/apps/alcs/src/alcs/obsolete-application-grpc/alcs-application.controller.spec.ts b/services/apps/alcs/src/alcs/obsolete-application-grpc/alcs-application.controller.spec.ts index 8063db82ee..7f518855ae 100644 --- a/services/apps/alcs/src/alcs/obsolete-application-grpc/alcs-application.controller.spec.ts +++ b/services/apps/alcs/src/alcs/obsolete-application-grpc/alcs-application.controller.spec.ts @@ -4,15 +4,16 @@ import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { ClsService } from 'nestjs-cls'; import { mockKeyCloakProviders } from '../../../test/mocks/mockTypes'; +import { FileNumberService } from '../../file-number/file-number.service'; import { ApplicationService } from '../application/application.service'; import { ApplicationGrpcController } from './alcs-application.controller'; describe('ApplicationGrpcController', () => { let controller: ApplicationGrpcController; - let mockApplicationService: DeepMocked; + let mockFileNumberService: DeepMocked; beforeEach(async () => { - mockApplicationService = createMock(); + mockFileNumberService = createMock(); const module: TestingModule = await Test.createTestingModule({ imports: [ @@ -21,7 +22,7 @@ describe('ApplicationGrpcController', () => { }), ], providers: [ - { provide: ApplicationService, useValue: mockApplicationService }, + { provide: FileNumberService, useValue: mockFileNumberService }, { provide: ClsService, useValue: {}, @@ -43,12 +44,12 @@ describe('ApplicationGrpcController', () => { it('should call through to service on generateNumber', async () => { const fileNumber = 'file-id'; - mockApplicationService.generateNextFileNumber.mockResolvedValue(fileNumber); + mockFileNumberService.generateNextFileNumber.mockResolvedValue(fileNumber); const res = await controller.generateFileNumber({ ApplicationFileNumberGenerateGrpcRequest: {}, }); expect(res).toEqual({ fileNumber }); - expect(mockApplicationService.generateNextFileNumber).toBeCalledTimes(1); + expect(mockFileNumberService.generateNextFileNumber).toBeCalledTimes(1); }); }); diff --git a/services/apps/alcs/src/alcs/obsolete-application-grpc/alcs-application.controller.ts b/services/apps/alcs/src/alcs/obsolete-application-grpc/alcs-application.controller.ts index 60fa1fdac1..9445876960 100644 --- a/services/apps/alcs/src/alcs/obsolete-application-grpc/alcs-application.controller.ts +++ b/services/apps/alcs/src/alcs/obsolete-application-grpc/alcs-application.controller.ts @@ -1,6 +1,6 @@ import { Controller, Logger } from '@nestjs/common'; import { GrpcMethod } from '@nestjs/microservices'; -import { ApplicationService } from '../application/application.service'; +import { FileNumberService } from '../../file-number/file-number.service'; import { ApplicationFileNumberGenerateGrpcResponse } from './alcs-application.message.interface'; import { AlcsApplicationService, @@ -11,7 +11,7 @@ import { export class ApplicationGrpcController implements AlcsApplicationService { private logger = new Logger(ApplicationGrpcController.name); - constructor(private applicationService: ApplicationService) {} + constructor(private fileNumberService: FileNumberService) {} @GrpcMethod(GRPC_APPLICATION_SERVICE_NAME, 'generateFileNumber') async generateFileNumber( @@ -19,7 +19,7 @@ export class ApplicationGrpcController implements AlcsApplicationService { ApplicationFileNumberGenerateGrpcRequest: any, ): Promise { return { - fileNumber: await this.applicationService.generateNextFileNumber(), + fileNumber: await this.fileNumberService.generateNextFileNumber(), }; } } diff --git a/services/apps/alcs/src/alcs/planning-review/planning-review.dto.ts b/services/apps/alcs/src/alcs/planning-review/planning-review.dto.ts index 12811c84c5..43c84b96eb 100644 --- a/services/apps/alcs/src/alcs/planning-review/planning-review.dto.ts +++ b/services/apps/alcs/src/alcs/planning-review/planning-review.dto.ts @@ -1,6 +1,6 @@ import { AutoMap } from '@automapper/classes'; import { IsNotEmpty, IsString, MaxLength } from 'class-validator'; -import { ApplicationLocalGovernmentDto } from '../application/application-code/application-local-government/application-local-government.dto'; +import { LocalGovernmentDto } from '../local-government/local-government.dto'; import { CardDto } from '../card/card.dto'; import { ApplicationRegionDto } from '../code/application-code/application-region/application-region.dto'; @@ -35,7 +35,7 @@ export class PlanningReviewDto { card: CardDto; @AutoMap() - localGovernment: ApplicationLocalGovernmentDto; + localGovernment: LocalGovernmentDto; @AutoMap() region: ApplicationRegionDto; diff --git a/services/apps/alcs/src/alcs/planning-review/planning-review.entity.ts b/services/apps/alcs/src/alcs/planning-review/planning-review.entity.ts index 27d8567f4c..908e4f9d3e 100644 --- a/services/apps/alcs/src/alcs/planning-review/planning-review.entity.ts +++ b/services/apps/alcs/src/alcs/planning-review/planning-review.entity.ts @@ -8,9 +8,9 @@ import { OneToOne, } from 'typeorm'; import { Base } from '../../common/entities/base.entity'; -import { ApplicationLocalGovernment } from '../application/application-code/application-local-government/application-local-government.entity'; import { Card } from '../card/card.entity'; import { ApplicationRegion } from '../code/application-code/application-region/application-region.entity'; +import { LocalGovernment } from '../local-government/local-government.entity'; @Entity() export class PlanningReview extends Base { @@ -36,8 +36,8 @@ export class PlanningReview extends Base { @Type(() => Card) card: Card; - @ManyToOne(() => ApplicationLocalGovernment) - localGovernment: ApplicationLocalGovernment; + @ManyToOne(() => LocalGovernment) + localGovernment: LocalGovernment; @Index() @Column({ diff --git a/services/apps/alcs/src/alcs/search/search.module.ts b/services/apps/alcs/src/alcs/search/search.module.ts index 3206a2c546..38c9051ac4 100644 --- a/services/apps/alcs/src/alcs/search/search.module.ts +++ b/services/apps/alcs/src/alcs/search/search.module.ts @@ -1,7 +1,7 @@ import { Module } from '@nestjs/common'; import { TypeOrmModule } from '@nestjs/typeorm'; import { ApplicationProfile } from '../../common/automapper/application.automapper.profile'; -import { ApplicationLocalGovernment } from '../application/application-code/application-local-government/application-local-government.entity'; +import { LocalGovernment } from '../local-government/local-government.entity'; import { Application } from '../application/application.entity'; import { Covenant } from '../covenant/covenant.entity'; import { NoticeOfIntent } from '../notice-of-intent/notice-of-intent.entity'; @@ -16,7 +16,7 @@ import { SearchService } from './search.service'; NoticeOfIntent, PlanningReview, Covenant, - ApplicationLocalGovernment, + LocalGovernment, ]), ], providers: [SearchService, ApplicationProfile], diff --git a/services/apps/alcs/src/common/automapper/application.automapper.profile.ts b/services/apps/alcs/src/common/automapper/application.automapper.profile.ts index bf15e21b83..27c1632a43 100644 --- a/services/apps/alcs/src/common/automapper/application.automapper.profile.ts +++ b/services/apps/alcs/src/common/automapper/application.automapper.profile.ts @@ -4,8 +4,8 @@ import { Injectable } from '@nestjs/common'; import { ApplicationDecisionMeetingDto } from '../../alcs/application-decision/application-decision-v1/application-decision-meeting/application-decision-meeting.dto'; import { ApplicationDecisionMeeting } from '../../alcs/application-decision/application-decision-v1/application-decision-meeting/application-decision-meeting.entity'; -import { ApplicationLocalGovernmentDto } from '../../alcs/application/application-code/application-local-government/application-local-government.dto'; -import { ApplicationLocalGovernment } from '../../alcs/application/application-code/application-local-government/application-local-government.entity'; +import { LocalGovernmentDto } from '../../alcs/local-government/local-government.dto'; +import { LocalGovernment } from '../../alcs/local-government/local-government.entity'; import { ApplicationDocumentDto } from '../../alcs/application/application-document/application-document.dto'; import { DocumentCode } from '../../document/document-code.entity'; import { ApplicationDocument } from '../../alcs/application/application-document/application-document.entity'; @@ -41,11 +41,7 @@ export class ApplicationProfile extends AutomapperProfile { createMap(mapper, ApplicationRegion, ApplicationRegionDto); createMap(mapper, ApplicationMeetingType, ApplicationMeetingTypeDto); - createMap( - mapper, - ApplicationLocalGovernment, - ApplicationLocalGovernmentDto, - ); + createMap(mapper, LocalGovernment, LocalGovernmentDto); createMap( mapper, diff --git a/services/apps/alcs/src/common/automapper/modification.automapper.profile.ts b/services/apps/alcs/src/common/automapper/modification.automapper.profile.ts index d36852e11f..5d9d5e2de5 100644 --- a/services/apps/alcs/src/common/automapper/modification.automapper.profile.ts +++ b/services/apps/alcs/src/common/automapper/modification.automapper.profile.ts @@ -12,8 +12,8 @@ import { ApplicationModificationOutcomeCodeDto, } from '../../alcs/application-decision/application-modification/application-modification.dto'; import { ApplicationModification } from '../../alcs/application-decision/application-modification/application-modification.entity'; -import { ApplicationLocalGovernmentDto } from '../../alcs/application/application-code/application-local-government/application-local-government.dto'; -import { ApplicationLocalGovernment } from '../../alcs/application/application-code/application-local-government/application-local-government.entity'; +import { LocalGovernmentDto } from '../../alcs/local-government/local-government.dto'; +import { LocalGovernment } from '../../alcs/local-government/local-government.entity'; import { Application } from '../../alcs/application/application.entity'; import { CardDto } from '../../alcs/card/card.dto'; import { Card } from '../../alcs/card/card.entity'; @@ -41,8 +41,8 @@ export class ModificationProfile extends AutomapperProfile { mapFrom((a) => this.mapper.map( a.localGovernment, - ApplicationLocalGovernment, - ApplicationLocalGovernmentDto, + LocalGovernment, + LocalGovernmentDto, ), ), ), diff --git a/services/apps/alcs/src/common/automapper/notice-of-intent-decision.automapper.profile.ts b/services/apps/alcs/src/common/automapper/notice-of-intent-decision.automapper.profile.ts index a77b937053..13e4c79d8f 100644 --- a/services/apps/alcs/src/common/automapper/notice-of-intent-decision.automapper.profile.ts +++ b/services/apps/alcs/src/common/automapper/notice-of-intent-decision.automapper.profile.ts @@ -1,10 +1,10 @@ import { createMap, forMember, mapFrom, Mapper } from '@automapper/core'; import { AutomapperProfile, InjectMapper } from '@automapper/nestjs'; import { Injectable } from '@nestjs/common'; -import { ApplicationLocalGovernmentDto } from '../../alcs/application/application-code/application-local-government/application-local-government.dto'; -import { ApplicationLocalGovernment } from '../../alcs/application/application-code/application-local-government/application-local-government.entity'; +import { LocalGovernmentDto } from '../../alcs/local-government/local-government.dto'; import { CardDto } from '../../alcs/card/card.dto'; import { Card } from '../../alcs/card/card.entity'; +import { LocalGovernment } from '../../alcs/local-government/local-government.entity'; import { NoticeOfIntentDecisionDocument } from '../../alcs/notice-of-intent-decision/notice-of-intent-decision-document/notice-of-intent-decision-document.entity'; import { NoticeOfIntentDecisionOutcome } from '../../alcs/notice-of-intent-decision/notice-of-intent-decision-outcome.entity'; import { @@ -126,8 +126,8 @@ export class NoticeOfIntentDecisionProfile extends AutomapperProfile { mapFrom((a) => this.mapper.map( a.localGovernment, - ApplicationLocalGovernment, - ApplicationLocalGovernmentDto, + LocalGovernment, + LocalGovernmentDto, ), ), ), diff --git a/services/apps/alcs/src/common/automapper/notice-of-intent-submission.automapper.profile.ts b/services/apps/alcs/src/common/automapper/notice-of-intent-submission.automapper.profile.ts new file mode 100644 index 0000000000..d7adff6063 --- /dev/null +++ b/services/apps/alcs/src/common/automapper/notice-of-intent-submission.automapper.profile.ts @@ -0,0 +1,55 @@ +import { createMap, forMember, mapFrom, Mapper } from '@automapper/core'; +import { AutomapperProfile, InjectMapper } from '@automapper/nestjs'; +import { Injectable } from '@nestjs/common'; +import { + NoticeOfIntentSubmissionDetailedDto, + NoticeOfIntentSubmissionDto, +} from '../../portal/notice-of-intent-submission/notice-of-intent-submission.dto'; +import { NoticeOfIntentSubmission } from '../../portal/notice-of-intent-submission/notice-of-intent-submission.entity'; + +@Injectable() +export class NoticeOfIntentSubmissionProfile extends AutomapperProfile { + constructor(@InjectMapper() mapper: Mapper) { + super(mapper); + } + + override get profile() { + return (mapper) => { + createMap( + mapper, + NoticeOfIntentSubmission, + NoticeOfIntentSubmissionDto, + forMember( + (a) => a.createdAt, + mapFrom((ad) => { + return ad.auditCreatedAt.getTime(); + }), + ), + forMember( + (a) => a.updatedAt, + mapFrom((ad) => { + return ad.auditUpdatedAt?.getTime(); + }), + ), + ); + + createMap( + mapper, + NoticeOfIntentSubmission, + NoticeOfIntentSubmissionDetailedDto, + forMember( + (a) => a.createdAt, + mapFrom((ad) => { + return ad.auditCreatedAt.getTime(); + }), + ), + forMember( + (a) => a.updatedAt, + mapFrom((ad) => { + return ad.auditUpdatedAt?.getTime(); + }), + ), + ); + }; + } +} diff --git a/services/apps/alcs/src/file-number/file-number.constants.ts b/services/apps/alcs/src/file-number/file-number.constants.ts new file mode 100644 index 0000000000..c2e13dce75 --- /dev/null +++ b/services/apps/alcs/src/file-number/file-number.constants.ts @@ -0,0 +1 @@ +export const FILE_NUMBER_SEQUENCE = 'alcs.alcs_file_number_seq'; diff --git a/services/apps/alcs/src/file-number/file-number.service.spec.ts b/services/apps/alcs/src/file-number/file-number.service.spec.ts index a932bcf448..b108979436 100644 --- a/services/apps/alcs/src/file-number/file-number.service.spec.ts +++ b/services/apps/alcs/src/file-number/file-number.service.spec.ts @@ -70,4 +70,16 @@ describe('FileNumberService', () => { expect(mockCovenantRepo.exist).toHaveBeenCalledTimes(1); expect(mockNOIRepo.exist).toHaveBeenCalledTimes(1); }); + + it('should generate and return new fileNumber', async () => { + mockAppRepo.findOne + .mockResolvedValueOnce({} as Application) + .mockResolvedValue(null); + mockAppRepo.query.mockResolvedValue([{ nextval: '2512' }]); + + const result = await service.generateNextFileNumber(); + + expect(mockAppRepo.query).toBeCalledTimes(1); + expect(result).toEqual('2512'); + }); }); diff --git a/services/apps/alcs/src/file-number/file-number.service.ts b/services/apps/alcs/src/file-number/file-number.service.ts index 6711681734..03f3b1580e 100644 --- a/services/apps/alcs/src/file-number/file-number.service.ts +++ b/services/apps/alcs/src/file-number/file-number.service.ts @@ -5,6 +5,7 @@ import { Repository } from 'typeorm'; import { Application } from '../alcs/application/application.entity'; import { Covenant } from '../alcs/covenant/covenant.entity'; import { NoticeOfIntent } from '../alcs/notice-of-intent/notice-of-intent.entity'; +import { FILE_NUMBER_SEQUENCE } from './file-number.constants'; @Injectable() export class FileNumberService { @@ -42,4 +43,11 @@ export class FileNumberService { } return true; } + + async generateNextFileNumber() { + const fileNumberArr = await this.applicationRepo.query( + `select nextval('${FILE_NUMBER_SEQUENCE}') limit 1`, + ); + return fileNumberArr[0].nextval; + } } diff --git a/services/apps/alcs/src/main.module.ts b/services/apps/alcs/src/main.module.ts index 045e0d91b7..ab4f586986 100644 --- a/services/apps/alcs/src/main.module.ts +++ b/services/apps/alcs/src/main.module.ts @@ -11,11 +11,14 @@ import { ClsModule } from 'nestjs-cls'; import { LoggerModule } from 'nestjs-pino'; import { CdogsModule } from '../../../libs/common/src/cdogs/cdogs.module'; import { AlcsModule } from './alcs/alcs.module'; +import { LocalGovernmentController } from './alcs/local-government/local-government.controller'; +import { LocalGovernmentModule } from './alcs/local-government/local-government.module'; import { AuthorizationFilter } from './common/authorization/authorization.filter'; import { AuthorizationModule } from './common/authorization/authorization.module'; import { AuditSubscriber } from './common/entities/audit.subscriber'; import { DocumentModule } from './document/document.module'; import { FileNumberModule } from './file-number/file-number.module'; +import { FileNumberService } from './file-number/file-number.service'; import { HealthCheck } from './healthcheck/healthcheck.entity'; import { LogoutController } from './logout/logout.controller'; import { MainController } from './main.controller'; @@ -23,6 +26,7 @@ import { MainService } from './main.service'; import { PortalModule } from './portal/portal.module'; import { TypeormConfigService } from './providers/typeorm/typeorm.service'; import { UserModule } from './user/user.module'; +import { NoticeOfIntentSubmissionModule } from './portal/notice-of-intent-submission/notice-of-intent-submission.module'; @Module({ imports: [ @@ -62,6 +66,7 @@ import { UserModule } from './user/user.module'; PortalModule, UserModule, FileNumberModule, + NoticeOfIntentSubmissionModule, ], controllers: [MainController, LogoutController], providers: [ diff --git a/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.spec.ts b/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.spec.ts index 0471d0e0ce..6634bf72f5 100644 --- a/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.spec.ts +++ b/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.spec.ts @@ -3,8 +3,8 @@ import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { ClsService } from 'nestjs-cls'; import { mockKeyCloakProviders } from '../../../test/mocks/mockTypes'; -import { ApplicationLocalGovernment } from '../../alcs/application/application-code/application-local-government/application-local-government.entity'; -import { ApplicationLocalGovernmentService } from '../../alcs/application/application-code/application-local-government/application-local-government.service'; +import { LocalGovernment } from '../../alcs/local-government/local-government.entity'; +import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; import { DocumentCode, DOCUMENT_TYPE, @@ -38,14 +38,14 @@ describe('ApplicationSubmissionReviewController', () => { let controller: ApplicationSubmissionReviewController; let mockAppReviewService: DeepMocked; let mockAppSubmissionService: DeepMocked; - let mockLGService: DeepMocked; + let mockLGService: DeepMocked; let mockAppDocService: DeepMocked; let mockAppValidatorService: DeepMocked; let mockAppService: DeepMocked; let mockEmailService: DeepMocked; let mockApplicationSubmissionStatusService: DeepMocked; - const mockLG = new ApplicationLocalGovernment({ + const mockLG = new LocalGovernment({ isFirstNation: false, isActive: true, bceidBusinessGuid: '', @@ -86,7 +86,7 @@ describe('ApplicationSubmissionReviewController', () => { useValue: mockAppSubmissionService, }, { - provide: ApplicationLocalGovernmentService, + provide: LocalGovernmentService, useValue: mockLGService, }, { diff --git a/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.ts b/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.ts index eaf916546f..9ebca6b312 100644 --- a/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.ts +++ b/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.ts @@ -14,8 +14,8 @@ import { UseGuards, } from '@nestjs/common'; import { generateStatusHtml } from '../../../../../templates/emails/submission-status.template'; -import { ApplicationLocalGovernment } from '../../alcs/application/application-code/application-local-government/application-local-government.entity'; -import { ApplicationLocalGovernmentService } from '../../alcs/application/application-code/application-local-government/application-local-government.service'; +import { LocalGovernment } from '../../alcs/local-government/local-government.entity'; +import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; import { ApplicationDocumentService } from '../../alcs/application/application-document/application-document.service'; import { ApplicationService } from '../../alcs/application/application.service'; import { ApplicationSubmissionStatusService } from '../../application-submission-status/application-submission-status.service'; @@ -46,7 +46,7 @@ export class ApplicationSubmissionReviewController { private applicationSubmissionService: ApplicationSubmissionService, private applicationSubmissionReviewService: ApplicationSubmissionReviewService, private applicationDocumentService: ApplicationDocumentService, - private localGovernmentService: ApplicationLocalGovernmentService, + private localGovernmentService: LocalGovernmentService, private applicationValidatorService: ApplicationSubmissionValidatorService, private applicationService: ApplicationService, private emailService: EmailService, @@ -236,7 +236,7 @@ export class ApplicationSubmissionReviewController { private async sendStatusEmail( applicationSubmission: ApplicationSubmission, fileNumber: string, - userLocalGovernment: ApplicationLocalGovernment, + userLocalGovernment: LocalGovernment, primaryContact: ApplicationOwner, ) { if (primaryContact.email) { diff --git a/services/apps/alcs/src/portal/application-submission-review/application-submission-review.service.spec.ts b/services/apps/alcs/src/portal/application-submission-review/application-submission-review.service.spec.ts index e812446209..332d184eb5 100644 --- a/services/apps/alcs/src/portal/application-submission-review/application-submission-review.service.spec.ts +++ b/services/apps/alcs/src/portal/application-submission-review/application-submission-review.service.spec.ts @@ -5,7 +5,7 @@ import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { ApplicationLocalGovernment } from '../../alcs/application/application-code/application-local-government/application-local-government.entity'; +import { LocalGovernment } from '../../alcs/local-government/local-government.entity'; import { DocumentCode, DOCUMENT_TYPE, @@ -27,7 +27,7 @@ describe('ApplicationSubmissionReviewService', () => { let mockAppDocumentService: DeepMocked; let mockAppService: DeepMocked; - const mockLocalGovernment = new ApplicationLocalGovernment({ + const mockLocalGovernment = new LocalGovernment({ isFirstNation: true, isActive: true, }); diff --git a/services/apps/alcs/src/portal/application-submission-review/application-submission-review.service.ts b/services/apps/alcs/src/portal/application-submission-review/application-submission-review.service.ts index f0dbb9be1d..93c25f7da2 100644 --- a/services/apps/alcs/src/portal/application-submission-review/application-submission-review.service.ts +++ b/services/apps/alcs/src/portal/application-submission-review/application-submission-review.service.ts @@ -7,7 +7,7 @@ import { InjectMapper } from '@automapper/nestjs'; import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { ApplicationLocalGovernment } from '../../alcs/application/application-code/application-local-government/application-local-government.entity'; +import { LocalGovernment } from '../../alcs/local-government/local-government.entity'; import { DOCUMENT_TYPE } from '../../document/document-code.entity'; import { ApplicationDocument } from '../../alcs/application/application-document/application-document.entity'; import { ApplicationDocumentService } from '../../alcs/application/application-document/application-document.service'; @@ -243,7 +243,7 @@ export class ApplicationSubmissionReviewService { async mapToDto( review: ApplicationSubmissionReview, - localGovernment: ApplicationLocalGovernment, + localGovernment: LocalGovernment, ): Promise { const mappedReview = await this.mapper.mapAsync( review, diff --git a/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.spec.ts b/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.spec.ts index bd1b82cae5..1e6e28cb0b 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.spec.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.spec.ts @@ -1,8 +1,8 @@ import { ServiceValidationException } from '@app/common/exceptions/base.exception'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; -import { ApplicationLocalGovernment } from '../../alcs/application/application-code/application-local-government/application-local-government.entity'; -import { ApplicationLocalGovernmentService } from '../../alcs/application/application-code/application-local-government/application-local-government.service'; +import { LocalGovernment } from '../../alcs/local-government/local-government.entity'; +import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; import { DocumentCode, DOCUMENT_TYPE, @@ -26,7 +26,7 @@ function includesError(errors: Error[], target: Error) { describe('ApplicationSubmissionValidatorService', () => { let service: ApplicationSubmissionValidatorService; - let mockLGService: DeepMocked; + let mockLGService: DeepMocked; let mockAppParcelService: DeepMocked; let mockAppDocumentService: DeepMocked; @@ -39,7 +39,7 @@ describe('ApplicationSubmissionValidatorService', () => { providers: [ ApplicationSubmissionValidatorService, { - provide: ApplicationLocalGovernmentService, + provide: LocalGovernmentService, useValue: mockLGService, }, { @@ -407,7 +407,7 @@ describe('ApplicationSubmissionValidatorService', () => { }); it('should accept local government when its valid', async () => { - const mockLg = new ApplicationLocalGovernment({ + const mockLg = new LocalGovernment({ uuid: 'lg-uuid', name: 'lg', bceidBusinessGuid: 'CATS', diff --git a/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.ts b/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.ts index 0a83049629..aed07bd264 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.ts @@ -1,6 +1,6 @@ import { ServiceValidationException } from '@app/common/exceptions/base.exception'; import { Injectable, Logger } from '@nestjs/common'; -import { ApplicationLocalGovernmentService } from '../../alcs/application/application-code/application-local-government/application-local-government.service'; +import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; import { DOCUMENT_TYPE } from '../../document/document-code.entity'; import { ApplicationDocument } from '../../alcs/application/application-document/application-document.entity'; import { ApplicationDocumentService } from '../../alcs/application/application-document/application-document.service'; @@ -37,7 +37,7 @@ export class ApplicationSubmissionValidatorService { ); constructor( - private localGovernmentService: ApplicationLocalGovernmentService, + private localGovernmentService: LocalGovernmentService, private appParcelService: ApplicationParcelService, private appDocumentService: ApplicationDocumentService, ) {} diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.controller.spec.ts b/services/apps/alcs/src/portal/application-submission/application-submission.controller.spec.ts index cc28740ba7..104ef46165 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.controller.spec.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.controller.spec.ts @@ -5,8 +5,8 @@ import { BadRequestException } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; import { ClsService } from 'nestjs-cls'; import { mockKeyCloakProviders } from '../../../test/mocks/mockTypes'; -import { ApplicationLocalGovernment } from '../../alcs/application/application-code/application-local-government/application-local-government.entity'; -import { ApplicationLocalGovernmentService } from '../../alcs/application/application-code/application-local-government/application-local-government.service'; +import { LocalGovernment } from '../../alcs/local-government/local-government.entity'; +import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; import { ApplicationDocumentService } from '../../alcs/application/application-document/application-document.service'; import { Application } from '../../alcs/application/application.entity'; import { ApplicationSubmissionStatusType } from '../../application-submission-status/submission-status-type.entity'; @@ -30,7 +30,7 @@ describe('ApplicationSubmissionController', () => { let controller: ApplicationSubmissionController; let mockAppSubmissionService: DeepMocked; let mockDocumentService: DeepMocked; - let mockLgService: DeepMocked; + let mockLgService: DeepMocked; let mockAppValidationService: DeepMocked; const localGovernmentUuid = 'local-government'; @@ -56,7 +56,7 @@ describe('ApplicationSubmissionController', () => { useValue: mockDocumentService, }, { - provide: ApplicationLocalGovernmentService, + provide: LocalGovernmentService, useValue: mockLgService, }, { @@ -100,7 +100,7 @@ describe('ApplicationSubmissionController', () => { mockAppSubmissionService.mapToDTOs.mockResolvedValue([]); mockLgService.list.mockResolvedValue([ - new ApplicationLocalGovernment({ + new LocalGovernment({ uuid: localGovernmentUuid, bceidBusinessGuid, name: 'fake-name', diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.controller.ts b/services/apps/alcs/src/portal/application-submission/application-submission.controller.ts index 71440fe831..b41a28faeb 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.controller.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.controller.ts @@ -10,8 +10,8 @@ import { Req, UseGuards, } from '@nestjs/common'; -import { ApplicationLocalGovernment } from '../../alcs/application/application-code/application-local-government/application-local-government.entity'; -import { ApplicationLocalGovernmentService } from '../../alcs/application/application-code/application-local-government/application-local-government.service'; +import { LocalGovernment } from '../../alcs/local-government/local-government.entity'; +import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; import { SUBMISSION_STATUS } from '../../application-submission-status/submission-status.dto'; import { PortalAuthGuard } from '../../common/authorization/portal-auth-guard.service'; import { User } from '../../user/user.entity'; @@ -29,7 +29,7 @@ export class ApplicationSubmissionController { constructor( private applicationSubmissionService: ApplicationSubmissionService, - private localGovernmentService: ApplicationLocalGovernmentService, + private localGovernmentService: LocalGovernmentService, private applicationSubmissionValidatorService: ApplicationSubmissionValidatorService, ) {} @@ -161,7 +161,7 @@ export class ApplicationSubmissionController { uuid, req.user.entity, ); - let localGovernment: ApplicationLocalGovernment | null = null; + let localGovernment: LocalGovernment | null = null; if (user.bceidBusinessGuid) { localGovernment = await this.localGovernmentService.getByGuid( diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.module.ts b/services/apps/alcs/src/portal/application-submission/application-submission.module.ts index 15e64ad7c3..2f8049c052 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.module.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.module.ts @@ -9,6 +9,7 @@ import { ApplicationOwnerProfile } from '../../common/automapper/application-own import { ApplicationParcelProfile } from '../../common/automapper/application-parcel.automapper.profile'; import { ApplicationSubmissionProfile } from '../../common/automapper/application-submission.automapper.profile'; import { DocumentModule } from '../../document/document.module'; +import { FileNumberModule } from '../../file-number/file-number.module'; import { PdfGenerationModule } from '../pdf-generation/pdf-generation.module'; import { ApplicationOwnerType } from './application-owner/application-owner-type/application-owner-type.entity'; import { ApplicationOwnerController } from './application-owner/application-owner.controller'; @@ -41,6 +42,7 @@ import { NaruSubtype } from './naru-subtype/naru-subtype.entity'; forwardRef(() => DocumentModule), forwardRef(() => PdfGenerationModule), ApplicationSubmissionStatusModule, + FileNumberModule, ], providers: [ ApplicationSubmissionService, diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.service.spec.ts b/services/apps/alcs/src/portal/application-submission/application-submission.service.spec.ts index 0b7a272490..405ec5bfcf 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.service.spec.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.service.spec.ts @@ -5,8 +5,8 @@ import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { ApplicationLocalGovernment } from '../../alcs/application/application-code/application-local-government/application-local-government.entity'; -import { ApplicationLocalGovernmentService } from '../../alcs/application/application-code/application-local-government/application-local-government.service'; +import { LocalGovernment } from '../../alcs/local-government/local-government.entity'; +import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; import { DOCUMENT_TYPE } from '../../document/document-code.entity'; import { ApplicationDocumentService } from '../../alcs/application/application-document/application-document.service'; import { Application } from '../../alcs/application/application.entity'; @@ -17,6 +17,7 @@ import { ApplicationSubmissionStatusType } from '../../application-submission-st import { SUBMISSION_STATUS } from '../../application-submission-status/submission-status.dto'; import { ApplicationSubmissionToSubmissionStatus } from '../../application-submission-status/submission-status.entity'; import { ApplicationSubmissionProfile } from '../../common/automapper/application-submission.automapper.profile'; +import { FileNumberService } from '../../file-number/file-number.service'; import { User } from '../../user/user.entity'; import { GenerateReviewDocumentService } from '../pdf-generation/generate-review-document.service'; import { GenerateSubmissionDocumentService } from '../pdf-generation/generate-submission-document.service'; @@ -33,11 +34,12 @@ describe('ApplicationSubmissionService', () => { >; let mockNaruSubtypeRepository: DeepMocked>; let mockApplicationService: DeepMocked; - let mockLGService: DeepMocked; + let mockLGService: DeepMocked; let mockAppDocService: DeepMocked; let mockGenerateSubmissionDocumentService: DeepMocked; let mockGenerateReviewDocumentService: DeepMocked; let mockApplicationSubmissionStatusService: DeepMocked; + let mockFileNumberService: DeepMocked; beforeEach(async () => { mockRepository = createMock(); @@ -49,6 +51,7 @@ describe('ApplicationSubmissionService', () => { mockGenerateReviewDocumentService = createMock(); mockNaruSubtypeRepository = createMock(); mockApplicationSubmissionStatusService = createMock(); + mockFileNumberService = createMock(); const module: TestingModule = await Test.createTestingModule({ imports: [ @@ -72,7 +75,7 @@ describe('ApplicationSubmissionService', () => { useValue: mockApplicationService, }, { - provide: ApplicationLocalGovernmentService, + provide: LocalGovernmentService, useValue: mockLGService, }, { @@ -95,6 +98,10 @@ describe('ApplicationSubmissionService', () => { provide: ApplicationSubmissionStatusService, useValue: mockApplicationSubmissionStatusService, }, + { + provide: FileNumberService, + useValue: mockFileNumberService, + }, ], }).compile(); @@ -155,7 +162,7 @@ describe('ApplicationSubmissionService', () => { new ApplicationSubmissionStatusType(), ); mockRepository.save.mockResolvedValue(new ApplicationSubmission()); - mockApplicationService.generateNextFileNumber.mockResolvedValue(fileId); + mockFileNumberService.generateNextFileNumber.mockResolvedValue(fileId); mockApplicationService.create.mockResolvedValue(new Application()); mockApplicationSubmissionStatusService.setInitialStatuses.mockResolvedValue( {} as any, @@ -203,7 +210,7 @@ describe('ApplicationSubmissionService', () => { const res = await service.getForGovernmentByFileId( '', - new ApplicationLocalGovernment({ + new LocalGovernment({ uuid: '', name: '', isFirstNation: false, diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.service.ts b/services/apps/alcs/src/portal/application-submission/application-submission.service.ts index d270290229..a8235eb325 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.service.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.service.ts @@ -7,8 +7,8 @@ import { InjectMapper } from '@automapper/nestjs'; import { forwardRef, Inject, Injectable, Logger } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { FindOptionsRelations, Repository } from 'typeorm'; -import { ApplicationLocalGovernment } from '../../alcs/application/application-code/application-local-government/application-local-government.entity'; -import { ApplicationLocalGovernmentService } from '../../alcs/application/application-code/application-local-government/application-local-government.service'; +import { LocalGovernment } from '../../alcs/local-government/local-government.entity'; +import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; import { DOCUMENT_TYPE } from '../../document/document-code.entity'; import { ApplicationDocumentService } from '../../alcs/application/application-document/application-document.service'; import { Application } from '../../alcs/application/application.entity'; @@ -17,6 +17,7 @@ import { ApplicationSubmissionStatusService } from '../../application-submission import { ApplicationSubmissionStatusType } from '../../application-submission-status/submission-status-type.entity'; import { SUBMISSION_STATUS } from '../../application-submission-status/submission-status.dto'; import { ROLES_ALLOWED_APPLICATIONS } from '../../common/authorization/roles'; +import { FileNumberService } from '../../file-number/file-number.service'; import { User } from '../../user/user.entity'; import { filterUndefined } from '../../utils/undefined'; import { ApplicationSubmissionReview } from '../application-submission-review/application-submission-review.entity'; @@ -61,7 +62,8 @@ export class ApplicationSubmissionService { @InjectRepository(NaruSubtype) private naruSubtypeRepository: Repository, private applicationService: ApplicationService, - private localGovernmentService: ApplicationLocalGovernmentService, + private fileNumberService: FileNumberService, + private localGovernmentService: LocalGovernmentService, private applicationDocumentService: ApplicationDocumentService, @Inject(forwardRef(() => GenerateSubmissionDocumentService)) private submissionDocumentGenerationService: GenerateSubmissionDocumentService, @@ -105,7 +107,7 @@ export class ApplicationSubmissionService { } async create(type: string, createdBy: User, prescribedBody?: string) { - const fileNumber = await this.applicationService.generateNextFileNumber(); + const fileNumber = await this.fileNumberService.generateNextFileNumber(); await this.applicationService.create( { @@ -303,7 +305,7 @@ export class ApplicationSubmissionService { }); } - async getForGovernment(localGovernment: ApplicationLocalGovernment) { + async getForGovernment(localGovernment: LocalGovernment) { if (!localGovernment.bceidBusinessGuid) { throw new Error("Cannot load by governments that don't have guids"); } @@ -340,10 +342,7 @@ export class ApplicationSubmissionService { ); } - async getForGovernmentByUuid( - uuid: string, - localGovernment: ApplicationLocalGovernment, - ) { + async getForGovernmentByUuid(uuid: string, localGovernment: LocalGovernment) { if (!localGovernment.bceidBusinessGuid) { throw new Error("Cannot load by governments that don't have guids"); } @@ -396,7 +395,7 @@ export class ApplicationSubmissionService { async getForGovernmentByFileId( fileNumber: string, - localGovernment: ApplicationLocalGovernment, + localGovernment: LocalGovernment, ) { if (!localGovernment.bceidBusinessGuid) { throw new Error("Cannot load by governments that don't have guids"); @@ -554,7 +553,7 @@ export class ApplicationSubmissionService { async mapToDTOs( apps: ApplicationSubmission[], user: User, - userGovernment?: ApplicationLocalGovernment, + userGovernment?: LocalGovernment, ) { const types = await this.applicationService.fetchApplicationTypes(); @@ -585,7 +584,7 @@ export class ApplicationSubmissionService { async mapToDetailedDTO( application: ApplicationSubmission, - userGovernment?: ApplicationLocalGovernment, + userGovernment?: LocalGovernment, ) { const types = await this.applicationService.fetchApplicationTypes(); const mappedApp = this.mapper.map( diff --git a/services/apps/alcs/src/portal/code/code.controller.spec.ts b/services/apps/alcs/src/portal/code/code.controller.spec.ts index 671d02300c..b97d56bbab 100644 --- a/services/apps/alcs/src/portal/code/code.controller.spec.ts +++ b/services/apps/alcs/src/portal/code/code.controller.spec.ts @@ -4,8 +4,8 @@ import { DeepMocked, createMock } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { ClsService } from 'nestjs-cls'; import { mockKeyCloakProviders } from '../../../test/mocks/mockTypes'; -import { ApplicationLocalGovernment } from '../../alcs/application/application-code/application-local-government/application-local-government.entity'; -import { ApplicationLocalGovernmentService } from '../../alcs/application/application-code/application-local-government/application-local-government.service'; +import { LocalGovernment } from '../../alcs/local-government/local-government.entity'; +import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; import { ApplicationDocumentService } from '../../alcs/application/application-document/application-document.service'; import { ApplicationService } from '../../alcs/application/application.service'; import { CardType } from '../../alcs/card/card-type/card-type.entity'; @@ -16,7 +16,7 @@ import { CodeController } from './code.controller'; describe('CodeController', () => { let portalController: CodeController; - let mockLgService: DeepMocked; + let mockLgService: DeepMocked; let mockAppService: DeepMocked; let mockCardService: DeepMocked; let mockAppDocService: DeepMocked; @@ -39,7 +39,7 @@ describe('CodeController', () => { providers: [ CodeController, { - provide: ApplicationLocalGovernmentService, + provide: LocalGovernmentService, useValue: mockLgService, }, { @@ -69,7 +69,7 @@ describe('CodeController', () => { portalController = app.get(CodeController); mockLgService.listActive.mockResolvedValue([ - new ApplicationLocalGovernment({ + new LocalGovernment({ uuid: 'fake-uuid', name: 'fake-name', isFirstNation: false, @@ -105,7 +105,7 @@ describe('CodeController', () => { it('should set the matches flag correctly when users guid matches government', async () => { const matchingGuid = 'guid'; mockLgService.listActive.mockResolvedValue([ - new ApplicationLocalGovernment({ + new LocalGovernment({ uuid: 'fake-uuid', name: 'fake-name', isFirstNation: false, diff --git a/services/apps/alcs/src/portal/code/code.controller.ts b/services/apps/alcs/src/portal/code/code.controller.ts index f4fe4dcf8f..2766f79064 100644 --- a/services/apps/alcs/src/portal/code/code.controller.ts +++ b/services/apps/alcs/src/portal/code/code.controller.ts @@ -1,8 +1,8 @@ import { Mapper } from '@automapper/core'; import { InjectMapper } from '@automapper/nestjs'; import { Controller, Get, Req, UseGuards } from '@nestjs/common'; -import { ApplicationLocalGovernment } from '../../alcs/application/application-code/application-local-government/application-local-government.entity'; -import { ApplicationLocalGovernmentService } from '../../alcs/application/application-code/application-local-government/application-local-government.service'; +import { LocalGovernment } from '../../alcs/local-government/local-government.entity'; +import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; import { DocumentCode } from '../../document/document-code.entity'; import { ApplicationDocumentService } from '../../alcs/application/application-document/application-document.service'; import { ApplicationService } from '../../alcs/application/application.service'; @@ -24,7 +24,7 @@ export interface LocalGovernmentDto { export class CodeController { constructor( @InjectMapper() private mapper: Mapper, - private localGovernmentService: ApplicationLocalGovernmentService, + private localGovernmentService: LocalGovernmentService, private applicationService: ApplicationService, private applicationDocumentService: ApplicationDocumentService, private cardService: CardService, @@ -61,7 +61,7 @@ export class CodeController { } private mapLocalGovernments( - governments: ApplicationLocalGovernment[], + governments: LocalGovernment[], user: User, ): LocalGovernmentDto[] { return governments.map((government) => ({ diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.controller.spec.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.controller.spec.ts new file mode 100644 index 0000000000..5cd63a99a3 --- /dev/null +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.controller.spec.ts @@ -0,0 +1,284 @@ +import { classes } from '@automapper/classes'; +import { AutomapperModule } from '@automapper/nestjs'; +import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; +import { Test, TestingModule } from '@nestjs/testing'; +import { ClsService } from 'nestjs-cls'; +import { mockKeyCloakProviders } from '../../../test/mocks/mockTypes'; +import { LocalGovernment } from '../../alcs/local-government/local-government.entity'; +import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; +import { NoticeOfIntentDocumentService } from '../../alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.service'; +import { NoticeOfIntent } from '../../alcs/notice-of-intent/notice-of-intent.entity'; +import { NoticeOfIntentSubmissionProfile } from '../../common/automapper/notice-of-intent-submission.automapper.profile'; +import { User } from '../../user/user.entity'; +import { NoticeOfIntentSubmissionController } from './notice-of-intent-submission.controller'; +import { + NoticeOfIntentSubmissionDetailedDto, + NoticeOfIntentSubmissionDto, +} from './notice-of-intent-submission.dto'; +import { NoticeOfIntentSubmission } from './notice-of-intent-submission.entity'; +import { NoticeOfIntentSubmissionService } from './notice-of-intent-submission.service'; + +describe('NoticeOfIntentSubmissionController', () => { + let controller: NoticeOfIntentSubmissionController; + let mockNoiSubmissionService: DeepMocked; + let mockDocumentService: DeepMocked; + let mockLgService: DeepMocked; + + const localGovernmentUuid = 'local-government'; + const applicant = 'fake-applicant'; + const bceidBusinessGuid = 'business-guid'; + + beforeEach(async () => { + mockNoiSubmissionService = createMock(); + mockDocumentService = createMock(); + mockLgService = createMock(); + + const module: TestingModule = await Test.createTestingModule({ + controllers: [NoticeOfIntentSubmissionController], + providers: [ + NoticeOfIntentSubmissionProfile, + { + provide: NoticeOfIntentSubmissionService, + useValue: mockNoiSubmissionService, + }, + { + provide: NoticeOfIntentDocumentService, + useValue: mockDocumentService, + }, + { + provide: LocalGovernmentService, + useValue: mockLgService, + }, + { + provide: ClsService, + useValue: {}, + }, + ...mockKeyCloakProviders, + ], + imports: [ + AutomapperModule.forRoot({ + strategyInitializer: classes(), + }), + ], + }).compile(); + + controller = module.get( + NoticeOfIntentSubmissionController, + ); + + mockNoiSubmissionService.update.mockResolvedValue( + new NoticeOfIntentSubmission({ + applicant: applicant, + localGovernmentUuid, + }), + ); + + mockNoiSubmissionService.create.mockResolvedValue('2'); + mockNoiSubmissionService.getIfCreatorByFileNumber.mockResolvedValue( + new NoticeOfIntentSubmission(), + ); + mockNoiSubmissionService.verifyAccessByFileId.mockResolvedValue( + new NoticeOfIntentSubmission(), + ); + mockNoiSubmissionService.verifyAccessByUuid.mockResolvedValue( + new NoticeOfIntentSubmission(), + ); + + mockNoiSubmissionService.mapToDTOs.mockResolvedValue([]); + mockLgService.list.mockResolvedValue([ + new LocalGovernment({ + uuid: localGovernmentUuid, + bceidBusinessGuid, + name: 'fake-name', + isFirstNation: false, + }), + ]); + }); + + it('should be defined', () => { + expect(controller).toBeDefined(); + }); + + it('should call out to service when fetching notice of intents', async () => { + mockNoiSubmissionService.getByUser.mockResolvedValue([]); + + const submissions = await controller.getSubmissions({ + user: { + entity: new User(), + }, + }); + + expect(submissions).toBeDefined(); + expect(mockNoiSubmissionService.getByUser).toHaveBeenCalledTimes(1); + }); + + it('should call out to service when cancelling an notice of intent', async () => { + const mockApplication = new NoticeOfIntentSubmission({}); + + mockNoiSubmissionService.mapToDTOs.mockResolvedValue([ + {} as NoticeOfIntentSubmissionDto, + ]); + mockNoiSubmissionService.verifyAccessByUuid.mockResolvedValue( + mockApplication, + ); + + const noticeOfIntentSubmission = await controller.cancel('file-id', { + user: { + entity: new User(), + }, + }); + + expect(noticeOfIntentSubmission).toBeDefined(); + //expect(mockNoiSubmissionService.cancel).toHaveBeenCalledTimes(1); + expect(mockNoiSubmissionService.verifyAccessByUuid).toHaveBeenCalledTimes( + 1, + ); + expect(mockNoiSubmissionService.verifyAccessByUuid).toHaveBeenCalledWith( + 'file-id', + new User(), + ); + }); + + // it('should throw an exception when trying to cancel a notice of intent that is not in progress', async () => { + // const mockNoi = new NoticeOfIntentSubmission(); + // mockNoiSubmissionService.verifyAccessByUuid.mockResolvedValue({ + // ...mockNoi, + // status: new ApplicationSubmissionStatusType({ + // code: SUBMISSION_STATUS.CANCELLED, + // }), + // } as any); + // + // const promise = controller.cancel('file-id', { + // user: { + // entity: new User(), + // }, + // }); + // + // await expect(promise).rejects.toMatchObject( + // new BadRequestException('Can only cancel in progress Applications'), + // ); + // //expect(mockNoiSubmissionService.cancel).toHaveBeenCalledTimes(0); + // expect(mockNoiSubmissionService.verifyAccessByUuid).toHaveBeenCalledTimes( + // 1, + // ); + // expect(mockNoiSubmissionService.verifyAccessByUuid).toHaveBeenCalledWith( + // 'file-id', + // new User(), + // ); + // }); + + it('should call out to service when fetching a notice of intent', async () => { + mockNoiSubmissionService.mapToDetailedDTO.mockResolvedValue( + {} as NoticeOfIntentSubmissionDetailedDto, + ); + + const noticeOfIntent = controller.getSubmission( + { + user: { + entity: new User(), + }, + }, + '', + ); + + expect(noticeOfIntent).toBeDefined(); + expect(mockNoiSubmissionService.verifyAccessByUuid).toHaveBeenCalledTimes( + 1, + ); + }); + + it('should fetch notice of intent by bceid if user has same guid as a local government', async () => { + mockNoiSubmissionService.mapToDetailedDTO.mockResolvedValue( + {} as NoticeOfIntentSubmissionDetailedDto, + ); + mockNoiSubmissionService.verifyAccessByUuid.mockResolvedValue( + new NoticeOfIntentSubmission({ + localGovernmentUuid: '', + }), + ); + + const noiSubmission = controller.getSubmission( + { + user: { + entity: new User({ + bceidBusinessGuid: 'guid', + }), + }, + }, + '', + ); + + expect(noiSubmission).toBeDefined(); + expect(mockNoiSubmissionService.verifyAccessByUuid).toHaveBeenCalledTimes( + 1, + ); + }); + + it('should call out to service when creating an notice of intent', async () => { + mockNoiSubmissionService.create.mockResolvedValue(''); + mockNoiSubmissionService.mapToDTOs.mockResolvedValue([ + {} as NoticeOfIntentSubmissionDto, + ]); + + const noiSubmission = await controller.create( + { + user: { + entity: new User(), + }, + }, + { + type: '', + }, + ); + + expect(noiSubmission).toBeDefined(); + expect(mockNoiSubmissionService.create).toHaveBeenCalledTimes(1); + }); + + it('should call out to service for update and map', async () => { + mockNoiSubmissionService.mapToDetailedDTO.mockResolvedValue( + {} as NoticeOfIntentSubmissionDetailedDto, + ); + + await controller.update( + 'file-id', + { + localGovernmentUuid, + applicant, + }, + { + user: { + entity: new User(), + }, + }, + ); + + expect(mockNoiSubmissionService.verifyAccessByUuid).toHaveBeenCalledTimes( + 1, + ); + expect(mockNoiSubmissionService.mapToDetailedDTO).toHaveBeenCalledTimes(1); + }); + + it('should call out to service on submitAlcs', async () => { + const mockFileId = 'file-id'; + mockNoiSubmissionService.submitToAlcs.mockResolvedValue( + new NoticeOfIntent(), + ); + mockNoiSubmissionService.getIfCreatorByUuid.mockResolvedValue( + new NoticeOfIntentSubmission({ + typeCode: 'TURP', + }), + ); + + await controller.submitAsApplicant(mockFileId, { + user: { + entity: new User(), + }, + }); + + expect(mockNoiSubmissionService.verifyAccessByUuid).toHaveBeenCalledTimes( + 1, + ); + expect(mockNoiSubmissionService.submitToAlcs).toHaveBeenCalledTimes(1); + }); +}); diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.controller.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.controller.ts new file mode 100644 index 0000000000..74a25c4db0 --- /dev/null +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.controller.ts @@ -0,0 +1,152 @@ +import { + Body, + Controller, + Get, + Logger, + Param, + Post, + Put, + Req, + UseGuards, +} from '@nestjs/common'; +import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; +import { PortalAuthGuard } from '../../common/authorization/portal-auth-guard.service'; +import { User } from '../../user/user.entity'; +import { + NoticeOfIntentSubmissionCreateDto, + NoticeOfIntentSubmissionUpdateDto, +} from './notice-of-intent-submission.dto'; +import { NoticeOfIntentSubmissionService } from './notice-of-intent-submission.service'; + +@Controller('notice-of-intent-submission') +@UseGuards(PortalAuthGuard) +export class NoticeOfIntentSubmissionController { + private logger: Logger = new Logger(NoticeOfIntentSubmissionController.name); + + constructor( + private noticeOfIntentSubmissionService: NoticeOfIntentSubmissionService, + ) {} + + @Get() + async getSubmissions(@Req() req) { + const user = req.user.entity as User; + + if (user.bceidBusinessGuid) { + //TODO: Business accounts? + } + + const applications = await this.noticeOfIntentSubmissionService.getByUser( + user, + ); + return this.noticeOfIntentSubmissionService.mapToDTOs(applications); + } + + @Get('/application/:fileId') + async getSubmissionByFileId(@Req() req, @Param('fileId') fileId: string) { + const user = req.user.entity as User; + + const submission = + await this.noticeOfIntentSubmissionService.verifyAccessByFileId( + fileId, + user, + ); + + return await this.noticeOfIntentSubmissionService.mapToDetailedDTO( + submission, + ); + } + + @Get('/:uuid') + async getSubmission(@Req() req, @Param('uuid') uuid: string) { + const user = req.user.entity as User; + + const submission = + await this.noticeOfIntentSubmissionService.verifyAccessByUuid(uuid, user); + + return await this.noticeOfIntentSubmissionService.mapToDetailedDTO( + submission, + ); + } + + @Post() + async create(@Req() req, @Body() body: NoticeOfIntentSubmissionCreateDto) { + const { type } = body; + const user = req.user.entity as User; + const newFileNumber = await this.noticeOfIntentSubmissionService.create( + type, + user, + ); + return { + fileId: newFileNumber, + }; + } + + @Put('/:uuid') + async update( + @Param('uuid') uuid: string, + @Body() updateDto: NoticeOfIntentSubmissionUpdateDto, + @Req() req, + ) { + const submission = + await this.noticeOfIntentSubmissionService.verifyAccessByUuid( + uuid, + req.user.entity, + ); + + const updatedSubmission = await this.noticeOfIntentSubmissionService.update( + submission.uuid, + updateDto, + ); + + return await this.noticeOfIntentSubmissionService.mapToDetailedDTO( + updatedSubmission, + ); + } + + @Post('/:uuid/cancel') + async cancel(@Param('uuid') uuid: string, @Req() req) { + const user = req.user.entity; + + const noticeOfIntentSubmission = + await this.noticeOfIntentSubmissionService.verifyAccessByUuid( + uuid, + req.user.entity, + ); + + //TODO: Hook this up + //await this.noticeOfIntentSubmissionService.cancel(noticeOfIntentSubmission); + + return { + cancelled: true, + }; + } + + @Post('/alcs/submit/:uuid') + async submitAsApplicant(@Param('uuid') uuid: string, @Req() req) { + const noticeOfIntentSubmission = + await this.noticeOfIntentSubmissionService.verifyAccessByUuid( + uuid, + req.user.entity, + ); + + const validationResult = { + noticeOfIntentSubmission, + errors: [], + }; + + if (validationResult) { + const validatedApplicationSubmission = + validationResult.noticeOfIntentSubmission; + await this.noticeOfIntentSubmissionService.submitToAlcs( + validatedApplicationSubmission, + ); + // return await this.noticeOfIntentSubmissionService.updateStatus( + // noticeOfIntentSubmission, + // SUBMISSION_STATUS.SUBMITTED_TO_ALC, + // ); + } else { + //this.logger.debug(validationResult.errors); + //throw new BadRequestException('Invalid Application'); + } + } +} diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.dto.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.dto.ts new file mode 100644 index 0000000000..f83d517ec9 --- /dev/null +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.dto.ts @@ -0,0 +1,146 @@ +import { AutoMap } from '@automapper/classes'; +import { + IsBoolean, + IsNotEmpty, + IsOptional, + IsString, + IsUUID, + MaxLength, +} from 'class-validator'; + +export const MAX_DESCRIPTION_FIELD_LENGTH = 4000; + +export class NoticeOfIntentSubmissionDto { + @AutoMap() + fileNumber: string; + + @AutoMap() + uuid: string; + + @AutoMap() + createdAt: number; + + @AutoMap() + updatedAt: number; + + @AutoMap() + applicant: string; + + @AutoMap() + localGovernmentUuid: string; + + @AutoMap() + type: string; + + canEdit: boolean; + canView: boolean; +} + +export class NoticeOfIntentSubmissionDetailedDto extends NoticeOfIntentSubmissionDto { + @AutoMap(() => String) + purpose: string | null; + @AutoMap() + parcelsAgricultureDescription: string; + @AutoMap() + parcelsAgricultureImprovementDescription: string; + @AutoMap() + parcelsNonAgricultureUseDescription: string; + @AutoMap() + northLandUseType: string; + @AutoMap() + northLandUseTypeDescription: string; + @AutoMap() + eastLandUseType: string; + @AutoMap() + eastLandUseTypeDescription: string; + @AutoMap() + southLandUseType: string; + @AutoMap() + southLandUseTypeDescription: string; + @AutoMap() + westLandUseType: string; + @AutoMap() + westLandUseTypeDescription: string; + @AutoMap(() => String) + primaryContactOwnerUuid?: string | null; +} + +export class NoticeOfIntentSubmissionCreateDto { + @IsString() + @IsNotEmpty() + type: string; + + @IsString() + @IsOptional() + prescribedBody?: string; +} + +export class NoticeOfIntentSubmissionUpdateDto { + @IsString() + @IsOptional() + applicant?: string; + + @IsString() + @IsOptional() + @MaxLength(MAX_DESCRIPTION_FIELD_LENGTH) + purpose?: string; + + @IsUUID() + @IsOptional() + localGovernmentUuid?: string; + + @IsString() + @IsOptional() + typeCode?: string; + + @IsString() + @IsOptional() + @MaxLength(MAX_DESCRIPTION_FIELD_LENGTH) + parcelsAgricultureDescription?: string; + + @IsString() + @IsOptional() + @MaxLength(MAX_DESCRIPTION_FIELD_LENGTH) + parcelsAgricultureImprovementDescription?: string; + + @IsString() + @IsOptional() + @MaxLength(MAX_DESCRIPTION_FIELD_LENGTH) + parcelsNonAgricultureUseDescription?: string; + + @IsString() + @IsOptional() + northLandUseType?: string; + + @IsString() + @IsOptional() + northLandUseTypeDescription?: string; + + @IsString() + @IsOptional() + eastLandUseType?: string; + + @IsString() + @IsOptional() + eastLandUseTypeDescription?: string; + + @IsString() + @IsOptional() + southLandUseType?: string; + + @IsString() + @IsOptional() + southLandUseTypeDescription?: string; + + @IsString() + @IsOptional() + westLandUseType?: string; + + @IsString() + @IsOptional() + westLandUseTypeDescription?: string; + + @IsBoolean() + @IsOptional() + hasOtherParcelsInCommunity?: boolean | null; +} diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.entity.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.entity.ts new file mode 100644 index 0000000000..8379f8e287 --- /dev/null +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.entity.ts @@ -0,0 +1,186 @@ +import { AutoMap } from '@automapper/classes'; +import { + Column, + Entity, + JoinColumn, + ManyToOne, + PrimaryGeneratedColumn, +} from 'typeorm'; +import { NoticeOfIntent } from '../../alcs/notice-of-intent/notice-of-intent.entity'; +import { Base } from '../../common/entities/base.entity'; +import { User } from '../../user/user.entity'; + +@Entity() +export class NoticeOfIntentSubmission extends Base { + constructor(data?: Partial) { + super(); + if (data) { + Object.assign(this, data); + } + } + + @AutoMap() + @PrimaryGeneratedColumn('uuid') + uuid: string; + + @AutoMap({}) + @Column({ + comment: 'File Number of attached application', + }) + fileNumber: string; + + @AutoMap({}) + @Column({ + comment: 'Indicates whether submission is currently draft or not', + default: false, + }) + isDraft: boolean; + + @AutoMap(() => String) + @Column({ + type: 'varchar', + comment: 'The Applicants name on the application', + nullable: true, + }) + applicant?: string | null; + + @AutoMap(() => String) + @Column({ + type: 'uuid', + comment: 'UUID from ALCS System of the Local Government', + nullable: true, + }) + localGovernmentUuid?: string | null; + + @AutoMap(() => String) + @Column({ + type: 'varchar', + comment: 'The Applicants name on the application', + nullable: true, + }) + purpose?: string | null; + + @AutoMap(() => String) + @Column({ + type: 'text', + comment: + 'Quantify and describe in detail all agriculture that currently takes place on the parcel(s).', + nullable: true, + }) + parcelsAgricultureDescription?: string | null; + + @AutoMap(() => String) + @Column({ + type: 'text', + comment: + 'Quantify and describe in detail all agricultural improvements made to the parcel(s).', + nullable: true, + }) + parcelsAgricultureImprovementDescription?: string | null; + + @AutoMap(() => String) + @Column({ + type: 'text', + comment: + 'Quantify and describe all non-agricultural uses that currently take place on the parcel(s).', + nullable: true, + }) + parcelsNonAgricultureUseDescription?: string | null; + + @AutoMap(() => String) + @Column({ + type: 'text', + comment: + 'The land uses surrounding the parcel(s) under application on the North.', + nullable: true, + }) + northLandUseType?: string | null; + + @AutoMap(() => String) + @Column({ + type: 'text', + comment: + 'Description of the land uses surrounding the parcel(s) under application on the North.', + nullable: true, + }) + northLandUseTypeDescription?: string | null; + + @AutoMap(() => String) + @Column({ + type: 'text', + comment: + 'The land uses surrounding the parcel(s) under application on the East.', + nullable: true, + }) + eastLandUseType?: string | null; + + @AutoMap(() => String) + @Column({ + type: 'text', + comment: + 'Description of the land uses surrounding the parcel(s) under application on the East.', + nullable: true, + }) + eastLandUseTypeDescription?: string | null; + + @AutoMap(() => String) + @Column({ + type: 'text', + comment: + 'The land uses surrounding the parcel(s) under application on the South.', + nullable: true, + }) + southLandUseType?: string | null; + + @AutoMap(() => String) + @Column({ + type: 'text', + comment: + 'Description of the land uses surrounding the parcel(s) under application on the South.', + nullable: true, + }) + southLandUseTypeDescription?: string | null; + + @AutoMap(() => String) + @Column({ + type: 'text', + comment: + 'The land uses surrounding the parcel(s) under application on the West.', + nullable: true, + }) + westLandUseType?: string | null; + + @AutoMap(() => String) + @Column({ + type: 'text', + comment: + 'Description of the land uses surrounding the parcel(s) under application on the West.', + nullable: true, + }) + westLandUseTypeDescription?: string | null; + + @AutoMap() + @ManyToOne(() => User) + createdBy: User; + + @Column({ + type: 'text', + nullable: true, + comment: 'Stores Uuid of Owner Selected as Primary Contact', + }) + primaryContactOwnerUuid?: string | null; + + @AutoMap() + @Column({ + comment: 'Notice of Intent Type Code', + }) + typeCode: string; + + @AutoMap(() => NoticeOfIntent) + @ManyToOne(() => NoticeOfIntent) + @JoinColumn({ + name: 'file_number', + referencedColumnName: 'fileNumber', + }) + noticeOfIntent: NoticeOfIntent; +} diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.module.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.module.ts new file mode 100644 index 0000000000..ee7ddf80ef --- /dev/null +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.module.ts @@ -0,0 +1,26 @@ +import { forwardRef, Module } from '@nestjs/common'; +import { TypeOrmModule } from '@nestjs/typeorm'; +import { BoardModule } from '../../alcs/board/board.module'; +import { LocalGovernmentModule } from '../../alcs/local-government/local-government.module'; +import { NoticeOfIntentModule } from '../../alcs/notice-of-intent/notice-of-intent.module'; +import { AuthorizationModule } from '../../common/authorization/authorization.module'; +import { DocumentModule } from '../../document/document.module'; +import { FileNumberModule } from '../../file-number/file-number.module'; +import { NoticeOfIntentSubmissionController } from './notice-of-intent-submission.controller'; +import { NoticeOfIntentSubmission } from './notice-of-intent-submission.entity'; +import { NoticeOfIntentSubmissionService } from './notice-of-intent-submission.service'; + +@Module({ + imports: [ + TypeOrmModule.forFeature([NoticeOfIntentSubmission]), + forwardRef(() => NoticeOfIntentModule), + AuthorizationModule, + forwardRef(() => DocumentModule), + forwardRef(() => BoardModule), + LocalGovernmentModule, + FileNumberModule, + ], + controllers: [NoticeOfIntentSubmissionController], + providers: [NoticeOfIntentSubmissionService], +}) +export class NoticeOfIntentSubmissionModule {} diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts new file mode 100644 index 0000000000..cb9c2ecb2d --- /dev/null +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts @@ -0,0 +1,244 @@ +import { BaseServiceException } from '@app/common/exceptions/base.exception'; +import { classes } from '@automapper/classes'; +import { AutomapperModule } from '@automapper/nestjs'; +import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; +import { Test, TestingModule } from '@nestjs/testing'; +import { getRepositoryToken } from '@nestjs/typeorm'; +import { Repository } from 'typeorm'; +import { NoticeOfIntentType } from '../../alcs/code/application-code/notice-of-intent-type/notice-of-intent-type.entity'; +import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; +import { NoticeOfIntentDocumentService } from '../../alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.service'; +import { NoticeOfIntent } from '../../alcs/notice-of-intent/notice-of-intent.entity'; +import { NoticeOfIntentService } from '../../alcs/notice-of-intent/notice-of-intent.service'; +import { NoticeOfIntentSubmissionProfile } from '../../common/automapper/notice-of-intent-submission.automapper.profile'; +import { FileNumberService } from '../../file-number/file-number.service'; +import { User } from '../../user/user.entity'; +import { NoticeOfIntentSubmission } from './notice-of-intent-submission.entity'; +import { NoticeOfIntentSubmissionService } from './notice-of-intent-submission.service'; + +describe('NoticeOfIntentSubmissionService', () => { + let service: NoticeOfIntentSubmissionService; + let mockRepository: DeepMocked>; + let mockNoiService: DeepMocked; + let mockLGService: DeepMocked; + let mockNoiDocService: DeepMocked; + let mockFileNumberService: DeepMocked; + + beforeEach(async () => { + mockRepository = createMock(); + mockNoiService = createMock(); + mockLGService = createMock(); + mockNoiDocService = createMock(); + mockFileNumberService = createMock(); + + const module: TestingModule = await Test.createTestingModule({ + imports: [ + AutomapperModule.forRoot({ + strategyInitializer: classes(), + }), + ], + providers: [ + NoticeOfIntentSubmissionService, + NoticeOfIntentSubmissionProfile, + { + provide: getRepositoryToken(NoticeOfIntentSubmission), + useValue: mockRepository, + }, + { + provide: NoticeOfIntentService, + useValue: mockNoiService, + }, + { + provide: LocalGovernmentService, + useValue: mockLGService, + }, + { + provide: NoticeOfIntentDocumentService, + useValue: mockNoiDocService, + }, + { + provide: FileNumberService, + useValue: mockFileNumberService, + }, + ], + }).compile(); + + service = module.get( + NoticeOfIntentSubmissionService, + ); + }); + + it('should be defined', () => { + expect(service).toBeDefined(); + }); + + it('should return the fetched application', async () => { + const application = new NoticeOfIntentSubmission(); + mockRepository.findOne.mockResolvedValue(application); + + const app = await service.getOrFailByFileNumber(''); + expect(app).toBe(application); + }); + + it('should return the fetched application when fetching with user', async () => { + const application = new NoticeOfIntentSubmission(); + mockRepository.findOne.mockResolvedValue(application); + + const app = await service.getIfCreatorByFileNumber('', new User()); + expect(app).toBe(application); + }); + + it('should throw an exception if the application is not found the fetched application', async () => { + mockRepository.findOne.mockResolvedValue(null); + + const promise = service.getIfCreatorByFileNumber('', new User()); + await expect(promise).rejects.toMatchObject( + new Error(`Failed to load application with File ID `), + ); + }); + + it("should throw an error if application doesn't exist", async () => { + mockRepository.findOne.mockResolvedValue(null); + + const promise = service.getOrFailByFileNumber(''); + await expect(promise).rejects.toMatchObject( + new Error('Failed to find document'), + ); + }); + + it('save a new noi for create', async () => { + const fileId = 'file-id'; + mockRepository.findOne.mockResolvedValue(null); + mockRepository.save.mockResolvedValue(new NoticeOfIntentSubmission()); + mockFileNumberService.generateNextFileNumber.mockResolvedValue(fileId); + mockNoiService.create.mockResolvedValue(new NoticeOfIntent()); + + const fileNumber = await service.create('type', new User()); + + expect(fileNumber).toEqual(fileId); + expect(mockRepository.save).toHaveBeenCalledTimes(1); + expect(mockNoiService.create).toHaveBeenCalledTimes(1); + }); + + it('should call through for get by user', async () => { + const application = new NoticeOfIntentSubmission(); + mockRepository.find.mockResolvedValue([application]); + + const res = await service.getByUser(new User()); + expect(mockRepository.find).toHaveBeenCalledTimes(1); + expect(res.length).toEqual(1); + expect(res[0]).toBe(application); + }); + + it('should call through for getByFileId', async () => { + const application = new NoticeOfIntentSubmission(); + mockRepository.findOne.mockResolvedValue(application); + + const res = await service.getByFileNumber('', new User()); + expect(mockRepository.findOne).toHaveBeenCalledTimes(1); + expect(res).toBe(application); + }); + + it('should use application type service for mapping DTOs', async () => { + const applicant = 'Bruce Wayne'; + const typeCode = 'fake-code'; + + mockNoiService.fetchTypes.mockResolvedValue([ + new NoticeOfIntentType({ + code: typeCode, + portalLabel: 'portalLabel', + htmlDescription: 'htmlDescription', + label: 'label', + }), + ]); + + const noiSubmission = new NoticeOfIntentSubmission({ + applicant, + typeCode: typeCode, + auditCreatedAt: new Date(), + }); + mockRepository.findOne.mockResolvedValue(noiSubmission); + + const res = await service.mapToDTOs([noiSubmission]); + expect(mockNoiService.fetchTypes).toHaveBeenCalledTimes(1); + expect(res[0].type).toEqual('label'); + expect(res[0].applicant).toEqual(applicant); + }); + + it('should fail on submitToAlcs if error', async () => { + const applicant = 'Bruce Wayne'; + const typeCode = 'fake-code'; + const fileNumber = 'fake'; + const localGovernmentUuid = 'fake-uuid'; + const noticeOfIntentSubmission = new NoticeOfIntentSubmission({ + fileNumber, + applicant, + typeCode, + localGovernmentUuid, + }); + + mockNoiService.submit.mockRejectedValue(new Error()); + + await expect( + service.submitToAlcs(noticeOfIntentSubmission), + ).rejects.toMatchObject( + new BaseServiceException(`Failed to submit application: ${fileNumber}`), + ); + }); + + it('should call out to service on submitToAlcs', async () => { + const applicant = 'Bruce Wayne'; + const typeCode = 'fake-code'; + const fileNumber = 'fake'; + const localGovernmentUuid = 'fake-uuid'; + const mockNoiSubmission = new NoticeOfIntentSubmission({ + fileNumber, + applicant, + typeCode, + localGovernmentUuid, + }); + const mockNoticeOfIntent = new NoticeOfIntent({ + dateSubmittedToAlc: new Date(), + }); + + mockNoiService.submit.mockResolvedValue(mockNoticeOfIntent); + await service.submitToAlcs(mockNoiSubmission); + + expect(mockNoiService.submit).toBeCalledTimes(1); + }); + + it('should update fields if notice of intent exists', async () => { + const applicant = 'Bruce Wayne'; + const typeCode = 'fake-code'; + const fileNumber = 'fake'; + const localGovernmentUuid = 'fake-uuid'; + + const mockNoiSubmission = new NoticeOfIntentSubmission({ + fileNumber, + applicant: 'incognito', + typeCode: 'fake', + localGovernmentUuid: 'uuid', + }); + + mockRepository.findOne.mockResolvedValue(mockNoiSubmission); + mockRepository.save.mockResolvedValue(mockNoiSubmission); + mockNoiService.update.mockResolvedValue(new NoticeOfIntent()); + + const result = await service.update(fileNumber, { + applicant, + typeCode, + localGovernmentUuid, + }); + + expect(mockRepository.save).toBeCalledTimes(1); + expect(mockRepository.findOne).toBeCalledTimes(2); + expect(result).toEqual( + new NoticeOfIntentSubmission({ + fileNumber, + applicant, + typeCode, + localGovernmentUuid, + }), + ); + }); +}); diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts new file mode 100644 index 0000000000..8a116f9c00 --- /dev/null +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts @@ -0,0 +1,344 @@ +import { + BaseServiceException, + ServiceNotFoundException, +} from '@app/common/exceptions/base.exception'; +import { Mapper } from '@automapper/core'; +import { InjectMapper } from '@automapper/nestjs'; +import { Injectable, Logger } from '@nestjs/common'; +import { InjectRepository } from '@nestjs/typeorm'; +import { FindOptionsRelations, Repository } from 'typeorm'; +import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; +import { NoticeOfIntentDocumentService } from '../../alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.service'; +import { NoticeOfIntentService } from '../../alcs/notice-of-intent/notice-of-intent.service'; +import { ROLES_ALLOWED_APPLICATIONS } from '../../common/authorization/roles'; +import { FileNumberService } from '../../file-number/file-number.service'; +import { User } from '../../user/user.entity'; +import { filterUndefined } from '../../utils/undefined'; +import { + NoticeOfIntentSubmissionDetailedDto, + NoticeOfIntentSubmissionDto, + NoticeOfIntentSubmissionUpdateDto, +} from './notice-of-intent-submission.dto'; +import { NoticeOfIntentSubmission } from './notice-of-intent-submission.entity'; + +@Injectable() +export class NoticeOfIntentSubmissionService { + private logger: Logger = new Logger(NoticeOfIntentSubmissionService.name); + + private DEFAULT_RELATIONS: FindOptionsRelations = { + //TODO + }; + + constructor( + @InjectRepository(NoticeOfIntentSubmission) + private noticeOfIntentSubmissionRepository: Repository, + private noticeOfIntentService: NoticeOfIntentService, + private localGovernmentService: LocalGovernmentService, + private noticeOfIntentDocumentService: NoticeOfIntentDocumentService, + private fileNumberService: FileNumberService, + @InjectMapper() private mapper: Mapper, + ) {} + + async getOrFailByFileNumber(fileNumber: string) { + const noticeOfIntent = + await this.noticeOfIntentSubmissionRepository.findOne({ + where: { + fileNumber, + isDraft: false, + }, + relations: this.DEFAULT_RELATIONS, + }); + if (!noticeOfIntent) { + throw new Error('Failed to find document'); + } + return noticeOfIntent; + } + + async getOrFailByUuid( + uuid: string, + relations: FindOptionsRelations = {}, + ) { + const noticeOfIntent = + await this.noticeOfIntentSubmissionRepository.findOne({ + where: { + uuid, + }, + relations, + }); + if (!noticeOfIntent) { + throw new Error('Failed to find document'); + } + return noticeOfIntent; + } + + async create(type: string, createdBy: User) { + const fileNumber = await this.fileNumberService.generateNextFileNumber(); + + await this.noticeOfIntentService.create({ + fileNumber, + applicant: 'Unknown', + typeCode: type, + }); + + //TODO: Set Initial Status here + + const noiSubmission = new NoticeOfIntentSubmission({ + fileNumber, + typeCode: type, + createdBy, + }); + + await this.noticeOfIntentSubmissionRepository.save(noiSubmission); + + return fileNumber; + } + + async update( + submissionUuid: string, + updateDto: NoticeOfIntentSubmissionUpdateDto, + ) { + const noticeOfIntentSubmission = await this.getOrFailByUuid(submissionUuid); + + noticeOfIntentSubmission.applicant = updateDto.applicant; + noticeOfIntentSubmission.purpose = filterUndefined( + updateDto.purpose, + noticeOfIntentSubmission.purpose, + ); + noticeOfIntentSubmission.typeCode = + updateDto.typeCode || noticeOfIntentSubmission.typeCode; + noticeOfIntentSubmission.localGovernmentUuid = + updateDto.localGovernmentUuid; + + await this.noticeOfIntentSubmissionRepository.save( + noticeOfIntentSubmission, + ); + + if (!noticeOfIntentSubmission.isDraft && updateDto.localGovernmentUuid) { + await this.noticeOfIntentService.update( + noticeOfIntentSubmission.fileNumber, + { + localGovernmentUuid: updateDto.localGovernmentUuid, + }, + ); + } + + return this.getOrFailByUuid(submissionUuid, this.DEFAULT_RELATIONS); + } + + // + // async submitToAlcs( + // application: ValidatedApplicationSubmission, + // user: User, + // applicationReview?: ApplicationSubmissionReview, + // ) { + // let submittedApp: Application | null = null; + // + // const shouldCreateCard = applicationReview?.isAuthorized ?? true; + // try { + // submittedApp = await this.noticeOfIntentService.submit( + // { + // fileNumber: application.fileNumber, + // applicant: application.applicant, + // localGovernmentUuid: application.localGovernmentUuid, + // typeCode: application.typeCode, + // dateSubmittedToAlc: new Date(), + // }, + // shouldCreateCard, + // ); + // + // await this.updateStatus( + // application, + // SUBMISSION_STATUS.SUBMITTED_TO_ALC, + // submittedApp.dateSubmittedToAlc, + // ); + // + // this.generateAndAttachPdfs( + // application.fileNumber, + // user, + // !!applicationReview, + // ); + // } catch (ex) { + // this.logger.error(ex); + // throw new BaseServiceException( + // `Failed to submit application: ${application.fileNumber}`, + // ); + // } + // + // return submittedApp; + // } + // + // private async generateAndAttachPdfs( + // fileNumber: string, + // user: User, + // hasReview: boolean, + // ) { + // try { + // await this.submissionDocumentGenerationService.generateAndAttach( + // fileNumber, + // user, + // ); + // + // if (hasReview) { + // await this.generateReviewDocumentService.generateAndAttach( + // fileNumber, + // user, + // ); + // } + // } catch (e) { + // this.logger.error(`Error generating the document on submission${e}`); + // } + // } + + getByUser(user: User) { + return this.noticeOfIntentSubmissionRepository.find({ + where: { + createdBy: { + uuid: user.uuid, + }, + isDraft: false, + }, + order: { + auditUpdatedAt: 'DESC', + }, + }); + } + + async getByFileNumber(fileNumber: string, user: User) { + return await this.noticeOfIntentSubmissionRepository.findOne({ + where: { + fileNumber, + createdBy: { + uuid: user.uuid, + }, + isDraft: false, + }, + relations: this.DEFAULT_RELATIONS, + }); + } + + async getByUuid(uuid: string) { + return await this.noticeOfIntentSubmissionRepository.findOne({ + where: { + uuid, + }, + relations: { + ...this.DEFAULT_RELATIONS, + createdBy: true, + }, + }); + } + + async getIfCreatorByFileNumber(fileNumber: string, user: User) { + const applicationSubmission = await this.getByFileNumber(fileNumber, user); + if (!applicationSubmission) { + throw new ServiceNotFoundException( + `Failed to load application with File ID ${fileNumber}`, + ); + } + return applicationSubmission; + } + + async getIfCreatorByUuid(uuid: string, user: User) { + const applicationSubmission = await this.getByUuid(uuid); + if ( + !applicationSubmission || + applicationSubmission.createdBy.uuid !== user.uuid + ) { + throw new ServiceNotFoundException( + `Failed to load application with ID ${uuid}`, + ); + } + return applicationSubmission; + } + + async verifyAccessByFileId(fileId: string, user: User) { + const overlappingRoles = ROLES_ALLOWED_APPLICATIONS.filter((value) => + user.clientRoles!.includes(value), + ); + if (overlappingRoles.length > 0) { + return await this.noticeOfIntentSubmissionRepository.findOneOrFail({ + where: { + fileNumber: fileId, + isDraft: false, + }, + relations: this.DEFAULT_RELATIONS, + }); + } + + return await this.getIfCreatorByFileNumber(fileId, user); + } + + async verifyAccessByUuid(submissionUuid: string, user: User) { + const overlappingRoles = ROLES_ALLOWED_APPLICATIONS.filter((value) => + user.clientRoles!.includes(value), + ); + if (overlappingRoles.length > 0) { + return await this.noticeOfIntentSubmissionRepository.findOneOrFail({ + where: { + uuid: submissionUuid, + }, + relations: { + ...this.DEFAULT_RELATIONS, + }, + }); + } + + return await this.getIfCreatorByUuid(submissionUuid, user); + } + + async mapToDTOs(apps: NoticeOfIntentSubmission[]) { + const types = await this.noticeOfIntentService.fetchTypes(); + + return apps.map((app) => { + return { + ...this.mapper.map( + app, + NoticeOfIntentSubmission, + NoticeOfIntentSubmissionDto, + ), + type: types.find((type) => type.code === app.typeCode)!.label, + canEdit: true, //TODO + canView: true, //TODO + }; + }); + } + + async mapToDetailedDTO(application: NoticeOfIntentSubmission) { + const types = await this.noticeOfIntentService.fetchTypes(); + const mappedApp = this.mapper.map( + application, + NoticeOfIntentSubmission, + NoticeOfIntentSubmissionDetailedDto, + ); + return { + ...mappedApp, + type: types.find((type) => type.code === application.typeCode)!.label, + canEdit: true, + canView: true, + }; + } + + async submitToAlcs(noticeOfIntent: NoticeOfIntentSubmission) { + try { + const submittedNoi = await this.noticeOfIntentService.submit({ + fileNumber: noticeOfIntent.fileNumber, + applicant: noticeOfIntent.applicant!, //TODO: Remove ! once validation is implemented + localGovernmentUuid: noticeOfIntent.localGovernmentUuid!, + typeCode: noticeOfIntent.typeCode, + dateSubmittedToAlc: new Date(), + }); + + // await this.updateStatus( + // application, + // SUBMISSION_STATUS.SUBMITTED_TO_ALC, + // submittedApp.dateSubmittedToAlc, + // ); + return submittedNoi; + } catch (ex) { + this.logger.error(ex); + throw new BaseServiceException( + `Failed to submit application: ${noticeOfIntent.fileNumber}`, + ); + } + } +} diff --git a/services/apps/alcs/src/portal/pdf-generation/generate-review-document.service.spec.ts b/services/apps/alcs/src/portal/pdf-generation/generate-review-document.service.spec.ts index de279896eb..39f548ea6e 100644 --- a/services/apps/alcs/src/portal/pdf-generation/generate-review-document.service.spec.ts +++ b/services/apps/alcs/src/portal/pdf-generation/generate-review-document.service.spec.ts @@ -3,7 +3,7 @@ import { classes } from '@automapper/classes'; import { AutomapperModule } from '@automapper/nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; -import { ApplicationLocalGovernmentService } from '../../alcs/application/application-code/application-local-government/application-local-government.service'; +import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; import { ApplicationDocumentService } from '../../alcs/application/application-document/application-document.service'; import { Application } from '../../alcs/application/application.entity'; import { ApplicationService } from '../../alcs/application/application.service'; @@ -21,7 +21,7 @@ describe('GenerateReviewDocumentService', () => { let service: GenerateReviewDocumentService; let mockCdogsService: DeepMocked; let mockApplicationSubmissionService: DeepMocked; - let mockApplicationLocalGovernmentService: DeepMocked; + let mockApplicationLocalGovernmentService: DeepMocked; let mockApplicationService: DeepMocked; let mockApplicationDocumentService: DeepMocked; let mockSubmissionReviewService: DeepMocked; @@ -49,7 +49,7 @@ describe('GenerateReviewDocumentService', () => { useValue: mockApplicationSubmissionService, }, { - provide: ApplicationLocalGovernmentService, + provide: LocalGovernmentService, useValue: mockApplicationLocalGovernmentService, }, { provide: ApplicationService, useValue: mockApplicationService }, diff --git a/services/apps/alcs/src/portal/pdf-generation/generate-review-document.service.ts b/services/apps/alcs/src/portal/pdf-generation/generate-review-document.service.ts index 991c900118..ab9b437617 100644 --- a/services/apps/alcs/src/portal/pdf-generation/generate-review-document.service.ts +++ b/services/apps/alcs/src/portal/pdf-generation/generate-review-document.service.ts @@ -6,7 +6,7 @@ import * as config from 'config'; import * as dayjs from 'dayjs'; import * as timezone from 'dayjs/plugin/timezone'; import * as utc from 'dayjs/plugin/utc'; -import { ApplicationLocalGovernmentService } from '../../alcs/application/application-code/application-local-government/application-local-government.service'; +import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; import { DOCUMENT_TYPE } from '../../document/document-code.entity'; import { ApplicationDocument, @@ -41,7 +41,7 @@ export class GenerateReviewDocumentService { @Inject(forwardRef(() => ApplicationSubmissionReviewService)) private applicationSubmissionReviewService: ApplicationSubmissionReviewService, private applicationService: ApplicationService, - private localGovernmentService: ApplicationLocalGovernmentService, + private localGovernmentService: LocalGovernmentService, @InjectMapper() private mapper: Mapper, ) {} diff --git a/services/apps/alcs/src/portal/pdf-generation/generate-submission-document.service.spec.ts b/services/apps/alcs/src/portal/pdf-generation/generate-submission-document.service.spec.ts index 69cf57d39a..099a47ba7b 100644 --- a/services/apps/alcs/src/portal/pdf-generation/generate-submission-document.service.spec.ts +++ b/services/apps/alcs/src/portal/pdf-generation/generate-submission-document.service.spec.ts @@ -6,7 +6,7 @@ import { Test, TestingModule } from '@nestjs/testing'; import * as dayjs from 'dayjs'; import * as timezone from 'dayjs/plugin/timezone'; import * as utc from 'dayjs/plugin/utc'; -import { ApplicationLocalGovernmentService } from '../../alcs/application/application-code/application-local-government/application-local-government.service'; +import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; import { DOCUMENT_TYPE } from '../../document/document-code.entity'; import { ApplicationDocument } from '../../alcs/application/application-document/application-document.entity'; import { ApplicationDocumentService } from '../../alcs/application/application-document/application-document.service'; @@ -30,7 +30,7 @@ describe('GenerateSubmissionDocumentService', () => { let service: GenerateSubmissionDocumentService; let mockCdogsService: DeepMocked; let mockApplicationSubmissionService: DeepMocked; - let mockApplicationLocalGovernmentService: DeepMocked; + let mockApplicationLocalGovernmentService: DeepMocked; let mockApplicationService: DeepMocked; let mockApplicationParcelService: DeepMocked; let mockApplicationOwnerService: DeepMocked; @@ -56,7 +56,7 @@ describe('GenerateSubmissionDocumentService', () => { useValue: mockApplicationSubmissionService, }, { - provide: ApplicationLocalGovernmentService, + provide: LocalGovernmentService, useValue: mockApplicationLocalGovernmentService, }, { provide: ApplicationService, useValue: mockApplicationService }, diff --git a/services/apps/alcs/src/portal/pdf-generation/generate-submission-document.service.ts b/services/apps/alcs/src/portal/pdf-generation/generate-submission-document.service.ts index 43ccf334f5..68992e01a4 100644 --- a/services/apps/alcs/src/portal/pdf-generation/generate-submission-document.service.ts +++ b/services/apps/alcs/src/portal/pdf-generation/generate-submission-document.service.ts @@ -9,7 +9,7 @@ import { } from '@nestjs/common'; import * as config from 'config'; import * as dayjs from 'dayjs'; -import { ApplicationLocalGovernmentService } from '../../alcs/application/application-code/application-local-government/application-local-government.service'; +import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; import { DOCUMENT_TYPE } from '../../document/document-code.entity'; import { ApplicationDocument, @@ -49,7 +49,7 @@ export class GenerateSubmissionDocumentService { private documentGenerationService: CdogsService, @Inject(forwardRef(() => ApplicationSubmissionService)) private applicationSubmissionService: ApplicationSubmissionService, - private localGovernmentService: ApplicationLocalGovernmentService, + private localGovernmentService: LocalGovernmentService, private applicationService: ApplicationService, @Inject(forwardRef(() => ApplicationParcelService)) private parcelService: ApplicationParcelService, diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1691185932823-add_noi_submissions.ts b/services/apps/alcs/src/providers/typeorm/migrations/1691185932823-add_noi_submissions.ts new file mode 100644 index 0000000000..aacbc8933a --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1691185932823-add_noi_submissions.ts @@ -0,0 +1,179 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class addNoiSubmissions1691185932823 implements MigrationInterface { + name = 'addNoiSubmissions1691185932823'; + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `ALTER TABLE "alcs"."application" DROP CONSTRAINT "FK_58853fcb8957e8b2c131cc12da1"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."covenant" DROP CONSTRAINT "FK_0fa742d800bc0e0b3f2451e0f0b"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent" DROP CONSTRAINT "FK_7e78db4d1c5afb16374253b42d4"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."planning_review" DROP CONSTRAINT "FK_5a57c8d407eb6132ed39cb8fe6f"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_local_government" RENAME TO "local_government"`, + ); + await queryRunner.query( + `CREATE TABLE "alcs"."notice_of_intent_type" ("audit_deleted_date_at" TIMESTAMP WITH TIME ZONE, "audit_created_at" TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now(), "audit_updated_at" TIMESTAMP WITH TIME ZONE DEFAULT now(), "audit_created_by" character varying NOT NULL, "audit_updated_by" character varying, "label" character varying NOT NULL, "code" text NOT NULL, "description" text NOT NULL, "short_label" character varying NOT NULL, "html_description" text NOT NULL DEFAULT '', "portal_label" text NOT NULL DEFAULT '', CONSTRAINT "UQ_2a02e4d5838272a54b4a9f7c9c8" UNIQUE ("description"), CONSTRAINT "PK_7b4b618e6aaf6c0205d36a5e2ca" PRIMARY KEY ("code"))`, + ); + await queryRunner.query( + `CREATE TABLE "alcs"."notice_of_intent_submission" ("audit_deleted_date_at" TIMESTAMP WITH TIME ZONE, "audit_created_at" TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now(), "audit_updated_at" TIMESTAMP WITH TIME ZONE DEFAULT now(), "audit_created_by" character varying NOT NULL, "audit_updated_by" character varying, "uuid" uuid NOT NULL DEFAULT gen_random_uuid(), "file_number" character varying NOT NULL, "is_draft" boolean NOT NULL DEFAULT false, "applicant" character varying, "local_government_uuid" uuid, "purpose" character varying, "parcels_agriculture_description" text, "parcels_agriculture_improvement_description" text, "parcels_non_agriculture_use_description" text, "north_land_use_type" text, "north_land_use_type_description" text, "east_land_use_type" text, "east_land_use_type_description" text, "south_land_use_type" text, "south_land_use_type_description" text, "west_land_use_type" text, "west_land_use_type_description" text, "primary_contact_owner_uuid" text, "type_code" character varying NOT NULL, "created_by_uuid" uuid, CONSTRAINT "PK_373b13feac5362050544ee1dd62" PRIMARY KEY ("uuid")); COMMENT ON COLUMN "alcs"."notice_of_intent_submission"."file_number" IS 'File Number of attached application'; COMMENT ON COLUMN "alcs"."notice_of_intent_submission"."is_draft" IS 'Indicates whether submission is currently draft or not'; COMMENT ON COLUMN "alcs"."notice_of_intent_submission"."applicant" IS 'The Applicants name on the application'; COMMENT ON COLUMN "alcs"."notice_of_intent_submission"."local_government_uuid" IS 'UUID from ALCS System of the Local Government'; COMMENT ON COLUMN "alcs"."notice_of_intent_submission"."purpose" IS 'The Applicants name on the application'; COMMENT ON COLUMN "alcs"."notice_of_intent_submission"."parcels_agriculture_description" IS 'Quantify and describe in detail all agriculture that currently takes place on the parcel(s).'; COMMENT ON COLUMN "alcs"."notice_of_intent_submission"."parcels_agriculture_improvement_description" IS 'Quantify and describe in detail all agricultural improvements made to the parcel(s).'; COMMENT ON COLUMN "alcs"."notice_of_intent_submission"."parcels_non_agriculture_use_description" IS 'Quantify and describe all non-agricultural uses that currently take place on the parcel(s).'; COMMENT ON COLUMN "alcs"."notice_of_intent_submission"."north_land_use_type" IS 'The land uses surrounding the parcel(s) under application on the North.'; COMMENT ON COLUMN "alcs"."notice_of_intent_submission"."north_land_use_type_description" IS 'Description of the land uses surrounding the parcel(s) under application on the North.'; COMMENT ON COLUMN "alcs"."notice_of_intent_submission"."east_land_use_type" IS 'The land uses surrounding the parcel(s) under application on the East.'; COMMENT ON COLUMN "alcs"."notice_of_intent_submission"."east_land_use_type_description" IS 'Description of the land uses surrounding the parcel(s) under application on the East.'; COMMENT ON COLUMN "alcs"."notice_of_intent_submission"."south_land_use_type" IS 'The land uses surrounding the parcel(s) under application on the South.'; COMMENT ON COLUMN "alcs"."notice_of_intent_submission"."south_land_use_type_description" IS 'Description of the land uses surrounding the parcel(s) under application on the South.'; COMMENT ON COLUMN "alcs"."notice_of_intent_submission"."west_land_use_type" IS 'The land uses surrounding the parcel(s) under application on the West.'; COMMENT ON COLUMN "alcs"."notice_of_intent_submission"."west_land_use_type_description" IS 'Description of the land uses surrounding the parcel(s) under application on the West.'; COMMENT ON COLUMN "alcs"."notice_of_intent_submission"."primary_contact_owner_uuid" IS 'Stores Uuid of Owner Selected as Primary Contact'; COMMENT ON COLUMN "alcs"."notice_of_intent_submission"."type_code" IS 'Notice of Intent Type Code'`, + ); + + //Add a type + await queryRunner.query(` + INSERT INTO "alcs"."notice_of_intent_type" ("audit_deleted_date_at", "audit_created_at", "audit_updated_at", "audit_created_by", "audit_updated_by", "label", "code", "description", "short_label", "html_description", "portal_label") VALUES + (NULL, NOW(), NULL, 'migration_seed', NULL, 'Placement of Fill', 'POFO', 'Placement of Fill Only', 'SOIL', 'Choose this option if you are only proposing to place fill on ALR land under + Section 20.3(1)(c) of the Agricultural Land Commission Act. +

+ Fill includes but is not limited to: +
    +
  • Aggregate
    • +
  • Topsoil
    • +
  • Structural Fill
    • +
  • Sand
    • +
  • Gravel
    • +
+ ', 'Placement of Fill within the ALR'), + (NULL, NOW(), NULL, 'migration_seed', NULL, 'Placement of Fill/Removal of Soil', 'PFRS', 'Placement of Fill and Removal of Soil', 'SOIL', 'Choose this option if you are proposing to remove soil and place fill on ALR land under + Section 20.3(1)(c) of the Agricultural Land Commission Act. +

+ Soil includes but is not limited to: +
    +
  • Aggregate Extraction
    • +
  • Placer Mining
    • +
  • Peat Extraction
    • +
  • Soil Removal
    • +
+
+ Fill includes but is not limited to: +
    +
  • Aggregate
    • +
  • Topsoil
    • +
  • Structural Fill
    • +
  • Sand
    • +
  • Gravel
    • +
+ ', 'Removal of Soil (Extraction) and Placement of Fill within the ALR'), + (NULL, NOW(), NULL, 'migration_seed', NULL, 'Removal of Soil', 'ROSO', 'Removal of Soil Only', 'SOIL', 'Choose this option if you are only proposing to remove soil from ALR land under + Section 20.3(1)(c) of the Agricultural Land Commission Act. +

+ Soil includes but is not limited to: +
    +
  • Aggregate Extraction
    • +
  • Placer Mining
    • +
  • Peat Extraction
    • +
  • Soil Removal
    • +
+ ', 'Removal of Soil (Extraction) within the ALR'); + `); + + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent" ADD "type_code" text NOT NULL DEFAULT 'POFO'`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent" ALTER COLUMN "type_code" DROP DEFAULT`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent" DROP CONSTRAINT "FK_d3247037b5d69365c94a6e5ddc9"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent" ALTER COLUMN "local_government_uuid" DROP NOT NULL`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent" ALTER COLUMN "region_code" DROP NOT NULL`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."local_government" ADD CONSTRAINT "FK_b1d9c7304c6cde02bc651fbd954" FOREIGN KEY ("preferred_region_code") REFERENCES "alcs"."application_region"("code") ON DELETE NO ACTION ON UPDATE NO ACTION`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application" ADD CONSTRAINT "FK_58853fcb8957e8b2c131cc12da1" FOREIGN KEY ("local_government_uuid") REFERENCES "alcs"."local_government"("uuid") ON DELETE NO ACTION ON UPDATE NO ACTION`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."covenant" ADD CONSTRAINT "FK_0fa742d800bc0e0b3f2451e0f0b" FOREIGN KEY ("local_government_uuid") REFERENCES "alcs"."local_government"("uuid") ON DELETE NO ACTION ON UPDATE NO ACTION`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent" ADD CONSTRAINT "FK_7e78db4d1c5afb16374253b42d4" FOREIGN KEY ("local_government_uuid") REFERENCES "alcs"."local_government"("uuid") ON DELETE NO ACTION ON UPDATE NO ACTION`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent" ADD CONSTRAINT "FK_d3247037b5d69365c94a6e5ddc9" FOREIGN KEY ("region_code") REFERENCES "alcs"."application_region"("code") ON DELETE NO ACTION ON UPDATE NO ACTION`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent" ADD CONSTRAINT "FK_7b4b618e6aaf6c0205d36a5e2ca" FOREIGN KEY ("type_code") REFERENCES "alcs"."notice_of_intent_type"("code") ON DELETE NO ACTION ON UPDATE NO ACTION`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."planning_review" ADD CONSTRAINT "FK_5a57c8d407eb6132ed39cb8fe6f" FOREIGN KEY ("local_government_uuid") REFERENCES "alcs"."local_government"("uuid") ON DELETE NO ACTION ON UPDATE NO ACTION`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" ADD CONSTRAINT "FK_ad65e20b0787e13906e0f36f1cf" FOREIGN KEY ("created_by_uuid") REFERENCES "alcs"."user"("uuid") ON DELETE NO ACTION ON UPDATE NO ACTION`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" ADD CONSTRAINT "FK_07e0aa0c43cb5a2bfc2c00282d4" FOREIGN KEY ("file_number") REFERENCES "alcs"."notice_of_intent"("file_number") ON DELETE NO ACTION ON UPDATE NO ACTION`, + ); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" DROP CONSTRAINT "FK_07e0aa0c43cb5a2bfc2c00282d4"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" DROP CONSTRAINT "FK_ad65e20b0787e13906e0f36f1cf"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."planning_review" DROP CONSTRAINT "FK_5a57c8d407eb6132ed39cb8fe6f"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent" DROP CONSTRAINT "FK_7b4b618e6aaf6c0205d36a5e2ca"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent" DROP CONSTRAINT "FK_d3247037b5d69365c94a6e5ddc9"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent" DROP CONSTRAINT "FK_7e78db4d1c5afb16374253b42d4"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."covenant" DROP CONSTRAINT "FK_0fa742d800bc0e0b3f2451e0f0b"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application" DROP CONSTRAINT "FK_58853fcb8957e8b2c131cc12da1"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."local_government" DROP CONSTRAINT "FK_b1d9c7304c6cde02bc651fbd954"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent" ALTER COLUMN "region_code" SET NOT NULL`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent" ALTER COLUMN "local_government_uuid" SET NOT NULL`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent" ADD CONSTRAINT "FK_d3247037b5d69365c94a6e5ddc9" FOREIGN KEY ("region_code") REFERENCES "alcs"."application_region"("code") ON DELETE NO ACTION ON UPDATE NO ACTION`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent" DROP COLUMN "type_code"`, + ); + await queryRunner.query(`DROP TABLE "alcs"."notice_of_intent_submission"`); + await queryRunner.query(`DROP TABLE "alcs"."notice_of_intent_type"`); + await queryRunner.query( + `ALTER TABLE "alcs"."local_government" RENAME TO "application_local_government"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."planning_review" ADD CONSTRAINT "FK_5a57c8d407eb6132ed39cb8fe6f" FOREIGN KEY ("local_government_uuid") REFERENCES "alcs"."application_local_government"("uuid") ON DELETE NO ACTION ON UPDATE NO ACTION`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent" ADD CONSTRAINT "FK_7e78db4d1c5afb16374253b42d4" FOREIGN KEY ("local_government_uuid") REFERENCES "alcs"."application_local_government"("uuid") ON DELETE NO ACTION ON UPDATE NO ACTION`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."covenant" ADD CONSTRAINT "FK_0fa742d800bc0e0b3f2451e0f0b" FOREIGN KEY ("local_government_uuid") REFERENCES "alcs"."application_local_government"("uuid") ON DELETE NO ACTION ON UPDATE NO ACTION`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application" ADD CONSTRAINT "FK_58853fcb8957e8b2c131cc12da1" FOREIGN KEY ("local_government_uuid") REFERENCES "alcs"."application_local_government"("uuid") ON DELETE NO ACTION ON UPDATE NO ACTION`, + ); + } +} diff --git a/services/apps/alcs/src/user/user.controller.spec.ts b/services/apps/alcs/src/user/user.controller.spec.ts index 25e4bffa35..5fdc849c28 100644 --- a/services/apps/alcs/src/user/user.controller.spec.ts +++ b/services/apps/alcs/src/user/user.controller.spec.ts @@ -3,7 +3,7 @@ import { AutomapperModule } from '@automapper/nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { ClsService } from 'nestjs-cls'; -import { ApplicationLocalGovernment } from '../alcs/application/application-code/application-local-government/application-local-government.entity'; +import { LocalGovernment } from '../alcs/local-government/local-government.entity'; import { UserProfile } from '../common/automapper/user.automapper.profile'; import { initMockUserDto, @@ -147,7 +147,7 @@ describe('UserController', () => { const governmentName = 'Government'; mockUserService.getUserLocalGovernment.mockResolvedValue( - new ApplicationLocalGovernment({ + new LocalGovernment({ name: governmentName, }), ); diff --git a/services/apps/alcs/src/user/user.module.ts b/services/apps/alcs/src/user/user.module.ts index 9269c64bdb..247e156a85 100644 --- a/services/apps/alcs/src/user/user.module.ts +++ b/services/apps/alcs/src/user/user.module.ts @@ -1,6 +1,6 @@ import { Module } from '@nestjs/common'; import { TypeOrmModule } from '@nestjs/typeorm'; -import { ApplicationLocalGovernment } from '../alcs/application/application-code/application-local-government/application-local-government.entity'; +import { LocalGovernment } from '../alcs/local-government/local-government.entity'; import { UserProfile } from '../common/automapper/user.automapper.profile'; import { EmailModule } from '../providers/email/email.module'; import { UserController } from './user.controller'; @@ -8,10 +8,7 @@ import { User } from './user.entity'; import { UserService } from './user.service'; @Module({ - imports: [ - TypeOrmModule.forFeature([ApplicationLocalGovernment, User]), - EmailModule, - ], + imports: [TypeOrmModule.forFeature([LocalGovernment, User]), EmailModule], providers: [UserService, UserProfile], exports: [UserService, EmailModule], controllers: [UserController], diff --git a/services/apps/alcs/src/user/user.service.spec.ts b/services/apps/alcs/src/user/user.service.spec.ts index fe94069eb8..7503389e71 100644 --- a/services/apps/alcs/src/user/user.service.spec.ts +++ b/services/apps/alcs/src/user/user.service.spec.ts @@ -8,7 +8,7 @@ import { getRepositoryToken } from '@nestjs/typeorm'; import * as config from 'config'; import { Repository } from 'typeorm'; import { initUserMockEntity } from '../../test/mocks/mockEntities'; -import { ApplicationLocalGovernment } from '../alcs/application/application-code/application-local-government/application-local-government.entity'; +import { LocalGovernment } from '../alcs/local-government/local-government.entity'; import { UserProfile } from '../common/automapper/user.automapper.profile'; import { EmailService } from '../providers/email/email.service'; import { User } from './user.entity'; @@ -17,9 +17,7 @@ import { UserService } from './user.service'; describe('UserService', () => { let service: UserService; let mockUserRepository: DeepMocked>; - let mockGovernmentRepository: DeepMocked< - Repository - >; + let mockGovernmentRepository: DeepMocked>; let emailServiceMock: DeepMocked; const email = 'bruce.wayne@gotham.com'; @@ -39,7 +37,7 @@ describe('UserService', () => { useValue: mockUserRepository, }, { - provide: getRepositoryToken(ApplicationLocalGovernment), + provide: getRepositoryToken(LocalGovernment), useValue: mockGovernmentRepository, }, { provide: EmailService, useValue: emailServiceMock }, @@ -152,9 +150,7 @@ describe('UserService', () => { }); it('should not call repository if user does not have a bc business guid', async () => { - mockGovernmentRepository.findOne.mockResolvedValue( - new ApplicationLocalGovernment(), - ); + mockGovernmentRepository.findOne.mockResolvedValue(new LocalGovernment()); const res = await service.getUserLocalGovernment(new User()); @@ -163,9 +159,7 @@ describe('UserService', () => { }); it('should call repository if user has a bc business guid', async () => { - mockGovernmentRepository.findOne.mockResolvedValue( - new ApplicationLocalGovernment(), - ); + mockGovernmentRepository.findOne.mockResolvedValue(new LocalGovernment()); const res = await service.getUserLocalGovernment( new User({ diff --git a/services/apps/alcs/src/user/user.service.ts b/services/apps/alcs/src/user/user.service.ts index be498d7f86..2679f3c729 100644 --- a/services/apps/alcs/src/user/user.service.ts +++ b/services/apps/alcs/src/user/user.service.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { IConfig } from 'config'; import { Repository } from 'typeorm'; -import { ApplicationLocalGovernment } from '../alcs/application/application-code/application-local-government/application-local-government.entity'; +import { LocalGovernment } from '../alcs/local-government/local-government.entity'; import { EmailService } from '../providers/email/email.service'; import { CreateUserDto } from './user.dto'; import { User } from './user.entity'; @@ -23,8 +23,8 @@ export class UserService { private userRepository: Repository, @InjectMapper() private userMapper: Mapper, private emailService: EmailService, - @InjectRepository(ApplicationLocalGovernment) - private localGovernmentRepository: Repository, + @InjectRepository(LocalGovernment) + private localGovernmentRepository: Repository, @Inject(CONFIG_TOKEN) private config: IConfig, ) {} From 23189b5e7d5644f9f1b8812c45916795f77a074b Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Tue, 8 Aug 2023 13:06:42 -0700 Subject: [PATCH 216/954] Code Review Feedback --- .../create-application-dialog.component.ts | 1 - .../alcs-application.controller.spec.ts | 1 - services/apps/alcs/src/main.module.ts | 3 -- .../notice-of-intent-submission.controller.ts | 2 + .../notice-of-intent-submission.entity.ts | 2 +- ...otice-of-intent-submission.service.spec.ts | 46 ++++++++++--------- .../notice-of-intent-submission.service.ts | 34 +++++++------- .../1691525221371-adjust_column_comments.ts | 23 ++++++++++ 8 files changed, 67 insertions(+), 45 deletions(-) create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1691525221371-adjust_column_comments.ts diff --git a/alcs-frontend/src/app/features/board/dialogs/application/create/create-application-dialog.component.ts b/alcs-frontend/src/app/features/board/dialogs/application/create/create-application-dialog.component.ts index 00381c5b77..d23960b1ab 100644 --- a/alcs-frontend/src/app/features/board/dialogs/application/create/create-application-dialog.component.ts +++ b/alcs-frontend/src/app/features/board/dialogs/application/create/create-application-dialog.component.ts @@ -49,7 +49,6 @@ export class CreateApplicationDialogComponent implements OnInit, OnDestroy { }); this.localGovernmentService.list().then((res) => { - debugger; this.localGovernments = res; }); } diff --git a/services/apps/alcs/src/alcs/obsolete-application-grpc/alcs-application.controller.spec.ts b/services/apps/alcs/src/alcs/obsolete-application-grpc/alcs-application.controller.spec.ts index 7f518855ae..8501f448f4 100644 --- a/services/apps/alcs/src/alcs/obsolete-application-grpc/alcs-application.controller.spec.ts +++ b/services/apps/alcs/src/alcs/obsolete-application-grpc/alcs-application.controller.spec.ts @@ -5,7 +5,6 @@ import { Test, TestingModule } from '@nestjs/testing'; import { ClsService } from 'nestjs-cls'; import { mockKeyCloakProviders } from '../../../test/mocks/mockTypes'; import { FileNumberService } from '../../file-number/file-number.service'; -import { ApplicationService } from '../application/application.service'; import { ApplicationGrpcController } from './alcs-application.controller'; describe('ApplicationGrpcController', () => { diff --git a/services/apps/alcs/src/main.module.ts b/services/apps/alcs/src/main.module.ts index ab4f586986..dcfb85af1c 100644 --- a/services/apps/alcs/src/main.module.ts +++ b/services/apps/alcs/src/main.module.ts @@ -11,14 +11,11 @@ import { ClsModule } from 'nestjs-cls'; import { LoggerModule } from 'nestjs-pino'; import { CdogsModule } from '../../../libs/common/src/cdogs/cdogs.module'; import { AlcsModule } from './alcs/alcs.module'; -import { LocalGovernmentController } from './alcs/local-government/local-government.controller'; -import { LocalGovernmentModule } from './alcs/local-government/local-government.module'; import { AuthorizationFilter } from './common/authorization/authorization.filter'; import { AuthorizationModule } from './common/authorization/authorization.module'; import { AuditSubscriber } from './common/entities/audit.subscriber'; import { DocumentModule } from './document/document.module'; import { FileNumberModule } from './file-number/file-number.module'; -import { FileNumberService } from './file-number/file-number.service'; import { HealthCheck } from './healthcheck/healthcheck.entity'; import { LogoutController } from './logout/logout.controller'; import { MainController } from './main.controller'; diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.controller.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.controller.ts index 74a25c4db0..38ab0f9f00 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.controller.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.controller.ts @@ -140,11 +140,13 @@ export class NoticeOfIntentSubmissionController { await this.noticeOfIntentSubmissionService.submitToAlcs( validatedApplicationSubmission, ); + //TODO: Uncomment when we add status // return await this.noticeOfIntentSubmissionService.updateStatus( // noticeOfIntentSubmission, // SUBMISSION_STATUS.SUBMITTED_TO_ALC, // ); } else { + //TODO: Uncomment when we add validation //this.logger.debug(validationResult.errors); //throw new BadRequestException('Invalid Application'); } diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.entity.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.entity.ts index 8379f8e287..b088547362 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.entity.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.entity.ts @@ -55,7 +55,7 @@ export class NoticeOfIntentSubmission extends Base { @AutoMap(() => String) @Column({ type: 'varchar', - comment: 'The Applicants name on the application', + comment: 'The purpose of the application', nullable: true, }) purpose?: string | null; diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts index cb9c2ecb2d..51c346abe8 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts @@ -72,37 +72,39 @@ describe('NoticeOfIntentSubmissionService', () => { expect(service).toBeDefined(); }); - it('should return the fetched application', async () => { - const application = new NoticeOfIntentSubmission(); - mockRepository.findOne.mockResolvedValue(application); + it('should return the fetched notice of intent', async () => { + const noiSubmission = new NoticeOfIntentSubmission(); + mockRepository.findOne.mockResolvedValue(noiSubmission); const app = await service.getOrFailByFileNumber(''); - expect(app).toBe(application); + expect(app).toBe(noiSubmission); }); - it('should return the fetched application when fetching with user', async () => { - const application = new NoticeOfIntentSubmission(); - mockRepository.findOne.mockResolvedValue(application); + it('should return the fetched notice of intent when fetching with user', async () => { + const noiSubmission = new NoticeOfIntentSubmission(); + mockRepository.findOne.mockResolvedValue(noiSubmission); const app = await service.getIfCreatorByFileNumber('', new User()); - expect(app).toBe(application); + expect(app).toBe(noiSubmission); }); - it('should throw an exception if the application is not found the fetched application', async () => { + it('should throw an exception if the notice of intent is not found', async () => { mockRepository.findOne.mockResolvedValue(null); - const promise = service.getIfCreatorByFileNumber('', new User()); + const promise = service.getIfCreatorByFileNumber('file-number', new User()); await expect(promise).rejects.toMatchObject( - new Error(`Failed to load application with File ID `), + new Error( + `Failed to load notice of intent submission with File ID file-number`, + ), ); }); - it("should throw an error if application doesn't exist", async () => { + it("should throw an error if notice of intent doesn't exist", async () => { mockRepository.findOne.mockResolvedValue(null); const promise = service.getOrFailByFileNumber(''); await expect(promise).rejects.toMatchObject( - new Error('Failed to find document'), + new Error('Failed to find notice of intent submission'), ); }); @@ -121,25 +123,25 @@ describe('NoticeOfIntentSubmissionService', () => { }); it('should call through for get by user', async () => { - const application = new NoticeOfIntentSubmission(); - mockRepository.find.mockResolvedValue([application]); + const noiSubmission = new NoticeOfIntentSubmission(); + mockRepository.find.mockResolvedValue([noiSubmission]); const res = await service.getByUser(new User()); expect(mockRepository.find).toHaveBeenCalledTimes(1); expect(res.length).toEqual(1); - expect(res[0]).toBe(application); + expect(res[0]).toBe(noiSubmission); }); it('should call through for getByFileId', async () => { - const application = new NoticeOfIntentSubmission(); - mockRepository.findOne.mockResolvedValue(application); + const noiSubmission = new NoticeOfIntentSubmission(); + mockRepository.findOne.mockResolvedValue(noiSubmission); const res = await service.getByFileNumber('', new User()); expect(mockRepository.findOne).toHaveBeenCalledTimes(1); - expect(res).toBe(application); + expect(res).toBe(noiSubmission); }); - it('should use application type service for mapping DTOs', async () => { + it('should use notice of intent type service for mapping DTOs', async () => { const applicant = 'Bruce Wayne'; const typeCode = 'fake-code'; @@ -182,7 +184,9 @@ describe('NoticeOfIntentSubmissionService', () => { await expect( service.submitToAlcs(noticeOfIntentSubmission), ).rejects.toMatchObject( - new BaseServiceException(`Failed to submit application: ${fileNumber}`), + new BaseServiceException( + `Failed to submit notice of intent: ${fileNumber}`, + ), ); }); diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts index 8a116f9c00..ca59616dbc 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts @@ -49,7 +49,7 @@ export class NoticeOfIntentSubmissionService { relations: this.DEFAULT_RELATIONS, }); if (!noticeOfIntent) { - throw new Error('Failed to find document'); + throw new Error('Failed to find notice of intent submission'); } return noticeOfIntent; } @@ -66,7 +66,7 @@ export class NoticeOfIntentSubmissionService { relations, }); if (!noticeOfIntent) { - throw new Error('Failed to find document'); + throw new Error('Failed to find submission'); } return noticeOfIntent; } @@ -125,7 +125,7 @@ export class NoticeOfIntentSubmissionService { return this.getOrFailByUuid(submissionUuid, this.DEFAULT_RELATIONS); } - // + //TODO: Uncomment when adding submitting // async submitToAlcs( // application: ValidatedApplicationSubmission, // user: User, @@ -229,26 +229,23 @@ export class NoticeOfIntentSubmissionService { } async getIfCreatorByFileNumber(fileNumber: string, user: User) { - const applicationSubmission = await this.getByFileNumber(fileNumber, user); - if (!applicationSubmission) { + const noiSubmission = await this.getByFileNumber(fileNumber, user); + if (!noiSubmission) { throw new ServiceNotFoundException( - `Failed to load application with File ID ${fileNumber}`, + `Failed to load notice of intent submission with File ID ${fileNumber}`, ); } - return applicationSubmission; + return noiSubmission; } async getIfCreatorByUuid(uuid: string, user: User) { - const applicationSubmission = await this.getByUuid(uuid); - if ( - !applicationSubmission || - applicationSubmission.createdBy.uuid !== user.uuid - ) { + const noiSubmission = await this.getByUuid(uuid); + if (!noiSubmission || noiSubmission.createdBy.uuid !== user.uuid) { throw new ServiceNotFoundException( - `Failed to load application with ID ${uuid}`, + `Failed to load notice of intent submission with ID ${uuid}`, ); } - return applicationSubmission; + return noiSubmission; } async verifyAccessByFileId(fileId: string, user: User) { @@ -303,16 +300,16 @@ export class NoticeOfIntentSubmissionService { }); } - async mapToDetailedDTO(application: NoticeOfIntentSubmission) { + async mapToDetailedDTO(noiSubmission: NoticeOfIntentSubmission) { const types = await this.noticeOfIntentService.fetchTypes(); const mappedApp = this.mapper.map( - application, + noiSubmission, NoticeOfIntentSubmission, NoticeOfIntentSubmissionDetailedDto, ); return { ...mappedApp, - type: types.find((type) => type.code === application.typeCode)!.label, + type: types.find((type) => type.code === noiSubmission.typeCode)!.label, canEdit: true, canView: true, }; @@ -328,6 +325,7 @@ export class NoticeOfIntentSubmissionService { dateSubmittedToAlc: new Date(), }); + //TODO: Uncomment once statuses are added // await this.updateStatus( // application, // SUBMISSION_STATUS.SUBMITTED_TO_ALC, @@ -337,7 +335,7 @@ export class NoticeOfIntentSubmissionService { } catch (ex) { this.logger.error(ex); throw new BaseServiceException( - `Failed to submit application: ${noticeOfIntent.fileNumber}`, + `Failed to submit notice of intent: ${noticeOfIntent.fileNumber}`, ); } } diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1691525221371-adjust_column_comments.ts b/services/apps/alcs/src/providers/typeorm/migrations/1691525221371-adjust_column_comments.ts new file mode 100644 index 0000000000..9619dd5e42 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1691525221371-adjust_column_comments.ts @@ -0,0 +1,23 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class adjustColumnComments1691525221371 implements MigrationInterface { + name = 'adjustColumnComments1691525221371'; + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `ALTER TABLE "alcs"."local_government" DROP CONSTRAINT "FK_b7e4525de796ada01f43f464d9d"`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."notice_of_intent_submission"."purpose" IS 'The purpose of the application'`, + ); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."notice_of_intent_submission"."purpose" IS 'The Applicants name on the application'`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."local_government" ADD CONSTRAINT "FK_b7e4525de796ada01f43f464d9d" FOREIGN KEY ("preferred_region_code") REFERENCES "alcs"."application_region"("code") ON DELETE NO ACTION ON UPDATE NO ACTION`, + ); + } +} From a310b5f189fd7e61923186e0e375660505ea3499 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Tue, 8 Aug 2023 09:25:15 -0700 Subject: [PATCH 217/954] Move applications to their own folder --- portal-frontend/src/app/app-routing.module.ts | 8 +++---- portal-frontend/src/app/app.module.ts | 12 +++++----- .../alcs-edit-submission.component.html | 0 .../alcs-edit-submission.component.scss | 4 ++-- .../alcs-edit-submission.component.spec.ts | 12 +++++----- .../alcs-edit-submission.component.ts | 22 +++++++++---------- .../alcs-edit-submission.module.ts | 4 ++-- .../confirm-publish-dialog.component.html | 0 .../confirm-publish-dialog.component.scss | 2 +- .../confirm-publish-dialog.component.spec.ts | 0 .../confirm-publish-dialog.component.ts | 0 ...ve-file-confirmation-dialog.component.html | 0 ...e-file-confirmation-dialog.component.scss} | 0 ...file-confirmation-dialog.component.spec.ts | 0 ...move-file-confirmation-dialog.component.ts | 0 .../application-details.component.html | 0 .../application-details.component.scss | 4 ++-- .../application-details.component.spec.ts | 12 +++++----- .../application-details.component.ts | 14 ++++++------ .../application-details.module.ts | 2 +- .../excl-details/excl-details.component.html | 0 .../excl-details/excl-details.component.scss | 0 .../excl-details.component.spec.ts | 4 ++-- .../excl-details/excl-details.component.ts | 6 ++--- .../incl-details/incl-details.component.html | 0 .../incl-details/incl-details.component.scss | 0 .../incl-details.component.spec.ts | 6 ++--- .../incl-details/incl-details.component.ts | 8 +++---- .../naru-details/naru-details.component.html | 0 .../naru-details/naru-details.component.scss | 2 +- .../naru-details.component.spec.ts | 4 ++-- .../naru-details/naru-details.component.ts | 6 ++--- .../nfu-details/nfu-details.component.html | 0 .../nfu-details/nfu-details.component.scss | 0 .../nfu-details/nfu-details.component.spec.ts | 0 .../nfu-details/nfu-details.component.ts | 2 +- .../parcel/parcel.component.html | 0 .../parcel/parcel.component.scss | 2 +- .../parcel/parcel.component.spec.ts | 8 +++---- .../parcel/parcel.component.ts | 20 ++++++++--------- .../pfrs-details/pfrs-details.component.html | 0 .../pfrs-details/pfrs-details.component.scss | 2 +- .../pfrs-details.component.spec.ts | 4 ++-- .../pfrs-details/pfrs-details.component.ts | 6 ++--- .../pofo-details/pofo-details.component.html | 0 .../pofo-details/pofo-details.component.scss | 2 +- .../pofo-details.component.spec.ts | 4 ++-- .../pofo-details/pofo-details.component.ts | 6 ++--- .../roso-details/roso-details.component.html | 0 .../roso-details/roso-details.component.scss | 2 +- .../roso-details.component.spec.ts | 4 ++-- .../roso-details/roso-details.component.ts | 6 ++--- .../subd-details/subd-details.component.html | 0 .../subd-details/subd-details.component.scss | 2 +- .../subd-details.component.spec.ts | 4 ++-- .../subd-details/subd-details.component.ts | 10 ++++----- .../tur-details/tur-details.component.html | 0 .../tur-details/tur-details.component.scss | 0 .../tur-details/tur-details.component.spec.ts | 2 +- .../tur-details/tur-details.component.ts | 6 ++--- ...nge-application-type-dialog.component.html | 0 ...nge-application-type-dialog.component.scss | 4 ++-- ...-application-type-dialog.component.spec.ts | 4 ++-- ...hange-application-type-dialog.component.ts | 8 +++---- .../edit-submission-base.module.ts | 2 +- .../edit-submission.component.html | 0 .../edit-submission.component.scss | 4 ++-- .../edit-submission.component.spec.ts | 12 +++++----- .../edit-submission.component.ts | 22 +++++++++---------- .../edit-submission/edit-submission.module.ts | 4 ++-- .../edit-submission/files-step.partial.ts | 6 ++--- .../land-use/land-use.component.html | 0 .../land-use/land-use.component.scss} | 4 ++-- .../land-use/land-use.component.spec.ts | 4 ++-- .../land-use/land-use.component.ts | 4 ++-- .../other-attachments.component.html | 0 .../other-attachments.component.scss | 4 ++-- .../other-attachments.component.spec.ts | 10 ++++----- .../other-attachments.component.ts | 8 +++---- ...-parcel-confirmation-dialog.component.html | 0 ...parcel-confirmation-dialog.component.scss} | 0 ...rcel-confirmation-dialog.component.spec.ts | 0 ...er-parcel-confirmation-dialog.component.ts | 0 .../other-parcels.component.html | 0 .../other-parcels.component.scss} | 4 ++-- .../other-parcels.component.spec.ts | 8 +++---- .../other-parcels/other-parcels.component.ts | 18 +++++++-------- ...lication-crown-owner-dialog.component.html | 0 ...lication-crown-owner-dialog.component.scss | 4 ++-- ...ation-crown-owner-dialog.component.spec.ts | 2 +- ...pplication-crown-owner-dialog.component.ts | 4 ++-- .../application-owner-dialog.component.html | 0 .../application-owner-dialog.component.scss | 4 ++-- ...application-owner-dialog.component.spec.ts | 6 ++--- .../application-owner-dialog.component.ts | 12 +++++----- .../application-owners-dialog.component.html | 0 .../application-owners-dialog.component.scss | 0 ...pplication-owners-dialog.component.spec.ts | 2 +- .../application-owners-dialog.component.ts | 4 ++-- .../delete-parcel-dialog.component.html | 0 .../delete-parcel-dialog.component.scss} | 0 .../delete-parcel-dialog.component.spec.ts | 2 +- .../delete-parcel-dialog.component.ts | 4 ++-- .../parcel-details.component.html | 0 .../parcel-details.component.scss | 0 .../parcel-details.component.spec.ts | 8 +++---- .../parcel-details.component.ts | 12 +++++----- ...l-entry-confirmation-dialog.component.html | 0 ...-entry-confirmation-dialog.component.scss} | 2 +- ...ntry-confirmation-dialog.component.spec.ts | 0 ...cel-entry-confirmation-dialog.component.ts | 0 .../parcel-entry/parcel-entry.component.html | 0 .../parcel-entry/parcel-entry.component.scss | 4 ++-- .../parcel-entry.component.spec.ts | 12 +++++----- .../parcel-entry/parcel-entry.component.ts | 18 +++++++-------- .../parcel-owners.component.html | 0 .../parcel-owners.component.scss | 4 ++-- .../parcel-owners.component.spec.ts | 4 ++-- .../parcel-owners/parcel-owners.component.ts | 6 ++--- .../primary-contact.component.html | 0 .../primary-contact.component.scss | 4 ++-- .../primary-contact.component.spec.ts | 14 ++++++------ .../primary-contact.component.ts | 12 +++++----- .../excl-proposal.component.html | 0 .../excl-proposal.component.scss | 2 +- .../excl-proposal.component.spec.ts | 8 +++---- .../excl-proposal/excl-proposal.component.ts | 10 ++++----- .../incl-proposal.component.html | 0 .../incl-proposal.component.scss | 2 +- .../incl-proposal.component.spec.ts | 12 +++++----- .../incl-proposal/incl-proposal.component.ts | 14 ++++++------ ...subtype-confirmation-dialog.component.html | 0 ...ubtype-confirmation-dialog.component.scss} | 2 +- ...type-confirmation-dialog.component.spec.ts | 0 ...e-subtype-confirmation-dialog.component.ts | 0 .../naru-proposal.component.html | 0 .../naru-proposal.component.scss | 2 +- .../naru-proposal.component.spec.ts | 10 ++++----- .../naru-proposal/naru-proposal.component.ts | 12 +++++----- .../nfu-proposal/nfu-proposal.component.html | 0 .../nfu-proposal/nfu-proposal.component.scss | 5 +++++ .../nfu-proposal.component.spec.ts | 4 ++-- .../nfu-proposal/nfu-proposal.component.ts | 6 ++--- .../pfrs-proposal.component.html | 0 .../pfrs-proposal.component.scss | 5 +++++ .../pfrs-proposal.component.spec.ts | 10 ++++----- .../pfrs-proposal/pfrs-proposal.component.ts | 14 ++++++------ .../pofo-proposal.component.html | 0 .../pofo-proposal.component.scss | 5 +++++ .../pofo-proposal.component.spec.ts | 10 ++++----- .../pofo-proposal/pofo-proposal.component.ts | 12 +++++----- .../roso-proposal.component.html | 0 .../roso-proposal.component.scss | 5 +++++ .../roso-proposal.component.spec.ts | 10 ++++----- .../roso-proposal/roso-proposal.component.ts | 12 +++++----- .../soil-table/soil-table.component.html | 0 .../soil-table/soil-table.component.scss | 2 +- .../soil-table/soil-table.component.spec.ts | 0 .../soil-table/soil-table.component.ts | 0 .../subd-proposal.component.html | 0 .../subd-proposal.component.scss | 2 +- .../subd-proposal.component.spec.ts | 10 ++++----- .../subd-proposal/subd-proposal.component.ts | 12 +++++----- .../tur-proposal/tur-proposal.component.html | 0 .../tur-proposal/tur-proposal.component.scss | 2 +- .../tur-proposal.component.spec.ts | 8 +++---- .../tur-proposal/tur-proposal.component.ts | 8 +++---- .../review-and-submit.component.html | 0 .../review-and-submit.component.scss | 0 .../review-and-submit.component.spec.ts | 10 ++++----- .../review-and-submit.component.ts | 12 +++++----- .../submit-confirmation-dialog.component.html | 0 .../submit-confirmation-dialog.component.scss | 2 +- ...bmit-confirmation-dialog.component.spec.ts | 0 .../submit-confirmation-dialog.component.ts | 0 .../select-government.component.html | 0 .../select-government.component.scss | 0 .../select-government.component.spec.ts | 6 ++--- .../select-government.component.ts | 6 ++--- .../edit-submission/step.partial.ts | 2 +- .../return-application-dialog.component.html | 0 .../return-application-dialog.component.scss | 4 ++-- ...eturn-application-dialog.component.spec.ts | 2 +- .../return-application-dialog.component.ts | 2 +- .../review-attachments.component.html | 0 .../review-attachments.component.scss} | 2 +- .../review-attachments.component.spec.ts | 8 +++---- .../review-attachments.component.ts | 8 +++---- .../review-contact-information.component.html | 0 .../review-contact-information.component.scss | 0 ...view-contact-information.component.spec.ts | 4 ++-- .../review-contact-information.component.ts | 2 +- .../review-ocp/review-ocp.component.html | 0 .../review-ocp/review-ocp.component.scss | 0 .../review-ocp/review-ocp.component.spec.ts | 4 ++-- .../review-ocp/review-ocp.component.ts | 2 +- .../review-resolution.component.html | 0 .../review-resolution.component.scss | 0 .../review-resolution.component.spec.ts | 4 ++-- .../review-resolution.component.ts | 2 +- .../review-submission.component.html | 0 .../review-submission.component.scss | 4 ++-- .../review-submission.component.spec.ts | 14 ++++++------ .../review-submission.component.ts | 18 +++++++-------- .../review-submission.module.ts | 4 ++-- .../review-submit-fng.component.html | 0 .../review-submit-fng.component.scss | 4 ++-- .../review-submit-fng.component.spec.ts | 14 ++++++------ .../review-submit-fng.component.ts | 16 +++++++------- .../review-submit.component.html | 0 .../review-submit.component.scss | 4 ++-- .../review-submit.component.spec.ts | 12 +++++----- .../review-submit/review-submit.component.ts | 16 +++++++------- .../review-zoning.component.html | 0 .../review-zoning.component.scss | 0 .../review-zoning.component.spec.ts | 4 ++-- .../review-zoning/review-zoning.component.ts | 2 +- .../alc-review/alc-review.component.html | 0 .../alc-review/alc-review.component.scss | 4 ++-- .../alc-review/alc-review.component.spec.ts | 2 +- .../alc-review/alc-review.component.ts | 6 ++--- .../decisions/decisions.component.html | 0 .../decisions/decisions.component.scss | 4 ++-- .../decisions/decisions.component.spec.ts | 2 +- .../decisions/decisions.component.ts | 4 ++-- .../submission-documents.component.html | 0 .../submission-documents.component.scss | 4 ++-- .../submission-documents.component.spec.ts | 2 +- .../submission-documents.component.ts | 4 ++-- .../lfng-review/lfng-review.component.html | 0 .../lfng-review/lfng-review.component.scss | 4 ++-- .../lfng-review/lfng-review.component.spec.ts | 12 +++++----- .../lfng-review/lfng-review.component.ts | 12 +++++----- .../view-submission.component.html | 0 .../view-submission.component.scss | 6 ++--- .../view-submission.component.spec.ts | 12 +++++----- .../view-submission.component.ts | 18 +++++++-------- .../land-use/land-use.component.scss | 5 ----- .../other-parcels.component.scss | 5 ----- .../nfu-proposal/nfu-proposal.component.scss | 5 ----- .../review-attachments.component.scss | 5 ----- 241 files changed, 512 insertions(+), 512 deletions(-) rename portal-frontend/src/app/features/{ => applications}/alcs-edit-submission/alcs-edit-submission.component.html (100%) rename portal-frontend/src/app/features/{ => applications}/alcs-edit-submission/alcs-edit-submission.component.scss (98%) rename portal-frontend/src/app/features/{ => applications}/alcs-edit-submission/alcs-edit-submission.component.spec.ts (75%) rename portal-frontend/src/app/features/{ => applications}/alcs-edit-submission/alcs-edit-submission.component.ts (90%) rename portal-frontend/src/app/features/{ => applications}/alcs-edit-submission/alcs-edit-submission.module.ts (88%) rename portal-frontend/src/app/features/{ => applications}/alcs-edit-submission/confirm-publish-dialog/confirm-publish-dialog.component.html (100%) rename portal-frontend/src/app/features/{ => applications}/alcs-edit-submission/confirm-publish-dialog/confirm-publish-dialog.component.scss (91%) rename portal-frontend/src/app/features/{ => applications}/alcs-edit-submission/confirm-publish-dialog/confirm-publish-dialog.component.spec.ts (100%) rename portal-frontend/src/app/features/{ => applications}/alcs-edit-submission/confirm-publish-dialog/confirm-publish-dialog.component.ts (100%) rename portal-frontend/src/app/features/{ => applications}/alcs-edit-submission/remove-file-confirmation-dialog/remove-file-confirmation-dialog.component.html (100%) rename portal-frontend/src/app/features/{edit-submission/other-parcels/other-parcel-confirmation-dialog/other-parcel-confirmation-dialog.component.scss => applications/alcs-edit-submission/remove-file-confirmation-dialog/remove-file-confirmation-dialog.component.scss} (100%) rename portal-frontend/src/app/features/{ => applications}/alcs-edit-submission/remove-file-confirmation-dialog/remove-file-confirmation-dialog.component.spec.ts (100%) rename portal-frontend/src/app/features/{ => applications}/alcs-edit-submission/remove-file-confirmation-dialog/remove-file-confirmation-dialog.component.ts (100%) rename portal-frontend/src/app/features/{ => applications}/application-details/application-details.component.html (100%) rename portal-frontend/src/app/features/{ => applications}/application-details/application-details.component.scss (96%) rename portal-frontend/src/app/features/{ => applications}/application-details/application-details.component.spec.ts (78%) rename portal-frontend/src/app/features/{ => applications}/application-details/application-details.component.ts (87%) rename portal-frontend/src/app/features/{ => applications}/application-details/application-details.module.ts (95%) rename portal-frontend/src/app/features/{ => applications}/application-details/excl-details/excl-details.component.html (100%) rename portal-frontend/src/app/features/{ => applications}/application-details/excl-details/excl-details.component.scss (100%) rename portal-frontend/src/app/features/{ => applications}/application-details/excl-details/excl-details.component.spec.ts (82%) rename portal-frontend/src/app/features/{ => applications}/application-details/excl-details/excl-details.component.ts (87%) rename portal-frontend/src/app/features/{ => applications}/application-details/incl-details/incl-details.component.html (100%) rename portal-frontend/src/app/features/{ => applications}/application-details/incl-details/incl-details.component.scss (100%) rename portal-frontend/src/app/features/{ => applications}/application-details/incl-details/incl-details.component.spec.ts (80%) rename portal-frontend/src/app/features/{ => applications}/application-details/incl-details/incl-details.component.ts (87%) rename portal-frontend/src/app/features/{ => applications}/application-details/naru-details/naru-details.component.html (100%) rename portal-frontend/src/app/features/{ => applications}/application-details/naru-details/naru-details.component.scss (77%) rename portal-frontend/src/app/features/{ => applications}/application-details/naru-details/naru-details.component.spec.ts (83%) rename portal-frontend/src/app/features/{ => applications}/application-details/naru-details/naru-details.component.ts (84%) rename portal-frontend/src/app/features/{ => applications}/application-details/nfu-details/nfu-details.component.html (100%) rename portal-frontend/src/app/features/{ => applications}/application-details/nfu-details/nfu-details.component.scss (100%) rename portal-frontend/src/app/features/{ => applications}/application-details/nfu-details/nfu-details.component.spec.ts (100%) rename portal-frontend/src/app/features/{ => applications}/application-details/nfu-details/nfu-details.component.ts (87%) rename portal-frontend/src/app/features/{ => applications}/application-details/parcel/parcel.component.html (100%) rename portal-frontend/src/app/features/{ => applications}/application-details/parcel/parcel.component.scss (93%) rename portal-frontend/src/app/features/{ => applications}/application-details/parcel/parcel.component.spec.ts (79%) rename portal-frontend/src/app/features/{ => applications}/application-details/parcel/parcel.component.ts (88%) rename portal-frontend/src/app/features/{ => applications}/application-details/pfrs-details/pfrs-details.component.html (100%) rename portal-frontend/src/app/features/{ => applications}/application-details/pfrs-details/pfrs-details.component.scss (83%) rename portal-frontend/src/app/features/{ => applications}/application-details/pfrs-details/pfrs-details.component.spec.ts (83%) rename portal-frontend/src/app/features/{ => applications}/application-details/pfrs-details/pfrs-details.component.ts (87%) rename portal-frontend/src/app/features/{ => applications}/application-details/pofo-details/pofo-details.component.html (100%) rename portal-frontend/src/app/features/{ => applications}/application-details/pofo-details/pofo-details.component.scss (77%) rename portal-frontend/src/app/features/{ => applications}/application-details/pofo-details/pofo-details.component.spec.ts (83%) rename portal-frontend/src/app/features/{ => applications}/application-details/pofo-details/pofo-details.component.ts (86%) rename portal-frontend/src/app/features/{ => applications}/application-details/roso-details/roso-details.component.html (100%) rename portal-frontend/src/app/features/{ => applications}/application-details/roso-details/roso-details.component.scss (77%) rename portal-frontend/src/app/features/{ => applications}/application-details/roso-details/roso-details.component.spec.ts (83%) rename portal-frontend/src/app/features/{ => applications}/application-details/roso-details/roso-details.component.ts (86%) rename portal-frontend/src/app/features/{ => applications}/application-details/subd-details/subd-details.component.html (100%) rename portal-frontend/src/app/features/{ => applications}/application-details/subd-details/subd-details.component.scss (79%) rename portal-frontend/src/app/features/{ => applications}/application-details/subd-details/subd-details.component.spec.ts (83%) rename portal-frontend/src/app/features/{ => applications}/application-details/subd-details/subd-details.component.ts (83%) rename portal-frontend/src/app/features/{ => applications}/application-details/tur-details/tur-details.component.html (100%) rename portal-frontend/src/app/features/{ => applications}/application-details/tur-details/tur-details.component.scss (100%) rename portal-frontend/src/app/features/{ => applications}/application-details/tur-details/tur-details.component.spec.ts (88%) rename portal-frontend/src/app/features/{ => applications}/application-details/tur-details/tur-details.component.ts (85%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/change-application-type-dialog/change-application-type-dialog.component.html (100%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/change-application-type-dialog/change-application-type-dialog.component.scss (94%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/change-application-type-dialog/change-application-type-dialog.component.spec.ts (87%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/change-application-type-dialog/change-application-type-dialog.component.ts (92%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/edit-submission-base.module.ts (98%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/edit-submission.component.html (100%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/edit-submission.component.scss (98%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/edit-submission.component.spec.ts (72%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/edit-submission.component.ts (91%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/edit-submission.module.ts (84%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/files-step.partial.ts (87%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/land-use/land-use.component.html (100%) rename portal-frontend/src/app/features/{edit-submission/proposal/roso-proposal/roso-proposal.component.scss => applications/edit-submission/land-use/land-use.component.scss} (55%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/land-use/land-use.component.spec.ts (86%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/land-use/land-use.component.ts (95%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/other-attachments/other-attachments.component.html (100%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/other-attachments/other-attachments.component.scss (83%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/other-attachments/other-attachments.component.spec.ts (79%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/other-attachments/other-attachments.component.ts (91%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/other-parcels/other-parcel-confirmation-dialog/other-parcel-confirmation-dialog.component.html (100%) rename portal-frontend/src/app/features/{edit-submission/parcel-details/parcel-entry/parcel-entry-confirmation-dialog/parcel-entry-confirmation-dialog.component.scss => applications/edit-submission/other-parcels/other-parcel-confirmation-dialog/other-parcel-confirmation-dialog.component.scss} (100%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/other-parcels/other-parcel-confirmation-dialog/other-parcel-confirmation-dialog.component.spec.ts (100%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/other-parcels/other-parcel-confirmation-dialog/other-parcel-confirmation-dialog.component.ts (100%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/other-parcels/other-parcels.component.html (100%) rename portal-frontend/src/app/features/{edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.scss => applications/edit-submission/other-parcels/other-parcels.component.scss} (57%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/other-parcels/other-parcels.component.spec.ts (82%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/other-parcels/other-parcels.component.ts (92%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/parcel-details/application-crown-owner-dialog/application-crown-owner-dialog.component.html (100%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/parcel-details/application-crown-owner-dialog/application-crown-owner-dialog.component.scss (72%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/parcel-details/application-crown-owner-dialog/application-crown-owner-dialog.component.spec.ts (92%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/parcel-details/application-crown-owner-dialog/application-crown-owner-dialog.component.ts (94%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/parcel-details/application-owner-dialog/application-owner-dialog.component.html (100%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/parcel-details/application-owner-dialog/application-owner-dialog.component.scss (75%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/parcel-details/application-owner-dialog/application-owner-dialog.component.spec.ts (85%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/parcel-details/application-owner-dialog/application-owner-dialog.component.ts (92%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/parcel-details/application-owners-dialog/application-owners-dialog.component.html (100%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/parcel-details/application-owners-dialog/application-owners-dialog.component.scss (100%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/parcel-details/application-owners-dialog/application-owners-dialog.component.spec.ts (91%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/parcel-details/application-owners-dialog/application-owners-dialog.component.ts (87%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/parcel-details/delete-parcel/delete-parcel-dialog.component.html (100%) rename portal-frontend/src/app/features/{edit-submission/proposal/naru-proposal/change-subtype-confirmation-dialog/change-subtype-confirmation-dialog.component.scss => applications/edit-submission/parcel-details/delete-parcel/delete-parcel-dialog.component.scss} (100%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/parcel-details/delete-parcel/delete-parcel-dialog.component.spec.ts (93%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/parcel-details/delete-parcel/delete-parcel-dialog.component.ts (91%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/parcel-details/parcel-details.component.html (100%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/parcel-details/parcel-details.component.scss (100%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/parcel-details/parcel-details.component.spec.ts (83%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/parcel-details/parcel-details.component.ts (92%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/parcel-details/parcel-entry/parcel-entry-confirmation-dialog/parcel-entry-confirmation-dialog.component.html (100%) rename portal-frontend/src/app/features/{alcs-edit-submission/remove-file-confirmation-dialog/remove-file-confirmation-dialog.component.scss => applications/edit-submission/parcel-details/parcel-entry/parcel-entry-confirmation-dialog/parcel-entry-confirmation-dialog.component.scss} (86%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/parcel-details/parcel-entry/parcel-entry-confirmation-dialog/parcel-entry-confirmation-dialog.component.spec.ts (100%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/parcel-details/parcel-entry/parcel-entry-confirmation-dialog/parcel-entry-confirmation-dialog.component.ts (100%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html (100%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/parcel-details/parcel-entry/parcel-entry.component.scss (94%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/parcel-details/parcel-entry/parcel-entry.component.spec.ts (79%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts (95%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/parcel-details/parcel-owners/parcel-owners.component.html (100%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/parcel-details/parcel-owners/parcel-owners.component.scss (66%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/parcel-details/parcel-owners/parcel-owners.component.spec.ts (82%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/parcel-details/parcel-owners/parcel-owners.component.ts (90%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/primary-contact/primary-contact.component.html (100%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/primary-contact/primary-contact.component.scss (90%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/primary-contact/primary-contact.component.spec.ts (74%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/primary-contact/primary-contact.component.ts (94%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/proposal/excl-proposal/excl-proposal.component.html (100%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/proposal/excl-proposal/excl-proposal.component.scss (66%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/proposal/excl-proposal/excl-proposal.component.spec.ts (79%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/proposal/excl-proposal/excl-proposal.component.ts (88%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/proposal/incl-proposal/incl-proposal.component.html (100%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/proposal/incl-proposal/incl-proposal.component.scss (66%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/proposal/incl-proposal/incl-proposal.component.spec.ts (74%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/proposal/incl-proposal/incl-proposal.component.ts (88%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/proposal/naru-proposal/change-subtype-confirmation-dialog/change-subtype-confirmation-dialog.component.html (100%) rename portal-frontend/src/app/features/{edit-submission/parcel-details/delete-parcel/delete-parcel-dialog.component.scss => applications/edit-submission/proposal/naru-proposal/change-subtype-confirmation-dialog/change-subtype-confirmation-dialog.component.scss} (86%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/proposal/naru-proposal/change-subtype-confirmation-dialog/change-subtype-confirmation-dialog.component.spec.ts (100%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/proposal/naru-proposal/change-subtype-confirmation-dialog/change-subtype-confirmation-dialog.component.ts (100%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/proposal/naru-proposal/naru-proposal.component.html (100%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/proposal/naru-proposal/naru-proposal.component.scss (82%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/proposal/naru-proposal/naru-proposal.component.spec.ts (76%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/proposal/naru-proposal/naru-proposal.component.ts (93%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/proposal/nfu-proposal/nfu-proposal.component.html (100%) create mode 100644 portal-frontend/src/app/features/applications/edit-submission/proposal/nfu-proposal/nfu-proposal.component.scss rename portal-frontend/src/app/features/{ => applications}/edit-submission/proposal/nfu-proposal/nfu-proposal.component.spec.ts (84%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/proposal/nfu-proposal/nfu-proposal.component.ts (94%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.html (100%) create mode 100644 portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.scss rename portal-frontend/src/app/features/{ => applications}/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.spec.ts (77%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.ts (93%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/proposal/pofo-proposal/pofo-proposal.component.html (100%) create mode 100644 portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.scss rename portal-frontend/src/app/features/{ => applications}/edit-submission/proposal/pofo-proposal/pofo-proposal.component.spec.ts (77%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/proposal/pofo-proposal/pofo-proposal.component.ts (91%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/proposal/roso-proposal/roso-proposal.component.html (100%) create mode 100644 portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.scss rename portal-frontend/src/app/features/{ => applications}/edit-submission/proposal/roso-proposal/roso-proposal.component.spec.ts (77%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/proposal/roso-proposal/roso-proposal.component.ts (91%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/proposal/soil-table/soil-table.component.html (100%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/proposal/soil-table/soil-table.component.scss (95%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/proposal/soil-table/soil-table.component.spec.ts (100%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/proposal/soil-table/soil-table.component.ts (100%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/proposal/subd-proposal/subd-proposal.component.html (100%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/proposal/subd-proposal/subd-proposal.component.scss (62%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/proposal/subd-proposal/subd-proposal.component.spec.ts (77%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/proposal/subd-proposal/subd-proposal.component.ts (89%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/proposal/tur-proposal/tur-proposal.component.html (100%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/proposal/tur-proposal/tur-proposal.component.scss (62%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/proposal/tur-proposal/tur-proposal.component.spec.ts (79%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/proposal/tur-proposal/tur-proposal.component.ts (90%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/review-and-submit/review-and-submit.component.html (100%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/review-and-submit/review-and-submit.component.scss (100%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/review-and-submit/review-and-submit.component.spec.ts (79%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/review-and-submit/review-and-submit.component.ts (79%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.html (100%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.scss (81%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.spec.ts (100%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.ts (100%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/select-government/select-government.component.html (100%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/select-government/select-government.component.scss (100%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/select-government/select-government.component.spec.ts (81%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/select-government/select-government.component.ts (94%) rename portal-frontend/src/app/features/{ => applications}/edit-submission/step.partial.ts (86%) rename portal-frontend/src/app/features/{ => applications}/review-submission/return-application-dialog/return-application-dialog.component.html (100%) rename portal-frontend/src/app/features/{ => applications}/review-submission/return-application-dialog/return-application-dialog.component.scss (93%) rename portal-frontend/src/app/features/{ => applications}/review-submission/return-application-dialog/return-application-dialog.component.spec.ts (90%) rename portal-frontend/src/app/features/{ => applications}/review-submission/return-application-dialog/return-application-dialog.component.ts (92%) rename portal-frontend/src/app/features/{ => applications}/review-submission/review-attachments/review-attachments.component.html (100%) rename portal-frontend/src/app/features/{edit-submission/proposal/pofo-proposal/pofo-proposal.component.scss => applications/review-submission/review-attachments/review-attachments.component.scss} (69%) rename portal-frontend/src/app/features/{ => applications}/review-submission/review-attachments/review-attachments.component.spec.ts (78%) rename portal-frontend/src/app/features/{ => applications}/review-submission/review-attachments/review-attachments.component.ts (91%) rename portal-frontend/src/app/features/{ => applications}/review-submission/review-contact-information/review-contact-information.component.html (100%) rename portal-frontend/src/app/features/{ => applications}/review-submission/review-contact-information/review-contact-information.component.scss (100%) rename portal-frontend/src/app/features/{ => applications}/review-submission/review-contact-information/review-contact-information.component.spec.ts (84%) rename portal-frontend/src/app/features/{ => applications}/review-submission/review-contact-information/review-contact-information.component.ts (96%) rename portal-frontend/src/app/features/{ => applications}/review-submission/review-ocp/review-ocp.component.html (100%) rename portal-frontend/src/app/features/{ => applications}/review-submission/review-ocp/review-ocp.component.scss (100%) rename portal-frontend/src/app/features/{ => applications}/review-submission/review-ocp/review-ocp.component.spec.ts (83%) rename portal-frontend/src/app/features/{ => applications}/review-submission/review-ocp/review-ocp.component.ts (96%) rename portal-frontend/src/app/features/{ => applications}/review-submission/review-resolution/review-resolution.component.html (100%) rename portal-frontend/src/app/features/{ => applications}/review-submission/review-resolution/review-resolution.component.scss (100%) rename portal-frontend/src/app/features/{ => applications}/review-submission/review-resolution/review-resolution.component.spec.ts (83%) rename portal-frontend/src/app/features/{ => applications}/review-submission/review-resolution/review-resolution.component.ts (95%) rename portal-frontend/src/app/features/{ => applications}/review-submission/review-submission.component.html (100%) rename portal-frontend/src/app/features/{ => applications}/review-submission/review-submission.component.scss (97%) rename portal-frontend/src/app/features/{ => applications}/review-submission/review-submission.component.spec.ts (77%) rename portal-frontend/src/app/features/{ => applications}/review-submission/review-submission.component.ts (89%) rename portal-frontend/src/app/features/{ => applications}/review-submission/review-submission.module.ts (92%) rename portal-frontend/src/app/features/{ => applications}/review-submission/review-submit-fng/review-submit-fng.component.html (100%) rename portal-frontend/src/app/features/{ => applications}/review-submission/review-submit-fng/review-submit-fng.component.scss (94%) rename portal-frontend/src/app/features/{ => applications}/review-submission/review-submit-fng/review-submit-fng.component.spec.ts (72%) rename portal-frontend/src/app/features/{ => applications}/review-submission/review-submit-fng/review-submit-fng.component.ts (85%) rename portal-frontend/src/app/features/{ => applications}/review-submission/review-submit/review-submit.component.html (100%) rename portal-frontend/src/app/features/{ => applications}/review-submission/review-submit/review-submit.component.scss (94%) rename portal-frontend/src/app/features/{ => applications}/review-submission/review-submit/review-submit.component.spec.ts (73%) rename portal-frontend/src/app/features/{ => applications}/review-submission/review-submit/review-submit.component.ts (89%) rename portal-frontend/src/app/features/{ => applications}/review-submission/review-zoning/review-zoning.component.html (100%) rename portal-frontend/src/app/features/{ => applications}/review-submission/review-zoning/review-zoning.component.scss (100%) rename portal-frontend/src/app/features/{ => applications}/review-submission/review-zoning/review-zoning.component.spec.ts (81%) rename portal-frontend/src/app/features/{ => applications}/review-submission/review-zoning/review-zoning.component.ts (97%) rename portal-frontend/src/app/features/{ => applications}/view-submission/alc-review/alc-review.component.html (100%) rename portal-frontend/src/app/features/{ => applications}/view-submission/alc-review/alc-review.component.scss (59%) rename portal-frontend/src/app/features/{ => applications}/view-submission/alc-review/alc-review.component.spec.ts (86%) rename portal-frontend/src/app/features/{ => applications}/view-submission/alc-review/alc-review.component.ts (81%) rename portal-frontend/src/app/features/{ => applications}/view-submission/alc-review/decisions/decisions.component.html (100%) rename portal-frontend/src/app/features/{ => applications}/view-submission/alc-review/decisions/decisions.component.scss (82%) rename portal-frontend/src/app/features/{ => applications}/view-submission/alc-review/decisions/decisions.component.spec.ts (88%) rename portal-frontend/src/app/features/{ => applications}/view-submission/alc-review/decisions/decisions.component.ts (80%) rename portal-frontend/src/app/features/{ => applications}/view-submission/alc-review/submission-documents/submission-documents.component.html (100%) rename portal-frontend/src/app/features/{ => applications}/view-submission/alc-review/submission-documents/submission-documents.component.scss (75%) rename portal-frontend/src/app/features/{ => applications}/view-submission/alc-review/submission-documents/submission-documents.component.spec.ts (89%) rename portal-frontend/src/app/features/{ => applications}/view-submission/alc-review/submission-documents/submission-documents.component.ts (86%) rename portal-frontend/src/app/features/{ => applications}/view-submission/lfng-review/lfng-review.component.html (100%) rename portal-frontend/src/app/features/{ => applications}/view-submission/lfng-review/lfng-review.component.scss (95%) rename portal-frontend/src/app/features/{ => applications}/view-submission/lfng-review/lfng-review.component.spec.ts (68%) rename portal-frontend/src/app/features/{ => applications}/view-submission/lfng-review/lfng-review.component.ts (87%) rename portal-frontend/src/app/features/{ => applications}/view-submission/view-submission.component.html (100%) rename portal-frontend/src/app/features/{ => applications}/view-submission/view-submission.component.scss (96%) rename portal-frontend/src/app/features/{ => applications}/view-submission/view-submission.component.spec.ts (76%) rename portal-frontend/src/app/features/{ => applications}/view-submission/view-submission.component.ts (79%) delete mode 100644 portal-frontend/src/app/features/edit-submission/land-use/land-use.component.scss delete mode 100644 portal-frontend/src/app/features/edit-submission/other-parcels/other-parcels.component.scss delete mode 100644 portal-frontend/src/app/features/edit-submission/proposal/nfu-proposal/nfu-proposal.component.scss delete mode 100644 portal-frontend/src/app/features/review-submission/review-attachments/review-attachments.component.scss diff --git a/portal-frontend/src/app/app-routing.module.ts b/portal-frontend/src/app/app-routing.module.ts index 8dab9039df..41b3578a9c 100644 --- a/portal-frontend/src/app/app-routing.module.ts +++ b/portal-frontend/src/app/app-routing.module.ts @@ -4,7 +4,7 @@ import { AuthorizationComponent } from './features/authorization/authorization.c import { HomeComponent } from './features/home/home.component'; import { LandingPageComponent } from './features/landing-page/landing-page.component'; import { LoginComponent } from './features/login/login.component'; -import { ViewSubmissionComponent } from './features/view-submission/view-submission.component'; +import { ViewSubmissionComponent } from './features/applications/view-submission/view-submission.component'; import { AlcsAuthGuard } from './services/authentication/alcs-auth.guard'; import { AuthGuard } from './services/authentication/auth.guard'; @@ -40,21 +40,21 @@ const routes: Routes = [ title: 'Edit Application', path: 'application/:fileId/edit', canActivate: [AuthGuard], - loadChildren: () => import('./features/edit-submission/edit-submission.module').then((m) => m.EditSubmissionModule), + loadChildren: () => import('./features/applications/edit-submission/edit-submission.module').then((m) => m.EditSubmissionModule), }, { title: 'ALCS Edit Application', path: 'alcs/application/:fileId/edit', canActivate: [AlcsAuthGuard], loadChildren: () => - import('./features/alcs-edit-submission/alcs-edit-submission.module').then((m) => m.AlcsEditSubmissionModule), + import('./features/applications/alcs-edit-submission/alcs-edit-submission.module').then((m) => m.AlcsEditSubmissionModule), }, { title: 'Review Application', path: 'application/:fileId/review', canActivate: [AuthGuard], loadChildren: () => - import('./features/review-submission/review-submission.module').then((m) => m.ReviewSubmissionModule), + import('./features/applications/review-submission/review-submission.module').then((m) => m.ReviewSubmissionModule), }, { path: '', redirectTo: '/login', pathMatch: 'full' }, ]; diff --git a/portal-frontend/src/app/app.module.ts b/portal-frontend/src/app/app.module.ts index d768dce4cd..25d2d3d63d 100644 --- a/portal-frontend/src/app/app.module.ts +++ b/portal-frontend/src/app/app.module.ts @@ -8,17 +8,17 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { provideNgxMask } from 'ngx-mask'; import { AppRoutingModule } from './app-routing.module'; import { AppComponent } from './app.component'; -import { ApplicationDetailsModule } from './features/application-details/application-details.module'; +import { ApplicationDetailsModule } from './features/applications/application-details/application-details.module'; import { AuthorizationComponent } from './features/authorization/authorization.component'; import { CreateApplicationDialogComponent } from './features/create-application-dialog/create-application-dialog.component'; import { ApplicationListComponent } from './features/home/application-list/application-list.component'; import { HomeComponent } from './features/home/home.component'; import { LandingPageComponent } from './features/landing-page/landing-page.component'; import { LoginComponent } from './features/login/login.component'; -import { AlcReviewComponent } from './features/view-submission/alc-review/alc-review.component'; -import { SubmissionDocumentsComponent } from './features/view-submission/alc-review/submission-documents/submission-documents.component'; -import { LfngReviewComponent } from './features/view-submission/lfng-review/lfng-review.component'; -import { ViewSubmissionComponent } from './features/view-submission/view-submission.component'; +import { AlcReviewComponent } from './features/applications/view-submission/alc-review/alc-review.component'; +import { SubmissionDocumentsComponent } from './features/applications/view-submission/alc-review/submission-documents/submission-documents.component'; +import { LfngReviewComponent } from './features/applications/view-submission/lfng-review/lfng-review.component'; +import { ViewSubmissionComponent } from './features/applications/view-submission/view-submission.component'; import { AuthInterceptorService } from './services/authentication/auth-interceptor.service'; import { TokenRefreshService } from './services/authentication/token-refresh.service'; import { ConfirmationDialogComponent } from './shared/confirmation-dialog/confirmation-dialog.component'; @@ -26,7 +26,7 @@ import { ConfirmationDialogService } from './shared/confirmation-dialog/confirma import { FooterComponent } from './shared/footer/footer.component'; import { HeaderComponent } from './shared/header/header.component'; import { SharedModule } from './shared/shared.module'; -import { DecisionsComponent } from './features/view-submission/alc-review/decisions/decisions.component'; +import { DecisionsComponent } from './features/applications/view-submission/alc-review/decisions/decisions.component'; @NgModule({ declarations: [ diff --git a/portal-frontend/src/app/features/alcs-edit-submission/alcs-edit-submission.component.html b/portal-frontend/src/app/features/applications/alcs-edit-submission/alcs-edit-submission.component.html similarity index 100% rename from portal-frontend/src/app/features/alcs-edit-submission/alcs-edit-submission.component.html rename to portal-frontend/src/app/features/applications/alcs-edit-submission/alcs-edit-submission.component.html diff --git a/portal-frontend/src/app/features/alcs-edit-submission/alcs-edit-submission.component.scss b/portal-frontend/src/app/features/applications/alcs-edit-submission/alcs-edit-submission.component.scss similarity index 98% rename from portal-frontend/src/app/features/alcs-edit-submission/alcs-edit-submission.component.scss rename to portal-frontend/src/app/features/applications/alcs-edit-submission/alcs-edit-submission.component.scss index 172d15447c..680d1f6272 100644 --- a/portal-frontend/src/app/features/alcs-edit-submission/alcs-edit-submission.component.scss +++ b/portal-frontend/src/app/features/applications/alcs-edit-submission/alcs-edit-submission.component.scss @@ -1,5 +1,5 @@ -@use '../../../styles/functions' as *; -@use '../../../styles/colors'; +@use '../../../../styles/functions' as *; +@use '../../../../styles/colors'; .header { margin: rem(24) 0; diff --git a/portal-frontend/src/app/features/alcs-edit-submission/alcs-edit-submission.component.spec.ts b/portal-frontend/src/app/features/applications/alcs-edit-submission/alcs-edit-submission.component.spec.ts similarity index 75% rename from portal-frontend/src/app/features/alcs-edit-submission/alcs-edit-submission.component.spec.ts rename to portal-frontend/src/app/features/applications/alcs-edit-submission/alcs-edit-submission.component.spec.ts index de987d58ff..296671f363 100644 --- a/portal-frontend/src/app/features/alcs-edit-submission/alcs-edit-submission.component.spec.ts +++ b/portal-frontend/src/app/features/applications/alcs-edit-submission/alcs-edit-submission.component.spec.ts @@ -3,14 +3,14 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MatAutocompleteModule } from '@angular/material/autocomplete'; import { RouterTestingModule } from '@angular/router/testing'; import { createMock, DeepMocked } from '@golevelup/ts-jest'; -import { ApplicationDocumentService } from '../../services/application-document/application-document.service'; -import { ApplicationSubmissionDraftService } from '../../services/application-submission/application-submission-draft.service'; -import { ApplicationSubmissionService } from '../../services/application-submission/application-submission.service'; -import { CodeService } from '../../services/code/code.service'; +import { ApplicationDocumentService } from '../../../services/application-document/application-document.service'; +import { ApplicationSubmissionDraftService } from '../../../services/application-submission/application-submission-draft.service'; +import { ApplicationSubmissionService } from '../../../services/application-submission/application-submission.service'; +import { CodeService } from '../../../services/code/code.service'; import { MatDialogModule } from '@angular/material/dialog'; -import { PdfGenerationService } from '../../services/pdf-generation/pdf-generation.service'; -import { ToastService } from '../../services/toast/toast.service'; +import { PdfGenerationService } from '../../../services/pdf-generation/pdf-generation.service'; +import { ToastService } from '../../../services/toast/toast.service'; import { AlcsEditSubmissionComponent } from './alcs-edit-submission.component'; describe('AlcsEditSubmissionComponent', () => { diff --git a/portal-frontend/src/app/features/alcs-edit-submission/alcs-edit-submission.component.ts b/portal-frontend/src/app/features/applications/alcs-edit-submission/alcs-edit-submission.component.ts similarity index 90% rename from portal-frontend/src/app/features/alcs-edit-submission/alcs-edit-submission.component.ts rename to portal-frontend/src/app/features/applications/alcs-edit-submission/alcs-edit-submission.component.ts index 32486f33ba..3fdefdbced 100644 --- a/portal-frontend/src/app/features/alcs-edit-submission/alcs-edit-submission.component.ts +++ b/portal-frontend/src/app/features/applications/alcs-edit-submission/alcs-edit-submission.component.ts @@ -4,16 +4,16 @@ import { MatDialog } from '@angular/material/dialog'; import { ActivatedRoute, Router } from '@angular/router'; import { getDiff } from 'recursive-diff'; import { BehaviorSubject, combineLatest, Observable, of, Subject, takeUntil } from 'rxjs'; -import { environment } from '../../../environments/environment'; -import { ApplicationDocumentDto } from '../../services/application-document/application-document.dto'; -import { ApplicationDocumentService } from '../../services/application-document/application-document.service'; -import { ApplicationSubmissionDraftService } from '../../services/application-submission/application-submission-draft.service'; -import { ApplicationSubmissionDetailedDto } from '../../services/application-submission/application-submission.dto'; -import { PdfGenerationService } from '../../services/pdf-generation/pdf-generation.service'; -import { ApplicationSubmissionService } from '../../services/application-submission/application-submission.service'; -import { ToastService } from '../../services/toast/toast.service'; -import { CustomStepperComponent } from '../../shared/custom-stepper/custom-stepper.component'; -import { OverlaySpinnerService } from '../../shared/overlay-spinner/overlay-spinner.service'; +import { environment } from '../../../../environments/environment'; +import { ApplicationDocumentDto } from '../../../services/application-document/application-document.dto'; +import { ApplicationDocumentService } from '../../../services/application-document/application-document.service'; +import { ApplicationSubmissionDraftService } from '../../../services/application-submission/application-submission-draft.service'; +import { ApplicationSubmissionDetailedDto } from '../../../services/application-submission/application-submission.dto'; +import { PdfGenerationService } from '../../../services/pdf-generation/pdf-generation.service'; +import { ApplicationSubmissionService } from '../../../services/application-submission/application-submission.service'; +import { ToastService } from '../../../services/toast/toast.service'; +import { CustomStepperComponent } from '../../../shared/custom-stepper/custom-stepper.component'; +import { OverlaySpinnerService } from '../../../shared/overlay-spinner/overlay-spinner.service'; import { EditApplicationSteps } from '../edit-submission/edit-submission.component'; import { LandUseComponent } from '../edit-submission/land-use/land-use.component'; import { OtherAttachmentsComponent } from '../edit-submission/other-attachments/other-attachments.component'; @@ -28,7 +28,7 @@ import { SubdProposalComponent } from '../edit-submission/proposal/subd-proposal import { TurProposalComponent } from '../edit-submission/proposal/tur-proposal/tur-proposal.component'; import { SelectGovernmentComponent } from '../edit-submission/select-government/select-government.component'; import { ConfirmPublishDialogComponent } from './confirm-publish-dialog/confirm-publish-dialog.component'; -import { scrollToElement } from '../../shared/utils/scroll-helper'; +import { scrollToElement } from '../../../shared/utils/scroll-helper'; import { ExclProposalComponent } from '../edit-submission/proposal/excl-proposal/excl-proposal.component'; import { InclProposalComponent } from '../edit-submission/proposal/incl-proposal/incl-proposal.component'; diff --git a/portal-frontend/src/app/features/alcs-edit-submission/alcs-edit-submission.module.ts b/portal-frontend/src/app/features/applications/alcs-edit-submission/alcs-edit-submission.module.ts similarity index 88% rename from portal-frontend/src/app/features/alcs-edit-submission/alcs-edit-submission.module.ts rename to portal-frontend/src/app/features/applications/alcs-edit-submission/alcs-edit-submission.module.ts index c20cb72dbf..1afea8940e 100644 --- a/portal-frontend/src/app/features/alcs-edit-submission/alcs-edit-submission.module.ts +++ b/portal-frontend/src/app/features/applications/alcs-edit-submission/alcs-edit-submission.module.ts @@ -1,8 +1,8 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { CanDeactivateGuard } from '../../shared/guard/can-deactivate.guard'; -import { SharedModule } from '../../shared/shared.module'; +import { CanDeactivateGuard } from '../../../shared/guard/can-deactivate.guard'; +import { SharedModule } from '../../../shared/shared.module'; import { EditSubmissionBaseModule } from '../edit-submission/edit-submission-base.module'; import { AlcsEditSubmissionComponent } from './alcs-edit-submission.component'; import { ConfirmPublishDialogComponent } from './confirm-publish-dialog/confirm-publish-dialog.component'; diff --git a/portal-frontend/src/app/features/alcs-edit-submission/confirm-publish-dialog/confirm-publish-dialog.component.html b/portal-frontend/src/app/features/applications/alcs-edit-submission/confirm-publish-dialog/confirm-publish-dialog.component.html similarity index 100% rename from portal-frontend/src/app/features/alcs-edit-submission/confirm-publish-dialog/confirm-publish-dialog.component.html rename to portal-frontend/src/app/features/applications/alcs-edit-submission/confirm-publish-dialog/confirm-publish-dialog.component.html diff --git a/portal-frontend/src/app/features/alcs-edit-submission/confirm-publish-dialog/confirm-publish-dialog.component.scss b/portal-frontend/src/app/features/applications/alcs-edit-submission/confirm-publish-dialog/confirm-publish-dialog.component.scss similarity index 91% rename from portal-frontend/src/app/features/alcs-edit-submission/confirm-publish-dialog/confirm-publish-dialog.component.scss rename to portal-frontend/src/app/features/applications/alcs-edit-submission/confirm-publish-dialog/confirm-publish-dialog.component.scss index 5baabab3ff..67d44d5da0 100644 --- a/portal-frontend/src/app/features/alcs-edit-submission/confirm-publish-dialog/confirm-publish-dialog.component.scss +++ b/portal-frontend/src/app/features/applications/alcs-edit-submission/confirm-publish-dialog/confirm-publish-dialog.component.scss @@ -1,4 +1,4 @@ -@use '../../../../styles/functions' as *; +@use '../../../../../styles/functions' as *; .mat-dialog-actions { justify-content: flex-end; diff --git a/portal-frontend/src/app/features/alcs-edit-submission/confirm-publish-dialog/confirm-publish-dialog.component.spec.ts b/portal-frontend/src/app/features/applications/alcs-edit-submission/confirm-publish-dialog/confirm-publish-dialog.component.spec.ts similarity index 100% rename from portal-frontend/src/app/features/alcs-edit-submission/confirm-publish-dialog/confirm-publish-dialog.component.spec.ts rename to portal-frontend/src/app/features/applications/alcs-edit-submission/confirm-publish-dialog/confirm-publish-dialog.component.spec.ts diff --git a/portal-frontend/src/app/features/alcs-edit-submission/confirm-publish-dialog/confirm-publish-dialog.component.ts b/portal-frontend/src/app/features/applications/alcs-edit-submission/confirm-publish-dialog/confirm-publish-dialog.component.ts similarity index 100% rename from portal-frontend/src/app/features/alcs-edit-submission/confirm-publish-dialog/confirm-publish-dialog.component.ts rename to portal-frontend/src/app/features/applications/alcs-edit-submission/confirm-publish-dialog/confirm-publish-dialog.component.ts diff --git a/portal-frontend/src/app/features/alcs-edit-submission/remove-file-confirmation-dialog/remove-file-confirmation-dialog.component.html b/portal-frontend/src/app/features/applications/alcs-edit-submission/remove-file-confirmation-dialog/remove-file-confirmation-dialog.component.html similarity index 100% rename from portal-frontend/src/app/features/alcs-edit-submission/remove-file-confirmation-dialog/remove-file-confirmation-dialog.component.html rename to portal-frontend/src/app/features/applications/alcs-edit-submission/remove-file-confirmation-dialog/remove-file-confirmation-dialog.component.html diff --git a/portal-frontend/src/app/features/edit-submission/other-parcels/other-parcel-confirmation-dialog/other-parcel-confirmation-dialog.component.scss b/portal-frontend/src/app/features/applications/alcs-edit-submission/remove-file-confirmation-dialog/remove-file-confirmation-dialog.component.scss similarity index 100% rename from portal-frontend/src/app/features/edit-submission/other-parcels/other-parcel-confirmation-dialog/other-parcel-confirmation-dialog.component.scss rename to portal-frontend/src/app/features/applications/alcs-edit-submission/remove-file-confirmation-dialog/remove-file-confirmation-dialog.component.scss diff --git a/portal-frontend/src/app/features/alcs-edit-submission/remove-file-confirmation-dialog/remove-file-confirmation-dialog.component.spec.ts b/portal-frontend/src/app/features/applications/alcs-edit-submission/remove-file-confirmation-dialog/remove-file-confirmation-dialog.component.spec.ts similarity index 100% rename from portal-frontend/src/app/features/alcs-edit-submission/remove-file-confirmation-dialog/remove-file-confirmation-dialog.component.spec.ts rename to portal-frontend/src/app/features/applications/alcs-edit-submission/remove-file-confirmation-dialog/remove-file-confirmation-dialog.component.spec.ts diff --git a/portal-frontend/src/app/features/alcs-edit-submission/remove-file-confirmation-dialog/remove-file-confirmation-dialog.component.ts b/portal-frontend/src/app/features/applications/alcs-edit-submission/remove-file-confirmation-dialog/remove-file-confirmation-dialog.component.ts similarity index 100% rename from portal-frontend/src/app/features/alcs-edit-submission/remove-file-confirmation-dialog/remove-file-confirmation-dialog.component.ts rename to portal-frontend/src/app/features/applications/alcs-edit-submission/remove-file-confirmation-dialog/remove-file-confirmation-dialog.component.ts diff --git a/portal-frontend/src/app/features/application-details/application-details.component.html b/portal-frontend/src/app/features/applications/application-details/application-details.component.html similarity index 100% rename from portal-frontend/src/app/features/application-details/application-details.component.html rename to portal-frontend/src/app/features/applications/application-details/application-details.component.html diff --git a/portal-frontend/src/app/features/application-details/application-details.component.scss b/portal-frontend/src/app/features/applications/application-details/application-details.component.scss similarity index 96% rename from portal-frontend/src/app/features/application-details/application-details.component.scss rename to portal-frontend/src/app/features/applications/application-details/application-details.component.scss index 07593da153..8df832ca0f 100644 --- a/portal-frontend/src/app/features/application-details/application-details.component.scss +++ b/portal-frontend/src/app/features/applications/application-details/application-details.component.scss @@ -1,5 +1,5 @@ -@use '../../../styles/functions' as *; -@use '../../../styles/colors'; +@use '../../../../styles/functions' as *; +@use '../../../../styles/colors'; :host::ng-deep { .view-grid-item { diff --git a/portal-frontend/src/app/features/application-details/application-details.component.spec.ts b/portal-frontend/src/app/features/applications/application-details/application-details.component.spec.ts similarity index 78% rename from portal-frontend/src/app/features/application-details/application-details.component.spec.ts rename to portal-frontend/src/app/features/applications/application-details/application-details.component.spec.ts index 640a2cd8b3..0554a68a05 100644 --- a/portal-frontend/src/app/features/application-details/application-details.component.spec.ts +++ b/portal-frontend/src/app/features/applications/application-details/application-details.component.spec.ts @@ -3,12 +3,12 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { Router } from '@angular/router'; import { DeepMocked, createMock } from '@golevelup/ts-jest'; import { BehaviorSubject } from 'rxjs'; -import { ApplicationDocumentDto } from '../../services/application-document/application-document.dto'; -import { ApplicationDocumentService } from '../../services/application-document/application-document.service'; -import { ApplicationSubmissionDetailedDto } from '../../services/application-submission/application-submission.dto'; -import { ApplicationSubmissionService } from '../../services/application-submission/application-submission.service'; -import { CodeService } from '../../services/code/code.service'; -import { ToastService } from '../../services/toast/toast.service'; +import { ApplicationDocumentDto } from '../../../services/application-document/application-document.dto'; +import { ApplicationDocumentService } from '../../../services/application-document/application-document.service'; +import { ApplicationSubmissionDetailedDto } from '../../../services/application-submission/application-submission.dto'; +import { ApplicationSubmissionService } from '../../../services/application-submission/application-submission.service'; +import { CodeService } from '../../../services/code/code.service'; +import { ToastService } from '../../../services/toast/toast.service'; import { ApplicationDetailsComponent } from './application-details.component'; diff --git a/portal-frontend/src/app/features/application-details/application-details.component.ts b/portal-frontend/src/app/features/applications/application-details/application-details.component.ts similarity index 87% rename from portal-frontend/src/app/features/application-details/application-details.component.ts rename to portal-frontend/src/app/features/applications/application-details/application-details.component.ts index 071fe7ed2f..c8ac8740c3 100644 --- a/portal-frontend/src/app/features/application-details/application-details.component.ts +++ b/portal-frontend/src/app/features/applications/application-details/application-details.component.ts @@ -5,13 +5,13 @@ import { ApplicationDocumentDto, DOCUMENT_SOURCE, DOCUMENT_TYPE, -} from '../../services/application-document/application-document.dto'; -import { ApplicationDocumentService } from '../../services/application-document/application-document.service'; -import { APPLICATION_OWNER, ApplicationOwnerDetailedDto } from '../../services/application-owner/application-owner.dto'; -import { PARCEL_TYPE } from '../../services/application-parcel/application-parcel.dto'; -import { ApplicationSubmissionDetailedDto } from '../../services/application-submission/application-submission.dto'; -import { LocalGovernmentDto } from '../../services/code/code.dto'; -import { CodeService } from '../../services/code/code.service'; +} from '../../../services/application-document/application-document.dto'; +import { ApplicationDocumentService } from '../../../services/application-document/application-document.service'; +import { APPLICATION_OWNER, ApplicationOwnerDetailedDto } from '../../../services/application-owner/application-owner.dto'; +import { PARCEL_TYPE } from '../../../services/application-parcel/application-parcel.dto'; +import { ApplicationSubmissionDetailedDto } from '../../../services/application-submission/application-submission.dto'; +import { LocalGovernmentDto } from '../../../services/code/code.dto'; +import { CodeService } from '../../../services/code/code.service'; @Component({ selector: 'app-application-details', diff --git a/portal-frontend/src/app/features/application-details/application-details.module.ts b/portal-frontend/src/app/features/applications/application-details/application-details.module.ts similarity index 95% rename from portal-frontend/src/app/features/application-details/application-details.module.ts rename to portal-frontend/src/app/features/applications/application-details/application-details.module.ts index 8a7ee11774..d7eac27fe1 100644 --- a/portal-frontend/src/app/features/application-details/application-details.module.ts +++ b/portal-frontend/src/app/features/applications/application-details/application-details.module.ts @@ -1,7 +1,7 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { NgxMaskPipe } from 'ngx-mask'; -import { SharedModule } from '../../shared/shared.module'; +import { SharedModule } from '../../../shared/shared.module'; import { ApplicationDetailsComponent } from './application-details.component'; import { InclDetailsComponent } from './incl-details/incl-details.component'; import { NaruDetailsComponent } from './naru-details/naru-details.component'; diff --git a/portal-frontend/src/app/features/application-details/excl-details/excl-details.component.html b/portal-frontend/src/app/features/applications/application-details/excl-details/excl-details.component.html similarity index 100% rename from portal-frontend/src/app/features/application-details/excl-details/excl-details.component.html rename to portal-frontend/src/app/features/applications/application-details/excl-details/excl-details.component.html diff --git a/portal-frontend/src/app/features/application-details/excl-details/excl-details.component.scss b/portal-frontend/src/app/features/applications/application-details/excl-details/excl-details.component.scss similarity index 100% rename from portal-frontend/src/app/features/application-details/excl-details/excl-details.component.scss rename to portal-frontend/src/app/features/applications/application-details/excl-details/excl-details.component.scss diff --git a/portal-frontend/src/app/features/application-details/excl-details/excl-details.component.spec.ts b/portal-frontend/src/app/features/applications/application-details/excl-details/excl-details.component.spec.ts similarity index 82% rename from portal-frontend/src/app/features/application-details/excl-details/excl-details.component.spec.ts rename to portal-frontend/src/app/features/applications/application-details/excl-details/excl-details.component.spec.ts index e021e28723..1f858adc91 100644 --- a/portal-frontend/src/app/features/application-details/excl-details/excl-details.component.spec.ts +++ b/portal-frontend/src/app/features/applications/application-details/excl-details/excl-details.component.spec.ts @@ -2,8 +2,8 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { DeepMocked } from '@golevelup/ts-jest'; import { ExclDetailsComponent } from './excl-details.component'; -import { ApplicationDocumentService } from '../../../services/application-document/application-document.service'; -import { ApplicationParcelService } from '../../../services/application-parcel/application-parcel.service'; +import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; +import { ApplicationParcelService } from '../../../../services/application-parcel/application-parcel.service'; describe('ExclDetailsComponent', () => { let component: ExclDetailsComponent; diff --git a/portal-frontend/src/app/features/application-details/excl-details/excl-details.component.ts b/portal-frontend/src/app/features/applications/application-details/excl-details/excl-details.component.ts similarity index 87% rename from portal-frontend/src/app/features/application-details/excl-details/excl-details.component.ts rename to portal-frontend/src/app/features/applications/application-details/excl-details/excl-details.component.ts index d7ea9ecdf9..0d9ce89d03 100644 --- a/portal-frontend/src/app/features/application-details/excl-details/excl-details.component.ts +++ b/portal-frontend/src/app/features/applications/application-details/excl-details/excl-details.component.ts @@ -1,8 +1,8 @@ import { Component, Input } from '@angular/core'; import { Router } from '@angular/router'; -import { ApplicationDocumentService } from '../../../services/application-document/application-document.service'; -import { ApplicationSubmissionDetailedDto } from '../../../services/application-submission/application-submission.dto'; -import { ApplicationDocumentDto, DOCUMENT_TYPE } from '../../../services/application-document/application-document.dto'; +import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; +import { ApplicationSubmissionDetailedDto } from '../../../../services/application-submission/application-submission.dto'; +import { ApplicationDocumentDto, DOCUMENT_TYPE } from '../../../../services/application-document/application-document.dto'; @Component({ selector: 'app-excl-details', diff --git a/portal-frontend/src/app/features/application-details/incl-details/incl-details.component.html b/portal-frontend/src/app/features/applications/application-details/incl-details/incl-details.component.html similarity index 100% rename from portal-frontend/src/app/features/application-details/incl-details/incl-details.component.html rename to portal-frontend/src/app/features/applications/application-details/incl-details/incl-details.component.html diff --git a/portal-frontend/src/app/features/application-details/incl-details/incl-details.component.scss b/portal-frontend/src/app/features/applications/application-details/incl-details/incl-details.component.scss similarity index 100% rename from portal-frontend/src/app/features/application-details/incl-details/incl-details.component.scss rename to portal-frontend/src/app/features/applications/application-details/incl-details/incl-details.component.scss diff --git a/portal-frontend/src/app/features/application-details/incl-details/incl-details.component.spec.ts b/portal-frontend/src/app/features/applications/application-details/incl-details/incl-details.component.spec.ts similarity index 80% rename from portal-frontend/src/app/features/application-details/incl-details/incl-details.component.spec.ts rename to portal-frontend/src/app/features/applications/application-details/incl-details/incl-details.component.spec.ts index beb030ce61..d49a691006 100644 --- a/portal-frontend/src/app/features/application-details/incl-details/incl-details.component.spec.ts +++ b/portal-frontend/src/app/features/applications/application-details/incl-details/incl-details.component.spec.ts @@ -1,9 +1,9 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { BehaviorSubject } from 'rxjs'; -import { ApplicationDocumentService } from '../../../services/application-document/application-document.service'; -import { UserDto } from '../../../services/authentication/authentication.dto'; -import { AuthenticationService } from '../../../services/authentication/authentication.service'; +import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; +import { UserDto } from '../../../../services/authentication/authentication.dto'; +import { AuthenticationService } from '../../../../services/authentication/authentication.service'; import { InclDetailsComponent } from './incl-details.component'; describe('InclDetailsComponent', () => { diff --git a/portal-frontend/src/app/features/application-details/incl-details/incl-details.component.ts b/portal-frontend/src/app/features/applications/application-details/incl-details/incl-details.component.ts similarity index 87% rename from portal-frontend/src/app/features/application-details/incl-details/incl-details.component.ts rename to portal-frontend/src/app/features/applications/application-details/incl-details/incl-details.component.ts index d248a469a5..b81fd9271c 100644 --- a/portal-frontend/src/app/features/application-details/incl-details/incl-details.component.ts +++ b/portal-frontend/src/app/features/applications/application-details/incl-details/incl-details.component.ts @@ -1,10 +1,10 @@ import { Component, Input, OnDestroy, OnInit } from '@angular/core'; import { Router } from '@angular/router'; import { Subject, takeUntil } from 'rxjs'; -import { ApplicationDocumentService } from '../../../services/application-document/application-document.service'; -import { ApplicationSubmissionDetailedDto } from '../../../services/application-submission/application-submission.dto'; -import { ApplicationDocumentDto, DOCUMENT_TYPE } from '../../../services/application-document/application-document.dto'; -import { AuthenticationService } from '../../../services/authentication/authentication.service'; +import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; +import { ApplicationSubmissionDetailedDto } from '../../../../services/application-submission/application-submission.dto'; +import { ApplicationDocumentDto, DOCUMENT_TYPE } from '../../../../services/application-document/application-document.dto'; +import { AuthenticationService } from '../../../../services/authentication/authentication.service'; @Component({ selector: 'app-incl-details', diff --git a/portal-frontend/src/app/features/application-details/naru-details/naru-details.component.html b/portal-frontend/src/app/features/applications/application-details/naru-details/naru-details.component.html similarity index 100% rename from portal-frontend/src/app/features/application-details/naru-details/naru-details.component.html rename to portal-frontend/src/app/features/applications/application-details/naru-details/naru-details.component.html diff --git a/portal-frontend/src/app/features/application-details/naru-details/naru-details.component.scss b/portal-frontend/src/app/features/applications/application-details/naru-details/naru-details.component.scss similarity index 77% rename from portal-frontend/src/app/features/application-details/naru-details/naru-details.component.scss rename to portal-frontend/src/app/features/applications/application-details/naru-details/naru-details.component.scss index 2444367585..0c540ce5fb 100644 --- a/portal-frontend/src/app/features/application-details/naru-details/naru-details.component.scss +++ b/portal-frontend/src/app/features/applications/application-details/naru-details/naru-details.component.scss @@ -1,4 +1,4 @@ -@use '../../../../styles/functions' as *; +@use '../../../../../styles/functions' as *; .soil-table { display: grid; diff --git a/portal-frontend/src/app/features/application-details/naru-details/naru-details.component.spec.ts b/portal-frontend/src/app/features/applications/application-details/naru-details/naru-details.component.spec.ts similarity index 83% rename from portal-frontend/src/app/features/application-details/naru-details/naru-details.component.spec.ts rename to portal-frontend/src/app/features/applications/application-details/naru-details/naru-details.component.spec.ts index fb5c4c9ed4..70c8dae4a4 100644 --- a/portal-frontend/src/app/features/application-details/naru-details/naru-details.component.spec.ts +++ b/portal-frontend/src/app/features/applications/application-details/naru-details/naru-details.component.spec.ts @@ -1,7 +1,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { createMock, DeepMocked } from '@golevelup/ts-jest'; -import { ApplicationDocumentService } from '../../../services/application-document/application-document.service'; -import { ApplicationParcelService } from '../../../services/application-parcel/application-parcel.service'; +import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; +import { ApplicationParcelService } from '../../../../services/application-parcel/application-parcel.service'; import { NaruDetailsComponent } from './naru-details.component'; diff --git a/portal-frontend/src/app/features/application-details/naru-details/naru-details.component.ts b/portal-frontend/src/app/features/applications/application-details/naru-details/naru-details.component.ts similarity index 84% rename from portal-frontend/src/app/features/application-details/naru-details/naru-details.component.ts rename to portal-frontend/src/app/features/applications/application-details/naru-details/naru-details.component.ts index b24c447d6f..bcbb2644a9 100644 --- a/portal-frontend/src/app/features/application-details/naru-details/naru-details.component.ts +++ b/portal-frontend/src/app/features/applications/application-details/naru-details/naru-details.component.ts @@ -1,8 +1,8 @@ import { Component, Input } from '@angular/core'; import { Router } from '@angular/router'; -import { ApplicationDocumentDto, DOCUMENT_TYPE } from '../../../services/application-document/application-document.dto'; -import { ApplicationDocumentService } from '../../../services/application-document/application-document.service'; -import { ApplicationSubmissionDetailedDto } from '../../../services/application-submission/application-submission.dto'; +import { ApplicationDocumentDto, DOCUMENT_TYPE } from '../../../../services/application-document/application-document.dto'; +import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; +import { ApplicationSubmissionDetailedDto } from '../../../../services/application-submission/application-submission.dto'; @Component({ selector: 'app-naru-details[applicationSubmission]', diff --git a/portal-frontend/src/app/features/application-details/nfu-details/nfu-details.component.html b/portal-frontend/src/app/features/applications/application-details/nfu-details/nfu-details.component.html similarity index 100% rename from portal-frontend/src/app/features/application-details/nfu-details/nfu-details.component.html rename to portal-frontend/src/app/features/applications/application-details/nfu-details/nfu-details.component.html diff --git a/portal-frontend/src/app/features/application-details/nfu-details/nfu-details.component.scss b/portal-frontend/src/app/features/applications/application-details/nfu-details/nfu-details.component.scss similarity index 100% rename from portal-frontend/src/app/features/application-details/nfu-details/nfu-details.component.scss rename to portal-frontend/src/app/features/applications/application-details/nfu-details/nfu-details.component.scss diff --git a/portal-frontend/src/app/features/application-details/nfu-details/nfu-details.component.spec.ts b/portal-frontend/src/app/features/applications/application-details/nfu-details/nfu-details.component.spec.ts similarity index 100% rename from portal-frontend/src/app/features/application-details/nfu-details/nfu-details.component.spec.ts rename to portal-frontend/src/app/features/applications/application-details/nfu-details/nfu-details.component.spec.ts diff --git a/portal-frontend/src/app/features/application-details/nfu-details/nfu-details.component.ts b/portal-frontend/src/app/features/applications/application-details/nfu-details/nfu-details.component.ts similarity index 87% rename from portal-frontend/src/app/features/application-details/nfu-details/nfu-details.component.ts rename to portal-frontend/src/app/features/applications/application-details/nfu-details/nfu-details.component.ts index 6a59556491..5a4f0a54d4 100644 --- a/portal-frontend/src/app/features/application-details/nfu-details/nfu-details.component.ts +++ b/portal-frontend/src/app/features/applications/application-details/nfu-details/nfu-details.component.ts @@ -1,6 +1,6 @@ import { Component, Input } from '@angular/core'; import { Router } from '@angular/router'; -import { ApplicationSubmissionDetailedDto } from '../../../services/application-submission/application-submission.dto'; +import { ApplicationSubmissionDetailedDto } from '../../../../services/application-submission/application-submission.dto'; @Component({ selector: 'app-nfu-details[applicationSubmission]', diff --git a/portal-frontend/src/app/features/application-details/parcel/parcel.component.html b/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.html similarity index 100% rename from portal-frontend/src/app/features/application-details/parcel/parcel.component.html rename to portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.html diff --git a/portal-frontend/src/app/features/application-details/parcel/parcel.component.scss b/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.scss similarity index 93% rename from portal-frontend/src/app/features/application-details/parcel/parcel.component.scss rename to portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.scss index def979ba59..ecf9d4a24c 100644 --- a/portal-frontend/src/app/features/application-details/parcel/parcel.component.scss +++ b/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.scss @@ -1,4 +1,4 @@ -@use '../../../../styles/functions' as *; +@use '../../../../../styles/functions' as *; .owner-information { display: grid; diff --git a/portal-frontend/src/app/features/application-details/parcel/parcel.component.spec.ts b/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.spec.ts similarity index 79% rename from portal-frontend/src/app/features/application-details/parcel/parcel.component.spec.ts rename to portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.spec.ts index 48836143c3..72ddecbc10 100644 --- a/portal-frontend/src/app/features/application-details/parcel/parcel.component.spec.ts +++ b/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.spec.ts @@ -3,10 +3,10 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { Router } from '@angular/router'; import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { BehaviorSubject } from 'rxjs'; -import { ApplicationDocumentService } from '../../../services/application-document/application-document.service'; -import { ApplicationOwnerService } from '../../../services/application-owner/application-owner.service'; -import { ApplicationParcelService } from '../../../services/application-parcel/application-parcel.service'; -import { ApplicationSubmissionDetailedDto } from '../../../services/application-submission/application-submission.dto'; +import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; +import { ApplicationOwnerService } from '../../../../services/application-owner/application-owner.service'; +import { ApplicationParcelService } from '../../../../services/application-parcel/application-parcel.service'; +import { ApplicationSubmissionDetailedDto } from '../../../../services/application-submission/application-submission.dto'; import { ParcelComponent } from './parcel.component'; describe('ParcelComponent', () => { diff --git a/portal-frontend/src/app/features/application-details/parcel/parcel.component.ts b/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.ts similarity index 88% rename from portal-frontend/src/app/features/application-details/parcel/parcel.component.ts rename to portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.ts index 85bfaa28a7..e06e3389d8 100644 --- a/portal-frontend/src/app/features/application-details/parcel/parcel.component.ts +++ b/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.ts @@ -2,21 +2,21 @@ import { Component, Input } from '@angular/core'; import { Router } from '@angular/router'; import { getDiff } from 'recursive-diff'; import { BehaviorSubject, Subject, takeUntil } from 'rxjs'; -import { ApplicationDocumentDto } from '../../../services/application-document/application-document.dto'; -import { ApplicationDocumentService } from '../../../services/application-document/application-document.service'; -import { ApplicationOwnerDto } from '../../../services/application-owner/application-owner.dto'; -import { ApplicationOwnerService } from '../../../services/application-owner/application-owner.service'; +import { ApplicationDocumentDto } from '../../../../services/application-document/application-document.dto'; +import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; +import { ApplicationOwnerDto } from '../../../../services/application-owner/application-owner.dto'; +import { ApplicationOwnerService } from '../../../../services/application-owner/application-owner.service'; import { ApplicationParcelDto, ApplicationParcelUpdateDto, PARCEL_OWNERSHIP_TYPE, PARCEL_TYPE, -} from '../../../services/application-parcel/application-parcel.dto'; -import { ApplicationParcelService } from '../../../services/application-parcel/application-parcel.service'; -import { ApplicationSubmissionDetailedDto } from '../../../services/application-submission/application-submission.dto'; -import { BaseCodeDto } from '../../../shared/dto/base.dto'; -import { formatBooleanToYesNoString } from '../../../shared/utils/boolean-helper'; -import { getLetterCombinations } from '../../../shared/utils/number-to-letter-helper'; +} from '../../../../services/application-parcel/application-parcel.dto'; +import { ApplicationParcelService } from '../../../../services/application-parcel/application-parcel.service'; +import { ApplicationSubmissionDetailedDto } from '../../../../services/application-submission/application-submission.dto'; +import { BaseCodeDto } from '../../../../shared/dto/base.dto'; +import { formatBooleanToYesNoString } from '../../../../shared/utils/boolean-helper'; +import { getLetterCombinations } from '../../../../shared/utils/number-to-letter-helper'; export class ApplicationParcelBasicValidation { // indicates general validity check state, including owner related information diff --git a/portal-frontend/src/app/features/application-details/pfrs-details/pfrs-details.component.html b/portal-frontend/src/app/features/applications/application-details/pfrs-details/pfrs-details.component.html similarity index 100% rename from portal-frontend/src/app/features/application-details/pfrs-details/pfrs-details.component.html rename to portal-frontend/src/app/features/applications/application-details/pfrs-details/pfrs-details.component.html diff --git a/portal-frontend/src/app/features/application-details/pfrs-details/pfrs-details.component.scss b/portal-frontend/src/app/features/applications/application-details/pfrs-details/pfrs-details.component.scss similarity index 83% rename from portal-frontend/src/app/features/application-details/pfrs-details/pfrs-details.component.scss rename to portal-frontend/src/app/features/applications/application-details/pfrs-details/pfrs-details.component.scss index 4fc6435f3f..f81fc4394b 100644 --- a/portal-frontend/src/app/features/application-details/pfrs-details/pfrs-details.component.scss +++ b/portal-frontend/src/app/features/applications/application-details/pfrs-details/pfrs-details.component.scss @@ -1,4 +1,4 @@ -@use '../../../../styles/functions' as *; +@use '../../../../../styles/functions' as *; .soil-table { display: grid; diff --git a/portal-frontend/src/app/features/application-details/pfrs-details/pfrs-details.component.spec.ts b/portal-frontend/src/app/features/applications/application-details/pfrs-details/pfrs-details.component.spec.ts similarity index 83% rename from portal-frontend/src/app/features/application-details/pfrs-details/pfrs-details.component.spec.ts rename to portal-frontend/src/app/features/applications/application-details/pfrs-details/pfrs-details.component.spec.ts index 1fa5655aa5..0c306faca0 100644 --- a/portal-frontend/src/app/features/application-details/pfrs-details/pfrs-details.component.spec.ts +++ b/portal-frontend/src/app/features/applications/application-details/pfrs-details/pfrs-details.component.spec.ts @@ -1,7 +1,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { createMock, DeepMocked } from '@golevelup/ts-jest'; -import { ApplicationDocumentService } from '../../../services/application-document/application-document.service'; -import { ApplicationParcelService } from '../../../services/application-parcel/application-parcel.service'; +import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; +import { ApplicationParcelService } from '../../../../services/application-parcel/application-parcel.service'; import { PfrsDetailsComponent } from './pfrs-details.component'; diff --git a/portal-frontend/src/app/features/application-details/pfrs-details/pfrs-details.component.ts b/portal-frontend/src/app/features/applications/application-details/pfrs-details/pfrs-details.component.ts similarity index 87% rename from portal-frontend/src/app/features/application-details/pfrs-details/pfrs-details.component.ts rename to portal-frontend/src/app/features/applications/application-details/pfrs-details/pfrs-details.component.ts index 398fedc975..d719c83504 100644 --- a/portal-frontend/src/app/features/application-details/pfrs-details/pfrs-details.component.ts +++ b/portal-frontend/src/app/features/applications/application-details/pfrs-details/pfrs-details.component.ts @@ -1,8 +1,8 @@ import { Component, Input } from '@angular/core'; import { Router } from '@angular/router'; -import { ApplicationDocumentDto, DOCUMENT_TYPE } from '../../../services/application-document/application-document.dto'; -import { ApplicationDocumentService } from '../../../services/application-document/application-document.service'; -import { ApplicationSubmissionDetailedDto } from '../../../services/application-submission/application-submission.dto'; +import { ApplicationDocumentDto, DOCUMENT_TYPE } from '../../../../services/application-document/application-document.dto'; +import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; +import { ApplicationSubmissionDetailedDto } from '../../../../services/application-submission/application-submission.dto'; @Component({ selector: 'app-pfrs-details[applicationSubmission]', diff --git a/portal-frontend/src/app/features/application-details/pofo-details/pofo-details.component.html b/portal-frontend/src/app/features/applications/application-details/pofo-details/pofo-details.component.html similarity index 100% rename from portal-frontend/src/app/features/application-details/pofo-details/pofo-details.component.html rename to portal-frontend/src/app/features/applications/application-details/pofo-details/pofo-details.component.html diff --git a/portal-frontend/src/app/features/application-details/pofo-details/pofo-details.component.scss b/portal-frontend/src/app/features/applications/application-details/pofo-details/pofo-details.component.scss similarity index 77% rename from portal-frontend/src/app/features/application-details/pofo-details/pofo-details.component.scss rename to portal-frontend/src/app/features/applications/application-details/pofo-details/pofo-details.component.scss index 2444367585..0c540ce5fb 100644 --- a/portal-frontend/src/app/features/application-details/pofo-details/pofo-details.component.scss +++ b/portal-frontend/src/app/features/applications/application-details/pofo-details/pofo-details.component.scss @@ -1,4 +1,4 @@ -@use '../../../../styles/functions' as *; +@use '../../../../../styles/functions' as *; .soil-table { display: grid; diff --git a/portal-frontend/src/app/features/application-details/pofo-details/pofo-details.component.spec.ts b/portal-frontend/src/app/features/applications/application-details/pofo-details/pofo-details.component.spec.ts similarity index 83% rename from portal-frontend/src/app/features/application-details/pofo-details/pofo-details.component.spec.ts rename to portal-frontend/src/app/features/applications/application-details/pofo-details/pofo-details.component.spec.ts index 4e7a277f6b..cadffa92a8 100644 --- a/portal-frontend/src/app/features/application-details/pofo-details/pofo-details.component.spec.ts +++ b/portal-frontend/src/app/features/applications/application-details/pofo-details/pofo-details.component.spec.ts @@ -1,7 +1,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { createMock, DeepMocked } from '@golevelup/ts-jest'; -import { ApplicationDocumentService } from '../../../services/application-document/application-document.service'; -import { ApplicationParcelService } from '../../../services/application-parcel/application-parcel.service'; +import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; +import { ApplicationParcelService } from '../../../../services/application-parcel/application-parcel.service'; import { PofoDetailsComponent } from './pofo-details.component'; diff --git a/portal-frontend/src/app/features/application-details/pofo-details/pofo-details.component.ts b/portal-frontend/src/app/features/applications/application-details/pofo-details/pofo-details.component.ts similarity index 86% rename from portal-frontend/src/app/features/application-details/pofo-details/pofo-details.component.ts rename to portal-frontend/src/app/features/applications/application-details/pofo-details/pofo-details.component.ts index da763c693c..c412d258e5 100644 --- a/portal-frontend/src/app/features/application-details/pofo-details/pofo-details.component.ts +++ b/portal-frontend/src/app/features/applications/application-details/pofo-details/pofo-details.component.ts @@ -1,8 +1,8 @@ import { Component, Input } from '@angular/core'; import { Router } from '@angular/router'; -import { ApplicationDocumentDto, DOCUMENT_TYPE } from '../../../services/application-document/application-document.dto'; -import { ApplicationDocumentService } from '../../../services/application-document/application-document.service'; -import { ApplicationSubmissionDetailedDto } from '../../../services/application-submission/application-submission.dto'; +import { ApplicationDocumentDto, DOCUMENT_TYPE } from '../../../../services/application-document/application-document.dto'; +import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; +import { ApplicationSubmissionDetailedDto } from '../../../../services/application-submission/application-submission.dto'; @Component({ selector: 'app-pofo-details[applicationSubmission]', diff --git a/portal-frontend/src/app/features/application-details/roso-details/roso-details.component.html b/portal-frontend/src/app/features/applications/application-details/roso-details/roso-details.component.html similarity index 100% rename from portal-frontend/src/app/features/application-details/roso-details/roso-details.component.html rename to portal-frontend/src/app/features/applications/application-details/roso-details/roso-details.component.html diff --git a/portal-frontend/src/app/features/application-details/roso-details/roso-details.component.scss b/portal-frontend/src/app/features/applications/application-details/roso-details/roso-details.component.scss similarity index 77% rename from portal-frontend/src/app/features/application-details/roso-details/roso-details.component.scss rename to portal-frontend/src/app/features/applications/application-details/roso-details/roso-details.component.scss index 2444367585..0c540ce5fb 100644 --- a/portal-frontend/src/app/features/application-details/roso-details/roso-details.component.scss +++ b/portal-frontend/src/app/features/applications/application-details/roso-details/roso-details.component.scss @@ -1,4 +1,4 @@ -@use '../../../../styles/functions' as *; +@use '../../../../../styles/functions' as *; .soil-table { display: grid; diff --git a/portal-frontend/src/app/features/application-details/roso-details/roso-details.component.spec.ts b/portal-frontend/src/app/features/applications/application-details/roso-details/roso-details.component.spec.ts similarity index 83% rename from portal-frontend/src/app/features/application-details/roso-details/roso-details.component.spec.ts rename to portal-frontend/src/app/features/applications/application-details/roso-details/roso-details.component.spec.ts index c3cbf56750..3257d7345c 100644 --- a/portal-frontend/src/app/features/application-details/roso-details/roso-details.component.spec.ts +++ b/portal-frontend/src/app/features/applications/application-details/roso-details/roso-details.component.spec.ts @@ -1,7 +1,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { createMock, DeepMocked } from '@golevelup/ts-jest'; -import { ApplicationDocumentService } from '../../../services/application-document/application-document.service'; -import { ApplicationParcelService } from '../../../services/application-parcel/application-parcel.service'; +import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; +import { ApplicationParcelService } from '../../../../services/application-parcel/application-parcel.service'; import { RosoDetailsComponent } from './roso-details.component'; diff --git a/portal-frontend/src/app/features/application-details/roso-details/roso-details.component.ts b/portal-frontend/src/app/features/applications/application-details/roso-details/roso-details.component.ts similarity index 86% rename from portal-frontend/src/app/features/application-details/roso-details/roso-details.component.ts rename to portal-frontend/src/app/features/applications/application-details/roso-details/roso-details.component.ts index 175830279f..7b4d0d5c5e 100644 --- a/portal-frontend/src/app/features/application-details/roso-details/roso-details.component.ts +++ b/portal-frontend/src/app/features/applications/application-details/roso-details/roso-details.component.ts @@ -1,8 +1,8 @@ import { Component, Input } from '@angular/core'; import { Router } from '@angular/router'; -import { ApplicationDocumentDto, DOCUMENT_TYPE } from '../../../services/application-document/application-document.dto'; -import { ApplicationDocumentService } from '../../../services/application-document/application-document.service'; -import { ApplicationSubmissionDetailedDto } from '../../../services/application-submission/application-submission.dto'; +import { ApplicationDocumentDto, DOCUMENT_TYPE } from '../../../../services/application-document/application-document.dto'; +import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; +import { ApplicationSubmissionDetailedDto } from '../../../../services/application-submission/application-submission.dto'; @Component({ selector: 'app-roso-details[applicationSubmission]', diff --git a/portal-frontend/src/app/features/application-details/subd-details/subd-details.component.html b/portal-frontend/src/app/features/applications/application-details/subd-details/subd-details.component.html similarity index 100% rename from portal-frontend/src/app/features/application-details/subd-details/subd-details.component.html rename to portal-frontend/src/app/features/applications/application-details/subd-details/subd-details.component.html diff --git a/portal-frontend/src/app/features/application-details/subd-details/subd-details.component.scss b/portal-frontend/src/app/features/applications/application-details/subd-details/subd-details.component.scss similarity index 79% rename from portal-frontend/src/app/features/application-details/subd-details/subd-details.component.scss rename to portal-frontend/src/app/features/applications/application-details/subd-details/subd-details.component.scss index 8cbdd6b2f5..8e046d8314 100644 --- a/portal-frontend/src/app/features/application-details/subd-details/subd-details.component.scss +++ b/portal-frontend/src/app/features/applications/application-details/subd-details/subd-details.component.scss @@ -1,4 +1,4 @@ -@use '../../../../styles/functions' as *; +@use '../../../../../styles/functions' as *; .parcel-table { display: grid; diff --git a/portal-frontend/src/app/features/application-details/subd-details/subd-details.component.spec.ts b/portal-frontend/src/app/features/applications/application-details/subd-details/subd-details.component.spec.ts similarity index 83% rename from portal-frontend/src/app/features/application-details/subd-details/subd-details.component.spec.ts rename to portal-frontend/src/app/features/applications/application-details/subd-details/subd-details.component.spec.ts index a5e8298700..f50de4439c 100644 --- a/portal-frontend/src/app/features/application-details/subd-details/subd-details.component.spec.ts +++ b/portal-frontend/src/app/features/applications/application-details/subd-details/subd-details.component.spec.ts @@ -1,7 +1,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { createMock, DeepMocked } from '@golevelup/ts-jest'; -import { ApplicationDocumentService } from '../../../services/application-document/application-document.service'; -import { ApplicationParcelService } from '../../../services/application-parcel/application-parcel.service'; +import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; +import { ApplicationParcelService } from '../../../../services/application-parcel/application-parcel.service'; import { SubdDetailsComponent } from './subd-details.component'; diff --git a/portal-frontend/src/app/features/application-details/subd-details/subd-details.component.ts b/portal-frontend/src/app/features/applications/application-details/subd-details/subd-details.component.ts similarity index 83% rename from portal-frontend/src/app/features/application-details/subd-details/subd-details.component.ts rename to portal-frontend/src/app/features/applications/application-details/subd-details/subd-details.component.ts index 22c034eadc..61ee6278fe 100644 --- a/portal-frontend/src/app/features/application-details/subd-details/subd-details.component.ts +++ b/portal-frontend/src/app/features/applications/application-details/subd-details/subd-details.component.ts @@ -1,10 +1,10 @@ import { Component, Input } from '@angular/core'; import { Router } from '@angular/router'; -import { ApplicationDocumentDto, DOCUMENT_TYPE } from '../../../services/application-document/application-document.dto'; -import { ApplicationDocumentService } from '../../../services/application-document/application-document.service'; -import { PARCEL_TYPE } from '../../../services/application-parcel/application-parcel.dto'; -import { ApplicationParcelService } from '../../../services/application-parcel/application-parcel.service'; -import { ApplicationSubmissionDetailedDto } from '../../../services/application-submission/application-submission.dto'; +import { ApplicationDocumentDto, DOCUMENT_TYPE } from '../../../../services/application-document/application-document.dto'; +import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; +import { PARCEL_TYPE } from '../../../../services/application-parcel/application-parcel.dto'; +import { ApplicationParcelService } from '../../../../services/application-parcel/application-parcel.service'; +import { ApplicationSubmissionDetailedDto } from '../../../../services/application-submission/application-submission.dto'; @Component({ selector: 'app-subd-details[applicationSubmission]', diff --git a/portal-frontend/src/app/features/application-details/tur-details/tur-details.component.html b/portal-frontend/src/app/features/applications/application-details/tur-details/tur-details.component.html similarity index 100% rename from portal-frontend/src/app/features/application-details/tur-details/tur-details.component.html rename to portal-frontend/src/app/features/applications/application-details/tur-details/tur-details.component.html diff --git a/portal-frontend/src/app/features/application-details/tur-details/tur-details.component.scss b/portal-frontend/src/app/features/applications/application-details/tur-details/tur-details.component.scss similarity index 100% rename from portal-frontend/src/app/features/application-details/tur-details/tur-details.component.scss rename to portal-frontend/src/app/features/applications/application-details/tur-details/tur-details.component.scss diff --git a/portal-frontend/src/app/features/application-details/tur-details/tur-details.component.spec.ts b/portal-frontend/src/app/features/applications/application-details/tur-details/tur-details.component.spec.ts similarity index 88% rename from portal-frontend/src/app/features/application-details/tur-details/tur-details.component.spec.ts rename to portal-frontend/src/app/features/applications/application-details/tur-details/tur-details.component.spec.ts index bcfa395b2d..f3125dd612 100644 --- a/portal-frontend/src/app/features/application-details/tur-details/tur-details.component.spec.ts +++ b/portal-frontend/src/app/features/applications/application-details/tur-details/tur-details.component.spec.ts @@ -1,6 +1,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { DeepMocked } from '@golevelup/ts-jest'; -import { ApplicationDocumentService } from '../../../services/application-document/application-document.service'; +import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; import { TurDetailsComponent } from './tur-details.component'; diff --git a/portal-frontend/src/app/features/application-details/tur-details/tur-details.component.ts b/portal-frontend/src/app/features/applications/application-details/tur-details/tur-details.component.ts similarity index 85% rename from portal-frontend/src/app/features/application-details/tur-details/tur-details.component.ts rename to portal-frontend/src/app/features/applications/application-details/tur-details/tur-details.component.ts index d9dee09f1b..dc196ca276 100644 --- a/portal-frontend/src/app/features/application-details/tur-details/tur-details.component.ts +++ b/portal-frontend/src/app/features/applications/application-details/tur-details/tur-details.component.ts @@ -1,8 +1,8 @@ import { Component, Input } from '@angular/core'; import { Router } from '@angular/router'; -import { ApplicationDocumentDto, DOCUMENT_TYPE } from '../../../services/application-document/application-document.dto'; -import { ApplicationDocumentService } from '../../../services/application-document/application-document.service'; -import { ApplicationSubmissionDetailedDto } from '../../../services/application-submission/application-submission.dto'; +import { ApplicationDocumentDto, DOCUMENT_TYPE } from '../../../../services/application-document/application-document.dto'; +import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; +import { ApplicationSubmissionDetailedDto } from '../../../../services/application-submission/application-submission.dto'; @Component({ selector: 'app-tur-details[applicationSubmission]', diff --git a/portal-frontend/src/app/features/edit-submission/change-application-type-dialog/change-application-type-dialog.component.html b/portal-frontend/src/app/features/applications/edit-submission/change-application-type-dialog/change-application-type-dialog.component.html similarity index 100% rename from portal-frontend/src/app/features/edit-submission/change-application-type-dialog/change-application-type-dialog.component.html rename to portal-frontend/src/app/features/applications/edit-submission/change-application-type-dialog/change-application-type-dialog.component.html diff --git a/portal-frontend/src/app/features/edit-submission/change-application-type-dialog/change-application-type-dialog.component.scss b/portal-frontend/src/app/features/applications/edit-submission/change-application-type-dialog/change-application-type-dialog.component.scss similarity index 94% rename from portal-frontend/src/app/features/edit-submission/change-application-type-dialog/change-application-type-dialog.component.scss rename to portal-frontend/src/app/features/applications/edit-submission/change-application-type-dialog/change-application-type-dialog.component.scss index ce2d1e3d58..454f80895e 100644 --- a/portal-frontend/src/app/features/edit-submission/change-application-type-dialog/change-application-type-dialog.component.scss +++ b/portal-frontend/src/app/features/applications/edit-submission/change-application-type-dialog/change-application-type-dialog.component.scss @@ -1,5 +1,5 @@ -@use '../../../../styles/functions' as *; -@use '../../../../styles/colors'; +@use '../../../../../styles/functions' as *; +@use '../../../../../styles/colors'; .step-header { padding: rem(16) 0; diff --git a/portal-frontend/src/app/features/edit-submission/change-application-type-dialog/change-application-type-dialog.component.spec.ts b/portal-frontend/src/app/features/applications/edit-submission/change-application-type-dialog/change-application-type-dialog.component.spec.ts similarity index 87% rename from portal-frontend/src/app/features/edit-submission/change-application-type-dialog/change-application-type-dialog.component.spec.ts rename to portal-frontend/src/app/features/applications/edit-submission/change-application-type-dialog/change-application-type-dialog.component.spec.ts index 3f2c3cd898..d435997d09 100644 --- a/portal-frontend/src/app/features/edit-submission/change-application-type-dialog/change-application-type-dialog.component.spec.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/change-application-type-dialog/change-application-type-dialog.component.spec.ts @@ -3,8 +3,8 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MAT_DIALOG_DATA, MatDialogModule, MatDialogRef } from '@angular/material/dialog'; import { MatRadioModule } from '@angular/material/radio'; -import { ApplicationSubmissionService } from '../../../services/application-submission/application-submission.service'; -import { CodeService } from '../../../services/code/code.service'; +import { ApplicationSubmissionService } from '../../../../services/application-submission/application-submission.service'; +import { CodeService } from '../../../../services/code/code.service'; import { ChangeApplicationTypeDialogComponent } from './change-application-type-dialog.component'; describe('ChangeApplicationTypeDialogComponent', () => { diff --git a/portal-frontend/src/app/features/edit-submission/change-application-type-dialog/change-application-type-dialog.component.ts b/portal-frontend/src/app/features/applications/edit-submission/change-application-type-dialog/change-application-type-dialog.component.ts similarity index 92% rename from portal-frontend/src/app/features/edit-submission/change-application-type-dialog/change-application-type-dialog.component.ts rename to portal-frontend/src/app/features/applications/edit-submission/change-application-type-dialog/change-application-type-dialog.component.ts index 5ce7921a58..88577ac71f 100644 --- a/portal-frontend/src/app/features/edit-submission/change-application-type-dialog/change-application-type-dialog.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/change-application-type-dialog/change-application-type-dialog.component.ts @@ -1,10 +1,10 @@ import { AfterViewChecked, Component, Inject, OnInit } from '@angular/core'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { MatRadioChange } from '@angular/material/radio'; -import { ApplicationSubmissionService } from '../../../services/application-submission/application-submission.service'; -import { ApplicationTypeDto } from '../../../services/code/code.dto'; -import { CodeService } from '../../../services/code/code.service'; -import { scrollToElement } from '../../../shared/utils/scroll-helper'; +import { ApplicationSubmissionService } from '../../../../services/application-submission/application-submission.service'; +import { ApplicationTypeDto } from '../../../../services/code/code.dto'; +import { CodeService } from '../../../../services/code/code.service'; +import { scrollToElement } from '../../../../shared/utils/scroll-helper'; export enum ApplicationChangeTypeStepsEnum { warning = 0, diff --git a/portal-frontend/src/app/features/edit-submission/edit-submission-base.module.ts b/portal-frontend/src/app/features/applications/edit-submission/edit-submission-base.module.ts similarity index 98% rename from portal-frontend/src/app/features/edit-submission/edit-submission-base.module.ts rename to portal-frontend/src/app/features/applications/edit-submission/edit-submission-base.module.ts index 71801160f1..c70691f53a 100644 --- a/portal-frontend/src/app/features/edit-submission/edit-submission-base.module.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/edit-submission-base.module.ts @@ -7,7 +7,7 @@ import { MatInputModule } from '@angular/material/input'; import { MatSelectModule } from '@angular/material/select'; import { MatTableModule } from '@angular/material/table'; import { NgxMaskDirective, NgxMaskPipe } from 'ngx-mask'; -import { SharedModule } from '../../shared/shared.module'; +import { SharedModule } from '../../../shared/shared.module'; import { ApplicationDetailsModule } from '../application-details/application-details.module'; import { ChangeApplicationTypeDialogComponent } from './change-application-type-dialog/change-application-type-dialog.component'; import { EditSubmissionComponent } from './edit-submission.component'; diff --git a/portal-frontend/src/app/features/edit-submission/edit-submission.component.html b/portal-frontend/src/app/features/applications/edit-submission/edit-submission.component.html similarity index 100% rename from portal-frontend/src/app/features/edit-submission/edit-submission.component.html rename to portal-frontend/src/app/features/applications/edit-submission/edit-submission.component.html diff --git a/portal-frontend/src/app/features/edit-submission/edit-submission.component.scss b/portal-frontend/src/app/features/applications/edit-submission/edit-submission.component.scss similarity index 98% rename from portal-frontend/src/app/features/edit-submission/edit-submission.component.scss rename to portal-frontend/src/app/features/applications/edit-submission/edit-submission.component.scss index cb18914260..e745545965 100644 --- a/portal-frontend/src/app/features/edit-submission/edit-submission.component.scss +++ b/portal-frontend/src/app/features/applications/edit-submission/edit-submission.component.scss @@ -1,5 +1,5 @@ -@use '../../../styles/functions' as *; -@use '../../../styles/colors'; +@use '../../../../styles/functions' as *; +@use '../../../../styles/colors'; .header { margin: rem(24) 0; diff --git a/portal-frontend/src/app/features/edit-submission/edit-submission.component.spec.ts b/portal-frontend/src/app/features/applications/edit-submission/edit-submission.component.spec.ts similarity index 72% rename from portal-frontend/src/app/features/edit-submission/edit-submission.component.spec.ts rename to portal-frontend/src/app/features/applications/edit-submission/edit-submission.component.spec.ts index 4c6636f950..b7d58a31c0 100644 --- a/portal-frontend/src/app/features/edit-submission/edit-submission.component.spec.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/edit-submission.component.spec.ts @@ -2,13 +2,13 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MatAutocompleteModule } from '@angular/material/autocomplete'; import { RouterTestingModule } from '@angular/router/testing'; -import { ApplicationDocumentService } from '../../services/application-document/application-document.service'; -import { ApplicationSubmissionReviewService } from '../../services/application-submission-review/application-submission-review.service'; -import { ApplicationSubmissionService } from '../../services/application-submission/application-submission.service'; -import { CodeService } from '../../services/code/code.service'; +import { ApplicationDocumentService } from '../../../services/application-document/application-document.service'; +import { ApplicationSubmissionReviewService } from '../../../services/application-submission-review/application-submission-review.service'; +import { ApplicationSubmissionService } from '../../../services/application-submission/application-submission.service'; +import { CodeService } from '../../../services/code/code.service'; import { MatDialogModule } from '@angular/material/dialog'; -import { PdfGenerationService } from '../../services/pdf-generation/pdf-generation.service'; -import { ToastService } from '../../services/toast/toast.service'; +import { PdfGenerationService } from '../../../services/pdf-generation/pdf-generation.service'; +import { ToastService } from '../../../services/toast/toast.service'; import { EditSubmissionComponent } from './edit-submission.component'; describe('EditSubmissionComponent', () => { diff --git a/portal-frontend/src/app/features/edit-submission/edit-submission.component.ts b/portal-frontend/src/app/features/applications/edit-submission/edit-submission.component.ts similarity index 91% rename from portal-frontend/src/app/features/edit-submission/edit-submission.component.ts rename to portal-frontend/src/app/features/applications/edit-submission/edit-submission.component.ts index 93f48f15ee..e1240cebe5 100644 --- a/portal-frontend/src/app/features/edit-submission/edit-submission.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/edit-submission.component.ts @@ -3,17 +3,17 @@ import { AfterViewInit, Component, OnDestroy, OnInit, ViewChild } from '@angular import { MatDialog } from '@angular/material/dialog'; import { ActivatedRoute, Router } from '@angular/router'; import { BehaviorSubject, combineLatest, Observable, of, Subject, takeUntil } from 'rxjs'; -import { ApplicationDocumentDto } from '../../services/application-document/application-document.dto'; -import { ApplicationDocumentService } from '../../services/application-document/application-document.service'; -import { ApplicationSubmissionReviewService } from '../../services/application-submission-review/application-submission-review.service'; -import { ApplicationSubmissionDetailedDto } from '../../services/application-submission/application-submission.dto'; -import { ApplicationSubmissionService } from '../../services/application-submission/application-submission.service'; -import { CodeService } from '../../services/code/code.service'; -import { PdfGenerationService } from '../../services/pdf-generation/pdf-generation.service'; -import { ToastService } from '../../services/toast/toast.service'; -import { CustomStepperComponent } from '../../shared/custom-stepper/custom-stepper.component'; -import { OverlaySpinnerService } from '../../shared/overlay-spinner/overlay-spinner.service'; -import { scrollToElement } from '../../shared/utils/scroll-helper'; +import { ApplicationDocumentDto } from '../../../services/application-document/application-document.dto'; +import { ApplicationDocumentService } from '../../../services/application-document/application-document.service'; +import { ApplicationSubmissionReviewService } from '../../../services/application-submission-review/application-submission-review.service'; +import { ApplicationSubmissionDetailedDto } from '../../../services/application-submission/application-submission.dto'; +import { ApplicationSubmissionService } from '../../../services/application-submission/application-submission.service'; +import { CodeService } from '../../../services/code/code.service'; +import { PdfGenerationService } from '../../../services/pdf-generation/pdf-generation.service'; +import { ToastService } from '../../../services/toast/toast.service'; +import { CustomStepperComponent } from '../../../shared/custom-stepper/custom-stepper.component'; +import { OverlaySpinnerService } from '../../../shared/overlay-spinner/overlay-spinner.service'; +import { scrollToElement } from '../../../shared/utils/scroll-helper'; import { ChangeApplicationTypeDialogComponent } from './change-application-type-dialog/change-application-type-dialog.component'; import { LandUseComponent } from './land-use/land-use.component'; import { OtherAttachmentsComponent } from './other-attachments/other-attachments.component'; diff --git a/portal-frontend/src/app/features/edit-submission/edit-submission.module.ts b/portal-frontend/src/app/features/applications/edit-submission/edit-submission.module.ts similarity index 84% rename from portal-frontend/src/app/features/edit-submission/edit-submission.module.ts rename to portal-frontend/src/app/features/applications/edit-submission/edit-submission.module.ts index d784d512bb..bc02d6b043 100644 --- a/portal-frontend/src/app/features/edit-submission/edit-submission.module.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/edit-submission.module.ts @@ -1,8 +1,8 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { CanDeactivateGuard } from '../../shared/guard/can-deactivate.guard'; -import { SharedModule } from '../../shared/shared.module'; +import { CanDeactivateGuard } from '../../../shared/guard/can-deactivate.guard'; +import { SharedModule } from '../../../shared/shared.module'; import { EditSubmissionBaseModule } from './edit-submission-base.module'; import { EditSubmissionComponent } from './edit-submission.component'; import { StepComponent } from './step.partial'; diff --git a/portal-frontend/src/app/features/edit-submission/files-step.partial.ts b/portal-frontend/src/app/features/applications/edit-submission/files-step.partial.ts similarity index 87% rename from portal-frontend/src/app/features/edit-submission/files-step.partial.ts rename to portal-frontend/src/app/features/applications/edit-submission/files-step.partial.ts index 012d128750..2840e92774 100644 --- a/portal-frontend/src/app/features/edit-submission/files-step.partial.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/files-step.partial.ts @@ -1,9 +1,9 @@ import { Component, Input } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; import { BehaviorSubject } from 'rxjs'; -import { ApplicationDocumentDto, DOCUMENT_TYPE } from '../../services/application-document/application-document.dto'; -import { ApplicationDocumentService } from '../../services/application-document/application-document.service'; -import { FileHandle } from '../../shared/file-drag-drop/drag-drop.directive'; +import { ApplicationDocumentDto, DOCUMENT_TYPE } from '../../../services/application-document/application-document.dto'; +import { ApplicationDocumentService } from '../../../services/application-document/application-document.service'; +import { FileHandle } from '../../../shared/file-drag-drop/drag-drop.directive'; import { RemoveFileConfirmationDialogComponent } from '../alcs-edit-submission/remove-file-confirmation-dialog/remove-file-confirmation-dialog.component'; import { StepComponent } from './step.partial'; diff --git a/portal-frontend/src/app/features/edit-submission/land-use/land-use.component.html b/portal-frontend/src/app/features/applications/edit-submission/land-use/land-use.component.html similarity index 100% rename from portal-frontend/src/app/features/edit-submission/land-use/land-use.component.html rename to portal-frontend/src/app/features/applications/edit-submission/land-use/land-use.component.html diff --git a/portal-frontend/src/app/features/edit-submission/proposal/roso-proposal/roso-proposal.component.scss b/portal-frontend/src/app/features/applications/edit-submission/land-use/land-use.component.scss similarity index 55% rename from portal-frontend/src/app/features/edit-submission/proposal/roso-proposal/roso-proposal.component.scss rename to portal-frontend/src/app/features/applications/edit-submission/land-use/land-use.component.scss index 8223c57759..26003d9afa 100644 --- a/portal-frontend/src/app/features/edit-submission/proposal/roso-proposal/roso-proposal.component.scss +++ b/portal-frontend/src/app/features/applications/edit-submission/land-use/land-use.component.scss @@ -1,5 +1,5 @@ @use '../../../../../styles/functions' as *; -section { - margin-top: rem(36); +h5 { + margin-top: rem(12) !important; } diff --git a/portal-frontend/src/app/features/edit-submission/land-use/land-use.component.spec.ts b/portal-frontend/src/app/features/applications/edit-submission/land-use/land-use.component.spec.ts similarity index 86% rename from portal-frontend/src/app/features/edit-submission/land-use/land-use.component.spec.ts rename to portal-frontend/src/app/features/applications/edit-submission/land-use/land-use.component.spec.ts index 804f60a96f..340875b1a2 100644 --- a/portal-frontend/src/app/features/edit-submission/land-use/land-use.component.spec.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/land-use/land-use.component.spec.ts @@ -3,8 +3,8 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { Router } from '@angular/router'; import { DeepMocked, createMock } from '@golevelup/ts-jest'; import { BehaviorSubject } from 'rxjs'; -import { ApplicationSubmissionDetailedDto } from '../../../services/application-submission/application-submission.dto'; -import { ApplicationSubmissionService } from '../../../services/application-submission/application-submission.service'; +import { ApplicationSubmissionDetailedDto } from '../../../../services/application-submission/application-submission.dto'; +import { ApplicationSubmissionService } from '../../../../services/application-submission/application-submission.service'; import { NO_ERRORS_SCHEMA } from '@angular/core'; import { LandUseComponent } from './land-use.component'; diff --git a/portal-frontend/src/app/features/edit-submission/land-use/land-use.component.ts b/portal-frontend/src/app/features/applications/edit-submission/land-use/land-use.component.ts similarity index 95% rename from portal-frontend/src/app/features/edit-submission/land-use/land-use.component.ts rename to portal-frontend/src/app/features/applications/edit-submission/land-use/land-use.component.ts index 6701fb7145..b6b66ecd15 100644 --- a/portal-frontend/src/app/features/edit-submission/land-use/land-use.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/land-use/land-use.component.ts @@ -2,8 +2,8 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; import { FormControl, FormGroup, Validators } from '@angular/forms'; import { Router } from '@angular/router'; import { takeUntil } from 'rxjs'; -import { ApplicationSubmissionDetailedDto } from '../../../services/application-submission/application-submission.dto'; -import { ApplicationSubmissionService } from '../../../services/application-submission/application-submission.service'; +import { ApplicationSubmissionDetailedDto } from '../../../../services/application-submission/application-submission.dto'; +import { ApplicationSubmissionService } from '../../../../services/application-submission/application-submission.service'; import { EditApplicationSteps } from '../edit-submission.component'; import { StepComponent } from '../step.partial'; diff --git a/portal-frontend/src/app/features/edit-submission/other-attachments/other-attachments.component.html b/portal-frontend/src/app/features/applications/edit-submission/other-attachments/other-attachments.component.html similarity index 100% rename from portal-frontend/src/app/features/edit-submission/other-attachments/other-attachments.component.html rename to portal-frontend/src/app/features/applications/edit-submission/other-attachments/other-attachments.component.html diff --git a/portal-frontend/src/app/features/edit-submission/other-attachments/other-attachments.component.scss b/portal-frontend/src/app/features/applications/edit-submission/other-attachments/other-attachments.component.scss similarity index 83% rename from portal-frontend/src/app/features/edit-submission/other-attachments/other-attachments.component.scss rename to portal-frontend/src/app/features/applications/edit-submission/other-attachments/other-attachments.component.scss index 601281e4d4..7a223440c8 100644 --- a/portal-frontend/src/app/features/edit-submission/other-attachments/other-attachments.component.scss +++ b/portal-frontend/src/app/features/applications/edit-submission/other-attachments/other-attachments.component.scss @@ -1,5 +1,5 @@ -@use '../../../../styles/functions' as *; -@use '../../../../styles/colors'; +@use '../../../../../styles/functions' as *; +@use '../../../../../styles/colors'; section { margin-top: rem(32); diff --git a/portal-frontend/src/app/features/edit-submission/other-attachments/other-attachments.component.spec.ts b/portal-frontend/src/app/features/applications/edit-submission/other-attachments/other-attachments.component.spec.ts similarity index 79% rename from portal-frontend/src/app/features/edit-submission/other-attachments/other-attachments.component.spec.ts rename to portal-frontend/src/app/features/applications/edit-submission/other-attachments/other-attachments.component.spec.ts index 81478babdd..3ff3b56c7d 100644 --- a/portal-frontend/src/app/features/edit-submission/other-attachments/other-attachments.component.spec.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/other-attachments/other-attachments.component.spec.ts @@ -4,11 +4,11 @@ import { MatDialog } from '@angular/material/dialog'; import { Router } from '@angular/router'; import { DeepMocked, createMock } from '@golevelup/ts-jest'; import { BehaviorSubject } from 'rxjs'; -import { ApplicationDocumentDto } from '../../../services/application-document/application-document.dto'; -import { ApplicationDocumentService } from '../../../services/application-document/application-document.service'; -import { ApplicationSubmissionDetailedDto } from '../../../services/application-submission/application-submission.dto'; -import { ApplicationSubmissionService } from '../../../services/application-submission/application-submission.service'; -import { CodeService } from '../../../services/code/code.service'; +import { ApplicationDocumentDto } from '../../../../services/application-document/application-document.dto'; +import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; +import { ApplicationSubmissionDetailedDto } from '../../../../services/application-submission/application-submission.dto'; +import { ApplicationSubmissionService } from '../../../../services/application-submission/application-submission.service'; +import { CodeService } from '../../../../services/code/code.service'; import { OtherAttachmentsComponent } from './other-attachments.component'; diff --git a/portal-frontend/src/app/features/edit-submission/other-attachments/other-attachments.component.ts b/portal-frontend/src/app/features/applications/edit-submission/other-attachments/other-attachments.component.ts similarity index 91% rename from portal-frontend/src/app/features/edit-submission/other-attachments/other-attachments.component.ts rename to portal-frontend/src/app/features/applications/edit-submission/other-attachments/other-attachments.component.ts index 64c47ce011..2984985c68 100644 --- a/portal-frontend/src/app/features/edit-submission/other-attachments/other-attachments.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/other-attachments/other-attachments.component.ts @@ -9,10 +9,10 @@ import { ApplicationDocumentUpdateDto, DOCUMENT_SOURCE, DOCUMENT_TYPE, -} from '../../../services/application-document/application-document.dto'; -import { ApplicationDocumentService } from '../../../services/application-document/application-document.service'; -import { ApplicationSubmissionService } from '../../../services/application-submission/application-submission.service'; -import { CodeService } from '../../../services/code/code.service'; +} from '../../../../services/application-document/application-document.dto'; +import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; +import { ApplicationSubmissionService } from '../../../../services/application-submission/application-submission.service'; +import { CodeService } from '../../../../services/code/code.service'; import { EditApplicationSteps } from '../edit-submission.component'; import { FilesStepComponent } from '../files-step.partial'; diff --git a/portal-frontend/src/app/features/edit-submission/other-parcels/other-parcel-confirmation-dialog/other-parcel-confirmation-dialog.component.html b/portal-frontend/src/app/features/applications/edit-submission/other-parcels/other-parcel-confirmation-dialog/other-parcel-confirmation-dialog.component.html similarity index 100% rename from portal-frontend/src/app/features/edit-submission/other-parcels/other-parcel-confirmation-dialog/other-parcel-confirmation-dialog.component.html rename to portal-frontend/src/app/features/applications/edit-submission/other-parcels/other-parcel-confirmation-dialog/other-parcel-confirmation-dialog.component.html diff --git a/portal-frontend/src/app/features/edit-submission/parcel-details/parcel-entry/parcel-entry-confirmation-dialog/parcel-entry-confirmation-dialog.component.scss b/portal-frontend/src/app/features/applications/edit-submission/other-parcels/other-parcel-confirmation-dialog/other-parcel-confirmation-dialog.component.scss similarity index 100% rename from portal-frontend/src/app/features/edit-submission/parcel-details/parcel-entry/parcel-entry-confirmation-dialog/parcel-entry-confirmation-dialog.component.scss rename to portal-frontend/src/app/features/applications/edit-submission/other-parcels/other-parcel-confirmation-dialog/other-parcel-confirmation-dialog.component.scss diff --git a/portal-frontend/src/app/features/edit-submission/other-parcels/other-parcel-confirmation-dialog/other-parcel-confirmation-dialog.component.spec.ts b/portal-frontend/src/app/features/applications/edit-submission/other-parcels/other-parcel-confirmation-dialog/other-parcel-confirmation-dialog.component.spec.ts similarity index 100% rename from portal-frontend/src/app/features/edit-submission/other-parcels/other-parcel-confirmation-dialog/other-parcel-confirmation-dialog.component.spec.ts rename to portal-frontend/src/app/features/applications/edit-submission/other-parcels/other-parcel-confirmation-dialog/other-parcel-confirmation-dialog.component.spec.ts diff --git a/portal-frontend/src/app/features/edit-submission/other-parcels/other-parcel-confirmation-dialog/other-parcel-confirmation-dialog.component.ts b/portal-frontend/src/app/features/applications/edit-submission/other-parcels/other-parcel-confirmation-dialog/other-parcel-confirmation-dialog.component.ts similarity index 100% rename from portal-frontend/src/app/features/edit-submission/other-parcels/other-parcel-confirmation-dialog/other-parcel-confirmation-dialog.component.ts rename to portal-frontend/src/app/features/applications/edit-submission/other-parcels/other-parcel-confirmation-dialog/other-parcel-confirmation-dialog.component.ts diff --git a/portal-frontend/src/app/features/edit-submission/other-parcels/other-parcels.component.html b/portal-frontend/src/app/features/applications/edit-submission/other-parcels/other-parcels.component.html similarity index 100% rename from portal-frontend/src/app/features/edit-submission/other-parcels/other-parcels.component.html rename to portal-frontend/src/app/features/applications/edit-submission/other-parcels/other-parcels.component.html diff --git a/portal-frontend/src/app/features/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.scss b/portal-frontend/src/app/features/applications/edit-submission/other-parcels/other-parcels.component.scss similarity index 57% rename from portal-frontend/src/app/features/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.scss rename to portal-frontend/src/app/features/applications/edit-submission/other-parcels/other-parcels.component.scss index 8223c57759..93a134c009 100644 --- a/portal-frontend/src/app/features/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.scss +++ b/portal-frontend/src/app/features/applications/edit-submission/other-parcels/other-parcels.component.scss @@ -1,5 +1,5 @@ @use '../../../../../styles/functions' as *; -section { - margin-top: rem(36); +p { + margin: rem(16) 0 !important; } diff --git a/portal-frontend/src/app/features/edit-submission/other-parcels/other-parcels.component.spec.ts b/portal-frontend/src/app/features/applications/edit-submission/other-parcels/other-parcels.component.spec.ts similarity index 82% rename from portal-frontend/src/app/features/edit-submission/other-parcels/other-parcels.component.spec.ts rename to portal-frontend/src/app/features/applications/edit-submission/other-parcels/other-parcels.component.spec.ts index c975222467..1153e907eb 100644 --- a/portal-frontend/src/app/features/edit-submission/other-parcels/other-parcels.component.spec.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/other-parcels/other-parcels.component.spec.ts @@ -4,10 +4,10 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MatDialog } from '@angular/material/dialog'; import { DeepMocked, createMock } from '@golevelup/ts-jest'; import { BehaviorSubject } from 'rxjs'; -import { ApplicationParcelService } from '../../../services/application-parcel/application-parcel.service'; -import { ApplicationSubmissionDetailedDto } from '../../../services/application-submission/application-submission.dto'; -import { ApplicationSubmissionService } from '../../../services/application-submission/application-submission.service'; -import { ToastService } from '../../../services/toast/toast.service'; +import { ApplicationParcelService } from '../../../../services/application-parcel/application-parcel.service'; +import { ApplicationSubmissionDetailedDto } from '../../../../services/application-submission/application-submission.dto'; +import { ApplicationSubmissionService } from '../../../../services/application-submission/application-submission.service'; +import { ToastService } from '../../../../services/toast/toast.service'; import { OtherParcelsComponent } from './other-parcels.component'; diff --git a/portal-frontend/src/app/features/edit-submission/other-parcels/other-parcels.component.ts b/portal-frontend/src/app/features/applications/edit-submission/other-parcels/other-parcels.component.ts similarity index 92% rename from portal-frontend/src/app/features/edit-submission/other-parcels/other-parcels.component.ts rename to portal-frontend/src/app/features/applications/edit-submission/other-parcels/other-parcels.component.ts index 0af4fccb8a..d15c92e1f3 100644 --- a/portal-frontend/src/app/features/edit-submission/other-parcels/other-parcels.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/other-parcels/other-parcels.component.ts @@ -8,19 +8,19 @@ import { APPLICATION_OWNER, ApplicationOwnerDetailedDto, ApplicationOwnerDto, -} from '../../../services/application-owner/application-owner.dto'; +} from '../../../../services/application-owner/application-owner.dto'; import { ApplicationParcelDto, ApplicationParcelUpdateDto, PARCEL_TYPE, -} from '../../../services/application-parcel/application-parcel.dto'; -import { ApplicationParcelService } from '../../../services/application-parcel/application-parcel.service'; -import { ApplicationSubmissionDetailedDto } from '../../../services/application-submission/application-submission.dto'; -import { ApplicationSubmissionService } from '../../../services/application-submission/application-submission.service'; -import { ToastService } from '../../../services/toast/toast.service'; -import { formatBooleanToString } from '../../../shared/utils/boolean-helper'; -import { getLetterCombinations } from '../../../shared/utils/number-to-letter-helper'; -import { parseStringToBoolean } from '../../../shared/utils/string-helper'; +} from '../../../../services/application-parcel/application-parcel.dto'; +import { ApplicationParcelService } from '../../../../services/application-parcel/application-parcel.service'; +import { ApplicationSubmissionDetailedDto } from '../../../../services/application-submission/application-submission.dto'; +import { ApplicationSubmissionService } from '../../../../services/application-submission/application-submission.service'; +import { ToastService } from '../../../../services/toast/toast.service'; +import { formatBooleanToString } from '../../../../shared/utils/boolean-helper'; +import { getLetterCombinations } from '../../../../shared/utils/number-to-letter-helper'; +import { parseStringToBoolean } from '../../../../shared/utils/string-helper'; import { EditApplicationSteps } from '../edit-submission.component'; import { DeleteParcelDialogComponent } from '../parcel-details/delete-parcel/delete-parcel-dialog.component'; import { ParcelEntryFormData } from '../parcel-details/parcel-entry/parcel-entry.component'; diff --git a/portal-frontend/src/app/features/edit-submission/parcel-details/application-crown-owner-dialog/application-crown-owner-dialog.component.html b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/application-crown-owner-dialog/application-crown-owner-dialog.component.html similarity index 100% rename from portal-frontend/src/app/features/edit-submission/parcel-details/application-crown-owner-dialog/application-crown-owner-dialog.component.html rename to portal-frontend/src/app/features/applications/edit-submission/parcel-details/application-crown-owner-dialog/application-crown-owner-dialog.component.html diff --git a/portal-frontend/src/app/features/edit-submission/parcel-details/application-crown-owner-dialog/application-crown-owner-dialog.component.scss b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/application-crown-owner-dialog/application-crown-owner-dialog.component.scss similarity index 72% rename from portal-frontend/src/app/features/edit-submission/parcel-details/application-crown-owner-dialog/application-crown-owner-dialog.component.scss rename to portal-frontend/src/app/features/applications/edit-submission/parcel-details/application-crown-owner-dialog/application-crown-owner-dialog.component.scss index c5273686ac..a4fd5b9b0f 100644 --- a/portal-frontend/src/app/features/edit-submission/parcel-details/application-crown-owner-dialog/application-crown-owner-dialog.component.scss +++ b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/application-crown-owner-dialog/application-crown-owner-dialog.component.scss @@ -1,5 +1,5 @@ -@use '../../../../../styles/functions' as *; -@use '../../../../../styles/colors'; +@use '../../../../../../styles/functions' as *; +@use '../../../../../../styles/colors'; .actions { button:not(:last-child) { diff --git a/portal-frontend/src/app/features/edit-submission/parcel-details/application-crown-owner-dialog/application-crown-owner-dialog.component.spec.ts b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/application-crown-owner-dialog/application-crown-owner-dialog.component.spec.ts similarity index 92% rename from portal-frontend/src/app/features/edit-submission/parcel-details/application-crown-owner-dialog/application-crown-owner-dialog.component.spec.ts rename to portal-frontend/src/app/features/applications/edit-submission/parcel-details/application-crown-owner-dialog/application-crown-owner-dialog.component.spec.ts index 950dd0a70d..97ab2104aa 100644 --- a/portal-frontend/src/app/features/edit-submission/parcel-details/application-crown-owner-dialog/application-crown-owner-dialog.component.spec.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/application-crown-owner-dialog/application-crown-owner-dialog.component.spec.ts @@ -2,7 +2,7 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { createMock, DeepMocked } from '@golevelup/ts-jest'; -import { ApplicationOwnerService } from '../../../../services/application-owner/application-owner.service'; +import { ApplicationOwnerService } from '../../../../../services/application-owner/application-owner.service'; import { ApplicationCrownOwnerDialogComponent } from './application-crown-owner-dialog.component'; diff --git a/portal-frontend/src/app/features/edit-submission/parcel-details/application-crown-owner-dialog/application-crown-owner-dialog.component.ts b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/application-crown-owner-dialog/application-crown-owner-dialog.component.ts similarity index 94% rename from portal-frontend/src/app/features/edit-submission/parcel-details/application-crown-owner-dialog/application-crown-owner-dialog.component.ts rename to portal-frontend/src/app/features/applications/edit-submission/parcel-details/application-crown-owner-dialog/application-crown-owner-dialog.component.ts index b36df6d272..fc2981a6fe 100644 --- a/portal-frontend/src/app/features/edit-submission/parcel-details/application-crown-owner-dialog/application-crown-owner-dialog.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/application-crown-owner-dialog/application-crown-owner-dialog.component.ts @@ -6,8 +6,8 @@ import { ApplicationOwnerCreateDto, ApplicationOwnerDto, ApplicationOwnerUpdateDto, -} from '../../../../services/application-owner/application-owner.dto'; -import { ApplicationOwnerService } from '../../../../services/application-owner/application-owner.service'; +} from '../../../../../services/application-owner/application-owner.dto'; +import { ApplicationOwnerService } from '../../../../../services/application-owner/application-owner.service'; @Component({ selector: 'app-application-crown-owner-dialog', diff --git a/portal-frontend/src/app/features/edit-submission/parcel-details/application-owner-dialog/application-owner-dialog.component.html b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/application-owner-dialog/application-owner-dialog.component.html similarity index 100% rename from portal-frontend/src/app/features/edit-submission/parcel-details/application-owner-dialog/application-owner-dialog.component.html rename to portal-frontend/src/app/features/applications/edit-submission/parcel-details/application-owner-dialog/application-owner-dialog.component.html diff --git a/portal-frontend/src/app/features/edit-submission/parcel-details/application-owner-dialog/application-owner-dialog.component.scss b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/application-owner-dialog/application-owner-dialog.component.scss similarity index 75% rename from portal-frontend/src/app/features/edit-submission/parcel-details/application-owner-dialog/application-owner-dialog.component.scss rename to portal-frontend/src/app/features/applications/edit-submission/parcel-details/application-owner-dialog/application-owner-dialog.component.scss index b5c967defe..2af88008a7 100644 --- a/portal-frontend/src/app/features/edit-submission/parcel-details/application-owner-dialog/application-owner-dialog.component.scss +++ b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/application-owner-dialog/application-owner-dialog.component.scss @@ -1,5 +1,5 @@ -@use '../../../../../styles/functions' as *; -@use '../../../../../styles/colors'; +@use '../../../../../../styles/functions' as *; +@use '../../../../../../styles/colors'; .actions { button:not(:last-child) { diff --git a/portal-frontend/src/app/features/edit-submission/parcel-details/application-owner-dialog/application-owner-dialog.component.spec.ts b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/application-owner-dialog/application-owner-dialog.component.spec.ts similarity index 85% rename from portal-frontend/src/app/features/edit-submission/parcel-details/application-owner-dialog/application-owner-dialog.component.spec.ts rename to portal-frontend/src/app/features/applications/edit-submission/parcel-details/application-owner-dialog/application-owner-dialog.component.spec.ts index 3c2df1f4ac..8e9cd1894e 100644 --- a/portal-frontend/src/app/features/edit-submission/parcel-details/application-owner-dialog/application-owner-dialog.component.spec.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/application-owner-dialog/application-owner-dialog.component.spec.ts @@ -2,9 +2,9 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MAT_DIALOG_DATA, MatDialog, MatDialogRef } from '@angular/material/dialog'; import { createMock, DeepMocked } from '@golevelup/ts-jest'; -import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; -import { ApplicationOwnerService } from '../../../../services/application-owner/application-owner.service'; -import { CodeService } from '../../../../services/code/code.service'; +import { ApplicationDocumentService } from '../../../../../services/application-document/application-document.service'; +import { ApplicationOwnerService } from '../../../../../services/application-owner/application-owner.service'; +import { CodeService } from '../../../../../services/code/code.service'; import { ApplicationOwnerDialogComponent } from './application-owner-dialog.component'; diff --git a/portal-frontend/src/app/features/edit-submission/parcel-details/application-owner-dialog/application-owner-dialog.component.ts b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/application-owner-dialog/application-owner-dialog.component.ts similarity index 92% rename from portal-frontend/src/app/features/edit-submission/parcel-details/application-owner-dialog/application-owner-dialog.component.ts rename to portal-frontend/src/app/features/applications/edit-submission/parcel-details/application-owner-dialog/application-owner-dialog.component.ts index c826a75c7a..37fe30f179 100644 --- a/portal-frontend/src/app/features/edit-submission/parcel-details/application-owner-dialog/application-owner-dialog.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/application-owner-dialog/application-owner-dialog.component.ts @@ -7,17 +7,17 @@ import { ApplicationDocumentTypeDto, DOCUMENT_SOURCE, DOCUMENT_TYPE, -} from '../../../../services/application-document/application-document.dto'; -import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; +} from '../../../../../services/application-document/application-document.dto'; +import { ApplicationDocumentService } from '../../../../../services/application-document/application-document.service'; import { APPLICATION_OWNER, ApplicationOwnerCreateDto, ApplicationOwnerDto, ApplicationOwnerUpdateDto, -} from '../../../../services/application-owner/application-owner.dto'; -import { ApplicationOwnerService } from '../../../../services/application-owner/application-owner.service'; -import { CodeService } from '../../../../services/code/code.service'; -import { FileHandle } from '../../../../shared/file-drag-drop/drag-drop.directive'; +} from '../../../../../services/application-owner/application-owner.dto'; +import { ApplicationOwnerService } from '../../../../../services/application-owner/application-owner.service'; +import { CodeService } from '../../../../../services/code/code.service'; +import { FileHandle } from '../../../../../shared/file-drag-drop/drag-drop.directive'; import { RemoveFileConfirmationDialogComponent } from '../../../alcs-edit-submission/remove-file-confirmation-dialog/remove-file-confirmation-dialog.component'; @Component({ diff --git a/portal-frontend/src/app/features/edit-submission/parcel-details/application-owners-dialog/application-owners-dialog.component.html b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/application-owners-dialog/application-owners-dialog.component.html similarity index 100% rename from portal-frontend/src/app/features/edit-submission/parcel-details/application-owners-dialog/application-owners-dialog.component.html rename to portal-frontend/src/app/features/applications/edit-submission/parcel-details/application-owners-dialog/application-owners-dialog.component.html diff --git a/portal-frontend/src/app/features/edit-submission/parcel-details/application-owners-dialog/application-owners-dialog.component.scss b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/application-owners-dialog/application-owners-dialog.component.scss similarity index 100% rename from portal-frontend/src/app/features/edit-submission/parcel-details/application-owners-dialog/application-owners-dialog.component.scss rename to portal-frontend/src/app/features/applications/edit-submission/parcel-details/application-owners-dialog/application-owners-dialog.component.scss diff --git a/portal-frontend/src/app/features/edit-submission/parcel-details/application-owners-dialog/application-owners-dialog.component.spec.ts b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/application-owners-dialog/application-owners-dialog.component.spec.ts similarity index 91% rename from portal-frontend/src/app/features/edit-submission/parcel-details/application-owners-dialog/application-owners-dialog.component.spec.ts rename to portal-frontend/src/app/features/applications/edit-submission/parcel-details/application-owners-dialog/application-owners-dialog.component.spec.ts index 9a2dcddf62..002133241d 100644 --- a/portal-frontend/src/app/features/edit-submission/parcel-details/application-owners-dialog/application-owners-dialog.component.spec.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/application-owners-dialog/application-owners-dialog.component.spec.ts @@ -2,7 +2,7 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MAT_DIALOG_DATA } from '@angular/material/dialog'; import { createMock, DeepMocked } from '@golevelup/ts-jest'; -import { ApplicationOwnerService } from '../../../../services/application-owner/application-owner.service'; +import { ApplicationOwnerService } from '../../../../../services/application-owner/application-owner.service'; import { ApplicationOwnersDialogComponent } from './application-owners-dialog.component'; describe('ApplicationOwnersDialogComponent', () => { diff --git a/portal-frontend/src/app/features/edit-submission/parcel-details/application-owners-dialog/application-owners-dialog.component.ts b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/application-owners-dialog/application-owners-dialog.component.ts similarity index 87% rename from portal-frontend/src/app/features/edit-submission/parcel-details/application-owners-dialog/application-owners-dialog.component.ts rename to portal-frontend/src/app/features/applications/edit-submission/parcel-details/application-owners-dialog/application-owners-dialog.component.ts index 53ae86801d..83c7335b90 100644 --- a/portal-frontend/src/app/features/edit-submission/parcel-details/application-owners-dialog/application-owners-dialog.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/application-owners-dialog/application-owners-dialog.component.ts @@ -1,7 +1,7 @@ import { Component, Inject } from '@angular/core'; import { MAT_DIALOG_DATA } from '@angular/material/dialog'; -import { APPLICATION_OWNER, ApplicationOwnerDto } from '../../../../services/application-owner/application-owner.dto'; -import { ApplicationOwnerService } from '../../../../services/application-owner/application-owner.service'; +import { APPLICATION_OWNER, ApplicationOwnerDto } from '../../../../../services/application-owner/application-owner.dto'; +import { ApplicationOwnerService } from '../../../../../services/application-owner/application-owner.service'; @Component({ selector: 'app-application-owner-dialog', diff --git a/portal-frontend/src/app/features/edit-submission/parcel-details/delete-parcel/delete-parcel-dialog.component.html b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/delete-parcel/delete-parcel-dialog.component.html similarity index 100% rename from portal-frontend/src/app/features/edit-submission/parcel-details/delete-parcel/delete-parcel-dialog.component.html rename to portal-frontend/src/app/features/applications/edit-submission/parcel-details/delete-parcel/delete-parcel-dialog.component.html diff --git a/portal-frontend/src/app/features/edit-submission/proposal/naru-proposal/change-subtype-confirmation-dialog/change-subtype-confirmation-dialog.component.scss b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/delete-parcel/delete-parcel-dialog.component.scss similarity index 100% rename from portal-frontend/src/app/features/edit-submission/proposal/naru-proposal/change-subtype-confirmation-dialog/change-subtype-confirmation-dialog.component.scss rename to portal-frontend/src/app/features/applications/edit-submission/parcel-details/delete-parcel/delete-parcel-dialog.component.scss diff --git a/portal-frontend/src/app/features/edit-submission/parcel-details/delete-parcel/delete-parcel-dialog.component.spec.ts b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/delete-parcel/delete-parcel-dialog.component.spec.ts similarity index 93% rename from portal-frontend/src/app/features/edit-submission/parcel-details/delete-parcel/delete-parcel-dialog.component.spec.ts rename to portal-frontend/src/app/features/applications/edit-submission/parcel-details/delete-parcel/delete-parcel-dialog.component.spec.ts index f495c53d83..9beff5eaf0 100644 --- a/portal-frontend/src/app/features/edit-submission/parcel-details/delete-parcel/delete-parcel-dialog.component.spec.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/delete-parcel/delete-parcel-dialog.component.spec.ts @@ -4,7 +4,7 @@ import { HttpClient } from '@angular/common/http'; import { NO_ERRORS_SCHEMA } from '@angular/core'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { DeepMocked, createMock } from '@golevelup/ts-jest'; -import { ApplicationParcelService } from '../../../../services/application-parcel/application-parcel.service'; +import { ApplicationParcelService } from '../../../../../services/application-parcel/application-parcel.service'; import { DeleteParcelDialogComponent } from './delete-parcel-dialog.component'; describe('DeleteParcelDialogComponent', () => { diff --git a/portal-frontend/src/app/features/edit-submission/parcel-details/delete-parcel/delete-parcel-dialog.component.ts b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/delete-parcel/delete-parcel-dialog.component.ts similarity index 91% rename from portal-frontend/src/app/features/edit-submission/parcel-details/delete-parcel/delete-parcel-dialog.component.ts rename to portal-frontend/src/app/features/applications/edit-submission/parcel-details/delete-parcel/delete-parcel-dialog.component.ts index 83161500ec..f86e0979ab 100644 --- a/portal-frontend/src/app/features/edit-submission/parcel-details/delete-parcel/delete-parcel-dialog.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/delete-parcel/delete-parcel-dialog.component.ts @@ -1,6 +1,6 @@ import { Component, Inject } from '@angular/core'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; -import { ApplicationParcelService } from '../../../../services/application-parcel/application-parcel.service'; +import { ApplicationParcelService } from '../../../../../services/application-parcel/application-parcel.service'; export enum ApplicationParcelDeleteStepsEnum { warning = 0, @@ -44,7 +44,7 @@ export class DeleteParcelDialogComponent { async onDelete() { const result = await this.applicationParcelService.deleteMany([this.parcelUuid]); - + if (result) { this.onCancel(true); } diff --git a/portal-frontend/src/app/features/edit-submission/parcel-details/parcel-details.component.html b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-details.component.html similarity index 100% rename from portal-frontend/src/app/features/edit-submission/parcel-details/parcel-details.component.html rename to portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-details.component.html diff --git a/portal-frontend/src/app/features/edit-submission/parcel-details/parcel-details.component.scss b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-details.component.scss similarity index 100% rename from portal-frontend/src/app/features/edit-submission/parcel-details/parcel-details.component.scss rename to portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-details.component.scss diff --git a/portal-frontend/src/app/features/edit-submission/parcel-details/parcel-details.component.spec.ts b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-details.component.spec.ts similarity index 83% rename from portal-frontend/src/app/features/edit-submission/parcel-details/parcel-details.component.spec.ts rename to portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-details.component.spec.ts index 23ecb2e9d1..14df0a689b 100644 --- a/portal-frontend/src/app/features/edit-submission/parcel-details/parcel-details.component.spec.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-details.component.spec.ts @@ -4,10 +4,10 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MatDialog } from '@angular/material/dialog'; import { DeepMocked, createMock } from '@golevelup/ts-jest'; import { BehaviorSubject } from 'rxjs'; -import { ApplicationOwnerService } from '../../../services/application-owner/application-owner.service'; -import { ApplicationParcelService } from '../../../services/application-parcel/application-parcel.service'; -import { ApplicationSubmissionDetailedDto } from '../../../services/application-submission/application-submission.dto'; -import { ToastService } from '../../../services/toast/toast.service'; +import { ApplicationOwnerService } from '../../../../services/application-owner/application-owner.service'; +import { ApplicationParcelService } from '../../../../services/application-parcel/application-parcel.service'; +import { ApplicationSubmissionDetailedDto } from '../../../../services/application-submission/application-submission.dto'; +import { ToastService } from '../../../../services/toast/toast.service'; import { ParcelDetailsComponent } from './parcel-details.component'; describe('ParcelDetailsComponent', () => { diff --git a/portal-frontend/src/app/features/edit-submission/parcel-details/parcel-details.component.ts b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-details.component.ts similarity index 92% rename from portal-frontend/src/app/features/edit-submission/parcel-details/parcel-details.component.ts rename to portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-details.component.ts index 52fb6bbc48..6c2f6e4cee 100644 --- a/portal-frontend/src/app/features/edit-submission/parcel-details/parcel-details.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-details.component.ts @@ -2,16 +2,16 @@ import { AfterViewInit, Component, EventEmitter, Input, OnInit, Output } from '@ import { MatDialog } from '@angular/material/dialog'; import { Router } from '@angular/router'; import { BehaviorSubject, takeUntil } from 'rxjs'; -import { APPLICATION_OWNER, ApplicationOwnerDto } from '../../../services/application-owner/application-owner.dto'; -import { ApplicationOwnerService } from '../../../services/application-owner/application-owner.service'; +import { APPLICATION_OWNER, ApplicationOwnerDto } from '../../../../services/application-owner/application-owner.dto'; +import { ApplicationOwnerService } from '../../../../services/application-owner/application-owner.service'; import { ApplicationParcelDto, ApplicationParcelUpdateDto, PARCEL_TYPE, -} from '../../../services/application-parcel/application-parcel.dto'; -import { ApplicationParcelService } from '../../../services/application-parcel/application-parcel.service'; -import { ToastService } from '../../../services/toast/toast.service'; -import { parseStringToBoolean } from '../../../shared/utils/string-helper'; +} from '../../../../services/application-parcel/application-parcel.dto'; +import { ApplicationParcelService } from '../../../../services/application-parcel/application-parcel.service'; +import { ToastService } from '../../../../services/toast/toast.service'; +import { parseStringToBoolean } from '../../../../shared/utils/string-helper'; import { EditApplicationSteps } from '../edit-submission.component'; import { StepComponent } from '../step.partial'; import { DeleteParcelDialogComponent } from './delete-parcel/delete-parcel-dialog.component'; diff --git a/portal-frontend/src/app/features/edit-submission/parcel-details/parcel-entry/parcel-entry-confirmation-dialog/parcel-entry-confirmation-dialog.component.html b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry-confirmation-dialog/parcel-entry-confirmation-dialog.component.html similarity index 100% rename from portal-frontend/src/app/features/edit-submission/parcel-details/parcel-entry/parcel-entry-confirmation-dialog/parcel-entry-confirmation-dialog.component.html rename to portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry-confirmation-dialog/parcel-entry-confirmation-dialog.component.html diff --git a/portal-frontend/src/app/features/alcs-edit-submission/remove-file-confirmation-dialog/remove-file-confirmation-dialog.component.scss b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry-confirmation-dialog/parcel-entry-confirmation-dialog.component.scss similarity index 86% rename from portal-frontend/src/app/features/alcs-edit-submission/remove-file-confirmation-dialog/remove-file-confirmation-dialog.component.scss rename to portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry-confirmation-dialog/parcel-entry-confirmation-dialog.component.scss index 5258112251..c4e03e5c59 100644 --- a/portal-frontend/src/app/features/alcs-edit-submission/remove-file-confirmation-dialog/remove-file-confirmation-dialog.component.scss +++ b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry-confirmation-dialog/parcel-entry-confirmation-dialog.component.scss @@ -1,4 +1,4 @@ -@use '../../../../styles/functions' as *; +@use '../../../../../../../styles/functions' as *; .margin-bottom-1 { margin-bottom: rem(16); diff --git a/portal-frontend/src/app/features/edit-submission/parcel-details/parcel-entry/parcel-entry-confirmation-dialog/parcel-entry-confirmation-dialog.component.spec.ts b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry-confirmation-dialog/parcel-entry-confirmation-dialog.component.spec.ts similarity index 100% rename from portal-frontend/src/app/features/edit-submission/parcel-details/parcel-entry/parcel-entry-confirmation-dialog/parcel-entry-confirmation-dialog.component.spec.ts rename to portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry-confirmation-dialog/parcel-entry-confirmation-dialog.component.spec.ts diff --git a/portal-frontend/src/app/features/edit-submission/parcel-details/parcel-entry/parcel-entry-confirmation-dialog/parcel-entry-confirmation-dialog.component.ts b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry-confirmation-dialog/parcel-entry-confirmation-dialog.component.ts similarity index 100% rename from portal-frontend/src/app/features/edit-submission/parcel-details/parcel-entry/parcel-entry-confirmation-dialog/parcel-entry-confirmation-dialog.component.ts rename to portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry-confirmation-dialog/parcel-entry-confirmation-dialog.component.ts diff --git a/portal-frontend/src/app/features/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html similarity index 100% rename from portal-frontend/src/app/features/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html rename to portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html diff --git a/portal-frontend/src/app/features/edit-submission/parcel-details/parcel-entry/parcel-entry.component.scss b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.scss similarity index 94% rename from portal-frontend/src/app/features/edit-submission/parcel-details/parcel-entry/parcel-entry.component.scss rename to portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.scss index 6ee187a180..223b120fa2 100644 --- a/portal-frontend/src/app/features/edit-submission/parcel-details/parcel-entry/parcel-entry.component.scss +++ b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.scss @@ -1,5 +1,5 @@ -@use '../../../../../styles/functions' as *; -@use '../../../../../styles/colors'; +@use '../../../../../../styles/functions' as *; +@use '../../../../../../styles/colors'; .owner-option { display: flex; diff --git a/portal-frontend/src/app/features/edit-submission/parcel-details/parcel-entry/parcel-entry.component.spec.ts b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.spec.ts similarity index 79% rename from portal-frontend/src/app/features/edit-submission/parcel-details/parcel-entry/parcel-entry.component.spec.ts rename to portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.spec.ts index 6fc99c190b..9df02aa086 100644 --- a/portal-frontend/src/app/features/edit-submission/parcel-details/parcel-entry/parcel-entry.component.spec.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.spec.ts @@ -5,12 +5,12 @@ import { MatAutocompleteModule } from '@angular/material/autocomplete'; import { MatDialog } from '@angular/material/dialog'; import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { BehaviorSubject } from 'rxjs'; -import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; -import { ApplicationOwnerDto } from '../../../../services/application-owner/application-owner.dto'; -import { ApplicationOwnerService } from '../../../../services/application-owner/application-owner.service'; -import { ApplicationParcelDto } from '../../../../services/application-parcel/application-parcel.dto'; -import { ApplicationParcelService } from '../../../../services/application-parcel/application-parcel.service'; -import { ParcelService } from '../../../../services/parcel/parcel.service'; +import { ApplicationDocumentService } from '../../../../../services/application-document/application-document.service'; +import { ApplicationOwnerDto } from '../../../../../services/application-owner/application-owner.dto'; +import { ApplicationOwnerService } from '../../../../../services/application-owner/application-owner.service'; +import { ApplicationParcelDto } from '../../../../../services/application-parcel/application-parcel.dto'; +import { ApplicationParcelService } from '../../../../../services/application-parcel/application-parcel.service'; +import { ParcelService } from '../../../../../services/parcel/parcel.service'; import { ParcelEntryComponent } from './parcel-entry.component'; describe('ParcelEntryComponent', () => { diff --git a/portal-frontend/src/app/features/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts similarity index 95% rename from portal-frontend/src/app/features/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts rename to portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts index fc8aec1045..b6567a7ea4 100644 --- a/portal-frontend/src/app/features/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts @@ -6,18 +6,18 @@ import { BehaviorSubject } from 'rxjs'; import { ApplicationDocumentDto, DOCUMENT_TYPE, -} from '../../../../services/application-document/application-document.dto'; -import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; -import { APPLICATION_OWNER, ApplicationOwnerDto } from '../../../../services/application-owner/application-owner.dto'; -import { ApplicationOwnerService } from '../../../../services/application-owner/application-owner.service'; +} from '../../../../../services/application-document/application-document.dto'; +import { ApplicationDocumentService } from '../../../../../services/application-document/application-document.service'; +import { APPLICATION_OWNER, ApplicationOwnerDto } from '../../../../../services/application-owner/application-owner.dto'; +import { ApplicationOwnerService } from '../../../../../services/application-owner/application-owner.service'; import { ApplicationParcelDto, PARCEL_OWNERSHIP_TYPE, -} from '../../../../services/application-parcel/application-parcel.dto'; -import { ApplicationParcelService } from '../../../../services/application-parcel/application-parcel.service'; -import { ParcelService } from '../../../../services/parcel/parcel.service'; -import { FileHandle } from '../../../../shared/file-drag-drop/drag-drop.directive'; -import { formatBooleanToString } from '../../../../shared/utils/boolean-helper'; +} from '../../../../../services/application-parcel/application-parcel.dto'; +import { ApplicationParcelService } from '../../../../../services/application-parcel/application-parcel.service'; +import { ParcelService } from '../../../../../services/parcel/parcel.service'; +import { FileHandle } from '../../../../../shared/file-drag-drop/drag-drop.directive'; +import { formatBooleanToString } from '../../../../../shared/utils/boolean-helper'; import { RemoveFileConfirmationDialogComponent } from '../../../alcs-edit-submission/remove-file-confirmation-dialog/remove-file-confirmation-dialog.component'; import { ApplicationCrownOwnerDialogComponent } from '../application-crown-owner-dialog/application-crown-owner-dialog.component'; import { ApplicationOwnerDialogComponent } from '../application-owner-dialog/application-owner-dialog.component'; diff --git a/portal-frontend/src/app/features/edit-submission/parcel-details/parcel-owners/parcel-owners.component.html b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-owners/parcel-owners.component.html similarity index 100% rename from portal-frontend/src/app/features/edit-submission/parcel-details/parcel-owners/parcel-owners.component.html rename to portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-owners/parcel-owners.component.html diff --git a/portal-frontend/src/app/features/edit-submission/parcel-details/parcel-owners/parcel-owners.component.scss b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-owners/parcel-owners.component.scss similarity index 66% rename from portal-frontend/src/app/features/edit-submission/parcel-details/parcel-owners/parcel-owners.component.scss rename to portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-owners/parcel-owners.component.scss index 926bc5711a..fb105e09eb 100644 --- a/portal-frontend/src/app/features/edit-submission/parcel-details/parcel-owners/parcel-owners.component.scss +++ b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-owners/parcel-owners.component.scss @@ -1,5 +1,5 @@ -@use '../../../../../styles/functions' as *; -@use '../../../../../styles/colors'; +@use '../../../../../../styles/functions' as *; +@use '../../../../../../styles/colors'; .actions { button:not(:last-child) { diff --git a/portal-frontend/src/app/features/edit-submission/parcel-details/parcel-owners/parcel-owners.component.spec.ts b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-owners/parcel-owners.component.spec.ts similarity index 82% rename from portal-frontend/src/app/features/edit-submission/parcel-details/parcel-owners/parcel-owners.component.spec.ts rename to portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-owners/parcel-owners.component.spec.ts index 23032e93d9..36430e28e6 100644 --- a/portal-frontend/src/app/features/edit-submission/parcel-details/parcel-owners/parcel-owners.component.spec.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-owners/parcel-owners.component.spec.ts @@ -1,8 +1,8 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MatDialog } from '@angular/material/dialog'; -import { ApplicationOwnerService } from '../../../../services/application-owner/application-owner.service'; -import { ConfirmationDialogService } from '../../../../shared/confirmation-dialog/confirmation-dialog.service'; +import { ApplicationOwnerService } from '../../../../../services/application-owner/application-owner.service'; +import { ConfirmationDialogService } from '../../../../../shared/confirmation-dialog/confirmation-dialog.service'; import { ParcelOwnersComponent } from './parcel-owners.component'; diff --git a/portal-frontend/src/app/features/edit-submission/parcel-details/parcel-owners/parcel-owners.component.ts b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-owners/parcel-owners.component.ts similarity index 90% rename from portal-frontend/src/app/features/edit-submission/parcel-details/parcel-owners/parcel-owners.component.ts rename to portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-owners/parcel-owners.component.ts index 42cbd8be63..760e03f11a 100644 --- a/portal-frontend/src/app/features/edit-submission/parcel-details/parcel-owners/parcel-owners.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-owners/parcel-owners.component.ts @@ -1,8 +1,8 @@ import { Component, EventEmitter, Input, Output } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; -import { ApplicationOwnerDto, APPLICATION_OWNER } from '../../../../services/application-owner/application-owner.dto'; -import { ApplicationOwnerService } from '../../../../services/application-owner/application-owner.service'; -import { ConfirmationDialogService } from '../../../../shared/confirmation-dialog/confirmation-dialog.service'; +import { ApplicationOwnerDto, APPLICATION_OWNER } from '../../../../../services/application-owner/application-owner.dto'; +import { ApplicationOwnerService } from '../../../../../services/application-owner/application-owner.service'; +import { ConfirmationDialogService } from '../../../../../shared/confirmation-dialog/confirmation-dialog.service'; import { ApplicationCrownOwnerDialogComponent } from '../application-crown-owner-dialog/application-crown-owner-dialog.component'; import { ApplicationOwnerDialogComponent } from '../application-owner-dialog/application-owner-dialog.component'; diff --git a/portal-frontend/src/app/features/edit-submission/primary-contact/primary-contact.component.html b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html similarity index 100% rename from portal-frontend/src/app/features/edit-submission/primary-contact/primary-contact.component.html rename to portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html diff --git a/portal-frontend/src/app/features/edit-submission/primary-contact/primary-contact.component.scss b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.scss similarity index 90% rename from portal-frontend/src/app/features/edit-submission/primary-contact/primary-contact.component.scss rename to portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.scss index 56c38ab52e..ba5b4f2a09 100644 --- a/portal-frontend/src/app/features/edit-submission/primary-contact/primary-contact.component.scss +++ b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.scss @@ -1,5 +1,5 @@ -@use '../../../../styles/functions' as *; -@use '../../../../styles/colors'; +@use '../../../../../styles/functions' as *; +@use '../../../../../styles/colors'; h4 { margin-bottom: rem(24) !important; diff --git a/portal-frontend/src/app/features/edit-submission/primary-contact/primary-contact.component.spec.ts b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.spec.ts similarity index 74% rename from portal-frontend/src/app/features/edit-submission/primary-contact/primary-contact.component.spec.ts rename to portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.spec.ts index db1a76b2cd..1bc4cce935 100644 --- a/portal-frontend/src/app/features/edit-submission/primary-contact/primary-contact.component.spec.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.spec.ts @@ -3,13 +3,13 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MatDialog } from '@angular/material/dialog'; import { DeepMocked, createMock } from '@golevelup/ts-jest'; import { BehaviorSubject } from 'rxjs'; -import { ApplicationDocumentDto } from '../../../services/application-document/application-document.dto'; -import { ApplicationDocumentService } from '../../../services/application-document/application-document.service'; -import { ApplicationOwnerService } from '../../../services/application-owner/application-owner.service'; -import { ApplicationSubmissionDetailedDto } from '../../../services/application-submission/application-submission.dto'; -import { ApplicationSubmissionService } from '../../../services/application-submission/application-submission.service'; -import { UserDto } from '../../../services/authentication/authentication.dto'; -import { AuthenticationService } from '../../../services/authentication/authentication.service'; +import { ApplicationDocumentDto } from '../../../../services/application-document/application-document.dto'; +import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; +import { ApplicationOwnerService } from '../../../../services/application-owner/application-owner.service'; +import { ApplicationSubmissionDetailedDto } from '../../../../services/application-submission/application-submission.dto'; +import { ApplicationSubmissionService } from '../../../../services/application-submission/application-submission.service'; +import { UserDto } from '../../../../services/authentication/authentication.dto'; +import { AuthenticationService } from '../../../../services/authentication/authentication.service'; import { PrimaryContactComponent } from './primary-contact.component'; diff --git a/portal-frontend/src/app/features/edit-submission/primary-contact/primary-contact.component.ts b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts similarity index 94% rename from portal-frontend/src/app/features/edit-submission/primary-contact/primary-contact.component.ts rename to portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts index ed32798620..cc5f41607d 100644 --- a/portal-frontend/src/app/features/edit-submission/primary-contact/primary-contact.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts @@ -3,12 +3,12 @@ import { FormControl, FormGroup, Validators } from '@angular/forms'; import { MatDialog } from '@angular/material/dialog'; import { Router } from '@angular/router'; import { takeUntil } from 'rxjs'; -import { ApplicationDocumentDto, DOCUMENT_TYPE } from '../../../services/application-document/application-document.dto'; -import { ApplicationDocumentService } from '../../../services/application-document/application-document.service'; -import { APPLICATION_OWNER, ApplicationOwnerDto } from '../../../services/application-owner/application-owner.dto'; -import { ApplicationOwnerService } from '../../../services/application-owner/application-owner.service'; -import { ApplicationSubmissionService } from '../../../services/application-submission/application-submission.service'; -import { AuthenticationService } from '../../../services/authentication/authentication.service'; +import { ApplicationDocumentDto, DOCUMENT_TYPE } from '../../../../services/application-document/application-document.dto'; +import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; +import { APPLICATION_OWNER, ApplicationOwnerDto } from '../../../../services/application-owner/application-owner.dto'; +import { ApplicationOwnerService } from '../../../../services/application-owner/application-owner.service'; +import { ApplicationSubmissionService } from '../../../../services/application-submission/application-submission.service'; +import { AuthenticationService } from '../../../../services/authentication/authentication.service'; import { EditApplicationSteps } from '../edit-submission.component'; import { FilesStepComponent } from '../files-step.partial'; diff --git a/portal-frontend/src/app/features/edit-submission/proposal/excl-proposal/excl-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/excl-proposal/excl-proposal.component.html similarity index 100% rename from portal-frontend/src/app/features/edit-submission/proposal/excl-proposal/excl-proposal.component.html rename to portal-frontend/src/app/features/applications/edit-submission/proposal/excl-proposal/excl-proposal.component.html diff --git a/portal-frontend/src/app/features/edit-submission/proposal/excl-proposal/excl-proposal.component.scss b/portal-frontend/src/app/features/applications/edit-submission/proposal/excl-proposal/excl-proposal.component.scss similarity index 66% rename from portal-frontend/src/app/features/edit-submission/proposal/excl-proposal/excl-proposal.component.scss rename to portal-frontend/src/app/features/applications/edit-submission/proposal/excl-proposal/excl-proposal.component.scss index 8ad03f05a0..1a30448410 100644 --- a/portal-frontend/src/app/features/edit-submission/proposal/excl-proposal/excl-proposal.component.scss +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/excl-proposal/excl-proposal.component.scss @@ -1,4 +1,4 @@ -@use '../../../../../styles/functions' as *; +@use '../../../../../../styles/functions' as *; section { margin-top: rem(36); diff --git a/portal-frontend/src/app/features/edit-submission/proposal/excl-proposal/excl-proposal.component.spec.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/excl-proposal/excl-proposal.component.spec.ts similarity index 79% rename from portal-frontend/src/app/features/edit-submission/proposal/excl-proposal/excl-proposal.component.spec.ts rename to portal-frontend/src/app/features/applications/edit-submission/proposal/excl-proposal/excl-proposal.component.spec.ts index 38c8bc753e..4cc2056ebb 100644 --- a/portal-frontend/src/app/features/edit-submission/proposal/excl-proposal/excl-proposal.component.spec.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/excl-proposal/excl-proposal.component.spec.ts @@ -4,10 +4,10 @@ import { MatDialog } from '@angular/material/dialog'; import { Router } from '@angular/router'; import { DeepMocked, createMock } from '@golevelup/ts-jest'; import { BehaviorSubject } from 'rxjs'; -import { ApplicationDocumentDto } from '../../../../services/application-document/application-document.dto'; -import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; -import { ApplicationSubmissionDetailedDto } from '../../../../services/application-submission/application-submission.dto'; -import { ApplicationSubmissionService } from '../../../../services/application-submission/application-submission.service'; +import { ApplicationDocumentDto } from '../../../../../services/application-document/application-document.dto'; +import { ApplicationDocumentService } from '../../../../../services/application-document/application-document.service'; +import { ApplicationSubmissionDetailedDto } from '../../../../../services/application-submission/application-submission.dto'; +import { ApplicationSubmissionService } from '../../../../../services/application-submission/application-submission.service'; import { ExclProposalComponent } from './excl-proposal.component'; diff --git a/portal-frontend/src/app/features/edit-submission/proposal/excl-proposal/excl-proposal.component.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/excl-proposal/excl-proposal.component.ts similarity index 88% rename from portal-frontend/src/app/features/edit-submission/proposal/excl-proposal/excl-proposal.component.ts rename to portal-frontend/src/app/features/applications/edit-submission/proposal/excl-proposal/excl-proposal.component.ts index 9205eb6159..638e8569b5 100644 --- a/portal-frontend/src/app/features/edit-submission/proposal/excl-proposal/excl-proposal.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/excl-proposal/excl-proposal.component.ts @@ -6,11 +6,11 @@ import { takeUntil } from 'rxjs'; import { ApplicationDocumentDto, DOCUMENT_TYPE, -} from '../../../../services/application-document/application-document.dto'; -import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; -import { ApplicationSubmissionUpdateDto } from '../../../../services/application-submission/application-submission.dto'; -import { ApplicationSubmissionService } from '../../../../services/application-submission/application-submission.service'; -import { parseStringToBoolean } from '../../../../shared/utils/string-helper'; +} from '../../../../../services/application-document/application-document.dto'; +import { ApplicationDocumentService } from '../../../../../services/application-document/application-document.service'; +import { ApplicationSubmissionUpdateDto } from '../../../../../services/application-submission/application-submission.dto'; +import { ApplicationSubmissionService } from '../../../../../services/application-submission/application-submission.service'; +import { parseStringToBoolean } from '../../../../../shared/utils/string-helper'; import { EditApplicationSteps } from '../../edit-submission.component'; import { FilesStepComponent } from '../../files-step.partial'; diff --git a/portal-frontend/src/app/features/edit-submission/proposal/incl-proposal/incl-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/incl-proposal/incl-proposal.component.html similarity index 100% rename from portal-frontend/src/app/features/edit-submission/proposal/incl-proposal/incl-proposal.component.html rename to portal-frontend/src/app/features/applications/edit-submission/proposal/incl-proposal/incl-proposal.component.html diff --git a/portal-frontend/src/app/features/edit-submission/proposal/incl-proposal/incl-proposal.component.scss b/portal-frontend/src/app/features/applications/edit-submission/proposal/incl-proposal/incl-proposal.component.scss similarity index 66% rename from portal-frontend/src/app/features/edit-submission/proposal/incl-proposal/incl-proposal.component.scss rename to portal-frontend/src/app/features/applications/edit-submission/proposal/incl-proposal/incl-proposal.component.scss index b435af700d..952b837267 100644 --- a/portal-frontend/src/app/features/edit-submission/proposal/incl-proposal/incl-proposal.component.scss +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/incl-proposal/incl-proposal.component.scss @@ -1,4 +1,4 @@ -@use '../../../../../styles/functions' as *; +@use '../../../../../../styles/functions' as *; section { margin-top: rem(32); diff --git a/portal-frontend/src/app/features/edit-submission/proposal/incl-proposal/incl-proposal.component.spec.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/incl-proposal/incl-proposal.component.spec.ts similarity index 74% rename from portal-frontend/src/app/features/edit-submission/proposal/incl-proposal/incl-proposal.component.spec.ts rename to portal-frontend/src/app/features/applications/edit-submission/proposal/incl-proposal/incl-proposal.component.spec.ts index bda063fcdc..a6d0e67ae7 100644 --- a/portal-frontend/src/app/features/edit-submission/proposal/incl-proposal/incl-proposal.component.spec.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/incl-proposal/incl-proposal.component.spec.ts @@ -3,13 +3,13 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MatDialog } from '@angular/material/dialog'; import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { BehaviorSubject } from 'rxjs'; -import { UserDto } from '../../../../services/authentication/authentication.dto'; -import { AuthenticationService } from '../../../../services/authentication/authentication.service'; +import { UserDto } from '../../../../../services/authentication/authentication.dto'; +import { AuthenticationService } from '../../../../../services/authentication/authentication.service'; import { InclProposalComponent } from './incl-proposal.component'; -import { ApplicationSubmissionService } from '../../../../services/application-submission/application-submission.service'; -import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; -import { ApplicationSubmissionDetailedDto } from '../../../../services/application-submission/application-submission.dto'; -import { ApplicationDocumentDto } from '../../../../services/application-document/application-document.dto'; +import { ApplicationSubmissionService } from '../../../../../services/application-submission/application-submission.service'; +import { ApplicationDocumentService } from '../../../../../services/application-document/application-document.service'; +import { ApplicationSubmissionDetailedDto } from '../../../../../services/application-submission/application-submission.dto'; +import { ApplicationDocumentDto } from '../../../../../services/application-document/application-document.dto'; describe('InclProposalComponent', () => { let component: InclProposalComponent; diff --git a/portal-frontend/src/app/features/edit-submission/proposal/incl-proposal/incl-proposal.component.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/incl-proposal/incl-proposal.component.ts similarity index 88% rename from portal-frontend/src/app/features/edit-submission/proposal/incl-proposal/incl-proposal.component.ts rename to portal-frontend/src/app/features/applications/edit-submission/proposal/incl-proposal/incl-proposal.component.ts index 9aac67ce46..f56da91fb4 100644 --- a/portal-frontend/src/app/features/edit-submission/proposal/incl-proposal/incl-proposal.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/incl-proposal/incl-proposal.component.ts @@ -1,20 +1,20 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; import { MatButtonToggleChange } from '@angular/material/button-toggle'; -import { AuthenticationService } from '../../../../services/authentication/authentication.service'; -import { formatBooleanToString } from '../../../../shared/utils/boolean-helper'; -import { parseStringToBoolean } from '../../../../shared/utils/string-helper'; +import { AuthenticationService } from '../../../../../services/authentication/authentication.service'; +import { formatBooleanToString } from '../../../../../shared/utils/boolean-helper'; +import { parseStringToBoolean } from '../../../../../shared/utils/string-helper'; import { FilesStepComponent } from '../../files-step.partial'; -import { ApplicationSubmissionService } from '../../../../services/application-submission/application-submission.service'; -import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; +import { ApplicationSubmissionService } from '../../../../../services/application-submission/application-submission.service'; +import { ApplicationDocumentService } from '../../../../../services/application-document/application-document.service'; import { MatDialog } from '@angular/material/dialog'; import { FormControl, FormGroup, Validators } from '@angular/forms'; import { ApplicationDocumentDto, DOCUMENT_TYPE, -} from '../../../../services/application-document/application-document.dto'; +} from '../../../../../services/application-document/application-document.dto'; import { EditApplicationSteps } from '../../edit-submission.component'; import { takeUntil } from 'rxjs'; -import { ApplicationSubmissionUpdateDto } from '../../../../services/application-submission/application-submission.dto'; +import { ApplicationSubmissionUpdateDto } from '../../../../../services/application-submission/application-submission.dto'; interface InclForm { hectares: FormControl; diff --git a/portal-frontend/src/app/features/edit-submission/proposal/naru-proposal/change-subtype-confirmation-dialog/change-subtype-confirmation-dialog.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/change-subtype-confirmation-dialog/change-subtype-confirmation-dialog.component.html similarity index 100% rename from portal-frontend/src/app/features/edit-submission/proposal/naru-proposal/change-subtype-confirmation-dialog/change-subtype-confirmation-dialog.component.html rename to portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/change-subtype-confirmation-dialog/change-subtype-confirmation-dialog.component.html diff --git a/portal-frontend/src/app/features/edit-submission/parcel-details/delete-parcel/delete-parcel-dialog.component.scss b/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/change-subtype-confirmation-dialog/change-subtype-confirmation-dialog.component.scss similarity index 86% rename from portal-frontend/src/app/features/edit-submission/parcel-details/delete-parcel/delete-parcel-dialog.component.scss rename to portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/change-subtype-confirmation-dialog/change-subtype-confirmation-dialog.component.scss index c0b978492d..c4e03e5c59 100644 --- a/portal-frontend/src/app/features/edit-submission/parcel-details/delete-parcel/delete-parcel-dialog.component.scss +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/change-subtype-confirmation-dialog/change-subtype-confirmation-dialog.component.scss @@ -1,4 +1,4 @@ -@use '../../../../../styles/functions' as *; +@use '../../../../../../../styles/functions' as *; .margin-bottom-1 { margin-bottom: rem(16); diff --git a/portal-frontend/src/app/features/edit-submission/proposal/naru-proposal/change-subtype-confirmation-dialog/change-subtype-confirmation-dialog.component.spec.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/change-subtype-confirmation-dialog/change-subtype-confirmation-dialog.component.spec.ts similarity index 100% rename from portal-frontend/src/app/features/edit-submission/proposal/naru-proposal/change-subtype-confirmation-dialog/change-subtype-confirmation-dialog.component.spec.ts rename to portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/change-subtype-confirmation-dialog/change-subtype-confirmation-dialog.component.spec.ts diff --git a/portal-frontend/src/app/features/edit-submission/proposal/naru-proposal/change-subtype-confirmation-dialog/change-subtype-confirmation-dialog.component.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/change-subtype-confirmation-dialog/change-subtype-confirmation-dialog.component.ts similarity index 100% rename from portal-frontend/src/app/features/edit-submission/proposal/naru-proposal/change-subtype-confirmation-dialog/change-subtype-confirmation-dialog.component.ts rename to portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/change-subtype-confirmation-dialog/change-subtype-confirmation-dialog.component.ts diff --git a/portal-frontend/src/app/features/edit-submission/proposal/naru-proposal/naru-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.html similarity index 100% rename from portal-frontend/src/app/features/edit-submission/proposal/naru-proposal/naru-proposal.component.html rename to portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.html diff --git a/portal-frontend/src/app/features/edit-submission/proposal/naru-proposal/naru-proposal.component.scss b/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.scss similarity index 82% rename from portal-frontend/src/app/features/edit-submission/proposal/naru-proposal/naru-proposal.component.scss rename to portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.scss index b9a8a44ecd..b3f3123a12 100644 --- a/portal-frontend/src/app/features/edit-submission/proposal/naru-proposal/naru-proposal.component.scss +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.scss @@ -1,4 +1,4 @@ -@use '../../../../../styles/functions' as *; +@use '../../../../../../styles/functions' as *; section { margin-top: rem(36); diff --git a/portal-frontend/src/app/features/edit-submission/proposal/naru-proposal/naru-proposal.component.spec.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.spec.ts similarity index 76% rename from portal-frontend/src/app/features/edit-submission/proposal/naru-proposal/naru-proposal.component.spec.ts rename to portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.spec.ts index 3a729be056..8436de1c4e 100644 --- a/portal-frontend/src/app/features/edit-submission/proposal/naru-proposal/naru-proposal.component.spec.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.spec.ts @@ -4,11 +4,11 @@ import { MatDialog } from '@angular/material/dialog'; import { Router } from '@angular/router'; import { DeepMocked, createMock } from '@golevelup/ts-jest'; import { BehaviorSubject } from 'rxjs'; -import { ApplicationDocumentDto } from '../../../../services/application-document/application-document.dto'; -import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; -import { ApplicationSubmissionDetailedDto } from '../../../../services/application-submission/application-submission.dto'; -import { ApplicationSubmissionService } from '../../../../services/application-submission/application-submission.service'; -import { CodeService } from '../../../../services/code/code.service'; +import { ApplicationDocumentDto } from '../../../../../services/application-document/application-document.dto'; +import { ApplicationDocumentService } from '../../../../../services/application-document/application-document.service'; +import { ApplicationSubmissionDetailedDto } from '../../../../../services/application-submission/application-submission.dto'; +import { ApplicationSubmissionService } from '../../../../../services/application-submission/application-submission.service'; +import { CodeService } from '../../../../../services/code/code.service'; import { NaruProposalComponent } from './naru-proposal.component'; diff --git a/portal-frontend/src/app/features/edit-submission/proposal/naru-proposal/naru-proposal.component.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.ts similarity index 93% rename from portal-frontend/src/app/features/edit-submission/proposal/naru-proposal/naru-proposal.component.ts rename to portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.ts index 74642f793d..7a5a8ff95b 100644 --- a/portal-frontend/src/app/features/edit-submission/proposal/naru-proposal/naru-proposal.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.ts @@ -7,15 +7,15 @@ import { takeUntil } from 'rxjs'; import { ApplicationDocumentDto, DOCUMENT_TYPE, -} from '../../../../services/application-document/application-document.dto'; -import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; +} from '../../../../../services/application-document/application-document.dto'; +import { ApplicationDocumentService } from '../../../../../services/application-document/application-document.service'; import { ApplicationSubmissionUpdateDto, NaruSubtypeDto, -} from '../../../../services/application-submission/application-submission.dto'; -import { ApplicationSubmissionService } from '../../../../services/application-submission/application-submission.service'; -import { CodeService } from '../../../../services/code/code.service'; -import { formatBooleanToYesNoString } from '../../../../shared/utils/boolean-helper'; +} from '../../../../../services/application-submission/application-submission.dto'; +import { ApplicationSubmissionService } from '../../../../../services/application-submission/application-submission.service'; +import { CodeService } from '../../../../../services/code/code.service'; +import { formatBooleanToYesNoString } from '../../../../../shared/utils/boolean-helper'; import { EditApplicationSteps } from '../../edit-submission.component'; import { FilesStepComponent } from '../../files-step.partial'; import { SoilTableData } from '../soil-table/soil-table.component'; diff --git a/portal-frontend/src/app/features/edit-submission/proposal/nfu-proposal/nfu-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/nfu-proposal/nfu-proposal.component.html similarity index 100% rename from portal-frontend/src/app/features/edit-submission/proposal/nfu-proposal/nfu-proposal.component.html rename to portal-frontend/src/app/features/applications/edit-submission/proposal/nfu-proposal/nfu-proposal.component.html diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/nfu-proposal/nfu-proposal.component.scss b/portal-frontend/src/app/features/applications/edit-submission/proposal/nfu-proposal/nfu-proposal.component.scss new file mode 100644 index 0000000000..56caa68a82 --- /dev/null +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/nfu-proposal/nfu-proposal.component.scss @@ -0,0 +1,5 @@ +@use '../../../../../../styles/functions' as *; + +section { + margin-top: rem(36); +} diff --git a/portal-frontend/src/app/features/edit-submission/proposal/nfu-proposal/nfu-proposal.component.spec.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/nfu-proposal/nfu-proposal.component.spec.ts similarity index 84% rename from portal-frontend/src/app/features/edit-submission/proposal/nfu-proposal/nfu-proposal.component.spec.ts rename to portal-frontend/src/app/features/applications/edit-submission/proposal/nfu-proposal/nfu-proposal.component.spec.ts index 823f9fb6ae..c565dfdf9d 100644 --- a/portal-frontend/src/app/features/edit-submission/proposal/nfu-proposal/nfu-proposal.component.spec.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/nfu-proposal/nfu-proposal.component.spec.ts @@ -3,8 +3,8 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { Router } from '@angular/router'; import { DeepMocked, createMock } from '@golevelup/ts-jest'; import { BehaviorSubject } from 'rxjs'; -import { ApplicationSubmissionDetailedDto } from '../../../../services/application-submission/application-submission.dto'; -import { ApplicationSubmissionService } from '../../../../services/application-submission/application-submission.service'; +import { ApplicationSubmissionDetailedDto } from '../../../../../services/application-submission/application-submission.dto'; +import { ApplicationSubmissionService } from '../../../../../services/application-submission/application-submission.service'; import { NfuProposalComponent } from './nfu-proposal.component'; diff --git a/portal-frontend/src/app/features/edit-submission/proposal/nfu-proposal/nfu-proposal.component.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/nfu-proposal/nfu-proposal.component.ts similarity index 94% rename from portal-frontend/src/app/features/edit-submission/proposal/nfu-proposal/nfu-proposal.component.ts rename to portal-frontend/src/app/features/applications/edit-submission/proposal/nfu-proposal/nfu-proposal.component.ts index a69d6e39d9..ccb753d4c9 100644 --- a/portal-frontend/src/app/features/edit-submission/proposal/nfu-proposal/nfu-proposal.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/nfu-proposal/nfu-proposal.component.ts @@ -2,9 +2,9 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; import { FormControl, FormGroup, Validators } from '@angular/forms'; import { Router } from '@angular/router'; import { takeUntil } from 'rxjs'; -import { ApplicationSubmissionUpdateDto } from '../../../../services/application-submission/application-submission.dto'; -import { ApplicationSubmissionService } from '../../../../services/application-submission/application-submission.service'; -import { parseStringToBoolean } from '../../../../shared/utils/string-helper'; +import { ApplicationSubmissionUpdateDto } from '../../../../../services/application-submission/application-submission.dto'; +import { ApplicationSubmissionService } from '../../../../../services/application-submission/application-submission.service'; +import { parseStringToBoolean } from '../../../../../shared/utils/string-helper'; import { EditApplicationSteps } from '../../edit-submission.component'; import { StepComponent } from '../../step.partial'; import { SoilTableData } from '../soil-table/soil-table.component'; diff --git a/portal-frontend/src/app/features/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.html similarity index 100% rename from portal-frontend/src/app/features/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.html rename to portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.html diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.scss b/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.scss new file mode 100644 index 0000000000..56caa68a82 --- /dev/null +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.scss @@ -0,0 +1,5 @@ +@use '../../../../../../styles/functions' as *; + +section { + margin-top: rem(36); +} diff --git a/portal-frontend/src/app/features/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.spec.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.spec.ts similarity index 77% rename from portal-frontend/src/app/features/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.spec.ts rename to portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.spec.ts index 156e96014b..72ff08d305 100644 --- a/portal-frontend/src/app/features/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.spec.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.spec.ts @@ -4,11 +4,11 @@ import { MatDialog } from '@angular/material/dialog'; import { Router } from '@angular/router'; import { DeepMocked, createMock } from '@golevelup/ts-jest'; import { BehaviorSubject } from 'rxjs'; -import { ApplicationDocumentDto } from '../../../../services/application-document/application-document.dto'; -import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; -import { ApplicationParcelService } from '../../../../services/application-parcel/application-parcel.service'; -import { ApplicationSubmissionDetailedDto } from '../../../../services/application-submission/application-submission.dto'; -import { ApplicationSubmissionService } from '../../../../services/application-submission/application-submission.service'; +import { ApplicationDocumentDto } from '../../../../../services/application-document/application-document.dto'; +import { ApplicationDocumentService } from '../../../../../services/application-document/application-document.service'; +import { ApplicationParcelService } from '../../../../../services/application-parcel/application-parcel.service'; +import { ApplicationSubmissionDetailedDto } from '../../../../../services/application-submission/application-submission.dto'; +import { ApplicationSubmissionService } from '../../../../../services/application-submission/application-submission.service'; import { PfrsProposalComponent } from './pfrs-proposal.component'; diff --git a/portal-frontend/src/app/features/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.ts similarity index 93% rename from portal-frontend/src/app/features/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.ts rename to portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.ts index 85f439bdf2..07a2f4552d 100644 --- a/portal-frontend/src/app/features/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.ts @@ -6,13 +6,13 @@ import { takeUntil } from 'rxjs'; import { ApplicationDocumentDto, DOCUMENT_TYPE, -} from '../../../../services/application-document/application-document.dto'; -import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; -import { ApplicationSubmissionUpdateDto } from '../../../../services/application-submission/application-submission.dto'; -import { ApplicationSubmissionService } from '../../../../services/application-submission/application-submission.service'; -import { formatBooleanToString } from '../../../../shared/utils/boolean-helper'; -import { MOBILE_BREAKPOINT } from '../../../../shared/utils/breakpoints'; -import { parseStringToBoolean } from '../../../../shared/utils/string-helper'; +} from '../../../../../services/application-document/application-document.dto'; +import { ApplicationDocumentService } from '../../../../../services/application-document/application-document.service'; +import { ApplicationSubmissionUpdateDto } from '../../../../../services/application-submission/application-submission.dto'; +import { ApplicationSubmissionService } from '../../../../../services/application-submission/application-submission.service'; +import { formatBooleanToString } from '../../../../../shared/utils/boolean-helper'; +import { MOBILE_BREAKPOINT } from '../../../../../shared/utils/breakpoints'; +import { parseStringToBoolean } from '../../../../../shared/utils/string-helper'; import { EditApplicationSteps } from '../../edit-submission.component'; import { FilesStepComponent } from '../../files-step.partial'; import { SoilTableData } from '../soil-table/soil-table.component'; diff --git a/portal-frontend/src/app/features/edit-submission/proposal/pofo-proposal/pofo-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.html similarity index 100% rename from portal-frontend/src/app/features/edit-submission/proposal/pofo-proposal/pofo-proposal.component.html rename to portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.html diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.scss b/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.scss new file mode 100644 index 0000000000..56caa68a82 --- /dev/null +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.scss @@ -0,0 +1,5 @@ +@use '../../../../../../styles/functions' as *; + +section { + margin-top: rem(36); +} diff --git a/portal-frontend/src/app/features/edit-submission/proposal/pofo-proposal/pofo-proposal.component.spec.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.spec.ts similarity index 77% rename from portal-frontend/src/app/features/edit-submission/proposal/pofo-proposal/pofo-proposal.component.spec.ts rename to portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.spec.ts index b508ea45c5..8c73afeec4 100644 --- a/portal-frontend/src/app/features/edit-submission/proposal/pofo-proposal/pofo-proposal.component.spec.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.spec.ts @@ -4,11 +4,11 @@ import { MatDialog } from '@angular/material/dialog'; import { Router } from '@angular/router'; import { DeepMocked, createMock } from '@golevelup/ts-jest'; import { BehaviorSubject } from 'rxjs'; -import { ApplicationDocumentDto } from '../../../../services/application-document/application-document.dto'; -import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; -import { ApplicationParcelService } from '../../../../services/application-parcel/application-parcel.service'; -import { ApplicationSubmissionDetailedDto } from '../../../../services/application-submission/application-submission.dto'; -import { ApplicationSubmissionService } from '../../../../services/application-submission/application-submission.service'; +import { ApplicationDocumentDto } from '../../../../../services/application-document/application-document.dto'; +import { ApplicationDocumentService } from '../../../../../services/application-document/application-document.service'; +import { ApplicationParcelService } from '../../../../../services/application-parcel/application-parcel.service'; +import { ApplicationSubmissionDetailedDto } from '../../../../../services/application-submission/application-submission.dto'; +import { ApplicationSubmissionService } from '../../../../../services/application-submission/application-submission.service'; import { PofoProposalComponent } from './pofo-proposal.component'; diff --git a/portal-frontend/src/app/features/edit-submission/proposal/pofo-proposal/pofo-proposal.component.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.ts similarity index 91% rename from portal-frontend/src/app/features/edit-submission/proposal/pofo-proposal/pofo-proposal.component.ts rename to portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.ts index 0c874af44c..b3ccbb4b96 100644 --- a/portal-frontend/src/app/features/edit-submission/proposal/pofo-proposal/pofo-proposal.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.ts @@ -6,12 +6,12 @@ import { takeUntil } from 'rxjs'; import { ApplicationDocumentDto, DOCUMENT_TYPE, -} from '../../../../services/application-document/application-document.dto'; -import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; -import { ApplicationSubmissionUpdateDto } from '../../../../services/application-submission/application-submission.dto'; -import { ApplicationSubmissionService } from '../../../../services/application-submission/application-submission.service'; -import { formatBooleanToString } from '../../../../shared/utils/boolean-helper'; -import { parseStringToBoolean } from '../../../../shared/utils/string-helper'; +} from '../../../../../services/application-document/application-document.dto'; +import { ApplicationDocumentService } from '../../../../../services/application-document/application-document.service'; +import { ApplicationSubmissionUpdateDto } from '../../../../../services/application-submission/application-submission.dto'; +import { ApplicationSubmissionService } from '../../../../../services/application-submission/application-submission.service'; +import { formatBooleanToString } from '../../../../../shared/utils/boolean-helper'; +import { parseStringToBoolean } from '../../../../../shared/utils/string-helper'; import { EditApplicationSteps } from '../../edit-submission.component'; import { FilesStepComponent } from '../../files-step.partial'; import { SoilTableData } from '../soil-table/soil-table.component'; diff --git a/portal-frontend/src/app/features/edit-submission/proposal/roso-proposal/roso-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.html similarity index 100% rename from portal-frontend/src/app/features/edit-submission/proposal/roso-proposal/roso-proposal.component.html rename to portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.html diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.scss b/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.scss new file mode 100644 index 0000000000..56caa68a82 --- /dev/null +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.scss @@ -0,0 +1,5 @@ +@use '../../../../../../styles/functions' as *; + +section { + margin-top: rem(36); +} diff --git a/portal-frontend/src/app/features/edit-submission/proposal/roso-proposal/roso-proposal.component.spec.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.spec.ts similarity index 77% rename from portal-frontend/src/app/features/edit-submission/proposal/roso-proposal/roso-proposal.component.spec.ts rename to portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.spec.ts index f0b8aca06b..6c17a24fe7 100644 --- a/portal-frontend/src/app/features/edit-submission/proposal/roso-proposal/roso-proposal.component.spec.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.spec.ts @@ -4,11 +4,11 @@ import { MatDialog } from '@angular/material/dialog'; import { Router } from '@angular/router'; import { DeepMocked, createMock } from '@golevelup/ts-jest'; import { BehaviorSubject } from 'rxjs'; -import { ApplicationDocumentDto } from '../../../../services/application-document/application-document.dto'; -import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; -import { ApplicationParcelService } from '../../../../services/application-parcel/application-parcel.service'; -import { ApplicationSubmissionDetailedDto } from '../../../../services/application-submission/application-submission.dto'; -import { ApplicationSubmissionService } from '../../../../services/application-submission/application-submission.service'; +import { ApplicationDocumentDto } from '../../../../../services/application-document/application-document.dto'; +import { ApplicationDocumentService } from '../../../../../services/application-document/application-document.service'; +import { ApplicationParcelService } from '../../../../../services/application-parcel/application-parcel.service'; +import { ApplicationSubmissionDetailedDto } from '../../../../../services/application-submission/application-submission.dto'; +import { ApplicationSubmissionService } from '../../../../../services/application-submission/application-submission.service'; import { RosoProposalComponent } from './roso-proposal.component'; diff --git a/portal-frontend/src/app/features/edit-submission/proposal/roso-proposal/roso-proposal.component.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.ts similarity index 91% rename from portal-frontend/src/app/features/edit-submission/proposal/roso-proposal/roso-proposal.component.ts rename to portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.ts index 1500bd6da3..83812714ac 100644 --- a/portal-frontend/src/app/features/edit-submission/proposal/roso-proposal/roso-proposal.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.ts @@ -6,12 +6,12 @@ import { takeUntil } from 'rxjs'; import { ApplicationDocumentDto, DOCUMENT_TYPE, -} from '../../../../services/application-document/application-document.dto'; -import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; -import { ApplicationSubmissionUpdateDto } from '../../../../services/application-submission/application-submission.dto'; -import { ApplicationSubmissionService } from '../../../../services/application-submission/application-submission.service'; -import { formatBooleanToString } from '../../../../shared/utils/boolean-helper'; -import { parseStringToBoolean } from '../../../../shared/utils/string-helper'; +} from '../../../../../services/application-document/application-document.dto'; +import { ApplicationDocumentService } from '../../../../../services/application-document/application-document.service'; +import { ApplicationSubmissionUpdateDto } from '../../../../../services/application-submission/application-submission.dto'; +import { ApplicationSubmissionService } from '../../../../../services/application-submission/application-submission.service'; +import { formatBooleanToString } from '../../../../../shared/utils/boolean-helper'; +import { parseStringToBoolean } from '../../../../../shared/utils/string-helper'; import { EditApplicationSteps } from '../../edit-submission.component'; import { FilesStepComponent } from '../../files-step.partial'; import { SoilTableData } from '../soil-table/soil-table.component'; diff --git a/portal-frontend/src/app/features/edit-submission/proposal/soil-table/soil-table.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/soil-table/soil-table.component.html similarity index 100% rename from portal-frontend/src/app/features/edit-submission/proposal/soil-table/soil-table.component.html rename to portal-frontend/src/app/features/applications/edit-submission/proposal/soil-table/soil-table.component.html diff --git a/portal-frontend/src/app/features/edit-submission/proposal/soil-table/soil-table.component.scss b/portal-frontend/src/app/features/applications/edit-submission/proposal/soil-table/soil-table.component.scss similarity index 95% rename from portal-frontend/src/app/features/edit-submission/proposal/soil-table/soil-table.component.scss rename to portal-frontend/src/app/features/applications/edit-submission/proposal/soil-table/soil-table.component.scss index b53e708d53..d1987e6e0e 100644 --- a/portal-frontend/src/app/features/edit-submission/proposal/soil-table/soil-table.component.scss +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/soil-table/soil-table.component.scss @@ -1,4 +1,4 @@ -@use '../../../../../styles/functions' as *; +@use '../../../../../../styles/functions' as *; .container { border: 1px solid #000; diff --git a/portal-frontend/src/app/features/edit-submission/proposal/soil-table/soil-table.component.spec.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/soil-table/soil-table.component.spec.ts similarity index 100% rename from portal-frontend/src/app/features/edit-submission/proposal/soil-table/soil-table.component.spec.ts rename to portal-frontend/src/app/features/applications/edit-submission/proposal/soil-table/soil-table.component.spec.ts diff --git a/portal-frontend/src/app/features/edit-submission/proposal/soil-table/soil-table.component.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/soil-table/soil-table.component.ts similarity index 100% rename from portal-frontend/src/app/features/edit-submission/proposal/soil-table/soil-table.component.ts rename to portal-frontend/src/app/features/applications/edit-submission/proposal/soil-table/soil-table.component.ts diff --git a/portal-frontend/src/app/features/edit-submission/proposal/subd-proposal/subd-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.html similarity index 100% rename from portal-frontend/src/app/features/edit-submission/proposal/subd-proposal/subd-proposal.component.html rename to portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.html diff --git a/portal-frontend/src/app/features/edit-submission/proposal/subd-proposal/subd-proposal.component.scss b/portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.scss similarity index 62% rename from portal-frontend/src/app/features/edit-submission/proposal/subd-proposal/subd-proposal.component.scss rename to portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.scss index b50b55c96b..c56600402d 100644 --- a/portal-frontend/src/app/features/edit-submission/proposal/subd-proposal/subd-proposal.component.scss +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.scss @@ -1,4 +1,4 @@ -@use '../../../../../styles/functions' as *; +@use '../../../../../../styles/functions' as *; section { margin-top: rem(36); diff --git a/portal-frontend/src/app/features/edit-submission/proposal/subd-proposal/subd-proposal.component.spec.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.spec.ts similarity index 77% rename from portal-frontend/src/app/features/edit-submission/proposal/subd-proposal/subd-proposal.component.spec.ts rename to portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.spec.ts index 0a9de1f967..688c0570db 100644 --- a/portal-frontend/src/app/features/edit-submission/proposal/subd-proposal/subd-proposal.component.spec.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.spec.ts @@ -4,11 +4,11 @@ import { MatDialog } from '@angular/material/dialog'; import { Router } from '@angular/router'; import { DeepMocked, createMock } from '@golevelup/ts-jest'; import { BehaviorSubject } from 'rxjs'; -import { ApplicationDocumentDto } from '../../../../services/application-document/application-document.dto'; -import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; -import { ApplicationParcelService } from '../../../../services/application-parcel/application-parcel.service'; -import { ApplicationSubmissionDetailedDto } from '../../../../services/application-submission/application-submission.dto'; -import { ApplicationSubmissionService } from '../../../../services/application-submission/application-submission.service'; +import { ApplicationDocumentDto } from '../../../../../services/application-document/application-document.dto'; +import { ApplicationDocumentService } from '../../../../../services/application-document/application-document.service'; +import { ApplicationParcelService } from '../../../../../services/application-parcel/application-parcel.service'; +import { ApplicationSubmissionDetailedDto } from '../../../../../services/application-submission/application-submission.dto'; +import { ApplicationSubmissionService } from '../../../../../services/application-submission/application-submission.service'; import { SubdProposalComponent } from './subd-proposal.component'; diff --git a/portal-frontend/src/app/features/edit-submission/proposal/subd-proposal/subd-proposal.component.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.ts similarity index 89% rename from portal-frontend/src/app/features/edit-submission/proposal/subd-proposal/subd-proposal.component.ts rename to portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.ts index 86b663dcd1..e1bfec8990 100644 --- a/portal-frontend/src/app/features/edit-submission/proposal/subd-proposal/subd-proposal.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.ts @@ -7,12 +7,12 @@ import { takeUntil } from 'rxjs'; import { ApplicationDocumentDto, DOCUMENT_TYPE, -} from '../../../../services/application-document/application-document.dto'; -import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; -import { PARCEL_TYPE } from '../../../../services/application-parcel/application-parcel.dto'; -import { ApplicationParcelService } from '../../../../services/application-parcel/application-parcel.service'; -import { ApplicationSubmissionUpdateDto } from '../../../../services/application-submission/application-submission.dto'; -import { ApplicationSubmissionService } from '../../../../services/application-submission/application-submission.service'; +} from '../../../../../services/application-document/application-document.dto'; +import { ApplicationDocumentService } from '../../../../../services/application-document/application-document.service'; +import { PARCEL_TYPE } from '../../../../../services/application-parcel/application-parcel.dto'; +import { ApplicationParcelService } from '../../../../../services/application-parcel/application-parcel.service'; +import { ApplicationSubmissionUpdateDto } from '../../../../../services/application-submission/application-submission.dto'; +import { ApplicationSubmissionService } from '../../../../../services/application-submission/application-submission.service'; import { EditApplicationSteps } from '../../edit-submission.component'; import { FilesStepComponent } from '../../files-step.partial'; diff --git a/portal-frontend/src/app/features/edit-submission/proposal/tur-proposal/tur-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/tur-proposal/tur-proposal.component.html similarity index 100% rename from portal-frontend/src/app/features/edit-submission/proposal/tur-proposal/tur-proposal.component.html rename to portal-frontend/src/app/features/applications/edit-submission/proposal/tur-proposal/tur-proposal.component.html diff --git a/portal-frontend/src/app/features/edit-submission/proposal/tur-proposal/tur-proposal.component.scss b/portal-frontend/src/app/features/applications/edit-submission/proposal/tur-proposal/tur-proposal.component.scss similarity index 62% rename from portal-frontend/src/app/features/edit-submission/proposal/tur-proposal/tur-proposal.component.scss rename to portal-frontend/src/app/features/applications/edit-submission/proposal/tur-proposal/tur-proposal.component.scss index 4526212950..fd01b5a150 100644 --- a/portal-frontend/src/app/features/edit-submission/proposal/tur-proposal/tur-proposal.component.scss +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/tur-proposal/tur-proposal.component.scss @@ -1,4 +1,4 @@ -@use '../../../../../styles/functions' as *; +@use '../../../../../../styles/functions' as *; section { margin-top: rem(36); diff --git a/portal-frontend/src/app/features/edit-submission/proposal/tur-proposal/tur-proposal.component.spec.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/tur-proposal/tur-proposal.component.spec.ts similarity index 79% rename from portal-frontend/src/app/features/edit-submission/proposal/tur-proposal/tur-proposal.component.spec.ts rename to portal-frontend/src/app/features/applications/edit-submission/proposal/tur-proposal/tur-proposal.component.spec.ts index bf47a5864c..c501f29ee4 100644 --- a/portal-frontend/src/app/features/edit-submission/proposal/tur-proposal/tur-proposal.component.spec.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/tur-proposal/tur-proposal.component.spec.ts @@ -4,10 +4,10 @@ import { MatDialog } from '@angular/material/dialog'; import { Router } from '@angular/router'; import { DeepMocked, createMock } from '@golevelup/ts-jest'; import { BehaviorSubject } from 'rxjs'; -import { ApplicationDocumentDto } from '../../../../services/application-document/application-document.dto'; -import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; -import { ApplicationSubmissionDetailedDto } from '../../../../services/application-submission/application-submission.dto'; -import { ApplicationSubmissionService } from '../../../../services/application-submission/application-submission.service'; +import { ApplicationDocumentDto } from '../../../../../services/application-document/application-document.dto'; +import { ApplicationDocumentService } from '../../../../../services/application-document/application-document.service'; +import { ApplicationSubmissionDetailedDto } from '../../../../../services/application-submission/application-submission.dto'; +import { ApplicationSubmissionService } from '../../../../../services/application-submission/application-submission.service'; import { TurProposalComponent } from './tur-proposal.component'; diff --git a/portal-frontend/src/app/features/edit-submission/proposal/tur-proposal/tur-proposal.component.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/tur-proposal/tur-proposal.component.ts similarity index 90% rename from portal-frontend/src/app/features/edit-submission/proposal/tur-proposal/tur-proposal.component.ts rename to portal-frontend/src/app/features/applications/edit-submission/proposal/tur-proposal/tur-proposal.component.ts index f0f9a2e831..0c85764f3e 100644 --- a/portal-frontend/src/app/features/edit-submission/proposal/tur-proposal/tur-proposal.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/tur-proposal/tur-proposal.component.ts @@ -6,10 +6,10 @@ import { takeUntil } from 'rxjs'; import { ApplicationDocumentDto, DOCUMENT_TYPE, -} from '../../../../services/application-document/application-document.dto'; -import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; -import { ApplicationSubmissionUpdateDto } from '../../../../services/application-submission/application-submission.dto'; -import { ApplicationSubmissionService } from '../../../../services/application-submission/application-submission.service'; +} from '../../../../../services/application-document/application-document.dto'; +import { ApplicationDocumentService } from '../../../../../services/application-document/application-document.service'; +import { ApplicationSubmissionUpdateDto } from '../../../../../services/application-submission/application-submission.dto'; +import { ApplicationSubmissionService } from '../../../../../services/application-submission/application-submission.service'; import { EditApplicationSteps } from '../../edit-submission.component'; import { FilesStepComponent } from '../../files-step.partial'; diff --git a/portal-frontend/src/app/features/edit-submission/review-and-submit/review-and-submit.component.html b/portal-frontend/src/app/features/applications/edit-submission/review-and-submit/review-and-submit.component.html similarity index 100% rename from portal-frontend/src/app/features/edit-submission/review-and-submit/review-and-submit.component.html rename to portal-frontend/src/app/features/applications/edit-submission/review-and-submit/review-and-submit.component.html diff --git a/portal-frontend/src/app/features/edit-submission/review-and-submit/review-and-submit.component.scss b/portal-frontend/src/app/features/applications/edit-submission/review-and-submit/review-and-submit.component.scss similarity index 100% rename from portal-frontend/src/app/features/edit-submission/review-and-submit/review-and-submit.component.scss rename to portal-frontend/src/app/features/applications/edit-submission/review-and-submit/review-and-submit.component.scss diff --git a/portal-frontend/src/app/features/edit-submission/review-and-submit/review-and-submit.component.spec.ts b/portal-frontend/src/app/features/applications/edit-submission/review-and-submit/review-and-submit.component.spec.ts similarity index 79% rename from portal-frontend/src/app/features/edit-submission/review-and-submit/review-and-submit.component.spec.ts rename to portal-frontend/src/app/features/applications/edit-submission/review-and-submit/review-and-submit.component.spec.ts index 69089069ef..acf4ab4aad 100644 --- a/portal-frontend/src/app/features/edit-submission/review-and-submit/review-and-submit.component.spec.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/review-and-submit/review-and-submit.component.spec.ts @@ -4,11 +4,11 @@ import { MatDialog } from '@angular/material/dialog'; import { Router } from '@angular/router'; import { DeepMocked, createMock } from '@golevelup/ts-jest'; import { BehaviorSubject } from 'rxjs'; -import { ApplicationSubmissionDetailedDto } from '../../../services/application-submission/application-submission.dto'; -import { ApplicationSubmissionService } from '../../../services/application-submission/application-submission.service'; -import { CodeService } from '../../../services/code/code.service'; -import { PdfGenerationService } from '../../../services/pdf-generation/pdf-generation.service'; -import { ToastService } from '../../../services/toast/toast.service'; +import { ApplicationSubmissionDetailedDto } from '../../../../services/application-submission/application-submission.dto'; +import { ApplicationSubmissionService } from '../../../../services/application-submission/application-submission.service'; +import { CodeService } from '../../../../services/code/code.service'; +import { PdfGenerationService } from '../../../../services/pdf-generation/pdf-generation.service'; +import { ToastService } from '../../../../services/toast/toast.service'; import { ReviewAndSubmitComponent } from './review-and-submit.component'; diff --git a/portal-frontend/src/app/features/edit-submission/review-and-submit/review-and-submit.component.ts b/portal-frontend/src/app/features/applications/edit-submission/review-and-submit/review-and-submit.component.ts similarity index 79% rename from portal-frontend/src/app/features/edit-submission/review-and-submit/review-and-submit.component.ts rename to portal-frontend/src/app/features/applications/edit-submission/review-and-submit/review-and-submit.component.ts index b20cc04cd3..49dbe47874 100644 --- a/portal-frontend/src/app/features/edit-submission/review-and-submit/review-and-submit.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/review-and-submit/review-and-submit.component.ts @@ -2,12 +2,12 @@ import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angu import { MatDialog } from '@angular/material/dialog'; import { Router } from '@angular/router'; import { BehaviorSubject, takeUntil } from 'rxjs'; -import { ApplicationDocumentDto } from '../../../services/application-document/application-document.dto'; -import { ApplicationSubmissionDetailedDto } from '../../../services/application-submission/application-submission.dto'; -import { ApplicationSubmissionService } from '../../../services/application-submission/application-submission.service'; -import { CodeService } from '../../../services/code/code.service'; -import { PdfGenerationService } from '../../../services/pdf-generation/pdf-generation.service'; -import { ToastService } from '../../../services/toast/toast.service'; +import { ApplicationDocumentDto } from '../../../../services/application-document/application-document.dto'; +import { ApplicationSubmissionDetailedDto } from '../../../../services/application-submission/application-submission.dto'; +import { ApplicationSubmissionService } from '../../../../services/application-submission/application-submission.service'; +import { CodeService } from '../../../../services/code/code.service'; +import { PdfGenerationService } from '../../../../services/pdf-generation/pdf-generation.service'; +import { ToastService } from '../../../../services/toast/toast.service'; import { StepComponent } from '../step.partial'; import { SubmitConfirmationDialogComponent } from './submit-confirmation-dialog/submit-confirmation-dialog.component'; diff --git a/portal-frontend/src/app/features/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.html b/portal-frontend/src/app/features/applications/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.html similarity index 100% rename from portal-frontend/src/app/features/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.html rename to portal-frontend/src/app/features/applications/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.html diff --git a/portal-frontend/src/app/features/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.scss b/portal-frontend/src/app/features/applications/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.scss similarity index 81% rename from portal-frontend/src/app/features/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.scss rename to portal-frontend/src/app/features/applications/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.scss index d4f7e0ae48..93f22cbbcb 100644 --- a/portal-frontend/src/app/features/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.scss +++ b/portal-frontend/src/app/features/applications/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.scss @@ -1,4 +1,4 @@ -@use '../../../../../styles/functions' as *; +@use '../../../../../../styles/functions' as *; .checkbox { margin: rem(10) 0; diff --git a/portal-frontend/src/app/features/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.spec.ts b/portal-frontend/src/app/features/applications/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.spec.ts similarity index 100% rename from portal-frontend/src/app/features/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.spec.ts rename to portal-frontend/src/app/features/applications/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.spec.ts diff --git a/portal-frontend/src/app/features/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.ts b/portal-frontend/src/app/features/applications/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.ts similarity index 100% rename from portal-frontend/src/app/features/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.ts rename to portal-frontend/src/app/features/applications/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.ts diff --git a/portal-frontend/src/app/features/edit-submission/select-government/select-government.component.html b/portal-frontend/src/app/features/applications/edit-submission/select-government/select-government.component.html similarity index 100% rename from portal-frontend/src/app/features/edit-submission/select-government/select-government.component.html rename to portal-frontend/src/app/features/applications/edit-submission/select-government/select-government.component.html diff --git a/portal-frontend/src/app/features/edit-submission/select-government/select-government.component.scss b/portal-frontend/src/app/features/applications/edit-submission/select-government/select-government.component.scss similarity index 100% rename from portal-frontend/src/app/features/edit-submission/select-government/select-government.component.scss rename to portal-frontend/src/app/features/applications/edit-submission/select-government/select-government.component.scss diff --git a/portal-frontend/src/app/features/edit-submission/select-government/select-government.component.spec.ts b/portal-frontend/src/app/features/applications/edit-submission/select-government/select-government.component.spec.ts similarity index 81% rename from portal-frontend/src/app/features/edit-submission/select-government/select-government.component.spec.ts rename to portal-frontend/src/app/features/applications/edit-submission/select-government/select-government.component.spec.ts index 65c6a4522f..c0e86d5608 100644 --- a/portal-frontend/src/app/features/edit-submission/select-government/select-government.component.spec.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/select-government/select-government.component.spec.ts @@ -3,9 +3,9 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MatAutocomplete } from '@angular/material/autocomplete'; import { DeepMocked, createMock } from '@golevelup/ts-jest'; import { BehaviorSubject } from 'rxjs'; -import { ApplicationSubmissionDetailedDto } from '../../../services/application-submission/application-submission.dto'; -import { ApplicationSubmissionService } from '../../../services/application-submission/application-submission.service'; -import { CodeService } from '../../../services/code/code.service'; +import { ApplicationSubmissionDetailedDto } from '../../../../services/application-submission/application-submission.dto'; +import { ApplicationSubmissionService } from '../../../../services/application-submission/application-submission.service'; +import { CodeService } from '../../../../services/code/code.service'; import { SelectGovernmentComponent } from './select-government.component'; diff --git a/portal-frontend/src/app/features/edit-submission/select-government/select-government.component.ts b/portal-frontend/src/app/features/applications/edit-submission/select-government/select-government.component.ts similarity index 94% rename from portal-frontend/src/app/features/edit-submission/select-government/select-government.component.ts rename to portal-frontend/src/app/features/applications/edit-submission/select-government/select-government.component.ts index 9acdf56fd4..2fb8d05845 100644 --- a/portal-frontend/src/app/features/edit-submission/select-government/select-government.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/select-government/select-government.component.ts @@ -3,9 +3,9 @@ import { FormControl, FormGroup, Validators } from '@angular/forms'; import { MatAutocompleteSelectedEvent } from '@angular/material/autocomplete'; import { Router } from '@angular/router'; import { map, Observable, startWith, takeUntil } from 'rxjs'; -import { ApplicationSubmissionService } from '../../../services/application-submission/application-submission.service'; -import { LocalGovernmentDto } from '../../../services/code/code.dto'; -import { CodeService } from '../../../services/code/code.service'; +import { ApplicationSubmissionService } from '../../../../services/application-submission/application-submission.service'; +import { LocalGovernmentDto } from '../../../../services/code/code.dto'; +import { CodeService } from '../../../../services/code/code.service'; import { EditApplicationSteps } from '../edit-submission.component'; import { StepComponent } from '../step.partial'; diff --git a/portal-frontend/src/app/features/edit-submission/step.partial.ts b/portal-frontend/src/app/features/applications/edit-submission/step.partial.ts similarity index 86% rename from portal-frontend/src/app/features/edit-submission/step.partial.ts rename to portal-frontend/src/app/features/applications/edit-submission/step.partial.ts index c88bffdbb5..b874e123ef 100644 --- a/portal-frontend/src/app/features/edit-submission/step.partial.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/step.partial.ts @@ -1,6 +1,6 @@ import { Component, EventEmitter, Input, OnDestroy, Output } from '@angular/core'; import { BehaviorSubject, Subject } from 'rxjs'; -import { ApplicationSubmissionDetailedDto } from '../../services/application-submission/application-submission.dto'; +import { ApplicationSubmissionDetailedDto } from '../../../services/application-submission/application-submission.dto'; @Component({ selector: 'app-step', diff --git a/portal-frontend/src/app/features/review-submission/return-application-dialog/return-application-dialog.component.html b/portal-frontend/src/app/features/applications/review-submission/return-application-dialog/return-application-dialog.component.html similarity index 100% rename from portal-frontend/src/app/features/review-submission/return-application-dialog/return-application-dialog.component.html rename to portal-frontend/src/app/features/applications/review-submission/return-application-dialog/return-application-dialog.component.html diff --git a/portal-frontend/src/app/features/review-submission/return-application-dialog/return-application-dialog.component.scss b/portal-frontend/src/app/features/applications/review-submission/return-application-dialog/return-application-dialog.component.scss similarity index 93% rename from portal-frontend/src/app/features/review-submission/return-application-dialog/return-application-dialog.component.scss rename to portal-frontend/src/app/features/applications/review-submission/return-application-dialog/return-application-dialog.component.scss index b4db98c980..5c9b16b19e 100644 --- a/portal-frontend/src/app/features/review-submission/return-application-dialog/return-application-dialog.component.scss +++ b/portal-frontend/src/app/features/applications/review-submission/return-application-dialog/return-application-dialog.component.scss @@ -1,5 +1,5 @@ -@use '../../../../styles/functions' as *; -@use '../../../../styles/colors'; +@use '../../../../../styles/functions' as *; +@use '../../../../../styles/colors'; .return-application-modal { width: 80vw; diff --git a/portal-frontend/src/app/features/review-submission/return-application-dialog/return-application-dialog.component.spec.ts b/portal-frontend/src/app/features/applications/review-submission/return-application-dialog/return-application-dialog.component.spec.ts similarity index 90% rename from portal-frontend/src/app/features/review-submission/return-application-dialog/return-application-dialog.component.spec.ts rename to portal-frontend/src/app/features/applications/review-submission/return-application-dialog/return-application-dialog.component.spec.ts index 36d99ea003..fabd328ecd 100644 --- a/portal-frontend/src/app/features/review-submission/return-application-dialog/return-application-dialog.component.spec.ts +++ b/portal-frontend/src/app/features/applications/review-submission/return-application-dialog/return-application-dialog.component.spec.ts @@ -4,7 +4,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MAT_DIALOG_DATA, MatDialogModule, MatDialogRef } from '@angular/material/dialog'; import { MatRadioModule } from '@angular/material/radio'; import { DeepMocked, createMock } from '@golevelup/ts-jest'; -import { ApplicationSubmissionReviewService } from '../../../services/application-submission-review/application-submission-review.service'; +import { ApplicationSubmissionReviewService } from '../../../../services/application-submission-review/application-submission-review.service'; import { ReturnApplicationDialogComponent } from './return-application-dialog.component'; describe('ReturnApplicationDialogComponent', () => { diff --git a/portal-frontend/src/app/features/review-submission/return-application-dialog/return-application-dialog.component.ts b/portal-frontend/src/app/features/applications/review-submission/return-application-dialog/return-application-dialog.component.ts similarity index 92% rename from portal-frontend/src/app/features/review-submission/return-application-dialog/return-application-dialog.component.ts rename to portal-frontend/src/app/features/applications/review-submission/return-application-dialog/return-application-dialog.component.ts index 803d69ef03..31da37f008 100644 --- a/portal-frontend/src/app/features/review-submission/return-application-dialog/return-application-dialog.component.ts +++ b/portal-frontend/src/app/features/applications/review-submission/return-application-dialog/return-application-dialog.component.ts @@ -1,6 +1,6 @@ import { Component, Inject, OnInit } from '@angular/core'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; -import { ApplicationSubmissionReviewService } from '../../../services/application-submission-review/application-submission-review.service'; +import { ApplicationSubmissionReviewService } from '../../../../services/application-submission-review/application-submission-review.service'; export enum ReturnApplicationStepEnum { reason = 0, diff --git a/portal-frontend/src/app/features/review-submission/review-attachments/review-attachments.component.html b/portal-frontend/src/app/features/applications/review-submission/review-attachments/review-attachments.component.html similarity index 100% rename from portal-frontend/src/app/features/review-submission/review-attachments/review-attachments.component.html rename to portal-frontend/src/app/features/applications/review-submission/review-attachments/review-attachments.component.html diff --git a/portal-frontend/src/app/features/edit-submission/proposal/pofo-proposal/pofo-proposal.component.scss b/portal-frontend/src/app/features/applications/review-submission/review-attachments/review-attachments.component.scss similarity index 69% rename from portal-frontend/src/app/features/edit-submission/proposal/pofo-proposal/pofo-proposal.component.scss rename to portal-frontend/src/app/features/applications/review-submission/review-attachments/review-attachments.component.scss index 8223c57759..74a771ed0c 100644 --- a/portal-frontend/src/app/features/edit-submission/proposal/pofo-proposal/pofo-proposal.component.scss +++ b/portal-frontend/src/app/features/applications/review-submission/review-attachments/review-attachments.component.scss @@ -1,5 +1,5 @@ @use '../../../../../styles/functions' as *; section { - margin-top: rem(36); + margin-bottom: rem(24); } diff --git a/portal-frontend/src/app/features/review-submission/review-attachments/review-attachments.component.spec.ts b/portal-frontend/src/app/features/applications/review-submission/review-attachments/review-attachments.component.spec.ts similarity index 78% rename from portal-frontend/src/app/features/review-submission/review-attachments/review-attachments.component.spec.ts rename to portal-frontend/src/app/features/applications/review-submission/review-attachments/review-attachments.component.spec.ts index f76fcb0c13..5405ebec90 100644 --- a/portal-frontend/src/app/features/review-submission/review-attachments/review-attachments.component.spec.ts +++ b/portal-frontend/src/app/features/applications/review-submission/review-attachments/review-attachments.component.spec.ts @@ -3,10 +3,10 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { Router } from '@angular/router'; import { DeepMocked, createMock } from '@golevelup/ts-jest'; import { BehaviorSubject } from 'rxjs'; -import { ApplicationDocumentDto } from '../../../services/application-document/application-document.dto'; -import { ApplicationDocumentService } from '../../../services/application-document/application-document.service'; -import { ApplicationSubmissionReviewDto } from '../../../services/application-submission-review/application-submission-review.dto'; -import { ApplicationSubmissionReviewService } from '../../../services/application-submission-review/application-submission-review.service'; +import { ApplicationDocumentDto } from '../../../../services/application-document/application-document.dto'; +import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; +import { ApplicationSubmissionReviewDto } from '../../../../services/application-submission-review/application-submission-review.dto'; +import { ApplicationSubmissionReviewService } from '../../../../services/application-submission-review/application-submission-review.service'; import { ReviewAttachmentsComponent } from './review-attachments.component'; diff --git a/portal-frontend/src/app/features/review-submission/review-attachments/review-attachments.component.ts b/portal-frontend/src/app/features/applications/review-submission/review-attachments/review-attachments.component.ts similarity index 91% rename from portal-frontend/src/app/features/review-submission/review-attachments/review-attachments.component.ts rename to portal-frontend/src/app/features/applications/review-submission/review-attachments/review-attachments.component.ts index b15894ef63..8e8b0f4f06 100644 --- a/portal-frontend/src/app/features/review-submission/review-attachments/review-attachments.component.ts +++ b/portal-frontend/src/app/features/applications/review-submission/review-attachments/review-attachments.component.ts @@ -5,10 +5,10 @@ import { ApplicationDocumentDto, DOCUMENT_SOURCE, DOCUMENT_TYPE, -} from '../../../services/application-document/application-document.dto'; -import { ApplicationDocumentService } from '../../../services/application-document/application-document.service'; -import { ApplicationSubmissionReviewService } from '../../../services/application-submission-review/application-submission-review.service'; -import { FileHandle } from '../../../shared/file-drag-drop/drag-drop.directive'; +} from '../../../../services/application-document/application-document.dto'; +import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; +import { ApplicationSubmissionReviewService } from '../../../../services/application-submission-review/application-submission-review.service'; +import { FileHandle } from '../../../../shared/file-drag-drop/drag-drop.directive'; import { ReviewApplicationFngSteps, ReviewApplicationSteps } from '../review-submission.component'; @Component({ diff --git a/portal-frontend/src/app/features/review-submission/review-contact-information/review-contact-information.component.html b/portal-frontend/src/app/features/applications/review-submission/review-contact-information/review-contact-information.component.html similarity index 100% rename from portal-frontend/src/app/features/review-submission/review-contact-information/review-contact-information.component.html rename to portal-frontend/src/app/features/applications/review-submission/review-contact-information/review-contact-information.component.html diff --git a/portal-frontend/src/app/features/review-submission/review-contact-information/review-contact-information.component.scss b/portal-frontend/src/app/features/applications/review-submission/review-contact-information/review-contact-information.component.scss similarity index 100% rename from portal-frontend/src/app/features/review-submission/review-contact-information/review-contact-information.component.scss rename to portal-frontend/src/app/features/applications/review-submission/review-contact-information/review-contact-information.component.scss diff --git a/portal-frontend/src/app/features/review-submission/review-contact-information/review-contact-information.component.spec.ts b/portal-frontend/src/app/features/applications/review-submission/review-contact-information/review-contact-information.component.spec.ts similarity index 84% rename from portal-frontend/src/app/features/review-submission/review-contact-information/review-contact-information.component.spec.ts rename to portal-frontend/src/app/features/applications/review-submission/review-contact-information/review-contact-information.component.spec.ts index e6eddbcf91..006ffafea8 100644 --- a/portal-frontend/src/app/features/review-submission/review-contact-information/review-contact-information.component.spec.ts +++ b/portal-frontend/src/app/features/applications/review-submission/review-contact-information/review-contact-information.component.spec.ts @@ -3,8 +3,8 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { Router } from '@angular/router'; import { DeepMocked, createMock } from '@golevelup/ts-jest'; import { BehaviorSubject } from 'rxjs'; -import { ApplicationSubmissionReviewDto } from '../../../services/application-submission-review/application-submission-review.dto'; -import { ApplicationSubmissionReviewService } from '../../../services/application-submission-review/application-submission-review.service'; +import { ApplicationSubmissionReviewDto } from '../../../../services/application-submission-review/application-submission-review.dto'; +import { ApplicationSubmissionReviewService } from '../../../../services/application-submission-review/application-submission-review.service'; import { ReviewContactInformationComponent } from './review-contact-information.component'; diff --git a/portal-frontend/src/app/features/review-submission/review-contact-information/review-contact-information.component.ts b/portal-frontend/src/app/features/applications/review-submission/review-contact-information/review-contact-information.component.ts similarity index 96% rename from portal-frontend/src/app/features/review-submission/review-contact-information/review-contact-information.component.ts rename to portal-frontend/src/app/features/applications/review-submission/review-contact-information/review-contact-information.component.ts index 2127f3ba91..40644c8efe 100644 --- a/portal-frontend/src/app/features/review-submission/review-contact-information/review-contact-information.component.ts +++ b/portal-frontend/src/app/features/applications/review-submission/review-contact-information/review-contact-information.component.ts @@ -2,7 +2,7 @@ import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angu import { FormControl, FormGroup, Validators } from '@angular/forms'; import { Router } from '@angular/router'; import { Subject, takeUntil } from 'rxjs'; -import { ApplicationSubmissionReviewService } from '../../../services/application-submission-review/application-submission-review.service'; +import { ApplicationSubmissionReviewService } from '../../../../services/application-submission-review/application-submission-review.service'; import { ReviewApplicationSteps } from '../review-submission.component'; @Component({ diff --git a/portal-frontend/src/app/features/review-submission/review-ocp/review-ocp.component.html b/portal-frontend/src/app/features/applications/review-submission/review-ocp/review-ocp.component.html similarity index 100% rename from portal-frontend/src/app/features/review-submission/review-ocp/review-ocp.component.html rename to portal-frontend/src/app/features/applications/review-submission/review-ocp/review-ocp.component.html diff --git a/portal-frontend/src/app/features/review-submission/review-ocp/review-ocp.component.scss b/portal-frontend/src/app/features/applications/review-submission/review-ocp/review-ocp.component.scss similarity index 100% rename from portal-frontend/src/app/features/review-submission/review-ocp/review-ocp.component.scss rename to portal-frontend/src/app/features/applications/review-submission/review-ocp/review-ocp.component.scss diff --git a/portal-frontend/src/app/features/review-submission/review-ocp/review-ocp.component.spec.ts b/portal-frontend/src/app/features/applications/review-submission/review-ocp/review-ocp.component.spec.ts similarity index 83% rename from portal-frontend/src/app/features/review-submission/review-ocp/review-ocp.component.spec.ts rename to portal-frontend/src/app/features/applications/review-submission/review-ocp/review-ocp.component.spec.ts index e4eec16439..b66188e8d8 100644 --- a/portal-frontend/src/app/features/review-submission/review-ocp/review-ocp.component.spec.ts +++ b/portal-frontend/src/app/features/applications/review-submission/review-ocp/review-ocp.component.spec.ts @@ -3,8 +3,8 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { Router } from '@angular/router'; import { DeepMocked, createMock } from '@golevelup/ts-jest'; import { BehaviorSubject } from 'rxjs'; -import { ApplicationSubmissionReviewDto } from '../../../services/application-submission-review/application-submission-review.dto'; -import { ApplicationSubmissionReviewService } from '../../../services/application-submission-review/application-submission-review.service'; +import { ApplicationSubmissionReviewDto } from '../../../../services/application-submission-review/application-submission-review.dto'; +import { ApplicationSubmissionReviewService } from '../../../../services/application-submission-review/application-submission-review.service'; import { ReviewOcpComponent } from './review-ocp.component'; diff --git a/portal-frontend/src/app/features/review-submission/review-ocp/review-ocp.component.ts b/portal-frontend/src/app/features/applications/review-submission/review-ocp/review-ocp.component.ts similarity index 96% rename from portal-frontend/src/app/features/review-submission/review-ocp/review-ocp.component.ts rename to portal-frontend/src/app/features/applications/review-submission/review-ocp/review-ocp.component.ts index 3ef0acb117..76305b82c6 100644 --- a/portal-frontend/src/app/features/review-submission/review-ocp/review-ocp.component.ts +++ b/portal-frontend/src/app/features/applications/review-submission/review-ocp/review-ocp.component.ts @@ -3,7 +3,7 @@ import { FormControl, FormGroup, Validators } from '@angular/forms'; import { MatButtonToggleChange } from '@angular/material/button-toggle'; import { Router } from '@angular/router'; import { Subject, takeUntil } from 'rxjs'; -import { ApplicationSubmissionReviewService } from '../../../services/application-submission-review/application-submission-review.service'; +import { ApplicationSubmissionReviewService } from '../../../../services/application-submission-review/application-submission-review.service'; import { ReviewApplicationSteps } from '../review-submission.component'; @Component({ diff --git a/portal-frontend/src/app/features/review-submission/review-resolution/review-resolution.component.html b/portal-frontend/src/app/features/applications/review-submission/review-resolution/review-resolution.component.html similarity index 100% rename from portal-frontend/src/app/features/review-submission/review-resolution/review-resolution.component.html rename to portal-frontend/src/app/features/applications/review-submission/review-resolution/review-resolution.component.html diff --git a/portal-frontend/src/app/features/review-submission/review-resolution/review-resolution.component.scss b/portal-frontend/src/app/features/applications/review-submission/review-resolution/review-resolution.component.scss similarity index 100% rename from portal-frontend/src/app/features/review-submission/review-resolution/review-resolution.component.scss rename to portal-frontend/src/app/features/applications/review-submission/review-resolution/review-resolution.component.scss diff --git a/portal-frontend/src/app/features/review-submission/review-resolution/review-resolution.component.spec.ts b/portal-frontend/src/app/features/applications/review-submission/review-resolution/review-resolution.component.spec.ts similarity index 83% rename from portal-frontend/src/app/features/review-submission/review-resolution/review-resolution.component.spec.ts rename to portal-frontend/src/app/features/applications/review-submission/review-resolution/review-resolution.component.spec.ts index 42afb3116c..bafadbc900 100644 --- a/portal-frontend/src/app/features/review-submission/review-resolution/review-resolution.component.spec.ts +++ b/portal-frontend/src/app/features/applications/review-submission/review-resolution/review-resolution.component.spec.ts @@ -3,8 +3,8 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { Router } from '@angular/router'; import { DeepMocked, createMock } from '@golevelup/ts-jest'; import { BehaviorSubject } from 'rxjs'; -import { ApplicationSubmissionReviewDto } from '../../../services/application-submission-review/application-submission-review.dto'; -import { ApplicationSubmissionReviewService } from '../../../services/application-submission-review/application-submission-review.service'; +import { ApplicationSubmissionReviewDto } from '../../../../services/application-submission-review/application-submission-review.dto'; +import { ApplicationSubmissionReviewService } from '../../../../services/application-submission-review/application-submission-review.service'; import { ReviewResolutionComponent } from './review-resolution.component'; diff --git a/portal-frontend/src/app/features/review-submission/review-resolution/review-resolution.component.ts b/portal-frontend/src/app/features/applications/review-submission/review-resolution/review-resolution.component.ts similarity index 95% rename from portal-frontend/src/app/features/review-submission/review-resolution/review-resolution.component.ts rename to portal-frontend/src/app/features/applications/review-submission/review-resolution/review-resolution.component.ts index 3120e39b4c..ada417fcd3 100644 --- a/portal-frontend/src/app/features/review-submission/review-resolution/review-resolution.component.ts +++ b/portal-frontend/src/app/features/applications/review-submission/review-resolution/review-resolution.component.ts @@ -2,7 +2,7 @@ import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angu import { FormControl, FormGroup, Validators } from '@angular/forms'; import { Router } from '@angular/router'; import { Subject, takeUntil } from 'rxjs'; -import { ApplicationSubmissionReviewService } from '../../../services/application-submission-review/application-submission-review.service'; +import { ApplicationSubmissionReviewService } from '../../../../services/application-submission-review/application-submission-review.service'; import { ReviewApplicationFngSteps, ReviewApplicationSteps } from '../review-submission.component'; @Component({ diff --git a/portal-frontend/src/app/features/review-submission/review-submission.component.html b/portal-frontend/src/app/features/applications/review-submission/review-submission.component.html similarity index 100% rename from portal-frontend/src/app/features/review-submission/review-submission.component.html rename to portal-frontend/src/app/features/applications/review-submission/review-submission.component.html diff --git a/portal-frontend/src/app/features/review-submission/review-submission.component.scss b/portal-frontend/src/app/features/applications/review-submission/review-submission.component.scss similarity index 97% rename from portal-frontend/src/app/features/review-submission/review-submission.component.scss rename to portal-frontend/src/app/features/applications/review-submission/review-submission.component.scss index f06c995246..99408b2af6 100644 --- a/portal-frontend/src/app/features/review-submission/review-submission.component.scss +++ b/portal-frontend/src/app/features/applications/review-submission/review-submission.component.scss @@ -1,5 +1,5 @@ -@use '../../../styles/functions' as *; -@use '../../../styles/colors'; +@use '../../../../styles/functions' as *; +@use '../../../../styles/colors'; .header { margin: rem(24) 0; diff --git a/portal-frontend/src/app/features/review-submission/review-submission.component.spec.ts b/portal-frontend/src/app/features/applications/review-submission/review-submission.component.spec.ts similarity index 77% rename from portal-frontend/src/app/features/review-submission/review-submission.component.spec.ts rename to portal-frontend/src/app/features/applications/review-submission/review-submission.component.spec.ts index b5e75d3097..bb92624e83 100644 --- a/portal-frontend/src/app/features/review-submission/review-submission.component.spec.ts +++ b/portal-frontend/src/app/features/applications/review-submission/review-submission.component.spec.ts @@ -4,13 +4,13 @@ import { MatDialog } from '@angular/material/dialog'; import { ActivatedRoute } from '@angular/router'; import { DeepMocked, createMock } from '@golevelup/ts-jest'; import { BehaviorSubject } from 'rxjs'; -import { ApplicationDocumentDto } from '../../services/application-document/application-document.dto'; -import { ApplicationDocumentService } from '../../services/application-document/application-document.service'; -import { ApplicationSubmissionReviewDto } from '../../services/application-submission-review/application-submission-review.dto'; -import { ApplicationSubmissionReviewService } from '../../services/application-submission-review/application-submission-review.service'; -import { ApplicationSubmissionService } from '../../services/application-submission/application-submission.service'; -import { PdfGenerationService } from '../../services/pdf-generation/pdf-generation.service'; -import { ToastService } from '../../services/toast/toast.service'; +import { ApplicationDocumentDto } from '../../../services/application-document/application-document.dto'; +import { ApplicationDocumentService } from '../../../services/application-document/application-document.service'; +import { ApplicationSubmissionReviewDto } from '../../../services/application-submission-review/application-submission-review.dto'; +import { ApplicationSubmissionReviewService } from '../../../services/application-submission-review/application-submission-review.service'; +import { ApplicationSubmissionService } from '../../../services/application-submission/application-submission.service'; +import { PdfGenerationService } from '../../../services/pdf-generation/pdf-generation.service'; +import { ToastService } from '../../../services/toast/toast.service'; import { ReviewSubmissionComponent } from './review-submission.component'; describe('ReviewSubmissionComponent', () => { diff --git a/portal-frontend/src/app/features/review-submission/review-submission.component.ts b/portal-frontend/src/app/features/applications/review-submission/review-submission.component.ts similarity index 89% rename from portal-frontend/src/app/features/review-submission/review-submission.component.ts rename to portal-frontend/src/app/features/applications/review-submission/review-submission.component.ts index f5ba423738..8948e8625a 100644 --- a/portal-frontend/src/app/features/review-submission/review-submission.component.ts +++ b/portal-frontend/src/app/features/applications/review-submission/review-submission.component.ts @@ -3,20 +3,20 @@ import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; import { ActivatedRoute, Router } from '@angular/router'; import { BehaviorSubject, Observable, Subject, combineLatest, of, takeUntil } from 'rxjs'; -import { ApplicationDocumentDto } from '../../services/application-document/application-document.dto'; -import { ApplicationDocumentService } from '../../services/application-document/application-document.service'; -import { ApplicationSubmissionReviewService } from '../../services/application-submission-review/application-submission-review.service'; -import { ApplicationSubmissionDto } from '../../services/application-submission/application-submission.dto'; -import { ApplicationSubmissionService } from '../../services/application-submission/application-submission.service'; -import { PdfGenerationService } from '../../services/pdf-generation/pdf-generation.service'; -import { ToastService } from '../../services/toast/toast.service'; -import { CustomStepperComponent } from '../../shared/custom-stepper/custom-stepper.component'; +import { ApplicationDocumentDto } from '../../../services/application-document/application-document.dto'; +import { ApplicationDocumentService } from '../../../services/application-document/application-document.service'; +import { ApplicationSubmissionReviewService } from '../../../services/application-submission-review/application-submission-review.service'; +import { ApplicationSubmissionDto } from '../../../services/application-submission/application-submission.dto'; +import { ApplicationSubmissionService } from '../../../services/application-submission/application-submission.service'; +import { PdfGenerationService } from '../../../services/pdf-generation/pdf-generation.service'; +import { ToastService } from '../../../services/toast/toast.service'; +import { CustomStepperComponent } from '../../../shared/custom-stepper/custom-stepper.component'; import { ReturnApplicationDialogComponent } from './return-application-dialog/return-application-dialog.component'; import { ReviewContactInformationComponent } from './review-contact-information/review-contact-information.component'; import { ReviewOcpComponent } from './review-ocp/review-ocp.component'; import { ReviewResolutionComponent } from './review-resolution/review-resolution.component'; import { ReviewZoningComponent } from './review-zoning/review-zoning.component'; -import { scrollToElement } from '../../shared/utils/scroll-helper'; +import { scrollToElement } from '../../../shared/utils/scroll-helper'; export enum ReviewApplicationSteps { ContactInformation = 0, diff --git a/portal-frontend/src/app/features/review-submission/review-submission.module.ts b/portal-frontend/src/app/features/applications/review-submission/review-submission.module.ts similarity index 92% rename from portal-frontend/src/app/features/review-submission/review-submission.module.ts rename to portal-frontend/src/app/features/applications/review-submission/review-submission.module.ts index 61923730bf..729ec1b3f8 100644 --- a/portal-frontend/src/app/features/review-submission/review-submission.module.ts +++ b/portal-frontend/src/app/features/applications/review-submission/review-submission.module.ts @@ -2,8 +2,8 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; import { NgxMaskDirective, NgxMaskPipe } from 'ngx-mask'; -import { CanDeactivateGuard } from '../../shared/guard/can-deactivate.guard'; -import { SharedModule } from '../../shared/shared.module'; +import { CanDeactivateGuard } from '../../../shared/guard/can-deactivate.guard'; +import { SharedModule } from '../../../shared/shared.module'; import { ReturnApplicationDialogComponent } from './return-application-dialog/return-application-dialog.component'; import { ReviewSubmissionComponent } from './review-submission.component'; import { ReviewAttachmentsComponent } from './review-attachments/review-attachments.component'; diff --git a/portal-frontend/src/app/features/review-submission/review-submit-fng/review-submit-fng.component.html b/portal-frontend/src/app/features/applications/review-submission/review-submit-fng/review-submit-fng.component.html similarity index 100% rename from portal-frontend/src/app/features/review-submission/review-submit-fng/review-submit-fng.component.html rename to portal-frontend/src/app/features/applications/review-submission/review-submit-fng/review-submit-fng.component.html diff --git a/portal-frontend/src/app/features/review-submission/review-submit-fng/review-submit-fng.component.scss b/portal-frontend/src/app/features/applications/review-submission/review-submit-fng/review-submit-fng.component.scss similarity index 94% rename from portal-frontend/src/app/features/review-submission/review-submit-fng/review-submit-fng.component.scss rename to portal-frontend/src/app/features/applications/review-submission/review-submit-fng/review-submit-fng.component.scss index 4224790083..df8cff354c 100644 --- a/portal-frontend/src/app/features/review-submission/review-submit-fng/review-submit-fng.component.scss +++ b/portal-frontend/src/app/features/applications/review-submission/review-submit-fng/review-submit-fng.component.scss @@ -1,5 +1,5 @@ -@use '../../../../styles/functions' as *; -@use '../../../../styles/colors'; +@use '../../../../../styles/functions' as *; +@use '../../../../../styles/colors'; section { margin-bottom: rem(24); diff --git a/portal-frontend/src/app/features/review-submission/review-submit-fng/review-submit-fng.component.spec.ts b/portal-frontend/src/app/features/applications/review-submission/review-submit-fng/review-submit-fng.component.spec.ts similarity index 72% rename from portal-frontend/src/app/features/review-submission/review-submit-fng/review-submit-fng.component.spec.ts rename to portal-frontend/src/app/features/applications/review-submission/review-submit-fng/review-submit-fng.component.spec.ts index 75663302cd..48641df391 100644 --- a/portal-frontend/src/app/features/review-submission/review-submit-fng/review-submit-fng.component.spec.ts +++ b/portal-frontend/src/app/features/applications/review-submission/review-submit-fng/review-submit-fng.component.spec.ts @@ -2,13 +2,13 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { DeepMocked, createMock } from '@golevelup/ts-jest'; import { BehaviorSubject } from 'rxjs'; -import { ApplicationDocumentDto } from '../../../services/application-document/application-document.dto'; -import { ApplicationDocumentService } from '../../../services/application-document/application-document.service'; -import { ApplicationSubmissionReviewDto } from '../../../services/application-submission-review/application-submission-review.dto'; -import { ApplicationSubmissionReviewService } from '../../../services/application-submission-review/application-submission-review.service'; -import { ApplicationSubmissionDto } from '../../../services/application-submission/application-submission.dto'; -import { ApplicationSubmissionService } from '../../../services/application-submission/application-submission.service'; -import { PdfGenerationService } from '../../../services/pdf-generation/pdf-generation.service'; +import { ApplicationDocumentDto } from '../../../../services/application-document/application-document.dto'; +import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; +import { ApplicationSubmissionReviewDto } from '../../../../services/application-submission-review/application-submission-review.dto'; +import { ApplicationSubmissionReviewService } from '../../../../services/application-submission-review/application-submission-review.service'; +import { ApplicationSubmissionDto } from '../../../../services/application-submission/application-submission.dto'; +import { ApplicationSubmissionService } from '../../../../services/application-submission/application-submission.service'; +import { PdfGenerationService } from '../../../../services/pdf-generation/pdf-generation.service'; import { ReviewSubmitFngComponent } from './review-submit-fng.component'; diff --git a/portal-frontend/src/app/features/review-submission/review-submit-fng/review-submit-fng.component.ts b/portal-frontend/src/app/features/applications/review-submission/review-submit-fng/review-submit-fng.component.ts similarity index 85% rename from portal-frontend/src/app/features/review-submission/review-submit-fng/review-submit-fng.component.ts rename to portal-frontend/src/app/features/applications/review-submission/review-submit-fng/review-submit-fng.component.ts index 869e4323cc..b729afc8d9 100644 --- a/portal-frontend/src/app/features/review-submission/review-submit-fng/review-submit-fng.component.ts +++ b/portal-frontend/src/app/features/applications/review-submission/review-submit-fng/review-submit-fng.component.ts @@ -2,14 +2,14 @@ import { Component, EventEmitter, HostListener, Input, OnDestroy, OnInit, Output import { MatExpansionPanel } from '@angular/material/expansion'; import { Router } from '@angular/router'; import { BehaviorSubject, Subject, takeUntil } from 'rxjs'; -import { ApplicationDocumentDto, DOCUMENT_TYPE } from '../../../services/application-document/application-document.dto'; -import { ApplicationDocumentService } from '../../../services/application-document/application-document.service'; -import { ApplicationSubmissionReviewDto } from '../../../services/application-submission-review/application-submission-review.dto'; -import { ApplicationSubmissionReviewService } from '../../../services/application-submission-review/application-submission-review.service'; -import { ApplicationSubmissionDto } from '../../../services/application-submission/application-submission.dto'; -import { PdfGenerationService } from '../../../services/pdf-generation/pdf-generation.service'; -import { CustomStepperComponent } from '../../../shared/custom-stepper/custom-stepper.component'; -import { MOBILE_BREAKPOINT } from '../../../shared/utils/breakpoints'; +import { ApplicationDocumentDto, DOCUMENT_TYPE } from '../../../../services/application-document/application-document.dto'; +import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; +import { ApplicationSubmissionReviewDto } from '../../../../services/application-submission-review/application-submission-review.dto'; +import { ApplicationSubmissionReviewService } from '../../../../services/application-submission-review/application-submission-review.service'; +import { ApplicationSubmissionDto } from '../../../../services/application-submission/application-submission.dto'; +import { PdfGenerationService } from '../../../../services/pdf-generation/pdf-generation.service'; +import { CustomStepperComponent } from '../../../../shared/custom-stepper/custom-stepper.component'; +import { MOBILE_BREAKPOINT } from '../../../../shared/utils/breakpoints'; import { ReviewApplicationFngSteps } from '../review-submission.component'; @Component({ diff --git a/portal-frontend/src/app/features/review-submission/review-submit/review-submit.component.html b/portal-frontend/src/app/features/applications/review-submission/review-submit/review-submit.component.html similarity index 100% rename from portal-frontend/src/app/features/review-submission/review-submit/review-submit.component.html rename to portal-frontend/src/app/features/applications/review-submission/review-submit/review-submit.component.html diff --git a/portal-frontend/src/app/features/review-submission/review-submit/review-submit.component.scss b/portal-frontend/src/app/features/applications/review-submission/review-submit/review-submit.component.scss similarity index 94% rename from portal-frontend/src/app/features/review-submission/review-submit/review-submit.component.scss rename to portal-frontend/src/app/features/applications/review-submission/review-submit/review-submit.component.scss index d0fe465eb5..6eb113b667 100644 --- a/portal-frontend/src/app/features/review-submission/review-submit/review-submit.component.scss +++ b/portal-frontend/src/app/features/applications/review-submission/review-submit/review-submit.component.scss @@ -1,5 +1,5 @@ -@use '../../../../styles/functions' as *; -@use '../../../../styles/colors'; +@use '../../../../../styles/functions' as *; +@use '../../../../../styles/colors'; section { margin-bottom: rem(24); diff --git a/portal-frontend/src/app/features/review-submission/review-submit/review-submit.component.spec.ts b/portal-frontend/src/app/features/applications/review-submission/review-submit/review-submit.component.spec.ts similarity index 73% rename from portal-frontend/src/app/features/review-submission/review-submit/review-submit.component.spec.ts rename to portal-frontend/src/app/features/applications/review-submission/review-submit/review-submit.component.spec.ts index 9570eac44a..4bfb483bb5 100644 --- a/portal-frontend/src/app/features/review-submission/review-submit/review-submit.component.spec.ts +++ b/portal-frontend/src/app/features/applications/review-submission/review-submit/review-submit.component.spec.ts @@ -2,12 +2,12 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { DeepMocked, createMock } from '@golevelup/ts-jest'; import { BehaviorSubject } from 'rxjs'; -import { ApplicationDocumentDto } from '../../../services/application-document/application-document.dto'; -import { ApplicationDocumentService } from '../../../services/application-document/application-document.service'; -import { ApplicationSubmissionReviewDto } from '../../../services/application-submission-review/application-submission-review.dto'; -import { ApplicationSubmissionReviewService } from '../../../services/application-submission-review/application-submission-review.service'; -import { ApplicationSubmissionDto } from '../../../services/application-submission/application-submission.dto'; -import { PdfGenerationService } from '../../../services/pdf-generation/pdf-generation.service'; +import { ApplicationDocumentDto } from '../../../../services/application-document/application-document.dto'; +import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; +import { ApplicationSubmissionReviewDto } from '../../../../services/application-submission-review/application-submission-review.dto'; +import { ApplicationSubmissionReviewService } from '../../../../services/application-submission-review/application-submission-review.service'; +import { ApplicationSubmissionDto } from '../../../../services/application-submission/application-submission.dto'; +import { PdfGenerationService } from '../../../../services/pdf-generation/pdf-generation.service'; import { ReviewSubmitComponent } from './review-submit.component'; diff --git a/portal-frontend/src/app/features/review-submission/review-submit/review-submit.component.ts b/portal-frontend/src/app/features/applications/review-submission/review-submit/review-submit.component.ts similarity index 89% rename from portal-frontend/src/app/features/review-submission/review-submit/review-submit.component.ts rename to portal-frontend/src/app/features/applications/review-submission/review-submit/review-submit.component.ts index f618a70cd9..b14ca7b5f0 100644 --- a/portal-frontend/src/app/features/review-submission/review-submit/review-submit.component.ts +++ b/portal-frontend/src/app/features/applications/review-submission/review-submit/review-submit.component.ts @@ -2,14 +2,14 @@ import { Component, EventEmitter, HostListener, Input, OnDestroy, OnInit, Output import { MatExpansionPanel } from '@angular/material/expansion'; import { Router } from '@angular/router'; import { BehaviorSubject, Subject, takeUntil } from 'rxjs'; -import { ApplicationDocumentDto, DOCUMENT_TYPE } from '../../../services/application-document/application-document.dto'; -import { ApplicationDocumentService } from '../../../services/application-document/application-document.service'; -import { ApplicationSubmissionReviewDto } from '../../../services/application-submission-review/application-submission-review.dto'; -import { ApplicationSubmissionReviewService } from '../../../services/application-submission-review/application-submission-review.service'; -import { ApplicationSubmissionDto } from '../../../services/application-submission/application-submission.dto'; -import { PdfGenerationService } from '../../../services/pdf-generation/pdf-generation.service'; -import { CustomStepperComponent } from '../../../shared/custom-stepper/custom-stepper.component'; -import { MOBILE_BREAKPOINT } from '../../../shared/utils/breakpoints'; +import { ApplicationDocumentDto, DOCUMENT_TYPE } from '../../../../services/application-document/application-document.dto'; +import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; +import { ApplicationSubmissionReviewDto } from '../../../../services/application-submission-review/application-submission-review.dto'; +import { ApplicationSubmissionReviewService } from '../../../../services/application-submission-review/application-submission-review.service'; +import { ApplicationSubmissionDto } from '../../../../services/application-submission/application-submission.dto'; +import { PdfGenerationService } from '../../../../services/pdf-generation/pdf-generation.service'; +import { CustomStepperComponent } from '../../../../shared/custom-stepper/custom-stepper.component'; +import { MOBILE_BREAKPOINT } from '../../../../shared/utils/breakpoints'; import { ReviewApplicationSteps } from '../review-submission.component'; @Component({ diff --git a/portal-frontend/src/app/features/review-submission/review-zoning/review-zoning.component.html b/portal-frontend/src/app/features/applications/review-submission/review-zoning/review-zoning.component.html similarity index 100% rename from portal-frontend/src/app/features/review-submission/review-zoning/review-zoning.component.html rename to portal-frontend/src/app/features/applications/review-submission/review-zoning/review-zoning.component.html diff --git a/portal-frontend/src/app/features/review-submission/review-zoning/review-zoning.component.scss b/portal-frontend/src/app/features/applications/review-submission/review-zoning/review-zoning.component.scss similarity index 100% rename from portal-frontend/src/app/features/review-submission/review-zoning/review-zoning.component.scss rename to portal-frontend/src/app/features/applications/review-submission/review-zoning/review-zoning.component.scss diff --git a/portal-frontend/src/app/features/review-submission/review-zoning/review-zoning.component.spec.ts b/portal-frontend/src/app/features/applications/review-submission/review-zoning/review-zoning.component.spec.ts similarity index 81% rename from portal-frontend/src/app/features/review-submission/review-zoning/review-zoning.component.spec.ts rename to portal-frontend/src/app/features/applications/review-submission/review-zoning/review-zoning.component.spec.ts index 38fea723a3..acdf3870c0 100644 --- a/portal-frontend/src/app/features/review-submission/review-zoning/review-zoning.component.spec.ts +++ b/portal-frontend/src/app/features/applications/review-submission/review-zoning/review-zoning.component.spec.ts @@ -2,8 +2,8 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { DeepMocked, createMock } from '@golevelup/ts-jest'; import { BehaviorSubject } from 'rxjs'; -import { ApplicationSubmissionReviewDto } from '../../../services/application-submission-review/application-submission-review.dto'; -import { ApplicationSubmissionReviewService } from '../../../services/application-submission-review/application-submission-review.service'; +import { ApplicationSubmissionReviewDto } from '../../../../services/application-submission-review/application-submission-review.dto'; +import { ApplicationSubmissionReviewService } from '../../../../services/application-submission-review/application-submission-review.service'; import { ReviewZoningComponent } from './review-zoning.component'; diff --git a/portal-frontend/src/app/features/review-submission/review-zoning/review-zoning.component.ts b/portal-frontend/src/app/features/applications/review-submission/review-zoning/review-zoning.component.ts similarity index 97% rename from portal-frontend/src/app/features/review-submission/review-zoning/review-zoning.component.ts rename to portal-frontend/src/app/features/applications/review-submission/review-zoning/review-zoning.component.ts index b16d6d1f2e..7da567bed9 100644 --- a/portal-frontend/src/app/features/review-submission/review-zoning/review-zoning.component.ts +++ b/portal-frontend/src/app/features/applications/review-submission/review-zoning/review-zoning.component.ts @@ -3,7 +3,7 @@ import { FormControl, FormGroup, Validators } from '@angular/forms'; import { MatButtonToggleChange } from '@angular/material/button-toggle'; import { Router } from '@angular/router'; import { Subject, takeUntil } from 'rxjs'; -import { ApplicationSubmissionReviewService } from '../../../services/application-submission-review/application-submission-review.service'; +import { ApplicationSubmissionReviewService } from '../../../../services/application-submission-review/application-submission-review.service'; import { ReviewApplicationSteps } from '../review-submission.component'; @Component({ diff --git a/portal-frontend/src/app/features/view-submission/alc-review/alc-review.component.html b/portal-frontend/src/app/features/applications/view-submission/alc-review/alc-review.component.html similarity index 100% rename from portal-frontend/src/app/features/view-submission/alc-review/alc-review.component.html rename to portal-frontend/src/app/features/applications/view-submission/alc-review/alc-review.component.html diff --git a/portal-frontend/src/app/features/view-submission/alc-review/alc-review.component.scss b/portal-frontend/src/app/features/applications/view-submission/alc-review/alc-review.component.scss similarity index 59% rename from portal-frontend/src/app/features/view-submission/alc-review/alc-review.component.scss rename to portal-frontend/src/app/features/applications/view-submission/alc-review/alc-review.component.scss index 31f5106ab0..7ca8d1c637 100644 --- a/portal-frontend/src/app/features/view-submission/alc-review/alc-review.component.scss +++ b/portal-frontend/src/app/features/applications/view-submission/alc-review/alc-review.component.scss @@ -1,5 +1,5 @@ -@use '../../../../styles/functions' as *; -@use '../../../../styles/colors'; +@use '../../../../../styles/functions' as *; +@use '../../../../../styles/colors'; .warning { background-color: rgba(colors.$accent-color-light, 0.5); diff --git a/portal-frontend/src/app/features/view-submission/alc-review/alc-review.component.spec.ts b/portal-frontend/src/app/features/applications/view-submission/alc-review/alc-review.component.spec.ts similarity index 86% rename from portal-frontend/src/app/features/view-submission/alc-review/alc-review.component.spec.ts rename to portal-frontend/src/app/features/applications/view-submission/alc-review/alc-review.component.spec.ts index 86fa3ff54c..62a72d72d0 100644 --- a/portal-frontend/src/app/features/view-submission/alc-review/alc-review.component.spec.ts +++ b/portal-frontend/src/app/features/applications/view-submission/alc-review/alc-review.component.spec.ts @@ -1,6 +1,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { createMock, DeepMocked } from '@golevelup/ts-jest'; -import { ApplicationSubmissionReviewService } from '../../../services/application-submission-review/application-submission-review.service'; +import { ApplicationSubmissionReviewService } from '../../../../services/application-submission-review/application-submission-review.service'; import { AlcReviewComponent } from './alc-review.component'; diff --git a/portal-frontend/src/app/features/view-submission/alc-review/alc-review.component.ts b/portal-frontend/src/app/features/applications/view-submission/alc-review/alc-review.component.ts similarity index 81% rename from portal-frontend/src/app/features/view-submission/alc-review/alc-review.component.ts rename to portal-frontend/src/app/features/applications/view-submission/alc-review/alc-review.component.ts index df59d564a4..ced2da29b9 100644 --- a/portal-frontend/src/app/features/view-submission/alc-review/alc-review.component.ts +++ b/portal-frontend/src/app/features/applications/view-submission/alc-review/alc-review.component.ts @@ -1,12 +1,12 @@ import { Component, Input, OnDestroy, OnInit } from '@angular/core'; import { Router } from '@angular/router'; import { BehaviorSubject, Subject, takeUntil } from 'rxjs'; -import { ApplicationDocumentDto } from '../../../services/application-document/application-document.dto'; -import { ApplicationSubmissionReviewService } from '../../../services/application-submission-review/application-submission-review.service'; +import { ApplicationDocumentDto } from '../../../../services/application-document/application-document.dto'; +import { ApplicationSubmissionReviewService } from '../../../../services/application-submission-review/application-submission-review.service'; import { SUBMISSION_STATUS, ApplicationSubmissionDetailedDto, -} from '../../../services/application-submission/application-submission.dto'; +} from '../../../../services/application-submission/application-submission.dto'; @Component({ selector: 'app-alc-review', diff --git a/portal-frontend/src/app/features/view-submission/alc-review/decisions/decisions.component.html b/portal-frontend/src/app/features/applications/view-submission/alc-review/decisions/decisions.component.html similarity index 100% rename from portal-frontend/src/app/features/view-submission/alc-review/decisions/decisions.component.html rename to portal-frontend/src/app/features/applications/view-submission/alc-review/decisions/decisions.component.html diff --git a/portal-frontend/src/app/features/view-submission/alc-review/decisions/decisions.component.scss b/portal-frontend/src/app/features/applications/view-submission/alc-review/decisions/decisions.component.scss similarity index 82% rename from portal-frontend/src/app/features/view-submission/alc-review/decisions/decisions.component.scss rename to portal-frontend/src/app/features/applications/view-submission/alc-review/decisions/decisions.component.scss index e633e135a7..c92c6fb6a8 100644 --- a/portal-frontend/src/app/features/view-submission/alc-review/decisions/decisions.component.scss +++ b/portal-frontend/src/app/features/applications/view-submission/alc-review/decisions/decisions.component.scss @@ -1,5 +1,5 @@ -@use '../../../../../styles/functions' as *; -@use '../../../../../styles/colors'; +@use '../../../../../../styles/functions' as *; +@use '../../../../../../styles/colors'; .decision-table { padding: rem(8); diff --git a/portal-frontend/src/app/features/view-submission/alc-review/decisions/decisions.component.spec.ts b/portal-frontend/src/app/features/applications/view-submission/alc-review/decisions/decisions.component.spec.ts similarity index 88% rename from portal-frontend/src/app/features/view-submission/alc-review/decisions/decisions.component.spec.ts rename to portal-frontend/src/app/features/applications/view-submission/alc-review/decisions/decisions.component.spec.ts index f1bdfd411f..f56a7194b9 100644 --- a/portal-frontend/src/app/features/view-submission/alc-review/decisions/decisions.component.spec.ts +++ b/portal-frontend/src/app/features/applications/view-submission/alc-review/decisions/decisions.component.spec.ts @@ -1,6 +1,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { createMock } from '@golevelup/ts-jest'; -import { ApplicationDecisionService } from '../../../../services/application-decision/application-decision.service'; +import { ApplicationDecisionService } from '../../../../../services/application-decision/application-decision.service'; import { DecisionsComponent } from './decisions.component'; diff --git a/portal-frontend/src/app/features/view-submission/alc-review/decisions/decisions.component.ts b/portal-frontend/src/app/features/applications/view-submission/alc-review/decisions/decisions.component.ts similarity index 80% rename from portal-frontend/src/app/features/view-submission/alc-review/decisions/decisions.component.ts rename to portal-frontend/src/app/features/applications/view-submission/alc-review/decisions/decisions.component.ts index f1a9c03618..f0c910a4b0 100644 --- a/portal-frontend/src/app/features/view-submission/alc-review/decisions/decisions.component.ts +++ b/portal-frontend/src/app/features/applications/view-submission/alc-review/decisions/decisions.component.ts @@ -1,6 +1,6 @@ import { Component, Input, OnChanges, OnInit, SimpleChanges } from '@angular/core'; -import { PortalDecisionDto } from '../../../../services/application-decision/application-decision.dto'; -import { ApplicationDecisionService } from '../../../../services/application-decision/application-decision.service'; +import { PortalDecisionDto } from '../../../../../services/application-decision/application-decision.dto'; +import { ApplicationDecisionService } from '../../../../../services/application-decision/application-decision.service'; @Component({ selector: 'app-decisions[fileNumber]', diff --git a/portal-frontend/src/app/features/view-submission/alc-review/submission-documents/submission-documents.component.html b/portal-frontend/src/app/features/applications/view-submission/alc-review/submission-documents/submission-documents.component.html similarity index 100% rename from portal-frontend/src/app/features/view-submission/alc-review/submission-documents/submission-documents.component.html rename to portal-frontend/src/app/features/applications/view-submission/alc-review/submission-documents/submission-documents.component.html diff --git a/portal-frontend/src/app/features/view-submission/alc-review/submission-documents/submission-documents.component.scss b/portal-frontend/src/app/features/applications/view-submission/alc-review/submission-documents/submission-documents.component.scss similarity index 75% rename from portal-frontend/src/app/features/view-submission/alc-review/submission-documents/submission-documents.component.scss rename to portal-frontend/src/app/features/applications/view-submission/alc-review/submission-documents/submission-documents.component.scss index e27ec16b36..0027146765 100644 --- a/portal-frontend/src/app/features/view-submission/alc-review/submission-documents/submission-documents.component.scss +++ b/portal-frontend/src/app/features/applications/view-submission/alc-review/submission-documents/submission-documents.component.scss @@ -1,5 +1,5 @@ -@use '../../../../../styles/colors'; -@use '../../../../../styles/functions' as *; +@use '../../../../../../styles/colors'; +@use '../../../../../../styles/functions' as *; .header { display: flex; diff --git a/portal-frontend/src/app/features/view-submission/alc-review/submission-documents/submission-documents.component.spec.ts b/portal-frontend/src/app/features/applications/view-submission/alc-review/submission-documents/submission-documents.component.spec.ts similarity index 89% rename from portal-frontend/src/app/features/view-submission/alc-review/submission-documents/submission-documents.component.spec.ts rename to portal-frontend/src/app/features/applications/view-submission/alc-review/submission-documents/submission-documents.component.spec.ts index 8956bfbfd1..09eb1292d3 100644 --- a/portal-frontend/src/app/features/view-submission/alc-review/submission-documents/submission-documents.component.spec.ts +++ b/portal-frontend/src/app/features/applications/view-submission/alc-review/submission-documents/submission-documents.component.spec.ts @@ -1,7 +1,7 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { createMock, DeepMocked } from '@golevelup/ts-jest'; -import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; +import { ApplicationDocumentService } from '../../../../../services/application-document/application-document.service'; import { SubmissionDocumentsComponent } from './submission-documents.component'; diff --git a/portal-frontend/src/app/features/view-submission/alc-review/submission-documents/submission-documents.component.ts b/portal-frontend/src/app/features/applications/view-submission/alc-review/submission-documents/submission-documents.component.ts similarity index 86% rename from portal-frontend/src/app/features/view-submission/alc-review/submission-documents/submission-documents.component.ts rename to portal-frontend/src/app/features/applications/view-submission/alc-review/submission-documents/submission-documents.component.ts index c4500e4858..e833e82712 100644 --- a/portal-frontend/src/app/features/view-submission/alc-review/submission-documents/submission-documents.component.ts +++ b/portal-frontend/src/app/features/applications/view-submission/alc-review/submission-documents/submission-documents.component.ts @@ -2,8 +2,8 @@ import { Component, Input, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { MatSort } from '@angular/material/sort'; import { MatTableDataSource } from '@angular/material/table'; import { BehaviorSubject, Subject, takeUntil } from 'rxjs'; -import { ApplicationDocumentDto } from '../../../../services/application-document/application-document.dto'; -import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; +import { ApplicationDocumentDto } from '../../../../../services/application-document/application-document.dto'; +import { ApplicationDocumentService } from '../../../../../services/application-document/application-document.service'; @Component({ selector: 'app-submission-documents', diff --git a/portal-frontend/src/app/features/view-submission/lfng-review/lfng-review.component.html b/portal-frontend/src/app/features/applications/view-submission/lfng-review/lfng-review.component.html similarity index 100% rename from portal-frontend/src/app/features/view-submission/lfng-review/lfng-review.component.html rename to portal-frontend/src/app/features/applications/view-submission/lfng-review/lfng-review.component.html diff --git a/portal-frontend/src/app/features/view-submission/lfng-review/lfng-review.component.scss b/portal-frontend/src/app/features/applications/view-submission/lfng-review/lfng-review.component.scss similarity index 95% rename from portal-frontend/src/app/features/view-submission/lfng-review/lfng-review.component.scss rename to portal-frontend/src/app/features/applications/view-submission/lfng-review/lfng-review.component.scss index 9d4b7c0db9..b2921ee5b8 100644 --- a/portal-frontend/src/app/features/view-submission/lfng-review/lfng-review.component.scss +++ b/portal-frontend/src/app/features/applications/view-submission/lfng-review/lfng-review.component.scss @@ -1,5 +1,5 @@ -@use '../../../../styles/functions' as *; -@use '../../../../styles/colors'; +@use '../../../../../styles/functions' as *; +@use '../../../../../styles/colors'; .warning { align-items: center; diff --git a/portal-frontend/src/app/features/view-submission/lfng-review/lfng-review.component.spec.ts b/portal-frontend/src/app/features/applications/view-submission/lfng-review/lfng-review.component.spec.ts similarity index 68% rename from portal-frontend/src/app/features/view-submission/lfng-review/lfng-review.component.spec.ts rename to portal-frontend/src/app/features/applications/view-submission/lfng-review/lfng-review.component.spec.ts index ebc8959a27..d1556cc200 100644 --- a/portal-frontend/src/app/features/view-submission/lfng-review/lfng-review.component.spec.ts +++ b/portal-frontend/src/app/features/applications/view-submission/lfng-review/lfng-review.component.spec.ts @@ -1,12 +1,12 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { BehaviorSubject } from 'rxjs'; -import { ApplicationDocumentDto } from '../../../services/application-document/application-document.dto'; -import { ApplicationDocumentService } from '../../../services/application-document/application-document.service'; -import { ApplicationSubmissionReviewDto } from '../../../services/application-submission-review/application-submission-review.dto'; -import { ApplicationSubmissionReviewService } from '../../../services/application-submission-review/application-submission-review.service'; -import { ApplicationSubmissionDetailedDto } from '../../../services/application-submission/application-submission.dto'; -import { PdfGenerationService } from '../../../services/pdf-generation/pdf-generation.service'; +import { ApplicationDocumentDto } from '../../../../services/application-document/application-document.dto'; +import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; +import { ApplicationSubmissionReviewDto } from '../../../../services/application-submission-review/application-submission-review.dto'; +import { ApplicationSubmissionReviewService } from '../../../../services/application-submission-review/application-submission-review.service'; +import { ApplicationSubmissionDetailedDto } from '../../../../services/application-submission/application-submission.dto'; +import { PdfGenerationService } from '../../../../services/pdf-generation/pdf-generation.service'; import { LfngReviewComponent } from './lfng-review.component'; diff --git a/portal-frontend/src/app/features/view-submission/lfng-review/lfng-review.component.ts b/portal-frontend/src/app/features/applications/view-submission/lfng-review/lfng-review.component.ts similarity index 87% rename from portal-frontend/src/app/features/view-submission/lfng-review/lfng-review.component.ts rename to portal-frontend/src/app/features/applications/view-submission/lfng-review/lfng-review.component.ts index 013e425394..91d1d69272 100644 --- a/portal-frontend/src/app/features/view-submission/lfng-review/lfng-review.component.ts +++ b/portal-frontend/src/app/features/applications/view-submission/lfng-review/lfng-review.component.ts @@ -5,15 +5,15 @@ import { ApplicationDocumentDto, DOCUMENT_SOURCE, DOCUMENT_TYPE, -} from '../../../services/application-document/application-document.dto'; -import { ApplicationDocumentService } from '../../../services/application-document/application-document.service'; -import { ApplicationSubmissionReviewDto } from '../../../services/application-submission-review/application-submission-review.dto'; -import { ApplicationSubmissionReviewService } from '../../../services/application-submission-review/application-submission-review.service'; +} from '../../../../services/application-document/application-document.dto'; +import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; +import { ApplicationSubmissionReviewDto } from '../../../../services/application-submission-review/application-submission-review.dto'; +import { ApplicationSubmissionReviewService } from '../../../../services/application-submission-review/application-submission-review.service'; import { ApplicationSubmissionDetailedDto, SUBMISSION_STATUS, -} from '../../../services/application-submission/application-submission.dto'; -import { PdfGenerationService } from '../../../services/pdf-generation/pdf-generation.service'; +} from '../../../../services/application-submission/application-submission.dto'; +import { PdfGenerationService } from '../../../../services/pdf-generation/pdf-generation.service'; @Component({ selector: 'app-lfng-review', diff --git a/portal-frontend/src/app/features/view-submission/view-submission.component.html b/portal-frontend/src/app/features/applications/view-submission/view-submission.component.html similarity index 100% rename from portal-frontend/src/app/features/view-submission/view-submission.component.html rename to portal-frontend/src/app/features/applications/view-submission/view-submission.component.html diff --git a/portal-frontend/src/app/features/view-submission/view-submission.component.scss b/portal-frontend/src/app/features/applications/view-submission/view-submission.component.scss similarity index 96% rename from portal-frontend/src/app/features/view-submission/view-submission.component.scss rename to portal-frontend/src/app/features/applications/view-submission/view-submission.component.scss index b667637177..473a1ad530 100644 --- a/portal-frontend/src/app/features/view-submission/view-submission.component.scss +++ b/portal-frontend/src/app/features/applications/view-submission/view-submission.component.scss @@ -1,6 +1,6 @@ -@use '../../../styles/functions' as *; -@use '../../../styles/colors'; -@use '../../../styles/navigation-wrapper'; +@use '../../../../styles/functions' as *; +@use '../../../../styles/colors'; +@use '../../../../styles/navigation-wrapper'; :host::ng-deep { .content { diff --git a/portal-frontend/src/app/features/view-submission/view-submission.component.spec.ts b/portal-frontend/src/app/features/applications/view-submission/view-submission.component.spec.ts similarity index 76% rename from portal-frontend/src/app/features/view-submission/view-submission.component.spec.ts rename to portal-frontend/src/app/features/applications/view-submission/view-submission.component.spec.ts index 32f56c5b24..c09acad8ed 100644 --- a/portal-frontend/src/app/features/view-submission/view-submission.component.spec.ts +++ b/portal-frontend/src/app/features/applications/view-submission/view-submission.component.spec.ts @@ -3,12 +3,12 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ActivatedRoute } from '@angular/router'; import { DeepMocked, createMock } from '@golevelup/ts-jest'; import { BehaviorSubject } from 'rxjs'; -import { ApplicationDocumentService } from '../../services/application-document/application-document.service'; -import { ApplicationSubmissionReviewDto } from '../../services/application-submission-review/application-submission-review.dto'; -import { ApplicationSubmissionReviewService } from '../../services/application-submission-review/application-submission-review.service'; -import { ApplicationSubmissionService } from '../../services/application-submission/application-submission.service'; -import { PdfGenerationService } from '../../services/pdf-generation/pdf-generation.service'; -import { ConfirmationDialogService } from '../../shared/confirmation-dialog/confirmation-dialog.service'; +import { ApplicationDocumentService } from '../../../services/application-document/application-document.service'; +import { ApplicationSubmissionReviewDto } from '../../../services/application-submission-review/application-submission-review.dto'; +import { ApplicationSubmissionReviewService } from '../../../services/application-submission-review/application-submission-review.service'; +import { ApplicationSubmissionService } from '../../../services/application-submission/application-submission.service'; +import { PdfGenerationService } from '../../../services/pdf-generation/pdf-generation.service'; +import { ConfirmationDialogService } from '../../../shared/confirmation-dialog/confirmation-dialog.service'; import { ViewSubmissionComponent } from './view-submission.component'; diff --git a/portal-frontend/src/app/features/view-submission/view-submission.component.ts b/portal-frontend/src/app/features/applications/view-submission/view-submission.component.ts similarity index 79% rename from portal-frontend/src/app/features/view-submission/view-submission.component.ts rename to portal-frontend/src/app/features/applications/view-submission/view-submission.component.ts index 9656634886..cd8a17a6e8 100644 --- a/portal-frontend/src/app/features/view-submission/view-submission.component.ts +++ b/portal-frontend/src/app/features/applications/view-submission/view-submission.component.ts @@ -1,18 +1,18 @@ import { Component, HostListener, OnDestroy, OnInit } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; import { BehaviorSubject, Subject, takeUntil } from 'rxjs'; -import { ApplicationDocumentDto } from '../../services/application-document/application-document.dto'; -import { ApplicationDocumentService } from '../../services/application-document/application-document.service'; -import { ApplicationSubmissionReviewDto } from '../../services/application-submission-review/application-submission-review.dto'; -import { ApplicationSubmissionReviewService } from '../../services/application-submission-review/application-submission-review.service'; +import { ApplicationDocumentDto } from '../../../services/application-document/application-document.dto'; +import { ApplicationDocumentService } from '../../../services/application-document/application-document.service'; +import { ApplicationSubmissionReviewDto } from '../../../services/application-submission-review/application-submission-review.dto'; +import { ApplicationSubmissionReviewService } from '../../../services/application-submission-review/application-submission-review.service'; import { ApplicationSubmissionDetailedDto, SUBMISSION_STATUS, -} from '../../services/application-submission/application-submission.dto'; -import { ApplicationSubmissionService } from '../../services/application-submission/application-submission.service'; -import { PdfGenerationService } from '../../services/pdf-generation/pdf-generation.service'; -import { ConfirmationDialogService } from '../../shared/confirmation-dialog/confirmation-dialog.service'; -import { MOBILE_BREAKPOINT } from '../../shared/utils/breakpoints'; +} from '../../../services/application-submission/application-submission.dto'; +import { ApplicationSubmissionService } from '../../../services/application-submission/application-submission.service'; +import { PdfGenerationService } from '../../../services/pdf-generation/pdf-generation.service'; +import { ConfirmationDialogService } from '../../../shared/confirmation-dialog/confirmation-dialog.service'; +import { MOBILE_BREAKPOINT } from '../../../shared/utils/breakpoints'; enum MOBILE_STEP { INTRODUCTION = 0, diff --git a/portal-frontend/src/app/features/edit-submission/land-use/land-use.component.scss b/portal-frontend/src/app/features/edit-submission/land-use/land-use.component.scss deleted file mode 100644 index 12009e11fb..0000000000 --- a/portal-frontend/src/app/features/edit-submission/land-use/land-use.component.scss +++ /dev/null @@ -1,5 +0,0 @@ -@use '../../../../styles/functions' as *; - -h5 { - margin-top: rem(12) !important; -} diff --git a/portal-frontend/src/app/features/edit-submission/other-parcels/other-parcels.component.scss b/portal-frontend/src/app/features/edit-submission/other-parcels/other-parcels.component.scss deleted file mode 100644 index 154584d3bb..0000000000 --- a/portal-frontend/src/app/features/edit-submission/other-parcels/other-parcels.component.scss +++ /dev/null @@ -1,5 +0,0 @@ -@use '../../../../styles/functions' as *; - -p { - margin: rem(16) 0 !important; -} diff --git a/portal-frontend/src/app/features/edit-submission/proposal/nfu-proposal/nfu-proposal.component.scss b/portal-frontend/src/app/features/edit-submission/proposal/nfu-proposal/nfu-proposal.component.scss deleted file mode 100644 index 8223c57759..0000000000 --- a/portal-frontend/src/app/features/edit-submission/proposal/nfu-proposal/nfu-proposal.component.scss +++ /dev/null @@ -1,5 +0,0 @@ -@use '../../../../../styles/functions' as *; - -section { - margin-top: rem(36); -} diff --git a/portal-frontend/src/app/features/review-submission/review-attachments/review-attachments.component.scss b/portal-frontend/src/app/features/review-submission/review-attachments/review-attachments.component.scss deleted file mode 100644 index 84bef3449e..0000000000 --- a/portal-frontend/src/app/features/review-submission/review-attachments/review-attachments.component.scss +++ /dev/null @@ -1,5 +0,0 @@ -@use '../../../../styles/functions' as *; - -section { - margin-bottom: rem(24); -} From 6f6c8ec32ac659abc16dd6b73e52373184ff9222 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Tue, 8 Aug 2023 14:36:26 -0700 Subject: [PATCH 218/954] Add front-end for NOI Creation * Update create dialog for NOIs * Add module for editing NOIs * Add landing page for viewing NOIs --- portal-frontend/src/app/app-routing.module.ts | 29 +++- portal-frontend/src/app/app.module.ts | 10 +- ...iew-application-submission.component.html} | 0 ...iew-application-submission.component.scss} | 0 ...-application-submission.component.spec.ts} | 10 +- ... view-application-submission.component.ts} | 8 +- .../create-application-dialog.component.html | 119 -------------- .../create-submission-dialog.component.html | 150 ++++++++++++++++++ .../create-submission-dialog.component.scss} | 0 ...reate-submission-dialog.component.spec.ts} | 17 +- .../create-submission-dialog.component.ts} | 88 ++++++---- .../src/app/features/home/home.component.ts | 4 +- .../edit-submission.component.html | 1 + .../edit-submission.component.scss | 0 .../edit-submission.component.spec.ts | 23 +++ .../edit-submission.component.ts | 10 ++ .../edit-submission/edit-submission.module.ts | 18 +++ ...notice-of-intent-submission.component.html | 1 + ...notice-of-intent-submission.component.scss | 0 ...ice-of-intent-submission.component.spec.ts | 22 +++ ...w-notice-of-intent-submission.component.ts | 8 + .../src/app/services/code/code.dto.ts | 10 +- .../src/app/services/code/code.service.ts | 3 +- .../application-submission-draft.service.ts | 79 +++++++++ ...of-intent-submission-draft.service.spec.ts | 95 +++++++++++ .../notice-of-intent-submission.dto.ts | 45 ++++++ ...otice-of-intent-submission.service.spec.ts | 132 +++++++++++++++ .../notice-of-intent-submission.service.ts | 123 ++++++++++++++ .../notice-of-intent.service.ts | 8 +- .../src/portal/code/code.controller.spec.ts | 8 + .../alcs/src/portal/code/code.controller.ts | 5 + .../notice-of-intent-submission.dto.ts | 4 - ...otice-of-intent-submission.service.spec.ts | 4 +- .../notice-of-intent-submission.service.ts | 4 +- .../apps/alcs/src/portal/portal.module.ts | 5 + 35 files changed, 856 insertions(+), 187 deletions(-) rename portal-frontend/src/app/features/applications/view-submission/{view-submission.component.html => view-application-submission.component.html} (100%) rename portal-frontend/src/app/features/applications/view-submission/{view-submission.component.scss => view-application-submission.component.scss} (100%) rename portal-frontend/src/app/features/applications/view-submission/{view-submission.component.spec.ts => view-application-submission.component.spec.ts} (88%) rename portal-frontend/src/app/features/applications/view-submission/{view-submission.component.ts => view-application-submission.component.ts} (94%) delete mode 100644 portal-frontend/src/app/features/create-application-dialog/create-application-dialog.component.html create mode 100644 portal-frontend/src/app/features/create-submission-dialog/create-submission-dialog.component.html rename portal-frontend/src/app/features/{create-application-dialog/create-application-dialog.component.scss => create-submission-dialog/create-submission-dialog.component.scss} (100%) rename portal-frontend/src/app/features/{create-application-dialog/create-application-dialog.component.spec.ts => create-submission-dialog/create-submission-dialog.component.spec.ts} (62%) rename portal-frontend/src/app/features/{create-application-dialog/create-application-dialog.component.ts => create-submission-dialog/create-submission-dialog.component.ts} (55%) create mode 100644 portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.html create mode 100644 portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.scss create mode 100644 portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.spec.ts create mode 100644 portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.ts create mode 100644 portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.module.ts create mode 100644 portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.html create mode 100644 portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.scss create mode 100644 portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.spec.ts create mode 100644 portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.ts create mode 100644 portal-frontend/src/app/services/notice-of-intent-submission/application-submission-draft.service.ts create mode 100644 portal-frontend/src/app/services/notice-of-intent-submission/notice-of-intent-submission-draft.service.spec.ts create mode 100644 portal-frontend/src/app/services/notice-of-intent-submission/notice-of-intent-submission.dto.ts create mode 100644 portal-frontend/src/app/services/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts create mode 100644 portal-frontend/src/app/services/notice-of-intent-submission/notice-of-intent-submission.service.ts diff --git a/portal-frontend/src/app/app-routing.module.ts b/portal-frontend/src/app/app-routing.module.ts index 41b3578a9c..486dcbdb63 100644 --- a/portal-frontend/src/app/app-routing.module.ts +++ b/portal-frontend/src/app/app-routing.module.ts @@ -4,7 +4,8 @@ import { AuthorizationComponent } from './features/authorization/authorization.c import { HomeComponent } from './features/home/home.component'; import { LandingPageComponent } from './features/landing-page/landing-page.component'; import { LoginComponent } from './features/login/login.component'; -import { ViewSubmissionComponent } from './features/applications/view-submission/view-submission.component'; +import { ViewApplicationSubmissionComponent } from './features/applications/view-submission/view-application-submission.component'; +import { ViewNoticeOfIntentSubmissionComponent } from './features/notice-of-intents/view-submission/view-notice-of-intent-submission.component'; import { AlcsAuthGuard } from './services/authentication/alcs-auth.guard'; import { AuthGuard } from './services/authentication/auth.guard'; @@ -33,28 +34,46 @@ const routes: Routes = [ { title: 'View Application', path: 'application/:fileId', - component: ViewSubmissionComponent, + component: ViewApplicationSubmissionComponent, canActivate: [AuthGuard], }, { title: 'Edit Application', path: 'application/:fileId/edit', canActivate: [AuthGuard], - loadChildren: () => import('./features/applications/edit-submission/edit-submission.module').then((m) => m.EditSubmissionModule), + loadChildren: () => + import('./features/applications/edit-submission/edit-submission.module').then((m) => m.EditSubmissionModule), }, { title: 'ALCS Edit Application', path: 'alcs/application/:fileId/edit', canActivate: [AlcsAuthGuard], loadChildren: () => - import('./features/applications/alcs-edit-submission/alcs-edit-submission.module').then((m) => m.AlcsEditSubmissionModule), + import('./features/applications/alcs-edit-submission/alcs-edit-submission.module').then( + (m) => m.AlcsEditSubmissionModule + ), }, { title: 'Review Application', path: 'application/:fileId/review', canActivate: [AuthGuard], loadChildren: () => - import('./features/applications/review-submission/review-submission.module').then((m) => m.ReviewSubmissionModule), + import('./features/applications/review-submission/review-submission.module').then( + (m) => m.ReviewSubmissionModule + ), + }, + { + title: 'View Notice of Intent', + path: 'notice-of-intent/:fileId', + component: ViewNoticeOfIntentSubmissionComponent, + canActivate: [AuthGuard], + }, + { + title: 'Edit Notice of Intent', + path: 'notice-of-intent/:fileId/edit', + canActivate: [AuthGuard], + loadChildren: () => + import('./features/notice-of-intents/edit-submission/edit-submission.module').then((m) => m.EditSubmissionModule), }, { path: '', redirectTo: '/login', pathMatch: 'full' }, ]; diff --git a/portal-frontend/src/app/app.module.ts b/portal-frontend/src/app/app.module.ts index 25d2d3d63d..57700ac0e9 100644 --- a/portal-frontend/src/app/app.module.ts +++ b/portal-frontend/src/app/app.module.ts @@ -10,7 +10,7 @@ import { AppRoutingModule } from './app-routing.module'; import { AppComponent } from './app.component'; import { ApplicationDetailsModule } from './features/applications/application-details/application-details.module'; import { AuthorizationComponent } from './features/authorization/authorization.component'; -import { CreateApplicationDialogComponent } from './features/create-application-dialog/create-application-dialog.component'; +import { CreateSubmissionDialogComponent } from './features/create-submission-dialog/create-submission-dialog.component'; import { ApplicationListComponent } from './features/home/application-list/application-list.component'; import { HomeComponent } from './features/home/home.component'; import { LandingPageComponent } from './features/landing-page/landing-page.component'; @@ -18,7 +18,8 @@ import { LoginComponent } from './features/login/login.component'; import { AlcReviewComponent } from './features/applications/view-submission/alc-review/alc-review.component'; import { SubmissionDocumentsComponent } from './features/applications/view-submission/alc-review/submission-documents/submission-documents.component'; import { LfngReviewComponent } from './features/applications/view-submission/lfng-review/lfng-review.component'; -import { ViewSubmissionComponent } from './features/applications/view-submission/view-submission.component'; +import { ViewApplicationSubmissionComponent } from './features/applications/view-submission/view-application-submission.component'; +import { ViewNoticeOfIntentSubmissionComponent } from './features/notice-of-intents/view-submission/view-notice-of-intent-submission.component'; import { AuthInterceptorService } from './services/authentication/auth-interceptor.service'; import { TokenRefreshService } from './services/authentication/token-refresh.service'; import { ConfirmationDialogComponent } from './shared/confirmation-dialog/confirmation-dialog.component'; @@ -37,10 +38,11 @@ import { DecisionsComponent } from './features/applications/view-submission/alc- HomeComponent, AuthorizationComponent, ApplicationListComponent, - CreateApplicationDialogComponent, + CreateSubmissionDialogComponent, LandingPageComponent, ConfirmationDialogComponent, - ViewSubmissionComponent, + ViewApplicationSubmissionComponent, + ViewNoticeOfIntentSubmissionComponent, LfngReviewComponent, AlcReviewComponent, SubmissionDocumentsComponent, diff --git a/portal-frontend/src/app/features/applications/view-submission/view-submission.component.html b/portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.html similarity index 100% rename from portal-frontend/src/app/features/applications/view-submission/view-submission.component.html rename to portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.html diff --git a/portal-frontend/src/app/features/applications/view-submission/view-submission.component.scss b/portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.scss similarity index 100% rename from portal-frontend/src/app/features/applications/view-submission/view-submission.component.scss rename to portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.scss diff --git a/portal-frontend/src/app/features/applications/view-submission/view-submission.component.spec.ts b/portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.spec.ts similarity index 88% rename from portal-frontend/src/app/features/applications/view-submission/view-submission.component.spec.ts rename to portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.spec.ts index c09acad8ed..60ef872ed3 100644 --- a/portal-frontend/src/app/features/applications/view-submission/view-submission.component.spec.ts +++ b/portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.spec.ts @@ -10,11 +10,11 @@ import { ApplicationSubmissionService } from '../../../services/application-subm import { PdfGenerationService } from '../../../services/pdf-generation/pdf-generation.service'; import { ConfirmationDialogService } from '../../../shared/confirmation-dialog/confirmation-dialog.service'; -import { ViewSubmissionComponent } from './view-submission.component'; +import { ViewApplicationSubmissionComponent } from './view-application-submission.component'; describe('ViewSubmissionComponent', () => { - let component: ViewSubmissionComponent; - let fixture: ComponentFixture; + let component: ViewApplicationSubmissionComponent; + let fixture: ComponentFixture; let mockRoute; let mockAppService: DeepMocked; @@ -64,11 +64,11 @@ describe('ViewSubmissionComponent', () => { useValue: {}, }, ], - declarations: [ViewSubmissionComponent], + declarations: [ViewApplicationSubmissionComponent], schemas: [NO_ERRORS_SCHEMA], }).compileComponents(); - fixture = TestBed.createComponent(ViewSubmissionComponent); + fixture = TestBed.createComponent(ViewApplicationSubmissionComponent); component = fixture.componentInstance; fixture.detectChanges(); }); diff --git a/portal-frontend/src/app/features/applications/view-submission/view-submission.component.ts b/portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.ts similarity index 94% rename from portal-frontend/src/app/features/applications/view-submission/view-submission.component.ts rename to portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.ts index cd8a17a6e8..4645450ce7 100644 --- a/portal-frontend/src/app/features/applications/view-submission/view-submission.component.ts +++ b/portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.ts @@ -22,11 +22,11 @@ enum MOBILE_STEP { } @Component({ - selector: 'app-view-submission', - templateUrl: './view-submission.component.html', - styleUrls: ['./view-submission.component.scss'], + selector: 'app-view-application-submission', + templateUrl: './view-application-submission.component.html', + styleUrls: ['./view-application-submission.component.scss'], }) -export class ViewSubmissionComponent implements OnInit, OnDestroy { +export class ViewApplicationSubmissionComponent implements OnInit, OnDestroy { application: ApplicationSubmissionDetailedDto | undefined; $application = new BehaviorSubject(undefined); $applicationDocuments = new BehaviorSubject([]); diff --git a/portal-frontend/src/app/features/create-application-dialog/create-application-dialog.component.html b/portal-frontend/src/app/features/create-application-dialog/create-application-dialog.component.html deleted file mode 100644 index ed0c6a90db..0000000000 --- a/portal-frontend/src/app/features/create-application-dialog/create-application-dialog.component.html +++ /dev/null @@ -1,119 +0,0 @@ -
-
-

Create New

-

- The governmental or prescribed public body that is applying to exclude land: -

-
- -
- -
- Select an option to learn more about the {{ currentStepIndex === 0 ? 'submission type' : 'application type' }}. -
-
- - - {{ subType.label }} - - -
-
- - - {{ appType.portalLabel }} - - -
- -
-
- {{ - selectedSubmissionType?.label - }} - -
-
-
- {{ selectedAppType?.portalLabel }} -
-
- Read {{ readMoreClicked ? 'Less' : 'More' }} -
- - - - -
-
- -
-
- - -
-
- - -
-
- - -
-
diff --git a/portal-frontend/src/app/features/create-submission-dialog/create-submission-dialog.component.html b/portal-frontend/src/app/features/create-submission-dialog/create-submission-dialog.component.html new file mode 100644 index 0000000000..b24b1f3975 --- /dev/null +++ b/portal-frontend/src/app/features/create-submission-dialog/create-submission-dialog.component.html @@ -0,0 +1,150 @@ +
+
+

Create New

+

+ The governmental or prescribed public body that is applying to exclude land: +

+
+ +
+ +
Select an option to learn more about the submission type.
+
+ + + {{ subType.label }} + + +
+
+
+ {{ selectedSubmissionType.label }} +
+
+
+ Read {{ readMoreClicked ? 'Less' : 'More' }} + + +
Select an option to learn more about the application type.
+
+ + + {{ appType.portalLabel }} + + +
+ +
+
+ {{ selectedAppType.portalLabel }} +
+
+ Read {{ readMoreClicked ? 'Less' : 'More' }} +
+ + +
Select an option to learn more about the notice of intent type.
+
+ + + {{ appType.portalLabel }} + + +
+ +
+
+ {{ selectedNoiType.portalLabel }} +
+
+ Read {{ readMoreClicked ? 'Less' : 'More' }} +
+ + + + +
+
+ +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
diff --git a/portal-frontend/src/app/features/create-application-dialog/create-application-dialog.component.scss b/portal-frontend/src/app/features/create-submission-dialog/create-submission-dialog.component.scss similarity index 100% rename from portal-frontend/src/app/features/create-application-dialog/create-application-dialog.component.scss rename to portal-frontend/src/app/features/create-submission-dialog/create-submission-dialog.component.scss diff --git a/portal-frontend/src/app/features/create-application-dialog/create-application-dialog.component.spec.ts b/portal-frontend/src/app/features/create-submission-dialog/create-submission-dialog.component.spec.ts similarity index 62% rename from portal-frontend/src/app/features/create-application-dialog/create-application-dialog.component.spec.ts rename to portal-frontend/src/app/features/create-submission-dialog/create-submission-dialog.component.spec.ts index 29867fe928..f260209156 100644 --- a/portal-frontend/src/app/features/create-application-dialog/create-application-dialog.component.spec.ts +++ b/portal-frontend/src/app/features/create-submission-dialog/create-submission-dialog.component.spec.ts @@ -4,11 +4,12 @@ import { MatDialogModule, MatDialogRef } from '@angular/material/dialog'; import { MatRadioModule } from '@angular/material/radio'; import { ApplicationSubmissionService } from '../../services/application-submission/application-submission.service'; import { CodeService } from '../../services/code/code.service'; -import { CreateApplicationDialogComponent } from './create-application-dialog.component'; +import { NoticeOfIntentSubmissionService } from '../../services/notice-of-intent-submission/notice-of-intent-submission.service'; +import { CreateSubmissionDialogComponent } from './create-submission-dialog.component'; -describe('CreateApplicationDialogComponent', () => { - let component: CreateApplicationDialogComponent; - let fixture: ComponentFixture; +describe('CreateSubmissionDialogComponent', () => { + let component: CreateSubmissionDialogComponent; + let fixture: ComponentFixture; beforeEach(async () => { await TestBed.configureTestingModule({ @@ -23,12 +24,16 @@ describe('CreateApplicationDialogComponent', () => { provide: CodeService, useValue: {}, }, + { + provide: NoticeOfIntentSubmissionService, + useValue: {}, + }, ], - declarations: [CreateApplicationDialogComponent], + declarations: [CreateSubmissionDialogComponent], schemas: [NO_ERRORS_SCHEMA], }).compileComponents(); - fixture = TestBed.createComponent(CreateApplicationDialogComponent); + fixture = TestBed.createComponent(CreateSubmissionDialogComponent); component = fixture.componentInstance; fixture.detectChanges(); }); diff --git a/portal-frontend/src/app/features/create-application-dialog/create-application-dialog.component.ts b/portal-frontend/src/app/features/create-submission-dialog/create-submission-dialog.component.ts similarity index 55% rename from portal-frontend/src/app/features/create-application-dialog/create-application-dialog.component.ts rename to portal-frontend/src/app/features/create-submission-dialog/create-submission-dialog.component.ts index 126f5c57a9..7674c4110b 100644 --- a/portal-frontend/src/app/features/create-application-dialog/create-application-dialog.component.ts +++ b/portal-frontend/src/app/features/create-submission-dialog/create-submission-dialog.component.ts @@ -3,42 +3,46 @@ import { MatDialogRef } from '@angular/material/dialog'; import { MatRadioChange } from '@angular/material/radio'; import { Router } from '@angular/router'; import { ApplicationSubmissionService } from '../../services/application-submission/application-submission.service'; -import { ApplicationTypeDto, SubmissionTypeDto } from '../../services/code/code.dto'; +import { ApplicationTypeDto, NoticeOfIntentTypeDto, SubmissionTypeDto } from '../../services/code/code.dto'; import { CodeService } from '../../services/code/code.service'; +import { NoticeOfIntentSubmissionService } from '../../services/notice-of-intent-submission/notice-of-intent-submission.service'; import { scrollToElement } from '../../shared/utils/scroll-helper'; export enum ApplicationCreateDialogStepsEnum { submissionType = 0, applicationType = 1, prescribedBody = 2, + noticeOfIntentType = 3, } @Component({ selector: 'app-create-application-dialog', - templateUrl: './create-application-dialog.component.html', - styleUrls: ['./create-application-dialog.component.scss'], + templateUrl: './create-submission-dialog.component.html', + styleUrls: ['./create-submission-dialog.component.scss'], encapsulation: ViewEncapsulation.None, }) -export class CreateApplicationDialogComponent implements OnInit, AfterViewChecked { - submissionStep = ApplicationCreateDialogStepsEnum.submissionType; - applicationStep = ApplicationCreateDialogStepsEnum.applicationType; - prescribedBodyStep = ApplicationCreateDialogStepsEnum.prescribedBody; +export class CreateSubmissionDialogComponent implements OnInit, AfterViewChecked { + steps = ApplicationCreateDialogStepsEnum; + + selectedSubmissionType: SubmissionTypeDto | undefined = undefined; + submissionTypes: SubmissionTypeDto[] = []; applicationTypes: ApplicationTypeDto[] = []; selectedAppType: ApplicationTypeDto | undefined = undefined; - selectedSubmissionType: SubmissionTypeDto | undefined = undefined; - submissionTypes: SubmissionTypeDto[] = []; + noticeOfIntentTypes: NoticeOfIntentTypeDto[] = []; + selectedNoiType: NoticeOfIntentTypeDto | undefined = undefined; readMoreClicked: boolean = false; isReadMoreVisible: boolean = false; - currentStepIndex: number = 0; + currentStep: ApplicationCreateDialogStepsEnum = this.steps.submissionType; prescribedBody: string | undefined; constructor( - private dialogRef: MatDialogRef, + private dialogRef: MatDialogRef, private codeService: CodeService, - private applicationService: ApplicationSubmissionService, + private appSubmissionService: ApplicationSubmissionService, + private noiSubmissionService: NoticeOfIntentSubmissionService, private router: Router ) {} @@ -57,40 +61,58 @@ export class CreateApplicationDialogComponent implements OnInit, AfterViewChecke .filter((type) => !!type.portalLabel) .sort((a, b) => (a.portalLabel > b.portalLabel ? 1 : -1)); this.submissionTypes = codes.submissionTypes.sort((a, b) => (a.code > b.code ? 1 : -1)); + this.noticeOfIntentTypes = codes.noticeOfIntentTypes.sort((a, b) => (a.portalLabel > b.portalLabel ? 1 : -1)); } onCancel() { this.dialogRef.close(false); } - async onSubmit() { + async onSubmitApplication() { if (this.selectedAppType && this.selectedAppType.code === 'EXCL') { - this.currentStepIndex++; + this.currentStep++; } else { await this.createApplication(); } } + async onSubmitNoi() { + if (this.selectedAppType && this.selectedAppType.code === 'EXCL') { + this.currentStep++; + } else { + await this.createNoi(); + } + } + async onSubmitInlcExcl() { await this.createApplication(); } private async createApplication() { - const res = await this.applicationService.create(this.selectedAppType!.code, this.prescribedBody); + const res = await this.appSubmissionService.create(this.selectedAppType!.code, this.prescribedBody); if (res) { await this.router.navigateByUrl(`/application/${res.fileId}/edit`); this.dialogRef.close(true); } } - onStepChange(idx: number) { - this.currentStepIndex += idx; + private async createNoi() { + const res = await this.noiSubmissionService.create(this.selectedNoiType!.code); + if (res) { + await this.router.navigateByUrl(`/notice-of-intent/${res.fileId}/edit`); + this.dialogRef.close(true); + } + } + + onStepChange(step: ApplicationCreateDialogStepsEnum) { + this.currentStep = step; this.readMoreClicked = false; } onSubmissionTypeSelected(event: MatRadioChange) { this.selectedSubmissionType = this.submissionTypes.find((e) => e.code === event.value); this.readMoreClicked = false; + debugger; } onReadMoreClicked() { @@ -111,23 +133,35 @@ export class CreateApplicationDialogComponent implements OnInit, AfterViewChecke }, 300); } + onNoiTypeSelected(event: MatRadioChange) { + this.selectedNoiType = this.noticeOfIntentTypes.find((e) => e.code === event.value); + this.readMoreClicked = false; + setTimeout(() => { + scrollToElement({ id: 'warningBanner', center: true }); + }, 300); + } + isEllipsisActive(e: string): boolean { - const el = document.getElementById(e); - return el ? el.clientHeight < el.scrollHeight : false; + const el = document.getElementsByClassName(e); + if (el.length > 0) { + return el ? el[0].clientHeight < el[0].scrollHeight : false; + } + return true; } checkIfReadMoreVisible(): boolean { - switch (this.currentStepIndex) { - case this.applicationStep: - return this.readMoreClicked || this.isEllipsisActive('appTypeDescription'); - case this.submissionStep: - return this.readMoreClicked || this.isEllipsisActive('subTypeDescription'); - default: - return true; - } + return this.readMoreClicked || this.isEllipsisActive('typeDescription'); } onSelectPrescribedBody(name: string) { this.prescribedBody = name; } + + onConfirmSubmissionType() { + if (this.selectedSubmissionType && this.selectedSubmissionType.code === 'APP') { + this.currentStep = this.steps.applicationType; + } else { + this.currentStep = this.steps.noticeOfIntentType; + } + } } diff --git a/portal-frontend/src/app/features/home/home.component.ts b/portal-frontend/src/app/features/home/home.component.ts index c7c24c9dac..e9b2412b41 100644 --- a/portal-frontend/src/app/features/home/home.component.ts +++ b/portal-frontend/src/app/features/home/home.component.ts @@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; import { AuthenticationService } from '../../services/authentication/authentication.service'; import { OverlaySpinnerService } from '../../shared/overlay-spinner/overlay-spinner.service'; -import { CreateApplicationDialogComponent } from '../create-application-dialog/create-application-dialog.component'; +import { CreateSubmissionDialogComponent } from '../create-submission-dialog/create-submission-dialog.component'; @Component({ selector: 'app-home', @@ -27,7 +27,7 @@ export class HomeComponent implements OnInit { } async onCreateApplication() { - this.dialog.open(CreateApplicationDialogComponent, { + this.dialog.open(CreateSubmissionDialogComponent, { panelClass: 'no-padding', disableClose: true, autoFocus: false, diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.html new file mode 100644 index 0000000000..2d6797f88a --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.html @@ -0,0 +1 @@ +

edit-submission works!

diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.scss b/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.scss new file mode 100644 index 0000000000..e69de29bb2 diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.spec.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.spec.ts new file mode 100644 index 0000000000..74776e7f67 --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.spec.ts @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { EditSubmissionComponent } from './edit-submission.component'; + +describe('EditSubmissionComponent', () => { + let component: EditSubmissionComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ EditSubmissionComponent ] + }) + .compileComponents(); + + fixture = TestBed.createComponent(EditSubmissionComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.ts new file mode 100644 index 0000000000..2dcc57f5ab --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.ts @@ -0,0 +1,10 @@ +import { Component } from '@angular/core'; + +@Component({ + selector: 'app-edit-submission', + templateUrl: './edit-submission.component.html', + styleUrls: ['./edit-submission.component.scss'] +}) +export class EditSubmissionComponent { + +} diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.module.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.module.ts new file mode 100644 index 0000000000..547fc2c060 --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.module.ts @@ -0,0 +1,18 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { RouterModule, Routes } from '@angular/router'; +import { SharedModule } from '../../../shared/shared.module'; +import { EditSubmissionComponent } from './edit-submission.component'; + +const routes: Routes = [ + { + path: '', + component: EditSubmissionComponent, + }, +]; + +@NgModule({ + declarations: [EditSubmissionComponent], + imports: [CommonModule, SharedModule, RouterModule.forChild(routes)], +}) +export class EditSubmissionModule {} diff --git a/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.html b/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.html new file mode 100644 index 0000000000..6132555a09 --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.html @@ -0,0 +1 @@ +

view-submission works!

diff --git a/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.scss b/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.scss new file mode 100644 index 0000000000..e69de29bb2 diff --git a/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.spec.ts b/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.spec.ts new file mode 100644 index 0000000000..67e0d001aa --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.spec.ts @@ -0,0 +1,22 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { ViewNoticeOfIntentSubmissionComponent } from './view-notice-of-intent-submission.component'; + +describe('ViewSubmissionComponent', () => { + let component: ViewNoticeOfIntentSubmissionComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ViewNoticeOfIntentSubmissionComponent], + }).compileComponents(); + + fixture = TestBed.createComponent(ViewNoticeOfIntentSubmissionComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.ts b/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.ts new file mode 100644 index 0000000000..267cb8f84c --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.ts @@ -0,0 +1,8 @@ +import { Component } from '@angular/core'; + +@Component({ + selector: 'app-view-noi-submission', + templateUrl: './view-notice-of-intent-submission.component.html', + styleUrls: ['./view-notice-of-intent-submission.component.scss'], +}) +export class ViewNoticeOfIntentSubmissionComponent {} diff --git a/portal-frontend/src/app/services/code/code.dto.ts b/portal-frontend/src/app/services/code/code.dto.ts index e00e33c8ea..561e1c56e6 100644 --- a/portal-frontend/src/app/services/code/code.dto.ts +++ b/portal-frontend/src/app/services/code/code.dto.ts @@ -7,12 +7,18 @@ export interface LocalGovernmentDto { matchesUserGuid: boolean; } +export interface SubmissionTypeDto extends BaseCodeDto { + portalHtmlDescription: string; +} + export interface ApplicationTypeDto { code: string; portalLabel: string; htmlDescription: string; } -export interface SubmissionTypeDto extends BaseCodeDto { - portalHtmlDescription: string; +export interface NoticeOfIntentTypeDto { + code: string; + portalLabel: string; + htmlDescription: string; } diff --git a/portal-frontend/src/app/services/code/code.service.ts b/portal-frontend/src/app/services/code/code.service.ts index 1c241fdef0..9115600fd5 100644 --- a/portal-frontend/src/app/services/code/code.service.ts +++ b/portal-frontend/src/app/services/code/code.service.ts @@ -4,7 +4,7 @@ import { firstValueFrom } from 'rxjs'; import { environment } from '../../../environments/environment'; import { ApplicationDocumentTypeDto } from '../application-document/application-document.dto'; import { NaruSubtypeDto } from '../application-submission/application-submission.dto'; -import { ApplicationTypeDto, LocalGovernmentDto, SubmissionTypeDto } from './code.dto'; +import { ApplicationTypeDto, LocalGovernmentDto, NoticeOfIntentTypeDto, SubmissionTypeDto } from './code.dto'; @Injectable({ providedIn: 'root', @@ -19,6 +19,7 @@ export class CodeService { this.httpClient.get<{ localGovernments: LocalGovernmentDto[]; applicationTypes: ApplicationTypeDto[]; + noticeOfIntentTypes: NoticeOfIntentTypeDto[]; applicationDocumentTypes: ApplicationDocumentTypeDto[]; submissionTypes: SubmissionTypeDto[]; naruSubtypes: NaruSubtypeDto[]; diff --git a/portal-frontend/src/app/services/notice-of-intent-submission/application-submission-draft.service.ts b/portal-frontend/src/app/services/notice-of-intent-submission/application-submission-draft.service.ts new file mode 100644 index 0000000000..6d8a45c483 --- /dev/null +++ b/portal-frontend/src/app/services/notice-of-intent-submission/application-submission-draft.service.ts @@ -0,0 +1,79 @@ +import { HttpClient } from '@angular/common/http'; +import { Injectable } from '@angular/core'; +import { firstValueFrom } from 'rxjs'; +import { environment } from '../../../environments/environment'; +import { OverlaySpinnerService } from '../../shared/overlay-spinner/overlay-spinner.service'; +import { + ApplicationSubmissionDetailedDto, + ApplicationSubmissionUpdateDto, +} from '../application-submission/application-submission.dto'; +import { ToastService } from '../toast/toast.service'; + +@Injectable({ + providedIn: 'root', +}) +export class ApplicationSubmissionDraftService { + private serviceUrl = `${environment.apiUrl}/application-submission-draft`; + + constructor( + private httpClient: HttpClient, + private toastService: ToastService, + private overlayService: OverlaySpinnerService + ) {} + + async getByFileId(fileId: string) { + try { + return await firstValueFrom( + this.httpClient.get(`${this.serviceUrl}/${fileId}`) + ); + } catch (e) { + console.error(e); + this.toastService.showErrorToast('Failed to load Application, please try again later'); + return undefined; + } + } + + async updatePending(fileId: string, updateDto: ApplicationSubmissionUpdateDto) { + try { + this.overlayService.showSpinner(); + const result = await firstValueFrom( + this.httpClient.put(`${this.serviceUrl}/${fileId}`, updateDto) + ); + this.toastService.showSuccessToast('Application Saved'); + return result; + } catch (e) { + console.error(e); + this.toastService.showErrorToast('Failed to update Application, please try again'); + } finally { + this.overlayService.hideSpinner(); + } + + return undefined; + } + + async publish(fileId: string) { + try { + this.overlayService.showSpinner(); + await firstValueFrom(this.httpClient.post(`${this.serviceUrl}/${fileId}/publish`, {})); + this.toastService.showSuccessToast('Application Submitted'); + } catch (e) { + console.error(e); + this.toastService.showErrorToast('Failed to update Application, please try again'); + } finally { + this.overlayService.hideSpinner(); + } + } + + async delete(fileId: string) { + try { + this.overlayService.showSpinner(); + await firstValueFrom(this.httpClient.delete(`${this.serviceUrl}/${fileId}`)); + this.toastService.showSuccessToast('Draft Edit Deleted'); + } catch (e) { + console.error(e); + this.toastService.showErrorToast('Failed to submit Application, please try again'); + } finally { + this.overlayService.hideSpinner(); + } + } +} diff --git a/portal-frontend/src/app/services/notice-of-intent-submission/notice-of-intent-submission-draft.service.spec.ts b/portal-frontend/src/app/services/notice-of-intent-submission/notice-of-intent-submission-draft.service.spec.ts new file mode 100644 index 0000000000..2f9f7b164d --- /dev/null +++ b/portal-frontend/src/app/services/notice-of-intent-submission/notice-of-intent-submission-draft.service.spec.ts @@ -0,0 +1,95 @@ +import { HttpClient } from '@angular/common/http'; +import { HttpClientTestingModule } from '@angular/common/http/testing'; +import { TestBed } from '@angular/core/testing'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { of, throwError } from 'rxjs'; +import { ToastService } from '../toast/toast.service'; +import { ApplicationSubmissionDraftService } from './application-submission-draft.service'; + +describe('ApplicationSubmissionDraftService', () => { + let service: ApplicationSubmissionDraftService; + let mockToastService: DeepMocked; + let mockHttpClient: DeepMocked; + + beforeEach(() => { + mockToastService = createMock(); + mockHttpClient = createMock(); + + TestBed.configureTestingModule({ + imports: [HttpClientTestingModule], + providers: [ + { + provide: ToastService, + useValue: mockToastService, + }, + { + provide: HttpClient, + useValue: mockHttpClient, + }, + ], + }); + service = TestBed.inject(ApplicationSubmissionDraftService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); + + it('should make a get request for loading a single application', async () => { + mockHttpClient.get.mockReturnValue(of({})); + let mockFileId = 'file-id'; + + await service.getByFileId(mockFileId); + + expect(mockHttpClient.get).toHaveBeenCalledTimes(1); + expect(mockHttpClient.get.mock.calls[0][0]).toContain('application'); + expect(mockHttpClient.get.mock.calls[0][0]).toContain(mockFileId); + }); + + it('should show an error toast if getting a specific application fails', async () => { + mockHttpClient.get.mockReturnValue(throwError(() => ({}))); + + await service.getByFileId('file-id'); + + expect(mockHttpClient.get).toHaveBeenCalledTimes(1); + expect(mockToastService.showErrorToast).toHaveBeenCalledTimes(1); + }); + + it('should make a put request for update', async () => { + mockHttpClient.put.mockReturnValue(of({})); + let mockFileId = 'fileId'; + + await service.updatePending('fileId', {}); + + expect(mockHttpClient.put).toHaveBeenCalledTimes(1); + expect(mockHttpClient.put.mock.calls[0][0]).toContain('application'); + expect(mockHttpClient.put.mock.calls[0][0]).toContain(mockFileId); + }); + + it('should show an error toast if updating an application fails', async () => { + mockHttpClient.put.mockReturnValue(throwError(() => ({}))); + + await service.updatePending('file-id', {}); + + expect(mockHttpClient.put).toHaveBeenCalledTimes(1); + expect(mockToastService.showErrorToast).toHaveBeenCalledTimes(1); + }); + + it('should make a delete request for delete', async () => { + mockHttpClient.delete.mockReturnValue(of({})); + + await service.delete('fileId'); + + expect(mockHttpClient.delete).toHaveBeenCalledTimes(1); + expect(mockHttpClient.delete.mock.calls[0][0]).toContain('application'); + }); + + it('should show an error toast if delete a draft fails', async () => { + mockHttpClient.delete.mockReturnValue(throwError(() => ({}))); + + await service.delete('fileId'); + + expect(mockHttpClient.delete).toHaveBeenCalledTimes(1); + expect(mockToastService.showErrorToast).toHaveBeenCalledTimes(1); + }); +}); diff --git a/portal-frontend/src/app/services/notice-of-intent-submission/notice-of-intent-submission.dto.ts b/portal-frontend/src/app/services/notice-of-intent-submission/notice-of-intent-submission.dto.ts new file mode 100644 index 0000000000..ba36fe6e58 --- /dev/null +++ b/portal-frontend/src/app/services/notice-of-intent-submission/notice-of-intent-submission.dto.ts @@ -0,0 +1,45 @@ +export interface NoticeOfIntentSubmissionDto { + fileNumber: string; + uuid: string; + createdAt: number; + updatedAt: number; + applicant: string; + localGovernmentUuid: string; + type: string; + canEdit: boolean; + canView: boolean; +} + +export interface NoticeOfIntentSubmissionDetailedDto extends NoticeOfIntentSubmissionDto { + purpose: string | null; + parcelsAgricultureDescription: string; + parcelsAgricultureImprovementDescription: string; + parcelsNonAgricultureUseDescription: string; + northLandUseType: string; + northLandUseTypeDescription: string; + eastLandUseType: string; + eastLandUseTypeDescription: string; + southLandUseType: string; + southLandUseTypeDescription: string; + westLandUseType: string; + westLandUseTypeDescription: string; + primaryContactOwnerUuid?: string | null; +} + +export interface NoticeOfIntentSubmissionUpdateDto { + applicant?: string; + purpose?: string; + localGovernmentUuid?: string; + typeCode?: string; + parcelsAgricultureDescription?: string; + parcelsAgricultureImprovementDescription?: string; + parcelsNonAgricultureUseDescription?: string; + northLandUseType?: string; + northLandUseTypeDescription?: string; + eastLandUseType?: string; + eastLandUseTypeDescription?: string; + southLandUseType?: string; + southLandUseTypeDescription?: string; + westLandUseType?: string; + westLandUseTypeDescription?: string; +} diff --git a/portal-frontend/src/app/services/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts b/portal-frontend/src/app/services/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts new file mode 100644 index 0000000000..99b4b804c8 --- /dev/null +++ b/portal-frontend/src/app/services/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts @@ -0,0 +1,132 @@ +import { HttpClient } from '@angular/common/http'; +import { HttpClientTestingModule } from '@angular/common/http/testing'; +import { TestBed } from '@angular/core/testing'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { of, throwError } from 'rxjs'; +import { ToastService } from '../toast/toast.service'; + +import { NoticeOfIntentSubmissionService } from './notice-of-intent-submission.service'; + +describe('NoticeOfIntentSubmissionService', () => { + let service: NoticeOfIntentSubmissionService; + let mockToastService: DeepMocked; + let mockHttpClient: DeepMocked; + + beforeEach(() => { + mockToastService = createMock(); + mockHttpClient = createMock(); + + TestBed.configureTestingModule({ + imports: [HttpClientTestingModule], + providers: [ + { + provide: ToastService, + useValue: mockToastService, + }, + { + provide: HttpClient, + useValue: mockHttpClient, + }, + ], + }); + service = TestBed.inject(NoticeOfIntentSubmissionService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); + + it('should make a get request for loading notice of intents', async () => { + mockHttpClient.get.mockReturnValue(of({})); + + await service.getNoticeOfIntents(); + + expect(mockHttpClient.get).toHaveBeenCalledTimes(1); + expect(mockHttpClient.get.mock.calls[0][0]).toContain('notice-of-intent'); + }); + + it('should show an error toast if getting notice of intents fails', async () => { + mockHttpClient.get.mockReturnValue(throwError(() => ({}))); + + await service.getNoticeOfIntents(); + + expect(mockHttpClient.get).toHaveBeenCalledTimes(1); + expect(mockToastService.showErrorToast).toHaveBeenCalledTimes(1); + }); + + it('should make a get request for loading a single notice of intent', async () => { + mockHttpClient.get.mockReturnValue(of({})); + let mockFileId = 'file-id'; + + await service.getByFileId(mockFileId); + + expect(mockHttpClient.get).toHaveBeenCalledTimes(1); + expect(mockHttpClient.get.mock.calls[0][0]).toContain('notice-of-intent'); + expect(mockHttpClient.get.mock.calls[0][0]).toContain(mockFileId); + }); + + it('should show an error toast if getting a specific notice of intent fails', async () => { + mockHttpClient.get.mockReturnValue(throwError(() => ({}))); + + await service.getByFileId('file-id'); + + expect(mockHttpClient.get).toHaveBeenCalledTimes(1); + expect(mockToastService.showErrorToast).toHaveBeenCalledTimes(1); + }); + + it('should make a post request for create', async () => { + mockHttpClient.post.mockReturnValue(of({})); + + await service.create('type'); + + expect(mockHttpClient.post).toHaveBeenCalledTimes(1); + expect(mockHttpClient.post.mock.calls[0][0]).toContain('notice-of-intent'); + }); + + it('should show an error toast if creating an notice of intent fails', async () => { + mockHttpClient.post.mockReturnValue(throwError(() => ({}))); + + await service.create('type'); + + expect(mockHttpClient.post).toHaveBeenCalledTimes(1); + expect(mockToastService.showErrorToast).toHaveBeenCalledTimes(1); + }); + + it('should make a put request for update', async () => { + mockHttpClient.put.mockReturnValue(of({})); + let mockFileId = 'fileId'; + + await service.updatePending('fileId', {}); + + expect(mockHttpClient.put).toHaveBeenCalledTimes(1); + expect(mockHttpClient.put.mock.calls[0][0]).toContain('notice-of-intent'); + expect(mockHttpClient.put.mock.calls[0][0]).toContain(mockFileId); + }); + + it('should show an error toast if updating an notice of intent fails', async () => { + mockHttpClient.put.mockReturnValue(throwError(() => ({}))); + + await service.updatePending('file-id', {}); + + expect(mockHttpClient.put).toHaveBeenCalledTimes(1); + expect(mockToastService.showErrorToast).toHaveBeenCalledTimes(1); + }); + + it('should make a post request for cancelling', async () => { + mockHttpClient.post.mockReturnValue(of({})); + + await service.cancel('fileId'); + + expect(mockHttpClient.post).toHaveBeenCalledTimes(1); + expect(mockHttpClient.post.mock.calls[0][0]).toContain('notice-of-intent'); + }); + + it('should show an error toast if cancelling a file fails', async () => { + mockHttpClient.post.mockReturnValue(throwError(() => ({}))); + + await service.cancel('fileId'); + + expect(mockHttpClient.post).toHaveBeenCalledTimes(1); + expect(mockToastService.showErrorToast).toHaveBeenCalledTimes(1); + }); +}); diff --git a/portal-frontend/src/app/services/notice-of-intent-submission/notice-of-intent-submission.service.ts b/portal-frontend/src/app/services/notice-of-intent-submission/notice-of-intent-submission.service.ts new file mode 100644 index 0000000000..d5663b6806 --- /dev/null +++ b/portal-frontend/src/app/services/notice-of-intent-submission/notice-of-intent-submission.service.ts @@ -0,0 +1,123 @@ +import { HttpClient } from '@angular/common/http'; +import { Injectable } from '@angular/core'; +import { firstValueFrom } from 'rxjs'; +import { environment } from '../../../environments/environment'; +import { OverlaySpinnerService } from '../../shared/overlay-spinner/overlay-spinner.service'; +import { ToastService } from '../toast/toast.service'; +import { + NoticeOfIntentSubmissionDetailedDto, + NoticeOfIntentSubmissionDto, + NoticeOfIntentSubmissionUpdateDto, +} from './notice-of-intent-submission.dto'; + +@Injectable({ + providedIn: 'root', +}) +export class NoticeOfIntentSubmissionService { + private serviceUrl = `${environment.apiUrl}/notice-of-intent-submission`; + + constructor( + private httpClient: HttpClient, + private toastService: ToastService, + private overlayService: OverlaySpinnerService + ) {} + + async getNoticeOfIntents() { + try { + return await firstValueFrom(this.httpClient.get(`${this.serviceUrl}`)); + } catch (e) { + console.error(e); + this.toastService.showErrorToast('Failed to load Notice of Intents, please try again later'); + return []; + } + } + + async getByFileId(fileId: string) { + try { + return await firstValueFrom( + this.httpClient.get(`${this.serviceUrl}/application/${fileId}`) + ); + } catch (e) { + console.error(e); + this.toastService.showErrorToast('Failed to load Notice of Intent, please try again later'); + return undefined; + } + } + + async getByUuid(uuid: string) { + try { + return await firstValueFrom( + this.httpClient.get(`${this.serviceUrl}/${uuid}`) + ); + } catch (e) { + console.error(e); + this.toastService.showErrorToast('Failed to load Notice of Intent, please try again later'); + return undefined; + } + } + + async create(type: string) { + try { + this.overlayService.showSpinner(); + return await firstValueFrom( + this.httpClient.post<{ fileId: string }>(`${this.serviceUrl}`, { + type, + }) + ); + } catch (e) { + console.error(e); + this.toastService.showErrorToast('Failed to create Notice of Intent, please try again later'); + } finally { + this.overlayService.hideSpinner(); + } + return undefined; + } + + async updatePending(uuid: string, updateDto: NoticeOfIntentSubmissionUpdateDto) { + try { + this.overlayService.showSpinner(); + const result = await firstValueFrom( + this.httpClient.put(`${this.serviceUrl}/${uuid}`, updateDto) + ); + this.toastService.showSuccessToast('Notice of Intent Saved'); + return result; + } catch (e) { + console.error(e); + this.toastService.showErrorToast('Failed to update Notice of Intent, please try again'); + } finally { + this.overlayService.hideSpinner(); + } + + return undefined; + } + + async cancel(uuid: string) { + try { + this.overlayService.showSpinner(); + return await firstValueFrom(this.httpClient.post<{ fileId: string }>(`${this.serviceUrl}/${uuid}/cancel`, {})); + } catch (e) { + console.error(e); + this.toastService.showErrorToast('Failed to cancel Notice of Intent, please try again later'); + } finally { + this.overlayService.hideSpinner(); + } + return undefined; + } + + async submitToAlcs(uuid: string) { + let res; + try { + this.overlayService.showSpinner(); + res = await firstValueFrom( + this.httpClient.post(`${this.serviceUrl}/alcs/submit/${uuid}`, {}) + ); + this.toastService.showSuccessToast('Notice of Intent Submitted'); + } catch (e) { + console.error(e); + this.toastService.showErrorToast('Failed to submit Notice of Intent, please try again'); + } finally { + this.overlayService.hideSpinner(); + } + return res; + } +} diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.ts index 862e199ffd..876e7e05d3 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.ts @@ -262,6 +262,10 @@ export class NoticeOfIntentService { return this.getByFileNumber(noticeOfIntent.fileNumber); } + async listTypes() { + return this.typeRepository.find(); + } + async listSubtypes() { return this.subtypeRepository.find({ where: { @@ -343,10 +347,6 @@ export class NoticeOfIntentService { return noticeOfIntent.fileNumber; } - async fetchTypes() { - return this.typeRepository.find(); - } - async submit(createDto: CreateNoticeOfIntentServiceDto) { const existingNoticeOfIntent = await this.repository.findOne({ where: { fileNumber: createDto.fileNumber }, diff --git a/services/apps/alcs/src/portal/code/code.controller.spec.ts b/services/apps/alcs/src/portal/code/code.controller.spec.ts index b97d56bbab..6c3a07e168 100644 --- a/services/apps/alcs/src/portal/code/code.controller.spec.ts +++ b/services/apps/alcs/src/portal/code/code.controller.spec.ts @@ -10,6 +10,7 @@ import { ApplicationDocumentService } from '../../alcs/application/application-d import { ApplicationService } from '../../alcs/application/application.service'; import { CardType } from '../../alcs/card/card-type/card-type.entity'; import { CardService } from '../../alcs/card/card.service'; +import { NoticeOfIntentService } from '../../alcs/notice-of-intent/notice-of-intent.service'; import { User } from '../../user/user.entity'; import { ApplicationSubmissionService } from '../application-submission/application-submission.service'; import { CodeController } from './code.controller'; @@ -21,6 +22,7 @@ describe('CodeController', () => { let mockCardService: DeepMocked; let mockAppDocService: DeepMocked; let mockAppSubmissionService: DeepMocked; + let mockNoiService: DeepMocked; beforeEach(async () => { mockLgService = createMock(); @@ -28,6 +30,7 @@ describe('CodeController', () => { mockCardService = createMock(); mockAppDocService = createMock(); mockAppSubmissionService = createMock(); + mockNoiService = createMock(); const app: TestingModule = await Test.createTestingModule({ imports: [ @@ -58,6 +61,10 @@ describe('CodeController', () => { provide: ApplicationSubmissionService, useValue: mockAppSubmissionService, }, + { + provide: NoticeOfIntentService, + useValue: mockNoiService, + }, { provide: ClsService, useValue: {}, @@ -87,6 +94,7 @@ describe('CodeController', () => { mockAppDocService.fetchTypes.mockResolvedValue([]); mockAppSubmissionService.listNaruSubtypes.mockResolvedValue([]); + mockNoiService.listTypes.mockResolvedValue([]); }); it('should call out to local government service for fetching codes', async () => { diff --git a/services/apps/alcs/src/portal/code/code.controller.ts b/services/apps/alcs/src/portal/code/code.controller.ts index 2766f79064..41fa24abe5 100644 --- a/services/apps/alcs/src/portal/code/code.controller.ts +++ b/services/apps/alcs/src/portal/code/code.controller.ts @@ -3,6 +3,7 @@ import { InjectMapper } from '@automapper/nestjs'; import { Controller, Get, Req, UseGuards } from '@nestjs/common'; import { LocalGovernment } from '../../alcs/local-government/local-government.entity'; import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; +import { NoticeOfIntentService } from '../../alcs/notice-of-intent/notice-of-intent.service'; import { DocumentCode } from '../../document/document-code.entity'; import { ApplicationDocumentService } from '../../alcs/application/application-document/application-document.service'; import { ApplicationService } from '../../alcs/application/application.service'; @@ -11,6 +12,7 @@ import { PortalAuthGuard } from '../../common/authorization/portal-auth-guard.se import { DocumentTypeDto } from '../../document/document.dto'; import { User } from '../../user/user.entity'; import { ApplicationSubmissionService } from '../application-submission/application-submission.service'; +import { NoticeOfIntentSubmissionService } from '../notice-of-intent-submission/notice-of-intent-submission.service'; export interface LocalGovernmentDto { uuid: string; @@ -29,6 +31,7 @@ export class CodeController { private applicationDocumentService: ApplicationDocumentService, private cardService: CardService, private applicationSubmissionService: ApplicationSubmissionService, + private noticeOfIntentService: NoticeOfIntentService, ) {} @Get() @@ -39,6 +42,7 @@ export class CodeController { const applicationDocumentTypes = await this.applicationDocumentService.fetchTypes(); const submissionTypes = await this.cardService.getPortalCardTypes(); + const noticeOfIntentTypes = await this.noticeOfIntentService.listTypes(); const naruSubtypes = await this.applicationSubmissionService.listNaruSubtypes(); @@ -54,6 +58,7 @@ export class CodeController { req.user.entity, ), applicationTypes, + noticeOfIntentTypes, submissionTypes, applicationDocumentTypes: mappedDocTypes, naruSubtypes, diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.dto.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.dto.ts index f83d517ec9..f5355f2cc1 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.dto.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.dto.ts @@ -139,8 +139,4 @@ export class NoticeOfIntentSubmissionUpdateDto { @IsString() @IsOptional() westLandUseTypeDescription?: string; - - @IsBoolean() - @IsOptional() - hasOtherParcelsInCommunity?: boolean | null; } diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts index 51c346abe8..4fee705e4a 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts @@ -145,7 +145,7 @@ describe('NoticeOfIntentSubmissionService', () => { const applicant = 'Bruce Wayne'; const typeCode = 'fake-code'; - mockNoiService.fetchTypes.mockResolvedValue([ + mockNoiService.listTypes.mockResolvedValue([ new NoticeOfIntentType({ code: typeCode, portalLabel: 'portalLabel', @@ -162,7 +162,7 @@ describe('NoticeOfIntentSubmissionService', () => { mockRepository.findOne.mockResolvedValue(noiSubmission); const res = await service.mapToDTOs([noiSubmission]); - expect(mockNoiService.fetchTypes).toHaveBeenCalledTimes(1); + expect(mockNoiService.listTypes).toHaveBeenCalledTimes(1); expect(res[0].type).toEqual('label'); expect(res[0].applicant).toEqual(applicant); }); diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts index ca59616dbc..bb80d7bdbf 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts @@ -284,7 +284,7 @@ export class NoticeOfIntentSubmissionService { } async mapToDTOs(apps: NoticeOfIntentSubmission[]) { - const types = await this.noticeOfIntentService.fetchTypes(); + const types = await this.noticeOfIntentService.listTypes(); return apps.map((app) => { return { @@ -301,7 +301,7 @@ export class NoticeOfIntentSubmissionService { } async mapToDetailedDTO(noiSubmission: NoticeOfIntentSubmission) { - const types = await this.noticeOfIntentService.fetchTypes(); + const types = await this.noticeOfIntentService.listTypes(); const mappedApp = this.mapper.map( noiSubmission, NoticeOfIntentSubmission, diff --git a/services/apps/alcs/src/portal/portal.module.ts b/services/apps/alcs/src/portal/portal.module.ts index 78268ffeb2..4db394b272 100644 --- a/services/apps/alcs/src/portal/portal.module.ts +++ b/services/apps/alcs/src/portal/portal.module.ts @@ -3,6 +3,7 @@ import { Module } from '@nestjs/common'; import { RouterModule } from '@nestjs/core'; import { ApplicationModule } from '../alcs/application/application.module'; import { CardModule } from '../alcs/card/card.module'; +import { NoticeOfIntentModule } from '../alcs/notice-of-intent/notice-of-intent.module'; import { DocumentModule } from '../document/document.module'; import { PortalApplicationDecisionModule } from './application-decision/application-decision.module'; import { PortalApplicationDocumentModule } from './application-document/application-document.module'; @@ -11,6 +12,7 @@ import { ApplicationSubmissionReviewModule } from './application-submission-revi import { ApplicationSubmissionModule } from './application-submission/application-submission.module'; import { CodeController } from './code/code.controller'; import { PortalDocumentModule } from './document/document.module'; +import { NoticeOfIntentSubmissionModule } from './notice-of-intent-submission/notice-of-intent-submission.module'; import { ParcelModule } from './parcel/parcel.module'; import { PdfGenerationModule } from './pdf-generation/pdf-generation.module'; @@ -28,8 +30,11 @@ import { PdfGenerationModule } from './pdf-generation/pdf-generation.module'; ApplicationSubmissionDraftModule, PdfGenerationModule, PortalApplicationDecisionModule, + NoticeOfIntentModule, + NoticeOfIntentSubmissionModule, RouterModule.register([ { path: 'portal', module: ApplicationSubmissionModule }, + { path: 'portal', module: NoticeOfIntentSubmissionModule }, { path: 'portal', module: ParcelModule }, { path: 'portal', module: ApplicationSubmissionReviewModule }, { path: 'portal', module: PortalDocumentModule }, From cbc8c3d96eb9c531e24e57c67332a888dd40d9b0 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Wed, 9 Aug 2023 11:21:35 -0700 Subject: [PATCH 219/954] Code Review Feedback --- ...w-application-submission.component.spec.ts | 2 +- .../create-submission-dialog.component.html | 6 +- .../create-submission-dialog.component.ts | 3 +- ...ice-of-intent-submission.component.spec.ts | 2 +- .../application-submission-draft.service.ts | 79 --------------- ...of-intent-submission-draft.service.spec.ts | 95 ------------------- 6 files changed, 6 insertions(+), 181 deletions(-) delete mode 100644 portal-frontend/src/app/services/notice-of-intent-submission/application-submission-draft.service.ts delete mode 100644 portal-frontend/src/app/services/notice-of-intent-submission/notice-of-intent-submission-draft.service.spec.ts diff --git a/portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.spec.ts b/portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.spec.ts index 60ef872ed3..e9ef7369a7 100644 --- a/portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.spec.ts +++ b/portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.spec.ts @@ -12,7 +12,7 @@ import { ConfirmationDialogService } from '../../../shared/confirmation-dialog/c import { ViewApplicationSubmissionComponent } from './view-application-submission.component'; -describe('ViewSubmissionComponent', () => { +describe('ViewApplicationSubmissionComponent', () => { let component: ViewApplicationSubmissionComponent; let fixture: ComponentFixture; diff --git a/portal-frontend/src/app/features/create-submission-dialog/create-submission-dialog.component.html b/portal-frontend/src/app/features/create-submission-dialog/create-submission-dialog.component.html index b24b1f3975..c263c8a6cf 100644 --- a/portal-frontend/src/app/features/create-submission-dialog/create-submission-dialog.component.html +++ b/portal-frontend/src/app/features/create-submission-dialog/create-submission-dialog.component.html @@ -80,8 +80,8 @@

color="primary" required > - - {{ appType.portalLabel }} + + {{ type.portalLabel }}

@@ -141,7 +141,7 @@

diff --git a/portal-frontend/src/app/features/home/noi-list/noi-list.component.html b/portal-frontend/src/app/features/home/noi-list/noi-list.component.html new file mode 100644 index 0000000000..e22f232d71 --- /dev/null +++ b/portal-frontend/src/app/features/home/noi-list/noi-list.component.html @@ -0,0 +1,66 @@ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
No NOIs Created
NOI ID{{ row.fileNumber }}Date Created{{ row.createdAt | date }}Owner Name{{ row.applicant || '(Unknown)' }}NOI Type{{ row.type }}Status +
+ {{ row.status.label }} +
+ 		Last Updated{{ row.updatedAt | date }}Actions + +
+ +
+
diff --git a/portal-frontend/src/app/features/home/noi-list/noi-list.component.scss b/portal-frontend/src/app/features/home/noi-list/noi-list.component.scss new file mode 100644 index 0000000000..5eb8d7a15e --- /dev/null +++ b/portal-frontend/src/app/features/home/noi-list/noi-list.component.scss @@ -0,0 +1,31 @@ +@use '../../../../styles/functions' as *; +@use '../../../../styles/colors'; + +.label { + display: inline-block; + padding: rem(4) rem(16); + border-radius: rem(16); + font-weight: bold; +} + +.table-wrapper { + overflow-x: auto; + + .table-container { + display: table; + width: 100%; + + table { + width: 100%; + } + + ::ng-deep .mat-table { + ::ng-deep .mat-cell, + ::ng-deep .mat-header-cell, + ::ng-deep .mat-row, + ::ng-deep .mat-header-row { + min-width: rem(150); + } + } + } +} diff --git a/portal-frontend/src/app/features/home/noi-list/noi-list.component.spec.ts b/portal-frontend/src/app/features/home/noi-list/noi-list.component.spec.ts new file mode 100644 index 0000000000..05ba133ac5 --- /dev/null +++ b/portal-frontend/src/app/features/home/noi-list/noi-list.component.spec.ts @@ -0,0 +1,36 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { NoticeOfIntentSubmissionService } from '../../../services/notice-of-intent-submission/notice-of-intent-submission.service'; +import { ConfirmationDialogService } from '../../../shared/confirmation-dialog/confirmation-dialog.service'; + +import { NoiListComponent } from './noi-list.component'; + +describe('NoiListComponent', () => { + let component: NoiListComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [NoiListComponent], + providers: [ + { + provide: NoticeOfIntentSubmissionService, + useValue: {}, + }, + { + provide: ConfirmationDialogService, + useValue: {}, + }, + ], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(NoiListComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/home/noi-list/noi-list.component.ts b/portal-frontend/src/app/features/home/noi-list/noi-list.component.ts new file mode 100644 index 0000000000..06f252fe20 --- /dev/null +++ b/portal-frontend/src/app/features/home/noi-list/noi-list.component.ts @@ -0,0 +1,37 @@ +import { Component, OnInit, ViewChild } from '@angular/core'; +import { MatPaginator } from '@angular/material/paginator'; +import { MatTableDataSource } from '@angular/material/table'; +import { NoticeOfIntentSubmissionDto } from '../../../services/notice-of-intent-submission/notice-of-intent-submission.dto'; +import { NoticeOfIntentSubmissionService } from '../../../services/notice-of-intent-submission/notice-of-intent-submission.service'; + +@Component({ + selector: 'app-noi-list', + templateUrl: './noi-list.component.html', + styleUrls: ['./noi-list.component.scss'], +}) +export class NoiListComponent implements OnInit { + dataSource: MatTableDataSource = new MatTableDataSource(); + displayedColumns: string[] = [ + 'fileNumber', + 'dateCreated', + 'applicant', + 'applicationType', + 'status', + 'lastUpdated', + 'actions', + ]; + + @ViewChild(MatPaginator) paginator!: MatPaginator; + + constructor(private noiSubmissionService: NoticeOfIntentSubmissionService) {} + + ngOnInit(): void { + this.loadNOIs(); + } + + async loadNOIs() { + const nois = await this.noiSubmissionService.getNoticeOfIntents(); + this.dataSource = new MatTableDataSource(nois); + this.dataSource.paginator = this.paginator; + } +} diff --git a/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.ts b/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.ts index 4449114f7c..c0d70aa686 100644 --- a/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.ts +++ b/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.ts @@ -74,9 +74,12 @@ export class ApplicationSubmissionReviewController { fileNumber, ); - if (applicationReview.createdBy) { + if ( + applicationReview.createdBy && + applicationReview.createdBy.bceidBusinessGuid + ) { const reviewGovernment = await this.localGovernmentService.getByGuid( - applicationReview.createdBy?.bceidBusinessGuid, + applicationReview.createdBy.bceidBusinessGuid, ); if (reviewGovernment) { @@ -206,7 +209,7 @@ export class ApplicationSubmissionReviewController { const creatingGuid = applicationSubmission.createdBy.bceidBusinessGuid; const creatingGovernment = await this.localGovernmentService.getByGuid( - creatingGuid, + creatingGuid!, ); if ( diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.controller.spec.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.controller.spec.ts index 3e33476d3c..a0052602b0 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.controller.spec.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.controller.spec.ts @@ -7,6 +7,7 @@ import { mockKeyCloakProviders } from '../../../test/mocks/mockTypes'; import { LocalGovernment } from '../../alcs/local-government/local-government.entity'; import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; import { NoticeOfIntentDocumentService } from '../../alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.service'; +import { NOI_SUBMISSION_STATUS } from '../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status.dto'; import { NoticeOfIntentSubmissionToSubmissionStatus } from '../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status.entity'; import { NoticeOfIntent } from '../../alcs/notice-of-intent/notice-of-intent.entity'; import { NoticeOfIntentSubmissionProfile } from '../../common/automapper/notice-of-intent-submission.automapper.profile'; @@ -269,11 +270,11 @@ describe('NoticeOfIntentSubmissionController', () => { new NoticeOfIntent(), ); mockNoiSubmissionService.getIfCreatorByUuid.mockResolvedValue( - new NoticeOfIntentSubmission({ - typeCode: 'TURP', - }), + new NoticeOfIntentSubmission(), ); + mockNoiSubmissionService.updateStatus.mockResolvedValue(); + await controller.submitAsApplicant(mockFileId, { user: { entity: new User(), @@ -284,5 +285,10 @@ describe('NoticeOfIntentSubmissionController', () => { 1, ); expect(mockNoiSubmissionService.submitToAlcs).toHaveBeenCalledTimes(1); + expect(mockNoiSubmissionService.updateStatus).toHaveBeenCalledTimes(1); + expect(mockNoiSubmissionService.updateStatus).toHaveBeenCalledWith( + undefined, + NOI_SUBMISSION_STATUS.SUBMITTED_TO_ALC, + ); }); }); diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.controller.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.controller.ts index 3aa22ec08e..82e569cfa9 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.controller.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.controller.ts @@ -9,6 +9,8 @@ import { Req, UseGuards, } from '@nestjs/common'; +import { SUBMISSION_STATUS } from '../../alcs/application/application-submission-status/submission-status.dto'; +import { NOI_SUBMISSION_STATUS } from '../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status.dto'; import { PortalAuthGuard } from '../../common/authorization/portal-auth-guard.service'; import { User } from '../../user/user.entity'; import { @@ -136,11 +138,10 @@ export class NoticeOfIntentSubmissionController { await this.noticeOfIntentSubmissionService.submitToAlcs( validatedApplicationSubmission, ); - //TODO: Uncomment when we add status - // return await this.noticeOfIntentSubmissionService.updateStatus( - // noticeOfIntentSubmission, - // SUBMISSION_STATUS.SUBMITTED_TO_ALC, - // ); + return await this.noticeOfIntentSubmissionService.updateStatus( + noticeOfIntentSubmission.uuid, + NOI_SUBMISSION_STATUS.SUBMITTED_TO_ALC, + ); } else { //TODO: Uncomment when we add validation //this.logger.debug(validationResult.errors); diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.module.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.module.ts index 4ae134c0b3..2a7378251c 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.module.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.module.ts @@ -5,6 +5,7 @@ import { LocalGovernmentModule } from '../../alcs/local-government/local-governm import { NoticeOfIntentSubmissionStatusModule } from '../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.module'; import { NoticeOfIntentModule } from '../../alcs/notice-of-intent/notice-of-intent.module'; import { AuthorizationModule } from '../../common/authorization/authorization.module'; +import { NoticeOfIntentSubmissionProfile } from '../../common/automapper/notice-of-intent-submission.automapper.profile'; import { DocumentModule } from '../../document/document.module'; import { FileNumberModule } from '../../file-number/file-number.module'; import { NoticeOfIntentSubmissionController } from './notice-of-intent-submission.controller'; @@ -23,6 +24,6 @@ import { NoticeOfIntentSubmissionService } from './notice-of-intent-submission.s FileNumberModule, ], controllers: [NoticeOfIntentSubmissionController], - providers: [NoticeOfIntentSubmissionService], + providers: [NoticeOfIntentSubmissionService, NoticeOfIntentSubmissionProfile], }) export class NoticeOfIntentSubmissionModule {} diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts index d829130932..abf85de386 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts @@ -6,7 +6,13 @@ import { Mapper } from '@automapper/core'; import { InjectMapper } from '@automapper/nestjs'; import { Injectable, Logger } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; -import { FindOptionsRelations, Repository } from 'typeorm'; +import { + FindOptionsRelations, + FindOptionsWhere, + IsNull, + Not, + Repository, +} from 'typeorm'; import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; import { NoticeOfIntentDocumentService } from '../../alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.service'; import { NOI_SUBMISSION_STATUS } from '../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status.dto'; @@ -196,14 +202,41 @@ export class NoticeOfIntentSubmissionService { // } // } - getByUser(user: User) { - return this.noticeOfIntentSubmissionRepository.find({ - where: { + async getByUser(user: User) { + const searchQueries: FindOptionsWhere[] = []; + + searchQueries.push({ + createdBy: { + uuid: user.uuid, + }, + isDraft: false, + }); + + if (user.bceidBusinessGuid) { + searchQueries.push({ createdBy: { - uuid: user.uuid, + bceidBusinessGuid: user.bceidBusinessGuid, }, isDraft: false, - }, + }); + + const matchingLocalGovernment = + await this.localGovernmentService.getByGuid(user.bceidBusinessGuid); + if (matchingLocalGovernment) { + searchQueries.push({ + localGovernmentUuid: matchingLocalGovernment.uuid, + isDraft: false, + //TODO: Test this once we can submit NOIs + submissionStatuses: { + effectiveDate: Not(IsNull()), + statusTypeCode: Not(NOI_SUBMISSION_STATUS.IN_PROGRESS), + }, + }); + } + } + + return this.noticeOfIntentSubmissionRepository.find({ + where: searchQueries, order: { auditUpdatedAt: 'DESC', }, @@ -348,11 +381,11 @@ export class NoticeOfIntentSubmissionService { } async updateStatus( - fileNumber: string, + uuid: string, statusCode: NOI_SUBMISSION_STATUS, effectiveDate?: Date | null, ) { - const submission = await this.loadBarebonesSubmission(fileNumber); + const submission = await this.loadBarebonesSubmission(uuid); await this.noticeOfIntentSubmissionStatusService.setStatusDate( submission.uuid, statusCode, @@ -367,11 +400,11 @@ export class NoticeOfIntentSubmissionService { ); } - private loadBarebonesSubmission(fileNumber: string) { + private loadBarebonesSubmission(uuid: string) { //Load submission without relations to prevent save from crazy cascading return this.noticeOfIntentSubmissionRepository.findOneOrFail({ where: { - fileNumber, + uuid, }, }); } diff --git a/services/apps/alcs/src/user/user.dto.ts b/services/apps/alcs/src/user/user.dto.ts index b14b6b22d0..6efee456af 100644 --- a/services/apps/alcs/src/user/user.dto.ts +++ b/services/apps/alcs/src/user/user.dto.ts @@ -57,7 +57,7 @@ export class CreateUserDto { bceidUserName?: string; idirUserGuid?: string; bceidGuid?: string; - bceidBusinessGuid?: string; + bceidBusinessGuid?: string | null; } export class AssigneeDto { diff --git a/services/apps/alcs/src/user/user.entity.ts b/services/apps/alcs/src/user/user.entity.ts index 4711c62f9b..1016ef31d2 100644 --- a/services/apps/alcs/src/user/user.entity.ts +++ b/services/apps/alcs/src/user/user.entity.ts @@ -64,8 +64,8 @@ export class User extends Base { @Column({ nullable: true }) bceidUserName: string; - @Column({ nullable: true }) - bceidBusinessGuid: string; + @Column({ nullable: true, type: 'varchar' }) + bceidBusinessGuid: string | null; @AutoMap() @Column({ default: [], array: true, type: 'text' }) From 911bfa56669e7505f23c0537fe93e663e654ad13 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Thu, 10 Aug 2023 15:35:57 -0700 Subject: [PATCH 224/954] Add NOI Stepper and Step 1 * Add Parcels and Owners * Change ApplicationOwnerType to OwnerType and re-use across both Apps and NOIs * Add NOI Document controller and service for portal --- .../application-details.component.html | 10 +- .../application-details.component.ts | 17 +- .../excl-details/excl-details.component.ts | 3 +- .../incl-details/incl-details.component.ts | 3 +- .../naru-details/naru-details.component.ts | 3 +- .../pfrs-details/pfrs-details.component.ts | 3 +- .../pofo-details/pofo-details.component.ts | 3 +- .../roso-details/roso-details.component.ts | 3 +- .../subd-details/subd-details.component.ts | 3 +- .../tur-details/tur-details.component.ts | 3 +- .../edit-submission/files-step.partial.ts | 4 +- .../other-attachments.component.ts | 10 +- .../other-parcels/other-parcels.component.ts | 7 +- ...pplication-crown-owner-dialog.component.ts | 6 +- .../application-owner-dialog.component.ts | 20 +- .../application-owners-dialog.component.ts | 5 +- .../parcel-details.component.ts | 9 +- .../parcel-entry/parcel-entry.component.ts | 13 +- .../parcel-owners/parcel-owners.component.ts | 5 +- .../primary-contact.component.ts | 25 +- .../excl-proposal/excl-proposal.component.ts | 6 +- .../incl-proposal/incl-proposal.component.ts | 6 +- .../naru-proposal/naru-proposal.component.ts | 6 +- .../pfrs-proposal/pfrs-proposal.component.ts | 6 +- .../pofo-proposal/pofo-proposal.component.ts | 6 +- .../roso-proposal/roso-proposal.component.ts | 6 +- .../subd-proposal/subd-proposal.component.ts | 6 +- .../tur-proposal/tur-proposal.component.ts | 6 +- .../review-attachments.component.ts | 7 +- .../review-submit-fng.component.ts | 3 +- .../review-submit/review-submit.component.ts | 3 +- .../lfng-review/lfng-review.component.ts | 7 +- .../edit-submission-base.module.ts | 48 ++ .../edit-submission.component.html | 71 ++- .../edit-submission.component.scss | 378 +++++++++++++ .../edit-submission.component.spec.ts | 27 +- .../edit-submission.component.ts | 150 +++++- .../edit-submission/edit-submission.module.ts | 12 +- .../delete-parcel-dialog.component.html | 36 ++ .../delete-parcel-dialog.component.scss | 24 + .../delete-parcel-dialog.component.spec.ts | 48 ++ .../delete-parcel-dialog.component.ts | 52 ++ .../parcels/parcel-details.component.html | 68 +++ .../parcels/parcel-details.component.scss | 0 .../parcels/parcel-details.component.spec.ts | 70 +++ .../parcels/parcel-details.component.ts | 173 ++++++ ...l-entry-confirmation-dialog.component.html | 35 ++ ...l-entry-confirmation-dialog.component.scss | 24 + ...ntry-confirmation-dialog.component.spec.ts | 35 ++ ...cel-entry-confirmation-dialog.component.ts | 33 ++ .../parcel-entry/parcel-entry.component.html | 372 +++++++++++++ .../parcel-entry/parcel-entry.component.scss | 96 ++++ .../parcel-entry.component.spec.ts | 81 +++ .../parcel-entry/parcel-entry.component.ts | 501 ++++++++++++++++++ .../parcel-owners.component.html | 73 +++ .../parcel-owners.component.scss | 14 + .../parcel-owners.component.spec.ts | 41 ++ .../parcel-owners/parcel-owners.component.ts | 91 ++++ .../edit-submission/step.partial.ts | 34 ++ .../application-document.dto.ts | 44 +- .../application-document.service.spec.ts | 2 +- .../application-document.service.ts | 8 +- .../application-owner.dto.ts | 17 +- .../application-owner.service.ts | 2 +- .../application-parcel.service.ts | 12 +- .../src/app/services/code/code.service.ts | 4 +- .../app/services/document/document.service.ts | 2 +- .../notice-of-intent-document.dto.ts | 18 + .../notice-of-intent-document.service.spec.ts | 91 ++++ .../notice-of-intent-document.service.ts | 91 ++++ .../notice-of-intent-owner.dto.ts | 57 ++ .../notice-of-intent-owner.service.spec.ts | 189 +++++++ .../notice-of-intent-owner.service.ts | 144 +++++ .../notice-of-intent-parcel.dto.ts | 29 + .../notice-of-intent-parcel.service.spec.ts | 102 ++++ .../notice-of-intent-parcel.service.ts | 107 ++++ .../notice-of-intent-submission.dto.ts | 2 + .../src/app/shared/dto/document.dto.ts | 41 ++ .../src/app/shared/dto/owner.dto.ts | 13 + .../application-document.service.ts | 4 +- ...tice-of-intent-document.controller.spec.ts | 2 - .../notice-of-intent-document.service.ts | 68 +-- .../notice-of-intent.service.ts | 4 +- .../application-owner.automapper.profile.ts | 5 +- ...tice-of-intent-owner.automapper.profile.ts | 82 +++ ...ice-of-intent-parcel.automapper.profile.ts | 85 +++ .../common/owner-type/owner-type.entity.ts | 23 + .../application-submission-draft.module.ts | 4 +- ...ation-submission-review.controller.spec.ts | 4 +- ...pplication-submission-review.controller.ts | 10 +- .../application-owner-type.entity.ts | 12 - .../application-owner.controller.spec.ts | 14 +- .../application-owner.controller.ts | 15 +- .../application-owner.dto.ts | 18 +- .../application-owner.entity.ts | 6 +- .../application-owner.service.spec.ts | 8 +- .../application-owner.service.ts | 14 +- ...ation-submission-validator.service.spec.ts | 34 +- ...pplication-submission-validator.service.ts | 16 +- .../application-submission.module.ts | 4 +- .../alcs/src/portal/code/code.controller.ts | 7 +- ...tice-of-intent-document.controller.spec.ts | 179 +++++++ .../notice-of-intent-document.controller.ts | 162 ++++++ .../notice-of-intent-document.dto.ts | 30 ++ .../notice-of-intent-document.module.ts | 17 + .../notice-of-intent-owner.controller.spec.ts | 345 ++++++++++++ .../notice-of-intent-owner.controller.ts | 259 +++++++++ .../notice-of-intent-owner.dto.ts | 138 +++++ .../notice-of-intent-owner.entity.ts | 77 +++ .../notice-of-intent-owner.service.spec.ts | 341 ++++++++++++ .../notice-of-intent-owner.service.ts | 294 ++++++++++ ...-of-intent-parcel-ownership-type.entity.ts | 5 + ...notice-of-intent-parcel.controller.spec.ts | 165 ++++++ .../notice-of-intent-parcel.controller.ts | 158 ++++++ .../notice-of-intent-parcel.dto.ts | 147 +++++ .../notice-of-intent-parcel.entity.ts | 147 +++++ .../notice-of-intent-parcel.service.spec.ts | 248 +++++++++ .../notice-of-intent-parcel.service.ts | 140 +++++ .../notice-of-intent-submission.entity.ts | 7 + .../notice-of-intent-submission.module.ts | 34 +- .../notice-of-intent-submission.service.ts | 4 + .../generate-submission-document.service.ts | 4 +- .../apps/alcs/src/portal/portal.module.ts | 3 + ...5-add_noi_submission_parcels_and_owners.ts | 111 ++++ ...691705084117-seed_noi_parcel_owner_type.ts | 14 + 125 files changed, 6910 insertions(+), 343 deletions(-) create mode 100644 portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission-base.module.ts create mode 100644 portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/delete-parcel/delete-parcel-dialog.component.html create mode 100644 portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/delete-parcel/delete-parcel-dialog.component.scss create mode 100644 portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/delete-parcel/delete-parcel-dialog.component.spec.ts create mode 100644 portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/delete-parcel/delete-parcel-dialog.component.ts create mode 100644 portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-details.component.html create mode 100644 portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-details.component.scss create mode 100644 portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-details.component.spec.ts create mode 100644 portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-details.component.ts create mode 100644 portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry-confirmation-dialog/parcel-entry-confirmation-dialog.component.html create mode 100644 portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry-confirmation-dialog/parcel-entry-confirmation-dialog.component.scss create mode 100644 portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry-confirmation-dialog/parcel-entry-confirmation-dialog.component.spec.ts create mode 100644 portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry-confirmation-dialog/parcel-entry-confirmation-dialog.component.ts create mode 100644 portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.html create mode 100644 portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.scss create mode 100644 portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.spec.ts create mode 100644 portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.ts create mode 100644 portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-owners/parcel-owners.component.html create mode 100644 portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-owners/parcel-owners.component.scss create mode 100644 portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-owners/parcel-owners.component.spec.ts create mode 100644 portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-owners/parcel-owners.component.ts create mode 100644 portal-frontend/src/app/features/notice-of-intents/edit-submission/step.partial.ts create mode 100644 portal-frontend/src/app/services/notice-of-intent-document/notice-of-intent-document.dto.ts create mode 100644 portal-frontend/src/app/services/notice-of-intent-document/notice-of-intent-document.service.spec.ts create mode 100644 portal-frontend/src/app/services/notice-of-intent-document/notice-of-intent-document.service.ts create mode 100644 portal-frontend/src/app/services/notice-of-intent-owner/notice-of-intent-owner.dto.ts create mode 100644 portal-frontend/src/app/services/notice-of-intent-owner/notice-of-intent-owner.service.spec.ts create mode 100644 portal-frontend/src/app/services/notice-of-intent-owner/notice-of-intent-owner.service.ts create mode 100644 portal-frontend/src/app/services/notice-of-intent-parcel/notice-of-intent-parcel.dto.ts create mode 100644 portal-frontend/src/app/services/notice-of-intent-parcel/notice-of-intent-parcel.service.spec.ts create mode 100644 portal-frontend/src/app/services/notice-of-intent-parcel/notice-of-intent-parcel.service.ts create mode 100644 portal-frontend/src/app/shared/dto/document.dto.ts create mode 100644 portal-frontend/src/app/shared/dto/owner.dto.ts create mode 100644 services/apps/alcs/src/common/automapper/notice-of-intent-owner.automapper.profile.ts create mode 100644 services/apps/alcs/src/common/automapper/notice-of-intent-parcel.automapper.profile.ts create mode 100644 services/apps/alcs/src/common/owner-type/owner-type.entity.ts delete mode 100644 services/apps/alcs/src/portal/application-submission/application-owner/application-owner-type/application-owner-type.entity.ts create mode 100644 services/apps/alcs/src/portal/notice-of-intent-document/notice-of-intent-document.controller.spec.ts create mode 100644 services/apps/alcs/src/portal/notice-of-intent-document/notice-of-intent-document.controller.ts create mode 100644 services/apps/alcs/src/portal/notice-of-intent-document/notice-of-intent-document.dto.ts create mode 100644 services/apps/alcs/src/portal/notice-of-intent-document/notice-of-intent-document.module.ts create mode 100644 services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.controller.spec.ts create mode 100644 services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.controller.ts create mode 100644 services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.dto.ts create mode 100644 services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.entity.ts create mode 100644 services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.service.spec.ts create mode 100644 services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.service.ts create mode 100644 services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel-ownership-type/notice-of-intent-parcel-ownership-type.entity.ts create mode 100644 services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.controller.spec.ts create mode 100644 services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.controller.ts create mode 100644 services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.dto.ts create mode 100644 services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.entity.ts create mode 100644 services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.service.spec.ts create mode 100644 services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.service.ts create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1691692339215-add_noi_submission_parcels_and_owners.ts create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1691705084117-seed_noi_parcel_owner_type.ts diff --git a/portal-frontend/src/app/features/applications/application-details/application-details.component.html b/portal-frontend/src/app/features/applications/application-details/application-details.component.html index 8c1e4e2548..de1ad9841b 100644 --- a/portal-frontend/src/app/features/applications/application-details/application-details.component.html +++ b/portal-frontend/src/app/features/applications/application-details/application-details.component.html @@ -42,18 +42,18 @@

3. Primary Contact

Organization (optional) - Ministry/Department Responsible - Department + Ministry/Department Responsible + Department
{{ primaryContact?.organizationName }}
diff --git a/portal-frontend/src/app/features/applications/application-details/application-details.component.ts b/portal-frontend/src/app/features/applications/application-details/application-details.component.ts index c8ac8740c3..da184ade67 100644 --- a/portal-frontend/src/app/features/applications/application-details/application-details.component.ts +++ b/portal-frontend/src/app/features/applications/application-details/application-details.component.ts @@ -1,17 +1,15 @@ import { Component, Input, OnDestroy, OnInit } from '@angular/core'; import { Router } from '@angular/router'; import { BehaviorSubject, Subject, takeUntil } from 'rxjs'; -import { - ApplicationDocumentDto, - DOCUMENT_SOURCE, - DOCUMENT_TYPE, -} from '../../../services/application-document/application-document.dto'; +import { ApplicationDocumentDto } from '../../../services/application-document/application-document.dto'; import { ApplicationDocumentService } from '../../../services/application-document/application-document.service'; -import { APPLICATION_OWNER, ApplicationOwnerDetailedDto } from '../../../services/application-owner/application-owner.dto'; +import { ApplicationOwnerDetailedDto } from '../../../services/application-owner/application-owner.dto'; import { PARCEL_TYPE } from '../../../services/application-parcel/application-parcel.dto'; import { ApplicationSubmissionDetailedDto } from '../../../services/application-submission/application-submission.dto'; import { LocalGovernmentDto } from '../../../services/code/code.dto'; import { CodeService } from '../../../services/code/code.service'; +import { DOCUMENT_SOURCE, DOCUMENT_TYPE } from '../../../shared/dto/document.dto'; +import { OWNER_TYPE } from '../../../shared/dto/owner.dto'; @Component({ selector: 'app-application-details', @@ -37,7 +35,7 @@ export class ApplicationDetailsComponent implements OnInit, OnDestroy { otherFiles: ApplicationDocumentDto[] = []; needsAuthorizationLetter = true; appDocuments: ApplicationDocumentDto[] = []; - APPLICATION_OWNER = APPLICATION_OWNER; + OWNER_TYPE = OWNER_TYPE; private localGovernments: LocalGovernmentDto[] = []; private otherFileTypes = [DOCUMENT_TYPE.PHOTOGRAPH, DOCUMENT_TYPE.PROFESSIONAL_REPORT, DOCUMENT_TYPE.OTHER]; @@ -57,11 +55,10 @@ export class ApplicationDetailsComponent implements OnInit, OnDestroy { this.populateLocalGovernment(app.localGovernmentUuid); this.needsAuthorizationLetter = - !(this.primaryContact?.type.code === APPLICATION_OWNER.GOVERNMENT) && + !(this.primaryContact?.type.code === OWNER_TYPE.GOVERNMENT) && !( app.owners.length === 1 && - (app.owners[0].type.code === APPLICATION_OWNER.INDIVIDUAL || - app.owners[0].type.code === APPLICATION_OWNER.GOVERNMENT) + (app.owners[0].type.code === OWNER_TYPE.INDIVIDUAL || app.owners[0].type.code === OWNER_TYPE.GOVERNMENT) ); } }); diff --git a/portal-frontend/src/app/features/applications/application-details/excl-details/excl-details.component.ts b/portal-frontend/src/app/features/applications/application-details/excl-details/excl-details.component.ts index 0d9ce89d03..cb7cd34589 100644 --- a/portal-frontend/src/app/features/applications/application-details/excl-details/excl-details.component.ts +++ b/portal-frontend/src/app/features/applications/application-details/excl-details/excl-details.component.ts @@ -2,7 +2,8 @@ import { Component, Input } from '@angular/core'; import { Router } from '@angular/router'; import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; import { ApplicationSubmissionDetailedDto } from '../../../../services/application-submission/application-submission.dto'; -import { ApplicationDocumentDto, DOCUMENT_TYPE } from '../../../../services/application-document/application-document.dto'; +import { ApplicationDocumentDto } from '../../../../services/application-document/application-document.dto'; +import { DOCUMENT_TYPE } from '../../../../shared/dto/document.dto'; @Component({ selector: 'app-excl-details', diff --git a/portal-frontend/src/app/features/applications/application-details/incl-details/incl-details.component.ts b/portal-frontend/src/app/features/applications/application-details/incl-details/incl-details.component.ts index b81fd9271c..758c5d32fd 100644 --- a/portal-frontend/src/app/features/applications/application-details/incl-details/incl-details.component.ts +++ b/portal-frontend/src/app/features/applications/application-details/incl-details/incl-details.component.ts @@ -3,8 +3,9 @@ import { Router } from '@angular/router'; import { Subject, takeUntil } from 'rxjs'; import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; import { ApplicationSubmissionDetailedDto } from '../../../../services/application-submission/application-submission.dto'; -import { ApplicationDocumentDto, DOCUMENT_TYPE } from '../../../../services/application-document/application-document.dto'; +import { ApplicationDocumentDto } from '../../../../services/application-document/application-document.dto'; import { AuthenticationService } from '../../../../services/authentication/authentication.service'; +import { DOCUMENT_TYPE } from '../../../../shared/dto/document.dto'; @Component({ selector: 'app-incl-details', diff --git a/portal-frontend/src/app/features/applications/application-details/naru-details/naru-details.component.ts b/portal-frontend/src/app/features/applications/application-details/naru-details/naru-details.component.ts index bcbb2644a9..50b6c278e4 100644 --- a/portal-frontend/src/app/features/applications/application-details/naru-details/naru-details.component.ts +++ b/portal-frontend/src/app/features/applications/application-details/naru-details/naru-details.component.ts @@ -1,8 +1,9 @@ import { Component, Input } from '@angular/core'; import { Router } from '@angular/router'; -import { ApplicationDocumentDto, DOCUMENT_TYPE } from '../../../../services/application-document/application-document.dto'; +import { ApplicationDocumentDto } from '../../../../services/application-document/application-document.dto'; import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; import { ApplicationSubmissionDetailedDto } from '../../../../services/application-submission/application-submission.dto'; +import { DOCUMENT_TYPE } from '../../../../shared/dto/document.dto'; @Component({ selector: 'app-naru-details[applicationSubmission]', diff --git a/portal-frontend/src/app/features/applications/application-details/pfrs-details/pfrs-details.component.ts b/portal-frontend/src/app/features/applications/application-details/pfrs-details/pfrs-details.component.ts index d719c83504..934048d407 100644 --- a/portal-frontend/src/app/features/applications/application-details/pfrs-details/pfrs-details.component.ts +++ b/portal-frontend/src/app/features/applications/application-details/pfrs-details/pfrs-details.component.ts @@ -1,8 +1,9 @@ import { Component, Input } from '@angular/core'; import { Router } from '@angular/router'; -import { ApplicationDocumentDto, DOCUMENT_TYPE } from '../../../../services/application-document/application-document.dto'; +import { ApplicationDocumentDto } from '../../../../services/application-document/application-document.dto'; import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; import { ApplicationSubmissionDetailedDto } from '../../../../services/application-submission/application-submission.dto'; +import { DOCUMENT_TYPE } from '../../../../shared/dto/document.dto'; @Component({ selector: 'app-pfrs-details[applicationSubmission]', diff --git a/portal-frontend/src/app/features/applications/application-details/pofo-details/pofo-details.component.ts b/portal-frontend/src/app/features/applications/application-details/pofo-details/pofo-details.component.ts index c412d258e5..f2f1576b33 100644 --- a/portal-frontend/src/app/features/applications/application-details/pofo-details/pofo-details.component.ts +++ b/portal-frontend/src/app/features/applications/application-details/pofo-details/pofo-details.component.ts @@ -1,8 +1,9 @@ import { Component, Input } from '@angular/core'; import { Router } from '@angular/router'; -import { ApplicationDocumentDto, DOCUMENT_TYPE } from '../../../../services/application-document/application-document.dto'; +import { ApplicationDocumentDto } from '../../../../services/application-document/application-document.dto'; import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; import { ApplicationSubmissionDetailedDto } from '../../../../services/application-submission/application-submission.dto'; +import { DOCUMENT_TYPE } from '../../../../shared/dto/document.dto'; @Component({ selector: 'app-pofo-details[applicationSubmission]', diff --git a/portal-frontend/src/app/features/applications/application-details/roso-details/roso-details.component.ts b/portal-frontend/src/app/features/applications/application-details/roso-details/roso-details.component.ts index 7b4d0d5c5e..1d7f7db422 100644 --- a/portal-frontend/src/app/features/applications/application-details/roso-details/roso-details.component.ts +++ b/portal-frontend/src/app/features/applications/application-details/roso-details/roso-details.component.ts @@ -1,8 +1,9 @@ import { Component, Input } from '@angular/core'; import { Router } from '@angular/router'; -import { ApplicationDocumentDto, DOCUMENT_TYPE } from '../../../../services/application-document/application-document.dto'; +import { ApplicationDocumentDto } from '../../../../services/application-document/application-document.dto'; import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; import { ApplicationSubmissionDetailedDto } from '../../../../services/application-submission/application-submission.dto'; +import { DOCUMENT_TYPE } from '../../../../shared/dto/document.dto'; @Component({ selector: 'app-roso-details[applicationSubmission]', diff --git a/portal-frontend/src/app/features/applications/application-details/subd-details/subd-details.component.ts b/portal-frontend/src/app/features/applications/application-details/subd-details/subd-details.component.ts index 61ee6278fe..295e9ab999 100644 --- a/portal-frontend/src/app/features/applications/application-details/subd-details/subd-details.component.ts +++ b/portal-frontend/src/app/features/applications/application-details/subd-details/subd-details.component.ts @@ -1,10 +1,11 @@ import { Component, Input } from '@angular/core'; import { Router } from '@angular/router'; -import { ApplicationDocumentDto, DOCUMENT_TYPE } from '../../../../services/application-document/application-document.dto'; +import { ApplicationDocumentDto } from '../../../../services/application-document/application-document.dto'; import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; import { PARCEL_TYPE } from '../../../../services/application-parcel/application-parcel.dto'; import { ApplicationParcelService } from '../../../../services/application-parcel/application-parcel.service'; import { ApplicationSubmissionDetailedDto } from '../../../../services/application-submission/application-submission.dto'; +import { DOCUMENT_TYPE } from '../../../../shared/dto/document.dto'; @Component({ selector: 'app-subd-details[applicationSubmission]', diff --git a/portal-frontend/src/app/features/applications/application-details/tur-details/tur-details.component.ts b/portal-frontend/src/app/features/applications/application-details/tur-details/tur-details.component.ts index dc196ca276..6444c3b03d 100644 --- a/portal-frontend/src/app/features/applications/application-details/tur-details/tur-details.component.ts +++ b/portal-frontend/src/app/features/applications/application-details/tur-details/tur-details.component.ts @@ -1,8 +1,9 @@ import { Component, Input } from '@angular/core'; import { Router } from '@angular/router'; -import { ApplicationDocumentDto, DOCUMENT_TYPE } from '../../../../services/application-document/application-document.dto'; +import { ApplicationDocumentDto } from '../../../../services/application-document/application-document.dto'; import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; import { ApplicationSubmissionDetailedDto } from '../../../../services/application-submission/application-submission.dto'; +import { DOCUMENT_TYPE } from '../../../../shared/dto/document.dto'; @Component({ selector: 'app-tur-details[applicationSubmission]', diff --git a/portal-frontend/src/app/features/applications/edit-submission/files-step.partial.ts b/portal-frontend/src/app/features/applications/edit-submission/files-step.partial.ts index 2840e92774..c583e6b74d 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/files-step.partial.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/files-step.partial.ts @@ -1,8 +1,9 @@ import { Component, Input } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; import { BehaviorSubject } from 'rxjs'; -import { ApplicationDocumentDto, DOCUMENT_TYPE } from '../../../services/application-document/application-document.dto'; +import { ApplicationDocumentDto } from '../../../services/application-document/application-document.dto'; import { ApplicationDocumentService } from '../../../services/application-document/application-document.service'; +import { DOCUMENT_TYPE } from '../../../shared/dto/document.dto'; import { FileHandle } from '../../../shared/file-drag-drop/drag-drop.directive'; import { RemoveFileConfirmationDialogComponent } from '../alcs-edit-submission/remove-file-confirmation-dialog/remove-file-confirmation-dialog.component'; import { StepComponent } from './step.partial'; @@ -18,6 +19,7 @@ export abstract class FilesStepComponent extends StepComponent { DOCUMENT_TYPE = DOCUMENT_TYPE; protected fileId = ''; + protected abstract save(): Promise; protected constructor(protected applicationDocumentService: ApplicationDocumentService, protected dialog: MatDialog) { diff --git a/portal-frontend/src/app/features/applications/edit-submission/other-attachments/other-attachments.component.ts b/portal-frontend/src/app/features/applications/edit-submission/other-attachments/other-attachments.component.ts index 2984985c68..8e26372636 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/other-attachments/other-attachments.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/other-attachments/other-attachments.component.ts @@ -5,14 +5,12 @@ import { Router } from '@angular/router'; import { takeUntil } from 'rxjs'; import { ApplicationDocumentDto, - ApplicationDocumentTypeDto, ApplicationDocumentUpdateDto, - DOCUMENT_SOURCE, - DOCUMENT_TYPE, } from '../../../../services/application-document/application-document.dto'; import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; import { ApplicationSubmissionService } from '../../../../services/application-submission/application-submission.service'; import { CodeService } from '../../../../services/code/code.service'; +import { DOCUMENT_SOURCE, DOCUMENT_TYPE, DocumentTypeDto } from '../../../../shared/dto/document.dto'; import { EditApplicationSteps } from '../edit-submission.component'; import { FilesStepComponent } from '../files-step.partial'; @@ -27,13 +25,13 @@ export class OtherAttachmentsComponent extends FilesStepComponent implements OnI currentStep = EditApplicationSteps.Attachments; displayedColumns = ['type', 'description', 'fileName', 'actions']; - selectableTypes: ApplicationDocumentTypeDto[] = []; + selectableTypes: DocumentTypeDto[] = []; otherFiles: ApplicationDocumentDto[] = []; private isDirty = false; form = new FormGroup({} as any); - private documentCodes: ApplicationDocumentTypeDto[] = []; + private documentCodes: DocumentTypeDto[] = []; constructor( private router: Router, @@ -117,7 +115,7 @@ export class OtherAttachmentsComponent extends FilesStepComponent implements OnI private async loadDocumentCodes() { const codes = await this.codeService.loadCodes(); - this.documentCodes = codes.applicationDocumentTypes; + this.documentCodes = codes.documentTypes; this.selectableTypes = this.documentCodes.filter((code) => USER_CONTROLLED_TYPES.includes(code.code)); } } diff --git a/portal-frontend/src/app/features/applications/edit-submission/other-parcels/other-parcels.component.ts b/portal-frontend/src/app/features/applications/edit-submission/other-parcels/other-parcels.component.ts index d15c92e1f3..e9476cdbc2 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/other-parcels/other-parcels.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/other-parcels/other-parcels.component.ts @@ -1,11 +1,9 @@ -import { Component, Input, OnDestroy, OnInit } from '@angular/core'; +import { Component, OnDestroy, OnInit } from '@angular/core'; import { FormControl, FormGroup, Validators } from '@angular/forms'; import { MatButtonToggleChange } from '@angular/material/button-toggle'; import { MatDialog } from '@angular/material/dialog'; -import { Router } from '@angular/router'; import { BehaviorSubject, takeUntil } from 'rxjs'; import { - APPLICATION_OWNER, ApplicationOwnerDetailedDto, ApplicationOwnerDto, } from '../../../../services/application-owner/application-owner.dto'; @@ -18,6 +16,7 @@ import { ApplicationParcelService } from '../../../../services/application-parce import { ApplicationSubmissionDetailedDto } from '../../../../services/application-submission/application-submission.dto'; import { ApplicationSubmissionService } from '../../../../services/application-submission/application-submission.service'; import { ToastService } from '../../../../services/toast/toast.service'; +import { OWNER_TYPE } from '../../../../shared/dto/owner.dto'; import { formatBooleanToString } from '../../../../shared/utils/boolean-helper'; import { getLetterCombinations } from '../../../../shared/utils/number-to-letter-helper'; import { parseStringToBoolean } from '../../../../shared/utils/string-helper'; @@ -71,7 +70,7 @@ export class OtherParcelsComponent extends StepComponent implements OnInit, OnDe this.fileId = application.fileNumber; this.submissionUuid = application.uuid; const nonAgentOwners = application.owners.filter( - (owner) => ![APPLICATION_OWNER.AGENT, APPLICATION_OWNER.GOVERNMENT].includes(owner.type.code) + (owner) => ![OWNER_TYPE.AGENT, OWNER_TYPE.GOVERNMENT].includes(owner.type.code) ); this.owners = nonAgentOwners.map((o) => ({ ...o, diff --git a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/application-crown-owner-dialog/application-crown-owner-dialog.component.ts b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/application-crown-owner-dialog/application-crown-owner-dialog.component.ts index fc2981a6fe..8aba0af222 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/application-crown-owner-dialog/application-crown-owner-dialog.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/application-crown-owner-dialog/application-crown-owner-dialog.component.ts @@ -2,12 +2,12 @@ import { Component, Inject } from '@angular/core'; import { FormControl, FormGroup, Validators } from '@angular/forms'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { - APPLICATION_OWNER, ApplicationOwnerCreateDto, ApplicationOwnerDto, ApplicationOwnerUpdateDto, } from '../../../../../services/application-owner/application-owner.dto'; import { ApplicationOwnerService } from '../../../../../services/application-owner/application-owner.service'; +import { OWNER_TYPE } from '../../../../../shared/dto/owner.dto'; @Component({ selector: 'app-application-crown-owner-dialog', @@ -61,7 +61,7 @@ export class ApplicationCrownOwnerDialogComponent { lastName: this.lastName.getRawValue() || undefined, email: this.email.getRawValue()!, phoneNumber: this.phoneNumber.getRawValue()!, - typeCode: APPLICATION_OWNER.CROWN, + typeCode: OWNER_TYPE.CROWN, applicationSubmissionUuid: this.data.submissionUuid, }; @@ -80,7 +80,7 @@ export class ApplicationCrownOwnerDialogComponent { lastName: this.lastName.getRawValue(), email: this.email.getRawValue()!, phoneNumber: this.phoneNumber.getRawValue()!, - typeCode: APPLICATION_OWNER.CROWN, + typeCode: OWNER_TYPE.CROWN, }; if (this.existingUuid) { const res = await this.appOwnerService.update(this.existingUuid, updateDto); diff --git a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/application-owner-dialog/application-owner-dialog.component.ts b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/application-owner-dialog/application-owner-dialog.component.ts index 37fe30f179..0826020249 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/application-owner-dialog/application-owner-dialog.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/application-owner-dialog/application-owner-dialog.component.ts @@ -2,21 +2,17 @@ import { Component, Inject } from '@angular/core'; import { FormControl, FormGroup, Validators } from '@angular/forms'; import { MatButtonToggleChange } from '@angular/material/button-toggle'; import { MAT_DIALOG_DATA, MatDialog, MatDialogRef } from '@angular/material/dialog'; -import { - ApplicationDocumentDto, - ApplicationDocumentTypeDto, - DOCUMENT_SOURCE, - DOCUMENT_TYPE, -} from '../../../../../services/application-document/application-document.dto'; +import { ApplicationDocumentDto } from '../../../../../services/application-document/application-document.dto'; import { ApplicationDocumentService } from '../../../../../services/application-document/application-document.service'; import { - APPLICATION_OWNER, ApplicationOwnerCreateDto, ApplicationOwnerDto, ApplicationOwnerUpdateDto, } from '../../../../../services/application-owner/application-owner.dto'; import { ApplicationOwnerService } from '../../../../../services/application-owner/application-owner.service'; import { CodeService } from '../../../../../services/code/code.service'; +import { DOCUMENT_SOURCE, DOCUMENT_TYPE, DocumentTypeDto } from '../../../../../shared/dto/document.dto'; +import { OWNER_TYPE } from '../../../../../shared/dto/owner.dto'; import { FileHandle } from '../../../../../shared/file-drag-drop/drag-drop.directive'; import { RemoveFileConfirmationDialogComponent } from '../../../alcs-edit-submission/remove-file-confirmation-dialog/remove-file-confirmation-dialog.component'; @@ -26,8 +22,8 @@ import { RemoveFileConfirmationDialogComponent } from '../../../alcs-edit-submis styleUrls: ['./application-owner-dialog.component.scss'], }) export class ApplicationOwnerDialogComponent { - OWNER_TYPE = APPLICATION_OWNER; - type = new FormControl(APPLICATION_OWNER.INDIVIDUAL); + OWNER_TYPE = OWNER_TYPE; + type = new FormControl(OWNER_TYPE.INDIVIDUAL); firstName = new FormControl('', [Validators.required]); lastName = new FormControl('', [Validators.required]); organizationName = new FormControl(''); @@ -49,7 +45,7 @@ export class ApplicationOwnerDialogComponent { corporateSummary: this.corporateSummary, }); private pendingFile: File | undefined; - private documentCodes: ApplicationDocumentTypeDto[] = []; + private documentCodes: DocumentTypeDto[] = []; constructor( private dialogRef: MatDialogRef, @@ -87,7 +83,7 @@ export class ApplicationOwnerDialogComponent { } onChangeType($event: MatButtonToggleChange) { - if ($event.value === APPLICATION_OWNER.ORGANIZATION) { + if ($event.value === OWNER_TYPE.ORGANIZATION) { this.organizationName.setValidators([Validators.required]); this.corporateSummary.setValidators([Validators.required]); } else { @@ -210,6 +206,6 @@ export class ApplicationOwnerDialogComponent { private async loadDocumentCodes() { const codes = await this.codeService.loadCodes(); - this.documentCodes = codes.applicationDocumentTypes; + this.documentCodes = codes.documentTypes; } } diff --git a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/application-owners-dialog/application-owners-dialog.component.ts b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/application-owners-dialog/application-owners-dialog.component.ts index 83c7335b90..8a884734aa 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/application-owners-dialog/application-owners-dialog.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/application-owners-dialog/application-owners-dialog.component.ts @@ -1,7 +1,8 @@ import { Component, Inject } from '@angular/core'; import { MAT_DIALOG_DATA } from '@angular/material/dialog'; -import { APPLICATION_OWNER, ApplicationOwnerDto } from '../../../../../services/application-owner/application-owner.dto'; +import { ApplicationOwnerDto } from '../../../../../services/application-owner/application-owner.dto'; import { ApplicationOwnerService } from '../../../../../services/application-owner/application-owner.service'; +import { OWNER_TYPE } from '../../../../../shared/dto/owner.dto'; @Component({ selector: 'app-application-owner-dialog', @@ -32,7 +33,7 @@ export class ApplicationOwnersDialogComponent { const updatedOwners = await this.applicationOwnerService.fetchBySubmissionId(this.submissionUuid); if (updatedOwners) { this.owners = updatedOwners.filter( - (owner) => ![APPLICATION_OWNER.AGENT, APPLICATION_OWNER.GOVERNMENT].includes(owner.type.code) + (owner) => ![OWNER_TYPE.AGENT, OWNER_TYPE.GOVERNMENT].includes(owner.type.code) ); this.isDirty = true; } diff --git a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-details.component.ts b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-details.component.ts index 6c2f6e4cee..3cc45bef0e 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-details.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-details.component.ts @@ -1,8 +1,8 @@ -import { AfterViewInit, Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; +import { AfterViewInit, Component, EventEmitter, OnInit, Output } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; import { Router } from '@angular/router'; import { BehaviorSubject, takeUntil } from 'rxjs'; -import { APPLICATION_OWNER, ApplicationOwnerDto } from '../../../../services/application-owner/application-owner.dto'; +import { ApplicationOwnerDto } from '../../../../services/application-owner/application-owner.dto'; import { ApplicationOwnerService } from '../../../../services/application-owner/application-owner.service'; import { ApplicationParcelDto, @@ -11,6 +11,7 @@ import { } from '../../../../services/application-parcel/application-parcel.dto'; import { ApplicationParcelService } from '../../../../services/application-parcel/application-parcel.service'; import { ToastService } from '../../../../services/toast/toast.service'; +import { OWNER_TYPE } from '../../../../shared/dto/owner.dto'; import { parseStringToBoolean } from '../../../../shared/utils/string-helper'; import { EditApplicationSteps } from '../edit-submission.component'; import { StepComponent } from '../step.partial'; @@ -50,7 +51,7 @@ export class ParcelDetailsComponent extends StepComponent implements OnInit, Aft this.submissionUuid = applicationSubmission.uuid; this.loadParcels(); const parcelOwners = applicationSubmission.owners.filter( - (owner) => ![APPLICATION_OWNER.AGENT, APPLICATION_OWNER.GOVERNMENT].includes(owner.type.code) + (owner) => ![OWNER_TYPE.AGENT, OWNER_TYPE.GOVERNMENT].includes(owner.type.code) ); this.$owners.next(parcelOwners); } @@ -164,7 +165,7 @@ export class ParcelDetailsComponent extends StepComponent implements OnInit, Aft const owners = await this.applicationOwnerService.fetchBySubmissionId(this.submissionUuid); if (owners) { const parcelOwners = owners.filter( - (owner) => ![APPLICATION_OWNER.AGENT, APPLICATION_OWNER.GOVERNMENT].includes(owner.type.code) + (owner) => ![OWNER_TYPE.AGENT, OWNER_TYPE.GOVERNMENT].includes(owner.type.code) ); this.$owners.next(parcelOwners); } diff --git a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts index b6567a7ea4..072389f93b 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts @@ -3,12 +3,9 @@ import { FormControl, FormGroup, Validators } from '@angular/forms'; import { MatButtonToggleChange } from '@angular/material/button-toggle'; import { MatDialog } from '@angular/material/dialog'; import { BehaviorSubject } from 'rxjs'; -import { - ApplicationDocumentDto, - DOCUMENT_TYPE, -} from '../../../../../services/application-document/application-document.dto'; +import { ApplicationDocumentDto } from '../../../../../services/application-document/application-document.dto'; import { ApplicationDocumentService } from '../../../../../services/application-document/application-document.service'; -import { APPLICATION_OWNER, ApplicationOwnerDto } from '../../../../../services/application-owner/application-owner.dto'; +import { ApplicationOwnerDto } from '../../../../../services/application-owner/application-owner.dto'; import { ApplicationOwnerService } from '../../../../../services/application-owner/application-owner.service'; import { ApplicationParcelDto, @@ -16,6 +13,8 @@ import { } from '../../../../../services/application-parcel/application-parcel.dto'; import { ApplicationParcelService } from '../../../../../services/application-parcel/application-parcel.service'; import { ParcelService } from '../../../../../services/parcel/parcel.service'; +import { DOCUMENT_TYPE } from '../../../../../shared/dto/document.dto'; +import { OWNER_TYPE } from '../../../../../shared/dto/owner.dto'; import { FileHandle } from '../../../../../shared/file-drag-drop/drag-drop.directive'; import { formatBooleanToString } from '../../../../../shared/utils/boolean-helper'; import { RemoveFileConfirmationDialogComponent } from '../../../alcs-edit-submission/remove-file-confirmation-dialog/remove-file-confirmation-dialog.component'; @@ -334,9 +333,9 @@ export class ParcelEntryComponent implements OnInit { return owners .filter((owner) => { if (this.isCrownLand) { - return [APPLICATION_OWNER.CROWN].includes(owner.type.code); + return [OWNER_TYPE.CROWN].includes(owner.type.code); } else { - return [APPLICATION_OWNER.INDIVIDUAL, APPLICATION_OWNER.ORGANIZATION].includes(owner.type.code); + return [OWNER_TYPE.INDIVIDUAL, OWNER_TYPE.ORGANIZATION].includes(owner.type.code); } }) .map((owner) => { diff --git a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-owners/parcel-owners.component.ts b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-owners/parcel-owners.component.ts index 760e03f11a..e0f04f417f 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-owners/parcel-owners.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-owners/parcel-owners.component.ts @@ -1,8 +1,9 @@ import { Component, EventEmitter, Input, Output } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; -import { ApplicationOwnerDto, APPLICATION_OWNER } from '../../../../../services/application-owner/application-owner.dto'; +import { ApplicationOwnerDto } from '../../../../../services/application-owner/application-owner.dto'; import { ApplicationOwnerService } from '../../../../../services/application-owner/application-owner.service'; import { ConfirmationDialogService } from '../../../../../shared/confirmation-dialog/confirmation-dialog.service'; +import { OWNER_TYPE } from '../../../../../shared/dto/owner.dto'; import { ApplicationCrownOwnerDialogComponent } from '../application-crown-owner-dialog/application-crown-owner-dialog.component'; import { ApplicationOwnerDialogComponent } from '../application-owner-dialog/application-owner-dialog.component'; @@ -44,7 +45,7 @@ export class ParcelOwnersComponent { onEdit(owner: ApplicationOwnerDto) { let dialog; - if (owner.type.code === APPLICATION_OWNER.CROWN) { + if (owner.type.code === OWNER_TYPE.CROWN) { dialog = this.dialog.open(ApplicationCrownOwnerDialogComponent, { data: { isDraft: this.isDraft, diff --git a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts index cc5f41607d..e42b200f13 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts @@ -3,12 +3,14 @@ import { FormControl, FormGroup, Validators } from '@angular/forms'; import { MatDialog } from '@angular/material/dialog'; import { Router } from '@angular/router'; import { takeUntil } from 'rxjs'; -import { ApplicationDocumentDto, DOCUMENT_TYPE } from '../../../../services/application-document/application-document.dto'; +import { ApplicationDocumentDto } from '../../../../services/application-document/application-document.dto'; import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; -import { APPLICATION_OWNER, ApplicationOwnerDto } from '../../../../services/application-owner/application-owner.dto'; +import { ApplicationOwnerDto } from '../../../../services/application-owner/application-owner.dto'; import { ApplicationOwnerService } from '../../../../services/application-owner/application-owner.service'; import { ApplicationSubmissionService } from '../../../../services/application-submission/application-submission.service'; import { AuthenticationService } from '../../../../services/authentication/authentication.service'; +import { DOCUMENT_TYPE } from '../../../../shared/dto/document.dto'; +import { OWNER_TYPE } from '../../../../shared/dto/owner.dto'; import { EditApplicationSteps } from '../edit-submission.component'; import { FilesStepComponent } from '../files-step.partial'; @@ -102,10 +104,9 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni ...owner, isSelected: owner.uuid === uuid, })); - this.selectedThirdPartyAgent = - (selectedOwner && selectedOwner.type.code === APPLICATION_OWNER.AGENT) || uuid == 'agent'; + this.selectedThirdPartyAgent = (selectedOwner && selectedOwner.type.code === OWNER_TYPE.AGENT) || uuid == 'agent'; this.selectedLocalGovernment = - (selectedOwner && selectedOwner.type.code === APPLICATION_OWNER.GOVERNMENT) || uuid == 'government'; + (selectedOwner && selectedOwner.type.code === OWNER_TYPE.GOVERNMENT) || uuid == 'government'; this.form.reset(); if (this.selectedLocalGovernment) { @@ -136,7 +137,7 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni phoneNumber: selectedOwner.phoneNumber, email: selectedOwner.email, }); - this.isCrownOwner = selectedOwner.type.code === APPLICATION_OWNER.CROWN; + this.isCrownOwner = selectedOwner.type.code === OWNER_TYPE.CROWN; } } this.calculateLetterRequired(); @@ -146,14 +147,14 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni if (this.selectedLocalGovernment) { this.needsAuthorizationLetter = false; } else { - const isSelfApplicant = this.owners.length > 0 && this.owners[0].type.code === APPLICATION_OWNER.INDIVIDUAL; + const isSelfApplicant = this.owners.length > 0 && this.owners[0].type.code === OWNER_TYPE.INDIVIDUAL; this.needsAuthorizationLetter = this.selectedThirdPartyAgent || !( isSelfApplicant && (this.owners.length === 1 || (this.owners.length === 2 && - this.owners[1].type.code === APPLICATION_OWNER.AGENT && + this.owners[1].type.code === OWNER_TYPE.AGENT && !this.selectedThirdPartyAgent)) ); } @@ -181,7 +182,7 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni email: this.email.getRawValue() ?? '', phoneNumber: this.phoneNumber.getRawValue() ?? '', ownerUuid: selectedOwner?.uuid, - type: this.selectedThirdPartyAgent ? APPLICATION_OWNER.AGENT : APPLICATION_OWNER.GOVERNMENT, + type: this.selectedThirdPartyAgent ? OWNER_TYPE.AGENT : OWNER_TYPE.GOVERNMENT, }); } else if (selectedOwner) { await this.applicationOwnerService.setPrimaryContact({ @@ -203,13 +204,13 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni if (owners) { const selectedOwner = owners.find((owner) => owner.uuid === primaryContactOwnerUuid); this.parcelOwners = owners.filter( - (owner) => ![APPLICATION_OWNER.AGENT, APPLICATION_OWNER.GOVERNMENT].includes(owner.type.code) + (owner) => ![OWNER_TYPE.AGENT, OWNER_TYPE.GOVERNMENT].includes(owner.type.code) ); this.owners = owners; if (selectedOwner) { - this.selectedThirdPartyAgent = selectedOwner.type.code === APPLICATION_OWNER.AGENT; - this.selectedLocalGovernment = selectedOwner.type.code === APPLICATION_OWNER.GOVERNMENT; + this.selectedThirdPartyAgent = selectedOwner.type.code === OWNER_TYPE.AGENT; + this.selectedLocalGovernment = selectedOwner.type.code === OWNER_TYPE.GOVERNMENT; } if (this.selectedLocalGovernment) { diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/excl-proposal/excl-proposal.component.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/excl-proposal/excl-proposal.component.ts index 638e8569b5..6f50c7aa0b 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/excl-proposal/excl-proposal.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/excl-proposal/excl-proposal.component.ts @@ -3,13 +3,11 @@ import { FormControl, FormGroup, Validators } from '@angular/forms'; import { MatDialog } from '@angular/material/dialog'; import { Router } from '@angular/router'; import { takeUntil } from 'rxjs'; -import { - ApplicationDocumentDto, - DOCUMENT_TYPE, -} from '../../../../../services/application-document/application-document.dto'; +import { ApplicationDocumentDto } from '../../../../../services/application-document/application-document.dto'; import { ApplicationDocumentService } from '../../../../../services/application-document/application-document.service'; import { ApplicationSubmissionUpdateDto } from '../../../../../services/application-submission/application-submission.dto'; import { ApplicationSubmissionService } from '../../../../../services/application-submission/application-submission.service'; +import { DOCUMENT_TYPE } from '../../../../../shared/dto/document.dto'; import { parseStringToBoolean } from '../../../../../shared/utils/string-helper'; import { EditApplicationSteps } from '../../edit-submission.component'; import { FilesStepComponent } from '../../files-step.partial'; diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/incl-proposal/incl-proposal.component.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/incl-proposal/incl-proposal.component.ts index f56da91fb4..c4b34405ef 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/incl-proposal/incl-proposal.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/incl-proposal/incl-proposal.component.ts @@ -1,6 +1,7 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; import { MatButtonToggleChange } from '@angular/material/button-toggle'; import { AuthenticationService } from '../../../../../services/authentication/authentication.service'; +import { DOCUMENT_TYPE } from '../../../../../shared/dto/document.dto'; import { formatBooleanToString } from '../../../../../shared/utils/boolean-helper'; import { parseStringToBoolean } from '../../../../../shared/utils/string-helper'; import { FilesStepComponent } from '../../files-step.partial'; @@ -8,10 +9,7 @@ import { ApplicationSubmissionService } from '../../../../../services/applicatio import { ApplicationDocumentService } from '../../../../../services/application-document/application-document.service'; import { MatDialog } from '@angular/material/dialog'; import { FormControl, FormGroup, Validators } from '@angular/forms'; -import { - ApplicationDocumentDto, - DOCUMENT_TYPE, -} from '../../../../../services/application-document/application-document.dto'; +import { ApplicationDocumentDto } from '../../../../../services/application-document/application-document.dto'; import { EditApplicationSteps } from '../../edit-submission.component'; import { takeUntil } from 'rxjs'; import { ApplicationSubmissionUpdateDto } from '../../../../../services/application-submission/application-submission.dto'; diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.ts index 7a5a8ff95b..7c9c17c3a4 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.ts @@ -4,10 +4,7 @@ import { MatDialog } from '@angular/material/dialog'; import { MatRadioChange } from '@angular/material/radio'; import { Router } from '@angular/router'; import { takeUntil } from 'rxjs'; -import { - ApplicationDocumentDto, - DOCUMENT_TYPE, -} from '../../../../../services/application-document/application-document.dto'; +import { ApplicationDocumentDto } from '../../../../../services/application-document/application-document.dto'; import { ApplicationDocumentService } from '../../../../../services/application-document/application-document.service'; import { ApplicationSubmissionUpdateDto, @@ -15,6 +12,7 @@ import { } from '../../../../../services/application-submission/application-submission.dto'; import { ApplicationSubmissionService } from '../../../../../services/application-submission/application-submission.service'; import { CodeService } from '../../../../../services/code/code.service'; +import { DOCUMENT_TYPE } from '../../../../../shared/dto/document.dto'; import { formatBooleanToYesNoString } from '../../../../../shared/utils/boolean-helper'; import { EditApplicationSteps } from '../../edit-submission.component'; import { FilesStepComponent } from '../../files-step.partial'; diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.ts index 07a2f4552d..f657a6f1aa 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.ts @@ -3,13 +3,11 @@ import { FormControl, FormGroup, Validators } from '@angular/forms'; import { MatDialog } from '@angular/material/dialog'; import { Router } from '@angular/router'; import { takeUntil } from 'rxjs'; -import { - ApplicationDocumentDto, - DOCUMENT_TYPE, -} from '../../../../../services/application-document/application-document.dto'; +import { ApplicationDocumentDto } from '../../../../../services/application-document/application-document.dto'; import { ApplicationDocumentService } from '../../../../../services/application-document/application-document.service'; import { ApplicationSubmissionUpdateDto } from '../../../../../services/application-submission/application-submission.dto'; import { ApplicationSubmissionService } from '../../../../../services/application-submission/application-submission.service'; +import { DOCUMENT_TYPE } from '../../../../../shared/dto/document.dto'; import { formatBooleanToString } from '../../../../../shared/utils/boolean-helper'; import { MOBILE_BREAKPOINT } from '../../../../../shared/utils/breakpoints'; import { parseStringToBoolean } from '../../../../../shared/utils/string-helper'; diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.ts index b3ccbb4b96..6f06250f2c 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.ts @@ -3,13 +3,11 @@ import { FormControl, FormGroup, Validators } from '@angular/forms'; import { MatDialog } from '@angular/material/dialog'; import { Router } from '@angular/router'; import { takeUntil } from 'rxjs'; -import { - ApplicationDocumentDto, - DOCUMENT_TYPE, -} from '../../../../../services/application-document/application-document.dto'; +import { ApplicationDocumentDto } from '../../../../../services/application-document/application-document.dto'; import { ApplicationDocumentService } from '../../../../../services/application-document/application-document.service'; import { ApplicationSubmissionUpdateDto } from '../../../../../services/application-submission/application-submission.dto'; import { ApplicationSubmissionService } from '../../../../../services/application-submission/application-submission.service'; +import { DOCUMENT_TYPE } from '../../../../../shared/dto/document.dto'; import { formatBooleanToString } from '../../../../../shared/utils/boolean-helper'; import { parseStringToBoolean } from '../../../../../shared/utils/string-helper'; import { EditApplicationSteps } from '../../edit-submission.component'; diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.ts index 83812714ac..3528028be2 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.ts @@ -3,13 +3,11 @@ import { FormControl, FormGroup, Validators } from '@angular/forms'; import { MatDialog } from '@angular/material/dialog'; import { Router } from '@angular/router'; import { takeUntil } from 'rxjs'; -import { - ApplicationDocumentDto, - DOCUMENT_TYPE, -} from '../../../../../services/application-document/application-document.dto'; +import { ApplicationDocumentDto } from '../../../../../services/application-document/application-document.dto'; import { ApplicationDocumentService } from '../../../../../services/application-document/application-document.service'; import { ApplicationSubmissionUpdateDto } from '../../../../../services/application-submission/application-submission.dto'; import { ApplicationSubmissionService } from '../../../../../services/application-submission/application-submission.service'; +import { DOCUMENT_TYPE } from '../../../../../shared/dto/document.dto'; import { formatBooleanToString } from '../../../../../shared/utils/boolean-helper'; import { parseStringToBoolean } from '../../../../../shared/utils/string-helper'; import { EditApplicationSteps } from '../../edit-submission.component'; diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.ts index e1bfec8990..9410136d51 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.ts @@ -4,15 +4,13 @@ import { MatDialog } from '@angular/material/dialog'; import { MatTableDataSource } from '@angular/material/table'; import { Router } from '@angular/router'; import { takeUntil } from 'rxjs'; -import { - ApplicationDocumentDto, - DOCUMENT_TYPE, -} from '../../../../../services/application-document/application-document.dto'; +import { ApplicationDocumentDto } from '../../../../../services/application-document/application-document.dto'; import { ApplicationDocumentService } from '../../../../../services/application-document/application-document.service'; import { PARCEL_TYPE } from '../../../../../services/application-parcel/application-parcel.dto'; import { ApplicationParcelService } from '../../../../../services/application-parcel/application-parcel.service'; import { ApplicationSubmissionUpdateDto } from '../../../../../services/application-submission/application-submission.dto'; import { ApplicationSubmissionService } from '../../../../../services/application-submission/application-submission.service'; +import { DOCUMENT_TYPE } from '../../../../../shared/dto/document.dto'; import { EditApplicationSteps } from '../../edit-submission.component'; import { FilesStepComponent } from '../../files-step.partial'; diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/tur-proposal/tur-proposal.component.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/tur-proposal/tur-proposal.component.ts index 0c85764f3e..4a845b4dc0 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/tur-proposal/tur-proposal.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/tur-proposal/tur-proposal.component.ts @@ -3,13 +3,11 @@ import { FormControl, FormGroup, Validators } from '@angular/forms'; import { MatDialog } from '@angular/material/dialog'; import { Router } from '@angular/router'; import { takeUntil } from 'rxjs'; -import { - ApplicationDocumentDto, - DOCUMENT_TYPE, -} from '../../../../../services/application-document/application-document.dto'; +import { ApplicationDocumentDto } from '../../../../../services/application-document/application-document.dto'; import { ApplicationDocumentService } from '../../../../../services/application-document/application-document.service'; import { ApplicationSubmissionUpdateDto } from '../../../../../services/application-submission/application-submission.dto'; import { ApplicationSubmissionService } from '../../../../../services/application-submission/application-submission.service'; +import { DOCUMENT_TYPE } from '../../../../../shared/dto/document.dto'; import { EditApplicationSteps } from '../../edit-submission.component'; import { FilesStepComponent } from '../../files-step.partial'; diff --git a/portal-frontend/src/app/features/applications/review-submission/review-attachments/review-attachments.component.ts b/portal-frontend/src/app/features/applications/review-submission/review-attachments/review-attachments.component.ts index 8e8b0f4f06..2ab11d4d1d 100644 --- a/portal-frontend/src/app/features/applications/review-submission/review-attachments/review-attachments.component.ts +++ b/portal-frontend/src/app/features/applications/review-submission/review-attachments/review-attachments.component.ts @@ -1,13 +1,10 @@ import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core'; import { Router } from '@angular/router'; import { BehaviorSubject, Subject, takeUntil } from 'rxjs'; -import { - ApplicationDocumentDto, - DOCUMENT_SOURCE, - DOCUMENT_TYPE, -} from '../../../../services/application-document/application-document.dto'; +import { ApplicationDocumentDto } from '../../../../services/application-document/application-document.dto'; import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; import { ApplicationSubmissionReviewService } from '../../../../services/application-submission-review/application-submission-review.service'; +import { DOCUMENT_SOURCE, DOCUMENT_TYPE } from '../../../../shared/dto/document.dto'; import { FileHandle } from '../../../../shared/file-drag-drop/drag-drop.directive'; import { ReviewApplicationFngSteps, ReviewApplicationSteps } from '../review-submission.component'; diff --git a/portal-frontend/src/app/features/applications/review-submission/review-submit-fng/review-submit-fng.component.ts b/portal-frontend/src/app/features/applications/review-submission/review-submit-fng/review-submit-fng.component.ts index b729afc8d9..fc165fe3c2 100644 --- a/portal-frontend/src/app/features/applications/review-submission/review-submit-fng/review-submit-fng.component.ts +++ b/portal-frontend/src/app/features/applications/review-submission/review-submit-fng/review-submit-fng.component.ts @@ -2,13 +2,14 @@ import { Component, EventEmitter, HostListener, Input, OnDestroy, OnInit, Output import { MatExpansionPanel } from '@angular/material/expansion'; import { Router } from '@angular/router'; import { BehaviorSubject, Subject, takeUntil } from 'rxjs'; -import { ApplicationDocumentDto, DOCUMENT_TYPE } from '../../../../services/application-document/application-document.dto'; +import { ApplicationDocumentDto } from '../../../../services/application-document/application-document.dto'; import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; import { ApplicationSubmissionReviewDto } from '../../../../services/application-submission-review/application-submission-review.dto'; import { ApplicationSubmissionReviewService } from '../../../../services/application-submission-review/application-submission-review.service'; import { ApplicationSubmissionDto } from '../../../../services/application-submission/application-submission.dto'; import { PdfGenerationService } from '../../../../services/pdf-generation/pdf-generation.service'; import { CustomStepperComponent } from '../../../../shared/custom-stepper/custom-stepper.component'; +import { DOCUMENT_TYPE } from '../../../../shared/dto/document.dto'; import { MOBILE_BREAKPOINT } from '../../../../shared/utils/breakpoints'; import { ReviewApplicationFngSteps } from '../review-submission.component'; diff --git a/portal-frontend/src/app/features/applications/review-submission/review-submit/review-submit.component.ts b/portal-frontend/src/app/features/applications/review-submission/review-submit/review-submit.component.ts index b14ca7b5f0..0ee3796c66 100644 --- a/portal-frontend/src/app/features/applications/review-submission/review-submit/review-submit.component.ts +++ b/portal-frontend/src/app/features/applications/review-submission/review-submit/review-submit.component.ts @@ -2,13 +2,14 @@ import { Component, EventEmitter, HostListener, Input, OnDestroy, OnInit, Output import { MatExpansionPanel } from '@angular/material/expansion'; import { Router } from '@angular/router'; import { BehaviorSubject, Subject, takeUntil } from 'rxjs'; -import { ApplicationDocumentDto, DOCUMENT_TYPE } from '../../../../services/application-document/application-document.dto'; +import { ApplicationDocumentDto } from '../../../../services/application-document/application-document.dto'; import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; import { ApplicationSubmissionReviewDto } from '../../../../services/application-submission-review/application-submission-review.dto'; import { ApplicationSubmissionReviewService } from '../../../../services/application-submission-review/application-submission-review.service'; import { ApplicationSubmissionDto } from '../../../../services/application-submission/application-submission.dto'; import { PdfGenerationService } from '../../../../services/pdf-generation/pdf-generation.service'; import { CustomStepperComponent } from '../../../../shared/custom-stepper/custom-stepper.component'; +import { DOCUMENT_TYPE } from '../../../../shared/dto/document.dto'; import { MOBILE_BREAKPOINT } from '../../../../shared/utils/breakpoints'; import { ReviewApplicationSteps } from '../review-submission.component'; diff --git a/portal-frontend/src/app/features/applications/view-submission/lfng-review/lfng-review.component.ts b/portal-frontend/src/app/features/applications/view-submission/lfng-review/lfng-review.component.ts index 91d1d69272..e80935380e 100644 --- a/portal-frontend/src/app/features/applications/view-submission/lfng-review/lfng-review.component.ts +++ b/portal-frontend/src/app/features/applications/view-submission/lfng-review/lfng-review.component.ts @@ -1,11 +1,7 @@ import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core'; import { Router } from '@angular/router'; import { BehaviorSubject, Subject, takeUntil } from 'rxjs'; -import { - ApplicationDocumentDto, - DOCUMENT_SOURCE, - DOCUMENT_TYPE, -} from '../../../../services/application-document/application-document.dto'; +import { ApplicationDocumentDto } from '../../../../services/application-document/application-document.dto'; import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; import { ApplicationSubmissionReviewDto } from '../../../../services/application-submission-review/application-submission-review.dto'; import { ApplicationSubmissionReviewService } from '../../../../services/application-submission-review/application-submission-review.service'; @@ -14,6 +10,7 @@ import { SUBMISSION_STATUS, } from '../../../../services/application-submission/application-submission.dto'; import { PdfGenerationService } from '../../../../services/pdf-generation/pdf-generation.service'; +import { DOCUMENT_SOURCE, DOCUMENT_TYPE } from '../../../../shared/dto/document.dto'; @Component({ selector: 'app-lfng-review', diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission-base.module.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission-base.module.ts new file mode 100644 index 0000000000..744f8fb3ee --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission-base.module.ts @@ -0,0 +1,48 @@ +import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; +import { MatButtonToggleModule } from '@angular/material/button-toggle'; +import { MatOptionModule } from '@angular/material/core'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatInputModule } from '@angular/material/input'; +import { MatSelectModule } from '@angular/material/select'; +import { MatTableModule } from '@angular/material/table'; +import { NgxMaskDirective, NgxMaskPipe } from 'ngx-mask'; +import { SharedModule } from '../../../shared/shared.module'; +import { EditSubmissionComponent } from './edit-submission.component'; +import { DeleteParcelDialogComponent } from './parcels/delete-parcel/delete-parcel-dialog.component'; +import { ParcelDetailsComponent } from './parcels/parcel-details.component'; +import { ParcelEntryConfirmationDialogComponent } from './parcels/parcel-entry/parcel-entry-confirmation-dialog/parcel-entry-confirmation-dialog.component'; +import { ParcelEntryComponent } from './parcels/parcel-entry/parcel-entry.component'; +import { ParcelOwnersComponent } from './parcels/parcel-owners/parcel-owners.component'; + +@NgModule({ + declarations: [ + EditSubmissionComponent, + ParcelDetailsComponent, + ParcelEntryComponent, + ParcelEntryConfirmationDialogComponent, + DeleteParcelDialogComponent, + ParcelOwnersComponent, + ], + imports: [ + CommonModule, + SharedModule, + NgxMaskDirective, + NgxMaskPipe, + MatInputModule, + MatButtonToggleModule, + MatFormFieldModule, + MatOptionModule, + MatSelectModule, + MatTableModule, + ], + exports: [ + EditSubmissionComponent, + ParcelDetailsComponent, + ParcelEntryComponent, + ParcelEntryConfirmationDialogComponent, + DeleteParcelDialogComponent, + ParcelOwnersComponent, + ], +}) +export class EditSubmissionBaseModule {} diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.html index 2d6797f88a..ab2679138c 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.html @@ -1 +1,70 @@ -

edit-submission works!

+ +
+
Notice of Intent ID: {{ noiSubmission.fileNumber }} | {{ noiSubmission.type }}
+
+ +
+ + + help_outline + +
+
+
+ + + + + +
+ +
+ + + +
Primary Contact
+ + + +
Select Government
+ + + +
Land Use
+ + + +
Proposal
+ + + +
Other attachments
+ + + +
Review and Submit
+ + diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.scss b/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.scss index e69de29bb2..e745545965 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.scss +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.scss @@ -0,0 +1,378 @@ +@use '../../../../styles/functions' as *; +@use '../../../../styles/colors'; + +.header { + margin: rem(24) 0; + display: flex; + justify-content: space-between; + flex-flow: row wrap; + + h6 { + display: flex; + align-items: center; + justify-content: center; + } + .header-btn-wrapper { + display: flex; + align-items: center; + flex-wrap: wrap; + margin-top: rem(16); + width: 100%; + + button { + width: 100%; + } + } + + .change-app-type-btn-wrapper { + display: flex; + align-items: center; + margin-top: rem(16); + margin-left: 0; + width: 100%; + + button { + width: 100%; + } + + .mat-icon { + margin-left: rem(8); + width: rem(22); + height: rem(22); + font-size: rem(22); + } + } + + @media screen and (min-width: $tabletBreakpoint) { + .header-btn-wrapper { + margin-top: 0; + width: unset; + + button { + width: auto; + } + + .change-app-type-btn-wrapper { + width: auto; + display: flex; + align-items: center; + margin-top: 0; + margin-left: rem(16); + + button { + width: auto; + } + + .mat-icon { + margin-left: rem(16); + font-size: rem(24); + } + } + } + } +} + +:host::ng-deep { + .step-description { + display: grid; + grid-template-columns: 1fr; + grid-row-gap: rem(24); + margin-bottom: rem(32); + } + + .step-documents { + border: rem(1) solid colors.$secondary-color; + border-radius: rem(4); + padding: rem(8); + + h6 { + color: colors.$secondary-color; + margin-top: unset !important; + } + } + + .mat-icon.mat-icon-inline { + line-height: initial; + } + + .mat-horizontal-content-container { + padding: 0; + min-height: 100%; + } + + .mat-horizontal-stepper-wrapper { + min-height: 100%; + } + + .subtext { + margin-bottom: rem(8) !important; + } + + .mat-step-header .mat-step-icon-selected { + color: #fff; + } + + .mat-step-header .mat-step-label.mat-step-label-active { + display: none; + } + + .mat-step-label { + display: none; + } + + .section { + margin: rem(24) 0; + } + + .date-picker { + ::ng-deep.mat-form-field-infix { + display: flex; + padding: rem(3) 0; + } + } + + .mat-button-wrapper { + white-space: break-spaces; + } + + .parcel-buttons-wrappers button { + margin-top: 1.2rem !important; + } + + @media screen and (min-width: $tabletBreakpoint) { + .mat-step-header .mat-step-label.mat-step-label-active { + display: inherit; + } + + .mat-step-label { + display: inherit; + } + } + + .review-step { + min-height: 100%; + } + + .mobile-hidden { + display: none !important; + + @media screen and (min-width: $tabletBreakpoint) { + display: initial !important; + } + } + + .tablet-hidden { + display: initial !important; + + @media screen and (min-width: $tabletBreakpoint) { + display: none !important; + } + } + + .mat-button-toggle-appearance-standard .mat-button-toggle-label-content { + line-height: rem(33); + } + + .mat-button-toggle-checked.mat-button-toggle-appearance-standard { + background-color: colors.$primary-color-light; + } + + .edit-application { + .description { + margin-top: rem(12); + margin-bottom: rem(20); + display: flex; + flex-direction: column; + + div { + display: flex; + align-items: center; + } + + .save-button { + margin-top: rem(16) !important; + width: 100%; + } + + @media screen and (min-width: $tabletBreakpoint) { + flex-direction: row; + justify-content: space-between; + + .save-button { + margin-left: rem(12) !important; + margin-top: unset !important; + width: unset; + } + } + } + + .button-container { + margin-top: rem(40); + margin-bottom: rem(24); + display: flex; + flex-direction: column-reverse; + justify-content: space-between; + + @media screen and (min-width: $tabletBreakpoint) { + flex-direction: row; + justify-content: space-between; + } + + div { + display: grid; + grid-template-columns: 1fr 1fr; + grid-column-gap: rem(8); + + @media screen and (min-width: $tabletBreakpoint) { + display: flex; + justify-content: space-between; + } + + button { + margin-bottom: rem(24) !important; + + @media screen and (min-width: $tabletBreakpoint) { + margin-left: rem(24) !important; + margin-bottom: 0 !important; + } + } + } + } + } + + // parcel entry details + .float-right { + float: right; + } + + .container { + margin: rem(20) 0 rem(20) 0; + } + + .parcel-checkbox { + margin: rem(20) 0 0 0; + } + + .type { + margin-bottom: rem(30); + } + + .pmbc-search { + border: 1px solid colors.$primary-color-dark; + border-radius: rem(4); + background-color: rgba(colors.$accent-color-light, 0.2); + padding: rem(16); + } + + .field-error { + color: colors.$error-color; + font-size: rem(15); + font-weight: 700; + display: flex; + align-items: center; + margin-top: rem(4); + } + + .form-row { + margin-top: rem(16); + display: grid; + grid-template-columns: 1fr; + grid-column-gap: rem(30); + + @media screen and (min-width: $desktopBreakpoint) { + & { + grid-template-columns: 1fr 1fr; + } + + .full-row { + grid-column: 1/3; + } + } + } + + .radio-row { + margin: rem(10) 0; + display: block; + + .mat-radio-button { + margin-right: rem(12); + } + } + + .full-width-input { + width: 100%; + } + + .mat-expansion-panel { + margin-bottom: rem(16); + } + + .mat-checkbox { + display: flex; + justify-content: center; + .mat-checkbox-layout { + white-space: break-spaces; + } + } + + .flex-center-wrap { + display: flex; + justify-content: center; + flex-wrap: wrap; + } + + .flex-evenly-wrap { + display: flex; + justify-content: space-evenly; + flex-wrap: wrap; + } + + .flex-space-between-wrap { + display: flex; + justify-content: space-between; + flex-wrap: wrap; + } + + .other-parcels-form { + width: 100%; + display: flex; + flex-direction: column; + row-gap: rem(24); + } + + .owner-table-wrapper { + display: block; + overflow: auto; + width: 100%; + } + + .land-use-form { + display: grid; + grid-template-columns: 1fr; + + .land-use-type-wrapper { + display: flex; + gap: rem(24); + flex-wrap: wrap; + width: 100%; + + .land-use-type { + width: 100%; + } + } + + @media screen and (min-width: $tabletBreakpoint) { + .land-use-type-wrapper { + flex-wrap: nowrap; + + .land-use-type { + width: 64%; + } + } + } + } + + .display-block { + display: block; + } +} diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.spec.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.spec.ts index 74776e7f67..b77ae01080 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.spec.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.spec.ts @@ -1,4 +1,8 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { MatDialog } from '@angular/material/dialog'; +import { ActivatedRoute } from '@angular/router'; +import { NoticeOfIntentSubmissionService } from '../../../services/notice-of-intent-submission/notice-of-intent-submission.service'; +import { ToastService } from '../../../services/toast/toast.service'; import { EditSubmissionComponent } from './edit-submission.component'; @@ -8,9 +12,26 @@ describe('EditSubmissionComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [ EditSubmissionComponent ] - }) - .compileComponents(); + declarations: [EditSubmissionComponent], + providers: [ + { + provide: NoticeOfIntentSubmissionService, + useValue: {}, + }, + { + provide: ToastService, + useValue: {}, + }, + { + provide: ActivatedRoute, + useValue: {}, + }, + { + provide: MatDialog, + useValue: {}, + }, + ], + }).compileComponents(); fixture = TestBed.createComponent(EditSubmissionComponent); component = fixture.componentInstance; diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.ts index 2dcc57f5ab..0f183800a7 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.ts @@ -1,10 +1,154 @@ -import { Component } from '@angular/core'; +import { StepperSelectionEvent } from '@angular/cdk/stepper'; +import { AfterViewInit, Component, OnDestroy, ViewChild } from '@angular/core'; +import { MatDialog } from '@angular/material/dialog'; +import { ActivatedRoute, Router } from '@angular/router'; +import { BehaviorSubject, combineLatest, Observable, of, Subject, takeUntil } from 'rxjs'; +import { NoticeOfIntentSubmissionDetailedDto } from '../../../services/notice-of-intent-submission/notice-of-intent-submission.dto'; +import { NoticeOfIntentSubmissionService } from '../../../services/notice-of-intent-submission/notice-of-intent-submission.service'; +import { ToastService } from '../../../services/toast/toast.service'; +import { CustomStepperComponent } from '../../../shared/custom-stepper/custom-stepper.component'; +import { OverlaySpinnerService } from '../../../shared/overlay-spinner/overlay-spinner.service'; +import { scrollToElement } from '../../../shared/utils/scroll-helper'; +import { EditApplicationSteps } from '../../applications/edit-submission/edit-submission.component'; +import { ParcelDetailsComponent } from './parcels/parcel-details.component'; + +export enum EditNoiSteps { + Parcel = 0, + PrimaryContact = 1, + Government = 2, + LandUse = 3, + Proposal = 4, + ExtraInfo = 5, + Attachments = 6, + ReviewAndSubmit = 7, +} @Component({ selector: 'app-edit-submission', templateUrl: './edit-submission.component.html', - styleUrls: ['./edit-submission.component.scss'] + styleUrls: ['./edit-submission.component.scss'], }) -export class EditSubmissionComponent { +export class EditSubmissionComponent implements OnDestroy, AfterViewInit { + fileId = ''; + + $destroy = new Subject(); + $noiSubmission = new BehaviorSubject(undefined); + noiSubmission: NoticeOfIntentSubmissionDetailedDto | undefined; + + steps = EditNoiSteps; + expandedParcelUuid?: string; + showValidationErrors = false; + + @ViewChild('cdkStepper') public customStepper!: CustomStepperComponent; + + @ViewChild(ParcelDetailsComponent) parcelDetailsComponent!: ParcelDetailsComponent; + + constructor( + private noticeOfIntentSubmissionService: NoticeOfIntentSubmissionService, + private activatedRoute: ActivatedRoute, + private dialog: MatDialog, + private toastService: ToastService, + private overlayService: OverlaySpinnerService, + private router: Router + ) { + this.expandedParcelUuid = undefined; + + this.$noiSubmission.pipe(takeUntil(this.$destroy)).subscribe((submission) => { + this.noiSubmission = submission; + }); + } + + ngAfterViewInit(): void { + combineLatest([this.activatedRoute.queryParamMap, this.activatedRoute.paramMap]) + .pipe(takeUntil(this.$destroy)) + .subscribe(([queryParamMap, paramMap]) => { + const fileId = paramMap.get('fileId'); + if (fileId) { + this.loadSubmission(fileId).then(() => { + const stepInd = paramMap.get('stepInd'); + const parcelUuid = queryParamMap.get('parcelUuid'); + const showErrors = queryParamMap.get('errors'); + if (showErrors) { + this.showValidationErrors = showErrors === 't'; + } + + if (stepInd) { + // setTimeout is required for stepper to be initialized + setTimeout(() => { + this.customStepper.navigateToStep(parseInt(stepInd), true); + + if (parcelUuid) { + this.expandedParcelUuid = parcelUuid; + } + }); + } + }); + } + }); + } + + async onExit() { + await this.router.navigateByUrl(`/notice-of-intent/${this.fileId}`); + } + + ngOnDestroy(): void { + this.$destroy.next(); + this.$destroy.complete(); + } + + // this gets fired whenever applicant navigates away from edit page + async canDeactivate(): Promise> { + await this.saveSubmission(this.customStepper.selectedIndex); + + return of(true); + } + + async onStepChange($event: StepperSelectionEvent) { + // scrolls to step if step selected programmatically + scrollToElement({ id: `stepWrapper_${$event.selectedIndex}`, center: false }); + } + + async onBeforeSwitchStep(index: number) { + // navigation to url will cause step change based on the index (index starts from 0) + // The save will be triggered using canDeactivate guard + this.showValidationErrors = this.customStepper.selectedIndex === EditNoiSteps.ReviewAndSubmit; + await this.router.navigateByUrl(`notice-of-intent/${this.fileId}/edit/${index}`); + } + + async saveSubmission(step: number) { + switch (step) { + case EditApplicationSteps.AppParcel: + await this.parcelDetailsComponent.onSave(); + break; + default: + this.toastService.showErrorToast('Error updating notice of intent.'); + } + } + + async onDownloadPdf(fileNumber: string | undefined) { + if (fileNumber) { + //TODO: Hook this up later + } + } + + onChangeSubmissionType() { + //TODO: Hook this up later + } + + private async loadSubmission(fileId: string, reload = false) { + if (!this.noiSubmission || reload) { + this.overlayService.showSpinner(); + this.noiSubmission = await this.noticeOfIntentSubmissionService.getByFileId(fileId); + this.fileId = fileId; + this.$noiSubmission.next(this.noiSubmission); + this.overlayService.hideSpinner(); + } + } + onParcelDetailsInitialized() { + if (this.expandedParcelUuid && this.parcelDetailsComponent) { + this.parcelDetailsComponent.openParcel(this.expandedParcelUuid); + this.expandedParcelUuid = undefined; + } + } } diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.module.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.module.ts index 547fc2c060..ba969b4f33 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.module.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.module.ts @@ -1,18 +1,26 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { RouterModule, Routes } from '@angular/router'; +import { CanDeactivateGuard } from '../../../shared/guard/can-deactivate.guard'; import { SharedModule } from '../../../shared/shared.module'; +import { EditSubmissionBaseModule } from './edit-submission-base.module'; import { EditSubmissionComponent } from './edit-submission.component'; +import { StepComponent } from './step.partial'; const routes: Routes = [ { path: '', component: EditSubmissionComponent, }, + { + path: ':stepInd', + component: EditSubmissionComponent, + canDeactivate: [CanDeactivateGuard], + }, ]; @NgModule({ - declarations: [EditSubmissionComponent], - imports: [CommonModule, SharedModule, RouterModule.forChild(routes)], + declarations: [StepComponent], + imports: [CommonModule, SharedModule, RouterModule.forChild(routes), EditSubmissionBaseModule], }) export class EditSubmissionModule {} diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/delete-parcel/delete-parcel-dialog.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/delete-parcel/delete-parcel-dialog.component.html new file mode 100644 index 0000000000..77c2809519 --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/delete-parcel/delete-parcel-dialog.component.html @@ -0,0 +1,36 @@ + + + + + + + + + + +
+

Delete Parcel #{{ parcelNumber }}

+
+ +
+
+ + Warning: All information relevant to this parcel, including information added in subsequent steps, will be + deleted. + + +
+ +
+
+ +
+
+
Are you sure you want to delete this? This action cannot be undone.
+
+ +
+ +
+
+
diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/delete-parcel/delete-parcel-dialog.component.scss b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/delete-parcel/delete-parcel-dialog.component.scss new file mode 100644 index 0000000000..1f78db7f1e --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/delete-parcel/delete-parcel-dialog.component.scss @@ -0,0 +1,24 @@ +@use '../../../../../../styles/functions' as *; + +.margin-bottom-1 { + margin-bottom: rem(16); +} + +.step-controls { + display: flex; + justify-content: space-between; +} + +.confirm-content { + margin: rem(24) 0; +} + +@media screen and (min-width: $desktopBreakpoint) { + .step-controls { + justify-content: flex-end; + + button { + margin-left: rem(25) !important; + } + } +} diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/delete-parcel/delete-parcel-dialog.component.spec.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/delete-parcel/delete-parcel-dialog.component.spec.ts new file mode 100644 index 0000000000..9beff5eaf0 --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/delete-parcel/delete-parcel-dialog.component.spec.ts @@ -0,0 +1,48 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { HttpClient } from '@angular/common/http'; +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; +import { DeepMocked, createMock } from '@golevelup/ts-jest'; +import { ApplicationParcelService } from '../../../../../services/application-parcel/application-parcel.service'; +import { DeleteParcelDialogComponent } from './delete-parcel-dialog.component'; + +describe('DeleteParcelDialogComponent', () => { + let component: DeleteParcelDialogComponent; + let fixture: ComponentFixture; + let mockHttpClient: DeepMocked; + let mockApplicationParcelService: DeepMocked; + + beforeEach(async () => { + mockHttpClient = createMock(); + mockApplicationParcelService = createMock(); + + await TestBed.configureTestingModule({ + declarations: [DeleteParcelDialogComponent], + providers: [ + { + provide: HttpClient, + useValue: mockHttpClient, + }, + { + provide: ApplicationParcelService, + useValue: mockApplicationParcelService, + }, + { + provide: MatDialogRef, + useValue: {}, + }, + { provide: MAT_DIALOG_DATA, useValue: {} }, + ], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(DeleteParcelDialogComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/delete-parcel/delete-parcel-dialog.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/delete-parcel/delete-parcel-dialog.component.ts new file mode 100644 index 0000000000..f86e0979ab --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/delete-parcel/delete-parcel-dialog.component.ts @@ -0,0 +1,52 @@ +import { Component, Inject } from '@angular/core'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; +import { ApplicationParcelService } from '../../../../../services/application-parcel/application-parcel.service'; + +export enum ApplicationParcelDeleteStepsEnum { + warning = 0, + confirmation = 1, +} + +@Component({ + selector: 'app-delete-parcel-dialog', + templateUrl: './delete-parcel-dialog.component.html', + styleUrls: ['./delete-parcel-dialog.component.scss'], +}) +export class DeleteParcelDialogComponent { + parcelUuid!: string; + parcelNumber!: string; + + stepIdx = 0; + + warningStep = ApplicationParcelDeleteStepsEnum.warning; + confirmationStep = ApplicationParcelDeleteStepsEnum.confirmation; + + constructor( + private applicationParcelService: ApplicationParcelService, + private dialogRef: MatDialogRef, + @Inject(MAT_DIALOG_DATA) public data: DeleteParcelDialogComponent + ) { + this.parcelUuid = data.parcelUuid; + this.parcelNumber = data.parcelNumber; + } + + async next() { + this.stepIdx += 1; + } + + async back() { + this.stepIdx -= 1; + } + + async onCancel(dialogResult: boolean = false) { + this.dialogRef.close(dialogResult); + } + + async onDelete() { + const result = await this.applicationParcelService.deleteMany([this.parcelUuid]); + + if (result) { + this.onCancel(true); + } + } +} diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-details.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-details.component.html new file mode 100644 index 0000000000..0a42627959 --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-details.component.html @@ -0,0 +1,68 @@ +
+
+

Identify Parcels Under Application

+

Provide parcel identification and registered ownership information for each parcel under application.

+

*All fields are required unless stated optional.

+
+
Documents needed for this step:
+
    +
  • Certificate of Title
    • +
  • Corporate Summary (if applicable)
    • +
+
+
+ + + Parcel #{{ parcelInd + 1 }} Details & Owner Information + + + + +
+
+ + +
+
+ + +
+ +
+ +
+ + +
+
+ +
+
+
diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-details.component.scss b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-details.component.scss new file mode 100644 index 0000000000..e69de29bb2 diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-details.component.spec.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-details.component.spec.ts new file mode 100644 index 0000000000..ef3dea17b9 --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-details.component.spec.ts @@ -0,0 +1,70 @@ +import { HttpClient } from '@angular/common/http'; +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { MatDialog } from '@angular/material/dialog'; +import { DeepMocked, createMock } from '@golevelup/ts-jest'; +import { BehaviorSubject } from 'rxjs'; +import { ApplicationOwnerService } from '../../../../services/application-owner/application-owner.service'; +import { ApplicationParcelService } from '../../../../services/application-parcel/application-parcel.service'; +import { ApplicationSubmissionDetailedDto } from '../../../../services/application-submission/application-submission.dto'; +import { NoticeOfIntentOwnerService } from '../../../../services/notice-of-intent-owner/notice-of-intent-owner.service'; +import { NoticeOfIntentParcelService } from '../../../../services/notice-of-intent-parcel/notice-of-intent-parcel.service'; +import { NoticeOfIntentSubmissionDetailedDto } from '../../../../services/notice-of-intent-submission/notice-of-intent-submission.dto'; +import { ToastService } from '../../../../services/toast/toast.service'; +import { ParcelDetailsComponent } from './parcel-details.component'; + +describe('ParcelDetailsComponent', () => { + let component: ParcelDetailsComponent; + let fixture: ComponentFixture; + let mockHttpClient: DeepMocked; + let mockNOIParcelService: DeepMocked; + let mockNOIOwnerService: DeepMocked; + let mockToastService: DeepMocked; + let mockMatDialog: DeepMocked; + let noiPipe = new BehaviorSubject(undefined); + + beforeEach(async () => { + mockHttpClient = createMock(); + mockNOIParcelService = createMock(); + mockToastService = createMock(); + mockMatDialog = createMock(); + mockNOIOwnerService = createMock(); + + await TestBed.configureTestingModule({ + declarations: [ParcelDetailsComponent], + providers: [ + { + provide: HttpClient, + useValue: mockHttpClient, + }, + { + provide: NoticeOfIntentParcelService, + useValue: mockNOIParcelService, + }, + { + provide: NoticeOfIntentOwnerService, + useValue: mockNOIOwnerService, + }, + { + provide: ToastService, + useValue: mockToastService, + }, + { + provide: MatDialog, + useValue: mockMatDialog, + }, + ], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(ParcelDetailsComponent); + component = fixture.componentInstance; + component.$noiSubmission = noiPipe; + + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-details.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-details.component.ts new file mode 100644 index 0000000000..d0352c217a --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-details.component.ts @@ -0,0 +1,173 @@ +import { AfterViewInit, Component, EventEmitter, OnInit, Output } from '@angular/core'; +import { MatDialog } from '@angular/material/dialog'; +import { Router } from '@angular/router'; +import { BehaviorSubject, takeUntil } from 'rxjs'; +import { ApplicationParcelUpdateDto } from '../../../../services/application-parcel/application-parcel.dto'; +import { NoticeOfIntentOwnerDto } from '../../../../services/notice-of-intent-owner/notice-of-intent-owner.dto'; +import { NoticeOfIntentOwnerService } from '../../../../services/notice-of-intent-owner/notice-of-intent-owner.service'; +import { NoticeOfIntentParcelDto } from '../../../../services/notice-of-intent-parcel/notice-of-intent-parcel.dto'; +import { NoticeOfIntentParcelService } from '../../../../services/notice-of-intent-parcel/notice-of-intent-parcel.service'; +import { ToastService } from '../../../../services/toast/toast.service'; +import { OWNER_TYPE } from '../../../../shared/dto/owner.dto'; +import { parseStringToBoolean } from '../../../../shared/utils/string-helper'; +import { EditNoiSteps } from '../edit-submission.component'; +import { StepComponent } from '../step.partial'; +import { DeleteParcelDialogComponent } from './delete-parcel/delete-parcel-dialog.component'; +import { ParcelEntryFormData } from './parcel-entry/parcel-entry.component'; + +@Component({ + selector: 'app-noi-parcel-details', + templateUrl: './parcel-details.component.html', + styleUrls: ['./parcel-details.component.scss'], +}) +export class ParcelDetailsComponent extends StepComponent implements OnInit, AfterViewInit { + @Output() componentInitialized = new EventEmitter(); + + currentStep = EditNoiSteps.Parcel; + fileId = ''; + submissionUuid = ''; + parcels: NoticeOfIntentParcelDto[] = []; + $owners = new BehaviorSubject([]); + newParcelAdded = false; + isDirty = false; + + constructor( + private router: Router, + private noiParcelService: NoticeOfIntentParcelService, + private noticeOfIntentOwnerService: NoticeOfIntentOwnerService, + private toastService: ToastService, + private dialog: MatDialog + ) { + super(); + } + + ngOnInit(): void { + this.$noiSubmission.pipe(takeUntil(this.$destroy)).subscribe((noiSubmission) => { + if (noiSubmission) { + this.fileId = noiSubmission.fileNumber; + this.submissionUuid = noiSubmission.uuid; + this.loadParcels(); + const parcelOwners = noiSubmission.owners.filter( + (owner) => ![OWNER_TYPE.AGENT, OWNER_TYPE.GOVERNMENT].includes(owner.type.code) + ); + this.$owners.next(parcelOwners); + } + }); + + this.newParcelAdded = false; + } + + ngAfterViewInit(): void { + setTimeout((_) => this.componentInitialized.emit(true)); + } + + async loadParcels() { + this.parcels = (await this.noiParcelService.fetchBySubmissionUuid(this.submissionUuid)) || []; + if (!this.parcels || this.parcels.length === 0) { + await this.onAddParcel(); + } + } + + async onAddParcel() { + const parcel = await this.noiParcelService.create(this.submissionUuid); + + if (parcel) { + this.parcels.push({ + uuid: parcel!.uuid, + owners: [], + isConfirmedByApplicant: false, + }); + this.newParcelAdded = true; + } else { + this.toastService.showErrorToast('Error adding new parcel. Please refresh page and try again.'); + } + } + + async onParcelFormChange(formData: Partial) { + const parcel = this.parcels.find((e) => e.uuid === formData.uuid); + if (!parcel) { + this.toastService.showErrorToast('Error updating the parcel. Please refresh page and try again.'); + return; + } + + this.isDirty = true; + parcel.pid = formData.pid !== undefined ? formData.pid : parcel.pid; + parcel.pin = formData.pid !== undefined ? formData.pin : parcel.pin; + parcel.civicAddress = formData.civicAddress !== undefined ? formData.civicAddress : parcel.civicAddress; + parcel.legalDescription = + formData.legalDescription !== undefined ? formData.legalDescription : parcel.legalDescription; + + parcel.mapAreaHectares = formData.mapArea !== undefined ? formData.mapArea : parcel.mapAreaHectares; + parcel.ownershipTypeCode = formData.parcelType !== undefined ? formData.parcelType : parcel.ownershipTypeCode; + parcel.isFarm = formData.isFarm !== undefined ? parseStringToBoolean(formData.isFarm) : parcel.isFarm; + parcel.purchasedDate = + formData.purchaseDate !== undefined ? formData.purchaseDate?.getTime() : parcel.purchasedDate; + parcel.isConfirmedByApplicant = formData.isConfirmedByApplicant || false; + parcel.crownLandOwnerType = + formData.crownLandOwnerType !== undefined ? formData.crownLandOwnerType : parcel.crownLandOwnerType; + if (formData.owners) { + //parcel.owners = formData.owners; + } + } + + private async saveProgress() { + if (this.isDirty || this.newParcelAdded) { + const parcelsToUpdate: ApplicationParcelUpdateDto[] = []; + for (const parcel of this.parcels) { + parcelsToUpdate.push({ + uuid: parcel.uuid, + pid: parcel.pid?.toString() || null, + pin: parcel.pin?.toString() || null, + civicAddress: parcel.civicAddress ?? null, + legalDescription: parcel.legalDescription, + isFarm: parcel.isFarm, + purchasedDate: parcel.purchasedDate, + mapAreaHectares: parcel.mapAreaHectares, + ownershipTypeCode: parcel.ownershipTypeCode, + isConfirmedByApplicant: parcel.isConfirmedByApplicant, + crownLandOwnerType: parcel.crownLandOwnerType, + ownerUuids: [], + }); + } + await this.noiParcelService.update(parcelsToUpdate); + } + } + + async onSave() { + await this.saveProgress(); + } + + async onDelete(parcelUuid: string, parcelNumber: number) { + this.dialog + .open(DeleteParcelDialogComponent, { + panelClass: 'no-padding', + disableClose: true, + data: { + parcelUuid, + parcelNumber, + }, + }) + .beforeClosed() + .subscribe((result) => { + if (result) { + this.loadParcels(); + } + }); + } + + async onOwnersUpdated() { + const owners = await this.noticeOfIntentOwnerService.fetchBySubmissionId(this.submissionUuid); + if (owners) { + const parcelOwners = owners.filter( + (owner) => ![OWNER_TYPE.AGENT, OWNER_TYPE.GOVERNMENT].includes(owner.type.code) + ); + this.$owners.next(parcelOwners); + } + } + + expandedParcel: string = ''; + + openParcel(index: string) { + this.expandedParcel = index; + } +} diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry-confirmation-dialog/parcel-entry-confirmation-dialog.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry-confirmation-dialog/parcel-entry-confirmation-dialog.component.html new file mode 100644 index 0000000000..e7e96cb4c5 --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry-confirmation-dialog/parcel-entry-confirmation-dialog.component.html @@ -0,0 +1,35 @@ + + + + + + + + + + +
+

Change Parcel Ownership Type

+
+ +
+
+ + Warning: Changing parcel ownership type will remove some inputs relevant to the current parcel. + + +
+ +
+
+ +
+
+
Are you sure you want to change parcel ownership type? This action cannot be undone.
+
+ +
+ +
+
+
diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry-confirmation-dialog/parcel-entry-confirmation-dialog.component.scss b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry-confirmation-dialog/parcel-entry-confirmation-dialog.component.scss new file mode 100644 index 0000000000..c4e03e5c59 --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry-confirmation-dialog/parcel-entry-confirmation-dialog.component.scss @@ -0,0 +1,24 @@ +@use '../../../../../../../styles/functions' as *; + +.margin-bottom-1 { + margin-bottom: rem(16); +} + +.step-controls { + display: flex; + justify-content: space-between; +} + +.confirm-content { + margin: rem(24) 0; +} + +@media screen and (min-width: $desktopBreakpoint) { + .step-controls { + justify-content: flex-end; + + button { + margin-left: rem(25) !important; + } + } +} diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry-confirmation-dialog/parcel-entry-confirmation-dialog.component.spec.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry-confirmation-dialog/parcel-entry-confirmation-dialog.component.spec.ts new file mode 100644 index 0000000000..705f0c459e --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry-confirmation-dialog/parcel-entry-confirmation-dialog.component.spec.ts @@ -0,0 +1,35 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { MatDialog, MatDialogRef } from '@angular/material/dialog'; +import { ParcelEntryConfirmationDialogComponent } from './parcel-entry-confirmation-dialog.component'; + +describe('ParcelEntryConfirmationDialogComponent', () => { + let component: ParcelEntryConfirmationDialogComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ParcelEntryConfirmationDialogComponent], + providers: [ + { + provide: MatDialog, + useValue: {}, + }, + { + provide: MatDialogRef, + useValue: {}, + }, + ], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(ParcelEntryConfirmationDialogComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry-confirmation-dialog/parcel-entry-confirmation-dialog.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry-confirmation-dialog/parcel-entry-confirmation-dialog.component.ts new file mode 100644 index 0000000000..dfe4bb5e16 --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry-confirmation-dialog/parcel-entry-confirmation-dialog.component.ts @@ -0,0 +1,33 @@ +import { Component } from '@angular/core'; +import { MatDialogRef } from '@angular/material/dialog'; +import { ApplicationParcelDeleteStepsEnum } from '../../delete-parcel/delete-parcel-dialog.component'; + +@Component({ + selector: 'app-parcel-entry-confirmation-dialog', + templateUrl: './parcel-entry-confirmation-dialog.component.html', + styleUrls: ['./parcel-entry-confirmation-dialog.component.scss'], +}) +export class ParcelEntryConfirmationDialogComponent { + stepIdx = 0; + + warningStep = ApplicationParcelDeleteStepsEnum.warning; + confirmationStep = ApplicationParcelDeleteStepsEnum.confirmation; + + constructor(private dialogRef: MatDialogRef) {} + + async next() { + this.stepIdx += 1; + } + + async back() { + this.stepIdx -= 1; + } + + async onCancel(dialogResult: boolean = false) { + this.dialogRef.close(dialogResult); + } + + async onDelete() { + this.onCancel(true); + } +} diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.html new file mode 100644 index 0000000000..ad624d34bd --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.html @@ -0,0 +1,372 @@ +
+
+ +
+ The answer to the following question will change the rest of the application form. Do not change this answer once + selected. +
+ + Fee Simple + Crown + +
+ warning +
This field is required
+
+
+ +
Parcel Lookup
+
+
+ + +
Please ensure the auto-filled information is accurate by comparing with your records
+
+
+ + + Search by PID + Search by PIN + + + + + + +
+
+ + Powered by PMBC! +
+
+
+ +
+ +
Can be found on the parcel's Certificate of Title
+ + + +
+ warning +
This field is required
+
+
+ +
+ +
The area of the entire parcel in hectares, not just the area under application.
+ + + +
+ warning +
This field is required
+
+
+ +
+ + + + +
+ warning +
This field is required
+
Invalid format
+
+
+ +
+ + + + +
+ +
+ + + + + + +
+ warning +
This field is required
+
+
+ Example: 2020-Mar-01 +
+
+ +
+ +
+ As determined by + BC Assessment +
+ + Yes + No + +
+ warning +
This field is required
+
+
+ +
+ + + + +
+ warning +
This field is required
+
+
+
+ +
+ + +
+ +
+
Owner Information
+ +

Provide the following information for all owners listed on the parcel's Certificate of Title

+ + + + + +
+
{{ option.displayName }}
+ +
+ + +
+
No owner matching search
+ +
+ + + See all Owners + + + +
+ warning +
This field is required
+
+ +
+ +
+ + +
+ +
+ + Provincial Crown + Federal Crown +
+ warning +
This field is required
+
+ + + + + +
+
{{ option.displayName }}
+ +
+ + +
+
No owner matching search
+ +
+ + + See all Owners + + + +
+ warning +
This field is required
+
+ +
+ + + + + + + + + + +
+ +
+ I confirm that the owner information provided above matches the current Certificate of Title. Mismatched + information can cause significant delays to processing time. + +
+ warning +
This field is required
+
+
diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.scss b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.scss new file mode 100644 index 0000000000..223b120fa2 --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.scss @@ -0,0 +1,96 @@ +@use '../../../../../../styles/functions' as *; +@use '../../../../../../styles/colors'; + +.owner-option { + display: flex; + justify-content: space-between; + align-items: center; +} + +.new-owner { + margin: rem(8) 0 !important; +} + +.link-text { + color: colors.$link-color; + text-decoration: underline; +} + +.lookup-pid-fields { + display: flex; + align-items: center; + flex-direction: column; + + @media screen and (min-width: $desktopBreakpoint) { + flex-direction: row; + } +} + +.lookup-search-by { + margin-top: rem(8); + + @media screen and (min-width: $desktopBreakpoint) { + width: unset !important; + flex-grow: 1; + } +} + +.lookup-input { + margin-top: rem(8); + + @media screen and (min-width: $desktopBreakpoint) { + width: unset !important; + flex-grow: 5; + } +} + +.lookup-search-button { + width: 100%; + margin-top: rem(8) !important; + + @media screen and (min-width: $desktopBreakpoint) { + height: rem(55); + margin-top: rem(7) !important; + width: rem(150); + } +} + +.lookup-bottom-row { + display: flex; + align-items: center; + flex-direction: column; + margin-top: rem(24); + + .reset-button { + width: 100%; + margin-bottom: rem(8); + } + + @media screen and (min-width: $desktopBreakpoint) { + flex-direction: row; + justify-content: space-between; + + .reset-button { + width: unset; + } + } +} + +.crown-owner-type { + display: block; + margin-bottom: rem(24); + + .mat-mdc-radio-button ~ .mat-mdc-radio-button { + margin-left: rem(16); + } +} + +mat-button-toggle-group#isFarm { + height: rem(55); + + .mat-button-toggle { + display: flex; + align-items: center; + height: 100%; + } +} diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.spec.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.spec.ts new file mode 100644 index 0000000000..9bce91efb1 --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.spec.ts @@ -0,0 +1,81 @@ +import { HttpClient } from '@angular/common/http'; +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { MatAutocompleteModule } from '@angular/material/autocomplete'; +import { MatDialog } from '@angular/material/dialog'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { BehaviorSubject } from 'rxjs'; +import { NoticeOfIntentDocumentService } from '../../../../../services/notice-of-intent-document/notice-of-intent-document.service'; +import { NoticeOfIntentOwnerDto } from '../../../../../services/notice-of-intent-owner/notice-of-intent-owner.dto'; +import { NoticeOfIntentOwnerService } from '../../../../../services/notice-of-intent-owner/notice-of-intent-owner.service'; +import { NoticeOfIntentParcelDto } from '../../../../../services/notice-of-intent-parcel/notice-of-intent-parcel.dto'; +import { NoticeOfIntentParcelService } from '../../../../../services/notice-of-intent-parcel/notice-of-intent-parcel.service'; +import { ParcelService } from '../../../../../services/parcel/parcel.service'; +import { ParcelEntryComponent } from './parcel-entry.component'; + +describe('ParcelEntryComponent', () => { + let component: ParcelEntryComponent; + let fixture: ComponentFixture; + let mockParcelService: DeepMocked; + let mockHttpClient: DeepMocked; + let mockNOIParcelService: DeepMocked; + let mockNOIOwnerService: DeepMocked; + let mockNOIDocumentService: DeepMocked; + + let mockParcel: NoticeOfIntentParcelDto = { + isConfirmedByApplicant: false, + uuid: '', + owners: [], + }; + + beforeEach(async () => { + mockParcelService = createMock(); + mockHttpClient = createMock(); + mockNOIParcelService = createMock(); + mockNOIOwnerService = createMock(); + mockNOIDocumentService = createMock(); + + await TestBed.configureTestingModule({ + imports: [MatAutocompleteModule], + declarations: [ParcelEntryComponent], + providers: [ + { + provide: ParcelService, + useValue: mockParcelService, + }, + { + provide: HttpClient, + useValue: mockHttpClient, + }, + { + provide: NoticeOfIntentParcelService, + useValue: mockNOIParcelService, + }, + { + provide: NoticeOfIntentOwnerService, + useValue: mockNOIOwnerService, + }, + { + provide: NoticeOfIntentDocumentService, + useValue: mockNOIDocumentService, + }, + { + provide: MatDialog, + useValue: {}, + }, + ], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(ParcelEntryComponent); + component = fixture.componentInstance; + component.$owners = new BehaviorSubject([]); + component.parcel = mockParcel; + + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.ts new file mode 100644 index 0000000000..bb0f985ece --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.ts @@ -0,0 +1,501 @@ +import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; +import { FormControl, FormGroup, Validators } from '@angular/forms'; +import { MatButtonToggleChange } from '@angular/material/button-toggle'; +import { MatDialog } from '@angular/material/dialog'; +import { BehaviorSubject } from 'rxjs'; +import { PARCEL_OWNERSHIP_TYPE } from '../../../../../services/application-parcel/application-parcel.dto'; +import { NoticeOfIntentDocumentDto } from '../../../../../services/notice-of-intent-document/notice-of-intent-document.dto'; +import { NoticeOfIntentDocumentService } from '../../../../../services/notice-of-intent-document/notice-of-intent-document.service'; +import { NoticeOfIntentOwnerDto } from '../../../../../services/notice-of-intent-owner/notice-of-intent-owner.dto'; +import { NoticeOfIntentOwnerService } from '../../../../../services/notice-of-intent-owner/notice-of-intent-owner.service'; +import { NoticeOfIntentParcelDto } from '../../../../../services/notice-of-intent-parcel/notice-of-intent-parcel.dto'; +import { NoticeOfIntentParcelService } from '../../../../../services/notice-of-intent-parcel/notice-of-intent-parcel.service'; +import { ParcelService } from '../../../../../services/parcel/parcel.service'; +import { DOCUMENT_TYPE } from '../../../../../shared/dto/document.dto'; +import { OWNER_TYPE } from '../../../../../shared/dto/owner.dto'; +import { FileHandle } from '../../../../../shared/file-drag-drop/drag-drop.directive'; +import { formatBooleanToString } from '../../../../../shared/utils/boolean-helper'; +import { RemoveFileConfirmationDialogComponent } from '../../../../applications/alcs-edit-submission/remove-file-confirmation-dialog/remove-file-confirmation-dialog.component'; +import { ApplicationCrownOwnerDialogComponent } from '../../../../applications/edit-submission/parcel-details/application-crown-owner-dialog/application-crown-owner-dialog.component'; +import { ApplicationOwnerDialogComponent } from '../../../../applications/edit-submission/parcel-details/application-owner-dialog/application-owner-dialog.component'; +import { ApplicationOwnersDialogComponent } from '../../../../applications/edit-submission/parcel-details/application-owners-dialog/application-owners-dialog.component'; +import { ParcelEntryConfirmationDialogComponent } from './parcel-entry-confirmation-dialog/parcel-entry-confirmation-dialog.component'; + +export interface ParcelEntryFormData { + uuid: string; + legalDescription: string | undefined | null; + mapArea: string | undefined | null; + pin: string | undefined | null; + pid: string | undefined | null; + civicAddress: string | undefined | null; + parcelType: string | undefined | null; + isFarm: string | undefined | null; + purchaseDate?: Date | null; + crownLandOwnerType?: string | null; + isConfirmedByApplicant: boolean; + owners: NoticeOfIntentOwnerDto[]; +} + +@Component({ + selector: 'app-noi-parcel-entry[parcel][fileId][submissionUuid]', + templateUrl: './parcel-entry.component.html', + styleUrls: ['./parcel-entry.component.scss'], +}) +export class ParcelEntryComponent implements OnInit { + @Input() parcel!: NoticeOfIntentParcelDto; + @Input() fileId!: string; + @Input() submissionUuid!: string; + @Input() $owners: BehaviorSubject = new BehaviorSubject([]); + + @Input() enableOwners = true; + @Input() enableCertificateOfTitleUpload = true; + @Input() enableUserSignOff = true; + @Input() enableAddNewOwner = true; + @Input() showErrors = false; + @Input() _disabled = false; + @Input() isDraft = false; + + @Input() + public set disabled(disabled: boolean) { + this._disabled = disabled; + this.onFormDisabled(); + } + + @Output() private onFormGroupChange = new EventEmitter>(); + @Output() private onSaveProgress = new EventEmitter(); + @Output() onOwnersUpdated = new EventEmitter(); + + owners: NoticeOfIntentOwnerDto[] = []; + filteredOwners: (NoticeOfIntentOwnerDto & { isSelected: boolean })[] = []; + + searchBy = new FormControl(null); + isCrownLand: boolean | null = null; + isCertificateOfTitleRequired = true; + + pidPin = new FormControl(''); + legalDescription = new FormControl(null, [Validators.required]); + mapArea = new FormControl(null, [Validators.required]); + pid = new FormControl(null, [Validators.required]); + pin = new FormControl(null); + civicAddress = new FormControl(null, [Validators.required]); + parcelType = new FormControl(null, [Validators.required]); + isFarm = new FormControl(null, [Validators.required]); + purchaseDate = new FormControl(null, [Validators.required]); + crownLandOwnerType = new FormControl(null); + isConfirmedByApplicant = new FormControl(false, [Validators.requiredTrue]); + parcelForm = new FormGroup({ + pidPin: this.pidPin, + legalDescription: this.legalDescription, + mapArea: this.mapArea, + pin: this.pin, + pid: this.pid, + civicAddress: this.civicAddress, + parcelType: this.parcelType, + isFarm: this.isFarm, + purchaseDate: this.purchaseDate, + crownLandOwnerType: this.crownLandOwnerType, + isConfirmedByApplicant: this.isConfirmedByApplicant, + searchBy: this.searchBy, + }); + pidPinPlaceholder = ''; + + ownerInput = new FormControl(null); + + DOCUMENT_TYPES = DOCUMENT_TYPE; + PARCEL_OWNERSHIP_TYPES = PARCEL_OWNERSHIP_TYPE; + maxPurchasedDate = new Date(); + + constructor( + private parcelService: ParcelService, + private noticeOfIntentParcelService: NoticeOfIntentParcelService, + private noticeOfIntentOwnerService: NoticeOfIntentOwnerService, + private noticeOfIntentDocumentService: NoticeOfIntentDocumentService, + private dialog: MatDialog + ) {} + + ngOnInit(): void { + this.setupForm(); + + this.$owners.subscribe((owners) => { + this.owners = owners; + this.filteredOwners = this.mapOwners(owners); + this.parcel.owners = this.parcel.owners.map((owner) => { + const updatedOwner = owners.find((updatedOwner) => updatedOwner.uuid === owner.uuid)!; + if (!updatedOwner) { + console.warn('Failed to find user in array'); + return owner; + } + return updatedOwner; + }); + }); + } + + async onSearch() { + let result; + if (this.searchBy.getRawValue() === 'pin') { + result = await this.parcelService.getByPin(this.pidPin.getRawValue()!); + } else { + result = await this.parcelService.getByPid(this.pidPin.getRawValue()!); + } + + this.onReset(); + if (result) { + this.legalDescription.setValue(result.legalDescription); + this.mapArea.setValue(result.mapArea); + + if (result.pin) { + this.pin.setValue(result.pin); + } + + if (result.pid) { + this.pid.setValue(result.pid); + } + + this.emitFormChangeOnSearchActions(); + } + } + + onReset() { + this.parcelForm.controls.pidPin.reset(); + this.parcelForm.controls.pid.reset(); + this.parcelForm.controls.pin.reset(); + this.parcelForm.controls.legalDescription.reset(); + this.parcelForm.controls.mapArea.reset(); + this.parcelForm.controls.purchaseDate.reset(); + this.parcelForm.controls.isFarm.reset(); + this.parcelForm.controls.civicAddress.reset(); + + this.emitFormChangeOnSearchActions(); + + if (this.showErrors) { + this.parcelForm.markAllAsTouched(); + } else { + this.parcelForm.controls.isFarm.markAsTouched(); + } + } + + private emitFormChangeOnSearchActions() { + this.onFormGroupChange.emit({ + uuid: this.parcel.uuid, + legalDescription: this.legalDescription.getRawValue(), + mapArea: this.mapArea.getRawValue(), + pin: this.pin.getRawValue(), + pid: this.pid.getRawValue(), + }); + } + + onChangeParcelType($event: MatButtonToggleChange) { + const dirtyForm = + this.legalDescription.value || + this.mapArea.value || + this.pid.value || + this.pin.value || + this.purchaseDate.value || + this.isFarm.value || + this.civicAddress.value; + + const changeParcelType = () => { + if ($event.value === this.PARCEL_OWNERSHIP_TYPES.CROWN) { + this.searchBy.setValue(null); + this.pidPinPlaceholder = ''; + this.isCrownLand = true; + this.pid.setValidators([]); + this.purchaseDate.disable(); + } else { + this.searchBy.setValue('pid'); + this.pidPinPlaceholder = 'Type 9 digit PID'; + this.isCrownLand = false; + this.pid.setValidators([Validators.required]); + this.crownLandOwnerType.setValue(null); + this.purchaseDate.enable(); + } + + this.updateParcelOwners([]); + this.filteredOwners = this.mapOwners(this.owners); + this.pid.updateValueAndValidity(); + }; + + if (dirtyForm && this.isCrownLand !== null) { + this.dialog + .open(ParcelEntryConfirmationDialogComponent, { + panelClass: 'no-padding', + disableClose: true, + }) + .beforeClosed() + .subscribe(async (result) => { + if (result) { + this.onReset(); + return changeParcelType(); + } else { + const newParcelType = this.parcelType.getRawValue(); + + const prevParcelType = + newParcelType === this.PARCEL_OWNERSHIP_TYPES.CROWN + ? this.PARCEL_OWNERSHIP_TYPES.FEE_SIMPLE + : this.PARCEL_OWNERSHIP_TYPES.CROWN; + + this.parcelType.setValue(prevParcelType); + } + }); + } else { + return changeParcelType(); + } + } + + async attachFile(file: FileHandle, parcelUuid: string) { + if (parcelUuid) { + const mappedFiles = file.file; + this.parcel.certificateOfTitle = await this.noticeOfIntentParcelService.attachCertificateOfTitle( + this.fileId, + parcelUuid, + mappedFiles + ); + } + } + + async deleteFile($event: NoticeOfIntentDocumentDto) { + if (this.isDraft) { + this.dialog + .open(RemoveFileConfirmationDialogComponent) + .beforeClosed() + .subscribe(async (didConfirm) => { + if (didConfirm) { + await this.noticeOfIntentDocumentService.deleteExternalFile($event.uuid); + this.parcel.certificateOfTitle = undefined; + } + }); + } else { + await this.noticeOfIntentDocumentService.deleteExternalFile($event.uuid); + this.parcel.certificateOfTitle = undefined; + } + } + + async openFile(uuid: string) { + const res = await this.noticeOfIntentDocumentService.openFile(uuid); + if (res) { + window.open(res.url, '_blank'); + } + } + + async beforeFileUploadOpened() { + this.onSaveProgress.emit(); + } + + onAddNewOwner() { + const dialog = this.dialog.open(ApplicationOwnerDialogComponent, { + data: { + fileId: this.fileId, + submissionUuid: this.submissionUuid, + parcelUuid: this.parcel.uuid, + }, + }); + dialog.beforeClosed().subscribe((createdDto) => { + if (createdDto) { + this.onOwnersUpdated.emit(); + const updatedArray = [...this.parcel.owners, createdDto]; + this.updateParcelOwners(updatedArray); + } + }); + } + + onAddNewGovernmentContact() { + const dialog = this.dialog.open(ApplicationCrownOwnerDialogComponent, { + data: { + fileId: this.fileId, + submissionUuid: this.submissionUuid, + parcelUuid: this.parcel.uuid, + }, + }); + dialog.beforeClosed().subscribe((createdDto) => { + if (createdDto) { + this.onOwnersUpdated.emit(); + const updatedArray = [...this.parcel.owners, createdDto]; + this.updateParcelOwners(updatedArray); + } + }); + } + + async onSelectOwner(owner: NoticeOfIntentOwnerDto, isSelected: boolean) { + if (!isSelected) { + const selectedOwners = [...this.parcel.owners, owner]; + this.updateParcelOwners(selectedOwners); + } + } + + async onOwnerRemoved(uuid: string) { + const updatedArray = this.parcel.owners.filter((existingOwner) => existingOwner.uuid !== uuid); + this.updateParcelOwners(updatedArray); + } + + mapOwners(owners: NoticeOfIntentOwnerDto[]) { + return owners + .filter((owner) => { + if (this.isCrownLand) { + return [OWNER_TYPE.CROWN].includes(owner.type.code); + } else { + return [OWNER_TYPE.INDIVIDUAL, OWNER_TYPE.ORGANIZATION].includes(owner.type.code); + } + }) + .map((owner) => { + const isSelected = this.parcel.owners.some((parcelOwner) => parcelOwner.uuid === owner.uuid); + return { + ...owner, + isSelected, + }; + }) + .sort(this.noticeOfIntentOwnerService.sortOwners); + } + + onTypeOwner($event: Event) { + const element = $event.target as HTMLInputElement; + this.filteredOwners = this.mapOwners(this.owners).filter((option) => { + return option.displayName.toLowerCase().includes(element.value.toLowerCase()); + }); + } + + onSeeAllOwners() { + this.dialog + .open(ApplicationOwnersDialogComponent, { + data: { + owners: this.owners, + fileId: this.fileId, + submissionUuid: this.submissionUuid, + }, + }) + .beforeClosed() + .subscribe((isDirty) => { + if (isDirty) { + this.onOwnersUpdated.emit(); + } + }); + } + + private setupForm() { + this.parcelForm.patchValue({ + legalDescription: this.parcel.legalDescription, + mapArea: this.parcel.mapAreaHectares, + pid: this.parcel.pid, + pin: this.parcel.pin, + civicAddress: this.parcel.civicAddress, + parcelType: this.parcel.ownershipTypeCode, + isFarm: formatBooleanToString(this.parcel.isFarm), + purchaseDate: this.parcel.purchasedDate ? new Date(this.parcel.purchasedDate) : null, + crownLandOwnerType: this.parcel.crownLandOwnerType, + isConfirmedByApplicant: this.enableUserSignOff ? this.parcel.isConfirmedByApplicant : false, + }); + + this.isCrownLand = this.parcelType.value + ? this.parcelType.getRawValue() === this.PARCEL_OWNERSHIP_TYPES.CROWN + : null; + + if (this.isCrownLand) { + this.pidPin.disable(); + this.purchaseDate.disable(); + this.pid.setValidators([]); + const pidValue = this.pid.getRawValue(); + this.isCertificateOfTitleRequired = !!pidValue && pidValue.length > 0; + this.pidPinPlaceholder = ''; + } else { + this.pidPinPlaceholder = 'Type 9 digit PID'; + this.isCertificateOfTitleRequired = true; + } + + if (this.parcel.owners.length > 0 && this.isCrownLand) { + this.ownerInput.disable(); + } + + if (this.showErrors) { + this.parcelForm.markAllAsTouched(); + + if (this.parcel.owners.length === 0) { + this.ownerInput.setValidators([Validators.required]); + this.ownerInput.setErrors({ required: true }); + this.ownerInput.markAllAsTouched(); + } + } + + this.parcelForm.valueChanges.subscribe((formData) => { + if (!this.parcelForm.dirty) { + return; + } + + if ((this.isCrownLand && !this.searchBy.getRawValue()) || this.disabled) { + this.pidPin.disable({ + emitEvent: false, + }); + } else { + this.pidPin.enable({ + emitEvent: false, + }); + } + + const pidValue = this.pid.getRawValue(); + if (this.isCrownLand) { + this.isCertificateOfTitleRequired = !!pidValue && pidValue.length > 0; + } else { + this.isCertificateOfTitleRequired = true; + } + + if (this.parcelForm.dirty && formData.isConfirmedByApplicant === this.parcel.isConfirmedByApplicant) { + this.parcel.isConfirmedByApplicant = false; + formData.isConfirmedByApplicant = false; + + this.parcelForm.patchValue( + { + isConfirmedByApplicant: false, + }, + { emitEvent: false } + ); + } + + return this.onFormGroupChange.emit({ + ...formData, + uuid: this.parcel.uuid, + isConfirmedByApplicant: formData.isConfirmedByApplicant!, + purchaseDate: new Date(formData.purchaseDate?.valueOf()), + }); + }); + } + + private updateParcelOwners(updatedArray: NoticeOfIntentOwnerDto[]) { + if (updatedArray.length > 0) { + this.ownerInput.clearValidators(); + this.ownerInput.updateValueAndValidity(); + } else if (updatedArray.length === 0 && this.showErrors) { + this.ownerInput.markAllAsTouched(); + this.ownerInput.setValidators([Validators.required]); + this.ownerInput.setErrors({ required: true }); + } + + if (this.isCrownLand && updatedArray.length > 0) { + this.ownerInput.disable(); + } else { + this.ownerInput.enable(); + } + + this.parcel.owners = updatedArray; + this.filteredOwners = this.mapOwners(this.owners); + this.onFormGroupChange.emit({ + uuid: this.parcel.uuid, + owners: updatedArray, + }); + } + + private onFormDisabled() { + if (this._disabled) { + this.parcelForm.disable(); + this.ownerInput.disable(); + } else { + this.parcelForm.enable(); + this.ownerInput.enable(); + } + } + + onChangeSearchBy(value: string) { + if (value === 'pid') { + this.pidPinPlaceholder = 'Type 9 digit PID'; + } else { + this.pidPinPlaceholder = 'Type PIN'; + } + } +} diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-owners/parcel-owners.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-owners/parcel-owners.component.html new file mode 100644 index 0000000000..51ea96511d --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-owners/parcel-owners.component.html @@ -0,0 +1,73 @@ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Type{{ element.type.label }}{{ element.position }}Full Name{{ element.displayName }}Organization NameOrganization Name / Ministry / Department + + {{ element.organizationName }} + Ministry/ Department{{ element.organizationName }}Phone{{ element.phoneNumber | mask : '(000) 000-0000' }}Email{{ element.email }}Actions + + + +
No owner information
+
diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-owners/parcel-owners.component.scss b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-owners/parcel-owners.component.scss new file mode 100644 index 0000000000..fb105e09eb --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-owners/parcel-owners.component.scss @@ -0,0 +1,14 @@ +@use '../../../../../../styles/functions' as *; +@use '../../../../../../styles/colors'; + +.actions { + button:not(:last-child) { + margin-right: rem(8) !important; + } +} + +.no-data-text { + text-align: center; + color: colors.$grey; + padding-top: rem(12); +} diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-owners/parcel-owners.component.spec.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-owners/parcel-owners.component.spec.ts new file mode 100644 index 0000000000..b36089cde8 --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-owners/parcel-owners.component.spec.ts @@ -0,0 +1,41 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { MatDialog } from '@angular/material/dialog'; +import { NoticeOfIntentOwnerService } from '../../../../../services/notice-of-intent-owner/notice-of-intent-owner.service'; +import { ConfirmationDialogService } from '../../../../../shared/confirmation-dialog/confirmation-dialog.service'; + +import { ParcelOwnersComponent } from './parcel-owners.component'; + +describe('ParcelOwnersComponent', () => { + let component: ParcelOwnersComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + providers: [ + { + provide: MatDialog, + useValue: {}, + }, + { + provide: NoticeOfIntentOwnerService, + useValue: {}, + }, + { + provide: ConfirmationDialogService, + useValue: {}, + }, + ], + declarations: [ParcelOwnersComponent], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(ParcelOwnersComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-owners/parcel-owners.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-owners/parcel-owners.component.ts new file mode 100644 index 0000000000..ebfcd50c62 --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-owners/parcel-owners.component.ts @@ -0,0 +1,91 @@ +import { Component, EventEmitter, Input, Output } from '@angular/core'; +import { MatDialog } from '@angular/material/dialog'; +import { NoticeOfIntentOwnerDto } from '../../../../../services/notice-of-intent-owner/notice-of-intent-owner.dto'; +import { NoticeOfIntentOwnerService } from '../../../../../services/notice-of-intent-owner/notice-of-intent-owner.service'; +import { ConfirmationDialogService } from '../../../../../shared/confirmation-dialog/confirmation-dialog.service'; +import { OWNER_TYPE } from '../../../../../shared/dto/owner.dto'; +import { ApplicationCrownOwnerDialogComponent } from '../../../../applications/edit-submission/parcel-details/application-crown-owner-dialog/application-crown-owner-dialog.component'; +import { ApplicationOwnerDialogComponent } from '../../../../applications/edit-submission/parcel-details/application-owner-dialog/application-owner-dialog.component'; + +@Component({ + selector: 'app-parcel-owners[owners][fileId][submissionUuid]', + templateUrl: './parcel-owners.component.html', + styleUrls: ['./parcel-owners.component.scss'], +}) +export class ParcelOwnersComponent { + @Output() onOwnersUpdated = new EventEmitter(); + @Output() onOwnerRemoved = new EventEmitter(); + + @Input() + public set owners(owners: NoticeOfIntentOwnerDto[]) { + this._owners = owners.sort(this.noticeOfIntentOwnerService.sortOwners); + } + + @Input() + public set disabled(disabled: boolean) { + this._disabled = disabled; + } + + @Input() submissionUuid!: string; + @Input() fileId!: string; + @Input() parcelUuid?: string | undefined; + @Input() isCrown = false; + @Input() isDraft = false; + @Input() isShowAllOwners = false; + + _owners: NoticeOfIntentOwnerDto[] = []; + _disabled = false; + displayedColumns = ['type', 'position', 'displayName', 'organizationName', 'phone', 'email', 'actions']; + + constructor( + private dialog: MatDialog, + private noticeOfIntentOwnerService: NoticeOfIntentOwnerService, + private confDialogService: ConfirmationDialogService + ) {} + + onEdit(owner: NoticeOfIntentOwnerDto) { + let dialog; + if (owner.type.code === OWNER_TYPE.CROWN) { + dialog = this.dialog.open(ApplicationCrownOwnerDialogComponent, { + data: { + isDraft: this.isDraft, + parcelUuid: this.parcelUuid, + existingOwner: owner, + submissionUuid: this.submissionUuid, + }, + }); + } else { + dialog = this.dialog.open(ApplicationOwnerDialogComponent, { + data: { + isDraft: this.isDraft, + fileId: this.fileId, + submissionUuid: this.submissionUuid, + parcelUuid: this.parcelUuid, + existingOwner: owner, + }, + }); + } + dialog.beforeClosed().subscribe((updatedUuid) => { + if (updatedUuid) { + this.onOwnersUpdated.emit(); + } + }); + } + + async onRemove(uuid: string) { + this.onOwnerRemoved.emit(uuid); + } + + async onDelete(owner: NoticeOfIntentOwnerDto) { + this.confDialogService + .openDialog({ + body: `This action will remove ${owner.displayName} and its usage from the entire application. Are you sure you want to remove this owner? `, + }) + .subscribe(async (didConfirm) => { + if (didConfirm) { + await this.noticeOfIntentOwnerService.delete(owner.uuid); + this.onOwnersUpdated.emit(); + } + }); + } +} diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/step.partial.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/step.partial.ts new file mode 100644 index 0000000000..6ac94b8e94 --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/step.partial.ts @@ -0,0 +1,34 @@ +import { Component, EventEmitter, Input, OnDestroy, Output } from '@angular/core'; +import { BehaviorSubject, Subject } from 'rxjs'; +import { ApplicationSubmissionDetailedDto } from '../../../services/application-submission/application-submission.dto'; +import { NoticeOfIntentSubmissionDetailedDto } from '../../../services/notice-of-intent-submission/notice-of-intent-submission.dto'; + +@Component({ + selector: 'app-step', + template: '

', + styleUrls: [], +}) +export class StepComponent implements OnDestroy { + protected $destroy = new Subject(); + + @Input() $noiSubmission!: BehaviorSubject; + + @Input() showErrors = false; + @Input() draftMode = false; + + @Output() navigateToStep = new EventEmitter(); + @Output() exit = new EventEmitter(); + + async onSaveExit() { + this.exit.emit(); + } + + onNavigateToStep(step: number) { + this.navigateToStep.emit(step); + } + + async ngOnDestroy() { + this.$destroy.next(); + this.$destroy.complete(); + } +} diff --git a/portal-frontend/src/app/services/application-document/application-document.dto.ts b/portal-frontend/src/app/services/application-document/application-document.dto.ts index f5762d92fe..24a998e007 100644 --- a/portal-frontend/src/app/services/application-document/application-document.dto.ts +++ b/portal-frontend/src/app/services/application-document/application-document.dto.ts @@ -1,47 +1,7 @@ -import { BaseCodeDto } from '../../shared/dto/base.dto'; - -export enum DOCUMENT_TYPE { - //ALCS - DECISION_DOCUMENT = 'DPAC', - OTHER = 'OTHR', - - //Government Review - RESOLUTION_DOCUMENT = 'RESO', - STAFF_REPORT = 'STFF', - - //Applicant Uploaded - CORPORATE_SUMMARY = 'CORS', - PROFESSIONAL_REPORT = 'PROR', - PHOTOGRAPH = 'PHTO', - AUTHORIZATION_LETTER = 'AAGR', - CERTIFICATE_OF_TITLE = 'CERT', - - //App Documents - SERVING_NOTICE = 'POSN', - PROPOSAL_MAP = 'PRSK', - HOMESITE_SEVERANCE = 'HOME', - CROSS_SECTIONS = 'SPCS', - RECLAMATION_PLAN = 'RECP', - NOTICE_OF_WORK = 'NOWE', - PROOF_OF_SIGNAGE = 'POSA', - REPORT_OF_PUBLIC_HEARING = 'ROPH', - PROOF_OF_ADVERTISING = 'POAA', -} - -export enum DOCUMENT_SOURCE { - APPLICANT = 'Applicant', - ALC = 'ALC', - LFNG = 'L/FNG', - AFFECTED_PARTY = 'Affected Party', - PUBLIC = 'Public', -} - -export interface ApplicationDocumentTypeDto extends BaseCodeDto { - code: DOCUMENT_TYPE; -} +import { DOCUMENT_SOURCE, DOCUMENT_TYPE, DocumentTypeDto } from '../../shared/dto/document.dto'; export interface ApplicationDocumentDto { - type: ApplicationDocumentTypeDto | null; + type: DocumentTypeDto | null; description?: string | null; uuid: string; fileName: string; diff --git a/portal-frontend/src/app/services/application-document/application-document.service.spec.ts b/portal-frontend/src/app/services/application-document/application-document.service.spec.ts index 44f8eaa138..285edba50b 100644 --- a/portal-frontend/src/app/services/application-document/application-document.service.spec.ts +++ b/portal-frontend/src/app/services/application-document/application-document.service.spec.ts @@ -71,7 +71,7 @@ describe('ApplicationDocumentService', () => { expect(mockToastService.showErrorToast).toHaveBeenCalledTimes(1); }); - it('should make a delete request for update file', async () => { + it('should make a patch request for update file', async () => { mockHttpClient.patch.mockReturnValue(of({})); await service.update('fileId', []); diff --git a/portal-frontend/src/app/services/application-document/application-document.service.ts b/portal-frontend/src/app/services/application-document/application-document.service.ts index 34020c3ebe..41067bf26d 100644 --- a/portal-frontend/src/app/services/application-document/application-document.service.ts +++ b/portal-frontend/src/app/services/application-document/application-document.service.ts @@ -2,15 +2,11 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { firstValueFrom } from 'rxjs'; import { environment } from '../../../environments/environment'; +import { DOCUMENT_SOURCE, DOCUMENT_TYPE } from '../../shared/dto/document.dto'; import { OverlaySpinnerService } from '../../shared/overlay-spinner/overlay-spinner.service'; import { DocumentService } from '../document/document.service'; import { ToastService } from '../toast/toast.service'; -import { - ApplicationDocumentDto, - ApplicationDocumentUpdateDto, - DOCUMENT_SOURCE, - DOCUMENT_TYPE, -} from './application-document.dto'; +import { ApplicationDocumentDto, ApplicationDocumentUpdateDto } from './application-document.dto'; @Injectable({ providedIn: 'root', diff --git a/portal-frontend/src/app/services/application-owner/application-owner.dto.ts b/portal-frontend/src/app/services/application-owner/application-owner.dto.ts index 090698c4d0..c37d003247 100644 --- a/portal-frontend/src/app/services/application-owner/application-owner.dto.ts +++ b/portal-frontend/src/app/services/application-owner/application-owner.dto.ts @@ -1,19 +1,8 @@ import { BaseCodeDto } from '../../shared/dto/base.dto'; +import { OWNER_TYPE, OwnerTypeDto } from '../../shared/dto/owner.dto'; import { ApplicationDocumentDto } from '../application-document/application-document.dto'; import { ApplicationParcelDto } from '../application-parcel/application-parcel.dto'; -export enum APPLICATION_OWNER { - INDIVIDUAL = 'INDV', - ORGANIZATION = 'ORGZ', - AGENT = 'AGEN', - CROWN = 'CRWN', - GOVERNMENT = 'GOVR', -} - -export interface ApplicationOwnerTypeDto extends BaseCodeDto { - code: APPLICATION_OWNER; -} - export interface ApplicationOwnerDto { uuid: string; applicationSubmissionUuid: string; @@ -23,7 +12,7 @@ export interface ApplicationOwnerDto { organizationName: string | null; phoneNumber: string | null; email: string | null; - type: ApplicationOwnerTypeDto; + type: OwnerTypeDto; corporateSummary?: ApplicationDocumentDto; } @@ -51,7 +40,7 @@ export interface SetPrimaryContactDto { organization?: string; phoneNumber?: string; email?: string; - type?: APPLICATION_OWNER; + type?: OWNER_TYPE; ownerUuid?: string; applicationSubmissionUuid: string; } diff --git a/portal-frontend/src/app/services/application-owner/application-owner.service.ts b/portal-frontend/src/app/services/application-owner/application-owner.service.ts index debb0ae2c4..290e3a83db 100644 --- a/portal-frontend/src/app/services/application-owner/application-owner.service.ts +++ b/portal-frontend/src/app/services/application-owner/application-owner.service.ts @@ -2,7 +2,7 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { firstValueFrom } from 'rxjs'; import { environment } from '../../../environments/environment'; -import { DOCUMENT_SOURCE, DOCUMENT_TYPE } from '../application-document/application-document.dto'; +import { DOCUMENT_SOURCE, DOCUMENT_TYPE } from '../../shared/dto/document.dto'; import { DocumentService } from '../document/document.service'; import { ToastService } from '../toast/toast.service'; import { diff --git a/portal-frontend/src/app/services/application-parcel/application-parcel.service.ts b/portal-frontend/src/app/services/application-parcel/application-parcel.service.ts index 813a830003..1112a20315 100644 --- a/portal-frontend/src/app/services/application-parcel/application-parcel.service.ts +++ b/portal-frontend/src/app/services/application-parcel/application-parcel.service.ts @@ -2,15 +2,12 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { firstValueFrom } from 'rxjs'; import { environment } from '../../../environments/environment'; +import { DOCUMENT_SOURCE, DOCUMENT_TYPE } from '../../shared/dto/document.dto'; import { OverlaySpinnerService } from '../../shared/overlay-spinner/overlay-spinner.service'; -import { - ApplicationDocumentDto, - DOCUMENT_SOURCE, - DOCUMENT_TYPE, -} from '../application-document/application-document.dto'; +import { ApplicationDocumentDto } from '../application-document/application-document.dto'; import { DocumentService } from '../document/document.service'; import { ToastService } from '../toast/toast.service'; -import { ApplicationParcelDto, ApplicationParcelUpdateDto, PARCEL_TYPE } from './application-parcel.dto'; +import { ApplicationParcelDto, ApplicationParcelUpdateDto } from './application-parcel.dto'; @Injectable({ providedIn: 'root', @@ -37,12 +34,11 @@ export class ApplicationParcelService { return undefined; } - async create(applicationSubmissionUuid: string, parcelType?: PARCEL_TYPE, ownerUuid?: string) { + async create(applicationSubmissionUuid: string, ownerUuid?: string) { try { return await firstValueFrom( this.httpClient.post(`${this.serviceUrl}`, { applicationSubmissionUuid, - parcelType, ownerUuid, }) ); diff --git a/portal-frontend/src/app/services/code/code.service.ts b/portal-frontend/src/app/services/code/code.service.ts index 9115600fd5..8dc58f9d8c 100644 --- a/portal-frontend/src/app/services/code/code.service.ts +++ b/portal-frontend/src/app/services/code/code.service.ts @@ -2,7 +2,7 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { firstValueFrom } from 'rxjs'; import { environment } from '../../../environments/environment'; -import { ApplicationDocumentTypeDto } from '../application-document/application-document.dto'; +import { DocumentTypeDto } from '../../shared/dto/document.dto'; import { NaruSubtypeDto } from '../application-submission/application-submission.dto'; import { ApplicationTypeDto, LocalGovernmentDto, NoticeOfIntentTypeDto, SubmissionTypeDto } from './code.dto'; @@ -20,7 +20,7 @@ export class CodeService { localGovernments: LocalGovernmentDto[]; applicationTypes: ApplicationTypeDto[]; noticeOfIntentTypes: NoticeOfIntentTypeDto[]; - applicationDocumentTypes: ApplicationDocumentTypeDto[]; + documentTypes: DocumentTypeDto[]; submissionTypes: SubmissionTypeDto[]; naruSubtypes: NaruSubtypeDto[]; }>(`${this.baseUrl}`) diff --git a/portal-frontend/src/app/services/document/document.service.ts b/portal-frontend/src/app/services/document/document.service.ts index e4e82374e8..899968fcbc 100644 --- a/portal-frontend/src/app/services/document/document.service.ts +++ b/portal-frontend/src/app/services/document/document.service.ts @@ -2,8 +2,8 @@ import { HttpBackend, HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { firstValueFrom } from 'rxjs'; import { environment } from '../../../environments/environment'; +import { DOCUMENT_SOURCE, DOCUMENT_TYPE } from '../../shared/dto/document.dto'; import { OverlaySpinnerService } from '../../shared/overlay-spinner/overlay-spinner.service'; -import { DOCUMENT_SOURCE, DOCUMENT_TYPE } from '../application-document/application-document.dto'; import { ToastService } from '../toast/toast.service'; import { UploadDocumentUrlDto } from './document.dto'; diff --git a/portal-frontend/src/app/services/notice-of-intent-document/notice-of-intent-document.dto.ts b/portal-frontend/src/app/services/notice-of-intent-document/notice-of-intent-document.dto.ts new file mode 100644 index 0000000000..cd724b639a --- /dev/null +++ b/portal-frontend/src/app/services/notice-of-intent-document/notice-of-intent-document.dto.ts @@ -0,0 +1,18 @@ +import { DOCUMENT_SOURCE, DOCUMENT_TYPE, DocumentTypeDto } from '../../shared/dto/document.dto'; + +export interface NoticeOfIntentDocumentDto { + type: DocumentTypeDto | null; + description?: string | null; + uuid: string; + fileName: string; + fileSize: number; + uploadedBy: string; + uploadedAt: number; + source: DOCUMENT_SOURCE; +} + +export interface NoticeOfIntentDocumentUpdateDto { + uuid: string; + type: DOCUMENT_TYPE | null; + description?: string | null; +} diff --git a/portal-frontend/src/app/services/notice-of-intent-document/notice-of-intent-document.service.spec.ts b/portal-frontend/src/app/services/notice-of-intent-document/notice-of-intent-document.service.spec.ts new file mode 100644 index 0000000000..5c07e25903 --- /dev/null +++ b/portal-frontend/src/app/services/notice-of-intent-document/notice-of-intent-document.service.spec.ts @@ -0,0 +1,91 @@ +import { HttpClient } from '@angular/common/http'; +import { HttpClientTestingModule } from '@angular/common/http/testing'; +import { TestBed } from '@angular/core/testing'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { of, throwError } from 'rxjs'; +import { ToastService } from '../toast/toast.service'; +import { NoticeOfIntentDocumentService } from './notice-of-intent-document.service'; + +describe('NoticeOfIntentDocumentService', () => { + let service: NoticeOfIntentDocumentService; + let mockToastService: DeepMocked; + let mockHttpClient: DeepMocked; + + beforeEach(() => { + mockToastService = createMock(); + mockHttpClient = createMock(); + + TestBed.configureTestingModule({ + imports: [HttpClientTestingModule], + providers: [ + { + provide: ToastService, + useValue: mockToastService, + }, + { + provide: HttpClient, + useValue: mockHttpClient, + }, + ], + }); + service = TestBed.inject(NoticeOfIntentDocumentService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); + + it('should make a get request for open file', async () => { + mockHttpClient.get.mockReturnValue(of({})); + + await service.openFile('fileId'); + + expect(mockHttpClient.get).toHaveBeenCalledTimes(1); + expect(mockHttpClient.get.mock.calls[0][0]).toContain('notice-of-intent-document'); + }); + + it('should show an error toast if opening a file fails', async () => { + mockHttpClient.get.mockReturnValue(throwError(() => ({}))); + + await service.openFile('fileId'); + + expect(mockHttpClient.get).toHaveBeenCalledTimes(1); + expect(mockToastService.showErrorToast).toHaveBeenCalledTimes(1); + }); + + it('should make a delete request for delete file', async () => { + mockHttpClient.delete.mockReturnValue(of({})); + + await service.deleteExternalFile('fileId'); + + expect(mockHttpClient.delete).toHaveBeenCalledTimes(1); + expect(mockHttpClient.delete.mock.calls[0][0]).toContain('notice-of-intent-document'); + }); + + it('should show an error toast if deleting a file fails', async () => { + mockHttpClient.delete.mockReturnValue(throwError(() => ({}))); + + await service.deleteExternalFile('fileId'); + + expect(mockHttpClient.delete).toHaveBeenCalledTimes(1); + expect(mockToastService.showErrorToast).toHaveBeenCalledTimes(1); + }); + + it('should make a patch request for update file', async () => { + mockHttpClient.patch.mockReturnValue(of({})); + + await service.update('fileId', []); + + expect(mockHttpClient.patch).toHaveBeenCalledTimes(1); + expect(mockHttpClient.patch.mock.calls[0][0]).toContain('notice-of-intent-document'); + }); + + it('should show an error toast if updating a file fails', async () => { + mockHttpClient.patch.mockReturnValue(throwError(() => ({}))); + + await service.update('fileId', []); + + expect(mockHttpClient.patch).toHaveBeenCalledTimes(1); + expect(mockToastService.showErrorToast).toHaveBeenCalledTimes(1); + }); +}); diff --git a/portal-frontend/src/app/services/notice-of-intent-document/notice-of-intent-document.service.ts b/portal-frontend/src/app/services/notice-of-intent-document/notice-of-intent-document.service.ts new file mode 100644 index 0000000000..6b51562e5e --- /dev/null +++ b/portal-frontend/src/app/services/notice-of-intent-document/notice-of-intent-document.service.ts @@ -0,0 +1,91 @@ +import { HttpClient } from '@angular/common/http'; +import { Injectable } from '@angular/core'; +import { firstValueFrom } from 'rxjs'; +import { environment } from '../../../environments/environment'; +import { DOCUMENT_SOURCE, DOCUMENT_TYPE } from '../../shared/dto/document.dto'; +import { OverlaySpinnerService } from '../../shared/overlay-spinner/overlay-spinner.service'; +import { DocumentService } from '../document/document.service'; +import { ToastService } from '../toast/toast.service'; +import { NoticeOfIntentDocumentDto, NoticeOfIntentDocumentUpdateDto } from './notice-of-intent-document.dto'; + +@Injectable({ + providedIn: 'root', +}) +export class NoticeOfIntentDocumentService { + private serviceUrl = `${environment.apiUrl}/notice-of-intent-document`; + + constructor( + private httpClient: HttpClient, + private toastService: ToastService, + private documentService: DocumentService, + private overlayService: OverlaySpinnerService + ) {} + + async attachExternalFile( + fileNumber: string, + file: File, + documentType: DOCUMENT_TYPE | null, + source = DOCUMENT_SOURCE.APPLICANT + ) { + try { + const res = await this.documentService.uploadFile( + fileNumber, + file, + documentType, + source, + `${this.serviceUrl}/application/${fileNumber}/attachExternal` + ); + this.toastService.showSuccessToast('Document uploaded'); + return res; + } catch (e) { + console.error(e); + this.toastService.showErrorToast('Failed to attach document to Application, please try again'); + } + return undefined; + } + + async openFile(fileUuid: string) { + try { + return await firstValueFrom(this.httpClient.get<{ url: string }>(`${this.serviceUrl}/${fileUuid}/open`)); + } catch (e) { + console.error(e); + this.toastService.showErrorToast('Failed to open the document, please try again'); + } + return undefined; + } + + async deleteExternalFile(fileUuid: string) { + try { + this.overlayService.showSpinner(); + await firstValueFrom(this.httpClient.delete(`${this.serviceUrl}/${fileUuid}`)); + this.toastService.showSuccessToast('Document deleted'); + } catch (e) { + console.error(e); + this.toastService.showErrorToast('Failed to delete document, please try again'); + } finally { + this.overlayService.hideSpinner(); + } + } + + async update(fileNumber: string | undefined, updateDtos: NoticeOfIntentDocumentUpdateDto[]) { + try { + await firstValueFrom(this.httpClient.patch(`${this.serviceUrl}/application/${fileNumber}`, updateDtos)); + } catch (e) { + console.error(e); + this.toastService.showErrorToast('Failed to update documents, please try again'); + } + return undefined; + } + + async getByFileId(fileNumber: string) { + try { + return await firstValueFrom( + this.httpClient.get(`${this.serviceUrl}/application/${fileNumber}`) + ); + } catch (e) { + console.error(e); + this.toastService.showErrorToast('Failed to fetch documents, please try again'); + } + return undefined; + } +} diff --git a/portal-frontend/src/app/services/notice-of-intent-owner/notice-of-intent-owner.dto.ts b/portal-frontend/src/app/services/notice-of-intent-owner/notice-of-intent-owner.dto.ts new file mode 100644 index 0000000000..21b23da93c --- /dev/null +++ b/portal-frontend/src/app/services/notice-of-intent-owner/notice-of-intent-owner.dto.ts @@ -0,0 +1,57 @@ +import { BaseCodeDto } from '../../shared/dto/base.dto'; +import { ApplicationDocumentDto } from '../application-document/application-document.dto'; +import { ApplicationParcelDto } from '../application-parcel/application-parcel.dto'; + +export enum OWNER_TYPE { + INDIVIDUAL = 'INDV', + ORGANIZATION = 'ORGZ', + AGENT = 'AGEN', + CROWN = 'CRWN', + GOVERNMENT = 'GOVR', +} + +export interface OwnerTypeDto extends BaseCodeDto { + code: OWNER_TYPE; +} + +export interface NoticeOfIntentOwnerDto { + uuid: string; + noticeOfIntentSubmissionUuid: string; + displayName: string; + firstName: string | null; + lastName: string | null; + organizationName: string | null; + phoneNumber: string | null; + email: string | null; + type: OwnerTypeDto; + corporateSummary?: ApplicationDocumentDto; +} + +export interface NoticeOfIntentOwnerDetailedDto extends NoticeOfIntentOwnerDto { + parcels: ApplicationParcelDto[]; +} + +export interface NoticeOfIntentOwnerUpdateDto { + firstName?: string | null; + lastName?: string | null; + organizationName?: string | null; + phoneNumber: string; + email: string; + typeCode: string; + corporateSummaryUuid?: string | null; +} + +export interface NoticeOfIntentOwnerCreateDto extends NoticeOfIntentOwnerUpdateDto { + noticeOfIntentSubmissionUuid: string; +} + +export interface SetPrimaryContactDto { + firstName?: string; + lastName?: string; + organization?: string; + phoneNumber?: string; + email?: string; + type?: OWNER_TYPE; + ownerUuid?: string; + noticeOfIntentSubmissionUuid: string; +} diff --git a/portal-frontend/src/app/services/notice-of-intent-owner/notice-of-intent-owner.service.spec.ts b/portal-frontend/src/app/services/notice-of-intent-owner/notice-of-intent-owner.service.spec.ts new file mode 100644 index 0000000000..236396e06e --- /dev/null +++ b/portal-frontend/src/app/services/notice-of-intent-owner/notice-of-intent-owner.service.spec.ts @@ -0,0 +1,189 @@ +import { HttpClient } from '@angular/common/http'; +import { TestBed } from '@angular/core/testing'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { of, throwError } from 'rxjs'; +import { DocumentService } from '../document/document.service'; +import { ToastService } from '../toast/toast.service'; + +import { NoticeOfIntentOwnerService } from './notice-of-intent-owner.service'; + +describe('NoticeOfIntentOwnerService', () => { + let service: NoticeOfIntentOwnerService; + let mockHttpClient: DeepMocked; + let mockToastService: DeepMocked; + let mockDocumentService: DeepMocked; + + let fileId = '123'; + + beforeEach(() => { + mockHttpClient = createMock(); + mockToastService = createMock(); + mockDocumentService = createMock(); + + TestBed.configureTestingModule({ + providers: [ + { + provide: HttpClient, + useValue: mockHttpClient, + }, + { + provide: ToastService, + useValue: mockToastService, + }, + { + provide: DocumentService, + useValue: mockDocumentService, + }, + ], + }); + service = TestBed.inject(NoticeOfIntentOwnerService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); + + it('should make a get request for loading owners', async () => { + mockHttpClient.get.mockReturnValue(of({})); + + await service.fetchBySubmissionId(fileId); + + expect(mockHttpClient.get).toHaveBeenCalledTimes(1); + expect(mockHttpClient.get.mock.calls[0][0]).toContain('notice-of-intent-owner'); + }); + + it('should show an error toast if getting owners fails', async () => { + mockHttpClient.get.mockReturnValue(throwError(() => ({}))); + + await service.fetchBySubmissionId(fileId); + + expect(mockHttpClient.get).toHaveBeenCalledTimes(1); + expect(mockToastService.showErrorToast).toHaveBeenCalledTimes(1); + }); + + it('should make a post request for create', async () => { + mockHttpClient.post.mockReturnValue(of({})); + + await service.create({ + noticeOfIntentSubmissionUuid: '', + email: '', + phoneNumber: '', + typeCode: '', + }); + + expect(mockHttpClient.post).toHaveBeenCalledTimes(1); + expect(mockHttpClient.post.mock.calls[0][0]).toContain('notice-of-intent-owner'); + }); + + it('should show an error toast if creating owner fails', async () => { + mockHttpClient.post.mockReturnValue(throwError(() => ({}))); + + await service.create({ + noticeOfIntentSubmissionUuid: '', + email: '', + phoneNumber: '', + typeCode: '', + }); + + expect(mockHttpClient.post).toHaveBeenCalledTimes(1); + expect(mockToastService.showErrorToast).toHaveBeenCalledTimes(1); + }); + + it('should make a patch request for update', async () => { + mockHttpClient.patch.mockReturnValue(of({})); + + await service.update('', { + email: '', + phoneNumber: '', + typeCode: '', + }); + + expect(mockHttpClient.patch).toHaveBeenCalledTimes(1); + expect(mockHttpClient.patch.mock.calls[0][0]).toContain('notice-of-intent-owner'); + }); + + it('should show an error toast if updating owner fails', async () => { + mockHttpClient.patch.mockReturnValue(throwError(() => ({}))); + + await service.update('', { + email: '', + phoneNumber: '', + typeCode: '', + }); + + expect(mockHttpClient.patch).toHaveBeenCalledTimes(1); + expect(mockToastService.showErrorToast).toHaveBeenCalledTimes(1); + }); + + it('should make a delete request for delete', async () => { + mockHttpClient.delete.mockReturnValue(of({})); + + await service.delete(''); + + expect(mockHttpClient.delete).toHaveBeenCalledTimes(1); + expect(mockHttpClient.delete.mock.calls[0][0]).toContain('notice-of-intent-owner'); + }); + + it('should show an error toast if delete owner fails', async () => { + mockHttpClient.delete.mockReturnValue(throwError(() => ({}))); + + await service.delete(''); + + expect(mockHttpClient.delete).toHaveBeenCalledTimes(1); + expect(mockToastService.showErrorToast).toHaveBeenCalledTimes(1); + }); + + it('should make a post request for removeFromParcel', async () => { + mockHttpClient.post.mockReturnValue(of({})); + + await service.removeFromParcel('', ''); + + expect(mockHttpClient.post).toHaveBeenCalledTimes(1); + expect(mockHttpClient.post.mock.calls[0][0]).toContain('notice-of-intent-owner'); + }); + + it('should show an error toast if removeFromParcel', async () => { + mockHttpClient.post.mockReturnValue(throwError(() => ({}))); + + await service.removeFromParcel('', ''); + + expect(mockHttpClient.post).toHaveBeenCalledTimes(1); + expect(mockToastService.showErrorToast).toHaveBeenCalledTimes(1); + }); + + it('should make a post request for linkToParcel', async () => { + mockHttpClient.post.mockReturnValue(of({})); + + await service.linkToParcel('', ''); + + expect(mockHttpClient.post).toHaveBeenCalledTimes(1); + expect(mockHttpClient.post.mock.calls[0][0]).toContain('notice-of-intent-owner'); + }); + + it('should show an error toast if linkToParcel', async () => { + mockHttpClient.post.mockReturnValue(throwError(() => ({}))); + + await service.linkToParcel('', ''); + + expect(mockHttpClient.post).toHaveBeenCalledTimes(1); + expect(mockToastService.showErrorToast).toHaveBeenCalledTimes(1); + }); + + it('should make a post request for setPrimaryContact', async () => { + mockHttpClient.post.mockReturnValue(of({})); + + await service.setPrimaryContact({ noticeOfIntentSubmissionUuid: '' }); + + expect(mockHttpClient.post).toHaveBeenCalledTimes(1); + expect(mockHttpClient.post.mock.calls[0][0]).toContain('notice-of-intent-owner'); + }); + + it('should show an error toast if setPrimaryContact', async () => { + mockHttpClient.post.mockReturnValue(throwError(() => ({}))); + + await service.setPrimaryContact({ noticeOfIntentSubmissionUuid: '' }); + + expect(mockHttpClient.post).toHaveBeenCalledTimes(1); + expect(mockToastService.showErrorToast).toHaveBeenCalledTimes(1); + }); +}); diff --git a/portal-frontend/src/app/services/notice-of-intent-owner/notice-of-intent-owner.service.ts b/portal-frontend/src/app/services/notice-of-intent-owner/notice-of-intent-owner.service.ts new file mode 100644 index 0000000000..92abf5b9e6 --- /dev/null +++ b/portal-frontend/src/app/services/notice-of-intent-owner/notice-of-intent-owner.service.ts @@ -0,0 +1,144 @@ +import { HttpClient } from '@angular/common/http'; +import { Injectable } from '@angular/core'; +import { firstValueFrom } from 'rxjs'; +import { environment } from '../../../environments/environment'; +import { DOCUMENT_SOURCE, DOCUMENT_TYPE } from '../../shared/dto/document.dto'; +import { DocumentService } from '../document/document.service'; +import { ToastService } from '../toast/toast.service'; +import { + NoticeOfIntentOwnerCreateDto, + NoticeOfIntentOwnerDto, + NoticeOfIntentOwnerUpdateDto, + SetPrimaryContactDto, +} from './notice-of-intent-owner.dto'; + +@Injectable({ + providedIn: 'root', +}) +export class NoticeOfIntentOwnerService { + private serviceUrl = `${environment.apiUrl}/notice-of-intent-owner`; + + constructor( + private httpClient: HttpClient, + private toastService: ToastService, + private documentService: DocumentService + ) {} + + async fetchBySubmissionId(submissionUuid: string) { + try { + return await firstValueFrom( + this.httpClient.get(`${this.serviceUrl}/submission/${submissionUuid}`) + ); + } catch (e) { + console.error(e); + this.toastService.showErrorToast('Failed to load Owners, please try again later'); + } + return undefined; + } + + async create(dto: NoticeOfIntentOwnerCreateDto) { + try { + const res = await firstValueFrom(this.httpClient.post(`${this.serviceUrl}`, dto)); + this.toastService.showSuccessToast('Owner created'); + return res; + } catch (e) { + console.error(e); + this.toastService.showErrorToast('Failed to create Owner, please try again later'); + return undefined; + } + } + + async update(uuid: string, updateDto: NoticeOfIntentOwnerUpdateDto) { + try { + const res = await firstValueFrom( + this.httpClient.patch(`${this.serviceUrl}/${uuid}`, updateDto) + ); + this.toastService.showSuccessToast('Owner saved'); + return res; + } catch (e) { + console.error(e); + this.toastService.showErrorToast('Failed to update Owner, please try again later'); + return undefined; + } + } + + async setPrimaryContact(updateDto: SetPrimaryContactDto) { + try { + const res = await firstValueFrom( + this.httpClient.post(`${this.serviceUrl}/setPrimaryContact`, updateDto) + ); + this.toastService.showSuccessToast('Application saved'); + return res; + } catch (e) { + console.error(e); + this.toastService.showErrorToast('Failed to update Application, please try again later'); + return undefined; + } + } + + async delete(uuid: string) { + try { + const result = await firstValueFrom(this.httpClient.delete(`${this.serviceUrl}/${uuid}`)); + this.toastService.showSuccessToast('Owner deleted'); + return result; + } catch (e) { + console.error(e); + this.toastService.showErrorToast('Failed to delete Owner, please try again'); + } + return undefined; + } + + async removeFromParcel(ownerUuid: string, parcelUuid: string) { + try { + const result = await firstValueFrom( + this.httpClient.post(`${this.serviceUrl}/${ownerUuid}/unlink/${parcelUuid}`, {}) + ); + this.toastService.showSuccessToast('Owner removed from parcel'); + return result; + } catch (e) { + console.error(e); + this.toastService.showErrorToast('Failed to remove Owner, please try again'); + } + return undefined; + } + + async linkToParcel(ownerUuid: any, parcelUuid: string) { + try { + const result = await firstValueFrom( + this.httpClient.post(`${this.serviceUrl}/${ownerUuid}/link/${parcelUuid}`, {}) + ); + this.toastService.showSuccessToast('Owner linked to parcel'); + return result; + } catch (e) { + console.error(e); + this.toastService.showErrorToast('Failed to link Owner, please try again'); + } + return undefined; + } + + sortOwners(a: NoticeOfIntentOwnerDto, b: NoticeOfIntentOwnerDto) { + if (a.displayName < b.displayName) { + return -1; + } + if (a.displayName > b.displayName) { + return 1; + } + return 0; + } + + async uploadCorporateSummary(applicationFileId: string, file: File) { + try { + return await this.documentService.uploadFile<{ uuid: string }>( + applicationFileId, + file, + DOCUMENT_TYPE.CORPORATE_SUMMARY, + DOCUMENT_SOURCE.APPLICANT, + `${this.serviceUrl}/attachCorporateSummary` + ); + } catch (e) { + console.error(e); + this.toastService.showErrorToast('Failed to attach document to Owner, please try again'); + } + return undefined; + } +} diff --git a/portal-frontend/src/app/services/notice-of-intent-parcel/notice-of-intent-parcel.dto.ts b/portal-frontend/src/app/services/notice-of-intent-parcel/notice-of-intent-parcel.dto.ts new file mode 100644 index 0000000000..7b5e10b9cd --- /dev/null +++ b/portal-frontend/src/app/services/notice-of-intent-parcel/notice-of-intent-parcel.dto.ts @@ -0,0 +1,29 @@ +import { BaseCodeDto } from '../../shared/dto/base.dto'; +import { ApplicationDocumentDto } from '../application-document/application-document.dto'; +import { NoticeOfIntentOwnerDto } from '../notice-of-intent-owner/notice-of-intent-owner.dto'; + +export interface NoticeOfIntentParcelUpdateDto { + uuid: string; + pid?: string | null; + pin?: string | null; + civicAddress?: string | null; + legalDescription?: string | null; + mapAreaHectares?: string | null; + purchasedDate?: number | null; + isFarm?: boolean | null; + ownershipTypeCode?: string | null; + crownLandOwnerType?: string | null; + isConfirmedByApplicant: boolean; + ownerUuids: string[] | null; +} + +export interface NoticeOfIntentParcelDto extends Omit { + ownershipType?: BaseCodeDto; + owners: NoticeOfIntentOwnerDto[]; + certificateOfTitle?: ApplicationDocumentDto; +} + +export enum PARCEL_OWNERSHIP_TYPE { + FEE_SIMPLE = 'SMPL', + CROWN = 'CRWN', +} diff --git a/portal-frontend/src/app/services/notice-of-intent-parcel/notice-of-intent-parcel.service.spec.ts b/portal-frontend/src/app/services/notice-of-intent-parcel/notice-of-intent-parcel.service.spec.ts new file mode 100644 index 0000000000..735991e006 --- /dev/null +++ b/portal-frontend/src/app/services/notice-of-intent-parcel/notice-of-intent-parcel.service.spec.ts @@ -0,0 +1,102 @@ +import { HttpClient } from '@angular/common/http'; +import { TestBed } from '@angular/core/testing'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { ToastService } from '../toast/toast.service'; + +import { of, throwError } from 'rxjs'; +import { DocumentService } from '../document/document.service'; +import { NoticeOfIntentParcelUpdateDto } from './notice-of-intent-parcel.dto'; +import { NoticeOfIntentParcelService } from './notice-of-intent-parcel.service'; + +describe('NoticeOfIntentParcelService', () => { + let service: NoticeOfIntentParcelService; + let mockHttpClient: DeepMocked; + let mockDocumentService: DeepMocked; + let mockToastService: DeepMocked; + + const mockUuid = 'fake_uuid'; + + beforeEach(() => { + mockHttpClient = createMock(); + mockToastService = createMock(); + + TestBed.configureTestingModule({ + imports: [], + providers: [ + { + provide: ToastService, + useValue: mockToastService, + }, + { + provide: HttpClient, + useValue: mockHttpClient, + }, + { + provide: DocumentService, + useValue: mockDocumentService, + }, + ], + }); + service = TestBed.inject(NoticeOfIntentParcelService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); + + it('should make a get request for loading parcels', async () => { + mockHttpClient.get.mockReturnValue(of({})); + + await service.fetchBySubmissionUuid(mockUuid); + + expect(mockHttpClient.get).toHaveBeenCalledTimes(1); + expect(mockHttpClient.get.mock.calls[0][0]).toContain('notice-of-intent-parcel'); + }); + + it('should show an error toast if getting parcel fails', async () => { + mockHttpClient.get.mockReturnValue(throwError(() => ({}))); + + await service.fetchBySubmissionUuid(mockUuid); + + expect(mockHttpClient.get).toHaveBeenCalledTimes(1); + expect(mockToastService.showErrorToast).toHaveBeenCalledTimes(1); + }); + + it('should make a post request for create', async () => { + mockHttpClient.post.mockReturnValue(of({})); + + await service.create(mockUuid); + + expect(mockHttpClient.post).toHaveBeenCalledTimes(1); + expect(mockHttpClient.post.mock.calls[0][0]).toContain('notice-of-intent-parcel'); + }); + + it('should show an error toast if creating a parcel fails', async () => { + mockHttpClient.post.mockReturnValue(throwError(() => ({}))); + + await service.create(mockUuid); + + expect(mockHttpClient.post).toHaveBeenCalledTimes(1); + expect(mockToastService.showErrorToast).toHaveBeenCalledTimes(1); + }); + + it('should make a put request for update', async () => { + mockHttpClient.put.mockReturnValue(of({})); + let mockUuid = 'fake'; + + await service.update([{ uuid: mockUuid }] as NoticeOfIntentParcelUpdateDto[]); + + expect(mockHttpClient.put).toHaveBeenCalledTimes(1); + expect(mockToastService.showSuccessToast).toHaveBeenCalledTimes(1); + expect(mockHttpClient.put.mock.calls[0][0]).toContain('notice-of-intent-parcel'); + }); + + it('should show an error toast if updating a parcel fails', async () => { + mockHttpClient.put.mockReturnValue(throwError(() => ({}))); + + await service.update([{}] as NoticeOfIntentParcelUpdateDto[]); + + expect(mockHttpClient.put).toHaveBeenCalledTimes(1); + expect(mockToastService.showErrorToast).toHaveBeenCalledTimes(1); + }); +}); diff --git a/portal-frontend/src/app/services/notice-of-intent-parcel/notice-of-intent-parcel.service.ts b/portal-frontend/src/app/services/notice-of-intent-parcel/notice-of-intent-parcel.service.ts new file mode 100644 index 0000000000..b468fd8cf7 --- /dev/null +++ b/portal-frontend/src/app/services/notice-of-intent-parcel/notice-of-intent-parcel.service.ts @@ -0,0 +1,107 @@ +import { HttpClient } from '@angular/common/http'; +import { Injectable } from '@angular/core'; +import { firstValueFrom } from 'rxjs'; +import { environment } from '../../../environments/environment'; +import { DOCUMENT_SOURCE, DOCUMENT_TYPE } from '../../shared/dto/document.dto'; +import { OverlaySpinnerService } from '../../shared/overlay-spinner/overlay-spinner.service'; +import { DocumentService } from '../document/document.service'; +import { NoticeOfIntentDocumentDto } from '../notice-of-intent-document/notice-of-intent-document.dto'; +import { ToastService } from '../toast/toast.service'; +import { NoticeOfIntentParcelDto, NoticeOfIntentParcelUpdateDto } from './notice-of-intent-parcel.dto'; + +@Injectable({ + providedIn: 'root', +}) +export class NoticeOfIntentParcelService { + private serviceUrl = `${environment.apiUrl}/notice-of-intent-parcel`; + + constructor( + private httpClient: HttpClient, + private toastService: ToastService, + private documentService: DocumentService, + private overlayService: OverlaySpinnerService + ) {} + + async fetchBySubmissionUuid(submissionUuid: string) { + try { + return await firstValueFrom( + this.httpClient.get(`${this.serviceUrl}/submission/${submissionUuid}`) + ); + } catch (e) { + console.error(e); + this.toastService.showErrorToast('Failed to load Parcel, please try again later'); + } + return undefined; + } + + async create(noticeOfIntentSubmissionUuid: string, ownerUuid?: string) { + try { + return await firstValueFrom( + this.httpClient.post(`${this.serviceUrl}`, { + noticeOfIntentSubmissionUuid, + ownerUuid, + }) + ); + } catch (e) { + console.error(e); + this.toastService.showErrorToast('Failed to create Parcel, please try again later'); + return undefined; + } + } + + async update(updateDtos: NoticeOfIntentParcelUpdateDto[]) { + try { + this.overlayService.showSpinner(); + const formattedDtos = updateDtos.map((e) => ({ + ...e, + mapAreaHectares: e.mapAreaHectares ? parseFloat(e.mapAreaHectares) : e.mapAreaHectares, + })); + + const result = await firstValueFrom( + this.httpClient.put(`${this.serviceUrl}`, formattedDtos) + ); + + this.toastService.showSuccessToast('Parcel saved'); + return result; + } catch (e) { + console.error(e); + this.toastService.showErrorToast('Failed to update Parcel, please try again later'); + } finally { + this.overlayService.hideSpinner(); + } + return undefined; + } + + async attachCertificateOfTitle(fileId: string, parcelUuid: string, file: File) { + try { + const document = await this.documentService.uploadFile( + fileId, + file, + DOCUMENT_TYPE.CERTIFICATE_OF_TITLE, + DOCUMENT_SOURCE.APPLICANT, + `${this.serviceUrl}/${parcelUuid}/attachCertificateOfTitle` + ); + this.toastService.showSuccessToast('Document uploaded'); + return document; + } catch (e) { + console.error(e); + this.toastService.showErrorToast('Failed to attach document to Parcel, please try again'); + } + return undefined; + } + + async deleteMany(parcelUuids: string[]) { + try { + this.overlayService.showSpinner(); + const result = await firstValueFrom(this.httpClient.delete(`${this.serviceUrl}`, { body: parcelUuids })); + this.toastService.showSuccessToast('Parcel deleted'); + return result; + } catch (e) { + console.error(e); + this.toastService.showErrorToast('Failed to delete Parcel, please try again'); + } finally { + this.overlayService.hideSpinner(); + } + return undefined; + } +} diff --git a/portal-frontend/src/app/services/notice-of-intent-submission/notice-of-intent-submission.dto.ts b/portal-frontend/src/app/services/notice-of-intent-submission/notice-of-intent-submission.dto.ts index cc747f826b..242403d17c 100644 --- a/portal-frontend/src/app/services/notice-of-intent-submission/notice-of-intent-submission.dto.ts +++ b/portal-frontend/src/app/services/notice-of-intent-submission/notice-of-intent-submission.dto.ts @@ -1,4 +1,5 @@ import { BaseCodeDto } from '../../shared/dto/base.dto'; +import { NoticeOfIntentOwnerDto } from '../notice-of-intent-owner/notice-of-intent-owner.dto'; export enum NOI_SUBMISSION_STATUS { IN_PROGRESS = 'PROG', @@ -32,6 +33,7 @@ export interface NoticeOfIntentSubmissionDto { type: string; status: NoticeOfIntentSubmissionStatusDto; submissionStatuses: NoticeOfIntentSubmissionToSubmissionStatusDto[]; + owners: NoticeOfIntentOwnerDto[]; canEdit: boolean; canView: boolean; } diff --git a/portal-frontend/src/app/shared/dto/document.dto.ts b/portal-frontend/src/app/shared/dto/document.dto.ts new file mode 100644 index 0000000000..e2dfebeef6 --- /dev/null +++ b/portal-frontend/src/app/shared/dto/document.dto.ts @@ -0,0 +1,41 @@ +import { BaseCodeDto } from './base.dto'; + +export enum DOCUMENT_TYPE { + //ALCS + DECISION_DOCUMENT = 'DPAC', + OTHER = 'OTHR', + + //Government Review + RESOLUTION_DOCUMENT = 'RESO', + STAFF_REPORT = 'STFF', + + //Applicant Uploaded + CORPORATE_SUMMARY = 'CORS', + PROFESSIONAL_REPORT = 'PROR', + PHOTOGRAPH = 'PHTO', + AUTHORIZATION_LETTER = 'AAGR', + CERTIFICATE_OF_TITLE = 'CERT', + + //App Documents + SERVING_NOTICE = 'POSN', + PROPOSAL_MAP = 'PRSK', + HOMESITE_SEVERANCE = 'HOME', + CROSS_SECTIONS = 'SPCS', + RECLAMATION_PLAN = 'RECP', + NOTICE_OF_WORK = 'NOWE', + PROOF_OF_SIGNAGE = 'POSA', + REPORT_OF_PUBLIC_HEARING = 'ROPH', + PROOF_OF_ADVERTISING = 'POAA', +} + +export enum DOCUMENT_SOURCE { + APPLICANT = 'Applicant', + ALC = 'ALC', + LFNG = 'L/FNG', + AFFECTED_PARTY = 'Affected Party', + PUBLIC = 'Public', +} + +export interface DocumentTypeDto extends BaseCodeDto { + code: DOCUMENT_TYPE; +} diff --git a/portal-frontend/src/app/shared/dto/owner.dto.ts b/portal-frontend/src/app/shared/dto/owner.dto.ts new file mode 100644 index 0000000000..9e1d82879a --- /dev/null +++ b/portal-frontend/src/app/shared/dto/owner.dto.ts @@ -0,0 +1,13 @@ +import { BaseCodeDto } from './base.dto'; + +export enum OWNER_TYPE { + INDIVIDUAL = 'INDV', + ORGANIZATION = 'ORGZ', + AGENT = 'AGEN', + CROWN = 'CRWN', + GOVERNMENT = 'GOVR', +} + +export interface OwnerTypeDto extends BaseCodeDto { + code: OWNER_TYPE; +} diff --git a/services/apps/alcs/src/alcs/application/application-document/application-document.service.ts b/services/apps/alcs/src/alcs/application/application-document/application-document.service.ts index c91b4a0d59..f93e8d68c2 100644 --- a/services/apps/alcs/src/alcs/application/application-document/application-document.service.ts +++ b/services/apps/alcs/src/alcs/application/application-document/application-document.service.ts @@ -42,7 +42,7 @@ export class ApplicationDocumentService { @InjectRepository(ApplicationDocument) private applicationDocumentRepository: Repository, @InjectRepository(DocumentCode) - private applicationDocumentCodeRepository: Repository, + private documentCodeRepository: Repository, ) {} async attachDocument({ @@ -253,7 +253,7 @@ export class ApplicationDocumentService { } async fetchTypes() { - return await this.applicationDocumentCodeRepository.find(); + return await this.documentCodeRepository.find(); } async update({ diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.controller.spec.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.controller.spec.ts index 84513e6ff9..3891462cba 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.controller.spec.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.controller.spec.ts @@ -9,9 +9,7 @@ import { NoticeOfIntentProfile } from '../../../common/automapper/notice-of-inte import { DOCUMENT_TYPE } from '../../../document/document-code.entity'; import { DOCUMENT_SOURCE } from '../../../document/document.dto'; import { Document } from '../../../document/document.entity'; -import { ApplicationOwner } from '../../../portal/application-submission/application-owner/application-owner.entity'; import { ApplicationOwnerService } from '../../../portal/application-submission/application-owner/application-owner.service'; -import { ApplicationParcel } from '../../../portal/application-submission/application-parcel/application-parcel.entity'; import { ApplicationParcelService } from '../../../portal/application-submission/application-parcel/application-parcel.service'; import { User } from '../../../user/user.entity'; import { CodeService } from '../../code/code.service'; diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.service.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.service.ts index bd0039567e..91509763b4 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.service.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.service.ts @@ -1,5 +1,9 @@ import { MultipartFile } from '@fastify/multipart'; -import { Injectable, NotFoundException } from '@nestjs/common'; +import { + BadRequestException, + Injectable, + NotFoundException, +} from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { ArrayOverlap, @@ -16,6 +20,7 @@ import { DOCUMENT_SYSTEM, } from '../../../document/document.dto'; import { DocumentService } from '../../../document/document.service'; +import { PortalNoticeOfIntentDocumentUpdateDto } from '../../../portal/notice-of-intent-document/notice-of-intent-document.dto'; import { User } from '../../../user/user.entity'; import { NoticeOfIntentService } from '../notice-of-intent.service'; import { @@ -197,37 +202,36 @@ export class NoticeOfIntentDocumentService { ); return this.get(savedDocument.uuid); } - // TODO: Re-enable as part of creating Step 7 - // async updateDescriptionAndType( - // updates: PortalNoticeOfIntentDocumentUpdateDto[], - // noticeOfIntentUuid: string, - // ) { - // const results: NoticeOfIntentDocument[] = []; - // for (const update of updates) { - // const file = await this.noticeOfIntentDocumentRepository.findOne({ - // where: { - // uuid: update.uuid, - // noticeOfIntentUuid, - // }, - // relations: { - // document: true, - // }, - // }); - // if (!file) { - // throw new BadRequestException( - // 'Failed to find file linked to provided noticeOfIntent', - // ); - // } - // - // file.typeCode = update.type; - // file.description = update.description; - // const updatedFile = await this.noticeOfIntentDocumentRepository.save( - // file, - // ); - // results.push(updatedFile); - // } - // return results; - // } + async updateDescriptionAndType( + updates: PortalNoticeOfIntentDocumentUpdateDto[], + noticeOfIntentUuid: string, + ) { + const results: NoticeOfIntentDocument[] = []; + for (const update of updates) { + const file = await this.noticeOfIntentDocumentRepository.findOne({ + where: { + uuid: update.uuid, + noticeOfIntentUuid, + }, + relations: { + document: true, + }, + }); + if (!file) { + throw new BadRequestException( + 'Failed to find file linked to provided noticeOfIntent', + ); + } + + file.typeCode = update.type; + file.description = update.description; + const updatedFile = await this.noticeOfIntentDocumentRepository.save( + file, + ); + results.push(updatedFile); + } + return results; + } async deleteByType(documentType: DOCUMENT_TYPE, noticeOfIntentUuid: string) { const documents = await this.noticeOfIntentDocumentRepository.find({ diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.ts index 876e7e05d3..a33b7ba440 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.ts @@ -341,10 +341,10 @@ export class NoticeOfIntentService { fileNumber, }, select: { - fileNumber: true, + uuid: true, }, }); - return noticeOfIntent.fileNumber; + return noticeOfIntent.uuid; } async submit(createDto: CreateNoticeOfIntentServiceDto) { diff --git a/services/apps/alcs/src/common/automapper/application-owner.automapper.profile.ts b/services/apps/alcs/src/common/automapper/application-owner.automapper.profile.ts index f980f99fb6..5b357761a8 100644 --- a/services/apps/alcs/src/common/automapper/application-owner.automapper.profile.ts +++ b/services/apps/alcs/src/common/automapper/application-owner.automapper.profile.ts @@ -3,11 +3,10 @@ import { AutomapperProfile, InjectMapper } from '@automapper/nestjs'; import { Injectable } from '@nestjs/common'; import { ApplicationDocumentDto } from '../../alcs/application/application-document/application-document.dto'; import { ApplicationDocument } from '../../alcs/application/application-document/application-document.entity'; -import { ApplicationOwnerType } from '../../portal/application-submission/application-owner/application-owner-type/application-owner-type.entity'; +import { OwnerType, OwnerTypeDto } from '../owner-type/owner-type.entity'; import { ApplicationOwnerDetailedDto, ApplicationOwnerDto, - ApplicationOwnerTypeDto, } from '../../portal/application-submission/application-owner/application-owner.dto'; import { ApplicationOwner } from '../../portal/application-submission/application-owner/application-owner.entity'; import { ApplicationParcelDto } from '../../portal/application-submission/application-parcel/application-parcel.dto'; @@ -77,7 +76,7 @@ export class ApplicationOwnerProfile extends AutomapperProfile { ), ); - createMap(mapper, ApplicationOwnerType, ApplicationOwnerTypeDto); + createMap(mapper, OwnerType, OwnerTypeDto); }; } } diff --git a/services/apps/alcs/src/common/automapper/notice-of-intent-owner.automapper.profile.ts b/services/apps/alcs/src/common/automapper/notice-of-intent-owner.automapper.profile.ts new file mode 100644 index 0000000000..ad4734b3fe --- /dev/null +++ b/services/apps/alcs/src/common/automapper/notice-of-intent-owner.automapper.profile.ts @@ -0,0 +1,82 @@ +import { createMap, forMember, mapFrom, Mapper } from '@automapper/core'; +import { AutomapperProfile, InjectMapper } from '@automapper/nestjs'; +import { Injectable } from '@nestjs/common'; +import { NoticeOfIntentDocumentDto } from '../../alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.dto'; +import { NoticeOfIntentDocument } from '../../alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.entity'; +import { + NoticeOfIntentOwnerDetailedDto, + NoticeOfIntentOwnerDto, +} from '../../portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.dto'; +import { NoticeOfIntentOwner } from '../../portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.entity'; +import { NoticeOfIntentParcelDto } from '../../portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.dto'; +import { NoticeOfIntentParcel } from '../../portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.entity'; +import { OwnerType, OwnerTypeDto } from '../owner-type/owner-type.entity'; + +@Injectable() +export class NoticeOfIntentOwnerProfile extends AutomapperProfile { + constructor(@InjectMapper() mapper: Mapper) { + super(mapper); + } + + override get profile() { + return (mapper) => { + createMap( + mapper, + NoticeOfIntentOwner, + NoticeOfIntentOwnerDto, + forMember( + (pd) => pd.displayName, + mapFrom((p) => `${p.firstName} ${p.lastName}`), + ), + forMember( + (pd) => pd.corporateSummary, + mapFrom((p) => + p.corporateSummary + ? this.mapper.map( + p.corporateSummary, + NoticeOfIntentDocument, + NoticeOfIntentDocumentDto, + ) + : undefined, + ), + ), + ); + + createMap( + mapper, + NoticeOfIntentOwner, + NoticeOfIntentOwnerDetailedDto, + forMember( + (pd) => pd.displayName, + mapFrom((p) => `${p.firstName} ${p.lastName}`), + ), + forMember( + (ad) => ad.parcels, + mapFrom((a) => { + if (a.parcels) { + return this.mapper.mapArray( + a.parcels, + NoticeOfIntentParcel, + NoticeOfIntentParcelDto, + ); + } + }), + ), + forMember( + (pd) => pd.corporateSummary, + mapFrom((p) => + p.corporateSummary + ? this.mapper.map( + p.corporateSummary, + NoticeOfIntentDocument, + NoticeOfIntentDocumentDto, + ) + : undefined, + ), + ), + ); + + createMap(mapper, OwnerType, OwnerTypeDto); + }; + } +} diff --git a/services/apps/alcs/src/common/automapper/notice-of-intent-parcel.automapper.profile.ts b/services/apps/alcs/src/common/automapper/notice-of-intent-parcel.automapper.profile.ts new file mode 100644 index 0000000000..eb57ac85aa --- /dev/null +++ b/services/apps/alcs/src/common/automapper/notice-of-intent-parcel.automapper.profile.ts @@ -0,0 +1,85 @@ +import { createMap, forMember, mapFrom, Mapper } from '@automapper/core'; +import { AutomapperProfile, InjectMapper } from '@automapper/nestjs'; +import { Injectable } from '@nestjs/common'; +import { NoticeOfIntentDocumentDto } from '../../alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.dto'; +import { NoticeOfIntentDocument } from '../../alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.entity'; +import { NoticeOfIntentOwnerDto } from '../../portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.dto'; +import { NoticeOfIntentOwner } from '../../portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.entity'; +import { NoticeOfIntentParcelOwnershipType } from '../../portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel-ownership-type/notice-of-intent-parcel-ownership-type.entity'; +import { + NoticeOfIntentParcelDto, + NoticeOfIntentParcelOwnershipTypeDto, +} from '../../portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.dto'; +import { NoticeOfIntentParcel } from '../../portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.entity'; + +@Injectable() +export class NoticeOfIntentParcelProfile extends AutomapperProfile { + constructor(@InjectMapper() mapper: Mapper) { + super(mapper); + } + + override get profile() { + return (mapper) => { + createMap( + mapper, + NoticeOfIntentParcel, + NoticeOfIntentParcelDto, + forMember( + (pd) => pd.ownershipTypeCode, + mapFrom((p) => p.ownershipTypeCode), + ), + forMember( + (pd) => pd.purchasedDate, + mapFrom((p) => p.purchasedDate?.getTime()), + ), + forMember( + (p) => p.certificateOfTitle, + mapFrom((pd) => { + if (pd.certificateOfTitle) { + return this.mapper.map( + pd.certificateOfTitle, + NoticeOfIntentDocument, + NoticeOfIntentDocumentDto, + ); + } + return; + }), + ), + forMember( + (p) => p.owners, + mapFrom((pd) => { + if (pd.owners) { + return this.mapper.mapArray( + pd.owners, + NoticeOfIntentOwner, + NoticeOfIntentOwnerDto, + ); + } else { + return []; + } + }), + ), + forMember( + (p) => p.ownershipType, + mapFrom((pd) => { + if (pd.ownershipType) { + return this.mapper.map( + pd.ownershipType, + NoticeOfIntentParcelOwnershipType, + NoticeOfIntentParcelOwnershipTypeDto, + ); + } else { + return undefined; + } + }), + ), + ); + + createMap( + mapper, + NoticeOfIntentParcelOwnershipType, + NoticeOfIntentParcelOwnershipTypeDto, + ); + }; + } +} diff --git a/services/apps/alcs/src/common/owner-type/owner-type.entity.ts b/services/apps/alcs/src/common/owner-type/owner-type.entity.ts new file mode 100644 index 0000000000..558d3e31ca --- /dev/null +++ b/services/apps/alcs/src/common/owner-type/owner-type.entity.ts @@ -0,0 +1,23 @@ +import { Entity } from 'typeorm'; +import { BaseCodeDto } from '../dtos/base.dto'; +import { BaseCodeEntity } from '../entities/base.code.entity'; + +export enum OWNER_TYPE { + INDIVIDUAL = 'INDV', + ORGANIZATION = 'ORGZ', + AGENT = 'AGEN', + CROWN = 'CRWN', + GOVERNMENT = 'GOVR', +} + +export class OwnerTypeDto extends BaseCodeDto {} + +@Entity() +export class OwnerType extends BaseCodeEntity { + constructor(data?: Partial) { + super(); + if (data) { + Object.assign(this, data); + } + } +} diff --git a/services/apps/alcs/src/portal/application-submission-draft/application-submission-draft.module.ts b/services/apps/alcs/src/portal/application-submission-draft/application-submission-draft.module.ts index 53cdc35914..fc9d96e259 100644 --- a/services/apps/alcs/src/portal/application-submission-draft/application-submission-draft.module.ts +++ b/services/apps/alcs/src/portal/application-submission-draft/application-submission-draft.module.ts @@ -2,7 +2,7 @@ import { Module } from '@nestjs/common'; import { TypeOrmModule } from '@nestjs/typeorm'; import { ApplicationSubmissionStatusModule } from '../../alcs/application/application-submission-status/application-submission-status.module'; import { ApplicationSubmissionStatusType } from '../../alcs/application/application-submission-status/submission-status-type.entity'; -import { ApplicationOwnerType } from '../application-submission/application-owner/application-owner-type/application-owner-type.entity'; +import { OwnerType } from '../../common/owner-type/owner-type.entity'; import { ApplicationOwner } from '../application-submission/application-owner/application-owner.entity'; import { ApplicationParcelOwnershipType } from '../application-submission/application-parcel/application-parcel-ownership-type/application-parcel-ownership-type.entity'; import { ApplicationParcel } from '../application-submission/application-parcel/application-parcel.entity'; @@ -20,7 +20,7 @@ import { ApplicationSubmissionDraftService } from './application-submission-draf ApplicationParcel, ApplicationParcelOwnershipType, ApplicationOwner, - ApplicationOwnerType, + OwnerType, ]), ApplicationSubmissionModule, PdfGenerationModule, diff --git a/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.spec.ts b/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.spec.ts index cb59406379..370f48ebbd 100644 --- a/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.spec.ts +++ b/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.spec.ts @@ -21,7 +21,7 @@ import { DOCUMENT_SOURCE } from '../../document/document.dto'; import { Document } from '../../document/document.entity'; import { EmailService } from '../../providers/email/email.service'; import { User } from '../../user/user.entity'; -import { ApplicationOwnerType } from '../application-submission/application-owner/application-owner-type/application-owner-type.entity'; +import { OwnerType } from '../../common/owner-type/owner-type.entity'; import { ApplicationOwner } from '../application-submission/application-owner/application-owner.entity'; import { ApplicationSubmissionValidatorService, @@ -253,7 +253,7 @@ describe('ApplicationSubmissionReviewController', () => { new ApplicationOwner({ uuid: 'uuid', email: 'fake-email', - type: new ApplicationOwnerType(), + type: new OwnerType(), }), ], primaryContactOwnerUuid: 'uuid', diff --git a/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.ts b/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.ts index c0d70aa686..ebec8444d1 100644 --- a/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.ts +++ b/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.ts @@ -14,17 +14,17 @@ import { UseGuards, } from '@nestjs/common'; import { generateStatusHtml } from '../../../../../templates/emails/submission-status.template'; -import { LocalGovernment } from '../../alcs/local-government/local-government.entity'; -import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; import { ApplicationDocumentService } from '../../alcs/application/application-document/application-document.service'; -import { ApplicationService } from '../../alcs/application/application.service'; import { ApplicationSubmissionStatusService } from '../../alcs/application/application-submission-status/application-submission-status.service'; import { SUBMISSION_STATUS } from '../../alcs/application/application-submission-status/submission-status.dto'; +import { ApplicationService } from '../../alcs/application/application.service'; +import { LocalGovernment } from '../../alcs/local-government/local-government.entity'; +import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; import { PortalAuthGuard } from '../../common/authorization/portal-auth-guard.service'; +import { OWNER_TYPE } from '../../common/owner-type/owner-type.entity'; import { DOCUMENT_SOURCE } from '../../document/document.dto'; import { EmailService } from '../../providers/email/email.service'; import { User } from '../../user/user.entity'; -import { APPLICATION_OWNER } from '../application-submission/application-owner/application-owner.dto'; import { ApplicationOwner } from '../application-submission/application-owner/application-owner.entity'; import { ApplicationSubmissionValidatorService } from '../application-submission/application-submission-validator.service'; import { ApplicationSubmission } from '../application-submission/application-submission.entity'; @@ -215,7 +215,7 @@ export class ApplicationSubmissionReviewController { if ( creatingGovernment?.uuid === applicationSubmission.localGovernmentUuid && primaryContact && - primaryContact.type.code === APPLICATION_OWNER.GOVERNMENT + primaryContact.type.code === OWNER_TYPE.GOVERNMENT ) { //Copy contact details over to government form when applying to self await this.applicationSubmissionReviewService.update( diff --git a/services/apps/alcs/src/portal/application-submission/application-owner/application-owner-type/application-owner-type.entity.ts b/services/apps/alcs/src/portal/application-submission/application-owner/application-owner-type/application-owner-type.entity.ts deleted file mode 100644 index ecbfbad3a2..0000000000 --- a/services/apps/alcs/src/portal/application-submission/application-owner/application-owner-type/application-owner-type.entity.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { Entity } from 'typeorm'; -import { BaseCodeEntity } from '../../../../common/entities/base.code.entity'; - -@Entity() -export class ApplicationOwnerType extends BaseCodeEntity { - constructor(data?: Partial) { - super(); - if (data) { - Object.assign(this, data); - } - } -} diff --git a/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.controller.spec.ts b/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.controller.spec.ts index 8aa0a7ddcb..d4decd8739 100644 --- a/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.controller.spec.ts +++ b/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.controller.spec.ts @@ -7,12 +7,14 @@ import { ClsService } from 'nestjs-cls'; import { mockKeyCloakProviders } from '../../../../test/mocks/mockTypes'; import { ApplicationDocumentService } from '../../../alcs/application/application-document/application-document.service'; import { ApplicationOwnerProfile } from '../../../common/automapper/application-owner.automapper.profile'; +import { + OWNER_TYPE, + OwnerType, +} from '../../../common/owner-type/owner-type.entity'; import { DocumentService } from '../../../document/document.service'; import { ApplicationSubmission } from '../application-submission.entity'; import { ApplicationSubmissionService } from '../application-submission.service'; -import { ApplicationOwnerType } from './application-owner-type/application-owner-type.entity'; import { ApplicationOwnerController } from './application-owner.controller'; -import { APPLICATION_OWNER } from './application-owner.dto'; import { ApplicationOwner } from './application-owner.entity'; import { ApplicationOwnerService } from './application-owner.service'; @@ -282,8 +284,8 @@ describe('ApplicationOwnerController', () => { it('should set the owner and delete agents when using a non-agent owner', async () => { mockAppOwnerService.getOwner.mockResolvedValue( new ApplicationOwner({ - type: new ApplicationOwnerType({ - code: APPLICATION_OWNER.INDIVIDUAL, + type: new OwnerType({ + code: OWNER_TYPE.INDIVIDUAL, }), }), ); @@ -312,8 +314,8 @@ describe('ApplicationOwnerController', () => { it('should update the agent owner when calling set primary contact', async () => { mockAppOwnerService.getOwner.mockResolvedValue( new ApplicationOwner({ - type: new ApplicationOwnerType({ - code: APPLICATION_OWNER.AGENT, + type: new OwnerType({ + code: OWNER_TYPE.AGENT, }), }), ); diff --git a/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.controller.ts b/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.controller.ts index 7a0cbe42fe..508340d81a 100644 --- a/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.controller.ts +++ b/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.controller.ts @@ -12,10 +12,11 @@ import { Req, UseGuards, } from '@nestjs/common'; -import { DOCUMENT_TYPE } from '../../../document/document-code.entity'; import { VISIBILITY_FLAG } from '../../../alcs/application/application-document/application-document.entity'; import { ApplicationDocumentService } from '../../../alcs/application/application-document/application-document.service'; import { PortalAuthGuard } from '../../../common/authorization/portal-auth-guard.service'; +import { OWNER_TYPE } from '../../../common/owner-type/owner-type.entity'; +import { DOCUMENT_TYPE } from '../../../document/document-code.entity'; import { DOCUMENT_SOURCE, DOCUMENT_SYSTEM, @@ -23,7 +24,6 @@ import { import { DocumentService } from '../../../document/document.service'; import { ApplicationSubmissionService } from '../application-submission.service'; import { - APPLICATION_OWNER, ApplicationOwnerCreateDto, ApplicationOwnerDto, ApplicationOwnerUpdateDto, @@ -133,7 +133,7 @@ export class ApplicationOwnerController { dto: ApplicationOwnerUpdateDto | ApplicationOwnerCreateDto, ) { if ( - dto.typeCode === APPLICATION_OWNER.INDIVIDUAL && + dto.typeCode === OWNER_TYPE.INDIVIDUAL && (!dto.firstName || !dto.lastName) ) { throw new BadRequestException( @@ -141,10 +141,7 @@ export class ApplicationOwnerController { ); } - if ( - dto.typeCode === APPLICATION_OWNER.ORGANIZATION && - !dto.organizationName - ) { + if (dto.typeCode === OWNER_TYPE.ORGANIZATION && !dto.organizationName) { throw new BadRequestException( 'Organizations must have an organizationName', ); @@ -184,8 +181,8 @@ export class ApplicationOwnerController { ); if ( - primaryContactOwner.type.code === APPLICATION_OWNER.AGENT || - primaryContactOwner.type.code === APPLICATION_OWNER.GOVERNMENT + primaryContactOwner.type.code === OWNER_TYPE.AGENT || + primaryContactOwner.type.code === OWNER_TYPE.GOVERNMENT ) { //Update Fields for non parcel owners await this.ownerService.update(primaryContactOwner.uuid, { diff --git a/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.dto.ts b/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.dto.ts index 10ec1bdac7..43b3bbf60a 100644 --- a/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.dto.ts +++ b/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.dto.ts @@ -8,19 +8,13 @@ import { } from 'class-validator'; import { ApplicationDocumentDto } from '../../../alcs/application/application-document/application-document.dto'; import { BaseCodeDto } from '../../../common/dtos/base.dto'; +import { + OWNER_TYPE, + OwnerTypeDto, +} from '../../../common/owner-type/owner-type.entity'; import { emailRegex } from '../../../utils/email.helper'; import { ApplicationParcelDto } from '../application-parcel/application-parcel.dto'; -export enum APPLICATION_OWNER { - INDIVIDUAL = 'INDV', - ORGANIZATION = 'ORGZ', - AGENT = 'AGEN', - CROWN = 'CRWN', - GOVERNMENT = 'GOVR', -} - -export class ApplicationOwnerTypeDto extends BaseCodeDto {} - export class ApplicationOwnerDto { @AutoMap() uuid: string; @@ -49,7 +43,7 @@ export class ApplicationOwnerDto { email?: string | null; @AutoMap() - type: ApplicationOwnerTypeDto; + type: OwnerTypeDto; @AutoMap(() => ApplicationDocumentDto) corporateSummary?: ApplicationDocumentDto; @@ -117,7 +111,7 @@ export class SetPrimaryContactDto { @IsString() @IsOptional() - type?: APPLICATION_OWNER; + type?: OWNER_TYPE; @IsUUID() @IsOptional() diff --git a/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.entity.ts b/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.entity.ts index 8f830e32ef..a24fec78da 100644 --- a/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.entity.ts +++ b/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.entity.ts @@ -5,7 +5,7 @@ import { ApplicationDocument } from '../../../alcs/application/application-docum import { Base } from '../../../common/entities/base.entity'; import { ApplicationParcel } from '../application-parcel/application-parcel.entity'; import { ApplicationSubmission } from '../application-submission.entity'; -import { ApplicationOwnerType } from './application-owner-type/application-owner-type.entity'; +import { OwnerType } from '../../../common/owner-type/owner-type.entity'; @Entity() export class ApplicationOwner extends Base { @@ -62,8 +62,8 @@ export class ApplicationOwner extends Base { corporateSummaryUuid: string | null; @AutoMap() - @ManyToOne(() => ApplicationOwnerType, { nullable: false }) - type: ApplicationOwnerType; + @ManyToOne(() => OwnerType, { nullable: false }) + type: OwnerType; @ManyToOne(() => ApplicationSubmission, { nullable: false }) applicationSubmission: ApplicationSubmission; diff --git a/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.service.spec.ts b/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.service.spec.ts index b78ca5feb0..4fc9af391b 100644 --- a/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.service.spec.ts +++ b/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.service.spec.ts @@ -9,7 +9,7 @@ import { ApplicationParcel } from '../application-parcel/application-parcel.enti import { ApplicationParcelService } from '../application-parcel/application-parcel.service'; import { ApplicationSubmission } from '../application-submission.entity'; import { ApplicationSubmissionService } from '../application-submission.service'; -import { ApplicationOwnerType } from './application-owner-type/application-owner-type.entity'; +import { OwnerType } from '../../../common/owner-type/owner-type.entity'; import { ApplicationOwner } from './application-owner.entity'; import { ApplicationOwnerService } from './application-owner.service'; @@ -17,7 +17,7 @@ describe('ApplicationOwnerService', () => { let service: ApplicationOwnerService; let mockParcelService: DeepMocked; let mockRepo: DeepMocked>; - let mockTypeRepo: DeepMocked>; + let mockTypeRepo: DeepMocked>; let mockAppDocumentService: DeepMocked; let mockApplicationservice: DeepMocked; @@ -40,7 +40,7 @@ describe('ApplicationOwnerService', () => { useValue: mockRepo, }, { - provide: getRepositoryToken(ApplicationOwnerType), + provide: getRepositoryToken(OwnerType), useValue: mockTypeRepo, }, { @@ -80,7 +80,7 @@ describe('ApplicationOwnerService', () => { it('should load the type and then call save for create', async () => { mockRepo.save.mockResolvedValue(new ApplicationOwner()); - mockTypeRepo.findOneOrFail.mockResolvedValue(new ApplicationOwnerType()); + mockTypeRepo.findOneOrFail.mockResolvedValue(new OwnerType()); await service.create( { diff --git a/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.service.ts b/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.service.ts index ddc745c66a..81e5dde54b 100644 --- a/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.service.ts +++ b/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.service.ts @@ -2,13 +2,15 @@ import { forwardRef, Inject, Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Any, Repository } from 'typeorm'; import { ApplicationDocumentService } from '../../../alcs/application/application-document/application-document.service'; +import { + OWNER_TYPE, + OwnerType, +} from '../../../common/owner-type/owner-type.entity'; import { PARCEL_TYPE } from '../application-parcel/application-parcel.dto'; import { ApplicationParcelService } from '../application-parcel/application-parcel.service'; import { ApplicationSubmission } from '../application-submission.entity'; import { ApplicationSubmissionService } from '../application-submission.service'; -import { ApplicationOwnerType } from './application-owner-type/application-owner-type.entity'; import { - APPLICATION_OWNER, ApplicationOwnerCreateDto, ApplicationOwnerUpdateDto, } from './application-owner.dto'; @@ -19,8 +21,8 @@ export class ApplicationOwnerService { constructor( @InjectRepository(ApplicationOwner) private repository: Repository, - @InjectRepository(ApplicationOwnerType) - private typeRepository: Repository, + @InjectRepository(OwnerType) + private typeRepository: Repository, @Inject(forwardRef(() => ApplicationParcelService)) private applicationParcelService: ApplicationParcelService, @Inject(forwardRef(() => ApplicationSubmissionService)) @@ -222,7 +224,7 @@ export class ApplicationOwnerService { uuid: submissionUuid, }, type: { - code: APPLICATION_OWNER.AGENT, + code: OWNER_TYPE.AGENT, }, }, { @@ -230,7 +232,7 @@ export class ApplicationOwnerService { uuid: submissionUuid, }, type: { - code: APPLICATION_OWNER.GOVERNMENT, + code: OWNER_TYPE.GOVERNMENT, }, }, ], diff --git a/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.spec.ts b/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.spec.ts index 1e6e28cb0b..4c11f99ea3 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.spec.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.spec.ts @@ -11,8 +11,10 @@ import { ApplicationDocument } from '../../alcs/application/application-document import { ApplicationDocumentService } from '../../alcs/application/application-document/application-document.service'; import { DOCUMENT_SOURCE } from '../../document/document.dto'; import { Document } from '../../document/document.entity'; -import { ApplicationOwnerType } from './application-owner/application-owner-type/application-owner-type.entity'; -import { APPLICATION_OWNER } from './application-owner/application-owner.dto'; +import { + OWNER_TYPE, + OwnerType, +} from '../../common/owner-type/owner-type.entity'; import { ApplicationOwner } from './application-owner/application-owner.entity'; import { PARCEL_TYPE } from './application-parcel/application-parcel.dto'; import { ApplicationParcel } from './application-parcel/application-parcel.entity'; @@ -174,8 +176,8 @@ describe('ApplicationSubmissionValidatorService', () => { const applicationSubmission = new ApplicationSubmission({ owners: [ new ApplicationOwner({ - type: new ApplicationOwnerType({ - code: APPLICATION_OWNER.CROWN, + type: new OwnerType({ + code: OWNER_TYPE.CROWN, }), }), ], @@ -255,8 +257,8 @@ describe('ApplicationSubmissionValidatorService', () => { it('should return errors for an invalid third party agent', async () => { const mockOwner = new ApplicationOwner({ uuid: 'owner-uuid', - type: new ApplicationOwnerType({ - code: APPLICATION_OWNER.AGENT, + type: new OwnerType({ + code: OWNER_TYPE.AGENT, }), firstName: 'Bruce', lastName: 'Wayne', @@ -279,8 +281,8 @@ describe('ApplicationSubmissionValidatorService', () => { it('should require an authorization letter for more than one owner', async () => { const mockOwner = new ApplicationOwner({ uuid: 'owner-uuid', - type: new ApplicationOwnerType({ - code: APPLICATION_OWNER.AGENT, + type: new OwnerType({ + code: OWNER_TYPE.AGENT, }), firstName: 'Bruce', lastName: 'Wayne', @@ -303,8 +305,8 @@ describe('ApplicationSubmissionValidatorService', () => { it('should not require an authorization letter for a single owner', async () => { const mockOwner = new ApplicationOwner({ uuid: 'owner-uuid', - type: new ApplicationOwnerType({ - code: APPLICATION_OWNER.INDIVIDUAL, + type: new OwnerType({ + code: OWNER_TYPE.INDIVIDUAL, }), firstName: 'Bruce', lastName: 'Wayne', @@ -327,8 +329,8 @@ describe('ApplicationSubmissionValidatorService', () => { it('should not require an authorization letter when contact is goverment', async () => { const mockOwner = new ApplicationOwner({ uuid: 'owner-uuid', - type: new ApplicationOwnerType({ - code: APPLICATION_OWNER.INDIVIDUAL, + type: new OwnerType({ + code: OWNER_TYPE.INDIVIDUAL, }), firstName: 'Bruce', lastName: 'Wayne', @@ -336,8 +338,8 @@ describe('ApplicationSubmissionValidatorService', () => { const governmentOwner = new ApplicationOwner({ uuid: 'government-owner-uuid', - type: new ApplicationOwnerType({ - code: APPLICATION_OWNER.GOVERNMENT, + type: new OwnerType({ + code: OWNER_TYPE.GOVERNMENT, }), firstName: 'Govern', lastName: 'Ment', @@ -361,8 +363,8 @@ describe('ApplicationSubmissionValidatorService', () => { it('should not have an authorization letter error when one is provided', async () => { const mockOwner = new ApplicationOwner({ uuid: 'owner-uuid', - type: new ApplicationOwnerType({ - code: APPLICATION_OWNER.INDIVIDUAL, + type: new OwnerType({ + code: OWNER_TYPE.INDIVIDUAL, }), firstName: 'Bruce', lastName: 'Wayne', diff --git a/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.ts b/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.ts index aed07bd264..7985577d18 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.ts @@ -1,10 +1,10 @@ import { ServiceValidationException } from '@app/common/exceptions/base.exception'; import { Injectable, Logger } from '@nestjs/common'; -import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; -import { DOCUMENT_TYPE } from '../../document/document-code.entity'; import { ApplicationDocument } from '../../alcs/application/application-document/application-document.entity'; import { ApplicationDocumentService } from '../../alcs/application/application-document/application-document.service'; -import { APPLICATION_OWNER } from './application-owner/application-owner.dto'; +import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; +import { OWNER_TYPE } from '../../common/owner-type/owner-type.entity'; +import { DOCUMENT_TYPE } from '../../document/document-code.entity'; import { ApplicationOwner } from './application-owner/application-owner.entity'; import { PARCEL_TYPE } from './application-parcel/application-parcel.dto'; import { ApplicationParcel } from './application-parcel/application-parcel.entity'; @@ -260,11 +260,10 @@ export class ApplicationSubmissionValidatorService { const onlyHasIndividualOwner = applicationSubmission.owners.length === 1 && - applicationSubmission.owners[0].type.code === - APPLICATION_OWNER.INDIVIDUAL; + applicationSubmission.owners[0].type.code === OWNER_TYPE.INDIVIDUAL; const isGovernmentContact = - primaryOwner.type.code === APPLICATION_OWNER.GOVERNMENT; + primaryOwner.type.code === OWNER_TYPE.GOVERNMENT; if (!onlyHasIndividualOwner && !isGovernmentContact) { const authorizationLetters = documents.filter( @@ -280,10 +279,7 @@ export class ApplicationSubmissionValidatorService { } } - if ( - primaryOwner.type.code === APPLICATION_OWNER.AGENT || - isGovernmentContact - ) { + if (primaryOwner.type.code === OWNER_TYPE.AGENT || isGovernmentContact) { if ( !primaryOwner.firstName || !primaryOwner.lastName || diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.module.ts b/services/apps/alcs/src/portal/application-submission/application-submission.module.ts index 2ffb29d04c..8960faeeae 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.module.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.module.ts @@ -11,7 +11,7 @@ import { ApplicationSubmissionProfile } from '../../common/automapper/applicatio import { DocumentModule } from '../../document/document.module'; import { FileNumberModule } from '../../file-number/file-number.module'; import { PdfGenerationModule } from '../pdf-generation/pdf-generation.module'; -import { ApplicationOwnerType } from './application-owner/application-owner-type/application-owner-type.entity'; +import { OwnerType } from '../../common/owner-type/owner-type.entity'; import { ApplicationOwnerController } from './application-owner/application-owner.controller'; import { ApplicationOwner } from './application-owner/application-owner.entity'; import { ApplicationOwnerService } from './application-owner/application-owner.service'; @@ -33,7 +33,7 @@ import { NaruSubtype } from './naru-subtype/naru-subtype.entity'; ApplicationParcel, ApplicationParcelOwnershipType, ApplicationOwner, - ApplicationOwnerType, + OwnerType, NaruSubtype, ApplicationSubmissionToSubmissionStatus, ]), diff --git a/services/apps/alcs/src/portal/code/code.controller.ts b/services/apps/alcs/src/portal/code/code.controller.ts index 41fa24abe5..8de46fd499 100644 --- a/services/apps/alcs/src/portal/code/code.controller.ts +++ b/services/apps/alcs/src/portal/code/code.controller.ts @@ -39,14 +39,13 @@ export class CodeController { const localGovernments = await this.localGovernmentService.listActive(); const applicationTypes = await this.applicationService.fetchApplicationTypes(); - const applicationDocumentTypes = - await this.applicationDocumentService.fetchTypes(); + const documentTypes = await this.applicationDocumentService.fetchTypes(); const submissionTypes = await this.cardService.getPortalCardTypes(); const noticeOfIntentTypes = await this.noticeOfIntentService.listTypes(); const naruSubtypes = await this.applicationSubmissionService.listNaruSubtypes(); - const mappedDocTypes = applicationDocumentTypes.map((docType) => { + const mappedDocTypes = documentTypes.map((docType) => { if (docType.portalLabel) { docType.label = docType.portalLabel; } @@ -60,7 +59,7 @@ export class CodeController { applicationTypes, noticeOfIntentTypes, submissionTypes, - applicationDocumentTypes: mappedDocTypes, + documentTypes: mappedDocTypes, naruSubtypes, }; } diff --git a/services/apps/alcs/src/portal/notice-of-intent-document/notice-of-intent-document.controller.spec.ts b/services/apps/alcs/src/portal/notice-of-intent-document/notice-of-intent-document.controller.spec.ts new file mode 100644 index 0000000000..920aa7d08b --- /dev/null +++ b/services/apps/alcs/src/portal/notice-of-intent-document/notice-of-intent-document.controller.spec.ts @@ -0,0 +1,179 @@ +import { classes } from '@automapper/classes'; +import { AutomapperModule } from '@automapper/nestjs'; +import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; +import { Test, TestingModule } from '@nestjs/testing'; +import { ClsService } from 'nestjs-cls'; +import { mockKeyCloakProviders } from '../../../test/mocks/mockTypes'; +import { NoticeOfIntentDocument } from '../../alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.entity'; +import { NoticeOfIntentDocumentService } from '../../alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.service'; +import { NoticeOfIntentService } from '../../alcs/notice-of-intent/notice-of-intent.service'; +import { NoticeOfIntentProfile } from '../../common/automapper/notice-of-intent.automapper.profile'; +import { DocumentCode } from '../../document/document-code.entity'; +import { DOCUMENT_SOURCE, DOCUMENT_SYSTEM } from '../../document/document.dto'; +import { Document } from '../../document/document.entity'; +import { DocumentService } from '../../document/document.service'; +import { User } from '../../user/user.entity'; +import { NoticeOfIntentSubmission } from '../notice-of-intent-submission/notice-of-intent-submission.entity'; +import { NoticeOfIntentSubmissionService } from '../notice-of-intent-submission/notice-of-intent-submission.service'; +import { NoticeOfIntentDocumentController } from './notice-of-intent-document.controller'; +import { AttachExternalDocumentDto } from './notice-of-intent-document.dto'; + +describe('NoticeOfIntentDocumentController', () => { + let controller: NoticeOfIntentDocumentController; + let noiDocumentService: DeepMocked; + let mockNoiSubmissionService: DeepMocked; + let mockDocumentService: DeepMocked; + let mockNoticeOfIntentService: DeepMocked; + + const mockDocument = new NoticeOfIntentDocument({ + document: new Document({ + fileName: 'fileName', + uploadedAt: new Date(), + uploadedBy: new User(), + }), + }); + + beforeEach(async () => { + noiDocumentService = createMock(); + mockDocumentService = createMock(); + mockNoiSubmissionService = createMock(); + mockNoticeOfIntentService = createMock(); + + const module: TestingModule = await Test.createTestingModule({ + imports: [ + AutomapperModule.forRoot({ + strategyInitializer: classes(), + }), + ], + controllers: [NoticeOfIntentDocumentController], + providers: [ + NoticeOfIntentProfile, + { + provide: NoticeOfIntentDocumentService, + useValue: noiDocumentService, + }, + { + provide: ClsService, + useValue: {}, + }, + { + provide: NoticeOfIntentSubmissionService, + useValue: mockNoiSubmissionService, + }, + { + provide: DocumentService, + useValue: mockDocumentService, + }, + { + provide: NoticeOfIntentService, + useValue: mockNoticeOfIntentService, + }, + ...mockKeyCloakProviders, + ], + }).compile(); + controller = module.get( + NoticeOfIntentDocumentController, + ); + + mockNoiSubmissionService.verifyAccessByFileId.mockResolvedValue( + new NoticeOfIntentSubmission(), + ); + mockNoticeOfIntentService.getUuid.mockResolvedValue('uuid'); + }); + + it('should be defined', () => { + expect(controller).toBeDefined(); + }); + + it('should call through to delete documents', async () => { + noiDocumentService.delete.mockResolvedValue(mockDocument); + noiDocumentService.get.mockResolvedValue(mockDocument); + + await controller.delete('fake-uuid', { + user: { + entity: {}, + }, + }); + + expect(noiDocumentService.get).toHaveBeenCalledTimes(1); + expect(noiDocumentService.delete).toHaveBeenCalledTimes(1); + }); + + it('should call through to update documents', async () => { + noiDocumentService.updateDescriptionAndType.mockResolvedValue([]); + + await controller.update( + 'file-number', + { + user: { + entity: {}, + }, + }, + [], + ); + + expect(noiDocumentService.updateDescriptionAndType).toHaveBeenCalledTimes( + 1, + ); + }); + + it('should call through for download', async () => { + const fakeUrl = 'fake-url'; + noiDocumentService.getInlineUrl.mockResolvedValue(fakeUrl); + noiDocumentService.get.mockResolvedValue(mockDocument); + + const res = await controller.open('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'; + const docObj = new Document({ uuid: 'fake-uuid' }); + const userEntity = new User({ + name: user.user.entity, + }); + + const docDto: AttachExternalDocumentDto = { + fileSize: 0, + mimeType: 'mimeType', + fileName: 'fileName', + fileKey: 'fileKey', + source: DOCUMENT_SOURCE.APPLICANT, + }; + + mockDocumentService.createDocumentRecord.mockResolvedValue(docObj); + + noiDocumentService.attachExternalDocument.mockResolvedValue( + new NoticeOfIntentDocument({ + noticeOfIntent: undefined, + type: new DocumentCode(), + uuid: fakeUuid, + document: new Document({ + uploadedAt: new Date(), + uploadedBy: userEntity, + }), + }), + ); + + const res = await controller.attachExternalDocument( + 'fake-number', + docDto, + user, + ); + + expect(mockDocumentService.createDocumentRecord).toBeCalledTimes(1); + expect(noiDocumentService.attachExternalDocument).toBeCalledTimes(1); + expect(mockDocumentService.createDocumentRecord).toBeCalledWith({ + ...docDto, + system: DOCUMENT_SYSTEM.PORTAL, + }); + expect(res.uploadedBy).toEqual(user.user.entity); + expect(res.uuid).toEqual(fakeUuid); + }); +}); diff --git a/services/apps/alcs/src/portal/notice-of-intent-document/notice-of-intent-document.controller.ts b/services/apps/alcs/src/portal/notice-of-intent-document/notice-of-intent-document.controller.ts new file mode 100644 index 0000000000..fb61df26e8 --- /dev/null +++ b/services/apps/alcs/src/portal/notice-of-intent-document/notice-of-intent-document.controller.ts @@ -0,0 +1,162 @@ +import { Mapper } from '@automapper/core'; +import { InjectMapper } from '@automapper/nestjs'; +import { + Body, + Controller, + Delete, + Get, + Param, + Patch, + Post, + Req, + UseGuards, +} from '@nestjs/common'; +import { ApiOAuth2 } from '@nestjs/swagger'; +import * as config from 'config'; +import { ApplicationDocumentDto } from '../../alcs/application/application-document/application-document.dto'; +import { VISIBILITY_FLAG } from '../../alcs/application/application-document/application-document.entity'; +import { NoticeOfIntentDocumentDto } from '../../alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.dto'; +import { NoticeOfIntentDocument } from '../../alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.entity'; +import { NoticeOfIntentDocumentService } from '../../alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.service'; +import { NoticeOfIntentService } from '../../alcs/notice-of-intent/notice-of-intent.service'; +import { PortalAuthGuard } from '../../common/authorization/portal-auth-guard.service'; +import { DOCUMENT_TYPE } from '../../document/document-code.entity'; +import { DOCUMENT_SYSTEM } from '../../document/document.dto'; +import { DocumentService } from '../../document/document.service'; +import { NoticeOfIntentSubmissionService } from '../notice-of-intent-submission/notice-of-intent-submission.service'; +import { + AttachExternalDocumentDto, + PortalNoticeOfIntentDocumentUpdateDto, +} from './notice-of-intent-document.dto'; + +@ApiOAuth2(config.get('KEYCLOAK.SCOPES')) +@UseGuards(PortalAuthGuard) +@Controller('notice-of-intent-document') +export class NoticeOfIntentDocumentController { + constructor( + private noticeOfIntentDocumentService: NoticeOfIntentDocumentService, + private noticeOfIntentSubmissionService: NoticeOfIntentSubmissionService, + private noticeOfIntentService: NoticeOfIntentService, + private documentService: DocumentService, + @InjectMapper() private mapper: Mapper, + ) {} + + @Get('/application/:fileNumber') + async listApplicantDocuments( + @Param('fileNumber') fileNumber: string, + @Param('documentType') documentType: DOCUMENT_TYPE | null, + @Req() req, + ): Promise { + await this.noticeOfIntentSubmissionService.verifyAccessByFileId( + fileNumber, + req.user.entity, + ); + + const documents = await this.noticeOfIntentDocumentService.list( + fileNumber, + [VISIBILITY_FLAG.APPLICANT], + ); + return this.mapPortalDocuments(documents); + } + + @Get('/:uuid/open') + async open(@Param('uuid') fileUuid: string, @Req() req) { + const document = await this.noticeOfIntentDocumentService.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.noticeOfIntentDocumentService.getInlineUrl(document); + return { url }; + } + + @Patch('/application/:fileNumber') + async update( + @Param('fileNumber') fileNumber: string, + @Req() req, + @Body() body: PortalNoticeOfIntentDocumentUpdateDto[], + ) { + await this.noticeOfIntentSubmissionService.verifyAccessByFileId( + fileNumber, + req.user.entity, + ); + + //Map from file number to uuid + const noticeOfIntentUuid = await this.noticeOfIntentService.getUuid( + fileNumber, + ); + + const res = + await this.noticeOfIntentDocumentService.updateDescriptionAndType( + body, + noticeOfIntentUuid, + ); + return this.mapPortalDocuments(res); + } + + @Delete('/:uuid') + async delete(@Param('uuid') fileUuid: string, @Req() req) { + const document = await this.noticeOfIntentDocumentService.get(fileUuid); + + //TODO: How do we know which documents applicant can delete? + // await this.applicationSubmissionService.verifyAccess( + // document.applicationUuid, + // req.user.entity, + // ); + + await this.noticeOfIntentDocumentService.delete(document); + return {}; + } + + @Post('/application/:uuid/attachExternal') + async attachExternalDocument( + @Param('uuid') fileNumber: string, + @Body() data: AttachExternalDocumentDto, + @Req() req, + ): Promise { + const submission = + await this.noticeOfIntentSubmissionService.verifyAccessByFileId( + fileNumber, + req.user.entity, + ); + + const document = await this.documentService.createDocumentRecord({ + ...data, + system: DOCUMENT_SYSTEM.PORTAL, + }); + + const savedDocument = + await this.noticeOfIntentDocumentService.attachExternalDocument( + submission.fileNumber, + { + documentUuid: document.uuid, + type: data.documentType, + }, + [ + VISIBILITY_FLAG.APPLICANT, + VISIBILITY_FLAG.GOVERNMENT, + VISIBILITY_FLAG.COMMISSIONER, + ], + ); + + const mappedDocs = this.mapPortalDocuments([savedDocument]); + return mappedDocs[0]; + } + + private mapPortalDocuments(documents: NoticeOfIntentDocument[]) { + const labeledDocuments = documents.map((document) => { + if (document.type?.portalLabel) { + document.type.label = document.type.portalLabel; + } + return document; + }); + return this.mapper.mapArray( + labeledDocuments, + NoticeOfIntentDocument, + NoticeOfIntentDocumentDto, + ); + } +} diff --git a/services/apps/alcs/src/portal/notice-of-intent-document/notice-of-intent-document.dto.ts b/services/apps/alcs/src/portal/notice-of-intent-document/notice-of-intent-document.dto.ts new file mode 100644 index 0000000000..3cbf7d4a0e --- /dev/null +++ b/services/apps/alcs/src/portal/notice-of-intent-document/notice-of-intent-document.dto.ts @@ -0,0 +1,30 @@ +import { IsNumber, IsOptional, IsString } from 'class-validator'; +import { DOCUMENT_TYPE } from '../../document/document-code.entity'; +import { DOCUMENT_SOURCE } from '../../document/document.dto'; + +export class AttachExternalDocumentDto { + @IsString() + mimeType: string; + + @IsString() + fileName: string; + + @IsNumber() + fileSize: number; + + @IsString() + fileKey: string; + + @IsString() + source: DOCUMENT_SOURCE.APPLICANT; + + @IsString() + @IsOptional() + documentType?: DOCUMENT_TYPE; +} + +export class PortalNoticeOfIntentDocumentUpdateDto { + uuid: string; + type: DOCUMENT_TYPE | null; + description: string | null; +} diff --git a/services/apps/alcs/src/portal/notice-of-intent-document/notice-of-intent-document.module.ts b/services/apps/alcs/src/portal/notice-of-intent-document/notice-of-intent-document.module.ts new file mode 100644 index 0000000000..ae4a6622a8 --- /dev/null +++ b/services/apps/alcs/src/portal/notice-of-intent-document/notice-of-intent-document.module.ts @@ -0,0 +1,17 @@ +import { Module } from '@nestjs/common'; +import { NoticeOfIntentModule } from '../../alcs/notice-of-intent/notice-of-intent.module'; +import { DocumentModule } from '../../document/document.module'; +import { NoticeOfIntentSubmissionModule } from '../notice-of-intent-submission/notice-of-intent-submission.module'; +import { NoticeOfIntentDocumentController } from './notice-of-intent-document.controller'; + +@Module({ + imports: [ + DocumentModule, + NoticeOfIntentModule, + NoticeOfIntentSubmissionModule, + ], + controllers: [NoticeOfIntentDocumentController], + providers: [], + exports: [], +}) +export class PortalNoticeOfIntentDocumentModule {} diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.controller.spec.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.controller.spec.ts new file mode 100644 index 0000000000..ee57a26100 --- /dev/null +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.controller.spec.ts @@ -0,0 +1,345 @@ +import { classes } from '@automapper/classes'; +import { AutomapperModule } from '@automapper/nestjs'; +import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; +import { BadRequestException } from '@nestjs/common'; +import { Test, TestingModule } from '@nestjs/testing'; +import { ClsService } from 'nestjs-cls'; +import { mockKeyCloakProviders } from '../../../../test/mocks/mockTypes'; +import { NoticeOfIntentDocumentService } from '../../../alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.service'; +import { NoticeOfIntentOwnerProfile } from '../../../common/automapper/notice-of-intent-owner.automapper.profile'; +import { + OWNER_TYPE, + OwnerType, +} from '../../../common/owner-type/owner-type.entity'; +import { DocumentService } from '../../../document/document.service'; +import { NoticeOfIntentSubmission } from '../notice-of-intent-submission.entity'; +import { NoticeOfIntentSubmissionService } from '../notice-of-intent-submission.service'; +import { NoticeOfIntentOwnerController } from './notice-of-intent-owner.controller'; +import { NoticeOfIntentOwner } from './notice-of-intent-owner.entity'; +import { NoticeOfIntentOwnerService } from './notice-of-intent-owner.service'; + +describe('NoticeOfIntentOwnerController', () => { + let controller: NoticeOfIntentOwnerController; + let mockNOISubmissionService: DeepMocked; + let mockOwnerService: DeepMocked; + let mockDocumentService: DeepMocked; + let mockNOIDocumentService: DeepMocked; + + beforeEach(async () => { + mockNOISubmissionService = createMock(); + mockOwnerService = createMock(); + mockDocumentService = createMock(); + mockNOIDocumentService = createMock(); + + const module: TestingModule = await Test.createTestingModule({ + imports: [ + AutomapperModule.forRoot({ + strategyInitializer: classes(), + }), + ], + controllers: [NoticeOfIntentOwnerController], + providers: [ + { + provide: NoticeOfIntentSubmissionService, + useValue: mockNOISubmissionService, + }, + { + provide: NoticeOfIntentOwnerService, + useValue: mockOwnerService, + }, + { + provide: DocumentService, + useValue: mockDocumentService, + }, + { + provide: NoticeOfIntentDocumentService, + useValue: mockNOIDocumentService, + }, + { + provide: ClsService, + useValue: {}, + }, + NoticeOfIntentOwnerProfile, + ...mockKeyCloakProviders, + ], + }).compile(); + + controller = module.get( + NoticeOfIntentOwnerController, + ); + }); + + it('should be defined', () => { + expect(controller).toBeDefined(); + }); + + it('should verify access before fetching applications and map displayName', async () => { + const owner = new NoticeOfIntentOwner({ + firstName: 'Bruce', + lastName: 'Wayne', + }); + mockNOISubmissionService.verifyAccessByUuid.mockResolvedValue( + new NoticeOfIntentSubmission({ + owners: [owner], + }), + ); + + const owners = await controller.fetchByFileId('', { + user: { + entity: {}, + }, + }); + + expect(owners.length).toEqual(1); + expect(owners[0].displayName).toBe('Bruce Wayne'); + expect(mockNOISubmissionService.verifyAccessByUuid).toHaveBeenCalledTimes( + 1, + ); + }); + + it('should verify the dto and file access then create', async () => { + const owner = new NoticeOfIntentOwner({ + firstName: 'Bruce', + lastName: 'Wayne', + }); + mockNOISubmissionService.verifyAccessByUuid.mockResolvedValue( + new NoticeOfIntentSubmission(), + ); + mockOwnerService.create.mockResolvedValue(owner); + + const createdOwner = await controller.create( + { + firstName: 'B', + lastName: 'W', + noticeOfIntentSubmissionUuid: '', + email: '', + phoneNumber: '', + typeCode: 'INDV', + }, + { + user: { + entity: {}, + }, + }, + ); + + expect(createdOwner).toBeDefined(); + expect(mockNOISubmissionService.verifyAccessByUuid).toHaveBeenCalledTimes( + 1, + ); + expect(mockOwnerService.create).toHaveBeenCalledTimes(1); + }); + + it('should throw an exception when creating an individual owner without first name', async () => { + const promise = controller.create( + { + lastName: 'W', + noticeOfIntentSubmissionUuid: '', + email: '', + phoneNumber: '', + typeCode: 'INDV', + }, + { + user: { + entity: {}, + }, + }, + ); + await expect(promise).rejects.toMatchObject( + new BadRequestException('Individuals require both first and last name'), + ); + }); + + it('should throw an exception when creating an organization an org name', async () => { + const promise = controller.create( + { + noticeOfIntentSubmissionUuid: '', + email: '', + phoneNumber: '', + typeCode: 'ORGZ', + }, + { + user: { + entity: {}, + }, + }, + ); + await expect(promise).rejects.toMatchObject( + new BadRequestException('Organizations must have an organizationName'), + ); + }); + + it('should call through for update', async () => { + mockOwnerService.update.mockResolvedValue(new NoticeOfIntentOwner()); + mockOwnerService.getOwner.mockResolvedValue(new NoticeOfIntentOwner()); + mockNOISubmissionService.verifyAccessByUuid.mockResolvedValue( + new NoticeOfIntentSubmission(), + ); + + const res = await controller.update( + '', + { + organizationName: 'orgName', + email: '', + phoneNumber: '', + typeCode: 'ORGZ', + }, + { + user: { + entity: {}, + }, + }, + ); + + expect(mockOwnerService.update).toHaveBeenCalledTimes(1); + expect(mockNOISubmissionService.verifyAccessByUuid).toHaveBeenCalledTimes( + 1, + ); + expect(mockOwnerService.getOwner).toHaveBeenCalledTimes(1); + }); + + it('should call through for delete', async () => { + mockOwnerService.delete.mockResolvedValue({} as any); + mockOwnerService.getOwner.mockResolvedValue(new NoticeOfIntentOwner()); + mockNOISubmissionService.verifyAccessByUuid.mockResolvedValue( + new NoticeOfIntentSubmission(), + ); + + await controller.delete('', { + user: { + entity: {}, + }, + }); + + expect(mockNOISubmissionService.verifyAccessByUuid).toHaveBeenCalledTimes( + 1, + ); + expect(mockOwnerService.delete).toHaveBeenCalledTimes(1); + expect(mockOwnerService.getOwner).toHaveBeenCalledTimes(1); + }); + + it('should call through for attachToParcel', async () => { + mockOwnerService.attachToParcel.mockResolvedValue({} as any); + mockOwnerService.getOwner.mockResolvedValue(new NoticeOfIntentOwner()); + mockNOISubmissionService.verifyAccessByUuid.mockResolvedValue( + new NoticeOfIntentSubmission(), + ); + + await controller.linkToParcel('', '', { + user: { + entity: {}, + }, + }); + + expect(mockNOISubmissionService.verifyAccessByUuid).toHaveBeenCalledTimes( + 1, + ); + expect(mockOwnerService.attachToParcel).toHaveBeenCalledTimes(1); + expect(mockOwnerService.getOwner).toHaveBeenCalledTimes(1); + }); + + it('should call through for removeFromParcel', async () => { + mockOwnerService.removeFromParcel.mockResolvedValue({} as any); + mockOwnerService.getOwner.mockResolvedValue(new NoticeOfIntentOwner()); + mockNOISubmissionService.verifyAccessByUuid.mockResolvedValue( + new NoticeOfIntentSubmission(), + ); + + await controller.removeFromParcel('', '', { + user: { + entity: {}, + }, + }); + + expect(mockNOISubmissionService.verifyAccessByUuid).toHaveBeenCalledTimes( + 1, + ); + expect(mockOwnerService.removeFromParcel).toHaveBeenCalledTimes(1); + expect(mockOwnerService.getOwner).toHaveBeenCalledTimes(1); + }); + + it('should create a new owner when setting primary contact to third party agent that doesnt exist', async () => { + mockOwnerService.deleteNonParcelOwners.mockResolvedValue([]); + mockOwnerService.create.mockResolvedValue(new NoticeOfIntentOwner()); + mockOwnerService.setPrimaryContact.mockResolvedValue(); + mockNOISubmissionService.verifyAccessByUuid.mockResolvedValue( + new NoticeOfIntentSubmission(), + ); + + await controller.setPrimaryContact( + { noticeOfIntentSubmissionUuid: '' }, + { + user: { + entity: {}, + }, + }, + ); + + expect(mockOwnerService.deleteNonParcelOwners).toHaveBeenCalledTimes(1); + expect(mockOwnerService.create).toHaveBeenCalledTimes(1); + expect(mockOwnerService.setPrimaryContact).toHaveBeenCalledTimes(1); + expect(mockNOISubmissionService.verifyAccessByUuid).toHaveBeenCalledTimes( + 1, + ); + }); + + it('should set the owner and delete agents when using a non-agent owner', async () => { + mockOwnerService.getOwner.mockResolvedValue( + new NoticeOfIntentOwner({ + type: new OwnerType({ + code: OWNER_TYPE.INDIVIDUAL, + }), + }), + ); + mockOwnerService.setPrimaryContact.mockResolvedValue(); + mockOwnerService.deleteNonParcelOwners.mockResolvedValue({} as any); + mockNOISubmissionService.verifyAccessByUuid.mockResolvedValue( + new NoticeOfIntentSubmission(), + ); + + await controller.setPrimaryContact( + { noticeOfIntentSubmissionUuid: '', ownerUuid: 'fake-uuid' }, + { + user: { + entity: {}, + }, + }, + ); + + expect(mockOwnerService.setPrimaryContact).toHaveBeenCalledTimes(1); + expect(mockNOISubmissionService.verifyAccessByUuid).toHaveBeenCalledTimes( + 1, + ); + expect(mockOwnerService.deleteNonParcelOwners).toHaveBeenCalledTimes(1); + }); + + it('should update the agent owner when calling set primary contact', async () => { + mockOwnerService.getOwner.mockResolvedValue( + new NoticeOfIntentOwner({ + type: new OwnerType({ + code: OWNER_TYPE.AGENT, + }), + }), + ); + mockOwnerService.update.mockResolvedValue(new NoticeOfIntentOwner()); + mockOwnerService.setPrimaryContact.mockResolvedValue(); + mockNOISubmissionService.verifyAccessByUuid.mockResolvedValue( + new NoticeOfIntentSubmission(), + ); + + await controller.setPrimaryContact( + { noticeOfIntentSubmissionUuid: '', ownerUuid: 'fake-uuid' }, + { + user: { + entity: {}, + }, + }, + ); + + expect(mockOwnerService.setPrimaryContact).toHaveBeenCalledTimes(1); + expect(mockNOISubmissionService.verifyAccessByUuid).toHaveBeenCalledTimes( + 1, + ); + expect(mockOwnerService.update).toHaveBeenCalledTimes(1); + }); +}); diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.controller.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.controller.ts new file mode 100644 index 0000000000..981c11489f --- /dev/null +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.controller.ts @@ -0,0 +1,259 @@ +import { Mapper } from '@automapper/core'; +import { InjectMapper } from '@automapper/nestjs'; +import { + BadRequestException, + Body, + Controller, + Delete, + Get, + Param, + Patch, + Post, + Req, + UseGuards, +} from '@nestjs/common'; +import { VISIBILITY_FLAG } from '../../../alcs/application/application-document/application-document.entity'; +import { NoticeOfIntentDocumentService } from '../../../alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.service'; +import { PortalAuthGuard } from '../../../common/authorization/portal-auth-guard.service'; +import { OWNER_TYPE } from '../../../common/owner-type/owner-type.entity'; +import { DOCUMENT_TYPE } from '../../../document/document-code.entity'; +import { + DOCUMENT_SOURCE, + DOCUMENT_SYSTEM, +} from '../../../document/document.dto'; +import { DocumentService } from '../../../document/document.service'; +import { NoticeOfIntentSubmissionService } from '../notice-of-intent-submission.service'; +import { + AttachCorporateSummaryDto, + NoticeOfIntentOwnerCreateDto, + NoticeOfIntentOwnerDto, + NoticeOfIntentOwnerUpdateDto, + SetPrimaryContactDto, +} from './notice-of-intent-owner.dto'; +import { NoticeOfIntentOwner } from './notice-of-intent-owner.entity'; +import { NoticeOfIntentOwnerService } from './notice-of-intent-owner.service'; + +@Controller('notice-of-intent-owner') +@UseGuards(PortalAuthGuard) +export class NoticeOfIntentOwnerController { + constructor( + private ownerService: NoticeOfIntentOwnerService, + private noticeOfIntentSubmissionService: NoticeOfIntentSubmissionService, + private documentService: DocumentService, + private noticeOfIntentDocumentService: NoticeOfIntentDocumentService, + @InjectMapper() private mapper: Mapper, + ) {} + + @Get('submission/:submissionUuid') + async fetchByFileId( + @Param('submissionUuid') submissionUuid: string, + @Req() req, + ): Promise { + const noticeOfIntentSubmission = + await this.noticeOfIntentSubmissionService.verifyAccessByUuid( + submissionUuid, + req.user.entity, + ); + + return this.mapper.mapArrayAsync( + noticeOfIntentSubmission.owners, + NoticeOfIntentOwner, + NoticeOfIntentOwnerDto, + ); + } + + @Post() + async create( + @Body() createDto: NoticeOfIntentOwnerCreateDto, + @Req() req, + ): Promise { + this.verifyDto(createDto); + + const application = + await this.noticeOfIntentSubmissionService.verifyAccessByUuid( + createDto.noticeOfIntentSubmissionUuid, + req.user.entity, + ); + const owner = await this.ownerService.create(createDto, application); + + return this.mapper.mapAsync( + owner, + NoticeOfIntentOwner, + NoticeOfIntentOwnerDto, + ); + } + + @Patch('/:uuid') + async update( + @Param('uuid') uuid: string, + @Body() updateDto: NoticeOfIntentOwnerUpdateDto, + @Req() req, + ) { + await this.verifyAccessAndGetOwner(req, uuid); + this.verifyDto(updateDto); + + const newParcel = await this.ownerService.update(uuid, updateDto); + + return this.mapper.mapAsync( + newParcel, + NoticeOfIntentOwner, + NoticeOfIntentOwnerDto, + ); + } + + @Delete('/:uuid') + async delete(@Param('uuid') uuid: string, @Req() req) { + const owner = await this.verifyAccessAndGetOwner(req, uuid); + if (owner.corporateSummary) { + await this.noticeOfIntentDocumentService.delete(owner.corporateSummary); + } + await this.ownerService.delete(owner); + return { uuid }; + } + + @Post('/:uuid/link/:parcelUuid') + async linkToParcel( + @Param('uuid') uuid: string, + @Param('parcelUuid') parcelUuid: string, + @Req() req, + ) { + await this.verifyAccessAndGetOwner(req, uuid); + + return { uuid: await this.ownerService.attachToParcel(uuid, parcelUuid) }; + } + + @Post('/:uuid/unlink/:parcelUuid') + async removeFromParcel( + @Param('uuid') uuid: string, + @Param('parcelUuid') parcelUuid: string, + @Req() req, + ) { + await this.verifyAccessAndGetOwner(req, uuid); + + return { uuid: await this.ownerService.removeFromParcel(uuid, parcelUuid) }; + } + + private verifyDto( + dto: NoticeOfIntentOwnerUpdateDto | NoticeOfIntentOwnerCreateDto, + ) { + if ( + dto.typeCode === OWNER_TYPE.INDIVIDUAL && + (!dto.firstName || !dto.lastName) + ) { + throw new BadRequestException( + 'Individuals require both first and last name', + ); + } + + if (dto.typeCode === OWNER_TYPE.ORGANIZATION && !dto.organizationName) { + throw new BadRequestException( + 'Organizations must have an organizationName', + ); + } + } + + @Post('setPrimaryContact') + async setPrimaryContact(@Body() data: SetPrimaryContactDto, @Req() req) { + const applicationSubmission = + await this.noticeOfIntentSubmissionService.verifyAccessByUuid( + data.noticeOfIntentSubmissionUuid, + req.user.entity, + ); + + //Create Owner + if (!data.ownerUuid) { + await this.ownerService.deleteNonParcelOwners(applicationSubmission.uuid); + const newOwner = await this.ownerService.create( + { + email: data.email, + typeCode: data.type, + lastName: data.lastName, + firstName: data.firstName, + phoneNumber: data.phoneNumber, + organizationName: data.organization, + noticeOfIntentSubmissionUuid: data.noticeOfIntentSubmissionUuid, + }, + applicationSubmission, + ); + await this.ownerService.setPrimaryContact( + applicationSubmission.uuid, + newOwner, + ); + } else if (data.ownerUuid) { + const primaryContactOwner = await this.ownerService.getOwner( + data.ownerUuid, + ); + + if ( + primaryContactOwner.type.code === OWNER_TYPE.AGENT || + primaryContactOwner.type.code === OWNER_TYPE.GOVERNMENT + ) { + //Update Fields for non parcel owners + await this.ownerService.update(primaryContactOwner.uuid, { + email: data.email, + typeCode: primaryContactOwner.type.code, + lastName: data.lastName, + firstName: data.firstName, + phoneNumber: data.phoneNumber, + organizationName: data.organization, + }); + } else { + //Delete Non parcel owners if we aren't using one + await this.ownerService.deleteNonParcelOwners( + applicationSubmission.uuid, + ); + } + + await this.ownerService.setPrimaryContact( + applicationSubmission.uuid, + primaryContactOwner, + ); + } + } + + private async verifyAccessAndGetOwner(@Req() req, ownerUuid: string) { + const owner = await this.ownerService.getOwner(ownerUuid); + await this.noticeOfIntentSubmissionService.verifyAccessByUuid( + owner.noticeOfIntentSubmissionUuid, + req.user.entity, + ); + + return owner; + } + + @Post('attachCorporateSummary') + async attachCorporateSummary( + @Req() req, + @Body() data: AttachCorporateSummaryDto, + ) { + await this.noticeOfIntentSubmissionService.verifyAccessByFileId( + data.fileNumber, + req.user.entity, + ); + + const document = await this.documentService.createDocumentRecord({ + ...data, + uploadedBy: req.user.entity, + source: DOCUMENT_SOURCE.APPLICANT, + system: DOCUMENT_SYSTEM.PORTAL, + }); + + const applicationDocument = + await this.noticeOfIntentDocumentService.attachExternalDocument( + data.fileNumber, + { + documentUuid: document.uuid, + type: DOCUMENT_TYPE.CORPORATE_SUMMARY, + }, + [ + VISIBILITY_FLAG.APPLICANT, + VISIBILITY_FLAG.GOVERNMENT, + VISIBILITY_FLAG.COMMISSIONER, + ], + ); + + return { + uuid: applicationDocument.uuid, + }; + } +} diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.dto.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.dto.ts new file mode 100644 index 0000000000..08ab45b2ea --- /dev/null +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.dto.ts @@ -0,0 +1,138 @@ +import { AutoMap } from '@automapper/classes'; +import { + IsNumber, + IsOptional, + IsString, + IsUUID, + Matches, +} from 'class-validator'; +import { NoticeOfIntentDocumentDto } from '../../../alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.dto'; +import { + OWNER_TYPE, + OwnerTypeDto, +} from '../../../common/owner-type/owner-type.entity'; +import { emailRegex } from '../../../utils/email.helper'; +import { NoticeOfIntentParcelDto } from '../notice-of-intent-parcel/notice-of-intent-parcel.dto'; + +export class NoticeOfIntentOwnerDto { + @AutoMap() + uuid: string; + + @AutoMap() + noticeOfIntentSubmissionUuid: string; + + @AutoMap(() => String) + corporateSummaryUuid?: string; + + displayName: string; + + @AutoMap(() => String) + firstName?: string | null; + + @AutoMap(() => String) + lastName?: string | null; + + @AutoMap(() => String) + organizationName?: string | null; + + @AutoMap(() => String) + phoneNumber?: string | null; + + @AutoMap(() => String) + email?: string | null; + + @AutoMap() + type: OwnerTypeDto; + + @AutoMap(() => NoticeOfIntentDocumentDto) + corporateSummary?: NoticeOfIntentDocumentDto; +} + +export class NoticeOfIntentOwnerDetailedDto extends NoticeOfIntentOwnerDto { + parcels: NoticeOfIntentParcelDto[]; +} + +export class NoticeOfIntentOwnerUpdateDto { + @IsString() + @IsOptional() + firstName?: string; + + @IsString() + @IsOptional() + lastName?: string; + + @IsString() + @IsOptional() + organizationName?: string; + + @IsString() + @IsOptional() + phoneNumber?: string; + + @Matches(emailRegex) + @IsOptional() + email?: string; + + @IsString() + @IsOptional() + typeCode?: string; + + @IsUUID() + @IsOptional() + corporateSummaryUuid?: string; +} + +export class NoticeOfIntentOwnerCreateDto extends NoticeOfIntentOwnerUpdateDto { + @IsString() + noticeOfIntentSubmissionUuid: string; +} + +export class SetPrimaryContactDto { + @IsString() + @IsOptional() + firstName?: string; + + @IsString() + @IsOptional() + lastName?: string; + + @IsString() + @IsOptional() + organization?: string; + + @IsString() + @IsOptional() + phoneNumber?: string; + + @IsString() + @IsOptional() + email?: string; + + @IsString() + @IsOptional() + type?: OWNER_TYPE; + + @IsUUID() + @IsOptional() + ownerUuid?: string; + + @IsString() + noticeOfIntentSubmissionUuid: string; +} + +export class AttachCorporateSummaryDto { + @IsString() + mimeType: string; + + @IsString() + fileName: string; + + @IsNumber() + fileSize: number; + + @IsString() + fileKey: string; + + @IsString() + fileNumber: string; +} diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.entity.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.entity.ts new file mode 100644 index 0000000000..62ec03a981 --- /dev/null +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.entity.ts @@ -0,0 +1,77 @@ +import { AutoMap } from '@automapper/classes'; +import { Column, Entity, JoinColumn, ManyToMany, ManyToOne } from 'typeorm'; +import { NoticeOfIntentDocumentDto } from '../../../alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.dto'; +import { NoticeOfIntentDocument } from '../../../alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.entity'; +import { Base } from '../../../common/entities/base.entity'; +import { OwnerType } from '../../../common/owner-type/owner-type.entity'; +import { NoticeOfIntentParcel } from '../notice-of-intent-parcel/notice-of-intent-parcel.entity'; +import { NoticeOfIntentSubmission } from '../notice-of-intent-submission.entity'; + +@Entity() +export class NoticeOfIntentOwner extends Base { + constructor(data?: Partial) { + super(); + if (data) { + Object.assign(this, data); + } + } + + @AutoMap(() => String) + @Column({ + type: 'varchar', + nullable: true, + }) + firstName?: string | null; + + @AutoMap(() => String) + @Column({ + type: 'varchar', + nullable: true, + }) + lastName?: string | null; + + @AutoMap(() => String) + @Column({ + type: 'varchar', + nullable: true, + }) + organizationName?: string | null; + + @AutoMap(() => String) + @Column({ + type: 'varchar', + nullable: true, + }) + phoneNumber?: string | null; + + @AutoMap(() => String) + @Column({ + type: 'varchar', + nullable: true, + }) + email?: string | null; + + @AutoMap(() => NoticeOfIntentDocumentDto) + @ManyToOne(() => NoticeOfIntentDocument, { + onDelete: 'SET NULL', + }) + @JoinColumn() + corporateSummary: NoticeOfIntentDocument | null; + + @Column({ nullable: true }) + corporateSummaryUuid: string | null; + + @AutoMap() + @ManyToOne(() => OwnerType, { nullable: false }) + type: OwnerType; + + @ManyToOne(() => NoticeOfIntentSubmission, { nullable: false }) + noticeOfIntentSubmission: NoticeOfIntentSubmission; + + @AutoMap() + @Column() + noticeOfIntentSubmissionUuid: string; + + @ManyToMany(() => NoticeOfIntentParcel, (appParcel) => appParcel.owners) + parcels: NoticeOfIntentParcel[]; +} diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.service.spec.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.service.spec.ts new file mode 100644 index 0000000000..9493d13e28 --- /dev/null +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.service.spec.ts @@ -0,0 +1,341 @@ +import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; +import { Test, TestingModule } from '@nestjs/testing'; +import { getRepositoryToken } from '@nestjs/typeorm'; +import { Repository } from 'typeorm'; +import { ApplicationDocumentService } from '../../../alcs/application/application-document/application-document.service'; +import { NoticeOfIntentDocument } from '../../../alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.entity'; +import { NoticeOfIntentDocumentService } from '../../../alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.service'; +import { OwnerType } from '../../../common/owner-type/owner-type.entity'; +import { NoticeOfIntentParcel } from '../notice-of-intent-parcel/notice-of-intent-parcel.entity'; +import { NoticeOfIntentParcelService } from '../notice-of-intent-parcel/notice-of-intent-parcel.service'; +import { NoticeOfIntentSubmission } from '../notice-of-intent-submission.entity'; +import { NoticeOfIntentSubmissionService } from '../notice-of-intent-submission.service'; +import { NoticeOfIntentOwner } from './notice-of-intent-owner.entity'; +import { NoticeOfIntentOwnerService } from './notice-of-intent-owner.service'; + +describe('NoticeOfIntentOwnerService', () => { + let service: NoticeOfIntentOwnerService; + let mockParcelService: DeepMocked; + let mockRepo: DeepMocked>; + let mockTypeRepo: DeepMocked>; + let mockAppDocumentService: DeepMocked; + let mockApplicationservice: DeepMocked; + + beforeEach(async () => { + mockParcelService = createMock(); + mockRepo = createMock(); + mockTypeRepo = createMock(); + mockAppDocumentService = createMock(); + mockApplicationservice = createMock(); + + const module: TestingModule = await Test.createTestingModule({ + providers: [ + NoticeOfIntentOwnerService, + { + provide: NoticeOfIntentParcelService, + useValue: mockParcelService, + }, + { + provide: getRepositoryToken(NoticeOfIntentOwner), + useValue: mockRepo, + }, + { + provide: getRepositoryToken(OwnerType), + useValue: mockTypeRepo, + }, + { + provide: NoticeOfIntentDocumentService, + useValue: mockAppDocumentService, + }, + { + provide: NoticeOfIntentSubmissionService, + useValue: mockApplicationservice, + }, + ], + }).compile(); + + service = module.get( + NoticeOfIntentOwnerService, + ); + + mockParcelService.fetchByApplicationSubmissionUuid.mockResolvedValue([ + new NoticeOfIntentParcel({ + owners: [new NoticeOfIntentOwner()], + }), + ]); + mockApplicationservice.update.mockResolvedValue( + new NoticeOfIntentSubmission(), + ); + }); + + it('should be defined', () => { + expect(service).toBeDefined(); + }); + + it('should call find for find', async () => { + mockRepo.find.mockResolvedValue([new NoticeOfIntentOwner()]); + + await service.fetchByApplicationFileId(''); + + expect(mockRepo.find).toHaveBeenCalledTimes(1); + }); + + it('should load the type and then call save for create', async () => { + mockRepo.save.mockResolvedValue(new NoticeOfIntentOwner()); + mockTypeRepo.findOneOrFail.mockResolvedValue(new OwnerType()); + + await service.create( + { + noticeOfIntentSubmissionUuid: '', + email: '', + phoneNumber: '', + typeCode: '', + }, + new NoticeOfIntentSubmission(), + ); + + expect(mockRepo.save).toHaveBeenCalledTimes(1); + expect(mockTypeRepo.findOneOrFail).toHaveBeenCalledTimes(1); + }); + + it('should load the type/parcel and then call save for attachToParcel', async () => { + const owner = new NoticeOfIntentOwner({ + parcels: [], + }); + mockRepo.findOneOrFail.mockResolvedValue(owner); + mockRepo.save.mockResolvedValue(new NoticeOfIntentOwner()); + mockParcelService.getOneOrFail.mockResolvedValue( + new NoticeOfIntentParcel(), + ); + + await service.attachToParcel('', ''); + + expect(owner.parcels.length).toEqual(1); + expect(mockRepo.findOneOrFail).toHaveBeenCalledTimes(1); + expect(mockRepo.save).toHaveBeenCalledTimes(1); + expect(mockParcelService.getOneOrFail).toHaveBeenCalledTimes(1); + }); + + it('should remove the parcel from the array then call save for removeFromParcel', async () => { + const parcelUuid = '1'; + const owner = new NoticeOfIntentOwner({ + parcels: [ + new NoticeOfIntentParcel({ + uuid: parcelUuid, + }), + ], + }); + mockRepo.findOneOrFail.mockResolvedValue(owner); + mockRepo.save.mockResolvedValue(new NoticeOfIntentOwner()); + + await service.removeFromParcel('', parcelUuid); + + expect(owner.parcels.length).toEqual(0); + expect(mockRepo.findOneOrFail).toHaveBeenCalledTimes(1); + expect(mockRepo.save).toHaveBeenCalledTimes(1); + }); + + it('should set properties and call save for update', async () => { + const owner = new NoticeOfIntentOwner({ + firstName: 'Bruce', + lastName: 'Wayne', + }); + mockRepo.findOneOrFail.mockResolvedValue(owner); + mockRepo.save.mockResolvedValue(new NoticeOfIntentOwner()); + + await service.update('', { + firstName: 'I Am', + lastName: 'Batman', + email: '', + phoneNumber: '', + typeCode: '', + }); + + expect(owner.firstName).toEqual('I Am'); + expect(owner.lastName).toEqual('Batman'); + expect(mockRepo.findOneOrFail).toHaveBeenCalledTimes(1); + expect(mockRepo.save).toHaveBeenCalledTimes(1); + }); + + it('should delete the existing document when updating', async () => { + const owner = new NoticeOfIntentOwner({ + firstName: 'Bruce', + lastName: 'Wayne', + corporateSummaryUuid: 'oldUuid', + corporateSummary: new NoticeOfIntentDocument(), + }); + mockRepo.findOneOrFail.mockResolvedValue(owner); + mockRepo.save.mockResolvedValue(new NoticeOfIntentOwner()); + mockAppDocumentService.delete.mockResolvedValue({} as any); + + await service.update('', { + organizationName: '', + email: '', + phoneNumber: '', + typeCode: '', + corporateSummaryUuid: 'newUuid', + }); + + expect(owner.corporateSummaryUuid).toEqual('newUuid'); + expect(mockAppDocumentService.delete).toHaveBeenCalledTimes(1); + expect(mockRepo.findOneOrFail).toHaveBeenCalledTimes(1); + expect(mockRepo.save).toHaveBeenCalledTimes(2); + }); + + it('should call through for delete', async () => { + mockRepo.remove.mockResolvedValue({} as any); + + await service.delete(new NoticeOfIntentOwner()); + + expect(mockRepo.remove).toHaveBeenCalledTimes(1); + }); + + it('should call through for verify', async () => { + mockRepo.findOneOrFail.mockResolvedValue(new NoticeOfIntentOwner()); + + await service.getOwner(''); + + expect(mockRepo.findOneOrFail).toHaveBeenCalledTimes(1); + }); + + it('should call through for getMany', async () => { + mockRepo.find.mockResolvedValue([new NoticeOfIntentOwner()]); + + await service.getMany([]); + + expect(mockRepo.find).toHaveBeenCalledTimes(1); + }); + + it('should call through for save', async () => { + mockRepo.save.mockResolvedValue(new NoticeOfIntentOwner()); + + await service.save(new NoticeOfIntentOwner()); + + expect(mockRepo.save).toHaveBeenCalledTimes(1); + }); + + it('should call update for the application with the first parcels last name', async () => { + mockRepo.find.mockResolvedValue([new NoticeOfIntentOwner()]); + const owners = [ + new NoticeOfIntentOwner({ + firstName: 'B', + lastName: 'A', + }), + ]; + mockParcelService.fetchByApplicationSubmissionUuid.mockResolvedValue([ + new NoticeOfIntentParcel({ + owners, + }), + ]); + + await service.updateSubmissionApplicant(''); + + expect(mockApplicationservice.update).toHaveBeenCalledTimes(1); + expect(mockApplicationservice.update.mock.calls[0][1].applicant).toEqual( + 'A', + ); + }); + + it('should call update for the application with the first parcels last name', async () => { + mockRepo.find.mockResolvedValue([new NoticeOfIntentOwner()]); + const owners = [ + new NoticeOfIntentOwner({ + firstName: 'F', + lastName: 'B', + }), + new NoticeOfIntentOwner({ + firstName: 'F', + lastName: 'A', + }), + new NoticeOfIntentOwner({ + firstName: 'F', + lastName: '1', + }), + new NoticeOfIntentOwner({ + firstName: 'F', + lastName: 'C', + }), + ]; + mockParcelService.fetchByApplicationSubmissionUuid.mockResolvedValue([ + new NoticeOfIntentParcel({ + owners, + }), + ]); + + await service.updateSubmissionApplicant(''); + + expect(mockApplicationservice.update).toHaveBeenCalledTimes(1); + expect(mockApplicationservice.update.mock.calls[0][1].applicant).toEqual( + 'A et al.', + ); + }); + + it('should call update for the application with the number owners last name', async () => { + mockRepo.find.mockResolvedValue([new NoticeOfIntentOwner()]); + const owners = [ + new NoticeOfIntentOwner({ + firstName: '1', + lastName: '1', + }), + new NoticeOfIntentOwner({ + firstName: '2', + lastName: '2', + }), + ]; + mockParcelService.fetchByApplicationSubmissionUuid.mockResolvedValue([ + new NoticeOfIntentParcel({ + owners, + }), + ]); + + await service.updateSubmissionApplicant(''); + + expect(mockApplicationservice.update).toHaveBeenCalledTimes(1); + expect(mockApplicationservice.update.mock.calls[0][1].applicant).toEqual( + '1 et al.', + ); + }); + + it('should use the first created parcel to set the application applicants name', async () => { + mockRepo.find.mockResolvedValue([new NoticeOfIntentOwner()]); + const owners1 = [ + new NoticeOfIntentOwner({ + firstName: 'C', + lastName: 'C', + }), + ]; + const owners2 = [ + new NoticeOfIntentOwner({ + firstName: 'A', + lastName: 'A', + }), + ]; + mockParcelService.fetchByApplicationSubmissionUuid.mockResolvedValue([ + new NoticeOfIntentParcel({ + owners: owners1, + auditCreatedAt: new Date(1), + }), + new NoticeOfIntentParcel({ + owners: owners2, + auditCreatedAt: new Date(100), + }), + ]); + + await service.updateSubmissionApplicant(''); + + expect(mockApplicationservice.update).toHaveBeenCalledTimes(1); + expect(mockApplicationservice.update.mock.calls[0][1].applicant).toEqual( + 'A et al.', + ); + }); + + it('should load then delete non application owners', async () => { + mockRepo.find.mockResolvedValue([new NoticeOfIntentOwner()]); + mockRepo.remove.mockResolvedValue([] as any); + + await service.deleteNonParcelOwners('uuid'); + + expect(mockRepo.find).toHaveBeenCalledTimes(1); + expect(mockRepo.remove).toHaveBeenCalledTimes(1); + }); +}); diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.service.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.service.ts new file mode 100644 index 0000000000..33d81961a7 --- /dev/null +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.service.ts @@ -0,0 +1,294 @@ +import { forwardRef, Inject, Injectable } from '@nestjs/common'; +import { InjectRepository } from '@nestjs/typeorm'; +import { Any, Repository } from 'typeorm'; +import { NoticeOfIntentDocumentService } from '../../../alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.service'; +import { + OWNER_TYPE, + OwnerType, +} from '../../../common/owner-type/owner-type.entity'; +import { NoticeOfIntentParcelService } from '../notice-of-intent-parcel/notice-of-intent-parcel.service'; +import { NoticeOfIntentSubmission } from '../notice-of-intent-submission.entity'; +import { NoticeOfIntentSubmissionService } from '../notice-of-intent-submission.service'; +import { + NoticeOfIntentOwnerCreateDto, + NoticeOfIntentOwnerUpdateDto, +} from './notice-of-intent-owner.dto'; +import { NoticeOfIntentOwner } from './notice-of-intent-owner.entity'; + +@Injectable() +export class NoticeOfIntentOwnerService { + constructor( + @InjectRepository(NoticeOfIntentOwner) + private repository: Repository, + @InjectRepository(OwnerType) + private typeRepository: Repository, + @Inject(forwardRef(() => NoticeOfIntentParcelService)) + private noticeOfIntentParcelService: NoticeOfIntentParcelService, + @Inject(forwardRef(() => NoticeOfIntentSubmissionService)) + private noticeOfIntentSubmissionService: NoticeOfIntentSubmissionService, + private noticeOfIntentDocumentService: NoticeOfIntentDocumentService, + ) {} + + async fetchByApplicationFileId(fileId: string) { + return this.repository.find({ + where: { + noticeOfIntentSubmission: { + fileNumber: fileId, + }, + }, + relations: { + type: true, + corporateSummary: { + document: true, + }, + }, + }); + } + + async create( + createDto: NoticeOfIntentOwnerCreateDto, + noticeOfIntentSubmission: NoticeOfIntentSubmission, + ) { + const type = await this.typeRepository.findOneOrFail({ + where: { + code: createDto.typeCode, + }, + }); + + const newOwner = new NoticeOfIntentOwner({ + firstName: createDto.firstName, + lastName: createDto.lastName, + organizationName: createDto.organizationName, + email: createDto.email, + phoneNumber: createDto.phoneNumber, + corporateSummaryUuid: createDto.corporateSummaryUuid, + noticeOfIntentSubmission, + type, + }); + + return await this.repository.save(newOwner); + } + + async attachToParcel(uuid: string, parcelUuid: string) { + const existingOwner = await this.repository.findOneOrFail({ + where: { + uuid, + }, + relations: { + parcels: true, + }, + }); + + const parcel = await this.noticeOfIntentParcelService.getOneOrFail( + parcelUuid, + ); + existingOwner.parcels.push(parcel); + + await this.updateSubmissionApplicant( + existingOwner.noticeOfIntentSubmissionUuid, + ); + + await this.repository.save(existingOwner); + } + + async save(owner: NoticeOfIntentOwner) { + await this.repository.save(owner); + } + + async removeFromParcel(uuid: string, parcelUuid: string) { + const existingOwner = await this.repository.findOneOrFail({ + where: { + uuid, + }, + relations: { + parcels: true, + }, + }); + + existingOwner.parcels = existingOwner.parcels.filter( + (parcel) => parcel.uuid !== parcelUuid, + ); + + await this.updateSubmissionApplicant( + existingOwner.noticeOfIntentSubmissionUuid, + ); + + await this.repository.save(existingOwner); + } + + async update(uuid: string, updateDto: NoticeOfIntentOwnerUpdateDto) { + const existingOwner = await this.repository.findOneOrFail({ + where: { + uuid, + }, + relations: { + corporateSummary: { + document: true, + }, + }, + }); + + if (updateDto.typeCode) { + existingOwner.type = await this.typeRepository.findOneOrFail({ + where: { + code: updateDto.typeCode, + }, + }); + } + + //If attaching new document and old one was defined, delete it + if ( + existingOwner.corporateSummaryUuid !== updateDto.corporateSummaryUuid && + existingOwner.corporateSummary + ) { + const oldSummary = existingOwner.corporateSummary; + existingOwner.corporateSummary = null; + await this.repository.save(existingOwner); + await this.noticeOfIntentDocumentService.delete(oldSummary); + } + + existingOwner.corporateSummaryUuid = + updateDto.corporateSummaryUuid !== undefined + ? updateDto.corporateSummaryUuid + : existingOwner.corporateSummaryUuid; + + existingOwner.organizationName = + updateDto.organizationName !== undefined + ? updateDto.organizationName + : existingOwner.organizationName; + + existingOwner.firstName = + updateDto.firstName !== undefined + ? updateDto.firstName + : existingOwner.firstName; + + existingOwner.lastName = + updateDto.lastName !== undefined + ? updateDto.lastName + : existingOwner.lastName; + + existingOwner.phoneNumber = + updateDto.phoneNumber !== undefined + ? updateDto.phoneNumber + : existingOwner.phoneNumber; + + existingOwner.email = + updateDto.email !== undefined ? updateDto.email : existingOwner.email; + + await this.updateSubmissionApplicant( + existingOwner.noticeOfIntentSubmissionUuid, + ); + + return await this.repository.save(existingOwner); + } + + async delete(owner: NoticeOfIntentOwner) { + const res = await this.repository.remove(owner); + await this.updateSubmissionApplicant(owner.noticeOfIntentSubmissionUuid); + return res; + } + + async setPrimaryContact(submissionUuid: string, owner: NoticeOfIntentOwner) { + await this.noticeOfIntentSubmissionService.setPrimaryContact( + submissionUuid, + owner.uuid, + ); + } + + async getOwner(ownerUuid: string) { + return await this.repository.findOneOrFail({ + where: { + uuid: ownerUuid, + }, + relations: { + type: true, + corporateSummary: { + document: true, + }, + }, + }); + } + + async getMany(ownerUuids: string[]) { + return await this.repository.find({ + where: { + uuid: Any(ownerUuids), + }, + }); + } + + async deleteNonParcelOwners(submissionUuid: string) { + const agentOwners = await this.repository.find({ + where: [ + { + noticeOfIntentSubmission: { + uuid: submissionUuid, + }, + type: { + code: OWNER_TYPE.AGENT, + }, + }, + { + noticeOfIntentSubmission: { + uuid: submissionUuid, + }, + type: { + code: OWNER_TYPE.GOVERNMENT, + }, + }, + ], + }); + return await this.repository.remove(agentOwners); + } + + async updateSubmissionApplicant(submissionUuid: string) { + const parcels = + await this.noticeOfIntentParcelService.fetchByApplicationSubmissionUuid( + submissionUuid, + ); + + if (parcels.length > 0) { + const firstParcel = parcels.reduce((a, b) => + a.auditCreatedAt > b.auditCreatedAt ? a : b, + ); + + const ownerCount = parcels.reduce((count, parcel) => { + return count + parcel.owners.length; + }, 0); + + if (firstParcel) { + //Filter to only alphabetic + const alphabetOwners = firstParcel.owners.filter((owner) => + isNaN( + parseInt( + (owner.organizationName ?? owner.lastName ?? '').charAt(0), + ), + ), + ); + + //If no alphabetic use them all + if (alphabetOwners.length === 0) { + alphabetOwners.push(...firstParcel.owners); + } + + const firstOwner = alphabetOwners.sort((a, b) => { + const mappedA = a.organizationName ?? a.lastName ?? ''; + const mappedB = b.organizationName ?? b.lastName ?? ''; + return mappedA.localeCompare(mappedB); + })[0]; + if (firstOwner) { + let applicantName = firstOwner.organizationName + ? firstOwner.organizationName + : firstOwner.lastName; + if (ownerCount > 1) { + applicantName += ' et al.'; + } + + await this.noticeOfIntentSubmissionService.update(submissionUuid, { + applicant: applicantName || '', + }); + } + } + } + } +} diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel-ownership-type/notice-of-intent-parcel-ownership-type.entity.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel-ownership-type/notice-of-intent-parcel-ownership-type.entity.ts new file mode 100644 index 0000000000..e6d3229bd5 --- /dev/null +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel-ownership-type/notice-of-intent-parcel-ownership-type.entity.ts @@ -0,0 +1,5 @@ +import { Entity } from 'typeorm'; +import { BaseCodeEntity } from '../../../../common/entities/base.code.entity'; + +@Entity() +export class NoticeOfIntentParcelOwnershipType extends BaseCodeEntity {} diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.controller.spec.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.controller.spec.ts new file mode 100644 index 0000000000..b2cbd3aa93 --- /dev/null +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.controller.spec.ts @@ -0,0 +1,165 @@ +import { classes } from '@automapper/classes'; +import { AutomapperModule } from '@automapper/nestjs'; +import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; +import { Test, TestingModule } from '@nestjs/testing'; +import { ClsService } from 'nestjs-cls'; +import { mockKeyCloakProviders } from '../../../../test/mocks/mockTypes'; +import { NoticeOfIntentDocumentService } from '../../../alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.service'; +import { NoticeOfIntentParcelProfile } from '../../../common/automapper/notice-of-intent-parcel.automapper.profile'; +import { DocumentService } from '../../../document/document.service'; +import { NoticeOfIntentOwnerService } from '../notice-of-intent-owner/notice-of-intent-owner.service'; +import { NoticeOfIntentSubmission } from '../notice-of-intent-submission.entity'; +import { NoticeOfIntentSubmissionService } from '../notice-of-intent-submission.service'; +import { NoticeOfIntentParcelController } from './notice-of-intent-parcel.controller'; +import { NoticeOfIntentParcelUpdateDto } from './notice-of-intent-parcel.dto'; +import { NoticeOfIntentParcel } from './notice-of-intent-parcel.entity'; +import { NoticeOfIntentParcelService } from './notice-of-intent-parcel.service'; + +describe('NoticeOfIntentParcelController', () => { + let controller: NoticeOfIntentParcelController; + let mockNOIParcelService: DeepMocked; + let mockNOIService: DeepMocked; + let mockNOIOwnerService: DeepMocked; + let mockDocumentService: DeepMocked; + let mockNOIDocumentService: DeepMocked; + + beforeEach(async () => { + mockNOIParcelService = createMock(); + mockNOIService = createMock(); + mockNOIOwnerService = createMock(); + mockDocumentService = createMock(); + mockNOIDocumentService = createMock(); + + const module: TestingModule = await Test.createTestingModule({ + imports: [ + AutomapperModule.forRoot({ + strategyInitializer: classes(), + }), + ], + controllers: [NoticeOfIntentParcelController], + providers: [ + NoticeOfIntentParcelProfile, + { + provide: NoticeOfIntentParcelService, + useValue: mockNOIParcelService, + }, + { + provide: NoticeOfIntentSubmissionService, + useValue: mockNOIService, + }, + { + provide: NoticeOfIntentOwnerService, + useValue: mockNOIOwnerService, + }, + { + provide: DocumentService, + useValue: mockDocumentService, + }, + { + provide: NoticeOfIntentDocumentService, + useValue: mockNOIDocumentService, + }, + { + provide: ClsService, + useValue: {}, + }, + ...mockKeyCloakProviders, + ], + }).compile(); + + controller = module.get( + NoticeOfIntentParcelController, + ); + }); + + it('should be defined', () => { + expect(controller).toBeDefined(); + }); + + it('should call out to service when fetching parcels', async () => { + mockNOIParcelService.fetchByApplicationSubmissionUuid.mockResolvedValue([]); + + const parcels = await controller.fetchByFileId('mockFileID'); + + expect(parcels).toBeDefined(); + expect( + mockNOIParcelService.fetchByApplicationSubmissionUuid, + ).toHaveBeenCalledTimes(1); + }); + + it('should call out to service when creating parcels', async () => { + mockNOIService.getOrFailByUuid.mockResolvedValue( + {} as NoticeOfIntentSubmission, + ); + mockNOIParcelService.create.mockResolvedValue({} as NoticeOfIntentParcel); + mockNOIOwnerService.attachToParcel.mockResolvedValue(); + + const parcel = await controller.create({ + noticeOfIntentSubmissionUuid: 'fake', + }); + + expect(mockNOIService.getOrFailByUuid).toBeCalledTimes(1); + expect(mockNOIParcelService.create).toBeCalledTimes(1); + expect(mockNOIOwnerService.attachToParcel).toBeCalledTimes(0); + expect(parcel).toBeDefined(); + }); + + it('should call out to service and revert newly created "other" parcel if failed to link it to and owner during creation process', async () => { + const mockError = new Error('mock error'); + mockNOIService.getOrFailByUuid.mockResolvedValue( + {} as NoticeOfIntentSubmission, + ); + mockNOIParcelService.create.mockResolvedValue({} as NoticeOfIntentParcel); + mockNOIOwnerService.attachToParcel.mockRejectedValue(mockError); + mockNOIParcelService.deleteMany.mockResolvedValue([]); + + await expect( + controller.create({ + noticeOfIntentSubmissionUuid: 'fake', + ownerUuid: 'fake_uuid', + parcelType: 'other', + }), + ).rejects.toMatchObject(mockError); + + expect(mockNOIService.getOrFailByUuid).toBeCalledTimes(1); + expect(mockNOIParcelService.create).toBeCalledTimes(1); + expect(mockNOIParcelService.deleteMany).toBeCalledTimes(1); + expect(mockNOIOwnerService.attachToParcel).toBeCalledTimes(1); + }); + + it('should call out to service when updating parcel', async () => { + const mockUpdateDto: NoticeOfIntentParcelUpdateDto[] = [ + { + uuid: 'fake_uuid', + pid: 'mock_pid', + pin: 'mock_pin', + legalDescription: 'mock_legal', + mapAreaHectares: 2, + purchasedDate: 1, + isFarm: true, + isConfirmedByApplicant: true, + ownershipTypeCode: 'SMPL', + ownerUuids: null, + }, + ]; + + mockNOIParcelService.update.mockResolvedValue([ + {}, + ] as NoticeOfIntentParcel[]); + + const parcel = await controller.update(mockUpdateDto); + + expect(mockNOIParcelService.update).toBeCalledTimes(1); + expect(parcel).toBeDefined(); + }); + + it('should call out to service when deleting parcel', async () => { + const fakeUuid = 'fake_uuid'; + mockNOIParcelService.deleteMany.mockResolvedValue([]); + + const result = await controller.delete([fakeUuid]); + + expect(mockNOIParcelService.deleteMany).toBeCalledTimes(1); + expect(result).toBeDefined(); + }); +}); diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.controller.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.controller.ts new file mode 100644 index 0000000000..d84a44e651 --- /dev/null +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.controller.ts @@ -0,0 +1,158 @@ +import { Mapper } from '@automapper/core'; +import { InjectMapper } from '@automapper/nestjs'; +import { + Body, + Controller, + Delete, + Get, + Param, + Post, + Put, + Req, + UseGuards, +} from '@nestjs/common'; +import { VISIBILITY_FLAG } from '../../../alcs/application/application-document/application-document.entity'; +import { NoticeOfIntentDocumentDto } from '../../../alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.dto'; +import { NoticeOfIntentDocument } from '../../../alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.entity'; +import { NoticeOfIntentDocumentService } from '../../../alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.service'; +import { PortalAuthGuard } from '../../../common/authorization/portal-auth-guard.service'; +import { DOCUMENT_TYPE } from '../../../document/document-code.entity'; +import { + DOCUMENT_SOURCE, + DOCUMENT_SYSTEM, +} from '../../../document/document.dto'; +import { DocumentService } from '../../../document/document.service'; +import { NoticeOfIntentOwnerService } from '../notice-of-intent-owner/notice-of-intent-owner.service'; +import { NoticeOfIntentSubmissionService } from '../notice-of-intent-submission.service'; +import { + AttachCertificateOfTitleDto, + NoticeOfIntentParcelCreateDto, + NoticeOfIntentParcelDto, + NoticeOfIntentParcelUpdateDto, +} from './notice-of-intent-parcel.dto'; +import { NoticeOfIntentParcel } from './notice-of-intent-parcel.entity'; +import { NoticeOfIntentParcelService } from './notice-of-intent-parcel.service'; + +@Controller('notice-of-intent-parcel') +@UseGuards(PortalAuthGuard) +export class NoticeOfIntentParcelController { + constructor( + private parcelService: NoticeOfIntentParcelService, + private noticeOfIntentSubmissionService: NoticeOfIntentSubmissionService, + @InjectMapper() private mapper: Mapper, + private ownerService: NoticeOfIntentOwnerService, + private documentService: DocumentService, + private noticeOfIntentDocumentService: NoticeOfIntentDocumentService, + ) {} + + @Get('submission/:submissionUuid') + async fetchByFileId( + @Param('submissionUuid') submissionUuid: string, + ): Promise { + const parcels = await this.parcelService.fetchByApplicationSubmissionUuid( + submissionUuid, + ); + return this.mapper.mapArrayAsync( + parcels, + NoticeOfIntentParcel, + NoticeOfIntentParcelDto, + ); + } + + @Post() + async create( + @Body() createDto: NoticeOfIntentParcelCreateDto, + ): Promise { + const noticeOfIntentSubmission = + await this.noticeOfIntentSubmissionService.getOrFailByUuid( + createDto.noticeOfIntentSubmissionUuid, + ); + const parcel = await this.parcelService.create( + noticeOfIntentSubmission.uuid, + ); + + try { + if (createDto.ownerUuid) { + await this.ownerService.attachToParcel( + createDto.ownerUuid, + parcel.uuid, + ); + } + } catch (e) { + await this.delete([parcel.uuid]); + throw e; + } + + return this.mapper.mapAsync( + parcel, + NoticeOfIntentParcel, + NoticeOfIntentParcelDto, + ); + } + + @Put('/') + async update( + @Body() updateDtos: NoticeOfIntentParcelUpdateDto[], + ): Promise { + const updatedParcels = await this.parcelService.update(updateDtos); + + return this.mapper.mapArrayAsync( + updatedParcels, + NoticeOfIntentParcel, + NoticeOfIntentParcelDto, + ); + } + + @Delete() + async delete(@Body() uuids: string[]) { + const deletedParcels = await this.parcelService.deleteMany(uuids); + return this.mapper.mapArrayAsync( + deletedParcels, + NoticeOfIntentParcel, + NoticeOfIntentParcelDto, + ); + } + + @Post(':uuid/attachCertificateOfTitle') + async attachCorporateSummary( + @Req() req, + @Param('uuid') parcelUuid: string, + @Body() data: AttachCertificateOfTitleDto, + ) { + const parcel = await this.parcelService.getOneOrFail(parcelUuid); + const document = await this.documentService.createDocumentRecord({ + ...data, + uploadedBy: req.user.entity, + source: DOCUMENT_SOURCE.APPLICANT, + system: DOCUMENT_SYSTEM.PORTAL, + }); + + const noticeOfIntentSubmission = + await this.noticeOfIntentSubmissionService.verifyAccessByUuid( + parcel.noticeOfIntentSubmissionUuid, + req.user.entity, + ); + + const certificateOfTitle = + await this.noticeOfIntentDocumentService.attachExternalDocument( + noticeOfIntentSubmission!.fileNumber, + { + documentUuid: document.uuid, + type: DOCUMENT_TYPE.CERTIFICATE_OF_TITLE, + }, + [ + VISIBILITY_FLAG.APPLICANT, + VISIBILITY_FLAG.GOVERNMENT, + VISIBILITY_FLAG.COMMISSIONER, + ], + ); + + await this.parcelService.setCertificateOfTitle(parcel, certificateOfTitle); + + return this.mapper.map( + certificateOfTitle, + NoticeOfIntentDocument, + NoticeOfIntentDocumentDto, + ); + } +} diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.dto.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.dto.ts new file mode 100644 index 0000000000..2e6732dd14 --- /dev/null +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.dto.ts @@ -0,0 +1,147 @@ +import { AutoMap } from '@automapper/classes'; +import { + IsArray, + IsBoolean, + IsNotEmpty, + IsNumber, + IsOptional, + IsString, +} from 'class-validator'; +import { NoticeOfIntentDocumentDto } from '../../../alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.dto'; +import { BaseCodeDto } from '../../../common/dtos/base.dto'; +import { NoticeOfIntentOwnerDto } from '../notice-of-intent-owner/notice-of-intent-owner.dto'; + +export class NoticeOfIntentParcelOwnershipTypeDto extends BaseCodeDto {} + +export class NoticeOfIntentParcelDto { + @AutoMap() + uuid: string; + + @AutoMap() + applicationSubmissionUuid: string; + + @AutoMap(() => String) + certificateOfTitleUuid: string | null; + + @AutoMap(() => String) + pid?: string | null; + + @AutoMap(() => String) + pin?: string | null; + + @AutoMap(() => String) + legalDescription?: string | null; + + @AutoMap(() => String) + civicAddress?: string | null; + + @AutoMap(() => Number) + mapAreaHectares?: number | null; + + @AutoMap(() => Number) + purchasedDate?: number | null; + + @AutoMap(() => Boolean) + isFarm?: boolean | null; + + @AutoMap(() => Boolean) + isConfirmedByApplicant?: boolean; + + @AutoMap(() => String) + ownershipTypeCode?: string | null; + + @AutoMap(() => String) + crownLandOwnerType?: string | null; + + ownershipType?: NoticeOfIntentParcelOwnershipTypeDto; + + @AutoMap(() => String) + parcelType: string; + + @AutoMap(() => Number) + alrArea: number | null; + + certificateOfTitle?: NoticeOfIntentDocumentDto; + owners: NoticeOfIntentOwnerDto[]; +} + +export class NoticeOfIntentParcelCreateDto { + @IsNotEmpty() + @IsString() + noticeOfIntentSubmissionUuid: string; + + @IsOptional() + @IsString() + parcelType?: string; + + @IsOptional() + @IsString() + ownerUuid?: string; +} + +export class NoticeOfIntentParcelUpdateDto { + @IsString() + uuid: string; + + @IsString() + @IsOptional() + pid?: string | null; + + @IsString() + @IsOptional() + pin?: string | null; + + @IsString() + @IsOptional() + civicAddress?: string | null; + + @IsString() + @IsOptional() + legalDescription?: string | null; + + @IsNumber() + @IsOptional() + mapAreaHectares?: number | null; + + @IsNumber() + @IsOptional() + purchasedDate?: number | null; + + @IsBoolean() + @IsOptional() + isFarm?: boolean | null; + + @IsBoolean() + @IsOptional() + isConfirmedByApplicant?: boolean; + + @IsString() + @IsOptional() + ownershipTypeCode?: string | null; + + @IsString() + @IsOptional() + crownLandOwnerType?: string | null; + + @IsArray() + @IsOptional() + ownerUuids?: string[] | null; + + @IsNumber() + @IsOptional() + alrArea?: number | null; +} + +export class AttachCertificateOfTitleDto { + @IsString() + mimeType: string; + + @IsString() + fileName: string; + + @IsNumber() + fileSize: number; + + @IsString() + fileKey: string; +} diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.entity.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.entity.ts new file mode 100644 index 0000000000..12b817142c --- /dev/null +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.entity.ts @@ -0,0 +1,147 @@ +import { AutoMap } from '@automapper/classes'; +import { + Column, + Entity, + JoinColumn, + JoinTable, + ManyToMany, + ManyToOne, +} from 'typeorm'; +import { NoticeOfIntentDocumentDto } from '../../../alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.dto'; +import { NoticeOfIntentDocument } from '../../../alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.entity'; +import { Base } from '../../../common/entities/base.entity'; +import { ColumnNumericTransformer } from '../../../utils/column-numeric-transform'; +import { NoticeOfIntentOwner } from '../notice-of-intent-owner/notice-of-intent-owner.entity'; +import { NoticeOfIntentSubmission } from '../notice-of-intent-submission.entity'; +import { NoticeOfIntentParcelOwnershipType } from './notice-of-intent-parcel-ownership-type/notice-of-intent-parcel-ownership-type.entity'; + +@Entity() +export class NoticeOfIntentParcel extends Base { + constructor(data?: Partial) { + super(); + if (data) { + Object.assign(this, data); + } + } + + @AutoMap(() => String) + @Column({ + type: 'varchar', + comment: + 'The Parcels pid entered by the user or populated from third-party data', + nullable: true, + }) + pid?: string | null; + + @AutoMap(() => String) + @Column({ + type: 'varchar', + comment: + 'The Parcels pin entered by the user or populated from third-party data', + nullable: true, + }) + pin?: string | null; + + @AutoMap(() => String) + @Column({ + type: 'varchar', + comment: + 'The Parcels legalDescription entered by the user or populated from third-party data', + nullable: true, + }) + legalDescription?: string | null; + + @AutoMap(() => String) + @Column({ + type: 'varchar', + comment: 'The standard address for the parcel', + nullable: true, + }) + civicAddress?: string | null; + + @AutoMap(() => String) + @Column({ + type: 'float', + comment: + 'The Parcels map are in hectares entered by the user or populated from third-party data', + nullable: true, + }) + mapAreaHectares?: number | null; + + @AutoMap(() => String) + @Column({ + type: 'boolean', + comment: 'The Parcels indication whether it is used as a farm', + nullable: true, + }) + isFarm?: boolean | null; + + @AutoMap() + @Column({ + type: 'timestamptz', + nullable: true, + comment: 'The Parcels purchase date provided by user', + }) + purchasedDate?: Date | null; + + @AutoMap(() => Boolean) + @Column({ + type: 'boolean', + comment: + 'The Parcels indication whether applicant signed off provided data including the Certificate of Title', + nullable: false, + default: false, + }) + isConfirmedByApplicant: boolean; + + @AutoMap() + @ManyToOne(() => NoticeOfIntentSubmission) + noticeOfIntentSubmission: NoticeOfIntentSubmission; + + @AutoMap() + @Column() + noticeOfIntentSubmissionUuid: string; + + @AutoMap(() => String) + @Column({ nullable: true }) + ownershipTypeCode?: string | null; + + @AutoMap() + @ManyToOne(() => NoticeOfIntentParcelOwnershipType) + ownershipType: NoticeOfIntentParcelOwnershipType; + + @AutoMap(() => Boolean) + @Column({ + type: 'text', + comment: + 'For Crown Land parcels to indicate whether they are provincially owned or federally owned', + nullable: true, + }) + crownLandOwnerType?: string | null; + + @ManyToMany(() => NoticeOfIntentOwner, (owner) => owner.parcels) + @JoinTable() + owners: NoticeOfIntentOwner[]; + + @AutoMap(() => NoticeOfIntentDocumentDto) + @JoinColumn() + @ManyToOne(() => NoticeOfIntentDocument, { + nullable: true, + onDelete: 'SET NULL', + }) + certificateOfTitle?: NoticeOfIntentDocument; + + @AutoMap(() => String) + @Column({ nullable: true }) + certificateOfTitleUuid: string | null; + + @AutoMap(() => Number) + @Column({ + type: 'decimal', + nullable: true, + precision: 12, + scale: 2, + transformer: new ColumnNumericTransformer(), + }) + alrArea?: number | null; +} diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.service.spec.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.service.spec.ts new file mode 100644 index 0000000000..099481434d --- /dev/null +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.service.spec.ts @@ -0,0 +1,248 @@ +import { ServiceValidationException } from '@app/common/exceptions/base.exception'; +import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; +import { Test, TestingModule } from '@nestjs/testing'; +import { getRepositoryToken } from '@nestjs/typeorm'; +import { In, Repository } from 'typeorm'; +import { NoticeOfIntentOwnerService } from '../notice-of-intent-owner/notice-of-intent-owner.service'; +import { NoticeOfIntentParcelUpdateDto } from './notice-of-intent-parcel.dto'; +import { NoticeOfIntentParcel } from './notice-of-intent-parcel.entity'; +import { NoticeOfIntentParcelService } from './notice-of-intent-parcel.service'; + +describe('NoticeOfIntentParcelService', () => { + let service: NoticeOfIntentParcelService; + let mockParcelRepo: DeepMocked>; + let mockOwnerService: DeepMocked; + + const mockFileNumber = 'mock_applicationFileNumber'; + const mockUuid = 'mock_uuid'; + const mockNOIParcel = new NoticeOfIntentParcel({ + uuid: mockUuid, + pid: 'mock_pid', + pin: 'mock_pin', + legalDescription: 'mock_legalDescription', + mapAreaHectares: 1, + isFarm: true, + purchasedDate: new Date(1, 1, 1), + isConfirmedByApplicant: true, + noticeOfIntentSubmissionUuid: mockFileNumber, + ownershipTypeCode: 'mock_ownershipTypeCode', + }); + const mockError = new Error('Parcel does not exist.'); + + beforeEach(async () => { + mockParcelRepo = createMock(); + mockOwnerService = createMock(); + const module: TestingModule = await Test.createTestingModule({ + providers: [ + NoticeOfIntentParcelService, + { + provide: getRepositoryToken(NoticeOfIntentParcel), + useValue: mockParcelRepo, + }, + { + provide: NoticeOfIntentOwnerService, + useValue: mockOwnerService, + }, + ], + }).compile(); + + service = module.get( + NoticeOfIntentParcelService, + ); + }); + + it('should be defined', () => { + expect(service).toBeDefined(); + }); + + it('should fetch parcels by fileNumber', async () => { + mockParcelRepo.find.mockResolvedValue([mockNOIParcel]); + + const result = await service.fetchByApplicationFileId(mockFileNumber); + + expect(result).toEqual([mockNOIParcel]); + expect(mockParcelRepo.find).toBeCalledTimes(1); + expect(mockParcelRepo.find).toBeCalledWith({ + where: { + noticeOfIntentSubmission: { + fileNumber: mockFileNumber, + isDraft: false, + }, + }, + order: { auditCreatedAt: 'ASC' }, + relations: { + certificateOfTitle: { document: true }, + owners: { + corporateSummary: { + document: true, + }, + type: true, + }, + ownershipType: true, + }, + }); + }); + + it('should get one parcel by id', async () => { + mockParcelRepo.findOneOrFail.mockResolvedValue(mockNOIParcel); + + const result = await service.getOneOrFail(mockUuid); + + expect(result).toEqual(mockNOIParcel); + expect(mockParcelRepo.findOneOrFail).toBeCalledTimes(1); + expect(mockParcelRepo.findOneOrFail).toBeCalledWith({ + where: { uuid: mockUuid }, + }); + }); + + it('should raise error on get parcel by uuid if the parcel does not exist', async () => { + mockParcelRepo.findOneOrFail.mockRejectedValue(mockError); + + await expect(service.getOneOrFail(mockUuid)).rejects.toMatchObject( + mockError, + ); + expect(mockParcelRepo.findOneOrFail).toBeCalledTimes(1); + expect(mockParcelRepo.findOneOrFail).toBeCalledWith({ + where: { uuid: mockUuid }, + }); + }); + + it('should successfully update parcel', async () => { + const updateParcelDto = [ + { + uuid: mockUuid, + pid: 'mock_pid', + pin: 'mock_pin', + legalDescription: 'mock_legalDescription', + mapAreaHectares: 1, + isFarm: true, + purchasedDate: 1, + isConfirmedByApplicant: true, + ownershipTypeCode: 'mock_ownershipTypeCode', + }, + ] as NoticeOfIntentParcelUpdateDto[]; + + mockParcelRepo.findOneOrFail.mockResolvedValue(mockNOIParcel); + mockParcelRepo.save.mockResolvedValue({} as NoticeOfIntentParcel); + + await service.update(updateParcelDto); + + expect(mockParcelRepo.findOneOrFail).toBeCalledTimes(1); + expect(mockParcelRepo.findOneOrFail).toBeCalledWith({ + where: { uuid: mockUuid }, + }); + expect(mockParcelRepo.save).toBeCalledTimes(1); + }); + + it('should update the applicant if the parcel has owners', async () => { + const updateParcelDto = [ + { + uuid: mockUuid, + pid: 'mock_pid', + pin: 'mock_pin', + legalDescription: 'mock_legalDescription', + mapAreaHectares: 1, + isFarm: true, + purchasedDate: 1, + isConfirmedByApplicant: true, + ownershipTypeCode: 'mock_ownershipTypeCode', + ownerUuids: ['cats'], + }, + ] as NoticeOfIntentParcelUpdateDto[]; + + mockParcelRepo.findOneOrFail.mockResolvedValue(mockNOIParcel); + mockParcelRepo.save.mockResolvedValue({} as NoticeOfIntentParcel); + mockOwnerService.updateSubmissionApplicant.mockResolvedValue(); + mockOwnerService.getMany.mockResolvedValue([]); + + await service.update(updateParcelDto); + + expect(mockParcelRepo.findOneOrFail).toBeCalledTimes(1); + expect(mockParcelRepo.findOneOrFail).toBeCalledWith({ + where: { uuid: mockUuid }, + }); + expect(mockParcelRepo.save).toBeCalledTimes(1); + expect(mockOwnerService.updateSubmissionApplicant).toHaveBeenCalledTimes(1); + }); + + it('it should fail to update a parcel if the parcel does not exist. ', async () => { + const updateParcelDto: NoticeOfIntentParcelUpdateDto[] = [ + { + uuid: mockUuid, + pid: 'mock_pid', + pin: 'mock_pin', + legalDescription: 'mock_legalDescription', + mapAreaHectares: 1, + isFarm: true, + purchasedDate: 1, + isConfirmedByApplicant: true, + ownershipTypeCode: 'mock_ownershipTypeCode', + }, + ]; + const mockError = new Error('Parcel does not exist.'); + + mockParcelRepo.findOneOrFail.mockRejectedValue(mockError); + mockParcelRepo.save.mockResolvedValue(new NoticeOfIntentParcel()); + + await expect(service.update(updateParcelDto)).rejects.toMatchObject( + mockError, + ); + expect(mockParcelRepo.findOneOrFail).toBeCalledTimes(1); + expect(mockParcelRepo.findOneOrFail).toBeCalledWith({ + where: { uuid: mockUuid }, + }); + expect(mockParcelRepo.save).toBeCalledTimes(0); + }); + + it('should successfully delete a parcel and update applicant', async () => { + mockParcelRepo.find.mockResolvedValue([mockNOIParcel]); + mockParcelRepo.remove.mockResolvedValue(new NoticeOfIntentParcel()); + mockOwnerService.updateSubmissionApplicant.mockResolvedValue(); + + const result = await service.deleteMany([mockUuid]); + + expect(result).toBeDefined(); + expect(mockParcelRepo.find).toBeCalledTimes(1); + expect(mockParcelRepo.find).toBeCalledWith({ + where: { uuid: In([mockUuid]) }, + }); + expect(mockParcelRepo.remove).toBeCalledWith([mockNOIParcel]); + expect(mockParcelRepo.remove).toBeCalledTimes(1); + expect(mockOwnerService.updateSubmissionApplicant).toHaveBeenCalledTimes(1); + }); + + it('should not call remove if the parcel does not exist', async () => { + const exception = new ServiceValidationException( + `Unable to find parcels with provided uuids: ${mockUuid}.`, + ); + + mockParcelRepo.find.mockResolvedValue([]); + mockParcelRepo.remove.mockResolvedValue(new NoticeOfIntentParcel()); + + await expect(service.deleteMany([mockUuid])).rejects.toMatchObject( + exception, + ); + expect(mockParcelRepo.find).toBeCalledTimes(1); + expect(mockParcelRepo.find).toBeCalledWith({ + where: { uuid: In([mockUuid]) }, + }); + expect(mockParcelRepo.remove).toBeCalledTimes(0); + }); + + it('should successfully create a parcel', async () => { + mockParcelRepo.save.mockResolvedValue({ + uuid: mockUuid, + noticeOfIntentSubmissionUuid: mockFileNumber, + } as NoticeOfIntentParcel); + + const mockParcel = new NoticeOfIntentParcel({ + uuid: mockUuid, + noticeOfIntentSubmissionUuid: mockFileNumber, + }); + + const result = await service.create(mockFileNumber); + + expect(result).toEqual(mockParcel); + expect(mockParcelRepo.save).toBeCalledTimes(1); + }); +}); diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.service.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.service.ts new file mode 100644 index 0000000000..ba69dc46bb --- /dev/null +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.service.ts @@ -0,0 +1,140 @@ +import { ServiceValidationException } from '@app/common/exceptions/base.exception'; +import { forwardRef, Inject, Injectable } from '@nestjs/common'; +import { InjectRepository } from '@nestjs/typeorm'; +import { In, Repository } from 'typeorm'; +import { NoticeOfIntentDocument } from '../../../alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.entity'; +import { formatIncomingDate } from '../../../utils/incoming-date.formatter'; +import { filterUndefined } from '../../../utils/undefined'; +import { NoticeOfIntentOwnerService } from '../notice-of-intent-owner/notice-of-intent-owner.service'; +import { NoticeOfIntentParcelUpdateDto } from './notice-of-intent-parcel.dto'; +import { NoticeOfIntentParcel } from './notice-of-intent-parcel.entity'; + +@Injectable() +export class NoticeOfIntentParcelService { + constructor( + @InjectRepository(NoticeOfIntentParcel) + private parcelRepository: Repository, + @Inject(forwardRef(() => NoticeOfIntentOwnerService)) + private noticeOfIntentOwnerService: NoticeOfIntentOwnerService, + ) {} + + async fetchByApplicationFileId(fileId: string) { + return this.parcelRepository.find({ + where: { + noticeOfIntentSubmission: { fileNumber: fileId, isDraft: false }, + }, + order: { auditCreatedAt: 'ASC' }, + relations: { + ownershipType: true, + certificateOfTitle: { document: true }, + owners: { + type: true, + corporateSummary: { + document: true, + }, + }, + }, + }); + } + + async fetchByApplicationSubmissionUuid(uuid: string) { + return this.parcelRepository.find({ + where: { noticeOfIntentSubmission: { uuid } }, + order: { auditCreatedAt: 'ASC' }, + relations: { + ownershipType: true, + certificateOfTitle: { document: true }, + owners: { + type: true, + corporateSummary: { + document: true, + }, + }, + }, + }); + } + + async create(noticeOfIntentSubmissionUuid: string) { + const parcel = new NoticeOfIntentParcel({ + noticeOfIntentSubmissionUuid, + }); + + return this.parcelRepository.save(parcel); + } + + async getOneOrFail(uuid: string) { + return this.parcelRepository.findOneOrFail({ + where: { uuid }, + }); + } + + async setCertificateOfTitle( + parcel: NoticeOfIntentParcel, + certificateOfTitle: NoticeOfIntentDocument, + ) { + parcel.certificateOfTitle = certificateOfTitle; + return await this.parcelRepository.save(parcel); + } + + async update(updateDtos: NoticeOfIntentParcelUpdateDto[]) { + const updatedParcels: NoticeOfIntentParcel[] = []; + + let hasOwnerUpdate = false; + for (const updateDto of updateDtos) { + const parcel = await this.getOneOrFail(updateDto.uuid); + + parcel.pid = updateDto.pid; + parcel.pin = updateDto.pin; + parcel.legalDescription = updateDto.legalDescription; + parcel.mapAreaHectares = updateDto.mapAreaHectares; + parcel.civicAddress = updateDto.civicAddress; + parcel.isFarm = updateDto.isFarm; + parcel.purchasedDate = formatIncomingDate(updateDto.purchasedDate); + parcel.ownershipTypeCode = updateDto.ownershipTypeCode; + parcel.isConfirmedByApplicant = filterUndefined( + updateDto.isConfirmedByApplicant, + parcel.isConfirmedByApplicant, + ); + parcel.crownLandOwnerType = updateDto.crownLandOwnerType; + parcel.alrArea = updateDto.alrArea; + + if (updateDto.ownerUuids) { + hasOwnerUpdate = true; + parcel.owners = await this.noticeOfIntentOwnerService.getMany( + updateDto.ownerUuids, + ); + } + + updatedParcels.push(parcel); + } + + const res = await this.parcelRepository.save(updatedParcels); + + if (hasOwnerUpdate) { + const firstParcel = updatedParcels[0]; + await this.noticeOfIntentOwnerService.updateSubmissionApplicant( + firstParcel.noticeOfIntentSubmissionUuid, + ); + } + return res; + } + + async deleteMany(uuids: string[]) { + const parcels = await this.parcelRepository.find({ + where: { uuid: In(uuids) }, + }); + + if (parcels.length === 0) { + throw new ServiceValidationException( + `Unable to find parcels with provided uuids: ${uuids}.`, + ); + } + + const result = await this.parcelRepository.remove(parcels); + await this.noticeOfIntentOwnerService.updateSubmissionApplicant( + parcels[0].noticeOfIntentSubmissionUuid, + ); + + return result; + } +} diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.entity.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.entity.ts index 790ccad385..498b9a0389 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.entity.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.entity.ts @@ -12,6 +12,7 @@ import { NoticeOfIntentSubmissionToSubmissionStatus } from '../../alcs/notice-of import { NoticeOfIntent } from '../../alcs/notice-of-intent/notice-of-intent.entity'; import { Base } from '../../common/entities/base.entity'; import { User } from '../../user/user.entity'; +import { NoticeOfIntentOwner } from './notice-of-intent-owner/notice-of-intent-owner.entity'; @Entity() export class NoticeOfIntentSubmission extends Base { @@ -187,6 +188,12 @@ export class NoticeOfIntentSubmission extends Base { }) noticeOfIntent: NoticeOfIntent; + @OneToMany( + () => NoticeOfIntentOwner, + (owner) => owner.noticeOfIntentSubmission, + ) + owners: NoticeOfIntentOwner[]; + @OneToMany( () => NoticeOfIntentSubmissionToSubmissionStatus, (status) => status.submission, diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.module.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.module.ts index 2a7378251c..33a9ac799f 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.module.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.module.ts @@ -5,16 +5,32 @@ import { LocalGovernmentModule } from '../../alcs/local-government/local-governm import { NoticeOfIntentSubmissionStatusModule } from '../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.module'; import { NoticeOfIntentModule } from '../../alcs/notice-of-intent/notice-of-intent.module'; import { AuthorizationModule } from '../../common/authorization/authorization.module'; +import { NoticeOfIntentOwnerProfile } from '../../common/automapper/notice-of-intent-owner.automapper.profile'; +import { NoticeOfIntentParcelProfile } from '../../common/automapper/notice-of-intent-parcel.automapper.profile'; import { NoticeOfIntentSubmissionProfile } from '../../common/automapper/notice-of-intent-submission.automapper.profile'; +import { OwnerType } from '../../common/owner-type/owner-type.entity'; import { DocumentModule } from '../../document/document.module'; import { FileNumberModule } from '../../file-number/file-number.module'; +import { NoticeOfIntentOwnerController } from './notice-of-intent-owner/notice-of-intent-owner.controller'; +import { NoticeOfIntentOwner } from './notice-of-intent-owner/notice-of-intent-owner.entity'; +import { NoticeOfIntentOwnerService } from './notice-of-intent-owner/notice-of-intent-owner.service'; +import { NoticeOfIntentParcelOwnershipType } from './notice-of-intent-parcel/notice-of-intent-parcel-ownership-type/notice-of-intent-parcel-ownership-type.entity'; +import { NoticeOfIntentParcelController } from './notice-of-intent-parcel/notice-of-intent-parcel.controller'; +import { NoticeOfIntentParcel } from './notice-of-intent-parcel/notice-of-intent-parcel.entity'; +import { NoticeOfIntentParcelService } from './notice-of-intent-parcel/notice-of-intent-parcel.service'; import { NoticeOfIntentSubmissionController } from './notice-of-intent-submission.controller'; import { NoticeOfIntentSubmission } from './notice-of-intent-submission.entity'; import { NoticeOfIntentSubmissionService } from './notice-of-intent-submission.service'; @Module({ imports: [ - TypeOrmModule.forFeature([NoticeOfIntentSubmission]), + TypeOrmModule.forFeature([ + NoticeOfIntentSubmission, + NoticeOfIntentParcel, + NoticeOfIntentParcelOwnershipType, + OwnerType, + NoticeOfIntentOwner, + ]), NoticeOfIntentSubmissionStatusModule, forwardRef(() => NoticeOfIntentModule), AuthorizationModule, @@ -23,7 +39,19 @@ import { NoticeOfIntentSubmissionService } from './notice-of-intent-submission.s LocalGovernmentModule, FileNumberModule, ], - controllers: [NoticeOfIntentSubmissionController], - providers: [NoticeOfIntentSubmissionService, NoticeOfIntentSubmissionProfile], + controllers: [ + NoticeOfIntentSubmissionController, + NoticeOfIntentParcelController, + NoticeOfIntentOwnerController, + ], + providers: [ + NoticeOfIntentSubmissionService, + NoticeOfIntentParcelService, + NoticeOfIntentOwnerService, + NoticeOfIntentSubmissionProfile, + NoticeOfIntentOwnerProfile, + NoticeOfIntentParcelProfile, + ], + exports: [NoticeOfIntentSubmissionService], }) export class NoticeOfIntentSubmissionModule {} diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts index abf85de386..db15158ca5 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts @@ -408,4 +408,8 @@ export class NoticeOfIntentSubmissionService { }, }); } + + async setPrimaryContact(submissionUuid: string, uuid: any) { + //TODO:? ?? + } } diff --git a/services/apps/alcs/src/portal/pdf-generation/generate-submission-document.service.ts b/services/apps/alcs/src/portal/pdf-generation/generate-submission-document.service.ts index 68992e01a4..6d087bfb97 100644 --- a/services/apps/alcs/src/portal/pdf-generation/generate-submission-document.service.ts +++ b/services/apps/alcs/src/portal/pdf-generation/generate-submission-document.service.ts @@ -10,6 +10,7 @@ import { import * as config from 'config'; import * as dayjs from 'dayjs'; import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; +import { OWNER_TYPE } from '../../common/owner-type/owner-type.entity'; import { DOCUMENT_TYPE } from '../../document/document-code.entity'; import { ApplicationDocument, @@ -20,7 +21,6 @@ import { ApplicationService } from '../../alcs/application/application.service'; import { DOCUMENT_SOURCE, DOCUMENT_SYSTEM } from '../../document/document.dto'; import { User } from '../../user/user.entity'; import { formatBooleanToYesNoString } from '../../utils/boolean-formatter'; -import { APPLICATION_OWNER } from '../application-submission/application-owner/application-owner.dto'; import { ApplicationOwnerService } from '../application-submission/application-owner/application-owner.service'; import { PARCEL_TYPE } from '../application-submission/application-parcel/application-parcel.dto'; import { ApplicationParcel } from '../application-submission/application-parcel/application-parcel.entity'; @@ -232,7 +232,7 @@ export class GenerateSubmissionDocumentService { applicant: submission.applicant, primaryContact, organizationText: - primaryContact?.type.code === APPLICATION_OWNER.CROWN + primaryContact?.type.code === OWNER_TYPE.CROWN ? 'Ministry/Department Responsible' : 'Organization (If Applicable)', diff --git a/services/apps/alcs/src/portal/portal.module.ts b/services/apps/alcs/src/portal/portal.module.ts index 4db394b272..8612f010e2 100644 --- a/services/apps/alcs/src/portal/portal.module.ts +++ b/services/apps/alcs/src/portal/portal.module.ts @@ -12,6 +12,7 @@ import { ApplicationSubmissionReviewModule } from './application-submission-revi import { ApplicationSubmissionModule } from './application-submission/application-submission.module'; import { CodeController } from './code/code.controller'; import { PortalDocumentModule } from './document/document.module'; +import { PortalNoticeOfIntentDocumentModule } from './notice-of-intent-document/notice-of-intent-document.module'; import { NoticeOfIntentSubmissionModule } from './notice-of-intent-submission/notice-of-intent-submission.module'; import { ParcelModule } from './parcel/parcel.module'; import { PdfGenerationModule } from './pdf-generation/pdf-generation.module'; @@ -32,6 +33,7 @@ import { PdfGenerationModule } from './pdf-generation/pdf-generation.module'; PortalApplicationDecisionModule, NoticeOfIntentModule, NoticeOfIntentSubmissionModule, + PortalNoticeOfIntentDocumentModule, RouterModule.register([ { path: 'portal', module: ApplicationSubmissionModule }, { path: 'portal', module: NoticeOfIntentSubmissionModule }, @@ -42,6 +44,7 @@ import { PdfGenerationModule } from './pdf-generation/pdf-generation.module'; { path: 'portal', module: ApplicationSubmissionDraftModule }, { path: 'portal', module: PdfGenerationModule }, { path: 'portal', module: PortalApplicationDecisionModule }, + { path: 'portal', module: PortalNoticeOfIntentDocumentModule }, ]), ], controllers: [CodeController], diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1691692339215-add_noi_submission_parcels_and_owners.ts b/services/apps/alcs/src/providers/typeorm/migrations/1691692339215-add_noi_submission_parcels_and_owners.ts new file mode 100644 index 0000000000..8547130c8c --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1691692339215-add_noi_submission_parcels_and_owners.ts @@ -0,0 +1,111 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class addNoiSubmissionParcelsAndOwners1691692339215 + implements MigrationInterface +{ + name = 'addNoiSubmissionParcelsAndOwners1691692339215'; + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `ALTER TABLE "alcs"."application_owner" DROP CONSTRAINT "FK_05181ec6491ee0aa527bd55c714"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_owner_type" RENAME TO "owner_type"`, + ); + await queryRunner.query( + `CREATE TABLE "alcs"."notice_of_intent_parcel_ownership_type" ("audit_deleted_date_at" TIMESTAMP WITH TIME ZONE, "audit_created_at" TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now(), "audit_updated_at" TIMESTAMP WITH TIME ZONE DEFAULT now(), "audit_created_by" character varying NOT NULL, "audit_updated_by" character varying, "label" character varying NOT NULL, "code" text NOT NULL, "description" text NOT NULL, CONSTRAINT "UQ_a7d503e16b2d7a04680dbfdcb59" UNIQUE ("description"), CONSTRAINT "PK_7b23cfdc8574f66dd2f88e37f3f" PRIMARY KEY ("code"))`, + ); + await queryRunner.query( + `CREATE TABLE "alcs"."notice_of_intent_parcel" ("audit_deleted_date_at" TIMESTAMP WITH TIME ZONE, "audit_created_at" TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now(), "audit_updated_at" TIMESTAMP WITH TIME ZONE DEFAULT now(), "audit_created_by" character varying NOT NULL, "audit_updated_by" character varying, "uuid" uuid NOT NULL DEFAULT gen_random_uuid(), "pid" character varying, "pin" character varying, "legal_description" character varying, "civic_address" character varying, "map_area_hectares" double precision, "is_farm" boolean, "purchased_date" TIMESTAMP WITH TIME ZONE, "is_confirmed_by_applicant" boolean NOT NULL DEFAULT false, "notice_of_intent_submission_uuid" uuid NOT NULL, "ownership_type_code" text, "crown_land_owner_type" text, "certificate_of_title_uuid" uuid, "alr_area" numeric(12,2), CONSTRAINT "PK_6cfd592c4237000793b5a891aa7" PRIMARY KEY ("uuid")); COMMENT ON COLUMN "alcs"."notice_of_intent_parcel"."pid" IS 'The Parcels pid entered by the user or populated from third-party data'; COMMENT ON COLUMN "alcs"."notice_of_intent_parcel"."pin" IS 'The Parcels pin entered by the user or populated from third-party data'; COMMENT ON COLUMN "alcs"."notice_of_intent_parcel"."legal_description" IS 'The Parcels legalDescription entered by the user or populated from third-party data'; COMMENT ON COLUMN "alcs"."notice_of_intent_parcel"."civic_address" IS 'The standard address for the parcel'; COMMENT ON COLUMN "alcs"."notice_of_intent_parcel"."map_area_hectares" IS 'The Parcels map are in hectares entered by the user or populated from third-party data'; COMMENT ON COLUMN "alcs"."notice_of_intent_parcel"."is_farm" IS 'The Parcels indication whether it is used as a farm'; COMMENT ON COLUMN "alcs"."notice_of_intent_parcel"."purchased_date" IS 'The Parcels purchase date provided by user'; COMMENT ON COLUMN "alcs"."notice_of_intent_parcel"."is_confirmed_by_applicant" IS 'The Parcels indication whether applicant signed off provided data including the Certificate of Title'; COMMENT ON COLUMN "alcs"."notice_of_intent_parcel"."crown_land_owner_type" IS 'For Crown Land parcels to indicate whether they are provincially owned or federally owned'`, + ); + await queryRunner.query( + `CREATE TABLE "alcs"."notice_of_intent_owner" ("audit_deleted_date_at" TIMESTAMP WITH TIME ZONE, "audit_created_at" TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now(), "audit_updated_at" TIMESTAMP WITH TIME ZONE DEFAULT now(), "audit_created_by" character varying NOT NULL, "audit_updated_by" character varying, "uuid" uuid NOT NULL DEFAULT gen_random_uuid(), "first_name" character varying, "last_name" character varying, "organization_name" character varying, "phone_number" character varying, "email" character varying, "corporate_summary_uuid" uuid, "notice_of_intent_submission_uuid" uuid NOT NULL, "type_code" text NOT NULL, CONSTRAINT "PK_057d19217ea35bb20b4b7e7ed43" PRIMARY KEY ("uuid"))`, + ); + await queryRunner.query( + `CREATE TABLE "alcs"."notice_of_intent_parcel_owners_notice_of_intent_owner" ("notice_of_intent_parcel_uuid" uuid NOT NULL, "notice_of_intent_owner_uuid" uuid NOT NULL, CONSTRAINT "PK_62cbd3e4f1802f240c40b1c37f8" PRIMARY KEY ("notice_of_intent_parcel_uuid", "notice_of_intent_owner_uuid"))`, + ); + await queryRunner.query( + `CREATE INDEX "IDX_a419bb29b4bdb7e5d4aa4181d1" ON "alcs"."notice_of_intent_parcel_owners_notice_of_intent_owner" ("notice_of_intent_parcel_uuid") `, + ); + await queryRunner.query( + `CREATE INDEX "IDX_4346ccc22b3ca8dafe57b25128" ON "alcs"."notice_of_intent_parcel_owners_notice_of_intent_owner" ("notice_of_intent_owner_uuid") `, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_owner" ADD CONSTRAINT "FK_05181ec6491ee0aa527bd55c714" FOREIGN KEY ("type_code") REFERENCES "alcs"."owner_type"("code") ON DELETE NO ACTION ON UPDATE NO ACTION`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_parcel" ADD CONSTRAINT "FK_8d14440209af146e7f351c7fbef" FOREIGN KEY ("notice_of_intent_submission_uuid") REFERENCES "alcs"."notice_of_intent_submission"("uuid") ON DELETE NO ACTION ON UPDATE NO ACTION`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_parcel" ADD CONSTRAINT "FK_7b23cfdc8574f66dd2f88e37f3f" FOREIGN KEY ("ownership_type_code") REFERENCES "alcs"."notice_of_intent_parcel_ownership_type"("code") ON DELETE NO ACTION ON UPDATE NO ACTION`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_parcel" ADD CONSTRAINT "FK_7b405f7700af3398ec38b70d634" FOREIGN KEY ("certificate_of_title_uuid") REFERENCES "alcs"."notice_of_intent_document"("uuid") ON DELETE SET NULL ON UPDATE NO ACTION`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_owner" ADD CONSTRAINT "FK_a27c5e1999ea94ce0dc0c923fb3" FOREIGN KEY ("corporate_summary_uuid") REFERENCES "alcs"."notice_of_intent_document"("uuid") ON DELETE SET NULL ON UPDATE NO ACTION`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_owner" ADD CONSTRAINT "FK_016562c9faf2b0d0ccc96212ee0" FOREIGN KEY ("type_code") REFERENCES "alcs"."owner_type"("code") ON DELETE NO ACTION ON UPDATE NO ACTION`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_owner" ADD CONSTRAINT "FK_df0c33df4e8ce83089e0645e928" FOREIGN KEY ("notice_of_intent_submission_uuid") REFERENCES "alcs"."notice_of_intent_submission"("uuid") ON DELETE NO ACTION ON UPDATE NO ACTION`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_parcel_owners_notice_of_intent_owner" ADD CONSTRAINT "FK_a419bb29b4bdb7e5d4aa4181d11" FOREIGN KEY ("notice_of_intent_parcel_uuid") REFERENCES "alcs"."notice_of_intent_parcel"("uuid") ON DELETE CASCADE ON UPDATE CASCADE`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_parcel_owners_notice_of_intent_owner" ADD CONSTRAINT "FK_4346ccc22b3ca8dafe57b251280" FOREIGN KEY ("notice_of_intent_owner_uuid") REFERENCES "alcs"."notice_of_intent_owner"("uuid") ON DELETE NO ACTION ON UPDATE NO ACTION`, + ); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_parcel_owners_notice_of_intent_owner" DROP CONSTRAINT "FK_4346ccc22b3ca8dafe57b251280"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_parcel_owners_notice_of_intent_owner" DROP CONSTRAINT "FK_a419bb29b4bdb7e5d4aa4181d11"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_owner" DROP CONSTRAINT "FK_df0c33df4e8ce83089e0645e928"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_owner" DROP CONSTRAINT "FK_016562c9faf2b0d0ccc96212ee0"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_owner" DROP CONSTRAINT "FK_a27c5e1999ea94ce0dc0c923fb3"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_parcel" DROP CONSTRAINT "FK_7b405f7700af3398ec38b70d634"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_parcel" DROP CONSTRAINT "FK_7b23cfdc8574f66dd2f88e37f3f"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_parcel" DROP CONSTRAINT "FK_8d14440209af146e7f351c7fbef"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_owner" DROP CONSTRAINT "FK_05181ec6491ee0aa527bd55c714"`, + ); + await queryRunner.query( + `DROP INDEX "alcs"."IDX_4346ccc22b3ca8dafe57b25128"`, + ); + await queryRunner.query( + `DROP INDEX "alcs"."IDX_a419bb29b4bdb7e5d4aa4181d1"`, + ); + await queryRunner.query( + `DROP TABLE "alcs"."notice_of_intent_parcel_owners_notice_of_intent_owner"`, + ); + await queryRunner.query(`DROP TABLE "alcs"."notice_of_intent_owner"`); + await queryRunner.query(`DROP TABLE "alcs"."notice_of_intent_parcel"`); + await queryRunner.query( + `DROP TABLE "alcs"."notice_of_intent_parcel_ownership_type"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."owner_type" RENAME TO "application_owner_type"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_owner" ADD CONSTRAINT "FK_05181ec6491ee0aa527bd55c714" FOREIGN KEY ("type_code") REFERENCES "alcs"."application_owner_type"("code") ON DELETE NO ACTION ON UPDATE NO ACTION`, + ); + } +} diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1691705084117-seed_noi_parcel_owner_type.ts b/services/apps/alcs/src/providers/typeorm/migrations/1691705084117-seed_noi_parcel_owner_type.ts new file mode 100644 index 0000000000..a400727ffd --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1691705084117-seed_noi_parcel_owner_type.ts @@ -0,0 +1,14 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class seedNoiParcelOwnerType1691705084117 implements MigrationInterface { + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query(` + INSERT INTO "alcs"."notice_of_intent_parcel_ownership_type" + ("audit_deleted_date_at", "audit_created_at", "audit_updated_at", "audit_created_by", "audit_updated_by", "label", "code", "description") VALUES + (NULL, NOW(), NULL, 'migration_seed', NULL, 'Crown', 'CRWN', 'Crown'), + (NULL, NOW(), NULL, 'migration_seed', NULL, 'Fee Simple', 'SMPL', 'Fee Simple'); + `); + } + + public async down(queryRunner: QueryRunner): Promise {} +} From 4c8eda790135f7ffa3204aef27bedd6e76477b10 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Fri, 11 Aug 2023 10:04:42 -0700 Subject: [PATCH 225/954] Code Review Feedback --- .../edit-submission/parcels/parcel-details.component.html | 8 ++++---- .../application-parcel/application-parcel.service.ts | 5 +++-- .../notice-of-intent-document.service.ts | 2 +- .../notice-of-intent-owner/notice-of-intent-owner.dto.ts | 8 ++++---- .../notice-of-intent-owner.service.ts | 8 ++++---- .../notice-of-intent-owner.service.spec.ts | 8 ++++---- 6 files changed, 20 insertions(+), 19 deletions(-) diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-details.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-details.component.html index 0a42627959..b2b1ca3ae7 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-details.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-details.component.html @@ -1,7 +1,7 @@
-

Identify Parcels Under Application

-

Provide parcel identification and registered ownership information for each parcel under application.

+

Identify Parcels Under Notice of Intent

+

Provide parcel identification and registered ownership information for each parcel.

*All fields are required unless stated optional.

Documents needed for this step:
@@ -23,7 +23,7 @@
Documents needed for this step:
Documents needed for this step:
- +
diff --git a/portal-frontend/src/app/services/application-parcel/application-parcel.service.ts b/portal-frontend/src/app/services/application-parcel/application-parcel.service.ts index 1112a20315..061f34564a 100644 --- a/portal-frontend/src/app/services/application-parcel/application-parcel.service.ts +++ b/portal-frontend/src/app/services/application-parcel/application-parcel.service.ts @@ -7,7 +7,7 @@ import { OverlaySpinnerService } from '../../shared/overlay-spinner/overlay-spin import { ApplicationDocumentDto } from '../application-document/application-document.dto'; import { DocumentService } from '../document/document.service'; import { ToastService } from '../toast/toast.service'; -import { ApplicationParcelDto, ApplicationParcelUpdateDto } from './application-parcel.dto'; +import { ApplicationParcelDto, ApplicationParcelUpdateDto, PARCEL_TYPE } from './application-parcel.dto'; @Injectable({ providedIn: 'root', @@ -34,11 +34,12 @@ export class ApplicationParcelService { return undefined; } - async create(applicationSubmissionUuid: string, ownerUuid?: string) { + async create(applicationSubmissionUuid: string, parcelType?: PARCEL_TYPE, ownerUuid?: string) { try { return await firstValueFrom( this.httpClient.post(`${this.serviceUrl}`, { applicationSubmissionUuid, + parcelType, ownerUuid, }) ); diff --git a/portal-frontend/src/app/services/notice-of-intent-document/notice-of-intent-document.service.ts b/portal-frontend/src/app/services/notice-of-intent-document/notice-of-intent-document.service.ts index 6b51562e5e..7ae8f404a9 100644 --- a/portal-frontend/src/app/services/notice-of-intent-document/notice-of-intent-document.service.ts +++ b/portal-frontend/src/app/services/notice-of-intent-document/notice-of-intent-document.service.ts @@ -39,7 +39,7 @@ export class NoticeOfIntentDocumentService { return res; } catch (e) { console.error(e); - this.toastService.showErrorToast('Failed to attach document to Application, please try again'); + this.toastService.showErrorToast('Failed to attach document, please try again'); } return undefined; } diff --git a/portal-frontend/src/app/services/notice-of-intent-owner/notice-of-intent-owner.dto.ts b/portal-frontend/src/app/services/notice-of-intent-owner/notice-of-intent-owner.dto.ts index 21b23da93c..48cf7cee32 100644 --- a/portal-frontend/src/app/services/notice-of-intent-owner/notice-of-intent-owner.dto.ts +++ b/portal-frontend/src/app/services/notice-of-intent-owner/notice-of-intent-owner.dto.ts @@ -1,6 +1,6 @@ import { BaseCodeDto } from '../../shared/dto/base.dto'; -import { ApplicationDocumentDto } from '../application-document/application-document.dto'; -import { ApplicationParcelDto } from '../application-parcel/application-parcel.dto'; +import { NoticeOfIntentDocumentDto } from '../notice-of-intent-document/notice-of-intent-document.dto'; +import { NoticeOfIntentParcelDto } from '../notice-of-intent-parcel/notice-of-intent-parcel.dto'; export enum OWNER_TYPE { INDIVIDUAL = 'INDV', @@ -24,11 +24,11 @@ export interface NoticeOfIntentOwnerDto { phoneNumber: string | null; email: string | null; type: OwnerTypeDto; - corporateSummary?: ApplicationDocumentDto; + corporateSummary?: NoticeOfIntentDocumentDto; } export interface NoticeOfIntentOwnerDetailedDto extends NoticeOfIntentOwnerDto { - parcels: ApplicationParcelDto[]; + parcels: NoticeOfIntentParcelDto[]; } export interface NoticeOfIntentOwnerUpdateDto { diff --git a/portal-frontend/src/app/services/notice-of-intent-owner/notice-of-intent-owner.service.ts b/portal-frontend/src/app/services/notice-of-intent-owner/notice-of-intent-owner.service.ts index 92abf5b9e6..66a48b3aab 100644 --- a/portal-frontend/src/app/services/notice-of-intent-owner/notice-of-intent-owner.service.ts +++ b/portal-frontend/src/app/services/notice-of-intent-owner/notice-of-intent-owner.service.ts @@ -67,11 +67,11 @@ export class NoticeOfIntentOwnerService { const res = await firstValueFrom( this.httpClient.post(`${this.serviceUrl}/setPrimaryContact`, updateDto) ); - this.toastService.showSuccessToast('Application saved'); + this.toastService.showSuccessToast('Notice of Intent saved'); return res; } catch (e) { console.error(e); - this.toastService.showErrorToast('Failed to update Application, please try again later'); + this.toastService.showErrorToast('Failed to update Notice of Intent, please try again later'); return undefined; } } @@ -126,10 +126,10 @@ export class NoticeOfIntentOwnerService { return 0; } - async uploadCorporateSummary(applicationFileId: string, file: File) { + async uploadCorporateSummary(noticeOfIntentFileId: string, file: File) { try { return await this.documentService.uploadFile<{ uuid: string }>( - applicationFileId, + noticeOfIntentFileId, file, DOCUMENT_TYPE.CORPORATE_SUMMARY, DOCUMENT_SOURCE.APPLICANT, diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.service.spec.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.service.spec.ts index 9493d13e28..99eb1b68a1 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.service.spec.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.service.spec.ts @@ -214,7 +214,7 @@ describe('NoticeOfIntentOwnerService', () => { expect(mockRepo.save).toHaveBeenCalledTimes(1); }); - it('should call update for the application with the first parcels last name', async () => { + it('should call update with the first parcels last name', async () => { mockRepo.find.mockResolvedValue([new NoticeOfIntentOwner()]); const owners = [ new NoticeOfIntentOwner({ @@ -236,7 +236,7 @@ describe('NoticeOfIntentOwnerService', () => { ); }); - it('should call update for the application with the first parcels last name', async () => { + it('should call update with the first parcels last name', async () => { mockRepo.find.mockResolvedValue([new NoticeOfIntentOwner()]); const owners = [ new NoticeOfIntentOwner({ @@ -270,7 +270,7 @@ describe('NoticeOfIntentOwnerService', () => { ); }); - it('should call update for the application with the number owners last name', async () => { + it('should call update with the number owners last name', async () => { mockRepo.find.mockResolvedValue([new NoticeOfIntentOwner()]); const owners = [ new NoticeOfIntentOwner({ @@ -296,7 +296,7 @@ describe('NoticeOfIntentOwnerService', () => { ); }); - it('should use the first created parcel to set the application applicants name', async () => { + it('should use the first created parcel to set the applicants name', async () => { mockRepo.find.mockResolvedValue([new NoticeOfIntentOwner()]); const owners1 = [ new NoticeOfIntentOwner({ From aeeba9a78248df29782d415cffefffd58b44b3bc Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Fri, 11 Aug 2023 11:10:34 -0700 Subject: [PATCH 226/954] Finish Implementing Owners * Genericize owner dialogs to work for both NOI and App --- .../edit-submission-base.module.ts | 12 -- .../application-owners-dialog.component.ts | 41 ------- .../parcel-entry/parcel-entry.component.html | 4 + .../parcel-entry/parcel-entry.component.ts | 33 ++++-- .../parcel-owners.component.html | 73 ------------ .../parcel-owners/parcel-owners.component.ts | 91 --------------- .../edit-submission-base.module.ts | 3 - .../parcels/parcel-details.component.ts | 12 +- .../parcel-entry/parcel-entry.component.html | 26 +++-- .../parcel-entry/parcel-entry.component.ts | 23 ++-- .../parcel-owners.component.scss | 14 --- .../parcel-owners.component.spec.ts | 41 ------- .../parcel-owners/parcel-owners.component.ts | 91 --------------- .../application-owner.service.ts | 10 -- .../crown-owner-dialog.component.html} | 0 .../crown-owner-dialog.component.scss} | 4 +- .../crown-owner-dialog.component.spec.ts} | 12 +- .../crown-owner-dialog.component.ts} | 35 +++--- .../owner-dialog/owner-dialog.component.html} | 0 .../owner-dialog/owner-dialog.component.scss} | 4 +- .../owner-dialog.component.spec.ts} | 16 +-- .../owner-dialog/owner-dialog.component.ts} | 46 ++++---- .../all-owners-dialog.component.html} | 2 + .../all-owners-dialog.component.scss} | 0 .../all-owners-dialog.component.spec.ts} | 12 +- .../all-owners-dialog.component.ts | 47 ++++++++ .../parcel-owners.component.html | 2 +- .../parcel-owners.component.scss | 4 +- .../parcel-owners.component.spec.ts | 4 +- .../parcel-owners/parcel-owners.component.ts | 110 ++++++++++++++++++ .../src/app/shared/shared.module.ts | 21 ++++ ...of-intent-submission.automapper.profile.ts | 16 +++ .../notice-of-intent-submission.dto.ts | 5 +- .../notice-of-intent-submission.service.ts | 8 +- 34 files changed, 343 insertions(+), 479 deletions(-) delete mode 100644 portal-frontend/src/app/features/applications/edit-submission/parcel-details/application-owners-dialog/application-owners-dialog.component.ts delete mode 100644 portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-owners/parcel-owners.component.html delete mode 100644 portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-owners/parcel-owners.component.ts delete mode 100644 portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-owners/parcel-owners.component.scss delete mode 100644 portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-owners/parcel-owners.component.spec.ts delete mode 100644 portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-owners/parcel-owners.component.ts rename portal-frontend/src/app/{features/applications/edit-submission/parcel-details/application-crown-owner-dialog/application-crown-owner-dialog.component.html => shared/owner-dialogs/crown-owner-dialog/crown-owner-dialog.component.html} (100%) rename portal-frontend/src/app/{features/applications/edit-submission/parcel-details/application-crown-owner-dialog/application-crown-owner-dialog.component.scss => shared/owner-dialogs/crown-owner-dialog/crown-owner-dialog.component.scss} (72%) rename portal-frontend/src/app/{features/applications/edit-submission/parcel-details/application-crown-owner-dialog/application-crown-owner-dialog.component.spec.ts => shared/owner-dialogs/crown-owner-dialog/crown-owner-dialog.component.spec.ts} (67%) rename portal-frontend/src/app/{features/applications/edit-submission/parcel-details/application-crown-owner-dialog/application-crown-owner-dialog.component.ts => shared/owner-dialogs/crown-owner-dialog/crown-owner-dialog.component.ts} (64%) rename portal-frontend/src/app/{features/applications/edit-submission/parcel-details/application-owner-dialog/application-owner-dialog.component.html => shared/owner-dialogs/owner-dialog/owner-dialog.component.html} (100%) rename portal-frontend/src/app/{features/applications/edit-submission/parcel-details/application-owner-dialog/application-owner-dialog.component.scss => shared/owner-dialogs/owner-dialog/owner-dialog.component.scss} (75%) rename portal-frontend/src/app/{features/applications/edit-submission/parcel-details/application-owner-dialog/application-owner-dialog.component.spec.ts => shared/owner-dialogs/owner-dialog/owner-dialog.component.spec.ts} (69%) rename portal-frontend/src/app/{features/applications/edit-submission/parcel-details/application-owner-dialog/application-owner-dialog.component.ts => shared/owner-dialogs/owner-dialog/owner-dialog.component.ts} (76%) rename portal-frontend/src/app/{features/applications/edit-submission/parcel-details/application-owners-dialog/application-owners-dialog.component.html => shared/owner-dialogs/owners-dialog/all-owners-dialog.component.html} (82%) rename portal-frontend/src/app/{features/applications/edit-submission/parcel-details/application-owners-dialog/application-owners-dialog.component.scss => shared/owner-dialogs/owners-dialog/all-owners-dialog.component.scss} (100%) rename portal-frontend/src/app/{features/applications/edit-submission/parcel-details/application-owners-dialog/application-owners-dialog.component.spec.ts => shared/owner-dialogs/owners-dialog/all-owners-dialog.component.spec.ts} (66%) create mode 100644 portal-frontend/src/app/shared/owner-dialogs/owners-dialog/all-owners-dialog.component.ts rename portal-frontend/src/app/{features/notice-of-intents/edit-submission/parcels => shared/owner-dialogs}/parcel-owners/parcel-owners.component.html (97%) rename portal-frontend/src/app/{features/applications/edit-submission/parcel-details => shared/owner-dialogs}/parcel-owners/parcel-owners.component.scss (66%) rename portal-frontend/src/app/{features/applications/edit-submission/parcel-details => shared/owner-dialogs}/parcel-owners/parcel-owners.component.spec.ts (82%) create mode 100644 portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.ts diff --git a/portal-frontend/src/app/features/applications/edit-submission/edit-submission-base.module.ts b/portal-frontend/src/app/features/applications/edit-submission/edit-submission-base.module.ts index c70691f53a..ad2d84a82b 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/edit-submission-base.module.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/edit-submission-base.module.ts @@ -15,14 +15,10 @@ import { LandUseComponent } from './land-use/land-use.component'; import { OtherAttachmentsComponent } from './other-attachments/other-attachments.component'; import { OtherParcelConfirmationDialogComponent } from './other-parcels/other-parcel-confirmation-dialog/other-parcel-confirmation-dialog.component'; import { OtherParcelsComponent } from './other-parcels/other-parcels.component'; -import { ApplicationCrownOwnerDialogComponent } from './parcel-details/application-crown-owner-dialog/application-crown-owner-dialog.component'; -import { ApplicationOwnerDialogComponent } from './parcel-details/application-owner-dialog/application-owner-dialog.component'; -import { ApplicationOwnersDialogComponent } from './parcel-details/application-owners-dialog/application-owners-dialog.component'; import { DeleteParcelDialogComponent } from './parcel-details/delete-parcel/delete-parcel-dialog.component'; import { ParcelDetailsComponent } from './parcel-details/parcel-details.component'; import { ParcelEntryConfirmationDialogComponent } from './parcel-details/parcel-entry/parcel-entry-confirmation-dialog/parcel-entry-confirmation-dialog.component'; import { ParcelEntryComponent } from './parcel-details/parcel-entry/parcel-entry.component'; -import { ParcelOwnersComponent } from './parcel-details/parcel-owners/parcel-owners.component'; import { PrimaryContactComponent } from './primary-contact/primary-contact.component'; import { ExclProposalComponent } from './proposal/excl-proposal/excl-proposal.component'; import { InclProposalComponent } from './proposal/incl-proposal/incl-proposal.component'; @@ -48,10 +44,6 @@ import { SelectGovernmentComponent } from './select-government/select-government EditSubmissionComponent, DeleteParcelDialogComponent, SelectGovernmentComponent, - ParcelOwnersComponent, - ApplicationOwnersDialogComponent, - ApplicationOwnerDialogComponent, - ApplicationCrownOwnerDialogComponent, LandUseComponent, OtherParcelsComponent, OtherAttachmentsComponent, @@ -92,10 +84,6 @@ import { SelectGovernmentComponent } from './select-government/select-government EditSubmissionComponent, DeleteParcelDialogComponent, SelectGovernmentComponent, - ParcelOwnersComponent, - ApplicationOwnersDialogComponent, - ApplicationOwnerDialogComponent, - ApplicationCrownOwnerDialogComponent, LandUseComponent, OtherParcelsComponent, OtherAttachmentsComponent, diff --git a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/application-owners-dialog/application-owners-dialog.component.ts b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/application-owners-dialog/application-owners-dialog.component.ts deleted file mode 100644 index 8a884734aa..0000000000 --- a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/application-owners-dialog/application-owners-dialog.component.ts +++ /dev/null @@ -1,41 +0,0 @@ -import { Component, Inject } from '@angular/core'; -import { MAT_DIALOG_DATA } from '@angular/material/dialog'; -import { ApplicationOwnerDto } from '../../../../../services/application-owner/application-owner.dto'; -import { ApplicationOwnerService } from '../../../../../services/application-owner/application-owner.service'; -import { OWNER_TYPE } from '../../../../../shared/dto/owner.dto'; - -@Component({ - selector: 'app-application-owner-dialog', - templateUrl: './application-owners-dialog.component.html', - styleUrls: ['./application-owners-dialog.component.scss'], -}) -export class ApplicationOwnersDialogComponent { - isDirty = false; - owners: ApplicationOwnerDto[] = []; - fileId: string; - submissionUuid: string; - - constructor( - private applicationOwnerService: ApplicationOwnerService, - @Inject(MAT_DIALOG_DATA) - public data: { - owners: ApplicationOwnerDto[]; - fileId: string; - submissionUuid: string; - } - ) { - this.fileId = data.fileId; - this.submissionUuid = data.submissionUuid; - this.owners = data.owners; - } - - async onUpdated() { - const updatedOwners = await this.applicationOwnerService.fetchBySubmissionId(this.submissionUuid); - if (updatedOwners) { - this.owners = updatedOwners.filter( - (owner) => ![OWNER_TYPE.AGENT, OWNER_TYPE.GOVERNMENT].includes(owner.type.code) - ); - this.isDirty = true; - } - } -} diff --git a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html index 0cdffa38c9..91d4429399 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html @@ -257,6 +257,8 @@
Owner Information
[owners]="parcel.owners" (onOwnersUpdated)="onOwnersUpdated.emit()" (onOwnerRemoved)="onOwnerRemoved($event)" + [documentService]="applicationDocumentService" + [ownerService]="applicationOwnerService" [disabled]="_disabled" >
@@ -339,6 +341,8 @@
Owner Information
[owners]="parcel.owners" (onOwnersUpdated)="onOwnersUpdated.emit()" (onOwnerRemoved)="onOwnerRemoved($event)" + [ownerService]="applicationOwnerService" + [documentService]="applicationDocumentService" [disabled]="_disabled" [isCrown]="true" > diff --git a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts index 072389f93b..1aef5b9bbe 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts @@ -18,9 +18,9 @@ import { OWNER_TYPE } from '../../../../../shared/dto/owner.dto'; import { FileHandle } from '../../../../../shared/file-drag-drop/drag-drop.directive'; import { formatBooleanToString } from '../../../../../shared/utils/boolean-helper'; import { RemoveFileConfirmationDialogComponent } from '../../../alcs-edit-submission/remove-file-confirmation-dialog/remove-file-confirmation-dialog.component'; -import { ApplicationCrownOwnerDialogComponent } from '../application-crown-owner-dialog/application-crown-owner-dialog.component'; -import { ApplicationOwnerDialogComponent } from '../application-owner-dialog/application-owner-dialog.component'; -import { ApplicationOwnersDialogComponent } from '../application-owners-dialog/application-owners-dialog.component'; +import { CrownOwnerDialogComponent } from '../../../../../shared/owner-dialogs/crown-owner-dialog/crown-owner-dialog.component'; +import { OwnerDialogComponent } from '../../../../../shared/owner-dialogs/owner-dialog/owner-dialog.component'; +import { AllOwnersDialogComponent } from '../../../../../shared/owner-dialogs/owners-dialog/all-owners-dialog.component'; import { ParcelEntryConfirmationDialogComponent } from './parcel-entry-confirmation-dialog/parcel-entry-confirmation-dialog.component'; export interface ParcelEntryFormData { @@ -110,8 +110,8 @@ export class ParcelEntryComponent implements OnInit { constructor( private parcelService: ParcelService, private applicationParcelService: ApplicationParcelService, - private applicationOwnerService: ApplicationOwnerService, - private applicationDocumentService: ApplicationDocumentService, + public applicationOwnerService: ApplicationOwnerService, + public applicationDocumentService: ApplicationDocumentService, private dialog: MatDialog ) {} @@ -284,11 +284,13 @@ export class ParcelEntryComponent implements OnInit { } onAddNewOwner() { - const dialog = this.dialog.open(ApplicationOwnerDialogComponent, { + const dialog = this.dialog.open(OwnerDialogComponent, { data: { fileId: this.fileId, submissionUuid: this.submissionUuid, parcelUuid: this.parcel.uuid, + ownerService: this.applicationOwnerService, + documentService: this.applicationDocumentService, }, }); dialog.beforeClosed().subscribe((createdDto) => { @@ -301,11 +303,12 @@ export class ParcelEntryComponent implements OnInit { } onAddNewGovernmentContact() { - const dialog = this.dialog.open(ApplicationCrownOwnerDialogComponent, { + const dialog = this.dialog.open(CrownOwnerDialogComponent, { data: { fileId: this.fileId, submissionUuid: this.submissionUuid, parcelUuid: this.parcel.uuid, + ownerService: this.applicationOwnerService, }, }); dialog.beforeClosed().subscribe((createdDto) => { @@ -345,7 +348,17 @@ export class ParcelEntryComponent implements OnInit { isSelected, }; }) - .sort(this.applicationOwnerService.sortOwners); + .sort(this.sortOwners); + } + + sortOwners(a: ApplicationOwnerDto, b: ApplicationOwnerDto) { + if (a.displayName < b.displayName) { + return -1; + } + if (a.displayName > b.displayName) { + return 1; + } + return 0; } onTypeOwner($event: Event) { @@ -357,11 +370,13 @@ export class ParcelEntryComponent implements OnInit { onSeeAllOwners() { this.dialog - .open(ApplicationOwnersDialogComponent, { + .open(AllOwnersDialogComponent, { data: { owners: this.owners, fileId: this.fileId, submissionUuid: this.submissionUuid, + ownerService: this.applicationOwnerService, + documentService: this.applicationDocumentService, }, }) .beforeClosed() diff --git a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-owners/parcel-owners.component.html b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-owners/parcel-owners.component.html deleted file mode 100644 index 51ea96511d..0000000000 --- a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-owners/parcel-owners.component.html +++ /dev/null @@ -1,73 +0,0 @@ -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Type{{ element.type.label }}{{ element.position }}Full Name{{ element.displayName }}Organization NameOrganization Name / Ministry / Department - - {{ element.organizationName }} - Ministry/ Department{{ element.organizationName }}Phone{{ element.phoneNumber | mask : '(000) 000-0000' }}Email{{ element.email }}Actions - - - -
No owner information
-
diff --git a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-owners/parcel-owners.component.ts b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-owners/parcel-owners.component.ts deleted file mode 100644 index e0f04f417f..0000000000 --- a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-owners/parcel-owners.component.ts +++ /dev/null @@ -1,91 +0,0 @@ -import { Component, EventEmitter, Input, Output } from '@angular/core'; -import { MatDialog } from '@angular/material/dialog'; -import { ApplicationOwnerDto } from '../../../../../services/application-owner/application-owner.dto'; -import { ApplicationOwnerService } from '../../../../../services/application-owner/application-owner.service'; -import { ConfirmationDialogService } from '../../../../../shared/confirmation-dialog/confirmation-dialog.service'; -import { OWNER_TYPE } from '../../../../../shared/dto/owner.dto'; -import { ApplicationCrownOwnerDialogComponent } from '../application-crown-owner-dialog/application-crown-owner-dialog.component'; -import { ApplicationOwnerDialogComponent } from '../application-owner-dialog/application-owner-dialog.component'; - -@Component({ - selector: 'app-parcel-owners[owners][fileId][submissionUuid]', - templateUrl: './parcel-owners.component.html', - styleUrls: ['./parcel-owners.component.scss'], -}) -export class ParcelOwnersComponent { - @Output() onOwnersUpdated = new EventEmitter(); - @Output() onOwnerRemoved = new EventEmitter(); - - @Input() - public set owners(owners: ApplicationOwnerDto[]) { - this._owners = owners.sort(this.appOwnerService.sortOwners); - } - - @Input() - public set disabled(disabled: boolean) { - this._disabled = disabled; - } - - @Input() submissionUuid!: string; - @Input() fileId!: string; - @Input() parcelUuid?: string | undefined; - @Input() isCrown = false; - @Input() isDraft = false; - @Input() isShowAllOwners = false; - - _owners: ApplicationOwnerDto[] = []; - _disabled = false; - displayedColumns = ['type', 'position', 'displayName', 'organizationName', 'phone', 'email', 'actions']; - - constructor( - private dialog: MatDialog, - private appOwnerService: ApplicationOwnerService, - private confDialogService: ConfirmationDialogService - ) {} - - onEdit(owner: ApplicationOwnerDto) { - let dialog; - if (owner.type.code === OWNER_TYPE.CROWN) { - dialog = this.dialog.open(ApplicationCrownOwnerDialogComponent, { - data: { - isDraft: this.isDraft, - parcelUuid: this.parcelUuid, - existingOwner: owner, - submissionUuid: this.submissionUuid, - }, - }); - } else { - dialog = this.dialog.open(ApplicationOwnerDialogComponent, { - data: { - isDraft: this.isDraft, - fileId: this.fileId, - submissionUuid: this.submissionUuid, - parcelUuid: this.parcelUuid, - existingOwner: owner, - }, - }); - } - dialog.beforeClosed().subscribe((updatedUuid) => { - if (updatedUuid) { - this.onOwnersUpdated.emit(); - } - }); - } - - async onRemove(uuid: string) { - this.onOwnerRemoved.emit(uuid); - } - - async onDelete(owner: ApplicationOwnerDto) { - this.confDialogService - .openDialog({ - body: `This action will remove ${owner.displayName} and its usage from the entire application. Are you sure you want to remove this owner? `, - }) - .subscribe(async (didConfirm) => { - if (didConfirm) { - await this.appOwnerService.delete(owner.uuid); - this.onOwnersUpdated.emit(); - } - }); - } -} diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission-base.module.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission-base.module.ts index 744f8fb3ee..57f9693ad8 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission-base.module.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission-base.module.ts @@ -13,7 +13,6 @@ import { DeleteParcelDialogComponent } from './parcels/delete-parcel/delete-parc import { ParcelDetailsComponent } from './parcels/parcel-details.component'; import { ParcelEntryConfirmationDialogComponent } from './parcels/parcel-entry/parcel-entry-confirmation-dialog/parcel-entry-confirmation-dialog.component'; import { ParcelEntryComponent } from './parcels/parcel-entry/parcel-entry.component'; -import { ParcelOwnersComponent } from './parcels/parcel-owners/parcel-owners.component'; @NgModule({ declarations: [ @@ -22,7 +21,6 @@ import { ParcelOwnersComponent } from './parcels/parcel-owners/parcel-owners.com ParcelEntryComponent, ParcelEntryConfirmationDialogComponent, DeleteParcelDialogComponent, - ParcelOwnersComponent, ], imports: [ CommonModule, @@ -42,7 +40,6 @@ import { ParcelOwnersComponent } from './parcels/parcel-owners/parcel-owners.com ParcelEntryComponent, ParcelEntryConfirmationDialogComponent, DeleteParcelDialogComponent, - ParcelOwnersComponent, ], }) export class EditSubmissionBaseModule {} diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-details.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-details.component.ts index d0352c217a..596788e2a6 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-details.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-details.component.ts @@ -2,10 +2,12 @@ import { AfterViewInit, Component, EventEmitter, OnInit, Output } from '@angular import { MatDialog } from '@angular/material/dialog'; import { Router } from '@angular/router'; import { BehaviorSubject, takeUntil } from 'rxjs'; -import { ApplicationParcelUpdateDto } from '../../../../services/application-parcel/application-parcel.dto'; import { NoticeOfIntentOwnerDto } from '../../../../services/notice-of-intent-owner/notice-of-intent-owner.dto'; import { NoticeOfIntentOwnerService } from '../../../../services/notice-of-intent-owner/notice-of-intent-owner.service'; -import { NoticeOfIntentParcelDto } from '../../../../services/notice-of-intent-parcel/notice-of-intent-parcel.dto'; +import { + NoticeOfIntentParcelDto, + NoticeOfIntentParcelUpdateDto, +} from '../../../../services/notice-of-intent-parcel/notice-of-intent-parcel.dto'; import { NoticeOfIntentParcelService } from '../../../../services/notice-of-intent-parcel/notice-of-intent-parcel.service'; import { ToastService } from '../../../../services/toast/toast.service'; import { OWNER_TYPE } from '../../../../shared/dto/owner.dto'; @@ -106,13 +108,13 @@ export class ParcelDetailsComponent extends StepComponent implements OnInit, Aft parcel.crownLandOwnerType = formData.crownLandOwnerType !== undefined ? formData.crownLandOwnerType : parcel.crownLandOwnerType; if (formData.owners) { - //parcel.owners = formData.owners; + parcel.owners = formData.owners; } } private async saveProgress() { if (this.isDirty || this.newParcelAdded) { - const parcelsToUpdate: ApplicationParcelUpdateDto[] = []; + const parcelsToUpdate: NoticeOfIntentParcelUpdateDto[] = []; for (const parcel of this.parcels) { parcelsToUpdate.push({ uuid: parcel.uuid, @@ -126,7 +128,7 @@ export class ParcelDetailsComponent extends StepComponent implements OnInit, Aft ownershipTypeCode: parcel.ownershipTypeCode, isConfirmedByApplicant: parcel.isConfirmedByApplicant, crownLandOwnerType: parcel.crownLandOwnerType, - ownerUuids: [], + ownerUuids: parcel.owners.map((owner) => owner.uuid), }); } await this.noiParcelService.update(parcelsToUpdate); diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.html index ad624d34bd..9c3365cc68 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.html @@ -2,8 +2,8 @@
- The answer to the following question will change the rest of the application form. Do not change this answer once - selected. + The answer to the following question will change the rest of the notice of intent form. Do not change this answer + once selected.
Owner Information [owners]="parcel.owners" (onOwnersUpdated)="onOwnersUpdated.emit()" (onOwnerRemoved)="onOwnerRemoved($event)" + [ownerService]="noticeOfIntentOwnerService" + [documentService]="noticeOfIntentDocumentService" [disabled]="_disabled" >
@@ -332,16 +334,16 @@
Owner Information
Add new government contact
- - - - - - - - - - + + + + + + + + + +
diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.ts index bb0f985ece..8d7c068727 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.ts @@ -11,14 +11,13 @@ import { NoticeOfIntentOwnerService } from '../../../../../services/notice-of-in import { NoticeOfIntentParcelDto } from '../../../../../services/notice-of-intent-parcel/notice-of-intent-parcel.dto'; import { NoticeOfIntentParcelService } from '../../../../../services/notice-of-intent-parcel/notice-of-intent-parcel.service'; import { ParcelService } from '../../../../../services/parcel/parcel.service'; -import { DOCUMENT_TYPE } from '../../../../../shared/dto/document.dto'; import { OWNER_TYPE } from '../../../../../shared/dto/owner.dto'; import { FileHandle } from '../../../../../shared/file-drag-drop/drag-drop.directive'; +import { CrownOwnerDialogComponent } from '../../../../../shared/owner-dialogs/crown-owner-dialog/crown-owner-dialog.component'; +import { OwnerDialogComponent } from '../../../../../shared/owner-dialogs/owner-dialog/owner-dialog.component'; +import { AllOwnersDialogComponent } from '../../../../../shared/owner-dialogs/owners-dialog/all-owners-dialog.component'; import { formatBooleanToString } from '../../../../../shared/utils/boolean-helper'; import { RemoveFileConfirmationDialogComponent } from '../../../../applications/alcs-edit-submission/remove-file-confirmation-dialog/remove-file-confirmation-dialog.component'; -import { ApplicationCrownOwnerDialogComponent } from '../../../../applications/edit-submission/parcel-details/application-crown-owner-dialog/application-crown-owner-dialog.component'; -import { ApplicationOwnerDialogComponent } from '../../../../applications/edit-submission/parcel-details/application-owner-dialog/application-owner-dialog.component'; -import { ApplicationOwnersDialogComponent } from '../../../../applications/edit-submission/parcel-details/application-owners-dialog/application-owners-dialog.component'; import { ParcelEntryConfirmationDialogComponent } from './parcel-entry-confirmation-dialog/parcel-entry-confirmation-dialog.component'; export interface ParcelEntryFormData { @@ -101,15 +100,14 @@ export class ParcelEntryComponent implements OnInit { ownerInput = new FormControl(null); - DOCUMENT_TYPES = DOCUMENT_TYPE; PARCEL_OWNERSHIP_TYPES = PARCEL_OWNERSHIP_TYPE; maxPurchasedDate = new Date(); constructor( private parcelService: ParcelService, private noticeOfIntentParcelService: NoticeOfIntentParcelService, - private noticeOfIntentOwnerService: NoticeOfIntentOwnerService, - private noticeOfIntentDocumentService: NoticeOfIntentDocumentService, + public noticeOfIntentOwnerService: NoticeOfIntentOwnerService, + public noticeOfIntentDocumentService: NoticeOfIntentDocumentService, private dialog: MatDialog ) {} @@ -282,11 +280,13 @@ export class ParcelEntryComponent implements OnInit { } onAddNewOwner() { - const dialog = this.dialog.open(ApplicationOwnerDialogComponent, { + const dialog = this.dialog.open(OwnerDialogComponent, { data: { fileId: this.fileId, submissionUuid: this.submissionUuid, parcelUuid: this.parcel.uuid, + ownerService: this.noticeOfIntentOwnerService, + documentService: this.noticeOfIntentDocumentService, }, }); dialog.beforeClosed().subscribe((createdDto) => { @@ -299,11 +299,12 @@ export class ParcelEntryComponent implements OnInit { } onAddNewGovernmentContact() { - const dialog = this.dialog.open(ApplicationCrownOwnerDialogComponent, { + const dialog = this.dialog.open(CrownOwnerDialogComponent, { data: { fileId: this.fileId, submissionUuid: this.submissionUuid, parcelUuid: this.parcel.uuid, + ownerService: this.noticeOfIntentOwnerService, }, }); dialog.beforeClosed().subscribe((createdDto) => { @@ -355,11 +356,13 @@ export class ParcelEntryComponent implements OnInit { onSeeAllOwners() { this.dialog - .open(ApplicationOwnersDialogComponent, { + .open(AllOwnersDialogComponent, { data: { owners: this.owners, fileId: this.fileId, submissionUuid: this.submissionUuid, + ownerService: this.noticeOfIntentOwnerService, + documentService: this.noticeOfIntentDocumentService, }, }) .beforeClosed() diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-owners/parcel-owners.component.scss b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-owners/parcel-owners.component.scss deleted file mode 100644 index fb105e09eb..0000000000 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-owners/parcel-owners.component.scss +++ /dev/null @@ -1,14 +0,0 @@ -@use '../../../../../../styles/functions' as *; -@use '../../../../../../styles/colors'; - -.actions { - button:not(:last-child) { - margin-right: rem(8) !important; - } -} - -.no-data-text { - text-align: center; - color: colors.$grey; - padding-top: rem(12); -} diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-owners/parcel-owners.component.spec.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-owners/parcel-owners.component.spec.ts deleted file mode 100644 index b36089cde8..0000000000 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-owners/parcel-owners.component.spec.ts +++ /dev/null @@ -1,41 +0,0 @@ -import { NO_ERRORS_SCHEMA } from '@angular/core'; -import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { MatDialog } from '@angular/material/dialog'; -import { NoticeOfIntentOwnerService } from '../../../../../services/notice-of-intent-owner/notice-of-intent-owner.service'; -import { ConfirmationDialogService } from '../../../../../shared/confirmation-dialog/confirmation-dialog.service'; - -import { ParcelOwnersComponent } from './parcel-owners.component'; - -describe('ParcelOwnersComponent', () => { - let component: ParcelOwnersComponent; - let fixture: ComponentFixture; - - beforeEach(async () => { - await TestBed.configureTestingModule({ - providers: [ - { - provide: MatDialog, - useValue: {}, - }, - { - provide: NoticeOfIntentOwnerService, - useValue: {}, - }, - { - provide: ConfirmationDialogService, - useValue: {}, - }, - ], - declarations: [ParcelOwnersComponent], - schemas: [NO_ERRORS_SCHEMA], - }).compileComponents(); - - fixture = TestBed.createComponent(ParcelOwnersComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-owners/parcel-owners.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-owners/parcel-owners.component.ts deleted file mode 100644 index ebfcd50c62..0000000000 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-owners/parcel-owners.component.ts +++ /dev/null @@ -1,91 +0,0 @@ -import { Component, EventEmitter, Input, Output } from '@angular/core'; -import { MatDialog } from '@angular/material/dialog'; -import { NoticeOfIntentOwnerDto } from '../../../../../services/notice-of-intent-owner/notice-of-intent-owner.dto'; -import { NoticeOfIntentOwnerService } from '../../../../../services/notice-of-intent-owner/notice-of-intent-owner.service'; -import { ConfirmationDialogService } from '../../../../../shared/confirmation-dialog/confirmation-dialog.service'; -import { OWNER_TYPE } from '../../../../../shared/dto/owner.dto'; -import { ApplicationCrownOwnerDialogComponent } from '../../../../applications/edit-submission/parcel-details/application-crown-owner-dialog/application-crown-owner-dialog.component'; -import { ApplicationOwnerDialogComponent } from '../../../../applications/edit-submission/parcel-details/application-owner-dialog/application-owner-dialog.component'; - -@Component({ - selector: 'app-parcel-owners[owners][fileId][submissionUuid]', - templateUrl: './parcel-owners.component.html', - styleUrls: ['./parcel-owners.component.scss'], -}) -export class ParcelOwnersComponent { - @Output() onOwnersUpdated = new EventEmitter(); - @Output() onOwnerRemoved = new EventEmitter(); - - @Input() - public set owners(owners: NoticeOfIntentOwnerDto[]) { - this._owners = owners.sort(this.noticeOfIntentOwnerService.sortOwners); - } - - @Input() - public set disabled(disabled: boolean) { - this._disabled = disabled; - } - - @Input() submissionUuid!: string; - @Input() fileId!: string; - @Input() parcelUuid?: string | undefined; - @Input() isCrown = false; - @Input() isDraft = false; - @Input() isShowAllOwners = false; - - _owners: NoticeOfIntentOwnerDto[] = []; - _disabled = false; - displayedColumns = ['type', 'position', 'displayName', 'organizationName', 'phone', 'email', 'actions']; - - constructor( - private dialog: MatDialog, - private noticeOfIntentOwnerService: NoticeOfIntentOwnerService, - private confDialogService: ConfirmationDialogService - ) {} - - onEdit(owner: NoticeOfIntentOwnerDto) { - let dialog; - if (owner.type.code === OWNER_TYPE.CROWN) { - dialog = this.dialog.open(ApplicationCrownOwnerDialogComponent, { - data: { - isDraft: this.isDraft, - parcelUuid: this.parcelUuid, - existingOwner: owner, - submissionUuid: this.submissionUuid, - }, - }); - } else { - dialog = this.dialog.open(ApplicationOwnerDialogComponent, { - data: { - isDraft: this.isDraft, - fileId: this.fileId, - submissionUuid: this.submissionUuid, - parcelUuid: this.parcelUuid, - existingOwner: owner, - }, - }); - } - dialog.beforeClosed().subscribe((updatedUuid) => { - if (updatedUuid) { - this.onOwnersUpdated.emit(); - } - }); - } - - async onRemove(uuid: string) { - this.onOwnerRemoved.emit(uuid); - } - - async onDelete(owner: NoticeOfIntentOwnerDto) { - this.confDialogService - .openDialog({ - body: `This action will remove ${owner.displayName} and its usage from the entire application. Are you sure you want to remove this owner? `, - }) - .subscribe(async (didConfirm) => { - if (didConfirm) { - await this.noticeOfIntentOwnerService.delete(owner.uuid); - this.onOwnersUpdated.emit(); - } - }); - } -} diff --git a/portal-frontend/src/app/services/application-owner/application-owner.service.ts b/portal-frontend/src/app/services/application-owner/application-owner.service.ts index 290e3a83db..ba3684a4eb 100644 --- a/portal-frontend/src/app/services/application-owner/application-owner.service.ts +++ b/portal-frontend/src/app/services/application-owner/application-owner.service.ts @@ -116,16 +116,6 @@ export class ApplicationOwnerService { return undefined; } - sortOwners(a: ApplicationOwnerDto, b: ApplicationOwnerDto) { - if (a.displayName < b.displayName) { - return -1; - } - if (a.displayName > b.displayName) { - return 1; - } - return 0; - } - async uploadCorporateSummary(applicationFileId: string, file: File) { try { return await this.documentService.uploadFile<{ uuid: string }>( diff --git a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/application-crown-owner-dialog/application-crown-owner-dialog.component.html b/portal-frontend/src/app/shared/owner-dialogs/crown-owner-dialog/crown-owner-dialog.component.html similarity index 100% rename from portal-frontend/src/app/features/applications/edit-submission/parcel-details/application-crown-owner-dialog/application-crown-owner-dialog.component.html rename to portal-frontend/src/app/shared/owner-dialogs/crown-owner-dialog/crown-owner-dialog.component.html diff --git a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/application-crown-owner-dialog/application-crown-owner-dialog.component.scss b/portal-frontend/src/app/shared/owner-dialogs/crown-owner-dialog/crown-owner-dialog.component.scss similarity index 72% rename from portal-frontend/src/app/features/applications/edit-submission/parcel-details/application-crown-owner-dialog/application-crown-owner-dialog.component.scss rename to portal-frontend/src/app/shared/owner-dialogs/crown-owner-dialog/crown-owner-dialog.component.scss index a4fd5b9b0f..f9fa4857b8 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/application-crown-owner-dialog/application-crown-owner-dialog.component.scss +++ b/portal-frontend/src/app/shared/owner-dialogs/crown-owner-dialog/crown-owner-dialog.component.scss @@ -1,5 +1,5 @@ -@use '../../../../../../styles/functions' as *; -@use '../../../../../../styles/colors'; +@use '../../../../styles/functions' as *; +@use '../../../../styles/colors'; .actions { button:not(:last-child) { diff --git a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/application-crown-owner-dialog/application-crown-owner-dialog.component.spec.ts b/portal-frontend/src/app/shared/owner-dialogs/crown-owner-dialog/crown-owner-dialog.component.spec.ts similarity index 67% rename from portal-frontend/src/app/features/applications/edit-submission/parcel-details/application-crown-owner-dialog/application-crown-owner-dialog.component.spec.ts rename to portal-frontend/src/app/shared/owner-dialogs/crown-owner-dialog/crown-owner-dialog.component.spec.ts index 97ab2104aa..c51f7e8bb3 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/application-crown-owner-dialog/application-crown-owner-dialog.component.spec.ts +++ b/portal-frontend/src/app/shared/owner-dialogs/crown-owner-dialog/crown-owner-dialog.component.spec.ts @@ -2,13 +2,13 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { createMock, DeepMocked } from '@golevelup/ts-jest'; -import { ApplicationOwnerService } from '../../../../../services/application-owner/application-owner.service'; +import { ApplicationOwnerService } from '../../../services/application-owner/application-owner.service'; -import { ApplicationCrownOwnerDialogComponent } from './application-crown-owner-dialog.component'; +import { CrownOwnerDialogComponent } from './crown-owner-dialog.component'; describe('ApplicationCrownOwnerDialogComponent', () => { - let component: ApplicationCrownOwnerDialogComponent; - let fixture: ComponentFixture; + let component: CrownOwnerDialogComponent; + let fixture: ComponentFixture; let mockAppOwnerService: DeepMocked; beforeEach(async () => { @@ -29,11 +29,11 @@ describe('ApplicationCrownOwnerDialogComponent', () => { useValue: {}, }, ], - declarations: [ApplicationCrownOwnerDialogComponent], + declarations: [CrownOwnerDialogComponent], schemas: [NO_ERRORS_SCHEMA], }).compileComponents(); - fixture = TestBed.createComponent(ApplicationCrownOwnerDialogComponent); + fixture = TestBed.createComponent(CrownOwnerDialogComponent); component = fixture.componentInstance; fixture.detectChanges(); }); diff --git a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/application-crown-owner-dialog/application-crown-owner-dialog.component.ts b/portal-frontend/src/app/shared/owner-dialogs/crown-owner-dialog/crown-owner-dialog.component.ts similarity index 64% rename from portal-frontend/src/app/features/applications/edit-submission/parcel-details/application-crown-owner-dialog/application-crown-owner-dialog.component.ts rename to portal-frontend/src/app/shared/owner-dialogs/crown-owner-dialog/crown-owner-dialog.component.ts index 8aba0af222..4d4e80f488 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/application-crown-owner-dialog/application-crown-owner-dialog.component.ts +++ b/portal-frontend/src/app/shared/owner-dialogs/crown-owner-dialog/crown-owner-dialog.component.ts @@ -5,16 +5,22 @@ import { ApplicationOwnerCreateDto, ApplicationOwnerDto, ApplicationOwnerUpdateDto, -} from '../../../../../services/application-owner/application-owner.dto'; -import { ApplicationOwnerService } from '../../../../../services/application-owner/application-owner.service'; -import { OWNER_TYPE } from '../../../../../shared/dto/owner.dto'; +} from '../../../services/application-owner/application-owner.dto'; +import { ApplicationOwnerService } from '../../../services/application-owner/application-owner.service'; +import { + NoticeOfIntentOwnerCreateDto, + NoticeOfIntentOwnerDto, + NoticeOfIntentOwnerUpdateDto, +} from '../../../services/notice-of-intent-owner/notice-of-intent-owner.dto'; +import { NoticeOfIntentOwnerService } from '../../../services/notice-of-intent-owner/notice-of-intent-owner.service'; +import { OWNER_TYPE } from '../../dto/owner.dto'; @Component({ - selector: 'app-application-crown-owner-dialog', - templateUrl: './application-crown-owner-dialog.component.html', - styleUrls: ['./application-crown-owner-dialog.component.scss'], + selector: 'app-crown-owner-dialog', + templateUrl: './crown-owner-dialog.component.html', + styleUrls: ['./crown-owner-dialog.component.scss'], }) -export class ApplicationCrownOwnerDialogComponent { +export class CrownOwnerDialogComponent { ministryName = new FormControl('', [Validators.required]); firstName = new FormControl('', [Validators.required]); lastName = new FormControl('', [Validators.required]); @@ -33,14 +39,14 @@ export class ApplicationCrownOwnerDialogComponent { }); constructor( - private dialogRef: MatDialogRef, - private appOwnerService: ApplicationOwnerService, + private dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) public data: { submissionUuid: string; fileId: string; parcelUuid?: string; - existingOwner?: ApplicationOwnerDto; + ownerService: ApplicationOwnerService | NoticeOfIntentOwnerService; + existingOwner?: ApplicationOwnerDto | NoticeOfIntentOwnerDto; } ) { if (data && data.existingOwner) { @@ -55,7 +61,7 @@ export class ApplicationCrownOwnerDialogComponent { } async onCreate() { - const createDto: ApplicationOwnerCreateDto = { + const createDto: ApplicationOwnerCreateDto & NoticeOfIntentOwnerCreateDto = { organizationName: this.ministryName.getRawValue() || undefined, firstName: this.firstName.getRawValue() || undefined, lastName: this.lastName.getRawValue() || undefined, @@ -63,9 +69,10 @@ export class ApplicationCrownOwnerDialogComponent { phoneNumber: this.phoneNumber.getRawValue()!, typeCode: OWNER_TYPE.CROWN, applicationSubmissionUuid: this.data.submissionUuid, + noticeOfIntentSubmissionUuid: this.data.submissionUuid, }; - const res = await this.appOwnerService.create(createDto); + const res = await this.data.ownerService.create(createDto); this.dialogRef.close(res); } @@ -74,7 +81,7 @@ export class ApplicationCrownOwnerDialogComponent { } async onSave() { - const updateDto: ApplicationOwnerUpdateDto = { + const updateDto: ApplicationOwnerUpdateDto & NoticeOfIntentOwnerUpdateDto = { organizationName: this.ministryName.getRawValue(), firstName: this.firstName.getRawValue(), lastName: this.lastName.getRawValue(), @@ -83,7 +90,7 @@ export class ApplicationCrownOwnerDialogComponent { typeCode: OWNER_TYPE.CROWN, }; if (this.existingUuid) { - const res = await this.appOwnerService.update(this.existingUuid, updateDto); + const res = await this.data.ownerService.update(this.existingUuid, updateDto); this.dialogRef.close(res); } } diff --git a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/application-owner-dialog/application-owner-dialog.component.html b/portal-frontend/src/app/shared/owner-dialogs/owner-dialog/owner-dialog.component.html similarity index 100% rename from portal-frontend/src/app/features/applications/edit-submission/parcel-details/application-owner-dialog/application-owner-dialog.component.html rename to portal-frontend/src/app/shared/owner-dialogs/owner-dialog/owner-dialog.component.html diff --git a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/application-owner-dialog/application-owner-dialog.component.scss b/portal-frontend/src/app/shared/owner-dialogs/owner-dialog/owner-dialog.component.scss similarity index 75% rename from portal-frontend/src/app/features/applications/edit-submission/parcel-details/application-owner-dialog/application-owner-dialog.component.scss rename to portal-frontend/src/app/shared/owner-dialogs/owner-dialog/owner-dialog.component.scss index 2af88008a7..a31d29d504 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/application-owner-dialog/application-owner-dialog.component.scss +++ b/portal-frontend/src/app/shared/owner-dialogs/owner-dialog/owner-dialog.component.scss @@ -1,5 +1,5 @@ -@use '../../../../../../styles/functions' as *; -@use '../../../../../../styles/colors'; +@use '../../../../styles/functions' as *; +@use '../../../../styles/colors'; .actions { button:not(:last-child) { diff --git a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/application-owner-dialog/application-owner-dialog.component.spec.ts b/portal-frontend/src/app/shared/owner-dialogs/owner-dialog/owner-dialog.component.spec.ts similarity index 69% rename from portal-frontend/src/app/features/applications/edit-submission/parcel-details/application-owner-dialog/application-owner-dialog.component.spec.ts rename to portal-frontend/src/app/shared/owner-dialogs/owner-dialog/owner-dialog.component.spec.ts index 8e9cd1894e..0c3aad1e35 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/application-owner-dialog/application-owner-dialog.component.spec.ts +++ b/portal-frontend/src/app/shared/owner-dialogs/owner-dialog/owner-dialog.component.spec.ts @@ -2,15 +2,15 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MAT_DIALOG_DATA, MatDialog, MatDialogRef } from '@angular/material/dialog'; import { createMock, DeepMocked } from '@golevelup/ts-jest'; -import { ApplicationDocumentService } from '../../../../../services/application-document/application-document.service'; -import { ApplicationOwnerService } from '../../../../../services/application-owner/application-owner.service'; -import { CodeService } from '../../../../../services/code/code.service'; +import { ApplicationDocumentService } from '../../../services/application-document/application-document.service'; +import { ApplicationOwnerService } from '../../../services/application-owner/application-owner.service'; +import { CodeService } from '../../../services/code/code.service'; -import { ApplicationOwnerDialogComponent } from './application-owner-dialog.component'; +import { OwnerDialogComponent } from './owner-dialog.component'; describe('ApplicationOwnerDialogComponent', () => { - let component: ApplicationOwnerDialogComponent; - let fixture: ComponentFixture; + let component: OwnerDialogComponent; + let fixture: ComponentFixture; let mockAppOwnerService: DeepMocked; let mockCodeService: DeepMocked; let mockAppDocService: DeepMocked; @@ -47,11 +47,11 @@ describe('ApplicationOwnerDialogComponent', () => { useValue: {}, }, ], - declarations: [ApplicationOwnerDialogComponent], + declarations: [OwnerDialogComponent], schemas: [NO_ERRORS_SCHEMA], }).compileComponents(); - fixture = TestBed.createComponent(ApplicationOwnerDialogComponent); + fixture = TestBed.createComponent(OwnerDialogComponent); component = fixture.componentInstance; fixture.detectChanges(); }); diff --git a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/application-owner-dialog/application-owner-dialog.component.ts b/portal-frontend/src/app/shared/owner-dialogs/owner-dialog/owner-dialog.component.ts similarity index 76% rename from portal-frontend/src/app/features/applications/edit-submission/parcel-details/application-owner-dialog/application-owner-dialog.component.ts rename to portal-frontend/src/app/shared/owner-dialogs/owner-dialog/owner-dialog.component.ts index 0826020249..cfd2303c8e 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/application-owner-dialog/application-owner-dialog.component.ts +++ b/portal-frontend/src/app/shared/owner-dialogs/owner-dialog/owner-dialog.component.ts @@ -2,26 +2,29 @@ import { Component, Inject } from '@angular/core'; import { FormControl, FormGroup, Validators } from '@angular/forms'; import { MatButtonToggleChange } from '@angular/material/button-toggle'; import { MAT_DIALOG_DATA, MatDialog, MatDialogRef } from '@angular/material/dialog'; -import { ApplicationDocumentDto } from '../../../../../services/application-document/application-document.dto'; -import { ApplicationDocumentService } from '../../../../../services/application-document/application-document.service'; +import { ApplicationDocumentDto } from '../../../services/application-document/application-document.dto'; +import { ApplicationDocumentService } from '../../../services/application-document/application-document.service'; import { ApplicationOwnerCreateDto, ApplicationOwnerDto, ApplicationOwnerUpdateDto, -} from '../../../../../services/application-owner/application-owner.dto'; -import { ApplicationOwnerService } from '../../../../../services/application-owner/application-owner.service'; -import { CodeService } from '../../../../../services/code/code.service'; -import { DOCUMENT_SOURCE, DOCUMENT_TYPE, DocumentTypeDto } from '../../../../../shared/dto/document.dto'; -import { OWNER_TYPE } from '../../../../../shared/dto/owner.dto'; -import { FileHandle } from '../../../../../shared/file-drag-drop/drag-drop.directive'; -import { RemoveFileConfirmationDialogComponent } from '../../../alcs-edit-submission/remove-file-confirmation-dialog/remove-file-confirmation-dialog.component'; +} from '../../../services/application-owner/application-owner.dto'; +import { ApplicationOwnerService } from '../../../services/application-owner/application-owner.service'; +import { CodeService } from '../../../services/code/code.service'; +import { NoticeOfIntentDocumentService } from '../../../services/notice-of-intent-document/notice-of-intent-document.service'; +import { NoticeOfIntentOwnerCreateDto } from '../../../services/notice-of-intent-owner/notice-of-intent-owner.dto'; +import { NoticeOfIntentOwnerService } from '../../../services/notice-of-intent-owner/notice-of-intent-owner.service'; +import { DOCUMENT_SOURCE, DOCUMENT_TYPE, DocumentTypeDto } from '../../dto/document.dto'; +import { OWNER_TYPE } from '../../dto/owner.dto'; +import { FileHandle } from '../../file-drag-drop/drag-drop.directive'; +import { RemoveFileConfirmationDialogComponent } from '../../../features/applications/alcs-edit-submission/remove-file-confirmation-dialog/remove-file-confirmation-dialog.component'; @Component({ - selector: 'app-application-owner-dialog', - templateUrl: './application-owner-dialog.component.html', - styleUrls: ['./application-owner-dialog.component.scss'], + selector: 'app-owner-dialog', + templateUrl: './owner-dialog.component.html', + styleUrls: ['./owner-dialog.component.scss'], }) -export class ApplicationOwnerDialogComponent { +export class OwnerDialogComponent { OWNER_TYPE = OWNER_TYPE; type = new FormControl(OWNER_TYPE.INDIVIDUAL); firstName = new FormControl('', [Validators.required]); @@ -48,10 +51,8 @@ export class ApplicationOwnerDialogComponent { private documentCodes: DocumentTypeDto[] = []; constructor( - private dialogRef: MatDialogRef, - private appOwnerService: ApplicationOwnerService, + private dialogRef: MatDialogRef, private codeService: CodeService, - private documentService: ApplicationDocumentService, private dialog: MatDialog, @Inject(MAT_DIALOG_DATA) public data: { @@ -60,6 +61,8 @@ export class ApplicationOwnerDialogComponent { isDraft: boolean; parcelUuid?: string; existingOwner?: ApplicationOwnerDto; + documentService: ApplicationDocumentService | NoticeOfIntentDocumentService; + ownerService: ApplicationOwnerService | NoticeOfIntentOwnerService; } ) { if (data && data.existingOwner) { @@ -101,7 +104,7 @@ export class ApplicationOwnerDialogComponent { } const documentUuid = await this.uploadPendingFile(this.pendingFile); - const createDto: ApplicationOwnerCreateDto = { + const createDto: ApplicationOwnerCreateDto & NoticeOfIntentOwnerCreateDto = { organizationName: this.organizationName.getRawValue() || undefined, firstName: this.firstName.getRawValue() || undefined, lastName: this.lastName.getRawValue() || undefined, @@ -110,9 +113,10 @@ export class ApplicationOwnerDialogComponent { phoneNumber: this.phoneNumber.getRawValue()!, typeCode: this.type.getRawValue()!, applicationSubmissionUuid: this.data.submissionUuid, + noticeOfIntentSubmissionUuid: this.data.submissionUuid, }; - const res = await this.appOwnerService.create(createDto); + const res = await this.data.ownerService.create(createDto); this.dialogRef.close(res); } @@ -132,7 +136,7 @@ export class ApplicationOwnerDialogComponent { typeCode: this.type.getRawValue()!, }; if (this.existingUuid) { - const res = await this.appOwnerService.update(this.existingUuid, updateDto); + const res = await this.data.ownerService.update(this.existingUuid, updateDto); this.dialogRef.close(res); } } @@ -186,7 +190,7 @@ export class ApplicationOwnerDialogComponent { const fileURL = URL.createObjectURL(this.pendingFile); window.open(fileURL, '_blank'); } else if (this.existingUuid && this.data.existingOwner?.corporateSummary?.uuid) { - const res = await this.documentService.openFile(this.data.existingOwner?.corporateSummary?.uuid); + const res = await this.data.documentService.openFile(this.data.existingOwner?.corporateSummary?.uuid); if (res) { window.open(res.url, '_blank'); } @@ -196,7 +200,7 @@ export class ApplicationOwnerDialogComponent { private async uploadPendingFile(file?: File) { let documentUuid; if (file) { - documentUuid = await this.appOwnerService.uploadCorporateSummary(this.data.fileId, file); + documentUuid = await this.data.ownerService.uploadCorporateSummary(this.data.fileId, file); if (!documentUuid) { return; } diff --git a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/application-owners-dialog/application-owners-dialog.component.html b/portal-frontend/src/app/shared/owner-dialogs/owners-dialog/all-owners-dialog.component.html similarity index 82% rename from portal-frontend/src/app/features/applications/edit-submission/parcel-details/application-owners-dialog/application-owners-dialog.component.html rename to portal-frontend/src/app/shared/owner-dialogs/owners-dialog/all-owners-dialog.component.html index 209aac8011..261a10027b 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/application-owners-dialog/application-owners-dialog.component.html +++ b/portal-frontend/src/app/shared/owner-dialogs/owners-dialog/all-owners-dialog.component.html @@ -9,6 +9,8 @@

All Owners

[owners]="owners" [fileId]="fileId" [isShowAllOwners]="true" + [documentService]="data.documentService" + [ownerService]="data.ownerService" > diff --git a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/application-owners-dialog/application-owners-dialog.component.scss b/portal-frontend/src/app/shared/owner-dialogs/owners-dialog/all-owners-dialog.component.scss similarity index 100% rename from portal-frontend/src/app/features/applications/edit-submission/parcel-details/application-owners-dialog/application-owners-dialog.component.scss rename to portal-frontend/src/app/shared/owner-dialogs/owners-dialog/all-owners-dialog.component.scss diff --git a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/application-owners-dialog/application-owners-dialog.component.spec.ts b/portal-frontend/src/app/shared/owner-dialogs/owners-dialog/all-owners-dialog.component.spec.ts similarity index 66% rename from portal-frontend/src/app/features/applications/edit-submission/parcel-details/application-owners-dialog/application-owners-dialog.component.spec.ts rename to portal-frontend/src/app/shared/owner-dialogs/owners-dialog/all-owners-dialog.component.spec.ts index 002133241d..3dc13aead7 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/application-owners-dialog/application-owners-dialog.component.spec.ts +++ b/portal-frontend/src/app/shared/owner-dialogs/owners-dialog/all-owners-dialog.component.spec.ts @@ -2,12 +2,12 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MAT_DIALOG_DATA } from '@angular/material/dialog'; import { createMock, DeepMocked } from '@golevelup/ts-jest'; -import { ApplicationOwnerService } from '../../../../../services/application-owner/application-owner.service'; -import { ApplicationOwnersDialogComponent } from './application-owners-dialog.component'; +import { ApplicationOwnerService } from '../../../services/application-owner/application-owner.service'; +import { AllOwnersDialogComponent } from './all-owners-dialog.component'; describe('ApplicationOwnersDialogComponent', () => { - let component: ApplicationOwnersDialogComponent; - let fixture: ComponentFixture; + let component: AllOwnersDialogComponent; + let fixture: ComponentFixture; let mockAppOwnerService: DeepMocked; beforeEach(async () => { @@ -24,11 +24,11 @@ describe('ApplicationOwnersDialogComponent', () => { useValue: {}, }, ], - declarations: [ApplicationOwnersDialogComponent], + declarations: [AllOwnersDialogComponent], schemas: [NO_ERRORS_SCHEMA], }).compileComponents(); - fixture = TestBed.createComponent(ApplicationOwnersDialogComponent); + fixture = TestBed.createComponent(AllOwnersDialogComponent); component = fixture.componentInstance; fixture.detectChanges(); }); diff --git a/portal-frontend/src/app/shared/owner-dialogs/owners-dialog/all-owners-dialog.component.ts b/portal-frontend/src/app/shared/owner-dialogs/owners-dialog/all-owners-dialog.component.ts new file mode 100644 index 0000000000..445d22530c --- /dev/null +++ b/portal-frontend/src/app/shared/owner-dialogs/owners-dialog/all-owners-dialog.component.ts @@ -0,0 +1,47 @@ +import { Component, Inject } from '@angular/core'; +import { MAT_DIALOG_DATA } from '@angular/material/dialog'; +import { ApplicationDocumentService } from '../../../services/application-document/application-document.service'; +import { ApplicationOwnerDto } from '../../../services/application-owner/application-owner.dto'; +import { ApplicationOwnerService } from '../../../services/application-owner/application-owner.service'; +import { NoticeOfIntentDocumentService } from '../../../services/notice-of-intent-document/notice-of-intent-document.service'; +import { NoticeOfIntentOwnerDto } from '../../../services/notice-of-intent-owner/notice-of-intent-owner.dto'; +import { NoticeOfIntentOwnerService } from '../../../services/notice-of-intent-owner/notice-of-intent-owner.service'; +import { OWNER_TYPE } from '../../dto/owner.dto'; + +@Component({ + selector: 'app-all-owners-dialog', + templateUrl: './all-owners-dialog.component.html', + styleUrls: ['./all-owners-dialog.component.scss'], +}) +export class AllOwnersDialogComponent { + isDirty = false; + owners: ApplicationOwnerDto[] | NoticeOfIntentOwnerDto[] = []; + fileId: string; + submissionUuid: string; + + constructor( + @Inject(MAT_DIALOG_DATA) + public data: { + owners: ApplicationOwnerDto[] | NoticeOfIntentOwnerDto[]; + fileId: string; + submissionUuid: string; + ownerService: ApplicationOwnerService | NoticeOfIntentOwnerService; + documentService: ApplicationDocumentService | NoticeOfIntentDocumentService; + } + ) { + this.fileId = data.fileId; + this.submissionUuid = data.submissionUuid; + this.owners = data.owners; + } + + async onUpdated() { + const updatedOwners = await this.data.ownerService.fetchBySubmissionId(this.submissionUuid); + if (updatedOwners) { + // @ts-ignore Bug with Typescript https://github.com/microsoft/TypeScript/issues/44373 + this.owners = updatedOwners.filter( + (owner: { type: { code: OWNER_TYPE } }) => ![OWNER_TYPE.AGENT, OWNER_TYPE.GOVERNMENT].includes(owner.type.code) + ); + this.isDirty = true; + } + } +} diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-owners/parcel-owners.component.html b/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.html similarity index 97% rename from portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-owners/parcel-owners.component.html rename to portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.html index 51ea96511d..0041cf444a 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-owners/parcel-owners.component.html +++ b/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.html @@ -1,5 +1,5 @@
- +
diff --git a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-owners/parcel-owners.component.scss b/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.scss similarity index 66% rename from portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-owners/parcel-owners.component.scss rename to portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.scss index fb105e09eb..bea80e08ec 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-owners/parcel-owners.component.scss +++ b/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.scss @@ -1,5 +1,5 @@ -@use '../../../../../../styles/functions' as *; -@use '../../../../../../styles/colors'; +@use '../../../../styles/functions' as *; +@use '../../../../styles/colors'; .actions { button:not(:last-child) { diff --git a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-owners/parcel-owners.component.spec.ts b/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.spec.ts similarity index 82% rename from portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-owners/parcel-owners.component.spec.ts rename to portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.spec.ts index 36430e28e6..1707807c8b 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-owners/parcel-owners.component.spec.ts +++ b/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.spec.ts @@ -1,8 +1,8 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MatDialog } from '@angular/material/dialog'; -import { ApplicationOwnerService } from '../../../../../services/application-owner/application-owner.service'; -import { ConfirmationDialogService } from '../../../../../shared/confirmation-dialog/confirmation-dialog.service'; +import { ApplicationOwnerService } from '../../../services/application-owner/application-owner.service'; +import { ConfirmationDialogService } from '../../confirmation-dialog/confirmation-dialog.service'; import { ParcelOwnersComponent } from './parcel-owners.component'; diff --git a/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.ts b/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.ts new file mode 100644 index 0000000000..2d99ada35f --- /dev/null +++ b/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.ts @@ -0,0 +1,110 @@ +import { Component, EventEmitter, Input, Output } from '@angular/core'; +import { MatDialog } from '@angular/material/dialog'; +import { MatTableDataSource } from '@angular/material/table'; +import { ApplicationDocumentService } from '../../../services/application-document/application-document.service'; +import { ApplicationOwnerDto } from '../../../services/application-owner/application-owner.dto'; +import { ApplicationOwnerService } from '../../../services/application-owner/application-owner.service'; +import { NoticeOfIntentDocumentService } from '../../../services/notice-of-intent-document/notice-of-intent-document.service'; +import { NoticeOfIntentOwnerDto } from '../../../services/notice-of-intent-owner/notice-of-intent-owner.dto'; +import { NoticeOfIntentOwnerService } from '../../../services/notice-of-intent-owner/notice-of-intent-owner.service'; +import { ConfirmationDialogService } from '../../confirmation-dialog/confirmation-dialog.service'; +import { OWNER_TYPE } from '../../dto/owner.dto'; +import { CrownOwnerDialogComponent } from '../crown-owner-dialog/crown-owner-dialog.component'; +import { OwnerDialogComponent } from '../owner-dialog/owner-dialog.component'; + +@Component({ + selector: 'app-parcel-owners[owners][fileId][submissionUuid][ownerService]', + templateUrl: './parcel-owners.component.html', + styleUrls: ['./parcel-owners.component.scss'], +}) +export class ParcelOwnersComponent { + @Output() onOwnersUpdated = new EventEmitter(); + @Output() onOwnerRemoved = new EventEmitter(); + + @Input() ownerService!: ApplicationOwnerService | NoticeOfIntentOwnerService; + @Input() documentService!: ApplicationDocumentService | NoticeOfIntentDocumentService; + dataSource = new MatTableDataSource([]); + + @Input() + public set owners(owners: ApplicationOwnerDto[] | NoticeOfIntentOwnerDto[]) { + const sorted = owners.sort(this.sortOwners); + // @ts-ignore + this.dataSource = new MatTableDataSource(sorted); + } + + sortOwners(a: ApplicationOwnerDto | NoticeOfIntentOwnerDto, b: ApplicationOwnerDto | NoticeOfIntentOwnerDto) { + if (a.displayName < b.displayName) { + return -1; + } + if (a.displayName > b.displayName) { + return 1; + } + return 0; + } + + @Input() + public set disabled(disabled: boolean) { + this._disabled = disabled; + } + + @Input() submissionUuid!: string; + @Input() fileId!: string; + @Input() parcelUuid?: string | undefined; + @Input() isCrown = false; + @Input() isDraft = false; + @Input() isShowAllOwners = false; + + _disabled = false; + displayedColumns = ['type', 'position', 'displayName', 'organizationName', 'phone', 'email', 'actions']; + + constructor(private dialog: MatDialog, private confDialogService: ConfirmationDialogService) {} + + onEdit(owner: ApplicationOwnerDto) { + let dialog; + if (owner.type.code === OWNER_TYPE.CROWN) { + dialog = this.dialog.open(CrownOwnerDialogComponent, { + data: { + isDraft: this.isDraft, + parcelUuid: this.parcelUuid, + existingOwner: owner, + submissionUuid: this.submissionUuid, + ownerService: this.ownerService, + }, + }); + } else { + dialog = this.dialog.open(OwnerDialogComponent, { + data: { + isDraft: this.isDraft, + fileId: this.fileId, + submissionUuid: this.submissionUuid, + parcelUuid: this.parcelUuid, + existingOwner: owner, + ownerService: this.ownerService, + documentService: this.documentService, + }, + }); + } + dialog.beforeClosed().subscribe((updatedUuid) => { + if (updatedUuid) { + this.onOwnersUpdated.emit(); + } + }); + } + + async onRemove(uuid: string) { + this.onOwnerRemoved.emit(uuid); + } + + async onDelete(owner: ApplicationOwnerDto | NoticeOfIntentOwnerDto) { + this.confDialogService + .openDialog({ + body: `This action will remove ${owner.displayName} and its usage from the entire application. Are you sure you want to remove this owner? `, + }) + .subscribe(async (didConfirm) => { + if (didConfirm) { + await this.ownerService.delete(owner.uuid); + this.onOwnersUpdated.emit(); + } + }); + } +} diff --git a/portal-frontend/src/app/shared/shared.module.ts b/portal-frontend/src/app/shared/shared.module.ts index 3d55310071..75b24121ec 100644 --- a/portal-frontend/src/app/shared/shared.module.ts +++ b/portal-frontend/src/app/shared/shared.module.ts @@ -31,6 +31,10 @@ import { DragDropDirective } from './file-drag-drop/drag-drop.directive'; import { FileDragDropComponent } from './file-drag-drop/file-drag-drop.component'; import { InfoBannerComponent } from './info-banner/info-banner.component'; import { NoDataComponent } from './no-data/no-data.component'; +import { CrownOwnerDialogComponent } from './owner-dialogs/crown-owner-dialog/crown-owner-dialog.component'; +import { OwnerDialogComponent } from './owner-dialogs/owner-dialog/owner-dialog.component'; +import { AllOwnersDialogComponent } from './owner-dialogs/owners-dialog/all-owners-dialog.component'; +import { ParcelOwnersComponent } from './owner-dialogs/parcel-owners/parcel-owners.component'; import { EmailValidPipe } from './pipes/emailValid.pipe'; import { FileSizePipe } from './pipes/fileSize.pipe'; import { MomentPipe } from './pipes/moment.pipe'; @@ -59,6 +63,15 @@ import { WarningBannerComponent } from './warning-banner/warning-banner.componen NgxMaskDirective, NgxMaskPipe, MatRadioModule, + MatDialogModule, + MatTableModule, + FormsModule, + ReactiveFormsModule, + MatFormFieldModule, + MatInputModule, + MatButtonToggleModule, + MatCheckboxModule, + MatIconModule, ], declarations: [ FileDragDropComponent, @@ -74,6 +87,10 @@ import { WarningBannerComponent } from './warning-banner/warning-banner.componen CustomStepperComponent, MomentPipe, PresribedBodyComponent, + OwnerDialogComponent, + CrownOwnerDialogComponent, + AllOwnersDialogComponent, + ParcelOwnersComponent, ], exports: [ CommonModule, @@ -116,6 +133,10 @@ import { WarningBannerComponent } from './warning-banner/warning-banner.componen NgxMaskPipe, MomentPipe, PresribedBodyComponent, + OwnerDialogComponent, + CrownOwnerDialogComponent, + AllOwnersDialogComponent, + ParcelOwnersComponent, ], }) export class SharedModule { diff --git a/services/apps/alcs/src/common/automapper/notice-of-intent-submission.automapper.profile.ts b/services/apps/alcs/src/common/automapper/notice-of-intent-submission.automapper.profile.ts index 6c2e94ef6a..f577977c4a 100644 --- a/services/apps/alcs/src/common/automapper/notice-of-intent-submission.automapper.profile.ts +++ b/services/apps/alcs/src/common/automapper/notice-of-intent-submission.automapper.profile.ts @@ -7,6 +7,8 @@ import { NoticeOfIntentSubmissionToSubmissionStatusDto, } from '../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status.dto'; import { NoticeOfIntentSubmissionToSubmissionStatus } from '../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status.entity'; +import { NoticeOfIntentOwnerDto } from '../../portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.dto'; +import { NoticeOfIntentOwner } from '../../portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.entity'; import { NoticeOfIntentSubmissionDetailedDto, NoticeOfIntentSubmissionDto, @@ -43,6 +45,20 @@ export class NoticeOfIntentSubmissionProfile extends AutomapperProfile { return ad.status.statusType; }), ), + forMember( + (a) => a.owners, + mapFrom((ad) => { + if (ad.owners) { + return this.mapper.mapArray( + ad.owners, + NoticeOfIntentOwner, + NoticeOfIntentOwnerDto, + ); + } else { + return []; + } + }), + ), ); createMap( diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.dto.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.dto.ts index 9cd7278d9d..ccb29748bd 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.dto.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.dto.ts @@ -1,14 +1,14 @@ import { AutoMap } from '@automapper/classes'; import { - IsBoolean, IsNotEmpty, IsOptional, IsString, IsUUID, MaxLength, } from 'class-validator'; -import { ApplicationStatusDto } from '../../alcs/application/application-submission-status/submission-status.dto'; import { NoticeOfIntentStatusDto } from '../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status.dto'; +import { ApplicationOwnerDto } from '../application-submission/application-owner/application-owner.dto'; +import { NoticeOfIntentOwnerDto } from './notice-of-intent-owner/notice-of-intent-owner.dto'; export const MAX_DESCRIPTION_FIELD_LENGTH = 4000; @@ -35,6 +35,7 @@ export class NoticeOfIntentSubmissionDto { type: string; status: NoticeOfIntentStatusDto; + owners: NoticeOfIntentOwnerDto[]; canEdit: boolean; canView: boolean; diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts index db15158ca5..dc5a46ed87 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts @@ -34,7 +34,13 @@ export class NoticeOfIntentSubmissionService { private logger: Logger = new Logger(NoticeOfIntentSubmissionService.name); private DEFAULT_RELATIONS: FindOptionsRelations = { - //TODO + owners: { + type: true, + corporateSummary: { + document: true, + }, + parcels: true, + }, }; constructor( From 1595b0e2124d5cf6ac952521b274c54d415197eb Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Fri, 11 Aug 2023 11:19:58 -0700 Subject: [PATCH 227/954] Add table descriptions --- .../1691777711797-add_noi_table_comments.ts | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1691777711797-add_noi_table_comments.ts diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1691777711797-add_noi_table_comments.ts b/services/apps/alcs/src/providers/typeorm/migrations/1691777711797-add_noi_table_comments.ts new file mode 100644 index 0000000000..9ac4860e6c --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1691777711797-add_noi_table_comments.ts @@ -0,0 +1,20 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class addNoiTableComments1691777711797 implements MigrationInterface { + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query( + ` + COMMENT ON TABLE "alcs"."notice_of_intent_parcel_ownership_type" IS 'Parcel Ownership types used for NOI Parcels'; + COMMENT ON TABLE "alcs"."notice_of_intent_parcel" IS 'Parcels that are linked to Notice of Intent Submissions'; + COMMENT ON TABLE "alcs"."notice_of_intent_owner" IS 'Owners for Notice of Intent Submissions'; + COMMENT ON TABLE "alcs"."notice_of_intent_parcel_owners_notice_of_intent_owner" IS 'Join table that links Owners to Parcels'; + COMMENT ON TABLE "alcs"."notice_of_intent_submission_status_type" IS 'The code table for Notice of Intent Submissions Statuses'; + COMMENT ON TABLE "alcs"."notice_of_intent_submission_to_submission_status" IS 'Join table to link Notice of Intent Submissions to their Statuses'; + `, + ); + } + + public async down(): Promise { + //No + } +} From a7487e4bd2073cb93c9ec9050040bea452fb1e2d Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Fri, 11 Aug 2023 13:04:18 -0700 Subject: [PATCH 228/954] Code Review Feedback --- .../parcel-entry/parcel-entry.component.html | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.html index 9c3365cc68..70ccd10264 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.html @@ -334,16 +334,18 @@
Owner Information
Add new government contact
- - - - - - - - - - +
From c8ab0853da9d6b3668d24f9912d1e6dca416be33 Mon Sep 17 00:00:00 2001 From: Liam Stoddard Date: Fri, 11 Aug 2023 13:06:00 -0700 Subject: [PATCH 229/954] found the bug --- .../applications/app_prep.py | 27 +++++++++++++--- .../sql/application-prep/application_prep.sql | 31 ++++++++++++------- .../common/alcs_application_enum.py | 4 +++ .../common/oats_application_code_values.py | 6 ++++ 4 files changed, 53 insertions(+), 15 deletions(-) diff --git a/bin/migrate-oats-data/applications/app_prep.py b/bin/migrate-oats-data/applications/app_prep.py index 88bacb10a2..eafd5bf0eb 100644 --- a/bin/migrate-oats-data/applications/app_prep.py +++ b/bin/migrate-oats-data/applications/app_prep.py @@ -9,6 +9,8 @@ AlcsAgCapSource, log_end, log_start, + OatsLegislationCodes, + AlcsApplicantType, ) from db import inject_conn_pool from constants import BATCH_UPLOAD_SIZE @@ -45,6 +47,11 @@ class OatsToAlcsAgCap(Enum): S = AlcsAgCap.Secondary.value U = AlcsAgCap.Unclassified.value +class OatsLegislationCodes(Enum): + SEC_30_1 = AlcsApplicantType.Land_owner.value + SEC_29_1 = AlcsApplicantType.LFNG.value + SEC_17_3 = AlcsApplicantType.Land_owner.value + SEC_17_1 = AlcsApplicantType.LFNG.value @inject_conn_pool def process_alcs_application_prep_fields(conn=None, batch_size=BATCH_UPLOAD_SIZE): @@ -165,7 +172,7 @@ def update_app_prep_records(conn, batch_size, cursor, rows): execute_batch( cursor, get_update_query_for_inc(), - exc_data_list, + inc_data_list, # sneaky bug page_size=batch_size, ) @@ -209,8 +216,10 @@ def prepare_app_prep_data(app_prep_raw_data_list): elif data["alr_change_code"] == ALRChangeCode.NAR.value: nar_data_list.append(data) elif data["alr_change_code"] == ALRChangeCode.EXC.value: + data = mapOatsToAlcsLeg(data) exc_data_list.append(data) elif data["alr_change_code"] == ALRChangeCode.INC.value: + data = mapOatsToAlcsLeg(data) inc_data_list.append(data) else: other_data_list.append(data) @@ -233,6 +242,14 @@ def mapOatsToAlcsAppPrep(data): return data +def mapOatsToAlcsLeg(data): + + if data["legislation_code"]: + data["legislation_code"] = str( + OatsLegislationCodes[data["legislation_code"]].value + ) + + return data def get_update_query_for_nfu(): query = """ @@ -280,7 +297,8 @@ def get_update_query_for_exc(): ag_cap_consultant = %(agri_cap_consultant)s, alr_area = %(component_area)s, ag_cap_source = %(capability_source_code)s, - staff_observations = %(staff_comment_observations)s + staff_observations = %(staff_comment_observations)s, + incl_excl_applicant_type = %(legislation_code)s WHERE alcs.application.file_number = %(alr_application_id)s::text; @@ -297,7 +315,8 @@ def get_update_query_for_inc(): ag_cap_consultant = %(agri_cap_consultant)s, alr_area = %(component_area)s, ag_cap_source = %(capability_source_code)s, - staff_observations = %(staff_comment_observations)s + staff_observations = %(staff_comment_observations)s, + incl_excl_applicant_type = %(legislation_code)s WHERE alcs.application.file_number = %(alr_application_id)s::text; @@ -333,7 +352,7 @@ def map_oats_to_alcs_nfu_subtypes(nfu_type_code, nfu_subtype_code): def map_basic_field(data): if data["capability_source_code"]: - data["capability_source_code"] = data["capability_source_code"] = str( + data["capability_source_code"] = str( OatsToAlcsAgCapSource[data["capability_source_code"]].value ) if data["agri_capability_code"]: diff --git a/bin/migrate-oats-data/applications/sql/application-prep/application_prep.sql b/bin/migrate-oats-data/applications/sql/application-prep/application_prep.sql index 72c23f5944..3e9649724a 100644 --- a/bin/migrate-oats-data/applications/sql/application-prep/application_prep.sql +++ b/bin/migrate-oats-data/applications/sql/application-prep/application_prep.sql @@ -1,12 +1,19 @@ -WITH appl_components_grouped AS ( - SELECT oaac.alr_application_id - FROM oats.oats_alr_appl_components oaac - JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id - WHERE oaa.application_class_code IN ('LOA', 'BLK') - GROUP BY oaac.alr_application_id - HAVING count(oaac.alr_application_id) < 2 -- ignore all applications wit multiple components -) -SELECT oaa.alr_application_id, +WITH + appl_components_grouped AS ( + SELECT + oaac.alr_application_id + FROM + oats.oats_alr_appl_components oaac + JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id + WHERE + oaa.application_class_code IN ('LOA', 'BLK') + GROUP BY + oaac.alr_application_id + HAVING + count(oaac.alr_application_id) < 2 -- ignore all applications wit multiple components + ) +SELECT + oaa.alr_application_id, oaac.agri_capability_code, oaac.agri_cap_map, oaac.agri_cap_consultant, @@ -19,7 +26,9 @@ SELECT oaa.alr_application_id, oaac.rsdntl_use_end_date, oaac.exclsn_app_type_code, oaa.staff_comment_observations, - oaac.alr_change_code -FROM appl_components_grouped acg + oaac.alr_change_code, + oaac.legislation_code +FROM + appl_components_grouped acg JOIN oats.oats_alr_appl_components oaac ON oaac.alr_application_id = acg.alr_application_id JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = acg.alr_application_id \ No newline at end of file diff --git a/bin/migrate-oats-data/common/alcs_application_enum.py b/bin/migrate-oats-data/common/alcs_application_enum.py index 02434a709b..298f64712c 100644 --- a/bin/migrate-oats-data/common/alcs_application_enum.py +++ b/bin/migrate-oats-data/common/alcs_application_enum.py @@ -48,3 +48,7 @@ class AlcsAgCapSource(Enum): BCLI = "BCLI" CLI = "CLI" On_site = "On-site" + +class AlcsApplicantType(Enum): + Land_owner = "Land Owner" + LFNG = "L/FNG Initiated" \ No newline at end of file diff --git a/bin/migrate-oats-data/common/oats_application_code_values.py b/bin/migrate-oats-data/common/oats_application_code_values.py index da8b8139bc..5dd8e7ca1a 100644 --- a/bin/migrate-oats-data/common/oats_application_code_values.py +++ b/bin/migrate-oats-data/common/oats_application_code_values.py @@ -28,6 +28,12 @@ class OatsAgriCapabilityCodes(Enum): S = "S" U = "U" +class OatsLegislationCodes(Enum): + SEC_30_1 = "SEC_30_1" + SEC_29_1 = "SEC_29_1" + SEC_17_3 = "SEC_17_3" + SEC_17_1 = "SEC_17_1" + OATS_NFU_SUBTYPES = [ {"type_key": "AGR", "subtype_key": "1", "value": "Accessory Buildings"}, {"type_key": "RES", "subtype_key": "2", "value": "Additional Dwelling(s)"}, From 4d534bd0ea2a4924c81f5900b094db9d1bdc2a5d Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Fri, 11 Aug 2023 13:15:03 -0700 Subject: [PATCH 230/954] Add more subtext * Add subtext to all form fields so they line up * Change some fields back to non-full width * Remove a font size in typography so it can be changed --- .../parcel-entry/parcel-entry.component.html | 13 +++++++++--- .../parcel-entry/parcel-entry.component.html | 20 +++++++++++++------ portal-frontend/src/styles/typography.scss | 2 -- 3 files changed, 24 insertions(+), 11 deletions(-) diff --git a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html index 91d4429399..4048cca05d 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html @@ -103,6 +103,7 @@
Parcel Lookup
+
A unique nine-digit number found on the parcel's Certificate of Title
@@ -115,14 +116,16 @@
Parcel Lookup
+
Unique numeric identifier for Crown land parcels
-
+
- +
Date of the original registered purchase of the parcel.
+ Parcel Lookup
-
+
As determined by @@ -181,6 +184,10 @@
Parcel Lookup
+
+ Visit BC Land Title & Survey to obtain + a recent copy (not older than 1 year) of the Certificate of Title +
Parcel Lookup
- +
A unique nine-digit number found on the parcel's Certificate of Title
+
@@ -113,16 +114,18 @@
Parcel Lookup
-
+
- +
Unique numeric identifier for Crown land parcels
+
-
+
- +
Date of the original registered purchase of the parcel.
+ Parcel Lookup
-
+
As determined by @@ -181,6 +184,11 @@
Parcel Lookup
+
+ Visit + BC Land Title & Survey + to obtain a recent copy (not older than 1 year) of the Certificate of Title +
Date: Fri, 11 Aug 2023 13:23:38 -0700 Subject: [PATCH 231/954] updated validation --- bin/migrate-oats-data/applications/app_prep.py | 2 +- .../application_prep_basic_validation.sql | 15 ++++++++++++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/bin/migrate-oats-data/applications/app_prep.py b/bin/migrate-oats-data/applications/app_prep.py index eafd5bf0eb..0be19ec600 100644 --- a/bin/migrate-oats-data/applications/app_prep.py +++ b/bin/migrate-oats-data/applications/app_prep.py @@ -172,7 +172,7 @@ def update_app_prep_records(conn, batch_size, cursor, rows): execute_batch( cursor, get_update_query_for_inc(), - inc_data_list, # sneaky bug + inc_data_list, page_size=batch_size, ) diff --git a/bin/migrate-oats-data/applications/sql/application-prep/application_prep_basic_validation.sql b/bin/migrate-oats-data/applications/sql/application-prep/application_prep_basic_validation.sql index c2523a58f3..0e3767c3de 100644 --- a/bin/migrate-oats-data/applications/sql/application-prep/application_prep_basic_validation.sql +++ b/bin/migrate-oats-data/applications/sql/application-prep/application_prep_basic_validation.sql @@ -30,7 +30,14 @@ oats_app_prep_data AS ( WHEN onusc.description = 'Tourist Accomodations' THEN 'Tourist Accommodations' WHEN onusc.description = 'Office Buiding (Primary Use)' THEN 'Office Building (Primary Use)' ELSE onusc.description - END AS mapped_nonfarm_use_subtype_description + END AS mapped_nonfarm_use_subtype_description, + CASE + WHEN oaac.legislation_code = 'SEC_30_1' THEN 'Land Owner' + WHEN oaac.legislation_code = 'SEC_29_1' THEN 'L/FNG Initiated' + WHEN oaac.legislation_code = 'SEC_17_3' THEN 'Land Owner' + WHEN oaac.legislation_code = 'SEC_17_1' THEN 'L/FNG Initiated' + ELSE oaac.legislation_code + END AS mapped_legislation FROM appl_components_grouped acg JOIN oats.oats_alr_appl_components oaac ON oaac.alr_application_id = acg.alr_application_id JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = acg.alr_application_id @@ -54,11 +61,13 @@ SELECT oapd.alr_application_id, oapd.agri_cap_consultant, oapd.staff_comment_observations, oapd.nonfarm_use_type_description, - oapd.mapped_nonfarm_use_subtype_description + oapd.mapped_nonfarm_use_subtype_description, + oapd.mapped_legislation FROM alcs.application a LEFT JOIN oats_app_prep_data AS oapd ON a.file_number = oapd.alr_application_id::TEXT WHERE a.alr_area != oapd.component_area OR a.ag_cap_map != oapd.agri_cap_map OR a.ag_cap_consultant != oapd.agri_cap_consultant OR a.staff_observations != oapd.staff_comment_observations - OR a.nfu_use_sub_type != oapd.mapped_nonfarm_use_subtype_description \ No newline at end of file + OR a.nfu_use_sub_type != oapd.mapped_nonfarm_use_subtype_description + OR a.incl_excl_applicant_type != oapd.mapped_legislation \ No newline at end of file From 0b130ed7390894bce1ed826609958b94df12f68c Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Fri, 11 Aug 2023 14:18:55 -0700 Subject: [PATCH 232/954] Add Steps 2,3,4,7 * Update stepper with correct number of steps and labels * Copy over components and setup for NOIs --- .../edit-submission-base.module.ts | 12 + .../edit-submission.component.html | 48 ++- .../edit-submission.component.spec.ts | 5 + .../edit-submission.component.ts | 33 +- .../edit-submission/files-step.partial.ts | 75 +++++ .../land-use/land-use.component.html | 307 ++++++++++++++++++ .../land-use/land-use.component.scss | 5 + .../land-use/land-use.component.spec.ts | 54 +++ .../land-use/land-use.component.ts | 119 +++++++ .../other-attachments.component.html | 107 ++++++ .../other-attachments.component.scss | 38 +++ .../other-attachments.component.spec.ts | 68 ++++ .../other-attachments.component.ts | 121 +++++++ .../primary-contact.component.html | 179 ++++++++++ .../primary-contact.component.scss | 58 ++++ .../primary-contact.component.spec.ts | 71 ++++ .../primary-contact.component.ts | 256 +++++++++++++++ .../select-government.component.html | 68 ++++ .../select-government.component.scss | 0 .../select-government.component.spec.ts | 43 +++ .../select-government.component.ts | 147 +++++++++ .../notice-of-intent-submission.dto.ts | 32 +- .../notice-of-intent-submission.service.ts | 38 ++- 23 files changed, 1856 insertions(+), 28 deletions(-) create mode 100644 portal-frontend/src/app/features/notice-of-intents/edit-submission/files-step.partial.ts create mode 100644 portal-frontend/src/app/features/notice-of-intents/edit-submission/land-use/land-use.component.html create mode 100644 portal-frontend/src/app/features/notice-of-intents/edit-submission/land-use/land-use.component.scss create mode 100644 portal-frontend/src/app/features/notice-of-intents/edit-submission/land-use/land-use.component.spec.ts create mode 100644 portal-frontend/src/app/features/notice-of-intents/edit-submission/land-use/land-use.component.ts create mode 100644 portal-frontend/src/app/features/notice-of-intents/edit-submission/other-attachments/other-attachments.component.html create mode 100644 portal-frontend/src/app/features/notice-of-intents/edit-submission/other-attachments/other-attachments.component.scss create mode 100644 portal-frontend/src/app/features/notice-of-intents/edit-submission/other-attachments/other-attachments.component.spec.ts create mode 100644 portal-frontend/src/app/features/notice-of-intents/edit-submission/other-attachments/other-attachments.component.ts create mode 100644 portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html create mode 100644 portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.scss create mode 100644 portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.spec.ts create mode 100644 portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts create mode 100644 portal-frontend/src/app/features/notice-of-intents/edit-submission/select-government/select-government.component.html create mode 100644 portal-frontend/src/app/features/notice-of-intents/edit-submission/select-government/select-government.component.scss create mode 100644 portal-frontend/src/app/features/notice-of-intents/edit-submission/select-government/select-government.component.spec.ts create mode 100644 portal-frontend/src/app/features/notice-of-intents/edit-submission/select-government/select-government.component.ts diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission-base.module.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission-base.module.ts index 57f9693ad8..63cf738713 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission-base.module.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission-base.module.ts @@ -9,10 +9,14 @@ import { MatTableModule } from '@angular/material/table'; import { NgxMaskDirective, NgxMaskPipe } from 'ngx-mask'; import { SharedModule } from '../../../shared/shared.module'; import { EditSubmissionComponent } from './edit-submission.component'; +import { LandUseComponent } from './land-use/land-use.component'; +import { OtherAttachmentsComponent } from './other-attachments/other-attachments.component'; import { DeleteParcelDialogComponent } from './parcels/delete-parcel/delete-parcel-dialog.component'; import { ParcelDetailsComponent } from './parcels/parcel-details.component'; import { ParcelEntryConfirmationDialogComponent } from './parcels/parcel-entry/parcel-entry-confirmation-dialog/parcel-entry-confirmation-dialog.component'; import { ParcelEntryComponent } from './parcels/parcel-entry/parcel-entry.component'; +import { PrimaryContactComponent } from './primary-contact/primary-contact.component'; +import { SelectGovernmentComponent } from './select-government/select-government.component'; @NgModule({ declarations: [ @@ -21,6 +25,10 @@ import { ParcelEntryComponent } from './parcels/parcel-entry/parcel-entry.compon ParcelEntryComponent, ParcelEntryConfirmationDialogComponent, DeleteParcelDialogComponent, + PrimaryContactComponent, + SelectGovernmentComponent, + LandUseComponent, + OtherAttachmentsComponent, ], imports: [ CommonModule, @@ -40,6 +48,10 @@ import { ParcelEntryComponent } from './parcels/parcel-entry/parcel-entry.compon ParcelEntryComponent, ParcelEntryConfirmationDialogComponent, DeleteParcelDialogComponent, + PrimaryContactComponent, + SelectGovernmentComponent, + LandUseComponent, + OtherAttachmentsComponent, ], }) export class EditSubmissionBaseModule {} diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.html index ab2679138c..ddae45362f 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.html @@ -11,9 +11,7 @@
Notice of Intent ID: {{ noiSubmission.fileNumber }} | Download PDF
- + Notice of Intent ID: {{ noiSubmission.fileNumber }} |
Notice of Intent ID: {{ noiSubmission.fileNumber }} | -
Primary Contact
+
+ +
-
Select Government
+
+ +
-
Land Use
+
+ +
Proposal
 + + +
Additional Information
+ -
Other attachments
+
+ +
diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.spec.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.spec.ts index b77ae01080..70c4567d05 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.spec.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.spec.ts @@ -1,6 +1,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MatDialog } from '@angular/material/dialog'; import { ActivatedRoute } from '@angular/router'; +import { NoticeOfIntentDocumentService } from '../../../services/notice-of-intent-document/notice-of-intent-document.service'; import { NoticeOfIntentSubmissionService } from '../../../services/notice-of-intent-submission/notice-of-intent-submission.service'; import { ToastService } from '../../../services/toast/toast.service'; @@ -18,6 +19,10 @@ describe('EditSubmissionComponent', () => { provide: NoticeOfIntentSubmissionService, useValue: {}, }, + { + provide: NoticeOfIntentDocumentService, + useValue: {}, + }, { provide: ToastService, useValue: {}, diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.ts index 0f183800a7..38969bd7de 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.ts @@ -3,14 +3,19 @@ import { AfterViewInit, Component, OnDestroy, ViewChild } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; import { ActivatedRoute, Router } from '@angular/router'; import { BehaviorSubject, combineLatest, Observable, of, Subject, takeUntil } from 'rxjs'; +import { NoticeOfIntentDocumentDto } from '../../../services/notice-of-intent-document/notice-of-intent-document.dto'; +import { NoticeOfIntentDocumentService } from '../../../services/notice-of-intent-document/notice-of-intent-document.service'; import { NoticeOfIntentSubmissionDetailedDto } from '../../../services/notice-of-intent-submission/notice-of-intent-submission.dto'; import { NoticeOfIntentSubmissionService } from '../../../services/notice-of-intent-submission/notice-of-intent-submission.service'; import { ToastService } from '../../../services/toast/toast.service'; import { CustomStepperComponent } from '../../../shared/custom-stepper/custom-stepper.component'; import { OverlaySpinnerService } from '../../../shared/overlay-spinner/overlay-spinner.service'; import { scrollToElement } from '../../../shared/utils/scroll-helper'; -import { EditApplicationSteps } from '../../applications/edit-submission/edit-submission.component'; +import { LandUseComponent } from './land-use/land-use.component'; +import { OtherAttachmentsComponent } from './other-attachments/other-attachments.component'; import { ParcelDetailsComponent } from './parcels/parcel-details.component'; +import { PrimaryContactComponent } from './primary-contact/primary-contact.component'; +import { SelectGovernmentComponent } from './select-government/select-government.component'; export enum EditNoiSteps { Parcel = 0, @@ -33,6 +38,7 @@ export class EditSubmissionComponent implements OnDestroy, AfterViewInit { $destroy = new Subject(); $noiSubmission = new BehaviorSubject(undefined); + $noiDocuments = new BehaviorSubject([]); noiSubmission: NoticeOfIntentSubmissionDetailedDto | undefined; steps = EditNoiSteps; @@ -42,9 +48,14 @@ export class EditSubmissionComponent implements OnDestroy, AfterViewInit { @ViewChild('cdkStepper') public customStepper!: CustomStepperComponent; @ViewChild(ParcelDetailsComponent) parcelDetailsComponent!: ParcelDetailsComponent; + @ViewChild(PrimaryContactComponent) primaryContactComponent!: PrimaryContactComponent; + @ViewChild(SelectGovernmentComponent) selectGovernmentComponent!: SelectGovernmentComponent; + @ViewChild(LandUseComponent) landUseComponent!: LandUseComponent; + @ViewChild(OtherAttachmentsComponent) otherAttachmentsComponent!: OtherAttachmentsComponent; constructor( private noticeOfIntentSubmissionService: NoticeOfIntentSubmissionService, + private noticeOfIntentDocumentService: NoticeOfIntentDocumentService, private activatedRoute: ActivatedRoute, private dialog: MatDialog, private toastService: ToastService, @@ -117,9 +128,21 @@ export class EditSubmissionComponent implements OnDestroy, AfterViewInit { async saveSubmission(step: number) { switch (step) { - case EditApplicationSteps.AppParcel: + case EditNoiSteps.Parcel: await this.parcelDetailsComponent.onSave(); break; + case EditNoiSteps.PrimaryContact: + await this.primaryContactComponent.onSave(); + break; + case EditNoiSteps.Government: + await this.selectGovernmentComponent.onSave(); + break; + case EditNoiSteps.LandUse: + await this.landUseComponent.onSave(); + break; + case EditNoiSteps.Attachments: + await this.otherAttachmentsComponent.onSave(); + break; default: this.toastService.showErrorToast('Error updating notice of intent.'); } @@ -140,6 +163,12 @@ export class EditSubmissionComponent implements OnDestroy, AfterViewInit { this.overlayService.showSpinner(); this.noiSubmission = await this.noticeOfIntentSubmissionService.getByFileId(fileId); this.fileId = fileId; + + const documents = await this.noticeOfIntentDocumentService.getByFileId(fileId); + if (documents) { + this.$noiDocuments.next(documents); + } + this.$noiSubmission.next(this.noiSubmission); this.overlayService.hideSpinner(); } diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/files-step.partial.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/files-step.partial.ts new file mode 100644 index 0000000000..5c5cdcf681 --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/files-step.partial.ts @@ -0,0 +1,75 @@ +import { Component, Input } from '@angular/core'; +import { MatDialog } from '@angular/material/dialog'; +import { BehaviorSubject } from 'rxjs'; +import { NoticeOfIntentDocumentDto } from '../../../services/notice-of-intent-document/notice-of-intent-document.dto'; +import { NoticeOfIntentDocumentService } from '../../../services/notice-of-intent-document/notice-of-intent-document.service'; +import { DOCUMENT_TYPE } from '../../../shared/dto/document.dto'; +import { FileHandle } from '../../../shared/file-drag-drop/drag-drop.directive'; +import { RemoveFileConfirmationDialogComponent } from '../../applications/alcs-edit-submission/remove-file-confirmation-dialog/remove-file-confirmation-dialog.component'; +import { StepComponent } from './step.partial'; + +@Component({ + selector: 'app-file-step', + template: '

', + styleUrls: [], +}) +export abstract class FilesStepComponent extends StepComponent { + @Input() $noiDocuments!: BehaviorSubject; + + DOCUMENT_TYPE = DOCUMENT_TYPE; + + protected fileId = ''; + + protected abstract save(): Promise; + + protected constructor( + protected noticeOfIntentDocumentService: NoticeOfIntentDocumentService, + protected dialog: MatDialog + ) { + super(); + } + + async attachFile(file: FileHandle, documentType: DOCUMENT_TYPE | null) { + if (this.fileId) { + await this.save(); + const mappedFiles = file.file; + await this.noticeOfIntentDocumentService.attachExternalFile(this.fileId, mappedFiles, documentType); + const documents = await this.noticeOfIntentDocumentService.getByFileId(this.fileId); + if (documents) { + this.$noiDocuments.next(documents); + } + } + } + + async onDeleteFile($event: NoticeOfIntentDocumentDto) { + if (this.draftMode) { + this.dialog + .open(RemoveFileConfirmationDialogComponent) + .beforeClosed() + .subscribe(async (didConfirm) => { + if (didConfirm) { + this.deleteFile($event); + } + }); + } else { + await this.deleteFile($event); + } + } + + private async deleteFile($event: NoticeOfIntentDocumentDto) { + await this.noticeOfIntentDocumentService.deleteExternalFile($event.uuid); + if (this.fileId) { + const documents = await this.noticeOfIntentDocumentService.getByFileId(this.fileId); + if (documents) { + this.$noiDocuments.next(documents); + } + } + } + + async openFile(uuid: string) { + const res = await this.noticeOfIntentDocumentService.openFile(uuid); + if (res) { + window.open(res.url, '_blank'); + } + } +} diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/land-use/land-use.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/land-use/land-use.component.html new file mode 100644 index 0000000000..a1a532ff09 --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/land-use/land-use.component.html @@ -0,0 +1,307 @@ +
+
+

Land Use

+

Current land use of parcel(s) under notice of intent and adjacent parcels.

+

*All fields are required unless stated optional.

+
+ + Please consult the + 'What the Commission Considers' + page of the ALC website for more information. + +
+
Land Use of Parcel(s) under Notice of Intent
+
+
+ +
You may describe multiple parcels collectively or individually.
+ + + +
+ warning +
This field is required
+
+ Example 1: PID 001-002-003: 60 ha hay crop, 40 ha grazing, 200 sheep. Example 2: Parcel 1: 10% + blueberry crop, 30% vegetables, 60% hay. Parcel 2: 100% hay. + +
Characters left: {{ 4000 - parcelsAgricultureDescriptionText.textLength }}
+
+
+
+ +
+
+ Describe any irrigation, drainage, fencing, material enhancement, clearing, etc. undertaken on the parcel(s). + If there have been no agricultural improvements on the parcel(s), please specify "No Agricultural + Improvements". +
+ + + +
+ warning +
This field is required
+
+ Example: 40 ha of grazing land fenced in 2010. +
Characters left: {{ 4000 - parcelsAgricultureImprovementDescriptionText.textLength }}
+
+
+ +
+ Describe any non-agricultural uses such as home-based businesses, commercial, recreational, institutional, + industrial, etc. If all activity is agricultural, please specify "No non-agricultural activity". +
+ + + +
+ warning +
This field is required
+
+ Example: House and 100 square metre detached auto repair shop. +
Characters left: {{ 4000 - parcelsNonAgricultureUseDescriptionText.textLength }}
+
+
+
Identify the land uses surrounding the parcel(s) under notice of intent.
+
+ Choose the Primary Land Use Type from the drop-down list. If there is more than one land use type, choose the main + land use and describe all the uses under Specific Activity. +
+
+
+ +
+
+ + + {{ + enum.value + }} + + +
+ warning +
This field is required
+
+
+
+ + + +
+ warning +
This field is required
+
+
+
+
+ +
+ +
+
+ + + {{ + enum.value + }} + + +
+ warning +
This field is required
+
+
+
+ + + +
+ warning +
This field is required
+
+
+
+
+ +
+ +
+
+ + + {{ + enum.value + }} + + +
+ warning +
This field is required
+
+
+
+ + + +
+ warning +
This field is required
+
+
+
+
+ +
+ +
+
+ + + {{ + enum.value + }} + + +
+ warning +
This field is required
+
+
+
+ + + +
+ warning +
This field is required
+
+
+
+
+
+ + +
+ + +
+ + +
+
+
diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/land-use/land-use.component.scss b/portal-frontend/src/app/features/notice-of-intents/edit-submission/land-use/land-use.component.scss new file mode 100644 index 0000000000..26003d9afa --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/land-use/land-use.component.scss @@ -0,0 +1,5 @@ +@use '../../../../../styles/functions' as *; + +h5 { + margin-top: rem(12) !important; +} diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/land-use/land-use.component.spec.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/land-use/land-use.component.spec.ts new file mode 100644 index 0000000000..28d919e005 --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/land-use/land-use.component.spec.ts @@ -0,0 +1,54 @@ +import { HttpClient } from '@angular/common/http'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { Router } from '@angular/router'; +import { DeepMocked, createMock } from '@golevelup/ts-jest'; +import { BehaviorSubject } from 'rxjs'; + +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { NoticeOfIntentSubmissionDetailedDto } from '../../../../services/notice-of-intent-submission/notice-of-intent-submission.dto'; +import { NoticeOfIntentSubmissionService } from '../../../../services/notice-of-intent-submission/notice-of-intent-submission.service'; +import { LandUseComponent } from './land-use.component'; + +describe('LandUseComponent', () => { + let component: LandUseComponent; + let fixture: ComponentFixture; + let mockAppService: DeepMocked; + let mockHttpClient: DeepMocked; + let mockRouter: DeepMocked; + let noiPipe = new BehaviorSubject(undefined); + + beforeEach(async () => { + mockAppService = createMock(); + mockHttpClient = createMock(); + mockRouter = createMock(); + + await TestBed.configureTestingModule({ + providers: [ + { + provide: Router, + useValue: mockRouter, + }, + { + provide: NoticeOfIntentSubmissionService, + useValue: mockAppService, + }, + { + provide: HttpClient, + useValue: mockHttpClient, + }, + ], + declarations: [LandUseComponent], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(LandUseComponent); + component = fixture.componentInstance; + component.$noiSubmission = noiPipe; + + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/land-use/land-use.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/land-use/land-use.component.ts new file mode 100644 index 0000000000..96ccbebde9 --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/land-use/land-use.component.ts @@ -0,0 +1,119 @@ +import { Component, OnDestroy, OnInit } from '@angular/core'; +import { FormControl, FormGroup, Validators } from '@angular/forms'; +import { Router } from '@angular/router'; +import { takeUntil } from 'rxjs'; +import { NoticeOfIntentSubmissionDetailedDto } from '../../../../services/notice-of-intent-submission/notice-of-intent-submission.dto'; +import { NoticeOfIntentSubmissionService } from '../../../../services/notice-of-intent-submission/notice-of-intent-submission.service'; +import { EditNoiSteps } from '../edit-submission.component'; +import { StepComponent } from '../step.partial'; + +export enum MainLandUseTypeOptions { + AgriculturalFarm = 'Agricultural / Farm', + CivicInstitutional = 'Civic / Institutional', + CommercialRetail = 'Commercial / Retail', + Industrial = 'Industrial', + Other = 'Other', + Recreational = 'Recreational', + Residential = 'Residential', + TransportationUtilities = 'Transportation / Utilities', + Unused = 'Unused', +} + +@Component({ + selector: 'app-land-use', + templateUrl: './land-use.component.html', + styleUrls: ['./land-use.component.scss'], +}) +export class LandUseComponent extends StepComponent implements OnInit, OnDestroy { + currentStep = EditNoiSteps.LandUse; + + fileId = ''; + submissionUuid = ''; + + MainLandUseTypeOptions = MainLandUseTypeOptions; + + parcelsAgricultureDescription = new FormControl('', [Validators.required]); + parcelsAgricultureImprovementDescription = new FormControl('', [Validators.required]); + parcelsNonAgricultureUseDescription = new FormControl('', [Validators.required]); + northLandUseType = new FormControl('', [Validators.required]); + northLandUseTypeDescription = new FormControl('', [Validators.required]); + eastLandUseType = new FormControl('', [Validators.required]); + eastLandUseTypeDescription = new FormControl('', [Validators.required]); + southLandUseType = new FormControl('', [Validators.required]); + southLandUseTypeDescription = new FormControl('', [Validators.required]); + westLandUseType = new FormControl('', [Validators.required]); + westLandUseTypeDescription = new FormControl('', [Validators.required]); + landUseForm = new FormGroup({ + parcelsAgricultureDescription: this.parcelsAgricultureDescription, + parcelsAgricultureImprovementDescription: this.parcelsAgricultureImprovementDescription, + parcelsNonAgricultureUseDescription: this.parcelsNonAgricultureUseDescription, + northLandUseType: this.northLandUseType, + northLandUseTypeDescription: this.northLandUseTypeDescription, + eastLandUseType: this.eastLandUseType, + eastLandUseTypeDescription: this.eastLandUseTypeDescription, + southLandUseType: this.southLandUseType, + southLandUseTypeDescription: this.southLandUseTypeDescription, + westLandUseType: this.westLandUseType, + westLandUseTypeDescription: this.westLandUseTypeDescription, + }); + + constructor(private router: Router, private noticeOfIntentSubmissionService: NoticeOfIntentSubmissionService) { + super(); + } + + ngOnInit(): void { + this.$noiSubmission.pipe(takeUntil(this.$destroy)).subscribe((noiSubmission) => { + if (noiSubmission) { + this.fileId = noiSubmission.fileNumber; + this.submissionUuid = noiSubmission.uuid; + this.populateFormValues(noiSubmission); + } + }); + + if (this.showErrors) { + this.landUseForm.markAllAsTouched(); + } + } + + populateFormValues(application: NoticeOfIntentSubmissionDetailedDto) { + this.landUseForm.patchValue({ + parcelsAgricultureDescription: application.parcelsAgricultureDescription, + parcelsAgricultureImprovementDescription: application.parcelsAgricultureImprovementDescription, + parcelsNonAgricultureUseDescription: application.parcelsNonAgricultureUseDescription, + northLandUseType: application.northLandUseType, + northLandUseTypeDescription: application.northLandUseTypeDescription, + eastLandUseType: application.eastLandUseType, + eastLandUseTypeDescription: application.eastLandUseTypeDescription, + southLandUseType: application.southLandUseType, + southLandUseTypeDescription: application.southLandUseTypeDescription, + westLandUseType: application.westLandUseType, + westLandUseTypeDescription: application.westLandUseTypeDescription, + }); + } + + async saveProgress() { + if (this.landUseForm.dirty) { + const formValues = this.landUseForm.getRawValue(); + const updatedSubmission = await this.noticeOfIntentSubmissionService.updatePending(this.submissionUuid, { + parcelsAgricultureDescription: formValues.parcelsAgricultureDescription, + parcelsAgricultureImprovementDescription: formValues.parcelsAgricultureImprovementDescription, + parcelsNonAgricultureUseDescription: formValues.parcelsNonAgricultureUseDescription, + northLandUseType: formValues.northLandUseType, + northLandUseTypeDescription: formValues.northLandUseTypeDescription, + eastLandUseType: formValues.eastLandUseType, + eastLandUseTypeDescription: formValues.eastLandUseTypeDescription, + southLandUseType: formValues.southLandUseType, + southLandUseTypeDescription: formValues.southLandUseTypeDescription, + westLandUseType: formValues.westLandUseType, + westLandUseTypeDescription: formValues.westLandUseTypeDescription, + }); + if (updatedSubmission) { + this.$noiSubmission.next(updatedSubmission); + } + } + } + + async onSave() { + await this.saveProgress(); + } +} diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/other-attachments/other-attachments.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/other-attachments/other-attachments.component.html new file mode 100644 index 0000000000..744ad73277 --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/other-attachments/other-attachments.component.html @@ -0,0 +1,107 @@ +

Optional Attachments

+

+ Please upload any optional supporting documents. Where possible, provide KML/KMZ Google Earth files or GIS shapefiles + and geodatabases. +

+

+ NOTE: All documents submitted as part of your notice of intent will be viewable to the public on the ALC website. Do + not include confidential material within your notice of intent. +

+
+

Optional Attachments (Max. 100 MB per attachment)

+
+
+
Type {{ element.type.label }}
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
Type + + + {{ type.label }} + + +
+ warning +
This field is required
+
+ 		Description + + + +
+ warning +
+ This field is required +
+
+ 		File Name + {{ element.fileName }} + Action + +
No attachments
+
+ +
+ +
+ +
+ + +
+ + +
+
diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/other-attachments/other-attachments.component.scss b/portal-frontend/src/app/features/notice-of-intents/edit-submission/other-attachments/other-attachments.component.scss new file mode 100644 index 0000000000..7a223440c8 --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/other-attachments/other-attachments.component.scss @@ -0,0 +1,38 @@ +@use '../../../../../styles/functions' as *; +@use '../../../../../styles/colors'; + +section { + margin-top: rem(32); +} + +.uploader { + margin-top: rem(24); +} + +h4 { + margin-bottom: rem(8) !important; +} + +.scrollable { + overflow-x: auto; +} + +.mat-mdc-table .mdc-data-table__row { + height: rem(75); +} + +.mat-mdc-form-field { + width: 100%; +} + +:host::ng-deep { + .mdc-text-field--invalid { + margin-top: rem(8); + } +} + +.no-data-text { + text-align: center; + color: colors.$grey; + padding-top: rem(12); +} diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/other-attachments/other-attachments.component.spec.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/other-attachments/other-attachments.component.spec.ts new file mode 100644 index 0000000000..6bca59e7d2 --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/other-attachments/other-attachments.component.spec.ts @@ -0,0 +1,68 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { MatDialog } from '@angular/material/dialog'; +import { Router } from '@angular/router'; +import { DeepMocked, createMock } from '@golevelup/ts-jest'; +import { BehaviorSubject } from 'rxjs'; +import { CodeService } from '../../../../services/code/code.service'; +import { NoticeOfIntentDocumentDto } from '../../../../services/notice-of-intent-document/notice-of-intent-document.dto'; +import { NoticeOfIntentDocumentService } from '../../../../services/notice-of-intent-document/notice-of-intent-document.service'; +import { NoticeOfIntentSubmissionDetailedDto } from '../../../../services/notice-of-intent-submission/notice-of-intent-submission.dto'; +import { NoticeOfIntentSubmissionService } from '../../../../services/notice-of-intent-submission/notice-of-intent-submission.service'; + +import { OtherAttachmentsComponent } from './other-attachments.component'; + +describe('OtherAttachmentsComponent', () => { + let component: OtherAttachmentsComponent; + let fixture: ComponentFixture; + let mockAppService: DeepMocked; + let mockAppDocumentService: DeepMocked; + let mockRouter: DeepMocked; + let mockCodeService: DeepMocked; + + let noiDocumentPipe = new BehaviorSubject([]); + + beforeEach(async () => { + mockAppService = createMock(); + mockAppDocumentService = createMock(); + mockRouter = createMock(); + mockCodeService = createMock(); + + await TestBed.configureTestingModule({ + providers: [ + { + provide: NoticeOfIntentSubmissionService, + useValue: mockAppService, + }, + { + provide: NoticeOfIntentDocumentService, + useValue: mockAppDocumentService, + }, + { + provide: Router, + useValue: mockRouter, + }, + { + provide: CodeService, + useValue: mockCodeService, + }, + { + provide: MatDialog, + useValue: {}, + }, + ], + declarations: [OtherAttachmentsComponent], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(OtherAttachmentsComponent); + component = fixture.componentInstance; + component.$noiSubmission = new BehaviorSubject(undefined); + component.$noiDocuments = noiDocumentPipe; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/other-attachments/other-attachments.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/other-attachments/other-attachments.component.ts new file mode 100644 index 0000000000..dd2d8c4c27 --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/other-attachments/other-attachments.component.ts @@ -0,0 +1,121 @@ +import { Component, OnDestroy, OnInit } from '@angular/core'; +import { FormControl, FormGroup, Validators } from '@angular/forms'; +import { MatDialog } from '@angular/material/dialog'; +import { Router } from '@angular/router'; +import { takeUntil } from 'rxjs'; +import { CodeService } from '../../../../services/code/code.service'; +import { + NoticeOfIntentDocumentDto, + NoticeOfIntentDocumentUpdateDto, +} from '../../../../services/notice-of-intent-document/notice-of-intent-document.dto'; +import { NoticeOfIntentDocumentService } from '../../../../services/notice-of-intent-document/notice-of-intent-document.service'; +import { NoticeOfIntentSubmissionService } from '../../../../services/notice-of-intent-submission/notice-of-intent-submission.service'; +import { DOCUMENT_SOURCE, DOCUMENT_TYPE, DocumentTypeDto } from '../../../../shared/dto/document.dto'; +import { EditNoiSteps } from '../edit-submission.component'; +import { FilesStepComponent } from '../files-step.partial'; + +const USER_CONTROLLED_TYPES = [DOCUMENT_TYPE.PHOTOGRAPH, DOCUMENT_TYPE.PROFESSIONAL_REPORT, DOCUMENT_TYPE.OTHER]; + +@Component({ + selector: 'app-other-attachments', + templateUrl: './other-attachments.component.html', + styleUrls: ['./other-attachments.component.scss'], +}) +export class OtherAttachmentsComponent extends FilesStepComponent implements OnInit, OnDestroy { + currentStep = EditNoiSteps.Attachments; + + displayedColumns = ['type', 'description', 'fileName', 'actions']; + selectableTypes: DocumentTypeDto[] = []; + otherFiles: NoticeOfIntentDocumentDto[] = []; + + private isDirty = false; + + form = new FormGroup({} as any); + private documentCodes: DocumentTypeDto[] = []; + + constructor( + private router: Router, + private noticeOfIntentSubmissionService: NoticeOfIntentSubmissionService, + private codeService: CodeService, + noticeOfIntentDocumentService: NoticeOfIntentDocumentService, + dialog: MatDialog + ) { + super(noticeOfIntentDocumentService, dialog); + } + + ngOnInit(): void { + this.$noiSubmission.pipe(takeUntil(this.$destroy)).subscribe((noiSubmission) => { + if (noiSubmission) { + this.fileId = noiSubmission.fileNumber; + } + }); + + this.loadDocumentCodes(); + + this.$noiDocuments.pipe(takeUntil(this.$destroy)).subscribe((documents) => { + this.otherFiles = documents + .filter((file) => (file.type ? USER_CONTROLLED_TYPES.includes(file.type.code) : true)) + .filter((file) => file.source === DOCUMENT_SOURCE.APPLICANT) + .sort((a, b) => { + return a.uploadedAt - b.uploadedAt; + }); + const newForm = new FormGroup({}); + for (const file of this.otherFiles) { + newForm.addControl(`${file.uuid}-type`, new FormControl(file.type?.code, [Validators.required])); + newForm.addControl(`${file.uuid}-description`, new FormControl(file.description, [Validators.required])); + } + this.form = newForm; + if (this.showErrors) { + this.form.markAllAsTouched(); + } + }); + } + + async onSave() { + await this.save(); + } + + protected async save() { + if (this.isDirty) { + const updateDtos: NoticeOfIntentDocumentUpdateDto[] = this.otherFiles.map((file) => ({ + uuid: file.uuid, + description: file.description, + type: file.type?.code ?? null, + })); + await this.noticeOfIntentDocumentService.update(this.fileId, updateDtos); + } + } + + onChangeDescription(uuid: string, event: Event) { + this.isDirty = true; + const input = event.target as HTMLInputElement; + const description = input.value; + this.otherFiles = this.otherFiles.map((file) => { + if (uuid === file.uuid) { + file.description = description; + } + return file; + }); + } + + onChangeType(uuid: string, selectedValue: DOCUMENT_TYPE) { + this.isDirty = true; + this.otherFiles = this.otherFiles.map((file) => { + if (uuid === file.uuid) { + const newType = this.documentCodes.find((code) => code.code === selectedValue); + if (newType) { + file.type = newType; + } else { + console.error('Failed to find matching document type'); + } + } + return file; + }); + } + + private async loadDocumentCodes() { + const codes = await this.codeService.loadCodes(); + this.documentCodes = codes.documentTypes; + this.selectableTypes = this.documentCodes.filter((code) => USER_CONTROLLED_TYPES.includes(code.code)); + } +} diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html new file mode 100644 index 0000000000..66bd3b7777 --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html @@ -0,0 +1,179 @@ +
+

Primary Contact

+

Select from the listed parcel owners or identify a third party agent

+

+ Identify staff from the local or first nation government listed below or a third-party agent to act as the primary + contact. +

+

*All fields are required unless stated optional.

+
+
Documents needed for this step:
+
    +
  • Authorization Letters (if applicable)
    • +
+
+
+
+
+ +
{{ owner.displayName }}
+ +
checkPrimary Contact
+ + +
{{ governmentName ?? 'Local / First Nation Government' }} Staff
+ +
checkPrimary Contact
+ +
Third-Party Agent
+ +
checkPrimary Contact
+
+ + Please select a primary contact + +
+ +
+

Primary Contact Information

+
+
+
+ + + + +
+ warning +
This field is required
+
+
+
+ + + + +
+ warning +
This field is required
+
+
+
+ + + + + + +
+ warning +
This field is required
+
+
+
+ + + + +
+ warning +
This field is required
+
Invalid format
+
+
+
+ + + + +
+ warning +
This field is required
+
Invalid format
+
+
+
+
+
+
+
+

Primary Contact Authorization Letters

+
+ + An authorization letter must be provided if: +
    +
  1. the parcel under notice of intent is owned by more than one person;
    2. +
  2. the parcel(s) is owned by an organization; or
    3. +
  3. the parcel(s) is owned by a corporation (private, Crown, local government, First Nations); or
    4. +
  4. the notice of intent is being submitted by a third-party agent on behalf of the land owner(s)
    5. +
+

+ The authorization letter must be signed by all individual land owners and the majority of directors in + organization land owners listed in Step 1. Please consult the Supporting Documentation page of ALC website for + further instruction and an Authorization Letter template. +

+ + + An authorization letter must be provided only if the notice of intent is being submitted by a third-party agent. Please + consult the Supporting Documentation page of the TODO: FIX THIS: ALC website for further instruction. + +
+
Authorization Letters (if applicable)
+
+ +
+
+
+ + +
+ + +
+
diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.scss b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.scss new file mode 100644 index 0000000000..ba5b4f2a09 --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.scss @@ -0,0 +1,58 @@ +@use '../../../../../styles/functions' as *; +@use '../../../../../styles/colors'; + +h4 { + margin-bottom: rem(24) !important; +} + +h6 { + margin: rem(32) 0 rem(16) !important; +} + +section { + margin-bottom: rem(32); +} + +.agent-form { + .form-row { + grid-template-columns: 1fr; + } + + .form-row .full-row { + grid-column: 1/2; + } + + @media screen and (min-width: $tabletBreakpoint) { + .form-row { + grid-template-columns: 1fr 1fr; + } + + .form-row .full-row { + grid-column: 1/3; + } + } +} + +.contacts { + margin: rem(24) 0; + display: grid; + grid-template-columns: 1fr 1fr; + grid-column-gap: rem(30); + grid-row-gap: rem(24); +} + +.uploader { + margin-bottom: rem(24); +} + +.selected { + color: colors.$primary-color; + text-align: center; + display: flex; + align-items: center; + justify-content: center; + + .mat-icon { + margin-right: rem(8); + } +} diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.spec.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.spec.ts new file mode 100644 index 0000000000..e55c98fd20 --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.spec.ts @@ -0,0 +1,71 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { MatDialog } from '@angular/material/dialog'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { BehaviorSubject } from 'rxjs'; +import { UserDto } from '../../../../services/authentication/authentication.dto'; +import { AuthenticationService } from '../../../../services/authentication/authentication.service'; +import { NoticeOfIntentDocumentDto } from '../../../../services/notice-of-intent-document/notice-of-intent-document.dto'; +import { NoticeOfIntentDocumentService } from '../../../../services/notice-of-intent-document/notice-of-intent-document.service'; +import { NoticeOfIntentOwnerService } from '../../../../services/notice-of-intent-owner/notice-of-intent-owner.service'; +import { NoticeOfIntentSubmissionDetailedDto } from '../../../../services/notice-of-intent-submission/notice-of-intent-submission.dto'; +import { NoticeOfIntentSubmissionService } from '../../../../services/notice-of-intent-submission/notice-of-intent-submission.service'; + +import { PrimaryContactComponent } from './primary-contact.component'; + +describe('PrimaryContactComponent', () => { + let component: PrimaryContactComponent; + let fixture: ComponentFixture; + let mockAppService: DeepMocked; + let mockAppDocumentService: DeepMocked; + let mockAppOwnerService: DeepMocked; + let mockAuthService: DeepMocked; + + let noiDocumentPipe = new BehaviorSubject([]); + + beforeEach(async () => { + mockAppService = createMock(); + mockAppDocumentService = createMock(); + mockAppOwnerService = createMock(); + mockAuthService = createMock(); + + mockAuthService.$currentProfile = new BehaviorSubject(undefined); + + await TestBed.configureTestingModule({ + providers: [ + { + provide: NoticeOfIntentSubmissionService, + useValue: mockAppService, + }, + { + provide: NoticeOfIntentDocumentService, + useValue: mockAppDocumentService, + }, + { + provide: NoticeOfIntentOwnerService, + useValue: mockAppOwnerService, + }, + { + provide: MatDialog, + useValue: {}, + }, + { + provide: AuthenticationService, + useValue: mockAuthService, + }, + ], + declarations: [PrimaryContactComponent], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(PrimaryContactComponent); + component = fixture.componentInstance; + component.$noiSubmission = new BehaviorSubject(undefined); + component.$noiDocuments = noiDocumentPipe; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts new file mode 100644 index 0000000000..b3afb5274e --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts @@ -0,0 +1,256 @@ +import { Component, OnDestroy, OnInit } from '@angular/core'; +import { FormControl, FormGroup, Validators } from '@angular/forms'; +import { MatDialog } from '@angular/material/dialog'; +import { Router } from '@angular/router'; +import { takeUntil } from 'rxjs'; +import { AuthenticationService } from '../../../../services/authentication/authentication.service'; +import { NoticeOfIntentDocumentDto } from '../../../../services/notice-of-intent-document/notice-of-intent-document.dto'; +import { NoticeOfIntentDocumentService } from '../../../../services/notice-of-intent-document/notice-of-intent-document.service'; +import { NoticeOfIntentOwnerDto } from '../../../../services/notice-of-intent-owner/notice-of-intent-owner.dto'; +import { NoticeOfIntentOwnerService } from '../../../../services/notice-of-intent-owner/notice-of-intent-owner.service'; +import { NoticeOfIntentSubmissionService } from '../../../../services/notice-of-intent-submission/notice-of-intent-submission.service'; +import { DOCUMENT_TYPE } from '../../../../shared/dto/document.dto'; +import { OWNER_TYPE } from '../../../../shared/dto/owner.dto'; +import { EditNoiSteps } from '../edit-submission.component'; +import { FilesStepComponent } from '../files-step.partial'; + +@Component({ + selector: 'app-primary-contact', + templateUrl: './primary-contact.component.html', + styleUrls: ['./primary-contact.component.scss'], +}) +export class PrimaryContactComponent extends FilesStepComponent implements OnInit, OnDestroy { + currentStep = EditNoiSteps.PrimaryContact; + + parcelOwners: NoticeOfIntentOwnerDto[] = []; + owners: NoticeOfIntentOwnerDto[] = []; + files: (NoticeOfIntentDocumentDto & { errorMessage?: string })[] = []; + + needsAuthorizationLetter = false; + selectedThirdPartyAgent = false; + selectedLocalGovernment = false; + selectedOwnerUuid: string | undefined = undefined; + isCrownOwner = false; + isGovernmentUser = false; + governmentName: string | undefined; + isDirty = false; + + firstName = new FormControl('', [Validators.required]); + lastName = new FormControl('', [Validators.required]); + organizationName = new FormControl(''); + phoneNumber = new FormControl('', [Validators.required]); + email = new FormControl('', [Validators.required, Validators.email]); + + form = new FormGroup({ + firstName: this.firstName, + lastName: this.lastName, + organizationName: this.organizationName, + phoneNumber: this.phoneNumber, + email: this.email, + }); + + private submissionUuid = ''; + + constructor( + private router: Router, + private noticeOfIntentSubmissionService: NoticeOfIntentSubmissionService, + noticeOfIntentDocumentService: NoticeOfIntentDocumentService, + private noticeOfIntentOwnerService: NoticeOfIntentOwnerService, + private authenticationService: AuthenticationService, + dialog: MatDialog + ) { + super(noticeOfIntentDocumentService, dialog); + } + + ngOnInit(): void { + this.$noiSubmission.pipe(takeUntil(this.$destroy)).subscribe((submission) => { + if (submission) { + this.fileId = submission.fileNumber; + this.submissionUuid = submission.uuid; + this.loadOwners(submission.uuid, submission.primaryContactOwnerUuid); + } + }); + + this.authenticationService.$currentProfile.pipe(takeUntil(this.$destroy)).subscribe((profile) => { + this.isGovernmentUser = !!profile?.isLocalGovernment || !!profile?.isFirstNationGovernment; + this.governmentName = profile?.government; + if (this.isGovernmentUser || this.selectedLocalGovernment) { + this.prepareGovernmentOwners(); + } + }); + + this.$noiDocuments.pipe(takeUntil(this.$destroy)).subscribe((documents) => { + this.files = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.AUTHORIZATION_LETTER); + }); + } + + async onSave() { + await this.save(); + } + + onSelectAgent() { + this.onSelectOwner('agent'); + } + + onSelectGovernment() { + this.onSelectOwner('government'); + } + + onSelectOwner(uuid: string) { + this.isDirty = true; + this.selectedOwnerUuid = uuid; + const selectedOwner = this.parcelOwners.find((owner) => owner.uuid === uuid); + this.parcelOwners = this.parcelOwners.map((owner) => ({ + ...owner, + isSelected: owner.uuid === uuid, + })); + this.selectedThirdPartyAgent = (selectedOwner && selectedOwner.type.code === OWNER_TYPE.AGENT) || uuid == 'agent'; + this.selectedLocalGovernment = + (selectedOwner && selectedOwner.type.code === OWNER_TYPE.GOVERNMENT) || uuid == 'government'; + this.form.reset(); + + if (this.selectedLocalGovernment) { + this.organizationName.setValidators([Validators.required]); + } else { + this.organizationName.setValidators([]); + } + + if (this.selectedThirdPartyAgent || this.selectedLocalGovernment) { + this.firstName.enable(); + this.lastName.enable(); + this.organizationName.enable(); + this.email.enable(); + this.phoneNumber.enable(); + this.isCrownOwner = false; + } else { + this.firstName.disable(); + this.lastName.disable(); + this.organizationName.disable(); + this.email.disable(); + this.phoneNumber.disable(); + + if (selectedOwner) { + this.form.patchValue({ + firstName: selectedOwner.firstName, + lastName: selectedOwner.lastName, + organizationName: selectedOwner.organizationName, + phoneNumber: selectedOwner.phoneNumber, + email: selectedOwner.email, + }); + this.isCrownOwner = selectedOwner.type.code === OWNER_TYPE.CROWN; + } + } + this.calculateLetterRequired(); + } + + private calculateLetterRequired() { + if (this.selectedLocalGovernment) { + this.needsAuthorizationLetter = false; + } else { + const isSelfApplicant = this.owners.length > 0 && this.owners[0].type.code === OWNER_TYPE.INDIVIDUAL; + this.needsAuthorizationLetter = + this.selectedThirdPartyAgent || + !( + isSelfApplicant && + (this.owners.length === 1 || + (this.owners.length === 2 && + this.owners[1].type.code === OWNER_TYPE.AGENT && + !this.selectedThirdPartyAgent)) + ); + } + + this.files = this.files.map((file) => ({ + ...file, + errorMessage: !this.needsAuthorizationLetter + ? 'Authorization Letter not required. Please remove this file.' + : undefined, + })); + } + + protected async save() { + if (this.isDirty || this.form.dirty) { + let selectedOwner: NoticeOfIntentOwnerDto | undefined = this.owners.find( + (owner) => owner.uuid === this.selectedOwnerUuid + ); + + if (this.selectedThirdPartyAgent || this.selectedLocalGovernment) { + await this.noticeOfIntentOwnerService.setPrimaryContact({ + noticeOfIntentSubmissionUuid: this.submissionUuid, + organization: this.organizationName.getRawValue() ?? '', + firstName: this.firstName.getRawValue() ?? '', + lastName: this.lastName.getRawValue() ?? '', + email: this.email.getRawValue() ?? '', + phoneNumber: this.phoneNumber.getRawValue() ?? '', + ownerUuid: selectedOwner?.uuid, + type: this.selectedThirdPartyAgent ? OWNER_TYPE.AGENT : OWNER_TYPE.GOVERNMENT, + }); + } else if (selectedOwner) { + await this.noticeOfIntentOwnerService.setPrimaryContact({ + noticeOfIntentSubmissionUuid: this.submissionUuid, + ownerUuid: selectedOwner.uuid, + }); + } + await this.reloadSubmission(); + } + } + + private async reloadSubmission() { + const noiSubmission = await this.noticeOfIntentSubmissionService.getByUuid(this.submissionUuid); + this.$noiSubmission.next(noiSubmission); + } + + private async loadOwners(submissionUuid: string, primaryContactOwnerUuid?: string | null) { + const owners = await this.noticeOfIntentOwnerService.fetchBySubmissionId(submissionUuid); + if (owners) { + const selectedOwner = owners.find((owner) => owner.uuid === primaryContactOwnerUuid); + this.parcelOwners = owners.filter( + (owner) => ![OWNER_TYPE.AGENT, OWNER_TYPE.GOVERNMENT].includes(owner.type.code) + ); + this.owners = owners; + + if (selectedOwner) { + this.selectedThirdPartyAgent = selectedOwner.type.code === OWNER_TYPE.AGENT; + this.selectedLocalGovernment = selectedOwner.type.code === OWNER_TYPE.GOVERNMENT; + } + + if (this.selectedLocalGovernment) { + this.organizationName.setValidators([Validators.required]); + } else { + this.organizationName.setValidators([]); + } + + if (selectedOwner && (this.selectedThirdPartyAgent || this.selectedLocalGovernment)) { + this.selectedOwnerUuid = selectedOwner.uuid; + this.form.patchValue({ + firstName: selectedOwner.firstName, + lastName: selectedOwner.lastName, + organizationName: selectedOwner.organizationName, + phoneNumber: selectedOwner.phoneNumber, + email: selectedOwner.email, + }); + } else if (selectedOwner) { + this.onSelectOwner(selectedOwner.uuid); + } else { + this.firstName.disable(); + this.lastName.disable(); + this.organizationName.disable(); + this.email.disable(); + this.phoneNumber.disable(); + } + + if (this.isGovernmentUser || this.selectedLocalGovernment) { + this.prepareGovernmentOwners(); + } + + if (this.showErrors) { + this.form.markAllAsTouched(); + } + this.isDirty = false; + this.calculateLetterRequired(); + } + } + + private prepareGovernmentOwners() { + this.parcelOwners = []; + } +} diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/select-government/select-government.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/select-government/select-government.component.html new file mode 100644 index 0000000000..33dcb4ec8d --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/select-government/select-government.component.html @@ -0,0 +1,68 @@ +
+

Government

+

+ Please indicate the local government in which the parcel(s) under the notice of intent are located. If the property + is located within the Islands Trust, please select 'Islands Trust' and not a specific island. +

+

*All fields are required unless stated optional.

+
+
+
+
+ + + + + + {{ option.name }} + + + +
+ warning +
This field is required
+
+
+
+
+ + This Local/First Nation Government has not yet been set up with the ALC Portal to receive notice of intents. To + submit, you will need to contact the ALC directly:  ALC.Portal@gov.bc.ca / 236-468-3342 + + + 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. + +

+ Please Note: If your Local or First Nation Government is not listed, please contact the ALC directly. + ALC.Portal@gov.bc.ca / 236-468-3342 +

+
+ + +
+ + +
+
diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/select-government/select-government.component.scss b/portal-frontend/src/app/features/notice-of-intents/edit-submission/select-government/select-government.component.scss new file mode 100644 index 0000000000..e69de29bb2 diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/select-government/select-government.component.spec.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/select-government/select-government.component.spec.ts new file mode 100644 index 0000000000..e2b7139ef2 --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/select-government/select-government.component.spec.ts @@ -0,0 +1,43 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { MatAutocomplete } from '@angular/material/autocomplete'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { BehaviorSubject } from 'rxjs'; +import { CodeService } from '../../../../services/code/code.service'; +import { NoticeOfIntentSubmissionDetailedDto } from '../../../../services/notice-of-intent-submission/notice-of-intent-submission.dto'; +import { NoticeOfIntentSubmissionService } from '../../../../services/notice-of-intent-submission/notice-of-intent-submission.service'; + +import { SelectGovernmentComponent } from './select-government.component'; + +describe('SelectGovernmentComponent', () => { + let component: SelectGovernmentComponent; + let fixture: ComponentFixture; + let mockCodeService: DeepMocked; + let mockAppService: DeepMocked; + + beforeEach(async () => { + mockCodeService = createMock(); + mockAppService = createMock(); + + await TestBed.configureTestingModule({ + declarations: [SelectGovernmentComponent, MatAutocomplete], + providers: [ + { + provide: CodeService, + useValue: mockCodeService, + }, + { provide: NoticeOfIntentSubmissionService, useValue: mockAppService }, + ], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(SelectGovernmentComponent); + component = fixture.componentInstance; + component.$noiSubmission = new BehaviorSubject(undefined); + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/select-government/select-government.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/select-government/select-government.component.ts new file mode 100644 index 0000000000..8188a55e2f --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/select-government/select-government.component.ts @@ -0,0 +1,147 @@ +import { Component, OnDestroy, OnInit } from '@angular/core'; +import { FormControl, FormGroup, Validators } from '@angular/forms'; +import { MatAutocompleteSelectedEvent } from '@angular/material/autocomplete'; +import { map, Observable, startWith, takeUntil } from 'rxjs'; +import { LocalGovernmentDto } from '../../../../services/code/code.dto'; +import { CodeService } from '../../../../services/code/code.service'; +import { NoticeOfIntentSubmissionService } from '../../../../services/notice-of-intent-submission/notice-of-intent-submission.service'; +import { EditNoiSteps } from '../edit-submission.component'; +import { StepComponent } from '../step.partial'; + +@Component({ + selector: 'app-select-government', + templateUrl: './select-government.component.html', + styleUrls: ['./select-government.component.scss'], +}) +export class SelectGovernmentComponent extends StepComponent implements OnInit, OnDestroy { + currentStep = EditNoiSteps.Government; + + private fileId = ''; + private submissionUuid = ''; + + localGovernment = new FormControl('', [Validators.required]); + showWarning = false; + selectedOwnGovernment = false; + selectGovernmentUuid = ''; + localGovernments: LocalGovernmentDto[] = []; + filteredLocalGovernments!: Observable; + isDirty = false; + + form = new FormGroup({ + localGovernment: this.localGovernment, + }); + + constructor( + private codeService: CodeService, + private noticeOfIntentSubmissionService: NoticeOfIntentSubmissionService + ) { + super(); + } + + ngOnInit(): void { + this.loadGovernments(); + + this.$noiSubmission.pipe(takeUntil(this.$destroy)).subscribe((noiSubmission) => { + if (noiSubmission) { + this.selectGovernmentUuid = noiSubmission.localGovernmentUuid; + this.fileId = noiSubmission.fileNumber; + this.submissionUuid = noiSubmission.uuid; + this.populateLocalGovernment(noiSubmission.localGovernmentUuid); + } + }); + + this.filteredLocalGovernments = this.localGovernment.valueChanges.pipe( + startWith(''), + map((value) => this.filter(value || '')) + ); + + if (this.showErrors) { + this.form.markAllAsTouched(); + } + } + + onChange($event: MatAutocompleteSelectedEvent) { + this.isDirty = true; + const localGovernmentName = $event.option.value; + if (localGovernmentName) { + const localGovernment = this.localGovernments.find((lg) => lg.name == localGovernmentName); + if (localGovernment) { + this.showWarning = !localGovernment.hasGuid; + + this.localGovernment.setValue(localGovernment.name); + if (localGovernment.hasGuid) { + this.localGovernment.setErrors(null); + } else { + this.localGovernment.setErrors({ invalid: localGovernment.hasGuid }); + } + + this.selectedOwnGovernment = localGovernment.matchesUserGuid; + } + } + } + + onBlur() { + //Blur will fire before onChange above, so use setTimeout to delay it + setTimeout(() => { + const localGovernmentName = this.localGovernment.getRawValue(); + if (localGovernmentName) { + const localGovernment = this.localGovernments.find((lg) => lg.name == localGovernmentName); + if (!localGovernment) { + this.localGovernment.setValue(null); + console.log('Clearing Local Government field'); + } + } + }, 500); + } + + async onSave() { + await this.save(); + } + + private async save() { + if (this.isDirty) { + const localGovernmentName = this.localGovernment.getRawValue(); + if (localGovernmentName) { + const localGovernment = this.localGovernments.find((lg) => lg.name == localGovernmentName); + + if (localGovernment) { + const res = await this.noticeOfIntentSubmissionService.updatePending(this.submissionUuid, { + localGovernmentUuid: localGovernment.uuid, + }); + this.$noiSubmission.next(res); + } + } + this.isDirty = false; + } + } + + private filter(value: string): LocalGovernmentDto[] { + if (this.localGovernments) { + const filterValue = value.toLowerCase(); + return this.localGovernments.filter((localGovernment) => + localGovernment.name.toLowerCase().includes(filterValue) + ); + } + return []; + } + + private async loadGovernments() { + const codes = await this.codeService.loadCodes(); + this.localGovernments = codes.localGovernments.sort((a, b) => (a.name > b.name ? 1 : -1)); + if (this.selectGovernmentUuid) { + this.populateLocalGovernment(this.selectGovernmentUuid); + } + } + + private populateLocalGovernment(governmentUuid: string) { + const lg = this.localGovernments.find((lg) => lg.uuid === governmentUuid); + if (lg) { + this.localGovernment.patchValue(lg.name); + this.showWarning = !lg.hasGuid; + if (!lg.hasGuid) { + this.localGovernment.setErrors({ invalid: true }); + } + this.selectedOwnGovernment = lg.matchesUserGuid; + } + } +} diff --git a/portal-frontend/src/app/services/notice-of-intent-submission/notice-of-intent-submission.dto.ts b/portal-frontend/src/app/services/notice-of-intent-submission/notice-of-intent-submission.dto.ts index 242403d17c..49ec815506 100644 --- a/portal-frontend/src/app/services/notice-of-intent-submission/notice-of-intent-submission.dto.ts +++ b/portal-frontend/src/app/services/notice-of-intent-submission/notice-of-intent-submission.dto.ts @@ -51,23 +51,23 @@ export interface NoticeOfIntentSubmissionDetailedDto extends NoticeOfIntentSubmi southLandUseTypeDescription: string; westLandUseType: string; westLandUseTypeDescription: string; - primaryContactOwnerUuid?: string | null; + primaryContactOwnerUuid: string | null; } export interface NoticeOfIntentSubmissionUpdateDto { - applicant?: string; - purpose?: string; - localGovernmentUuid?: string; - typeCode?: string; - parcelsAgricultureDescription?: string; - parcelsAgricultureImprovementDescription?: string; - parcelsNonAgricultureUseDescription?: string; - northLandUseType?: string; - northLandUseTypeDescription?: string; - eastLandUseType?: string; - eastLandUseTypeDescription?: string; - southLandUseType?: string; - southLandUseTypeDescription?: string; - westLandUseType?: string; - westLandUseTypeDescription?: string; + applicant?: string | null; + purpose?: string | null; + localGovernmentUuid?: string | null; + typeCode?: string | null; + parcelsAgricultureDescription?: string | null; + parcelsAgricultureImprovementDescription?: string | null; + parcelsNonAgricultureUseDescription?: string | null; + northLandUseType?: string | null; + northLandUseTypeDescription?: string | null; + eastLandUseType?: string | null; + eastLandUseTypeDescription?: string | null; + southLandUseType?: string | null; + southLandUseTypeDescription?: string | null; + westLandUseType?: string | null; + westLandUseTypeDescription?: string | null; } diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts index dc5a46ed87..233549c30a 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts @@ -22,6 +22,8 @@ import { ROLES_ALLOWED_APPLICATIONS } from '../../common/authorization/roles'; import { FileNumberService } from '../../file-number/file-number.service'; import { User } from '../../user/user.entity'; import { filterUndefined } from '../../utils/undefined'; +import { ApplicationSubmissionUpdateDto } from '../application-submission/application-submission.dto'; +import { ApplicationSubmission } from '../application-submission/application-submission.entity'; import { NoticeOfIntentSubmissionDetailedDto, NoticeOfIntentSubmissionDto, @@ -128,6 +130,8 @@ export class NoticeOfIntentSubmissionService { noticeOfIntentSubmission.localGovernmentUuid = updateDto.localGovernmentUuid; + this.setLandUseFields(noticeOfIntentSubmission, updateDto); + await this.noticeOfIntentSubmissionRepository.save( noticeOfIntentSubmission, ); @@ -144,6 +148,32 @@ export class NoticeOfIntentSubmissionService { return this.getOrFailByUuid(submissionUuid, this.DEFAULT_RELATIONS); } + private setLandUseFields( + noticeOfIntentSubmission: NoticeOfIntentSubmission, + updateDto: NoticeOfIntentSubmissionUpdateDto, + ) { + noticeOfIntentSubmission.parcelsAgricultureDescription = + updateDto.parcelsAgricultureDescription; + noticeOfIntentSubmission.parcelsAgricultureImprovementDescription = + updateDto.parcelsAgricultureImprovementDescription; + noticeOfIntentSubmission.parcelsNonAgricultureUseDescription = + updateDto.parcelsNonAgricultureUseDescription; + noticeOfIntentSubmission.northLandUseType = updateDto.northLandUseType; + noticeOfIntentSubmission.northLandUseTypeDescription = + updateDto.northLandUseTypeDescription; + noticeOfIntentSubmission.eastLandUseType = updateDto.eastLandUseType; + noticeOfIntentSubmission.eastLandUseTypeDescription = + updateDto.eastLandUseTypeDescription; + noticeOfIntentSubmission.southLandUseType = updateDto.southLandUseType; + noticeOfIntentSubmission.southLandUseTypeDescription = + updateDto.southLandUseTypeDescription; + noticeOfIntentSubmission.westLandUseType = updateDto.westLandUseType; + noticeOfIntentSubmission.westLandUseTypeDescription = + updateDto.westLandUseTypeDescription; + + return noticeOfIntentSubmission; + } + //TODO: Uncomment when adding submitting // async submitToAlcs( // application: ValidatedApplicationSubmission, @@ -415,7 +445,11 @@ export class NoticeOfIntentSubmissionService { }); } - async setPrimaryContact(submissionUuid: string, uuid: any) { - //TODO:? ?? + async setPrimaryContact(submissionUuid: string, primaryContactUuid: any) { + const noticeOfIntentSubmission = await this.getOrFailByUuid(submissionUuid); + noticeOfIntentSubmission.primaryContactOwnerUuid = primaryContactUuid; + await this.noticeOfIntentSubmissionRepository.save( + noticeOfIntentSubmission, + ); } } From 7808242758208b4c90f8ca6d72ab84b3215343fe Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Fri, 11 Aug 2023 15:51:16 -0700 Subject: [PATCH 233/954] ROSO Proposal for NOIs * Add new DB fields for all types * Add ROSO Proposal Component for NOI Submissions * Move soil table to shared module --- .../edit-submission-base.module.ts | 3 - .../naru-proposal/naru-proposal.component.ts | 2 +- .../nfu-proposal/nfu-proposal.component.ts | 2 +- .../pfrs-proposal/pfrs-proposal.component.ts | 2 +- .../pofo-proposal/pofo-proposal.component.ts | 2 +- .../roso-proposal/roso-proposal.component.ts | 2 +- .../edit-submission-base.module.ts | 25 +- .../edit-submission.component.html | 25 +- .../edit-submission.component.ts | 9 +- .../roso/roso-proposal.component.html | 332 ++++++++++++++++++ .../roso/roso-proposal.component.scss | 5 + .../roso/roso-proposal.component.spec.ts | 61 ++++ .../proposal/roso/roso-proposal.component.ts | 180 ++++++++++ .../notice-of-intent-submission.dto.ts | 57 +++ .../src/app/shared/shared.module.ts | 3 + .../soil-table/soil-table.component.html | 0 .../soil-table/soil-table.component.scss | 2 +- .../soil-table/soil-table.component.spec.ts | 0 .../soil-table/soil-table.component.ts | 0 .../notice-of-intent-submission.dto.ts | 193 +++++++++- .../notice-of-intent-submission.entity.ts | 208 +++++++++++ .../notice-of-intent-submission.service.ts | 129 ++++++- ...845-add_soil_fields_for_noi_submissions.ts | 169 +++++++++ 23 files changed, 1380 insertions(+), 31 deletions(-) create mode 100644 portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.html create mode 100644 portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.scss create mode 100644 portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.spec.ts create mode 100644 portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.ts rename portal-frontend/src/app/{features/applications/edit-submission/proposal => shared}/soil-table/soil-table.component.html (100%) rename portal-frontend/src/app/{features/applications/edit-submission/proposal => shared}/soil-table/soil-table.component.scss (95%) rename portal-frontend/src/app/{features/applications/edit-submission/proposal => shared}/soil-table/soil-table.component.spec.ts (100%) rename portal-frontend/src/app/{features/applications/edit-submission/proposal => shared}/soil-table/soil-table.component.ts (100%) create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1691792941845-add_soil_fields_for_noi_submissions.ts diff --git a/portal-frontend/src/app/features/applications/edit-submission/edit-submission-base.module.ts b/portal-frontend/src/app/features/applications/edit-submission/edit-submission-base.module.ts index ad2d84a82b..d55740124f 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/edit-submission-base.module.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/edit-submission-base.module.ts @@ -28,7 +28,6 @@ import { NfuProposalComponent } from './proposal/nfu-proposal/nfu-proposal.compo import { PfrsProposalComponent } from './proposal/pfrs-proposal/pfrs-proposal.component'; import { PofoProposalComponent } from './proposal/pofo-proposal/pofo-proposal.component'; import { RosoProposalComponent } from './proposal/roso-proposal/roso-proposal.component'; -import { SoilTableComponent } from './proposal/soil-table/soil-table.component'; import { SubdProposalComponent } from './proposal/subd-proposal/subd-proposal.component'; import { TurProposalComponent } from './proposal/tur-proposal/tur-proposal.component'; import { ReviewAndSubmitComponent } from './review-and-submit/review-and-submit.component'; @@ -59,7 +58,6 @@ import { SelectGovernmentComponent } from './select-government/select-government PfrsProposalComponent, NaruProposalComponent, ChangeSubtypeConfirmationDialogComponent, - SoilTableComponent, ExclProposalComponent, InclProposalComponent, ], @@ -97,7 +95,6 @@ import { SelectGovernmentComponent } from './select-government/select-government PofoProposalComponent, PfrsProposalComponent, NaruProposalComponent, - SoilTableComponent, ExclProposalComponent, InclProposalComponent, ], diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.ts index 7c9c17c3a4..a24d2e6eb1 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.ts @@ -16,7 +16,7 @@ import { DOCUMENT_TYPE } from '../../../../../shared/dto/document.dto'; import { formatBooleanToYesNoString } from '../../../../../shared/utils/boolean-helper'; import { EditApplicationSteps } from '../../edit-submission.component'; import { FilesStepComponent } from '../../files-step.partial'; -import { SoilTableData } from '../soil-table/soil-table.component'; +import { SoilTableData } from '../../../../../shared/soil-table/soil-table.component'; import { ChangeSubtypeConfirmationDialogComponent } from './change-subtype-confirmation-dialog/change-subtype-confirmation-dialog.component'; @Component({ diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/nfu-proposal/nfu-proposal.component.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/nfu-proposal/nfu-proposal.component.ts index ccb753d4c9..a366031721 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/nfu-proposal/nfu-proposal.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/nfu-proposal/nfu-proposal.component.ts @@ -7,7 +7,7 @@ import { ApplicationSubmissionService } from '../../../../../services/applicatio import { parseStringToBoolean } from '../../../../../shared/utils/string-helper'; import { EditApplicationSteps } from '../../edit-submission.component'; import { StepComponent } from '../../step.partial'; -import { SoilTableData } from '../soil-table/soil-table.component'; +import { SoilTableData } from '../../../../../shared/soil-table/soil-table.component'; @Component({ selector: 'app-nfu-proposal', diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.ts index f657a6f1aa..2b0e865f2c 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.ts @@ -13,7 +13,7 @@ import { MOBILE_BREAKPOINT } from '../../../../../shared/utils/breakpoints'; import { parseStringToBoolean } from '../../../../../shared/utils/string-helper'; import { EditApplicationSteps } from '../../edit-submission.component'; import { FilesStepComponent } from '../../files-step.partial'; -import { SoilTableData } from '../soil-table/soil-table.component'; +import { SoilTableData } from '../../../../../shared/soil-table/soil-table.component'; @Component({ selector: 'app-pfrs-proposal', diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.ts index 6f06250f2c..2548b6d2b2 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.ts @@ -12,7 +12,7 @@ import { formatBooleanToString } from '../../../../../shared/utils/boolean-helpe import { parseStringToBoolean } from '../../../../../shared/utils/string-helper'; import { EditApplicationSteps } from '../../edit-submission.component'; import { FilesStepComponent } from '../../files-step.partial'; -import { SoilTableData } from '../soil-table/soil-table.component'; +import { SoilTableData } from '../../../../../shared/soil-table/soil-table.component'; @Component({ selector: 'app-pofo-proposal', diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.ts index 3528028be2..4860d4b274 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.ts @@ -12,7 +12,7 @@ import { formatBooleanToString } from '../../../../../shared/utils/boolean-helpe import { parseStringToBoolean } from '../../../../../shared/utils/string-helper'; import { EditApplicationSteps } from '../../edit-submission.component'; import { FilesStepComponent } from '../../files-step.partial'; -import { SoilTableData } from '../soil-table/soil-table.component'; +import { SoilTableData } from '../../../../../shared/soil-table/soil-table.component'; @Component({ selector: 'app-roso-proposal', diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission-base.module.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission-base.module.ts index 63cf738713..224d720b0d 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission-base.module.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission-base.module.ts @@ -16,20 +16,10 @@ import { ParcelDetailsComponent } from './parcels/parcel-details.component'; import { ParcelEntryConfirmationDialogComponent } from './parcels/parcel-entry/parcel-entry-confirmation-dialog/parcel-entry-confirmation-dialog.component'; import { ParcelEntryComponent } from './parcels/parcel-entry/parcel-entry.component'; import { PrimaryContactComponent } from './primary-contact/primary-contact.component'; +import { RosoProposalComponent } from './proposal/roso/roso-proposal.component'; import { SelectGovernmentComponent } from './select-government/select-government.component'; @NgModule({ - declarations: [ - EditSubmissionComponent, - ParcelDetailsComponent, - ParcelEntryComponent, - ParcelEntryConfirmationDialogComponent, - DeleteParcelDialogComponent, - PrimaryContactComponent, - SelectGovernmentComponent, - LandUseComponent, - OtherAttachmentsComponent, - ], imports: [ CommonModule, SharedModule, @@ -42,6 +32,18 @@ import { SelectGovernmentComponent } from './select-government/select-government MatSelectModule, MatTableModule, ], + declarations: [ + EditSubmissionComponent, + ParcelDetailsComponent, + ParcelEntryComponent, + ParcelEntryConfirmationDialogComponent, + DeleteParcelDialogComponent, + PrimaryContactComponent, + SelectGovernmentComponent, + LandUseComponent, + OtherAttachmentsComponent, + RosoProposalComponent, + ], exports: [ EditSubmissionComponent, ParcelDetailsComponent, @@ -52,6 +54,7 @@ import { SelectGovernmentComponent } from './select-government/select-government SelectGovernmentComponent, LandUseComponent, OtherAttachmentsComponent, + RosoProposalComponent, ], }) export class EditSubmissionBaseModule {} diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.html index ddae45362f..f608c3e8be 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.html @@ -27,7 +27,7 @@
Notice of Intent ID: {{ noiSubmission.fileNumber }} | class="edit-application" #cdkStepper (selectionChange)="onStepChange($event)" - (beforeSwitchStep)="onBeforeSwitchStep($event)" + (beforeSwitchStep)="switchStep($event)" > @@ -35,7 +35,7 @@
Notice of Intent ID: {{ noiSubmission.fileNumber }} | @@ -48,7 +48,7 @@
Notice of Intent ID: {{ noiSubmission.fileNumber }} | [showErrors]="showValidationErrors" [$noiSubmission]="$noiSubmission" [$noiDocuments]="$noiDocuments" - (navigateToStep)="onBeforeSwitchStep($event)" + (navigateToStep)="switchStep($event)" (exit)="onExit()" > @@ -59,7 +59,7 @@
Notice of Intent ID: {{ noiSubmission.fileNumber }} | @@ -70,14 +70,25 @@
Notice of Intent ID: {{ noiSubmission.fileNumber }} | -
Proposal
+
+ + +
@@ -90,7 +101,7 @@
Notice of Intent ID: {{ noiSubmission.fileNumber }} | [$noiSubmission]="$noiSubmission" [$noiDocuments]="$noiDocuments" [showErrors]="showValidationErrors" - (navigateToStep)="onBeforeSwitchStep($event)" + (navigateToStep)="switchStep($event)" (exit)="onExit()" > diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.ts index 38969bd7de..a0cd07b3d8 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.ts @@ -15,6 +15,7 @@ import { LandUseComponent } from './land-use/land-use.component'; import { OtherAttachmentsComponent } from './other-attachments/other-attachments.component'; import { ParcelDetailsComponent } from './parcels/parcel-details.component'; import { PrimaryContactComponent } from './primary-contact/primary-contact.component'; +import { RosoProposalComponent } from './proposal/roso/roso-proposal.component'; import { SelectGovernmentComponent } from './select-government/select-government.component'; export enum EditNoiSteps { @@ -52,6 +53,7 @@ export class EditSubmissionComponent implements OnDestroy, AfterViewInit { @ViewChild(SelectGovernmentComponent) selectGovernmentComponent!: SelectGovernmentComponent; @ViewChild(LandUseComponent) landUseComponent!: LandUseComponent; @ViewChild(OtherAttachmentsComponent) otherAttachmentsComponent!: OtherAttachmentsComponent; + @ViewChild(RosoProposalComponent) rosoProposalComponent!: RosoProposalComponent; constructor( private noticeOfIntentSubmissionService: NoticeOfIntentSubmissionService, @@ -119,7 +121,7 @@ export class EditSubmissionComponent implements OnDestroy, AfterViewInit { scrollToElement({ id: `stepWrapper_${$event.selectedIndex}`, center: false }); } - async onBeforeSwitchStep(index: number) { + async switchStep(index: number) { // navigation to url will cause step change based on the index (index starts from 0) // The save will be triggered using canDeactivate guard this.showValidationErrors = this.customStepper.selectedIndex === EditNoiSteps.ReviewAndSubmit; @@ -143,6 +145,11 @@ export class EditSubmissionComponent implements OnDestroy, AfterViewInit { case EditNoiSteps.Attachments: await this.otherAttachmentsComponent.onSave(); break; + case EditNoiSteps.Proposal: + if (this.rosoProposalComponent) { + await this.rosoProposalComponent.onSave(); + } + break; default: this.toastService.showErrorToast('Error updating notice of intent.'); } diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.html new file mode 100644 index 0000000000..00e3d6ec48 --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.html @@ -0,0 +1,332 @@ +
+

Proposal

+

+ Considerations are subject to + FIXME: Section 6 of the ALC Act. +

+

All fields are required unless stated optional.

+
+ + In order to complete this step, please consult the following pages on the ALC website: + + +
+
+
+ +
If yes, provide the ALC Application or Notice of Intent ID in the field below
+
+ + Yes + + No + + +
+
+
+ +
If you have multiple IDs, please separate with a comma.
+ + + + +
+ warning +
This field is required
+
+
+
+ +
+ Include why you are applying for removal of soil, what the proposal will achieve, and any benefits to + agriculture that the proposal provides. +
+ + + +
+ warning +
This field is required
+
+
Characters left: {{ 4000 - purposeText.textLength }}
+
+
+ +
List all proposed soil types to be removed.
+ + + +
+ warning +
This field is required
+
+ Example: Aggregate, Extraction, Placer Mining, Peat Extraction, Soil etc. +
Characters left: {{ 4000 - soilTypeRemovedText.textLength }}
+
+
+ +
+ Please provide accurate numbers that align with your cross sections, reclamation plan, and site plan. The + Commission will consider your proposal dimensions when determining the potential impact it will have on the + agricultural capability of the land. +
+ Please refer to FIXME: Contact Us on the ALC website for more detail. + +
+
+ +
If no proposed soil has already been removed, please leave 0 in the fields below
+ +
+ +
+

Project Duration

+
Estimated duration of the project
+
+
+ + + + Days + Months + Years + + +
+ warning +
This field is required
+
+
+
+ + + + +
+ warning +
This field is required
+
+
+
+
+ +
+ +
A visual representation of your proposal.
+ +
+ +
+ +
+ + Yes + + No + + +
+
+ +
+ +
Include North-South and East-West cross sections
+ + Please refer to FIXME: Removal of Soil on the ALC website for more information + + +
+
+ +
+ The Reclamation Plan should be completed by a qualified Professional Agrologist and contain the area's + agricultural capability assessment. +
+ + Please refer to FIXME: Removal of Soil on the ALC website for more information + + +
+ +
+ +
If yes, please attach the Notice of Work in the section below.
+
+ + Yes + + No + + +
+
+ +
+ + + Please refer to FIXME: Removal of Soil on the ALC website for more information + + +
+
+
+
+ + +
+ + +
+
diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.scss b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.scss new file mode 100644 index 0000000000..56caa68a82 --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.scss @@ -0,0 +1,5 @@ +@use '../../../../../../styles/functions' as *; + +section { + margin-top: rem(36); +} diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.spec.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.spec.ts new file mode 100644 index 0000000000..26d01c861e --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.spec.ts @@ -0,0 +1,61 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { MatDialog } from '@angular/material/dialog'; +import { Router } from '@angular/router'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { BehaviorSubject } from 'rxjs'; +import { NoticeOfIntentDocumentDto } from '../../../../../services/notice-of-intent-document/notice-of-intent-document.dto'; +import { NoticeOfIntentDocumentService } from '../../../../../services/notice-of-intent-document/notice-of-intent-document.service'; +import { NoticeOfIntentSubmissionDetailedDto } from '../../../../../services/notice-of-intent-submission/notice-of-intent-submission.dto'; +import { NoticeOfIntentSubmissionService } from '../../../../../services/notice-of-intent-submission/notice-of-intent-submission.service'; + +import { RosoProposalComponent } from './roso-proposal.component'; + +describe('RosoProposalComponent', () => { + let component: RosoProposalComponent; + let fixture: ComponentFixture; + let mockNOISubmissionService: DeepMocked; + let mockNOIDocumentService: DeepMocked; + let mockRouter: DeepMocked; + + let noiDocumentPipe = new BehaviorSubject([]); + + beforeEach(async () => { + mockNOISubmissionService = createMock(); + mockRouter = createMock(); + mockNOIDocumentService = createMock(); + + await TestBed.configureTestingModule({ + providers: [ + { + provide: NoticeOfIntentSubmissionService, + useValue: mockNOISubmissionService, + }, + { + provide: Router, + useValue: mockRouter, + }, + { + provide: NoticeOfIntentDocumentService, + useValue: mockNOIDocumentService, + }, + { + provide: MatDialog, + useValue: {}, + }, + ], + declarations: [RosoProposalComponent], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(RosoProposalComponent); + component = fixture.componentInstance; + component.$noiSubmission = new BehaviorSubject(undefined); + component.$noiDocuments = noiDocumentPipe; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.ts new file mode 100644 index 0000000000..c0966f7b86 --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.ts @@ -0,0 +1,180 @@ +import { Component, OnDestroy, OnInit } from '@angular/core'; +import { FormControl, FormGroup, Validators } from '@angular/forms'; +import { MatDialog } from '@angular/material/dialog'; +import { Router } from '@angular/router'; +import { takeUntil } from 'rxjs'; +import { NoticeOfIntentDocumentDto } from '../../../../../services/notice-of-intent-document/notice-of-intent-document.dto'; +import { NoticeOfIntentDocumentService } from '../../../../../services/notice-of-intent-document/notice-of-intent-document.service'; +import { NoticeOfIntentSubmissionUpdateDto } from '../../../../../services/notice-of-intent-submission/notice-of-intent-submission.dto'; +import { NoticeOfIntentSubmissionService } from '../../../../../services/notice-of-intent-submission/notice-of-intent-submission.service'; +import { DOCUMENT_TYPE } from '../../../../../shared/dto/document.dto'; +import { formatBooleanToString } from '../../../../../shared/utils/boolean-helper'; +import { parseStringToBoolean } from '../../../../../shared/utils/string-helper'; +import { SoilTableData } from '../../../../../shared/soil-table/soil-table.component'; +import { EditNoiSteps } from '../../edit-submission.component'; +import { FilesStepComponent } from '../../files-step.partial'; + +@Component({ + selector: 'app-roso-proposal', + templateUrl: './roso-proposal.component.html', + styleUrls: ['./roso-proposal.component.scss'], +}) +export class RosoProposalComponent extends FilesStepComponent implements OnInit, OnDestroy { + currentStep = EditNoiSteps.Proposal; + + DOCUMENT = DOCUMENT_TYPE; + + allowMiningUploads = false; + requiresNoticeOfWork = false; + + proposalMap: NoticeOfIntentDocumentDto[] = []; + crossSections: NoticeOfIntentDocumentDto[] = []; + reclamationPlan: NoticeOfIntentDocumentDto[] = []; + noticeOfWork: NoticeOfIntentDocumentDto[] = []; + + isFollowUp = new FormControl(null, [Validators.required]); + followUpIds = new FormControl({ value: null, disabled: true }, [Validators.required]); + purpose = new FormControl(null, [Validators.required]); + soilTypeRemoved = new FormControl(null, [Validators.required]); + projectDurationAmount = new FormControl(null, [Validators.required]); + projectDurationUnit = new FormControl(null, [Validators.required]); + areComponentsDirty = false; + isExtractionOrMining = new FormControl(null, [Validators.required]); + hasSubmittedNotice = new FormControl(null, [Validators.required]); + + form = new FormGroup({ + isFollowUp: this.isFollowUp, + followUpIds: this.followUpIds, + purpose: this.purpose, + soilTypeRemoved: this.soilTypeRemoved, + projectDurationAmount: this.projectDurationAmount, + projectDurationUnit: this.projectDurationUnit, + isExtractionOrMining: this.isExtractionOrMining, + hasSubmittedNotice: this.hasSubmittedNotice, + }); + + private submissionUuid = ''; + removalTableData: SoilTableData = {}; + alreadyRemovedTableData: SoilTableData = {}; + + constructor( + private router: Router, + private noticeOfIntentSubmissionService: NoticeOfIntentSubmissionService, + noticeOfIntentDocumentService: NoticeOfIntentDocumentService, + dialog: MatDialog + ) { + super(noticeOfIntentDocumentService, dialog); + } + + ngOnInit(): void { + this.$noiSubmission.pipe(takeUntil(this.$destroy)).subscribe((noiSubmission) => { + if (noiSubmission) { + this.fileId = noiSubmission.fileNumber; + this.submissionUuid = noiSubmission.uuid; + + this.alreadyRemovedTableData = { + volume: noiSubmission.soilAlreadyRemovedVolume ?? 0, + area: noiSubmission.soilAlreadyRemovedArea ?? 0, + averageDepth: noiSubmission.soilAlreadyRemovedAverageDepth ?? 0, + maximumDepth: noiSubmission.soilAlreadyRemovedMaximumDepth ?? 0, + }; + + this.removalTableData = { + volume: noiSubmission.soilToRemoveVolume ?? undefined, + area: noiSubmission.soilToRemoveArea ?? undefined, + averageDepth: noiSubmission.soilToRemoveAverageDepth ?? undefined, + maximumDepth: noiSubmission.soilToRemoveMaximumDepth ?? undefined, + }; + + if (noiSubmission.soilIsFollowUp) { + this.followUpIds.enable(); + } + + if (noiSubmission.soilIsExtractionOrMining) { + this.allowMiningUploads = true; + } + + this.form.patchValue({ + isFollowUp: formatBooleanToString(noiSubmission.soilIsFollowUp), + followUpIds: noiSubmission.soilFollowUpIDs, + purpose: noiSubmission.purpose, + soilTypeRemoved: noiSubmission.soilTypeRemoved, + projectDurationAmount: noiSubmission.soilProjectDurationAmount?.toString() ?? null, + projectDurationUnit: noiSubmission.soilProjectDurationUnit, + isExtractionOrMining: formatBooleanToString(noiSubmission.soilIsExtractionOrMining), + hasSubmittedNotice: formatBooleanToString(noiSubmission.soilHasSubmittedNotice), + }); + if (this.showErrors) { + this.form.markAllAsTouched(); + } + } + }); + + this.$noiDocuments.pipe(takeUntil(this.$destroy)).subscribe((documents) => { + this.proposalMap = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.PROPOSAL_MAP); + this.crossSections = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.CROSS_SECTIONS); + this.reclamationPlan = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.RECLAMATION_PLAN); + this.noticeOfWork = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.NOTICE_OF_WORK); + }); + } + + async onSave() { + await this.save(); + } + + protected async save() { + if (this.fileId && this.form.dirty) { + const isNOIFollowUp = this.isFollowUp.getRawValue(); + const soilFollowUpIDs = this.followUpIds.getRawValue(); + const purpose = this.purpose.getRawValue(); + const soilTypeRemoved = this.soilTypeRemoved.getRawValue(); + const isExtractionOrMining = this.isExtractionOrMining.getRawValue(); + const hasSubmittedNotice = this.hasSubmittedNotice.getRawValue(); + + const updateDto: NoticeOfIntentSubmissionUpdateDto = { + purpose, + soilTypeRemoved, + soilIsFollowUp: parseStringToBoolean(isNOIFollowUp), + soilFollowUpIDs, + soilToRemoveVolume: this.removalTableData?.volume ?? null, + soilToRemoveArea: this.removalTableData?.area ?? null, + soilToRemoveMaximumDepth: this.removalTableData?.maximumDepth ?? null, + soilToRemoveAverageDepth: this.removalTableData?.averageDepth ?? null, + soilAlreadyRemovedVolume: this.alreadyRemovedTableData?.volume ?? null, + soilAlreadyRemovedArea: this.alreadyRemovedTableData?.area ?? null, + soilAlreadyRemovedMaximumDepth: this.alreadyRemovedTableData?.maximumDepth ?? null, + soilAlreadyRemovedAverageDepth: this.alreadyRemovedTableData?.averageDepth ?? null, + soilProjectDurationAmount: this.projectDurationAmount.value + ? parseFloat(this.projectDurationAmount.value) + : null, + soilProjectDurationUnit: this.projectDurationUnit.value, + soilIsExtractionOrMining: parseStringToBoolean(isExtractionOrMining), + soilHasSubmittedNotice: parseStringToBoolean(hasSubmittedNotice), + }; + + const updatedApp = await this.noticeOfIntentSubmissionService.updatePending(this.submissionUuid, updateDto); + this.$noiSubmission.next(updatedApp); + } + } + + onChangeIsFollowUp(selectedValue: string) { + if (selectedValue === 'true') { + this.followUpIds.enable(); + } else if (selectedValue === 'false') { + this.followUpIds.disable(); + this.followUpIds.setValue(null); + } + } + + onChangeIsExtractionOrMining(selectedValue: string) { + this.allowMiningUploads = selectedValue === 'true'; + } + + markDirty() { + this.areComponentsDirty = true; + } + + onChangeNoticeOfWork(selectedValue: string) { + this.requiresNoticeOfWork = selectedValue === 'true'; + } +} diff --git a/portal-frontend/src/app/services/notice-of-intent-submission/notice-of-intent-submission.dto.ts b/portal-frontend/src/app/services/notice-of-intent-submission/notice-of-intent-submission.dto.ts index 49ec815506..2cecd2086f 100644 --- a/portal-frontend/src/app/services/notice-of-intent-submission/notice-of-intent-submission.dto.ts +++ b/portal-frontend/src/app/services/notice-of-intent-submission/notice-of-intent-submission.dto.ts @@ -31,6 +31,7 @@ export interface NoticeOfIntentSubmissionDto { applicant: string; localGovernmentUuid: string; type: string; + typeCode: string; status: NoticeOfIntentSubmissionStatusDto; submissionStatuses: NoticeOfIntentSubmissionToSubmissionStatusDto[]; owners: NoticeOfIntentOwnerDto[]; @@ -52,6 +53,34 @@ export interface NoticeOfIntentSubmissionDetailedDto extends NoticeOfIntentSubmi westLandUseType: string; westLandUseTypeDescription: string; primaryContactOwnerUuid: string | null; + + //Soil Fields + soilIsFollowUp: boolean | null; + soilFollowUpIDs: string | null; + soilTypeRemoved: string | null; + soilReduceNegativeImpacts: string | null; + soilToRemoveVolume: number | null; + soilToRemoveArea: number | null; + soilToRemoveMaximumDepth: number | null; + soilToRemoveAverageDepth: number | null; + soilAlreadyRemovedVolume: number | null; + soilAlreadyRemovedArea: number | null; + soilAlreadyRemovedMaximumDepth: number | null; + soilAlreadyRemovedAverageDepth: number | null; + soilToPlaceVolume: number | null; + soilToPlaceArea: number | null; + soilToPlaceMaximumDepth: number | null; + soilToPlaceAverageDepth: number | null; + soilAlreadyPlacedVolume: number | null; + soilAlreadyPlacedArea: number | null; + soilAlreadyPlacedMaximumDepth: number | null; + soilAlreadyPlacedAverageDepth: number | null; + soilProjectDurationAmount: number | null; + soilProjectDurationUnit?: string | null; + soilFillTypeToPlace?: string | null; + soilAlternativeMeasures?: string | null; + soilIsExtractionOrMining?: boolean; + soilHasSubmittedNotice?: boolean; } export interface NoticeOfIntentSubmissionUpdateDto { @@ -70,4 +99,32 @@ export interface NoticeOfIntentSubmissionUpdateDto { southLandUseTypeDescription?: string | null; westLandUseType?: string | null; westLandUseTypeDescription?: string | null; + + //Soil Fields + soilIsFollowUp?: boolean | null; + soilFollowUpIDs?: string | null; + soilTypeRemoved?: string | null; + soilReduceNegativeImpacts?: string | null; + soilToRemoveVolume?: number | null; + soilToRemoveArea?: number | null; + soilToRemoveMaximumDepth?: number | null; + soilToRemoveAverageDepth?: number | null; + soilAlreadyRemovedVolume?: number | null; + soilAlreadyRemovedArea?: number | null; + soilAlreadyRemovedMaximumDepth?: number | null; + soilAlreadyRemovedAverageDepth?: number | null; + soilToPlaceVolume?: number | null; + soilToPlaceArea?: number | null; + soilToPlaceMaximumDepth?: number | null; + soilToPlaceAverageDepth?: number | null; + soilAlreadyPlacedVolume?: number | null; + soilAlreadyPlacedArea?: number | null; + soilAlreadyPlacedMaximumDepth?: number | null; + soilAlreadyPlacedAverageDepth?: number | null; + soilProjectDurationAmount?: number | null; + soilProjectDurationUnit?: string | null; + soilFillTypeToPlace?: string | null; + soilAlternativeMeasures?: string | null; + soilIsExtractionOrMining?: boolean | null; + soilHasSubmittedNotice?: boolean | null; } diff --git a/portal-frontend/src/app/shared/shared.module.ts b/portal-frontend/src/app/shared/shared.module.ts index 75b24121ec..14966fe720 100644 --- a/portal-frontend/src/app/shared/shared.module.ts +++ b/portal-frontend/src/app/shared/shared.module.ts @@ -40,6 +40,7 @@ import { FileSizePipe } from './pipes/fileSize.pipe'; import { MomentPipe } from './pipes/moment.pipe'; import { PhoneValidPipe } from './pipes/phoneValid.pipe'; import { PresribedBodyComponent } from './presribed-body/presribed-body.component'; +import { SoilTableComponent } from './soil-table/soil-table.component'; import { UpdatedBannerComponent } from './updated-banner/updated-banner.component'; import { DATE_FORMATS } from './utils/date-format'; import { ValidationErrorComponent } from './validation-error/validation-error.component'; @@ -91,6 +92,7 @@ import { WarningBannerComponent } from './warning-banner/warning-banner.componen CrownOwnerDialogComponent, AllOwnersDialogComponent, ParcelOwnersComponent, + SoilTableComponent, ], exports: [ CommonModule, @@ -137,6 +139,7 @@ import { WarningBannerComponent } from './warning-banner/warning-banner.componen CrownOwnerDialogComponent, AllOwnersDialogComponent, ParcelOwnersComponent, + SoilTableComponent, ], }) export class SharedModule { diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/soil-table/soil-table.component.html b/portal-frontend/src/app/shared/soil-table/soil-table.component.html similarity index 100% rename from portal-frontend/src/app/features/applications/edit-submission/proposal/soil-table/soil-table.component.html rename to portal-frontend/src/app/shared/soil-table/soil-table.component.html diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/soil-table/soil-table.component.scss b/portal-frontend/src/app/shared/soil-table/soil-table.component.scss similarity index 95% rename from portal-frontend/src/app/features/applications/edit-submission/proposal/soil-table/soil-table.component.scss rename to portal-frontend/src/app/shared/soil-table/soil-table.component.scss index d1987e6e0e..d7e7c37d6a 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/soil-table/soil-table.component.scss +++ b/portal-frontend/src/app/shared/soil-table/soil-table.component.scss @@ -1,4 +1,4 @@ -@use '../../../../../../styles/functions' as *; +@use '../../../styles/functions' as *; .container { border: 1px solid #000; diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/soil-table/soil-table.component.spec.ts b/portal-frontend/src/app/shared/soil-table/soil-table.component.spec.ts similarity index 100% rename from portal-frontend/src/app/features/applications/edit-submission/proposal/soil-table/soil-table.component.spec.ts rename to portal-frontend/src/app/shared/soil-table/soil-table.component.spec.ts diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/soil-table/soil-table.component.ts b/portal-frontend/src/app/shared/soil-table/soil-table.component.ts similarity index 100% rename from portal-frontend/src/app/features/applications/edit-submission/proposal/soil-table/soil-table.component.ts rename to portal-frontend/src/app/shared/soil-table/soil-table.component.ts diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.dto.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.dto.ts index ccb29748bd..3a47818495 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.dto.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.dto.ts @@ -1,13 +1,14 @@ import { AutoMap } from '@automapper/classes'; import { + IsBoolean, IsNotEmpty, + IsNumber, IsOptional, IsString, IsUUID, MaxLength, } from 'class-validator'; import { NoticeOfIntentStatusDto } from '../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status.dto'; -import { ApplicationOwnerDto } from '../application-submission/application-owner/application-owner.dto'; import { NoticeOfIntentOwnerDto } from './notice-of-intent-owner/notice-of-intent-owner.dto'; export const MAX_DESCRIPTION_FIELD_LENGTH = 4000; @@ -34,6 +35,9 @@ export class NoticeOfIntentSubmissionDto { @AutoMap() type: string; + @AutoMap() + typeCode: string; + status: NoticeOfIntentStatusDto; owners: NoticeOfIntentOwnerDto[]; @@ -68,6 +72,85 @@ export class NoticeOfIntentSubmissionDetailedDto extends NoticeOfIntentSubmissio westLandUseTypeDescription: string; @AutoMap(() => String) primaryContactOwnerUuid?: string | null; + + //Soil Fields + @AutoMap(() => Boolean) + soilIsFollowUp: boolean | null; + + @AutoMap(() => String) + soilFollowUpIDs: string | null; + + @AutoMap(() => String) + soilTypeRemoved: string | null; + + @AutoMap(() => String) + soilReduceNegativeImpacts: string | null; + + @AutoMap(() => Number) + soilToRemoveVolume: number | null; + + @AutoMap(() => Number) + soilToRemoveArea: number | null; + + @AutoMap(() => Number) + soilToRemoveMaximumDepth: number | null; + + @AutoMap(() => Number) + soilToRemoveAverageDepth: number | null; + + @AutoMap(() => Number) + soilAlreadyRemovedVolume: number | null; + + @AutoMap(() => Number) + soilAlreadyRemovedArea: number | null; + + @AutoMap(() => Number) + soilAlreadyRemovedMaximumDepth: number | null; + + @AutoMap(() => Number) + soilAlreadyRemovedAverageDepth: number | null; + + @AutoMap(() => Number) + soilToPlaceVolume: number | null; + + @AutoMap(() => Number) + soilToPlaceArea: number | null; + + @AutoMap(() => Number) + soilToPlaceMaximumDepth: number | null; + + @AutoMap(() => Number) + soilToPlaceAverageDepth: number | null; + + @AutoMap(() => Number) + soilAlreadyPlacedVolume: number | null; + + @AutoMap(() => Number) + soilAlreadyPlacedArea: number | null; + + @AutoMap(() => Number) + soilAlreadyPlacedMaximumDepth: number | null; + + @AutoMap(() => Number) + soilAlreadyPlacedAverageDepth: number | null; + + @AutoMap(() => Number) + soilProjectDurationAmount: number | null; + + @AutoMap(() => String) + soilProjectDurationUnit?: string | null; + + @AutoMap(() => String) + soilFillTypeToPlace?: string | null; + + @AutoMap(() => String) + soilAlternativeMeasures?: string | null; + + @AutoMap(() => Boolean) + soilIsExtractionOrMining?: boolean; + + @AutoMap(() => Boolean) + soilHasSubmittedNotice?: boolean; } export class NoticeOfIntentSubmissionCreateDto { @@ -144,4 +227,112 @@ export class NoticeOfIntentSubmissionUpdateDto { @IsString() @IsOptional() westLandUseTypeDescription?: string; + + //Soil Fields + @IsBoolean() + @IsOptional() + soilIsFollowUp?: boolean | null; + + @IsString() + @MaxLength(MAX_DESCRIPTION_FIELD_LENGTH) + @IsOptional() + soilFollowUpIDs?: string | null; + + @IsString() + @MaxLength(MAX_DESCRIPTION_FIELD_LENGTH) + @IsOptional() + soilTypeRemoved?: string | null; + + @IsString() + @MaxLength(MAX_DESCRIPTION_FIELD_LENGTH) + @IsOptional() + soilReduceNegativeImpacts?: string | null; + + @IsNumber() + @IsOptional() + soilToRemoveVolume?: number | null; + + @IsNumber() + @IsOptional() + soilToRemoveArea?: number | null; + + @IsNumber() + @IsOptional() + soilToRemoveMaximumDepth?: number | null; + + @IsNumber() + @IsOptional() + soilToRemoveAverageDepth?: number | null; + + @IsNumber() + @IsOptional() + soilAlreadyRemovedVolume?: number | null; + + @IsNumber() + @IsOptional() + soilAlreadyRemovedArea?: number | null; + + @IsNumber() + @IsOptional() + soilAlreadyRemovedMaximumDepth?: number | null; + + @IsNumber() + @IsOptional() + soilAlreadyRemovedAverageDepth?: number | null; + + @IsNumber() + @IsOptional() + soilToPlaceVolume?: number | null; + + @IsNumber() + @IsOptional() + soilToPlaceArea?: number | null; + + @IsNumber() + @IsOptional() + soilToPlaceMaximumDepth?: number | null; + + @IsNumber() + @IsOptional() + soilToPlaceAverageDepth?: number | null; + + @IsNumber() + @IsOptional() + soilAlreadyPlacedVolume?: number | null; + + @IsNumber() + @IsOptional() + soilAlreadyPlacedArea?: number | null; + + @IsNumber() + @IsOptional() + soilAlreadyPlacedMaximumDepth?: number | null; + + @IsNumber() + @IsOptional() + soilAlreadyPlacedAverageDepth?: number | null; + + @IsNumber() + @IsOptional() + soilProjectDurationAmount?: number | null; + + @IsString() + @IsOptional() + soilProjectDurationUnit?: string | null; + + @IsString() + @IsOptional() + soilFillTypeToPlace?: string | null; + + @IsString() + @IsOptional() + soilAlternativeMeasures?: string | null; + + @IsBoolean() + @IsOptional() + soilIsExtractionOrMining?: boolean; + + @IsBoolean() + @IsOptional() + soilHasSubmittedNotice?: boolean; } diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.entity.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.entity.ts index 498b9a0389..3d71859500 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.entity.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.entity.ts @@ -12,6 +12,7 @@ import { NoticeOfIntentSubmissionToSubmissionStatus } from '../../alcs/notice-of import { NoticeOfIntent } from '../../alcs/notice-of-intent/notice-of-intent.entity'; import { Base } from '../../common/entities/base.entity'; import { User } from '../../user/user.entity'; +import { ColumnNumericTransformer } from '../../utils/column-numeric-transform'; import { NoticeOfIntentOwner } from './notice-of-intent-owner/notice-of-intent-owner.entity'; @Entity() @@ -180,6 +181,213 @@ export class NoticeOfIntentSubmission extends Base { }) typeCode: string; + //Soil & Fill + @AutoMap(() => Boolean) + @Column({ type: 'boolean', nullable: true }) + soilIsFollowUp: boolean | null; + + @AutoMap(() => String) + @Column({ type: 'text', nullable: true, name: 'soil_follow_up_ids' }) + soilFollowUpIDs: string | null; + + @AutoMap(() => String) + @Column({ type: 'text', nullable: true }) + soilTypeRemoved: string | null; + + @AutoMap(() => String) + @Column({ type: 'text', nullable: true }) + soilReduceNegativeImpacts: string | null; + + @AutoMap(() => Number) + @Column({ + type: 'decimal', + nullable: true, + precision: 12, + scale: 2, + transformer: new ColumnNumericTransformer(), + }) + soilToRemoveVolume: number | null; + + @AutoMap(() => Number) + @Column({ + type: 'decimal', + nullable: true, + precision: 12, + scale: 2, + transformer: new ColumnNumericTransformer(), + }) + soilToRemoveArea: number | null; + + @AutoMap(() => Number) + @Column({ + type: 'decimal', + nullable: true, + precision: 12, + scale: 2, + transformer: new ColumnNumericTransformer(), + }) + soilToRemoveMaximumDepth: number | null; + + @AutoMap(() => Number) + @Column({ + type: 'decimal', + nullable: true, + precision: 12, + scale: 2, + transformer: new ColumnNumericTransformer(), + }) + soilToRemoveAverageDepth: number | null; + + @AutoMap(() => Number) + @Column({ + type: 'decimal', + nullable: true, + precision: 12, + scale: 2, + transformer: new ColumnNumericTransformer(), + }) + soilAlreadyRemovedVolume: number | null; + + @AutoMap(() => Number) + @Column({ + type: 'decimal', + nullable: true, + precision: 12, + scale: 2, + transformer: new ColumnNumericTransformer(), + }) + soilAlreadyRemovedArea: number | null; + + @AutoMap(() => Number) + @Column({ + type: 'decimal', + nullable: true, + precision: 12, + scale: 2, + transformer: new ColumnNumericTransformer(), + }) + soilAlreadyRemovedMaximumDepth: number | null; + + @AutoMap(() => Number) + @Column({ + type: 'decimal', + nullable: true, + precision: 12, + scale: 2, + transformer: new ColumnNumericTransformer(), + }) + soilAlreadyRemovedAverageDepth: number | null; + + @AutoMap(() => Number) + @Column({ + type: 'decimal', + nullable: true, + precision: 12, + scale: 2, + transformer: new ColumnNumericTransformer(), + }) + soilToPlaceVolume: number | null; + + @AutoMap(() => Number) + @Column({ + type: 'decimal', + nullable: true, + precision: 12, + scale: 2, + transformer: new ColumnNumericTransformer(), + }) + soilToPlaceArea: number | null; + + @AutoMap(() => Number) + @Column({ + type: 'decimal', + nullable: true, + precision: 12, + scale: 2, + transformer: new ColumnNumericTransformer(), + }) + soilToPlaceMaximumDepth: number | null; + + @AutoMap(() => Number) + @Column({ + type: 'decimal', + nullable: true, + precision: 12, + scale: 2, + transformer: new ColumnNumericTransformer(), + }) + soilToPlaceAverageDepth: number | null; + + @AutoMap(() => Number) + @Column({ + type: 'decimal', + nullable: true, + precision: 12, + scale: 2, + transformer: new ColumnNumericTransformer(), + }) + soilAlreadyPlacedVolume: number | null; + + @AutoMap(() => Number) + @Column({ + type: 'decimal', + nullable: true, + precision: 12, + scale: 2, + transformer: new ColumnNumericTransformer(), + }) + soilAlreadyPlacedArea: number | null; + + @AutoMap(() => Number) + @Column({ + type: 'decimal', + nullable: true, + precision: 12, + scale: 2, + transformer: new ColumnNumericTransformer(), + }) + soilAlreadyPlacedMaximumDepth: number | null; + + @AutoMap(() => Number) + @Column({ + type: 'decimal', + nullable: true, + precision: 12, + scale: 2, + transformer: new ColumnNumericTransformer(), + }) + soilAlreadyPlacedAverageDepth: number | null; + + @AutoMap(() => Number) + @Column({ + type: 'decimal', + nullable: true, + precision: 12, + scale: 2, + transformer: new ColumnNumericTransformer(), + }) + soilProjectDurationAmount: number | null; + + @AutoMap(() => String) + @Column({ type: 'text', nullable: true }) + soilProjectDurationUnit: string | null; + + @AutoMap(() => String) + @Column({ type: 'text', nullable: true }) + soilFillTypeToPlace: string | null; + + @AutoMap(() => String) + @Column({ type: 'text', nullable: true }) + soilAlternativeMeasures: string | null; + + @AutoMap(() => Boolean) + @Column({ type: 'boolean', nullable: true }) + soilIsExtractionOrMining: boolean | null; + + @AutoMap(() => Boolean) + @Column({ type: 'boolean', nullable: true }) + soilHasSubmittedNotice: boolean | null; + @AutoMap(() => NoticeOfIntent) @ManyToOne(() => NoticeOfIntent) @JoinColumn({ diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts index 233549c30a..a35a2c0bb2 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts @@ -19,11 +19,10 @@ import { NOI_SUBMISSION_STATUS } from '../../alcs/notice-of-intent/notice-of-int import { NoticeOfIntentSubmissionStatusService } from '../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service'; import { NoticeOfIntentService } from '../../alcs/notice-of-intent/notice-of-intent.service'; import { ROLES_ALLOWED_APPLICATIONS } from '../../common/authorization/roles'; +import { DOCUMENT_TYPE } from '../../document/document-code.entity'; import { FileNumberService } from '../../file-number/file-number.service'; import { User } from '../../user/user.entity'; import { filterUndefined } from '../../utils/undefined'; -import { ApplicationSubmissionUpdateDto } from '../application-submission/application-submission.dto'; -import { ApplicationSubmission } from '../application-submission/application-submission.entity'; import { NoticeOfIntentSubmissionDetailedDto, NoticeOfIntentSubmissionDto, @@ -131,6 +130,7 @@ export class NoticeOfIntentSubmissionService { updateDto.localGovernmentUuid; this.setLandUseFields(noticeOfIntentSubmission, updateDto); + await this.setSoilFields(noticeOfIntentSubmission, updateDto); await this.noticeOfIntentSubmissionRepository.save( noticeOfIntentSubmission, @@ -174,6 +174,131 @@ export class NoticeOfIntentSubmissionService { return noticeOfIntentSubmission; } + private async setSoilFields( + noticeOfIntentSubmission: NoticeOfIntentSubmission, + updateDto: NoticeOfIntentSubmissionUpdateDto, + ) { + noticeOfIntentSubmission.soilIsFollowUp = filterUndefined( + updateDto.soilIsFollowUp, + noticeOfIntentSubmission.soilIsFollowUp, + ); + noticeOfIntentSubmission.soilFollowUpIDs = filterUndefined( + updateDto.soilFollowUpIDs, + noticeOfIntentSubmission.soilFollowUpIDs, + ); + noticeOfIntentSubmission.soilTypeRemoved = filterUndefined( + updateDto.soilTypeRemoved, + noticeOfIntentSubmission.soilTypeRemoved, + ); + noticeOfIntentSubmission.soilReduceNegativeImpacts = filterUndefined( + updateDto.soilReduceNegativeImpacts, + noticeOfIntentSubmission.soilReduceNegativeImpacts, + ); + noticeOfIntentSubmission.soilToRemoveVolume = filterUndefined( + updateDto.soilToRemoveVolume, + noticeOfIntentSubmission.soilToRemoveVolume, + ); + noticeOfIntentSubmission.soilToRemoveArea = filterUndefined( + updateDto.soilToRemoveArea, + noticeOfIntentSubmission.soilToRemoveArea, + ); + noticeOfIntentSubmission.soilToRemoveMaximumDepth = filterUndefined( + updateDto.soilToRemoveMaximumDepth, + noticeOfIntentSubmission.soilToRemoveMaximumDepth, + ); + noticeOfIntentSubmission.soilToRemoveAverageDepth = filterUndefined( + updateDto.soilToRemoveAverageDepth, + noticeOfIntentSubmission.soilToRemoveAverageDepth, + ); + noticeOfIntentSubmission.soilAlreadyRemovedVolume = filterUndefined( + updateDto.soilAlreadyRemovedVolume, + noticeOfIntentSubmission.soilAlreadyRemovedVolume, + ); + noticeOfIntentSubmission.soilAlreadyRemovedArea = filterUndefined( + updateDto.soilAlreadyRemovedArea, + noticeOfIntentSubmission.soilAlreadyRemovedArea, + ); + noticeOfIntentSubmission.soilAlreadyRemovedMaximumDepth = filterUndefined( + updateDto.soilAlreadyRemovedMaximumDepth, + noticeOfIntentSubmission.soilAlreadyRemovedMaximumDepth, + ); + noticeOfIntentSubmission.soilAlreadyRemovedAverageDepth = filterUndefined( + updateDto.soilAlreadyRemovedAverageDepth, + noticeOfIntentSubmission.soilAlreadyRemovedAverageDepth, + ); + noticeOfIntentSubmission.soilToPlaceVolume = filterUndefined( + updateDto.soilToPlaceVolume, + noticeOfIntentSubmission.soilToPlaceVolume, + ); + noticeOfIntentSubmission.soilToPlaceArea = filterUndefined( + updateDto.soilToPlaceArea, + noticeOfIntentSubmission.soilToPlaceArea, + ); + noticeOfIntentSubmission.soilToPlaceMaximumDepth = filterUndefined( + updateDto.soilToPlaceMaximumDepth, + noticeOfIntentSubmission.soilToPlaceMaximumDepth, + ); + noticeOfIntentSubmission.soilToPlaceAverageDepth = filterUndefined( + updateDto.soilToPlaceAverageDepth, + noticeOfIntentSubmission.soilToPlaceAverageDepth, + ); + noticeOfIntentSubmission.soilAlreadyPlacedVolume = filterUndefined( + updateDto.soilAlreadyPlacedVolume, + noticeOfIntentSubmission.soilAlreadyPlacedVolume, + ); + noticeOfIntentSubmission.soilAlreadyPlacedArea = filterUndefined( + updateDto.soilAlreadyPlacedArea, + noticeOfIntentSubmission.soilAlreadyPlacedArea, + ); + noticeOfIntentSubmission.soilAlreadyPlacedMaximumDepth = filterUndefined( + updateDto.soilAlreadyPlacedMaximumDepth, + noticeOfIntentSubmission.soilAlreadyPlacedMaximumDepth, + ); + noticeOfIntentSubmission.soilAlreadyPlacedAverageDepth = filterUndefined( + updateDto.soilAlreadyPlacedAverageDepth, + noticeOfIntentSubmission.soilAlreadyPlacedAverageDepth, + ); + noticeOfIntentSubmission.soilProjectDurationAmount = filterUndefined( + updateDto.soilProjectDurationAmount, + noticeOfIntentSubmission.soilProjectDurationAmount, + ); + noticeOfIntentSubmission.soilProjectDurationUnit = filterUndefined( + updateDto.soilProjectDurationUnit, + noticeOfIntentSubmission.soilProjectDurationUnit, + ); + noticeOfIntentSubmission.soilFillTypeToPlace = filterUndefined( + updateDto.soilFillTypeToPlace, + noticeOfIntentSubmission.soilFillTypeToPlace, + ); + noticeOfIntentSubmission.soilAlternativeMeasures = filterUndefined( + updateDto.soilAlternativeMeasures, + noticeOfIntentSubmission.soilAlternativeMeasures, + ); + + noticeOfIntentSubmission.soilIsExtractionOrMining = filterUndefined( + updateDto.soilIsExtractionOrMining, + noticeOfIntentSubmission.soilIsExtractionOrMining, + ); + + noticeOfIntentSubmission.soilHasSubmittedNotice = filterUndefined( + updateDto.soilHasSubmittedNotice, + noticeOfIntentSubmission.soilHasSubmittedNotice, + ); + + if ( + updateDto.soilHasSubmittedNotice === false || + updateDto.soilIsExtractionOrMining === false + ) { + const noiUuid = await this.noticeOfIntentService.getUuid( + noticeOfIntentSubmission.fileNumber, + ); + await this.noticeOfIntentDocumentService.deleteByType( + DOCUMENT_TYPE.NOTICE_OF_WORK, + noiUuid, + ); + } + } + //TODO: Uncomment when adding submitting // async submitToAlcs( // application: ValidatedApplicationSubmission, diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1691792941845-add_soil_fields_for_noi_submissions.ts b/services/apps/alcs/src/providers/typeorm/migrations/1691792941845-add_soil_fields_for_noi_submissions.ts new file mode 100644 index 0000000000..12114e1696 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1691792941845-add_soil_fields_for_noi_submissions.ts @@ -0,0 +1,169 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class addSoilFieldsForNoiSubmissions1691792941845 + implements MigrationInterface +{ + name = 'addSoilFieldsForNoiSubmissions1691792941845'; + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" ADD "soil_is_follow_up" boolean`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" ADD "soil_follow_up_ids" text`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" ADD "soil_type_removed" text`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" ADD "soil_reduce_negative_impacts" text`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" ADD "soil_to_remove_volume" numeric(12,2)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" ADD "soil_to_remove_area" numeric(12,2)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" ADD "soil_to_remove_maximum_depth" numeric(12,2)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" ADD "soil_to_remove_average_depth" numeric(12,2)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" ADD "soil_already_removed_volume" numeric(12,2)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" ADD "soil_already_removed_area" numeric(12,2)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" ADD "soil_already_removed_maximum_depth" numeric(12,2)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" ADD "soil_already_removed_average_depth" numeric(12,2)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" ADD "soil_to_place_volume" numeric(12,2)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" ADD "soil_to_place_area" numeric(12,2)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" ADD "soil_to_place_maximum_depth" numeric(12,2)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" ADD "soil_to_place_average_depth" numeric(12,2)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" ADD "soil_already_placed_volume" numeric(12,2)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" ADD "soil_already_placed_area" numeric(12,2)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" ADD "soil_already_placed_maximum_depth" numeric(12,2)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" ADD "soil_already_placed_average_depth" numeric(12,2)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" ADD "soil_project_duration_amount" numeric(12,2)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" ADD "soil_project_duration_unit" text`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" ADD "soil_fill_type_to_place" text`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" ADD "soil_alternative_measures" text`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" ADD "soil_is_extraction_or_mining" boolean`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" ADD "soil_has_submitted_notice" boolean`, + ); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" DROP COLUMN "soil_has_submitted_notice"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" DROP COLUMN "soil_is_extraction_or_mining"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" DROP COLUMN "soil_alternative_measures"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" DROP COLUMN "soil_fill_type_to_place"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" DROP COLUMN "soil_project_duration_unit"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" DROP COLUMN "soil_project_duration_amount"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" DROP COLUMN "soil_already_placed_average_depth"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" DROP COLUMN "soil_already_placed_maximum_depth"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" DROP COLUMN "soil_already_placed_area"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" DROP COLUMN "soil_already_placed_volume"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" DROP COLUMN "soil_to_place_average_depth"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" DROP COLUMN "soil_to_place_maximum_depth"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" DROP COLUMN "soil_to_place_area"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" DROP COLUMN "soil_to_place_volume"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" DROP COLUMN "soil_already_removed_average_depth"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" DROP COLUMN "soil_already_removed_maximum_depth"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" DROP COLUMN "soil_already_removed_area"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" DROP COLUMN "soil_already_removed_volume"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" DROP COLUMN "soil_to_remove_average_depth"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" DROP COLUMN "soil_to_remove_maximum_depth"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" DROP COLUMN "soil_to_remove_area"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" DROP COLUMN "soil_to_remove_volume"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" DROP COLUMN "soil_reduce_negative_impacts"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" DROP COLUMN "soil_type_removed"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" DROP COLUMN "soil_follow_up_ids"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" DROP COLUMN "soil_is_follow_up"`, + ); + } +} From 370ad1d0ebc11a50f0d53f2b370a0d49804f18ca Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Fri, 11 Aug 2023 16:04:33 -0700 Subject: [PATCH 234/954] Feature/alcs 693 - no status and various fixes (#867) update LG visibility rules of applications prevent user from manually navigating to edit in the portal prevent update api calls for non-eligible submission add missing table comments introduce "no status" status --- .../overview/overview.component.ts | 11 ++++- .../uncancel-application-dialog.component.ts | 20 +++++++- .../application-dialog.component.ts | 30 +++++++++--- .../application-submission-status.dto.ts | 6 +++ .../application-submission-status.service.ts | 18 +++++-- .../details-header.component.ts | 23 +++++---- .../edit-submission.component.ts | 14 +++++- ...ation-submission-review.controller.spec.ts | 47 ++++--------------- ...pplication-submission-review.controller.ts | 12 ++--- .../application-submission.controller.spec.ts | 42 +++++++++++++++-- .../application-submission.controller.ts | 14 +++++- .../application-submission.service.ts | 18 ++++--- .../1691785736403-more_table_comments.ts | 17 +++++++ 13 files changed, 193 insertions(+), 79 deletions(-) create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1691785736403-more_table_comments.ts diff --git a/alcs-frontend/src/app/features/application/overview/overview.component.ts b/alcs-frontend/src/app/features/application/overview/overview.component.ts index ce0e893608..0749c04df4 100644 --- a/alcs-frontend/src/app/features/application/overview/overview.component.ts +++ b/alcs-frontend/src/app/features/application/overview/overview.component.ts @@ -359,7 +359,16 @@ export class OverviewComponent implements OnInit, OnDestroy { } private async loadStatusHistory(fileNumber: string) { - const statusHistory = await this.applicationSubmissionStatusService.fetchSubmissionStatusesByFileNumber(fileNumber); + let statusHistory: ApplicationSubmissionToSubmissionStatusDto[] = []; + try { + statusHistory = await this.applicationSubmissionStatusService.fetchSubmissionStatusesByFileNumber( + fileNumber, + false + ); + } catch (e) { + console.warn(`No statuses for ${fileNumber}. Is it a manually created submission?`); + } + this.isCancelled = statusHistory.filter((status) => status.effectiveDate && status.statusTypeCode === SUBMISSION_STATUS.CANCELLED) .length > 0; diff --git a/alcs-frontend/src/app/features/application/overview/uncancel-application-dialog/uncancel-application-dialog.component.ts b/alcs-frontend/src/app/features/application/overview/uncancel-application-dialog/uncancel-application-dialog.component.ts index 1ca143957d..7eea9e85d5 100644 --- a/alcs-frontend/src/app/features/application/overview/uncancel-application-dialog/uncancel-application-dialog.component.ts +++ b/alcs-frontend/src/app/features/application/overview/uncancel-application-dialog/uncancel-application-dialog.component.ts @@ -1,5 +1,9 @@ import { Component, Inject } from '@angular/core'; -import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; +import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; +import { + ApplicationSubmissionToSubmissionStatusDto, + DEFAULT_NO_STATUS, +} from '../../../../services/application/application-submission-status/application-submission-status.dto'; import { ApplicationSubmissionStatusService } from '../../../../services/application/application-submission-status/application-submission-status.service'; import { SUBMISSION_STATUS } from '../../../../services/application/application.dto'; import { ApplicationSubmissionStatusPill } from '../../../../shared/application-submission-status-type-pill/application-submission-status-type-pill.component'; @@ -21,7 +25,17 @@ export class UncancelApplicationDialogComponent { } async calculateStatusChange(fileNumber: string) { - const statusHistory = await this.applicationSubmissionStatusService.fetchSubmissionStatusesByFileNumber(fileNumber); + let statusHistory: ApplicationSubmissionToSubmissionStatusDto[] = []; + + try { + statusHistory = await this.applicationSubmissionStatusService.fetchSubmissionStatusesByFileNumber( + fileNumber, + false + ); + } catch (e) { + console.warn(`No statuses for ${fileNumber}. Is it a manually created submission?`); + } + const validStatuses = statusHistory .filter( (status) => @@ -37,6 +51,8 @@ export class UncancelApplicationDialogComponent { textColor: validStatus.alcsColor, label: validStatus.label, }; + } else { + this.status = DEFAULT_NO_STATUS; } } diff --git a/alcs-frontend/src/app/features/board/dialogs/application/application-dialog.component.ts b/alcs-frontend/src/app/features/board/dialogs/application/application-dialog.component.ts index 8963a37698..673ae390c2 100644 --- a/alcs-frontend/src/app/features/board/dialogs/application/application-dialog.component.ts +++ b/alcs-frontend/src/app/features/board/dialogs/application/application-dialog.component.ts @@ -1,6 +1,10 @@ import { Component, Inject, OnInit } from '@angular/core'; import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { Router } from '@angular/router'; +import { + ApplicationSubmissionToSubmissionStatusDto, + DEFAULT_NO_STATUS, +} from '../../../../services/application/application-submission-status/application-submission-status.dto'; import { ApplicationSubmissionStatusService } from '../../../../services/application/application-submission-status/application-submission-status.service'; import { ApplicationDto } from '../../../../services/application/application.dto'; import { ApplicationService } from '../../../../services/application/application.service'; @@ -56,12 +60,26 @@ export class ApplicationDialogComponent extends CardDialogComponent implements O } async populateApplicationSubmissionStatus(fileNumber: string) { - const submissionStatus = await this.applicationSubmissionStatusService.fetchCurrentStatusByFileNumber(fileNumber); - this.status = { - backgroundColor: submissionStatus.status.alcsBackgroundColor, - textColor: submissionStatus.status.alcsColor, - label: submissionStatus.status.label, - }; + let submissionStatus: ApplicationSubmissionToSubmissionStatusDto | null = null; + + try { + submissionStatus = await this.applicationSubmissionStatusService.fetchCurrentStatusByFileNumber( + fileNumber, + false + ); + } catch (e) { + console.warn(`No statuses for ${fileNumber}. Is it a manually created submission?`); + } + + if (submissionStatus) { + this.status = { + backgroundColor: submissionStatus.status.alcsBackgroundColor, + textColor: submissionStatus.status.alcsColor, + label: submissionStatus.status.label, + }; + } else { + this.status = DEFAULT_NO_STATUS; + } } async onBoardSelected(board: BoardWithFavourite) { diff --git a/alcs-frontend/src/app/services/application/application-submission-status/application-submission-status.dto.ts b/alcs-frontend/src/app/services/application/application-submission-status/application-submission-status.dto.ts index afdc12ca34..e9c903981c 100644 --- a/alcs-frontend/src/app/services/application/application-submission-status/application-submission-status.dto.ts +++ b/alcs-frontend/src/app/services/application/application-submission-status/application-submission-status.dto.ts @@ -24,3 +24,9 @@ export interface ApplicationSubmissionToSubmissionStatusDto { status: ApplicationStatusDto; } + +export const DEFAULT_NO_STATUS = { + backgroundColor: '#929292', + textColor: '#EFEFEF', + label: 'No Status', +}; diff --git a/alcs-frontend/src/app/services/application/application-submission-status/application-submission-status.service.ts b/alcs-frontend/src/app/services/application/application-submission-status/application-submission-status.service.ts index 84bcd69a31..b7427b7ae3 100644 --- a/alcs-frontend/src/app/services/application/application-submission-status/application-submission-status.service.ts +++ b/alcs-frontend/src/app/services/application/application-submission-status/application-submission-status.service.ts @@ -13,26 +13,36 @@ export class ApplicationSubmissionStatusService { constructor(private http: HttpClient, private toastService: ToastService) {} - async fetchSubmissionStatusesByFileNumber(fileNumber: string): Promise { + async fetchSubmissionStatusesByFileNumber( + fileNumber: string, + showErrorToast = true + ): Promise { try { const result = await firstValueFrom( this.http.get(`${this.baseUrl}/${fileNumber}`) ); return result; } catch (e) { - this.toastService.showErrorToast('Failed to fetch Application Submission Statuses'); + if (showErrorToast) { + this.toastService.showErrorToast('Failed to fetch Application Submission Statuses'); + } throw e; } } - async fetchCurrentStatusByFileNumber(fileNumber: string): Promise { + async fetchCurrentStatusByFileNumber( + fileNumber: string, + showErrorToast = true + ): Promise { try { const result = await firstValueFrom( this.http.get(`${this.baseUrl}/current-status/${fileNumber}`) ); return result; } catch (e) { - this.toastService.showErrorToast('Failed to fetch Application Submission Status'); + if (showErrorToast) { + this.toastService.showErrorToast('Failed to fetch Application Submission Status'); + } throw e; } } diff --git a/alcs-frontend/src/app/shared/details-header/details-header.component.ts b/alcs-frontend/src/app/shared/details-header/details-header.component.ts index 302115e4c5..50b5fdb2a7 100644 --- a/alcs-frontend/src/app/shared/details-header/details-header.component.ts +++ b/alcs-frontend/src/app/shared/details-header/details-header.component.ts @@ -4,6 +4,7 @@ import { Subject } from 'rxjs'; import { ApplicationTypeDto } from '../../services/application/application-code.dto'; import { ApplicationModificationDto } from '../../services/application/application-modification/application-modification.dto'; import { ApplicationReconsiderationDto } from '../../services/application/application-reconsideration/application-reconsideration.dto'; +import { DEFAULT_NO_STATUS } from '../../services/application/application-submission-status/application-submission-status.dto'; import { ApplicationSubmissionStatusService } from '../../services/application/application-submission-status/application-submission-status.service'; import { ApplicationDto } from '../../services/application/application.dto'; import { CardDto } from '../../services/card/card.dto'; @@ -55,14 +56,20 @@ export class DetailsHeaderComponent { } if (this.showStatus) { - this.submissionStatusService.fetchCurrentStatusByFileNumber(application.fileNumber).then( - (status) => - (this.currentStatus = { - label: status.status.label, - backgroundColor: status.status.alcsBackgroundColor, - textColor: status.status.alcsColor, - }) - ); + this.submissionStatusService + .fetchCurrentStatusByFileNumber(application.fileNumber, false) + .then( + (status) => + (this.currentStatus = { + label: status.status.label, + backgroundColor: status.status.alcsBackgroundColor, + textColor: status.status.alcsColor, + }) + ) + .catch((e) => { + console.warn(`No statuses for ${application.fileNumber}. Is it a manually created submission?`); + this.currentStatus = DEFAULT_NO_STATUS; + }); } } } diff --git a/portal-frontend/src/app/features/applications/edit-submission/edit-submission.component.ts b/portal-frontend/src/app/features/applications/edit-submission/edit-submission.component.ts index e1240cebe5..ee61cfcd8c 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/edit-submission.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/edit-submission.component.ts @@ -6,7 +6,10 @@ import { BehaviorSubject, combineLatest, Observable, of, Subject, takeUntil } fr import { ApplicationDocumentDto } from '../../../services/application-document/application-document.dto'; import { ApplicationDocumentService } from '../../../services/application-document/application-document.service'; import { ApplicationSubmissionReviewService } from '../../../services/application-submission-review/application-submission-review.service'; -import { ApplicationSubmissionDetailedDto } from '../../../services/application-submission/application-submission.dto'; +import { + ApplicationSubmissionDetailedDto, + SUBMISSION_STATUS, +} from '../../../services/application-submission/application-submission.dto'; import { ApplicationSubmissionService } from '../../../services/application-submission/application-submission.service'; import { CodeService } from '../../../services/code/code.service'; import { PdfGenerationService } from '../../../services/pdf-generation/pdf-generation.service'; @@ -98,6 +101,15 @@ export class EditSubmissionComponent implements OnInit, OnDestroy, AfterViewInit this.$applicationSubmission.pipe(takeUntil(this.$destroy)).subscribe((submission) => { this.applicationSubmission = submission; + if ( + submission?.status.code && + ![SUBMISSION_STATUS.IN_PROGRESS, SUBMISSION_STATUS.WRONG_GOV, SUBMISSION_STATUS.INCOMPLETE].includes( + submission?.status.code + ) + ) { + this.toastService.showErrorToast('Editing is not allowed. Please contact ALC for more details'); + this.router.navigate(['/home']); + } }); } diff --git a/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.spec.ts b/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.spec.ts index 370f48ebbd..a5dd309102 100644 --- a/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.spec.ts +++ b/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.spec.ts @@ -3,25 +3,25 @@ import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { ClsService } from 'nestjs-cls'; import { mockKeyCloakProviders } from '../../../test/mocks/mockTypes'; -import { LocalGovernment } from '../../alcs/local-government/local-government.entity'; -import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; -import { - DocumentCode, - DOCUMENT_TYPE, -} from '../../document/document-code.entity'; import { ApplicationDocument } from '../../alcs/application/application-document/application-document.entity'; import { ApplicationDocumentService } from '../../alcs/application/application-document/application-document.service'; -import { Application } from '../../alcs/application/application.entity'; -import { ApplicationService } from '../../alcs/application/application.service'; import { ApplicationSubmissionStatusService } from '../../alcs/application/application-submission-status/application-submission-status.service'; import { ApplicationSubmissionStatusType } from '../../alcs/application/application-submission-status/submission-status-type.entity'; import { SUBMISSION_STATUS } from '../../alcs/application/application-submission-status/submission-status.dto'; import { ApplicationSubmissionToSubmissionStatus } from '../../alcs/application/application-submission-status/submission-status.entity'; +import { Application } from '../../alcs/application/application.entity'; +import { ApplicationService } from '../../alcs/application/application.service'; +import { LocalGovernment } from '../../alcs/local-government/local-government.entity'; +import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; +import { OwnerType } from '../../common/owner-type/owner-type.entity'; +import { + DocumentCode, + DOCUMENT_TYPE, +} from '../../document/document-code.entity'; import { DOCUMENT_SOURCE } from '../../document/document.dto'; import { Document } from '../../document/document.entity'; import { EmailService } from '../../providers/email/email.service'; import { User } from '../../user/user.entity'; -import { OwnerType } from '../../common/owner-type/owner-type.entity'; import { ApplicationOwner } from '../application-submission/application-owner/application-owner.entity'; import { ApplicationSubmissionValidatorService, @@ -177,35 +177,6 @@ describe('ApplicationSubmissionReviewController', () => { expect(res).toBeDefined(); }); - it('should throw an exception when user loads review that is not complete', async () => { - mockLGService.getByGuid.mockResolvedValue(mockLG); - - const reviewWithApp = new ApplicationSubmissionReview({ - ...applicationReview, - }); - - mockAppReviewService.getByFileNumber.mockResolvedValue(reviewWithApp); - mockAppSubmissionService.getByFileNumber.mockResolvedValue( - new ApplicationSubmission({ - localGovernmentUuid: mockLG.uuid, - status: new ApplicationSubmissionToSubmissionStatus({ - statusTypeCode: SUBMISSION_STATUS.IN_PROGRESS, - effectiveDate: new Date(1, 1, 1), - submissionUuid: 'fake', - }), - }), - ); - - const promise = controller.get(fileNumber, { - user: { - entity: new User({}), - }, - }); - await expect(promise).rejects.toMatchObject( - new Error('Failed to load review'), - ); - }); - it('should update the applications status when calling create', async () => { mockLGService.getByGuid.mockResolvedValue(mockLG); mockAppReviewService.startReview.mockResolvedValue(applicationReview); diff --git a/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.ts b/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.ts index ebec8444d1..a808c0ec2c 100644 --- a/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.ts +++ b/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.ts @@ -29,6 +29,7 @@ import { ApplicationOwner } from '../application-submission/application-owner/ap import { ApplicationSubmissionValidatorService } from '../application-submission/application-submission-validator.service'; import { ApplicationSubmission } from '../application-submission/application-submission.entity'; import { ApplicationSubmissionService } from '../application-submission/application-submission.service'; +import { APPLICATION_SUBMISSION_TYPES } from '../pdf-generation/generate-submission-document.service'; import { ReturnApplicationSubmissionDto, UpdateApplicationSubmissionReviewDto, @@ -111,15 +112,8 @@ export class ApplicationSubmissionReviewController { ); } - if ( - ![ - SUBMISSION_STATUS.SUBMITTED_TO_ALC, - SUBMISSION_STATUS.REFUSED_TO_FORWARD_LG, - ].includes( - applicationSubmission.status.statusTypeCode as SUBMISSION_STATUS, - ) - ) { - throw new NotFoundException('Failed to load review'); + if (applicationSubmission.typeCode === APPLICATION_SUBMISSION_TYPES.TURP) { + throw new NotFoundException('Not subject to review'); } const localGovernments = await this.localGovernmentService.list(); diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.controller.spec.ts b/services/apps/alcs/src/portal/application-submission/application-submission.controller.spec.ts index c8e9baf3d4..25d591ff2a 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.controller.spec.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.controller.spec.ts @@ -4,14 +4,15 @@ import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { BadRequestException } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; import { ClsService } from 'nestjs-cls'; +import { ServiceValidationException } from '../../../../../libs/common/src/exceptions/base.exception'; import { mockKeyCloakProviders } from '../../../test/mocks/mockTypes'; -import { LocalGovernment } from '../../alcs/local-government/local-government.entity'; -import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; import { ApplicationDocumentService } from '../../alcs/application/application-document/application-document.service'; -import { Application } from '../../alcs/application/application.entity'; import { ApplicationSubmissionStatusType } from '../../alcs/application/application-submission-status/submission-status-type.entity'; import { SUBMISSION_STATUS } from '../../alcs/application/application-submission-status/submission-status.dto'; import { ApplicationSubmissionToSubmissionStatus } from '../../alcs/application/application-submission-status/submission-status.entity'; +import { Application } from '../../alcs/application/application.entity'; +import { LocalGovernment } from '../../alcs/local-government/local-government.entity'; +import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; import { ApplicationProfile } from '../../common/automapper/application.automapper.profile'; import { User } from '../../user/user.entity'; import { @@ -276,6 +277,14 @@ describe('ApplicationSubmissionController', () => { {} as ApplicationSubmissionDetailedDto, ); + mockAppSubmissionService.verifyAccessByUuid.mockResolvedValue( + new ApplicationSubmission({ + status: new ApplicationSubmissionToSubmissionStatus({ + statusTypeCode: SUBMISSION_STATUS.INCOMPLETE, + }), + }), + ); + await controller.update( 'file-id', { @@ -295,6 +304,33 @@ describe('ApplicationSubmissionController', () => { expect(mockAppSubmissionService.mapToDetailedDTO).toHaveBeenCalledTimes(1); }); + it('should throw exception on update if submission is not it in "In Progress" status ', async () => { + mockAppSubmissionService.mapToDetailedDTO.mockResolvedValue( + {} as ApplicationSubmissionDetailedDto, + ); + + const promise = controller.update( + 'file-id', + { + localGovernmentUuid, + applicant, + }, + { + user: { + entity: new User(), + }, + }, + ); + + await expect(promise).rejects.toMatchObject( + new ServiceValidationException('Not allowed to update submission'), + ); + + expect(mockAppSubmissionService.verifyAccessByUuid).toHaveBeenCalledTimes( + 1, + ); + }); + it('should call out to service on submitAlcs if application type is TURP', async () => { const mockFileId = 'file-id'; mockAppSubmissionService.submitToAlcs.mockResolvedValue(new Application()); diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.controller.ts b/services/apps/alcs/src/portal/application-submission/application-submission.controller.ts index beaa60d24b..0fd7474ca0 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.controller.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.controller.ts @@ -10,9 +10,10 @@ import { Req, UseGuards, } from '@nestjs/common'; +import { ServiceValidationException } from '../../../../../libs/common/src/exceptions/base.exception'; +import { SUBMISSION_STATUS } from '../../alcs/application/application-submission-status/submission-status.dto'; import { LocalGovernment } from '../../alcs/local-government/local-government.entity'; import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; -import { SUBMISSION_STATUS } from '../../alcs/application/application-submission-status/submission-status.dto'; import { PortalAuthGuard } from '../../common/authorization/portal-auth-guard.service'; import { User } from '../../user/user.entity'; import { ApplicationSubmissionValidatorService } from './application-submission-validator.service'; @@ -141,6 +142,17 @@ export class ApplicationSubmissionController { req.user.entity, ); + if ( + !submission.status || + ![ + SUBMISSION_STATUS.INCOMPLETE.toString(), + SUBMISSION_STATUS.WRONG_GOV.toString(), + SUBMISSION_STATUS.IN_PROGRESS.toString(), + ].includes(submission.status.statusTypeCode) + ) { + throw new ServiceValidationException('Not allowed to update submission'); + } + const updatedSubmission = await this.applicationSubmissionService.update( submission.uuid, updateDto, diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.service.ts b/services/apps/alcs/src/portal/application-submission/application-submission.service.ts index 901c03a3cf..4444f5a30d 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.service.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.service.ts @@ -7,16 +7,16 @@ import { InjectMapper } from '@automapper/nestjs'; import { forwardRef, Inject, Injectable, Logger } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { FindOptionsRelations, Repository } from 'typeorm'; -import { LocalGovernment } from '../../alcs/local-government/local-government.entity'; -import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; -import { DOCUMENT_TYPE } from '../../document/document-code.entity'; import { ApplicationDocumentService } from '../../alcs/application/application-document/application-document.service'; -import { Application } from '../../alcs/application/application.entity'; -import { ApplicationService } from '../../alcs/application/application.service'; import { ApplicationSubmissionStatusService } from '../../alcs/application/application-submission-status/application-submission-status.service'; import { ApplicationSubmissionStatusType } from '../../alcs/application/application-submission-status/submission-status-type.entity'; import { SUBMISSION_STATUS } from '../../alcs/application/application-submission-status/submission-status.dto'; +import { Application } from '../../alcs/application/application.entity'; +import { ApplicationService } from '../../alcs/application/application.service'; +import { LocalGovernment } from '../../alcs/local-government/local-government.entity'; +import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; import { ROLES_ALLOWED_APPLICATIONS } from '../../common/authorization/roles'; +import { DOCUMENT_TYPE } from '../../document/document-code.entity'; import { FileNumberService } from '../../file-number/file-number.service'; import { User } from '../../user/user.entity'; import { filterUndefined } from '../../utils/undefined'; @@ -33,10 +33,16 @@ import { ApplicationSubmission } from './application-submission.entity'; import { NaruSubtype } from './naru-subtype/naru-subtype.entity'; const LG_VISIBLE_STATUSES = [ + SUBMISSION_STATUS.INCOMPLETE, SUBMISSION_STATUS.SUBMITTED_TO_LG, SUBMISSION_STATUS.IN_REVIEW_BY_LG, - SUBMISSION_STATUS.REFUSED_TO_FORWARD_LG, SUBMISSION_STATUS.SUBMITTED_TO_ALC, + SUBMISSION_STATUS.SUBMITTED_TO_ALC_INCOMPLETE, + SUBMISSION_STATUS.RECEIVED_BY_ALC, + SUBMISSION_STATUS.IN_REVIEW_BY_ALC, + SUBMISSION_STATUS.ALC_DECISION, + SUBMISSION_STATUS.REFUSED_TO_FORWARD_LG, + SUBMISSION_STATUS.CANCELLED, ]; @Injectable() diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1691785736403-more_table_comments.ts b/services/apps/alcs/src/providers/typeorm/migrations/1691785736403-more_table_comments.ts new file mode 100644 index 0000000000..a8ad58ec54 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1691785736403-more_table_comments.ts @@ -0,0 +1,17 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class moreTableComments1691785736403 implements MigrationInterface { + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query( + ` + COMMENT ON TABLE "alcs"."board_create_card_types_card_type" IS 'Contains the type of cards can be created from each board'; + COMMENT ON TABLE "alcs"."application_submission_to_submission_status" IS 'Join table that links submission with its status'; + COMMENT ON TABLE "alcs"."application_decision_condition_component" IS 'Join table that links decision condition with decision components'; + `, + ); + } + + public async down(queryRunner: QueryRunner): Promise { + // nope + } +} From ddf3265199e586cea398791ff07def92fb23c173 Mon Sep 17 00:00:00 2001 From: Liam Stoddard Date: Fri, 11 Aug 2023 16:28:21 -0700 Subject: [PATCH 235/954] updated function name --- bin/migrate-oats-data/applications/app_prep.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/migrate-oats-data/applications/app_prep.py b/bin/migrate-oats-data/applications/app_prep.py index 0be19ec600..dd9696946c 100644 --- a/bin/migrate-oats-data/applications/app_prep.py +++ b/bin/migrate-oats-data/applications/app_prep.py @@ -216,10 +216,10 @@ def prepare_app_prep_data(app_prep_raw_data_list): elif data["alr_change_code"] == ALRChangeCode.NAR.value: nar_data_list.append(data) elif data["alr_change_code"] == ALRChangeCode.EXC.value: - data = mapOatsToAlcsLeg(data) + data = mapOatsToAlcsLegislationCode(data) exc_data_list.append(data) elif data["alr_change_code"] == ALRChangeCode.INC.value: - data = mapOatsToAlcsLeg(data) + data = mapOatsToAlcsLegislationCode(data) inc_data_list.append(data) else: other_data_list.append(data) @@ -242,7 +242,7 @@ def mapOatsToAlcsAppPrep(data): return data -def mapOatsToAlcsLeg(data): +def mapOatsToAlcsLegislationCode(data): if data["legislation_code"]: data["legislation_code"] = str( From 3d760fbfa7d1d40006e5cfb50e8724a95b74e666 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Mon, 14 Aug 2023 10:27:25 -0700 Subject: [PATCH 236/954] Add new payment fields and hook up statuses * Add more payment fields * Set statuses when setting certain fields in update * Add tooltips --- .../intake/intake.component.html | 54 +++++++++++++++---- .../intake/intake.component.scss | 11 ++-- .../intake/intake.component.ts | 2 +- .../notice-of-intent/notice-of-intent.dto.ts | 6 +++ .../notice-of-intent/notice-of-intent.dto.ts | 24 ++++++++- .../notice-of-intent.entity.ts | 26 ++++++++- .../notice-of-intent.module.ts | 2 + .../notice-of-intent.service.spec.ts | 41 +++++++++++++- .../notice-of-intent.service.ts | 50 ++++++++++++++++- .../1692030508798-add_noi_intake_fields.ts | 29 ++++++++++ 10 files changed, 225 insertions(+), 20 deletions(-) create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1692030508798-add_noi_intake_fields.ts diff --git a/alcs-frontend/src/app/features/notice-of-intent/intake/intake.component.html b/alcs-frontend/src/app/features/notice-of-intent/intake/intake.component.html index d25d278216..bce5a79543 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/intake/intake.component.html +++ b/alcs-frontend/src/app/features/notice-of-intent/intake/intake.component.html @@ -7,17 +7,44 @@
Submitted to ALC
(save)="updateDate('dateSubmittedToAlc', $event)" > - -
-
-
Fee Received Date
- +
Payment
+
+
+
Payment Date
+ +
+
+
Payment Amount
+ +
+
+
Split with L/FNG
+ +
+
+
Fee Waived
+ +
-
Acknowledged Incomplete
+
+
Acknowledged Incomplete
+ info_outline + +
Acknowledged Incomplete
-
Received All Items
+
+
Received All Items
+ info_outline + +
Boolean) + feeWaived?: boolean | null; + + @AutoMap(() => Boolean) + feeSplitWithLg?: boolean | null; + + @AutoMap(() => Number) + feeAmount?: number | null; + dateAcknowledgedIncomplete?: number; dateReceivedAllItems?: number; dateAcknowledgedComplete?: number; @@ -96,6 +106,18 @@ export class UpdateNoticeOfIntentDto { @IsNumber() feePaidDate?: number; + @IsBoolean() + @IsOptional() + feeWaived?: boolean | null; + + @IsBoolean() + @IsOptional() + feeSplitWithLg?: boolean | null; + + @IsOptional() + @IsNumber() + feeAmount?: number | null; + @IsOptional() @IsNumber() dateAcknowledgedIncomplete?: number; diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.entity.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.entity.ts index f36dfc11ac..3e3d233a1a 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.entity.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.entity.ts @@ -11,10 +11,10 @@ import { OneToOne, } from 'typeorm'; import { Base } from '../../common/entities/base.entity'; +import { ColumnNumericTransformer } from '../../utils/column-numeric-transform'; import { LocalGovernment } from '../local-government/local-government.entity'; import { Card } from '../card/card.entity'; import { ApplicationRegion } from '../code/application-code/application-region/application-region.entity'; -import { ApplicationType } from '../code/application-code/application-type/application-type.entity'; import { NoticeOfIntentType } from '../code/application-code/notice-of-intent-type/notice-of-intent-type.entity'; import { NoticeOfIntentSubtype } from './notice-of-intent-subtype.entity'; @@ -84,6 +84,30 @@ export class NoticeOfIntent extends Base { }) feePaidDate: Date | null; + @AutoMap(() => Boolean) + @Column({ + type: 'boolean', + nullable: true, + }) + feeWaived?: boolean | null; + + @AutoMap(() => Boolean) + @Column({ + type: 'boolean', + nullable: true, + }) + feeSplitWithLg?: boolean | null; + + @AutoMap(() => Number) + @Column({ + type: 'decimal', + nullable: true, + precision: 12, + scale: 2, + transformer: new ColumnNumericTransformer(), + }) + feeAmount?: number | null; + @AutoMap() @Column({ type: 'timestamptz', diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.module.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.module.ts index 8876b3f228..ffad50cbda 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.module.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.module.ts @@ -17,6 +17,7 @@ import { NoticeOfIntentMeetingType } from './notice-of-intent-meeting/notice-of- import { NoticeOfIntentMeetingController } from './notice-of-intent-meeting/notice-of-intent-meeting.controller'; import { NoticeOfIntentMeeting } from './notice-of-intent-meeting/notice-of-intent-meeting.entity'; import { NoticeOfIntentMeetingService } from './notice-of-intent-meeting/notice-of-intent-meeting.service'; +import { NoticeOfIntentSubmissionStatusModule } from './notice-of-intent-submission-status/notice-of-intent-submission-status.module'; import { NoticeOfIntentController } from './notice-of-intent.controller'; import { NoticeOfIntentSubtype } from './notice-of-intent-subtype.entity'; @@ -41,6 +42,7 @@ import { NoticeOfIntentService } from './notice-of-intent.service'; DocumentModule, CodeModule, LocalGovernmentModule, + NoticeOfIntentSubmissionStatusModule, ], providers: [ NoticeOfIntentService, diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.spec.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.spec.ts index eb5d47adc1..213ee7e109 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.spec.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.spec.ts @@ -12,8 +12,10 @@ import { CardService } from '../card/card.service'; import { ApplicationRegion } from '../code/application-code/application-region/application-region.entity'; import { NoticeOfIntentType } from '../code/application-code/notice-of-intent-type/notice-of-intent-type.entity'; import { CodeService } from '../code/code.service'; -import { LocalGovernment } from '../local-government/local-government.entity'; import { LocalGovernmentService } from '../local-government/local-government.service'; +import { NOI_SUBMISSION_STATUS } from './notice-of-intent-submission-status/notice-of-intent-status.dto'; +import { NoticeOfIntentSubmissionToSubmissionStatus } from './notice-of-intent-submission-status/notice-of-intent-status.entity'; +import { NoticeOfIntentSubmissionStatusService } from './notice-of-intent-submission-status/notice-of-intent-submission-status.service'; import { NoticeOfIntentSubtype } from './notice-of-intent-subtype.entity'; import { NoticeOfIntent } from './notice-of-intent.entity'; import { NoticeOfIntentService } from './notice-of-intent.service'; @@ -27,6 +29,7 @@ describe('NoticeOfIntentService', () => { let mockFileNumberService: DeepMocked; let mockLocalGovernmentService: DeepMocked; let mockCodeService: DeepMocked; + let mockSubmissionStatusService: DeepMocked; beforeEach(async () => { mockCardService = createMock(); @@ -36,6 +39,7 @@ describe('NoticeOfIntentService', () => { mockTypeRepository = createMock(); mockLocalGovernmentService = createMock(); mockCodeService = createMock(); + mockSubmissionStatusService = createMock(); const module: TestingModule = await Test.createTestingModule({ imports: [ @@ -74,6 +78,10 @@ describe('NoticeOfIntentService', () => { provide: CodeService, useValue: mockCodeService, }, + { + provide: NoticeOfIntentSubmissionStatusService, + useValue: mockSubmissionStatusService, + }, ], }).compile(); @@ -178,6 +186,37 @@ describe('NoticeOfIntentService', () => { expect(notice.summary).toEqual('new-summary'); }); + it('should set the X status when setting Acknowledge Complete', async () => { + const notice = new NoticeOfIntent({ + summary: 'old-summary', + }); + mockRepository.findOneOrFail.mockResolvedValue(notice); + mockRepository.save.mockResolvedValue(new NoticeOfIntent()); + mockSubmissionStatusService.setStatusDateByFileNumber.mockResolvedValue( + new NoticeOfIntentSubmissionToSubmissionStatus(), + ); + + const res = await service.update('file', { + summary: 'new-summary', + dateAcknowledgedIncomplete: 5, + }); + + expect(res).toBeDefined(); + expect(mockRepository.findOneOrFail).toHaveBeenCalledTimes(2); + expect(mockRepository.save).toHaveBeenCalledTimes(1); + expect( + mockSubmissionStatusService.setStatusDateByFileNumber, + ).toHaveBeenCalledTimes(1); + expect( + mockSubmissionStatusService.setStatusDateByFileNumber, + ).toHaveBeenCalledWith( + undefined, + NOI_SUBMISSION_STATUS.SUBMITTED_TO_ALC_INCOMPLETE, + new Date(5), + ); + expect(notice.summary).toEqual('new-summary'); + }); + it('should load deleted cards', async () => { mockRepository.find.mockResolvedValue([]); diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.ts index a33b7ba440..dea6f1754b 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.ts @@ -4,7 +4,7 @@ import { } from '@app/common/exceptions/base.exception'; import { Mapper } from '@automapper/core'; import { InjectMapper } from '@automapper/nestjs'; -import { Injectable } from '@nestjs/common'; +import { Injectable, Logger } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { FindOptionsRelations, @@ -17,7 +17,7 @@ import { import { FileNumberService } from '../../file-number/file-number.service'; import { formatIncomingDate } from '../../utils/incoming-date.formatter'; import { filterUndefined } from '../../utils/undefined'; -import { LocalGovernmentService } from '../local-government/local-government.service'; +import { SUBMISSION_STATUS } from '../application/application-submission-status/submission-status.dto'; import { ApplicationTimeData } from '../application/application-time-tracking.service'; import { Board } from '../board/board.entity'; import { CARD_TYPE } from '../card/card-type/card-type.entity'; @@ -25,6 +25,9 @@ import { Card } from '../card/card.entity'; import { CardService } from '../card/card.service'; import { NoticeOfIntentType } from '../code/application-code/notice-of-intent-type/notice-of-intent-type.entity'; import { CodeService } from '../code/code.service'; +import { LocalGovernmentService } from '../local-government/local-government.service'; +import { NOI_SUBMISSION_STATUS } from './notice-of-intent-submission-status/notice-of-intent-status.dto'; +import { NoticeOfIntentSubmissionStatusService } from './notice-of-intent-submission-status/notice-of-intent-submission-status.service'; import { NoticeOfIntentSubtype } from './notice-of-intent-subtype.entity'; import { CreateNoticeOfIntentServiceDto, @@ -35,6 +38,8 @@ import { NoticeOfIntent } from './notice-of-intent.entity'; @Injectable() export class NoticeOfIntentService { + private logger = new Logger(NoticeOfIntentService.name); + private CARD_RELATIONS = { board: true, type: true, @@ -61,6 +66,7 @@ export class NoticeOfIntentService { private fileNumberService: FileNumberService, private codeService: CodeService, private localGovernmentService: LocalGovernmentService, + private noticeOfIntentSubmissionStatusService: NoticeOfIntentSubmissionStatusService, ) {} async create( @@ -247,6 +253,21 @@ export class NoticeOfIntentService { noticeOfIntent.feePaidDate, ); + noticeOfIntent.feeWaived = filterUndefined( + updateDto.feeWaived, + noticeOfIntent.feeWaived, + ); + + noticeOfIntent.feeSplitWithLg = filterUndefined( + updateDto.feeSplitWithLg, + noticeOfIntent.feeSplitWithLg, + ); + + noticeOfIntent.feeAmount = filterUndefined( + updateDto.feeAmount, + noticeOfIntent.feeAmount, + ); + noticeOfIntent.dateSubmittedToAlc = filterUndefined( formatIncomingDate(updateDto.dateSubmittedToAlc), noticeOfIntent.dateSubmittedToAlc, @@ -259,6 +280,31 @@ export class NoticeOfIntentService { await this.repository.save(noticeOfIntent); + //Statuses + try { + if (updateDto.dateAcknowledgedIncomplete !== undefined) { + await this.noticeOfIntentSubmissionStatusService.setStatusDateByFileNumber( + noticeOfIntent.fileNumber, + NOI_SUBMISSION_STATUS.SUBMITTED_TO_ALC_INCOMPLETE, + formatIncomingDate(updateDto.dateAcknowledgedIncomplete), + ); + } + + if (updateDto.dateReceivedAllItems !== undefined) { + await this.noticeOfIntentSubmissionStatusService.setStatusDateByFileNumber( + noticeOfIntent.fileNumber, + NOI_SUBMISSION_STATUS.RECEIVED_BY_ALC, + formatIncomingDate(updateDto.dateReceivedAllItems), + ); + } + } catch (error) { + if (error instanceof ServiceNotFoundException) { + this.logger.warn(error.message, error); + } else { + throw error; + } + } + return this.getByFileNumber(noticeOfIntent.fileNumber); } diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1692030508798-add_noi_intake_fields.ts b/services/apps/alcs/src/providers/typeorm/migrations/1692030508798-add_noi_intake_fields.ts new file mode 100644 index 0000000000..098e890f2c --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1692030508798-add_noi_intake_fields.ts @@ -0,0 +1,29 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class addNoiIntakeFields1692030508798 implements MigrationInterface { + name = 'addNoiIntakeFields1692030508798'; + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent" ADD "fee_waived" boolean`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent" ADD "fee_split_with_lg" boolean`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent" ADD "fee_amount" numeric(12,2)`, + ); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent" DROP COLUMN "fee_amount"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent" DROP COLUMN "fee_split_with_lg"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent" DROP COLUMN "fee_waived"`, + ); + } +} From 5da0224ea019e466b6fdd560b12414716be939ee Mon Sep 17 00:00:00 2001 From: Liam Stoddard Date: Mon, 14 Aug 2023 11:59:43 -0700 Subject: [PATCH 237/954] commit before restructure --- bin/migrate-oats-data/applications/app_prep.py | 13 +++++++++++++ .../sql/application-prep/application_prep.sql | 6 +++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/bin/migrate-oats-data/applications/app_prep.py b/bin/migrate-oats-data/applications/app_prep.py index dd9696946c..12c3e276dc 100644 --- a/bin/migrate-oats-data/applications/app_prep.py +++ b/bin/migrate-oats-data/applications/app_prep.py @@ -251,6 +251,19 @@ def mapOatsToAlcsLegislationCode(data): return data +def get_update_query(unique_fields): + query = """ + UPDATE alcs.application + SET ag_cap = %(agri_capability_code)s, + ag_cap_map = %(agri_cap_map)s, + ag_cap_consultant = %(agri_cap_consultant)s, + alr_area = %(component_area)s, + ag_cap_source = %(capability_source_code)s, + staff_observations = %(staff_comment_observations)s + {unique_fields} + WHERE + alcs.application.file_number = %(alr_application_id)s::TEXT; +""" def get_update_query_for_nfu(): query = """ UPDATE alcs.application diff --git a/bin/migrate-oats-data/applications/sql/application-prep/application_prep.sql b/bin/migrate-oats-data/applications/sql/application-prep/application_prep.sql index 3e9649724a..00af775a77 100644 --- a/bin/migrate-oats-data/applications/sql/application-prep/application_prep.sql +++ b/bin/migrate-oats-data/applications/sql/application-prep/application_prep.sql @@ -27,7 +27,11 @@ SELECT oaac.exclsn_app_type_code, oaa.staff_comment_observations, oaac.alr_change_code, - oaac.legislation_code + oaac.legislation_code, + oaa.applied_fee_amt, + oaa.split_fee_with_local_gov_ind, + oaa.fee_waived_ind, + oaa.fee_received_date FROM appl_components_grouped acg JOIN oats.oats_alr_appl_components oaac ON oaac.alr_application_id = acg.alr_application_id From e055549a7c05ac3e05269493301abbc421448dc6 Mon Sep 17 00:00:00 2001 From: Liam Stoddard Date: Mon, 14 Aug 2023 12:16:21 -0700 Subject: [PATCH 238/954] implemented --- .../applications/app_prep.py | 153 ++++++++++-------- 1 file changed, 84 insertions(+), 69 deletions(-) diff --git a/bin/migrate-oats-data/applications/app_prep.py b/bin/migrate-oats-data/applications/app_prep.py index 12c3e276dc..a75f626ba7 100644 --- a/bin/migrate-oats-data/applications/app_prep.py +++ b/bin/migrate-oats-data/applications/app_prep.py @@ -259,98 +259,113 @@ def get_update_query(unique_fields): ag_cap_consultant = %(agri_cap_consultant)s, alr_area = %(component_area)s, ag_cap_source = %(capability_source_code)s, - staff_observations = %(staff_comment_observations)s + staff_observations = %(staff_comment_observations)s, + fee_paid_date = %(fee_received_date)s, + fee_waived = %(fee_waived_ind)s, + fee_amount = %(applied_fee_amt)s, + fee_split_with_lg = %(split_fee_with_local_gov_ind)s {unique_fields} WHERE alcs.application.file_number = %(alr_application_id)s::TEXT; -""" -def get_update_query_for_nfu(): - query = """ - UPDATE alcs.application - SET ag_cap = %(agri_capability_code)s, - ag_cap_map = %(agri_cap_map)s, - ag_cap_consultant = %(agri_cap_consultant)s, - alr_area = %(component_area)s, - ag_cap_source = %(capability_source_code)s, - nfu_use_type = %(nonfarm_use_type_code)s, - nfu_use_sub_type = %(nonfarm_use_subtype_code)s, - proposal_end_date = %(nonfarm_use_end_date)s, - staff_observations = %(staff_comment_observations)s - WHERE - alcs.application.file_number = %(alr_application_id)s::text; """ - return query + return query.format(unique_fields=unique_fields) + +def get_update_query_for_nfu(): + # query = """ + # UPDATE alcs.application + # SET ag_cap = %(agri_capability_code)s, + # ag_cap_map = %(agri_cap_map)s, + # ag_cap_consultant = %(agri_cap_consultant)s, + # alr_area = %(component_area)s, + # ag_cap_source = %(capability_source_code)s, + # nfu_use_type = %(nonfarm_use_type_code)s, + # nfu_use_sub_type = %(nonfarm_use_subtype_code)s, + # proposal_end_date = %(nonfarm_use_end_date)s, + # staff_observations = %(staff_comment_observations)s + # WHERE + # alcs.application.file_number = %(alr_application_id)s::text; + # """ + # return query + unique_fields =",\n nfu_use_type = %(nonfarm_use_type_code)s,\n nfu_use_sub_type = %(nonfarm_use_subtype_code)s,\n proposal_end_date = %(nonfarm_use_end_date)s" + return get_update_query(unique_fields) def get_update_query_for_nar(): # naruSubtype is a part of submission, import there - query = """ - UPDATE alcs.application - SET ag_cap = %(agri_capability_code)s, - ag_cap_map = %(agri_cap_map)s, - ag_cap_consultant = %(agri_cap_consultant)s, - alr_area = %(component_area)s, - ag_cap_source = %(capability_source_code)s, - proposal_end_date = %(rsdntl_use_end_date)s, - staff_observations = %(staff_comment_observations)s - WHERE - alcs.application.file_number = %(alr_application_id)s::text; - """ - return query + # query = """ + # UPDATE alcs.application + # SET ag_cap = %(agri_capability_code)s, + # ag_cap_map = %(agri_cap_map)s, + # ag_cap_consultant = %(agri_cap_consultant)s, + # alr_area = %(component_area)s, + # ag_cap_source = %(capability_source_code)s, + # proposal_end_date = %(rsdntl_use_end_date)s, + # staff_observations = %(staff_comment_observations)s + # WHERE + # alcs.application.file_number = %(alr_application_id)s::text; + # """ + # return query + unique_fields = ",\n proposal_end_date = %(rsdntl_use_end_date)s" + return get_update_query(unique_fields) def get_update_query_for_exc(): # TODO Will be finalized in ALCS-834. # exclsn_app_type_code is out of scope. It is a part of submission - query = """ - UPDATE alcs.application - SET ag_cap = %(agri_capability_code)s, - ag_cap_map = %(agri_cap_map)s, - ag_cap_consultant = %(agri_cap_consultant)s, - alr_area = %(component_area)s, - ag_cap_source = %(capability_source_code)s, - staff_observations = %(staff_comment_observations)s, - incl_excl_applicant_type = %(legislation_code)s + # query = """ + # UPDATE alcs.application + # SET ag_cap = %(agri_capability_code)s, + # ag_cap_map = %(agri_cap_map)s, + # ag_cap_consultant = %(agri_cap_consultant)s, + # alr_area = %(component_area)s, + # ag_cap_source = %(capability_source_code)s, + # staff_observations = %(staff_comment_observations)s, + # incl_excl_applicant_type = %(legislation_code)s - WHERE - alcs.application.file_number = %(alr_application_id)s::text; - """ - return query + # WHERE + # alcs.application.file_number = %(alr_application_id)s::text; + # """ + # return query + unique_fields = ",\n incl_excl_applicant_type = %(legislation_code)s" + return get_update_query(unique_fields) def get_update_query_for_inc(): # TODO Will be finalized in ALCS-834. - query = """ - UPDATE alcs.application - SET ag_cap = %(agri_capability_code)s, - ag_cap_map = %(agri_cap_map)s, - ag_cap_consultant = %(agri_cap_consultant)s, - alr_area = %(component_area)s, - ag_cap_source = %(capability_source_code)s, - staff_observations = %(staff_comment_observations)s, - incl_excl_applicant_type = %(legislation_code)s + # query = """ + # UPDATE alcs.application + # SET ag_cap = %(agri_capability_code)s, + # ag_cap_map = %(agri_cap_map)s, + # ag_cap_consultant = %(agri_cap_consultant)s, + # alr_area = %(component_area)s, + # ag_cap_source = %(capability_source_code)s, + # staff_observations = %(staff_comment_observations)s, + # incl_excl_applicant_type = %(legislation_code)s - WHERE - alcs.application.file_number = %(alr_application_id)s::text; - """ - return query + # WHERE + # alcs.application.file_number = %(alr_application_id)s::text; + # """ + # return query + unique_fields = ",\n incl_excl_applicant_type = %(legislation_code)s" + return get_update_query(unique_fields) def get_update_query_for_other(): - query = """ - UPDATE alcs.application - SET ag_cap = %(agri_capability_code)s, - ag_cap_map = %(agri_cap_map)s, - ag_cap_consultant = %(agri_cap_consultant)s, - alr_area = %(component_area)s, - ag_cap_source = %(capability_source_code)s, - staff_observations = %(staff_comment_observations)s - WHERE - alcs.application.file_number = %(alr_application_id)s::text; - """ - return query - + # query = """ + # UPDATE alcs.application + # SET ag_cap = %(agri_capability_code)s, + # ag_cap_map = %(agri_cap_map)s, + # ag_cap_consultant = %(agri_cap_consultant)s, + # alr_area = %(component_area)s, + # ag_cap_source = %(capability_source_code)s, + # staff_observations = %(staff_comment_observations)s + # WHERE + # alcs.application.file_number = %(alr_application_id)s::text; + # """ + # return query + unique_fields = "" + return get_update_query(unique_fields) def map_oats_to_alcs_nfu_subtypes(nfu_type_code, nfu_subtype_code): for dict_obj in OATS_NFU_SUBTYPES: From fed109308c3e098a2e0e5484e56e49bf11f5cb6a Mon Sep 17 00:00:00 2001 From: Liam Stoddard Date: Mon, 14 Aug 2023 12:37:45 -0700 Subject: [PATCH 239/954] updated validation & confirmed functionality --- .../application_prep_basic_validation.sql | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/bin/migrate-oats-data/applications/sql/application-prep/application_prep_basic_validation.sql b/bin/migrate-oats-data/applications/sql/application-prep/application_prep_basic_validation.sql index 0e3767c3de..a4bda71aed 100644 --- a/bin/migrate-oats-data/applications/sql/application-prep/application_prep_basic_validation.sql +++ b/bin/migrate-oats-data/applications/sql/application-prep/application_prep_basic_validation.sql @@ -37,7 +37,11 @@ oats_app_prep_data AS ( WHEN oaac.legislation_code = 'SEC_17_3' THEN 'Land Owner' WHEN oaac.legislation_code = 'SEC_17_1' THEN 'L/FNG Initiated' ELSE oaac.legislation_code - END AS mapped_legislation + END AS mapped_legislation, + split_fee_with_local_gov_ind AS fee_lg, + fee_received_date AS fee_date, + fee_waived_ind AS fee_waived, + applied_fee_amt AS fee_amount FROM appl_components_grouped acg JOIN oats.oats_alr_appl_components oaac ON oaac.alr_application_id = acg.alr_application_id JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = acg.alr_application_id @@ -62,7 +66,13 @@ SELECT oapd.alr_application_id, oapd.staff_comment_observations, oapd.nonfarm_use_type_description, oapd.mapped_nonfarm_use_subtype_description, - oapd.mapped_legislation + oapd.mapped_legislation, + oapd.fee_date, + oapd.fee_amount, + a.fee_split_with_lg, + oapd.fee_lg, + oapd.fee_waived, + a.fee_waived FROM alcs.application a LEFT JOIN oats_app_prep_data AS oapd ON a.file_number = oapd.alr_application_id::TEXT WHERE a.alr_area != oapd.component_area @@ -70,4 +80,5 @@ WHERE a.alr_area != oapd.component_area OR a.ag_cap_consultant != oapd.agri_cap_consultant OR a.staff_observations != oapd.staff_comment_observations OR a.nfu_use_sub_type != oapd.mapped_nonfarm_use_subtype_description - OR a.incl_excl_applicant_type != oapd.mapped_legislation \ No newline at end of file + OR a.incl_excl_applicant_type != oapd.mapped_legislation + OR a.fee_amount != oapd.fee_amount \ No newline at end of file From e286416d73285e1356fe07ffd9ef592d0baa8e86 Mon Sep 17 00:00:00 2001 From: Liam Stoddard Date: Mon, 14 Aug 2023 12:52:27 -0700 Subject: [PATCH 240/954] cleaned up code for MR --- .../applications/app_prep.py | 88 +++---------------- 1 file changed, 13 insertions(+), 75 deletions(-) diff --git a/bin/migrate-oats-data/applications/app_prep.py b/bin/migrate-oats-data/applications/app_prep.py index a75f626ba7..73840819f4 100644 --- a/bin/migrate-oats-data/applications/app_prep.py +++ b/bin/migrate-oats-data/applications/app_prep.py @@ -252,6 +252,7 @@ def mapOatsToAlcsLegislationCode(data): return data def get_update_query(unique_fields): + # unique_fields takes input from called function and appends to query query = """ UPDATE alcs.application SET ag_cap = %(agri_capability_code)s, @@ -271,100 +272,37 @@ def get_update_query(unique_fields): return query.format(unique_fields=unique_fields) def get_update_query_for_nfu(): - # query = """ - # UPDATE alcs.application - # SET ag_cap = %(agri_capability_code)s, - # ag_cap_map = %(agri_cap_map)s, - # ag_cap_consultant = %(agri_cap_consultant)s, - # alr_area = %(component_area)s, - # ag_cap_source = %(capability_source_code)s, - # nfu_use_type = %(nonfarm_use_type_code)s, - # nfu_use_sub_type = %(nonfarm_use_subtype_code)s, - # proposal_end_date = %(nonfarm_use_end_date)s, - # staff_observations = %(staff_comment_observations)s - # WHERE - # alcs.application.file_number = %(alr_application_id)s::text; - # """ - # return query - unique_fields =",\n nfu_use_type = %(nonfarm_use_type_code)s,\n nfu_use_sub_type = %(nonfarm_use_subtype_code)s,\n proposal_end_date = %(nonfarm_use_end_date)s" + unique_fields = """, + nfu_use_type = %(nonfarm_use_type_code)s, + nfu_use_sub_type = %(nonfarm_use_subtype_code)s, + proposal_end_date = %(nonfarm_use_end_date)s""" return get_update_query(unique_fields) - def get_update_query_for_nar(): # naruSubtype is a part of submission, import there - # query = """ - # UPDATE alcs.application - # SET ag_cap = %(agri_capability_code)s, - # ag_cap_map = %(agri_cap_map)s, - # ag_cap_consultant = %(agri_cap_consultant)s, - # alr_area = %(component_area)s, - # ag_cap_source = %(capability_source_code)s, - # proposal_end_date = %(rsdntl_use_end_date)s, - # staff_observations = %(staff_comment_observations)s - # WHERE - # alcs.application.file_number = %(alr_application_id)s::text; - # """ - # return query - unique_fields = ",\n proposal_end_date = %(rsdntl_use_end_date)s" + unique_fields = """, + proposal_end_date = %(rsdntl_use_end_date)s""" return get_update_query(unique_fields) def get_update_query_for_exc(): # TODO Will be finalized in ALCS-834. # exclsn_app_type_code is out of scope. It is a part of submission - - # query = """ - # UPDATE alcs.application - # SET ag_cap = %(agri_capability_code)s, - # ag_cap_map = %(agri_cap_map)s, - # ag_cap_consultant = %(agri_cap_consultant)s, - # alr_area = %(component_area)s, - # ag_cap_source = %(capability_source_code)s, - # staff_observations = %(staff_comment_observations)s, - # incl_excl_applicant_type = %(legislation_code)s - - # WHERE - # alcs.application.file_number = %(alr_application_id)s::text; - # """ - # return query - unique_fields = ",\n incl_excl_applicant_type = %(legislation_code)s" + unique_fields = """, + incl_excl_applicant_type = %(legislation_code)s""" return get_update_query(unique_fields) def get_update_query_for_inc(): # TODO Will be finalized in ALCS-834. - # query = """ - # UPDATE alcs.application - # SET ag_cap = %(agri_capability_code)s, - # ag_cap_map = %(agri_cap_map)s, - # ag_cap_consultant = %(agri_cap_consultant)s, - # alr_area = %(component_area)s, - # ag_cap_source = %(capability_source_code)s, - # staff_observations = %(staff_comment_observations)s, - # incl_excl_applicant_type = %(legislation_code)s - - # WHERE - # alcs.application.file_number = %(alr_application_id)s::text; - # """ - # return query - unique_fields = ",\n incl_excl_applicant_type = %(legislation_code)s" + unique_fields = """, + incl_excl_applicant_type = %(legislation_code)s""" return get_update_query(unique_fields) def get_update_query_for_other(): - # query = """ - # UPDATE alcs.application - # SET ag_cap = %(agri_capability_code)s, - # ag_cap_map = %(agri_cap_map)s, - # ag_cap_consultant = %(agri_cap_consultant)s, - # alr_area = %(component_area)s, - # ag_cap_source = %(capability_source_code)s, - # staff_observations = %(staff_comment_observations)s - # WHERE - # alcs.application.file_number = %(alr_application_id)s::text; - # """ - # return query - unique_fields = "" + # leaving blank insert for now + unique_fields = """""" return get_update_query(unique_fields) def map_oats_to_alcs_nfu_subtypes(nfu_type_code, nfu_subtype_code): From 31356a542562c59e651a2ee230413b17f686af16 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Mon, 14 Aug 2023 13:27:09 -0700 Subject: [PATCH 241/954] Add Step 8 for NOI + Roso Add Step 8 for NOIs and ROSO Proposal, not including Step 6 --- .../review-and-submit.component.spec.ts | 8 - .../review-and-submit.component.ts | 4 +- .../edit-submission-base.module.ts | 8 + .../edit-submission.component.html | 10 +- .../edit-submission.component.spec.ts | 7 + .../edit-submission.component.ts | 43 +++ .../review-and-submit.component.html | 33 +++ .../review-and-submit.component.scss | 0 .../review-and-submit.component.spec.ts | 57 ++++ .../review-and-submit.component.ts | 67 +++++ .../submit-confirmation-dialog.component.html | 40 +++ .../submit-confirmation-dialog.component.scss | 18 ++ ...bmit-confirmation-dialog.component.spec.ts | 39 +++ .../submit-confirmation-dialog.component.ts | 16 ++ .../notice-of-intent-details.component.html | 263 ++++++++++++++++++ .../notice-of-intent-details.component.scss | 143 ++++++++++ ...notice-of-intent-details.component.spec.ts | 71 +++++ .../notice-of-intent-details.component.ts | 120 ++++++++ .../notice-of-intent-details.module.ts | 14 + .../parcel/parcel.component.html | 171 ++++++++++++ .../parcel/parcel.component.scss | 39 +++ .../parcel/parcel.component.spec.ts | 59 ++++ .../parcel/parcel.component.ts | 222 +++++++++++++++ .../roso-details/roso-details.component.html | 186 +++++++++++++ .../roso-details/roso-details.component.scss | 9 + .../roso-details.component.spec.ts | 40 +++ .../roso-details/roso-details.component.ts | 55 ++++ .../file-drag-drop.component.html | 6 +- 28 files changed, 1732 insertions(+), 16 deletions(-) create mode 100644 portal-frontend/src/app/features/notice-of-intents/edit-submission/review-and-submit/review-and-submit.component.html create mode 100644 portal-frontend/src/app/features/notice-of-intents/edit-submission/review-and-submit/review-and-submit.component.scss create mode 100644 portal-frontend/src/app/features/notice-of-intents/edit-submission/review-and-submit/review-and-submit.component.spec.ts create mode 100644 portal-frontend/src/app/features/notice-of-intents/edit-submission/review-and-submit/review-and-submit.component.ts create mode 100644 portal-frontend/src/app/features/notice-of-intents/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.html create mode 100644 portal-frontend/src/app/features/notice-of-intents/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.scss create mode 100644 portal-frontend/src/app/features/notice-of-intents/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.spec.ts create mode 100644 portal-frontend/src/app/features/notice-of-intents/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.ts create mode 100644 portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.html create mode 100644 portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.scss create mode 100644 portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.spec.ts create mode 100644 portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.ts create mode 100644 portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.module.ts create mode 100644 portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/parcel/parcel.component.html create mode 100644 portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/parcel/parcel.component.scss create mode 100644 portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/parcel/parcel.component.spec.ts create mode 100644 portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/parcel/parcel.component.ts create mode 100644 portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/roso-details/roso-details.component.html create mode 100644 portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/roso-details/roso-details.component.scss create mode 100644 portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/roso-details/roso-details.component.spec.ts create mode 100644 portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/roso-details/roso-details.component.ts diff --git a/portal-frontend/src/app/features/applications/edit-submission/review-and-submit/review-and-submit.component.spec.ts b/portal-frontend/src/app/features/applications/edit-submission/review-and-submit/review-and-submit.component.spec.ts index acf4ab4aad..a4199f8aca 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/review-and-submit/review-and-submit.component.spec.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/review-and-submit/review-and-submit.component.spec.ts @@ -44,14 +44,6 @@ describe('ReviewAndSubmitComponent', () => { provide: PdfGenerationService, useValue: {}, }, - { - provide: MatDialog, - useValue: {}, - }, - { - provide: CodeService, - useValue: {}, - }, ], }).compileComponents(); diff --git a/portal-frontend/src/app/features/applications/edit-submission/review-and-submit/review-and-submit.component.ts b/portal-frontend/src/app/features/applications/edit-submission/review-and-submit/review-and-submit.component.ts index 49dbe47874..fc122f5c0b 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/review-and-submit/review-and-submit.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/review-and-submit/review-and-submit.component.ts @@ -28,9 +28,7 @@ export class ReviewAndSubmitComponent extends StepComponent implements OnInit, O private router: Router, private toastService: ToastService, private applicationService: ApplicationSubmissionService, - private pdfGenerationService: PdfGenerationService, - private codeService: CodeService, - private dialog: MatDialog + private pdfGenerationService: PdfGenerationService ) { super(); } diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission-base.module.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission-base.module.ts index 224d720b0d..f544a4d2f2 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission-base.module.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission-base.module.ts @@ -8,6 +8,7 @@ import { MatSelectModule } from '@angular/material/select'; import { MatTableModule } from '@angular/material/table'; import { NgxMaskDirective, NgxMaskPipe } from 'ngx-mask'; import { SharedModule } from '../../../shared/shared.module'; +import { NoticeOfIntentDetailsModule } from '../notice-of-intent-details/notice-of-intent-details.module'; import { EditSubmissionComponent } from './edit-submission.component'; import { LandUseComponent } from './land-use/land-use.component'; import { OtherAttachmentsComponent } from './other-attachments/other-attachments.component'; @@ -17,6 +18,8 @@ import { ParcelEntryConfirmationDialogComponent } from './parcels/parcel-entry/p import { ParcelEntryComponent } from './parcels/parcel-entry/parcel-entry.component'; import { PrimaryContactComponent } from './primary-contact/primary-contact.component'; import { RosoProposalComponent } from './proposal/roso/roso-proposal.component'; +import { ReviewAndSubmitComponent } from './review-and-submit/review-and-submit.component'; +import { SubmitConfirmationDialogComponent } from './review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component'; import { SelectGovernmentComponent } from './select-government/select-government.component'; @NgModule({ @@ -31,6 +34,7 @@ import { SelectGovernmentComponent } from './select-government/select-government MatOptionModule, MatSelectModule, MatTableModule, + NoticeOfIntentDetailsModule, ], declarations: [ EditSubmissionComponent, @@ -43,6 +47,8 @@ import { SelectGovernmentComponent } from './select-government/select-government LandUseComponent, OtherAttachmentsComponent, RosoProposalComponent, + ReviewAndSubmitComponent, + SubmitConfirmationDialogComponent, ], exports: [ EditSubmissionComponent, @@ -55,6 +61,8 @@ import { SelectGovernmentComponent } from './select-government/select-government LandUseComponent, OtherAttachmentsComponent, RosoProposalComponent, + ReviewAndSubmitComponent, + SubmitConfirmationDialogComponent, ], }) export class EditSubmissionBaseModule {} diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.html index f608c3e8be..46b5f6be22 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.html @@ -83,7 +83,6 @@
Notice of Intent ID: {{ noiSubmission.fileNumber }} | [$noiSubmission]="$noiSubmission" [$noiDocuments]="$noiDocuments" [showErrors]="showValidationErrors" - [draftMode]="true" (navigateToStep)="switchStep($event)" (exit)="onExit()" > @@ -108,6 +107,13 @@
Notice of Intent ID: {{ noiSubmission.fileNumber }} | -
Review and Submit
+
+ +
diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.spec.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.spec.ts index 70c4567d05..46cbe54919 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.spec.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.spec.ts @@ -1,6 +1,8 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MatDialog } from '@angular/material/dialog'; import { ActivatedRoute } from '@angular/router'; +import { CodeService } from '../../../services/code/code.service'; import { NoticeOfIntentDocumentService } from '../../../services/notice-of-intent-document/notice-of-intent-document.service'; import { NoticeOfIntentSubmissionService } from '../../../services/notice-of-intent-submission/notice-of-intent-submission.service'; import { ToastService } from '../../../services/toast/toast.service'; @@ -35,7 +37,12 @@ describe('EditSubmissionComponent', () => { provide: MatDialog, useValue: {}, }, + { + provide: CodeService, + useValue: {}, + }, ], + schemas: [NO_ERRORS_SCHEMA], }).compileComponents(); fixture = TestBed.createComponent(EditSubmissionComponent); diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.ts index a0cd07b3d8..c46203b65c 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.ts @@ -3,6 +3,7 @@ import { AfterViewInit, Component, OnDestroy, ViewChild } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; import { ActivatedRoute, Router } from '@angular/router'; import { BehaviorSubject, combineLatest, Observable, of, Subject, takeUntil } from 'rxjs'; +import { CodeService } from '../../../services/code/code.service'; import { NoticeOfIntentDocumentDto } from '../../../services/notice-of-intent-document/notice-of-intent-document.dto'; import { NoticeOfIntentDocumentService } from '../../../services/notice-of-intent-document/notice-of-intent-document.service'; import { NoticeOfIntentSubmissionDetailedDto } from '../../../services/notice-of-intent-submission/notice-of-intent-submission.dto'; @@ -16,6 +17,7 @@ import { OtherAttachmentsComponent } from './other-attachments/other-attachments import { ParcelDetailsComponent } from './parcels/parcel-details.component'; import { PrimaryContactComponent } from './primary-contact/primary-contact.component'; import { RosoProposalComponent } from './proposal/roso/roso-proposal.component'; +import { SubmitConfirmationDialogComponent } from './review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component'; import { SelectGovernmentComponent } from './select-government/select-government.component'; export enum EditNoiSteps { @@ -58,6 +60,7 @@ export class EditSubmissionComponent implements OnDestroy, AfterViewInit { constructor( private noticeOfIntentSubmissionService: NoticeOfIntentSubmissionService, private noticeOfIntentDocumentService: NoticeOfIntentDocumentService, + private codeService: CodeService, private activatedRoute: ActivatedRoute, private dialog: MatDialog, private toastService: ToastService, @@ -150,6 +153,9 @@ export class EditSubmissionComponent implements OnDestroy, AfterViewInit { await this.rosoProposalComponent.onSave(); } break; + case EditNoiSteps.ReviewAndSubmit: + //DO NOTHING + break; default: this.toastService.showErrorToast('Error updating notice of intent.'); } @@ -165,6 +171,43 @@ export class EditSubmissionComponent implements OnDestroy, AfterViewInit { //TODO: Hook this up later } + async onSubmit() { + if (this.noiSubmission) { + const government = await this.loadGovernment(this.noiSubmission.localGovernmentUuid); + this.dialog + .open(SubmitConfirmationDialogComponent, { + data: { + governmentName: government?.name ?? 'selected local / first nation government', + }, + }) + .beforeClosed() + .subscribe((didConfirm) => { + if (didConfirm) { + this.submit(); + } + }); + } + } + + private async submit() { + const submission = this.noiSubmission; + if (submission) { + const didSubmit = await this.noticeOfIntentSubmissionService.submitToAlcs(submission.uuid); + if (didSubmit) { + await this.router.navigateByUrl(`/notice-of-intent/${submission?.fileNumber}`); + } + } + } + + private async loadGovernment(uuid: string) { + const codes = await this.codeService.loadCodes(); + const localGovernment = codes.localGovernments.find((a) => a.uuid === uuid); + if (localGovernment) { + return localGovernment; + } + return; + } + private async loadSubmission(fileId: string, reload = false) { if (!this.noiSubmission || reload) { this.overlayService.showSpinner(); diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/review-and-submit/review-and-submit.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/review-and-submit/review-and-submit.component.html new file mode 100644 index 0000000000..9e095b9717 --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/review-and-submit/review-and-submit.component.html @@ -0,0 +1,33 @@ +
+ +
+ +
+ +
+ + + +
+ + +
+
+
diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/review-and-submit/review-and-submit.component.scss b/portal-frontend/src/app/features/notice-of-intents/edit-submission/review-and-submit/review-and-submit.component.scss new file mode 100644 index 0000000000..e69de29bb2 diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/review-and-submit/review-and-submit.component.spec.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/review-and-submit/review-and-submit.component.spec.ts new file mode 100644 index 0000000000..d1c2937991 --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/review-and-submit/review-and-submit.component.spec.ts @@ -0,0 +1,57 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { Router } from '@angular/router'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { BehaviorSubject } from 'rxjs'; +import { NoticeOfIntentSubmissionDetailedDto } from '../../../../services/notice-of-intent-submission/notice-of-intent-submission.dto'; +import { NoticeOfIntentSubmissionService } from '../../../../services/notice-of-intent-submission/notice-of-intent-submission.service'; +import { PdfGenerationService } from '../../../../services/pdf-generation/pdf-generation.service'; +import { ToastService } from '../../../../services/toast/toast.service'; + +import { ReviewAndSubmitComponent } from './review-and-submit.component'; + +describe('ReviewAndSubmitComponent', () => { + let component: ReviewAndSubmitComponent; + let fixture: ComponentFixture; + let mockToastService: DeepMocked; + let mockRouter: DeepMocked; + let mockNoiSubmissionService: DeepMocked; + + beforeEach(async () => { + mockToastService = createMock(); + mockRouter = createMock(); + mockNoiSubmissionService = createMock(); + + await TestBed.configureTestingModule({ + declarations: [ReviewAndSubmitComponent], + schemas: [NO_ERRORS_SCHEMA], + providers: [ + { + provide: ToastService, + useValue: mockToastService, + }, + { + provide: Router, + useValue: mockRouter, + }, + { + provide: NoticeOfIntentSubmissionService, + useValue: mockNoiSubmissionService, + }, + { + provide: PdfGenerationService, + useValue: {}, + }, + ], + }).compileComponents(); + + fixture = TestBed.createComponent(ReviewAndSubmitComponent); + component = fixture.componentInstance; + component.$noiSubmission = new BehaviorSubject(undefined); + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/review-and-submit/review-and-submit.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/review-and-submit/review-and-submit.component.ts new file mode 100644 index 0000000000..73b9b2c006 --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/review-and-submit/review-and-submit.component.ts @@ -0,0 +1,67 @@ +import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core'; +import { Router } from '@angular/router'; +import { BehaviorSubject, takeUntil } from 'rxjs'; +import { NoticeOfIntentDocumentDto } from '../../../../services/notice-of-intent-document/notice-of-intent-document.dto'; +import { NoticeOfIntentSubmissionDetailedDto } from '../../../../services/notice-of-intent-submission/notice-of-intent-submission.dto'; +import { NoticeOfIntentSubmissionService } from '../../../../services/notice-of-intent-submission/notice-of-intent-submission.service'; +import { PdfGenerationService } from '../../../../services/pdf-generation/pdf-generation.service'; +import { ToastService } from '../../../../services/toast/toast.service'; +import { StepComponent } from '../step.partial'; + +@Component({ + selector: 'app-review-and-submit', + templateUrl: './review-and-submit.component.html', + styleUrls: ['./review-and-submit.component.scss'], +}) +export class ReviewAndSubmitComponent extends StepComponent implements OnInit, OnDestroy { + @Input() $noiDocuments!: BehaviorSubject; + @Input() updatedFields: string[] = []; + @Input() originalSubmissionUuid = ''; + @Output() submit = new EventEmitter(); + + noiSubmission: NoticeOfIntentSubmissionDetailedDto | undefined; + + constructor( + private router: Router, + private toastService: ToastService, + private applicationService: NoticeOfIntentSubmissionService, + private pdfGenerationService: PdfGenerationService + ) { + super(); + } + + ngOnInit(): void { + this.$noiSubmission.pipe(takeUntil(this.$destroy)).subscribe((submission) => { + this.noiSubmission = submission; + }); + } + + override async onNavigateToStep(step: number) { + if (this.draftMode) { + await this.router.navigateByUrl(`alcs/application/${this.noiSubmission?.fileNumber}/edit/${step}?errors=t`); + } else { + await this.router.navigateByUrl(`application/${this.noiSubmission?.fileNumber}/edit/${step}?errors=t`); + } + } + + async onSubmitToAlcs() { + if (this.noiSubmission) { + const el = document.getElementsByClassName('error'); + if (el && el.length > 0) { + el[0].scrollIntoView({ + behavior: 'smooth', + block: 'center', + }); + this.toastService.showErrorToast('Please correct all errors before submitting the form'); + } else { + this.submit.emit(); + } + } + } + + async onDownloadPdf(fileNumber: string | undefined) { + if (fileNumber) { + await this.pdfGenerationService.generateSubmission(fileNumber); + } + } +} diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.html new file mode 100644 index 0000000000..6f76d04448 --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.html @@ -0,0 +1,40 @@ +
+

Submit Application

+
+ +
+

Your notice of intent will be submitted to the {{ data.governmentName }}.

+
+
Terms and Conditions:
+ + I/we consent to the use of the information provided in the application and all supporting documents to process the + notice of intent in accordance with the Agricultural Land Commission Act, the Agricultural Land Reserve General + Regulation, and the Agricultural Land Reserve Use Regulation. + + + I/we declare that the information provided in the notice of intent and all the supporting documents are, to the + best of my/our knowledge, true and correct. + + + I/we understand that the Agricultural Land Commission will take the steps necessary to confirm the accuracy of the + information and documents provided. This information will be available for review by any member of the public. + +
+

+ If you have any questions about the collection or use of this information, please contact the Agricultural Land + Commission. +

+
+
+ + +
+
+
diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.scss b/portal-frontend/src/app/features/notice-of-intents/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.scss new file mode 100644 index 0000000000..93f22cbbcb --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.scss @@ -0,0 +1,18 @@ +@use '../../../../../../styles/functions' as *; + +.checkbox { + margin: rem(10) 0; +} + +p { + margin: rem(28) 0 !important; +} + +.step-controls { + display: flex; + justify-content: flex-end; + + button:not(:last-child) { + margin-right: rem(16) !important; + } +} diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.spec.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.spec.ts new file mode 100644 index 0000000000..7d6d06ed68 --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.spec.ts @@ -0,0 +1,39 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { MAT_DIALOG_DATA, MatDialog, MatDialogRef } from '@angular/material/dialog'; +import { SubmitConfirmationDialogComponent } from './submit-confirmation-dialog.component'; + +describe('SubmitConfirmationDialogComponent', () => { + let component: SubmitConfirmationDialogComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [SubmitConfirmationDialogComponent], + providers: [ + { + provide: MatDialog, + useValue: {}, + }, + { + provide: MatDialogRef, + useValue: {}, + }, + { + provide: MAT_DIALOG_DATA, + useValue: {}, + }, + ], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(SubmitConfirmationDialogComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.ts new file mode 100644 index 0000000000..cf84e55daa --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.ts @@ -0,0 +1,16 @@ +import { Component, Inject } from '@angular/core'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; + +@Component({ + selector: 'app-submit-confirmation-dialog', + templateUrl: './submit-confirmation-dialog.component.html', + styleUrls: ['./submit-confirmation-dialog.component.scss'], +}) +export class SubmitConfirmationDialogComponent { + constructor( + @Inject(MAT_DIALOG_DATA) + protected data: { + governmentName: string; + } + ) {} +} diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.html b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.html new file mode 100644 index 0000000000..d4ad467c8f --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.html @@ -0,0 +1,263 @@ +
+ +
+
+

2. Primary Contact

+ + Changes made to this section will not be flagged as + - ensure accuracy before saving. + +
+
Type
+
+ {{ primaryContact?.type?.label }} + +
+
First Name
+
+ {{ primaryContact?.firstName }} + +
+
Last Name
+
+ {{ primaryContact?.lastName }} + +
+
+ Organization (optional) + Ministry/Department Responsible + Department +
+
+ {{ primaryContact?.organizationName }} + +
+
Phone
+
+ {{ primaryContact?.phoneNumber }} + + Invalid Format +
+
Email
+
+ {{ primaryContact?.email }} + + Invalid Format +
+ +
Authorization Letter(s)
+
+ + + + Authorization letters are not required, please remove them + +
+ +
+ +
+
+
+
+

3. Government

+
+
+ Local or First Nation Government + +
+
+ {{ localGovernment?.name }} + + + This Local/First Nation Government has not yet been set up with the ALC Portal to receive notice of intents. To + submit, you will need to contact the ALC directly:  ALC.Portal@gov.bc.ca / 236-468-3342 + +
+
+ +
+
+
+
+

4. Land Use

+
+
+

Land Use of Parcel(s) under Notice of Intent

+
+
+ Quantify and describe in detail all agriculture that currently takes place on the parcel(s). + +
+
+ {{ noiSubmission.parcelsAgricultureDescription }} + +
+
+ Quantify and describe in detail all agricultural improvements made to the parcel(s). + +
+
+ {{ noiSubmission.parcelsAgricultureImprovementDescription }} + +
+
+ Quantify and describe all non-agricultural uses that currently take place on the parcel(s). + +
+
+ {{ noiSubmission.parcelsNonAgricultureUseDescription }} + +
+
+

+ Land Use of Adjacent Parcels + +

+
+
+
+
Main Land Use Type
+
Specific Activity
+
North
+
+ {{ noiSubmission.northLandUseType }} + +
+
+ {{ noiSubmission.northLandUseTypeDescription }} + +
+
East
+
+ {{ noiSubmission.eastLandUseType }} + +
+
+ {{ noiSubmission.eastLandUseTypeDescription }} + +
+
South
+
+ {{ noiSubmission.southLandUseType }} + +
+
+ {{ noiSubmission.southLandUseTypeDescription }} + +
+
West
+
+ {{ noiSubmission.westLandUseType }} + +
+
+ {{ noiSubmission.westLandUseTypeDescription }} + +
+
+
+ +
+
+
+
+

5. Proposal

+ +
+
+

6. Additional Information

+ TODO +
+
+

7. Optional Documents

+
+
+
Type
+
Description
+
File Name
+ +
+ {{ file.type?.label }} + +
+
+ {{ file.description }} + +
+
+ {{ file.fileName }} +
+ +
+ +
+
+
+ +
+
+
diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.scss b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.scss new file mode 100644 index 0000000000..8df832ca0f --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.scss @@ -0,0 +1,143 @@ +@use '../../../../styles/functions' as *; +@use '../../../../styles/colors'; + +:host::ng-deep { + .view-grid-item { + display: grid; + grid-template-columns: minmax(rem(100), 0.5fr) 1fr; + column-gap: rem(16); + margin-bottom: rem(12); + } + + .details-wrapper { + margin-top: rem(24); + margin-bottom: rem(24); + + .title { + margin-bottom: rem(16) !important; + } + } + + h3 .subtext { + margin: 0.5rem 0 !important; + } + + label { + font-weight: 600; + } + + .no-data-text { + text-align: center; + color: colors.$grey; + padding-top: rem(12); + + .error { + justify-content: center; + } + } + + .custom-mat-expansion-panel-header { + height: fit-content; + } + + .table-wrapper { + overflow-x: auto; + width: 100%; + } + + @media screen and (min-width: $tabletBreakpoint) { + .flex-item { + display: flex; + gap: rem(16); + } + } +} + +:host::ng-deep { + .scrollable { + overflow-x: auto; + } + + .other-attachments { + display: grid; + grid-template-columns: max-content max-content max-content; + overflow-x: auto; + grid-column-gap: rem(36); + grid-row-gap: rem(12); + + .full-width { + grid-column: 1/3; + } + } + + .adjacent-parcels { + display: grid; + grid-template-columns: max-content max-content max-content; + overflow-x: auto; + grid-column-gap: rem(36); + grid-row-gap: rem(12); + + .full-width { + grid-column: 1/4; + } + } + + .review-table { + padding: rem(8); + margin: rem(12) 0 rem(20) 0; + background-color: colors.$grey-light; + display: grid; + grid-row-gap: rem(24); + grid-column-gap: rem(16); + grid-template-columns: 1fr; + word-wrap: break-word; + hyphens: auto; + + .edit-button { + display: flex; + justify-content: center; + + button { + width: 100%; + + @media screen and (min-width: $tabletBreakpoint) { + width: unset; + } + } + } + + .subheading2 { + margin-bottom: rem(4) !important; + } + + @media screen and (min-width: $tabletBreakpoint) { + padding: rem(16); + margin: rem(24) 0 rem(40) 0; + grid-template-columns: minmax(rem(60), 1fr) minmax(rem(60), 1fr) minmax(rem(60), 1fr) minmax(rem(60), 1fr); + + .full-width { + grid-column: 1/5; + } + + .grid-double { + grid-column: 2/5; + } + + .grid-1 { + grid-column: 1/2; + } + + .grid-2 { + grid-column: 2/3; + } + + .grid-3 { + grid-column: 3/5; + } + + .edit-button { + grid-column: 1/5; + } + } + } +} diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.spec.ts b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.spec.ts new file mode 100644 index 0000000000..470a008ab5 --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.spec.ts @@ -0,0 +1,71 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { Router } from '@angular/router'; +import { DeepMocked, createMock } from '@golevelup/ts-jest'; +import { BehaviorSubject } from 'rxjs'; +import { CodeService } from '../../../services/code/code.service'; +import { NoticeOfIntentDocumentDto } from '../../../services/notice-of-intent-document/notice-of-intent-document.dto'; +import { NoticeOfIntentDocumentService } from '../../../services/notice-of-intent-document/notice-of-intent-document.service'; +import { NoticeOfIntentSubmissionDetailedDto } from '../../../services/notice-of-intent-submission/notice-of-intent-submission.dto'; +import { NoticeOfIntentSubmissionService } from '../../../services/notice-of-intent-submission/notice-of-intent-submission.service'; +import { ToastService } from '../../../services/toast/toast.service'; + +import { NoticeOfIntentDetailsComponent } from './notice-of-intent-details.component'; + +describe('NoticeOfIntentDetailsComponent', () => { + let component: NoticeOfIntentDetailsComponent; + let fixture: ComponentFixture; + let mockCodeService: DeepMocked; + let mockNoiDocumentService: DeepMocked; + let mockRouter: DeepMocked; + let mockToastService: DeepMocked; + let mockNoiSubmissionService: DeepMocked; + + let noiDocumentPipe = new BehaviorSubject([]); + + beforeEach(async () => { + mockCodeService = createMock(); + mockNoiDocumentService = createMock(); + mockRouter = createMock(); + mockNoiSubmissionService = createMock(); + + await TestBed.configureTestingModule({ + providers: [ + { + provide: CodeService, + useValue: mockCodeService, + }, + { + provide: NoticeOfIntentDocumentService, + useValue: mockNoiDocumentService, + }, + { + provide: Router, + useValue: mockRouter, + }, + { + provide: ToastService, + useValue: mockToastService, + }, + { + provide: NoticeOfIntentSubmissionService, + useValue: mockNoiSubmissionService, + }, + ], + declarations: [NoticeOfIntentDetailsComponent], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(NoticeOfIntentDetailsComponent); + component = fixture.componentInstance; + component.$noticeOfIntentSubmission = new BehaviorSubject( + undefined + ); + component.$noiDocuments = noiDocumentPipe; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.ts b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.ts new file mode 100644 index 0000000000..75c34df486 --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.ts @@ -0,0 +1,120 @@ +import { Component, Input, OnDestroy, OnInit } from '@angular/core'; +import { Router } from '@angular/router'; +import { BehaviorSubject, Subject, takeUntil } from 'rxjs'; +import { PARCEL_TYPE } from '../../../services/application-parcel/application-parcel.dto'; +import { LocalGovernmentDto } from '../../../services/code/code.dto'; +import { CodeService } from '../../../services/code/code.service'; +import { NoticeOfIntentDocumentDto } from '../../../services/notice-of-intent-document/notice-of-intent-document.dto'; +import { NoticeOfIntentDocumentService } from '../../../services/notice-of-intent-document/notice-of-intent-document.service'; +import { NoticeOfIntentOwnerDto } from '../../../services/notice-of-intent-owner/notice-of-intent-owner.dto'; +import { NoticeOfIntentSubmissionDetailedDto } from '../../../services/notice-of-intent-submission/notice-of-intent-submission.dto'; +import { DOCUMENT_SOURCE, DOCUMENT_TYPE } from '../../../shared/dto/document.dto'; +import { OWNER_TYPE } from '../../../shared/dto/owner.dto'; + +@Component({ + selector: 'app-noi-details', + templateUrl: './notice-of-intent-details.component.html', + styleUrls: ['./notice-of-intent-details.component.scss'], +}) +export class NoticeOfIntentDetailsComponent implements OnInit, OnDestroy { + $destroy = new Subject(); + + @Input() $noticeOfIntentSubmission!: BehaviorSubject; + @Input() $noiDocuments!: BehaviorSubject; + @Input() showErrors = true; + @Input() showEdit = true; + @Input() draftMode = false; + @Input() originalSubmissionUuid = ''; + @Input() updatedFields: string[] = []; + + parcelType = PARCEL_TYPE; + noiSubmission: NoticeOfIntentSubmissionDetailedDto | undefined; + primaryContact: NoticeOfIntentOwnerDto | undefined; + localGovernment: LocalGovernmentDto | undefined; + authorizationLetters: NoticeOfIntentDocumentDto[] = []; + otherFiles: NoticeOfIntentDocumentDto[] = []; + needsAuthorizationLetter = true; + appDocuments: NoticeOfIntentDocumentDto[] = []; + OWNER_TYPE = OWNER_TYPE; + + private localGovernments: LocalGovernmentDto[] = []; + private otherFileTypes = [DOCUMENT_TYPE.PHOTOGRAPH, DOCUMENT_TYPE.PROFESSIONAL_REPORT, DOCUMENT_TYPE.OTHER]; + + constructor( + private codeService: CodeService, + private noticeOfIntentDocumentService: NoticeOfIntentDocumentService, + private router: Router + ) {} + + ngOnInit(): void { + this.loadGovernments(); + this.$noticeOfIntentSubmission.pipe(takeUntil(this.$destroy)).subscribe((noiSubmission) => { + this.noiSubmission = noiSubmission; + if (noiSubmission) { + this.primaryContact = noiSubmission.owners.find( + (owner) => owner.uuid === noiSubmission.primaryContactOwnerUuid + ); + this.populateLocalGovernment(noiSubmission.localGovernmentUuid); + + this.needsAuthorizationLetter = + !(this.primaryContact?.type.code === OWNER_TYPE.GOVERNMENT) && + !( + noiSubmission.owners.length === 1 && + (noiSubmission.owners[0].type.code === OWNER_TYPE.INDIVIDUAL || + noiSubmission.owners[0].type.code === OWNER_TYPE.GOVERNMENT) + ); + } + }); + + this.$noiDocuments.pipe(takeUntil(this.$destroy)).subscribe((documents) => { + this.otherFiles = documents + .filter((file) => (file.type ? this.otherFileTypes.includes(file.type.code) : true)) + .filter((file) => file.source === DOCUMENT_SOURCE.APPLICANT) + .sort((a, b) => { + return a.uploadedAt - b.uploadedAt; + }); + + this.authorizationLetters = documents + .filter((file) => file.type?.code === DOCUMENT_TYPE.AUTHORIZATION_LETTER) + .filter((file) => file.source === DOCUMENT_SOURCE.APPLICANT) + .sort((a, b) => { + return a.uploadedAt - b.uploadedAt; + }); + + this.appDocuments = documents; + }); + } + + ngOnDestroy(): void { + this.$destroy.next(); + this.$destroy.complete(); + } + + async openFile(uuid: string) { + const res = await this.noticeOfIntentDocumentService.openFile(uuid); + window.open(res?.url, '_blank'); + } + + async onNavigateToStep(step: number) { + if (this.draftMode) { + await this.router.navigateByUrl(`alcs/notice-of-intent/${this.noiSubmission?.fileNumber}/edit/${step}?errors=t`); + } else { + await this.router.navigateByUrl(`notice-of-intent/${this.noiSubmission?.fileNumber}/edit/${step}?errors=t`); + } + } + + private async loadGovernments() { + const codes = await this.codeService.loadCodes(); + this.localGovernments = codes.localGovernments.sort((a, b) => (a.name > b.name ? 1 : -1)); + if (this.noiSubmission?.localGovernmentUuid) { + this.populateLocalGovernment(this.noiSubmission?.localGovernmentUuid); + } + } + + private populateLocalGovernment(governmentUuid: string) { + const lg = this.localGovernments.find((lg) => lg.uuid === governmentUuid); + if (lg) { + this.localGovernment = lg; + } + } +} diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.module.ts b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.module.ts new file mode 100644 index 0000000000..7fbf9b5cd3 --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.module.ts @@ -0,0 +1,14 @@ +import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; +import { NgxMaskPipe } from 'ngx-mask'; +import { SharedModule } from '../../../shared/shared.module'; +import { NoticeOfIntentDetailsComponent } from './notice-of-intent-details.component'; +import { ParcelComponent } from './parcel/parcel.component'; +import { RosoDetailsComponent } from './roso-details/roso-details.component'; + +@NgModule({ + declarations: [ParcelComponent, RosoDetailsComponent, NoticeOfIntentDetailsComponent], + imports: [CommonModule, SharedModule, NgxMaskPipe], + exports: [NoticeOfIntentDetailsComponent], +}) +export class NoticeOfIntentDetailsModule {} diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/parcel/parcel.component.html b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/parcel/parcel.component.html new file mode 100644 index 0000000000..41191e9061 --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/parcel/parcel.component.html @@ -0,0 +1,171 @@ +

1. Identify Parcel(s) Under Application

+
+ +
+

Parcel {{ parcelInd + 1 }}: Parcel and Owner Information

+
+ +
+
+
Parcel Information
+
+ Ownership Type + +
+
+ {{ parcel.ownershipType?.label }} + +
+
+ Legal Description + +
+
+ {{ parcel.legalDescription }} + +
+
+ Area (Hectares) + +
+
+ {{ parcel.mapAreaHectares }} + +
+
+ PID {{ parcel.ownershipType?.code === PARCEL_OWNERSHIP_TYPES.CROWN ? '(optional)' : '' }} + +
+
+ {{ parcel.pid | mask : '000-000-000' }} + + + Invalid Format + +
+ +
+ PIN (optional) +
+
+ {{ parcel.pin }} + +
+ + +
+ Purchase Date + +
+
+ {{ parcel.purchasedDate | date }} + + +
+ +
+ Farm Classification + +
+
+ {{ parcel.isFarm ? 'Yes' : 'No' }} + +
+
+ Civic Address + +
+
+ {{ parcel.civicAddress }} + +
+ +
Crown Selection
+
+ {{ parcel.crownLandOwnerType }} + +
+ +
+ Certificate Of Title + +
+
+ + +
+
+ Owner Information +
+
+
Type
+
Full Name
+
Organization
+
+ Ministry/ Department +
+
Phone
+
Email
+
Corporate Summary
+ +
{{ owner.type.label }}
+
{{ owner.displayName }}
+
+ {{ owner.organizationName }} + +
+
{{ owner.phoneNumber }}
+
{{ owner.email }}
+ + +
+ +
+
+
+ I confirm that the owner information provided above matches the current Certificate of Title +
+
+ Yes + +
+
+ +
+ +
+ +
+
diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/parcel/parcel.component.scss b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/parcel/parcel.component.scss new file mode 100644 index 0000000000..ecf9d4a24c --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/parcel/parcel.component.scss @@ -0,0 +1,39 @@ +@use '../../../../../styles/functions' as *; + +.owner-information { + display: grid; + grid-template-columns: max-content max-content max-content max-content max-content max-content; + overflow-x: auto; + grid-column-gap: rem(36); + grid-row-gap: rem(12); + + .full-width { + grid-column: 1/3; + } +} + +.review-table { + grid-template-columns: 1fr 1fr !important; + + .full-width { + grid-column: 1/3; + } + + .edit-button { + grid-column: 1/3; + } + + @media screen and (min-width: $tabletBreakpoint) { + .full-width { + grid-column: 1/5; + } + + .edit-button { + grid-column: 1/5; + } + } +} + +.crown-land { + text-transform: capitalize; +} diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/parcel/parcel.component.spec.ts b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/parcel/parcel.component.spec.ts new file mode 100644 index 0000000000..30e85cf5d5 --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/parcel/parcel.component.spec.ts @@ -0,0 +1,59 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { Router } from '@angular/router'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { BehaviorSubject } from 'rxjs'; +import { NoticeOfIntentDocumentService } from '../../../../services/notice-of-intent-document/notice-of-intent-document.service'; +import { NoticeOfIntentOwnerService } from '../../../../services/notice-of-intent-owner/notice-of-intent-owner.service'; +import { NoticeOfIntentParcelService } from '../../../../services/notice-of-intent-parcel/notice-of-intent-parcel.service'; +import { NoticeOfIntentSubmissionDetailedDto } from '../../../../services/notice-of-intent-submission/notice-of-intent-submission.dto'; +import { ParcelComponent } from './parcel.component'; + +describe('ParcelComponent', () => { + let component: ParcelComponent; + let fixture: ComponentFixture; + + let mockNoiParcelService: DeepMocked; + let mockNoiOwnerService: DeepMocked; + let mockNoiDocService: DeepMocked; + + beforeEach(async () => { + mockNoiParcelService = createMock(); + mockNoiOwnerService = createMock(); + mockNoiDocService = createMock(); + + await TestBed.configureTestingModule({ + declarations: [ParcelComponent], + providers: [ + { + provide: NoticeOfIntentParcelService, + useValue: mockNoiParcelService, + }, + { + provide: NoticeOfIntentOwnerService, + useValue: mockNoiOwnerService, + }, + { + provide: NoticeOfIntentDocumentService, + useValue: mockNoiDocService, + }, + { + provides: Router, + useValue: {}, + }, + ], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(ParcelComponent); + component = fixture.componentInstance; + component.$noticeOfIntentSubmission = new BehaviorSubject( + undefined + ); + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/parcel/parcel.component.ts b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/parcel/parcel.component.ts new file mode 100644 index 0000000000..240116e40c --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/parcel/parcel.component.ts @@ -0,0 +1,222 @@ +import { Component, Input } from '@angular/core'; +import { Router } from '@angular/router'; +import { getDiff } from 'recursive-diff'; +import { BehaviorSubject, Subject, takeUntil } from 'rxjs'; +import { PARCEL_OWNERSHIP_TYPE } from '../../../../services/application-parcel/application-parcel.dto'; +import { NoticeOfIntentDocumentDto } from '../../../../services/notice-of-intent-document/notice-of-intent-document.dto'; +import { NoticeOfIntentDocumentService } from '../../../../services/notice-of-intent-document/notice-of-intent-document.service'; +import { NoticeOfIntentOwnerDto } from '../../../../services/notice-of-intent-owner/notice-of-intent-owner.dto'; +import { NoticeOfIntentOwnerService } from '../../../../services/notice-of-intent-owner/notice-of-intent-owner.service'; +import { + NoticeOfIntentParcelDto, + NoticeOfIntentParcelUpdateDto, +} from '../../../../services/notice-of-intent-parcel/notice-of-intent-parcel.dto'; +import { NoticeOfIntentParcelService } from '../../../../services/notice-of-intent-parcel/notice-of-intent-parcel.service'; +import { NoticeOfIntentSubmissionDetailedDto } from '../../../../services/notice-of-intent-submission/notice-of-intent-submission.dto'; +import { BaseCodeDto } from '../../../../shared/dto/base.dto'; +import { formatBooleanToYesNoString } from '../../../../shared/utils/boolean-helper'; +import { getLetterCombinations } from '../../../../shared/utils/number-to-letter-helper'; + +export class NoticeOfIntentParcelBasicValidation { + // indicates general validity check state, including owner related information + isInvalid = false; + + isTypeRequired = false; + isPidRequired = false; + isPinRequired = false; + isLegalDescriptionRequired = false; + isMapAreaHectaresRequired = false; + isPurchasedDateRequired = false; + isFarmRequired = false; + isCertificateRequired = false; + isCertificateUploaded = false; + isConfirmedByApplicant = false; + isCrownSelectionMandatory = false; +} + +interface NoticeOfIntentParcelExtended extends Omit { + isFarmText?: string; + ownershipType?: BaseCodeDto; + validation?: NoticeOfIntentParcelBasicValidation; + owners: NoticeOfIntentOwnerDto[]; + certificateOfTitle?: NoticeOfIntentDocumentDto; +} + +@Component({ + selector: 'app-parcel', + templateUrl: './parcel.component.html', + styleUrls: ['./parcel.component.scss'], +}) +export class ParcelComponent { + $destroy = new Subject(); + + @Input() $noticeOfIntentSubmission!: BehaviorSubject; + @Input() originalSubmissionUuid: string | undefined; + @Input() showErrors = true; + @Input() showEdit = true; + @Input() draftMode = false; + + PARCEL_OWNERSHIP_TYPES = PARCEL_OWNERSHIP_TYPE; + + fileId = ''; + submissionUuid = ''; + parcels: NoticeOfIntentParcelExtended[] = []; + noticeOfIntentSubmission!: NoticeOfIntentSubmissionDetailedDto; + updatedFields: string[] = []; + + constructor( + private noticeOfIntentParcelService: NoticeOfIntentParcelService, + private noticeOfIntentDocumentService: NoticeOfIntentDocumentService, + private ownerService: NoticeOfIntentOwnerService, + private router: Router + ) {} + + ngOnInit(): void { + this.$noticeOfIntentSubmission.pipe(takeUntil(this.$destroy)).subscribe((noiSubmission) => { + if (noiSubmission) { + this.fileId = noiSubmission.fileNumber; + this.submissionUuid = noiSubmission.uuid; + this.noticeOfIntentSubmission = noiSubmission; + this.loadParcels().then(async () => await this.validateParcelDetails()); + } + }); + } + + ngOnDestroy(): void { + this.$destroy.next(); + this.$destroy.complete(); + } + + async loadParcels() { + const parcels = (await this.noticeOfIntentParcelService.fetchBySubmissionUuid(this.submissionUuid)) || []; + this.parcels = parcels.map((p) => ({ ...p, isFarmText: formatBooleanToYesNoString(p.isFarm) })); + + if (this.originalSubmissionUuid) { + await this.calculateParcelDiffs(this.originalSubmissionUuid); + } + } + + private async calculateParcelDiffs(originalSubmissionUuid: string) { + const oldParcels = await this.noticeOfIntentParcelService.fetchBySubmissionUuid(originalSubmissionUuid); + if (oldParcels) { + const diffResult = getDiff(oldParcels, this.parcels); + const changedFields = new Set(); + for (const diff of diffResult) { + const partialPath = []; + const fullPath = diff.path.join('.'); + if (!fullPath.toLowerCase().includes('uuid')) { + for (const path of diff.path) { + if (typeof path !== 'string' || !path.includes('Uuid')) { + partialPath.push(path); + changedFields.add(partialPath.join('.')); + } + } + if ((diff.op = 'add') && typeof diff.val === 'object') { + for (const key of Object.keys(diff.val)) { + changedFields.add(`${diff.path.join('.')}.${key}`); + } + } + } + } + this.updatedFields = [...changedFields.keys()]; + } + } + + private async validateParcelDetails() { + if (this.parcels) { + this.parcels.forEach((p) => { + p.validation = this.validateParcelBasic(p); + }); + } + } + + async onOpenFile(uuid: string) { + const res = await this.noticeOfIntentDocumentService.openFile(uuid); + if (res) { + window.open(res.url, '_blank'); + } + } + + private validateParcelBasic(parcel: NoticeOfIntentParcelDto) { + const validation = new NoticeOfIntentParcelBasicValidation(); + + if (!parcel.ownershipType) { + validation.isTypeRequired = true; + + if (!parcel.pid && !parcel.pin) { + validation.isPidRequired = true; + } + + if (!parcel.purchasedDate) { + validation.isPurchasedDateRequired = true; + } + } + + if (!parcel.pid && parcel.ownershipType?.code === this.PARCEL_OWNERSHIP_TYPES.FEE_SIMPLE) { + validation.isPidRequired = true; + } + + if (!parcel.legalDescription) { + validation.isLegalDescriptionRequired = true; + } + + if (!parcel.mapAreaHectares) { + validation.isMapAreaHectaresRequired = true; + } + + if (!parcel.purchasedDate && parcel.ownershipType?.code === this.PARCEL_OWNERSHIP_TYPES.FEE_SIMPLE) { + validation.isPurchasedDateRequired = true; + } + + if (parcel.ownershipType?.code === this.PARCEL_OWNERSHIP_TYPES.CROWN) { + validation.isCrownSelectionMandatory = true; + } + + if (!parcel.isFarm) { + validation.isFarmRequired = true; + } + + validation.isCertificateUploaded = !!parcel.certificateOfTitle; + const isCrownWithPid = + parcel.ownershipType?.code === this.PARCEL_OWNERSHIP_TYPES.CROWN && parcel.pid && parcel.pid.length > 0; + const isFeeSimple = parcel.ownershipType?.code === this.PARCEL_OWNERSHIP_TYPES.FEE_SIMPLE; + if (isCrownWithPid || isFeeSimple) { + validation.isCertificateRequired = true; + } + + validation.isInvalid = this.isInvalid(validation); + + return validation; + } + + private isInvalid(validationObj: NoticeOfIntentParcelBasicValidation) { + for (const prop in validationObj) { + if (validationObj[prop as keyof typeof validationObj]) { + return true; + } + } + + return false; + } + + async onEditParcelsClick($event: any) { + $event.stopPropagation(); + if (this.draftMode) { + await this.router.navigateByUrl(`alcs/notice-of-intent/${this.fileId}/edit/0?errors=t`); + } else { + await this.router.navigateByUrl(`notice-of-intent/${this.fileId}/edit/0?errors=t`); + } + } + + async onEditParcelClick(uuid: string) { + if (this.draftMode) { + await this.router.navigateByUrl(`alcs/notice-of-intent/${this.fileId}/edit/0?parcelUuid=${uuid}&errors=t`); + } else { + await this.router.navigateByUrl(`notice-of-intent/${this.fileId}/edit/0?parcelUuid=${uuid}&errors=t`); + } + } + + getLetterIndex(num: number) { + return getLetterCombinations(num); + } +} diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/roso-details/roso-details.component.html b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/roso-details/roso-details.component.html new file mode 100644 index 0000000000..5969731d85 --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/roso-details/roso-details.component.html @@ -0,0 +1,186 @@ +
+
+ Has the ALC previously received an application or Notice of Intent for this proposal? + +
+
+ + {{ _noiSubmission.soilIsFollowUp ? 'Yes' : 'No' }} + + +
+ +
+ Application or NOI ID + +
+
+ {{ _noiSubmission.soilFollowUpIDs }} + +
+ +
+ What is the purpose of the proposal? + +
+
+ {{ _noiSubmission.purpose }} + +
+ +
+ Describe the type of soil proposed to be removed. + +
+
+ {{ _noiSubmission.soilTypeRemoved }} + +
+ +
+
+
+
+ Soil to be Removed + +
+
Volume
+
+ {{ _noiSubmission.soilToRemoveVolume }} + m3 + +
+
Area
+
+ {{ _noiSubmission.soilToRemoveArea }} ha + +
+
Maximum Depth
+
+ {{ _noiSubmission.soilToRemoveMaximumDepth }} + m + +
+
Average Depth
+
+ {{ _noiSubmission.soilToRemoveAverageDepth }} + m + +
+
+ +
+
+
+
+ Soil already Removed + +
+
Volume
+
+ {{ _noiSubmission.soilAlreadyRemovedVolume }} + m3 + +
+
Area
+
+ {{ _noiSubmission.soilAlreadyRemovedArea }} + ha + +
+
Maximum Depth
+
+ {{ _noiSubmission.soilAlreadyRemovedMaximumDepth }} + m + +
+
Average Depth
+
+ {{ _noiSubmission.soilAlreadyRemovedAverageDepth }} + m + +
+
+ +
+

Project Duration

+
+
+ Duration +
+
+ {{ _noiSubmission.soilProjectDurationUnit }} + +
+
+ Length +
+
+ {{ _noiSubmission.soilProjectDurationAmount }} + +
+ +
Proposal Map / Site Plan
+
+ + {{ map.fileName }} + + +
+ +
Is your proposal for aggregate extraction or placer mining?
+
+ + {{ _noiSubmission.soilIsExtractionOrMining ? 'Yes' : 'No' }} + + +
+ + +
Cross Sections
+
+ + {{ file.fileName }} + + +
+ +
Reclamation Plan
+
+ + {{ file.fileName }} + + +
+ +
+ Have you submitted a Notice of Work to the Ministry of Energy, Mines and Low Carbon Innovation (EMLI)? +
+
+ + {{ _noiSubmission.soilHasSubmittedNotice ? 'Yes' : 'No' }} + + +
+ + +
Notice of Work
+
+ + {{ file.fileName }} + + +
+ + + +
+ +
+
diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/roso-details/roso-details.component.scss b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/roso-details/roso-details.component.scss new file mode 100644 index 0000000000..0c540ce5fb --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/roso-details/roso-details.component.scss @@ -0,0 +1,9 @@ +@use '../../../../../styles/functions' as *; + +.soil-table { + display: grid; + grid-template-columns: max-content max-content; + overflow-x: auto; + grid-column-gap: rem(36); + grid-row-gap: rem(12); +} diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/roso-details/roso-details.component.spec.ts b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/roso-details/roso-details.component.spec.ts new file mode 100644 index 0000000000..44fdd3578f --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/roso-details/roso-details.component.spec.ts @@ -0,0 +1,40 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { NoticeOfIntentDocumentService } from '../../../../services/notice-of-intent-document/notice-of-intent-document.service'; +import { NoticeOfIntentParcelService } from '../../../../services/notice-of-intent-parcel/notice-of-intent-parcel.service'; + +import { RosoDetailsComponent } from './roso-details.component'; + +describe('RosoDetailsComponent', () => { + let component: RosoDetailsComponent; + let fixture: ComponentFixture; + let mockNoiDocumentService: DeepMocked; + let mockNoiParcelService: DeepMocked; + + beforeEach(async () => { + mockNoiParcelService = createMock(); + mockNoiDocumentService = createMock(); + + await TestBed.configureTestingModule({ + declarations: [RosoDetailsComponent], + providers: [ + { + provide: NoticeOfIntentDocumentService, + useValue: mockNoiDocumentService, + }, + { + provide: NoticeOfIntentParcelService, + useValue: mockNoiParcelService, + }, + ], + }).compileComponents(); + + fixture = TestBed.createComponent(RosoDetailsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/roso-details/roso-details.component.ts b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/roso-details/roso-details.component.ts new file mode 100644 index 0000000000..cceb8fc61a --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/roso-details/roso-details.component.ts @@ -0,0 +1,55 @@ +import { Component, Input } from '@angular/core'; +import { Router } from '@angular/router'; +import { NoticeOfIntentDocumentDto } from '../../../../services/notice-of-intent-document/notice-of-intent-document.dto'; +import { NoticeOfIntentDocumentService } from '../../../../services/notice-of-intent-document/notice-of-intent-document.service'; +import { NoticeOfIntentSubmissionDetailedDto } from '../../../../services/notice-of-intent-submission/notice-of-intent-submission.dto'; +import { DOCUMENT_TYPE } from '../../../../shared/dto/document.dto'; + +@Component({ + selector: 'app-roso-details[noiSubmission]', + templateUrl: './roso-details.component.html', + styleUrls: ['./roso-details.component.scss'], +}) +export class RosoDetailsComponent { + @Input() showErrors = true; + @Input() showEdit = true; + @Input() draftMode = false; + @Input() updatedFields: string[] = []; + + _noiSubmission: NoticeOfIntentSubmissionDetailedDto | undefined; + + @Input() set noiSubmission(noiSubmission: NoticeOfIntentSubmissionDetailedDto | undefined) { + if (noiSubmission) { + this._noiSubmission = noiSubmission; + } + } + + @Input() set noiDocuments(documents: NoticeOfIntentDocumentDto[]) { + this.crossSections = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.CROSS_SECTIONS); + this.proposalMap = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.PROPOSAL_MAP); + this.reclamationPlans = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.RECLAMATION_PLAN); + this.noticeOfWorks = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.NOTICE_OF_WORK); + } + + crossSections: NoticeOfIntentDocumentDto[] = []; + proposalMap: NoticeOfIntentDocumentDto[] = []; + reclamationPlans: NoticeOfIntentDocumentDto[] = []; + noticeOfWorks: NoticeOfIntentDocumentDto[] = []; + + constructor(private router: Router, private noticeOfIntentDocumentService: NoticeOfIntentDocumentService) {} + + async onEditSection(step: number) { + if (this.draftMode) { + await this.router.navigateByUrl( + `/alcs/notice-of-intent/${this._noiSubmission?.fileNumber}/edit/${step}?errors=t` + ); + } else { + await this.router.navigateByUrl(`notice-of-intent/${this._noiSubmission?.fileNumber}/edit/${step}?errors=t`); + } + } + + async openFile(uuid: string) { + const res = await this.noticeOfIntentDocumentService.openFile(uuid); + window.open(res?.url, '_blank'); + } +} diff --git a/portal-frontend/src/app/shared/file-drag-drop/file-drag-drop.component.html b/portal-frontend/src/app/shared/file-drag-drop/file-drag-drop.component.html index fc46ac4787..d5915e5dbf 100644 --- a/portal-frontend/src/app/shared/file-drag-drop/file-drag-drop.component.html +++ b/portal-frontend/src/app/shared/file-drag-drop/file-drag-drop.component.html @@ -4,7 +4,7 @@
{{ file.fileName }} @@ -27,7 +27,7 @@ *ngIf="!uploadedFiles.length || allowMultiple" [ngClass]="{ 'desktop-file-drag-drop': true, - 'error-outline': isRequired && showErrors && !uploadedFiles.length, + 'error-outline': isRequired && !disabled && showErrors && !uploadedFiles.length, disabled: disabled }" dragDropFile @@ -52,6 +52,6 @@ > Upload File -This file upload is required From 1c633f1f1d6b38839e1c023f388fe862b69fbae6 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Mon, 14 Aug 2023 15:10:19 -0700 Subject: [PATCH 242/954] Hide rescinded decision fields instead of disabling * Add new requireComponents flag to make components optional for rescinded decisions --- .../decision-input-v2.component.html | 50 +++++++++++-------- .../decision-input-v2.component.ts | 18 +++---- .../decision-v2/decision-v2.component.html | 23 +++------ 3 files changed, 43 insertions(+), 48 deletions(-) diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.html index f0bb7692b7..d500be1a92 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.html @@ -26,7 +26,9 @@

Decisions > Edit Decision Draft

mat-stroked-button color="primary" (click)="onGenerateResolutionNumber()" - [ngClass]="{ 'error-field-outlined ng-invalid': !resolutionNumberControl.valid && resolutionNumberControl.touched }" + [ngClass]="{ + 'error-field-outlined ng-invalid': !resolutionNumberControl.valid && resolutionNumberControl.touched + }" > Generate Number @@ -151,7 +153,8 @@

Decisions > Edit Decision Draft

name="isSubjectToConditions" (change)="onChangeSubjectToConditions($event)" [ngClass]="{ - 'error-field-outlined': !form.controls.isSubjectToConditions.valid && form.controls.isSubjectToConditions.touched + 'error-field-outlined': + !form.controls.isSubjectToConditions.valid && form.controls.isSubjectToConditions.touched }" > Yes @@ -174,7 +177,8 @@

Decisions > Edit Decision Draft

formControlName="isStatsRequired" name="isStatsRequired" [ngClass]="{ - 'error-field-outlined ng-invalid': !form.controls.isStatsRequired.valid && form.controls.isStatsRequired.touched + 'error-field-outlined ng-invalid': + !form.controls.isStatsRequired.valid && form.controls.isStatsRequired.touched }" > Yes @@ -187,25 +191,29 @@

Decisions > Edit Decision Draft

- - Rescinded Date - - - - + + + Rescinded Date + + + + +
- - Rescinded Comment - - + + + Rescinded Comment + + +
Decisions > Edit Decision Draft
[fileNumber]="fileNumber" [components]="components" (componentsChange)="onComponentChange($event)" - [showError]="form.touched && components.length < 1" + [showError]="form.touched && components.length < 1 && requireComponents" > diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.ts index 2bc38b496b..15eaaee3f1 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.ts @@ -54,6 +54,7 @@ export class DecisionInputV2Component implements OnInit, OnDestroy { minDate = new Date(0); isFirstDecision = false; showComponents = false; + requireComponents = false; showConditions = false; conditionsValid = true; componentsValid = true; @@ -98,8 +99,8 @@ export class DecisionInputV2Component implements OnInit, OnDestroy { decisionDescription: new FormControl(undefined, [Validators.required]), isStatsRequired: new FormControl(undefined, [Validators.required]), daysHideFromPublic: new FormControl('2', [Validators.required]), - rescindedDate: new FormControl({ disabled: true, value: null }), - rescindedComment: new FormControl({ disabled: true, value: null }), + rescindedDate: new FormControl(null), + rescindedComment: new FormControl(null), }); constructor( @@ -329,15 +330,16 @@ export class DecisionInputV2Component implements OnInit, OnDestroy { this.components = existingDecision.components; } + this.requireComponents = ['APPR', 'APPA'].includes(existingDecision.outcome.code); + if (['APPR', 'APPA', 'RESC'].includes(existingDecision.outcome.code)) { this.showComponents = true; } else { + this.showComponents = false; this.form.controls.isSubjectToConditions.disable(); } if (existingDecision.outcome.code === 'RESC') { - this.form.controls.rescindedComment.enable(); - this.form.controls.rescindedDate.enable(); this.form.controls.rescindedComment.setValidators([Validators.required]); this.form.controls.rescindedDate.setValidators([Validators.required]); } @@ -529,7 +531,7 @@ export class DecisionInputV2Component implements OnInit, OnDestroy { private runValidation() { this.form.markAllAsTouched(); const requiresConditions = this.showConditions; - const requiresComponents = this.showComponents; + const requiresComponents = this.showComponents && this.requireComponents; if (this.decisionComponentsComponent) { this.decisionComponentsComponent.onValidate(); @@ -618,16 +620,12 @@ export class DecisionInputV2Component implements OnInit, OnDestroy { }); } - if (selectedOutcome.code === 'RESC' && this.form.controls.rescindedComment.disabled) { - this.form.controls.rescindedComment.enable(); - this.form.controls.rescindedDate.enable(); + if (selectedOutcome.code === 'RESC') { this.form.controls.rescindedComment.setValidators([Validators.required]); this.form.controls.rescindedDate.setValidators([Validators.required]); this.form.controls.rescindedComment.updateValueAndValidity(); this.form.controls.rescindedDate.updateValueAndValidity(); } else if (this.form.controls.rescindedComment.enabled) { - this.form.controls.rescindedComment.disable(); - this.form.controls.rescindedDate.disable(); this.form.controls.rescindedComment.setValue(null); this.form.controls.rescindedDate.setValue(null); this.form.controls.rescindedComment.setValidators([]); diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.html index b912c09605..c496fc29d5 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.html @@ -5,13 +5,6 @@

Decision

- - @@ -156,21 +149,17 @@

Condition Compliance

(save)="onStatsRequiredUpdate(decision.uuid, $event)" >
-
-
Rescinded Date
- {{ decision.rescindedDate | momentFormat }} - -
+
+
Rescinded Date
+ {{ decision.rescindedDate | momentFormat }} + +
Rescinded Comment
{{ decision.rescindedComment }} - +
From dc414877a520894febf0fe76f1f5234f36e3fa66 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Mon, 14 Aug 2023 15:19:26 -0700 Subject: [PATCH 243/954] Change NOI Parcel Dialog to use NOI Parcel Service * Was accidentally still using Application Parcel Service --- .../delete-parcel-dialog.component.spec.ts | 15 +++++++-------- .../delete-parcel-dialog.component.ts | 12 ++++++------ .../parcel-entry-confirmation-dialog.component.ts | 6 +++--- 3 files changed, 16 insertions(+), 17 deletions(-) diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/delete-parcel/delete-parcel-dialog.component.spec.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/delete-parcel/delete-parcel-dialog.component.spec.ts index 9beff5eaf0..59d4818b54 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/delete-parcel/delete-parcel-dialog.component.spec.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/delete-parcel/delete-parcel-dialog.component.spec.ts @@ -1,21 +1,20 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - import { HttpClient } from '@angular/common/http'; import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; -import { DeepMocked, createMock } from '@golevelup/ts-jest'; -import { ApplicationParcelService } from '../../../../../services/application-parcel/application-parcel.service'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { NoticeOfIntentParcelService } from '../../../../../services/notice-of-intent-parcel/notice-of-intent-parcel.service'; import { DeleteParcelDialogComponent } from './delete-parcel-dialog.component'; describe('DeleteParcelDialogComponent', () => { let component: DeleteParcelDialogComponent; let fixture: ComponentFixture; let mockHttpClient: DeepMocked; - let mockApplicationParcelService: DeepMocked; + let mockNoiParcelService: DeepMocked; beforeEach(async () => { mockHttpClient = createMock(); - mockApplicationParcelService = createMock(); + mockNoiParcelService = createMock(); await TestBed.configureTestingModule({ declarations: [DeleteParcelDialogComponent], @@ -25,8 +24,8 @@ describe('DeleteParcelDialogComponent', () => { useValue: mockHttpClient, }, { - provide: ApplicationParcelService, - useValue: mockApplicationParcelService, + provide: NoticeOfIntentParcelService, + useValue: mockNoiParcelService, }, { provide: MatDialogRef, diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/delete-parcel/delete-parcel-dialog.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/delete-parcel/delete-parcel-dialog.component.ts index f86e0979ab..827eabbefd 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/delete-parcel/delete-parcel-dialog.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/delete-parcel/delete-parcel-dialog.component.ts @@ -1,8 +1,8 @@ import { Component, Inject } from '@angular/core'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; -import { ApplicationParcelService } from '../../../../../services/application-parcel/application-parcel.service'; +import { NoticeOfIntentParcelService } from '../../../../../services/notice-of-intent-parcel/notice-of-intent-parcel.service'; -export enum ApplicationParcelDeleteStepsEnum { +export enum NoticeOfIntentParcelDeleteStepsEnum { warning = 0, confirmation = 1, } @@ -18,11 +18,11 @@ export class DeleteParcelDialogComponent { stepIdx = 0; - warningStep = ApplicationParcelDeleteStepsEnum.warning; - confirmationStep = ApplicationParcelDeleteStepsEnum.confirmation; + warningStep = NoticeOfIntentParcelDeleteStepsEnum.warning; + confirmationStep = NoticeOfIntentParcelDeleteStepsEnum.confirmation; constructor( - private applicationParcelService: ApplicationParcelService, + private noticeOfIntentParcelService: NoticeOfIntentParcelService, private dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) public data: DeleteParcelDialogComponent ) { @@ -43,7 +43,7 @@ export class DeleteParcelDialogComponent { } async onDelete() { - const result = await this.applicationParcelService.deleteMany([this.parcelUuid]); + const result = await this.noticeOfIntentParcelService.deleteMany([this.parcelUuid]); if (result) { this.onCancel(true); diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry-confirmation-dialog/parcel-entry-confirmation-dialog.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry-confirmation-dialog/parcel-entry-confirmation-dialog.component.ts index dfe4bb5e16..7a5436516d 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry-confirmation-dialog/parcel-entry-confirmation-dialog.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry-confirmation-dialog/parcel-entry-confirmation-dialog.component.ts @@ -1,6 +1,6 @@ import { Component } from '@angular/core'; import { MatDialogRef } from '@angular/material/dialog'; -import { ApplicationParcelDeleteStepsEnum } from '../../delete-parcel/delete-parcel-dialog.component'; +import { NoticeOfIntentParcelDeleteStepsEnum } from '../../delete-parcel/delete-parcel-dialog.component'; @Component({ selector: 'app-parcel-entry-confirmation-dialog', @@ -10,8 +10,8 @@ import { ApplicationParcelDeleteStepsEnum } from '../../delete-parcel/delete-par export class ParcelEntryConfirmationDialogComponent { stepIdx = 0; - warningStep = ApplicationParcelDeleteStepsEnum.warning; - confirmationStep = ApplicationParcelDeleteStepsEnum.confirmation; + warningStep = NoticeOfIntentParcelDeleteStepsEnum.warning; + confirmationStep = NoticeOfIntentParcelDeleteStepsEnum.confirmation; constructor(private dialogRef: MatDialogRef) {} From 0329386730e66d943d15aa97d835bc783b98d319 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Mon, 14 Aug 2023 16:18:57 -0700 Subject: [PATCH 244/954] Bug fixes for Decision Dialogs * Sort statuses by weight, not date, to find correct revert status * Update missed DTO to new codes value to fix release dialog --- .../revert-to-draft-dialog.component.ts | 3 ++- .../src/app/services/application/application-code.dto.ts | 2 +- .../src/app/services/application/application.dto.ts | 8 ++++---- .../src/app/services/application/application.service.ts | 2 +- .../submission-status.dto.ts | 6 +++--- 5 files changed, 11 insertions(+), 10 deletions(-) diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/revert-to-draft-dialog/revert-to-draft-dialog.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/revert-to-draft-dialog/revert-to-draft-dialog.component.ts index 874f314f32..c9a77874a7 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/revert-to-draft-dialog/revert-to-draft-dialog.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/revert-to-draft-dialog/revert-to-draft-dialog.component.ts @@ -29,7 +29,8 @@ export class RevertToDraftDialogComponent { status.statusTypeCode !== SUBMISSION_STATUS.ALC_DECISION && status.effectiveDate < Date.now() ) - .sort((a, b) => a.effectiveDate! - b.effectiveDate!); + .sort((a, b) => b.status.weight! - a.status.weight!); + if (validStatuses && validStatuses.length > 0) { const newStatus = validStatuses[0].status; this.mappedType = { diff --git a/alcs-frontend/src/app/services/application/application-code.dto.ts b/alcs-frontend/src/app/services/application/application-code.dto.ts index ff201daca9..1d7307f365 100644 --- a/alcs-frontend/src/app/services/application/application-code.dto.ts +++ b/alcs-frontend/src/app/services/application/application-code.dto.ts @@ -16,5 +16,5 @@ export interface ApplicationMasterCodesDto { status: CardStatusDto[]; region: ApplicationRegionDto[]; reconsiderationType: ReconsiderationTypeDto[]; - applicationStatuses: ApplicationStatusDto[]; + applicationStatusType: ApplicationStatusDto[]; } diff --git a/alcs-frontend/src/app/services/application/application.dto.ts b/alcs-frontend/src/app/services/application/application.dto.ts index 83fd61d3f7..7e350fc3e4 100644 --- a/alcs-frontend/src/app/services/application/application.dto.ts +++ b/alcs-frontend/src/app/services/application/application.dto.ts @@ -22,11 +22,11 @@ export enum SUBMISSION_STATUS { SUBMITTED_TO_LG = 'SUBG', //Submitted to L/FNG IN_REVIEW_BY_LG = 'REVG', //new Under Review by L/FNG SUBMITTED_TO_ALC = 'SUBM', //Submitted to ALC - SUBMITTED_TO_ALC_INCOMPLETE = 'SUIN', //new Submitted to ALC - Incomplete - RECEIVED_BY_ALC = 'RECA', //new Received By ALC - IN_REVIEW_BY_ALC = 'REVA', //new Under Review by ALC + SUBMITTED_TO_ALC_INCOMPLETE = 'SUIN', //Submitted to ALC - Incomplete + RECEIVED_BY_ALC = 'RECA', //Received By ALC + IN_REVIEW_BY_ALC = 'REVA', //Under Review by ALC ALC_DECISION = 'ALCD', // Decision Released - REFUSED_TO_FORWARD_LG = 'RFFG', //new L/FNG Refused to Forward + REFUSED_TO_FORWARD_LG = 'RFFG', //L/FNG Refused to Forward CANCELLED = 'CANC', //Cancelled } diff --git a/alcs-frontend/src/app/services/application/application.service.ts b/alcs-frontend/src/app/services/application/application.service.ts index 3e04215beb..feeddfa362 100644 --- a/alcs-frontend/src/app/services/application/application.service.ts +++ b/alcs-frontend/src/app/services/application/application.service.ts @@ -97,7 +97,7 @@ export class ApplicationService { this.regions = codes.region; this.$applicationRegions.next(this.regions); - this.applicationStatuses = codes.applicationStatuses; + this.applicationStatuses = codes.applicationStatusType; this.$applicationStatuses.next(this.applicationStatuses); } diff --git a/services/apps/alcs/src/alcs/application/application-submission-status/submission-status.dto.ts b/services/apps/alcs/src/alcs/application/application-submission-status/submission-status.dto.ts index 5ff8a00827..c2ffce23b3 100644 --- a/services/apps/alcs/src/alcs/application/application-submission-status/submission-status.dto.ts +++ b/services/apps/alcs/src/alcs/application/application-submission-status/submission-status.dto.ts @@ -6,11 +6,11 @@ export enum SUBMISSION_STATUS { INCOMPLETE = 'INCM', // L/FNG Returned as Incomplete WRONG_GOV = 'WRNG', //Wrong L/FNG SUBMITTED_TO_LG = 'SUBG', //Submitted to L/FNG - IN_REVIEW_BY_LG = 'REVG', //new Under Review by L/FNG + IN_REVIEW_BY_LG = 'REVG', //Under Review by L/FNG SUBMITTED_TO_ALC = 'SUBM', //Submitted to ALC SUBMITTED_TO_ALC_INCOMPLETE = 'SUIN', //new Submitted to ALC - Incomplete - RECEIVED_BY_ALC = 'RECA', //new Received By ALC - IN_REVIEW_BY_ALC = 'REVA', //new Under Review by ALC + RECEIVED_BY_ALC = 'RECA', //Received By ALC + IN_REVIEW_BY_ALC = 'REVA', //Under Review by ALC ALC_DECISION = 'ALCD', // Decision Released REFUSED_TO_FORWARD_LG = 'RFFG', //new L/FNG Refused to Forward CANCELLED = 'CANC', From d2a2e108c70217e8de9aefb08ce8d482e25d61ab Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Mon, 14 Aug 2023 16:21:24 -0700 Subject: [PATCH 245/954] Update portal-frontend/src/app/features/notice-of-intents/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.html Co-authored-by: to. sandra <76515860+sandratoh@users.noreply.github.com> --- .../submit-confirmation-dialog.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.html index 6f76d04448..cb623c2ba8 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.html @@ -1,5 +1,5 @@
-

Submit Application

+

Submit Notice of Intent

From dbe1bd82cae073f60eea6a9c5619c87758aa4c0f Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Mon, 14 Aug 2023 16:21:31 -0700 Subject: [PATCH 246/954] Update portal-frontend/src/app/features/notice-of-intents/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.html Co-authored-by: to. sandra <76515860+sandratoh@users.noreply.github.com> --- .../submit-confirmation-dialog.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.html index cb623c2ba8..44e41840fe 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.html @@ -7,7 +7,7 @@

Submit Notice of Intent

Terms and Conditions:
- I/we consent to the use of the information provided in the application and all supporting documents to process the + I/we consent to the use of the information provided in the notice of intent and all supporting documents to process the notice of intent in accordance with the Agricultural Land Commission Act, the Agricultural Land Reserve General Regulation, and the Agricultural Land Reserve Use Regulation. From 15d13a3c43f772762d14979999d832012ce17e53 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Mon, 14 Aug 2023 16:28:20 -0700 Subject: [PATCH 247/954] Code Review Feedback --- .../notice-of-intent-details.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.ts b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.ts index 75c34df486..71df72edbb 100644 --- a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.ts @@ -57,7 +57,7 @@ export class NoticeOfIntentDetailsComponent implements OnInit, OnDestroy { this.populateLocalGovernment(noiSubmission.localGovernmentUuid); this.needsAuthorizationLetter = - !(this.primaryContact?.type.code === OWNER_TYPE.GOVERNMENT) && + this.primaryContact?.type.code !== OWNER_TYPE.GOVERNMENT && !( noiSubmission.owners.length === 1 && (noiSubmission.owners[0].type.code === OWNER_TYPE.INDIVIDUAL || From c2ce1a2c0376f31250d2bf6bbb03c76dd8e68f4f Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Mon, 14 Aug 2023 16:31:19 -0700 Subject: [PATCH 248/954] Update services/apps/alcs/src/alcs/application/application-submission-status/submission-status.dto.ts Co-authored-by: to. sandra <76515860+sandratoh@users.noreply.github.com> --- .../application-submission-status/submission-status.dto.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/apps/alcs/src/alcs/application/application-submission-status/submission-status.dto.ts b/services/apps/alcs/src/alcs/application/application-submission-status/submission-status.dto.ts index c2ffce23b3..5475b5cc99 100644 --- a/services/apps/alcs/src/alcs/application/application-submission-status/submission-status.dto.ts +++ b/services/apps/alcs/src/alcs/application/application-submission-status/submission-status.dto.ts @@ -12,7 +12,7 @@ export enum SUBMISSION_STATUS { RECEIVED_BY_ALC = 'RECA', //Received By ALC IN_REVIEW_BY_ALC = 'REVA', //Under Review by ALC ALC_DECISION = 'ALCD', // Decision Released - REFUSED_TO_FORWARD_LG = 'RFFG', //new L/FNG Refused to Forward + REFUSED_TO_FORWARD_LG = 'RFFG', //L/FNG Refused to Forward CANCELLED = 'CANC', } From c0cab944b2626661aceae6680643e3423dfb7c9d Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Tue, 15 Aug 2023 11:01:06 -0700 Subject: [PATCH 249/954] Feature/alcs 981 - NOI step 6 ROSO (#875) step 6 for ROSO unit tests --- ...ructure-confirmation-dialog.component.html | 14 + ...ructure-confirmation-dialog.component.scss | 24 ++ ...ture-confirmation-dialog.component.spec.ts | 25 ++ ...structure-confirmation-dialog.component.ts | 8 + ...roso-additional-information.component.html | 288 ++++++++++++++++++ ...roso-additional-information.component.scss | 0 ...o-additional-information.component.spec.ts | 43 +++ .../roso-additional-information.component.ts | 282 +++++++++++++++++ ...removal-confirmation-dialog.component.html | 14 + ...removal-confirmation-dialog.component.scss | 24 ++ ...oval-confirmation-dialog.component.spec.ts | 24 ++ ...l-removal-confirmation-dialog.component.ts | 20 ++ .../edit-submission-base.module.ts | 7 + .../edit-submission.component.html | 12 +- .../edit-submission.component.ts | 7 + .../notice-of-intent-document.service.spec.ts | 18 ++ .../notice-of-intent-document.service.ts | 12 + .../notice-of-intent-submission.dto.ts | 18 ++ .../src/app/shared/dto/document.dto.ts | 5 +- .../notice-of-intent-document.service.spec.ts | 40 ++- .../notice-of-intent-document.service.ts | 18 +- .../alcs/src/document/document-code.entity.ts | 1 + .../src/document/document.service.spec.ts | 16 +- .../alcs/src/document/document.service.ts | 5 +- ...tice-of-intent-document.controller.spec.ts | 10 +- .../notice-of-intent-document.controller.ts | 11 + .../notice-of-intent-submission.dto.ts | 44 +++ .../notice-of-intent-submission.entity.ts | 39 +++ .../notice-of-intent-submission.service.ts | 33 ++ .../1692031918906-new_document_type.ts | 15 + ...6187722-roso_noi_additional_soil_fields.ts | 55 ++++ 31 files changed, 1123 insertions(+), 9 deletions(-) create mode 100644 portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/roso/delete-structure-confirmation-dialog/delete-structure-confirmation-dialog.component.html create mode 100644 portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/roso/delete-structure-confirmation-dialog/delete-structure-confirmation-dialog.component.scss create mode 100644 portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/roso/delete-structure-confirmation-dialog/delete-structure-confirmation-dialog.component.spec.ts create mode 100644 portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/roso/delete-structure-confirmation-dialog/delete-structure-confirmation-dialog.component.ts create mode 100644 portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/roso/roso-additional-information.component.html create mode 100644 portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/roso/roso-additional-information.component.scss create mode 100644 portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/roso/roso-additional-information.component.spec.ts create mode 100644 portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/roso/roso-additional-information.component.ts create mode 100644 portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/roso/soil-removal-confirmation-dialog/soil-removal-confirmation-dialog.component.html create mode 100644 portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/roso/soil-removal-confirmation-dialog/soil-removal-confirmation-dialog.component.scss create mode 100644 portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/roso/soil-removal-confirmation-dialog/soil-removal-confirmation-dialog.component.spec.ts create mode 100644 portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/roso/soil-removal-confirmation-dialog/soil-removal-confirmation-dialog.component.ts create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1692031918906-new_document_type.ts create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1692046187722-roso_noi_additional_soil_fields.ts diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/roso/delete-structure-confirmation-dialog/delete-structure-confirmation-dialog.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/roso/delete-structure-confirmation-dialog/delete-structure-confirmation-dialog.component.html new file mode 100644 index 0000000000..413c84b902 --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/roso/delete-structure-confirmation-dialog/delete-structure-confirmation-dialog.component.html @@ -0,0 +1,14 @@ +
+

Delete Structure Type

+
+ +
+ + Warning: Deleting the structure type can remove some content already saved to this page.
+ Do you want to continue? + +
+ + +
+
diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/roso/delete-structure-confirmation-dialog/delete-structure-confirmation-dialog.component.scss b/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/roso/delete-structure-confirmation-dialog/delete-structure-confirmation-dialog.component.scss new file mode 100644 index 0000000000..245cf0a559 --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/roso/delete-structure-confirmation-dialog/delete-structure-confirmation-dialog.component.scss @@ -0,0 +1,24 @@ +@use '../../../../../../../styles/functions' as *; + +.margin-bottom-1 { + margin-bottom: rem(16); +} + +.controls { + display: flex; + justify-content: space-between; +} + +.confirm-content { + margin: rem(24) 0; +} + +@media screen and (min-width: $desktopBreakpoint) { + .controls { + justify-content: flex-end; + + button { + margin-left: rem(25) !important; + } + } +} diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/roso/delete-structure-confirmation-dialog/delete-structure-confirmation-dialog.component.spec.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/roso/delete-structure-confirmation-dialog/delete-structure-confirmation-dialog.component.spec.ts new file mode 100644 index 0000000000..e99c9e81b6 --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/roso/delete-structure-confirmation-dialog/delete-structure-confirmation-dialog.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { MatDialogRef } from '@angular/material/dialog'; + +import { DeleteStructureConfirmationDialogComponent } from './delete-structure-confirmation-dialog.component'; + +describe('DeleteStructureConfirmationDialogComponent', () => { + let component: DeleteStructureConfirmationDialogComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ DeleteStructureConfirmationDialogComponent ], + providers: [{ provide: MatDialogRef, useValue: {} }], + }) + .compileComponents(); + + fixture = TestBed.createComponent(DeleteStructureConfirmationDialogComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/roso/delete-structure-confirmation-dialog/delete-structure-confirmation-dialog.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/roso/delete-structure-confirmation-dialog/delete-structure-confirmation-dialog.component.ts new file mode 100644 index 0000000000..55ca0f2995 --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/roso/delete-structure-confirmation-dialog/delete-structure-confirmation-dialog.component.ts @@ -0,0 +1,8 @@ +import { Component } from '@angular/core'; + +@Component({ + selector: 'app-delete-structure-confirmation-dialog', + templateUrl: './delete-structure-confirmation-dialog.component.html', + styleUrls: ['./delete-structure-confirmation-dialog.component.scss'], +}) +export class DeleteStructureConfirmationDialogComponent {} diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/roso/roso-additional-information.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/roso/roso-additional-information.component.html new file mode 100644 index 0000000000..6c46489b3a --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/roso/roso-additional-information.component.html @@ -0,0 +1,288 @@ +
+

Additional Proposal Information

+

+ Considerations are subject to + FIXME: Section 6 of the ALC Act. +

+

All fields are required unless stated optional.

+
+ + In order to complete this step, please consult the following pages on the ALC website: + + + +
+
+
+ +
Structures include farm buildings, residences, or accessory buildings
+
+ + Yes + + No + + +
+ Note: The form will be updated with additional required questions if you are building a structure +
+
+ + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
#{{ i + 1 }}Type + + + + {{ type }} + + + + Total Floor Area + + + m2 + + Action + +
+ No Proposed Structures Entered. Use the button below to add your first structure. +
+
+
+ +
+
+ + + At least one structure is required + +
+ +
+ + Selected proposed structure type(s) will determine the proposal questions below + +
+ +
+ + + + +
+ warning +
This field is required
+
+
Characters left: {{ 4000 - soilStructureFarmUseReasonText.textLength }}
+
+ +
+ + + + +
+ warning +
This field is required
+
+
Characters left: {{ 4000 - soilStructureResidentialUseReasonText.textLength }}
+
+ +
+ +
Include the area, yields, crop types, and farm equipment size and attachments
+ + + +
+ warning +
This field is required
+
+
Characters left: {{ 4000 - soilAgriParcelActivityText.textLength }}
+
+ +
+ + + + +
+ warning +
This field is required
+
+
Characters left: {{ 4000 - structureResidentialAccessoryUseReasonText.textLength }}
+
+ +
+ +
+ Building plans must be the most up to date, current version and should include (1) the total floor area of all + levels and the intended use; and (2) interior and exterior views +
+ +
+
+ +
+
+ + +
+ + +
+
diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/roso/roso-additional-information.component.scss b/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/roso/roso-additional-information.component.scss new file mode 100644 index 0000000000..e69de29bb2 diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/roso/roso-additional-information.component.spec.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/roso/roso-additional-information.component.spec.ts new file mode 100644 index 0000000000..5c598f894f --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/roso/roso-additional-information.component.spec.ts @@ -0,0 +1,43 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { MatDialog } from '@angular/material/dialog'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { BehaviorSubject } from 'rxjs'; +import { NoticeOfIntentDocumentDto } from '../../../../../services/notice-of-intent-document/notice-of-intent-document.dto'; +import { NoticeOfIntentDocumentService } from '../../../../../services/notice-of-intent-document/notice-of-intent-document.service'; +import { NoticeOfIntentSubmissionDetailedDto } from '../../../../../services/notice-of-intent-submission/notice-of-intent-submission.dto'; +import { NoticeOfIntentSubmissionService } from '../../../../../services/notice-of-intent-submission/notice-of-intent-submission.service'; + +import { RosoAdditionalInformationComponent } from './roso-additional-information.component'; + +describe('RosoAdditionalInformationComponent', () => { + let component: RosoAdditionalInformationComponent; + let fixture: ComponentFixture; + let mockNoticeOfIntentSubmissionService: DeepMocked; + let mockNoticeOfIntentDocumentService: DeepMocked; + + beforeEach(async () => { + mockNoticeOfIntentSubmissionService = createMock(); + mockNoticeOfIntentDocumentService = createMock(); + await TestBed.configureTestingModule({ + declarations: [RosoAdditionalInformationComponent], + providers: [ + { provide: MatDialog, useValue: {} }, + { + provide: NoticeOfIntentSubmissionService, + useValue: mockNoticeOfIntentSubmissionService, + }, + { provide: NoticeOfIntentDocumentService, useValue: mockNoticeOfIntentDocumentService }, + ], + }).compileComponents(); + + fixture = TestBed.createComponent(RosoAdditionalInformationComponent); + component = fixture.componentInstance; + component.$noiSubmission = new BehaviorSubject(undefined); + component.$noiDocuments = new BehaviorSubject([]); + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/roso/roso-additional-information.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/roso/roso-additional-information.component.ts new file mode 100644 index 0000000000..1d694c58f3 --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/roso/roso-additional-information.component.ts @@ -0,0 +1,282 @@ +import { Component, OnDestroy, OnInit } from '@angular/core'; +import { FormControl, FormGroup, Validators } from '@angular/forms'; +import { MatButtonToggleChange } from '@angular/material/button-toggle'; +import { MatDialog } from '@angular/material/dialog'; +import { MatTableDataSource } from '@angular/material/table'; +import { takeUntil } from 'rxjs'; +import { NoticeOfIntentDocumentDto } from '../../../../../services/notice-of-intent-document/notice-of-intent-document.dto'; +import { NoticeOfIntentDocumentService } from '../../../../../services/notice-of-intent-document/notice-of-intent-document.service'; +import { NoticeOfIntentSubmissionUpdateDto } from '../../../../../services/notice-of-intent-submission/notice-of-intent-submission.dto'; +import { NoticeOfIntentSubmissionService } from '../../../../../services/notice-of-intent-submission/notice-of-intent-submission.service'; +import { DOCUMENT_TYPE } from '../../../../../shared/dto/document.dto'; +import { formatBooleanToString } from '../../../../../shared/utils/boolean-helper'; +import { parseStringToBoolean } from '../../../../../shared/utils/string-helper'; +import { EditNoiSteps } from '../../edit-submission.component'; +import { FilesStepComponent } from '../../files-step.partial'; +import { DeleteStructureConfirmationDialogComponent } from './delete-structure-confirmation-dialog/delete-structure-confirmation-dialog.component'; +import { SoilRemovalConfirmationDialogComponent } from './soil-removal-confirmation-dialog/soil-removal-confirmation-dialog.component'; + +export enum STRUCTURE_TYPES { + FARM_STRUCTURE = 'Farm Structure', + PRINCIPAL_RESIDENCE = 'Residential - Principal Residence', + ADDITIONAL_RESIDENCE = 'Residential - Additional Residence', + ACCESSORY_STRUCTURE = 'Residential - Accessory Structure', +} + +type ProposedStructure = { type: STRUCTURE_TYPES | null; area: string | null }; + +const RESIDENTIAL_STRUCTURE_TYPES = [ + STRUCTURE_TYPES.ACCESSORY_STRUCTURE, + STRUCTURE_TYPES.ADDITIONAL_RESIDENCE, + STRUCTURE_TYPES.PRINCIPAL_RESIDENCE, +]; + +@Component({ + selector: 'app-roso-additional-information', + templateUrl: './roso-additional-information.component.html', + styleUrls: ['./roso-additional-information.component.scss'], +}) +export class RosoAdditionalInformationComponent extends FilesStepComponent implements OnInit, OnDestroy { + currentStep = EditNoiSteps.ExtraInfo; + + DOCUMENT = DOCUMENT_TYPE; + STRUCTURE_TYPES = [ + STRUCTURE_TYPES.FARM_STRUCTURE, + STRUCTURE_TYPES.PRINCIPAL_RESIDENCE, + STRUCTURE_TYPES.ADDITIONAL_RESIDENCE, + STRUCTURE_TYPES.ACCESSORY_STRUCTURE, + ]; + + private submissionUuid = ''; + + confirmRemovalOfSoil = false; + buildingPlans: NoticeOfIntentDocumentDto[] = []; + + proposedStructures: ProposedStructure[] = []; + structuresSource = new MatTableDataSource(this.proposedStructures); + displayedColumns = ['index', 'type', 'area', 'action']; + + isSoilStructureFarmUseReasonVisible = false; + isSoilStructureResidentialUseReasonVisible = false; + isSoilAgriParcelActivityVisible = false; + isSoilStructureResidentialAccessoryUseReasonVisible = false; + + isRemovingSoilForNewStructure = new FormControl(null, [Validators.required]); + soilStructureFarmUseReason = new FormControl(null); + soilStructureResidentialUseReason = new FormControl(null); + soilAgriParcelActivity = new FormControl(null); + soilStructureResidentialAccessoryUseReason = new FormControl(null); + + form = new FormGroup({ + isRemovingSoilForNewStructure: this.isRemovingSoilForNewStructure, + soilStructureFarmUseReason: this.soilStructureFarmUseReason, + soilStructureResidentialUseReason: this.soilStructureResidentialUseReason, + soilAgriParcelActivity: this.soilAgriParcelActivity, + soilStructureResidentialAccessoryUseReason: this.soilStructureResidentialAccessoryUseReason, + }); + + constructor( + private noticeOfIntentSubmissionService: NoticeOfIntentSubmissionService, + noticeOfIntentDocumentService: NoticeOfIntentDocumentService, + dialog: MatDialog + ) { + super(noticeOfIntentDocumentService, dialog); + } + + ngOnInit(): void { + this.$noiSubmission.pipe(takeUntil(this.$destroy)).subscribe((noiSubmission) => { + if (noiSubmission) { + this.fileId = noiSubmission.fileNumber; + this.submissionUuid = noiSubmission.uuid; + + if (noiSubmission.soilIsRemovingSoilForNewStructure) { + this.confirmRemovalOfSoil = true; + } + + this.form.patchValue({ + isRemovingSoilForNewStructure: formatBooleanToString(noiSubmission.soilIsRemovingSoilForNewStructure), + soilStructureFarmUseReason: noiSubmission.soilStructureFarmUseReason, + soilStructureResidentialUseReason: noiSubmission.soilStructureResidentialUseReason, + soilAgriParcelActivity: noiSubmission.soilAgriParcelActivity, + soilStructureResidentialAccessoryUseReason: noiSubmission.soilStructureResidentialAccessoryUseReason, + }); + + this.proposedStructures = noiSubmission.soilProposedStructures.map((structure) => ({ + ...structure, + area: structure.area ? structure.area.toString(10) : null, + })); + this.structuresSource = new MatTableDataSource(this.proposedStructures); + this.prepareStructureSpecificTextInputs(); + + if (this.showErrors) { + this.form.markAllAsTouched(); + } + } + }); + + this.$noiDocuments.pipe(takeUntil(this.$destroy)).subscribe((documents) => { + this.buildingPlans = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.BUILDING_PLAN); + }); + } + + prepareStructureSpecificTextInputs() { + this.setVisibilityAndValidatorsForFarmFields(); + + this.setVisibilityAndValidatorsForAccessoryFields(); + + this.setVisibilityAndValidatorsForResidentialFields(); + } + + private setVisibilityAndValidatorsForResidentialFields() { + if ( + this.proposedStructures.some( + (structure) => structure.type && RESIDENTIAL_STRUCTURE_TYPES.includes(structure.type) + ) + ) { + this.isSoilStructureResidentialUseReasonVisible = true; + this.soilStructureResidentialUseReason.setValidators([Validators.required]); + } else { + this.isSoilStructureResidentialUseReasonVisible = false; + this.soilStructureResidentialUseReason.removeValidators([Validators.required]); + this.soilStructureResidentialUseReason.reset(); + } + } + + private setVisibilityAndValidatorsForAccessoryFields() { + if (this.proposedStructures.some((structure) => structure.type === STRUCTURE_TYPES.ACCESSORY_STRUCTURE)) { + this.isSoilStructureResidentialAccessoryUseReasonVisible = true; + this.soilStructureResidentialAccessoryUseReason.setValidators([Validators.required]); + } else { + this.isSoilStructureResidentialAccessoryUseReasonVisible = false; + this.soilStructureResidentialAccessoryUseReason.removeValidators([Validators.required]); + this.soilStructureResidentialAccessoryUseReason.reset(); + } + } + + private setVisibilityAndValidatorsForFarmFields() { + if (this.proposedStructures.some((structure) => structure.type === STRUCTURE_TYPES.FARM_STRUCTURE)) { + this.isSoilAgriParcelActivityVisible = true; + this.isSoilStructureFarmUseReasonVisible = true; + this.soilAgriParcelActivity.setValidators([Validators.required]); + this.soilStructureFarmUseReason.setValidators([Validators.required]); + } else { + this.isSoilAgriParcelActivityVisible = false; + this.isSoilStructureFarmUseReasonVisible = false; + this.soilAgriParcelActivity.removeValidators([Validators.required]); + this.soilStructureFarmUseReason.removeValidators([Validators.required]); + this.soilAgriParcelActivity.reset(); + this.soilStructureFarmUseReason.reset(); + } + } + + async onSave() { + await this.save(); + } + + protected async save(): Promise { + if (this.fileId && this.form.dirty) { + const isRemovingSoilForNewStructure = this.isRemovingSoilForNewStructure.getRawValue(); + const soilStructureFarmUseReason = this.soilStructureFarmUseReason.getRawValue(); + const soilStructureResidentialUseReason = this.soilStructureResidentialUseReason.getRawValue(); + const soilAgriParcelActivity = this.soilAgriParcelActivity.getRawValue(); + const soilStructureResidentialAccessoryUseReason = this.soilStructureResidentialAccessoryUseReason.getRawValue(); + + const updateDto: NoticeOfIntentSubmissionUpdateDto = { + soilStructureFarmUseReason, + soilStructureResidentialUseReason, + soilIsRemovingSoilForNewStructure: parseStringToBoolean(isRemovingSoilForNewStructure), + soilAgriParcelActivity, + soilStructureResidentialAccessoryUseReason, + soilProposedStructures: this.proposedStructures.map((structure) => ({ + ...structure, + area: structure.area ? parseFloat(structure.area) : null, + })), + }; + + const updatedApp = await this.noticeOfIntentSubmissionService.updatePending(this.submissionUuid, updateDto); + this.$noiSubmission.next(updatedApp); + } + } + + onChangeIsRemovingSoilForNewStructure($event: MatButtonToggleChange) { + const parsedSelectedValue = parseStringToBoolean($event.value); + + if (this.confirmRemovalOfSoil === true && parsedSelectedValue === false) { + this.dialog + .open(SoilRemovalConfirmationDialogComponent, { + panelClass: 'no-padding', + disableClose: true, + }) + .beforeClosed() + .subscribe(async (result) => { + if (result) { + await this.noticeOfIntentDocumentService.deleteExternalFiles(this.buildingPlans.map((doc) => doc.uuid)); + this.buildingPlans = []; + + this.confirmRemovalOfSoil = false; + this.form.reset(); + this.form.controls.isRemovingSoilForNewStructure.setValue('false'); + this.proposedStructures = []; + this.structuresSource = new MatTableDataSource(this.proposedStructures); + + await this.save(); + } else { + this.form.controls.isRemovingSoilForNewStructure.setValue('true'); + } + }); + } else { + this.confirmRemovalOfSoil = parsedSelectedValue ?? false; + } + } + + onChangeStructureType(index: number, value: STRUCTURE_TYPES) { + this.proposedStructures[index].type = value; + + this.prepareStructureSpecificTextInputs(); + + this.form.markAsDirty(); + } + + onStructureRemove(index: number) { + this.dialog + .open(DeleteStructureConfirmationDialogComponent, { + panelClass: 'no-padding', + disableClose: true, + }) + .beforeClosed() + .subscribe(async (result) => { + if (result) { + this.deleteStructure(index); + } + }); + } + + private deleteStructure(index: number) { + const deletedStructure: ProposedStructure = this.proposedStructures.splice(index, 1)[0]; + this.structuresSource = new MatTableDataSource(this.proposedStructures); + + if (deletedStructure.type === STRUCTURE_TYPES.FARM_STRUCTURE) { + this.setVisibilityAndValidatorsForFarmFields(); + } + + if (deletedStructure.type === STRUCTURE_TYPES.ACCESSORY_STRUCTURE) { + this.setVisibilityAndValidatorsForAccessoryFields(); + } + + if (deletedStructure.type && RESIDENTIAL_STRUCTURE_TYPES.includes(deletedStructure.type)) { + this.setVisibilityAndValidatorsForResidentialFields(); + } + + this.form.markAsDirty(); + } + + onStructureAdd() { + this.proposedStructures.push({ type: null, area: '' }); + this.structuresSource = new MatTableDataSource(this.proposedStructures); + this.form.markAsDirty(); + } + + onAreaChange() { + this.form.markAsDirty(); + } +} diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/roso/soil-removal-confirmation-dialog/soil-removal-confirmation-dialog.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/roso/soil-removal-confirmation-dialog/soil-removal-confirmation-dialog.component.html new file mode 100644 index 0000000000..4650212c0f --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/roso/soil-removal-confirmation-dialog/soil-removal-confirmation-dialog.component.html @@ -0,0 +1,14 @@ +
+

Are you removing soil in order to build a structure?

+
+ +
+ + Warning: Changing your answer will remove all the saved progress on this step. Do you want to + continue? +
+ + +
+
diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/roso/soil-removal-confirmation-dialog/soil-removal-confirmation-dialog.component.scss b/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/roso/soil-removal-confirmation-dialog/soil-removal-confirmation-dialog.component.scss new file mode 100644 index 0000000000..245cf0a559 --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/roso/soil-removal-confirmation-dialog/soil-removal-confirmation-dialog.component.scss @@ -0,0 +1,24 @@ +@use '../../../../../../../styles/functions' as *; + +.margin-bottom-1 { + margin-bottom: rem(16); +} + +.controls { + display: flex; + justify-content: space-between; +} + +.confirm-content { + margin: rem(24) 0; +} + +@media screen and (min-width: $desktopBreakpoint) { + .controls { + justify-content: flex-end; + + button { + margin-left: rem(25) !important; + } + } +} diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/roso/soil-removal-confirmation-dialog/soil-removal-confirmation-dialog.component.spec.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/roso/soil-removal-confirmation-dialog/soil-removal-confirmation-dialog.component.spec.ts new file mode 100644 index 0000000000..b726b84ca4 --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/roso/soil-removal-confirmation-dialog/soil-removal-confirmation-dialog.component.spec.ts @@ -0,0 +1,24 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { MatDialogRef } from '@angular/material/dialog'; + +import { SoilRemovalConfirmationDialogComponent } from './soil-removal-confirmation-dialog.component'; + +describe('SoilRemovalConfirmationDialogComponent', () => { + let component: SoilRemovalConfirmationDialogComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [SoilRemovalConfirmationDialogComponent], + providers: [{ provide: MatDialogRef, useValue: {} }], + }).compileComponents(); + + fixture = TestBed.createComponent(SoilRemovalConfirmationDialogComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/roso/soil-removal-confirmation-dialog/soil-removal-confirmation-dialog.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/roso/soil-removal-confirmation-dialog/soil-removal-confirmation-dialog.component.ts new file mode 100644 index 0000000000..ff0f70decf --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/roso/soil-removal-confirmation-dialog/soil-removal-confirmation-dialog.component.ts @@ -0,0 +1,20 @@ +import { Component } from '@angular/core'; +import { MatDialogRef } from '@angular/material/dialog'; +import { DeleteStructureConfirmationDialogComponent } from '../delete-structure-confirmation-dialog/delete-structure-confirmation-dialog.component'; + +@Component({ + selector: 'app-soil-removal-confirmation-dialog', + templateUrl: './soil-removal-confirmation-dialog.component.html', + styleUrls: ['./soil-removal-confirmation-dialog.component.scss'], +}) +export class SoilRemovalConfirmationDialogComponent { + constructor(private dialogRef: MatDialogRef) {} + + async onCancel(dialogResult: boolean = false) { + this.dialogRef.close(dialogResult); + } + + async onConfirm() { + this.onCancel(true); + } +} diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission-base.module.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission-base.module.ts index f544a4d2f2..20505d8ff1 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission-base.module.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission-base.module.ts @@ -8,7 +8,10 @@ import { MatSelectModule } from '@angular/material/select'; import { MatTableModule } from '@angular/material/table'; import { NgxMaskDirective, NgxMaskPipe } from 'ngx-mask'; import { SharedModule } from '../../../shared/shared.module'; +import { RosoAdditionalInformationComponent } from './additional-information/roso/roso-additional-information.component'; import { NoticeOfIntentDetailsModule } from '../notice-of-intent-details/notice-of-intent-details.module'; +import { DeleteStructureConfirmationDialogComponent } from './additional-information/roso/delete-structure-confirmation-dialog/delete-structure-confirmation-dialog.component'; +import { SoilRemovalConfirmationDialogComponent } from './additional-information/roso/soil-removal-confirmation-dialog/soil-removal-confirmation-dialog.component'; import { EditSubmissionComponent } from './edit-submission.component'; import { LandUseComponent } from './land-use/land-use.component'; import { OtherAttachmentsComponent } from './other-attachments/other-attachments.component'; @@ -47,6 +50,9 @@ import { SelectGovernmentComponent } from './select-government/select-government LandUseComponent, OtherAttachmentsComponent, RosoProposalComponent, + RosoAdditionalInformationComponent, + DeleteStructureConfirmationDialogComponent, + SoilRemovalConfirmationDialogComponent, ReviewAndSubmitComponent, SubmitConfirmationDialogComponent, ], @@ -61,6 +67,7 @@ import { SelectGovernmentComponent } from './select-government/select-government LandUseComponent, OtherAttachmentsComponent, RosoProposalComponent, + RosoAdditionalInformationComponent, ReviewAndSubmitComponent, SubmitConfirmationDialogComponent, ], diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.html index 46b5f6be22..003efb3fb6 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.html @@ -91,7 +91,17 @@
Notice of Intent ID: {{ noiSubmission.fileNumber }} | -
Additional Information
+
+ +
diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.ts index c46203b65c..a6aca4df59 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.ts @@ -12,6 +12,7 @@ import { ToastService } from '../../../services/toast/toast.service'; import { CustomStepperComponent } from '../../../shared/custom-stepper/custom-stepper.component'; import { OverlaySpinnerService } from '../../../shared/overlay-spinner/overlay-spinner.service'; import { scrollToElement } from '../../../shared/utils/scroll-helper'; +import { RosoAdditionalInformationComponent } from './additional-information/roso/roso-additional-information.component'; import { LandUseComponent } from './land-use/land-use.component'; import { OtherAttachmentsComponent } from './other-attachments/other-attachments.component'; import { ParcelDetailsComponent } from './parcels/parcel-details.component'; @@ -56,6 +57,7 @@ export class EditSubmissionComponent implements OnDestroy, AfterViewInit { @ViewChild(LandUseComponent) landUseComponent!: LandUseComponent; @ViewChild(OtherAttachmentsComponent) otherAttachmentsComponent!: OtherAttachmentsComponent; @ViewChild(RosoProposalComponent) rosoProposalComponent!: RosoProposalComponent; + @ViewChild(RosoAdditionalInformationComponent) rosoAdditionalInfoComponent!: RosoAdditionalInformationComponent; constructor( private noticeOfIntentSubmissionService: NoticeOfIntentSubmissionService, @@ -153,6 +155,11 @@ export class EditSubmissionComponent implements OnDestroy, AfterViewInit { await this.rosoProposalComponent.onSave(); } break; + case EditNoiSteps.ExtraInfo: + if (this.rosoAdditionalInfoComponent) { + await this.rosoAdditionalInfoComponent.onSave(); + } + break; case EditNoiSteps.ReviewAndSubmit: //DO NOTHING break; diff --git a/portal-frontend/src/app/services/notice-of-intent-document/notice-of-intent-document.service.spec.ts b/portal-frontend/src/app/services/notice-of-intent-document/notice-of-intent-document.service.spec.ts index 5c07e25903..19295bb9e9 100644 --- a/portal-frontend/src/app/services/notice-of-intent-document/notice-of-intent-document.service.spec.ts +++ b/portal-frontend/src/app/services/notice-of-intent-document/notice-of-intent-document.service.spec.ts @@ -88,4 +88,22 @@ describe('NoticeOfIntentDocumentService', () => { expect(mockHttpClient.patch).toHaveBeenCalledTimes(1); expect(mockToastService.showErrorToast).toHaveBeenCalledTimes(1); }); + + it('should make a post request for deleting multiple files', async () => { + mockHttpClient.post.mockReturnValue(of({})); + + await service.deleteExternalFiles(['fileId']); + + expect(mockHttpClient.post).toHaveBeenCalledTimes(1); + expect(mockHttpClient.post.mock.calls[0][0]).toContain('notice-of-intent-document'); + }); + + it('should show an error toast if deleting a file fails', async () => { + mockHttpClient.post.mockReturnValue(throwError(() => ({}))); + + await service.deleteExternalFiles(['fileId']); + + expect(mockHttpClient.post).toHaveBeenCalledTimes(1); + expect(mockToastService.showErrorToast).toHaveBeenCalledTimes(1); + }); }); diff --git a/portal-frontend/src/app/services/notice-of-intent-document/notice-of-intent-document.service.ts b/portal-frontend/src/app/services/notice-of-intent-document/notice-of-intent-document.service.ts index 7ae8f404a9..b2b363f816 100644 --- a/portal-frontend/src/app/services/notice-of-intent-document/notice-of-intent-document.service.ts +++ b/portal-frontend/src/app/services/notice-of-intent-document/notice-of-intent-document.service.ts @@ -67,6 +67,18 @@ export class NoticeOfIntentDocumentService { } } + async deleteExternalFiles(fileUuids: string[]) { + try { + this.overlayService.showSpinner(); + await firstValueFrom(this.httpClient.post(`${this.serviceUrl}/delete-files`, fileUuids)); + } catch (e) { + console.error(e); + this.toastService.showErrorToast('Failed to delete documents'); + } finally { + this.overlayService.hideSpinner(); + } + } + async update(fileNumber: string | undefined, updateDtos: NoticeOfIntentDocumentUpdateDto[]) { try { await firstValueFrom(this.httpClient.patch(`${this.serviceUrl}/application/${fileNumber}`, updateDtos)); diff --git a/portal-frontend/src/app/services/notice-of-intent-submission/notice-of-intent-submission.dto.ts b/portal-frontend/src/app/services/notice-of-intent-submission/notice-of-intent-submission.dto.ts index 2cecd2086f..798c1ada78 100644 --- a/portal-frontend/src/app/services/notice-of-intent-submission/notice-of-intent-submission.dto.ts +++ b/portal-frontend/src/app/services/notice-of-intent-submission/notice-of-intent-submission.dto.ts @@ -1,3 +1,4 @@ +import { STRUCTURE_TYPES } from '../../features/notice-of-intents/edit-submission/additional-information/roso/roso-additional-information.component'; import { BaseCodeDto } from '../../shared/dto/base.dto'; import { NoticeOfIntentOwnerDto } from '../notice-of-intent-owner/notice-of-intent-owner.dto'; @@ -81,6 +82,12 @@ export interface NoticeOfIntentSubmissionDetailedDto extends NoticeOfIntentSubmi soilAlternativeMeasures?: string | null; soilIsExtractionOrMining?: boolean; soilHasSubmittedNotice?: boolean; + soilIsRemovingSoilForNewStructure: boolean | null; + soilStructureFarmUseReason?: string | null; + soilStructureResidentialUseReason?: string | null; + soilAgriParcelActivity?: string | null; + soilStructureResidentialAccessoryUseReason?: string | null; + soilProposedStructures: ProposedStructure[]; } export interface NoticeOfIntentSubmissionUpdateDto { @@ -127,4 +134,15 @@ export interface NoticeOfIntentSubmissionUpdateDto { soilAlternativeMeasures?: string | null; soilIsExtractionOrMining?: boolean | null; soilHasSubmittedNotice?: boolean | null; + soilIsRemovingSoilForNewStructure?: boolean | null; + soilStructureFarmUseReason?: string | null; + soilStructureResidentialUseReason?: string | null; + soilAgriParcelActivity?: string | null; + soilStructureResidentialAccessoryUseReason?: string | null; + soilProposedStructures?: ProposedStructure[]; +} + +export interface ProposedStructure { + type: STRUCTURE_TYPES | null; + area: number | null; } diff --git a/portal-frontend/src/app/shared/dto/document.dto.ts b/portal-frontend/src/app/shared/dto/document.dto.ts index e2dfebeef6..b68976bb1e 100644 --- a/portal-frontend/src/app/shared/dto/document.dto.ts +++ b/portal-frontend/src/app/shared/dto/document.dto.ts @@ -16,7 +16,7 @@ export enum DOCUMENT_TYPE { AUTHORIZATION_LETTER = 'AAGR', CERTIFICATE_OF_TITLE = 'CERT', - //App Documents + //App Documents and NOI Documents SERVING_NOTICE = 'POSN', PROPOSAL_MAP = 'PRSK', HOMESITE_SEVERANCE = 'HOME', @@ -26,6 +26,9 @@ export enum DOCUMENT_TYPE { PROOF_OF_SIGNAGE = 'POSA', REPORT_OF_PUBLIC_HEARING = 'ROPH', PROOF_OF_ADVERTISING = 'POAA', + + //NOI DOCUMENTS + BUILDING_PLAN = 'BLDP', } export enum DOCUMENT_SOURCE { diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.service.spec.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.service.spec.ts index d9cdd8ca16..173cc26427 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.service.spec.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.service.spec.ts @@ -3,11 +3,11 @@ import { MultipartFile } from '@fastify/multipart'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; -import { Repository } from 'typeorm'; +import { In, Repository } from 'typeorm'; import { initApplicationMockEntity } from '../../../../test/mocks/mockEntities'; import { - DOCUMENT_TYPE, DocumentCode, + DOCUMENT_TYPE, } from '../../../document/document-code.entity'; import { DOCUMENT_SOURCE, @@ -112,7 +112,7 @@ describe('NoticeOfIntentDocumentService', () => { expect(res).toBe(mockSavedDocument); }); - it('should delete document and application document when deleting', async () => { + it('should delete document and noi document when deleting', async () => { const mockDocument = {}; const mockAppDocument = { uuid: '1', @@ -340,4 +340,38 @@ describe('NoticeOfIntentDocumentService', () => { expect(mockDocumentService.create).toHaveBeenCalledTimes(1); expect(mockRepository.save).toHaveBeenCalledTimes(1); }); + + it('should delete multiple documents and noi documents linked to it when deleting', async () => { + const mockDocuments = [new Document(), new Document()]; + const mockNoiDocuments = [ + new NoticeOfIntentDocument({ + document: new Document(), + }), + new NoticeOfIntentDocument({ + document: new Document(), + }), + ]; + + mockDocumentService.softRemoveMany.mockResolvedValue(); + mockRepository.remove.mockResolvedValue({} as any); + mockRepository.find.mockResolvedValue(mockNoiDocuments); + + await service.deleteMany(['fileId_1', 'fileId_2']); + + expect(mockDocumentService.softRemoveMany.mock.calls[0][0]).toEqual( + mockDocuments, + ); + expect(mockDocumentService.softRemoveMany).toHaveBeenCalledTimes(1); + expect(mockRepository.find).toHaveBeenCalledTimes(1); + expect(mockRepository.find).toHaveBeenCalledWith({ + where: { + uuid: In(['fileId_1', 'fileId_2']), + }, + relations: { + document: true, + }, + }); + expect(mockRepository.remove).toHaveBeenCalledTimes(1); + expect(mockRepository.remove.mock.calls[0][0]).toBe(mockNoiDocuments); + }); }); diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.service.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.service.ts index 91509763b4..1fcbd1a212 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.service.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.service.ts @@ -9,11 +9,12 @@ import { ArrayOverlap, FindOptionsRelations, FindOptionsWhere, + In, Repository, } from 'typeorm'; import { - DOCUMENT_TYPE, DocumentCode, + DOCUMENT_TYPE, } from '../../../document/document-code.entity'; import { DOCUMENT_SOURCE, @@ -149,6 +150,21 @@ export class NoticeOfIntentDocumentService { return document; } + async deleteMany(noiDocumentUuids: string[]) { + const noiDocuments = await this.noticeOfIntentDocumentRepository.find({ + where: { + uuid: In(noiDocumentUuids), + }, + relations: { + document: true, + }, + }); + await this.noticeOfIntentDocumentRepository.remove(noiDocuments); + await this.documentService.softRemoveMany( + noiDocuments.map((doc) => doc.document), + ); + } + async list(fileNumber: string, visibilityFlags?: VISIBILITY_FLAG[]) { const where: FindOptionsWhere = { noticeOfIntent: { diff --git a/services/apps/alcs/src/document/document-code.entity.ts b/services/apps/alcs/src/document/document-code.entity.ts index 98120bbab4..b4618f9a4a 100644 --- a/services/apps/alcs/src/document/document-code.entity.ts +++ b/services/apps/alcs/src/document/document-code.entity.ts @@ -26,6 +26,7 @@ export enum DOCUMENT_TYPE { PROOF_OF_SIGNAGE = 'POSA', REPORT_OF_PUBLIC_HEARING = 'ROPH', PROOF_OF_ADVERTISING = 'POAA', + BUILDING_PLAN = 'BLDP', ORIGINAL_SUBMISSION = 'SUBO', UPDATED_SUBMISSION = 'SUBU', diff --git a/services/apps/alcs/src/document/document.service.spec.ts b/services/apps/alcs/src/document/document.service.spec.ts index 970d417347..6d17fb7a65 100644 --- a/services/apps/alcs/src/document/document.service.spec.ts +++ b/services/apps/alcs/src/document/document.service.spec.ts @@ -70,7 +70,7 @@ describe('DocumentService', () => { expect(mockRepository.save).toHaveBeenCalledTimes(1); }); - it('should delete from s3 and repo on delete', async () => { + it('should delete file from repo on delete', async () => { mockRepository.softRemove.mockResolvedValue({} as any); const documentUuid = 'fake-uuid'; @@ -82,6 +82,20 @@ describe('DocumentService', () => { expect(mockRepository.softRemove).toHaveBeenCalledTimes(1); }); + it('should delete multiple files from repo on delete', async () => { + mockRepository.softRemove.mockResolvedValue({} as any); + + const documentUuid = 'fake-uuid'; + + await service.softRemoveMany([ + { + uuid: documentUuid, + } as Document, + ]); + + expect(mockRepository.softRemove).toHaveBeenCalledTimes(1); + }); + it('should call repository save on create Document', async () => { const mockDoc = { mimeType: 'mimeType', diff --git a/services/apps/alcs/src/document/document.service.ts b/services/apps/alcs/src/document/document.service.ts index 269c0139fd..3502af41a9 100644 --- a/services/apps/alcs/src/document/document.service.ts +++ b/services/apps/alcs/src/document/document.service.ts @@ -2,7 +2,6 @@ import { CONFIG_TOKEN, IConfig } from '@app/common/config/config.module'; import { GetObjectCommand, PutObjectCommand, - PutObjectTaggingCommand, S3Client, } from '@aws-sdk/client-s3'; import { getSignedUrl } from '@aws-sdk/s3-request-presigner'; @@ -117,6 +116,10 @@ export class DocumentService { await this.documentRepository.softRemove(document); } + async softRemoveMany(documents: Document[]) { + await this.documentRepository.softRemove(documents); + } + async getUploadUrl(filePath: string) { const fileKey = `${filePath}/${v4()}`; const command = new PutObjectCommand({ diff --git a/services/apps/alcs/src/portal/notice-of-intent-document/notice-of-intent-document.controller.spec.ts b/services/apps/alcs/src/portal/notice-of-intent-document/notice-of-intent-document.controller.spec.ts index 920aa7d08b..f7c0ffb97c 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-document/notice-of-intent-document.controller.spec.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-document/notice-of-intent-document.controller.spec.ts @@ -85,7 +85,7 @@ describe('NoticeOfIntentDocumentController', () => { expect(controller).toBeDefined(); }); - it('should call through to delete documents', async () => { + it('should call through to delete document', async () => { noiDocumentService.delete.mockResolvedValue(mockDocument); noiDocumentService.get.mockResolvedValue(mockDocument); @@ -176,4 +176,12 @@ describe('NoticeOfIntentDocumentController', () => { expect(res.uploadedBy).toEqual(user.user.entity); expect(res.uuid).toEqual(fakeUuid); }); + + it('should call through to delete multiple documents', async () => { + noiDocumentService.deleteMany.mockResolvedValue(); + + await controller.deleteMany(['fake-uuid']); + + expect(noiDocumentService.deleteMany).toHaveBeenCalledTimes(1); + }); }); diff --git a/services/apps/alcs/src/portal/notice-of-intent-document/notice-of-intent-document.controller.ts b/services/apps/alcs/src/portal/notice-of-intent-document/notice-of-intent-document.controller.ts index fb61df26e8..5fb933f583 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-document/notice-of-intent-document.controller.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-document/notice-of-intent-document.controller.ts @@ -111,6 +111,17 @@ export class NoticeOfIntentDocumentController { return {}; } + @Post('/delete-files') + async deleteMany(@Body() fileUuids: string[]) { + //TODO: How do we know which documents applicant can delete? + // await this.applicationSubmissionService.verifyAccess( + // document.applicationUuid, + // req.user.entity, + // ); + await this.noticeOfIntentDocumentService.deleteMany(fileUuids); + return {}; + } + @Post('/application/:uuid/attachExternal') async attachExternalDocument( @Param('uuid') fileNumber: string, diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.dto.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.dto.ts index 3a47818495..30c3dd7f0f 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.dto.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.dto.ts @@ -1,5 +1,6 @@ import { AutoMap } from '@automapper/classes'; import { + IsArray, IsBoolean, IsNotEmpty, IsNumber, @@ -10,6 +11,7 @@ import { } from 'class-validator'; import { NoticeOfIntentStatusDto } from '../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status.dto'; import { NoticeOfIntentOwnerDto } from './notice-of-intent-owner/notice-of-intent-owner.dto'; +import { ProposedStructure } from './notice-of-intent-submission.entity'; export const MAX_DESCRIPTION_FIELD_LENGTH = 4000; @@ -151,6 +153,24 @@ export class NoticeOfIntentSubmissionDetailedDto extends NoticeOfIntentSubmissio @AutoMap(() => Boolean) soilHasSubmittedNotice?: boolean; + + @AutoMap(() => Boolean) + soilIsRemovingSoilForNewStructure?: boolean; + + @AutoMap(() => String) + soilStructureFarmUseReason?: string | null; + + @AutoMap(() => String) + soilStructureResidentialUseReason?: string | null; + + @AutoMap(() => String) + soilAgriParcelActivity?: string | null; + + @AutoMap(() => String) + soilStructureResidentialAccessoryUseReason?: string | null; + + @AutoMap(() => [ProposedStructure]) + soilProposedStructures: ProposedStructure[]; } export class NoticeOfIntentSubmissionCreateDto { @@ -335,4 +355,28 @@ export class NoticeOfIntentSubmissionUpdateDto { @IsBoolean() @IsOptional() soilHasSubmittedNotice?: boolean; + + @IsBoolean() + @IsOptional() + soilIsRemovingSoilForNewStructure?: boolean; + + @IsString() + @IsOptional() + soilStructureFarmUseReason?: string | null; + + @IsString() + @IsOptional() + soilStructureResidentialUseReason?: string | null; + + @IsString() + @IsOptional() + soilAgriParcelActivity?: string | null; + + @IsString() + @IsOptional() + soilStructureResidentialAccessoryUseReason?: string | null; + + @IsArray() + @IsOptional() + soilProposedStructures?: ProposedStructure[]; } diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.entity.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.entity.ts index 3d71859500..515a813bdf 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.entity.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.entity.ts @@ -15,6 +15,16 @@ import { User } from '../../user/user.entity'; import { ColumnNumericTransformer } from '../../utils/column-numeric-transform'; import { NoticeOfIntentOwner } from './notice-of-intent-owner/notice-of-intent-owner.entity'; +export class ProposedStructure { + type: + | 'Farm Structure' + | 'Residential - Principal Residence' + | 'Residential - Additional Residence' + | 'Residential - Accessory Structure' + | null; + area?: number | null; +} + @Entity() export class NoticeOfIntentSubmission extends Base { constructor(data?: Partial) { @@ -388,6 +398,35 @@ export class NoticeOfIntentSubmission extends Base { @Column({ type: 'boolean', nullable: true }) soilHasSubmittedNotice: boolean | null; + @AutoMap(() => Boolean) + @Column({ type: 'boolean', nullable: true }) + soilIsRemovingSoilForNewStructure: boolean | null; + + @AutoMap(() => String) + @Column({ type: 'text', nullable: true }) + soilStructureFarmUseReason: string | null; + + @AutoMap(() => String) + @Column({ type: 'text', nullable: true }) + soilStructureResidentialUseReason: string | null; + + @AutoMap(() => String) + @Column({ type: 'text', nullable: true }) + soilAgriParcelActivity: string | null; + + @AutoMap(() => String) + @Column({ type: 'text', nullable: true }) + soilStructureResidentialAccessoryUseReason: string | null; + + @AutoMap(() => ProposedStructure) + @Column({ + comment: 'JSONB Column containing the proposed structures', + type: 'jsonb', + array: false, + default: () => `'[]'`, + }) + soilProposedStructures: ProposedStructure[]; + @AutoMap(() => NoticeOfIntent) @ManyToOne(() => NoticeOfIntent) @JoinColumn({ diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts index a35a2c0bb2..2a808b8aa3 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts @@ -285,6 +285,39 @@ export class NoticeOfIntentSubmissionService { noticeOfIntentSubmission.soilHasSubmittedNotice, ); + noticeOfIntentSubmission.soilIsRemovingSoilForNewStructure = + filterUndefined( + updateDto.soilIsRemovingSoilForNewStructure, + noticeOfIntentSubmission.soilIsRemovingSoilForNewStructure, + ); + + noticeOfIntentSubmission.soilStructureFarmUseReason = filterUndefined( + updateDto.soilStructureFarmUseReason, + noticeOfIntentSubmission.soilStructureFarmUseReason, + ); + + noticeOfIntentSubmission.soilStructureResidentialUseReason = + filterUndefined( + updateDto.soilStructureResidentialUseReason, + noticeOfIntentSubmission.soilStructureResidentialUseReason, + ); + + noticeOfIntentSubmission.soilAgriParcelActivity = filterUndefined( + updateDto.soilAgriParcelActivity, + noticeOfIntentSubmission.soilAgriParcelActivity, + ); + + noticeOfIntentSubmission.soilStructureResidentialAccessoryUseReason = + filterUndefined( + updateDto.soilStructureResidentialAccessoryUseReason, + noticeOfIntentSubmission.soilStructureResidentialAccessoryUseReason, + ); + + noticeOfIntentSubmission.soilProposedStructures = filterUndefined( + updateDto.soilProposedStructures, + noticeOfIntentSubmission.soilProposedStructures, + ); + if ( updateDto.soilHasSubmittedNotice === false || updateDto.soilIsExtractionOrMining === false diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1692031918906-new_document_type.ts b/services/apps/alcs/src/providers/typeorm/migrations/1692031918906-new_document_type.ts new file mode 100644 index 0000000000..8f71d5958b --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1692031918906-new_document_type.ts @@ -0,0 +1,15 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class newDocumentType1692031918906 implements MigrationInterface { + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query(` + INSERT INTO "alcs"."document_code" + ("audit_deleted_date_at", "audit_created_at", "audit_updated_at", "audit_created_by", "audit_updated_by", "label", "code", "description", "oats_code") VALUES + (NULL, NOW(), NULL, 'migration_seed', NULL, 'Detailed Building Plan', 'BLDP', 'Detailed Building Plan', 'BLDP'); + `); + } + + public async down(queryRunner: QueryRunner): Promise { + // nope + } +} diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1692046187722-roso_noi_additional_soil_fields.ts b/services/apps/alcs/src/providers/typeorm/migrations/1692046187722-roso_noi_additional_soil_fields.ts new file mode 100644 index 0000000000..4a94164f2f --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1692046187722-roso_noi_additional_soil_fields.ts @@ -0,0 +1,55 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class rosoNoiAdditionalSoilFields1692046187722 + implements MigrationInterface +{ + name = 'rosoNoiAdditionalSoilFields1692046187722'; + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" ADD "soil_is_removing_soil_for_new_structure" boolean`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" ADD "soil_structure_farm_use_reason" text`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" ADD "soil_structure_residential_use_reason" text`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" ADD "soil_agri_parcel_activity" text`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" ADD "soil_structure_residential_accessory_use_reason" text`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" ADD "soil_proposed_structures" jsonb NOT NULL DEFAULT '[]'`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."notice_of_intent_submission"."soil_proposed_structures" IS 'JSONB Column containing the proposed structures'`, + ); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."notice_of_intent_submission"."soil_proposed_structures" IS 'JSONB Column containing the proposed structures'`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" DROP COLUMN "soil_proposed_structures"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" DROP COLUMN "soil_structure_residential_accessory_use_reason"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" DROP COLUMN "soil_agri_parcel_activity"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" DROP COLUMN "soil_structure_residential_use_reason"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" DROP COLUMN "soil_structure_farm_use_reason"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" DROP COLUMN "soil_is_removing_soil_for_new_structure"`, + ); + } +} From 443a754523c81f25a801b122afa4026f34d3cbcb Mon Sep 17 00:00:00 2001 From: Liam Stoddard Date: Tue, 15 Aug 2023 11:51:38 -0700 Subject: [PATCH 250/954] fixed reference to old table --- .../sql/documents_app/alcs_documents_to_app_documents.sql | 2 +- .../alcs_documents_to_app_documents_total_count.sql | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/migrate-oats-data/sql/documents_app/alcs_documents_to_app_documents.sql b/bin/migrate-oats-data/sql/documents_app/alcs_documents_to_app_documents.sql index a5ce9e008d..ac775c2ff8 100644 --- a/bin/migrate-oats-data/sql/documents_app/alcs_documents_to_app_documents.sql +++ b/bin/migrate-oats-data/sql/documents_app/alcs_documents_to_app_documents.sql @@ -12,7 +12,7 @@ with oats_documents_to_map as ( join alcs."document" d on d.oats_document_id = od.document_id::text - join alcs.application_document_code adc + join alcs.document_code adc on adc.oats_code = od.document_code join alcs.application a diff --git a/bin/migrate-oats-data/sql/documents_app/alcs_documents_to_app_documents_total_count.sql b/bin/migrate-oats-data/sql/documents_app/alcs_documents_to_app_documents_total_count.sql index a326237443..60069badfd 100644 --- a/bin/migrate-oats-data/sql/documents_app/alcs_documents_to_app_documents_total_count.sql +++ b/bin/migrate-oats-data/sql/documents_app/alcs_documents_to_app_documents_total_count.sql @@ -12,7 +12,7 @@ with oats_documents_to_map as ( join alcs."document" d on d.oats_document_id = od.document_id::text - join alcs.application_document_code adc + join alcs.document_code adc on adc.oats_code = od.document_code join alcs.application a From 5bec6e71c2f78379e547c6713a60f23b0e31a93b Mon Sep 17 00:00:00 2001 From: Liam Stoddard Date: Tue, 15 Aug 2023 12:04:39 -0700 Subject: [PATCH 251/954] missed a letter --- .../documents/alcs_documents_to_noi_documents.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/migrate-oats-data/documents/alcs_documents_to_noi_documents.py b/bin/migrate-oats-data/documents/alcs_documents_to_noi_documents.py index b06b2101e1..744b78a933 100644 --- a/bin/migrate-oats-data/documents/alcs_documents_to_noi_documents.py +++ b/bin/migrate-oats-data/documents/alcs_documents_to_noi_documents.py @@ -23,7 +23,7 @@ def compile_document_insert_query(number_of_rows_to_insert): ) VALUES {documents_to_insert} ON CONFLICT (oats_document_id, oats_application_id) DO UPDATE SET - notice_of_intent_uuid = EXCLUDED.notice_of_intnent_uuid, + notice_of_intent_uuid = EXCLUDED.notice_of_intent_uuid, document_uuid = EXCLUDED.document_uuid, type_code = EXCLUDED.type_code, visibility_flags = EXCLUDED.visibility_flags, From a45f9bcf824a0c091cb51a72ce62292c2c2cc05d Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Tue, 15 Aug 2023 11:03:04 -0700 Subject: [PATCH 252/954] Add submission and validation for ROSO NOIs * Add noi validator service * Update confirmation dialog to new UX --- .../edit-submission.component.spec.ts | 4 - .../edit-submission.component.ts | 17 +- .../proposal/roso/roso-proposal.component.ts | 8 + .../submit-confirmation-dialog.component.html | 6 +- .../submit-confirmation-dialog.component.ts | 4 +- .../roso-details/roso-details.component.html | 2 +- .../notice-of-intent.service.ts | 1 + .../notice-of-intent-parcel.service.spec.ts | 2 +- .../notice-of-intent-parcel.service.ts | 2 +- ...ntent-submission-validator.service.spec.ts | 1036 +++++++++++++++++ ...-of-intent-submission-validator.service.ts | 655 +++++++++++ ...ce-of-intent-submission.controller.spec.ts | 29 +- .../notice-of-intent-submission.controller.ts | 32 +- .../notice-of-intent-submission.module.ts | 2 + ...otice-of-intent-submission.service.spec.ts | 9 +- .../notice-of-intent-submission.service.ts | 17 +- 16 files changed, 1767 insertions(+), 59 deletions(-) create mode 100644 services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission-validator.service.spec.ts create mode 100644 services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission-validator.service.ts diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.spec.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.spec.ts index 46cbe54919..6b41598188 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.spec.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.spec.ts @@ -37,10 +37,6 @@ describe('EditSubmissionComponent', () => { provide: MatDialog, useValue: {}, }, - { - provide: CodeService, - useValue: {}, - }, ], schemas: [NO_ERRORS_SCHEMA], }).compileComponents(); diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.ts index a6aca4df59..cdfb2ec897 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.ts @@ -62,7 +62,6 @@ export class EditSubmissionComponent implements OnDestroy, AfterViewInit { constructor( private noticeOfIntentSubmissionService: NoticeOfIntentSubmissionService, private noticeOfIntentDocumentService: NoticeOfIntentDocumentService, - private codeService: CodeService, private activatedRoute: ActivatedRoute, private dialog: MatDialog, private toastService: ToastService, @@ -180,13 +179,8 @@ export class EditSubmissionComponent implements OnDestroy, AfterViewInit { async onSubmit() { if (this.noiSubmission) { - const government = await this.loadGovernment(this.noiSubmission.localGovernmentUuid); this.dialog - .open(SubmitConfirmationDialogComponent, { - data: { - governmentName: government?.name ?? 'selected local / first nation government', - }, - }) + .open(SubmitConfirmationDialogComponent) .beforeClosed() .subscribe((didConfirm) => { if (didConfirm) { @@ -206,15 +200,6 @@ export class EditSubmissionComponent implements OnDestroy, AfterViewInit { } } - private async loadGovernment(uuid: string) { - const codes = await this.codeService.loadCodes(); - const localGovernment = codes.localGovernments.find((a) => a.uuid === uuid); - if (localGovernment) { - return localGovernment; - } - return; - } - private async loadSubmission(fileId: string, reload = false) { if (!this.noiSubmission || reload) { this.overlayService.showSpinner(); diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.ts index c0966f7b86..18fdbba025 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.ts @@ -92,6 +92,9 @@ export class RosoProposalComponent extends FilesStepComponent implements OnInit, if (noiSubmission.soilIsExtractionOrMining) { this.allowMiningUploads = true; + this.hasSubmittedNotice.enable(); + } else { + this.hasSubmittedNotice.disable(); } this.form.patchValue({ @@ -168,6 +171,11 @@ export class RosoProposalComponent extends FilesStepComponent implements OnInit, onChangeIsExtractionOrMining(selectedValue: string) { this.allowMiningUploads = selectedValue === 'true'; + if (selectedValue === 'true') { + this.hasSubmittedNotice.enable(); + } else { + this.hasSubmittedNotice.disable(); + } } markDirty() { diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.html index 44e41840fe..56f646bb69 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.html @@ -3,12 +3,12 @@

Submit Notice of Intent

-

Your notice of intent will be submitted to the {{ data.governmentName }}.

+

Your notice of intent will be submitted to the ALC.

Terms and Conditions:
- I/we consent to the use of the information provided in the notice of intent and all supporting documents to process the - notice of intent in accordance with the Agricultural Land Commission Act, the Agricultural Land Reserve General + I/we consent to the use of the information provided in the application and all supporting documents to process the + application in accordance with the Agricultural Land Commission Act, the Agricultural Land Reserve General Regulation, and the Agricultural Land Reserve Use Regulation. diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.ts index cf84e55daa..418ad271a2 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.ts @@ -9,8 +9,6 @@ import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; export class SubmitConfirmationDialogComponent { constructor( @Inject(MAT_DIALOG_DATA) - protected data: { - governmentName: string; - } + protected data: {} ) {} } diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/roso-details/roso-details.component.html b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/roso-details/roso-details.component.html index 5969731d85..7cab8ff23b 100644 --- a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/roso-details/roso-details.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/roso-details/roso-details.component.html @@ -163,7 +163,7 @@

Project Duration

Have you submitted a Notice of Work to the Ministry of Energy, Mines and Low Carbon Innovation (EMLI)?
- + {{ _noiSubmission.soilHasSubmittedNotice ? 'Yes' : 'No' }} diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.ts index dea6f1754b..459849bea5 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.ts @@ -429,6 +429,7 @@ export class NoticeOfIntentService { existingNoticeOfIntent.typeCode = createDto.typeCode; existingNoticeOfIntent.region = region; existingNoticeOfIntent.card = new Card(); + existingNoticeOfIntent.card.typeCode = CARD_TYPE.NOI; await this.repository.save(existingNoticeOfIntent); return this.getByFileNumber(createDto.fileNumber); diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.service.spec.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.service.spec.ts index 099481434d..a16a25df9c 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.service.spec.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.service.spec.ts @@ -58,7 +58,7 @@ describe('NoticeOfIntentParcelService', () => { it('should fetch parcels by fileNumber', async () => { mockParcelRepo.find.mockResolvedValue([mockNOIParcel]); - const result = await service.fetchByApplicationFileId(mockFileNumber); + const result = await service.fetchByFileId(mockFileNumber); expect(result).toEqual([mockNOIParcel]); expect(mockParcelRepo.find).toBeCalledTimes(1); diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.service.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.service.ts index ba69dc46bb..7287652876 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.service.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.service.ts @@ -18,7 +18,7 @@ export class NoticeOfIntentParcelService { private noticeOfIntentOwnerService: NoticeOfIntentOwnerService, ) {} - async fetchByApplicationFileId(fileId: string) { + async fetchByFileId(fileId: string) { return this.parcelRepository.find({ where: { noticeOfIntentSubmission: { fileNumber: fileId, isDraft: false }, diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission-validator.service.spec.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission-validator.service.spec.ts new file mode 100644 index 0000000000..ee38a790eb --- /dev/null +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission-validator.service.spec.ts @@ -0,0 +1,1036 @@ +import { ServiceValidationException } from '@app/common/exceptions/base.exception'; +import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; +import { Test, TestingModule } from '@nestjs/testing'; +import { LocalGovernment } from '../../alcs/local-government/local-government.entity'; +import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; +import { NoticeOfIntentDocument } from '../../alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.entity'; +import { NoticeOfIntentDocumentService } from '../../alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.service'; +import { + DocumentCode, + DOCUMENT_TYPE, +} from '../../document/document-code.entity'; +import { DOCUMENT_SOURCE } from '../../document/document.dto'; +import { Document } from '../../document/document.entity'; +import { + OWNER_TYPE, + OwnerType, +} from '../../common/owner-type/owner-type.entity'; +import { NoticeOfIntentOwner } from './notice-of-intent-owner/notice-of-intent-owner.entity'; +import { NoticeOfIntentParcel } from './notice-of-intent-parcel/notice-of-intent-parcel.entity'; +import { NoticeOfIntentParcelService } from './notice-of-intent-parcel/notice-of-intent-parcel.service'; +import { NoticeOfIntentSubmissionValidatorService } from './notice-of-intent-submission-validator.service'; +import { NoticeOfIntentSubmission } from './notice-of-intent-submission.entity'; + +function includesError(errors: Error[], target: Error) { + return errors.some((error) => error.message === target.message); +} + +describe('NoticeOfIntentSubmissionValidatorService', () => { + let service: NoticeOfIntentSubmissionValidatorService; + let mockLGService: DeepMocked; + let mockNoiParcelService: DeepMocked; + let mockNoiDocumentService: DeepMocked; + + beforeEach(async () => { + mockLGService = createMock(); + mockNoiParcelService = createMock(); + mockNoiDocumentService = createMock(); + + const module: TestingModule = await Test.createTestingModule({ + providers: [ + NoticeOfIntentSubmissionValidatorService, + { + provide: LocalGovernmentService, + useValue: mockLGService, + }, + { + provide: NoticeOfIntentParcelService, + useValue: mockNoiParcelService, + }, + { + provide: NoticeOfIntentDocumentService, + useValue: mockNoiDocumentService, + }, + ], + }).compile(); + + mockLGService.list.mockResolvedValue([]); + mockNoiParcelService.fetchByFileId.mockResolvedValue([]); + mockNoiDocumentService.getApplicantDocuments.mockResolvedValue([]); + + service = module.get( + NoticeOfIntentSubmissionValidatorService, + ); + }); + + it('should be defined', () => { + expect(service).toBeDefined(); + }); + + it('should return an error for missing applicant', async () => { + const noticeOfIntentSubmission = new NoticeOfIntentSubmission({ + owners: [], + soilProposedStructures: [], + }); + + const res = await service.validateSubmission(noticeOfIntentSubmission); + + expect(includesError(res.errors, new Error('Missing applicant'))).toBe( + true, + ); + }); + + it('should return an error for missing purpose', async () => { + const noticeOfIntentSubmission = new NoticeOfIntentSubmission({ + owners: [], + soilProposedStructures: [], + }); + + const res = await service.validateSubmission(noticeOfIntentSubmission); + + expect(includesError(res.errors, new Error('Missing purpose'))).toBe(true); + }); + + it('should return an error for no parcels', async () => { + const noticeOfIntentSubmission = new NoticeOfIntentSubmission({ + owners: [], + soilProposedStructures: [], + }); + + const res = await service.validateSubmission(noticeOfIntentSubmission); + + expect(includesError(res.errors, new Error('Missing applicant'))).toBe( + true, + ); + }); + + it('provide errors for invalid parcel', async () => { + const noticeOfIntentSubmission = new NoticeOfIntentSubmission({ + owners: [], + soilProposedStructures: [], + }); + const parcel = new NoticeOfIntentParcel({ + uuid: 'parcel-1', + owners: [], + ownershipTypeCode: 'SMPL', + }); + + mockNoiParcelService.fetchByFileId.mockResolvedValue([parcel]); + + const res = await service.validateSubmission(noticeOfIntentSubmission); + + expect( + includesError( + res.errors, + new ServiceValidationException(`Invalid Parcel ${parcel.uuid}`), + ), + ).toBe(true); + + expect( + includesError( + res.errors, + new ServiceValidationException(`Parcel has no Owners ${parcel.uuid}`), + ), + ).toBe(true); + expect( + includesError( + res.errors, + new ServiceValidationException( + `Parcel is missing certificate of title ${parcel.uuid}`, + ), + ), + ).toBe(true); + expect( + includesError( + res.errors, + new ServiceValidationException( + `Fee Simple Parcel ${parcel.uuid} has no PID`, + ), + ), + ).toBe(true); + }); + + it('should report an invalid PID', async () => { + const noticeOfIntentSubmission = new NoticeOfIntentSubmission({ + owners: [], + soilProposedStructures: [], + }); + const parcel = new NoticeOfIntentParcel({ + uuid: 'parcel-1', + owners: [], + ownershipTypeCode: 'SMPL', + pid: '1251251', + }); + + mockNoiParcelService.fetchByFileId.mockResolvedValue([parcel]); + + const res = await service.validateSubmission(noticeOfIntentSubmission); + + expect( + includesError( + res.errors, + new ServiceValidationException(`Parcel ${parcel.uuid} has invalid PID`), + ), + ).toBe(true); + }); + + it('should require certificate of title and crown description for CRWN parcels with PID and with CRWN owners', async () => { + const noticeOfIntentSubmission = new NoticeOfIntentSubmission({ + owners: [ + new NoticeOfIntentOwner({ + type: new OwnerType({ + code: OWNER_TYPE.CROWN, + }), + }), + ], + soilProposedStructures: [], + }); + const parcel = new NoticeOfIntentParcel({ + uuid: 'parcel-1', + owners: [], + ownershipTypeCode: 'CRWN', + pid: '12512', + }); + + mockNoiParcelService.fetchByFileId.mockResolvedValue([parcel]); + + const res = await service.validateSubmission(noticeOfIntentSubmission); + + expect( + includesError( + res.errors, + new Error(`Crown Parcel ${parcel.uuid} has no ownership type`), + ), + ).toBe(true); + expect( + includesError( + res.errors, + new Error(`Parcel is missing certificate of title ${parcel.uuid}`), + ), + ).toBe(true); + }); + + it('should return an error for no primary contact', async () => { + const noticeOfIntentSubmission = new NoticeOfIntentSubmission({ + owners: [], + soilProposedStructures: [], + }); + + const res = await service.validateSubmission(noticeOfIntentSubmission); + + expect( + includesError( + res.errors, + new Error(`Notice of Intent has no primary contact`), + ), + ).toBe(true); + }); + + it('should return errors for an invalid third party agent', async () => { + const mockOwner = new NoticeOfIntentOwner({ + uuid: 'owner-uuid', + type: new OwnerType({ + code: OWNER_TYPE.AGENT, + }), + firstName: 'Bruce', + lastName: 'Wayne', + }); + const noticeOfIntentSubmission = new NoticeOfIntentSubmission({ + owners: [mockOwner], + primaryContactOwnerUuid: mockOwner.uuid, + soilProposedStructures: [], + }); + + const res = await service.validateSubmission(noticeOfIntentSubmission); + + expect( + includesError( + res.errors, + new Error(`Invalid Third Party Agent Information`), + ), + ).toBe(true); + }); + + it('should require an authorization letter for more than one owner', async () => { + const mockOwner = new NoticeOfIntentOwner({ + uuid: 'owner-uuid', + type: new OwnerType({ + code: OWNER_TYPE.AGENT, + }), + firstName: 'Bruce', + lastName: 'Wayne', + }); + const noticeOfIntentSubmission = new NoticeOfIntentSubmission({ + owners: [mockOwner, mockOwner], + primaryContactOwnerUuid: mockOwner.uuid, + soilProposedStructures: [], + }); + + const res = await service.validateSubmission(noticeOfIntentSubmission); + + expect( + includesError( + res.errors, + new Error(`Notice of Intent has no authorization letters`), + ), + ).toBe(true); + }); + + it('should not require an authorization letter for a single owner', async () => { + const mockOwner = new NoticeOfIntentOwner({ + uuid: 'owner-uuid', + type: new OwnerType({ + code: OWNER_TYPE.INDIVIDUAL, + }), + firstName: 'Bruce', + lastName: 'Wayne', + }); + const noticeOfIntentSubmission = new NoticeOfIntentSubmission({ + owners: [mockOwner], + primaryContactOwnerUuid: mockOwner.uuid, + soilProposedStructures: [], + }); + + const res = await service.validateSubmission(noticeOfIntentSubmission); + + expect( + includesError( + res.errors, + new Error(`Notice of Intent has no authorization letters`), + ), + ).toBe(false); + }); + + it('should not require an authorization letter when contact is government', async () => { + const mockOwner = new NoticeOfIntentOwner({ + uuid: 'owner-uuid', + type: new OwnerType({ + code: OWNER_TYPE.INDIVIDUAL, + }), + firstName: 'Bruce', + lastName: 'Wayne', + }); + + const governmentOwner = new NoticeOfIntentOwner({ + uuid: 'government-owner-uuid', + type: new OwnerType({ + code: OWNER_TYPE.GOVERNMENT, + }), + firstName: 'Govern', + lastName: 'Ment', + }); + + const noticeOfIntentSubmission = new NoticeOfIntentSubmission({ + owners: [mockOwner, governmentOwner], + primaryContactOwnerUuid: governmentOwner.uuid, + soilProposedStructures: [], + }); + + const res = await service.validateSubmission(noticeOfIntentSubmission); + + expect( + includesError( + res.errors, + new Error(`Notice of Intent has no authorization letters`), + ), + ).toBe(false); + }); + + it('should not have an authorization letter error when one is provided', async () => { + const mockOwner = new NoticeOfIntentOwner({ + uuid: 'owner-uuid', + type: new OwnerType({ + code: OWNER_TYPE.INDIVIDUAL, + }), + firstName: 'Bruce', + lastName: 'Wayne', + }); + const noticeOfIntentSubmission = new NoticeOfIntentSubmission({ + owners: [mockOwner, mockOwner], + primaryContactOwnerUuid: mockOwner.uuid, + soilProposedStructures: [], + }); + + const documents = [ + new NoticeOfIntentDocument({ + type: new DocumentCode({ + code: DOCUMENT_TYPE.AUTHORIZATION_LETTER, + }), + }), + ]; + mockNoiDocumentService.getApplicantDocuments.mockResolvedValue(documents); + + const res = await service.validateSubmission(noticeOfIntentSubmission); + + expect( + includesError( + res.errors, + new Error(`Notice of Intent has no authorization letters`), + ), + ).toBe(false); + }); + + it('should produce an error for missing local government', async () => { + const noticeOfIntentSubmission = new NoticeOfIntentSubmission({ + owners: [], + soilProposedStructures: [], + }); + + const res = await service.validateSubmission(noticeOfIntentSubmission); + + expect( + includesError( + res.errors, + new Error('Notice of Intent has no local government'), + ), + ).toBe(true); + }); + + it('should accept local government when its valid', async () => { + const mockLg = new LocalGovernment({ + uuid: 'lg-uuid', + name: 'lg', + bceidBusinessGuid: 'CATS', + isFirstNation: false, + }); + mockLGService.list.mockResolvedValue([mockLg]); + + const noticeOfIntentSubmission = new NoticeOfIntentSubmission({ + owners: [], + localGovernmentUuid: mockLg.uuid, + soilProposedStructures: [], + }); + + const res = await service.validateSubmission(noticeOfIntentSubmission); + + expect( + includesError( + res.errors, + new Error( + `Selected local government is setup in portal ${mockLg.name}`, + ), + ), + ).toBe(false); + }); + + it('should not have land use errors when all fields are filled', async () => { + const noticeOfIntentSubmission = new NoticeOfIntentSubmission({ + owners: [], + soilProposedStructures: [], + parcelsAgricultureDescription: 'VALID', + parcelsAgricultureImprovementDescription: 'VALID', + parcelsNonAgricultureUseDescription: 'VALID', + northLandUseType: 'VALID', + northLandUseTypeDescription: 'VALID', + eastLandUseType: 'VALID', + eastLandUseTypeDescription: 'VALID', + southLandUseType: 'VALID', + southLandUseTypeDescription: 'VALID', + westLandUseType: 'VALID', + westLandUseTypeDescription: 'VALID', + }); + + const res = await service.validateSubmission(noticeOfIntentSubmission); + + expect( + includesError(res.errors, new Error(`Invalid Parcel Description`)), + ).toBe(false); + expect( + includesError(res.errors, new Error(`Invalid Adjacent Parcels`)), + ).toBe(false); + }); + + it('should have land use errors when not all fields are filled', async () => { + const noticeOfIntentSubmission = new NoticeOfIntentSubmission({ + owners: [], + soilProposedStructures: [], + parcelsAgricultureDescription: undefined, + parcelsAgricultureImprovementDescription: 'VALID', + parcelsNonAgricultureUseDescription: 'VALID', + northLandUseType: undefined, + northLandUseTypeDescription: 'VALID', + eastLandUseType: 'VALID', + eastLandUseTypeDescription: 'VALID', + southLandUseType: 'VALID', + southLandUseTypeDescription: 'VALID', + westLandUseType: undefined, + westLandUseTypeDescription: 'VALID', + }); + + const res = await service.validateSubmission(noticeOfIntentSubmission); + + expect( + includesError(res.errors, new Error(`Invalid Parcel Description`)), + ).toBe(true); + expect( + includesError(res.errors, new Error(`Invalid Adjacent Parcels`)), + ).toBe(true); + }); + + it('should report error for document missing type', async () => { + const incompleteDocument = new NoticeOfIntentDocument({ + type: undefined, + document: new Document({ + source: DOCUMENT_SOURCE.APPLICANT, + }), + }); + + const documents = [incompleteDocument]; + mockNoiDocumentService.getApplicantDocuments.mockResolvedValue(documents); + + const noticeOfIntentSubmission = new NoticeOfIntentSubmission({ + owners: [], + soilProposedStructures: [], + }); + + const res = await service.validateSubmission(noticeOfIntentSubmission); + + expect( + includesError( + res.errors, + new Error(`Document ${incompleteDocument.uuid} missing type`), + ), + ).toBe(true); + }); + + it('should report error for other document missing description', async () => { + const incompleteDocument = new NoticeOfIntentDocument({ + type: new DocumentCode({ + code: DOCUMENT_TYPE.OTHER, + }), + document: new Document({ + source: DOCUMENT_SOURCE.APPLICANT, + }), + description: undefined, + }); + const noticeOfIntentSubmission = new NoticeOfIntentSubmission({ + owners: [], + soilProposedStructures: [], + }); + + const documents = [incompleteDocument]; + mockNoiDocumentService.getApplicantDocuments.mockResolvedValue(documents); + + const res = await service.validateSubmission(noticeOfIntentSubmission); + + expect( + includesError( + res.errors, + new Error(`Document ${incompleteDocument.uuid} missing description`), + ), + ).toBe(true); + }); + + describe('Additional Info', () => { + it('should be happy with complete structures', async () => { + const noticeOfIntentSubmission = new NoticeOfIntentSubmission({ + owners: [], + soilIsRemovingSoilForNewStructure: true, + soilProposedStructures: [ + { type: 'Residential - Accessory Structure', area: 5 }, + { type: 'Farm Structure', area: 5 }, + { type: 'Residential - Additional Residence', area: 5 }, + ], + soilStructureFarmUseReason: 'VALID', + soilAgriParcelActivity: 'VALID', + soilStructureResidentialAccessoryUseReason: 'VALID', + typeCode: 'ROSO', + }); + + const buildingPlan = new NoticeOfIntentDocument({ + type: new DocumentCode({ + code: DOCUMENT_TYPE.BUILDING_PLAN, + }), + typeCode: DOCUMENT_TYPE.BUILDING_PLAN, + }); + + const documents = [buildingPlan]; + mockNoiDocumentService.getApplicantDocuments.mockResolvedValue(documents); + + const res = await service.validateSubmission(noticeOfIntentSubmission); + + expect( + includesError( + res.errors, + new Error(`ROSO proposal missing structures`), + ), + ).toBe(false); + + expect( + includesError( + res.errors, + new Error(`ROSO proposal incomplete structure`), + ), + ).toBe(false); + + expect( + includesError( + res.errors, + new Error(`ROSO proposal missing Building Plans`), + ), + ).toBe(false); + + expect( + includesError( + res.errors, + new Error(`ROSO proposal missing farm use reason`), + ), + ).toBe(false); + + expect( + includesError( + res.errors, + new Error(`ROSO proposal missing agricultural activity`), + ), + ).toBe(false); + + expect( + includesError( + res.errors, + new Error(`ROSO proposal missing accessory use reason`), + ), + ).toBe(false); + }); + + it('should be happy with no structures', async () => { + const noticeOfIntentSubmission = new NoticeOfIntentSubmission({ + owners: [], + soilIsRemovingSoilForNewStructure: false, + soilProposedStructures: [], + typeCode: 'ROSO', + }); + + const res = await service.validateSubmission(noticeOfIntentSubmission); + + expect( + includesError( + res.errors, + new Error(`ROSO proposal missing structures`), + ), + ).toBe(false); + + expect( + includesError( + res.errors, + new Error(`ROSO proposal incomplete structure`), + ), + ).toBe(false); + + expect( + includesError( + res.errors, + new Error(`ROSO proposal missing Building Plans`), + ), + ).toBe(false); + + expect( + includesError( + res.errors, + new Error(`ROSO proposal missing farm use reason`), + ), + ).toBe(false); + + expect( + includesError( + res.errors, + new Error(`ROSO proposal missing agricultural activity`), + ), + ).toBe(false); + + expect( + includesError( + res.errors, + new Error(`ROSO proposal missing accessory use reason`), + ), + ).toBe(false); + }); + + it('should require structures', async () => { + const noticeOfIntentSubmission = new NoticeOfIntentSubmission({ + owners: [], + soilIsRemovingSoilForNewStructure: true, + soilProposedStructures: [], + typeCode: 'ROSO', + }); + + const res = await service.validateSubmission(noticeOfIntentSubmission); + + expect( + includesError( + res.errors, + new Error(`ROSO proposal missing structures`), + ), + ).toBe(true); + + expect( + includesError( + res.errors, + new Error(`ROSO proposal missing Building Plans`), + ), + ).toBe(true); + }); + + it('should require additional questions when having all structures', async () => { + const noticeOfIntentSubmission = new NoticeOfIntentSubmission({ + owners: [], + soilIsRemovingSoilForNewStructure: true, + soilProposedStructures: [ + { type: 'Residential - Accessory Structure', area: 5 }, + { type: 'Farm Structure', area: 5 }, + { type: 'Residential - Additional Residence', area: null }, + ], + typeCode: 'ROSO', + }); + + const res = await service.validateSubmission(noticeOfIntentSubmission); + + expect( + includesError( + res.errors, + new Error(`ROSO proposal incomplete structure`), + ), + ).toBe(true); + + expect( + includesError( + res.errors, + new Error(`ROSO proposal missing farm use reason`), + ), + ).toBe(true); + + expect( + includesError( + res.errors, + new Error(`ROSO proposal missing agricultural activity`), + ), + ).toBe(true); + + expect( + includesError( + res.errors, + new Error(`ROSO proposal missing residential use reason`), + ), + ).toBe(true); + }); + }); + + describe('ROSO Notice of Intents', () => { + it('should not have an error when base information is filled correctly', async () => { + const noticeOfIntentSubmission = new NoticeOfIntentSubmission({ + owners: [], + soilProposedStructures: [], + soilReduceNegativeImpacts: 'soilReduceNegativeImpacts', + soilIsFollowUp: false, + soilAlreadyRemovedVolume: 5, + soilAlreadyRemovedMaximumDepth: 5, + soilToRemoveMaximumDepth: 5, + soilAlreadyRemovedAverageDepth: 5, + soilAlreadyRemovedArea: 5, + soilToRemoveAverageDepth: 5, + soilToRemoveVolume: 5, + soilToRemoveArea: 5, + soilTypeRemoved: 'soilTypeRemoved', + typeCode: 'ROSO', + }); + + const res = await service.validateSubmission(noticeOfIntentSubmission); + + expect( + includesError(res.errors, new Error(`ROSO proposal incomplete`)), + ).toBe(false); + }); + + it('should report errors when information is missing', async () => { + const noticeOfIntentSubmission = new NoticeOfIntentSubmission({ + owners: [], + soilProposedStructures: [], + soilTypeRemoved: null, + soilToRemoveVolume: null, + typeCode: 'ROSO', + }); + + const res = await service.validateSubmission(noticeOfIntentSubmission); + + expect( + includesError(res.errors, new Error(`ROSO proposal incomplete`)), + ).toBe(true); + + expect( + includesError(res.errors, new Error(`ROSO Soil Table Incomplete`)), + ).toBe(true); + }); + + it('should require NOIDs or ApplicationIDs', async () => { + const noticeOfIntentSubmission = new NoticeOfIntentSubmission({ + owners: [], + soilProposedStructures: [], + soilIsFollowUp: true, + soilFollowUpIDs: null, + typeCode: 'ROSO', + }); + + const res = await service.validateSubmission(noticeOfIntentSubmission); + + expect( + includesError( + res.errors, + new Error(`ROSO proposal missing Application or NOI IDs`), + ), + ).toBe(true); + }); + + it('should complain about missing files when soilIsExtractionOrMining is true', async () => { + const noticeOfIntentSubmission = new NoticeOfIntentSubmission({ + owners: [], + soilProposedStructures: [], + soilIsFollowUp: true, + soilIsExtractionOrMining: true, + typeCode: 'ROSO', + }); + + const res = await service.validateSubmission(noticeOfIntentSubmission); + + expect( + includesError( + res.errors, + new Error(`ROSO proposal missing Proposal Map / Site Plan`), + ), + ).toBe(true); + + expect( + includesError( + res.errors, + new Error(`ROSO proposal missing Cross Section Diagrams`), + ), + ).toBe(true); + + expect( + includesError( + res.errors, + new Error(`ROSO proposal missing Reclamation Plans`), + ), + ).toBe(true); + }); + }); + + // describe('POFO Applications', () => { + // it('should not have errors when base information is filled correctly', async () => { + // const application = new NoticeOfIntentSubmission({ + // owners: [], + // soilReduceNegativeImpacts: 'soilReduceNegativeImpacts', + // soilIsFollowUp: false, + // soilAlreadyPlacedVolume: 5, + // soilAlreadyPlacedMaximumDepth: 5, + // soilToPlaceMaximumDepth: 5, + // soilAlreadyPlacedAverageDepth: 5, + // soilAlreadyPlacedArea: 5, + // soilToPlaceAverageDepth: 5, + // soilToPlaceVolume: 5, + // soilToPlaceArea: 5, + // soilAlternativeMeasures: 'soilAlternativeMeasures', + // soilFillTypeToPlace: 'soilFillTypeToPlace', + // typeCode: 'POFO', + // }); + // + // const res = await service.validateSubmission(application); + // + // expect( + // includesError(res.errors, new Error(`POFO Proposal incomplete`)), + // ).toBe(false); + // + // expect( + // includesError(res.errors, new Error(`POFO Soil Table Incomplete`)), + // ).toBe(false); + // }); + // + // it('should report errors when information is missing', async () => { + // const application = new NoticeOfIntentSubmission({ + // owners: [], + // soilFillTypeToPlace: null, + // soilReduceNegativeImpacts: 'soilReduceNegativeImpacts', + // soilToPlaceArea: null, + // typeCode: 'POFO', + // }); + // + // const res = await service.validateSubmission(application); + // + // expect( + // includesError(res.errors, new Error(`POFO Proposal incomplete`)), + // ).toBe(true); + // + // expect( + // includesError(res.errors, new Error(`POFO Soil Table Incomplete`)), + // ).toBe(true); + // }); + // + // it('should require NOI IDs or ApplicationIDs', async () => { + // const application = new NoticeOfIntentSubmission({ + // owners: [], + // soilIsFollowUp: true, + // typeCode: 'POFO', + // }); + // + // const res = await service.validateSubmission(application); + // + // expect( + // includesError( + // res.errors, + // new Error(`POFO Proposal missing Application or NOI IDs`), + // ), + // ).toBe(true); + // }); + // + // it('should complain about missing files', async () => { + // const application = new NoticeOfIntentSubmission({ + // owners: [], + // soilIsFollowUp: true, + // typeCode: 'POFO', + // }); + // + // const res = await service.validateSubmission(application); + // + // expect( + // includesError( + // res.errors, + // new Error(`POFO proposal missing Proposal Map / Site Plan`), + // ), + // ).toBe(true); + // + // expect( + // includesError( + // res.errors, + // new Error(`POFO proposal missing Cross Section Diagrams`), + // ), + // ).toBe(true); + // + // expect( + // includesError( + // res.errors, + // new Error(`POFO proposal missing Reclamation Plans`), + // ), + // ).toBe(true); + // }); + // }); + // + // describe('PFRS Applications', () => { + // it('should not have errors when base information is filled correctly', async () => { + // const application = new NoticeOfIntentSubmission({ + // owners: [], + // purpose: 'purpose', + // soilReduceNegativeImpacts: 'soilReduceNegativeImpacts', + // soilIsFollowUp: false, + // soilAlreadyPlacedVolume: 5, + // soilAlreadyPlacedMaximumDepth: 5, + // soilToPlaceMaximumDepth: 5, + // soilAlreadyPlacedAverageDepth: 5, + // soilAlreadyPlacedArea: 5, + // soilToPlaceAverageDepth: 5, + // soilToPlaceVolume: 5, + // soilToPlaceArea: 5, + // soilAlternativeMeasures: 'soilAlternativeMeasures', + // soilFillTypeToPlace: 'soilFillTypeToPlace', + // typeCode: 'PFRS', + // }); + // + // const res = await service.validateSubmission(application); + // + // expect( + // includesError(res.errors, new Error(`PFRS Proposal incomplete`)), + // ).toBe(false); + // + // expect( + // includesError(res.errors, new Error(`PFRS Soil Table Incomplete`)), + // ).toBe(false); + // }); + // + // it('should report errors when information is missing', async () => { + // const application = new NoticeOfIntentSubmission({ + // owners: [], + // purpose: 'purpose', + // soilFillTypeToPlace: null, + // soilReduceNegativeImpacts: 'soilReduceNegativeImpacts', + // soilToPlaceArea: null, + // typeCode: 'PFRS', + // }); + // + // const res = await service.validateSubmission(application); + // + // expect( + // includesError(res.errors, new Error(`PFRS Proposal incomplete`)), + // ).toBe(true); + // + // expect( + // includesError(res.errors, new Error(`PFRS Soil Table Incomplete`)), + // ).toBe(true); + // }); + // + // it('should require NOI IDs or ApplicationIDs', async () => { + // const application = new NoticeOfIntentSubmission({ + // owners: [], + // soilIsFollowUp: true, + // typeCode: 'PFRS', + // }); + // + // const res = await service.validateSubmission(application); + // + // expect( + // includesError( + // res.errors, + // new Error(`PFRS Proposal missing Application or NOI IDs`), + // ), + // ).toBe(true); + // }); + // + // it('should complain about missing files', async () => { + // const application = new NoticeOfIntentSubmission({ + // owners: [], + // soilIsFollowUp: true, + // typeCode: 'PFRS', + // }); + // + // const res = await service.validateSubmission(application); + // + // expect( + // includesError( + // res.errors, + // new Error(`PFRS proposal missing Proposal Map / Site Plan`), + // ), + // ).toBe(true); + // + // expect( + // includesError( + // res.errors, + // new Error(`PFRS proposal missing Cross Section Diagrams`), + // ), + // ).toBe(true); + // + // expect( + // includesError( + // res.errors, + // new Error(`PFRS proposal missing Reclamation Plans`), + // ), + // ).toBe(true); + // }); + // + // it('should require a notice of work for both mining and notice true', async () => { + // const application = new NoticeOfIntentSubmission({ + // owners: [], + // soilIsFollowUp: true, + // soilIsExtractionOrMining: true, + // soilHasSubmittedNotice: true, + // typeCode: 'PFRS', + // }); + // + // const res = await service.validateSubmission(application); + // + // expect( + // includesError( + // res.errors, + // new Error( + // `PFRS proposal has yes to notice of work but is not attached`, + // ), + // ), + // ).toBe(true); + // }); + // }); +}); diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission-validator.service.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission-validator.service.ts new file mode 100644 index 0000000000..d2d59990bb --- /dev/null +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission-validator.service.ts @@ -0,0 +1,655 @@ +import { ServiceValidationException } from '@app/common/exceptions/base.exception'; +import { Injectable, Logger } from '@nestjs/common'; +import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; +import { NoticeOfIntentDocument } from '../../alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.entity'; +import { NoticeOfIntentDocumentService } from '../../alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.service'; +import { OWNER_TYPE } from '../../common/owner-type/owner-type.entity'; +import { DOCUMENT_TYPE } from '../../document/document-code.entity'; +import { NoticeOfIntentOwner } from './notice-of-intent-owner/notice-of-intent-owner.entity'; +import { NoticeOfIntentParcel } from './notice-of-intent-parcel/notice-of-intent-parcel.entity'; +import { NoticeOfIntentParcelService } from './notice-of-intent-parcel/notice-of-intent-parcel.service'; +import { NoticeOfIntentSubmission } from './notice-of-intent-submission.entity'; + +export class ValidatedNoticeOfIntentSubmission extends NoticeOfIntentSubmission { + applicant: string; + localGovernmentUuid: string; + parcels: NoticeOfIntentParcel[]; + primaryContact: NoticeOfIntentOwner; + parcelsAgricultureDescription: string; + parcelsAgricultureImprovementDescription: string; + parcelsNonAgricultureUseDescription: string; + northLandUseType: string; + northLandUseTypeDescription: string; + eastLandUseType: string; + eastLandUseTypeDescription: string; + southLandUseType: string; + southLandUseTypeDescription: string; + westLandUseType: string; + westLandUseTypeDescription: string; +} + +@Injectable() +export class NoticeOfIntentSubmissionValidatorService { + private logger: Logger = new Logger( + NoticeOfIntentSubmissionValidatorService.name, + ); + + constructor( + private localGovernmentService: LocalGovernmentService, + private noiParcelService: NoticeOfIntentParcelService, + private noiDocumentService: NoticeOfIntentDocumentService, + ) {} + + async validateSubmission(noticeOfIntentSubmission: NoticeOfIntentSubmission) { + const errors: Error[] = []; + + if (!noticeOfIntentSubmission.applicant) { + errors.push(new ServiceValidationException('Missing applicant')); + } + + if (!noticeOfIntentSubmission.purpose) { + errors.push(new ServiceValidationException('Missing purpose')); + } + + await this.validateParcels(noticeOfIntentSubmission, errors); + + const applicantDocuments = + await this.noiDocumentService.getApplicantDocuments( + noticeOfIntentSubmission.fileNumber, + ); + + await this.validatePrimaryContact( + noticeOfIntentSubmission, + applicantDocuments, + errors, + ); + + await this.validateLocalGovernment(noticeOfIntentSubmission, errors); + await this.validateLandUse(noticeOfIntentSubmission, errors); + this.validateAdditionalInfo( + noticeOfIntentSubmission, + applicantDocuments, + errors, + ); + await this.validateOptionalDocuments(applicantDocuments, errors); + + if (noticeOfIntentSubmission.typeCode === 'ROSO') { + await this.validateRosoProposal( + noticeOfIntentSubmission, + applicantDocuments, + errors, + ); + } + if (noticeOfIntentSubmission.typeCode === 'POFO') { + await this.validatePofoProposal( + noticeOfIntentSubmission, + applicantDocuments, + errors, + ); + } + if (noticeOfIntentSubmission.typeCode === 'PFRS') { + await this.validatePofoProposal( + noticeOfIntentSubmission, + applicantDocuments, + errors, + ); + await this.validateRosoProposal( + noticeOfIntentSubmission, + applicantDocuments, + errors, + ); + await this.validatePfrsProposal( + noticeOfIntentSubmission, + applicantDocuments, + errors, + ); + } + + return { + errors, + noticeOfIntentSubmission: + errors.length === 0 + ? (noticeOfIntentSubmission as ValidatedNoticeOfIntentSubmission) + : undefined, + }; + } + + private async validateParcels( + noticeOfIntentSubmission: NoticeOfIntentSubmission, + errors: Error[], + ) { + const parcels = await this.noiParcelService.fetchByFileId( + noticeOfIntentSubmission.fileNumber, + ); + + if (parcels.length === 0) { + errors.push( + new ServiceValidationException(`Notice of Intent has no parcels`), + ); + } + + for (const parcel of parcels) { + if ( + parcel.ownershipTypeCode === null || + parcel.legalDescription === null || + parcel.mapAreaHectares === null || + parcel.civicAddress === null || + parcel.isFarm === null || + !parcel.isConfirmedByApplicant + ) { + errors.push( + new ServiceValidationException(`Invalid Parcel ${parcel.uuid}`), + ); + } + + if (parcel.ownershipTypeCode === 'SMPL' && !parcel.pid) { + errors.push( + new ServiceValidationException( + `Fee Simple Parcel ${parcel.uuid} has no PID`, + ), + ); + } + + if (parcel.pid && parcel.pid.length !== 9) { + errors.push( + new ServiceValidationException( + `Parcel ${parcel.uuid} has invalid PID`, + ), + ); + } + + if (parcel.ownershipTypeCode === 'SMPL' && !parcel.purchasedDate) { + errors.push( + new ServiceValidationException( + `Fee Simple Parcel ${parcel.uuid} has no purchase date`, + ), + ); + } + + if (parcel.ownershipTypeCode === 'CRWN' && !parcel.crownLandOwnerType) { + errors.push( + new ServiceValidationException( + `Crown Parcel ${parcel.uuid} has no ownership type`, + ), + ); + } + + if (parcel.owners.length === 0) { + errors.push( + new ServiceValidationException(`Parcel has no Owners ${parcel.uuid}`), + ); + } + + if ( + !parcel.certificateOfTitle && + (parcel.ownershipTypeCode === 'SMPL' || parcel.pid) + ) { + errors.push( + new ServiceValidationException( + `Parcel is missing certificate of title ${parcel.uuid}`, + ), + ); + } + } + + if (errors.length === 0) { + return parcels; + } + } + + private async validatePrimaryContact( + noticeOfIntentSubmission: NoticeOfIntentSubmission, + documents: NoticeOfIntentDocument[], + errors: Error[], + ): Promise { + const primaryOwner = noticeOfIntentSubmission.owners.find( + (owner) => + owner.uuid === noticeOfIntentSubmission.primaryContactOwnerUuid, + ); + + if (!primaryOwner) { + errors.push( + new ServiceValidationException( + `Notice of Intent has no primary contact`, + ), + ); + return; + } + + const onlyHasIndividualOwner = + noticeOfIntentSubmission.owners.length === 1 && + noticeOfIntentSubmission.owners[0].type.code === OWNER_TYPE.INDIVIDUAL; + + const isGovernmentContact = + primaryOwner.type.code === OWNER_TYPE.GOVERNMENT; + + if (!onlyHasIndividualOwner && !isGovernmentContact) { + const authorizationLetters = documents.filter( + (document) => + document.type?.code === DOCUMENT_TYPE.AUTHORIZATION_LETTER, + ); + if (authorizationLetters.length === 0) { + errors.push( + new ServiceValidationException( + `Notice of Intent has no authorization letters`, + ), + ); + } + } + + if (primaryOwner.type.code === OWNER_TYPE.AGENT || isGovernmentContact) { + if ( + !primaryOwner.firstName || + !primaryOwner.lastName || + !primaryOwner.phoneNumber || + !primaryOwner.email + ) { + errors.push( + new ServiceValidationException( + `Invalid Third Party Agent Information`, + ), + ); + } + } + + if (errors.length === 0) { + return primaryOwner; + } + return undefined; + } + + private async validateLocalGovernment( + noticeOfIntentSubmission: NoticeOfIntentSubmission, + errors: Error[], + ) { + const localGovernments = await this.localGovernmentService.list(); + const matchingLg = localGovernments.find( + (lg) => lg.uuid === noticeOfIntentSubmission.localGovernmentUuid, + ); + if (!noticeOfIntentSubmission.localGovernmentUuid) { + errors.push( + new ServiceValidationException( + 'Notice of Intent has no local government', + ), + ); + } + + if (!matchingLg) { + errors.push( + new ServiceValidationException( + 'Cannot find local government set on Notice of Intent', + ), + ); + return; + } + + if (!matchingLg.bceidBusinessGuid) { + errors.push( + new ServiceValidationException( + `Selected local government is setup in portal ${matchingLg.name}`, + ), + ); + } + } + + private async validateLandUse( + noticeOfIntentSubmission: NoticeOfIntentSubmission, + errors: Error[], + ) { + if ( + !noticeOfIntentSubmission.parcelsAgricultureDescription || + !noticeOfIntentSubmission.parcelsAgricultureImprovementDescription || + !noticeOfIntentSubmission.parcelsNonAgricultureUseDescription + ) { + errors.push(new ServiceValidationException(`Invalid Parcel Description`)); + } + + if ( + !noticeOfIntentSubmission.northLandUseType || + !noticeOfIntentSubmission.northLandUseTypeDescription || + !noticeOfIntentSubmission.eastLandUseType || + !noticeOfIntentSubmission.eastLandUseTypeDescription || + !noticeOfIntentSubmission.southLandUseType || + !noticeOfIntentSubmission.southLandUseTypeDescription || + !noticeOfIntentSubmission.westLandUseType || + !noticeOfIntentSubmission.westLandUseTypeDescription + ) { + errors.push(new ServiceValidationException(`Invalid Adjacent Parcels`)); + } + } + + private async validateOptionalDocuments( + applicantDocuments: NoticeOfIntentDocument[], + errors: Error[], + ) { + const untypedDocuments = applicantDocuments.filter( + (document) => !document.type, + ); + for (const document of untypedDocuments) { + errors.push( + new ServiceValidationException( + `Document ${document.uuid} missing type`, + ), + ); + } + + const optionalDocuments = applicantDocuments.filter((document) => + [ + DOCUMENT_TYPE.OTHER, + DOCUMENT_TYPE.PHOTOGRAPH, + DOCUMENT_TYPE.PROFESSIONAL_REPORT, + ].includes(document.type?.code as DOCUMENT_TYPE), + ); + for (const document of optionalDocuments) { + if (!document.description) { + errors.push( + new ServiceValidationException( + `Document ${document.uuid} missing description`, + ), + ); + } + } + } + + private async validateRosoProposal( + noticeOfIntentSubmission: NoticeOfIntentSubmission, + applicantDocuments: NoticeOfIntentDocument[], + errors: Error[], + ) { + if (noticeOfIntentSubmission.soilTypeRemoved === null) { + errors.push( + new ServiceValidationException( + `${noticeOfIntentSubmission.typeCode} proposal incomplete`, + ), + ); + } + + if ( + noticeOfIntentSubmission.soilToRemoveVolume === null || + noticeOfIntentSubmission.soilToRemoveArea === null || + noticeOfIntentSubmission.soilToRemoveMaximumDepth === null || + noticeOfIntentSubmission.soilToRemoveAverageDepth === null || + noticeOfIntentSubmission.soilAlreadyRemovedVolume === null || + noticeOfIntentSubmission.soilAlreadyRemovedArea === null || + noticeOfIntentSubmission.soilAlreadyRemovedMaximumDepth === null || + noticeOfIntentSubmission.soilAlreadyRemovedAverageDepth === null + ) { + errors.push( + new ServiceValidationException( + `${noticeOfIntentSubmission.typeCode} Soil Table Incomplete`, + ), + ); + } + this.runSharedSoilValidation( + noticeOfIntentSubmission, + errors, + applicantDocuments, + ); + } + + private async validatePofoProposal( + noticeOfIntentSubmission: NoticeOfIntentSubmission, + applicantDocuments: NoticeOfIntentDocument[], + errors: Error[], + ) { + if ( + noticeOfIntentSubmission.soilFillTypeToPlace === null || + noticeOfIntentSubmission.soilAlternativeMeasures === null || + noticeOfIntentSubmission.soilReduceNegativeImpacts === null + ) { + errors.push( + new ServiceValidationException( + `${noticeOfIntentSubmission.typeCode} proposal incomplete`, + ), + ); + } + + this.runSharedSoilValidation( + noticeOfIntentSubmission, + errors, + applicantDocuments, + ); + + if ( + noticeOfIntentSubmission.soilToPlaceVolume === null || + noticeOfIntentSubmission.soilToPlaceArea === null || + noticeOfIntentSubmission.soilToPlaceMaximumDepth === null || + noticeOfIntentSubmission.soilToPlaceAverageDepth === null || + noticeOfIntentSubmission.soilAlreadyPlacedVolume === null || + noticeOfIntentSubmission.soilAlreadyPlacedArea === null || + noticeOfIntentSubmission.soilAlreadyPlacedMaximumDepth === null || + noticeOfIntentSubmission.soilAlreadyPlacedAverageDepth === null + ) { + errors.push( + new ServiceValidationException( + `${noticeOfIntentSubmission.typeCode} Soil Table Incomplete`, + ), + ); + } + this.runSharedSoilValidation( + noticeOfIntentSubmission, + errors, + applicantDocuments, + ); + } + + private async validatePfrsProposal( + noticeOfIntentSubmission: NoticeOfIntentSubmission, + applicantDocuments: NoticeOfIntentDocument[], + errors: Error[], + ) { + if (noticeOfIntentSubmission.soilIsExtractionOrMining === null) { + errors.push( + new ServiceValidationException( + `${noticeOfIntentSubmission.typeCode} proposal missing extraction/mining answer`, + ), + ); + } + + if (noticeOfIntentSubmission.soilIsExtractionOrMining) { + if (noticeOfIntentSubmission.soilHasSubmittedNotice === null) { + errors.push( + new ServiceValidationException( + `${noticeOfIntentSubmission.typeCode} proposal missing notice submitted answer`, + ), + ); + } + } + + const noticeOfWork = applicantDocuments.filter( + (document) => document.typeCode === DOCUMENT_TYPE.NOTICE_OF_WORK, + ); + if (noticeOfIntentSubmission.soilIsFollowUp && noticeOfWork.length === 0) { + errors.push( + new ServiceValidationException( + `${noticeOfIntentSubmission.typeCode} proposal has yes to notice of work but is not attached`, + ), + ); + } + } + + private runSharedSoilValidation( + noticeOfIntentSubmission: NoticeOfIntentSubmission, + errors: Error[], + applicantDocuments: NoticeOfIntentDocument[], + ) { + if ( + noticeOfIntentSubmission.soilIsFollowUp === null || + noticeOfIntentSubmission.soilProjectDurationAmount === null || + noticeOfIntentSubmission.soilProjectDurationUnit === null + ) { + errors.push( + new ServiceValidationException( + `${noticeOfIntentSubmission.typeCode} proposal missing shared fields`, + ), + ); + } + + if ( + noticeOfIntentSubmission.soilIsFollowUp && + !noticeOfIntentSubmission.soilFollowUpIDs + ) { + errors.push( + new ServiceValidationException( + `${noticeOfIntentSubmission.typeCode} proposal missing Application or NOI IDs`, + ), + ); + } + + const proposalMaps = applicantDocuments.filter( + (document) => document.typeCode === DOCUMENT_TYPE.PROPOSAL_MAP, + ); + if (proposalMaps.length === 0) { + errors.push( + new ServiceValidationException( + `${noticeOfIntentSubmission.typeCode} proposal missing Proposal Map / Site Plan`, + ), + ); + } + + if (noticeOfIntentSubmission.soilIsExtractionOrMining) { + const crossSections = applicantDocuments.filter( + (document) => document.typeCode === DOCUMENT_TYPE.CROSS_SECTIONS, + ); + if (crossSections.length === 0) { + errors.push( + new ServiceValidationException( + `${noticeOfIntentSubmission.typeCode} proposal missing Cross Section Diagrams`, + ), + ); + } + + const reclamationPlans = applicantDocuments.filter( + (document) => document.typeCode === DOCUMENT_TYPE.RECLAMATION_PLAN, + ); + if (reclamationPlans.length === 0) { + errors.push( + new ServiceValidationException( + `${noticeOfIntentSubmission.typeCode} proposal missing Reclamation Plans`, + ), + ); + } + + if (noticeOfIntentSubmission.soilHasSubmittedNotice === null) { + errors.push( + new ServiceValidationException( + `${noticeOfIntentSubmission.typeCode} proposal missing work notice answer`, + ), + ); + } + + if (noticeOfIntentSubmission.soilHasSubmittedNotice) { + const noticeOfWorks = applicantDocuments.filter( + (document) => document.typeCode === DOCUMENT_TYPE.NOTICE_OF_WORK, + ); + if (noticeOfWorks.length === 0) { + errors.push( + new ServiceValidationException( + `${noticeOfIntentSubmission.typeCode} proposal missing Notice of Work`, + ), + ); + } + } + } + } + + private validateAdditionalInfo( + noticeOfIntentSubmission: NoticeOfIntentSubmission, + applicantDocuments: NoticeOfIntentDocument[], + errors: Error[], + ) { + if (noticeOfIntentSubmission.soilIsRemovingSoilForNewStructure === null) { + errors.push( + new ServiceValidationException( + `${noticeOfIntentSubmission.typeCode} proposal missing structure questions`, + ), + ); + } + + if (noticeOfIntentSubmission.soilIsRemovingSoilForNewStructure) { + if (noticeOfIntentSubmission.soilProposedStructures.length === 0) { + errors.push( + new ServiceValidationException( + `${noticeOfIntentSubmission.typeCode} proposal missing structures`, + ), + ); + } + + for (const structure of noticeOfIntentSubmission.soilProposedStructures) { + if (!structure.type || structure.area === null) { + errors.push( + new ServiceValidationException( + `${noticeOfIntentSubmission.typeCode} proposal incomplete structure`, + ), + ); + } + } + + const buildingPlans = applicantDocuments.filter( + (document) => document.typeCode === DOCUMENT_TYPE.BUILDING_PLAN, + ); + if (buildingPlans.length === 0) { + errors.push( + new ServiceValidationException( + `${noticeOfIntentSubmission.typeCode} proposal missing Building Plans`, + ), + ); + } + + const hasFarmStructure = + noticeOfIntentSubmission.soilProposedStructures.some( + (structure) => structure.type === 'Farm Structure', + ); + if (hasFarmStructure) { + if (!noticeOfIntentSubmission.soilStructureFarmUseReason) { + errors.push( + new ServiceValidationException( + `${noticeOfIntentSubmission.typeCode} proposal missing farm use reason`, + ), + ); + } + if (!noticeOfIntentSubmission.soilAgriParcelActivity) { + errors.push( + new ServiceValidationException( + `${noticeOfIntentSubmission.typeCode} proposal missing agricultural activity`, + ), + ); + } + } + + const hasResidentialStructure = + noticeOfIntentSubmission.soilProposedStructures.some((structure) => + [ + 'Residential - Principal Residence', + 'Residential - Additional Residence', + 'Residential - Accessory Structure', + ].includes(structure.type!), + ); + if ( + hasResidentialStructure && + !noticeOfIntentSubmission.soilStructureResidentialUseReason + ) { + errors.push( + new ServiceValidationException( + `${noticeOfIntentSubmission.typeCode} proposal missing residential use reason`, + ), + ); + } + } + + const hasAccessoryStructure = + noticeOfIntentSubmission.soilProposedStructures.find( + (structure) => structure.type === 'Residential - Accessory Structure', + ); + if ( + hasAccessoryStructure && + !noticeOfIntentSubmission.soilStructureResidentialAccessoryUseReason + ) { + errors.push( + new ServiceValidationException( + `${noticeOfIntentSubmission.typeCode} proposal missing accessory use reason`, + ), + ); + } + } +} diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.controller.spec.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.controller.spec.ts index a0052602b0..4bbc67fa74 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.controller.spec.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.controller.spec.ts @@ -12,6 +12,10 @@ import { NoticeOfIntentSubmissionToSubmissionStatus } from '../../alcs/notice-of import { NoticeOfIntent } from '../../alcs/notice-of-intent/notice-of-intent.entity'; import { NoticeOfIntentSubmissionProfile } from '../../common/automapper/notice-of-intent-submission.automapper.profile'; import { User } from '../../user/user.entity'; +import { + NoticeOfIntentSubmissionValidatorService, + ValidatedNoticeOfIntentSubmission, +} from './notice-of-intent-submission-validator.service'; import { NoticeOfIntentSubmissionController } from './notice-of-intent-submission.controller'; import { NoticeOfIntentSubmissionDetailedDto, @@ -25,6 +29,7 @@ describe('NoticeOfIntentSubmissionController', () => { let mockNoiSubmissionService: DeepMocked; let mockDocumentService: DeepMocked; let mockLgService: DeepMocked; + let mockNoiValidatorService: DeepMocked; const localGovernmentUuid = 'local-government'; const applicant = 'fake-applicant'; @@ -34,6 +39,7 @@ describe('NoticeOfIntentSubmissionController', () => { mockNoiSubmissionService = createMock(); mockDocumentService = createMock(); mockLgService = createMock(); + mockNoiValidatorService = createMock(); const module: TestingModule = await Test.createTestingModule({ controllers: [NoticeOfIntentSubmissionController], @@ -51,6 +57,10 @@ describe('NoticeOfIntentSubmissionController', () => { provide: LocalGovernmentService, useValue: mockLgService, }, + { + provide: NoticeOfIntentSubmissionValidatorService, + useValue: mockNoiValidatorService, + }, { provide: ClsService, useValue: {}, @@ -272,8 +282,14 @@ describe('NoticeOfIntentSubmissionController', () => { mockNoiSubmissionService.getIfCreatorByUuid.mockResolvedValue( new NoticeOfIntentSubmission(), ); - - mockNoiSubmissionService.updateStatus.mockResolvedValue(); + mockNoiValidatorService.validateSubmission.mockResolvedValue({ + noticeOfIntentSubmission: + new NoticeOfIntentSubmission() as ValidatedNoticeOfIntentSubmission, + errors: [], + }); + mockNoiSubmissionService.mapToDetailedDTO.mockResolvedValue( + {} as NoticeOfIntentSubmissionDetailedDto, + ); await controller.submitAsApplicant(mockFileId, { user: { @@ -282,13 +298,10 @@ describe('NoticeOfIntentSubmissionController', () => { }); expect(mockNoiSubmissionService.verifyAccessByUuid).toHaveBeenCalledTimes( - 1, + 2, ); expect(mockNoiSubmissionService.submitToAlcs).toHaveBeenCalledTimes(1); - expect(mockNoiSubmissionService.updateStatus).toHaveBeenCalledTimes(1); - expect(mockNoiSubmissionService.updateStatus).toHaveBeenCalledWith( - undefined, - NOI_SUBMISSION_STATUS.SUBMITTED_TO_ALC, - ); + expect(mockNoiValidatorService.validateSubmission).toHaveBeenCalledTimes(1); + expect(mockNoiSubmissionService.mapToDetailedDTO).toHaveBeenCalledTimes(1); }); }); diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.controller.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.controller.ts index 82e569cfa9..2e81391598 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.controller.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.controller.ts @@ -1,4 +1,5 @@ import { + BadRequestException, Body, Controller, Get, @@ -9,10 +10,9 @@ import { Req, UseGuards, } from '@nestjs/common'; -import { SUBMISSION_STATUS } from '../../alcs/application/application-submission-status/submission-status.dto'; -import { NOI_SUBMISSION_STATUS } from '../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status.dto'; import { PortalAuthGuard } from '../../common/authorization/portal-auth-guard.service'; import { User } from '../../user/user.entity'; +import { NoticeOfIntentSubmissionValidatorService } from './notice-of-intent-submission-validator.service'; import { NoticeOfIntentSubmissionCreateDto, NoticeOfIntentSubmissionUpdateDto, @@ -26,6 +26,7 @@ export class NoticeOfIntentSubmissionController { constructor( private noticeOfIntentSubmissionService: NoticeOfIntentSubmissionService, + private noticeOfIntentValidatorService: NoticeOfIntentSubmissionValidatorService, ) {} @Get() @@ -127,25 +128,30 @@ export class NoticeOfIntentSubmissionController { req.user.entity, ); - const validationResult = { - noticeOfIntentSubmission, - errors: [], - }; + const validationResult = + await this.noticeOfIntentValidatorService.validateSubmission( + noticeOfIntentSubmission, + ); - if (validationResult) { + if (validationResult.noticeOfIntentSubmission) { const validatedApplicationSubmission = validationResult.noticeOfIntentSubmission; + await this.noticeOfIntentSubmissionService.submitToAlcs( validatedApplicationSubmission, ); - return await this.noticeOfIntentSubmissionService.updateStatus( - noticeOfIntentSubmission.uuid, - NOI_SUBMISSION_STATUS.SUBMITTED_TO_ALC, + + const finalSubmission = + await this.noticeOfIntentSubmissionService.verifyAccessByUuid( + uuid, + req.user.entity, + ); + return await this.noticeOfIntentSubmissionService.mapToDetailedDTO( + finalSubmission, ); } else { - //TODO: Uncomment when we add validation - //this.logger.debug(validationResult.errors); - //throw new BadRequestException('Invalid Application'); + this.logger.debug(validationResult.errors); + throw new BadRequestException('Invalid Notice of Intent'); } } } diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.module.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.module.ts index 33a9ac799f..8fe460df4c 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.module.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.module.ts @@ -18,6 +18,7 @@ import { NoticeOfIntentParcelOwnershipType } from './notice-of-intent-parcel/not import { NoticeOfIntentParcelController } from './notice-of-intent-parcel/notice-of-intent-parcel.controller'; import { NoticeOfIntentParcel } from './notice-of-intent-parcel/notice-of-intent-parcel.entity'; import { NoticeOfIntentParcelService } from './notice-of-intent-parcel/notice-of-intent-parcel.service'; +import { NoticeOfIntentSubmissionValidatorService } from './notice-of-intent-submission-validator.service'; import { NoticeOfIntentSubmissionController } from './notice-of-intent-submission.controller'; import { NoticeOfIntentSubmission } from './notice-of-intent-submission.entity'; import { NoticeOfIntentSubmissionService } from './notice-of-intent-submission.service'; @@ -48,6 +49,7 @@ import { NoticeOfIntentSubmissionService } from './notice-of-intent-submission.s NoticeOfIntentSubmissionService, NoticeOfIntentParcelService, NoticeOfIntentOwnerService, + NoticeOfIntentSubmissionValidatorService, NoticeOfIntentSubmissionProfile, NoticeOfIntentOwnerProfile, NoticeOfIntentParcelProfile, diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts index 91967e708f..8c91c6e772 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts @@ -15,6 +15,7 @@ import { NoticeOfIntentService } from '../../alcs/notice-of-intent/notice-of-int import { NoticeOfIntentSubmissionProfile } from '../../common/automapper/notice-of-intent-submission.automapper.profile'; import { FileNumberService } from '../../file-number/file-number.service'; import { User } from '../../user/user.entity'; +import { ValidatedNoticeOfIntentSubmission } from './notice-of-intent-submission-validator.service'; import { NoticeOfIntentSubmission } from './notice-of-intent-submission.entity'; import { NoticeOfIntentSubmissionService } from './notice-of-intent-submission.service'; @@ -196,7 +197,9 @@ describe('NoticeOfIntentSubmissionService', () => { mockNoiService.submit.mockRejectedValue(new Error()); await expect( - service.submitToAlcs(noticeOfIntentSubmission), + service.submitToAlcs( + noticeOfIntentSubmission as ValidatedNoticeOfIntentSubmission, + ), ).rejects.toMatchObject( new BaseServiceException( `Failed to submit notice of intent: ${fileNumber}`, @@ -223,7 +226,9 @@ describe('NoticeOfIntentSubmissionService', () => { ); mockNoiService.submit.mockResolvedValue(mockNoticeOfIntent); - await service.submitToAlcs(mockNoiSubmission); + await service.submitToAlcs( + mockNoiSubmission as ValidatedNoticeOfIntentSubmission, + ); expect(mockNoiService.submit).toBeCalledTimes(1); expect(mockNoiStatusService.setStatusDate).toHaveBeenCalledTimes(1); diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts index 2a808b8aa3..b0a81cca14 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts @@ -23,6 +23,7 @@ import { DOCUMENT_TYPE } from '../../document/document-code.entity'; import { FileNumberService } from '../../file-number/file-number.service'; import { User } from '../../user/user.entity'; import { filterUndefined } from '../../utils/undefined'; +import { ValidatedNoticeOfIntentSubmission } from './notice-of-intent-submission-validator.service'; import { NoticeOfIntentSubmissionDetailedDto, NoticeOfIntentSubmissionDto, @@ -549,18 +550,20 @@ export class NoticeOfIntentSubmissionService { }; } - async submitToAlcs(noticeOfIntent: NoticeOfIntentSubmission) { + async submitToAlcs( + noticeOfIntentSubmission: ValidatedNoticeOfIntentSubmission, + ) { try { const submittedNoi = await this.noticeOfIntentService.submit({ - fileNumber: noticeOfIntent.fileNumber, - applicant: noticeOfIntent.applicant!, //TODO: Remove ! once validation is implemented - localGovernmentUuid: noticeOfIntent.localGovernmentUuid!, - typeCode: noticeOfIntent.typeCode, + fileNumber: noticeOfIntentSubmission.fileNumber, + applicant: noticeOfIntentSubmission.applicant, + localGovernmentUuid: noticeOfIntentSubmission.localGovernmentUuid, + typeCode: noticeOfIntentSubmission.typeCode, dateSubmittedToAlc: new Date(), }); await this.noticeOfIntentSubmissionStatusService.setStatusDate( - submittedNoi.uuid, + noticeOfIntentSubmission.uuid, NOI_SUBMISSION_STATUS.SUBMITTED_TO_ALC, submittedNoi.dateSubmittedToAlc, ); @@ -569,7 +572,7 @@ export class NoticeOfIntentSubmissionService { } catch (ex) { this.logger.error(ex); throw new BaseServiceException( - `Failed to submit notice of intent: ${noticeOfIntent.fileNumber}`, + `Failed to submit notice of intent: ${noticeOfIntentSubmission.fileNumber}`, ); } } From dd5610bc1ba9b06a24bf409bca07dfb90ad1b7fe Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Tue, 15 Aug 2023 13:02:27 -0700 Subject: [PATCH 253/954] Feature/alcs 980 step 6 on step 8 (#879) * step 6 on step 8 for roso and some fixes * unit test --- .../roso-additional-information.component.ts | 3 +- .../notice-of-intent-details.component.html | 43 +++----- .../notice-of-intent-details.component.scss | 8 ++ .../notice-of-intent-details.module.ts | 3 +- ...roso-additional-information.component.html | 103 ++++++++++++++++++ ...roso-additional-information.component.scss | 5 + ...o-additional-information.component.spec.ts | 31 ++++++ .../roso-additional-information.component.ts | 97 +++++++++++++++++ .../roso-details/roso-details.component.scss | 9 -- 9 files changed, 265 insertions(+), 37 deletions(-) create mode 100644 portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/roso-details/roso-additional-information/roso-additional-information.component.html create mode 100644 portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/roso-details/roso-additional-information/roso-additional-information.component.scss create mode 100644 portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/roso-details/roso-additional-information/roso-additional-information.component.spec.ts create mode 100644 portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/roso-details/roso-additional-information/roso-additional-information.component.ts diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/roso/roso-additional-information.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/roso/roso-additional-information.component.ts index 1d694c58f3..ba72e75687 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/roso/roso-additional-information.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/roso/roso-additional-information.component.ts @@ -25,7 +25,7 @@ export enum STRUCTURE_TYPES { type ProposedStructure = { type: STRUCTURE_TYPES | null; area: string | null }; -const RESIDENTIAL_STRUCTURE_TYPES = [ +export const RESIDENTIAL_STRUCTURE_TYPES = [ STRUCTURE_TYPES.ACCESSORY_STRUCTURE, STRUCTURE_TYPES.ADDITIONAL_RESIDENCE, STRUCTURE_TYPES.PRINCIPAL_RESIDENCE, @@ -215,6 +215,7 @@ export class RosoAdditionalInformationComponent extends FilesStepComponent imple this.confirmRemovalOfSoil = false; this.form.reset(); + this.form.markAsDirty(); this.form.controls.isRemovingSoilForNewStructure.setValue('false'); this.proposedStructures = []; this.structuresSource = new MatTableDataSource(this.proposedStructures); diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.html b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.html index d4ad467c8f..c8a9bf25fe 100644 --- a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.html @@ -112,10 +112,7 @@

Land Use of Parcel(s) under Notice of Intent

{{ noiSubmission.parcelsAgricultureDescription }} - +
Quantify and describe in detail all agricultural improvements made to the parcel(s). @@ -136,10 +133,7 @@

Land Use of Parcel(s) under Notice of Intent

{{ noiSubmission.parcelsNonAgricultureUseDescription }} - +

@@ -169,10 +163,7 @@

{{ noiSubmission.northLandUseTypeDescription }} - +
East
@@ -181,10 +172,7 @@

{{ noiSubmission.eastLandUseTypeDescription }} - +
South
@@ -193,10 +181,7 @@

{{ noiSubmission.southLandUseTypeDescription }} - +
West
@@ -205,10 +190,7 @@

{{ noiSubmission.westLandUseTypeDescription }} - +
@@ -229,8 +211,17 @@

5. Proposal

>
-

6. Additional Information

- TODO +

6. Additional Proposal Information

+ +

7. Optional Documents

diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.scss b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.scss index 8df832ca0f..7ef4dbb6b8 100644 --- a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.scss +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.scss @@ -58,6 +58,14 @@ overflow-x: auto; } + .soil-table { + display: grid; + grid-template-columns: max-content max-content; + overflow-x: auto; + grid-column-gap: rem(36); + grid-row-gap: rem(12); + } + .other-attachments { display: grid; grid-template-columns: max-content max-content max-content; diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.module.ts b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.module.ts index 7fbf9b5cd3..9f59f389d8 100644 --- a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.module.ts +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.module.ts @@ -5,9 +5,10 @@ import { SharedModule } from '../../../shared/shared.module'; import { NoticeOfIntentDetailsComponent } from './notice-of-intent-details.component'; import { ParcelComponent } from './parcel/parcel.component'; import { RosoDetailsComponent } from './roso-details/roso-details.component'; +import { RosoAdditionalInformationComponent } from './roso-details/roso-additional-information/roso-additional-information.component'; @NgModule({ - declarations: [ParcelComponent, RosoDetailsComponent, NoticeOfIntentDetailsComponent], + declarations: [ParcelComponent, RosoDetailsComponent, NoticeOfIntentDetailsComponent, RosoAdditionalInformationComponent], imports: [CommonModule, SharedModule, NgxMaskPipe], exports: [NoticeOfIntentDetailsComponent], }) diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/roso-details/roso-additional-information/roso-additional-information.component.html b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/roso-details/roso-additional-information/roso-additional-information.component.html new file mode 100644 index 0000000000..985e6732d8 --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/roso-details/roso-additional-information/roso-additional-information.component.html @@ -0,0 +1,103 @@ +
+
+ Are you removing soil in order to build a structure? + +
+
+ + {{ _noiSubmission.soilIsRemovingSoilForNewStructure ? 'Yes' : 'No' }} + + +
+ + +
+
#
+
Type
+
Area
+ +
+ {{ i + 1 }} +
+
+ {{ structure.type }} + +
+
+ {{ structure.area }} + +
+ +
+ +
+
+ + +
+ Describe how the structure is necessary for farm use + +
+
+ {{ _noiSubmission.soilStructureFarmUseReason }} + +
+ + + +
+ Describe how the structure is necessary for residential use + +
+
+ {{ _noiSubmission.soilStructureResidentialUseReason }} + +
+ + + +
+ Describe the current agricultural activity on the parcel(s) + +
+
+ {{ _noiSubmission.soilAgriParcelActivity }} + +
+ + + +
+ Describe the intended use of the residential accessory structure + +
+
+ {{ _noiSubmission.soilStructureResidentialAccessoryUseReason }} + +
+ + +
Detailed Building Plan(s)
+
+ + {{ file.fileName }} + + +
+ + +
+ +
+
diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/roso-details/roso-additional-information/roso-additional-information.component.scss b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/roso-details/roso-additional-information/roso-additional-information.component.scss new file mode 100644 index 0000000000..bfe0899632 --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/roso-details/roso-additional-information/roso-additional-information.component.scss @@ -0,0 +1,5 @@ +.multiple-documents { + a { + display: block; + } +} diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/roso-details/roso-additional-information/roso-additional-information.component.spec.ts b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/roso-details/roso-additional-information/roso-additional-information.component.spec.ts new file mode 100644 index 0000000000..92b752ab0b --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/roso-details/roso-additional-information/roso-additional-information.component.spec.ts @@ -0,0 +1,31 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { DeepMocked } from '@golevelup/ts-jest'; +import { NoticeOfIntentDocumentService } from '../../../../../services/notice-of-intent-document/notice-of-intent-document.service'; + +import { RosoAdditionalInformationComponent } from './roso-additional-information.component'; + +describe('RosoAdditionalInformationComponent', () => { + let component: RosoAdditionalInformationComponent; + let fixture: ComponentFixture; + let mockNoiDocumentService: DeepMocked; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [RosoAdditionalInformationComponent], + providers: [ + { + provide: NoticeOfIntentDocumentService, + useValue: mockNoiDocumentService, + }, + ], + }).compileComponents(); + + fixture = TestBed.createComponent(RosoAdditionalInformationComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/roso-details/roso-additional-information/roso-additional-information.component.ts b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/roso-details/roso-additional-information/roso-additional-information.component.ts new file mode 100644 index 0000000000..a2b65f427e --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/roso-details/roso-additional-information/roso-additional-information.component.ts @@ -0,0 +1,97 @@ +import { Component, Input } from '@angular/core'; +import { Router } from '@angular/router'; +import { NoticeOfIntentDocumentDto } from '../../../../../services/notice-of-intent-document/notice-of-intent-document.dto'; +import { NoticeOfIntentDocumentService } from '../../../../../services/notice-of-intent-document/notice-of-intent-document.service'; +import { NoticeOfIntentSubmissionDetailedDto } from '../../../../../services/notice-of-intent-submission/notice-of-intent-submission.dto'; +import { DOCUMENT_TYPE } from '../../../../../shared/dto/document.dto'; +import { + RESIDENTIAL_STRUCTURE_TYPES, + STRUCTURE_TYPES, +} from '../../../edit-submission/additional-information/roso/roso-additional-information.component'; + +@Component({ + selector: 'app-roso-additional-information', + templateUrl: './roso-additional-information.component.html', + styleUrls: ['./roso-additional-information.component.scss'], +}) +export class RosoAdditionalInformationComponent { + @Input() showErrors = true; + @Input() showEdit = true; + @Input() draftMode = false; + @Input() updatedFields: string[] = []; + + _noiSubmission: NoticeOfIntentSubmissionDetailedDto | undefined; + + @Input() set noiSubmission(noiSubmission: NoticeOfIntentSubmissionDetailedDto | undefined) { + if (noiSubmission) { + this._noiSubmission = noiSubmission; + this.setVisibilityAndValidatorsForResidentialFields(); + this.setVisibilityAndValidatorsForAccessoryFields(); + this.setVisibilityAndValidatorsForFarmFields(); + } + } + + @Input() set noiDocuments(documents: NoticeOfIntentDocumentDto[]) { + this.buildingPlans = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.BUILDING_PLAN); + } + + buildingPlans: NoticeOfIntentDocumentDto[] = []; + + isSoilStructureFarmUseReasonVisible = false; + isSoilStructureResidentialUseReasonVisible = false; + isSoilAgriParcelActivityVisible = false; + isSoilStructureResidentialAccessoryUseReasonVisible = false; + + constructor(private router: Router, private noticeOfIntentDocumentService: NoticeOfIntentDocumentService) {} + + private setVisibilityAndValidatorsForResidentialFields() { + if ( + this._noiSubmission?.soilProposedStructures.some( + (structure) => structure.type && RESIDENTIAL_STRUCTURE_TYPES.includes(structure.type) + ) + ) { + this.isSoilStructureResidentialUseReasonVisible = true; + } else { + this.isSoilStructureResidentialUseReasonVisible = false; + } + } + + private setVisibilityAndValidatorsForAccessoryFields() { + if ( + this._noiSubmission?.soilProposedStructures.some( + (structure) => structure.type === STRUCTURE_TYPES.ACCESSORY_STRUCTURE + ) + ) { + this.isSoilStructureResidentialAccessoryUseReasonVisible = true; + } else { + this.isSoilStructureResidentialAccessoryUseReasonVisible = false; + } + } + + private setVisibilityAndValidatorsForFarmFields() { + if ( + this._noiSubmission?.soilProposedStructures.some((structure) => structure.type === STRUCTURE_TYPES.FARM_STRUCTURE) + ) { + this.isSoilAgriParcelActivityVisible = true; + this.isSoilStructureFarmUseReasonVisible = true; + } else { + this.isSoilAgriParcelActivityVisible = false; + this.isSoilStructureFarmUseReasonVisible = false; + } + } + + async onEditSection(step: number) { + if (this.draftMode) { + await this.router.navigateByUrl( + `/alcs/notice-of-intent/${this._noiSubmission?.fileNumber}/edit/${step}?errors=t` + ); + } else { + await this.router.navigateByUrl(`notice-of-intent/${this._noiSubmission?.fileNumber}/edit/${step}?errors=t`); + } + } + + async openFile(uuid: string) { + const res = await this.noticeOfIntentDocumentService.openFile(uuid); + window.open(res?.url, '_blank'); + } +} diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/roso-details/roso-details.component.scss b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/roso-details/roso-details.component.scss index 0c540ce5fb..e69de29bb2 100644 --- a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/roso-details/roso-details.component.scss +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/roso-details/roso-details.component.scss @@ -1,9 +0,0 @@ -@use '../../../../../styles/functions' as *; - -.soil-table { - display: grid; - grid-template-columns: max-content max-content; - overflow-x: auto; - grid-column-gap: rem(36); - grid-row-gap: rem(12); -} From 1d914f38c1311afd58b3da8abce31fa77407577b Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Tue, 15 Aug 2023 16:11:49 -0700 Subject: [PATCH 254/954] Add Proposal map to NFU Submissions * Add to Step 6 and Step 8 * Add to ALCS --- .../application-details.component.html | 1 + .../naru-details/naru-details.component.html | 8 +++-- .../naru-details/naru-details.component.ts | 2 +- .../nfu-details/nfu-details.component.html | 8 +++++ .../nfu-details/nfu-details.component.spec.ts | 12 ++++++-- .../nfu-details/nfu-details.component.ts | 17 ++++++++++- .../application-details.component.html | 6 ++-- .../naru-details.component.spec.ts | 7 ----- .../nfu-details/nfu-details.component.html | 7 +++++ .../nfu-details/nfu-details.component.spec.ts | 16 ++++++++-- .../nfu-details/nfu-details.component.ts | 15 +++++++++- .../edit-submission.component.html | 1 + .../nfu-proposal/nfu-proposal.component.html | 13 +++++++++ .../nfu-proposal.component.spec.ts | 12 ++++++++ .../nfu-proposal/nfu-proposal.component.ts | 29 ++++++++++++++----- ...pplication-submission-validator.service.ts | 18 +++++++++++- 16 files changed, 140 insertions(+), 32 deletions(-) diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.html b/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.html index 56625b34d5..1777a072b9 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.html +++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.html @@ -149,6 +149,7 @@

Proposal

Proposal Map / Site Plan
- - {{ file.fileName }} - +
diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/naru-details/naru-details.component.ts b/alcs-frontend/src/app/features/application/applicant-info/application-details/naru-details/naru-details.component.ts index 23d8f536c5..94a33a8f5a 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/application-details/naru-details/naru-details.component.ts +++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/naru-details/naru-details.component.ts @@ -26,7 +26,7 @@ export class NaruDetailsComponent { proposalMap: ApplicationDocumentDto[] = []; - constructor(private router: Router, private applicationDocumentService: ApplicationDocumentService) {} + constructor(private applicationDocumentService: ApplicationDocumentService) {} async openFile(file: ApplicationDocumentDto) { await this.applicationDocumentService.download(file.uuid, file.fileName); diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/nfu-details/nfu-details.component.html b/alcs-frontend/src/app/features/application/applicant-info/application-details/nfu-details/nfu-details.component.html index 97fbb7bff9..2e25f03054 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/application-details/nfu-details/nfu-details.component.html +++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/nfu-details/nfu-details.component.html @@ -18,6 +18,14 @@
{{ applicationSubmission.nfuAgricultureSupport }}
+
Proposal Map / Site Plan
+
+ +
Do you need to import any fill to construct or conduct the proposed Non-farm use? Fill is any material brought onto the property, including gravel for construction. diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/nfu-details/nfu-details.component.spec.ts b/alcs-frontend/src/app/features/application/applicant-info/application-details/nfu-details/nfu-details.component.spec.ts index c89c5c5448..e20167bde4 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/application-details/nfu-details/nfu-details.component.spec.ts +++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/nfu-details/nfu-details.component.spec.ts @@ -1,4 +1,5 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { ApplicationDocumentService } from '../../../../../services/application/application-document/application-document.service'; import { NfuDetailsComponent } from './nfu-details.component'; @@ -8,9 +9,14 @@ describe('NfuDetailsComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [ NfuDetailsComponent ] - }) - .compileComponents(); + providers: [ + { + provide: ApplicationDocumentService, + useValue: {}, + }, + ], + declarations: [NfuDetailsComponent], + }).compileComponents(); fixture = TestBed.createComponent(NfuDetailsComponent); component = fixture.componentInstance; diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/nfu-details/nfu-details.component.ts b/alcs-frontend/src/app/features/application/applicant-info/application-details/nfu-details/nfu-details.component.ts index c7f3561504..6d878a899c 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/application-details/nfu-details/nfu-details.component.ts +++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/nfu-details/nfu-details.component.ts @@ -1,5 +1,8 @@ import { Component, Input } from '@angular/core'; +import { ApplicationDocumentDto } from '../../../../../services/application/application-document/application-document.dto'; +import { ApplicationDocumentService } from '../../../../../services/application/application-document/application-document.service'; import { ApplicationSubmissionDto } from '../../../../../services/application/application.dto'; +import { DOCUMENT_TYPE } from '../../../../../shared/document/document.dto'; @Component({ selector: 'app-nfu-details[applicationSubmission]', @@ -9,5 +12,17 @@ import { ApplicationSubmissionDto } from '../../../../../services/application/ap export class NfuDetailsComponent { @Input() applicationSubmission!: ApplicationSubmissionDto; - constructor() {} + @Input() set files(documents: ApplicationDocumentDto[] | undefined) { + if (documents) { + this.proposalMap = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.PROPOSAL_MAP); + } + } + + proposalMap: ApplicationDocumentDto[] = []; + + constructor(private applicationDocumentService: ApplicationDocumentService) {} + + async openFile(file: ApplicationDocumentDto) { + await this.applicationDocumentService.download(file.uuid, file.fileName); + } } diff --git a/portal-frontend/src/app/features/applications/application-details/application-details.component.html b/portal-frontend/src/app/features/applications/application-details/application-details.component.html index de1ad9841b..20d8ac1cab 100644 --- a/portal-frontend/src/app/features/applications/application-details/application-details.component.html +++ b/portal-frontend/src/app/features/applications/application-details/application-details.component.html @@ -41,10 +41,7 @@

3. Primary Contact

Organization (optional) Ministry/Department Responsible @@ -242,6 +239,7 @@

6. Proposal

[showEdit]="showEdit" [draftMode]="draftMode" [applicationSubmission]="applicationSubmission" + [applicationDocuments]="appDocuments" [updatedFields]="updatedFields" > { let component: NaruDetailsComponent; let fixture: ComponentFixture; let mockAppDocumentService: DeepMocked; - let mockAppParcelService: DeepMocked; beforeEach(async () => { - mockAppParcelService = createMock(); mockAppDocumentService = createMock(); await TestBed.configureTestingModule({ @@ -22,10 +19,6 @@ describe('PofoDetailsComponent', () => { provide: ApplicationDocumentService, useValue: mockAppDocumentService, }, - { - provide: ApplicationParcelService, - useValue: mockAppParcelService, - }, ], }).compileComponents(); diff --git a/portal-frontend/src/app/features/applications/application-details/nfu-details/nfu-details.component.html b/portal-frontend/src/app/features/applications/application-details/nfu-details/nfu-details.component.html index 339409f445..5dcc330bc5 100644 --- a/portal-frontend/src/app/features/applications/application-details/nfu-details/nfu-details.component.html +++ b/portal-frontend/src/app/features/applications/application-details/nfu-details/nfu-details.component.html @@ -32,6 +32,13 @@ {{ applicationSubmission.nfuAgricultureSupport }}
+
Proposal Map / Site Plan
+
+ + {{ map.fileName }} + + +
Do you need to import any fill to construct or conduct the proposed Non-farm use? Fill is any material brought onto the property, including gravel for construction. diff --git a/portal-frontend/src/app/features/applications/application-details/nfu-details/nfu-details.component.spec.ts b/portal-frontend/src/app/features/applications/application-details/nfu-details/nfu-details.component.spec.ts index c89c5c5448..0083d0c979 100644 --- a/portal-frontend/src/app/features/applications/application-details/nfu-details/nfu-details.component.spec.ts +++ b/portal-frontend/src/app/features/applications/application-details/nfu-details/nfu-details.component.spec.ts @@ -1,16 +1,26 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; import { NfuDetailsComponent } from './nfu-details.component'; describe('NfuDetailsComponent', () => { let component: NfuDetailsComponent; let fixture: ComponentFixture; + let mockAppDocumentService: DeepMocked; beforeEach(async () => { + mockAppDocumentService = createMock(); + await TestBed.configureTestingModule({ - declarations: [ NfuDetailsComponent ] - }) - .compileComponents(); + declarations: [NfuDetailsComponent], + providers: [ + { + provide: ApplicationDocumentService, + useValue: mockAppDocumentService, + }, + ], + }).compileComponents(); fixture = TestBed.createComponent(NfuDetailsComponent); component = fixture.componentInstance; diff --git a/portal-frontend/src/app/features/applications/application-details/nfu-details/nfu-details.component.ts b/portal-frontend/src/app/features/applications/application-details/nfu-details/nfu-details.component.ts index 5a4f0a54d4..2479a231f3 100644 --- a/portal-frontend/src/app/features/applications/application-details/nfu-details/nfu-details.component.ts +++ b/portal-frontend/src/app/features/applications/application-details/nfu-details/nfu-details.component.ts @@ -1,6 +1,9 @@ import { Component, Input } from '@angular/core'; import { Router } from '@angular/router'; +import { ApplicationDocumentDto } from '../../../../services/application-document/application-document.dto'; +import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; import { ApplicationSubmissionDetailedDto } from '../../../../services/application-submission/application-submission.dto'; +import { DOCUMENT_TYPE } from '../../../../shared/dto/document.dto'; @Component({ selector: 'app-nfu-details[applicationSubmission]', @@ -13,8 +16,13 @@ export class NfuDetailsComponent { @Input() showEdit = true; @Input() draftMode = false; @Input() updatedFields: string[] = []; + proposalMap: ApplicationDocumentDto[] = []; - constructor(private router: Router) {} + @Input() set applicationDocuments(documents: ApplicationDocumentDto[]) { + this.proposalMap = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.PROPOSAL_MAP); + } + + constructor(private router: Router, private applicationDocumentService: ApplicationDocumentService) {} async onEditSection(step: number) { if (this.draftMode) { @@ -25,4 +33,9 @@ export class NfuDetailsComponent { await this.router.navigateByUrl(`application/${this.applicationSubmission?.fileNumber}/edit/${step}?errors=t`); } } + + async openFile(uuid: string) { + const res = await this.applicationDocumentService.openFile(uuid); + window.open(res?.url, '_blank'); + } } diff --git a/portal-frontend/src/app/features/applications/edit-submission/edit-submission.component.html b/portal-frontend/src/app/features/applications/edit-submission/edit-submission.component.html index 704d34ef5f..269d5d3ebb 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/edit-submission.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/edit-submission.component.html @@ -96,6 +96,7 @@
Proposal
Characters left: {{ 4000 - agricultureSupportText.textLength }}
+
+ +
A visual representation of your proposal.
+ +
[noiDocuments]="appDocuments" [updatedFields]="updatedFields" > - +

7. Optional Documents

diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.module.ts b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.module.ts index 9f59f389d8..f194f51c70 100644 --- a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.module.ts +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.module.ts @@ -4,11 +4,20 @@ import { NgxMaskPipe } from 'ngx-mask'; import { SharedModule } from '../../../shared/shared.module'; import { NoticeOfIntentDetailsComponent } from './notice-of-intent-details.component'; import { ParcelComponent } from './parcel/parcel.component'; +import { PfrsDetailsComponent } from './pfrs-details/pfrs-details.component'; +import { PofoDetailsComponent } from './pofo-details/pofo-details.component'; import { RosoDetailsComponent } from './roso-details/roso-details.component'; -import { RosoAdditionalInformationComponent } from './roso-details/roso-additional-information/roso-additional-information.component'; +import { AdditionalInformationComponent } from './additional-information/additional-information.component'; @NgModule({ - declarations: [ParcelComponent, RosoDetailsComponent, NoticeOfIntentDetailsComponent, RosoAdditionalInformationComponent], + declarations: [ + ParcelComponent, + RosoDetailsComponent, + PofoDetailsComponent, + PfrsDetailsComponent, + NoticeOfIntentDetailsComponent, + AdditionalInformationComponent, + ], imports: [CommonModule, SharedModule, NgxMaskPipe], exports: [NoticeOfIntentDetailsComponent], }) diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pfrs-details/pfrs-details.component.html b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pfrs-details/pfrs-details.component.html new file mode 100644 index 0000000000..8d6d6739a8 --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pfrs-details/pfrs-details.component.html @@ -0,0 +1,254 @@ +
+
+ Has the ALC previously received an application or Notice of Intent for this proposal? + +
+
+ + {{ _noiSubmission.soilIsFollowUp ? 'Yes' : 'No' }} + + +
+ +
+ Application or NOI ID + +
+
+ {{ _noiSubmission.soilFollowUpIDs }} + +
+ +
+ What is the purpose of the proposal? + +
+
+ {{ _noiSubmission.purpose }} + +
+ +
+ Describe the type of soil proposed to be removed. + +
+
+ {{ _noiSubmission.soilTypeRemoved }} + +
+ +
+ Describe the type, origin and quality of fill proposed to be placed. + +
+
+ {{ _noiSubmission.soilFillTypeToPlace }} + +
+ +
+
+
Soil to be Removed
+
Fill to be Placed
+ +
Volume
+
+ {{ _noiSubmission.soilToRemoveVolume }} + m3 + +
+
+ {{ _noiSubmission.soilToPlaceVolume }} + m3 + +
+ +
Area
+
+ {{ _noiSubmission.soilToRemoveArea }} + ha + +
+
+ {{ _noiSubmission.soilToPlaceArea }} + ha + +
+ +
Maximum Depth
+
+ {{ _noiSubmission.soilToRemoveMaximumDepth }} + m + +
+
+ {{ _noiSubmission.soilToPlaceMaximumDepth }} + m + +
+ +
Average Depth
+
+ {{ _noiSubmission.soilToRemoveAverageDepth }} + m + +
+
+ {{ _noiSubmission.soilToPlaceAverageDepth }} + m + +
+ +
+ +
+
Soil already Removed
+
Fill already Placed
+ +
Volume
+
+ {{ _noiSubmission.soilAlreadyRemovedVolume }} + m3 + +
+
+ {{ _noiSubmission.soilAlreadyPlacedVolume }} + m3 + +
+ +
Area
+
+ {{ _noiSubmission.soilAlreadyRemovedArea }} + ha + +
+
+ {{ _noiSubmission.soilAlreadyPlacedArea }} + ha + +
+ +
Maximum Depth
+
+ {{ _noiSubmission.soilAlreadyRemovedMaximumDepth }} + m + +
+
+ {{ _noiSubmission.soilAlreadyPlacedMaximumDepth }} + m + +
+ +
Average Depth
+
+ {{ _noiSubmission.soilAlreadyRemovedAverageDepth }} + m + +
+
+ {{ _noiSubmission.soilAlreadyPlacedAverageDepth }} + m + +
+
+ +
+

Project Duration

+
+
+ Duration +
+
+ {{ _noiSubmission.soilProjectDurationUnit }} + +
+
+ Length +
+
+ {{ _noiSubmission.soilProjectDurationAmount }} + +
+ +
Proposal Map / Site Plan
+
+ + {{ map.fileName }} + + +
+ +
Is your proposal for area-wide filling?
+
+ + {{ _noiSubmission.soilIsAreaWideFilling ? 'Yes' : 'No' }} + + +
+ +
Is your proposal for aggregate extraction or placer mining?
+
+ + {{ _noiSubmission.soilIsExtractionOrMining ? 'Yes' : 'No' }} + + +
+ + +
Cross Sections
+
+ + {{ file.fileName }} + + +
+ +
Reclamation Plan
+
+ + {{ file.fileName }} + + +
+ + +
+ Have you submitted a Notice of Work to the Ministry of Energy, Mines and Low Carbon Innovation (EMLI)? +
+
+ + {{ _noiSubmission.soilHasSubmittedNotice ? 'Yes' : 'No' }} + + +
+ + + +
Notice of Work
+
+ + {{ file.fileName }} + + +
+ + + +
+ +
+
diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pfrs-details/pfrs-details.component.scss b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pfrs-details/pfrs-details.component.scss new file mode 100644 index 0000000000..9cda769473 --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pfrs-details/pfrs-details.component.scss @@ -0,0 +1,10 @@ +@use '../../../../../styles/functions' as *; + +.soil-table { + grid-template-columns: max-content max-content max-content; + + .spacer-row { + grid-column: 1/4; + height: rem(16); + } +} diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pfrs-details/pfrs-details.component.spec.ts b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pfrs-details/pfrs-details.component.spec.ts new file mode 100644 index 0000000000..36f0806422 --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pfrs-details/pfrs-details.component.spec.ts @@ -0,0 +1,40 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { NoticeOfIntentDocumentService } from '../../../../services/notice-of-intent-document/notice-of-intent-document.service'; +import { NoticeOfIntentParcelService } from '../../../../services/notice-of-intent-parcel/notice-of-intent-parcel.service'; + +import { PfrsDetailsComponent } from './pfrs-details.component'; + +describe('RosoDetailsComponent', () => { + let component: PfrsDetailsComponent; + let fixture: ComponentFixture; + let mockNoiDocumentService: DeepMocked; + let mockNoiParcelService: DeepMocked; + + beforeEach(async () => { + mockNoiParcelService = createMock(); + mockNoiDocumentService = createMock(); + + await TestBed.configureTestingModule({ + declarations: [PfrsDetailsComponent], + providers: [ + { + provide: NoticeOfIntentDocumentService, + useValue: mockNoiDocumentService, + }, + { + provide: NoticeOfIntentParcelService, + useValue: mockNoiParcelService, + }, + ], + }).compileComponents(); + + fixture = TestBed.createComponent(PfrsDetailsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pfrs-details/pfrs-details.component.ts b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pfrs-details/pfrs-details.component.ts new file mode 100644 index 0000000000..7362317011 --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pfrs-details/pfrs-details.component.ts @@ -0,0 +1,55 @@ +import { Component, Input } from '@angular/core'; +import { Router } from '@angular/router'; +import { NoticeOfIntentDocumentDto } from '../../../../services/notice-of-intent-document/notice-of-intent-document.dto'; +import { NoticeOfIntentDocumentService } from '../../../../services/notice-of-intent-document/notice-of-intent-document.service'; +import { NoticeOfIntentSubmissionDetailedDto } from '../../../../services/notice-of-intent-submission/notice-of-intent-submission.dto'; +import { DOCUMENT_TYPE } from '../../../../shared/dto/document.dto'; + +@Component({ + selector: 'app-pfrs-details[noiSubmission]', + templateUrl: './pfrs-details.component.html', + styleUrls: ['./pfrs-details.component.scss'], +}) +export class PfrsDetailsComponent { + @Input() showErrors = true; + @Input() showEdit = true; + @Input() draftMode = false; + @Input() updatedFields: string[] = []; + + _noiSubmission: NoticeOfIntentSubmissionDetailedDto | undefined; + + @Input() set noiSubmission(noiSubmission: NoticeOfIntentSubmissionDetailedDto | undefined) { + if (noiSubmission) { + this._noiSubmission = noiSubmission; + } + } + + @Input() set noiDocuments(documents: NoticeOfIntentDocumentDto[]) { + this.crossSections = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.CROSS_SECTIONS); + this.proposalMap = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.PROPOSAL_MAP); + this.reclamationPlans = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.RECLAMATION_PLAN); + this.noticeOfWorks = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.NOTICE_OF_WORK); + } + + crossSections: NoticeOfIntentDocumentDto[] = []; + proposalMap: NoticeOfIntentDocumentDto[] = []; + reclamationPlans: NoticeOfIntentDocumentDto[] = []; + noticeOfWorks: NoticeOfIntentDocumentDto[] = []; + + constructor(private router: Router, private noticeOfIntentDocumentService: NoticeOfIntentDocumentService) {} + + async onEditSection(step: number) { + if (this.draftMode) { + await this.router.navigateByUrl( + `/alcs/notice-of-intent/${this._noiSubmission?.fileNumber}/edit/${step}?errors=t` + ); + } else { + await this.router.navigateByUrl(`notice-of-intent/${this._noiSubmission?.fileNumber}/edit/${step}?errors=t`); + } + } + + async openFile(uuid: string) { + const res = await this.noticeOfIntentDocumentService.openFile(uuid); + window.open(res?.url, '_blank'); + } +} diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pofo-details/pofo-details.component.html b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pofo-details/pofo-details.component.html new file mode 100644 index 0000000000..1fbf8a4fdd --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pofo-details/pofo-details.component.html @@ -0,0 +1,166 @@ +
+
+ Has the ALC previously received an application or Notice of Intent for this proposal? + +
+
+ + {{ _noiSubmission.soilIsFollowUp ? 'Yes' : 'No' }} + + +
+ +
+ Application or NOI ID + +
+
+ {{ _noiSubmission.soilFollowUpIDs }} + +
+ +
+ What is the purpose of the proposal? + +
+
+ {{ _noiSubmission.purpose }} + +
+ +
+ Describe the type, origin and quality of fill proposed to be placed. + +
+
+ {{ _noiSubmission.soilFillTypeToPlace }} + +
+ +
+
+
+ Fill to be Placed + +
+
Volume
+
+ {{ _noiSubmission.soilToPlaceVolume }} + m3 + +
+
Area
+
+ {{ _noiSubmission.soilToPlaceArea }} ha + +
+
Maximum Depth
+
+ {{ _noiSubmission.soilToPlaceMaximumDepth }} + m + +
+
Average Depth
+
+ {{ _noiSubmission.soilToPlaceAverageDepth }} + m + +
+
+ +
+
+
+ Fill already Placed + +
+
Volume
+
+ {{ _noiSubmission.soilAlreadyPlacedVolume }} + m3 + +
+
Area
+
+ {{ _noiSubmission.soilAlreadyPlacedArea }} + ha + +
+
Maximum Depth
+
+ {{ _noiSubmission.soilAlreadyPlacedMaximumDepth }} + m + +
+
Average Depth
+
+ {{ _noiSubmission.soilAlreadyPlacedAverageDepth }} + m + +
+
+ +
+

Project Duration

+
+
+ Duration + +
+
+ {{ _noiSubmission.soilProjectDurationUnit }} + +
+
+ Length + +
+
+ {{ _noiSubmission.soilProjectDurationAmount }} + +
+ +
Proposal Map / Site Plan
+
+ + {{ map.fileName }} + + +
+ +
Is your proposal for area-wide filling?
+
+ + {{ _noiSubmission.soilIsAreaWideFilling ? 'Yes' : 'No' }} + + +
+ + +
Cross Sections
+
+ + {{ file.fileName }} + + +
+ +
Reclamation Plan
+
+ + {{ file.fileName }} + + +
+ + +
+ +
+
diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pofo-details/pofo-details.component.scss b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pofo-details/pofo-details.component.scss new file mode 100644 index 0000000000..76605b2b82 --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pofo-details/pofo-details.component.scss @@ -0,0 +1,8 @@ +@use '../../../../../styles/functions' as *; + +.soil-table { + .spacer-row { + grid-column: 1/4; + height: rem(16); + } +} diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pofo-details/pofo-details.component.spec.ts b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pofo-details/pofo-details.component.spec.ts new file mode 100644 index 0000000000..6bdcc5a467 --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pofo-details/pofo-details.component.spec.ts @@ -0,0 +1,40 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { NoticeOfIntentDocumentService } from '../../../../services/notice-of-intent-document/notice-of-intent-document.service'; +import { NoticeOfIntentParcelService } from '../../../../services/notice-of-intent-parcel/notice-of-intent-parcel.service'; + +import { PofoDetailsComponent } from './pofo-details.component'; + +describe('RosoDetailsComponent', () => { + let component: PofoDetailsComponent; + let fixture: ComponentFixture; + let mockNoiDocumentService: DeepMocked; + let mockNoiParcelService: DeepMocked; + + beforeEach(async () => { + mockNoiParcelService = createMock(); + mockNoiDocumentService = createMock(); + + await TestBed.configureTestingModule({ + declarations: [PofoDetailsComponent], + providers: [ + { + provide: NoticeOfIntentDocumentService, + useValue: mockNoiDocumentService, + }, + { + provide: NoticeOfIntentParcelService, + useValue: mockNoiParcelService, + }, + ], + }).compileComponents(); + + fixture = TestBed.createComponent(PofoDetailsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pofo-details/pofo-details.component.ts b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pofo-details/pofo-details.component.ts new file mode 100644 index 0000000000..ca7f7ed72c --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pofo-details/pofo-details.component.ts @@ -0,0 +1,55 @@ +import { Component, Input } from '@angular/core'; +import { Router } from '@angular/router'; +import { NoticeOfIntentDocumentDto } from '../../../../services/notice-of-intent-document/notice-of-intent-document.dto'; +import { NoticeOfIntentDocumentService } from '../../../../services/notice-of-intent-document/notice-of-intent-document.service'; +import { NoticeOfIntentSubmissionDetailedDto } from '../../../../services/notice-of-intent-submission/notice-of-intent-submission.dto'; +import { DOCUMENT_TYPE } from '../../../../shared/dto/document.dto'; + +@Component({ + selector: 'app-pofo-details[noiSubmission]', + templateUrl: './pofo-details.component.html', + styleUrls: ['./pofo-details.component.scss'], +}) +export class PofoDetailsComponent { + @Input() showErrors = true; + @Input() showEdit = true; + @Input() draftMode = false; + @Input() updatedFields: string[] = []; + + _noiSubmission: NoticeOfIntentSubmissionDetailedDto | undefined; + + @Input() set noiSubmission(noiSubmission: NoticeOfIntentSubmissionDetailedDto | undefined) { + if (noiSubmission) { + this._noiSubmission = noiSubmission; + } + } + + @Input() set noiDocuments(documents: NoticeOfIntentDocumentDto[]) { + this.crossSections = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.CROSS_SECTIONS); + this.proposalMap = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.PROPOSAL_MAP); + this.reclamationPlans = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.RECLAMATION_PLAN); + this.noticeOfWorks = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.NOTICE_OF_WORK); + } + + crossSections: NoticeOfIntentDocumentDto[] = []; + proposalMap: NoticeOfIntentDocumentDto[] = []; + reclamationPlans: NoticeOfIntentDocumentDto[] = []; + noticeOfWorks: NoticeOfIntentDocumentDto[] = []; + + constructor(private router: Router, private noticeOfIntentDocumentService: NoticeOfIntentDocumentService) {} + + async onEditSection(step: number) { + if (this.draftMode) { + await this.router.navigateByUrl( + `/alcs/notice-of-intent/${this._noiSubmission?.fileNumber}/edit/${step}?errors=t` + ); + } else { + await this.router.navigateByUrl(`notice-of-intent/${this._noiSubmission?.fileNumber}/edit/${step}?errors=t`); + } + } + + async openFile(uuid: string) { + const res = await this.noticeOfIntentDocumentService.openFile(uuid); + window.open(res?.url, '_blank'); + } +} diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/roso-details/roso-details.component.html b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/roso-details/roso-details.component.html index 7cab8ff23b..f1d020d0a1 100644 --- a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/roso-details/roso-details.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/roso-details/roso-details.component.html @@ -42,7 +42,7 @@
Soil to be Removed - +
Volume
diff --git a/portal-frontend/src/app/services/notice-of-intent-document/notice-of-intent-document.service.ts b/portal-frontend/src/app/services/notice-of-intent-document/notice-of-intent-document.service.ts index b2b363f816..c336e011b3 100644 --- a/portal-frontend/src/app/services/notice-of-intent-document/notice-of-intent-document.service.ts +++ b/portal-frontend/src/app/services/notice-of-intent-document/notice-of-intent-document.service.ts @@ -33,7 +33,7 @@ export class NoticeOfIntentDocumentService { file, documentType, source, - `${this.serviceUrl}/application/${fileNumber}/attachExternal` + `${this.serviceUrl}/notice-of-intent/${fileNumber}/attachExternal` ); this.toastService.showSuccessToast('Document uploaded'); return res; @@ -81,7 +81,9 @@ export class NoticeOfIntentDocumentService { async update(fileNumber: string | undefined, updateDtos: NoticeOfIntentDocumentUpdateDto[]) { try { - await firstValueFrom(this.httpClient.patch(`${this.serviceUrl}/application/${fileNumber}`, updateDtos)); + await firstValueFrom( + this.httpClient.patch(`${this.serviceUrl}/notice-of-intent/${fileNumber}`, updateDtos) + ); } catch (e) { console.error(e); this.toastService.showErrorToast('Failed to update documents, please try again'); @@ -92,7 +94,7 @@ export class NoticeOfIntentDocumentService { async getByFileId(fileNumber: string) { try { return await firstValueFrom( - this.httpClient.get(`${this.serviceUrl}/application/${fileNumber}`) + this.httpClient.get(`${this.serviceUrl}/notice-of-intent/${fileNumber}`) ); } catch (e) { console.error(e); diff --git a/portal-frontend/src/app/services/notice-of-intent-submission/notice-of-intent-submission.dto.ts b/portal-frontend/src/app/services/notice-of-intent-submission/notice-of-intent-submission.dto.ts index 798c1ada78..94504765ee 100644 --- a/portal-frontend/src/app/services/notice-of-intent-submission/notice-of-intent-submission.dto.ts +++ b/portal-frontend/src/app/services/notice-of-intent-submission/notice-of-intent-submission.dto.ts @@ -1,4 +1,4 @@ -import { STRUCTURE_TYPES } from '../../features/notice-of-intents/edit-submission/additional-information/roso/roso-additional-information.component'; +import { STRUCTURE_TYPES } from '../../features/notice-of-intents/edit-submission/additional-information/additional-information.component'; import { BaseCodeDto } from '../../shared/dto/base.dto'; import { NoticeOfIntentOwnerDto } from '../notice-of-intent-owner/notice-of-intent-owner.dto'; @@ -77,16 +77,17 @@ export interface NoticeOfIntentSubmissionDetailedDto extends NoticeOfIntentSubmi soilAlreadyPlacedMaximumDepth: number | null; soilAlreadyPlacedAverageDepth: number | null; soilProjectDurationAmount: number | null; - soilProjectDurationUnit?: string | null; - soilFillTypeToPlace?: string | null; - soilAlternativeMeasures?: string | null; - soilIsExtractionOrMining?: boolean; - soilHasSubmittedNotice?: boolean; + soilProjectDurationUnit: string | null; + soilFillTypeToPlace: string | null; + soilAlternativeMeasures: string | null; + soilIsExtractionOrMining: boolean | null; + soilIsAreaWideFilling: boolean | null; + soilHasSubmittedNotice: boolean | null; soilIsRemovingSoilForNewStructure: boolean | null; - soilStructureFarmUseReason?: string | null; - soilStructureResidentialUseReason?: string | null; - soilAgriParcelActivity?: string | null; - soilStructureResidentialAccessoryUseReason?: string | null; + soilStructureFarmUseReason: string | null; + soilStructureResidentialUseReason: string | null; + soilAgriParcelActivity: string | null; + soilStructureResidentialAccessoryUseReason: string | null; soilProposedStructures: ProposedStructure[]; } @@ -133,6 +134,7 @@ export interface NoticeOfIntentSubmissionUpdateDto { soilFillTypeToPlace?: string | null; soilAlternativeMeasures?: string | null; soilIsExtractionOrMining?: boolean | null; + soilIsAreaWideFilling?: boolean | null; soilHasSubmittedNotice?: boolean | null; soilIsRemovingSoilForNewStructure?: boolean | null; soilStructureFarmUseReason?: string | null; diff --git a/services/apps/alcs/src/portal/notice-of-intent-document/notice-of-intent-document.controller.ts b/services/apps/alcs/src/portal/notice-of-intent-document/notice-of-intent-document.controller.ts index 5fb933f583..97ef994ac7 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-document/notice-of-intent-document.controller.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-document/notice-of-intent-document.controller.ts @@ -41,7 +41,7 @@ export class NoticeOfIntentDocumentController { @InjectMapper() private mapper: Mapper, ) {} - @Get('/application/:fileNumber') + @Get('/notice-of-intent/:fileNumber') async listApplicantDocuments( @Param('fileNumber') fileNumber: string, @Param('documentType') documentType: DOCUMENT_TYPE | null, @@ -73,7 +73,7 @@ export class NoticeOfIntentDocumentController { return { url }; } - @Patch('/application/:fileNumber') + @Patch('/notice-of-intent/:fileNumber') async update( @Param('fileNumber') fileNumber: string, @Req() req, @@ -122,7 +122,7 @@ export class NoticeOfIntentDocumentController { return {}; } - @Post('/application/:uuid/attachExternal') + @Post('/notice-of-intent/:uuid/attachExternal') async attachExternalDocument( @Param('uuid') fileNumber: string, @Body() data: AttachExternalDocumentDto, diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.dto.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.dto.ts index 30c3dd7f0f..0116f1f75e 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.dto.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.dto.ts @@ -151,6 +151,9 @@ export class NoticeOfIntentSubmissionDetailedDto extends NoticeOfIntentSubmissio @AutoMap(() => Boolean) soilIsExtractionOrMining?: boolean; + @AutoMap(() => Boolean) + soilIsAreaWideFilling?: boolean; + @AutoMap(() => Boolean) soilHasSubmittedNotice?: boolean; @@ -352,6 +355,10 @@ export class NoticeOfIntentSubmissionUpdateDto { @IsOptional() soilIsExtractionOrMining?: boolean; + @IsBoolean() + @IsOptional() + soilIsAreaWideFilling?: boolean; + @IsBoolean() @IsOptional() soilHasSubmittedNotice?: boolean; diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.entity.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.entity.ts index 515a813bdf..d37048bd35 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.entity.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.entity.ts @@ -394,6 +394,10 @@ export class NoticeOfIntentSubmission extends Base { @Column({ type: 'boolean', nullable: true }) soilIsExtractionOrMining: boolean | null; + @AutoMap(() => Boolean) + @Column({ type: 'boolean', nullable: true }) + soilIsAreaWideFilling: boolean | null; + @AutoMap(() => Boolean) @Column({ type: 'boolean', nullable: true }) soilHasSubmittedNotice: boolean | null; diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts index b0a81cca14..b1e7825f70 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts @@ -281,6 +281,11 @@ export class NoticeOfIntentSubmissionService { noticeOfIntentSubmission.soilIsExtractionOrMining, ); + noticeOfIntentSubmission.soilIsAreaWideFilling = filterUndefined( + updateDto.soilIsAreaWideFilling, + noticeOfIntentSubmission.soilIsAreaWideFilling, + ); + noticeOfIntentSubmission.soilHasSubmittedNotice = filterUndefined( updateDto.soilHasSubmittedNotice, noticeOfIntentSubmission.soilHasSubmittedNotice, diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1692207063498-add_area_wide_filling_to_noi_submission.ts b/services/apps/alcs/src/providers/typeorm/migrations/1692207063498-add_area_wide_filling_to_noi_submission.ts new file mode 100644 index 0000000000..2a88e5ef04 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1692207063498-add_area_wide_filling_to_noi_submission.ts @@ -0,0 +1,19 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class addAreaWideFillingToNoiSubmission1692207063498 + implements MigrationInterface +{ + name = 'addAreaWideFillingToNoiSubmission1692207063498'; + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" ADD "soil_is_area_wide_filling" boolean`, + ); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" DROP COLUMN "soil_is_area_wide_filling"`, + ); + } +} From c462c370993645b2c0ae5b8865f7298cd536fa66 Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Wed, 16 Aug 2023 15:22:24 -0700 Subject: [PATCH 257/954] Feature/alcs 803 roso applicant info (#883) ROSO NOI view in ALCS added "source" column to NOI --- .../applicant-info.component.ts | 6 +- .../application/application.component.ts | 4 +- .../decision/decision.component.ts | 4 +- .../application/intake/intake.component.ts | 4 +- .../proposal/proposal.component.ts | 4 +- .../application-dialog.component.spec.ts | 7 +- .../notice-of-intent-dialog.component.spec.ts | 4 +- .../applicant-info.component.html | 11 + .../applicant-info.component.scss | 10 + .../applicant-info.component.spec.ts | 41 +++ .../applicant-info.component.ts | 48 ++++ .../notice-of-intent-details.component.html | 192 +++++++++++++ .../notice-of-intent-details.component.scss | 126 ++++++++ ...notice-of-intent-details.component.spec.ts | 124 ++++++++ .../notice-of-intent-details.component.ts | 66 +++++ .../notice-of-intent-details.module.ts | 20 ++ .../parcel/parcel.component.html | 92 ++++++ .../parcel/parcel.component.scss | 24 ++ .../parcel/parcel.component.spec.ts | 54 ++++ .../parcel/parcel.component.ts | 77 +++++ ...roso-additional-information.component.html | 73 +++++ ...roso-additional-information.component.scss | 5 + ...o-additional-information.component.spec.ts | 32 +++ .../roso-additional-information.component.ts | 80 ++++++ .../roso-details/roso-details.component.html | 140 +++++++++ .../roso-details/roso-details.component.scss | 0 .../roso-details.component.spec.ts | 35 +++ .../roso-details/roso-details.component.ts | 40 +++ .../notice-of-intent.component.ts | 8 + .../notice-of-intent.module.ts | 5 +- .../application-parcel.service.spec.ts | 2 - .../services/application/application.dto.ts | 4 +- .../application/application.service.spec.ts | 4 +- .../notice-of-intent-parcel.service.spec.ts | 42 +++ .../notice-of-intent-parcel.service.ts | 40 +++ ...otice-of-intent-submission.service.spec.ts | 101 +++++++ .../notice-of-intent-submission.service.ts | 37 +++ .../notice-of-intent/notice-of-intent.dto.ts | 270 ++++++++++++++++++ .../src/app/shared/document/document.dto.ts | 3 + .../additional-information.component.html | 1 + ...notice-of-intent-parcel.controller.spec.ts | 52 ++++ .../notice-of-intent-parcel.controller.ts | 47 +++ ...ce-of-intent-submission.controller.spec.ts | 85 ++++++ .../notice-of-intent-submission.controller.ts | 52 ++++ ...otice-of-intent-submission.service.spec.ts | 157 ++++++++++ .../notice-of-intent-submission.service.ts | 85 ++++++ .../notice-of-intent/notice-of-intent.dto.ts | 12 + .../notice-of-intent.entity.ts | 19 +- .../notice-of-intent.module.ts | 15 + .../notice-of-intent.service.ts | 1 + ...of-intent-submission.automapper.profile.ts | 39 ++- .../notice-of-intent.automapper.profile.ts | 3 + .../notice-of-intent-owner.dto.ts | 2 +- .../notice-of-intent-submission.module.ts | 6 +- .../notice-of-intent-submission.service.ts | 1 + .../1692216006482-noi_source_column.ts | 23 ++ 56 files changed, 2412 insertions(+), 27 deletions(-) create mode 100644 alcs-frontend/src/app/features/notice-of-intent/applicant-info/applicant-info.component.html create mode 100644 alcs-frontend/src/app/features/notice-of-intent/applicant-info/applicant-info.component.scss create mode 100644 alcs-frontend/src/app/features/notice-of-intent/applicant-info/applicant-info.component.spec.ts create mode 100644 alcs-frontend/src/app/features/notice-of-intent/applicant-info/applicant-info.component.ts create mode 100644 alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/notice-of-intent-details.component.html create mode 100644 alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/notice-of-intent-details.component.scss create mode 100644 alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/notice-of-intent-details.component.spec.ts create mode 100644 alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/notice-of-intent-details.component.ts create mode 100644 alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/notice-of-intent-details.module.ts create mode 100644 alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/parcel/parcel.component.html create mode 100644 alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/parcel/parcel.component.scss create mode 100644 alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/parcel/parcel.component.spec.ts create mode 100644 alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/parcel/parcel.component.ts create mode 100644 alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/roso-details/roso-additional-information/roso-additional-information.component.html create mode 100644 alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/roso-details/roso-additional-information/roso-additional-information.component.scss create mode 100644 alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/roso-details/roso-additional-information/roso-additional-information.component.spec.ts create mode 100644 alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/roso-details/roso-additional-information/roso-additional-information.component.ts create mode 100644 alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/roso-details/roso-details.component.html create mode 100644 alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/roso-details/roso-details.component.scss create mode 100644 alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/roso-details/roso-details.component.spec.ts create mode 100644 alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/roso-details/roso-details.component.ts create mode 100644 alcs-frontend/src/app/services/notice-of-intent/notice-of-intent-parcel/notice-of-intent-parcel.service.spec.ts create mode 100644 alcs-frontend/src/app/services/notice-of-intent/notice-of-intent-parcel/notice-of-intent-parcel.service.ts create mode 100644 alcs-frontend/src/app/services/notice-of-intent/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts create mode 100644 alcs-frontend/src/app/services/notice-of-intent/notice-of-intent-submission/notice-of-intent-submission.service.ts create mode 100644 services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-parcel/notice-of-intent-parcel.controller.spec.ts create mode 100644 services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-parcel/notice-of-intent-parcel.controller.ts create mode 100644 services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission/notice-of-intent-submission.controller.spec.ts create mode 100644 services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission/notice-of-intent-submission.controller.ts create mode 100644 services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts create mode 100644 services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission/notice-of-intent-submission.service.ts create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1692216006482-noi_source_column.ts diff --git a/alcs-frontend/src/app/features/application/applicant-info/applicant-info.component.ts b/alcs-frontend/src/app/features/application/applicant-info/applicant-info.component.ts index e32a3e3a3d..3ae87c4d62 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/applicant-info.component.ts +++ b/alcs-frontend/src/app/features/application/applicant-info/applicant-info.component.ts @@ -1,14 +1,14 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; import { Subject, takeUntil } from 'rxjs'; -import { DOCUMENT_TYPE } from '../../../shared/document/document.dto'; import { ApplicationDetailService } from '../../../services/application/application-detail.service'; import { ApplicationSubmissionService } from '../../../services/application/application-submission/application-submission.service'; import { - APPLICATION_SYSTEM_SOURCE_TYPES, ApplicationDto, ApplicationSubmissionDto, SUBMISSION_STATUS, + SYSTEM_SOURCE_TYPES, } from '../../../services/application/application.dto'; +import { DOCUMENT_TYPE } from '../../../shared/document/document.dto'; @Component({ selector: 'app-applicant-info', @@ -37,7 +37,7 @@ export class ApplicantInfoComponent implements OnInit, OnDestroy { this.fileNumber = application.fileNumber; this.submission = await this.applicationSubmissionService.fetchSubmission(this.fileNumber); - const isApplicantSubmission = application.source === APPLICATION_SYSTEM_SOURCE_TYPES.APPLICANT; + const isApplicantSubmission = application.source === SYSTEM_SOURCE_TYPES.APPLICANT; this.isSubmittedToAlc = isApplicantSubmission ? !!application.dateSubmittedToAlc : true; diff --git a/alcs-frontend/src/app/features/application/application.component.ts b/alcs-frontend/src/app/features/application/application.component.ts index 001007eb8f..c0c35069e1 100644 --- a/alcs-frontend/src/app/features/application/application.component.ts +++ b/alcs-frontend/src/app/features/application/application.component.ts @@ -12,8 +12,8 @@ import { ApplicationSubmissionService } from '../../services/application/applica import { ApplicationDto, ApplicationSubmissionDto, - APPLICATION_SYSTEM_SOURCE_TYPES, SUBMISSION_STATUS, + SYSTEM_SOURCE_TYPES, } from '../../services/application/application.dto'; import { ApplicantInfoComponent } from './applicant-info/applicant-info.component'; import { ApplicationMeetingComponent } from './application-meeting/application-meeting.component'; @@ -200,7 +200,7 @@ export class ApplicationComponent implements OnInit, OnDestroy { this.reconsiderationService.fetchByApplication(application.fileNumber); this.modificationService.fetchByApplication(application.fileNumber); - this.isApplicantSubmission = application.source === APPLICATION_SYSTEM_SOURCE_TYPES.APPLICANT; + this.isApplicantSubmission = application.source === SYSTEM_SOURCE_TYPES.APPLICANT; let wasSubmittedToLfng = false; if (this.isApplicantSubmission) { diff --git a/alcs-frontend/src/app/features/application/decision/decision.component.ts b/alcs-frontend/src/app/features/application/decision/decision.component.ts index 5c66f837dd..f9f3a16678 100644 --- a/alcs-frontend/src/app/features/application/decision/decision.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision.component.ts @@ -1,7 +1,7 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; import { Subject, takeUntil } from 'rxjs'; import { ApplicationDetailService } from '../../../services/application/application-detail.service'; -import { ApplicationDto, APPLICATION_SYSTEM_SOURCE_TYPES } from '../../../services/application/application.dto'; +import { ApplicationDto, SYSTEM_SOURCE_TYPES } from '../../../services/application/application.dto'; import { decisionChildRoutes } from './decision.module'; @Component({ @@ -13,7 +13,7 @@ export class DecisionComponent implements OnInit, OnDestroy { $destroy = new Subject(); childRoutes = decisionChildRoutes; - APPLICATION_SYSTEM_SOURCE_TYPES = APPLICATION_SYSTEM_SOURCE_TYPES; + APPLICATION_SYSTEM_SOURCE_TYPES = SYSTEM_SOURCE_TYPES; application: ApplicationDto | undefined; constructor(private applicationDetailService: ApplicationDetailService) {} diff --git a/alcs-frontend/src/app/features/application/intake/intake.component.ts b/alcs-frontend/src/app/features/application/intake/intake.component.ts index 79a378b256..c84f229787 100644 --- a/alcs-frontend/src/app/features/application/intake/intake.component.ts +++ b/alcs-frontend/src/app/features/application/intake/intake.component.ts @@ -3,8 +3,8 @@ import moment from 'moment'; import { environment } from '../../../../environments/environment'; import { ApplicationDetailService } from '../../../services/application/application-detail.service'; import { - APPLICATION_SYSTEM_SOURCE_TYPES, ApplicationDto, + SYSTEM_SOURCE_TYPES, UpdateApplicationDto, } from '../../../services/application/application.dto'; import { ToastService } from '../../../services/toast/toast.service'; @@ -17,7 +17,7 @@ import { ToastService } from '../../../services/toast/toast.service'; export class IntakeComponent implements OnInit { dateSubmittedToAlc?: string; application?: ApplicationDto; - APPLICATION_SYSTEM_SOURCE_TYPES = APPLICATION_SYSTEM_SOURCE_TYPES; + APPLICATION_SYSTEM_SOURCE_TYPES = SYSTEM_SOURCE_TYPES; constructor(private applicationDetailService: ApplicationDetailService, private toastService: ToastService) {} diff --git a/alcs-frontend/src/app/features/application/proposal/proposal.component.ts b/alcs-frontend/src/app/features/application/proposal/proposal.component.ts index cb5bbdb889..6ce20da5e5 100644 --- a/alcs-frontend/src/app/features/application/proposal/proposal.component.ts +++ b/alcs-frontend/src/app/features/application/proposal/proposal.component.ts @@ -1,8 +1,8 @@ import { Component, OnInit } from '@angular/core'; import { ApplicationDetailService } from '../../../services/application/application-detail.service'; import { - APPLICATION_SYSTEM_SOURCE_TYPES, ApplicationDto, + SYSTEM_SOURCE_TYPES, UpdateApplicationDto, } from '../../../services/application/application.dto'; import { ToastService } from '../../../services/toast/toast.service'; @@ -58,7 +58,7 @@ export class ProposalComponent implements OnInit { agCapSourceOptions = AG_CAP_SOURCE_OPTIONS; alrArea: string | undefined; staffObservations: string = ''; - APPLICATION_SYSTEM_SOURCE_TYPES = APPLICATION_SYSTEM_SOURCE_TYPES; + APPLICATION_SYSTEM_SOURCE_TYPES = SYSTEM_SOURCE_TYPES; constructor(private applicationDetailService: ApplicationDetailService, private toastService: ToastService) {} diff --git a/alcs-frontend/src/app/features/board/dialogs/application/application-dialog.component.spec.ts b/alcs-frontend/src/app/features/board/dialogs/application/application-dialog.component.spec.ts index cad7d8ca4a..30be9ca64a 100644 --- a/alcs-frontend/src/app/features/board/dialogs/application/application-dialog.component.spec.ts +++ b/alcs-frontend/src/app/features/board/dialogs/application/application-dialog.component.spec.ts @@ -1,13 +1,12 @@ import { HttpClientTestingModule } from '@angular/common/http/testing'; import { EventEmitter, NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; +import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { RouterTestingModule } from '@angular/router/testing'; import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { ApplicationRegionDto, ApplicationTypeDto } from '../../../../services/application/application-code.dto'; -import { APPLICATION_SYSTEM_SOURCE_TYPES, ApplicationDto } from '../../../../services/application/application.dto'; -import { BoardDto } from '../../../../services/board/board.dto'; +import { ApplicationDto, SYSTEM_SOURCE_TYPES } from '../../../../services/application/application.dto'; import { BoardService } from '../../../../services/board/board.service'; import { CardDto } from '../../../../services/card/card.dto'; import { AssigneeDto } from '../../../../services/user/user.dto'; @@ -71,7 +70,7 @@ describe('ApplicationDialogComponent', () => { code: 'card-status', }, } as CardDto, - source: APPLICATION_SYSTEM_SOURCE_TYPES.ALCS, + source: SYSTEM_SOURCE_TYPES.ALCS, }; beforeEach(async () => { diff --git a/alcs-frontend/src/app/features/board/dialogs/notice-of-intent/notice-of-intent-dialog.component.spec.ts b/alcs-frontend/src/app/features/board/dialogs/notice-of-intent/notice-of-intent-dialog.component.spec.ts index 3347b68d7b..1e2829a64b 100644 --- a/alcs-frontend/src/app/features/board/dialogs/notice-of-intent/notice-of-intent-dialog.component.spec.ts +++ b/alcs-frontend/src/app/features/board/dialogs/notice-of-intent/notice-of-intent-dialog.component.spec.ts @@ -12,7 +12,7 @@ import { AuthenticationService, ICurrentUser } from '../../../../services/authen import { BoardService, BoardWithFavourite } from '../../../../services/board/board.service'; import { CardDto } from '../../../../services/card/card.dto'; import { CardService } from '../../../../services/card/card.service'; -import { NoticeOfIntentDto } from '../../../../services/notice-of-intent/notice-of-intent.dto'; +import { NoticeOfIntentDto, NoticeOfIntentTypeDto } from '../../../../services/notice-of-intent/notice-of-intent.dto'; import { NoticeOfIntentService } from '../../../../services/notice-of-intent/notice-of-intent.service'; import { ToastService } from '../../../../services/toast/toast.service'; import { AssigneeDto } from '../../../../services/user/user.dto'; @@ -54,6 +54,8 @@ describe('NoticeOfIntentDialogComponent', () => { uuid: '', retroactive: null, subtype: [], + type: {} as NoticeOfIntentTypeDto, + source: 'ALCS', }; beforeEach(async () => { diff --git a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/applicant-info.component.html b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/applicant-info.component.html new file mode 100644 index 0000000000..ca71ef9c2c --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/applicant-info.component.html @@ -0,0 +1,11 @@ +
+
+ +
+
diff --git a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/applicant-info.component.scss b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/applicant-info.component.scss new file mode 100644 index 0000000000..480cb3d0e2 --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/applicant-info.component.scss @@ -0,0 +1,10 @@ +.applicant-info { + & > div { + margin: 32px 0; + } + } + + .subheading1 { + margin-bottom: 4px !important; + } + \ No newline at end of file diff --git a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/applicant-info.component.spec.ts b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/applicant-info.component.spec.ts new file mode 100644 index 0000000000..bd5f1a9b09 --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/applicant-info.component.spec.ts @@ -0,0 +1,41 @@ +import { HttpClientTestingModule } from '@angular/common/http/testing'; +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { BehaviorSubject } from 'rxjs'; +import { NoticeOfIntentDetailService } from '../../../services/notice-of-intent/notice-of-intent-detail.service'; +import { NoticeOfIntentDto } from '../../../services/notice-of-intent/notice-of-intent.dto'; +import { ToastService } from '../../../services/toast/toast.service'; + +import { ApplicantInfoComponent } from './applicant-info.component'; + +describe('ApplicantInfoComponent', () => { + let component: ApplicantInfoComponent; + let fixture: ComponentFixture; + let mockAppDetailService: DeepMocked; + let mockToastService: DeepMocked; + + beforeEach(async () => { + mockAppDetailService = createMock() + mockAppDetailService.$noticeOfIntent = new BehaviorSubject(undefined); + + await TestBed.configureTestingModule({ + imports: [HttpClientTestingModule], + declarations: [ ApplicantInfoComponent ], + providers: [ + { provide: NoticeOfIntentDetailService, useValue: mockAppDetailService }, + { provide: ToastService, useValue: mockToastService }, + ], + schemas: [NO_ERRORS_SCHEMA], + }) + .compileComponents(); + + fixture = TestBed.createComponent(ApplicantInfoComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/applicant-info.component.ts b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/applicant-info.component.ts new file mode 100644 index 0000000000..cf7aafffbf --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/applicant-info.component.ts @@ -0,0 +1,48 @@ +import { Component, OnDestroy, OnInit } from '@angular/core'; +import { Subject, takeUntil } from 'rxjs'; +import { SYSTEM_SOURCE_TYPES } from '../../../services/application/application.dto'; +import { NoticeOfIntentDetailService } from '../../../services/notice-of-intent/notice-of-intent-detail.service'; +import { NoticeOfIntentSubmissionService } from '../../../services/notice-of-intent/notice-of-intent-submission/notice-of-intent-submission.service'; +import { + NoticeOfIntentDto, + NoticeOfIntentSubmissionDto, +} from '../../../services/notice-of-intent/notice-of-intent.dto'; +import { DOCUMENT_TYPE } from '../../../shared/document/document.dto'; + +@Component({ + selector: 'app-applicant-info', + templateUrl: './applicant-info.component.html', + styleUrls: ['./applicant-info.component.scss'], +}) +export class ApplicantInfoComponent implements OnInit, OnDestroy { + fileNumber: string = ''; + applicant: string = ''; + destroy = new Subject(); + DOCUMENT_TYPE = DOCUMENT_TYPE; + noticeOfIntent: NoticeOfIntentDto | undefined; + submission?: NoticeOfIntentSubmissionDto = undefined; + isSubmittedToAlc = false; + + constructor( + private noiDetailService: NoticeOfIntentDetailService, + private noiSubmissionService: NoticeOfIntentSubmissionService + ) {} + + ngOnInit(): void { + this.noiDetailService.$noticeOfIntent.pipe(takeUntil(this.destroy)).subscribe(async (noi) => { + if (noi) { + this.noticeOfIntent = noi; + this.fileNumber = noi.fileNumber; + + this.submission = await this.noiSubmissionService.fetchSubmission(this.fileNumber); + const isApplicantSubmission = noi.source === SYSTEM_SOURCE_TYPES.APPLICANT; + this.isSubmittedToAlc = isApplicantSubmission ? !!noi.dateSubmittedToAlc : true; + } + }); + } + + ngOnDestroy(): void { + this.destroy.next(); + this.destroy.complete(); + } +} diff --git a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/notice-of-intent-details.component.html b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/notice-of-intent-details.component.html new file mode 100644 index 0000000000..7dc46b1a0e --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/notice-of-intent-details.component.html @@ -0,0 +1,192 @@ +
+ +
+
+ +
+
+
+
+

Primary Contact Information

+
+
Type
+
+ {{ submission.primaryContact?.type?.label }} + +
+
First Name
+
+ {{ submission.primaryContact?.firstName }} + +
+
Last Name
+
+ {{ submission.primaryContact?.lastName }} + +
+
+ Organization + Ministry/Department Responsible + Department +
+
+ {{ submission.primaryContact?.organizationName }} + +
+
Phone
+
+ {{ submission.primaryContact?.phoneNumber }} + +
+
Email
+
+ {{ submission.primaryContact?.email }} + +
+ +
Authorization Letter(s)
+
+ +
+ +
+ +
+
+
+
+

Land Use

+
+
+

Land Use of Parcel(s) under Application

+
+
+ Quantify and describe in detail all agriculture that currently takes place on the parcel(s). +
+
+ {{ submission.parcelsAgricultureDescription }} +
+
+ Quantify and describe in detail all agricultural improvements made to the parcel(s). +
+
+ {{ submission.parcelsAgricultureImprovementDescription }} +
+
+ Quantify and describe all non-agricultural uses that currently take place on the parcel(s). +
+
+ {{ submission.parcelsNonAgricultureUseDescription }} +
+
+

Land Use of Adjacent Parcels

+
+
+
+
Main Land Use Type
+
Specific Activity
+
North
+
+ {{ submission.northLandUseType }} +
+
+ {{ submission.northLandUseTypeDescription }} +
+
East
+
+ {{ submission.eastLandUseType }} +
+
+ {{ submission.eastLandUseTypeDescription }} +
+
South
+
+ {{ submission.southLandUseType }} +
+
+ {{ submission.southLandUseTypeDescription }} +
+
West
+
+ {{ submission.westLandUseType }} +
+
+ {{ submission.westLandUseTypeDescription }} +
+
+
+ +
+
+
+
+

Proposal

+ +
+
+ +
+
+
+
+

Additional Proposal Information

+ +
+
+ +
+
+
+
+

Optional Documents

+
+
+
Type
+
Description
+
File Name
+ +
+ {{ file.type?.label }} +
+
+ {{ file.description }} +
+
+ {{ file.fileName }} +
+ +
No optional attachments
+
+
+ +
+
+
diff --git a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/notice-of-intent-details.component.scss b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/notice-of-intent-details.component.scss new file mode 100644 index 0000000000..9a90bc113d --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/notice-of-intent-details.component.scss @@ -0,0 +1,126 @@ +@use '../../../../../styles/colors'; + +:host::ng-deep { + .view-grid-item { + display: grid; + grid-template-columns: minmax(100px, 0.5fr) 1fr; + column-gap: 16px; + margin-bottom: 12px; + } + + .details-wrapper { + margin-top: 24px; + margin-bottom: 24px; + + .title { + margin-bottom: 16px !important; + } + } + + h3 .subtext { + margin: 0.5rem 0 !important; + } + + label { + font-weight: 600; + } + + .no-data-text { + text-align: center; + color: colors.$grey; + padding-top: rem(12); + + .error { + justify-content: center; + } + } + + .custom-mat-expansion-panel-header { + height: fit-content; + } + + .table-wrapper { + overflow-x: auto; + width: 100%; + } +} + +:host::ng-deep { + .soil-table { + display: grid; + grid-template-columns: max-content max-content; + overflow-x: auto; + grid-column-gap: 36px; + grid-row-gap: 12px; + overflow: unset; + } + + .scrollable { + overflow-x: auto; + } + + .other-attachments { + display: grid; + grid-template-columns: max-content max-content max-content; + overflow-x: auto; + overflow-y: hidden; + grid-column-gap: 36px; + grid-row-gap: 12px; + + .full-width { + grid-column: 1/3; + } + } + + .adjacent-parcels { + display: grid; + grid-template-columns: max-content max-content max-content; + overflow-x: auto; + grid-column-gap: 36px; + grid-row-gap: 12px; + + .full-width { + grid-column: 1/4; + } + } + + .review-table { + background-color: colors.$grey-light; + display: grid; + grid-row-gap: 24px; + grid-column-gap: 16px; + word-wrap: break-word; + hyphens: auto; + padding: 16px; + margin: 24px 0 40px 0; + grid-template-columns: minmax(60px, 1fr) minmax(60px, 1fr) minmax(60px, 1fr) minmax(60px, 1fr); + + .full-width { + grid-column: 1/5; + } + + .grid-double { + grid-column: 2/5; + } + + .grid-1 { + grid-column: 1/2; + } + + .grid-2 { + grid-column: 2/3; + } + + .grid-3 { + grid-column: 3/5; + } + + .subheading2 { + margin-bottom: 4px !important; + } + } +} + +.edit-section { + margin-top: -40px; +} diff --git a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/notice-of-intent-details.component.spec.ts b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/notice-of-intent-details.component.spec.ts new file mode 100644 index 0000000000..e50059e993 --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/notice-of-intent-details.component.spec.ts @@ -0,0 +1,124 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { Router } from '@angular/router'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { NoiDocumentService } from '../../../../services/notice-of-intent/noi-document/noi-document.service'; +import { NoticeOfIntentSubmissionService } from '../../../../services/notice-of-intent/notice-of-intent-submission/notice-of-intent-submission.service'; +import { + NOI_SUBMISSION_STATUS, + NoticeOfIntentSubmissionStatusDto, +} from '../../../../services/notice-of-intent/notice-of-intent.dto'; +import { ToastService } from '../../../../services/toast/toast.service'; + +import { NoticeOfIntentDetailsComponent } from './notice-of-intent-details.component'; + +describe('NoticeOfIntentDetailsComponent', () => { + let component: NoticeOfIntentDetailsComponent; + let fixture: ComponentFixture; + + let mockNoiDocumentService: DeepMocked; + let mockRouter: DeepMocked; + let mockToastService: DeepMocked; + let mockNoiSubmissionService: DeepMocked; + + beforeEach(async () => { + mockNoiDocumentService = createMock(); + mockRouter = createMock(); + mockNoiSubmissionService = createMock(); + + await TestBed.configureTestingModule({ + providers: [ + { + provide: NoiDocumentService, + useValue: mockNoiDocumentService, + }, + { + provide: Router, + useValue: mockRouter, + }, + { + provide: ToastService, + useValue: mockToastService, + }, + { + provide: NoticeOfIntentSubmissionService, + useValue: mockNoiSubmissionService, + }, + ], + declarations: [NoticeOfIntentDetailsComponent], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(NoticeOfIntentDetailsComponent); + component = fixture.componentInstance; + component.submission = { + fileNumber: '', + uuid: '', + createdAt: 1, + updatedAt: 1, + applicant: '', + localGovernmentUuid: '', + type: '', + typeCode: '', + status: { + code: NOI_SUBMISSION_STATUS.IN_PROGRESS, + portalBackgroundColor: '', + portalColor: '', + } as NoticeOfIntentSubmissionStatusDto, + submissionStatuses: [], + owners: [], + canEdit: false, + canView: false, + + purpose: '', + parcelsAgricultureDescription: '', + parcelsAgricultureImprovementDescription: '', + parcelsNonAgricultureUseDescription: '', + northLandUseType: '', + northLandUseTypeDescription: '', + eastLandUseType: '', + eastLandUseTypeDescription: '', + southLandUseType: '', + southLandUseTypeDescription: '', + westLandUseType: '', + westLandUseTypeDescription: '', + + primaryContactOwnerUuid: null, + primaryContact: undefined, + + //Soil Fields + soilIsRemovingSoilForNewStructure: null, + soilIsFollowUp: null, + soilFollowUpIDs: '', + soilTypeRemoved: '', + soilReduceNegativeImpacts: '', + soilToRemoveVolume: null, + soilToRemoveArea: null, + soilToRemoveMaximumDepth: null, + soilToRemoveAverageDepth: null, + soilAlreadyRemovedVolume: null, + soilAlreadyRemovedArea: null, + soilAlreadyRemovedMaximumDepth: null, + soilAlreadyRemovedAverageDepth: null, + soilToPlaceVolume: null, + soilToPlaceArea: null, + soilToPlaceMaximumDepth: null, + soilToPlaceAverageDepth: null, + soilAlreadyPlacedVolume: null, + soilAlreadyPlacedArea: null, + soilAlreadyPlacedMaximumDepth: null, + soilAlreadyPlacedAverageDepth: null, + soilProjectDurationAmount: null, + soilProjectDurationUnit: null, + soilFillTypeToPlace: null, + soilProposedStructures: [], + }; + component.noiType = 'ROSO'; + component.fileNumber = 'fake'; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/notice-of-intent-details.component.ts b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/notice-of-intent-details.component.ts new file mode 100644 index 0000000000..f9ca90ef74 --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/notice-of-intent-details.component.ts @@ -0,0 +1,66 @@ +import { Component, Input, OnChanges, OnDestroy, OnInit, SimpleChanges } from '@angular/core'; +import { Subject } from 'rxjs'; +import { environment } from '../../../../../environments/environment'; +import { NoticeOfIntentDocumentDto } from '../../../../services/notice-of-intent/noi-document/noi-document.dto'; +import { NoiDocumentService } from '../../../../services/notice-of-intent/noi-document/noi-document.service'; +import { NoticeOfIntentSubmissionDetailedDto } from '../../../../services/notice-of-intent/notice-of-intent.dto'; +import { DOCUMENT_TYPE } from '../../../../shared/document/document.dto'; + +@Component({ + selector: 'app-noi-details', + templateUrl: './notice-of-intent-details.component.html', + styleUrls: ['./notice-of-intent-details.component.scss'], +}) +export class NoticeOfIntentDetailsComponent implements OnInit, OnChanges, OnDestroy { + $destroy = new Subject(); + + @Input() submission!: NoticeOfIntentSubmissionDetailedDto; + @Input() noiType!: string; + @Input() fileNumber!: string; + @Input() showEdit = false; + @Input() isSubmittedToAlc = true; + @Input() wasSubmittedToLfng = false; + + authorizationLetters: NoticeOfIntentDocumentDto[] = []; + otherFiles: NoticeOfIntentDocumentDto[] = []; + files: NoticeOfIntentDocumentDto[] | undefined; + disableEdit = false; + showFullApp = false; + + constructor(private noiDocumentService: NoiDocumentService) {} + + ngOnInit(): void { + this.loadDocuments(); + } + + ngOnChanges(changes: SimpleChanges): void { + this.disableEdit = !this.isSubmittedToAlc; + this.showFullApp = this.isSubmittedToAlc; + } + + ngOnDestroy(): void { + this.$destroy.next(); + this.$destroy.complete(); + } + + onEdit(step: number) { + window.location.href = `${environment.portalUrl}/alcs/notice-of-intent/${this.fileNumber}/edit/${step}`; + } + + async openFile(uuid: string) { + await this.noiDocumentService.download(uuid, ''); + } + + private async loadDocuments() { + const documents = await this.noiDocumentService.getApplicantDocuments(this.fileNumber); + this.otherFiles = documents.filter( + (document) => + document.type && + [DOCUMENT_TYPE.PHOTOGRAPH, DOCUMENT_TYPE.OTHER, DOCUMENT_TYPE.PROFESSIONAL_REPORT].includes(document.type.code) + ); + this.authorizationLetters = documents.filter( + (document) => document.type?.code === DOCUMENT_TYPE.AUTHORIZATION_LETTER + ); + this.files = documents; + } +} diff --git a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/notice-of-intent-details.module.ts b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/notice-of-intent-details.module.ts new file mode 100644 index 0000000000..5da882c43d --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/notice-of-intent-details.module.ts @@ -0,0 +1,20 @@ +import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; +import { NgxMaskPipe } from 'ngx-mask'; +import { SharedModule } from '../../../../shared/shared.module'; +import { NoticeOfIntentDetailsComponent } from './notice-of-intent-details.component'; +import { ParcelComponent } from './parcel/parcel.component'; +import { RosoAdditionalInformationComponent } from './roso-details/roso-additional-information/roso-additional-information.component'; +import { RosoDetailsComponent } from './roso-details/roso-details.component'; + +@NgModule({ + declarations: [ + ParcelComponent, + RosoDetailsComponent, + NoticeOfIntentDetailsComponent, + RosoAdditionalInformationComponent, + ], + imports: [CommonModule, SharedModule, NgxMaskPipe], + exports: [NoticeOfIntentDetailsComponent], +}) +export class NoticeOfIntentDetailsModule {} diff --git a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/parcel/parcel.component.html b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/parcel/parcel.component.html new file mode 100644 index 0000000000..7ad420667a --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/parcel/parcel.component.html @@ -0,0 +1,92 @@ +

Notice of Intent Parcels

+ +
+ +
+

Parcel {{ parcelInd + 1 }}: Parcel and Owner Information

+
+
Parcel Information
+
Ownership Type
+
+ {{ parcel.ownershipType?.label }} + +
+
Legal Description
+
+ {{ parcel.legalDescription }} + +
+
Area (Hectares)
+
+ {{ parcel.mapAreaHectares }} + +
+
+ PID {{ parcel.ownershipType?.code === PARCEL_OWNERSHIP_TYPES.CROWN ? '(optional)' : '' }} +
+
+ {{ parcel.pid | mask : '000-000-000' }} + +
+ +
PIN (optional)
+
+ {{ parcel.pin }} +
+ + +
Purchase Date
+
+ {{ parcel.purchasedDate | date }} + +
+ +
Farm Classification
+
+ {{ parcel.isFarm ? 'Yes' : 'No' }} + +
+
Civic Address
+
+ {{ parcel.civicAddress }} + +
+ +
Crown Selection
+
+ {{ parcel.crownLandOwnerType }} + +
+ +
Certificate Of Title
+
+ +
+
Owner Information
+
+
Type
+
Full Name
+
Organization
+
+ Ministry/ Department +
+
Phone
+
Email
+
Corporate Summary
+ +
{{ owner.type.label }}
+
{{ owner.displayName }}
+
{{ owner.organizationName }}
+
{{ owner.phoneNumber }}
+
{{ owner.email }}
+ + +
+ +
diff --git a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/parcel/parcel.component.scss b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/parcel/parcel.component.scss new file mode 100644 index 0000000000..e79cc4a08f --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/parcel/parcel.component.scss @@ -0,0 +1,24 @@ +.owner-information { + display: grid; + grid-template-columns: max-content max-content max-content max-content max-content max-content; + overflow-x: auto; + overflow-y: hidden; + grid-column-gap: 36px; + grid-row-gap: 12px; + + .full-width { + grid-column: 1/3; + } +} + +.review-table { + grid-template-columns: 1fr 1fr !important; + + .full-width { + grid-column: 1/5; + } +} + +.crown-land { + text-transform: capitalize; +} diff --git a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/parcel/parcel.component.spec.ts b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/parcel/parcel.component.spec.ts new file mode 100644 index 0000000000..6ed8739d73 --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/parcel/parcel.component.spec.ts @@ -0,0 +1,54 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { ActivatedRoute, Router } from '@angular/router'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { Observable } from 'rxjs'; +import { NoiDocumentService } from '../../../../../services/notice-of-intent/noi-document/noi-document.service'; +import { NoticeOfIntentParcelService } from '../../../../../services/notice-of-intent/notice-of-intent-parcel/notice-of-intent-parcel.service'; +import { ParcelComponent } from './parcel.component'; + +describe('ParcelComponent', () => { + let component: ParcelComponent; + let fixture: ComponentFixture; + + let mockNoiParcelService: DeepMocked; + let mockNoiDocService: DeepMocked; + let mockRoute: DeepMocked; + + beforeEach(async () => { + mockNoiParcelService = createMock(); + mockNoiDocService = createMock(); + mockRoute = createMock(); + mockRoute.fragment = new Observable(); + + await TestBed.configureTestingModule({ + declarations: [ParcelComponent], + providers: [ + { + provide: NoticeOfIntentParcelService, + useValue: mockNoiParcelService, + }, + { + provide: NoiDocumentService, + useValue: mockNoiDocService, + }, + { + provide: ActivatedRoute, + useValue: mockRoute, + }, + ], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(ParcelComponent); + component = fixture.componentInstance; + component.noticeOfIntent = { + parcels: [], + } as any; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/parcel/parcel.component.ts b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/parcel/parcel.component.ts new file mode 100644 index 0000000000..ba2ca715a0 --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/parcel/parcel.component.ts @@ -0,0 +1,77 @@ +import { AfterContentChecked, Component, Input, OnChanges, OnDestroy, OnInit, SimpleChanges } from '@angular/core'; +import { ActivatedRoute } from '@angular/router'; +import { Subject, takeUntil } from 'rxjs'; +import { PARCEL_OWNERSHIP_TYPE } from '../../../../../services/application/application.dto'; +import { NoticeOfIntentDocumentDto } from '../../../../../services/notice-of-intent/noi-document/noi-document.dto'; +import { NoiDocumentService } from '../../../../../services/notice-of-intent/noi-document/noi-document.service'; +import { NoticeOfIntentParcelService } from '../../../../../services/notice-of-intent/notice-of-intent-parcel/notice-of-intent-parcel.service'; +import { NoticeOfIntentSubmissionDto } from '../../../../../services/notice-of-intent/notice-of-intent.dto'; + +@Component({ + selector: 'app-parcel', + templateUrl: './parcel.component.html', + styleUrls: ['./parcel.component.scss'], +}) +export class ParcelComponent implements OnInit, OnChanges, OnDestroy, AfterContentChecked { + $destroy = new Subject(); + + @Input() noticeOfIntent!: NoticeOfIntentSubmissionDto; + @Input() files: NoticeOfIntentDocumentDto[] = []; + + pageTitle: string = 'Notice of Intent Parcels'; + showCertificateOfTitle: boolean = true; + + fileId: string = ''; + parcels: any[] = []; + + PARCEL_OWNERSHIP_TYPES = PARCEL_OWNERSHIP_TYPE; + private anchorededParcelUuid: string | undefined; + + constructor( + private noiDocumentService: NoiDocumentService, + private parcelService: NoticeOfIntentParcelService, + private route: ActivatedRoute + ) {} + + ngOnInit(): void { + this.route.fragment.pipe(takeUntil(this.$destroy)).subscribe((fragment) => { + if (fragment) { + this.anchorededParcelUuid = fragment; + } + }); + } + + async onOpenFile(uuid: string) { + const file = this.files.find((file) => file.uuid === uuid); + if (file) { + await this.noiDocumentService.download(file.uuid, file.fileName); + } + } + + async loadParcels(fileNumber: string) { + this.parcels = await this.parcelService.fetchParcels(fileNumber); + } + + ngOnChanges(changes: SimpleChanges): void { + this.loadParcels(this.noticeOfIntent.fileNumber); + } + + ngOnDestroy(): void { + this.$destroy.next(); + this.$destroy.complete(); + } + + ngAfterContentChecked(): void { + if (this.anchorededParcelUuid) { + const el = document.getElementById(this.anchorededParcelUuid); + if (el) { + this.anchorededParcelUuid = undefined; + el.scrollIntoView({ + behavior: 'smooth', + block: 'start', + inline: 'start', + }); + } + } + } +} diff --git a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/roso-details/roso-additional-information/roso-additional-information.component.html b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/roso-details/roso-additional-information/roso-additional-information.component.html new file mode 100644 index 0000000000..e27996ed82 --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/roso-details/roso-additional-information/roso-additional-information.component.html @@ -0,0 +1,73 @@ +
+
Are you removing soil in order to build a structure?
+
+ + {{ _noiSubmission.soilIsRemovingSoilForNewStructure ? 'Yes' : 'No' }} + + +
+ + +
The total floor area (m2) of the proposed structure(s)
+
+
#
+
Type
+
Area
+ +
+ {{ i + 1 }} +
+
+ {{ structure.type }} + +
+
+ {{ structure.area }} + +
+ +
+ +
+
+ + +
Describe how the structure is necessary for farm use
+
+ {{ _noiSubmission.soilStructureFarmUseReason }} +
+ + + +
Describe how the structure is necessary for residential use
+
+ {{ _noiSubmission.soilStructureResidentialUseReason }} + +
+ + + +
Describe the current agricultural activity on the parcel(s)
+
+ {{ _noiSubmission.soilAgriParcelActivity }} + +
+ + + +
Describe the intended use of the residential accessory structure
+
+ {{ _noiSubmission.soilStructureResidentialAccessoryUseReason }} + +
+ + +
Detailed Building Plan(s)
+
+ + {{ file.fileName }} + + +
+ +
diff --git a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/roso-details/roso-additional-information/roso-additional-information.component.scss b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/roso-details/roso-additional-information/roso-additional-information.component.scss new file mode 100644 index 0000000000..bfe0899632 --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/roso-details/roso-additional-information/roso-additional-information.component.scss @@ -0,0 +1,5 @@ +.multiple-documents { + a { + display: block; + } +} diff --git a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/roso-details/roso-additional-information/roso-additional-information.component.spec.ts b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/roso-details/roso-additional-information/roso-additional-information.component.spec.ts new file mode 100644 index 0000000000..301b528b84 --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/roso-details/roso-additional-information/roso-additional-information.component.spec.ts @@ -0,0 +1,32 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { DeepMocked } from '@golevelup/ts-jest'; +import { NoiDocumentService } from '../../../../../../services/notice-of-intent/noi-document/noi-document.service'; +import { RosoAdditionalInformationComponent } from './roso-additional-information.component'; + +describe('RosoAdditionalInformationComponent', () => { + let component: RosoAdditionalInformationComponent; + let fixture: ComponentFixture; + let mockNoiDocumentService: DeepMocked; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [RosoAdditionalInformationComponent], + providers: [ + { + provide: NoiDocumentService, + useValue: mockNoiDocumentService, + }, + ], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(RosoAdditionalInformationComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/roso-details/roso-additional-information/roso-additional-information.component.ts b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/roso-details/roso-additional-information/roso-additional-information.component.ts new file mode 100644 index 0000000000..2086d214c5 --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/roso-details/roso-additional-information/roso-additional-information.component.ts @@ -0,0 +1,80 @@ +import { Component, Input } from '@angular/core'; +import { Router } from '@angular/router'; +import { NoticeOfIntentDocumentDto } from '../../../../../../services/notice-of-intent/noi-document/noi-document.dto'; +import { NoiDocumentService } from '../../../../../../services/notice-of-intent/noi-document/noi-document.service'; +import { + NoticeOfIntentSubmissionDetailedDto, + RESIDENTIAL_STRUCTURE_TYPES, + STRUCTURE_TYPES, +} from '../../../../../../services/notice-of-intent/notice-of-intent.dto'; +import { DOCUMENT_TYPE } from '../../../../../../shared/document/document.dto'; + +@Component({ + selector: 'app-roso-additional-information', + templateUrl: './roso-additional-information.component.html', + styleUrls: ['./roso-additional-information.component.scss'], +}) +export class RosoAdditionalInformationComponent { + _noiSubmission: NoticeOfIntentSubmissionDetailedDto | undefined; + + @Input() set noiSubmission(noiSubmission: NoticeOfIntentSubmissionDetailedDto | undefined) { + if (noiSubmission) { + this._noiSubmission = noiSubmission; + this.setVisibilityAndValidatorsForResidentialFields(); + this.setVisibilityAndValidatorsForAccessoryFields(); + this.setVisibilityAndValidatorsForFarmFields(); + } + } + + @Input() set files(documents: NoticeOfIntentDocumentDto[] | undefined) { + this.buildingPlans = documents?.filter((document) => document.type?.code === DOCUMENT_TYPE.BUILDING_PLAN) ?? []; + } + + buildingPlans: NoticeOfIntentDocumentDto[] = []; + + isSoilStructureFarmUseReasonVisible = false; + isSoilStructureResidentialUseReasonVisible = false; + isSoilAgriParcelActivityVisible = false; + isSoilStructureResidentialAccessoryUseReasonVisible = false; + + constructor(private router: Router, private noticeOfIntentDocumentService: NoiDocumentService) {} + + private setVisibilityAndValidatorsForResidentialFields() { + if ( + this._noiSubmission?.soilProposedStructures.some( + (structure) => structure.type && RESIDENTIAL_STRUCTURE_TYPES.includes(structure.type) + ) + ) { + this.isSoilStructureResidentialUseReasonVisible = true; + } else { + this.isSoilStructureResidentialUseReasonVisible = false; + } + } + + private setVisibilityAndValidatorsForAccessoryFields() { + if ( + this._noiSubmission?.soilProposedStructures.some( + (structure) => structure.type === STRUCTURE_TYPES.ACCESSORY_STRUCTURE + ) + ) { + this.isSoilStructureResidentialAccessoryUseReasonVisible = true; + } else { + this.isSoilStructureResidentialAccessoryUseReasonVisible = false; + } + } + + private setVisibilityAndValidatorsForFarmFields() { + if ( + this._noiSubmission?.soilProposedStructures.some((structure) => structure.type === STRUCTURE_TYPES.FARM_STRUCTURE) + ) { + this.isSoilAgriParcelActivityVisible = true; + this.isSoilStructureFarmUseReasonVisible = true; + } else { + this.isSoilAgriParcelActivityVisible = false; + this.isSoilStructureFarmUseReasonVisible = false; + } + } + async openFile(file: NoticeOfIntentDocumentDto) { + await this.noticeOfIntentDocumentService.download(file.uuid, file.fileName); + } +} diff --git a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/roso-details/roso-details.component.html b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/roso-details/roso-details.component.html new file mode 100644 index 0000000000..2582a4f4b5 --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/roso-details/roso-details.component.html @@ -0,0 +1,140 @@ +
+
+ Has the ALC previously received an application or Notice of Intent for this proposal? +
+
+ + {{ _noiSubmission.soilIsFollowUp ? 'Yes' : 'No' }} + +
+ +
Application or NOI ID
+
+ {{ _noiSubmission.soilFollowUpIDs }} +
+ +
What is the purpose of the proposal?
+
+ {{ _noiSubmission.purpose }} +
+ +
Describe the type of soil proposed to be removed.
+
+ {{ _noiSubmission.soilTypeRemoved }} +
+ +
+
+
+
+ Soil to be Removed +
+
Volume
+
+ {{ _noiSubmission.soilToRemoveVolume }} + m3 +
+
Area
+
+ {{ _noiSubmission.soilToRemoveArea }} ha +
+
Maximum Depth
+
+ {{ _noiSubmission.soilToRemoveMaximumDepth }} + m +
+
Average Depth
+
+ {{ _noiSubmission.soilToRemoveAverageDepth }} + m +
+
+ +
+
+
+
+ Soil already Removed +
+
Volume
+
+ {{ _noiSubmission.soilAlreadyRemovedVolume }} + m3 +
+
Area
+
+ {{ _noiSubmission.soilAlreadyRemovedArea }} + ha +
+
Maximum Depth
+
+ {{ _noiSubmission.soilAlreadyRemovedMaximumDepth }} + m +
+
Average Depth
+
+ {{ _noiSubmission.soilAlreadyRemovedAverageDepth }} + m +
+
+ +
+

Project Duration

+
+
Duration
+
+ {{ _noiSubmission.soilProjectDurationUnit }} +
+
Length
+
+ {{ _noiSubmission.soilProjectDurationAmount }} +
+ +
Proposal Map / Site Plan
+
+ + {{ map.fileName }} + +
+ +
Is your proposal for aggregate extraction or placer mining?
+
+ + {{ _noiSubmission.soilIsExtractionOrMining ? 'Yes' : 'No' }} + +
+ + +
Cross Sections
+
+ + {{ file.fileName }} + +
+ +
Reclamation Plan
+
+ + {{ file.fileName }} + +
+ +
+ Have you submitted a Notice of Work to the Ministry of Energy, Mines and Low Carbon Innovation (EMLI)? +
+
+ + {{ _noiSubmission.soilHasSubmittedNotice ? 'Yes' : 'No' }} + +
+ + +
Notice of Work
+
+ + {{ file.fileName }} + +
+ + +
diff --git a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/roso-details/roso-details.component.scss b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/roso-details/roso-details.component.scss new file mode 100644 index 0000000000..e69de29bb2 diff --git a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/roso-details/roso-details.component.spec.ts b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/roso-details/roso-details.component.spec.ts new file mode 100644 index 0000000000..7462bad6c3 --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/roso-details/roso-details.component.spec.ts @@ -0,0 +1,35 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { NoiDocumentService } from '../../../../../services/notice-of-intent/noi-document/noi-document.service'; + +import { RosoDetailsComponent } from './roso-details.component'; + +describe('RosoDetailsComponent', () => { + let component: RosoDetailsComponent; + let fixture: ComponentFixture; + let mockNoiDocumentService: DeepMocked; + + beforeEach(async () => { + mockNoiDocumentService = createMock(); + + await TestBed.configureTestingModule({ + declarations: [RosoDetailsComponent], + providers: [ + { + provide: NoiDocumentService, + useValue: mockNoiDocumentService, + }, + ], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(RosoDetailsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/roso-details/roso-details.component.ts b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/roso-details/roso-details.component.ts new file mode 100644 index 0000000000..308a3be588 --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/roso-details/roso-details.component.ts @@ -0,0 +1,40 @@ +import { Component, Input } from '@angular/core'; +import { NoticeOfIntentDocumentDto } from '../../../../../services/notice-of-intent/noi-document/noi-document.dto'; +import { NoiDocumentService } from '../../../../../services/notice-of-intent/noi-document/noi-document.service'; +import { NoticeOfIntentSubmissionDetailedDto } from '../../../../../services/notice-of-intent/notice-of-intent.dto'; +import { DOCUMENT_TYPE } from '../../../../../shared/document/document.dto'; + +@Component({ + selector: 'app-roso-details[noiSubmission]', + templateUrl: './roso-details.component.html', + styleUrls: ['./roso-details.component.scss'], +}) +export class RosoDetailsComponent { + _noiSubmission: NoticeOfIntentSubmissionDetailedDto | undefined; + + @Input() set noiSubmission(noiSubmission: NoticeOfIntentSubmissionDetailedDto | undefined) { + if (noiSubmission) { + this._noiSubmission = noiSubmission; + } + } + + @Input() set files(documents: NoticeOfIntentDocumentDto[] | undefined) { + if (documents) { + this.crossSections = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.CROSS_SECTIONS); + this.proposalMap = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.PROPOSAL_MAP); + this.reclamationPlans = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.RECLAMATION_PLAN); + this.noticeOfWorks = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.NOTICE_OF_WORK); + } + } + + crossSections: NoticeOfIntentDocumentDto[] = []; + proposalMap: NoticeOfIntentDocumentDto[] = []; + reclamationPlans: NoticeOfIntentDocumentDto[] = []; + noticeOfWorks: NoticeOfIntentDocumentDto[] = []; + + constructor(private noticeOfIntentDocumentService: NoiDocumentService) {} + + async openFile(file: NoticeOfIntentDocumentDto) { + await this.noticeOfIntentDocumentService.download(file.uuid, file.fileName); + } +} diff --git a/alcs-frontend/src/app/features/notice-of-intent/notice-of-intent.component.ts b/alcs-frontend/src/app/features/notice-of-intent/notice-of-intent.component.ts index 0be8d680f2..214617e702 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/notice-of-intent.component.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/notice-of-intent.component.ts @@ -14,6 +14,7 @@ import { IntakeComponent } from './intake/intake.component'; import { OverviewComponent } from './overview/overview.component'; import { PostDecisionComponent } from './post-decision/post-decision.component'; import { PreparationComponent } from './preparation/preparation.component'; +import { ApplicantInfoComponent } from './applicant-info/applicant-info.component'; export const childRoutes = [ { @@ -22,6 +23,13 @@ export const childRoutes = [ icon: 'summarize', component: OverviewComponent, }, + { + path: 'applicant-info', + menuTitle: 'Applicant Info', + icon: 'persons', + component: ApplicantInfoComponent, + portalOnly: true, + }, { path: 'intake', menuTitle: 'ALC Intake', diff --git a/alcs-frontend/src/app/features/notice-of-intent/notice-of-intent.module.ts b/alcs-frontend/src/app/features/notice-of-intent/notice-of-intent.module.ts index d9f93f256d..ce6d30256e 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/notice-of-intent.module.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/notice-of-intent.module.ts @@ -15,6 +15,8 @@ import { OverviewComponent } from './overview/overview.component'; import { EditModificationDialogComponent } from './post-decision/edit-modification-dialog/edit-modification-dialog.component'; import { PostDecisionComponent } from './post-decision/post-decision.component'; import { PreparationComponent } from './preparation/preparation.component'; +import { ApplicantInfoComponent } from './applicant-info/applicant-info.component'; +import { NoticeOfIntentDetailsModule } from './applicant-info/notice-of-intent-details/notice-of-intent-details.module'; const routes: Routes = [ { @@ -40,7 +42,8 @@ const routes: Routes = [ EditModificationDialogComponent, NoiDocumentsComponent, DocumentUploadDialogComponent, + ApplicantInfoComponent, ], - imports: [SharedModule.forRoot(), RouterModule.forChild(routes)], + imports: [SharedModule.forRoot(), RouterModule.forChild(routes), NoticeOfIntentDetailsModule], }) export class NoticeOfIntentModule {} diff --git a/alcs-frontend/src/app/services/application/application-parcel/application-parcel.service.spec.ts b/alcs-frontend/src/app/services/application/application-parcel/application-parcel.service.spec.ts index 7dbe4bebaf..0c1b0ef2ec 100644 --- a/alcs-frontend/src/app/services/application/application-parcel/application-parcel.service.spec.ts +++ b/alcs-frontend/src/app/services/application/application-parcel/application-parcel.service.spec.ts @@ -3,8 +3,6 @@ import { TestBed } from '@angular/core/testing'; import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { of } from 'rxjs'; import { ToastService } from '../../toast/toast.service'; -import { ApplicationSubmissionDto, SubmittedApplicationOwnerDto } from '../application.dto'; - import { ApplicationParcelService } from './application-parcel.service'; describe('ApplicationParcelService', () => { diff --git a/alcs-frontend/src/app/services/application/application.dto.ts b/alcs-frontend/src/app/services/application/application.dto.ts index 7e350fc3e4..aee39f025d 100644 --- a/alcs-frontend/src/app/services/application/application.dto.ts +++ b/alcs-frontend/src/app/services/application/application.dto.ts @@ -5,7 +5,7 @@ import { ApplicationRegionDto, ApplicationTypeDto } from './application-code.dto import { ApplicationLocalGovernmentDto } from './application-local-government/application-local-government.dto'; import { ApplicationSubmissionToSubmissionStatusDto } from './application-submission-status/application-submission-status.dto'; -export enum APPLICATION_SYSTEM_SOURCE_TYPES { +export enum SYSTEM_SOURCE_TYPES { APPLICANT = 'APPLICANT', ALCS = 'ALCS', } @@ -249,7 +249,7 @@ export interface ApplicationDto { decisionMeetings: ApplicationDecisionMeetingDto[]; card?: CardDto; submittedApplication?: ApplicationSubmissionDto; - source: APPLICATION_SYSTEM_SOURCE_TYPES; + source: SYSTEM_SOURCE_TYPES; alrArea?: number; agCap?: string; agCapSource?: string; diff --git a/alcs-frontend/src/app/services/application/application.service.spec.ts b/alcs-frontend/src/app/services/application/application.service.spec.ts index 29a794768c..b4e509f0bd 100644 --- a/alcs-frontend/src/app/services/application/application.service.spec.ts +++ b/alcs-frontend/src/app/services/application/application.service.spec.ts @@ -3,7 +3,7 @@ import { TestBed } from '@angular/core/testing'; import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { firstValueFrom, of, throwError } from 'rxjs'; import { ToastService } from '../toast/toast.service'; -import { APPLICATION_SYSTEM_SOURCE_TYPES, ApplicationDto } from './application.dto'; +import { ApplicationDto, SYSTEM_SOURCE_TYPES } from './application.dto'; import { ApplicationService } from './application.service'; @@ -40,7 +40,7 @@ describe('ApplicationService', () => { backgroundColor: '', textColor: '', }, - source: APPLICATION_SYSTEM_SOURCE_TYPES.ALCS, + source: SYSTEM_SOURCE_TYPES.ALCS, }; beforeEach(() => { diff --git a/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent-parcel/notice-of-intent-parcel.service.spec.ts b/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent-parcel/notice-of-intent-parcel.service.spec.ts new file mode 100644 index 0000000000..89e25f0b2a --- /dev/null +++ b/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent-parcel/notice-of-intent-parcel.service.spec.ts @@ -0,0 +1,42 @@ +import { HttpClient } from '@angular/common/http'; +import { TestBed } from '@angular/core/testing'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { ToastService } from '../../toast/toast.service'; +import { of } from 'rxjs'; + +import { NoticeOfIntentParcelService } from './notice-of-intent-parcel.service'; + +describe('NoticeOfIntentParcelService', () => { + let service: NoticeOfIntentParcelService; + let mockToastService: DeepMocked; + let mockHttpClient: DeepMocked; + + beforeEach(() => { + mockToastService = createMock(); + mockHttpClient = createMock(); + + TestBed.configureTestingModule({ + providers: [ + { provide: ToastService, useValue: mockToastService }, + { + provide: HttpClient, + useValue: mockHttpClient, + }, + ], + }); + service = TestBed.inject(NoticeOfIntentParcelService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); + + it('should successfully fetch parcels', async () => { + mockHttpClient.get.mockReturnValue(of([])); + + const result = await service.fetchParcels('1'); + + expect(result).toEqual([]); + expect(mockHttpClient.get).toBeCalledTimes(1); + }); +}); diff --git a/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent-parcel/notice-of-intent-parcel.service.ts b/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent-parcel/notice-of-intent-parcel.service.ts new file mode 100644 index 0000000000..a7764d1067 --- /dev/null +++ b/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent-parcel/notice-of-intent-parcel.service.ts @@ -0,0 +1,40 @@ +import { HttpClient } from '@angular/common/http'; +import { Injectable } from '@angular/core'; +import { firstValueFrom } from 'rxjs'; +import { environment } from '../../../../environments/environment'; +import { ToastService } from '../../toast/toast.service'; +import { NoticeOfIntentParcelDto } from '../notice-of-intent.dto'; + +@Injectable({ + providedIn: 'root', +}) +export class NoticeOfIntentParcelService { + private baseUrl = `${environment.apiUrl}/notice-of-intent-parcel`; + + constructor(private http: HttpClient, private toastService: ToastService) {} + + async fetchParcels(fileNumber: string): Promise { + try { + return firstValueFrom(this.http.get(`${this.baseUrl}/${fileNumber}`)); + } catch (e) { + this.toastService.showErrorToast('Failed to fetch Application Parcels'); + throw e; + } + } + + async setParcelArea(uuid: string, alrArea: number | null): Promise { + try { + const res = await firstValueFrom( + this.http.post(`${this.baseUrl}/${uuid}`, { + alrArea, + }) + ); + this.toastService.showSuccessToast('Notice of Intent updated'); + + return res; + } catch (e) { + this.toastService.showErrorToast('Failed to update Notice of Intent Parcel'); + throw e; + } + } +} diff --git a/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts b/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts new file mode 100644 index 0000000000..380dd25362 --- /dev/null +++ b/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts @@ -0,0 +1,101 @@ +import { HttpClient } from '@angular/common/http'; +import { TestBed } from '@angular/core/testing'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { of } from 'rxjs'; +import { ToastService } from '../../toast/toast.service'; +import { NOI_SUBMISSION_STATUS, NoticeOfIntentSubmissionDto } from '../notice-of-intent.dto'; + +import { NoticeOfIntentSubmissionService } from './notice-of-intent-submission.service'; + +describe('NoticeOfIntentSubmissionService', () => { + let service: NoticeOfIntentSubmissionService; + let mockToastService: DeepMocked; + let mockHttpClient: DeepMocked; + + const mockSubmittedApplication: NoticeOfIntentSubmissionDto = { + fileNumber: '', + uuid: '', + createdAt: 0, + updatedAt: 0, + applicant: '', + localGovernmentUuid: '', + type: '', + typeCode: '', + status: { + code: NOI_SUBMISSION_STATUS.IN_PROGRESS, + portalBackgroundColor: '', + portalColor: '', + label: '', + description: '', + }, + submissionStatuses: [], + owners: [], + canEdit: false, + canView: false, + purpose: null, + parcelsAgricultureDescription: '', + parcelsAgricultureImprovementDescription: '', + parcelsNonAgricultureUseDescription: '', + northLandUseType: '', + northLandUseTypeDescription: '', + eastLandUseType: '', + eastLandUseTypeDescription: '', + southLandUseType: '', + southLandUseTypeDescription: '', + westLandUseType: '', + westLandUseTypeDescription: '', + primaryContactOwnerUuid: null, + soilIsFollowUp: null, + soilFollowUpIDs: null, + soilTypeRemoved: null, + soilReduceNegativeImpacts: null, + soilToRemoveVolume: null, + soilToRemoveArea: null, + soilToRemoveMaximumDepth: null, + soilToRemoveAverageDepth: null, + soilAlreadyRemovedVolume: null, + soilAlreadyRemovedArea: null, + soilAlreadyRemovedMaximumDepth: null, + soilAlreadyRemovedAverageDepth: null, + soilToPlaceVolume: null, + soilToPlaceArea: null, + soilToPlaceMaximumDepth: null, + soilToPlaceAverageDepth: null, + soilAlreadyPlacedVolume: null, + soilAlreadyPlacedArea: null, + soilAlreadyPlacedMaximumDepth: null, + soilAlreadyPlacedAverageDepth: null, + soilProjectDurationAmount: null, + soilIsRemovingSoilForNewStructure: null, + soilProposedStructures: [] + }; + + beforeEach(() => { + mockToastService = createMock(); + mockHttpClient = createMock(); + + TestBed.configureTestingModule({ + providers: [ + { provide: ToastService, useValue: mockToastService }, + { + provide: HttpClient, + useValue: mockHttpClient, + }, + ], + }); + service = TestBed.inject(NoticeOfIntentSubmissionService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); + + it('should successfully fetch application submission', async () => { + mockHttpClient.get.mockReturnValue(of(mockSubmittedApplication)); + + const result = await service.fetchSubmission('1'); + + expect(result).toEqual(mockSubmittedApplication); + expect(mockHttpClient.get).toBeCalledTimes(1); + }); +}); diff --git a/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent-submission/notice-of-intent-submission.service.ts b/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent-submission/notice-of-intent-submission.service.ts new file mode 100644 index 0000000000..eb5a37ef95 --- /dev/null +++ b/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent-submission/notice-of-intent-submission.service.ts @@ -0,0 +1,37 @@ +import { HttpClient } from '@angular/common/http'; +import { Injectable } from '@angular/core'; +import { firstValueFrom } from 'rxjs'; +import { environment } from '../../../../environments/environment'; +import { ToastService } from '../../toast/toast.service'; +import { NoticeOfIntentSubmissionDto } from '../notice-of-intent.dto'; + +@Injectable({ + providedIn: 'root', +}) +export class NoticeOfIntentSubmissionService { + private baseUrl = `${environment.apiUrl}/notice-of-intent-submission`; + + constructor(private http: HttpClient, private toastService: ToastService) {} + + async fetchSubmission(fileNumber: string): Promise { + try { + return firstValueFrom(this.http.get(`${this.baseUrl}/${fileNumber}`)); + } catch (e) { + this.toastService.showErrorToast('Failed to fetch Notice of Intent Submission'); + throw e; + } + } + + async setSubmissionStatus(fileNumber: string, statusCode: string): Promise { + try { + return firstValueFrom( + this.http.patch(`${this.baseUrl}/${fileNumber}/update-status`, { + statusCode, + }) + ); + } catch (e) { + this.toastService.showErrorToast('Failed to update Notice of Intent Submission Status'); + throw e; + } + } +} diff --git a/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent.dto.ts b/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent.dto.ts index 1f62f11780..b1a15ce775 100644 --- a/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent.dto.ts +++ b/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent.dto.ts @@ -16,6 +16,12 @@ export interface CreateNoticeOfIntentDto { dateSubmittedToAlc: number; } +export interface NoticeOfIntentTypeDto extends BaseCodeDto { + shortLabel: string; + backgroundColor: string; + textColor: string; +} + export interface NoticeOfIntentDto { uuid: string; fileNumber: string; @@ -23,6 +29,8 @@ export interface NoticeOfIntentDto { localGovernment: ApplicationLocalGovernmentDto; region: ApplicationRegionDto; applicant: string; + type: NoticeOfIntentTypeDto; + source: 'ALCS' | 'APPLICANT'; dateSubmittedToAlc?: number; feePaidDate?: number; @@ -55,3 +63,265 @@ export interface UpdateNoticeOfIntentDto { retroactive?: boolean; subtype?: string[]; } + +export enum NOI_SUBMISSION_STATUS { + IN_PROGRESS = 'PROG', + SUBMITTED_TO_ALC = 'SUBM', //Submitted to ALC + SUBMITTED_TO_ALC_INCOMPLETE = 'SUIN', //Submitted to ALC - Incomplete + RECEIVED_BY_ALC = 'RECA', //Received By ALC + ALC_DECISION = 'ALCD', //Decision Released + CANCELLED = 'CANC', +} + +export interface NoticeOfIntentSubmissionStatusDto extends BaseCodeDto { + code: NOI_SUBMISSION_STATUS; + portalBackgroundColor: string; + portalColor: string; +} + +export interface NoticeOfIntentSubmissionToSubmissionStatusDto { + submissionUuid: string; + effectiveDate: number | null; + statusTypeCode: string; + status: NoticeOfIntentSubmissionStatusDto; +} + +export interface NoticeOfIntentSubmissionDto { + fileNumber: string; + uuid: string; + createdAt: number; + updatedAt: number; + applicant: string; + localGovernmentUuid: string; + type: string; + typeCode: string; + status: NoticeOfIntentSubmissionStatusDto; + submissionStatuses: NoticeOfIntentSubmissionToSubmissionStatusDto[]; + owners: NoticeOfIntentOwnerDto[]; + canEdit: boolean; + canView: boolean; + + purpose: string | null; + parcelsAgricultureDescription: string; + parcelsAgricultureImprovementDescription: string; + parcelsNonAgricultureUseDescription: string; + northLandUseType: string; + northLandUseTypeDescription: string; + eastLandUseType: string; + eastLandUseTypeDescription: string; + southLandUseType: string; + southLandUseTypeDescription: string; + westLandUseType: string; + westLandUseTypeDescription: string; + + primaryContactOwnerUuid: string | null; + primaryContact?: SubmittedNoticeOfIntentOwnerDto; + + //Soil Fields + soilIsFollowUp: boolean | null; + soilFollowUpIDs: string | null; + soilTypeRemoved: string | null; + soilReduceNegativeImpacts: string | null; + soilToRemoveVolume: number | null; + soilToRemoveArea: number | null; + soilToRemoveMaximumDepth: number | null; + soilToRemoveAverageDepth: number | null; + soilAlreadyRemovedVolume: number | null; + soilAlreadyRemovedArea: number | null; + soilAlreadyRemovedMaximumDepth: number | null; + soilAlreadyRemovedAverageDepth: number | null; + soilToPlaceVolume: number | null; + soilToPlaceArea: number | null; + soilToPlaceMaximumDepth: number | null; + soilToPlaceAverageDepth: number | null; + soilAlreadyPlacedVolume: number | null; + soilAlreadyPlacedArea: number | null; + soilAlreadyPlacedMaximumDepth: number | null; + soilAlreadyPlacedAverageDepth: number | null; + soilProjectDurationAmount: number | null; + soilProjectDurationUnit?: string | null; + soilFillTypeToPlace?: string | null; + soilAlternativeMeasures?: string | null; + soilIsExtractionOrMining?: boolean; + soilHasSubmittedNotice?: boolean; + soilIsRemovingSoilForNewStructure: boolean | null; + soilStructureFarmUseReason?: string | null; + soilStructureResidentialUseReason?: string | null; + soilAgriParcelActivity?: string | null; + soilStructureResidentialAccessoryUseReason?: string | null; + soilProposedStructures: ProposedStructure[]; +} + +export interface NoticeOfIntentSubmissionDetailedDto extends NoticeOfIntentSubmissionDto { + purpose: string | null; + parcelsAgricultureDescription: string; + parcelsAgricultureImprovementDescription: string; + parcelsNonAgricultureUseDescription: string; + northLandUseType: string; + northLandUseTypeDescription: string; + eastLandUseType: string; + eastLandUseTypeDescription: string; + southLandUseType: string; + southLandUseTypeDescription: string; + westLandUseType: string; + westLandUseTypeDescription: string; + + primaryContactOwnerUuid: string | null; + primaryContact?: SubmittedNoticeOfIntentOwnerDto; + + //Soil Fields + soilIsFollowUp: boolean | null; + soilFollowUpIDs: string | null; + soilTypeRemoved: string | null; + soilReduceNegativeImpacts: string | null; + soilToRemoveVolume: number | null; + soilToRemoveArea: number | null; + soilToRemoveMaximumDepth: number | null; + soilToRemoveAverageDepth: number | null; + soilAlreadyRemovedVolume: number | null; + soilAlreadyRemovedArea: number | null; + soilAlreadyRemovedMaximumDepth: number | null; + soilAlreadyRemovedAverageDepth: number | null; + soilToPlaceVolume: number | null; + soilToPlaceArea: number | null; + soilToPlaceMaximumDepth: number | null; + soilToPlaceAverageDepth: number | null; + soilAlreadyPlacedVolume: number | null; + soilAlreadyPlacedArea: number | null; + soilAlreadyPlacedMaximumDepth: number | null; + soilAlreadyPlacedAverageDepth: number | null; + soilProjectDurationAmount: number | null; + soilProjectDurationUnit?: string | null; + soilFillTypeToPlace?: string | null; + soilAlternativeMeasures?: string | null; + soilIsExtractionOrMining?: boolean; + soilHasSubmittedNotice?: boolean; + soilIsRemovingSoilForNewStructure: boolean | null; + soilStructureFarmUseReason?: string | null; + soilStructureResidentialUseReason?: string | null; + soilAgriParcelActivity?: string | null; + soilStructureResidentialAccessoryUseReason?: string | null; + soilProposedStructures: ProposedStructure[]; +} + +export interface NoticeOfIntentSubmissionUpdateDto { + applicant?: string | null; + purpose?: string | null; + localGovernmentUuid?: string | null; + typeCode?: string | null; + parcelsAgricultureDescription?: string | null; + parcelsAgricultureImprovementDescription?: string | null; + parcelsNonAgricultureUseDescription?: string | null; + northLandUseType?: string | null; + northLandUseTypeDescription?: string | null; + eastLandUseType?: string | null; + eastLandUseTypeDescription?: string | null; + southLandUseType?: string | null; + southLandUseTypeDescription?: string | null; + westLandUseType?: string | null; + westLandUseTypeDescription?: string | null; + + //Soil Fields + soilIsFollowUp?: boolean | null; + soilFollowUpIDs?: string | null; + soilTypeRemoved?: string | null; + soilReduceNegativeImpacts?: string | null; + soilToRemoveVolume?: number | null; + soilToRemoveArea?: number | null; + soilToRemoveMaximumDepth?: number | null; + soilToRemoveAverageDepth?: number | null; + soilAlreadyRemovedVolume?: number | null; + soilAlreadyRemovedArea?: number | null; + soilAlreadyRemovedMaximumDepth?: number | null; + soilAlreadyRemovedAverageDepth?: number | null; + soilToPlaceVolume?: number | null; + soilToPlaceArea?: number | null; + soilToPlaceMaximumDepth?: number | null; + soilToPlaceAverageDepth?: number | null; + soilAlreadyPlacedVolume?: number | null; + soilAlreadyPlacedArea?: number | null; + soilAlreadyPlacedMaximumDepth?: number | null; + soilAlreadyPlacedAverageDepth?: number | null; + soilProjectDurationAmount?: number | null; + soilProjectDurationUnit?: string | null; + soilFillTypeToPlace?: string | null; + soilAlternativeMeasures?: string | null; + soilIsExtractionOrMining?: boolean | null; + soilHasSubmittedNotice?: boolean | null; + soilIsRemovingSoilForNewStructure?: boolean | null; + soilStructureFarmUseReason?: string | null; + soilStructureResidentialUseReason?: string | null; + soilAgriParcelActivity?: string | null; + soilStructureResidentialAccessoryUseReason?: string | null; + soilProposedStructures?: ProposedStructure[]; +} + +export interface ProposedStructure { + type: STRUCTURE_TYPES | null; + area: number | null; +} + +export enum STRUCTURE_TYPES { + FARM_STRUCTURE = 'Farm Structure', + PRINCIPAL_RESIDENCE = 'Residential - Principal Residence', + ADDITIONAL_RESIDENCE = 'Residential - Additional Residence', + ACCESSORY_STRUCTURE = 'Residential - Accessory Structure', +} + +export interface NoticeOfIntentOwnerDto { + uuid: string; + noticeOfIntentSubmissionUuid: string; + displayName: string; + firstName: string | null; + lastName: string | null; + organizationName: string | null; + phoneNumber: string | null; + email: string | null; + type: OwnerTypeDto; +} + +export enum OWNER_TYPE { + INDIVIDUAL = 'INDV', + ORGANIZATION = 'ORGZ', + AGENT = 'AGEN', + CROWN = 'CRWN', + GOVERNMENT = 'GOVR', +} + +export interface OwnerTypeDto extends BaseCodeDto { + code: OWNER_TYPE; +} + +export const RESIDENTIAL_STRUCTURE_TYPES = [ + STRUCTURE_TYPES.ACCESSORY_STRUCTURE, + STRUCTURE_TYPES.ADDITIONAL_RESIDENCE, + STRUCTURE_TYPES.PRINCIPAL_RESIDENCE, +]; + +export interface SubmittedNoticeOfIntentOwnerDto { + uuid: string; + displayName: string; + firstName: string; + lastName: string; + organizationName?: string; + phoneNumber: string; + email: string; + type: BaseCodeDto; + corporateSummaryUuid?: string; +} + +export interface NoticeOfIntentParcelDto { + uuid: string; + pid?: string; + pin?: string; + legalDescription: string; + mapAreaHectares: string; + purchasedDate?: number; + isFarm?: boolean; + ownershipType?: string; + crownLandOwnerType?: string; + parcelType?: string; + certificateOfTitleUuid?: string; + owners: SubmittedNoticeOfIntentOwnerDto[]; + alrArea: number; +} diff --git a/alcs-frontend/src/app/shared/document/document.dto.ts b/alcs-frontend/src/app/shared/document/document.dto.ts index 393e62c16f..e177053562 100644 --- a/alcs-frontend/src/app/shared/document/document.dto.ts +++ b/alcs-frontend/src/app/shared/document/document.dto.ts @@ -27,6 +27,9 @@ export enum DOCUMENT_TYPE { PROOF_OF_SIGNAGE = 'POSA', REPORT_OF_PUBLIC_HEARING = 'ROPH', PROOF_OF_ADVERTISING = 'POAA', + + // NOI Documents + BUILDING_PLAN = 'BLDP', } export enum DOCUMENT_SOURCE { diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/additional-information/additional-information.component.html b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/additional-information/additional-information.component.html index 1796e934c9..4c4ae5349f 100644 --- a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/additional-information/additional-information.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/additional-information/additional-information.component.html @@ -14,6 +14,7 @@
+
The total floor area (m2) of the proposed structure(s)
#
Type
diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-parcel/notice-of-intent-parcel.controller.spec.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-parcel/notice-of-intent-parcel.controller.spec.ts new file mode 100644 index 0000000000..0ab1923602 --- /dev/null +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-parcel/notice-of-intent-parcel.controller.spec.ts @@ -0,0 +1,52 @@ +import { classes } from '@automapper/classes'; +import { AutomapperModule } from '@automapper/nestjs'; +import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; +import { Test, TestingModule } from '@nestjs/testing'; +import { ClsService } from 'nestjs-cls'; +import { mockKeyCloakProviders } from '../../../../test/mocks/mockTypes'; +import { NoticeOfIntentParcelService } from '../../../portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.service'; +import { NoticeOfIntentParcelController } from './notice-of-intent-parcel.controller'; + +describe('NoticeOfIntentParcelController', () => { + let controller: NoticeOfIntentParcelController; + let mockParcelService: DeepMocked; + + beforeEach(async () => { + mockParcelService = createMock(); + + const module: TestingModule = await Test.createTestingModule({ + imports: [ + AutomapperModule.forRoot({ + strategyInitializer: classes(), + }), + ], + controllers: [NoticeOfIntentParcelController], + providers: [ + { + provide: NoticeOfIntentParcelService, + useValue: mockParcelService, + }, + { + provide: ClsService, + useValue: {}, + }, + ...mockKeyCloakProviders, + ], + }).compile(); + + controller = module.get( + NoticeOfIntentParcelController, + ); + }); + + it('should be defined', () => { + expect(controller).toBeDefined(); + }); + + it('should call through to service for get', async () => { + mockParcelService.fetchByFileId.mockResolvedValue([]); + + await controller.get(''); + expect(mockParcelService.fetchByFileId).toHaveBeenCalledTimes(1); + }); +}); diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-parcel/notice-of-intent-parcel.controller.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-parcel/notice-of-intent-parcel.controller.ts new file mode 100644 index 0000000000..58f667084b --- /dev/null +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-parcel/notice-of-intent-parcel.controller.ts @@ -0,0 +1,47 @@ +import { Mapper } from '@automapper/core'; +import { InjectMapper } from '@automapper/nestjs'; +import { Body, Controller, Get, Param, Post } from '@nestjs/common'; +import { ANY_AUTH_ROLE } from '../../../common/authorization/roles'; +import { UserRoles } from '../../../common/authorization/roles.decorator'; +import { NoticeOfIntentParcelDto } from '../../../portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.dto'; +import { NoticeOfIntentParcel } from '../../../portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.entity'; +import { NoticeOfIntentParcelService } from '../../../portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.service'; + +@Controller('notice-of-intent-parcel') +export class NoticeOfIntentParcelController { + constructor( + private applicationParcelService: NoticeOfIntentParcelService, + @InjectMapper() private mapper: Mapper, + ) {} + + @UserRoles(...ANY_AUTH_ROLE) + @Get('/:fileNumber') + async get(@Param('fileNumber') fileNumber: string) { + const parcels = await this.applicationParcelService.fetchByFileId( + fileNumber, + ); + + return this.mapper.mapArray( + parcels, + NoticeOfIntentParcel, + NoticeOfIntentParcelDto, + ); + } + + @UserRoles(...ANY_AUTH_ROLE) + @Post('/:uuid') + async update(@Param('uuid') uuid: string, @Body() body: { alrArea: number }) { + const parcels = await this.applicationParcelService.update([ + { + uuid, + alrArea: body.alrArea, + }, + ]); + + return this.mapper.mapArray( + parcels, + NoticeOfIntentParcel, + NoticeOfIntentParcelDto, + )[0]; + } +} diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission/notice-of-intent-submission.controller.spec.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission/notice-of-intent-submission.controller.spec.ts new file mode 100644 index 0000000000..04da3b69a3 --- /dev/null +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission/notice-of-intent-submission.controller.spec.ts @@ -0,0 +1,85 @@ +import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; +import { Test, TestingModule } from '@nestjs/testing'; +import { ClsService } from 'nestjs-cls'; +import { DocumentService } from '../../../document/document.service'; +import { NoticeOfIntentSubmission } from '../../../portal/notice-of-intent-submission/notice-of-intent-submission.entity'; +import { AlcsNoticeOfIntentSubmissionDto } from '../notice-of-intent.dto'; +import { NoticeOfIntentSubmissionController } from './notice-of-intent-submission.controller'; +import { NoticeOfIntentSubmissionService } from './notice-of-intent-submission.service'; +import { Document } from '../../../document/document.entity'; +import { mockKeyCloakProviders } from '../../../../test/mocks/mockTypes'; + +describe('NoticeOfIntentSubmissionController', () => { + let controller: NoticeOfIntentSubmissionController; + + let mockNoticeOfIntentSubmissionService: DeepMocked; + let mockDocumentService: DeepMocked; + + beforeEach(async () => { + mockNoticeOfIntentSubmissionService = createMock(); + mockDocumentService = createMock(); + + const module: TestingModule = await Test.createTestingModule({ + controllers: [NoticeOfIntentSubmissionController], + providers: [ + { + provide: NoticeOfIntentSubmissionService, + useValue: mockNoticeOfIntentSubmissionService, + }, + { + provide: DocumentService, + useValue: mockDocumentService, + }, + { + provide: ClsService, + useValue: {}, + }, + ...mockKeyCloakProviders, + ], + }).compile(); + + controller = module.get( + NoticeOfIntentSubmissionController, + ); + }); + + it('should be defined', () => { + expect(controller).toBeDefined(); + }); + + it('should call NoticeOfIntentSubmissionService to get Notice of Intent Submission', async () => { + const fakeFileNumber = 'fake'; + + mockNoticeOfIntentSubmissionService.get.mockResolvedValue({ + fileNumber: fakeFileNumber, + } as NoticeOfIntentSubmission); + mockNoticeOfIntentSubmissionService.mapToDto.mockResolvedValue( + createMock(), + ); + + const result = await controller.get(fakeFileNumber); + + expect(mockNoticeOfIntentSubmissionService.get).toBeCalledTimes(1); + expect(mockNoticeOfIntentSubmissionService.mapToDto).toBeCalledTimes(1); + expect(result).toBeDefined(); + }); + + it('should call documentService to get inline download url Submission', async () => { + const fakeDownloadUrl = 'fake_download'; + const fakeUuid = 'fake'; + + mockDocumentService.getDocument.mockResolvedValue({} as Document); + mockDocumentService.getDownloadUrl.mockResolvedValue(fakeDownloadUrl); + + const result = await controller.downloadFile(fakeUuid); + + expect(mockDocumentService.getDocument).toBeCalledTimes(1); + expect(mockDocumentService.getDownloadUrl).toBeCalledTimes(1); + expect(mockDocumentService.getDocument).toBeCalledWith(fakeUuid); + expect(mockDocumentService.getDownloadUrl).toBeCalledWith( + {} as Document, + true, + ); + expect(result).toEqual({ url: fakeDownloadUrl }); + }); +}); diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission/notice-of-intent-submission.controller.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission/notice-of-intent-submission.controller.ts new file mode 100644 index 0000000000..7ec2b16fda --- /dev/null +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission/notice-of-intent-submission.controller.ts @@ -0,0 +1,52 @@ +import { Body, Controller, Get, Param, Patch, UseGuards } from '@nestjs/common'; +import { ApiOAuth2 } from '@nestjs/swagger'; +import * as config from 'config'; +import { ServiceValidationException } from '../../../../../../libs/common/src/exceptions/base.exception'; +import { ANY_AUTH_ROLE } from '../../../common/authorization/roles'; +import { RolesGuard } from '../../../common/authorization/roles-guard.service'; +import { UserRoles } from '../../../common/authorization/roles.decorator'; +import { DocumentService } from '../../../document/document.service'; +import { NOI_SUBMISSION_STATUS } from '../notice-of-intent-submission-status/notice-of-intent-status.dto'; +import { NoticeOfIntentSubmissionService } from './notice-of-intent-submission.service'; + +@ApiOAuth2(config.get('KEYCLOAK.SCOPES')) +@UseGuards(RolesGuard) +@Controller('notice-of-intent-submission') +export class NoticeOfIntentSubmissionController { + constructor( + private applicationSubmissionService: NoticeOfIntentSubmissionService, + private documentService: DocumentService, + ) {} + + @UserRoles(...ANY_AUTH_ROLE) + @Get('/:fileNumber') + async get(@Param('fileNumber') fileNumber: string) { + const submission = await this.applicationSubmissionService.get(fileNumber); + + return await this.applicationSubmissionService.mapToDto(submission); + } + + @UserRoles(...ANY_AUTH_ROLE) + @Get('/document/:uuid/open') + async downloadFile(@Param('uuid') uuid: string) { + const document = await this.documentService.getDocument(uuid); + const url = await this.documentService.getDownloadUrl(document, true); + return { url }; + } + + @UserRoles(...ANY_AUTH_ROLE) + @Patch('/:fileNumber/update-status') + async updateStatus( + @Param('fileNumber') fileNumber: string, + @Body('statusCode') status: string, + ) { + if (!fileNumber) { + throw new ServiceValidationException('File number is required'); + } + await this.applicationSubmissionService.updateStatus( + fileNumber, + status as NOI_SUBMISSION_STATUS, + ); + return this.get(fileNumber); + } +} diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts new file mode 100644 index 0000000000..2e992ca778 --- /dev/null +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts @@ -0,0 +1,157 @@ +import { classes } from '@automapper/classes'; +import { AutomapperModule } from '@automapper/nestjs'; +import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; +import { Test, TestingModule } from '@nestjs/testing'; +import { getRepositoryToken } from '@nestjs/typeorm'; +import { Repository } from 'typeorm'; +import { NoticeOfIntentOwnerProfile } from '../../../common/automapper/notice-of-intent-owner.automapper.profile'; +import { NoticeOfIntentSubmissionProfile } from '../../../common/automapper/notice-of-intent-submission.automapper.profile'; +import { NoticeOfIntentOwner } from '../../../portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.entity'; +import { NoticeOfIntentSubmission } from '../../../portal/notice-of-intent-submission/notice-of-intent-submission.entity'; +import { NoticeOfIntentSubmissionStatusType } from '../notice-of-intent-submission-status/notice-of-intent-status-type.entity'; +import { NOI_SUBMISSION_STATUS } from '../notice-of-intent-submission-status/notice-of-intent-status.dto'; +import { NoticeOfIntentSubmissionStatusService } from '../notice-of-intent-submission-status/notice-of-intent-submission-status.service'; +import { NoticeOfIntentSubmissionService } from './notice-of-intent-submission.service'; + +describe('NoticeOfIntentSubmissionService', () => { + let service: NoticeOfIntentSubmissionService; + + let mockNoticeOfIntentSubmissionRepository: DeepMocked< + Repository + >; + let mockNoticeOfIntentStatusRepository: DeepMocked< + Repository + >; + let mockNoticeOfIntentSubmissionStatusService: DeepMocked; + + beforeEach(async () => { + mockNoticeOfIntentSubmissionRepository = createMock(); + mockNoticeOfIntentStatusRepository = createMock(); + mockNoticeOfIntentSubmissionStatusService = createMock(); + + const module: TestingModule = await Test.createTestingModule({ + imports: [ + AutomapperModule.forRoot({ + strategyInitializer: classes(), + }), + ], + providers: [ + NoticeOfIntentSubmissionService, + NoticeOfIntentSubmissionProfile, + NoticeOfIntentOwnerProfile, + { + provide: getRepositoryToken(NoticeOfIntentSubmission), + useValue: mockNoticeOfIntentSubmissionRepository, + }, + { + provide: getRepositoryToken(NoticeOfIntentSubmissionStatusType), + useValue: mockNoticeOfIntentStatusRepository, + }, + { + provide: NoticeOfIntentSubmissionStatusService, + useValue: mockNoticeOfIntentSubmissionStatusService, + }, + ], + }).compile(); + + mockNoticeOfIntentSubmissionStatusService.setStatusDate.mockResolvedValue( + {} as any, + ); + + service = module.get( + NoticeOfIntentSubmissionService, + ); + }); + + it('should be defined', () => { + expect(service).toBeDefined(); + }); + + it('should successfully find NoticeOfIntentSubmission', async () => { + const fakeFileNumber = 'fake'; + + mockNoticeOfIntentSubmissionRepository.findOneOrFail.mockResolvedValue( + {} as NoticeOfIntentSubmission, + ); + + const result = await service.get(fakeFileNumber); + + expect(result).toBeDefined(); + expect( + mockNoticeOfIntentSubmissionRepository.findOneOrFail, + ).toBeCalledTimes(1); + expect(mockNoticeOfIntentSubmissionRepository.findOneOrFail).toBeCalledWith( + { + where: { fileNumber: fakeFileNumber, isDraft: false }, + relations: { + noticeOfIntent: { + documents: { + document: true, + }, + }, + owners: { + type: true, + }, + }, + }, + ); + }); + + it('should properly map to dto', async () => { + const fakeSubmission = createMock({ + primaryContactOwnerUuid: 'uuid', + }); + fakeSubmission.owners = [ + new NoticeOfIntentOwner({ + uuid: 'uuid', + }), + ]; + + const result = await service.mapToDto(fakeSubmission); + + expect(result).toBeDefined(); + expect(result.primaryContact).toBeDefined(); + }); + + it('should successfully retrieve status from repo', async () => { + mockNoticeOfIntentStatusRepository.findOneOrFail.mockResolvedValue( + {} as NoticeOfIntentSubmissionStatusType, + ); + + const result = await service.getStatus(NOI_SUBMISSION_STATUS.ALC_DECISION); + + expect(result).toBeDefined(); + expect(mockNoticeOfIntentStatusRepository.findOneOrFail).toBeCalledTimes(1); + expect(mockNoticeOfIntentStatusRepository.findOneOrFail).toBeCalledWith({ + where: { code: NOI_SUBMISSION_STATUS.ALC_DECISION }, + }); + }); + + it('should successfully update the status', async () => { + mockNoticeOfIntentStatusRepository.findOneOrFail.mockResolvedValue( + {} as NoticeOfIntentSubmissionStatusType, + ); + mockNoticeOfIntentSubmissionRepository.findOneOrFail.mockResolvedValue({ + uuid: 'fake', + } as NoticeOfIntentSubmission); + + await service.updateStatus('fake', NOI_SUBMISSION_STATUS.ALC_DECISION); + + expect( + mockNoticeOfIntentSubmissionRepository.findOneOrFail, + ).toBeCalledTimes(1); + expect(mockNoticeOfIntentSubmissionRepository.findOneOrFail).toBeCalledWith( + { + where: { + fileNumber: 'fake', + }, + }, + ); + expect( + mockNoticeOfIntentSubmissionStatusService.setStatusDate, + ).toBeCalledTimes(1); + expect( + mockNoticeOfIntentSubmissionStatusService.setStatusDate, + ).toBeCalledWith('fake', NOI_SUBMISSION_STATUS.ALC_DECISION); + }); +}); diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission/notice-of-intent-submission.service.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission/notice-of-intent-submission.service.ts new file mode 100644 index 0000000000..bf38c26422 --- /dev/null +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission/notice-of-intent-submission.service.ts @@ -0,0 +1,85 @@ +import { Mapper } from '@automapper/core'; +import { InjectMapper } from '@automapper/nestjs'; +import { Injectable } from '@nestjs/common'; +import { InjectRepository } from '@nestjs/typeorm'; +import { Repository } from 'typeorm'; +import { NoticeOfIntentOwnerDto } from '../../../portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.dto'; +import { NoticeOfIntentOwner } from '../../../portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.entity'; +import { NoticeOfIntentSubmission } from '../../../portal/notice-of-intent-submission/notice-of-intent-submission.entity'; +import { NoticeOfIntentSubmissionStatusType } from '../notice-of-intent-submission-status/notice-of-intent-status-type.entity'; +import { NOI_SUBMISSION_STATUS } from '../notice-of-intent-submission-status/notice-of-intent-status.dto'; +import { NoticeOfIntentSubmissionStatusService } from '../notice-of-intent-submission-status/notice-of-intent-submission-status.service'; +import { AlcsNoticeOfIntentSubmissionDto } from '../notice-of-intent.dto'; + +@Injectable() +export class NoticeOfIntentSubmissionService { + constructor( + @InjectRepository(NoticeOfIntentSubmission) + private noiSubmissionRepository: Repository, + @InjectRepository(NoticeOfIntentSubmissionStatusType) + private noiStatusRepository: Repository, + @InjectMapper() private mapper: Mapper, + private noiSubmissionStatusService: NoticeOfIntentSubmissionStatusService, + ) {} + + async get(fileNumber: string) { + return await this.noiSubmissionRepository.findOneOrFail({ + where: { fileNumber, isDraft: false }, + relations: { + noticeOfIntent: { + documents: { + document: true, + }, + }, + owners: { + type: true, + }, + }, + }); + } + + async mapToDto(submission: NoticeOfIntentSubmission) { + const mappedSubmission = await this.mapper.mapAsync( + submission, + NoticeOfIntentSubmission, + AlcsNoticeOfIntentSubmissionDto, + ); + + const primaryContact = submission.owners.find( + (e) => e.uuid === submission.primaryContactOwnerUuid, + ); + + mappedSubmission.primaryContact = await this.mapper.mapAsync( + primaryContact, + NoticeOfIntentOwner, + NoticeOfIntentOwnerDto, + ); + + return mappedSubmission; + } + + async getStatus(code: NOI_SUBMISSION_STATUS) { + return await this.noiStatusRepository.findOneOrFail({ + where: { + code, + }, + }); + } + + async updateStatus(fileNumber: string, statusCode: NOI_SUBMISSION_STATUS) { + const submission = await this.loadBarebonesSubmission(fileNumber); + await this.noiSubmissionStatusService.setStatusDate( + submission.uuid, + statusCode, + ); + } + + private loadBarebonesSubmission(fileNumber: string) { + //Load submission without relations to prevent save from crazy cascading + return this.noiSubmissionRepository.findOneOrFail({ + where: { + fileNumber, + }, + }); + } +} diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.dto.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.dto.ts index 6d4fff23da..987111de92 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.dto.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.dto.ts @@ -9,10 +9,16 @@ import { IsUUID, } from 'class-validator'; import { BaseCodeDto } from '../../common/dtos/base.dto'; +import { NoticeOfIntentOwnerDto } from '../../portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.dto'; +import { NoticeOfIntentSubmissionDetailedDto } from '../../portal/notice-of-intent-submission/notice-of-intent-submission.dto'; import { CardDto } from '../card/card.dto'; import { ApplicationRegionDto } from '../code/application-code/application-region/application-region.dto'; +import { NoticeOfIntentTypeDto } from '../code/application-code/notice-of-intent-type/notice-of-intent-type.dto'; import { LocalGovernmentDto } from '../local-government/local-government.dto'; +export class AlcsNoticeOfIntentSubmissionDto extends NoticeOfIntentSubmissionDetailedDto { + primaryContact?: NoticeOfIntentOwnerDto; +} export class NoticeOfIntentSubtypeDto extends BaseCodeDto { @AutoMap() @IsBoolean() @@ -95,6 +101,12 @@ export class NoticeOfIntentDto { @AutoMap(() => [NoticeOfIntentSubtypeDto]) subtype: NoticeOfIntentSubtypeDto[]; + + @AutoMap(() => NoticeOfIntentTypeDto) + type: NoticeOfIntentTypeDto; + + @AutoMap() + source: 'ALCS' | 'APPLICANT'; } export class UpdateNoticeOfIntentDto { diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.entity.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.entity.ts index 3e3d233a1a..9108748bf2 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.entity.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.entity.ts @@ -8,14 +8,16 @@ import { JoinTable, ManyToMany, ManyToOne, + OneToMany, OneToOne, } from 'typeorm'; import { Base } from '../../common/entities/base.entity'; import { ColumnNumericTransformer } from '../../utils/column-numeric-transform'; -import { LocalGovernment } from '../local-government/local-government.entity'; import { Card } from '../card/card.entity'; import { ApplicationRegion } from '../code/application-code/application-region/application-region.entity'; import { NoticeOfIntentType } from '../code/application-code/notice-of-intent-type/notice-of-intent-type.entity'; +import { LocalGovernment } from '../local-government/local-government.entity'; +import { NoticeOfIntentDocument } from './notice-of-intent-document/notice-of-intent-document.entity'; import { NoticeOfIntentSubtype } from './notice-of-intent-subtype.entity'; @Entity() @@ -129,6 +131,14 @@ export class NoticeOfIntent extends Base { }) dateAcknowledgedComplete: Date | null; + @AutoMap() + @Column({ + default: 'ALCS', + type: 'text', + comment: 'Determines where the NOI came from', + }) + source: 'ALCS' | 'APPLICANT'; + @AutoMap() @Column({ type: 'timestamptz', @@ -143,4 +153,11 @@ export class NoticeOfIntent extends Base { @Column() typeCode: string; + + @AutoMap() + @OneToMany( + () => NoticeOfIntentDocument, + (noiDocument) => noiDocument.noticeOfIntent, + ) + documents: NoticeOfIntentDocument[]; } diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.module.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.module.ts index ffad50cbda..48f54d1834 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.module.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.module.ts @@ -24,6 +24,14 @@ import { NoticeOfIntentSubtype } from './notice-of-intent-subtype.entity'; import { NoticeOfIntent } from './notice-of-intent.entity'; import { NoticeOfIntentService } from './notice-of-intent.service'; +import { NoticeOfIntentSubmissionService } from './notice-of-intent-submission/notice-of-intent-submission.service'; +import { NoticeOfIntentSubmissionController } from './notice-of-intent-submission/notice-of-intent-submission.controller'; +import { NoticeOfIntentSubmission } from '../../portal/notice-of-intent-submission/notice-of-intent-submission.entity'; +import { NoticeOfIntentSubmissionStatusType } from './notice-of-intent-submission-status/notice-of-intent-status-type.entity'; +import { NoticeOfIntentParcelController } from './notice-of-intent-parcel/notice-of-intent-parcel.controller'; +import { NoticeOfIntentSubmissionModule } from '../../portal/notice-of-intent-submission/notice-of-intent-submission.module'; +import { NoticeOfIntentParcel } from '../../portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.entity'; +import { NoticeOfIntentParcelProfile } from '../../common/automapper/notice-of-intent-parcel.automapper.profile'; @Module({ imports: [ @@ -34,6 +42,8 @@ import { NoticeOfIntentService } from './notice-of-intent.service'; NoticeOfIntentType, NoticeOfIntentSubtype, NoticeOfIntentDocument, + NoticeOfIntentSubmission, + NoticeOfIntentSubmissionStatusType, DocumentCode, ]), forwardRef(() => BoardModule), @@ -43,17 +53,22 @@ import { NoticeOfIntentService } from './notice-of-intent.service'; CodeModule, LocalGovernmentModule, NoticeOfIntentSubmissionStatusModule, + forwardRef(() => NoticeOfIntentSubmissionModule), ], providers: [ NoticeOfIntentService, NoticeOfIntentProfile, NoticeOfIntentMeetingService, NoticeOfIntentDocumentService, + NoticeOfIntentSubmissionService, + NoticeOfIntentParcelProfile, ], controllers: [ NoticeOfIntentController, NoticeOfIntentMeetingController, NoticeOfIntentDocumentController, + NoticeOfIntentSubmissionController, + NoticeOfIntentParcelController, ], exports: [ NoticeOfIntentService, diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.ts index 459849bea5..5d3e76e411 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.ts @@ -52,6 +52,7 @@ export class NoticeOfIntentService { localGovernment: true, region: true, subtype: true, + type: true, }; constructor( diff --git a/services/apps/alcs/src/common/automapper/notice-of-intent-submission.automapper.profile.ts b/services/apps/alcs/src/common/automapper/notice-of-intent-submission.automapper.profile.ts index f577977c4a..8b4e971899 100644 --- a/services/apps/alcs/src/common/automapper/notice-of-intent-submission.automapper.profile.ts +++ b/services/apps/alcs/src/common/automapper/notice-of-intent-submission.automapper.profile.ts @@ -7,7 +7,11 @@ import { NoticeOfIntentSubmissionToSubmissionStatusDto, } from '../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status.dto'; import { NoticeOfIntentSubmissionToSubmissionStatus } from '../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status.entity'; -import { NoticeOfIntentOwnerDto } from '../../portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.dto'; +import { AlcsNoticeOfIntentSubmissionDto } from '../../alcs/notice-of-intent/notice-of-intent.dto'; +import { + NoticeOfIntentOwnerDetailedDto, + NoticeOfIntentOwnerDto, +} from '../../portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.dto'; import { NoticeOfIntentOwner } from '../../portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.entity'; import { NoticeOfIntentSubmissionDetailedDto, @@ -106,6 +110,39 @@ export class NoticeOfIntentSubmissionProfile extends AutomapperProfile { }), ), ); + + createMap( + mapper, + NoticeOfIntentSubmission, + AlcsNoticeOfIntentSubmissionDto, + // TODO uncomment when working on statuses + // forMember( + // (a) => a.lastStatusUpdate, + // mapFrom((ad) => { + // return ad.status?.effectiveDate?.getTime(); + // }), + // ), + forMember( + (a) => a.status, + mapFrom((ad) => { + return ad.status.statusType; + }), + ), + forMember( + (a) => a.owners, + mapFrom((ad) => { + if (ad.owners) { + return this.mapper.mapArray( + ad.owners, + NoticeOfIntentOwner, + NoticeOfIntentOwnerDetailedDto, + ); + } else { + return []; + } + }), + ), + ); }; } } diff --git a/services/apps/alcs/src/common/automapper/notice-of-intent.automapper.profile.ts b/services/apps/alcs/src/common/automapper/notice-of-intent.automapper.profile.ts index 786b0c1e7b..a1f6658a50 100644 --- a/services/apps/alcs/src/common/automapper/notice-of-intent.automapper.profile.ts +++ b/services/apps/alcs/src/common/automapper/notice-of-intent.automapper.profile.ts @@ -3,6 +3,8 @@ import { AutomapperProfile, InjectMapper } from '@automapper/nestjs'; import { Injectable } from '@nestjs/common'; import { ApplicationDocumentDto } from '../../alcs/application/application-document/application-document.dto'; import { ApplicationDocument } from '../../alcs/application/application-document/application-document.entity'; +import { NoticeOfIntentTypeDto } from '../../alcs/code/application-code/notice-of-intent-type/notice-of-intent-type.dto'; +import { NoticeOfIntentType } from '../../alcs/code/application-code/notice-of-intent-type/notice-of-intent-type.entity'; import { NoticeOfIntentDocumentDto } from '../../alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.dto'; import { NoticeOfIntentDocument } from '../../alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.entity'; @@ -30,6 +32,7 @@ export class NoticeOfIntentProfile extends AutomapperProfile { override get profile() { return (mapper) => { createMap(mapper, NoticeOfIntentSubtype, NoticeOfIntentSubtypeDto); + createMap(mapper, NoticeOfIntentType, NoticeOfIntentTypeDto); createMap( mapper, diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.dto.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.dto.ts index 08ab45b2ea..671de80829 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.dto.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.dto.ts @@ -8,8 +8,8 @@ import { } from 'class-validator'; import { NoticeOfIntentDocumentDto } from '../../../alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.dto'; import { - OWNER_TYPE, OwnerTypeDto, + OWNER_TYPE, } from '../../../common/owner-type/owner-type.entity'; import { emailRegex } from '../../../utils/email.helper'; import { NoticeOfIntentParcelDto } from '../notice-of-intent-parcel/notice-of-intent-parcel.dto'; diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.module.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.module.ts index 8fe460df4c..1b0fc2501a 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.module.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.module.ts @@ -54,6 +54,10 @@ import { NoticeOfIntentSubmissionService } from './notice-of-intent-submission.s NoticeOfIntentOwnerProfile, NoticeOfIntentParcelProfile, ], - exports: [NoticeOfIntentSubmissionService], + exports: [ + NoticeOfIntentSubmissionService, + NoticeOfIntentParcelService, + NoticeOfIntentParcelProfile, + ], }) export class NoticeOfIntentSubmissionModule {} diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts index b1e7825f70..53276c81e0 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts @@ -95,6 +95,7 @@ export class NoticeOfIntentSubmissionService { fileNumber, applicant: 'Unknown', typeCode: type, + source: 'APPLICANT', }); const noiSubmission = new NoticeOfIntentSubmission({ diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1692216006482-noi_source_column.ts b/services/apps/alcs/src/providers/typeorm/migrations/1692216006482-noi_source_column.ts new file mode 100644 index 0000000000..be56225375 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1692216006482-noi_source_column.ts @@ -0,0 +1,23 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class noiSourceColumn1692216006482 implements MigrationInterface { + name = 'noiSourceColumn1692216006482'; + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent" ADD "source" text NOT NULL DEFAULT 'ALCS'`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."notice_of_intent"."source" IS 'Determines where the NOI came from'`, + ); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."notice_of_intent"."source" IS 'Determines where the NOI came from'`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent" DROP COLUMN "source"`, + ); + } +} From 98a6d336beace51891c62df9b6ee55f2d05b2af3 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Wed, 16 Aug 2023 15:10:52 -0700 Subject: [PATCH 258/954] Add NOI View Page * Add NOI View Page * Remove navigation-wrapper and use default angular tabs (with bold headers) --- portal-frontend/src/app/app.module.ts | 2 + .../lfng-review/lfng-review.component.scss | 37 ---- ...view-application-submission.component.html | 117 +---------- ...view-application-submission.component.scss | 77 +++----- .../view-application-submission.component.ts | 26 +-- .../src/app/features/home/home.component.html | 2 +- .../src/app/features/home/home.component.scss | 7 +- .../edit-submission.component.scss | 1 + ...notice-of-intent-submission.component.html | 107 +++++++++- ...notice-of-intent-submission.component.scss | 183 ++++++++++++++++++ ...ice-of-intent-submission.component.spec.ts | 31 +++ ...w-notice-of-intent-submission.component.ts | 63 +++++- .../notice-of-intent-submission.dto.ts | 1 + .../src/styles/navigation-wrapper.scss | 76 -------- ...of-intent-submission.automapper.profile.ts | 12 ++ .../notice-of-intent-submission.dto.ts | 1 + 16 files changed, 440 insertions(+), 303 deletions(-) delete mode 100644 portal-frontend/src/styles/navigation-wrapper.scss diff --git a/portal-frontend/src/app/app.module.ts b/portal-frontend/src/app/app.module.ts index 2bf28c4feb..c0675920cf 100644 --- a/portal-frontend/src/app/app.module.ts +++ b/portal-frontend/src/app/app.module.ts @@ -20,6 +20,7 @@ import { AlcReviewComponent } from './features/applications/view-submission/alc- import { SubmissionDocumentsComponent } from './features/applications/view-submission/alc-review/submission-documents/submission-documents.component'; import { LfngReviewComponent } from './features/applications/view-submission/lfng-review/lfng-review.component'; import { ViewApplicationSubmissionComponent } from './features/applications/view-submission/view-application-submission.component'; +import { NoticeOfIntentDetailsModule } from './features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.module'; import { ViewNoticeOfIntentSubmissionComponent } from './features/notice-of-intents/view-submission/view-notice-of-intent-submission.component'; import { AuthInterceptorService } from './services/authentication/auth-interceptor.service'; import { TokenRefreshService } from './services/authentication/token-refresh.service'; @@ -59,6 +60,7 @@ import { DecisionsComponent } from './features/applications/view-submission/alc- MatPaginatorModule, MatToolbarModule, ApplicationDetailsModule, + NoticeOfIntentDetailsModule, ], providers: [ ConfirmationDialogService, diff --git a/portal-frontend/src/app/features/applications/view-submission/lfng-review/lfng-review.component.scss b/portal-frontend/src/app/features/applications/view-submission/lfng-review/lfng-review.component.scss index b2921ee5b8..8af4733989 100644 --- a/portal-frontend/src/app/features/applications/view-submission/lfng-review/lfng-review.component.scss +++ b/portal-frontend/src/app/features/applications/view-submission/lfng-review/lfng-review.component.scss @@ -38,43 +38,6 @@ cursor: pointer; } -.header { - flex-direction: column; - align-items: start; - - h3 { - margin-bottom: rem(24) !important; - } - - .btns-wrapper { - display: flex; - flex-direction: column; - width: 100%; - - button { - width: 100%; - margin-bottom: rem(8) !important; - } - } - - @media screen and (min-width: $desktopBreakpoint) { - flex-direction: row; - - h3 { - max-width: 50%; - } - - .btns-wrapper { - flex-direction: row; - width: unset; - - button { - width: unset; - } - } - } -} - .review-table { padding: rem(8); margin: rem(12) 0 rem(20) 0; diff --git a/portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.html b/portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.html index 3990a744a8..447eef32c7 100644 --- a/portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.html +++ b/portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.html @@ -1,6 +1,3 @@ -
- -
-
+
+
@@ -131,114 +128,6 @@

Applicant Submission

-
-
Section:
- - - Applicant Submission - Local/First Nation Gov Review - ALC Review and Decision - - - -
- Tractor - Select section to view more -
-
-
-
-

Application

-
-
-
- - - -
-
- -
-
- -
-
- - -
-
-
-
-
- -
-
- -
-
- - -
-
-
-
- -
-
-
-
+
diff --git a/portal-frontend/src/app/features/home/home.component.scss b/portal-frontend/src/app/features/home/home.component.scss index b372c1ddb9..6e3266e0d0 100644 --- a/portal-frontend/src/app/features/home/home.component.scss +++ b/portal-frontend/src/app/features/home/home.component.scss @@ -1,6 +1,11 @@ @use '../../../styles/functions' as *; @use '../../../styles/colors'; -@use '../../../styles/navigation-wrapper'; + +.navigation { + ::ng-deep .mdc-tab__text-label { + font-weight: bold; + } +} .header-row { .learn-more-wrapper { diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.scss b/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.scss index e745545965..ce7f3f5be7 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.scss +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.scss @@ -12,6 +12,7 @@ align-items: center; justify-content: center; } + .header-btn-wrapper { display: flex; align-items: center; diff --git a/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.html b/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.html index 6132555a09..10c1dea8c2 100644 --- a/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.html @@ -1 +1,106 @@ -

view-submission works!

+ + + +
+
+ + +
+
+
+

Applicant Submission

+
+ + + +
+
+
+ +
+
+
+
+
+ +
+
+ +
+
+ + +
ALC GOES HERE
+ + +
+
+
+ +
diff --git a/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.scss b/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.scss index e69de29bb2..2b720dbcd3 100644 --- a/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.scss +++ b/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.scss @@ -0,0 +1,183 @@ +@use '../../../../styles/functions' as *; +@use '../../../../styles/colors'; + +.navigation { + ::ng-deep .mdc-tab__text-label { + font-weight: bold; + } +} + +.content { + margin: rem(24) 0; +} + +:host::ng-deep { + .header { + display: flex; + justify-content: space-between; + align-items: center; + margin-bottom: rem(24); + flex-direction: column; + + @media screen and (min-width: $tabletBreakpoint) { + flex-direction: row; + } + + h3 { + margin-top: rem(8) !important; + } + + .btns-wrapper { + display: flex; + flex-direction: column-reverse; + width: 100%; + + button { + margin-top: rem(16) !important; + } + + @media screen and (min-width: $tabletBreakpoint) { + display: inline-block; + width: unset; + + button { + margin-right: rem(16) !important; + margin-top: rem(8) !important; + } + + button:last-child { + margin-right: 0 !important; + } + } + } + } +} + +.absolute { + position: absolute; + left: 0; + right: 0; +} + +.banner { + background-color: colors.$secondary-color; + width: 100%; + color: #fff; + padding: rem(16) rem(24); + margin-bottom: rem(32); + + @media screen and (min-width: $tabletBreakpoint) { + padding: rem(12) rem(36) !important; + } + + // TODO: this is just a placeholder and will be addressed later + @media screen and (min-width: $desktopBreakpoint) { + padding: rem(18) rem(80) !important; + } + + .banner-status { + margin: rem(16) 0; + display: grid; + grid-template-columns: 1fr; + + div { + margin-top: rem(16); + } + + @media screen and (min-width: $tabletBreakpoint) { + grid-template-columns: 1fr 1fr; + margin-bottom: 0; + } + } +} + +.buttons { + display: flex; + flex-direction: column-reverse; + justify-content: center; + + button { + width: 100%; + margin-bottom: rem(16) !important; + } + + @media screen and (min-width: $tabletBreakpoint) { + flex-direction: row; + + div { + margin-right: rem(16); + } + + div:last-child { + margin-right: 0 !important; + } + } +} + +.action-bar { + position: fixed; + bottom: 0; + left: 0; + right: 0; + width: 100%; + background-color: colors.$primary-color-light; + display: flex; + justify-content: center; + align-items: center; + height: rem(56); + z-index: 2; + + button { + width: 100%; + height: 100%; + text-align: right !important; + display: flex; + justify-content: flex-end; + padding: rem(8) rem(24); + + @media screen and (min-width: $tabletBreakpoint) { + padding: rem(12) rem(36); + } + + @media screen and (min-width: $desktopBreakpoint) { + padding: rem(18) rem(80); + } + } + + div { + display: flex; + align-items: center; + justify-content: center; + + .mat-icon { + margin-left: rem(6); + } + } +} + +.page-selector { + width: 100%; + margin-bottom: rem(24); +} + +.change-step { + width: 100%; +} + +.no-comment { + color: colors.$grey-dark; + font-style: italic; +} + +.tractor { + width: 100%; + margin-bottom: rem(16); +} + +section { + margin-bottom: rem(24); +} + +.document { + margin-bottom: rem(8); +} diff --git a/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.spec.ts b/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.spec.ts index 682e06e656..60ca1796e4 100644 --- a/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.spec.ts +++ b/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.spec.ts @@ -1,4 +1,10 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { ActivatedRoute } from '@angular/router'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { BehaviorSubject } from 'rxjs'; +import { NoticeOfIntentDocumentService } from '../../../services/notice-of-intent-document/notice-of-intent-document.service'; +import { NoticeOfIntentSubmissionService } from '../../../services/notice-of-intent-submission/notice-of-intent-submission.service'; import { ViewNoticeOfIntentSubmissionComponent } from './view-notice-of-intent-submission.component'; @@ -6,9 +12,34 @@ describe('ViewNoticeOfIntentSubmissionComponent', () => { let component: ViewNoticeOfIntentSubmissionComponent; let fixture: ComponentFixture; + let mockNoiSubmissionService: DeepMocked; + let mockNoiDocumentService: DeepMocked; + let mockActivatedRoute: DeepMocked; + beforeEach(async () => { + mockNoiSubmissionService = createMock(); + mockNoiDocumentService = createMock(); + mockActivatedRoute = createMock(); + + mockActivatedRoute.paramMap = new BehaviorSubject(new Map()); + await TestBed.configureTestingModule({ declarations: [ViewNoticeOfIntentSubmissionComponent], + providers: [ + { + provide: NoticeOfIntentSubmissionService, + useValue: mockNoiSubmissionService, + }, + { + provide: NoticeOfIntentDocumentService, + useValue: mockNoiDocumentService, + }, + { + provide: ActivatedRoute, + useValue: mockActivatedRoute, + }, + ], + schemas: [NO_ERRORS_SCHEMA], }).compileComponents(); fixture = TestBed.createComponent(ViewNoticeOfIntentSubmissionComponent); diff --git a/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.ts b/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.ts index 267cb8f84c..d572503dc0 100644 --- a/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.ts @@ -1,8 +1,67 @@ -import { Component } from '@angular/core'; +import { Component, OnDestroy, OnInit } from '@angular/core'; +import { ActivatedRoute, Router } from '@angular/router'; +import { BehaviorSubject, Subject, takeUntil } from 'rxjs'; +import { NoticeOfIntentDocumentDto } from '../../../services/notice-of-intent-document/notice-of-intent-document.dto'; +import { NoticeOfIntentDocumentService } from '../../../services/notice-of-intent-document/notice-of-intent-document.service'; +import { NoticeOfIntentSubmissionDetailedDto } from '../../../services/notice-of-intent-submission/notice-of-intent-submission.dto'; +import { NoticeOfIntentSubmissionService } from '../../../services/notice-of-intent-submission/notice-of-intent-submission.service'; @Component({ selector: 'app-view-noi-submission', templateUrl: './view-notice-of-intent-submission.component.html', styleUrls: ['./view-notice-of-intent-submission.component.scss'], }) -export class ViewNoticeOfIntentSubmissionComponent {} +export class ViewNoticeOfIntentSubmissionComponent implements OnInit, OnDestroy { + $destroy = new Subject(); + $noiSubmission = new BehaviorSubject(undefined); + $noiDocuments = new BehaviorSubject([]); + submission: NoticeOfIntentSubmissionDetailedDto | undefined; + + constructor( + private noiSubmissionService: NoticeOfIntentSubmissionService, + private noiDocumentService: NoticeOfIntentDocumentService, + private route: ActivatedRoute, + private router: Router + ) {} + + ngOnInit(): void { + this.route.paramMap.pipe(takeUntil(this.$destroy)).subscribe((paramMap) => { + const fileId = paramMap.get('fileId'); + if (fileId) { + this.loadSubmission(fileId); + this.loadDocuments(fileId); + } + }); + } + + async loadSubmission(fileId: string) { + const noiSubmission = await this.noiSubmissionService.getByFileId(fileId); + this.submission = noiSubmission; + this.$noiSubmission.next(noiSubmission); + } + + async loadDocuments(fileId: string) { + const documents = await this.noiDocumentService.getByFileId(fileId); + if (documents) { + this.$noiDocuments.next(documents); + } + } + + ngOnDestroy(): void { + this.$destroy.next(); + this.$destroy.complete(); + } + + async onNavigateHome() { + await this.router.navigateByUrl(`home`); + } + + async onCancel(uuid: string) { + await this.noiSubmissionService.cancel(uuid); + await this.router.navigateByUrl(`home`); + } + + onDownloadSubmissionPdf(fileNumber: string) { + //TODO: When we add PDFs + } +} diff --git a/portal-frontend/src/app/services/notice-of-intent-submission/notice-of-intent-submission.dto.ts b/portal-frontend/src/app/services/notice-of-intent-submission/notice-of-intent-submission.dto.ts index 94504765ee..df15079ede 100644 --- a/portal-frontend/src/app/services/notice-of-intent-submission/notice-of-intent-submission.dto.ts +++ b/portal-frontend/src/app/services/notice-of-intent-submission/notice-of-intent-submission.dto.ts @@ -34,6 +34,7 @@ export interface NoticeOfIntentSubmissionDto { type: string; typeCode: string; status: NoticeOfIntentSubmissionStatusDto; + lastStatusUpdate: number; submissionStatuses: NoticeOfIntentSubmissionToSubmissionStatusDto[]; owners: NoticeOfIntentOwnerDto[]; canEdit: boolean; diff --git a/portal-frontend/src/styles/navigation-wrapper.scss b/portal-frontend/src/styles/navigation-wrapper.scss deleted file mode 100644 index 251f41b745..0000000000 --- a/portal-frontend/src/styles/navigation-wrapper.scss +++ /dev/null @@ -1,76 +0,0 @@ -@use './functions' as *; -@use './colors'; - -.navigation-wrapper { - ::ng-deep .mat-mdc-tab-body-content { - overflow-x: hidden; - } - - ::ng-deep .mat-mdc-tab-header-pagination { - display: none !important; - } - - ::ng-deep .mat-mdc-tab-header { - overflow-x: scroll !important; - display: flex; - flex-wrap: nowrap; - border-bottom: none; - } - - ::ng-deep .mat-mdc-tab-label-container { - overflow: visible !important; - display: flex; - flex-wrap: wrap; - flex-direction: row !important; - flex-flow: row wrap !important; - justify-content: space-between; - } - - ::ng-deep .mat-mdc-tab-header::-webkit-scrollbar { - display: none !important; - } - - ::ng-deep .mat-mdc-ink-bar { - display: none; - } - - ::ng-deep .mat-mdc-tab-labels { - display: flex; - flex-wrap: wrap; - flex-direction: row; - flex-flow: row wrap; - justify-content: space-between; - - ::ng-deep .mat-mdc-tab { - width: 100%; - margin-top: rem(24); - height: rem(32); - background: colors.$primary-color; - opacity: 1; - - .mdc-tab__text-label { - color: colors.$white; - } - } - - ::ng-deep .mat-mdc-tab.mdc-tab--active { - background-color: colors.$primary-color-dark; - } - } - - @media screen and (min-width: $desktopBreakpoint) { - ::ng-deep .mat-mdc-tab-labels { - display: flex; - flex-wrap: nowrap; - justify-content: space-between; - - .mat-mdc-tab { - width: 33%; - - &:not(:last-child) { - margin-right: rem(4); - } - } - } - } -} diff --git a/services/apps/alcs/src/common/automapper/notice-of-intent-submission.automapper.profile.ts b/services/apps/alcs/src/common/automapper/notice-of-intent-submission.automapper.profile.ts index f577977c4a..6a3485ea66 100644 --- a/services/apps/alcs/src/common/automapper/notice-of-intent-submission.automapper.profile.ts +++ b/services/apps/alcs/src/common/automapper/notice-of-intent-submission.automapper.profile.ts @@ -45,6 +45,12 @@ export class NoticeOfIntentSubmissionProfile extends AutomapperProfile { return ad.status.statusType; }), ), + forMember( + (a) => a.lastStatusUpdate, + mapFrom((ad) => { + return ad.status?.effectiveDate?.getTime(); + }), + ), forMember( (a) => a.owners, mapFrom((ad) => { @@ -83,6 +89,12 @@ export class NoticeOfIntentSubmissionProfile extends AutomapperProfile { return ad.status.statusType; }), ), + forMember( + (a) => a.lastStatusUpdate, + mapFrom((ad) => { + return ad.status?.effectiveDate?.getTime(); + }), + ), ); createMap( diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.dto.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.dto.ts index 0116f1f75e..61e0cfc61c 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.dto.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.dto.ts @@ -41,6 +41,7 @@ export class NoticeOfIntentSubmissionDto { typeCode: string; status: NoticeOfIntentStatusDto; + lastStatusUpdate: number; owners: NoticeOfIntentOwnerDto[]; canEdit: boolean; From b6b2dcaac1a8bf4af863a9d80e8193b7aed6bc8a Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Wed, 16 Aug 2023 16:05:58 -0700 Subject: [PATCH 259/954] rename local government table (#884) rename application_local_government table to local_government in etl and pgtap --- .../applications/sql/insert-batch-application.sql | 2 +- bin/migrate-oats-data/noi/sql/insert_noi.sql | 2 +- services/apps/alcs/test/pgtap/test_calculate_paused_time.sql | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/migrate-oats-data/applications/sql/insert-batch-application.sql b/bin/migrate-oats-data/applications/sql/insert-batch-application.sql index 499a817fd5..37a1ea29e2 100644 --- a/bin/migrate-oats-data/applications/sql/insert-batch-application.sql +++ b/bin/migrate-oats-data/applications/sql/insert-batch-application.sql @@ -43,7 +43,7 @@ WITH alg.uuid AS gov_uuid FROM oats_gov - JOIN alcs.application_local_government alg on ( + JOIN alcs.local_government alg on ( CASE WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Gabriola Island' THEN 'Islands Trust Gabriola Island (Historical)' WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Galiano Island' THEN 'Islands Trust Galiano Island (Historical)' diff --git a/bin/migrate-oats-data/noi/sql/insert_noi.sql b/bin/migrate-oats-data/noi/sql/insert_noi.sql index f1c87dac67..205f68e5b6 100644 --- a/bin/migrate-oats-data/noi/sql/insert_noi.sql +++ b/bin/migrate-oats-data/noi/sql/insert_noi.sql @@ -57,7 +57,7 @@ WITH alg.uuid AS gov_uuid FROM oats_gov - JOIN alcs.application_local_government alg on ( + JOIN alcs.local_government alg on ( CASE WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Gabriola Island' THEN 'Islands Trust Gabriola Island (Historical)' WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Galiano Island' THEN 'Islands Trust Galiano Island (Historical)' diff --git a/services/apps/alcs/test/pgtap/test_calculate_paused_time.sql b/services/apps/alcs/test/pgtap/test_calculate_paused_time.sql index 6bf6e7a6f2..8028099d54 100644 --- a/services/apps/alcs/test/pgtap/test_calculate_paused_time.sql +++ b/services/apps/alcs/test/pgtap/test_calculate_paused_time.sql @@ -33,9 +33,9 @@ prepare insert_application_region_in_test_calculate_paused AS SELECT lives_ok('insert_application_region_in_test_calculate_paused', 'should insert application_region'); prepare insert_application_local_government_in_test_calculate_paused as - INSERT INTO alcs.application_local_government (uuid,audit_deleted_date_at,audit_created_at,audit_updated_at,audit_created_by,audit_updated_by,"name",preferred_region_code) VALUES + INSERT INTO alcs.local_government (uuid,audit_deleted_date_at,audit_created_at,audit_updated_at,audit_created_by,audit_updated_by,"name",preferred_region_code) VALUES ('11111111-1111-1111-1111-111111111111',NULL,'2022-09-29 16:28:39.371', NULL,'unit_test',NULL,'Village of Mock','TEST'); -SELECT lives_ok('insert_application_local_government_in_test_calculate_paused', 'should insert application_local_government'); +SELECT lives_ok('insert_local_government_in_test_calculate_paused', 'should insert local_government'); -- create application status prepare insert_card_status_in_test_calculate_paused AS From 8a63ed9b73d71209e17144be06be510faa9ce104 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Wed, 16 Aug 2023 16:25:15 -0700 Subject: [PATCH 260/954] Split View App and View NOI into own Modules * Brings main js file back down to 1.5MB from 2.1MB --- portal-frontend/src/app/app-routing.module.ts | 11 +++++- portal-frontend/src/app/app.module.ts | 16 -------- .../view-application-submission.module.ts | 37 +++++++++++++++++++ ...view-notice-of-intent-submission.module.ts | 27 ++++++++++++++ 4 files changed, 73 insertions(+), 18 deletions(-) create mode 100644 portal-frontend/src/app/features/applications/view-submission/view-application-submission.module.ts create mode 100644 portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.module.ts diff --git a/portal-frontend/src/app/app-routing.module.ts b/portal-frontend/src/app/app-routing.module.ts index 486dcbdb63..5b4f6246d9 100644 --- a/portal-frontend/src/app/app-routing.module.ts +++ b/portal-frontend/src/app/app-routing.module.ts @@ -1,5 +1,6 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; +import { ViewApplicationSubmissionModule } from './features/applications/view-submission/view-application-submission.module'; import { AuthorizationComponent } from './features/authorization/authorization.component'; import { HomeComponent } from './features/home/home.component'; import { LandingPageComponent } from './features/landing-page/landing-page.component'; @@ -34,8 +35,11 @@ const routes: Routes = [ { title: 'View Application', path: 'application/:fileId', - component: ViewApplicationSubmissionComponent, canActivate: [AuthGuard], + loadChildren: () => + import('./features/applications/view-submission/view-application-submission.module').then( + (m) => m.ViewApplicationSubmissionModule + ), }, { title: 'Edit Application', @@ -65,8 +69,11 @@ const routes: Routes = [ { title: 'View Notice of Intent', path: 'notice-of-intent/:fileId', - component: ViewNoticeOfIntentSubmissionComponent, canActivate: [AuthGuard], + loadChildren: () => + import('./features/notice-of-intents/view-submission/view-notice-of-intent-submission.module').then( + (m) => m.ViewNoticeOfIntentSubmissionModule + ), }, { title: 'Edit Notice of Intent', diff --git a/portal-frontend/src/app/app.module.ts b/portal-frontend/src/app/app.module.ts index c0675920cf..591e13de37 100644 --- a/portal-frontend/src/app/app.module.ts +++ b/portal-frontend/src/app/app.module.ts @@ -8,7 +8,6 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { provideNgxMask } from 'ngx-mask'; import { AppRoutingModule } from './app-routing.module'; import { AppComponent } from './app.component'; -import { ApplicationDetailsModule } from './features/applications/application-details/application-details.module'; import { AuthorizationComponent } from './features/authorization/authorization.component'; import { CreateSubmissionDialogComponent } from './features/create-submission-dialog/create-submission-dialog.component'; import { ApplicationListComponent } from './features/home/application-list/application-list.component'; @@ -16,12 +15,6 @@ import { HomeComponent } from './features/home/home.component'; import { NoiListComponent } from './features/home/noi-list/noi-list.component'; import { LandingPageComponent } from './features/landing-page/landing-page.component'; import { LoginComponent } from './features/login/login.component'; -import { AlcReviewComponent } from './features/applications/view-submission/alc-review/alc-review.component'; -import { SubmissionDocumentsComponent } from './features/applications/view-submission/alc-review/submission-documents/submission-documents.component'; -import { LfngReviewComponent } from './features/applications/view-submission/lfng-review/lfng-review.component'; -import { ViewApplicationSubmissionComponent } from './features/applications/view-submission/view-application-submission.component'; -import { NoticeOfIntentDetailsModule } from './features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.module'; -import { ViewNoticeOfIntentSubmissionComponent } from './features/notice-of-intents/view-submission/view-notice-of-intent-submission.component'; import { AuthInterceptorService } from './services/authentication/auth-interceptor.service'; import { TokenRefreshService } from './services/authentication/token-refresh.service'; import { ConfirmationDialogComponent } from './shared/confirmation-dialog/confirmation-dialog.component'; @@ -29,7 +22,6 @@ import { ConfirmationDialogService } from './shared/confirmation-dialog/confirma import { FooterComponent } from './shared/footer/footer.component'; import { HeaderComponent } from './shared/header/header.component'; import { SharedModule } from './shared/shared.module'; -import { DecisionsComponent } from './features/applications/view-submission/alc-review/decisions/decisions.component'; @NgModule({ declarations: [ @@ -44,12 +36,6 @@ import { DecisionsComponent } from './features/applications/view-submission/alc- CreateSubmissionDialogComponent, LandingPageComponent, ConfirmationDialogComponent, - ViewApplicationSubmissionComponent, - ViewNoticeOfIntentSubmissionComponent, - LfngReviewComponent, - AlcReviewComponent, - SubmissionDocumentsComponent, - DecisionsComponent, ], imports: [ BrowserModule, @@ -59,8 +45,6 @@ import { DecisionsComponent } from './features/applications/view-submission/alc- MatSortModule, MatPaginatorModule, MatToolbarModule, - ApplicationDetailsModule, - NoticeOfIntentDetailsModule, ], providers: [ ConfirmationDialogService, diff --git a/portal-frontend/src/app/features/applications/view-submission/view-application-submission.module.ts b/portal-frontend/src/app/features/applications/view-submission/view-application-submission.module.ts new file mode 100644 index 0000000000..91855fac48 --- /dev/null +++ b/portal-frontend/src/app/features/applications/view-submission/view-application-submission.module.ts @@ -0,0 +1,37 @@ +import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from '@angular/router'; +import { NgxMaskDirective, NgxMaskPipe } from 'ngx-mask'; +import { SharedModule } from '../../../shared/shared.module'; +import { ApplicationDetailsModule } from '../application-details/application-details.module'; +import { AlcReviewComponent } from './alc-review/alc-review.component'; +import { DecisionsComponent } from './alc-review/decisions/decisions.component'; +import { SubmissionDocumentsComponent } from './alc-review/submission-documents/submission-documents.component'; +import { LfngReviewComponent } from './lfng-review/lfng-review.component'; +import { ViewApplicationSubmissionComponent } from './view-application-submission.component'; + +const routes: Routes = [ + { + path: '', + component: ViewApplicationSubmissionComponent, + }, +]; + +@NgModule({ + imports: [ + CommonModule, + SharedModule, + RouterModule.forChild(routes), + ApplicationDetailsModule, + NgxMaskDirective, + NgxMaskPipe, + ], + declarations: [ + ViewApplicationSubmissionComponent, + LfngReviewComponent, + AlcReviewComponent, + SubmissionDocumentsComponent, + DecisionsComponent, + ], +}) +export class ViewApplicationSubmissionModule {} diff --git a/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.module.ts b/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.module.ts new file mode 100644 index 0000000000..acdd01ad37 --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.module.ts @@ -0,0 +1,27 @@ +import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from '@angular/router'; +import { NgxMaskDirective, NgxMaskPipe } from 'ngx-mask'; +import { SharedModule } from '../../../shared/shared.module'; +import { NoticeOfIntentDetailsModule } from '../notice-of-intent-details/notice-of-intent-details.module'; +import { ViewNoticeOfIntentSubmissionComponent } from './view-notice-of-intent-submission.component'; + +const routes: Routes = [ + { + path: '', + component: ViewNoticeOfIntentSubmissionComponent, + }, +]; + +@NgModule({ + imports: [ + CommonModule, + SharedModule, + RouterModule.forChild(routes), + NoticeOfIntentDetailsModule, + NgxMaskDirective, + NgxMaskPipe, + ], + declarations: [ViewNoticeOfIntentSubmissionComponent], +}) +export class ViewNoticeOfIntentSubmissionModule {} From d1cc526a87246c0c8e49a8bf6cfb2f4610b5154e Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Wed, 16 Aug 2023 16:39:51 -0700 Subject: [PATCH 261/954] Set Applicant on NOI / Application when updating non-draft owners --- .../application/application.service.spec.ts | 8 +++ .../alcs/application/application.service.ts | 12 ++++ .../notice-of-intent.service.spec.ts | 8 +++ .../notice-of-intent.service.ts | 11 +++ .../application-owner.service.spec.ts | 70 +++++++++++++------ .../application-owner.service.ts | 13 ++++ .../application-submission.service.ts | 14 ++++ .../notice-of-intent-owner.service.spec.ts | 42 +++++++---- .../notice-of-intent-owner.service.ts | 13 ++++ .../notice-of-intent-submission.service.ts | 14 ++++ 10 files changed, 170 insertions(+), 35 deletions(-) diff --git a/services/apps/alcs/src/alcs/application/application.service.spec.ts b/services/apps/alcs/src/alcs/application/application.service.spec.ts index 4a4bdca804..4b6151e879 100644 --- a/services/apps/alcs/src/alcs/application/application.service.spec.ts +++ b/services/apps/alcs/src/alcs/application/application.service.spec.ts @@ -238,6 +238,14 @@ describe('ApplicationService', () => { expect(applicationRepositoryMock.findOneOrFail).toHaveBeenCalledTimes(1); }); + it('should call the repo for get update applicant', async () => { + applicationRepositoryMock.update.mockResolvedValue({} as any); + + await applicationService.updateApplicant('file-number', 'applicant'); + + expect(applicationRepositoryMock.update).toHaveBeenCalledTimes(1); + }); + it('should fail to update if application does not exist', async () => { applicationRepositoryMock.exist.mockResolvedValue(false); diff --git a/services/apps/alcs/src/alcs/application/application.service.ts b/services/apps/alcs/src/alcs/application/application.service.ts index 406497041a..49c521c79e 100644 --- a/services/apps/alcs/src/alcs/application/application.service.ts +++ b/services/apps/alcs/src/alcs/application/application.service.ts @@ -439,6 +439,7 @@ export class ApplicationService { uuid, }, select: { + uuid: true, fileNumber: true, }, }); @@ -452,4 +453,15 @@ export class ApplicationService { }, }); } + + async updateApplicant(fileNumber: string, applicantName: string) { + await this.applicationRepository.update( + { + fileNumber, + }, + { + applicant: applicantName, + }, + ); + } } diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.spec.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.spec.ts index 213ee7e109..0b7580b026 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.spec.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.spec.ts @@ -234,6 +234,14 @@ describe('NoticeOfIntentService', () => { expect(mockSubtypeRepository.find).toHaveBeenCalledTimes(1); }); + it('should call the repo for get update applicant', async () => { + mockRepository.update.mockResolvedValue({} as any); + + await service.updateApplicant('file-number', 'applicant'); + + expect(mockRepository.update).toHaveBeenCalledTimes(1); + }); + it('should call map active and paused times for mapToDtos', async () => { const noi = new NoticeOfIntent({ uuid: '5', diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.ts index 459849bea5..a45bbd1bce 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.ts @@ -434,4 +434,15 @@ export class NoticeOfIntentService { await this.repository.save(existingNoticeOfIntent); return this.getByFileNumber(createDto.fileNumber); } + + async updateApplicant(fileNumber: string, applicant: string) { + await this.repository.update( + { + fileNumber, + }, + { + applicant, + }, + ); + } } diff --git a/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.service.spec.ts b/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.service.spec.ts index 4fc9af391b..28141f8979 100644 --- a/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.service.spec.ts +++ b/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.service.spec.ts @@ -4,12 +4,13 @@ import { getRepositoryToken } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { ApplicationDocument } from '../../../alcs/application/application-document/application-document.entity'; import { ApplicationDocumentService } from '../../../alcs/application/application-document/application-document.service'; +import { ApplicationService } from '../../../alcs/application/application.service'; +import { OwnerType } from '../../../common/owner-type/owner-type.entity'; import { PARCEL_TYPE } from '../application-parcel/application-parcel.dto'; import { ApplicationParcel } from '../application-parcel/application-parcel.entity'; import { ApplicationParcelService } from '../application-parcel/application-parcel.service'; import { ApplicationSubmission } from '../application-submission.entity'; import { ApplicationSubmissionService } from '../application-submission.service'; -import { OwnerType } from '../../../common/owner-type/owner-type.entity'; import { ApplicationOwner } from './application-owner.entity'; import { ApplicationOwnerService } from './application-owner.service'; @@ -19,14 +20,16 @@ describe('ApplicationOwnerService', () => { let mockRepo: DeepMocked>; let mockTypeRepo: DeepMocked>; let mockAppDocumentService: DeepMocked; - let mockApplicationservice: DeepMocked; + let mockApplicationSubmissionservice: DeepMocked; + let mockApplicationService: DeepMocked; beforeEach(async () => { mockParcelService = createMock(); mockRepo = createMock(); mockTypeRepo = createMock(); mockAppDocumentService = createMock(); - mockApplicationservice = createMock(); + mockApplicationSubmissionservice = createMock(); + mockApplicationService = createMock(); const module: TestingModule = await Test.createTestingModule({ providers: [ @@ -49,7 +52,11 @@ describe('ApplicationOwnerService', () => { }, { provide: ApplicationSubmissionService, - useValue: mockApplicationservice, + useValue: mockApplicationSubmissionservice, + }, + { + provide: ApplicationService, + useValue: mockApplicationService, }, ], }).compile(); @@ -61,9 +68,13 @@ describe('ApplicationOwnerService', () => { owners: [new ApplicationOwner()], }), ]); - mockApplicationservice.update.mockResolvedValue( + mockApplicationSubmissionservice.update.mockResolvedValue( new ApplicationSubmission(), ); + mockApplicationService.updateApplicant.mockResolvedValue(); + mockApplicationSubmissionservice.getFileNumber.mockResolvedValue( + 'file-number', + ); }); it('should be defined', () => { @@ -227,10 +238,14 @@ describe('ApplicationOwnerService', () => { await service.updateSubmissionApplicant(''); - expect(mockApplicationservice.update).toHaveBeenCalledTimes(1); - expect(mockApplicationservice.update.mock.calls[0][1].applicant).toEqual( - 'A', - ); + expect(mockApplicationSubmissionservice.update).toHaveBeenCalledTimes(1); + expect( + mockApplicationSubmissionservice.update.mock.calls[0][1].applicant, + ).toEqual('A'); + expect( + mockApplicationSubmissionservice.getFileNumber, + ).toHaveBeenCalledTimes(1); + expect(mockApplicationService.updateApplicant).toHaveBeenCalledTimes(1); }); it('should call update for the application with the first parcels last name', async () => { @@ -262,10 +277,15 @@ describe('ApplicationOwnerService', () => { await service.updateSubmissionApplicant(''); - expect(mockApplicationservice.update).toHaveBeenCalledTimes(1); - expect(mockApplicationservice.update.mock.calls[0][1].applicant).toEqual( - 'A et al.', - ); + expect(mockApplicationSubmissionservice.update).toHaveBeenCalledTimes(1); + expect( + mockApplicationSubmissionservice.update.mock.calls[0][1].applicant, + ).toEqual('A et al.'); + + expect( + mockApplicationSubmissionservice.getFileNumber, + ).toHaveBeenCalledTimes(1); + expect(mockApplicationService.updateApplicant).toHaveBeenCalledTimes(1); }); it('should call update for the application with the number owners last name', async () => { @@ -289,10 +309,14 @@ describe('ApplicationOwnerService', () => { await service.updateSubmissionApplicant(''); - expect(mockApplicationservice.update).toHaveBeenCalledTimes(1); - expect(mockApplicationservice.update.mock.calls[0][1].applicant).toEqual( - '1 et al.', - ); + expect(mockApplicationSubmissionservice.update).toHaveBeenCalledTimes(1); + expect( + mockApplicationSubmissionservice.update.mock.calls[0][1].applicant, + ).toEqual('1 et al.'); + expect( + mockApplicationSubmissionservice.getFileNumber, + ).toHaveBeenCalledTimes(1); + expect(mockApplicationService.updateApplicant).toHaveBeenCalledTimes(1); }); it('should use the first created parcel to set the application applicants name', async () => { @@ -324,10 +348,14 @@ describe('ApplicationOwnerService', () => { await service.updateSubmissionApplicant(''); - expect(mockApplicationservice.update).toHaveBeenCalledTimes(1); - expect(mockApplicationservice.update.mock.calls[0][1].applicant).toEqual( - 'A et al.', - ); + expect(mockApplicationSubmissionservice.update).toHaveBeenCalledTimes(1); + expect( + mockApplicationSubmissionservice.update.mock.calls[0][1].applicant, + ).toEqual('A et al.'); + expect( + mockApplicationSubmissionservice.getFileNumber, + ).toHaveBeenCalledTimes(1); + expect(mockApplicationService.updateApplicant).toHaveBeenCalledTimes(1); }); it('should load then delete non application owners', async () => { diff --git a/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.service.ts b/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.service.ts index 81e5dde54b..a1e4c89969 100644 --- a/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.service.ts +++ b/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.service.ts @@ -2,6 +2,7 @@ import { forwardRef, Inject, Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Any, Repository } from 'typeorm'; import { ApplicationDocumentService } from '../../../alcs/application/application-document/application-document.service'; +import { ApplicationService } from '../../../alcs/application/application.service'; import { OWNER_TYPE, OwnerType, @@ -28,6 +29,7 @@ export class ApplicationOwnerService { @Inject(forwardRef(() => ApplicationSubmissionService)) private applicationSubmissionService: ApplicationSubmissionService, private applicationDocumentService: ApplicationDocumentService, + private applicationService: ApplicationService, ) {} async fetchByApplicationFileId(fileId: string) { @@ -290,6 +292,17 @@ export class ApplicationOwnerService { await this.applicationSubmissionService.update(submissionUuid, { applicant: applicantName || '', }); + + const fileNumber = + await this.applicationSubmissionService.getFileNumber( + submissionUuid, + ); + if (fileNumber) { + await this.applicationService.updateApplicant( + fileNumber, + applicantName || 'Unknown', + ); + } } } } diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.service.ts b/services/apps/alcs/src/portal/application-submission/application-submission.service.ts index 4444f5a30d..3089043343 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.service.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.service.ts @@ -990,4 +990,18 @@ export class ApplicationSubmissionService { }, }); } + + async getFileNumber(submissionUuid: string, includeDraft = false) { + const submission = await this.applicationSubmissionRepository.findOne({ + where: { + uuid: submissionUuid, + isDraft: includeDraft, + }, + select: { + uuid: true, + fileNumber: true, + }, + }); + return submission?.fileNumber; + } } diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.service.spec.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.service.spec.ts index 99eb1b68a1..61e18dcd34 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.service.spec.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.service.spec.ts @@ -2,9 +2,9 @@ import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { ApplicationDocumentService } from '../../../alcs/application/application-document/application-document.service'; import { NoticeOfIntentDocument } from '../../../alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.entity'; import { NoticeOfIntentDocumentService } from '../../../alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.service'; +import { NoticeOfIntentService } from '../../../alcs/notice-of-intent/notice-of-intent.service'; import { OwnerType } from '../../../common/owner-type/owner-type.entity'; import { NoticeOfIntentParcel } from '../notice-of-intent-parcel/notice-of-intent-parcel.entity'; import { NoticeOfIntentParcelService } from '../notice-of-intent-parcel/notice-of-intent-parcel.service'; @@ -18,15 +18,17 @@ describe('NoticeOfIntentOwnerService', () => { let mockParcelService: DeepMocked; let mockRepo: DeepMocked>; let mockTypeRepo: DeepMocked>; - let mockAppDocumentService: DeepMocked; - let mockApplicationservice: DeepMocked; + let mockAppDocumentService: DeepMocked; + let mockNoiSubmissionService: DeepMocked; + let mockNoiService: DeepMocked; beforeEach(async () => { mockParcelService = createMock(); mockRepo = createMock(); mockTypeRepo = createMock(); mockAppDocumentService = createMock(); - mockApplicationservice = createMock(); + mockNoiSubmissionService = createMock(); + mockNoiService = createMock(); const module: TestingModule = await Test.createTestingModule({ providers: [ @@ -49,7 +51,11 @@ describe('NoticeOfIntentOwnerService', () => { }, { provide: NoticeOfIntentSubmissionService, - useValue: mockApplicationservice, + useValue: mockNoiSubmissionService, + }, + { + provide: NoticeOfIntentService, + useValue: mockNoiService, }, ], }).compile(); @@ -63,9 +69,11 @@ describe('NoticeOfIntentOwnerService', () => { owners: [new NoticeOfIntentOwner()], }), ]); - mockApplicationservice.update.mockResolvedValue( + mockNoiSubmissionService.update.mockResolvedValue( new NoticeOfIntentSubmission(), ); + mockNoiService.updateApplicant.mockResolvedValue(); + mockNoiSubmissionService.getFileNumber.mockResolvedValue('file-number'); }); it('should be defined', () => { @@ -230,10 +238,12 @@ describe('NoticeOfIntentOwnerService', () => { await service.updateSubmissionApplicant(''); - expect(mockApplicationservice.update).toHaveBeenCalledTimes(1); - expect(mockApplicationservice.update.mock.calls[0][1].applicant).toEqual( + expect(mockNoiSubmissionService.update).toHaveBeenCalledTimes(1); + expect(mockNoiSubmissionService.update.mock.calls[0][1].applicant).toEqual( 'A', ); + expect(mockNoiSubmissionService.getFileNumber).toHaveBeenCalledTimes(1); + expect(mockNoiService.updateApplicant).toHaveBeenCalledTimes(1); }); it('should call update with the first parcels last name', async () => { @@ -264,10 +274,12 @@ describe('NoticeOfIntentOwnerService', () => { await service.updateSubmissionApplicant(''); - expect(mockApplicationservice.update).toHaveBeenCalledTimes(1); - expect(mockApplicationservice.update.mock.calls[0][1].applicant).toEqual( + expect(mockNoiSubmissionService.update).toHaveBeenCalledTimes(1); + expect(mockNoiSubmissionService.update.mock.calls[0][1].applicant).toEqual( 'A et al.', ); + expect(mockNoiSubmissionService.getFileNumber).toHaveBeenCalledTimes(1); + expect(mockNoiService.updateApplicant).toHaveBeenCalledTimes(1); }); it('should call update with the number owners last name', async () => { @@ -290,8 +302,8 @@ describe('NoticeOfIntentOwnerService', () => { await service.updateSubmissionApplicant(''); - expect(mockApplicationservice.update).toHaveBeenCalledTimes(1); - expect(mockApplicationservice.update.mock.calls[0][1].applicant).toEqual( + expect(mockNoiSubmissionService.update).toHaveBeenCalledTimes(1); + expect(mockNoiSubmissionService.update.mock.calls[0][1].applicant).toEqual( '1 et al.', ); }); @@ -323,10 +335,12 @@ describe('NoticeOfIntentOwnerService', () => { await service.updateSubmissionApplicant(''); - expect(mockApplicationservice.update).toHaveBeenCalledTimes(1); - expect(mockApplicationservice.update.mock.calls[0][1].applicant).toEqual( + expect(mockNoiSubmissionService.update).toHaveBeenCalledTimes(1); + expect(mockNoiSubmissionService.update.mock.calls[0][1].applicant).toEqual( 'A et al.', ); + expect(mockNoiSubmissionService.getFileNumber).toHaveBeenCalledTimes(1); + expect(mockNoiService.updateApplicant).toHaveBeenCalledTimes(1); }); it('should load then delete non application owners', async () => { diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.service.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.service.ts index 33d81961a7..a6560cc9dc 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.service.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.service.ts @@ -2,6 +2,7 @@ import { forwardRef, Inject, Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Any, Repository } from 'typeorm'; import { NoticeOfIntentDocumentService } from '../../../alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.service'; +import { NoticeOfIntentService } from '../../../alcs/notice-of-intent/notice-of-intent.service'; import { OWNER_TYPE, OwnerType, @@ -27,6 +28,7 @@ export class NoticeOfIntentOwnerService { @Inject(forwardRef(() => NoticeOfIntentSubmissionService)) private noticeOfIntentSubmissionService: NoticeOfIntentSubmissionService, private noticeOfIntentDocumentService: NoticeOfIntentDocumentService, + private noticeOfIntentService: NoticeOfIntentService, ) {} async fetchByApplicationFileId(fileId: string) { @@ -287,6 +289,17 @@ export class NoticeOfIntentOwnerService { await this.noticeOfIntentSubmissionService.update(submissionUuid, { applicant: applicantName || '', }); + + const fileNumber = + await this.noticeOfIntentSubmissionService.getFileNumber( + submissionUuid, + ); + if (fileNumber) { + await this.noticeOfIntentService.updateApplicant( + fileNumber, + applicantName || 'Unknown', + ); + } } } } diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts index b1e7825f70..80fb1c2741 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts @@ -149,6 +149,20 @@ export class NoticeOfIntentSubmissionService { return this.getOrFailByUuid(submissionUuid, this.DEFAULT_RELATIONS); } + async getFileNumber(submissionUuid: string, includeDraft = false) { + const submission = await this.noticeOfIntentSubmissionRepository.findOne({ + where: { + uuid: submissionUuid, + isDraft: includeDraft, + }, + select: { + uuid: true, + fileNumber: true, + }, + }); + return submission?.fileNumber; + } + private setLandUseFields( noticeOfIntentSubmission: NoticeOfIntentSubmission, updateDto: NoticeOfIntentSubmissionUpdateDto, From b1b2baf7d1c5c87e380595f4bae19498885e5a3d Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Thu, 17 Aug 2023 09:42:58 -0700 Subject: [PATCH 262/954] Code Review Feedback --- .../apps/alcs/src/alcs/import/noi-import.service.ts | 3 ++- .../application-submission-review.controller.ts | 10 +++++++--- .../application-owner/application-owner.service.ts | 3 ++- .../application-submission.service.ts | 3 ++- .../notice-of-intent-owner.service.ts | 3 ++- .../notice-of-intent-submission.service.ts | 3 ++- services/apps/alcs/src/utils/owner.constants.ts | 1 + 7 files changed, 18 insertions(+), 8 deletions(-) create mode 100644 services/apps/alcs/src/utils/owner.constants.ts diff --git a/services/apps/alcs/src/alcs/import/noi-import.service.ts b/services/apps/alcs/src/alcs/import/noi-import.service.ts index 66732d1add..79f674fff6 100644 --- a/services/apps/alcs/src/alcs/import/noi-import.service.ts +++ b/services/apps/alcs/src/alcs/import/noi-import.service.ts @@ -5,6 +5,7 @@ import * as timezone from 'dayjs/plugin/timezone'; import * as utc from 'dayjs/plugin/utc'; import * as fs from 'fs'; import * as path from 'path'; +import { FALLBACK_APPLICANT_NAME } from '../../utils/owner.constants'; import { LocalGovernmentService } from '../local-government/local-government.service'; import { BoardService } from '../board/board.service'; import { CardService } from '../card/card.service'; @@ -166,7 +167,7 @@ export class NoticeOfIntentImportService { { typeCode: '', fileNumber: mappedRow.fileNumber, - applicant: mappedRow.applicant || 'Unknown', + applicant: mappedRow.applicant || FALLBACK_APPLICANT_NAME, dateSubmittedToAlc: mappedRow.submittedToAlc, localGovernmentUuid: localGovernment.uuid, regionCode: regionCode, diff --git a/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.ts b/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.ts index a808c0ec2c..ee62c46795 100644 --- a/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.ts +++ b/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.ts @@ -25,6 +25,7 @@ import { OWNER_TYPE } from '../../common/owner-type/owner-type.entity'; import { DOCUMENT_SOURCE } from '../../document/document.dto'; import { EmailService } from '../../providers/email/email.service'; import { User } from '../../user/user.entity'; +import { FALLBACK_APPLICANT_NAME } from '../../utils/owner.constants'; import { ApplicationOwner } from '../application-submission/application-owner/application-owner.entity'; import { ApplicationSubmissionValidatorService } from '../application-submission/application-submission-validator.service'; import { ApplicationSubmission } from '../application-submission/application-submission.entity'; @@ -248,9 +249,12 @@ export class ApplicationSubmissionReviewController { const emailTemplate = generateStatusHtml({ fileNumber, - applicantName: applicationSubmission.applicant || 'Unknown', + applicantName: + applicationSubmission.applicant || FALLBACK_APPLICANT_NAME, applicationType: - matchingType?.portalLabel ?? matchingType?.label ?? 'Unknown', + matchingType?.portalLabel ?? + matchingType?.label ?? + FALLBACK_APPLICANT_NAME, governmentName: userLocalGovernment.name, status: status.label, }); @@ -258,7 +262,7 @@ export class ApplicationSubmissionReviewController { this.emailService.sendEmail({ body: emailTemplate.html, subject: `Agricultural Land Commission Application ID: ${fileNumber} (${ - applicationSubmission.applicant || 'Unknown' + applicationSubmission.applicant || FALLBACK_APPLICANT_NAME })`, to: [primaryContact.email], }); diff --git a/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.service.ts b/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.service.ts index a1e4c89969..60038328fb 100644 --- a/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.service.ts +++ b/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.service.ts @@ -7,6 +7,7 @@ import { OWNER_TYPE, OwnerType, } from '../../../common/owner-type/owner-type.entity'; +import { FALLBACK_APPLICANT_NAME } from '../../../utils/owner.constants'; import { PARCEL_TYPE } from '../application-parcel/application-parcel.dto'; import { ApplicationParcelService } from '../application-parcel/application-parcel.service'; import { ApplicationSubmission } from '../application-submission.entity'; @@ -300,7 +301,7 @@ export class ApplicationOwnerService { if (fileNumber) { await this.applicationService.updateApplicant( fileNumber, - applicantName || 'Unknown', + applicantName || FALLBACK_APPLICANT_NAME, ); } } diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.service.ts b/services/apps/alcs/src/portal/application-submission/application-submission.service.ts index 3089043343..f611d60466 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.service.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.service.ts @@ -19,6 +19,7 @@ import { ROLES_ALLOWED_APPLICATIONS } from '../../common/authorization/roles'; import { DOCUMENT_TYPE } from '../../document/document-code.entity'; import { FileNumberService } from '../../file-number/file-number.service'; import { User } from '../../user/user.entity'; +import { FALLBACK_APPLICANT_NAME } from '../../utils/owner.constants'; import { filterUndefined } from '../../utils/undefined'; import { ApplicationSubmissionReview } from '../application-submission-review/application-submission-review.entity'; import { GenerateReviewDocumentService } from '../pdf-generation/generate-review-document.service'; @@ -118,7 +119,7 @@ export class ApplicationSubmissionService { await this.applicationService.create( { fileNumber, - applicant: 'Unknown', + applicant: FALLBACK_APPLICANT_NAME, typeCode: type, source: 'APPLICANT', }, diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.service.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.service.ts index a6560cc9dc..62835be58d 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.service.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.service.ts @@ -7,6 +7,7 @@ import { OWNER_TYPE, OwnerType, } from '../../../common/owner-type/owner-type.entity'; +import { FALLBACK_APPLICANT_NAME } from '../../../utils/owner.constants'; import { NoticeOfIntentParcelService } from '../notice-of-intent-parcel/notice-of-intent-parcel.service'; import { NoticeOfIntentSubmission } from '../notice-of-intent-submission.entity'; import { NoticeOfIntentSubmissionService } from '../notice-of-intent-submission.service'; @@ -297,7 +298,7 @@ export class NoticeOfIntentOwnerService { if (fileNumber) { await this.noticeOfIntentService.updateApplicant( fileNumber, - applicantName || 'Unknown', + applicantName || FALLBACK_APPLICANT_NAME, ); } } diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts index 80fb1c2741..7773206615 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts @@ -22,6 +22,7 @@ import { ROLES_ALLOWED_APPLICATIONS } from '../../common/authorization/roles'; import { DOCUMENT_TYPE } from '../../document/document-code.entity'; import { FileNumberService } from '../../file-number/file-number.service'; import { User } from '../../user/user.entity'; +import { FALLBACK_APPLICANT_NAME } from '../../utils/owner.constants'; import { filterUndefined } from '../../utils/undefined'; import { ValidatedNoticeOfIntentSubmission } from './notice-of-intent-submission-validator.service'; import { @@ -93,7 +94,7 @@ export class NoticeOfIntentSubmissionService { await this.noticeOfIntentService.create({ fileNumber, - applicant: 'Unknown', + applicant: FALLBACK_APPLICANT_NAME, typeCode: type, }); diff --git a/services/apps/alcs/src/utils/owner.constants.ts b/services/apps/alcs/src/utils/owner.constants.ts new file mode 100644 index 0000000000..440b2bc82f --- /dev/null +++ b/services/apps/alcs/src/utils/owner.constants.ts @@ -0,0 +1 @@ +export const FALLBACK_APPLICANT_NAME = 'Unknown'; From b31388ff56095103af7c8963e2e979f3561301c7 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Thu, 17 Aug 2023 11:12:30 -0700 Subject: [PATCH 263/954] Add NOI Change Type DIalog * Add and hook up NOI change type dialog * Update buttons on change application dialog to be more sensible --- ...nge-application-type-dialog.component.html | 4 +- .../additional-information.component.spec.ts | 2 + .../change-noi-type-dialog.component.html | 74 ++++++++++++ .../change-noi-type-dialog.component.scss | 95 +++++++++++++++ .../change-noi-type-dialog.component.spec.ts | 41 +++++++ .../change-noi-type-dialog.component.ts | 110 ++++++++++++++++++ .../edit-submission-base.module.ts | 3 + .../edit-submission.component.ts | 21 +++- 8 files changed, 346 insertions(+), 4 deletions(-) create mode 100644 portal-frontend/src/app/features/notice-of-intents/edit-submission/change-noi-type-dialog/change-noi-type-dialog.component.html create mode 100644 portal-frontend/src/app/features/notice-of-intents/edit-submission/change-noi-type-dialog/change-noi-type-dialog.component.scss create mode 100644 portal-frontend/src/app/features/notice-of-intents/edit-submission/change-noi-type-dialog/change-noi-type-dialog.component.spec.ts create mode 100644 portal-frontend/src/app/features/notice-of-intents/edit-submission/change-noi-type-dialog/change-noi-type-dialog.component.ts diff --git a/portal-frontend/src/app/features/applications/edit-submission/change-application-type-dialog/change-application-type-dialog.component.html b/portal-frontend/src/app/features/applications/edit-submission/change-application-type-dialog/change-application-type-dialog.component.html index a00900c07d..285b52766b 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/change-application-type-dialog/change-application-type-dialog.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/change-application-type-dialog/change-application-type-dialog.component.html @@ -63,12 +63,12 @@
Are you sure you want to change your application type?
- +
- +
diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component.spec.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component.spec.ts index 5807160322..ca6945e18f 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component.spec.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component.spec.ts @@ -1,3 +1,4 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MatDialog } from '@angular/material/dialog'; import { createMock, DeepMocked } from '@golevelup/ts-jest'; @@ -28,6 +29,7 @@ describe('RosoAdditionalInformationComponent', () => { }, { provide: NoticeOfIntentDocumentService, useValue: mockNoticeOfIntentDocumentService }, ], + schemas: [NO_ERRORS_SCHEMA], }).compileComponents(); fixture = TestBed.createComponent(AdditionalInformationComponent); diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/change-noi-type-dialog/change-noi-type-dialog.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/change-noi-type-dialog/change-noi-type-dialog.component.html new file mode 100644 index 0000000000..e9c78cdc0f --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/change-noi-type-dialog/change-noi-type-dialog.component.html @@ -0,0 +1,74 @@ +
+
+

Change NOI Type

+
+ +
+
+
+ + Warning: Changing the notice of intent type will remove some inputs from your saved progress. Do you + want to continue? + +
+
+ +
+
Select an option to learn more about the notice of intent type.
+ + + {{ appType.portalLabel }} + + + +
+
+
+ {{ selectedType.portalLabel }} +
+
+ Read {{ readMoreClicked ? 'Less' : 'More' }} + +
+
+
+ +
+
+
Are you sure you want to change your notice of intent type?
+
+
+
+
+ +
+
+ + +
+ +
+ + +
+ +
+ + +
+
diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/change-noi-type-dialog/change-noi-type-dialog.component.scss b/portal-frontend/src/app/features/notice-of-intents/edit-submission/change-noi-type-dialog/change-noi-type-dialog.component.scss new file mode 100644 index 0000000000..454f80895e --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/change-noi-type-dialog/change-noi-type-dialog.component.scss @@ -0,0 +1,95 @@ +@use '../../../../../styles/functions' as *; +@use '../../../../../styles/colors'; + +.step-header { + padding: rem(16) 0; +} + +.change-app-type-modal { + .warning-banner { + margin-top: rem(8); + background-color: rgba(colors.$accent-color-light, 0.5); + padding: rem(16); + + .read-more-btn { + padding-top: rem(8); + cursor: pointer; + display: flex; + justify-content: flex-end; + color: colors.$accent-color-dark; + } + + .display-none { + display: none !important; + } + } + + .app-type-radio-group { + display: flex; + flex-direction: column; + } +} + +.dialog-action-container { + margin: rem(4) 0; + padding: 0 rem(24); +} + +.dialog-controls-wrapper { + display: flex; + justify-content: space-between; + + button { + width: rem(116); + } +} + +.dialog-container { + max-height: 80vh !important; +} + +.dialog-action-container { + margin: rem(4) 0; + padding: 0 rem(24); +} + +.step-description { + margin-bottom: rem(8); +} + +@media screen and (min-width: $minWidth) { + .dialog-action-container { + margin: rem(8) 0 rem(24); + } +} + +@media screen and (min-width: $tabletBreakpoint) { + .warning-banner { + padding: 2rem 3rem; + + .ellipsis-3 { + display: block; + } + } + + .dialog-container { + max-height: unset; + width: 70vw; + } + + .dialog-controls-wrapper { + justify-content: flex-end; + + button { + margin-left: rem(16) !important; + } + } + + .dialog-action-container { + margin: rem(24) 0; + } + + .change-app-type-modal { + margin-top: rem(16); + } +} diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/change-noi-type-dialog/change-noi-type-dialog.component.spec.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/change-noi-type-dialog/change-noi-type-dialog.component.spec.ts new file mode 100644 index 0000000000..58ef5bbcf4 --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/change-noi-type-dialog/change-noi-type-dialog.component.spec.ts @@ -0,0 +1,41 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { MAT_DIALOG_DATA, MatDialogModule, MatDialogRef } from '@angular/material/dialog'; +import { MatRadioModule } from '@angular/material/radio'; +import { CodeService } from '../../../../services/code/code.service'; +import { NoticeOfIntentSubmissionService } from '../../../../services/notice-of-intent-submission/notice-of-intent-submission.service'; +import { ChangeNoiTypeDialogComponent } from './change-noi-type-dialog.component'; + +describe('ChangeNoiTypeDialogComponent', () => { + let component: ChangeNoiTypeDialogComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [MatDialogModule, MatRadioModule], + providers: [ + { provide: MatDialogRef, useValue: {} }, + { + provide: NoticeOfIntentSubmissionService, + useValue: {}, + }, + { + provide: CodeService, + useValue: {}, + }, + { provide: MAT_DIALOG_DATA, useValue: { fileId: 'fake' } }, + ], + declarations: [ChangeNoiTypeDialogComponent], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(ChangeNoiTypeDialogComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/change-noi-type-dialog/change-noi-type-dialog.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/change-noi-type-dialog/change-noi-type-dialog.component.ts new file mode 100644 index 0000000000..1e1a4ba48d --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/change-noi-type-dialog/change-noi-type-dialog.component.ts @@ -0,0 +1,110 @@ +import { AfterViewChecked, Component, Inject, OnInit } from '@angular/core'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; +import { MatRadioChange } from '@angular/material/radio'; +import { NoticeOfIntentTypeDto } from '../../../../services/code/code.dto'; +import { CodeService } from '../../../../services/code/code.service'; +import { NoticeOfIntentSubmissionService } from '../../../../services/notice-of-intent-submission/notice-of-intent-submission.service'; +import { scrollToElement } from '../../../../shared/utils/scroll-helper'; + +export enum NoiChangeTypeStepsEnum { + warning = 0, + noiType = 1, + confirmation = 2, +} + +@Component({ + selector: 'app-change-noi-type-dialog', + templateUrl: './change-noi-type-dialog.component.html', + styleUrls: ['./change-noi-type-dialog.component.scss'], +}) +export class ChangeNoiTypeDialogComponent implements OnInit, AfterViewChecked { + submissionUuid: string; + submissionTypeCode: string; + + noiTypes: NoticeOfIntentTypeDto[] = []; + selectedType: NoticeOfIntentTypeDto | undefined = undefined; + + readMoreClicked: boolean = false; + isReadMoreVisible: boolean = false; + + warningStep = NoiChangeTypeStepsEnum.warning; + applicationTypeStep = NoiChangeTypeStepsEnum.noiType; + confirmationStep = NoiChangeTypeStepsEnum.confirmation; + + stepIdx = 0; + + constructor( + private dialogRef: MatDialogRef, + private noticeOfIntentSubmissionService: NoticeOfIntentSubmissionService, + private codeService: CodeService, + @Inject(MAT_DIALOG_DATA) public data: ChangeNoiTypeDialogComponent + ) { + this.submissionUuid = data.submissionUuid; + this.submissionTypeCode = data.submissionTypeCode; + } + + ngAfterViewChecked(): void { + // timeout is required due to the value change of isReadMoreVisible, otherwise it will error out + setTimeout(() => (this.isReadMoreVisible = this.checkIfReadMoreVisible()), 0); + } + + ngOnInit(): void { + this.loadCodes(); + } + + private async loadCodes() { + const codes = await this.codeService.loadCodes(); + this.noiTypes = codes.noticeOfIntentTypes + .filter((type) => !!type.portalLabel) + .sort((a, b) => (a.portalLabel > b.portalLabel ? 1 : -1)); + } + + async closeDialog(dialogResult: boolean = false) { + this.dialogRef.close(dialogResult); + } + + async onSubmit() { + const result = await this.noticeOfIntentSubmissionService.updatePending(this.submissionUuid, { + typeCode: this.selectedType!.code, + }); + if (result) { + await this.closeDialog(true); + } + } + + async onTypeSelected(event: MatRadioChange) { + this.selectedType = this.noiTypes.find((e) => e.code === event.value); + this.readMoreClicked = false; + + setTimeout(() => { + scrollToElement({ id: 'warningBanner', center: true }); + }, 300); + } + + isEllipsisActive(e: string): boolean { + const el = document.getElementById(e); + return el ? el.clientHeight < el.scrollHeight : false; + } + + private checkIfReadMoreVisible(): boolean { + return this.readMoreClicked || this.isEllipsisActive('typeDescription'); + } + + onReadMoreClicked() { + this.readMoreClicked = !this.readMoreClicked; + + if (this.readMoreClicked) { + setTimeout(() => { + scrollToElement({ id: 'warningBanner', center: false }); + }, 300); + } + } + + async next() { + this.stepIdx += 1; + } + + async back() { + this.stepIdx -= 1; + } +} diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission-base.module.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission-base.module.ts index e18d8604b2..ae5dceb75f 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission-base.module.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission-base.module.ts @@ -12,6 +12,7 @@ import { AdditionalInformationComponent } from './additional-information/additio import { NoticeOfIntentDetailsModule } from '../notice-of-intent-details/notice-of-intent-details.module'; import { DeleteStructureConfirmationDialogComponent } from './additional-information/delete-structure-confirmation-dialog/delete-structure-confirmation-dialog.component'; import { SoilRemovalConfirmationDialogComponent } from './additional-information/soil-removal-confirmation-dialog/soil-removal-confirmation-dialog.component'; +import { ChangeNoiTypeDialogComponent } from './change-noi-type-dialog/change-noi-type-dialog.component'; import { EditSubmissionComponent } from './edit-submission.component'; import { LandUseComponent } from './land-use/land-use.component'; import { OtherAttachmentsComponent } from './other-attachments/other-attachments.component'; @@ -59,6 +60,7 @@ import { SelectGovernmentComponent } from './select-government/select-government SoilRemovalConfirmationDialogComponent, ReviewAndSubmitComponent, SubmitConfirmationDialogComponent, + ChangeNoiTypeDialogComponent, ], exports: [ EditSubmissionComponent, @@ -76,6 +78,7 @@ import { SelectGovernmentComponent } from './select-government/select-government AdditionalInformationComponent, ReviewAndSubmitComponent, SubmitConfirmationDialogComponent, + ChangeNoiTypeDialogComponent, ], }) export class EditSubmissionBaseModule {} diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.ts index 726adafd3b..1c2047c5f2 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.ts @@ -3,7 +3,6 @@ import { AfterViewInit, Component, OnDestroy, ViewChild } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; import { ActivatedRoute, Router } from '@angular/router'; import { BehaviorSubject, combineLatest, Observable, of, Subject, takeUntil } from 'rxjs'; -import { CodeService } from '../../../services/code/code.service'; import { NoticeOfIntentDocumentDto } from '../../../services/notice-of-intent-document/notice-of-intent-document.dto'; import { NoticeOfIntentDocumentService } from '../../../services/notice-of-intent-document/notice-of-intent-document.service'; import { NoticeOfIntentSubmissionDetailedDto } from '../../../services/notice-of-intent-submission/notice-of-intent-submission.dto'; @@ -13,6 +12,7 @@ import { CustomStepperComponent } from '../../../shared/custom-stepper/custom-st import { OverlaySpinnerService } from '../../../shared/overlay-spinner/overlay-spinner.service'; import { scrollToElement } from '../../../shared/utils/scroll-helper'; import { AdditionalInformationComponent } from './additional-information/additional-information.component'; +import { ChangeNoiTypeDialogComponent } from './change-noi-type-dialog/change-noi-type-dialog.component'; import { LandUseComponent } from './land-use/land-use.component'; import { OtherAttachmentsComponent } from './other-attachments/other-attachments.component'; import { ParcelDetailsComponent } from './parcels/parcel-details.component'; @@ -184,7 +184,24 @@ export class EditSubmissionComponent implements OnDestroy, AfterViewInit { } onChangeSubmissionType() { - //TODO: Hook this up later + if (this.noiSubmission) { + this.dialog + .open(ChangeNoiTypeDialogComponent, { + panelClass: 'no-padding', + disableClose: true, + autoFocus: false, + data: { + submissionUuid: this.noiSubmission.uuid, + submissionTypeCode: this.noiSubmission.typeCode, + }, + }) + .beforeClosed() + .subscribe((result) => { + if (result) { + this.loadSubmission(this.fileId, true); + } + }); + } } async onSubmit() { From f24243a70caedae35ec9fdca41c779a844cb4f33 Mon Sep 17 00:00:00 2001 From: "to. sandra" <76515860+sandratoh@users.noreply.github.com> Date: Thu, 17 Aug 2023 13:32:49 -0700 Subject: [PATCH 264/954] Send application status emails (#876) * Update email template wording * Move common email template sections to partials * Update template and separate out notification message * Rename template to match status and add comment for bug * Send applicant email after lfng submission * Send lfng submission email to government * Check for first time submission before sending emails * Refactor lfng submission and review email to service * Add wrong lfng email template * Send returned as incomplete app status email * Add cc flag and refactor to use default array type for email list * Send refuse to forward email to applicant and lfng * Add submitted to alc email templates * Send submit to alc email for tur applications * Send all app type submitted to alc email and update template styling * Send cancel email when triggered by applicant, lfng, and alcs * Send status email for new discussion schedule * Send under review email for first review decision * Send decision released email on non-draft decisions v2 * WIP Backend unit tests * Update application-submission backend tests * Update application and decision v2 controller tests * Update email service tests * Improve email service test coverage * Send decision released email on first release of drafts * Refactor commonly used service pattern for email set up * Add develop merge conflict change to service * Refactor and clean up tests and modules * Refactor code to dry up duplicated service calls * Emphasize date in email --- ...view-application-submission.component.html | 7 +- .../view-application-submission.component.ts | 1 + ...cation-decision-meeting.controller.spec.ts | 74 ++++++- ...application-decision-meeting.controller.ts | 28 +++ ...application-decision-v2.controller.spec.ts | 110 +++++++++++ .../application-decision-v2.controller.ts | 45 +++++ .../application.controller.spec.ts | 39 ++++ .../application/application.controller.ts | 18 ++ ...ation-submission-review.controller.spec.ts | 171 ++++++++++++++--- ...pplication-submission-review.controller.ts | 125 ++++++------ .../application-submission.controller.spec.ts | 181 ++++++++++++++++-- .../application-submission.controller.ts | 88 +++++++++ .../alcs/src/providers/email/email.module.ts | 11 +- .../src/providers/email/email.service.spec.ts | 112 +++++++++++ .../alcs/src/providers/email/email.service.ts | 134 ++++++++++++- .../templates/emails/cancelled.template.ts | 42 ++++ .../emails/decision-released.template.ts | 54 ++++++ .../emails/partials/footer.template.ts | 10 + .../emails/partials/header.template.ts | 21 ++ services/templates/emails/partials/index.ts | 4 + .../partials/notification-only.template.ts | 5 + .../emails/partials/portal-button.template.ts | 16 ++ .../emails/refused-to-forward.template.ts | 48 +++++ .../emails/returned-as-incomplete.template.ts | 48 +++++ .../emails/submission-status.template.ts | 90 --------- .../submitted-to-alc/applicant.template.ts | 111 +++++++++++ .../emails/submitted-to-alc/index.ts | 3 + .../tur-applicant.template.ts | 96 ++++++++++ .../tur-government.template.ts | 44 +++++ .../submitted-to-lfng/applicant.template.ts | 72 +++++++ .../submitted-to-lfng/government.template.ts | 69 +++++++ .../emails/submitted-to-lfng/index.ts | 2 + .../emails/under-review-by-alc.template.ts | 45 +++++ .../emails/under-review-by-lfng.template.ts | 48 +++++ .../templates/emails/wrong-lfng.template.ts | 45 +++++ 35 files changed, 1818 insertions(+), 199 deletions(-) create mode 100644 services/templates/emails/cancelled.template.ts create mode 100644 services/templates/emails/decision-released.template.ts create mode 100644 services/templates/emails/partials/footer.template.ts create mode 100644 services/templates/emails/partials/header.template.ts create mode 100644 services/templates/emails/partials/index.ts create mode 100644 services/templates/emails/partials/notification-only.template.ts create mode 100644 services/templates/emails/partials/portal-button.template.ts create mode 100644 services/templates/emails/refused-to-forward.template.ts create mode 100644 services/templates/emails/returned-as-incomplete.template.ts delete mode 100644 services/templates/emails/submission-status.template.ts create mode 100644 services/templates/emails/submitted-to-alc/applicant.template.ts create mode 100644 services/templates/emails/submitted-to-alc/index.ts create mode 100644 services/templates/emails/submitted-to-alc/tur-applicant.template.ts create mode 100644 services/templates/emails/submitted-to-alc/tur-government.template.ts create mode 100644 services/templates/emails/submitted-to-lfng/applicant.template.ts create mode 100644 services/templates/emails/submitted-to-lfng/government.template.ts create mode 100644 services/templates/emails/submitted-to-lfng/index.ts create mode 100644 services/templates/emails/under-review-by-alc.template.ts create mode 100644 services/templates/emails/under-review-by-lfng.template.ts create mode 100644 services/templates/emails/wrong-lfng.template.ts diff --git a/portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.html b/portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.html index 447eef32c7..6bb880d9d5 100644 --- a/portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.html +++ b/portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.html @@ -79,12 +79,7 @@

Applicant Submission

-
diff --git a/portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.ts b/portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.ts index b4de470d32..4843830735 100644 --- a/portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.ts +++ b/portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.ts @@ -74,6 +74,7 @@ export class ViewApplicationSubmissionComponent implements OnInit, OnDestroy { async onReview(fileId: string) { if (this.application?.status.code === SUBMISSION_STATUS.SUBMITTED_TO_LG) { + // FIXME: Service call is being called twice on banner button click causing error toast const review = await this.applicationReviewService.startReview(fileId); if (!review) { return; diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v1/application-decision-meeting/application-decision-meeting.controller.spec.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v1/application-decision-meeting/application-decision-meeting.controller.spec.ts index 6568f8a477..20d890d6bb 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v1/application-decision-meeting/application-decision-meeting.controller.spec.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v1/application-decision-meeting/application-decision-meeting.controller.spec.ts @@ -20,13 +20,20 @@ import { CreateApplicationDecisionMeetingDto, } from './application-decision-meeting.dto'; import { ApplicationDecisionMeetingService } from './application-decision-meeting.service'; +import { EmailService } from '../../../../providers/email/email.service'; +import { ApplicationDecisionMeeting } from './application-decision-meeting.entity'; +import { ApplicationSubmission } from '../../../../portal/application-submission/application-submission.entity'; +import { ApplicationOwner } from '../../../../portal/application-submission/application-owner/application-owner.entity'; +import { LocalGovernment } from '../../../local-government/local-government.entity'; +import { generateREVAHtml } from '../../../../../../../templates/emails/under-review-by-alc.template'; +import { SUBMISSION_STATUS } from '../../../application/application-submission-status/submission-status.dto'; describe('ApplicationDecisionMeetingController', () => { let controller: ApplicationDecisionMeetingController; let mockMeetingService: DeepMocked; let mockApplicationService: DeepMocked; let mockReconsiderationService: DeepMocked; - + let mockEmailService: DeepMocked; let mockApplication; let mockMeeting; @@ -34,6 +41,7 @@ describe('ApplicationDecisionMeetingController', () => { mockMeetingService = createMock(); mockApplicationService = createMock(); mockReconsiderationService = createMock(); + mockEmailService = createMock(); const module: TestingModule = await Test.createTestingModule({ imports: [ @@ -57,6 +65,10 @@ describe('ApplicationDecisionMeetingController', () => { provide: ApplicationReconsiderationService, useValue: mockReconsiderationService, }, + { + provide: EmailService, + useValue: mockEmailService, + }, { provide: ClsService, useValue: {}, @@ -107,6 +119,7 @@ describe('ApplicationDecisionMeetingController', () => { it('should create meeting', async () => { mockApplicationService.getOrFail.mockResolvedValue(mockApplication); + mockMeetingService.getByAppFileNumber.mockResolvedValue([]); const meetingToUpdate = { date: new Date(2022, 2, 2, 2, 2, 2, 2).valueOf(), @@ -122,6 +135,65 @@ describe('ApplicationDecisionMeetingController', () => { }); }); + it('should send status email for first review discussion', async () => { + const primaryContactOwnerUuid = 'fake-owner'; + const localGovernmentUuid = 'local-government'; + + const mockGovernment = new LocalGovernment({ uuid: localGovernmentUuid }); + const mockOwner = new ApplicationOwner({ uuid: primaryContactOwnerUuid }); + const mockSubmission = new ApplicationSubmission({ + owners: [mockOwner], + primaryContactOwnerUuid, + localGovernmentUuid, + }); + + mockApplicationService.getOrFail.mockResolvedValue(mockApplication); + mockMeetingService.getByAppFileNumber.mockResolvedValue([ + new ApplicationDecisionMeeting(), + ]); + mockEmailService.getSubmissionStatusEmailData.mockResolvedValue({ + applicationSubmission: mockSubmission, + primaryContact: mockOwner, + submissionGovernment: mockGovernment, + }); + mockEmailService.sendStatusEmail.mockResolvedValue(); + + const meetingToUpdate = { + date: new Date(2022, 2, 2, 2, 2, 2, 2).valueOf(), + applicationFileNumber: mockApplication.fileNumber, + } as CreateApplicationDecisionMeetingDto; + + await controller.create(meetingToUpdate); + + expect(mockEmailService.sendStatusEmail).toBeCalledTimes(1); + expect(mockEmailService.sendStatusEmail).toBeCalledWith({ + generateStatusHtml: generateREVAHtml, + status: SUBMISSION_STATUS.IN_REVIEW_BY_ALC, + applicationSubmission: mockSubmission, + government: mockGovernment, + primaryContact: mockOwner, + ccGovernment: true, + }); + }); + + it('should not send status email for additional review discussions', async () => { + mockApplicationService.getOrFail.mockResolvedValue(mockApplication); + mockMeetingService.getByAppFileNumber.mockResolvedValue([ + new ApplicationDecisionMeeting(), + new ApplicationDecisionMeeting(), + ]); + mockEmailService.sendStatusEmail.mockResolvedValue(); + + const meetingToUpdate = { + date: new Date(2022, 2, 2, 2, 2, 2, 2).valueOf(), + applicationFileNumber: mockApplication.fileNumber, + } as CreateApplicationDecisionMeetingDto; + + await controller.create(meetingToUpdate); + + expect(mockEmailService.sendStatusEmail).toBeCalledTimes(0); + }); + it('should update meeting', async () => { const meetingToUpdate = { uuid: mockMeeting.uuid, diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v1/application-decision-meeting/application-decision-meeting.controller.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v1/application-decision-meeting/application-decision-meeting.controller.ts index e0cff43220..6c1a81b697 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v1/application-decision-meeting/application-decision-meeting.controller.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v1/application-decision-meeting/application-decision-meeting.controller.ts @@ -30,6 +30,10 @@ import { ApplicationDecisionMeeting } from './application-decision-meeting.entit import { ApplicationDecisionMeetingService } from './application-decision-meeting.service'; import { formatIncomingDate } from '../../../../utils/incoming-date.formatter'; +import { EmailService } from '../../../../providers/email/email.service'; +import { generateREVAHtml } from '../../../../../../../templates/emails/under-review-by-alc.template'; +import { SUBMISSION_STATUS } from '../../../application/application-submission-status/submission-status.dto'; + @ApiOAuth2(config.get('KEYCLOAK.SCOPES')) @Controller('application-decision-meeting') @UseGuards(RolesGuard) @@ -37,6 +41,7 @@ export class ApplicationDecisionMeetingController { constructor( private appDecisionMeetingService: ApplicationDecisionMeetingService, private applicationService: ApplicationService, + private emailService: EmailService, private reconsiderationService: ApplicationReconsiderationService, @InjectMapper() private mapper: Mapper, ) {} @@ -105,6 +110,29 @@ export class ApplicationDecisionMeetingController { applicationUuid: application.uuid, }); + const meetings = await this.appDecisionMeetingService.getByAppFileNumber( + meeting.applicationFileNumber, + ); + + // Send status email for first review discussion + if (meetings.length === 1) { + const { applicationSubmission, primaryContact, submissionGovernment } = + await this.emailService.getSubmissionStatusEmailData( + meeting.applicationFileNumber, + ); + + if (primaryContact) { + await this.emailService.sendStatusEmail({ + generateStatusHtml: generateREVAHtml, + status: SUBMISSION_STATUS.IN_REVIEW_BY_ALC, + applicationSubmission, + government: submissionGovernment, + primaryContact, + ccGovernment: true, + }); + } + } + return this.mapper.map( newMeeting, ApplicationDecisionMeeting, diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.controller.spec.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.controller.spec.ts index 7a17471246..321b5708b4 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.controller.spec.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.controller.spec.ts @@ -22,6 +22,13 @@ import { CreateApplicationDecisionDto, UpdateApplicationDecisionDto, } from './application-decision.dto'; +import { EmailService } from '../../../../providers/email/email.service'; +import { ApplicationSubmission } from '../../../../portal/application-submission/application-submission.entity'; +import { LocalGovernment } from '../../../local-government/local-government.entity'; +import { ApplicationOwner } from '../../../../portal/application-submission/application-owner/application-owner.entity'; +import { generateALCDHtml } from '../../../../../../../templates/emails/decision-released.template'; +import { SUBMISSION_STATUS } from '../../../application/application-submission-status/submission-status.dto'; +import { ApplicationDecision } from '../../application-decision.entity'; describe('ApplicationDecisionV2Controller', () => { let controller: ApplicationDecisionV2Controller; @@ -30,6 +37,7 @@ describe('ApplicationDecisionV2Controller', () => { let mockCodeService: DeepMocked; let mockModificationService: DeepMocked; let mockReconService: DeepMocked; + let mockEmailService: DeepMocked; let mockApplication; let mockDecision; @@ -40,6 +48,7 @@ describe('ApplicationDecisionV2Controller', () => { mockCodeService = createMock(); mockModificationService = createMock(); mockReconService = createMock(); + mockEmailService = createMock(); mockApplication = initApplicationMockEntity(); mockDecision = initApplicationDecisionMock(mockApplication); @@ -75,6 +84,10 @@ describe('ApplicationDecisionV2Controller', () => { provide: ApplicationReconsiderationService, useValue: mockReconService, }, + { + provide: EmailService, + useValue: mockEmailService, + }, { provide: ClsService, useValue: {}, @@ -161,7 +174,13 @@ describe('ApplicationDecisionV2Controller', () => { }); it('should update the decision', async () => { + mockApplicationService.getFileNumber.mockResolvedValue('file-number'); + mockDecisionService.get.mockResolvedValue(new ApplicationDecision()); + mockDecisionService.getByAppFileNumber.mockResolvedValue([ + new ApplicationDecision(), + ]); mockDecisionService.update.mockResolvedValue(mockDecision); + const updates = { outcome: 'New Outcome', date: new Date(2022, 2, 2, 2, 2, 2, 2).valueOf(), @@ -245,4 +264,95 @@ describe('ApplicationDecisionV2Controller', () => { expect(mockDecisionService.generateResolutionNumber).toBeCalledTimes(1); expect(mockDecisionService.generateResolutionNumber).toBeCalledWith(2023); }); + + it('should send status email after the first release of any decisions', async () => { + const fileNumber = 'fake-file-number'; + const primaryContactOwnerUuid = 'primary-contact'; + const mockOwner = new ApplicationOwner({ uuid: primaryContactOwnerUuid }); + const localGovernmentUuid = 'fake-government'; + const mockGovernment = new LocalGovernment({ uuid: localGovernmentUuid }); + const mockApplicationSubmission = new ApplicationSubmission({ + fileNumber, + primaryContactOwnerUuid, + owners: [mockOwner], + localGovernmentUuid, + }); + + mockApplicationService.getFileNumber.mockResolvedValue(fileNumber); + mockDecisionService.get.mockResolvedValue( + new ApplicationDecision({ wasReleased: false }), + ); + mockDecisionService.update.mockResolvedValue(mockDecision); + mockEmailService.getSubmissionStatusEmailData.mockResolvedValue({ + applicationSubmission: mockApplicationSubmission, + primaryContact: mockOwner, + submissionGovernment: mockGovernment, + }); + mockEmailService.sendStatusEmail.mockResolvedValue(); + + const updates = { + outcome: 'New Outcome', + date: new Date(2022, 2, 2, 2, 2, 2, 2).valueOf(), + isDraft: false, + } as UpdateApplicationDecisionDto; + + await controller.update('fake-uuid', updates); + + expect(mockDecisionService.update).toBeCalledTimes(1); + expect(mockDecisionService.update).toBeCalledWith( + 'fake-uuid', + { + outcome: 'New Outcome', + date: updates.date, + isDraft: false, + }, + undefined, + undefined, + ); + + expect(mockEmailService.sendStatusEmail).toBeCalledTimes(1); + expect(mockEmailService.sendStatusEmail).toBeCalledWith({ + generateStatusHtml: generateALCDHtml, + status: SUBMISSION_STATUS.ALC_DECISION, + applicationSubmission: mockApplicationSubmission, + government: mockGovernment, + primaryContact: mockOwner, + ccGovernment: true, + decisionReleaseMaskedDate: new Date().toLocaleDateString('en-CA', { + weekday: 'long', + year: 'numeric', + month: 'long', + day: 'numeric', + }), + }); + }); + + it('should not send status email on subsequent decision releases', async () => { + mockDecisionService.get.mockResolvedValue( + new ApplicationDecision({ wasReleased: true }), + ); + mockDecisionService.update.mockResolvedValue(mockDecision); + mockEmailService.sendStatusEmail.mockResolvedValue(); + + const updates = { + outcome: 'New Outcome', + date: new Date(2022, 2, 2, 2, 2, 2, 2).valueOf(), + isDraft: false, + } as UpdateApplicationDecisionDto; + + await controller.update('fake-uuid', updates); + + expect(mockDecisionService.update).toBeCalledTimes(1); + expect(mockDecisionService.update).toBeCalledWith( + 'fake-uuid', + { + outcome: 'New Outcome', + date: updates.date, + isDraft: false, + }, + undefined, + undefined, + ); + expect(mockEmailService.sendStatusEmail).toBeCalledTimes(0); + }); }); diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.controller.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.controller.ts index d664badb99..633a1b92c8 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.controller.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.controller.ts @@ -41,6 +41,9 @@ import { CeoCriterionCodeDto } from './ceo-criterion/ceo-criterion.dto'; import { ApplicationDecisionComponentType } from './component/application-decision-component-type.entity'; import { ApplicationDecisionComponentTypeDto } from './component/application-decision-component.dto'; import { LinkedResolutionOutcomeType } from './linked-resolution-outcome-type.entity'; +import { EmailService } from '../../../../providers/email/email.service'; +import { SUBMISSION_STATUS } from '../../../application/application-submission-status/submission-status.dto'; +import { generateALCDHtml } from '../../../../../../../templates/emails/decision-released.template'; @ApiOAuth2(config.get('KEYCLOAK.SCOPES')) @Controller('application-decision') @@ -49,6 +52,7 @@ export class ApplicationDecisionV2Controller { constructor( private appDecisionService: ApplicationDecisionV2Service, private applicationService: ApplicationService, + private emailService: EmailService, private modificationService: ApplicationModificationService, private reconsiderationService: ApplicationReconsiderationService, @InjectMapper() private mapper: Mapper, @@ -192,12 +196,19 @@ export class ApplicationDecisionV2Controller { reconsiders = null; } + const decision = await this.appDecisionService.get(uuid); + const updatedDecision = await this.appDecisionService.update( uuid, updateDto, modifies, reconsiders, ); + + if (!decision.wasReleased && updateDto.isDraft === false) { + this.sendDecisionReleasedEmail(updatedDecision); + } + return this.mapper.mapAsync( updatedDecision, ApplicationDecision, @@ -275,4 +286,38 @@ export class ApplicationDecisionV2Controller { ) { return this.appDecisionService.generateResolutionNumber(resolutionYear); } + + private async sendDecisionReleasedEmail(decision: ApplicationDecision) { + const fileNumber = await this.applicationService.getFileNumber( + decision.applicationUuid, + ); + + const { applicationSubmission, primaryContact, submissionGovernment } = + await this.emailService.getSubmissionStatusEmailData(fileNumber); + + const date = decision.date ? new Date(decision.date) : new Date(); + + if (decision.daysHideFromPublic) { + date.setDate(date.getDate() + decision.daysHideFromPublic); + } + + const options: Intl.DateTimeFormatOptions = { + weekday: 'long', + year: 'numeric', + month: 'long', + day: 'numeric', + }; + + if (primaryContact) { + await this.emailService.sendStatusEmail({ + generateStatusHtml: generateALCDHtml, + status: SUBMISSION_STATUS.ALC_DECISION, + applicationSubmission, + government: submissionGovernment, + primaryContact, + ccGovernment: true, + decisionReleaseMaskedDate: date.toLocaleDateString('en-CA', options), + }); + } + } } diff --git a/services/apps/alcs/src/alcs/application/application.controller.spec.ts b/services/apps/alcs/src/alcs/application/application.controller.spec.ts index 83173e98d7..091b5fcfea 100644 --- a/services/apps/alcs/src/alcs/application/application.controller.spec.ts +++ b/services/apps/alcs/src/alcs/application/application.controller.spec.ts @@ -21,12 +21,20 @@ import { ApplicationController } from './application.controller'; import { ApplicationDto, UpdateApplicationDto } from './application.dto'; import { Application } from './application.entity'; import { ApplicationService } from './application.service'; +import { EmailService } from '../../providers/email/email.service'; +import { ApplicationSubmission } from '../../portal/application-submission/application-submission.entity'; +import { ApplicationOwner } from '../../portal/application-submission/application-owner/application-owner.entity'; +import { LocalGovernment } from '../local-government/local-government.entity'; +import { generateCANCHtml } from '../../../../../templates/emails/cancelled.template'; +import { SUBMISSION_STATUS } from './application-submission-status/submission-status.dto'; describe('ApplicationController', () => { let controller: ApplicationController; let applicationService: DeepMocked; let notificationService: DeepMocked; let cardService: DeepMocked; + let emailService: DeepMocked; + const mockApplicationEntity = initApplicationMockEntity(); const mockApplicationDto: ApplicationDto = { @@ -66,6 +74,7 @@ describe('ApplicationController', () => { applicationService = createMock(); notificationService = createMock(); cardService = createMock(); + emailService = createMock(); const module: TestingModule = await Test.createTestingModule({ controllers: [ApplicationController], @@ -84,6 +93,10 @@ describe('ApplicationController', () => { provide: CardService, useValue: cardService, }, + { + provide: EmailService, + useValue: emailService, + }, { provide: ClsService, useValue: {}, @@ -368,10 +381,36 @@ describe('ApplicationController', () => { }); it('should call through for cancel', async () => { + const primaryContactOwnerUuid = 'primary-contact'; + const localGovernmentUuid = 'local-government'; + const mockGovernment = new LocalGovernment({ uuid: localGovernmentUuid }); + const mockOwner = new ApplicationOwner({ uuid: primaryContactOwnerUuid }); + const mockApplicationSubmission = new ApplicationSubmission({ + owners: [mockOwner], + primaryContactOwnerUuid, + localGovernmentUuid, + }); + + emailService.getSubmissionStatusEmailData.mockResolvedValue({ + applicationSubmission: mockApplicationSubmission, + primaryContact: mockOwner, + submissionGovernment: mockGovernment, + }); + emailService.sendStatusEmail.mockResolvedValue(); applicationService.cancel.mockResolvedValue(); + await controller.cancel(mockApplicationEntity.uuid); expect(applicationService.cancel).toBeCalledTimes(1); + expect(emailService.sendStatusEmail).toBeCalledTimes(1); + expect(emailService.sendStatusEmail).toBeCalledWith({ + generateStatusHtml: generateCANCHtml, + status: SUBMISSION_STATUS.CANCELLED, + applicationSubmission: mockApplicationSubmission, + government: mockGovernment, + primaryContact: mockOwner, + ccGovernment: true, + }); }); it('should call through for uncancel', async () => { diff --git a/services/apps/alcs/src/alcs/application/application.controller.ts b/services/apps/alcs/src/alcs/application/application.controller.ts index 19532b1390..02fb5ad4f4 100644 --- a/services/apps/alcs/src/alcs/application/application.controller.ts +++ b/services/apps/alcs/src/alcs/application/application.controller.ts @@ -29,6 +29,9 @@ import { UpdateApplicationDto, } from './application.dto'; import { ApplicationService } from './application.service'; +import { EmailService } from '../../providers/email/email.service'; +import { generateCANCHtml } from '../../../../../templates/emails/cancelled.template'; +import { SUBMISSION_STATUS } from '../application/application-submission-status/submission-status.dto'; @ApiOAuth2(config.get('KEYCLOAK.SCOPES')) @Controller('application') @@ -37,6 +40,7 @@ export class ApplicationController { constructor( private applicationService: ApplicationService, private cardService: CardService, + private emailService: EmailService, @Inject(CONFIG_TOKEN) private config: config.IConfig, ) {} @@ -122,6 +126,20 @@ export class ApplicationController { @Post('/:fileNumber/cancel') @UserRoles(...ROLES_ALLOWED_APPLICATIONS) async cancel(@Param('fileNumber') fileNumber): Promise { + const { applicationSubmission, primaryContact, submissionGovernment } = + await this.emailService.getSubmissionStatusEmailData(fileNumber); + + if (primaryContact) { + await this.emailService.sendStatusEmail({ + generateStatusHtml: generateCANCHtml, + status: SUBMISSION_STATUS.CANCELLED, + applicationSubmission, + government: submissionGovernment, + primaryContact, + ccGovernment: !!submissionGovernment, + }); + } + await this.applicationService.cancel(fileNumber); } diff --git a/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.spec.ts b/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.spec.ts index a5dd309102..8e3bfd8998 100644 --- a/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.spec.ts +++ b/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.spec.ts @@ -33,6 +33,10 @@ import { ApplicationSubmissionReviewController } from './application-submission- import { ApplicationSubmissionReviewDto } from './application-submission-review.dto'; import { ApplicationSubmissionReview } from './application-submission-review.entity'; import { ApplicationSubmissionReviewService } from './application-submission-review.service'; +import { generateSUBMApplicantHtml } from '../../../../../templates/emails/submitted-to-alc'; +import { generateRFFGHtml } from '../../../../../templates/emails/refused-to-forward.template'; +import { generateINCMHtml } from '../../../../../templates/emails/returned-as-incomplete.template'; +import { generateWRNGHtml } from '../../../../../templates/emails/wrong-lfng.template'; describe('ApplicationSubmissionReviewController', () => { let controller: ApplicationSubmissionReviewController; @@ -213,6 +217,7 @@ describe('ApplicationSubmissionReviewController', () => { it('should send an email through the service when creating with a valid primary contact', async () => { mockLGService.getByGuid.mockResolvedValue(mockLG); mockAppReviewService.startReview.mockResolvedValue(applicationReview); + mockEmailService.sendStatusEmail.mockResolvedValue(); const user = new User({ bceidBusinessGuid: 'id', @@ -246,7 +251,7 @@ describe('ApplicationSubmissionReviewController', () => { }, }); - expect(mockEmailService.sendEmail).toHaveBeenCalledTimes(1); + expect(mockEmailService.sendStatusEmail).toHaveBeenCalledTimes(1); expect(mockLGService.getByGuid).toHaveBeenCalledTimes(2); expect(mockAppReviewService.startReview).toHaveBeenCalledTimes(1); expect( @@ -319,17 +324,23 @@ describe('ApplicationSubmissionReviewController', () => { it('should load review and call submitToAlcs when in correct status for finish', async () => { mockLGService.getByGuid.mockResolvedValue(mockLG); - mockAppSubmissionService.getForGovernmentByFileId.mockResolvedValue( - new ApplicationSubmission({ - status: new ApplicationSubmissionToSubmissionStatus({ - statusTypeCode: SUBMISSION_STATUS.IN_REVIEW_BY_LG, - effectiveDate: new Date(1, 1, 1), - submissionUuid: 'fake', - }), + + const mockOwner = new ApplicationOwner({ uuid: '1234' }); + const mockSubmission = new ApplicationSubmission({ + status: new ApplicationSubmissionToSubmissionStatus({ + statusTypeCode: SUBMISSION_STATUS.IN_REVIEW_BY_LG, + effectiveDate: new Date(1, 1, 1), + submissionUuid: 'fake', }), + owners: [mockOwner], + primaryContactOwnerUuid: '1234', + }); + mockAppSubmissionService.getForGovernmentByFileId.mockResolvedValue( + mockSubmission, ); mockAppReviewService.getByFileNumber.mockResolvedValue(applicationReview); mockAppDocService.list.mockResolvedValue([]); + mockEmailService.sendStatusEmail.mockResolvedValue(); mockAppReviewService.verifyComplete.mockReturnValue({ ...applicationReview, @@ -373,18 +384,32 @@ describe('ApplicationSubmissionReviewController', () => { expect(mockAppSubmissionService.updateStatus.mock.calls[0][1]).toEqual( SUBMISSION_STATUS.SUBMITTED_TO_ALC, ); + expect(mockEmailService.sendStatusEmail).toHaveBeenCalledTimes(1); + expect(mockEmailService.sendStatusEmail).toHaveBeenCalledWith({ + generateStatusHtml: generateSUBMApplicantHtml, + status: SUBMISSION_STATUS.SUBMITTED_TO_ALC, + applicationSubmission: mockSubmission, + government: mockLG, + primaryContact: mockOwner, + ccGovernment: true, + }); }); it('should load review and call submitToAlcs and set to refused to forward when not authorized', async () => { mockLGService.getByGuid.mockResolvedValue(mockLG); - mockAppSubmissionService.getForGovernmentByFileId.mockResolvedValue( - new ApplicationSubmission({ - status: new ApplicationSubmissionToSubmissionStatus({ - statusTypeCode: SUBMISSION_STATUS.IN_REVIEW_BY_LG, - effectiveDate: new Date(1, 1, 1), - submissionUuid: 'fake', - }), + + const mockOwner = new ApplicationOwner({ uuid: '1234' }); + const mockSubmission = new ApplicationSubmission({ + status: new ApplicationSubmissionToSubmissionStatus({ + statusTypeCode: SUBMISSION_STATUS.IN_REVIEW_BY_LG, + effectiveDate: new Date(1, 1, 1), + submissionUuid: 'fake', }), + owners: [new ApplicationOwner({ uuid: '1234' })], + primaryContactOwnerUuid: '1234', + }); + mockAppSubmissionService.getForGovernmentByFileId.mockResolvedValue( + mockSubmission, ); mockAppSubmissionService.submitToAlcs.mockResolvedValue( new Application({ @@ -407,6 +432,7 @@ describe('ApplicationSubmissionReviewController', () => { errors: [], }); mockAppSubmissionService.updateStatus.mockResolvedValue({} as any); + mockEmailService.sendStatusEmail.mockResolvedValue(); mockAppDocService.list.mockResolvedValue([]); await controller.finish(fileNumber, { @@ -428,19 +454,34 @@ describe('ApplicationSubmissionReviewController', () => { expect(mockAppSubmissionService.updateStatus.mock.calls[0][1]).toEqual( SUBMISSION_STATUS.REFUSED_TO_FORWARD_LG, ); + expect(mockEmailService.sendStatusEmail).toHaveBeenCalledTimes(1); + expect(mockEmailService.sendStatusEmail).toHaveBeenCalledWith({ + generateStatusHtml: generateRFFGHtml, + status: SUBMISSION_STATUS.REFUSED_TO_FORWARD_LG, + applicationSubmission: mockSubmission, + government: mockLG, + primaryContact: mockOwner, + ccGovernment: true, + }); }); it('should update the status, delete documents, and update the application for return', async () => { mockLGService.getByGuid.mockResolvedValue(mockLG); - mockAppSubmissionService.getForGovernmentByFileId.mockResolvedValue( - new ApplicationSubmission({ - uuid: 'submission-uuid', - status: new ApplicationSubmissionToSubmissionStatus({ - statusTypeCode: SUBMISSION_STATUS.IN_REVIEW_BY_LG, - effectiveDate: new Date(1, 1, 1), - submissionUuid: 'fake', - }), + + const mockOwner = new ApplicationOwner({ uuid: '1234' }); + const mockSubmission = new ApplicationSubmission({ + uuid: 'submission-uuid', + status: new ApplicationSubmissionToSubmissionStatus({ + statusTypeCode: SUBMISSION_STATUS.IN_REVIEW_BY_LG, + effectiveDate: new Date(1, 1, 1), + submissionUuid: 'fake', }), + owners: [mockOwner], + primaryContactOwnerUuid: '1234', + }); + + mockAppSubmissionService.getForGovernmentByFileId.mockResolvedValue( + mockSubmission, ); mockAppSubmissionService.updateStatus.mockResolvedValue({} as any); mockAppReviewService.getByFileNumber.mockResolvedValue(applicationReview); @@ -449,6 +490,7 @@ describe('ApplicationSubmissionReviewController', () => { mockAppSubmissionService.update.mockResolvedValue( new ApplicationSubmission(), ); + mockEmailService.sendStatusEmail.mockResolvedValue(); const documents = [ new ApplicationDocument({ @@ -508,7 +550,88 @@ describe('ApplicationSubmissionReviewController', () => { }); expect( mockApplicationSubmissionStatusService.setStatusDate, - ).toBeCalledTimes(2); + ).toHaveBeenCalledTimes(2); + expect(mockEmailService.sendStatusEmail).toHaveBeenCalledTimes(1); + expect(mockEmailService.sendStatusEmail).toHaveBeenCalledWith({ + generateStatusHtml: generateINCMHtml, + status: SUBMISSION_STATUS.INCOMPLETE, + applicationSubmission: mockSubmission, + government: mockLG, + primaryContact: mockOwner, + ccGovernment: true, + }); + }); + + it('should send the correct email template for wrong government return', async () => { + mockLGService.getByGuid.mockResolvedValue(mockLG); + + const mockOwner = new ApplicationOwner({ uuid: '1234' }); + const mockSubmission = new ApplicationSubmission({ + uuid: 'submission-uuid', + status: new ApplicationSubmissionToSubmissionStatus({ + statusTypeCode: SUBMISSION_STATUS.IN_REVIEW_BY_LG, + effectiveDate: new Date(1, 1, 1), + submissionUuid: 'fake', + }), + owners: [mockOwner], + primaryContactOwnerUuid: '1234', + }); + + mockAppSubmissionService.getForGovernmentByFileId.mockResolvedValue( + mockSubmission, + ); + mockAppSubmissionService.updateStatus.mockResolvedValue({} as any); + mockAppReviewService.getByFileNumber.mockResolvedValue(applicationReview); + mockAppReviewService.delete.mockResolvedValue(); + mockAppDocService.delete.mockResolvedValue({} as any); + mockAppSubmissionService.update.mockResolvedValue( + new ApplicationSubmission(), + ); + mockEmailService.sendStatusEmail.mockResolvedValue(); + + const documents = [ + new ApplicationDocument({ + type: new DocumentCode({ + code: DOCUMENT_TYPE.RESOLUTION_DOCUMENT, + }), + document: new Document({ + source: DOCUMENT_SOURCE.LFNG, + }), + }), + new ApplicationDocument({ + type: new DocumentCode({ + code: DOCUMENT_TYPE.CERTIFICATE_OF_TITLE, + }), + document: new Document({ + source: DOCUMENT_SOURCE.APPLICANT, + }), + }), + ]; + mockAppDocService.list.mockResolvedValue(documents); + + await controller.return( + fileNumber, + { + user: { + entity: new User({ + bceidBusinessGuid: 'id', + }), + }, + }, + { + reasonForReturn: 'wrongGovernment', + applicantComment: 'test-comment', + }, + ); + + expect(mockEmailService.sendStatusEmail).toHaveBeenCalledTimes(1); + expect(mockEmailService.sendStatusEmail).toHaveBeenCalledWith({ + generateStatusHtml: generateWRNGHtml, + status: SUBMISSION_STATUS.WRONG_GOV, + applicationSubmission: mockSubmission, + government: mockLG, + primaryContact: mockOwner, + }); }); it('should throw an exception when trying to return an application not in review', async () => { diff --git a/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.ts b/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.ts index ee62c46795..41674d6f06 100644 --- a/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.ts +++ b/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.ts @@ -6,27 +6,23 @@ import { Body, Controller, Get, - Logger, NotFoundException, Param, Post, Req, UseGuards, } from '@nestjs/common'; -import { generateStatusHtml } from '../../../../../templates/emails/submission-status.template'; +import { generateREVGHtml } from '../../../../../templates/emails/under-review-by-lfng.template'; +import { generateWRNGHtml } from '../../../../../templates/emails/wrong-lfng.template'; import { ApplicationDocumentService } from '../../alcs/application/application-document/application-document.service'; import { ApplicationSubmissionStatusService } from '../../alcs/application/application-submission-status/application-submission-status.service'; import { SUBMISSION_STATUS } from '../../alcs/application/application-submission-status/submission-status.dto'; -import { ApplicationService } from '../../alcs/application/application.service'; -import { LocalGovernment } from '../../alcs/local-government/local-government.entity'; import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; import { PortalAuthGuard } from '../../common/authorization/portal-auth-guard.service'; import { OWNER_TYPE } from '../../common/owner-type/owner-type.entity'; import { DOCUMENT_SOURCE } from '../../document/document.dto'; import { EmailService } from '../../providers/email/email.service'; import { User } from '../../user/user.entity'; -import { FALLBACK_APPLICANT_NAME } from '../../utils/owner.constants'; -import { ApplicationOwner } from '../application-submission/application-owner/application-owner.entity'; import { ApplicationSubmissionValidatorService } from '../application-submission/application-submission-validator.service'; import { ApplicationSubmission } from '../application-submission/application-submission.entity'; import { ApplicationSubmissionService } from '../application-submission/application-submission.service'; @@ -36,21 +32,19 @@ import { UpdateApplicationSubmissionReviewDto, } from './application-submission-review.dto'; import { ApplicationSubmissionReviewService } from './application-submission-review.service'; +import { generateINCMHtml } from '../../../../../templates/emails/returned-as-incomplete.template'; +import { generateRFFGHtml } from '../../../../../templates/emails/refused-to-forward.template'; +import { generateSUBMApplicantHtml } from '../../../../../templates/emails/submitted-to-alc'; @Controller('application-review') @UseGuards(PortalAuthGuard) export class ApplicationSubmissionReviewController { - private logger: Logger = new Logger( - ApplicationSubmissionReviewController.name, - ); - constructor( private applicationSubmissionService: ApplicationSubmissionService, private applicationSubmissionReviewService: ApplicationSubmissionReviewService, private applicationDocumentService: ApplicationDocumentService, private localGovernmentService: LocalGovernmentService, private applicationValidatorService: ApplicationSubmissionValidatorService, - private applicationService: ApplicationService, private emailService: EmailService, private applicationSubmissionStatusService: ApplicationSubmissionStatusService, ) {} @@ -189,17 +183,18 @@ export class ApplicationSubmissionReviewController { SUBMISSION_STATUS.IN_REVIEW_BY_LG, ); - const primaryContact = applicationSubmission.owners.find( + const primaryContact = applicationSubmission.owners?.find( (owner) => owner.uuid === applicationSubmission.primaryContactOwnerUuid, ); - if (primaryContact && primaryContact.email) { - await this.sendStatusEmail( + if (primaryContact) { + await this.emailService.sendStatusEmail({ + generateStatusHtml: generateREVGHtml, + status: SUBMISSION_STATUS.IN_REVIEW_BY_LG, applicationSubmission, - fileNumber, - userLocalGovernment, + government: userLocalGovernment, primaryContact, - ); + }); } const creatingGuid = applicationSubmission.createdBy.bceidBusinessGuid; @@ -231,48 +226,6 @@ export class ApplicationSubmissionReviewController { ); } - private async sendStatusEmail( - applicationSubmission: ApplicationSubmission, - fileNumber: string, - userLocalGovernment: LocalGovernment, - primaryContact: ApplicationOwner, - ) { - if (primaryContact.email) { - const status = await this.applicationSubmissionService.getStatus( - SUBMISSION_STATUS.IN_REVIEW_BY_LG, - ); - - const types = await this.applicationService.fetchApplicationTypes(); - const matchingType = types.find( - (type) => type.code === applicationSubmission.typeCode, - ); - - const emailTemplate = generateStatusHtml({ - fileNumber, - applicantName: - applicationSubmission.applicant || FALLBACK_APPLICANT_NAME, - applicationType: - matchingType?.portalLabel ?? - matchingType?.label ?? - FALLBACK_APPLICANT_NAME, - governmentName: userLocalGovernment.name, - status: status.label, - }); - - this.emailService.sendEmail({ - body: emailTemplate.html, - subject: `Agricultural Land Commission Application ID: ${fileNumber} (${ - applicationSubmission.applicant || FALLBACK_APPLICANT_NAME - })`, - to: [primaryContact.email], - }); - } else { - this.logger.warn( - 'Cannot send status email, primary contact has no email', - ); - } - } - @Post('/:fileNumber/finish') async finish(@Param('fileNumber') fileNumber: string, @Req() req) { const userLocalGovernment = await this.getUserGovernmentOrFail( @@ -322,16 +275,43 @@ export class ApplicationSubmissionReviewController { req.user.entity, completedReview, ); + + const primaryContact = application.owners?.find( + (owner) => owner.uuid === application.primaryContactOwnerUuid, + ); + if (completedReview.isAuthorized !== false) { await this.applicationSubmissionService.updateStatus( application, SUBMISSION_STATUS.SUBMITTED_TO_ALC, ); + + if (primaryContact) { + await this.emailService.sendStatusEmail({ + generateStatusHtml: generateSUBMApplicantHtml, + status: SUBMISSION_STATUS.SUBMITTED_TO_ALC, + applicationSubmission: application, + government: userLocalGovernment, + primaryContact, + ccGovernment: true, + }); + } } else { await this.applicationSubmissionService.updateStatus( application, SUBMISSION_STATUS.REFUSED_TO_FORWARD_LG, ); + + if (primaryContact) { + await this.emailService.sendStatusEmail({ + generateStatusHtml: generateRFFGHtml, + status: SUBMISSION_STATUS.REFUSED_TO_FORWARD_LG, + applicationSubmission: application, + government: userLocalGovernment, + primaryContact, + ccGovernment: true, + }); + } } } else { throw new BaseServiceException('Application not in correct status'); @@ -401,6 +381,33 @@ export class ApplicationSubmissionReviewController { } await this.setReturnedStatus(returnDto, applicationSubmission); + + const primaryContact = applicationSubmission.owners?.find( + (owner) => owner.uuid === applicationSubmission.primaryContactOwnerUuid, + ); + + if (primaryContact) { + if (returnDto.reasonForReturn === 'wrongGovernment') { + await this.emailService.sendStatusEmail({ + generateStatusHtml: generateWRNGHtml, + status: SUBMISSION_STATUS.WRONG_GOV, + applicationSubmission, + government: userLocalGovernment, + primaryContact, + }); + } + + if (returnDto.reasonForReturn === 'incomplete') { + await this.emailService.sendStatusEmail({ + generateStatusHtml: generateINCMHtml, + status: SUBMISSION_STATUS.INCOMPLETE, + applicationSubmission, + government: userLocalGovernment, + primaryContact, + ccGovernment: true, + }); + } + } } else { throw new BaseServiceException('Application not in correct status'); } diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.controller.spec.ts b/services/apps/alcs/src/portal/application-submission/application-submission.controller.spec.ts index 25d591ff2a..c199026416 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.controller.spec.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.controller.spec.ts @@ -26,6 +26,17 @@ import { } from './application-submission.dto'; import { ApplicationSubmission } from './application-submission.entity'; import { ApplicationSubmissionService } from './application-submission.service'; +import { EmailService } from '../../providers/email/email.service'; +import { ApplicationOwner } from './application-owner/application-owner.entity'; +import { generateCANCHtml } from '../../../../../templates/emails/cancelled.template'; +import { + generateSUBGTurApplicantHtml, + generateSUBGTurGovernmentHtml, +} from '../../../../../templates/emails/submitted-to-alc'; +import { + generateSUBGApplicantHtml, + generateSUBGGovernmentHtml, +} from '../../../../../templates/emails/submitted-to-lfng'; describe('ApplicationSubmissionController', () => { let controller: ApplicationSubmissionController; @@ -33,8 +44,10 @@ describe('ApplicationSubmissionController', () => { let mockDocumentService: DeepMocked; let mockLgService: DeepMocked; let mockAppValidationService: DeepMocked; + let mockEmailService: DeepMocked; const localGovernmentUuid = 'local-government'; + const primaryContactOwnerUuid = 'primary-contact'; const applicant = 'fake-applicant'; const bceidBusinessGuid = 'business-guid'; @@ -43,6 +56,7 @@ describe('ApplicationSubmissionController', () => { mockDocumentService = createMock(); mockLgService = createMock(); mockAppValidationService = createMock(); + mockEmailService = createMock(); const module: TestingModule = await Test.createTestingModule({ controllers: [ApplicationSubmissionController], @@ -64,6 +78,10 @@ describe('ApplicationSubmissionController', () => { provide: ApplicationSubmissionValidatorService, useValue: mockAppValidationService, }, + { + provide: EmailService, + useValue: mockEmailService, + }, { provide: ClsService, useValue: {}, @@ -83,7 +101,7 @@ describe('ApplicationSubmissionController', () => { mockAppSubmissionService.update.mockResolvedValue( new ApplicationSubmission({ - applicant: applicant, + applicant, localGovernmentUuid, }), ); @@ -143,12 +161,16 @@ describe('ApplicationSubmissionController', () => { }); it('should call out to service when cancelling an application', async () => { + const mockOwner = new ApplicationOwner({ uuid: primaryContactOwnerUuid }); const mockApplication = new ApplicationSubmission({ status: new ApplicationSubmissionToSubmissionStatus({ statusTypeCode: SUBMISSION_STATUS.IN_PROGRESS, submissionUuid: 'fake', effectiveDate: new Date(), }), + owners: [mockOwner], + primaryContactOwnerUuid, + localGovernmentUuid, }); mockAppSubmissionService.mapToDTOs.mockResolvedValue([ @@ -159,6 +181,15 @@ describe('ApplicationSubmissionController', () => { ); mockAppSubmissionService.cancel.mockResolvedValue(); + const mockGovernment = new LocalGovernment({ uuid: localGovernmentUuid }); + mockEmailService.getSubmissionStatusEmailData.mockResolvedValue({ + applicationSubmission: mockApplication, + primaryContact: mockOwner, + submissionGovernment: mockGovernment, + }); + + mockEmailService.sendStatusEmail.mockResolvedValue(); + const application = await controller.cancel('file-id', { user: { entity: new User(), @@ -174,6 +205,15 @@ describe('ApplicationSubmissionController', () => { 'file-id', new User(), ); + expect(mockEmailService.sendStatusEmail).toHaveBeenCalledTimes(1); + expect(mockEmailService.sendStatusEmail).toHaveBeenCalledWith({ + generateStatusHtml: generateCANCHtml, + status: SUBMISSION_STATUS.CANCELLED, + applicationSubmission: mockApplication, + government: mockGovernment, + primaryContact: mockOwner, + ccGovernment: true, + }); }); it('should throw an exception when trying to cancel an application that is not in progress', async () => { @@ -333,22 +373,35 @@ describe('ApplicationSubmissionController', () => { it('should call out to service on submitAlcs if application type is TURP', async () => { const mockFileId = 'file-id'; + const mockOwner = new ApplicationOwner({ uuid: primaryContactOwnerUuid }); + const mockApplicationSubmission = new ApplicationSubmission({ + fileNumber: mockFileId, + typeCode: 'TURP', + owners: [mockOwner], + primaryContactOwnerUuid, + localGovernmentUuid, + }); mockAppSubmissionService.submitToAlcs.mockResolvedValue(new Application()); - mockAppSubmissionService.getIfCreatorByUuid.mockResolvedValue( - new ApplicationSubmission({ - typeCode: 'TURP', - }), + mockAppSubmissionService.verifyAccessByUuid.mockResolvedValue( + mockApplicationSubmission, ); mockAppSubmissionService.updateStatus.mockResolvedValue( new ApplicationSubmissionToSubmissionStatus(), ); mockAppValidationService.validateSubmission.mockResolvedValue({ - application: new ApplicationSubmission({ - typeCode: 'TURP', - }) as ValidatedApplicationSubmission, + application: mockApplicationSubmission as ValidatedApplicationSubmission, errors: [], }); + const mockGovernment = new LocalGovernment({ uuid: localGovernmentUuid }); + mockEmailService.getSubmissionStatusEmailData.mockResolvedValue({ + applicationSubmission: mockApplicationSubmission, + primaryContact: mockOwner, + submissionGovernment: mockGovernment, + }); + + mockEmailService.sendStatusEmail.mockResolvedValue(); + await controller.submitAsApplicant(mockFileId, { user: { entity: new User(), @@ -360,6 +413,20 @@ describe('ApplicationSubmissionController', () => { ); expect(mockAppSubmissionService.submitToAlcs).toHaveBeenCalledTimes(1); expect(mockAppSubmissionService.updateStatus).toHaveBeenCalledTimes(1); + expect(mockEmailService.sendStatusEmail).toHaveBeenCalledTimes(2); + expect(mockEmailService.sendStatusEmail).toHaveBeenCalledWith({ + generateStatusHtml: generateSUBGTurApplicantHtml, + status: SUBMISSION_STATUS.SUBMITTED_TO_ALC, + applicationSubmission: mockApplicationSubmission, + government: mockGovernment, + primaryContact: mockOwner, + }); + expect(mockEmailService.sendStatusEmail).toHaveBeenCalledWith({ + generateStatusHtml: generateSUBGTurGovernmentHtml, + status: SUBMISSION_STATUS.SUBMITTED_TO_ALC, + applicationSubmission: mockApplicationSubmission, + government: mockGovernment, + }); }); it('should submit to LG if application type is NOT-TURP', async () => { @@ -367,17 +434,29 @@ describe('ApplicationSubmissionController', () => { mockAppSubmissionService.submitToLg.mockResolvedValue( new ApplicationSubmissionToSubmissionStatus(), ); - mockAppSubmissionService.getIfCreatorByUuid.mockResolvedValue( - new ApplicationSubmission({ - typeCode: 'NOT-TURP', - localGovernmentUuid, - }), + const mockOwner = new ApplicationOwner({ uuid: primaryContactOwnerUuid }); + const mockApplicationSubmission = new ApplicationSubmission({ + typeCode: 'NOT-TURP', + owners: [mockOwner], + primaryContactOwnerUuid, + localGovernmentUuid, + }); + mockAppSubmissionService.verifyAccessByUuid.mockResolvedValue( + mockApplicationSubmission, ); mockAppValidationService.validateSubmission.mockResolvedValue({ application: new ApplicationSubmission() as ValidatedApplicationSubmission, errors: [], }); + mockEmailService.sendStatusEmail.mockResolvedValue(); + + const mockGovernment = new LocalGovernment({ uuid: localGovernmentUuid }); + mockEmailService.getSubmissionStatusEmailData.mockResolvedValue({ + applicationSubmission: mockApplicationSubmission, + primaryContact: mockOwner, + submissionGovernment: mockGovernment, + }); await controller.submitAsApplicant(mockFileId, { user: { @@ -389,15 +468,85 @@ describe('ApplicationSubmissionController', () => { 1, ); expect(mockAppSubmissionService.submitToLg).toHaveBeenCalledTimes(1); + expect(mockEmailService.sendStatusEmail).toHaveBeenCalledTimes(2); + expect(mockEmailService.sendStatusEmail).toHaveBeenCalledWith({ + generateStatusHtml: generateSUBGApplicantHtml, + status: SUBMISSION_STATUS.SUBMITTED_TO_LG, + applicationSubmission: mockApplicationSubmission, + government: mockGovernment, + primaryContact: mockOwner, + }); + expect(mockEmailService.sendStatusEmail).toHaveBeenCalledWith({ + generateStatusHtml: generateSUBGGovernmentHtml, + status: SUBMISSION_STATUS.SUBMITTED_TO_LG, + applicationSubmission: mockApplicationSubmission, + government: mockGovernment, + }); + }); + + it('should only send status email for first time non-TUR applications', async () => { + const mockFileId = 'file-id'; + mockAppSubmissionService.submitToLg.mockResolvedValue( + new ApplicationSubmissionToSubmissionStatus(), + ); + const mockOwner = new ApplicationOwner({ uuid: primaryContactOwnerUuid }); + const mockApplicationSubmission = new ApplicationSubmission({ + typeCode: 'NOT-TURP', + owners: [mockOwner], + primaryContactOwnerUuid, + localGovernmentUuid, + submissionStatuses: [ + new ApplicationSubmissionToSubmissionStatus({ + statusTypeCode: SUBMISSION_STATUS.INCOMPLETE, + submissionUuid: 'fake', + effectiveDate: new Date(), + }), + ], + }); + mockAppSubmissionService.verifyAccessByUuid.mockResolvedValue( + mockApplicationSubmission, + ); + mockAppValidationService.validateSubmission.mockResolvedValue({ + application: + new ApplicationSubmission() as ValidatedApplicationSubmission, + errors: [], + }); + mockEmailService.sendStatusEmail.mockResolvedValue(); + + const mockGovernment = new LocalGovernment({ uuid: localGovernmentUuid }); + mockEmailService.getSubmissionStatusEmailData.mockResolvedValue({ + applicationSubmission: mockApplicationSubmission, + primaryContact: mockOwner, + submissionGovernment: mockGovernment, + }); + + await controller.submitAsApplicant(mockFileId, { + user: { + entity: new User(), + }, + }); + + expect(mockAppSubmissionService.verifyAccessByUuid).toHaveBeenCalledTimes( + 1, + ); + expect(mockAppSubmissionService.submitToLg).toHaveBeenCalledTimes(1); + expect(mockEmailService.sendStatusEmail).toHaveBeenCalledTimes(0); }); it('should throw an exception if application fails validation', async () => { const mockFileId = 'file-id'; + const mockApplicationSubmission = new ApplicationSubmission({ + typeCode: 'NOT-TURP', + owners: [], + }); mockAppSubmissionService.verifyAccessByUuid.mockResolvedValue( - new ApplicationSubmission({ - typeCode: 'NOT-TURP', - }), + mockApplicationSubmission, ); + mockEmailService.getSubmissionStatusEmailData.mockResolvedValue({ + applicationSubmission: mockApplicationSubmission, + primaryContact: new ApplicationOwner(), + submissionGovernment: new LocalGovernment(), + }); mockAppValidationService.validateSubmission.mockResolvedValue({ application: undefined, errors: [new Error('Failed to validate')], diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.controller.ts b/services/apps/alcs/src/portal/application-submission/application-submission.controller.ts index 0fd7474ca0..449e80bf1f 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.controller.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.controller.ts @@ -22,6 +22,16 @@ import { ApplicationSubmissionUpdateDto, } from './application-submission.dto'; import { ApplicationSubmissionService } from './application-submission.service'; +import { + generateSUBGApplicantHtml, + generateSUBGGovernmentHtml, +} from '../../../../../templates/emails/submitted-to-lfng'; +import { EmailService } from '../../providers/email/email.service'; +import { + generateSUBGTurApplicantHtml, + generateSUBGTurGovernmentHtml, +} from '../../../../../templates/emails/submitted-to-alc'; +import { generateCANCHtml } from '../../../../../templates/emails/cancelled.template'; @Controller('application-submission') @UseGuards(PortalAuthGuard) @@ -32,6 +42,7 @@ export class ApplicationSubmissionController { private applicationSubmissionService: ApplicationSubmissionService, private localGovernmentService: LocalGovernmentService, private applicationSubmissionValidatorService: ApplicationSubmissionValidatorService, + private emailService: EmailService, ) {} @Get() @@ -188,6 +199,23 @@ export class ApplicationSubmissionController { throw new BadRequestException('Can only cancel in progress Applications'); } + const { primaryContact, submissionGovernment } = + await this.emailService.getSubmissionStatusEmailData( + application.fileNumber, + application, + ); + + if (primaryContact) { + await this.emailService.sendStatusEmail({ + generateStatusHtml: generateCANCHtml, + status: SUBMISSION_STATUS.CANCELLED, + applicationSubmission: application, + government: submissionGovernment, + primaryContact, + ccGovernment: !!submissionGovernment, + }); + } + await this.applicationSubmissionService.cancel(application); return { @@ -208,6 +236,12 @@ export class ApplicationSubmissionController { applicationSubmission, ); + const { primaryContact, submissionGovernment } = + await this.emailService.getSubmissionStatusEmailData( + applicationSubmission.fileNumber, + applicationSubmission, + ); + if (validationResult.application) { const validatedApplicationSubmission = validationResult.application; if (validatedApplicationSubmission.typeCode === 'TURP') { @@ -215,11 +249,65 @@ export class ApplicationSubmissionController { validatedApplicationSubmission, req.user.entity, ); + + if (primaryContact) { + await this.emailService.sendStatusEmail({ + generateStatusHtml: generateSUBGTurApplicantHtml, + status: SUBMISSION_STATUS.SUBMITTED_TO_ALC, + applicationSubmission, + government: submissionGovernment, + primaryContact, + }); + } + + if (submissionGovernment) { + await this.emailService.sendStatusEmail({ + generateStatusHtml: generateSUBGTurGovernmentHtml, + status: SUBMISSION_STATUS.SUBMITTED_TO_ALC, + applicationSubmission, + government: submissionGovernment, + }); + } + return await this.applicationSubmissionService.updateStatus( applicationSubmission, SUBMISSION_STATUS.SUBMITTED_TO_ALC, ); } else { + const wasSubmittedToLfng = + applicationSubmission.submissionStatuses.find( + (s) => + [ + SUBMISSION_STATUS.SUBMITTED_TO_LG, + SUBMISSION_STATUS.IN_REVIEW_BY_LG, + SUBMISSION_STATUS.WRONG_GOV, + SUBMISSION_STATUS.INCOMPLETE, + ].includes(s.statusTypeCode as SUBMISSION_STATUS) && + !!s.effectiveDate, + ); + + // Send status emails for first time submissions + if (!wasSubmittedToLfng) { + if (primaryContact) { + await this.emailService.sendStatusEmail({ + generateStatusHtml: generateSUBGApplicantHtml, + status: SUBMISSION_STATUS.SUBMITTED_TO_LG, + applicationSubmission, + government: submissionGovernment, + primaryContact, + }); + } + + if (submissionGovernment) { + await this.emailService.sendStatusEmail({ + generateStatusHtml: generateSUBGGovernmentHtml, + status: SUBMISSION_STATUS.SUBMITTED_TO_LG, + applicationSubmission, + government: submissionGovernment, + }); + } + } + return await this.applicationSubmissionService.submitToLg( validatedApplicationSubmission, ); diff --git a/services/apps/alcs/src/providers/email/email.module.ts b/services/apps/alcs/src/providers/email/email.module.ts index fad89dbffd..535c4b276c 100644 --- a/services/apps/alcs/src/providers/email/email.module.ts +++ b/services/apps/alcs/src/providers/email/email.module.ts @@ -1,11 +1,18 @@ import { HttpModule } from '@nestjs/axios'; -import { Module } from '@nestjs/common'; +import { Module, forwardRef } from '@nestjs/common'; import { TypeOrmModule } from '@nestjs/typeorm'; import { EmailStatus } from './email-status.entity'; import { EmailService } from './email.service'; +import { ApplicationSubmissionModule } from '../../portal/application-submission/application-submission.module'; +import { ApplicationModule } from '../../alcs/application/application.module'; @Module({ - imports: [HttpModule, TypeOrmModule.forFeature([EmailStatus])], + imports: [ + HttpModule, + TypeOrmModule.forFeature([EmailStatus]), + forwardRef(() => ApplicationModule), + forwardRef(() => ApplicationSubmissionModule), + ], providers: [EmailService], exports: [EmailService], }) diff --git a/services/apps/alcs/src/providers/email/email.service.spec.ts b/services/apps/alcs/src/providers/email/email.service.spec.ts index c035e39e30..eced68e730 100644 --- a/services/apps/alcs/src/providers/email/email.service.spec.ts +++ b/services/apps/alcs/src/providers/email/email.service.spec.ts @@ -3,20 +3,36 @@ import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { HttpService } from '@nestjs/axios'; import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; +import { MJMLParseResults } from 'mjml-core'; import * as config from 'config'; import { of } from 'rxjs'; import { Repository } from 'typeorm'; import { EmailStatus } from './email-status.entity'; import { EmailService } from './email.service'; +import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; +import { ApplicationSubmissionService } from '../../portal/application-submission/application-submission.service'; +import { ApplicationService } from '../../alcs/application/application.service'; +import { ApplicationSubmission } from '../../portal/application-submission/application-submission.entity'; +import { LocalGovernment } from '../../alcs/local-government/local-government.entity'; +import { ApplicationOwner } from '../../portal/application-submission/application-owner/application-owner.entity'; +import { SUBMISSION_STATUS } from '../../alcs/application/application-submission-status/submission-status.dto'; +import { ApplicationSubmissionStatusType } from '../../alcs/application/application-submission-status/submission-status-type.entity'; describe('EmailService', () => { let service: EmailService; let mockHttpService; let mockRepo: DeepMocked>; + let mockLocalGovernmentService: DeepMocked; + let mockApplicationSubmissionService: DeepMocked; + let mockApplicationService: DeepMocked; beforeEach(async () => { mockHttpService = createMock(); mockRepo = createMock(); + mockLocalGovernmentService = createMock(); + mockApplicationSubmissionService = + createMock(); + mockApplicationService = createMock(); const module: TestingModule = await Test.createTestingModule({ imports: [ConfigModule], @@ -26,6 +42,18 @@ describe('EmailService', () => { provide: HttpService, useValue: mockHttpService, }, + { + provide: LocalGovernmentService, + useValue: mockLocalGovernmentService, + }, + { + provide: ApplicationSubmissionService, + useValue: mockApplicationSubmissionService, + }, + { + provide: ApplicationService, + useValue: mockApplicationService, + }, { provide: getRepositoryToken(EmailStatus), useValue: mockRepo, @@ -63,6 +91,7 @@ describe('EmailService', () => { body: 'body', subject: 'subject', to: ['email'], + cc: ['carbon', 'copy'], }; await service.sendEmail(mockEmail); @@ -75,6 +104,7 @@ describe('EmailService', () => { expect(servicePostBody.subject).toEqual(mockEmail.subject); expect(servicePostBody.body).toEqual(mockEmail.body); expect(servicePostBody.from).toEqual(config.get('CHES.FROM')); + expect(servicePostBody.cc).toEqual(mockEmail.cc); }); it('should re-use the token if its not expired', async () => { @@ -106,4 +136,86 @@ describe('EmailService', () => { expect(mockRepo.save).toHaveBeenCalledTimes(2); expect(mockHttpService.post).toHaveBeenCalledTimes(3); }); + + it('should return submission government if found', async () => { + const localGovernmentUuid = 'fake-uuid'; + const mockGovernment = new LocalGovernment({ uuid: localGovernmentUuid }); + const mockApplicationSubmission = new ApplicationSubmission({ + localGovernmentUuid, + }); + + mockLocalGovernmentService.getByUuid.mockResolvedValue(mockGovernment); + + const res = await service.getSubmissionGovernmentOrFail( + mockApplicationSubmission, + ); + + expect(mockLocalGovernmentService.getByUuid).toHaveBeenCalledTimes(1); + expect(mockLocalGovernmentService.getByUuid).toHaveBeenCalledWith( + mockApplicationSubmission.localGovernmentUuid, + ); + expect(res).toStrictEqual(mockGovernment); + }); + + it('should throw an exception if no submission government is found', async () => { + mockLocalGovernmentService.getByUuid.mockResolvedValue(null); + + const mockApplicationSubmission = new ApplicationSubmission({ + localGovernmentUuid: 'fake-uuid', + }); + const promise = service.getSubmissionGovernmentOrFail( + mockApplicationSubmission, + ); + expect(mockLocalGovernmentService.getByUuid).toHaveBeenCalledTimes(1); + expect(mockLocalGovernmentService.getByUuid).toHaveBeenCalledWith( + mockApplicationSubmission.localGovernmentUuid, + ); + await expect(promise).rejects.toMatchObject( + new Error('Submission local government not found'), + ); + }); + + it('should call through services and return submission data', async () => { + const mockSubmission = new ApplicationSubmission({}); + mockApplicationSubmissionService.getOrFailByFileNumber.mockResolvedValue( + mockSubmission, + ); + + const res = await service.getSubmissionStatusEmailData('file-number'); + + expect( + mockApplicationSubmissionService.getOrFailByFileNumber, + ).toBeCalledTimes(1); + expect( + mockApplicationSubmissionService.getOrFailByFileNumber, + ).toBeCalledWith('file-number'); + expect(res).toStrictEqual({ + applicationSubmission: mockSubmission, + primaryContact: undefined, + submissionGovernment: null, + }); + }); + + it('should call through services to set email template', async () => { + const mockData = { + generateStatusHtml: () => ({} as MJMLParseResults), + status: SUBMISSION_STATUS.IN_REVIEW_BY_LG, + applicationSubmission: new ApplicationSubmission({ typeCode: 'TURP' }), + government: new LocalGovernment({ emails: [] }), + primaryContact: new ApplicationOwner(), + }; + + mockApplicationSubmissionService.getStatus.mockResolvedValue( + new ApplicationSubmissionStatusType(), + ); + mockApplicationService.fetchApplicationTypes.mockResolvedValue([]); + + await service.sendStatusEmail(mockData); + + expect(mockApplicationSubmissionService.getStatus).toBeCalledTimes(1); + expect(mockApplicationSubmissionService.getStatus).toBeCalledWith( + mockData.status, + ); + expect(mockApplicationService.fetchApplicationTypes).toBeCalledTimes(1); + }); }); diff --git a/services/apps/alcs/src/providers/email/email.service.ts b/services/apps/alcs/src/providers/email/email.service.ts index 1fae12b7da..d67941fb02 100644 --- a/services/apps/alcs/src/providers/email/email.service.ts +++ b/services/apps/alcs/src/providers/email/email.service.ts @@ -1,10 +1,46 @@ import { CONFIG_TOKEN, IConfig } from '@app/common/config/config.module'; import { HttpService } from '@nestjs/axios'; -import { Inject, Injectable, Logger } from '@nestjs/common'; +import { Inject, Injectable, Logger, NotFoundException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; +import { MJMLParseResults } from 'mjml-core'; import { firstValueFrom } from 'rxjs'; import { Repository } from 'typeorm'; import { EmailStatus } from './email-status.entity'; +import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; +import { ApplicationSubmission } from '../../portal/application-submission/application-submission.entity'; +import { SUBMISSION_STATUS } from '../../alcs/application/application-submission-status/submission-status.dto'; +import { LocalGovernment } from '../../alcs/local-government/local-government.entity'; +import { ApplicationOwner } from '../../portal/application-submission/application-owner/application-owner.entity'; +import { ApplicationSubmissionService } from '../../portal/application-submission/application-submission.service'; +import { ApplicationService } from '../../alcs/application/application.service'; +import { FALLBACK_APPLICANT_NAME } from '../../utils/owner.constants'; + +export interface StatusUpdateEmail { + fileNumber: string; + applicantName: string; + status: string; + applicationType: string; + governmentName: string; +} + +type StatusEmailData = { + generateStatusHtml: MJMLParseResults; + status: SUBMISSION_STATUS; + applicationSubmission: ApplicationSubmission; + government: LocalGovernment | null; + primaryContact?: ApplicationOwner; + ccGovernment?: boolean; + decisionReleaseMaskedDate?: string; +}; + +export const appFees = [ + { type: 'Exclusion', fee: 750 }, + { type: 'Subdivision', fee: 750 }, + { type: 'Non-Farm Use', fee: 750 }, + { type: 'Non-Adhering Residential Use', fee: 450 }, + { type: 'Soil or Fill Use', fee: 750 }, + { type: 'Inclusion', fee: 0 }, +]; @Injectable() export class EmailService { @@ -15,6 +51,9 @@ export class EmailService { private httpService: HttpService, @InjectRepository(EmailStatus) private repository: Repository, + private localGovernmentService: LocalGovernmentService, + private applicationSubmissionService: ApplicationSubmissionService, + private applicationService: ApplicationService, ) {} private token = ''; @@ -130,4 +169,97 @@ export class EmailService { ); } } + + async getSubmissionGovernmentOrFail(submission: ApplicationSubmission) { + const submissionGovernment = await this.getSubmissionGovernment(submission); + if (!submissionGovernment) { + throw new NotFoundException('Submission local government not found'); + } + return submissionGovernment; + } + + private async getSubmissionGovernment(submission: ApplicationSubmission) { + if (submission.localGovernmentUuid) { + const localGovernment = await this.localGovernmentService.getByUuid( + submission.localGovernmentUuid, + ); + if (localGovernment) { + return localGovernment; + } + } + return undefined; + } + + async getSubmissionStatusEmailData( + fileNumber: string, + submissionData?: ApplicationSubmission, + ) { + const applicationSubmission = + submissionData || + (await this.applicationSubmissionService.getOrFailByFileNumber( + fileNumber, + )); + + const primaryContact = applicationSubmission.owners?.find( + (owner) => owner.uuid === applicationSubmission.primaryContactOwnerUuid, + ); + + const submissionGovernment = applicationSubmission.localGovernmentUuid + ? await this.getSubmissionGovernmentOrFail(applicationSubmission) + : null; + + return { applicationSubmission, primaryContact, submissionGovernment }; + } + + async sendStatusEmail(data: StatusEmailData) { + const status = await this.applicationSubmissionService.getStatus( + data.status, + ); + + const types = await this.applicationService.fetchApplicationTypes(); + + const matchingType = types.find( + (type) => type.code === data.applicationSubmission.typeCode, + ); + + const fileNumber = data.applicationSubmission.fileNumber; + const applicantName = + data.applicationSubmission.applicant || FALLBACK_APPLICANT_NAME; + + const emailTemplate = data.generateStatusHtml({ + fileNumber, + applicantName, + applicationType: + matchingType?.portalLabel ?? + matchingType?.label ?? + FALLBACK_APPLICANT_NAME, + governmentName: data.government?.name, + status: status.label, + decisionReleaseMaskedDate: data?.decisionReleaseMaskedDate, + }); + + const email = { + body: emailTemplate.html, + subject: `Agricultural Land Commission Application ID: ${fileNumber} (${applicantName})`, + }; + + if (data.primaryContact && data.primaryContact.email) { + this.sendEmail({ + ...email, + to: [data.primaryContact.email], + cc: data.ccGovernment ? data.government?.emails : [], + }); + } else if (data.government && data.government.emails.length > 0) { + this.sendEmail({ + ...email, + to: data.government.emails, + }); + } else { + this.logger.warn( + `Cannot send status email, ${ + data.primaryContact?.email ? 'primary contact' : 'local government' + } has no email`, + ); + } + } } diff --git a/services/templates/emails/cancelled.template.ts b/services/templates/emails/cancelled.template.ts new file mode 100644 index 0000000000..4d0a6e3dd2 --- /dev/null +++ b/services/templates/emails/cancelled.template.ts @@ -0,0 +1,42 @@ +import { MJMLParseResults } from 'mjml-core'; +import { EmailTemplateService } from '../../libs/common/src/email-template-service/email-template.service'; +import { header, footer, notificationOnly, portalButton } from './partials'; +import { StatusUpdateEmail } from '../../apps/alcs/src/providers/email/email.service'; + +const template = ` + + + .line-height div { + line-height: 24px !important; + } + + .align-left { + float: left !important; + } + + + + ${header} + + + + + This email is to advise that the above noted {{ applicationType }} application has been cancelled and will not be considered further. + + + If you are an agent acting on behalf of the applicant(s)/landowner(s), it is your responsibility to advise your client(s) of this, and any future, correspondence. + + ${notificationOnly} + + + + ${portalButton} + + ${footer} + + +`; + +export const generateCANCHtml = (data: StatusUpdateEmail): MJMLParseResults => { + return new EmailTemplateService().generateEmailBase(template, data); +}; diff --git a/services/templates/emails/decision-released.template.ts b/services/templates/emails/decision-released.template.ts new file mode 100644 index 0000000000..c49fd06a7b --- /dev/null +++ b/services/templates/emails/decision-released.template.ts @@ -0,0 +1,54 @@ +import { MJMLParseResults } from 'mjml-core'; +import { EmailTemplateService } from '../../libs/common/src/email-template-service/email-template.service'; +import { header, footer, notificationOnly, portalButton } from './partials'; +import { StatusUpdateEmail } from '../../apps/alcs/src/providers/email/email.service'; + +type DecisionReleasedStatusEmail = StatusUpdateEmail & { + decisionReleaseMaskedDate: number; +}; + +const template = ` + + + .line-height div { + line-height: 24px !important; + } + + .align-left { + float: left !important; + } + + + + ${header} + + + + + This email is to advise that the Reasons for Decision for the above noted application has been released. + + + Please log into the ALC Portal to view the Reasons for Decision. The document can be found by clicking 'View' from the Inbox table and then navigating to the 'ALC Review and Decision' tab. The Reasons for Decision will be available to the public on {{ decisionReleaseMaskedDate }}. + + + Further correspondence with respect to this application should be directed to the ALC Land Use Planner for your region, found on the ALC website Contact Us page. + + + If you are an agent acting on behalf of the applicant(s)/landowner(s), it is your responsibility to advise your client(s) of this, and any future, correspondence. + + ${notificationOnly} + + + + ${portalButton} + + ${footer} + + +`; + +export const generateALCDHtml = ( + data: DecisionReleasedStatusEmail, +): MJMLParseResults => { + return new EmailTemplateService().generateEmailBase(template, data); +}; diff --git a/services/templates/emails/partials/footer.template.ts b/services/templates/emails/partials/footer.template.ts new file mode 100644 index 0000000000..a4cddba0c9 --- /dev/null +++ b/services/templates/emails/partials/footer.template.ts @@ -0,0 +1,10 @@ +export const footer = ` + + + Provincial Agricultural Land Commission (gov.bc.ca) + + + Contact: 604-660-7000 + + + `; diff --git a/services/templates/emails/partials/header.template.ts b/services/templates/emails/partials/header.template.ts new file mode 100644 index 0000000000..7993fe3bfd --- /dev/null +++ b/services/templates/emails/partials/header.template.ts @@ -0,0 +1,21 @@ +import * as config from 'config'; + +export const header = ` + + + Application ID #{{fileNumber}} + Owner Name: {{applicantName}} + Status: {{status}} + + + + + + `; diff --git a/services/templates/emails/partials/index.ts b/services/templates/emails/partials/index.ts new file mode 100644 index 0000000000..d7b8faeabe --- /dev/null +++ b/services/templates/emails/partials/index.ts @@ -0,0 +1,4 @@ +export * from './footer.template'; +export * from './header.template'; +export * from './notification-only.template'; +export * from './portal-button.template'; diff --git a/services/templates/emails/partials/notification-only.template.ts b/services/templates/emails/partials/notification-only.template.ts new file mode 100644 index 0000000000..e8c09a1140 --- /dev/null +++ b/services/templates/emails/partials/notification-only.template.ts @@ -0,0 +1,5 @@ +export const notificationOnly = ` + + This is an ALC Portal notification only. Please do not reply to this email. + + `; diff --git a/services/templates/emails/partials/portal-button.template.ts b/services/templates/emails/partials/portal-button.template.ts new file mode 100644 index 0000000000..b89ff125aa --- /dev/null +++ b/services/templates/emails/partials/portal-button.template.ts @@ -0,0 +1,16 @@ +export const portalButton = ` + + + + GO TO ALC PORTAL + + + + `; diff --git a/services/templates/emails/refused-to-forward.template.ts b/services/templates/emails/refused-to-forward.template.ts new file mode 100644 index 0000000000..15007c6f1b --- /dev/null +++ b/services/templates/emails/refused-to-forward.template.ts @@ -0,0 +1,48 @@ +import { MJMLParseResults } from 'mjml-core'; +import { EmailTemplateService } from '../../libs/common/src/email-template-service/email-template.service'; +import { header, footer, notificationOnly, portalButton } from './partials'; +import { StatusUpdateEmail } from '../../apps/alcs/src/providers/email/email.service'; + +const template = ` + + + .line-height div { + line-height: 24px !important; + } + + .align-left { + float: left !important; + } + + + + ${header} + + + + + This email is to advise that the above noted {{ applicationType }} application has been reviewed by the {{ governmentName }} which has determined not to forward your application to the Agricultural Land Commission for further review. + + + If you have any questions about this outcome, please contact {{ governmentName }}. + + + If you are an agent acting on behalf of the applicant(s)/landowner(s), it is your responsibility to advise your client(s) of this, and any future, correspondence. + + + Login to the ALC Portal for further information on your application. + + ${notificationOnly} + + + + ${portalButton} + + ${footer} + + +`; + +export const generateRFFGHtml = (data: StatusUpdateEmail): MJMLParseResults => { + return new EmailTemplateService().generateEmailBase(template, data); +}; diff --git a/services/templates/emails/returned-as-incomplete.template.ts b/services/templates/emails/returned-as-incomplete.template.ts new file mode 100644 index 0000000000..e6d7173180 --- /dev/null +++ b/services/templates/emails/returned-as-incomplete.template.ts @@ -0,0 +1,48 @@ +import { MJMLParseResults } from 'mjml-core'; +import { EmailTemplateService } from '../../libs/common/src/email-template-service/email-template.service'; +import { header, footer, notificationOnly, portalButton } from './partials'; +import { StatusUpdateEmail } from '../../apps/alcs/src/providers/email/email.service'; + +const template = ` + + + .line-height div { + line-height: 24px !important; + } + + .align-left { + float: left !important; + } + + + + ${header} + + + + + This email is to advise that the above noted {{ applicationType }} application is considered to be incomplete by the {{ governmentName }} and consequently it has been returned to the applicant. + + + Please login to the ALC Portal to view the comments left by the {{ governmentName }}. Please review, edit and re-submit the application. + + + NOTE: Re-submitted applications do not require an additional application fee. + + + If you are an agent acting on behalf of the applicant(s)/landowner(s), it is your responsibility to advise your client(s) of this, and any future, correspondence. + + ${notificationOnly} + + + + ${portalButton} + + ${footer} + + +`; + +export const generateINCMHtml = (data: StatusUpdateEmail): MJMLParseResults => { + return new EmailTemplateService().generateEmailBase(template, data); +}; diff --git a/services/templates/emails/submission-status.template.ts b/services/templates/emails/submission-status.template.ts deleted file mode 100644 index f3f690dd95..0000000000 --- a/services/templates/emails/submission-status.template.ts +++ /dev/null @@ -1,90 +0,0 @@ -import * as config from 'config'; -import { MJMLParseResults } from 'mjml-core'; -import { EmailTemplateService } from '../../libs/common/src/email-template-service/email-template.service'; - -export interface StatusUpdateEMail { - fileNumber: string; - applicantName: string; - status: string; - applicationType: string; - governmentName: string; -} - -const template = ` - - - .line-height div { - line-height: 24px !important; - } - - .align-left { - float: left !important; - } - - - - - - Application ID #{{fileNumber}} - Applicant: {{applicantName}} - Status: {{status}} - - - - - - - - - - This email is to advise that the above noted {{applicationType}} application has been received by the {{governmentName}} for review. - - - If you have not already done so, please contact {{governmentName}} to determine the preferred form of payment as the application may not be processed until payment is received. - - - If you are an agent acting on behalf of the landowner(s), it is your responsibility to advise your client(s) of this, and any future, correspondence. - - - Login to the Agricultural Land Commission Application Portal for further updates on your application as it progresses through the application process. - - - This is an ALC Application Portal notification only. Please do not reply to this email. - - - - - - - - GO TO APPLICATION PORTAL - - - - - - - Provincial Agricultural Land Commission (gov.bc.ca) - - - Contact: 604-660-7000 - - - - -`; - -export const generateStatusHtml = ( - data: StatusUpdateEMail, -): MJMLParseResults => { - return new EmailTemplateService().generateEmailBase(template, data); -}; diff --git a/services/templates/emails/submitted-to-alc/applicant.template.ts b/services/templates/emails/submitted-to-alc/applicant.template.ts new file mode 100644 index 0000000000..e73947d051 --- /dev/null +++ b/services/templates/emails/submitted-to-alc/applicant.template.ts @@ -0,0 +1,111 @@ +import { MJMLParseResults } from 'mjml-core'; +import { EmailTemplateService } from '../../../libs/common/src/email-template-service/email-template.service'; +import { header, footer, notificationOnly, portalButton } from '../partials'; +import { + StatusUpdateEmail, + appFees, +} from '../../../apps/alcs/src/providers/email/email.service'; + +const template = ` + + + .line-height div { + line-height: 24px !important; + } + + .align-left { + float: left !important; + } + + + + ${header} + + + + + Agricultural Land Commission {{ applicationType }} Application ID: {{ fileNumber }} ({{ applicantName }}) has been reviewed by the {{ governmentName }} and submitted to the Agricultural Land Commission for further review. + + + APPLICATION FEES - Payable to the Minister of Finance c/o the ALC + + + + Application Type + ALC Portion of Fee + + ${appFees + .map((a) => { + return ` + + ${a.type} + $${a.fee} + + `; + }) + .join('')} + + + This fee can be paid: +
    +
  1. Cheque: Made payable to the Minister of Finance c/o the ALC
    2. +
  2. Credit card: Over the phone or in-person
    3. +
+ + + Please include your assigned Application ID with your payment. + + + Mailing address: +
+ Agricultural Land Commission +
+ 201-4940 Canada Way +
+ Burnaby, BC, Canada +
+ V5G 4K6 +
+ + + Paying via telephone: +
+ Tel: 604-660-7000 +
+ + + If you are making a long-distance call to a provincial government agency, you can place your call through Enquiry BC free of charge: +
+ In Victoria call: 250-387-6121 +
+ Elsewhere in BC call: 1-800-663-7867 +
+ + + The length of processing time for each application varies depending on the type of application, statutory requirements within the Agricultural Land Commission Act, information provided, necessity for site visit or applicant meetings, etc. + + + Please be advised that the Status of the application in the ALC Portal will update and a notification email will be sent out as the application moves through each stage of the application review process. Should the ALC Land Use Planner require any additional information or clarification regarding the application, they will contact you. Further information about the application process can be obtained from the ALC website. + + + If you are an agent acting on behalf of the applicant(s) / landowner(s), it is your responsibility to advise them of this, and any future, correspondence. + + + Please log into the ALC Portal for further updates on the application as it progresses. + + ${notificationOnly} + + + + ${portalButton} + + ${footer} + + +`; + +export const generateSUBMApplicantHtml = ( + data: StatusUpdateEmail, +): MJMLParseResults => { + return new EmailTemplateService().generateEmailBase(template, data); +}; diff --git a/services/templates/emails/submitted-to-alc/index.ts b/services/templates/emails/submitted-to-alc/index.ts new file mode 100644 index 0000000000..218deecbd4 --- /dev/null +++ b/services/templates/emails/submitted-to-alc/index.ts @@ -0,0 +1,3 @@ +export * from './applicant.template'; +export * from './tur-applicant.template'; +export * from './tur-government.template'; diff --git a/services/templates/emails/submitted-to-alc/tur-applicant.template.ts b/services/templates/emails/submitted-to-alc/tur-applicant.template.ts new file mode 100644 index 0000000000..91840da803 --- /dev/null +++ b/services/templates/emails/submitted-to-alc/tur-applicant.template.ts @@ -0,0 +1,96 @@ +import { MJMLParseResults } from 'mjml-core'; +import { EmailTemplateService } from '../../../libs/common/src/email-template-service/email-template.service'; +import { header, footer, notificationOnly, portalButton } from '../partials'; +import { StatusUpdateEmail } from '../../../apps/alcs/src/providers/email/email.service'; + +const template = ` + + + .line-height div { + line-height: 24px !important; + } + + .align-left { + float: left !important; + } + + + + ${header} + + + + + This email is to acknowledge that the Agricultural Land Commission (ALC) is in receipt of the above noted {{ applicationType }} application. Please refer to the ALC Application ID in all future correspondence with this office. A copy of this application has been forwarded to the {{ governmentName }} for information purposes. + + + APPLICATION FEES - Payable to the Minister of Finance c/o the ALC + + + + Application Type + {{ governmentName }} Portion of Fee + + + Transportation, Utility, and Recreational Trail Uses + $1500 + + + + This fee can be paid: +
    +
  1. Cheque: Made payable to the Minister of Finance c/o the ALC
    2. +
  2. Credit card: Over the phone or in-person
    3. +
+ + + Please include your assigned Application ID with your payment. + + + Mailing address: +
+ Agricultural Land Commission +
+ 201-4940 Canada Way +
+ Burnaby, BC, Canada +
+ V5G 4K6 +
+ + + Paying via telephone: +
+ Tel: 604-660-7000 +
+ + + If you are making a long-distance call to a provincial government agency, you can place your call through Enquiry BC free of charge: +
+ In Victoria call: 250-387-6121 +
+ Elsewhere in BC call: 1-800-663-7867 +
+ + + If you are an agent acting on behalf of the applicant(s) / landowner(s), it is your responsibility to advise them of this, and any future, correspondence. + + + Please log into the ALC Portal for further updates on the application as it progresses. + + ${notificationOnly} + + + + ${portalButton} + + ${footer} + + +`; + +export const generateSUBGTurApplicantHtml = ( + data: StatusUpdateEmail, +): MJMLParseResults => { + return new EmailTemplateService().generateEmailBase(template, data); +}; diff --git a/services/templates/emails/submitted-to-alc/tur-government.template.ts b/services/templates/emails/submitted-to-alc/tur-government.template.ts new file mode 100644 index 0000000000..13c599073c --- /dev/null +++ b/services/templates/emails/submitted-to-alc/tur-government.template.ts @@ -0,0 +1,44 @@ +import { MJMLParseResults } from 'mjml-core'; +import { EmailTemplateService } from '../../../libs/common/src/email-template-service/email-template.service'; +import { header, footer, notificationOnly, portalButton } from '../partials'; +import { StatusUpdateEmail } from '../../../apps/alcs/src/providers/email/email.service'; + +const template = ` + + + .line-height div { + line-height: 24px !important; + } + + .align-left { + float: left !important; + } + + + + ${header} + + + + + Agricultural Land Commission {{ applicationType }} Application ID: {{ fileNumber }} ({{ applicantName }}) has been successfully submitted to the Agricultural Land Commission. A read-only copy of the application has been submitted to the {{ governmentName }} for informational purposes. Should the {{ governmentName }} wish to comment on the application, please submit comments directly to the ALC. + + + Please log into the ALC Portal to view the application. + + ${notificationOnly} + + + + ${portalButton} + + ${footer} + + +`; + +export const generateSUBGTurGovernmentHtml = ( + data: StatusUpdateEmail, +): MJMLParseResults => { + return new EmailTemplateService().generateEmailBase(template, data); +}; diff --git a/services/templates/emails/submitted-to-lfng/applicant.template.ts b/services/templates/emails/submitted-to-lfng/applicant.template.ts new file mode 100644 index 0000000000..320c139d61 --- /dev/null +++ b/services/templates/emails/submitted-to-lfng/applicant.template.ts @@ -0,0 +1,72 @@ +import { MJMLParseResults } from 'mjml-core'; +import { EmailTemplateService } from '../../../libs/common/src/email-template-service/email-template.service'; +import { header, footer, notificationOnly, portalButton } from '../partials'; +import { + StatusUpdateEmail, + appFees, +} from '../../../apps/alcs/src/providers/email/email.service'; + +const template = ` + + + .line-height div { + line-height: 24px !important; + } + + .align-left { + float: left !important; + } + + + + ${header} + + + + + This email is to acknowledge that you have submitted the above noted {{ applicationType }} application to the {{ governmentName }}. + + + + Application Type + {{ governmentName }} Portion of Fee + + ${appFees + .map((a) => { + return ` + + ${a.type} + $${a.fee} + + `; + }) + .join('')} + + + Contact the {{ governmentName }} for its payment options. Please include your assigned Application ID with your payment. + + + NOTE: There is no additional fee for re-submission if the {{ governmentName }} returns your application. + + + If you are an agent acting on behalf of the applicant(s) / landowner(s), it is your responsibility to advise them of this, and any future, correspondence. + + + Please log into the ALC Portal for further updates on the application as it progresses. + + ${notificationOnly} + + + + ${portalButton} + + ${footer} + + +`; + +export const generateSUBGApplicantHtml = ( + data: StatusUpdateEmail, +): MJMLParseResults => { + return new EmailTemplateService().generateEmailBase(template, data); +}; diff --git a/services/templates/emails/submitted-to-lfng/government.template.ts b/services/templates/emails/submitted-to-lfng/government.template.ts new file mode 100644 index 0000000000..14cdd37905 --- /dev/null +++ b/services/templates/emails/submitted-to-lfng/government.template.ts @@ -0,0 +1,69 @@ +import { MJMLParseResults } from 'mjml-core'; +import { EmailTemplateService } from '../../../libs/common/src/email-template-service/email-template.service'; +import { header, footer, notificationOnly, portalButton } from '../partials'; +import { StatusUpdateEmail } from '../../../apps/alcs/src/providers/email/email.service'; + +const appFees = [ + { type: 'Exclusion', fee: 750 }, + { type: 'Subdivision', fee: 750 }, + { type: 'Non-Farm Use', fee: 750 }, + { type: 'Non-Adhering Residential Use', fee: 450 }, + { type: 'Soil or Fill Use', fee: 750 }, + { type: 'Inclusion', fee: 0 }, +]; + +const template = ` + + + .line-height div { + line-height: 24px !important; + } + + .align-left { + float: left !important; + } + + + + ${header} + + + + + Agricultural Land Commission {{ applicationType }} Application ID: {{ fileNumber }} ({{ applicantName }}) has been successfully submitted to the {{ governmentName }}. The Applicant has been instructed to contact the {{ governmentName }} for payment instructions regarding the applicable application fee. + + + + Application Type + {{ governmentName }} Portion of Fee + + ${appFees + .map((a) => { + return ` + + ${a.type} + $${a.fee} + + `; + }) + .join('')} + + + Please log into the ALC Portal to view the application. + + ${notificationOnly} + + + + ${portalButton} + + ${footer} + + +`; + +export const generateSUBGGovernmentHtml = ( + data: StatusUpdateEmail, +): MJMLParseResults => { + return new EmailTemplateService().generateEmailBase(template, data); +}; diff --git a/services/templates/emails/submitted-to-lfng/index.ts b/services/templates/emails/submitted-to-lfng/index.ts new file mode 100644 index 0000000000..f15e9f56ce --- /dev/null +++ b/services/templates/emails/submitted-to-lfng/index.ts @@ -0,0 +1,2 @@ +export * from './applicant.template'; +export * from './government.template'; diff --git a/services/templates/emails/under-review-by-alc.template.ts b/services/templates/emails/under-review-by-alc.template.ts new file mode 100644 index 0000000000..0468eb67d6 --- /dev/null +++ b/services/templates/emails/under-review-by-alc.template.ts @@ -0,0 +1,45 @@ +import { MJMLParseResults } from 'mjml-core'; +import { EmailTemplateService } from '../../libs/common/src/email-template-service/email-template.service'; +import { header, footer, notificationOnly, portalButton } from './partials'; +import { StatusUpdateEmail } from '../../apps/alcs/src/providers/email/email.service'; + +const template = ` + + + .line-height div { + line-height: 24px !important; + } + + .align-left { + float: left !important; + } + + + + ${header} + + + + + Your application is now under review by the ALC Commissioners. You may be contacted during this review period if additional information or clarification is required. No further action is required from you at this time. + + + If you are an agent acting on behalf of the applicant(s)/landowner(s), it is your responsibility to advise your client(s) of this, and any future, correspondence. + + + Login to the ALC Portal for further updates on your application as it progresses through the application process. + + ${notificationOnly} + + + + ${portalButton} + + ${footer} + + +`; + +export const generateREVAHtml = (data: StatusUpdateEmail): MJMLParseResults => { + return new EmailTemplateService().generateEmailBase(template, data); +}; diff --git a/services/templates/emails/under-review-by-lfng.template.ts b/services/templates/emails/under-review-by-lfng.template.ts new file mode 100644 index 0000000000..50bc360415 --- /dev/null +++ b/services/templates/emails/under-review-by-lfng.template.ts @@ -0,0 +1,48 @@ +import { MJMLParseResults } from 'mjml-core'; +import { EmailTemplateService } from '../../libs/common/src/email-template-service/email-template.service'; +import { header, footer, notificationOnly, portalButton } from './partials'; +import { StatusUpdateEmail } from '../../apps/alcs/src/providers/email/email.service'; + +const template = ` + + + .line-height div { + line-height: 24px !important; + } + + .align-left { + float: left !important; + } + + + + ${header} + + + + + This email is to advise that the above noted {{ applicationType }} application has been received by the {{ governmentName }} for review. + + + If you have not already done so, please contact the {{ governmentName }} to determine the preferred form of payment as the application may not be processed until payment is received. + + + If you are an agent acting on behalf of the applicant(s)/landowner(s), it is your responsibility to advise your client(s) of this, and any future, correspondence. + + + Login to the ALC Portal for further updates on your application as it progresses through the application process. + + ${notificationOnly} + + + + ${portalButton} + + ${footer} + + +`; + +export const generateREVGHtml = (data: StatusUpdateEmail): MJMLParseResults => { + return new EmailTemplateService().generateEmailBase(template, data); +}; diff --git a/services/templates/emails/wrong-lfng.template.ts b/services/templates/emails/wrong-lfng.template.ts new file mode 100644 index 0000000000..a0acfa46b3 --- /dev/null +++ b/services/templates/emails/wrong-lfng.template.ts @@ -0,0 +1,45 @@ +import { MJMLParseResults } from 'mjml-core'; +import { EmailTemplateService } from '../../libs/common/src/email-template-service/email-template.service'; +import { header, footer, notificationOnly, portalButton } from './partials'; +import { StatusUpdateEmail } from '../../apps/alcs/src/providers/email/email.service'; + +const template = ` + + + .line-height div { + line-height: 24px !important; + } + + .align-left { + float: left !important; + } + + + + ${header} + + + + + This email is to advise that the above noted {{ applicationType }} application does not fall within the jurisdiction of the {{ governmentName }} and consequently it has been returned to the applicant. + + + Please login to the ALC Portal to select the correct Local or First Nation Government jurisdiction and re-submit the application. + + + If you are an agent acting on behalf of the applicant(s)/landowner(s), it is your responsibility to advise your client(s) of this, and any future, correspondence. + + ${notificationOnly} + + + + ${portalButton} + + ${footer} + + +`; + +export const generateWRNGHtml = (data: StatusUpdateEmail): MJMLParseResults => { + return new EmailTemplateService().generateEmailBase(template, data); +}; From e1513781ba6535fd45dfdab3756f649f0b7f7ddf Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Thu, 17 Aug 2023 13:56:00 -0700 Subject: [PATCH 265/954] Feature/alcs 1019- steps 5 and 6 for POFO and PFRS in ALCS (#888) steps 5 and 6 for POFO and PFRS in ALCS removed redundant soil columns --- .../additional-information.component.html} | 2 +- .../additional-information.component.scss | 0 .../additional-information.component.spec.ts} | 12 +- .../additional-information.component.ts} | 32 +- .../notice-of-intent-details.component.html | 22 +- .../notice-of-intent-details.component.scss | 6 + ...notice-of-intent-details.component.spec.ts | 1 - .../notice-of-intent-details.module.ts | 8 +- .../pfrs-details/pfrs-details.component.html | 174 +++++++ .../pfrs-details/pfrs-details.component.scss | 13 + .../pfrs-details.component.spec.ts | 33 ++ .../pfrs-details/pfrs-details.component.ts | 41 ++ .../pofo-details/pofo-details.component.html | 99 ++++ .../pofo-details/pofo-details.component.scss | 0 .../pofo-details.component.spec.ts | 33 ++ .../pofo-details/pofo-details.component.ts | 39 ++ ...roso-additional-information.component.scss | 5 - .../roso-details/roso-details.component.html | 8 +- .../notice-of-intent.module.ts | 8 +- ...otice-of-intent-submission.service.spec.ts | 1 - .../notice-of-intent/notice-of-intent.dto.ts | 6 - .../review-and-submit.component.ts | 2 - .../notice-of-intent-submission.dto.ts | 4 - ...ntent-submission-validator.service.spec.ts | 455 +++++++++--------- ...-of-intent-submission-validator.service.ts | 19 +- .../notice-of-intent-submission.dto.ts | 15 - .../notice-of-intent-submission.entity.ts | 8 - .../notice-of-intent-submission.service.ts | 8 - ...9-remove_redundant_pfrs_fields_from_noi.ts | 25 + 29 files changed, 760 insertions(+), 319 deletions(-) rename alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/{roso-details/roso-additional-information/roso-additional-information.component.html => additional-information/additional-information.component.html} (97%) create mode 100644 alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/additional-information/additional-information.component.scss rename alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/{roso-details/roso-additional-information/roso-additional-information.component.spec.ts => additional-information/additional-information.component.spec.ts} (60%) rename alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/{roso-details/roso-additional-information/roso-additional-information.component.ts => additional-information/additional-information.component.ts} (68%) create mode 100644 alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/pfrs-details/pfrs-details.component.html create mode 100644 alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/pfrs-details/pfrs-details.component.scss create mode 100644 alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/pfrs-details/pfrs-details.component.spec.ts create mode 100644 alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/pfrs-details/pfrs-details.component.ts create mode 100644 alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/pofo-details/pofo-details.component.html create mode 100644 alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/pofo-details/pofo-details.component.scss create mode 100644 alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/pofo-details/pofo-details.component.spec.ts create mode 100644 alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/pofo-details/pofo-details.component.ts delete mode 100644 alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/roso-details/roso-additional-information/roso-additional-information.component.scss create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1692230243959-remove_redundant_pfrs_fields_from_noi.ts diff --git a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/roso-details/roso-additional-information/roso-additional-information.component.html b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/additional-information/additional-information.component.html similarity index 97% rename from alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/roso-details/roso-additional-information/roso-additional-information.component.html rename to alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/additional-information/additional-information.component.html index e27996ed82..c724236e7a 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/roso-details/roso-additional-information/roso-additional-information.component.html +++ b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/additional-information/additional-information.component.html @@ -1,5 +1,5 @@
-
Are you removing soil in order to build a structure?
+
{{ firstQuestion }}
{{ _noiSubmission.soilIsRemovingSoilForNewStructure ? 'Yes' : 'No' }} diff --git a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/additional-information/additional-information.component.scss b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/additional-information/additional-information.component.scss new file mode 100644 index 0000000000..e69de29bb2 diff --git a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/roso-details/roso-additional-information/roso-additional-information.component.spec.ts b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/additional-information/additional-information.component.spec.ts similarity index 60% rename from alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/roso-details/roso-additional-information/roso-additional-information.component.spec.ts rename to alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/additional-information/additional-information.component.spec.ts index 301b528b84..657864619c 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/roso-details/roso-additional-information/roso-additional-information.component.spec.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/additional-information/additional-information.component.spec.ts @@ -1,17 +1,17 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { DeepMocked } from '@golevelup/ts-jest'; -import { NoiDocumentService } from '../../../../../../services/notice-of-intent/noi-document/noi-document.service'; -import { RosoAdditionalInformationComponent } from './roso-additional-information.component'; +import { NoiDocumentService } from '../../../../../services/notice-of-intent/noi-document/noi-document.service'; +import { AdditionalInformationComponent } from './additional-information.component'; describe('RosoAdditionalInformationComponent', () => { - let component: RosoAdditionalInformationComponent; - let fixture: ComponentFixture; + let component: AdditionalInformationComponent; + let fixture: ComponentFixture; let mockNoiDocumentService: DeepMocked; beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [RosoAdditionalInformationComponent], + declarations: [AdditionalInformationComponent], providers: [ { provide: NoiDocumentService, @@ -21,7 +21,7 @@ describe('RosoAdditionalInformationComponent', () => { schemas: [NO_ERRORS_SCHEMA], }).compileComponents(); - fixture = TestBed.createComponent(RosoAdditionalInformationComponent); + fixture = TestBed.createComponent(AdditionalInformationComponent); component = fixture.componentInstance; fixture.detectChanges(); }); diff --git a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/roso-details/roso-additional-information/roso-additional-information.component.ts b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/additional-information/additional-information.component.ts similarity index 68% rename from alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/roso-details/roso-additional-information/roso-additional-information.component.ts rename to alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/additional-information/additional-information.component.ts index 2086d214c5..36a3461148 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/roso-details/roso-additional-information/roso-additional-information.component.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/additional-information/additional-information.component.ts @@ -1,20 +1,20 @@ import { Component, Input } from '@angular/core'; import { Router } from '@angular/router'; -import { NoticeOfIntentDocumentDto } from '../../../../../../services/notice-of-intent/noi-document/noi-document.dto'; -import { NoiDocumentService } from '../../../../../../services/notice-of-intent/noi-document/noi-document.service'; +import { NoticeOfIntentDocumentDto } from '../../../../../services/notice-of-intent/noi-document/noi-document.dto'; +import { NoiDocumentService } from '../../../../../services/notice-of-intent/noi-document/noi-document.service'; import { NoticeOfIntentSubmissionDetailedDto, RESIDENTIAL_STRUCTURE_TYPES, STRUCTURE_TYPES, -} from '../../../../../../services/notice-of-intent/notice-of-intent.dto'; -import { DOCUMENT_TYPE } from '../../../../../../shared/document/document.dto'; +} from '../../../../../services/notice-of-intent/notice-of-intent.dto'; +import { DOCUMENT_TYPE } from '../../../../../shared/document/document.dto'; @Component({ - selector: 'app-roso-additional-information', - templateUrl: './roso-additional-information.component.html', - styleUrls: ['./roso-additional-information.component.scss'], + selector: 'app-additional-information', + templateUrl: './additional-information.component.html', + styleUrls: ['./additional-information.component.scss'], }) -export class RosoAdditionalInformationComponent { +export class AdditionalInformationComponent { _noiSubmission: NoticeOfIntentSubmissionDetailedDto | undefined; @Input() set noiSubmission(noiSubmission: NoticeOfIntentSubmissionDetailedDto | undefined) { @@ -23,6 +23,7 @@ export class RosoAdditionalInformationComponent { this.setVisibilityAndValidatorsForResidentialFields(); this.setVisibilityAndValidatorsForAccessoryFields(); this.setVisibilityAndValidatorsForFarmFields(); + this.setFirstQuestion(noiSubmission); } } @@ -31,6 +32,7 @@ export class RosoAdditionalInformationComponent { } buildingPlans: NoticeOfIntentDocumentDto[] = []; + firstQuestion: string = ''; isSoilStructureFarmUseReasonVisible = false; isSoilStructureResidentialUseReasonVisible = false; @@ -77,4 +79,18 @@ export class RosoAdditionalInformationComponent { async openFile(file: NoticeOfIntentDocumentDto) { await this.noticeOfIntentDocumentService.download(file.uuid, file.fileName); } + + private setFirstQuestion(noiSubmission: NoticeOfIntentSubmissionDetailedDto) { + switch (noiSubmission.typeCode) { + case 'ROSO': + this.firstQuestion = 'Are you placing fill in order to build a structure?'; + break; + case 'POFO': + this.firstQuestion = 'Are you placing fill in order to build a structure?'; + break; + case 'PFRS': + this.firstQuestion = 'Are you removing soil and placing fill in order to build a structure?'; + break; + } + } } diff --git a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/notice-of-intent-details.component.html b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/notice-of-intent-details.component.html index 7dc46b1a0e..4034ed7785 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/notice-of-intent-details.component.html +++ b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/notice-of-intent-details.component.html @@ -1,9 +1,5 @@
- +

Additional Proposal Information

- + >
Proposal Map / Site Plan
-
+
{{ map.fileName }} @@ -106,14 +106,14 @@

Project Duration

Cross Sections
-
+
{{ file.fileName }}
Reclamation Plan
-
+
{{ file.fileName }} @@ -130,7 +130,7 @@

Project Duration

Notice of Work
-
+
{{ file.fileName }} diff --git a/alcs-frontend/src/app/features/notice-of-intent/notice-of-intent.module.ts b/alcs-frontend/src/app/features/notice-of-intent/notice-of-intent.module.ts index ce6d30256e..c1bd55a57f 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/notice-of-intent.module.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/notice-of-intent.module.ts @@ -2,21 +2,21 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; import { NoticeOfIntentDetailService } from '../../services/notice-of-intent/notice-of-intent-detail.service'; import { SharedModule } from '../../shared/shared.module'; +import { ApplicantInfoComponent } from './applicant-info/applicant-info.component'; +import { NoticeOfIntentDetailsModule } from './applicant-info/notice-of-intent-details/notice-of-intent-details.module'; +import { DecisionDialogComponent } from './decision/decision-dialog/decision-dialog.component'; +import { DecisionComponent } from './decision/decision.component'; import { DocumentUploadDialogComponent } from './documents/document-upload-dialog/document-upload-dialog.component'; import { NoiDocumentsComponent } from './documents/documents.component'; import { InfoRequestDialogComponent } from './info-requests/info-request-dialog/info-request-dialog.component'; import { InfoRequestsComponent } from './info-requests/info-requests.component'; import { NoticeOfIntentMeetingDialogComponent } from './info-requests/notice-of-intent-meeting-dialog/notice-of-intent-meeting-dialog.component'; -import { DecisionDialogComponent } from './decision/decision-dialog/decision-dialog.component'; -import { DecisionComponent } from './decision/decision.component'; import { IntakeComponent } from './intake/intake.component'; import { childRoutes, NoticeOfIntentComponent } from './notice-of-intent.component'; import { OverviewComponent } from './overview/overview.component'; import { EditModificationDialogComponent } from './post-decision/edit-modification-dialog/edit-modification-dialog.component'; import { PostDecisionComponent } from './post-decision/post-decision.component'; import { PreparationComponent } from './preparation/preparation.component'; -import { ApplicantInfoComponent } from './applicant-info/applicant-info.component'; -import { NoticeOfIntentDetailsModule } from './applicant-info/notice-of-intent-details/notice-of-intent-details.module'; const routes: Routes = [ { diff --git a/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts b/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts index 380dd25362..668511eef1 100644 --- a/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts +++ b/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts @@ -48,7 +48,6 @@ describe('NoticeOfIntentSubmissionService', () => { soilIsFollowUp: null, soilFollowUpIDs: null, soilTypeRemoved: null, - soilReduceNegativeImpacts: null, soilToRemoveVolume: null, soilToRemoveArea: null, soilToRemoveMaximumDepth: null, diff --git a/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent.dto.ts b/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent.dto.ts index b1a15ce775..933a4d53d7 100644 --- a/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent.dto.ts +++ b/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent.dto.ts @@ -121,7 +121,6 @@ export interface NoticeOfIntentSubmissionDto { soilIsFollowUp: boolean | null; soilFollowUpIDs: string | null; soilTypeRemoved: string | null; - soilReduceNegativeImpacts: string | null; soilToRemoveVolume: number | null; soilToRemoveArea: number | null; soilToRemoveMaximumDepth: number | null; @@ -141,7 +140,6 @@ export interface NoticeOfIntentSubmissionDto { soilProjectDurationAmount: number | null; soilProjectDurationUnit?: string | null; soilFillTypeToPlace?: string | null; - soilAlternativeMeasures?: string | null; soilIsExtractionOrMining?: boolean; soilHasSubmittedNotice?: boolean; soilIsRemovingSoilForNewStructure: boolean | null; @@ -173,7 +171,6 @@ export interface NoticeOfIntentSubmissionDetailedDto extends NoticeOfIntentSubmi soilIsFollowUp: boolean | null; soilFollowUpIDs: string | null; soilTypeRemoved: string | null; - soilReduceNegativeImpacts: string | null; soilToRemoveVolume: number | null; soilToRemoveArea: number | null; soilToRemoveMaximumDepth: number | null; @@ -193,7 +190,6 @@ export interface NoticeOfIntentSubmissionDetailedDto extends NoticeOfIntentSubmi soilProjectDurationAmount: number | null; soilProjectDurationUnit?: string | null; soilFillTypeToPlace?: string | null; - soilAlternativeMeasures?: string | null; soilIsExtractionOrMining?: boolean; soilHasSubmittedNotice?: boolean; soilIsRemovingSoilForNewStructure: boolean | null; @@ -225,7 +221,6 @@ export interface NoticeOfIntentSubmissionUpdateDto { soilIsFollowUp?: boolean | null; soilFollowUpIDs?: string | null; soilTypeRemoved?: string | null; - soilReduceNegativeImpacts?: string | null; soilToRemoveVolume?: number | null; soilToRemoveArea?: number | null; soilToRemoveMaximumDepth?: number | null; @@ -245,7 +240,6 @@ export interface NoticeOfIntentSubmissionUpdateDto { soilProjectDurationAmount?: number | null; soilProjectDurationUnit?: string | null; soilFillTypeToPlace?: string | null; - soilAlternativeMeasures?: string | null; soilIsExtractionOrMining?: boolean | null; soilHasSubmittedNotice?: boolean | null; soilIsRemovingSoilForNewStructure?: boolean | null; diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/review-and-submit/review-and-submit.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/review-and-submit/review-and-submit.component.ts index 73b9b2c006..7c758da6e2 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/review-and-submit/review-and-submit.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/review-and-submit/review-and-submit.component.ts @@ -3,7 +3,6 @@ import { Router } from '@angular/router'; import { BehaviorSubject, takeUntil } from 'rxjs'; import { NoticeOfIntentDocumentDto } from '../../../../services/notice-of-intent-document/notice-of-intent-document.dto'; import { NoticeOfIntentSubmissionDetailedDto } from '../../../../services/notice-of-intent-submission/notice-of-intent-submission.dto'; -import { NoticeOfIntentSubmissionService } from '../../../../services/notice-of-intent-submission/notice-of-intent-submission.service'; import { PdfGenerationService } from '../../../../services/pdf-generation/pdf-generation.service'; import { ToastService } from '../../../../services/toast/toast.service'; import { StepComponent } from '../step.partial'; @@ -24,7 +23,6 @@ export class ReviewAndSubmitComponent extends StepComponent implements OnInit, O constructor( private router: Router, private toastService: ToastService, - private applicationService: NoticeOfIntentSubmissionService, private pdfGenerationService: PdfGenerationService ) { super(); diff --git a/portal-frontend/src/app/services/notice-of-intent-submission/notice-of-intent-submission.dto.ts b/portal-frontend/src/app/services/notice-of-intent-submission/notice-of-intent-submission.dto.ts index df15079ede..8878d1c425 100644 --- a/portal-frontend/src/app/services/notice-of-intent-submission/notice-of-intent-submission.dto.ts +++ b/portal-frontend/src/app/services/notice-of-intent-submission/notice-of-intent-submission.dto.ts @@ -60,7 +60,6 @@ export interface NoticeOfIntentSubmissionDetailedDto extends NoticeOfIntentSubmi soilIsFollowUp: boolean | null; soilFollowUpIDs: string | null; soilTypeRemoved: string | null; - soilReduceNegativeImpacts: string | null; soilToRemoveVolume: number | null; soilToRemoveArea: number | null; soilToRemoveMaximumDepth: number | null; @@ -80,7 +79,6 @@ export interface NoticeOfIntentSubmissionDetailedDto extends NoticeOfIntentSubmi soilProjectDurationAmount: number | null; soilProjectDurationUnit: string | null; soilFillTypeToPlace: string | null; - soilAlternativeMeasures: string | null; soilIsExtractionOrMining: boolean | null; soilIsAreaWideFilling: boolean | null; soilHasSubmittedNotice: boolean | null; @@ -113,7 +111,6 @@ export interface NoticeOfIntentSubmissionUpdateDto { soilIsFollowUp?: boolean | null; soilFollowUpIDs?: string | null; soilTypeRemoved?: string | null; - soilReduceNegativeImpacts?: string | null; soilToRemoveVolume?: number | null; soilToRemoveArea?: number | null; soilToRemoveMaximumDepth?: number | null; @@ -133,7 +130,6 @@ export interface NoticeOfIntentSubmissionUpdateDto { soilProjectDurationAmount?: number | null; soilProjectDurationUnit?: string | null; soilFillTypeToPlace?: string | null; - soilAlternativeMeasures?: string | null; soilIsExtractionOrMining?: boolean | null; soilIsAreaWideFilling?: boolean | null; soilHasSubmittedNotice?: boolean | null; diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission-validator.service.spec.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission-validator.service.spec.ts index ee38a790eb..2134822760 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission-validator.service.spec.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission-validator.service.spec.ts @@ -5,16 +5,16 @@ import { LocalGovernment } from '../../alcs/local-government/local-government.en import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; import { NoticeOfIntentDocument } from '../../alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.entity'; import { NoticeOfIntentDocumentService } from '../../alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.service'; +import { + OwnerType, + OWNER_TYPE, +} from '../../common/owner-type/owner-type.entity'; import { DocumentCode, DOCUMENT_TYPE, } from '../../document/document-code.entity'; import { DOCUMENT_SOURCE } from '../../document/document.dto'; import { Document } from '../../document/document.entity'; -import { - OWNER_TYPE, - OwnerType, -} from '../../common/owner-type/owner-type.entity'; import { NoticeOfIntentOwner } from './notice-of-intent-owner/notice-of-intent-owner.entity'; import { NoticeOfIntentParcel } from './notice-of-intent-parcel/notice-of-intent-parcel.entity'; import { NoticeOfIntentParcelService } from './notice-of-intent-parcel/notice-of-intent-parcel.service'; @@ -719,7 +719,6 @@ describe('NoticeOfIntentSubmissionValidatorService', () => { const noticeOfIntentSubmission = new NoticeOfIntentSubmission({ owners: [], soilProposedStructures: [], - soilReduceNegativeImpacts: 'soilReduceNegativeImpacts', soilIsFollowUp: false, soilAlreadyRemovedVolume: 5, soilAlreadyRemovedMaximumDepth: 5, @@ -813,224 +812,230 @@ describe('NoticeOfIntentSubmissionValidatorService', () => { }); }); - // describe('POFO Applications', () => { - // it('should not have errors when base information is filled correctly', async () => { - // const application = new NoticeOfIntentSubmission({ - // owners: [], - // soilReduceNegativeImpacts: 'soilReduceNegativeImpacts', - // soilIsFollowUp: false, - // soilAlreadyPlacedVolume: 5, - // soilAlreadyPlacedMaximumDepth: 5, - // soilToPlaceMaximumDepth: 5, - // soilAlreadyPlacedAverageDepth: 5, - // soilAlreadyPlacedArea: 5, - // soilToPlaceAverageDepth: 5, - // soilToPlaceVolume: 5, - // soilToPlaceArea: 5, - // soilAlternativeMeasures: 'soilAlternativeMeasures', - // soilFillTypeToPlace: 'soilFillTypeToPlace', - // typeCode: 'POFO', - // }); - // - // const res = await service.validateSubmission(application); - // - // expect( - // includesError(res.errors, new Error(`POFO Proposal incomplete`)), - // ).toBe(false); - // - // expect( - // includesError(res.errors, new Error(`POFO Soil Table Incomplete`)), - // ).toBe(false); - // }); - // - // it('should report errors when information is missing', async () => { - // const application = new NoticeOfIntentSubmission({ - // owners: [], - // soilFillTypeToPlace: null, - // soilReduceNegativeImpacts: 'soilReduceNegativeImpacts', - // soilToPlaceArea: null, - // typeCode: 'POFO', - // }); - // - // const res = await service.validateSubmission(application); - // - // expect( - // includesError(res.errors, new Error(`POFO Proposal incomplete`)), - // ).toBe(true); - // - // expect( - // includesError(res.errors, new Error(`POFO Soil Table Incomplete`)), - // ).toBe(true); - // }); - // - // it('should require NOI IDs or ApplicationIDs', async () => { - // const application = new NoticeOfIntentSubmission({ - // owners: [], - // soilIsFollowUp: true, - // typeCode: 'POFO', - // }); - // - // const res = await service.validateSubmission(application); - // - // expect( - // includesError( - // res.errors, - // new Error(`POFO Proposal missing Application or NOI IDs`), - // ), - // ).toBe(true); - // }); - // - // it('should complain about missing files', async () => { - // const application = new NoticeOfIntentSubmission({ - // owners: [], - // soilIsFollowUp: true, - // typeCode: 'POFO', - // }); - // - // const res = await service.validateSubmission(application); - // - // expect( - // includesError( - // res.errors, - // new Error(`POFO proposal missing Proposal Map / Site Plan`), - // ), - // ).toBe(true); - // - // expect( - // includesError( - // res.errors, - // new Error(`POFO proposal missing Cross Section Diagrams`), - // ), - // ).toBe(true); - // - // expect( - // includesError( - // res.errors, - // new Error(`POFO proposal missing Reclamation Plans`), - // ), - // ).toBe(true); - // }); - // }); - // - // describe('PFRS Applications', () => { - // it('should not have errors when base information is filled correctly', async () => { - // const application = new NoticeOfIntentSubmission({ - // owners: [], - // purpose: 'purpose', - // soilReduceNegativeImpacts: 'soilReduceNegativeImpacts', - // soilIsFollowUp: false, - // soilAlreadyPlacedVolume: 5, - // soilAlreadyPlacedMaximumDepth: 5, - // soilToPlaceMaximumDepth: 5, - // soilAlreadyPlacedAverageDepth: 5, - // soilAlreadyPlacedArea: 5, - // soilToPlaceAverageDepth: 5, - // soilToPlaceVolume: 5, - // soilToPlaceArea: 5, - // soilAlternativeMeasures: 'soilAlternativeMeasures', - // soilFillTypeToPlace: 'soilFillTypeToPlace', - // typeCode: 'PFRS', - // }); - // - // const res = await service.validateSubmission(application); - // - // expect( - // includesError(res.errors, new Error(`PFRS Proposal incomplete`)), - // ).toBe(false); - // - // expect( - // includesError(res.errors, new Error(`PFRS Soil Table Incomplete`)), - // ).toBe(false); - // }); - // - // it('should report errors when information is missing', async () => { - // const application = new NoticeOfIntentSubmission({ - // owners: [], - // purpose: 'purpose', - // soilFillTypeToPlace: null, - // soilReduceNegativeImpacts: 'soilReduceNegativeImpacts', - // soilToPlaceArea: null, - // typeCode: 'PFRS', - // }); - // - // const res = await service.validateSubmission(application); - // - // expect( - // includesError(res.errors, new Error(`PFRS Proposal incomplete`)), - // ).toBe(true); - // - // expect( - // includesError(res.errors, new Error(`PFRS Soil Table Incomplete`)), - // ).toBe(true); - // }); - // - // it('should require NOI IDs or ApplicationIDs', async () => { - // const application = new NoticeOfIntentSubmission({ - // owners: [], - // soilIsFollowUp: true, - // typeCode: 'PFRS', - // }); - // - // const res = await service.validateSubmission(application); - // - // expect( - // includesError( - // res.errors, - // new Error(`PFRS Proposal missing Application or NOI IDs`), - // ), - // ).toBe(true); - // }); - // - // it('should complain about missing files', async () => { - // const application = new NoticeOfIntentSubmission({ - // owners: [], - // soilIsFollowUp: true, - // typeCode: 'PFRS', - // }); - // - // const res = await service.validateSubmission(application); - // - // expect( - // includesError( - // res.errors, - // new Error(`PFRS proposal missing Proposal Map / Site Plan`), - // ), - // ).toBe(true); - // - // expect( - // includesError( - // res.errors, - // new Error(`PFRS proposal missing Cross Section Diagrams`), - // ), - // ).toBe(true); - // - // expect( - // includesError( - // res.errors, - // new Error(`PFRS proposal missing Reclamation Plans`), - // ), - // ).toBe(true); - // }); - // - // it('should require a notice of work for both mining and notice true', async () => { - // const application = new NoticeOfIntentSubmission({ - // owners: [], - // soilIsFollowUp: true, - // soilIsExtractionOrMining: true, - // soilHasSubmittedNotice: true, - // typeCode: 'PFRS', - // }); - // - // const res = await service.validateSubmission(application); - // - // expect( - // includesError( - // res.errors, - // new Error( - // `PFRS proposal has yes to notice of work but is not attached`, - // ), - // ), - // ).toBe(true); - // }); - // }); + describe('POFO Notice of Intents', () => { + it('should not have errors when base information is filled correctly', async () => { + const noticeOfIntentSubmission = new NoticeOfIntentSubmission({ + owners: [], + soilProposedStructures: [], + soilIsFollowUp: false, + soilAlreadyPlacedVolume: 5, + soilAlreadyPlacedMaximumDepth: 5, + soilToPlaceMaximumDepth: 5, + soilAlreadyPlacedAverageDepth: 5, + soilAlreadyPlacedArea: 5, + soilToPlaceAverageDepth: 5, + soilToPlaceVolume: 5, + soilToPlaceArea: 5, + soilFillTypeToPlace: 'soilFillTypeToPlace', + typeCode: 'POFO', + }); + + const res = await service.validateSubmission(noticeOfIntentSubmission); + + expect( + includesError(res.errors, new Error(`POFO Proposal incomplete`)), + ).toBe(false); + + expect( + includesError(res.errors, new Error(`POFO Soil Table Incomplete`)), + ).toBe(false); + }); + + it('should report errors when information is missing', async () => { + const application = new NoticeOfIntentSubmission({ + owners: [], + soilIsFollowUp: true, + soilFillTypeToPlace: null, + soilToPlaceArea: null, + typeCode: 'POFO', + soilProposedStructures: [], + }); + + const res = await service.validateSubmission(application); + + expect( + includesError(res.errors, new Error(`POFO proposal incomplete`)), + ).toBe(true); + + expect( + includesError(res.errors, new Error(`POFO Soil Table Incomplete`)), + ).toBe(true); + }); + + it('should require NOI IDs or ApplicationIDs', async () => { + const application = new NoticeOfIntentSubmission({ + owners: [], + soilIsFollowUp: true, + typeCode: 'POFO', + soilProposedStructures: [], + }); + + const res = await service.validateSubmission(application); + + expect( + includesError( + res.errors, + new Error(`POFO proposal missing Application or NOI IDs`), + ), + ).toBe(true); + }); + + it('should complain about missing files', async () => { + const application = new NoticeOfIntentSubmission({ + owners: [], + soilIsFollowUp: true, + typeCode: 'POFO', + soilProposedStructures: [], + soilIsExtractionOrMining: true, + }); + + const res = await service.validateSubmission(application); + + expect( + includesError( + res.errors, + new Error(`POFO proposal missing Proposal Map / Site Plan`), + ), + ).toBe(true); + + expect( + includesError( + res.errors, + new Error(`POFO proposal missing Cross Section Diagrams`), + ), + ).toBe(true); + + expect( + includesError( + res.errors, + new Error(`POFO proposal missing Reclamation Plans`), + ), + ).toBe(true); + }); + }); + + describe('PFRS Applications', () => { + it('should not have errors when base information is filled correctly', async () => { + const application = new NoticeOfIntentSubmission({ + owners: [], + soilProposedStructures: [], + purpose: 'purpose', + soilIsFollowUp: false, + soilAlreadyPlacedVolume: 5, + soilAlreadyPlacedMaximumDepth: 5, + soilToPlaceMaximumDepth: 5, + soilAlreadyPlacedAverageDepth: 5, + soilAlreadyPlacedArea: 5, + soilToPlaceAverageDepth: 5, + soilToPlaceVolume: 5, + soilToPlaceArea: 5, + soilFillTypeToPlace: 'soilFillTypeToPlace', + typeCode: 'PFRS', + }); + + const res = await service.validateSubmission(application); + + expect( + includesError(res.errors, new Error(`PFRS proposal incomplete`)), + ).toBe(false); + + expect( + includesError(res.errors, new Error(`PFRS Soil Table Incomplete`)), + ).toBe(false); + }); + + it('should report errors when information is missing', async () => { + const application = new NoticeOfIntentSubmission({ + owners: [], + purpose: 'purpose', + soilFillTypeToPlace: null, + soilToPlaceArea: null, + typeCode: 'PFRS', + soilProposedStructures: [], + }); + + const res = await service.validateSubmission(application); + + expect( + includesError(res.errors, new Error(`PFRS proposal incomplete`)), + ).toBe(true); + + expect( + includesError(res.errors, new Error(`PFRS Soil Table Incomplete`)), + ).toBe(true); + }); + + it('should require NOI IDs or ApplicationIDs', async () => { + const application = new NoticeOfIntentSubmission({ + owners: [], + soilIsFollowUp: true, + typeCode: 'PFRS', + soilProposedStructures: [], + }); + + const res = await service.validateSubmission(application); + + expect( + includesError( + res.errors, + new Error(`PFRS proposal missing Application or NOI IDs`), + ), + ).toBe(true); + }); + + it('should complain about missing files', async () => { + const application = new NoticeOfIntentSubmission({ + owners: [], + soilIsFollowUp: true, + typeCode: 'PFRS', + soilProposedStructures: [], + soilIsExtractionOrMining: true, + }); + + const res = await service.validateSubmission(application); + + expect( + includesError( + res.errors, + new Error(`PFRS proposal missing Proposal Map / Site Plan`), + ), + ).toBe(true); + + expect( + includesError( + res.errors, + new Error(`PFRS proposal missing Cross Section Diagrams`), + ), + ).toBe(true); + + expect( + includesError( + res.errors, + new Error(`PFRS proposal missing Reclamation Plans`), + ), + ).toBe(true); + }); + + it('should require a notice of work for both mining and notice true', async () => { + const application = new NoticeOfIntentSubmission({ + owners: [], + soilIsFollowUp: true, + soilIsExtractionOrMining: true, + soilHasSubmittedNotice: true, + typeCode: 'PFRS', + soilProposedStructures: [], + }); + + const res = await service.validateSubmission(application); + + expect( + includesError( + res.errors, + new Error( + `PFRS proposal has yes to notice of work but is not attached`, + ), + ), + ).toBe(true); + }); + }); }); diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission-validator.service.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission-validator.service.ts index d2d59990bb..fcec84e1f5 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission-validator.service.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission-validator.service.ts @@ -392,11 +392,7 @@ export class NoticeOfIntentSubmissionValidatorService { applicantDocuments: NoticeOfIntentDocument[], errors: Error[], ) { - if ( - noticeOfIntentSubmission.soilFillTypeToPlace === null || - noticeOfIntentSubmission.soilAlternativeMeasures === null || - noticeOfIntentSubmission.soilReduceNegativeImpacts === null - ) { + if (noticeOfIntentSubmission.soilFillTypeToPlace === null) { errors.push( new ServiceValidationException( `${noticeOfIntentSubmission.typeCode} proposal incomplete`, @@ -404,12 +400,6 @@ export class NoticeOfIntentSubmissionValidatorService { ); } - this.runSharedSoilValidation( - noticeOfIntentSubmission, - errors, - applicantDocuments, - ); - if ( noticeOfIntentSubmission.soilToPlaceVolume === null || noticeOfIntentSubmission.soilToPlaceArea === null || @@ -426,6 +416,7 @@ export class NoticeOfIntentSubmissionValidatorService { ), ); } + this.runSharedSoilValidation( noticeOfIntentSubmission, errors, @@ -456,6 +447,12 @@ export class NoticeOfIntentSubmissionValidatorService { } } + this.runSharedSoilValidation( + noticeOfIntentSubmission, + errors, + applicantDocuments, + ); + const noticeOfWork = applicantDocuments.filter( (document) => document.typeCode === DOCUMENT_TYPE.NOTICE_OF_WORK, ); diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.dto.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.dto.ts index 61e0cfc61c..7fa6602b62 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.dto.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.dto.ts @@ -86,9 +86,6 @@ export class NoticeOfIntentSubmissionDetailedDto extends NoticeOfIntentSubmissio @AutoMap(() => String) soilTypeRemoved: string | null; - @AutoMap(() => String) - soilReduceNegativeImpacts: string | null; - @AutoMap(() => Number) soilToRemoveVolume: number | null; @@ -146,9 +143,6 @@ export class NoticeOfIntentSubmissionDetailedDto extends NoticeOfIntentSubmissio @AutoMap(() => String) soilFillTypeToPlace?: string | null; - @AutoMap(() => String) - soilAlternativeMeasures?: string | null; - @AutoMap(() => Boolean) soilIsExtractionOrMining?: boolean; @@ -267,11 +261,6 @@ export class NoticeOfIntentSubmissionUpdateDto { @IsOptional() soilTypeRemoved?: string | null; - @IsString() - @MaxLength(MAX_DESCRIPTION_FIELD_LENGTH) - @IsOptional() - soilReduceNegativeImpacts?: string | null; - @IsNumber() @IsOptional() soilToRemoveVolume?: number | null; @@ -348,10 +337,6 @@ export class NoticeOfIntentSubmissionUpdateDto { @IsOptional() soilFillTypeToPlace?: string | null; - @IsString() - @IsOptional() - soilAlternativeMeasures?: string | null; - @IsBoolean() @IsOptional() soilIsExtractionOrMining?: boolean; diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.entity.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.entity.ts index d37048bd35..6bba5fbbb8 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.entity.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.entity.ts @@ -204,10 +204,6 @@ export class NoticeOfIntentSubmission extends Base { @Column({ type: 'text', nullable: true }) soilTypeRemoved: string | null; - @AutoMap(() => String) - @Column({ type: 'text', nullable: true }) - soilReduceNegativeImpacts: string | null; - @AutoMap(() => Number) @Column({ type: 'decimal', @@ -386,10 +382,6 @@ export class NoticeOfIntentSubmission extends Base { @Column({ type: 'text', nullable: true }) soilFillTypeToPlace: string | null; - @AutoMap(() => String) - @Column({ type: 'text', nullable: true }) - soilAlternativeMeasures: string | null; - @AutoMap(() => Boolean) @Column({ type: 'boolean', nullable: true }) soilIsExtractionOrMining: boolean | null; diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts index 776a4827bf..9819f198bf 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts @@ -207,10 +207,6 @@ export class NoticeOfIntentSubmissionService { updateDto.soilTypeRemoved, noticeOfIntentSubmission.soilTypeRemoved, ); - noticeOfIntentSubmission.soilReduceNegativeImpacts = filterUndefined( - updateDto.soilReduceNegativeImpacts, - noticeOfIntentSubmission.soilReduceNegativeImpacts, - ); noticeOfIntentSubmission.soilToRemoveVolume = filterUndefined( updateDto.soilToRemoveVolume, noticeOfIntentSubmission.soilToRemoveVolume, @@ -287,10 +283,6 @@ export class NoticeOfIntentSubmissionService { updateDto.soilFillTypeToPlace, noticeOfIntentSubmission.soilFillTypeToPlace, ); - noticeOfIntentSubmission.soilAlternativeMeasures = filterUndefined( - updateDto.soilAlternativeMeasures, - noticeOfIntentSubmission.soilAlternativeMeasures, - ); noticeOfIntentSubmission.soilIsExtractionOrMining = filterUndefined( updateDto.soilIsExtractionOrMining, diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1692230243959-remove_redundant_pfrs_fields_from_noi.ts b/services/apps/alcs/src/providers/typeorm/migrations/1692230243959-remove_redundant_pfrs_fields_from_noi.ts new file mode 100644 index 0000000000..4fe68df3b2 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1692230243959-remove_redundant_pfrs_fields_from_noi.ts @@ -0,0 +1,25 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class removeRedundantPfrsFieldsFromNoi1692230243959 + implements MigrationInterface +{ + name = 'removeRedundantPfrsFieldsFromNoi1692230243959'; + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" DROP COLUMN "soil_reduce_negative_impacts"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" DROP COLUMN "soil_alternative_measures"`, + ); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" ADD "soil_alternative_measures" text`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" ADD "soil_reduce_negative_impacts" text`, + ); + } +} From cf50d234a7ad1db58497219c62f9b5f2aa754d98 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Thu, 17 Aug 2023 15:52:24 -0700 Subject: [PATCH 266/954] Clean up NOI User Access * Change all to two main functions and remove the extra layers * Update unit tests * Only allow editing of In Progress Applications * Change to just getByFileNumber and getByUuid --- .../edit-submission.component.ts | 10 +- .../notice-of-intent-submission.service.ts | 2 +- .../notice-of-intent-parcel.controller.ts | 23 +- ...tice-of-intent-document.controller.spec.ts | 2 +- .../notice-of-intent-document.controller.ts | 6 +- .../notice-of-intent-owner.controller.spec.ts | 60 +- .../notice-of-intent-owner.controller.ts | 71 ++- .../notice-of-intent-owner.service.spec.ts | 51 +- .../notice-of-intent-owner.service.ts | 40 +- ...notice-of-intent-parcel.controller.spec.ts | 64 +- .../notice-of-intent-parcel.controller.ts | 25 +- .../notice-of-intent-parcel.service.spec.ts | 19 +- .../notice-of-intent-parcel.service.ts | 7 +- ...-of-intent-submission-validator.service.ts | 5 +- ...ce-of-intent-submission.controller.spec.ts | 143 +++-- .../notice-of-intent-submission.controller.ts | 61 +- ...otice-of-intent-submission.service.spec.ts | 120 ++-- .../notice-of-intent-submission.service.ts | 555 ++++++++---------- 18 files changed, 653 insertions(+), 611 deletions(-) diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.ts index 1c2047c5f2..c114c9693f 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.ts @@ -5,7 +5,10 @@ import { ActivatedRoute, Router } from '@angular/router'; import { BehaviorSubject, combineLatest, Observable, of, Subject, takeUntil } from 'rxjs'; import { NoticeOfIntentDocumentDto } from '../../../services/notice-of-intent-document/notice-of-intent-document.dto'; import { NoticeOfIntentDocumentService } from '../../../services/notice-of-intent-document/notice-of-intent-document.service'; -import { NoticeOfIntentSubmissionDetailedDto } from '../../../services/notice-of-intent-submission/notice-of-intent-submission.dto'; +import { + NOI_SUBMISSION_STATUS, + NoticeOfIntentSubmissionDetailedDto, +} from '../../../services/notice-of-intent-submission/notice-of-intent-submission.dto'; import { NoticeOfIntentSubmissionService } from '../../../services/notice-of-intent-submission/notice-of-intent-submission.service'; import { ToastService } from '../../../services/toast/toast.service'; import { CustomStepperComponent } from '../../../shared/custom-stepper/custom-stepper.component'; @@ -233,6 +236,11 @@ export class EditSubmissionComponent implements OnDestroy, AfterViewInit { this.noiSubmission = await this.noticeOfIntentSubmissionService.getByFileId(fileId); this.fileId = fileId; + if (this.noiSubmission?.status.code !== NOI_SUBMISSION_STATUS.IN_PROGRESS) { + this.toastService.showErrorToast('Unable to edit Notice of Intent'); + await this.router.navigateByUrl(`/home`); + } + const documents = await this.noticeOfIntentDocumentService.getByFileId(fileId); if (documents) { this.$noiDocuments.next(documents); diff --git a/portal-frontend/src/app/services/notice-of-intent-submission/notice-of-intent-submission.service.ts b/portal-frontend/src/app/services/notice-of-intent-submission/notice-of-intent-submission.service.ts index d5663b6806..23a81bb717 100644 --- a/portal-frontend/src/app/services/notice-of-intent-submission/notice-of-intent-submission.service.ts +++ b/portal-frontend/src/app/services/notice-of-intent-submission/notice-of-intent-submission.service.ts @@ -35,7 +35,7 @@ export class NoticeOfIntentSubmissionService { async getByFileId(fileId: string) { try { return await firstValueFrom( - this.httpClient.get(`${this.serviceUrl}/application/${fileId}`) + this.httpClient.get(`${this.serviceUrl}/notice-of-intent/${fileId}`) ); } catch (e) { console.error(e); diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-parcel/notice-of-intent-parcel.controller.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-parcel/notice-of-intent-parcel.controller.ts index 58f667084b..763c149158 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-parcel/notice-of-intent-parcel.controller.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-parcel/notice-of-intent-parcel.controller.ts @@ -1,6 +1,6 @@ import { Mapper } from '@automapper/core'; import { InjectMapper } from '@automapper/nestjs'; -import { Body, Controller, Get, Param, Post } from '@nestjs/common'; +import { Body, Controller, Get, Param, Post, Req } from '@nestjs/common'; import { ANY_AUTH_ROLE } from '../../../common/authorization/roles'; import { UserRoles } from '../../../common/authorization/roles.decorator'; import { NoticeOfIntentParcelDto } from '../../../portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.dto'; @@ -30,13 +30,20 @@ export class NoticeOfIntentParcelController { @UserRoles(...ANY_AUTH_ROLE) @Post('/:uuid') - async update(@Param('uuid') uuid: string, @Body() body: { alrArea: number }) { - const parcels = await this.applicationParcelService.update([ - { - uuid, - alrArea: body.alrArea, - }, - ]); + async update( + @Param('uuid') uuid: string, + @Req() req, + @Body() body: { alrArea: number }, + ) { + const parcels = await this.applicationParcelService.update( + [ + { + uuid, + alrArea: body.alrArea, + }, + ], + req.user.entity, + ); return this.mapper.mapArray( parcels, diff --git a/services/apps/alcs/src/portal/notice-of-intent-document/notice-of-intent-document.controller.spec.ts b/services/apps/alcs/src/portal/notice-of-intent-document/notice-of-intent-document.controller.spec.ts index f7c0ffb97c..a606009d2f 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-document/notice-of-intent-document.controller.spec.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-document/notice-of-intent-document.controller.spec.ts @@ -75,7 +75,7 @@ describe('NoticeOfIntentDocumentController', () => { NoticeOfIntentDocumentController, ); - mockNoiSubmissionService.verifyAccessByFileId.mockResolvedValue( + mockNoiSubmissionService.getByFileNumber.mockResolvedValue( new NoticeOfIntentSubmission(), ); mockNoticeOfIntentService.getUuid.mockResolvedValue('uuid'); diff --git a/services/apps/alcs/src/portal/notice-of-intent-document/notice-of-intent-document.controller.ts b/services/apps/alcs/src/portal/notice-of-intent-document/notice-of-intent-document.controller.ts index 97ef994ac7..05dfd9a58d 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-document/notice-of-intent-document.controller.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-document/notice-of-intent-document.controller.ts @@ -47,7 +47,7 @@ export class NoticeOfIntentDocumentController { @Param('documentType') documentType: DOCUMENT_TYPE | null, @Req() req, ): Promise { - await this.noticeOfIntentSubmissionService.verifyAccessByFileId( + await this.noticeOfIntentSubmissionService.getByFileNumber( fileNumber, req.user.entity, ); @@ -79,7 +79,7 @@ export class NoticeOfIntentDocumentController { @Req() req, @Body() body: PortalNoticeOfIntentDocumentUpdateDto[], ) { - await this.noticeOfIntentSubmissionService.verifyAccessByFileId( + await this.noticeOfIntentSubmissionService.getByFileNumber( fileNumber, req.user.entity, ); @@ -129,7 +129,7 @@ export class NoticeOfIntentDocumentController { @Req() req, ): Promise { const submission = - await this.noticeOfIntentSubmissionService.verifyAccessByFileId( + await this.noticeOfIntentSubmissionService.getByFileNumber( fileNumber, req.user.entity, ); diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.controller.spec.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.controller.spec.ts index ee57a26100..6f733202c4 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.controller.spec.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.controller.spec.ts @@ -78,7 +78,7 @@ describe('NoticeOfIntentOwnerController', () => { firstName: 'Bruce', lastName: 'Wayne', }); - mockNOISubmissionService.verifyAccessByUuid.mockResolvedValue( + mockNOISubmissionService.getByUuid.mockResolvedValue( new NoticeOfIntentSubmission({ owners: [owner], }), @@ -92,9 +92,7 @@ describe('NoticeOfIntentOwnerController', () => { expect(owners.length).toEqual(1); expect(owners[0].displayName).toBe('Bruce Wayne'); - expect(mockNOISubmissionService.verifyAccessByUuid).toHaveBeenCalledTimes( - 1, - ); + expect(mockNOISubmissionService.getByUuid).toHaveBeenCalledTimes(1); }); it('should verify the dto and file access then create', async () => { @@ -102,7 +100,7 @@ describe('NoticeOfIntentOwnerController', () => { firstName: 'Bruce', lastName: 'Wayne', }); - mockNOISubmissionService.verifyAccessByUuid.mockResolvedValue( + mockNOISubmissionService.getByUuid.mockResolvedValue( new NoticeOfIntentSubmission(), ); mockOwnerService.create.mockResolvedValue(owner); @@ -124,9 +122,7 @@ describe('NoticeOfIntentOwnerController', () => { ); expect(createdOwner).toBeDefined(); - expect(mockNOISubmissionService.verifyAccessByUuid).toHaveBeenCalledTimes( - 1, - ); + expect(mockNOISubmissionService.getByUuid).toHaveBeenCalledTimes(1); expect(mockOwnerService.create).toHaveBeenCalledTimes(1); }); @@ -171,10 +167,6 @@ describe('NoticeOfIntentOwnerController', () => { it('should call through for update', async () => { mockOwnerService.update.mockResolvedValue(new NoticeOfIntentOwner()); - mockOwnerService.getOwner.mockResolvedValue(new NoticeOfIntentOwner()); - mockNOISubmissionService.verifyAccessByUuid.mockResolvedValue( - new NoticeOfIntentSubmission(), - ); const res = await controller.update( '', @@ -192,16 +184,12 @@ describe('NoticeOfIntentOwnerController', () => { ); expect(mockOwnerService.update).toHaveBeenCalledTimes(1); - expect(mockNOISubmissionService.verifyAccessByUuid).toHaveBeenCalledTimes( - 1, - ); - expect(mockOwnerService.getOwner).toHaveBeenCalledTimes(1); }); it('should call through for delete', async () => { mockOwnerService.delete.mockResolvedValue({} as any); mockOwnerService.getOwner.mockResolvedValue(new NoticeOfIntentOwner()); - mockNOISubmissionService.verifyAccessByUuid.mockResolvedValue( + mockNOISubmissionService.getByUuid.mockResolvedValue( new NoticeOfIntentSubmission(), ); @@ -211,19 +199,13 @@ describe('NoticeOfIntentOwnerController', () => { }, }); - expect(mockNOISubmissionService.verifyAccessByUuid).toHaveBeenCalledTimes( - 1, - ); + expect(mockNOISubmissionService.getByUuid).toHaveBeenCalledTimes(1); expect(mockOwnerService.delete).toHaveBeenCalledTimes(1); expect(mockOwnerService.getOwner).toHaveBeenCalledTimes(1); }); it('should call through for attachToParcel', async () => { mockOwnerService.attachToParcel.mockResolvedValue({} as any); - mockOwnerService.getOwner.mockResolvedValue(new NoticeOfIntentOwner()); - mockNOISubmissionService.verifyAccessByUuid.mockResolvedValue( - new NoticeOfIntentSubmission(), - ); await controller.linkToParcel('', '', { user: { @@ -231,19 +213,11 @@ describe('NoticeOfIntentOwnerController', () => { }, }); - expect(mockNOISubmissionService.verifyAccessByUuid).toHaveBeenCalledTimes( - 1, - ); expect(mockOwnerService.attachToParcel).toHaveBeenCalledTimes(1); - expect(mockOwnerService.getOwner).toHaveBeenCalledTimes(1); }); it('should call through for removeFromParcel', async () => { mockOwnerService.removeFromParcel.mockResolvedValue({} as any); - mockOwnerService.getOwner.mockResolvedValue(new NoticeOfIntentOwner()); - mockNOISubmissionService.verifyAccessByUuid.mockResolvedValue( - new NoticeOfIntentSubmission(), - ); await controller.removeFromParcel('', '', { user: { @@ -251,18 +225,14 @@ describe('NoticeOfIntentOwnerController', () => { }, }); - expect(mockNOISubmissionService.verifyAccessByUuid).toHaveBeenCalledTimes( - 1, - ); expect(mockOwnerService.removeFromParcel).toHaveBeenCalledTimes(1); - expect(mockOwnerService.getOwner).toHaveBeenCalledTimes(1); }); it('should create a new owner when setting primary contact to third party agent that doesnt exist', async () => { mockOwnerService.deleteNonParcelOwners.mockResolvedValue([]); mockOwnerService.create.mockResolvedValue(new NoticeOfIntentOwner()); mockOwnerService.setPrimaryContact.mockResolvedValue(); - mockNOISubmissionService.verifyAccessByUuid.mockResolvedValue( + mockNOISubmissionService.getByUuid.mockResolvedValue( new NoticeOfIntentSubmission(), ); @@ -278,9 +248,7 @@ describe('NoticeOfIntentOwnerController', () => { expect(mockOwnerService.deleteNonParcelOwners).toHaveBeenCalledTimes(1); expect(mockOwnerService.create).toHaveBeenCalledTimes(1); expect(mockOwnerService.setPrimaryContact).toHaveBeenCalledTimes(1); - expect(mockNOISubmissionService.verifyAccessByUuid).toHaveBeenCalledTimes( - 1, - ); + expect(mockNOISubmissionService.getByUuid).toHaveBeenCalledTimes(1); }); it('should set the owner and delete agents when using a non-agent owner', async () => { @@ -293,7 +261,7 @@ describe('NoticeOfIntentOwnerController', () => { ); mockOwnerService.setPrimaryContact.mockResolvedValue(); mockOwnerService.deleteNonParcelOwners.mockResolvedValue({} as any); - mockNOISubmissionService.verifyAccessByUuid.mockResolvedValue( + mockNOISubmissionService.getByUuid.mockResolvedValue( new NoticeOfIntentSubmission(), ); @@ -307,9 +275,7 @@ describe('NoticeOfIntentOwnerController', () => { ); expect(mockOwnerService.setPrimaryContact).toHaveBeenCalledTimes(1); - expect(mockNOISubmissionService.verifyAccessByUuid).toHaveBeenCalledTimes( - 1, - ); + expect(mockNOISubmissionService.getByUuid).toHaveBeenCalledTimes(1); expect(mockOwnerService.deleteNonParcelOwners).toHaveBeenCalledTimes(1); }); @@ -323,7 +289,7 @@ describe('NoticeOfIntentOwnerController', () => { ); mockOwnerService.update.mockResolvedValue(new NoticeOfIntentOwner()); mockOwnerService.setPrimaryContact.mockResolvedValue(); - mockNOISubmissionService.verifyAccessByUuid.mockResolvedValue( + mockNOISubmissionService.getByUuid.mockResolvedValue( new NoticeOfIntentSubmission(), ); @@ -337,9 +303,7 @@ describe('NoticeOfIntentOwnerController', () => { ); expect(mockOwnerService.setPrimaryContact).toHaveBeenCalledTimes(1); - expect(mockNOISubmissionService.verifyAccessByUuid).toHaveBeenCalledTimes( - 1, - ); + expect(mockNOISubmissionService.getByUuid).toHaveBeenCalledTimes(1); expect(mockOwnerService.update).toHaveBeenCalledTimes(1); }); }); diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.controller.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.controller.ts index 981c11489f..ed651d0bd1 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.controller.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.controller.ts @@ -50,7 +50,7 @@ export class NoticeOfIntentOwnerController { @Req() req, ): Promise { const noticeOfIntentSubmission = - await this.noticeOfIntentSubmissionService.verifyAccessByUuid( + await this.noticeOfIntentSubmissionService.getByUuid( submissionUuid, req.user.entity, ); @@ -69,12 +69,15 @@ export class NoticeOfIntentOwnerController { ): Promise { this.verifyDto(createDto); - const application = - await this.noticeOfIntentSubmissionService.verifyAccessByUuid( + const noticeOfIntentSubmission = + await this.noticeOfIntentSubmissionService.getByUuid( createDto.noticeOfIntentSubmissionUuid, req.user.entity, ); - const owner = await this.ownerService.create(createDto, application); + const owner = await this.ownerService.create( + createDto, + noticeOfIntentSubmission, + ); return this.mapper.mapAsync( owner, @@ -89,10 +92,13 @@ export class NoticeOfIntentOwnerController { @Body() updateDto: NoticeOfIntentOwnerUpdateDto, @Req() req, ) { - await this.verifyAccessAndGetOwner(req, uuid); this.verifyDto(updateDto); - const newParcel = await this.ownerService.update(uuid, updateDto); + const newParcel = await this.ownerService.update( + uuid, + updateDto, + req.user.entity, + ); return this.mapper.mapAsync( newParcel, @@ -107,7 +113,7 @@ export class NoticeOfIntentOwnerController { if (owner.corporateSummary) { await this.noticeOfIntentDocumentService.delete(owner.corporateSummary); } - await this.ownerService.delete(owner); + await this.ownerService.delete(owner, req.user.entity); return { uuid }; } @@ -117,9 +123,13 @@ export class NoticeOfIntentOwnerController { @Param('parcelUuid') parcelUuid: string, @Req() req, ) { - await this.verifyAccessAndGetOwner(req, uuid); - - return { uuid: await this.ownerService.attachToParcel(uuid, parcelUuid) }; + return { + uuid: await this.ownerService.attachToParcel( + uuid, + parcelUuid, + req.user.entity, + ), + }; } @Post('/:uuid/unlink/:parcelUuid') @@ -128,9 +138,13 @@ export class NoticeOfIntentOwnerController { @Param('parcelUuid') parcelUuid: string, @Req() req, ) { - await this.verifyAccessAndGetOwner(req, uuid); - - return { uuid: await this.ownerService.removeFromParcel(uuid, parcelUuid) }; + return { + uuid: await this.ownerService.removeFromParcel( + uuid, + parcelUuid, + req.user.entity, + ), + }; } private verifyDto( @@ -154,10 +168,11 @@ export class NoticeOfIntentOwnerController { @Post('setPrimaryContact') async setPrimaryContact(@Body() data: SetPrimaryContactDto, @Req() req) { + const user = req.user.entity; const applicationSubmission = - await this.noticeOfIntentSubmissionService.verifyAccessByUuid( + await this.noticeOfIntentSubmissionService.getByUuid( data.noticeOfIntentSubmissionUuid, - req.user.entity, + user, ); //Create Owner @@ -178,6 +193,7 @@ export class NoticeOfIntentOwnerController { await this.ownerService.setPrimaryContact( applicationSubmission.uuid, newOwner, + user, ); } else if (data.ownerUuid) { const primaryContactOwner = await this.ownerService.getOwner( @@ -189,14 +205,18 @@ export class NoticeOfIntentOwnerController { primaryContactOwner.type.code === OWNER_TYPE.GOVERNMENT ) { //Update Fields for non parcel owners - await this.ownerService.update(primaryContactOwner.uuid, { - email: data.email, - typeCode: primaryContactOwner.type.code, - lastName: data.lastName, - firstName: data.firstName, - phoneNumber: data.phoneNumber, - organizationName: data.organization, - }); + await this.ownerService.update( + primaryContactOwner.uuid, + { + email: data.email, + typeCode: primaryContactOwner.type.code, + lastName: data.lastName, + firstName: data.firstName, + phoneNumber: data.phoneNumber, + organizationName: data.organization, + }, + user, + ); } else { //Delete Non parcel owners if we aren't using one await this.ownerService.deleteNonParcelOwners( @@ -207,13 +227,14 @@ export class NoticeOfIntentOwnerController { await this.ownerService.setPrimaryContact( applicationSubmission.uuid, primaryContactOwner, + user, ); } } private async verifyAccessAndGetOwner(@Req() req, ownerUuid: string) { const owner = await this.ownerService.getOwner(ownerUuid); - await this.noticeOfIntentSubmissionService.verifyAccessByUuid( + await this.noticeOfIntentSubmissionService.getByUuid( owner.noticeOfIntentSubmissionUuid, req.user.entity, ); @@ -226,7 +247,7 @@ export class NoticeOfIntentOwnerController { @Req() req, @Body() data: AttachCorporateSummaryDto, ) { - await this.noticeOfIntentSubmissionService.verifyAccessByFileId( + await this.noticeOfIntentSubmissionService.getByFileNumber( data.fileNumber, req.user.entity, ); diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.service.spec.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.service.spec.ts index 61e18dcd34..1d3754d0bc 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.service.spec.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.service.spec.ts @@ -6,6 +6,7 @@ import { NoticeOfIntentDocument } from '../../../alcs/notice-of-intent/notice-of import { NoticeOfIntentDocumentService } from '../../../alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.service'; import { NoticeOfIntentService } from '../../../alcs/notice-of-intent/notice-of-intent.service'; import { OwnerType } from '../../../common/owner-type/owner-type.entity'; +import { User } from '../../../user/user.entity'; import { NoticeOfIntentParcel } from '../notice-of-intent-parcel/notice-of-intent-parcel.entity'; import { NoticeOfIntentParcelService } from '../notice-of-intent-parcel/notice-of-intent-parcel.service'; import { NoticeOfIntentSubmission } from '../notice-of-intent-submission.entity'; @@ -116,7 +117,7 @@ describe('NoticeOfIntentOwnerService', () => { new NoticeOfIntentParcel(), ); - await service.attachToParcel('', ''); + await service.attachToParcel('', '', new User()); expect(owner.parcels.length).toEqual(1); expect(mockRepo.findOneOrFail).toHaveBeenCalledTimes(1); @@ -136,7 +137,7 @@ describe('NoticeOfIntentOwnerService', () => { mockRepo.findOneOrFail.mockResolvedValue(owner); mockRepo.save.mockResolvedValue(new NoticeOfIntentOwner()); - await service.removeFromParcel('', parcelUuid); + await service.removeFromParcel('', parcelUuid, new User()); expect(owner.parcels.length).toEqual(0); expect(mockRepo.findOneOrFail).toHaveBeenCalledTimes(1); @@ -151,13 +152,17 @@ describe('NoticeOfIntentOwnerService', () => { mockRepo.findOneOrFail.mockResolvedValue(owner); mockRepo.save.mockResolvedValue(new NoticeOfIntentOwner()); - await service.update('', { - firstName: 'I Am', - lastName: 'Batman', - email: '', - phoneNumber: '', - typeCode: '', - }); + await service.update( + '', + { + firstName: 'I Am', + lastName: 'Batman', + email: '', + phoneNumber: '', + typeCode: '', + }, + new User(), + ); expect(owner.firstName).toEqual('I Am'); expect(owner.lastName).toEqual('Batman'); @@ -176,13 +181,17 @@ describe('NoticeOfIntentOwnerService', () => { mockRepo.save.mockResolvedValue(new NoticeOfIntentOwner()); mockAppDocumentService.delete.mockResolvedValue({} as any); - await service.update('', { - organizationName: '', - email: '', - phoneNumber: '', - typeCode: '', - corporateSummaryUuid: 'newUuid', - }); + await service.update( + '', + { + organizationName: '', + email: '', + phoneNumber: '', + typeCode: '', + corporateSummaryUuid: 'newUuid', + }, + new User(), + ); expect(owner.corporateSummaryUuid).toEqual('newUuid'); expect(mockAppDocumentService.delete).toHaveBeenCalledTimes(1); @@ -193,7 +202,7 @@ describe('NoticeOfIntentOwnerService', () => { it('should call through for delete', async () => { mockRepo.remove.mockResolvedValue({} as any); - await service.delete(new NoticeOfIntentOwner()); + await service.delete(new NoticeOfIntentOwner(), new User()); expect(mockRepo.remove).toHaveBeenCalledTimes(1); }); @@ -236,7 +245,7 @@ describe('NoticeOfIntentOwnerService', () => { }), ]); - await service.updateSubmissionApplicant(''); + await service.updateSubmissionApplicant('', new User()); expect(mockNoiSubmissionService.update).toHaveBeenCalledTimes(1); expect(mockNoiSubmissionService.update.mock.calls[0][1].applicant).toEqual( @@ -272,7 +281,7 @@ describe('NoticeOfIntentOwnerService', () => { }), ]); - await service.updateSubmissionApplicant(''); + await service.updateSubmissionApplicant('', new User()); expect(mockNoiSubmissionService.update).toHaveBeenCalledTimes(1); expect(mockNoiSubmissionService.update.mock.calls[0][1].applicant).toEqual( @@ -300,7 +309,7 @@ describe('NoticeOfIntentOwnerService', () => { }), ]); - await service.updateSubmissionApplicant(''); + await service.updateSubmissionApplicant('', new User()); expect(mockNoiSubmissionService.update).toHaveBeenCalledTimes(1); expect(mockNoiSubmissionService.update.mock.calls[0][1].applicant).toEqual( @@ -333,7 +342,7 @@ describe('NoticeOfIntentOwnerService', () => { }), ]); - await service.updateSubmissionApplicant(''); + await service.updateSubmissionApplicant('', new User()); expect(mockNoiSubmissionService.update).toHaveBeenCalledTimes(1); expect(mockNoiSubmissionService.update.mock.calls[0][1].applicant).toEqual( diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.service.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.service.ts index 62835be58d..0640d90f05 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.service.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.service.ts @@ -7,6 +7,7 @@ import { OWNER_TYPE, OwnerType, } from '../../../common/owner-type/owner-type.entity'; +import { User } from '../../../user/user.entity'; import { FALLBACK_APPLICANT_NAME } from '../../../utils/owner.constants'; import { NoticeOfIntentParcelService } from '../notice-of-intent-parcel/notice-of-intent-parcel.service'; import { NoticeOfIntentSubmission } from '../notice-of-intent-submission.entity'; @@ -72,7 +73,7 @@ export class NoticeOfIntentOwnerService { return await this.repository.save(newOwner); } - async attachToParcel(uuid: string, parcelUuid: string) { + async attachToParcel(uuid: string, parcelUuid: string, user: User) { const existingOwner = await this.repository.findOneOrFail({ where: { uuid, @@ -89,6 +90,7 @@ export class NoticeOfIntentOwnerService { await this.updateSubmissionApplicant( existingOwner.noticeOfIntentSubmissionUuid, + user, ); await this.repository.save(existingOwner); @@ -98,7 +100,7 @@ export class NoticeOfIntentOwnerService { await this.repository.save(owner); } - async removeFromParcel(uuid: string, parcelUuid: string) { + async removeFromParcel(uuid: string, parcelUuid: string, user: User) { const existingOwner = await this.repository.findOneOrFail({ where: { uuid, @@ -114,12 +116,17 @@ export class NoticeOfIntentOwnerService { await this.updateSubmissionApplicant( existingOwner.noticeOfIntentSubmissionUuid, + user, ); await this.repository.save(existingOwner); } - async update(uuid: string, updateDto: NoticeOfIntentOwnerUpdateDto) { + async update( + uuid: string, + updateDto: NoticeOfIntentOwnerUpdateDto, + user: User, + ) { const existingOwner = await this.repository.findOneOrFail({ where: { uuid, @@ -180,21 +187,30 @@ export class NoticeOfIntentOwnerService { await this.updateSubmissionApplicant( existingOwner.noticeOfIntentSubmissionUuid, + user, ); return await this.repository.save(existingOwner); } - async delete(owner: NoticeOfIntentOwner) { + async delete(owner: NoticeOfIntentOwner, user: User) { const res = await this.repository.remove(owner); - await this.updateSubmissionApplicant(owner.noticeOfIntentSubmissionUuid); + await this.updateSubmissionApplicant( + owner.noticeOfIntentSubmissionUuid, + user, + ); return res; } - async setPrimaryContact(submissionUuid: string, owner: NoticeOfIntentOwner) { + async setPrimaryContact( + submissionUuid: string, + owner: NoticeOfIntentOwner, + user: User, + ) { await this.noticeOfIntentSubmissionService.setPrimaryContact( submissionUuid, owner.uuid, + user, ); } @@ -244,7 +260,7 @@ export class NoticeOfIntentOwnerService { return await this.repository.remove(agentOwners); } - async updateSubmissionApplicant(submissionUuid: string) { + async updateSubmissionApplicant(submissionUuid: string, user: User) { const parcels = await this.noticeOfIntentParcelService.fetchByApplicationSubmissionUuid( submissionUuid, @@ -287,9 +303,13 @@ export class NoticeOfIntentOwnerService { applicantName += ' et al.'; } - await this.noticeOfIntentSubmissionService.update(submissionUuid, { - applicant: applicantName || '', - }); + await this.noticeOfIntentSubmissionService.update( + submissionUuid, + { + applicant: applicantName || '', + }, + user, + ); const fileNumber = await this.noticeOfIntentSubmissionService.getFileNumber( diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.controller.spec.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.controller.spec.ts index b2cbd3aa93..3b62960e5a 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.controller.spec.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.controller.spec.ts @@ -7,6 +7,7 @@ import { mockKeyCloakProviders } from '../../../../test/mocks/mockTypes'; import { NoticeOfIntentDocumentService } from '../../../alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.service'; import { NoticeOfIntentParcelProfile } from '../../../common/automapper/notice-of-intent-parcel.automapper.profile'; import { DocumentService } from '../../../document/document.service'; +import { User } from '../../../user/user.entity'; import { NoticeOfIntentOwnerService } from '../notice-of-intent-owner/notice-of-intent-owner.service'; import { NoticeOfIntentSubmission } from '../notice-of-intent-submission.entity'; import { NoticeOfIntentSubmissionService } from '../notice-of-intent-submission.service'; @@ -22,6 +23,7 @@ describe('NoticeOfIntentParcelController', () => { let mockNOIOwnerService: DeepMocked; let mockDocumentService: DeepMocked; let mockNOIDocumentService: DeepMocked; + let mockNoticeOfIntentSubmission; beforeEach(async () => { mockNOIParcelService = createMock(); @@ -30,6 +32,10 @@ describe('NoticeOfIntentParcelController', () => { mockDocumentService = createMock(); mockNOIDocumentService = createMock(); + mockNoticeOfIntentSubmission = new NoticeOfIntentSubmission({ + createdBy: new User(), + }); + const module: TestingModule = await Test.createTestingModule({ imports: [ AutomapperModule.forRoot({ @@ -88,40 +94,52 @@ describe('NoticeOfIntentParcelController', () => { }); it('should call out to service when creating parcels', async () => { - mockNOIService.getOrFailByUuid.mockResolvedValue( - {} as NoticeOfIntentSubmission, - ); + mockNOIService.getByUuid.mockResolvedValue(mockNoticeOfIntentSubmission); mockNOIParcelService.create.mockResolvedValue({} as NoticeOfIntentParcel); mockNOIOwnerService.attachToParcel.mockResolvedValue(); - const parcel = await controller.create({ - noticeOfIntentSubmissionUuid: 'fake', - }); + const parcel = await controller.create( + { + noticeOfIntentSubmissionUuid: 'fake', + }, + { + user: { + entity: new User(), + }, + }, + ); - expect(mockNOIService.getOrFailByUuid).toBeCalledTimes(1); + expect(mockNOIService.getByUuid).toBeCalledTimes(1); expect(mockNOIParcelService.create).toBeCalledTimes(1); expect(mockNOIOwnerService.attachToParcel).toBeCalledTimes(0); expect(parcel).toBeDefined(); }); - it('should call out to service and revert newly created "other" parcel if failed to link it to and owner during creation process', async () => { + it('should revert newly created "other" parcel if failed to link', async () => { const mockError = new Error('mock error'); - mockNOIService.getOrFailByUuid.mockResolvedValue( - {} as NoticeOfIntentSubmission, - ); + mockNOIService.getByUuid.mockResolvedValue(mockNoticeOfIntentSubmission); mockNOIParcelService.create.mockResolvedValue({} as NoticeOfIntentParcel); mockNOIOwnerService.attachToParcel.mockRejectedValue(mockError); mockNOIParcelService.deleteMany.mockResolvedValue([]); await expect( - controller.create({ - noticeOfIntentSubmissionUuid: 'fake', - ownerUuid: 'fake_uuid', - parcelType: 'other', - }), + controller.create( + { + noticeOfIntentSubmissionUuid: 'fake', + ownerUuid: 'fake_uuid', + parcelType: 'other', + }, + { + user: { + entity: new User({ + clientRoles: [], + }), + }, + }, + ), ).rejects.toMatchObject(mockError); - expect(mockNOIService.getOrFailByUuid).toBeCalledTimes(1); + expect(mockNOIService.getByUuid).toBeCalledTimes(1); expect(mockNOIParcelService.create).toBeCalledTimes(1); expect(mockNOIParcelService.deleteMany).toBeCalledTimes(1); expect(mockNOIOwnerService.attachToParcel).toBeCalledTimes(1); @@ -147,7 +165,11 @@ describe('NoticeOfIntentParcelController', () => { {}, ] as NoticeOfIntentParcel[]); - const parcel = await controller.update(mockUpdateDto); + const parcel = await controller.update(mockUpdateDto, { + user: { + entity: new User(), + }, + }); expect(mockNOIParcelService.update).toBeCalledTimes(1); expect(parcel).toBeDefined(); @@ -157,7 +179,11 @@ describe('NoticeOfIntentParcelController', () => { const fakeUuid = 'fake_uuid'; mockNOIParcelService.deleteMany.mockResolvedValue([]); - const result = await controller.delete([fakeUuid]); + const result = await controller.delete([fakeUuid], { + user: { + entity: new User(), + }, + }); expect(mockNOIParcelService.deleteMany).toBeCalledTimes(1); expect(result).toBeDefined(); diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.controller.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.controller.ts index d84a44e651..1b0271bd8e 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.controller.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.controller.ts @@ -62,10 +62,13 @@ export class NoticeOfIntentParcelController { @Post() async create( @Body() createDto: NoticeOfIntentParcelCreateDto, + @Req() req, ): Promise { + const user = req.user.entity; const noticeOfIntentSubmission = - await this.noticeOfIntentSubmissionService.getOrFailByUuid( + await this.noticeOfIntentSubmissionService.getByUuid( createDto.noticeOfIntentSubmissionUuid, + user, ); const parcel = await this.parcelService.create( noticeOfIntentSubmission.uuid, @@ -76,10 +79,11 @@ export class NoticeOfIntentParcelController { await this.ownerService.attachToParcel( createDto.ownerUuid, parcel.uuid, + user, ); } } catch (e) { - await this.delete([parcel.uuid]); + await this.parcelService.deleteMany([parcel.uuid], user); throw e; } @@ -93,8 +97,12 @@ export class NoticeOfIntentParcelController { @Put('/') async update( @Body() updateDtos: NoticeOfIntentParcelUpdateDto[], + @Req() req, ): Promise { - const updatedParcels = await this.parcelService.update(updateDtos); + const updatedParcels = await this.parcelService.update( + updateDtos, + req.user.entity, + ); return this.mapper.mapArrayAsync( updatedParcels, @@ -104,8 +112,11 @@ export class NoticeOfIntentParcelController { } @Delete() - async delete(@Body() uuids: string[]) { - const deletedParcels = await this.parcelService.deleteMany(uuids); + async delete(@Body() uuids: string[], @Req() req) { + const deletedParcels = await this.parcelService.deleteMany( + uuids, + req.user.entity, + ); return this.mapper.mapArrayAsync( deletedParcels, NoticeOfIntentParcel, @@ -128,14 +139,14 @@ export class NoticeOfIntentParcelController { }); const noticeOfIntentSubmission = - await this.noticeOfIntentSubmissionService.verifyAccessByUuid( + await this.noticeOfIntentSubmissionService.getByUuid( parcel.noticeOfIntentSubmissionUuid, req.user.entity, ); const certificateOfTitle = await this.noticeOfIntentDocumentService.attachExternalDocument( - noticeOfIntentSubmission!.fileNumber, + noticeOfIntentSubmission.fileNumber, { documentUuid: document.uuid, type: DOCUMENT_TYPE.CERTIFICATE_OF_TITLE, diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.service.spec.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.service.spec.ts index a16a25df9c..19a4c0c40b 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.service.spec.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.service.spec.ts @@ -3,6 +3,7 @@ import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; import { In, Repository } from 'typeorm'; +import { User } from '../../../user/user.entity'; import { NoticeOfIntentOwnerService } from '../notice-of-intent-owner/notice-of-intent-owner.service'; import { NoticeOfIntentParcelUpdateDto } from './notice-of-intent-parcel.dto'; import { NoticeOfIntentParcel } from './notice-of-intent-parcel.entity'; @@ -125,7 +126,7 @@ describe('NoticeOfIntentParcelService', () => { mockParcelRepo.findOneOrFail.mockResolvedValue(mockNOIParcel); mockParcelRepo.save.mockResolvedValue({} as NoticeOfIntentParcel); - await service.update(updateParcelDto); + await service.update(updateParcelDto, new User()); expect(mockParcelRepo.findOneOrFail).toBeCalledTimes(1); expect(mockParcelRepo.findOneOrFail).toBeCalledWith({ @@ -155,7 +156,7 @@ describe('NoticeOfIntentParcelService', () => { mockOwnerService.updateSubmissionApplicant.mockResolvedValue(); mockOwnerService.getMany.mockResolvedValue([]); - await service.update(updateParcelDto); + await service.update(updateParcelDto, new User()); expect(mockParcelRepo.findOneOrFail).toBeCalledTimes(1); expect(mockParcelRepo.findOneOrFail).toBeCalledWith({ @@ -184,9 +185,9 @@ describe('NoticeOfIntentParcelService', () => { mockParcelRepo.findOneOrFail.mockRejectedValue(mockError); mockParcelRepo.save.mockResolvedValue(new NoticeOfIntentParcel()); - await expect(service.update(updateParcelDto)).rejects.toMatchObject( - mockError, - ); + await expect( + service.update(updateParcelDto, new User()), + ).rejects.toMatchObject(mockError); expect(mockParcelRepo.findOneOrFail).toBeCalledTimes(1); expect(mockParcelRepo.findOneOrFail).toBeCalledWith({ where: { uuid: mockUuid }, @@ -199,7 +200,7 @@ describe('NoticeOfIntentParcelService', () => { mockParcelRepo.remove.mockResolvedValue(new NoticeOfIntentParcel()); mockOwnerService.updateSubmissionApplicant.mockResolvedValue(); - const result = await service.deleteMany([mockUuid]); + const result = await service.deleteMany([mockUuid], new User()); expect(result).toBeDefined(); expect(mockParcelRepo.find).toBeCalledTimes(1); @@ -219,9 +220,9 @@ describe('NoticeOfIntentParcelService', () => { mockParcelRepo.find.mockResolvedValue([]); mockParcelRepo.remove.mockResolvedValue(new NoticeOfIntentParcel()); - await expect(service.deleteMany([mockUuid])).rejects.toMatchObject( - exception, - ); + await expect( + service.deleteMany([mockUuid], new User()), + ).rejects.toMatchObject(exception); expect(mockParcelRepo.find).toBeCalledTimes(1); expect(mockParcelRepo.find).toBeCalledWith({ where: { uuid: In([mockUuid]) }, diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.service.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.service.ts index 7287652876..d1c612da54 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.service.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.service.ts @@ -3,6 +3,7 @@ import { forwardRef, Inject, Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { In, Repository } from 'typeorm'; import { NoticeOfIntentDocument } from '../../../alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.entity'; +import { User } from '../../../user/user.entity'; import { formatIncomingDate } from '../../../utils/incoming-date.formatter'; import { filterUndefined } from '../../../utils/undefined'; import { NoticeOfIntentOwnerService } from '../notice-of-intent-owner/notice-of-intent-owner.service'; @@ -76,7 +77,7 @@ export class NoticeOfIntentParcelService { return await this.parcelRepository.save(parcel); } - async update(updateDtos: NoticeOfIntentParcelUpdateDto[]) { + async update(updateDtos: NoticeOfIntentParcelUpdateDto[], user: User) { const updatedParcels: NoticeOfIntentParcel[] = []; let hasOwnerUpdate = false; @@ -114,12 +115,13 @@ export class NoticeOfIntentParcelService { const firstParcel = updatedParcels[0]; await this.noticeOfIntentOwnerService.updateSubmissionApplicant( firstParcel.noticeOfIntentSubmissionUuid, + user, ); } return res; } - async deleteMany(uuids: string[]) { + async deleteMany(uuids: string[], user: User) { const parcels = await this.parcelRepository.find({ where: { uuid: In(uuids) }, }); @@ -133,6 +135,7 @@ export class NoticeOfIntentParcelService { const result = await this.parcelRepository.remove(parcels); await this.noticeOfIntentOwnerService.updateSubmissionApplicant( parcels[0].noticeOfIntentSubmissionUuid, + user, ); return result; diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission-validator.service.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission-validator.service.ts index fcec84e1f5..474f9d78fe 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission-validator.service.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission-validator.service.ts @@ -456,7 +456,10 @@ export class NoticeOfIntentSubmissionValidatorService { const noticeOfWork = applicantDocuments.filter( (document) => document.typeCode === DOCUMENT_TYPE.NOTICE_OF_WORK, ); - if (noticeOfIntentSubmission.soilIsFollowUp && noticeOfWork.length === 0) { + if ( + noticeOfIntentSubmission.soilHasSubmittedNotice && + noticeOfWork.length === 0 + ) { errors.push( new ServiceValidationException( `${noticeOfIntentSubmission.typeCode} proposal has yes to notice of work but is not attached`, diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.controller.spec.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.controller.spec.ts index 4bbc67fa74..878890b79d 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.controller.spec.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.controller.spec.ts @@ -1,12 +1,14 @@ import { classes } from '@automapper/classes'; import { AutomapperModule } from '@automapper/nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; +import { BadRequestException } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; import { ClsService } from 'nestjs-cls'; import { mockKeyCloakProviders } from '../../../test/mocks/mockTypes'; import { LocalGovernment } from '../../alcs/local-government/local-government.entity'; import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; import { NoticeOfIntentDocumentService } from '../../alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.service'; +import { NoticeOfIntentSubmissionStatusType } from '../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status-type.entity'; import { NOI_SUBMISSION_STATUS } from '../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status.dto'; import { NoticeOfIntentSubmissionToSubmissionStatus } from '../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status.entity'; import { NoticeOfIntent } from '../../alcs/notice-of-intent/notice-of-intent.entity'; @@ -86,13 +88,10 @@ describe('NoticeOfIntentSubmissionController', () => { ); mockNoiSubmissionService.create.mockResolvedValue('2'); - mockNoiSubmissionService.getIfCreatorByFileNumber.mockResolvedValue( + mockNoiSubmissionService.getByFileNumber.mockResolvedValue( new NoticeOfIntentSubmission(), ); - mockNoiSubmissionService.verifyAccessByFileId.mockResolvedValue( - new NoticeOfIntentSubmission(), - ); - mockNoiSubmissionService.verifyAccessByUuid.mockResolvedValue( + mockNoiSubmissionService.getByUuid.mockResolvedValue( new NoticeOfIntentSubmission(), ); @@ -112,7 +111,7 @@ describe('NoticeOfIntentSubmissionController', () => { }); it('should call out to service when fetching notice of intents', async () => { - mockNoiSubmissionService.getByUser.mockResolvedValue([]); + mockNoiSubmissionService.getAllByUser.mockResolvedValue([]); const submissions = await controller.getSubmissions({ user: { @@ -121,18 +120,20 @@ describe('NoticeOfIntentSubmissionController', () => { }); expect(submissions).toBeDefined(); - expect(mockNoiSubmissionService.getByUser).toHaveBeenCalledTimes(1); + expect(mockNoiSubmissionService.getAllByUser).toHaveBeenCalledTimes(1); }); it('should call out to service when cancelling an notice of intent', async () => { - const mockApplication = new NoticeOfIntentSubmission({}); + const mockApplication = new NoticeOfIntentSubmission({ + status: new NoticeOfIntentSubmissionToSubmissionStatus({ + statusTypeCode: NOI_SUBMISSION_STATUS.IN_PROGRESS, + }), + }); mockNoiSubmissionService.mapToDTOs.mockResolvedValue([ {} as NoticeOfIntentSubmissionDto, ]); - mockNoiSubmissionService.verifyAccessByUuid.mockResolvedValue( - mockApplication, - ); + mockNoiSubmissionService.getByUuid.mockResolvedValue(mockApplication); mockNoiSubmissionService.cancel.mockResolvedValue( new NoticeOfIntentSubmissionToSubmissionStatus(), ); @@ -145,42 +146,41 @@ describe('NoticeOfIntentSubmissionController', () => { expect(noticeOfIntentSubmission).toBeDefined(); expect(mockNoiSubmissionService.cancel).toHaveBeenCalledTimes(1); - expect(mockNoiSubmissionService.verifyAccessByUuid).toHaveBeenCalledTimes( - 1, - ); - expect(mockNoiSubmissionService.verifyAccessByUuid).toHaveBeenCalledWith( + expect(mockNoiSubmissionService.getByUuid).toHaveBeenCalledTimes(1); + expect(mockNoiSubmissionService.getByUuid).toHaveBeenCalledWith( 'file-id', new User(), ); }); - // it('should throw an exception when trying to cancel a notice of intent that is not in progress', async () => { - // const mockNoi = new NoticeOfIntentSubmission(); - // mockNoiSubmissionService.verifyAccessByUuid.mockResolvedValue({ - // ...mockNoi, - // status: new ApplicationSubmissionStatusType({ - // code: SUBMISSION_STATUS.CANCELLED, - // }), - // } as any); - // - // const promise = controller.cancel('file-id', { - // user: { - // entity: new User(), - // }, - // }); - // - // await expect(promise).rejects.toMatchObject( - // new BadRequestException('Can only cancel in progress Applications'), - // ); - // //expect(mockNoiSubmissionService.cancel).toHaveBeenCalledTimes(0); - // expect(mockNoiSubmissionService.verifyAccessByUuid).toHaveBeenCalledTimes( - // 1, - // ); - // expect(mockNoiSubmissionService.verifyAccessByUuid).toHaveBeenCalledWith( - // 'file-id', - // new User(), - // ); - // }); + it('should throw an exception when trying to cancel a notice of intent that is not in progress', async () => { + const mockNoi = new NoticeOfIntentSubmission(); + mockNoiSubmissionService.getByUuid.mockResolvedValue({ + ...mockNoi, + status: new NoticeOfIntentSubmissionStatusType({ + code: NOI_SUBMISSION_STATUS.CANCELLED, + }), + } as any); + mockNoiSubmissionService.cancel.mockResolvedValue( + new NoticeOfIntentSubmissionToSubmissionStatus(), + ); + + const promise = controller.cancel('file-id', { + user: { + entity: new User(), + }, + }); + + await expect(promise).rejects.toMatchObject( + new BadRequestException('Can only cancel in progress Notice of Intents'), + ); + expect(mockNoiSubmissionService.cancel).toHaveBeenCalledTimes(0); + expect(mockNoiSubmissionService.getByUuid).toHaveBeenCalledTimes(1); + expect(mockNoiSubmissionService.getByUuid).toHaveBeenCalledWith( + 'file-id', + new User(), + ); + }); it('should call out to service when fetching a notice of intent', async () => { mockNoiSubmissionService.mapToDetailedDTO.mockResolvedValue( @@ -197,16 +197,14 @@ describe('NoticeOfIntentSubmissionController', () => { ); expect(noticeOfIntent).toBeDefined(); - expect(mockNoiSubmissionService.verifyAccessByUuid).toHaveBeenCalledTimes( - 1, - ); + expect(mockNoiSubmissionService.getByUuid).toHaveBeenCalledTimes(1); }); it('should fetch notice of intent by bceid if user has same guid as a local government', async () => { mockNoiSubmissionService.mapToDetailedDTO.mockResolvedValue( {} as NoticeOfIntentSubmissionDetailedDto, ); - mockNoiSubmissionService.verifyAccessByUuid.mockResolvedValue( + mockNoiSubmissionService.getByUuid.mockResolvedValue( new NoticeOfIntentSubmission({ localGovernmentUuid: '', }), @@ -224,9 +222,7 @@ describe('NoticeOfIntentSubmissionController', () => { ); expect(noiSubmission).toBeDefined(); - expect(mockNoiSubmissionService.verifyAccessByUuid).toHaveBeenCalledTimes( - 1, - ); + expect(mockNoiSubmissionService.getByUuid).toHaveBeenCalledTimes(1); }); it('should call out to service when creating an notice of intent', async () => { @@ -254,6 +250,13 @@ describe('NoticeOfIntentSubmissionController', () => { mockNoiSubmissionService.mapToDetailedDTO.mockResolvedValue( {} as NoticeOfIntentSubmissionDetailedDto, ); + mockNoiSubmissionService.getByUuid.mockResolvedValue( + new NoticeOfIntentSubmission({ + status: new NoticeOfIntentSubmissionToSubmissionStatus({ + statusTypeCode: NOI_SUBMISSION_STATUS.IN_PROGRESS, + }), + }), + ); await controller.update( 'file-id', @@ -268,18 +271,48 @@ describe('NoticeOfIntentSubmissionController', () => { }, ); - expect(mockNoiSubmissionService.verifyAccessByUuid).toHaveBeenCalledTimes( - 1, - ); + expect(mockNoiSubmissionService.update).toHaveBeenCalledTimes(1); expect(mockNoiSubmissionService.mapToDetailedDTO).toHaveBeenCalledTimes(1); }); + it('should throw an exception when trying to update a not in progress noi', async () => { + mockNoiSubmissionService.mapToDetailedDTO.mockResolvedValue( + {} as NoticeOfIntentSubmissionDetailedDto, + ); + mockNoiSubmissionService.getByUuid.mockResolvedValue( + new NoticeOfIntentSubmission({ + status: new NoticeOfIntentSubmissionToSubmissionStatus({ + statusTypeCode: NOI_SUBMISSION_STATUS.CANCELLED, + }), + }), + ); + + const promise = controller.update( + 'file-id', + { + localGovernmentUuid, + applicant, + }, + { + user: { + entity: new User(), + }, + }, + ); + await expect(promise).rejects.toMatchObject( + new BadRequestException('Can only edit in progress Notice of Intents'), + ); + + expect(mockNoiSubmissionService.update).toHaveBeenCalledTimes(0); + expect(mockNoiSubmissionService.mapToDetailedDTO).toHaveBeenCalledTimes(0); + }); + it('should call out to service on submitAlcs', async () => { const mockFileId = 'file-id'; mockNoiSubmissionService.submitToAlcs.mockResolvedValue( new NoticeOfIntent(), ); - mockNoiSubmissionService.getIfCreatorByUuid.mockResolvedValue( + mockNoiSubmissionService.getByUuid.mockResolvedValue( new NoticeOfIntentSubmission(), ); mockNoiValidatorService.validateSubmission.mockResolvedValue({ @@ -297,9 +330,7 @@ describe('NoticeOfIntentSubmissionController', () => { }, }); - expect(mockNoiSubmissionService.verifyAccessByUuid).toHaveBeenCalledTimes( - 2, - ); + expect(mockNoiSubmissionService.getByUuid).toHaveBeenCalledTimes(2); expect(mockNoiSubmissionService.submitToAlcs).toHaveBeenCalledTimes(1); expect(mockNoiValidatorService.validateSubmission).toHaveBeenCalledTimes(1); expect(mockNoiSubmissionService.mapToDetailedDTO).toHaveBeenCalledTimes(1); diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.controller.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.controller.ts index 2e81391598..c9685b8e1b 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.controller.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.controller.ts @@ -10,6 +10,7 @@ import { Req, UseGuards, } from '@nestjs/common'; +import { NOI_SUBMISSION_STATUS } from '../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status.dto'; import { PortalAuthGuard } from '../../common/authorization/portal-auth-guard.service'; import { User } from '../../user/user.entity'; import { NoticeOfIntentSubmissionValidatorService } from './notice-of-intent-submission-validator.service'; @@ -33,28 +34,21 @@ export class NoticeOfIntentSubmissionController { async getSubmissions(@Req() req) { const user = req.user.entity as User; - if (user.bceidBusinessGuid) { - //TODO: Business accounts? - } - - const applications = await this.noticeOfIntentSubmissionService.getByUser( - user, - ); - return this.noticeOfIntentSubmissionService.mapToDTOs(applications); + const applications = + await this.noticeOfIntentSubmissionService.getAllByUser(user); + return this.noticeOfIntentSubmissionService.mapToDTOs(applications, user); } - @Get('/application/:fileId') + @Get('/notice-of-intent/:fileId') async getSubmissionByFileId(@Req() req, @Param('fileId') fileId: string) { const user = req.user.entity as User; const submission = - await this.noticeOfIntentSubmissionService.verifyAccessByFileId( - fileId, - user, - ); + await this.noticeOfIntentSubmissionService.getByFileNumber(fileId, user); return await this.noticeOfIntentSubmissionService.mapToDetailedDTO( submission, + user, ); } @@ -62,11 +56,14 @@ export class NoticeOfIntentSubmissionController { async getSubmission(@Req() req, @Param('uuid') uuid: string) { const user = req.user.entity as User; - const submission = - await this.noticeOfIntentSubmissionService.verifyAccessByUuid(uuid, user); + const submission = await this.noticeOfIntentSubmissionService.getByUuid( + uuid, + user, + ); return await this.noticeOfIntentSubmissionService.mapToDetailedDTO( submission, + user, ); } @@ -89,30 +86,50 @@ export class NoticeOfIntentSubmissionController { @Body() updateDto: NoticeOfIntentSubmissionUpdateDto, @Req() req, ) { - const submission = - await this.noticeOfIntentSubmissionService.verifyAccessByUuid( + const noticeOfIntentSubmission = + await this.noticeOfIntentSubmissionService.getByUuid( uuid, req.user.entity, ); + if ( + noticeOfIntentSubmission.status.statusTypeCode !== + NOI_SUBMISSION_STATUS.IN_PROGRESS + ) { + throw new BadRequestException( + 'Can only edit in progress Notice of Intents', + ); + } + const updatedSubmission = await this.noticeOfIntentSubmissionService.update( - submission.uuid, + uuid, updateDto, + req.user.entity, ); return await this.noticeOfIntentSubmissionService.mapToDetailedDTO( updatedSubmission, + req.user.entity, ); } @Post('/:uuid/cancel') async cancel(@Param('uuid') uuid: string, @Req() req) { const noticeOfIntentSubmission = - await this.noticeOfIntentSubmissionService.verifyAccessByUuid( + await this.noticeOfIntentSubmissionService.getByUuid( uuid, req.user.entity, ); + if ( + noticeOfIntentSubmission.status.statusTypeCode !== + NOI_SUBMISSION_STATUS.IN_PROGRESS + ) { + throw new BadRequestException( + 'Can only cancel in progress Notice of Intents', + ); + } + await this.noticeOfIntentSubmissionService.cancel(noticeOfIntentSubmission); return { @@ -123,7 +140,7 @@ export class NoticeOfIntentSubmissionController { @Post('/alcs/submit/:uuid') async submitAsApplicant(@Param('uuid') uuid: string, @Req() req) { const noticeOfIntentSubmission = - await this.noticeOfIntentSubmissionService.verifyAccessByUuid( + await this.noticeOfIntentSubmissionService.getByUuid( uuid, req.user.entity, ); @@ -142,12 +159,14 @@ export class NoticeOfIntentSubmissionController { ); const finalSubmission = - await this.noticeOfIntentSubmissionService.verifyAccessByUuid( + await this.noticeOfIntentSubmissionService.getByUuid( uuid, req.user.entity, ); + return await this.noticeOfIntentSubmissionService.mapToDetailedDTO( finalSubmission, + req.user.entity, ); } else { this.logger.debug(validationResult.errors); diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts index 8c91c6e772..220678b6ca 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts @@ -27,6 +27,7 @@ describe('NoticeOfIntentSubmissionService', () => { let mockNoiDocService: DeepMocked; let mockFileNumberService: DeepMocked; let mockNoiStatusService: DeepMocked; + let mockNoiSubmission; beforeEach(async () => { mockRepository = createMock(); @@ -75,6 +76,16 @@ describe('NoticeOfIntentSubmissionService', () => { service = module.get( NoticeOfIntentSubmissionService, ); + + mockNoiSubmission = new NoticeOfIntentSubmission({ + fileNumber: 'file-number', + applicant: 'incognito', + typeCode: 'fake', + localGovernmentUuid: 'uuid', + createdBy: new User({ + clientRoles: [], + }), + }); }); it('should be defined', () => { @@ -83,38 +94,28 @@ describe('NoticeOfIntentSubmissionService', () => { it('should return the fetched notice of intent', async () => { const noiSubmission = new NoticeOfIntentSubmission(); - mockRepository.findOne.mockResolvedValue(noiSubmission); + mockRepository.findOneOrFail.mockResolvedValue(noiSubmission); - const app = await service.getOrFailByFileNumber(''); + const app = await service.getByFileNumber( + '', + new User({ + clientRoles: [], + }), + ); expect(app).toBe(noiSubmission); }); it('should return the fetched notice of intent when fetching with user', async () => { const noiSubmission = new NoticeOfIntentSubmission(); - mockRepository.findOne.mockResolvedValue(noiSubmission); - - const app = await service.getIfCreatorByFileNumber('', new User()); - expect(app).toBe(noiSubmission); - }); - - it('should throw an exception if the notice of intent is not found', async () => { - mockRepository.findOne.mockResolvedValue(null); - - const promise = service.getIfCreatorByFileNumber('file-number', new User()); - await expect(promise).rejects.toMatchObject( - new Error( - `Failed to load notice of intent submission with File ID file-number`, - ), - ); - }); - - it("should throw an error if notice of intent doesn't exist", async () => { - mockRepository.findOne.mockResolvedValue(null); + mockRepository.findOneOrFail.mockResolvedValue(noiSubmission); - const promise = service.getOrFailByFileNumber(''); - await expect(promise).rejects.toMatchObject( - new Error('Failed to find notice of intent submission'), + const app = await service.getByFileNumber( + '', + new User({ + clientRoles: [], + }), ); + expect(app).toBe(noiSubmission); }); it('save a new noi for create', async () => { @@ -125,7 +126,12 @@ describe('NoticeOfIntentSubmissionService', () => { mockNoiService.create.mockResolvedValue(new NoticeOfIntent()); mockNoiStatusService.setInitialStatuses.mockResolvedValue([]); - const fileNumber = await service.create('type', new User()); + const fileNumber = await service.create( + 'type', + new User({ + clientRoles: [], + }), + ); expect(fileNumber).toEqual(fileId); expect(mockRepository.save).toHaveBeenCalledTimes(1); @@ -137,7 +143,11 @@ describe('NoticeOfIntentSubmissionService', () => { const noiSubmission = new NoticeOfIntentSubmission(); mockRepository.find.mockResolvedValue([noiSubmission]); - const res = await service.getByUser(new User()); + const res = await service.getAllByUser( + new User({ + clientRoles: [], + }), + ); expect(mockRepository.find).toHaveBeenCalledTimes(1); expect(res.length).toEqual(1); expect(res[0]).toBe(noiSubmission); @@ -145,10 +155,15 @@ describe('NoticeOfIntentSubmissionService', () => { it('should call through for getByFileId', async () => { const noiSubmission = new NoticeOfIntentSubmission(); - mockRepository.findOne.mockResolvedValue(noiSubmission); + mockRepository.findOneOrFail.mockResolvedValue(noiSubmission); - const res = await service.getByFileNumber('', new User()); - expect(mockRepository.findOne).toHaveBeenCalledTimes(1); + const res = await service.getByFileNumber( + '', + new User({ + clientRoles: [], + }), + ); + expect(mockRepository.findOneOrFail).toHaveBeenCalledTimes(1); expect(res).toBe(noiSubmission); }); @@ -173,10 +188,16 @@ describe('NoticeOfIntentSubmissionService', () => { statusTypeCode: 'status-code', submissionUuid: 'fake', }), + createdBy: new User(), }); mockRepository.findOne.mockResolvedValue(noiSubmission); - const res = await service.mapToDTOs([noiSubmission]); + const res = await service.mapToDTOs( + [noiSubmission], + new User({ + clientRoles: [], + }), + ); expect(mockNoiService.listTypes).toHaveBeenCalledTimes(1); expect(res[0].type).toEqual('label'); expect(res[0].applicant).toEqual(applicant); @@ -208,16 +229,6 @@ describe('NoticeOfIntentSubmissionService', () => { }); it('should call out to service on submitToAlcs', async () => { - const applicant = 'Bruce Wayne'; - const typeCode = 'fake-code'; - const fileNumber = 'fake'; - const localGovernmentUuid = 'fake-uuid'; - const mockNoiSubmission = new NoticeOfIntentSubmission({ - fileNumber, - applicant, - typeCode, - localGovernmentUuid, - }); const mockNoticeOfIntent = new NoticeOfIntent({ dateSubmittedToAlc: new Date(), }); @@ -240,32 +251,23 @@ describe('NoticeOfIntentSubmissionService', () => { const fileNumber = 'fake'; const localGovernmentUuid = 'fake-uuid'; - const mockNoiSubmission = new NoticeOfIntentSubmission({ - fileNumber, - applicant: 'incognito', - typeCode: 'fake', - localGovernmentUuid: 'uuid', - }); - - mockRepository.findOne.mockResolvedValue(mockNoiSubmission); + mockRepository.findOneOrFail.mockResolvedValue(mockNoiSubmission); mockRepository.save.mockResolvedValue(mockNoiSubmission); mockNoiService.update.mockResolvedValue(new NoticeOfIntent()); - const result = await service.update(fileNumber, { - applicant, - typeCode, - localGovernmentUuid, - }); - - expect(mockRepository.save).toBeCalledTimes(1); - expect(mockRepository.findOne).toBeCalledTimes(2); - expect(result).toEqual( - new NoticeOfIntentSubmission({ - fileNumber, + const result = await service.update( + fileNumber, + { applicant, typeCode, localGovernmentUuid, + }, + new User({ + clientRoles: [], }), ); + + expect(mockRepository.save).toBeCalledTimes(1); + expect(mockRepository.findOneOrFail).toBeCalledTimes(2); }); }); diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts index 9819f198bf..09e9552120 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts @@ -1,7 +1,4 @@ -import { - BaseServiceException, - ServiceNotFoundException, -} from '@app/common/exceptions/base.exception'; +import { BaseServiceException } from '@app/common/exceptions/base.exception'; import { Mapper } from '@automapper/core'; import { InjectMapper } from '@automapper/nestjs'; import { Injectable, Logger } from '@nestjs/common'; @@ -37,6 +34,7 @@ export class NoticeOfIntentSubmissionService { private logger: Logger = new Logger(NoticeOfIntentSubmissionService.name); private DEFAULT_RELATIONS: FindOptionsRelations = { + createdBy: true, owners: { type: true, corporateSummary: { @@ -57,38 +55,6 @@ export class NoticeOfIntentSubmissionService { @InjectMapper() private mapper: Mapper, ) {} - async getOrFailByFileNumber(fileNumber: string) { - const noticeOfIntent = - await this.noticeOfIntentSubmissionRepository.findOne({ - where: { - fileNumber, - isDraft: false, - }, - relations: this.DEFAULT_RELATIONS, - }); - if (!noticeOfIntent) { - throw new Error('Failed to find notice of intent submission'); - } - return noticeOfIntent; - } - - async getOrFailByUuid( - uuid: string, - relations: FindOptionsRelations = {}, - ) { - const noticeOfIntent = - await this.noticeOfIntentSubmissionRepository.findOne({ - where: { - uuid, - }, - relations, - }); - if (!noticeOfIntent) { - throw new Error('Failed to find submission'); - } - return noticeOfIntent; - } - async create(type: string, createdBy: User) { const fileNumber = await this.fileNumberService.generateNextFileNumber(); @@ -119,8 +85,9 @@ export class NoticeOfIntentSubmissionService { async update( submissionUuid: string, updateDto: NoticeOfIntentSubmissionUpdateDto, + user: User, ) { - const noticeOfIntentSubmission = await this.getOrFailByUuid(submissionUuid); + const noticeOfIntentSubmission = await this.getByUuid(submissionUuid, user); noticeOfIntentSubmission.applicant = updateDto.applicant; noticeOfIntentSubmission.purpose = filterUndefined( @@ -148,7 +115,7 @@ export class NoticeOfIntentSubmissionService { ); } - return this.getOrFailByUuid(submissionUuid, this.DEFAULT_RELATIONS); + return this.getByUuid(submissionUuid, user); } async getFileNumber(submissionUuid: string, includeDraft = false) { @@ -165,6 +132,237 @@ export class NoticeOfIntentSubmissionService { return submission?.fileNumber; } + async getAllByUser(user: User) { + const whereClauses = await this.generateWhereClauses({}, user); + + return this.noticeOfIntentSubmissionRepository.find({ + where: whereClauses, + order: { + auditUpdatedAt: 'DESC', + }, + relations: this.DEFAULT_RELATIONS, + }); + } + + async getByFileNumber(fileNumber: string, user: User) { + const overlappingRoles = ROLES_ALLOWED_APPLICATIONS.filter((value) => + user.clientRoles!.includes(value), + ); + if (overlappingRoles.length > 0) { + return await this.noticeOfIntentSubmissionRepository.findOneOrFail({ + where: { + fileNumber, + isDraft: false, + }, + relations: this.DEFAULT_RELATIONS, + }); + } + + const whereClauses = await this.generateWhereClauses( + { + fileNumber, + }, + user, + ); + + return this.noticeOfIntentSubmissionRepository.findOneOrFail({ + where: whereClauses, + order: { + auditUpdatedAt: 'DESC', + }, + relations: this.DEFAULT_RELATIONS, + }); + } + + async getByUuid(uuid: string, user: User) { + const overlappingRoles = ROLES_ALLOWED_APPLICATIONS.filter((value) => + user.clientRoles!.includes(value), + ); + if (overlappingRoles.length > 0) { + return await this.noticeOfIntentSubmissionRepository.findOneOrFail({ + where: { + uuid, + }, + relations: { + ...this.DEFAULT_RELATIONS, + }, + }); + } + + const findOptions = await this.generateWhereClauses( + { + uuid, + }, + user, + ); + + return this.noticeOfIntentSubmissionRepository.findOneOrFail({ + where: findOptions, + order: { + auditUpdatedAt: 'DESC', + }, + }); + } + + private async generateWhereClauses( + searchOptions: FindOptionsWhere, + user: User, + ) { + const searchQueries: FindOptionsWhere[] = []; + + searchQueries.push({ + ...searchOptions, + createdBy: { + uuid: user.uuid, + }, + isDraft: false, + }); + + if (user.bceidBusinessGuid) { + searchQueries.push({ + ...searchOptions, + createdBy: { + bceidBusinessGuid: user.bceidBusinessGuid, + }, + isDraft: false, + }); + + const matchingLocalGovernment = + await this.localGovernmentService.getByGuid(user.bceidBusinessGuid); + if (matchingLocalGovernment) { + searchQueries.push({ + ...searchOptions, + localGovernmentUuid: matchingLocalGovernment.uuid, + isDraft: false, + submissionStatuses: { + effectiveDate: Not(IsNull()), + statusTypeCode: Not(NOI_SUBMISSION_STATUS.IN_PROGRESS), + }, + }); + } + } + + return searchQueries; + } + + async mapToDTOs(submissions: NoticeOfIntentSubmission[], user: User) { + const types = await this.noticeOfIntentService.listTypes(); + + return submissions.map((noiSubmission) => { + const isCreator = noiSubmission.createdBy.uuid === user.uuid; + const isSameAccount = + user.bceidBusinessGuid && + noiSubmission.createdBy.bceidBusinessGuid === user.bceidBusinessGuid; + + return { + ...this.mapper.map( + noiSubmission, + NoticeOfIntentSubmission, + NoticeOfIntentSubmissionDto, + ), + type: types.find((type) => type.code === noiSubmission.typeCode)!.label, + canEdit: + [NOI_SUBMISSION_STATUS.IN_PROGRESS].includes( + noiSubmission.status.statusTypeCode as NOI_SUBMISSION_STATUS, + ) && + (isCreator || isSameAccount), + canView: true, + }; + }); + } + + async mapToDetailedDTO(noiSubmission: NoticeOfIntentSubmission, user: User) { + const types = await this.noticeOfIntentService.listTypes(); + const mappedApp = this.mapper.map( + noiSubmission, + NoticeOfIntentSubmission, + NoticeOfIntentSubmissionDetailedDto, + ); + const isCreator = noiSubmission.createdBy.uuid === user.uuid; + const isSameAccount = + user.bceidBusinessGuid && + noiSubmission.createdBy.bceidBusinessGuid === user.bceidBusinessGuid; + + return { + ...mappedApp, + type: types.find((type) => type.code === noiSubmission.typeCode)!.label, + canEdit: + [NOI_SUBMISSION_STATUS.IN_PROGRESS].includes( + noiSubmission.status.statusTypeCode as NOI_SUBMISSION_STATUS, + ) && + (isCreator || isSameAccount), + canView: true, + }; + } + + async submitToAlcs( + noticeOfIntentSubmission: ValidatedNoticeOfIntentSubmission, + ) { + try { + const submittedNoi = await this.noticeOfIntentService.submit({ + fileNumber: noticeOfIntentSubmission.fileNumber, + applicant: noticeOfIntentSubmission.applicant, + localGovernmentUuid: noticeOfIntentSubmission.localGovernmentUuid, + typeCode: noticeOfIntentSubmission.typeCode, + dateSubmittedToAlc: new Date(), + }); + + await this.noticeOfIntentSubmissionStatusService.setStatusDate( + noticeOfIntentSubmission.uuid, + NOI_SUBMISSION_STATUS.SUBMITTED_TO_ALC, + submittedNoi.dateSubmittedToAlc, + ); + + return submittedNoi; + } catch (ex) { + this.logger.error(ex); + throw new BaseServiceException( + `Failed to submit notice of intent: ${noticeOfIntentSubmission.fileNumber}`, + ); + } + } + + async updateStatus( + uuid: string, + statusCode: NOI_SUBMISSION_STATUS, + effectiveDate?: Date | null, + ) { + const submission = await this.loadBarebonesSubmission(uuid); + await this.noticeOfIntentSubmissionStatusService.setStatusDate( + submission.uuid, + statusCode, + effectiveDate, + ); + } + + async cancel(noticeOfIntentSubmission: NoticeOfIntentSubmission) { + return await this.noticeOfIntentSubmissionStatusService.setStatusDate( + noticeOfIntentSubmission.uuid, + NOI_SUBMISSION_STATUS.CANCELLED, + ); + } + + async setPrimaryContact( + submissionUuid: string, + primaryContactUuid: any, + user: User, + ) { + const noticeOfIntentSubmission = await this.getByUuid(submissionUuid, user); + noticeOfIntentSubmission.primaryContactOwnerUuid = primaryContactUuid; + await this.noticeOfIntentSubmissionRepository.save( + noticeOfIntentSubmission, + ); + } + + private loadBarebonesSubmission(uuid: string) { + //Load submission without relations to prevent save from crazy cascading + return this.noticeOfIntentSubmissionRepository.findOneOrFail({ + where: { + uuid, + }, + }); + } + private setLandUseFields( noticeOfIntentSubmission: NoticeOfIntentSubmission, updateDto: NoticeOfIntentSubmissionUpdateDto, @@ -345,285 +543,4 @@ export class NoticeOfIntentSubmissionService { ); } } - - //TODO: Uncomment when adding submitting - // async submitToAlcs( - // application: ValidatedApplicationSubmission, - // user: User, - // applicationReview?: ApplicationSubmissionReview, - // ) { - // let submittedApp: Application | null = null; - // - // const shouldCreateCard = applicationReview?.isAuthorized ?? true; - // try { - // submittedApp = await this.noticeOfIntentService.submit( - // { - // fileNumber: application.fileNumber, - // applicant: application.applicant, - // localGovernmentUuid: application.localGovernmentUuid, - // typeCode: application.typeCode, - // dateSubmittedToAlc: new Date(), - // }, - // shouldCreateCard, - // ); - // - // await this.updateStatus( - // application, - // SUBMISSION_STATUS.SUBMITTED_TO_ALC, - // submittedApp.dateSubmittedToAlc, - // ); - // - // this.generateAndAttachPdfs( - // application.fileNumber, - // user, - // !!applicationReview, - // ); - // } catch (ex) { - // this.logger.error(ex); - // throw new BaseServiceException( - // `Failed to submit application: ${application.fileNumber}`, - // ); - // } - // - // return submittedApp; - // } - // - // private async generateAndAttachPdfs( - // fileNumber: string, - // user: User, - // hasReview: boolean, - // ) { - // try { - // await this.submissionDocumentGenerationService.generateAndAttach( - // fileNumber, - // user, - // ); - // - // if (hasReview) { - // await this.generateReviewDocumentService.generateAndAttach( - // fileNumber, - // user, - // ); - // } - // } catch (e) { - // this.logger.error(`Error generating the document on submission${e}`); - // } - // } - - async getByUser(user: User) { - const searchQueries: FindOptionsWhere[] = []; - - searchQueries.push({ - createdBy: { - uuid: user.uuid, - }, - isDraft: false, - }); - - if (user.bceidBusinessGuid) { - searchQueries.push({ - createdBy: { - bceidBusinessGuid: user.bceidBusinessGuid, - }, - isDraft: false, - }); - - const matchingLocalGovernment = - await this.localGovernmentService.getByGuid(user.bceidBusinessGuid); - if (matchingLocalGovernment) { - searchQueries.push({ - localGovernmentUuid: matchingLocalGovernment.uuid, - isDraft: false, - //TODO: Test this once we can submit NOIs - submissionStatuses: { - effectiveDate: Not(IsNull()), - statusTypeCode: Not(NOI_SUBMISSION_STATUS.IN_PROGRESS), - }, - }); - } - } - - return this.noticeOfIntentSubmissionRepository.find({ - where: searchQueries, - order: { - auditUpdatedAt: 'DESC', - }, - }); - } - - async getByFileNumber(fileNumber: string, user: User) { - return await this.noticeOfIntentSubmissionRepository.findOne({ - where: { - fileNumber, - createdBy: { - uuid: user.uuid, - }, - isDraft: false, - }, - relations: this.DEFAULT_RELATIONS, - }); - } - - async getByUuid(uuid: string) { - return await this.noticeOfIntentSubmissionRepository.findOne({ - where: { - uuid, - }, - relations: { - ...this.DEFAULT_RELATIONS, - createdBy: true, - }, - }); - } - - async getIfCreatorByFileNumber(fileNumber: string, user: User) { - const noiSubmission = await this.getByFileNumber(fileNumber, user); - if (!noiSubmission) { - throw new ServiceNotFoundException( - `Failed to load notice of intent submission with File ID ${fileNumber}`, - ); - } - return noiSubmission; - } - - async getIfCreatorByUuid(uuid: string, user: User) { - const noiSubmission = await this.getByUuid(uuid); - if (!noiSubmission || noiSubmission.createdBy.uuid !== user.uuid) { - throw new ServiceNotFoundException( - `Failed to load notice of intent submission with ID ${uuid}`, - ); - } - return noiSubmission; - } - - async verifyAccessByFileId(fileId: string, user: User) { - const overlappingRoles = ROLES_ALLOWED_APPLICATIONS.filter((value) => - user.clientRoles!.includes(value), - ); - if (overlappingRoles.length > 0) { - return await this.noticeOfIntentSubmissionRepository.findOneOrFail({ - where: { - fileNumber: fileId, - isDraft: false, - }, - relations: this.DEFAULT_RELATIONS, - }); - } - - return await this.getIfCreatorByFileNumber(fileId, user); - } - - async verifyAccessByUuid(submissionUuid: string, user: User) { - const overlappingRoles = ROLES_ALLOWED_APPLICATIONS.filter((value) => - user.clientRoles!.includes(value), - ); - if (overlappingRoles.length > 0) { - return await this.noticeOfIntentSubmissionRepository.findOneOrFail({ - where: { - uuid: submissionUuid, - }, - relations: { - ...this.DEFAULT_RELATIONS, - }, - }); - } - - return await this.getIfCreatorByUuid(submissionUuid, user); - } - - async mapToDTOs(apps: NoticeOfIntentSubmission[]) { - const types = await this.noticeOfIntentService.listTypes(); - - return apps.map((app) => { - return { - ...this.mapper.map( - app, - NoticeOfIntentSubmission, - NoticeOfIntentSubmissionDto, - ), - type: types.find((type) => type.code === app.typeCode)!.label, - canEdit: true, //TODO - canView: true, //TODO - }; - }); - } - - async mapToDetailedDTO(noiSubmission: NoticeOfIntentSubmission) { - const types = await this.noticeOfIntentService.listTypes(); - const mappedApp = this.mapper.map( - noiSubmission, - NoticeOfIntentSubmission, - NoticeOfIntentSubmissionDetailedDto, - ); - return { - ...mappedApp, - type: types.find((type) => type.code === noiSubmission.typeCode)!.label, - canEdit: true, - canView: true, - }; - } - - async submitToAlcs( - noticeOfIntentSubmission: ValidatedNoticeOfIntentSubmission, - ) { - try { - const submittedNoi = await this.noticeOfIntentService.submit({ - fileNumber: noticeOfIntentSubmission.fileNumber, - applicant: noticeOfIntentSubmission.applicant, - localGovernmentUuid: noticeOfIntentSubmission.localGovernmentUuid, - typeCode: noticeOfIntentSubmission.typeCode, - dateSubmittedToAlc: new Date(), - }); - - await this.noticeOfIntentSubmissionStatusService.setStatusDate( - noticeOfIntentSubmission.uuid, - NOI_SUBMISSION_STATUS.SUBMITTED_TO_ALC, - submittedNoi.dateSubmittedToAlc, - ); - - return submittedNoi; - } catch (ex) { - this.logger.error(ex); - throw new BaseServiceException( - `Failed to submit notice of intent: ${noticeOfIntentSubmission.fileNumber}`, - ); - } - } - - async updateStatus( - uuid: string, - statusCode: NOI_SUBMISSION_STATUS, - effectiveDate?: Date | null, - ) { - const submission = await this.loadBarebonesSubmission(uuid); - await this.noticeOfIntentSubmissionStatusService.setStatusDate( - submission.uuid, - statusCode, - effectiveDate, - ); - } - - async cancel(noticeOfIntentSubmission: NoticeOfIntentSubmission) { - return await this.noticeOfIntentSubmissionStatusService.setStatusDate( - noticeOfIntentSubmission.uuid, - NOI_SUBMISSION_STATUS.CANCELLED, - ); - } - - private loadBarebonesSubmission(uuid: string) { - //Load submission without relations to prevent save from crazy cascading - return this.noticeOfIntentSubmissionRepository.findOneOrFail({ - where: { - uuid, - }, - }); - } - - async setPrimaryContact(submissionUuid: string, primaryContactUuid: any) { - const noticeOfIntentSubmission = await this.getOrFailByUuid(submissionUuid); - noticeOfIntentSubmission.primaryContactOwnerUuid = primaryContactUuid; - await this.noticeOfIntentSubmissionRepository.save( - noticeOfIntentSubmission, - ); - } } From 7bd6adfefd5702ddfa11611600afa8683e58b651 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Thu, 17 Aug 2023 16:38:46 -0700 Subject: [PATCH 267/954] Add ALC Tab Contents for NOIs * Add ALC Tab Content and Documents for NOIs --- .../alc-review/alc-review.component.html | 26 +++++++++++ .../alc-review/alc-review.component.scss | 8 ++++ .../alc-review/alc-review.component.spec.ts | 23 ++++++++++ .../alc-review/alc-review.component.ts | 35 +++++++++++++++ .../submission-documents.component.html | 43 ++++++++++++++++++ .../submission-documents.component.scss | 25 +++++++++++ .../submission-documents.component.spec.ts | 36 +++++++++++++++ .../submission-documents.component.ts | 45 +++++++++++++++++++ ...notice-of-intent-submission.component.html | 8 ++-- ...view-notice-of-intent-submission.module.ts | 4 +- 10 files changed, 248 insertions(+), 5 deletions(-) create mode 100644 portal-frontend/src/app/features/notice-of-intents/view-submission/alc-review/alc-review.component.html create mode 100644 portal-frontend/src/app/features/notice-of-intents/view-submission/alc-review/alc-review.component.scss create mode 100644 portal-frontend/src/app/features/notice-of-intents/view-submission/alc-review/alc-review.component.spec.ts create mode 100644 portal-frontend/src/app/features/notice-of-intents/view-submission/alc-review/alc-review.component.ts create mode 100644 portal-frontend/src/app/features/notice-of-intents/view-submission/alc-review/submission-documents/submission-documents.component.html create mode 100644 portal-frontend/src/app/features/notice-of-intents/view-submission/alc-review/submission-documents/submission-documents.component.scss create mode 100644 portal-frontend/src/app/features/notice-of-intents/view-submission/alc-review/submission-documents/submission-documents.component.spec.ts create mode 100644 portal-frontend/src/app/features/notice-of-intents/view-submission/alc-review/submission-documents/submission-documents.component.ts diff --git a/portal-frontend/src/app/features/notice-of-intents/view-submission/alc-review/alc-review.component.html b/portal-frontend/src/app/features/notice-of-intents/view-submission/alc-review/alc-review.component.html new file mode 100644 index 0000000000..2191680ae3 --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/view-submission/alc-review/alc-review.component.html @@ -0,0 +1,26 @@ +
+
+

ALC Review and Decision

+
+ +
+
+
+ This section will update after the Notice of Intent is submitted to the ALC. +
+
+ +
+
diff --git a/portal-frontend/src/app/features/notice-of-intents/view-submission/alc-review/alc-review.component.scss b/portal-frontend/src/app/features/notice-of-intents/view-submission/alc-review/alc-review.component.scss new file mode 100644 index 0000000000..7ca8d1c637 --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/view-submission/alc-review/alc-review.component.scss @@ -0,0 +1,8 @@ +@use '../../../../../styles/functions' as *; +@use '../../../../../styles/colors'; + +.warning { + background-color: rgba(colors.$accent-color-light, 0.5); + padding: rem(16); + margin-bottom: rem(24); +} diff --git a/portal-frontend/src/app/features/notice-of-intents/view-submission/alc-review/alc-review.component.spec.ts b/portal-frontend/src/app/features/notice-of-intents/view-submission/alc-review/alc-review.component.spec.ts new file mode 100644 index 0000000000..5c4cd95735 --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/view-submission/alc-review/alc-review.component.spec.ts @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { AlcReviewComponent } from './alc-review.component'; + +describe('AlcsReviewComponent', () => { + let component: AlcReviewComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + providers: [], + declarations: [AlcReviewComponent], + }).compileComponents(); + + fixture = TestBed.createComponent(AlcReviewComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/notice-of-intents/view-submission/alc-review/alc-review.component.ts b/portal-frontend/src/app/features/notice-of-intents/view-submission/alc-review/alc-review.component.ts new file mode 100644 index 0000000000..0b84ab7497 --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/view-submission/alc-review/alc-review.component.ts @@ -0,0 +1,35 @@ +import { Component, Input, OnDestroy, OnInit } from '@angular/core'; +import { BehaviorSubject, Subject, takeUntil } from 'rxjs'; +import { NoticeOfIntentDocumentDto } from '../../../../services/notice-of-intent-document/notice-of-intent-document.dto'; +import { + NOI_SUBMISSION_STATUS, + NoticeOfIntentSubmissionDetailedDto, +} from '../../../../services/notice-of-intent-submission/notice-of-intent-submission.dto'; + +@Component({ + selector: 'app-alc-review', + templateUrl: './alc-review.component.html', + styleUrls: ['./alc-review.component.scss'], +}) +export class AlcReviewComponent implements OnInit, OnDestroy { + private $destroy = new Subject(); + + @Input() $noiSubmission = new BehaviorSubject(undefined); + @Input() $noiDocuments = new BehaviorSubject([]); + + noiSubmission: NoticeOfIntentSubmissionDetailedDto | undefined; + NOI_SUBMISSION_STATUS = NOI_SUBMISSION_STATUS; + + constructor() {} + + ngOnInit(): void { + this.$noiSubmission.pipe(takeUntil(this.$destroy)).subscribe((noiSubmission) => { + this.noiSubmission = noiSubmission; + }); + } + + ngOnDestroy(): void { + this.$destroy.next(); + this.$destroy.complete(); + } +} diff --git a/portal-frontend/src/app/features/notice-of-intents/view-submission/alc-review/submission-documents/submission-documents.component.html b/portal-frontend/src/app/features/notice-of-intents/view-submission/alc-review/submission-documents/submission-documents.component.html new file mode 100644 index 0000000000..437bbd407e --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/view-submission/alc-review/submission-documents/submission-documents.component.html @@ -0,0 +1,43 @@ +

Application Documents

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Type + {{ element.type?.label }} + Document Name + {{ element.fileName }} + Source{{ element.source }}Upload Date{{ element.uploadedAt | date }}Actions + +
Documents will be visible here once provided by ALC
+
diff --git a/portal-frontend/src/app/features/notice-of-intents/view-submission/alc-review/submission-documents/submission-documents.component.scss b/portal-frontend/src/app/features/notice-of-intents/view-submission/alc-review/submission-documents/submission-documents.component.scss new file mode 100644 index 0000000000..0027146765 --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/view-submission/alc-review/submission-documents/submission-documents.component.scss @@ -0,0 +1,25 @@ +@use '../../../../../../styles/colors'; +@use '../../../../../../styles/functions' as *; + +.header { + display: flex; + justify-content: space-between; +} + +.table-container { + margin: rem(4); + overflow-x: auto; +} + +.documents { + margin-top: rem(12); +} + +.mat-mdc-no-data-row { + height: rem(56); + color: colors.$grey-dark; +} + +a { + word-break: break-all; +} diff --git a/portal-frontend/src/app/features/notice-of-intents/view-submission/alc-review/submission-documents/submission-documents.component.spec.ts b/portal-frontend/src/app/features/notice-of-intents/view-submission/alc-review/submission-documents/submission-documents.component.spec.ts new file mode 100644 index 0000000000..05549f3c0b --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/view-submission/alc-review/submission-documents/submission-documents.component.spec.ts @@ -0,0 +1,36 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { ApplicationDocumentService } from '../../../../../services/application-document/application-document.service'; +import { NoticeOfIntentDocumentService } from '../../../../../services/notice-of-intent-document/notice-of-intent-document.service'; + +import { SubmissionDocumentsComponent } from './submission-documents.component'; + +describe('SubmissionDocumentsComponent', () => { + let component: SubmissionDocumentsComponent; + let fixture: ComponentFixture; + let mockNoiDocumentService: DeepMocked; + + beforeEach(async () => { + mockNoiDocumentService = createMock(); + + await TestBed.configureTestingModule({ + declarations: [SubmissionDocumentsComponent], + providers: [ + { + provide: NoticeOfIntentDocumentService, + useValue: mockNoiDocumentService, + }, + ], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(SubmissionDocumentsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/notice-of-intents/view-submission/alc-review/submission-documents/submission-documents.component.ts b/portal-frontend/src/app/features/notice-of-intents/view-submission/alc-review/submission-documents/submission-documents.component.ts new file mode 100644 index 0000000000..86d6683606 --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/view-submission/alc-review/submission-documents/submission-documents.component.ts @@ -0,0 +1,45 @@ +import { Component, Input, OnDestroy, OnInit, ViewChild } from '@angular/core'; +import { MatSort } from '@angular/material/sort'; +import { MatTableDataSource } from '@angular/material/table'; +import { BehaviorSubject, Subject, takeUntil } from 'rxjs'; +import { NoticeOfIntentDocumentDto } from '../../../../../services/notice-of-intent-document/notice-of-intent-document.dto'; +import { NoticeOfIntentDocumentService } from '../../../../../services/notice-of-intent-document/notice-of-intent-document.service'; + +@Component({ + selector: 'app-submission-documents', + templateUrl: './submission-documents.component.html', + styleUrls: ['./submission-documents.component.scss'], +}) +export class SubmissionDocumentsComponent implements OnInit, OnDestroy { + private $destroy = new Subject(); + + displayedColumns: string[] = ['type', 'fileName', 'source', 'uploadedAt', 'actions']; + documents: NoticeOfIntentDocumentDto[] = []; + + @Input() $noiDocuments = new BehaviorSubject([]); + + @ViewChild(MatSort) sort!: MatSort; + dataSource: MatTableDataSource = new MatTableDataSource(); + + constructor(private noticeOfIntentDocumentService: NoticeOfIntentDocumentService) {} + + ngOnInit(): void { + this.$noiDocuments.pipe(takeUntil(this.$destroy)).subscribe((documents) => { + this.dataSource = new MatTableDataSource(documents); + }); + } + + async openFile(uuid: string) { + const res = await this.noticeOfIntentDocumentService.openFile(uuid); + if (res) { + window.open(res.url, '_blank'); + } + } + + ngOnDestroy(): void { + this.$destroy.next(); + this.$destroy.complete(); + } + + protected readonly open = open; +} diff --git a/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.html b/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.html index 10c1dea8c2..9c4f716361 100644 --- a/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.html @@ -28,9 +28,7 @@

NOI ID: {{ submission.fileNumber }}

- +
@@ -91,7 +89,9 @@

Applicant Submission

-
ALC GOES HERE
+
+ +
diff --git a/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.module.ts b/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.module.ts index acdd01ad37..5de0b47a0b 100644 --- a/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.module.ts +++ b/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.module.ts @@ -4,6 +4,8 @@ import { RouterModule, Routes } from '@angular/router'; import { NgxMaskDirective, NgxMaskPipe } from 'ngx-mask'; import { SharedModule } from '../../../shared/shared.module'; import { NoticeOfIntentDetailsModule } from '../notice-of-intent-details/notice-of-intent-details.module'; +import { AlcReviewComponent } from './alc-review/alc-review.component'; +import { SubmissionDocumentsComponent } from './alc-review/submission-documents/submission-documents.component'; import { ViewNoticeOfIntentSubmissionComponent } from './view-notice-of-intent-submission.component'; const routes: Routes = [ @@ -22,6 +24,6 @@ const routes: Routes = [ NgxMaskDirective, NgxMaskPipe, ], - declarations: [ViewNoticeOfIntentSubmissionComponent], + declarations: [ViewNoticeOfIntentSubmissionComponent, AlcReviewComponent, SubmissionDocumentsComponent], }) export class ViewNoticeOfIntentSubmissionModule {} From 664d9ffddf45ab07d46d8eb176d57f4a0d6da00c Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Fri, 18 Aug 2023 14:07:38 -0700 Subject: [PATCH 268/954] Add NOI Edit Submission * Make code go brr --- portal-frontend/src/app/app-routing.module.ts | 12 +- .../alcs-edit-submission.component.html | 147 +++++++ .../alcs-edit-submission.component.scss | 365 ++++++++++++++++++ .../alcs-edit-submission.component.spec.ts | 63 +++ .../alcs-edit-submission.component.ts | 230 +++++++++++ .../alcs-edit-submission.module.ts | 28 ++ .../confirm-publish-dialog.component.html | 15 + .../confirm-publish-dialog.component.scss | 32 ++ .../confirm-publish-dialog.component.spec.ts | 30 ++ .../confirm-publish-dialog.component.ts | 18 + ...ve-file-confirmation-dialog.component.html | 15 + ...ve-file-confirmation-dialog.component.scss | 24 ++ ...file-confirmation-dialog.component.spec.ts | 35 ++ ...move-file-confirmation-dialog.component.ts | 19 + .../edit-submission.component.html | 1 - ...of-intent-submission-draft.service.spec.ts | 95 +++++ ...tice-of-intent-submission-draft.service.ts | 79 ++++ ...intent-submission-draft.controller.spec.ts | 91 +++++ ...e-of-intent-submission-draft.controller.ts | 58 +++ ...otice-of-intent-submission-draft.module.ts | 20 + ...of-intent-submission-draft.service.spec.ts | 181 +++++++++ ...tice-of-intent-submission-draft.service.ts | 282 ++++++++++++++ ...ce-of-intent-submission.controller.spec.ts | 8 +- .../notice-of-intent-submission.controller.ts | 8 +- .../notice-of-intent-submission.entity.ts | 7 + .../notice-of-intent-submission.module.ts | 1 + .../apps/alcs/src/portal/portal.module.ts | 3 + 27 files changed, 1860 insertions(+), 7 deletions(-) create mode 100644 portal-frontend/src/app/features/notice-of-intents/alcs-edit-submission/alcs-edit-submission.component.html create mode 100644 portal-frontend/src/app/features/notice-of-intents/alcs-edit-submission/alcs-edit-submission.component.scss create mode 100644 portal-frontend/src/app/features/notice-of-intents/alcs-edit-submission/alcs-edit-submission.component.spec.ts create mode 100644 portal-frontend/src/app/features/notice-of-intents/alcs-edit-submission/alcs-edit-submission.component.ts create mode 100644 portal-frontend/src/app/features/notice-of-intents/alcs-edit-submission/alcs-edit-submission.module.ts create mode 100644 portal-frontend/src/app/features/notice-of-intents/alcs-edit-submission/confirm-publish-dialog/confirm-publish-dialog.component.html create mode 100644 portal-frontend/src/app/features/notice-of-intents/alcs-edit-submission/confirm-publish-dialog/confirm-publish-dialog.component.scss create mode 100644 portal-frontend/src/app/features/notice-of-intents/alcs-edit-submission/confirm-publish-dialog/confirm-publish-dialog.component.spec.ts create mode 100644 portal-frontend/src/app/features/notice-of-intents/alcs-edit-submission/confirm-publish-dialog/confirm-publish-dialog.component.ts create mode 100644 portal-frontend/src/app/features/notice-of-intents/alcs-edit-submission/remove-file-confirmation-dialog/remove-file-confirmation-dialog.component.html create mode 100644 portal-frontend/src/app/features/notice-of-intents/alcs-edit-submission/remove-file-confirmation-dialog/remove-file-confirmation-dialog.component.scss create mode 100644 portal-frontend/src/app/features/notice-of-intents/alcs-edit-submission/remove-file-confirmation-dialog/remove-file-confirmation-dialog.component.spec.ts create mode 100644 portal-frontend/src/app/features/notice-of-intents/alcs-edit-submission/remove-file-confirmation-dialog/remove-file-confirmation-dialog.component.ts create mode 100644 portal-frontend/src/app/services/notice-of-intent-submission/notice-of-intent-submission-draft.service.spec.ts create mode 100644 portal-frontend/src/app/services/notice-of-intent-submission/notice-of-intent-submission-draft.service.ts create mode 100644 services/apps/alcs/src/portal/notice-of-intent-submission-draft/notice-of-intent-submission-draft.controller.spec.ts create mode 100644 services/apps/alcs/src/portal/notice-of-intent-submission-draft/notice-of-intent-submission-draft.controller.ts create mode 100644 services/apps/alcs/src/portal/notice-of-intent-submission-draft/notice-of-intent-submission-draft.module.ts create mode 100644 services/apps/alcs/src/portal/notice-of-intent-submission-draft/notice-of-intent-submission-draft.service.spec.ts create mode 100644 services/apps/alcs/src/portal/notice-of-intent-submission-draft/notice-of-intent-submission-draft.service.ts diff --git a/portal-frontend/src/app/app-routing.module.ts b/portal-frontend/src/app/app-routing.module.ts index 5b4f6246d9..51e9d2e4d3 100644 --- a/portal-frontend/src/app/app-routing.module.ts +++ b/portal-frontend/src/app/app-routing.module.ts @@ -1,12 +1,9 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { ViewApplicationSubmissionModule } from './features/applications/view-submission/view-application-submission.module'; import { AuthorizationComponent } from './features/authorization/authorization.component'; import { HomeComponent } from './features/home/home.component'; import { LandingPageComponent } from './features/landing-page/landing-page.component'; import { LoginComponent } from './features/login/login.component'; -import { ViewApplicationSubmissionComponent } from './features/applications/view-submission/view-application-submission.component'; -import { ViewNoticeOfIntentSubmissionComponent } from './features/notice-of-intents/view-submission/view-notice-of-intent-submission.component'; import { AlcsAuthGuard } from './services/authentication/alcs-auth.guard'; import { AuthGuard } from './services/authentication/auth.guard'; @@ -57,6 +54,15 @@ const routes: Routes = [ (m) => m.AlcsEditSubmissionModule ), }, + { + title: 'ALCS Edit Notice of Intent', + path: 'alcs/notice-of-intent/:fileId/edit', + canActivate: [AlcsAuthGuard], + loadChildren: () => + import('./features/notice-of-intents/alcs-edit-submission/alcs-edit-submission.module').then( + (m) => m.AlcsEditSubmissionModule + ), + }, { title: 'Review Application', path: 'application/:fileId/review', diff --git a/portal-frontend/src/app/features/notice-of-intents/alcs-edit-submission/alcs-edit-submission.component.html b/portal-frontend/src/app/features/notice-of-intents/alcs-edit-submission/alcs-edit-submission.component.html new file mode 100644 index 0000000000..00dacfed36 --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/alcs-edit-submission/alcs-edit-submission.component.html @@ -0,0 +1,147 @@ + +
+
Notice of Intent ID: {{ noiSubmission.fileNumber }} | {{ noiSubmission.type }}
+
+ +
+
+ + + + + +
+ +
+ + + +
+ +
+ + + +
+ +
+ + + +
+ +
+ + + +
+ + + + + + +
+ + + +
+ +
+ + + +
+ +
+ + + +
+ +
+ + diff --git a/portal-frontend/src/app/features/notice-of-intents/alcs-edit-submission/alcs-edit-submission.component.scss b/portal-frontend/src/app/features/notice-of-intents/alcs-edit-submission/alcs-edit-submission.component.scss new file mode 100644 index 0000000000..680d1f6272 --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/alcs-edit-submission/alcs-edit-submission.component.scss @@ -0,0 +1,365 @@ +@use '../../../../styles/functions' as *; +@use '../../../../styles/colors'; + +.header { + margin: rem(24) 0; + display: flex; + justify-content: space-between; + flex-flow: row wrap; + + h6 { + display: flex; + align-items: center; + justify-content: center; + } + .header-btn-wrapper { + display: flex; + align-items: center; + flex-wrap: wrap; + margin-top: rem(16); + + button { + width: 100%; + } + } + + .change-app-type-btn-wrapper { + display: flex; + align-items: center; + margin-top: rem(16); + margin-left: 0; + width: 100%; + + button { + width: 100%; + } + + .mat-icon { + margin-left: rem(8); + width: rem(22); + height: rem(22); + font-size: rem(22); + } + } + + @media screen and (min-width: $tabletBreakpoint) { + .header-btn-wrapper { + margin-top: 0; + + button { + width: auto; + } + + .change-app-type-btn-wrapper { + width: auto; + display: flex; + align-items: center; + margin-top: 0; + margin-left: rem(16); + + button { + width: auto; + } + + .mat-icon { + margin-left: rem(16); + font-size: rem(24); + } + } + } + } +} + +:host::ng-deep { + .step-description { + display: grid; + grid-template-columns: 1fr; + grid-row-gap: rem(24); + margin-bottom: rem(32); + } + + .mat-icon.mat-icon-inline { + line-height: initial; + } + + .mat-horizontal-content-container { + padding: 0; + min-height: 100%; + } + + .mat-horizontal-stepper-wrapper { + min-height: 100%; + } + + .subtext { + margin-bottom: rem(8) !important; + } + + .mat-step-header .mat-step-icon-selected { + color: #fff; + } + + .mat-step-header .mat-step-label.mat-step-label-active { + display: none; + } + + .mat-step-label { + display: none; + } + + .section { + margin: rem(24) 0; + } + + .date-picker { + ::ng-deep.mat-form-field-infix { + display: flex; + padding: rem(3) 0; + } + } + + .mat-button-wrapper { + white-space: break-spaces; + } + + .parcel-buttons-wrappers button { + margin-top: 1.2rem !important; + } + + @media screen and (min-width: $tabletBreakpoint) { + .mat-step-header .mat-step-label.mat-step-label-active { + display: inherit; + } + + .mat-step-label { + display: inherit; + } + } + + .review-step { + min-height: 100%; + } + + .mobile-hidden { + display: none !important; + + @media screen and (min-width: $tabletBreakpoint) { + display: initial !important; + } + } + + .tablet-hidden { + display: initial !important; + + @media screen and (min-width: $tabletBreakpoint) { + display: none !important; + } + } + + .mat-button-toggle-appearance-standard .mat-button-toggle-label-content { + line-height: rem(33); + } + + .mat-button-toggle-checked.mat-button-toggle-appearance-standard { + background-color: colors.$primary-color-light; + } + + .edit-application { + .description { + margin-top: rem(12); + margin-bottom: rem(20); + display: flex; + flex-direction: column; + + div { + display: flex; + align-items: center; + } + + .save-button { + margin-top: rem(16) !important; + width: 100%; + } + + @media screen and (min-width: $tabletBreakpoint) { + flex-direction: row; + justify-content: space-between; + + .save-button { + margin-left: rem(12) !important; + margin-top: unset !important; + width: unset; + } + } + } + + .button-container { + margin-top: rem(40); + margin-bottom: rem(24); + display: flex; + flex-direction: column-reverse; + justify-content: space-between; + + @media screen and (min-width: $tabletBreakpoint) { + flex-direction: row; + justify-content: space-between; + } + + div { + display: grid; + grid-template-columns: 1fr 1fr; + grid-column-gap: rem(8); + + @media screen and (min-width: $tabletBreakpoint) { + display: flex; + justify-content: space-between; + } + + button { + margin-bottom: rem(24) !important; + + @media screen and (min-width: $tabletBreakpoint) { + margin-left: rem(24) !important; + margin-bottom: 0 !important; + } + } + } + } + } + + // parcel entry details + .float-right { + float: right; + } + + .container { + margin: rem(20) 0 rem(20) 0; + } + + .parcel-checkbox { + margin: rem(20) 0 0 0; + } + + .type { + margin-bottom: rem(30); + } + + .pmbc-search { + border: 1px solid colors.$primary-color-dark; + border-radius: rem(4); + background-color: rgba(colors.$accent-color-light, 0.2); + padding: rem(16); + } + + .field-error { + color: colors.$error-color; + font-size: rem(15); + font-weight: 700; + display: flex; + align-items: center; + margin-top: rem(4); + } + + .form-row { + margin-top: rem(16); + display: grid; + grid-template-columns: 1fr; + grid-column-gap: rem(30); + + @media screen and (min-width: $desktopBreakpoint) { + & { + grid-template-columns: 1fr 1fr; + } + + .full-row { + grid-column: 1/3; + } + } + } + + .radio-row { + margin: rem(10) 0; + display: block; + + .mat-radio-button { + margin-right: rem(12); + } + } + + .full-width-input { + width: 100%; + } + + .mat-expansion-panel { + margin-bottom: rem(16); + } + + .mat-checkbox { + display: flex; + justify-content: center; + .mat-checkbox-layout { + white-space: break-spaces; + } + } + + .flex-center-wrap { + display: flex; + justify-content: center; + flex-wrap: wrap; + } + + .flex-evenly-wrap { + display: flex; + justify-content: space-evenly; + flex-wrap: wrap; + } + + .flex-space-between-wrap { + display: flex; + justify-content: space-between; + flex-wrap: wrap; + } + + .other-parcels-form { + width: 100%; + display: flex; + flex-direction: column; + row-gap: rem(24); + } + + .owner-table-wrapper { + display: block; + overflow: auto; + width: 100%; + } + + .land-use-form { + display: grid; + grid-template-columns: 1fr; + + .land-use-type-wrapper { + display: flex; + gap: rem(24); + flex-wrap: wrap; + width: 100%; + + .land-use-type { + width: 100%; + } + } + + @media screen and (min-width: $tabletBreakpoint) { + .land-use-type-wrapper { + flex-wrap: nowrap; + + .land-use-type { + width: 64%; + } + } + } + } + + .display-block { + display: block; + } +} diff --git a/portal-frontend/src/app/features/notice-of-intents/alcs-edit-submission/alcs-edit-submission.component.spec.ts b/portal-frontend/src/app/features/notice-of-intents/alcs-edit-submission/alcs-edit-submission.component.spec.ts new file mode 100644 index 0000000000..dc910ac2ac --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/alcs-edit-submission/alcs-edit-submission.component.spec.ts @@ -0,0 +1,63 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { MatAutocompleteModule } from '@angular/material/autocomplete'; +import { MatDialogModule } from '@angular/material/dialog'; +import { RouterTestingModule } from '@angular/router/testing'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { CodeService } from '../../../services/code/code.service'; +import { NoticeOfIntentDocumentService } from '../../../services/notice-of-intent-document/notice-of-intent-document.service'; +import { NoticeOfIntentSubmissionDraftService } from '../../../services/notice-of-intent-submission/notice-of-intent-submission-draft.service'; +import { NoticeOfIntentSubmissionService } from '../../../services/notice-of-intent-submission/notice-of-intent-submission.service'; +import { PdfGenerationService } from '../../../services/pdf-generation/pdf-generation.service'; +import { ToastService } from '../../../services/toast/toast.service'; +import { AlcsEditSubmissionComponent } from './alcs-edit-submission.component'; + +describe('AlcsEditSubmissionComponent', () => { + let component: AlcsEditSubmissionComponent; + let fixture: ComponentFixture; + let mockSubmissionService: DeepMocked; + + beforeEach(async () => { + mockSubmissionService = createMock(); + + await TestBed.configureTestingModule({ + declarations: [AlcsEditSubmissionComponent], + providers: [ + { + provide: NoticeOfIntentSubmissionDraftService, + useValue: {}, + }, + { + provide: NoticeOfIntentDocumentService, + useValue: {}, + }, + { + provide: CodeService, + useValue: {}, + }, + { + provide: ToastService, + useValue: {}, + }, + { + provide: PdfGenerationService, + useValue: {}, + }, + { + provide: NoticeOfIntentSubmissionService, + useValue: mockSubmissionService, + }, + ], + imports: [RouterTestingModule, MatAutocompleteModule, MatDialogModule], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(AlcsEditSubmissionComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/notice-of-intents/alcs-edit-submission/alcs-edit-submission.component.ts b/portal-frontend/src/app/features/notice-of-intents/alcs-edit-submission/alcs-edit-submission.component.ts new file mode 100644 index 0000000000..ec9de0dc23 --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/alcs-edit-submission/alcs-edit-submission.component.ts @@ -0,0 +1,230 @@ +import { StepperSelectionEvent } from '@angular/cdk/stepper'; +import { AfterViewInit, Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; +import { MatDialog } from '@angular/material/dialog'; +import { ActivatedRoute, Router } from '@angular/router'; +import { getDiff } from 'recursive-diff'; +import { BehaviorSubject, combineLatest, Observable, of, Subject, takeUntil } from 'rxjs'; +import { environment } from '../../../../environments/environment'; +import { NoticeOfIntentDocumentDto } from '../../../services/notice-of-intent-document/notice-of-intent-document.dto'; +import { NoticeOfIntentDocumentService } from '../../../services/notice-of-intent-document/notice-of-intent-document.service'; +import { NoticeOfIntentSubmissionDraftService } from '../../../services/notice-of-intent-submission/notice-of-intent-submission-draft.service'; +import { NoticeOfIntentSubmissionDetailedDto } from '../../../services/notice-of-intent-submission/notice-of-intent-submission.dto'; +import { NoticeOfIntentSubmissionService } from '../../../services/notice-of-intent-submission/notice-of-intent-submission.service'; +import { ToastService } from '../../../services/toast/toast.service'; +import { CustomStepperComponent } from '../../../shared/custom-stepper/custom-stepper.component'; +import { OverlaySpinnerService } from '../../../shared/overlay-spinner/overlay-spinner.service'; +import { scrollToElement } from '../../../shared/utils/scroll-helper'; +import { AdditionalInformationComponent } from '../edit-submission/additional-information/additional-information.component'; +import { EditNoiSteps } from '../edit-submission/edit-submission.component'; +import { LandUseComponent } from '../edit-submission/land-use/land-use.component'; +import { OtherAttachmentsComponent } from '../edit-submission/other-attachments/other-attachments.component'; +import { ParcelDetailsComponent } from '../edit-submission/parcels/parcel-details.component'; +import { PrimaryContactComponent } from '../edit-submission/primary-contact/primary-contact.component'; +import { PfrsProposalComponent } from '../edit-submission/proposal/pfrs/pfrs-proposal.component'; +import { PofoProposalComponent } from '../edit-submission/proposal/pofo/pofo-proposal.component'; +import { RosoProposalComponent } from '../edit-submission/proposal/roso/roso-proposal.component'; +import { SelectGovernmentComponent } from '../edit-submission/select-government/select-government.component'; +import { ConfirmPublishDialogComponent } from './confirm-publish-dialog/confirm-publish-dialog.component'; + +@Component({ + selector: 'app-alcs-edit-submission', + templateUrl: './alcs-edit-submission.component.html', + styleUrls: ['./alcs-edit-submission.component.scss'], +}) +export class AlcsEditSubmissionComponent implements OnInit, OnDestroy, AfterViewInit { + fileId = ''; + documents: NoticeOfIntentDocumentDto[] = []; + + $destroy = new Subject(); + $noiSubmission = new BehaviorSubject(undefined); + $noiDocuments = new BehaviorSubject([]); + noiSubmission: NoticeOfIntentSubmissionDetailedDto | undefined; + originalSubmissionUuid = ''; + + steps = EditNoiSteps; + expandedParcelUuid?: string; + + showValidationErrors = false; + updatedFields: string[] = []; + + @ViewChild('cdkStepper') public customStepper!: CustomStepperComponent; + + @ViewChild(ParcelDetailsComponent) parcelDetailsComponent!: ParcelDetailsComponent; + @ViewChild(PrimaryContactComponent) primaryContactComponent!: PrimaryContactComponent; + @ViewChild(SelectGovernmentComponent) selectGovernmentComponent!: SelectGovernmentComponent; + @ViewChild(LandUseComponent) landUseComponent!: LandUseComponent; + @ViewChild(OtherAttachmentsComponent) otherAttachmentsComponent!: OtherAttachmentsComponent; + @ViewChild(RosoProposalComponent) rosoProposalComponent!: RosoProposalComponent; + @ViewChild(PofoProposalComponent) pofoProposalComponent!: PofoProposalComponent; + @ViewChild(PfrsProposalComponent) pfrsProposalComponent!: PfrsProposalComponent; + @ViewChild(AdditionalInformationComponent) rosoAdditionalInfoComponent!: AdditionalInformationComponent; + + constructor( + private noticeOfIntentSubmissionDraftService: NoticeOfIntentSubmissionDraftService, + private noticeOfIntentSubmissionService: NoticeOfIntentSubmissionService, + private noticeOfIntentDocumentService: NoticeOfIntentDocumentService, + private activatedRoute: ActivatedRoute, + private dialog: MatDialog, + private toastService: ToastService, + private overlayService: OverlaySpinnerService, + private router: Router + ) {} + + ngOnInit(): void { + this.expandedParcelUuid = undefined; + } + + ngAfterViewInit(): void { + combineLatest([this.activatedRoute.queryParamMap, this.activatedRoute.paramMap]) + .pipe(takeUntil(this.$destroy)) + .subscribe(([queryParamMap, paramMap]) => { + const fileId = paramMap.get('fileId'); + if (fileId) { + this.loadDraftSubmission(fileId).then(() => { + const stepInd = paramMap.get('stepInd'); + const parcelUuid = queryParamMap.get('parcelUuid'); + const showErrors = queryParamMap.get('errors'); + if (showErrors) { + this.showValidationErrors = showErrors === 't'; + } + + if (stepInd) { + // setTimeout is required for stepper to be initialized + setTimeout(() => { + this.customStepper.navigateToStep(parseInt(stepInd), true); + + if (parcelUuid) { + this.expandedParcelUuid = parcelUuid; + } + }); + } + }); + } + }); + } + + ngOnDestroy(): void { + this.$destroy.next(); + this.$destroy.complete(); + } + + private async loadOriginalSubmission(fileId: string) { + const originalSubmission = await this.noticeOfIntentSubmissionService.getByFileId(fileId); + if (originalSubmission) { + this.originalSubmissionUuid = originalSubmission?.uuid; + + const diffResult = getDiff(originalSubmission, this.noiSubmission); + const changedFields = new Set(); + for (const diff of diffResult) { + const fullPath = diff.path.join('.'); + if (!fullPath.toLowerCase().includes('uuid')) { + changedFields.add(diff.path.join('.')); + changedFields.add(diff.path[0].toString()); + } + } + this.updatedFields = [...changedFields.keys()]; + } + } + + private async loadDraftSubmission(fileId: string) { + if (!this.noiSubmission) { + this.overlayService.showSpinner(); + this.noiSubmission = await this.noticeOfIntentSubmissionDraftService.getByFileId(fileId); + this.loadOriginalSubmission(fileId); + const documents = await this.noticeOfIntentDocumentService.getByFileId(fileId); + if (documents) { + this.$noiDocuments.next(documents); + } + this.fileId = fileId; + this.$noiSubmission.next(this.noiSubmission); + this.overlayService.hideSpinner(); + } + } + + // this gets fired whenever applicant navigates away from edit page + async canDeactivate(): Promise> { + await this.saveSubmission(this.customStepper.selectedIndex); + return of(true); + } + + async onStepChange($event: StepperSelectionEvent) { + // scrolls to step if step selected programmatically + scrollToElement({ id: `stepWrapper_${$event.selectedIndex}`, center: false }); + } + + async saveSubmission(step: number) { + switch (step) { + case EditNoiSteps.Parcel: + await this.parcelDetailsComponent.onSave(); + break; + case EditNoiSteps.PrimaryContact: + await this.primaryContactComponent.onSave(); + break; + case EditNoiSteps.Government: + await this.selectGovernmentComponent.onSave(); + break; + case EditNoiSteps.LandUse: + await this.landUseComponent.onSave(); + break; + case EditNoiSteps.Attachments: + await this.otherAttachmentsComponent.onSave(); + break; + case EditNoiSteps.Proposal: + if (this.rosoProposalComponent) { + await this.rosoProposalComponent.onSave(); + } + if (this.pofoProposalComponent) { + await this.pofoProposalComponent.onSave(); + } + if (this.pfrsProposalComponent) { + await this.pfrsProposalComponent.onSave(); + } + break; + case EditNoiSteps.ExtraInfo: + if (this.rosoAdditionalInfoComponent) { + await this.rosoAdditionalInfoComponent.onSave(); + } + break; + case EditNoiSteps.ReviewAndSubmit: + //DO NOTHING + break; + default: + this.toastService.showErrorToast('Error updating notice of intent.'); + } + } + + async switchStep(index: number) { + // navigation to url will cause step change based on the index (index starts from 0) + // The save will be triggered using canDeactivate guard + this.showValidationErrors = this.customStepper.selectedIndex === EditNoiSteps.ReviewAndSubmit; + await this.router.navigateByUrl(`/alcs/notice-of-intent/${this.fileId}/edit/${index}`); + } + + onParcelDetailsInitialized() { + if (this.expandedParcelUuid && this.parcelDetailsComponent) { + this.parcelDetailsComponent.openParcel(this.expandedParcelUuid); + this.expandedParcelUuid = undefined; + } + } + + async onDownloadPdf(fileNumber: string | undefined) { + //TODO: Add this + } + + async onExit() { + await this.noticeOfIntentSubmissionDraftService.delete(this.fileId); + window.location.href = `${environment.alcsUrl}/notice-of-intent/${this.fileId}/applicant-info`; + } + + async onSubmit() { + this.dialog + .open(ConfirmPublishDialogComponent) + .beforeClosed() + .subscribe(async (didConfirm) => { + if (didConfirm) { + await this.noticeOfIntentSubmissionDraftService.publish(this.fileId); + window.location.href = `${environment.alcsUrl}/notice-of-intent/${this.fileId}/applicant-info`; + } + }); + } +} diff --git a/portal-frontend/src/app/features/notice-of-intents/alcs-edit-submission/alcs-edit-submission.module.ts b/portal-frontend/src/app/features/notice-of-intents/alcs-edit-submission/alcs-edit-submission.module.ts new file mode 100644 index 0000000000..1afea8940e --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/alcs-edit-submission/alcs-edit-submission.module.ts @@ -0,0 +1,28 @@ +import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from '@angular/router'; +import { CanDeactivateGuard } from '../../../shared/guard/can-deactivate.guard'; +import { SharedModule } from '../../../shared/shared.module'; +import { EditSubmissionBaseModule } from '../edit-submission/edit-submission-base.module'; +import { AlcsEditSubmissionComponent } from './alcs-edit-submission.component'; +import { ConfirmPublishDialogComponent } from './confirm-publish-dialog/confirm-publish-dialog.component'; +import { RemoveFileConfirmationDialogComponent } from './remove-file-confirmation-dialog/remove-file-confirmation-dialog.component'; + +const routes: Routes = [ + { + path: '', + component: AlcsEditSubmissionComponent, + canDeactivate: [CanDeactivateGuard], + }, + { + path: ':stepInd', + component: AlcsEditSubmissionComponent, + canDeactivate: [CanDeactivateGuard], + }, +]; + +@NgModule({ + declarations: [AlcsEditSubmissionComponent, ConfirmPublishDialogComponent, RemoveFileConfirmationDialogComponent], + imports: [CommonModule, SharedModule, RouterModule.forChild(routes), EditSubmissionBaseModule], +}) +export class AlcsEditSubmissionModule {} diff --git a/portal-frontend/src/app/features/notice-of-intents/alcs-edit-submission/confirm-publish-dialog/confirm-publish-dialog.component.html b/portal-frontend/src/app/features/notice-of-intents/alcs-edit-submission/confirm-publish-dialog/confirm-publish-dialog.component.html new file mode 100644 index 0000000000..ab593c1b00 --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/alcs-edit-submission/confirm-publish-dialog/confirm-publish-dialog.component.html @@ -0,0 +1,15 @@ +
+

Confirm Submission Update

+
+
+

Once confirmed, any updates made to the applicant's submission will be immediately visible in the Portal.

+

+ In ALCS, an updated version of the submission PDF will be added to the Documents table and made visible to the + applicant and Commissioners. The original submission PDF and any existing updated submission PDFs will no longer be + visible but will remain in the Documents table for internal reference. +

+
+
+ + +
diff --git a/portal-frontend/src/app/features/notice-of-intents/alcs-edit-submission/confirm-publish-dialog/confirm-publish-dialog.component.scss b/portal-frontend/src/app/features/notice-of-intents/alcs-edit-submission/confirm-publish-dialog/confirm-publish-dialog.component.scss new file mode 100644 index 0000000000..67d44d5da0 --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/alcs-edit-submission/confirm-publish-dialog/confirm-publish-dialog.component.scss @@ -0,0 +1,32 @@ +@use '../../../../../styles/functions' as *; + +.mat-dialog-actions { + justify-content: flex-end; +} + +p { + margin-bottom: rem(16) !important; +} + +.mat-mdc-dialog-content { + margin-top: rem(12); +} + +.button-container { + display: flex; + justify-content: center; + + @media screen and (min-width: $tabletBreakpoint) { + & { + justify-content: flex-end; + + button:not(:last-child) { + margin-right: rem(24) !important; + } + } + } + + button:not(:last-child) { + margin-right: rem(9) !important; + } +} diff --git a/portal-frontend/src/app/features/notice-of-intents/alcs-edit-submission/confirm-publish-dialog/confirm-publish-dialog.component.spec.ts b/portal-frontend/src/app/features/notice-of-intents/alcs-edit-submission/confirm-publish-dialog/confirm-publish-dialog.component.spec.ts new file mode 100644 index 0000000000..930d51aade --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/alcs-edit-submission/confirm-publish-dialog/confirm-publish-dialog.component.spec.ts @@ -0,0 +1,30 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { MatDialogModule, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; +import { ConfirmPublishDialogComponent } from './confirm-publish-dialog.component'; + +describe('ConfirmPublishDialogComponent', () => { + let component: ConfirmPublishDialogComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [MatDialogModule], + declarations: [ConfirmPublishDialogComponent], + providers: [ + { provide: MatDialogRef, useValue: {} }, + { provide: MAT_DIALOG_DATA, useValue: {} }, + ], + }).compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(ConfirmPublishDialogComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/notice-of-intents/alcs-edit-submission/confirm-publish-dialog/confirm-publish-dialog.component.ts b/portal-frontend/src/app/features/notice-of-intents/alcs-edit-submission/confirm-publish-dialog/confirm-publish-dialog.component.ts new file mode 100644 index 0000000000..fe7ba8d322 --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/alcs-edit-submission/confirm-publish-dialog/confirm-publish-dialog.component.ts @@ -0,0 +1,18 @@ +import { Component, Inject } from '@angular/core'; +import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; + +@Component({ + selector: 'app-confirm-publish-dialog', + templateUrl: './confirm-publish-dialog.component.html', + styleUrls: ['./confirm-publish-dialog.component.scss'], +}) +export class ConfirmPublishDialogComponent { + constructor( + public dialogRef: MatDialogRef, + @Inject(MAT_DIALOG_DATA) public data: any + ) {} + + onCancel(): void { + this.dialogRef.close(false); + } +} diff --git a/portal-frontend/src/app/features/notice-of-intents/alcs-edit-submission/remove-file-confirmation-dialog/remove-file-confirmation-dialog.component.html b/portal-frontend/src/app/features/notice-of-intents/alcs-edit-submission/remove-file-confirmation-dialog/remove-file-confirmation-dialog.component.html new file mode 100644 index 0000000000..e4aa159b4d --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/alcs-edit-submission/remove-file-confirmation-dialog/remove-file-confirmation-dialog.component.html @@ -0,0 +1,15 @@ +
+

Remove Submission Document

+
+ +
+ + Warning: This document will be immediately deleted from ALCS and the Portal and cannot be undone. To retain, + first download a copy from the Documents tab in ALCS then return to complete this action. + + +
+ + +
+
diff --git a/portal-frontend/src/app/features/notice-of-intents/alcs-edit-submission/remove-file-confirmation-dialog/remove-file-confirmation-dialog.component.scss b/portal-frontend/src/app/features/notice-of-intents/alcs-edit-submission/remove-file-confirmation-dialog/remove-file-confirmation-dialog.component.scss new file mode 100644 index 0000000000..c0b978492d --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/alcs-edit-submission/remove-file-confirmation-dialog/remove-file-confirmation-dialog.component.scss @@ -0,0 +1,24 @@ +@use '../../../../../styles/functions' as *; + +.margin-bottom-1 { + margin-bottom: rem(16); +} + +.step-controls { + display: flex; + justify-content: space-between; +} + +.confirm-content { + margin: rem(24) 0; +} + +@media screen and (min-width: $desktopBreakpoint) { + .step-controls { + justify-content: flex-end; + + button { + margin-left: rem(25) !important; + } + } +} diff --git a/portal-frontend/src/app/features/notice-of-intents/alcs-edit-submission/remove-file-confirmation-dialog/remove-file-confirmation-dialog.component.spec.ts b/portal-frontend/src/app/features/notice-of-intents/alcs-edit-submission/remove-file-confirmation-dialog/remove-file-confirmation-dialog.component.spec.ts new file mode 100644 index 0000000000..9cd4b6f304 --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/alcs-edit-submission/remove-file-confirmation-dialog/remove-file-confirmation-dialog.component.spec.ts @@ -0,0 +1,35 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { MatDialog, MatDialogRef } from '@angular/material/dialog'; +import { RemoveFileConfirmationDialogComponent } from './remove-file-confirmation-dialog.component'; + +describe('OtherParcelConfirmationDialogComponent', () => { + let component: RemoveFileConfirmationDialogComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [RemoveFileConfirmationDialogComponent], + providers: [ + { + provide: MatDialog, + useValue: {}, + }, + { + provide: MatDialogRef, + useValue: {}, + }, + ], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(RemoveFileConfirmationDialogComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/notice-of-intents/alcs-edit-submission/remove-file-confirmation-dialog/remove-file-confirmation-dialog.component.ts b/portal-frontend/src/app/features/notice-of-intents/alcs-edit-submission/remove-file-confirmation-dialog/remove-file-confirmation-dialog.component.ts new file mode 100644 index 0000000000..5a440ad721 --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/alcs-edit-submission/remove-file-confirmation-dialog/remove-file-confirmation-dialog.component.ts @@ -0,0 +1,19 @@ +import { Component } from '@angular/core'; +import { MatDialogRef } from '@angular/material/dialog'; + +@Component({ + selector: 'app-remove-file-confirmation-dialog', + templateUrl: './remove-file-confirmation-dialog.component.html', + styleUrls: ['./remove-file-confirmation-dialog.component.scss'], +}) +export class RemoveFileConfirmationDialogComponent { + constructor(private dialogRef: MatDialogRef) {} + + async onCancel(dialogResult: boolean = false) { + this.dialogRef.close(dialogResult); + } + + async onDelete() { + this.onCancel(true); + } +} diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.html index 74a5378584..5fd08c36a8 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.html @@ -114,7 +114,6 @@
Notice of Intent ID: {{ noiSubmission.fileNumber }} | [$noiSubmission]="$noiSubmission" [$noiDocuments]="$noiDocuments" [showErrors]="showValidationErrors" - [draftMode]="true" (navigateToStep)="switchStep($event)" (exit)="onExit()" > diff --git a/portal-frontend/src/app/services/notice-of-intent-submission/notice-of-intent-submission-draft.service.spec.ts b/portal-frontend/src/app/services/notice-of-intent-submission/notice-of-intent-submission-draft.service.spec.ts new file mode 100644 index 0000000000..e70ee9a776 --- /dev/null +++ b/portal-frontend/src/app/services/notice-of-intent-submission/notice-of-intent-submission-draft.service.spec.ts @@ -0,0 +1,95 @@ +import { HttpClient } from '@angular/common/http'; +import { HttpClientTestingModule } from '@angular/common/http/testing'; +import { TestBed } from '@angular/core/testing'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { of, throwError } from 'rxjs'; +import { ToastService } from '../toast/toast.service'; +import { NoticeOfIntentSubmissionDraftService } from './notice-of-intent-submission-draft.service'; + +describe('ApplicationSubmissionDraftService', () => { + let service: NoticeOfIntentSubmissionDraftService; + let mockToastService: DeepMocked; + let mockHttpClient: DeepMocked; + + beforeEach(() => { + mockToastService = createMock(); + mockHttpClient = createMock(); + + TestBed.configureTestingModule({ + imports: [HttpClientTestingModule], + providers: [ + { + provide: ToastService, + useValue: mockToastService, + }, + { + provide: HttpClient, + useValue: mockHttpClient, + }, + ], + }); + service = TestBed.inject(NoticeOfIntentSubmissionDraftService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); + + it('should make a get request for loading a single notice of intent', async () => { + mockHttpClient.get.mockReturnValue(of({})); + let mockFileId = 'file-id'; + + await service.getByFileId(mockFileId); + + expect(mockHttpClient.get).toHaveBeenCalledTimes(1); + expect(mockHttpClient.get.mock.calls[0][0]).toContain('notice-of-intent'); + expect(mockHttpClient.get.mock.calls[0][0]).toContain(mockFileId); + }); + + it('should show an error toast if getting a specific notice of intent fails', async () => { + mockHttpClient.get.mockReturnValue(throwError(() => ({}))); + + await service.getByFileId('file-id'); + + expect(mockHttpClient.get).toHaveBeenCalledTimes(1); + expect(mockToastService.showErrorToast).toHaveBeenCalledTimes(1); + }); + + it('should make a put request for update', async () => { + mockHttpClient.put.mockReturnValue(of({})); + let mockFileId = 'fileId'; + + await service.updatePending('fileId', {}); + + expect(mockHttpClient.put).toHaveBeenCalledTimes(1); + expect(mockHttpClient.put.mock.calls[0][0]).toContain('notice-of-intent'); + expect(mockHttpClient.put.mock.calls[0][0]).toContain(mockFileId); + }); + + it('should show an error toast if updating an notice of intent fails', async () => { + mockHttpClient.put.mockReturnValue(throwError(() => ({}))); + + await service.updatePending('file-id', {}); + + expect(mockHttpClient.put).toHaveBeenCalledTimes(1); + expect(mockToastService.showErrorToast).toHaveBeenCalledTimes(1); + }); + + it('should make a delete request for delete', async () => { + mockHttpClient.delete.mockReturnValue(of({})); + + await service.delete('fileId'); + + expect(mockHttpClient.delete).toHaveBeenCalledTimes(1); + expect(mockHttpClient.delete.mock.calls[0][0]).toContain('notice-of-intent'); + }); + + it('should show an error toast if delete a draft fails', async () => { + mockHttpClient.delete.mockReturnValue(throwError(() => ({}))); + + await service.delete('fileId'); + + expect(mockHttpClient.delete).toHaveBeenCalledTimes(1); + expect(mockToastService.showErrorToast).toHaveBeenCalledTimes(1); + }); +}); diff --git a/portal-frontend/src/app/services/notice-of-intent-submission/notice-of-intent-submission-draft.service.ts b/portal-frontend/src/app/services/notice-of-intent-submission/notice-of-intent-submission-draft.service.ts new file mode 100644 index 0000000000..0c073a770e --- /dev/null +++ b/portal-frontend/src/app/services/notice-of-intent-submission/notice-of-intent-submission-draft.service.ts @@ -0,0 +1,79 @@ +import { HttpClient } from '@angular/common/http'; +import { Injectable } from '@angular/core'; +import { firstValueFrom } from 'rxjs'; +import { environment } from '../../../environments/environment'; +import { OverlaySpinnerService } from '../../shared/overlay-spinner/overlay-spinner.service'; +import { ToastService } from '../toast/toast.service'; +import { + NoticeOfIntentSubmissionDetailedDto, + NoticeOfIntentSubmissionUpdateDto, +} from './notice-of-intent-submission.dto'; + +@Injectable({ + providedIn: 'root', +}) +export class NoticeOfIntentSubmissionDraftService { + private serviceUrl = `${environment.apiUrl}/notice-of-intent-submission-draft`; + + constructor( + private httpClient: HttpClient, + private toastService: ToastService, + private overlayService: OverlaySpinnerService + ) {} + + async getByFileId(fileId: string) { + try { + return await firstValueFrom( + this.httpClient.get(`${this.serviceUrl}/${fileId}`) + ); + } catch (e) { + console.error(e); + this.toastService.showErrorToast('Failed to load Notice of Intent, please try again later'); + return undefined; + } + } + + async updatePending(fileId: string, updateDto: NoticeOfIntentSubmissionUpdateDto) { + try { + this.overlayService.showSpinner(); + const result = await firstValueFrom( + this.httpClient.put(`${this.serviceUrl}/${fileId}`, updateDto) + ); + this.toastService.showSuccessToast('Notice of Intent Saved'); + return result; + } catch (e) { + console.error(e); + this.toastService.showErrorToast('Failed to update Notice of Intent, please try again'); + } finally { + this.overlayService.hideSpinner(); + } + + return undefined; + } + + async publish(fileId: string) { + try { + this.overlayService.showSpinner(); + await firstValueFrom(this.httpClient.post(`${this.serviceUrl}/${fileId}/publish`, {})); + this.toastService.showSuccessToast('Notice of Intent Updated'); + } catch (e) { + console.error(e); + this.toastService.showErrorToast('Failed to update Notice of Intent, please try again'); + } finally { + this.overlayService.hideSpinner(); + } + } + + async delete(fileId: string) { + try { + this.overlayService.showSpinner(); + await firstValueFrom(this.httpClient.delete(`${this.serviceUrl}/${fileId}`)); + this.toastService.showSuccessToast('Draft Edit Deleted'); + } catch (e) { + console.error(e); + this.toastService.showErrorToast('Failed to delete draft Notice of Intent, please try again'); + } finally { + this.overlayService.hideSpinner(); + } + } +} diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission-draft/notice-of-intent-submission-draft.controller.spec.ts b/services/apps/alcs/src/portal/notice-of-intent-submission-draft/notice-of-intent-submission-draft.controller.spec.ts new file mode 100644 index 0000000000..6d426c63d3 --- /dev/null +++ b/services/apps/alcs/src/portal/notice-of-intent-submission-draft/notice-of-intent-submission-draft.controller.spec.ts @@ -0,0 +1,91 @@ +import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; +import { Test, TestingModule } from '@nestjs/testing'; +import { ClsService } from 'nestjs-cls'; +import { mockKeyCloakProviders } from '../../../test/mocks/mockTypes'; +import { User } from '../../user/user.entity'; +import { NoticeOfIntentSubmission } from '../notice-of-intent-submission/notice-of-intent-submission.entity'; +import { NoticeOfIntentSubmissionService } from '../notice-of-intent-submission/notice-of-intent-submission.service'; +import { NoticeOfIntentSubmissionDraftController } from './notice-of-intent-submission-draft.controller'; +import { NoticeOfIntentSubmissionDraftService } from './notice-of-intent-submission-draft.service'; + +describe('NoticeOfIntentSubmissionDraftController', () => { + let controller: NoticeOfIntentSubmissionDraftController; + let mockNoiSubmissionService: DeepMocked; + let mockNoiDraftService: DeepMocked; + let mockUser; + + beforeEach(async () => { + mockNoiSubmissionService = createMock(); + mockNoiDraftService = createMock(); + + mockUser = new User({ + clientRoles: [], + }); + + const module: TestingModule = await Test.createTestingModule({ + controllers: [NoticeOfIntentSubmissionDraftController], + providers: [ + { + provide: NoticeOfIntentSubmissionService, + useValue: mockNoiSubmissionService, + }, + { + provide: NoticeOfIntentSubmissionDraftService, + useValue: mockNoiDraftService, + }, + { + provide: ClsService, + useValue: {}, + }, + ...mockKeyCloakProviders, + ], + }).compile(); + + controller = module.get( + NoticeOfIntentSubmissionDraftController, + ); + }); + + it('should be defined', () => { + expect(controller).toBeDefined(); + }); + + it('should call through for getOrCreateDraft', async () => { + mockNoiDraftService.getOrCreateDraft.mockResolvedValue( + new NoticeOfIntentSubmission(), + ); + mockNoiDraftService.mapToDetailedDto.mockResolvedValue({} as any); + + const submission = await controller.getOrCreateDraft('fileNumber', { + user: { + entity: mockUser, + }, + }); + expect(submission).toBeDefined(); + + expect(mockNoiDraftService.getOrCreateDraft).toHaveBeenCalledTimes(1); + expect(mockNoiDraftService.mapToDetailedDto).toHaveBeenCalledTimes(1); + }); + + it('should call through for deleteDraft', async () => { + mockNoiDraftService.deleteDraft.mockResolvedValue(); + + await controller.deleteDraft('fileNumber', { + user: { + entity: mockUser, + }, + }); + expect(mockNoiDraftService.deleteDraft).toHaveBeenCalledTimes(1); + }); + + it('should call through for publish', async () => { + mockNoiDraftService.publish.mockResolvedValue(); + + await controller.publishDraft('fileNumber', { + user: { + entity: mockUser, + }, + }); + expect(mockNoiDraftService.publish).toHaveBeenCalledTimes(1); + }); +}); diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission-draft/notice-of-intent-submission-draft.controller.ts b/services/apps/alcs/src/portal/notice-of-intent-submission-draft/notice-of-intent-submission-draft.controller.ts new file mode 100644 index 0000000000..c69b19ea7b --- /dev/null +++ b/services/apps/alcs/src/portal/notice-of-intent-submission-draft/notice-of-intent-submission-draft.controller.ts @@ -0,0 +1,58 @@ +import { + Controller, + Delete, + Get, + Param, + Post, + Req, + UseGuards, +} from '@nestjs/common'; +import { ApiOAuth2 } from '@nestjs/swagger'; +import * as config from 'config'; +import { ROLES_ALLOWED_APPLICATIONS } from '../../common/authorization/roles'; +import { RolesGuard } from '../../common/authorization/roles-guard.service'; +import { UserRoles } from '../../common/authorization/roles.decorator'; +import { NoticeOfIntentSubmissionService } from '../notice-of-intent-submission/notice-of-intent-submission.service'; +import { NoticeOfIntentSubmissionDraftService } from './notice-of-intent-submission-draft.service'; + +@ApiOAuth2(config.get('KEYCLOAK.SCOPES')) +@Controller('notice-of-intent-submission-draft') +@UseGuards(RolesGuard) +export class NoticeOfIntentSubmissionDraftController { + constructor( + private noticeOfIntentSubmissionService: NoticeOfIntentSubmissionService, + private noticeOfIntentSubmissionDraftService: NoticeOfIntentSubmissionDraftService, + ) {} + + @Get('/:fileNumber') + @UserRoles(...ROLES_ALLOWED_APPLICATIONS) + async getOrCreateDraft(@Param('fileNumber') fileNumber: string, @Req() req) { + const noticeOfIntentSubmission = + await this.noticeOfIntentSubmissionDraftService.getOrCreateDraft( + fileNumber, + req.user.entity, + ); + return await this.noticeOfIntentSubmissionDraftService.mapToDetailedDto( + noticeOfIntentSubmission, + req.user.entity, + ); + } + + @Post('/:fileNumber/publish') + @UserRoles(...ROLES_ALLOWED_APPLICATIONS) + async publishDraft(@Param('fileNumber') fileNumber: string, @Req() req) { + await this.noticeOfIntentSubmissionDraftService.publish( + fileNumber, + req.user.entity, + ); + } + + @Delete('/:fileNumber') + @UserRoles(...ROLES_ALLOWED_APPLICATIONS) + async deleteDraft(@Param('fileNumber') fileNumber: string, @Req() req) { + await this.noticeOfIntentSubmissionDraftService.deleteDraft( + fileNumber, + req.user.entity, + ); + } +} diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission-draft/notice-of-intent-submission-draft.module.ts b/services/apps/alcs/src/portal/notice-of-intent-submission-draft/notice-of-intent-submission-draft.module.ts new file mode 100644 index 0000000000..860dab2355 --- /dev/null +++ b/services/apps/alcs/src/portal/notice-of-intent-submission-draft/notice-of-intent-submission-draft.module.ts @@ -0,0 +1,20 @@ +import { Module } from '@nestjs/common'; +import { TypeOrmModule } from '@nestjs/typeorm'; +import { NoticeOfIntentSubmissionStatusModule } from '../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.module'; +import { NoticeOfIntentSubmission } from '../notice-of-intent-submission/notice-of-intent-submission.entity'; +import { NoticeOfIntentSubmissionModule } from '../notice-of-intent-submission/notice-of-intent-submission.module'; +import { PdfGenerationModule } from '../pdf-generation/pdf-generation.module'; +import { NoticeOfIntentSubmissionDraftController } from './notice-of-intent-submission-draft.controller'; +import { NoticeOfIntentSubmissionDraftService } from './notice-of-intent-submission-draft.service'; + +@Module({ + imports: [ + TypeOrmModule.forFeature([NoticeOfIntentSubmission]), + NoticeOfIntentSubmissionModule, + PdfGenerationModule, + NoticeOfIntentSubmissionStatusModule, + ], + providers: [NoticeOfIntentSubmissionDraftService], + controllers: [NoticeOfIntentSubmissionDraftController], +}) +export class NoticeOfIntentSubmissionDraftModule {} diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission-draft/notice-of-intent-submission-draft.service.spec.ts b/services/apps/alcs/src/portal/notice-of-intent-submission-draft/notice-of-intent-submission-draft.service.spec.ts new file mode 100644 index 0000000000..64be70944d --- /dev/null +++ b/services/apps/alcs/src/portal/notice-of-intent-submission-draft/notice-of-intent-submission-draft.service.spec.ts @@ -0,0 +1,181 @@ +import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; +import { Test, TestingModule } from '@nestjs/testing'; +import { getRepositoryToken } from '@nestjs/typeorm'; +import { Repository } from 'typeorm'; +import { NoticeOfIntentSubmissionStatusService } from '../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service'; +import { User } from '../../user/user.entity'; +import { NoticeOfIntentOwnerService } from '../notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.service'; +import { NoticeOfIntentParcelService } from '../notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.service'; +import { NoticeOfIntentSubmission } from '../notice-of-intent-submission/notice-of-intent-submission.entity'; +import { NoticeOfIntentSubmissionService } from '../notice-of-intent-submission/notice-of-intent-submission.service'; +import { GenerateSubmissionDocumentService } from '../pdf-generation/generate-submission-document.service'; +import { NoticeOfIntentSubmissionDraftService } from './notice-of-intent-submission-draft.service'; + +describe('NoticeOfIntentSubmissionDraftService', () => { + let service: NoticeOfIntentSubmissionDraftService; + let mockSubmissionRepo: DeepMocked>; + let mockNoiSubmissionService: DeepMocked; + let mockParcelService: DeepMocked; + let mockAppOwnerService: DeepMocked; + let mockGenerateSubmissionDocumentService: DeepMocked; + let mockNoiSubmissionStatusService: DeepMocked; + + let mockUser; + + beforeEach(async () => { + mockSubmissionRepo = createMock(); + mockNoiSubmissionService = createMock(); + mockParcelService = createMock(); + mockAppOwnerService = createMock(); + mockGenerateSubmissionDocumentService = createMock(); + mockNoiSubmissionStatusService = createMock(); + + mockUser = new User({ + clientRoles: [], + }); + + const module: TestingModule = await Test.createTestingModule({ + providers: [ + NoticeOfIntentSubmissionDraftService, + { + provide: getRepositoryToken(NoticeOfIntentSubmission), + useValue: mockSubmissionRepo, + }, + { + provide: NoticeOfIntentSubmissionService, + useValue: mockNoiSubmissionService, + }, + { + provide: NoticeOfIntentParcelService, + useValue: mockParcelService, + }, + { + provide: NoticeOfIntentOwnerService, + useValue: mockAppOwnerService, + }, + { + provide: GenerateSubmissionDocumentService, + useValue: mockGenerateSubmissionDocumentService, + }, + { + provide: NoticeOfIntentSubmissionStatusService, + useValue: mockNoiSubmissionStatusService, + }, + ], + }).compile(); + + service = module.get( + NoticeOfIntentSubmissionDraftService, + ); + }); + + it('should be defined', () => { + expect(service).toBeDefined(); + }); + + it('return the draft if one exists', async () => { + mockSubmissionRepo.findOne.mockResolvedValue( + new NoticeOfIntentSubmission(), + ); + + const draft = await service.getOrCreateDraft('fileNumber', mockUser); + + expect(mockSubmissionRepo.findOne).toHaveBeenCalledTimes(1); + expect(draft).toBeDefined(); + }); + + it('create a new draft if one does not exist', async () => { + mockSubmissionRepo.findOne + .mockResolvedValueOnce(null) + .mockResolvedValueOnce( + new NoticeOfIntentSubmission({ + owners: [], + parcels: [], + }), + ) + .mockResolvedValueOnce(new NoticeOfIntentSubmission()); + + mockSubmissionRepo.save.mockResolvedValue(new NoticeOfIntentSubmission()); + mockParcelService.update.mockResolvedValue([]); + const mockTransaction = jest.fn(); + mockSubmissionRepo.manager.transaction = mockTransaction; + mockNoiSubmissionStatusService.getCopiedStatuses.mockResolvedValue([]); + + const draft = await service.getOrCreateDraft('fileNumber', mockUser); + + expect(mockSubmissionRepo.findOne).toHaveBeenCalledTimes(3); + expect(mockSubmissionRepo.save).toHaveBeenCalledTimes(1); + expect( + mockNoiSubmissionStatusService.getCopiedStatuses, + ).toHaveBeenCalledTimes(1); + expect(draft).toBeDefined(); + }); + + it('should delete a draft, attached parcels, statuses and owners', async () => { + mockSubmissionRepo.findOne.mockResolvedValue( + new NoticeOfIntentSubmission({ + owners: [], + parcels: [], + }), + ); + + mockSubmissionRepo.remove.mockResolvedValue(new NoticeOfIntentSubmission()); + mockParcelService.deleteMany.mockResolvedValueOnce([]); + mockNoiSubmissionStatusService.removeStatuses.mockResolvedValue({} as any); + + await service.deleteDraft('fileNumber', mockUser); + + expect(mockSubmissionRepo.findOne).toHaveBeenCalledTimes(1); + expect(mockSubmissionRepo.remove).toHaveBeenCalledTimes(1); + expect(mockParcelService.deleteMany).toHaveBeenCalledTimes(1); + expect(mockNoiSubmissionStatusService.removeStatuses).toHaveBeenCalledTimes( + 1, + ); + }); + + it('should load two submissions and save one as not draft when publishing', async () => { + mockSubmissionRepo.findOne.mockResolvedValue( + new NoticeOfIntentSubmission({ + uuid: 'fake', + owners: [], + parcels: [], + }), + ); + + mockSubmissionRepo.delete.mockResolvedValue({} as any); + mockSubmissionRepo.save.mockResolvedValue(new NoticeOfIntentSubmission()); + mockParcelService.deleteMany.mockResolvedValueOnce([]); + mockGenerateSubmissionDocumentService.generateUpdate.mockResolvedValue(); + mockNoiSubmissionStatusService.removeStatuses.mockResolvedValue({} as any); + + await service.publish('fileNumber', new User()); + + expect(mockSubmissionRepo.findOne).toHaveBeenCalledTimes(2); + expect(mockSubmissionRepo.delete).toHaveBeenCalledTimes(1); + expect(mockSubmissionRepo.delete).toBeCalledWith({ uuid: 'fake' }); + expect(mockParcelService.deleteMany).toHaveBeenCalledTimes(1); + expect(mockSubmissionRepo.save).toHaveBeenCalledTimes(1); + expect(mockNoiSubmissionStatusService.removeStatuses).toHaveBeenCalledTimes( + 1, + ); + expect(mockSubmissionRepo.save.mock.calls[0][0].isDraft).toEqual(false); + // expect( + // mockGenerateSubmissionDocumentService.generateUpdate, + // ).toHaveBeenCalledTimes(1); + }); + + it('should call through for mapToDto', async () => { + mockNoiSubmissionService.mapToDetailedDTO.mockResolvedValueOnce({} as any); + + const res = await service.mapToDetailedDto( + new NoticeOfIntentSubmission(), + new User({ + clientRoles: [], + }), + ); + + expect(mockNoiSubmissionService.mapToDetailedDTO).toHaveBeenCalledTimes(1); + expect(res).toBeDefined(); + expect(res.canEdit).toBeTruthy(); + }); +}); diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission-draft/notice-of-intent-submission-draft.service.ts b/services/apps/alcs/src/portal/notice-of-intent-submission-draft/notice-of-intent-submission-draft.service.ts new file mode 100644 index 0000000000..c3155ba577 --- /dev/null +++ b/services/apps/alcs/src/portal/notice-of-intent-submission-draft/notice-of-intent-submission-draft.service.ts @@ -0,0 +1,282 @@ +import { BaseServiceException } from '@app/common/exceptions/base.exception'; +import { BadRequestException, Injectable, Logger } from '@nestjs/common'; +import { InjectRepository } from '@nestjs/typeorm'; +import { Repository } from 'typeorm'; +import { NoticeOfIntentSubmissionStatusService } from '../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service'; +import { User } from '../../user/user.entity'; +import { NoticeOfIntentOwnerService } from '../notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.service'; +import { NoticeOfIntentParcelUpdateDto } from '../notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.dto'; +import { NoticeOfIntentParcelService } from '../notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.service'; +import { NoticeOfIntentSubmission } from '../notice-of-intent-submission/notice-of-intent-submission.entity'; +import { NoticeOfIntentSubmissionService } from '../notice-of-intent-submission/notice-of-intent-submission.service'; + +@Injectable() +export class NoticeOfIntentSubmissionDraftService { + private logger = new Logger(NoticeOfIntentSubmissionDraftService.name); + + constructor( + @InjectRepository(NoticeOfIntentSubmission) + private noticeOfIntentSubmissionRepository: Repository, + private noticeOfIntentSubmissionService: NoticeOfIntentSubmissionService, + private noticeOfIntentParcelService: NoticeOfIntentParcelService, + private noticeOfIntentOwnerService: NoticeOfIntentOwnerService, + private noticeOfIntentSubmissionStatusService: NoticeOfIntentSubmissionStatusService, + ) {} + + async getOrCreateDraft(fileNumber: string, user: User) { + const existingDraft = await this.getDraft(fileNumber); + + if (existingDraft) { + return existingDraft; + } else { + return this.createDraft(fileNumber, user); + } + } + + private async getDraft(fileNumber: string) { + return await this.noticeOfIntentSubmissionRepository.findOne({ + where: { + fileNumber: fileNumber, + isDraft: true, + }, + relations: { + createdBy: true, + owners: { + type: true, + corporateSummary: { + document: true, + }, + parcels: true, + }, + }, + }); + } + + private async createDraft( + fileNumber: string, + user: User, + ): Promise { + const originalSubmission = + await this.noticeOfIntentSubmissionRepository.findOne({ + where: { + fileNumber: fileNumber, + isDraft: false, + }, + relations: { + createdBy: true, + owners: { + type: true, + }, + parcels: { + certificateOfTitle: true, + owners: true, + }, + }, + }); + + if (!originalSubmission) { + throw new BadRequestException( + "Cannot edit a submission that doesn't exist", + ); + } + + const newSubmission = new NoticeOfIntentSubmission({ + ...originalSubmission, + uuid: undefined, + auditCreatedAt: undefined, + auditUpdatedAt: undefined, + isDraft: true, + parcels: [], + owners: [], + }); + const savedSubmission = await this.noticeOfIntentSubmissionRepository.save( + newSubmission, + ); + const statuses = + await this.noticeOfIntentSubmissionStatusService.getCopiedStatuses( + originalSubmission.uuid, + newSubmission.uuid, + ); + + await this.noticeOfIntentSubmissionRepository.manager.transaction( + async (transactionalEntityManager) => { + await transactionalEntityManager.save(newSubmission); + + await transactionalEntityManager.save(statuses); + }, + ); + + const ownerUuidMap = new Map(); + for (const owner of originalSubmission.owners) { + const savedOwner = await this.noticeOfIntentOwnerService.create( + { + firstName: owner.firstName ?? undefined, + lastName: owner.lastName ?? undefined, + typeCode: owner.type.code ?? undefined, + corporateSummaryUuid: owner.corporateSummaryUuid ?? undefined, + email: owner.email ?? undefined, + phoneNumber: owner.phoneNumber ?? undefined, + organizationName: owner.organizationName ?? undefined, + noticeOfIntentSubmissionUuid: savedSubmission.uuid, + }, + savedSubmission, + ); + ownerUuidMap.set(owner.uuid, savedOwner.uuid); + } + + const updateDtos: NoticeOfIntentParcelUpdateDto[] = []; + for (const parcel of originalSubmission.parcels) { + const savedParcel = await this.noticeOfIntentParcelService.create( + savedSubmission.uuid, + ); + updateDtos.push({ + ...parcel, + uuid: savedParcel.uuid, + ownerUuids: parcel.owners.map( + (oldOwner) => ownerUuidMap.get(oldOwner.uuid)!, + ), + purchasedDate: parcel.purchasedDate + ? parcel.purchasedDate.getTime() + : undefined, + }); + + //Copy certificate of titles + if (parcel.certificateOfTitle) { + await this.noticeOfIntentParcelService.setCertificateOfTitle( + savedParcel, + parcel.certificateOfTitle, + ); + } + } + await this.noticeOfIntentParcelService.update(updateDtos, user); + + //Copy over Primary Contact + if (originalSubmission.primaryContactOwnerUuid) { + const mappedOwnerUuid = (savedSubmission.primaryContactOwnerUuid = + ownerUuidMap.get(originalSubmission.primaryContactOwnerUuid)); + await this.noticeOfIntentSubmissionRepository.update( + { + uuid: savedSubmission.uuid, + }, + { + primaryContactOwnerUuid: mappedOwnerUuid, + }, + ); + } + + this.logger.debug(`Draft Created for File Number ${fileNumber}`); + + const submission = await this.getDraft(fileNumber); + if (submission === null) { + throw new BaseServiceException('Failed to save/create draft'); + } + return submission; + } + + async publish(fileNumber: string, user: User) { + const draft = await this.getDraft(fileNumber); + if (!draft) { + throw new BaseServiceException( + `Failed to find Draft to Publish with File Number ${fileNumber}`, + ); + } + + const original = await this.noticeOfIntentSubmissionRepository.findOne({ + where: { + fileNumber, + isDraft: false, + }, + relations: { + owners: true, + parcels: true, + createdBy: true, + }, + }); + + if (!original) { + throw new BaseServiceException( + `Failed to find original submission to Publish with FileID ${fileNumber}`, + ); + } + + //Delete Original Submission + for (const owner of original.owners) { + await this.noticeOfIntentOwnerService.delete(owner, user); + } + const parcelUuids = original.parcels.map((parcel) => parcel.uuid); + await this.noticeOfIntentParcelService.deleteMany(parcelUuids, user); + await this.noticeOfIntentSubmissionStatusService.removeStatuses( + original.uuid, + ); + await this.noticeOfIntentSubmissionRepository.delete({ + uuid: original.uuid, + }); + + draft.createdBy = original.createdBy; + draft.isDraft = false; + await this.noticeOfIntentSubmissionRepository.save(draft); + + //Generate PDF + //TODO: Turn this back on for PDFs + // await this.generateSubmissionDocumentService.generateUpdate( + // fileNumber, + // user, + // ); + this.logger.debug(`Published Draft for file number ${fileNumber}`); + } + + async deleteDraft(fileNumber: string, user: User) { + const draftSubmission = + await this.noticeOfIntentSubmissionRepository.findOne({ + where: { + fileNumber: fileNumber, + isDraft: true, + }, + relations: { + createdBy: true, + owners: { + type: true, + }, + parcels: { + owners: true, + }, + }, + }); + + if (!draftSubmission) { + throw new BadRequestException( + "Cannot delete a submission that doesn't exist", + ); + } + + for (const owner of draftSubmission.owners) { + await this.noticeOfIntentOwnerService.delete(owner, user); + } + + await this.noticeOfIntentSubmissionStatusService.removeStatuses( + draftSubmission.uuid, + ); + + const parcelUuids = draftSubmission.parcels.map((parcel) => parcel.uuid); + await this.noticeOfIntentParcelService.deleteMany(parcelUuids, user); + + await this.noticeOfIntentSubmissionRepository.remove(draftSubmission); + } + + async mapToDetailedDto( + noticeOfIntentSubmission: NoticeOfIntentSubmission, + user: User, + ) { + const mappedSubmission = + await this.noticeOfIntentSubmissionService.mapToDetailedDTO( + noticeOfIntentSubmission, + user, + ); + return { + ...mappedSubmission, + canEdit: true, + canReview: true, + canView: true, + }; + } +} diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.controller.spec.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.controller.spec.ts index 878890b79d..07535d9139 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.controller.spec.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.controller.spec.ts @@ -266,7 +266,9 @@ describe('NoticeOfIntentSubmissionController', () => { }, { user: { - entity: new User(), + entity: new User({ + clientRoles: [], + }), }, }, ); @@ -295,7 +297,9 @@ describe('NoticeOfIntentSubmissionController', () => { }, { user: { - entity: new User(), + entity: new User({ + clientRoles: [], + }), }, }, ); diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.controller.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.controller.ts index c9685b8e1b..17cb2a859c 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.controller.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.controller.ts @@ -12,6 +12,7 @@ import { } from '@nestjs/common'; import { NOI_SUBMISSION_STATUS } from '../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status.dto'; import { PortalAuthGuard } from '../../common/authorization/portal-auth-guard.service'; +import { ROLES_ALLOWED_APPLICATIONS } from '../../common/authorization/roles'; import { User } from '../../user/user.entity'; import { NoticeOfIntentSubmissionValidatorService } from './notice-of-intent-submission-validator.service'; import { @@ -92,9 +93,14 @@ export class NoticeOfIntentSubmissionController { req.user.entity, ); + const overlappingRoles = ROLES_ALLOWED_APPLICATIONS.filter((value) => + req.user.entity.clientRoles!.includes(value), + ); + if ( noticeOfIntentSubmission.status.statusTypeCode !== - NOI_SUBMISSION_STATUS.IN_PROGRESS + NOI_SUBMISSION_STATUS.IN_PROGRESS && + overlappingRoles.length === 0 ) { throw new BadRequestException( 'Can only edit in progress Notice of Intents', diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.entity.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.entity.ts index 6bba5fbbb8..a1a8e5f4dc 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.entity.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.entity.ts @@ -14,6 +14,7 @@ import { Base } from '../../common/entities/base.entity'; import { User } from '../../user/user.entity'; import { ColumnNumericTransformer } from '../../utils/column-numeric-transform'; import { NoticeOfIntentOwner } from './notice-of-intent-owner/notice-of-intent-owner.entity'; +import { NoticeOfIntentParcel } from './notice-of-intent-parcel/notice-of-intent-parcel.entity'; export class ProposedStructure { type: @@ -437,6 +438,12 @@ export class NoticeOfIntentSubmission extends Base { ) owners: NoticeOfIntentOwner[]; + @OneToMany( + () => NoticeOfIntentParcel, + (parcel) => parcel.noticeOfIntentSubmission, + ) + parcels: NoticeOfIntentParcel[]; + @OneToMany( () => NoticeOfIntentSubmissionToSubmissionStatus, (status) => status.submission, diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.module.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.module.ts index 1b0fc2501a..42e4e28789 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.module.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.module.ts @@ -58,6 +58,7 @@ import { NoticeOfIntentSubmissionService } from './notice-of-intent-submission.s NoticeOfIntentSubmissionService, NoticeOfIntentParcelService, NoticeOfIntentParcelProfile, + NoticeOfIntentOwnerService, ], }) export class NoticeOfIntentSubmissionModule {} diff --git a/services/apps/alcs/src/portal/portal.module.ts b/services/apps/alcs/src/portal/portal.module.ts index 8612f010e2..880e4ebf74 100644 --- a/services/apps/alcs/src/portal/portal.module.ts +++ b/services/apps/alcs/src/portal/portal.module.ts @@ -13,6 +13,7 @@ import { ApplicationSubmissionModule } from './application-submission/applicatio import { CodeController } from './code/code.controller'; import { PortalDocumentModule } from './document/document.module'; import { PortalNoticeOfIntentDocumentModule } from './notice-of-intent-document/notice-of-intent-document.module'; +import { NoticeOfIntentSubmissionDraftModule } from './notice-of-intent-submission-draft/notice-of-intent-submission-draft.module'; import { NoticeOfIntentSubmissionModule } from './notice-of-intent-submission/notice-of-intent-submission.module'; import { ParcelModule } from './parcel/parcel.module'; import { PdfGenerationModule } from './pdf-generation/pdf-generation.module'; @@ -34,6 +35,7 @@ import { PdfGenerationModule } from './pdf-generation/pdf-generation.module'; NoticeOfIntentModule, NoticeOfIntentSubmissionModule, PortalNoticeOfIntentDocumentModule, + NoticeOfIntentSubmissionDraftModule, RouterModule.register([ { path: 'portal', module: ApplicationSubmissionModule }, { path: 'portal', module: NoticeOfIntentSubmissionModule }, @@ -45,6 +47,7 @@ import { PdfGenerationModule } from './pdf-generation/pdf-generation.module'; { path: 'portal', module: PdfGenerationModule }, { path: 'portal', module: PortalApplicationDecisionModule }, { path: 'portal', module: PortalNoticeOfIntentDocumentModule }, + { path: 'portal', module: NoticeOfIntentSubmissionDraftModule }, ]), ], controllers: [CodeController], From 9e8bb13d3ee4c65394f5b7f29fef3d42becc4d7f Mon Sep 17 00:00:00 2001 From: "to. sandra" <76515860+sandratoh@users.noreply.github.com> Date: Fri, 18 Aug 2023 16:23:10 -0700 Subject: [PATCH 269/954] Add file info to email table and update release dialog text (#893) * Render dialog notification text by decision release state * Add email trigger file info to tracking table * Fix release dialog unit test * Remove unneeded imports from unit test --- .../release-dialog.component.html | 3 +- .../release-dialog.component.spec.ts | 10 +++- .../release-dialog.component.ts | 9 ++++ .../application-decision-v2.dto.ts | 1 + .../providers/email/email-status.entity.ts | 18 +++++++ .../src/providers/email/email.service.spec.ts | 1 + .../alcs/src/providers/email/email.service.ts | 17 +++++++ .../1692397032513-add_email_tracking.ts | 47 +++++++++++++++++++ 8 files changed, 104 insertions(+), 2 deletions(-) create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1692397032513-add_email_tracking.ts diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/release-dialog/release-dialog.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/release-dialog/release-dialog.component.html index bbaceaf9c6..3db6231291 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/release-dialog/release-dialog.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/release-dialog/release-dialog.component.html @@ -12,10 +12,11 @@

Confirm Release Decision

If there is more than one decision, the status will not change -

+

The Applicant and Local/First Nation Government will not receive an auto-email notification. Please complete any notification manually.

+

The Applicant and Local/First Nation Government will receive an auto-email notification.

diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/release-dialog/release-dialog.component.spec.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/release-dialog/release-dialog.component.spec.ts index b2df1b452e..5662286c0d 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/release-dialog/release-dialog.component.spec.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/release-dialog/release-dialog.component.spec.ts @@ -5,17 +5,21 @@ import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { BehaviorSubject } from 'rxjs'; import { ApplicationStatusDto } from '../../../../../services/application/application-submission-status/application-submission-status.dto'; import { ApplicationService } from '../../../../../services/application/application.service'; - import { ReleaseDialogComponent } from './release-dialog.component'; +import { ApplicationDecisionV2Service } from '../../../../../services/application/decision/application-decision-v2/application-decision-v2.service'; +import { ApplicationDecisionDto } from '../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; describe('ReleaseDialogComponent', () => { let component: ReleaseDialogComponent; let fixture: ComponentFixture; let mockApplicationService: DeepMocked; + let mockApplicationDecisionV2Service: DeepMocked; beforeEach(async () => { mockApplicationService = createMock(); mockApplicationService.$applicationStatuses = new BehaviorSubject([]); + mockApplicationDecisionV2Service = createMock(); + mockApplicationDecisionV2Service.$decision = new BehaviorSubject(undefined); await TestBed.configureTestingModule({ declarations: [ReleaseDialogComponent], @@ -24,6 +28,10 @@ describe('ReleaseDialogComponent', () => { provide: ApplicationService, useValue: mockApplicationService, }, + { + provide: ApplicationDecisionV2Service, + useValue: mockApplicationDecisionV2Service, + }, { provide: MatDialogRef, useValue: {} }, { provide: MAT_DIALOG_DATA, diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/release-dialog/release-dialog.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/release-dialog/release-dialog.component.ts index f2376b3ba6..cc1a273f17 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/release-dialog/release-dialog.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/release-dialog/release-dialog.component.ts @@ -4,6 +4,7 @@ import { Subject, takeUntil } from 'rxjs'; import { SUBMISSION_STATUS } from '../../../../../services/application/application.dto'; import { ApplicationService } from '../../../../../services/application/application.service'; import { ApplicationPill } from '../../../../../shared/application-type-pill/application-type-pill.component'; +import { ApplicationDecisionV2Service } from '../../../../../services/application/decision/application-decision-v2/application-decision-v2.service'; @Component({ selector: 'app-release-dialog', @@ -13,9 +14,11 @@ import { ApplicationPill } from '../../../../../shared/application-type-pill/app export class ReleaseDialogComponent implements OnInit, OnDestroy { $destroy = new Subject(); mappedType?: ApplicationPill; + wasReleased = false; constructor( private applicationService: ApplicationService, + private decisionService: ApplicationDecisionV2Service, public matDialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) data: any ) {} @@ -35,6 +38,12 @@ export class ReleaseDialogComponent implements OnInit, OnDestroy { } } }); + + this.decisionService.$decision.pipe(takeUntil(this.$destroy)).subscribe((decision) => { + if (decision) { + this.wasReleased = decision.wasReleased; + } + }); } ngOnDestroy(): void { diff --git a/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-v2.dto.ts b/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-v2.dto.ts index ad705c7014..758198262f 100644 --- a/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-v2.dto.ts +++ b/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-v2.dto.ts @@ -76,6 +76,7 @@ export interface ApplicationDecisionDto { modifiedBy?: LinkedResolutionDto[]; components: DecisionComponentDto[]; conditions: ApplicationDecisionConditionDto[]; + wasReleased: boolean; } export interface LinkedResolutionDto { diff --git a/services/apps/alcs/src/providers/email/email-status.entity.ts b/services/apps/alcs/src/providers/email/email-status.entity.ts index f13736bb62..cfe8267298 100644 --- a/services/apps/alcs/src/providers/email/email-status.entity.ts +++ b/services/apps/alcs/src/providers/email/email-status.entity.ts @@ -37,4 +37,22 @@ export class EmailStatus extends BaseEntity { @Column({ nullable: true, type: 'text' }) errors?: string; + + @Column({ + nullable: true, + comment: 'Type of parent entity', + }) + parentType: string; + + @Column({ + nullable: true, + comment: 'Uuid of parent entity', + }) + parentId: string; + + @Column({ + nullable: true, + comment: 'Status that triggered the email', + }) + triggerStatus: string; } diff --git a/services/apps/alcs/src/providers/email/email.service.spec.ts b/services/apps/alcs/src/providers/email/email.service.spec.ts index eced68e730..6f3d2ac5c4 100644 --- a/services/apps/alcs/src/providers/email/email.service.spec.ts +++ b/services/apps/alcs/src/providers/email/email.service.spec.ts @@ -209,6 +209,7 @@ describe('EmailService', () => { new ApplicationSubmissionStatusType(), ); mockApplicationService.fetchApplicationTypes.mockResolvedValue([]); + mockApplicationService.getUuid.mockResolvedValue('fake-uuid'); await service.sendStatusEmail(mockData); diff --git a/services/apps/alcs/src/providers/email/email.service.ts b/services/apps/alcs/src/providers/email/email.service.ts index d67941fb02..ac8f9f16f4 100644 --- a/services/apps/alcs/src/providers/email/email.service.ts +++ b/services/apps/alcs/src/providers/email/email.service.ts @@ -99,12 +99,18 @@ export class EmailService { subject, cc = [], bcc = [], + parentType, + parentId, + triggerStatus, }: { to: string[]; body: string; subject: string; cc?: string[]; bcc?: string[]; + parentType?: string; + parentId?: string; + triggerStatus?: string; }) { const serviceUrl = this.config.get('CHES.URL'); const from = this.config.get('CHES.FROM'); @@ -150,6 +156,9 @@ export class EmailService { recipients: [...to, ...cc, ...bcc].join(', '), status: 'success', transactionId: res.data.txId, + parentType, + parentId, + triggerStatus, }), ); } catch (e) { @@ -165,6 +174,9 @@ export class EmailService { recipients: [...to, ...cc, ...bcc].join(', '), status: 'failed', errors: errorMessage, + parentType, + parentId, + triggerStatus, }), ); } @@ -238,9 +250,14 @@ export class EmailService { decisionReleaseMaskedDate: data?.decisionReleaseMaskedDate, }); + const parentId = await this.applicationService.getUuid(fileNumber); + const email = { body: emailTemplate.html, subject: `Agricultural Land Commission Application ID: ${fileNumber} (${applicantName})`, + parentType: 'application', + parentId, + triggerStatus: status.code, }; if (data.primaryContact && data.primaryContact.email) { diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1692397032513-add_email_tracking.ts b/services/apps/alcs/src/providers/typeorm/migrations/1692397032513-add_email_tracking.ts new file mode 100644 index 0000000000..98eab053a1 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1692397032513-add_email_tracking.ts @@ -0,0 +1,47 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class addEmailTracking1692397032513 implements MigrationInterface { + name = 'addEmailTracking1692397032513'; + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `ALTER TABLE "alcs"."email_status" ADD "parent_type" character varying`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."email_status"."parent_type" IS 'Type of parent entity'`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."email_status" ADD "parent_id" character varying`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."email_status"."parent_id" IS 'Uuid of parent entity'`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."email_status" ADD "trigger_status" character varying`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."email_status"."trigger_status" IS 'Status that triggered the email'`, + ); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."email_status"."trigger_status" IS 'Status that triggered the email'`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."email_status" DROP COLUMN "trigger_status"`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."email_status"."parent_id" IS 'Uuid of parent entity'`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."email_status" DROP COLUMN "parent_id"`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."email_status"."parent_type" IS 'Type of parent entity'`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."email_status" DROP COLUMN "parent_type"`, + ); + } +} From ecef1d49852f53eed0e49d529eaddb82f736cf1f Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Fri, 18 Aug 2023 16:36:07 -0700 Subject: [PATCH 270/954] Add app update banners to new NOI soil components * Some were missing --- .../pfrs-details/pfrs-details.component.html | 73 +++++++++++++++++-- .../pofo-details/pofo-details.component.html | 23 +++++- .../roso-details/roso-details.component.html | 21 +++++- 3 files changed, 102 insertions(+), 15 deletions(-) diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pfrs-details/pfrs-details.component.html b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pfrs-details/pfrs-details.component.html index 8d6d6739a8..b7fbfecedb 100644 --- a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pfrs-details/pfrs-details.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pfrs-details/pfrs-details.component.html @@ -48,8 +48,32 @@
-
Soil to be Removed
-
Fill to be Placed
+
+ Soil to be Removed + + +
+
+ Fill to be Placed + + +
Volume
@@ -102,8 +126,32 @@
-
Soil already Removed
-
Fill already Placed
+
+ Soil already Removed + + +
+
+ Fill already Placed + + +
Volume
@@ -170,14 +218,16 @@

Project Duration

- Duration + Duration +
{{ _noiSubmission.soilProjectDurationUnit }}
- Length + Length +
{{ _noiSubmission.soilProjectDurationAmount }} @@ -192,7 +242,10 @@

Project Duration

-
Is your proposal for area-wide filling?
+
+ Is your proposal for area-wide filling? + +
{{ _noiSubmission.soilIsAreaWideFilling ? 'Yes' : 'No' }} @@ -200,7 +253,10 @@

Project Duration

-
Is your proposal for aggregate extraction or placer mining?
+
+ Is your proposal for aggregate extraction or placer mining? + +
{{ _noiSubmission.soilIsExtractionOrMining ? 'Yes' : 'No' }} @@ -228,6 +284,7 @@

Project Duration

Have you submitted a Notice of Work to the Ministry of Energy, Mines and Low Carbon Innovation (EMLI)? +
diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pofo-details/pofo-details.component.html b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pofo-details/pofo-details.component.html index 1fbf8a4fdd..23c93046d2 100644 --- a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pofo-details/pofo-details.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pofo-details/pofo-details.component.html @@ -41,7 +41,14 @@
Fill to be Placed - +
Volume
@@ -72,7 +79,14 @@
Fill already Placed - +
Volume
@@ -134,7 +148,10 @@

Project Duration

-
Is your proposal for area-wide filling?
+
+ Is your proposal for area-wide filling? + +
{{ _noiSubmission.soilIsAreaWideFilling ? 'Yes' : 'No' }} diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/roso-details/roso-details.component.html b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/roso-details/roso-details.component.html index f1d020d0a1..68f97c3f2b 100644 --- a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/roso-details/roso-details.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/roso-details/roso-details.component.html @@ -74,7 +74,14 @@
Soil already Removed - +
Volume
@@ -112,14 +119,16 @@

Project Duration

- Duration + Duration +
{{ _noiSubmission.soilProjectDurationUnit }}
- Length + Length +
{{ _noiSubmission.soilProjectDurationAmount }} @@ -134,7 +143,10 @@

Project Duration

-
Is your proposal for aggregate extraction or placer mining?
+
+ Is your proposal for aggregate extraction or placer mining? + +
{{ _noiSubmission.soilIsExtractionOrMining ? 'Yes' : 'No' }} @@ -161,6 +173,7 @@

Project Duration

Have you submitted a Notice of Work to the Ministry of Energy, Mines and Low Carbon Innovation (EMLI)? +
From 6afde2da56b67cf92b58752f245379ef125e3ccf Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Mon, 21 Aug 2023 09:58:49 -0700 Subject: [PATCH 271/954] Set documents on NFUP Component in ALCS Edit Submission --- .../alcs-edit-submission/alcs-edit-submission.component.html | 1 + 1 file changed, 1 insertion(+) diff --git a/portal-frontend/src/app/features/applications/alcs-edit-submission/alcs-edit-submission.component.html b/portal-frontend/src/app/features/applications/alcs-edit-submission/alcs-edit-submission.component.html index 74ccaa5382..08239e44da 100644 --- a/portal-frontend/src/app/features/applications/alcs-edit-submission/alcs-edit-submission.component.html +++ b/portal-frontend/src/app/features/applications/alcs-edit-submission/alcs-edit-submission.component.html @@ -80,6 +80,7 @@
Date: Mon, 21 Aug 2023 10:12:42 -0700 Subject: [PATCH 272/954] Feature/alcs 983 Noi Proposal Component (#895) Noi Proposal Component new noi subtypes preselect subtypes on submit to ALCS disable pre-populated subtypes option on edit validation --- .../applicant-info.component.ts | 2 +- .../parcel/parcel.component.ts | 3 +- .../application/application.component.ts | 2 +- .../decision-component.component.ts | 2 +- .../decision/decision.component.ts | 3 +- .../application/intake/intake.component.ts | 2 +- .../proposal/proposal.component.ts | 49 +---- .../application-dialog.component.spec.ts | 3 +- .../notice-of-intent-dialog.component.spec.ts | 3 +- .../applicant-info.component.ts | 2 +- .../parcel/parcel.component.ts | 2 +- .../notice-of-intent.component.ts | 8 +- .../notice-of-intent.module.ts | 8 +- .../preparation/preparation.component.ts | 72 ------- .../parcel-prep/parcel-prep.component.html | 62 ++++++ .../parcel-prep/parcel-prep.component.scss | 17 ++ .../parcel-prep/parcel-prep.component.spec.ts | 35 ++++ .../parcel-prep/parcel-prep.component.ts | 50 +++++ .../preparation/preparation.component.html | 13 +- .../preparation/preparation.component.scss | 0 .../preparation/preparation.component.spec.ts | 16 +- .../preparation/preparation.component.ts | 129 +++++++++++++ .../proposal/proposal.component.html | 55 ++++++ .../proposal/proposal.component.scss | 15 ++ .../proposal/proposal.component.spec.ts | 47 +++++ .../proposal/proposal.component.ts | 54 ++++++ .../proposal/soil/soil.component.html | 49 +++++ .../proposal/soil/soil.component.scss | 16 ++ .../proposal/soil/soil.component.spec.ts | 53 ++++++ .../proposal/soil/soil.component.ts | 49 +++++ .../services/application/application.dto.ts | 11 +- .../application/application.service.spec.ts | 3 +- .../notice-of-intent/notice-of-intent.dto.ts | 20 +- .../src/app/shared/dto/ag-cap.types.dto.ts | 37 ++++ .../shared/dto/parcel-ownership.type.dto.ts | 4 + .../app/shared/dto/system-source.types.dto.ts | 4 + .../inline-dropdown.component.html | 6 +- .../inline-dropdown.component.ts | 2 +- .../submit-confirmation-dialog.component.html | 2 +- .../notice-of-intent-submission.service.ts | 2 +- .../notice-of-intent/notice-of-intent.dto.ts | 49 +++++ .../notice-of-intent.entity.ts | 58 ++++++ .../notice-of-intent.service.spec.ts | 60 ++++++ .../notice-of-intent.service.ts | 177 +++++++++++++++++- .../notice-of-intent.automapper.profile.ts | 6 +- .../notice-of-intent-submission.entity.ts | 19 ++ ...otice-of-intent-submission.service.spec.ts | 70 ++++++- .../notice-of-intent-submission.service.ts | 80 +++++++- ...1692314042619-add_ag_cap_columns_to_noi.ts | 83 ++++++++ .../1692315860319-soil_proposal_noi.ts | 23 +++ .../migrations/1692397894264-noi_sub_types.ts | 18 ++ 51 files changed, 1388 insertions(+), 167 deletions(-) delete mode 100644 alcs-frontend/src/app/features/notice-of-intent/preparation/preparation.component.ts create mode 100644 alcs-frontend/src/app/features/notice-of-intent/proposal/parcel-prep/parcel-prep.component.html create mode 100644 alcs-frontend/src/app/features/notice-of-intent/proposal/parcel-prep/parcel-prep.component.scss create mode 100644 alcs-frontend/src/app/features/notice-of-intent/proposal/parcel-prep/parcel-prep.component.spec.ts create mode 100644 alcs-frontend/src/app/features/notice-of-intent/proposal/parcel-prep/parcel-prep.component.ts rename alcs-frontend/src/app/features/notice-of-intent/{ => proposal}/preparation/preparation.component.html (55%) rename alcs-frontend/src/app/features/notice-of-intent/{ => proposal}/preparation/preparation.component.scss (100%) rename alcs-frontend/src/app/features/notice-of-intent/{ => proposal}/preparation/preparation.component.spec.ts (65%) create mode 100644 alcs-frontend/src/app/features/notice-of-intent/proposal/preparation/preparation.component.ts create mode 100644 alcs-frontend/src/app/features/notice-of-intent/proposal/proposal.component.html create mode 100644 alcs-frontend/src/app/features/notice-of-intent/proposal/proposal.component.scss create mode 100644 alcs-frontend/src/app/features/notice-of-intent/proposal/proposal.component.spec.ts create mode 100644 alcs-frontend/src/app/features/notice-of-intent/proposal/proposal.component.ts create mode 100644 alcs-frontend/src/app/features/notice-of-intent/proposal/soil/soil.component.html create mode 100644 alcs-frontend/src/app/features/notice-of-intent/proposal/soil/soil.component.scss create mode 100644 alcs-frontend/src/app/features/notice-of-intent/proposal/soil/soil.component.spec.ts create mode 100644 alcs-frontend/src/app/features/notice-of-intent/proposal/soil/soil.component.ts create mode 100644 alcs-frontend/src/app/shared/dto/ag-cap.types.dto.ts create mode 100644 alcs-frontend/src/app/shared/dto/parcel-ownership.type.dto.ts create mode 100644 alcs-frontend/src/app/shared/dto/system-source.types.dto.ts create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1692314042619-add_ag_cap_columns_to_noi.ts create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1692315860319-soil_proposal_noi.ts create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1692397894264-noi_sub_types.ts diff --git a/alcs-frontend/src/app/features/application/applicant-info/applicant-info.component.ts b/alcs-frontend/src/app/features/application/applicant-info/applicant-info.component.ts index 3ae87c4d62..18743a01c2 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/applicant-info.component.ts +++ b/alcs-frontend/src/app/features/application/applicant-info/applicant-info.component.ts @@ -6,9 +6,9 @@ import { ApplicationDto, ApplicationSubmissionDto, SUBMISSION_STATUS, - SYSTEM_SOURCE_TYPES, } from '../../../services/application/application.dto'; import { DOCUMENT_TYPE } from '../../../shared/document/document.dto'; +import { SYSTEM_SOURCE_TYPES } from '../../../shared/dto/system-source.types.dto'; @Component({ selector: 'app-applicant-info', diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/parcel/parcel.component.ts b/alcs-frontend/src/app/features/application/applicant-info/application-details/parcel/parcel.component.ts index e7b7bb695d..c003aab01b 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/application-details/parcel/parcel.component.ts +++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/parcel/parcel.component.ts @@ -4,7 +4,8 @@ import { Subject, takeUntil } from 'rxjs'; import { ApplicationDocumentDto } from '../../../../../services/application/application-document/application-document.dto'; import { ApplicationDocumentService } from '../../../../../services/application/application-document/application-document.service'; import { ApplicationParcelService } from '../../../../../services/application/application-parcel/application-parcel.service'; -import { ApplicationSubmissionDto, PARCEL_OWNERSHIP_TYPE } from '../../../../../services/application/application.dto'; +import { ApplicationSubmissionDto } from '../../../../../services/application/application.dto'; +import { PARCEL_OWNERSHIP_TYPE } from '../../../../../shared/dto/parcel-ownership.type.dto'; @Component({ selector: 'app-parcel', diff --git a/alcs-frontend/src/app/features/application/application.component.ts b/alcs-frontend/src/app/features/application/application.component.ts index c0c35069e1..5073de3e65 100644 --- a/alcs-frontend/src/app/features/application/application.component.ts +++ b/alcs-frontend/src/app/features/application/application.component.ts @@ -13,8 +13,8 @@ import { ApplicationDto, ApplicationSubmissionDto, SUBMISSION_STATUS, - SYSTEM_SOURCE_TYPES, } from '../../services/application/application.dto'; +import { SYSTEM_SOURCE_TYPES } from '../../shared/dto/system-source.types.dto'; import { ApplicantInfoComponent } from './applicant-info/applicant-info.component'; import { ApplicationMeetingComponent } from './application-meeting/application-meeting.component'; import { decisionChildRoutes, DecisionModule } from './decision/decision.module'; diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.ts index 0fcfaf9fe8..177d0873cb 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.ts @@ -14,8 +14,8 @@ import { TurpDecisionComponentDto, } from '../../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; import { ToastService } from '../../../../../../../services/toast/toast.service'; +import { AG_CAP_OPTIONS, AG_CAP_SOURCE_OPTIONS } from '../../../../../../../shared/dto/ag-cap.types.dto'; import { formatDateForApi } from '../../../../../../../shared/utils/api-date-formatter'; -import { AG_CAP_OPTIONS, AG_CAP_SOURCE_OPTIONS } from '../../../../../proposal/proposal.component'; import { SubdInputComponent } from './subd-input/subd-input.component'; @Component({ diff --git a/alcs-frontend/src/app/features/application/decision/decision.component.ts b/alcs-frontend/src/app/features/application/decision/decision.component.ts index f9f3a16678..aa04a71268 100644 --- a/alcs-frontend/src/app/features/application/decision/decision.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision.component.ts @@ -1,7 +1,8 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; import { Subject, takeUntil } from 'rxjs'; import { ApplicationDetailService } from '../../../services/application/application-detail.service'; -import { ApplicationDto, SYSTEM_SOURCE_TYPES } from '../../../services/application/application.dto'; +import { ApplicationDto } from '../../../services/application/application.dto'; +import { SYSTEM_SOURCE_TYPES } from '../../../shared/dto/system-source.types.dto'; import { decisionChildRoutes } from './decision.module'; @Component({ diff --git a/alcs-frontend/src/app/features/application/intake/intake.component.ts b/alcs-frontend/src/app/features/application/intake/intake.component.ts index c84f229787..c28794a55e 100644 --- a/alcs-frontend/src/app/features/application/intake/intake.component.ts +++ b/alcs-frontend/src/app/features/application/intake/intake.component.ts @@ -4,10 +4,10 @@ import { environment } from '../../../../environments/environment'; import { ApplicationDetailService } from '../../../services/application/application-detail.service'; import { ApplicationDto, - SYSTEM_SOURCE_TYPES, UpdateApplicationDto, } from '../../../services/application/application.dto'; import { ToastService } from '../../../services/toast/toast.service'; +import { SYSTEM_SOURCE_TYPES } from '../../../shared/dto/system-source.types.dto'; @Component({ selector: 'app-overview', diff --git a/alcs-frontend/src/app/features/application/proposal/proposal.component.ts b/alcs-frontend/src/app/features/application/proposal/proposal.component.ts index 6ce20da5e5..32c4969562 100644 --- a/alcs-frontend/src/app/features/application/proposal/proposal.component.ts +++ b/alcs-frontend/src/app/features/application/proposal/proposal.component.ts @@ -1,50 +1,9 @@ import { Component, OnInit } from '@angular/core'; import { ApplicationDetailService } from '../../../services/application/application-detail.service'; -import { - ApplicationDto, - SYSTEM_SOURCE_TYPES, - UpdateApplicationDto, -} from '../../../services/application/application.dto'; +import { ApplicationDto, UpdateApplicationDto } from '../../../services/application/application.dto'; import { ToastService } from '../../../services/toast/toast.service'; - -// TODO move to code tables? -export const AG_CAP_OPTIONS = [ - { - label: 'Mixed Prime and Secondary', - value: 'Mixed Prime and Secondary', - }, - { - label: 'Prime', - value: 'Prime', - }, - { - label: 'Prime Dominant', - value: 'Prime Dominant', - }, - { - label: 'Secondary', - value: 'Secondary', - }, - { - label: 'Unclassified', - value: 'Unclassified', - }, -]; - -export const AG_CAP_SOURCE_OPTIONS = [ - { - label: 'BCLI', - value: 'BCLI', - }, - { - label: 'CLI', - value: 'CLI', - }, - { - label: 'On-site', - value: 'On-site', - }, -]; +import { AG_CAP_OPTIONS, AG_CAP_SOURCE_OPTIONS } from '../../../shared/dto/ag-cap.types.dto'; +import { SYSTEM_SOURCE_TYPES } from '../../../shared/dto/system-source.types.dto'; @Component({ selector: 'app-proposal', @@ -57,7 +16,7 @@ export class ProposalComponent implements OnInit { agCapOptions = AG_CAP_OPTIONS; agCapSourceOptions = AG_CAP_SOURCE_OPTIONS; alrArea: string | undefined; - staffObservations: string = ''; + staffObservations = ''; APPLICATION_SYSTEM_SOURCE_TYPES = SYSTEM_SOURCE_TYPES; constructor(private applicationDetailService: ApplicationDetailService, private toastService: ToastService) {} diff --git a/alcs-frontend/src/app/features/board/dialogs/application/application-dialog.component.spec.ts b/alcs-frontend/src/app/features/board/dialogs/application/application-dialog.component.spec.ts index 30be9ca64a..c204ad03a6 100644 --- a/alcs-frontend/src/app/features/board/dialogs/application/application-dialog.component.spec.ts +++ b/alcs-frontend/src/app/features/board/dialogs/application/application-dialog.component.spec.ts @@ -6,11 +6,12 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { RouterTestingModule } from '@angular/router/testing'; import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { ApplicationRegionDto, ApplicationTypeDto } from '../../../../services/application/application-code.dto'; -import { ApplicationDto, SYSTEM_SOURCE_TYPES } from '../../../../services/application/application.dto'; +import { ApplicationDto } from '../../../../services/application/application.dto'; import { BoardService } from '../../../../services/board/board.service'; import { CardDto } from '../../../../services/card/card.dto'; import { AssigneeDto } from '../../../../services/user/user.dto'; import { ConfirmationDialogService } from '../../../../shared/confirmation-dialog/confirmation-dialog.service'; +import { SYSTEM_SOURCE_TYPES } from '../../../../shared/dto/system-source.types.dto'; import { SharedModule } from '../../../../shared/shared.module'; import { ApplicationDialogComponent } from './application-dialog.component'; diff --git a/alcs-frontend/src/app/features/board/dialogs/notice-of-intent/notice-of-intent-dialog.component.spec.ts b/alcs-frontend/src/app/features/board/dialogs/notice-of-intent/notice-of-intent-dialog.component.spec.ts index 1e2829a64b..329cbbc2d7 100644 --- a/alcs-frontend/src/app/features/board/dialogs/notice-of-intent/notice-of-intent-dialog.component.spec.ts +++ b/alcs-frontend/src/app/features/board/dialogs/notice-of-intent/notice-of-intent-dialog.component.spec.ts @@ -18,6 +18,7 @@ import { ToastService } from '../../../../services/toast/toast.service'; import { AssigneeDto } from '../../../../services/user/user.dto'; import { UserService } from '../../../../services/user/user.service'; import { ConfirmationDialogService } from '../../../../shared/confirmation-dialog/confirmation-dialog.service'; +import { SYSTEM_SOURCE_TYPES } from '../../../../shared/dto/system-source.types.dto'; import { NoticeOfIntentDialogComponent } from './notice-of-intent-dialog.component'; describe('NoticeOfIntentDialogComponent', () => { @@ -55,7 +56,7 @@ describe('NoticeOfIntentDialogComponent', () => { retroactive: null, subtype: [], type: {} as NoticeOfIntentTypeDto, - source: 'ALCS', + source: SYSTEM_SOURCE_TYPES.ALCS, }; beforeEach(async () => { diff --git a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/applicant-info.component.ts b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/applicant-info.component.ts index cf7aafffbf..8a3bab4003 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/applicant-info.component.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/applicant-info.component.ts @@ -1,6 +1,5 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; import { Subject, takeUntil } from 'rxjs'; -import { SYSTEM_SOURCE_TYPES } from '../../../services/application/application.dto'; import { NoticeOfIntentDetailService } from '../../../services/notice-of-intent/notice-of-intent-detail.service'; import { NoticeOfIntentSubmissionService } from '../../../services/notice-of-intent/notice-of-intent-submission/notice-of-intent-submission.service'; import { @@ -8,6 +7,7 @@ import { NoticeOfIntentSubmissionDto, } from '../../../services/notice-of-intent/notice-of-intent.dto'; import { DOCUMENT_TYPE } from '../../../shared/document/document.dto'; +import { SYSTEM_SOURCE_TYPES } from '../../../shared/dto/system-source.types.dto'; @Component({ selector: 'app-applicant-info', diff --git a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/parcel/parcel.component.ts b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/parcel/parcel.component.ts index ba2ca715a0..b93c17a34f 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/parcel/parcel.component.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/parcel/parcel.component.ts @@ -1,11 +1,11 @@ import { AfterContentChecked, Component, Input, OnChanges, OnDestroy, OnInit, SimpleChanges } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { Subject, takeUntil } from 'rxjs'; -import { PARCEL_OWNERSHIP_TYPE } from '../../../../../services/application/application.dto'; import { NoticeOfIntentDocumentDto } from '../../../../../services/notice-of-intent/noi-document/noi-document.dto'; import { NoiDocumentService } from '../../../../../services/notice-of-intent/noi-document/noi-document.service'; import { NoticeOfIntentParcelService } from '../../../../../services/notice-of-intent/notice-of-intent-parcel/notice-of-intent-parcel.service'; import { NoticeOfIntentSubmissionDto } from '../../../../../services/notice-of-intent/notice-of-intent.dto'; +import { PARCEL_OWNERSHIP_TYPE } from '../../../../../shared/dto/parcel-ownership.type.dto'; @Component({ selector: 'app-parcel', diff --git a/alcs-frontend/src/app/features/notice-of-intent/notice-of-intent.component.ts b/alcs-frontend/src/app/features/notice-of-intent/notice-of-intent.component.ts index 214617e702..fea65ebd34 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/notice-of-intent.component.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/notice-of-intent.component.ts @@ -7,14 +7,14 @@ import { NoticeOfIntentDetailService } from '../../services/notice-of-intent/not import { NoticeOfIntentModificationDto } from '../../services/notice-of-intent/notice-of-intent-modification/notice-of-intent-modification.dto'; import { NoticeOfIntentModificationService } from '../../services/notice-of-intent/notice-of-intent-modification/notice-of-intent-modification.service'; import { NoticeOfIntentDto } from '../../services/notice-of-intent/notice-of-intent.dto'; +import { ApplicantInfoComponent } from './applicant-info/applicant-info.component'; +import { DecisionComponent } from './decision/decision.component'; import { NoiDocumentsComponent } from './documents/documents.component'; import { InfoRequestsComponent } from './info-requests/info-requests.component'; -import { DecisionComponent } from './decision/decision.component'; import { IntakeComponent } from './intake/intake.component'; import { OverviewComponent } from './overview/overview.component'; import { PostDecisionComponent } from './post-decision/post-decision.component'; -import { PreparationComponent } from './preparation/preparation.component'; -import { ApplicantInfoComponent } from './applicant-info/applicant-info.component'; +import { ProposalComponent } from './proposal/proposal.component'; export const childRoutes = [ { @@ -40,7 +40,7 @@ export const childRoutes = [ path: 'prep', menuTitle: 'NOI Prep', icon: 'task', - component: PreparationComponent, + component: ProposalComponent, }, { path: 'info-request', diff --git a/alcs-frontend/src/app/features/notice-of-intent/notice-of-intent.module.ts b/alcs-frontend/src/app/features/notice-of-intent/notice-of-intent.module.ts index c1bd55a57f..8c43fd5ed7 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/notice-of-intent.module.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/notice-of-intent.module.ts @@ -16,7 +16,10 @@ import { childRoutes, NoticeOfIntentComponent } from './notice-of-intent.compone import { OverviewComponent } from './overview/overview.component'; import { EditModificationDialogComponent } from './post-decision/edit-modification-dialog/edit-modification-dialog.component'; import { PostDecisionComponent } from './post-decision/post-decision.component'; -import { PreparationComponent } from './preparation/preparation.component'; +import { ParcelPrepComponent } from './proposal/parcel-prep/parcel-prep.component'; +import { PreparationComponent } from './proposal/preparation/preparation.component'; +import { ProposalComponent } from './proposal/proposal.component'; +import { SoilProposalComponent } from './proposal/soil/soil.component'; const routes: Routes = [ { @@ -43,6 +46,9 @@ const routes: Routes = [ NoiDocumentsComponent, DocumentUploadDialogComponent, ApplicantInfoComponent, + ProposalComponent, + ParcelPrepComponent, + SoilProposalComponent, ], imports: [SharedModule.forRoot(), RouterModule.forChild(routes), NoticeOfIntentDetailsModule], }) diff --git a/alcs-frontend/src/app/features/notice-of-intent/preparation/preparation.component.ts b/alcs-frontend/src/app/features/notice-of-intent/preparation/preparation.component.ts deleted file mode 100644 index 760bb8ced8..0000000000 --- a/alcs-frontend/src/app/features/notice-of-intent/preparation/preparation.component.ts +++ /dev/null @@ -1,72 +0,0 @@ -import { Component, OnInit } from '@angular/core'; -import moment from 'moment'; -import { environment } from '../../../../environments/environment'; -import { NoticeOfIntentDetailService } from '../../../services/notice-of-intent/notice-of-intent-detail.service'; -import { - NoticeOfIntentDto, - NoticeOfIntentSubtypeDto, - UpdateNoticeOfIntentDto, -} from '../../../services/notice-of-intent/notice-of-intent.dto'; -import { NoticeOfIntentService } from '../../../services/notice-of-intent/notice-of-intent.service'; -import { ToastService } from '../../../services/toast/toast.service'; - -@Component({ - selector: 'app-preparation', - templateUrl: './preparation.component.html', - styleUrls: ['./preparation.component.scss'], -}) -export class PreparationComponent implements OnInit { - dateSubmittedToAlc?: string; - noticeOfIntent?: NoticeOfIntentDto; - selectableTypes: { label: string; value: string }[] = []; - selectedSubtypes: string[] = []; - private subtypes: NoticeOfIntentSubtypeDto[] = []; - - constructor( - private noticeOfIntentDetailService: NoticeOfIntentDetailService, - private noticeOfIntentService: NoticeOfIntentService, - private toastService: ToastService - ) {} - - ngOnInit(): void { - this.noticeOfIntentDetailService.$noticeOfIntent.subscribe((noticeOfIntent) => { - if (noticeOfIntent) { - this.dateSubmittedToAlc = moment(noticeOfIntent.dateSubmittedToAlc).format(environment.dateFormat); - this.noticeOfIntent = noticeOfIntent; - this.selectedSubtypes = noticeOfIntent.subtype.map((subtype) => subtype.label); - } - }); - - this.loadSubtypes(); - } - - async updateBoolean(field: keyof UpdateNoticeOfIntentDto, value: boolean) { - const application = this.noticeOfIntent; - if (application) { - const update = await this.noticeOfIntentDetailService.update(application.fileNumber, { - [field]: value, - }); - if (update) { - this.toastService.showSuccessToast('Notice of Intent updated'); - } - } - } - - private async loadSubtypes() { - const subtypes = await this.noticeOfIntentService.listSubtypes(); - this.subtypes = subtypes; - this.selectableTypes = subtypes.map((subtype) => ({ - label: subtype.label, - value: subtype.label, - })); - } - - async saveSubtypes($event: string | string[] | null) { - if (this.noticeOfIntent && $event instanceof Array) { - const selectedCodes = $event.map((label) => this.subtypes.find((subtype) => subtype.label === label)!.code); - await this.noticeOfIntentDetailService.update(this.noticeOfIntent?.fileNumber, { - subtype: selectedCodes, - }); - } - } -} diff --git a/alcs-frontend/src/app/features/notice-of-intent/proposal/parcel-prep/parcel-prep.component.html b/alcs-frontend/src/app/features/notice-of-intent/proposal/parcel-prep/parcel-prep.component.html new file mode 100644 index 0000000000..91cfbd81db --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/proposal/parcel-prep/parcel-prep.component.html @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
#{{ i + 1 }}PID + {{ row.pid }} + + PIN + {{ row.pin }} + + Civic Address + {{ row.civicAddress }} + Area (ha){{ row.mapAreaHectares }}ALR Area (ha) + + Owner(s) + {{ row.owners }} + Actions + +
diff --git a/alcs-frontend/src/app/features/notice-of-intent/proposal/parcel-prep/parcel-prep.component.scss b/alcs-frontend/src/app/features/notice-of-intent/proposal/parcel-prep/parcel-prep.component.scss new file mode 100644 index 0000000000..c68304cfac --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/proposal/parcel-prep/parcel-prep.component.scss @@ -0,0 +1,17 @@ +@use '../../../../../styles/colors'; + +.link-button { + color: colors.$link-color; +} + +:host::ng-deep { + th { + font-weight: 700; + } +} + +.civic-address { + white-space: nowrap; + overflow: hidden; + text-overflow: clip; +} diff --git a/alcs-frontend/src/app/features/notice-of-intent/proposal/parcel-prep/parcel-prep.component.spec.ts b/alcs-frontend/src/app/features/notice-of-intent/proposal/parcel-prep/parcel-prep.component.spec.ts new file mode 100644 index 0000000000..2e61bc1999 --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/proposal/parcel-prep/parcel-prep.component.spec.ts @@ -0,0 +1,35 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { NoticeOfIntentParcelService } from '../../../../services/notice-of-intent/notice-of-intent-parcel/notice-of-intent-parcel.service'; + +import { ParcelPrepComponent } from './parcel-prep.component'; + +describe('ParcelPrepComponent', () => { + let component: ParcelPrepComponent; + let fixture: ComponentFixture; + let mockNoiParcelService: DeepMocked; + + beforeEach(async () => { + mockNoiParcelService = createMock(); + + await TestBed.configureTestingModule({ + declarations: [ParcelPrepComponent], + providers: [ + { + provide: NoticeOfIntentParcelService, + useValue: mockNoiParcelService, + }, + ], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(ParcelPrepComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/alcs-frontend/src/app/features/notice-of-intent/proposal/parcel-prep/parcel-prep.component.ts b/alcs-frontend/src/app/features/notice-of-intent/proposal/parcel-prep/parcel-prep.component.ts new file mode 100644 index 0000000000..95357e16b9 --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/proposal/parcel-prep/parcel-prep.component.ts @@ -0,0 +1,50 @@ +import { Component, Input, OnChanges } from '@angular/core'; +import { Router } from '@angular/router'; +import { NoticeOfIntentParcelService } from '../../../../services/notice-of-intent/notice-of-intent-parcel/notice-of-intent-parcel.service'; + +@Component({ + selector: 'app-parcel-prep', + templateUrl: './parcel-prep.component.html', + styleUrls: ['./parcel-prep.component.scss'] +}) +export class ParcelPrepComponent implements OnChanges { + @Input() fileNumber = ''; + + displayedColumns = ['number', 'pid', 'pin', 'civicAddress', 'area', 'alrArea', 'owners', 'actions']; + parcels: { + pin?: string; + pid?: string; + mapAreaHectares: string; + alrArea: number; + owners: string; + fullOwners: string; + hasManyOwners: boolean; + uuid: string; + }[] = []; + + constructor(private parcelService: NoticeOfIntentParcelService, private router: Router) {} + + async loadParcels(fileNumber: string) { + const parcels = await this.parcelService.fetchParcels(fileNumber); + this.parcels = parcels.map((parcel) => ({ + ...parcel, + owners: `${parcel.owners[0].displayName} ${parcel.owners.length > 1 ? ' et al.' : ''}`, + fullOwners: parcel.owners.map((owner) => owner.displayName).join(', '), + hasManyOwners: parcel.owners.length > 1, + })); + } + + async saveParcel(uuid: string, alrArea: string | null) { + await this.parcelService.setParcelArea(uuid, alrArea ? parseFloat(alrArea) : null); + } + + ngOnChanges(): void { + this.loadParcels(this.fileNumber); + } + + async navigateToParcelDetails(uuid: any) { + await this.router.navigate(['notice-of-intent', this.fileNumber, 'applicant-info'], { + fragment: uuid, + }); + } +} diff --git a/alcs-frontend/src/app/features/notice-of-intent/preparation/preparation.component.html b/alcs-frontend/src/app/features/notice-of-intent/proposal/preparation/preparation.component.html similarity index 55% rename from alcs-frontend/src/app/features/notice-of-intent/preparation/preparation.component.html rename to alcs-frontend/src/app/features/notice-of-intent/proposal/preparation/preparation.component.html index c768fe6ea4..6974e31ad8 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/preparation/preparation.component.html +++ b/alcs-frontend/src/app/features/notice-of-intent/proposal/preparation/preparation.component.html @@ -1,19 +1,18 @@ -
-

Notice of Intent Prep

+
-
NOI Subtype
+
NOI Subtype
-
Retroactive
+
Retroactive
diff --git a/alcs-frontend/src/app/features/notice-of-intent/preparation/preparation.component.scss b/alcs-frontend/src/app/features/notice-of-intent/proposal/preparation/preparation.component.scss similarity index 100% rename from alcs-frontend/src/app/features/notice-of-intent/preparation/preparation.component.scss rename to alcs-frontend/src/app/features/notice-of-intent/proposal/preparation/preparation.component.scss diff --git a/alcs-frontend/src/app/features/notice-of-intent/preparation/preparation.component.spec.ts b/alcs-frontend/src/app/features/notice-of-intent/proposal/preparation/preparation.component.spec.ts similarity index 65% rename from alcs-frontend/src/app/features/notice-of-intent/preparation/preparation.component.spec.ts rename to alcs-frontend/src/app/features/notice-of-intent/proposal/preparation/preparation.component.spec.ts index a52954689d..51aca7ec81 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/preparation/preparation.component.spec.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/proposal/preparation/preparation.component.spec.ts @@ -3,10 +3,11 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MatSnackBarModule } from '@angular/material/snack-bar'; import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { BehaviorSubject } from 'rxjs'; -import { ApplicationService } from '../../../services/application/application.service'; -import { NoticeOfIntentDetailService } from '../../../services/notice-of-intent/notice-of-intent-detail.service'; -import { NoticeOfIntentDto } from '../../../services/notice-of-intent/notice-of-intent.dto'; -import { NoticeOfIntentService } from '../../../services/notice-of-intent/notice-of-intent.service'; +import { ApplicationService } from '../../../../services/application/application.service'; +import { NoticeOfIntentDetailService } from '../../../../services/notice-of-intent/notice-of-intent-detail.service'; +import { NoticeOfIntentSubmissionService } from '../../../../services/notice-of-intent/notice-of-intent-submission/notice-of-intent-submission.service'; +import { NoticeOfIntentDto } from '../../../../services/notice-of-intent/notice-of-intent.dto'; +import { NoticeOfIntentService } from '../../../../services/notice-of-intent/notice-of-intent.service'; import { PreparationComponent } from './preparation.component'; describe('IntakeComponent', () => { @@ -14,10 +15,13 @@ describe('IntakeComponent', () => { let fixture: ComponentFixture; let mockNOIDetailService: DeepMocked; let mockNOIService: DeepMocked; + let mockNoticeOfIntentSubmissionService: DeepMocked; + beforeEach(async () => { mockNOIService = createMock(); mockNOIDetailService = createMock(); + mockNoticeOfIntentSubmissionService = createMock(); mockNOIDetailService.$noticeOfIntent = new BehaviorSubject(undefined); await TestBed.configureTestingModule({ @@ -37,6 +41,10 @@ describe('IntakeComponent', () => { provide: NoticeOfIntentService, useValue: mockNOIService, }, + { + provide: NoticeOfIntentSubmissionService, + useValue: mockNoticeOfIntentSubmissionService, + }, ], declarations: [PreparationComponent], schemas: [NO_ERRORS_SCHEMA], diff --git a/alcs-frontend/src/app/features/notice-of-intent/proposal/preparation/preparation.component.ts b/alcs-frontend/src/app/features/notice-of-intent/proposal/preparation/preparation.component.ts new file mode 100644 index 0000000000..6e1b8ea947 --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/proposal/preparation/preparation.component.ts @@ -0,0 +1,129 @@ +import { Component, Input, OnInit } from '@angular/core'; +import moment from 'moment'; +import { environment } from '../../../../../environments/environment'; +import { NoticeOfIntentDetailService } from '../../../../services/notice-of-intent/notice-of-intent-detail.service'; +import { NoticeOfIntentSubmissionService } from '../../../../services/notice-of-intent/notice-of-intent-submission/notice-of-intent-submission.service'; +import { + NoticeOfIntentDto, + NoticeOfIntentSubmissionDto, + NoticeOfIntentSubtypeDto, + STRUCTURE_TYPES, + UpdateNoticeOfIntentDto, +} from '../../../../services/notice-of-intent/notice-of-intent.dto'; +import { NoticeOfIntentService } from '../../../../services/notice-of-intent/notice-of-intent.service'; +import { ToastService } from '../../../../services/toast/toast.service'; + +@Component({ + selector: 'app-preparation', + templateUrl: './preparation.component.html', + styleUrls: ['./preparation.component.scss'], +}) +export class PreparationComponent implements OnInit { + dateSubmittedToAlc?: string; + selectableTypes: { label: string; value: string; disabled: boolean }[] = []; + selectedSubtypes: string[] = []; + private subtypes: NoticeOfIntentSubtypeDto[] = []; + + _noticeOfIntent: NoticeOfIntentDto | undefined; + + @Input() set noticeOfIntent(noticeOfIntent: NoticeOfIntentDto | undefined) { + if (noticeOfIntent) { + this._noticeOfIntent = noticeOfIntent; + this.dateSubmittedToAlc = moment(noticeOfIntent.dateSubmittedToAlc).format(environment.dateFormat); + this.selectedSubtypes = noticeOfIntent.subtype.map((subtype) => subtype.label); + } + } + + constructor( + private noticeOfIntentDetailService: NoticeOfIntentDetailService, + private noticeOfIntentService: NoticeOfIntentService, + private noticeOfIntentSubmissionService: NoticeOfIntentSubmissionService, + private toastService: ToastService + ) {} + + ngOnInit(): void { + this.loadSubtypes(); + } + + async updateBoolean(field: keyof UpdateNoticeOfIntentDto, value: boolean) { + const application = this._noticeOfIntent; + if (application) { + const update = await this.noticeOfIntentDetailService.update(application.fileNumber, { + [field]: value, + }); + if (update) { + this.toastService.showSuccessToast('Notice of Intent updated'); + } + } + } + + private async loadSubtypes() { + if (this._noticeOfIntent) { + const submission = await this.noticeOfIntentSubmissionService.fetchSubmission(this._noticeOfIntent.fileNumber); + + const subtypes = await this.noticeOfIntentService.listSubtypes(); + this.subtypes = subtypes; + + this.selectableTypes = subtypes.map((subtype) => { + let disabled = false; + + disabled = this.isSubtypeDisabled(submission, subtype); + + return { + label: subtype.label, + value: subtype.label, + disabled, + }; + }); + } + } + + private isSubtypeDisabled(submission: NoticeOfIntentSubmissionDto, subtype: NoticeOfIntentSubtypeDto) { + const isResidentialAccessory = + submission.soilProposedStructures?.some((struct) => struct.type === STRUCTURE_TYPES.ACCESSORY_STRUCTURE) && + subtype.code === 'RACS'; + if (isResidentialAccessory) { + return true; + } + + const isPrincipalResidence = + submission.soilProposedStructures?.some((struct) => struct.type === STRUCTURE_TYPES.PRINCIPAL_RESIDENCE) && + subtype.code === 'RPRI'; + if (isPrincipalResidence) { + return true; + } + + const isAdditionalResidence = + submission.soilProposedStructures?.some((struct) => struct.type === STRUCTURE_TYPES.ADDITIONAL_RESIDENCE) && + subtype.code === 'RADD'; + if (isAdditionalResidence) { + return true; + } + + const isFarmStructure = + submission.soilProposedStructures?.some((struct) => struct.type === STRUCTURE_TYPES.FARM_STRUCTURE) && + subtype.code === 'FRST'; + if (isFarmStructure) { + return true; + } + + if (submission.soilIsAreaWideFilling && subtype.code === 'ARWF') { + return true; + } + + if (submission.soilIsExtractionOrMining && subtype.code === 'AEPM') { + return true; + } + + return false; + } + + async saveSubtypes($event: string | string[] | null) { + if (this._noticeOfIntent && $event instanceof Array) { + const selectedCodes = $event.map((label) => this.subtypes.find((subtype) => subtype.label === label)!.code); + await this.noticeOfIntentDetailService.update(this._noticeOfIntent?.fileNumber, { + subtype: selectedCodes, + }); + } + } +} diff --git a/alcs-frontend/src/app/features/notice-of-intent/proposal/proposal.component.html b/alcs-frontend/src/app/features/notice-of-intent/proposal/proposal.component.html new file mode 100644 index 0000000000..d384b46289 --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/proposal/proposal.component.html @@ -0,0 +1,55 @@ +

Notice of Intent Prep

+
+
Proposal Components - {{ noticeOfIntent?.type?.label }}
+
+
+
Proposal ALR Area (ha)
+ +
+
+
Ag Cap
+ +
+
+
Ag Cap Source
+ +
+
+
Ag Cap Map
+ +
+
+
Ag Cap Consultant
+ +
+
+
+ +
+ +
+
+
Parcels
+ +
+
+
Staff Comments and Observations
+ +
diff --git a/alcs-frontend/src/app/features/notice-of-intent/proposal/proposal.component.scss b/alcs-frontend/src/app/features/notice-of-intent/proposal/proposal.component.scss new file mode 100644 index 0000000000..102987e802 --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/proposal/proposal.component.scss @@ -0,0 +1,15 @@ +h3 { + margin-bottom: 24px !important; +} + +.input-table { + display: grid; + grid-template-columns: 1fr 1fr; + margin-top: 16px; + row-gap: 32px; + column-gap: 24px; +} + +section { + margin-bottom: 56px; +} diff --git a/alcs-frontend/src/app/features/notice-of-intent/proposal/proposal.component.spec.ts b/alcs-frontend/src/app/features/notice-of-intent/proposal/proposal.component.spec.ts new file mode 100644 index 0000000000..53f765e4ce --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/proposal/proposal.component.spec.ts @@ -0,0 +1,47 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { BehaviorSubject } from 'rxjs'; +import { NoticeOfIntentDetailService } from '../../../services/notice-of-intent/notice-of-intent-detail.service'; +import { NoticeOfIntentDto } from '../../../services/notice-of-intent/notice-of-intent.dto'; +import { ToastService } from '../../../services/toast/toast.service'; + +import { ProposalComponent } from './proposal.component'; + +describe('ProposalComponent', () => { + let component: ProposalComponent; + let fixture: ComponentFixture; + let mockNoiDetailService: DeepMocked; + let mockToastService: DeepMocked; + + beforeEach(async () => { + mockNoiDetailService = createMock(); + mockToastService = createMock(); + + mockNoiDetailService.$noticeOfIntent = new BehaviorSubject(undefined); + + await TestBed.configureTestingModule({ + declarations: [ ProposalComponent ], + providers: [ + { + provide: NoticeOfIntentDetailService, + useValue: mockNoiDetailService, + }, + { + provide: ToastService, + useValue: mockToastService, + }, + ], + schemas: [NO_ERRORS_SCHEMA], + }) + .compileComponents(); + + fixture = TestBed.createComponent(ProposalComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/alcs-frontend/src/app/features/notice-of-intent/proposal/proposal.component.ts b/alcs-frontend/src/app/features/notice-of-intent/proposal/proposal.component.ts new file mode 100644 index 0000000000..a51f23a4ef --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/proposal/proposal.component.ts @@ -0,0 +1,54 @@ +import { Component, OnInit } from '@angular/core'; +import { NoticeOfIntentDetailService } from '../../../services/notice-of-intent/notice-of-intent-detail.service'; +import { NoticeOfIntentDto, UpdateNoticeOfIntentDto } from '../../../services/notice-of-intent/notice-of-intent.dto'; +import { ToastService } from '../../../services/toast/toast.service'; +import { AG_CAP_OPTIONS, AG_CAP_SOURCE_OPTIONS } from '../../../shared/dto/ag-cap.types.dto'; +import { SYSTEM_SOURCE_TYPES } from '../../../shared/dto/system-source.types.dto'; + +@Component({ + selector: 'app-proposal', + templateUrl: './proposal.component.html', + styleUrls: ['./proposal.component.scss'], +}) +export class ProposalComponent implements OnInit { + noticeOfIntent?: NoticeOfIntentDto; + + agCapOptions = AG_CAP_OPTIONS; + agCapSourceOptions = AG_CAP_SOURCE_OPTIONS; + alrArea: string | undefined; + staffObservations = ''; + APPLICATION_SYSTEM_SOURCE_TYPES = SYSTEM_SOURCE_TYPES; + + constructor(private noiDetailService: NoticeOfIntentDetailService, private toastService: ToastService) {} + + ngOnInit(): void { + this.noiDetailService.$noticeOfIntent.subscribe((noticeOfIntent) => { + if (noticeOfIntent) { + this.noticeOfIntent = noticeOfIntent; + this.alrArea = noticeOfIntent.alrArea?.toString(); + this.staffObservations = noticeOfIntent.staffObservations ?? ''; + } + }); + } + + async onSaveAlrArea(value: string | null) { + const parsedValue = value ? parseFloat(value) : null; + await this.updateNoiValue('alrArea', parsedValue); + } + + async updateNoiValue(field: keyof UpdateNoticeOfIntentDto, value: string[] | string | number | null) { + const noticeOfIntent = this.noticeOfIntent; + if (noticeOfIntent) { + const update = await this.noiDetailService.update(noticeOfIntent.fileNumber, { + [field]: value, + }); + if (update) { + this.toastService.showSuccessToast('Notice of Intent updated'); + } + } + } + + async onSaveStaffObservations($event: string) { + await this.updateNoiValue('staffObservations', $event); + } +} diff --git a/alcs-frontend/src/app/features/notice-of-intent/proposal/soil/soil.component.html b/alcs-frontend/src/app/features/notice-of-intent/proposal/soil/soil.component.html new file mode 100644 index 0000000000..59611d05d0 --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/proposal/soil/soil.component.html @@ -0,0 +1,49 @@ +
+
Use End Date
+ +
+ +
+
Type, origin and quality of fill proposed to be placed.
+ {{ submission?.soilFillTypeToPlace }} +
+ +
+
Type of soil to be removed.
+ {{ submission?.soilTypeRemoved }} +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Fill to be PlacedFill to be Removed
Volume{{ submission.soilToPlaceVolume }} m3{{ submission.soilToRemoveVolume }} m3
Area{{ submission.soilToPlaceArea }} ha{{ submission.soilToRemoveArea }} ha
Maximum Depth{{ submission.soilToPlaceMaximumDepth }} m{{ submission.soilToRemoveMaximumDepth }} m
Average Depth{{ submission.soilToPlaceAverageDepth }} m{{ submission.soilToRemoveAverageDepth }} m
+
diff --git a/alcs-frontend/src/app/features/notice-of-intent/proposal/soil/soil.component.scss b/alcs-frontend/src/app/features/notice-of-intent/proposal/soil/soil.component.scss new file mode 100644 index 0000000000..53417de07a --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/proposal/soil/soil.component.scss @@ -0,0 +1,16 @@ +div { + margin: 32px 0; +} + +table { + border-spacing: 12px; + margin-left: -12px; +} + +.soil-table-label { + font-weight: 700; +} + +.header { + margin-bottom: 6px !important; +} diff --git a/alcs-frontend/src/app/features/notice-of-intent/proposal/soil/soil.component.spec.ts b/alcs-frontend/src/app/features/notice-of-intent/proposal/soil/soil.component.spec.ts new file mode 100644 index 0000000000..f0ba13cce5 --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/proposal/soil/soil.component.spec.ts @@ -0,0 +1,53 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { BehaviorSubject } from 'rxjs'; +import { NoticeOfIntentDetailService } from '../../../../services/notice-of-intent/notice-of-intent-detail.service'; +import { NoticeOfIntentSubmissionService } from '../../../../services/notice-of-intent/notice-of-intent-submission/notice-of-intent-submission.service'; +import { NoticeOfIntentDto } from '../../../../services/notice-of-intent/notice-of-intent.dto'; +import { ToastService } from '../../../../services/toast/toast.service'; + +import { SoilProposalComponent } from './soil.component'; + +describe('SoilComponent', () => { + let component: SoilProposalComponent; + let fixture: ComponentFixture; + let mockNoiDetailService: DeepMocked; + let mockNoiSubmissionService: DeepMocked; + let mockToastService: DeepMocked; + + beforeEach(async () => { + mockNoiDetailService = createMock(); + mockNoiSubmissionService = createMock(); + mockToastService = createMock(); + + mockNoiDetailService.$noticeOfIntent = new BehaviorSubject(undefined); + + await TestBed.configureTestingModule({ + declarations: [SoilProposalComponent], + providers: [ + { + provide: NoticeOfIntentDetailService, + useValue: mockNoiDetailService, + }, + { + provide: NoticeOfIntentSubmissionService, + useValue: mockNoiSubmissionService, + }, + { + provide: ToastService, + useValue: mockToastService, + }, + ], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(SoilProposalComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/alcs-frontend/src/app/features/notice-of-intent/proposal/soil/soil.component.ts b/alcs-frontend/src/app/features/notice-of-intent/proposal/soil/soil.component.ts new file mode 100644 index 0000000000..2553f15abb --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/proposal/soil/soil.component.ts @@ -0,0 +1,49 @@ +import { Component, OnDestroy, OnInit } from '@angular/core'; +import { Subject, takeUntil } from 'rxjs'; +import { NoticeOfIntentDetailService } from '../../../../services/notice-of-intent/notice-of-intent-detail.service'; +import { NoticeOfIntentSubmissionService } from '../../../../services/notice-of-intent/notice-of-intent-submission/notice-of-intent-submission.service'; +import { NoticeOfIntentDto, NoticeOfIntentSubmissionDto, UpdateNoticeOfIntentDto } from '../../../../services/notice-of-intent/notice-of-intent.dto'; +import { ToastService } from '../../../../services/toast/toast.service'; + +@Component({ + selector: 'app-proposal-soil', + templateUrl: './soil.component.html', + styleUrls: ['./soil.component.scss'], +}) +export class SoilProposalComponent implements OnDestroy, OnInit { + $destroy = new Subject(); + noticeOfIntent: NoticeOfIntentDto | undefined; + submission: NoticeOfIntentSubmissionDto | undefined; + + constructor( + private noiDetailService: NoticeOfIntentDetailService, + private noiSubmissionService: NoticeOfIntentSubmissionService, + private toastService: ToastService + ) {} + + ngOnInit(): void { + this.noiDetailService.$noticeOfIntent.pipe(takeUntil(this.$destroy)).subscribe(async (noi) => { + if (noi) { + this.noticeOfIntent = noi; + this.submission = await this.noiSubmissionService.fetchSubmission(noi.fileNumber); + } + }); + } + + async updateValue(field: keyof UpdateNoticeOfIntentDto, value: string[] | string | number | null) { + const application = this.noticeOfIntent; + if (application) { + const update = await this.noiDetailService.update(application.fileNumber, { + [field]: value, + }); + if (update) { + this.toastService.showSuccessToast('Notice of Intent updated'); + } + } + } + + ngOnDestroy(): void { + this.$destroy.next(); + this.$destroy.complete(); + } +} diff --git a/alcs-frontend/src/app/services/application/application.dto.ts b/alcs-frontend/src/app/services/application/application.dto.ts index aee39f025d..2794b6f739 100644 --- a/alcs-frontend/src/app/services/application/application.dto.ts +++ b/alcs-frontend/src/app/services/application/application.dto.ts @@ -1,20 +1,11 @@ import { BaseCodeDto } from '../../shared/dto/base.dto'; +import { SYSTEM_SOURCE_TYPES } from '../../shared/dto/system-source.types.dto'; import { CardDto } from '../card/card.dto'; import { UserDto } from '../user/user.dto'; import { ApplicationRegionDto, ApplicationTypeDto } from './application-code.dto'; import { ApplicationLocalGovernmentDto } from './application-local-government/application-local-government.dto'; import { ApplicationSubmissionToSubmissionStatusDto } from './application-submission-status/application-submission-status.dto'; -export enum SYSTEM_SOURCE_TYPES { - APPLICANT = 'APPLICANT', - ALCS = 'ALCS', -} - -export enum PARCEL_OWNERSHIP_TYPE { - FEE_SIMPLE = 'SMPL', - CROWN = 'CRWN', -} - export enum SUBMISSION_STATUS { IN_PROGRESS = 'PROG', INCOMPLETE = 'INCM', // L/FNG Returned as Incomplete diff --git a/alcs-frontend/src/app/services/application/application.service.spec.ts b/alcs-frontend/src/app/services/application/application.service.spec.ts index b4e509f0bd..f327b07ea3 100644 --- a/alcs-frontend/src/app/services/application/application.service.spec.ts +++ b/alcs-frontend/src/app/services/application/application.service.spec.ts @@ -2,8 +2,9 @@ import { HttpClient } from '@angular/common/http'; import { TestBed } from '@angular/core/testing'; import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { firstValueFrom, of, throwError } from 'rxjs'; +import { SYSTEM_SOURCE_TYPES } from '../../shared/dto/system-source.types.dto'; import { ToastService } from '../toast/toast.service'; -import { ApplicationDto, SYSTEM_SOURCE_TYPES } from './application.dto'; +import { ApplicationDto } from './application.dto'; import { ApplicationService } from './application.service'; diff --git a/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent.dto.ts b/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent.dto.ts index 933a4d53d7..2782671139 100644 --- a/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent.dto.ts +++ b/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent.dto.ts @@ -1,4 +1,5 @@ import { BaseCodeDto } from '../../shared/dto/base.dto'; +import { SYSTEM_SOURCE_TYPES } from '../../shared/dto/system-source.types.dto'; import { ApplicationRegionDto } from '../application/application-code.dto'; import { ApplicationLocalGovernmentDto } from '../application/application-local-government/application-local-government.dto'; import { CardDto } from '../card/card.dto'; @@ -30,7 +31,7 @@ export interface NoticeOfIntentDto { region: ApplicationRegionDto; applicant: string; type: NoticeOfIntentTypeDto; - source: 'ALCS' | 'APPLICANT'; + source: SYSTEM_SOURCE_TYPES; dateSubmittedToAlc?: number; feePaidDate?: number; @@ -48,6 +49,14 @@ export interface NoticeOfIntentDto { activeDays: number | null; pausedDays: number | null; paused: boolean; + + alrArea?: number; + agCap?: string; + agCapSource?: string; + agCapMap?: string; + agCapConsultant?: string; + staffObservations?: string; + proposalEndDate?: number; } export interface UpdateNoticeOfIntentDto { @@ -62,6 +71,14 @@ export interface UpdateNoticeOfIntentDto { summary?: string; retroactive?: boolean; subtype?: string[]; + + alrArea?: number; + agCap?: string; + agCapSource?: string; + agCapMap?: string; + agCapConsultant?: string; + staffObservations?: string; + proposalEndDate?: number; } export enum NOI_SUBMISSION_STATUS { @@ -147,6 +164,7 @@ export interface NoticeOfIntentSubmissionDto { soilStructureResidentialUseReason?: string | null; soilAgriParcelActivity?: string | null; soilStructureResidentialAccessoryUseReason?: string | null; + soilIsAreaWideFilling?: boolean | null; soilProposedStructures: ProposedStructure[]; } diff --git a/alcs-frontend/src/app/shared/dto/ag-cap.types.dto.ts b/alcs-frontend/src/app/shared/dto/ag-cap.types.dto.ts new file mode 100644 index 0000000000..83f70e7c4a --- /dev/null +++ b/alcs-frontend/src/app/shared/dto/ag-cap.types.dto.ts @@ -0,0 +1,37 @@ +export const AG_CAP_OPTIONS = [ + { + label: 'Mixed Prime and Secondary', + value: 'Mixed Prime and Secondary', + }, + { + label: 'Prime', + value: 'Prime', + }, + { + label: 'Prime Dominant', + value: 'Prime Dominant', + }, + { + label: 'Secondary', + value: 'Secondary', + }, + { + label: 'Unclassified', + value: 'Unclassified', + }, +]; + +export const AG_CAP_SOURCE_OPTIONS = [ + { + label: 'BCLI', + value: 'BCLI', + }, + { + label: 'CLI', + value: 'CLI', + }, + { + label: 'On-site', + value: 'On-site', + }, +]; diff --git a/alcs-frontend/src/app/shared/dto/parcel-ownership.type.dto.ts b/alcs-frontend/src/app/shared/dto/parcel-ownership.type.dto.ts new file mode 100644 index 0000000000..48074e039f --- /dev/null +++ b/alcs-frontend/src/app/shared/dto/parcel-ownership.type.dto.ts @@ -0,0 +1,4 @@ +export enum PARCEL_OWNERSHIP_TYPE { + FEE_SIMPLE = 'SMPL', + CROWN = 'CRWN', +} diff --git a/alcs-frontend/src/app/shared/dto/system-source.types.dto.ts b/alcs-frontend/src/app/shared/dto/system-source.types.dto.ts new file mode 100644 index 0000000000..aba4fa4519 --- /dev/null +++ b/alcs-frontend/src/app/shared/dto/system-source.types.dto.ts @@ -0,0 +1,4 @@ +export enum SYSTEM_SOURCE_TYPES { + APPLICANT = 'APPLICANT', + ALCS = 'ALCS', +} diff --git a/alcs-frontend/src/app/shared/inline-editors/inline-dropdown/inline-dropdown.component.html b/alcs-frontend/src/app/shared/inline-editors/inline-dropdown/inline-dropdown.component.html index 773ef5018d..ce65699289 100644 --- a/alcs-frontend/src/app/shared/inline-editors/inline-dropdown/inline-dropdown.component.html +++ b/alcs-frontend/src/app/shared/inline-editors/inline-dropdown/inline-dropdown.component.html @@ -20,7 +20,11 @@ > - + {{ option.label }} diff --git a/alcs-frontend/src/app/shared/inline-editors/inline-dropdown/inline-dropdown.component.ts b/alcs-frontend/src/app/shared/inline-editors/inline-dropdown/inline-dropdown.component.ts index bbc2f0832c..291badd90b 100644 --- a/alcs-frontend/src/app/shared/inline-editors/inline-dropdown/inline-dropdown.component.ts +++ b/alcs-frontend/src/app/shared/inline-editors/inline-dropdown/inline-dropdown.component.ts @@ -8,7 +8,7 @@ import { AfterContentChecked, Component, ElementRef, EventEmitter, Input, Output export class InlineDropdownComponent implements AfterContentChecked { @Input() value?: string | string[] | undefined; @Input() placeholder: string = 'Enter a value'; - @Input() options: { label: string; value: string }[] = []; + @Input() options: { label: string; value: string; disabled?: boolean | null }[] = []; @Input() multiple = false; @Output() save = new EventEmitter(); diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.html index 56f646bb69..814f281721 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.html @@ -7,7 +7,7 @@

Submit Notice of Intent

Terms and Conditions:
- I/we consent to the use of the information provided in the application and all supporting documents to process the + I/we consent to the use of the information provided in the Notice of Intent and all supporting documents to process the application in accordance with the Agricultural Land Commission Act, the Agricultural Land Reserve General Regulation, and the Agricultural Land Reserve Use Regulation. diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission/notice-of-intent-submission.service.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission/notice-of-intent-submission.service.ts index bf38c26422..cfba2fb325 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission/notice-of-intent-submission.service.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission/notice-of-intent-submission.service.ts @@ -74,7 +74,7 @@ export class NoticeOfIntentSubmissionService { ); } - private loadBarebonesSubmission(fileNumber: string) { + public loadBarebonesSubmission(fileNumber: string) { //Load submission without relations to prevent save from crazy cascading return this.noiSubmissionRepository.findOneOrFail({ where: { diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.dto.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.dto.ts index 987111de92..9b3ee13dae 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.dto.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.dto.ts @@ -107,6 +107,26 @@ export class NoticeOfIntentDto { @AutoMap() source: 'ALCS' | 'APPLICANT'; + + @AutoMap(() => String) + alrArea?: number; + + @AutoMap(() => String) + agCap?: string; + + @AutoMap(() => String) + agCapSource?: string; + + @AutoMap(() => String) + agCapMap?: string; + + @AutoMap(() => String) + agCapConsultant?: string; + + @AutoMap(() => String) + staffObservations?: string; + + proposalEndDate?: number; } export class UpdateNoticeOfIntentDto { @@ -157,6 +177,34 @@ export class UpdateNoticeOfIntentDto { @IsBoolean() @IsOptional() retroactive?: boolean; + + @IsOptional() + @IsNumber() + alrArea?: number; + + @IsOptional() + @IsString() + agCap?: string; + + @IsOptional() + @IsString() + agCapSource?: string; + + @IsOptional() + @IsString() + agCapMap?: string; + + @IsOptional() + @IsString() + agCapConsultant?: string; + + @IsOptional() + @IsString() + staffObservations?: string; + + @IsOptional() + @IsNumber() + proposalEndDate?: number; } export class CreateNoticeOfIntentServiceDto { @@ -167,4 +215,5 @@ export class CreateNoticeOfIntentServiceDto { regionCode?: string; localGovernmentUuid?: string; source?: 'ALCS' | 'APPLICANT'; + subtypes?: string[]; } diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.entity.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.entity.ts index 9108748bf2..d4001d18e1 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.entity.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.entity.ts @@ -146,6 +146,64 @@ export class NoticeOfIntent extends Base { }) decisionDate: Date | null; + @AutoMap(() => Number) + @Column({ + type: 'decimal', + nullable: true, + precision: 12, + scale: 2, + transformer: new ColumnNumericTransformer(), + comment: 'Area in hectares of ALR impacted by the proposal', + }) + alrArea?: number | null; + + @AutoMap(() => String) + @Column({ + type: 'text', + comment: 'Agricultural cap classification', + nullable: true, + }) + agCap?: string | null; + + @AutoMap(() => String) + @Column({ + type: 'text', + comment: 'Agricultural capability classification system used', + nullable: true, + }) + agCapSource?: string | null; + + @AutoMap(() => String) + @Column({ + type: 'text', + comment: 'Agricultural capability map sheet reference', + nullable: true, + }) + agCapMap?: string | null; + + @AutoMap(() => String) + @Column({ + type: 'text', + comment: 'Consultant who determined the agricultural capability', + nullable: true, + }) + agCapConsultant?: string | null; + + @AutoMap(() => String) + @Column({ + type: 'text', + comment: 'ALC Staff Observations and Comments', + nullable: true, + }) + staffObservations?: string | null; + + @Column({ + type: 'timestamptz', + comment: 'The date at which the proposal use ends', + nullable: true, + }) + proposalEndDate?: Date | null; + @ManyToOne(() => NoticeOfIntentType, { nullable: false, }) diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.spec.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.spec.ts index 0b7580b026..2160673de2 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.spec.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.spec.ts @@ -4,8 +4,10 @@ import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; +import { ServiceValidationException } from '../../../../../libs/common/src/exceptions/base.exception'; import { NoticeOfIntentProfile } from '../../common/automapper/notice-of-intent.automapper.profile'; import { FileNumberService } from '../../file-number/file-number.service'; +import { NoticeOfIntentSubmission } from '../../portal/notice-of-intent-submission/notice-of-intent-submission.entity'; import { Board } from '../board/board.entity'; import { Card } from '../card/card.entity'; import { CardService } from '../card/card.service'; @@ -16,6 +18,7 @@ import { LocalGovernmentService } from '../local-government/local-government.ser import { NOI_SUBMISSION_STATUS } from './notice-of-intent-submission-status/notice-of-intent-status.dto'; import { NoticeOfIntentSubmissionToSubmissionStatus } from './notice-of-intent-submission-status/notice-of-intent-status.entity'; import { NoticeOfIntentSubmissionStatusService } from './notice-of-intent-submission-status/notice-of-intent-submission-status.service'; +import { NoticeOfIntentSubmissionService } from './notice-of-intent-submission/notice-of-intent-submission.service'; import { NoticeOfIntentSubtype } from './notice-of-intent-subtype.entity'; import { NoticeOfIntent } from './notice-of-intent.entity'; import { NoticeOfIntentService } from './notice-of-intent.service'; @@ -30,6 +33,7 @@ describe('NoticeOfIntentService', () => { let mockLocalGovernmentService: DeepMocked; let mockCodeService: DeepMocked; let mockSubmissionStatusService: DeepMocked; + let mockNoticeOfIntentSubmissionService: DeepMocked; beforeEach(async () => { mockCardService = createMock(); @@ -40,6 +44,7 @@ describe('NoticeOfIntentService', () => { mockLocalGovernmentService = createMock(); mockCodeService = createMock(); mockSubmissionStatusService = createMock(); + mockNoticeOfIntentSubmissionService = createMock(); const module: TestingModule = await Test.createTestingModule({ imports: [ @@ -82,6 +87,10 @@ describe('NoticeOfIntentService', () => { provide: NoticeOfIntentSubmissionStatusService, useValue: mockSubmissionStatusService, }, + { + provide: NoticeOfIntentSubmissionService, + useValue: mockNoticeOfIntentSubmissionService, + }, ], }).compile(); @@ -186,6 +195,57 @@ describe('NoticeOfIntentService', () => { expect(notice.summary).toEqual('new-summary'); }); + it('should fail update if the preselected subtypes missing', async () => { + const notice = new NoticeOfIntent({ + summary: 'old-summary', + }); + + const errors = [ + '"Residential - Accessory Structures" must be selected', + '"Residential - Additional Residence" must be selected', + '"Residential - Principal Residence" must be selected', + '"Farm Structure" must be selected', + '"Area-Wide Filling" must be selected', + '"Aggregate Extraction or Placer Mining" must be selected', + ]; + + mockSubtypeRepository.find.mockResolvedValue([]); + mockNoticeOfIntentSubmissionService.loadBarebonesSubmission.mockResolvedValue( + new NoticeOfIntentSubmission({ + soilProposedStructures: [ + { + type: 'Farm Structure', + }, + { + type: 'Residential - Principal Residence', + }, + { + type: 'Residential - Additional Residence', + }, + { + type: 'Residential - Accessory Structure', + }, + ], + soilIsAreaWideFilling: true, + soilIsExtractionOrMining: true, + }), + ); + + mockRepository.findOneOrFail.mockResolvedValue(notice); + mockRepository.save.mockResolvedValue(new NoticeOfIntent()); + const promise = service.update('file', { + summary: 'new-summary', + subtype: [], + }); + + await expect(promise).rejects.toMatchObject( + new ServiceValidationException(errors.join('; ')), + ); + + expect(mockRepository.findOneOrFail).toHaveBeenCalledTimes(1); + expect(mockRepository.save).toHaveBeenCalledTimes(0); + }); + it('should set the X status when setting Acknowledge Complete', async () => { const notice = new NoticeOfIntent({ summary: 'old-summary', diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.ts index fc21f9ab5c..81c0130b04 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.ts @@ -15,9 +15,12 @@ import { Repository, } from 'typeorm'; import { FileNumberService } from '../../file-number/file-number.service'; +import { + NoticeOfIntentSubmission, + PORTAL_TO_ALCS_STRUCTURE_TYPES_MAPPING, +} from '../../portal/notice-of-intent-submission/notice-of-intent-submission.entity'; import { formatIncomingDate } from '../../utils/incoming-date.formatter'; import { filterUndefined } from '../../utils/undefined'; -import { SUBMISSION_STATUS } from '../application/application-submission-status/submission-status.dto'; import { ApplicationTimeData } from '../application/application-time-tracking.service'; import { Board } from '../board/board.entity'; import { CARD_TYPE } from '../card/card-type/card-type.entity'; @@ -28,6 +31,7 @@ import { CodeService } from '../code/code.service'; import { LocalGovernmentService } from '../local-government/local-government.service'; import { NOI_SUBMISSION_STATUS } from './notice-of-intent-submission-status/notice-of-intent-status.dto'; import { NoticeOfIntentSubmissionStatusService } from './notice-of-intent-submission-status/notice-of-intent-submission-status.service'; +import { NoticeOfIntentSubmissionService } from './notice-of-intent-submission/notice-of-intent-submission.service'; import { NoticeOfIntentSubtype } from './notice-of-intent-subtype.entity'; import { CreateNoticeOfIntentServiceDto, @@ -68,6 +72,7 @@ export class NoticeOfIntentService { private codeService: CodeService, private localGovernmentService: LocalGovernmentService, private noticeOfIntentSubmissionStatusService: NoticeOfIntentSubmissionStatusService, + private noticeOfIntentSubmissionService: NoticeOfIntentSubmissionService, ) {} async create( @@ -90,6 +95,7 @@ export class NoticeOfIntentService { applicant: createDto.applicant, dateSubmittedToAlc: createDto.dateSubmittedToAlc, type, + source: createDto.source, }); if (board) { @@ -231,6 +237,12 @@ export class NoticeOfIntentService { const selectedSubtypes = updateDto.subtype.map( (code) => subtypes.find((subtype) => subtype.code === code)!, ); + + await this.validatePrepopulatedSubtypes( + noticeOfIntent, + updateDto.subtype, + ); + noticeOfIntent.subtype = selectedSubtypes; } @@ -279,9 +291,159 @@ export class NoticeOfIntentService { ? updateDto.retroactive : noticeOfIntent.retroactive; + noticeOfIntent.alrArea = filterUndefined( + updateDto.alrArea, + noticeOfIntent.alrArea, + ); + + noticeOfIntent.agCap = filterUndefined( + updateDto.agCap, + noticeOfIntent.agCap, + ); + + noticeOfIntent.agCapConsultant = filterUndefined( + updateDto.agCapConsultant, + noticeOfIntent.agCapConsultant, + ); + + noticeOfIntent.agCapMap = filterUndefined( + updateDto.agCapMap, + noticeOfIntent.agCapMap, + ); + + noticeOfIntent.agCapSource = filterUndefined( + updateDto.agCapSource, + noticeOfIntent.agCapSource, + ); + + noticeOfIntent.staffObservations = filterUndefined( + updateDto.staffObservations, + noticeOfIntent.staffObservations, + ); + + noticeOfIntent.proposalEndDate = filterUndefined( + formatIncomingDate(updateDto.proposalEndDate), + noticeOfIntent.proposalEndDate, + ); + await this.repository.save(noticeOfIntent); - //Statuses + await this.updateStatus(updateDto, noticeOfIntent); + + return this.getByFileNumber(noticeOfIntent.fileNumber); + } + + private async validatePrepopulatedSubtypes( + noticeOfIntent: NoticeOfIntent, + subtypes: string[], + ) { + const errors: string[] = []; + const noticeOfIntentSubmission = + await this.noticeOfIntentSubmissionService.loadBarebonesSubmission( + noticeOfIntent.fileNumber, + ); + + const isResidentialAccessory = this.checkIfStructureExists( + noticeOfIntentSubmission, + PORTAL_TO_ALCS_STRUCTURE_TYPES_MAPPING.RESIDENTIAL_ACCESSORY_STRUCTURE + .portalValue, + ); + if ( + isResidentialAccessory && + !this.checkIfCodePresentInNoiSubtypes( + subtypes, + PORTAL_TO_ALCS_STRUCTURE_TYPES_MAPPING.RESIDENTIAL_ACCESSORY_STRUCTURE + .alcsValueCode, + ) + ) { + errors.push('"Residential - Accessory Structures" must be selected'); + } + + const isResidentialAdditionalResidence = this.checkIfStructureExists( + noticeOfIntentSubmission, + PORTAL_TO_ALCS_STRUCTURE_TYPES_MAPPING.RESIDENTIAL_ADDITIONAL_RESIDENCE + .portalValue, + ); + if ( + isResidentialAdditionalResidence && + !this.checkIfCodePresentInNoiSubtypes( + subtypes, + PORTAL_TO_ALCS_STRUCTURE_TYPES_MAPPING.RESIDENTIAL_ADDITIONAL_RESIDENCE + .alcsValueCode, + ) + ) { + errors.push('"Residential - Additional Residence" must be selected'); + } + + const isResidentialPrincipalResidence = this.checkIfStructureExists( + noticeOfIntentSubmission, + PORTAL_TO_ALCS_STRUCTURE_TYPES_MAPPING.RESIDENTIAL_PRINCIPAL_RESIDENCE + .portalValue, + ); + if ( + isResidentialPrincipalResidence && + !this.checkIfCodePresentInNoiSubtypes( + subtypes, + PORTAL_TO_ALCS_STRUCTURE_TYPES_MAPPING.RESIDENTIAL_PRINCIPAL_RESIDENCE + .alcsValueCode, + ) + ) { + errors.push('"Residential - Principal Residence" must be selected'); + } + + const isFarmStructure = this.checkIfStructureExists( + noticeOfIntentSubmission, + PORTAL_TO_ALCS_STRUCTURE_TYPES_MAPPING.FARM_STRUCTURE.portalValue, + ); + if ( + isFarmStructure && + !this.checkIfCodePresentInNoiSubtypes( + subtypes, + PORTAL_TO_ALCS_STRUCTURE_TYPES_MAPPING.FARM_STRUCTURE.alcsValueCode, + ) + ) { + errors.push('"Farm Structure" must be selected'); + } + + if ( + noticeOfIntentSubmission.soilIsAreaWideFilling && + !subtypes.some((subtype) => subtype === 'ARWF') + ) { + errors.push('"Area-Wide Filling" must be selected'); + } + + if ( + noticeOfIntentSubmission.soilIsExtractionOrMining && + !subtypes.some((subtype) => subtype === 'AEPM') + ) { + errors.push('"Aggregate Extraction or Placer Mining" must be selected'); + } + + if (errors.length > 0) { + throw new ServiceValidationException(errors.join('; ')); + } + } + + private checkIfStructureExists( + noticeOfIntentSubmission: NoticeOfIntentSubmission, + searchType: string, + ) { + return noticeOfIntentSubmission.soilProposedStructures?.some( + (struct) => struct.type === searchType, + ); + } + + private checkIfCodePresentInNoiSubtypes( + subtypes: string[], + searchCode: string, + ) { + return subtypes.some((subtype) => subtype === searchCode); + } + + private async updateStatus( + updateDto: UpdateNoticeOfIntentDto, + noticeOfIntent: NoticeOfIntent, + ) { try { if (updateDto.dateAcknowledgedIncomplete !== undefined) { await this.noticeOfIntentSubmissionStatusService.setStatusDateByFileNumber( @@ -305,8 +467,6 @@ export class NoticeOfIntentService { throw error; } } - - return this.getByFileNumber(noticeOfIntent.fileNumber); } async listTypes() { @@ -432,6 +592,15 @@ export class NoticeOfIntentService { existingNoticeOfIntent.card = new Card(); existingNoticeOfIntent.card.typeCode = CARD_TYPE.NOI; + if (createDto.subtypes && createDto.subtypes.length > 0) { + const subtypes = await this.listSubtypes(); + const selectedSubtypes = subtypes.filter((subtype) => + createDto.subtypes!.includes(subtype.code), + ); + + existingNoticeOfIntent.subtype = selectedSubtypes; + } + await this.repository.save(existingNoticeOfIntent); return this.getByFileNumber(createDto.fileNumber); } diff --git a/services/apps/alcs/src/common/automapper/notice-of-intent.automapper.profile.ts b/services/apps/alcs/src/common/automapper/notice-of-intent.automapper.profile.ts index a1f6658a50..54d47bc7f6 100644 --- a/services/apps/alcs/src/common/automapper/notice-of-intent.automapper.profile.ts +++ b/services/apps/alcs/src/common/automapper/notice-of-intent.automapper.profile.ts @@ -1,8 +1,6 @@ import { createMap, forMember, mapFrom, Mapper } from '@automapper/core'; import { AutomapperProfile, InjectMapper } from '@automapper/nestjs'; import { Injectable } from '@nestjs/common'; -import { ApplicationDocumentDto } from '../../alcs/application/application-document/application-document.dto'; -import { ApplicationDocument } from '../../alcs/application/application-document/application-document.entity'; import { NoticeOfIntentTypeDto } from '../../alcs/code/application-code/notice-of-intent-type/notice-of-intent-type.dto'; import { NoticeOfIntentType } from '../../alcs/code/application-code/notice-of-intent-type/notice-of-intent-type.entity'; import { NoticeOfIntentDocumentDto } from '../../alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.dto'; @@ -62,6 +60,10 @@ export class NoticeOfIntentProfile extends AutomapperProfile { (a) => a.decisionDate, mapFrom((ad) => ad.decisionDate?.getTime()), ), + forMember( + (a) => a.proposalEndDate, + mapFrom((ad) => ad.proposalEndDate?.getTime()), + ), forMember( (a) => a.activeDays, mapFrom((_) => 0), diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.entity.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.entity.ts index a1a8e5f4dc..81b8ba0276 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.entity.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.entity.ts @@ -16,6 +16,25 @@ import { ColumnNumericTransformer } from '../../utils/column-numeric-transform'; import { NoticeOfIntentOwner } from './notice-of-intent-owner/notice-of-intent-owner.entity'; import { NoticeOfIntentParcel } from './notice-of-intent-parcel/notice-of-intent-parcel.entity'; +export const PORTAL_TO_ALCS_STRUCTURE_TYPES_MAPPING = { + RESIDENTIAL_PRINCIPAL_RESIDENCE: { + portalValue: 'Residential - Principal Residence', + alcsValueCode: 'RPRI', + }, + RESIDENTIAL_ADDITIONAL_RESIDENCE: { + portalValue: 'Residential - Additional Residence', + alcsValueCode: 'RADD', + }, + RESIDENTIAL_ACCESSORY_STRUCTURE: { + portalValue: 'Residential - Accessory Structure', + alcsValueCode: 'RACS', + }, + FARM_STRUCTURE: { + portalValue: 'Farm Structure', + alcsValueCode: 'FRST', + }, +}; + export class ProposedStructure { type: | 'Farm Structure' diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts index 220678b6ca..400f3aee40 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts @@ -16,7 +16,10 @@ import { NoticeOfIntentSubmissionProfile } from '../../common/automapper/notice- import { FileNumberService } from '../../file-number/file-number.service'; import { User } from '../../user/user.entity'; import { ValidatedNoticeOfIntentSubmission } from './notice-of-intent-submission-validator.service'; -import { NoticeOfIntentSubmission } from './notice-of-intent-submission.entity'; +import { + NoticeOfIntentSubmission, + PORTAL_TO_ALCS_STRUCTURE_TYPES_MAPPING, +} from './notice-of-intent-submission.entity'; import { NoticeOfIntentSubmissionService } from './notice-of-intent-submission.service'; describe('NoticeOfIntentSubmissionService', () => { @@ -245,6 +248,71 @@ describe('NoticeOfIntentSubmissionService', () => { expect(mockNoiStatusService.setStatusDate).toHaveBeenCalledTimes(1); }); + it('should populate noi subtypes', async () => { + const applicant = 'Bruce Wayne'; + const typeCode = 'fake-code'; + const fileNumber = 'fake'; + const localGovernmentUuid = 'fake-uuid'; + + const mockDate = new Date('2022-01-01'); + jest.useFakeTimers().setSystemTime(mockDate); + + const mockNoiSubmission = new NoticeOfIntentSubmission({ + fileNumber, + applicant, + typeCode, + localGovernmentUuid, + soilProposedStructures: [ + { + type: 'Farm Structure', + }, + { + type: 'Residential - Principal Residence', + }, + { + type: 'Residential - Additional Residence', + }, + { + type: 'Residential - Accessory Structure', + }, + ], + soilIsAreaWideFilling: true, + soilIsExtractionOrMining: true, + }); + const mockNoticeOfIntent = new NoticeOfIntent({ + dateSubmittedToAlc: new Date(), + }); + mockNoiStatusService.setStatusDate.mockResolvedValue( + new NoticeOfIntentSubmissionToSubmissionStatus(), + ); + + mockNoiService.submit.mockResolvedValue(mockNoticeOfIntent); + await service.submitToAlcs( + mockNoiSubmission as ValidatedNoticeOfIntentSubmission, + ); + + expect(mockNoiService.submit).toHaveBeenCalledTimes(1); + expect(mockNoiStatusService.setStatusDate).toHaveBeenCalledTimes(1); + expect(mockNoiService.submit).toHaveBeenCalledWith({ + applicant, + fileNumber, + localGovernmentUuid, + dateSubmittedToAlc: mockDate, + typeCode, + subtypes: [ + PORTAL_TO_ALCS_STRUCTURE_TYPES_MAPPING.RESIDENTIAL_ACCESSORY_STRUCTURE + .alcsValueCode, + PORTAL_TO_ALCS_STRUCTURE_TYPES_MAPPING.RESIDENTIAL_ADDITIONAL_RESIDENCE + .alcsValueCode, + PORTAL_TO_ALCS_STRUCTURE_TYPES_MAPPING.RESIDENTIAL_PRINCIPAL_RESIDENCE + .alcsValueCode, + PORTAL_TO_ALCS_STRUCTURE_TYPES_MAPPING.FARM_STRUCTURE.alcsValueCode, + 'ARWF', + 'AEPM', + ], + }); + }); + it('should update fields if notice of intent exists', async () => { const applicant = 'Bruce Wayne'; const typeCode = 'fake-code'; diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts index 09e9552120..729fcbe99e 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts @@ -27,7 +27,10 @@ import { NoticeOfIntentSubmissionDto, NoticeOfIntentSubmissionUpdateDto, } from './notice-of-intent-submission.dto'; -import { NoticeOfIntentSubmission } from './notice-of-intent-submission.entity'; +import { + NoticeOfIntentSubmission, + PORTAL_TO_ALCS_STRUCTURE_TYPES_MAPPING, +} from './notice-of-intent-submission.entity'; @Injectable() export class NoticeOfIntentSubmissionService { @@ -198,6 +201,9 @@ export class NoticeOfIntentSubmissionService { return this.noticeOfIntentSubmissionRepository.findOneOrFail({ where: findOptions, + relations: { + ...this.DEFAULT_RELATIONS, + }, order: { auditUpdatedAt: 'DESC', }, @@ -299,12 +305,15 @@ export class NoticeOfIntentSubmissionService { noticeOfIntentSubmission: ValidatedNoticeOfIntentSubmission, ) { try { + const subtypes = this.populateNoiSubtype(noticeOfIntentSubmission); + const submittedNoi = await this.noticeOfIntentService.submit({ fileNumber: noticeOfIntentSubmission.fileNumber, applicant: noticeOfIntentSubmission.applicant, localGovernmentUuid: noticeOfIntentSubmission.localGovernmentUuid, typeCode: noticeOfIntentSubmission.typeCode, dateSubmittedToAlc: new Date(), + subtypes, }); await this.noticeOfIntentSubmissionStatusService.setStatusDate( @@ -322,6 +331,75 @@ export class NoticeOfIntentSubmissionService { } } + private populateNoiSubtype( + noticeOfIntentSubmission: ValidatedNoticeOfIntentSubmission, + ) { + const subtypes: string[] = []; + const isResidentialAccessory = + noticeOfIntentSubmission.soilProposedStructures?.some( + (struct) => + struct.type === + PORTAL_TO_ALCS_STRUCTURE_TYPES_MAPPING.RESIDENTIAL_ACCESSORY_STRUCTURE + .portalValue, + ); + if (isResidentialAccessory) { + subtypes.push( + PORTAL_TO_ALCS_STRUCTURE_TYPES_MAPPING.RESIDENTIAL_ACCESSORY_STRUCTURE + .alcsValueCode, + ); + } + + const isResidentialAdditionalResidence = + noticeOfIntentSubmission.soilProposedStructures?.some( + (struct) => + struct.type === + PORTAL_TO_ALCS_STRUCTURE_TYPES_MAPPING + .RESIDENTIAL_ADDITIONAL_RESIDENCE.portalValue, + ); + if (isResidentialAdditionalResidence) { + subtypes.push( + PORTAL_TO_ALCS_STRUCTURE_TYPES_MAPPING.RESIDENTIAL_ADDITIONAL_RESIDENCE + .alcsValueCode, + ); + } + + const isResidentialPrincipalResidence = + noticeOfIntentSubmission.soilProposedStructures?.some( + (struct) => + struct.type === + PORTAL_TO_ALCS_STRUCTURE_TYPES_MAPPING.RESIDENTIAL_PRINCIPAL_RESIDENCE + .portalValue, + ); + if (isResidentialPrincipalResidence) { + subtypes.push( + PORTAL_TO_ALCS_STRUCTURE_TYPES_MAPPING.RESIDENTIAL_PRINCIPAL_RESIDENCE + .alcsValueCode, + ); + } + + const isFarmStructure = + noticeOfIntentSubmission.soilProposedStructures?.some( + (struct) => + struct.type === + PORTAL_TO_ALCS_STRUCTURE_TYPES_MAPPING.FARM_STRUCTURE.portalValue, + ); + if (isFarmStructure) { + subtypes.push( + PORTAL_TO_ALCS_STRUCTURE_TYPES_MAPPING.FARM_STRUCTURE.alcsValueCode, + ); + } + + if (noticeOfIntentSubmission.soilIsAreaWideFilling) { + subtypes.push('ARWF'); + } + + if (noticeOfIntentSubmission.soilIsExtractionOrMining) { + subtypes.push('AEPM'); + } + + return subtypes; + } + async updateStatus( uuid: string, statusCode: NOI_SUBMISSION_STATUS, diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1692314042619-add_ag_cap_columns_to_noi.ts b/services/apps/alcs/src/providers/typeorm/migrations/1692314042619-add_ag_cap_columns_to_noi.ts new file mode 100644 index 0000000000..625b47e57e --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1692314042619-add_ag_cap_columns_to_noi.ts @@ -0,0 +1,83 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class addAgCapColumnsToNoi1692314042619 implements MigrationInterface { + name = 'addAgCapColumnsToNoi1692314042619'; + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent" ADD "alr_area" numeric(12,2)`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."notice_of_intent"."alr_area" IS 'Area in hectares of ALR impacted by the proposal'`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent" ADD "ag_cap" text`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."notice_of_intent"."ag_cap" IS 'Agricultural cap classification'`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent" ADD "ag_cap_source" text`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."notice_of_intent"."ag_cap_source" IS 'Agricultural capability classification system used'`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent" ADD "ag_cap_map" text`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."notice_of_intent"."ag_cap_map" IS 'Agricultural capability map sheet reference'`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent" ADD "ag_cap_consultant" text`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."notice_of_intent"."ag_cap_consultant" IS 'Consultant who determined the agricultural capability'`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent" ADD "staff_observations" text`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."notice_of_intent"."staff_observations" IS 'ALC Staff Observations and Comments'`, + ); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."notice_of_intent"."staff_observations" IS 'ALC Staff Observations and Comments'`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent" DROP COLUMN "staff_observations"`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."notice_of_intent"."ag_cap_consultant" IS 'Consultant who determined the agricultural capability'`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent" DROP COLUMN "ag_cap_consultant"`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."notice_of_intent"."ag_cap_map" IS 'Agricultural capability map sheet reference'`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent" DROP COLUMN "ag_cap_map"`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."notice_of_intent"."ag_cap_source" IS 'Agricultural capability classification system used'`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent" DROP COLUMN "ag_cap_source"`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."notice_of_intent"."ag_cap" IS 'Agricultural cap classification'`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent" DROP COLUMN "ag_cap"`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."notice_of_intent"."alr_area" IS 'Area in hectares of ALR impacted by the proposal'`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent" DROP COLUMN "alr_area"`, + ); + } +} diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1692315860319-soil_proposal_noi.ts b/services/apps/alcs/src/providers/typeorm/migrations/1692315860319-soil_proposal_noi.ts new file mode 100644 index 0000000000..d2ff2fd52e --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1692315860319-soil_proposal_noi.ts @@ -0,0 +1,23 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class soilProposalNoi1692315860319 implements MigrationInterface { + name = 'soilProposalNoi1692315860319'; + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent" ADD "proposal_end_date" TIMESTAMP WITH TIME ZONE`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."notice_of_intent"."proposal_end_date" IS 'The date at which the proposal use ends'`, + ); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."notice_of_intent"."proposal_end_date" IS 'The date at which the proposal use ends'`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent" DROP COLUMN "proposal_end_date"`, + ); + } +} diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1692397894264-noi_sub_types.ts b/services/apps/alcs/src/providers/typeorm/migrations/1692397894264-noi_sub_types.ts new file mode 100644 index 0000000000..2be987cb96 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1692397894264-noi_sub_types.ts @@ -0,0 +1,18 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class noiSubTypes1692397894264 implements MigrationInterface { + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query(` + INSERT INTO "alcs"."notice_of_intent_subtype" + ("audit_deleted_date_at", "audit_created_at", "audit_updated_at", "audit_created_by", "audit_updated_by", "label", "code", "description") VALUES + (DEFAULT, NOW(), DEFAULT, 'migration_seed', DEFAULT, 'Area-Wide Filling', 'ARWF', 'Area-Wide Filling'), + (DEFAULT, NOW(), DEFAULT, 'migration_seed', DEFAULT, 'Placer Mining', 'PLMI', 'Placer Mining'), + (DEFAULT, NOW(), DEFAULT, 'migration_seed', DEFAULT, 'Aggregate Extraction or Placer Mining', 'AEPM', 'Aggregate Extraction or Placer Mining'), + (DEFAULT, NOW(), DEFAULT, 'migration_seed', DEFAULT, 'Farm Structure', 'FRST', 'Farm Structure'); + `); + } + + public async down(queryRunner: QueryRunner): Promise { + //nope + } +} From c1a8cc9b818b3c60f453f7c3bdafd36d8caeac8a Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Mon, 21 Aug 2023 11:01:19 -0700 Subject: [PATCH 273/954] Add required validators asynchronously * This prevents them from validating immediately --- .../additional-information.component.ts | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component.ts index c0600d3417..1c3cccbbb5 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component.ts @@ -135,9 +135,7 @@ export class AdditionalInformationComponent extends FilesStepComponent implement prepareStructureSpecificTextInputs() { this.setVisibilityAndValidatorsForFarmFields(); - this.setVisibilityAndValidatorsForAccessoryFields(); - this.setVisibilityAndValidatorsForResidentialFields(); } @@ -148,7 +146,7 @@ export class AdditionalInformationComponent extends FilesStepComponent implement ) ) { this.isSoilStructureResidentialUseReasonVisible = true; - this.soilStructureResidentialUseReason.setValidators([Validators.required]); + this.setRequiredAsync(this.soilStructureResidentialUseReason); } else { this.isSoilStructureResidentialUseReasonVisible = false; this.soilStructureResidentialUseReason.removeValidators([Validators.required]); @@ -159,7 +157,7 @@ export class AdditionalInformationComponent extends FilesStepComponent implement private setVisibilityAndValidatorsForAccessoryFields() { if (this.proposedStructures.some((structure) => structure.type === STRUCTURE_TYPES.ACCESSORY_STRUCTURE)) { this.isSoilStructureResidentialAccessoryUseReasonVisible = true; - this.soilStructureResidentialAccessoryUseReason.setValidators([Validators.required]); + this.setRequiredAsync(this.soilStructureResidentialAccessoryUseReason); } else { this.isSoilStructureResidentialAccessoryUseReasonVisible = false; this.soilStructureResidentialAccessoryUseReason.removeValidators([Validators.required]); @@ -171,8 +169,8 @@ export class AdditionalInformationComponent extends FilesStepComponent implement if (this.proposedStructures.some((structure) => structure.type === STRUCTURE_TYPES.FARM_STRUCTURE)) { this.isSoilAgriParcelActivityVisible = true; this.isSoilStructureFarmUseReasonVisible = true; - this.soilAgriParcelActivity.setValidators([Validators.required]); - this.soilStructureFarmUseReason.setValidators([Validators.required]); + this.setRequiredAsync(this.soilAgriParcelActivity); + this.setRequiredAsync(this.soilStructureFarmUseReason); } else { this.isSoilAgriParcelActivityVisible = false; this.isSoilStructureFarmUseReasonVisible = false; @@ -215,7 +213,7 @@ export class AdditionalInformationComponent extends FilesStepComponent implement onChangeIsRemovingSoilForNewStructure($event: MatButtonToggleChange) { const parsedSelectedValue = parseStringToBoolean($event.value); - if (this.confirmRemovalOfSoil === true && parsedSelectedValue === false) { + if (this.confirmRemovalOfSoil && parsedSelectedValue === false) { this.dialog .open(SoilRemovalConfirmationDialogComponent, { panelClass: 'no-padding', @@ -294,4 +292,11 @@ export class AdditionalInformationComponent extends FilesStepComponent implement onAreaChange() { this.form.markAsDirty(); } + + private setRequiredAsync(formControl: FormControl) { + //We set these asynchronously so they don't run immediately + setTimeout(() => { + formControl.setValidators([Validators.required]); + }); + } } From 99b193a080ff736f03dbbc6005fee8df8895cf03 Mon Sep 17 00:00:00 2001 From: Liam Stoddard Date: Mon, 21 Aug 2023 13:28:56 -0700 Subject: [PATCH 274/954] adding submissions folder --- bin/migrate-oats-data/submissions/__init__.py | 1 + .../submissions/app_submissions.py | 262 ++++++++++++++++++ .../submissions/sql/app_submission.sql | 26 ++ .../submissions/sql/app_submission_count.sql | 18 ++ 4 files changed, 307 insertions(+) create mode 100644 bin/migrate-oats-data/submissions/__init__.py create mode 100644 bin/migrate-oats-data/submissions/app_submissions.py create mode 100644 bin/migrate-oats-data/submissions/sql/app_submission.sql create mode 100644 bin/migrate-oats-data/submissions/sql/app_submission_count.sql diff --git a/bin/migrate-oats-data/submissions/__init__.py b/bin/migrate-oats-data/submissions/__init__.py new file mode 100644 index 0000000000..9d0f9dbe9c --- /dev/null +++ b/bin/migrate-oats-data/submissions/__init__.py @@ -0,0 +1 @@ +from .app_submissions import * \ No newline at end of file diff --git a/bin/migrate-oats-data/submissions/app_submissions.py b/bin/migrate-oats-data/submissions/app_submissions.py new file mode 100644 index 0000000000..8eea34fa3b --- /dev/null +++ b/bin/migrate-oats-data/submissions/app_submissions.py @@ -0,0 +1,262 @@ +from common import ( + ALRChangeCode, + log_end, + log_start, +) +from db import inject_conn_pool +from constants import BATCH_UPLOAD_SIZE +from psycopg2.extras import execute_batch, RealDictCursor +import traceback +from enum import Enum + +etl_name = "alcs_app_sub" + +@inject_conn_pool +def process_alcs_app_submissions(conn=None, batch_size=BATCH_UPLOAD_SIZE): + """ + This function is responsible for processing app_submissions in batches, updating records in the alcs.application_submissions table. + + Args: + conn (psycopg2.extensions.connection): PostgreSQL database connection. Provided by the decorator. + batch_size (int): The number of items to process at once. Defaults to BATCH_UPLOAD_SIZE. + """ + + log_start(etl_name) + with conn.cursor(cursor_factory=RealDictCursor) as cursor: + with open( + "submissions/sql/app_submission_count.sql", + "r", + encoding="utf-8", + ) as sql_file: + count_query = sql_file.read() + cursor.execute(count_query) + count_total = dict(cursor.fetchone())["count"] + print("- Total Application Submission data to insert: ", count_total) + + failed_inserts = 0 + successful_updates_count = 0 + last_application_id = 0 + + with open( + "submissions/sql/app_submission.sql", + "r", + encoding="utf-8", + ) as sql_file: + application_sql = sql_file.read() + while True: + cursor.execute( + f"{application_sql} WHERE acg.alr_application_id > {last_application_id} ORDER BY acg.alr_application_id;" + ) + + rows = cursor.fetchmany(batch_size) + + if not rows: + break + try: + applications_to_be_updated_count = len(rows) + + update_app_sub_records(conn, batch_size, cursor, rows) + + successful_updates_count = ( + successful_updates_count + applications_to_be_updated_count + ) + last_application_id = dict(rows[-1])["alr_application_id"] + + print( + f"retrieved/updated items count: {applications_to_be_updated_count}; total successfully updated submissions so far {successful_updates_count}; last updated application_id: {last_application_id}" + ) + except Exception as e: + # this is NOT going to be caused by actual data update failure. This code is only executed when the code error appears or connection to DB is lost + conn.rollback() + str_err = str(e) + trace_err = traceback.format_exc() + print(str_err) + print(trace_err) + log_end(etl_name, str_err, trace_err) + failed_inserts = count_total - successful_updates_count + last_application_id = last_application_id + 1 + + print("Total amount of successful updates:", successful_updates_count) + print("Total failed updates:", failed_inserts) + log_end(etl_name) + +def update_app_sub_records(conn, batch_size, cursor, rows): + """ + Function to update submission records in batches. + + Args: + conn (obj): Connection to the database. + batch_size (int): Number of rows to execute at one time. + cursor (obj): Cursor object to execute queries. + rows (list): Rows of data to update in the database. + + Returns: + None: Commits the changes to the database. + """ + ( + nfu_data_list, + nar_data_list, + other_data_list, + exc_data_list, + inc_data_list, + ) = prepare_app_sub_data(rows) + + if len(nfu_data_list) > 0: + execute_batch( + cursor, + get_update_query_for_nfu(), + nfu_data_list, + page_size=batch_size, + ) + + if len(nar_data_list) > 0: + execute_batch( + cursor, + get_update_query_for_nar(), + nar_data_list, + page_size=batch_size, + ) + + if len(exc_data_list) > 0: + execute_batch( + cursor, + get_update_query_for_exc(), + exc_data_list, + page_size=batch_size, + ) + + if len(inc_data_list) > 0: + execute_batch( + cursor, + get_update_query_for_inc(), + inc_data_list, + page_size=batch_size, + ) + + if len(other_data_list) > 0: + execute_batch( + cursor, + get_update_query_for_other(), + other_data_list, + page_size=batch_size, + ) + + conn.commit() + +def prepare_app_sub_data(app_sub_raw_data_list): + """ + This function prepares different lists of data based on the 'alr_change_code' field of each data dict in 'app_sub_raw_data_list'. + + :param app_sub_raw_data_list: A list of raw data dictionaries. + :return: Five lists, each containing dictionaries from 'app_sub_raw_data_list' grouped based on the 'alr_change_code' field + + Detailed Workflow: + - Initializes empty lists + - Iterates over 'app_sub_raw_data_list' + - Maps the basic fields of the data dictionary based on the alr_change_code + - Returns the mapped lists + """ + nfu_data_list = [] + nar_data_list = [] + exc_data_list = [] + inc_data_list = [] + other_data_list = [] + + for row in app_sub_raw_data_list: + data = dict(row) + # data = map_basic_field(data) + + if data["alr_change_code"] == ALRChangeCode.NFU.value: + # data = mapOatsToAlcsAppPrep(data) + nfu_data_list.append(data) + elif data["alr_change_code"] == ALRChangeCode.NAR.value: + nar_data_list.append(data) + elif data["alr_change_code"] == ALRChangeCode.EXC.value: + # data = mapOatsToAlcsLegislationCode(data) + exc_data_list.append(data) + elif data["alr_change_code"] == ALRChangeCode.INC.value: + # data = mapOatsToAlcsLegislationCode(data) + inc_data_list.append(data) + else: + other_data_list.append(data) + + return nfu_data_list, nar_data_list, other_data_list, exc_data_list, inc_data_list + + +def get_update_query(unique_fields,unique_values): + # unique_fields takes input from called function and appends to query + query = """ + INSERT INTO alcs.application_submission ( + file_number, + local_government_uuid, + type_code, + is_draft, + audit_created_by, + applicant + {unique_fields} + ) + VALUES ( + %(file_number)s, + %(local_government_uuid)s, + %(type_code)s, + false, + 'oats_etl', + %(applicant)s + {unique_values} + ) + """ + return query.format(unique_fields=unique_fields, unique_values=unique_values) + +def get_update_query_for_nfu(): + unique_fields = """, + nfu_hectares + """ + unique_values = """, + %(alr_area)s + """ + return get_update_query(unique_fields,unique_values) + +def get_update_query_for_nar(): + # naruSubtype is a part of submission, import there + unique_fields = """""" + unique_values = """""" + return get_update_query(unique_fields,unique_values) + + +def get_update_query_for_exc(): + unique_fields = """, + incl_excl_hectares + """ + unique_values = """, + %(alr_area)s + """ + return get_update_query(unique_fields,unique_values) + + +def get_update_query_for_inc(): + unique_fields = """, + incl_excl_hectares + """ + unique_values = """, + %(alr_area)s + """ + return get_update_query(unique_fields,unique_values) + + +def get_update_query_for_other(): + # leaving blank insert for now + unique_fields = """""" + unique_values = """""" + return get_update_query(unique_fields,unique_values) + + + + +@inject_conn_pool +def clean_application_submission(conn=None): + print("Start application_submission cleaning") + with conn.cursor() as cursor: + cursor.execute( + "DELETE FROM alcs.application_submission a WHERE a.audit_created_by = 'oats_etl'" + ) + print(f"Deleted items count = {cursor.rowcount}") \ No newline at end of file diff --git a/bin/migrate-oats-data/submissions/sql/app_submission.sql b/bin/migrate-oats-data/submissions/sql/app_submission.sql new file mode 100644 index 0000000000..6d3605e5c9 --- /dev/null +++ b/bin/migrate-oats-data/submissions/sql/app_submission.sql @@ -0,0 +1,26 @@ +WITH + appl_components_grouped AS ( + SELECT + oaac.alr_application_id + FROM + oats.oats_alr_appl_components oaac + JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id + WHERE + oaa.application_class_code IN ('LOA', 'BLK') + GROUP BY + oaac.alr_application_id + HAVING + count(oaac.alr_application_id) < 2 -- ignore all applications wit multiple components + ) +SELECT + aa.file_number, + aa.type_code, + aa.local_government_uuid, + oc.alr_change_code, + acg.alr_application_id, + aa.applicant, + aa.alr_area +FROM + appl_components_grouped acg + LEFT JOIN alcs.application aa ON aa.file_number = acg.alr_application_id::TEXT + JOIN oats.oats_alr_appl_components oc ON acg.alr_application_id = oc.alr_application_id \ No newline at end of file diff --git a/bin/migrate-oats-data/submissions/sql/app_submission_count.sql b/bin/migrate-oats-data/submissions/sql/app_submission_count.sql new file mode 100644 index 0000000000..12a4a10e82 --- /dev/null +++ b/bin/migrate-oats-data/submissions/sql/app_submission_count.sql @@ -0,0 +1,18 @@ +WITH + appl_components_grouped AS ( + SELECT + oaac.alr_application_id + FROM + oats.oats_alr_appl_components oaac + JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id + WHERE + oaa.application_class_code IN ('LOA', 'BLK') + GROUP BY + oaac.alr_application_id + HAVING + count(oaac.alr_application_id) < 2 -- ignore all applications wit multiple components + ) +SELECT + count(*) +FROM + appl_components_grouped acg \ No newline at end of file From 9d6785c59c55b071c5f83475a50c3d40d8b4f7f2 Mon Sep 17 00:00:00 2001 From: Liam Stoddard Date: Mon, 21 Aug 2023 13:33:26 -0700 Subject: [PATCH 275/954] added submissions to migrate --- bin/migrate-oats-data/migrate.py | 36 ++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/bin/migrate-oats-data/migrate.py b/bin/migrate-oats-data/migrate.py index 5edf6bbdc7..4d5d088f43 100644 --- a/bin/migrate-oats-data/migrate.py +++ b/bin/migrate-oats-data/migrate.py @@ -20,6 +20,10 @@ process_nois, clean_nois, ) +from submissions import( + process_alcs_app_submissions, + clean_application_submission, +) from constants import BATCH_UPLOAD_SIZE import_batch_size = BATCH_UPLOAD_SIZE @@ -142,6 +146,20 @@ def import_command_parser(subparsers): ) import_command.set_defaults(func=import_batch_size) +def app_sub_import_command_parser(import_batch_size, subparsers): + app_sub_import_command = subparsers.add_parser( + "app-sub-import", + help=f"Import App submission into ALCS (update application_submission table) in specified batch size: (default: {import_batch_size})", + ) + app_sub_import_command.add_argument( + "--batch-size", + type=int, + default=import_batch_size, + metavar="", + help=f"batch size (default: {import_batch_size})", + ) + app_sub_import_command.set_defaults(func=import_batch_size) + def setup_menu_args_parser(import_batch_size): parser = argparse.ArgumentParser(description="OATS ETL utility") @@ -156,6 +174,7 @@ def setup_menu_args_parser(import_batch_size): document_noi_import_command_parser(import_batch_size, subparsers) noi_document_import_command_parser(import_batch_size, subparsers) import_command_parser(subparsers) + app_sub_import_command_parser(import_batch_size, subparsers) subparsers.add_parser("clean", help="Clean all imported data") @@ -210,6 +229,9 @@ def setup_menu_args_parser(import_batch_size): console.log("Processing application prep:") process_alcs_application_prep_fields(batch_size=import_batch_size) + console.log("Processing application submission:") + process_alcs_app_submissions(batch_size=import_batch_size) + console.log("Done") case "clean": with console.status("[bold green]Cleaning previous ETL...") as status: @@ -219,6 +241,7 @@ def setup_menu_args_parser(import_batch_size): clean_application_documents() clean_noi_documents() clean_documents() + clean_application_submission() clean_applications() clean_nois() @@ -300,6 +323,19 @@ def setup_menu_args_parser(import_batch_size): ) process_noi_documents(batch_size=import_batch_size) + case "app-sub-import": + console.log("Beginning OATS -> ALCS app-prep import process") + with console.status( + "[bold green]App submission import (application_submission table update in ALCS)..." + ) as status: + if args.batch_size: + import_batch_size = args.batch_size + + console.log( + f"Processing app-sub import in batch size = {import_batch_size}" + ) + + process_alcs_app_submissions(batch_size=import_batch_size) finally: if connection_pool: From 305354585b5e06f2b8995d712daf3470c1c0c313 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Mon, 21 Aug 2023 13:50:14 -0700 Subject: [PATCH 276/954] Re-organize Component Fields * Change component input and view to 2 column layout * Move ALR Area Impacted to the first question and inside each component so it lines up * Move Ag fields to end of each component * Update labeling to use long names everywhere --- .../basic/basic.component.html | 17 +-- .../basic/basic.component.ts | 7 +- .../incl-excl/incl-excl.component.html | 32 ++---- .../incl-excl/incl-excl.component.ts | 7 +- .../naru/naru.component.html | 4 +- .../decision-component/naru/naru.component.ts | 9 +- .../nfup/nfup.component.html | 4 +- .../decision-component/nfup/nfup.component.ts | 7 +- .../pfrs/pfrs.component.html | 14 +-- .../decision-component/pfrs/pfrs.component.ts | 11 +- .../pofo/pofo.component.html | 20 +--- .../decision-component/pofo/pofo.component.ts | 9 +- .../roso/roso.component.html | 20 +--- .../decision-component/roso/roso.component.ts | 9 +- .../subd/subd.component.html | 25 ++--- .../decision-component/subd/subd.component.ts | 9 +- .../turp/turp.component.html | 18 +-- .../decision-component/turp/turp.component.ts | 7 +- .../decision-component.component.html | 105 ++++++------------ .../incl-excl-input.component.html | 15 ++- .../naru-input/naru-input.component.html | 15 ++- .../nfu-input/nfu-input.component.html | 15 ++- .../pfrs-input/pfrs-input.component.html | 15 ++- .../pofo-input/pofo-input.component.html | 15 ++- .../roso-input/roso-input.component.html | 15 ++- .../subd-input/subd-input.component.html | 15 +++ .../turp-input/turp-input.component.html | 15 ++- .../decision-input-v2.component.scss | 15 +-- .../decision-v2/decision-v2.component.html | 87 +++++++++------ .../decision-v2/decision-v2.component.ts | 2 +- .../parcel-prep/parcel-prep.component.html | 2 +- .../proposal/proposal.component.html | 10 +- .../proposal/subd/subd.component.html | 2 +- .../parcel-prep/parcel-prep.component.html | 2 +- .../proposal/proposal.component.html | 10 +- .../lots-table/lots-table-form.component.html | 2 +- .../lots-table/lots-table-form.component.scss | 4 + 37 files changed, 330 insertions(+), 260 deletions(-) diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/basic/basic.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/basic/basic.component.html index c4c966d50c..995cbe4c53 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/basic/basic.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/basic/basic.component.html @@ -1,12 +1,7 @@ -
-
-
Ag Cap Map
- {{ component.agCapMap }} - -
-
-
Ag Cap Consultant
- {{ component.agCapConsultant }} - -
+
+
ALR Area Impacted (ha)
+
diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/basic/basic.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/basic/basic.component.ts index 6d72c40945..bf635028a4 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/basic/basic.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/basic/basic.component.ts @@ -1,4 +1,4 @@ -import { Component, Input } from '@angular/core'; +import { Component, EventEmitter, Input, Output } from '@angular/core'; import { DecisionComponentDto } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; @Component({ @@ -9,6 +9,11 @@ import { DecisionComponentDto } from '../../../../../../services/application/dec export class BasicComponent { @Input() component!: DecisionComponentDto; @Input() fillRow = false; + @Output() saveAlrArea = new EventEmitter(); constructor() {} + + async onSaveAlrArea(alrArea: string | null) { + this.saveAlrArea.emit(alrArea); + } } diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/incl-excl/incl-excl.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/incl-excl/incl-excl.component.html index 3dadcfd6c4..5ef5d7b857 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/incl-excl/incl-excl.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/incl-excl/incl-excl.component.html @@ -1,26 +1,16 @@ -
- -
-
Applicant Type
- {{ component.inclExclApplicantType }} - -
-
-
Expiry Date
- {{ component.expiryDate | date }} - -
+
+
-
+
+
Applicant Type
+ {{ component.inclExclApplicantType }} + +
+ +
Expiry Date
{{ component.expiryDate | date }} diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/incl-excl/incl-excl.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/incl-excl/incl-excl.component.ts index d183fc72d9..ff8841afbe 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/incl-excl/incl-excl.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/incl-excl/incl-excl.component.ts @@ -1,4 +1,4 @@ -import { Component, Input } from '@angular/core'; +import { Component, EventEmitter, Input, Output } from '@angular/core'; import { DecisionComponentDto } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; @Component({ @@ -8,4 +8,9 @@ import { DecisionComponentDto } from '../../../../../../services/application/dec }) export class InclExclComponent { @Input() component!: DecisionComponentDto; + @Output() saveAlrArea = new EventEmitter(); + + onSaveAlrArea($event: string | null) { + this.saveAlrArea.emit($event); + } } diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/naru/naru.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/naru/naru.component.html index 32fd73fb85..0c54d2acdc 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/naru/naru.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/naru/naru.component.html @@ -1,5 +1,5 @@ -
- +
+
diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/naru/naru.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/naru/naru.component.ts index c4a4007501..974153c5fc 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/naru/naru.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/naru/naru.component.ts @@ -1,11 +1,16 @@ -import { Component, Input } from '@angular/core'; +import { Component, EventEmitter, Input, Output } from '@angular/core'; import { DecisionComponentDto } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; @Component({ selector: 'app-naru', templateUrl: './naru.component.html', - styleUrls: ['./naru.component.scss'] + styleUrls: ['./naru.component.scss'], }) export class NaruComponent { @Input() component!: DecisionComponentDto; + @Output() saveAlrArea = new EventEmitter(); + + onSaveAlrArea($event: string | null) { + this.saveAlrArea.emit($event); + } } diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/nfup/nfup.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/nfup/nfup.component.html index f1651e9ac5..999db02795 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/nfup/nfup.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/nfup/nfup.component.html @@ -1,5 +1,5 @@ -
- +
+
Non-Farm Use Type
diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/nfup/nfup.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/nfup/nfup.component.ts index 63cfa9492c..f864471d24 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/nfup/nfup.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/nfup/nfup.component.ts @@ -1,4 +1,4 @@ -import { Component, Input } from '@angular/core'; +import { Component, EventEmitter, Input, Output } from '@angular/core'; import { DecisionComponentDto } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; @Component({ @@ -8,4 +8,9 @@ import { DecisionComponentDto } from '../../../../../../services/application/dec }) export class NfupComponent { @Input() component!: DecisionComponentDto; + @Output() saveAlrArea = new EventEmitter(); + + onSaveAlrArea($event: string | null) { + this.saveAlrArea.emit($event); + } } diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pfrs/pfrs.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pfrs/pfrs.component.html index 6c9016cb7b..1aa8e4b62c 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pfrs/pfrs.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pfrs/pfrs.component.html @@ -1,11 +1,5 @@ -
- +
+
Use End Date
{{ component.endDate | date }} @@ -13,12 +7,12 @@
-
Type of soil approved to be removed.
+
Type of soil approved to be removed
{{ component.soilTypeRemoved }}
-
Type, origin and quality of fill proposed to be placed.
+
Type, origin and quality of fill proposed to be placed
{{ component.soilFillTypeToPlace }}
(); + + onSaveAlrArea($event: string | null) { + this.saveAlrArea.emit($event); + } +} diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pofo/pofo.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pofo/pofo.component.html index 658d1947cf..cfeb435400 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pofo/pofo.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pofo/pofo.component.html @@ -1,19 +1,11 @@ -
- -
-
Use End Date
- {{ component.endDate | date }} - -
+ +
+
Use End Date
+ {{ component.endDate | date }} +
-
Type, origin and quality of fill proposed to be placed.
+
Type, origin and quality of fill proposed to be placed
{{ component.soilFillTypeToPlace }}
(); + + onSaveAlrArea($event: string | null) { + this.saveAlrArea.emit($event); + } } diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/roso/roso.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/roso/roso.component.html index 732fd4cd46..1a282c6af9 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/roso/roso.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/roso/roso.component.html @@ -1,19 +1,11 @@ -
- -
-
Use End Date
- {{ component.endDate | date }} - -
+ +
+
Use End Date
+ {{ component.endDate | date }} +
-
Type of soil approved to be removed.
+
Type of soil approved to be removed
{{ component.soilTypeRemoved }}
diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/roso/roso.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/roso/roso.component.ts index 0266291d00..b8532d53b7 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/roso/roso.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/roso/roso.component.ts @@ -1,11 +1,16 @@ -import { Component, Input } from '@angular/core'; +import { Component, EventEmitter, Input, Output } from '@angular/core'; import { DecisionComponentDto } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; @Component({ selector: 'app-roso', templateUrl: './roso.component.html', - styleUrls: ['./roso.component.scss'] + styleUrls: ['./roso.component.scss'], }) export class RosoComponent { @Input() component!: DecisionComponentDto; + @Output() saveAlrArea = new EventEmitter(); + + onSaveAlrArea($event: string | null) { + this.saveAlrArea.emit($event); + } } diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/subd/subd.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/subd/subd.component.html index afb6f892d5..2aa48cc956 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/subd/subd.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/subd/subd.component.html @@ -1,23 +1,15 @@ -
- -
-
Total Number of Lots Approved
- {{ component.lots?.length }} - -
+ +
+
Total Number of Lots Approved
+ {{ component.lots?.length }} +
#
Type
Size (ha)
-
ALR Area (ha)
+
ALR Area Impacted (ha)
{{ lot.index }} @@ -32,7 +24,10 @@
- +
diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/subd/subd.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/subd/subd.component.ts index 66feb88ece..82ddfa919e 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/subd/subd.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/subd/subd.component.ts @@ -1,4 +1,4 @@ -import { Component, Input, OnInit } from '@angular/core'; +import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { ApplicationDecisionComponentLotService } from '../../../../../../services/application/decision/application-decision-v2/application-decision-component-lot/application-decision-component-lot.service'; import { DecisionComponentDto, @@ -14,12 +14,17 @@ export class SubdComponent implements OnInit { constructor(private componentLotService: ApplicationDecisionComponentLotService) {} @Input() component!: DecisionComponentDto; + @Output() saveAlrArea = new EventEmitter(); ngOnInit(): void { this.component.lots = this.component.lots?.sort((a, b) => a.index - b.index) ?? undefined; } - async onSaveAlrArea(lot: ProposedDecisionLotDto, alrArea: string | null) { + onSaveAlrArea($event: string | null) { + this.saveAlrArea.emit($event); + } + + async onSaveAlrParcelArea(lot: ProposedDecisionLotDto, alrArea: string | null) { if (lot.uuid) { lot.alrArea = alrArea ? parseFloat(alrArea) : null; await this.componentLotService.update(lot.uuid, lot); diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/turp/turp.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/turp/turp.component.html index d6fc3ab2e5..e9b2951536 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/turp/turp.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/turp/turp.component.html @@ -1,14 +1,6 @@ -
- -
-
Expiry Date
- {{ component.expiryDate | date }} - -
+ +
+
Expiry Date
+ {{ component.expiryDate | date }} +
diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/turp/turp.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/turp/turp.component.ts index d29b3c8a16..9f518d3a8b 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/turp/turp.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/turp/turp.component.ts @@ -1,4 +1,4 @@ -import { Component, Input } from '@angular/core'; +import { Component, EventEmitter, Input, Output } from '@angular/core'; import { DecisionComponentDto } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; @Component({ @@ -8,4 +8,9 @@ import { DecisionComponentDto } from '../../../../../../services/application/dec }) export class TurpComponent { @Input() component!: DecisionComponentDto; + @Output() saveAlrArea = new EventEmitter(); + + onSaveAlrArea($event: string | null) { + this.saveAlrArea.emit($event); + } } diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.html index 543ab647d2..440306dd8b 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.html @@ -1,20 +1,39 @@
{{ data.applicationDecisionComponentType?.label }} Component
-
- - ALR Area (hectares) - - +
+ +
+
+ +
+ +
+ +
+ +
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
-
-
Ag Cap Map @@ -55,60 +72,4 @@
- -
- -
- -
- -
- -
- -
- -
- -
-
- -
-
- -
-
- -
-
- -
diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/incl-excl-input/incl-excl-input.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/incl-excl-input/incl-excl-input.component.html index b4203dc864..2bdded468d 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/incl-excl-input/incl-excl-input.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/incl-excl-input/incl-excl-input.component.html @@ -1,7 +1,20 @@
+ + ALR Area Impacted (ha) + + +
- Applicant Type* + Applicant Type* Land Owner L/FNG Initiated diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/naru-input/naru-input.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/naru-input/naru-input.component.html index 541fcb6f48..a5939e3f04 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/naru-input/naru-input.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/naru-input/naru-input.component.html @@ -1,5 +1,18 @@ -
+
+ + ALR Area Impacted (ha) + + +
-
+
+ + ALR Area Impacted (ha) + + +
-
+
+ + ALR Area Impacted (ha) + + + Use End Date -
+
+ + ALR Area Impacted (ha) + + + Use End Date -
+
+ + ALR Area Impacted (ha) + + + Use End Date +
+ + ALR Area Impacted (ha) + + +
+ diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/turp-input/turp-input.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/turp-input/turp-input.component.html index 1421b99ab5..b64b949e8b 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/turp-input/turp-input.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/turp-input/turp-input.component.html @@ -1,5 +1,18 @@
-
+
+ + ALR Area Impacted (ha) + + + Expiry Date Decision
Res #{{ decision.resolutionNumber }}/{{ decision.resolutionYear }} - + + - + +
@@ -187,78 +187,92 @@
Decision Components and Conditions
{{ component.applicationDecisionComponentType?.label }} Component
-
-
-
ALR Area Impacted (ha)
- -
-
-
Agri Cap
- {{ component.agCap }} - -
-
-
Agri Cap Source
- {{ component.agCapSource }} - -
-
- + +
+
+
Agricultural Capability
+ {{ component.agCap }} + +
+
+
Agricultural Capability Source
+ {{ component.agCapSource }} + +
+ +
+
Agricultural Capability Mapsheet Reference
+ {{ component.agCapMap }} + +
+
+
Agricultural Capability Consultant
+ {{ component.agCapConsultant }} + +
+
@@ -270,8 +284,9 @@
Decision Components and Conditions

Conditions

View Conditionsopen_in_new + >View Conditions + open_in_new +
diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.ts index 8f33eb75fc..3208b8c6ad 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.ts @@ -203,7 +203,7 @@ export class DecisionV2Component implements OnInit, OnDestroy { await this.loadDecisions(this.fileNumber); } - async onSaveAlrArea(decisionUuid: string, componentUuid: string, value?: any) { + async onSaveAlrArea(decisionUuid: string, componentUuid: string | undefined, value?: any) { const decision = this.decisions.find((e) => e.uuid === decisionUuid); const component = decision?.components.find((e) => e.uuid === componentUuid); if (componentUuid && component) { diff --git a/alcs-frontend/src/app/features/application/proposal/parcel-prep/parcel-prep.component.html b/alcs-frontend/src/app/features/application/proposal/parcel-prep/parcel-prep.component.html index 91cfbd81db..610596a4ac 100644 --- a/alcs-frontend/src/app/features/application/proposal/parcel-prep/parcel-prep.component.html +++ b/alcs-frontend/src/app/features/application/proposal/parcel-prep/parcel-prep.component.html @@ -34,7 +34,7 @@ {{ row.mapAreaHectares }} - ALR Area (ha) + ALR Area Impacted (ha) diff --git a/alcs-frontend/src/app/features/application/proposal/proposal.component.html b/alcs-frontend/src/app/features/application/proposal/proposal.component.html index c87ab973ff..5837ee6133 100644 --- a/alcs-frontend/src/app/features/application/proposal/proposal.component.html +++ b/alcs-frontend/src/app/features/application/proposal/proposal.component.html @@ -3,11 +3,11 @@

Application Prep

Proposal Components - {{ application?.type?.label }}
-
Proposal ALR Area (ha)
+
Proposal ALR Area Impacted (ha)
-
Ag Cap
+
Agricultural Capability
Proposal Components - {{ application?.type?.label }}
>
-
Ag Cap Source
+
Agricultural Capability Source
Proposal Components - {{ application?.type?.label }} >
-
Ag Cap Map
+
Agricultural Capability Mapsheet Reference
-
Ag Cap Consultant
+
Agricultural Capability Consultant
#
Type
Size (ha)
-
ALR Area (ha)
+
ALR Area Impacted (ha)
{{ i + 1 }} diff --git a/alcs-frontend/src/app/features/notice-of-intent/proposal/parcel-prep/parcel-prep.component.html b/alcs-frontend/src/app/features/notice-of-intent/proposal/parcel-prep/parcel-prep.component.html index 91cfbd81db..610596a4ac 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/proposal/parcel-prep/parcel-prep.component.html +++ b/alcs-frontend/src/app/features/notice-of-intent/proposal/parcel-prep/parcel-prep.component.html @@ -34,7 +34,7 @@ {{ row.mapAreaHectares }} - ALR Area (ha) + ALR Area Impacted (ha) diff --git a/alcs-frontend/src/app/features/notice-of-intent/proposal/proposal.component.html b/alcs-frontend/src/app/features/notice-of-intent/proposal/proposal.component.html index d384b46289..f57ffd73e6 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/proposal/proposal.component.html +++ b/alcs-frontend/src/app/features/notice-of-intent/proposal/proposal.component.html @@ -3,11 +3,11 @@

Notice of Intent Prep

Proposal Components - {{ noticeOfIntent?.type?.label }}
-
Proposal ALR Area (ha)
+
Proposal ALR Area Impacted (ha)
-
Ag Cap
+
Agricultural Capability
Proposal Components - {{ noticeOfIntent?.type?.label }} >
-
Ag Cap Source
+
Agricultural Capability Source
Proposal Components - {{ noticeOfIntent?.type?.label }} >
-
Ag Cap Map
+
Agricultural Capability Mapsheet Reference
-
Ag Cap Consultant
+
Agricultural Capability Consultant
-
+
Total Number of Proposed Lots Date: Mon, 21 Aug 2023 15:50:55 -0700 Subject: [PATCH 277/954] Feature/alcs 841 - legacy id (#901) added legacy id to application detailed page and detailed card view --- .../src/app/features/board/board.component.ts | 1 + .../application-dialog.component.html | 1 + .../services/application/application.dto.ts | 1 + .../application-legacy-id.component.html | 4 ++++ .../application-legacy-id.component.scss | 11 +++++++++ .../application-legacy-id.component.spec.ts | 23 +++++++++++++++++++ .../application-legacy-id.component.ts | 10 ++++++++ .../src/app/shared/card/card.component.ts | 1 + .../details-header.component.html | 1 + .../details-header.component.ts | 6 +++++ alcs-frontend/src/app/shared/shared.module.ts | 3 +++ .../src/alcs/application/application.dto.ts | 3 +++ .../alcs/application/application.entity.ts | 9 ++++++++ .../migrations/1692639176392-legacy_id.ts | 23 +++++++++++++++++++ 14 files changed, 97 insertions(+) create mode 100644 alcs-frontend/src/app/shared/application-legacy-id/application-legacy-id.component.html create mode 100644 alcs-frontend/src/app/shared/application-legacy-id/application-legacy-id.component.scss create mode 100644 alcs-frontend/src/app/shared/application-legacy-id/application-legacy-id.component.spec.ts create mode 100644 alcs-frontend/src/app/shared/application-legacy-id/application-legacy-id.component.ts create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1692639176392-legacy_id.ts diff --git a/alcs-frontend/src/app/features/board/board.component.ts b/alcs-frontend/src/app/features/board/board.component.ts index 526c511722..28e8d032f5 100644 --- a/alcs-frontend/src/app/features/board/board.component.ts +++ b/alcs-frontend/src/app/features/board/board.component.ts @@ -333,6 +333,7 @@ export class BoardComponent implements OnInit, OnDestroy { cardType: CardType.APP, cardUuid: application.card!.uuid, dateReceived: application.dateSubmittedToAlc, + legacyId: application.legacyId, }; } diff --git a/alcs-frontend/src/app/features/board/dialogs/application/application-dialog.component.html b/alcs-frontend/src/app/features/board/dialogs/application/application-dialog.component.html index 614288178e..d10de71d06 100644 --- a/alcs-frontend/src/app/features/board/dialogs/application/application-dialog.component.html +++ b/alcs-frontend/src/app/features/board/dialogs/application/application-dialog.component.html @@ -9,6 +9,7 @@
Application

{{ cardTitle }} +

diff --git a/alcs-frontend/src/app/services/application/application.dto.ts b/alcs-frontend/src/app/services/application/application.dto.ts index 2794b6f739..58f073bb2e 100644 --- a/alcs-frontend/src/app/services/application/application.dto.ts +++ b/alcs-frontend/src/app/services/application/application.dto.ts @@ -252,6 +252,7 @@ export interface ApplicationDto { inclExclApplicantType?: string; proposalEndDate?: number; proposalExpiryDate?: number; + legacyId?: string; } export interface UpdateApplicationDto { diff --git a/alcs-frontend/src/app/shared/application-legacy-id/application-legacy-id.component.html b/alcs-frontend/src/app/shared/application-legacy-id/application-legacy-id.component.html new file mode 100644 index 0000000000..72cf5592b1 --- /dev/null +++ b/alcs-frontend/src/app/shared/application-legacy-id/application-legacy-id.component.html @@ -0,0 +1,4 @@ +
+ folder_open{{ legacyId }} +
diff --git a/alcs-frontend/src/app/shared/application-legacy-id/application-legacy-id.component.scss b/alcs-frontend/src/app/shared/application-legacy-id/application-legacy-id.component.scss new file mode 100644 index 0000000000..5c5ee50824 --- /dev/null +++ b/alcs-frontend/src/app/shared/application-legacy-id/application-legacy-id.component.scss @@ -0,0 +1,11 @@ +.legacy-id { + display: inline-flex; + align-items: baseline; + font-size: 20px; + font-weight: 400; + + mat-icon { + vertical-align: sub; + } + } + \ No newline at end of file diff --git a/alcs-frontend/src/app/shared/application-legacy-id/application-legacy-id.component.spec.ts b/alcs-frontend/src/app/shared/application-legacy-id/application-legacy-id.component.spec.ts new file mode 100644 index 0000000000..5ac982f88e --- /dev/null +++ b/alcs-frontend/src/app/shared/application-legacy-id/application-legacy-id.component.spec.ts @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { ApplicationLegacyIdComponent } from './application-legacy-id.component'; + +describe('ApplicationLegacyIdComponent', () => { + let component: ApplicationLegacyIdComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ ApplicationLegacyIdComponent ] + }) + .compileComponents(); + + fixture = TestBed.createComponent(ApplicationLegacyIdComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/alcs-frontend/src/app/shared/application-legacy-id/application-legacy-id.component.ts b/alcs-frontend/src/app/shared/application-legacy-id/application-legacy-id.component.ts new file mode 100644 index 0000000000..f2b0f7d19e --- /dev/null +++ b/alcs-frontend/src/app/shared/application-legacy-id/application-legacy-id.component.ts @@ -0,0 +1,10 @@ +import { Component, Input } from '@angular/core'; + +@Component({ + selector: 'app-application-legacy-id', + templateUrl: './application-legacy-id.component.html', + styleUrls: ['./application-legacy-id.component.scss'], +}) +export class ApplicationLegacyIdComponent { + @Input() legacyId?: string; +} diff --git a/alcs-frontend/src/app/shared/card/card.component.ts b/alcs-frontend/src/app/shared/card/card.component.ts index 69e8e7a953..3779913ce1 100644 --- a/alcs-frontend/src/app/shared/card/card.component.ts +++ b/alcs-frontend/src/app/shared/card/card.component.ts @@ -24,6 +24,7 @@ export interface CardData { verticalOutBound?: boolean; dueDate?: Date; maxActiveDays?: number; + legacyId?: string; } export interface CardSelectedEvent { diff --git a/alcs-frontend/src/app/shared/details-header/details-header.component.html b/alcs-frontend/src/app/shared/details-header/details-header.component.html index f949f75c1d..c1880bd6a1 100644 --- a/alcs-frontend/src/app/shared/details-header/details-header.component.html +++ b/alcs-frontend/src/app/shared/details-header/details-header.component.html @@ -5,6 +5,7 @@
{{ _application.fileNumber }} ({{ _application.applicant }})
+
diff --git a/alcs-frontend/src/app/shared/details-header/details-header.component.ts b/alcs-frontend/src/app/shared/details-header/details-header.component.ts index 50b5fdb2a7..607858a36d 100644 --- a/alcs-frontend/src/app/shared/details-header/details-header.component.ts +++ b/alcs-frontend/src/app/shared/details-header/details-header.component.ts @@ -31,6 +31,8 @@ export class DetailsHeaderComponent { @Input() days = 'Calendar Days'; @Input() showStatus = false; + legacyId?: string; + _application: ApplicationDto | CommissionerApplicationDto | NoticeOfIntentDto | undefined; @Input() set application(application: ApplicationDto | CommissionerApplicationDto | NoticeOfIntentDto | undefined) { @@ -55,6 +57,10 @@ export class DetailsHeaderComponent { this.showRetroLabel = !!application.retroactive; } + if ('legacyId' in application) { + this.legacyId = application.legacyId; + } + if (this.showStatus) { this.submissionStatusService .fetchCurrentStatusByFileNumber(application.fileNumber, false) diff --git a/alcs-frontend/src/app/shared/shared.module.ts b/alcs-frontend/src/app/shared/shared.module.ts index f80164609a..6eef90b2d6 100644 --- a/alcs-frontend/src/app/shared/shared.module.ts +++ b/alcs-frontend/src/app/shared/shared.module.ts @@ -66,6 +66,7 @@ import { TimelineComponent } from './timeline/timeline.component'; import { DATE_FORMATS } from './utils/date-format'; import { ExtensionsDatepickerFormatter } from './utils/extensions-datepicker-formatter'; import { WarningBannerComponent } from './warning-banner/warning-banner.component'; +import { ApplicationLegacyIdComponent } from './application-legacy-id/application-legacy-id.component'; @NgModule({ declarations: [ @@ -100,6 +101,7 @@ import { WarningBannerComponent } from './warning-banner/warning-banner.componen ErrorMessageComponent, LotsTableFormComponent, InlineNgSelectComponent, + ApplicationLegacyIdComponent, ], imports: [ CommonModule, @@ -190,6 +192,7 @@ import { WarningBannerComponent } from './warning-banner/warning-banner.componen WarningBannerComponent, ErrorMessageComponent, LotsTableFormComponent, + ApplicationLegacyIdComponent, ], }) export class SharedModule { diff --git a/services/apps/alcs/src/alcs/application/application.dto.ts b/services/apps/alcs/src/alcs/application/application.dto.ts index db902aeb43..9bb99437b6 100644 --- a/services/apps/alcs/src/alcs/application/application.dto.ts +++ b/services/apps/alcs/src/alcs/application/application.dto.ts @@ -252,6 +252,9 @@ export class ApplicationDto { @AutoMap(() => String) inclExclApplicantType?: string; + @AutoMap(() => String) + legacyId?: string; + proposalEndDate?: number; proposalExpiryDate?: number; } diff --git a/services/apps/alcs/src/alcs/application/application.entity.ts b/services/apps/alcs/src/alcs/application/application.entity.ts index 423c222b3d..ed48cc5671 100644 --- a/services/apps/alcs/src/alcs/application/application.entity.ts +++ b/services/apps/alcs/src/alcs/application/application.entity.ts @@ -247,6 +247,15 @@ export class Application extends Base { }) proposalExpiryDate?: Date | null; + @AutoMap(() => String) + @Column({ + type: 'text', + comment: + 'Application Id that is applicable only to paper version applications from 70s - 80s', + nullable: true, + }) + legacyId?: string | null; + @AutoMap() @OneToMany(() => ApplicationPaused, (appPaused) => appPaused.application) pauses: ApplicationPaused[]; diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1692639176392-legacy_id.ts b/services/apps/alcs/src/providers/typeorm/migrations/1692639176392-legacy_id.ts new file mode 100644 index 0000000000..b8eee01b76 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1692639176392-legacy_id.ts @@ -0,0 +1,23 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class legacyId1692639176392 implements MigrationInterface { + name = 'legacyId1692639176392'; + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `ALTER TABLE "alcs"."application" ADD "legacy_id" text`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."application"."legacy_id" IS 'Application Id that is applicable only to paper version applications from 70s - 80s'`, + ); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."application"."legacy_id" IS 'Application Id that is applicable only to paper version applications from 70s - 80s'`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application" DROP COLUMN "legacy_id"`, + ); + } +} From f7549744acce2f5f676a508c8cc205f101f64d1d Mon Sep 17 00:00:00 2001 From: Liam Stoddard Date: Mon, 21 Aug 2023 16:22:35 -0700 Subject: [PATCH 278/954] MR Feedback --- bin/migrate-oats-data/migrate.py | 2 +- bin/migrate-oats-data/submissions/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/migrate-oats-data/migrate.py b/bin/migrate-oats-data/migrate.py index 4d5d088f43..01501d78ad 100644 --- a/bin/migrate-oats-data/migrate.py +++ b/bin/migrate-oats-data/migrate.py @@ -324,7 +324,7 @@ def setup_menu_args_parser(import_batch_size): process_noi_documents(batch_size=import_batch_size) case "app-sub-import": - console.log("Beginning OATS -> ALCS app-prep import process") + console.log("Beginning OATS -> ALCS app-sub import process") with console.status( "[bold green]App submission import (application_submission table update in ALCS)..." ) as status: diff --git a/bin/migrate-oats-data/submissions/__init__.py b/bin/migrate-oats-data/submissions/__init__.py index 9d0f9dbe9c..6d8ed07ef9 100644 --- a/bin/migrate-oats-data/submissions/__init__.py +++ b/bin/migrate-oats-data/submissions/__init__.py @@ -1 +1 @@ -from .app_submissions import * \ No newline at end of file +from .app_submissions import process_alcs_app_submissions, clean_application_submission \ No newline at end of file From 415f3eb368b26e1ec63c8c6dd396912971ba907e Mon Sep 17 00:00:00 2001 From: Liam Stoddard Date: Mon, 21 Aug 2023 16:30:12 -0700 Subject: [PATCH 279/954] updated function names and retested --- .../submissions/app_submissions.py | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/bin/migrate-oats-data/submissions/app_submissions.py b/bin/migrate-oats-data/submissions/app_submissions.py index 8eea34fa3b..ba4ef88cb8 100644 --- a/bin/migrate-oats-data/submissions/app_submissions.py +++ b/bin/migrate-oats-data/submissions/app_submissions.py @@ -66,7 +66,7 @@ def process_alcs_app_submissions(conn=None, batch_size=BATCH_UPLOAD_SIZE): f"retrieved/updated items count: {applications_to_be_updated_count}; total successfully updated submissions so far {successful_updates_count}; last updated application_id: {last_application_id}" ) except Exception as e: - # this is NOT going to be caused by actual data update failure. This code is only executed when the code error appears or connection to DB is lost + # this is NOT going to be caused by actual data insert failure. This code is only executed when the code error appears or connection to DB is lost conn.rollback() str_err = str(e) trace_err = traceback.format_exc() @@ -82,7 +82,7 @@ def process_alcs_app_submissions(conn=None, batch_size=BATCH_UPLOAD_SIZE): def update_app_sub_records(conn, batch_size, cursor, rows): """ - Function to update submission records in batches. + Function to insert submission records in batches. Args: conn (obj): Connection to the database. @@ -104,7 +104,7 @@ def update_app_sub_records(conn, batch_size, cursor, rows): if len(nfu_data_list) > 0: execute_batch( cursor, - get_update_query_for_nfu(), + get_insert_query_for_nfu(), nfu_data_list, page_size=batch_size, ) @@ -112,7 +112,7 @@ def update_app_sub_records(conn, batch_size, cursor, rows): if len(nar_data_list) > 0: execute_batch( cursor, - get_update_query_for_nar(), + get_insert_query_for_nar(), nar_data_list, page_size=batch_size, ) @@ -120,7 +120,7 @@ def update_app_sub_records(conn, batch_size, cursor, rows): if len(exc_data_list) > 0: execute_batch( cursor, - get_update_query_for_exc(), + get_insert_query_for_exc(), exc_data_list, page_size=batch_size, ) @@ -128,7 +128,7 @@ def update_app_sub_records(conn, batch_size, cursor, rows): if len(inc_data_list) > 0: execute_batch( cursor, - get_update_query_for_inc(), + get_insert_query_for_inc(), inc_data_list, page_size=batch_size, ) @@ -136,7 +136,7 @@ def update_app_sub_records(conn, batch_size, cursor, rows): if len(other_data_list) > 0: execute_batch( cursor, - get_update_query_for_other(), + get_insert_query_for_other(), other_data_list, page_size=batch_size, ) @@ -183,7 +183,7 @@ def prepare_app_sub_data(app_sub_raw_data_list): return nfu_data_list, nar_data_list, other_data_list, exc_data_list, inc_data_list -def get_update_query(unique_fields,unique_values): +def get_insert_query(unique_fields,unique_values): # unique_fields takes input from called function and appends to query query = """ INSERT INTO alcs.application_submission ( @@ -207,47 +207,47 @@ def get_update_query(unique_fields,unique_values): """ return query.format(unique_fields=unique_fields, unique_values=unique_values) -def get_update_query_for_nfu(): +def get_insert_query_for_nfu(): unique_fields = """, nfu_hectares """ unique_values = """, %(alr_area)s """ - return get_update_query(unique_fields,unique_values) + return get_insert_query(unique_fields,unique_values) -def get_update_query_for_nar(): +def get_insert_query_for_nar(): # naruSubtype is a part of submission, import there unique_fields = """""" unique_values = """""" - return get_update_query(unique_fields,unique_values) + return get_insert_query(unique_fields,unique_values) -def get_update_query_for_exc(): +def get_insert_query_for_exc(): unique_fields = """, incl_excl_hectares """ unique_values = """, %(alr_area)s """ - return get_update_query(unique_fields,unique_values) + return get_insert_query(unique_fields,unique_values) -def get_update_query_for_inc(): +def get_insert_query_for_inc(): unique_fields = """, incl_excl_hectares """ unique_values = """, %(alr_area)s """ - return get_update_query(unique_fields,unique_values) + return get_insert_query(unique_fields,unique_values) -def get_update_query_for_other(): +def get_insert_query_for_other(): # leaving blank insert for now unique_fields = """""" unique_values = """""" - return get_update_query(unique_fields,unique_values) + return get_insert_query(unique_fields,unique_values) From ef6813a3e4b35f0600325608139d225f7120b885 Mon Sep 17 00:00:00 2001 From: Liam Stoddard Date: Tue, 22 Aug 2023 09:10:49 -0700 Subject: [PATCH 280/954] changing string variable formatting --- .../submissions/app_submissions.py | 32 ++++++------------- 1 file changed, 10 insertions(+), 22 deletions(-) diff --git a/bin/migrate-oats-data/submissions/app_submissions.py b/bin/migrate-oats-data/submissions/app_submissions.py index ba4ef88cb8..02c9d7bf0f 100644 --- a/bin/migrate-oats-data/submissions/app_submissions.py +++ b/bin/migrate-oats-data/submissions/app_submissions.py @@ -208,45 +208,33 @@ def get_insert_query(unique_fields,unique_values): return query.format(unique_fields=unique_fields, unique_values=unique_values) def get_insert_query_for_nfu(): - unique_fields = """, - nfu_hectares - """ - unique_values = """, - %(alr_area)s - """ + unique_fields = ", nfu_hectares" + unique_values = ", %(alr_area)s" return get_insert_query(unique_fields,unique_values) def get_insert_query_for_nar(): # naruSubtype is a part of submission, import there - unique_fields = """""" - unique_values = """""" + unique_fields = "" + unique_values = "" return get_insert_query(unique_fields,unique_values) def get_insert_query_for_exc(): - unique_fields = """, - incl_excl_hectares - """ - unique_values = """, - %(alr_area)s - """ + unique_fields = ", incl_excl_hectares" + unique_values = ", %(alr_area)s" return get_insert_query(unique_fields,unique_values) def get_insert_query_for_inc(): - unique_fields = """, - incl_excl_hectares - """ - unique_values = """, - %(alr_area)s - """ + unique_fields = ", incl_excl_hectares" + unique_values = ", %(alr_area)s" return get_insert_query(unique_fields,unique_values) def get_insert_query_for_other(): # leaving blank insert for now - unique_fields = """""" - unique_values = """""" + unique_fields = "" + unique_values = "" return get_insert_query(unique_fields,unique_values) From 1ddde70a10aae8ab31ab05ddca0d4cb2531d8336 Mon Sep 17 00:00:00 2001 From: Mekhti Date: Tue, 22 Aug 2023 09:21:27 -0700 Subject: [PATCH 281/954] update search query for NOI --- .../notice-of-intent-submission.service.ts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts index 729fcbe99e..7ebe9a7502 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts @@ -240,9 +240,8 @@ export class NoticeOfIntentSubmissionService { ...searchOptions, localGovernmentUuid: matchingLocalGovernment.uuid, isDraft: false, - submissionStatuses: { - effectiveDate: Not(IsNull()), - statusTypeCode: Not(NOI_SUBMISSION_STATUS.IN_PROGRESS), + noticeOfIntent: { + dateSubmittedToAlc: Not(IsNull()), }, }); } From 8b10b51adceb6c6f3016e9f4dd2b9d88259c1b73 Mon Sep 17 00:00:00 2001 From: Mekhti Date: Tue, 22 Aug 2023 09:22:42 -0700 Subject: [PATCH 282/954] Revert "update search query for NOI" This reverts commit 1ddde70a10aae8ab31ab05ddca0d4cb2531d8336. --- .../notice-of-intent-submission.service.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts index 7ebe9a7502..729fcbe99e 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts @@ -240,8 +240,9 @@ export class NoticeOfIntentSubmissionService { ...searchOptions, localGovernmentUuid: matchingLocalGovernment.uuid, isDraft: false, - noticeOfIntent: { - dateSubmittedToAlc: Not(IsNull()), + submissionStatuses: { + effectiveDate: Not(IsNull()), + statusTypeCode: Not(NOI_SUBMISSION_STATUS.IN_PROGRESS), }, }); } From 9504c08d91f53899345d7340e7691fde581f4279 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Tue, 22 Aug 2023 09:23:43 -0700 Subject: [PATCH 283/954] Code Review Feedback Use ng-content to DRY up the code a bit --- .../incl-excl/incl-excl.component.html | 5 +---- .../incl-excl/incl-excl.component.ts | 5 ----- .../decision-component/naru/naru.component.html | 5 +---- .../decision-component/naru/naru.component.ts | 5 ----- .../decision-component/nfup/nfup.component.html | 16 +++++++--------- .../decision-component/nfup/nfup.component.ts | 5 ----- .../decision-component/pfrs/pfrs.component.html | 12 +++++------- .../decision-component/pfrs/pfrs.component.ts | 5 ----- .../decision-component/pofo/pofo.component.html | 2 +- .../decision-component/pofo/pofo.component.ts | 5 ----- .../decision-component/roso/roso.component.html | 2 +- .../decision-component/roso/roso.component.ts | 5 ----- .../decision-component/subd/subd.component.html | 3 ++- .../decision-component/subd/subd.component.ts | 5 ----- .../decision-component/turp/turp.component.html | 2 +- .../decision-component/turp/turp.component.ts | 5 ----- 16 files changed, 19 insertions(+), 68 deletions(-) diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/incl-excl/incl-excl.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/incl-excl/incl-excl.component.html index 5ef5d7b857..a594ecffa7 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/incl-excl/incl-excl.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/incl-excl/incl-excl.component.html @@ -1,7 +1,4 @@ -
- -
- +
Applicant Type
{{ component.inclExclApplicantType }} diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/incl-excl/incl-excl.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/incl-excl/incl-excl.component.ts index ff8841afbe..d164dca1aa 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/incl-excl/incl-excl.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/incl-excl/incl-excl.component.ts @@ -8,9 +8,4 @@ import { DecisionComponentDto } from '../../../../../../services/application/dec }) export class InclExclComponent { @Input() component!: DecisionComponentDto; - @Output() saveAlrArea = new EventEmitter(); - - onSaveAlrArea($event: string | null) { - this.saveAlrArea.emit($event); - } } diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/naru/naru.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/naru/naru.component.html index 0c54d2acdc..dafcee70ff 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/naru/naru.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/naru/naru.component.html @@ -1,7 +1,4 @@ -
- -
- +
Residential Use Type
{{ component.naruSubtype?.label }} diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/naru/naru.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/naru/naru.component.ts index 974153c5fc..2160e20196 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/naru/naru.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/naru/naru.component.ts @@ -8,9 +8,4 @@ import { DecisionComponentDto } from '../../../../../../services/application/dec }) export class NaruComponent { @Input() component!: DecisionComponentDto; - @Output() saveAlrArea = new EventEmitter(); - - onSaveAlrArea($event: string | null) { - this.saveAlrArea.emit($event); - } } diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/nfup/nfup.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/nfup/nfup.component.html index 999db02795..b689abbefd 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/nfup/nfup.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/nfup/nfup.component.html @@ -1,18 +1,16 @@ +
- -
-
-
Non-Farm Use Type
+
Non-Farm Use Type
{{ component.nfuType }} - +
-
Non-Farm Use Sub-Type
+
Non-Farm Use Sub-Type
{{ component.nfuSubType }} - +
-
Use End Date
+
Use End Date
{{ component.endDate | date }} - +
diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/nfup/nfup.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/nfup/nfup.component.ts index f864471d24..ac4b5cddfb 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/nfup/nfup.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/nfup/nfup.component.ts @@ -8,9 +8,4 @@ import { DecisionComponentDto } from '../../../../../../services/application/dec }) export class NfupComponent { @Input() component!: DecisionComponentDto; - @Output() saveAlrArea = new EventEmitter(); - - onSaveAlrArea($event: string | null) { - this.saveAlrArea.emit($event); - } } diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pfrs/pfrs.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pfrs/pfrs.component.html index 1aa8e4b62c..87b04a95bc 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pfrs/pfrs.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pfrs/pfrs.component.html @@ -1,10 +1,8 @@ -
- -
-
Use End Date
- {{ component.endDate | date }} - -
+ +
+
Use End Date
+ {{ component.endDate | date }} +
Type of soil approved to be removed
diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pfrs/pfrs.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pfrs/pfrs.component.ts index 76569d4b9c..532eddb08e 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pfrs/pfrs.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pfrs/pfrs.component.ts @@ -8,9 +8,4 @@ import { DecisionComponentDto } from '../../../../../../services/application/dec }) export class PfrsComponent { @Input() component!: DecisionComponentDto; - @Output() saveAlrArea = new EventEmitter(); - - onSaveAlrArea($event: string | null) { - this.saveAlrArea.emit($event); - } } diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pofo/pofo.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pofo/pofo.component.html index cfeb435400..f6960c3d2b 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pofo/pofo.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pofo/pofo.component.html @@ -1,4 +1,4 @@ - +
Use End Date
{{ component.endDate | date }} diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pofo/pofo.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pofo/pofo.component.ts index bc5fe00014..dcee185d01 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pofo/pofo.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pofo/pofo.component.ts @@ -8,9 +8,4 @@ import { DecisionComponentDto } from '../../../../../../services/application/dec }) export class PofoComponent { @Input() component!: DecisionComponentDto; - @Output() saveAlrArea = new EventEmitter(); - - onSaveAlrArea($event: string | null) { - this.saveAlrArea.emit($event); - } } diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/roso/roso.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/roso/roso.component.html index 1a282c6af9..52a9c85e0e 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/roso/roso.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/roso/roso.component.html @@ -1,4 +1,4 @@ - +
Use End Date
{{ component.endDate | date }} diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/roso/roso.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/roso/roso.component.ts index b8532d53b7..f474f24ae0 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/roso/roso.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/roso/roso.component.ts @@ -8,9 +8,4 @@ import { DecisionComponentDto } from '../../../../../../services/application/dec }) export class RosoComponent { @Input() component!: DecisionComponentDto; - @Output() saveAlrArea = new EventEmitter(); - - onSaveAlrArea($event: string | null) { - this.saveAlrArea.emit($event); - } } diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/subd/subd.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/subd/subd.component.html index 2aa48cc956..525b2dba48 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/subd/subd.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/subd/subd.component.html @@ -1,10 +1,11 @@ - +
Total Number of Lots Approved
{{ component.lots?.length }}
+ Proposed Lot Areas
#
Type
diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/subd/subd.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/subd/subd.component.ts index 82ddfa919e..3fb6ec788c 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/subd/subd.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/subd/subd.component.ts @@ -14,16 +14,11 @@ export class SubdComponent implements OnInit { constructor(private componentLotService: ApplicationDecisionComponentLotService) {} @Input() component!: DecisionComponentDto; - @Output() saveAlrArea = new EventEmitter(); ngOnInit(): void { this.component.lots = this.component.lots?.sort((a, b) => a.index - b.index) ?? undefined; } - onSaveAlrArea($event: string | null) { - this.saveAlrArea.emit($event); - } - async onSaveAlrParcelArea(lot: ProposedDecisionLotDto, alrArea: string | null) { if (lot.uuid) { lot.alrArea = alrArea ? parseFloat(alrArea) : null; diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/turp/turp.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/turp/turp.component.html index e9b2951536..a05daeca10 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/turp/turp.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/turp/turp.component.html @@ -1,4 +1,4 @@ - +
Expiry Date
{{ component.expiryDate | date }} diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/turp/turp.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/turp/turp.component.ts index 9f518d3a8b..1fa3091fa7 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/turp/turp.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/turp/turp.component.ts @@ -8,9 +8,4 @@ import { DecisionComponentDto } from '../../../../../../services/application/dec }) export class TurpComponent { @Input() component!: DecisionComponentDto; - @Output() saveAlrArea = new EventEmitter(); - - onSaveAlrArea($event: string | null) { - this.saveAlrArea.emit($event); - } } From f0283fd8cf679a93cd8c52662b9c17fccc65ddb7 Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Tue, 22 Aug 2023 09:24:22 -0700 Subject: [PATCH 284/954] added legacy id to commissioner view (#902) --- alcs-frontend/src/app/services/commissioner/commissioner.dto.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/alcs-frontend/src/app/services/commissioner/commissioner.dto.ts b/alcs-frontend/src/app/services/commissioner/commissioner.dto.ts index ebacb86d20..dd94cc4646 100644 --- a/alcs-frontend/src/app/services/commissioner/commissioner.dto.ts +++ b/alcs-frontend/src/app/services/commissioner/commissioner.dto.ts @@ -12,4 +12,5 @@ export interface CommissionerApplicationDto { localGovernment: ApplicationLocalGovernmentDto; hasRecons: boolean; hasModifications: boolean; + legacyId?: string; } From 36af3951c66a742be6a74f7f1ac13e4ddbb28b21 Mon Sep 17 00:00:00 2001 From: Liam Stoddard Date: Tue, 22 Aug 2023 09:10:49 -0700 Subject: [PATCH 285/954] changing string variable formatting insert, not update --- .../submissions/app_submissions.py | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/bin/migrate-oats-data/submissions/app_submissions.py b/bin/migrate-oats-data/submissions/app_submissions.py index 02c9d7bf0f..37fdf32f1f 100644 --- a/bin/migrate-oats-data/submissions/app_submissions.py +++ b/bin/migrate-oats-data/submissions/app_submissions.py @@ -34,7 +34,7 @@ def process_alcs_app_submissions(conn=None, batch_size=BATCH_UPLOAD_SIZE): print("- Total Application Submission data to insert: ", count_total) failed_inserts = 0 - successful_updates_count = 0 + successful_inserts_count = 0 last_application_id = 0 with open( @@ -53,17 +53,17 @@ def process_alcs_app_submissions(conn=None, batch_size=BATCH_UPLOAD_SIZE): if not rows: break try: - applications_to_be_updated_count = len(rows) + applications_to_be_inserted_count = len(rows) - update_app_sub_records(conn, batch_size, cursor, rows) + insert_app_sub_records(conn, batch_size, cursor, rows) - successful_updates_count = ( - successful_updates_count + applications_to_be_updated_count + successful_inserts_count = ( + successful_inserts_count + applications_to_be_inserted_count ) last_application_id = dict(rows[-1])["alr_application_id"] print( - f"retrieved/updated items count: {applications_to_be_updated_count}; total successfully updated submissions so far {successful_updates_count}; last updated application_id: {last_application_id}" + f"retrieved/inserted items count: {applications_to_be_inserted_count}; total successfully inserted submissions so far {successful_inserts_count}; last inserted application_id: {last_application_id}" ) except Exception as e: # this is NOT going to be caused by actual data insert failure. This code is only executed when the code error appears or connection to DB is lost @@ -73,14 +73,14 @@ def process_alcs_app_submissions(conn=None, batch_size=BATCH_UPLOAD_SIZE): print(str_err) print(trace_err) log_end(etl_name, str_err, trace_err) - failed_inserts = count_total - successful_updates_count + failed_inserts = count_total - successful_inserts_count last_application_id = last_application_id + 1 - print("Total amount of successful updates:", successful_updates_count) - print("Total failed updates:", failed_inserts) + print("Total amount of successful inserts:", successful_inserts_count) + print("Total failed inserts:", failed_inserts) log_end(etl_name) -def update_app_sub_records(conn, batch_size, cursor, rows): +def insert_app_sub_records(conn, batch_size, cursor, rows): """ Function to insert submission records in batches. @@ -88,7 +88,7 @@ def update_app_sub_records(conn, batch_size, cursor, rows): conn (obj): Connection to the database. batch_size (int): Number of rows to execute at one time. cursor (obj): Cursor object to execute queries. - rows (list): Rows of data to update in the database. + rows (list): Rows of data to insert in the database. Returns: None: Commits the changes to the database. From aa9d0a2e37e8fc6473c7924dd0802f2182a520de Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Tue, 22 Aug 2023 09:47:57 -0700 Subject: [PATCH 286/954] Re-organize and style Decisions V2 * Remove days to hide from public * Chair Review Required as Default --- .../application/application.component.ts | 2 +- .../pfrs/pfrs.component.spec.ts | 2 + .../pofo/pofo.component.spec.ts | 2 + .../roso/roso.component.spec.ts | 2 + .../subd/subd.component.scss | 8 + .../decision-documents.component.html | 4 - .../decision-documents.component.scss | 6 +- .../decision-component.component.html | 8 +- .../decision-component.component.ts | 5 + .../decision-components.component.html | 33 +- .../decision-components.component.scss | 8 + .../decision-components.component.ts | 4 +- .../decision-condition.component.html | 28 +- .../decision-condition.component.scss | 28 +- .../decision-condition.component.spec.ts | 7 + .../decision-condition.component.ts | 14 +- .../decision-conditions.component.html | 46 +- .../decision-conditions.component.scss | 7 +- .../decision-conditions.component.spec.ts | 11 + .../decision-conditions.component.ts | 6 +- .../decision-input-v2.component.html | 441 +++++++------- .../decision-input-v2.component.scss | 42 +- .../decision-input-v2.component.ts | 7 +- .../decision-v2/decision-v2.component.html | 544 +++++++++--------- .../decision-v2/decision-v2.component.scss | 249 ++++---- .../decision-v2/decision-v2.component.ts | 19 +- .../application/decision/decision.module.ts | 2 +- .../application-decision-v2.dto.ts | 2 - .../application-decision-v2.controller.ts | 4 - .../application-decision-v2.service.ts | 15 +- .../application-decision.dto.ts | 7 - .../application-decision.entity.ts | 9 - .../1692723526069-remove_days_hide.ts | 17 + 33 files changed, 804 insertions(+), 785 deletions(-) create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1692723526069-remove_days_hide.ts diff --git a/alcs-frontend/src/app/features/application/application.component.ts b/alcs-frontend/src/app/features/application/application.component.ts index 5073de3e65..d71435a940 100644 --- a/alcs-frontend/src/app/features/application/application.component.ts +++ b/alcs-frontend/src/app/features/application/application.component.ts @@ -134,7 +134,7 @@ export const appChildRoutes = [ }, { path: 'decision', - menuTitle: 'Decision', + menuTitle: 'Decisions', icon: 'gavel', module: DecisionModule, portalOnly: false, diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pfrs/pfrs.component.spec.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pfrs/pfrs.component.spec.ts index cfef8adbd3..5a691549ad 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pfrs/pfrs.component.spec.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pfrs/pfrs.component.spec.ts @@ -1,3 +1,4 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { DecisionComponentDto } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; @@ -10,6 +11,7 @@ describe('PfrsComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ declarations: [PfrsComponent], + schemas: [NO_ERRORS_SCHEMA], }).compileComponents(); fixture = TestBed.createComponent(PfrsComponent); diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pofo/pofo.component.spec.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pofo/pofo.component.spec.ts index d3b5977136..eeee8571e3 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pofo/pofo.component.spec.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pofo/pofo.component.spec.ts @@ -1,3 +1,4 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { DecisionComponentDto } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; @@ -10,6 +11,7 @@ describe('PofoComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ declarations: [PofoComponent], + schemas: [NO_ERRORS_SCHEMA], }).compileComponents(); fixture = TestBed.createComponent(PofoComponent); diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/roso/roso.component.spec.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/roso/roso.component.spec.ts index d70b4c57ef..cc4679d648 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/roso/roso.component.spec.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/roso/roso.component.spec.ts @@ -1,3 +1,4 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { DecisionComponentDto } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; @@ -10,6 +11,7 @@ describe('RosoComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ declarations: [RosoComponent], + schemas: [NO_ERRORS_SCHEMA], }).compileComponents(); fixture = TestBed.createComponent(RosoComponent); diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/subd/subd.component.scss b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/subd/subd.component.scss index e69de29bb2..1944097143 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/subd/subd.component.scss +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/subd/subd.component.scss @@ -0,0 +1,8 @@ +.lot-table { + margin-top: 12px; + display: grid; + grid-template-columns: max-content max-content max-content 0.8fr; + grid-column-gap: 36px; + grid-row-gap: 12px; + align-items: center; +} diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-documents/decision-documents.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-documents/decision-documents.component.html index 78377b19d1..cb3638941a 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-documents/decision-documents.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-documents/decision-documents.component.html @@ -1,7 +1,3 @@ -
-
Decision Documents
-
Decision Documents *
-
+
+
{{ data.applicationDecisionComponentType?.label }}
+ +
+
diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.ts index 177d0873cb..1bec2e48eb 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.ts @@ -27,6 +27,7 @@ export class DecisionComponentComponent implements OnInit { @Input() data!: DecisionComponentDto; @Input() codes!: DecisionCodesDto; @Output() dataChange = new EventEmitter(); + @Output() remove = new EventEmitter(); @ViewChild(SubdInputComponent) subdInputComponent?: SubdInputComponent; @@ -343,4 +344,8 @@ export class DecisionComponentComponent implements OnInit { expiryDate: this.expiryDate.value ? formatDateForApi(this.expiryDate.value) : null, }; } + + onRemove() { + this.remove.emit(); + } } diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-components.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-components.component.html index b3a243ca19..e331336783 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-components.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-components.component.html @@ -1,31 +1,15 @@
-
-
Decision Components
-
- -
- -
- -
-
- -
+
+

Components

@@ -43,4 +27,13 @@
Decision Components
+ +
+ +
diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-components.component.scss b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-components.component.scss index e69de29bb2..484d1ef16a 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-components.component.scss +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-components.component.scss @@ -0,0 +1,8 @@ +@use '../../../../../../../styles/colors'; + +.component { + border-radius: 4px; + border: 1px solid colors.$grey; + padding: 16px; + margin-bottom: 48px; +} diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-components.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-components.component.ts index 421541c4e6..f1d5b564a2 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-components.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-components.component.ts @@ -155,7 +155,7 @@ export class DecisionComponentsComponent implements OnInit, OnDestroy, AfterView this.patchInclExclFields(component); } - this.components.push(component); + this.components.unshift(component); break; case APPLICATION_DECISION_COMPONENT_TYPE.NFUP: case APPLICATION_DECISION_COMPONENT_TYPE.TURP: @@ -166,7 +166,7 @@ export class DecisionComponentsComponent implements OnInit, OnDestroy, AfterView case APPLICATION_DECISION_COMPONENT_TYPE.SUBD: case APPLICATION_DECISION_COMPONENT_TYPE.INCL: case APPLICATION_DECISION_COMPONENT_TYPE.EXCL: - this.components.push({ + this.components.unshift({ applicationDecisionComponentTypeCode: typeCode, applicationDecisionComponentType: this.decisionComponentTypes.find( (e) => e.code === typeCode && e.uiCode !== 'COPY' diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-condition/decision-condition.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-condition/decision-condition.component.html index 9e13ef2f1c..ead69cd822 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-condition/decision-condition.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-condition/decision-condition.component.html @@ -1,28 +1,20 @@ +
+
{{ data.type?.label }}
+ +
+
- - - + Component to Condition - + {{ component.label }} -
+
Approval Dependent* Yes @@ -30,7 +22,7 @@
- + Security Amount - + Administrative Fee Amount { fixture = TestBed.createComponent(DecisionConditionComponent); component = fixture.componentInstance; + component.data = { + type: { + code: '', + label: '', + description: '', + }, + }; fixture.detectChanges(); }); diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-condition/decision-condition.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-condition/decision-condition.component.ts index fc566f39e6..5b7a0808d3 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-condition/decision-condition.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-condition/decision-condition.component.ts @@ -1,6 +1,5 @@ import { Component, EventEmitter, Input, OnChanges, OnInit, Output, SimpleChanges } from '@angular/core'; import { FormControl, FormGroup, Validators } from '@angular/forms'; -import { ApplicationDecisionConditionTypeDto } from '../../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; import { parseStringToBoolean } from '../../../../../../../shared/utils/boolean-helper'; import { SelectableComponent, TempApplicationDecisionConditionDto } from '../decision-conditions.component'; @@ -12,11 +11,10 @@ import { SelectableComponent, TempApplicationDecisionConditionDto } from '../dec export class DecisionConditionComponent implements OnInit, OnChanges { @Input() data!: TempApplicationDecisionConditionDto; @Output() dataChange = new EventEmitter(); + @Output() remove = new EventEmitter(); - @Input() codes!: ApplicationDecisionConditionTypeDto[]; @Input() selectableComponents: SelectableComponent[] = []; - type = new FormControl(null, [Validators.required]); componentsToCondition = new FormControl(null, [Validators.required]); approvalDependant = new FormControl(null, [Validators.required]); @@ -25,7 +23,6 @@ export class DecisionConditionComponent implements OnInit, OnChanges { description = new FormControl(null, [Validators.required]); form = new FormGroup({ - type: this.type, approvalDependant: this.approvalDependant, securityAmount: this.securityAmount, administrativeFee: this.administrativeFee, @@ -51,7 +48,6 @@ export class DecisionConditionComponent implements OnInit, OnChanges { this.componentsToCondition.setValue(selectedOptions.map((e) => e.tempId) ?? null); this.form.patchValue({ - type: this.data.type?.code ?? null, approvalDependant, securityAmount: this.data.securityAmount?.toString() ?? null, administrativeFee: this.data.administrativeFee?.toString() ?? null, @@ -60,8 +56,6 @@ export class DecisionConditionComponent implements OnInit, OnChanges { } this.form.valueChanges.subscribe((changes) => { - const matchingType = this.codes.find((code) => code.code === this.type.value); - const selectedOptions = this.selectableComponents .filter((component) => this.componentsToCondition.value?.includes(component.tempId)) .map((e) => ({ @@ -71,9 +65,9 @@ export class DecisionConditionComponent implements OnInit, OnChanges { })); this.dataChange.emit({ + type: this.data.type, tempUuid: this.data.tempUuid, uuid: this.data.uuid, - type: matchingType ?? null, approvalDependant: parseStringToBoolean(this.approvalDependant.value), securityAmount: this.securityAmount.value !== null ? parseFloat(this.securityAmount.value) : undefined, administrativeFee: this.administrativeFee.value !== null ? parseFloat(this.administrativeFee.value) : undefined, @@ -97,4 +91,8 @@ export class DecisionConditionComponent implements OnInit, OnChanges { } } } + + onRemove() { + this.remove.emit(); + } } diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-conditions.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-conditions.component.html index 34dd8b0936..029df03dfa 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-conditions.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-conditions.component.html @@ -1,26 +1,38 @@
-
Decision Conditions
+
+

Conditions

+
+ + +
+
+ + + + +
- -
-
- -
diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-conditions.component.scss b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-conditions.component.scss index e2dfd40275..a55dff748c 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-conditions.component.scss +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-conditions.component.scss @@ -1,3 +1,5 @@ +@use '../../../../../../../styles/colors'; + section { width: 100%; margin: 24px 0 56px; @@ -8,7 +10,10 @@ section { } .condition { - margin: 48px 0; + border-radius: 4px; + border: 1px solid colors.$grey; + padding: 16px; + margin-bottom: 48px; &:first-of-type { margin-top: 12px; diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-conditions.component.spec.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-conditions.component.spec.ts index 7d5a8dabd0..f6e3fcb0a3 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-conditions.component.spec.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-conditions.component.spec.ts @@ -1,5 +1,6 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { MatMenuModule } from '@angular/material/menu'; import { createMock } from '@golevelup/ts-jest'; import { BehaviorSubject } from 'rxjs'; import { @@ -21,6 +22,7 @@ describe('DecisionConditionComponent', () => { mockDecisionService.$decisions = new BehaviorSubject([]); await TestBed.configureTestingModule({ + imports: [MatMenuModule], providers: [ { provide: ApplicationDecisionV2Service, @@ -33,6 +35,15 @@ describe('DecisionConditionComponent', () => { fixture = TestBed.createComponent(DecisionConditionsComponent); component = fixture.componentInstance; + component.codes = { + ceoCriterion: [], + decisionComponentTypes: [], + decisionMakers: [], + linkedResolutionOutcomeTypes: [], + naruSubtypes: [], + outcomes: [], + decisionConditionTypes: [], + }; fixture.detectChanges(); }); diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-conditions.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-conditions.component.ts index 631a758310..66deb97f9a 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-conditions.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-conditions.component.ts @@ -86,8 +86,10 @@ export class DecisionConditionsComponent implements OnInit, OnChanges, OnDestroy }); } - onAddNewCondition() { - this.mappedConditions.push({ + onAddNewCondition(typeCode: string) { + const matchingType = this.codes.decisionConditionTypes.find((code) => code.code === typeCode); + this.mappedConditions.unshift({ + type: matchingType, tempUuid: (Math.random() * 10000).toFixed(0), }); this.conditionsChange.emit({ diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.html index d500be1a92..972f1f2ee3 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.html @@ -1,252 +1,246 @@ -
-
-

Decisions > Edit Decision Draft

-
+
+

Decision #{{ index }} Draft

+
- -
-
- -
+

Resolution

+ +
+
+ +
-
-
+
+
+ + +
+
+
+ Res #{{ resolutionNumberControl.getRawValue() }} / {{ resolutionYearControl.getRawValue() }} - -
-
-
- Res #{{ resolutionNumberControl.getRawValue() }} / {{ resolutionYearControl.getRawValue() }} - -
+
- - Decision Date - - - - - - - - - + + Decision Date + + + + - + + - - - {{ item.number }} - {{ item.label }} - - - {{ item.number }} - {{ item.label }} - - - - Criterion 8 Modification - - Time Extension - Other - - + - + -
-
- Subject to Conditions* - - Yes - No - -
-
+ + + {{ item.number }} - {{ item.label }} + + + {{ item.number }} - {{ item.label }} + + + + Criterion 8 Modification + + Time Extension + Other + + -
- - Decision Description - - -
+ +
- Stats required* + Subject to Conditions* Yes No
+
- - Days to Hide from Public - +
+ + Decision Description + +
- - - Rescinded Date - - - - - +
+ Stats required* + + Yes + No +
- - Rescinded Comment - + + Rescinded Date + + + +
-
- -
+ + + Rescinded Comment + + + - - +
+

Documents

+ +
-
- -
+ + -
-

Audit and Chair Review Info

-
+
+ +
+
+

Audit and Chair Review

Audit Date @@ -297,16 +291,19 @@

Audit and Chair Review Info

+
+ -
- - -
- - -
-
- +
+
+ + +
+
+
diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.scss b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.scss index 2b74458b55..c751cae2c7 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.scss +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.scss @@ -1,5 +1,25 @@ @use '../../../../../../styles/colors.scss'; +.bottom-scroller { + margin-top: 36px; + position: absolute; + bottom: 0; + left: 212px; + right: 0; + background-color: #fff; + padding: 16px; + z-index: 2; + border-top: 1px solid colors.$grey-light; + + button:not(:last-child) { + margin-right: 16px !important; + } +} + +form { + padding-bottom: 120px; +} + :host::ng-deep { .grid, .grid-2 { @@ -13,6 +33,11 @@ } } + h3 { + margin-top: 36px !important; + margin-bottom: 12px !important; + } + .resolution-number-wrapper { display: grid; grid-template-columns: 1fr 16px 0.7fr; @@ -88,14 +113,6 @@ .container-wide { max-width: 700px; } - .btn-row { - justify-content: space-between; - } - - .flex-right { - display: flex; - justify-content: right; - } .resolution-number-wrapper { display: flex; @@ -127,15 +144,6 @@ height: 100px !important; } - .subheading1 { - font-family: 'BCSans', 'Noto Sans', Verdana, Arial, sans-serif !important; - font-size: 19px !important; - font-weight: 400 !important; - line-height: 24px; - color: #565656 !important; - margin: 24px 0 !important; - } - .error-field-outlined.ng-invalid { border-color: colors.$error-color !important; diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.ts index 15eaaee3f1..8cc68224b8 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.ts @@ -58,6 +58,7 @@ export class DecisionInputV2Component implements OnInit, OnDestroy { showConditions = false; conditionsValid = true; componentsValid = true; + index = 1; fileNumber: string = ''; uuid: string = ''; @@ -98,7 +99,6 @@ export class DecisionInputV2Component implements OnInit, OnDestroy { isSubjectToConditions: new FormControl(undefined, [Validators.required]), decisionDescription: new FormControl(undefined, [Validators.required]), isStatsRequired: new FormControl(undefined, [Validators.required]), - daysHideFromPublic: new FormControl('2', [Validators.required]), rescindedDate: new FormControl(null), rescindedComment: new FormControl(null), }); @@ -128,6 +128,8 @@ export class DecisionInputV2Component implements OnInit, OnDestroy { private extractAndPopulateQueryParams() { const fileNumber = this.route.parent?.parent?.snapshot.paramMap.get('fileNumber'); const uuid = this.route.snapshot.paramMap.get('uuid'); + const index = this.route.snapshot.paramMap.get('index'); + this.index = index ? parseInt(index) : 1; if (uuid) { this.uuid = uuid; @@ -283,7 +285,6 @@ export class DecisionInputV2Component implements OnInit, OnDestroy { isSubjectToConditions: parseBooleanToString(existingDecision.isSubjectToConditions), decisionDescription: existingDecision.decisionDescription, isStatsRequired: parseBooleanToString(existingDecision.isStatsRequired), - daysHideFromPublic: existingDecision.daysHideFromPublic?.toString() ?? '2', rescindedDate: existingDecision.rescindedDate ? new Date(existingDecision.rescindedDate) : undefined, rescindedComment: existingDecision.rescindedComment, linkedResolutionOutcome: existingDecision.linkedResolutionOutcome?.code, @@ -417,7 +418,6 @@ export class DecisionInputV2Component implements OnInit, OnDestroy { isSubjectToConditions, decisionDescription, isStatsRequired, - daysHideFromPublic, rescindedDate, rescindedComment, linkedResolutionOutcome, @@ -445,7 +445,6 @@ export class DecisionInputV2Component implements OnInit, OnDestroy { isSubjectToConditions: parseStringToBoolean(isSubjectToConditions), decisionDescription: decisionDescription, isStatsRequired: parseStringToBoolean(isStatsRequired), - daysHideFromPublic: daysHideFromPublic ? parseInt(daysHideFromPublic) : 2, rescindedDate: rescindedDate ? formatDateForApi(rescindedDate) : rescindedDate, rescindedComment: rescindedComment, decisionComponents: this.components, diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.html index f660e2b9f5..841e2465ae 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.html @@ -1,135 +1,129 @@ - - - -

Decision

- - - - - - -
-
-
-
- +
+

Decisions

+
+ +
+
+
+
No Decisions
+
+
+
+ +
+
+
+
+ Modified By:  + {{ decision.modifiedByResolutions?.join(', ') }} + N/A +
+
+ Reconsidered By:  + {{ decision.reconsideredByResolutions?.join(', ') }} + N/A
-
-
No Decisions
-
-
-
- + +
+
+
+

Decision #{{ decision.index }}

+
+ + calendar_month + {{ application.activeDays }} + + + pause + {{ application.pausedDays }} + +
+ + + + + + + +
Res #{{ decision.resolutionNumber }}/{{ decision.resolutionYear }}
+ + + + + + +
+ + + + +
+ +
-
-
+ +

Resolution

+
+
- Modified By:  - {{ decision.modifiedByResolutions?.join(', ') }} - N/A +
Decision Date
+ {{ decision.date | momentFormat }} +
- Reconsidered By:  - {{ decision.reconsideredByResolutions?.join(', ') }} - N/A +
Decision Maker
+ {{ decision.decisionMaker?.label }} +
-
-
-
-
- Decision #{{ decision.index }} -
- - calendar_month - {{ application.activeDays }} - - - pause - {{ application.pausedDays }} - -
- - - - - - - - Res #{{ decision.resolutionNumber }}/{{ decision.resolutionYear }} - - - - - - -
- - - - -
- -
+
+
Decision Outcome
+ {{ decision.outcome.label }} {{ decision.isSubjectToConditions ? '- Subject to Conditions' : '' }}
-
-
-
Decision Date
- {{ decision.date | momentFormat }} - -
-
-
Decision Maker
- {{ decision.decisionMaker?.label }} - -
- -
-
Decision Outcome
- {{ decision.outcome.label }} {{ decision.isSubjectToConditions ? '- Subject to Conditions' : '' }} -
- -
-
CEO Criterion
- {{ decision.ceoCriterion?.label }} - - - Time extension - , - Other -
+
+
CEO Criterion
+ {{ decision.ceoCriterion?.label }} + - + Time extension + , + Other +
-
-
- Modification Outcome - Reconsideration Outcome -
- {{ decision.linkedResolutionOutcome?.label }} - - {{ decision.modifies?.linkedResolutions?.join(', ') }} - {{ decision.reconsiders?.linkedResolutions?.join(', ') }} +
+
+ Modification Outcome + Reconsideration Outcome
+ {{ decision.linkedResolutionOutcome?.label }} + + {{ decision.modifies?.linkedResolutions?.join(', ') }} + {{ decision.reconsiders?.linkedResolutions?.join(', ') }}
-
+
Decision Description
{{ decision.decisionDescription }} Decision >
-
-
-
Days To Hide From Public
- {{ decision.daysHideFromPublic }} -
-
-
Stats Required
- -
+
+
Stats Required
+
-
+
Rescinded Date
{{ decision.rescindedDate | momentFormat }}
-
+ +
Rescinded Comment
{{ decision.rescindedComment }}
+
+
-
- -
+

Documents

+
+ +
- -
-
-
Decision Components and Conditions
-
- -
-
- {{ component.applicationDecisionComponentType?.label }} Component -
-
- + +

Components

+
+ + + +
{{ component.applicationDecisionComponentType?.label }}
+
+ + + > + - + + > - + + > - + + > - + + > - + + > - + + > - + + > -
-
-
Agricultural Capability
- {{ component.agCap }} - -
-
-
Agricultural Capability Source
- {{ component.agCapSource }} - -
+
+
+
Agricultural Capability
+ {{ component.agCap }} + +
+
+
Agricultural Capability Source
+ {{ component.agCapSource }} + +
-
-
Agricultural Capability Mapsheet Reference
- {{ component.agCapMap }} - -
-
-
Agricultural Capability Consultant
- {{ component.agCapConsultant }} - -
+
+
Agricultural Capability Mapsheet Reference
+ {{ component.agCapMap }} + +
+
+
Agricultural Capability Consultant
+ {{ component.agCapConsultant }} +
-
+
+ +
+ -
-

Conditions

- + +

Conditions

+
+ +
+ -
-
Audit and Chair Review Info
-
-
-
Audit Date
- {{ decision.auditDate | momentFormat }} - - - -
-
-
Chair Review Date
- - - - {{ decision.chairReviewDate | momentFormat }} -
-
-
Chair Review Outcome
- {{ decision.chairReviewOutcome.label }} - -
-
+

Audit and Chair Review

+
+
+
+
Audit Date
+ {{ decision.auditDate | momentFormat }} + + + +
+
+
Chair Review
+ {{ decision.chairReviewRequired ? 'Required' : 'Not Needed' }} +
+
+
Chair Review Date
+ + + + {{ decision.chairReviewDate | momentFormat }} +
+
+
Chair Review Outcome
+ {{ decision.chairReviewOutcome.label }} +
- - - -
+
+ +
+
-
-
- +
+
+
diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.scss b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.scss index 09b54fbebb..ed21e4ab3a 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.scss +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.scss @@ -1,170 +1,146 @@ @use '../../../../../styles/colors'; -:host ::ng-deep { - section { - margin-bottom: 64px; - } +section { + margin-bottom: 64px; +} - .decision-container { - position: relative; - } +h4 { + margin-bottom: 12px !important; +} - .decision { - margin: 24px 0; - box-shadow: 0 2px 8px 1px rgba(0, 0, 0, 0.25); - } +hr { + margin: 36px 0; + stroke: colors.$grey; +} - .loading-overlay { - position: absolute; - z-index: 2; - background-color: colors.$grey; - opacity: 0.4; - width: 100%; - height: 100%; +.decision-container { + position: relative; +} + +.decision { + margin: 24px 0; + box-shadow: 0 2px 8px 1px rgba(0, 0, 0, 0.25); +} + +.decision.draft { + border: 2px solid colors.$secondary-color-light; +} + +.decision-section { + background: colors.$grey-light; + padding: 18px; +} + +.decision-section-no-title { + background: colors.$grey-light; + padding: 1px 18px; +} + +.header { + display: flex; + justify-content: space-between; + margin-bottom: 36px; + + .title { display: flex; align-items: center; - justify-content: center; + justify-content: space-between; + gap: 28px; + + .days { + display: inline-block; + margin-right: 6px; + margin-top: 4px; + + .mat-icon { + font-size: 19px !important; + line-height: 21px !important; + width: 19px; + vertical-align: middle; + } + } } +} - .post-decisions { - padding: 6px 32px; - background-color: colors.$grey-light; - grid-template-columns: 50% 50%; - display: grid; - min-height: 36px; - text-transform: uppercase; - border-radius: 4px 4px 0 0; - } +.loading-overlay { + position: absolute; + z-index: 2; + background-color: colors.$grey; + opacity: 0.4; + width: 100%; + height: 100%; + display: flex; + align-items: center; + justify-content: center; +} - .decision-menu { - position: absolute; - top: 0; - right: 0; - height: 36px; - background: colors.$accent-color; - box-shadow: -1px 1px 4px rgba(0, 0, 0, 0.25); - border-radius: 0 4px 0 10px; - } +.post-decisions { + padding: 6px 32px; + background-color: colors.$grey-light; + grid-template-columns: 50% 50%; + display: grid; + min-height: 36px; + text-transform: uppercase; + border-radius: 4px 4px 0 0; +} - .decision-padding { - padding: 18px 32px 32px 32px; - } +.decision-menu { + position: absolute; + top: 0; + right: 0; + height: 36px; + background: colors.$accent-color; + box-shadow: -1px 1px 4px rgba(0, 0, 0, 0.25); + border-radius: 0 4px 0 10px; +} - .grid-2 { - display: grid; - grid-template-columns: 50% 50%; - grid-row-gap: 24px; - } +.decision-padding { + padding: 18px 32px; +} - .grid-3 { - display: grid; - grid-template-columns: 33% 33% 33%; - grid-row-gap: 24px; +.no-decisions { + margin-top: 16px; + display: flex; + align-items: center; + justify-content: center; + background-color: colors.$grey-light; + height: 72px; +} - .grid-2 { - margin-top: unset; - } - } +.conditions-link-icon { + position: absolute; +} - .grid-uneven { +:host ::ng-deep { + .grid-2 { + margin-top: 18px; + margin-bottom: 18px; display: grid; - grid-template-columns: 66% 33%; - grid-row-gap: 24px; + grid-template-columns: 50% 50%; + grid-row-gap: 18px; - .grid-2 { - margin-top: unset; + .full-width { + grid-column: 1/3; } } - .decision-content, - .grid-2 { - margin-top: 16px; - margin-bottom: 16px; - font-size: 16px; - } - - .components-wrapper, - .conditions-wrapper { - margin-bottom: 36px; + .mat-mdc-table { + background: colors.$grey-light; } .subheading2 { margin-bottom: 6px !important; } - .header { - display: flex; - justify-content: space-between; - - .title { - display: flex; - align-items: center; - justify-content: space-between; - gap: 16px; - - .days { - display: inline-block; - margin-right: 6px; - - .mat-icon { - font-size: 19px !important; - line-height: 21px !important; - width: 19px; - vertical-align: middle; - } - } - } - } - .row { margin: 16px 0; } - .conditions-link-icon { - position: absolute; - } - - .no-decisions { - margin-top: 16px; - display: flex; - align-items: center; - justify-content: center; - background-color: colors.$grey-light; - height: 72px; - } - - .decision-documents .subheading1 { - font-family: 'BCSans', 'Noto Sans', Verdana, Arial, sans-serif !important; - font-size: 19px !important; - font-weight: 400 !important; - margin: 0 !important; - line-height: 24px; - color: #565656 !important; - } - - .subheading1 { - color: colors.$grey-dark !important; - } - .application-pill-wrapper, .application-pill { margin-right: 0 !important; } - .decision-tabs { - .mdc-tab__text-label { - color: colors.$black !important; - } - - .mdc-tab { - margin-left: 8px; - } - } - - .full-width { - grid-column: 1/4; - } - table { border-spacing: 12px; margin-left: -12px; @@ -177,13 +153,4 @@ .pre-wrapped-text { white-space: pre-wrap; } - - .lot-table { - margin-top: 12px; - display: grid; - grid-template-columns: max-content max-content max-content 0.8fr; - grid-column-gap: 36px; - grid-row-gap: 12px; - align-items: center; - } } diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.ts index 3208b8c6ad..32a3904d71 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.ts @@ -115,7 +115,7 @@ export class DecisionV2Component implements OnInit, OnDestroy { async onCreate() { const newDecision = await this.decisionService.create({ resolutionYear: new Date().getFullYear(), - chairReviewRequired: false, + chairReviewRequired: true, isDraft: true, date: Date.now(), applicationFileNumber: this.fileNumber, @@ -123,14 +123,23 @@ export class DecisionV2Component implements OnInit, OnDestroy { reconsidersUuid: null, }); - await this.router.navigate([`/application/${this.fileNumber}/decision/draft/${newDecision.uuid}/edit`]); + const index = this.decisions.length; + await this.router.navigate([ + `/application/${this.fileNumber}/decision/draft/${newDecision.uuid}/edit/${index + 1}`, + ]); } - async onEdit(decision: ApplicationDecisionWithLinkedResolutionDto) { - await this.router.navigate([`/application/${this.fileNumber}/decision/draft/${decision.uuid}/edit`]); + async onEdit(selectedDecision: ApplicationDecisionWithLinkedResolutionDto) { + const position = this.decisions.findIndex((decision) => decision.uuid === selectedDecision.uuid); + const index = this.decisions.length - position; + await this.router.navigate([ + `/application/${this.fileNumber}/decision/draft/${selectedDecision.uuid}/edit/${index}`, + ]); } async onRevertToDraft(uuid: string) { + const position = this.decisions.findIndex((decision) => decision.uuid === uuid); + const index = this.decisions.length - position; this.dialog .open(RevertToDraftDialogComponent, { data: { fileNumber: this.fileNumber }, @@ -143,7 +152,7 @@ export class DecisionV2Component implements OnInit, OnDestroy { }); await this.applicationDetailService.loadApplication(this.fileNumber); - await this.router.navigate([`/application/${this.fileNumber}/decision/draft/${uuid}/edit`]); + await this.router.navigate([`/application/${this.fileNumber}/decision/draft/${uuid}/edit/${index}`]); } }); } diff --git a/alcs-frontend/src/app/features/application/decision/decision.module.ts b/alcs-frontend/src/app/features/application/decision/decision.module.ts index 5e656899df..b5fd0f9ddc 100644 --- a/alcs-frontend/src/app/features/application/decision/decision.module.ts +++ b/alcs-frontend/src/app/features/application/decision/decision.module.ts @@ -57,7 +57,7 @@ export const decisionChildRoutes = [ portalOnly: false, }, { - path: 'draft/:uuid/edit', + path: 'draft/:uuid/edit/:index', menuTitle: 'Decision', component: DecisionInputV2Component, portalOnly: false, diff --git a/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-v2.dto.ts b/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-v2.dto.ts index 758198262f..1a1be3a708 100644 --- a/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-v2.dto.ts +++ b/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-v2.dto.ts @@ -24,7 +24,6 @@ export interface UpdateApplicationDecisionDto { isSubjectToConditions?: boolean | null; decisionDescription?: string | null; isStatsRequired?: boolean | null; - daysHideFromPublic?: number | null; rescindedDate?: number | null; rescindedComment?: string | null; conditions?: UpdateApplicationDecisionConditionDto[]; @@ -67,7 +66,6 @@ export interface ApplicationDecisionDto { isSubjectToConditions?: boolean | null; decisionDescription?: string | null; isStatsRequired?: boolean | null; - daysHideFromPublic?: number | null; rescindedDate?: number | null; rescindedComment?: string | null; modifies?: LinkedResolutionDto; diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.controller.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.controller.ts index 633a1b92c8..db5695690c 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.controller.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.controller.ts @@ -297,10 +297,6 @@ export class ApplicationDecisionV2Controller { const date = decision.date ? new Date(decision.date) : new Date(); - if (decision.daysHideFromPublic) { - date.setDate(date.getDate() + decision.daysHideFromPublic); - } - const options: Intl.DateTimeFormatOptions = { weekday: 'long', year: 'numeric', diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service.ts index ad461c9d46..d555f09e30 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service.ts @@ -6,8 +6,6 @@ import { ServiceNotFoundException, ServiceValidationException, } from '../../../../../../../libs/common/src/exceptions/base.exception'; -import { ApplicationSubmissionStatusService } from '../../../application/application-submission-status/application-submission-status.service'; -import { SUBMISSION_STATUS } from '../../../application/application-submission-status/submission-status.dto'; import { DOCUMENT_SOURCE, DOCUMENT_SYSTEM, @@ -16,6 +14,8 @@ import { DocumentService } from '../../../../document/document.service'; import { NaruSubtype } from '../../../../portal/application-submission/naru-subtype/naru-subtype.entity'; import { User } from '../../../../user/user.entity'; import { formatIncomingDate } from '../../../../utils/incoming-date.formatter'; +import { ApplicationSubmissionStatusService } from '../../../application/application-submission-status/application-submission-status.service'; +import { SUBMISSION_STATUS } from '../../../application/application-submission-status/submission-status.dto'; import { Application } from '../../../application/application.entity'; import { ApplicationService } from '../../../application/application.service'; import { ApplicationCeoCriterionCode } from '../../application-ceo-criterion/application-ceo-criterion.entity'; @@ -277,7 +277,6 @@ export class ApplicationDecisionV2Service { existingDecision.isSubjectToConditions = updateDto.isSubjectToConditions; existingDecision.decisionDescription = updateDto.decisionDescription; existingDecision.isStatsRequired = updateDto.isStatsRequired; - existingDecision.daysHideFromPublic = updateDto.daysHideFromPublic; existingDecision.isDraft = updateDto.isDraft; existingDecision.rescindedDate = formatIncomingDate( updateDto.rescindedDate, @@ -380,7 +379,6 @@ export class ApplicationDecisionV2Service { isSubjectToConditions: createDto.isSubjectToConditions, decisionDescription: createDto.decisionDescription, isStatsRequired: createDto.isStatsRequired, - daysHideFromPublic: createDto.daysHideFromPublic, rescindedDate: createDto.rescindedDate ? new Date(createDto.rescindedDate) : null, @@ -713,17 +711,10 @@ export class ApplicationDecisionV2Service { decisionDate: Date | null, applicationDecision: ApplicationDecision, ) { - const statusDate = decisionDate; - if (applicationDecision.daysHideFromPublic) { - statusDate?.setDate( - statusDate.getDate() + applicationDecision.daysHideFromPublic, - ); - } - await this.applicationSubmissionStatusService.setStatusDateByFileNumber( applicationDecision.application.fileNumber, SUBMISSION_STATUS.ALC_DECISION, - statusDate, + decisionDate, ); } diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision.dto.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision.dto.ts index c0e8132722..c4d50ee910 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision.dto.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision.dto.ts @@ -92,10 +92,6 @@ export class UpdateApplicationDecisionDto { @IsOptional() isStatsRequired?: boolean | null; - @IsNumber() - @IsOptional() - daysHideFromPublic?: number | null; - @IsNumber() @IsOptional() rescindedDate?: number | null; @@ -212,9 +208,6 @@ export class ApplicationDecisionDto { @AutoMap(() => Boolean) isStatsRequired?: boolean | null; - @AutoMap(() => Number) - daysHideFromPublic?: number | null; - @AutoMap(() => Number) rescindedDate?: number | null; diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision.entity.ts b/services/apps/alcs/src/alcs/application-decision/application-decision.entity.ts index 8f26dd8e42..11f3051d0b 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision.entity.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision.entity.ts @@ -133,15 +133,6 @@ export class ApplicationDecision extends Base { }) isStatsRequired?: boolean | null; - @AutoMap(() => Number) - @Column({ - comment: - 'Indicates how long the decision should stay hidden from public in days from decision date', - nullable: true, - type: 'integer', - }) - daysHideFromPublic?: number | null; - @AutoMap(() => Date) @Column({ type: 'timestamptz', diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1692723526069-remove_days_hide.ts b/services/apps/alcs/src/providers/typeorm/migrations/1692723526069-remove_days_hide.ts new file mode 100644 index 0000000000..5c040bc22a --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1692723526069-remove_days_hide.ts @@ -0,0 +1,17 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class removeDaysHide1692723526069 implements MigrationInterface { + name = 'removeDaysHide1692723526069'; + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `ALTER TABLE "alcs"."application_decision" DROP COLUMN "days_hide_from_public"`, + ); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `ALTER TABLE "alcs"."application_decision" ADD "days_hide_from_public" integer`, + ); + } +} From 7ad7b74e19d444505bf792f44582ad138bcd280c Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Tue, 22 Aug 2023 10:42:48 -0700 Subject: [PATCH 287/954] Add confirmation dialogs, fix error state * Error state had no border so was not showing red * Add confirmation dialogs for removing conditions / components. --- .../decision-components.component.spec.ts | 5 + .../decision-components.component.ts | 120 ++++++++++-------- .../decision-conditions.component.spec.ts | 5 + .../decision-conditions.component.ts | 18 ++- .../decision-input-v2.component.scss | 4 +- 5 files changed, 92 insertions(+), 60 deletions(-) diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-components.component.spec.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-components.component.spec.ts index 7e2540c161..1492dfe5c5 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-components.component.spec.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-components.component.spec.ts @@ -9,6 +9,7 @@ import { ApplicationDto } from '../../../../../../services/application/applicati import { ApplicationDecisionDto } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; import { ApplicationDecisionV2Service } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.service'; import { ToastService } from '../../../../../../services/toast/toast.service'; +import { ConfirmationDialogService } from '../../../../../../shared/confirmation-dialog/confirmation-dialog.service'; import { DecisionComponentsComponent } from './decision-components.component'; @@ -50,6 +51,10 @@ describe('DecisionComponentsComponent', () => { provide: ApplicationSubmissionService, useValue: mockApplicationSubmissionService, }, + { + provide: ConfirmationDialogService, + useValue: {}, + }, ], schemas: [NO_ERRORS_SCHEMA], }).compileComponents(); diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-components.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-components.component.ts index f1d5b564a2..3cc2e2e646 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-components.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-components.component.ts @@ -20,6 +20,7 @@ import { DecisionComponentTypeDto, } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; import { ToastService } from '../../../../../../services/toast/toast.service'; +import { ConfirmationDialogService } from '../../../../../../shared/confirmation-dialog/confirmation-dialog.service'; import { DecisionComponentComponent } from './decision-component/decision-component.component'; export type DecisionComponentTypeMenuItem = DecisionComponentTypeDto & { isDisabled: boolean; uiCode: string }; @@ -49,7 +50,8 @@ export class DecisionComponentsComponent implements OnInit, OnDestroy, AfterView constructor( private toastService: ToastService, private applicationDetailService: ApplicationDetailService, - private submissionService: ApplicationSubmissionService + private submissionService: ApplicationSubmissionService, + private confirmationDialogService: ConfirmationDialogService ) {} ngOnInit(): void { @@ -79,30 +81,6 @@ export class DecisionComponentsComponent implements OnInit, OnDestroy, AfterView this.$destroy.complete(); } - private async prepareDecisionComponentTypes(codes: DecisionCodesDto) { - const decisionComponentTypes: DecisionComponentTypeMenuItem[] = codes.decisionComponentTypes.map((e) => ({ - ...e, - isDisabled: false, - uiCode: e.code, - })); - - const mappedProposalType = decisionComponentTypes.find((e) => e.code === this.application.type.code); - - if (mappedProposalType) { - const proposalDecisionType: DecisionComponentTypeMenuItem = { - isDisabled: false, - uiCode: 'COPY', - code: mappedProposalType!.code, - label: `Copy Proposal - ${mappedProposalType?.label}`, - description: mappedProposalType?.description ?? '', - }; - decisionComponentTypes.unshift(proposalDecisionType); - } - this.decisionComponentTypes = decisionComponentTypes; - - this.updateComponentsMenuItems(); - } - onAddNewComponent(uiCode: string, typeCode: string) { switch (uiCode) { case 'COPY': @@ -180,6 +158,68 @@ export class DecisionComponentsComponent implements OnInit, OnDestroy, AfterView this.updateComponentsMenuItems(); } + onRemove(index: number) { + this.confirmationDialogService + .openDialog({ + body: 'Are you sure you want to remove this component?', + }) + .subscribe((didConfirm) => { + if (didConfirm) { + this.components.splice(index, 1); + this.updateComponentsMenuItems(); + } + }); + } + + trackByFn(index: any, item: DecisionComponentDto) { + return item.applicationDecisionComponentTypeCode; + } + + onChange() { + const isValid = + this.components.length > 0 && (!this.childComponents || this.childComponents?.length < 1) + ? false + : this.childComponents.reduce((isValid, component) => isValid && component.form.valid, true); + + this.componentsChange.emit({ + components: this.components, + isValid, + }); + } + + onValidate() { + this.childComponents.forEach((component) => { + component.form.markAllAsTouched(); + if ('markTouched' in component) { + component.markTouched(); + } + }); + } + + private async prepareDecisionComponentTypes(codes: DecisionCodesDto) { + const decisionComponentTypes: DecisionComponentTypeMenuItem[] = codes.decisionComponentTypes.map((e) => ({ + ...e, + isDisabled: false, + uiCode: e.code, + })); + + const mappedProposalType = decisionComponentTypes.find((e) => e.code === this.application.type.code); + + if (mappedProposalType) { + const proposalDecisionType: DecisionComponentTypeMenuItem = { + isDisabled: false, + uiCode: 'COPY', + code: mappedProposalType!.code, + label: `Copy Proposal - ${mappedProposalType?.label}`, + description: mappedProposalType?.description ?? '', + }; + decisionComponentTypes.unshift(proposalDecisionType); + } + this.decisionComponentTypes = decisionComponentTypes; + + this.updateComponentsMenuItems(); + } + private patchNfuFields(component: DecisionComponentDto) { component.nfuType = this.application.nfuUseType; component.nfuSubType = this.application.nfuUseSubType; @@ -231,34 +271,4 @@ export class DecisionComponentsComponent implements OnInit, OnDestroy, AfterView isDisabled: this.components.some((c) => c.applicationDecisionComponentTypeCode === e.code), })); } - - onRemove(index: number) { - this.components.splice(index, 1); - this.updateComponentsMenuItems(); - } - - trackByFn(index: any, item: DecisionComponentDto) { - return item.applicationDecisionComponentTypeCode; - } - - onChange() { - const isValid = - this.components.length > 0 && (!this.childComponents || this.childComponents?.length < 1) - ? false - : this.childComponents.reduce((isValid, component) => isValid && component.form.valid, true); - - this.componentsChange.emit({ - components: this.components, - isValid, - }); - } - - onValidate() { - this.childComponents.forEach((component) => { - component.form.markAllAsTouched(); - if ('markTouched' in component) { - component.markTouched(); - } - }); - } } diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-conditions.component.spec.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-conditions.component.spec.ts index f6e3fcb0a3..81eb022bc1 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-conditions.component.spec.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-conditions.component.spec.ts @@ -8,6 +8,7 @@ import { ApplicationDecisionWithLinkedResolutionDto, } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; import { ApplicationDecisionV2Service } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.service'; +import { ConfirmationDialogService } from '../../../../../../shared/confirmation-dialog/confirmation-dialog.service'; import { DecisionConditionsComponent } from './decision-conditions.component'; @@ -28,6 +29,10 @@ describe('DecisionConditionComponent', () => { provide: ApplicationDecisionV2Service, useValue: mockDecisionService, }, + { + provide: ConfirmationDialogService, + useValue: {}, + }, ], declarations: [DecisionConditionsComponent], schemas: [NO_ERRORS_SCHEMA], diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-conditions.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-conditions.component.ts index 66deb97f9a..bf61badbd1 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-conditions.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-conditions.component.ts @@ -18,6 +18,7 @@ import { UpdateApplicationDecisionConditionDto, } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; import { ApplicationDecisionV2Service } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.service'; +import { ConfirmationDialogService } from '../../../../../../shared/confirmation-dialog/confirmation-dialog.service'; import { DecisionConditionComponent } from './decision-condition/decision-condition.component'; export type TempApplicationDecisionConditionDto = UpdateApplicationDecisionConditionDto & { tempUuid?: string }; @@ -46,7 +47,10 @@ export class DecisionConditionsComponent implements OnInit, OnChanges, OnDestroy mappedConditions: TempApplicationDecisionConditionDto[] = []; decision: ApplicationDecisionDto | undefined; - constructor(private decisionService: ApplicationDecisionV2Service) {} + constructor( + private decisionService: ApplicationDecisionV2Service, + private confirmationDialogService: ConfirmationDialogService + ) {} ngOnInit(): void { this.decisionService.$decision @@ -106,8 +110,16 @@ export class DecisionConditionsComponent implements OnInit, OnChanges, OnDestroy } onRemoveCondition(index: number) { - this.mappedConditions.splice(index, 1); - this.onChanges(); + this.confirmationDialogService + .openDialog({ + body: 'Are you sure you want to remove this condition?', + }) + .subscribe((didConfirm) => { + if (didConfirm) { + this.mappedConditions.splice(index, 1); + this.onChanges(); + } + }); } ngOnChanges(changes: SimpleChanges): void { diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.scss b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.scss index c751cae2c7..811eda701f 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.scss +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.scss @@ -145,7 +145,7 @@ form { } .error-field-outlined.ng-invalid { - border-color: colors.$error-color !important; + border: 1px solid colors.$error-color !important; .mat-button-toggle { border-color: colors.$error-color; @@ -154,7 +154,7 @@ form { &.upload-button { border: 2px solid colors.$error-color; - margin-bottom: 0px !important; + margin-bottom: 0 !important; } } From 8c95d417c06c13a6647a141bb51c11157dfac43a Mon Sep 17 00:00:00 2001 From: Liam Stoddard Date: Tue, 22 Aug 2023 10:57:58 -0700 Subject: [PATCH 288/954] cleaned up based on MR feedback --- .../submissions/app_submissions.py | 29 ++++++------------- 1 file changed, 9 insertions(+), 20 deletions(-) diff --git a/bin/migrate-oats-data/submissions/app_submissions.py b/bin/migrate-oats-data/submissions/app_submissions.py index 37fdf32f1f..eb32f17f57 100644 --- a/bin/migrate-oats-data/submissions/app_submissions.py +++ b/bin/migrate-oats-data/submissions/app_submissions.py @@ -35,17 +35,17 @@ def process_alcs_app_submissions(conn=None, batch_size=BATCH_UPLOAD_SIZE): failed_inserts = 0 successful_inserts_count = 0 - last_application_id = 0 + last_submission_id = 0 with open( "submissions/sql/app_submission.sql", "r", encoding="utf-8", ) as sql_file: - application_sql = sql_file.read() + submission_sql = sql_file.read() while True: cursor.execute( - f"{application_sql} WHERE acg.alr_application_id > {last_application_id} ORDER BY acg.alr_application_id;" + f"{submission_sql} WHERE acg.alr_application_id > {last_submission_id} ORDER BY acg.alr_application_id;" ) rows = cursor.fetchmany(batch_size) @@ -53,20 +53,19 @@ def process_alcs_app_submissions(conn=None, batch_size=BATCH_UPLOAD_SIZE): if not rows: break try: - applications_to_be_inserted_count = len(rows) + submissions_to_be_inserted_count = len(rows) insert_app_sub_records(conn, batch_size, cursor, rows) successful_inserts_count = ( - successful_inserts_count + applications_to_be_inserted_count + successful_inserts_count + submissions_to_be_inserted_count ) - last_application_id = dict(rows[-1])["alr_application_id"] + last_submission_id = dict(rows[-1])["alr_application_id"] print( - f"retrieved/inserted items count: {applications_to_be_inserted_count}; total successfully inserted submissions so far {successful_inserts_count}; last inserted application_id: {last_application_id}" + f"retrieved/inserted items count: {submissions_to_be_inserted_count}; total successfully inserted submissions so far {successful_inserts_count}; last inserted application_id: {last_submission_id}" ) except Exception as e: - # this is NOT going to be caused by actual data insert failure. This code is only executed when the code error appears or connection to DB is lost conn.rollback() str_err = str(e) trace_err = traceback.format_exc() @@ -74,7 +73,7 @@ def process_alcs_app_submissions(conn=None, batch_size=BATCH_UPLOAD_SIZE): print(trace_err) log_end(etl_name, str_err, trace_err) failed_inserts = count_total - successful_inserts_count - last_application_id = last_application_id + 1 + last_submission_id = last_submission_id + 1 print("Total amount of successful inserts:", successful_inserts_count) print("Total failed inserts:", failed_inserts) @@ -136,7 +135,7 @@ def insert_app_sub_records(conn, batch_size, cursor, rows): if len(other_data_list) > 0: execute_batch( cursor, - get_insert_query_for_other(), + get_insert_query("",""), other_data_list, page_size=batch_size, ) @@ -230,16 +229,6 @@ def get_insert_query_for_inc(): unique_values = ", %(alr_area)s" return get_insert_query(unique_fields,unique_values) - -def get_insert_query_for_other(): - # leaving blank insert for now - unique_fields = "" - unique_values = "" - return get_insert_query(unique_fields,unique_values) - - - - @inject_conn_pool def clean_application_submission(conn=None): print("Start application_submission cleaning") From e72462c057747be345221bb3d887060d94706d2f Mon Sep 17 00:00:00 2001 From: Liam Stoddard Date: Wed, 23 Aug 2023 12:22:38 -0700 Subject: [PATCH 289/954] code is working commit before refactor --- .../submissions/app_submissions.py | 77 +++++++++++++++++-- 1 file changed, 70 insertions(+), 7 deletions(-) diff --git a/bin/migrate-oats-data/submissions/app_submissions.py b/bin/migrate-oats-data/submissions/app_submissions.py index eb32f17f57..7c08900a58 100644 --- a/bin/migrate-oats-data/submissions/app_submissions.py +++ b/bin/migrate-oats-data/submissions/app_submissions.py @@ -53,9 +53,21 @@ def process_alcs_app_submissions(conn=None, batch_size=BATCH_UPLOAD_SIZE): if not rows: break try: + application_ids = [dict(item)["alr_application_id"] for item in rows] + print(application_ids) + application_ids_string = ', '.join(str(item) for item in application_ids) + # print(application_ids_string) + + + adj_rows_query = f"""SELECT * from + oats.oats_adjacent_land_uses oalu + WHERE oalu.alr_application_id in ({application_ids_string}) + """ + cursor.execute(adj_rows_query) + adj_rows = cursor.fetchall() submissions_to_be_inserted_count = len(rows) - insert_app_sub_records(conn, batch_size, cursor, rows) + insert_app_sub_records(conn, batch_size, cursor, rows, adj_rows) successful_inserts_count = ( successful_inserts_count + submissions_to_be_inserted_count @@ -79,7 +91,7 @@ def process_alcs_app_submissions(conn=None, batch_size=BATCH_UPLOAD_SIZE): print("Total failed inserts:", failed_inserts) log_end(etl_name) -def insert_app_sub_records(conn, batch_size, cursor, rows): +def insert_app_sub_records(conn, batch_size, cursor, rows, adj_rows): """ Function to insert submission records in batches. @@ -98,7 +110,7 @@ def insert_app_sub_records(conn, batch_size, cursor, rows): other_data_list, exc_data_list, inc_data_list, - ) = prepare_app_sub_data(rows) + ) = prepare_app_sub_data(rows, adj_rows) if len(nfu_data_list) > 0: execute_batch( @@ -142,7 +154,7 @@ def insert_app_sub_records(conn, batch_size, cursor, rows): conn.commit() -def prepare_app_sub_data(app_sub_raw_data_list): +def prepare_app_sub_data(app_sub_raw_data_list, raw_dir_data_list): """ This function prepares different lists of data based on the 'alr_change_code' field of each data dict in 'app_sub_raw_data_list'. @@ -163,7 +175,10 @@ def prepare_app_sub_data(app_sub_raw_data_list): for row in app_sub_raw_data_list: data = dict(row) - # data = map_basic_field(data) + data = add_direction_field(data) + for adj_row in raw_dir_data_list: + dir_data = dict(adj_row) + data = map_direction_field(data, dir_data) if data["alr_change_code"] == ALRChangeCode.NFU.value: # data = mapOatsToAlcsAppPrep(data) @@ -191,7 +206,15 @@ def get_insert_query(unique_fields,unique_values): type_code, is_draft, audit_created_by, - applicant + applicant, + east_land_use_type_description, + west_land_use_type_description, + north_land_use_type_description, + south_land_use_type_description, + east_land_use_type, + west_land_use_type, + north_land_use_type, + south_land_use_type {unique_fields} ) VALUES ( @@ -200,7 +223,15 @@ def get_insert_query(unique_fields,unique_values): %(type_code)s, false, 'oats_etl', - %(applicant)s + %(applicant)s, + %(east_land_use_type_description)s, + %(west_land_use_type_description)s, + %(north_land_use_type_description)s, + %(south_land_use_type_description)s, + %(east_land_use_type)s, + %(west_land_use_type)s, + %(north_land_use_type)s, + %(south_land_use_type)s {unique_values} ) """ @@ -229,6 +260,38 @@ def get_insert_query_for_inc(): unique_values = ", %(alr_area)s" return get_insert_query(unique_fields,unique_values) +def map_direction_field(data, dir_data): + if data['alr_application_id'] == dir_data['alr_application_id']: + if dir_data['cardinal_direction'] == 'EAST': + data['east_land_use_type_description'] = dir_data['description'] + data['east_land_use_type'] = dir_data['nonfarm_use_type_code'] + if dir_data['cardinal_direction'] == 'WEST': + data['west_land_use_type_description'] = dir_data['description'] + data['west_land_use_type'] = dir_data['nonfarm_use_type_code'] + if dir_data['cardinal_direction'] == 'NORTH': + data['north_land_use_type_description'] = dir_data['description'] + data['north_land_use_type'] = dir_data['nonfarm_use_type_code'] + if dir_data['cardinal_direction'] == 'SOUTH': + data['south_land_use_type_description'] = dir_data['description'] + data['south_land_use_type'] = dir_data['nonfarm_use_type_code'] + else: + return data + + print(data) + print("direction_found") + return data + +def add_direction_field(data): + data['east_land_use_type_description'] = None + data['east_land_use_type'] = None + data['west_land_use_type_description'] = None + data['west_land_use_type'] = None + data['north_land_use_type_description'] = None + data['north_land_use_type'] = None + data['south_land_use_type_description'] = None + data['south_land_use_type'] = None + return data + @inject_conn_pool def clean_application_submission(conn=None): print("Start application_submission cleaning") From 3722579acf23a846158e84d673db054dea77802a Mon Sep 17 00:00:00 2001 From: Liam Stoddard Date: Wed, 23 Aug 2023 12:52:27 -0700 Subject: [PATCH 290/954] moved direction mapping to new submap folder --- bin/migrate-oats-data/submap/__init__.py | 1 + .../submap/direction_mapping.py | 29 +++++++++++++ .../submissions/app_submissions.py | 43 +++---------------- 3 files changed, 36 insertions(+), 37 deletions(-) create mode 100644 bin/migrate-oats-data/submap/__init__.py create mode 100644 bin/migrate-oats-data/submap/direction_mapping.py diff --git a/bin/migrate-oats-data/submap/__init__.py b/bin/migrate-oats-data/submap/__init__.py new file mode 100644 index 0000000000..775acecbf2 --- /dev/null +++ b/bin/migrate-oats-data/submap/__init__.py @@ -0,0 +1 @@ +from .direction_mapping import * \ No newline at end of file diff --git a/bin/migrate-oats-data/submap/direction_mapping.py b/bin/migrate-oats-data/submap/direction_mapping.py new file mode 100644 index 0000000000..a661e11f66 --- /dev/null +++ b/bin/migrate-oats-data/submap/direction_mapping.py @@ -0,0 +1,29 @@ + +def add_direction_field(data): + data['east_land_use_type_description'] = None + data['east_land_use_type'] = None + data['west_land_use_type_description'] = None + data['west_land_use_type'] = None + data['north_land_use_type_description'] = None + data['north_land_use_type'] = None + data['south_land_use_type_description'] = None + data['south_land_use_type'] = None + return data + +def map_direction_field(data, dir_data): + if data['alr_application_id'] == dir_data['alr_application_id']: + if dir_data['cardinal_direction'] == 'EAST': + data['east_land_use_type_description'] = dir_data['description'] + data['east_land_use_type'] = dir_data['nonfarm_use_type_code'] + if dir_data['cardinal_direction'] == 'WEST': + data['west_land_use_type_description'] = dir_data['description'] + data['west_land_use_type'] = dir_data['nonfarm_use_type_code'] + if dir_data['cardinal_direction'] == 'NORTH': + data['north_land_use_type_description'] = dir_data['description'] + data['north_land_use_type'] = dir_data['nonfarm_use_type_code'] + if dir_data['cardinal_direction'] == 'SOUTH': + data['south_land_use_type_description'] = dir_data['description'] + data['south_land_use_type'] = dir_data['nonfarm_use_type_code'] + else: + return data + return data \ No newline at end of file diff --git a/bin/migrate-oats-data/submissions/app_submissions.py b/bin/migrate-oats-data/submissions/app_submissions.py index 7c08900a58..1af764b5c2 100644 --- a/bin/migrate-oats-data/submissions/app_submissions.py +++ b/bin/migrate-oats-data/submissions/app_submissions.py @@ -3,6 +3,10 @@ log_end, log_start, ) +from submap import ( + add_direction_field, + map_direction_field, +) from db import inject_conn_pool from constants import BATCH_UPLOAD_SIZE from psycopg2.extras import execute_batch, RealDictCursor @@ -54,17 +58,14 @@ def process_alcs_app_submissions(conn=None, batch_size=BATCH_UPLOAD_SIZE): break try: application_ids = [dict(item)["alr_application_id"] for item in rows] - print(application_ids) - application_ids_string = ', '.join(str(item) for item in application_ids) - # print(application_ids_string) - - + application_ids_string = ', '.join(str(item) for item in application_ids) adj_rows_query = f"""SELECT * from oats.oats_adjacent_land_uses oalu WHERE oalu.alr_application_id in ({application_ids_string}) """ cursor.execute(adj_rows_query) adj_rows = cursor.fetchall() + submissions_to_be_inserted_count = len(rows) insert_app_sub_records(conn, batch_size, cursor, rows, adj_rows) @@ -260,38 +261,6 @@ def get_insert_query_for_inc(): unique_values = ", %(alr_area)s" return get_insert_query(unique_fields,unique_values) -def map_direction_field(data, dir_data): - if data['alr_application_id'] == dir_data['alr_application_id']: - if dir_data['cardinal_direction'] == 'EAST': - data['east_land_use_type_description'] = dir_data['description'] - data['east_land_use_type'] = dir_data['nonfarm_use_type_code'] - if dir_data['cardinal_direction'] == 'WEST': - data['west_land_use_type_description'] = dir_data['description'] - data['west_land_use_type'] = dir_data['nonfarm_use_type_code'] - if dir_data['cardinal_direction'] == 'NORTH': - data['north_land_use_type_description'] = dir_data['description'] - data['north_land_use_type'] = dir_data['nonfarm_use_type_code'] - if dir_data['cardinal_direction'] == 'SOUTH': - data['south_land_use_type_description'] = dir_data['description'] - data['south_land_use_type'] = dir_data['nonfarm_use_type_code'] - else: - return data - - print(data) - print("direction_found") - return data - -def add_direction_field(data): - data['east_land_use_type_description'] = None - data['east_land_use_type'] = None - data['west_land_use_type_description'] = None - data['west_land_use_type'] = None - data['north_land_use_type_description'] = None - data['north_land_use_type'] = None - data['south_land_use_type_description'] = None - data['south_land_use_type'] = None - return data - @inject_conn_pool def clean_application_submission(conn=None): print("Start application_submission cleaning") From d8a2fc10ab4ded88adaae44e9bce10fc891adcd5 Mon Sep 17 00:00:00 2001 From: Liam Stoddard Date: Wed, 23 Aug 2023 13:13:31 -0700 Subject: [PATCH 291/954] simplified code, removed unused/currently unnecessary functions --- .../submissions/app_submissions.py | 59 ++++--------------- 1 file changed, 11 insertions(+), 48 deletions(-) diff --git a/bin/migrate-oats-data/submissions/app_submissions.py b/bin/migrate-oats-data/submissions/app_submissions.py index 1af764b5c2..03db7279d8 100644 --- a/bin/migrate-oats-data/submissions/app_submissions.py +++ b/bin/migrate-oats-data/submissions/app_submissions.py @@ -107,10 +107,8 @@ def insert_app_sub_records(conn, batch_size, cursor, rows, adj_rows): """ ( nfu_data_list, - nar_data_list, other_data_list, - exc_data_list, - inc_data_list, + inc_exc_data_list, ) = prepare_app_sub_data(rows, adj_rows) if len(nfu_data_list) > 0: @@ -121,27 +119,11 @@ def insert_app_sub_records(conn, batch_size, cursor, rows, adj_rows): page_size=batch_size, ) - if len(nar_data_list) > 0: + if len(inc_exc_data_list) > 0: execute_batch( cursor, - get_insert_query_for_nar(), - nar_data_list, - page_size=batch_size, - ) - - if len(exc_data_list) > 0: - execute_batch( - cursor, - get_insert_query_for_exc(), - exc_data_list, - page_size=batch_size, - ) - - if len(inc_data_list) > 0: - execute_batch( - cursor, - get_insert_query_for_inc(), - inc_data_list, + get_insert_query_for_inc_exc(), + inc_exc_data_list, page_size=batch_size, ) @@ -169,9 +151,7 @@ def prepare_app_sub_data(app_sub_raw_data_list, raw_dir_data_list): - Returns the mapped lists """ nfu_data_list = [] - nar_data_list = [] - exc_data_list = [] - inc_data_list = [] + inc_exc_data_list = [] other_data_list = [] for row in app_sub_raw_data_list: @@ -180,22 +160,17 @@ def prepare_app_sub_data(app_sub_raw_data_list, raw_dir_data_list): for adj_row in raw_dir_data_list: dir_data = dict(adj_row) data = map_direction_field(data, dir_data) + # currently rather slow + # ToDo optimize, potentially give index for dir_data resume point if data["alr_change_code"] == ALRChangeCode.NFU.value: - # data = mapOatsToAlcsAppPrep(data) nfu_data_list.append(data) - elif data["alr_change_code"] == ALRChangeCode.NAR.value: - nar_data_list.append(data) - elif data["alr_change_code"] == ALRChangeCode.EXC.value: - # data = mapOatsToAlcsLegislationCode(data) - exc_data_list.append(data) - elif data["alr_change_code"] == ALRChangeCode.INC.value: - # data = mapOatsToAlcsLegislationCode(data) - inc_data_list.append(data) + elif data["alr_change_code"] == ALRChangeCode.EXC.value or data["alr_change_code"] == ALRChangeCode.INC.value: + inc_exc_data_list.append(data) else: other_data_list.append(data) - return nfu_data_list, nar_data_list, other_data_list, exc_data_list, inc_data_list + return nfu_data_list, other_data_list, inc_exc_data_list def get_insert_query(unique_fields,unique_values): @@ -243,24 +218,12 @@ def get_insert_query_for_nfu(): unique_values = ", %(alr_area)s" return get_insert_query(unique_fields,unique_values) -def get_insert_query_for_nar(): - # naruSubtype is a part of submission, import there - unique_fields = "" - unique_values = "" - return get_insert_query(unique_fields,unique_values) - - -def get_insert_query_for_exc(): +def get_insert_query_for_inc_exc(): unique_fields = ", incl_excl_hectares" unique_values = ", %(alr_area)s" return get_insert_query(unique_fields,unique_values) -def get_insert_query_for_inc(): - unique_fields = ", incl_excl_hectares" - unique_values = ", %(alr_area)s" - return get_insert_query(unique_fields,unique_values) - @inject_conn_pool def clean_application_submission(conn=None): print("Start application_submission cleaning") From f11216853081bfc0b20ae0cb25b80ad9e8d46b5f Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Tue, 22 Aug 2023 15:59:22 -0700 Subject: [PATCH 292/954] Setup V2 Decisions for NOIs * Create services/controllers/entities * Copy over front-end * Rename App -> NOI * Fix Tests * TODO: Make it work properly --- .../card-status-dialog.component.spec.ts | 2 +- .../card-status/card-status.component.spec.ts | 2 +- ...n-condition-types-dialog.component.spec.ts | 4 +- ...cision-condition-types-dialog.component.ts | 4 +- ...decision-condition-types.component.spec.ts | 6 +- .../decision-condition-types.component.ts | 4 +- .../decision-maker-dialog.component.spec.ts | 4 +- .../decision-maker-dialog.component.ts | 4 +- .../decision-maker.component.spec.ts | 4 +- .../decision-maker.component.ts | 4 +- .../condition/condition.component.ts | 4 +- .../conditions/conditions.component.ts | 4 +- .../basic/basic.component.spec.ts | 4 +- .../basic/basic.component.ts | 4 +- .../incl-excl/incl-excl.component.spec.ts | 4 +- .../incl-excl/incl-excl.component.ts | 4 +- .../naru/naru.component.spec.ts | 4 +- .../decision-component/naru/naru.component.ts | 4 +- .../nfup/nfup.component.spec.ts | 4 +- .../decision-component/nfup/nfup.component.ts | 4 +- .../pfrs/pfrs.component.spec.ts | 4 +- .../decision-component/pfrs/pfrs.component.ts | 4 +- .../pofo/pofo.component.spec.ts | 4 +- .../decision-component/pofo/pofo.component.ts | 4 +- .../roso/roso.component.spec.ts | 4 +- .../decision-component/roso/roso.component.ts | 4 +- .../subd/subd.component.spec.ts | 8 +- .../decision-component/subd/subd.component.ts | 4 +- .../turp/turp.component.spec.ts | 4 +- .../decision-component/turp/turp.component.ts | 4 +- .../decision-component.component.ts | 10 +- .../naru-input/naru-input.component.spec.ts | 4 +- .../naru-input/naru-input.component.ts | 4 +- .../decision-components.component.ts | 30 +- .../decision-conditions.component.ts | 10 +- .../decision-input-v2.component.ts | 10 +- .../condition/condition.component.html | 73 +++ .../condition/condition.component.scss | 3 + .../condition/condition.component.spec.ts | 48 ++ .../condition/condition.component.ts | 104 +++ .../conditions/conditions.component.html | 74 +++ .../conditions/conditions.component.scss | 135 ++++ .../conditions/conditions.component.spec.ts | 55 ++ .../conditions/conditions.component.ts | 167 +++++ .../decision-dialog.component.ts | 8 +- .../decision-v1/decision-v1.component.html | 105 +++ .../decision-v1/decision-v1.component.scss | 142 ++++ .../decision-v1/decision-v1.component.spec.ts | 64 ++ .../decision-v1/decision-v1.component.ts | 208 ++++++ .../basic/basic.component.html | 7 + .../basic/basic.component.scss | 0 .../basic/basic.component.spec.ts | 26 + .../basic/basic.component.ts | 19 + .../pfrs/pfrs.component.html | 112 ++++ .../pfrs/pfrs.component.scss | 0 .../pfrs/pfrs.component.spec.ts | 26 + .../decision-component/pfrs/pfrs.component.ts | 11 + .../pofo/pofo.component.html | 70 ++ .../pofo/pofo.component.scss | 0 .../pofo/pofo.component.spec.ts | 26 + .../decision-component/pofo/pofo.component.ts | 11 + .../roso/roso.component.html | 65 ++ .../roso/roso.component.scss | 0 .../roso/roso.component.spec.ts | 26 + .../decision-component/roso/roso.component.ts | 11 + .../decision-documents.component.html | 70 ++ .../decision-documents.component.scss | 37 ++ .../decision-documents.component.spec.ts | 52 ++ .../decision-documents.component.ts | 114 ++++ .../decision-component.component.html | 57 ++ .../decision-component.component.scss | 0 .../decision-component.component.spec.ts | 32 + .../decision-component.component.ts | 213 ++++++ .../pfrs-input/pfrs-input.component.html | 180 +++++ .../pfrs-input/pfrs-input.component.scss | 0 .../pfrs-input/pfrs-input.component.spec.ts | 24 + .../pfrs-input/pfrs-input.component.ts | 11 + .../pofo-input/pofo-input.component.html | 114 ++++ .../pofo-input/pofo-input.component.scss | 0 .../pofo-input/pofo-input.component.spec.ts | 24 + .../pofo-input/pofo-input.component.ts | 11 + .../roso-input/roso-input.component.html | 114 ++++ .../roso-input/roso-input.component.scss | 0 .../roso-input/roso-input.component.spec.ts | 24 + .../roso-input/roso-input.component.ts | 11 + .../decision-components.component.html | 39 ++ .../decision-components.component.scss | 8 + .../decision-components.component.spec.ts | 72 ++ .../decision-components.component.ts | 218 +++++++ .../decision-condition.component.html | 52 ++ .../decision-condition.component.scss | 14 + .../decision-condition.component.spec.ts | 31 + .../decision-condition.component.ts | 98 +++ .../decision-conditions.component.html | 38 ++ .../decision-conditions.component.scss | 25 + .../decision-conditions.component.spec.ts | 55 ++ .../decision-conditions.component.ts | 211 ++++++ ...sion-document-upload-dialog.component.html | 95 +++ ...sion-document-upload-dialog.component.scss | 43 ++ ...n-document-upload-dialog.component.spec.ts | 47 ++ ...cision-document-upload-dialog.component.ts | 103 +++ .../decision-input-v2.component.html | 228 +++++++ .../decision-input-v2.component.scss | 166 +++++ .../decision-input-v2.component.spec.ts | 79 +++ .../decision-input-v2.component.ts | 483 ++++++++++++++ .../decision-v2/decision-v2.component.html | 242 +++++++ .../decision-v2/decision-v2.component.scss | 156 +++++ .../decision-v2/decision-v2.component.spec.ts | 86 +++ .../decision-v2/decision-v2.component.ts | 237 +++++++ .../release-dialog.component.html | 28 + .../release-dialog.component.scss | 6 + .../release-dialog.component.spec.ts | 52 ++ .../release-dialog.component.ts | 56 ++ .../revert-to-draft-dialog.component.html | 30 + .../revert-to-draft-dialog.component.scss | 6 + .../revert-to-draft-dialog.component.spec.ts | 31 + .../revert-to-draft-dialog.component.ts | 49 ++ .../decision/decision.component.html | 108 +-- .../decision/decision.component.scss | 142 ---- .../decision/decision.component.spec.ts | 37 +- .../decision/decision.component.ts | 185 +----- .../decision/decision.module.ts | 82 +++ .../notice-of-intent.component.ts | 20 +- .../notice-of-intent.module.ts | 4 - ...-decision-condition-types.service.spec.ts} | 8 +- ...ation-decision-condition-types.service.ts} | 8 +- ...pplication-decision-maker.service.spec.ts} | 8 +- .../application-decision-maker.service.ts} | 8 +- .../application-decision-component.service.ts | 6 +- .../application-decision-v2.dto.ts | 10 +- .../application-decision-v2.service.ts | 6 +- ...-intent-decision-component.service.spec.ts | 66 ++ ...ce-of-intent-decision-component.service.ts | 35 + ...-intent-decision-condition.service.spec.ts | 66 ++ ...ce-of-intent-decision-condition.service.ts | 35 + ...tice-of-intent-decision-v2.service.spec.ts | 204 ++++++ .../notice-of-intent-decision-v2.service.ts | 168 +++++ .../decision/notice-of-intent-decision.dto.ts | 135 +++- .../notice-of-intent-decision.service.spec.ts | 22 +- .../noi-document/noi-document.service.spec.ts | 2 +- .../notice-of-intent-detail.service.spec.ts | 8 +- .../notice-of-intent-detail.service.ts | 2 +- ...ice-of-intent-modification.service.spec.ts | 2 +- .../notice-of-intent-parcel.service.ts | 2 +- .../notice-of-intent-submission-status.dto.ts | 32 + ...f-intent-submission-status.service.spec.ts | 98 +++ ...ice-of-intent-submission-status.service.ts | 49 ++ ...otice-of-intent-submission.service.spec.ts | 10 +- .../notice-of-intent.service.ts | 2 +- .../application-decision.entity.ts | 8 +- .../src/alcs/import/noi-import.service.ts | 9 +- ...f-intent-decision-component-type.entity.ts | 12 + ...tent-decision-component.controller.spec.ts | 84 +++ ...of-intent-decision-component.controller.ts | 40 ++ ...notice-of-intent-decision-component.dto.ts | 158 +++++ ...ice-of-intent-decision-component.entity.ts | 190 ++++++ ...-intent-decision-component.service.spec.ts | 234 +++++++ ...ce-of-intent-decision-component.service.ts | 228 +++++++ ...f-intent-decision-condition-code.entity.ts | 5 + ...tent-decision-condition.controller.spec.ts | 109 ++++ ...of-intent-decision-condition.controller.ts | 48 ++ ...notice-of-intent-decision-condition.dto.ts | 103 +++ ...ice-of-intent-decision-condition.entity.ts | 85 +++ ...-intent-decision-condition.service.spec.ts | 162 +++++ ...ce-of-intent-decision-condition.service.ts | 121 ++++ ...-of-intent-decision-v1.controller.spec.ts} | 40 +- ...otice-of-intent-decision-v1.controller.ts} | 28 +- ...ice-of-intent-decision-v1.service.spec.ts} | 30 +- .../notice-of-intent-decision-v1.service.ts} | 30 +- ...e-of-intent-decision-v2.controller.spec.ts | 250 +++++++ ...notice-of-intent-decision-v2.controller.ts | 227 +++++++ ...tice-of-intent-decision-v2.service.spec.ts | 510 +++++++++++++++ .../notice-of-intent-decision-v2.service.ts | 616 ++++++++++++++++++ .../notice-of-intent-decision.dto.ts | 94 ++- .../notice-of-intent-decision.entity.ts | 77 ++- .../notice-of-intent-decision.module.ts | 28 +- .../notice-of-intent-modification.dto.ts | 4 +- ...ice-of-intent-modification.service.spec.ts | 6 +- .../notice-of-intent-modification.service.ts | 4 +- ...lication-decision-v2.automapper.profile.ts | 11 +- ...e-of-intent-decision.automapper.profile.ts | 90 ++- .../1692812627565-noi_decisions_v2.ts | 185 ++++++ .../1692812692333-seed_noi_dec_v2_tables.ts | 48 ++ 183 files changed, 10669 insertions(+), 733 deletions(-) create mode 100644 alcs-frontend/src/app/features/notice-of-intent/decision/conditions/condition/condition.component.html create mode 100644 alcs-frontend/src/app/features/notice-of-intent/decision/conditions/condition/condition.component.scss create mode 100644 alcs-frontend/src/app/features/notice-of-intent/decision/conditions/condition/condition.component.spec.ts create mode 100644 alcs-frontend/src/app/features/notice-of-intent/decision/conditions/condition/condition.component.ts create mode 100644 alcs-frontend/src/app/features/notice-of-intent/decision/conditions/conditions.component.html create mode 100644 alcs-frontend/src/app/features/notice-of-intent/decision/conditions/conditions.component.scss create mode 100644 alcs-frontend/src/app/features/notice-of-intent/decision/conditions/conditions.component.spec.ts create mode 100644 alcs-frontend/src/app/features/notice-of-intent/decision/conditions/conditions.component.ts create mode 100644 alcs-frontend/src/app/features/notice-of-intent/decision/decision-v1/decision-v1.component.html create mode 100644 alcs-frontend/src/app/features/notice-of-intent/decision/decision-v1/decision-v1.component.scss create mode 100644 alcs-frontend/src/app/features/notice-of-intent/decision/decision-v1/decision-v1.component.spec.ts create mode 100644 alcs-frontend/src/app/features/notice-of-intent/decision/decision-v1/decision-v1.component.ts create mode 100644 alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/basic/basic.component.html create mode 100644 alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/basic/basic.component.scss create mode 100644 alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/basic/basic.component.spec.ts create mode 100644 alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/basic/basic.component.ts create mode 100644 alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/pfrs/pfrs.component.html create mode 100644 alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/pfrs/pfrs.component.scss create mode 100644 alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/pfrs/pfrs.component.spec.ts create mode 100644 alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/pfrs/pfrs.component.ts create mode 100644 alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/pofo/pofo.component.html create mode 100644 alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/pofo/pofo.component.scss create mode 100644 alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/pofo/pofo.component.spec.ts create mode 100644 alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/pofo/pofo.component.ts create mode 100644 alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/roso/roso.component.html create mode 100644 alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/roso/roso.component.scss create mode 100644 alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/roso/roso.component.spec.ts create mode 100644 alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/roso/roso.component.ts create mode 100644 alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-documents/decision-documents.component.html create mode 100644 alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-documents/decision-documents.component.scss create mode 100644 alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-documents/decision-documents.component.spec.ts create mode 100644 alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-documents/decision-documents.component.ts create mode 100644 alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.html create mode 100644 alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.scss create mode 100644 alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.spec.ts create mode 100644 alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.ts create mode 100644 alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/pfrs-input/pfrs-input.component.html create mode 100644 alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/pfrs-input/pfrs-input.component.scss create mode 100644 alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/pfrs-input/pfrs-input.component.spec.ts create mode 100644 alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/pfrs-input/pfrs-input.component.ts create mode 100644 alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/pofo-input/pofo-input.component.html create mode 100644 alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/pofo-input/pofo-input.component.scss create mode 100644 alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/pofo-input/pofo-input.component.spec.ts create mode 100644 alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/pofo-input/pofo-input.component.ts create mode 100644 alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/roso-input/roso-input.component.html create mode 100644 alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/roso-input/roso-input.component.scss create mode 100644 alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/roso-input/roso-input.component.spec.ts create mode 100644 alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/roso-input/roso-input.component.ts create mode 100644 alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-components.component.html create mode 100644 alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-components.component.scss create mode 100644 alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-components.component.spec.ts create mode 100644 alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-components.component.ts create mode 100644 alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-conditions/decision-condition/decision-condition.component.html create mode 100644 alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-conditions/decision-condition/decision-condition.component.scss create mode 100644 alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-conditions/decision-condition/decision-condition.component.spec.ts create mode 100644 alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-conditions/decision-condition/decision-condition.component.ts create mode 100644 alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-conditions/decision-conditions.component.html create mode 100644 alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-conditions/decision-conditions.component.scss create mode 100644 alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-conditions/decision-conditions.component.spec.ts create mode 100644 alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-conditions/decision-conditions.component.ts create mode 100644 alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-file-upload-dialog/decision-document-upload-dialog.component.html create mode 100644 alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-file-upload-dialog/decision-document-upload-dialog.component.scss create mode 100644 alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-file-upload-dialog/decision-document-upload-dialog.component.spec.ts create mode 100644 alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-file-upload-dialog/decision-document-upload-dialog.component.ts create mode 100644 alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-input-v2.component.html create mode 100644 alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-input-v2.component.scss create mode 100644 alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-input-v2.component.spec.ts create mode 100644 alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-input-v2.component.ts create mode 100644 alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-v2.component.html create mode 100644 alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-v2.component.scss create mode 100644 alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-v2.component.spec.ts create mode 100644 alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-v2.component.ts create mode 100644 alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/release-dialog/release-dialog.component.html create mode 100644 alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/release-dialog/release-dialog.component.scss create mode 100644 alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/release-dialog/release-dialog.component.spec.ts create mode 100644 alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/release-dialog/release-dialog.component.ts create mode 100644 alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/revert-to-draft-dialog/revert-to-draft-dialog.component.html create mode 100644 alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/revert-to-draft-dialog/revert-to-draft-dialog.component.scss create mode 100644 alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/revert-to-draft-dialog/revert-to-draft-dialog.component.spec.ts create mode 100644 alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/revert-to-draft-dialog/revert-to-draft-dialog.component.ts create mode 100644 alcs-frontend/src/app/features/notice-of-intent/decision/decision.module.ts rename alcs-frontend/src/app/services/{decision-condition-types/decision-condition-types.service.spec.ts => application/application-decision-condition-types/application-decision-condition-types.service.spec.ts} (92%) rename alcs-frontend/src/app/services/{decision-condition-types/decision-condition-types.service.ts => application/application-decision-condition-types/application-decision-condition-types.service.ts} (84%) rename alcs-frontend/src/app/services/{decision-maker/decision-maker.service.spec.ts => application/application-decision-maker/application-decision-maker.service.spec.ts} (93%) rename alcs-frontend/src/app/services/{decision-maker/decision-maker.service.ts => application/application-decision-maker/application-decision-maker.service.ts} (84%) create mode 100644 alcs-frontend/src/app/services/notice-of-intent/decision-v2/notice-of-intent-decision-component/notice-of-intent-decision-component.service.spec.ts create mode 100644 alcs-frontend/src/app/services/notice-of-intent/decision-v2/notice-of-intent-decision-component/notice-of-intent-decision-component.service.ts create mode 100644 alcs-frontend/src/app/services/notice-of-intent/decision-v2/notice-of-intent-decision-condition/notice-of-intent-decision-condition.service.spec.ts create mode 100644 alcs-frontend/src/app/services/notice-of-intent/decision-v2/notice-of-intent-decision-condition/notice-of-intent-decision-condition.service.ts create mode 100644 alcs-frontend/src/app/services/notice-of-intent/decision-v2/notice-of-intent-decision-v2.service.spec.ts create mode 100644 alcs-frontend/src/app/services/notice-of-intent/decision-v2/notice-of-intent-decision-v2.service.ts create mode 100644 alcs-frontend/src/app/services/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.dto.ts create mode 100644 alcs-frontend/src/app/services/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service.spec.ts create mode 100644 alcs-frontend/src/app/services/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service.ts create mode 100644 services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-component/notice-of-intent-decision-component-type.entity.ts create mode 100644 services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-component/notice-of-intent-decision-component.controller.spec.ts create mode 100644 services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-component/notice-of-intent-decision-component.controller.ts create mode 100644 services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-component/notice-of-intent-decision-component.dto.ts create mode 100644 services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-component/notice-of-intent-decision-component.entity.ts create mode 100644 services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-component/notice-of-intent-decision-component.service.spec.ts create mode 100644 services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-component/notice-of-intent-decision-component.service.ts create mode 100644 services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-condition/notice-of-intent-decision-condition-code.entity.ts create mode 100644 services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-condition/notice-of-intent-decision-condition.controller.spec.ts create mode 100644 services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-condition/notice-of-intent-decision-condition.controller.ts create mode 100644 services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-condition/notice-of-intent-decision-condition.dto.ts create mode 100644 services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-condition/notice-of-intent-decision-condition.entity.ts create mode 100644 services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-condition/notice-of-intent-decision-condition.service.spec.ts create mode 100644 services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-condition/notice-of-intent-decision-condition.service.ts rename services/apps/alcs/src/alcs/notice-of-intent-decision/{notice-of-intent-decision.controller.spec.ts => notice-of-intent-decision-v1/notice-of-intent-decision-v1.controller.spec.ts} (80%) rename services/apps/alcs/src/alcs/notice-of-intent-decision/{notice-of-intent-decision.controller.ts => notice-of-intent-decision-v1/notice-of-intent-decision-v1.controller.ts} (83%) rename services/apps/alcs/src/alcs/notice-of-intent-decision/{notice-of-intent-decision.service.spec.ts => notice-of-intent-decision-v1/notice-of-intent-decision-v1.service.spec.ts} (92%) rename services/apps/alcs/src/alcs/notice-of-intent-decision/{notice-of-intent-decision.service.ts => notice-of-intent-decision-v1/notice-of-intent-decision-v1.service.ts} (90%) create mode 100644 services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.controller.spec.ts create mode 100644 services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.controller.ts create mode 100644 services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.service.spec.ts create mode 100644 services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.service.ts create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1692812627565-noi_decisions_v2.ts create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1692812692333-seed_noi_dec_v2_tables.ts diff --git a/alcs-frontend/src/app/features/admin/card-status/card-status-dialog/card-status-dialog.component.spec.ts b/alcs-frontend/src/app/features/admin/card-status/card-status-dialog/card-status-dialog.component.spec.ts index ef7e3af3d4..89b844851c 100644 --- a/alcs-frontend/src/app/features/admin/card-status/card-status-dialog/card-status-dialog.component.spec.ts +++ b/alcs-frontend/src/app/features/admin/card-status/card-status-dialog/card-status-dialog.component.spec.ts @@ -3,7 +3,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { CardStatusService } from '../../../../services/card/card-status/card-status.service'; -import { DecisionConditionTypesService } from '../../../../services/decision-condition-types/decision-condition-types.service'; +import { ApplicationDecisionConditionTypesService } from '../../../../services/application/application-decision-condition-types/application-decision-condition-types.service'; import { CardStatusDialogComponent } from './card-status-dialog.component'; diff --git a/alcs-frontend/src/app/features/admin/card-status/card-status.component.spec.ts b/alcs-frontend/src/app/features/admin/card-status/card-status.component.spec.ts index d038f664e1..addd5047d1 100644 --- a/alcs-frontend/src/app/features/admin/card-status/card-status.component.spec.ts +++ b/alcs-frontend/src/app/features/admin/card-status/card-status.component.spec.ts @@ -4,7 +4,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MatDialog } from '@angular/material/dialog'; import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { CardStatusService } from '../../../services/card/card-status/card-status.service'; -import { DecisionConditionTypesService } from '../../../services/decision-condition-types/decision-condition-types.service'; +import { ApplicationDecisionConditionTypesService } from '../../../services/application/application-decision-condition-types/application-decision-condition-types.service'; import { ConfirmationDialogService } from '../../../shared/confirmation-dialog/confirmation-dialog.service'; import { CardStatusComponent } from './card-status.component'; diff --git a/alcs-frontend/src/app/features/admin/decision-condition-types/decision-condition-types-dialog/decision-condition-types-dialog.component.spec.ts b/alcs-frontend/src/app/features/admin/decision-condition-types/decision-condition-types-dialog/decision-condition-types-dialog.component.spec.ts index f27ef9c36f..2d8259b43b 100644 --- a/alcs-frontend/src/app/features/admin/decision-condition-types/decision-condition-types-dialog/decision-condition-types-dialog.component.spec.ts +++ b/alcs-frontend/src/app/features/admin/decision-condition-types/decision-condition-types-dialog/decision-condition-types-dialog.component.spec.ts @@ -3,7 +3,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { CeoCriterionService } from '../../../../services/ceo-criterion/ceo-criterion.service'; -import { DecisionConditionTypesService } from '../../../../services/decision-condition-types/decision-condition-types.service'; +import { ApplicationDecisionConditionTypesService } from '../../../../services/application/application-decision-condition-types/application-decision-condition-types.service'; import { DecisionConditionTypesDialogComponent } from './decision-condition-types-dialog.component'; @@ -19,7 +19,7 @@ describe('DecisionConditionTypesDialogComponent', () => { { provide: MAT_DIALOG_DATA, useValue: undefined }, { provide: MatDialogRef, useValue: {} }, { - provide: DecisionConditionTypesService, + provide: ApplicationDecisionConditionTypesService, useValue: {}, }, ], diff --git a/alcs-frontend/src/app/features/admin/decision-condition-types/decision-condition-types-dialog/decision-condition-types-dialog.component.ts b/alcs-frontend/src/app/features/admin/decision-condition-types/decision-condition-types-dialog/decision-condition-types-dialog.component.ts index 8cb9bdd4fd..3626659f6a 100644 --- a/alcs-frontend/src/app/features/admin/decision-condition-types/decision-condition-types-dialog/decision-condition-types-dialog.component.ts +++ b/alcs-frontend/src/app/features/admin/decision-condition-types/decision-condition-types-dialog/decision-condition-types-dialog.component.ts @@ -1,7 +1,7 @@ import { Component, Inject } from '@angular/core'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { ApplicationDecisionConditionTypeDto } from '../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; -import { DecisionConditionTypesService } from '../../../../services/decision-condition-types/decision-condition-types.service'; +import { ApplicationDecisionConditionTypesService } from '../../../../services/application/application-decision-condition-types/application-decision-condition-types.service'; @Component({ selector: 'app-decision-condition-types-dialog', @@ -19,7 +19,7 @@ export class DecisionConditionTypesDialogComponent { constructor( @Inject(MAT_DIALOG_DATA) public data: ApplicationDecisionConditionTypeDto | undefined, private dialogRef: MatDialogRef, - private decisionConditionTypesService: DecisionConditionTypesService + private decisionConditionTypesService: ApplicationDecisionConditionTypesService ) { if (data) { this.description = data.description; diff --git a/alcs-frontend/src/app/features/admin/decision-condition-types/decision-condition-types.component.spec.ts b/alcs-frontend/src/app/features/admin/decision-condition-types/decision-condition-types.component.spec.ts index 68d15c3272..15dde6a26d 100644 --- a/alcs-frontend/src/app/features/admin/decision-condition-types/decision-condition-types.component.spec.ts +++ b/alcs-frontend/src/app/features/admin/decision-condition-types/decision-condition-types.component.spec.ts @@ -3,7 +3,7 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MatDialog } from '@angular/material/dialog'; import { createMock, DeepMocked } from '@golevelup/ts-jest'; -import { DecisionConditionTypesService } from '../../../services/decision-condition-types/decision-condition-types.service'; +import { ApplicationDecisionConditionTypesService } from '../../../services/application/application-decision-condition-types/application-decision-condition-types.service'; import { ConfirmationDialogService } from '../../../shared/confirmation-dialog/confirmation-dialog.service'; import { DecisionConditionTypesComponent } from './decision-condition-types.component'; @@ -11,7 +11,7 @@ import { DecisionConditionTypesComponent } from './decision-condition-types.comp describe('DecisionConditionTypesComponent', () => { let component: DecisionConditionTypesComponent; let fixture: ComponentFixture; - let mockDecTypesService: DeepMocked; + let mockDecTypesService: DeepMocked; let mockDialog: DeepMocked; let mockConfirmationDialogService: DeepMocked; @@ -24,7 +24,7 @@ describe('DecisionConditionTypesComponent', () => { declarations: [DecisionConditionTypesComponent], providers: [ { - provide: DecisionConditionTypesService, + provide: ApplicationDecisionConditionTypesService, useValue: mockDecTypesService, }, { diff --git a/alcs-frontend/src/app/features/admin/decision-condition-types/decision-condition-types.component.ts b/alcs-frontend/src/app/features/admin/decision-condition-types/decision-condition-types.component.ts index d730203f41..46e9ffd90c 100644 --- a/alcs-frontend/src/app/features/admin/decision-condition-types/decision-condition-types.component.ts +++ b/alcs-frontend/src/app/features/admin/decision-condition-types/decision-condition-types.component.ts @@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; import { Subject } from 'rxjs'; import { ApplicationDecisionConditionTypeDto } from '../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; -import { DecisionConditionTypesService } from '../../../services/decision-condition-types/decision-condition-types.service'; +import { ApplicationDecisionConditionTypesService } from '../../../services/application/application-decision-condition-types/application-decision-condition-types.service'; import { ConfirmationDialogService } from '../../../shared/confirmation-dialog/confirmation-dialog.service'; import { DecisionConditionTypesDialogComponent } from './decision-condition-types-dialog/decision-condition-types-dialog.component'; @@ -18,7 +18,7 @@ export class DecisionConditionTypesComponent implements OnInit { displayedColumns: string[] = ['label', 'description', 'code', 'actions']; constructor( - private decisionConditionTypesService: DecisionConditionTypesService, + private decisionConditionTypesService: ApplicationDecisionConditionTypesService, public dialog: MatDialog, private confirmationDialogService: ConfirmationDialogService ) {} diff --git a/alcs-frontend/src/app/features/admin/decision-maker/decision-maker-dialog/decision-maker-dialog.component.spec.ts b/alcs-frontend/src/app/features/admin/decision-maker/decision-maker-dialog/decision-maker-dialog.component.spec.ts index 09bbcff7aa..8a36a923ef 100644 --- a/alcs-frontend/src/app/features/admin/decision-maker/decision-maker-dialog/decision-maker-dialog.component.spec.ts +++ b/alcs-frontend/src/app/features/admin/decision-maker/decision-maker-dialog/decision-maker-dialog.component.spec.ts @@ -2,7 +2,7 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; -import { DecisionMakerService } from '../../../../services/decision-maker/decision-maker.service'; +import { ApplicationDecisionMakerService } from '../../../../services/application/application-decision-maker/application-decision-maker.service'; import { DecisionMakerDialogComponent } from './decision-maker-dialog.component'; @@ -18,7 +18,7 @@ describe('DecisionMakerDialogComponent', () => { { provide: MAT_DIALOG_DATA, useValue: undefined }, { provide: MatDialogRef, useValue: {} }, { - provide: DecisionMakerService, + provide: ApplicationDecisionMakerService, useValue: {}, }, ], diff --git a/alcs-frontend/src/app/features/admin/decision-maker/decision-maker-dialog/decision-maker-dialog.component.ts b/alcs-frontend/src/app/features/admin/decision-maker/decision-maker-dialog/decision-maker-dialog.component.ts index 082c6a1d39..0d92afcd79 100644 --- a/alcs-frontend/src/app/features/admin/decision-maker/decision-maker-dialog/decision-maker-dialog.component.ts +++ b/alcs-frontend/src/app/features/admin/decision-maker/decision-maker-dialog/decision-maker-dialog.component.ts @@ -1,7 +1,7 @@ import { Component, Inject } from '@angular/core'; import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { DecisionMakerDto } from '../../../../services/application/decision/application-decision-v1/application-decision.dto'; -import { DecisionMakerService } from '../../../../services/decision-maker/decision-maker.service'; +import { ApplicationDecisionMakerService } from '../../../../services/application/application-decision-maker/application-decision-maker.service'; @Component({ selector: 'app-decision-maker-dialog', @@ -20,7 +20,7 @@ export class DecisionMakerDialogComponent { constructor( @Inject(MAT_DIALOG_DATA) public data: DecisionMakerDto | undefined, private dialogRef: MatDialogRef, - private decisionMakerService: DecisionMakerService + private decisionMakerService: ApplicationDecisionMakerService ) { if (data) { this.description = data.description; diff --git a/alcs-frontend/src/app/features/admin/decision-maker/decision-maker.component.spec.ts b/alcs-frontend/src/app/features/admin/decision-maker/decision-maker.component.spec.ts index 547b37edf6..14ec61f2c3 100644 --- a/alcs-frontend/src/app/features/admin/decision-maker/decision-maker.component.spec.ts +++ b/alcs-frontend/src/app/features/admin/decision-maker/decision-maker.component.spec.ts @@ -4,7 +4,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MatDialog } from '@angular/material/dialog'; import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { CeoCriterionService } from '../../../services/ceo-criterion/ceo-criterion.service'; -import { DecisionMakerService } from '../../../services/decision-maker/decision-maker.service'; +import { ApplicationDecisionMakerService } from '../../../services/application/application-decision-maker/application-decision-maker.service'; import { ConfirmationDialogService } from '../../../shared/confirmation-dialog/confirmation-dialog.service'; import { DecisionMakerComponent } from './decision-maker.component'; @@ -25,7 +25,7 @@ describe('DecisionMakerComponent', () => { declarations: [DecisionMakerComponent], providers: [ { - provide: DecisionMakerService, + provide: ApplicationDecisionMakerService, useValue: mockCeoCriterionService, }, { diff --git a/alcs-frontend/src/app/features/admin/decision-maker/decision-maker.component.ts b/alcs-frontend/src/app/features/admin/decision-maker/decision-maker.component.ts index 579f465cee..e6c5dc27f8 100644 --- a/alcs-frontend/src/app/features/admin/decision-maker/decision-maker.component.ts +++ b/alcs-frontend/src/app/features/admin/decision-maker/decision-maker.component.ts @@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; import { Subject } from 'rxjs'; import { DecisionMakerDto } from '../../../services/application/decision/application-decision-v1/application-decision.dto'; -import { DecisionMakerService } from '../../../services/decision-maker/decision-maker.service'; +import { ApplicationDecisionMakerService } from '../../../services/application/application-decision-maker/application-decision-maker.service'; import { ConfirmationDialogService } from '../../../shared/confirmation-dialog/confirmation-dialog.service'; import { DecisionMakerDialogComponent } from './decision-maker-dialog/decision-maker-dialog.component'; @@ -18,7 +18,7 @@ export class DecisionMakerComponent implements OnInit { displayedColumns: string[] = ['label', 'description', 'code', 'isActive', 'actions']; constructor( - private decisionMakerService: DecisionMakerService, + private decisionMakerService: ApplicationDecisionMakerService, public dialog: MatDialog, private confirmationDialogService: ConfirmationDialogService ) {} diff --git a/alcs-frontend/src/app/features/application/decision/conditions/condition/condition.component.ts b/alcs-frontend/src/app/features/application/decision/conditions/condition/condition.component.ts index 4e7e434d1f..c445216b08 100644 --- a/alcs-frontend/src/app/features/application/decision/conditions/condition/condition.component.ts +++ b/alcs-frontend/src/app/features/application/decision/conditions/condition/condition.component.ts @@ -5,7 +5,7 @@ import { ApplicationDecisionConditionService } from '../../../../../services/app import { ApplicationDecisionConditionToComponentPlanNumberDto, APPLICATION_DECISION_COMPONENT_TYPE, - DecisionComponentDto, + ApplicationDecisionComponentDto, UpdateApplicationDecisionConditionDto, } from '../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; import { @@ -44,7 +44,7 @@ export class ConditionComponent implements OnInit, AfterViewInit { isReadMoreVisible = false; conditionStatus: string = ''; isRequireSurveyPlan = false; - subdComponent?: DecisionComponentDto; + subdComponent?: ApplicationDecisionComponentDto; planNumbers: ApplicationDecisionConditionToComponentPlanNumberDto[] = []; constructor( diff --git a/alcs-frontend/src/app/features/application/decision/conditions/conditions.component.ts b/alcs-frontend/src/app/features/application/decision/conditions/conditions.component.ts index 09b076ed80..8b84edc196 100644 --- a/alcs-frontend/src/app/features/application/decision/conditions/conditions.component.ts +++ b/alcs-frontend/src/app/features/application/decision/conditions/conditions.component.ts @@ -8,7 +8,7 @@ import { ApplicationDecisionConditionDto, ApplicationDecisionDto, ApplicationDecisionWithLinkedResolutionDto, - DecisionCodesDto, + ApplicationDecisionCodesDto, } from '../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; import { ApplicationDecisionV2Service } from '../../../../services/application/decision/application-decision-v2/application-decision-v2.service'; import { @@ -53,7 +53,7 @@ export class ConditionsComponent implements OnInit { decision!: ApplicationDecisionWithConditionComponentLabels; conditionDecision!: ApplicationDecisionDto; application: ApplicationDto | undefined; - codes!: DecisionCodesDto; + codes!: ApplicationDecisionCodesDto; today!: number; dratDecisionLabel = DRAFT_DECISION_TYPE_LABEL; diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/basic/basic.component.spec.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/basic/basic.component.spec.ts index 3cd182197e..0b966955c4 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/basic/basic.component.spec.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/basic/basic.component.spec.ts @@ -1,6 +1,6 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { DecisionComponentDto } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; +import { ApplicationDecisionComponentDto } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; import { BasicComponent } from './basic.component'; @@ -16,7 +16,7 @@ describe('BasicComponent', () => { fixture = TestBed.createComponent(BasicComponent); component = fixture.componentInstance; - component.component = {} as DecisionComponentDto; + component.component = {} as ApplicationDecisionComponentDto; fixture.detectChanges(); }); diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/basic/basic.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/basic/basic.component.ts index bf635028a4..ab85edd3e9 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/basic/basic.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/basic/basic.component.ts @@ -1,5 +1,5 @@ import { Component, EventEmitter, Input, Output } from '@angular/core'; -import { DecisionComponentDto } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; +import { ApplicationDecisionComponentDto } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; @Component({ selector: 'app-basic', @@ -7,7 +7,7 @@ import { DecisionComponentDto } from '../../../../../../services/application/dec styleUrls: ['./basic.component.scss'], }) export class BasicComponent { - @Input() component!: DecisionComponentDto; + @Input() component!: ApplicationDecisionComponentDto; @Input() fillRow = false; @Output() saveAlrArea = new EventEmitter(); diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/incl-excl/incl-excl.component.spec.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/incl-excl/incl-excl.component.spec.ts index 9681c2d6ab..b7c34fd7e7 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/incl-excl/incl-excl.component.spec.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/incl-excl/incl-excl.component.spec.ts @@ -1,6 +1,6 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { DecisionComponentDto } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; +import { ApplicationDecisionComponentDto } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; import { InclExclComponent } from './incl-excl.component'; @@ -16,7 +16,7 @@ describe('NaruComponent', () => { fixture = TestBed.createComponent(InclExclComponent); component = fixture.componentInstance; - component.component = {} as DecisionComponentDto; + component.component = {} as ApplicationDecisionComponentDto; fixture.detectChanges(); }); diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/incl-excl/incl-excl.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/incl-excl/incl-excl.component.ts index d164dca1aa..04747ca1d3 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/incl-excl/incl-excl.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/incl-excl/incl-excl.component.ts @@ -1,5 +1,5 @@ import { Component, EventEmitter, Input, Output } from '@angular/core'; -import { DecisionComponentDto } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; +import { ApplicationDecisionComponentDto } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; @Component({ selector: 'app-incl-excl', @@ -7,5 +7,5 @@ import { DecisionComponentDto } from '../../../../../../services/application/dec styleUrls: ['./incl-excl.component.scss'], }) export class InclExclComponent { - @Input() component!: DecisionComponentDto; + @Input() component!: ApplicationDecisionComponentDto; } diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/naru/naru.component.spec.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/naru/naru.component.spec.ts index d8629453a1..f5eb9c2369 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/naru/naru.component.spec.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/naru/naru.component.spec.ts @@ -1,6 +1,6 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { DecisionComponentDto } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; +import { ApplicationDecisionComponentDto } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; import { NaruComponent } from './naru.component'; @@ -16,7 +16,7 @@ describe('NaruComponent', () => { fixture = TestBed.createComponent(NaruComponent); component = fixture.componentInstance; - component.component = {} as DecisionComponentDto; + component.component = {} as ApplicationDecisionComponentDto; fixture.detectChanges(); }); diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/naru/naru.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/naru/naru.component.ts index 2160e20196..1f4090aa51 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/naru/naru.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/naru/naru.component.ts @@ -1,5 +1,5 @@ import { Component, EventEmitter, Input, Output } from '@angular/core'; -import { DecisionComponentDto } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; +import { ApplicationDecisionComponentDto } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; @Component({ selector: 'app-naru', @@ -7,5 +7,5 @@ import { DecisionComponentDto } from '../../../../../../services/application/dec styleUrls: ['./naru.component.scss'], }) export class NaruComponent { - @Input() component!: DecisionComponentDto; + @Input() component!: ApplicationDecisionComponentDto; } diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/nfup/nfup.component.spec.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/nfup/nfup.component.spec.ts index 0409a7eca8..f0cf2bf7ef 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/nfup/nfup.component.spec.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/nfup/nfup.component.spec.ts @@ -1,6 +1,6 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { DecisionComponentDto } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; +import { ApplicationDecisionComponentDto } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; import { NfupComponent } from './nfup.component'; @@ -16,7 +16,7 @@ describe('NfupComponent', () => { fixture = TestBed.createComponent(NfupComponent); component = fixture.componentInstance; - component.component = {} as DecisionComponentDto; + component.component = {} as ApplicationDecisionComponentDto; fixture.detectChanges(); }); diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/nfup/nfup.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/nfup/nfup.component.ts index ac4b5cddfb..728bef3466 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/nfup/nfup.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/nfup/nfup.component.ts @@ -1,5 +1,5 @@ import { Component, EventEmitter, Input, Output } from '@angular/core'; -import { DecisionComponentDto } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; +import { ApplicationDecisionComponentDto } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; @Component({ selector: 'app-nfup', @@ -7,5 +7,5 @@ import { DecisionComponentDto } from '../../../../../../services/application/dec styleUrls: ['./nfup.component.scss'], }) export class NfupComponent { - @Input() component!: DecisionComponentDto; + @Input() component!: ApplicationDecisionComponentDto; } diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pfrs/pfrs.component.spec.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pfrs/pfrs.component.spec.ts index 5a691549ad..23476b67a0 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pfrs/pfrs.component.spec.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pfrs/pfrs.component.spec.ts @@ -1,6 +1,6 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { DecisionComponentDto } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; +import { ApplicationDecisionComponentDto } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; import { PfrsComponent } from './pfrs.component'; @@ -16,7 +16,7 @@ describe('PfrsComponent', () => { fixture = TestBed.createComponent(PfrsComponent); component = fixture.componentInstance; - component.component = {} as DecisionComponentDto; + component.component = {} as ApplicationDecisionComponentDto; fixture.detectChanges(); }); diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pfrs/pfrs.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pfrs/pfrs.component.ts index 532eddb08e..b8b3304d59 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pfrs/pfrs.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pfrs/pfrs.component.ts @@ -1,5 +1,5 @@ import { Component, EventEmitter, Input, Output } from '@angular/core'; -import { DecisionComponentDto } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; +import { ApplicationDecisionComponentDto } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; @Component({ selector: 'app-pfrs', @@ -7,5 +7,5 @@ import { DecisionComponentDto } from '../../../../../../services/application/dec styleUrls: ['./pfrs.component.scss'], }) export class PfrsComponent { - @Input() component!: DecisionComponentDto; + @Input() component!: ApplicationDecisionComponentDto; } diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pofo/pofo.component.spec.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pofo/pofo.component.spec.ts index eeee8571e3..21a5215761 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pofo/pofo.component.spec.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pofo/pofo.component.spec.ts @@ -1,6 +1,6 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { DecisionComponentDto } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; +import { ApplicationDecisionComponentDto } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; import { PofoComponent } from './pofo.component'; @@ -16,7 +16,7 @@ describe('PofoComponent', () => { fixture = TestBed.createComponent(PofoComponent); component = fixture.componentInstance; - component.component = {} as DecisionComponentDto; + component.component = {} as ApplicationDecisionComponentDto; fixture.detectChanges(); }); diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pofo/pofo.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pofo/pofo.component.ts index dcee185d01..90b0ca0879 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pofo/pofo.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pofo/pofo.component.ts @@ -1,5 +1,5 @@ import { Component, EventEmitter, Input, Output } from '@angular/core'; -import { DecisionComponentDto } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; +import { ApplicationDecisionComponentDto } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; @Component({ selector: 'app-pofo', @@ -7,5 +7,5 @@ import { DecisionComponentDto } from '../../../../../../services/application/dec styleUrls: ['./pofo.component.scss'], }) export class PofoComponent { - @Input() component!: DecisionComponentDto; + @Input() component!: ApplicationDecisionComponentDto; } diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/roso/roso.component.spec.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/roso/roso.component.spec.ts index cc4679d648..c30b323ba4 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/roso/roso.component.spec.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/roso/roso.component.spec.ts @@ -1,6 +1,6 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { DecisionComponentDto } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; +import { ApplicationDecisionComponentDto } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; import { RosoComponent } from './roso.component'; @@ -16,7 +16,7 @@ describe('RosoComponent', () => { fixture = TestBed.createComponent(RosoComponent); component = fixture.componentInstance; - component.component = {} as DecisionComponentDto; + component.component = {} as ApplicationDecisionComponentDto; fixture.detectChanges(); }); diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/roso/roso.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/roso/roso.component.ts index f474f24ae0..a6caddf3df 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/roso/roso.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/roso/roso.component.ts @@ -1,5 +1,5 @@ import { Component, EventEmitter, Input, Output } from '@angular/core'; -import { DecisionComponentDto } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; +import { ApplicationDecisionComponentDto } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; @Component({ selector: 'app-roso', @@ -7,5 +7,5 @@ import { DecisionComponentDto } from '../../../../../../services/application/dec styleUrls: ['./roso.component.scss'], }) export class RosoComponent { - @Input() component!: DecisionComponentDto; + @Input() component!: ApplicationDecisionComponentDto; } diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/subd/subd.component.spec.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/subd/subd.component.spec.ts index 614a7a2ec5..c1d3d73a7f 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/subd/subd.component.spec.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/subd/subd.component.spec.ts @@ -3,7 +3,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { ApplicationDecisionComponentLotService } from '../../../../../../services/application/decision/application-decision-v2/application-decision-component-lot/application-decision-component-lot.service'; import { ApplicationDecisionComponentService } from '../../../../../../services/application/decision/application-decision-v2/application-decision-component/application-decision-component.service'; -import { DecisionComponentDto } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; +import { ApplicationDecisionComponentDto } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; import { SubdComponent } from './subd.component'; @@ -20,15 +20,15 @@ describe('PfrsComponent', () => { providers: [ { provide: ApplicationDecisionComponentLotService, - useValue: mockComponentLotService - } + useValue: mockComponentLotService, + }, ], schemas: [NO_ERRORS_SCHEMA], }).compileComponents(); fixture = TestBed.createComponent(SubdComponent); component = fixture.componentInstance; - component.component = {} as DecisionComponentDto; + component.component = {} as ApplicationDecisionComponentDto; fixture.detectChanges(); }); diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/subd/subd.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/subd/subd.component.ts index 3fb6ec788c..ab5cdd4253 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/subd/subd.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/subd/subd.component.ts @@ -1,7 +1,7 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { ApplicationDecisionComponentLotService } from '../../../../../../services/application/decision/application-decision-v2/application-decision-component-lot/application-decision-component-lot.service'; import { - DecisionComponentDto, + ApplicationDecisionComponentDto, ProposedDecisionLotDto, } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; @@ -13,7 +13,7 @@ import { export class SubdComponent implements OnInit { constructor(private componentLotService: ApplicationDecisionComponentLotService) {} - @Input() component!: DecisionComponentDto; + @Input() component!: ApplicationDecisionComponentDto; ngOnInit(): void { this.component.lots = this.component.lots?.sort((a, b) => a.index - b.index) ?? undefined; diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/turp/turp.component.spec.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/turp/turp.component.spec.ts index 1ad0c0b3fc..12425f4802 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/turp/turp.component.spec.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/turp/turp.component.spec.ts @@ -1,6 +1,6 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { DecisionComponentDto } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; +import { ApplicationDecisionComponentDto } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; import { TurpComponent } from './turp.component'; @@ -16,7 +16,7 @@ describe('TurpComponent', () => { fixture = TestBed.createComponent(TurpComponent); component = fixture.componentInstance; - component.component = {} as DecisionComponentDto; + component.component = {} as ApplicationDecisionComponentDto; fixture.detectChanges(); }); diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/turp/turp.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/turp/turp.component.ts index 1fa3091fa7..c9030c3662 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/turp/turp.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/turp/turp.component.ts @@ -1,5 +1,5 @@ import { Component, EventEmitter, Input, Output } from '@angular/core'; -import { DecisionComponentDto } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; +import { ApplicationDecisionComponentDto } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; @Component({ selector: 'app-turp', @@ -7,5 +7,5 @@ import { DecisionComponentDto } from '../../../../../../services/application/dec styleUrls: ['./turp.component.scss'], }) export class TurpComponent { - @Input() component!: DecisionComponentDto; + @Input() component!: ApplicationDecisionComponentDto; } diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.ts index 1bec2e48eb..8446e128e5 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.ts @@ -2,8 +2,8 @@ import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angu import { FormControl, FormGroup, Validators } from '@angular/forms'; import { APPLICATION_DECISION_COMPONENT_TYPE, - DecisionCodesDto, - DecisionComponentDto, + ApplicationDecisionCodesDto, + ApplicationDecisionComponentDto, DecisionComponentTypeDto, NaruDecisionComponentDto, NfuDecisionComponentDto, @@ -24,9 +24,9 @@ import { SubdInputComponent } from './subd-input/subd-input.component'; styleUrls: ['./decision-component.component.scss'], }) export class DecisionComponentComponent implements OnInit { - @Input() data!: DecisionComponentDto; - @Input() codes!: DecisionCodesDto; - @Output() dataChange = new EventEmitter(); + @Input() data!: ApplicationDecisionComponentDto; + @Input() codes!: ApplicationDecisionCodesDto; + @Output() dataChange = new EventEmitter(); @Output() remove = new EventEmitter(); @ViewChild(SubdInputComponent) subdInputComponent?: SubdInputComponent; diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/naru-input/naru-input.component.spec.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/naru-input/naru-input.component.spec.ts index f528c6a600..3d9638c340 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/naru-input/naru-input.component.spec.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/naru-input/naru-input.component.spec.ts @@ -1,6 +1,6 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { DecisionCodesDto } from '../../../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; +import { ApplicationDecisionCodesDto } from '../../../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; import { NaruInputComponent } from './naru-input.component'; @@ -16,7 +16,7 @@ describe('NaruInputComponent', () => { fixture = TestBed.createComponent(NaruInputComponent); component = fixture.componentInstance; - component.codes = {} as DecisionCodesDto; + component.codes = {} as ApplicationDecisionCodesDto; fixture.detectChanges(); }); diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/naru-input/naru-input.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/naru-input/naru-input.component.ts index d52f03423e..ee5a8f01ee 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/naru-input/naru-input.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/naru-input/naru-input.component.ts @@ -1,6 +1,6 @@ import { Component, Input } from '@angular/core'; import { FormGroup } from '@angular/forms'; -import { DecisionCodesDto } from '../../../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; +import { ApplicationDecisionCodesDto } from '../../../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; @Component({ selector: 'app-naru-input', @@ -9,5 +9,5 @@ import { DecisionCodesDto } from '../../../../../../../../services/application/d }) export class NaruInputComponent { @Input() form!: FormGroup; - @Input() codes!: DecisionCodesDto; + @Input() codes!: ApplicationDecisionCodesDto; } diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-components.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-components.component.ts index 3cc2e2e646..6b4ef02f93 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-components.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-components.component.ts @@ -15,8 +15,8 @@ import { ApplicationSubmissionService } from '../../../../../../services/applica import { ApplicationDto } from '../../../../../../services/application/application.dto'; import { APPLICATION_DECISION_COMPONENT_TYPE, - DecisionCodesDto, - DecisionComponentDto, + ApplicationDecisionCodesDto, + ApplicationDecisionComponentDto, DecisionComponentTypeDto, } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; import { ToastService } from '../../../../../../services/toast/toast.service'; @@ -33,13 +33,13 @@ export type DecisionComponentTypeMenuItem = DecisionComponentTypeDto & { isDisab export class DecisionComponentsComponent implements OnInit, OnDestroy, AfterViewInit { $destroy = new Subject(); - @Input() codes!: DecisionCodesDto; + @Input() codes!: ApplicationDecisionCodesDto; @Input() fileNumber!: string; @Input() showError = false; - @Input() components: DecisionComponentDto[] = []; + @Input() components: ApplicationDecisionComponentDto[] = []; @Output() componentsChange = new EventEmitter<{ - components: DecisionComponentDto[]; + components: ApplicationDecisionComponentDto[]; isValid: boolean; }>(); @ViewChildren(DecisionComponentComponent) childComponents!: QueryList; @@ -84,7 +84,7 @@ export class DecisionComponentsComponent implements OnInit, OnDestroy, AfterView onAddNewComponent(uiCode: string, typeCode: string) { switch (uiCode) { case 'COPY': - const component: DecisionComponentDto = { + const component: ApplicationDecisionComponentDto = { applicationDecisionComponentTypeCode: typeCode, alrArea: this.application.alrArea, agCap: this.application.agCap, @@ -149,7 +149,7 @@ export class DecisionComponentsComponent implements OnInit, OnDestroy, AfterView applicationDecisionComponentType: this.decisionComponentTypes.find( (e) => e.code === typeCode && e.uiCode !== 'COPY' ), - } as DecisionComponentDto); + } as ApplicationDecisionComponentDto); break; default: this.toastService.showErrorToast(`Failed to create component ${typeCode}`); @@ -171,7 +171,7 @@ export class DecisionComponentsComponent implements OnInit, OnDestroy, AfterView }); } - trackByFn(index: any, item: DecisionComponentDto) { + trackByFn(index: any, item: ApplicationDecisionComponentDto) { return item.applicationDecisionComponentTypeCode; } @@ -196,7 +196,7 @@ export class DecisionComponentsComponent implements OnInit, OnDestroy, AfterView }); } - private async prepareDecisionComponentTypes(codes: DecisionCodesDto) { + private async prepareDecisionComponentTypes(codes: ApplicationDecisionCodesDto) { const decisionComponentTypes: DecisionComponentTypeMenuItem[] = codes.decisionComponentTypes.map((e) => ({ ...e, isDisabled: false, @@ -220,17 +220,17 @@ export class DecisionComponentsComponent implements OnInit, OnDestroy, AfterView this.updateComponentsMenuItems(); } - private patchNfuFields(component: DecisionComponentDto) { + private patchNfuFields(component: ApplicationDecisionComponentDto) { component.nfuType = this.application.nfuUseType; component.nfuSubType = this.application.nfuUseSubType; component.endDate = this.application.proposalEndDate; } - private patchTurpFields(component: DecisionComponentDto) { + private patchTurpFields(component: ApplicationDecisionComponentDto) { component.expiryDate = this.application.proposalExpiryDate; } - private patchPofoFields(component: DecisionComponentDto) { + private patchPofoFields(component: ApplicationDecisionComponentDto) { component.endDate = this.application.proposalEndDate; component.soilFillTypeToPlace = this.application.submittedApplication?.soilFillTypeToPlace; component.soilToPlaceVolume = this.application.submittedApplication?.soilToPlaceVolume; @@ -239,7 +239,7 @@ export class DecisionComponentsComponent implements OnInit, OnDestroy, AfterView component.soilToPlaceAverageDepth = this.application.submittedApplication?.soilToPlaceAverageDepth; } - private patchRosoFields(component: DecisionComponentDto) { + private patchRosoFields(component: ApplicationDecisionComponentDto) { component.endDate = this.application.proposalEndDate; component.soilTypeRemoved = this.application.submittedApplication?.soilTypeRemoved; component.soilToRemoveVolume = this.application.submittedApplication?.soilToRemoveVolume; @@ -248,13 +248,13 @@ export class DecisionComponentsComponent implements OnInit, OnDestroy, AfterView component.soilToRemoveAverageDepth = this.application.submittedApplication?.soilToRemoveAverageDepth; } - private patchNaruFields(component: DecisionComponentDto) { + private patchNaruFields(component: ApplicationDecisionComponentDto) { component.endDate = this.application.proposalEndDate; component.expiryDate = this.application.proposalExpiryDate; component.naruSubtypeCode = this.application.submittedApplication?.naruSubtype?.code; } - private patchInclExclFields(component: DecisionComponentDto) { + private patchInclExclFields(component: ApplicationDecisionComponentDto) { if (this.application.inclExclApplicantType) { component.inclExclApplicantType = this.application.inclExclApplicantType; } else { diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-conditions.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-conditions.component.ts index bf61badbd1..21682af88e 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-conditions.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-conditions.component.ts @@ -13,8 +13,8 @@ import { combineLatestWith, Subject, takeUntil } from 'rxjs'; import { ApplicationDecisionConditionDto, ApplicationDecisionDto, - DecisionCodesDto, - DecisionComponentDto, + ApplicationDecisionCodesDto, + ApplicationDecisionComponentDto, UpdateApplicationDecisionConditionDto, } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; import { ApplicationDecisionV2Service } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.service'; @@ -32,8 +32,8 @@ export type SelectableComponent = { uuid?: string; tempId: string; decisionUuid: export class DecisionConditionsComponent implements OnInit, OnChanges, OnDestroy { $destroy = new Subject(); - @Input() codes!: DecisionCodesDto; - @Input() components: DecisionComponentDto[] = []; + @Input() codes!: ApplicationDecisionCodesDto; + @Input() components: ApplicationDecisionComponentDto[] = []; @Input() conditions: ApplicationDecisionConditionDto[] = []; @Input() showError = false; @ViewChildren(DecisionConditionComponent) conditionComponents: DecisionConditionComponent[] = []; @@ -172,7 +172,7 @@ export class DecisionConditionsComponent implements OnInit, OnChanges, OnDestroy mapComponents( decisionUuid: string, - components: DecisionComponentDto[], + components: ApplicationDecisionComponentDto[], decisionNumber: number | null, decisionYear: number | null ) { diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.ts index 8cc68224b8..7173b2f6aa 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.ts @@ -16,8 +16,8 @@ import { CeoCriterion, CeoCriterionDto, CreateApplicationDecisionDto, - DecisionCodesDto, - DecisionComponentDto, + ApplicationDecisionCodesDto, + ApplicationDecisionComponentDto, DecisionMaker, DecisionMakerDto, DecisionOutcomeCodeDto, @@ -70,12 +70,12 @@ export class DecisionInputV2Component implements OnInit, OnDestroy { resolutionYears: number[] = []; postDecisions: MappedPostDecision[] = []; existingDecision: ApplicationDecisionDto | undefined; - codes?: DecisionCodesDto; + codes?: ApplicationDecisionCodesDto; resolutionNumberControl = new FormControl(null, [Validators.required]); resolutionYearControl = new FormControl(null, [Validators.required]); - components: DecisionComponentDto[] = []; + components: ApplicationDecisionComponentDto[] = []; conditions: ApplicationDecisionConditionDto[] = []; conditionUpdates: UpdateApplicationDecisionConditionDto[] = []; @@ -589,7 +589,7 @@ export class DecisionInputV2Component implements OnInit, OnDestroy { } } - onComponentChange($event: { components: DecisionComponentDto[]; isValid: boolean }) { + onComponentChange($event: { components: ApplicationDecisionComponentDto[]; isValid: boolean }) { this.components = Array.from($event.components); this.componentsValid = $event.isValid; } diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/conditions/condition/condition.component.html b/alcs-frontend/src/app/features/notice-of-intent/decision/conditions/condition/condition.component.html new file mode 100644 index 0000000000..e0c39fdff4 --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/conditions/condition/condition.component.html @@ -0,0 +1,73 @@ +
+

{{ condition.type.label }}

+ + + + + + + + + +
+
+
+
Component to Condition
+ {{ condition.componentLabelsStr }} + +
+ +
+
Approval Dependent
+ {{ condition.approvalDependant | booleanToString }} + +
+ +
+
Security Amount
+ {{ condition.securityAmount }} + +
+ +
+
Admin Fee
+ {{ condition.administrativeFee }} + +
+ +
+
Completion Date
+ +
+ +
+
Superseded Date
+ +
+ +
+
Description
+ {{ + condition.description + }} + +
+ {{ isReadMoreClicked ? 'Read Less' : 'Read More' }} +
+
+
diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/conditions/condition/condition.component.scss b/alcs-frontend/src/app/features/notice-of-intent/decision/conditions/condition/condition.component.scss new file mode 100644 index 0000000000..b1976e0872 --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/conditions/condition/condition.component.scss @@ -0,0 +1,3 @@ +.component-labels { + white-space: pre-wrap; +} diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/conditions/condition/condition.component.spec.ts b/alcs-frontend/src/app/features/notice-of-intent/decision/conditions/condition/condition.component.spec.ts new file mode 100644 index 0000000000..11279144f7 --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/conditions/condition/condition.component.spec.ts @@ -0,0 +1,48 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { NoticeOfIntentDecisionConditionService } from '../../../../../services/notice-of-intent/decision-v2/notice-of-intent-decision-condition/notice-of-intent-decision-condition.service'; +import { SharedModule } from '../../../../../shared/shared.module'; +import { ConditionComponentLabels, DecisionConditionWithStatus } from '../conditions.component'; + +import { ConditionComponent } from './condition.component'; + +describe('ConditionComponent', () => { + let component: ConditionComponent; + let fixture: ComponentFixture; + let mockNOIDecisionConditionService: DeepMocked; + + beforeEach(async () => { + mockNOIDecisionConditionService = createMock(); + + await TestBed.configureTestingModule({ + declarations: [ConditionComponent], + providers: [ + { + provide: NoticeOfIntentDecisionConditionService, + useValue: mockNOIDecisionConditionService, + }, + ], + schemas: [NO_ERRORS_SCHEMA], + imports: [SharedModule, BrowserAnimationsModule], + }).compileComponents(); + + fixture = TestBed.createComponent(ConditionComponent); + component = fixture.componentInstance; + + component.condition = createMock< + DecisionConditionWithStatus & { + componentLabelsStr?: string; + componentLabels?: ConditionComponentLabels[]; + } + >(); + component.condition.conditionComponentsLabels = []; + + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/conditions/condition/condition.component.ts b/alcs-frontend/src/app/features/notice-of-intent/decision/conditions/condition/condition.component.ts new file mode 100644 index 0000000000..99927ef81c --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/conditions/condition/condition.component.ts @@ -0,0 +1,104 @@ +import { AfterViewInit, Component, Input, OnInit } from '@angular/core'; +import moment from 'moment'; +import { UpdateApplicationDecisionConditionDto } from '../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; +import { NoticeOfIntentDecisionConditionService } from '../../../../../services/notice-of-intent/decision-v2/notice-of-intent-decision-condition/notice-of-intent-decision-condition.service'; +import { UpdateNoticeOfIntentDecisionConditionDto } from '../../../../../services/notice-of-intent/decision/notice-of-intent-decision.dto'; +import { + DECISION_CONDITION_COMPLETE_LABEL, + DECISION_CONDITION_INCOMPLETE_LABEL, + DECISION_CONDITION_SUPERSEDED_LABEL, +} from '../../../../../shared/application-type-pill/application-type-pill.constants'; +import { CONDITION_STATUS, ConditionComponentLabels, DecisionConditionWithStatus } from '../conditions.component'; + +type Condition = DecisionConditionWithStatus & { + componentLabelsStr?: string; + componentLabels?: ConditionComponentLabels[]; +}; + +@Component({ + selector: 'app-condition', + templateUrl: './condition.component.html', + styleUrls: ['./condition.component.scss'], +}) +export class ConditionComponent implements OnInit, AfterViewInit { + @Input() condition!: Condition; + @Input() isDraftDecision!: boolean; + @Input() fileNumber!: string; + + incompleteLabel = DECISION_CONDITION_INCOMPLETE_LABEL; + completeLabel = DECISION_CONDITION_COMPLETE_LABEL; + supersededLabel = DECISION_CONDITION_SUPERSEDED_LABEL; + + CONDITION_STATUS = CONDITION_STATUS; + + isReadMoreClicked = false; + isReadMoreVisible = false; + conditionStatus: string = ''; + isRequireSurveyPlan = false; + + constructor(private conditionService: NoticeOfIntentDecisionConditionService) {} + + ngOnInit() { + this.updateStatus(); + if (this.condition) { + this.condition = { + ...this.condition, + componentLabelsStr: this.condition.conditionComponentsLabels?.flatMap((e) => e.label).join(';\n'), + }; + + this.isRequireSurveyPlan = this.condition.type?.code === 'RSPL'; + } + } + + ngAfterViewInit(): void { + setTimeout(() => (this.isReadMoreVisible = this.checkIfReadMoreVisible())); + } + + async onUpdateCondition( + field: keyof UpdateNoticeOfIntentDecisionConditionDto, + value: string[] | string | number | null + ) { + const condition = this.condition; + + if (condition) { + const update = await this.conditionService.update(condition.uuid, { + [field]: value, + }); + + const labels = this.condition.componentLabels; + this.condition = { ...update, componentLabels: labels } as Condition; + + this.updateStatus(); + } + } + + onToggleReadMore() { + this.isReadMoreClicked = !this.isReadMoreClicked; + } + + isEllipsisActive(e: string): boolean { + const el = document.getElementById(e); + // + 2 required as adjustment to height + return el ? el.clientHeight + 2 < el.scrollHeight : false; + } + + checkIfReadMoreVisible(): boolean { + return this.isReadMoreClicked || this.isEllipsisActive(this.condition.uuid + 'Description'); + } + + updateStatus() { + const today = moment().startOf('day').toDate().getTime(); + + if (this.condition.supersededDate && this.condition.supersededDate <= today) { + this.conditionStatus = CONDITION_STATUS.SUPERSEDED; + } else if (this.condition.completionDate && this.condition.completionDate <= today) { + this.conditionStatus = CONDITION_STATUS.COMPLETE; + } else { + this.conditionStatus = CONDITION_STATUS.INCOMPLETE; + } + } + + getComponentLabel(componentUuid: string) { + return this.condition.conditionComponentsLabels?.find((e) => e.componentUuid === componentUuid)?.label; + } +} diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/conditions/conditions.component.html b/alcs-frontend/src/app/features/notice-of-intent/decision/conditions/conditions.component.html new file mode 100644 index 0000000000..f4927fbbe4 --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/conditions/conditions.component.html @@ -0,0 +1,74 @@ +
+
+

View Conditions

+ +
+
+
+
+
+ Modified By:  + {{ decision.modifiedByResolutions?.join(', ') }} + N/A +
+
+
+
+
Decision #{{ decision.index }}
+
+ + calendar_month + {{ noticeOfIntent.activeDays }} + + + pause + {{ noticeOfIntent.pausedDays }} + +
+ + + + Res #{{ decision.resolutionNumber }}/{{ decision.resolutionYear }} + + + + +
+
+
+ +
+
+ +
+
+
+
+ +
+
diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/conditions/conditions.component.scss b/alcs-frontend/src/app/features/notice-of-intent/decision/conditions/conditions.component.scss new file mode 100644 index 0000000000..d216bf2f2b --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/conditions/conditions.component.scss @@ -0,0 +1,135 @@ +@use '../../../../../styles/colors.scss'; + +h3, +div, +span, +p { + color: colors.$black; +} + +.header, +.footer { + display: flex; + padding-left: 16px; +} + +.header { + justify-content: space-between; +} + +.footer { + justify-content: flex-end; +} + +:host ::ng-deep { + .display-none { + display: none !important; + } + + .read-more { + display: flex; + justify-content: flex-end; + } + + .decision-container { + padding: 28px 0; + + .post-decisions { + padding: 8px 16px; + background-color: colors.$grey-light; + grid-template-columns: 50% 50%; + display: grid; + min-height: 36px; + text-transform: uppercase; + border-radius: 4px 4px 0 0; + } + + .header { + margin: 0; + display: flex; + justify-content: space-between; + padding: 0 16px; + + .title { + display: flex; + align-items: center; + justify-content: space-between; + gap: 16px; + } + } + + .even-condition { + background-color: colors.$grey-light; + } + + .condition-container { + display: block; + padding: 24px 16px; + + .header { + display: flex; + padding: 0px; + gap: 16px; + padding-bottom: 16px; + + color: colors.$black; + justify-content: flex-start; + } + + .grid-3 { + display: grid; + grid-template-columns: 31% 31% 31%; + grid-row-gap: 24px; + grid-column-gap: 16px; + + .full-width { + grid-column: 1/4; + } + } + } + + .no-conditions { + margin: 16px 16px; + color: colors.$grey-dark; + } + } + + .lot-table { + margin-top: 12px; + display: grid; + grid-template-columns: max-content max-content max-content 0.8fr; + grid-column-gap: 36px; + grid-row-gap: 12px; + align-items: center; + } + + .container { + margin: 32px 0; + } + + .subheading2 { + display: flex; + gap: 4px; + } + + .icon { + height: 20px; + width: 20px; + font-size: 20px; + } + + .component-labels { + white-space: pre-wrap; + } + + .inline-plan-numbers { + width: 100%; + + .editing { + width: 100%; + .mat-mdc-form-field { + width: 100%; + } + } + } +} diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/conditions/conditions.component.spec.ts b/alcs-frontend/src/app/features/notice-of-intent/decision/conditions/conditions.component.spec.ts new file mode 100644 index 0000000000..5f991f7f3b --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/conditions/conditions.component.spec.ts @@ -0,0 +1,55 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { ActivatedRoute, convertToParamMap } from '@angular/router'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { BehaviorSubject } from 'rxjs'; +import { NoticeOfIntentDecisionV2Service } from '../../../../services/notice-of-intent/decision-v2/notice-of-intent-decision-v2.service'; +import { NoticeOfIntentDetailService } from '../../../../services/notice-of-intent/notice-of-intent-detail.service'; +import { NoticeOfIntentDto } from '../../../../services/notice-of-intent/notice-of-intent.dto'; + +import { ConditionsComponent } from './conditions.component'; + +describe('ConditionsComponent', () => { + let component: ConditionsComponent; + let fixture: ComponentFixture; + let mockNOIDetailService: DeepMocked; + let mockNOIV2DecisionService: DeepMocked; + + beforeEach(async () => { + mockNOIDetailService = createMock(); + mockNOIDetailService.$noticeOfIntent = new BehaviorSubject(undefined); + + mockNOIV2DecisionService = createMock(); + + await TestBed.configureTestingModule({ + declarations: [ConditionsComponent], + providers: [ + { + provide: NoticeOfIntentDetailService, + useValue: mockNOIDetailService, + }, + { + provide: NoticeOfIntentDecisionV2Service, + useValue: mockNOIV2DecisionService, + }, + { + provide: ActivatedRoute, + useValue: { + snapshot: { + paramMap: convertToParamMap({ uuid: 'fake' }), + }, + }, + }, + ], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(ConditionsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/conditions/conditions.component.ts b/alcs-frontend/src/app/features/notice-of-intent/decision/conditions/conditions.component.ts new file mode 100644 index 0000000000..0d64ea2980 --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/conditions/conditions.component.ts @@ -0,0 +1,167 @@ +import { Component, OnInit } from '@angular/core'; +import { ActivatedRoute } from '@angular/router'; +import moment from 'moment'; +import { Subject, takeUntil } from 'rxjs'; +import { NoticeOfIntentDecisionV2Service } from '../../../../services/notice-of-intent/decision-v2/notice-of-intent-decision-v2.service'; +import { + NoticeOfIntentDecisionCodesDto, + NoticeOfIntentDecisionConditionDto, + NoticeOfIntentDecisionWithLinkedResolutionDto, +} from '../../../../services/notice-of-intent/decision/notice-of-intent-decision.dto'; +import { NoticeOfIntentDetailService } from '../../../../services/notice-of-intent/notice-of-intent-detail.service'; +import { NoticeOfIntentDto } from '../../../../services/notice-of-intent/notice-of-intent.dto'; +import { + DRAFT_DECISION_TYPE_LABEL, + MODIFICATION_TYPE_LABEL, + RECON_TYPE_LABEL, + RELEASED_DECISION_TYPE_LABEL, +} from '../../../../shared/application-type-pill/application-type-pill.constants'; + +export type ConditionComponentLabels = { + label: string[]; + componentUuid: string; + conditionUuid: string; +}; + +export type DecisionConditionWithStatus = NoticeOfIntentDecisionConditionDto & { + conditionComponentsLabels?: ConditionComponentLabels[]; + status: string; +}; + +export type DecisionWithConditionComponentLabels = NoticeOfIntentDecisionWithLinkedResolutionDto & { + conditions: DecisionConditionWithStatus[]; +}; + +export const CONDITION_STATUS = { + INCOMPLETE: 'incomplete', + COMPLETE: 'complete', + SUPERSEDED: 'superseded', +}; + +@Component({ + selector: 'app-conditions', + templateUrl: './conditions.component.html', + styleUrls: ['./conditions.component.scss'], +}) +export class ConditionsComponent implements OnInit { + $destroy = new Subject(); + + decisionUuid: string = ''; + fileNumber: string = ''; + decisions: DecisionWithConditionComponentLabels[] = []; + decision!: DecisionWithConditionComponentLabels; + noticeOfIntent: NoticeOfIntentDto | undefined; + codes!: NoticeOfIntentDecisionCodesDto; + today!: number; + + dratDecisionLabel = DRAFT_DECISION_TYPE_LABEL; + releasedDecisionLabel = RELEASED_DECISION_TYPE_LABEL; + reconLabel = RECON_TYPE_LABEL; + modificationLabel = MODIFICATION_TYPE_LABEL; + + constructor( + private noticeOfIntentDetailService: NoticeOfIntentDetailService, + private decisionService: NoticeOfIntentDecisionV2Service, + private activatedRouter: ActivatedRoute + ) { + this.today = moment().startOf('day').toDate().getTime(); + } + + ngOnInit(): void { + this.fileNumber = this.activatedRouter.parent?.parent?.snapshot.paramMap.get('fileNumber')!; + this.decisionUuid = this.activatedRouter.snapshot.paramMap.get('uuid')!; + + this.noticeOfIntentDetailService.$noticeOfIntent.pipe(takeUntil(this.$destroy)).subscribe((noticeOfIntent) => { + if (noticeOfIntent) { + this.noticeOfIntent = noticeOfIntent; + this.loadDecisions(noticeOfIntent.fileNumber); + } + }); + } + + async loadDecisions(fileNumber: string) { + this.codes = await this.decisionService.fetchCodes(); + this.decisionService.$decisions.pipe(takeUntil(this.$destroy)).subscribe((decisions) => { + this.decisions = decisions.map((decision) => { + if (decision.uuid === this.decisionUuid) { + const conditions = this.mapConditions(decision, decisions); + + this.sortConditions(decision, conditions); + + this.decision = decision as DecisionWithConditionComponentLabels; + } + + return decision as DecisionWithConditionComponentLabels; + }); + }); + + this.decisionService.loadDecisions(fileNumber); + } + + private sortConditions( + decision: NoticeOfIntentDecisionWithLinkedResolutionDto, + conditions: DecisionConditionWithStatus[] + ) { + decision.conditions = conditions.sort((a, b) => { + const order = [CONDITION_STATUS.INCOMPLETE, CONDITION_STATUS.COMPLETE, CONDITION_STATUS.SUPERSEDED]; + if (a.status === b.status) { + if (a.type && b.type) { + return a.type?.label.localeCompare(b.type.label); + } else { + return -1; + } + } else { + return order.indexOf(a.status) - order.indexOf(b.status); + } + }); + } + + private mapConditions( + decision: NoticeOfIntentDecisionWithLinkedResolutionDto, + decisions: NoticeOfIntentDecisionWithLinkedResolutionDto[] + ) { + return decision.conditions.map((condition) => { + const status = this.getStatus(condition, decision); + + return { + ...condition, + status, + conditionComponentsLabels: condition.components?.map((c) => { + const matchingType = this.codes.decisionComponentTypes.find( + (type) => type.code === c.noticeOfIntentDecisionComponentTypeCode + ); + + const componentsDecision = decisions.find((d) => d.uuid === c.noticeOfIntentDecisionUuid); + + if (componentsDecision) { + decision = componentsDecision; + } + + const label = + decision.resolutionNumber && decision.resolutionYear + ? `#${decision.resolutionNumber}/${decision.resolutionYear} ${matchingType?.label}` + : `Draft ${matchingType?.label}`; + + return { label, conditionUuid: condition.uuid, componentUuid: c.uuid }; + }), + } as DecisionConditionWithStatus; + }); + } + + private getStatus( + condition: NoticeOfIntentDecisionConditionDto, + decision: NoticeOfIntentDecisionWithLinkedResolutionDto + ) { + let status = ''; + if (condition.supersededDate && condition.supersededDate <= this.today) { + status = CONDITION_STATUS.SUPERSEDED; + } else if (condition.completionDate && condition.completionDate <= this.today) { + status = CONDITION_STATUS.COMPLETE; + } else if (!decision.isDraft) { + status = CONDITION_STATUS.INCOMPLETE; + } else { + status = ''; + } + return status; + } +} diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-dialog/decision-dialog.component.ts b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-dialog/decision-dialog.component.ts index 64224ba858..21aaa1d4fa 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-dialog/decision-dialog.component.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-dialog/decision-dialog.component.ts @@ -118,18 +118,16 @@ export class DecisionDialogComponent implements OnInit { outcomeCode: outcome!, decisionMaker: decisionMaker!, decisionMakerName: decisionMakerName!, - applicationFileNumber: this.data.fileNumber, + fileNumber: this.data.fileNumber, modifiesUuid: postDecision ?? undefined, + isDraft: false, }; try { if (this.data.existingDecision) { await this.decisionService.update(this.data.existingDecision.uuid, data); } else { - await this.decisionService.create({ - ...data, - applicationFileNumber: this.data.fileNumber, - }); + await this.decisionService.create(data); } this.dialogRef.close(true); } finally { diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v1/decision-v1.component.html b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v1/decision-v1.component.html new file mode 100644 index 0000000000..6992915501 --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v1/decision-v1.component.html @@ -0,0 +1,105 @@ +
+

Decision

+
+ +
+
+
+
No Decisions
+
+
+
+ +
+
+
+
+ Modified By:  + {{ decision.modifiedByResolutions.join(', ') }} + N/A +
+
+ +
+ + + +
+
+
+ Decision #{{ decisions.length - i }} + + + calendar_month + {{ noticeOfIntent.activeDays >= MAX_ACTIVE_DAYS ? '61+' : noticeOfIntent.activeDays }} + + + + + + Res #{{ decision.resolutionNumber }}/{{ decision.resolutionYear }} +
+
+
+
Decision Date
+ {{ decision.date | momentFormat }} +
+
+
Decision Outcome
+ {{ decision.outcome.label }} +
+
+
Decision Maker
+ {{ decision.decisionMaker }} +
+
+
Decision Maker Name
+ {{ decision.decisionMakerName ?? 'No Data' }} +
+
+
Audit Date
+ {{ decision.auditDate | momentFormat }} + + + +
+
+
Documents
+
+
File Name
+
File Upload Date
+
File Actions
+
No Documents
+ + +
{{ document.uploadedAt | momentFormat }}
+
+ + +
+ +
+
+
+
diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v1/decision-v1.component.scss b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v1/decision-v1.component.scss new file mode 100644 index 0000000000..f80d0c776b --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v1/decision-v1.component.scss @@ -0,0 +1,142 @@ +@use '../../../../../styles/colors'; + +h3 { + margin-bottom: 24px !important; +} + +section { + margin-bottom: 64px; +} + +.decision-container { + position: relative; +} + +.decision { + margin: 24px 0; + box-shadow: 0 2px 8px 1px rgba(0, 0, 0, 0.25); +} + +.loading-overlay { + position: absolute; + z-index: 2; + background-color: colors.$grey; + opacity: 0.4; + width: 100%; + height: 100%; + display: flex; + align-items: center; + justify-content: center; +} + +.days { + display: inline-block; + margin-right: 16px; + margin-left: 16px; + + .mat-icon { + font-size: 19px !important; + line-height: 21px !important; + width: 19px; + vertical-align: middle; + } +} + +.post-decisions { + padding: 6px 32px; + background-color: colors.$grey-light; + grid-template-columns: 1fr 1fr; + display: grid; + min-height: 36px; + text-transform: uppercase; + border-radius: 4px 4px 0 0; + box-shadow: -1px 1px 4px rgba(0, 0, 0, 0.25); +} + +.decision-menu { + position: absolute; + top: 0; + right: 0; + height: 36px; + background: colors.$accent-color; + box-shadow: -1px 1px 4px rgba(0, 0, 0, 0.25); + border-radius: 0 4px 0 10px; + + button { + color: colors.$white; + width: 36px; + height: 36px; + line-height: 36px; + } + + mat-icon { + position: absolute; + top: 8px; + left: 8px; + font-size: 21px; + width: 20px; + height: 36px; + } +} + +.decision-padding { + padding: 18px 32px 32px 32px; +} + +.decision-content { + margin-top: 16px; + margin-bottom: 32px; + margin-right: 100px; + display: grid; + grid-template-columns: 1fr 1fr; + grid-row-gap: 24px; + + .subheading2 { + margin-bottom: 6px !important; + } + + & > div { + font-size: 16px; + } +} + +.decision-documents { + margin-top: 4px; + display: grid; + grid-template-columns: 1fr 1fr 100px; + grid-row-gap: 4px; + + div { + display: flex; + align-items: center; + font-size: 16px !important; + } +} + +.file-actions { + margin-left: -12px; +} + +.delete-file-icon { + color: colors.$error-color; +} + +.no-decisions { + margin-top: 16px; + display: flex; + align-items: center; + justify-content: center; + background-color: colors.$grey-light; + height: 72px; +} + +.no-files { + grid-column: 1/4; + margin-top: 16px; + padding: 16px; + display: flex; + align-items: center; + justify-content: center; + text-align: center; + background-color: colors.$grey-light; +} diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v1/decision-v1.component.spec.ts b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v1/decision-v1.component.spec.ts new file mode 100644 index 0000000000..900a5dcadc --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v1/decision-v1.component.spec.ts @@ -0,0 +1,64 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { MatDialog, MatDialogRef } from '@angular/material/dialog'; +import { MatSnackBarModule } from '@angular/material/snack-bar'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { BehaviorSubject } from 'rxjs'; +import { NoticeOfIntentDecisionService } from '../../../../services/notice-of-intent/decision/notice-of-intent-decision.service'; +import { NoticeOfIntentDetailService } from '../../../../services/notice-of-intent/notice-of-intent-detail.service'; +import { NoticeOfIntentDto } from '../../../../services/notice-of-intent/notice-of-intent.dto'; +import { ToastService } from '../../../../services/toast/toast.service'; +import { ConfirmationDialogService } from '../../../../shared/confirmation-dialog/confirmation-dialog.service'; + +import { DecisionV1Component } from './decision-v1.component'; + +describe('DecisionComponent', () => { + let component: DecisionV1Component; + let fixture: ComponentFixture; + let mockNOIDetailService: DeepMocked; + + beforeEach(async () => { + mockNOIDetailService = createMock(); + mockNOIDetailService.$noticeOfIntent = new BehaviorSubject(undefined); + + await TestBed.configureTestingModule({ + imports: [MatSnackBarModule], + declarations: [DecisionV1Component], + providers: [ + { + provide: NoticeOfIntentDetailService, + useValue: mockNOIDetailService, + }, + { + provide: NoticeOfIntentDecisionService, + useValue: {}, + }, + { + provide: MatDialogRef, + useValue: {}, + }, + { + provide: ConfirmationDialogService, + useValue: {}, + }, + { + provide: ToastService, + useValue: {}, + }, + { + provide: MatDialog, + useValue: {}, + }, + ], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(DecisionV1Component); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v1/decision-v1.component.ts b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v1/decision-v1.component.ts new file mode 100644 index 0000000000..22c087f4c1 --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v1/decision-v1.component.ts @@ -0,0 +1,208 @@ +import { Component, OnDestroy, OnInit } from '@angular/core'; +import { MatDialog } from '@angular/material/dialog'; +import { Subject, takeUntil } from 'rxjs'; +import { + NoticeOfIntentDecisionDto, + NoticeOfIntentDecisionOutcomeCodeDto, +} from '../../../../services/notice-of-intent/decision/notice-of-intent-decision.dto'; +import { NoticeOfIntentDecisionService } from '../../../../services/notice-of-intent/decision/notice-of-intent-decision.service'; +import { NoticeOfIntentDetailService } from '../../../../services/notice-of-intent/notice-of-intent-detail.service'; +import { NoticeOfIntentDto } from '../../../../services/notice-of-intent/notice-of-intent.dto'; +import { ToastService } from '../../../../services/toast/toast.service'; +import { MODIFICATION_TYPE_LABEL } from '../../../../shared/application-type-pill/application-type-pill.constants'; +import { ConfirmationDialogService } from '../../../../shared/confirmation-dialog/confirmation-dialog.service'; +import { formatDateForApi } from '../../../../shared/utils/api-date-formatter'; +import { DecisionDialogComponent } from '../decision-dialog/decision-dialog.component'; + +type LoadingDecision = NoticeOfIntentDecisionDto & { + modifiedByResolutions: string[]; + loading: boolean; +}; + +@Component({ + selector: 'app-noi-decision-v1', + templateUrl: './decision-v1.component.html', + styleUrls: ['./decision-v1.component.scss'], +}) +export class DecisionV1Component implements OnInit, OnDestroy { + $destroy = new Subject(); + fileNumber: string = ''; + decisionDate: number | undefined; + decisions: LoadingDecision[] = []; + outcomes: NoticeOfIntentDecisionOutcomeCodeDto[] = []; + isPaused = true; + MAX_ACTIVE_DAYS = 61; + + noticeOfIntent: NoticeOfIntentDto | undefined; + modificationLabel = MODIFICATION_TYPE_LABEL; + + constructor( + public dialog: MatDialog, + private noticeOfIntentDetailService: NoticeOfIntentDetailService, + private decisionService: NoticeOfIntentDecisionService, + private toastService: ToastService, + private confirmationDialogService: ConfirmationDialogService + ) {} + + ngOnInit(): void { + this.noticeOfIntentDetailService.$noticeOfIntent.pipe(takeUntil(this.$destroy)).subscribe((noticeOfIntent) => { + if (noticeOfIntent) { + this.fileNumber = noticeOfIntent.fileNumber; + this.decisionDate = noticeOfIntent.decisionDate; + this.isPaused = noticeOfIntent.paused; + this.loadDecisions(noticeOfIntent.fileNumber); + this.noticeOfIntent = noticeOfIntent; + } + }); + } + + async loadDecisions(fileNumber: string) { + const codes = await this.decisionService.fetchCodes(); + this.outcomes = codes.outcomes; + + const loadedDecision = await this.decisionService.fetchByFileNumber(fileNumber); + + this.decisions = loadedDecision.map((decision) => ({ + ...decision, + loading: false, + modifiedByResolutions: decision.modifiedBy?.flatMap((r) => r.linkedResolutions) || [], + })); + } + + onCreate() { + let minDate = new Date(0); + if (this.decisions.length > 0) { + minDate = new Date(this.decisions[this.decisions.length - 1].date); + } + + this.dialog + .open(DecisionDialogComponent, { + minWidth: '600px', + maxWidth: '900px', + maxHeight: '80vh', + width: '90%', + autoFocus: false, + data: { + isFirstDecision: this.decisions.length === 0, + minDate, + fileNumber: this.fileNumber, + outcomes: this.outcomes, + }, + }) + .afterClosed() + .subscribe((didCreate) => { + if (didCreate) { + this.noticeOfIntentDetailService.load(this.fileNumber); + } + }); + } + + onEdit(decision: LoadingDecision) { + const decisionIndex = this.decisions.indexOf(decision); + let minDate = new Date(0); + if (decisionIndex !== this.decisions.length - 1) { + minDate = new Date(this.decisions[this.decisions.length - 1].date); + } + this.dialog + .open(DecisionDialogComponent, { + minWidth: '600px', + maxWidth: '900px', + maxHeight: '80vh', + width: '90%', + autoFocus: false, + data: { + isFirstDecision: decisionIndex === this.decisions.length - 1, + minDate, + fileNumber: this.fileNumber, + outcomes: this.outcomes, + existingDecision: decision, + }, + }) + .afterClosed() + .subscribe((didModify) => { + if (didModify) { + this.noticeOfIntentDetailService.load(this.fileNumber); + } + }); + } + + async deleteDecision(uuid: string) { + this.confirmationDialogService + .openDialog({ + body: 'Are you sure you want to delete the selected decision?', + }) + .subscribe(async (confirmed) => { + if (confirmed) { + this.decisions = this.decisions.map((decision) => { + return { + ...decision, + loading: decision.uuid === uuid, + }; + }); + await this.decisionService.delete(uuid); + await this.noticeOfIntentDetailService.load(this.fileNumber); + this.toastService.showSuccessToast('Decision deleted'); + } + }); + } + + async attachFile(decisionUuid: string, event: Event) { + this.decisions = this.decisions.map((decision) => { + return { + ...decision, + loading: decision.uuid === decisionUuid, + }; + }); + const element = event.target as HTMLInputElement; + const fileList = element.files; + if (fileList && fileList.length > 0) { + const file: File = fileList[0]; + const uploadedFile = await this.decisionService.uploadFile(decisionUuid, file); + if (uploadedFile) { + await this.loadDecisions(this.fileNumber); + } + } + } + + async downloadFile(decisionUuid: string, decisionDocumentUuid: string, fileName: string) { + await this.decisionService.downloadFile(decisionUuid, decisionDocumentUuid, fileName, false); + } + + async openFile(decisionUuid: string, decisionDocumentUuid: string, fileName: string) { + await this.decisionService.downloadFile(decisionUuid, decisionDocumentUuid, fileName); + } + + async deleteFile(decisionUuid: string, decisionDocumentUuid: string, fileName: string) { + this.confirmationDialogService + .openDialog({ + body: `Are you sure you want to delete the file ${fileName}?`, + }) + .subscribe(async (confirmed) => { + if (confirmed) { + this.decisions = this.decisions.map((decision) => { + return { + ...decision, + loading: decision.uuid === decisionUuid, + }; + }); + + await this.decisionService.deleteFile(decisionUuid, decisionDocumentUuid); + await this.loadDecisions(this.fileNumber); + this.toastService.showSuccessToast('File deleted'); + } + }); + } + + async onSaveAuditDate(decisionUuid: string, auditReviewDate: number) { + await this.decisionService.update(decisionUuid, { + isDraft: false, + auditDate: formatDateForApi(auditReviewDate), + }); + await this.loadDecisions(this.fileNumber); + } + + ngOnDestroy(): void { + this.$destroy.next(); + this.$destroy.complete(); + } +} diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/basic/basic.component.html b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/basic/basic.component.html new file mode 100644 index 0000000000..995cbe4c53 --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/basic/basic.component.html @@ -0,0 +1,7 @@ +
+
ALR Area Impacted (ha)
+ +
diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/basic/basic.component.scss b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/basic/basic.component.scss new file mode 100644 index 0000000000..e69de29bb2 diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/basic/basic.component.spec.ts b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/basic/basic.component.spec.ts new file mode 100644 index 0000000000..f31dc65a8a --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/basic/basic.component.spec.ts @@ -0,0 +1,26 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { NoticeOfIntentDecisionComponentDto } from '../../../../../../services/notice-of-intent/decision/notice-of-intent-decision.dto'; + +import { BasicComponent } from './basic.component'; + +describe('BasicComponent', () => { + let component: BasicComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [BasicComponent], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(BasicComponent); + component = fixture.componentInstance; + component.component = {} as NoticeOfIntentDecisionComponentDto; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/basic/basic.component.ts b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/basic/basic.component.ts new file mode 100644 index 0000000000..d642d55165 --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/basic/basic.component.ts @@ -0,0 +1,19 @@ +import { Component, EventEmitter, Input, Output } from '@angular/core'; +import { NoticeOfIntentDecisionComponentDto } from '../../../../../../services/notice-of-intent/decision/notice-of-intent-decision.dto'; + +@Component({ + selector: 'app-basic', + templateUrl: './basic.component.html', + styleUrls: ['./basic.component.scss'], +}) +export class BasicComponent { + @Input() component!: NoticeOfIntentDecisionComponentDto; + @Input() fillRow = false; + @Output() saveAlrArea = new EventEmitter(); + + constructor() {} + + async onSaveAlrArea(alrArea: string | null) { + this.saveAlrArea.emit(alrArea); + } +} diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/pfrs/pfrs.component.html b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/pfrs/pfrs.component.html new file mode 100644 index 0000000000..87b04a95bc --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/pfrs/pfrs.component.html @@ -0,0 +1,112 @@ + +
+
Use End Date
+ {{ component.endDate | date }} + +
+
+
Type of soil approved to be removed
+
{{ component.soilTypeRemoved }}
+ +
+
+
Type, origin and quality of fill proposed to be placed
+
{{ component.soilFillTypeToPlace }}
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Soil to be RemovedFill to be Placed
Volume + {{ component.soilToRemoveVolume }} m3 + + + {{ component.soilToPlaceVolume }} m3 + +
+ Area +
Note: 0.01 ha is 100m2
+ 		+ + {{ component.soilToRemoveArea }} ha + + + {{ component.soilToPlaceArea }} ha + +
Maximum Depth + {{ component.soilToRemoveMaximumDepth }} m + + + {{ component.soilToPlaceMaximumDepth }} m + +
Average Depth + {{ component.soilToRemoveAverageDepth }} m + + + + {{ component.soilToPlaceAverageDepth }} m + +
+
diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/pfrs/pfrs.component.scss b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/pfrs/pfrs.component.scss new file mode 100644 index 0000000000..e69de29bb2 diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/pfrs/pfrs.component.spec.ts b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/pfrs/pfrs.component.spec.ts new file mode 100644 index 0000000000..c1a21e1f61 --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/pfrs/pfrs.component.spec.ts @@ -0,0 +1,26 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { NoticeOfIntentDecisionComponentDto } from '../../../../../../services/notice-of-intent/decision/notice-of-intent-decision.dto'; + +import { PfrsComponent } from './pfrs.component'; + +describe('PfrsComponent', () => { + let component: PfrsComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [PfrsComponent], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(PfrsComponent); + component = fixture.componentInstance; + component.component = {} as NoticeOfIntentDecisionComponentDto; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/pfrs/pfrs.component.ts b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/pfrs/pfrs.component.ts new file mode 100644 index 0000000000..b97670a565 --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/pfrs/pfrs.component.ts @@ -0,0 +1,11 @@ +import { Component, Input } from '@angular/core'; +import { NoticeOfIntentDecisionComponentDto } from '../../../../../../services/notice-of-intent/decision/notice-of-intent-decision.dto'; + +@Component({ + selector: 'app-pfrs', + templateUrl: './pfrs.component.html', + styleUrls: ['./pfrs.component.scss'], +}) +export class PfrsComponent { + @Input() component!: NoticeOfIntentDecisionComponentDto; +} diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/pofo/pofo.component.html b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/pofo/pofo.component.html new file mode 100644 index 0000000000..f6960c3d2b --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/pofo/pofo.component.html @@ -0,0 +1,70 @@ + +
+
Use End Date
+ {{ component.endDate | date }} + +
+
+
Type, origin and quality of fill proposed to be placed
+
{{ component.soilFillTypeToPlace }}
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + +
Fill to be Placed
Volume + + {{ component.soilToPlaceVolume }} m3 + + +
+ Area +
Note: 0.01 ha is 100m2
+ 		+ + {{ component.soilToPlaceArea }} ha + + +
Maximum Depth + + {{ component.soilToPlaceMaximumDepth }} m + + +
Average Depth + {{ component.soilToPlaceAverageDepth }} m + +
+
diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/pofo/pofo.component.scss b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/pofo/pofo.component.scss new file mode 100644 index 0000000000..e69de29bb2 diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/pofo/pofo.component.spec.ts b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/pofo/pofo.component.spec.ts new file mode 100644 index 0000000000..f0e65a2b36 --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/pofo/pofo.component.spec.ts @@ -0,0 +1,26 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { NoticeOfIntentDecisionComponentDto } from '../../../../../../services/notice-of-intent/decision/notice-of-intent-decision.dto'; + +import { PofoComponent } from './pofo.component'; + +describe('PofoComponent', () => { + let component: PofoComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [PofoComponent], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(PofoComponent); + component = fixture.componentInstance; + component.component = {} as NoticeOfIntentDecisionComponentDto; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/pofo/pofo.component.ts b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/pofo/pofo.component.ts new file mode 100644 index 0000000000..d8082846da --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/pofo/pofo.component.ts @@ -0,0 +1,11 @@ +import { Component, Input } from '@angular/core'; +import { NoticeOfIntentDecisionComponentDto } from '../../../../../../services/notice-of-intent/decision/notice-of-intent-decision.dto'; + +@Component({ + selector: 'app-pofo', + templateUrl: './pofo.component.html', + styleUrls: ['./pofo.component.scss'], +}) +export class PofoComponent { + @Input() component!: NoticeOfIntentDecisionComponentDto; +} diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/roso/roso.component.html b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/roso/roso.component.html new file mode 100644 index 0000000000..52a9c85e0e --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/roso/roso.component.html @@ -0,0 +1,65 @@ + +
+
Use End Date
+ {{ component.endDate | date }} + +
+
+
Type of soil approved to be removed
+
{{ component.soilTypeRemoved }}
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + +
Soil to be Removed
Volume + {{ component.soilToRemoveVolume }} m3 + +
Area + + {{ component.soilToRemoveArea }} ha + + +
Maximum Depth + {{ component.soilToRemoveMaximumDepth }} m + +
Average Depth + {{ component.soilToRemoveAverageDepth }} m + +
+
diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/roso/roso.component.scss b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/roso/roso.component.scss new file mode 100644 index 0000000000..e69de29bb2 diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/roso/roso.component.spec.ts b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/roso/roso.component.spec.ts new file mode 100644 index 0000000000..d89da3b470 --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/roso/roso.component.spec.ts @@ -0,0 +1,26 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { NoticeOfIntentDecisionComponentDto } from '../../../../../../services/notice-of-intent/decision/notice-of-intent-decision.dto'; + +import { RosoComponent } from './roso.component'; + +describe('RosoComponent', () => { + let component: RosoComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [RosoComponent], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(RosoComponent); + component = fixture.componentInstance; + component.component = {} as NoticeOfIntentDecisionComponentDto; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/roso/roso.component.ts b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/roso/roso.component.ts new file mode 100644 index 0000000000..773423f87f --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/roso/roso.component.ts @@ -0,0 +1,11 @@ +import { Component, Input } from '@angular/core'; +import { NoticeOfIntentDecisionComponentDto } from '../../../../../../services/notice-of-intent/decision/notice-of-intent-decision.dto'; + +@Component({ + selector: 'app-roso', + templateUrl: './roso.component.html', + styleUrls: ['./roso.component.scss'], +}) +export class RosoComponent { + @Input() component!: NoticeOfIntentDecisionComponentDto; +} diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-documents/decision-documents.component.html b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-documents/decision-documents.component.html new file mode 100644 index 0000000000..cb3638941a --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-documents/decision-documents.component.html @@ -0,0 +1,70 @@ +
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
TypeDECPACKDocument Name + {{ element.fileName }} + SourceALC + Visibility +
* = Pending
+ 		+ A*, + C*, + G*, + P* + Upload Date{{ element.uploadedAt | date }}File Actions + + + +
No Documents
diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-documents/decision-documents.component.scss b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-documents/decision-documents.component.scss new file mode 100644 index 0000000000..dbb564d787 --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-documents/decision-documents.component.scss @@ -0,0 +1,37 @@ +@use '../../../../../../styles/colors'; + +.documents { + margin-top: 12px; + border-collapse: collapse; +} + +.upload-button { + width: 100%; + margin: 4px 0 12px !important; +} + +.mat-mdc-no-data-row { + height: 56px; + color: colors.$grey-dark; +} + +a { + word-break: break-all; +} + +table { + box-shadow: none; + + th { + font-weight: 700; + padding-bottom: 16px; + position: relative; + + .subheading { + font-size: 11px; + line-height: 16px; + font-weight: 400; + position: absolute; + } + } +} diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-documents/decision-documents.component.spec.ts b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-documents/decision-documents.component.spec.ts new file mode 100644 index 0000000000..2eb09e08dc --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-documents/decision-documents.component.spec.ts @@ -0,0 +1,52 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { MatDialog } from '@angular/material/dialog'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { BehaviorSubject } from 'rxjs'; +import { NoticeOfIntentDecisionV2Service } from '../../../../../services/notice-of-intent/decision-v2/notice-of-intent-decision-v2.service'; +import { NoticeOfIntentDecisionDto } from '../../../../../services/notice-of-intent/decision/notice-of-intent-decision.dto'; +import { ToastService } from '../../../../../services/toast/toast.service'; + +import { DecisionDocumentsComponent } from './decision-documents.component'; + +describe('DecisionDocumentsComponent', () => { + let component: DecisionDocumentsComponent; + let fixture: ComponentFixture; + let mockNOIDecService: DeepMocked; + let mockDialog: DeepMocked; + let mockToastService: DeepMocked; + + beforeEach(async () => { + mockNOIDecService = createMock(); + mockDialog = createMock(); + mockToastService = createMock(); + mockNOIDecService.$decision = new BehaviorSubject(undefined); + + await TestBed.configureTestingModule({ + declarations: [DecisionDocumentsComponent], + providers: [ + { + provide: NoticeOfIntentDecisionV2Service, + useValue: mockNOIDecService, + }, + { + provide: MatDialog, + useValue: mockDialog, + }, + { + provide: ToastService, + useValue: mockToastService, + }, + ], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(DecisionDocumentsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-documents/decision-documents.component.ts b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-documents/decision-documents.component.ts new file mode 100644 index 0000000000..70aa70d30d --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-documents/decision-documents.component.ts @@ -0,0 +1,114 @@ +import { Component, EventEmitter, Input, OnDestroy, OnInit, Output, ViewChild } from '@angular/core'; +import { MatDialog } from '@angular/material/dialog'; +import { MatSort } from '@angular/material/sort'; +import { MatTableDataSource } from '@angular/material/table'; +import { Subject, takeUntil } from 'rxjs'; +import { DecisionDocumentDto } from '../../../../../services/application/decision/application-decision-v1/application-decision.dto'; +import { NoticeOfIntentDecisionV2Service } from '../../../../../services/notice-of-intent/decision-v2/notice-of-intent-decision-v2.service'; +import { NoticeOfIntentDecisionDto } from '../../../../../services/notice-of-intent/decision/notice-of-intent-decision.dto'; +import { ToastService } from '../../../../../services/toast/toast.service'; +import { ConfirmationDialogService } from '../../../../../shared/confirmation-dialog/confirmation-dialog.service'; +import { DecisionDocumentUploadDialogComponent } from '../decision-input/decision-file-upload-dialog/decision-document-upload-dialog.component'; + +@Component({ + selector: 'app-decision-documents', + templateUrl: './decision-documents.component.html', + styleUrls: ['./decision-documents.component.scss'], +}) +export class DecisionDocumentsComponent implements OnInit, OnDestroy { + $destroy = new Subject(); + + @Input() editable = true; + @Input() loadData = true; + @Input() decision: NoticeOfIntentDecisionDto | undefined; + @Input() showError = false; + @Output() beforeDocumentUpload = new EventEmitter(); + + displayedColumns: string[] = ['type', 'fileName', 'source', 'visibilityFlags', 'uploadedAt', 'actions']; + documents: DecisionDocumentDto[] = []; + private fileId = ''; + + @ViewChild(MatSort) sort!: MatSort; + dataSource: MatTableDataSource = new MatTableDataSource(); + + constructor( + private decisionService: NoticeOfIntentDecisionV2Service, + private dialog: MatDialog, + private toastService: ToastService, + private confirmationDialogService: ConfirmationDialogService + ) {} + + ngOnInit(): void { + if (this.decision && !this.loadData) { + this.dataSource = new MatTableDataSource(this.decision.documents); + } + this.decisionService.$decision.pipe(takeUntil(this.$destroy)).subscribe((decision) => { + if (decision) { + this.dataSource = new MatTableDataSource(decision.documents); + this.decision = decision; + } + }); + } + + async openFile(fileUuid: string, fileName: string) { + if (this.decision) { + await this.decisionService.downloadFile(this.decision.uuid, fileUuid, fileName); + } + } + + async downloadFile(fileUuid: string, fileName: string) { + if (this.decision) { + await this.decisionService.downloadFile(this.decision.uuid, fileUuid, fileName, false); + } + } + + async onUploadFile() { + this.beforeDocumentUpload.emit(); + this.openFileDialog(); + } + + onEditFile(element: DecisionDocumentDto) { + this.openFileDialog(element); + } + + private openFileDialog(existingDocument?: DecisionDocumentDto) { + if (this.decision) { + this.dialog + .open(DecisionDocumentUploadDialogComponent, { + minWidth: '600px', + maxWidth: '800px', + width: '70%', + data: { + fileId: this.fileId, + decisionUuid: this.decision?.uuid, + existingDocument: existingDocument, + }, + }) + .beforeClosed() + .subscribe((isDirty: boolean) => { + if (isDirty && this.decision) { + this.decisionService.loadDecision(this.decision.uuid); + } + }); + } + } + + onDeleteFile(element: DecisionDocumentDto) { + this.confirmationDialogService + .openDialog({ + body: 'Are you sure you want to delete the selected file?', + }) + .subscribe(async (accepted) => { + if (accepted && this.decision) { + await this.decisionService.deleteFile(this.decision.uuid, element.uuid); + await this.decisionService.loadDecision(this.decision.uuid); + this.toastService.showSuccessToast('Document deleted'); + } + }); + } + + ngOnDestroy(): void { + this.$destroy.next(); + this.$destroy.complete(); + } +} diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.html b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.html new file mode 100644 index 0000000000..f8601a7b5a --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.html @@ -0,0 +1,57 @@ +
+
{{ data.noticeOfIntentDecisionComponentType?.label }}
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+ +
+ + + Ag Cap Map + + + + + Ag Cap Consultant + + +
+
diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.scss b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.scss new file mode 100644 index 0000000000..e69de29bb2 diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.spec.ts b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.spec.ts new file mode 100644 index 0000000000..a8d6f1024d --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.spec.ts @@ -0,0 +1,32 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { ToastService } from '../../../../../../../services/toast/toast.service'; + +import { DecisionComponentComponent } from './decision-component.component'; + +describe('DecisionComponentComponent', () => { + let component: DecisionComponentComponent; + let fixture: ComponentFixture; + let mockToastService: DeepMocked; + + beforeEach(async () => { + mockToastService = createMock(); + + await TestBed.configureTestingModule({ + declarations: [DecisionComponentComponent], + providers: [{ provide: ToastService, useValue: mockToastService }], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(DecisionComponentComponent); + component = fixture.componentInstance; + component.data = { noticeOfIntentDecisionComponentTypeCode: '' }; + + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.ts b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.ts new file mode 100644 index 0000000000..4d6e98e313 --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.ts @@ -0,0 +1,213 @@ +import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; +import { FormControl, FormGroup, Validators } from '@angular/forms'; +import { + NOI_DECISION_COMPONENT_TYPE, + NoticeOfIntentDecisionCodesDto, + NoticeOfIntentDecisionComponentDto, + NoticeOfIntentDecisionComponentTypeDto, + PofoDecisionComponentDto, + RosoDecisionComponentDto, +} from '../../../../../../../services/notice-of-intent/decision/notice-of-intent-decision.dto'; +import { ToastService } from '../../../../../../../services/toast/toast.service'; +import { AG_CAP_OPTIONS, AG_CAP_SOURCE_OPTIONS } from '../../../../../../../shared/dto/ag-cap.types.dto'; +import { formatDateForApi } from '../../../../../../../shared/utils/api-date-formatter'; + +@Component({ + selector: 'app-decision-component', + templateUrl: './decision-component.component.html', + styleUrls: ['./decision-component.component.scss'], +}) +export class DecisionComponentComponent implements OnInit { + @Input() data!: NoticeOfIntentDecisionComponentDto; + @Input() codes!: NoticeOfIntentDecisionCodesDto; + @Output() dataChange = new EventEmitter(); + @Output() remove = new EventEmitter(); + + COMPONENT_TYPE = NOI_DECISION_COMPONENT_TYPE; + + agCapOptions = AG_CAP_OPTIONS; + agCapSourceOptions = AG_CAP_SOURCE_OPTIONS; + + // pofo, pfrs + fillTypeToPlace = new FormControl(null, [Validators.required]); + volumeToPlace = new FormControl(null, [Validators.required]); + areaToPlace = new FormControl(null, [Validators.required]); + maximumDepthToPlace = new FormControl(null, [Validators.required]); + averageDepthToPlace = new FormControl(null, [Validators.required]); + + // roso, pfrs + soilTypeRemoved = new FormControl(null, [Validators.required]); + volumeToRemove = new FormControl(null, [Validators.required]); + areaToRemove = new FormControl(null, [Validators.required]); + maximumDepthToRemove = new FormControl(null, [Validators.required]); + averageDepthToRemove = new FormControl(null, [Validators.required]); + + // general + endDate = new FormControl(null, [Validators.required]); + alrArea = new FormControl(null, [Validators.required]); + agCap = new FormControl(null, [Validators.required]); + agCapSource = new FormControl(null, [Validators.required]); + agCapMap = new FormControl(null); + agCapConsultant = new FormControl(null); + + form: FormGroup = new FormGroup({ + alrArea: this.alrArea, + agCap: this.agCap, + agCapSource: this.agCapSource, + agCapMap: this.agCapMap, + agCapConsultant: this.agCapConsultant, + }); + + constructor(private toastService: ToastService) {} + + ngOnInit(): void { + if (this.data) { + this.alrArea.setValue(this.data.alrArea ? this.data.alrArea : null); + this.agCap.setValue(this.data.agCap ? this.data.agCap : null); + this.agCapSource.setValue(this.data.agCapSource ? this.data.agCapSource : null); + this.agCapMap.setValue(this.data.agCapMap ? this.data.agCapMap : null); + this.agCapConsultant.setValue(this.data.agCapConsultant ? this.data.agCapConsultant : null); + + switch (this.data.noticeOfIntentDecisionComponentTypeCode) { + case NOI_DECISION_COMPONENT_TYPE.POFO: + this.patchPofoFields(); + break; + case NOI_DECISION_COMPONENT_TYPE.ROSO: + this.patchRosoFields(); + break; + case NOI_DECISION_COMPONENT_TYPE.PFRS: + this.patchPofoFields(); + this.patchRosoFields(); + break; + default: + this.toastService.showErrorToast('Wrong decision component type'); + break; + } + } + + this.onFormValueChanges(); + } + + private onFormValueChanges() { + this.form.valueChanges.subscribe((changes) => { + let dataChange = { + alrArea: this.alrArea.value ? this.alrArea.value : null, + agCap: this.agCap.value ? this.agCap.value : null, + agCapSource: this.agCapSource.value ? this.agCapSource.value : null, + agCapMap: this.agCapMap.value ? this.agCapMap.value : null, + agCapConsultant: this.agCapConsultant.value ? this.agCapConsultant.value : null, + noticeOfIntentDecisionComponentTypeCode: this.data.noticeOfIntentDecisionComponentTypeCode, + noticeOfIntentDecisionComponentType: this.codes.decisionComponentTypes.find( + (e) => e.code === this.data.noticeOfIntentDecisionComponentTypeCode + )!, + noticeOfIntentDecisionUuid: this.data.uuid, + uuid: this.data.uuid, + }; + + const componentData = this.getComponentData(dataChange); + this.dataChange.emit(componentData); + }); + } + + private getComponentData(dataChange: { + alrArea: number | null; + agCap: string | null; + agCapSource: string | null; + agCapMap: string | null; + agCapConsultant: string | null; + noticeOfIntentDecisionComponentTypeCode: string; + noticeOfIntentDecisionComponentType: NoticeOfIntentDecisionComponentTypeDto; + noticeOfIntentDecisionUuid: string | undefined; + uuid: string | undefined; + }): NoticeOfIntentDecisionComponentDto { + switch (dataChange.noticeOfIntentDecisionComponentTypeCode) { + case NOI_DECISION_COMPONENT_TYPE.POFO: + dataChange = { ...dataChange, ...this.getPofoDataChange() }; + break; + case NOI_DECISION_COMPONENT_TYPE.ROSO: + dataChange = { ...dataChange, ...this.getRosoDataChange() }; + break; + case NOI_DECISION_COMPONENT_TYPE.PFRS: + dataChange = { ...dataChange, ...this.getPfrsDataChange() }; + break; + default: + this.toastService.showErrorToast('Wrong decision component type'); + break; + } + return dataChange; + } + + private patchPofoFields() { + this.form.addControl('endDate', this.endDate); + this.form.addControl('fillTypeToPlace', this.fillTypeToPlace); + this.form.addControl('areaToPlace', this.areaToPlace); + this.form.addControl('volumeToPlace', this.volumeToPlace); + this.form.addControl('maximumDepthToPlace', this.maximumDepthToPlace); + this.form.addControl('averageDepthToPlace', this.averageDepthToPlace); + + this.endDate.setValue(this.data.endDate ? new Date(this.data.endDate) : null); + this.fillTypeToPlace.setValue(this.data.soilFillTypeToPlace ?? null); + this.areaToPlace.setValue(this.data.soilToPlaceArea ?? null); + this.volumeToPlace.setValue(this.data.soilToPlaceVolume ?? null); + this.maximumDepthToPlace.setValue(this.data.soilToPlaceMaximumDepth ?? null); + this.averageDepthToPlace.setValue(this.data.soilToPlaceAverageDepth ?? null); + } + + private patchRosoFields() { + this.form.addControl('endDate', this.endDate); + this.form.addControl('soilTypeRemoved', this.soilTypeRemoved); + this.form.addControl('areaToRemove', this.areaToRemove); + this.form.addControl('volumeToRemove', this.volumeToRemove); + this.form.addControl('maximumDepthToRemove', this.maximumDepthToRemove); + this.form.addControl('averageDepthToRemove', this.averageDepthToRemove); + + this.endDate.setValue(this.data.endDate ? new Date(this.data.endDate) : null); + this.soilTypeRemoved.setValue(this.data.soilTypeRemoved ?? null); + this.areaToRemove.setValue(this.data.soilToRemoveArea ?? null); + this.volumeToRemove.setValue(this.data.soilToRemoveVolume ?? null); + this.maximumDepthToRemove.setValue(this.data.soilToRemoveMaximumDepth ?? null); + this.averageDepthToRemove.setValue(this.data.soilToRemoveAverageDepth ?? null); + } + + private getPofoDataChange(): PofoDecisionComponentDto { + return { + endDate: this.endDate.value ? formatDateForApi(this.endDate.value) : null, + soilFillTypeToPlace: this.fillTypeToPlace.value ?? null, + soilToPlaceArea: this.areaToPlace.value ?? null, + soilToPlaceVolume: this.volumeToPlace.value ?? null, + soilToPlaceMaximumDepth: this.maximumDepthToPlace.value ?? null, + soilToPlaceAverageDepth: this.averageDepthToPlace.value ?? null, + }; + } + + private getRosoDataChange(): RosoDecisionComponentDto { + return { + endDate: this.endDate.value ? formatDateForApi(this.endDate.value) : null, + soilTypeRemoved: this.soilTypeRemoved.value ?? null, + soilToRemoveArea: this.areaToRemove.value ?? null, + soilToRemoveVolume: this.volumeToRemove.value ?? null, + soilToRemoveMaximumDepth: this.maximumDepthToRemove.value ?? null, + soilToRemoveAverageDepth: this.averageDepthToRemove.value ?? null, + }; + } + + private getPfrsDataChange(): RosoDecisionComponentDto & PofoDecisionComponentDto { + return { + endDate: this.endDate.value ? formatDateForApi(this.endDate.value) : null, + soilTypeRemoved: this.soilTypeRemoved.value ?? null, + soilToRemoveArea: this.areaToRemove.value ?? null, + soilToRemoveVolume: this.volumeToRemove.value ?? null, + soilToRemoveMaximumDepth: this.maximumDepthToRemove.value ?? null, + soilToRemoveAverageDepth: this.averageDepthToRemove.value ?? null, + soilFillTypeToPlace: this.fillTypeToPlace.value ?? null, + soilToPlaceArea: this.areaToPlace.value ?? null, + soilToPlaceVolume: this.volumeToPlace.value ?? null, + soilToPlaceMaximumDepth: this.maximumDepthToPlace.value ?? null, + soilToPlaceAverageDepth: this.averageDepthToPlace.value ?? null, + }; + } + + onRemove() { + this.remove.emit(); + } +} diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/pfrs-input/pfrs-input.component.html b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/pfrs-input/pfrs-input.component.html new file mode 100644 index 0000000000..5469971cd0 --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/pfrs-input/pfrs-input.component.html @@ -0,0 +1,180 @@ +
+
+ + ALR Area Impacted (ha) + + + + + Use End Date + + + + +
+ + + + + + + + + +
+
+
+
+ +
+
+ +
+
+ +
+
+ + + m3 + +
+
+ + + m3 + +
+
+ +
Note: 0.01 ha is 100m2
+
+
+ + + ha + +
+
+ + + ha + +
+
+ +
+
+ + + m + +
+
+ + + m + +
+
+ +
+
+ + + m + +
+
+ + + m + +
+
+
+
diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/pfrs-input/pfrs-input.component.scss b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/pfrs-input/pfrs-input.component.scss new file mode 100644 index 0000000000..e69de29bb2 diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/pfrs-input/pfrs-input.component.spec.ts b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/pfrs-input/pfrs-input.component.spec.ts new file mode 100644 index 0000000000..2d8c4a3e16 --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/pfrs-input/pfrs-input.component.spec.ts @@ -0,0 +1,24 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { PfrsInputComponent } from './pfrs-input.component'; + +describe('PfrsInputComponent', () => { + let component: PfrsInputComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [PfrsInputComponent], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(PfrsInputComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/pfrs-input/pfrs-input.component.ts b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/pfrs-input/pfrs-input.component.ts new file mode 100644 index 0000000000..b1f91bb0b9 --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/pfrs-input/pfrs-input.component.ts @@ -0,0 +1,11 @@ +import { Component, Input } from '@angular/core'; +import { FormGroup } from '@angular/forms'; + +@Component({ + selector: 'app-pfrs-input', + templateUrl: './pfrs-input.component.html', + styleUrls: ['./pfrs-input.component.scss'], +}) +export class PfrsInputComponent { + @Input() form!: FormGroup; +} diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/pofo-input/pofo-input.component.html b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/pofo-input/pofo-input.component.html new file mode 100644 index 0000000000..7f4a43207b --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/pofo-input/pofo-input.component.html @@ -0,0 +1,114 @@ +
+
+ + ALR Area Impacted (ha) + + + + + Use End Date + + + + +
+ + + + + +
+
+
+
+ +
+
+ +
+
+ + + m3 + +
+
+ +
Note: 0.01 ha is 100m2
+
+
+ + + ha + +
+
+ +
+
+ + + m + +
+
+ +
+
+ + + m + +
+
+
+
diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/pofo-input/pofo-input.component.scss b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/pofo-input/pofo-input.component.scss new file mode 100644 index 0000000000..e69de29bb2 diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/pofo-input/pofo-input.component.spec.ts b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/pofo-input/pofo-input.component.spec.ts new file mode 100644 index 0000000000..bdc4bf380e --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/pofo-input/pofo-input.component.spec.ts @@ -0,0 +1,24 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { PofoInputComponent } from './pofo-input.component'; + +describe('PofoInputComponent', () => { + let component: PofoInputComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [PofoInputComponent], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(PofoInputComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/pofo-input/pofo-input.component.ts b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/pofo-input/pofo-input.component.ts new file mode 100644 index 0000000000..dc8f525fdc --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/pofo-input/pofo-input.component.ts @@ -0,0 +1,11 @@ +import { Component, Input } from '@angular/core'; +import { FormGroup } from '@angular/forms'; + +@Component({ + selector: 'app-pofo-input', + templateUrl: './pofo-input.component.html', + styleUrls: ['./pofo-input.component.scss'], +}) +export class PofoInputComponent { + @Input() form!: FormGroup; +} diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/roso-input/roso-input.component.html b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/roso-input/roso-input.component.html new file mode 100644 index 0000000000..f175fb8b59 --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/roso-input/roso-input.component.html @@ -0,0 +1,114 @@ +
+
+ + ALR Area Impacted (ha) + + + + + Use End Date + + + + +
+ + + + + +
+
+
+
+ +
+
+ +
+
+ + + m3 + +
+
+ +
Note: 0.01 ha is 100m2
+
+
+ + + ha + +
+
+ +
+
+ + + m + +
+
+ +
+
+ + + m + +
+
+
+
diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/roso-input/roso-input.component.scss b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/roso-input/roso-input.component.scss new file mode 100644 index 0000000000..e69de29bb2 diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/roso-input/roso-input.component.spec.ts b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/roso-input/roso-input.component.spec.ts new file mode 100644 index 0000000000..1aa4815305 --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/roso-input/roso-input.component.spec.ts @@ -0,0 +1,24 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { RosoInputComponent } from './roso-input.component'; + +describe('RosoInputComponent', () => { + let component: RosoInputComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [RosoInputComponent], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(RosoInputComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/roso-input/roso-input.component.ts b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/roso-input/roso-input.component.ts new file mode 100644 index 0000000000..cb18c63a8e --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/roso-input/roso-input.component.ts @@ -0,0 +1,11 @@ +import { Component, Input } from '@angular/core'; +import { FormGroup } from '@angular/forms'; + +@Component({ + selector: 'app-roso-input', + templateUrl: './roso-input.component.html', + styleUrls: ['./roso-input.component.scss'], +}) +export class RosoInputComponent { + @Input() form!: FormGroup; +} diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-components.component.html b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-components.component.html new file mode 100644 index 0000000000..e331336783 --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-components.component.html @@ -0,0 +1,39 @@ +
+
+

Components

+
+ + +
+
+ + + + + +
+ +
+
diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-components.component.scss b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-components.component.scss new file mode 100644 index 0000000000..484d1ef16a --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-components.component.scss @@ -0,0 +1,8 @@ +@use '../../../../../../../styles/colors'; + +.component { + border-radius: 4px; + border: 1px solid colors.$grey; + padding: 16px; + margin-bottom: 48px; +} diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-components.component.spec.ts b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-components.component.spec.ts new file mode 100644 index 0000000000..f76e8a6cbd --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-components.component.spec.ts @@ -0,0 +1,72 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { MatMenuModule } from '@angular/material/menu'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { BehaviorSubject } from 'rxjs'; +import { NoticeOfIntentDecisionV2Service } from '../../../../../../services/notice-of-intent/decision-v2/notice-of-intent-decision-v2.service'; +import { NoticeOfIntentDecisionDto } from '../../../../../../services/notice-of-intent/decision/notice-of-intent-decision.dto'; +import { NoticeOfIntentDetailService } from '../../../../../../services/notice-of-intent/notice-of-intent-detail.service'; +import { NoticeOfIntentSubmissionService } from '../../../../../../services/notice-of-intent/notice-of-intent-submission/notice-of-intent-submission.service'; +import { NoticeOfIntentDto } from '../../../../../../services/notice-of-intent/notice-of-intent.dto'; +import { ToastService } from '../../../../../../services/toast/toast.service'; +import { ConfirmationDialogService } from '../../../../../../shared/confirmation-dialog/confirmation-dialog.service'; + +import { DecisionComponentsComponent } from './decision-components.component'; + +describe('DecisionComponentsComponent', () => { + let component: DecisionComponentsComponent; + let fixture: ComponentFixture; + let mockNoticeOfIntentDecisionV2Service: DeepMocked; + let mockToastService: DeepMocked; + let mockNoticeOfIntentDetailService: DeepMocked; + let mockNoticeOfIntentSubmissionService: DeepMocked; + + beforeEach(async () => { + mockNoticeOfIntentDecisionV2Service = createMock(); + mockNoticeOfIntentDecisionV2Service.$decision = new BehaviorSubject( + undefined + ); + + mockToastService = createMock(); + mockNoticeOfIntentDetailService = createMock(); + mockNoticeOfIntentDetailService.$noticeOfIntent = new BehaviorSubject(undefined); + + mockNoticeOfIntentSubmissionService = createMock(); + + await TestBed.configureTestingModule({ + imports: [MatMenuModule], + declarations: [DecisionComponentsComponent], + providers: [ + { + provide: NoticeOfIntentDecisionV2Service, + useValue: mockNoticeOfIntentDecisionV2Service, + }, + { + provide: ToastService, + useValue: mockToastService, + }, + { + provide: NoticeOfIntentDetailService, + useValue: mockNoticeOfIntentDetailService, + }, + { + provide: NoticeOfIntentSubmissionService, + useValue: mockNoticeOfIntentSubmissionService, + }, + { + provide: ConfirmationDialogService, + useValue: {}, + }, + ], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(DecisionComponentsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-components.component.ts b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-components.component.ts new file mode 100644 index 0000000000..57efe1cd61 --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-components.component.ts @@ -0,0 +1,218 @@ +import { + AfterViewInit, + Component, + EventEmitter, + Input, + OnDestroy, + OnInit, + Output, + QueryList, + ViewChildren, +} from '@angular/core'; +import { Subject, takeUntil } from 'rxjs'; +import { + NOI_DECISION_COMPONENT_TYPE, + NoticeOfIntentDecisionCodesDto, + NoticeOfIntentDecisionComponentDto, + NoticeOfIntentDecisionComponentTypeDto, +} from '../../../../../../services/notice-of-intent/decision/notice-of-intent-decision.dto'; +import { NoticeOfIntentDetailService } from '../../../../../../services/notice-of-intent/notice-of-intent-detail.service'; +import { NoticeOfIntentSubmissionService } from '../../../../../../services/notice-of-intent/notice-of-intent-submission/notice-of-intent-submission.service'; +import { + NoticeOfIntentDto, + NoticeOfIntentSubmissionDto, +} from '../../../../../../services/notice-of-intent/notice-of-intent.dto'; +import { ToastService } from '../../../../../../services/toast/toast.service'; +import { ConfirmationDialogService } from '../../../../../../shared/confirmation-dialog/confirmation-dialog.service'; +import { DecisionComponentComponent } from './decision-component/decision-component.component'; + +export type DecisionComponentTypeMenuItem = NoticeOfIntentDecisionComponentTypeDto & { + isDisabled: boolean; + uiCode: string; +}; + +@Component({ + selector: 'app-decision-components', + templateUrl: './decision-components.component.html', + styleUrls: ['./decision-components.component.scss'], +}) +export class DecisionComponentsComponent implements OnInit, OnDestroy, AfterViewInit { + $destroy = new Subject(); + + @Input() codes!: NoticeOfIntentDecisionCodesDto; + @Input() fileNumber!: string; + @Input() showError = false; + + @Input() components: NoticeOfIntentDecisionComponentDto[] = []; + @Output() componentsChange = new EventEmitter<{ + components: NoticeOfIntentDecisionComponentDto[]; + isValid: boolean; + }>(); + @ViewChildren(DecisionComponentComponent) childComponents!: QueryList; + + noticeOfIntent!: NoticeOfIntentDto; + noticeOfIntentSubmission!: NoticeOfIntentSubmissionDto; + decisionComponentTypes: DecisionComponentTypeMenuItem[] = []; + + constructor( + private toastService: ToastService, + private noticeOfIntentDetailService: NoticeOfIntentDetailService, + private submissionService: NoticeOfIntentSubmissionService, + private confirmationDialogService: ConfirmationDialogService + ) {} + + ngOnInit(): void { + this.noticeOfIntentDetailService.$noticeOfIntent + .pipe(takeUntil(this.$destroy)) + .subscribe(async (noticeOfIntent) => { + if (noticeOfIntent) { + this.noticeOfIntent = noticeOfIntent; + + //TODO:What? + //this.noticeOfIntent.submittedApplication = await this.submissionService.fetchSubmission(noticeOfIntent.fileNumber); + } + }); + + this.prepareDecisionComponentTypes(this.codes); + + // validate components on load + setTimeout(() => this.onChange(), 0); + } + + ngAfterViewInit(): void { + // subscribes to child components and triggers validation on add/delete. NOTE: this is NOT getting called on first page load + this.childComponents.changes.subscribe(() => { + // setTimeout is required to ensure that current code is executed after the current change detection cycle completes, avoiding the ExpressionChangedAfterItHasBeenCheckedError + setTimeout(() => this.onChange(), 0); + }); + } + + ngOnDestroy(): void { + this.$destroy.next(); + this.$destroy.complete(); + } + + onAddNewComponent(uiCode: string, typeCode: string) { + switch (uiCode) { + case 'COPY': + const component: NoticeOfIntentDecisionComponentDto = { + noticeOfIntentDecisionComponentTypeCode: typeCode, + alrArea: this.noticeOfIntent.alrArea, + agCap: this.noticeOfIntent.agCap, + agCapSource: this.noticeOfIntent.agCapSource, + agCapMap: this.noticeOfIntent.agCapMap, + agCapConsultant: this.noticeOfIntent.agCapConsultant, + noticeOfIntentDecisionComponentType: this.decisionComponentTypes.find( + (e) => e.code === typeCode && e.uiCode !== 'COPY' + )!, + }; + + if (typeCode === NOI_DECISION_COMPONENT_TYPE.POFO) { + this.patchPofoFields(component); + } + + if (typeCode === NOI_DECISION_COMPONENT_TYPE.ROSO) { + this.patchRosoFields(component); + } + + if (typeCode === NOI_DECISION_COMPONENT_TYPE.PFRS) { + this.patchPofoFields(component); + this.patchRosoFields(component); + } + + this.components.unshift(component); + break; + case NOI_DECISION_COMPONENT_TYPE.POFO: + case NOI_DECISION_COMPONENT_TYPE.ROSO: + case NOI_DECISION_COMPONENT_TYPE.PFRS: + const componentType = this.decisionComponentTypes.find((e) => e.code === typeCode && e.uiCode !== 'COPY'); + this.components.unshift({ + noticeOfIntentDecisionComponentTypeCode: typeCode, + noticeOfIntentDecisionComponentType: componentType, + } as unknown as NoticeOfIntentDecisionComponentDto); + break; + default: + this.toastService.showErrorToast(`Failed to create component ${typeCode}`); + } + + this.updateComponentsMenuItems(); + } + + onRemove(index: number) { + this.confirmationDialogService + .openDialog({ + body: 'Are you sure you want to remove this component?', + }) + .subscribe((didConfirm) => { + if (didConfirm) { + this.components.splice(index, 1); + this.updateComponentsMenuItems(); + } + }); + } + + trackByFn(index: any, item: NoticeOfIntentDecisionComponentDto) { + return item.noticeOfIntentDecisionComponentTypeCode; + } + + onChange() { + const isValid = + this.components.length > 0 && (!this.childComponents || this.childComponents?.length < 1) + ? false + : this.childComponents.reduce((isValid, component) => isValid && component.form.valid, true); + + this.componentsChange.emit({ + components: this.components, + isValid, + }); + } + + private async prepareDecisionComponentTypes(codes: NoticeOfIntentDecisionCodesDto) { + const decisionComponentTypes: DecisionComponentTypeMenuItem[] = codes.decisionComponentTypes.map((e) => ({ + ...e, + isDisabled: false, + uiCode: e.code, + })); + + const mappedProposalType = decisionComponentTypes.find((e) => e.code === this.noticeOfIntent.type.code); + + if (mappedProposalType) { + const proposalDecisionType: DecisionComponentTypeMenuItem = { + isDisabled: false, + uiCode: 'COPY', + code: mappedProposalType!.code, + label: `Copy Proposal - ${mappedProposalType?.label}`, + description: mappedProposalType?.description ?? '', + }; + decisionComponentTypes.unshift(proposalDecisionType); + } + this.decisionComponentTypes = decisionComponentTypes; + + this.updateComponentsMenuItems(); + } + + private patchPofoFields(component: NoticeOfIntentDecisionComponentDto) { + component.endDate = this.noticeOfIntent.proposalEndDate; + component.soilFillTypeToPlace = this.noticeOfIntentSubmission.soilFillTypeToPlace; + component.soilToPlaceVolume = this.noticeOfIntentSubmission.soilToPlaceVolume; + component.soilToPlaceArea = this.noticeOfIntentSubmission.soilToPlaceArea; + component.soilToPlaceMaximumDepth = this.noticeOfIntentSubmission.soilToPlaceMaximumDepth; + component.soilToPlaceAverageDepth = this.noticeOfIntentSubmission.soilToPlaceAverageDepth; + } + + private patchRosoFields(component: NoticeOfIntentDecisionComponentDto) { + component.endDate = this.noticeOfIntent.proposalEndDate; + component.soilTypeRemoved = this.noticeOfIntentSubmission.soilTypeRemoved; + component.soilToRemoveVolume = this.noticeOfIntentSubmission.soilToRemoveVolume; + component.soilToRemoveArea = this.noticeOfIntentSubmission.soilToRemoveArea; + component.soilToRemoveMaximumDepth = this.noticeOfIntentSubmission.soilToRemoveMaximumDepth; + component.soilToRemoveAverageDepth = this.noticeOfIntentSubmission.soilToRemoveAverageDepth; + } + + private updateComponentsMenuItems() { + this.decisionComponentTypes = this.decisionComponentTypes.map((e) => ({ + ...e, + isDisabled: this.components.some((c) => c.noticeOfIntentDecisionComponentTypeCode === e.code), + })); + } +} diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-conditions/decision-condition/decision-condition.component.html b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-conditions/decision-condition/decision-condition.component.html new file mode 100644 index 0000000000..ead69cd822 --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-conditions/decision-condition/decision-condition.component.html @@ -0,0 +1,52 @@ +
+
{{ data.type?.label }}
+ +
+ +
+
+ + Component to Condition + + {{ + component.label + }} + + + +
+ Approval Dependent* + + Yes + No + +
+ + + Security Amount + + + + + Administrative Fee Amount + + + + + Description + + +
+
diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-conditions/decision-condition/decision-condition.component.scss b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-conditions/decision-condition/decision-condition.component.scss new file mode 100644 index 0000000000..3b4c9e86c7 --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-conditions/decision-condition/decision-condition.component.scss @@ -0,0 +1,14 @@ +form { + margin-top: 12px; +} + +.condition { + display: grid; + grid-template-columns: calc(50% - 12px) calc(50% - 12px); + grid-column-gap: 24px; + grid-row-gap: 24px; + + .condition-full-width { + grid-column: 1/3; + } +} diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-conditions/decision-condition/decision-condition.component.spec.ts b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-conditions/decision-condition/decision-condition.component.spec.ts new file mode 100644 index 0000000000..7468fb24c3 --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-conditions/decision-condition/decision-condition.component.spec.ts @@ -0,0 +1,31 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { DecisionConditionComponent } from './decision-condition.component'; + +describe('DecisionConditionComponent', () => { + let component: DecisionConditionComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [DecisionConditionComponent], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(DecisionConditionComponent); + component = fixture.componentInstance; + component.data = { + type: { + code: '', + label: '', + description: '', + }, + }; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-conditions/decision-condition/decision-condition.component.ts b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-conditions/decision-condition/decision-condition.component.ts new file mode 100644 index 0000000000..d2c9d59f81 --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-conditions/decision-condition/decision-condition.component.ts @@ -0,0 +1,98 @@ +import { Component, EventEmitter, Input, OnChanges, OnInit, Output, SimpleChanges } from '@angular/core'; +import { FormControl, FormGroup, Validators } from '@angular/forms'; +import { parseStringToBoolean } from '../../../../../../../shared/utils/boolean-helper'; +import { SelectableComponent, TempNoticeOfIntentDecisionConditionDto } from '../decision-conditions.component'; + +@Component({ + selector: 'app-decision-condition', + templateUrl: './decision-condition.component.html', + styleUrls: ['./decision-condition.component.scss'], +}) +export class DecisionConditionComponent implements OnInit, OnChanges { + @Input() data!: TempNoticeOfIntentDecisionConditionDto; + @Output() dataChange = new EventEmitter(); + @Output() remove = new EventEmitter(); + + @Input() selectableComponents: SelectableComponent[] = []; + + componentsToCondition = new FormControl(null, [Validators.required]); + approvalDependant = new FormControl(null, [Validators.required]); + + securityAmount = new FormControl(null); + administrativeFee = new FormControl(null); + description = new FormControl(null, [Validators.required]); + + form = new FormGroup({ + approvalDependant: this.approvalDependant, + securityAmount: this.securityAmount, + administrativeFee: this.administrativeFee, + description: this.description, + componentsToCondition: this.componentsToCondition, + }); + + ngOnInit(): void { + if (this.data) { + let approvalDependant = null; + if (this.data.approvalDependant !== null) { + approvalDependant = this.data.approvalDependant ? 'true' : 'false'; + } + + const selectedOptions = this.selectableComponents + .filter((component) => this.data.componentsToCondition?.map((e) => e.tempId)?.includes(component.tempId)) + .map((e) => ({ + componentDecisionUuid: e.decisionUuid, + componentToConditionType: e.code, + tempId: e.tempId, + })); + + this.componentsToCondition.setValue(selectedOptions.map((e) => e.tempId) ?? null); + + this.form.patchValue({ + approvalDependant, + securityAmount: this.data.securityAmount?.toString() ?? null, + administrativeFee: this.data.administrativeFee?.toString() ?? null, + description: this.data.description ?? null, + }); + } + + this.form.valueChanges.subscribe((changes) => { + const selectedOptions = this.selectableComponents + .filter((component) => this.componentsToCondition.value?.includes(component.tempId)) + .map((e) => ({ + componentDecisionUuid: e.decisionUuid, + componentToConditionType: e.code, + tempId: e.tempId, + })); + + this.dataChange.emit({ + type: this.data.type, + tempUuid: this.data.tempUuid, + uuid: this.data.uuid, + approvalDependant: parseStringToBoolean(this.approvalDependant.value), + securityAmount: this.securityAmount.value !== null ? parseFloat(this.securityAmount.value) : undefined, + administrativeFee: this.administrativeFee.value !== null ? parseFloat(this.administrativeFee.value) : undefined, + description: this.description.value ?? undefined, + componentsToCondition: selectedOptions, + }); + }); + } + + ngOnChanges(changes: SimpleChanges): void { + if (changes['selectableComponents']) { + const selectedOptions = this.selectableComponents + .filter((component) => this.componentsToCondition.value?.includes(component.tempId)) + .map((e) => ({ + componentDecisionUuid: e.decisionUuid, + componentToConditionType: e.code, + })); + + if (selectedOptions && selectedOptions.length < 1) { + this.componentsToCondition.setValue(null); + } + } + } + + onRemove() { + this.remove.emit(); + } +} diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-conditions/decision-conditions.component.html b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-conditions/decision-conditions.component.html new file mode 100644 index 0000000000..029df03dfa --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-conditions/decision-conditions.component.html @@ -0,0 +1,38 @@ +
+
+

Conditions

+
+ + +
+
+ + + + + +
+ +
+
diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-conditions/decision-conditions.component.scss b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-conditions/decision-conditions.component.scss new file mode 100644 index 0000000000..a55dff748c --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-conditions/decision-conditions.component.scss @@ -0,0 +1,25 @@ +@use '../../../../../../../styles/colors'; + +section { + width: 100%; + margin: 24px 0 56px; +} + +.buttons { + margin-top: 28px; +} + +.condition { + border-radius: 4px; + border: 1px solid colors.$grey; + padding: 16px; + margin-bottom: 48px; + + &:first-of-type { + margin-top: 12px; + } +} + +.remove-button { + margin-top: 18px !important; +} diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-conditions/decision-conditions.component.spec.ts b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-conditions/decision-conditions.component.spec.ts new file mode 100644 index 0000000000..a0015d4867 --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-conditions/decision-conditions.component.spec.ts @@ -0,0 +1,55 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { MatMenuModule } from '@angular/material/menu'; +import { createMock } from '@golevelup/ts-jest'; +import { BehaviorSubject } from 'rxjs'; +import { ApplicationDecisionV2Service } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.service'; +import { NoticeOfIntentDecisionV2Service } from '../../../../../../services/notice-of-intent/decision-v2/notice-of-intent-decision-v2.service'; +import { + NoticeOfIntentDecisionDto, + NoticeOfIntentDecisionWithLinkedResolutionDto, +} from '../../../../../../services/notice-of-intent/decision/notice-of-intent-decision.dto'; +import { ConfirmationDialogService } from '../../../../../../shared/confirmation-dialog/confirmation-dialog.service'; + +import { DecisionConditionsComponent } from './decision-conditions.component'; + +describe('DecisionConditionComponent', () => { + let component: DecisionConditionsComponent; + let fixture: ComponentFixture; + let mockDecisionService: NoticeOfIntentDecisionV2Service; + + beforeEach(async () => { + mockDecisionService = createMock(); + mockDecisionService.$decision = new BehaviorSubject(undefined); + mockDecisionService.$decisions = new BehaviorSubject([]); + + await TestBed.configureTestingModule({ + imports: [MatMenuModule], + providers: [ + { + provide: NoticeOfIntentDecisionV2Service, + useValue: mockDecisionService, + }, + { + provide: ConfirmationDialogService, + useValue: {}, + }, + ], + declarations: [DecisionConditionsComponent], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(DecisionConditionsComponent); + component = fixture.componentInstance; + component.codes = { + decisionComponentTypes: [], + outcomes: [], + decisionConditionTypes: [], + }; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-conditions/decision-conditions.component.ts b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-conditions/decision-conditions.component.ts new file mode 100644 index 0000000000..0addc94d27 --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-conditions/decision-conditions.component.ts @@ -0,0 +1,211 @@ +import { + Component, + EventEmitter, + Input, + OnChanges, + OnDestroy, + OnInit, + Output, + SimpleChanges, + ViewChildren, +} from '@angular/core'; +import { combineLatestWith, Subject, takeUntil } from 'rxjs'; +import { NoticeOfIntentDecisionV2Service } from '../../../../../../services/notice-of-intent/decision-v2/notice-of-intent-decision-v2.service'; +import { + NoticeOfIntentDecisionCodesDto, + NoticeOfIntentDecisionComponentDto, + NoticeOfIntentDecisionConditionDto, + NoticeOfIntentDecisionDto, + UpdateNoticeOfIntentDecisionConditionDto, +} from '../../../../../../services/notice-of-intent/decision/notice-of-intent-decision.dto'; +import { ConfirmationDialogService } from '../../../../../../shared/confirmation-dialog/confirmation-dialog.service'; +import { DecisionConditionComponent } from './decision-condition/decision-condition.component'; + +export type TempNoticeOfIntentDecisionConditionDto = UpdateNoticeOfIntentDecisionConditionDto & { tempUuid?: string }; +export type SelectableComponent = { uuid?: string; tempId: string; decisionUuid: string; code: string; label: string }; + +@Component({ + selector: 'app-decision-conditions', + templateUrl: './decision-conditions.component.html', + styleUrls: ['./decision-conditions.component.scss'], +}) +export class DecisionConditionsComponent implements OnInit, OnChanges, OnDestroy { + $destroy = new Subject(); + + @Input() codes!: NoticeOfIntentDecisionCodesDto; + @Input() components: NoticeOfIntentDecisionComponentDto[] = []; + @Input() conditions: NoticeOfIntentDecisionConditionDto[] = []; + @Input() showError = false; + @ViewChildren(DecisionConditionComponent) conditionComponents: DecisionConditionComponent[] = []; + + @Output() conditionsChange = new EventEmitter<{ + conditions: UpdateNoticeOfIntentDecisionConditionDto[]; + isValid: boolean; + }>(); + selectableComponents: SelectableComponent[] = []; + private allComponents: SelectableComponent[] = []; + mappedConditions: TempNoticeOfIntentDecisionConditionDto[] = []; + decision: NoticeOfIntentDecisionDto | undefined; + + constructor( + private decisionService: NoticeOfIntentDecisionV2Service, + private confirmationDialogService: ConfirmationDialogService + ) {} + + ngOnInit(): void { + this.decisionService.$decision + .pipe(takeUntil(this.$destroy)) + .pipe(combineLatestWith(this.decisionService.$decisions)) + .subscribe(([selectedDecision, decisions]) => { + const otherDecisionComponents = []; + for (const decision of decisions) { + const mappedComponents = this.mapComponents( + decision.uuid, + decision.components, + decision.resolutionNumber, + decision.resolutionYear + ); + const otherDecisionsComponents = mappedComponents.filter( + (component) => component.decisionUuid !== selectedDecision?.uuid + ); + otherDecisionComponents.push(...otherDecisionsComponents); + } + this.allComponents = otherDecisionComponents; + this.selectableComponents = [...this.allComponents]; + + if (selectedDecision) { + const updatedComponents = this.mapComponents( + selectedDecision.uuid, + this.components, + selectedDecision.resolutionNumber, + selectedDecision.resolutionYear + ); + this.selectableComponents = [...this.allComponents, ...updatedComponents]; + + this.decision = selectedDecision; + + this.populateConditions(selectedDecision.conditions); + this.onChanges(); + } + }); + } + + onAddNewCondition(typeCode: string) { + const matchingType = this.codes.decisionConditionTypes.find((code) => code.code === typeCode); + this.mappedConditions.unshift({ + type: matchingType, + tempUuid: (Math.random() * 10000).toFixed(0), + }); + this.conditionsChange.emit({ + conditions: this.mappedConditions, + isValid: false, + }); + } + + trackByFn(index: any, item: TempNoticeOfIntentDecisionConditionDto) { + if (item.uuid) { + return item.uuid; + } + return item.tempUuid; + } + + onRemoveCondition(index: number) { + this.confirmationDialogService + .openDialog({ + body: 'Are you sure you want to remove this condition?', + }) + .subscribe((didConfirm) => { + if (didConfirm) { + this.mappedConditions.splice(index, 1); + this.onChanges(); + } + }); + } + + ngOnChanges(changes: SimpleChanges): void { + if (this.decision && changes['components']) { + const updatedComponents = this.mapComponents( + this.decision.uuid, + this.components, + this.decision.resolutionNumber, + this.decision.resolutionYear + ); + this.selectableComponents = [...this.allComponents, ...updatedComponents]; + const validComponentIds = this.selectableComponents.map((component) => component.tempId); + + this.mappedConditions = this.mappedConditions.map((condition) => { + if (condition.componentsToCondition) { + condition.componentsToCondition = condition.componentsToCondition.filter((component) => + validComponentIds.includes(component.tempId) + ); + } + return condition; + }); + this.onChanges(); + } + + if (changes['conditions']) { + this.populateConditions(this.conditions); + this.onChanges(); + } + } + + private populateConditions(conditions: NoticeOfIntentDecisionConditionDto[]) { + this.mappedConditions = conditions.map((condition) => { + const selectedComponents = this.selectableComponents + .filter((component) => + condition.components?.map((conditionComponent) => conditionComponent.uuid).includes(component.uuid) + ) + .map((e) => ({ + componentDecisionUuid: e.decisionUuid, + componentToConditionType: e.code, + tempId: e.tempId, + uuid: e.uuid, + })); + + return { + ...condition, + componentsToCondition: selectedComponents, + }; + }); + } + + mapComponents( + decisionUuid: string, + components: NoticeOfIntentDecisionComponentDto[], + decisionNumber: number | null, + decisionYear: number | null + ) { + return components.map((component) => { + const matchingType = this.codes.decisionComponentTypes.find( + (type) => type.code === component.noticeOfIntentDecisionComponentTypeCode + ); + return { + uuid: component.uuid, + decisionUuid: decisionUuid, + code: component.noticeOfIntentDecisionComponentTypeCode, + label: + decisionNumber && decisionYear + ? `#${decisionNumber}/${decisionYear} ${matchingType?.label}` + : `Draft ${matchingType?.label}`, + tempId: `${decisionUuid}_${component.noticeOfIntentDecisionComponentTypeCode}`, + }; + }); + } + + ngOnDestroy(): void { + this.$destroy.next(); + this.$destroy.complete(); + } + + onChanges() { + this.conditionsChange.emit({ + conditions: this.mappedConditions, + isValid: this.conditionComponents.reduce((isValid, component) => isValid && component.form.valid, true), + }); + } + + onValidate() { + this.conditionComponents.forEach((component) => component.form.markAllAsTouched()); + } +} diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-file-upload-dialog/decision-document-upload-dialog.component.html b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-file-upload-dialog/decision-document-upload-dialog.component.html new file mode 100644 index 0000000000..517e5c27f5 --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-file-upload-dialog/decision-document-upload-dialog.component.html @@ -0,0 +1,95 @@ +
+

{{ title }} Document

+
+
+
+
+
+ Document Upload* +
+ + +
+
+ {{ pendingFile.name }} +  ({{ pendingFile.size | filesize }}) +
+ +
+
+ + +
+
+ +
+ + Document Name + + +
+ +
+ + +
+
+ + Source + + {{ source }} + + +
+
+ Visible To: +
+ Applicant, L/FNG, and Commissioner +
+
+ Public +
+
+
+ + +
+ + + +
+ +
diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-file-upload-dialog/decision-document-upload-dialog.component.scss b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-file-upload-dialog/decision-document-upload-dialog.component.scss new file mode 100644 index 0000000000..99825bd974 --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-file-upload-dialog/decision-document-upload-dialog.component.scss @@ -0,0 +1,43 @@ +.form { + display: grid; + grid-template-columns: 1fr 1fr; + row-gap: 32px; + column-gap: 32px; + + .double { + grid-column: 1/3; + } +} + +.full-width { + width: 100%; +} + +a { + word-break: break-all; +} + +.file { + border: 1px solid #000; + border-radius: 8px; + display: flex; + justify-content: space-between; + align-items: center; + padding: 8px; +} + +.upload-button { + margin-top: 6px !important; +} + +.spinner { + display: inline-block; + margin-right: 4px; +} + +:host::ng-deep { + .mdc-button__label { + display: flex; + align-items: center; + } +} diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-file-upload-dialog/decision-document-upload-dialog.component.spec.ts b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-file-upload-dialog/decision-document-upload-dialog.component.spec.ts new file mode 100644 index 0000000000..2c662b6be9 --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-file-upload-dialog/decision-document-upload-dialog.component.spec.ts @@ -0,0 +1,47 @@ +import { EventEmitter, NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { MAT_DIALOG_DATA, MatDialogModule, MatDialogRef } from '@angular/material/dialog'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { NoticeOfIntentDecisionV2Service } from '../../../../../../services/notice-of-intent/decision-v2/notice-of-intent-decision-v2.service'; + +import { DecisionDocumentUploadDialogComponent } from './decision-document-upload-dialog.component'; + +describe('DecisionDocumentUploadDialogComponent', () => { + let component: DecisionDocumentUploadDialogComponent; + let fixture: ComponentFixture; + + let mockNOIDecService: DeepMocked; + + beforeEach(async () => { + mockNOIDecService = createMock(); + + const mockDialogRef = { + close: jest.fn(), + afterClosed: jest.fn(), + subscribe: jest.fn(), + backdropClick: () => new EventEmitter(), + }; + + await TestBed.configureTestingModule({ + declarations: [DecisionDocumentUploadDialogComponent], + providers: [ + { + provide: NoticeOfIntentDecisionV2Service, + useValue: mockNOIDecService, + }, + { provide: MatDialogRef, useValue: mockDialogRef }, + { provide: MAT_DIALOG_DATA, useValue: {} }, + ], + imports: [MatDialogModule], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(DecisionDocumentUploadDialogComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-file-upload-dialog/decision-document-upload-dialog.component.ts b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-file-upload-dialog/decision-document-upload-dialog.component.ts new file mode 100644 index 0000000000..ecb07ad94d --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-file-upload-dialog/decision-document-upload-dialog.component.ts @@ -0,0 +1,103 @@ +import { Component, Inject, OnInit } from '@angular/core'; +import { FormControl, FormGroup, Validators } from '@angular/forms'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; +import { DecisionDocumentDto } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; +import { NoticeOfIntentDecisionV2Service } from '../../../../../../services/notice-of-intent/decision-v2/notice-of-intent-decision-v2.service'; +import { DOCUMENT_SOURCE } from '../../../../../../shared/document/document.dto'; + +@Component({ + selector: 'app-decision-document-upload-dialog', + templateUrl: './decision-document-upload-dialog.component.html', + styleUrls: ['./decision-document-upload-dialog.component.scss'], +}) +export class DecisionDocumentUploadDialogComponent implements OnInit { + title = 'Create'; + isDirty = false; + isSaving = false; + allowsFileEdit = true; + documentType = 'Decision Package'; + + name = new FormControl('', [Validators.required]); + type = new FormControl({ disabled: true, value: undefined }, [Validators.required]); + source = new FormControl({ disabled: true, value: DOCUMENT_SOURCE.ALC }, [Validators.required]); + + visibleToInternal = new FormControl({ disabled: true, value: true }, [Validators.required]); + visibleToPublic = new FormControl({ disabled: true, value: true }, [Validators.required]); + + documentSources = Object.values(DOCUMENT_SOURCE); + + form = new FormGroup({ + name: this.name, + type: this.type, + source: this.source, + visibleToInternal: this.visibleToInternal, + visibleToPublic: this.visibleToPublic, + }); + + pendingFile: File | undefined; + existingFile: string | undefined; + + constructor( + @Inject(MAT_DIALOG_DATA) + public data: { fileId: string; decisionUuid: string; existingDocument?: DecisionDocumentDto }, + protected dialog: MatDialogRef, + private decisionService: NoticeOfIntentDecisionV2Service + ) {} + + ngOnInit(): void { + if (this.data.existingDocument) { + const document = this.data.existingDocument; + this.title = 'Edit'; + this.form.patchValue({ + name: document.fileName, + }); + this.existingFile = document.fileName; + } + } + + async onSubmit() { + const file = this.pendingFile; + if (file) { + const renamedFile = new File([file], this.name.getRawValue() ?? file.name); + this.isSaving = true; + if (this.data.existingDocument) { + await this.decisionService.deleteFile(this.data.decisionUuid, this.data.existingDocument.uuid); + } + await this.decisionService.uploadFile(this.data.decisionUuid, renamedFile); + + this.dialog.close(true); + this.isSaving = false; + } + } + + uploadFile(event: Event) { + const element = event.target as HTMLInputElement; + const selectedFiles = element.files; + if (selectedFiles && selectedFiles[0]) { + this.pendingFile = selectedFiles[0]; + this.name.setValue(selectedFiles[0].name); + } + } + + onRemoveFile() { + this.pendingFile = undefined; + this.existingFile = undefined; + } + + openFile() { + if (this.pendingFile) { + const fileURL = URL.createObjectURL(this.pendingFile); + window.open(fileURL, '_blank'); + } + } + + async openExistingFile() { + if (this.data.existingDocument) { + await this.decisionService.downloadFile( + this.data.decisionUuid, + this.data.existingDocument.uuid, + this.data.existingDocument.fileName + ); + } + } +} diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-input-v2.component.html b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-input-v2.component.html new file mode 100644 index 0000000000..17a889722c --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-input-v2.component.html @@ -0,0 +1,228 @@ +
+

Decision #{{ index }} Draft

+
+ +

Resolution

+
+
+
+ +
+ +
+
+ + +
+
+
+ Res #{{ resolutionNumberControl.getRawValue() }} / {{ resolutionYearControl.getRawValue() }} + +
+
+
+ + + Decision Date + + + + + + + + +
+ + Decision Maker + + +
+ + + +
+
+ Subject to Conditions* + + Yes + No + +
+
+ +
+ + Decision Description + + +
+ +
+ Stats required* + + Yes + No + +
+ + + + Rescinded Date + + + + + +
+ + + + Rescinded Comment + + + + +
+

Documents

+ +
+ + + + +
+ +
+ +
+

Audit and Chair Review

+
+ + Audit Date + + + + +
+
+
+ +
+
+ +
+
+
+ + +
+
+
diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-input-v2.component.scss b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-input-v2.component.scss new file mode 100644 index 0000000000..811eda701f --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-input-v2.component.scss @@ -0,0 +1,166 @@ +@use '../../../../../../styles/colors.scss'; + +.bottom-scroller { + margin-top: 36px; + position: absolute; + bottom: 0; + left: 212px; + right: 0; + background-color: #fff; + padding: 16px; + z-index: 2; + border-top: 1px solid colors.$grey-light; + + button:not(:last-child) { + margin-right: 16px !important; + } +} + +form { + padding-bottom: 120px; +} + +:host::ng-deep { + .grid, + .grid-2 { + display: grid; + grid-template-columns: calc(50% - 12px) calc(50% - 12px); + grid-column-gap: 24px; + grid-row-gap: 32px; + + .full-width { + grid-column: 1/3; + } + } + + h3 { + margin-top: 36px !important; + margin-bottom: 12px !important; + } + + .resolution-number-wrapper { + display: grid; + grid-template-columns: 1fr 16px 0.7fr; + .resolution-number-btn-wrapper { + width: 100%; + } + } + + .row-no-flex, + .row, + .btn-row { + width: 100%; + margin: 24px 0; + } + + .row, + .btn-row { + display: flex; + flex-direction: row; + flex-wrap: wrap; + + .column { + display: flex; + flex-direction: column; + flex-basis: 100%; + flex: 1; + } + + .release-decision-btn { + width: 50%; + } + } + + .container, + .container-wide { + border: 1px solid colors.$grey-dark; + max-width: 438px; + + .soil-table { + padding: 16px; + display: grid; + grid-template-columns: 39% 59%; + grid-row-gap: 28px; + padding: 10px; + + &.double-table { + grid-template-columns: 22% 37% 37%; + column-gap: 10px; + } + + .full-width { + width: 100%; + } + } + + .label { + display: flex; + flex-direction: column; + justify-content: center; + margin-bottom: 0; + + .subtext { + margin-bottom: -8px !important; + } + } + + input { + text-align: right; + padding-right: 8px; + } + } + + .container-wide { + max-width: 700px; + } + + .resolution-number-wrapper { + display: flex; + align-items: center; + + .generate-number-btn { + width: 100%; + } + + .resolution-number { + display: flex; + align-items: center; + font-size: 20px; + color: colors.$grey-dark; + + .delete-icon { + color: colors.$error-color; + } + } + } + + .decision-component-form { + .grid { + margin-bottom: 24px; + } + } + + .soil-text-area { + height: 100px !important; + } + + .error-field-outlined.ng-invalid { + border: 1px solid colors.$error-color !important; + + .mat-button-toggle { + border-color: colors.$error-color; + color: colors.$error-color !important; + } + + &.upload-button { + border: 2px solid colors.$error-color; + margin-bottom: 0 !important; + } + } + + .toggle-label { + color: colors.$grey-dark; + display: block; + margin-bottom: 3px; + } +} diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-input-v2.component.spec.ts b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-input-v2.component.spec.ts new file mode 100644 index 0000000000..1c744f2665 --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-input-v2.component.spec.ts @@ -0,0 +1,79 @@ +import { HttpClientTestingModule } from '@angular/common/http/testing'; +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { MatDialog } from '@angular/material/dialog'; +import { ActivatedRoute, convertToParamMap, Router } from '@angular/router'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { NoticeOfIntentDecisionV2Service } from '../../../../../services/notice-of-intent/decision-v2/notice-of-intent-decision-v2.service'; +import { NoticeOfIntentDetailService } from '../../../../../services/notice-of-intent/notice-of-intent-detail.service'; +import { NoticeOfIntentModificationService } from '../../../../../services/notice-of-intent/notice-of-intent-modification/notice-of-intent-modification.service'; +import { ToastService } from '../../../../../services/toast/toast.service'; +import { StartOfDayPipe } from '../../../../../shared/pipes/startOfDay.pipe'; + +import { DecisionInputV2Component } from './decision-input-v2.component'; + +describe('DecisionInputComponent', () => { + let component: DecisionInputV2Component; + let fixture: ComponentFixture; + let mockNoticeOfIntentDecisionV2Service: DeepMocked; + let mockNoticeOfIntentModificationService: DeepMocked; + let mockNoticeOfIntentDetailService: DeepMocked; + let mockRouter: DeepMocked; + let mockToastService: DeepMocked; + let mockMatDialog: DeepMocked; + + beforeEach(async () => { + mockNoticeOfIntentDecisionV2Service = createMock(); + mockNoticeOfIntentModificationService = createMock(); + mockToastService = createMock(); + mockRouter = createMock(); + mockRouter.navigateByUrl.mockResolvedValue(true); + mockMatDialog = createMock(); + mockNoticeOfIntentDetailService = createMock(); + + await TestBed.configureTestingModule({ + imports: [HttpClientTestingModule], + declarations: [DecisionInputV2Component, StartOfDayPipe], + providers: [ + { + provide: NoticeOfIntentDecisionV2Service, + useValue: mockNoticeOfIntentDecisionV2Service, + }, + { + provide: NoticeOfIntentModificationService, + useValue: mockNoticeOfIntentModificationService, + }, + { provide: NoticeOfIntentDetailService, useValue: mockNoticeOfIntentDetailService }, + { + provide: ToastService, + useValue: mockToastService, + }, + { + provide: ActivatedRoute, + useValue: { + snapshot: { + paramMap: convertToParamMap({ uuid: 'fake' }), + }, + }, + }, + { + provide: Router, + useValue: mockRouter, + }, + { + provide: MatDialog, + useValue: mockMatDialog, + }, + ], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(DecisionInputV2Component); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-input-v2.component.ts b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-input-v2.component.ts new file mode 100644 index 0000000000..87425ac561 --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-input-v2.component.ts @@ -0,0 +1,483 @@ +import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; +import { FormControl, FormGroup, Validators } from '@angular/forms'; +import { MatButtonToggleChange } from '@angular/material/button-toggle'; +import { MatDialog } from '@angular/material/dialog'; +import { ActivatedRoute, Router } from '@angular/router'; +import moment from 'moment'; +import { combineLatestWith, Subject, takeUntil } from 'rxjs'; +import { NoticeOfIntentDecisionV2Service } from '../../../../../services/notice-of-intent/decision-v2/notice-of-intent-decision-v2.service'; +import { + CreateNoticeOfIntentDecisionDto, + NoticeOfIntentDecisionCodesDto, + NoticeOfIntentDecisionComponentDto, + NoticeOfIntentDecisionConditionDto, + NoticeOfIntentDecisionDto, + NoticeOfIntentDecisionOutcomeCodeDto, + UpdateNoticeOfIntentDecisionConditionDto, +} from '../../../../../services/notice-of-intent/decision/notice-of-intent-decision.dto'; +import { NoticeOfIntentDetailService } from '../../../../../services/notice-of-intent/notice-of-intent-detail.service'; +import { NoticeOfIntentModificationDto } from '../../../../../services/notice-of-intent/notice-of-intent-modification/notice-of-intent-modification.dto'; +import { NoticeOfIntentModificationService } from '../../../../../services/notice-of-intent/notice-of-intent-modification/notice-of-intent-modification.service'; +import { ToastService } from '../../../../../services/toast/toast.service'; +import { formatDateForApi } from '../../../../../shared/utils/api-date-formatter'; +import { parseBooleanToString, parseStringToBoolean } from '../../../../../shared/utils/boolean-helper'; +import { ReleaseDialogComponent } from '../release-dialog/release-dialog.component'; +import { DecisionComponentsComponent } from './decision-components/decision-components.component'; +import { DecisionConditionsComponent } from './decision-conditions/decision-conditions.component'; + +type MappedPostDecision = { + label: string; + uuid: string; +}; + +@Component({ + selector: 'app-decision-input', + templateUrl: './decision-input-v2.component.html', + styleUrls: ['./decision-input-v2.component.scss'], +}) +export class DecisionInputV2Component implements OnInit, OnDestroy { + $destroy = new Subject(); + isLoading = false; + minDate = new Date(0); + isFirstDecision = false; + showComponents = false; + requireComponents = false; + showConditions = false; + conditionsValid = true; + componentsValid = true; + index = 1; + + fileNumber: string = ''; + uuid: string = ''; + outcomes: NoticeOfIntentDecisionOutcomeCodeDto[] = []; + + resolutionYears: number[] = []; + postDecisions: MappedPostDecision[] = []; + existingDecision: NoticeOfIntentDecisionDto | undefined; + codes?: NoticeOfIntentDecisionCodesDto; + + resolutionNumberControl = new FormControl(null, [Validators.required]); + resolutionYearControl = new FormControl(null, [Validators.required]); + + components: NoticeOfIntentDecisionComponentDto[] = []; + conditions: NoticeOfIntentDecisionConditionDto[] = []; + conditionUpdates: UpdateNoticeOfIntentDecisionConditionDto[] = []; + + @ViewChild(DecisionComponentsComponent) decisionComponentsComponent?: DecisionComponentsComponent; + @ViewChild(DecisionConditionsComponent) decisionConditionsComponent?: DecisionConditionsComponent; + + form = new FormGroup({ + outcome: new FormControl(null, [Validators.required]), + date: new FormControl(undefined, [Validators.required]), + decisionMaker: new FormControl(null, [Validators.required]), + postDecision: new FormControl(null), + resolutionNumber: this.resolutionNumberControl, + resolutionYear: this.resolutionYearControl, + auditDate: new FormControl(null), + isSubjectToConditions: new FormControl(undefined, [Validators.required]), + decisionDescription: new FormControl(undefined, [Validators.required]), + isStatsRequired: new FormControl(undefined, [Validators.required]), + rescindedDate: new FormControl(null), + rescindedComment: new FormControl(null), + }); + + constructor( + private decisionService: NoticeOfIntentDecisionV2Service, + private modificationService: NoticeOfIntentModificationService, + public router: Router, + private route: ActivatedRoute, + private toastService: ToastService, + private noticeOfIntentDetailService: NoticeOfIntentDetailService, + public dialog: MatDialog + ) {} + + ngOnInit(): void { + this.resolutionYearControl.disable(); + this.setYear(); + + this.extractAndPopulateQueryParams(); + + if (this.fileNumber) { + this.loadData(); + } + } + + private extractAndPopulateQueryParams() { + const fileNumber = this.route.parent?.parent?.snapshot.paramMap.get('fileNumber'); + const uuid = this.route.snapshot.paramMap.get('uuid'); + const index = this.route.snapshot.paramMap.get('index'); + this.index = index ? parseInt(index) : 1; + + if (uuid) { + this.uuid = uuid; + } + + if (fileNumber) { + this.fileNumber = fileNumber; + } + } + + private setYear() { + const year = moment('1974'); + const currentYear = moment().year(); + while (year.year() <= currentYear) { + this.resolutionYears.push(year.year()); + year.add(1, 'year'); + } + this.resolutionYears.reverse(); + } + + ngOnDestroy(): void { + this.decisionService.clearDecision(); + this.decisionService.clearDecisions(); + this.$destroy.next(); + this.$destroy.complete(); + } + + async loadData() { + if (this.uuid) { + await this.decisionService.loadDecision(this.uuid); + } + + await this.decisionService.loadDecisions(this.fileNumber); + + this.codes = await this.decisionService.fetchCodes(); + this.outcomes = this.codes.outcomes; + + await this.prepareDataForEdit(); + } + + private async prepareDataForEdit() { + this.decisionService.$decision + .pipe(takeUntil(this.$destroy)) + .pipe(combineLatestWith(this.modificationService.$modifications, this.decisionService.$decisions)) + .subscribe(([decision, modifications, decisions]) => { + if (decision) { + this.existingDecision = decision; + this.uuid = decision.uuid; + } + + this.mapPostDecisionsToControls(modifications, this.existingDecision); + + if (this.existingDecision) { + this.patchFormWithExistingData(this.existingDecision); + + if (decisions.length > 0) { + let minDate = null; + this.isFirstDecision = true; + + for (const decision of decisions) { + if (!minDate && decision.date) { + minDate = decision.date; + } + + if (minDate && decision.date && minDate > decision.date) { + minDate = decision.date; + } + + if ( + this.existingDecision.createdAt > decision.createdAt && + this.existingDecision.uuid !== decision.uuid + ) { + this.isFirstDecision = false; + } + } + + if (minDate) { + this.minDate = new Date(minDate); + } + + if (!this.isFirstDecision) { + this.form.controls.postDecision.addValidators([Validators.required]); + this.form.controls.decisionMaker.disable(); + } + } else { + this.isFirstDecision = true; + } + } else { + this.resolutionYearControl.enable(); + } + }); + } + + private mapPostDecisionsToControls( + modifications: NoticeOfIntentModificationDto[], + existingDecision?: NoticeOfIntentDecisionDto + ) { + //TOOD: Clean this up + const mappedModifications = modifications + .filter( + (modification) => + (existingDecision && existingDecision.modifies?.uuid === modification.uuid) || + (modification.reviewOutcome.code === 'PRC' && !modification.resultingDecision) + ) + .map((modification, index) => ({ + label: `Modification Request #${modifications.length - index} - ${modification.modifiesDecisions + .map((dec) => `#${dec.resolutionNumber}/${dec.resolutionYear}`) + .join(', ')}`, + uuid: modification.uuid, + })); + + this.postDecisions = [...mappedModifications]; + } + + private patchFormWithExistingData(existingDecision: NoticeOfIntentDecisionDto) { + this.form.patchValue({ + outcome: existingDecision.outcome.code, + decisionMaker: existingDecision.decisionMaker, + date: existingDecision.date ? new Date(existingDecision.date) : undefined, + resolutionYear: existingDecision.resolutionYear, + resolutionNumber: existingDecision.resolutionNumber?.toString(10) || undefined, + auditDate: existingDecision.auditDate ? new Date(existingDecision.auditDate) : undefined, + postDecision: existingDecision.modifies?.uuid, + isSubjectToConditions: parseBooleanToString(existingDecision.isSubjectToConditions), + decisionDescription: existingDecision.decisionDescription, + isStatsRequired: parseBooleanToString(existingDecision.isStatsRequired), + rescindedDate: existingDecision.rescindedDate ? new Date(existingDecision.rescindedDate) : undefined, + rescindedComment: existingDecision.rescindedComment, + }); + + this.conditions = existingDecision.conditions; + + if (existingDecision.isSubjectToConditions) { + this.showConditions = true; + } + + if (!existingDecision.resolutionNumber) { + this.resolutionYearControl.enable(); + } + + if (existingDecision?.components) { + this.components = existingDecision.components; + } + + this.requireComponents = ['APPR', 'APPA'].includes(existingDecision.outcome.code); + + if (['APPR', 'APPA', 'RESC'].includes(existingDecision.outcome.code)) { + this.showComponents = true; + } else { + this.showComponents = false; + this.form.controls.isSubjectToConditions.disable(); + } + + if (existingDecision.outcome.code === 'RESC') { + this.form.controls.rescindedComment.setValidators([Validators.required]); + this.form.controls.rescindedDate.setValidators([Validators.required]); + } + } + + async onSubmit(isStayOnPage: boolean = false, isDraft: boolean = true) { + this.isLoading = true; + + try { + await this.saveDecision(isDraft); + } finally { + if (!isStayOnPage) { + this.onCancel(); + } else { + await this.loadData(); + } + + this.isLoading = false; + } + } + + async saveDecision(isDraft: boolean = true) { + const data = this.mapDecisionDataForSave(isDraft); + + if (this.uuid) { + await this.decisionService.update(this.uuid, data); + } else { + const createdDecision = await this.decisionService.create({ + ...data, + fileNumber: this.fileNumber, + }); + this.uuid = createdDecision.uuid; + } + } + + private mapDecisionDataForSave(isDraft: boolean) { + const { + date, + outcome, + decisionMaker, + resolutionNumber, + resolutionYear, + auditDate, + postDecision, + isSubjectToConditions, + decisionDescription, + isStatsRequired, + rescindedDate, + rescindedComment, + } = this.form.getRawValue(); + + const data: CreateNoticeOfIntentDecisionDto = { + date: formatDateForApi(date!), + resolutionNumber: parseInt(resolutionNumber!), + resolutionYear: resolutionYear!, + auditDate: auditDate ? formatDateForApi(auditDate) : auditDate, + outcomeCode: outcome!, + fileNumber: this.fileNumber, + modifiesUuid: postDecision ?? undefined, + isDraft, + isSubjectToConditions: parseStringToBoolean(isSubjectToConditions), + decisionDescription: decisionDescription, + isStatsRequired: parseStringToBoolean(isStatsRequired), + rescindedDate: rescindedDate ? formatDateForApi(rescindedDate) : rescindedDate, + rescindedComment: rescindedComment, + decisionComponents: this.components, + conditions: this.conditionUpdates, + decisionMaker: decisionMaker ?? undefined, + }; + + return data; + } + + onCancel() { + this.router.navigate([`notice-of-intent/${this.fileNumber}/decision`]); + } + + async onGenerateResolutionNumber() { + const selectedYear = this.form.controls.resolutionYear.getRawValue(); + if (selectedYear) { + const number = await this.decisionService.getNextAvailableResolutionNumber(selectedYear); + if (number) { + this.setResolutionNumber(number); + } else { + this.toastService.showErrorToast('Failed to retrieve resolution number.'); + } + } else { + this.toastService.showErrorToast('Resolution year is not selected. Select a resolution year first.'); + } + } + + private async setResolutionNumber(number: number) { + try { + this.resolutionYearControl.disable(); + this.form.controls.resolutionNumber.setValue(number.toString()); + await this.onSubmit(true); + } catch { + this.resolutionYearControl.enable(); + } + } + + async onDeleteResolutionNumber() { + this.resolutionNumberControl.setValue(null); + await this.onSubmit(true); + this.resolutionYearControl.enable(); + } + + private runValidation() { + this.form.markAllAsTouched(); + const requiresConditions = this.showConditions; + const requiresComponents = this.showComponents && this.requireComponents; + + if (this.decisionConditionsComponent) { + this.decisionConditionsComponent.onValidate(); + } + + if ( + !this.form.valid || + !this.conditionsValid || + !this.componentsValid || + (this.components.length === 0 && requiresComponents) || + (this.conditionUpdates.length === 0 && requiresConditions) + ) { + this.form.controls.decisionMaker.markAsDirty(); + this.toastService.showErrorToast('Please correct all errors before submitting the form'); + + // this will ensure that error rendering complete + setTimeout(() => this.scrollToError()); + + return false; + } else { + return true; + } + } + + private scrollToError() { + let elements = document.getElementsByClassName('ng-invalid'); + let elArray = Array.from(elements).filter((el) => el.nodeName !== 'FORM'); + + elArray[0]?.scrollIntoView({ + behavior: 'smooth', + block: 'center', + }); + } + + async onRelease() { + if (this.runValidation()) { + this.dialog + .open(ReleaseDialogComponent, { + minWidth: '600px', + maxWidth: '900px', + maxHeight: '80vh', + width: '90%', + autoFocus: false, + }) + .afterClosed() + .subscribe(async (didAccept) => { + if (didAccept) { + await this.onSubmit(false, false); + await this.noticeOfIntentDetailService.load(this.fileNumber); + } + }); + } + } + + onComponentChange($event: { components: NoticeOfIntentDecisionComponentDto[]; isValid: boolean }) { + this.components = Array.from($event.components); + this.componentsValid = $event.isValid; + } + + onConditionsChange($event: { conditions: UpdateNoticeOfIntentDecisionConditionDto[]; isValid: boolean }) { + this.conditionUpdates = Array.from($event.conditions); + this.conditionsValid = $event.isValid; + } + + onChangeDecisionOutcome(selectedOutcome: NoticeOfIntentDecisionOutcomeCodeDto) { + if (['APPR', 'APPA', 'RESC'].includes(selectedOutcome.code)) { + if (this.form.controls.isSubjectToConditions.disabled) { + this.showComponents = true; + this.form.controls.isSubjectToConditions.enable(); + this.form.patchValue({ + isSubjectToConditions: null, + }); + this.showConditions = false; + } + } else if (this.form.controls.isSubjectToConditions.enabled) { + this.showComponents = false; + this.components = []; + this.conditions = []; + this.form.controls.isSubjectToConditions.disable(); + this.form.patchValue({ + isSubjectToConditions: 'false', + }); + } + + if (selectedOutcome.code === 'RESC') { + this.form.controls.rescindedComment.setValidators([Validators.required]); + this.form.controls.rescindedDate.setValidators([Validators.required]); + this.form.controls.rescindedComment.updateValueAndValidity(); + this.form.controls.rescindedDate.updateValueAndValidity(); + } else if (this.form.controls.rescindedComment.enabled) { + this.form.controls.rescindedComment.setValue(null); + this.form.controls.rescindedDate.setValue(null); + this.form.controls.rescindedComment.setValidators([]); + this.form.controls.rescindedDate.setValidators([]); + this.form.controls.rescindedComment.updateValueAndValidity(); + this.form.controls.rescindedDate.updateValueAndValidity(); + } + } + + onChangeSubjectToConditions($event: MatButtonToggleChange) { + if ($event.value === 'true') { + this.showConditions = true; + } else { + this.conditions = []; + this.conditionUpdates = []; + this.showConditions = false; + } + } +} diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-v2.component.html b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-v2.component.html new file mode 100644 index 0000000000..7dbb975abb --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-v2.component.html @@ -0,0 +1,242 @@ +
+

Decisions

+
+ +
+
+
+
No Decisions
+
+
+
+ +
+
+
+
+ Modified By:  + {{ decision.modifiedBy?.join(', ') }} + N/A +
+
+ +
+
+
+

Decision #{{ i }}

+
+ + calendar_month + {{ noticeOfIntent.activeDays }} + + + pause + {{ noticeOfIntent.pausedDays }} + +
+ + + + +
Res #{{ decision.resolutionNumber }}/{{ decision.resolutionYear }}
+ + + + + + +
+ + + + +
+ +
+
+ +

Resolution

+
+
+
+
Decision Date
+ {{ decision.date | momentFormat }} + +
+
+
Decision Maker
+ {{ decision.decisionMaker }} + +
+ +
+
Decision Outcome
+ {{ decision.outcome.label }} {{ decision.isSubjectToConditions ? '- Subject to Conditions' : '' }} +
+ +
+
Decision Description
+ {{ decision.decisionDescription }} + +
+ +
+
Stats Required
+ +
+ +
+
Rescinded Date
+ {{ decision.rescindedDate | momentFormat }} + +
+ +
+
Rescinded Comment
+ {{ decision.rescindedComment }} + +
+
+
+ +

Documents

+ + + + + + +

Components

+
+ + + +
{{ component.noticeOfIntentDecisionComponentType?.label }}
+
+ + + + + + + + + +
+
+
Agricultural Capability
+ {{ component.agCap }} + +
+
+
Agricultural Capability Source
+ {{ component.agCapSource }} + +
+ +
+
Agricultural Capability Mapsheet Reference
+ {{ component.agCapMap }} + +
+
+
Agricultural Capability Consultant
+ {{ component.agCapConsultant }} + +
+
+
+
+ +
+ + + +

Conditions

+
+ +
+ + +

Audit

+
+
+
+
Audit Date
+ {{ decision.auditDate | momentFormat }} + + + +
+
+
+ +
+ +
+
+
+
diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-v2.component.scss b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-v2.component.scss new file mode 100644 index 0000000000..ed21e4ab3a --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-v2.component.scss @@ -0,0 +1,156 @@ +@use '../../../../../styles/colors'; + +section { + margin-bottom: 64px; +} + +h4 { + margin-bottom: 12px !important; +} + +hr { + margin: 36px 0; + stroke: colors.$grey; +} + +.decision-container { + position: relative; +} + +.decision { + margin: 24px 0; + box-shadow: 0 2px 8px 1px rgba(0, 0, 0, 0.25); +} + +.decision.draft { + border: 2px solid colors.$secondary-color-light; +} + +.decision-section { + background: colors.$grey-light; + padding: 18px; +} + +.decision-section-no-title { + background: colors.$grey-light; + padding: 1px 18px; +} + +.header { + display: flex; + justify-content: space-between; + margin-bottom: 36px; + + .title { + display: flex; + align-items: center; + justify-content: space-between; + gap: 28px; + + .days { + display: inline-block; + margin-right: 6px; + margin-top: 4px; + + .mat-icon { + font-size: 19px !important; + line-height: 21px !important; + width: 19px; + vertical-align: middle; + } + } + } +} + +.loading-overlay { + position: absolute; + z-index: 2; + background-color: colors.$grey; + opacity: 0.4; + width: 100%; + height: 100%; + display: flex; + align-items: center; + justify-content: center; +} + +.post-decisions { + padding: 6px 32px; + background-color: colors.$grey-light; + grid-template-columns: 50% 50%; + display: grid; + min-height: 36px; + text-transform: uppercase; + border-radius: 4px 4px 0 0; +} + +.decision-menu { + position: absolute; + top: 0; + right: 0; + height: 36px; + background: colors.$accent-color; + box-shadow: -1px 1px 4px rgba(0, 0, 0, 0.25); + border-radius: 0 4px 0 10px; +} + +.decision-padding { + padding: 18px 32px; +} + +.no-decisions { + margin-top: 16px; + display: flex; + align-items: center; + justify-content: center; + background-color: colors.$grey-light; + height: 72px; +} + +.conditions-link-icon { + position: absolute; +} + +:host ::ng-deep { + .grid-2 { + margin-top: 18px; + margin-bottom: 18px; + display: grid; + grid-template-columns: 50% 50%; + grid-row-gap: 18px; + + .full-width { + grid-column: 1/3; + } + } + + .mat-mdc-table { + background: colors.$grey-light; + } + + .subheading2 { + margin-bottom: 6px !important; + } + + .row { + margin: 16px 0; + } + + .application-pill-wrapper, + .application-pill { + margin-right: 0 !important; + } + + table { + border-spacing: 12px; + margin-left: -12px; + } + + .soil-table-label { + font-weight: 700; + } + + .pre-wrapped-text { + white-space: pre-wrap; + } +} diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-v2.component.spec.ts b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-v2.component.spec.ts new file mode 100644 index 0000000000..9ed928895f --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-v2.component.spec.ts @@ -0,0 +1,86 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { MatDialog, MatDialogRef } from '@angular/material/dialog'; +import { MatSnackBarModule } from '@angular/material/snack-bar'; +import { ActivatedRoute } from '@angular/router'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { BehaviorSubject } from 'rxjs'; +import { NoticeOfIntentDecisionComponentService } from '../../../../services/notice-of-intent/decision-v2/notice-of-intent-decision-component/notice-of-intent-decision-component.service'; +import { NoticeOfIntentDecisionV2Service } from '../../../../services/notice-of-intent/decision-v2/notice-of-intent-decision-v2.service'; +import { + NoticeOfIntentDecisionDto, + NoticeOfIntentDecisionWithLinkedResolutionDto, +} from '../../../../services/notice-of-intent/decision/notice-of-intent-decision.dto'; +import { NoticeOfIntentDetailService } from '../../../../services/notice-of-intent/notice-of-intent-detail.service'; +import { NoticeOfIntentDto } from '../../../../services/notice-of-intent/notice-of-intent.dto'; +import { ToastService } from '../../../../services/toast/toast.service'; +import { ConfirmationDialogService } from '../../../../shared/confirmation-dialog/confirmation-dialog.service'; + +import { DecisionV2Component } from './decision-v2.component'; + +describe('DecisionV2Component', () => { + let component: DecisionV2Component; + let fixture: ComponentFixture; + let mockNOIDecisionService: DeepMocked; + let mockNOIDetailService: DeepMocked; + let mockNOIDecisionComponentService: DeepMocked; + + beforeEach(async () => { + mockNOIDecisionService = createMock(); + mockNOIDecisionService.$decision = new BehaviorSubject(undefined); + mockNOIDecisionService.$decisions = new BehaviorSubject([]); + + mockNOIDetailService = createMock(); + mockNOIDetailService.$noticeOfIntent = new BehaviorSubject(undefined); + + mockNOIDecisionComponentService = createMock(); + + await TestBed.configureTestingModule({ + imports: [MatSnackBarModule], + declarations: [DecisionV2Component], + providers: [ + { + provide: NoticeOfIntentDecisionV2Service, + useValue: mockNOIDecisionService, + }, + { + provide: NoticeOfIntentDetailService, + useValue: mockNOIDetailService, + }, + { + provide: MatDialogRef, + useValue: {}, + }, + { + provide: ConfirmationDialogService, + useValue: {}, + }, + { + provide: ToastService, + useValue: {}, + }, + { + provide: MatDialog, + useValue: {}, + }, + { + provide: NoticeOfIntentDecisionComponentService, + useValue: mockNOIDecisionComponentService, + }, + { + provide: ActivatedRoute, + useValue: {}, + }, + ], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(DecisionV2Component); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-v2.component.ts b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-v2.component.ts new file mode 100644 index 0000000000..f275aae97c --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-v2.component.ts @@ -0,0 +1,237 @@ +import { Component, ElementRef, OnDestroy, OnInit } from '@angular/core'; +import { MatDialog } from '@angular/material/dialog'; +import { ActivatedRoute, Router } from '@angular/router'; +import { Subject, takeUntil } from 'rxjs'; +import { NoticeOfIntentDecisionComponentService } from '../../../../services/notice-of-intent/decision-v2/notice-of-intent-decision-component/notice-of-intent-decision-component.service'; +import { NoticeOfIntentDecisionV2Service } from '../../../../services/notice-of-intent/decision-v2/notice-of-intent-decision-v2.service'; +import { + NOI_DECISION_COMPONENT_TYPE, + NoticeOfIntentDecisionDto, + NoticeOfIntentDecisionOutcomeCodeDto, +} from '../../../../services/notice-of-intent/decision/notice-of-intent-decision.dto'; +import { NoticeOfIntentDetailService } from '../../../../services/notice-of-intent/notice-of-intent-detail.service'; +import { NoticeOfIntentDto } from '../../../../services/notice-of-intent/notice-of-intent.dto'; +import { ToastService } from '../../../../services/toast/toast.service'; +import { + DRAFT_DECISION_TYPE_LABEL, + MODIFICATION_TYPE_LABEL, + RELEASED_DECISION_TYPE_LABEL, +} from '../../../../shared/application-type-pill/application-type-pill.constants'; +import { ConfirmationDialogService } from '../../../../shared/confirmation-dialog/confirmation-dialog.service'; +import { formatDateForApi } from '../../../../shared/utils/api-date-formatter'; +import { decisionChildRoutes } from '../decision.module'; +import { RevertToDraftDialogComponent } from './revert-to-draft-dialog/revert-to-draft-dialog.component'; + +type LoadingDecision = NoticeOfIntentDecisionDto & { + loading: boolean; +}; + +@Component({ + selector: 'app-noi-decision-v2', + templateUrl: './decision-v2.component.html', + styleUrls: ['./decision-v2.component.scss'], +}) +export class DecisionV2Component implements OnInit, OnDestroy { + $destroy = new Subject(); + createDecision = decisionChildRoutes.find((e) => e.path === 'create')!; + isDraftExists = true; + disabledCreateBtnTooltip = ''; + + fileNumber: string = ''; + decisionDate: number | undefined; + decisions: LoadingDecision[] = []; + outcomes: NoticeOfIntentDecisionOutcomeCodeDto[] = []; + isPaused = true; + + modificationLabel = MODIFICATION_TYPE_LABEL; + noticeOfIntent: NoticeOfIntentDto | undefined; + dratDecisionLabel = DRAFT_DECISION_TYPE_LABEL; + releasedDecisionLabel = RELEASED_DECISION_TYPE_LABEL; + + COMPONENT_TYPE = NOI_DECISION_COMPONENT_TYPE; + + constructor( + public dialog: MatDialog, + private noticeOfIntentDetailService: NoticeOfIntentDetailService, + private decisionService: NoticeOfIntentDecisionV2Service, + private toastService: ToastService, + private confirmationDialogService: ConfirmationDialogService, + private noticeOfIntentDecisionComponentService: NoticeOfIntentDecisionComponentService, + private router: Router, + private activatedRouter: ActivatedRoute, + private elementRef: ElementRef + ) {} + + ngOnInit(): void { + this.noticeOfIntentDetailService.$noticeOfIntent.pipe(takeUntil(this.$destroy)).subscribe((noticeOfIntent) => { + if (noticeOfIntent) { + this.fileNumber = noticeOfIntent.fileNumber; + this.decisionDate = noticeOfIntent.decisionDate; + this.isPaused = noticeOfIntent.paused; + this.loadDecisions(noticeOfIntent.fileNumber); + this.noticeOfIntent = noticeOfIntent; + } + }); + } + + async loadDecisions(fileNumber: string) { + const codes = await this.decisionService.fetchCodes(); + this.outcomes = codes.outcomes; + this.decisionService.loadDecisions(fileNumber); + + this.decisionService.$decisions.pipe(takeUntil(this.$destroy)).subscribe((decisions) => { + this.decisions = decisions.map((decision) => ({ + ...decision, + loading: false, + })); + + this.scrollToDecision(); + + this.isDraftExists = this.decisions.some((d) => d.isDraft); + this.disabledCreateBtnTooltip = this.isPaused + ? 'This notice of intent is currently paused. Only active notice of intents can have decisions.' + : 'A notice of intent can only have one decision draft at a time. Please release or delete the existing decision draft to continue.'; + }); + } + + scrollToDecision() { + const decisionUuid = this.activatedRouter.snapshot.queryParamMap.get('uuid'); + + setTimeout(() => { + if (this.decisions.length > 0 && decisionUuid) { + this.scrollToElement(decisionUuid); + } + }); + } + + async onCreate() { + const newDecision = await this.decisionService.create({ + resolutionYear: new Date().getFullYear(), + isDraft: true, + date: Date.now(), + fileNumber: this.fileNumber, + }); + + const index = this.decisions.length; + await this.router.navigate([ + `/notice-of-intent/${this.fileNumber}/decision/draft/${newDecision.uuid}/edit/${index + 1}`, + ]); + } + + async onEdit(selectedDecision: NoticeOfIntentDecisionDto) { + const position = this.decisions.findIndex((decision) => decision.uuid === selectedDecision.uuid); + const index = this.decisions.length - position; + await this.router.navigate([ + `/notice-of-intent/${this.fileNumber}/decision/draft/${selectedDecision.uuid}/edit/${index}`, + ]); + } + + async onRevertToDraft(uuid: string) { + const position = this.decisions.findIndex((decision) => decision.uuid === uuid); + const index = this.decisions.length - position; + this.dialog + .open(RevertToDraftDialogComponent, { + data: { fileNumber: this.fileNumber }, + }) + .beforeClosed() + .subscribe(async (didConfirm) => { + if (didConfirm) { + await this.decisionService.update(uuid, { + isDraft: true, + }); + await this.noticeOfIntentDetailService.load(this.fileNumber); + + await this.router.navigate([`/notice-of-intent/${this.fileNumber}/decision/draft/${uuid}/edit/${index}`]); + } + }); + } + + async deleteDecision(uuid: string) { + this.confirmationDialogService + .openDialog({ + body: 'Are you sure you want to delete the selected decision?', + }) + .subscribe(async (confirmed) => { + if (confirmed) { + this.decisions = this.decisions.map((decision) => { + return { + ...decision, + loading: decision.uuid === uuid, + }; + }); + await this.decisionService.delete(uuid); + await this.noticeOfIntentDetailService.load(this.fileNumber); + this.toastService.showSuccessToast('Decision deleted'); + } + }); + } + + async attachFile(decisionUuid: string, event: Event) { + this.decisions = this.decisions.map((decision) => { + return { + ...decision, + loading: decision.uuid === decisionUuid, + }; + }); + const element = event.target as HTMLInputElement; + const fileList = element.files; + if (fileList && fileList.length > 0) { + const file: File = fileList[0]; + const uploadedFile = await this.decisionService.uploadFile(decisionUuid, file); + if (uploadedFile) { + await this.loadDecisions(this.fileNumber); + } + } + } + + async onSaveAuditDate(decisionUuid: string, auditReviewDate: number) { + await this.decisionService.update(decisionUuid, { + auditDate: formatDateForApi(auditReviewDate), + isDraft: this.decisions.find((e) => e.uuid === decisionUuid)!.isDraft, + }); + await this.loadDecisions(this.fileNumber); + } + + async onSaveAlrArea(decisionUuid: string, componentUuid: string | undefined, value?: any) { + const decision = this.decisions.find((e) => e.uuid === decisionUuid); + const component = decision?.components.find((e) => e.uuid === componentUuid); + if (componentUuid && component) { + await this.noticeOfIntentDecisionComponentService.update(componentUuid, { + uuid: componentUuid, + noticeOfIntentDecisionComponentTypeCode: component.noticeOfIntentDecisionComponentTypeCode, + alrArea: value ? value : null, + }); + } else { + this.toastService.showErrorToast('Unable to update the Alr Area. Please reload the page and try again.'); + } + + await this.loadDecisions(this.fileNumber); + } + + async onStatsRequiredUpdate(decisionUuid: string, value: boolean) { + await this.decisionService.update(decisionUuid, { + isStatsRequired: value, + isDraft: this.decisions.find((e) => e.uuid === decisionUuid)!.isDraft, + }); + await this.loadDecisions(this.fileNumber); + } + + ngOnDestroy(): void { + this.decisionService.clearDecisions(); + this.$destroy.next(); + this.$destroy.complete(); + } + + scrollToElement(elementId: string) { + const id = `#${CSS.escape(elementId)}`; + const element = this.elementRef.nativeElement.querySelector(id); + + if (element) { + element.scrollIntoView({ + behavior: 'smooth', + block: 'start', + inline: 'start', + }); + } + } +} diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/release-dialog/release-dialog.component.html b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/release-dialog/release-dialog.component.html new file mode 100644 index 0000000000..3db6231291 --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/release-dialog/release-dialog.component.html @@ -0,0 +1,28 @@ +
+

Confirm Release Decision

+
+ +
+

+ This decision and document will be immediately visible to the Applicant and Local/First Nation Government. The + decision will be visible to the Public after the prescribed amount of days is exhausted. +

+

+ Upon releasing the decision, the application will be updated to the status: + +

+ If there is more than one decision, the status will not change +

+ The Applicant and Local/First Nation Government will not receive an auto-email notification. Please complete any + notification manually. +

+

The Applicant and Local/First Nation Government will receive an auto-email notification.

+
+ + + +
+ + +
+ diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/release-dialog/release-dialog.component.scss b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/release-dialog/release-dialog.component.scss new file mode 100644 index 0000000000..756d26e192 --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/release-dialog/release-dialog.component.scss @@ -0,0 +1,6 @@ +.grid { + display: grid; + grid-template-columns: 1fr; + grid-column-gap: 24px; + grid-row-gap: 24px; +} diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/release-dialog/release-dialog.component.spec.ts b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/release-dialog/release-dialog.component.spec.ts new file mode 100644 index 0000000000..4ff7b1b86f --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/release-dialog/release-dialog.component.spec.ts @@ -0,0 +1,52 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { BehaviorSubject } from 'rxjs'; +import { ApplicationService } from '../../../../../services/application/application.service'; +import { ApplicationDecisionV2Service } from '../../../../../services/application/decision/application-decision-v2/application-decision-v2.service'; +import { NoticeOfIntentDecisionV2Service } from '../../../../../services/notice-of-intent/decision-v2/notice-of-intent-decision-v2.service'; +import { NoticeOfIntentDecisionDto } from '../../../../../services/notice-of-intent/decision/notice-of-intent-decision.dto'; +import { NoticeOfIntentService } from '../../../../../services/notice-of-intent/notice-of-intent.service'; +import { ReleaseDialogComponent } from './release-dialog.component'; + +describe('ReleaseDialogComponent', () => { + let component: ReleaseDialogComponent; + let fixture: ComponentFixture; + let mockNOIService: DeepMocked; + let mockNOIDecisionV2Service: DeepMocked; + + beforeEach(async () => { + mockNOIService = createMock(); + mockNOIDecisionV2Service = createMock(); + mockNOIDecisionV2Service.$decision = new BehaviorSubject(undefined); + + await TestBed.configureTestingModule({ + declarations: [ReleaseDialogComponent], + providers: [ + { + provide: NoticeOfIntentService, + useValue: mockNOIService, + }, + { + provide: NoticeOfIntentDecisionV2Service, + useValue: mockNOIDecisionV2Service, + }, + { provide: MatDialogRef, useValue: {} }, + { + provide: MAT_DIALOG_DATA, + useValue: {}, + }, + ], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(ReleaseDialogComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/release-dialog/release-dialog.component.ts b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/release-dialog/release-dialog.component.ts new file mode 100644 index 0000000000..9411c72448 --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/release-dialog/release-dialog.component.ts @@ -0,0 +1,56 @@ +import { Component, Inject, OnDestroy, OnInit } from '@angular/core'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; +import { Subject, takeUntil } from 'rxjs'; +import { NoticeOfIntentDecisionV2Service } from '../../../../../services/notice-of-intent/decision-v2/notice-of-intent-decision-v2.service'; +import { NoticeOfIntentService } from '../../../../../services/notice-of-intent/notice-of-intent.service'; +import { ApplicationPill } from '../../../../../shared/application-type-pill/application-type-pill.component'; + +@Component({ + selector: 'app-release-dialog', + templateUrl: './release-dialog.component.html', + styleUrls: ['./release-dialog.component.scss'], +}) +export class ReleaseDialogComponent implements OnInit, OnDestroy { + $destroy = new Subject(); + mappedType?: ApplicationPill; + wasReleased = false; + + constructor( + private noticeOfIntentService: NoticeOfIntentService, + private decisionService: NoticeOfIntentDecisionV2Service, + public matDialogRef: MatDialogRef, + @Inject(MAT_DIALOG_DATA) data: any + ) {} + + ngOnInit(): void { + // this.applicationService.$applicationStatuses.pipe(takeUntil(this.$destroy)).subscribe((statuses) => { + // if (statuses) { + // const releasedStatus = statuses.find((status) => status.code === SUBMISSION_STATUS.ALC_DECISION); + // if (releasedStatus) { + // this.mappedType = { + // label: releasedStatus.label, + // backgroundColor: releasedStatus.alcsBackgroundColor, + // borderColor: releasedStatus.alcsBackgroundColor, + // textColor: releasedStatus.alcsColor, + // shortLabel: releasedStatus.label, + // }; + // } + // } + // }); + + this.decisionService.$decision.pipe(takeUntil(this.$destroy)).subscribe((decision) => { + if (decision) { + this.wasReleased = decision.wasReleased; + } + }); + } + + ngOnDestroy(): void { + this.$destroy.next(); + this.$destroy.complete(); + } + + onRelease() { + this.matDialogRef.close(true); + } +} diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/revert-to-draft-dialog/revert-to-draft-dialog.component.html b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/revert-to-draft-dialog/revert-to-draft-dialog.component.html new file mode 100644 index 0000000000..af89c6851d --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/revert-to-draft-dialog/revert-to-draft-dialog.component.html @@ -0,0 +1,30 @@ +
+

Confirm Revert to Draft

+
+ +
+

+ This decision and document will be reverted into draft form, providing you with full editing capabilities but + hiding it from the Applicant, Local/First Nation Government, and the Public. +

+

+ Upon reverting the decision to draft, the application will be updated to the status: + +

+ If there is more than one decision, the status will not change +

+ The Applicant and Local/First Nation Government will not receive an auto-email notification. Please complete any + notification manually. +

+
+ + + +
+ + +
+ diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/revert-to-draft-dialog/revert-to-draft-dialog.component.scss b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/revert-to-draft-dialog/revert-to-draft-dialog.component.scss new file mode 100644 index 0000000000..756d26e192 --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/revert-to-draft-dialog/revert-to-draft-dialog.component.scss @@ -0,0 +1,6 @@ +.grid { + display: grid; + grid-template-columns: 1fr; + grid-column-gap: 24px; + grid-row-gap: 24px; +} diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/revert-to-draft-dialog/revert-to-draft-dialog.component.spec.ts b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/revert-to-draft-dialog/revert-to-draft-dialog.component.spec.ts new file mode 100644 index 0000000000..dfa843d347 --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/revert-to-draft-dialog/revert-to-draft-dialog.component.spec.ts @@ -0,0 +1,31 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; +import { NoticeOfIntentSubmissionStatusService } from '../../../../../services/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service'; + +import { RevertToDraftDialogComponent } from './revert-to-draft-dialog.component'; + +describe('RevertToDraftDialogComponent', () => { + let component: RevertToDraftDialogComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [RevertToDraftDialogComponent], + providers: [ + { provide: MatDialogRef, useValue: {} }, + { provide: NoticeOfIntentSubmissionStatusService, useValue: {} }, + { provide: MAT_DIALOG_DATA, useValue: {} }, + ], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(RevertToDraftDialogComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/revert-to-draft-dialog/revert-to-draft-dialog.component.ts b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/revert-to-draft-dialog/revert-to-draft-dialog.component.ts new file mode 100644 index 0000000000..faec1414a0 --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/revert-to-draft-dialog/revert-to-draft-dialog.component.ts @@ -0,0 +1,49 @@ +import { Component, Inject } from '@angular/core'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; +import { SUBMISSION_STATUS } from '../../../../../services/application/application.dto'; +import { NoticeOfIntentSubmissionStatusService } from '../../../../../services/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service'; +import { ApplicationSubmissionStatusPill } from '../../../../../shared/application-submission-status-type-pill/application-submission-status-type-pill.component'; + +@Component({ + selector: 'app-revert-to-draft-dialog', + templateUrl: './revert-to-draft-dialog.component.html', + styleUrls: ['./revert-to-draft-dialog.component.scss'], +}) +export class RevertToDraftDialogComponent { + mappedType?: ApplicationSubmissionStatusPill; + + constructor( + public matDialogRef: MatDialogRef, + private noticeOfIntentSubmissionStatusService: NoticeOfIntentSubmissionStatusService, + @Inject(MAT_DIALOG_DATA) data: { fileNumber: string } + ) { + this.calculateStatusChange(data.fileNumber); + } + + async calculateStatusChange(fileNumber: string) { + const statusHistory = await this.noticeOfIntentSubmissionStatusService.fetchSubmissionStatusesByFileNumber( + fileNumber + ); + const validStatuses = statusHistory + .filter( + (status) => + status.effectiveDate && + status.statusTypeCode !== SUBMISSION_STATUS.ALC_DECISION && + status.effectiveDate < Date.now() + ) + .sort((a, b) => b.status.weight! - a.status.weight!); + + if (validStatuses && validStatuses.length > 0) { + const newStatus = validStatuses[0].status; + this.mappedType = { + label: newStatus.label, + backgroundColor: newStatus.alcsBackgroundColor, + textColor: newStatus.alcsColor, + }; + } + } + + onConfirm() { + this.matDialogRef.close(true); + } +} diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision.component.html b/alcs-frontend/src/app/features/notice-of-intent/decision/decision.component.html index 6992915501..93d6cc768d 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/decision/decision.component.html +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision.component.html @@ -1,105 +1,7 @@ -
-

Decision

-
- -
-
-
-
No Decisions
-
-
-
- -
-
-
-
- Modified By:  - {{ decision.modifiedByResolutions.join(', ') }} - N/A -
-
- -
- - - -
-
-
- Decision #{{ decisions.length - i }} - - - calendar_month - {{ noticeOfIntent.activeDays >= MAX_ACTIVE_DAYS ? '61+' : noticeOfIntent.activeDays }} - - - - - - Res #{{ decision.resolutionNumber }}/{{ decision.resolutionYear }} -
-
-
-
Decision Date
- {{ decision.date | momentFormat }} -
-
-
Decision Outcome
- {{ decision.outcome.label }} -
-
-
Decision Maker
- {{ decision.decisionMaker }} -
-
-
Decision Maker Name
- {{ decision.decisionMakerName ?? 'No Data' }} -
-
-
Audit Date
- {{ decision.auditDate | momentFormat }} - - - -
-
-
Documents
-
-
File Name
-
File Upload Date
-
File Actions
-
No Documents
- - -
{{ document.uploadedAt | momentFormat }}
-
- - -
- -
-
+
+ + +
+
diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision.component.scss b/alcs-frontend/src/app/features/notice-of-intent/decision/decision.component.scss index 4913228a68..e69de29bb2 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/decision/decision.component.scss +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision.component.scss @@ -1,142 +0,0 @@ -@use '../../../../styles/colors'; - -h3 { - margin-bottom: 24px !important; -} - -section { - margin-bottom: 64px; -} - -.decision-container { - position: relative; -} - -.decision { - margin: 24px 0; - box-shadow: 0 2px 8px 1px rgba(0, 0, 0, 0.25); -} - -.loading-overlay { - position: absolute; - z-index: 2; - background-color: colors.$grey; - opacity: 0.4; - width: 100%; - height: 100%; - display: flex; - align-items: center; - justify-content: center; -} - -.days { - display: inline-block; - margin-right: 16px; - margin-left: 16px; - - .mat-icon { - font-size: 19px !important; - line-height: 21px !important; - width: 19px; - vertical-align: middle; - } -} - -.post-decisions { - padding: 6px 32px; - background-color: colors.$grey-light; - grid-template-columns: 1fr 1fr; - display: grid; - min-height: 36px; - text-transform: uppercase; - border-radius: 4px 4px 0 0; - box-shadow: -1px 1px 4px rgba(0, 0, 0, 0.25); -} - -.decision-menu { - position: absolute; - top: 0; - right: 0; - height: 36px; - background: colors.$accent-color; - box-shadow: -1px 1px 4px rgba(0, 0, 0, 0.25); - border-radius: 0 4px 0 10px; - - button { - color: colors.$white; - width: 36px; - height: 36px; - line-height: 36px; - } - - mat-icon { - position: absolute; - top: 8px; - left: 8px; - font-size: 21px; - width: 20px; - height: 36px; - } -} - -.decision-padding { - padding: 18px 32px 32px 32px; -} - -.decision-content { - margin-top: 16px; - margin-bottom: 32px; - margin-right: 100px; - display: grid; - grid-template-columns: 1fr 1fr; - grid-row-gap: 24px; - - .subheading2 { - margin-bottom: 6px !important; - } - - & > div { - font-size: 16px; - } -} - -.decision-documents { - margin-top: 4px; - display: grid; - grid-template-columns: 1fr 1fr 100px; - grid-row-gap: 4px; - - div { - display: flex; - align-items: center; - font-size: 16px !important; - } -} - -.file-actions { - margin-left: -12px; -} - -.delete-file-icon { - color: colors.$error-color; -} - -.no-decisions { - margin-top: 16px; - display: flex; - align-items: center; - justify-content: center; - background-color: colors.$grey-light; - height: 72px; -} - -.no-files { - grid-column: 1/4; - margin-top: 16px; - padding: 16px; - display: flex; - align-items: center; - justify-content: center; - text-align: center; - background-color: colors.$grey-light; -} diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision.component.spec.ts b/alcs-frontend/src/app/features/notice-of-intent/decision/decision.component.spec.ts index aca299f23d..8e5c05ab6d 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/decision/decision.component.spec.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision.component.spec.ts @@ -1,58 +1,33 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { MatDialog, MatDialogRef } from '@angular/material/dialog'; -import { MatSnackBarModule } from '@angular/material/snack-bar'; import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { BehaviorSubject } from 'rxjs'; -import { NoticeOfIntentDecisionService } from '../../../services/notice-of-intent/decision/notice-of-intent-decision.service'; import { NoticeOfIntentDetailService } from '../../../services/notice-of-intent/notice-of-intent-detail.service'; import { NoticeOfIntentDto } from '../../../services/notice-of-intent/notice-of-intent.dto'; -import { ToastService } from '../../../services/toast/toast.service'; -import { ConfirmationDialogService } from '../../../shared/confirmation-dialog/confirmation-dialog.service'; import { DecisionComponent } from './decision.component'; describe('DecisionComponent', () => { let component: DecisionComponent; let fixture: ComponentFixture; - let mockNOIDetailService: DeepMocked; + let mockNoticeOfIntentDetailService: DeepMocked; beforeEach(async () => { - mockNOIDetailService = createMock(); - mockNOIDetailService.$noticeOfIntent = new BehaviorSubject(undefined); + mockNoticeOfIntentDetailService = createMock(); await TestBed.configureTestingModule({ - imports: [MatSnackBarModule], - declarations: [DecisionComponent], providers: [ { provide: NoticeOfIntentDetailService, - useValue: mockNOIDetailService, - }, - { - provide: NoticeOfIntentDecisionService, - useValue: {}, - }, - { - provide: MatDialogRef, - useValue: {}, - }, - { - provide: ConfirmationDialogService, - useValue: {}, - }, - { - provide: ToastService, - useValue: {}, - }, - { - provide: MatDialog, - useValue: {}, + useValue: mockNoticeOfIntentDetailService, }, ], + declarations: [DecisionComponent], schemas: [NO_ERRORS_SCHEMA], }).compileComponents(); + mockNoticeOfIntentDetailService.$noticeOfIntent = new BehaviorSubject(undefined); + fixture = TestBed.createComponent(DecisionComponent); component = fixture.componentInstance; fixture.detectChanges(); diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision.component.ts b/alcs-frontend/src/app/features/notice-of-intent/decision/decision.component.ts index 2d0bc788fc..b66c07d007 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/decision/decision.component.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision.component.ts @@ -1,205 +1,32 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; -import { MatDialog } from '@angular/material/dialog'; import { Subject, takeUntil } from 'rxjs'; -import { - NoticeOfIntentDecisionDto, - NoticeOfIntentDecisionOutcomeCodeDto, -} from '../../../services/notice-of-intent/decision/notice-of-intent-decision.dto'; -import { NoticeOfIntentDecisionService } from '../../../services/notice-of-intent/decision/notice-of-intent-decision.service'; import { NoticeOfIntentDetailService } from '../../../services/notice-of-intent/notice-of-intent-detail.service'; import { NoticeOfIntentDto } from '../../../services/notice-of-intent/notice-of-intent.dto'; -import { ToastService } from '../../../services/toast/toast.service'; -import { MODIFICATION_TYPE_LABEL } from '../../../shared/application-type-pill/application-type-pill.constants'; -import { ConfirmationDialogService } from '../../../shared/confirmation-dialog/confirmation-dialog.service'; -import { formatDateForApi } from '../../../shared/utils/api-date-formatter'; -import { DecisionDialogComponent } from './decision-dialog/decision-dialog.component'; - -type LoadingDecision = NoticeOfIntentDecisionDto & { - modifiedByResolutions: string[]; - loading: boolean; -}; +import { SYSTEM_SOURCE_TYPES } from '../../../shared/dto/system-source.types.dto'; @Component({ - selector: 'app-noi-decision', + selector: 'app-decision', templateUrl: './decision.component.html', styleUrls: ['./decision.component.scss'], }) export class DecisionComponent implements OnInit, OnDestroy { $destroy = new Subject(); - fileNumber: string = ''; - decisionDate: number | undefined; - decisions: LoadingDecision[] = []; - outcomes: NoticeOfIntentDecisionOutcomeCodeDto[] = []; - isPaused = true; - MAX_ACTIVE_DAYS = 61; + SYSTEM_SOURCE_TYPES = SYSTEM_SOURCE_TYPES; noticeOfIntent: NoticeOfIntentDto | undefined; - modificationLabel = MODIFICATION_TYPE_LABEL; - constructor( - public dialog: MatDialog, - private noticeOfIntentDetailService: NoticeOfIntentDetailService, - private decisionService: NoticeOfIntentDecisionService, - private toastService: ToastService, - private confirmationDialogService: ConfirmationDialogService - ) {} + constructor(private noticeOfIntentDetailService: NoticeOfIntentDetailService) {} ngOnInit(): void { this.noticeOfIntentDetailService.$noticeOfIntent.pipe(takeUntil(this.$destroy)).subscribe((noticeOfIntent) => { if (noticeOfIntent) { - this.fileNumber = noticeOfIntent.fileNumber; - this.decisionDate = noticeOfIntent.decisionDate; - this.isPaused = noticeOfIntent.paused; - this.loadDecisions(noticeOfIntent.fileNumber); this.noticeOfIntent = noticeOfIntent; + } else { + this.noticeOfIntent = undefined; } }); } - async loadDecisions(fileNumber: string) { - const codes = await this.decisionService.fetchCodes(); - this.outcomes = codes.outcomes; - - const loadedDecision = await this.decisionService.fetchByFileNumber(fileNumber); - - this.decisions = loadedDecision.map((decision) => ({ - ...decision, - loading: false, - modifiedByResolutions: decision.modifiedBy?.flatMap((r) => r.linkedResolutions) || [], - })); - } - - onCreate() { - let minDate = new Date(0); - if (this.decisions.length > 0) { - minDate = new Date(this.decisions[this.decisions.length - 1].date); - } - - this.dialog - .open(DecisionDialogComponent, { - minWidth: '600px', - maxWidth: '900px', - maxHeight: '80vh', - width: '90%', - autoFocus: false, - data: { - isFirstDecision: this.decisions.length === 0, - minDate, - fileNumber: this.fileNumber, - outcomes: this.outcomes, - }, - }) - .afterClosed() - .subscribe((didCreate) => { - if (didCreate) { - this.noticeOfIntentDetailService.load(this.fileNumber); - } - }); - } - - onEdit(decision: LoadingDecision) { - const decisionIndex = this.decisions.indexOf(decision); - let minDate = new Date(0); - if (decisionIndex !== this.decisions.length - 1) { - minDate = new Date(this.decisions[this.decisions.length - 1].date); - } - this.dialog - .open(DecisionDialogComponent, { - minWidth: '600px', - maxWidth: '900px', - maxHeight: '80vh', - width: '90%', - autoFocus: false, - data: { - isFirstDecision: decisionIndex === this.decisions.length - 1, - minDate, - fileNumber: this.fileNumber, - outcomes: this.outcomes, - existingDecision: decision, - }, - }) - .afterClosed() - .subscribe((didModify) => { - if (didModify) { - this.noticeOfIntentDetailService.load(this.fileNumber); - } - }); - } - - async deleteDecision(uuid: string) { - this.confirmationDialogService - .openDialog({ - body: 'Are you sure you want to delete the selected decision?', - }) - .subscribe(async (confirmed) => { - if (confirmed) { - this.decisions = this.decisions.map((decision) => { - return { - ...decision, - loading: decision.uuid === uuid, - }; - }); - await this.decisionService.delete(uuid); - await this.noticeOfIntentDetailService.load(this.fileNumber); - this.toastService.showSuccessToast('Decision deleted'); - } - }); - } - - async attachFile(decisionUuid: string, event: Event) { - this.decisions = this.decisions.map((decision) => { - return { - ...decision, - loading: decision.uuid === decisionUuid, - }; - }); - const element = event.target as HTMLInputElement; - const fileList = element.files; - if (fileList && fileList.length > 0) { - const file: File = fileList[0]; - const uploadedFile = await this.decisionService.uploadFile(decisionUuid, file); - if (uploadedFile) { - await this.loadDecisions(this.fileNumber); - } - } - } - - async downloadFile(decisionUuid: string, decisionDocumentUuid: string, fileName: string) { - await this.decisionService.downloadFile(decisionUuid, decisionDocumentUuid, fileName, false); - } - - async openFile(decisionUuid: string, decisionDocumentUuid: string, fileName: string) { - await this.decisionService.downloadFile(decisionUuid, decisionDocumentUuid, fileName); - } - - async deleteFile(decisionUuid: string, decisionDocumentUuid: string, fileName: string) { - this.confirmationDialogService - .openDialog({ - body: `Are you sure you want to delete the file ${fileName}?`, - }) - .subscribe(async (confirmed) => { - if (confirmed) { - this.decisions = this.decisions.map((decision) => { - return { - ...decision, - loading: decision.uuid === decisionUuid, - }; - }); - - await this.decisionService.deleteFile(decisionUuid, decisionDocumentUuid); - await this.loadDecisions(this.fileNumber); - this.toastService.showSuccessToast('File deleted'); - } - }); - } - - async onSaveAuditDate(decisionUuid: string, auditReviewDate: number) { - await this.decisionService.update(decisionUuid, { - auditDate: formatDateForApi(auditReviewDate), - }); - await this.loadDecisions(this.fileNumber); - } - ngOnDestroy(): void { this.$destroy.next(); this.$destroy.complete(); diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision.module.ts b/alcs-frontend/src/app/features/notice-of-intent/decision/decision.module.ts new file mode 100644 index 0000000000..af64437137 --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision.module.ts @@ -0,0 +1,82 @@ +import { NgModule } from '@angular/core'; +import { RouterModule } from '@angular/router'; +import { NgxMaskDirective } from 'ngx-mask'; +import { SharedModule } from '../../../shared/shared.module'; +import { ConditionComponent } from './conditions/condition/condition.component'; +import { ConditionsComponent } from './conditions/conditions.component'; +import { DecisionDialogComponent } from './decision-dialog/decision-dialog.component'; +import { DecisionV1Component } from './decision-v1/decision-v1.component'; +import { BasicComponent } from './decision-v2/decision-component/basic/basic.component'; +import { PfrsComponent } from './decision-v2/decision-component/pfrs/pfrs.component'; +import { PofoComponent } from './decision-v2/decision-component/pofo/pofo.component'; +import { RosoComponent } from './decision-v2/decision-component/roso/roso.component'; +import { DecisionDocumentsComponent } from './decision-v2/decision-documents/decision-documents.component'; +import { DecisionComponentComponent } from './decision-v2/decision-input/decision-components/decision-component/decision-component.component'; +import { PfrsInputComponent } from './decision-v2/decision-input/decision-components/decision-component/pfrs-input/pfrs-input.component'; +import { PofoInputComponent } from './decision-v2/decision-input/decision-components/decision-component/pofo-input/pofo-input.component'; +import { RosoInputComponent } from './decision-v2/decision-input/decision-components/decision-component/roso-input/roso-input.component'; +import { DecisionComponentsComponent } from './decision-v2/decision-input/decision-components/decision-components.component'; +import { DecisionConditionComponent } from './decision-v2/decision-input/decision-conditions/decision-condition/decision-condition.component'; +import { DecisionConditionsComponent } from './decision-v2/decision-input/decision-conditions/decision-conditions.component'; +import { DecisionDocumentUploadDialogComponent } from './decision-v2/decision-input/decision-file-upload-dialog/decision-document-upload-dialog.component'; +import { DecisionInputV2Component } from './decision-v2/decision-input/decision-input-v2.component'; +import { DecisionV2Component } from './decision-v2/decision-v2.component'; +import { ReleaseDialogComponent } from './decision-v2/release-dialog/release-dialog.component'; +import { RevertToDraftDialogComponent } from './decision-v2/revert-to-draft-dialog/revert-to-draft-dialog.component'; +import { DecisionComponent } from './decision.component'; + +export const decisionChildRoutes = [ + { + path: '', + menuTitle: 'Decision', + component: DecisionComponent, + portalOnly: false, + }, + { + path: 'create', + menuTitle: 'Decision', + component: DecisionInputV2Component, + portalOnly: false, + }, + { + path: 'draft/:uuid/edit/:index', + menuTitle: 'Decision', + component: DecisionInputV2Component, + portalOnly: false, + }, + { + path: 'conditions/:uuid', + menuTitle: 'Conditions', + component: ConditionsComponent, + portalOnly: false, + }, +]; + +@NgModule({ + declarations: [ + DecisionComponent, + DecisionV2Component, + DecisionInputV2Component, + DecisionV1Component, + DecisionDialogComponent, + ReleaseDialogComponent, + DecisionComponentComponent, + DecisionComponentsComponent, + DecisionDocumentUploadDialogComponent, + RevertToDraftDialogComponent, + DecisionDocumentsComponent, + DecisionConditionComponent, + DecisionConditionsComponent, + PofoInputComponent, + PofoComponent, + RosoComponent, + RosoInputComponent, + PfrsInputComponent, + PfrsComponent, + ConditionsComponent, + ConditionComponent, + BasicComponent, + ], + imports: [SharedModule.forRoot(), RouterModule.forChild(decisionChildRoutes), NgxMaskDirective], +}) +export class DecisionModule {} diff --git a/alcs-frontend/src/app/features/notice-of-intent/notice-of-intent.component.ts b/alcs-frontend/src/app/features/notice-of-intent/notice-of-intent.component.ts index fea65ebd34..f344756e9a 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/notice-of-intent.component.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/notice-of-intent.component.ts @@ -8,7 +8,7 @@ import { NoticeOfIntentModificationDto } from '../../services/notice-of-intent/n import { NoticeOfIntentModificationService } from '../../services/notice-of-intent/notice-of-intent-modification/notice-of-intent-modification.service'; import { NoticeOfIntentDto } from '../../services/notice-of-intent/notice-of-intent.dto'; import { ApplicantInfoComponent } from './applicant-info/applicant-info.component'; -import { DecisionComponent } from './decision/decision.component'; +import { decisionChildRoutes, DecisionModule } from './decision/decision.module'; import { NoiDocumentsComponent } from './documents/documents.component'; import { InfoRequestsComponent } from './info-requests/info-requests.component'; import { IntakeComponent } from './intake/intake.component'; @@ -50,9 +50,11 @@ export const childRoutes = [ }, { path: 'decision', - menuTitle: 'Decision', + menuTitle: 'Decisions', icon: 'gavel', - component: DecisionComponent, + module: DecisionModule, + portalOnly: false, + children: decisionChildRoutes, }, { path: 'post-decision', @@ -91,10 +93,12 @@ export class NoticeOfIntentComponent implements OnInit, OnDestroy { ) {} ngOnInit(): void { + this.fileNumber = '100135'; + this.load(); + this.route.params.pipe(takeUntil(this.destroy)).subscribe(async (routeParams) => { const { fileNumber } = routeParams; this.fileNumber = fileNumber; - this.load(); }); this.noticeOfIntentDetailService.$noticeOfIntent.pipe(takeUntil(this.destroy)).subscribe((noticeOfIntent) => { @@ -113,14 +117,14 @@ export class NoticeOfIntentComponent implements OnInit, OnDestroy { }); } + async load() { + await this.noticeOfIntentDetailService.load(this.fileNumber!); + } + ngOnDestroy(): void { this.noticeOfIntentDetailService.clear(); this.noticeOfIntentModificationService.clearModifications(); this.destroy.next(); this.destroy.complete(); } - - async load() { - await this.noticeOfIntentDetailService.load(this.fileNumber!); - } } diff --git a/alcs-frontend/src/app/features/notice-of-intent/notice-of-intent.module.ts b/alcs-frontend/src/app/features/notice-of-intent/notice-of-intent.module.ts index 8c43fd5ed7..c82a7d121d 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/notice-of-intent.module.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/notice-of-intent.module.ts @@ -4,8 +4,6 @@ import { NoticeOfIntentDetailService } from '../../services/notice-of-intent/not import { SharedModule } from '../../shared/shared.module'; import { ApplicantInfoComponent } from './applicant-info/applicant-info.component'; import { NoticeOfIntentDetailsModule } from './applicant-info/notice-of-intent-details/notice-of-intent-details.module'; -import { DecisionDialogComponent } from './decision/decision-dialog/decision-dialog.component'; -import { DecisionComponent } from './decision/decision.component'; import { DocumentUploadDialogComponent } from './documents/document-upload-dialog/document-upload-dialog.component'; import { NoiDocumentsComponent } from './documents/documents.component'; import { InfoRequestDialogComponent } from './info-requests/info-request-dialog/info-request-dialog.component'; @@ -39,8 +37,6 @@ const routes: Routes = [ InfoRequestDialogComponent, PreparationComponent, NoticeOfIntentMeetingDialogComponent, - DecisionComponent, - DecisionDialogComponent, PostDecisionComponent, EditModificationDialogComponent, NoiDocumentsComponent, diff --git a/alcs-frontend/src/app/services/decision-condition-types/decision-condition-types.service.spec.ts b/alcs-frontend/src/app/services/application/application-decision-condition-types/application-decision-condition-types.service.spec.ts similarity index 92% rename from alcs-frontend/src/app/services/decision-condition-types/decision-condition-types.service.spec.ts rename to alcs-frontend/src/app/services/application/application-decision-condition-types/application-decision-condition-types.service.spec.ts index 0d6ff26077..fcb4539053 100644 --- a/alcs-frontend/src/app/services/decision-condition-types/decision-condition-types.service.spec.ts +++ b/alcs-frontend/src/app/services/application/application-decision-condition-types/application-decision-condition-types.service.spec.ts @@ -2,11 +2,11 @@ import { HttpClient } from '@angular/common/http'; import { TestBed } from '@angular/core/testing'; import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { of, throwError } from 'rxjs'; -import { ToastService } from '../toast/toast.service'; -import { DecisionConditionTypesService } from './decision-condition-types.service'; +import { ToastService } from '../../toast/toast.service'; +import { ApplicationDecisionConditionTypesService } from './application-decision-condition-types.service'; describe('DecisionConditionTypesService', () => { - let service: DecisionConditionTypesService; + let service: ApplicationDecisionConditionTypesService; let mockHttpClient: DeepMocked; let mockToastService: DeepMocked; @@ -26,7 +26,7 @@ describe('DecisionConditionTypesService', () => { }, ], }); - service = TestBed.inject(DecisionConditionTypesService); + service = TestBed.inject(ApplicationDecisionConditionTypesService); }); it('should be created', () => { diff --git a/alcs-frontend/src/app/services/decision-condition-types/decision-condition-types.service.ts b/alcs-frontend/src/app/services/application/application-decision-condition-types/application-decision-condition-types.service.ts similarity index 84% rename from alcs-frontend/src/app/services/decision-condition-types/decision-condition-types.service.ts rename to alcs-frontend/src/app/services/application/application-decision-condition-types/application-decision-condition-types.service.ts index 094e6edc15..5d6698a78c 100644 --- a/alcs-frontend/src/app/services/decision-condition-types/decision-condition-types.service.ts +++ b/alcs-frontend/src/app/services/application/application-decision-condition-types/application-decision-condition-types.service.ts @@ -1,14 +1,14 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { firstValueFrom } from 'rxjs'; -import { environment } from '../../../environments/environment'; -import { ApplicationDecisionConditionTypeDto } from '../application/decision/application-decision-v2/application-decision-v2.dto'; -import { ToastService } from '../toast/toast.service'; +import { environment } from '../../../../environments/environment'; +import { ApplicationDecisionConditionTypeDto } from '../decision/application-decision-v2/application-decision-v2.dto'; +import { ToastService } from '../../toast/toast.service'; @Injectable({ providedIn: 'root', }) -export class DecisionConditionTypesService { +export class ApplicationDecisionConditionTypesService { private url = `${environment.apiUrl}/decision-condition-types`; constructor(private http: HttpClient, private toastService: ToastService) {} diff --git a/alcs-frontend/src/app/services/decision-maker/decision-maker.service.spec.ts b/alcs-frontend/src/app/services/application/application-decision-maker/application-decision-maker.service.spec.ts similarity index 93% rename from alcs-frontend/src/app/services/decision-maker/decision-maker.service.spec.ts rename to alcs-frontend/src/app/services/application/application-decision-maker/application-decision-maker.service.spec.ts index 28b1532158..a8477fcbf7 100644 --- a/alcs-frontend/src/app/services/decision-maker/decision-maker.service.spec.ts +++ b/alcs-frontend/src/app/services/application/application-decision-maker/application-decision-maker.service.spec.ts @@ -2,11 +2,11 @@ import { HttpClient } from '@angular/common/http'; import { TestBed } from '@angular/core/testing'; import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { of, throwError } from 'rxjs'; -import { ToastService } from '../toast/toast.service'; -import { DecisionMakerService } from './decision-maker.service'; +import { ToastService } from '../../toast/toast.service'; +import { ApplicationDecisionMakerService } from './application-decision-maker.service'; describe('DecisionMakerService', () => { - let service: DecisionMakerService; + let service: ApplicationDecisionMakerService; let mockHttpClient: DeepMocked; let mockToastService: DeepMocked; @@ -26,7 +26,7 @@ describe('DecisionMakerService', () => { }, ], }); - service = TestBed.inject(DecisionMakerService); + service = TestBed.inject(ApplicationDecisionMakerService); }); it('should be created', () => { diff --git a/alcs-frontend/src/app/services/decision-maker/decision-maker.service.ts b/alcs-frontend/src/app/services/application/application-decision-maker/application-decision-maker.service.ts similarity index 84% rename from alcs-frontend/src/app/services/decision-maker/decision-maker.service.ts rename to alcs-frontend/src/app/services/application/application-decision-maker/application-decision-maker.service.ts index efb97f784f..891a034e32 100644 --- a/alcs-frontend/src/app/services/decision-maker/decision-maker.service.ts +++ b/alcs-frontend/src/app/services/application/application-decision-maker/application-decision-maker.service.ts @@ -1,14 +1,14 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { firstValueFrom } from 'rxjs'; -import { environment } from '../../../environments/environment'; -import { DecisionMakerDto } from '../application/decision/application-decision-v1/application-decision.dto'; -import { ToastService } from '../toast/toast.service'; +import { environment } from '../../../../environments/environment'; +import { DecisionMakerDto } from '../decision/application-decision-v1/application-decision.dto'; +import { ToastService } from '../../toast/toast.service'; @Injectable({ providedIn: 'root', }) -export class DecisionMakerService { +export class ApplicationDecisionMakerService { private url = `${environment.apiUrl}/decision-maker`; constructor(private http: HttpClient, private toastService: ToastService) {} diff --git a/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-component/application-decision-component.service.ts b/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-component/application-decision-component.service.ts index 26e589c5fd..843d7d1299 100644 --- a/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-component/application-decision-component.service.ts +++ b/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-component/application-decision-component.service.ts @@ -3,7 +3,7 @@ import { Injectable } from '@angular/core'; import { firstValueFrom } from 'rxjs'; import { environment } from '../../../../../../environments/environment'; import { ToastService } from '../../../../toast/toast.service'; -import { DecisionComponentDto } from '../application-decision-v2.dto'; +import { ApplicationDecisionComponentDto } from '../application-decision-v2.dto'; @Injectable({ providedIn: 'root', @@ -13,9 +13,9 @@ export class ApplicationDecisionComponentService { constructor(private http: HttpClient, private toastService: ToastService) {} - async update(uuid: string, data: DecisionComponentDto) { + async update(uuid: string, data: ApplicationDecisionComponentDto) { try { - const res = await firstValueFrom(this.http.patch(`${this.url}/${uuid}`, data)); + const res = await firstValueFrom(this.http.patch(`${this.url}/${uuid}`, data)); this.toastService.showSuccessToast('Decision updated'); return res; } catch (e) { diff --git a/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-v2.dto.ts b/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-v2.dto.ts index 1a1be3a708..903e0e5bf0 100644 --- a/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-v2.dto.ts +++ b/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-v2.dto.ts @@ -41,7 +41,7 @@ export interface CreateApplicationDecisionDto extends UpdateApplicationDecisionD modifiesUuid: string | null; reconsidersUuid: string | null; isDraft: boolean; - decisionComponents?: DecisionComponentDto[]; + decisionComponents?: ApplicationDecisionComponentDto[]; } export interface ApplicationDecisionDto { @@ -72,7 +72,7 @@ export interface ApplicationDecisionDto { reconsiders?: LinkedResolutionDto; reconsideredBy?: LinkedResolutionDto[]; modifiedBy?: LinkedResolutionDto[]; - components: DecisionComponentDto[]; + components: ApplicationDecisionComponentDto[]; conditions: ApplicationDecisionConditionDto[]; wasReleased: boolean; } @@ -170,7 +170,7 @@ export interface InclExclDecisionComponentDto { inclExclApplicantType?: string | null; } -export interface DecisionComponentDto +export interface ApplicationDecisionComponentDto extends NfuDecisionComponentDto, TurpDecisionComponentDto, PofoDecisionComponentDto, @@ -190,7 +190,7 @@ export interface DecisionComponentDto conditionComponentsLabels?: string; } -export interface DecisionCodesDto { +export interface ApplicationDecisionCodesDto { outcomes: DecisionOutcomeCodeDto[]; decisionMakers: DecisionMakerDto[]; ceoCriterion: CeoCriterionDto[]; @@ -226,7 +226,7 @@ export interface ApplicationDecisionConditionDto { completionDate?: number | null; supersededDate?: number | null; type?: ApplicationDecisionConditionTypeDto | null; - components?: DecisionComponentDto[] | null; + components?: ApplicationDecisionComponentDto[] | null; } export interface ComponentToCondition { diff --git a/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-v2.service.ts b/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-v2.service.ts index 2d2891b35a..5fc5d2b385 100644 --- a/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-v2.service.ts +++ b/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-v2.service.ts @@ -9,7 +9,7 @@ import { ApplicationDecisionDto, ApplicationDecisionWithLinkedResolutionDto, CreateApplicationDecisionDto, - DecisionCodesDto, + ApplicationDecisionCodesDto, UpdateApplicationDecisionDto, } from './application-decision-v2.dto'; @@ -37,9 +37,9 @@ export class ApplicationDecisionV2Service { return decisions; } - async fetchCodes(): Promise { + async fetchCodes(): Promise { try { - return await firstValueFrom(this.http.get(`${this.url}/codes`)); + return await firstValueFrom(this.http.get(`${this.url}/codes`)); } catch (err) { this.toastService.showErrorToast('Failed to fetch decisions'); } diff --git a/alcs-frontend/src/app/services/notice-of-intent/decision-v2/notice-of-intent-decision-component/notice-of-intent-decision-component.service.spec.ts b/alcs-frontend/src/app/services/notice-of-intent/decision-v2/notice-of-intent-decision-component/notice-of-intent-decision-component.service.spec.ts new file mode 100644 index 0000000000..d5df6385b1 --- /dev/null +++ b/alcs-frontend/src/app/services/notice-of-intent/decision-v2/notice-of-intent-decision-component/notice-of-intent-decision-component.service.spec.ts @@ -0,0 +1,66 @@ +import { HttpClient } from '@angular/common/http'; +import { TestBed } from '@angular/core/testing'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { of, throwError } from 'rxjs'; +import { ToastService } from '../../../toast/toast.service'; + +import { NoticeOfIntentDecisionComponentService } from './notice-of-intent-decision-component.service'; + +describe('NoticeOfIntentDecisionComponentService', () => { + let service: NoticeOfIntentDecisionComponentService; + let httpClient: DeepMocked; + let toastService: DeepMocked; + + beforeEach(() => { + httpClient = createMock(); + toastService = createMock(); + + TestBed.configureTestingModule({ + providers: [ + { + provide: HttpClient, + useValue: httpClient, + }, + { + provide: ToastService, + useValue: toastService, + }, + ], + }); + service = TestBed.inject(NoticeOfIntentDecisionComponentService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); + + it('should make an http patch and show a success toast when updating', async () => { + httpClient.patch.mockReturnValue( + of({ + fileNumber: '1', + }) + ); + + await service.update('1', { noticeOfIntentDecisionComponentTypeCode: 'fake' }); + + expect(httpClient.patch).toHaveBeenCalledTimes(1); + expect(toastService.showSuccessToast).toHaveBeenCalledTimes(1); + }); + + it('should show a toast message if update fails', async () => { + httpClient.patch.mockReturnValue( + throwError(() => { + new Error(''); + }) + ); + + try { + await service.update('1', { noticeOfIntentDecisionComponentTypeCode: 'fake' }); + } catch (e) { + //OM NOM NOM + } + + expect(httpClient.patch).toHaveBeenCalledTimes(1); + expect(toastService.showErrorToast).toHaveBeenCalledTimes(1); + }); +}); diff --git a/alcs-frontend/src/app/services/notice-of-intent/decision-v2/notice-of-intent-decision-component/notice-of-intent-decision-component.service.ts b/alcs-frontend/src/app/services/notice-of-intent/decision-v2/notice-of-intent-decision-component/notice-of-intent-decision-component.service.ts new file mode 100644 index 0000000000..76b9081acc --- /dev/null +++ b/alcs-frontend/src/app/services/notice-of-intent/decision-v2/notice-of-intent-decision-component/notice-of-intent-decision-component.service.ts @@ -0,0 +1,35 @@ +import { HttpClient, HttpErrorResponse } from '@angular/common/http'; +import { Injectable } from '@angular/core'; +import { firstValueFrom } from 'rxjs'; +import { environment } from '../../../../../environments/environment'; +import { ToastService } from '../../../toast/toast.service'; +import { + NoticeOfIntentDecisionComponentDto, + UpdateNoticeOfIntentDecisionComponentDto, +} from '../../decision/notice-of-intent-decision.dto'; + +@Injectable({ + providedIn: 'root', +}) +export class NoticeOfIntentDecisionComponentService { + private url = `${environment.apiUrl}/notice-of-intent-decision-component`; + + constructor(private http: HttpClient, private toastService: ToastService) {} + + async update(uuid: string, data: UpdateNoticeOfIntentDecisionComponentDto) { + try { + const res = await firstValueFrom( + this.http.patch(`${this.url}/${uuid}`, data) + ); + this.toastService.showSuccessToast('Decision updated'); + return res; + } catch (e) { + if (e instanceof HttpErrorResponse && e.status === 400 && e.error?.message) { + this.toastService.showErrorToast(e.error.message); + } else { + this.toastService.showErrorToast('Failed to update decision'); + } + throw e; + } + } +} diff --git a/alcs-frontend/src/app/services/notice-of-intent/decision-v2/notice-of-intent-decision-condition/notice-of-intent-decision-condition.service.spec.ts b/alcs-frontend/src/app/services/notice-of-intent/decision-v2/notice-of-intent-decision-condition/notice-of-intent-decision-condition.service.spec.ts new file mode 100644 index 0000000000..e33ee680de --- /dev/null +++ b/alcs-frontend/src/app/services/notice-of-intent/decision-v2/notice-of-intent-decision-condition/notice-of-intent-decision-condition.service.spec.ts @@ -0,0 +1,66 @@ +import { HttpClient } from '@angular/common/http'; +import { TestBed } from '@angular/core/testing'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { of, throwError } from 'rxjs'; +import { ToastService } from '../../../toast/toast.service'; + +import { NoticeOfIntentDecisionConditionService } from './notice-of-intent-decision-condition.service'; + +describe('NoticeOfIntentDecisionConditionService', () => { + let service: NoticeOfIntentDecisionConditionService; + let mockHttpClient: DeepMocked; + let mockToastService: DeepMocked; + + beforeEach(() => { + mockHttpClient = createMock(); + mockToastService = createMock(); + + TestBed.configureTestingModule({ + providers: [ + { + provide: HttpClient, + useValue: mockHttpClient, + }, + { + provide: ToastService, + useValue: mockToastService, + }, + ], + }); + service = TestBed.inject(NoticeOfIntentDecisionConditionService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); + + it('should make an http patch and show a success toast when updating', async () => { + mockHttpClient.patch.mockReturnValue( + of({ + fileNumber: '1', + }) + ); + + await service.update('1', {}); + + expect(mockHttpClient.patch).toHaveBeenCalledTimes(1); + expect(mockToastService.showSuccessToast).toHaveBeenCalledTimes(1); + }); + + it('should show a toast message if update fails', async () => { + mockHttpClient.patch.mockReturnValue( + throwError(() => { + new Error(''); + }) + ); + + try { + await service.update('1', {}); + } catch (e) { + //OM NOM NOM + } + + expect(mockHttpClient.patch).toHaveBeenCalledTimes(1); + expect(mockToastService.showErrorToast).toHaveBeenCalledTimes(1); + }); +}); diff --git a/alcs-frontend/src/app/services/notice-of-intent/decision-v2/notice-of-intent-decision-condition/notice-of-intent-decision-condition.service.ts b/alcs-frontend/src/app/services/notice-of-intent/decision-v2/notice-of-intent-decision-condition/notice-of-intent-decision-condition.service.ts new file mode 100644 index 0000000000..a719e47fb8 --- /dev/null +++ b/alcs-frontend/src/app/services/notice-of-intent/decision-v2/notice-of-intent-decision-condition/notice-of-intent-decision-condition.service.ts @@ -0,0 +1,35 @@ +import { HttpClient, HttpErrorResponse } from '@angular/common/http'; +import { Injectable } from '@angular/core'; +import { firstValueFrom } from 'rxjs'; +import { environment } from '../../../../../environments/environment'; +import { ToastService } from '../../../toast/toast.service'; +import { + NoticeOfIntentDecisionConditionDto, + UpdateNoticeOfIntentDecisionConditionDto, +} from '../../decision/notice-of-intent-decision.dto'; + +@Injectable({ + providedIn: 'root', +}) +export class NoticeOfIntentDecisionConditionService { + private url = `${environment.apiUrl}/notice-of-intent-decision-condition`; + + constructor(private http: HttpClient, private toastService: ToastService) {} + + async update(uuid: string, data: UpdateNoticeOfIntentDecisionConditionDto) { + try { + const res = await firstValueFrom( + this.http.patch(`${this.url}/${uuid}`, data) + ); + this.toastService.showSuccessToast('Condition updated'); + return res; + } catch (e) { + if (e instanceof HttpErrorResponse && e.status === 400 && e.error?.message) { + this.toastService.showErrorToast(e.error.message); + } else { + this.toastService.showErrorToast('Failed to update condition'); + } + throw e; + } + } +} diff --git a/alcs-frontend/src/app/services/notice-of-intent/decision-v2/notice-of-intent-decision-v2.service.spec.ts b/alcs-frontend/src/app/services/notice-of-intent/decision-v2/notice-of-intent-decision-v2.service.spec.ts new file mode 100644 index 0000000000..bdc6ee227c --- /dev/null +++ b/alcs-frontend/src/app/services/notice-of-intent/decision-v2/notice-of-intent-decision-v2.service.spec.ts @@ -0,0 +1,204 @@ +import { HttpClient } from '@angular/common/http'; +import { TestBed } from '@angular/core/testing'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { of, throwError } from 'rxjs'; +import { environment } from '../../../../environments/environment'; +import { ToastService } from '../../toast/toast.service'; +import { NoticeOfIntentDecisionV2Service } from './notice-of-intent-decision-v2.service'; + +describe('NoticeOfIntentDecisionV2Service', () => { + let service: NoticeOfIntentDecisionV2Service; + let httpClient: DeepMocked; + let toastService: DeepMocked; + + beforeEach(() => { + httpClient = createMock(); + toastService = createMock(); + + TestBed.configureTestingModule({ + providers: [ + { + provide: HttpClient, + useValue: httpClient, + }, + { + provide: ToastService, + useValue: toastService, + }, + ], + }); + service = TestBed.inject(NoticeOfIntentDecisionV2Service); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); + + it('should fetch and return an noiDto', async () => { + httpClient.get.mockReturnValue( + of([ + { + fileNumber: '1', + }, + ]) + ); + + const res = await service.fetchByFileNumber('1'); + + expect(res.length).toEqual(1); + expect(res[0].fileNumber).toEqual('1'); + }); + + it('should show a toast message if fetch fails', async () => { + httpClient.get.mockReturnValue( + throwError(() => { + new Error(''); + }) + ); + + const res = await service.fetchByFileNumber('1'); + + expect(res.length).toEqual(0); + expect(toastService.showErrorToast).toHaveBeenCalledTimes(1); + }); + + it('should make an http patch and show a success toast when updating', async () => { + httpClient.patch.mockReturnValue( + of({ + fileNumber: '1', + }) + ); + + await service.update('1', { + isDraft: false, + }); + + expect(httpClient.patch).toHaveBeenCalledTimes(1); + expect(toastService.showSuccessToast).toHaveBeenCalledTimes(1); + }); + + it('should show a toast message if update fails', async () => { + httpClient.patch.mockReturnValue( + throwError(() => { + new Error(''); + }) + ); + + try { + await service.update('1', { + isDraft: false, + }); + } catch (e) { + //OM NOM NOM + } + + expect(httpClient.patch).toHaveBeenCalledTimes(1); + expect(toastService.showErrorToast).toHaveBeenCalledTimes(1); + }); + + it('should make an http post and show a success toast when creating', async () => { + httpClient.post.mockReturnValue( + of({ + fileNumber: '1', + }) + ); + + await service.create({ + fileNumber: '', + date: 0, + modifiesUuid: '', + outcomeCode: '', + resolutionNumber: 0, + resolutionYear: 0, + isDraft: true, + }); + + expect(httpClient.post).toHaveBeenCalledTimes(1); + expect(toastService.showSuccessToast).toHaveBeenCalledTimes(1); + }); + + it('should show a toast message if create fails', async () => { + httpClient.post.mockReturnValue( + throwError(() => { + new Error(''); + }) + ); + + try { + await service.create({ + fileNumber: '', + date: 0, + modifiesUuid: '', + outcomeCode: '', + resolutionNumber: 0, + resolutionYear: 0, + isDraft: true, + }); + } catch (e) { + //OM NOM NOM + } + + expect(httpClient.post).toHaveBeenCalledTimes(1); + expect(toastService.showErrorToast).toHaveBeenCalledTimes(1); + }); + + it('should make an http delete and show a success toast', async () => { + httpClient.delete.mockReturnValue( + of({ + fileNumber: '1', + }) + ); + + await service.delete(''); + + expect(httpClient.delete).toHaveBeenCalledTimes(1); + expect(toastService.showSuccessToast).toHaveBeenCalledTimes(1); + }); + + it('should show a toast message if delete fails', async () => { + httpClient.delete.mockReturnValue( + throwError(() => { + new Error(''); + }) + ); + + try { + await service.delete(''); + } catch (e) { + //OM NOM NOM + } + + expect(httpClient.delete).toHaveBeenCalledTimes(1); + expect(toastService.showErrorToast).toHaveBeenCalledTimes(1); + }); + + it('should show a toast warning when uploading a file thats too large', async () => { + const file = createMock(); + Object.defineProperty(file, 'size', { value: environment.maxFileSize + 1 }); + + await service.uploadFile('', file); + + expect(toastService.showWarningToast).toHaveBeenCalledTimes(1); + expect(httpClient.post).toHaveBeenCalledTimes(0); + }); + + it('should make an http delete when deleting a file', async () => { + httpClient.delete.mockReturnValue( + of({ + fileNumber: '1', + }) + ); + + await service.deleteFile('', ''); + + expect(httpClient.delete).toHaveBeenCalledTimes(1); + }); + + it('should make an http get when requesting a new resolution number', async () => { + httpClient.get.mockReturnValue(of(1)); + + await service.getNextAvailableResolutionNumber(2023); + + expect(httpClient.get).toHaveBeenCalledTimes(1); + }); +}); diff --git a/alcs-frontend/src/app/services/notice-of-intent/decision-v2/notice-of-intent-decision-v2.service.ts b/alcs-frontend/src/app/services/notice-of-intent/decision-v2/notice-of-intent-decision-v2.service.ts new file mode 100644 index 0000000000..86b38bb0a6 --- /dev/null +++ b/alcs-frontend/src/app/services/notice-of-intent/decision-v2/notice-of-intent-decision-v2.service.ts @@ -0,0 +1,168 @@ +import { HttpClient, HttpErrorResponse } from '@angular/common/http'; +import { Injectable } from '@angular/core'; +import { BehaviorSubject, firstValueFrom } from 'rxjs'; +import { environment } from '../../../../environments/environment'; +import { downloadFileFromUrl, openFileInline } from '../../../shared/utils/file'; +import { verifyFileSize } from '../../../shared/utils/file-size-checker'; +import { ToastService } from '../../toast/toast.service'; +import { + CreateNoticeOfIntentDecisionDto, + NoticeOfIntentDecisionCodesDto, + NoticeOfIntentDecisionDto, + NoticeOfIntentDecisionWithLinkedResolutionDto, + UpdateNoticeOfIntentDecisionDto, +} from '../decision/notice-of-intent-decision.dto'; + +@Injectable({ + providedIn: 'root', +}) +export class NoticeOfIntentDecisionV2Service { + private url = `${environment.apiUrl}/notice-of-intent-decision/v2`; + private decision: NoticeOfIntentDecisionDto | undefined; + private decisions: NoticeOfIntentDecisionWithLinkedResolutionDto[] = []; + $decision = new BehaviorSubject(undefined); + $decisions = new BehaviorSubject([]); + + constructor(private http: HttpClient, private toastService: ToastService) {} + + async fetchByFileNumber(fileNumber: string) { + let decisions: NoticeOfIntentDecisionDto[] = []; + try { + decisions = await firstValueFrom( + this.http.get(`${this.url}/notice-of-intent/${fileNumber}`) + ); + } catch (err) { + this.toastService.showErrorToast('Failed to fetch decisions'); + } + return decisions; + } + + async fetchCodes(): Promise { + try { + return await firstValueFrom(this.http.get(`${this.url}/codes`)); + } catch (err) { + this.toastService.showErrorToast('Failed to fetch decisions'); + } + return { + outcomes: [], + decisionComponentTypes: [], + decisionConditionTypes: [], + }; + } + + async update(uuid: string, data: UpdateNoticeOfIntentDecisionDto) { + try { + const res = await firstValueFrom(this.http.patch(`${this.url}/${uuid}`, data)); + this.toastService.showSuccessToast('Decision updated'); + return res; + } catch (e) { + if (e instanceof HttpErrorResponse && e.status === 400 && e.error?.message) { + this.toastService.showErrorToast(e.error.message); + } else { + this.toastService.showErrorToast('Failed to update decision'); + } + throw e; + } + } + + async create(decision: CreateNoticeOfIntentDecisionDto) { + try { + const res = await firstValueFrom(this.http.post(`${this.url}`, decision)); + this.toastService.showSuccessToast('Decision created'); + return res; + } catch (e) { + if (e instanceof HttpErrorResponse && e.status === 400 && e.error?.message) { + this.toastService.showErrorToast(e.error.message); + } else { + this.toastService.showErrorToast(`Failed to create decision`); + } + throw e; + } + } + + async delete(uuid: string) { + try { + await firstValueFrom(this.http.delete(`${this.url}/${uuid}`)); + this.toastService.showSuccessToast('Decision deleted'); + } catch (err) { + this.toastService.showErrorToast('Failed to delete meeting'); + } + } + + async uploadFile(decisionUuid: string, file: File) { + const isValidSize = verifyFileSize(file, this.toastService); + if (!isValidSize) { + return; + } + + let formData: FormData = new FormData(); + formData.append('file', file, file.name); + const res = await firstValueFrom(this.http.post(`${this.url}/${decisionUuid}/file`, formData)); + this.toastService.showSuccessToast('Document uploaded'); + return res; + } + + async downloadFile(decisionUuid: string, documentUuid: string, fileName: string, isInline = true) { + const url = `${this.url}/${decisionUuid}/file/${documentUuid}`; + const finalUrl = isInline ? `${url}/open` : `${url}/download`; + const data = await firstValueFrom(this.http.get<{ url: string }>(finalUrl)); + if (isInline) { + openFileInline(data.url, fileName); + } else { + downloadFileFromUrl(data.url, fileName); + } + } + + async deleteFile(decisionUuid: string, documentUuid: string) { + const url = `${this.url}/${decisionUuid}/file/${documentUuid}`; + return await firstValueFrom(this.http.delete<{ url: string }>(url)); + } + + async getByUuid(uuid: string) { + let decision: NoticeOfIntentDecisionDto | undefined; + try { + decision = await firstValueFrom(this.http.get(`${this.url}/${uuid}`)); + } catch (err) { + this.toastService.showErrorToast('Failed to fetch decision'); + } + return decision; + } + + async loadDecision(uuid: string) { + this.clearDecision(); + this.decision = await this.getByUuid(uuid); + this.$decision.next(this.decision); + } + + async loadDecisions(fileNumber: string) { + this.clearDecisions(); + const decisions = await this.fetchByFileNumber(fileNumber); + const decisionsLength = decisions.length; + + this.decisions = decisions.map((decision, ind) => ({ + ...decision, + modifiedByResolutions: decision.modifiedBy?.flatMap((r) => r.linkedResolutions) || [], + index: decisionsLength - ind, + })); + + this.$decisions.next(this.decisions); + } + + clearDecision() { + this.$decision.next(undefined); + } + + clearDecisions() { + this.$decisions.next([]); + } + + async getNextAvailableResolutionNumber(resolutionYear: number) { + let result: number | undefined = undefined; + try { + result = await firstValueFrom(this.http.get(`${this.url}/next-resolution-number/${resolutionYear}`)); + } catch (err) { + this.toastService.showErrorToast('Failed to fetch resolutionNumber'); + } + return result; + } +} diff --git a/alcs-frontend/src/app/services/notice-of-intent/decision/notice-of-intent-decision.dto.ts b/alcs-frontend/src/app/services/notice-of-intent/decision/notice-of-intent-decision.dto.ts index 0065b7ddd7..e508c61b64 100644 --- a/alcs-frontend/src/app/services/notice-of-intent/decision/notice-of-intent-decision.dto.ts +++ b/alcs-frontend/src/app/services/notice-of-intent/decision/notice-of-intent-decision.dto.ts @@ -1,21 +1,31 @@ import { BaseCodeDto } from '../../../shared/dto/base.dto'; -import { NoticeOfIntentModificationDto } from '../notice-of-intent-modification/notice-of-intent-modification.dto'; export interface UpdateNoticeOfIntentDecisionDto { + resolutionNumber?: number; + resolutionYear?: number; date?: number; outcomeCode?: string; auditDate?: number | null; decisionMaker?: string | null; decisionMakerName?: string | null; + modifiesUuid?: string | null; + isSubjectToConditions?: boolean | null; + decisionDescription?: string | null; + isStatsRequired?: boolean | null; + rescindedDate?: number | null; + rescindedComment?: string | null; + isDraft?: boolean; + decisionComponents?: NoticeOfIntentDecisionComponentDto[]; + conditions?: UpdateNoticeOfIntentDecisionConditionDto[]; } export interface CreateNoticeOfIntentDecisionDto extends UpdateNoticeOfIntentDecisionDto { date: number; - outcomeCode: string; - resolutionNumber: number; + outcomeCode?: string; + resolutionNumber?: number; resolutionYear: number; - applicationFileNumber: string; - decisionMaker: string; + fileNumber: string; + decisionMaker?: string; decisionMakerName?: string; auditDate?: number | null; modifiesUuid?: string; @@ -29,16 +39,26 @@ export interface LinkedResolutionDto { export interface NoticeOfIntentDecisionDto { uuid: string; date: number; + createdAt: Date; outcome: NoticeOfIntentDecisionOutcomeCodeDto; resolutionNumber: number; resolutionYear: number; auditDate?: number | null; decisionMaker: string; decisionMakerName?: string; - noticeOfIntentFileNumber: string; + isSubjectToConditions: boolean | null; + isDraft: boolean; + wasReleased: boolean; + decisionDescription?: string | null; + isStatsRequired?: boolean | null; + rescindedDate?: number | null; + rescindedComment?: string | null; + fileNumber: string; documents: NoticeOfIntentDecisionDocumentDto[]; modifies?: LinkedResolutionDto; modifiedBy?: LinkedResolutionDto[]; + components: NoticeOfIntentDecisionComponentDto[]; + conditions: NoticeOfIntentDecisionConditionDto[]; } export interface NoticeOfIntentDecisionDocumentDto { @@ -50,3 +70,106 @@ export interface NoticeOfIntentDecisionDocumentDto { } export interface NoticeOfIntentDecisionOutcomeCodeDto extends BaseCodeDto {} + +export interface NoticeOfIntentDecisionConditionTypeDto extends BaseCodeDto {} +export interface NoticeOfIntentDecisionConditionDto { + uuid: string; + approvalDependant: boolean | null; + securityAmount: number | null; + administrativeFee: number | null; + description: string | null; + type: NoticeOfIntentDecisionConditionTypeDto; + componentUuid: string | null; + completionDate?: number; + supersededDate?: number; + components?: NoticeOfIntentDecisionComponentDto[]; +} + +export interface ComponentToCondition { + componentDecisionUuid?: string; + componentToConditionType?: string; + tempId: string; +} + +export interface UpdateNoticeOfIntentDecisionConditionDto { + uuid?: string; + componentsToCondition?: ComponentToCondition[]; + approvalDependant?: boolean | null; + securityAmount?: number | null; + administrativeFee?: number | null; + description?: string | null; + type?: NoticeOfIntentDecisionConditionTypeDto; + completionDate?: number | null; + supersededDate?: number | null; +} + +export interface NoticeOfIntentDecisionComponentTypeDto extends BaseCodeDto {} + +export interface UpdateNoticeOfIntentDecisionComponentDto { + uuid?: string; + alrArea?: number; + agCap?: string; + agCapSource?: string; + agCapMap?: string; + agCapConsultant?: string; + noticeOfIntentDecisionComponentTypeCode: string; + endDate?: number; + expiryDate?: number; + soilFillTypeToPlace?: string; + soilToPlaceVolume?: number | null; + soilToPlaceArea?: number | null; + soilToPlaceMaximumDepth?: number | null; + soilToPlaceAverageDepth?: number | null; + soilTypeRemoved?: string; + soilToRemoveVolume?: number | null; + soilToRemoveArea?: number | null; + soilToRemoveMaximumDepth?: number | null; + soilToRemoveAverageDepth?: number | null; +} + +export interface NoticeOfIntentDecisionComponentDto extends PofoDecisionComponentDto, RosoDecisionComponentDto { + uuid?: string; + alrArea?: number | null; + agCap?: string | null; + agCapSource?: string | null; + agCapMap?: string | null; + agCapConsultant?: string | null; + noticeOfIntentDecisionUuid?: string; + noticeOfIntentDecisionComponentTypeCode: string; + noticeOfIntentDecisionComponentType?: NoticeOfIntentDecisionComponentTypeDto; +} + +export interface PofoDecisionComponentDto { + endDate?: number | null; + soilFillTypeToPlace?: string | null; + soilToPlaceArea?: number | null; + soilToPlaceVolume?: number | null; + soilToPlaceMaximumDepth?: number | null; + soilToPlaceAverageDepth?: number | null; +} + +export interface RosoDecisionComponentDto { + endDate?: number | null; + soilTypeRemoved?: string | null; + soilToRemoveVolume?: number | null; + soilToRemoveArea?: number | null; + soilToRemoveMaximumDepth?: number | null; + soilToRemoveAverageDepth?: number | null; +} + +export interface NoticeOfIntentDecisionCodesDto { + outcomes: NoticeOfIntentDecisionOutcomeCodeDto[]; + decisionComponentTypes: NoticeOfIntentDecisionComponentTypeDto[]; + decisionConditionTypes: NoticeOfIntentDecisionConditionTypeDto[]; +} + +export interface NoticeOfIntentDecisionWithLinkedResolutionDto extends NoticeOfIntentDecisionDto { + modifiedByResolutions?: string[]; + index: number; +} + +export enum NOI_DECISION_COMPONENT_TYPE { + POFO = 'POFO', + ROSO = 'ROSO', + PFRS = 'PFRS', +} diff --git a/alcs-frontend/src/app/services/notice-of-intent/decision/notice-of-intent-decision.service.spec.ts b/alcs-frontend/src/app/services/notice-of-intent/decision/notice-of-intent-decision.service.spec.ts index 64ebbb5d5f..41499dc576 100644 --- a/alcs-frontend/src/app/services/notice-of-intent/decision/notice-of-intent-decision.service.spec.ts +++ b/alcs-frontend/src/app/services/notice-of-intent/decision/notice-of-intent-decision.service.spec.ts @@ -6,7 +6,7 @@ import { environment } from '../../../../environments/environment'; import { ToastService } from '../../toast/toast.service'; import { NoticeOfIntentDecisionService } from './notice-of-intent-decision.service'; -describe('ApplicationMeetingService', () => { +describe('NoticeOfIntentDecisionService', () => { let service: NoticeOfIntentDecisionService; let httpClient: DeepMocked; let toastService: DeepMocked; @@ -38,7 +38,7 @@ describe('ApplicationMeetingService', () => { httpClient.get.mockReturnValue( of([ { - noticeOfIntentFileNumber: '1', + fileNumber: '1', }, ]) ); @@ -46,7 +46,7 @@ describe('ApplicationMeetingService', () => { const res = await service.fetchByFileNumber('1'); expect(res.length).toEqual(1); - expect(res[0].noticeOfIntentFileNumber).toEqual('1'); + expect(res[0].fileNumber).toEqual('1'); }); it('should show a toast message if fetch fails', async () => { @@ -65,11 +65,13 @@ describe('ApplicationMeetingService', () => { it('should make an http patch and show a success toast when updating', async () => { httpClient.patch.mockReturnValue( of({ - applicationFileNumber: '1', + fileNumber: '1', }) ); - await service.update('1', {}); + await service.update('1', { + isDraft: false, + }); expect(httpClient.patch).toHaveBeenCalledTimes(1); expect(toastService.showSuccessToast).toHaveBeenCalledTimes(1); @@ -95,12 +97,12 @@ describe('ApplicationMeetingService', () => { it('should make an http post and show a success toast when creating', async () => { httpClient.post.mockReturnValue( of({ - applicationFileNumber: '1', + fileNumber: '1', }) ); await service.create({ - applicationFileNumber: '', + fileNumber: '', date: 0, outcomeCode: '', resolutionNumber: 0, @@ -121,7 +123,7 @@ describe('ApplicationMeetingService', () => { try { await service.create({ - applicationFileNumber: '', + fileNumber: '', date: 0, outcomeCode: '', resolutionNumber: 0, @@ -139,7 +141,7 @@ describe('ApplicationMeetingService', () => { it('should make an http delete and show a success toast', async () => { httpClient.delete.mockReturnValue( of({ - applicationFileNumber: '1', + fileNumber: '1', }) ); @@ -179,7 +181,7 @@ describe('ApplicationMeetingService', () => { it('should make an http delete when deleting a file', async () => { httpClient.delete.mockReturnValue( of({ - applicationFileNumber: '1', + fileNumber: '1', }) ); diff --git a/alcs-frontend/src/app/services/notice-of-intent/noi-document/noi-document.service.spec.ts b/alcs-frontend/src/app/services/notice-of-intent/noi-document/noi-document.service.spec.ts index 07321c1818..c5afd1260c 100644 --- a/alcs-frontend/src/app/services/notice-of-intent/noi-document/noi-document.service.spec.ts +++ b/alcs-frontend/src/app/services/notice-of-intent/noi-document/noi-document.service.spec.ts @@ -7,7 +7,7 @@ import { DOCUMENT_SOURCE, DOCUMENT_TYPE } from '../../../shared/document/documen import { ToastService } from '../../toast/toast.service'; import { NoiDocumentService } from './noi-document.service'; -describe('ApplicationDocumentService', () => { +describe('NoiDocumentService', () => { let service: NoiDocumentService; let httpClient: DeepMocked; let toastService: DeepMocked; diff --git a/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent-detail.service.spec.ts b/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent-detail.service.spec.ts index a51030f696..f6e8840842 100644 --- a/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent-detail.service.spec.ts +++ b/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent-detail.service.spec.ts @@ -1,9 +1,9 @@ import { TestBed } from '@angular/core/testing'; import { createMock, DeepMocked } from '@golevelup/ts-jest'; -import { firstValueFrom, of } from 'rxjs'; +import { firstValueFrom } from 'rxjs'; import { ToastService } from '../toast/toast.service'; import { NoticeOfIntentDetailService } from './notice-of-intent-detail.service'; -import { NoticeOfIntentDto, UpdateNoticeOfIntentDto } from './notice-of-intent.dto'; +import { NoticeOfIntentDto } from './notice-of-intent.dto'; import { NoticeOfIntentService } from './notice-of-intent.service'; describe('NoticeOfIntentDetailService', () => { @@ -33,7 +33,7 @@ describe('NoticeOfIntentDetailService', () => { expect(service).toBeTruthy(); }); - it('should publish the loaded application', async () => { + it('should publish the loaded noi', async () => { noticeOfIntentService.fetchByFileNumber.mockResolvedValue({ fileNumber: '1', } as NoticeOfIntentDto); @@ -46,7 +46,7 @@ describe('NoticeOfIntentDetailService', () => { expect(res!.fileNumber).toEqual('1'); }); - it('should publish the updated application for update', async () => { + it('should publish the updated noi for update', async () => { noticeOfIntentService.update.mockResolvedValue({ fileNumber: '1', } as NoticeOfIntentDto); diff --git a/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent-detail.service.ts b/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent-detail.service.ts index b0b6d1ad6d..d8ac8bfa61 100644 --- a/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent-detail.service.ts +++ b/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent-detail.service.ts @@ -15,7 +15,7 @@ export class NoticeOfIntentDetailService { this.$noticeOfIntent.next(noticeOfIntent); } - async clear() { + clear() { this.$noticeOfIntent.next(undefined); } diff --git a/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent-modification/notice-of-intent-modification.service.spec.ts b/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent-modification/notice-of-intent-modification.service.spec.ts index 77cd8e6913..8a5b69fda3 100644 --- a/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent-modification/notice-of-intent-modification.service.spec.ts +++ b/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent-modification/notice-of-intent-modification.service.spec.ts @@ -6,7 +6,7 @@ import { ToastService } from '../../toast/toast.service'; import { NoticeOfIntentModificationService } from './notice-of-intent-modification.service'; -describe('ApplicationReconsiderationService', () => { +describe('NoticeOfIntentModificationService', () => { let service: NoticeOfIntentModificationService; let httpClient: DeepMocked; let toastService: DeepMocked; diff --git a/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent-parcel/notice-of-intent-parcel.service.ts b/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent-parcel/notice-of-intent-parcel.service.ts index a7764d1067..8b93c26cfa 100644 --- a/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent-parcel/notice-of-intent-parcel.service.ts +++ b/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent-parcel/notice-of-intent-parcel.service.ts @@ -17,7 +17,7 @@ export class NoticeOfIntentParcelService { try { return firstValueFrom(this.http.get(`${this.baseUrl}/${fileNumber}`)); } catch (e) { - this.toastService.showErrorToast('Failed to fetch Application Parcels'); + this.toastService.showErrorToast('Failed to fetch Notice of Intent Parcels'); throw e; } } diff --git a/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.dto.ts b/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.dto.ts new file mode 100644 index 0000000000..47a7868033 --- /dev/null +++ b/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.dto.ts @@ -0,0 +1,32 @@ +import { BaseCodeDto } from '../../../shared/dto/base.dto'; +import { NOI_SUBMISSION_STATUS } from '../notice-of-intent.dto'; + +export interface NoticeOfIntentStatusDto extends BaseCodeDto { + alcsBackgroundColor: string; + + alcsColor: string; + + portalBackgroundColor: string; + + portalColor: string; + + code: NOI_SUBMISSION_STATUS; + + weight: number; +} + +export interface NoticeOfIntentSubmissionToSubmissionStatusDto { + submissionUuid: string; + + effectiveDate: number | null; + + statusTypeCode: string; + + status: NoticeOfIntentStatusDto; +} + +export const DEFAULT_NO_STATUS = { + backgroundColor: '#929292', + textColor: '#EFEFEF', + label: 'No Status', +}; diff --git a/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service.spec.ts b/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service.spec.ts new file mode 100644 index 0000000000..d55254c01d --- /dev/null +++ b/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service.spec.ts @@ -0,0 +1,98 @@ +import { HttpClient } from '@angular/common/http'; +import { TestBed } from '@angular/core/testing'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { of, throwError } from 'rxjs'; +import { ToastService } from '../../toast/toast.service'; +import { NoticeOfIntentSubmissionStatusService } from './notice-of-intent-submission-status.service'; + +describe('NoticeOfIntentSubmissionStatusService', () => { + let service: NoticeOfIntentSubmissionStatusService; + let mockHttpClient: DeepMocked; + let mockToastService: DeepMocked; + + beforeEach(() => { + mockToastService = createMock(); + mockHttpClient = createMock(); + + TestBed.configureTestingModule({ + providers: [ + { + provide: HttpClient, + useValue: mockHttpClient, + }, + { + provide: ToastService, + useValue: mockToastService, + }, + ], + }); + service = TestBed.inject(NoticeOfIntentSubmissionStatusService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); + + it('should fetch statuses by fileNumber', async () => { + mockHttpClient.get.mockReturnValue( + of([ + { + submissionUuid: 'fake', + }, + ]) + ); + + const res = await service.fetchSubmissionStatusesByFileNumber('1'); + + expect(mockHttpClient.get).toHaveBeenCalledTimes(1); + expect(res.length).toEqual(1); + expect(res[0].submissionUuid).toEqual('fake'); + }); + + it('should show a toast message if fetch statuses by fileNumber fails', async () => { + mockHttpClient.get.mockReturnValue( + throwError(() => { + new Error(''); + }) + ); + + try { + await service.fetchSubmissionStatusesByFileNumber('1'); + } catch { + // suppress error message + } + + expect(mockHttpClient.get).toHaveBeenCalledTimes(1); + expect(mockToastService.showErrorToast).toHaveBeenCalledTimes(1); + }); + + it('should fetch current status by fileNumber', async () => { + mockHttpClient.get.mockReturnValue( + of({ + submissionUuid: 'fake', + }) + ); + + const res = await service.fetchCurrentStatusByFileNumber('1'); + + expect(mockHttpClient.get).toHaveBeenCalledTimes(1); + expect(res.submissionUuid).toEqual('fake'); + }); + + it('should show a toast message if fetch current status by fileNumber fails', async () => { + mockHttpClient.get.mockReturnValue( + throwError(() => { + new Error(''); + }) + ); + + try { + await service.fetchCurrentStatusByFileNumber('1'); + } catch { + // suppress error message + } + + expect(mockHttpClient.get).toHaveBeenCalledTimes(1); + expect(mockToastService.showErrorToast).toHaveBeenCalledTimes(1); + }); +}); diff --git a/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service.ts b/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service.ts new file mode 100644 index 0000000000..8e814dba64 --- /dev/null +++ b/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service.ts @@ -0,0 +1,49 @@ +import { HttpClient } from '@angular/common/http'; +import { Injectable } from '@angular/core'; +import { firstValueFrom } from 'rxjs'; +import { environment } from '../../../../environments/environment'; +import { ToastService } from '../../toast/toast.service'; +import { NoticeOfIntentSubmissionToSubmissionStatusDto } from './notice-of-intent-submission-status.dto'; + +@Injectable({ + providedIn: 'root', +}) +export class NoticeOfIntentSubmissionStatusService { + private baseUrl = `${environment.apiUrl}/notice-of-intent-submission-status`; + + constructor(private http: HttpClient, private toastService: ToastService) {} + + async fetchSubmissionStatusesByFileNumber( + fileNumber: string, + showErrorToast = true + ): Promise { + try { + const result = await firstValueFrom( + this.http.get(`${this.baseUrl}/${fileNumber}`) + ); + return result; + } catch (e) { + if (showErrorToast) { + this.toastService.showErrorToast('Failed to fetch NOI Submission Statuses'); + } + throw e; + } + } + + async fetchCurrentStatusByFileNumber( + fileNumber: string, + showErrorToast = true + ): Promise { + try { + const result = await firstValueFrom( + this.http.get(`${this.baseUrl}/current-status/${fileNumber}`) + ); + return result; + } catch (e) { + if (showErrorToast) { + this.toastService.showErrorToast('Failed to fetch NOI Submission Status'); + } + throw e; + } + } +} diff --git a/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts b/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts index 668511eef1..d98b15bfc6 100644 --- a/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts +++ b/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts @@ -12,7 +12,7 @@ describe('NoticeOfIntentSubmissionService', () => { let mockToastService: DeepMocked; let mockHttpClient: DeepMocked; - const mockSubmittedApplication: NoticeOfIntentSubmissionDto = { + const mockSubmittedNOI: NoticeOfIntentSubmissionDto = { fileNumber: '', uuid: '', createdAt: 0, @@ -66,7 +66,7 @@ describe('NoticeOfIntentSubmissionService', () => { soilAlreadyPlacedAverageDepth: null, soilProjectDurationAmount: null, soilIsRemovingSoilForNewStructure: null, - soilProposedStructures: [] + soilProposedStructures: [], }; beforeEach(() => { @@ -89,12 +89,12 @@ describe('NoticeOfIntentSubmissionService', () => { expect(service).toBeTruthy(); }); - it('should successfully fetch application submission', async () => { - mockHttpClient.get.mockReturnValue(of(mockSubmittedApplication)); + it('should successfully fetch noi submission', async () => { + mockHttpClient.get.mockReturnValue(of(mockSubmittedNOI)); const result = await service.fetchSubmission('1'); - expect(result).toEqual(mockSubmittedApplication); + expect(result).toEqual(mockSubmittedNOI); expect(mockHttpClient.get).toBeCalledTimes(1); }); }); diff --git a/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent.service.ts b/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent.service.ts index 823cf9f663..74db344959 100644 --- a/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent.service.ts +++ b/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent.service.ts @@ -56,7 +56,7 @@ export class NoticeOfIntentService { async fetchByFileNumber(fileNumber: string) { try { - return await firstValueFrom(this.http.get(`${this.url}/${fileNumber}`)); + return firstValueFrom(this.http.get(`${this.url}/${fileNumber}`)); } catch (e) { console.error(e); this.toastService.showErrorToast('Failed to fetch Notice of Intent'); diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision.entity.ts b/services/apps/alcs/src/alcs/application-decision/application-decision.entity.ts index 11f3051d0b..45e1858502 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision.entity.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision.entity.ts @@ -66,10 +66,6 @@ export class ApplicationDecision extends Base { @Column() outcomeCode: string; - @AutoMap() - @ManyToOne(() => Application) - application: Application; - @AutoMap() @Column({ type: 'int4', nullable: true }) resolutionNumber: number; @@ -178,6 +174,10 @@ export class ApplicationDecision extends Base { @Column({ nullable: true, type: 'text' }) linkedResolutionOutcomeCode: string | null; + @AutoMap() + @ManyToOne(() => Application) + application: Application; + @AutoMap() @Column({ type: 'uuid' }) applicationUuid: string; diff --git a/services/apps/alcs/src/alcs/import/noi-import.service.ts b/services/apps/alcs/src/alcs/import/noi-import.service.ts index 79f674fff6..47619d4728 100644 --- a/services/apps/alcs/src/alcs/import/noi-import.service.ts +++ b/services/apps/alcs/src/alcs/import/noi-import.service.ts @@ -6,10 +6,10 @@ import * as utc from 'dayjs/plugin/utc'; import * as fs from 'fs'; import * as path from 'path'; import { FALLBACK_APPLICANT_NAME } from '../../utils/owner.constants'; -import { LocalGovernmentService } from '../local-government/local-government.service'; import { BoardService } from '../board/board.service'; import { CardService } from '../card/card.service'; -import { NoticeOfIntentDecisionService } from '../notice-of-intent-decision/notice-of-intent-decision.service'; +import { LocalGovernmentService } from '../local-government/local-government.service'; +import { NoticeOfIntentDecisionV1Service } from '../notice-of-intent-decision/notice-of-intent-decision-v1/notice-of-intent-decision-v1.service'; import { NoticeOfIntentMeetingService } from '../notice-of-intent/notice-of-intent-meeting/notice-of-intent-meeting.service'; import { NoticeOfIntentSubtype } from '../notice-of-intent/notice-of-intent-subtype.entity'; import { NoticeOfIntent } from '../notice-of-intent/notice-of-intent.entity'; @@ -82,7 +82,7 @@ export class NoticeOfIntentImportService { private boardService: BoardService, private localGovernmentService: LocalGovernmentService, private cardService: CardService, - private noticeOfIntentDecisionService: NoticeOfIntentDecisionService, + private noticeOfIntentDecisionService: NoticeOfIntentDecisionV1Service, ) {} importNoiCsv() { @@ -363,11 +363,12 @@ export class NoticeOfIntentImportService { { date: mappedRow.decisionReleased.getTime(), decisionMaker: 'CEO Delegate', - applicationFileNumber: mappedRow.fileNumber, + fileNumber: mappedRow.fileNumber, outcomeCode: mappedRow.outcome === 'Approved' ? 'APPR' : 'ONTP', resolutionNumber: resolutionNumber, resolutionYear: resolutionYear, auditDate: mappedRow.auditDate?.getTime(), + isDraft: false, }, updatedApp, undefined, diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-component/notice-of-intent-decision-component-type.entity.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-component/notice-of-intent-decision-component-type.entity.ts new file mode 100644 index 0000000000..77f3e40f43 --- /dev/null +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-component/notice-of-intent-decision-component-type.entity.ts @@ -0,0 +1,12 @@ +import { Entity } from 'typeorm'; +import { BaseCodeEntity } from '../../../common/entities/base.code.entity'; + +@Entity() +export class NoticeOfIntentDecisionComponentType extends BaseCodeEntity { + constructor(data?: Partial) { + super(); + if (data) { + Object.assign(this, data); + } + } +} diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-component/notice-of-intent-decision-component.controller.spec.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-component/notice-of-intent-decision-component.controller.spec.ts new file mode 100644 index 0000000000..6418968627 --- /dev/null +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-component/notice-of-intent-decision-component.controller.spec.ts @@ -0,0 +1,84 @@ +import { classes } from '@automapper/classes'; +import { AutomapperModule } from '@automapper/nestjs'; +import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; +import { Test, TestingModule } from '@nestjs/testing'; +import { ClsService } from 'nestjs-cls'; +import { mockKeyCloakProviders } from '../../../../test/mocks/mockTypes'; +import { NoticeOfIntentDecisionProfile } from '../../../common/automapper/notice-of-intent-decision.automapper.profile'; +import { NoticeOfIntentDecisionComponentController } from './notice-of-intent-decision-component.controller'; +import { CreateNoticeOfIntentDecisionComponentDto } from './notice-of-intent-decision-component.dto'; +import { NoticeOfIntentDecisionComponent } from './notice-of-intent-decision-component.entity'; +import { NoticeOfIntentDecisionComponentService } from './notice-of-intent-decision-component.service'; + +describe('NoticeOfIntentDecisionComponentController', () => { + let controller: NoticeOfIntentDecisionComponentController; + let mockApplicationDecisionComponentService: DeepMocked; + + beforeEach(async () => { + mockApplicationDecisionComponentService = createMock(); + + const module: TestingModule = await Test.createTestingModule({ + imports: [ + AutomapperModule.forRoot({ + strategyInitializer: classes(), + }), + ], + controllers: [NoticeOfIntentDecisionComponentController], + providers: [ + ...mockKeyCloakProviders, + NoticeOfIntentDecisionProfile, + { + provide: ClsService, + useValue: {}, + }, + { + provide: NoticeOfIntentDecisionComponentService, + useValue: mockApplicationDecisionComponentService, + }, + ], + }).compile(); + + controller = module.get( + NoticeOfIntentDecisionComponentController, + ); + }); + + it('should be defined', () => { + expect(controller).toBeDefined(); + }); + + it('should call update of ApplicationDecisionComponentService', async () => { + mockApplicationDecisionComponentService.createOrUpdate.mockResolvedValue([ + new NoticeOfIntentDecisionComponent(), + ]); + mockApplicationDecisionComponentService.getOneOrFail.mockResolvedValue( + new NoticeOfIntentDecisionComponent(), + ); + const updates = { + uuid: 'fake_uuid', + alrArea: 10, + noticeOfIntentDecisionComponentTypeCode: 'fake', + } as CreateNoticeOfIntentDecisionComponentDto; + + await controller.update('fake_uuid', updates); + + expect( + mockApplicationDecisionComponentService.getOneOrFail, + ).toBeCalledTimes(1); + expect(mockApplicationDecisionComponentService.getOneOrFail).toBeCalledWith( + 'fake_uuid', + ); + expect( + mockApplicationDecisionComponentService.createOrUpdate, + ).toBeCalledTimes(1); + expect( + mockApplicationDecisionComponentService.createOrUpdate, + ).toBeCalledWith([ + { + uuid: 'fake_uuid', + alrArea: 10, + noticeOfIntentDecisionComponentTypeCode: 'fake', + }, + ]); + }); +}); diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-component/notice-of-intent-decision-component.controller.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-component/notice-of-intent-decision-component.controller.ts new file mode 100644 index 0000000000..cbc8b7cf6d --- /dev/null +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-component/notice-of-intent-decision-component.controller.ts @@ -0,0 +1,40 @@ +import { Mapper } from '@automapper/core'; +import { InjectMapper } from '@automapper/nestjs'; +import { Body, Controller, Param, Patch } from '@nestjs/common'; +import { ANY_AUTH_ROLE } from '../../../common/authorization/roles'; +import { UserRoles } from '../../../common/authorization/roles.decorator'; +import { + NoticeOfIntentDecisionComponentDto, + UpdateNoticeOfIntentDecisionComponentDto, +} from './notice-of-intent-decision-component.dto'; +import { NoticeOfIntentDecisionComponent } from './notice-of-intent-decision-component.entity'; +import { NoticeOfIntentDecisionComponentService } from './notice-of-intent-decision-component.service'; + +@Controller('notice-of-intent-decision-component') +export class NoticeOfIntentDecisionComponentController { + constructor( + private noticeOfIntentDecisionComponentService: NoticeOfIntentDecisionComponentService, + @InjectMapper() private mapper: Mapper, + ) {} + + @Patch('/:uuid') + @UserRoles(...ANY_AUTH_ROLE) + async update( + @Param('uuid') uuid: string, + @Body() updateDto: UpdateNoticeOfIntentDecisionComponentDto, + ): Promise { + await this.noticeOfIntentDecisionComponentService.getOneOrFail(uuid); + + const updatedComponent = + await this.noticeOfIntentDecisionComponentService.createOrUpdate([ + updateDto, + ]); + return ( + await this.mapper.mapArrayAsync( + updatedComponent, + NoticeOfIntentDecisionComponent, + NoticeOfIntentDecisionComponentDto, + ) + )[0]; + } +} diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-component/notice-of-intent-decision-component.dto.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-component/notice-of-intent-decision-component.dto.ts new file mode 100644 index 0000000000..70ad3a57b8 --- /dev/null +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-component/notice-of-intent-decision-component.dto.ts @@ -0,0 +1,158 @@ +import { AutoMap } from '@automapper/classes'; +import { IsNumber, IsOptional, IsString } from 'class-validator'; +import { BaseCodeDto } from '../../../common/dtos/base.dto'; + +export class NoticeOfIntentDecisionComponentTypeDto extends BaseCodeDto {} + +export class UpdateNoticeOfIntentDecisionComponentDto { + @IsString() + uuid: string; + + @IsOptional() + @IsString() + alrArea?: number; + + @IsOptional() + @IsString() + agCap?: string; + + @IsOptional() + @IsString() + agCapSource?: string; + + @IsOptional() + @IsString() + agCapMap?: string; + + @IsOptional() + @IsString() + agCapConsultant?: string; + + @IsString() + noticeOfIntentDecisionComponentTypeCode: string; + + @IsOptional() + @IsNumber() + endDate?: number; + + @IsOptional() + @IsNumber() + expiryDate?: number; + + @IsOptional() + @IsString() + soilFillTypeToPlace?: string; + + @IsNumber() + @IsOptional() + soilToPlaceVolume?: number | null; + + @IsNumber() + @IsOptional() + soilToPlaceArea?: number | null; + + @IsNumber() + @IsOptional() + soilToPlaceMaximumDepth?: number | null; + + @IsNumber() + @IsOptional() + soilToPlaceAverageDepth?: number | null; + + @IsOptional() + @IsString() + soilTypeRemoved?: string; + + @IsNumber() + @IsOptional() + soilToRemoveVolume?: number | null; + + @IsNumber() + @IsOptional() + soilToRemoveArea?: number | null; + + @IsNumber() + @IsOptional() + soilToRemoveMaximumDepth?: number | null; + + @IsNumber() + @IsOptional() + soilToRemoveAverageDepth?: number | null; +} + +export class CreateNoticeOfIntentDecisionComponentDto extends UpdateNoticeOfIntentDecisionComponentDto { + @IsOptional() + @IsString() + override uuid: string; +} + +export class NoticeOfIntentDecisionComponentDto { + @AutoMap() + uuid: string; + + @AutoMap() + alrArea?: number; + + @AutoMap() + agCap?: string; + + @AutoMap() + agCapSource?: string; + + @AutoMap() + agCapMap?: string; + + @AutoMap() + agCapConsultant?: string; + + @AutoMap() + endDate?: number; + + @AutoMap() + expiryDate?: number; + + @AutoMap() + noticeOfIntentDecisionUuid: string; + + @AutoMap() + soilFillTypeToPlace?: string; + + @AutoMap() + soilToPlaceVolume?: number; + + @AutoMap() + soilToPlaceArea?: number; + + @AutoMap() + soilToPlaceMaximumDepth?: number; + + @AutoMap() + soilToPlaceAverageDepth?: number; + + @AutoMap() + soilTypeRemoved?: string; + + @AutoMap() + soilToRemoveVolume?: number; + + @AutoMap() + soilToRemoveArea?: number; + + @AutoMap() + soilToRemoveMaximumDepth?: number; + + @AutoMap() + soilToRemoveAverageDepth?: number; + + @AutoMap() + noticeOfIntentDecisionComponentTypeCode: string; + + @AutoMap(() => NoticeOfIntentDecisionComponentTypeDto) + noticeOfIntentDecisionComponentType: NoticeOfIntentDecisionComponentTypeDto; +} + +export enum NOI_DECISION_COMPONENT_TYPE { + POFO = 'POFO', + ROSO = 'ROSO', + PFRS = 'PFRS', +} diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-component/notice-of-intent-decision-component.entity.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-component/notice-of-intent-decision-component.entity.ts new file mode 100644 index 0000000000..46725fced2 --- /dev/null +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-component/notice-of-intent-decision-component.entity.ts @@ -0,0 +1,190 @@ +import { AutoMap } from '@automapper/classes'; +import { Column, Entity, Index, ManyToMany, ManyToOne } from 'typeorm'; +import { Base } from '../../../common/entities/base.entity'; +import { ColumnNumericTransformer } from '../../../utils/column-numeric-transform'; +import { NoticeOfIntentDecisionCondition } from '../notice-of-intent-decision-condition/notice-of-intent-decision-condition.entity'; +import { NoticeOfIntentDecision } from '../notice-of-intent-decision.entity'; +import { NoticeOfIntentDecisionComponentType } from './notice-of-intent-decision-component-type.entity'; + +@Entity() +@Index( + ['noticeOfIntentDecisionComponentTypeCode', 'noticeOfIntentDecisionUuid'], + { + unique: true, + where: '"audit_deleted_date_at" is null', + }, +) +export class NoticeOfIntentDecisionComponent extends Base { + constructor(data?: Partial) { + super(); + if (data) { + Object.assign(this, data); + } + } + + @AutoMap(() => Number) + @Column({ + type: 'decimal', + nullable: true, + precision: 12, + scale: 2, + transformer: new ColumnNumericTransformer(), + comment: 'Area in hectares of ALR impacted by the decision component', + }) + alrArea?: number | null; + + @AutoMap(() => String) + @Column({ + type: 'text', + comment: 'Agricultural cap classification', + nullable: true, + }) + agCap?: string | null; + + @AutoMap(() => String) + @Column({ + type: 'text', + comment: 'Agricultural capability classification system used', + nullable: true, + }) + agCapSource?: string | null; + + @AutoMap(() => String) + @Column({ + type: 'text', + comment: 'Agricultural capability map sheet reference', + nullable: true, + }) + agCapMap?: string | null; + + @AutoMap(() => String) + @Column({ + type: 'text', + comment: 'Consultant who determined the agricultural capability', + nullable: true, + }) + agCapConsultant?: string | null; + + @Column({ + type: 'timestamptz', + comment: 'Components` end date', + nullable: true, + }) + endDate?: Date | null; + + @Column({ + type: 'timestamptz', + comment: 'Components` expiry date', + nullable: true, + }) + expiryDate?: Date | null; + + @AutoMap(() => String) + @Column({ type: 'text', nullable: true }) + soilFillTypeToPlace: string | null; + + @AutoMap(() => Number) + @Column({ + type: 'decimal', + nullable: true, + precision: 12, + scale: 2, + transformer: new ColumnNumericTransformer(), + }) + soilToPlaceVolume: number | null; + + @AutoMap(() => Number) + @Column({ + type: 'decimal', + nullable: true, + precision: 12, + scale: 2, + transformer: new ColumnNumericTransformer(), + }) + soilToPlaceArea: number | null; + + @AutoMap(() => Number) + @Column({ + type: 'decimal', + nullable: true, + precision: 12, + scale: 2, + transformer: new ColumnNumericTransformer(), + }) + soilToPlaceMaximumDepth: number | null; + + @AutoMap(() => Number) + @Column({ + type: 'decimal', + nullable: true, + precision: 12, + scale: 2, + transformer: new ColumnNumericTransformer(), + }) + soilToPlaceAverageDepth: number | null; + + @AutoMap(() => String) + @Column({ type: 'text', nullable: true }) + soilTypeRemoved: string | null; + + @AutoMap(() => Number) + @Column({ + type: 'decimal', + nullable: true, + precision: 12, + scale: 2, + transformer: new ColumnNumericTransformer(), + }) + soilToRemoveVolume: number | null; + + @AutoMap(() => Number) + @Column({ + type: 'decimal', + nullable: true, + precision: 12, + scale: 2, + transformer: new ColumnNumericTransformer(), + }) + soilToRemoveArea: number | null; + + @AutoMap(() => Number) + @Column({ + type: 'decimal', + nullable: true, + precision: 12, + scale: 2, + transformer: new ColumnNumericTransformer(), + }) + soilToRemoveMaximumDepth: number | null; + + @AutoMap(() => Number) + @Column({ + type: 'decimal', + nullable: true, + precision: 12, + scale: 2, + transformer: new ColumnNumericTransformer(), + }) + soilToRemoveAverageDepth: number | null; + + @AutoMap() + @Column({ nullable: false }) + noticeOfIntentDecisionComponentTypeCode: string; + + @AutoMap() + @ManyToOne(() => NoticeOfIntentDecisionComponentType) + noticeOfIntentDecisionComponentType: NoticeOfIntentDecisionComponentType; + + @Column({ nullable: false }) + noticeOfIntentDecisionUuid: string; + + @AutoMap() + @ManyToOne(() => NoticeOfIntentDecision, { nullable: false }) + noticeOfIntentDecision: NoticeOfIntentDecision; + + @ManyToMany( + () => NoticeOfIntentDecisionCondition, + (condition) => condition.components, + ) + conditions: NoticeOfIntentDecisionCondition[]; +} diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-component/notice-of-intent-decision-component.service.spec.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-component/notice-of-intent-decision-component.service.spec.ts new file mode 100644 index 0000000000..7118c35dc8 --- /dev/null +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-component/notice-of-intent-decision-component.service.spec.ts @@ -0,0 +1,234 @@ +import { ServiceValidationException } from '@app/common/exceptions/base.exception'; +import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; +import { Test, TestingModule } from '@nestjs/testing'; +import { getRepositoryToken } from '@nestjs/typeorm'; +import { Repository } from 'typeorm'; +import { CreateNoticeOfIntentDecisionComponentDto } from './notice-of-intent-decision-component.dto'; +import { NoticeOfIntentDecisionComponent } from './notice-of-intent-decision-component.entity'; +import { NoticeOfIntentDecisionComponentService } from './notice-of-intent-decision-component.service'; + +describe('ApplicationDecisionComponentService', () => { + let service: NoticeOfIntentDecisionComponentService; + let mockApplicationDecisionComponentRepository: DeepMocked< + Repository + >; + + beforeEach(async () => { + mockApplicationDecisionComponentRepository = createMock(); + + const module: TestingModule = await Test.createTestingModule({ + providers: [ + NoticeOfIntentDecisionComponentService, + { + provide: getRepositoryToken(NoticeOfIntentDecisionComponent), + useValue: mockApplicationDecisionComponentRepository, + }, + ], + }).compile(); + + service = module.get( + NoticeOfIntentDecisionComponentService, + ); + }); + + it('should be defined', () => { + expect(service).toBeDefined(); + }); + + it('should call repo to get one or fails with correct parameters', async () => { + mockApplicationDecisionComponentRepository.findOneOrFail.mockResolvedValue( + new NoticeOfIntentDecisionComponent(), + ); + + const result = await service.getOneOrFail('fake'); + + expect( + mockApplicationDecisionComponentRepository.findOneOrFail, + ).toBeCalledTimes(1); + expect( + mockApplicationDecisionComponentRepository.findOneOrFail, + ).toBeCalledWith({ + where: { uuid: 'fake' }, + }); + expect(result).toBeDefined(); + }); + + it('calls componentRepository.softRemove() method and soft removes an array of components', async () => { + const components = [ + new NoticeOfIntentDecisionComponent(), + new NoticeOfIntentDecisionComponent(), + ]; + + mockApplicationDecisionComponentRepository.softRemove.mockResolvedValue( + {} as NoticeOfIntentDecisionComponent, + ); + + await service.softRemove(components); + + expect( + mockApplicationDecisionComponentRepository.softRemove, + ).toHaveBeenCalledWith(components); + }); + + it('throws validation error if there are duplicate components', () => { + const firstComponent = { + uuid: 'fake', + noticeOfIntentDecisionComponentTypeCode: 'TURP', + agCap: '1', + agCapSource: '1', + alrArea: 1, + } as CreateNoticeOfIntentDecisionComponentDto; + + const secondComponent = { + uuid: 'fake-2', + noticeOfIntentDecisionComponentTypeCode: 'TURP', + agCap: '2', + agCapSource: '2', + alrArea: 2, + } as CreateNoticeOfIntentDecisionComponentDto; + + firstComponent.noticeOfIntentDecisionComponentTypeCode = 'fake'; + secondComponent.noticeOfIntentDecisionComponentTypeCode = 'fake'; + + const mockComponentsDto = [firstComponent, secondComponent]; + + expect(() => { + return service.validate(mockComponentsDto); + }).toThrowError(ServiceValidationException); + }); + + it('does not throw if there are no duplicate components', () => { + const firstComponent = { + uuid: 'fake', + noticeOfIntentDecisionComponentTypeCode: 'TURP', + agCap: '1', + agCapSource: '1', + alrArea: 1, + } as CreateNoticeOfIntentDecisionComponentDto; + + const secondComponent = { + uuid: 'fake-2', + noticeOfIntentDecisionComponentTypeCode: 'fake', + agCap: '2', + agCapSource: '2', + alrArea: 2, + } as CreateNoticeOfIntentDecisionComponentDto; + + const mockComponentsDto = [firstComponent, secondComponent]; + + expect(() => { + return service.validate(mockComponentsDto); + }).not.toThrowError(ServiceValidationException); + }); + + it('should create new components when given a DTO without a UUID', async () => { + mockApplicationDecisionComponentRepository.findOneOrFail.mockResolvedValue( + {} as NoticeOfIntentDecisionComponent, + ); + + const updateDtos = [ + new CreateNoticeOfIntentDecisionComponentDto(), + new CreateNoticeOfIntentDecisionComponentDto(), + ]; + + const result = await service.createOrUpdate(updateDtos, false); + + expect(result).toBeDefined(); + expect(result.length).toBe(2); + expect( + mockApplicationDecisionComponentRepository.findOneOrFail, + ).toBeCalledTimes(0); + }); + + it('should update existing components when given a DTO with a UUID', async () => { + mockApplicationDecisionComponentRepository.findOneOrFail.mockResolvedValue({ + uuid: 'fake', + noticeOfIntentDecisionComponentTypeCode: 'fake_code', + } as NoticeOfIntentDecisionComponent); + + const mockDto = new CreateNoticeOfIntentDecisionComponentDto(); + mockDto.uuid = 'fake'; + mockDto.alrArea = 1; + mockDto.agCap = '2'; + mockDto.agCapSource = '3'; + mockDto.agCapMap = '4'; + mockDto.agCapConsultant = '5'; + mockDto.noticeOfIntentDecisionComponentTypeCode = 'should_not_beUpdated'; + + const result = await service.createOrUpdate([mockDto], false); + + expect(result).toBeDefined(); + expect(result.length).toBe(1); + expect( + mockApplicationDecisionComponentRepository.findOneOrFail, + ).toBeCalledTimes(1); + expect( + mockApplicationDecisionComponentRepository.findOneOrFail, + ).toBeCalledWith({ + where: { uuid: 'fake' }, + }); + expect(result[0].uuid).toEqual(mockDto.uuid); + expect(result[0].alrArea).toEqual(mockDto.alrArea); + expect(result[0].agCap).toEqual(mockDto.agCap); + expect(result[0].agCapSource).toEqual(mockDto.agCapSource); + expect(result[0].agCapMap).toEqual(mockDto.agCapMap); + expect(result[0].agCapConsultant).toEqual(mockDto.agCapConsultant); + expect(result[0].noticeOfIntentDecisionComponentTypeCode).toEqual( + 'fake_code', + ); + }); + + it('should persist entity if persist flag is true', async () => { + mockApplicationDecisionComponentRepository.findOneOrFail.mockResolvedValue( + {} as NoticeOfIntentDecisionComponent, + ); + mockApplicationDecisionComponentRepository.save.mockResolvedValue( + {} as NoticeOfIntentDecisionComponent, + ); + + const updateDtos = [new CreateNoticeOfIntentDecisionComponentDto()]; + + const result = await service.createOrUpdate(updateDtos, true); + + expect(result).toBeDefined(); + expect( + mockApplicationDecisionComponentRepository.findOneOrFail, + ).toBeCalledTimes(0); + expect(mockApplicationDecisionComponentRepository.save).toBeCalledTimes(1); + }); + + it('should not persist entity if persist flag is false', async () => { + mockApplicationDecisionComponentRepository.findOneOrFail.mockResolvedValue( + {} as NoticeOfIntentDecisionComponent, + ); + mockApplicationDecisionComponentRepository.save.mockResolvedValue( + {} as NoticeOfIntentDecisionComponent, + ); + + const updateDtos = [new CreateNoticeOfIntentDecisionComponentDto()]; + + const result = await service.createOrUpdate(updateDtos, false); + + expect(result).toBeDefined(); + expect( + mockApplicationDecisionComponentRepository.findOneOrFail, + ).toBeCalledTimes(0); + expect(mockApplicationDecisionComponentRepository.save).toBeCalledTimes(0); + }); + + it('should validation decision component fields and throw error if any', async () => { + const mockComponents = [ + { + noticeOfIntentDecisionComponentTypeCode: 'POFO', + }, + { noticeOfIntentDecisionComponentTypeCode: 'ROSO' }, + { noticeOfIntentDecisionComponentTypeCode: 'PFRS' }, + ] as CreateNoticeOfIntentDecisionComponentDto[]; + + const mockValidationWrapper = () => { + service.validate(mockComponents, false); + }; + + expect(mockValidationWrapper).toThrow(ServiceValidationException); + }); +}); diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-component/notice-of-intent-decision-component.service.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-component/notice-of-intent-decision-component.service.ts new file mode 100644 index 0000000000..6128ec1abf --- /dev/null +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-component/notice-of-intent-decision-component.service.ts @@ -0,0 +1,228 @@ +import { ServiceValidationException } from '@app/common/exceptions/base.exception'; +import { Injectable } from '@nestjs/common'; +import { InjectRepository } from '@nestjs/typeorm'; +import { Repository } from 'typeorm'; +import { + NOI_DECISION_COMPONENT_TYPE, + CreateNoticeOfIntentDecisionComponentDto, +} from './notice-of-intent-decision-component.dto'; +import { NoticeOfIntentDecisionComponent } from './notice-of-intent-decision-component.entity'; + +@Injectable() +export class NoticeOfIntentDecisionComponentService { + constructor( + @InjectRepository(NoticeOfIntentDecisionComponent) + private componentRepository: Repository, + ) {} + + async getOneOrFail(uuid: string) { + return this.componentRepository.findOneOrFail({ + where: { uuid }, + }); + } + + async createOrUpdate( + updateDtos: CreateNoticeOfIntentDecisionComponentDto[], + isPersist = true, + ) { + const updatedComponents: NoticeOfIntentDecisionComponent[] = []; + + for (const updateDto of updateDtos) { + let component: NoticeOfIntentDecisionComponent | null = null; + + if (updateDto.uuid) { + component = await this.getOneOrFail(updateDto.uuid); + } else { + component = new NoticeOfIntentDecisionComponent(); + component.noticeOfIntentDecisionComponentTypeCode = + updateDto.noticeOfIntentDecisionComponentTypeCode; + } + + component.alrArea = updateDto.alrArea; + component.agCap = updateDto.agCap; + component.agCapSource = updateDto.agCapSource; + component.agCapMap = updateDto.agCapMap; + component.agCapConsultant = updateDto.agCapConsultant; + + this.patchPofoFields(component, updateDto); + this.patchRosoFields(component, updateDto); + + updatedComponents.push(component); + } + + if (isPersist) { + return await this.componentRepository.save(updatedComponents); + } + + return updatedComponents; + } + + private patchPofoFields( + component: NoticeOfIntentDecisionComponent, + updateDto: CreateNoticeOfIntentDecisionComponentDto, + ) { + component.endDate = updateDto.endDate ? new Date(updateDto.endDate) : null; + component.soilFillTypeToPlace = updateDto.soilFillTypeToPlace ?? null; + component.soilToPlaceArea = updateDto.soilToPlaceArea ?? null; + component.soilToPlaceVolume = updateDto.soilToPlaceVolume ?? null; + component.soilToPlaceMaximumDepth = + updateDto.soilToPlaceMaximumDepth ?? null; + component.soilToPlaceAverageDepth = + updateDto.soilToPlaceAverageDepth ?? null; + } + + private patchRosoFields( + component: NoticeOfIntentDecisionComponent, + updateDto: CreateNoticeOfIntentDecisionComponentDto, + ) { + component.endDate = updateDto.endDate ? new Date(updateDto.endDate) : null; + component.soilTypeRemoved = updateDto.soilTypeRemoved ?? null; + component.soilToRemoveVolume = updateDto.soilToRemoveVolume ?? null; + component.soilToRemoveArea = updateDto.soilToRemoveArea ?? null; + component.soilToRemoveMaximumDepth = + updateDto.soilToRemoveMaximumDepth ?? null; + component.soilToRemoveAverageDepth = + updateDto.soilToRemoveAverageDepth ?? null; + } + + validate( + componentsDto: CreateNoticeOfIntentDecisionComponentDto[], + isDraftDecision = false, + ) { + if (!this.checkDuplicates(componentsDto)) { + throw new ServiceValidationException( + 'Only on component of each type is allowed', + ); + } + + if (!isDraftDecision) { + if (componentsDto.length < 1) { + throw new ServiceValidationException( + 'Decision components are required', + ); + } + + this.validateDecisionComponentFields(componentsDto); + } + } + + private checkDuplicates( + components: CreateNoticeOfIntentDecisionComponentDto[], + ) { + const typeCounts = {}; + + for (const { noticeOfIntentDecisionComponentTypeCode } of components) { + if (typeCounts[noticeOfIntentDecisionComponentTypeCode]) { + return false; + } + typeCounts[noticeOfIntentDecisionComponentTypeCode] = 1; + } + + return true; + } + + async getAllByNoticeOfIntentUUID(noticeOfIntentUuid: string) { + return await this.componentRepository.find({ + where: { + noticeOfIntentDecision: { + noticeOfIntentUuid, + }, + }, + relations: { + noticeOfIntentDecisionComponentType: true, + }, + }); + } + + validateDecisionComponentFields( + componentsDto: CreateNoticeOfIntentDecisionComponentDto[], + ) { + const errors: string[] = []; + + for (const component of componentsDto) { + if (!component.alrArea) { + errors.push('Alr Area is required'); + } + if (!component.agCap) { + errors.push('Agri Cap is required'); + } + if (!component.alrArea) { + errors.push('Agri Source is required'); + } + + if ( + component.noticeOfIntentDecisionComponentTypeCode === + NOI_DECISION_COMPONENT_TYPE.POFO + ) { + this.validatePofoDecisionComponentFields(component, errors); + } + + if ( + component.noticeOfIntentDecisionComponentTypeCode === + NOI_DECISION_COMPONENT_TYPE.ROSO + ) { + this.validateRosoDecisionComponentFields(component, errors); + } + + if ( + component.noticeOfIntentDecisionComponentTypeCode === + NOI_DECISION_COMPONENT_TYPE.PFRS + ) { + this.validatePofoDecisionComponentFields(component, errors); + this.validateRosoDecisionComponentFields(component, errors); + } + } + + if (errors.length > 0) { + throw new ServiceValidationException(errors.join(', ')); + } + } + + private validatePofoDecisionComponentFields( + component: CreateNoticeOfIntentDecisionComponentDto, + errors: string[], + ) { + if (!component.soilFillTypeToPlace) { + errors.push( + 'Type, origin and quality of fill approved to be placed is required', + ); + } + if (!component.soilToPlaceVolume) { + errors.push('Volume To Place is required'); + } + if (!component.soilToPlaceArea) { + errors.push('Area To Place is required'); + } + if (!component.soilToPlaceMaximumDepth) { + errors.push('Maximum Depth To Place is required'); + } + if (!component.soilToPlaceAverageDepth) { + errors.push('Average Depth To Place is required'); + } + } + + private validateRosoDecisionComponentFields( + component: CreateNoticeOfIntentDecisionComponentDto, + errors: string[], + ) { + if (!component.soilTypeRemoved) { + errors.push('Type of soil approved to be removed is required'); + } + if (!component.soilToRemoveVolume) { + errors.push('Volume To Remove is required'); + } + if (!component.soilToRemoveArea) { + errors.push('Area To Remove is required'); + } + if (!component.soilToRemoveMaximumDepth) { + errors.push('Maximum Depth To Remove is required'); + } + if (!component.soilToRemoveAverageDepth) { + errors.push('Average Depth To Remove is required'); + } + } + + async softRemove(components: NoticeOfIntentDecisionComponent[]) { + await this.componentRepository.softRemove(components); + } +} diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-condition/notice-of-intent-decision-condition-code.entity.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-condition/notice-of-intent-decision-condition-code.entity.ts new file mode 100644 index 0000000000..595624db07 --- /dev/null +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-condition/notice-of-intent-decision-condition-code.entity.ts @@ -0,0 +1,5 @@ +import { Entity } from 'typeorm'; +import { BaseCodeEntity } from '../../../common/entities/base.code.entity'; + +@Entity() +export class NoticeOfIntentDecisionConditionType extends BaseCodeEntity {} diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-condition/notice-of-intent-decision-condition.controller.spec.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-condition/notice-of-intent-decision-condition.controller.spec.ts new file mode 100644 index 0000000000..b1756bf9bd --- /dev/null +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-condition/notice-of-intent-decision-condition.controller.spec.ts @@ -0,0 +1,109 @@ +import { classes } from '@automapper/classes'; +import { AutomapperModule } from '@automapper/nestjs'; +import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; +import { Test, TestingModule } from '@nestjs/testing'; +import { ClsService } from 'nestjs-cls'; +import { mockKeyCloakProviders } from '../../../../test/mocks/mockTypes'; +import { NoticeOfIntentDecisionProfile } from '../../../common/automapper/notice-of-intent-decision.automapper.profile'; +import { NoticeOfIntentDecisionConditionController } from './notice-of-intent-decision-condition.controller'; +import { UpdateNoticeOfIntentDecisionConditionDto } from './notice-of-intent-decision-condition.dto'; +import { NoticeOfIntentDecisionCondition } from './notice-of-intent-decision-condition.entity'; +import { NoticeOfIntentDecisionConditionService } from './notice-of-intent-decision-condition.service'; + +describe('NoticeOfIntentDecisionConditionController', () => { + let controller: NoticeOfIntentDecisionConditionController; + let mockApplicationDecisionConditionService: DeepMocked; + + beforeEach(async () => { + mockApplicationDecisionConditionService = createMock(); + + const module: TestingModule = await Test.createTestingModule({ + imports: [ + AutomapperModule.forRoot({ + strategyInitializer: classes(), + }), + ], + controllers: [NoticeOfIntentDecisionConditionController], + providers: [ + NoticeOfIntentDecisionProfile, + { + provide: NoticeOfIntentDecisionConditionService, + useValue: mockApplicationDecisionConditionService, + }, + { + provide: ClsService, + useValue: {}, + }, + ...mockKeyCloakProviders, + ], + }).compile(); + + controller = module.get( + NoticeOfIntentDecisionConditionController, + ); + }); + + it('should be defined', () => { + expect(controller).toBeDefined(); + }); + + describe('update', () => { + it('should update the condition and return updated condition', async () => { + // Arrange + const uuid = 'example-uuid'; + const date = new Date(); + const updates: UpdateNoticeOfIntentDecisionConditionDto = { + approvalDependant: true, + securityAmount: 1000, + administrativeFee: 50, + description: 'example description', + completionDate: date.getTime(), + supersededDate: date.getTime(), + }; + + const condition = new NoticeOfIntentDecisionCondition({ + uuid, + approvalDependant: false, + securityAmount: 500, + administrativeFee: 25, + description: 'existing description', + completionDate: new Date(), + supersededDate: new Date(), + }); + + const updated = new NoticeOfIntentDecisionCondition({ + uuid, + approvalDependant: updates.approvalDependant, + securityAmount: updates.securityAmount, + administrativeFee: updates.administrativeFee, + description: updates.description, + completionDate: date, + supersededDate: date, + }); + + mockApplicationDecisionConditionService.getOneOrFail.mockResolvedValue( + condition, + ); + mockApplicationDecisionConditionService.update.mockResolvedValue(updated); + + const result = await controller.update(uuid, updates); + + expect( + mockApplicationDecisionConditionService.getOneOrFail, + ).toHaveBeenCalledWith(uuid); + expect( + mockApplicationDecisionConditionService.update, + ).toHaveBeenCalledWith(condition, { + ...updates, + completionDate: date, + supersededDate: date, + }); + expect(new Date(result.completionDate!)).toEqual(updated.completionDate); + expect(new Date(result.supersededDate!)).toEqual(updated.supersededDate); + expect(result.description).toEqual(updated.description); + expect(result.administrativeFee).toEqual(updated.administrativeFee); + expect(result.securityAmount).toEqual(updated.securityAmount); + expect(result.approvalDependant).toEqual(updated.approvalDependant); + }); + }); +}); diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-condition/notice-of-intent-decision-condition.controller.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-condition/notice-of-intent-decision-condition.controller.ts new file mode 100644 index 0000000000..e2830c7b33 --- /dev/null +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-condition/notice-of-intent-decision-condition.controller.ts @@ -0,0 +1,48 @@ +import { Mapper } from '@automapper/core'; +import { InjectMapper } from '@automapper/nestjs'; +import { Body, Controller, Param, Patch, UseGuards } from '@nestjs/common'; +import { ApiOAuth2 } from '@nestjs/swagger'; +import * as config from 'config'; +import { ANY_AUTH_ROLE } from '../../../common/authorization/roles'; +import { RolesGuard } from '../../../common/authorization/roles-guard.service'; +import { UserRoles } from '../../../common/authorization/roles.decorator'; +import { formatIncomingDate } from '../../../utils/incoming-date.formatter'; +import { + NoticeOfIntentDecisionConditionDto, + UpdateNoticeOfIntentDecisionConditionDto, +} from './notice-of-intent-decision-condition.dto'; +import { NoticeOfIntentDecisionCondition } from './notice-of-intent-decision-condition.entity'; +import { NoticeOfIntentDecisionConditionService } from './notice-of-intent-decision-condition.service'; + +@ApiOAuth2(config.get('KEYCLOAK.SCOPES')) +@Controller('notice-of-intent-decision-condition') +@UseGuards(RolesGuard) +export class NoticeOfIntentDecisionConditionController { + constructor( + private conditionService: NoticeOfIntentDecisionConditionService, + @InjectMapper() private mapper: Mapper, + ) {} + + @Patch('/:uuid') + @UserRoles(...ANY_AUTH_ROLE) + async update( + @Param('uuid') uuid: string, + @Body() updates: UpdateNoticeOfIntentDecisionConditionDto, + ) { + const condition = await this.conditionService.getOneOrFail(uuid); + + const updatedCondition = await this.conditionService.update(condition, { + approvalDependant: updates.approvalDependant, + securityAmount: updates.securityAmount, + administrativeFee: updates.administrativeFee, + description: updates.description, + completionDate: formatIncomingDate(updates.completionDate), + supersededDate: formatIncomingDate(updates.supersededDate), + }); + return await this.mapper.mapAsync( + updatedCondition, + NoticeOfIntentDecisionCondition, + NoticeOfIntentDecisionConditionDto, + ); + } +} diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-condition/notice-of-intent-decision-condition.dto.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-condition/notice-of-intent-decision-condition.dto.ts new file mode 100644 index 0000000000..1cd1db72f5 --- /dev/null +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-condition/notice-of-intent-decision-condition.dto.ts @@ -0,0 +1,103 @@ +import { AutoMap } from '@automapper/classes'; +import { + IsArray, + IsBoolean, + IsNumber, + IsOptional, + IsString, + IsUUID, +} from 'class-validator'; +import { BaseCodeDto } from '../../../common/dtos/base.dto'; +import { NoticeOfIntentDecisionComponentDto } from '../notice-of-intent-decision-component/notice-of-intent-decision-component.dto'; + +export class NoticeOfIntentDecisionConditionTypeDto extends BaseCodeDto {} +export class NoticeOfIntentDecisionConditionDto { + @AutoMap() + uuid: string; + + @AutoMap(() => Boolean) + approvalDependant: boolean | null; + + @AutoMap(() => Number) + securityAmount: number | null; + + @AutoMap(() => Number) + administrativeFee: number | null; + + @AutoMap(() => String) + description: string | null; + + @AutoMap(() => NoticeOfIntentDecisionConditionTypeDto) + type: NoticeOfIntentDecisionConditionTypeDto; + + @AutoMap(() => String) + componentUuid: string | null; + + @AutoMap() + completionDate?: number; + + @AutoMap() + supersededDate?: number; + + @AutoMap() + components?: NoticeOfIntentDecisionComponentDto[]; +} + +export class ComponentToConditionDto { + @IsOptional() + @IsUUID() + componentDecisionUuid?: string; + + @IsOptional() + @IsString() + componentToConditionType?: string; +} + +export class UpdateNoticeOfIntentDecisionConditionDto { + @IsOptional() + @IsString() + uuid?: string; + + @IsOptional() + @IsArray() + componentsToCondition?: ComponentToConditionDto[]; + + @IsOptional() + @IsBoolean() + approvalDependant?: boolean; + + @IsOptional() + @IsNumber() + securityAmount?: number; + + @IsOptional() + @IsNumber() + administrativeFee?: number; + + @IsOptional() + @IsString() + description?: string; + + @IsOptional() + @IsString() + type?: NoticeOfIntentDecisionConditionTypeDto; + + @IsOptional() + @IsNumber() + completionDate?: number; + + @IsOptional() + @IsNumber() + supersededDate?: number; +} + +export class UpdateNoticeOfIntentDecisionConditionServiceDto { + componentDecisionUuid?: string; + componentToConditionType?: string; + approvalDependant?: boolean; + securityAmount?: number; + administrativeFee?: number; + description?: string; + completionDate?: Date | null; + supersededDate?: Date | null; +} diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-condition/notice-of-intent-decision-condition.entity.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-condition/notice-of-intent-decision-condition.entity.ts new file mode 100644 index 0000000000..b40b90bf3e --- /dev/null +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-condition/notice-of-intent-decision-condition.entity.ts @@ -0,0 +1,85 @@ +import { AutoMap } from '@automapper/classes'; +import { Column, Entity, JoinTable, ManyToMany, ManyToOne } from 'typeorm'; +import { Base } from '../../../common/entities/base.entity'; +import { ColumnNumericTransformer } from '../../../utils/column-numeric-transform'; +import { NoticeOfIntentDecisionComponent } from '../notice-of-intent-decision-component/notice-of-intent-decision-component.entity'; +import { NoticeOfIntentDecision } from '../notice-of-intent-decision.entity'; +import { NoticeOfIntentDecisionConditionType } from './notice-of-intent-decision-condition-code.entity'; + +@Entity() +export class NoticeOfIntentDecisionCondition extends Base { + constructor(data?: Partial) { + super(); + if (data) { + Object.assign(this, data); + } + } + + @AutoMap(() => Boolean) + @Column({ type: 'boolean', nullable: true }) + approvalDependant: boolean | null; + + @AutoMap(() => Number) + @Column({ + type: 'decimal', + nullable: true, + precision: 12, + scale: 2, + transformer: new ColumnNumericTransformer(), + }) + securityAmount: number | null; + + @AutoMap(() => Number) + @Column({ + type: 'decimal', + nullable: true, + precision: 12, + scale: 2, + transformer: new ColumnNumericTransformer(), + }) + administrativeFee: number | null; + + @AutoMap(() => String) + @Column({ type: 'text', nullable: true }) + description: string | null; + + @AutoMap(() => String) + @Column({ + type: 'timestamptz', + comment: 'Condition Completion date', + nullable: true, + }) + completionDate?: Date | null; + + @AutoMap() + @Column({ + type: 'timestamptz', + comment: 'Condition Superseded date', + nullable: true, + }) + supersededDate?: Date | null; + + @ManyToOne(() => NoticeOfIntentDecisionConditionType) + type: NoticeOfIntentDecisionConditionType; + + @AutoMap(() => String) + @Column({ type: 'text', nullable: true }) + typeCode: string | null; + + @ManyToOne(() => NoticeOfIntentDecision, { nullable: false }) + decision: NoticeOfIntentDecision; + + @AutoMap(() => String) + @Column() + decisionUuid: string; + + @ManyToMany( + () => NoticeOfIntentDecisionComponent, + (component) => component.conditions, + { nullable: true }, + ) + @JoinTable({ + name: 'notice_of_intent_decision_condition_component', + }) + components: NoticeOfIntentDecisionComponent[] | null; +} diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-condition/notice-of-intent-decision-condition.service.spec.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-condition/notice-of-intent-decision-condition.service.spec.ts new file mode 100644 index 0000000000..1a9eb6b50a --- /dev/null +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-condition/notice-of-intent-decision-condition.service.spec.ts @@ -0,0 +1,162 @@ +import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; +import { Test, TestingModule } from '@nestjs/testing'; +import { getRepositoryToken } from '@nestjs/typeorm'; +import { Repository } from 'typeorm'; +import { NoticeOfIntentDecisionConditionType } from './notice-of-intent-decision-condition-code.entity'; +import { UpdateNoticeOfIntentDecisionConditionDto } from './notice-of-intent-decision-condition.dto'; +import { NoticeOfIntentDecisionCondition } from './notice-of-intent-decision-condition.entity'; +import { NoticeOfIntentDecisionConditionService } from './notice-of-intent-decision-condition.service'; + +describe('ApplicationDecisionConditionService', () => { + let service: NoticeOfIntentDecisionConditionService; + let mockApplicationDecisionConditionRepository: DeepMocked< + Repository + >; + let mockAppDecCondTypeRepository: DeepMocked< + Repository + >; + + beforeEach(async () => { + mockApplicationDecisionConditionRepository = createMock(); + mockAppDecCondTypeRepository = createMock(); + + const module: TestingModule = await Test.createTestingModule({ + providers: [ + NoticeOfIntentDecisionConditionService, + { + provide: getRepositoryToken(NoticeOfIntentDecisionCondition), + useValue: mockApplicationDecisionConditionRepository, + }, + { + provide: getRepositoryToken(NoticeOfIntentDecisionConditionType), + useValue: mockAppDecCondTypeRepository, + }, + ], + }).compile(); + + service = module.get( + NoticeOfIntentDecisionConditionService, + ); + }); + + it('should be defined', () => { + expect(service).toBeDefined(); + }); + + it('should call repo to get one or fails with correct parameters', async () => { + mockApplicationDecisionConditionRepository.findOneOrFail.mockResolvedValue( + new NoticeOfIntentDecisionCondition(), + ); + + const result = await service.getOneOrFail('fake'); + + expect( + mockApplicationDecisionConditionRepository.findOneOrFail, + ).toBeCalledTimes(1); + expect( + mockApplicationDecisionConditionRepository.findOneOrFail, + ).toBeCalledWith({ + where: { uuid: 'fake' }, + relations: { type: true }, + }); + expect(result).toBeDefined(); + }); + + it('calls remove method for deleted conditions', async () => { + const conditions = [ + new NoticeOfIntentDecisionCondition(), + new NoticeOfIntentDecisionCondition(), + ]; + + mockApplicationDecisionConditionRepository.remove.mockResolvedValue( + {} as NoticeOfIntentDecisionCondition, + ); + + await service.remove(conditions); + + expect(mockApplicationDecisionConditionRepository.remove).toBeCalledTimes( + 1, + ); + }); + + it('should create new components when given a DTO without a UUID', async () => { + mockApplicationDecisionConditionRepository.findOneOrFail.mockResolvedValue( + new NoticeOfIntentDecisionCondition(), + ); + + const updateDtos: UpdateNoticeOfIntentDecisionConditionDto[] = [{}, {}]; + + const result = await service.createOrUpdate(updateDtos, [], [], false); + + expect(result).toBeDefined(); + expect(result.length).toBe(2); + expect( + mockApplicationDecisionConditionRepository.findOneOrFail, + ).toBeCalledTimes(0); + }); + + it('should update existing components when given a DTO with a UUID', async () => { + mockApplicationDecisionConditionRepository.findOneOrFail.mockResolvedValue( + new NoticeOfIntentDecisionCondition({ + uuid: 'uuid', + }), + ); + + const mockDto: UpdateNoticeOfIntentDecisionConditionDto = { + uuid: 'uuid', + }; + + const result = await service.createOrUpdate([mockDto], [], [], false); + + expect(result).toBeDefined(); + expect(result.length).toBe(1); + expect( + mockApplicationDecisionConditionRepository.findOneOrFail, + ).toBeCalledTimes(1); + expect( + mockApplicationDecisionConditionRepository.findOneOrFail, + ).toBeCalledWith({ + where: { uuid: 'uuid' }, + relations: { type: true }, + }); + expect(result[0].uuid).toEqual(mockDto.uuid); + }); + + it('should persist entity if persist flag is true', async () => { + mockApplicationDecisionConditionRepository.findOneOrFail.mockResolvedValue( + new NoticeOfIntentDecisionCondition(), + ); + mockApplicationDecisionConditionRepository.save.mockResolvedValue( + new NoticeOfIntentDecisionCondition(), + ); + + const updateDtos: UpdateNoticeOfIntentDecisionConditionDto[] = [{}]; + + const result = await service.createOrUpdate(updateDtos, [], [], true); + + expect(result).toBeDefined(); + expect( + mockApplicationDecisionConditionRepository.findOneOrFail, + ).toBeCalledTimes(0); + expect(mockApplicationDecisionConditionRepository.save).toBeCalledTimes(1); + }); + + it('should not persist entity if persist flag is false', async () => { + mockApplicationDecisionConditionRepository.findOneOrFail.mockResolvedValue( + new NoticeOfIntentDecisionCondition(), + ); + mockApplicationDecisionConditionRepository.save.mockResolvedValue( + new NoticeOfIntentDecisionCondition(), + ); + + const updateDtos: UpdateNoticeOfIntentDecisionConditionDto[] = [{}]; + + const result = await service.createOrUpdate(updateDtos, [], [], false); + + expect(result).toBeDefined(); + expect( + mockApplicationDecisionConditionRepository.findOneOrFail, + ).toBeCalledTimes(0); + expect(mockApplicationDecisionConditionRepository.save).toBeCalledTimes(0); + }); +}); diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-condition/notice-of-intent-decision-condition.service.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-condition/notice-of-intent-decision-condition.service.ts new file mode 100644 index 0000000000..7f38ee9569 --- /dev/null +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-condition/notice-of-intent-decision-condition.service.ts @@ -0,0 +1,121 @@ +import { Injectable } from '@nestjs/common'; +import { InjectRepository } from '@nestjs/typeorm'; +import { Repository } from 'typeorm'; +import { ServiceValidationException } from '../../../../../../libs/common/src/exceptions/base.exception'; +import { NoticeOfIntentDecisionComponent } from '../notice-of-intent-decision-component/notice-of-intent-decision-component.entity'; +import { NoticeOfIntentDecisionConditionType } from './notice-of-intent-decision-condition-code.entity'; +import { + UpdateNoticeOfIntentDecisionConditionDto, + UpdateNoticeOfIntentDecisionConditionServiceDto, +} from './notice-of-intent-decision-condition.dto'; +import { NoticeOfIntentDecisionCondition } from './notice-of-intent-decision-condition.entity'; + +@Injectable() +export class NoticeOfIntentDecisionConditionService { + constructor( + @InjectRepository(NoticeOfIntentDecisionCondition) + private repository: Repository, + @InjectRepository(NoticeOfIntentDecisionConditionType) + private typeRepository: Repository, + ) {} + + async getOneOrFail(uuid: string) { + return this.repository.findOneOrFail({ + where: { uuid }, + relations: { + type: true, + }, + }); + } + + async createOrUpdate( + updateDtos: UpdateNoticeOfIntentDecisionConditionDto[], + allComponents: NoticeOfIntentDecisionComponent[], + newComponents: NoticeOfIntentDecisionComponent[], + isPersist = true, + ) { + const updatedConditions: NoticeOfIntentDecisionCondition[] = []; + + for (const updateDto of updateDtos) { + let condition: NoticeOfIntentDecisionCondition | null = null; + + if (updateDto.uuid) { + condition = await this.getOneOrFail(updateDto.uuid); + } else { + condition = new NoticeOfIntentDecisionCondition(); + } + if (updateDto.type?.code) { + condition.type = await this.typeRepository.findOneOrFail({ + where: { + code: updateDto.type.code, + }, + }); + } + + condition.administrativeFee = updateDto.administrativeFee ?? null; + condition.description = updateDto.description ?? null; + condition.securityAmount = updateDto.securityAmount ?? null; + condition.approvalDependant = updateDto.approvalDependant ?? null; + + if ( + updateDto.componentsToCondition !== undefined && + updateDto.componentsToCondition.length > 0 + ) { + const mappedComponents: NoticeOfIntentDecisionComponent[] = []; + for (const componentToCondition of updateDto.componentsToCondition) { + const matchingComponent = allComponents.find( + (component) => + componentToCondition.componentDecisionUuid === + component.noticeOfIntentDecisionUuid && + componentToCondition.componentToConditionType === + component.noticeOfIntentDecisionComponentTypeCode, + ); + + if (matchingComponent) { + mappedComponents.push(matchingComponent); + updatedConditions.push(condition); + continue; + } + + const matchingComponent2 = newComponents.find( + (component) => + componentToCondition.componentToConditionType === + component.noticeOfIntentDecisionComponentTypeCode, + ); + + if (matchingComponent2) { + mappedComponents.push(matchingComponent2); + updatedConditions.push(condition); + continue; + } + throw new ServiceValidationException( + 'Failed to find matching component', + ); + } + + condition.components = mappedComponents; + } else { + condition.components = null; + updatedConditions.push(condition); + } + } + + if (isPersist) { + return await this.repository.save(updatedConditions); + } + + return updatedConditions; + } + + async remove(conditions: NoticeOfIntentDecisionCondition[]) { + await this.repository.remove(conditions); + } + + async update( + existingCondition: NoticeOfIntentDecisionCondition, + updates: UpdateNoticeOfIntentDecisionConditionServiceDto, + ) { + await this.repository.update(existingCondition.uuid, updates); + return await this.getOneOrFail(existingCondition.uuid); + } +} diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.controller.spec.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v1/notice-of-intent-decision-v1.controller.spec.ts similarity index 80% rename from services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.controller.spec.ts rename to services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v1/notice-of-intent-decision-v1.controller.spec.ts index 9a48e1e66a..45398bf98a 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.controller.spec.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v1/notice-of-intent-decision-v1.controller.spec.ts @@ -3,24 +3,24 @@ import { AutomapperModule } from '@automapper/nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { ClsService } from 'nestjs-cls'; -import { mockKeyCloakProviders } from '../../../test/mocks/mockTypes'; -import { NoticeOfIntentDecisionProfile } from '../../common/automapper/notice-of-intent-decision.automapper.profile'; -import { UserProfile } from '../../common/automapper/user.automapper.profile'; -import { NoticeOfIntent } from '../notice-of-intent/notice-of-intent.entity'; -import { NoticeOfIntentService } from '../notice-of-intent/notice-of-intent.service'; -import { NoticeOfIntentDecisionOutcome } from './notice-of-intent-decision-outcome.entity'; -import { NoticeOfIntentDecisionController } from './notice-of-intent-decision.controller'; +import { mockKeyCloakProviders } from '../../../../test/mocks/mockTypes'; +import { NoticeOfIntentDecisionProfile } from '../../../common/automapper/notice-of-intent-decision.automapper.profile'; +import { UserProfile } from '../../../common/automapper/user.automapper.profile'; +import { NoticeOfIntent } from '../../notice-of-intent/notice-of-intent.entity'; +import { NoticeOfIntentService } from '../../notice-of-intent/notice-of-intent.service'; +import { NoticeOfIntentDecisionOutcome } from '../notice-of-intent-decision-outcome.entity'; +import { NoticeOfIntentDecisionV1Controller } from './notice-of-intent-decision-v1.controller'; import { CreateNoticeOfIntentDecisionDto, UpdateNoticeOfIntentDecisionDto, -} from './notice-of-intent-decision.dto'; -import { NoticeOfIntentDecision } from './notice-of-intent-decision.entity'; -import { NoticeOfIntentDecisionService } from './notice-of-intent-decision.service'; -import { NoticeOfIntentModificationService } from './notice-of-intent-modification/notice-of-intent-modification.service'; +} from '../notice-of-intent-decision.dto'; +import { NoticeOfIntentDecision } from '../notice-of-intent-decision.entity'; +import { NoticeOfIntentDecisionV1Service } from './notice-of-intent-decision-v1.service'; +import { NoticeOfIntentModificationService } from '../notice-of-intent-modification/notice-of-intent-modification.service'; describe('NoticeOfIntentDecisionController', () => { - let controller: NoticeOfIntentDecisionController; - let mockDecisionService: DeepMocked; + let controller: NoticeOfIntentDecisionV1Controller; + let mockDecisionService: DeepMocked; let mockNOIService: DeepMocked; let mockNOIModificationService: DeepMocked; @@ -46,12 +46,12 @@ describe('NoticeOfIntentDecisionController', () => { strategyInitializer: classes(), }), ], - controllers: [NoticeOfIntentDecisionController], + controllers: [NoticeOfIntentDecisionV1Controller], providers: [ NoticeOfIntentDecisionProfile, UserProfile, { - provide: NoticeOfIntentDecisionService, + provide: NoticeOfIntentDecisionV1Service, useValue: mockDecisionService, }, { @@ -70,8 +70,8 @@ describe('NoticeOfIntentDecisionController', () => { ], }).compile(); - controller = module.get( - NoticeOfIntentDecisionController, + controller = module.get( + NoticeOfIntentDecisionV1Controller, ); mockDecisionService.fetchCodes.mockResolvedValue({ @@ -120,7 +120,7 @@ describe('NoticeOfIntentDecisionController', () => { const decisionToCreate = { date: new Date(2022, 2, 2, 2, 2, 2, 2).valueOf(), - applicationFileNumber: mockNoi.fileNumber, + fileNumber: mockNoi.fileNumber, outcomeCode: 'outcome', } as CreateNoticeOfIntentDecisionDto; @@ -141,7 +141,7 @@ describe('NoticeOfIntentDecisionController', () => { it('should update the decision', async () => { mockDecisionService.update.mockResolvedValue(mockDecision); const updates = { - outcome: 'New Outcome', + outcomeCode: 'New Outcome', date: new Date(2022, 2, 2, 2, 2, 2, 2).valueOf(), } as UpdateNoticeOfIntentDecisionDto; @@ -149,7 +149,7 @@ describe('NoticeOfIntentDecisionController', () => { expect(mockDecisionService.update).toBeCalledTimes(1); expect(mockDecisionService.update).toBeCalledWith('fake-uuid', { - outcome: 'New Outcome', + outcomeCode: 'New Outcome', date: updates.date, }); }); diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.controller.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v1/notice-of-intent-decision-v1.controller.ts similarity index 83% rename from services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.controller.ts rename to services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v1/notice-of-intent-decision-v1.controller.ts index a6de65456f..9b6f3e826d 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.controller.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v1/notice-of-intent-decision-v1.controller.ts @@ -14,27 +14,27 @@ import { } from '@nestjs/common'; import { ApiOAuth2 } from '@nestjs/swagger'; import * as config from 'config'; -import { ANY_AUTH_ROLE } from '../../common/authorization/roles'; -import { RolesGuard } from '../../common/authorization/roles-guard.service'; -import { UserRoles } from '../../common/authorization/roles.decorator'; -import { NoticeOfIntentService } from '../notice-of-intent/notice-of-intent.service'; -import { NoticeOfIntentDecisionOutcome } from './notice-of-intent-decision-outcome.entity'; -import { NoticeOfIntentDecision } from './notice-of-intent-decision.entity'; +import { ANY_AUTH_ROLE } from '../../../common/authorization/roles'; +import { RolesGuard } from '../../../common/authorization/roles-guard.service'; +import { UserRoles } from '../../../common/authorization/roles.decorator'; +import { NoticeOfIntentService } from '../../notice-of-intent/notice-of-intent.service'; +import { NoticeOfIntentDecisionOutcome } from '../notice-of-intent-decision-outcome.entity'; +import { NoticeOfIntentDecision } from '../notice-of-intent-decision.entity'; import { CreateNoticeOfIntentDecisionDto, NoticeOfIntentDecisionDto, - NoticeOfIntentDecisionOutcomeDto, + NoticeOfIntentDecisionOutcomeCodeDto, UpdateNoticeOfIntentDecisionDto, -} from './notice-of-intent-decision.dto'; -import { NoticeOfIntentDecisionService } from './notice-of-intent-decision.service'; -import { NoticeOfIntentModificationService } from './notice-of-intent-modification/notice-of-intent-modification.service'; +} from '../notice-of-intent-decision.dto'; +import { NoticeOfIntentDecisionV1Service } from './notice-of-intent-decision-v1.service'; +import { NoticeOfIntentModificationService } from '../notice-of-intent-modification/notice-of-intent-modification.service'; @ApiOAuth2(config.get('KEYCLOAK.SCOPES')) @Controller('notice-of-intent-decision') @UseGuards(RolesGuard) -export class NoticeOfIntentDecisionController { +export class NoticeOfIntentDecisionV1Controller { constructor( - private noticeOfIntentDecisionService: NoticeOfIntentDecisionService, + private noticeOfIntentDecisionService: NoticeOfIntentDecisionV1Service, private noticeOfIntentService: NoticeOfIntentService, private noticeOfIntentModificationService: NoticeOfIntentModificationService, @InjectMapper() private mapper: Mapper, @@ -72,7 +72,7 @@ export class NoticeOfIntentDecisionController { @Body() createDto: CreateNoticeOfIntentDecisionDto, ): Promise { const noticeOfIntent = await this.noticeOfIntentService.getByFileNumber( - createDto.applicationFileNumber, + createDto.fileNumber, ); const modifiedNotice = createDto.modifiesUuid @@ -182,7 +182,7 @@ export class NoticeOfIntentDecisionController { outcomes: await this.mapper.mapArrayAsync( codes.outcomes, NoticeOfIntentDecisionOutcome, - NoticeOfIntentDecisionOutcomeDto, + NoticeOfIntentDecisionOutcomeCodeDto, ), }; } diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.service.spec.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v1/notice-of-intent-decision-v1.service.spec.ts similarity index 92% rename from services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.service.spec.ts rename to services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v1/notice-of-intent-decision-v1.service.spec.ts index 3277f923f9..d76567da3f 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.service.spec.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v1/notice-of-intent-decision-v1.service.spec.ts @@ -8,20 +8,20 @@ import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { DocumentService } from '../../document/document.service'; -import { NoticeOfIntent } from '../notice-of-intent/notice-of-intent.entity'; -import { NoticeOfIntentService } from '../notice-of-intent/notice-of-intent.service'; -import { NoticeOfIntentDecisionDocument } from './notice-of-intent-decision-document/notice-of-intent-decision-document.entity'; -import { NoticeOfIntentDecisionOutcome } from './notice-of-intent-decision-outcome.entity'; +import { DocumentService } from '../../../document/document.service'; +import { NoticeOfIntent } from '../../notice-of-intent/notice-of-intent.entity'; +import { NoticeOfIntentService } from '../../notice-of-intent/notice-of-intent.service'; +import { NoticeOfIntentDecisionDocument } from '../notice-of-intent-decision-document/notice-of-intent-decision-document.entity'; +import { NoticeOfIntentDecisionOutcome } from '../notice-of-intent-decision-outcome.entity'; import { CreateNoticeOfIntentDecisionDto, UpdateNoticeOfIntentDecisionDto, -} from './notice-of-intent-decision.dto'; -import { NoticeOfIntentDecision } from './notice-of-intent-decision.entity'; -import { NoticeOfIntentDecisionService } from './notice-of-intent-decision.service'; +} from '../notice-of-intent-decision.dto'; +import { NoticeOfIntentDecision } from '../notice-of-intent-decision.entity'; +import { NoticeOfIntentDecisionV1Service } from './notice-of-intent-decision-v1.service'; describe('NoticeOfIntentDecisionService', () => { - let service: NoticeOfIntentDecisionService; + let service: NoticeOfIntentDecisionV1Service; let mockDecisionRepository: DeepMocked>; let mockDecisionDocumentRepository: DeepMocked< Repository @@ -51,7 +51,7 @@ describe('NoticeOfIntentDecisionService', () => { }), ], providers: [ - NoticeOfIntentDecisionService, + NoticeOfIntentDecisionV1Service, { provide: getRepositoryToken(NoticeOfIntentDecision), useValue: mockDecisionRepository, @@ -75,8 +75,8 @@ describe('NoticeOfIntentDecisionService', () => { ], }).compile(); - service = module.get( - NoticeOfIntentDecisionService, + service = module.get( + NoticeOfIntentDecisionV1Service, ); mockNOI = new NoticeOfIntent({ @@ -143,7 +143,7 @@ describe('NoticeOfIntentDecisionService', () => { const decisionDate = new Date(2022, 2, 2, 2, 2, 2, 2); const decisionToCreate = { date: decisionDate.getTime(), - applicationFileNumber: 'file-number', + fileNumber: 'file-number', outcomeCode: 'Outcome', } as CreateNoticeOfIntentDecisionDto; @@ -166,7 +166,7 @@ describe('NoticeOfIntentDecisionService', () => { resolutionNumber: 1, resolutionYear: 1, date: decisionDate.getTime(), - applicationFileNumber: 'file-number', + fileNumber: 'file-number', outcomeCode: 'Outcome', } as CreateNoticeOfIntentDecisionDto; @@ -188,7 +188,7 @@ describe('NoticeOfIntentDecisionService', () => { const decisionDate = new Date(2022, 2, 2, 2, 2, 2, 2); const decisionToCreate = { date: decisionDate.getTime(), - applicationFileNumber: 'file-number', + fileNumber: 'file-number', outcomeCode: 'Outcome', } as CreateNoticeOfIntentDecisionDto; diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.service.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v1/notice-of-intent-decision-v1.service.ts similarity index 90% rename from services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.service.ts rename to services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v1/notice-of-intent-decision-v1.service.ts index dfe58a1046..153a6d71ad 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.service.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v1/notice-of-intent-decision-v1.service.ts @@ -6,25 +6,27 @@ import { MultipartFile } from '@fastify/multipart'; import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { In, IsNull, Repository } from 'typeorm'; -import { DOCUMENT_SOURCE, DOCUMENT_SYSTEM } from '../../document/document.dto'; -import { DocumentService } from '../../document/document.service'; -import { User } from '../../user/user.entity'; -import { formatIncomingDate } from '../../utils/incoming-date.formatter'; -import { filterUndefined } from '../../utils/undefined'; -import { ApplicationModification } from '../application-decision/application-modification/application-modification.entity'; -import { NoticeOfIntent } from '../notice-of-intent/notice-of-intent.entity'; -import { NoticeOfIntentService } from '../notice-of-intent/notice-of-intent.service'; -import { NoticeOfIntentDecisionDocument } from './notice-of-intent-decision-document/notice-of-intent-decision-document.entity'; -import { NoticeOfIntentDecisionOutcome } from './notice-of-intent-decision-outcome.entity'; -import { NoticeOfIntentDecision } from './notice-of-intent-decision.entity'; +import { + DOCUMENT_SOURCE, + DOCUMENT_SYSTEM, +} from '../../../document/document.dto'; +import { DocumentService } from '../../../document/document.service'; +import { User } from '../../../user/user.entity'; +import { formatIncomingDate } from '../../../utils/incoming-date.formatter'; +import { filterUndefined } from '../../../utils/undefined'; +import { NoticeOfIntent } from '../../notice-of-intent/notice-of-intent.entity'; +import { NoticeOfIntentService } from '../../notice-of-intent/notice-of-intent.service'; +import { NoticeOfIntentDecisionDocument } from '../notice-of-intent-decision-document/notice-of-intent-decision-document.entity'; +import { NoticeOfIntentDecisionOutcome } from '../notice-of-intent-decision-outcome.entity'; +import { NoticeOfIntentDecision } from '../notice-of-intent-decision.entity'; import { CreateNoticeOfIntentDecisionDto, UpdateNoticeOfIntentDecisionDto, -} from './notice-of-intent-decision.dto'; -import { NoticeOfIntentModification } from './notice-of-intent-modification/notice-of-intent-modification.entity'; +} from '../notice-of-intent-decision.dto'; +import { NoticeOfIntentModification } from '../notice-of-intent-modification/notice-of-intent-modification.entity'; @Injectable() -export class NoticeOfIntentDecisionService { +export class NoticeOfIntentDecisionV1Service { constructor( @InjectRepository(NoticeOfIntentDecision) private appDecisionRepository: Repository, diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.controller.spec.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.controller.spec.ts new file mode 100644 index 0000000000..336e3a546c --- /dev/null +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.controller.spec.ts @@ -0,0 +1,250 @@ +import { classes } from '@automapper/classes'; +import { AutomapperModule } from '@automapper/nestjs'; +import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; +import { Test, TestingModule } from '@nestjs/testing'; +import { ClsService } from 'nestjs-cls'; +import { mockKeyCloakProviders } from '../../../../test/mocks/mockTypes'; +import { NoticeOfIntentDecisionProfile } from '../../../common/automapper/notice-of-intent-decision.automapper.profile'; +import { NoticeOfIntentProfile } from '../../../common/automapper/notice-of-intent.automapper.profile'; +import { UserProfile } from '../../../common/automapper/user.automapper.profile'; +import { EmailService } from '../../../providers/email/email.service'; +import { CodeService } from '../../code/code.service'; +import { NoticeOfIntent } from '../../notice-of-intent/notice-of-intent.entity'; +import { NoticeOfIntentService } from '../../notice-of-intent/notice-of-intent.service'; +import { NoticeOfIntentDecisionOutcome } from '../notice-of-intent-decision-outcome.entity'; +import { + CreateNoticeOfIntentDecisionDto, + UpdateNoticeOfIntentDecisionDto, +} from '../notice-of-intent-decision.dto'; +import { NoticeOfIntentDecision } from '../notice-of-intent-decision.entity'; +import { NoticeOfIntentModificationService } from '../notice-of-intent-modification/notice-of-intent-modification.service'; +import { NoticeOfIntentDecisionV2Controller } from './notice-of-intent-decision-v2.controller'; +import { NoticeOfIntentDecisionV2Service } from './notice-of-intent-decision-v2.service'; + +describe('NoticeOfIntentDecisionV2Controller', () => { + let controller: NoticeOfIntentDecisionV2Controller; + let mockDecisionService: DeepMocked; + let mockApplicationService: DeepMocked; + let mockCodeService: DeepMocked; + let mockModificationService: DeepMocked; + let mockEmailService: DeepMocked; + + let mockNoticeOfintent; + let mockDecision; + + beforeEach(async () => { + mockDecisionService = createMock(); + mockApplicationService = createMock(); + mockCodeService = createMock(); + mockModificationService = createMock(); + mockEmailService = createMock(); + + mockNoticeOfintent = new NoticeOfIntent(); + mockDecision = new NoticeOfIntentDecision({ + noticeOfIntent: mockNoticeOfintent, + }); + + const module: TestingModule = await Test.createTestingModule({ + imports: [ + AutomapperModule.forRoot({ + strategyInitializer: classes(), + }), + ], + controllers: [NoticeOfIntentDecisionV2Controller], + providers: [ + NoticeOfIntentProfile, + NoticeOfIntentDecisionProfile, + UserProfile, + { + provide: NoticeOfIntentDecisionV2Service, + useValue: mockDecisionService, + }, + { + provide: NoticeOfIntentService, + useValue: mockApplicationService, + }, + { + provide: CodeService, + useValue: mockCodeService, + }, + { + provide: NoticeOfIntentModificationService, + useValue: mockModificationService, + }, + { + provide: EmailService, + useValue: mockEmailService, + }, + { + provide: ClsService, + useValue: {}, + }, + ...mockKeyCloakProviders, + ], + }).compile(); + + controller = module.get( + NoticeOfIntentDecisionV2Controller, + ); + + mockDecisionService.fetchCodes.mockResolvedValue({ + outcomes: [ + { + code: 'decision-code', + label: 'decision-label', + } as NoticeOfIntentDecisionOutcome, + ], + decisionComponentTypes: [], + decisionConditionTypes: [], + }); + }); + + it('should be defined', () => { + expect(controller).toBeDefined(); + }); + + it('should get all for application', async () => { + mockDecisionService.getByAppFileNumber.mockResolvedValue([mockDecision]); + + const result = await controller.getByFileNumber('fake-number'); + + expect(mockDecisionService.getByAppFileNumber).toBeCalledTimes(1); + expect(result[0].uuid).toStrictEqual(mockDecision.uuid); + }); + + it('should get a specific decision', async () => { + mockDecisionService.get.mockResolvedValue(mockDecision); + const result = await controller.get('fake-uuid'); + + expect(mockDecisionService.get).toBeCalledTimes(1); + expect(result.uuid).toStrictEqual(mockDecision.uuid); + }); + + it('should call through for deletion', async () => { + mockDecisionService.delete.mockResolvedValue({} as any); + + await controller.delete('fake-uuid'); + + expect(mockDecisionService.delete).toBeCalledTimes(1); + expect(mockDecisionService.delete).toBeCalledWith('fake-uuid'); + }); + + it('should create the decision if application exists', async () => { + mockApplicationService.getByFileNumber.mockResolvedValue( + mockNoticeOfintent, + ); + mockDecisionService.create.mockResolvedValue(mockDecision); + + const decisionToCreate: CreateNoticeOfIntentDecisionDto = { + date: new Date(2022, 2, 2, 2, 2, 2, 2).valueOf(), + fileNumber: mockNoticeOfintent.fileNumber, + outcomeCode: 'outcome', + isDraft: true, + }; + + await controller.create(decisionToCreate); + + expect(mockDecisionService.create).toBeCalledTimes(1); + expect(mockDecisionService.create).toBeCalledWith( + { + fileNumber: mockNoticeOfintent.fileNumber, + outcomeCode: 'outcome', + date: decisionToCreate.date, + isDraft: true, + }, + mockNoticeOfintent, + undefined, + ); + }); + + it('should update the decision', async () => { + mockApplicationService.getFileNumber.mockResolvedValue('file-number'); + mockDecisionService.get.mockResolvedValue(new NoticeOfIntentDecision()); + mockDecisionService.getByAppFileNumber.mockResolvedValue([ + new NoticeOfIntentDecision(), + ]); + mockDecisionService.update.mockResolvedValue(mockDecision); + + const updates = { + outcome: 'New Outcome', + date: new Date(2022, 2, 2, 2, 2, 2, 2).valueOf(), + isDraft: true, + } as UpdateNoticeOfIntentDecisionDto; + + await controller.update('fake-uuid', updates); + + expect(mockDecisionService.update).toBeCalledTimes(1); + expect(mockDecisionService.update).toBeCalledWith( + 'fake-uuid', + { + outcome: 'New Outcome', + date: updates.date, + isDraft: true, + }, + undefined, + ); + }); + + it('should call through for attaching the document', async () => { + mockDecisionService.attachDocument.mockResolvedValue({} as any); + await controller.attachDocument('fake-uuid', { + isMultipart: () => true, + body: { + file: {}, + }, + user: { + entity: {}, + }, + }); + + expect(mockDecisionService.attachDocument).toBeCalledTimes(1); + }); + + it('should throw an exception if there is no file for file upload', async () => { + mockDecisionService.attachDocument.mockResolvedValue({} as any); + const promise = controller.attachDocument('fake-uuid', { + file: () => ({}), + isMultipart: () => false, + user: { + entity: {}, + }, + }); + + await expect(promise).rejects.toMatchObject( + new Error('Request is not multipart'), + ); + }); + + it('should call through for getting download url', async () => { + const fakeUrl = 'fake-url'; + mockDecisionService.getDownloadUrl.mockResolvedValue(fakeUrl); + const res = await controller.getDownloadUrl('fake-uuid', 'document-uuid'); + + expect(mockDecisionService.getDownloadUrl).toBeCalledTimes(1); + expect(res.url).toEqual(fakeUrl); + }); + + it('should call through for getting open url', async () => { + const fakeUrl = 'fake-url'; + mockDecisionService.getDownloadUrl.mockResolvedValue(fakeUrl); + const res = await controller.getOpenUrl('fake-uuid', 'document-uuid'); + + expect(mockDecisionService.getDownloadUrl).toBeCalledTimes(1); + expect(res.url).toEqual(fakeUrl); + }); + + it('should call through for document deletion', async () => { + mockDecisionService.deleteDocument.mockResolvedValue({} as any); + await controller.deleteDocument('fake-uuid', 'document-uuid'); + + expect(mockDecisionService.deleteDocument).toBeCalledTimes(1); + }); + + it('should call through for resolution number generation', async () => { + mockDecisionService.generateResolutionNumber.mockResolvedValue(1); + await controller.getNextAvailableResolutionNumber(2023); + + expect(mockDecisionService.generateResolutionNumber).toBeCalledTimes(1); + expect(mockDecisionService.generateResolutionNumber).toBeCalledWith(2023); + }); +}); diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.controller.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.controller.ts new file mode 100644 index 0000000000..5e402a190c --- /dev/null +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.controller.ts @@ -0,0 +1,227 @@ +import { Mapper } from '@automapper/core'; +import { InjectMapper } from '@automapper/nestjs'; +import { + BadRequestException, + Body, + Controller, + Delete, + Get, + Param, + Patch, + Post, + Req, + UseGuards, +} from '@nestjs/common'; +import { ApiOAuth2 } from '@nestjs/swagger'; +import * as config from 'config'; +import { ANY_AUTH_ROLE } from '../../../common/authorization/roles'; +import { RolesGuard } from '../../../common/authorization/roles-guard.service'; +import { UserRoles } from '../../../common/authorization/roles.decorator'; +import { EmailService } from '../../../providers/email/email.service'; +import { NoticeOfIntentService } from '../../notice-of-intent/notice-of-intent.service'; +import { NoticeOfIntentDecisionComponentType } from '../notice-of-intent-decision-component/notice-of-intent-decision-component-type.entity'; +import { NoticeOfIntentDecisionComponentTypeDto } from '../notice-of-intent-decision-component/notice-of-intent-decision-component.dto'; +import { NoticeOfIntentDecisionConditionType } from '../notice-of-intent-decision-condition/notice-of-intent-decision-condition-code.entity'; +import { NoticeOfIntentDecisionConditionTypeDto } from '../notice-of-intent-decision-condition/notice-of-intent-decision-condition.dto'; +import { NoticeOfIntentDecisionOutcome } from '../notice-of-intent-decision-outcome.entity'; +import { + CreateNoticeOfIntentDecisionDto, + NoticeOfIntentDecisionDto, + NoticeOfIntentDecisionOutcomeCodeDto, + UpdateNoticeOfIntentDecisionDto, +} from '../notice-of-intent-decision.dto'; +import { NoticeOfIntentDecision } from '../notice-of-intent-decision.entity'; +import { NoticeOfIntentModificationService } from '../notice-of-intent-modification/notice-of-intent-modification.service'; +import { NoticeOfIntentDecisionV2Service } from './notice-of-intent-decision-v2.service'; + +@ApiOAuth2(config.get('KEYCLOAK.SCOPES')) +@Controller('notice-of-intent-decision/v2') +@UseGuards(RolesGuard) +export class NoticeOfIntentDecisionV2Controller { + constructor( + private noticeOfIntentDecisionV2Service: NoticeOfIntentDecisionV2Service, + private noticeOfIntentService: NoticeOfIntentService, + private emailService: EmailService, + private modificationService: NoticeOfIntentModificationService, + @InjectMapper() private mapper: Mapper, + ) {} + + @Get('/notice-of-intent/:fileNumber') + @UserRoles(...ANY_AUTH_ROLE) + async getByFileNumber( + @Param('fileNumber') fileNumber, + ): Promise { + const decisions = + await this.noticeOfIntentDecisionV2Service.getByAppFileNumber(fileNumber); + + return await this.mapper.mapArrayAsync( + decisions, + NoticeOfIntentDecision, + NoticeOfIntentDecisionDto, + ); + } + + @Get('/codes') + @UserRoles(...ANY_AUTH_ROLE) + async getCodes() { + const codes = await this.noticeOfIntentDecisionV2Service.fetchCodes(); + return { + outcomes: await this.mapper.mapArrayAsync( + codes.outcomes, + NoticeOfIntentDecisionOutcome, + NoticeOfIntentDecisionOutcomeCodeDto, + ), + decisionComponentTypes: await this.mapper.mapArrayAsync( + codes.decisionComponentTypes, + NoticeOfIntentDecisionComponentType, + NoticeOfIntentDecisionComponentTypeDto, + ), + decisionConditionTypes: await this.mapper.mapArrayAsync( + codes.decisionConditionTypes, + NoticeOfIntentDecisionConditionType, + NoticeOfIntentDecisionConditionTypeDto, + ), + }; + } + + @Get('/:uuid') + @UserRoles(...ANY_AUTH_ROLE) + async get(@Param('uuid') uuid: string): Promise { + const decision = await this.noticeOfIntentDecisionV2Service.get(uuid); + + return this.mapper.mapAsync( + decision, + NoticeOfIntentDecision, + NoticeOfIntentDecisionDto, + ); + } + + @Post() + @UserRoles(...ANY_AUTH_ROLE) + async create( + @Body() createDto: CreateNoticeOfIntentDecisionDto, + ): Promise { + const noticeOfIntent = await this.noticeOfIntentService.getByFileNumber( + createDto.fileNumber, + ); + + const modification = createDto.modifiesUuid + ? await this.modificationService.getByUuid(createDto.modifiesUuid) + : undefined; + + const newDecision = await this.noticeOfIntentDecisionV2Service.create( + createDto, + noticeOfIntent, + modification, + ); + + return this.mapper.mapAsync( + newDecision, + NoticeOfIntentDecision, + NoticeOfIntentDecisionDto, + ); + } + + @Patch('/:uuid') + @UserRoles(...ANY_AUTH_ROLE) + async update( + @Param('uuid') uuid: string, + @Body() updateDto: UpdateNoticeOfIntentDecisionDto, + ): Promise { + let modifies; + if (updateDto.modifiesUuid) { + modifies = await this.modificationService.getByUuid( + updateDto.modifiesUuid, + ); + } else if (updateDto.modifiesUuid === null) { + modifies = null; + } + + const decision = await this.noticeOfIntentDecisionV2Service.get(uuid); + + const updatedDecision = await this.noticeOfIntentDecisionV2Service.update( + uuid, + updateDto, + modifies, + ); + + return this.mapper.mapAsync( + updatedDecision, + NoticeOfIntentDecision, + NoticeOfIntentDecisionDto, + ); + } + + @Delete('/:uuid') + @UserRoles(...ANY_AUTH_ROLE) + async delete(@Param('uuid') uuid: string) { + return await this.noticeOfIntentDecisionV2Service.delete(uuid); + } + + @Post('/:uuid/file') + @UserRoles(...ANY_AUTH_ROLE) + async attachDocument(@Param('uuid') decisionUuid: string, @Req() req) { + if (!req.isMultipart()) { + throw new BadRequestException('Request is not multipart'); + } + + const file = req.body.file; + await this.noticeOfIntentDecisionV2Service.attachDocument( + decisionUuid, + file, + req.user.entity, + ); + return { + uploaded: true, + }; + } + + @Get('/:uuid/file/:fileUuid/download') + @UserRoles(...ANY_AUTH_ROLE) + async getDownloadUrl( + @Param('uuid') decisionUuid: string, + @Param('fileUuid') documentUuid: string, + ) { + const downloadUrl = + await this.noticeOfIntentDecisionV2Service.getDownloadUrl(documentUuid); + return { + url: downloadUrl, + }; + } + + @Get('/:uuid/file/:fileUuid/open') + @UserRoles(...ANY_AUTH_ROLE) + async getOpenUrl( + @Param('uuid') decisionUuid: string, + @Param('fileUuid') documentUuid: string, + ) { + const downloadUrl = + await this.noticeOfIntentDecisionV2Service.getDownloadUrl( + documentUuid, + true, + ); + return { + url: downloadUrl, + }; + } + + @Delete('/:uuid/file/:fileUuid') + @UserRoles(...ANY_AUTH_ROLE) + async deleteDocument( + @Param('uuid') decisionUuid: string, + @Param('fileUuid') documentUuid: string, + ) { + await this.noticeOfIntentDecisionV2Service.deleteDocument(documentUuid); + return {}; + } + + @Get('next-resolution-number/:resolutionYear') + @UserRoles(...ANY_AUTH_ROLE) + async getNextAvailableResolutionNumber( + @Param('resolutionYear') resolutionYear: number, + ) { + return this.noticeOfIntentDecisionV2Service.generateResolutionNumber( + resolutionYear, + ); + } +} diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.service.spec.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.service.spec.ts new file mode 100644 index 0000000000..2e1109b7f5 --- /dev/null +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.service.spec.ts @@ -0,0 +1,510 @@ +import { + ServiceNotFoundException, + ServiceValidationException, +} from '@app/common/exceptions/base.exception'; +import { classes } from '@automapper/classes'; +import { AutomapperModule } from '@automapper/nestjs'; +import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; +import { Test, TestingModule } from '@nestjs/testing'; +import { getRepositoryToken } from '@nestjs/typeorm'; +import { Repository } from 'typeorm'; +import { DocumentService } from '../../../document/document.service'; +import { NOI_SUBMISSION_STATUS } from '../../notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status.dto'; +import { NoticeOfIntentSubmissionStatusService } from '../../notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service'; +import { NoticeOfIntent } from '../../notice-of-intent/notice-of-intent.entity'; +import { NoticeOfIntentService } from '../../notice-of-intent/notice-of-intent.service'; +import { NoticeOfIntentDecisionComponentType } from '../notice-of-intent-decision-component/notice-of-intent-decision-component-type.entity'; +import { NoticeOfIntentDecisionComponentDto } from '../notice-of-intent-decision-component/notice-of-intent-decision-component.dto'; +import { NoticeOfIntentDecisionComponentService } from '../notice-of-intent-decision-component/notice-of-intent-decision-component.service'; +import { NoticeOfIntentDecisionConditionType } from '../notice-of-intent-decision-condition/notice-of-intent-decision-condition-code.entity'; +import { NoticeOfIntentDecisionConditionService } from '../notice-of-intent-decision-condition/notice-of-intent-decision-condition.service'; +import { NoticeOfIntentDecisionDocument } from '../notice-of-intent-decision-document/notice-of-intent-decision-document.entity'; +import { NoticeOfIntentDecisionOutcome } from '../notice-of-intent-decision-outcome.entity'; +import { + CreateNoticeOfIntentDecisionDto, + UpdateNoticeOfIntentDecisionDto, +} from '../notice-of-intent-decision.dto'; +import { NoticeOfIntentDecision } from '../notice-of-intent-decision.entity'; +import { NoticeOfIntentDecisionV2Service } from './notice-of-intent-decision-v2.service'; + +describe('NoticeOfIntentDecisionV2Service', () => { + let service: NoticeOfIntentDecisionV2Service; + let mockDecisionRepository: DeepMocked>; + let mockDecisionDocumentRepository: DeepMocked< + Repository + >; + let mockDecisionOutcomeRepository: DeepMocked< + Repository + >; + let mockNoticeOfIntentService: DeepMocked; + let mockDocumentService: DeepMocked; + let mockNoticeOfIntentDecisionComponentTypeRepository: DeepMocked< + Repository + >; + let mockDecisionComponentService: DeepMocked; + let mockDecisionConditionService: DeepMocked; + let mockNoticeOfIntentSubmissionStatusService: DeepMocked; + + let mockNoticeOfIntent; + let mockDecision; + + beforeEach(async () => { + mockNoticeOfIntentService = createMock(); + mockDocumentService = createMock(); + mockDecisionRepository = createMock>(); + mockDecisionDocumentRepository = + createMock>(); + mockDecisionOutcomeRepository = + createMock>(); + mockNoticeOfIntentDecisionComponentTypeRepository = createMock(); + mockDecisionComponentService = createMock(); + mockDecisionConditionService = createMock(); + mockNoticeOfIntentSubmissionStatusService = createMock(); + + const module: TestingModule = await Test.createTestingModule({ + imports: [ + AutomapperModule.forRoot({ + strategyInitializer: classes(), + }), + ], + providers: [ + NoticeOfIntentDecisionV2Service, + { + provide: getRepositoryToken(NoticeOfIntentDecision), + useValue: mockDecisionRepository, + }, + { + provide: getRepositoryToken(NoticeOfIntentDecisionDocument), + useValue: mockDecisionDocumentRepository, + }, + { + provide: getRepositoryToken(NoticeOfIntentDecisionOutcome), + useValue: mockDecisionOutcomeRepository, + }, + { + provide: NoticeOfIntentService, + useValue: mockNoticeOfIntentService, + }, + { + provide: DocumentService, + useValue: mockDocumentService, + }, + { + provide: getRepositoryToken(NoticeOfIntentDecisionComponentType), + useValue: mockNoticeOfIntentDecisionComponentTypeRepository, + }, + { + provide: NoticeOfIntentDecisionComponentService, + useValue: mockDecisionComponentService, + }, + { + provide: NoticeOfIntentDecisionConditionService, + useValue: mockDecisionConditionService, + }, + { + provide: getRepositoryToken(NoticeOfIntentDecisionConditionType), + useValue: mockNoticeOfIntentDecisionComponentTypeRepository, + }, + { + provide: NoticeOfIntentSubmissionStatusService, + useValue: mockNoticeOfIntentSubmissionStatusService, + }, + ], + }).compile(); + + service = module.get( + NoticeOfIntentDecisionV2Service, + ); + + mockNoticeOfIntent = new NoticeOfIntent({ + uuid: '1111-1111-1111-1111', + }); + mockDecision = new NoticeOfIntentDecision({ + noticeOfIntent: mockNoticeOfIntent, + documents: [], + }); + + mockDecisionRepository.find.mockResolvedValue([mockDecision]); + mockDecisionRepository.findOne.mockResolvedValue(mockDecision); + mockDecisionRepository.save.mockResolvedValue(mockDecision); + + mockDecisionDocumentRepository.find.mockResolvedValue([]); + + mockNoticeOfIntentService.getByFileNumber.mockResolvedValue( + mockNoticeOfIntent, + ); + mockNoticeOfIntentService.update.mockResolvedValue({} as any); + mockNoticeOfIntentService.updateByUuid.mockResolvedValue({} as any); + + mockDecisionOutcomeRepository.find.mockResolvedValue([]); + mockDecisionOutcomeRepository.findOneOrFail.mockResolvedValue({} as any); + + mockNoticeOfIntentDecisionComponentTypeRepository.find.mockResolvedValue( + [], + ); + mockDecisionComponentService.createOrUpdate.mockResolvedValue([]); + mockDecisionConditionService.remove.mockResolvedValue({} as any); + mockNoticeOfIntentSubmissionStatusService.setStatusDateByFileNumber.mockResolvedValue( + {} as any, + ); + }); + + describe('NoticeOfIntentDecisionService Core Tests', () => { + it('should be defined', () => { + expect(service).toBeDefined(); + }); + + it('should get decisions by notice of intent', async () => { + const result = await service.getByAppFileNumber( + mockNoticeOfIntent.fileNumber, + ); + + expect(result).toStrictEqual([mockDecision]); + }); + + it('should return decisions by uuid', async () => { + const result = await service.get(mockDecision.uuid); + + expect(result).toStrictEqual(mockDecision); + }); + + it('should delete decision with uuid and update notice of intent and submission status', async () => { + mockDecisionRepository.softRemove.mockResolvedValue({} as any); + mockDecisionRepository.findOne.mockResolvedValue({ + ...mockDecision, + reconsiders: 'reconsider-uuid', + modifies: 'modified-uuid', + }); + mockDecisionRepository.find.mockResolvedValue([]); + mockDecisionComponentService.softRemove.mockResolvedValue(); + + await service.delete(mockDecision.uuid); + + expect(mockDecisionRepository.save.mock.calls[0][0].modifies).toBeNull(); + expect(mockDecisionRepository.softRemove).toBeCalledTimes(1); + expect(mockNoticeOfIntentService.updateByUuid).toHaveBeenCalledTimes(1); + expect(mockNoticeOfIntentService.updateByUuid).toHaveBeenCalledWith( + mockNoticeOfIntent.uuid, + { + decisionDate: null, + }, + ); + expect( + mockNoticeOfIntentSubmissionStatusService.setStatusDateByFileNumber, + ).toBeCalledTimes(1); + expect( + mockNoticeOfIntentSubmissionStatusService.setStatusDateByFileNumber, + ).toBeCalledWith( + mockNoticeOfIntent.fileNumber, + NOI_SUBMISSION_STATUS.ALC_DECISION, + null, + ); + }); + + it('should create a decision', async () => { + mockDecisionRepository.find.mockResolvedValue([]); + mockDecisionRepository.findOne.mockResolvedValue({ + documents: [] as NoticeOfIntentDecisionDocument[], + } as NoticeOfIntentDecision); + mockDecisionRepository.exist.mockResolvedValue(false); + + const decisionDate = new Date(2022, 2, 2, 2, 2, 2, 2); + const decisionToCreate = { + date: decisionDate.getTime(), + fileNumber: 'file-number', + outcomeCode: 'Outcome', + isDraft: true, + } as CreateNoticeOfIntentDecisionDto; + + await service.create(decisionToCreate, mockNoticeOfIntent, undefined); + + expect(mockDecisionRepository.save).toBeCalledTimes(1); + expect(mockNoticeOfIntentService.update).toHaveBeenCalledTimes(0); + }); + + it('should fail create a decision if the resolution number is already in use', async () => { + mockDecisionRepository.findOne.mockResolvedValue( + {} as NoticeOfIntentDecision, + ); + mockDecisionRepository.exist.mockResolvedValueOnce(false); + + const decisionDate = new Date(2022, 2, 2, 2, 2, 2, 2); + const decisionToCreate = { + resolutionNumber: 1, + resolutionYear: 1, + date: decisionDate.getTime(), + fileNumber: 'file-number', + outcomeCode: 'Outcome', + isDraft: true, + } as CreateNoticeOfIntentDecisionDto; + + await expect( + service.create(decisionToCreate, mockNoticeOfIntent, undefined), + ).rejects.toMatchObject( + new ServiceValidationException( + `Resolution number #${decisionToCreate.resolutionNumber}/${decisionToCreate.resolutionYear} is already in use`, + ), + ); + + expect(mockDecisionRepository.save).toBeCalledTimes(0); + expect(mockNoticeOfIntentService.update).toHaveBeenCalledTimes(0); + }); + + it('should fail create a draft decision if draft already exists', async () => { + mockDecisionRepository.findOne.mockResolvedValue({ + documents: [] as NoticeOfIntentDecisionDocument[], + } as NoticeOfIntentDecision); + mockDecisionRepository.exist.mockResolvedValueOnce(true); + + const decisionDate = new Date(2022, 2, 2, 2, 2, 2, 2); + const decisionToCreate = { + resolutionNumber: 1, + resolutionYear: 1, + date: decisionDate.getTime(), + fileNumber: 'file-number', + outcomeCode: 'Outcome', + isDraft: true, + } as CreateNoticeOfIntentDecisionDto; + + await expect( + service.create(decisionToCreate, mockNoticeOfIntent, undefined), + ).rejects.toMatchObject( + new ServiceValidationException( + 'Draft decision already exists for this notice of intent.', + ), + ); + + expect(mockDecisionRepository.save).toBeCalledTimes(0); + expect(mockNoticeOfIntentService.update).toHaveBeenCalledTimes(0); + }); + + it('should create a decision and NOT update the notice of intent if this was the second decision', async () => { + mockDecisionRepository.findOne.mockResolvedValue({ + documents: [] as NoticeOfIntentDecisionDocument[], + } as NoticeOfIntentDecision); + mockDecisionRepository.exist.mockResolvedValueOnce(false); + + const decisionDate = new Date(2022, 2, 2, 2, 2, 2, 2); + const decisionToCreate = { + date: decisionDate.getTime(), + fileNumber: 'file-number', + outcomeCode: 'Outcome', + } as CreateNoticeOfIntentDecisionDto; + + await service.create(decisionToCreate, mockNoticeOfIntent, undefined); + + expect(mockDecisionRepository.save).toBeCalledTimes(1); + expect(mockNoticeOfIntentService.update).not.toHaveBeenCalled(); + expect( + mockNoticeOfIntentSubmissionStatusService.setStatusDateByFileNumber, + ).not.toHaveBeenCalled(); + }); + + it('should update the decision and update the notice of intent and submission status if it was the only decision', async () => { + const decisionDate = new Date(2022, 3, 3, 3, 3, 3, 3); + const decisionUpdate: UpdateNoticeOfIntentDecisionDto = { + date: decisionDate.getTime(), + outcomeCode: 'New Outcome', + isDraft: false, + decisionComponents: [ + { + uuid: 'fake', + alrArea: 1, + agCap: '1', + agCapSource: '1', + noticeOfIntentDecisionComponentTypeCode: 'fake', + }, + ] as NoticeOfIntentDecisionComponentDto[], + }; + + const createdDecision = new NoticeOfIntentDecision({ + date: decisionDate, + documents: [], + }); + + mockDecisionRepository.find.mockResolvedValue([createdDecision]); + + await service.update(mockDecision.uuid, decisionUpdate, undefined); + + expect(mockDecisionRepository.findOne).toBeCalledTimes(2); + expect(mockDecisionRepository.save).toHaveBeenCalledTimes(1); + expect(mockNoticeOfIntentService.updateByUuid).toHaveBeenCalledTimes(1); + expect(mockNoticeOfIntentService.updateByUuid).toHaveBeenCalledWith( + mockNoticeOfIntent.uuid, + { + decisionDate, + }, + ); + expect( + mockNoticeOfIntentSubmissionStatusService.setStatusDateByFileNumber, + ).toBeCalledTimes(1); + expect( + mockNoticeOfIntentSubmissionStatusService.setStatusDateByFileNumber, + ).toBeCalledWith( + mockNoticeOfIntent.fileNumber, + NOI_SUBMISSION_STATUS.ALC_DECISION, + decisionDate, + ); + }); + + it('should update decision and update the notice of intent date to null if it is draft decision', async () => { + const decisionDate = new Date(2022, 3, 3, 3, 3, 3, 3); + const decisionUpdate: UpdateNoticeOfIntentDecisionDto = { + date: decisionDate.getTime(), + outcomeCode: 'New Outcome', + isDraft: true, + }; + + await service.update(mockDecision.uuid, decisionUpdate, undefined); + + expect(mockDecisionRepository.findOne).toBeCalledTimes(2); + expect(mockDecisionRepository.save).toBeCalledTimes(1); + expect(mockNoticeOfIntentService.updateByUuid).toHaveBeenCalledTimes(1); + expect(mockNoticeOfIntentService.updateByUuid).toBeCalledWith( + '1111-1111-1111-1111', + { + decisionDate: null, + }, + ); + expect( + mockNoticeOfIntentSubmissionStatusService.setStatusDateByFileNumber, + ).toBeCalledTimes(1); + expect( + mockNoticeOfIntentSubmissionStatusService.setStatusDateByFileNumber, + ).toBeCalledWith( + mockNoticeOfIntent.fileNumber, + NOI_SUBMISSION_STATUS.ALC_DECISION, + null, + ); + }); + + it('should not update the notice of intent dates when updating a draft decision', async () => { + const secondDecision = new NoticeOfIntentDecision({ + noticeOfIntent: mockNoticeOfIntent, + documents: [], + }); + secondDecision.isDraft = true; + secondDecision.uuid = 'second-uuid'; + mockDecisionRepository.find.mockResolvedValue([ + secondDecision, + mockDecision, + ]); + mockDecisionRepository.findOne.mockResolvedValue(secondDecision); + + const decisionUpdate: UpdateNoticeOfIntentDecisionDto = { + outcomeCode: 'New Outcome', + isDraft: true, + }; + + await service.update(mockDecision.uuid, decisionUpdate, undefined); + + expect(mockDecisionRepository.findOne).toBeCalledTimes(2); + expect(mockDecisionRepository.save).toBeCalledTimes(1); + expect(mockNoticeOfIntentService.update).not.toHaveBeenCalled(); + expect( + mockNoticeOfIntentSubmissionStatusService.setStatusDateByFileNumber, + ).not.toHaveBeenCalled(); + }); + + it('should fail on update if the decision is not found', async () => { + const nonExistantUuid = 'bad-uuid'; + mockDecisionRepository.findOne.mockResolvedValue(null); + const decisionUpdate: UpdateNoticeOfIntentDecisionDto = { + date: new Date(2022, 2, 2, 2, 2, 2, 2).getTime(), + outcomeCode: 'New Outcome', + isDraft: true, + }; + const promise = service.update( + nonExistantUuid, + decisionUpdate, + undefined, + ); + + await expect(promise).rejects.toMatchObject( + new ServiceNotFoundException( + `Decision with UUID ${nonExistantUuid} not found`, + ), + ); + expect(mockDecisionRepository.save).toBeCalledTimes(0); + }); + + it('should call through for get code', async () => { + await service.fetchCodes(); + expect(mockDecisionOutcomeRepository.find).toHaveBeenCalledTimes(1); + }); + + it('should call through for get for applicant', async () => { + await service.getForPortal(''); + expect(mockDecisionRepository.find).toHaveBeenCalledTimes(1); + }); + }); + + describe('NoticeOfIntentDecisionService File Tests', () => { + let mockDocument; + beforeEach(() => { + mockDecisionDocumentRepository.findOne.mockResolvedValue(mockDocument); + mockDecisionDocumentRepository.save.mockResolvedValue(mockDocument); + + mockDocument = { + uuid: 'fake-uuid', + decisionUuid: 'decision-uuid', + } as NoticeOfIntentDecisionDocument; + }); + + it('should call the repository for attaching a file', async () => { + mockDocumentService.create.mockResolvedValue({} as any); + + await service.attachDocument('uuid', {} as any, {} as any); + expect(mockDecisionDocumentRepository.save).toHaveBeenCalledTimes(1); + expect(mockDocumentService.create).toHaveBeenCalledTimes(1); + }); + + it('should throw an exception when attaching a document to a non-existent decision', async () => { + mockDecisionRepository.findOne.mockResolvedValue(null); + await expect( + service.attachDocument('uuid', {} as any, {} as any), + ).rejects.toMatchObject( + new ServiceNotFoundException(`Decision with UUID uuid not found`), + ); + expect(mockDocumentService.create).not.toHaveBeenCalled(); + }); + + it('should call the repository to delete documents', async () => { + mockDecisionDocumentRepository.softRemove.mockResolvedValue({} as any); + + await service.deleteDocument('fake-uuid'); + expect(mockDecisionDocumentRepository.softRemove).toHaveBeenCalledTimes( + 1, + ); + }); + + it('should throw an exception when document not found for deletion', async () => { + mockDecisionDocumentRepository.findOne.mockResolvedValue(null); + await expect(service.deleteDocument('fake-uuid')).rejects.toMatchObject( + new ServiceNotFoundException( + `Failed to find document with uuid fake-uuid`, + ), + ); + expect(mockDocumentService.softRemove).not.toHaveBeenCalled(); + }); + + it('should call through to document service for download', async () => { + const downloadUrl = 'download-url'; + mockDocumentService.getDownloadUrl.mockResolvedValue(downloadUrl); + + const res = await service.getDownloadUrl('fake-uuid'); + + expect(mockDocumentService.getDownloadUrl).toHaveBeenCalledTimes(1); + expect(res).toEqual(downloadUrl); + }); + + it('should throw an exception when document not found for download', async () => { + mockDecisionDocumentRepository.findOne.mockResolvedValue(null); + await expect(service.getDownloadUrl('fake-uuid')).rejects.toMatchObject( + new ServiceNotFoundException( + `Failed to find document with uuid fake-uuid`, + ), + ); + }); + }); +}); diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.service.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.service.ts new file mode 100644 index 0000000000..e8e979b964 --- /dev/null +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.service.ts @@ -0,0 +1,616 @@ +import { + ServiceNotFoundException, + ServiceValidationException, +} from '@app/common/exceptions/base.exception'; +import { MultipartFile } from '@fastify/multipart'; +import { Injectable } from '@nestjs/common'; +import { InjectRepository } from '@nestjs/typeorm'; +import { In, IsNull, Repository } from 'typeorm'; +import { + DOCUMENT_SOURCE, + DOCUMENT_SYSTEM, +} from '../../../document/document.dto'; +import { DocumentService } from '../../../document/document.service'; +import { User } from '../../../user/user.entity'; +import { formatIncomingDate } from '../../../utils/incoming-date.formatter'; +import { NOI_SUBMISSION_STATUS } from '../../notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status.dto'; +import { NoticeOfIntentSubmissionStatusService } from '../../notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service'; +import { NoticeOfIntent } from '../../notice-of-intent/notice-of-intent.entity'; +import { NoticeOfIntentService } from '../../notice-of-intent/notice-of-intent.service'; +import { NoticeOfIntentDecisionComponentType } from '../notice-of-intent-decision-component/notice-of-intent-decision-component-type.entity'; +import { NoticeOfIntentDecisionComponent } from '../notice-of-intent-decision-component/notice-of-intent-decision-component.entity'; +import { NoticeOfIntentDecisionComponentService } from '../notice-of-intent-decision-component/notice-of-intent-decision-component.service'; +import { NoticeOfIntentDecisionConditionType } from '../notice-of-intent-decision-condition/notice-of-intent-decision-condition-code.entity'; +import { NoticeOfIntentDecisionConditionService } from '../notice-of-intent-decision-condition/notice-of-intent-decision-condition.service'; +import { NoticeOfIntentDecisionDocument } from '../notice-of-intent-decision-document/notice-of-intent-decision-document.entity'; +import { NoticeOfIntentDecisionOutcome } from '../notice-of-intent-decision-outcome.entity'; +import { + CreateNoticeOfIntentDecisionDto, + UpdateNoticeOfIntentDecisionDto, +} from '../notice-of-intent-decision.dto'; +import { NoticeOfIntentDecision } from '../notice-of-intent-decision.entity'; +import { NoticeOfIntentModification } from '../notice-of-intent-modification/notice-of-intent-modification.entity'; + +@Injectable() +export class NoticeOfIntentDecisionV2Service { + constructor( + @InjectRepository(NoticeOfIntentDecision) + private noticeOfIntentDecisionRepository: Repository, + @InjectRepository(NoticeOfIntentDecisionDocument) + private decisionDocumentRepository: Repository, + @InjectRepository(NoticeOfIntentDecisionOutcome) + private decisionOutcomeRepository: Repository, + @InjectRepository(NoticeOfIntentDecisionComponentType) + private decisionComponentTypeRepository: Repository, + @InjectRepository(NoticeOfIntentDecisionConditionType) + private decisionConditionTypeRepository: Repository, + private noticeOfIntentService: NoticeOfIntentService, + private documentService: DocumentService, + private decisionComponentService: NoticeOfIntentDecisionComponentService, + private decisionConditionService: NoticeOfIntentDecisionConditionService, + private noticeOfIntentSubmissionStatusService: NoticeOfIntentSubmissionStatusService, + ) {} + + async getForPortal(fileNumber: string) { + const noticeOfIntent = await this.noticeOfIntentService.getByFileNumber( + fileNumber, + ); + + return await this.noticeOfIntentDecisionRepository.find({ + where: { + noticeOfIntentUuid: noticeOfIntent.uuid, + isDraft: false, + }, + relations: { + outcome: true, + documents: { + document: true, + }, + modifies: { + modifiesDecisions: true, + }, + }, + order: { + auditCreatedAt: 'DESC', + }, + }); + } + + async getByAppFileNumber(number: string) { + const noticeOfIntent = await this.noticeOfIntentService.getByFileNumber( + number, + ); + + const decisions = await this.noticeOfIntentDecisionRepository.find({ + where: { + noticeOfIntentUuid: noticeOfIntent.uuid, + }, + order: { + createdAt: 'DESC', + }, + relations: { + outcome: true, + modifies: { + modifiesDecisions: true, + }, + components: { + noticeOfIntentDecisionComponentType: true, + }, + conditions: { + type: true, + }, + }, + }); + + // do not place modifiedBy into query above, it will kill performance + const decisionsWithModifiedBy = + await this.noticeOfIntentDecisionRepository.find({ + where: { + noticeOfIntentUuid: noticeOfIntent.uuid, + modifiedBy: { + resultingDecision: { + isDraft: false, + }, + }, + }, + relations: { + modifiedBy: { + resultingDecision: true, + reviewOutcome: true, + }, + }, + }); + + for (const decision of decisions) { + decision.modifiedBy = + decisionsWithModifiedBy.find((r) => r.uuid === decision.uuid) + ?.modifiedBy || []; + } + + //Query Documents separately as when added to the above joins caused performance issues + for (const decision of decisions) { + decision.documents = await this.decisionDocumentRepository.find({ + where: { + decisionUuid: decision.uuid, + document: { + auditDeletedDateAt: IsNull(), + }, + }, + relations: { + document: true, + }, + }); + } + return decisions; + } + + async get(uuid) { + const decision = await this.noticeOfIntentDecisionRepository.findOne({ + where: { + uuid, + }, + relations: { + outcome: true, + documents: { + document: true, + }, + modifies: { + modifiesDecisions: true, + }, + components: { + noticeOfIntentDecisionComponentType: true, + }, + conditions: { + type: true, + components: true, + }, + }, + }); + + if (!decision) { + throw new ServiceNotFoundException( + `Failed to load decision with uuid ${uuid}`, + ); + } + + decision.documents = decision.documents.filter( + (document) => !!document.document, + ); + + return decision; + } + + async update( + uuid: string, + updateDto: UpdateNoticeOfIntentDecisionDto, + modifies: NoticeOfIntentModification | undefined | null, + ) { + const existingDecision: Partial = + await this.getOrFail(uuid); + + // resolution number is int64 in postgres, which means it is a string in JS + if ( + updateDto.resolutionNumber && + updateDto.resolutionYear && + (existingDecision.resolutionNumber !== updateDto.resolutionNumber || + existingDecision.resolutionYear !== updateDto.resolutionYear) + ) { + await this.validateResolutionNumber( + updateDto.resolutionNumber, + updateDto.resolutionYear, + ); + } + + const isChangingDraftStatus = + existingDecision.isDraft !== updateDto.isDraft; + + existingDecision.auditDate = formatIncomingDate(updateDto.auditDate); + existingDecision.modifies = modifies; + existingDecision.resolutionNumber = updateDto.resolutionNumber; + existingDecision.resolutionYear = updateDto.resolutionYear; + existingDecision.isSubjectToConditions = updateDto.isSubjectToConditions; + existingDecision.decisionDescription = updateDto.decisionDescription; + existingDecision.isStatsRequired = updateDto.isStatsRequired; + existingDecision.isDraft = updateDto.isDraft; + existingDecision.rescindedDate = formatIncomingDate( + updateDto.rescindedDate, + ); + existingDecision.rescindedComment = updateDto.rescindedComment; + existingDecision.wasReleased = + existingDecision.wasReleased || !updateDto.isDraft; + + if (updateDto.outcomeCode) { + existingDecision.outcome = await this.getOutcomeByCode( + updateDto.outcomeCode, + ); + } + + let dateHasChanged = false; + if ( + updateDto.date !== undefined && + existingDecision.date !== formatIncomingDate(updateDto.date) + ) { + dateHasChanged = true; + existingDecision.date = formatIncomingDate(updateDto.date); + } + + await this.updateComponents(updateDto, existingDecision); + + //Must be called after update components + await this.updateConditions(updateDto, existingDecision); + + const updatedDecision = await this.noticeOfIntentDecisionRepository.save( + existingDecision, + ); + + if (dateHasChanged || isChangingDraftStatus) { + await this.updateDecisionDates(updatedDecision); + } + + return this.get(existingDecision.uuid); + } + + async create( + createDto: CreateNoticeOfIntentDecisionDto, + noticeOfIntent: NoticeOfIntent, + modifies: NoticeOfIntentModification | undefined | null, + ) { + const isDraftExists = await this.noticeOfIntentDecisionRepository.exist({ + where: { + noticeOfIntent: { fileNumber: createDto.fileNumber }, + isDraft: true, + }, + }); + + if (isDraftExists) { + throw new ServiceValidationException( + 'Draft decision already exists for this notice of intent.', + ); + } + + let decisionComponents: NoticeOfIntentDecisionComponent[] = []; + if (createDto.decisionComponents) { + this.decisionComponentService.validate( + createDto.decisionComponents, + createDto.isDraft, + ); + decisionComponents = await this.decisionComponentService.createOrUpdate( + createDto.decisionComponents, + false, + ); + } + + const decision = new NoticeOfIntentDecision({ + outcome: await this.getOutcomeByCode(createDto.outcomeCode), + date: new Date(createDto.date), + resolutionNumber: createDto.resolutionNumber, + resolutionYear: createDto.resolutionYear, + auditDate: createDto.auditDate + ? new Date(createDto.auditDate) + : undefined, + isDraft: true, + isSubjectToConditions: createDto.isSubjectToConditions, + decisionDescription: createDto.decisionDescription, + isStatsRequired: createDto.isStatsRequired, + rescindedDate: createDto.rescindedDate + ? new Date(createDto.rescindedDate) + : null, + rescindedComment: createDto.rescindedComment, + noticeOfIntent, + modifies, + components: decisionComponents, + }); + + await this.validateResolutionNumber( + createDto.resolutionNumber, + createDto.resolutionYear, + ); + + const savedDecision = await this.noticeOfIntentDecisionRepository.save( + decision, + { + transaction: true, + }, + ); + + return this.get(savedDecision.uuid); + } + + private async validateResolutionNumber(number, year) { + // we do not need to validate decision without number + if (!number) { + return; + } + + // we do not need to include deleted items since there may be multiple deleted draft decision wih the same or different numbers + const existingDecision = + await this.noticeOfIntentDecisionRepository.findOne({ + where: { + resolutionNumber: number, + resolutionYear: year ?? IsNull(), + }, + }); + + if (existingDecision) { + throw new ServiceValidationException( + `Resolution number #${number}/${year} is already in use`, + ); + } + } + + async delete(uuid) { + const noticeOfIntentDecision = + await this.noticeOfIntentDecisionRepository.findOne({ + where: { uuid }, + relations: { + outcome: true, + documents: { + document: true, + }, + noticeOfIntent: true, + components: true, + }, + }); + + if (!noticeOfIntentDecision) { + throw new ServiceNotFoundException( + `Failed to find decision with uuid ${uuid}`, + ); + } + + for (const document of noticeOfIntentDecision.documents) { + await this.documentService.softRemove(document.document); + } + + await this.decisionComponentService.softRemove( + noticeOfIntentDecision.components, + ); + + //Clear potential links + noticeOfIntentDecision.modifies = null; + await this.noticeOfIntentDecisionRepository.save(noticeOfIntentDecision); + + await this.noticeOfIntentDecisionRepository.softRemove([ + noticeOfIntentDecision, + ]); + await this.updateDecisionDates(noticeOfIntentDecision); + } + + async attachDocument(decisionUuid: string, file: MultipartFile, user: User) { + const decision = await this.getOrFail(decisionUuid); + const document = await this.documentService.create( + `decision/${decision.uuid}`, + file.filename, + file, + user, + DOCUMENT_SOURCE.ALC, + DOCUMENT_SYSTEM.ALCS, + ); + const appDocument = new NoticeOfIntentDecisionDocument({ + decision, + document, + }); + + return this.decisionDocumentRepository.save(appDocument); + } + + async deleteDocument(decisionDocumentUuid: string) { + const decisionDocument = await this.getDecisionDocumentOrFail( + decisionDocumentUuid, + ); + + await this.decisionDocumentRepository.softRemove(decisionDocument); + return decisionDocument; + } + + async getDownloadUrl(decisionDocumentUuid: string, openInline = false) { + const decisionDocument = await this.getDecisionDocumentOrFail( + decisionDocumentUuid, + ); + + return this.documentService.getDownloadUrl( + decisionDocument.document, + openInline, + ); + } + + getOutcomeByCode(code: string) { + return this.decisionOutcomeRepository.findOneOrFail({ + where: { + code, + }, + }); + } + + async fetchCodes() { + const values = await Promise.all([ + this.decisionOutcomeRepository.find(), + this.decisionComponentTypeRepository.find(), + this.decisionConditionTypeRepository.find(), + ]); + + return { + outcomes: values[0], + decisionComponentTypes: values[1], + decisionConditionTypes: values[2], + }; + } + + getMany(modifiesDecisionUuids: string[]) { + return this.noticeOfIntentDecisionRepository.find({ + where: { + uuid: In(modifiesDecisionUuids), + }, + }); + } + + async generateResolutionNumber(resolutionYear: number) { + const result = await this.noticeOfIntentDecisionRepository.query( + `SELECT * FROM alcs.generate_next_resolution_number(${resolutionYear})`, + ); + + return result[0].generate_next_resolution_number; + } + + private async updateComponents( + updateDto: UpdateNoticeOfIntentDecisionDto, + existingDecision: Partial, + ) { + if (updateDto.decisionComponents) { + if ( + existingDecision.outcomeCode && + ['APPA', 'APPR'].includes(existingDecision.outcomeCode) + ) { + this.decisionComponentService.validate( + updateDto.decisionComponents, + updateDto.isDraft, + ); + } + + if (existingDecision.components) { + const componentsToRemove = existingDecision.components.filter( + (component) => + !updateDto.decisionComponents?.some( + (componentDto) => componentDto.uuid === component.uuid, + ), + ); + + await this.decisionComponentService.softRemove(componentsToRemove); + } + + existingDecision.components = + await this.decisionComponentService.createOrUpdate( + updateDto.decisionComponents, + false, + ); + } else if ( + updateDto.decisionComponents === null && + existingDecision.components + ) { + await this.decisionComponentService.softRemove( + existingDecision.components, + ); + } + } + + private async updateConditions( + updateDto: UpdateNoticeOfIntentDecisionDto, + existingDecision: Partial, + ) { + if (updateDto.conditions) { + if (existingDecision.noticeOfIntentUuid && existingDecision.conditions) { + const conditionsToRemove = existingDecision.conditions.filter( + (condition) => + !updateDto.conditions?.some( + (conditionDto) => conditionDto.uuid === condition.uuid, + ), + ); + + await this.decisionConditionService.remove(conditionsToRemove); + } + + const existingComponents = + await this.decisionComponentService.getAllByNoticeOfIntentUUID( + existingDecision.noticeOfIntentUuid!, + ); + + existingDecision.conditions = + await this.decisionConditionService.createOrUpdate( + updateDto.conditions, + existingComponents, + existingDecision.components ?? [], + false, + ); + } else if (updateDto.conditions === null && existingDecision.conditions) { + await this.decisionConditionService.remove(existingDecision.conditions); + } + } + + private async getOrFail(uuid: string) { + const existingDecision = + await this.noticeOfIntentDecisionRepository.findOne({ + where: { + uuid, + }, + relations: { + noticeOfIntent: true, + components: true, + conditions: true, + }, + }); + + if (!existingDecision) { + throw new ServiceNotFoundException( + `Decision with UUID ${uuid} not found`, + ); + } + return existingDecision; + } + + private async updateDecisionDates( + noticeOfIntentDecision: NoticeOfIntentDecision, + ) { + const existingDecisions = await this.getByAppFileNumber( + noticeOfIntentDecision.noticeOfIntent.fileNumber, + ); + const releasedDecisions = existingDecisions.filter( + (decision) => !decision.isDraft, + ); + if (releasedDecisions.length === 0) { + await this.noticeOfIntentService.updateByUuid( + noticeOfIntentDecision.noticeOfIntent.uuid, + { + decisionDate: null, + }, + ); + + await this.noticeOfIntentSubmissionStatusService.setStatusDateByFileNumber( + noticeOfIntentDecision.noticeOfIntent.fileNumber, + NOI_SUBMISSION_STATUS.ALC_DECISION, + null, + ); + } else { + const decisionDate = existingDecisions[existingDecisions.length - 1].date; + await this.noticeOfIntentService.updateByUuid( + noticeOfIntentDecision.noticeOfIntent.uuid, + { + decisionDate, + }, + ); + + await this.setDecisionReleasedStatus( + decisionDate, + noticeOfIntentDecision, + ); + } + } + + private async setDecisionReleasedStatus( + decisionDate: Date | null, + noticeOfIntentDecision: NoticeOfIntentDecision, + ) { + await this.noticeOfIntentSubmissionStatusService.setStatusDateByFileNumber( + noticeOfIntentDecision.noticeOfIntent.fileNumber, + NOI_SUBMISSION_STATUS.ALC_DECISION, + decisionDate, + ); + } + + private async getDecisionDocumentOrFail(decisionDocumentUuid: string) { + const decisionDocument = await this.decisionDocumentRepository.findOne({ + where: { + uuid: decisionDocumentUuid, + }, + relations: { + document: true, + }, + }); + + if (!decisionDocument) { + throw new ServiceNotFoundException( + `Failed to find document with uuid ${decisionDocumentUuid}`, + ); + } + return decisionDocument; + } +} diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.dto.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.dto.ts index 5bafa50d90..23db0752ad 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.dto.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.dto.ts @@ -1,8 +1,23 @@ import { AutoMap } from '@automapper/classes'; -import { IsNumber, IsOptional, IsString, IsUUID } from 'class-validator'; +import { + IsArray, + IsBoolean, + IsNumber, + IsOptional, + IsString, + IsUUID, +} from 'class-validator'; import { BaseCodeDto } from '../../common/dtos/base.dto'; +import { + NoticeOfIntentDecisionComponentDto, + UpdateNoticeOfIntentDecisionComponentDto, +} from './notice-of-intent-decision-component/notice-of-intent-decision-component.dto'; +import { + NoticeOfIntentDecisionConditionDto, + UpdateNoticeOfIntentDecisionConditionDto, +} from './notice-of-intent-decision-condition/notice-of-intent-decision-condition.dto'; -export class NoticeOfIntentDecisionOutcomeDto extends BaseCodeDto {} +export class NoticeOfIntentDecisionOutcomeCodeDto extends BaseCodeDto {} export class UpdateNoticeOfIntentDecisionDto { @IsNumber() @@ -32,11 +47,46 @@ export class UpdateNoticeOfIntentDecisionDto { @IsString() @IsOptional() decisionMakerName?: string | null; + + @IsUUID() + @IsOptional() + modifiesUuid?: string | null; + + @IsBoolean() + @IsOptional() + isSubjectToConditions?: boolean | null; + + @IsString() + @IsOptional() + decisionDescription?: string | null; + + @IsBoolean() + @IsOptional() + isStatsRequired?: boolean | null; + + @IsNumber() + @IsOptional() + rescindedDate?: number | null; + + @IsString() + @IsOptional() + rescindedComment?: string | null; + + @IsBoolean() + @IsOptional() + isDraft?: boolean; + + @IsOptional() + decisionComponents?: UpdateNoticeOfIntentDecisionComponentDto[]; + + @IsOptional() + @IsArray() + conditions?: UpdateNoticeOfIntentDecisionConditionDto[]; } export class CreateNoticeOfIntentDecisionDto extends UpdateNoticeOfIntentDecisionDto { @IsString() - applicationFileNumber; + fileNumber: string; @IsNumber() date: number; @@ -45,14 +95,19 @@ export class CreateNoticeOfIntentDecisionDto extends UpdateNoticeOfIntentDecisio outcomeCode: string; @IsNumber() - resolutionNumber: number; + @IsOptional() + resolutionNumber?: number; @IsNumber() - resolutionYear: number; + @IsOptional() + resolutionYear?: number; @IsUUID() @IsOptional() modifiesUuid?: string; + + @IsOptional() + override isDraft = true; } export class LinkedResolutionDto { @@ -65,7 +120,7 @@ export class NoticeOfIntentDecisionDto { uuid: string; @AutoMap() - applicationFileNumber: string; + fileNumber: string; @AutoMap() date: number; @@ -79,6 +134,24 @@ export class NoticeOfIntentDecisionDto { @AutoMap() resolutionYear: number; + @AutoMap(() => Boolean) + isSubjectToConditions: boolean | null; + + @AutoMap(() => Boolean) + isDraft: boolean; + + @AutoMap(() => String) + decisionDescription?: string | null; + + @AutoMap(() => Boolean) + isStatsRequired?: boolean | null; + + @AutoMap(() => Number) + rescindedDate?: number | null; + + @AutoMap(() => String) + rescindedComment?: string | null; + @AutoMap(() => [NoticeOfIntentDecisionDocumentDto]) documents: NoticeOfIntentDecisionDocumentDto[]; @@ -88,11 +161,16 @@ export class NoticeOfIntentDecisionDto { @AutoMap(() => String) decisionMakerName?: string | null; - @AutoMap(() => NoticeOfIntentDecisionOutcomeDto) - outcome?: NoticeOfIntentDecisionOutcomeDto | null; + @AutoMap(() => NoticeOfIntentDecisionOutcomeCodeDto) + outcome?: NoticeOfIntentDecisionOutcomeCodeDto | null; modifies?: LinkedResolutionDto; modifiedBy?: LinkedResolutionDto[]; + + components?: NoticeOfIntentDecisionComponentDto[]; + + @AutoMap(() => [NoticeOfIntentDecisionConditionDto]) + conditions?: NoticeOfIntentDecisionConditionDto[]; } export class NoticeOfIntentDecisionDocumentDto { diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.entity.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.entity.ts index d3327ffefa..c3beae8601 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.entity.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.entity.ts @@ -12,6 +12,8 @@ import { } from 'typeorm'; import { Base } from '../../common/entities/base.entity'; import { NoticeOfIntent } from '../notice-of-intent/notice-of-intent.entity'; +import { NoticeOfIntentDecisionComponent } from './notice-of-intent-decision-component/notice-of-intent-decision-component.entity'; +import { NoticeOfIntentDecisionCondition } from './notice-of-intent-decision-condition/notice-of-intent-decision-condition.entity'; import { NoticeOfIntentDecisionDocument } from './notice-of-intent-decision-document/notice-of-intent-decision-document.entity'; import { NoticeOfIntentDecisionOutcome } from './notice-of-intent-decision-outcome.entity'; import { NoticeOfIntentModification } from './notice-of-intent-modification/notice-of-intent-modification.entity'; @@ -30,8 +32,8 @@ export class NoticeOfIntentDecision extends Base { } @AutoMap() - @Column({ type: 'timestamptz' }) - date: Date; + @Column({ type: 'timestamptz', nullable: true }) + date: Date | null; @AutoMap() @Column({ type: 'timestamptz', nullable: true }) @@ -56,13 +58,64 @@ export class NoticeOfIntentDecision extends Base { resolutionYear: number; @AutoMap() - @Column() - decisionMaker: string; + @Column({ type: 'varchar', nullable: true }) + decisionMaker?: string; @AutoMap() @Column({ type: 'text', nullable: true }) decisionMakerName?: string; + @AutoMap() + @Column({ type: 'boolean', default: false }) + wasReleased: boolean; + + @AutoMap() + @Column({ + comment: 'Indicates whether the decision is currently draft or not', + default: false, + }) + isDraft: boolean; + + @AutoMap(() => Boolean) + @Column({ + comment: 'Indicates whether the decision is subject to conditions', + type: 'boolean', + nullable: true, + }) + isSubjectToConditions?: boolean | null; + + @AutoMap(() => String) + @Column({ + comment: 'Staff input field for a description of the decision', + nullable: true, + type: 'text', + }) + decisionDescription?: string | null; + + @AutoMap(() => Boolean) + @Column({ + comment: 'Indicates whether the stats are required for the decision', + nullable: true, + type: 'boolean', + }) + isStatsRequired?: boolean | null; + + @AutoMap(() => Date) + @Column({ + type: 'timestamptz', + nullable: true, + comment: 'Date when decision was rescinded', + }) + rescindedDate?: Date | null; + + @AutoMap(() => String) + @Column({ + comment: 'Comment provided by the staff when the decision was rescinded', + nullable: true, + type: 'text', + }) + rescindedComment?: string | null; + @CreateDateColumn({ type: 'timestamptz', nullable: false, @@ -101,4 +154,20 @@ export class NoticeOfIntentDecision extends Base { ) @JoinColumn() modifies?: NoticeOfIntentModification | null; + + @AutoMap(() => [NoticeOfIntentDecisionComponent]) + @OneToMany( + () => NoticeOfIntentDecisionComponent, + (component) => component.noticeOfIntentDecision, + { cascade: ['insert', 'update'] }, + ) + components: NoticeOfIntentDecisionComponent[]; + + @AutoMap(() => [NoticeOfIntentDecisionCondition]) + @OneToMany( + () => NoticeOfIntentDecisionCondition, + (component) => component.decision, + { cascade: ['insert', 'update'] }, + ) + conditions: NoticeOfIntentDecisionCondition[]; } diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.module.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.module.ts index a88e7515c1..518dacc971 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.module.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.module.ts @@ -4,12 +4,21 @@ import { NoticeOfIntentDecisionProfile } from '../../common/automapper/notice-of import { DocumentModule } from '../../document/document.module'; import { BoardModule } from '../board/board.module'; import { CardModule } from '../card/card.module'; +import { NoticeOfIntentSubmissionStatusModule } from '../notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.module'; import { NoticeOfIntentModule } from '../notice-of-intent/notice-of-intent.module'; +import { NoticeOfIntentDecisionComponentType } from './notice-of-intent-decision-component/notice-of-intent-decision-component-type.entity'; +import { NoticeOfIntentDecisionComponent } from './notice-of-intent-decision-component/notice-of-intent-decision-component.entity'; +import { NoticeOfIntentDecisionComponentService } from './notice-of-intent-decision-component/notice-of-intent-decision-component.service'; +import { NoticeOfIntentDecisionConditionType } from './notice-of-intent-decision-condition/notice-of-intent-decision-condition-code.entity'; +import { NoticeOfIntentDecisionCondition } from './notice-of-intent-decision-condition/notice-of-intent-decision-condition.entity'; +import { NoticeOfIntentDecisionConditionService } from './notice-of-intent-decision-condition/notice-of-intent-decision-condition.service'; import { NoticeOfIntentDecisionDocument } from './notice-of-intent-decision-document/notice-of-intent-decision-document.entity'; import { NoticeOfIntentDecisionOutcome } from './notice-of-intent-decision-outcome.entity'; +import { NoticeOfIntentDecisionV2Controller } from './notice-of-intent-decision-v2/notice-of-intent-decision-v2.controller'; +import { NoticeOfIntentDecisionV2Service } from './notice-of-intent-decision-v2/notice-of-intent-decision-v2.service'; import { NoticeOfIntentDecision } from './notice-of-intent-decision.entity'; -import { NoticeOfIntentDecisionController } from './notice-of-intent-decision.controller'; -import { NoticeOfIntentDecisionService } from './notice-of-intent-decision.service'; +import { NoticeOfIntentDecisionV1Controller } from './notice-of-intent-decision-v1/notice-of-intent-decision-v1.controller'; +import { NoticeOfIntentDecisionV1Service } from './notice-of-intent-decision-v1/notice-of-intent-decision-v1.service'; import { NoticeOfIntentModificationOutcomeType } from './notice-of-intent-modification/notice-of-intent-modification-outcome-type/notice-of-intent-modification-outcome-type.entity'; import { NoticeOfIntentModificationController } from './notice-of-intent-modification/notice-of-intent-modification.controller'; import { NoticeOfIntentModification } from './notice-of-intent-modification/notice-of-intent-modification.entity'; @@ -23,21 +32,30 @@ import { NoticeOfIntentModificationService } from './notice-of-intent-modificati NoticeOfIntentDecisionDocument, NoticeOfIntentModification, NoticeOfIntentModificationOutcomeType, + NoticeOfIntentDecisionComponent, + NoticeOfIntentDecisionComponentType, + NoticeOfIntentDecisionCondition, + NoticeOfIntentDecisionConditionType, ]), forwardRef(() => BoardModule), CardModule, DocumentModule, NoticeOfIntentModule, + NoticeOfIntentSubmissionStatusModule, ], providers: [ - NoticeOfIntentDecisionService, + NoticeOfIntentDecisionV1Service, + NoticeOfIntentDecisionV2Service, + NoticeOfIntentDecisionComponentService, + NoticeOfIntentDecisionConditionService, NoticeOfIntentDecisionProfile, NoticeOfIntentModificationService, ], controllers: [ - NoticeOfIntentDecisionController, + NoticeOfIntentDecisionV1Controller, + NoticeOfIntentDecisionV2Controller, NoticeOfIntentModificationController, ], - exports: [NoticeOfIntentModificationService, NoticeOfIntentDecisionService], + exports: [NoticeOfIntentModificationService, NoticeOfIntentDecisionV1Service], }) export class NoticeOfIntentDecisionModule {} diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-modification/notice-of-intent-modification.dto.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-modification/notice-of-intent-modification.dto.ts index 385ca4c487..54cffee43d 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-modification/notice-of-intent-modification.dto.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-modification/notice-of-intent-modification.dto.ts @@ -8,10 +8,10 @@ import { IsString, } from 'class-validator'; import { BaseCodeDto } from '../../../common/dtos/base.dto'; +import { NoticeOfIntentTypeDto } from '../../code/application-code/notice-of-intent-type/notice-of-intent-type.dto'; import { LocalGovernmentDto } from '../../local-government/local-government.dto'; import { CardDto } from '../../card/card.dto'; import { ApplicationRegionDto } from '../../code/application-code/application-region/application-region.dto'; -import { ApplicationTypeDto } from '../../code/application-code/application-type/application-type.dto'; import { NoticeOfIntentDecisionDto } from '../notice-of-intent-decision.dto'; export class NoticeOfIntentModificationOutcomeCodeDto extends BaseCodeDto {} @@ -70,7 +70,7 @@ export class NoticeOfIntentModificationUpdateDto { export class NoticeOfIntentForModificationDto { fileNumber: string; - type: ApplicationTypeDto; + type: NoticeOfIntentTypeDto; statusCode: string; applicant: string; region: ApplicationRegionDto; diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-modification/notice-of-intent-modification.service.spec.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-modification/notice-of-intent-modification.service.spec.ts index 80ce3c69a0..382f69839b 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-modification/notice-of-intent-modification.service.spec.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-modification/notice-of-intent-modification.service.spec.ts @@ -13,7 +13,7 @@ import { CardService } from '../../card/card.service'; import { NoticeOfIntent } from '../../notice-of-intent/notice-of-intent.entity'; import { NoticeOfIntentService } from '../../notice-of-intent/notice-of-intent.service'; import { NoticeOfIntentDecision } from '../notice-of-intent-decision.entity'; -import { NoticeOfIntentDecisionService } from '../notice-of-intent-decision.service'; +import { NoticeOfIntentDecisionV1Service } from '../notice-of-intent-decision-v1/notice-of-intent-decision-v1.service'; import { NoticeOfIntentModificationCreateDto, NoticeOfIntentModificationUpdateDto, @@ -26,7 +26,7 @@ describe('NoticeOfIntentModificationService', () => { let service: NoticeOfIntentModificationService; let noticeOfIntentServiceMock: DeepMocked; let cardServiceMock: DeepMocked; - let decisionServiceMock: DeepMocked; + let decisionServiceMock: DeepMocked; let mockModification; let mockModificationCreateDto: NoticeOfIntentModificationCreateDto; @@ -83,7 +83,7 @@ describe('NoticeOfIntentModificationService', () => { useValue: cardServiceMock, }, { - provide: NoticeOfIntentDecisionService, + provide: NoticeOfIntentDecisionV1Service, useValue: decisionServiceMock, }, { diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-modification/notice-of-intent-modification.service.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-modification/notice-of-intent-modification.service.ts index ff8c210b4f..3267288a59 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-modification/notice-of-intent-modification.service.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-modification/notice-of-intent-modification.service.ts @@ -14,7 +14,7 @@ import { Board } from '../../board/board.entity'; import { CARD_TYPE } from '../../card/card-type/card-type.entity'; import { CardService } from '../../card/card.service'; import { NoticeOfIntentService } from '../../notice-of-intent/notice-of-intent.service'; -import { NoticeOfIntentDecisionService } from '../notice-of-intent-decision.service'; +import { NoticeOfIntentDecisionV1Service } from '../notice-of-intent-decision-v1/notice-of-intent-decision-v1.service'; import { NoticeOfIntentModificationCreateDto, NoticeOfIntentModificationDto, @@ -29,7 +29,7 @@ export class NoticeOfIntentModificationService { private modificationRepository: Repository, @InjectMapper() private mapper: Mapper, private noticeOfIntentService: NoticeOfIntentService, - private noticeOfIntentDecisionService: NoticeOfIntentDecisionService, + private noticeOfIntentDecisionService: NoticeOfIntentDecisionV1Service, private cardService: CardService, ) {} diff --git a/services/apps/alcs/src/common/automapper/application-decision-v2.automapper.profile.ts b/services/apps/alcs/src/common/automapper/application-decision-v2.automapper.profile.ts index c777a7f6d6..984afa4a64 100644 --- a/services/apps/alcs/src/common/automapper/application-decision-v2.automapper.profile.ts +++ b/services/apps/alcs/src/common/automapper/application-decision-v2.automapper.profile.ts @@ -62,16 +62,6 @@ export class ApplicationDecisionProfile extends AutomapperProfile { ), ), ), - forMember( - (ad) => ad.documents, - mapFrom((a) => - this.mapper.mapArray( - a.documents || [], - ApplicationDecisionDocument, - DecisionDocumentDto, - ), - ), - ), forMember( (a) => a.reconsiders, mapFrom((dec) => @@ -167,6 +157,7 @@ export class ApplicationDecisionProfile extends AutomapperProfile { ApplicationDecisionOutcomeCode, ApplicationDecisionOutcomeCodeDto, ); + createMap(mapper, NaruSubtype, NaruSubtypeDto); createMap( mapper, diff --git a/services/apps/alcs/src/common/automapper/notice-of-intent-decision.automapper.profile.ts b/services/apps/alcs/src/common/automapper/notice-of-intent-decision.automapper.profile.ts index 13e4c79d8f..883aa72dc6 100644 --- a/services/apps/alcs/src/common/automapper/notice-of-intent-decision.automapper.profile.ts +++ b/services/apps/alcs/src/common/automapper/notice-of-intent-decision.automapper.profile.ts @@ -1,16 +1,28 @@ import { createMap, forMember, mapFrom, Mapper } from '@automapper/core'; import { AutomapperProfile, InjectMapper } from '@automapper/nestjs'; import { Injectable } from '@nestjs/common'; -import { LocalGovernmentDto } from '../../alcs/local-government/local-government.dto'; import { CardDto } from '../../alcs/card/card.dto'; import { Card } from '../../alcs/card/card.entity'; +import { LocalGovernmentDto } from '../../alcs/local-government/local-government.dto'; import { LocalGovernment } from '../../alcs/local-government/local-government.entity'; +import { NoticeOfIntentDecisionComponentType } from '../../alcs/notice-of-intent-decision/notice-of-intent-decision-component/notice-of-intent-decision-component-type.entity'; +import { + NoticeOfIntentDecisionComponentDto, + NoticeOfIntentDecisionComponentTypeDto, +} from '../../alcs/notice-of-intent-decision/notice-of-intent-decision-component/notice-of-intent-decision-component.dto'; +import { NoticeOfIntentDecisionComponent } from '../../alcs/notice-of-intent-decision/notice-of-intent-decision-component/notice-of-intent-decision-component.entity'; +import { NoticeOfIntentDecisionConditionType } from '../../alcs/notice-of-intent-decision/notice-of-intent-decision-condition/notice-of-intent-decision-condition-code.entity'; +import { + NoticeOfIntentDecisionConditionDto, + NoticeOfIntentDecisionConditionTypeDto, +} from '../../alcs/notice-of-intent-decision/notice-of-intent-decision-condition/notice-of-intent-decision-condition.dto'; +import { NoticeOfIntentDecisionCondition } from '../../alcs/notice-of-intent-decision/notice-of-intent-decision-condition/notice-of-intent-decision-condition.entity'; import { NoticeOfIntentDecisionDocument } from '../../alcs/notice-of-intent-decision/notice-of-intent-decision-document/notice-of-intent-decision-document.entity'; import { NoticeOfIntentDecisionOutcome } from '../../alcs/notice-of-intent-decision/notice-of-intent-decision-outcome.entity'; import { NoticeOfIntentDecisionDocumentDto, NoticeOfIntentDecisionDto, - NoticeOfIntentDecisionOutcomeDto, + NoticeOfIntentDecisionOutcomeCodeDto, } from '../../alcs/notice-of-intent-decision/notice-of-intent-decision.dto'; import { NoticeOfIntentDecision } from '../../alcs/notice-of-intent-decision/notice-of-intent-decision.entity'; import { NoticeOfIntentModificationOutcomeType } from '../../alcs/notice-of-intent-decision/notice-of-intent-modification/notice-of-intent-modification-outcome-type/notice-of-intent-modification-outcome-type.entity'; @@ -46,12 +58,16 @@ export class NoticeOfIntentDecisionProfile extends AutomapperProfile { ), forMember( (ad) => ad.date, - mapFrom((a) => a.date.getTime()), + mapFrom((a) => a.date?.getTime()), ), forMember( (ad) => ad.auditDate, mapFrom((a) => a.auditDate?.getTime()), ), + forMember( + (ad) => ad.rescindedDate, + mapFrom((a) => a.rescindedDate?.getTime()), + ), forMember( (a) => a.modifies, mapFrom((dec) => @@ -81,12 +97,78 @@ export class NoticeOfIntentDecisionProfile extends AutomapperProfile { })), ), ), + forMember( + (a) => a.components, + mapFrom((ad) => { + if (ad.components) { + return this.mapper.mapArray( + ad.components, + NoticeOfIntentDecisionComponent, + NoticeOfIntentDecisionComponentDto, + ); + } else { + return []; + } + }), + ), + ); + + createMap( + mapper, + NoticeOfIntentDecisionComponent, + NoticeOfIntentDecisionComponentDto, + forMember( + (ad) => ad.endDate, + mapFrom((a) => a.endDate?.getTime()), + ), + forMember( + (ad) => ad.expiryDate, + mapFrom((a) => a.expiryDate?.getTime()), + ), + ); + + createMap( + mapper, + NoticeOfIntentDecisionComponentType, + NoticeOfIntentDecisionComponentTypeDto, + ); + + createMap( + mapper, + NoticeOfIntentDecisionCondition, + NoticeOfIntentDecisionConditionDto, + forMember( + (ad) => ad.completionDate, + mapFrom((a) => a.completionDate?.getTime()), + ), + forMember( + (ad) => ad.supersededDate, + mapFrom((a) => a.supersededDate?.getTime()), + ), + forMember( + (ad) => ad.components, + mapFrom((a) => + a.components && a.components.length > 0 + ? this.mapper.mapArray( + a.components, + NoticeOfIntentDecisionComponent, + NoticeOfIntentDecisionComponentDto, + ) + : [], + ), + ), + ); + + createMap( + mapper, + NoticeOfIntentDecisionConditionType, + NoticeOfIntentDecisionConditionTypeDto, ); createMap( mapper, NoticeOfIntentDecisionOutcome, - NoticeOfIntentDecisionOutcomeDto, + NoticeOfIntentDecisionOutcomeCodeDto, ); createMap( diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1692812627565-noi_decisions_v2.ts b/services/apps/alcs/src/providers/typeorm/migrations/1692812627565-noi_decisions_v2.ts new file mode 100644 index 0000000000..960568f5bb --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1692812627565-noi_decisions_v2.ts @@ -0,0 +1,185 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class noiDecisionsV21692812627565 implements MigrationInterface { + name = 'noiDecisionsV21692812627565'; + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `CREATE TABLE "alcs"."notice_of_intent_decision_condition_type" ("audit_deleted_date_at" TIMESTAMP WITH TIME ZONE, "audit_created_at" TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now(), "audit_updated_at" TIMESTAMP WITH TIME ZONE DEFAULT now(), "audit_created_by" character varying NOT NULL, "audit_updated_by" character varying, "label" character varying NOT NULL, "code" text NOT NULL, "description" text NOT NULL, CONSTRAINT "UQ_d42e55b4aef0fdc3c676b32a2a3" UNIQUE ("description"), CONSTRAINT "PK_30a33ede5fb646124dd846719cd" PRIMARY KEY ("code"))`, + ); + await queryRunner.query( + `CREATE TABLE "alcs"."notice_of_intent_decision_condition" ("audit_deleted_date_at" TIMESTAMP WITH TIME ZONE, "audit_created_at" TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now(), "audit_updated_at" TIMESTAMP WITH TIME ZONE DEFAULT now(), "audit_created_by" character varying NOT NULL, "audit_updated_by" character varying, "uuid" uuid NOT NULL DEFAULT gen_random_uuid(), "approval_dependant" boolean, "security_amount" numeric(12,2), "administrative_fee" numeric(12,2), "description" text, "completion_date" TIMESTAMP WITH TIME ZONE, "superseded_date" TIMESTAMP WITH TIME ZONE, "type_code" text, "decision_uuid" uuid NOT NULL, CONSTRAINT "PK_51e53b1c3920b8957bfe368c46a" PRIMARY KEY ("uuid")); COMMENT ON COLUMN "alcs"."notice_of_intent_decision_condition"."completion_date" IS 'Condition Completion date'; COMMENT ON COLUMN "alcs"."notice_of_intent_decision_condition"."superseded_date" IS 'Condition Superseded date'`, + ); + await queryRunner.query( + `CREATE TABLE "alcs"."notice_of_intent_decision_component_type" ("audit_deleted_date_at" TIMESTAMP WITH TIME ZONE, "audit_created_at" TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now(), "audit_updated_at" TIMESTAMP WITH TIME ZONE DEFAULT now(), "audit_created_by" character varying NOT NULL, "audit_updated_by" character varying, "label" character varying NOT NULL, "code" text NOT NULL, "description" text NOT NULL, CONSTRAINT "UQ_6c4783f61a9a7fa784deac579ff" UNIQUE ("description"), CONSTRAINT "PK_67c2c14d96bec32f1d9c8e2e9b0" PRIMARY KEY ("code"))`, + ); + await queryRunner.query( + `CREATE TABLE "alcs"."notice_of_intent_decision_component" ("audit_deleted_date_at" TIMESTAMP WITH TIME ZONE, "audit_created_at" TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now(), "audit_updated_at" TIMESTAMP WITH TIME ZONE DEFAULT now(), "audit_created_by" character varying NOT NULL, "audit_updated_by" character varying, "uuid" uuid NOT NULL DEFAULT gen_random_uuid(), "alr_area" numeric(12,2), "ag_cap" text, "ag_cap_source" text, "ag_cap_map" text, "ag_cap_consultant" text, "end_date" TIMESTAMP WITH TIME ZONE, "expiry_date" TIMESTAMP WITH TIME ZONE, "soil_fill_type_to_place" text, "soil_to_place_volume" numeric(12,2), "soil_to_place_area" numeric(12,2), "soil_to_place_maximum_depth" numeric(12,2), "soil_to_place_average_depth" numeric(12,2), "soil_type_removed" text, "soil_to_remove_volume" numeric(12,2), "soil_to_remove_area" numeric(12,2), "soil_to_remove_maximum_depth" numeric(12,2), "soil_to_remove_average_depth" numeric(12,2), "notice_of_intent_decision_component_type_code" text NOT NULL, "notice_of_intent_decision_uuid" uuid NOT NULL, CONSTRAINT "PK_cd1ed330456b906001d6b6288f6" PRIMARY KEY ("uuid")); COMMENT ON COLUMN "alcs"."notice_of_intent_decision_component"."alr_area" IS 'Area in hectares of ALR impacted by the decision component'; COMMENT ON COLUMN "alcs"."notice_of_intent_decision_component"."ag_cap" IS 'Agricultural cap classification'; COMMENT ON COLUMN "alcs"."notice_of_intent_decision_component"."ag_cap_source" IS 'Agricultural capability classification system used'; COMMENT ON COLUMN "alcs"."notice_of_intent_decision_component"."ag_cap_map" IS 'Agricultural capability map sheet reference'; COMMENT ON COLUMN "alcs"."notice_of_intent_decision_component"."ag_cap_consultant" IS 'Consultant who determined the agricultural capability'; COMMENT ON COLUMN "alcs"."notice_of_intent_decision_component"."end_date" IS 'Components\` end date'; COMMENT ON COLUMN "alcs"."notice_of_intent_decision_component"."expiry_date" IS 'Components\` expiry date'`, + ); + await queryRunner.query( + `CREATE UNIQUE INDEX "IDX_4014f28095a987bb6bc515aa2b" ON "alcs"."notice_of_intent_decision_component" ("notice_of_intent_decision_component_type_code", "notice_of_intent_decision_uuid") WHERE "audit_deleted_date_at" is null`, + ); + await queryRunner.query( + `CREATE TABLE "alcs"."notice_of_intent_decision_condition_component" ("notice_of_intent_decision_condition_uuid" uuid NOT NULL, "notice_of_intent_decision_component_uuid" uuid NOT NULL, CONSTRAINT "PK_e91078d3e07b0f292333ff9d5d6" PRIMARY KEY ("notice_of_intent_decision_condition_uuid", "notice_of_intent_decision_component_uuid"))`, + ); + await queryRunner.query( + `CREATE INDEX "IDX_4f1ecd62bb990e102c6af22a2e" ON "alcs"."notice_of_intent_decision_condition_component" ("notice_of_intent_decision_condition_uuid") `, + ); + await queryRunner.query( + `CREATE INDEX "IDX_a8090f60d15374a96a0d15bb13" ON "alcs"."notice_of_intent_decision_condition_component" ("notice_of_intent_decision_component_uuid") `, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_decision" ADD "was_released" boolean NOT NULL DEFAULT false`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_decision" ADD "is_draft" boolean NOT NULL DEFAULT false`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."notice_of_intent_decision"."is_draft" IS 'Indicates whether the decision is currently draft or not'`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_decision" ADD "is_subject_to_conditions" boolean`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."notice_of_intent_decision"."is_subject_to_conditions" IS 'Indicates whether the decision is subject to conditions'`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_decision" ADD "decision_description" text`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."notice_of_intent_decision"."decision_description" IS 'Staff input field for a description of the decision'`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_decision" ADD "is_stats_required" boolean`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."notice_of_intent_decision"."is_stats_required" IS 'Indicates whether the stats are required for the decision'`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_decision" ADD "rescinded_date" TIMESTAMP WITH TIME ZONE`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."notice_of_intent_decision"."rescinded_date" IS 'Date when decision was rescinded'`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_decision" ADD "rescinded_comment" text`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."notice_of_intent_decision"."rescinded_comment" IS 'Comment provided by the staff when the decision was rescinded'`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_decision" ALTER COLUMN "date" DROP NOT NULL`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_decision_condition" ADD CONSTRAINT "FK_30a33ede5fb646124dd846719cd" FOREIGN KEY ("type_code") REFERENCES "alcs"."notice_of_intent_decision_condition_type"("code") ON DELETE NO ACTION ON UPDATE NO ACTION`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_decision_condition" ADD CONSTRAINT "FK_88a63053a271ef84bc673e2bf9b" FOREIGN KEY ("decision_uuid") REFERENCES "alcs"."notice_of_intent_decision"("uuid") ON DELETE NO ACTION ON UPDATE NO ACTION`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_decision_component" ADD CONSTRAINT "FK_50ae784448f16c849fc9e9355c2" FOREIGN KEY ("notice_of_intent_decision_component_type_code") REFERENCES "alcs"."notice_of_intent_decision_component_type"("code") ON DELETE NO ACTION ON UPDATE NO ACTION`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_decision_component" ADD CONSTRAINT "FK_ac731e8132c6eb334dc44481c33" FOREIGN KEY ("notice_of_intent_decision_uuid") REFERENCES "alcs"."notice_of_intent_decision"("uuid") ON DELETE NO ACTION ON UPDATE NO ACTION`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_decision_condition_component" ADD CONSTRAINT "FK_4f1ecd62bb990e102c6af22a2e1" FOREIGN KEY ("notice_of_intent_decision_condition_uuid") REFERENCES "alcs"."notice_of_intent_decision_condition"("uuid") ON DELETE CASCADE ON UPDATE CASCADE`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_decision_condition_component" ADD CONSTRAINT "FK_a8090f60d15374a96a0d15bb13f" FOREIGN KEY ("notice_of_intent_decision_component_uuid") REFERENCES "alcs"."notice_of_intent_decision_component"("uuid") ON DELETE NO ACTION ON UPDATE NO ACTION`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_decision" ALTER COLUMN "decision_maker" DROP NOT NULL`, + ); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_decision" ALTER COLUMN "decision_maker" SET NOT NULL`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_decision_condition_component" DROP CONSTRAINT "FK_a8090f60d15374a96a0d15bb13f"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_decision_condition_component" DROP CONSTRAINT "FK_4f1ecd62bb990e102c6af22a2e1"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_decision_component" DROP CONSTRAINT "FK_ac731e8132c6eb334dc44481c33"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_decision_component" DROP CONSTRAINT "FK_50ae784448f16c849fc9e9355c2"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_decision_condition" DROP CONSTRAINT "FK_88a63053a271ef84bc673e2bf9b"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_decision_condition" DROP CONSTRAINT "FK_30a33ede5fb646124dd846719cd"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_decision" ALTER COLUMN "date" SET NOT NULL`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."notice_of_intent_decision"."rescinded_comment" IS 'Comment provided by the staff when the decision was rescinded'`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_decision" DROP COLUMN "rescinded_comment"`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."notice_of_intent_decision"."rescinded_date" IS 'Date when decision was rescinded'`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_decision" DROP COLUMN "rescinded_date"`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."notice_of_intent_decision"."is_stats_required" IS 'Indicates whether the stats are required for the decision'`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_decision" DROP COLUMN "is_stats_required"`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."notice_of_intent_decision"."decision_description" IS 'Staff input field for a description of the decision'`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_decision" DROP COLUMN "decision_description"`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."notice_of_intent_decision"."is_subject_to_conditions" IS 'Indicates whether the decision is subject to conditions'`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_decision" DROP COLUMN "is_subject_to_conditions"`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."notice_of_intent_decision"."is_draft" IS 'Indicates whether the decision is currently draft or not'`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_decision" DROP COLUMN "is_draft"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_decision" DROP COLUMN "was_released"`, + ); + await queryRunner.query( + `DROP INDEX "alcs"."IDX_a8090f60d15374a96a0d15bb13"`, + ); + await queryRunner.query( + `DROP INDEX "alcs"."IDX_4f1ecd62bb990e102c6af22a2e"`, + ); + await queryRunner.query( + `DROP TABLE "alcs"."notice_of_intent_decision_condition_component"`, + ); + await queryRunner.query( + `DROP INDEX "alcs"."IDX_4014f28095a987bb6bc515aa2b"`, + ); + await queryRunner.query( + `DROP TABLE "alcs"."notice_of_intent_decision_component"`, + ); + await queryRunner.query( + `DROP TABLE "alcs"."notice_of_intent_decision_component_type"`, + ); + await queryRunner.query( + `DROP TABLE "alcs"."notice_of_intent_decision_condition"`, + ); + await queryRunner.query( + `DROP TABLE "alcs"."notice_of_intent_decision_condition_type"`, + ); + } +} diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1692812692333-seed_noi_dec_v2_tables.ts b/services/apps/alcs/src/providers/typeorm/migrations/1692812692333-seed_noi_dec_v2_tables.ts new file mode 100644 index 0000000000..1e1d1671a8 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1692812692333-seed_noi_dec_v2_tables.ts @@ -0,0 +1,48 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class seedNoiDecV2Tables1692812692333 implements MigrationInterface { + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query(` + INSERT INTO "alcs"."notice_of_intent_decision_component_type" ("audit_deleted_date_at", "audit_created_at", "audit_updated_at", "audit_created_by", "audit_updated_by", "label", "code", "description") VALUES + (NULL, NOW(), NULL, 'seed-migration', 'seed-migration', 'Removal of Soil', 'ROSO', 'Removal of Soil'), + (NULL, NOW(), NULL, 'seed-migration', 'seed-migration', 'Placement of Fill', 'POFO', 'Placement of Fill'), + (NULL, NOW(), NULL, 'seed-migration', 'seed-migration', 'Placement of Fill/Removal of Soil', 'PFRS', 'Placement of Fill/Removal of Soil'); + `); + + await queryRunner.query(` + INSERT INTO "alcs"."notice_of_intent_decision_condition_type" ("audit_deleted_date_at", "audit_created_at", "audit_updated_at", "audit_created_by", "audit_updated_by", "label", "code", "description") VALUES + (NULL, NOW(), NULL, 'migration_seed', NULL, 'Adoption and/or compliance with By-Laws, OCP, etc.', 'ACBO', 'Responsibility to comply with applicable Acts, regulations, bylaws of the local government, and decisions and orders of any person or body having jurisdiction over the land under an enactment'), + (NULL, NOW(), NULL, 'migration_seed', NULL, 'Access', 'ACCE', 'Creating a new parcel requires legal access, associated with subdivision'), + (NULL, NOW(), NULL, 'migration_seed', NULL, 'Administrative Fees', 'AFEE', 'Fees will be charged by the ALC to administrate condition compliance'), + (NULL, NOW(), NULL, 'migration_seed', NULL, 'Bond', 'BOND', 'Financial security to ensure compliance with conditions of approval'), + (NULL, NOW(), NULL, 'migration_seed', NULL, 'Benefit to Agriculture', 'BTOA', 'Provide some action that is a benefit to agriculture'), + (NULL, NOW(), NULL, 'migration_seed', NULL, 'Buffering', 'BUFF', 'Landscape buffering along the edge of an approval to mitigate impacts to/from adjacent properties'), + (NULL, NOW(), NULL, 'migration_seed', NULL, 'Consolidation', 'CONS', 'Resurveying multiple properties into fewer properties and consolidating by legal title'), + (NULL, NOW(), NULL, 'migration_seed', NULL, 'Covenant', 'COVE', 'Registered on title to ensure ongoing compliance to the conditions of approval'), + (NULL, NOW(), NULL, 'migration_seed', NULL, 'Fencing', 'FENC', 'Fencing along the edge of an approval to mitigate impacts to/from adjacent properties'), + (NULL, NOW(), NULL, 'migration_seed', NULL, 'Final Report', 'FRPT', 'Closing report prepared by a qualified professional outlining condition compliance'), + (NULL, NOW(), NULL, 'migration_seed', NULL, 'Homesite Severance', 'HOME', 'Compliance with criteria outlined in Policy L-11'), + (NULL, NOW(), NULL, 'migration_seed', NULL, 'Inclusion', 'INCL', 'Subject to the inclusion of alternate agriculturally-capable land into the ALR to offset an approval'), + (NULL, NOW(), NULL, 'migration_seed', NULL, 'Lease', 'LEAS', 'Require a lease agreement to ensure the property is used for agricultural purposes'), + (NULL, NOW(), NULL, 'migration_seed', NULL, 'Monitored by qualified registered professional', 'MBRP', 'Oversight of the approved use by a qualified professional'), + (NULL, NOW(), NULL, 'migration_seed', NULL, 'No Expansion', 'NOEX', 'No expansion beyond the approved footprint or site plan'), + (NULL, NOW(), NULL, 'migration_seed', NULL, 'No Homesite Severance', 'NOHS', 'Does not meet criteria outlined in Policy L-11'), + (NULL, NOW(), NULL, 'migration_seed', NULL, 'Non-Transferrable', 'NONT', 'For the sole benefit of the applicant'), + (NULL, NOW(), NULL, 'migration_seed', NULL, 'Other', 'OTHR', 'Other condition not outlined by standard condition types'), + (NULL, NOW(), NULL, 'migration_seed', NULL, 'Rehabilitation/Reclamation', 'RERC', 'Plan to reclaim or rehabilitate the property to an appropriate agricultural standard'), + (NULL, NOW(), NULL, 'migration_seed', NULL, 'Right of First Refusal', 'ROFR', 'Gives a party the first opportunity to make an offer in a particular transaction'), + (NULL, NOW(), NULL, 'migration_seed', NULL, 'Require Survey Plan', 'RSPL', 'Legal survey plan completed by a BC Land Surveyor provided within a defined time limit'), + (NULL, NOW(), NULL, 'migration_seed', NULL, 'SCA Report', 'SCAR', 'Soil Conservation Act (repealed) required reporting'), + (NULL, NOW(), NULL, 'migration_seed', NULL, 'Substantial Compliance with Submitted Plan', 'SCSP', 'Approved use is consistent with the submitted plan'), + (NULL, NOW(), NULL, 'migration_seed', NULL, 'Status Report', 'SRPT', 'Report prepared by a qualified professional provided on a recurring basis to outline progress'), + (NULL, NOW(), NULL, 'migration_seed', NULL, 'Siting or Site Development Plan', 'SSDP', 'Site plan detailing the approved or proposed use on the landscape'), + (NULL, NOW(), NULL, 'migration_seed', NULL, 'Standard Reclamation Conditions', 'STRC', 'Standard reclamation conditions outlined in ALC policies and bulletins'), + (NULL, NOW(), NULL, 'migration_seed', NULL, 'Time Limit', 'TIME', 'Specified deadline to complete a specific condition or use'), + (NULL, NOW(), NULL, 'migration_seed', NULL, 'Vegetative Screening', 'VEGS', 'The use of vegetation to mitigate impacts to/from adjacent properties'); + `); + } + + public async down(): Promise { + //No can has + } +} From 78d7dfd98810624987c0d796c15831b67fe0126c Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Wed, 23 Aug 2023 15:50:36 -0700 Subject: [PATCH 293/954] Bugfix/alcs 1050 (#905) * update search query for NOI in portal * switch from api level filtering to queryBuilder, adjust filter criteria on search app submission for LG --- .../application-submission.service.spec.ts | 46 +++++++- .../application-submission.service.ts | 103 +++++++++++------- .../notice-of-intent-submission.service.ts | 5 +- 3 files changed, 110 insertions(+), 44 deletions(-) diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.service.spec.ts b/services/apps/alcs/src/portal/application-submission/application-submission.service.spec.ts index d4257f3d28..5871d6e127 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.service.spec.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.service.spec.ts @@ -1,4 +1,7 @@ -import { BaseServiceException } from '@app/common/exceptions/base.exception'; +import { + BaseServiceException, + ServiceNotFoundException, +} from '@app/common/exceptions/base.exception'; import { classes } from '@automapper/classes'; import { AutomapperModule } from '@automapper/nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; @@ -204,7 +207,9 @@ describe('ApplicationSubmissionService', () => { statusTypeCode: SUBMISSION_STATUS.SUBMITTED_TO_LG, submissionUuid: 'fake', }), - createdBy: new User(), + createdBy: new User({ + bceidBusinessGuid: 'cats', + }), }); mockRepository.findOne.mockResolvedValue(application); @@ -221,6 +226,43 @@ describe('ApplicationSubmissionService', () => { expect(res).toBe(application); }); + it('should fail on getForGovernmentByFileId if application was not submitted previously', async () => { + const submission = new ApplicationSubmission({ + uuid: 'fake-uuid', + fileNumber: 'fake-number', + submissionStatuses: [ + new ApplicationSubmissionToSubmissionStatus({ + statusTypeCode: SUBMISSION_STATUS.SUBMITTED_TO_LG, + effectiveDate: null, + }), + ], + status: new ApplicationSubmissionToSubmissionStatus({ + statusTypeCode: SUBMISSION_STATUS.CANCELLED, + submissionUuid: 'fake', + }), + createdBy: new User(), + }); + mockRepository.findOne.mockResolvedValue(submission); + + const promise = service.getForGovernmentByFileId( + submission.fileNumber, + new LocalGovernment({ + uuid: '', + name: '', + isFirstNation: false, + bceidBusinessGuid: 'cats', + }), + ); + + await expect(promise).rejects.toMatchObject( + new ServiceNotFoundException( + `Failed to load application with File ID ${submission.fileNumber}`, + ), + ); + + expect(mockRepository.findOne).toHaveBeenCalledTimes(1); + }); + it('should load the canceled status and save the application for cancel', async () => { const application = new ApplicationSubmission({ uuid: 'fake', diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.service.ts b/services/apps/alcs/src/portal/application-submission/application-submission.service.ts index f611d60466..0b9f8c0df4 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.service.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.service.ts @@ -11,6 +11,7 @@ import { ApplicationDocumentService } from '../../alcs/application/application-d import { ApplicationSubmissionStatusService } from '../../alcs/application/application-submission-status/application-submission-status.service'; import { ApplicationSubmissionStatusType } from '../../alcs/application/application-submission-status/submission-status-type.entity'; import { SUBMISSION_STATUS } from '../../alcs/application/application-submission-status/submission-status.dto'; +import { ApplicationSubmissionToSubmissionStatus } from '../../alcs/application/application-submission-status/submission-status.entity'; import { Application } from '../../alcs/application/application.entity'; import { ApplicationService } from '../../alcs/application/application.service'; import { LocalGovernment } from '../../alcs/local-government/local-government.entity'; @@ -317,36 +318,41 @@ export class ApplicationSubmissionService { throw new Error("Cannot load by governments that don't have guids"); } - const submissions = await this.applicationSubmissionRepository.find({ - where: [ - //Owns + const submissions = await this.applicationSubmissionRepository + .createQueryBuilder('aps') + .leftJoinAndSelect( + (sq) => + sq + .select('apsst.submission_uuid') + .from(ApplicationSubmissionToSubmissionStatus, 'apsst') + .where('apsst.status_type_code IN (:...statuses)', { + statuses: ['SUBG', 'SUBM'], + }) + .andWhere('apsst.effective_date IS NOT NULL') + .groupBy('apsst.submission_uuid'), + 'fapsst', + 'aps.uuid = fapsst.submission_uuid', + ) + .leftJoinAndSelect( + User, + 'createdBy', + 'createdBy.uuid = aps.created_by_uuid', + ) + .leftJoin(LocalGovernment, 'lg', 'lg.uuid = aps.local_government_uuid') + .where('aps.isDraft=False') + .andWhere( + '(createdBy.bceid_business_guid = :bceidGuid or (fapsst is not null and lg.uuid=:lgUuid))', { - createdBy: { - bceidBusinessGuid: localGovernment.bceidBusinessGuid, - }, - isDraft: false, - }, - //Local Government - { - localGovernmentUuid: localGovernment.uuid, - isDraft: false, + bceidGuid: localGovernment.bceidBusinessGuid, + lgUuid: localGovernment.uuid, }, - ], - order: { - auditUpdatedAt: 'DESC', - }, - relations: { - createdBy: true, - }, - }); + ) + .leftJoinAndSelect('aps.submissionStatuses', 'submissionStatuses') + .leftJoinAndSelect('submissionStatuses.statusType', 'statusType') + .orderBy('aps.auditUpdatedAt', 'DESC') + .getMany(); - return submissions.filter( - (s) => - s.createdBy?.bceidBusinessGuid === localGovernment.bceidBusinessGuid || - LG_VISIBLE_STATUSES.includes( - s.status?.statusTypeCode as SUBMISSION_STATUS, - ), - ); + return submissions; } async getForGovernmentByUuid(uuid: string, localGovernment: LocalGovernment) { @@ -385,12 +391,10 @@ export class ApplicationSubmissionService { if ( !existingApplication || - (existingApplication && - existingApplication.createdBy.bceidBusinessGuid !== - localGovernment.bceidBusinessGuid && - !LG_VISIBLE_STATUSES.includes( - existingApplication.status.statusTypeCode as SUBMISSION_STATUS, - )) + !this.isSubmissionVisibleToLocalGovernment( + existingApplication, + localGovernment, + ) ) { throw new ServiceNotFoundException( `Failed to load application with uuid ${uuid}`, @@ -400,6 +404,28 @@ export class ApplicationSubmissionService { return existingApplication; } + private isSubmissionVisibleToLocalGovernment( + existingApplication: ApplicationSubmission, + localGovernment: LocalGovernment, + ) { + return ( + (existingApplication.createdBy && + existingApplication.createdBy.bceidBusinessGuid === + localGovernment.bceidBusinessGuid) || + (LG_VISIBLE_STATUSES.includes( + existingApplication.status.statusTypeCode as SUBMISSION_STATUS, + ) && + existingApplication.submissionStatuses.some( + (status) => + [ + SUBMISSION_STATUS.SUBMITTED_TO_ALC, + SUBMISSION_STATUS.SUBMITTED_TO_LG, + ].includes(status.statusTypeCode as SUBMISSION_STATUS) && + status.effectiveDate !== null, + )) + ); + } + async getForGovernmentByFileId( fileNumber: string, localGovernment: LocalGovernment, @@ -436,14 +462,13 @@ export class ApplicationSubmissionService { }, relations: { ...this.DEFAULT_RELATIONS, createdBy: true }, }); + if ( !existingApplication || - (existingApplication && - existingApplication.createdBy.bceidBusinessGuid !== - localGovernment.bceidBusinessGuid && - !LG_VISIBLE_STATUSES.includes( - existingApplication.status.statusTypeCode as SUBMISSION_STATUS, - )) + !this.isSubmissionVisibleToLocalGovernment( + existingApplication, + localGovernment, + ) ) { throw new ServiceNotFoundException( `Failed to load application with File ID ${fileNumber}`, diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts index 729fcbe99e..7ebe9a7502 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts @@ -240,9 +240,8 @@ export class NoticeOfIntentSubmissionService { ...searchOptions, localGovernmentUuid: matchingLocalGovernment.uuid, isDraft: false, - submissionStatuses: { - effectiveDate: Not(IsNull()), - statusTypeCode: Not(NOI_SUBMISSION_STATUS.IN_PROGRESS), + noticeOfIntent: { + dateSubmittedToAlc: Not(IsNull()), }, }); } From ed40d3a8ee469403c7a238840b7e2bea39e5d09f Mon Sep 17 00:00:00 2001 From: Liam Stoddard Date: Wed, 23 Aug 2023 18:20:07 -0700 Subject: [PATCH 294/954] using dict to create NESW descriptions --- .../submissions/app_submissions.py | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/bin/migrate-oats-data/submissions/app_submissions.py b/bin/migrate-oats-data/submissions/app_submissions.py index 03db7279d8..c885b9e166 100644 --- a/bin/migrate-oats-data/submissions/app_submissions.py +++ b/bin/migrate-oats-data/submissions/app_submissions.py @@ -65,6 +65,43 @@ def process_alcs_app_submissions(conn=None, batch_size=BATCH_UPLOAD_SIZE): """ cursor.execute(adj_rows_query) adj_rows = cursor.fetchall() + test_dict = {} + for row in adj_rows: + application_id = row['alr_application_id'] + if application_id in test_dict: + if row['cardinal_direction'] == 'EAST': + test_dict[application_id]['east_description'] = row['description'] + test_dict[application_id]['east_type_code'] = row['nonfarm_use_type_code'] + # test_dict[application_id].append(row) + if row['cardinal_direction'] == 'WEST': + test_dict[application_id]['west_description'] = row['description'] + test_dict[application_id]['west_type_code'] = row['nonfarm_use_type_code'] + if row['cardinal_direction'] == 'NORTH': + test_dict[application_id]['north_description'] = row['description'] + test_dict[application_id]['north_type_code'] = row['nonfarm_use_type_code'] + if row['cardinal_direction'] == 'SOUTH': + test_dict[application_id]['south_description'] = row['description'] + test_dict[application_id]['south_type_code'] = row['nonfarm_use_type_code'] + else: + test_dict[application_id] = {} + test_dict[application_id]['alr_application_id'] = row['alr_application_id'] + # test_dict[application_id] = [row] + if row['cardinal_direction'] == 'EAST': + test_dict[application_id]['east_description'] = row['description'] + test_dict[application_id]['east_type_code'] = row['nonfarm_use_type_code'] + # test_dict[application_id].append(row) + if row['cardinal_direction'] == 'WEST': + test_dict[application_id]['west_description'] = row['description'] + test_dict[application_id]['west_type_code'] = row['nonfarm_use_type_code'] + if row['cardinal_direction'] == 'NORTH': + test_dict[application_id]['north_description'] = row['description'] + test_dict[application_id]['north_type_code'] = row['nonfarm_use_type_code'] + if row['cardinal_direction'] == 'SOUTH': + test_dict[application_id]['south_description'] = row['description'] + test_dict[application_id]['south_type_code'] = row['nonfarm_use_type_code'] + + # for row in {adj_rows['alr_application_id']: adj_rows for adj_rows in adj_rows} + print(test_dict) submissions_to_be_inserted_count = len(rows) From 31f6589a7d4c412c511c010079254236d3539b16 Mon Sep 17 00:00:00 2001 From: Liam Stoddard Date: Wed, 23 Aug 2023 18:44:30 -0700 Subject: [PATCH 295/954] EOD commit --- .../submissions/app_submissions.py | 23 ++++++++++++------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/bin/migrate-oats-data/submissions/app_submissions.py b/bin/migrate-oats-data/submissions/app_submissions.py index c885b9e166..63f5e44ef1 100644 --- a/bin/migrate-oats-data/submissions/app_submissions.py +++ b/bin/migrate-oats-data/submissions/app_submissions.py @@ -101,11 +101,15 @@ def process_alcs_app_submissions(conn=None, batch_size=BATCH_UPLOAD_SIZE): test_dict[application_id]['south_type_code'] = row['nonfarm_use_type_code'] # for row in {adj_rows['alr_application_id']: adj_rows for adj_rows in adj_rows} - print(test_dict) + # print(test_dict) + + # print("this is rows") + # print(rows) + # print("end rows") submissions_to_be_inserted_count = len(rows) - insert_app_sub_records(conn, batch_size, cursor, rows, adj_rows) + insert_app_sub_records(conn, batch_size, cursor, rows, adj_rows, test_dict) successful_inserts_count = ( successful_inserts_count + submissions_to_be_inserted_count @@ -129,7 +133,7 @@ def process_alcs_app_submissions(conn=None, batch_size=BATCH_UPLOAD_SIZE): print("Total failed inserts:", failed_inserts) log_end(etl_name) -def insert_app_sub_records(conn, batch_size, cursor, rows, adj_rows): +def insert_app_sub_records(conn, batch_size, cursor, rows, adj_rows, test_dict): """ Function to insert submission records in batches. @@ -146,7 +150,7 @@ def insert_app_sub_records(conn, batch_size, cursor, rows, adj_rows): nfu_data_list, other_data_list, inc_exc_data_list, - ) = prepare_app_sub_data(rows, adj_rows) + ) = prepare_app_sub_data(rows, adj_rows, test_dict) if len(nfu_data_list) > 0: execute_batch( @@ -174,7 +178,7 @@ def insert_app_sub_records(conn, batch_size, cursor, rows, adj_rows): conn.commit() -def prepare_app_sub_data(app_sub_raw_data_list, raw_dir_data_list): +def prepare_app_sub_data(app_sub_raw_data_list, raw_dir_data_list, test_dict): """ This function prepares different lists of data based on the 'alr_change_code' field of each data dict in 'app_sub_raw_data_list'. @@ -194,9 +198,12 @@ def prepare_app_sub_data(app_sub_raw_data_list, raw_dir_data_list): for row in app_sub_raw_data_list: data = dict(row) data = add_direction_field(data) - for adj_row in raw_dir_data_list: - dir_data = dict(adj_row) - data = map_direction_field(data, dir_data) + if data["alr_application_id"] in test_dict: + print(test_dict[data["alr_application_id"]]["alr_application_id"]) + #leaving off here to insert values from new fcn + # for adj_row in raw_dir_data_list: + # dir_data = dict(adj_row) + # data = map_direction_field(data, dir_data) # currently rather slow # ToDo optimize, potentially give index for dir_data resume point From 9e6770464dbace2cc581c7eede7f098246e7d9eb Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Thu, 24 Aug 2023 09:42:14 -0700 Subject: [PATCH 296/954] Code Review Feedback * Rename some Apps -> NOIs * Add table comments for new tables --- ...cision-document-upload-dialog.component.ts | 4 +- .../condition/condition.component.ts | 4 -- .../decision-v1/decision-v1.component.spec.ts | 2 +- .../decision-conditions.component.spec.ts | 1 - ...cision-document-upload-dialog.component.ts | 4 +- .../decision-input-v2.component.ts | 5 +- .../notice-of-intent.component.ts | 4 +- .../application-decision-v2.dto.ts | 4 +- .../notice-of-intent.service.ts | 2 +- ...-intent-decision-component.service.spec.ts | 62 +++++++---------- ...tent-decision-condition.controller.spec.ts | 33 +++++----- ...-intent-decision-condition.service.spec.ts | 66 +++++++------------ ...e-of-intent-decision-v2.controller.spec.ts | 14 ++-- .../notice-of-intent-decision.module.ts | 1 + .../1692812627565-noi_decisions_v2.ts | 15 +++++ 15 files changed, 98 insertions(+), 123 deletions(-) diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-file-upload-dialog/decision-document-upload-dialog.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-file-upload-dialog/decision-document-upload-dialog.component.ts index fdde9c666d..aeb4b66027 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-file-upload-dialog/decision-document-upload-dialog.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-file-upload-dialog/decision-document-upload-dialog.component.ts @@ -1,7 +1,7 @@ import { Component, Inject, OnInit } from '@angular/core'; import { FormControl, FormGroup, Validators } from '@angular/forms'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; -import { DecisionDocumentDto } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; +import { ApplicationDecisionDocumentDto } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; import { ApplicationDecisionV2Service } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.service'; import { DOCUMENT_SOURCE } from '../../../../../../shared/document/document.dto'; @@ -39,7 +39,7 @@ export class DecisionDocumentUploadDialogComponent implements OnInit { constructor( @Inject(MAT_DIALOG_DATA) - public data: { fileId: string; decisionUuid: string; existingDocument?: DecisionDocumentDto }, + public data: { fileId: string; decisionUuid: string; existingDocument?: ApplicationDecisionDocumentDto }, protected dialog: MatDialogRef, private decisionService: ApplicationDecisionV2Service ) {} diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/conditions/condition/condition.component.ts b/alcs-frontend/src/app/features/notice-of-intent/decision/conditions/condition/condition.component.ts index 99927ef81c..975703b4f6 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/decision/conditions/condition/condition.component.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/conditions/condition/condition.component.ts @@ -1,6 +1,5 @@ import { AfterViewInit, Component, Input, OnInit } from '@angular/core'; import moment from 'moment'; -import { UpdateApplicationDecisionConditionDto } from '../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; import { NoticeOfIntentDecisionConditionService } from '../../../../../services/notice-of-intent/decision-v2/notice-of-intent-decision-condition/notice-of-intent-decision-condition.service'; import { UpdateNoticeOfIntentDecisionConditionDto } from '../../../../../services/notice-of-intent/decision/notice-of-intent-decision.dto'; import { @@ -34,7 +33,6 @@ export class ConditionComponent implements OnInit, AfterViewInit { isReadMoreClicked = false; isReadMoreVisible = false; conditionStatus: string = ''; - isRequireSurveyPlan = false; constructor(private conditionService: NoticeOfIntentDecisionConditionService) {} @@ -45,8 +43,6 @@ export class ConditionComponent implements OnInit, AfterViewInit { ...this.condition, componentLabelsStr: this.condition.conditionComponentsLabels?.flatMap((e) => e.label).join(';\n'), }; - - this.isRequireSurveyPlan = this.condition.type?.code === 'RSPL'; } } diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v1/decision-v1.component.spec.ts b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v1/decision-v1.component.spec.ts index 900a5dcadc..0ea55942b9 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v1/decision-v1.component.spec.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v1/decision-v1.component.spec.ts @@ -12,7 +12,7 @@ import { ConfirmationDialogService } from '../../../../shared/confirmation-dialo import { DecisionV1Component } from './decision-v1.component'; -describe('DecisionComponent', () => { +describe('DecisionV1Component', () => { let component: DecisionV1Component; let fixture: ComponentFixture; let mockNOIDetailService: DeepMocked; diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-conditions/decision-conditions.component.spec.ts b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-conditions/decision-conditions.component.spec.ts index a0015d4867..0c274c5231 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-conditions/decision-conditions.component.spec.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-conditions/decision-conditions.component.spec.ts @@ -3,7 +3,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MatMenuModule } from '@angular/material/menu'; import { createMock } from '@golevelup/ts-jest'; import { BehaviorSubject } from 'rxjs'; -import { ApplicationDecisionV2Service } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.service'; import { NoticeOfIntentDecisionV2Service } from '../../../../../../services/notice-of-intent/decision-v2/notice-of-intent-decision-v2.service'; import { NoticeOfIntentDecisionDto, diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-file-upload-dialog/decision-document-upload-dialog.component.ts b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-file-upload-dialog/decision-document-upload-dialog.component.ts index ecb07ad94d..4682493a1b 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-file-upload-dialog/decision-document-upload-dialog.component.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-file-upload-dialog/decision-document-upload-dialog.component.ts @@ -1,8 +1,8 @@ import { Component, Inject, OnInit } from '@angular/core'; import { FormControl, FormGroup, Validators } from '@angular/forms'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; -import { DecisionDocumentDto } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; import { NoticeOfIntentDecisionV2Service } from '../../../../../../services/notice-of-intent/decision-v2/notice-of-intent-decision-v2.service'; +import { NoticeOfIntentDecisionDocumentDto } from '../../../../../../services/notice-of-intent/decision/notice-of-intent-decision.dto'; import { DOCUMENT_SOURCE } from '../../../../../../shared/document/document.dto'; @Component({ @@ -39,7 +39,7 @@ export class DecisionDocumentUploadDialogComponent implements OnInit { constructor( @Inject(MAT_DIALOG_DATA) - public data: { fileId: string; decisionUuid: string; existingDocument?: DecisionDocumentDto }, + public data: { fileId: string; decisionUuid: string; existingDocument?: NoticeOfIntentDecisionDocumentDto }, protected dialog: MatDialogRef, private decisionService: NoticeOfIntentDecisionV2Service ) {} diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-input-v2.component.ts b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-input-v2.component.ts index 87425ac561..192e631a31 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-input-v2.component.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-input-v2.component.ts @@ -204,8 +204,7 @@ export class DecisionInputV2Component implements OnInit, OnDestroy { modifications: NoticeOfIntentModificationDto[], existingDecision?: NoticeOfIntentDecisionDto ) { - //TOOD: Clean this up - const mappedModifications = modifications + this.postDecisions = modifications .filter( (modification) => (existingDecision && existingDecision.modifies?.uuid === modification.uuid) || @@ -217,8 +216,6 @@ export class DecisionInputV2Component implements OnInit, OnDestroy { .join(', ')}`, uuid: modification.uuid, })); - - this.postDecisions = [...mappedModifications]; } private patchFormWithExistingData(existingDecision: NoticeOfIntentDecisionDto) { diff --git a/alcs-frontend/src/app/features/notice-of-intent/notice-of-intent.component.ts b/alcs-frontend/src/app/features/notice-of-intent/notice-of-intent.component.ts index f344756e9a..3b5486bc9b 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/notice-of-intent.component.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/notice-of-intent.component.ts @@ -93,12 +93,10 @@ export class NoticeOfIntentComponent implements OnInit, OnDestroy { ) {} ngOnInit(): void { - this.fileNumber = '100135'; - this.load(); - this.route.params.pipe(takeUntil(this.destroy)).subscribe(async (routeParams) => { const { fileNumber } = routeParams; this.fileNumber = fileNumber; + this.load(); }); this.noticeOfIntentDetailService.$noticeOfIntent.pipe(takeUntil(this.destroy)).subscribe((noticeOfIntent) => { diff --git a/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-v2.dto.ts b/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-v2.dto.ts index 903e0e5bf0..db99cf2efe 100644 --- a/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-v2.dto.ts +++ b/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-v2.dto.ts @@ -59,7 +59,7 @@ export interface ApplicationDecisionDto { chairReviewOutcome: ChairReviewOutcomeCodeDto | null; linkedResolutionOutcome: LinkedResolutionOutcomeTypeDto | null; applicationFileNumber: string; - documents: DecisionDocumentDto[]; + documents: ApplicationDecisionDocumentDto[]; isTimeExtension?: boolean | null; isOther?: boolean | null; isDraft: boolean; @@ -88,7 +88,7 @@ export interface ApplicationDecisionWithLinkedResolutionDto extends ApplicationD index: number; } -export interface DecisionDocumentDto { +export interface ApplicationDecisionDocumentDto { uuid: string; fileName: string; mimeType: string; diff --git a/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent.service.ts b/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent.service.ts index 74db344959..823cf9f663 100644 --- a/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent.service.ts +++ b/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent.service.ts @@ -56,7 +56,7 @@ export class NoticeOfIntentService { async fetchByFileNumber(fileNumber: string) { try { - return firstValueFrom(this.http.get(`${this.url}/${fileNumber}`)); + return await firstValueFrom(this.http.get(`${this.url}/${fileNumber}`)); } catch (e) { console.error(e); this.toastService.showErrorToast('Failed to fetch Notice of Intent'); diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-component/notice-of-intent-decision-component.service.spec.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-component/notice-of-intent-decision-component.service.spec.ts index 7118c35dc8..f24061a5f0 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-component/notice-of-intent-decision-component.service.spec.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-component/notice-of-intent-decision-component.service.spec.ts @@ -7,21 +7,21 @@ import { CreateNoticeOfIntentDecisionComponentDto } from './notice-of-intent-dec import { NoticeOfIntentDecisionComponent } from './notice-of-intent-decision-component.entity'; import { NoticeOfIntentDecisionComponentService } from './notice-of-intent-decision-component.service'; -describe('ApplicationDecisionComponentService', () => { +describe('NoticeOfIntentDecisionComponentService', () => { let service: NoticeOfIntentDecisionComponentService; - let mockApplicationDecisionComponentRepository: DeepMocked< + let mockDecisionComponentRepository: DeepMocked< Repository >; beforeEach(async () => { - mockApplicationDecisionComponentRepository = createMock(); + mockDecisionComponentRepository = createMock(); const module: TestingModule = await Test.createTestingModule({ providers: [ NoticeOfIntentDecisionComponentService, { provide: getRepositoryToken(NoticeOfIntentDecisionComponent), - useValue: mockApplicationDecisionComponentRepository, + useValue: mockDecisionComponentRepository, }, ], }).compile(); @@ -36,18 +36,14 @@ describe('ApplicationDecisionComponentService', () => { }); it('should call repo to get one or fails with correct parameters', async () => { - mockApplicationDecisionComponentRepository.findOneOrFail.mockResolvedValue( + mockDecisionComponentRepository.findOneOrFail.mockResolvedValue( new NoticeOfIntentDecisionComponent(), ); const result = await service.getOneOrFail('fake'); - expect( - mockApplicationDecisionComponentRepository.findOneOrFail, - ).toBeCalledTimes(1); - expect( - mockApplicationDecisionComponentRepository.findOneOrFail, - ).toBeCalledWith({ + expect(mockDecisionComponentRepository.findOneOrFail).toBeCalledTimes(1); + expect(mockDecisionComponentRepository.findOneOrFail).toBeCalledWith({ where: { uuid: 'fake' }, }); expect(result).toBeDefined(); @@ -59,15 +55,15 @@ describe('ApplicationDecisionComponentService', () => { new NoticeOfIntentDecisionComponent(), ]; - mockApplicationDecisionComponentRepository.softRemove.mockResolvedValue( + mockDecisionComponentRepository.softRemove.mockResolvedValue( {} as NoticeOfIntentDecisionComponent, ); await service.softRemove(components); - expect( - mockApplicationDecisionComponentRepository.softRemove, - ).toHaveBeenCalledWith(components); + expect(mockDecisionComponentRepository.softRemove).toHaveBeenCalledWith( + components, + ); }); it('throws validation error if there are duplicate components', () => { @@ -122,7 +118,7 @@ describe('ApplicationDecisionComponentService', () => { }); it('should create new components when given a DTO without a UUID', async () => { - mockApplicationDecisionComponentRepository.findOneOrFail.mockResolvedValue( + mockDecisionComponentRepository.findOneOrFail.mockResolvedValue( {} as NoticeOfIntentDecisionComponent, ); @@ -135,13 +131,11 @@ describe('ApplicationDecisionComponentService', () => { expect(result).toBeDefined(); expect(result.length).toBe(2); - expect( - mockApplicationDecisionComponentRepository.findOneOrFail, - ).toBeCalledTimes(0); + expect(mockDecisionComponentRepository.findOneOrFail).toBeCalledTimes(0); }); it('should update existing components when given a DTO with a UUID', async () => { - mockApplicationDecisionComponentRepository.findOneOrFail.mockResolvedValue({ + mockDecisionComponentRepository.findOneOrFail.mockResolvedValue({ uuid: 'fake', noticeOfIntentDecisionComponentTypeCode: 'fake_code', } as NoticeOfIntentDecisionComponent); @@ -159,12 +153,8 @@ describe('ApplicationDecisionComponentService', () => { expect(result).toBeDefined(); expect(result.length).toBe(1); - expect( - mockApplicationDecisionComponentRepository.findOneOrFail, - ).toBeCalledTimes(1); - expect( - mockApplicationDecisionComponentRepository.findOneOrFail, - ).toBeCalledWith({ + expect(mockDecisionComponentRepository.findOneOrFail).toBeCalledTimes(1); + expect(mockDecisionComponentRepository.findOneOrFail).toBeCalledWith({ where: { uuid: 'fake' }, }); expect(result[0].uuid).toEqual(mockDto.uuid); @@ -179,10 +169,10 @@ describe('ApplicationDecisionComponentService', () => { }); it('should persist entity if persist flag is true', async () => { - mockApplicationDecisionComponentRepository.findOneOrFail.mockResolvedValue( + mockDecisionComponentRepository.findOneOrFail.mockResolvedValue( {} as NoticeOfIntentDecisionComponent, ); - mockApplicationDecisionComponentRepository.save.mockResolvedValue( + mockDecisionComponentRepository.save.mockResolvedValue( {} as NoticeOfIntentDecisionComponent, ); @@ -191,17 +181,15 @@ describe('ApplicationDecisionComponentService', () => { const result = await service.createOrUpdate(updateDtos, true); expect(result).toBeDefined(); - expect( - mockApplicationDecisionComponentRepository.findOneOrFail, - ).toBeCalledTimes(0); - expect(mockApplicationDecisionComponentRepository.save).toBeCalledTimes(1); + expect(mockDecisionComponentRepository.findOneOrFail).toBeCalledTimes(0); + expect(mockDecisionComponentRepository.save).toBeCalledTimes(1); }); it('should not persist entity if persist flag is false', async () => { - mockApplicationDecisionComponentRepository.findOneOrFail.mockResolvedValue( + mockDecisionComponentRepository.findOneOrFail.mockResolvedValue( {} as NoticeOfIntentDecisionComponent, ); - mockApplicationDecisionComponentRepository.save.mockResolvedValue( + mockDecisionComponentRepository.save.mockResolvedValue( {} as NoticeOfIntentDecisionComponent, ); @@ -210,10 +198,8 @@ describe('ApplicationDecisionComponentService', () => { const result = await service.createOrUpdate(updateDtos, false); expect(result).toBeDefined(); - expect( - mockApplicationDecisionComponentRepository.findOneOrFail, - ).toBeCalledTimes(0); - expect(mockApplicationDecisionComponentRepository.save).toBeCalledTimes(0); + expect(mockDecisionComponentRepository.findOneOrFail).toBeCalledTimes(0); + expect(mockDecisionComponentRepository.save).toBeCalledTimes(0); }); it('should validation decision component fields and throw error if any', async () => { diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-condition/notice-of-intent-decision-condition.controller.spec.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-condition/notice-of-intent-decision-condition.controller.spec.ts index b1756bf9bd..338b655f1f 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-condition/notice-of-intent-decision-condition.controller.spec.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-condition/notice-of-intent-decision-condition.controller.spec.ts @@ -12,10 +12,10 @@ import { NoticeOfIntentDecisionConditionService } from './notice-of-intent-decis describe('NoticeOfIntentDecisionConditionController', () => { let controller: NoticeOfIntentDecisionConditionController; - let mockApplicationDecisionConditionService: DeepMocked; + let mockNOIDecisionConditionService: DeepMocked; beforeEach(async () => { - mockApplicationDecisionConditionService = createMock(); + mockNOIDecisionConditionService = createMock(); const module: TestingModule = await Test.createTestingModule({ imports: [ @@ -28,7 +28,7 @@ describe('NoticeOfIntentDecisionConditionController', () => { NoticeOfIntentDecisionProfile, { provide: NoticeOfIntentDecisionConditionService, - useValue: mockApplicationDecisionConditionService, + useValue: mockNOIDecisionConditionService, }, { provide: ClsService, @@ -81,23 +81,22 @@ describe('NoticeOfIntentDecisionConditionController', () => { supersededDate: date, }); - mockApplicationDecisionConditionService.getOneOrFail.mockResolvedValue( - condition, - ); - mockApplicationDecisionConditionService.update.mockResolvedValue(updated); + mockNOIDecisionConditionService.getOneOrFail.mockResolvedValue(condition); + mockNOIDecisionConditionService.update.mockResolvedValue(updated); const result = await controller.update(uuid, updates); - expect( - mockApplicationDecisionConditionService.getOneOrFail, - ).toHaveBeenCalledWith(uuid); - expect( - mockApplicationDecisionConditionService.update, - ).toHaveBeenCalledWith(condition, { - ...updates, - completionDate: date, - supersededDate: date, - }); + expect(mockNOIDecisionConditionService.getOneOrFail).toHaveBeenCalledWith( + uuid, + ); + expect(mockNOIDecisionConditionService.update).toHaveBeenCalledWith( + condition, + { + ...updates, + completionDate: date, + supersededDate: date, + }, + ); expect(new Date(result.completionDate!)).toEqual(updated.completionDate); expect(new Date(result.supersededDate!)).toEqual(updated.supersededDate); expect(result.description).toEqual(updated.description); diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-condition/notice-of-intent-decision-condition.service.spec.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-condition/notice-of-intent-decision-condition.service.spec.ts index 1a9eb6b50a..f4e00a7089 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-condition/notice-of-intent-decision-condition.service.spec.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-condition/notice-of-intent-decision-condition.service.spec.ts @@ -7,29 +7,29 @@ import { UpdateNoticeOfIntentDecisionConditionDto } from './notice-of-intent-dec import { NoticeOfIntentDecisionCondition } from './notice-of-intent-decision-condition.entity'; import { NoticeOfIntentDecisionConditionService } from './notice-of-intent-decision-condition.service'; -describe('ApplicationDecisionConditionService', () => { +describe('NoticeOfIntentDecisionConditionService', () => { let service: NoticeOfIntentDecisionConditionService; - let mockApplicationDecisionConditionRepository: DeepMocked< + let mockNOIDecisionConditionRepository: DeepMocked< Repository >; - let mockAppDecCondTypeRepository: DeepMocked< + let mockNOIDecisionConditionTypeRepository: DeepMocked< Repository >; beforeEach(async () => { - mockApplicationDecisionConditionRepository = createMock(); - mockAppDecCondTypeRepository = createMock(); + mockNOIDecisionConditionRepository = createMock(); + mockNOIDecisionConditionTypeRepository = createMock(); const module: TestingModule = await Test.createTestingModule({ providers: [ NoticeOfIntentDecisionConditionService, { provide: getRepositoryToken(NoticeOfIntentDecisionCondition), - useValue: mockApplicationDecisionConditionRepository, + useValue: mockNOIDecisionConditionRepository, }, { provide: getRepositoryToken(NoticeOfIntentDecisionConditionType), - useValue: mockAppDecCondTypeRepository, + useValue: mockNOIDecisionConditionTypeRepository, }, ], }).compile(); @@ -44,18 +44,14 @@ describe('ApplicationDecisionConditionService', () => { }); it('should call repo to get one or fails with correct parameters', async () => { - mockApplicationDecisionConditionRepository.findOneOrFail.mockResolvedValue( + mockNOIDecisionConditionRepository.findOneOrFail.mockResolvedValue( new NoticeOfIntentDecisionCondition(), ); const result = await service.getOneOrFail('fake'); - expect( - mockApplicationDecisionConditionRepository.findOneOrFail, - ).toBeCalledTimes(1); - expect( - mockApplicationDecisionConditionRepository.findOneOrFail, - ).toBeCalledWith({ + expect(mockNOIDecisionConditionRepository.findOneOrFail).toBeCalledTimes(1); + expect(mockNOIDecisionConditionRepository.findOneOrFail).toBeCalledWith({ where: { uuid: 'fake' }, relations: { type: true }, }); @@ -68,19 +64,17 @@ describe('ApplicationDecisionConditionService', () => { new NoticeOfIntentDecisionCondition(), ]; - mockApplicationDecisionConditionRepository.remove.mockResolvedValue( + mockNOIDecisionConditionRepository.remove.mockResolvedValue( {} as NoticeOfIntentDecisionCondition, ); await service.remove(conditions); - expect(mockApplicationDecisionConditionRepository.remove).toBeCalledTimes( - 1, - ); + expect(mockNOIDecisionConditionRepository.remove).toBeCalledTimes(1); }); it('should create new components when given a DTO without a UUID', async () => { - mockApplicationDecisionConditionRepository.findOneOrFail.mockResolvedValue( + mockNOIDecisionConditionRepository.findOneOrFail.mockResolvedValue( new NoticeOfIntentDecisionCondition(), ); @@ -90,13 +84,11 @@ describe('ApplicationDecisionConditionService', () => { expect(result).toBeDefined(); expect(result.length).toBe(2); - expect( - mockApplicationDecisionConditionRepository.findOneOrFail, - ).toBeCalledTimes(0); + expect(mockNOIDecisionConditionRepository.findOneOrFail).toBeCalledTimes(0); }); it('should update existing components when given a DTO with a UUID', async () => { - mockApplicationDecisionConditionRepository.findOneOrFail.mockResolvedValue( + mockNOIDecisionConditionRepository.findOneOrFail.mockResolvedValue( new NoticeOfIntentDecisionCondition({ uuid: 'uuid', }), @@ -110,12 +102,8 @@ describe('ApplicationDecisionConditionService', () => { expect(result).toBeDefined(); expect(result.length).toBe(1); - expect( - mockApplicationDecisionConditionRepository.findOneOrFail, - ).toBeCalledTimes(1); - expect( - mockApplicationDecisionConditionRepository.findOneOrFail, - ).toBeCalledWith({ + expect(mockNOIDecisionConditionRepository.findOneOrFail).toBeCalledTimes(1); + expect(mockNOIDecisionConditionRepository.findOneOrFail).toBeCalledWith({ where: { uuid: 'uuid' }, relations: { type: true }, }); @@ -123,10 +111,10 @@ describe('ApplicationDecisionConditionService', () => { }); it('should persist entity if persist flag is true', async () => { - mockApplicationDecisionConditionRepository.findOneOrFail.mockResolvedValue( + mockNOIDecisionConditionRepository.findOneOrFail.mockResolvedValue( new NoticeOfIntentDecisionCondition(), ); - mockApplicationDecisionConditionRepository.save.mockResolvedValue( + mockNOIDecisionConditionRepository.save.mockResolvedValue( new NoticeOfIntentDecisionCondition(), ); @@ -135,17 +123,15 @@ describe('ApplicationDecisionConditionService', () => { const result = await service.createOrUpdate(updateDtos, [], [], true); expect(result).toBeDefined(); - expect( - mockApplicationDecisionConditionRepository.findOneOrFail, - ).toBeCalledTimes(0); - expect(mockApplicationDecisionConditionRepository.save).toBeCalledTimes(1); + expect(mockNOIDecisionConditionRepository.findOneOrFail).toBeCalledTimes(0); + expect(mockNOIDecisionConditionRepository.save).toBeCalledTimes(1); }); it('should not persist entity if persist flag is false', async () => { - mockApplicationDecisionConditionRepository.findOneOrFail.mockResolvedValue( + mockNOIDecisionConditionRepository.findOneOrFail.mockResolvedValue( new NoticeOfIntentDecisionCondition(), ); - mockApplicationDecisionConditionRepository.save.mockResolvedValue( + mockNOIDecisionConditionRepository.save.mockResolvedValue( new NoticeOfIntentDecisionCondition(), ); @@ -154,9 +140,7 @@ describe('ApplicationDecisionConditionService', () => { const result = await service.createOrUpdate(updateDtos, [], [], false); expect(result).toBeDefined(); - expect( - mockApplicationDecisionConditionRepository.findOneOrFail, - ).toBeCalledTimes(0); - expect(mockApplicationDecisionConditionRepository.save).toBeCalledTimes(0); + expect(mockNOIDecisionConditionRepository.findOneOrFail).toBeCalledTimes(0); + expect(mockNOIDecisionConditionRepository.save).toBeCalledTimes(0); }); }); diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.controller.spec.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.controller.spec.ts index 336e3a546c..82af45ac3f 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.controller.spec.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.controller.spec.ts @@ -24,7 +24,7 @@ import { NoticeOfIntentDecisionV2Service } from './notice-of-intent-decision-v2. describe('NoticeOfIntentDecisionV2Controller', () => { let controller: NoticeOfIntentDecisionV2Controller; let mockDecisionService: DeepMocked; - let mockApplicationService: DeepMocked; + let mockNoticeOfIntentService: DeepMocked; let mockCodeService: DeepMocked; let mockModificationService: DeepMocked; let mockEmailService: DeepMocked; @@ -34,7 +34,7 @@ describe('NoticeOfIntentDecisionV2Controller', () => { beforeEach(async () => { mockDecisionService = createMock(); - mockApplicationService = createMock(); + mockNoticeOfIntentService = createMock(); mockCodeService = createMock(); mockModificationService = createMock(); mockEmailService = createMock(); @@ -61,7 +61,7 @@ describe('NoticeOfIntentDecisionV2Controller', () => { }, { provide: NoticeOfIntentService, - useValue: mockApplicationService, + useValue: mockNoticeOfIntentService, }, { provide: CodeService, @@ -103,7 +103,7 @@ describe('NoticeOfIntentDecisionV2Controller', () => { expect(controller).toBeDefined(); }); - it('should get all for application', async () => { + it('should get all for notice of intent', async () => { mockDecisionService.getByAppFileNumber.mockResolvedValue([mockDecision]); const result = await controller.getByFileNumber('fake-number'); @@ -129,8 +129,8 @@ describe('NoticeOfIntentDecisionV2Controller', () => { expect(mockDecisionService.delete).toBeCalledWith('fake-uuid'); }); - it('should create the decision if application exists', async () => { - mockApplicationService.getByFileNumber.mockResolvedValue( + it('should create the decision if noi exists', async () => { + mockNoticeOfIntentService.getByFileNumber.mockResolvedValue( mockNoticeOfintent, ); mockDecisionService.create.mockResolvedValue(mockDecision); @@ -158,7 +158,7 @@ describe('NoticeOfIntentDecisionV2Controller', () => { }); it('should update the decision', async () => { - mockApplicationService.getFileNumber.mockResolvedValue('file-number'); + mockNoticeOfIntentService.getFileNumber.mockResolvedValue('file-number'); mockDecisionService.get.mockResolvedValue(new NoticeOfIntentDecision()); mockDecisionService.getByAppFileNumber.mockResolvedValue([ new NoticeOfIntentDecision(), diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.module.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.module.ts index 518dacc971..e3c9f9c127 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.module.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.module.ts @@ -44,6 +44,7 @@ import { NoticeOfIntentModificationService } from './notice-of-intent-modificati NoticeOfIntentSubmissionStatusModule, ], providers: [ + //These are in the same module, so be careful to import the correct one NoticeOfIntentDecisionV1Service, NoticeOfIntentDecisionV2Service, NoticeOfIntentDecisionComponentService, diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1692812627565-noi_decisions_v2.ts b/services/apps/alcs/src/providers/typeorm/migrations/1692812627565-noi_decisions_v2.ts index 960568f5bb..f299e3f309 100644 --- a/services/apps/alcs/src/providers/typeorm/migrations/1692812627565-noi_decisions_v2.ts +++ b/services/apps/alcs/src/providers/typeorm/migrations/1692812627565-noi_decisions_v2.ts @@ -7,21 +7,36 @@ export class noiDecisionsV21692812627565 implements MigrationInterface { await queryRunner.query( `CREATE TABLE "alcs"."notice_of_intent_decision_condition_type" ("audit_deleted_date_at" TIMESTAMP WITH TIME ZONE, "audit_created_at" TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now(), "audit_updated_at" TIMESTAMP WITH TIME ZONE DEFAULT now(), "audit_created_by" character varying NOT NULL, "audit_updated_by" character varying, "label" character varying NOT NULL, "code" text NOT NULL, "description" text NOT NULL, CONSTRAINT "UQ_d42e55b4aef0fdc3c676b32a2a3" UNIQUE ("description"), CONSTRAINT "PK_30a33ede5fb646124dd846719cd" PRIMARY KEY ("code"))`, ); + await queryRunner.query( + `COMMENT ON TABLE "alcs"."notice_of_intent_decision_condition_type" IS 'Decision Condition Types Code Table for Notice of Intents'`, + ); await queryRunner.query( `CREATE TABLE "alcs"."notice_of_intent_decision_condition" ("audit_deleted_date_at" TIMESTAMP WITH TIME ZONE, "audit_created_at" TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now(), "audit_updated_at" TIMESTAMP WITH TIME ZONE DEFAULT now(), "audit_created_by" character varying NOT NULL, "audit_updated_by" character varying, "uuid" uuid NOT NULL DEFAULT gen_random_uuid(), "approval_dependant" boolean, "security_amount" numeric(12,2), "administrative_fee" numeric(12,2), "description" text, "completion_date" TIMESTAMP WITH TIME ZONE, "superseded_date" TIMESTAMP WITH TIME ZONE, "type_code" text, "decision_uuid" uuid NOT NULL, CONSTRAINT "PK_51e53b1c3920b8957bfe368c46a" PRIMARY KEY ("uuid")); COMMENT ON COLUMN "alcs"."notice_of_intent_decision_condition"."completion_date" IS 'Condition Completion date'; COMMENT ON COLUMN "alcs"."notice_of_intent_decision_condition"."superseded_date" IS 'Condition Superseded date'`, ); + await queryRunner.query( + `COMMENT ON TABLE "alcs"."notice_of_intent_decision_condition" IS 'Decision Conditions for Notice of Intents'`, + ); await queryRunner.query( `CREATE TABLE "alcs"."notice_of_intent_decision_component_type" ("audit_deleted_date_at" TIMESTAMP WITH TIME ZONE, "audit_created_at" TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now(), "audit_updated_at" TIMESTAMP WITH TIME ZONE DEFAULT now(), "audit_created_by" character varying NOT NULL, "audit_updated_by" character varying, "label" character varying NOT NULL, "code" text NOT NULL, "description" text NOT NULL, CONSTRAINT "UQ_6c4783f61a9a7fa784deac579ff" UNIQUE ("description"), CONSTRAINT "PK_67c2c14d96bec32f1d9c8e2e9b0" PRIMARY KEY ("code"))`, ); + await queryRunner.query( + `COMMENT ON TABLE "alcs"."notice_of_intent_decision_component_type" IS 'Decision Component Types Code Table for Notice of Intents'`, + ); await queryRunner.query( `CREATE TABLE "alcs"."notice_of_intent_decision_component" ("audit_deleted_date_at" TIMESTAMP WITH TIME ZONE, "audit_created_at" TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now(), "audit_updated_at" TIMESTAMP WITH TIME ZONE DEFAULT now(), "audit_created_by" character varying NOT NULL, "audit_updated_by" character varying, "uuid" uuid NOT NULL DEFAULT gen_random_uuid(), "alr_area" numeric(12,2), "ag_cap" text, "ag_cap_source" text, "ag_cap_map" text, "ag_cap_consultant" text, "end_date" TIMESTAMP WITH TIME ZONE, "expiry_date" TIMESTAMP WITH TIME ZONE, "soil_fill_type_to_place" text, "soil_to_place_volume" numeric(12,2), "soil_to_place_area" numeric(12,2), "soil_to_place_maximum_depth" numeric(12,2), "soil_to_place_average_depth" numeric(12,2), "soil_type_removed" text, "soil_to_remove_volume" numeric(12,2), "soil_to_remove_area" numeric(12,2), "soil_to_remove_maximum_depth" numeric(12,2), "soil_to_remove_average_depth" numeric(12,2), "notice_of_intent_decision_component_type_code" text NOT NULL, "notice_of_intent_decision_uuid" uuid NOT NULL, CONSTRAINT "PK_cd1ed330456b906001d6b6288f6" PRIMARY KEY ("uuid")); COMMENT ON COLUMN "alcs"."notice_of_intent_decision_component"."alr_area" IS 'Area in hectares of ALR impacted by the decision component'; COMMENT ON COLUMN "alcs"."notice_of_intent_decision_component"."ag_cap" IS 'Agricultural cap classification'; COMMENT ON COLUMN "alcs"."notice_of_intent_decision_component"."ag_cap_source" IS 'Agricultural capability classification system used'; COMMENT ON COLUMN "alcs"."notice_of_intent_decision_component"."ag_cap_map" IS 'Agricultural capability map sheet reference'; COMMENT ON COLUMN "alcs"."notice_of_intent_decision_component"."ag_cap_consultant" IS 'Consultant who determined the agricultural capability'; COMMENT ON COLUMN "alcs"."notice_of_intent_decision_component"."end_date" IS 'Components\` end date'; COMMENT ON COLUMN "alcs"."notice_of_intent_decision_component"."expiry_date" IS 'Components\` expiry date'`, ); + await queryRunner.query( + `COMMENT ON TABLE "alcs"."notice_of_intent_decision_component" IS 'Decision Components for Notice of Intents'`, + ); await queryRunner.query( `CREATE UNIQUE INDEX "IDX_4014f28095a987bb6bc515aa2b" ON "alcs"."notice_of_intent_decision_component" ("notice_of_intent_decision_component_type_code", "notice_of_intent_decision_uuid") WHERE "audit_deleted_date_at" is null`, ); await queryRunner.query( `CREATE TABLE "alcs"."notice_of_intent_decision_condition_component" ("notice_of_intent_decision_condition_uuid" uuid NOT NULL, "notice_of_intent_decision_component_uuid" uuid NOT NULL, CONSTRAINT "PK_e91078d3e07b0f292333ff9d5d6" PRIMARY KEY ("notice_of_intent_decision_condition_uuid", "notice_of_intent_decision_component_uuid"))`, ); + await queryRunner.query( + `COMMENT ON TABLE "alcs"."notice_of_intent_decision_condition_component" IS 'Tracks Conditions links Components'`, + ); await queryRunner.query( `CREATE INDEX "IDX_4f1ecd62bb990e102c6af22a2e" ON "alcs"."notice_of_intent_decision_condition_component" ("notice_of_intent_decision_condition_uuid") `, ); From df0e93dff5bae9666b76866187ccbecbe6bc96d9 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Thu, 24 Aug 2023 09:52:47 -0700 Subject: [PATCH 297/954] Add enum for outcomes with components --- .../decision-input/decision-input-v2.component.ts | 5 +++-- .../decision/decision-v2/decision-v2.component.html | 4 ++-- .../decision/decision-v2/decision-v2.component.ts | 3 +++ 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-input-v2.component.ts b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-input-v2.component.ts index 192e631a31..cb5027a952 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-input-v2.component.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-input-v2.component.ts @@ -21,6 +21,7 @@ import { NoticeOfIntentModificationService } from '../../../../../services/notic import { ToastService } from '../../../../../services/toast/toast.service'; import { formatDateForApi } from '../../../../../shared/utils/api-date-formatter'; import { parseBooleanToString, parseStringToBoolean } from '../../../../../shared/utils/boolean-helper'; +import { OUTCOMES_WITH_COMPONENTS } from '../decision-v2.component'; import { ReleaseDialogComponent } from '../release-dialog/release-dialog.component'; import { DecisionComponentsComponent } from './decision-components/decision-components.component'; import { DecisionConditionsComponent } from './decision-conditions/decision-conditions.component'; @@ -250,7 +251,7 @@ export class DecisionInputV2Component implements OnInit, OnDestroy { this.requireComponents = ['APPR', 'APPA'].includes(existingDecision.outcome.code); - if (['APPR', 'APPA', 'RESC'].includes(existingDecision.outcome.code)) { + if (OUTCOMES_WITH_COMPONENTS.includes(existingDecision.outcome.code)) { this.showComponents = true; } else { this.showComponents = false; @@ -434,7 +435,7 @@ export class DecisionInputV2Component implements OnInit, OnDestroy { } onChangeDecisionOutcome(selectedOutcome: NoticeOfIntentDecisionOutcomeCodeDto) { - if (['APPR', 'APPA', 'RESC'].includes(selectedOutcome.code)) { + if (OUTCOMES_WITH_COMPONENTS.includes(selectedOutcome.code)) { if (this.form.controls.isSubjectToConditions.disabled) { this.showComponents = true; this.form.controls.isSubjectToConditions.enable(); diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-v2.component.html b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-v2.component.html index 7dbb975abb..481d7d9ba9 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-v2.component.html +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-v2.component.html @@ -129,7 +129,7 @@

Documents

- +

Components

{{ component.noticeOfIntentDecisionComponentType?.label }}
- +

Conditions

diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-v2.component.ts b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-v2.component.ts index f275aae97c..190c48fbd0 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-v2.component.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-v2.component.ts @@ -26,6 +26,8 @@ type LoadingDecision = NoticeOfIntentDecisionDto & { loading: boolean; }; +export const OUTCOMES_WITH_COMPONENTS = ['APPR', 'APPA', 'RESC']; + @Component({ selector: 'app-noi-decision-v2', templateUrl: './decision-v2.component.html', @@ -42,6 +44,7 @@ export class DecisionV2Component implements OnInit, OnDestroy { decisions: LoadingDecision[] = []; outcomes: NoticeOfIntentDecisionOutcomeCodeDto[] = []; isPaused = true; + OUTCOMES_WITH_COMPONENTS = OUTCOMES_WITH_COMPONENTS; modificationLabel = MODIFICATION_TYPE_LABEL; noticeOfIntent: NoticeOfIntentDto | undefined; From 06499130732e9a77ebda33a8c31a23c5dcce2f4c Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Thu, 24 Aug 2023 10:31:27 -0700 Subject: [PATCH 298/954] Decision Fixes * Update styling for POFO/PFRS/ROSO Input Components to match new designs * Update document table to have upload button on the right like other sections --- .../decision-documents.component.html | 27 +- .../pfrs-input/pfrs-input.component.html | 2 +- .../pfrs-input/pfrs-input.component.scss | 15 ++ .../pofo-input/pofo-input.component.html | 124 ++++----- .../roso-input/roso-input.component.html | 124 ++++----- .../decision-input-v2.component.html | 1 - .../decision-input-v2.component.scss | 25 +- .../decision-documents.component.html | 27 +- .../pfrs-input/pfrs-input.component.html | 250 +++++++++--------- .../pfrs-input/pfrs-input.component.scss | 15 ++ .../pofo-input/pofo-input.component.html | 124 ++++----- .../roso-input/roso-input.component.html | 125 ++++----- .../decision-input-v2.component.html | 1 - .../decision-input-v2.component.scss | 24 +- 14 files changed, 397 insertions(+), 487 deletions(-) diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-documents/decision-documents.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-documents/decision-documents.component.html index cb3638941a..351641d7a0 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-documents/decision-documents.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-documents/decision-documents.component.html @@ -1,15 +1,20 @@
- - +
+

Documents

+
+ + +
+
diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/pfrs-input/pfrs-input.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/pfrs-input/pfrs-input.component.html index 5469971cd0..0235ef5514 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/pfrs-input/pfrs-input.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/pfrs-input/pfrs-input.component.html @@ -50,7 +50,7 @@
-
+
diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/pfrs-input/pfrs-input.component.scss b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/pfrs-input/pfrs-input.component.scss index e69de29bb2..d9a9d9af0b 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/pfrs-input/pfrs-input.component.scss +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/pfrs-input/pfrs-input.component.scss @@ -0,0 +1,15 @@ +.soil-table { + display: grid; + grid-template-columns: calc(20% - 10px) 40% 40%; + grid-row-gap: 28px; + padding: 10px; + column-gap: 10px; + + .full-width { + width: 100%; + } + + label { + font-weight: 700; + } +} diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/pofo-input/pofo-input.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/pofo-input/pofo-input.component.html index 7f4a43207b..5f0138eda5 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/pofo-input/pofo-input.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/pofo-input/pofo-input.component.html @@ -38,77 +38,57 @@ > -
-
-
-
- -
-
- -
-
- - - m3 - -
-
- -
Note: 0.01 ha is 100m2
-
-
- - - ha - -
-
- -
-
- - - m - -
-
- -
-
- - - m - -
-
+
+ + + m3 + + + + + ha + + + + + m + + + + + m +
diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/roso-input/roso-input.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/roso-input/roso-input.component.html index f175fb8b59..12da03f807 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/roso-input/roso-input.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/roso-input/roso-input.component.html @@ -38,77 +38,57 @@ > -
-
-
-
- -
-
- -
-
- - - m3 - -
-
- -
Note: 0.01 ha is 100m2
-
-
- - - ha - -
-
- -
-
- - - m - -
-
- -
-
- - - m - -
-
+
+ + + m3 + + + + + ha + + + + + m + + + + + m +
diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.html index 972f1f2ee3..e6be6ba00f 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.html @@ -211,7 +211,6 @@

Resolution

-

Documents

- - +
+

Documents

+
+ + +
+
diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/pfrs-input/pfrs-input.component.html b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/pfrs-input/pfrs-input.component.html index 5469971cd0..fa2213b901 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/pfrs-input/pfrs-input.component.html +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/pfrs-input/pfrs-input.component.html @@ -49,132 +49,130 @@ > -
-
-
-
- -
-
- -
-
- -
-
- - - m3 - -
-
- - - m3 - -
-
- -
Note: 0.01 ha is 100m2
-
-
- - - ha - -
-
- - - ha - -
-
- -
-
- - - m - -
-
- - - m - -
-
- -
-
- - - m - -
-
- - - m - -
+
+
+
+ +
+
+ +
+
+ +
+
+ + + m3 + +
+
+ + + m3 + +
+
+ +
Note: 0.01 ha is 100m2
+
+
+ + + ha + +
+
+ + + ha + +
+
+ +
+
+ + + m + +
+
+ + + m + +
+
+ +
+
+ + + m + +
+
+ + + m +
diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/pfrs-input/pfrs-input.component.scss b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/pfrs-input/pfrs-input.component.scss index e69de29bb2..d9a9d9af0b 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/pfrs-input/pfrs-input.component.scss +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/pfrs-input/pfrs-input.component.scss @@ -0,0 +1,15 @@ +.soil-table { + display: grid; + grid-template-columns: calc(20% - 10px) 40% 40%; + grid-row-gap: 28px; + padding: 10px; + column-gap: 10px; + + .full-width { + width: 100%; + } + + label { + font-weight: 700; + } +} diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/pofo-input/pofo-input.component.html b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/pofo-input/pofo-input.component.html index 7f4a43207b..5f0138eda5 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/pofo-input/pofo-input.component.html +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/pofo-input/pofo-input.component.html @@ -38,77 +38,57 @@ > -
-
-
-
- -
-
- -
-
- - - m3 - -
-
- -
Note: 0.01 ha is 100m2
-
-
- - - ha - -
-
- -
-
- - - m - -
-
- -
-
- - - m - -
-
+
+ + + m3 + + + + + ha + + + + + m + + + + + m +
diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/roso-input/roso-input.component.html b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/roso-input/roso-input.component.html index f175fb8b59..db43104f4f 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/roso-input/roso-input.component.html +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/roso-input/roso-input.component.html @@ -31,84 +31,63 @@ -
-
-
-
- -
-
- -
-
- - - m3 - -
-
- -
Note: 0.01 ha is 100m2
-
-
- - - ha - -
-
- -
-
- - - m - -
-
- -
-
- - - m - -
-
+
+ + + m3 + + + + + ha + + + + + m + + + + + m +
diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-input-v2.component.html b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-input-v2.component.html index 17a889722c..06250cfd89 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-input-v2.component.html +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-input-v2.component.html @@ -166,7 +166,6 @@

Resolution

-

Documents

Date: Thu, 24 Aug 2023 10:37:19 -0700 Subject: [PATCH 299/954] Send NOI Submission and Cancelled Emails (#908) * Create ParentType enum and update email template to set type label * Add SUBM noi template and generalize type label * Send email after noi portal submission - Resolve circular module import errors with forwardRef - Add new noi submission service method to getStatus for email template - Add noi method to email service and refactor * Send gov separate email for noi submission * Add noi cancelled template * Send noi cancelled status email in portal * Add noi decision released template * Rename email service application methods * Refactor and fix unit tests * Add new email unit test and wip resolving submission test * Clean up and pass all unit tests * Update enum from MR feedback --- ...cation-decision-meeting.controller.spec.ts | 13 +- ...application-decision-meeting.controller.ts | 6 +- .../application-decision-v1.module.ts | 2 +- .../application-decision-v2.module.ts | 2 +- ...application-decision-v2.controller.spec.ts | 17 +-- .../application-decision-v2.controller.ts | 10 +- .../application.controller.spec.ts | 13 +- .../application/application.controller.ts | 10 +- .../apps/alcs/src/alcs/board/board.module.ts | 2 +- .../card/card-subtask/card-subtask.dto.ts | 16 ++- .../alcs/src/alcs/home/home.controller.ts | 15 +- .../notice-of-intent-decision.module.ts | 2 +- ...ation-submission-review.controller.spec.ts | 46 +++--- ...pplication-submission-review.controller.ts | 20 ++- .../application-submission.controller.spec.ts | 53 ++++--- .../application-submission.controller.ts | 24 ++-- ...ce-of-intent-submission.controller.spec.ts | 87 +++++++++++- .../notice-of-intent-submission.controller.ts | 51 +++++++ .../notice-of-intent-submission.module.ts | 4 +- ...otice-of-intent-submission.service.spec.ts | 9 ++ .../notice-of-intent-submission.service.ts | 11 ++ .../alcs/src/providers/email/email.module.ts | 4 + .../src/providers/email/email.service.spec.ts | 67 ++++++++- .../alcs/src/providers/email/email.service.ts | 133 ++++++++++++++++-- .../application.template.ts} | 12 +- services/templates/emails/cancelled/index.ts | 2 + .../cancelled/notice-of-intent.template.ts | 44 ++++++ .../application.template.ts} | 8 +- .../emails/decision-released/index.ts | 2 + .../notice-of-intent.template.ts | 54 +++++++ .../emails/partials/header.template.ts | 2 +- .../emails/refused-to-forward.template.ts | 2 +- .../emails/returned-as-incomplete.template.ts | 2 +- ...nt.template.ts => application.template.ts} | 2 +- .../emails/submitted-to-alc/index.ts | 4 +- .../noi-applicant.template.ts | 105 ++++++++++++++ .../noi-government.template.ts | 44 ++++++ .../tur-applicant.template.ts | 2 +- .../tur-government.template.ts | 2 +- .../submitted-to-lfng/applicant.template.ts | 2 +- .../submitted-to-lfng/government.template.ts | 2 +- .../emails/under-review-by-lfng.template.ts | 2 +- .../templates/emails/wrong-lfng.template.ts | 2 +- 43 files changed, 767 insertions(+), 145 deletions(-) rename services/templates/emails/{cancelled.template.ts => cancelled/application.template.ts} (67%) create mode 100644 services/templates/emails/cancelled/index.ts create mode 100644 services/templates/emails/cancelled/notice-of-intent.template.ts rename services/templates/emails/{decision-released.template.ts => decision-released/application.template.ts} (88%) create mode 100644 services/templates/emails/decision-released/index.ts create mode 100644 services/templates/emails/decision-released/notice-of-intent.template.ts rename services/templates/emails/submitted-to-alc/{applicant.template.ts => application.template.ts} (99%) create mode 100644 services/templates/emails/submitted-to-alc/noi-applicant.template.ts create mode 100644 services/templates/emails/submitted-to-alc/noi-government.template.ts diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v1/application-decision-meeting/application-decision-meeting.controller.spec.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v1/application-decision-meeting/application-decision-meeting.controller.spec.ts index 20d890d6bb..3f02420d41 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v1/application-decision-meeting/application-decision-meeting.controller.spec.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v1/application-decision-meeting/application-decision-meeting.controller.spec.ts @@ -151,12 +151,12 @@ describe('ApplicationDecisionMeetingController', () => { mockMeetingService.getByAppFileNumber.mockResolvedValue([ new ApplicationDecisionMeeting(), ]); - mockEmailService.getSubmissionStatusEmailData.mockResolvedValue({ + mockEmailService.getApplicationEmailData.mockResolvedValue({ applicationSubmission: mockSubmission, primaryContact: mockOwner, submissionGovernment: mockGovernment, }); - mockEmailService.sendStatusEmail.mockResolvedValue(); + mockEmailService.sendApplicationStatusEmail.mockResolvedValue(); const meetingToUpdate = { date: new Date(2022, 2, 2, 2, 2, 2, 2).valueOf(), @@ -165,12 +165,13 @@ describe('ApplicationDecisionMeetingController', () => { await controller.create(meetingToUpdate); - expect(mockEmailService.sendStatusEmail).toBeCalledTimes(1); - expect(mockEmailService.sendStatusEmail).toBeCalledWith({ + expect(mockEmailService.sendApplicationStatusEmail).toBeCalledTimes(1); + expect(mockEmailService.sendApplicationStatusEmail).toBeCalledWith({ generateStatusHtml: generateREVAHtml, status: SUBMISSION_STATUS.IN_REVIEW_BY_ALC, applicationSubmission: mockSubmission, government: mockGovernment, + parentType: 'application', primaryContact: mockOwner, ccGovernment: true, }); @@ -182,7 +183,7 @@ describe('ApplicationDecisionMeetingController', () => { new ApplicationDecisionMeeting(), new ApplicationDecisionMeeting(), ]); - mockEmailService.sendStatusEmail.mockResolvedValue(); + mockEmailService.sendApplicationStatusEmail.mockResolvedValue(); const meetingToUpdate = { date: new Date(2022, 2, 2, 2, 2, 2, 2).valueOf(), @@ -191,7 +192,7 @@ describe('ApplicationDecisionMeetingController', () => { await controller.create(meetingToUpdate); - expect(mockEmailService.sendStatusEmail).toBeCalledTimes(0); + expect(mockEmailService.sendApplicationStatusEmail).toBeCalledTimes(0); }); it('should update meeting', async () => { diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v1/application-decision-meeting/application-decision-meeting.controller.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v1/application-decision-meeting/application-decision-meeting.controller.ts index 6c1a81b697..9cebc2dfe6 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v1/application-decision-meeting/application-decision-meeting.controller.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v1/application-decision-meeting/application-decision-meeting.controller.ts @@ -33,6 +33,7 @@ import { formatIncomingDate } from '../../../../utils/incoming-date.formatter'; import { EmailService } from '../../../../providers/email/email.service'; import { generateREVAHtml } from '../../../../../../../templates/emails/under-review-by-alc.template'; import { SUBMISSION_STATUS } from '../../../application/application-submission-status/submission-status.dto'; +import { PARENT_TYPE } from '../../../card/card-subtask/card-subtask.dto'; @ApiOAuth2(config.get('KEYCLOAK.SCOPES')) @Controller('application-decision-meeting') @@ -117,16 +118,17 @@ export class ApplicationDecisionMeetingController { // Send status email for first review discussion if (meetings.length === 1) { const { applicationSubmission, primaryContact, submissionGovernment } = - await this.emailService.getSubmissionStatusEmailData( + await this.emailService.getApplicationEmailData( meeting.applicationFileNumber, ); if (primaryContact) { - await this.emailService.sendStatusEmail({ + await this.emailService.sendApplicationStatusEmail({ generateStatusHtml: generateREVAHtml, status: SUBMISSION_STATUS.IN_REVIEW_BY_ALC, applicationSubmission, government: submissionGovernment, + parentType: PARENT_TYPE.APPLICATION, primaryContact, ccGovernment: true, }); diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v1/application-decision-v1.module.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v1/application-decision-v1.module.ts index b4156af08f..19088783fa 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v1/application-decision-v1.module.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v1/application-decision-v1.module.ts @@ -52,7 +52,7 @@ import { ApplicationDecisionV1Service } from './application-decision/application ApplicationSubmissionStatusType, ]), forwardRef(() => BoardModule), - ApplicationModule, + forwardRef(() => ApplicationModule), CardModule, DocumentModule, ApplicationSubmissionStatusModule, diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision-v2.module.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision-v2.module.ts index 80b657f0f4..3fccff1009 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision-v2.module.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision-v2.module.ts @@ -73,7 +73,7 @@ import { LinkedResolutionOutcomeType } from './application-decision/linked-resol ApplicationDecisionConditionComponentPlanNumber, ]), forwardRef(() => BoardModule), - ApplicationModule, + forwardRef(() => ApplicationModule), CardModule, DocumentModule, ApplicationDecisionV2Module, diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.controller.spec.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.controller.spec.ts index 321b5708b4..be4f628954 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.controller.spec.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.controller.spec.ts @@ -26,7 +26,7 @@ import { EmailService } from '../../../../providers/email/email.service'; import { ApplicationSubmission } from '../../../../portal/application-submission/application-submission.entity'; import { LocalGovernment } from '../../../local-government/local-government.entity'; import { ApplicationOwner } from '../../../../portal/application-submission/application-owner/application-owner.entity'; -import { generateALCDHtml } from '../../../../../../../templates/emails/decision-released.template'; +import { generateALCDApplicationHtml } from '../../../../../../../templates/emails/decision-released'; import { SUBMISSION_STATUS } from '../../../application/application-submission-status/submission-status.dto'; import { ApplicationDecision } from '../../application-decision.entity'; @@ -283,12 +283,12 @@ describe('ApplicationDecisionV2Controller', () => { new ApplicationDecision({ wasReleased: false }), ); mockDecisionService.update.mockResolvedValue(mockDecision); - mockEmailService.getSubmissionStatusEmailData.mockResolvedValue({ + mockEmailService.getApplicationEmailData.mockResolvedValue({ applicationSubmission: mockApplicationSubmission, primaryContact: mockOwner, submissionGovernment: mockGovernment, }); - mockEmailService.sendStatusEmail.mockResolvedValue(); + mockEmailService.sendApplicationStatusEmail.mockResolvedValue(); const updates = { outcome: 'New Outcome', @@ -310,12 +310,13 @@ describe('ApplicationDecisionV2Controller', () => { undefined, ); - expect(mockEmailService.sendStatusEmail).toBeCalledTimes(1); - expect(mockEmailService.sendStatusEmail).toBeCalledWith({ - generateStatusHtml: generateALCDHtml, + expect(mockEmailService.sendApplicationStatusEmail).toBeCalledTimes(1); + expect(mockEmailService.sendApplicationStatusEmail).toBeCalledWith({ + generateStatusHtml: generateALCDApplicationHtml, status: SUBMISSION_STATUS.ALC_DECISION, applicationSubmission: mockApplicationSubmission, government: mockGovernment, + parentType: 'application', primaryContact: mockOwner, ccGovernment: true, decisionReleaseMaskedDate: new Date().toLocaleDateString('en-CA', { @@ -332,7 +333,7 @@ describe('ApplicationDecisionV2Controller', () => { new ApplicationDecision({ wasReleased: true }), ); mockDecisionService.update.mockResolvedValue(mockDecision); - mockEmailService.sendStatusEmail.mockResolvedValue(); + mockEmailService.sendApplicationStatusEmail.mockResolvedValue(); const updates = { outcome: 'New Outcome', @@ -353,6 +354,6 @@ describe('ApplicationDecisionV2Controller', () => { undefined, undefined, ); - expect(mockEmailService.sendStatusEmail).toBeCalledTimes(0); + expect(mockEmailService.sendApplicationStatusEmail).toBeCalledTimes(0); }); }); diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.controller.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.controller.ts index db5695690c..b8aca8ebaa 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.controller.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.controller.ts @@ -43,7 +43,8 @@ import { ApplicationDecisionComponentTypeDto } from './component/application-dec import { LinkedResolutionOutcomeType } from './linked-resolution-outcome-type.entity'; import { EmailService } from '../../../../providers/email/email.service'; import { SUBMISSION_STATUS } from '../../../application/application-submission-status/submission-status.dto'; -import { generateALCDHtml } from '../../../../../../../templates/emails/decision-released.template'; +import { generateALCDApplicationHtml } from '../../../../../../../templates/emails/decision-released'; +import { PARENT_TYPE } from '../../../card/card-subtask/card-subtask.dto'; @ApiOAuth2(config.get('KEYCLOAK.SCOPES')) @Controller('application-decision') @@ -293,7 +294,7 @@ export class ApplicationDecisionV2Controller { ); const { applicationSubmission, primaryContact, submissionGovernment } = - await this.emailService.getSubmissionStatusEmailData(fileNumber); + await this.emailService.getApplicationEmailData(fileNumber); const date = decision.date ? new Date(decision.date) : new Date(); @@ -305,11 +306,12 @@ export class ApplicationDecisionV2Controller { }; if (primaryContact) { - await this.emailService.sendStatusEmail({ - generateStatusHtml: generateALCDHtml, + await this.emailService.sendApplicationStatusEmail({ + generateStatusHtml: generateALCDApplicationHtml, status: SUBMISSION_STATUS.ALC_DECISION, applicationSubmission, government: submissionGovernment, + parentType: PARENT_TYPE.APPLICATION, primaryContact, ccGovernment: true, decisionReleaseMaskedDate: date.toLocaleDateString('en-CA', options), diff --git a/services/apps/alcs/src/alcs/application/application.controller.spec.ts b/services/apps/alcs/src/alcs/application/application.controller.spec.ts index 091b5fcfea..f091fd4ec8 100644 --- a/services/apps/alcs/src/alcs/application/application.controller.spec.ts +++ b/services/apps/alcs/src/alcs/application/application.controller.spec.ts @@ -25,7 +25,7 @@ import { EmailService } from '../../providers/email/email.service'; import { ApplicationSubmission } from '../../portal/application-submission/application-submission.entity'; import { ApplicationOwner } from '../../portal/application-submission/application-owner/application-owner.entity'; import { LocalGovernment } from '../local-government/local-government.entity'; -import { generateCANCHtml } from '../../../../../templates/emails/cancelled.template'; +import { generateCANCApplicationHtml } from '../../../../../templates/emails/cancelled'; import { SUBMISSION_STATUS } from './application-submission-status/submission-status.dto'; describe('ApplicationController', () => { @@ -391,23 +391,24 @@ describe('ApplicationController', () => { localGovernmentUuid, }); - emailService.getSubmissionStatusEmailData.mockResolvedValue({ + emailService.getApplicationEmailData.mockResolvedValue({ applicationSubmission: mockApplicationSubmission, primaryContact: mockOwner, submissionGovernment: mockGovernment, }); - emailService.sendStatusEmail.mockResolvedValue(); + emailService.sendApplicationStatusEmail.mockResolvedValue(); applicationService.cancel.mockResolvedValue(); await controller.cancel(mockApplicationEntity.uuid); expect(applicationService.cancel).toBeCalledTimes(1); - expect(emailService.sendStatusEmail).toBeCalledTimes(1); - expect(emailService.sendStatusEmail).toBeCalledWith({ - generateStatusHtml: generateCANCHtml, + expect(emailService.sendApplicationStatusEmail).toBeCalledTimes(1); + expect(emailService.sendApplicationStatusEmail).toBeCalledWith({ + generateStatusHtml: generateCANCApplicationHtml, status: SUBMISSION_STATUS.CANCELLED, applicationSubmission: mockApplicationSubmission, government: mockGovernment, + parentType: 'application', primaryContact: mockOwner, ccGovernment: true, }); diff --git a/services/apps/alcs/src/alcs/application/application.controller.ts b/services/apps/alcs/src/alcs/application/application.controller.ts index 02fb5ad4f4..c3a11ee20e 100644 --- a/services/apps/alcs/src/alcs/application/application.controller.ts +++ b/services/apps/alcs/src/alcs/application/application.controller.ts @@ -30,8 +30,9 @@ import { } from './application.dto'; import { ApplicationService } from './application.service'; import { EmailService } from '../../providers/email/email.service'; -import { generateCANCHtml } from '../../../../../templates/emails/cancelled.template'; +import { generateCANCApplicationHtml } from '../../../../../templates/emails/cancelled'; import { SUBMISSION_STATUS } from '../application/application-submission-status/submission-status.dto'; +import { PARENT_TYPE } from '../card/card-subtask/card-subtask.dto'; @ApiOAuth2(config.get('KEYCLOAK.SCOPES')) @Controller('application') @@ -127,14 +128,15 @@ export class ApplicationController { @UserRoles(...ROLES_ALLOWED_APPLICATIONS) async cancel(@Param('fileNumber') fileNumber): Promise { const { applicationSubmission, primaryContact, submissionGovernment } = - await this.emailService.getSubmissionStatusEmailData(fileNumber); + await this.emailService.getApplicationEmailData(fileNumber); if (primaryContact) { - await this.emailService.sendStatusEmail({ - generateStatusHtml: generateCANCHtml, + await this.emailService.sendApplicationStatusEmail({ + generateStatusHtml: generateCANCApplicationHtml, status: SUBMISSION_STATUS.CANCELLED, applicationSubmission, government: submissionGovernment, + parentType: PARENT_TYPE.APPLICATION, primaryContact, ccGovernment: !!submissionGovernment, }); diff --git a/services/apps/alcs/src/alcs/board/board.module.ts b/services/apps/alcs/src/alcs/board/board.module.ts index 3856999d95..7f5362b6f2 100644 --- a/services/apps/alcs/src/alcs/board/board.module.ts +++ b/services/apps/alcs/src/alcs/board/board.module.ts @@ -16,7 +16,7 @@ import { BoardService } from './board.service'; @Module({ imports: [ TypeOrmModule.forFeature([Board, BoardStatus]), - ApplicationModule, + forwardRef(() => ApplicationModule), CardModule, forwardRef(() => ApplicationDecisionModule), PlanningReviewModule, diff --git a/services/apps/alcs/src/alcs/card/card-subtask/card-subtask.dto.ts b/services/apps/alcs/src/alcs/card/card-subtask/card-subtask.dto.ts index 6ddf1c218b..a8464d5739 100644 --- a/services/apps/alcs/src/alcs/card/card-subtask/card-subtask.dto.ts +++ b/services/apps/alcs/src/alcs/card/card-subtask/card-subtask.dto.ts @@ -4,6 +4,14 @@ import { ApplicationTypeDto } from '../../code/application-code/application-type import { AssigneeDto } from '../../../user/user.dto'; import { CardDto } from '../card.dto'; +export enum PARENT_TYPE { + APPLICATION = 'application', + RECONSIDERATION = 'reconsideration', + COVENANT = 'covenant', + MODIFICATION = 'modification', + PLANNING_REVIEW = 'planning-review', + NOTICE_OF_INTENT = 'notice-of-intent', +} export class UpdateCardSubtaskDto { @AutoMap() @IsUUID() @@ -50,13 +58,7 @@ export class HomepageSubtaskDTO extends CardSubtaskDto { card: CardDto; title: string; appType?: ApplicationTypeDto; - parentType: - | 'application' - | 'reconsideration' - | 'covenant' - | 'modification' - | 'planning-review' - | 'notice-of-intent'; + parentType: PARENT_TYPE; activeDays?: number; paused: boolean; } diff --git a/services/apps/alcs/src/alcs/home/home.controller.ts b/services/apps/alcs/src/alcs/home/home.controller.ts index aaffa1b0b4..d694c28427 100644 --- a/services/apps/alcs/src/alcs/home/home.controller.ts +++ b/services/apps/alcs/src/alcs/home/home.controller.ts @@ -23,6 +23,7 @@ import { CARD_STATUS } from '../card/card-status/card-status.entity'; import { CARD_SUBTASK_TYPE, HomepageSubtaskDTO, + PARENT_TYPE, } from '../card/card-subtask/card-subtask.dto'; import { CardDto } from '../card/card.dto'; import { Card } from '../card/card.entity'; @@ -219,7 +220,7 @@ export class HomeController { paused: false, title: `${recon.application.fileNumber} (${recon.application.applicant})`, appType: recon.application.type, - parentType: 'reconsideration', + parentType: PARENT_TYPE.RECONSIDERATION, }); } } @@ -251,7 +252,7 @@ export class HomeController { paused: appPausedMap.get(application.uuid) || false, title: `${application.fileNumber} (${application.applicant})`, appType: application.type, - parentType: 'application', + parentType: PARENT_TYPE.APPLICATION, }); } } @@ -271,7 +272,7 @@ export class HomeController { completedAt: subtask.completedAt?.getTime(), paused: false, title: `${planningReview.fileNumber} (${planningReview.type})`, - parentType: 'planning-review', + parentType: PARENT_TYPE.PLANNING_REVIEW, }); } } @@ -291,7 +292,7 @@ export class HomeController { completedAt: subtask.completedAt?.getTime(), paused: false, title: `${covenant.fileNumber} (${covenant.applicant})`, - parentType: 'covenant', + parentType: PARENT_TYPE.COVENANT, }); } } @@ -312,7 +313,7 @@ export class HomeController { completedAt: subtask.completedAt?.getTime(), paused: false, title: `${noticeOfIntent.fileNumber} (${noticeOfIntent.applicant})`, - parentType: 'notice-of-intent', + parentType: PARENT_TYPE.NOTICE_OF_INTENT, }); } } @@ -337,7 +338,7 @@ export class HomeController { paused: false, title: `${modification.application.fileNumber} (${modification.application.applicant})`, appType: modification.application.type, - parentType: 'modification', + parentType: PARENT_TYPE.MODIFICATION, }); } } @@ -362,7 +363,7 @@ export class HomeController { completedAt: subtask.completedAt?.getTime(), paused: false, title: `${modification.noticeOfIntent.fileNumber} (${modification.noticeOfIntent.applicant})`, - parentType: 'modification', + parentType: PARENT_TYPE.MODIFICATION, }); } } diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.module.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.module.ts index e3c9f9c127..e1cb3f7c86 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.module.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.module.ts @@ -40,7 +40,7 @@ import { NoticeOfIntentModificationService } from './notice-of-intent-modificati forwardRef(() => BoardModule), CardModule, DocumentModule, - NoticeOfIntentModule, + forwardRef(() => NoticeOfIntentModule), NoticeOfIntentSubmissionStatusModule, ], providers: [ diff --git a/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.spec.ts b/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.spec.ts index 8e3bfd8998..3feedf7fec 100644 --- a/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.spec.ts +++ b/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.spec.ts @@ -33,7 +33,7 @@ import { ApplicationSubmissionReviewController } from './application-submission- import { ApplicationSubmissionReviewDto } from './application-submission-review.dto'; import { ApplicationSubmissionReview } from './application-submission-review.entity'; import { ApplicationSubmissionReviewService } from './application-submission-review.service'; -import { generateSUBMApplicantHtml } from '../../../../../templates/emails/submitted-to-alc'; +import { generateSUBMApplicationHtml } from '../../../../../templates/emails/submitted-to-alc'; import { generateRFFGHtml } from '../../../../../templates/emails/refused-to-forward.template'; import { generateINCMHtml } from '../../../../../templates/emails/returned-as-incomplete.template'; import { generateWRNGHtml } from '../../../../../templates/emails/wrong-lfng.template'; @@ -217,7 +217,7 @@ describe('ApplicationSubmissionReviewController', () => { it('should send an email through the service when creating with a valid primary contact', async () => { mockLGService.getByGuid.mockResolvedValue(mockLG); mockAppReviewService.startReview.mockResolvedValue(applicationReview); - mockEmailService.sendStatusEmail.mockResolvedValue(); + mockEmailService.sendApplicationStatusEmail.mockResolvedValue(); const user = new User({ bceidBusinessGuid: 'id', @@ -251,7 +251,9 @@ describe('ApplicationSubmissionReviewController', () => { }, }); - expect(mockEmailService.sendStatusEmail).toHaveBeenCalledTimes(1); + expect(mockEmailService.sendApplicationStatusEmail).toHaveBeenCalledTimes( + 1, + ); expect(mockLGService.getByGuid).toHaveBeenCalledTimes(2); expect(mockAppReviewService.startReview).toHaveBeenCalledTimes(1); expect( @@ -340,7 +342,7 @@ describe('ApplicationSubmissionReviewController', () => { ); mockAppReviewService.getByFileNumber.mockResolvedValue(applicationReview); mockAppDocService.list.mockResolvedValue([]); - mockEmailService.sendStatusEmail.mockResolvedValue(); + mockEmailService.sendApplicationStatusEmail.mockResolvedValue(); mockAppReviewService.verifyComplete.mockReturnValue({ ...applicationReview, @@ -384,12 +386,15 @@ describe('ApplicationSubmissionReviewController', () => { expect(mockAppSubmissionService.updateStatus.mock.calls[0][1]).toEqual( SUBMISSION_STATUS.SUBMITTED_TO_ALC, ); - expect(mockEmailService.sendStatusEmail).toHaveBeenCalledTimes(1); - expect(mockEmailService.sendStatusEmail).toHaveBeenCalledWith({ - generateStatusHtml: generateSUBMApplicantHtml, + expect(mockEmailService.sendApplicationStatusEmail).toHaveBeenCalledTimes( + 1, + ); + expect(mockEmailService.sendApplicationStatusEmail).toHaveBeenCalledWith({ + generateStatusHtml: generateSUBMApplicationHtml, status: SUBMISSION_STATUS.SUBMITTED_TO_ALC, applicationSubmission: mockSubmission, government: mockLG, + parentType: 'application', primaryContact: mockOwner, ccGovernment: true, }); @@ -432,7 +437,7 @@ describe('ApplicationSubmissionReviewController', () => { errors: [], }); mockAppSubmissionService.updateStatus.mockResolvedValue({} as any); - mockEmailService.sendStatusEmail.mockResolvedValue(); + mockEmailService.sendApplicationStatusEmail.mockResolvedValue(); mockAppDocService.list.mockResolvedValue([]); await controller.finish(fileNumber, { @@ -454,12 +459,15 @@ describe('ApplicationSubmissionReviewController', () => { expect(mockAppSubmissionService.updateStatus.mock.calls[0][1]).toEqual( SUBMISSION_STATUS.REFUSED_TO_FORWARD_LG, ); - expect(mockEmailService.sendStatusEmail).toHaveBeenCalledTimes(1); - expect(mockEmailService.sendStatusEmail).toHaveBeenCalledWith({ + expect(mockEmailService.sendApplicationStatusEmail).toHaveBeenCalledTimes( + 1, + ); + expect(mockEmailService.sendApplicationStatusEmail).toHaveBeenCalledWith({ generateStatusHtml: generateRFFGHtml, status: SUBMISSION_STATUS.REFUSED_TO_FORWARD_LG, applicationSubmission: mockSubmission, government: mockLG, + parentType: 'application', primaryContact: mockOwner, ccGovernment: true, }); @@ -490,7 +498,7 @@ describe('ApplicationSubmissionReviewController', () => { mockAppSubmissionService.update.mockResolvedValue( new ApplicationSubmission(), ); - mockEmailService.sendStatusEmail.mockResolvedValue(); + mockEmailService.sendApplicationStatusEmail.mockResolvedValue(); const documents = [ new ApplicationDocument({ @@ -551,12 +559,15 @@ describe('ApplicationSubmissionReviewController', () => { expect( mockApplicationSubmissionStatusService.setStatusDate, ).toHaveBeenCalledTimes(2); - expect(mockEmailService.sendStatusEmail).toHaveBeenCalledTimes(1); - expect(mockEmailService.sendStatusEmail).toHaveBeenCalledWith({ + expect(mockEmailService.sendApplicationStatusEmail).toHaveBeenCalledTimes( + 1, + ); + expect(mockEmailService.sendApplicationStatusEmail).toHaveBeenCalledWith({ generateStatusHtml: generateINCMHtml, status: SUBMISSION_STATUS.INCOMPLETE, applicationSubmission: mockSubmission, government: mockLG, + parentType: 'application', primaryContact: mockOwner, ccGovernment: true, }); @@ -587,7 +598,7 @@ describe('ApplicationSubmissionReviewController', () => { mockAppSubmissionService.update.mockResolvedValue( new ApplicationSubmission(), ); - mockEmailService.sendStatusEmail.mockResolvedValue(); + mockEmailService.sendApplicationStatusEmail.mockResolvedValue(); const documents = [ new ApplicationDocument({ @@ -624,12 +635,15 @@ describe('ApplicationSubmissionReviewController', () => { }, ); - expect(mockEmailService.sendStatusEmail).toHaveBeenCalledTimes(1); - expect(mockEmailService.sendStatusEmail).toHaveBeenCalledWith({ + expect(mockEmailService.sendApplicationStatusEmail).toHaveBeenCalledTimes( + 1, + ); + expect(mockEmailService.sendApplicationStatusEmail).toHaveBeenCalledWith({ generateStatusHtml: generateWRNGHtml, status: SUBMISSION_STATUS.WRONG_GOV, applicationSubmission: mockSubmission, government: mockLG, + parentType: 'application', primaryContact: mockOwner, }); }); diff --git a/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.ts b/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.ts index 41674d6f06..777229b76c 100644 --- a/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.ts +++ b/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.ts @@ -34,7 +34,8 @@ import { import { ApplicationSubmissionReviewService } from './application-submission-review.service'; import { generateINCMHtml } from '../../../../../templates/emails/returned-as-incomplete.template'; import { generateRFFGHtml } from '../../../../../templates/emails/refused-to-forward.template'; -import { generateSUBMApplicantHtml } from '../../../../../templates/emails/submitted-to-alc'; +import { generateSUBMApplicationHtml } from '../../../../../templates/emails/submitted-to-alc'; +import { PARENT_TYPE } from '../../alcs/card/card-subtask/card-subtask.dto'; @Controller('application-review') @UseGuards(PortalAuthGuard) @@ -188,11 +189,12 @@ export class ApplicationSubmissionReviewController { ); if (primaryContact) { - await this.emailService.sendStatusEmail({ + await this.emailService.sendApplicationStatusEmail({ generateStatusHtml: generateREVGHtml, status: SUBMISSION_STATUS.IN_REVIEW_BY_LG, applicationSubmission, government: userLocalGovernment, + parentType: PARENT_TYPE.APPLICATION, primaryContact, }); } @@ -287,11 +289,12 @@ export class ApplicationSubmissionReviewController { ); if (primaryContact) { - await this.emailService.sendStatusEmail({ - generateStatusHtml: generateSUBMApplicantHtml, + await this.emailService.sendApplicationStatusEmail({ + generateStatusHtml: generateSUBMApplicationHtml, status: SUBMISSION_STATUS.SUBMITTED_TO_ALC, applicationSubmission: application, government: userLocalGovernment, + parentType: PARENT_TYPE.APPLICATION, primaryContact, ccGovernment: true, }); @@ -303,11 +306,12 @@ export class ApplicationSubmissionReviewController { ); if (primaryContact) { - await this.emailService.sendStatusEmail({ + await this.emailService.sendApplicationStatusEmail({ generateStatusHtml: generateRFFGHtml, status: SUBMISSION_STATUS.REFUSED_TO_FORWARD_LG, applicationSubmission: application, government: userLocalGovernment, + parentType: PARENT_TYPE.APPLICATION, primaryContact, ccGovernment: true, }); @@ -388,21 +392,23 @@ export class ApplicationSubmissionReviewController { if (primaryContact) { if (returnDto.reasonForReturn === 'wrongGovernment') { - await this.emailService.sendStatusEmail({ + await this.emailService.sendApplicationStatusEmail({ generateStatusHtml: generateWRNGHtml, status: SUBMISSION_STATUS.WRONG_GOV, applicationSubmission, government: userLocalGovernment, + parentType: PARENT_TYPE.APPLICATION, primaryContact, }); } if (returnDto.reasonForReturn === 'incomplete') { - await this.emailService.sendStatusEmail({ + await this.emailService.sendApplicationStatusEmail({ generateStatusHtml: generateINCMHtml, status: SUBMISSION_STATUS.INCOMPLETE, applicationSubmission, government: userLocalGovernment, + parentType: PARENT_TYPE.APPLICATION, primaryContact, ccGovernment: true, }); diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.controller.spec.ts b/services/apps/alcs/src/portal/application-submission/application-submission.controller.spec.ts index c199026416..67cff64d3a 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.controller.spec.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.controller.spec.ts @@ -28,7 +28,7 @@ import { ApplicationSubmission } from './application-submission.entity'; import { ApplicationSubmissionService } from './application-submission.service'; import { EmailService } from '../../providers/email/email.service'; import { ApplicationOwner } from './application-owner/application-owner.entity'; -import { generateCANCHtml } from '../../../../../templates/emails/cancelled.template'; +import { generateCANCApplicationHtml } from '../../../../../templates/emails/cancelled'; import { generateSUBGTurApplicantHtml, generateSUBGTurGovernmentHtml, @@ -182,13 +182,13 @@ describe('ApplicationSubmissionController', () => { mockAppSubmissionService.cancel.mockResolvedValue(); const mockGovernment = new LocalGovernment({ uuid: localGovernmentUuid }); - mockEmailService.getSubmissionStatusEmailData.mockResolvedValue({ + mockEmailService.getApplicationEmailData.mockResolvedValue({ applicationSubmission: mockApplication, primaryContact: mockOwner, submissionGovernment: mockGovernment, }); - mockEmailService.sendStatusEmail.mockResolvedValue(); + mockEmailService.sendApplicationStatusEmail.mockResolvedValue(); const application = await controller.cancel('file-id', { user: { @@ -205,12 +205,15 @@ describe('ApplicationSubmissionController', () => { 'file-id', new User(), ); - expect(mockEmailService.sendStatusEmail).toHaveBeenCalledTimes(1); - expect(mockEmailService.sendStatusEmail).toHaveBeenCalledWith({ - generateStatusHtml: generateCANCHtml, + expect(mockEmailService.sendApplicationStatusEmail).toHaveBeenCalledTimes( + 1, + ); + expect(mockEmailService.sendApplicationStatusEmail).toHaveBeenCalledWith({ + generateStatusHtml: generateCANCApplicationHtml, status: SUBMISSION_STATUS.CANCELLED, applicationSubmission: mockApplication, government: mockGovernment, + parentType: 'application', primaryContact: mockOwner, ccGovernment: true, }); @@ -394,13 +397,13 @@ describe('ApplicationSubmissionController', () => { }); const mockGovernment = new LocalGovernment({ uuid: localGovernmentUuid }); - mockEmailService.getSubmissionStatusEmailData.mockResolvedValue({ + mockEmailService.getApplicationEmailData.mockResolvedValue({ applicationSubmission: mockApplicationSubmission, primaryContact: mockOwner, submissionGovernment: mockGovernment, }); - mockEmailService.sendStatusEmail.mockResolvedValue(); + mockEmailService.sendApplicationStatusEmail.mockResolvedValue(); await controller.submitAsApplicant(mockFileId, { user: { @@ -413,19 +416,23 @@ describe('ApplicationSubmissionController', () => { ); expect(mockAppSubmissionService.submitToAlcs).toHaveBeenCalledTimes(1); expect(mockAppSubmissionService.updateStatus).toHaveBeenCalledTimes(1); - expect(mockEmailService.sendStatusEmail).toHaveBeenCalledTimes(2); - expect(mockEmailService.sendStatusEmail).toHaveBeenCalledWith({ + expect(mockEmailService.sendApplicationStatusEmail).toHaveBeenCalledTimes( + 2, + ); + expect(mockEmailService.sendApplicationStatusEmail).toHaveBeenCalledWith({ generateStatusHtml: generateSUBGTurApplicantHtml, status: SUBMISSION_STATUS.SUBMITTED_TO_ALC, applicationSubmission: mockApplicationSubmission, government: mockGovernment, + parentType: 'application', primaryContact: mockOwner, }); - expect(mockEmailService.sendStatusEmail).toHaveBeenCalledWith({ + expect(mockEmailService.sendApplicationStatusEmail).toHaveBeenCalledWith({ generateStatusHtml: generateSUBGTurGovernmentHtml, status: SUBMISSION_STATUS.SUBMITTED_TO_ALC, applicationSubmission: mockApplicationSubmission, government: mockGovernment, + parentType: 'application', }); }); @@ -449,10 +456,10 @@ describe('ApplicationSubmissionController', () => { new ApplicationSubmission() as ValidatedApplicationSubmission, errors: [], }); - mockEmailService.sendStatusEmail.mockResolvedValue(); + mockEmailService.sendApplicationStatusEmail.mockResolvedValue(); const mockGovernment = new LocalGovernment({ uuid: localGovernmentUuid }); - mockEmailService.getSubmissionStatusEmailData.mockResolvedValue({ + mockEmailService.getApplicationEmailData.mockResolvedValue({ applicationSubmission: mockApplicationSubmission, primaryContact: mockOwner, submissionGovernment: mockGovernment, @@ -468,19 +475,23 @@ describe('ApplicationSubmissionController', () => { 1, ); expect(mockAppSubmissionService.submitToLg).toHaveBeenCalledTimes(1); - expect(mockEmailService.sendStatusEmail).toHaveBeenCalledTimes(2); - expect(mockEmailService.sendStatusEmail).toHaveBeenCalledWith({ + expect(mockEmailService.sendApplicationStatusEmail).toHaveBeenCalledTimes( + 2, + ); + expect(mockEmailService.sendApplicationStatusEmail).toHaveBeenCalledWith({ generateStatusHtml: generateSUBGApplicantHtml, status: SUBMISSION_STATUS.SUBMITTED_TO_LG, applicationSubmission: mockApplicationSubmission, government: mockGovernment, + parentType: 'application', primaryContact: mockOwner, }); - expect(mockEmailService.sendStatusEmail).toHaveBeenCalledWith({ + expect(mockEmailService.sendApplicationStatusEmail).toHaveBeenCalledWith({ generateStatusHtml: generateSUBGGovernmentHtml, status: SUBMISSION_STATUS.SUBMITTED_TO_LG, applicationSubmission: mockApplicationSubmission, government: mockGovernment, + parentType: 'application', }); }); @@ -511,10 +522,10 @@ describe('ApplicationSubmissionController', () => { new ApplicationSubmission() as ValidatedApplicationSubmission, errors: [], }); - mockEmailService.sendStatusEmail.mockResolvedValue(); + mockEmailService.sendApplicationStatusEmail.mockResolvedValue(); const mockGovernment = new LocalGovernment({ uuid: localGovernmentUuid }); - mockEmailService.getSubmissionStatusEmailData.mockResolvedValue({ + mockEmailService.getApplicationEmailData.mockResolvedValue({ applicationSubmission: mockApplicationSubmission, primaryContact: mockOwner, submissionGovernment: mockGovernment, @@ -530,7 +541,9 @@ describe('ApplicationSubmissionController', () => { 1, ); expect(mockAppSubmissionService.submitToLg).toHaveBeenCalledTimes(1); - expect(mockEmailService.sendStatusEmail).toHaveBeenCalledTimes(0); + expect(mockEmailService.sendApplicationStatusEmail).toHaveBeenCalledTimes( + 0, + ); }); it('should throw an exception if application fails validation', async () => { @@ -542,7 +555,7 @@ describe('ApplicationSubmissionController', () => { mockAppSubmissionService.verifyAccessByUuid.mockResolvedValue( mockApplicationSubmission, ); - mockEmailService.getSubmissionStatusEmailData.mockResolvedValue({ + mockEmailService.getApplicationEmailData.mockResolvedValue({ applicationSubmission: mockApplicationSubmission, primaryContact: new ApplicationOwner(), submissionGovernment: new LocalGovernment(), diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.controller.ts b/services/apps/alcs/src/portal/application-submission/application-submission.controller.ts index 449e80bf1f..d495f331e1 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.controller.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.controller.ts @@ -31,7 +31,8 @@ import { generateSUBGTurApplicantHtml, generateSUBGTurGovernmentHtml, } from '../../../../../templates/emails/submitted-to-alc'; -import { generateCANCHtml } from '../../../../../templates/emails/cancelled.template'; +import { generateCANCApplicationHtml } from '../../../../../templates/emails/cancelled'; +import { PARENT_TYPE } from '../../alcs/card/card-subtask/card-subtask.dto'; @Controller('application-submission') @UseGuards(PortalAuthGuard) @@ -200,17 +201,18 @@ export class ApplicationSubmissionController { } const { primaryContact, submissionGovernment } = - await this.emailService.getSubmissionStatusEmailData( + await this.emailService.getApplicationEmailData( application.fileNumber, application, ); if (primaryContact) { - await this.emailService.sendStatusEmail({ - generateStatusHtml: generateCANCHtml, + await this.emailService.sendApplicationStatusEmail({ + generateStatusHtml: generateCANCApplicationHtml, status: SUBMISSION_STATUS.CANCELLED, applicationSubmission: application, government: submissionGovernment, + parentType: PARENT_TYPE.APPLICATION, primaryContact, ccGovernment: !!submissionGovernment, }); @@ -237,7 +239,7 @@ export class ApplicationSubmissionController { ); const { primaryContact, submissionGovernment } = - await this.emailService.getSubmissionStatusEmailData( + await this.emailService.getApplicationEmailData( applicationSubmission.fileNumber, applicationSubmission, ); @@ -251,21 +253,23 @@ export class ApplicationSubmissionController { ); if (primaryContact) { - await this.emailService.sendStatusEmail({ + await this.emailService.sendApplicationStatusEmail({ generateStatusHtml: generateSUBGTurApplicantHtml, status: SUBMISSION_STATUS.SUBMITTED_TO_ALC, applicationSubmission, government: submissionGovernment, + parentType: PARENT_TYPE.APPLICATION, primaryContact, }); } if (submissionGovernment) { - await this.emailService.sendStatusEmail({ + await this.emailService.sendApplicationStatusEmail({ generateStatusHtml: generateSUBGTurGovernmentHtml, status: SUBMISSION_STATUS.SUBMITTED_TO_ALC, applicationSubmission, government: submissionGovernment, + parentType: PARENT_TYPE.APPLICATION, }); } @@ -289,21 +293,23 @@ export class ApplicationSubmissionController { // Send status emails for first time submissions if (!wasSubmittedToLfng) { if (primaryContact) { - await this.emailService.sendStatusEmail({ + await this.emailService.sendApplicationStatusEmail({ generateStatusHtml: generateSUBGApplicantHtml, status: SUBMISSION_STATUS.SUBMITTED_TO_LG, applicationSubmission, government: submissionGovernment, + parentType: PARENT_TYPE.APPLICATION, primaryContact, }); } if (submissionGovernment) { - await this.emailService.sendStatusEmail({ + await this.emailService.sendApplicationStatusEmail({ generateStatusHtml: generateSUBGGovernmentHtml, status: SUBMISSION_STATUS.SUBMITTED_TO_LG, applicationSubmission, government: submissionGovernment, + parentType: PARENT_TYPE.APPLICATION, }); } } diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.controller.spec.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.controller.spec.ts index 07535d9139..56d726b91a 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.controller.spec.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.controller.spec.ts @@ -25,6 +25,13 @@ import { } from './notice-of-intent-submission.dto'; import { NoticeOfIntentSubmission } from './notice-of-intent-submission.entity'; import { NoticeOfIntentSubmissionService } from './notice-of-intent-submission.service'; +import { EmailService } from '../../providers/email/email.service'; +import { NoticeOfIntentOwner } from './notice-of-intent-owner/notice-of-intent-owner.entity'; +import { generateCANCNoticeOfIntentHtml } from '../../../../../templates/emails/cancelled'; +import { + generateSUBMNoiApplicantHtml, + generateSUBMNoiGovernmentHtml, +} from '../../../../../templates/emails/submitted-to-alc'; describe('NoticeOfIntentSubmissionController', () => { let controller: NoticeOfIntentSubmissionController; @@ -32,7 +39,9 @@ describe('NoticeOfIntentSubmissionController', () => { let mockDocumentService: DeepMocked; let mockLgService: DeepMocked; let mockNoiValidatorService: DeepMocked; + let mockEmailService: DeepMocked; + const primaryContactOwnerUuid = 'primary-contact'; const localGovernmentUuid = 'local-government'; const applicant = 'fake-applicant'; const bceidBusinessGuid = 'business-guid'; @@ -42,6 +51,7 @@ describe('NoticeOfIntentSubmissionController', () => { mockDocumentService = createMock(); mockLgService = createMock(); mockNoiValidatorService = createMock(); + mockEmailService = createMock(); const module: TestingModule = await Test.createTestingModule({ controllers: [NoticeOfIntentSubmissionController], @@ -63,6 +73,10 @@ describe('NoticeOfIntentSubmissionController', () => { provide: NoticeOfIntentSubmissionValidatorService, useValue: mockNoiValidatorService, }, + { + provide: EmailService, + useValue: mockEmailService, + }, { provide: ClsService, useValue: {}, @@ -123,11 +137,19 @@ describe('NoticeOfIntentSubmissionController', () => { expect(mockNoiSubmissionService.getAllByUser).toHaveBeenCalledTimes(1); }); - it('should call out to service when cancelling an notice of intent', async () => { + it('should call out to service when cancelling a notice of intent', async () => { + const mockOwner = new NoticeOfIntentOwner({ + uuid: primaryContactOwnerUuid, + }); + const mockGovernment = new LocalGovernment({ uuid: localGovernmentUuid }); + const mockApplication = new NoticeOfIntentSubmission({ status: new NoticeOfIntentSubmissionToSubmissionStatus({ statusTypeCode: NOI_SUBMISSION_STATUS.IN_PROGRESS, }), + owners: [mockOwner], + primaryContactOwnerUuid, + localGovernmentUuid, }); mockNoiSubmissionService.mapToDTOs.mockResolvedValue([ @@ -137,6 +159,11 @@ describe('NoticeOfIntentSubmissionController', () => { mockNoiSubmissionService.cancel.mockResolvedValue( new NoticeOfIntentSubmissionToSubmissionStatus(), ); + mockEmailService.getNoticeOfIntentEmailData.mockResolvedValue({ + primaryContact: mockOwner, + submissionGovernment: mockGovernment, + }); + mockEmailService.sendNoticeOfIntentStatusEmail.mockResolvedValue(); const noticeOfIntentSubmission = await controller.cancel('file-id', { user: { @@ -151,6 +178,20 @@ describe('NoticeOfIntentSubmissionController', () => { 'file-id', new User(), ); + expect( + mockEmailService.sendNoticeOfIntentStatusEmail, + ).toHaveBeenCalledTimes(1); + expect(mockEmailService.sendNoticeOfIntentStatusEmail).toHaveBeenCalledWith( + { + generateStatusHtml: generateCANCNoticeOfIntentHtml, + status: NOI_SUBMISSION_STATUS.CANCELLED, + noticeOfIntentSubmission: mockApplication, + government: mockGovernment, + parentType: 'application', + primaryContact: mockOwner, + ccGovernment: true, + }, + ); }); it('should throw an exception when trying to cancel a notice of intent that is not in progress', async () => { @@ -313,20 +354,34 @@ describe('NoticeOfIntentSubmissionController', () => { it('should call out to service on submitAlcs', async () => { const mockFileId = 'file-id'; + const mockOwner = new NoticeOfIntentOwner({ + uuid: primaryContactOwnerUuid, + }); + const mockGovernment = new LocalGovernment({ uuid: localGovernmentUuid }); + const mockSubmission = new NoticeOfIntentSubmission({ + fileNumber: mockFileId, + owners: [mockOwner], + primaryContactOwnerUuid, + localGovernmentUuid, + }); + mockNoiSubmissionService.submitToAlcs.mockResolvedValue( new NoticeOfIntent(), ); - mockNoiSubmissionService.getByUuid.mockResolvedValue( - new NoticeOfIntentSubmission(), - ); + mockNoiSubmissionService.getByUuid.mockResolvedValue(mockSubmission); mockNoiValidatorService.validateSubmission.mockResolvedValue({ noticeOfIntentSubmission: - new NoticeOfIntentSubmission() as ValidatedNoticeOfIntentSubmission, + mockSubmission as ValidatedNoticeOfIntentSubmission, errors: [], }); mockNoiSubmissionService.mapToDetailedDTO.mockResolvedValue( {} as NoticeOfIntentSubmissionDetailedDto, ); + mockEmailService.getNoticeOfIntentEmailData.mockResolvedValue({ + primaryContact: mockOwner, + submissionGovernment: mockGovernment, + }); + mockEmailService.sendNoticeOfIntentStatusEmail.mockResolvedValue(); await controller.submitAsApplicant(mockFileId, { user: { @@ -338,5 +393,27 @@ describe('NoticeOfIntentSubmissionController', () => { expect(mockNoiSubmissionService.submitToAlcs).toHaveBeenCalledTimes(1); expect(mockNoiValidatorService.validateSubmission).toHaveBeenCalledTimes(1); expect(mockNoiSubmissionService.mapToDetailedDTO).toHaveBeenCalledTimes(1); + expect( + mockEmailService.sendNoticeOfIntentStatusEmail, + ).toHaveBeenCalledTimes(2); + expect(mockEmailService.sendNoticeOfIntentStatusEmail).toHaveBeenCalledWith( + { + generateStatusHtml: generateSUBMNoiApplicantHtml, + status: NOI_SUBMISSION_STATUS.SUBMITTED_TO_ALC, + noticeOfIntentSubmission: mockSubmission, + government: mockGovernment, + parentType: 'notice-of-intent', + primaryContact: mockOwner, + }, + ); + expect(mockEmailService.sendNoticeOfIntentStatusEmail).toHaveBeenCalledWith( + { + generateStatusHtml: generateSUBMNoiGovernmentHtml, + status: NOI_SUBMISSION_STATUS.SUBMITTED_TO_ALC, + noticeOfIntentSubmission: mockSubmission, + government: mockGovernment, + parentType: 'notice-of-intent', + }, + ); }); }); diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.controller.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.controller.ts index 17cb2a859c..84d3b110d0 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.controller.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.controller.ts @@ -20,6 +20,13 @@ import { NoticeOfIntentSubmissionUpdateDto, } from './notice-of-intent-submission.dto'; import { NoticeOfIntentSubmissionService } from './notice-of-intent-submission.service'; +import { EmailService } from '../../providers/email/email.service'; +import { + generateSUBMNoiApplicantHtml, + generateSUBMNoiGovernmentHtml, +} from '../../../../../templates/emails/submitted-to-alc'; +import { PARENT_TYPE } from '../../alcs/card/card-subtask/card-subtask.dto'; +import { generateCANCNoticeOfIntentHtml } from '../../../../../templates/emails/cancelled'; @Controller('notice-of-intent-submission') @UseGuards(PortalAuthGuard) @@ -29,6 +36,7 @@ export class NoticeOfIntentSubmissionController { constructor( private noticeOfIntentSubmissionService: NoticeOfIntentSubmissionService, private noticeOfIntentValidatorService: NoticeOfIntentSubmissionValidatorService, + private emailService: EmailService, ) {} @Get() @@ -136,6 +144,23 @@ export class NoticeOfIntentSubmissionController { ); } + const { primaryContact, submissionGovernment } = + await this.emailService.getNoticeOfIntentEmailData( + noticeOfIntentSubmission, + ); + + if (primaryContact) { + await this.emailService.sendNoticeOfIntentStatusEmail({ + generateStatusHtml: generateCANCNoticeOfIntentHtml, + status: NOI_SUBMISSION_STATUS.CANCELLED, + noticeOfIntentSubmission, + government: submissionGovernment, + parentType: PARENT_TYPE.APPLICATION, + primaryContact, + ccGovernment: !!submissionGovernment, + }); + } + await this.noticeOfIntentSubmissionService.cancel(noticeOfIntentSubmission); return { @@ -164,6 +189,32 @@ export class NoticeOfIntentSubmissionController { validatedApplicationSubmission, ); + const { primaryContact, submissionGovernment } = + await this.emailService.getNoticeOfIntentEmailData( + noticeOfIntentSubmission, + ); + + if (primaryContact) { + await this.emailService.sendNoticeOfIntentStatusEmail({ + generateStatusHtml: generateSUBMNoiApplicantHtml, + status: NOI_SUBMISSION_STATUS.SUBMITTED_TO_ALC, + noticeOfIntentSubmission, + government: submissionGovernment, + parentType: PARENT_TYPE.NOTICE_OF_INTENT, + primaryContact, + }); + } + + if (submissionGovernment) { + await this.emailService.sendNoticeOfIntentStatusEmail({ + generateStatusHtml: generateSUBMNoiGovernmentHtml, + status: NOI_SUBMISSION_STATUS.SUBMITTED_TO_ALC, + noticeOfIntentSubmission, + government: submissionGovernment, + parentType: PARENT_TYPE.NOTICE_OF_INTENT, + }); + } + const finalSubmission = await this.noticeOfIntentSubmissionService.getByUuid( uuid, diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.module.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.module.ts index 42e4e28789..257dce1c7a 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.module.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.module.ts @@ -22,6 +22,7 @@ import { NoticeOfIntentSubmissionValidatorService } from './notice-of-intent-sub import { NoticeOfIntentSubmissionController } from './notice-of-intent-submission.controller'; import { NoticeOfIntentSubmission } from './notice-of-intent-submission.entity'; import { NoticeOfIntentSubmissionService } from './notice-of-intent-submission.service'; +import { NoticeOfIntentSubmissionStatusType } from '../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status-type.entity'; @Module({ imports: [ @@ -31,10 +32,11 @@ import { NoticeOfIntentSubmissionService } from './notice-of-intent-submission.s NoticeOfIntentParcelOwnershipType, OwnerType, NoticeOfIntentOwner, + NoticeOfIntentSubmissionStatusType, ]), NoticeOfIntentSubmissionStatusModule, forwardRef(() => NoticeOfIntentModule), - AuthorizationModule, + forwardRef(() => AuthorizationModule), forwardRef(() => DocumentModule), forwardRef(() => BoardModule), LocalGovernmentModule, diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts index 400f3aee40..962e1482b6 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts @@ -21,10 +21,14 @@ import { PORTAL_TO_ALCS_STRUCTURE_TYPES_MAPPING, } from './notice-of-intent-submission.entity'; import { NoticeOfIntentSubmissionService } from './notice-of-intent-submission.service'; +import { NoticeOfIntentSubmissionStatusType } from '../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status-type.entity'; describe('NoticeOfIntentSubmissionService', () => { let service: NoticeOfIntentSubmissionService; let mockRepository: DeepMocked>; + let mockStatusRepository: DeepMocked< + Repository + >; let mockNoiService: DeepMocked; let mockLGService: DeepMocked; let mockNoiDocService: DeepMocked; @@ -34,6 +38,7 @@ describe('NoticeOfIntentSubmissionService', () => { beforeEach(async () => { mockRepository = createMock(); + mockStatusRepository = createMock(); mockNoiService = createMock(); mockLGService = createMock(); mockNoiDocService = createMock(); @@ -53,6 +58,10 @@ describe('NoticeOfIntentSubmissionService', () => { provide: getRepositoryToken(NoticeOfIntentSubmission), useValue: mockRepository, }, + { + provide: getRepositoryToken(NoticeOfIntentSubmissionStatusType), + useValue: mockStatusRepository, + }, { provide: NoticeOfIntentService, useValue: mockNoiService, diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts index 7ebe9a7502..10d6854aef 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts @@ -31,6 +31,7 @@ import { NoticeOfIntentSubmission, PORTAL_TO_ALCS_STRUCTURE_TYPES_MAPPING, } from './notice-of-intent-submission.entity'; +import { NoticeOfIntentSubmissionStatusType } from '../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status-type.entity'; @Injectable() export class NoticeOfIntentSubmissionService { @@ -50,6 +51,8 @@ export class NoticeOfIntentSubmissionService { constructor( @InjectRepository(NoticeOfIntentSubmission) private noticeOfIntentSubmissionRepository: Repository, + @InjectRepository(NoticeOfIntentSubmissionStatusType) + private noticeOfIntentStatusRepository: Repository, private noticeOfIntentService: NoticeOfIntentService, private localGovernmentService: LocalGovernmentService, private noticeOfIntentDocumentService: NoticeOfIntentDocumentService, @@ -412,6 +415,14 @@ export class NoticeOfIntentSubmissionService { ); } + async getStatus(code: NOI_SUBMISSION_STATUS) { + return await this.noticeOfIntentStatusRepository.findOneOrFail({ + where: { + code, + }, + }); + } + async cancel(noticeOfIntentSubmission: NoticeOfIntentSubmission) { return await this.noticeOfIntentSubmissionStatusService.setStatusDate( noticeOfIntentSubmission.uuid, diff --git a/services/apps/alcs/src/providers/email/email.module.ts b/services/apps/alcs/src/providers/email/email.module.ts index 535c4b276c..00ed8d94be 100644 --- a/services/apps/alcs/src/providers/email/email.module.ts +++ b/services/apps/alcs/src/providers/email/email.module.ts @@ -5,6 +5,8 @@ import { EmailStatus } from './email-status.entity'; import { EmailService } from './email.service'; import { ApplicationSubmissionModule } from '../../portal/application-submission/application-submission.module'; import { ApplicationModule } from '../../alcs/application/application.module'; +import { NoticeOfIntentModule } from '../../alcs/notice-of-intent/notice-of-intent.module'; +import { NoticeOfIntentSubmissionModule } from '../../portal/notice-of-intent-submission/notice-of-intent-submission.module'; @Module({ imports: [ @@ -12,6 +14,8 @@ import { ApplicationModule } from '../../alcs/application/application.module'; TypeOrmModule.forFeature([EmailStatus]), forwardRef(() => ApplicationModule), forwardRef(() => ApplicationSubmissionModule), + forwardRef(() => NoticeOfIntentModule), + forwardRef(() => NoticeOfIntentSubmissionModule), ], providers: [EmailService], exports: [EmailService], diff --git a/services/apps/alcs/src/providers/email/email.service.spec.ts b/services/apps/alcs/src/providers/email/email.service.spec.ts index 6f3d2ac5c4..fca6ee04c6 100644 --- a/services/apps/alcs/src/providers/email/email.service.spec.ts +++ b/services/apps/alcs/src/providers/email/email.service.spec.ts @@ -17,6 +17,13 @@ import { LocalGovernment } from '../../alcs/local-government/local-government.en import { ApplicationOwner } from '../../portal/application-submission/application-owner/application-owner.entity'; import { SUBMISSION_STATUS } from '../../alcs/application/application-submission-status/submission-status.dto'; import { ApplicationSubmissionStatusType } from '../../alcs/application/application-submission-status/submission-status-type.entity'; +import { NoticeOfIntentService } from '../../alcs/notice-of-intent/notice-of-intent.service'; +import { NoticeOfIntentSubmissionService } from '../../portal/notice-of-intent-submission/notice-of-intent-submission.service'; +import { NoticeOfIntentSubmission } from '../../portal/notice-of-intent-submission/notice-of-intent-submission.entity'; +import { NOI_SUBMISSION_STATUS } from '../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status.dto'; +import { NoticeOfIntentOwner } from '../../portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.entity'; +import { NoticeOfIntentSubmissionStatusType } from '../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status-type.entity'; +import { PARENT_TYPE } from '../../alcs/card/card-subtask/card-subtask.dto'; describe('EmailService', () => { let service: EmailService; @@ -25,6 +32,8 @@ describe('EmailService', () => { let mockLocalGovernmentService: DeepMocked; let mockApplicationSubmissionService: DeepMocked; let mockApplicationService: DeepMocked; + let mockNoticeOfIntentSubmissionService: DeepMocked; + let mockNoticeOfIntentService: DeepMocked; beforeEach(async () => { mockHttpService = createMock(); @@ -33,6 +42,9 @@ describe('EmailService', () => { mockApplicationSubmissionService = createMock(); mockApplicationService = createMock(); + mockNoticeOfIntentSubmissionService = + createMock(); + mockNoticeOfIntentService = createMock(); const module: TestingModule = await Test.createTestingModule({ imports: [ConfigModule], @@ -54,6 +66,14 @@ describe('EmailService', () => { provide: ApplicationService, useValue: mockApplicationService, }, + { + provide: NoticeOfIntentSubmissionService, + useValue: mockNoticeOfIntentSubmissionService, + }, + { + provide: NoticeOfIntentService, + useValue: mockNoticeOfIntentService, + }, { provide: getRepositoryToken(EmailStatus), useValue: mockRepo, @@ -175,13 +195,13 @@ describe('EmailService', () => { ); }); - it('should call through services and return submission data', async () => { - const mockSubmission = new ApplicationSubmission({}); + it('should call through services and return application data', async () => { + const mockSubmission = new ApplicationSubmission(); mockApplicationSubmissionService.getOrFailByFileNumber.mockResolvedValue( mockSubmission, ); - const res = await service.getSubmissionStatusEmailData('file-number'); + const res = await service.getApplicationEmailData('file-number'); expect( mockApplicationSubmissionService.getOrFailByFileNumber, @@ -196,11 +216,23 @@ describe('EmailService', () => { }); }); - it('should call through services to set email template', async () => { + it('should call through services and return notice of intent data', async () => { + const res = await service.getNoticeOfIntentEmailData( + new NoticeOfIntentSubmission(), + ); + + expect(res).toStrictEqual({ + primaryContact: undefined, + submissionGovernment: null, + }); + }); + + it('should call through services to set application email template', async () => { const mockData = { generateStatusHtml: () => ({} as MJMLParseResults), status: SUBMISSION_STATUS.IN_REVIEW_BY_LG, applicationSubmission: new ApplicationSubmission({ typeCode: 'TURP' }), + parentType: 'application' as PARENT_TYPE, government: new LocalGovernment({ emails: [] }), primaryContact: new ApplicationOwner(), }; @@ -211,7 +243,7 @@ describe('EmailService', () => { mockApplicationService.fetchApplicationTypes.mockResolvedValue([]); mockApplicationService.getUuid.mockResolvedValue('fake-uuid'); - await service.sendStatusEmail(mockData); + await service.sendApplicationStatusEmail(mockData); expect(mockApplicationSubmissionService.getStatus).toBeCalledTimes(1); expect(mockApplicationSubmissionService.getStatus).toBeCalledWith( @@ -219,4 +251,29 @@ describe('EmailService', () => { ); expect(mockApplicationService.fetchApplicationTypes).toBeCalledTimes(1); }); + + it('should call through services to set notice of intent email template', async () => { + const mockData = { + generateStatusHtml: () => ({} as MJMLParseResults), + status: NOI_SUBMISSION_STATUS.SUBMITTED_TO_ALC, + noticeOfIntentSubmission: new NoticeOfIntentSubmission(), + parentType: 'notice-of-intent' as PARENT_TYPE, + government: new LocalGovernment({ emails: [] }), + primaryContact: new NoticeOfIntentOwner(), + }; + + mockNoticeOfIntentSubmissionService.getStatus.mockResolvedValue( + new NoticeOfIntentSubmissionStatusType(), + ); + mockNoticeOfIntentService.listTypes.mockResolvedValue([]); + mockNoticeOfIntentService.getUuid.mockResolvedValue('fake-uuid'); + + await service.sendNoticeOfIntentStatusEmail(mockData); + + expect(mockNoticeOfIntentSubmissionService.getStatus).toBeCalledTimes(1); + expect(mockNoticeOfIntentSubmissionService.getStatus).toBeCalledWith( + mockData.status, + ); + expect(mockNoticeOfIntentService.listTypes).toBeCalledTimes(1); + }); }); diff --git a/services/apps/alcs/src/providers/email/email.service.ts b/services/apps/alcs/src/providers/email/email.service.ts index ac8f9f16f4..74e62eace8 100644 --- a/services/apps/alcs/src/providers/email/email.service.ts +++ b/services/apps/alcs/src/providers/email/email.service.ts @@ -14,24 +14,40 @@ import { ApplicationOwner } from '../../portal/application-submission/applicatio import { ApplicationSubmissionService } from '../../portal/application-submission/application-submission.service'; import { ApplicationService } from '../../alcs/application/application.service'; import { FALLBACK_APPLICANT_NAME } from '../../utils/owner.constants'; +import { PARENT_TYPE } from '../../alcs/card/card-subtask/card-subtask.dto'; +import { NoticeOfIntentSubmission } from '../../portal/notice-of-intent-submission/notice-of-intent-submission.entity'; +import { NoticeOfIntentOwner } from '../../portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.entity'; +import { NoticeOfIntentSubmissionService } from '../../portal/notice-of-intent-submission/notice-of-intent-submission.service'; +import { NoticeOfIntentService } from '../../alcs/notice-of-intent/notice-of-intent.service'; +import { NOI_SUBMISSION_STATUS } from '../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status.dto'; export interface StatusUpdateEmail { fileNumber: string; applicantName: string; status: string; - applicationType: string; + childType: string; governmentName: string; + parentType: PARENT_TYPE; } -type StatusEmailData = { +type BaseStatusEmailData = { generateStatusHtml: MJMLParseResults; - status: SUBMISSION_STATUS; - applicationSubmission: ApplicationSubmission; government: LocalGovernment | null; - primaryContact?: ApplicationOwner; + parentType: PARENT_TYPE; ccGovernment?: boolean; decisionReleaseMaskedDate?: string; }; +type ApplicationEmailData = BaseStatusEmailData & { + applicationSubmission: ApplicationSubmission; + status: SUBMISSION_STATUS; + primaryContact?: ApplicationOwner; +}; + +type NoticeOfIntentEmailData = BaseStatusEmailData & { + noticeOfIntentSubmission: NoticeOfIntentSubmission; + status: NOI_SUBMISSION_STATUS; + primaryContact?: NoticeOfIntentOwner; +}; export const appFees = [ { type: 'Exclusion', fee: 750 }, @@ -42,6 +58,20 @@ export const appFees = [ { type: 'Inclusion', fee: 0 }, ]; +export const noiFees = [ + { type: 'Removal of Soil', fee: 150 }, + { type: 'Placement of Fill', fee: 150 }, + { type: 'Placement of Fill/Removal of Soil', fee: 150 }, +]; + +const parentTypeLabel: Record< + PARENT_TYPE.APPLICATION | PARENT_TYPE.NOTICE_OF_INTENT, + string +> = { + application: 'Application', + 'notice-of-intent': 'NOI', +}; + @Injectable() export class EmailService { private logger: Logger = new Logger(EmailService.name); @@ -54,6 +84,8 @@ export class EmailService { private localGovernmentService: LocalGovernmentService, private applicationSubmissionService: ApplicationSubmissionService, private applicationService: ApplicationService, + private noticeOfIntentService: NoticeOfIntentService, + private noticeOfInterntSubmissionService: NoticeOfIntentSubmissionService, ) {} private token = ''; @@ -182,7 +214,9 @@ export class EmailService { } } - async getSubmissionGovernmentOrFail(submission: ApplicationSubmission) { + async getSubmissionGovernmentOrFail( + submission: ApplicationSubmission | NoticeOfIntentSubmission, + ) { const submissionGovernment = await this.getSubmissionGovernment(submission); if (!submissionGovernment) { throw new NotFoundException('Submission local government not found'); @@ -190,7 +224,9 @@ export class EmailService { return submissionGovernment; } - private async getSubmissionGovernment(submission: ApplicationSubmission) { + private async getSubmissionGovernment( + submission: ApplicationSubmission | NoticeOfIntentSubmission, + ) { if (submission.localGovernmentUuid) { const localGovernment = await this.localGovernmentService.getByUuid( submission.localGovernmentUuid, @@ -202,12 +238,12 @@ export class EmailService { return undefined; } - async getSubmissionStatusEmailData( + async getApplicationEmailData( fileNumber: string, - submissionData?: ApplicationSubmission, + submission?: ApplicationSubmission, ) { const applicationSubmission = - submissionData || + submission || (await this.applicationSubmissionService.getOrFailByFileNumber( fileNumber, )); @@ -223,7 +259,19 @@ export class EmailService { return { applicationSubmission, primaryContact, submissionGovernment }; } - async sendStatusEmail(data: StatusEmailData) { + async getNoticeOfIntentEmailData(submission: NoticeOfIntentSubmission) { + const primaryContact = submission.owners?.find( + (owner) => owner.uuid === submission.primaryContactOwnerUuid, + ); + + const submissionGovernment = submission.localGovernmentUuid + ? await this.getSubmissionGovernmentOrFail(submission) + : null; + + return { primaryContact, submissionGovernment }; + } + + private async setApplicationEmailTemplate(data: ApplicationEmailData) { const status = await this.applicationSubmissionService.getStatus( data.status, ); @@ -241,25 +289,82 @@ export class EmailService { const emailTemplate = data.generateStatusHtml({ fileNumber, applicantName, - applicationType: + childType: matchingType?.portalLabel ?? matchingType?.label ?? FALLBACK_APPLICANT_NAME, governmentName: data.government?.name, status: status.label, + parentTypeLabel: parentTypeLabel[data.parentType], decisionReleaseMaskedDate: data?.decisionReleaseMaskedDate, }); const parentId = await this.applicationService.getUuid(fileNumber); - const email = { + return { body: emailTemplate.html, subject: `Agricultural Land Commission Application ID: ${fileNumber} (${applicantName})`, - parentType: 'application', + parentType: data.parentType, + parentId, + triggerStatus: status.code, + }; + } + + private async setNoticeOfIntentEmailTemplate(data: NoticeOfIntentEmailData) { + const status = await this.noticeOfInterntSubmissionService.getStatus( + data.status, + ); + + const types = await this.noticeOfIntentService.listTypes(); + + const matchingType = types.find( + (type) => type.code === data.noticeOfIntentSubmission.typeCode, + ); + + const fileNumber = data.noticeOfIntentSubmission.fileNumber; + + const applicantName = + data.noticeOfIntentSubmission.applicant || FALLBACK_APPLICANT_NAME; + + const emailTemplate = data.generateStatusHtml({ + fileNumber, + applicantName, + childType: + matchingType?.portalLabel ?? + matchingType?.label ?? + FALLBACK_APPLICANT_NAME, + governmentName: data.government?.name, + status: status.label, + parentTypeLabel: parentTypeLabel[data.parentType], + }); + + const parentId = await this.noticeOfIntentService.getUuid(fileNumber); + + return { + body: emailTemplate.html, + subject: `Agricultural Land Commission NOI ID: ${fileNumber} (${applicantName})`, + parentType: data.parentType, parentId, triggerStatus: status.code, }; + } + async sendApplicationStatusEmail(data: ApplicationEmailData) { + const email = await this.setApplicationEmailTemplate(data); + + this.sendStatusEmail(data, email); + } + + async sendNoticeOfIntentStatusEmail(data: NoticeOfIntentEmailData) { + const email = await this.setNoticeOfIntentEmailTemplate(data); + + this.sendStatusEmail(data, email); + } + + private sendStatusEmail( + data: ApplicationEmailData | NoticeOfIntentEmailData, + email, + ) { if (data.primaryContact && data.primaryContact.email) { this.sendEmail({ ...email, diff --git a/services/templates/emails/cancelled.template.ts b/services/templates/emails/cancelled/application.template.ts similarity index 67% rename from services/templates/emails/cancelled.template.ts rename to services/templates/emails/cancelled/application.template.ts index 4d0a6e3dd2..60df235aaf 100644 --- a/services/templates/emails/cancelled.template.ts +++ b/services/templates/emails/cancelled/application.template.ts @@ -1,7 +1,7 @@ import { MJMLParseResults } from 'mjml-core'; -import { EmailTemplateService } from '../../libs/common/src/email-template-service/email-template.service'; -import { header, footer, notificationOnly, portalButton } from './partials'; -import { StatusUpdateEmail } from '../../apps/alcs/src/providers/email/email.service'; +import { EmailTemplateService } from '../../../libs/common/src/email-template-service/email-template.service'; +import { header, footer, notificationOnly, portalButton } from '../partials'; +import { StatusUpdateEmail } from '../../../apps/alcs/src/providers/email/email.service'; const template = ` @@ -21,7 +21,7 @@ const template = ` - This email is to advise that the above noted {{ applicationType }} application has been cancelled and will not be considered further. + This email is to advise that the above noted {{ childType }} application has been cancelled and will not be considered further. If you are an agent acting on behalf of the applicant(s)/landowner(s), it is your responsibility to advise your client(s) of this, and any future, correspondence. @@ -37,6 +37,8 @@ const template = ` `; -export const generateCANCHtml = (data: StatusUpdateEmail): MJMLParseResults => { +export const generateCANCApplicationHtml = ( + data: StatusUpdateEmail, +): MJMLParseResults => { return new EmailTemplateService().generateEmailBase(template, data); }; diff --git a/services/templates/emails/cancelled/index.ts b/services/templates/emails/cancelled/index.ts new file mode 100644 index 0000000000..cf7fa6130d --- /dev/null +++ b/services/templates/emails/cancelled/index.ts @@ -0,0 +1,2 @@ +export * from './application.template'; +export * from './notice-of-intent.template'; diff --git a/services/templates/emails/cancelled/notice-of-intent.template.ts b/services/templates/emails/cancelled/notice-of-intent.template.ts new file mode 100644 index 0000000000..dbc1a771f8 --- /dev/null +++ b/services/templates/emails/cancelled/notice-of-intent.template.ts @@ -0,0 +1,44 @@ +import { MJMLParseResults } from 'mjml-core'; +import { EmailTemplateService } from '../../../libs/common/src/email-template-service/email-template.service'; +import { header, footer, notificationOnly, portalButton } from '../partials'; +import { StatusUpdateEmail } from '../../../apps/alcs/src/providers/email/email.service'; + +const template = ` + + + .line-height div { + line-height: 24px !important; + } + + .align-left { + float: left !important; + } + + + + ${header} + + + + + This email is to advise that the above noted {{ childType }} Notice of Intent has been cancelled and will not be considered further. + + + If you are an agent acting on behalf of the applicant(s)/landowner(s), it is your responsibility to advise your client(s) of this, and any future, correspondence. + + ${notificationOnly} + + + + ${portalButton} + + ${footer} + + +`; + +export const generateCANCNoticeOfIntentHtml = ( + data: StatusUpdateEmail, +): MJMLParseResults => { + return new EmailTemplateService().generateEmailBase(template, data); +}; diff --git a/services/templates/emails/decision-released.template.ts b/services/templates/emails/decision-released/application.template.ts similarity index 88% rename from services/templates/emails/decision-released.template.ts rename to services/templates/emails/decision-released/application.template.ts index c49fd06a7b..4ef596f6bf 100644 --- a/services/templates/emails/decision-released.template.ts +++ b/services/templates/emails/decision-released/application.template.ts @@ -1,7 +1,7 @@ import { MJMLParseResults } from 'mjml-core'; -import { EmailTemplateService } from '../../libs/common/src/email-template-service/email-template.service'; -import { header, footer, notificationOnly, portalButton } from './partials'; -import { StatusUpdateEmail } from '../../apps/alcs/src/providers/email/email.service'; +import { EmailTemplateService } from '../../../libs/common/src/email-template-service/email-template.service'; +import { header, footer, notificationOnly, portalButton } from '../partials'; +import { StatusUpdateEmail } from '../../../apps/alcs/src/providers/email/email.service'; type DecisionReleasedStatusEmail = StatusUpdateEmail & { decisionReleaseMaskedDate: number; @@ -47,7 +47,7 @@ const template = ` `; -export const generateALCDHtml = ( +export const generateALCDApplicationHtml = ( data: DecisionReleasedStatusEmail, ): MJMLParseResults => { return new EmailTemplateService().generateEmailBase(template, data); diff --git a/services/templates/emails/decision-released/index.ts b/services/templates/emails/decision-released/index.ts new file mode 100644 index 0000000000..cf7fa6130d --- /dev/null +++ b/services/templates/emails/decision-released/index.ts @@ -0,0 +1,2 @@ +export * from './application.template'; +export * from './notice-of-intent.template'; diff --git a/services/templates/emails/decision-released/notice-of-intent.template.ts b/services/templates/emails/decision-released/notice-of-intent.template.ts new file mode 100644 index 0000000000..ade548924c --- /dev/null +++ b/services/templates/emails/decision-released/notice-of-intent.template.ts @@ -0,0 +1,54 @@ +import { MJMLParseResults } from 'mjml-core'; +import { EmailTemplateService } from '../../../libs/common/src/email-template-service/email-template.service'; +import { header, footer, notificationOnly, portalButton } from '../partials'; +import { StatusUpdateEmail } from '../../../apps/alcs/src/providers/email/email.service'; + +type DecisionReleasedStatusEmail = StatusUpdateEmail & { + decisionReleaseMaskedDate: number; +}; + +const template = ` + + + .line-height div { + line-height: 24px !important; + } + + .align-left { + float: left !important; + } + + + + ${header} + + + + + The decision for the above noted Notice of Intent (NOI) has been released on the the ALC Portal. + + + The decision document can be found by clicking 'View' from the NOI Inbox table in the ALC Portal, and then navigating to the 'ALC Review and Decision' tab. The decision will be available to the public on {{ decisionReleaseMaskedDate }}. + + + Further correspondence with respect to this NOI should be directed to ALC.Soil@gov.bc.ca. + + + If you are an agent acting on behalf of the applicant(s)/landowner(s), it is your responsibility to advise your client(s) of this, and any future, correspondence. + + ${notificationOnly} + + + + ${portalButton} + + ${footer} + + +`; + +export const generateALCDNoticeOfIntentHtml = ( + data: DecisionReleasedStatusEmail, +): MJMLParseResults => { + return new EmailTemplateService().generateEmailBase(template, data); +}; diff --git a/services/templates/emails/partials/header.template.ts b/services/templates/emails/partials/header.template.ts index 7993fe3bfd..e49082c8a3 100644 --- a/services/templates/emails/partials/header.template.ts +++ b/services/templates/emails/partials/header.template.ts @@ -3,7 +3,7 @@ import * as config from 'config'; export const header = ` - Application ID #{{fileNumber}} + {{ parentTypeLabel }} ID #{{fileNumber}} Owner Name: {{applicantName}} Status: {{status}} diff --git a/services/templates/emails/refused-to-forward.template.ts b/services/templates/emails/refused-to-forward.template.ts index 15007c6f1b..3cdba2e2cf 100644 --- a/services/templates/emails/refused-to-forward.template.ts +++ b/services/templates/emails/refused-to-forward.template.ts @@ -21,7 +21,7 @@ const template = ` - This email is to advise that the above noted {{ applicationType }} application has been reviewed by the {{ governmentName }} which has determined not to forward your application to the Agricultural Land Commission for further review. + This email is to advise that the above noted {{ childType }} application has been reviewed by the {{ governmentName }} which has determined not to forward your application to the Agricultural Land Commission for further review. If you have any questions about this outcome, please contact {{ governmentName }}. diff --git a/services/templates/emails/returned-as-incomplete.template.ts b/services/templates/emails/returned-as-incomplete.template.ts index e6d7173180..e97ce576b0 100644 --- a/services/templates/emails/returned-as-incomplete.template.ts +++ b/services/templates/emails/returned-as-incomplete.template.ts @@ -21,7 +21,7 @@ const template = ` - This email is to advise that the above noted {{ applicationType }} application is considered to be incomplete by the {{ governmentName }} and consequently it has been returned to the applicant. + This email is to advise that the above noted {{ childType }} application is considered to be incomplete by the {{ governmentName }} and consequently it has been returned to the applicant. Please login to the ALC Portal to view the comments left by the {{ governmentName }}. Please review, edit and re-submit the application. diff --git a/services/templates/emails/submitted-to-alc/applicant.template.ts b/services/templates/emails/submitted-to-alc/application.template.ts similarity index 99% rename from services/templates/emails/submitted-to-alc/applicant.template.ts rename to services/templates/emails/submitted-to-alc/application.template.ts index e73947d051..4c4e32e8e3 100644 --- a/services/templates/emails/submitted-to-alc/applicant.template.ts +++ b/services/templates/emails/submitted-to-alc/application.template.ts @@ -104,7 +104,7 @@ const template = ` `; -export const generateSUBMApplicantHtml = ( +export const generateSUBMApplicationHtml = ( data: StatusUpdateEmail, ): MJMLParseResults => { return new EmailTemplateService().generateEmailBase(template, data); diff --git a/services/templates/emails/submitted-to-alc/index.ts b/services/templates/emails/submitted-to-alc/index.ts index 218deecbd4..0232ab77f0 100644 --- a/services/templates/emails/submitted-to-alc/index.ts +++ b/services/templates/emails/submitted-to-alc/index.ts @@ -1,3 +1,5 @@ -export * from './applicant.template'; +export * from './application.template'; +export * from './noi-applicant.template'; +export * from './noi-government.template'; export * from './tur-applicant.template'; export * from './tur-government.template'; diff --git a/services/templates/emails/submitted-to-alc/noi-applicant.template.ts b/services/templates/emails/submitted-to-alc/noi-applicant.template.ts new file mode 100644 index 0000000000..e21577fab1 --- /dev/null +++ b/services/templates/emails/submitted-to-alc/noi-applicant.template.ts @@ -0,0 +1,105 @@ +import { MJMLParseResults } from 'mjml-core'; +import { EmailTemplateService } from '../../../libs/common/src/email-template-service/email-template.service'; +import { header, footer, notificationOnly, portalButton } from '../partials'; +import { + StatusUpdateEmail, + noiFees, +} from '../../../apps/alcs/src/providers/email/email.service'; + +const template = ` + + + .line-height div { + line-height: 24px !important; + } + + .align-left { + float: left !important; + } + + + + ${header} + + + + + This email is to acknowledge that the Agricultural Land Commission (ALC) is in receipt of the above noted {{ childType }} Notice of Intent (NOI). Please refer to the ALC NOI ID in all future correspondence with this office. A copy of this NOI has been forwarded to the {{ governmentName }} for information purposes. + + + NOTICE OF INTENT FEES - Payable to the Minister of Finance c/o the ALC + + +
+ + + + ${noiFees + .map((a) => { + return ` + + + + + `; + }) + .join('')} + + + This fee can be paid: +
    +
  1. Cheque: Made payable to the Minister of Finance c/o the ALC
    2. +
  2. Credit card: Over the phone or in-person
    3. +
+ + + Please include your assigned NOI ID with your payment. + + + Mailing address: +
+ Agricultural Land Commission +
+ 201-4940 Canada Way +
+ Burnaby, BC, Canada +
+ V5G 4K6 +
+ + + Paying via telephone: +
+ Tel: 604-660-7000 +
+ + + If you are making a long-distance call to a provincial government agency, you can place your call through Enquiry BC free of charge: +
+ In Victoria call: 250-387-6121 +
+ Elsewhere in BC call: 1-800-663-7867 +
+ + + If you are an agent acting on behalf of the applicant(s) / landowner(s), it is your responsibility to advise them of this, and any future, correspondence. + + + Please log into the ALC Portal for further updates on the NOI as it progresses. + + ${notificationOnly} + + + + ${portalButton} + + ${footer} + + +`; + +export const generateSUBMNoiApplicantHtml = ( + data: StatusUpdateEmail, +): MJMLParseResults => { + return new EmailTemplateService().generateEmailBase(template, data); +}; diff --git a/services/templates/emails/submitted-to-alc/noi-government.template.ts b/services/templates/emails/submitted-to-alc/noi-government.template.ts new file mode 100644 index 0000000000..84ed87c25d --- /dev/null +++ b/services/templates/emails/submitted-to-alc/noi-government.template.ts @@ -0,0 +1,44 @@ +import { MJMLParseResults } from 'mjml-core'; +import { EmailTemplateService } from '../../../libs/common/src/email-template-service/email-template.service'; +import { header, footer, notificationOnly, portalButton } from '../partials'; +import { StatusUpdateEmail } from '../../../apps/alcs/src/providers/email/email.service'; + +const template = ` + + + .line-height div { + line-height: 24px !important; + } + + .align-left { + float: left !important; + } + + + + ${header} + + + + + Agricultural Land Commission {{ childType }} NOI ID: {{ fileNumber }} ({{ applicantName }}) has been successfully submitted to the Agricultural Land Commission. A read-only copy of the Notice of Intent (NOI) has been submitted to the {{ governmentName }} for informational purposes. Should the {{ governmentName}} wish to comment on the NOI, please submit comments directly to the ALC. + + + Please log into the ALC Portal to view the NOI. + + ${notificationOnly} + + + + ${portalButton} + + ${footer} + + +`; + +export const generateSUBMNoiGovernmentHtml = ( + data: StatusUpdateEmail, +): MJMLParseResults => { + return new EmailTemplateService().generateEmailBase(template, data); +}; diff --git a/services/templates/emails/submitted-to-alc/tur-applicant.template.ts b/services/templates/emails/submitted-to-alc/tur-applicant.template.ts index 91840da803..1eb1ca18f5 100644 --- a/services/templates/emails/submitted-to-alc/tur-applicant.template.ts +++ b/services/templates/emails/submitted-to-alc/tur-applicant.template.ts @@ -21,7 +21,7 @@ const template = ` - This email is to acknowledge that the Agricultural Land Commission (ALC) is in receipt of the above noted {{ applicationType }} application. Please refer to the ALC Application ID in all future correspondence with this office. A copy of this application has been forwarded to the {{ governmentName }} for information purposes. + This email is to acknowledge that the Agricultural Land Commission (ALC) is in receipt of the above noted {{ childType }} application. Please refer to the ALC Application ID in all future correspondence with this office. A copy of this application has been forwarded to the {{ governmentName }} for information purposes. APPLICATION FEES - Payable to the Minister of Finance c/o the ALC diff --git a/services/templates/emails/submitted-to-alc/tur-government.template.ts b/services/templates/emails/submitted-to-alc/tur-government.template.ts index 13c599073c..c17f3e2125 100644 --- a/services/templates/emails/submitted-to-alc/tur-government.template.ts +++ b/services/templates/emails/submitted-to-alc/tur-government.template.ts @@ -21,7 +21,7 @@ const template = ` - Agricultural Land Commission {{ applicationType }} Application ID: {{ fileNumber }} ({{ applicantName }}) has been successfully submitted to the Agricultural Land Commission. A read-only copy of the application has been submitted to the {{ governmentName }} for informational purposes. Should the {{ governmentName }} wish to comment on the application, please submit comments directly to the ALC. + Agricultural Land Commission {{ childType }} Application ID: {{ fileNumber }} ({{ applicantName }}) has been successfully submitted to the Agricultural Land Commission. A read-only copy of the application has been submitted to the {{ governmentName }} for informational purposes. Should the {{ governmentName }} wish to comment on the application, please submit comments directly to the ALC. Please log into the ALC Portal to view the application. diff --git a/services/templates/emails/submitted-to-lfng/applicant.template.ts b/services/templates/emails/submitted-to-lfng/applicant.template.ts index 320c139d61..5bce0d49c7 100644 --- a/services/templates/emails/submitted-to-lfng/applicant.template.ts +++ b/services/templates/emails/submitted-to-lfng/applicant.template.ts @@ -24,7 +24,7 @@ const template = ` - This email is to acknowledge that you have submitted the above noted {{ applicationType }} application to the {{ governmentName }}. + This email is to acknowledge that you have submitted the above noted {{ childType }} application to the {{ governmentName }}. diff --git a/services/templates/emails/submitted-to-lfng/government.template.ts b/services/templates/emails/submitted-to-lfng/government.template.ts index 14cdd37905..53c9e73d44 100644 --- a/services/templates/emails/submitted-to-lfng/government.template.ts +++ b/services/templates/emails/submitted-to-lfng/government.template.ts @@ -30,7 +30,7 @@ const template = ` - Agricultural Land Commission {{ applicationType }} Application ID: {{ fileNumber }} ({{ applicantName }}) has been successfully submitted to the {{ governmentName }}. The Applicant has been instructed to contact the {{ governmentName }} for payment instructions regarding the applicable application fee. + Agricultural Land Commission {{ childType }} Application ID: {{ fileNumber }} ({{ applicantName }}) has been successfully submitted to the {{ governmentName }}. The Applicant has been instructed to contact the {{ governmentName }} for payment instructions regarding the applicable application fee. diff --git a/services/templates/emails/under-review-by-lfng.template.ts b/services/templates/emails/under-review-by-lfng.template.ts index 50bc360415..bb37198427 100644 --- a/services/templates/emails/under-review-by-lfng.template.ts +++ b/services/templates/emails/under-review-by-lfng.template.ts @@ -21,7 +21,7 @@ const template = ` - This email is to advise that the above noted {{ applicationType }} application has been received by the {{ governmentName }} for review. + This email is to advise that the above noted {{ childType }} application has been received by the {{ governmentName }} for review. If you have not already done so, please contact the {{ governmentName }} to determine the preferred form of payment as the application may not be processed until payment is received. diff --git a/services/templates/emails/wrong-lfng.template.ts b/services/templates/emails/wrong-lfng.template.ts index a0acfa46b3..7e6f856dd0 100644 --- a/services/templates/emails/wrong-lfng.template.ts +++ b/services/templates/emails/wrong-lfng.template.ts @@ -21,7 +21,7 @@ const template = ` - This email is to advise that the above noted {{ applicationType }} application does not fall within the jurisdiction of the {{ governmentName }} and consequently it has been returned to the applicant. + This email is to advise that the above noted {{ childType }} application does not fall within the jurisdiction of the {{ governmentName }} and consequently it has been returned to the applicant. Please login to the ALC Portal to select the correct Local or First Nation Government jurisdiction and re-submit the application. From aed186cbbd040c1e12cd53537d1bd3716b25dc79 Mon Sep 17 00:00:00 2001 From: Liam Stoddard Date: Thu, 24 Aug 2023 11:05:34 -0700 Subject: [PATCH 300/954] dicts working, code working, committing before refactor --- bin/migrate-oats-data/submap/direction_mapping.py | 5 ++++- bin/migrate-oats-data/submissions/app_submissions.py | 9 +++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/bin/migrate-oats-data/submap/direction_mapping.py b/bin/migrate-oats-data/submap/direction_mapping.py index a661e11f66..38534ced5d 100644 --- a/bin/migrate-oats-data/submap/direction_mapping.py +++ b/bin/migrate-oats-data/submap/direction_mapping.py @@ -26,4 +26,7 @@ def map_direction_field(data, dir_data): data['south_land_use_type'] = dir_data['nonfarm_use_type_code'] else: return data - return data \ No newline at end of file + return data + +# def map_dict_field(data, NESW) +# if data[] \ No newline at end of file diff --git a/bin/migrate-oats-data/submissions/app_submissions.py b/bin/migrate-oats-data/submissions/app_submissions.py index 63f5e44ef1..e6fe6cb8c4 100644 --- a/bin/migrate-oats-data/submissions/app_submissions.py +++ b/bin/migrate-oats-data/submissions/app_submissions.py @@ -200,6 +200,15 @@ def prepare_app_sub_data(app_sub_raw_data_list, raw_dir_data_list, test_dict): data = add_direction_field(data) if data["alr_application_id"] in test_dict: print(test_dict[data["alr_application_id"]]["alr_application_id"]) + data['east_land_use_type_description'] = test_dict[data["alr_application_id"]]['east_description'] + data['east_land_use_type'] = test_dict[data["alr_application_id"]]['east_type_code'] + data['west_land_use_type_description'] = test_dict[data["alr_application_id"]]['west_description'] + data['west_land_use_type'] = test_dict[data["alr_application_id"]]['west_type_code'] + data['north_land_use_type_description'] = test_dict[data["alr_application_id"]]['north_description'] + data['north_land_use_type'] = test_dict[data["alr_application_id"]]['north_type_code'] + data['south_land_use_type_description'] = test_dict[data["alr_application_id"]]['south_description'] + data['south_land_use_type'] = test_dict[data["alr_application_id"]]['south_type_code'] + print(data) #leaving off here to insert values from new fcn # for adj_row in raw_dir_data_list: # dir_data = dict(adj_row) From c91bcf698749ad1922b4ac37d164f740862483e9 Mon Sep 17 00:00:00 2001 From: Liam Stoddard Date: Thu, 24 Aug 2023 11:52:25 -0700 Subject: [PATCH 301/954] Cleaned up, fixed key error if NESW not all present. Ready for MR --- .../submap/direction_mapping.py | 78 +++++++++++++---- .../submissions/app_submissions.py | 83 +++---------------- 2 files changed, 71 insertions(+), 90 deletions(-) diff --git a/bin/migrate-oats-data/submap/direction_mapping.py b/bin/migrate-oats-data/submap/direction_mapping.py index 38534ced5d..621178242f 100644 --- a/bin/migrate-oats-data/submap/direction_mapping.py +++ b/bin/migrate-oats-data/submap/direction_mapping.py @@ -1,5 +1,6 @@ def add_direction_field(data): + # populates columns to be inserted data['east_land_use_type_description'] = None data['east_land_use_type'] = None data['west_land_use_type_description'] = None @@ -10,23 +11,64 @@ def add_direction_field(data): data['south_land_use_type'] = None return data -def map_direction_field(data, dir_data): - if data['alr_application_id'] == dir_data['alr_application_id']: - if dir_data['cardinal_direction'] == 'EAST': - data['east_land_use_type_description'] = dir_data['description'] - data['east_land_use_type'] = dir_data['nonfarm_use_type_code'] - if dir_data['cardinal_direction'] == 'WEST': - data['west_land_use_type_description'] = dir_data['description'] - data['west_land_use_type'] = dir_data['nonfarm_use_type_code'] - if dir_data['cardinal_direction'] == 'NORTH': - data['north_land_use_type_description'] = dir_data['description'] - data['north_land_use_type'] = dir_data['nonfarm_use_type_code'] - if dir_data['cardinal_direction'] == 'SOUTH': - data['south_land_use_type_description'] = dir_data['description'] - data['south_land_use_type'] = dir_data['nonfarm_use_type_code'] - else: - return data +def get_NESW_rows(rows, cursor): + # fetches adjacent land use data, specifically direction, description and type code + application_ids = [dict(item)["alr_application_id"] for item in rows] + application_ids_string = ', '.join(str(item) for item in application_ids) + adj_rows_query = f"""SELECT * from + oats.oats_adjacent_land_uses oalu + WHERE oalu.alr_application_id in ({application_ids_string}) + """ + cursor.execute(adj_rows_query) + adj_rows = cursor.fetchall() + return adj_rows + +def map_direction_values(data, direction_data): + # adds direction field values into data row + data['east_land_use_type_description'] = direction_data.get(data["alr_application_id"], {}).get('east_description', 'No entry found') + data['east_land_use_type'] = direction_data.get(data["alr_application_id"], {}).get('east_type_code', None) + data['west_land_use_type_description'] = direction_data.get(data["alr_application_id"], {}).get('west_description', 'No entry found') + data['west_land_use_type'] = direction_data.get(data["alr_application_id"], {}).get('west_type_code', None) + data['north_land_use_type_description'] = direction_data.get(data["alr_application_id"], {}).get('north_description', 'No entry found') + data['north_land_use_type'] = direction_data.get(data["alr_application_id"], {}).get('north_type_code', None) + data['south_land_use_type_description'] = direction_data.get(data["alr_application_id"], {}).get('south_description', 'No entry found') + data['south_land_use_type'] = direction_data.get(data["alr_application_id"], {}).get('south_type_code', None) return data -# def map_dict_field(data, NESW) -# if data[] \ No newline at end of file +def create_dir_dict(adj_rows): + # creates dictionary of adjacent land use data with all directions attributed to one application id + dir_dict = {} + for row in adj_rows: + application_id = row['alr_application_id'] + + if application_id in dir_dict: + if row['cardinal_direction'] == 'EAST': + dir_dict[application_id]['east_description'] = row['description'] + dir_dict[application_id]['east_type_code'] = row['nonfarm_use_type_code'] + if row['cardinal_direction'] == 'WEST': + dir_dict[application_id]['west_description'] = row['description'] + dir_dict[application_id]['west_type_code'] = row['nonfarm_use_type_code'] + if row['cardinal_direction'] == 'NORTH': + dir_dict[application_id]['north_description'] = row['description'] + dir_dict[application_id]['north_type_code'] = row['nonfarm_use_type_code'] + if row['cardinal_direction'] == 'SOUTH': + dir_dict[application_id]['south_description'] = row['description'] + dir_dict[application_id]['south_type_code'] = row['nonfarm_use_type_code'] + else: + dir_dict[application_id] = {} + dir_dict[application_id]['alr_application_id'] = row['alr_application_id'] + + if row['cardinal_direction'] == 'EAST': + dir_dict[application_id]['east_description'] = row['description'] + dir_dict[application_id]['east_type_code'] = row['nonfarm_use_type_code'] + if row['cardinal_direction'] == 'WEST': + dir_dict[application_id]['west_description'] = row['description'] + dir_dict[application_id]['west_type_code'] = row['nonfarm_use_type_code'] + if row['cardinal_direction'] == 'NORTH': + dir_dict[application_id]['north_description'] = row['description'] + dir_dict[application_id]['north_type_code'] = row['nonfarm_use_type_code'] + if row['cardinal_direction'] == 'SOUTH': + dir_dict[application_id]['south_description'] = row['description'] + dir_dict[application_id]['south_type_code'] = row['nonfarm_use_type_code'] + + return dir_dict \ No newline at end of file diff --git a/bin/migrate-oats-data/submissions/app_submissions.py b/bin/migrate-oats-data/submissions/app_submissions.py index e6fe6cb8c4..62e5c869fe 100644 --- a/bin/migrate-oats-data/submissions/app_submissions.py +++ b/bin/migrate-oats-data/submissions/app_submissions.py @@ -5,7 +5,9 @@ ) from submap import ( add_direction_field, - map_direction_field, + map_direction_values, + create_dir_dict, + get_NESW_rows, ) from db import inject_conn_pool from constants import BATCH_UPLOAD_SIZE @@ -57,59 +59,12 @@ def process_alcs_app_submissions(conn=None, batch_size=BATCH_UPLOAD_SIZE): if not rows: break try: - application_ids = [dict(item)["alr_application_id"] for item in rows] - application_ids_string = ', '.join(str(item) for item in application_ids) - adj_rows_query = f"""SELECT * from - oats.oats_adjacent_land_uses oalu - WHERE oalu.alr_application_id in ({application_ids_string}) - """ - cursor.execute(adj_rows_query) - adj_rows = cursor.fetchall() - test_dict = {} - for row in adj_rows: - application_id = row['alr_application_id'] - if application_id in test_dict: - if row['cardinal_direction'] == 'EAST': - test_dict[application_id]['east_description'] = row['description'] - test_dict[application_id]['east_type_code'] = row['nonfarm_use_type_code'] - # test_dict[application_id].append(row) - if row['cardinal_direction'] == 'WEST': - test_dict[application_id]['west_description'] = row['description'] - test_dict[application_id]['west_type_code'] = row['nonfarm_use_type_code'] - if row['cardinal_direction'] == 'NORTH': - test_dict[application_id]['north_description'] = row['description'] - test_dict[application_id]['north_type_code'] = row['nonfarm_use_type_code'] - if row['cardinal_direction'] == 'SOUTH': - test_dict[application_id]['south_description'] = row['description'] - test_dict[application_id]['south_type_code'] = row['nonfarm_use_type_code'] - else: - test_dict[application_id] = {} - test_dict[application_id]['alr_application_id'] = row['alr_application_id'] - # test_dict[application_id] = [row] - if row['cardinal_direction'] == 'EAST': - test_dict[application_id]['east_description'] = row['description'] - test_dict[application_id]['east_type_code'] = row['nonfarm_use_type_code'] - # test_dict[application_id].append(row) - if row['cardinal_direction'] == 'WEST': - test_dict[application_id]['west_description'] = row['description'] - test_dict[application_id]['west_type_code'] = row['nonfarm_use_type_code'] - if row['cardinal_direction'] == 'NORTH': - test_dict[application_id]['north_description'] = row['description'] - test_dict[application_id]['north_type_code'] = row['nonfarm_use_type_code'] - if row['cardinal_direction'] == 'SOUTH': - test_dict[application_id]['south_description'] = row['description'] - test_dict[application_id]['south_type_code'] = row['nonfarm_use_type_code'] - - # for row in {adj_rows['alr_application_id']: adj_rows for adj_rows in adj_rows} - # print(test_dict) - - # print("this is rows") - # print(rows) - # print("end rows") + adj_rows = get_NESW_rows(rows, cursor) + direction_data = create_dir_dict(adj_rows) submissions_to_be_inserted_count = len(rows) - insert_app_sub_records(conn, batch_size, cursor, rows, adj_rows, test_dict) + insert_app_sub_records(conn, batch_size, cursor, rows, direction_data) successful_inserts_count = ( successful_inserts_count + submissions_to_be_inserted_count @@ -133,7 +88,7 @@ def process_alcs_app_submissions(conn=None, batch_size=BATCH_UPLOAD_SIZE): print("Total failed inserts:", failed_inserts) log_end(etl_name) -def insert_app_sub_records(conn, batch_size, cursor, rows, adj_rows, test_dict): +def insert_app_sub_records(conn, batch_size, cursor, rows, direction_data): """ Function to insert submission records in batches. @@ -150,7 +105,7 @@ def insert_app_sub_records(conn, batch_size, cursor, rows, adj_rows, test_dict): nfu_data_list, other_data_list, inc_exc_data_list, - ) = prepare_app_sub_data(rows, adj_rows, test_dict) + ) = prepare_app_sub_data(rows, direction_data) if len(nfu_data_list) > 0: execute_batch( @@ -178,7 +133,7 @@ def insert_app_sub_records(conn, batch_size, cursor, rows, adj_rows, test_dict): conn.commit() -def prepare_app_sub_data(app_sub_raw_data_list, raw_dir_data_list, test_dict): +def prepare_app_sub_data(app_sub_raw_data_list, direction_data): """ This function prepares different lists of data based on the 'alr_change_code' field of each data dict in 'app_sub_raw_data_list'. @@ -198,24 +153,8 @@ def prepare_app_sub_data(app_sub_raw_data_list, raw_dir_data_list, test_dict): for row in app_sub_raw_data_list: data = dict(row) data = add_direction_field(data) - if data["alr_application_id"] in test_dict: - print(test_dict[data["alr_application_id"]]["alr_application_id"]) - data['east_land_use_type_description'] = test_dict[data["alr_application_id"]]['east_description'] - data['east_land_use_type'] = test_dict[data["alr_application_id"]]['east_type_code'] - data['west_land_use_type_description'] = test_dict[data["alr_application_id"]]['west_description'] - data['west_land_use_type'] = test_dict[data["alr_application_id"]]['west_type_code'] - data['north_land_use_type_description'] = test_dict[data["alr_application_id"]]['north_description'] - data['north_land_use_type'] = test_dict[data["alr_application_id"]]['north_type_code'] - data['south_land_use_type_description'] = test_dict[data["alr_application_id"]]['south_description'] - data['south_land_use_type'] = test_dict[data["alr_application_id"]]['south_type_code'] - print(data) - #leaving off here to insert values from new fcn - # for adj_row in raw_dir_data_list: - # dir_data = dict(adj_row) - # data = map_direction_field(data, dir_data) - # currently rather slow - # ToDo optimize, potentially give index for dir_data resume point - + if data["alr_application_id"] in direction_data: + data = map_direction_values(data, direction_data) if data["alr_change_code"] == ALRChangeCode.NFU.value: nfu_data_list.append(data) elif data["alr_change_code"] == ALRChangeCode.EXC.value or data["alr_change_code"] == ALRChangeCode.INC.value: From 1006063127d69297ebbcbba17403d3ebfbd89dc2 Mon Sep 17 00:00:00 2001 From: Liam Stoddard Date: Thu, 24 Aug 2023 13:46:10 -0700 Subject: [PATCH 302/954] changed 'No entry found' to 'No data found' --- bin/migrate-oats-data/submap/direction_mapping.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/migrate-oats-data/submap/direction_mapping.py b/bin/migrate-oats-data/submap/direction_mapping.py index 621178242f..ff8afa18e1 100644 --- a/bin/migrate-oats-data/submap/direction_mapping.py +++ b/bin/migrate-oats-data/submap/direction_mapping.py @@ -25,13 +25,13 @@ def get_NESW_rows(rows, cursor): def map_direction_values(data, direction_data): # adds direction field values into data row - data['east_land_use_type_description'] = direction_data.get(data["alr_application_id"], {}).get('east_description', 'No entry found') + data['east_land_use_type_description'] = direction_data.get(data["alr_application_id"], {}).get('east_description', 'No data found') data['east_land_use_type'] = direction_data.get(data["alr_application_id"], {}).get('east_type_code', None) - data['west_land_use_type_description'] = direction_data.get(data["alr_application_id"], {}).get('west_description', 'No entry found') + data['west_land_use_type_description'] = direction_data.get(data["alr_application_id"], {}).get('west_description', 'No data found') data['west_land_use_type'] = direction_data.get(data["alr_application_id"], {}).get('west_type_code', None) - data['north_land_use_type_description'] = direction_data.get(data["alr_application_id"], {}).get('north_description', 'No entry found') + data['north_land_use_type_description'] = direction_data.get(data["alr_application_id"], {}).get('north_description', 'No data found') data['north_land_use_type'] = direction_data.get(data["alr_application_id"], {}).get('north_type_code', None) - data['south_land_use_type_description'] = direction_data.get(data["alr_application_id"], {}).get('south_description', 'No entry found') + data['south_land_use_type_description'] = direction_data.get(data["alr_application_id"], {}).get('south_description', 'No data found') data['south_land_use_type'] = direction_data.get(data["alr_application_id"], {}).get('south_type_code', None) return data From 47236f008327f2037288a912ee82d88b8d564a85 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Thu, 24 Aug 2023 15:13:07 -0700 Subject: [PATCH 303/954] NOI Decisions V2 Pt2 * Update UI to match NOI * Update number generation for decisions to include NOI and Application Decisions * Rename DecisionDocumentDto -> ApplicationDecisionDocumentDto --- .../pofo/pofo.component.html | 75 +++++------------- .../roso/roso.component.html | 72 +++++------------ .../decision-documents.component.ts | 13 +-- .../decision-input-v2.component.ts | 12 +-- ...reate-noi-modification-dialog.component.ts | 10 ++- .../decision-dialog.component.ts | 2 +- .../decision-v1/decision-v1.component.html | 2 +- .../decision-v1/decision-v1.component.ts | 4 +- .../pofo/pofo.component.html | 79 +++++-------------- .../roso/roso.component.html | 72 +++++------------ .../decision-documents.component.ts | 16 ++-- .../decision-components.component.ts | 4 +- .../decision-input-v2.component.html | 23 +++--- .../decision-input-v2.component.scss | 2 +- .../decision-input-v2.component.ts | 46 ++++++----- .../decision-v2/decision-v2.component.html | 34 +++++--- .../overview/overview.component.ts | 2 +- .../application-decision.dto.ts | 4 +- .../decision/notice-of-intent-decision.dto.ts | 12 +-- .../notice-of-intent-decision-v1.service.ts | 4 +- ...e-of-intent-decision-v2.controller.spec.ts | 6 +- ...notice-of-intent-decision-v2.controller.ts | 4 +- ...tice-of-intent-decision-v2.service.spec.ts | 2 +- .../notice-of-intent-decision-v2.service.ts | 12 ++- .../notice-of-intent-decision.dto.ts | 34 ++------ .../notice-of-intent-decision.entity.ts | 18 ++--- .../notice-of-intent-decision.module.ts | 8 +- ...e-of-intent-decision.automapper.profile.ts | 12 +++ ...0-update_dec_number_generation_for_nois.ts | 54 +++++++++++++ 29 files changed, 282 insertions(+), 356 deletions(-) create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1692902429290-update_dec_number_generation_for_nois.ts diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pofo/pofo.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pofo/pofo.component.html index f6960c3d2b..3288a2c74e 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pofo/pofo.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pofo/pofo.component.html @@ -11,60 +11,23 @@ *ngIf="component.soilFillTypeToPlace === null || component.soilFillTypeToPlace === undefined" > -
-
Application TypeALC Portion of Fee
${a.type}$${a.fee}
- - - - - - - - - - - - - - - - - - - - - - -
Fill to be Placed
Volume - - {{ component.soilToPlaceVolume }} m3 - - -
- Area -
Note: 0.01 ha is 100m2
- 		- - {{ component.soilToPlaceArea }} ha - - -
Maximum Depth - - {{ component.soilToPlaceMaximumDepth }} m - - -
Average Depth - {{ component.soilToPlaceAverageDepth }} m - -
+
+
Volume
+ {{ component.soilToPlaceVolume }} m3 + +
+
+
Area
+ {{ component.soilToPlaceArea }} m2 + +
+
+
Maximum Depth
+ {{ component.soilToPlaceMaximumDepth }} m + +
+
+
Average Depth
+ {{ component.soilToPlaceAverageDepth }} m +
diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/roso/roso.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/roso/roso.component.html index 52a9c85e0e..160bf4b370 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/roso/roso.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/roso/roso.component.html @@ -9,57 +9,23 @@
{{ component.soilTypeRemoved }}
-
- - - - - - - - - - - - - - - - - - - - - - - -
Soil to be Removed
Volume - {{ component.soilToRemoveVolume }} m3 - -
Area - - {{ component.soilToRemoveArea }} ha - - -
Maximum Depth - {{ component.soilToRemoveMaximumDepth }} m - -
Average Depth - {{ component.soilToRemoveAverageDepth }} m - -
+
+
Volume
+ {{ component.soilToRemoveVolume }} m3 + +
+
+
Area
+ {{ component.soilToRemoveArea }} m2 + +
+
+
Maximum Depth
+ {{ component.soilToRemoveMaximumDepth }} m + +
+
+
Average Depth
+ {{ component.soilToRemoveAverageDepth }} m +
diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-documents/decision-documents.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-documents/decision-documents.component.ts index 2010e9202f..eac574e122 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-documents/decision-documents.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-documents/decision-documents.component.ts @@ -3,7 +3,7 @@ import { MatDialog } from '@angular/material/dialog'; import { MatSort } from '@angular/material/sort'; import { MatTableDataSource } from '@angular/material/table'; import { Subject, takeUntil } from 'rxjs'; -import { DecisionDocumentDto } from '../../../../../services/application/decision/application-decision-v1/application-decision.dto'; +import { ApplicationDecisionDocumentDto } from '../../../../../services/application/decision/application-decision-v1/application-decision.dto'; import { ApplicationDecisionDto } from '../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; import { ApplicationDecisionV2Service } from '../../../../../services/application/decision/application-decision-v2/application-decision-v2.service'; import { ToastService } from '../../../../../services/toast/toast.service'; @@ -25,11 +25,12 @@ export class DecisionDocumentsComponent implements OnInit, OnDestroy { @Output() beforeDocumentUpload = new EventEmitter(); displayedColumns: string[] = ['type', 'fileName', 'source', 'visibilityFlags', 'uploadedAt', 'actions']; - documents: DecisionDocumentDto[] = []; + documents: ApplicationDecisionDocumentDto[] = []; private fileId = ''; @ViewChild(MatSort) sort!: MatSort; - dataSource: MatTableDataSource = new MatTableDataSource(); + dataSource: MatTableDataSource = + new MatTableDataSource(); constructor( private decisionService: ApplicationDecisionV2Service, @@ -67,11 +68,11 @@ export class DecisionDocumentsComponent implements OnInit, OnDestroy { this.openFileDialog(); } - onEditFile(element: DecisionDocumentDto) { + onEditFile(element: ApplicationDecisionDocumentDto) { this.openFileDialog(element); } - private openFileDialog(existingDocument?: DecisionDocumentDto) { + private openFileDialog(existingDocument?: ApplicationDecisionDocumentDto) { if (this.decision) { this.dialog .open(DecisionDocumentUploadDialogComponent, { @@ -93,7 +94,7 @@ export class DecisionDocumentsComponent implements OnInit, OnDestroy { } } - onDeleteFile(element: DecisionDocumentDto) { + onDeleteFile(element: ApplicationDecisionDocumentDto) { this.confirmationDialogService .openDialog({ body: 'Are you sure you want to delete the selected file?', diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.ts index 7173b2f6aa..672049a355 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.ts @@ -122,6 +122,7 @@ export class DecisionInputV2Component implements OnInit, OnDestroy { if (this.fileNumber) { this.loadData(); + this.setupSubscribers(); } } @@ -169,11 +170,9 @@ export class DecisionInputV2Component implements OnInit, OnDestroy { this.decisionMakers = this.codes.decisionMakers; this.ceoCriterionItems = this.codes.ceoCriterion; this.linkedResolutionOutcomes = this.codes.linkedResolutionOutcomeTypes; - - await this.prepareDataForEdit(); } - private async prepareDataForEdit() { + private setupSubscribers() { this.decisionService.$decision .pipe(takeUntil(this.$destroy)) .pipe( @@ -219,15 +218,18 @@ export class DecisionInputV2Component implements OnInit, OnDestroy { this.minDate = new Date(minDate); } - if (!this.isFirstDecision) { + if (this.isFirstDecision) { + this.form.controls.postDecision.disable(); + } else { this.form.controls.postDecision.addValidators([Validators.required]); - this.form.controls.decisionMaker.disable(); + this.form.controls.postDecision.enable(); this.onSelectPostDecision({ type: this.existingDecision.modifies ? PostDecisionType.Modification : PostDecisionType.Reconsideration, }); } } else { this.isFirstDecision = true; + this.form.controls.postDecision.disable(); } } else { this.resolutionYearControl.enable(); diff --git a/alcs-frontend/src/app/features/board/dialogs/noi-modification/create/create-noi-modification-dialog.component.ts b/alcs-frontend/src/app/features/board/dialogs/noi-modification/create/create-noi-modification-dialog.component.ts index 6df8001b33..3d433ace85 100644 --- a/alcs-frontend/src/app/features/board/dialogs/noi-modification/create/create-noi-modification-dialog.component.ts +++ b/alcs-frontend/src/app/features/board/dialogs/noi-modification/create/create-noi-modification-dialog.component.ts @@ -167,10 +167,12 @@ export class CreateNoiModificationDialogComponent implements OnInit, OnDestroy { async loadDecisions(fileNumber: string) { const decisions = await this.decisionService.fetchByFileNumber(fileNumber); if (decisions.length > 0) { - this.decisions = decisions.map((decision) => ({ - uuid: decision.uuid, - resolution: `#${decision.resolutionNumber}/${decision.resolutionYear}`, - })); + this.decisions = decisions + .filter((dec) => !dec.isDraft) + .map((decision) => ({ + uuid: decision.uuid, + resolution: `#${decision.resolutionNumber}/${decision.resolutionYear}`, + })); this.modifiesDecisions.enable(); } } diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-dialog/decision-dialog.component.ts b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-dialog/decision-dialog.component.ts index 21aaa1d4fa..a3aa9ceb03 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-dialog/decision-dialog.component.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-dialog/decision-dialog.component.ts @@ -141,7 +141,7 @@ export class DecisionDialogComponent implements OnInit { outcome: existingDecision.outcome.code, decisionMaker: existingDecision.decisionMaker, decisionMakerName: existingDecision.decisionMakerName, - date: new Date(existingDecision.date), + date: new Date(existingDecision.date!), resolutionYear: existingDecision.resolutionYear, resolutionNumber: existingDecision.resolutionNumber.toString(10), auditDate: existingDecision.auditDate ? new Date(existingDecision.auditDate) : undefined, diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v1/decision-v1.component.html b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v1/decision-v1.component.html index 6992915501..4609dbca54 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v1/decision-v1.component.html +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v1/decision-v1.component.html @@ -48,7 +48,7 @@

Decision

Decision Date
- {{ decision.date | momentFormat }} + {{ decision.date! | momentFormat }}
Decision Outcome
diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v1/decision-v1.component.ts b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v1/decision-v1.component.ts index 22c087f4c1..309c2b87c5 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v1/decision-v1.component.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v1/decision-v1.component.ts @@ -72,7 +72,7 @@ export class DecisionV1Component implements OnInit, OnDestroy { onCreate() { let minDate = new Date(0); if (this.decisions.length > 0) { - minDate = new Date(this.decisions[this.decisions.length - 1].date); + minDate = new Date(this.decisions[this.decisions.length - 1].date!); } this.dialog @@ -101,7 +101,7 @@ export class DecisionV1Component implements OnInit, OnDestroy { const decisionIndex = this.decisions.indexOf(decision); let minDate = new Date(0); if (decisionIndex !== this.decisions.length - 1) { - minDate = new Date(this.decisions[this.decisions.length - 1].date); + minDate = new Date(this.decisions[this.decisions.length - 1].date!); } this.dialog .open(DecisionDialogComponent, { diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/pofo/pofo.component.html b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/pofo/pofo.component.html index f6960c3d2b..5e2e786e4e 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/pofo/pofo.component.html +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/pofo/pofo.component.html @@ -7,64 +7,25 @@
Type, origin and quality of fill proposed to be placed
{{ component.soilFillTypeToPlace }}
- +
-
- - - - - - - - - - - - - - - - - - - - - - - -
Fill to be Placed
Volume - - {{ component.soilToPlaceVolume }} m3 - - -
- Area -
Note: 0.01 ha is 100m2
- 		- - {{ component.soilToPlaceArea }} ha - - -
Maximum Depth - - {{ component.soilToPlaceMaximumDepth }} m - - -
Average Depth - {{ component.soilToPlaceAverageDepth }} m - -
+
+
Volume
+ {{ component.soilToPlaceVolume }} m3 + +
+
+
Area
+ {{ component.soilToPlaceArea }} m2 + +
+
+
Maximum Depth
+ {{ component.soilToPlaceMaximumDepth }} m + +
+
+
Average Depth
+ {{ component.soilToPlaceAverageDepth }} m +
diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/roso/roso.component.html b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/roso/roso.component.html index 52a9c85e0e..160bf4b370 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/roso/roso.component.html +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/roso/roso.component.html @@ -9,57 +9,23 @@
{{ component.soilTypeRemoved }}
-
- - - - - - - - - - - - - - - - - - - - - - - -
Soil to be Removed
Volume - {{ component.soilToRemoveVolume }} m3 - -
Area - - {{ component.soilToRemoveArea }} ha - - -
Maximum Depth - {{ component.soilToRemoveMaximumDepth }} m - -
Average Depth - {{ component.soilToRemoveAverageDepth }} m - -
+
+
Volume
+ {{ component.soilToRemoveVolume }} m3 + +
+
+
Area
+ {{ component.soilToRemoveArea }} m2 + +
+
+
Maximum Depth
+ {{ component.soilToRemoveMaximumDepth }} m + +
+
+
Average Depth
+ {{ component.soilToRemoveAverageDepth }} m +
diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-documents/decision-documents.component.ts b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-documents/decision-documents.component.ts index 70aa70d30d..6dd0e805af 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-documents/decision-documents.component.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-documents/decision-documents.component.ts @@ -3,9 +3,11 @@ import { MatDialog } from '@angular/material/dialog'; import { MatSort } from '@angular/material/sort'; import { MatTableDataSource } from '@angular/material/table'; import { Subject, takeUntil } from 'rxjs'; -import { DecisionDocumentDto } from '../../../../../services/application/decision/application-decision-v1/application-decision.dto'; import { NoticeOfIntentDecisionV2Service } from '../../../../../services/notice-of-intent/decision-v2/notice-of-intent-decision-v2.service'; -import { NoticeOfIntentDecisionDto } from '../../../../../services/notice-of-intent/decision/notice-of-intent-decision.dto'; +import { + NoticeOfIntentDecisionDocumentDto, + NoticeOfIntentDecisionDto, +} from '../../../../../services/notice-of-intent/decision/notice-of-intent-decision.dto'; import { ToastService } from '../../../../../services/toast/toast.service'; import { ConfirmationDialogService } from '../../../../../shared/confirmation-dialog/confirmation-dialog.service'; import { DecisionDocumentUploadDialogComponent } from '../decision-input/decision-file-upload-dialog/decision-document-upload-dialog.component'; @@ -25,11 +27,11 @@ export class DecisionDocumentsComponent implements OnInit, OnDestroy { @Output() beforeDocumentUpload = new EventEmitter(); displayedColumns: string[] = ['type', 'fileName', 'source', 'visibilityFlags', 'uploadedAt', 'actions']; - documents: DecisionDocumentDto[] = []; + documents: NoticeOfIntentDecisionDocumentDto[] = []; private fileId = ''; @ViewChild(MatSort) sort!: MatSort; - dataSource: MatTableDataSource = new MatTableDataSource(); + dataSource = new MatTableDataSource(); constructor( private decisionService: NoticeOfIntentDecisionV2Service, @@ -67,11 +69,11 @@ export class DecisionDocumentsComponent implements OnInit, OnDestroy { this.openFileDialog(); } - onEditFile(element: DecisionDocumentDto) { + onEditFile(element: NoticeOfIntentDecisionDocumentDto) { this.openFileDialog(element); } - private openFileDialog(existingDocument?: DecisionDocumentDto) { + private openFileDialog(existingDocument?: NoticeOfIntentDecisionDocumentDto) { if (this.decision) { this.dialog .open(DecisionDocumentUploadDialogComponent, { @@ -93,7 +95,7 @@ export class DecisionDocumentsComponent implements OnInit, OnDestroy { } } - onDeleteFile(element: DecisionDocumentDto) { + onDeleteFile(element: NoticeOfIntentDecisionDocumentDto) { this.confirmationDialogService .openDialog({ body: 'Are you sure you want to delete the selected file?', diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-components.component.ts b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-components.component.ts index 57efe1cd61..ef7853468e 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-components.component.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-components.component.ts @@ -67,9 +67,7 @@ export class DecisionComponentsComponent implements OnInit, OnDestroy, AfterView .subscribe(async (noticeOfIntent) => { if (noticeOfIntent) { this.noticeOfIntent = noticeOfIntent; - - //TODO:What? - //this.noticeOfIntent.submittedApplication = await this.submissionService.fetchSubmission(noticeOfIntent.fileNumber); + this.noticeOfIntentSubmission = await this.submissionService.fetchSubmission(noticeOfIntent.fileNumber); } }); diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-input-v2.component.html b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-input-v2.component.html index 06250cfd89..8178384585 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-input-v2.component.html +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-input-v2.component.html @@ -65,13 +65,25 @@

Resolution

+
+ Decision Maker* + + CEO Delegate + CEO + +
+ + + Decision Maker Name + + + Resolution > -
- - Decision Maker - - -
- (null, [Validators.required]), date: new FormControl(undefined, [Validators.required]), decisionMaker: new FormControl(null, [Validators.required]), + decisionMakerName: new FormControl(null), postDecision: new FormControl(null), resolutionNumber: this.resolutionNumberControl, resolutionYear: this.resolutionYearControl, @@ -94,11 +95,12 @@ export class DecisionInputV2Component implements OnInit, OnDestroy { ngOnInit(): void { this.resolutionYearControl.disable(); - this.setYear(); + this.populateResolutionYears(); this.extractAndPopulateQueryParams(); if (this.fileNumber) { + this.setupSubscribers(); this.loadData(); } } @@ -118,7 +120,7 @@ export class DecisionInputV2Component implements OnInit, OnDestroy { } } - private setYear() { + private populateResolutionYears() { const year = moment('1974'); const currentYear = moment().year(); while (year.year() <= currentYear) { @@ -143,15 +145,14 @@ export class DecisionInputV2Component implements OnInit, OnDestroy { await this.decisionService.loadDecisions(this.fileNumber); this.codes = await this.decisionService.fetchCodes(); + this.modificationService.fetchByFileNumber(this.fileNumber); this.outcomes = this.codes.outcomes; - - await this.prepareDataForEdit(); } - private async prepareDataForEdit() { + private setupSubscribers() { this.decisionService.$decision - .pipe(takeUntil(this.$destroy)) .pipe(combineLatestWith(this.modificationService.$modifications, this.decisionService.$decisions)) + .pipe(takeUntil(this.$destroy)) .subscribe(([decision, modifications, decisions]) => { if (decision) { this.existingDecision = decision; @@ -188,12 +189,15 @@ export class DecisionInputV2Component implements OnInit, OnDestroy { this.minDate = new Date(minDate); } - if (!this.isFirstDecision) { + if (this.isFirstDecision) { + this.form.controls.postDecision.disable(); + } else { + this.form.controls.postDecision.enable(); this.form.controls.postDecision.addValidators([Validators.required]); - this.form.controls.decisionMaker.disable(); } } else { this.isFirstDecision = true; + this.form.controls.postDecision.disable(); } } else { this.resolutionYearControl.enable(); @@ -205,24 +209,24 @@ export class DecisionInputV2Component implements OnInit, OnDestroy { modifications: NoticeOfIntentModificationDto[], existingDecision?: NoticeOfIntentDecisionDto ) { - this.postDecisions = modifications - .filter( - (modification) => - (existingDecision && existingDecision.modifies?.uuid === modification.uuid) || - (modification.reviewOutcome.code === 'PRC' && !modification.resultingDecision) - ) - .map((modification, index) => ({ - label: `Modification Request #${modifications.length - index} - ${modification.modifiesDecisions - .map((dec) => `#${dec.resolutionNumber}/${dec.resolutionYear}`) - .join(', ')}`, - uuid: modification.uuid, - })); + const proceededModifications = modifications.filter( + (modification) => + (existingDecision && existingDecision.modifies?.uuid === modification.uuid) || + (modification.reviewOutcome.code === 'PRC' && !modification.resultingDecision) + ); + this.postDecisions = proceededModifications.map((modification, index) => ({ + label: `Modification Request #${modifications.length - index} - ${modification.modifiesDecisions + .map((dec) => `#${dec.resolutionNumber}/${dec.resolutionYear}`) + .join(', ')}`, + uuid: modification.uuid, + })); } private patchFormWithExistingData(existingDecision: NoticeOfIntentDecisionDto) { this.form.patchValue({ outcome: existingDecision.outcome.code, decisionMaker: existingDecision.decisionMaker, + decisionMakerName: existingDecision.decisionMakerName, date: existingDecision.date ? new Date(existingDecision.date) : undefined, resolutionYear: existingDecision.resolutionYear, resolutionNumber: existingDecision.resolutionNumber?.toString(10) || undefined, @@ -299,6 +303,7 @@ export class DecisionInputV2Component implements OnInit, OnDestroy { date, outcome, decisionMaker, + decisionMakerName, resolutionNumber, resolutionYear, auditDate, @@ -314,6 +319,7 @@ export class DecisionInputV2Component implements OnInit, OnDestroy { date: formatDateForApi(date!), resolutionNumber: parseInt(resolutionNumber!), resolutionYear: resolutionYear!, + decisionMakerName, auditDate: auditDate ? formatDateForApi(auditDate) : auditDate, outcomeCode: outcome!, fileNumber: this.fileNumber, diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-v2.component.html b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-v2.component.html index 481d7d9ba9..a8243709e2 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-v2.component.html +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-v2.component.html @@ -23,15 +23,15 @@
Modified By:  - {{ decision.modifiedBy?.join(', ') }} - N/A + {{ decision.modifiedByResolutions?.join(', ') }} + N/A
-

Decision #{{ i }}

+

Decision #{{ decisions.length - i }}

calendar_month @@ -79,7 +79,7 @@

Resolution

Decision Date
- {{ decision.date | momentFormat }} + {{ decision.date | momentFormat }}
@@ -93,6 +93,14 @@

Resolution

{{ decision.outcome.label }} {{ decision.isSubjectToConditions ? '- Subject to Conditions' : '' }}
+
+
Decision Maker Name
+ {{ decision.decisionMakerName }} + +
+
Decision Description
{{ decision.decisionDescription }} @@ -124,9 +132,9 @@

Resolution

Documents

- - - +
+ +
@@ -149,8 +157,8 @@
{{ component.noticeOfIntentDecisionComponentType?.label }}
[component]="component" [fillRow]="true" (saveAlrArea)="onSaveAlrArea(decision.uuid, component.uuid, $event)" - > + > + {{ component.noticeOfIntentDecisionComponentType?.label }} [component]="component" [fillRow]="true" (saveAlrArea)="onSaveAlrArea(decision.uuid, component.uuid, $event)" - > + > + {{ component.noticeOfIntentDecisionComponentType?.label }} [component]="component" [fillRow]="true" (saveAlrArea)="onSaveAlrArea(decision.uuid, component.uuid, $event)" - > + > +
diff --git a/alcs-frontend/src/app/features/notice-of-intent/overview/overview.component.ts b/alcs-frontend/src/app/features/notice-of-intent/overview/overview.component.ts index 4eebf2cea9..facf0fe847 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/overview/overview.component.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/overview/overview.component.ts @@ -152,7 +152,7 @@ export class OverviewComponent implements OnInit, OnDestroy { htmlText: `Decision #${decisions.length - index} Made${ decisions.length - 1 === index ? ` - Active Days: ${noticeOfIntent.activeDays}` : '' }`, - startDate: new Date(decision.date + SORTING_ORDER.DECISION_MADE), + startDate: new Date(decision.date! + SORTING_ORDER.DECISION_MADE), isFulfilled: true, }); } diff --git a/alcs-frontend/src/app/services/application/decision/application-decision-v1/application-decision.dto.ts b/alcs-frontend/src/app/services/application/decision/application-decision-v1/application-decision.dto.ts index 3f2184de92..b8c93d0b06 100644 --- a/alcs-frontend/src/app/services/application/decision/application-decision-v1/application-decision.dto.ts +++ b/alcs-frontend/src/app/services/application/decision/application-decision-v1/application-decision.dto.ts @@ -47,7 +47,7 @@ export interface ApplicationDecisionDto { chairReviewRequired: boolean; chairReviewOutcome?: ChairReviewOutcomeCodeDto | null; applicationFileNumber: string; - documents: DecisionDocumentDto[]; + documents: ApplicationDecisionDocumentDto[]; isTimeExtension?: boolean | null; isOther?: boolean | null; modifies?: LinkedResolutionDto; @@ -62,7 +62,7 @@ export interface LinkedResolutionDto { linkedResolutions: string[]; } -export interface DecisionDocumentDto { +export interface ApplicationDecisionDocumentDto { uuid: string; fileName: string; mimeType: string; diff --git a/alcs-frontend/src/app/services/notice-of-intent/decision/notice-of-intent-decision.dto.ts b/alcs-frontend/src/app/services/notice-of-intent/decision/notice-of-intent-decision.dto.ts index e508c61b64..791d4d37cf 100644 --- a/alcs-frontend/src/app/services/notice-of-intent/decision/notice-of-intent-decision.dto.ts +++ b/alcs-frontend/src/app/services/notice-of-intent/decision/notice-of-intent-decision.dto.ts @@ -21,14 +21,9 @@ export interface UpdateNoticeOfIntentDecisionDto { export interface CreateNoticeOfIntentDecisionDto extends UpdateNoticeOfIntentDecisionDto { date: number; - outcomeCode?: string; resolutionNumber?: number; resolutionYear: number; fileNumber: string; - decisionMaker?: string; - decisionMakerName?: string; - auditDate?: number | null; - modifiesUuid?: string; } export interface LinkedResolutionDto { @@ -38,14 +33,14 @@ export interface LinkedResolutionDto { export interface NoticeOfIntentDecisionDto { uuid: string; - date: number; + date: number | null; createdAt: Date; outcome: NoticeOfIntentDecisionOutcomeCodeDto; resolutionNumber: number; resolutionYear: number; auditDate?: number | null; - decisionMaker: string; - decisionMakerName?: string; + decisionMaker: string | null; + decisionMakerName: string | null; isSubjectToConditions: boolean | null; isDraft: boolean; wasReleased: boolean; @@ -57,6 +52,7 @@ export interface NoticeOfIntentDecisionDto { documents: NoticeOfIntentDecisionDocumentDto[]; modifies?: LinkedResolutionDto; modifiedBy?: LinkedResolutionDto[]; + modifiedByResolutions?: string[]; components: NoticeOfIntentDecisionComponentDto[]; conditions: NoticeOfIntentDecisionConditionDto[]; } diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v1/notice-of-intent-decision-v1.service.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v1/notice-of-intent-decision-v1.service.ts index 153a6d71ad..21a36ca7b7 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v1/notice-of-intent-decision-v1.service.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v1/notice-of-intent-decision-v1.service.ts @@ -211,8 +211,8 @@ export class NoticeOfIntentDecisionV1Service { modifies: NoticeOfIntentModification | undefined | null, ) { const decision = new NoticeOfIntentDecision({ - outcome: await this.getOutcomeByCode(createDto.outcomeCode), - date: new Date(createDto.date), + outcome: await this.getOutcomeByCode(createDto.outcomeCode ?? 'APPR'), + date: createDto.date ? new Date(createDto.date) : null, resolutionNumber: createDto.resolutionNumber, resolutionYear: createDto.resolutionYear, decisionMaker: filterUndefined(createDto.decisionMaker, undefined), diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.controller.spec.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.controller.spec.ts index 82af45ac3f..90d6fe17e7 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.controller.spec.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.controller.spec.ts @@ -104,11 +104,11 @@ describe('NoticeOfIntentDecisionV2Controller', () => { }); it('should get all for notice of intent', async () => { - mockDecisionService.getByAppFileNumber.mockResolvedValue([mockDecision]); + mockDecisionService.getByFileNumber.mockResolvedValue([mockDecision]); const result = await controller.getByFileNumber('fake-number'); - expect(mockDecisionService.getByAppFileNumber).toBeCalledTimes(1); + expect(mockDecisionService.getByFileNumber).toBeCalledTimes(1); expect(result[0].uuid).toStrictEqual(mockDecision.uuid); }); @@ -160,7 +160,7 @@ describe('NoticeOfIntentDecisionV2Controller', () => { it('should update the decision', async () => { mockNoticeOfIntentService.getFileNumber.mockResolvedValue('file-number'); mockDecisionService.get.mockResolvedValue(new NoticeOfIntentDecision()); - mockDecisionService.getByAppFileNumber.mockResolvedValue([ + mockDecisionService.getByFileNumber.mockResolvedValue([ new NoticeOfIntentDecision(), ]); mockDecisionService.update.mockResolvedValue(mockDecision); diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.controller.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.controller.ts index 5e402a190c..3c9f9ad092 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.controller.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.controller.ts @@ -52,7 +52,7 @@ export class NoticeOfIntentDecisionV2Controller { @Param('fileNumber') fileNumber, ): Promise { const decisions = - await this.noticeOfIntentDecisionV2Service.getByAppFileNumber(fileNumber); + await this.noticeOfIntentDecisionV2Service.getByFileNumber(fileNumber); return await this.mapper.mapArrayAsync( decisions, @@ -137,8 +137,6 @@ export class NoticeOfIntentDecisionV2Controller { modifies = null; } - const decision = await this.noticeOfIntentDecisionV2Service.get(uuid); - const updatedDecision = await this.noticeOfIntentDecisionV2Service.update( uuid, updateDto, diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.service.spec.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.service.spec.ts index 2e1109b7f5..e0d224b6ab 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.service.spec.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.service.spec.ts @@ -155,7 +155,7 @@ describe('NoticeOfIntentDecisionV2Service', () => { }); it('should get decisions by notice of intent', async () => { - const result = await service.getByAppFileNumber( + const result = await service.getByFileNumber( mockNoticeOfIntent.fileNumber, ); diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.service.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.service.ts index e8e979b964..151e734c6a 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.service.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.service.ts @@ -76,7 +76,7 @@ export class NoticeOfIntentDecisionV2Service { }); } - async getByAppFileNumber(number: string) { + async getByFileNumber(number: string) { const noticeOfIntent = await this.noticeOfIntentService.getByFileNumber( number, ); @@ -206,6 +206,8 @@ export class NoticeOfIntentDecisionV2Service { existingDecision.auditDate = formatIncomingDate(updateDto.auditDate); existingDecision.modifies = modifies; + existingDecision.decisionMaker = updateDto.decisionMaker; + existingDecision.decisionMakerName = updateDto.decisionMakerName; existingDecision.resolutionNumber = updateDto.resolutionNumber; existingDecision.resolutionYear = updateDto.resolutionYear; existingDecision.isSubjectToConditions = updateDto.isSubjectToConditions; @@ -281,10 +283,12 @@ export class NoticeOfIntentDecisionV2Service { } const decision = new NoticeOfIntentDecision({ - outcome: await this.getOutcomeByCode(createDto.outcomeCode), - date: new Date(createDto.date), + outcome: await this.getOutcomeByCode(createDto.outcomeCode ?? 'APPR'), + date: createDto.date ? new Date(createDto.date) : null, resolutionNumber: createDto.resolutionNumber, resolutionYear: createDto.resolutionYear, + decisionMaker: createDto.decisionMaker, + decisionMakerName: createDto.decisionMakerName, auditDate: createDto.auditDate ? new Date(createDto.auditDate) : undefined, @@ -550,7 +554,7 @@ export class NoticeOfIntentDecisionV2Service { private async updateDecisionDates( noticeOfIntentDecision: NoticeOfIntentDecision, ) { - const existingDecisions = await this.getByAppFileNumber( + const existingDecisions = await this.getByFileNumber( noticeOfIntentDecision.noticeOfIntent.fileNumber, ); const releasedDecisions = existingDecisions.filter( diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.dto.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.dto.ts index 23db0752ad..cd1bab37ad 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.dto.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.dto.ts @@ -88,24 +88,6 @@ export class CreateNoticeOfIntentDecisionDto extends UpdateNoticeOfIntentDecisio @IsString() fileNumber: string; - @IsNumber() - date: number; - - @IsString() - outcomeCode: string; - - @IsNumber() - @IsOptional() - resolutionNumber?: number; - - @IsNumber() - @IsOptional() - resolutionYear?: number; - - @IsUUID() - @IsOptional() - modifiesUuid?: string; - @IsOptional() override isDraft = true; } @@ -122,11 +104,9 @@ export class NoticeOfIntentDecisionDto { @AutoMap() fileNumber: string; - @AutoMap() date: number; - - @AutoMap() auditDate: number; + createdAt: number; @AutoMap() resolutionNumber: string; @@ -134,6 +114,12 @@ export class NoticeOfIntentDecisionDto { @AutoMap() resolutionYear: number; + @AutoMap(() => String) + decisionMaker: string | null; + + @AutoMap(() => String) + decisionMakerName: string | null; + @AutoMap(() => Boolean) isSubjectToConditions: boolean | null; @@ -155,12 +141,6 @@ export class NoticeOfIntentDecisionDto { @AutoMap(() => [NoticeOfIntentDecisionDocumentDto]) documents: NoticeOfIntentDecisionDocumentDto[]; - @AutoMap(() => String) - decisionMaker?: string | null; - - @AutoMap(() => String) - decisionMakerName?: string | null; - @AutoMap(() => NoticeOfIntentDecisionOutcomeCodeDto) outcome?: NoticeOfIntentDecisionOutcomeCodeDto | null; diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.entity.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.entity.ts index c3beae8601..ccc808eabb 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.entity.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.entity.ts @@ -40,30 +40,28 @@ export class NoticeOfIntentDecision extends Base { auditDate: Date | null; @AutoMap(() => NoticeOfIntentDecisionOutcome) - @ManyToOne(() => NoticeOfIntentDecisionOutcome, { - nullable: false, - }) + @ManyToOne(() => NoticeOfIntentDecisionOutcome, { nullable: false }) outcome: NoticeOfIntentDecisionOutcome; - @AutoMap() + @AutoMap(() => String) @Column() outcomeCode: string; - @AutoMap() + @AutoMap(() => Number) @Column({ type: 'int4', nullable: true }) - resolutionNumber: number; + resolutionNumber: number | null; @AutoMap() @Column({ type: 'smallint' }) resolutionYear: number; - @AutoMap() + @AutoMap(() => String) @Column({ type: 'varchar', nullable: true }) - decisionMaker?: string; + decisionMaker?: string | null; - @AutoMap() + @AutoMap(() => String) @Column({ type: 'text', nullable: true }) - decisionMakerName?: string; + decisionMakerName?: string | null; @AutoMap() @Column({ type: 'boolean', default: false }) diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.module.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.module.ts index e1cb3f7c86..b9894bcaf0 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.module.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.module.ts @@ -7,18 +7,20 @@ import { CardModule } from '../card/card.module'; import { NoticeOfIntentSubmissionStatusModule } from '../notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.module'; import { NoticeOfIntentModule } from '../notice-of-intent/notice-of-intent.module'; import { NoticeOfIntentDecisionComponentType } from './notice-of-intent-decision-component/notice-of-intent-decision-component-type.entity'; +import { NoticeOfIntentDecisionComponentController } from './notice-of-intent-decision-component/notice-of-intent-decision-component.controller'; import { NoticeOfIntentDecisionComponent } from './notice-of-intent-decision-component/notice-of-intent-decision-component.entity'; import { NoticeOfIntentDecisionComponentService } from './notice-of-intent-decision-component/notice-of-intent-decision-component.service'; import { NoticeOfIntentDecisionConditionType } from './notice-of-intent-decision-condition/notice-of-intent-decision-condition-code.entity'; +import { NoticeOfIntentDecisionConditionController } from './notice-of-intent-decision-condition/notice-of-intent-decision-condition.controller'; import { NoticeOfIntentDecisionCondition } from './notice-of-intent-decision-condition/notice-of-intent-decision-condition.entity'; import { NoticeOfIntentDecisionConditionService } from './notice-of-intent-decision-condition/notice-of-intent-decision-condition.service'; import { NoticeOfIntentDecisionDocument } from './notice-of-intent-decision-document/notice-of-intent-decision-document.entity'; import { NoticeOfIntentDecisionOutcome } from './notice-of-intent-decision-outcome.entity'; +import { NoticeOfIntentDecisionV1Controller } from './notice-of-intent-decision-v1/notice-of-intent-decision-v1.controller'; +import { NoticeOfIntentDecisionV1Service } from './notice-of-intent-decision-v1/notice-of-intent-decision-v1.service'; import { NoticeOfIntentDecisionV2Controller } from './notice-of-intent-decision-v2/notice-of-intent-decision-v2.controller'; import { NoticeOfIntentDecisionV2Service } from './notice-of-intent-decision-v2/notice-of-intent-decision-v2.service'; import { NoticeOfIntentDecision } from './notice-of-intent-decision.entity'; -import { NoticeOfIntentDecisionV1Controller } from './notice-of-intent-decision-v1/notice-of-intent-decision-v1.controller'; -import { NoticeOfIntentDecisionV1Service } from './notice-of-intent-decision-v1/notice-of-intent-decision-v1.service'; import { NoticeOfIntentModificationOutcomeType } from './notice-of-intent-modification/notice-of-intent-modification-outcome-type/notice-of-intent-modification-outcome-type.entity'; import { NoticeOfIntentModificationController } from './notice-of-intent-modification/notice-of-intent-modification.controller'; import { NoticeOfIntentModification } from './notice-of-intent-modification/notice-of-intent-modification.entity'; @@ -56,6 +58,8 @@ import { NoticeOfIntentModificationService } from './notice-of-intent-modificati NoticeOfIntentDecisionV1Controller, NoticeOfIntentDecisionV2Controller, NoticeOfIntentModificationController, + NoticeOfIntentDecisionComponentController, + NoticeOfIntentDecisionConditionController, ], exports: [NoticeOfIntentModificationService, NoticeOfIntentDecisionV1Service], }) diff --git a/services/apps/alcs/src/common/automapper/notice-of-intent-decision.automapper.profile.ts b/services/apps/alcs/src/common/automapper/notice-of-intent-decision.automapper.profile.ts index 883aa72dc6..43eb63d3ec 100644 --- a/services/apps/alcs/src/common/automapper/notice-of-intent-decision.automapper.profile.ts +++ b/services/apps/alcs/src/common/automapper/notice-of-intent-decision.automapper.profile.ts @@ -32,6 +32,8 @@ import { NoticeOfIntentModificationOutcomeCodeDto, } from '../../alcs/notice-of-intent-decision/notice-of-intent-modification/notice-of-intent-modification.dto'; import { NoticeOfIntentModification } from '../../alcs/notice-of-intent-decision/notice-of-intent-modification/notice-of-intent-modification.entity'; +import { NoticeOfIntentSubmissionStatusType } from '../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status-type.entity'; +import { NoticeOfIntentStatusDto } from '../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status.dto'; import { NoticeOfIntent } from '../../alcs/notice-of-intent/notice-of-intent.entity'; @Injectable() @@ -60,6 +62,10 @@ export class NoticeOfIntentDecisionProfile extends AutomapperProfile { (ad) => ad.date, mapFrom((a) => a.date?.getTime()), ), + forMember( + (ad) => ad.createdAt, + mapFrom((a) => a.createdAt?.getTime()), + ), forMember( (ad) => ad.auditDate, mapFrom((a) => a.auditDate?.getTime()), @@ -113,6 +119,12 @@ export class NoticeOfIntentDecisionProfile extends AutomapperProfile { ), ); + createMap( + mapper, + NoticeOfIntentSubmissionStatusType, + NoticeOfIntentStatusDto, + ); + createMap( mapper, NoticeOfIntentDecisionComponent, diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1692902429290-update_dec_number_generation_for_nois.ts b/services/apps/alcs/src/providers/typeorm/migrations/1692902429290-update_dec_number_generation_for_nois.ts new file mode 100644 index 0000000000..0953947b97 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1692902429290-update_dec_number_generation_for_nois.ts @@ -0,0 +1,54 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class updateDecNumberGenerationForNois1692902429290 + implements MigrationInterface +{ + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `CREATE OR REPLACE FUNCTION alcs.generate_next_resolution_number(p_resolution_year integer) + RETURNS integer + LANGUAGE plpgsql + AS $function$ + + declare next_resolution_number integer; + BEGIN + select + row_num into next_resolution_number + from + ( + select + coalesce(resolution_number, 0) as resolution_number, + row_number() over ( + order by resolution_number) row_num + from + ( + SELECT + resolution_number, resolution_year, audit_deleted_date_at + FROM + alcs.application_decision + UNION + SELECT + resolution_number, resolution_year, audit_deleted_date_at + FROM + alcs.notice_of_intent_decision) rows + where + resolution_year = p_resolution_year + and audit_deleted_date_at is null + ) z + where + row_num != resolution_number + order by + row_num offset 0 row fetch next 1 row only; + + return coalesce(next_resolution_number, 1); + END; + $function$ + ; + `, + ); + } + + public async down(queryRunner: QueryRunner): Promise { + //Nope + } +} From eccc56d7a6b99c2ffc9252eb536081d0c491d463 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Thu, 24 Aug 2023 15:54:04 -0700 Subject: [PATCH 304/954] Add update file functionality for NOI/Application Decisisions * Add ability to update file name for existing documents * Add service/controller/test functions --- .../decision-document-upload-dialog.component.ts | 8 +++++++- .../decision-document-upload-dialog.component.ts | 8 +++++++- .../application-decision-v2.service.spec.ts | 13 +++++++++++++ .../application-decision-v2.service.ts | 13 +++++++++++++ .../notice-of-intent-decision-v2.service.spec.ts | 13 +++++++++++++ .../notice-of-intent-decision-v2.service.ts | 13 +++++++++++++ .../application-decision-v2.controller.spec.ts | 9 +++++++++ .../application-decision-v2.controller.ts | 13 +++++++++++++ .../application-decision-v2.service.spec.ts | 7 +++++++ .../application-decision-v2.service.ts | 8 ++++++++ ...tice-of-intent-decision-v2.controller.spec.ts | 9 +++++++++ .../notice-of-intent-decision-v2.controller.ts | 16 ++++++++++++++++ .../notice-of-intent-decision-v2.service.spec.ts | 7 +++++++ .../notice-of-intent-decision-v2.service.ts | 8 ++++++++ 14 files changed, 143 insertions(+), 2 deletions(-) diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-file-upload-dialog/decision-document-upload-dialog.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-file-upload-dialog/decision-document-upload-dialog.component.ts index aeb4b66027..127d31347b 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-file-upload-dialog/decision-document-upload-dialog.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-file-upload-dialog/decision-document-upload-dialog.component.ts @@ -58,13 +58,19 @@ export class DecisionDocumentUploadDialogComponent implements OnInit { async onSubmit() { const file = this.pendingFile; if (file) { - const renamedFile = new File([file], this.name.getRawValue() ?? file.name); + const renamedFile = new File([file], this.name.value ?? file.name); this.isSaving = true; if (this.data.existingDocument) { await this.decisionService.deleteFile(this.data.decisionUuid, this.data.existingDocument.uuid); } await this.decisionService.uploadFile(this.data.decisionUuid, renamedFile); + this.dialog.close(true); + this.isSaving = false; + } else if (this.data.existingDocument) { + this.isSaving = true; + await this.decisionService.updateFile(this.data.decisionUuid, this.data.existingDocument.uuid, this.name.value!); + this.dialog.close(true); this.isSaving = false; } diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-file-upload-dialog/decision-document-upload-dialog.component.ts b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-file-upload-dialog/decision-document-upload-dialog.component.ts index 4682493a1b..8a104ea557 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-file-upload-dialog/decision-document-upload-dialog.component.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-file-upload-dialog/decision-document-upload-dialog.component.ts @@ -58,13 +58,19 @@ export class DecisionDocumentUploadDialogComponent implements OnInit { async onSubmit() { const file = this.pendingFile; if (file) { - const renamedFile = new File([file], this.name.getRawValue() ?? file.name); + const renamedFile = new File([file], this.name.value ?? file.name); this.isSaving = true; if (this.data.existingDocument) { await this.decisionService.deleteFile(this.data.decisionUuid, this.data.existingDocument.uuid); } await this.decisionService.uploadFile(this.data.decisionUuid, renamedFile); + this.dialog.close(true); + this.isSaving = false; + } else if (this.data.existingDocument) { + this.isSaving = true; + await this.decisionService.updateFile(this.data.decisionUuid, this.data.existingDocument.uuid, this.name.value!); + this.dialog.close(true); this.isSaving = false; } diff --git a/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-v2.service.spec.ts b/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-v2.service.spec.ts index 1bee660d82..9af77d3153 100644 --- a/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-v2.service.spec.ts +++ b/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-v2.service.spec.ts @@ -172,6 +172,19 @@ describe('ApplicationDecisionV2Service', () => { expect(toastService.showErrorToast).toHaveBeenCalledTimes(1); }); + it('should make an http patch call for update file', async () => { + httpClient.patch.mockReturnValue( + of([ + { + fileNumber: '1', + }, + ]) + ); + await service.updateFile('', '', ''); + + expect(httpClient.patch).toHaveBeenCalledTimes(1); + }); + it('should show a toast warning when uploading a file thats too large', async () => { const file = createMock(); Object.defineProperty(file, 'size', { value: environment.maxFileSize + 1 }); diff --git a/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-v2.service.ts b/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-v2.service.ts index 5fc5d2b385..51133aa130 100644 --- a/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-v2.service.ts +++ b/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-v2.service.ts @@ -117,6 +117,19 @@ export class ApplicationDecisionV2Service { } } + async updateFile(decisionUuid: string, documentUuid: string, fileName: string) { + try { + await firstValueFrom( + this.http.patch(`${this.url}/${decisionUuid}/file/${documentUuid}`, { + fileName, + }) + ); + this.toastService.showSuccessToast('File updated'); + } catch (err) { + this.toastService.showErrorToast('Failed to update file'); + } + } + async deleteFile(decisionUuid: string, documentUuid: string) { const url = `${this.url}/${decisionUuid}/file/${documentUuid}`; return await firstValueFrom(this.http.delete<{ url: string }>(url)); diff --git a/alcs-frontend/src/app/services/notice-of-intent/decision-v2/notice-of-intent-decision-v2.service.spec.ts b/alcs-frontend/src/app/services/notice-of-intent/decision-v2/notice-of-intent-decision-v2.service.spec.ts index bdc6ee227c..de9ed5c6ef 100644 --- a/alcs-frontend/src/app/services/notice-of-intent/decision-v2/notice-of-intent-decision-v2.service.spec.ts +++ b/alcs-frontend/src/app/services/notice-of-intent/decision-v2/notice-of-intent-decision-v2.service.spec.ts @@ -182,6 +182,19 @@ describe('NoticeOfIntentDecisionV2Service', () => { expect(httpClient.post).toHaveBeenCalledTimes(0); }); + it('should make an http patch call for update file', async () => { + httpClient.patch.mockReturnValue( + of([ + { + fileNumber: '1', + }, + ]) + ); + await service.updateFile('', '', ''); + + expect(httpClient.patch).toHaveBeenCalledTimes(1); + }); + it('should make an http delete when deleting a file', async () => { httpClient.delete.mockReturnValue( of({ diff --git a/alcs-frontend/src/app/services/notice-of-intent/decision-v2/notice-of-intent-decision-v2.service.ts b/alcs-frontend/src/app/services/notice-of-intent/decision-v2/notice-of-intent-decision-v2.service.ts index 86b38bb0a6..89075f04ef 100644 --- a/alcs-frontend/src/app/services/notice-of-intent/decision-v2/notice-of-intent-decision-v2.service.ts +++ b/alcs-frontend/src/app/services/notice-of-intent/decision-v2/notice-of-intent-decision-v2.service.ts @@ -102,6 +102,19 @@ export class NoticeOfIntentDecisionV2Service { return res; } + async updateFile(decisionUuid: string, documentUuid: string, fileName: string) { + try { + await firstValueFrom( + this.http.patch(`${this.url}/${decisionUuid}/file/${documentUuid}`, { + fileName, + }) + ); + this.toastService.showSuccessToast('File updated'); + } catch (err) { + this.toastService.showErrorToast('Failed to update file'); + } + } + async downloadFile(decisionUuid: string, documentUuid: string, fileName: string, isInline = true) { const url = `${this.url}/${decisionUuid}/file/${documentUuid}`; const finalUrl = isInline ? `${url}/open` : `${url}/download`; diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.controller.spec.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.controller.spec.ts index be4f628954..47fbe6ff88 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.controller.spec.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.controller.spec.ts @@ -241,6 +241,15 @@ describe('ApplicationDecisionV2Controller', () => { expect(res.url).toEqual(fakeUrl); }); + it('should call through for updating the file', async () => { + mockDecisionService.updateDocument.mockResolvedValue({} as any); + await controller.updateDocument('fake-uuid', 'document-uuid', { + fileName: '', + }); + + expect(mockDecisionService.updateDocument).toBeCalledTimes(1); + }); + it('should call through for getting open url', async () => { const fakeUrl = 'fake-url'; mockDecisionService.getDownloadUrl.mockResolvedValue(fakeUrl); diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.controller.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.controller.ts index b8aca8ebaa..8dfc2386b4 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.controller.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.controller.ts @@ -241,6 +241,19 @@ export class ApplicationDecisionV2Controller { }; } + @Patch('/:uuid/file/:documentUuid') + @UserRoles(...ANY_AUTH_ROLE) + async updateDocument( + @Param('uuid') decisionUuid: string, + @Param('documentUuid') documentUuid: string, + @Body() body: { fileName: string }, + ) { + await this.appDecisionService.updateDocument(documentUuid, body.fileName); + return { + uploaded: true, + }; + } + @Get('/:uuid/file/:fileUuid/download') @UserRoles(...ANY_AUTH_ROLE) async getDownloadUrl( diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service.spec.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service.spec.ts index bfc1507ad7..9f17506abc 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service.spec.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service.spec.ts @@ -610,6 +610,13 @@ describe('ApplicationDecisionV2Service', () => { expect(mockDocumentService.softRemove).not.toHaveBeenCalled(); }); + it('should call through to document service for update', async () => { + mockDocumentService.update.mockResolvedValue({} as any); + + await service.updateDocument('document-uuid', 'file-name'); + expect(mockDocumentService.update).toHaveBeenCalledTimes(1); + }); + it('should call through to document service for download', async () => { const downloadUrl = 'download-url'; mockDocumentService.getDownloadUrl.mockResolvedValue(downloadUrl); diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service.ts index d555f09e30..f5cdfadbc1 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service.ts @@ -735,4 +735,12 @@ export class ApplicationDecisionV2Service { } return decisionDocument; } + + async updateDocument(documentUuid: string, fileName: string) { + const document = await this.getDecisionDocumentOrFail(documentUuid); + await this.documentService.update(document.document, { + fileName, + source: DOCUMENT_SOURCE.ALC, + }); + } } diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.controller.spec.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.controller.spec.ts index 90d6fe17e7..2f0906fa24 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.controller.spec.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.controller.spec.ts @@ -224,6 +224,15 @@ describe('NoticeOfIntentDecisionV2Controller', () => { expect(res.url).toEqual(fakeUrl); }); + it('should call through for updating the file', async () => { + mockDecisionService.updateDocument.mockResolvedValue({} as any); + await controller.updateDocument('fake-uuid', 'document-uuid', { + fileName: '', + }); + + expect(mockDecisionService.updateDocument).toBeCalledTimes(1); + }); + it('should call through for getting open url', async () => { const fakeUrl = 'fake-url'; mockDecisionService.getDownloadUrl.mockResolvedValue(fakeUrl); diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.controller.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.controller.ts index 3c9f9ad092..f243e2211f 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.controller.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.controller.ts @@ -174,6 +174,22 @@ export class NoticeOfIntentDecisionV2Controller { }; } + @Patch('/:uuid/file/:documentUuid') + @UserRoles(...ANY_AUTH_ROLE) + async updateDocument( + @Param('uuid') decisionUuid: string, + @Param('documentUuid') documentUuid: string, + @Body() body: { fileName: string }, + ) { + await this.noticeOfIntentDecisionV2Service.updateDocument( + documentUuid, + body.fileName, + ); + return { + uploaded: true, + }; + } + @Get('/:uuid/file/:fileUuid/download') @UserRoles(...ANY_AUTH_ROLE) async getDownloadUrl( diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.service.spec.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.service.spec.ts index e0d224b6ab..078c77f30d 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.service.spec.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.service.spec.ts @@ -488,6 +488,13 @@ describe('NoticeOfIntentDecisionV2Service', () => { expect(mockDocumentService.softRemove).not.toHaveBeenCalled(); }); + it('should call through to document service for update', async () => { + mockDocumentService.update.mockResolvedValue({} as any); + + await service.updateDocument('document-uuid', 'file-name'); + expect(mockDocumentService.update).toHaveBeenCalledTimes(1); + }); + it('should call through to document service for download', async () => { const downloadUrl = 'download-url'; mockDocumentService.getDownloadUrl.mockResolvedValue(downloadUrl); diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.service.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.service.ts index 151e734c6a..98c7b0b662 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.service.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.service.ts @@ -617,4 +617,12 @@ export class NoticeOfIntentDecisionV2Service { } return decisionDocument; } + + async updateDocument(documentUuid: string, fileName: string) { + const document = await this.getDecisionDocumentOrFail(documentUuid); + await this.documentService.update(document.document, { + fileName, + source: DOCUMENT_SOURCE.ALC, + }); + } } From 8150d2932de900d808029013d759a68be9c7f94d Mon Sep 17 00:00:00 2001 From: "to. sandra" <76515860+sandratoh@users.noreply.github.com> Date: Thu, 24 Aug 2023 16:22:28 -0700 Subject: [PATCH 305/954] Pass correct argument to fix error in noi cancel (#911) --- .../view-notice-of-intent-submission.component.html | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.html b/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.html index 9c4f716361..318bfe8d9f 100644 --- a/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.html @@ -67,12 +67,7 @@

Applicant Submission

-
From e8a6fa2d9afa51fdc0722a7c520b215941fc1f61 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Thu, 24 Aug 2023 16:39:11 -0700 Subject: [PATCH 306/954] Change updated flags to re-calculate when we save the submission --- .../alcs-edit-submission.component.ts | 38 ++++++++++++------- .../additional-information.component.html | 5 ++- 2 files changed, 28 insertions(+), 15 deletions(-) diff --git a/portal-frontend/src/app/features/notice-of-intents/alcs-edit-submission/alcs-edit-submission.component.ts b/portal-frontend/src/app/features/notice-of-intents/alcs-edit-submission/alcs-edit-submission.component.ts index ec9de0dc23..553bf9cf93 100644 --- a/portal-frontend/src/app/features/notice-of-intents/alcs-edit-submission/alcs-edit-submission.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/alcs-edit-submission/alcs-edit-submission.component.ts @@ -39,7 +39,7 @@ export class AlcsEditSubmissionComponent implements OnInit, OnDestroy, AfterView $noiSubmission = new BehaviorSubject(undefined); $noiDocuments = new BehaviorSubject([]); noiSubmission: NoticeOfIntentSubmissionDetailedDto | undefined; - originalSubmissionUuid = ''; + originalSubmission: NoticeOfIntentSubmissionDetailedDto | undefined; steps = EditNoiSteps; expandedParcelUuid?: string; @@ -72,6 +72,13 @@ export class AlcsEditSubmissionComponent implements OnInit, OnDestroy, AfterView ngOnInit(): void { this.expandedParcelUuid = undefined; + + this.$noiSubmission.pipe(takeUntil(this.$destroy)).subscribe((submission) => { + if (submission) { + this.noiSubmission = submission; + this.calculateUpdatedFields(); + } + }); } ngAfterViewInit(): void { @@ -111,18 +118,8 @@ export class AlcsEditSubmissionComponent implements OnInit, OnDestroy, AfterView private async loadOriginalSubmission(fileId: string) { const originalSubmission = await this.noticeOfIntentSubmissionService.getByFileId(fileId); if (originalSubmission) { - this.originalSubmissionUuid = originalSubmission?.uuid; - - const diffResult = getDiff(originalSubmission, this.noiSubmission); - const changedFields = new Set(); - for (const diff of diffResult) { - const fullPath = diff.path.join('.'); - if (!fullPath.toLowerCase().includes('uuid')) { - changedFields.add(diff.path.join('.')); - changedFields.add(diff.path[0].toString()); - } - } - this.updatedFields = [...changedFields.keys()]; + this.originalSubmission = originalSubmission; + this.calculateUpdatedFields(); } } @@ -130,7 +127,7 @@ export class AlcsEditSubmissionComponent implements OnInit, OnDestroy, AfterView if (!this.noiSubmission) { this.overlayService.showSpinner(); this.noiSubmission = await this.noticeOfIntentSubmissionDraftService.getByFileId(fileId); - this.loadOriginalSubmission(fileId); + await this.loadOriginalSubmission(fileId); const documents = await this.noticeOfIntentDocumentService.getByFileId(fileId); if (documents) { this.$noiDocuments.next(documents); @@ -227,4 +224,17 @@ export class AlcsEditSubmissionComponent implements OnInit, OnDestroy, AfterView } }); } + + private calculateUpdatedFields() { + const diffResult = getDiff(this.originalSubmission, this.noiSubmission); + const changedFields = new Set(); + for (const diff of diffResult) { + const fullPath = diff.path.join('.'); + if (!fullPath.toLowerCase().includes('uuid')) { + changedFields.add(diff.path.join('.')); + changedFields.add(diff.path[0].toString()); + } + } + this.updatedFields = [...changedFields.keys()]; + } } diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/additional-information/additional-information.component.html b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/additional-information/additional-information.component.html index 4c4ae5349f..431948076b 100644 --- a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/additional-information/additional-information.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/additional-information/additional-information.component.html @@ -14,7 +14,10 @@
-
The total floor area (m2) of the proposed structure(s)
+
+ The total floor area (m2) of the proposed structure(s) + +
#
Type
From d1aa4efe4dfa41bcd8b6ac6599de0b363ee037e2 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Fri, 25 Aug 2023 11:14:49 -0700 Subject: [PATCH 307/954] Show NOI Decisions in Portal * Add modules/controllers/ui * Fix small typos * Rename existing DTO to include Application --- .../decisions/decisions.component.ts | 4 +- .../alc-review/alc-review.component.html | 1 + .../decisions/decisions.component.html | 26 ++++++ .../decisions/decisions.component.scss | 20 +++++ .../decisions/decisions.component.spec.ts | 33 +++++++ .../decisions/decisions.component.ts | 39 ++++++++ .../submission-documents.component.html | 2 +- ...view-notice-of-intent-submission.module.ts | 9 +- .../application-decision.dto.ts | 2 +- .../application-decision.service.ts | 4 +- .../notice-of-intent-decision.dto.ts | 19 ++++ .../notice-of-intent-decision.service.spec.ts | 36 ++++++++ .../notice-of-intent-decision.service.ts | 37 ++++++++ .../notice-of-intent-decision.module.ts | 6 +- ...lication-decision-v2.automapper.profile.ts | 4 +- ...e-of-intent-decision.automapper.profile.ts | 25 ++++++ .../application-decision.controller.ts | 6 +- .../application-decision.dto.ts | 2 +- ...tice-of-intent-decision.controller.spec.ts | 89 +++++++++++++++++++ .../notice-of-intent-decision.controller.ts | 49 ++++++++++ .../notice-of-intent-decision.dto.ts | 32 +++++++ .../notice-of-intent-decision.module.ts | 12 +++ .../apps/alcs/src/portal/portal.module.ts | 3 + ...0-update_dec_number_generation_for_nois.ts | 3 + 24 files changed, 449 insertions(+), 14 deletions(-) create mode 100644 portal-frontend/src/app/features/notice-of-intents/view-submission/alc-review/decisions/decisions.component.html create mode 100644 portal-frontend/src/app/features/notice-of-intents/view-submission/alc-review/decisions/decisions.component.scss create mode 100644 portal-frontend/src/app/features/notice-of-intents/view-submission/alc-review/decisions/decisions.component.spec.ts create mode 100644 portal-frontend/src/app/features/notice-of-intents/view-submission/alc-review/decisions/decisions.component.ts create mode 100644 portal-frontend/src/app/services/notice-of-intent-decision/notice-of-intent-decision.dto.ts create mode 100644 portal-frontend/src/app/services/notice-of-intent-decision/notice-of-intent-decision.service.spec.ts create mode 100644 portal-frontend/src/app/services/notice-of-intent-decision/notice-of-intent-decision.service.ts create mode 100644 services/apps/alcs/src/portal/notice-of-intent-decision/notice-of-intent-decision.controller.spec.ts create mode 100644 services/apps/alcs/src/portal/notice-of-intent-decision/notice-of-intent-decision.controller.ts create mode 100644 services/apps/alcs/src/portal/notice-of-intent-decision/notice-of-intent-decision.dto.ts create mode 100644 services/apps/alcs/src/portal/notice-of-intent-decision/notice-of-intent-decision.module.ts diff --git a/portal-frontend/src/app/features/applications/view-submission/alc-review/decisions/decisions.component.ts b/portal-frontend/src/app/features/applications/view-submission/alc-review/decisions/decisions.component.ts index f0c910a4b0..1280cc0118 100644 --- a/portal-frontend/src/app/features/applications/view-submission/alc-review/decisions/decisions.component.ts +++ b/portal-frontend/src/app/features/applications/view-submission/alc-review/decisions/decisions.component.ts @@ -1,5 +1,5 @@ import { Component, Input, OnChanges, OnInit, SimpleChanges } from '@angular/core'; -import { PortalDecisionDto } from '../../../../../services/application-decision/application-decision.dto'; +import { ApplicationPortalDecisionDto } from '../../../../../services/application-decision/application-decision.dto'; import { ApplicationDecisionService } from '../../../../../services/application-decision/application-decision.service'; @Component({ @@ -9,7 +9,7 @@ import { ApplicationDecisionService } from '../../../../../services/application- }) export class DecisionsComponent implements OnInit, OnChanges { @Input() fileNumber = ''; - decisions: PortalDecisionDto[] = []; + decisions: ApplicationPortalDecisionDto[] = []; constructor(private decisionService: ApplicationDecisionService) {} diff --git a/portal-frontend/src/app/features/notice-of-intents/view-submission/alc-review/alc-review.component.html b/portal-frontend/src/app/features/notice-of-intents/view-submission/alc-review/alc-review.component.html index 2191680ae3..a080e0c620 100644 --- a/portal-frontend/src/app/features/notice-of-intents/view-submission/alc-review/alc-review.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/view-submission/alc-review/alc-review.component.html @@ -21,6 +21,7 @@

ALC Review and Decision

noiSubmission.status.code === NOI_SUBMISSION_STATUS.ALC_DECISION " > +
diff --git a/portal-frontend/src/app/features/notice-of-intents/view-submission/alc-review/decisions/decisions.component.html b/portal-frontend/src/app/features/notice-of-intents/view-submission/alc-review/decisions/decisions.component.html new file mode 100644 index 0000000000..ee4d949dba --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/view-submission/alc-review/decisions/decisions.component.html @@ -0,0 +1,26 @@ +
+

Decision #{{ decisions.length - index }}

+
+
+
Decision Date
+ {{ decision.date | momentFormat }} +
+ +
+
Resolution Number
+ #{{ decision.resolutionNumber }}/{{ decision.resolutionYear }} +
+ +
+
Decision Outcome
+ {{ decision.outcome.label }} {{ decision.isSubjectToConditions ? '- Subject to Conditions' : '' }} +
+ +
+
Decision Document
+ +
+
+
diff --git a/portal-frontend/src/app/features/notice-of-intents/view-submission/alc-review/decisions/decisions.component.scss b/portal-frontend/src/app/features/notice-of-intents/view-submission/alc-review/decisions/decisions.component.scss new file mode 100644 index 0000000000..c92c6fb6a8 --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/view-submission/alc-review/decisions/decisions.component.scss @@ -0,0 +1,20 @@ +@use '../../../../../../styles/functions' as *; +@use '../../../../../../styles/colors'; + +.decision-table { + padding: rem(8); + margin: rem(12) 0 rem(20) 0; + background-color: colors.$grey-light; + display: grid; + grid-row-gap: rem(24); + grid-column-gap: rem(16); + grid-template-columns: 100%; + word-wrap: break-word; + hyphens: auto; + + @media screen and (min-width: $tabletBreakpoint) { + padding: rem(16); + margin: rem(24) 0 rem(40) 0; + grid-template-columns: 50% 50%; + } +} diff --git a/portal-frontend/src/app/features/notice-of-intents/view-submission/alc-review/decisions/decisions.component.spec.ts b/portal-frontend/src/app/features/notice-of-intents/view-submission/alc-review/decisions/decisions.component.spec.ts new file mode 100644 index 0000000000..3bde8b71ad --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/view-submission/alc-review/decisions/decisions.component.spec.ts @@ -0,0 +1,33 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { createMock } from '@golevelup/ts-jest'; +import { NoticeOfIntentDecisionService } from '../../../../../services/notice-of-intent-decision/notice-of-intent-decision.service'; + +import { DecisionsComponent } from './decisions.component'; + +describe('DecisionsComponent', () => { + let component: DecisionsComponent; + let fixture: ComponentFixture; + let mockDecisionService: NoticeOfIntentDecisionService; + + beforeEach(async () => { + mockDecisionService = createMock(); + + await TestBed.configureTestingModule({ + declarations: [DecisionsComponent], + providers: [ + { + provide: NoticeOfIntentDecisionService, + useValue: mockDecisionService, + }, + ], + }).compileComponents(); + + fixture = TestBed.createComponent(DecisionsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/notice-of-intents/view-submission/alc-review/decisions/decisions.component.ts b/portal-frontend/src/app/features/notice-of-intents/view-submission/alc-review/decisions/decisions.component.ts new file mode 100644 index 0000000000..02d647de95 --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/view-submission/alc-review/decisions/decisions.component.ts @@ -0,0 +1,39 @@ +import { Component, Input, OnChanges, OnInit, SimpleChanges } from '@angular/core'; +import { NoticeOfIntentPortalDecisionDto } from '../../../../../services/notice-of-intent-decision/notice-of-intent-decision.dto'; +import { NoticeOfIntentDecisionService } from '../../../../../services/notice-of-intent-decision/notice-of-intent-decision.service'; + +@Component({ + selector: 'app-decisions[fileNumber]', + templateUrl: './decisions.component.html', + styleUrls: ['./decisions.component.scss'], +}) +export class DecisionsComponent implements OnInit, OnChanges { + @Input() fileNumber = ''; + decisions: NoticeOfIntentPortalDecisionDto[] = []; + + constructor(private decisionService: NoticeOfIntentDecisionService) {} + + ngOnInit(): void { + this.loadDecisions(); + } + + ngOnChanges(changes: SimpleChanges): void { + this.loadDecisions(); + } + + async openFile(uuid: string) { + const res = await this.decisionService.openFile(uuid); + if (res) { + window.open(res.url, '_blank'); + } + } + + private async loadDecisions() { + if (this.fileNumber) { + const decisions = await this.decisionService.getByFileId(this.fileNumber); + if (decisions) { + this.decisions = decisions; + } + } + } +} diff --git a/portal-frontend/src/app/features/notice-of-intents/view-submission/alc-review/submission-documents/submission-documents.component.html b/portal-frontend/src/app/features/notice-of-intents/view-submission/alc-review/submission-documents/submission-documents.component.html index 437bbd407e..822474bef5 100644 --- a/portal-frontend/src/app/features/notice-of-intents/view-submission/alc-review/submission-documents/submission-documents.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/view-submission/alc-review/submission-documents/submission-documents.component.html @@ -1,4 +1,4 @@ -

Application Documents

+

Notice of Intent Documents

diff --git a/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.module.ts b/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.module.ts index 5de0b47a0b..5a7d8a2138 100644 --- a/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.module.ts +++ b/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.module.ts @@ -1,10 +1,12 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; +import { MatSortModule } from '@angular/material/sort'; import { RouterModule, Routes } from '@angular/router'; import { NgxMaskDirective, NgxMaskPipe } from 'ngx-mask'; import { SharedModule } from '../../../shared/shared.module'; import { NoticeOfIntentDetailsModule } from '../notice-of-intent-details/notice-of-intent-details.module'; import { AlcReviewComponent } from './alc-review/alc-review.component'; +import { DecisionsComponent } from './alc-review/decisions/decisions.component'; import { SubmissionDocumentsComponent } from './alc-review/submission-documents/submission-documents.component'; import { ViewNoticeOfIntentSubmissionComponent } from './view-notice-of-intent-submission.component'; @@ -24,6 +26,11 @@ const routes: Routes = [ NgxMaskDirective, NgxMaskPipe, ], - declarations: [ViewNoticeOfIntentSubmissionComponent, AlcReviewComponent, SubmissionDocumentsComponent], + declarations: [ + ViewNoticeOfIntentSubmissionComponent, + AlcReviewComponent, + SubmissionDocumentsComponent, + DecisionsComponent, + ], }) export class ViewNoticeOfIntentSubmissionModule {} diff --git a/portal-frontend/src/app/services/application-decision/application-decision.dto.ts b/portal-frontend/src/app/services/application-decision/application-decision.dto.ts index c22d63a639..a444a87146 100644 --- a/portal-frontend/src/app/services/application-decision/application-decision.dto.ts +++ b/portal-frontend/src/app/services/application-decision/application-decision.dto.ts @@ -6,7 +6,7 @@ export interface LinkedResolutionDto { linkedResolutions: string[]; } -export interface PortalDecisionDto { +export interface ApplicationPortalDecisionDto { uuid: string; date: number; outcome: BaseCodeDto; diff --git a/portal-frontend/src/app/services/application-decision/application-decision.service.ts b/portal-frontend/src/app/services/application-decision/application-decision.service.ts index 0678052441..0f6df323ec 100644 --- a/portal-frontend/src/app/services/application-decision/application-decision.service.ts +++ b/portal-frontend/src/app/services/application-decision/application-decision.service.ts @@ -3,7 +3,7 @@ import { Injectable } from '@angular/core'; import { firstValueFrom } from 'rxjs'; import { environment } from '../../../environments/environment'; import { ToastService } from '../toast/toast.service'; -import { PortalDecisionDto } from './application-decision.dto'; +import { ApplicationPortalDecisionDto } from './application-decision.dto'; @Injectable({ providedIn: 'root', @@ -16,7 +16,7 @@ export class ApplicationDecisionService { async getByFileId(fileNumber: string) { try { return await firstValueFrom( - this.httpClient.get(`${this.serviceUrl}/application/${fileNumber}`) + this.httpClient.get(`${this.serviceUrl}/application/${fileNumber}`) ); } catch (e) { console.error(e); diff --git a/portal-frontend/src/app/services/notice-of-intent-decision/notice-of-intent-decision.dto.ts b/portal-frontend/src/app/services/notice-of-intent-decision/notice-of-intent-decision.dto.ts new file mode 100644 index 0000000000..4684fbaa36 --- /dev/null +++ b/portal-frontend/src/app/services/notice-of-intent-decision/notice-of-intent-decision.dto.ts @@ -0,0 +1,19 @@ +import { BaseCodeDto } from '../../shared/dto/base.dto'; +import { ApplicationDocumentDto } from '../application-document/application-document.dto'; + +export interface LinkedResolutionDto { + uuid: string; + linkedResolutions: string[]; +} + +export interface NoticeOfIntentPortalDecisionDto { + uuid: string; + date: number; + outcome: BaseCodeDto; + resolutionNumber: number; + resolutionYear: number; + documents: ApplicationDocumentDto[]; + isSubjectToConditions: boolean; + reconsiders?: LinkedResolutionDto; + modifies?: LinkedResolutionDto; +} diff --git a/portal-frontend/src/app/services/notice-of-intent-decision/notice-of-intent-decision.service.spec.ts b/portal-frontend/src/app/services/notice-of-intent-decision/notice-of-intent-decision.service.spec.ts new file mode 100644 index 0000000000..07166dd8d9 --- /dev/null +++ b/portal-frontend/src/app/services/notice-of-intent-decision/notice-of-intent-decision.service.spec.ts @@ -0,0 +1,36 @@ +import { HttpClient } from '@angular/common/http'; +import { HttpClientTestingModule } from '@angular/common/http/testing'; +import { TestBed } from '@angular/core/testing'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { ToastService } from '../toast/toast.service'; +import { NoticeOfIntentDecisionService } from './notice-of-intent-decision.service'; + +describe('NoticeOfIntentDecisionService', () => { + let service: NoticeOfIntentDecisionService; + let mockToastService: DeepMocked; + let mockHttpClient: DeepMocked; + + beforeEach(() => { + mockToastService = createMock(); + mockHttpClient = createMock(); + + TestBed.configureTestingModule({ + imports: [HttpClientTestingModule], + providers: [ + { + provide: ToastService, + useValue: mockToastService, + }, + { + provide: HttpClient, + useValue: mockHttpClient, + }, + ], + }); + service = TestBed.inject(NoticeOfIntentDecisionService); + }); + + it('should create', () => { + expect(service).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/services/notice-of-intent-decision/notice-of-intent-decision.service.ts b/portal-frontend/src/app/services/notice-of-intent-decision/notice-of-intent-decision.service.ts new file mode 100644 index 0000000000..4268cc31d3 --- /dev/null +++ b/portal-frontend/src/app/services/notice-of-intent-decision/notice-of-intent-decision.service.ts @@ -0,0 +1,37 @@ +import { HttpClient } from '@angular/common/http'; +import { Injectable } from '@angular/core'; +import { firstValueFrom } from 'rxjs'; +import { environment } from '../../../environments/environment'; +import { ToastService } from '../toast/toast.service'; +import { NoticeOfIntentPortalDecisionDto } from './notice-of-intent-decision.dto'; + +@Injectable({ + providedIn: 'root', +}) +export class NoticeOfIntentDecisionService { + private serviceUrl = `${environment.apiUrl}/notice-of-intent-decision`; + + constructor(private httpClient: HttpClient, private toastService: ToastService) {} + + async getByFileId(fileNumber: string) { + try { + return await firstValueFrom( + this.httpClient.get(`${this.serviceUrl}/notice-of-intent/${fileNumber}`) + ); + } catch (e) { + console.error(e); + this.toastService.showErrorToast('Failed to load decisions, please try again'); + } + return undefined; + } + + async openFile(documentUuid: string) { + try { + return await firstValueFrom(this.httpClient.get<{ url: string }>(`${this.serviceUrl}/${documentUuid}/open`)); + } catch (e) { + console.error(e); + this.toastService.showErrorToast('Failed to open the document, please try again'); + } + return undefined; + } +} diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.module.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.module.ts index b9894bcaf0..bed848ef83 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.module.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.module.ts @@ -61,6 +61,10 @@ import { NoticeOfIntentModificationService } from './notice-of-intent-modificati NoticeOfIntentDecisionComponentController, NoticeOfIntentDecisionConditionController, ], - exports: [NoticeOfIntentModificationService, NoticeOfIntentDecisionV1Service], + exports: [ + NoticeOfIntentModificationService, + NoticeOfIntentDecisionV1Service, + NoticeOfIntentDecisionV2Service, + ], }) export class NoticeOfIntentDecisionModule {} diff --git a/services/apps/alcs/src/common/automapper/application-decision-v2.automapper.profile.ts b/services/apps/alcs/src/common/automapper/application-decision-v2.automapper.profile.ts index 984afa4a64..6a2f91c2b8 100644 --- a/services/apps/alcs/src/common/automapper/application-decision-v2.automapper.profile.ts +++ b/services/apps/alcs/src/common/automapper/application-decision-v2.automapper.profile.ts @@ -33,7 +33,7 @@ import { import { ApplicationDecisionComponent } from '../../alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.entity'; import { LinkedResolutionOutcomeType } from '../../alcs/application-decision/application-decision-v2/application-decision/linked-resolution-outcome-type.entity'; import { ApplicationDecision } from '../../alcs/application-decision/application-decision.entity'; -import { PortalDecisionDto } from '../../portal/application-decision/application-decision.dto'; +import { ApplicationPortalDecisionDto } from '../../portal/application-decision/application-decision.dto'; import { NaruSubtypeDto } from '../../portal/application-submission/application-submission.dto'; import { NaruSubtype } from '../../portal/application-submission/naru-subtype/naru-subtype.entity'; import { ApplicationDecisionConditionToComponentLotDto } from '../../alcs/application-decision/application-condition-to-component-lot/application-condition-to-component-lot.controller.dto'; @@ -264,7 +264,7 @@ export class ApplicationDecisionProfile extends AutomapperProfile { createMap( mapper, ApplicationDecision, - PortalDecisionDto, + ApplicationPortalDecisionDto, forMember( (a) => a.reconsiders, mapFrom((dec) => diff --git a/services/apps/alcs/src/common/automapper/notice-of-intent-decision.automapper.profile.ts b/services/apps/alcs/src/common/automapper/notice-of-intent-decision.automapper.profile.ts index 43eb63d3ec..4ffa68ff3a 100644 --- a/services/apps/alcs/src/common/automapper/notice-of-intent-decision.automapper.profile.ts +++ b/services/apps/alcs/src/common/automapper/notice-of-intent-decision.automapper.profile.ts @@ -35,6 +35,7 @@ import { NoticeOfIntentModification } from '../../alcs/notice-of-intent-decision import { NoticeOfIntentSubmissionStatusType } from '../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status-type.entity'; import { NoticeOfIntentStatusDto } from '../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status.dto'; import { NoticeOfIntent } from '../../alcs/notice-of-intent/notice-of-intent.entity'; +import { NoticeOfIntentPortalDecisionDto } from '../../portal/notice-of-intent-decision/notice-of-intent-decision.dto'; @Injectable() export class NoticeOfIntentDecisionProfile extends AutomapperProfile { @@ -282,6 +283,30 @@ export class NoticeOfIntentDecisionProfile extends AutomapperProfile { mapFrom((rd) => this.mapper.map(rd.card, Card, CardDto)), ), ); + + createMap( + mapper, + NoticeOfIntentDecision, + NoticeOfIntentPortalDecisionDto, + forMember( + (a) => a.date, + mapFrom((rd) => rd.date?.getTime()), + ), + forMember( + (a) => a.modifies, + mapFrom((dec) => + dec.modifies + ? { + uuid: dec.modifies.uuid, + linkedResolutions: dec.modifies.modifiesDecisions.map( + (decision) => + `#${decision.resolutionNumber}/${decision.resolutionYear}`, + ), + } + : undefined, + ), + ), + ); }; } } diff --git a/services/apps/alcs/src/portal/application-decision/application-decision.controller.ts b/services/apps/alcs/src/portal/application-decision/application-decision.controller.ts index 831405e1cc..545d694111 100644 --- a/services/apps/alcs/src/portal/application-decision/application-decision.controller.ts +++ b/services/apps/alcs/src/portal/application-decision/application-decision.controller.ts @@ -7,7 +7,7 @@ import { ApplicationDecision } from '../../alcs/application-decision/application import { ApplicationDecisionV2Service } from '../../alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service'; import { PortalAuthGuard } from '../../common/authorization/portal-auth-guard.service'; import { ApplicationSubmissionService } from '../application-submission/application-submission.service'; -import { PortalDecisionDto } from './application-decision.dto'; +import { ApplicationPortalDecisionDto } from './application-decision.dto'; @ApiOAuth2(config.get('KEYCLOAK.SCOPES')) @UseGuards(PortalAuthGuard) @@ -23,7 +23,7 @@ export class ApplicationDecisionController { async listDecisions( @Param('fileNumber') fileNumber: string, @Req() req, - ): Promise { + ): Promise { await this.applicationSubmissionService.verifyAccessByFileId( fileNumber, req.user.entity, @@ -34,7 +34,7 @@ export class ApplicationDecisionController { return this.mapper.mapArray( decisions, ApplicationDecision, - PortalDecisionDto, + ApplicationPortalDecisionDto, ); } diff --git a/services/apps/alcs/src/portal/application-decision/application-decision.dto.ts b/services/apps/alcs/src/portal/application-decision/application-decision.dto.ts index ff2c7580d2..755da4b7ca 100644 --- a/services/apps/alcs/src/portal/application-decision/application-decision.dto.ts +++ b/services/apps/alcs/src/portal/application-decision/application-decision.dto.ts @@ -5,7 +5,7 @@ import { } from '../../alcs/application-decision/application-decision-v1/application-decision/application-decision.dto'; import { ApplicationDecisionOutcomeCodeDto } from '../../alcs/application-decision/application-decision-v2/application-decision/application-decision.dto'; -export class PortalDecisionDto { +export class ApplicationPortalDecisionDto { @AutoMap() uuid: string; diff --git a/services/apps/alcs/src/portal/notice-of-intent-decision/notice-of-intent-decision.controller.spec.ts b/services/apps/alcs/src/portal/notice-of-intent-decision/notice-of-intent-decision.controller.spec.ts new file mode 100644 index 0000000000..ca88b19658 --- /dev/null +++ b/services/apps/alcs/src/portal/notice-of-intent-decision/notice-of-intent-decision.controller.spec.ts @@ -0,0 +1,89 @@ +import { classes } from '@automapper/classes'; +import { AutomapperModule } from '@automapper/nestjs'; +import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; +import { Test, TestingModule } from '@nestjs/testing'; +import { ClsService } from 'nestjs-cls'; +import { mockKeyCloakProviders } from '../../../test/mocks/mockTypes'; +import { NoticeOfIntentDecisionV2Service } from '../../alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.service'; +import { NoticeOfIntentDecision } from '../../alcs/notice-of-intent-decision/notice-of-intent-decision.entity'; +import { NoticeOfIntentDecisionProfile } from '../../common/automapper/notice-of-intent-decision.automapper.profile'; +import { User } from '../../user/user.entity'; +import { NoticeOfIntentSubmission } from '../notice-of-intent-submission/notice-of-intent-submission.entity'; +import { NoticeOfIntentSubmissionService } from '../notice-of-intent-submission/notice-of-intent-submission.service'; +import { NoticeOfIntentDecisionController } from './notice-of-intent-decision.controller'; + +describe('NoticeOfIntentDecisionController', () => { + let controller: NoticeOfIntentDecisionController; + let mockNOISubmissionService: DeepMocked; + let mockDecisionService: DeepMocked; + + beforeEach(async () => { + mockNOISubmissionService = createMock(); + mockDecisionService = createMock(); + + const module: TestingModule = await Test.createTestingModule({ + imports: [ + AutomapperModule.forRoot({ + strategyInitializer: classes(), + }), + ], + controllers: [NoticeOfIntentDecisionController], + providers: [ + NoticeOfIntentDecisionProfile, + { + provide: NoticeOfIntentSubmissionService, + useValue: mockNOISubmissionService, + }, + { + provide: NoticeOfIntentDecisionV2Service, + useValue: mockDecisionService, + }, + { + provide: ClsService, + useValue: {}, + }, + ...mockKeyCloakProviders, + ], + }).compile(); + controller = module.get( + NoticeOfIntentDecisionController, + ); + + mockNOISubmissionService.getByFileNumber.mockResolvedValue( + new NoticeOfIntentSubmission(), + ); + }); + + it('should be defined', () => { + expect(controller).toBeDefined(); + }); + + it('should verify access and call through for loading decisions', async () => { + mockDecisionService.getForPortal.mockResolvedValue([ + new NoticeOfIntentDecision(), + ]); + + const res = await controller.listDecisions('', { + user: { + entity: new User(), + }, + }); + + expect(res.length).toEqual(1); + expect(mockNOISubmissionService.getByFileNumber).toHaveBeenCalledTimes(1); + expect(mockDecisionService.getForPortal).toHaveBeenCalledTimes(1); + }); + + it('should call through for loading files', async () => { + mockDecisionService.getDownloadUrl.mockResolvedValue('Mock Url'); + + const res = await controller.openFile('', { + user: { + entity: new User(), + }, + }); + + expect(res.url).toBeTruthy(); + expect(mockDecisionService.getDownloadUrl).toHaveBeenCalledTimes(1); + }); +}); diff --git a/services/apps/alcs/src/portal/notice-of-intent-decision/notice-of-intent-decision.controller.ts b/services/apps/alcs/src/portal/notice-of-intent-decision/notice-of-intent-decision.controller.ts new file mode 100644 index 0000000000..3ea5857a99 --- /dev/null +++ b/services/apps/alcs/src/portal/notice-of-intent-decision/notice-of-intent-decision.controller.ts @@ -0,0 +1,49 @@ +import { Mapper } from '@automapper/core'; +import { InjectMapper } from '@automapper/nestjs'; +import { Controller, Get, Param, Req, UseGuards } from '@nestjs/common'; +import { ApiOAuth2 } from '@nestjs/swagger'; +import * as config from 'config'; +import { NoticeOfIntentDecisionV2Service } from '../../alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.service'; +import { NoticeOfIntentDecision } from '../../alcs/notice-of-intent-decision/notice-of-intent-decision.entity'; +import { PortalAuthGuard } from '../../common/authorization/portal-auth-guard.service'; +import { NoticeOfIntentSubmissionService } from '../notice-of-intent-submission/notice-of-intent-submission.service'; +import { NoticeOfIntentPortalDecisionDto } from './notice-of-intent-decision.dto'; + +@ApiOAuth2(config.get('KEYCLOAK.SCOPES')) +@UseGuards(PortalAuthGuard) +@Controller('notice-of-intent-decision') +export class NoticeOfIntentDecisionController { + constructor( + private noticeOfIntentSubmissionService: NoticeOfIntentSubmissionService, + private decisionService: NoticeOfIntentDecisionV2Service, + @InjectMapper() private mapper: Mapper, + ) {} + + @Get('/notice-of-intent/:fileNumber') + async listDecisions( + @Param('fileNumber') fileNumber: string, + @Req() req, + ): Promise { + await this.noticeOfIntentSubmissionService.getByFileNumber( + fileNumber, + req.user.entity, + ); + + const decisions = await this.decisionService.getForPortal(fileNumber); + + return this.mapper.mapArray( + decisions, + NoticeOfIntentDecision, + NoticeOfIntentPortalDecisionDto, + ); + } + + @Get('/:uuid/open') + async openFile(@Param('uuid') fileUuid: string, @Req() req) { + const url = await this.decisionService.getDownloadUrl(fileUuid); + + //TODO: How do we know which documents applicant can access? + + return { url }; + } +} diff --git a/services/apps/alcs/src/portal/notice-of-intent-decision/notice-of-intent-decision.dto.ts b/services/apps/alcs/src/portal/notice-of-intent-decision/notice-of-intent-decision.dto.ts new file mode 100644 index 0000000000..0a44cc1d24 --- /dev/null +++ b/services/apps/alcs/src/portal/notice-of-intent-decision/notice-of-intent-decision.dto.ts @@ -0,0 +1,32 @@ +import { AutoMap } from '@automapper/classes'; +import { LinkedResolutionDto } from '../../alcs/application-decision/application-decision-v1/application-decision/application-decision.dto'; +import { + NoticeOfIntentDecisionDocumentDto, + NoticeOfIntentDecisionOutcomeCodeDto, +} from '../../alcs/notice-of-intent-decision/notice-of-intent-decision.dto'; +import { NoticeOfIntentDocumentDto } from '../../alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.dto'; + +export class NoticeOfIntentPortalDecisionDto { + @AutoMap() + uuid: string; + + @AutoMap() + date: number; + + @AutoMap(() => NoticeOfIntentDecisionOutcomeCodeDto) + outcome: NoticeOfIntentDecisionOutcomeCodeDto; + + @AutoMap(() => String) + resolutionNumber: number; + + @AutoMap(() => String) + resolutionYear: number; + + @AutoMap(() => [NoticeOfIntentDecisionDocumentDto]) + documents: NoticeOfIntentDocumentDto[]; + + @AutoMap(() => Boolean) + isSubjectToConditions: boolean; + + modifies?: LinkedResolutionDto; +} diff --git a/services/apps/alcs/src/portal/notice-of-intent-decision/notice-of-intent-decision.module.ts b/services/apps/alcs/src/portal/notice-of-intent-decision/notice-of-intent-decision.module.ts new file mode 100644 index 0000000000..7912000bee --- /dev/null +++ b/services/apps/alcs/src/portal/notice-of-intent-decision/notice-of-intent-decision.module.ts @@ -0,0 +1,12 @@ +import { Module } from '@nestjs/common'; +import { NoticeOfIntentDecisionModule } from '../../alcs/notice-of-intent-decision/notice-of-intent-decision.module'; +import { NoticeOfIntentSubmissionModule } from '../notice-of-intent-submission/notice-of-intent-submission.module'; +import { NoticeOfIntentDecisionController } from './notice-of-intent-decision.controller'; + +@Module({ + imports: [NoticeOfIntentDecisionModule, NoticeOfIntentSubmissionModule], + controllers: [NoticeOfIntentDecisionController], + providers: [], + exports: [], +}) +export class PortalNoticeOfIntentDecisionModule {} diff --git a/services/apps/alcs/src/portal/portal.module.ts b/services/apps/alcs/src/portal/portal.module.ts index 880e4ebf74..1819e29a5b 100644 --- a/services/apps/alcs/src/portal/portal.module.ts +++ b/services/apps/alcs/src/portal/portal.module.ts @@ -12,6 +12,7 @@ import { ApplicationSubmissionReviewModule } from './application-submission-revi import { ApplicationSubmissionModule } from './application-submission/application-submission.module'; import { CodeController } from './code/code.controller'; import { PortalDocumentModule } from './document/document.module'; +import { PortalNoticeOfIntentDecisionModule } from './notice-of-intent-decision/notice-of-intent-decision.module'; import { PortalNoticeOfIntentDocumentModule } from './notice-of-intent-document/notice-of-intent-document.module'; import { NoticeOfIntentSubmissionDraftModule } from './notice-of-intent-submission-draft/notice-of-intent-submission-draft.module'; import { NoticeOfIntentSubmissionModule } from './notice-of-intent-submission/notice-of-intent-submission.module'; @@ -36,6 +37,7 @@ import { PdfGenerationModule } from './pdf-generation/pdf-generation.module'; NoticeOfIntentSubmissionModule, PortalNoticeOfIntentDocumentModule, NoticeOfIntentSubmissionDraftModule, + PortalNoticeOfIntentDecisionModule, RouterModule.register([ { path: 'portal', module: ApplicationSubmissionModule }, { path: 'portal', module: NoticeOfIntentSubmissionModule }, @@ -48,6 +50,7 @@ import { PdfGenerationModule } from './pdf-generation/pdf-generation.module'; { path: 'portal', module: PortalApplicationDecisionModule }, { path: 'portal', module: PortalNoticeOfIntentDocumentModule }, { path: 'portal', module: NoticeOfIntentSubmissionDraftModule }, + { path: 'portal', module: PortalNoticeOfIntentDecisionModule }, ]), ], controllers: [CodeController], diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1692902429290-update_dec_number_generation_for_nois.ts b/services/apps/alcs/src/providers/typeorm/migrations/1692902429290-update_dec_number_generation_for_nois.ts index 0953947b97..31254bc77e 100644 --- a/services/apps/alcs/src/providers/typeorm/migrations/1692902429290-update_dec_number_generation_for_nois.ts +++ b/services/apps/alcs/src/providers/typeorm/migrations/1692902429290-update_dec_number_generation_for_nois.ts @@ -4,6 +4,9 @@ export class updateDecNumberGenerationForNois1692902429290 implements MigrationInterface { public async up(queryRunner: QueryRunner): Promise { + // This function gets the next available decision number for the given year, these numbers are shared among Applications and NOIs + // When a decision is deleted, that number returns to the pool. + // This function unions both NOI and Application tables then uses row_number by resolution_number to find the next one await queryRunner.query( `CREATE OR REPLACE FUNCTION alcs.generate_next_resolution_number(p_resolution_year integer) RETURNS integer From f61c087997022415bd25d5a7cc8ca02875524055 Mon Sep 17 00:00:00 2001 From: Liam Stoddard Date: Fri, 25 Aug 2023 13:02:57 -0700 Subject: [PATCH 308/954] MR feedback --- .../submap/direction_mapping.py | 74 ----------------- .../submissions/app_submissions.py | 15 ++-- .../{ => submissions}/submap/__init__.py | 0 .../submissions/submap/direction_mapping.py | 80 +++++++++++++++++++ 4 files changed, 89 insertions(+), 80 deletions(-) delete mode 100644 bin/migrate-oats-data/submap/direction_mapping.py rename bin/migrate-oats-data/{ => submissions}/submap/__init__.py (100%) create mode 100644 bin/migrate-oats-data/submissions/submap/direction_mapping.py diff --git a/bin/migrate-oats-data/submap/direction_mapping.py b/bin/migrate-oats-data/submap/direction_mapping.py deleted file mode 100644 index ff8afa18e1..0000000000 --- a/bin/migrate-oats-data/submap/direction_mapping.py +++ /dev/null @@ -1,74 +0,0 @@ - -def add_direction_field(data): - # populates columns to be inserted - data['east_land_use_type_description'] = None - data['east_land_use_type'] = None - data['west_land_use_type_description'] = None - data['west_land_use_type'] = None - data['north_land_use_type_description'] = None - data['north_land_use_type'] = None - data['south_land_use_type_description'] = None - data['south_land_use_type'] = None - return data - -def get_NESW_rows(rows, cursor): - # fetches adjacent land use data, specifically direction, description and type code - application_ids = [dict(item)["alr_application_id"] for item in rows] - application_ids_string = ', '.join(str(item) for item in application_ids) - adj_rows_query = f"""SELECT * from - oats.oats_adjacent_land_uses oalu - WHERE oalu.alr_application_id in ({application_ids_string}) - """ - cursor.execute(adj_rows_query) - adj_rows = cursor.fetchall() - return adj_rows - -def map_direction_values(data, direction_data): - # adds direction field values into data row - data['east_land_use_type_description'] = direction_data.get(data["alr_application_id"], {}).get('east_description', 'No data found') - data['east_land_use_type'] = direction_data.get(data["alr_application_id"], {}).get('east_type_code', None) - data['west_land_use_type_description'] = direction_data.get(data["alr_application_id"], {}).get('west_description', 'No data found') - data['west_land_use_type'] = direction_data.get(data["alr_application_id"], {}).get('west_type_code', None) - data['north_land_use_type_description'] = direction_data.get(data["alr_application_id"], {}).get('north_description', 'No data found') - data['north_land_use_type'] = direction_data.get(data["alr_application_id"], {}).get('north_type_code', None) - data['south_land_use_type_description'] = direction_data.get(data["alr_application_id"], {}).get('south_description', 'No data found') - data['south_land_use_type'] = direction_data.get(data["alr_application_id"], {}).get('south_type_code', None) - return data - -def create_dir_dict(adj_rows): - # creates dictionary of adjacent land use data with all directions attributed to one application id - dir_dict = {} - for row in adj_rows: - application_id = row['alr_application_id'] - - if application_id in dir_dict: - if row['cardinal_direction'] == 'EAST': - dir_dict[application_id]['east_description'] = row['description'] - dir_dict[application_id]['east_type_code'] = row['nonfarm_use_type_code'] - if row['cardinal_direction'] == 'WEST': - dir_dict[application_id]['west_description'] = row['description'] - dir_dict[application_id]['west_type_code'] = row['nonfarm_use_type_code'] - if row['cardinal_direction'] == 'NORTH': - dir_dict[application_id]['north_description'] = row['description'] - dir_dict[application_id]['north_type_code'] = row['nonfarm_use_type_code'] - if row['cardinal_direction'] == 'SOUTH': - dir_dict[application_id]['south_description'] = row['description'] - dir_dict[application_id]['south_type_code'] = row['nonfarm_use_type_code'] - else: - dir_dict[application_id] = {} - dir_dict[application_id]['alr_application_id'] = row['alr_application_id'] - - if row['cardinal_direction'] == 'EAST': - dir_dict[application_id]['east_description'] = row['description'] - dir_dict[application_id]['east_type_code'] = row['nonfarm_use_type_code'] - if row['cardinal_direction'] == 'WEST': - dir_dict[application_id]['west_description'] = row['description'] - dir_dict[application_id]['west_type_code'] = row['nonfarm_use_type_code'] - if row['cardinal_direction'] == 'NORTH': - dir_dict[application_id]['north_description'] = row['description'] - dir_dict[application_id]['north_type_code'] = row['nonfarm_use_type_code'] - if row['cardinal_direction'] == 'SOUTH': - dir_dict[application_id]['south_description'] = row['description'] - dir_dict[application_id]['south_type_code'] = row['nonfarm_use_type_code'] - - return dir_dict \ No newline at end of file diff --git a/bin/migrate-oats-data/submissions/app_submissions.py b/bin/migrate-oats-data/submissions/app_submissions.py index 62e5c869fe..8407f456c5 100644 --- a/bin/migrate-oats-data/submissions/app_submissions.py +++ b/bin/migrate-oats-data/submissions/app_submissions.py @@ -3,11 +3,11 @@ log_end, log_start, ) -from submap import ( +from .submap import ( add_direction_field, map_direction_values, - create_dir_dict, - get_NESW_rows, + create_direction_dict, + get_directions_rows, ) from db import inject_conn_pool from constants import BATCH_UPLOAD_SIZE @@ -59,8 +59,8 @@ def process_alcs_app_submissions(conn=None, batch_size=BATCH_UPLOAD_SIZE): if not rows: break try: - adj_rows = get_NESW_rows(rows, cursor) - direction_data = create_dir_dict(adj_rows) + adj_rows = get_directions_rows(rows, cursor) + direction_data = create_direction_dict(adj_rows) submissions_to_be_inserted_count = len(rows) @@ -97,6 +97,7 @@ def insert_app_sub_records(conn, batch_size, cursor, rows, direction_data): batch_size (int): Number of rows to execute at one time. cursor (obj): Cursor object to execute queries. rows (list): Rows of data to insert in the database. + direction_data (dict): Dictionary of adjacent parcel data Returns: None: Commits the changes to the database. @@ -138,11 +139,13 @@ def prepare_app_sub_data(app_sub_raw_data_list, direction_data): This function prepares different lists of data based on the 'alr_change_code' field of each data dict in 'app_sub_raw_data_list'. :param app_sub_raw_data_list: A list of raw data dictionaries. - :return: Five lists, each containing dictionaries from 'app_sub_raw_data_list' grouped based on the 'alr_change_code' field + :param direction_data: A dictionary of adjacent parcel data. + :return: Five lists, each containing dictionaries from 'app_sub_raw_data_list' and 'direction_data' grouped based on the 'alr_change_code' field Detailed Workflow: - Initializes empty lists - Iterates over 'app_sub_raw_data_list' + - Maps adjacent parcel data based on alr_application_id - Maps the basic fields of the data dictionary based on the alr_change_code - Returns the mapped lists """ diff --git a/bin/migrate-oats-data/submap/__init__.py b/bin/migrate-oats-data/submissions/submap/__init__.py similarity index 100% rename from bin/migrate-oats-data/submap/__init__.py rename to bin/migrate-oats-data/submissions/submap/__init__.py diff --git a/bin/migrate-oats-data/submissions/submap/direction_mapping.py b/bin/migrate-oats-data/submissions/submap/direction_mapping.py new file mode 100644 index 0000000000..ac086e8507 --- /dev/null +++ b/bin/migrate-oats-data/submissions/submap/direction_mapping.py @@ -0,0 +1,80 @@ + +def add_direction_field(data): + # populates columns to be inserted + data['east_land_use_type_description'] = None + data['east_land_use_type'] = None + data['west_land_use_type_description'] = None + data['west_land_use_type'] = None + data['north_land_use_type_description'] = None + data['north_land_use_type'] = None + data['south_land_use_type_description'] = None + data['south_land_use_type'] = None + return data + +def get_directions_rows(rows, cursor): + # fetches adjacent land use data, specifically direction, description and type code + application_ids = [dict(item)["alr_application_id"] for item in rows] + application_ids_string = ', '.join(str(item) for item in application_ids) + adj_rows_query = f"""SELECT * from + oats.oats_adjacent_land_uses oalu + WHERE oalu.alr_application_id in ({application_ids_string}) + """ + cursor.execute(adj_rows_query) + adj_rows = cursor.fetchall() + return adj_rows + +def map_direction_values(data, direction_data): + # adds direction field values into data row + no_data = 'No data found' + app_id = "alr_application_id" + data['east_land_use_type_description'] = direction_data.get(data[app_id], {}).get('east_description', no_data) + data['east_land_use_type'] = direction_data.get(data[app_id], {}).get('east_type_code', None) + data['west_land_use_type_description'] = direction_data.get(data[app_id], {}).get('west_description', no_data) + data['west_land_use_type'] = direction_data.get(data[app_id], {}).get('west_type_code', None) + data['north_land_use_type_description'] = direction_data.get(data[app_id], {}).get('north_description', no_data) + data['north_land_use_type'] = direction_data.get(data[app_id], {}).get('north_type_code', None) + data['south_land_use_type_description'] = direction_data.get(data[app_id], {}).get('south_description', no_data) + data['south_land_use_type'] = direction_data.get(data[app_id], {}).get('south_type_code', None) + return data + +def create_direction_dict(adj_rows): + # creates dictionary of adjacent land use data with all directions attributed to one application id + compass = 'cardinal_direction' + description = 'description' + type_code = 'nonfarm_use_type_code' + alr_id = 'alr_application_id' + direction_dict = {} + for row in adj_rows: + application_id = row[alr_id] + + if application_id in direction_dict: + if row[compass] == 'EAST': + direction_dict[application_id]['east_description'] = row[description] + direction_dict[application_id]['east_type_code'] = row[type_code] + if row[compass] == 'WEST': + direction_dict[application_id]['west_description'] = row[description] + direction_dict[application_id]['west_type_code'] = row[type_code] + if row[compass] == 'NORTH': + direction_dict[application_id]['north_description'] = row[description] + direction_dict[application_id]['north_type_code'] = row[type_code] + if row[compass] == 'SOUTH': + direction_dict[application_id]['south_description'] = row[description] + direction_dict[application_id]['south_type_code'] = row[type_code] + else: + direction_dict[application_id] = {} + direction_dict[application_id][alr_id] = row[alr_id] + + if row[compass] == 'EAST': + direction_dict[application_id]['east_description'] = row[description] + direction_dict[application_id]['east_type_code'] = row[type_code] + if row[compass] == 'WEST': + direction_dict[application_id]['west_description'] = row[description] + direction_dict[application_id]['west_type_code'] = row[type_code] + if row[compass] == 'NORTH': + direction_dict[application_id]['north_description'] = row[description] + direction_dict[application_id]['north_type_code'] = row[type_code] + if row[compass] == 'SOUTH': + direction_dict[application_id]['south_description'] = row[description] + direction_dict[application_id]['south_type_code'] = row[type_code] + + return direction_dict \ No newline at end of file From d5f679166e154cf414210637f85e69a76138786e Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Fri, 25 Aug 2023 13:24:49 -0700 Subject: [PATCH 309/954] Decision Bug Fixes * Rename Ag fields to full names * Change padding on scroller to line buttons up with edges * Fix ordering of INCL/EXCL components --- .../decision-component.component.html | 12 ++++++------ .../incl-excl-input.component.html | 16 ++++++++-------- .../decision-input-v2.component.scss | 2 +- .../decision-component.component.html | 8 ++++---- .../decision-input-v2.component.scss | 2 +- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.html index ac4b7060b3..80bc71f308 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.html @@ -49,7 +49,7 @@
{{ data.applicationDecisionComponentType?.label }}
bindLabel="label" bindValue="value" required - placeholder="Ag Cap*" + placeholder="Agricultural Capability*" [clearable]="false" > @@ -63,19 +63,19 @@
{{ data.applicationDecisionComponentType?.label }}
bindLabel="label" bindValue="value" required - placeholder="Ag Cap Source*" + placeholder="Agricultural Capability Source*" [clearable]="false" > - Ag Cap Map - + Agricultural Capability Mapsheet Reference + - Ag Cap Consultant - + Agricultural Capability Consultant + diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/incl-excl-input/incl-excl-input.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/incl-excl-input/incl-excl-input.component.html index 2bdded468d..1022aa19e4 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/incl-excl-input/incl-excl-input.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/incl-excl-input/incl-excl-input.component.html @@ -13,14 +13,6 @@ /> -
- Applicant Type* - - Land Owner - L/FNG Initiated - -
- Expiry Date + +
+ Applicant Type* + + Land Owner + L/FNG Initiated + +
diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.scss b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.scss index 463b5a53e0..9e994e5cd3 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.scss +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.scss @@ -7,7 +7,7 @@ left: 212px; right: 0; background-color: #fff; - padding: 16px; + padding: 16px 94px 16px 48px; z-index: 2; border-top: 1px solid colors.$grey-light; diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.html b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.html index f8601a7b5a..3f8d3b0196 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.html +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.html @@ -25,7 +25,7 @@
{{ data.noticeOfIntentDecisionComponentType?.label }}
bindLabel="label" bindValue="value" required - placeholder="Ag Cap*" + placeholder="Agricultural Capability*" [clearable]="false" > @@ -39,18 +39,18 @@
{{ data.noticeOfIntentDecisionComponentType?.label }}
bindLabel="label" bindValue="value" required - placeholder="Ag Cap Source*" + placeholder="Agricultural Capability Source*" [clearable]="false" > - Ag Cap Map + Agricultural Capability Mapsheet Reference - Ag Cap Consultant + Agricultural Capability Consultant diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-input-v2.component.scss b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-input-v2.component.scss index 65072d2bb9..000036bef8 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-input-v2.component.scss +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-input-v2.component.scss @@ -7,7 +7,7 @@ left: 240px; right: 0; background-color: #fff; - padding: 16px; + padding: 16px 94px 16px 48px; z-index: 2; border-top: 1px solid colors.$grey-light; From 5d441d4724fab2d45cf25e7847e3317f528deba8 Mon Sep 17 00:00:00 2001 From: Liam Stoddard Date: Fri, 25 Aug 2023 17:27:26 -0700 Subject: [PATCH 310/954] initial commit, query & dict appear functional --- .../submissions/app_submissions.py | 8 ++++ .../submissions/sql/app_submission.sql | 3 +- .../submissions/submap/__init__.py | 3 +- .../submissions/submap/subdiv_plot.py | 46 +++++++++++++++++++ 4 files changed, 58 insertions(+), 2 deletions(-) create mode 100644 bin/migrate-oats-data/submissions/submap/subdiv_plot.py diff --git a/bin/migrate-oats-data/submissions/app_submissions.py b/bin/migrate-oats-data/submissions/app_submissions.py index 8407f456c5..43bb52bfcd 100644 --- a/bin/migrate-oats-data/submissions/app_submissions.py +++ b/bin/migrate-oats-data/submissions/app_submissions.py @@ -8,12 +8,15 @@ map_direction_values, create_direction_dict, get_directions_rows, + get_subdiv_rows, + create_subdiv_dict, ) from db import inject_conn_pool from constants import BATCH_UPLOAD_SIZE from psycopg2.extras import execute_batch, RealDictCursor import traceback from enum import Enum +import json etl_name = "alcs_app_sub" @@ -59,8 +62,13 @@ def process_alcs_app_submissions(conn=None, batch_size=BATCH_UPLOAD_SIZE): if not rows: break try: + # print(rows) adj_rows = get_directions_rows(rows, cursor) direction_data = create_direction_dict(adj_rows) + subdiv_rows = get_subdiv_rows(rows, cursor) + print(subdiv_rows) + subdiv_data = create_subdiv_dict(subdiv_rows) + print(subdiv_data) submissions_to_be_inserted_count = len(rows) diff --git a/bin/migrate-oats-data/submissions/sql/app_submission.sql b/bin/migrate-oats-data/submissions/sql/app_submission.sql index 6d3605e5c9..d4c0b36d64 100644 --- a/bin/migrate-oats-data/submissions/sql/app_submission.sql +++ b/bin/migrate-oats-data/submissions/sql/app_submission.sql @@ -19,7 +19,8 @@ SELECT oc.alr_change_code, acg.alr_application_id, aa.applicant, - aa.alr_area + aa.alr_area, + oc.alr_appl_component_id FROM appl_components_grouped acg LEFT JOIN alcs.application aa ON aa.file_number = acg.alr_application_id::TEXT diff --git a/bin/migrate-oats-data/submissions/submap/__init__.py b/bin/migrate-oats-data/submissions/submap/__init__.py index 775acecbf2..39cbcf6a23 100644 --- a/bin/migrate-oats-data/submissions/submap/__init__.py +++ b/bin/migrate-oats-data/submissions/submap/__init__.py @@ -1 +1,2 @@ -from .direction_mapping import * \ No newline at end of file +from .direction_mapping import * +from .subdiv_plot import * \ No newline at end of file diff --git a/bin/migrate-oats-data/submissions/submap/subdiv_plot.py b/bin/migrate-oats-data/submissions/submap/subdiv_plot.py new file mode 100644 index 0000000000..a2a7bf4dab --- /dev/null +++ b/bin/migrate-oats-data/submissions/submap/subdiv_plot.py @@ -0,0 +1,46 @@ +def get_subdiv_rows(rows, cursor): + # fetches subdivision_data, + component_ids = [dict(item)["alr_appl_component_id"] for item in rows] + component_ids_string = ', '.join(str(item) for item in component_ids) + print(component_ids_string) + subdiv_rows_query = f""" + SELECT + spi.alr_appl_component_id, spi.parcel_area, road_dedication_area, spi.subdiv_design_parcel_id + FROM + oats.oats_subdiv_parcel_intents spi + LEFT JOIN oats.oats_subdivision_designs sd ON spi.alr_appl_component_id = sd.alr_appl_component_id + LEFT JOIN oats.oats_subdiv_design_parcels sdp ON spi.subdiv_design_parcel_id = sdp.subdiv_design_parcel_id + WHERE spi.alr_appl_component_id in ({component_ids_string}) + """ + # print(subdiv_rows_query) + cursor.execute(subdiv_rows_query) + subdiv_rows = cursor.fetchall() + return subdiv_rows + +def create_subdiv_dict(subdiv_rows): + # creates dictionary of adjacent land use data with all directions attributed to one application id + alr_id = 'alr_appl_component_id' + parcel_design_id = 'subdiv_design_parcel_id' + area = 'parcel_area' + lot = 'Lot' + type = 'type' + size = 'size' + + subdiv_dict = {} + for row in subdiv_rows: + app_component_id = row[alr_id] + + if app_component_id in subdiv_dict: + if row[parcel_design_id] not in subdiv_dict: + subdiv_dict[app_component_id][size] = row[area] + subdiv_dict[app_component_id][type] = lot + + else: + subdiv_dict[app_component_id] = {} + subdiv_dict[app_component_id][size] = row[area] + subdiv_dict[app_component_id][type] = lot + subdiv_dict[app_component_id][size] = row['road_dedication_area'] + subdiv_dict[app_component_id][type] = 'Road_Dedication' + + return subdiv_dict + \ No newline at end of file From 2471d86277507d6373c1b22efa42cd480b7d3b68 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Mon, 28 Aug 2023 09:57:44 -0700 Subject: [PATCH 311/954] Add Unit Tests * Add unit tests to classes a bit low on code coverage --- .../board-management.controller.spec.ts | 106 ++++++++++++++++++ .../alcs/src/alcs/board/board.service.spec.ts | 50 +++++++++ .../alcs/src/alcs/card/card.service.spec.ts | 78 +++++++++++++ .../notice-of-intent.controller.spec.ts | 30 +++++ .../notice-of-intent.controller.ts | 2 +- .../notice-of-intent.service.spec.ts | 75 ++++++++++++- .../alcs/notice-of-intent/notice-of-intent.ts | 18 --- 7 files changed, 339 insertions(+), 20 deletions(-) delete mode 100644 services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.ts diff --git a/services/apps/alcs/src/alcs/admin/board-management/board-management.controller.spec.ts b/services/apps/alcs/src/alcs/admin/board-management/board-management.controller.spec.ts index 645912a24f..1861b70268 100644 --- a/services/apps/alcs/src/alcs/admin/board-management/board-management.controller.spec.ts +++ b/services/apps/alcs/src/alcs/admin/board-management/board-management.controller.spec.ts @@ -1,9 +1,11 @@ +import { ServiceValidationException } from '@app/common/exceptions/base.exception'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { ConfigModule } from '@nestjs/config'; import { Test, TestingModule } from '@nestjs/testing'; import { ClsService } from 'nestjs-cls'; import { mockKeyCloakProviders } from '../../../../test/mocks/mockTypes'; import { BoardService } from '../../board/board.service'; +import { Card } from '../../card/card.entity'; import { CardService } from '../../card/card.service'; import { BoardManagementController } from './board-management.controller'; @@ -44,4 +46,108 @@ describe('BoardManagementController', () => { it('should be defined', () => { expect(controller).toBeDefined(); }); + + it('should call through for get card type', async () => { + mockCardService.getCardTypes.mockResolvedValue([]); + + await controller.fetchCardTypes(); + + expect(mockCardService.getCardTypes).toHaveBeenCalledTimes(1); + }); + + it('should call through for update', async () => { + mockBoardService.update.mockResolvedValue(); + + await controller.update('code', { + allowedCardTypes: [], + code: '', + createCardTypes: [], + showOnSchedule: false, + statuses: [], + title: '', + }); + + expect(mockBoardService.update).toHaveBeenCalledTimes(1); + }); + + it('should call through for create', async () => { + mockBoardService.create.mockResolvedValue(); + + await controller.create({ + allowedCardTypes: [], + code: '', + createCardTypes: [], + showOnSchedule: false, + statuses: [], + title: '', + }); + + expect(mockBoardService.create).toHaveBeenCalledTimes(1); + }); + + it('should call through for delete when board has no cards', async () => { + mockCardService.getByBoard.mockResolvedValue([]); + mockBoardService.delete.mockResolvedValue(); + + await controller.delete('code'); + + expect(mockCardService.getByBoard).toHaveBeenCalledTimes(1); + expect(mockBoardService.delete).toHaveBeenCalledTimes(1); + }); + + it('should throw an exception for delete when board has cards', async () => { + mockCardService.getByBoard.mockResolvedValue([new Card()]); + + const promise = controller.delete('code'); + await expect(promise).rejects.toMatchObject( + new ServiceValidationException('Cannot delete boards with cards'), + ); + + expect(mockCardService.getByBoard).toHaveBeenCalledTimes(1); + expect(mockBoardService.delete).toHaveBeenCalledTimes(0); + }); + + it('should return card counts', async () => { + const mockCards = [ + { statusCode: 'status1' }, + { statusCode: 'status2' }, + { statusCode: 'status1' }, + ]; + mockCardService.getByBoard.mockResolvedValue(mockCards as Card[]); + + const result = await controller.fetchCardCount('code'); + + expect(result).toEqual({ status1: 2, status2: 1 }); + }); + + describe('canDelete', () => { + it('should allow board deletion if code is not "vett" and no cards on the board', async () => { + mockCardService.getByBoard.mockResolvedValue([]); + + const result = await controller.canDelete('code'); + + expect(result).toEqual({ canDelete: true }); + }); + + it('should disallow board deletion if code is "vett"', async () => { + const result = await controller.canDelete('vett'); + + expect(result).toEqual({ + canDelete: false, + reason: + 'Board is critical to application functionality and can never be deleted', + }); + }); + + it('should disallow board deletion if cards are present on the board', async () => { + mockCardService.getByBoard.mockResolvedValue([new Card()]); + + const result = await controller.canDelete('code'); + + expect(result).toEqual({ + canDelete: false, + reason: 'Board has cards on it, please move cards in order to delete', + }); + }); + }); }); diff --git a/services/apps/alcs/src/alcs/board/board.service.spec.ts b/services/apps/alcs/src/alcs/board/board.service.spec.ts index 95c34efe0d..2fcdfb4e75 100644 --- a/services/apps/alcs/src/alcs/board/board.service.spec.ts +++ b/services/apps/alcs/src/alcs/board/board.service.spec.ts @@ -4,6 +4,7 @@ import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { ApplicationService } from '../application/application.service'; +import { CARD_STATUS } from '../card/card-status/card-status.entity'; import { Card } from '../card/card.entity'; import { CardService } from '../card/card.service'; import { BoardStatus } from './board-status.entity'; @@ -121,4 +122,53 @@ describe('BoardsService', () => { expect(mockBoardStatusRepository.delete).toHaveBeenCalledTimes(1); }); + + it('should call through for getOneOrFail', async () => { + mockBoardRepository.findOneOrFail.mockResolvedValue({} as any); + + await service.getOneOrFail({}); + + expect(mockBoardRepository.findOneOrFail).toHaveBeenCalledTimes(1); + }); + + it('should call through for getBoardsWithStatus', async () => { + mockBoardRepository.find.mockResolvedValue([]); + + await service.getBoardsWithStatus(CARD_STATUS.READY_FOR_REVIEW); + + expect(mockBoardRepository.find).toHaveBeenCalledTimes(1); + }); + + it('should delete the status links then remove the board for delete', async () => { + mockBoardRepository.findOneOrFail.mockResolvedValue(new Board()); + mockBoardRepository.remove.mockResolvedValue({} as any); + mockBoardStatusRepository.delete.mockResolvedValue({} as any); + + await service.delete('board-code'); + + expect(mockBoardRepository.findOneOrFail).toHaveBeenCalledTimes(1); + expect(mockBoardStatusRepository.delete).toHaveBeenCalledTimes(1); + expect(mockBoardRepository.remove).toHaveBeenCalledTimes(1); + }); + + it('should save both the board and updated status when creating or updating', async () => { + cardService.getCardTypes.mockResolvedValue([]); + mockBoardRepository.save.mockResolvedValue(new Board()); + mockBoardStatusRepository.delete.mockResolvedValue({} as any); + mockBoardStatusRepository.save.mockResolvedValue([] as any); + + await service.create({ + allowedCardTypes: [], + code: '', + createCardTypes: [], + showOnSchedule: false, + statuses: [], + title: '', + }); + + expect(cardService.getCardTypes).toHaveBeenCalledTimes(1); + expect(mockBoardRepository.save).toHaveBeenCalledTimes(1); + expect(mockBoardStatusRepository.delete).toHaveBeenCalledTimes(1); + expect(mockBoardStatusRepository.save).toHaveBeenCalledTimes(1); + }); }); diff --git a/services/apps/alcs/src/alcs/card/card.service.spec.ts b/services/apps/alcs/src/alcs/card/card.service.spec.ts index 44ba8c745d..4e7bd197ce 100644 --- a/services/apps/alcs/src/alcs/card/card.service.spec.ts +++ b/services/apps/alcs/src/alcs/card/card.service.spec.ts @@ -14,6 +14,7 @@ import { import { User } from '../../user/user.entity'; import { Board } from '../board/board.entity'; import { NotificationService } from '../notification/notification.service'; +import { CardSubtask } from './card-subtask/card-subtask.entity'; import { CardSubtaskService } from './card-subtask/card-subtask.service'; import { CARD_TYPE, CardType } from './card-type/card-type.entity'; import { CardUpdateServiceDto } from './card.dto'; @@ -161,6 +162,15 @@ describe('CardService', () => { expect(cardTypeRepositoryMock.find).toBeCalledTimes(1); }); + it('should call the repo for listing portal card types', async () => { + cardTypeRepositoryMock.find.mockResolvedValue([new CardType({})]); + + const types = await service.getPortalCardTypes(); + expect(types.length).toEqual(1); + + expect(cardTypeRepositoryMock.find).toBeCalledTimes(1); + }); + it('should call the repo for getWithBoard', async () => { cardRepositoryMock.findOne.mockResolvedValue(new Card()); @@ -169,6 +179,32 @@ describe('CardService', () => { expect(cardRepositoryMock.findOne).toBeCalledTimes(1); }); + it('should call the repo for getByBoard', async () => { + cardRepositoryMock.find.mockResolvedValue([new Card()]); + + const card = await service.getByBoard(''); + expect(card).toBeDefined(); + expect(cardRepositoryMock.find).toBeCalledTimes(1); + }); + + it('should call the repo for getByCardStatus', async () => { + cardRepositoryMock.find.mockResolvedValue([new Card()]); + + const card = await service.getByCardStatus(''); + expect(card).toBeDefined(); + expect(cardRepositoryMock.find).toBeCalledTimes(1); + }); + + it('should call the repo for save', async () => { + cardRepositoryMock.findOne.mockResolvedValue(new Card()); + cardRepositoryMock.save.mockResolvedValue(new Card()); + + const card = await service.save(new Card()); + expect(card).toBeDefined(); + expect(cardRepositoryMock.findOne).toBeCalledTimes(1); + expect(cardRepositoryMock.save).toHaveBeenCalledTimes(1); + }); + it('should call notification service when assignee is changed', async () => { const mockUserUuid = 'fake-user'; const mockUpdate = { @@ -194,4 +230,46 @@ describe('CardService', () => { ); expect(createNotificationServiceDto.targetType).toStrictEqual('card'); }); + + it('should delete the subtasks then call softRemove for Archive', async () => { + cardRepositoryMock.findOneOrFail.mockResolvedValue( + new Card({ + subtasks: [ + new CardSubtask({ + uuid: 'subtask-uuid', + }), + ], + }), + ); + cardRepositoryMock.save.mockResolvedValue(new Card()); + cardRepositoryMock.softRemove.mockResolvedValue({} as any); + mockSubtaskService.deleteMany.mockResolvedValue(); + + await service.archive('uuid'); + expect(cardRepositoryMock.findOneOrFail).toBeCalledTimes(1); + expect(cardRepositoryMock.save).toHaveBeenCalledTimes(1); + expect(cardRepositoryMock.softRemove).toHaveBeenCalledTimes(1); + expect(mockSubtaskService.deleteMany).toHaveBeenCalledTimes(1); + }); + + it('should recover the subtasks then call recover for recover', async () => { + cardRepositoryMock.findOneOrFail.mockResolvedValue( + new Card({ + subtasks: [ + new CardSubtask({ + uuid: 'subtask-uuid', + }), + ], + }), + ); + cardRepositoryMock.save.mockResolvedValue(new Card()); + cardRepositoryMock.recover.mockResolvedValue({} as any); + mockSubtaskService.recoverMany.mockResolvedValue(); + + await service.recover('uuid'); + expect(cardRepositoryMock.findOneOrFail).toBeCalledTimes(1); + expect(cardRepositoryMock.save).toHaveBeenCalledTimes(1); + expect(cardRepositoryMock.recover).toHaveBeenCalledTimes(1); + expect(mockSubtaskService.recoverMany).toHaveBeenCalledTimes(1); + }); }); diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.controller.spec.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.controller.spec.ts index 30483de2fb..6f9ec113dc 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.controller.spec.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.controller.spec.ts @@ -70,6 +70,36 @@ describe('NoticeOfIntentController', () => { expect(mockService.mapToDtos).toHaveBeenCalledTimes(1); }); + it('should call through to service for get', async () => { + mockService.getByFileNumber.mockResolvedValue(new NoticeOfIntent()); + mockService.mapToDtos.mockResolvedValue([]); + + await controller.get('fileNumber'); + + expect(mockService.getByFileNumber).toHaveBeenCalledTimes(1); + expect(mockService.mapToDtos).toHaveBeenCalledTimes(1); + }); + + it('should call through to service for search', async () => { + mockService.searchByFileNumber.mockResolvedValue([new NoticeOfIntent()]); + mockService.mapToDtos.mockResolvedValue([]); + + await controller.search('fileNumber'); + + expect(mockService.searchByFileNumber).toHaveBeenCalledTimes(1); + expect(mockService.mapToDtos).toHaveBeenCalledTimes(1); + }); + + it('should call through to service for update', async () => { + mockService.update.mockResolvedValue(new NoticeOfIntent()); + mockService.mapToDtos.mockResolvedValue([]); + + await controller.update({}, 'fileNumber'); + + expect(mockService.update).toHaveBeenCalledTimes(1); + expect(mockService.mapToDtos).toHaveBeenCalledTimes(1); + }); + it('should call through to service for get card', async () => { mockService.getByCardUuid.mockResolvedValue(new NoticeOfIntent()); mockService.mapToDtos.mockResolvedValue([]); diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.controller.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.controller.ts index ee68803698..ad759a6dc7 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.controller.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.controller.ts @@ -88,7 +88,7 @@ export class NoticeOfIntentController { @Get('/search/:fileNumber') @UserRoles(...ROLES_ALLOWED_APPLICATIONS) - async searchApplications(@Param('fileNumber') fileNumber: string) { + async search(@Param('fileNumber') fileNumber: string) { const noticeOfIntents = await this.noticeOfIntentService.searchByFileNumber( fileNumber, ); diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.spec.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.spec.ts index 2160673de2..13436a77b9 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.spec.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.spec.ts @@ -4,7 +4,10 @@ import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { ServiceValidationException } from '../../../../../libs/common/src/exceptions/base.exception'; +import { + ServiceNotFoundException, + ServiceValidationException, +} from '../../../../../libs/common/src/exceptions/base.exception'; import { NoticeOfIntentProfile } from '../../common/automapper/notice-of-intent.automapper.profile'; import { FileNumberService } from '../../file-number/file-number.service'; import { NoticeOfIntentSubmission } from '../../portal/notice-of-intent-submission/notice-of-intent-submission.entity'; @@ -172,6 +175,19 @@ describe('NoticeOfIntentService', () => { expect(mockRepository.find.mock.calls[0][0]!.where).toEqual(mockFilter); }); + it('should call throw an exception when getOrFailByUuid fails', async () => { + mockRepository.findOne.mockResolvedValue(null); + const promise = service.getOrFailByUuid('uuid'); + + await expect(promise).rejects.toMatchObject( + new ServiceNotFoundException( + `Failed to find notice of intent with uuid uuid`, + ), + ); + + expect(mockRepository.findOne).toHaveBeenCalledTimes(1); + }); + it('should call through to the repo for getByFileNumber', async () => { mockRepository.findOneOrFail.mockResolvedValue(new NoticeOfIntent()); await service.getByFileNumber('file'); @@ -179,6 +195,38 @@ describe('NoticeOfIntentService', () => { expect(mockRepository.findOneOrFail).toHaveBeenCalledTimes(1); }); + it('should call through to the repo for searchByFileNumber', async () => { + mockRepository.find.mockResolvedValue([new NoticeOfIntent()]); + const res = await service.searchByFileNumber('file'); + + expect(mockRepository.find).toHaveBeenCalledTimes(1); + expect(res.length).toEqual(1); + }); + + it('should call through to the repo for getFileNumber', async () => { + mockRepository.findOneOrFail.mockResolvedValue( + new NoticeOfIntent({ + fileNumber: 'fileNumber', + }), + ); + const res = await service.getFileNumber('file'); + + expect(mockRepository.findOneOrFail).toHaveBeenCalledTimes(1); + expect(res).toEqual('fileNumber'); + }); + + it('should call through to the repo for getUuid', async () => { + mockRepository.findOneOrFail.mockResolvedValue( + new NoticeOfIntent({ + uuid: 'uuid', + }), + ); + const res = await service.getUuid('file'); + + expect(mockRepository.findOneOrFail).toHaveBeenCalledTimes(1); + expect(res).toEqual('uuid'); + }); + it('should set values and call save for update', async () => { const notice = new NoticeOfIntent({ summary: 'old-summary', @@ -328,4 +376,29 @@ describe('NoticeOfIntentService', () => { expect(res[0].pausedDays).toEqual(5); expect(res[0].paused).toEqual(true); }); + + it('should create a card and save it for submit', async () => { + const mockNoi = new NoticeOfIntent(); + mockRepository.findOne.mockResolvedValue(mockNoi); + mockRepository.findOneOrFail.mockResolvedValue(mockNoi); + mockCodeService.fetchRegion.mockResolvedValue(new ApplicationRegion()); + mockRepository.save.mockResolvedValue({} as any); + + await service.submit({ + applicant: 'Bruce Wayne', + typeCode: 'CAT', + fileNumber: 'fileNumber', + localGovernmentUuid: 'governmentUuid', + regionCode: 'REGION', + }); + + expect(mockNoi.fileNumber).toEqual('fileNumber'); + expect(mockNoi.region).toBeDefined(); + expect(mockNoi.card).toBeDefined(); + expect(mockCodeService.fetchRegion).toHaveBeenCalledTimes(1); + expect(mockRepository.findOne).toHaveBeenCalledTimes(1); + 0; + expect(mockRepository.findOneOrFail).toHaveBeenCalledTimes(1); + expect(mockRepository.save).toHaveBeenCalledTimes(1); + }); }); diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.ts deleted file mode 100644 index 32a3c1264a..0000000000 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.ts +++ /dev/null @@ -1,18 +0,0 @@ -import { Test, TestingModule } from '@nestjs/testing'; -import { NoticeOfIntentController } from './notice-of-intent.controller'; - -describe('NoiController', () => { - let controller: NoticeOfIntentController; - - beforeEach(async () => { - const module: TestingModule = await Test.createTestingModule({ - controllers: [NoticeOfIntentController], - }).compile(); - - controller = module.get(NoticeOfIntentController); - }); - - it('should be defined', () => { - expect(controller).toBeDefined(); - }); -}); From 0e315588c088f6aff136f161bd9b2a952bf60c86 Mon Sep 17 00:00:00 2001 From: "to. sandra" <76515860+sandratoh@users.noreply.github.com> Date: Mon, 28 Aug 2023 15:04:07 -0700 Subject: [PATCH 312/954] Send NOI decision released status emails (#917) * Send noi decision released email (wip masked date) * Rename variable to reflect removed masked date and add to noi * Add noi decision email unit test * Update noi service method and add unit test --- ...application-decision-v2.controller.spec.ts | 2 +- .../application-decision-v2.controller.ts | 2 +- ...e-of-intent-decision-v2.controller.spec.ts | 105 ++++++++++++++++++ ...notice-of-intent-decision-v2.controller.ts | 50 +++++++++ .../notice-of-intent-decision.module.ts | 2 + ...otice-of-intent-submission.service.spec.ts | 9 ++ .../notice-of-intent-submission.service.ts | 18 +-- .../alcs/src/providers/email/email.service.ts | 5 +- .../decision-released/application.template.ts | 4 +- .../notice-of-intent.template.ts | 4 +- 10 files changed, 186 insertions(+), 15 deletions(-) diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.controller.spec.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.controller.spec.ts index 47fbe6ff88..b9b93ddd3e 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.controller.spec.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.controller.spec.ts @@ -328,7 +328,7 @@ describe('ApplicationDecisionV2Controller', () => { parentType: 'application', primaryContact: mockOwner, ccGovernment: true, - decisionReleaseMaskedDate: new Date().toLocaleDateString('en-CA', { + decisionDate: new Date().toLocaleDateString('en-CA', { weekday: 'long', year: 'numeric', month: 'long', diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.controller.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.controller.ts index 8dfc2386b4..877430a398 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.controller.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.controller.ts @@ -327,7 +327,7 @@ export class ApplicationDecisionV2Controller { parentType: PARENT_TYPE.APPLICATION, primaryContact, ccGovernment: true, - decisionReleaseMaskedDate: date.toLocaleDateString('en-CA', options), + decisionDate: date.toLocaleDateString('en-CA', options), }); } } diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.controller.spec.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.controller.spec.ts index 2f0906fa24..74a21fc925 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.controller.spec.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.controller.spec.ts @@ -20,6 +20,12 @@ import { NoticeOfIntentDecision } from '../notice-of-intent-decision.entity'; import { NoticeOfIntentModificationService } from '../notice-of-intent-modification/notice-of-intent-modification.service'; import { NoticeOfIntentDecisionV2Controller } from './notice-of-intent-decision-v2.controller'; import { NoticeOfIntentDecisionV2Service } from './notice-of-intent-decision-v2.service'; +import { NoticeOfIntentSubmissionService } from '../../../portal/notice-of-intent-submission/notice-of-intent-submission.service'; +import { NoticeOfIntentOwner } from '../../../portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.entity'; +import { NoticeOfIntentSubmission } from '../../../portal/notice-of-intent-submission/notice-of-intent-submission.entity'; +import { LocalGovernment } from '../../local-government/local-government.entity'; +import { generateALCDNoticeOfIntentHtml } from '../../../../../../templates/emails/decision-released'; +import { NOI_SUBMISSION_STATUS } from '../../notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status.dto'; describe('NoticeOfIntentDecisionV2Controller', () => { let controller: NoticeOfIntentDecisionV2Controller; @@ -27,6 +33,7 @@ describe('NoticeOfIntentDecisionV2Controller', () => { let mockNoticeOfIntentService: DeepMocked; let mockCodeService: DeepMocked; let mockModificationService: DeepMocked; + let mockNoticeOfIntentSubmissionService: DeepMocked; let mockEmailService: DeepMocked; let mockNoticeOfintent; @@ -37,6 +44,7 @@ describe('NoticeOfIntentDecisionV2Controller', () => { mockNoticeOfIntentService = createMock(); mockCodeService = createMock(); mockModificationService = createMock(); + mockNoticeOfIntentSubmissionService = createMock(); mockEmailService = createMock(); mockNoticeOfintent = new NoticeOfIntent(); @@ -71,6 +79,10 @@ describe('NoticeOfIntentDecisionV2Controller', () => { provide: NoticeOfIntentModificationService, useValue: mockModificationService, }, + { + provide: NoticeOfIntentSubmissionService, + useValue: mockNoticeOfIntentSubmissionService, + }, { provide: EmailService, useValue: mockEmailService, @@ -256,4 +268,97 @@ describe('NoticeOfIntentDecisionV2Controller', () => { expect(mockDecisionService.generateResolutionNumber).toBeCalledTimes(1); expect(mockDecisionService.generateResolutionNumber).toBeCalledWith(2023); }); + + it('should send status email after the first release of any decisions', async () => { + const fileNumber = 'fake-file-number'; + const primaryContactOwnerUuid = 'primary-contact'; + const mockOwner = new NoticeOfIntentOwner({ + uuid: primaryContactOwnerUuid, + }); + const localGovernmentUuid = 'fake-government'; + const mockGovernment = new LocalGovernment({ uuid: localGovernmentUuid }); + const mockNoticeOfIntentSubmission = new NoticeOfIntentSubmission({ + fileNumber, + primaryContactOwnerUuid, + owners: [mockOwner], + localGovernmentUuid, + }); + + mockNoticeOfIntentService.getFileNumber.mockResolvedValue(fileNumber); + mockDecisionService.get.mockResolvedValue( + new NoticeOfIntentDecision({ wasReleased: false }), + ); + mockDecisionService.update.mockResolvedValue(mockDecision); + mockNoticeOfIntentSubmissionService.getOrFailByFileNumber.mockResolvedValue( + mockNoticeOfIntentSubmission, + ); + mockEmailService.getNoticeOfIntentEmailData.mockResolvedValue({ + primaryContact: mockOwner, + submissionGovernment: mockGovernment, + }); + mockEmailService.sendNoticeOfIntentStatusEmail.mockResolvedValue(); + + const updates = { + outcome: 'New Outcome', + date: new Date(2023, 3, 3, 3, 3, 3, 3).valueOf(), + isDraft: false, + } as UpdateNoticeOfIntentDecisionDto; + + await controller.update('fake-uuid', updates); + + expect(mockDecisionService.update).toBeCalledTimes(1); + expect(mockDecisionService.update).toBeCalledWith( + 'fake-uuid', + { + outcome: 'New Outcome', + date: updates.date, + isDraft: false, + }, + undefined, + ); + expect(mockEmailService.sendNoticeOfIntentStatusEmail).toBeCalledTimes(1); + expect(mockEmailService.sendNoticeOfIntentStatusEmail).toBeCalledWith({ + generateStatusHtml: generateALCDNoticeOfIntentHtml, + status: NOI_SUBMISSION_STATUS.ALC_DECISION, + noticeOfIntentSubmission: mockNoticeOfIntentSubmission, + government: mockGovernment, + parentType: 'notice-of-intent', + primaryContact: mockOwner, + ccGovernment: true, + decisionDate: new Date().toLocaleDateString('en-CA', { + weekday: 'long', + year: 'numeric', + month: 'long', + day: 'numeric', + }), + }); + }); + + it('should not send status email on subsequent decision releases', async () => { + mockDecisionService.get.mockResolvedValue( + new NoticeOfIntentDecision({ wasReleased: true }), + ); + mockDecisionService.update.mockResolvedValue(mockDecision); + mockEmailService.sendNoticeOfIntentStatusEmail.mockResolvedValue(); + + const updates = { + outcome: 'New Outcome', + date: new Date(2023, 3, 3, 3, 3, 3, 3).valueOf(), + isDraft: false, + } as UpdateNoticeOfIntentDecisionDto; + + await controller.update('fake-uuid', updates); + + expect(mockDecisionService.update).toBeCalledTimes(1); + expect(mockDecisionService.update).toBeCalledWith( + 'fake-uuid', + { + outcome: 'New Outcome', + date: updates.date, + isDraft: false, + }, + undefined, + ); + expect(mockEmailService.sendNoticeOfIntentStatusEmail).toBeCalledTimes(0); + }); }); diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.controller.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.controller.ts index f243e2211f..0e4f59b396 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.controller.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.controller.ts @@ -33,6 +33,11 @@ import { import { NoticeOfIntentDecision } from '../notice-of-intent-decision.entity'; import { NoticeOfIntentModificationService } from '../notice-of-intent-modification/notice-of-intent-modification.service'; import { NoticeOfIntentDecisionV2Service } from './notice-of-intent-decision-v2.service'; +import { generateALCDNoticeOfIntentHtml } from '../../../../../../templates/emails/decision-released'; +import { NOI_SUBMISSION_STATUS } from '../../notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status.dto'; +import { PARENT_TYPE } from '../../card/card-subtask/card-subtask.dto'; +import { NoticeOfIntentSubmissionService } from '../../../portal/notice-of-intent-submission/notice-of-intent-submission.service'; +import { NoticeOfIntentSubmission } from '../../../portal/notice-of-intent-submission/notice-of-intent-submission.entity'; @ApiOAuth2(config.get('KEYCLOAK.SCOPES')) @Controller('notice-of-intent-decision/v2') @@ -41,6 +46,7 @@ export class NoticeOfIntentDecisionV2Controller { constructor( private noticeOfIntentDecisionV2Service: NoticeOfIntentDecisionV2Service, private noticeOfIntentService: NoticeOfIntentService, + private noticeOfIntentSubmissionService: NoticeOfIntentSubmissionService, private emailService: EmailService, private modificationService: NoticeOfIntentModificationService, @InjectMapper() private mapper: Mapper, @@ -137,12 +143,18 @@ export class NoticeOfIntentDecisionV2Controller { modifies = null; } + const decision = await this.noticeOfIntentDecisionV2Service.get(uuid); + const updatedDecision = await this.noticeOfIntentDecisionV2Service.update( uuid, updateDto, modifies, ); + if (!decision.wasReleased && updateDto.isDraft === false) { + this.sendDecisionReleasedEmail(updatedDecision); + } + return this.mapper.mapAsync( updatedDecision, NoticeOfIntentDecision, @@ -238,4 +250,42 @@ export class NoticeOfIntentDecisionV2Controller { resolutionYear, ); } + + private async sendDecisionReleasedEmail(decision: NoticeOfIntentDecision) { + const fileNumber = await this.noticeOfIntentService.getFileNumber( + decision.noticeOfIntentUuid, + ); + + const noticeOfIntentSubmission = + await this.noticeOfIntentSubmissionService.getOrFailByFileNumber( + fileNumber, + ); + + const { primaryContact, submissionGovernment } = + await this.emailService.getNoticeOfIntentEmailData( + noticeOfIntentSubmission, + ); + + const date = decision.date ? new Date(decision.date) : new Date(); + + const options: Intl.DateTimeFormatOptions = { + weekday: 'long', + year: 'numeric', + month: 'long', + day: 'numeric', + }; + + if (primaryContact) { + await this.emailService.sendNoticeOfIntentStatusEmail({ + generateStatusHtml: generateALCDNoticeOfIntentHtml, + status: NOI_SUBMISSION_STATUS.ALC_DECISION, + noticeOfIntentSubmission, + government: submissionGovernment, + parentType: PARENT_TYPE.NOTICE_OF_INTENT, + primaryContact, + ccGovernment: true, + decisionDate: date.toLocaleDateString('en-CA', options), + }); + } + } } diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.module.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.module.ts index bed848ef83..706500e5cc 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.module.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.module.ts @@ -25,6 +25,7 @@ import { NoticeOfIntentModificationOutcomeType } from './notice-of-intent-modifi import { NoticeOfIntentModificationController } from './notice-of-intent-modification/notice-of-intent-modification.controller'; import { NoticeOfIntentModification } from './notice-of-intent-modification/notice-of-intent-modification.entity'; import { NoticeOfIntentModificationService } from './notice-of-intent-modification/notice-of-intent-modification.service'; +import { NoticeOfIntentSubmissionModule } from '../../portal/notice-of-intent-submission/notice-of-intent-submission.module'; @Module({ imports: [ @@ -44,6 +45,7 @@ import { NoticeOfIntentModificationService } from './notice-of-intent-modificati DocumentModule, forwardRef(() => NoticeOfIntentModule), NoticeOfIntentSubmissionStatusModule, + NoticeOfIntentSubmissionModule, ], providers: [ //These are in the same module, so be careful to import the correct one diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts index 962e1482b6..5cb5e32961 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts @@ -347,4 +347,13 @@ describe('NoticeOfIntentSubmissionService', () => { expect(mockRepository.save).toBeCalledTimes(1); expect(mockRepository.findOneOrFail).toBeCalledTimes(2); }); + + it('should return the fetched notice of intent when fetching with file number', async () => { + const noiSubmission = new NoticeOfIntentSubmission(); + mockRepository.findOneOrFail.mockResolvedValue(noiSubmission); + + const app = await service.getOrFailByFileNumber(''); + + expect(app).toBe(noiSubmission); + }); }); diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts index 10d6854aef..a0b97f9cb2 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts @@ -61,6 +61,16 @@ export class NoticeOfIntentSubmissionService { @InjectMapper() private mapper: Mapper, ) {} + async getOrFailByFileNumber(fileNumber: string) { + return await this.noticeOfIntentSubmissionRepository.findOneOrFail({ + where: { + fileNumber, + isDraft: false, + }, + relations: this.DEFAULT_RELATIONS, + }); + } + async create(type: string, createdBy: User) { const fileNumber = await this.fileNumberService.generateNextFileNumber(); @@ -155,13 +165,7 @@ export class NoticeOfIntentSubmissionService { user.clientRoles!.includes(value), ); if (overlappingRoles.length > 0) { - return await this.noticeOfIntentSubmissionRepository.findOneOrFail({ - where: { - fileNumber, - isDraft: false, - }, - relations: this.DEFAULT_RELATIONS, - }); + return await this.getOrFailByFileNumber(fileNumber); } const whereClauses = await this.generateWhereClauses( diff --git a/services/apps/alcs/src/providers/email/email.service.ts b/services/apps/alcs/src/providers/email/email.service.ts index 74e62eace8..cf698dfaaa 100644 --- a/services/apps/alcs/src/providers/email/email.service.ts +++ b/services/apps/alcs/src/providers/email/email.service.ts @@ -35,7 +35,7 @@ type BaseStatusEmailData = { government: LocalGovernment | null; parentType: PARENT_TYPE; ccGovernment?: boolean; - decisionReleaseMaskedDate?: string; + decisionDate?: string; }; type ApplicationEmailData = BaseStatusEmailData & { applicationSubmission: ApplicationSubmission; @@ -296,7 +296,7 @@ export class EmailService { governmentName: data.government?.name, status: status.label, parentTypeLabel: parentTypeLabel[data.parentType], - decisionReleaseMaskedDate: data?.decisionReleaseMaskedDate, + decisionDate: data?.decisionDate, }); const parentId = await this.applicationService.getUuid(fileNumber); @@ -336,6 +336,7 @@ export class EmailService { governmentName: data.government?.name, status: status.label, parentTypeLabel: parentTypeLabel[data.parentType], + decisionDate: data?.decisionDate, }); const parentId = await this.noticeOfIntentService.getUuid(fileNumber); diff --git a/services/templates/emails/decision-released/application.template.ts b/services/templates/emails/decision-released/application.template.ts index 4ef596f6bf..050496fb37 100644 --- a/services/templates/emails/decision-released/application.template.ts +++ b/services/templates/emails/decision-released/application.template.ts @@ -4,7 +4,7 @@ import { header, footer, notificationOnly, portalButton } from '../partials'; import { StatusUpdateEmail } from '../../../apps/alcs/src/providers/email/email.service'; type DecisionReleasedStatusEmail = StatusUpdateEmail & { - decisionReleaseMaskedDate: number; + decisionDate: number; }; const template = ` @@ -28,7 +28,7 @@ const template = ` This email is to advise that the Reasons for Decision for the above noted application has been released. - Please log into the ALC Portal to view the Reasons for Decision. The document can be found by clicking 'View' from the Inbox table and then navigating to the 'ALC Review and Decision' tab. The Reasons for Decision will be available to the public on {{ decisionReleaseMaskedDate }}. + Please log into the ALC Portal to view the Reasons for Decision. The document can be found by clicking 'View' from the Inbox table and then navigating to the 'ALC Review and Decision' tab. The Reasons for Decision will be available to the public on {{ decisionDate }}. Further correspondence with respect to this application should be directed to the ALC Land Use Planner for your region, found on the ALC website Contact Us page. diff --git a/services/templates/emails/decision-released/notice-of-intent.template.ts b/services/templates/emails/decision-released/notice-of-intent.template.ts index ade548924c..e8d0db1b2f 100644 --- a/services/templates/emails/decision-released/notice-of-intent.template.ts +++ b/services/templates/emails/decision-released/notice-of-intent.template.ts @@ -4,7 +4,7 @@ import { header, footer, notificationOnly, portalButton } from '../partials'; import { StatusUpdateEmail } from '../../../apps/alcs/src/providers/email/email.service'; type DecisionReleasedStatusEmail = StatusUpdateEmail & { - decisionReleaseMaskedDate: number; + decisionDate: number; }; const template = ` @@ -28,7 +28,7 @@ const template = ` The decision for the above noted Notice of Intent (NOI) has been released on the the ALC Portal. - The decision document can be found by clicking 'View' from the NOI Inbox table in the ALC Portal, and then navigating to the 'ALC Review and Decision' tab. The decision will be available to the public on {{ decisionReleaseMaskedDate }}. + The decision document can be found by clicking 'View' from the NOI Inbox table in the ALC Portal, and then navigating to the 'ALC Review and Decision' tab. The decision will be available to the public on {{ decisionDate }}. Further correspondence with respect to this NOI should be directed to ALC.Soil@gov.bc.ca. From 88cea3c5ef7363bba12d90ff8e9e51958e1369e9 Mon Sep 17 00:00:00 2001 From: Liam Stoddard Date: Mon, 28 Aug 2023 16:20:54 -0700 Subject: [PATCH 313/954] commit before cleaning --- .../submissions/app_submissions.py | 24 +++++++---- .../submissions/submap/subdiv_plot.py | 41 +++++++++++++------ 2 files changed, 43 insertions(+), 22 deletions(-) diff --git a/bin/migrate-oats-data/submissions/app_submissions.py b/bin/migrate-oats-data/submissions/app_submissions.py index 43bb52bfcd..0cb7a0c233 100644 --- a/bin/migrate-oats-data/submissions/app_submissions.py +++ b/bin/migrate-oats-data/submissions/app_submissions.py @@ -10,6 +10,8 @@ get_directions_rows, get_subdiv_rows, create_subdiv_dict, + add_subdiv, + map_subdiv_lots, ) from db import inject_conn_pool from constants import BATCH_UPLOAD_SIZE @@ -62,17 +64,16 @@ def process_alcs_app_submissions(conn=None, batch_size=BATCH_UPLOAD_SIZE): if not rows: break try: - # print(rows) adj_rows = get_directions_rows(rows, cursor) direction_data = create_direction_dict(adj_rows) subdiv_rows = get_subdiv_rows(rows, cursor) - print(subdiv_rows) + # print(subdiv_rows) subdiv_data = create_subdiv_dict(subdiv_rows) - print(subdiv_data) + # print(subdiv_data) submissions_to_be_inserted_count = len(rows) - insert_app_sub_records(conn, batch_size, cursor, rows, direction_data) + insert_app_sub_records(conn, batch_size, cursor, rows, direction_data, subdiv_data) successful_inserts_count = ( successful_inserts_count + submissions_to_be_inserted_count @@ -96,7 +97,7 @@ def process_alcs_app_submissions(conn=None, batch_size=BATCH_UPLOAD_SIZE): print("Total failed inserts:", failed_inserts) log_end(etl_name) -def insert_app_sub_records(conn, batch_size, cursor, rows, direction_data): +def insert_app_sub_records(conn, batch_size, cursor, rows, direction_data, subdiv_data): """ Function to insert submission records in batches. @@ -114,7 +115,7 @@ def insert_app_sub_records(conn, batch_size, cursor, rows, direction_data): nfu_data_list, other_data_list, inc_exc_data_list, - ) = prepare_app_sub_data(rows, direction_data) + ) = prepare_app_sub_data(rows, direction_data, subdiv_data) if len(nfu_data_list) > 0: execute_batch( @@ -142,7 +143,7 @@ def insert_app_sub_records(conn, batch_size, cursor, rows, direction_data): conn.commit() -def prepare_app_sub_data(app_sub_raw_data_list, direction_data): +def prepare_app_sub_data(app_sub_raw_data_list, direction_data, subdiv_data): """ This function prepares different lists of data based on the 'alr_change_code' field of each data dict in 'app_sub_raw_data_list'. @@ -164,6 +165,9 @@ def prepare_app_sub_data(app_sub_raw_data_list, direction_data): for row in app_sub_raw_data_list: data = dict(row) data = add_direction_field(data) + data = add_subdiv(data,json) + if data['alr_appl_component_id'] in subdiv_data: + data = map_subdiv_lots(data, subdiv_data, json) if data["alr_application_id"] in direction_data: data = map_direction_values(data, direction_data) if data["alr_change_code"] == ALRChangeCode.NFU.value: @@ -193,7 +197,8 @@ def get_insert_query(unique_fields,unique_values): east_land_use_type, west_land_use_type, north_land_use_type, - south_land_use_type + south_land_use_type, + subd_proposed_lots {unique_fields} ) VALUES ( @@ -210,7 +215,8 @@ def get_insert_query(unique_fields,unique_values): %(east_land_use_type)s, %(west_land_use_type)s, %(north_land_use_type)s, - %(south_land_use_type)s + %(south_land_use_type)s, + %(subd_proposed_lots)s {unique_values} ) """ diff --git a/bin/migrate-oats-data/submissions/submap/subdiv_plot.py b/bin/migrate-oats-data/submissions/submap/subdiv_plot.py index a2a7bf4dab..c822ea0bc2 100644 --- a/bin/migrate-oats-data/submissions/submap/subdiv_plot.py +++ b/bin/migrate-oats-data/submissions/submap/subdiv_plot.py @@ -2,7 +2,7 @@ def get_subdiv_rows(rows, cursor): # fetches subdivision_data, component_ids = [dict(item)["alr_appl_component_id"] for item in rows] component_ids_string = ', '.join(str(item) for item in component_ids) - print(component_ids_string) + # print(component_ids_string) subdiv_rows_query = f""" SELECT spi.alr_appl_component_id, spi.parcel_area, road_dedication_area, spi.subdiv_design_parcel_id @@ -15,6 +15,7 @@ def get_subdiv_rows(rows, cursor): # print(subdiv_rows_query) cursor.execute(subdiv_rows_query) subdiv_rows = cursor.fetchall() + # print(subdiv_rows) return subdiv_rows def create_subdiv_dict(subdiv_rows): @@ -23,24 +24,38 @@ def create_subdiv_dict(subdiv_rows): parcel_design_id = 'subdiv_design_parcel_id' area = 'parcel_area' lot = 'Lot' - type = 'type' + parcel_type = 'type' size = 'size' subdiv_dict = {} for row in subdiv_rows: app_component_id = row[alr_id] - + if app_component_id in subdiv_dict: - if row[parcel_design_id] not in subdiv_dict: - subdiv_dict[app_component_id][size] = row[area] - subdiv_dict[app_component_id][type] = lot + # if row[parcel_design_id] not in subdiv_dict[app_component_id]: + subdiv_dict[app_component_id].append({size: row[area], parcel_type: lot}) + # print("in the loop") + # print(subdiv_dict[app_component_id]) + # print("updated row") else: - subdiv_dict[app_component_id] = {} - subdiv_dict[app_component_id][size] = row[area] - subdiv_dict[app_component_id][type] = lot - subdiv_dict[app_component_id][size] = row['road_dedication_area'] - subdiv_dict[app_component_id][type] = 'Road_Dedication' - + subdiv_dict[app_component_id] = [] + if row['road_dedication_area'] is not None: + subdiv_dict[app_component_id].append({size: row['road_dedication_area'], parcel_type: 'Road Dedication'}) + subdiv_dict[app_component_id].append({size: row[area], parcel_type: lot}) return subdiv_dict - \ No newline at end of file + +def add_subdiv(data,json): + insert_string = [] + json_string = json.dumps(insert_string) + data['subd_proposed_lots'] = json_string + return data + +def map_subdiv_lots(data, subdiv_data, json): + insert_string = subdiv_data[data['alr_appl_component_id']] + # print(insert_string) + json_string = json.dumps(insert_string) + data['subd_proposed_lots'] = json_string + # print('to json') + # print(data['subd_proposed_lots']) + return data \ No newline at end of file From 38c6b6101e638d6f4a0d3d973b550154a7176251 Mon Sep 17 00:00:00 2001 From: Liam Stoddard Date: Mon, 28 Aug 2023 16:45:12 -0700 Subject: [PATCH 314/954] ready for MR --- .../submissions/app_submissions.py | 4 +-- .../submissions/submap/subdiv_plot.py | 25 +++++-------------- 2 files changed, 8 insertions(+), 21 deletions(-) diff --git a/bin/migrate-oats-data/submissions/app_submissions.py b/bin/migrate-oats-data/submissions/app_submissions.py index 0cb7a0c233..bdbea88c6e 100644 --- a/bin/migrate-oats-data/submissions/app_submissions.py +++ b/bin/migrate-oats-data/submissions/app_submissions.py @@ -67,9 +67,7 @@ def process_alcs_app_submissions(conn=None, batch_size=BATCH_UPLOAD_SIZE): adj_rows = get_directions_rows(rows, cursor) direction_data = create_direction_dict(adj_rows) subdiv_rows = get_subdiv_rows(rows, cursor) - # print(subdiv_rows) subdiv_data = create_subdiv_dict(subdiv_rows) - # print(subdiv_data) submissions_to_be_inserted_count = len(rows) @@ -107,6 +105,7 @@ def insert_app_sub_records(conn, batch_size, cursor, rows, direction_data, subdi cursor (obj): Cursor object to execute queries. rows (list): Rows of data to insert in the database. direction_data (dict): Dictionary of adjacent parcel data + subdiv_data: list of subdivision data Returns: None: Commits the changes to the database. @@ -149,6 +148,7 @@ def prepare_app_sub_data(app_sub_raw_data_list, direction_data, subdiv_data): :param app_sub_raw_data_list: A list of raw data dictionaries. :param direction_data: A dictionary of adjacent parcel data. + :param subdiv_data: list of subdivision data :return: Five lists, each containing dictionaries from 'app_sub_raw_data_list' and 'direction_data' grouped based on the 'alr_change_code' field Detailed Workflow: diff --git a/bin/migrate-oats-data/submissions/submap/subdiv_plot.py b/bin/migrate-oats-data/submissions/submap/subdiv_plot.py index c822ea0bc2..0298291c81 100644 --- a/bin/migrate-oats-data/submissions/submap/subdiv_plot.py +++ b/bin/migrate-oats-data/submissions/submap/subdiv_plot.py @@ -1,27 +1,21 @@ def get_subdiv_rows(rows, cursor): - # fetches subdivision_data, + # fetches subdivision_data component_ids = [dict(item)["alr_appl_component_id"] for item in rows] - component_ids_string = ', '.join(str(item) for item in component_ids) - # print(component_ids_string) + component_ids_string = ', '.join(str(item) for item in component_ids) subdiv_rows_query = f""" SELECT - spi.alr_appl_component_id, spi.parcel_area, road_dedication_area, spi.subdiv_design_parcel_id + spi.alr_appl_component_id, spi.parcel_area, spi.subdiv_design_parcel_id FROM oats.oats_subdiv_parcel_intents spi - LEFT JOIN oats.oats_subdivision_designs sd ON spi.alr_appl_component_id = sd.alr_appl_component_id - LEFT JOIN oats.oats_subdiv_design_parcels sdp ON spi.subdiv_design_parcel_id = sdp.subdiv_design_parcel_id WHERE spi.alr_appl_component_id in ({component_ids_string}) """ - # print(subdiv_rows_query) cursor.execute(subdiv_rows_query) subdiv_rows = cursor.fetchall() - # print(subdiv_rows) return subdiv_rows def create_subdiv_dict(subdiv_rows): - # creates dictionary of adjacent land use data with all directions attributed to one application id + # creates dictionary of subdivision parcel data with all subdivision attributed to one application component id alr_id = 'alr_appl_component_id' - parcel_design_id = 'subdiv_design_parcel_id' area = 'parcel_area' lot = 'Lot' parcel_type = 'type' @@ -32,30 +26,23 @@ def create_subdiv_dict(subdiv_rows): app_component_id = row[alr_id] if app_component_id in subdiv_dict: - # if row[parcel_design_id] not in subdiv_dict[app_component_id]: subdiv_dict[app_component_id].append({size: row[area], parcel_type: lot}) - # print("in the loop") - # print(subdiv_dict[app_component_id]) - # print("updated row") else: subdiv_dict[app_component_id] = [] - if row['road_dedication_area'] is not None: - subdiv_dict[app_component_id].append({size: row['road_dedication_area'], parcel_type: 'Road Dedication'}) subdiv_dict[app_component_id].append({size: row[area], parcel_type: lot}) return subdiv_dict def add_subdiv(data,json): + # inserts null valued json string insert_string = [] json_string = json.dumps(insert_string) data['subd_proposed_lots'] = json_string return data def map_subdiv_lots(data, subdiv_data, json): + # updates json string for applications with subdivision data insert_string = subdiv_data[data['alr_appl_component_id']] - # print(insert_string) json_string = json.dumps(insert_string) data['subd_proposed_lots'] = json_string - # print('to json') - # print(data['subd_proposed_lots']) return data \ No newline at end of file From 59c38e62656520cbc6a3624fe552261306394ac9 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Mon, 28 Aug 2023 16:33:21 -0700 Subject: [PATCH 315/954] Move timeline calculations to back end, add subtasks * Move all timeline logic to backend, clean up front-end, add unit tests * Load and add subtasks to events --- .../overview/overview.component.spec.ts | 26 +- .../overview/overview.component.ts | 302 +------------ .../info-requests/info-requests.component.ts | 2 +- .../overview/overview.component.spec.ts | 20 +- .../overview/overview.component.ts | 172 +------- .../application-timeline.dto.ts | 7 + .../application-timeline.service.spec.ts | 45 ++ .../application-timeline.service.ts | 25 ++ .../notice-of-intent-meeting.service.ts | 4 +- .../notice-of-intent-timeline.dto.ts | 7 + .../notice-of-intent-timeline.service.spec.ts | 45 ++ .../notice-of-intent-timeline.service.ts | 25 ++ .../shared/timeline/timeline.component.html | 7 +- .../app/shared/timeline/timeline.component.ts | 11 +- services/apps/alcs/src/alcs/alcs.module.ts | 6 + ...plication-decision-meeting.service.spec.ts | 10 +- .../application-decision-meeting.service.ts | 2 +- ...ation-submission-status.controller.spec.ts | 6 +- ...pplication-submission-status.controller.ts | 2 +- ...lication-submission-status.service.spec.ts | 8 +- .../application-submission-status.service.ts | 6 +- .../application-timeline.controller.spec.ts | 49 +++ .../application-timeline.controller.ts | 20 + .../application-timeline.module.ts | 26 ++ .../application-timeline.service.spec.ts | 294 +++++++++++++ .../application-timeline.service.ts | 406 ++++++++++++++++++ ...otice-of-intent-meeting.controller.spec.ts | 6 +- .../notice-of-intent-meeting.controller.ts | 12 +- .../notice-of-intent-meeting.service.spec.ts | 5 +- .../notice-of-intent-meeting.service.ts | 22 +- ...tice-of-intent-timeline.controller.spec.ts | 49 +++ .../notice-of-intent-timeline.controller.ts | 20 + .../notice-of-intent-timeline.module.ts | 22 + .../notice-of-intent-timeline.service.spec.ts | 187 ++++++++ .../notice-of-intent-timeline.service.ts | 267 ++++++++++++ .../notice-of-intent.module.ts | 20 +- services/apps/alcs/src/main.module.ts | 2 +- 37 files changed, 1582 insertions(+), 563 deletions(-) create mode 100644 alcs-frontend/src/app/services/application/application-timeline/application-timeline.dto.ts create mode 100644 alcs-frontend/src/app/services/application/application-timeline/application-timeline.service.spec.ts create mode 100644 alcs-frontend/src/app/services/application/application-timeline/application-timeline.service.ts create mode 100644 alcs-frontend/src/app/services/notice-of-intent/notice-of-intent-timeline/notice-of-intent-timeline.dto.ts create mode 100644 alcs-frontend/src/app/services/notice-of-intent/notice-of-intent-timeline/notice-of-intent-timeline.service.spec.ts create mode 100644 alcs-frontend/src/app/services/notice-of-intent/notice-of-intent-timeline/notice-of-intent-timeline.service.ts create mode 100644 services/apps/alcs/src/alcs/application/application-timeline/application-timeline.controller.spec.ts create mode 100644 services/apps/alcs/src/alcs/application/application-timeline/application-timeline.controller.ts create mode 100644 services/apps/alcs/src/alcs/application/application-timeline/application-timeline.module.ts create mode 100644 services/apps/alcs/src/alcs/application/application-timeline/application-timeline.service.spec.ts create mode 100644 services/apps/alcs/src/alcs/application/application-timeline/application-timeline.service.ts create mode 100644 services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-timeline/notice-of-intent-timeline.controller.spec.ts create mode 100644 services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-timeline/notice-of-intent-timeline.controller.ts create mode 100644 services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-timeline/notice-of-intent-timeline.module.ts create mode 100644 services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-timeline/notice-of-intent-timeline.service.spec.ts create mode 100644 services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-timeline/notice-of-intent-timeline.service.ts diff --git a/alcs-frontend/src/app/features/application/overview/overview.component.spec.ts b/alcs-frontend/src/app/features/application/overview/overview.component.spec.ts index 260dcac99c..ae137fca84 100644 --- a/alcs-frontend/src/app/features/application/overview/overview.component.spec.ts +++ b/alcs-frontend/src/app/features/application/overview/overview.component.spec.ts @@ -4,13 +4,9 @@ import { MatDialog } from '@angular/material/dialog'; import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { BehaviorSubject } from 'rxjs'; import { ApplicationDetailService } from '../../../services/application/application-detail.service'; -import { ApplicationMeetingService } from '../../../services/application/application-meeting/application-meeting.service'; -import { ApplicationModificationService } from '../../../services/application/application-modification/application-modification.service'; -import { ApplicationReconsiderationService } from '../../../services/application/application-reconsideration/application-reconsideration.service'; -import { ApplicationReviewService } from '../../../services/application/application-review/application-review.service'; import { ApplicationSubmissionStatusService } from '../../../services/application/application-submission-status/application-submission-status.service'; +import { ApplicationTimelineService } from '../../../services/application/application-timeline/application-timeline.service'; import { ApplicationDto } from '../../../services/application/application.dto'; -import { ApplicationDecisionService } from '../../../services/application/decision/application-decision-v1/application-decision.service'; import { OverviewComponent } from './overview.component'; @@ -30,27 +26,9 @@ describe('OverviewComponent', () => { useValue: mockAppDetailService, }, { - provide: ApplicationDecisionService, + provide: ApplicationTimelineService, useValue: {}, }, - { - provide: ApplicationReconsiderationService, - useValue: {}, - }, - { - provide: ApplicationModificationService, - useValue: {}, - }, - { - provide: ApplicationReviewService, - useValue: {}, - }, - { - provide: ApplicationMeetingService, - useValue: { - fetch: jest.fn(), - }, - }, { provide: MatDialog, useValue: {}, diff --git a/alcs-frontend/src/app/features/application/overview/overview.component.ts b/alcs-frontend/src/app/features/application/overview/overview.component.ts index 0749c04df4..04655eb1aa 100644 --- a/alcs-frontend/src/app/features/application/overview/overview.component.ts +++ b/alcs-frontend/src/app/features/application/overview/overview.component.ts @@ -1,45 +1,15 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; -import { BehaviorSubject, combineLatestWith, Subject, takeUntil, tap } from 'rxjs'; +import { Subject, takeUntil } from 'rxjs'; import { ApplicationDetailService } from '../../../services/application/application-detail.service'; -import { ApplicationMeetingDto } from '../../../services/application/application-meeting/application-meeting.dto'; -import { ApplicationMeetingService } from '../../../services/application/application-meeting/application-meeting.service'; -import { ApplicationModificationDto } from '../../../services/application/application-modification/application-modification.dto'; -import { ApplicationModificationService } from '../../../services/application/application-modification/application-modification.service'; -import { ApplicationReconsiderationDto } from '../../../services/application/application-reconsideration/application-reconsideration.dto'; -import { ApplicationReconsiderationService } from '../../../services/application/application-reconsideration/application-reconsideration.service'; import { ApplicationSubmissionToSubmissionStatusDto } from '../../../services/application/application-submission-status/application-submission-status.dto'; import { ApplicationSubmissionStatusService } from '../../../services/application/application-submission-status/application-submission-status.service'; +import { ApplicationTimelineService } from '../../../services/application/application-timeline/application-timeline.service'; import { ApplicationDto, SUBMISSION_STATUS } from '../../../services/application/application.dto'; -import { ApplicationDecisionDto } from '../../../services/application/decision/application-decision-v1/application-decision.dto'; -import { ApplicationDecisionService } from '../../../services/application/decision/application-decision-v1/application-decision.service'; +import { TimelineEventDto } from '../../../services/notice-of-intent/notice-of-intent-timeline/notice-of-intent-timeline.dto'; import { ConfirmationDialogService } from '../../../shared/confirmation-dialog/confirmation-dialog.service'; -import { TimelineEvent } from '../../../shared/timeline/timeline.component'; import { UncancelApplicationDialogComponent } from './uncancel-application-dialog/uncancel-application-dialog.component'; -const editLink = new Map([ - ['IR', './info-request'], - ['AM', './site-visit-meeting'], - ['SV', './site-visit-meeting'], -]); - -const SORTING_ORDER = { - //high comes first, 1 shows at bottom - MODIFICATION_REVIEW: 13, - MODIFICATION_REQUEST: 12, - RECON_REVIEW: 11, - RECON_REQUEST: 10, - CHAIR_REVIEW_DECISION: 9, - AUDITED_DECISION: 8, - DECISION_MADE: 7, - VISIT_REPORTS: 6, - VISIT_REQUESTS: 5, - ACKNOWLEDGE_COMPLETE: 4, - FEE_RECEIVED: 3, - ACKNOWLEDGED_INCOMPLETE: 2, - SUBMITTED: 1, -}; - @Component({ selector: 'app-overview', templateUrl: './overview.component.html', @@ -48,77 +18,33 @@ const SORTING_ORDER = { export class OverviewComponent implements OnInit, OnDestroy { $destroy = new Subject(); application?: ApplicationDto; - private $decisions = new BehaviorSubject([]); - private $statusHistory = new BehaviorSubject([]); - events: TimelineEvent[] = []; + events: TimelineEventDto[] = []; summary = ''; isCancelled = false; constructor( private applicationDetailService: ApplicationDetailService, - private meetingService: ApplicationMeetingService, - private decisionService: ApplicationDecisionService, - private reconsiderationService: ApplicationReconsiderationService, - private modificationService: ApplicationModificationService, private confirmationDialogService: ConfirmationDialogService, private applicationSubmissionStatusService: ApplicationSubmissionStatusService, + private applicationTimelineService: ApplicationTimelineService, private dialog: MatDialog ) {} ngOnInit(): void { - this.applicationDetailService.$application - .pipe(takeUntil(this.$destroy)) - .pipe( - tap((app) => { - if (app) { - this.clearComponentData(); - - this.loadStatusHistory(app.fileNumber); - this.meetingService.fetch(app.fileNumber); - this.decisionService.fetchByApplication(app.fileNumber).then((res) => { - this.$decisions.next(res); - }); - } - }) - ) - .pipe( - combineLatestWith( - this.meetingService.$meetings, - this.$decisions, - this.reconsiderationService.$reconsiderations, - this.modificationService.$modifications, - this.$statusHistory - ) - ) - .subscribe(([application, meetings, decisions, reconsiderations, modifications, statusHistory]) => { - if (application) { - this.summary = application.summary || ''; - this.application = application; - - this.events = this.mapApplicationToEvents( - application, - meetings, - decisions, - reconsiderations, - modifications, - statusHistory - ); - } - }); + this.applicationDetailService.$application.pipe(takeUntil(this.$destroy)).subscribe(async (application) => { + if (application) { + this.application = application; + this.events = await this.applicationTimelineService.fetchByFileNumber(application.fileNumber); + this.loadStatusHistory(this.application.fileNumber); + } + }); } async ngOnDestroy() { - await this.clearComponentData(); - this.$destroy.next(); this.$destroy.complete(); } - private async clearComponentData() { - this.$decisions.next([]); - this.$statusHistory.next([]); - } - async onCancelApplication() { this.confirmationDialogService .openDialog({ @@ -127,6 +53,7 @@ export class OverviewComponent implements OnInit, OnDestroy { title: 'Cancel Application', }) .subscribe(async (didConfirm) => { + debugger; if (didConfirm && this.application) { await this.applicationDetailService.cancelApplication(this.application.fileNumber); await this.loadStatusHistory(this.application.fileNumber); @@ -152,207 +79,9 @@ export class OverviewComponent implements OnInit, OnDestroy { } } - private mapApplicationToEvents( - application: ApplicationDto, - meetings: ApplicationMeetingDto[], - decisions: ApplicationDecisionDto[], - reconsiderations: ApplicationReconsiderationDto[], - modifications: ApplicationModificationDto[], - statusHistory: ApplicationSubmissionToSubmissionStatusDto[] - ): TimelineEvent[] { - const mappedEvents: TimelineEvent[] = []; - - const statusesToInclude = statusHistory.filter( - (status) => ![SUBMISSION_STATUS.IN_REVIEW_BY_ALC].includes(status.status.code) - ); - for (const status of statusesToInclude) { - if (status.effectiveDate) { - let htmlText = `${status.status.label}`; - - if (status.status.code === SUBMISSION_STATUS.RECEIVED_BY_ALC) { - htmlText = 'Received All Items - Received by ALC'; - } - - if (status.status.code === SUBMISSION_STATUS.IN_PROGRESS) { - htmlText = 'Created - In Progress'; - } - - if (status.status.code === SUBMISSION_STATUS.SUBMITTED_TO_ALC_INCOMPLETE) { - htmlText = 'Acknowledged Incomplete - Submitted to ALC - Incomplete'; - } - - mappedEvents.push({ - htmlText, - startDate: new Date(status.effectiveDate + status.status.weight), - isFulfilled: true, - }); - } - } - - if (application.dateAcknowledgedComplete) { - mappedEvents.push({ - htmlText: 'Acknowledged Complete', - startDate: new Date(application.dateAcknowledgedComplete + SORTING_ORDER.ACKNOWLEDGE_COMPLETE), - isFulfilled: true, - }); - } - - if (application.feePaidDate) { - mappedEvents.push({ - htmlText: 'Fee Received Date', - startDate: new Date(application.feePaidDate + SORTING_ORDER.FEE_RECEIVED), - isFulfilled: true, - }); - } - - const events: TimelineEvent[] = application.decisionMeetings - .sort((a, b) => a.date - b.date) - .map((meeting, index) => { - let htmlText = `Review Discussion #${index + 1}`; - if (index === 0) { - htmlText += ` - Under Review by ALC`; - } - - return { - htmlText, - startDate: new Date(meeting.date), - isFulfilled: true, - }; - }); - mappedEvents.push(...events); - - for (const [index, decision] of decisions.entries()) { - if (decision.isDraft) { - continue; - } - - if (decision.auditDate) { - mappedEvents.push({ - htmlText: `Audited Decision #${decisions.length - index}`, - startDate: new Date(decision.auditDate + SORTING_ORDER.AUDITED_DECISION), - isFulfilled: true, - }); - } - - if (decision.chairReviewDate) { - mappedEvents.push({ - htmlText: `Chair Reviewed Decision #${decisions.length - index}`, - startDate: new Date(decision.chairReviewDate + SORTING_ORDER.CHAIR_REVIEW_DECISION), - isFulfilled: true, - }); - } - - mappedEvents.push({ - htmlText: `Decision #${decisions.length - index} Made${ - decisions.length - 1 === index ? ` - Active Days: ${application.activeDays}` : '' - }`, - startDate: new Date(decision.date + SORTING_ORDER.DECISION_MADE), - isFulfilled: true, - }); - } - - if (application.notificationSentDate) { - mappedEvents.push({ - htmlText: "'Ready for Review' Notification Sent to Applicant", - startDate: new Date(application.notificationSentDate), - isFulfilled: true, - }); - } - - meetings.sort((a, b) => a.meetingStartDate - b.meetingStartDate); - const typeCount = new Map(); - meetings.forEach((meeting) => { - const count = typeCount.get(meeting.meetingType.code) || 0; - - mappedEvents.push({ - htmlText: `${meeting.meetingType.label} #${count + 1}`, - startDate: new Date(meeting.meetingStartDate + SORTING_ORDER.VISIT_REQUESTS), - fulfilledDate: meeting.meetingEndDate ? new Date(meeting.meetingEndDate) : undefined, - isFulfilled: !!meeting.meetingEndDate, - link: editLink.get(meeting.meetingType.code), - }); - - if (meeting.reportStartDate) { - mappedEvents.push({ - htmlText: `${meeting.meetingType.label} #${count + 1} Report Sent to Applicant`, - startDate: new Date(meeting.reportStartDate + SORTING_ORDER.VISIT_REPORTS), - fulfilledDate: meeting.reportEndDate ? new Date(meeting.reportEndDate) : undefined, - isFulfilled: !!meeting.reportEndDate, - link: editLink.get(meeting.meetingType.code), - }); - } - - typeCount.set(meeting.meetingType.code, count + 1); - }); - - const mappedReconsiderations = this.mapReconsiderationsToEvents(reconsiderations); - mappedEvents.push(...mappedReconsiderations); - - const mappedModifications = this.mapModificationsToEvents(modifications); - mappedEvents.push(...mappedModifications); - - mappedEvents.sort((a, b) => b.startDate.getTime() - a.startDate.getTime()); - - return mappedEvents; - } - - private mapReconsiderationsToEvents(reconsiderations: ApplicationReconsiderationDto[]) { - const events: TimelineEvent[] = []; - for (const [index, reconsideration] of reconsiderations - .sort((a, b) => b.submittedDate - a.submittedDate) - .entries()) { - if (reconsideration.type.code === '33.1') { - events.push({ - htmlText: `Reconsideration Request #${reconsiderations.length - index} - ${reconsideration.type.code}`, - startDate: new Date(reconsideration.submittedDate + SORTING_ORDER.RECON_REQUEST), - isFulfilled: true, - }); - } else { - events.push({ - htmlText: `Reconsideration Requested #${reconsiderations.length - index} - ${reconsideration.type.code}`, - startDate: new Date(reconsideration.submittedDate + SORTING_ORDER.RECON_REQUEST), - isFulfilled: true, - }); - if (reconsideration.reviewDate) { - events.push({ - htmlText: `Reconsideration Request Reviewed #${reconsiderations.length - index} - ${ - reconsideration.reviewOutcome?.label - }`, - startDate: new Date(reconsideration.reviewDate + SORTING_ORDER.RECON_REVIEW), - isFulfilled: true, - }); - } - } - } - return events; - } - - private mapModificationsToEvents(modifications: ApplicationModificationDto[]) { - const events: TimelineEvent[] = []; - for (const [index, modification] of modifications.sort((a, b) => b.submittedDate - a.submittedDate).entries()) { - events.push({ - htmlText: `Modification Requested #${modifications.length - index} - ${ - modification.isTimeExtension ? 'Time Extension' : 'Other' - }`, - startDate: new Date(modification.submittedDate + SORTING_ORDER.MODIFICATION_REQUEST), - isFulfilled: true, - }); - if (modification.reviewDate) { - events.push({ - htmlText: `Modification Request Reviewed #${modifications.length - index} - ${ - modification.reviewOutcome?.label - }`, - startDate: new Date(modification.reviewDate + SORTING_ORDER.MODIFICATION_REVIEW), - isFulfilled: true, - }); - } - } - return events; - } - - onSaveSummary(updatedSummary: string) { + async onSaveSummary(updatedSummary: string) { if (this.application) { - this.applicationDetailService.updateApplication(this.application.fileNumber, { + await this.applicationDetailService.updateApplication(this.application.fileNumber, { summary: updatedSummary ?? null, }); } @@ -372,6 +101,5 @@ export class OverviewComponent implements OnInit, OnDestroy { this.isCancelled = statusHistory.filter((status) => status.effectiveDate && status.statusTypeCode === SUBMISSION_STATUS.CANCELLED) .length > 0; - this.$statusHistory.next(statusHistory); } } diff --git a/alcs-frontend/src/app/features/notice-of-intent/info-requests/info-requests.component.ts b/alcs-frontend/src/app/features/notice-of-intent/info-requests/info-requests.component.ts index 4e08e6e54b..174de6eddc 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/info-requests/info-requests.component.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/info-requests/info-requests.component.ts @@ -36,7 +36,7 @@ export class InfoRequestsComponent implements OnInit, OnDestroy { if (noi) { this.fileNumber = noi.fileNumber; this.uuid = noi.uuid; - this.meetingService.fetch(noi.uuid); + this.meetingService.fetch(noi.fileNumber); } }); diff --git a/alcs-frontend/src/app/features/notice-of-intent/overview/overview.component.spec.ts b/alcs-frontend/src/app/features/notice-of-intent/overview/overview.component.spec.ts index 1175ddba9a..ecfae7257b 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/overview/overview.component.spec.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/overview/overview.component.spec.ts @@ -8,6 +8,7 @@ import { NoticeOfIntentMeetingService } from '../../../services/notice-of-intent import { NoticeOfIntentDetailService } from '../../../services/notice-of-intent/notice-of-intent-detail.service'; import { NoticeOfIntentModificationDto } from '../../../services/notice-of-intent/notice-of-intent-modification/notice-of-intent-modification.dto'; import { NoticeOfIntentModificationService } from '../../../services/notice-of-intent/notice-of-intent-modification/notice-of-intent-modification.service'; +import { NoticeOfIntentTimelineService } from '../../../services/notice-of-intent/notice-of-intent-timeline/notice-of-intent-timeline.service'; import { NoticeOfIntentDto } from '../../../services/notice-of-intent/notice-of-intent.dto'; import { OverviewComponent } from './overview.component'; @@ -16,8 +17,6 @@ describe('OverviewComponent', () => { let component: OverviewComponent; let fixture: ComponentFixture; let mockNOIDetailService: DeepMocked; - let mockNoticeOfIntentMeetingService: DeepMocked; - let mockNOIModificationService: DeepMocked; let mockNOIDecisionService: DeepMocked; beforeEach(async () => { @@ -25,28 +24,13 @@ describe('OverviewComponent', () => { mockNOIDetailService = createMock(); mockNOIDetailService.$noticeOfIntent = new BehaviorSubject(undefined); - - mockNoticeOfIntentMeetingService = createMock(); - mockNoticeOfIntentMeetingService.$meetings = new BehaviorSubject([]); - - mockNOIModificationService = createMock(); - mockNOIModificationService.$modifications = new BehaviorSubject([]); - await TestBed.configureTestingModule({ providers: [ { provide: NoticeOfIntentDetailService, useValue: mockNOIDetailService, }, - { provide: NoticeOfIntentMeetingService, useValue: mockNoticeOfIntentMeetingService }, - { - provide: NoticeOfIntentModificationService, - useValue: mockNOIModificationService, - }, - { - provide: NoticeOfIntentDecisionService, - useValue: mockNOIDecisionService, - }, + { provide: NoticeOfIntentTimelineService, useValue: {} }, ], declarations: [OverviewComponent], schemas: [NO_ERRORS_SCHEMA], diff --git a/alcs-frontend/src/app/features/notice-of-intent/overview/overview.component.ts b/alcs-frontend/src/app/features/notice-of-intent/overview/overview.component.ts index facf0fe847..240cb4c737 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/overview/overview.component.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/overview/overview.component.ts @@ -1,34 +1,9 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; -import { BehaviorSubject, combineLatestWith, Subject, takeUntil, tap } from 'rxjs'; -import { ApplicationModificationDto } from '../../../services/application/application-modification/application-modification.dto'; -import { ApplicationDecisionDto } from '../../../services/application/decision/application-decision-v1/application-decision.dto'; -import { NoticeOfIntentDecisionDto } from '../../../services/notice-of-intent/decision/notice-of-intent-decision.dto'; -import { NoticeOfIntentDecisionService } from '../../../services/notice-of-intent/decision/notice-of-intent-decision.service'; -import { NoticeOfIntentMeetingDto } from '../../../services/notice-of-intent/meeting/notice-of-intent-meeting.dto'; -import { NoticeOfIntentMeetingService } from '../../../services/notice-of-intent/meeting/notice-of-intent-meeting.service'; +import { Subject, takeUntil } from 'rxjs'; import { NoticeOfIntentDetailService } from '../../../services/notice-of-intent/notice-of-intent-detail.service'; -import { NoticeOfIntentModificationDto } from '../../../services/notice-of-intent/notice-of-intent-modification/notice-of-intent-modification.dto'; -import { NoticeOfIntentModificationService } from '../../../services/notice-of-intent/notice-of-intent-modification/notice-of-intent-modification.service'; +import { TimelineEventDto } from '../../../services/notice-of-intent/notice-of-intent-timeline/notice-of-intent-timeline.dto'; +import { NoticeOfIntentTimelineService } from '../../../services/notice-of-intent/notice-of-intent-timeline/notice-of-intent-timeline.service'; import { NoticeOfIntentDto } from '../../../services/notice-of-intent/notice-of-intent.dto'; -import { TimelineEvent } from '../../../shared/timeline/timeline.component'; - -const editLink = new Map([['IR', './info-request']]); - -const SORTING_ORDER = { - //high comes first, 1 shows at bottom - MODIFICATION_REVIEW: 12, - MODIFICATION_REQUEST: 11, - CHAIR_REVIEW_DECISION: 10, - AUDITED_DECISION: 9, - DECISION_MADE: 8, - VISIT_REPORTS: 7, - VISIT_REQUESTS: 6, - ACKNOWLEDGE_COMPLETE: 5, - RECEIVED_ALL_ITEMS: 4, - FEE_RECEIVED: 3, - ACKNOWLEDGED_INCOMPLETE: 2, - SUBMITTED: 1, -}; @Component({ selector: 'app-overview', @@ -38,43 +13,20 @@ const SORTING_ORDER = { export class OverviewComponent implements OnInit, OnDestroy { $destroy = new Subject(); noticeOfIntent?: NoticeOfIntentDto; - events: TimelineEvent[] = []; + events: TimelineEventDto[] = []; summary = ''; - private $decisions = new BehaviorSubject([]); - constructor( private noticeOfIntentDetailService: NoticeOfIntentDetailService, - private noticeOfIntentMeetingService: NoticeOfIntentMeetingService, - private noticeOfIntentDecisionService: NoticeOfIntentDecisionService, - private noticeOfIntentModificationService: NoticeOfIntentModificationService + private noticeOfIntentTimelineService: NoticeOfIntentTimelineService ) {} ngOnInit(): void { this.noticeOfIntentDetailService.$noticeOfIntent .pipe(takeUntil(this.$destroy)) - .pipe( - tap((noi) => { - if (noi) { - this.noticeOfIntentMeetingService.fetch(noi.uuid); - this.noticeOfIntentDecisionService.fetchByFileNumber(noi.fileNumber).then((res) => { - this.$decisions.next(res); - }); - } - }) - ) - .pipe( - combineLatestWith( - this.noticeOfIntentMeetingService.$meetings, - this.noticeOfIntentModificationService.$modifications, - this.$decisions - ) - ) - .subscribe(([noticeOfIntent, meetings, modifications, decisions]) => { + .subscribe(async (noticeOfIntent) => { if (noticeOfIntent) { - this.summary = noticeOfIntent.summary || ''; - this.noticeOfIntent = noticeOfIntent; - this.populateEvents(noticeOfIntent, meetings, modifications, decisions); + this.events = await this.noticeOfIntentTimelineService.fetchByFileNumber(noticeOfIntent.fileNumber); } }); } @@ -91,114 +43,4 @@ export class OverviewComponent implements OnInit, OnDestroy { }); } } - - private populateEvents( - noticeOfIntent: NoticeOfIntentDto, - meetings: NoticeOfIntentMeetingDto[], - modifications: NoticeOfIntentModificationDto[], - decisions: NoticeOfIntentDecisionDto[] - ) { - const mappedEvents: TimelineEvent[] = []; - if (noticeOfIntent.dateSubmittedToAlc) { - mappedEvents.push({ - htmlText: 'Submitted to ALC', - startDate: new Date(noticeOfIntent.dateSubmittedToAlc + SORTING_ORDER.SUBMITTED), - isFulfilled: true, - }); - } - - if (noticeOfIntent.dateAcknowledgedIncomplete) { - mappedEvents.push({ - htmlText: 'Acknowledged Incomplete', - startDate: new Date(noticeOfIntent.dateAcknowledgedIncomplete + SORTING_ORDER.ACKNOWLEDGED_INCOMPLETE), - isFulfilled: true, - }); - } - - if (noticeOfIntent.dateAcknowledgedComplete) { - mappedEvents.push({ - htmlText: 'Acknowledged Complete', - startDate: new Date(noticeOfIntent.dateAcknowledgedComplete + SORTING_ORDER.ACKNOWLEDGE_COMPLETE), - isFulfilled: true, - }); - } - - if (noticeOfIntent.feePaidDate) { - mappedEvents.push({ - htmlText: 'Fee Received Date', - startDate: new Date(noticeOfIntent.feePaidDate + SORTING_ORDER.FEE_RECEIVED), - isFulfilled: true, - }); - } - - if (noticeOfIntent.dateReceivedAllItems) { - mappedEvents.push({ - htmlText: 'Received All Items', - startDate: new Date(noticeOfIntent.dateReceivedAllItems + SORTING_ORDER.FEE_RECEIVED), - isFulfilled: true, - }); - } - - for (const [index, decision] of decisions.entries()) { - if (decision.auditDate) { - mappedEvents.push({ - htmlText: `Audited Decision #${decisions.length - index}`, - startDate: new Date(decision.auditDate + SORTING_ORDER.AUDITED_DECISION), - isFulfilled: true, - }); - } - - mappedEvents.push({ - htmlText: `Decision #${decisions.length - index} Made${ - decisions.length - 1 === index ? ` - Active Days: ${noticeOfIntent.activeDays}` : '' - }`, - startDate: new Date(decision.date! + SORTING_ORDER.DECISION_MADE), - isFulfilled: true, - }); - } - - meetings.sort((a, b) => a.meetingStartDate - b.meetingStartDate); - const typeCount = new Map(); - meetings.forEach((meeting) => { - const count = typeCount.get(meeting.meetingType.code) || 0; - mappedEvents.push({ - htmlText: `${meeting.meetingType.label} #${count + 1}`, - startDate: new Date(meeting.meetingStartDate + SORTING_ORDER.VISIT_REQUESTS), - fulfilledDate: meeting.meetingEndDate ? new Date(meeting.meetingEndDate) : undefined, - isFulfilled: !!meeting.meetingEndDate, - link: editLink.get(meeting.meetingType.code), - }); - - typeCount.set(meeting.meetingType.code, count + 1); - }); - - const mappedModifications = this.mapModificationsToEvents(modifications); - mappedEvents.push(...mappedModifications); - - mappedEvents.sort((a, b) => b.startDate.getTime() - a.startDate.getTime()); - - this.events = mappedEvents; - } - - private mapModificationsToEvents(modifications: NoticeOfIntentModificationDto[]) { - const events: TimelineEvent[] = []; - for (const [index, modification] of modifications.sort((a, b) => b.submittedDate - a.submittedDate).entries()) { - events.push({ - htmlText: `Modification Requested #${modifications.length - index}`, - startDate: new Date(modification.submittedDate + SORTING_ORDER.MODIFICATION_REQUEST), - isFulfilled: true, - }); - - if (modification.outcomeNotificationDate) { - events.push({ - htmlText: `Modification Request Reviewed #${modifications.length - index} - ${ - modification.reviewOutcome.label - }`, - startDate: new Date(modification.submittedDate + SORTING_ORDER.MODIFICATION_REQUEST), - isFulfilled: true, - }); - } - } - return events; - } } diff --git a/alcs-frontend/src/app/services/application/application-timeline/application-timeline.dto.ts b/alcs-frontend/src/app/services/application/application-timeline/application-timeline.dto.ts new file mode 100644 index 0000000000..cc1519a556 --- /dev/null +++ b/alcs-frontend/src/app/services/application/application-timeline/application-timeline.dto.ts @@ -0,0 +1,7 @@ +export interface TimelineEventDto { + htmlText: string; + startDate: number; + fulfilledDate: number | null; + isFulfilled: boolean; + link: string | null; +} diff --git a/alcs-frontend/src/app/services/application/application-timeline/application-timeline.service.spec.ts b/alcs-frontend/src/app/services/application/application-timeline/application-timeline.service.spec.ts new file mode 100644 index 0000000000..9f6dabcb8c --- /dev/null +++ b/alcs-frontend/src/app/services/application/application-timeline/application-timeline.service.spec.ts @@ -0,0 +1,45 @@ +import { HttpClient } from '@angular/common/http'; +import { TestBed } from '@angular/core/testing'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { of } from 'rxjs'; +import { ToastService } from '../../toast/toast.service'; + +import { ApplicationTimelineService } from './application-timeline.service'; + +describe('ApplicationTimelineService', () => { + let service: ApplicationTimelineService; + let httpClient: DeepMocked; + let toastService: DeepMocked; + + beforeEach(() => { + httpClient = createMock(); + toastService = createMock(); + + TestBed.configureTestingModule({ + providers: [ + { + provide: HttpClient, + useValue: httpClient, + }, + { + provide: ToastService, + useValue: toastService, + }, + ], + }); + service = TestBed.inject(ApplicationTimelineService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); + + it('should call get to fetch timeline events', async () => { + httpClient.get.mockReturnValue(of([])); + + const res = await service.fetchByFileNumber('1'); + + expect(httpClient.get).toHaveBeenCalledTimes(1); + expect(res.length).toEqual(0); + }); +}); diff --git a/alcs-frontend/src/app/services/application/application-timeline/application-timeline.service.ts b/alcs-frontend/src/app/services/application/application-timeline/application-timeline.service.ts new file mode 100644 index 0000000000..f352192b1b --- /dev/null +++ b/alcs-frontend/src/app/services/application/application-timeline/application-timeline.service.ts @@ -0,0 +1,25 @@ +import { HttpClient } from '@angular/common/http'; +import { Injectable } from '@angular/core'; +import { firstValueFrom } from 'rxjs'; +import { environment } from '../../../../environments/environment'; +import { ToastService } from '../../toast/toast.service'; +import { TimelineEventDto } from './application-timeline.dto'; + +@Injectable({ + providedIn: 'root', +}) +export class ApplicationTimelineService { + private url = `${environment.apiUrl}/application-timeline`; + + constructor(private http: HttpClient, private toastService: ToastService) {} + + async fetchByFileNumber(fileNumber: string) { + try { + return await firstValueFrom(this.http.get(`${this.url}/${fileNumber}`)); + } catch (err) { + console.error(err); + this.toastService.showErrorToast('Failed to timeline events'); + } + return []; + } +} diff --git a/alcs-frontend/src/app/services/notice-of-intent/meeting/notice-of-intent-meeting.service.ts b/alcs-frontend/src/app/services/notice-of-intent/meeting/notice-of-intent-meeting.service.ts index aa316067c1..46dda0e04c 100644 --- a/alcs-frontend/src/app/services/notice-of-intent/meeting/notice-of-intent-meeting.service.ts +++ b/alcs-frontend/src/app/services/notice-of-intent/meeting/notice-of-intent-meeting.service.ts @@ -19,12 +19,12 @@ export class NoticeOfIntentMeetingService { constructor(private http: HttpClient, private toastService: ToastService) {} - async fetch(uuid: string) { + async fetch(fileNumber: string) { this.clearMeetings(); let meetings: NoticeOfIntentMeetingDto[] = []; try { - meetings = await firstValueFrom(this.http.get(`${this.url}/${uuid}`)); + meetings = await firstValueFrom(this.http.get(`${this.url}/${fileNumber}`)); } catch (err) { this.toastService.showErrorToast('Failed to fetch meetings'); } diff --git a/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent-timeline/notice-of-intent-timeline.dto.ts b/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent-timeline/notice-of-intent-timeline.dto.ts new file mode 100644 index 0000000000..cc1519a556 --- /dev/null +++ b/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent-timeline/notice-of-intent-timeline.dto.ts @@ -0,0 +1,7 @@ +export interface TimelineEventDto { + htmlText: string; + startDate: number; + fulfilledDate: number | null; + isFulfilled: boolean; + link: string | null; +} diff --git a/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent-timeline/notice-of-intent-timeline.service.spec.ts b/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent-timeline/notice-of-intent-timeline.service.spec.ts new file mode 100644 index 0000000000..7a5d06ee20 --- /dev/null +++ b/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent-timeline/notice-of-intent-timeline.service.spec.ts @@ -0,0 +1,45 @@ +import { HttpClient } from '@angular/common/http'; +import { TestBed } from '@angular/core/testing'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { of } from 'rxjs'; +import { ToastService } from '../../toast/toast.service'; + +import { NoticeOfIntentTimelineService } from './notice-of-intent-timeline.service'; + +describe('NoticeOfIntentTimelineService', () => { + let service: NoticeOfIntentTimelineService; + let httpClient: DeepMocked; + let toastService: DeepMocked; + + beforeEach(() => { + httpClient = createMock(); + toastService = createMock(); + + TestBed.configureTestingModule({ + providers: [ + { + provide: HttpClient, + useValue: httpClient, + }, + { + provide: ToastService, + useValue: toastService, + }, + ], + }); + service = TestBed.inject(NoticeOfIntentTimelineService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); + + it('should call get to fetch timeline events', async () => { + httpClient.get.mockReturnValue(of([])); + + const res = await service.fetchByFileNumber('1'); + + expect(httpClient.get).toHaveBeenCalledTimes(1); + expect(res.length).toEqual(0); + }); +}); diff --git a/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent-timeline/notice-of-intent-timeline.service.ts b/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent-timeline/notice-of-intent-timeline.service.ts new file mode 100644 index 0000000000..56d28e709c --- /dev/null +++ b/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent-timeline/notice-of-intent-timeline.service.ts @@ -0,0 +1,25 @@ +import { HttpClient } from '@angular/common/http'; +import { Injectable } from '@angular/core'; +import { firstValueFrom } from 'rxjs'; +import { environment } from '../../../../environments/environment'; +import { ToastService } from '../../toast/toast.service'; +import { TimelineEventDto } from './notice-of-intent-timeline.dto'; + +@Injectable({ + providedIn: 'root', +}) +export class NoticeOfIntentTimelineService { + private url = `${environment.apiUrl}/notice-of-intent-timeline`; + + constructor(private http: HttpClient, private toastService: ToastService) {} + + async fetchByFileNumber(fileNumber: string) { + try { + return await firstValueFrom(this.http.get(`${this.url}/${fileNumber}`)); + } catch (err) { + console.error(err); + this.toastService.showErrorToast('Failed to fetch timeline events'); + } + return []; + } +} diff --git a/alcs-frontend/src/app/shared/timeline/timeline.component.html b/alcs-frontend/src/app/shared/timeline/timeline.component.html index b4f3721b49..54ed9c9704 100644 --- a/alcs-frontend/src/app/shared/timeline/timeline.component.html +++ b/alcs-frontend/src/app/shared/timeline/timeline.component.html @@ -18,9 +18,10 @@ diff --git a/alcs-frontend/src/app/shared/timeline/timeline.component.ts b/alcs-frontend/src/app/shared/timeline/timeline.component.ts index f0303d3d6c..bbd79500ae 100644 --- a/alcs-frontend/src/app/shared/timeline/timeline.component.ts +++ b/alcs-frontend/src/app/shared/timeline/timeline.component.ts @@ -1,12 +1,5 @@ import { Component, Input } from '@angular/core'; - -export interface TimelineEvent { - startDate: Date; - fulfilledDate?: Date; - isFulfilled: boolean; - htmlText: string; - link?: string; -} +import { TimelineEventDto } from '../../services/notice-of-intent/notice-of-intent-timeline/notice-of-intent-timeline.dto'; @Component({ selector: 'app-timeline[events]', @@ -14,7 +7,7 @@ export interface TimelineEvent { styleUrls: ['./timeline.component.scss'], }) export class TimelineComponent { - @Input() events: TimelineEvent[] = []; + @Input() events: TimelineEventDto[] = []; constructor() {} } diff --git a/services/apps/alcs/src/alcs/alcs.module.ts b/services/apps/alcs/src/alcs/alcs.module.ts index 7092c9b22c..f54beb3aaa 100644 --- a/services/apps/alcs/src/alcs/alcs.module.ts +++ b/services/apps/alcs/src/alcs/alcs.module.ts @@ -3,6 +3,7 @@ import { RouterModule } from '@nestjs/core'; import { ApplicationSubmissionStatusModule } from './application/application-submission-status/application-submission-status.module'; import { AdminModule } from './admin/admin.module'; import { ApplicationDecisionModule } from './application-decision/application-decision.module'; +import { ApplicationTimelineModule } from './application/application-timeline/application-timeline.module'; import { ApplicationModule } from './application/application.module'; import { BoardModule } from './board/board.module'; import { CardModule } from './card/card.module'; @@ -14,6 +15,7 @@ import { HomeModule } from './home/home.module'; import { ImportModule } from './import/import.module'; import { LocalGovernmentModule } from './local-government/local-government.module'; import { NoticeOfIntentDecisionModule } from './notice-of-intent-decision/notice-of-intent-decision.module'; +import { NoticeOfIntentTimelineModule } from './notice-of-intent/notice-of-intent-timeline/notice-of-intent-timeline.module'; import { NoticeOfIntentSubmissionStatusModule } from './notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.module'; import { NoticeOfIntentModule } from './notice-of-intent/notice-of-intent.module'; import { NotificationModule } from './notification/notification.module'; @@ -39,6 +41,8 @@ import { StaffJournalModule } from './staff-journal/staff-journal.module'; NoticeOfIntentModule, StaffJournalModule, NoticeOfIntentDecisionModule, + ApplicationTimelineModule, + NoticeOfIntentTimelineModule, SearchModule, LocalGovernmentModule, RouterModule.register([ @@ -61,6 +65,8 @@ import { StaffJournalModule } from './staff-journal/staff-journal.module'; { path: 'alcs', module: ApplicationSubmissionStatusModule }, { path: 'alcs', module: NoticeOfIntentSubmissionStatusModule }, { path: 'alcs', module: LocalGovernmentModule }, + { path: 'alcs', module: ApplicationTimelineModule }, + { path: 'alcs', module: NoticeOfIntentTimelineModule }, ]), ], controllers: [], diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v1/application-decision-meeting/application-decision-meeting.service.spec.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v1/application-decision-meeting/application-decision-meeting.service.spec.ts index 93bf9457ea..f272c8e8ae 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v1/application-decision-meeting/application-decision-meeting.service.spec.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v1/application-decision-meeting/application-decision-meeting.service.spec.ts @@ -77,7 +77,7 @@ describe('ApplicationDecisionMeetingService', () => { mockApplicationSubmissionStatusService.setStatusDateByFileNumber.mockResolvedValue( {} as any, ); - mockApplicationSubmissionStatusService.getCurrentStatusesByFileNumber.mockResolvedValue( + mockApplicationSubmissionStatusService.getStatusesByFileNumber.mockResolvedValue( [mockSubmissionStatus], ); }); @@ -125,10 +125,10 @@ describe('ApplicationDecisionMeetingService', () => { expect(mockAppDecisionMeetingRepository.findOne).toBeCalledTimes(0); expect(mockAppDecisionMeetingRepository.save).toBeCalledTimes(1); expect( - mockApplicationSubmissionStatusService.getCurrentStatusesByFileNumber, + mockApplicationSubmissionStatusService.getStatusesByFileNumber, ).toBeCalledTimes(1); expect( - mockApplicationSubmissionStatusService.getCurrentStatusesByFileNumber, + mockApplicationSubmissionStatusService.getStatusesByFileNumber, ).toBeCalledWith(mockApplication.fileNumber); expect( mockApplicationSubmissionStatusService.setStatusDate, @@ -156,10 +156,10 @@ describe('ApplicationDecisionMeetingService', () => { }); expect(mockAppDecisionMeetingRepository.save).toBeCalledTimes(1); expect( - mockApplicationSubmissionStatusService.getCurrentStatusesByFileNumber, + mockApplicationSubmissionStatusService.getStatusesByFileNumber, ).toBeCalledTimes(1); expect( - mockApplicationSubmissionStatusService.getCurrentStatusesByFileNumber, + mockApplicationSubmissionStatusService.getStatusesByFileNumber, ).toBeCalledWith(mockApplication.fileNumber); expect( mockApplicationSubmissionStatusService.setStatusDate, diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v1/application-decision-meeting/application-decision-meeting.service.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v1/application-decision-meeting/application-decision-meeting.service.ts index 2dc7958735..59906bd274 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v1/application-decision-meeting/application-decision-meeting.service.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v1/application-decision-meeting/application-decision-meeting.service.ts @@ -76,7 +76,7 @@ export class ApplicationDecisionMeetingService { ); const currentStatuses = - await this.applicationSubmissionStatusService.getCurrentStatusesByFileNumber( + await this.applicationSubmissionStatusService.getStatusesByFileNumber( application.fileNumber, ); diff --git a/services/apps/alcs/src/alcs/application/application-submission-status/application-submission-status.controller.spec.ts b/services/apps/alcs/src/alcs/application/application-submission-status/application-submission-status.controller.spec.ts index 44519583c8..0a57bd3bfd 100644 --- a/services/apps/alcs/src/alcs/application/application-submission-status/application-submission-status.controller.spec.ts +++ b/services/apps/alcs/src/alcs/application/application-submission-status/application-submission-status.controller.spec.ts @@ -49,17 +49,17 @@ describe('ApplicationSubmissionStatusController', () => { it('should call service to get statuses by file number', async () => { const fakeFileNumber = 'fake'; - mockApplicationSubmissionStatusService.getCurrentStatusesByFileNumber.mockResolvedValue( + mockApplicationSubmissionStatusService.getStatusesByFileNumber.mockResolvedValue( [new ApplicationSubmissionToSubmissionStatus()], ); const result = await controller.getStatusesByFileNumber(fakeFileNumber); expect( - mockApplicationSubmissionStatusService.getCurrentStatusesByFileNumber, + mockApplicationSubmissionStatusService.getStatusesByFileNumber, ).toBeCalledTimes(1); expect( - mockApplicationSubmissionStatusService.getCurrentStatusesByFileNumber, + mockApplicationSubmissionStatusService.getStatusesByFileNumber, ).toBeCalledWith(fakeFileNumber); expect(result.length).toEqual(1); expect(result).toBeDefined(); diff --git a/services/apps/alcs/src/alcs/application/application-submission-status/application-submission-status.controller.ts b/services/apps/alcs/src/alcs/application/application-submission-status/application-submission-status.controller.ts index a97e38a951..9556b5a140 100644 --- a/services/apps/alcs/src/alcs/application/application-submission-status/application-submission-status.controller.ts +++ b/services/apps/alcs/src/alcs/application/application-submission-status/application-submission-status.controller.ts @@ -18,7 +18,7 @@ export class ApplicationSubmissionStatusController { @Get('/:fileNumber') async getStatusesByFileNumber(@Param('fileNumber') fileNumber) { const statuses = - await this.applicationSubmissionStatusService.getCurrentStatusesByFileNumber( + await this.applicationSubmissionStatusService.getStatusesByFileNumber( fileNumber, ); diff --git a/services/apps/alcs/src/alcs/application/application-submission-status/application-submission-status.service.spec.ts b/services/apps/alcs/src/alcs/application/application-submission-status/application-submission-status.service.spec.ts index ca1f35abc3..db4f84dafe 100644 --- a/services/apps/alcs/src/alcs/application/application-submission-status/application-submission-status.service.spec.ts +++ b/services/apps/alcs/src/alcs/application/application-submission-status/application-submission-status.service.spec.ts @@ -116,7 +116,7 @@ describe('ApplicationSubmissionStatusService', () => { mockStatuses, ); - const statuses = await service.getCurrentStatusesBy(fakeSubmissionUuid); + const statuses = await service.getStatusesByUuid(fakeSubmissionUuid); expect( mockApplicationSubmissionToSubmissionStatusRepository.findBy, @@ -150,9 +150,7 @@ describe('ApplicationSubmissionStatusService', () => { }), ); - const statuses = await service.getCurrentStatusesByFileNumber( - fakeFileNumber, - ); + const statuses = await service.getStatusesByFileNumber(fakeFileNumber); expect( mockApplicationSubmissionToSubmissionStatusRepository.findBy, @@ -188,7 +186,7 @@ describe('ApplicationSubmissionStatusService', () => { mockApplicationSubmissionRepository.findOneBy.mockResolvedValue(null); await expect( - service.getCurrentStatusesByFileNumber(fakeFileNumber), + service.getStatusesByFileNumber(fakeFileNumber), ).rejects.toMatchObject( new ServiceNotFoundException( `Submission does not exist for provided application ${fakeFileNumber}. Only applications originated in portal have statuses.`, diff --git a/services/apps/alcs/src/alcs/application/application-submission-status/application-submission-status.service.ts b/services/apps/alcs/src/alcs/application/application-submission-status/application-submission-status.service.ts index 44fbccc982..5e3d8ffb15 100644 --- a/services/apps/alcs/src/alcs/application/application-submission-status/application-submission-status.service.ts +++ b/services/apps/alcs/src/alcs/application/application-submission-status/application-submission-status.service.ts @@ -86,11 +86,11 @@ export class ApplicationSubmissionStatusService { ); } - async getCurrentStatusesBy(submissionUuid: string) { + async getStatusesByUuid(submissionUuid: string) { return await this.statusesRepository.findBy({ submissionUuid }); } - async getCurrentStatusesByFileNumber(fileNumber: string) { + async getStatusesByFileNumber(fileNumber: string) { const submission = await this.getSubmission(fileNumber); return await this.statusesRepository.findBy({ @@ -121,7 +121,7 @@ export class ApplicationSubmissionStatusService { //Note: do not use fileNumber as identifier since there maybe multiple submissions with // the same fileNumber due to isDraft flag async removeStatuses(submissionUuid: string) { - const statusesToRemove = await this.getCurrentStatusesBy(submissionUuid); + const statusesToRemove = await this.getStatusesByUuid(submissionUuid); return await this.statusesRepository.remove(statusesToRemove); } diff --git a/services/apps/alcs/src/alcs/application/application-timeline/application-timeline.controller.spec.ts b/services/apps/alcs/src/alcs/application/application-timeline/application-timeline.controller.spec.ts new file mode 100644 index 0000000000..bb8f864850 --- /dev/null +++ b/services/apps/alcs/src/alcs/application/application-timeline/application-timeline.controller.spec.ts @@ -0,0 +1,49 @@ +import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; +import { Test, TestingModule } from '@nestjs/testing'; +import { ClsService } from 'nestjs-cls'; +import { mockKeyCloakProviders } from '../../../../test/mocks/mockTypes'; +import { ApplicationTimelineController } from './application-timeline.controller'; +import { ApplicationTimelineService } from './application-timeline.service'; + +describe('ApplicationTimelineController', () => { + let controller: ApplicationTimelineController; + let mockTimelineService: DeepMocked; + + beforeEach(async () => { + mockTimelineService = createMock(); + + const module: TestingModule = await Test.createTestingModule({ + providers: [ + { + provide: ApplicationTimelineService, + useValue: mockTimelineService, + }, + { + provide: ClsService, + useValue: {}, + }, + ...mockKeyCloakProviders, + ], + controllers: [ApplicationTimelineController], + }).compile(); + + controller = module.get( + ApplicationTimelineController, + ); + }); + + it('should be defined', () => { + expect(controller).toBeDefined(); + }); + + it('should call through to get timeline events', async () => { + mockTimelineService.getTimelineEvents.mockResolvedValue([]); + const res = await controller.fetchTimelineEvents('fileNumber'); + + expect(res).toBeDefined(); + expect(mockTimelineService.getTimelineEvents).toHaveBeenCalledTimes(1); + expect(mockTimelineService.getTimelineEvents).toHaveBeenCalledWith( + 'fileNumber', + ); + }); +}); diff --git a/services/apps/alcs/src/alcs/application/application-timeline/application-timeline.controller.ts b/services/apps/alcs/src/alcs/application/application-timeline/application-timeline.controller.ts new file mode 100644 index 0000000000..5661ed1358 --- /dev/null +++ b/services/apps/alcs/src/alcs/application/application-timeline/application-timeline.controller.ts @@ -0,0 +1,20 @@ +import { Controller, Get, Param, UseGuards } from '@nestjs/common'; +import { ApiOAuth2 } from '@nestjs/swagger'; +import * as config from 'config'; +import { AUTH_ROLE } from '../../../common/authorization/roles'; +import { RolesGuard } from '../../../common/authorization/roles-guard.service'; +import { UserRoles } from '../../../common/authorization/roles.decorator'; +import { ApplicationTimelineService } from './application-timeline.service'; + +@ApiOAuth2(config.get('KEYCLOAK.SCOPES')) +@Controller('application-timeline') +@UseGuards(RolesGuard) +export class ApplicationTimelineController { + constructor(private applicationTimelineService: ApplicationTimelineService) {} + + @Get('/:fileNumber') + @UserRoles(AUTH_ROLE.ADMIN) + async fetchTimelineEvents(@Param('fileNumber') fileNumber: string) { + return await this.applicationTimelineService.getTimelineEvents(fileNumber); + } +} diff --git a/services/apps/alcs/src/alcs/application/application-timeline/application-timeline.module.ts b/services/apps/alcs/src/alcs/application/application-timeline/application-timeline.module.ts new file mode 100644 index 0000000000..4ed61a3a95 --- /dev/null +++ b/services/apps/alcs/src/alcs/application/application-timeline/application-timeline.module.ts @@ -0,0 +1,26 @@ +import { Module } from '@nestjs/common'; +import { TypeOrmModule } from '@nestjs/typeorm'; +import { ApplicationDecision } from '../../application-decision/application-decision.entity'; +import { ApplicationModification } from '../../application-decision/application-modification/application-modification.entity'; +import { ApplicationReconsideration } from '../../application-decision/application-reconsideration/application-reconsideration.entity'; +import { ApplicationSubmissionStatusModule } from '../application-submission-status/application-submission-status.module'; +import { Application } from '../application.entity'; +import { ApplicationModule } from '../application.module'; +import { ApplicationTimelineController } from './application-timeline.controller'; +import { ApplicationTimelineService } from './application-timeline.service'; + +@Module({ + imports: [ + TypeOrmModule.forFeature([ + Application, + ApplicationModification, + ApplicationReconsideration, + ApplicationDecision, + ]), + ApplicationModule, + ApplicationSubmissionStatusModule, + ], + providers: [ApplicationTimelineService], + controllers: [ApplicationTimelineController], +}) +export class ApplicationTimelineModule {} diff --git a/services/apps/alcs/src/alcs/application/application-timeline/application-timeline.service.spec.ts b/services/apps/alcs/src/alcs/application/application-timeline/application-timeline.service.spec.ts new file mode 100644 index 0000000000..b675cd35f1 --- /dev/null +++ b/services/apps/alcs/src/alcs/application/application-timeline/application-timeline.service.spec.ts @@ -0,0 +1,294 @@ +import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; +import { Test, TestingModule } from '@nestjs/testing'; +import { getRepositoryToken } from '@nestjs/typeorm'; +import { Repository } from 'typeorm'; +import { ApplicationDecision } from '../../application-decision/application-decision.entity'; +import { ApplicationModificationOutcomeType } from '../../application-decision/application-modification/application-modification-outcome-type/application-modification-outcome-type.entity'; +import { ApplicationModification } from '../../application-decision/application-modification/application-modification.entity'; +import { ApplicationReconsideration } from '../../application-decision/application-reconsideration/application-reconsideration.entity'; +import { ApplicationReconsiderationOutcomeType } from '../../application-decision/application-reconsideration/reconsideration-outcome-type/application-reconsideration-outcome-type.entity'; +import { ApplicationReconsiderationType } from '../../application-decision/application-reconsideration/reconsideration-type/application-reconsideration-type.entity'; +import { NoticeOfIntentMeetingType } from '../../notice-of-intent/notice-of-intent-meeting/notice-of-intent-meeting-type.entity'; +import { NoticeOfIntentMeeting } from '../../notice-of-intent/notice-of-intent-meeting/notice-of-intent-meeting.entity'; +import { NoticeOfIntent } from '../../notice-of-intent/notice-of-intent.entity'; +import { ApplicationMeeting } from '../application-meeting/application-meeting.entity'; +import { ApplicationMeetingService } from '../application-meeting/application-meeting.service'; +import { ApplicationPaused } from '../application-paused.entity'; +import { ApplicationSubmissionStatusService } from '../application-submission-status/application-submission-status.service'; +import { SUBMISSION_STATUS } from '../application-submission-status/submission-status.dto'; +import { ApplicationSubmissionToSubmissionStatus } from '../application-submission-status/submission-status.entity'; +import { Application } from '../application.entity'; +import { ApplicationService } from '../application.service'; +import { ApplicationTimelineService } from './application-timeline.service'; + +describe('ApplicationTimelineService', () => { + let service: ApplicationTimelineService; + let mockAppRepo: DeepMocked>; + let mockAppModificationRepo: DeepMocked>; + let mockAppReconsiderationRepo: DeepMocked< + Repository + >; + let mockAppDecisionRepo: DeepMocked>; + let mockAppService: DeepMocked; + let mockAppMeetingService: DeepMocked; + let mockAppStatusService: DeepMocked; + + beforeEach(async () => { + mockAppRepo = createMock(); + mockAppModificationRepo = createMock(); + mockAppReconsiderationRepo = createMock(); + mockAppDecisionRepo = createMock(); + mockAppService = createMock(); + mockAppMeetingService = createMock(); + mockAppStatusService = createMock(); + + const module: TestingModule = await Test.createTestingModule({ + providers: [ + { + provide: getRepositoryToken(Application), + useValue: mockAppRepo, + }, + { + provide: getRepositoryToken(ApplicationReconsideration), + useValue: mockAppReconsiderationRepo, + }, + { + provide: getRepositoryToken(ApplicationModification), + useValue: mockAppModificationRepo, + }, + { + provide: getRepositoryToken(ApplicationDecision), + useValue: mockAppDecisionRepo, + }, + { + provide: ApplicationService, + useValue: mockAppService, + }, + { + provide: ApplicationMeetingService, + useValue: mockAppMeetingService, + }, + { + provide: ApplicationSubmissionStatusService, + useValue: mockAppStatusService, + }, + ApplicationTimelineService, + ], + }).compile(); + + service = module.get( + ApplicationTimelineService, + ); + + mockAppRepo.findOneOrFail.mockResolvedValue(new Application()); + mockAppModificationRepo.find.mockResolvedValue([]); + mockAppReconsiderationRepo.find.mockResolvedValue([]); + mockAppDecisionRepo.find.mockResolvedValue([]); + mockAppMeetingService.getByAppFileNumber.mockResolvedValue([]); + mockAppStatusService.getStatusesByFileNumber.mockResolvedValue([]); + }); + + it('should be defined', () => { + expect(service).toBeDefined(); + }); + + it('should return nothing for empty Application', async () => { + const res = await service.getTimelineEvents('file-number'); + + expect(res).toBeDefined(); + }); + + it('should map base Application events in the correct order', async () => { + const sameDate = new Date(); + mockAppRepo.findOneOrFail.mockResolvedValue( + new Application({ + feePaidDate: sameDate, + dateAcknowledgedComplete: sameDate, + notificationSentDate: sameDate, + }), + ); + + const res = await service.getTimelineEvents('file-number'); + + expect(res).toBeDefined(); + expect(res.length).toEqual(3); + expect(res[2].htmlText).toEqual('Fee Received Date'); + expect(res[1].htmlText).toEqual('Acknowledged Complete'); + expect(res[0].htmlText).toEqual( + "'Ready for Review' Notification Sent to Applicant", + ); + }); + + it('should map decision events in the correct order', async () => { + const sameDate = new Date(); + mockAppService.mapToDtos.mockResolvedValue([ + { + activeDays: 6, + } as any, + ]); + + mockAppDecisionRepo.find.mockResolvedValue([ + new ApplicationDecision({ + auditDate: new Date(sameDate.getTime() + 1000), + chairReviewDate: new Date(sameDate.getTime() + 1000), + date: new Date(sameDate.getTime() + 1000), + }), + new ApplicationDecision({ + auditDate: sameDate, + chairReviewDate: sameDate, + date: sameDate, + }), + ]); + + const res = await service.getTimelineEvents('file-number'); + + expect(res).toBeDefined(); + expect(res.length).toEqual(6); + expect(res[5].htmlText).toEqual('Decision #1 Made - Active Days: 6'); + expect(res[4].htmlText).toEqual('Audited Decision #1'); + expect(res[3].htmlText).toEqual('Chair Reviewed Decision #1'); + expect(res[2].htmlText).toEqual('Decision #2 Made'); + expect(res[1].htmlText).toEqual('Audited Decision #2'); + expect(res[0].htmlText).toEqual('Chair Reviewed Decision #2'); + }); + + it('should map reconsideration events in the correct order', async () => { + const sameDate = new Date(); + mockAppReconsiderationRepo.find.mockResolvedValue([ + new ApplicationReconsideration({ + type: { + code: '33', + } as ApplicationReconsiderationType, + submittedDate: new Date(sameDate.getTime() + 100), + reviewDate: new Date(sameDate.getTime() + 100), + reviewOutcome: { + label: 'CATS', + } as ApplicationReconsiderationOutcomeType, + }), + new ApplicationReconsideration({ + type: { + code: '33.1', + } as ApplicationReconsiderationType, + submittedDate: sameDate, + }), + ]); + + const res = await service.getTimelineEvents('file-number'); + + expect(res).toBeDefined(); + expect(res.length).toEqual(3); + expect(res[2].htmlText).toEqual('Reconsideration Request #1 - 33.1'); + expect(res[1].htmlText).toEqual('Reconsideration Requested #2 - 33'); + expect(res[0].htmlText).toEqual( + 'Reconsideration Request Reviewed #2 - CATS', + ); + }); + + it('should map modification events in the correct order', async () => { + const sameDate = new Date(); + mockAppModificationRepo.find.mockResolvedValue([ + new ApplicationModification({ + isTimeExtension: true, + submittedDate: new Date(sameDate.getTime() + 100), + reviewDate: new Date(sameDate.getTime() + 100), + reviewOutcome: { + label: 'CATS', + } as ApplicationModificationOutcomeType, + }), + new ApplicationModification({ + isTimeExtension: false, + submittedDate: sameDate, + }), + ]); + + const res = await service.getTimelineEvents('file-number'); + + expect(res).toBeDefined(); + expect(res.length).toEqual(3); + expect(res[2].htmlText).toEqual('Modification Requested #1 - Other'); + expect(res[1].htmlText).toEqual( + 'Modification Requested #2 - Time Extension', + ); + expect(res[0].htmlText).toEqual('Modification Request Reviewed #2 - CATS'); + }); + + it('should map Meeting Events', async () => { + const sameDate = new Date(); + mockAppMeetingService.getByAppFileNumber.mockResolvedValue([ + new ApplicationMeeting({ + meetingPause: new ApplicationPaused({ + startDate: new Date(sameDate.getTime() + 1000), + endDate: new Date(sameDate.getTime() + 1000), + }), + reportPause: new ApplicationPaused({ + startDate: new Date(sameDate.getTime() + 1000), + endDate: null, + }), + type: { + label: 'CATS', + } as any, + }), + new ApplicationMeeting({ + meetingPause: new ApplicationPaused({ + startDate: sameDate, + endDate: sameDate, + }), + reportPause: new ApplicationPaused({ + startDate: sameDate, + endDate: sameDate, + }), + type: { + label: 'CATS', + } as any, + }), + ]); + + const res = await service.getTimelineEvents('file-number'); + + expect(res).toBeDefined(); + expect(res.length).toEqual(4); + expect(res[3].htmlText).toEqual('CATS #1'); + expect(res[2].htmlText).toEqual('CATS #1 Report Sent to Applicant'); + expect(res[1].htmlText).toEqual('CATS #2'); + expect(res[0].htmlText).toEqual('CATS #2 Report Sent to Applicant'); + }); + + it('should map Status Events', async () => { + const sameDate = new Date(); + mockAppStatusService.getStatusesByFileNumber.mockResolvedValue([ + new ApplicationSubmissionToSubmissionStatus({ + statusType: { + code: SUBMISSION_STATUS.RECEIVED_BY_ALC, + weight: 2, + } as any, + effectiveDate: sameDate, + }), + new ApplicationSubmissionToSubmissionStatus({ + statusType: { + code: SUBMISSION_STATUS.IN_PROGRESS, + weight: 0, + } as any, + effectiveDate: sameDate, + }), + new ApplicationSubmissionToSubmissionStatus({ + statusType: { + code: SUBMISSION_STATUS.SUBMITTED_TO_ALC_INCOMPLETE, + weight: 1, + } as any, + effectiveDate: sameDate, + }), + ]); + + const res = await service.getTimelineEvents('file-number'); + + expect(res).toBeDefined(); + expect(res.length).toEqual(3); + expect(res[2].htmlText).toEqual('Created - In Progress'); + expect(res[1].htmlText).toEqual( + 'Acknowledged Incomplete - Submitted to ALC - Incomplete', + ); + expect(res[0].htmlText).toEqual( + 'Received All Items - Received by ALC', + ); + }); +}); diff --git a/services/apps/alcs/src/alcs/application/application-timeline/application-timeline.service.ts b/services/apps/alcs/src/alcs/application/application-timeline/application-timeline.service.ts new file mode 100644 index 0000000000..b3bad2061d --- /dev/null +++ b/services/apps/alcs/src/alcs/application/application-timeline/application-timeline.service.ts @@ -0,0 +1,406 @@ +import { Injectable } from '@nestjs/common'; +import { InjectRepository } from '@nestjs/typeorm'; +import { Repository } from 'typeorm'; +import { ApplicationDecision } from '../../application-decision/application-decision.entity'; +import { ApplicationModification } from '../../application-decision/application-modification/application-modification.entity'; +import { ApplicationReconsideration } from '../../application-decision/application-reconsideration/application-reconsideration.entity'; +import { CardSubtask } from '../../card/card-subtask/card-subtask.entity'; +import { ApplicationMeetingService } from '../application-meeting/application-meeting.service'; +import { ApplicationSubmissionStatusService } from '../application-submission-status/application-submission-status.service'; +import { SUBMISSION_STATUS } from '../application-submission-status/submission-status.dto'; +import { Application } from '../application.entity'; +import { ApplicationService } from '../application.service'; + +export interface TimelineEvent { + htmlText: string; + startDate: number; + fulfilledDate: number | null; + isFulfilled: boolean; + link?: string | null; +} + +const SORTING_ORDER = { + //high comes first, 1 shows at bottom + MODIFICATION_REVIEW: 14, + MODIFICATION_REQUEST: 13, + RECON_REVIEW: 12, + RECON_REQUEST: 11, + CHAIR_REVIEW_DECISION: 10, + AUDITED_DECISION: 9, + READY_FOR_REVIEW_NOTIFICATION: 8, + DECISION_MADE: 7, + VISIT_REPORTS: 6, + VISIT_REQUESTS: 5, + ACKNOWLEDGE_COMPLETE: 4, + FEE_RECEIVED: 3, + ACKNOWLEDGED_INCOMPLETE: 2, + SUBMITTED: 1, +}; + +const editLink = new Map([ + ['IR', './info-request'], + ['AM', './site-visit-meeting'], + ['SV', './site-visit-meeting'], +]); + +@Injectable() +export class ApplicationTimelineService { + constructor( + @InjectRepository(Application) + private applicationRepo: Repository, + @InjectRepository(ApplicationModification) + private applicationModificationRepo: Repository, + @InjectRepository(ApplicationReconsideration) + private applicationReconsiderationRepo: Repository, + @InjectRepository(ApplicationDecision) + private applicationDecisionRepo: Repository, + private applicationService: ApplicationService, + private applicationMeetingService: ApplicationMeetingService, + private applicationSubmissionStatusService: ApplicationSubmissionStatusService, + ) {} + + async getTimelineEvents(fileNumber: string) { + const events: TimelineEvent[] = []; + const application = await this.applicationRepo.findOneOrFail({ + where: { + fileNumber, + }, + relations: { + decisionMeetings: true, + type: true, + card: { + type: true, + subtasks: { + type: true, + }, + }, + }, + withDeleted: true, + }); + + this.addApplicationEvents(application, events); + await this.addDecisionEvents(application, events); + await this.addReconsiderationEvents(application, events); + await this.addModificationEvents(application, events); + await this.addMeetingEvents(application, events); + await this.addStatusEvents(application, events); + + if (application.card) { + for (const subtask of application.card.subtasks) { + const mappedEvent = this.mapSubtaskToEvent(subtask); + events.push(mappedEvent); + } + } + + events.sort((a, b) => b.startDate - a.startDate); + return events; + } + + private addApplicationEvents( + application: Application, + events: TimelineEvent[], + ) { + if (application.feePaidDate) { + events.push({ + htmlText: 'Fee Received Date', + startDate: + application.feePaidDate.getTime() + SORTING_ORDER.FEE_RECEIVED, + fulfilledDate: null, + isFulfilled: true, + }); + } + + if (application.dateAcknowledgedComplete) { + events.push({ + htmlText: 'Acknowledged Complete', + startDate: + application.dateAcknowledgedComplete.getTime() + + SORTING_ORDER.ACKNOWLEDGE_COMPLETE, + isFulfilled: true, + fulfilledDate: null, + }); + } + + if (application.notificationSentDate) { + events.push({ + htmlText: "'Ready for Review' Notification Sent to Applicant", + startDate: + application.notificationSentDate.getTime() + + SORTING_ORDER.READY_FOR_REVIEW_NOTIFICATION, + fulfilledDate: null, + isFulfilled: true, + }); + } + } + + private mapSubtaskToEvent(subtask: CardSubtask): TimelineEvent { + return { + htmlText: `${subtask.type.label} Subtask`, + fulfilledDate: subtask.completedAt?.getTime() ?? null, + startDate: subtask.createdAt.getTime(), + isFulfilled: !!subtask.completedAt, + }; + } + + private async addDecisionEvents( + application: Application, + events: TimelineEvent[], + ) { + const decisions = await this.applicationDecisionRepo.find({ + where: { + applicationUuid: application.uuid, + isDraft: false, + }, + order: { + date: 'DESC', + }, + }); + + if (decisions.length > 0) { + const mappedApplications = await this.applicationService.mapToDtos([ + application, + ]); + const mappedApplication = mappedApplications[0]; + + for (const [index, decision] of decisions.entries()) { + if (decision.auditDate) { + events.push({ + htmlText: `Audited Decision #${decisions.length - index}`, + startDate: + decision.auditDate.getTime() + SORTING_ORDER.AUDITED_DECISION, + fulfilledDate: null, + isFulfilled: true, + }); + } + + if (decision.chairReviewDate) { + events.push({ + htmlText: `Chair Reviewed Decision #${decisions.length - index}`, + startDate: + decision.chairReviewDate.getTime() + + SORTING_ORDER.CHAIR_REVIEW_DECISION, + fulfilledDate: null, + isFulfilled: true, + }); + } + + events.push({ + htmlText: `Decision #${decisions.length - index} Made${ + decisions.length - 1 === index + ? ` - Active Days: ${mappedApplication.activeDays}` + : '' + }`, + startDate: decision.date!.getTime() + SORTING_ORDER.DECISION_MADE, + fulfilledDate: null, + isFulfilled: true, + }); + } + } + } + + private async addReconsiderationEvents( + application: Application, + events: TimelineEvent[], + ) { + const reconsiderations = await this.applicationReconsiderationRepo.find({ + where: { + applicationUuid: application.uuid, + }, + relations: { + card: { + subtasks: { + type: true, + }, + }, + }, + order: { + submittedDate: 'DESC', + }, + }); + + for (const [index, reconsideration] of reconsiderations.entries()) { + if (reconsideration.type.code === '33.1') { + events.push({ + htmlText: `Reconsideration Request #${ + reconsiderations.length - index + } - ${reconsideration.type.code}`, + startDate: + reconsideration.submittedDate.getTime() + + SORTING_ORDER.RECON_REQUEST, + fulfilledDate: null, + isFulfilled: true, + }); + } else { + events.push({ + htmlText: `Reconsideration Requested #${ + reconsiderations.length - index + } - ${reconsideration.type.code}`, + startDate: + reconsideration.submittedDate.getTime() + + SORTING_ORDER.RECON_REQUEST, + fulfilledDate: null, + isFulfilled: true, + }); + if (reconsideration.reviewDate) { + events.push({ + htmlText: `Reconsideration Request Reviewed #${ + reconsiderations.length - index + } - ${reconsideration.reviewOutcome?.label}`, + startDate: + reconsideration.reviewDate.getTime() + SORTING_ORDER.RECON_REVIEW, + fulfilledDate: null, + isFulfilled: true, + }); + } + } + } + } + + private async addModificationEvents( + application: Application, + events: TimelineEvent[], + ) { + const modifications = await this.applicationModificationRepo.find({ + where: { + applicationUuid: application.uuid, + }, + relations: { + card: { + subtasks: { + type: true, + }, + }, + }, + order: { + submittedDate: 'DESC', + }, + }); + + for (const [index, modification] of modifications.entries()) { + events.push({ + htmlText: `Modification Requested #${modifications.length - index} - ${ + modification.isTimeExtension ? 'Time Extension' : 'Other' + }`, + startDate: + modification.submittedDate.getTime() + + SORTING_ORDER.MODIFICATION_REQUEST, + fulfilledDate: null, + isFulfilled: true, + }); + + if (modification.card) { + for (const subtask of modification.card.subtasks) { + const mappedEvent = this.mapSubtaskToEvent(subtask); + events.push(mappedEvent); + } + } + + if (modification.reviewDate) { + events.push({ + htmlText: `Modification Request Reviewed #${ + modifications.length - index + } - ${modification.reviewOutcome.label}`, + startDate: + modification.reviewDate.getTime() + + SORTING_ORDER.MODIFICATION_REVIEW, + fulfilledDate: null, + isFulfilled: true, + }); + } + } + } + + private async addMeetingEvents( + noticeOfIntent: Application, + events: TimelineEvent[], + ) { + const meetings = await this.applicationMeetingService.getByAppFileNumber( + noticeOfIntent.fileNumber, + ); + + meetings.sort( + (a, b) => + a.meetingPause!.startDate.getTime() - + b.meetingPause!.startDate.getTime(), + ); + + const typeCount = new Map(); + meetings.forEach((meeting) => { + const count = typeCount.get(meeting.type.code) || 0; + + const meetingStartDate = meeting.meetingPause?.startDate.getTime(); + const meetingEndDate = meeting.meetingPause?.endDate?.getTime(); + + if (meetingStartDate) { + events.push({ + htmlText: `${meeting.type.label} #${count + 1}`, + startDate: meetingStartDate + SORTING_ORDER.VISIT_REQUESTS, + fulfilledDate: meetingEndDate ?? null, + isFulfilled: !!meetingEndDate, + link: editLink.get(meeting.type.code), + }); + } + + const reportStartDate = meeting.reportPause?.startDate.getTime(); + const reportEndDate = meeting.reportPause?.endDate?.getTime(); + if (reportStartDate) { + events.push({ + htmlText: `${meeting.type.label} #${ + count + 1 + } Report Sent to Applicant`, + startDate: reportStartDate + SORTING_ORDER.VISIT_REPORTS, + fulfilledDate: reportEndDate ?? null, + isFulfilled: !!reportEndDate, + link: editLink.get(meeting.type.code), + }); + } + + typeCount.set(meeting.type.code, count + 1); + }); + } + + private async addStatusEvents( + application: Application, + events: TimelineEvent[], + ) { + const statusHistory = + await this.applicationSubmissionStatusService.getStatusesByFileNumber( + application.fileNumber, + ); + + const statusesToInclude = statusHistory.filter( + (status) => + ![SUBMISSION_STATUS.IN_REVIEW_BY_ALC].includes( + status.statusType.code, + ), + ); + for (const status of statusesToInclude) { + if (status.effectiveDate) { + let htmlText = `${status.statusType.label}`; + + if (status.statusType.code === SUBMISSION_STATUS.RECEIVED_BY_ALC) { + htmlText = 'Received All Items - Received by ALC'; + } + + if (status.statusType.code === SUBMISSION_STATUS.IN_PROGRESS) { + htmlText = 'Created - In Progress'; + } + + if ( + status.statusType.code === + SUBMISSION_STATUS.SUBMITTED_TO_ALC_INCOMPLETE + ) { + htmlText = + 'Acknowledged Incomplete - Submitted to ALC - Incomplete'; + } + + events.push({ + htmlText, + startDate: status.effectiveDate.getTime() + status.statusType.weight, + fulfilledDate: null, + isFulfilled: true, + }); + } + } + } +} diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-meeting/notice-of-intent-meeting.controller.spec.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-meeting/notice-of-intent-meeting.controller.spec.ts index 39cec3a79b..d06047a6fc 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-meeting/notice-of-intent-meeting.controller.spec.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-meeting/notice-of-intent-meeting.controller.spec.ts @@ -80,14 +80,12 @@ describe('NoticeOfIntentMeetingController', () => { }); it('should get all for notice of intent', async () => { - mockNoticeOfIntentMeetingService.getByAppFileNumber.mockResolvedValue([ + mockNoticeOfIntentMeetingService.getByFileNumber.mockResolvedValue([ mockMeeting, ]); const result = await controller.getAllForApplication('fake-number'); - expect(mockNoticeOfIntentMeetingService.getByAppFileNumber).toBeCalledTimes( - 1, - ); + expect(mockNoticeOfIntentMeetingService.getByFileNumber).toBeCalledTimes(1); expect(result[0].uuid).toStrictEqual(mockMeeting.uuid); }); diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-meeting/notice-of-intent-meeting.controller.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-meeting/notice-of-intent-meeting.controller.ts index f0d00b7ef8..6c82c8202a 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-meeting/notice-of-intent-meeting.controller.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-meeting/notice-of-intent-meeting.controller.ts @@ -1,17 +1,17 @@ +import { Mapper } from '@automapper/core'; +import { InjectMapper } from '@automapper/nestjs'; import { Body, Controller, Delete, Get, + Logger, NotFoundException, Param, Patch, Post, + UseGuards, } from '@nestjs/common'; - -import { Mapper } from '@automapper/core'; -import { InjectMapper } from '@automapper/nestjs'; -import { Logger, UseGuards } from '@nestjs/common'; import { ApiOAuth2 } from '@nestjs/swagger'; import * as config from 'config'; import { ServiceNotFoundException } from '../../../../../../libs/common/src/exceptions/base.exception'; @@ -44,9 +44,7 @@ export class NoticeOfIntentMeetingController { async getAllForApplication( @Param('fileNumber') fileNumber, ): Promise { - const meetings = await this.noiMeetingService.getByAppFileNumber( - fileNumber, - ); + const meetings = await this.noiMeetingService.getByFileNumber(fileNumber); return this.mapper.mapArrayAsync( meetings, diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-meeting/notice-of-intent-meeting.service.spec.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-meeting/notice-of-intent-meeting.service.spec.ts index 1e6066fa42..da700a985b 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-meeting/notice-of-intent-meeting.service.spec.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-meeting/notice-of-intent-meeting.service.spec.ts @@ -62,6 +62,7 @@ describe('NoticeOfIntentMeetingService', () => { mockNoiMeetingRepository.findOne.mockResolvedValue(mockMeeting); mockNoiMeetingRepository.save.mockResolvedValue(mockMeeting); mockNoiService.getOrFailByUuid.mockResolvedValue(mockNoi); + mockNoiService.getUuid.mockResolvedValue(mockNoi.uuid); }); it('should be defined', () => { @@ -69,14 +70,14 @@ describe('NoticeOfIntentMeetingService', () => { }); it('should get meetings for noi', async () => { - const result = await service.getByAppFileNumber(mockNoi.fileNumber); + const result = await service.getByFileNumber(mockNoi.fileNumber); expect(result).toStrictEqual([mockMeeting]); }); it('should return empty array if no meetings for noi', async () => { mockNoiMeetingRepository.find.mockResolvedValue([]); - const result = await service.getByAppFileNumber('non-existing number'); + const result = await service.getByFileNumber('non-existing number'); expect(result).toStrictEqual([]); }); diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-meeting/notice-of-intent-meeting.service.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-meeting/notice-of-intent-meeting.service.ts index 5c7828d596..b1c8962791 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-meeting/notice-of-intent-meeting.service.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-meeting/notice-of-intent-meeting.service.ts @@ -22,22 +22,22 @@ const DEFAULT_RELATIONS: FindOptionsRelations = { export class NoticeOfIntentMeetingService { constructor( @InjectRepository(NoticeOfIntentMeeting) - private noiRepository: Repository, + private noticeOfIntentMeetingRepository: Repository, @InjectRepository(NoticeOfIntentMeetingType) private noiMeetingTypeRepository: Repository, - private noiService: NoticeOfIntentService, + private noticeOfIntentService: NoticeOfIntentService, ) {} - async getByAppFileNumber(number: string): Promise { - const noi = await this.noiService.getOrFailByUuid(number); - return this.noiRepository.find({ - where: { noticeOfIntentUuid: noi.uuid }, + async getByFileNumber(number: string): Promise { + const uuid = await this.noticeOfIntentService.getUuid(number); + return await this.noticeOfIntentMeetingRepository.find({ + where: { noticeOfIntentUuid: uuid }, relations: DEFAULT_RELATIONS, }); } get(uuid) { - return this.noiRepository.findOne({ + return this.noticeOfIntentMeetingRepository.findOne({ where: { uuid }, relations: DEFAULT_RELATIONS, }); @@ -68,7 +68,7 @@ export class NoticeOfIntentMeetingService { : existingMeeting.startDate; existingMeeting.endDate = formatIncomingDate(updateDto.meetingEndDate); - await this.noiRepository.save(existingMeeting); + await this.noticeOfIntentMeetingRepository.save(existingMeeting); return this.get(uuid); } @@ -83,13 +83,15 @@ export class NoticeOfIntentMeetingService { createMeeting.typeCode = meeting.meetingTypeCode; createMeeting.noticeOfIntentUuid = meeting.noticeOfIntentUuid; - const savedMeeting = await this.noiRepository.save(createMeeting); + const savedMeeting = await this.noticeOfIntentMeetingRepository.save( + createMeeting, + ); return this.get(savedMeeting.uuid); } async remove(meeting: NoticeOfIntentMeeting) { - return this.noiRepository.softRemove(meeting); + return this.noticeOfIntentMeetingRepository.softRemove(meeting); } async fetNoticeOfIntentMeetingTypes() { diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-timeline/notice-of-intent-timeline.controller.spec.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-timeline/notice-of-intent-timeline.controller.spec.ts new file mode 100644 index 0000000000..16dc3e6044 --- /dev/null +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-timeline/notice-of-intent-timeline.controller.spec.ts @@ -0,0 +1,49 @@ +import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; +import { Test, TestingModule } from '@nestjs/testing'; +import { ClsService } from 'nestjs-cls'; +import { mockKeyCloakProviders } from '../../../../test/mocks/mockTypes'; +import { NoticeOfIntentTimelineController } from './notice-of-intent-timeline.controller'; +import { NoticeOfIntentTimelineService } from './notice-of-intent-timeline.service'; + +describe('NoticeOfIntentTimelineController', () => { + let controller: NoticeOfIntentTimelineController; + let mockTimelineService: DeepMocked; + + beforeEach(async () => { + mockTimelineService = createMock(); + + const module: TestingModule = await Test.createTestingModule({ + providers: [ + { + provide: NoticeOfIntentTimelineService, + useValue: mockTimelineService, + }, + { + provide: ClsService, + useValue: {}, + }, + ...mockKeyCloakProviders, + ], + controllers: [NoticeOfIntentTimelineController], + }).compile(); + + controller = module.get( + NoticeOfIntentTimelineController, + ); + }); + + it('should be defined', () => { + expect(controller).toBeDefined(); + }); + + it('should call through to get timeline events', async () => { + mockTimelineService.getTimelineEvents.mockResolvedValue([]); + const res = await controller.fetchTimelineEvents('fileNumber'); + + expect(res).toBeDefined(); + expect(mockTimelineService.getTimelineEvents).toHaveBeenCalledTimes(1); + expect(mockTimelineService.getTimelineEvents).toHaveBeenCalledWith( + 'fileNumber', + ); + }); +}); diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-timeline/notice-of-intent-timeline.controller.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-timeline/notice-of-intent-timeline.controller.ts new file mode 100644 index 0000000000..12ecc93e33 --- /dev/null +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-timeline/notice-of-intent-timeline.controller.ts @@ -0,0 +1,20 @@ +import { Controller, Get, Param, UseGuards } from '@nestjs/common'; +import { ApiOAuth2 } from '@nestjs/swagger'; +import * as config from 'config'; +import { AUTH_ROLE } from '../../../common/authorization/roles'; +import { RolesGuard } from '../../../common/authorization/roles-guard.service'; +import { UserRoles } from '../../../common/authorization/roles.decorator'; +import { NoticeOfIntentTimelineService } from './notice-of-intent-timeline.service'; + +@ApiOAuth2(config.get('KEYCLOAK.SCOPES')) +@Controller('notice-of-intent-timeline') +@UseGuards(RolesGuard) +export class NoticeOfIntentTimelineController { + constructor(private noiTimelineService: NoticeOfIntentTimelineService) {} + + @Get('/:fileNumber') + @UserRoles(AUTH_ROLE.ADMIN) + async fetchTimelineEvents(@Param('fileNumber') fileNumber: string) { + return await this.noiTimelineService.getTimelineEvents(fileNumber); + } +} diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-timeline/notice-of-intent-timeline.module.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-timeline/notice-of-intent-timeline.module.ts new file mode 100644 index 0000000000..45ed940a72 --- /dev/null +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-timeline/notice-of-intent-timeline.module.ts @@ -0,0 +1,22 @@ +import { Module } from '@nestjs/common'; +import { TypeOrmModule } from '@nestjs/typeorm'; +import { NoticeOfIntentDecision } from '../../notice-of-intent-decision/notice-of-intent-decision.entity'; +import { NoticeOfIntentModification } from '../../notice-of-intent-decision/notice-of-intent-modification/notice-of-intent-modification.entity'; +import { NoticeOfIntent } from '../notice-of-intent.entity'; +import { NoticeOfIntentModule } from '../notice-of-intent.module'; +import { NoticeOfIntentTimelineController } from './notice-of-intent-timeline.controller'; +import { NoticeOfIntentTimelineService } from './notice-of-intent-timeline.service'; + +@Module({ + imports: [ + TypeOrmModule.forFeature([ + NoticeOfIntent, + NoticeOfIntentModification, + NoticeOfIntentDecision, + ]), + NoticeOfIntentModule, + ], + providers: [NoticeOfIntentTimelineService], + controllers: [NoticeOfIntentTimelineController], +}) +export class NoticeOfIntentTimelineModule {} diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-timeline/notice-of-intent-timeline.service.spec.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-timeline/notice-of-intent-timeline.service.spec.ts new file mode 100644 index 0000000000..6bed075791 --- /dev/null +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-timeline/notice-of-intent-timeline.service.spec.ts @@ -0,0 +1,187 @@ +import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; +import { Test, TestingModule } from '@nestjs/testing'; +import { getRepositoryToken } from '@nestjs/typeorm'; +import { Repository } from 'typeorm'; +import { NoticeOfIntentDecision } from '../../notice-of-intent-decision/notice-of-intent-decision.entity'; +import { NoticeOfIntentModificationOutcomeType } from '../../notice-of-intent-decision/notice-of-intent-modification/notice-of-intent-modification-outcome-type/notice-of-intent-modification-outcome-type.entity'; +import { NoticeOfIntentModification } from '../../notice-of-intent-decision/notice-of-intent-modification/notice-of-intent-modification.entity'; +import { NoticeOfIntentMeetingType } from '../notice-of-intent-meeting/notice-of-intent-meeting-type.entity'; +import { NoticeOfIntentMeeting } from '../notice-of-intent-meeting/notice-of-intent-meeting.entity'; +import { NoticeOfIntentMeetingService } from '../notice-of-intent-meeting/notice-of-intent-meeting.service'; +import { NoticeOfIntent } from '../notice-of-intent.entity'; +import { NoticeOfIntentService } from '../notice-of-intent.service'; +import { NoticeOfIntentTimelineService } from './notice-of-intent-timeline.service'; + +describe('NoticeOfIntentTimelineService', () => { + let service: NoticeOfIntentTimelineService; + let mockNOIRepo: DeepMocked>; + let mockNOIModificationRepo: DeepMocked< + Repository + >; + let mockNOIDecisionRepo: DeepMocked>; + let mockNOIService: DeepMocked; + let mockNOIMeetingService: DeepMocked; + + beforeEach(async () => { + mockNOIRepo = createMock(); + mockNOIModificationRepo = createMock(); + mockNOIDecisionRepo = createMock(); + mockNOIService = createMock(); + mockNOIMeetingService = createMock(); + + const module: TestingModule = await Test.createTestingModule({ + providers: [ + { + provide: getRepositoryToken(NoticeOfIntent), + useValue: mockNOIRepo, + }, + { + provide: getRepositoryToken(NoticeOfIntentModification), + useValue: mockNOIModificationRepo, + }, + { + provide: getRepositoryToken(NoticeOfIntentDecision), + useValue: mockNOIDecisionRepo, + }, + { + provide: NoticeOfIntentService, + useValue: mockNOIService, + }, + { + provide: NoticeOfIntentMeetingService, + useValue: mockNOIMeetingService, + }, + NoticeOfIntentTimelineService, + ], + }).compile(); + + service = module.get( + NoticeOfIntentTimelineService, + ); + + mockNOIRepo.findOneOrFail.mockResolvedValue(new NoticeOfIntent()); + mockNOIDecisionRepo.find.mockResolvedValue([]); + mockNOIModificationRepo.find.mockResolvedValue([]); + mockNOIMeetingService.getByFileNumber.mockResolvedValue([]); + mockNOIService.mapToDtos.mockResolvedValue([]); + }); + + it('should be defined', () => { + expect(service).toBeDefined(); + }); + + it('should return nothing for empty NOI', async () => { + const res = await service.getTimelineEvents('file-number'); + + expect(res).toBeDefined(); + }); + + it('should map NOI events in the correct order', async () => { + const sameDate = new Date(); + mockNOIRepo.findOneOrFail.mockResolvedValue( + new NoticeOfIntent({ + dateReceivedAllItems: sameDate, + feePaidDate: sameDate, + dateAcknowledgedComplete: sameDate, + dateAcknowledgedIncomplete: sameDate, + dateSubmittedToAlc: sameDate, + }), + ); + + const res = await service.getTimelineEvents('file-number'); + + expect(res).toBeDefined(); + expect(res.length).toEqual(5); + expect(res[0].htmlText).toEqual('Acknowledged Complete'); + expect(res[1].htmlText).toEqual('Fee Received Date'); + expect(res[2].htmlText).toEqual('Received All Items'); + expect(res[3].htmlText).toEqual('Acknowledged Incomplete'); + expect(res[4].htmlText).toEqual('Submitted to ALC'); + }); + + it('should map Decision Events', async () => { + const sameDate = new Date(); + mockNOIDecisionRepo.find.mockResolvedValue([ + new NoticeOfIntentDecision({ + date: new Date(sameDate.getTime() + 1000), + auditDate: new Date(sameDate.getTime() + 1000), + }), + new NoticeOfIntentDecision({ + date: sameDate, + auditDate: sameDate, + }), + ]); + mockNOIService.mapToDtos.mockResolvedValue([ + { + activeDays: 5, + } as any, + ]); + + const res = await service.getTimelineEvents('file-number'); + + expect(res).toBeDefined(); + expect(res.length).toEqual(4); + expect(res[3].htmlText).toEqual('Decision #1 Made - Active Days: 5'); + expect(res[2].htmlText).toEqual('Audited Decision #1'); + expect(res[1].htmlText).toEqual('Decision #2 Made'); + expect(res[0].htmlText).toEqual('Audited Decision #2'); + }); + + it('should map Modification Events', async () => { + const sameDate = new Date(); + mockNOIModificationRepo.find.mockResolvedValue([ + new NoticeOfIntentModification({ + submittedDate: new Date(sameDate.getTime() + 1000), + outcomeNotificationDate: new Date(sameDate.getTime() + 1000), + reviewOutcome: { + label: 'CATS', + } as NoticeOfIntentModificationOutcomeType, + }), + new NoticeOfIntentModification({ + submittedDate: sameDate, + outcomeNotificationDate: sameDate, + reviewOutcome: { + label: 'CATS', + } as NoticeOfIntentModificationOutcomeType, + }), + ]); + + const res = await service.getTimelineEvents('file-number'); + + expect(res).toBeDefined(); + expect(res.length).toEqual(4); + expect(res[3].htmlText).toEqual('Modification Requested #1'); + expect(res[2].htmlText).toEqual('Modification Request Reviewed #1 - CATS'); + expect(res[1].htmlText).toEqual('Modification Requested #2'); + expect(res[0].htmlText).toEqual('Modification Request Reviewed #2 - CATS'); + }); + + it('should map Meeting Events', async () => { + const sameDate = new Date(); + mockNOIMeetingService.getByFileNumber.mockResolvedValue([ + new NoticeOfIntentMeeting({ + startDate: new Date(sameDate.getTime() + 1000), + endDate: new Date(sameDate.getTime() + 1000), + type: { + label: 'Meeting', + code: 'CATS', + } as NoticeOfIntentMeetingType, + }), + new NoticeOfIntentMeeting({ + startDate: sameDate, + endDate: sameDate, + type: { + label: 'Meeting', + code: 'CATS', + } as NoticeOfIntentMeetingType, + }), + ]); + + const res = await service.getTimelineEvents('file-number'); + + expect(res).toBeDefined(); + expect(res.length).toEqual(2); + expect(res[1].htmlText).toEqual('Meeting #1'); + expect(res[0].htmlText).toEqual('Meeting #2'); + }); +}); diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-timeline/notice-of-intent-timeline.service.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-timeline/notice-of-intent-timeline.service.ts new file mode 100644 index 0000000000..1f538aebd3 --- /dev/null +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-timeline/notice-of-intent-timeline.service.ts @@ -0,0 +1,267 @@ +import { Injectable } from '@nestjs/common'; +import { InjectRepository } from '@nestjs/typeorm'; +import { Repository } from 'typeorm'; +import { CardSubtask } from '../../card/card-subtask/card-subtask.entity'; +import { NoticeOfIntentDecision } from '../../notice-of-intent-decision/notice-of-intent-decision.entity'; +import { NoticeOfIntentModification } from '../../notice-of-intent-decision/notice-of-intent-modification/notice-of-intent-modification.entity'; +import { NoticeOfIntentMeetingService } from '../notice-of-intent-meeting/notice-of-intent-meeting.service'; +import { NoticeOfIntent } from '../notice-of-intent.entity'; +import { NoticeOfIntentService } from '../notice-of-intent.service'; + +export interface TimelineEvent { + htmlText: string; + startDate: number; + fulfilledDate: number | null; + isFulfilled: boolean; + link?: string | null; +} + +const SORTING_ORDER = { + //high comes first, 1 shows at bottom + MODIFICATION_REVIEW: 12, + MODIFICATION_REQUEST: 11, + CHAIR_REVIEW_DECISION: 10, + AUDITED_DECISION: 9, + DECISION_MADE: 8, + VISIT_REPORTS: 7, + VISIT_REQUESTS: 6, + ACKNOWLEDGE_COMPLETE: 5, + RECEIVED_ALL_ITEMS: 4, + FEE_RECEIVED: 3, + ACKNOWLEDGED_INCOMPLETE: 2, + SUBMITTED: 1, +}; + +const editLink = new Map([['IR', './info-request']]); + +@Injectable() +export class NoticeOfIntentTimelineService { + constructor( + @InjectRepository(NoticeOfIntent) + private noticeOfIntentRepo: Repository, + @InjectRepository(NoticeOfIntentModification) + private noticeOfIntentModificationRepo: Repository, + @InjectRepository(NoticeOfIntentDecision) + private noticeOfIntentDecisionRepo: Repository, + private noticeOfIntentService: NoticeOfIntentService, + private noticeOfIntentMeetingService: NoticeOfIntentMeetingService, + ) {} + + async getTimelineEvents(fileNumber: string) { + const events: TimelineEvent[] = []; + const noticeOfIntent = await this.noticeOfIntentRepo.findOneOrFail({ + where: { + fileNumber, + }, + relations: { + card: { + type: true, + subtasks: { + type: true, + }, + }, + }, + withDeleted: true, + }); + this.addNoticeOfIntentEvents(noticeOfIntent, events); + await this.addDecisionEvents(noticeOfIntent, events); + await this.addModificationEvents(noticeOfIntent, events); + await this.addMeetingEvents(noticeOfIntent, events); + + if (noticeOfIntent.card) { + for (const subtask of noticeOfIntent.card.subtasks) { + const mappedEvent = this.mapSubtaskToEvent(subtask); + events.push(mappedEvent); + } + } + + events.sort((a, b) => b.startDate - a.startDate); + return events; + } + + private addNoticeOfIntentEvents( + noticeOfIntent: NoticeOfIntent, + events: TimelineEvent[], + ) { + if (noticeOfIntent.dateSubmittedToAlc) { + events.push({ + htmlText: 'Submitted to ALC', + startDate: + noticeOfIntent.dateSubmittedToAlc.getTime() + SORTING_ORDER.SUBMITTED, + isFulfilled: true, + fulfilledDate: null, + }); + } + + if (noticeOfIntent.dateAcknowledgedIncomplete) { + events.push({ + htmlText: 'Acknowledged Incomplete', + startDate: + noticeOfIntent.dateAcknowledgedIncomplete.getTime() + + SORTING_ORDER.ACKNOWLEDGED_INCOMPLETE, + isFulfilled: true, + fulfilledDate: null, + }); + } + + if (noticeOfIntent.dateAcknowledgedComplete) { + events.push({ + htmlText: 'Acknowledged Complete', + startDate: + noticeOfIntent.dateAcknowledgedComplete.getTime() + + SORTING_ORDER.ACKNOWLEDGE_COMPLETE, + isFulfilled: true, + fulfilledDate: null, + }); + } + + if (noticeOfIntent.feePaidDate) { + events.push({ + htmlText: 'Fee Received Date', + startDate: + noticeOfIntent.feePaidDate.getTime() + SORTING_ORDER.FEE_RECEIVED, + isFulfilled: true, + fulfilledDate: null, + }); + } + + if (noticeOfIntent.dateReceivedAllItems) { + events.push({ + htmlText: 'Received All Items', + startDate: + noticeOfIntent.dateReceivedAllItems.getTime() + + SORTING_ORDER.FEE_RECEIVED, + isFulfilled: true, + fulfilledDate: null, + }); + } + } + + private mapSubtaskToEvent(subtask: CardSubtask): TimelineEvent { + return { + htmlText: `${subtask.type.label} Subtask`, + fulfilledDate: subtask.completedAt?.getTime() ?? null, + startDate: subtask.createdAt.getTime(), + isFulfilled: !!subtask.completedAt, + }; + } + + private async addDecisionEvents( + noticeOfIntent: NoticeOfIntent, + events: TimelineEvent[], + ) { + const decisions = await this.noticeOfIntentDecisionRepo.find({ + where: { + noticeOfIntentUuid: noticeOfIntent.uuid, + isDraft: false, + }, + order: { + date: 'DESC', + }, + }); + + const mappedNOIs = await this.noticeOfIntentService.mapToDtos([ + noticeOfIntent, + ]); + const mappedNOI = mappedNOIs[0]; + + for (const [index, decision] of decisions.entries()) { + if (decision.auditDate) { + events.push({ + htmlText: `Audited Decision #${decisions.length - index}`, + startDate: + decision.auditDate.getTime() + SORTING_ORDER.AUDITED_DECISION, + fulfilledDate: null, + isFulfilled: true, + }); + } + + events.push({ + htmlText: `Decision #${decisions.length - index} Made${ + decisions.length - 1 === index + ? ` - Active Days: ${mappedNOI.activeDays}` + : '' + }`, + startDate: decision.date!.getTime() + SORTING_ORDER.DECISION_MADE, + fulfilledDate: null, + isFulfilled: true, + }); + } + } + + private async addModificationEvents( + noticeOfIntent: NoticeOfIntent, + events: TimelineEvent[], + ) { + const modifications = await this.noticeOfIntentModificationRepo.find({ + where: { + noticeOfIntentUuid: noticeOfIntent.uuid, + }, + relations: { + card: { + subtasks: { + type: true, + }, + }, + }, + order: { + submittedDate: 'DESC', + }, + }); + + for (const [index, modification] of modifications.entries()) { + events.push({ + htmlText: `Modification Requested #${modifications.length - index}`, + startDate: + modification.submittedDate.getTime() + + SORTING_ORDER.MODIFICATION_REQUEST, + fulfilledDate: null, + isFulfilled: true, + }); + + if (modification.card) { + for (const subtask of modification.card.subtasks) { + const mappedEvent = this.mapSubtaskToEvent(subtask); + events.push(mappedEvent); + } + } + + if (modification.outcomeNotificationDate) { + events.push({ + htmlText: `Modification Request Reviewed #${ + modifications.length - index + } - ${modification.reviewOutcome.label}`, + startDate: + modification.outcomeNotificationDate.getTime() + + SORTING_ORDER.MODIFICATION_REVIEW, + fulfilledDate: null, + isFulfilled: true, + }); + } + } + } + + private async addMeetingEvents( + noticeOfIntent: NoticeOfIntent, + events: TimelineEvent[], + ) { + const meetings = await this.noticeOfIntentMeetingService.getByFileNumber( + noticeOfIntent.fileNumber, + ); + + meetings.sort((a, b) => a.startDate.getTime() - b.startDate.getTime()); + const typeCount = new Map(); + meetings.forEach((meeting) => { + const count = typeCount.get(meeting.type.code) || 0; + events.push({ + htmlText: `${meeting.type.label} #${count + 1}`, + startDate: meeting.startDate.getTime() + SORTING_ORDER.VISIT_REQUESTS, + fulfilledDate: meeting.endDate?.getTime() ?? null, + isFulfilled: !!meeting.endDate, + link: editLink.get(meeting.type.code), + }); + + typeCount.set(meeting.type.code, count + 1); + }); + } +} diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.module.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.module.ts index 48f54d1834..5c73a57a42 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.module.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.module.ts @@ -1,9 +1,12 @@ import { forwardRef, Module } from '@nestjs/common'; import { TypeOrmModule } from '@nestjs/typeorm'; +import { NoticeOfIntentParcelProfile } from '../../common/automapper/notice-of-intent-parcel.automapper.profile'; import { NoticeOfIntentProfile } from '../../common/automapper/notice-of-intent.automapper.profile'; import { DocumentCode } from '../../document/document-code.entity'; import { DocumentModule } from '../../document/document.module'; import { FileNumberModule } from '../../file-number/file-number.module'; +import { NoticeOfIntentSubmission } from '../../portal/notice-of-intent-submission/notice-of-intent-submission.entity'; +import { NoticeOfIntentSubmissionModule } from '../../portal/notice-of-intent-submission/notice-of-intent-submission.module'; import { BoardModule } from '../board/board.module'; import { CardModule } from '../card/card.module'; import { NoticeOfIntentType } from '../code/application-code/notice-of-intent-type/notice-of-intent-type.entity'; @@ -12,26 +15,19 @@ import { LocalGovernmentModule } from '../local-government/local-government.modu import { NoticeOfIntentDocumentController } from './notice-of-intent-document/notice-of-intent-document.controller'; import { NoticeOfIntentDocument } from './notice-of-intent-document/notice-of-intent-document.entity'; import { NoticeOfIntentDocumentService } from './notice-of-intent-document/notice-of-intent-document.service'; - import { NoticeOfIntentMeetingType } from './notice-of-intent-meeting/notice-of-intent-meeting-type.entity'; import { NoticeOfIntentMeetingController } from './notice-of-intent-meeting/notice-of-intent-meeting.controller'; import { NoticeOfIntentMeeting } from './notice-of-intent-meeting/notice-of-intent-meeting.entity'; import { NoticeOfIntentMeetingService } from './notice-of-intent-meeting/notice-of-intent-meeting.service'; +import { NoticeOfIntentParcelController } from './notice-of-intent-parcel/notice-of-intent-parcel.controller'; +import { NoticeOfIntentSubmissionStatusType } from './notice-of-intent-submission-status/notice-of-intent-status-type.entity'; import { NoticeOfIntentSubmissionStatusModule } from './notice-of-intent-submission-status/notice-of-intent-submission-status.module'; -import { NoticeOfIntentController } from './notice-of-intent.controller'; - +import { NoticeOfIntentSubmissionController } from './notice-of-intent-submission/notice-of-intent-submission.controller'; +import { NoticeOfIntentSubmissionService } from './notice-of-intent-submission/notice-of-intent-submission.service'; import { NoticeOfIntentSubtype } from './notice-of-intent-subtype.entity'; - +import { NoticeOfIntentController } from './notice-of-intent.controller'; import { NoticeOfIntent } from './notice-of-intent.entity'; import { NoticeOfIntentService } from './notice-of-intent.service'; -import { NoticeOfIntentSubmissionService } from './notice-of-intent-submission/notice-of-intent-submission.service'; -import { NoticeOfIntentSubmissionController } from './notice-of-intent-submission/notice-of-intent-submission.controller'; -import { NoticeOfIntentSubmission } from '../../portal/notice-of-intent-submission/notice-of-intent-submission.entity'; -import { NoticeOfIntentSubmissionStatusType } from './notice-of-intent-submission-status/notice-of-intent-status-type.entity'; -import { NoticeOfIntentParcelController } from './notice-of-intent-parcel/notice-of-intent-parcel.controller'; -import { NoticeOfIntentSubmissionModule } from '../../portal/notice-of-intent-submission/notice-of-intent-submission.module'; -import { NoticeOfIntentParcel } from '../../portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.entity'; -import { NoticeOfIntentParcelProfile } from '../../common/automapper/notice-of-intent-parcel.automapper.profile'; @Module({ imports: [ diff --git a/services/apps/alcs/src/main.module.ts b/services/apps/alcs/src/main.module.ts index dcfb85af1c..552a4ed0b2 100644 --- a/services/apps/alcs/src/main.module.ts +++ b/services/apps/alcs/src/main.module.ts @@ -20,10 +20,10 @@ import { HealthCheck } from './healthcheck/healthcheck.entity'; import { LogoutController } from './logout/logout.controller'; import { MainController } from './main.controller'; import { MainService } from './main.service'; +import { NoticeOfIntentSubmissionModule } from './portal/notice-of-intent-submission/notice-of-intent-submission.module'; import { PortalModule } from './portal/portal.module'; import { TypeormConfigService } from './providers/typeorm/typeorm.service'; import { UserModule } from './user/user.module'; -import { NoticeOfIntentSubmissionModule } from './portal/notice-of-intent-submission/notice-of-intent-submission.module'; @Module({ imports: [ From 540f2702f9f0dec4ef3d56c39a0eb2ecbb5f21f8 Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Tue, 29 Aug 2023 10:49:33 -0700 Subject: [PATCH 316/954] Rename Application -> Notice of Intent (#919) --- .../notice-of-intent-details.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/notice-of-intent-details.component.html b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/notice-of-intent-details.component.html index 4034ed7785..8f7549b022 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/notice-of-intent-details.component.html +++ b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/notice-of-intent-details.component.html @@ -66,7 +66,7 @@

Primary Contact Information

Land Use

-

Land Use of Parcel(s) under Application

+

Land Use of Parcel(s) under Notice of Intent

Quantify and describe in detail all agriculture that currently takes place on the parcel(s). From 137f711ad5d15715963eb46165a813c03aec5aaa Mon Sep 17 00:00:00 2001 From: Liam Stoddard Date: Tue, 29 Aug 2023 11:29:51 -0700 Subject: [PATCH 317/954] MR feedback --- .../submissions/app_submissions.py | 23 ++++++++++++++----- 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/bin/migrate-oats-data/submissions/app_submissions.py b/bin/migrate-oats-data/submissions/app_submissions.py index bdbea88c6e..99c096b66c 100644 --- a/bin/migrate-oats-data/submissions/app_submissions.py +++ b/bin/migrate-oats-data/submissions/app_submissions.py @@ -64,10 +64,9 @@ def process_alcs_app_submissions(conn=None, batch_size=BATCH_UPLOAD_SIZE): if not rows: break try: - adj_rows = get_directions_rows(rows, cursor) - direction_data = create_direction_dict(adj_rows) - subdiv_rows = get_subdiv_rows(rows, cursor) - subdiv_data = create_subdiv_dict(subdiv_rows) + + direction_data = get_direction_data(rows, cursor) + subdiv_data = get_subdiv_data(rows, cursor) submissions_to_be_inserted_count = len(rows) @@ -105,7 +104,7 @@ def insert_app_sub_records(conn, batch_size, cursor, rows, direction_data, subdi cursor (obj): Cursor object to execute queries. rows (list): Rows of data to insert in the database. direction_data (dict): Dictionary of adjacent parcel data - subdiv_data: list of subdivision data + subdiv_data: dictionary of subdivision data lists Returns: None: Commits the changes to the database. @@ -148,7 +147,7 @@ def prepare_app_sub_data(app_sub_raw_data_list, direction_data, subdiv_data): :param app_sub_raw_data_list: A list of raw data dictionaries. :param direction_data: A dictionary of adjacent parcel data. - :param subdiv_data: list of subdivision data + :param subdiv_data: dictionary of subdivision data lists :return: Five lists, each containing dictionaries from 'app_sub_raw_data_list' and 'direction_data' grouped based on the 'alr_change_code' field Detailed Workflow: @@ -232,6 +231,18 @@ def get_insert_query_for_inc_exc(): unique_values = ", %(alr_area)s" return get_insert_query(unique_fields,unique_values) +def get_direction_data(rows, cursor): + # runs query to get direction data and creates a dict based on alr_application_id + adj_rows = get_directions_rows(rows, cursor) + direction_data = create_direction_dict(adj_rows) + return direction_data + +def get_subdiv_data(rows, cursor): + # runs query to get subdivision data and creates a dictionaly based on alr_appl_component_id with a list of plots + subdiv_rows = get_subdiv_rows(rows, cursor) + subdiv_data = create_subdiv_dict(subdiv_rows) + return subdiv_data + @inject_conn_pool def clean_application_submission(conn=None): From 645be838b13b0888b0106b97b16f9ff5b2f46a18 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Tue, 29 Aug 2023 11:46:42 -0700 Subject: [PATCH 318/954] Fix Edit Submission Updated banners * Add special exception to local government uuid * Pass original submission UUID to app-details so it can be used by parcels --- .../src/app/features/application/overview/overview.component.ts | 1 - .../alcs-edit-submission/alcs-edit-submission.component.ts | 2 +- .../select-government/select-government.component.ts | 1 - .../alcs-edit-submission/alcs-edit-submission.component.html | 2 ++ .../alcs-edit-submission/alcs-edit-submission.component.ts | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) diff --git a/alcs-frontend/src/app/features/application/overview/overview.component.ts b/alcs-frontend/src/app/features/application/overview/overview.component.ts index 04655eb1aa..435265d389 100644 --- a/alcs-frontend/src/app/features/application/overview/overview.component.ts +++ b/alcs-frontend/src/app/features/application/overview/overview.component.ts @@ -53,7 +53,6 @@ export class OverviewComponent implements OnInit, OnDestroy { title: 'Cancel Application', }) .subscribe(async (didConfirm) => { - debugger; if (didConfirm && this.application) { await this.applicationDetailService.cancelApplication(this.application.fileNumber); await this.loadStatusHistory(this.application.fileNumber); diff --git a/portal-frontend/src/app/features/applications/alcs-edit-submission/alcs-edit-submission.component.ts b/portal-frontend/src/app/features/applications/alcs-edit-submission/alcs-edit-submission.component.ts index 3fdefdbced..4ba097f60f 100644 --- a/portal-frontend/src/app/features/applications/alcs-edit-submission/alcs-edit-submission.component.ts +++ b/portal-frontend/src/app/features/applications/alcs-edit-submission/alcs-edit-submission.component.ts @@ -129,7 +129,7 @@ export class AlcsEditSubmissionComponent implements OnInit, OnDestroy, AfterView const changedFields = new Set(); for (const diff of diffResult) { const fullPath = diff.path.join('.'); - if (!fullPath.toLowerCase().includes('uuid')) { + if (!fullPath.toLowerCase().includes('uuid') || fullPath === 'localGovernmentUuid') { changedFields.add(diff.path.join('.')); changedFields.add(diff.path[0].toString()); } diff --git a/portal-frontend/src/app/features/applications/edit-submission/select-government/select-government.component.ts b/portal-frontend/src/app/features/applications/edit-submission/select-government/select-government.component.ts index 2fb8d05845..522ca5f4c6 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/select-government/select-government.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/select-government/select-government.component.ts @@ -1,7 +1,6 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; import { FormControl, FormGroup, Validators } from '@angular/forms'; import { MatAutocompleteSelectedEvent } from '@angular/material/autocomplete'; -import { Router } from '@angular/router'; import { map, Observable, startWith, takeUntil } from 'rxjs'; import { ApplicationSubmissionService } from '../../../../services/application-submission/application-submission.service'; import { LocalGovernmentDto } from '../../../../services/code/code.dto'; diff --git a/portal-frontend/src/app/features/notice-of-intents/alcs-edit-submission/alcs-edit-submission.component.html b/portal-frontend/src/app/features/notice-of-intents/alcs-edit-submission/alcs-edit-submission.component.html index 00dacfed36..16a75b21e2 100644 --- a/portal-frontend/src/app/features/notice-of-intents/alcs-edit-submission/alcs-edit-submission.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/alcs-edit-submission/alcs-edit-submission.component.html @@ -135,10 +135,12 @@
Notice of Intent ID: {{ noiSubmission.fileNumber }} |
diff --git a/portal-frontend/src/app/features/notice-of-intents/alcs-edit-submission/alcs-edit-submission.component.ts b/portal-frontend/src/app/features/notice-of-intents/alcs-edit-submission/alcs-edit-submission.component.ts index 553bf9cf93..f9ab4ae5c9 100644 --- a/portal-frontend/src/app/features/notice-of-intents/alcs-edit-submission/alcs-edit-submission.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/alcs-edit-submission/alcs-edit-submission.component.ts @@ -230,7 +230,7 @@ export class AlcsEditSubmissionComponent implements OnInit, OnDestroy, AfterView const changedFields = new Set(); for (const diff of diffResult) { const fullPath = diff.path.join('.'); - if (!fullPath.toLowerCase().includes('uuid')) { + if (!fullPath.toLowerCase().includes('uuid') || fullPath === 'localGovernmentUuid') { changedFields.add(diff.path.join('.')); changedFields.add(diff.path[0].toString()); } From a26c998edeb6dc8747b4467d6e31644a0c153b53 Mon Sep 17 00:00:00 2001 From: "to. sandra" <76515860+sandratoh@users.noreply.github.com> Date: Tue, 29 Aug 2023 13:13:15 -0700 Subject: [PATCH 319/954] Update font styling and date format (#922) --- .../decision-documents.component.html | 2 +- .../shared/lots-table/lots-table-form.component.html | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-documents/decision-documents.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-documents/decision-documents.component.html index 351641d7a0..d71013bc1c 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-documents/decision-documents.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-documents/decision-documents.component.html @@ -49,7 +49,7 @@

Documents

 - + diff --git a/alcs-frontend/src/app/shared/lots-table/lots-table-form.component.html b/alcs-frontend/src/app/shared/lots-table/lots-table-form.component.html index 3b6f7159b9..0807552a36 100644 --- a/alcs-frontend/src/app/shared/lots-table/lots-table-form.component.html +++ b/alcs-frontend/src/app/shared/lots-table/lots-table-form.component.html @@ -1,5 +1,5 @@
-
+
Total Number of Proposed Lots Approved Lot Areas
{{ event.startDate | momentFormat }} - {{ event.fulfilledDate | momentFormat }} - - Add date + {{ event.fulfilledDate | momentFormat }} + + Add date + - Upload Date{{ element.uploadedAt | date }}{{ element.uploadedAt | momentFormat }}
- + - + + + diff --git a/portal-frontend/src/app/features/applications/view-submission/alc-review/submission-documents/submission-documents.component.ts b/portal-frontend/src/app/features/applications/view-submission/alc-review/submission-documents/submission-documents.component.ts index e833e82712..027fbdbfea 100644 --- a/portal-frontend/src/app/features/applications/view-submission/alc-review/submission-documents/submission-documents.component.ts +++ b/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(event.target); + downloadLink.style.display = 'none'; + document.body.appendChild(downloadLink); + } + downloadLink.click(); + } + } + ngOnDestroy(): void { this.$destroy.next(); this.$destroy.complete(); diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/select-government/select-government.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/select-government/select-government.component.html index 33dcb4ec8d..3428d17d01 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/select-government/select-government.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/select-government/select-government.component.html @@ -45,11 +45,6 @@

Government

submit, you will need to contact the ALC directly:  ALC.Portal@gov.bc.ca / 236-468-3342 - - 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. -

Please Note: If your Local or First Nation Government is not listed, please contact the ALC directly. ALC.Portal@gov.bc.ca / 236-468-3342 diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/select-government/select-government.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/select-government/select-government.component.ts index 8188a55e2f..9cef1882b8 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/select-government/select-government.component.ts +++ b/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('', [Validators.required]); showWarning = false; - selectedOwnGovernment = false; selectGovernmentUuid = ''; localGovernments: LocalGovernmentDto[] = []; filteredLocalGovernments!: Observable; @@ -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; } } } diff --git a/portal-frontend/src/app/services/application-document/application-document.service.ts b/portal-frontend/src/app/services/application-document/application-document.service.ts index 41067bf26d..0a2b78c846 100644 --- a/portal-frontend/src/app/services/application-document/application-document.service.ts +++ b/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(); diff --git a/services/apps/alcs/src/common/automapper/application-decision-v2.automapper.profile.ts b/services/apps/alcs/src/common/automapper/application-decision-v2.automapper.profile.ts index 6a2f91c2b8..a13110717f 100644 --- a/services/apps/alcs/src/common/automapper/application-decision-v2.automapper.profile.ts +++ b/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) => diff --git a/services/apps/alcs/src/portal/application-decision/application-decision.dto.ts b/services/apps/alcs/src/portal/application-decision/application-decision.dto.ts index 755da4b7ca..2c1a9f6014 100644 --- a/services/apps/alcs/src/portal/application-decision/application-decision.dto.ts +++ b/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) diff --git a/services/apps/alcs/src/portal/application-document/application-document.controller.spec.ts b/services/apps/alcs/src/portal/application-document/application-document.controller.spec.ts index 1df45859b0..27622efa17 100644 --- a/services/apps/alcs/src/portal/application-document/application-document.controller.spec.ts +++ b/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'; diff --git a/services/apps/alcs/src/portal/application-document/application-document.controller.ts b/services/apps/alcs/src/portal/application-document/application-document.controller.ts index 239388c06c..23fd7567fe 100644 --- a/services/apps/alcs/src/portal/application-document/application-document.controller.ts +++ b/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, From 8359e374e0a1797deebeb09cbc4dfaf3ac7ec2f0 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Thu, 31 Aug 2023 10:35:09 -0700 Subject: [PATCH 325/954] Bug Fixes Pt3 * Change componentLabels -> componentLabelsStr to prevent the labels from disappearing on both NOI and Application Conditions pages when updating * Add an extra check to allow 33.1 recons to not require approval to be used as links * Mark the decision components as touched when validating so they show red error borders * Load components attached to conditions so they show on the NOI conditions page --- .../decision/conditions/condition/condition.component.ts | 4 ++-- .../decision-input/decision-input-v2.component.ts | 8 ++++++-- .../decision/conditions/condition/condition.component.ts | 8 ++------ .../decision/conditions/conditions.component.ts | 2 -- .../decision-components/decision-components.component.ts | 4 ++++ .../decision-input/decision-input-v2.component.ts | 3 +++ .../notice-of-intent-decision-v2.controller.ts | 1 - .../notice-of-intent-decision-v2.service.ts | 1 + 8 files changed, 18 insertions(+), 13 deletions(-) diff --git a/alcs-frontend/src/app/features/application/decision/conditions/condition/condition.component.ts b/alcs-frontend/src/app/features/application/decision/conditions/condition/condition.component.ts index c445216b08..982dbf0370 100644 --- a/alcs-frontend/src/app/features/application/decision/conditions/condition/condition.component.ts +++ b/alcs-frontend/src/app/features/application/decision/conditions/condition/condition.component.ts @@ -134,8 +134,8 @@ export class ConditionComponent implements OnInit, AfterViewInit { [field]: value, }); - const labels = this.condition.componentLabels; - this.condition = { ...update, componentLabels: labels } as Condition; + const labels = this.condition.componentLabelsStr; + this.condition = { ...update, componentLabelsStr: labels } as Condition; this.updateStatus(); } diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.ts index 672049a355..073a1059cf 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.ts @@ -8,7 +8,10 @@ import { combineLatestWith, Subject, takeUntil } from 'rxjs'; import { ApplicationDetailService } from '../../../../../services/application/application-detail.service'; import { ApplicationModificationDto } from '../../../../../services/application/application-modification/application-modification.dto'; import { ApplicationModificationService } from '../../../../../services/application/application-modification/application-modification.service'; -import { ApplicationReconsiderationDto } from '../../../../../services/application/application-reconsideration/application-reconsideration.dto'; +import { + ApplicationReconsiderationDto, + RECONSIDERATION_TYPE, +} from '../../../../../services/application/application-reconsideration/application-reconsideration.dto'; import { ApplicationReconsiderationService } from '../../../../../services/application/application-reconsideration/application-reconsideration.service'; import { ApplicationDecisionConditionDto, @@ -260,7 +263,8 @@ export class DecisionInputV2Component implements OnInit, OnDestroy { .filter( (reconsideration) => (existingDecision && existingDecision.reconsiders?.uuid === reconsideration.uuid) || - (reconsideration.reviewOutcome?.code === 'PRC' && !reconsideration.resultingDecision) + (reconsideration.reviewOutcome?.code === 'PRC' && !reconsideration.resultingDecision) || + (reconsideration.type.code === RECONSIDERATION_TYPE.T_33_1 && !reconsideration.resultingDecision) ) .map((reconsideration, index) => ({ label: `Reconsideration Request #${reconsiderations.length - index} - ${reconsideration.reconsideredDecisions diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/conditions/condition/condition.component.ts b/alcs-frontend/src/app/features/notice-of-intent/decision/conditions/condition/condition.component.ts index 975703b4f6..2f5e487808 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/decision/conditions/condition/condition.component.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/conditions/condition/condition.component.ts @@ -61,8 +61,8 @@ export class ConditionComponent implements OnInit, AfterViewInit { [field]: value, }); - const labels = this.condition.componentLabels; - this.condition = { ...update, componentLabels: labels } as Condition; + const labels = this.condition.componentLabelsStr; + this.condition = { ...update, componentLabelsStr: labels } as Condition; this.updateStatus(); } @@ -93,8 +93,4 @@ export class ConditionComponent implements OnInit, AfterViewInit { this.conditionStatus = CONDITION_STATUS.INCOMPLETE; } } - - getComponentLabel(componentUuid: string) { - return this.condition.conditionComponentsLabels?.find((e) => e.componentUuid === componentUuid)?.label; - } } diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/conditions/conditions.component.ts b/alcs-frontend/src/app/features/notice-of-intent/decision/conditions/conditions.component.ts index 0d64ea2980..174497db5a 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/decision/conditions/conditions.component.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/conditions/conditions.component.ts @@ -13,7 +13,6 @@ import { NoticeOfIntentDto } from '../../../../services/notice-of-intent/notice- import { DRAFT_DECISION_TYPE_LABEL, MODIFICATION_TYPE_LABEL, - RECON_TYPE_LABEL, RELEASED_DECISION_TYPE_LABEL, } from '../../../../shared/application-type-pill/application-type-pill.constants'; @@ -56,7 +55,6 @@ export class ConditionsComponent implements OnInit { dratDecisionLabel = DRAFT_DECISION_TYPE_LABEL; releasedDecisionLabel = RELEASED_DECISION_TYPE_LABEL; - reconLabel = RECON_TYPE_LABEL; modificationLabel = MODIFICATION_TYPE_LABEL; constructor( diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-components.component.ts b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-components.component.ts index f8f325536f..259a47b70d 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-components.component.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-components.component.ts @@ -212,4 +212,8 @@ export class DecisionComponentsComponent implements OnInit, OnDestroy, AfterView isDisabled: this.components.some((c) => c.noticeOfIntentDecisionComponentTypeCode === e.code), })); } + + onValidate() { + this.childComponents.forEach((component) => component.form.markAllAsTouched()); + } } diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-input-v2.component.ts b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-input-v2.component.ts index 4b1294a72b..2b2987090e 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-input-v2.component.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-input-v2.component.ts @@ -380,6 +380,9 @@ export class DecisionInputV2Component implements OnInit, OnDestroy { if (this.decisionConditionsComponent) { this.decisionConditionsComponent.onValidate(); } + if (this.decisionComponentsComponent) { + this.decisionComponentsComponent.onValidate(); + } if ( !this.form.valid || diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.controller.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.controller.ts index 0e4f59b396..38edcfad1c 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.controller.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.controller.ts @@ -37,7 +37,6 @@ import { generateALCDNoticeOfIntentHtml } from '../../../../../../templates/emai import { NOI_SUBMISSION_STATUS } from '../../notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status.dto'; import { PARENT_TYPE } from '../../card/card-subtask/card-subtask.dto'; import { NoticeOfIntentSubmissionService } from '../../../portal/notice-of-intent-submission/notice-of-intent-submission.service'; -import { NoticeOfIntentSubmission } from '../../../portal/notice-of-intent-submission/notice-of-intent-submission.entity'; @ApiOAuth2(config.get('KEYCLOAK.SCOPES')) @Controller('notice-of-intent-decision/v2') diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.service.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.service.ts index 98c7b0b662..ed7a81cec8 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.service.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.service.ts @@ -98,6 +98,7 @@ export class NoticeOfIntentDecisionV2Service { }, conditions: { type: true, + components: true, }, }, }); From 7e012b8fe3c91b0e094b46653b068b28b36c9ce6 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Thu, 31 Aug 2023 11:27:48 -0700 Subject: [PATCH 326/954] Change valueChange -> Change This prevents calling form.patchvalue from immediately calling the hooked functions, which we don't want. --- .../proposal/pfrs-proposal/pfrs-proposal.component.html | 6 +++--- .../proposal/roso-proposal/roso-proposal.component.html | 2 +- .../proposal/pfrs/pfrs-proposal.component.html | 8 ++++---- .../proposal/pofo/pofo-proposal.component.html | 4 ++-- .../proposal/roso/roso-proposal.component.html | 8 ++++---- .../proposal/roso/roso-proposal.component.ts | 2 ++ 6 files changed, 16 insertions(+), 14 deletions(-) diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.html index d795b5f5f6..a2ef832778 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.html @@ -32,7 +32,7 @@

Proposal

@@ -351,7 +351,7 @@

Project Duration

@@ -385,7 +385,7 @@

Project Duration

diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.html index 6364510f0f..7f4871db55 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.html @@ -32,7 +32,7 @@

Proposal

diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pfrs/pfrs-proposal.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pfrs/pfrs-proposal.component.html index a97858ac91..602553c586 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pfrs/pfrs-proposal.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pfrs/pfrs-proposal.component.html @@ -32,7 +32,7 @@

Proposal

@@ -270,7 +270,7 @@

Project Duration

@@ -299,7 +299,7 @@

Project Duration

@@ -373,7 +373,7 @@

Project Duration

diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pofo/pofo-proposal.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pofo/pofo-proposal.component.html index 2598f55750..f70fd5e041 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pofo/pofo-proposal.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pofo/pofo-proposal.component.html @@ -32,7 +32,7 @@

Proposal

@@ -214,7 +214,7 @@

Project Duration

diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.html index 00e3d6ec48..eaa73a7444 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.html @@ -32,7 +32,7 @@

Proposal

@@ -201,7 +201,7 @@

Project Duration

@@ -275,9 +275,9 @@

Project Duration

Date: Thu, 31 Aug 2023 13:26:29 -0700 Subject: [PATCH 327/954] Change L/FNG Review to only call save when components are dirty * Also don't reload application / documents / etc when changing steps --- .../review-contact-information.component.html | 1 + .../review-contact-information.component.ts | 2 +- .../review-ocp/review-ocp.component.ts | 2 +- .../review-resolution.component.ts | 2 +- .../review-submission.component.ts | 33 ++++++++++--------- .../review-zoning/review-zoning.component.ts | 2 +- ...pplication-submission-review.controller.ts | 4 ++- .../typeorm/datasource.cli.orm.config.ts | 1 + 8 files changed, 27 insertions(+), 20 deletions(-) diff --git a/portal-frontend/src/app/features/applications/review-submission/review-contact-information/review-contact-information.component.html b/portal-frontend/src/app/features/applications/review-submission/review-contact-information/review-contact-information.component.html index 72c324e640..fc0977ce8c 100644 --- a/portal-frontend/src/app/features/applications/review-submission/review-contact-information/review-contact-information.component.html +++ b/portal-frontend/src/app/features/applications/review-submission/review-contact-information/review-contact-information.component.html @@ -70,6 +70,7 @@

Contact Information

placeholder="Type phone number" formControlName="phoneNumber" mask="(000) 000-0000" + type="tel" />
diff --git a/portal-frontend/src/app/features/applications/review-submission/review-contact-information/review-contact-information.component.ts b/portal-frontend/src/app/features/applications/review-submission/review-contact-information/review-contact-information.component.ts index 40644c8efe..657196a7bd 100644 --- a/portal-frontend/src/app/features/applications/review-submission/review-contact-information/review-contact-information.component.ts +++ b/portal-frontend/src/app/features/applications/review-submission/review-contact-information/review-contact-information.component.ts @@ -70,7 +70,7 @@ export class ReviewContactInformationComponent implements OnInit, OnDestroy { } private async saveProgress() { - if (this.fileId) { + if (this.fileId && this.contactForm.dirty) { await this.applicationReviewService.update(this.fileId, { localGovernmentFileNumber: this.lgFileNumber.getRawValue(), firstName: this.firstName.getRawValue(), diff --git a/portal-frontend/src/app/features/applications/review-submission/review-ocp/review-ocp.component.ts b/portal-frontend/src/app/features/applications/review-submission/review-ocp/review-ocp.component.ts index 76305b82c6..043b41b517 100644 --- a/portal-frontend/src/app/features/applications/review-submission/review-ocp/review-ocp.component.ts +++ b/portal-frontend/src/app/features/applications/review-submission/review-ocp/review-ocp.component.ts @@ -69,7 +69,7 @@ export class ReviewOcpComponent implements OnInit, OnDestroy { } private async saveProgress() { - if (this.fileId) { + if (this.fileId && this.ocpForm.dirty) { const ocpDesignation = this.isOCPDesignation.getRawValue(); let ocpDesignationResult = null; if (ocpDesignation !== null) { diff --git a/portal-frontend/src/app/features/applications/review-submission/review-resolution/review-resolution.component.ts b/portal-frontend/src/app/features/applications/review-submission/review-resolution/review-resolution.component.ts index ada417fcd3..ecf6b13591 100644 --- a/portal-frontend/src/app/features/applications/review-submission/review-resolution/review-resolution.component.ts +++ b/portal-frontend/src/app/features/applications/review-submission/review-resolution/review-resolution.component.ts @@ -61,7 +61,7 @@ export class ReviewResolutionComponent implements OnInit, OnDestroy { } private async saveProgress() { - if (this.fileId) { + if (this.fileId && this.resolutionForm.dirty) { if (this.isAuthorized.getRawValue() !== null) { if (this.isFirstNationGovernment || this.isSubjectToZoning || this.isOCPDesignation) { await this.applicationReviewService.update(this.fileId, { diff --git a/portal-frontend/src/app/features/applications/review-submission/review-submission.component.ts b/portal-frontend/src/app/features/applications/review-submission/review-submission.component.ts index 8948e8625a..e9360b815d 100644 --- a/portal-frontend/src/app/features/applications/review-submission/review-submission.component.ts +++ b/portal-frontend/src/app/features/applications/review-submission/review-submission.component.ts @@ -82,6 +82,12 @@ export class ReviewSubmissionComponent implements OnInit, OnDestroy { .subscribe(([queryParamMap, paramMap]) => { const fileId = paramMap.get('fileId'); if (fileId) { + if (this.fileId !== fileId) { + this.loadApplication(fileId); + this.loadApplicationDocuments(fileId); + this.loadApplicationReview(fileId); + } + this.fileId = fileId; const stepInd = paramMap.get('stepInd'); @@ -90,27 +96,24 @@ export class ReviewSubmissionComponent implements OnInit, OnDestroy { this.showValidationErrors = showErrors === 't'; } - this.loadApplication(fileId); - this.loadApplicationDocuments(fileId); - this.loadApplicationReview(fileId).then(() => { - if (stepInd) { - // setTimeout is required for stepper to be initialized - setTimeout(() => { - const stepInt = parseInt(stepInd); - this.customStepper.navigateToStep(stepInt, true); - - this.showDownloadPdf = this.isFirstNationGovernment - ? stepInt === ReviewApplicationFngSteps.ReviewAndSubmitFng - : stepInt === ReviewApplicationSteps.ReviewAndSubmit; - }); - } - }); + if (stepInd) { + // setTimeout is required for stepper to be initialized + setTimeout(() => { + const stepInt = parseInt(stepInd); + this.customStepper.navigateToStep(stepInt, true); + + this.showDownloadPdf = this.isFirstNationGovernment + ? stepInt === ReviewApplicationFngSteps.ReviewAndSubmitFng + : stepInt === ReviewApplicationSteps.ReviewAndSubmit; + }); + } } }); this.$application.pipe(takeUntil(this.$destroy)).subscribe((application) => { this.application = application; }); + this.applicationReviewService.$applicationReview.pipe(takeUntil(this.$destroy)).subscribe((appReview) => { this.isFirstNationGovernment = appReview?.isFirstNationGovernment ?? false; }); diff --git a/portal-frontend/src/app/features/applications/review-submission/review-zoning/review-zoning.component.ts b/portal-frontend/src/app/features/applications/review-submission/review-zoning/review-zoning.component.ts index 7da567bed9..dd84e353e9 100644 --- a/portal-frontend/src/app/features/applications/review-submission/review-zoning/review-zoning.component.ts +++ b/portal-frontend/src/app/features/applications/review-submission/review-zoning/review-zoning.component.ts @@ -73,7 +73,7 @@ export class ReviewZoningComponent implements OnInit, OnDestroy { } private async saveProgress() { - if (this.fileId) { + if (this.fileId && this.zoningForm.dirty) { const isSubjectToZoning = this.isSubjectToZoning.getRawValue(); let subjectToZoningResult = null; if (isSubjectToZoning !== null) { diff --git a/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.ts b/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.ts index 777229b76c..12da1943ed 100644 --- a/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.ts +++ b/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.ts @@ -265,7 +265,9 @@ export class ApplicationSubmissionReviewController { if (!validationResult.application) { throw new BaseServiceException( - `Invalid application found during LG Submission ${application.fileNumber}`, + `Invalid application found during LG Submission ${ + application.fileNumber + } ${validationResult.errors.toString()}`, ); } diff --git a/services/apps/alcs/src/providers/typeorm/datasource.cli.orm.config.ts b/services/apps/alcs/src/providers/typeorm/datasource.cli.orm.config.ts index c4ce58f6a0..32f17e8c50 100644 --- a/services/apps/alcs/src/providers/typeorm/datasource.cli.orm.config.ts +++ b/services/apps/alcs/src/providers/typeorm/datasource.cli.orm.config.ts @@ -20,4 +20,5 @@ export const connectionSource = new DataSource({ migrations: [join(__dirname, '**', 'migrations/*{.ts,.js}')], namingStrategy: new SnakeNamingStrategy(), uuidExtension: 'pgcrypto', + maxQueryExecutionTime: 500, }); From 67d4b9e73a7e26d162fd7c5bbc2d31f5beb95344 Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Thu, 31 Aug 2023 13:42:49 -0700 Subject: [PATCH 328/954] Feature/alcs 957-part-1: applications and nois (#925) advanced search page status search advanced search support for applications advanced search support for NOIs --- alcs-frontend/src/app/app-routing.module.ts | 14 +- alcs-frontend/src/app/app.module.ts | 11 +- .../application-search-table.component.html | 73 ++++ .../application-search-table.component.scss | 0 ...application-search-table.component.spec.ts | 31 ++ .../application-search-table.component.ts | 122 ++++++ ...tice-of-intent-search-table.component.html | 73 ++++ ...tice-of-intent-search-table.component.scss | 0 ...e-of-intent-search-table.component.spec.ts | 33 ++ ...notice-of-intent-search-table.component.ts | 123 ++++++ .../app/features/search/search.component.html | 263 +++++++++++++ .../app/features/search/search.component.scss | 154 ++++++++ .../search/search.component.spec.ts | 33 +- .../app/features/search/search.component.ts | 305 +++++++++++++++ .../app/features/search/search.interface.ts | 7 + .../src/app/features/search/search.module.ts | 22 ++ .../src/app/services/search/search.dto.ts | 51 +++ .../services/search/search.service.spec.ts | 98 +++++ .../src/app/services/search/search.service.ts | 49 ++- .../header/search-bar/search-bar.component.ts | 1 - .../header/search/search.component.html | 44 --- .../header/search/search.component.scss | 49 --- .../shared/header/search/search.component.ts | 105 ----- .../pipes/table-column-no-data.pipe.spec.ts | 8 + .../shared/pipes/table-column-no-data.pipe.ts | 10 + alcs-frontend/src/app/shared/shared.module.ts | 5 +- ...pplication-advanced-search.service.spec.ts | 116 ++++++ .../application-advanced-search.service.ts | 366 ++++++++++++++++++ .../application-search-view.entity.ts | 104 +++++ ...-of-intent-advanced-search.service.spec.ts | 113 ++++++ ...otice-of-intent-advanced-search.service.ts | 336 ++++++++++++++++ .../notice-of-intent-search-view.entity.ts | 100 +++++ .../src/alcs/search/search.controller.spec.ts | 99 ++++- .../alcs/src/alcs/search/search.controller.ts | 152 +++++++- .../apps/alcs/src/alcs/search/search.dto.ts | 122 ++++++ .../alcs/src/alcs/search/search.module.ts | 15 +- .../src/alcs/search/search.service.spec.ts | 16 + ...92985798191-get_current_status_function.ts | 41 ++ .../1693352687970-app_search_view.ts | 30 ++ ...9968-rename_get_current_status_function.ts | 15 + ...169-get_current_status_for_noi_function.ts | 41 ++ .../1693416651488-noi_search_view.ts | 30 ++ .../apps/alcs/src/utils/search-helper.spec.ts | 35 ++ services/apps/alcs/src/utils/search-helper.ts | 18 + 44 files changed, 3207 insertions(+), 226 deletions(-) create mode 100644 alcs-frontend/src/app/features/search/application-search-table/application-search-table.component.html create mode 100644 alcs-frontend/src/app/features/search/application-search-table/application-search-table.component.scss create mode 100644 alcs-frontend/src/app/features/search/application-search-table/application-search-table.component.spec.ts create mode 100644 alcs-frontend/src/app/features/search/application-search-table/application-search-table.component.ts create mode 100644 alcs-frontend/src/app/features/search/notice-of-intent-search-table/notice-of-intent-search-table.component.html create mode 100644 alcs-frontend/src/app/features/search/notice-of-intent-search-table/notice-of-intent-search-table.component.scss create mode 100644 alcs-frontend/src/app/features/search/notice-of-intent-search-table/notice-of-intent-search-table.component.spec.ts create mode 100644 alcs-frontend/src/app/features/search/notice-of-intent-search-table/notice-of-intent-search-table.component.ts create mode 100644 alcs-frontend/src/app/features/search/search.component.html create mode 100644 alcs-frontend/src/app/features/search/search.component.scss rename alcs-frontend/src/app/{shared/header => features}/search/search.component.spec.ts (52%) create mode 100644 alcs-frontend/src/app/features/search/search.component.ts create mode 100644 alcs-frontend/src/app/features/search/search.interface.ts create mode 100644 alcs-frontend/src/app/features/search/search.module.ts delete mode 100644 alcs-frontend/src/app/shared/header/search/search.component.html delete mode 100644 alcs-frontend/src/app/shared/header/search/search.component.scss delete mode 100644 alcs-frontend/src/app/shared/header/search/search.component.ts create mode 100644 alcs-frontend/src/app/shared/pipes/table-column-no-data.pipe.spec.ts create mode 100644 alcs-frontend/src/app/shared/pipes/table-column-no-data.pipe.ts create mode 100644 services/apps/alcs/src/alcs/search/application/application-advanced-search.service.spec.ts create mode 100644 services/apps/alcs/src/alcs/search/application/application-advanced-search.service.ts create mode 100644 services/apps/alcs/src/alcs/search/application/application-search-view.entity.ts create mode 100644 services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-advanced-search.service.spec.ts create mode 100644 services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-advanced-search.service.ts create mode 100644 services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-search-view.entity.ts create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1692985798191-get_current_status_function.ts create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1693352687970-app_search_view.ts create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1693410289968-rename_get_current_status_function.ts create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1693410408169-get_current_status_for_noi_function.ts create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1693416651488-noi_search_view.ts create mode 100644 services/apps/alcs/src/utils/search-helper.spec.ts create mode 100644 services/apps/alcs/src/utils/search-helper.ts diff --git a/alcs-frontend/src/app/app-routing.module.ts b/alcs-frontend/src/app/app-routing.module.ts index b63b57b267..e3d3768667 100644 --- a/alcs-frontend/src/app/app-routing.module.ts +++ b/alcs-frontend/src/app/app-routing.module.ts @@ -7,7 +7,6 @@ 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 { SearchComponent } from './shared/header/search/search.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; @@ -70,6 +69,14 @@ const routes: Routes = [ }, loadChildren: () => import('./features/admin/admin.module').then((m) => m.AdminModule), }, + { + path: 'search', + canActivate: [HasRolesGuard], + data: { + roles: ALL_ROLES, + }, + loadChildren: () => import('./features/search/search.module').then((m) => m.SearchModule), + }, { path: 'login', component: LoginComponent, @@ -83,11 +90,6 @@ const routes: Routes = [ component: ProvisionComponent, canActivate: [AuthGuard], }, - { - path: 'search', - component: SearchComponent, - canActivate: [AuthGuard], - }, { path: '', redirectTo: '/login', pathMatch: 'full' }, { path: '**', component: NotFoundComponent }, ]; diff --git a/alcs-frontend/src/app/app.module.ts b/alcs-frontend/src/app/app.module.ts index 03a4d798a7..a92968e50b 100644 --- a/alcs-frontend/src/app/app.module.ts +++ b/alcs-frontend/src/app/app.module.ts @@ -12,13 +12,13 @@ import { AuthorizationComponent } from './features/authorization/authorization.c import { NotFoundComponent } from './features/errors/not-found/not-found.component'; import { LoginComponent } from './features/login/login.component'; import { ProvisionComponent } from './features/provision/provision.component'; +import { SearchModule } from './features/search/search.module'; import { AuthInterceptorService } from './services/authentication/auth-interceptor.service'; import { TokenRefreshService } from './services/authentication/token-refresh.service'; import { ConfirmationDialogComponent } from './shared/confirmation-dialog/confirmation-dialog.component'; import { HeaderComponent } from './shared/header/header.component'; import { NotificationsComponent } from './shared/header/notifications/notifications.component'; import { SearchBarComponent } from './shared/header/search-bar/search-bar.component'; -import { SearchComponent } from './shared/header/search/search.component'; import { SharedModule } from './shared/shared.module'; @NgModule({ @@ -32,9 +32,14 @@ import { SharedModule } from './shared/shared.module'; ConfirmationDialogComponent, NotificationsComponent, SearchBarComponent, - SearchComponent, ], - imports: [BrowserModule, BrowserAnimationsModule, SharedModule.forRoot(), AppRoutingModule, MomentDateModule], + imports: [ + BrowserModule, + BrowserAnimationsModule, + SharedModule.forRoot(), + AppRoutingModule, + MomentDateModule, + ], providers: [ { provide: HTTP_INTERCEPTORS, useClass: AuthInterceptorService, multi: true }, { provide: MAT_DIALOG_DEFAULT_OPTIONS, useValue: { panelClass: 'mat-dialog-override' } }, diff --git a/alcs-frontend/src/app/features/search/application-search-table/application-search-table.component.html b/alcs-frontend/src/app/features/search/application-search-table/application-search-table.component.html new file mode 100644 index 0000000000..bd7ef5c617 --- /dev/null +++ b/alcs-frontend/src/app/features/search/application-search-table/application-search-table.component.html @@ -0,0 +1,73 @@ +
## {{ i + 1 }} TypeType @@ -37,7 +37,7 @@ - Size (ha)*Size (ha)* - Alr Area (ha)*ALR Area (ha)* Date: Tue, 29 Aug 2023 13:25:48 -0700 Subject: [PATCH 320/954] Fix circular import error breaking api (#923) --- .../notice-of-intent-decision.module.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.module.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.module.ts index 706500e5cc..fe7cf9c6c6 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.module.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.module.ts @@ -45,7 +45,7 @@ import { NoticeOfIntentSubmissionModule } from '../../portal/notice-of-intent-su DocumentModule, forwardRef(() => NoticeOfIntentModule), NoticeOfIntentSubmissionStatusModule, - NoticeOfIntentSubmissionModule, + forwardRef(() => NoticeOfIntentSubmissionModule), ], providers: [ //These are in the same module, so be careful to import the correct one From 29aaa7fb78505c4cde8d6fce03ab239424c67680 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Tue, 29 Aug 2023 14:58:53 -0700 Subject: [PATCH 321/954] Force deploy --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 44f336520a..1872b126fe 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ This project contains the frontend and backend for the ALCS used for tracking various permits and other ALC related documents -## Getting Help or Reporting an Issue +## Getting Help or Reporting an Issue To report bugs/issues/features requests, please file an [issue](https://github.com/bcgov/alcs/issues). From 3f814288cce9ff73baef3be61392678e83fa63ed Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Tue, 29 Aug 2023 16:39:29 -0700 Subject: [PATCH 322/954] Bug Fixes * Only prepare components after the NOI / App are loaded * Load codes/subtypes for Timeline mapping --- .../decision-components/decision-components.component.ts | 3 +-- .../decision-components/decision-components.component.ts | 3 +-- .../application-timeline/application-timeline.service.ts | 3 +++ 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-components.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-components.component.ts index 6b4ef02f93..09429cc6d5 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-components.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-components.component.ts @@ -59,11 +59,10 @@ export class DecisionComponentsComponent implements OnInit, OnDestroy, AfterView if (application) { this.application = application; this.application.submittedApplication = await this.submissionService.fetchSubmission(application.fileNumber); + await this.prepareDecisionComponentTypes(this.codes); } }); - this.prepareDecisionComponentTypes(this.codes); - // validate components on load setTimeout(() => this.onChange(), 0); } diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-components.component.ts b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-components.component.ts index ef7853468e..f8f325536f 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-components.component.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-components.component.ts @@ -68,11 +68,10 @@ export class DecisionComponentsComponent implements OnInit, OnDestroy, AfterView if (noticeOfIntent) { this.noticeOfIntent = noticeOfIntent; this.noticeOfIntentSubmission = await this.submissionService.fetchSubmission(noticeOfIntent.fileNumber); + await this.prepareDecisionComponentTypes(this.codes); } }); - this.prepareDecisionComponentTypes(this.codes); - // validate components on load setTimeout(() => this.onChange(), 0); } diff --git a/services/apps/alcs/src/alcs/application/application-timeline/application-timeline.service.ts b/services/apps/alcs/src/alcs/application/application-timeline/application-timeline.service.ts index b3bad2061d..d74fd9633d 100644 --- a/services/apps/alcs/src/alcs/application/application-timeline/application-timeline.service.ts +++ b/services/apps/alcs/src/alcs/application/application-timeline/application-timeline.service.ts @@ -207,6 +207,8 @@ export class ApplicationTimelineService { applicationUuid: application.uuid, }, relations: { + type: true, + reviewOutcome: true, card: { subtasks: { type: true, @@ -270,6 +272,7 @@ export class ApplicationTimelineService { type: true, }, }, + reviewOutcome: true, }, order: { submittedDate: 'DESC', From aae85510de5d8d5016ee860dbab95f6129f5613e Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Wed, 30 Aug 2023 16:20:50 -0700 Subject: [PATCH 323/954] Bug Fixes Pt1 * Filter to only application parcels on app prep page * Save POFO and ROSO components if child components are dirty * Allow updating submissions in draft mode regardless of their status --- .../proposal/parcel-prep/parcel-prep.component.ts | 14 ++++++++------ .../pofo-proposal/pofo-proposal.component.ts | 2 +- .../roso-proposal/roso-proposal.component.ts | 2 +- .../application-submission.controller.ts | 13 +++++++------ 4 files changed, 17 insertions(+), 14 deletions(-) diff --git a/alcs-frontend/src/app/features/application/proposal/parcel-prep/parcel-prep.component.ts b/alcs-frontend/src/app/features/application/proposal/parcel-prep/parcel-prep.component.ts index 5bf3bce19a..335c6ec886 100644 --- a/alcs-frontend/src/app/features/application/proposal/parcel-prep/parcel-prep.component.ts +++ b/alcs-frontend/src/app/features/application/proposal/parcel-prep/parcel-prep.component.ts @@ -26,12 +26,14 @@ export class ParcelPrepComponent implements OnChanges { async loadParcels(fileNumber: string) { const parcels = await this.parcelService.fetchParcels(fileNumber); - this.parcels = parcels.map((parcel) => ({ - ...parcel, - owners: `${parcel.owners[0].displayName} ${parcel.owners.length > 1 ? ' et al.' : ''}`, - fullOwners: parcel.owners.map((owner) => owner.displayName).join(', '), - hasManyOwners: parcel.owners.length > 1, - })); + this.parcels = parcels + .filter((parcel) => parcel.parcelType === 'application') + .map((parcel) => ({ + ...parcel, + owners: `${parcel.owners[0].displayName} ${parcel.owners.length > 1 ? ' et al.' : ''}`, + fullOwners: parcel.owners.map((owner) => owner.displayName).join(', '), + hasManyOwners: parcel.owners.length > 1, + })); } async saveParcel(uuid: string, alrArea: string | null) { diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.ts index 2548b6d2b2..986baff612 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.ts @@ -113,7 +113,7 @@ export class PofoProposalComponent extends FilesStepComponent implements OnInit, } protected async save() { - if (this.fileId && this.form.dirty) { + if (this.fileId && (this.form.dirty || this.areComponentsDirty)) { const isFollowUp = this.isFollowUp.getRawValue(); const soilFollowUpIDs = this.followUpIDs.getRawValue(); const purpose = this.purpose.getRawValue(); diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.ts index 4860d4b274..cd4a416290 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.ts @@ -111,7 +111,7 @@ export class RosoProposalComponent extends FilesStepComponent implements OnInit, } protected async save() { - if (this.fileId && this.form.dirty) { + if (this.fileId && (this.form.dirty || this.areComponentsDirty)) { const isNOIFollowUp = this.isFollowUp.getRawValue(); const soilFollowUpIDs = this.followUpIds.getRawValue(); const purpose = this.purpose.getRawValue(); diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.controller.ts b/services/apps/alcs/src/portal/application-submission/application-submission.controller.ts index d495f331e1..b443e74b01 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.controller.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.controller.ts @@ -155,12 +155,13 @@ export class ApplicationSubmissionController { ); if ( - !submission.status || - ![ - SUBMISSION_STATUS.INCOMPLETE.toString(), - SUBMISSION_STATUS.WRONG_GOV.toString(), - SUBMISSION_STATUS.IN_PROGRESS.toString(), - ].includes(submission.status.statusTypeCode) + !submission.isDraft && + (!submission.status || + ![ + SUBMISSION_STATUS.INCOMPLETE.toString(), + SUBMISSION_STATUS.WRONG_GOV.toString(), + SUBMISSION_STATUS.IN_PROGRESS.toString(), + ].includes(submission.status.statusTypeCode)) ) { throw new ServiceValidationException('Not allowed to update submission'); } From 961160cbf6d12cbfe6e398858b54191ac487db69 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Thu, 31 Aug 2023 09:14:30 -0700 Subject: [PATCH 324/954] Bug Fixes Pt 2 * Add download to controller and hook up to download on front end * Disable government selector when in draft mode * Remove government review banner and variable from NOIs * Properly map date on Application decisions --- .../select-government.component.ts | 4 ++++ .../submission-documents.component.html | 2 +- .../submission-documents.component.ts | 15 +++++++++++++++ .../select-government.component.html | 5 ----- .../select-government.component.ts | 4 ---- .../application-document.service.ts | 10 ++++++++++ ...application-decision-v2.automapper.profile.ts | 4 ++++ .../application-decision.dto.ts | 1 - .../application-document.controller.spec.ts | 16 +++++++++++++++- .../application-document.controller.ts | 14 ++++++++++++++ 10 files changed, 63 insertions(+), 12 deletions(-) diff --git a/portal-frontend/src/app/features/applications/edit-submission/select-government/select-government.component.ts b/portal-frontend/src/app/features/applications/edit-submission/select-government/select-government.component.ts index 522ca5f4c6..b5b264eb7a 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/select-government/select-government.component.ts +++ b/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 || '')) diff --git a/portal-frontend/src/app/features/applications/view-submission/alc-review/submission-documents/submission-documents.component.html b/portal-frontend/src/app/features/applications/view-submission/alc-review/submission-documents/submission-documents.component.html index 437bbd407e..8dc409f48a 100644 --- a/portal-frontend/src/app/features/applications/view-submission/alc-review/submission-documents/submission-documents.component.html +++ b/portal-frontend/src/app/features/applications/view-submission/alc-review/submission-documents/submission-documents.component.html @@ -28,7 +28,7 @@

Application Documents

Actions -
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
File ID + {{ element.fileNumber | emptyColumn }} + Date Submitted + {{ element.dateSubmitted | date | emptyColumn }} + Owner Name + {{ element.ownerName | emptyColumn }} + Type + + + - + Local/First Nation Government + {{ element.localGovernmentName | emptyColumn }} + Portal Status + +
+
No Search results.
+
Please adjust criteria and try again.
+
+ diff --git a/alcs-frontend/src/app/features/search/application-search-table/application-search-table.component.scss b/alcs-frontend/src/app/features/search/application-search-table/application-search-table.component.scss new file mode 100644 index 0000000000..e69de29bb2 diff --git a/alcs-frontend/src/app/features/search/application-search-table/application-search-table.component.spec.ts b/alcs-frontend/src/app/features/search/application-search-table/application-search-table.component.spec.ts new file mode 100644 index 0000000000..769348d3ca --- /dev/null +++ b/alcs-frontend/src/app/features/search/application-search-table/application-search-table.component.spec.ts @@ -0,0 +1,31 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { Router } from '@angular/router'; +import { DeepMocked } from '@golevelup/ts-jest'; + +import { ApplicationSearchTableComponent } from './application-search-table.component'; + +describe('ApplicationSearchTableComponent', () => { + let component: ApplicationSearchTableComponent; + let fixture: ComponentFixture; + let mockRouter: DeepMocked; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ApplicationSearchTableComponent], + providers: [ + { + provide: Router, + useValue: mockRouter, + }, + ], + }).compileComponents(); + + fixture = TestBed.createComponent(ApplicationSearchTableComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/alcs-frontend/src/app/features/search/application-search-table/application-search-table.component.ts b/alcs-frontend/src/app/features/search/application-search-table/application-search-table.component.ts new file mode 100644 index 0000000000..25f980db36 --- /dev/null +++ b/alcs-frontend/src/app/features/search/application-search-table/application-search-table.component.ts @@ -0,0 +1,122 @@ +import { AfterViewInit, Component, EventEmitter, Input, OnDestroy, Output, ViewChild } from '@angular/core'; +import { MatPaginator, PageEvent } from '@angular/material/paginator'; +import { MatSort } from '@angular/material/sort'; +import { Router } from '@angular/router'; +import { Subject, takeUntil } from 'rxjs'; +import { ApplicationRegionDto, ApplicationTypeDto } from '../../../services/application/application-code.dto'; +import { ApplicationStatusDto } from '../../../services/application/application-submission-status/application-submission-status.dto'; +import { ApplicationSearchResultDto } from '../../../services/search/search.dto'; +import { ApplicationSubmissionStatusPill } from '../../../shared/application-submission-status-type-pill/application-submission-status-type-pill.component'; +import { defaultStatusBackgroundColour, defaultStatusColour } from '../search.component'; +import { TableChange } from '../search.interface'; + +interface SearchResult { + fileNumber: string; + dateSubmitted: number; + ownerName: string; + type?: ApplicationTypeDto; + localGovernmentName?: string; + portalStatus?: string; + referenceId: string; + board?: string; + class: string; + status?: ApplicationSubmissionStatusPill; +} + +@Component({ + selector: 'app-application-search-table', + templateUrl: './application-search-table.component.html', + styleUrls: ['./application-search-table.component.scss'], +}) +export class ApplicationSearchTableComponent implements AfterViewInit, OnDestroy { + $destroy = new Subject(); + + @ViewChild(MatPaginator) paginator!: MatPaginator; + @ViewChild(MatSort) sort?: MatSort; + + _applications: ApplicationSearchResultDto[] = []; + @Input() set applications(applications: ApplicationSearchResultDto[]) { + this._applications = applications; + this.dataSource = this.mapApplications(applications); + } + + @Input() totalCount = 0; + @Input() statuses: ApplicationStatusDto[] = []; + @Input() regions: ApplicationRegionDto[] = []; + + @Output() tableChange = new EventEmitter(); + + displayedColumns = ['fileId', 'dateSubmitted', 'ownerName', 'type', 'government', 'portalStatus']; + dataSource: SearchResult[] = []; + pageIndex = 0; + itemsPerPage = 20; + total = 0; + sortDirection = 'DESC'; + sortField = 'dateSubmitted'; + + constructor(private router: Router) {} + + ngAfterViewInit() { + if (this.sort) { + this.sort.sortChange.pipe(takeUntil(this.$destroy)).subscribe(async (sortObj) => { + this.paginator.pageIndex = 0; + this.pageIndex = 0; + this.sortDirection = sortObj.direction.toUpperCase(); + this.sortField = sortObj.active; + + await this.onTableChange(); + }); + } + } + + ngOnDestroy(): void { + this.$destroy.next(); + this.$destroy.complete(); + } + + async onTableChange() { + this.tableChange.emit({ + pageIndex: this.pageIndex, + itemsPerPage: this.itemsPerPage, + sortDirection: this.sortDirection, + sortField: this.sortField, + tableType: 'APP', + }); + } + + async onPageChange($event: PageEvent) { + this.pageIndex = $event.pageIndex; + this.itemsPerPage = $event.pageSize; + + await this.onTableChange(); + } + + async onSelectRecord(record: SearchResult) { + await this.router.navigateByUrl(`/application/${record.referenceId}`); + } + + private mapApplications(applications: ApplicationSearchResultDto[]): SearchResult[] { + return applications.map((e) => { + const status = this.statuses.find((st) => st.code === e.status); + + return { + fileNumber: e.fileNumber, + dateSubmitted: e.dateSubmitted, + ownerName: e.ownerName, + type: e.type, + localGovernmentName: e.localGovernmentName, + portalStatus: e.portalStatus, + referenceId: e.referenceId, + board: e.boardCode, + class: e.class, + status: { + backgroundColor: status?.portalBackgroundColor ?? defaultStatusBackgroundColour, + textColor: status?.portalColor ?? defaultStatusColour, + borderColor: status?.portalBackgroundColor, + label: status?.label, + shortLabel: status?.label, + }, + }; + }); + } +} diff --git a/alcs-frontend/src/app/features/search/notice-of-intent-search-table/notice-of-intent-search-table.component.html b/alcs-frontend/src/app/features/search/notice-of-intent-search-table/notice-of-intent-search-table.component.html new file mode 100644 index 0000000000..bd7ef5c617 --- /dev/null +++ b/alcs-frontend/src/app/features/search/notice-of-intent-search-table/notice-of-intent-search-table.component.html @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
File ID + {{ element.fileNumber | emptyColumn }} + Date Submitted + {{ element.dateSubmitted | date | emptyColumn }} + Owner Name + {{ element.ownerName | emptyColumn }} + Type + + + - + Local/First Nation Government + {{ element.localGovernmentName | emptyColumn }} + Portal Status + +
+
No Search results.
+
Please adjust criteria and try again.
+
+ diff --git a/alcs-frontend/src/app/features/search/notice-of-intent-search-table/notice-of-intent-search-table.component.scss b/alcs-frontend/src/app/features/search/notice-of-intent-search-table/notice-of-intent-search-table.component.scss new file mode 100644 index 0000000000..e69de29bb2 diff --git a/alcs-frontend/src/app/features/search/notice-of-intent-search-table/notice-of-intent-search-table.component.spec.ts b/alcs-frontend/src/app/features/search/notice-of-intent-search-table/notice-of-intent-search-table.component.spec.ts new file mode 100644 index 0000000000..8f73bb0ba8 --- /dev/null +++ b/alcs-frontend/src/app/features/search/notice-of-intent-search-table/notice-of-intent-search-table.component.spec.ts @@ -0,0 +1,33 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { Router } from '@angular/router'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; + +import { NoticeOfIntentSearchTableComponent } from './notice-of-intent-search-table.component'; + +describe('NoticeOfIntentSearchTableComponent', () => { + let component: NoticeOfIntentSearchTableComponent; + let fixture: ComponentFixture; + let mockRouter: DeepMocked; + + beforeEach(async () => { + mockRouter = createMock(); + + await TestBed.configureTestingModule({ + declarations: [NoticeOfIntentSearchTableComponent], + providers: [ + { + provide: Router, + useValue: mockRouter, + }, + ], + }).compileComponents(); + + fixture = TestBed.createComponent(NoticeOfIntentSearchTableComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/alcs-frontend/src/app/features/search/notice-of-intent-search-table/notice-of-intent-search-table.component.ts b/alcs-frontend/src/app/features/search/notice-of-intent-search-table/notice-of-intent-search-table.component.ts new file mode 100644 index 0000000000..536701d449 --- /dev/null +++ b/alcs-frontend/src/app/features/search/notice-of-intent-search-table/notice-of-intent-search-table.component.ts @@ -0,0 +1,123 @@ +import { AfterViewInit, Component, EventEmitter, Input, OnDestroy, Output, ViewChild } from '@angular/core'; +import { MatPaginator, PageEvent } from '@angular/material/paginator'; +import { MatSort } from '@angular/material/sort'; +import { Router } from '@angular/router'; +import { Subject, takeUntil } from 'rxjs'; +import { ApplicationRegionDto } from '../../../services/application/application-code.dto'; +import { ApplicationStatusDto } from '../../../services/application/application-submission-status/application-submission-status.dto'; +import { NoticeOfIntentTypeDto } from '../../../services/notice-of-intent/notice-of-intent.dto'; +import { NoticeOfIntentSearchResultDto } from '../../../services/search/search.dto'; +import { ApplicationSubmissionStatusPill } from '../../../shared/application-submission-status-type-pill/application-submission-status-type-pill.component'; +import { TableChange } from '../search.interface'; + +interface SearchResult { + fileNumber: string; + dateSubmitted: number; + ownerName: string; + type?: NoticeOfIntentTypeDto; + government?: string; + portalStatus?: string; + referenceId: string; + board?: string; + class: string; + status?: ApplicationSubmissionStatusPill; +} + +@Component({ + selector: 'app-notice-of-intent-search-table', + templateUrl: './notice-of-intent-search-table.component.html', + styleUrls: ['./notice-of-intent-search-table.component.scss'], +}) +export class NoticeOfIntentSearchTableComponent implements AfterViewInit, OnDestroy { + $destroy = new Subject(); + + @ViewChild(MatPaginator) paginator!: MatPaginator; + @ViewChild(MatSort) sort?: MatSort; + + _noticeOfIntents: NoticeOfIntentSearchResultDto[] = []; + @Input() set noticeOfIntents(noticeOfIntents: NoticeOfIntentSearchResultDto[]) { + this._noticeOfIntents = noticeOfIntents; + this.dataSource = this.mapNoticeOfIntent(noticeOfIntents); + } + + @Input() totalCount = 0; + @Input() statuses: ApplicationStatusDto[] = []; + @Input() regions: ApplicationRegionDto[] = []; + + @Output() tableChange = new EventEmitter(); + + displayedColumns = ['fileId', 'dateSubmitted', 'ownerName', 'type', 'government', 'portalStatus']; + dataSource: SearchResult[] = []; + pageIndex = 0; + itemsPerPage = 20; + total = 0; + sortDirection = 'DESC'; + sortField = 'dateSubmitted'; + + constructor(private router: Router) {} + + ngAfterViewInit() { + if (this.sort) { + this.sort.sortChange.pipe(takeUntil(this.$destroy)).subscribe(async (sortObj) => { + this.paginator.pageIndex = 0; + this.pageIndex = 0; + this.sortDirection = sortObj.direction.toUpperCase(); + this.sortField = sortObj.active; + + await this.onTableChange(); + }); + } + } + + ngOnDestroy(): void { + this.$destroy.next(); + this.$destroy.complete(); + } + + async onTableChange() { + this.tableChange.emit({ + pageIndex: this.pageIndex, + itemsPerPage: this.itemsPerPage, + sortDirection: this.sortDirection, + sortField: this.sortField, + tableType: 'APP', + }); + } + + async onPageChange($event: PageEvent) { + this.pageIndex = $event.pageIndex; + this.itemsPerPage = $event.pageSize; + + await this.onTableChange(); + } + + async onSelectRecord(record: SearchResult) { + await this.router.navigateByUrl(`/notice-of-intent/${record.referenceId}`); + } + + private mapNoticeOfIntent(applications: NoticeOfIntentSearchResultDto[]) { + return applications.map((e) => { + const status = this.statuses.find((st) => st.code === e.status); + + return { + fileNumber: e.fileNumber, + dateSubmitted: e.dateSubmitted, + ownerName: e.ownerName, + type: e.type, + localGovernmentName: e.localGovernmentName, + portalStatus: e.portalStatus, + referenceId: e.referenceId, + board: e.boardCode, + class: e.class, + status: { + // TODO there no pills for NOI status yet. This needs to be addressed once noi statuses are done + backgroundColor: '#fcba19', + textColor: '#002f17', + borderColor: '#fcba19', + label: status?.label, + shortLabel: status?.label, + }, + }; + }); + } +} diff --git a/alcs-frontend/src/app/features/search/search.component.html b/alcs-frontend/src/app/features/search/search.component.html new file mode 100644 index 0000000000..3a4b561a2f --- /dev/null +++ b/alcs-frontend/src/app/features/search/search.component.html @@ -0,0 +1,263 @@ +
+

Advanced Search

+
+ +
+
Provide one or more of the following criteria:
+
+ +
+
+
+
+ + File ID + + +
+
+ + Name + + +
Search by Primary Contact, Parcel Owner, Organization, Ministry or Department
+
+
+
+ +
+
+ + PID + + + + Civic Address + + +
+ +
+
+ info +
+
+ Property details change over time. Use both ALCS and iMap to + confirm ALC history on a property +
+
+ + Expand search to include 'Other Parcels in the Community' from applicant submission +
+
+
+ More Criteria + keyboard_arrow_down +
+ +
+ Less Criteria + keyboard_arrow_up +
+
+ +
+
+
+
+
+ + Resolution Number + + +
+
/
+
+ +
+
+
+
+ + Legacy ID + + +
+
+
+
+ + + + {{ status.label }} + + + +
+ +
+ + File Type (To be implemented) + + +
Note: This field searches both proposal and decision component type
+
+
+ +
+
+ + + + + {{ option.name }} + + + +
+ +
+ + +
{{ item.label }}
+ + +
+
+
Date Submitted
+
+
+ + From + + + + +
+ +
+ + To + + + + +
+
+
Date Decided
+
+
+ + From + + + + +
+ +
+ + To + + + + +
+
+
+
+
+ + +
+ +
+

Search Results:

+ + + + Applications: {{ applicationTotal }} + + + + + Notice of Intent: {{ noticeOfIntentTotal }} + + + + + Non-Applications: 0 + + +
diff --git a/alcs-frontend/src/app/features/search/search.component.scss b/alcs-frontend/src/app/features/search/search.component.scss new file mode 100644 index 0000000000..f2b6428f48 --- /dev/null +++ b/alcs-frontend/src/app/features/search/search.component.scss @@ -0,0 +1,154 @@ +@use '../../../styles/colors'; +h3, +div, +span { + color: colors.$black; +} + +.search-title { + width: 100%; + margin-top: 42px; + margin-bottom: 24px; + display: flex; + justify-content: left; + align-items: center; + + h4 { + margin-right: 12px !important; + } +} + +:host::ng-deep { + .table { + width: 100%; + margin-top: 12px; + + td, + th { + font-size: 16px; + width: 25%; + } + + .type-cell { + width: 90px; + } + + tr.mdc-data-table__row:hover { + box-shadow: 0 0 0 2px rgba(colors.$primary-color, 0.9); + cursor: pointer; + transform: scale(1); + } + + tr.no-data { + border: none; + background-color: colors.$grey-light; + align-items: center; + justify-content: center; + cursor: auto; + box-shadow: none !important; + height: 32px; + } + } +} + +.search-fields-wrapper { + padding: 0 80px; +} + +.row { + display: flex; + flex-direction: row; + flex-wrap: wrap; + gap: 24px; + width: 100%; + margin: 24px 0; + + &.date-row { + margin: 0 0 12px 0; + } + + &.date-row-label { + margin: 0 0 4px 0; + gap: 4px; + } + + .column { + display: flex; + flex-direction: column; + flex-basis: 100%; + flex: 1; + } + + .resolution-wrapper { + gap: 12px; + margin: 0; + } +} + +.address-search-fields-wrapper { + background-color: #fee9b580; + padding: 12px 80px; + + .row { + margin: 4px 0; + } + .column { + background-color: white; + } +} + +.expand-search { + display: flex; + align-items: center; + justify-content: right; + + .expand-search-btn { + display: flex; + align-items: center; + cursor: pointer; + color: #1a5a96; + + span { + color: #1a5a96; + } + } +} + +.btn-controls { + padding: 12px 80px; + display: flex; + justify-content: space-between; +} + +.title { + margin: 36px 80px; +} + +.subtitle { + margin: 18px 80px; +} + +.info-banner { + display: flex; + align-items: center; + + .info-description { + min-width: 0; + word-break: break-word; + } + + .icon { + display: flex; + justify-content: center; + mat-icon { + font-size: 18px; + height: 18px; + width: 18px; + } + } +} + +.search-result-wrapper { + margin-top: 60px; + margin-bottom: 60px; +} diff --git a/alcs-frontend/src/app/shared/header/search/search.component.spec.ts b/alcs-frontend/src/app/features/search/search.component.spec.ts similarity index 52% rename from alcs-frontend/src/app/shared/header/search/search.component.spec.ts rename to alcs-frontend/src/app/features/search/search.component.spec.ts index 25ddceaee6..1e5903ebfe 100644 --- a/alcs-frontend/src/app/shared/header/search/search.component.spec.ts +++ b/alcs-frontend/src/app/features/search/search.component.spec.ts @@ -1,10 +1,14 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { MatAutocompleteModule } from '@angular/material/autocomplete'; import { ActivatedRoute, ParamMap, Router } from '@angular/router'; import { createMock, DeepMocked } from '@golevelup/ts-jest'; -import { Observable } from 'rxjs'; -import { SearchService } from '../../../services/search/search.service'; -import { ToastService } from '../../../services/toast/toast.service'; +import { BehaviorSubject, Observable } from 'rxjs'; +import { ApplicationRegionDto } from '../../services/application/application-code.dto'; +import { ApplicationLocalGovernmentService } from '../../services/application/application-local-government/application-local-government.service'; +import { ApplicationService } from '../../services/application/application.service'; +import { SearchService } from '../../services/search/search.service'; +import { ToastService } from '../../services/toast/toast.service'; import { SearchComponent } from './search.component'; @@ -12,13 +16,17 @@ describe('SearchComponent', () => { let component: SearchComponent; let fixture: ComponentFixture; let mockSearchService: DeepMocked; - let mockRouter: DeepMocked; let mockToastService: DeepMocked; + let mockLocalGovernmentService: DeepMocked; + let mockApplicationService: DeepMocked; beforeEach(async () => { mockSearchService = createMock(); - mockRouter = createMock(); mockToastService = createMock(); + mockLocalGovernmentService = createMock(); + mockApplicationService = createMock(); + + mockApplicationService.$applicationRegions = new BehaviorSubject([]); await TestBed.configureTestingModule({ providers: [ @@ -26,22 +34,27 @@ describe('SearchComponent', () => { provide: SearchService, useValue: mockSearchService, }, - { - provide: Router, - useValue: mockRouter, - }, { provide: ActivatedRoute, useValue: { - queryParamMap: new Observable + queryParamMap: new Observable(), }, }, { provide: ToastService, useValue: mockToastService, }, + { + provide: ApplicationLocalGovernmentService, + useValue: mockLocalGovernmentService, + }, + { + provide: ApplicationService, + useValue: mockApplicationService, + }, ], declarations: [SearchComponent], + imports: [MatAutocompleteModule], schemas: [NO_ERRORS_SCHEMA], }).compileComponents(); diff --git a/alcs-frontend/src/app/features/search/search.component.ts b/alcs-frontend/src/app/features/search/search.component.ts new file mode 100644 index 0000000000..57c8e400ca --- /dev/null +++ b/alcs-frontend/src/app/features/search/search.component.ts @@ -0,0 +1,305 @@ +import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; +import { FormControl, FormGroup } from '@angular/forms'; +import { MatAutocompleteSelectedEvent } from '@angular/material/autocomplete'; +import { MatPaginator } from '@angular/material/paginator'; +import { MatSort } from '@angular/material/sort'; +import { ActivatedRoute } from '@angular/router'; +import moment from 'moment'; +import { combineLatestWith, map, Observable, startWith, Subject, takeUntil } from 'rxjs'; +import { ApplicationRegionDto } from '../../services/application/application-code.dto'; +import { ApplicationLocalGovernmentDto } from '../../services/application/application-local-government/application-local-government.dto'; +import { ApplicationLocalGovernmentService } from '../../services/application/application-local-government/application-local-government.service'; +import { ApplicationStatusDto } from '../../services/application/application-submission-status/application-submission-status.dto'; +import { ApplicationService } from '../../services/application/application.service'; +import { + AdvancedSearchResponseDto, + ApplicationSearchResultDto, + NoticeOfIntentSearchResultDto, + SearchRequestDto, +} from '../../services/search/search.dto'; +import { SearchService } from '../../services/search/search.service'; +import { ToastService } from '../../services/toast/toast.service'; +import { formatDateForApi } from '../../shared/utils/api-date-formatter'; +import { TableChange } from './search.interface'; + +export const defaultStatusBackgroundColour = '#ffffff'; +export const defaultStatusColour = '#313132'; +@Component({ + selector: 'app-search', + templateUrl: './search.component.html', + styleUrls: ['./search.component.scss'], +}) +export class SearchComponent implements OnInit, OnDestroy { + $destroy = new Subject(); + + @ViewChild(MatPaginator) paginator!: MatPaginator; + @ViewChild(MatSort) sort?: MatSort; + + applications: ApplicationSearchResultDto[] = []; + applicationTotal = 0; + + noticeOfIntents: NoticeOfIntentSearchResultDto[] = []; + noticeOfIntentTotal = 0; + + isSearchExpanded = false; + pageIndex = 0; + itemsPerPage = 20; + sortDirection = 'DESC'; + sortField = 'dateSubmitted'; + + localGovernmentControl = new FormControl(undefined); + portalStatusControl = new FormControl(undefined); + searchForm = new FormGroup({ + fileNumber: new FormControl(undefined), + name: new FormControl(undefined), + pid: new FormControl(undefined), + civicAddress: new FormControl(undefined), + isIncludeOtherParcels: new FormControl(false), + resolutionNumber: new FormControl(undefined), + resolutionYear: new FormControl(undefined), + legacyId: new FormControl(undefined), + portalStatus: this.portalStatusControl, + componentType: new FormControl(undefined), + government: this.localGovernmentControl, + region: new FormControl(undefined), + dateSubmittedFrom: new FormControl(undefined), + dateSubmittedTo: new FormControl(undefined), + dateDecidedFrom: new FormControl(undefined), + dateDecidedTo: new FormControl(undefined), + }); + resolutionYears: number[] = []; + localGovernments: ApplicationLocalGovernmentDto[] = []; + filteredLocalGovernments!: Observable; + regions: ApplicationRegionDto[] = []; + statuses: ApplicationStatusDto[] = []; + + constructor( + private searchService: SearchService, + private activatedRoute: ActivatedRoute, + private localGovernmentService: ApplicationLocalGovernmentService, + private applicationService: ApplicationService, + private toastService: ToastService + ) {} + + ngOnInit(): void { + this.setup(); + + this.applicationService.$applicationRegions + .pipe(takeUntil(this.$destroy)) + .pipe(combineLatestWith(this.applicationService.$applicationStatuses, this.activatedRoute.queryParamMap)) + .subscribe(([regions, statuses, queryParamMap]) => { + this.regions = regions; + this.statuses = statuses; + + const searchText = queryParamMap.get('searchText'); + + if (searchText) { + this.searchForm.controls.fileNumber.setValue(searchText); + + this.searchService + .advancedSearchFetch({ + fileNumber: searchText, + isIncludeOtherParcels: false, + pageSize: this.itemsPerPage, + page: this.pageIndex + 1, + sortDirection: this.sortDirection, + sortField: this.sortField, + applicationFileTypes: [], + }) + .then((result) => this.mapSearchResults(result)); + } + }); + } + + private setup() { + const startingYear = moment('1950'); + const currentYear = moment().year(); + while (startingYear.year() <= currentYear) { + this.resolutionYears.push(startingYear.year()); + startingYear.add(1, 'year'); + } + this.resolutionYears.reverse(); + this.loadGovernments(); + this.applicationService.setup(); + + this.filteredLocalGovernments = this.localGovernmentControl.valueChanges.pipe( + startWith(''), + map((value) => this.filterLocalGovernment(value || '')) + ); + } + + ngOnDestroy(): void { + this.$destroy.next(); + this.$destroy.complete(); + } + + // TODO: remove this once the search is complete + // async onSelectCard(record: SearchResult) { + // switch (record.class) { + // case 'APP': + // await this.router.navigateByUrl(`/application/${record.referenceId}`); + // break; + // case 'NOI': + // await this.router.navigateByUrl(`/notice-of-intent/${record.referenceId}`); + // break; + // case 'COV': + // case 'PLAN': + // await this.router.navigateByUrl(`/board/${record.board}?card=${record.referenceId}&type=${record.type}`); + // break; + // default: + // this.toastService.showErrorToast(`Unable to navigate to ${record.referenceId}`); + // } + // } + + async onSubmit() { + await this.onSearch(); + } + + expandSearchClicked() { + this.isSearchExpanded = !this.isSearchExpanded; + } + + onGovernmentChange($event: MatAutocompleteSelectedEvent) { + const localGovernmentName = $event.option.value; + if (localGovernmentName) { + const localGovernment = this.localGovernments.find((lg) => lg.name == localGovernmentName); + if (localGovernment) { + this.localGovernmentControl.setValue(localGovernment.name); + } + } + } + + onBlur() { + //Blur will fire before onChange above, so use setTimeout to delay it + setTimeout(() => { + const localGovernmentName = this.localGovernmentControl.getRawValue(); + if (localGovernmentName) { + const localGovernment = this.localGovernments.find((lg) => lg.name == localGovernmentName); + if (!localGovernment) { + this.localGovernmentControl.setValue(null); + console.log('Clearing Local Government field'); + } + } + }, 500); + } + + onReset() { + this.searchForm.reset(); + } + + async onSearch() { + const searchParams = this.getSearchParams(); + const result = await this.searchService.advancedSearchFetch(searchParams); + this.mapSearchResults(result); + } + + getSearchParams(): SearchRequestDto { + return { + // pagination + pageSize: this.itemsPerPage, + page: this.pageIndex + 1, + // sorting + sortField: this.sortField, + sortDirection: this.sortDirection, + // TODO move condition into helper function? + fileNumber: + this.searchForm.controls.fileNumber.value && this.searchForm.controls.fileNumber.value !== '' + ? this.searchForm.controls.fileNumber.value + : undefined, + legacyId: this.searchForm.controls.legacyId.value ?? undefined, + name: this.searchForm.controls.name.value ?? undefined, + civicAddress: this.searchForm.controls.civicAddress.value ?? undefined, + pid: this.searchForm.controls.pid.value ?? undefined, + isIncludeOtherParcels: this.searchForm.controls.isIncludeOtherParcels.value ?? false, + resolutionNumber: this.searchForm.controls.resolutionNumber.value + ? parseInt(this.searchForm.controls.resolutionNumber.value) + : undefined, + resolutionYear: this.searchForm.controls.resolutionYear.value ?? undefined, + portalStatusCode: this.searchForm.controls.portalStatus.value ?? undefined, + governmentName: this.searchForm.controls.government.value ?? undefined, + regionCode: this.searchForm.controls.region.value ?? undefined, + dateSubmittedFrom: this.searchForm.controls.dateSubmittedFrom.value + ? formatDateForApi(this.searchForm.controls.dateSubmittedFrom.value) + : undefined, + dateSubmittedTo: this.searchForm.controls.dateSubmittedTo.value + ? formatDateForApi(this.searchForm.controls.dateSubmittedTo.value) + : undefined, + dateDecidedFrom: this.searchForm.controls.dateDecidedFrom.value + ? formatDateForApi(this.searchForm.controls.dateDecidedFrom.value) + : undefined, + dateDecidedTo: this.searchForm.controls.dateDecidedTo.value + ? formatDateForApi(this.searchForm.controls.dateDecidedTo.value) + : undefined, + // TODO this will be reworked in later tickets + applicationFileTypes: this.searchForm.controls.componentType.value + ? this.searchForm.controls.componentType.value.split(',') + : [], + }; + } + + async onApplicationSearch() { + const searchParams = this.getSearchParams(); + const result = await this.searchService.advancedSearchApplicationsFetch(searchParams); + + this.applications = result?.data ?? []; + this.applicationTotal = result?.total ?? 0; + } + + async onNoticeOfIntentSearch() { + const searchParams = this.getSearchParams(); + const result = await this.searchService.advancedSearchNoticeOfIntentsFetch(searchParams); + + this.noticeOfIntents = result?.data ?? []; + this.noticeOfIntentTotal = result?.total ?? 0; + } + + async onTableChange(event: TableChange) { + this.pageIndex = event.pageIndex; + this.itemsPerPage = event.itemsPerPage; + this.sortDirection = event.sortDirection; + this.sortField = event.sortField; + + switch (event.tableType) { + case 'APP': + await this.onApplicationSearch(); + break; + case 'NOI': + await this.onApplicationSearch(); + break; + default: + this.toastService.showErrorToast('Not implemented'); + } + } + + private async loadGovernments() { + const governments = await this.localGovernmentService.list(); + this.localGovernments = governments.sort((a, b) => (a.name > b.name ? 1 : -1)); + } + + private filterLocalGovernment(value: string): ApplicationLocalGovernmentDto[] { + if (this.localGovernments) { + const filterValue = value.toLowerCase(); + return this.localGovernments.filter((localGovernment) => + localGovernment.name.toLowerCase().includes(filterValue) + ); + } + return []; + } + + private mapSearchResults(searchResult?: AdvancedSearchResponseDto) { + if (!searchResult) { + searchResult = { + applications: [], + noticeOfIntents: [], + totalApplications: 0, + totalNoticeOfIntents: 0, + }; + } + + this.applicationTotal = searchResult.totalApplications; + this.applications = searchResult.applications; + + this.noticeOfIntentTotal = searchResult.totalNoticeOfIntents; + this.noticeOfIntents = searchResult.noticeOfIntents; + } +} diff --git a/alcs-frontend/src/app/features/search/search.interface.ts b/alcs-frontend/src/app/features/search/search.interface.ts new file mode 100644 index 0000000000..f254745a09 --- /dev/null +++ b/alcs-frontend/src/app/features/search/search.interface.ts @@ -0,0 +1,7 @@ +export interface TableChange { + pageIndex: number; + itemsPerPage: number; + sortDirection: string; + sortField: string; + tableType: string; +} diff --git a/alcs-frontend/src/app/features/search/search.module.ts b/alcs-frontend/src/app/features/search/search.module.ts new file mode 100644 index 0000000000..48530f0a02 --- /dev/null +++ b/alcs-frontend/src/app/features/search/search.module.ts @@ -0,0 +1,22 @@ +import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; +import { MatPaginatorModule } from '@angular/material/paginator'; +import { MatTabsModule } from '@angular/material/tabs'; +import { RouterModule, Routes } from '@angular/router'; +import { SharedModule } from '../../shared/shared.module'; +import { SearchComponent } from './search.component'; +import { ApplicationSearchTableComponent } from './application-search-table/application-search-table.component'; +import { NoticeOfIntentSearchTableComponent } from './notice-of-intent-search-table/notice-of-intent-search-table.component'; + +const routes: Routes = [ + { + path: '', + component: SearchComponent, + }, +]; + +@NgModule({ + declarations: [SearchComponent, ApplicationSearchTableComponent, NoticeOfIntentSearchTableComponent], + imports: [CommonModule, SharedModule.forRoot(), RouterModule.forChild(routes), MatTabsModule, MatPaginatorModule], +}) +export class SearchModule {} diff --git a/alcs-frontend/src/app/services/search/search.dto.ts b/alcs-frontend/src/app/services/search/search.dto.ts index 797c619778..2cb7223441 100644 --- a/alcs-frontend/src/app/services/search/search.dto.ts +++ b/alcs-frontend/src/app/services/search/search.dto.ts @@ -1,5 +1,56 @@ import { ApplicationTypeDto } from '../application/application-code.dto'; +export interface ApplicationSearchResultDto { + fileNumber: string; + type: ApplicationTypeDto; + referenceId: string; + applicant?: string; + localGovernmentName: string; + boardCode?: string; + ownerName: string; + dateSubmitted: number; + portalStatus?: string; + class: string; + status: string; +} + +export interface NoticeOfIntentSearchResultDto extends ApplicationSearchResultDto {} + +export interface AdvancedSearchResponseDto { + applications: ApplicationSearchResultDto[]; + noticeOfIntents: NoticeOfIntentSearchResultDto[]; + totalApplications: number; + totalNoticeOfIntents: number; +} + +export interface AdvancedSearchEntityResponseDto { + data: T[]; + total: number; +} + +export interface SearchRequestDto { + pageSize: number; + page: number; + sortField: string; + sortDirection: string; + fileNumber?: string; + legacyId?: string; + name?: string; + pid?: string; + civicAddress?: string; + isIncludeOtherParcels: boolean; + resolutionNumber?: number; + resolutionYear?: number; + portalStatusCode?: string; + governmentName?: string; + regionCode?: string; + dateSubmittedFrom?: number; + dateSubmittedTo?: number; + dateDecidedFrom?: number; + dateDecidedTo?: number; + applicationFileTypes: string[]; +} + export interface SearchResultDto { fileNumber: string; type: string; diff --git a/alcs-frontend/src/app/services/search/search.service.spec.ts b/alcs-frontend/src/app/services/search/search.service.spec.ts index ecd881e5cd..2ce634722d 100644 --- a/alcs-frontend/src/app/services/search/search.service.spec.ts +++ b/alcs-frontend/src/app/services/search/search.service.spec.ts @@ -36,6 +36,27 @@ describe('SearchService', () => { }, ]; + const mockAdvancedSearchEntityResult = { + total: 0, + data: [], + }; + + const mockAdvancedSearchResult = { + applications: [], + noticeOfIntents: [], + totalApplications: 0, + totalNoticeOfIntents: 0, + }; + + const mockSearchRequestDto = { + pageSize: 1, + page: 1, + sortField: '1', + sortDirection: 'ASC', + isIncludeOtherParcels: false, + applicationFileTypes: [], + }; + beforeEach(() => { mockHttpClient = createMock(); mockToastService = createMock(); @@ -82,4 +103,81 @@ describe('SearchService', () => { expect(res).toBeUndefined(); expect(mockToastService.showErrorToast).toHaveBeenCalledTimes(1); }); + + it('should fetch advanced search results by AdvancedSearchRequestDto', async () => { + mockHttpClient.post.mockReturnValue(of(mockAdvancedSearchResult)); + + const res = await service.advancedSearchFetch(mockSearchRequestDto); + + expect(mockHttpClient.post).toHaveBeenCalledTimes(1); + expect(res).toBeDefined(); + expect(res?.totalApplications).toEqual(0); + expect(res?.applications).toEqual([]); + expect(res?.totalNoticeOfIntents).toEqual(0); + expect(res?.noticeOfIntents).toEqual([]); + }); + + it('should show an error toast message if search fails', async () => { + mockHttpClient.post.mockReturnValue( + throwError(() => { + new Error(''); + }) + ); + + const res = await service.advancedSearchFetch(mockSearchRequestDto); + + expect(mockHttpClient.post).toHaveBeenCalledTimes(1); + expect(res).toBeUndefined(); + expect(mockToastService.showErrorToast).toHaveBeenCalledTimes(1); + }); + + it('should fetch application advanced search results by AdvancedSearchRequestDto', async () => { + mockHttpClient.post.mockReturnValue(of(mockAdvancedSearchEntityResult)); + + const res = await service.advancedSearchApplicationsFetch(mockSearchRequestDto); + + expect(mockHttpClient.post).toHaveBeenCalledTimes(1); + expect(res).toBeDefined(); + expect(res?.total).toEqual(0); + expect(res?.data).toEqual([]); + }); + + it('should show an error toast message if application advanced search fails', async () => { + mockHttpClient.post.mockReturnValue( + throwError(() => { + new Error(''); + }) + ); + + const res = await service.advancedSearchApplicationsFetch(mockSearchRequestDto); + + expect(mockHttpClient.post).toHaveBeenCalledTimes(1); + expect(res).toBeUndefined(); + expect(mockToastService.showErrorToast).toHaveBeenCalledTimes(1); + }); + + it('should fetch NOI advanced search results by AdvancedSearchRequestDto', async () => { + mockHttpClient.post.mockReturnValue(of(mockAdvancedSearchEntityResult)); + + const res = await service.advancedSearchNoticeOfIntentsFetch(mockSearchRequestDto); + + expect(mockHttpClient.post).toHaveBeenCalledTimes(1); + expect(res).toBeDefined(); + expect(res?.total).toEqual(0); + expect(res?.data).toEqual([]); + }); + + it('should show an error toast message if NOI advanced search fails', async () => { + mockHttpClient.post.mockReturnValue( + throwError(() => { + new Error(''); + }) + ); + + const res = await service.advancedSearchNoticeOfIntentsFetch(mockSearchRequestDto); + + expect(mockHttpClient.post).toHaveBeenCalledTimes(1); + expect(res).toBeUndefined(); + expect(mockToastService.showErrorToast).toHaveBeenCalledTimes(1); + }); }); diff --git a/alcs-frontend/src/app/services/search/search.service.ts b/alcs-frontend/src/app/services/search/search.service.ts index 615f8610ce..77ed377de3 100644 --- a/alcs-frontend/src/app/services/search/search.service.ts +++ b/alcs-frontend/src/app/services/search/search.service.ts @@ -3,7 +3,14 @@ import { Injectable } from '@angular/core'; import { firstValueFrom } from 'rxjs'; import { environment } from '../../../environments/environment'; import { ToastService } from '../toast/toast.service'; -import { SearchResultDto } from './search.dto'; +import { + AdvancedSearchEntityResponseDto, + AdvancedSearchResponseDto, + ApplicationSearchResultDto, + NoticeOfIntentSearchResultDto, + SearchRequestDto, + SearchResultDto, +} from './search.dto'; @Injectable({ providedIn: 'root', @@ -13,6 +20,16 @@ export class SearchService { constructor(private http: HttpClient, private toastService: ToastService) {} + async advancedSearchFetch(searchDto: SearchRequestDto) { + try { + return await firstValueFrom(this.http.post(`${this.baseUrl}/advanced`, searchDto)); + } catch (e) { + console.error(e); + this.toastService.showErrorToast(`Search failed. Please refresh the page and try again`); + return undefined; + } + } + async fetch(searchTerm: string) { try { return await firstValueFrom(this.http.get(`${this.baseUrl}/${searchTerm}`)); @@ -22,4 +39,34 @@ export class SearchService { return undefined; } } + + async advancedSearchApplicationsFetch(searchDto: SearchRequestDto) { + try { + return await firstValueFrom( + this.http.post>( + `${this.baseUrl}/advanced/application`, + searchDto + ) + ); + } catch (e) { + console.error(e); + this.toastService.showErrorToast(`Search failed. Please refresh the page and try again`); + return undefined; + } + } + + async advancedSearchNoticeOfIntentsFetch(searchDto: SearchRequestDto) { + try { + return await firstValueFrom( + this.http.post>( + `${this.baseUrl}/advanced/notice-of-intent`, + searchDto + ) + ); + } catch (e) { + console.error(e); + this.toastService.showErrorToast(`Search failed. Please refresh the page and try again`); + return undefined; + } + } } diff --git a/alcs-frontend/src/app/shared/header/search-bar/search-bar.component.ts b/alcs-frontend/src/app/shared/header/search-bar/search-bar.component.ts index bb2b548751..cd1278ee1e 100644 --- a/alcs-frontend/src/app/shared/header/search-bar/search-bar.component.ts +++ b/alcs-frontend/src/app/shared/header/search-bar/search-bar.component.ts @@ -18,7 +18,6 @@ export class SearchBarComponent { async onSearch() { try { const searchResult = await this.searchService.fetch(this.searchText); - if (!searchResult || searchResult.length < 1) { this.toastService.showWarningToast(`File ID ${this.searchText} not found, try again`); return; diff --git a/alcs-frontend/src/app/shared/header/search/search.component.html b/alcs-frontend/src/app/shared/header/search/search.component.html deleted file mode 100644 index 15638122a9..0000000000 --- a/alcs-frontend/src/app/shared/header/search/search.component.html +++ /dev/null @@ -1,44 +0,0 @@ -
-
-

Search Results:

-

File ID: {{ searchText }}

-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
File ID - {{ element.title }} - Class - {{ element.class }} - Type - - - Local/First Nation Government - {{ element.government }} -
No Search Results
-
diff --git a/alcs-frontend/src/app/shared/header/search/search.component.scss b/alcs-frontend/src/app/shared/header/search/search.component.scss deleted file mode 100644 index 5c9eded809..0000000000 --- a/alcs-frontend/src/app/shared/header/search/search.component.scss +++ /dev/null @@ -1,49 +0,0 @@ -@use '../../../../styles/colors.scss'; - -.layout { - padding: 0 80px; -} - -.search-title { - width: 100%; - margin-top: 42px; - margin-bottom: 24px; - display: flex; - justify-content: left; - align-items: center; - - h4 { - margin-right: 12px !important; - } -} - -.table { - width: 100%; - margin-top: 12px; - - td, - th { - font-size: 16px; - width: 25%; - } - - .type-cell { - width: 90px; - } - - tr.mdc-data-table__row:hover { - box-shadow: 0 0 0 2px rgba(colors.$primary-color, 0.9); - cursor: pointer; - transform: scale(1); - } - - tr.no-data { - border: none; - background-color: colors.$grey-light; - align-items: center; - justify-content: center; - cursor: auto; - box-shadow: none !important; - height: 32px; - } -} diff --git a/alcs-frontend/src/app/shared/header/search/search.component.ts b/alcs-frontend/src/app/shared/header/search/search.component.ts deleted file mode 100644 index 53a7ec8c89..0000000000 --- a/alcs-frontend/src/app/shared/header/search/search.component.ts +++ /dev/null @@ -1,105 +0,0 @@ -import { Component, OnDestroy, OnInit } from '@angular/core'; -import { ActivatedRoute, Router } from '@angular/router'; -import { Subject, takeUntil } from 'rxjs'; -import { ApplicationTypeDto } from '../../../services/application/application-code.dto'; -import { SearchResultDto } from '../../../services/search/search.dto'; -import { SearchService } from '../../../services/search/search.service'; -import { ToastService } from '../../../services/toast/toast.service'; -import { COVENANT_TYPE_LABEL, PLANNING_TYPE_LABEL } from '../../application-type-pill/application-type-pill.constants'; - -interface SearchResult { - title: string; - class: string; - type?: any; - government?: string; - referenceId: string; - board?: string; - label?: ApplicationTypeDto; -} - -@Component({ - selector: 'app-search', - templateUrl: './search.component.html', - styleUrls: ['./search.component.scss'], -}) -export class SearchComponent implements OnInit, OnDestroy { - $destroy = new Subject(); - searchText?: string; - - searchResults: SearchResult[] = []; - displayedColumns = ['fileId', 'class', 'type', 'government']; - - constructor( - private searchService: SearchService, - private router: Router, - private activatedRoute: ActivatedRoute, - private toastService: ToastService - ) {} - - ngOnInit(): void { - this.activatedRoute.queryParamMap.pipe(takeUntil(this.$destroy)).subscribe((queryParamMap) => { - const searchText = queryParamMap.get('searchText'); - - if (searchText) { - this.searchText = searchText; - - this.searchService - .fetch(searchText) - .then((result) => (this.searchResults = this.mapSearchResults(result ?? []))); - } - }); - } - - ngOnDestroy(): void { - this.$destroy.next(); - this.$destroy.complete(); - } - - async onSelectCard(record: SearchResult) { - switch (record.type) { - case 'APP': - await this.router.navigateByUrl(`/application/${record.referenceId}`); - break; - case 'NOI': - await this.router.navigateByUrl(`/notice-of-intent/${record.referenceId}`); - break; - case 'COV': - case 'PLAN': - await this.router.navigateByUrl(`/board/${record.board}?card=${record.referenceId}&type=${record.type}`); - break; - default: - this.toastService.showErrorToast(`Unable to navigate to ${record.referenceId}`); - } - } - - private mapSearchResults(data: SearchResultDto[]) { - return data.map((e) => { - const { classType, label } = this.mapClassAndLabels(e); - - return { - title: `${e.fileNumber} ${e.applicant ?? ''}`, - class: classType, - type: e.type, - label: label, - government: e.localGovernmentName, - referenceId: e.referenceId, - board: e.boardCode, - }; - }); - } - - private mapClassAndLabels(data: SearchResultDto) { - switch (data.type) { - case 'APP': - return { classType: 'Application', label: data.label }; - case 'NOI': - return { classType: 'NOI' }; - case 'COV': - return { classType: 'Non-App', label: COVENANT_TYPE_LABEL }; - case 'PLAN': - return { classType: 'Non-App', label: PLANNING_TYPE_LABEL }; - default: - return { classType: 'Unknown' }; - } - } -} diff --git a/alcs-frontend/src/app/shared/pipes/table-column-no-data.pipe.spec.ts b/alcs-frontend/src/app/shared/pipes/table-column-no-data.pipe.spec.ts new file mode 100644 index 0000000000..9af20ee335 --- /dev/null +++ b/alcs-frontend/src/app/shared/pipes/table-column-no-data.pipe.spec.ts @@ -0,0 +1,8 @@ +import { TableColumnNoDataPipe } from './table-column-no-data.pipe'; + +describe('TableColumnNoDataPipe', () => { + it('create an instance', () => { + const pipe = new TableColumnNoDataPipe(); + expect(pipe).toBeTruthy(); + }); +}); diff --git a/alcs-frontend/src/app/shared/pipes/table-column-no-data.pipe.ts b/alcs-frontend/src/app/shared/pipes/table-column-no-data.pipe.ts new file mode 100644 index 0000000000..e6d078a8c8 --- /dev/null +++ b/alcs-frontend/src/app/shared/pipes/table-column-no-data.pipe.ts @@ -0,0 +1,10 @@ +import { Pipe, PipeTransform } from '@angular/core'; + +@Pipe({ + name: 'emptyColumn' +}) +export class TableColumnNoDataPipe implements PipeTransform { + transform(value: any): any { + return value !== null && value !== undefined && value !== '' ? value : '-'; + } +} \ No newline at end of file diff --git a/alcs-frontend/src/app/shared/shared.module.ts b/alcs-frontend/src/app/shared/shared.module.ts index 6eef90b2d6..acf4f6e46a 100644 --- a/alcs-frontend/src/app/shared/shared.module.ts +++ b/alcs-frontend/src/app/shared/shared.module.ts @@ -34,6 +34,7 @@ import { NgOptionHighlightModule } from '@ng-select/ng-option-highlight'; import { NgSelectModule } from '@ng-select/ng-select'; import { NgxMaskDirective, NgxMaskPipe } from 'ngx-mask'; import { ApplicationDocumentComponent } from './application-document/application-document.component'; +import { ApplicationLegacyIdComponent } from './application-legacy-id/application-legacy-id.component'; import { ApplicationSubmissionStatusTypePillComponent } from './application-submission-status-type-pill/application-submission-status-type-pill.component'; import { ApplicationTypePillComponent } from './application-type-pill/application-type-pill.component'; import { AvatarCircleComponent } from './avatar-circle/avatar-circle.component'; @@ -58,6 +59,7 @@ import { FileSizePipe } from './pipes/fileSize.pipe'; import { MomentPipe } from './pipes/moment.pipe'; import { SafePipe } from './pipes/safe.pipe'; import { StartOfDayPipe } from './pipes/startOfDay.pipe'; +import { TableColumnNoDataPipe } from './pipes/table-column-no-data.pipe'; import { StaffJournalNoteInputComponent } from './staff-journal/staff-journal-note-input/staff-journal-note-input.component'; import { StaffJournalNoteComponent } from './staff-journal/staff-journal-note/staff-journal-note.component'; import { StaffJournalComponent } from './staff-journal/staff-journal.component'; @@ -66,7 +68,6 @@ import { TimelineComponent } from './timeline/timeline.component'; import { DATE_FORMATS } from './utils/date-format'; import { ExtensionsDatepickerFormatter } from './utils/extensions-datepicker-formatter'; import { WarningBannerComponent } from './warning-banner/warning-banner.component'; -import { ApplicationLegacyIdComponent } from './application-legacy-id/application-legacy-id.component'; @NgModule({ declarations: [ @@ -102,6 +103,7 @@ import { ApplicationLegacyIdComponent } from './application-legacy-id/applicatio LotsTableFormComponent, InlineNgSelectComponent, ApplicationLegacyIdComponent, + TableColumnNoDataPipe, ], imports: [ CommonModule, @@ -193,6 +195,7 @@ import { ApplicationLegacyIdComponent } from './application-legacy-id/applicatio ErrorMessageComponent, LotsTableFormComponent, ApplicationLegacyIdComponent, + TableColumnNoDataPipe, ], }) export class SharedModule { diff --git a/services/apps/alcs/src/alcs/search/application/application-advanced-search.service.spec.ts b/services/apps/alcs/src/alcs/search/application/application-advanced-search.service.spec.ts new file mode 100644 index 0000000000..5ff132c11d --- /dev/null +++ b/services/apps/alcs/src/alcs/search/application/application-advanced-search.service.spec.ts @@ -0,0 +1,116 @@ +import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; +import { Test, TestingModule } from '@nestjs/testing'; +import { getRepositoryToken } from '@nestjs/typeorm'; +import { Repository } from 'typeorm'; +import { LocalGovernment } from '../../local-government/local-government.entity'; +import { SearchRequestDto } from '../search.dto'; +import { ApplicationAdvancedSearchService } from './application-advanced-search.service'; +import { ApplicationSubmissionSearchView } from './application-search-view.entity'; + +describe('ApplicationAdvancedSearchService', () => { + let service: ApplicationAdvancedSearchService; + let mockApplicationSubmissionSearchViewRepository: DeepMocked< + Repository + >; + let mockLocalGovernmentRepository: DeepMocked>; + + const mockSearchRequestDto: SearchRequestDto = { + fileNumber: '123', + legacyId: '123', + portalStatusCode: 'A', + governmentName: 'B', + regionCode: 'C', + name: 'D', + pid: 'E', + civicAddress: 'F', + isIncludeOtherParcels: true, + dateSubmittedFrom: new Date('2020-10-10').getTime(), + dateSubmittedTo: new Date('2021-10-10').getTime(), + dateDecidedFrom: new Date('2020-11-10').getTime(), + dateDecidedTo: new Date('2021-11-10').getTime(), + resolutionNumber: 123, + resolutionYear: 2021, + applicationFileTypes: ['type1', 'type2'], + page: 1, + pageSize: 10, + sortField: 'ownerName', + sortDirection: 'ASC', + }; + + let mockQuery: any = {}; + + beforeEach(async () => { + mockApplicationSubmissionSearchViewRepository = createMock(); + mockLocalGovernmentRepository = createMock(); + + mockQuery = { + getManyAndCount: jest.fn().mockResolvedValue([[], 0]), + orderBy: jest.fn().mockReturnThis(), + offset: jest.fn().mockReturnThis(), + limit: jest.fn().mockReturnThis(), + innerJoinAndMapOne: jest.fn().mockReturnThis(), + groupBy: jest.fn().mockReturnThis(), + where: jest.fn().mockReturnThis(), + andWhere: jest.fn().mockReturnThis(), + setParameters: jest.fn().mockReturnThis(), + leftJoin: jest.fn().mockReturnThis(), + }; + + const module: TestingModule = await Test.createTestingModule({ + providers: [ + ApplicationAdvancedSearchService, + { + provide: getRepositoryToken(ApplicationSubmissionSearchView), + useValue: mockApplicationSubmissionSearchViewRepository, + }, + { + provide: getRepositoryToken(LocalGovernment), + useValue: mockLocalGovernmentRepository, + }, + ], + }).compile(); + + service = module.get( + ApplicationAdvancedSearchService, + ); + + mockLocalGovernmentRepository.findOneByOrFail.mockResolvedValue( + new LocalGovernment(), + ); + }); + + it('should be defined', () => { + expect(service).toBeDefined(); + }); + + it('should successfully build a query using all search parameters defined', async () => { + mockApplicationSubmissionSearchViewRepository.createQueryBuilder.mockReturnValue( + mockQuery as any, + ); + + const result = await service.searchApplications(mockSearchRequestDto); + + expect(result).toEqual({ data: [], total: 0 }); + expect( + mockApplicationSubmissionSearchViewRepository.createQueryBuilder, + ).toBeCalledTimes(1); + expect(mockQuery.andWhere).toBeCalledTimes(15); + expect(mockQuery.where).toBeCalledTimes(1); + }); + + it('should call compileApplicationSearchQuery method correctly', async () => { + const compileApplicationSearchQuerySpy = jest + .spyOn(service as any, 'compileApplicationSearchQuery') + .mockResolvedValue(mockQuery); + + const result = await service.searchApplications(mockSearchRequestDto); + + expect(result).toEqual({ data: [], total: 0 }); + expect(compileApplicationSearchQuerySpy).toBeCalledWith( + mockSearchRequestDto, + ); + expect(mockQuery.orderBy).toHaveBeenCalledTimes(1); + expect(mockQuery.offset).toHaveBeenCalledTimes(1); + expect(mockQuery.limit).toHaveBeenCalledTimes(1); + }); +}); diff --git a/services/apps/alcs/src/alcs/search/application/application-advanced-search.service.ts b/services/apps/alcs/src/alcs/search/application/application-advanced-search.service.ts new file mode 100644 index 0000000000..82d2199802 --- /dev/null +++ b/services/apps/alcs/src/alcs/search/application/application-advanced-search.service.ts @@ -0,0 +1,366 @@ +import { Injectable } from '@nestjs/common'; +import { InjectRepository } from '@nestjs/typeorm'; +import { Brackets, Repository } from 'typeorm'; +import { ApplicationOwner } from '../../../portal/application-submission/application-owner/application-owner.entity'; +import { ApplicationParcel } from '../../../portal/application-submission/application-parcel/application-parcel.entity'; +import { formatIncomingDate } from '../../../utils/incoming-date.formatter'; +import { formatStringToPostgresSearchStringArrayWithWildCard } from '../../../utils/search-helper'; +import { ApplicationDecisionComponent } from '../../application-decision/application-decision-v2/application-decision/component/application-decision-component.entity'; +import { ApplicationDecision } from '../../application-decision/application-decision.entity'; +import { LocalGovernment } from '../../local-government/local-government.entity'; +import { AdvancedSearchResultDto, SearchRequestDto } from '../search.dto'; +import { ApplicationSubmissionSearchView } from './application-search-view.entity'; + +@Injectable() +export class ApplicationAdvancedSearchService { + constructor( + @InjectRepository(ApplicationSubmissionSearchView) + private applicationSearchRepository: Repository, + @InjectRepository(LocalGovernment) + private governmentRepository: Repository, + ) {} + + async searchApplications( + searchDto: SearchRequestDto, + ): Promise> { + let query = await this.compileApplicationSearchQuery(searchDto); + + query = this.compileApplicationGroupBySearchQuery(query); + + const sortQuery = this.compileSortQuery(searchDto); + + query = query + .orderBy(sortQuery, searchDto.sortDirection) + .offset((searchDto.page - 1) * searchDto.pageSize) + .limit(searchDto.pageSize); + + const result = await query.getManyAndCount(); + + return { + data: result[0], + total: result[1], + }; + } + + private compileSortQuery(searchDto: SearchRequestDto) { + switch (searchDto.sortField) { + case 'fileId': + return '"appSearch"."file_number"'; + + case 'ownerName': + return '"appSearch"."applicant"'; + + case 'type': + return '"appSearch"."application_type_code"'; + + case 'government': + return '"appSearch"."local_government_name"'; + + case 'portalStatus': + return `"appSearch"."status" ->> 'label' `; + + default: + case 'dateSubmitted': + return '"appSearch"."date_submitted_to_alc"'; + } + } + + private compileApplicationGroupBySearchQuery(query) { + query = query + .innerJoinAndMapOne( + 'appSearch.applicationType', + 'appSearch.applicationType', + 'applicationType', + ) + .groupBy( + ` + "appSearch"."uuid" + , "appSearch"."application_uuid" + , "appSearch"."application_region_code" + , "appSearch"."file_number" + , "appSearch"."applicant" + , "appSearch"."local_government_uuid" + , "appSearch"."local_government_name" + , "appSearch"."application_type_code" + , "appSearch"."legacy_id" + , "appSearch"."status" + , "appSearch"."date_submitted_to_alc" + , "appSearch"."decision_date" + , "applicationType"."audit_deleted_date_at" + , "applicationType"."audit_created_at" + , "applicationType"."audit_updated_by" + , "applicationType"."audit_updated_at" + , "applicationType"."audit_created_by" + , "applicationType"."short_label" + , "applicationType"."label" + , "applicationType"."code" + , "applicationType"."background_color" + , "applicationType"."text_color" + , "applicationType"."html_description" + , "applicationType"."portal_label" + , "appSearch"."is_draft" + `, + ); + return query; + } + + private async compileApplicationSearchQuery(searchDto: SearchRequestDto) { + let query = this.applicationSearchRepository + .createQueryBuilder('appSearch') + .where('appSearch.is_draft = false'); + + if (searchDto.fileNumber) { + query = query + .andWhere('appSearch.file_number = :fileNumber') + .setParameters({ fileNumber: searchDto.fileNumber ?? null }); + } + + if (searchDto.legacyId) { + query = query.andWhere('appSearch.legacy_id = :legacyId', { + legacyId: searchDto.legacyId, + }); + } + + if (searchDto.portalStatusCode) { + query = query.andWhere( + "alcs.get_current_status_for_application_submission_by_uuid(appSearch.uuid) ->> 'status_type_code' = :status", + { + status: searchDto.portalStatusCode, + }, + ); + } + + if (searchDto.governmentName) { + const government = await this.governmentRepository.findOneByOrFail({ + name: searchDto.governmentName, + }); + + query = query.andWhere( + 'appSearch.local_government_uuid = :local_government_uuid', + { + local_government_uuid: government.uuid, + }, + ); + } + + if (searchDto.regionCode) { + query = query.andWhere( + 'appSearch.application_region_code = :application_region_code', + { + application_region_code: searchDto.regionCode, + }, + ); + } + + query = this.compileApplicationSearchByNameQuery(searchDto, query); + + query = this.compileApplicationParcelSearchQuery(searchDto, query); + + query = this.compileApplicationDecisionSearchQuery(searchDto, query); + + query = this.compileApplicationFileTypeSearchQuery(searchDto, query); + + query = this.compileApplicationDateRangeSearchQuery(searchDto, query); + + return query; + } + + private compileApplicationDateRangeSearchQuery( + searchDto: SearchRequestDto, + query, + ) { + // TODO check dates toIsoString + if (searchDto.dateSubmittedFrom) { + query = query.andWhere( + 'appSearch.date_submitted_to_alc >= :date_submitted_to_alc', + { + date_submitted_to_alc: formatIncomingDate( + searchDto.dateSubmittedFrom, + )!.toISOString(), + }, + ); + } + + if (searchDto.dateSubmittedTo) { + query = query.andWhere( + 'appSearch.date_submitted_to_alc <= :date_submitted_to_alc', + { + date_submitted_to_alc: formatIncomingDate( + searchDto.dateSubmittedTo, + )!.toISOString(), + }, + ); + } + + if (searchDto.dateDecidedFrom) { + query = query.andWhere('appSearch.decision_date >= :decision_date', { + decision_date: formatIncomingDate( + searchDto.dateDecidedFrom, + )!.toISOString(), + }); + } + + if (searchDto.dateDecidedTo) { + query = query.andWhere('appSearch.decision_date <= :decision_date_to', { + decision_date_to: formatIncomingDate( + searchDto.dateDecidedTo, + )!.toISOString(), + }); + } + return query; + } + + private compileApplicationDecisionSearchQuery( + searchDto: SearchRequestDto, + query, + ) { + if ( + searchDto.resolutionNumber !== undefined || + searchDto.resolutionYear !== undefined + ) { + query = this.joinApplicationDecision(query); + + if (searchDto.resolutionNumber !== undefined) { + query = query.andWhere( + 'decision.resolution_number = :resolution_number', + { + resolution_number: searchDto.resolutionNumber, + }, + ); + } + + if (searchDto.resolutionYear !== undefined) { + query = query.andWhere('decision.resolution_year = :resolution_year', { + resolution_year: searchDto.resolutionYear, + }); + } + } + return query; + } + + private joinApplicationDecision(query: any) { + query = query.leftJoin( + ApplicationDecision, + 'decision', + 'decision.application_uuid = "appSearch"."application_uuid"', + ); + return query; + } + + private compileApplicationParcelSearchQuery( + searchDto: SearchRequestDto, + query, + ) { + if ( + (searchDto.pid || searchDto.civicAddress) && + searchDto.isIncludeOtherParcels + ) { + query = query.leftJoin( + ApplicationParcel, + 'parcel', + "parcel.application_submission_uuid = appSearch.uuid AND parcel.parcel_type IN ('application', 'other')", + ); + } else { + query = query.leftJoin( + ApplicationParcel, + 'parcel', + "parcel.application_submission_uuid = appSearch.uuid AND parcel.parcel_type = 'application'", + ); + } + + if (searchDto.pid) { + query = query.andWhere('parcel.pid = :pid', { pid: searchDto.pid }); + } + + if (searchDto.civicAddress) { + query = query.andWhere('parcel.civic_address like :civic_address', { + civic_address: `%${searchDto.civicAddress}%`, + }); + } + return query; + } + + private compileApplicationSearchByNameQuery( + searchDto: SearchRequestDto, + query, + ) { + if (searchDto.name) { + const formattedSearchString = + formatStringToPostgresSearchStringArrayWithWildCard(searchDto.name!); + + query = query + .leftJoin( + ApplicationOwner, + 'application_owner', + 'application_owner.application_submission_uuid = appSearch.uuid', + ) + .andWhere( + new Brackets((qb) => + qb + .where( + "LOWER(application_owner.first_name || ' ' || application_owner.last_name) LIKE ANY (:names)", + { + names: formattedSearchString, + }, + ) + .orWhere( + 'LOWER(application_owner.first_name) LIKE ANY (:names)', + { + names: formattedSearchString, + }, + ) + .orWhere('LOWER(application_owner.last_name) LIKE ANY (:names)', { + names: formattedSearchString, + }) + .orWhere( + 'LOWER(application_owner.organization_name) LIKE ANY (:names)', + { + names: formattedSearchString, + }, + ), + ), + ); + } + return query; + } + + private compileApplicationFileTypeSearchQuery( + searchDto: SearchRequestDto, + query, + ) { + query = query; + + if (searchDto.applicationFileTypes.length > 0) { + // if decision is not joined yet -> join it. The join of decision happens in compileApplicationDecisionSearchQuery + if ( + searchDto.resolutionNumber === undefined && + searchDto.resolutionYear === undefined + ) { + query = this.joinApplicationDecision(query); + } + + query = query.leftJoin( + ApplicationDecisionComponent, + 'decisionComponent', + 'decisionComponent.application_decision_uuid = decision.uuid', + ); + + query = query.andWhere( + new Brackets((qb) => + qb + .where('appSearch.application_type_code IN (:...typeCodes)', { + typeCodes: searchDto.applicationFileTypes, + }) + .orWhere( + 'decisionComponent.application_decision_component_type_code IN (:...typeCodes)', + { + typeCodes: searchDto.applicationFileTypes, + }, + ), + ), + ); + } + + return query; + } +} diff --git a/services/apps/alcs/src/alcs/search/application/application-search-view.entity.ts b/services/apps/alcs/src/alcs/search/application/application-search-view.entity.ts new file mode 100644 index 0000000000..3da99ed8cb --- /dev/null +++ b/services/apps/alcs/src/alcs/search/application/application-search-view.entity.ts @@ -0,0 +1,104 @@ +import { + DataSource, + JoinColumn, + ManyToOne, + PrimaryColumn, + ViewColumn, + ViewEntity, +} from 'typeorm'; +import { ApplicationSubmission } from '../../../portal/application-submission/application-submission.entity'; +import { Application } from '../../application/application.entity'; +import { ApplicationType } from '../../code/application-code/application-type/application-type.entity'; +import { LocalGovernment } from '../../local-government/local-government.entity'; + +// typeorm does not transform property names for the status +export class SearchApplicationSubmissionStatusType { + submission_uuid: string; + + status_type_code: string; + + effective_date: Date; + + label: string; +} + +@ViewEntity({ + expression: (datasource: DataSource) => + datasource + .createQueryBuilder() + .select('as2.uuid', 'uuid') + .addSelect('as2.file_number', 'file_number') + .addSelect('as2.applicant', 'applicant') + .addSelect('as2.local_government_uuid', 'local_government_uuid') + .addSelect('localGovernment.name', 'local_government_name') + .addSelect('as2.type_code', 'application_type_code') + .addSelect('as2.is_draft', 'is_draft') + .addSelect('a.legacy_id', 'legacy_id') + .addSelect('a.date_submitted_to_alc', 'date_submitted_to_alc') + .addSelect('a.decision_date', 'decision_date') + .addSelect('a.uuid', 'application_uuid') + .addSelect('a.region_code', 'application_region_code') + .addSelect( + 'alcs.get_current_status_for_application_submission_by_uuid(as2.uuid)', + 'status', + ) + .from(ApplicationSubmission, 'as2') + .innerJoin(Application, 'a', 'a.file_number = as2.file_number') + .innerJoinAndSelect( + ApplicationType, + 'applicationType', + 'as2.type_code = applicationType.code', + ) + .leftJoin( + LocalGovernment, + 'localGovernment', + 'as2.local_government_uuid = localGovernment.uuid', + ), +}) +export class ApplicationSubmissionSearchView { + @ViewColumn() + @PrimaryColumn() + uuid: string; + + @ViewColumn() + applicationUuid: string; + + @ViewColumn() + isDraft: boolean; + + @ViewColumn() + applicationRegionCode?: string; + + @ViewColumn() + fileNumber: string; + + @ViewColumn() + applicant?: string; + + @ViewColumn() + localGovernmentUuid?: string; + + @ViewColumn() + localGovernmentName?: string; + + @ViewColumn() + applicationTypeCode: string; + + @ViewColumn() + legacyId?: string; + + @ViewColumn() + status: SearchApplicationSubmissionStatusType; + + @ViewColumn() + dateSubmittedToAlc: Date | null; + + @ViewColumn() + decisionDate: Date | null; + + @ManyToOne(() => ApplicationType, { + nullable: false, + }) + @JoinColumn({ name: 'application_type_code' }) + applicationType: ApplicationType; +} diff --git a/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-advanced-search.service.spec.ts b/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-advanced-search.service.spec.ts new file mode 100644 index 0000000000..ce29c4b358 --- /dev/null +++ b/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-advanced-search.service.spec.ts @@ -0,0 +1,113 @@ +import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; +import { Test, TestingModule } from '@nestjs/testing'; +import { getRepositoryToken } from '@nestjs/typeorm'; +import { Repository } from 'typeorm'; +import { LocalGovernment } from '../../local-government/local-government.entity'; +import { SearchRequestDto } from '../search.dto'; +import { NoticeOfIntentAdvancedSearchService } from './notice-of-intent-advanced-search.service'; +import { NoticeOfIntentSubmissionSearchView } from './notice-of-intent-search-view.entity'; + +describe('NoticeOfIntentService', () => { + let service: NoticeOfIntentAdvancedSearchService; + let mockNoticeOfIntentSubmissionSearchViewRepository: DeepMocked< + Repository + >; + let mockLocalGovernmentRepository: DeepMocked>; + + const mockSearchDto: SearchRequestDto = { + fileNumber: '123', + portalStatusCode: 'A', + governmentName: 'B', + regionCode: 'C', + name: 'D', + pid: 'E', + civicAddress: 'F', + isIncludeOtherParcels: false, + dateSubmittedFrom: new Date('2020-10-10').getTime(), + dateSubmittedTo: new Date('2021-10-10').getTime(), + dateDecidedFrom: new Date('2020-11-10').getTime(), + dateDecidedTo: new Date('2021-11-10').getTime(), + resolutionNumber: 123, + resolutionYear: 2021, + applicationFileTypes: ['type1', 'type2'], + page: 1, + pageSize: 10, + sortField: 'ownerName', + sortDirection: 'ASC', + }; + + let mockQuery: any = {}; + + beforeEach(async () => { + mockNoticeOfIntentSubmissionSearchViewRepository = createMock(); + mockLocalGovernmentRepository = createMock(); + + mockQuery = { + getManyAndCount: jest.fn().mockResolvedValue([[], 0]), + orderBy: jest.fn().mockReturnThis(), + offset: jest.fn().mockReturnThis(), + limit: jest.fn().mockReturnThis(), + innerJoinAndMapOne: jest.fn().mockReturnThis(), + groupBy: jest.fn().mockReturnThis(), + where: jest.fn().mockReturnThis(), + andWhere: jest.fn().mockReturnThis(), + setParameters: jest.fn().mockReturnThis(), + leftJoin: jest.fn().mockReturnThis(), + }; + + const module: TestingModule = await Test.createTestingModule({ + providers: [ + NoticeOfIntentAdvancedSearchService, + { + provide: getRepositoryToken(NoticeOfIntentSubmissionSearchView), + useValue: mockNoticeOfIntentSubmissionSearchViewRepository, + }, + { + provide: getRepositoryToken(LocalGovernment), + useValue: mockLocalGovernmentRepository, + }, + ], + }).compile(); + + service = module.get( + NoticeOfIntentAdvancedSearchService, + ); + + mockLocalGovernmentRepository.findOneByOrFail.mockResolvedValue( + new LocalGovernment(), + ); + }); + + it('should be defined', () => { + expect(service).toBeDefined(); + }); + + it('should successfully build a query using all search parameters defined', async () => { + mockNoticeOfIntentSubmissionSearchViewRepository.createQueryBuilder.mockReturnValue( + mockQuery as any, + ); + + const result = await service.searchNoticeOfIntents(mockSearchDto); + + expect(result).toEqual({ data: [], total: 0 }); + expect( + mockNoticeOfIntentSubmissionSearchViewRepository.createQueryBuilder, + ).toBeCalledTimes(1); + expect(mockQuery.andWhere).toBeCalledTimes(14); + expect(mockQuery.where).toBeCalledTimes(1); + }); + + it('should call compileNoticeOfIntentSearchQuery method correctly', async () => { + const compileApplicationSearchQuerySpy = jest + .spyOn(service as any, 'compileNoticeOfIntentSearchQuery') + .mockResolvedValue(mockQuery); + + const result = await service.searchNoticeOfIntents(mockSearchDto); + + expect(result).toEqual({ data: [], total: 0 }); + expect(compileApplicationSearchQuerySpy).toBeCalledWith(mockSearchDto); + expect(mockQuery.orderBy).toHaveBeenCalledTimes(1); + expect(mockQuery.offset).toHaveBeenCalledTimes(1); + expect(mockQuery.limit).toHaveBeenCalledTimes(1); + }); +}); diff --git a/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-advanced-search.service.ts b/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-advanced-search.service.ts new file mode 100644 index 0000000000..4ba8d3fbdf --- /dev/null +++ b/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-advanced-search.service.ts @@ -0,0 +1,336 @@ +import { Injectable } from '@nestjs/common'; +import { InjectRepository } from '@nestjs/typeorm'; +import { Brackets, Repository } from 'typeorm'; +import { NoticeOfIntentOwner } from '../../../portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.entity'; +import { NoticeOfIntentParcel } from '../../../portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.entity'; +import { formatIncomingDate } from '../../../utils/incoming-date.formatter'; +import { formatStringToPostgresSearchStringArrayWithWildCard } from '../../../utils/search-helper'; +import { LocalGovernment } from '../../local-government/local-government.entity'; +import { NoticeOfIntentDecisionComponent } from '../../notice-of-intent-decision/notice-of-intent-decision-component/notice-of-intent-decision-component.entity'; +import { NoticeOfIntentDecision } from '../../notice-of-intent-decision/notice-of-intent-decision.entity'; +import { AdvancedSearchResultDto, SearchRequestDto } from '../search.dto'; +import { NoticeOfIntentSubmissionSearchView } from './notice-of-intent-search-view.entity'; + +@Injectable() +export class NoticeOfIntentAdvancedSearchService { + constructor( + @InjectRepository(NoticeOfIntentSubmissionSearchView) + private noiSearchRepository: Repository, + @InjectRepository(LocalGovernment) + private governmentRepository: Repository, + ) {} + + async searchNoticeOfIntents( + searchDto: SearchRequestDto, + ): Promise> { + let query = await this.compileNoticeOfIntentSearchQuery(searchDto); + + query = this.compileGroupBySearchQuery(query); + + const sortQuery = this.compileSortQuery(searchDto); + + query = query + .orderBy(sortQuery, searchDto.sortDirection) + .offset((searchDto.page - 1) * searchDto.pageSize) + .limit(searchDto.pageSize); + + const result = await query.getManyAndCount(); + + return { + data: result[0], + total: result[1], + }; + } + + private compileSortQuery(searchDto: SearchRequestDto) { + switch (searchDto.sortField) { + case 'fileId': + return '"noiSearch"."file_number"'; + + case 'ownerName': + return '"noiSearch"."applicant"'; + + case 'type': + return '"noiSearch"."notice_of_intent_type_code"'; + + case 'government': + return '"noiSearch"."local_government_name"'; + + case 'portalStatus': + return `"noiSearch"."status" ->> 'label' `; + + default: + case 'dateSubmitted': + return '"noiSearch"."date_submitted_to_alc"'; + } + } + + private compileGroupBySearchQuery(query) { + query = query + .innerJoinAndMapOne( + 'noiSearch.noticeOfIntentType', + 'noiSearch.noticeOfIntentType', + 'noticeOfIntentType', + ) + .groupBy( + ` + "noiSearch"."uuid" + , "noiSearch"."notice_of_intent_uuid" + , "noiSearch"."notice_of_intent_region_code" + , "noiSearch"."file_number" + , "noiSearch"."applicant" + , "noiSearch"."local_government_uuid" + , "noiSearch"."local_government_name" + , "noiSearch"."notice_of_intent_type_code" + , "noiSearch"."status" + , "noiSearch"."date_submitted_to_alc" + , "noiSearch"."decision_date" + , "noticeOfIntentType"."audit_deleted_date_at" + , "noticeOfIntentType"."audit_created_at" + , "noticeOfIntentType"."audit_updated_by" + , "noticeOfIntentType"."audit_updated_at" + , "noticeOfIntentType"."audit_created_by" + , "noticeOfIntentType"."short_label" + , "noticeOfIntentType"."label" + , "noticeOfIntentType"."code" + , "noticeOfIntentType"."html_description" + , "noticeOfIntentType"."portal_label" + , "noiSearch"."is_draft" + `, + ); + return query; + } + + private async compileNoticeOfIntentSearchQuery(searchDto: SearchRequestDto) { + let query = this.noiSearchRepository + .createQueryBuilder('noiSearch') + .where('noiSearch.is_draft = false'); + + if (searchDto.fileNumber) { + query = query + .andWhere('noiSearch.file_number = :fileNumber') + .setParameters({ fileNumber: searchDto.fileNumber ?? null }); + } + + if (searchDto.portalStatusCode) { + query = query.andWhere( + "alcs.get_current_status_for_notice_of_intent_submission_by_uuid(noiSearch.uuid) ->> 'status_type_code' = :status", + { + status: searchDto.portalStatusCode, + }, + ); + } + + if (searchDto.governmentName) { + const government = await this.governmentRepository.findOneByOrFail({ + name: searchDto.governmentName, + }); + + query = query.andWhere( + 'noiSearch.local_government_uuid = :local_government_uuid', + { + local_government_uuid: government.uuid, + }, + ); + } + + if (searchDto.regionCode) { + query = query.andWhere( + 'noiSearch.notice_of_intent_region_code = :noi_region_code', + { + noi_region_code: searchDto.regionCode, + }, + ); + } + + query = this.compileSearchByNameQuery(searchDto, query); + + query = this.compileParcelSearchQuery(searchDto, query); + + query = this.compileDecisionSearchQuery(searchDto, query); + + query = this.compileFileTypeSearchQuery(searchDto, query); + + query = this.compileDateRangeSearchQuery(searchDto, query); + + return query; + } + + private compileDateRangeSearchQuery(searchDto: SearchRequestDto, query) { + // TODO check dates toIsoString + if (searchDto.dateSubmittedFrom) { + query = query.andWhere( + 'noiSearch.date_submitted_to_alc >= :date_submitted_to_alc', + { + date_submitted_to_alc: formatIncomingDate( + searchDto.dateSubmittedFrom, + )!.toISOString(), + }, + ); + } + + if (searchDto.dateSubmittedTo) { + query = query.andWhere( + 'noiSearch.date_submitted_to_alc <= :date_submitted_to_alc', + { + date_submitted_to_alc: formatIncomingDate( + searchDto.dateSubmittedTo, + )!.toISOString(), + }, + ); + } + + if (searchDto.dateDecidedFrom) { + query = query.andWhere('noiSearch.decision_date >= :decision_date', { + decision_date: formatIncomingDate( + searchDto.dateDecidedFrom, + )!.toISOString(), + }); + } + + if (searchDto.dateDecidedTo) { + query = query.andWhere('noiSearch.decision_date <= :decision_date_to', { + decision_date_to: formatIncomingDate( + searchDto.dateDecidedTo, + )!.toISOString(), + }); + } + return query; + } + + private compileDecisionSearchQuery(searchDto: SearchRequestDto, query) { + if ( + searchDto.resolutionNumber !== undefined || + searchDto.resolutionYear !== undefined + ) { + query = this.joinDecision(query); + + if (searchDto.resolutionNumber !== undefined) { + query = query.andWhere( + 'decision.resolution_number = :resolution_number', + { + resolution_number: searchDto.resolutionNumber, + }, + ); + } + + if (searchDto.resolutionYear !== undefined) { + query = query.andWhere('decision.resolution_year = :resolution_year', { + resolution_year: searchDto.resolutionYear, + }); + } + } + return query; + } + + private joinDecision(query: any) { + query = query.leftJoin( + NoticeOfIntentDecision, + 'decision', + 'decision.notice_of_intent_uuid = "noiSearch"."notice_of_intent_uuid"', + ); + return query; + } + + private compileParcelSearchQuery(searchDto: SearchRequestDto, query) { + if (searchDto.pid || searchDto.civicAddress) { + query = query.leftJoin( + NoticeOfIntentParcel, + 'parcel', + 'parcel.notice_of_intent_submission_uuid = noiSearch.uuid', + ); + } + + if (searchDto.pid) { + query = query.andWhere('parcel.pid = :pid', { pid: searchDto.pid }); + } + + if (searchDto.civicAddress) { + query = query.andWhere('parcel.civic_address like :civic_address', { + civic_address: `%${searchDto.civicAddress}%`, + }); + } + return query; + } + + private compileSearchByNameQuery(searchDto: SearchRequestDto, query) { + if (searchDto.name) { + const formattedSearchString = + formatStringToPostgresSearchStringArrayWithWildCard(searchDto.name!); + + query = query + .leftJoin( + NoticeOfIntentOwner, + 'notice_of_intent_owner', + 'notice_of_intent_owner.notice_of_intent_submission_uuid = noiSearch.uuid', + ) + .andWhere( + new Brackets((qb) => + qb + .where( + "LOWER(notice_of_intent_owner.first_name || ' ' || notice_of_intent_owner.last_name) LIKE ANY (:names)", + { + names: formattedSearchString, + }, + ) + .orWhere( + 'LOWER(notice_of_intent_owner.first_name) LIKE ANY (:names)', + { + names: formattedSearchString, + }, + ) + .orWhere( + 'LOWER(notice_of_intent_owner.last_name) LIKE ANY (:names)', + { + names: formattedSearchString, + }, + ) + .orWhere( + 'LOWER(notice_of_intent_owner.organization_name) LIKE ANY (:names)', + { + names: formattedSearchString, + }, + ), + ), + ); + } + return query; + } + + private compileFileTypeSearchQuery(searchDto: SearchRequestDto, query) { + query = query; + + if (searchDto.applicationFileTypes.length > 0) { + // if decision is not joined yet -> join it. The join of decision happens in compileApplicationDecisionSearchQuery + if ( + searchDto.resolutionNumber === undefined && + searchDto.resolutionYear === undefined + ) { + query = this.joinDecision(query); + } + + query = query.leftJoin( + NoticeOfIntentDecisionComponent, + 'decisionComponent', + 'decisionComponent.notice_of_intent_decision_uuid = decision.uuid', + ); + + query = query.andWhere( + new Brackets((qb) => + qb + .where('noiSearch.notice_of_intent_type_code IN (:...typeCodes)', { + typeCodes: searchDto.applicationFileTypes, + }) + .orWhere( + 'decisionComponent.notice_of_intent_decision_component_type_code IN (:...typeCodes)', + { + typeCodes: searchDto.applicationFileTypes, + }, + ), + ), + ); + } + + return query; + } +} diff --git a/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-search-view.entity.ts b/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-search-view.entity.ts new file mode 100644 index 0000000000..8c1c397a93 --- /dev/null +++ b/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-search-view.entity.ts @@ -0,0 +1,100 @@ +import { + DataSource, + JoinColumn, + ManyToOne, + PrimaryColumn, + ViewColumn, + ViewEntity, +} from 'typeorm'; +import { NoticeOfIntentSubmission } from '../../../portal/notice-of-intent-submission/notice-of-intent-submission.entity'; +import { NoticeOfIntentType } from '../../code/application-code/notice-of-intent-type/notice-of-intent-type.entity'; +import { LocalGovernment } from '../../local-government/local-government.entity'; +import { NoticeOfIntent } from '../../notice-of-intent/notice-of-intent.entity'; + +// typeorm does not transform property names for the status +export class SearchNoticeOfIntentSubmissionStatusType { + submission_uuid: string; + + status_type_code: string; + + effective_date: Date; + + label: string; +} + +@ViewEntity({ + expression: (datasource: DataSource) => + datasource + .createQueryBuilder() + .select('nois.uuid', 'uuid') + .addSelect('nois.file_number', 'file_number') + .addSelect('nois.applicant', 'applicant') + .addSelect('nois.local_government_uuid', 'local_government_uuid') + .addSelect('localGovernment.name', 'local_government_name') + .addSelect('nois.type_code', 'notice_of_intent_type_code') + .addSelect('nois.is_draft', 'is_draft') + .addSelect('noi.date_submitted_to_alc', 'date_submitted_to_alc') + .addSelect('noi.decision_date', 'decision_date') + .addSelect('noi.uuid', 'notice_of_intent_uuid') + .addSelect('noi.region_code', 'notice_of_intent_region_code') + .addSelect( + 'alcs.get_current_status_for_notice_of_intent_submission_by_uuid(nois.uuid)', + 'status', + ) + .from(NoticeOfIntentSubmission, 'nois') + .innerJoin(NoticeOfIntent, 'noi', 'noi.file_number = nois.file_number') + .innerJoinAndSelect( + NoticeOfIntentType, + 'noticeOfIntentType', + 'nois.type_code = noticeOfIntentType.code', + ) + .leftJoin( + LocalGovernment, + 'localGovernment', + 'nois.local_government_uuid = localGovernment.uuid', + ), +}) +export class NoticeOfIntentSubmissionSearchView { + @ViewColumn() + @PrimaryColumn() + uuid: string; + + @ViewColumn() + noticeOfIntentUuid: string; + + @ViewColumn() + isDraft: boolean; + + @ViewColumn() + noticeOfIntentRegionCode?: string; + + @ViewColumn() + fileNumber: string; + + @ViewColumn() + applicant?: string; + + @ViewColumn() + localGovernmentUuid?: string; + + @ViewColumn() + localGovernmentName?: string; + + @ViewColumn() + noticeOfIntentTypeCode: string; + + @ViewColumn() + status: SearchNoticeOfIntentSubmissionStatusType; + + @ViewColumn() + dateSubmittedToAlc: Date | null; + + @ViewColumn() + decisionDate: Date | null; + + @ManyToOne(() => NoticeOfIntentType, { + nullable: false, + }) + @JoinColumn({ name: 'notice_of_intent_type_code' }) + noticeOfIntentType: NoticeOfIntentType; +} diff --git a/services/apps/alcs/src/alcs/search/search.controller.spec.ts b/services/apps/alcs/src/alcs/search/search.controller.spec.ts index 278ef3034e..41d2380130 100644 --- a/services/apps/alcs/src/alcs/search/search.controller.spec.ts +++ b/services/apps/alcs/src/alcs/search/search.controller.spec.ts @@ -10,15 +10,24 @@ import { Card } from '../card/card.entity'; import { Covenant } from '../covenant/covenant.entity'; import { NoticeOfIntent } from '../notice-of-intent/notice-of-intent.entity'; import { PlanningReview } from '../planning-review/planning-review.entity'; +import { ApplicationAdvancedSearchService } from './application/application-advanced-search.service'; +import { ApplicationSubmissionSearchView } from './application/application-search-view.entity'; +import { NoticeOfIntentAdvancedSearchService } from './notice-of-intent/notice-of-intent-advanced-search.service'; +import { NoticeOfIntentSubmissionSearchView } from './notice-of-intent/notice-of-intent-search-view.entity'; import { SearchController } from './search.controller'; +import { AdvancedSearchResultDto, SearchRequestDto } from './search.dto'; import { SearchService } from './search.service'; describe('SearchController', () => { let controller: SearchController; let mockSearchService: DeepMocked; + let mockNoticeOfIntentAdvancedSearchService: DeepMocked; + let mockApplicationAdvancedSearchService: DeepMocked; beforeEach(async () => { mockSearchService = createMock(); + mockNoticeOfIntentAdvancedSearchService = createMock(); + mockApplicationAdvancedSearchService = createMock(); const module: TestingModule = await Test.createTestingModule({ imports: [ @@ -31,6 +40,14 @@ describe('SearchController', () => { provide: SearchService, useValue: mockSearchService, }, + { + provide: NoticeOfIntentAdvancedSearchService, + useValue: mockNoticeOfIntentAdvancedSearchService, + }, + { + provide: ApplicationAdvancedSearchService, + useValue: mockApplicationAdvancedSearchService, + }, { provide: ClsService, useValue: {}, @@ -62,13 +79,33 @@ describe('SearchController', () => { } as Card, }), ); + + const mockNoiResult = new AdvancedSearchResultDto< + NoticeOfIntentSubmissionSearchView[] + >(); + mockNoiResult.data = new Array(); + mockNoiResult.total = 0; + + mockNoticeOfIntentAdvancedSearchService.searchNoticeOfIntents.mockResolvedValue( + mockNoiResult, + ); + + const mockApplicationResult = new AdvancedSearchResultDto< + ApplicationSubmissionSearchView[] + >(); + mockApplicationResult.data = new Array(); + mockApplicationResult.total = 0; + + mockApplicationAdvancedSearchService.searchApplications.mockResolvedValue( + mockApplicationResult, + ); }); it('should be defined', () => { expect(controller).toBeDefined(); }); - it('should call service to retrieve Application, Noi, Planning, Covenant', async () => { + it('should call service to retrieve Application, Noi, Planning, Covenant by file number', async () => { const searchString = 'fake'; const result = await controller.search(searchString); @@ -83,4 +120,64 @@ describe('SearchController', () => { expect(result).toBeDefined(); expect(result.length).toBe(4); }); + + it('should call applications advanced search to retrieve Applications', async () => { + const mockSearchRequestDto = { + pageSize: 1, + page: 1, + sortField: '1', + sortDirection: 'ASC', + isIncludeOtherParcels: false, + applicationFileTypes: [], + }; + + mockApplicationAdvancedSearchService.searchApplications.mockResolvedValue({ + data: [], + total: 0, + }); + + const result = await controller.advancedSearch( + mockSearchRequestDto as SearchRequestDto, + ); + + expect( + mockApplicationAdvancedSearchService.searchApplications, + ).toBeCalledTimes(1); + expect( + mockApplicationAdvancedSearchService.searchApplications, + ).toBeCalledWith(mockSearchRequestDto); + expect(result.applications).toBeDefined(); + expect(result.totalApplications).toBe(0); + }); + + it('should call NOI advanced search to retrieve NOIs', async () => { + const mockSearchRequestDto = { + pageSize: 1, + page: 1, + sortField: '1', + sortDirection: 'ASC', + isIncludeOtherParcels: false, + applicationFileTypes: [], + }; + + mockNoticeOfIntentAdvancedSearchService.searchNoticeOfIntents.mockResolvedValue( + { + data: [], + total: 0, + }, + ); + + const result = await controller.advancedSearch( + mockSearchRequestDto as SearchRequestDto, + ); + + expect( + mockNoticeOfIntentAdvancedSearchService.searchNoticeOfIntents, + ).toBeCalledTimes(1); + expect( + mockNoticeOfIntentAdvancedSearchService.searchNoticeOfIntents, + ).toBeCalledWith(mockSearchRequestDto); + expect(result.applications).toBeDefined(); + expect(result.totalApplications).toBe(0); + }); }); diff --git a/services/apps/alcs/src/alcs/search/search.controller.ts b/services/apps/alcs/src/alcs/search/search.controller.ts index 24f7398346..9d6f5e753c 100644 --- a/services/apps/alcs/src/alcs/search/search.controller.ts +++ b/services/apps/alcs/src/alcs/search/search.controller.ts @@ -1,6 +1,6 @@ import { Mapper } from '@automapper/core'; import { InjectMapper } from '@automapper/nestjs'; -import { Controller, Get, Param, UseGuards } from '@nestjs/common'; +import { Body, Controller, Get, Param, Post, UseGuards } from '@nestjs/common'; import { ApiOAuth2 } from '@nestjs/swagger'; import * as config from 'config'; import { ROLES_ALLOWED_APPLICATIONS } from '../../common/authorization/roles'; @@ -13,7 +13,18 @@ import { ApplicationType } from '../code/application-code/application-type/appli import { Covenant } from '../covenant/covenant.entity'; import { NoticeOfIntent } from '../notice-of-intent/notice-of-intent.entity'; import { PlanningReview } from '../planning-review/planning-review.entity'; -import { SearchResultDto } from './search.dto'; +import { ApplicationAdvancedSearchService } from './application/application-advanced-search.service'; +import { ApplicationSubmissionSearchView } from './application/application-search-view.entity'; +import { NoticeOfIntentAdvancedSearchService } from './notice-of-intent/notice-of-intent-advanced-search.service'; +import { NoticeOfIntentSubmissionSearchView } from './notice-of-intent/notice-of-intent-search-view.entity'; +import { + AdvancedSearchResponseDto, + AdvancedSearchResultDto, + ApplicationSearchResultDto, + NoticeOfIntentSearchResultDto, + SearchRequestDto, + SearchResultDto, +} from './search.dto'; import { SearchService } from './search.service'; @ApiOAuth2(config.get('KEYCLOAK.SCOPES')) @@ -23,10 +34,12 @@ export class SearchController { constructor( private searchService: SearchService, @InjectMapper() private mapper: Mapper, + private noticeOfIntentSearchService: NoticeOfIntentAdvancedSearchService, + private applicationSearchService: ApplicationAdvancedSearchService, ) {} - @Get('/:searchTerm') @UserRoles(...ROLES_ALLOWED_APPLICATIONS) + @Get('/:searchTerm') async search(@Param('searchTerm') searchTerm) { const application = await this.searchService.getApplication(searchTerm); @@ -122,4 +135,137 @@ export class SearchController { return result; } + + @Post('/advanced') + @UserRoles(...ROLES_ALLOWED_APPLICATIONS) + async advancedSearch(@Body() searchDto: SearchRequestDto) { + const applicationSearchResult = + await this.applicationSearchService.searchApplications(searchDto); + + const noticeOfIntentSearchService = + await this.noticeOfIntentSearchService.searchNoticeOfIntents(searchDto); + + const mappedSearchResult = this.mapAdvancedSearchResults( + applicationSearchResult, + noticeOfIntentSearchService, + ); + + return mappedSearchResult; + } + + @Post('/advanced/application') + @UserRoles(...ROLES_ALLOWED_APPLICATIONS) + async advancedSearchApplications( + @Body() searchDto: SearchRequestDto, + ): Promise> { + const applicationSearchResult = + await this.applicationSearchService.searchApplications(searchDto); + + const mappedSearchResult = this.mapAdvancedSearchResults( + applicationSearchResult, + null, + ); + + return { + total: mappedSearchResult.totalApplications, + data: mappedSearchResult.applications, + }; + } + + @Post('/advanced/notice-of-intent') + @UserRoles(...ROLES_ALLOWED_APPLICATIONS) + async advancedSearchNoticeOfIntents( + @Body() searchDto: SearchRequestDto, + ): Promise> { + const noticeOfIntentSearchService = + await this.noticeOfIntentSearchService.searchNoticeOfIntents(searchDto); + + const mappedSearchResult = this.mapAdvancedSearchResults( + null, + noticeOfIntentSearchService, + ); + + return { + total: mappedSearchResult.totalNoticeOfIntents, + data: mappedSearchResult.noticeOfIntents, + }; + } + + private mapAdvancedSearchResults( + applications: AdvancedSearchResultDto< + ApplicationSubmissionSearchView[] + > | null, + noticeOfIntents: AdvancedSearchResultDto< + NoticeOfIntentSubmissionSearchView[] + > | null, + ) { + const response = new AdvancedSearchResponseDto(); + + const mappedApplications: ApplicationSearchResultDto[] = []; + if (applications && applications.data.length > 0) { + mappedApplications.push( + ...applications.data.map((app) => + this.mapApplicationToAdvancedSearchResult(app), + ), + ); + } + + const mappedNoticeOfIntents: NoticeOfIntentSearchResultDto[] = []; + if (noticeOfIntents && noticeOfIntents.data.length > 0) { + mappedNoticeOfIntents.push( + ...noticeOfIntents.data.map((noi) => + this.mapNoticeOfIntentToAdvancedSearchResult(noi), + ), + ); + } + + response.applications = mappedApplications; + response.totalApplications = applications?.total ?? 0; + response.noticeOfIntents = mappedNoticeOfIntents; + response.totalNoticeOfIntents = noticeOfIntents?.total ?? 0; + + return response; + } + + private mapApplicationToAdvancedSearchResult( + application: ApplicationSubmissionSearchView, + ) { + const result = { + referenceId: application.fileNumber, + fileNumber: application.fileNumber, + dateSubmitted: application.dateSubmittedToAlc, + type: this.mapper.map( + application.applicationType, + ApplicationType, + ApplicationTypeDto, + ), + localGovernmentName: application.localGovernmentName, + ownerName: application.applicant, + class: 'APP', + status: application.status.status_type_code, + } as ApplicationSearchResultDto; + + return result; + } + + private mapNoticeOfIntentToAdvancedSearchResult( + noi: NoticeOfIntentSubmissionSearchView, + ) { + const result = { + referenceId: noi.fileNumber, + fileNumber: noi.fileNumber, + dateSubmitted: noi.dateSubmittedToAlc, + type: this.mapper.map( + noi.noticeOfIntentType, + ApplicationType, + ApplicationTypeDto, + ), + localGovernmentName: noi.localGovernmentName, + ownerName: noi.applicant, + class: 'NOI', + status: noi.status.status_type_code, + } as NoticeOfIntentSearchResultDto; + + return result; + } } diff --git a/services/apps/alcs/src/alcs/search/search.dto.ts b/services/apps/alcs/src/alcs/search/search.dto.ts index 36d0c58de1..0a3ff0db2d 100644 --- a/services/apps/alcs/src/alcs/search/search.dto.ts +++ b/services/apps/alcs/src/alcs/search/search.dto.ts @@ -1,3 +1,11 @@ +import { + IsArray, + IsBoolean, + IsNumber, + IsOptional, + IsString, + MinLength, +} from 'class-validator'; import { ApplicationTypeDto } from '../code/application-code/application-type/application-type.dto'; export class SearchResultDto { @@ -9,3 +17,117 @@ export class SearchResultDto { boardCode?: string; label?: ApplicationTypeDto; } + +export class ApplicationSearchResultDto { + type: ApplicationTypeDto; + referenceId: string; + ownerName?: string; + localGovernmentName: string; + fileNumber: string; + boardCode?: string; + status: string; +} + +export class NoticeOfIntentSearchResultDto { + type: ApplicationTypeDto; + referenceId: string; + ownerName?: string; + localGovernmentName: string; + fileNumber: string; + boardCode?: string; + status: string; +} + +export class AdvancedSearchResponseDto { + applications: ApplicationSearchResultDto[]; + noticeOfIntents: NoticeOfIntentSearchResultDto[]; + totalApplications: number; + totalNoticeOfIntents: number; +} + +export class AdvancedSearchResultDto { + data: T; + total: number; +} + +export class SearchRequestDto { + @IsString() + @IsOptional() + @MinLength(3) + fileNumber?: string; + + @IsString() + @IsOptional() + @MinLength(3) + legacyId?: string; + + @IsString() + @IsOptional() + @MinLength(3) + name?: string; + + @IsString() + @IsOptional() + @MinLength(9) + pid?: string; + + @IsString() + @IsOptional() + @MinLength(3) + civicAddress?: string; + + @IsBoolean() + @IsOptional() + isIncludeOtherParcels = false; + + @IsNumber() + @IsOptional() + resolutionNumber?: number; + + @IsNumber() + @IsOptional() + resolutionYear?: number; + + @IsString() + @IsOptional() + portalStatusCode?: string; + + @IsString() + @IsOptional() + governmentName?: string; + + @IsString() + @IsOptional() + regionCode?: string; + + @IsNumber() + @IsOptional() + dateSubmittedFrom?: number; + + @IsNumber() + @IsOptional() + dateSubmittedTo?: number; + + @IsNumber() + @IsOptional() + dateDecidedFrom?: number; + + @IsNumber() + @IsOptional() + dateDecidedTo?: number; + + @IsArray() + applicationFileTypes: string[]; + + @IsNumber() + page: number; + + @IsNumber() + pageSize: number; + + @IsString() + sortField: string; + + @IsString() + sortDirection: 'ASC' | 'DESC'; +} diff --git a/services/apps/alcs/src/alcs/search/search.module.ts b/services/apps/alcs/src/alcs/search/search.module.ts index 38c9051ac4..b3fee1cb95 100644 --- a/services/apps/alcs/src/alcs/search/search.module.ts +++ b/services/apps/alcs/src/alcs/search/search.module.ts @@ -1,11 +1,15 @@ import { Module } from '@nestjs/common'; import { TypeOrmModule } from '@nestjs/typeorm'; import { ApplicationProfile } from '../../common/automapper/application.automapper.profile'; -import { LocalGovernment } from '../local-government/local-government.entity'; import { Application } from '../application/application.entity'; import { Covenant } from '../covenant/covenant.entity'; +import { LocalGovernment } from '../local-government/local-government.entity'; import { NoticeOfIntent } from '../notice-of-intent/notice-of-intent.entity'; import { PlanningReview } from '../planning-review/planning-review.entity'; +import { ApplicationAdvancedSearchService } from './application/application-advanced-search.service'; +import { ApplicationSubmissionSearchView } from './application/application-search-view.entity'; +import { NoticeOfIntentAdvancedSearchService } from './notice-of-intent/notice-of-intent-advanced-search.service'; +import { NoticeOfIntentSubmissionSearchView } from './notice-of-intent/notice-of-intent-search-view.entity'; import { SearchController } from './search.controller'; import { SearchService } from './search.service'; @@ -17,9 +21,16 @@ import { SearchService } from './search.service'; PlanningReview, Covenant, LocalGovernment, + ApplicationSubmissionSearchView, + NoticeOfIntentSubmissionSearchView, ]), ], - providers: [SearchService, ApplicationProfile], + providers: [ + SearchService, + ApplicationProfile, + ApplicationAdvancedSearchService, + NoticeOfIntentAdvancedSearchService, + ], controllers: [SearchController], }) export class SearchModule {} diff --git a/services/apps/alcs/src/alcs/search/search.service.spec.ts b/services/apps/alcs/src/alcs/search/search.service.spec.ts index 497ae813d8..a75070366e 100644 --- a/services/apps/alcs/src/alcs/search/search.service.spec.ts +++ b/services/apps/alcs/src/alcs/search/search.service.spec.ts @@ -4,8 +4,10 @@ import { getRepositoryToken } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { Application } from '../application/application.entity'; import { Covenant } from '../covenant/covenant.entity'; +import { LocalGovernment } from '../local-government/local-government.entity'; import { NoticeOfIntent } from '../notice-of-intent/notice-of-intent.entity'; import { PlanningReview } from '../planning-review/planning-review.entity'; +import { ApplicationSubmissionSearchView } from './application/application-search-view.entity'; import { SearchService } from './search.service'; describe('SearchService', () => { @@ -14,6 +16,10 @@ describe('SearchService', () => { let mockNoiRepository: DeepMocked>; let mockPlanningReviewRepository: DeepMocked>; let mockCovenantRepository: DeepMocked>; + let mockApplicationSubmissionSearchView: DeepMocked< + Repository + >; + let mockLocalGovernment: DeepMocked>; const fakeFileNumber = 'fake'; @@ -22,6 +28,8 @@ describe('SearchService', () => { mockNoiRepository = createMock(); mockPlanningReviewRepository = createMock(); mockCovenantRepository = createMock(); + mockApplicationSubmissionSearchView = createMock(); + mockLocalGovernment = createMock(); const module: TestingModule = await Test.createTestingModule({ providers: [ @@ -42,6 +50,14 @@ describe('SearchService', () => { provide: getRepositoryToken(Covenant), useValue: mockCovenantRepository, }, + { + provide: getRepositoryToken(ApplicationSubmissionSearchView), + useValue: mockApplicationSubmissionSearchView, + }, + { + provide: getRepositoryToken(LocalGovernment), + useValue: mockLocalGovernment, + }, ], }).compile(); diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1692985798191-get_current_status_function.ts b/services/apps/alcs/src/providers/typeorm/migrations/1692985798191-get_current_status_function.ts new file mode 100644 index 0000000000..542e0bf519 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1692985798191-get_current_status_function.ts @@ -0,0 +1,41 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class getCurrentStatusFunction1692985798191 + implements MigrationInterface +{ + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `CREATE OR REPLACE FUNCTION alcs.get_current_status_for_submission_by_uuid(application_submission_uuid uuid) + RETURNS jsonb + LANGUAGE plpgsql + AS $function$ + DECLARE + utc_timestamp_tomorrow timestamptz; + result RECORD; + BEGIN + -- TODO adjust the date according to api + utc_timestamp_tomorrow = timezone('utc', (now() - INTERVAL '-1 DAY')); + + SELECT + astss.submission_uuid , astss.status_type_code ,astss.effective_date, asst."label" + FROM alcs.application_submission_status_type asst + JOIN alcs.application_submission_to_submission_status astss + ON asst.code = astss.status_type_code + AND astss.submission_uuid = application_submission_uuid + AND astss.effective_date IS NOT NULL + WHERE + astss.effective_date < utc_timestamp_tomorrow + ORDER BY astss.effective_date desc, weight desc + LIMIT 1 INTO result; + + RETURN row_to_json(RESULT); + + END;$function$ + ;`, + ); + } + + public async down(queryRunner: QueryRunner): Promise { + // nope + } +} diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1693352687970-app_search_view.ts b/services/apps/alcs/src/providers/typeorm/migrations/1693352687970-app_search_view.ts new file mode 100644 index 0000000000..668d9746cf --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1693352687970-app_search_view.ts @@ -0,0 +1,30 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class appSearchView1693352687970 implements MigrationInterface { + name = 'appSearchView1693352687970'; + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `CREATE VIEW "alcs"."application_submission_search_view" AS SELECT "as2"."uuid" AS "uuid", "as2"."applicant" AS "applicant", "a"."uuid" AS "application_uuid", "applicationType"."audit_deleted_date_at" AS "applicationType_audit_deleted_date_at", "applicationType"."audit_created_at" AS "applicationType_audit_created_at", "applicationType"."audit_updated_at" AS "applicationType_audit_updated_at", "applicationType"."audit_created_by" AS "applicationType_audit_created_by", "applicationType"."audit_updated_by" AS "applicationType_audit_updated_by", "applicationType"."label" AS "applicationType_label", "applicationType"."code" AS "applicationType_code", "applicationType"."description" AS "applicationType_description", "applicationType"."short_label" AS "applicationType_short_label", "applicationType"."background_color" AS "applicationType_background_color", "applicationType"."text_color" AS "applicationType_text_color", "applicationType"."html_description" AS "applicationType_html_description", "applicationType"."portal_label" AS "applicationType_portal_label", "localGovernment"."name" AS "local_government_name", "as2"."file_number" AS "file_number", "as2"."local_government_uuid" AS "local_government_uuid", "as2"."type_code" AS "application_type_code", "as2"."is_draft" AS "is_draft", "a"."legacy_id" AS "legacy_id", "a"."date_submitted_to_alc" AS "date_submitted_to_alc", "a"."decision_date" AS "decision_date", "a"."region_code" AS "application_region_code", alcs.get_current_status_for_submission_by_uuid("as2"."uuid") AS "status" FROM "alcs"."application_submission" "as2" INNER JOIN "alcs"."application" "a" ON "a"."file_number" = "as2"."file_number" AND "a"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."application_type" "applicationType" ON "as2"."type_code" = "applicationType"."code" AND "applicationType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "as2"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL WHERE "as2"."audit_deleted_date_at" IS NULL`, + ); + await queryRunner.query( + `INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, + [ + 'alcs', + 'VIEW', + 'application_submission_search_view', + 'SELECT "as2"."uuid" AS "uuid", "as2"."applicant" AS "applicant", "a"."uuid" AS "application_uuid", "applicationType"."audit_deleted_date_at" AS "applicationType_audit_deleted_date_at", "applicationType"."audit_created_at" AS "applicationType_audit_created_at", "applicationType"."audit_updated_at" AS "applicationType_audit_updated_at", "applicationType"."audit_created_by" AS "applicationType_audit_created_by", "applicationType"."audit_updated_by" AS "applicationType_audit_updated_by", "applicationType"."label" AS "applicationType_label", "applicationType"."code" AS "applicationType_code", "applicationType"."description" AS "applicationType_description", "applicationType"."short_label" AS "applicationType_short_label", "applicationType"."background_color" AS "applicationType_background_color", "applicationType"."text_color" AS "applicationType_text_color", "applicationType"."html_description" AS "applicationType_html_description", "applicationType"."portal_label" AS "applicationType_portal_label", "localGovernment"."name" AS "local_government_name", "as2"."file_number" AS "file_number", "as2"."local_government_uuid" AS "local_government_uuid", "as2"."type_code" AS "application_type_code", "as2"."is_draft" AS "is_draft", "a"."legacy_id" AS "legacy_id", "a"."date_submitted_to_alc" AS "date_submitted_to_alc", "a"."decision_date" AS "decision_date", "a"."region_code" AS "application_region_code", alcs.get_current_status_for_submission_by_uuid("as2"."uuid") AS "status" FROM "alcs"."application_submission" "as2" INNER JOIN "alcs"."application" "a" ON "a"."file_number" = "as2"."file_number" AND "a"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."application_type" "applicationType" ON "as2"."type_code" = "applicationType"."code" AND "applicationType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "as2"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL WHERE "as2"."audit_deleted_date_at" IS NULL', + ], + ); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, + ['VIEW', 'application_submission_search_view', 'alcs'], + ); + await queryRunner.query( + `DROP VIEW "alcs"."application_submission_search_view"`, + ); + } +} diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1693410289968-rename_get_current_status_function.ts b/services/apps/alcs/src/providers/typeorm/migrations/1693410289968-rename_get_current_status_function.ts new file mode 100644 index 0000000000..10c1ff185a --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1693410289968-rename_get_current_status_function.ts @@ -0,0 +1,15 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class renameGetCurrentStatusFunction1693410289968 + implements MigrationInterface +{ + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query(` + ALTER FUNCTION alcs.get_current_status_for_submission_by_uuid(uuid) RENAME TO get_current_status_for_application_submission_by_uuid; + `); + } + + public async down(queryRunner: QueryRunner): Promise { + // nope + } +} diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1693410408169-get_current_status_for_noi_function.ts b/services/apps/alcs/src/providers/typeorm/migrations/1693410408169-get_current_status_for_noi_function.ts new file mode 100644 index 0000000000..6110dfb108 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1693410408169-get_current_status_for_noi_function.ts @@ -0,0 +1,41 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class getCurrentStatusForNoiFunction1693410408169 + implements MigrationInterface +{ + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `CREATE OR REPLACE FUNCTION alcs.get_current_status_for_notice_of_intent_submission_by_uuid(application_submission_uuid uuid) + RETURNS jsonb + LANGUAGE plpgsql + AS $function$ + DECLARE + utc_timestamp_tomorrow timestamptz; + result RECORD; + BEGIN + -- TODO adjust the date according to api + utc_timestamp_tomorrow = timezone('utc', (now() - INTERVAL '-1 DAY')); + + SELECT + noistss.submission_uuid , noistss.status_type_code ,noistss.effective_date, noisst."label" + FROM alcs.notice_of_intent_submission_status_type noisst + JOIN alcs.notice_of_intent_submission_to_submission_status noistss + ON noisst.code = noistss.status_type_code + AND noistss.submission_uuid = application_submission_uuid + AND noistss.effective_date IS NOT NULL + WHERE + noistss.effective_date < utc_timestamp_tomorrow + ORDER BY noistss.effective_date desc, weight desc + LIMIT 1 INTO result; + + RETURN row_to_json(RESULT); + + END;$function$ + ;`, + ); + } + + public async down(queryRunner: QueryRunner): Promise { + // nope + } +} diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1693416651488-noi_search_view.ts b/services/apps/alcs/src/providers/typeorm/migrations/1693416651488-noi_search_view.ts new file mode 100644 index 0000000000..c0fee51a94 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1693416651488-noi_search_view.ts @@ -0,0 +1,30 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class noiSearchView1693416651488 implements MigrationInterface { + name = 'noiSearchView1693416651488'; + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `CREATE VIEW "alcs"."notice_of_intent_submission_search_view" AS SELECT "nois"."uuid" AS "uuid", "nois"."applicant" AS "applicant", "noi"."uuid" AS "notice_of_intent_uuid", "noticeOfIntentType"."audit_deleted_date_at" AS "noticeOfIntentType_audit_deleted_date_at", "noticeOfIntentType"."audit_created_at" AS "noticeOfIntentType_audit_created_at", "noticeOfIntentType"."audit_updated_at" AS "noticeOfIntentType_audit_updated_at", "noticeOfIntentType"."audit_created_by" AS "noticeOfIntentType_audit_created_by", "noticeOfIntentType"."audit_updated_by" AS "noticeOfIntentType_audit_updated_by", "noticeOfIntentType"."label" AS "noticeOfIntentType_label", "noticeOfIntentType"."code" AS "noticeOfIntentType_code", "noticeOfIntentType"."description" AS "noticeOfIntentType_description", "noticeOfIntentType"."short_label" AS "noticeOfIntentType_short_label", "noticeOfIntentType"."html_description" AS "noticeOfIntentType_html_description", "noticeOfIntentType"."portal_label" AS "noticeOfIntentType_portal_label", "localGovernment"."name" AS "local_government_name", "nois"."file_number" AS "file_number", "nois"."local_government_uuid" AS "local_government_uuid", "nois"."type_code" AS "notice_of_intent_type_code", "nois"."is_draft" AS "is_draft", "noi"."date_submitted_to_alc" AS "date_submitted_to_alc", "noi"."decision_date" AS "decision_date", "noi"."region_code" AS "notice_of_intent_region_code", alcs.get_current_status_for_notice_of_intent_submission_by_uuid("nois"."uuid") AS "status" FROM "alcs"."notice_of_intent_submission" "nois" INNER JOIN "alcs"."notice_of_intent" "noi" ON "noi"."file_number" = "nois"."file_number" AND "noi"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."notice_of_intent_type" "noticeOfIntentType" ON "nois"."type_code" = "noticeOfIntentType"."code" AND "noticeOfIntentType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "nois"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL WHERE "nois"."audit_deleted_date_at" IS NULL`, + ); + await queryRunner.query( + `INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, + [ + 'alcs', + 'VIEW', + 'notice_of_intent_submission_search_view', + 'SELECT "nois"."uuid" AS "uuid", "nois"."applicant" AS "applicant", "noi"."uuid" AS "notice_of_intent_uuid", "noticeOfIntentType"."audit_deleted_date_at" AS "noticeOfIntentType_audit_deleted_date_at", "noticeOfIntentType"."audit_created_at" AS "noticeOfIntentType_audit_created_at", "noticeOfIntentType"."audit_updated_at" AS "noticeOfIntentType_audit_updated_at", "noticeOfIntentType"."audit_created_by" AS "noticeOfIntentType_audit_created_by", "noticeOfIntentType"."audit_updated_by" AS "noticeOfIntentType_audit_updated_by", "noticeOfIntentType"."label" AS "noticeOfIntentType_label", "noticeOfIntentType"."code" AS "noticeOfIntentType_code", "noticeOfIntentType"."description" AS "noticeOfIntentType_description", "noticeOfIntentType"."short_label" AS "noticeOfIntentType_short_label", "noticeOfIntentType"."html_description" AS "noticeOfIntentType_html_description", "noticeOfIntentType"."portal_label" AS "noticeOfIntentType_portal_label", "localGovernment"."name" AS "local_government_name", "nois"."file_number" AS "file_number", "nois"."local_government_uuid" AS "local_government_uuid", "nois"."type_code" AS "notice_of_intent_type_code", "nois"."is_draft" AS "is_draft", "noi"."date_submitted_to_alc" AS "date_submitted_to_alc", "noi"."decision_date" AS "decision_date", "noi"."region_code" AS "notice_of_intent_region_code", alcs.get_current_status_for_notice_of_intent_submission_by_uuid("nois"."uuid") AS "status" FROM "alcs"."notice_of_intent_submission" "nois" INNER JOIN "alcs"."notice_of_intent" "noi" ON "noi"."file_number" = "nois"."file_number" AND "noi"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."notice_of_intent_type" "noticeOfIntentType" ON "nois"."type_code" = "noticeOfIntentType"."code" AND "noticeOfIntentType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "nois"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL WHERE "nois"."audit_deleted_date_at" IS NULL', + ], + ); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, + ['VIEW', 'notice_of_intent_submission_search_view', 'alcs'], + ); + await queryRunner.query( + `DROP VIEW "alcs"."notice_of_intent_submission_search_view"`, + ); + } +} diff --git a/services/apps/alcs/src/utils/search-helper.spec.ts b/services/apps/alcs/src/utils/search-helper.spec.ts new file mode 100644 index 0000000000..38b1063f1b --- /dev/null +++ b/services/apps/alcs/src/utils/search-helper.spec.ts @@ -0,0 +1,35 @@ +import { formatStringToPostgresSearchStringArrayWithWildCard } from './search-helper'; + +describe('formatStringToSearchStringWithWildCard', () => { + test('should format string correctly when input contains single word', () => { + const input = 'word'; + const expectedOutput = '{%word%}'; + const actualOutput = + formatStringToPostgresSearchStringArrayWithWildCard(input); + expect(actualOutput).toBe(expectedOutput); + }); + + test('should format string correctly when input contains multiple words', () => { + const input = 'multiple words'; + const expectedOutput = '{%multiple%,%words%,%multiple words%}'; + const actualOutput = + formatStringToPostgresSearchStringArrayWithWildCard(input); + expect(actualOutput).toBe(expectedOutput); + }); + + test('should trim input and format string correctly', () => { + const input = ' trimmed word '; + const expectedOutput = '{%trimmed%,%word%,%trimmed word%}'; + const actualOutput = + formatStringToPostgresSearchStringArrayWithWildCard(input); + expect(actualOutput).toBe(expectedOutput); + }); + + it('should handle empty string correctly', () => { + const input = ''; + const expectedOutput = '{%%}'; + expect(formatStringToPostgresSearchStringArrayWithWildCard(input)).toBe( + expectedOutput, + ); + }); +}); diff --git a/services/apps/alcs/src/utils/search-helper.ts b/services/apps/alcs/src/utils/search-helper.ts new file mode 100644 index 0000000000..4ee7141d7c --- /dev/null +++ b/services/apps/alcs/src/utils/search-helper.ts @@ -0,0 +1,18 @@ +export const formatStringToPostgresSearchStringArrayWithWildCard = ( + input: string, +): string => { + input = input.trim(); + const splitString = input.split(' '); + let output = ''; + + if (splitString.length === 1) { + output = splitString.map((word) => `%${word}%`.toLowerCase()).join(','); + return `{${output}}`; + } + + output = splitString + .map((word) => `%${word}%`.trim().toLowerCase()) + .join(','); + output += `,%${input}%`; + return `{${output}}`; +}; From 607f7e86441acae1ff32b7be1fac9428b0c273c1 Mon Sep 17 00:00:00 2001 From: "to. sandra" <76515860+sandratoh@users.noreply.github.com> Date: Thu, 31 Aug 2023 14:07:49 -0700 Subject: [PATCH 329/954] Fix portal bugs with edit submissions and reviews (#931) * Improve dialog text readability * Add toast error message and validation for lfng review * Pass lfng review unit test --- .../remove-file-confirmation-dialog.component.html | 11 +++++++++-- .../review-submission.component.html | 5 ++++- .../review-submit-fng.component.spec.ts | 7 +++++++ .../review-submit-fng/review-submit-fng.component.ts | 4 ++++ .../review-submit/review-submit.component.spec.ts | 7 +++++++ .../review-submit/review-submit.component.ts | 4 ++++ .../remove-file-confirmation-dialog.component.html | 11 +++++++++-- 7 files changed, 44 insertions(+), 5 deletions(-) diff --git a/portal-frontend/src/app/features/applications/alcs-edit-submission/remove-file-confirmation-dialog/remove-file-confirmation-dialog.component.html b/portal-frontend/src/app/features/applications/alcs-edit-submission/remove-file-confirmation-dialog/remove-file-confirmation-dialog.component.html index e4aa159b4d..5f486cb803 100644 --- a/portal-frontend/src/app/features/applications/alcs-edit-submission/remove-file-confirmation-dialog/remove-file-confirmation-dialog.component.html +++ b/portal-frontend/src/app/features/applications/alcs-edit-submission/remove-file-confirmation-dialog/remove-file-confirmation-dialog.component.html @@ -4,8 +4,15 @@

Remove Submission Document

- Warning: This document will be immediately deleted from ALCS and the Portal and cannot be undone. To retain, - first download a copy from the Documents tab in ALCS then return to complete this action. +
+ Warning: This document will be immediately deleted from ALCS and the Portal and cannot be undone. To retain + the document, first download a copy from the Documents tab in ALCS then return to complete this action. +
+
+
+ To replace the document on the Submission: delete current, upload new, then update the submission (via Review & + Submit). +
diff --git a/portal-frontend/src/app/features/applications/review-submission/review-submission.component.html b/portal-frontend/src/app/features/applications/review-submission/review-submission.component.html index 8edf89fd36..19bf444e54 100644 --- a/portal-frontend/src/app/features/applications/review-submission/review-submission.component.html +++ b/portal-frontend/src/app/features/applications/review-submission/review-submission.component.html @@ -93,7 +93,10 @@
Application ID: {{ application.fileNumber }} | {{ applic
- +
diff --git a/portal-frontend/src/app/features/applications/review-submission/review-submit-fng/review-submit-fng.component.spec.ts b/portal-frontend/src/app/features/applications/review-submission/review-submit-fng/review-submit-fng.component.spec.ts index 48641df391..b860ebee32 100644 --- a/portal-frontend/src/app/features/applications/review-submission/review-submit-fng/review-submit-fng.component.spec.ts +++ b/portal-frontend/src/app/features/applications/review-submission/review-submit-fng/review-submit-fng.component.spec.ts @@ -11,6 +11,7 @@ import { ApplicationSubmissionService } from '../../../../services/application-s import { PdfGenerationService } from '../../../../services/pdf-generation/pdf-generation.service'; import { ReviewSubmitFngComponent } from './review-submit-fng.component'; +import { ToastService } from '../../../../services/toast/toast.service'; describe('ReviewSubmitFngComponent', () => { let component: ReviewSubmitFngComponent; @@ -18,6 +19,7 @@ describe('ReviewSubmitFngComponent', () => { let mockAppReviewService: DeepMocked; let mockAppSubmissionService: DeepMocked; let mockAppDocumentService: DeepMocked; + let mockToastService: DeepMocked; let mockPdfGenerationService: DeepMocked; let applicationPipe = new BehaviorSubject(undefined); @@ -29,6 +31,7 @@ describe('ReviewSubmitFngComponent', () => { undefined ); mockAppDocumentService = createMock(); + mockToastService = createMock(); mockPdfGenerationService = createMock(); mockAppSubmissionService = createMock(); @@ -50,6 +53,10 @@ describe('ReviewSubmitFngComponent', () => { provide: PdfGenerationService, useValue: mockPdfGenerationService, }, + { + provide: ToastService, + useValue: mockToastService, + }, ], declarations: [ReviewSubmitFngComponent], schemas: [NO_ERRORS_SCHEMA], diff --git a/portal-frontend/src/app/features/applications/review-submission/review-submit-fng/review-submit-fng.component.ts b/portal-frontend/src/app/features/applications/review-submission/review-submit-fng/review-submit-fng.component.ts index fc165fe3c2..b2d992c0cf 100644 --- a/portal-frontend/src/app/features/applications/review-submission/review-submit-fng/review-submit-fng.component.ts +++ b/portal-frontend/src/app/features/applications/review-submission/review-submit-fng/review-submit-fng.component.ts @@ -12,6 +12,7 @@ import { CustomStepperComponent } from '../../../../shared/custom-stepper/custom import { DOCUMENT_TYPE } from '../../../../shared/dto/document.dto'; import { MOBILE_BREAKPOINT } from '../../../../shared/utils/breakpoints'; import { ReviewApplicationFngSteps } from '../review-submission.component'; +import { ToastService } from '../../../../services/toast/toast.service'; @Component({ selector: 'app-review-submit-fng[stepper]', @@ -42,6 +43,7 @@ export class ReviewSubmitFngComponent implements OnInit, OnDestroy { private router: Router, private applicationReviewService: ApplicationSubmissionReviewService, private applicationDocumentService: ApplicationDocumentService, + private toastService: ToastService, private pdfGenerationService: PdfGenerationService ) {} @@ -131,6 +133,8 @@ export class ReviewSubmitFngComponent implements OnInit, OnDestroy { } }, 5); + this.toastService.showErrorToast('Please correct all errors before submitting the form'); + return contactInfoValid && resolutionValid && attachmentsValid; } diff --git a/portal-frontend/src/app/features/applications/review-submission/review-submit/review-submit.component.spec.ts b/portal-frontend/src/app/features/applications/review-submission/review-submit/review-submit.component.spec.ts index 4bfb483bb5..6baabb88a1 100644 --- a/portal-frontend/src/app/features/applications/review-submission/review-submit/review-submit.component.spec.ts +++ b/portal-frontend/src/app/features/applications/review-submission/review-submit/review-submit.component.spec.ts @@ -10,12 +10,14 @@ import { ApplicationSubmissionDto } from '../../../../services/application-submi import { PdfGenerationService } from '../../../../services/pdf-generation/pdf-generation.service'; import { ReviewSubmitComponent } from './review-submit.component'; +import { ToastService } from '../../../../services/toast/toast.service'; describe('ReviewSubmitComponent', () => { let component: ReviewSubmitComponent; let fixture: ComponentFixture; let mockAppReviewService: DeepMocked; let mockAppDocumentService: DeepMocked; + let mockToastService: DeepMocked; let mockPdfGenerationService: DeepMocked; let applicationPipe = new BehaviorSubject(undefined); @@ -28,6 +30,7 @@ describe('ReviewSubmitComponent', () => { ); mockAppDocumentService = createMock(); + mockToastService = createMock(); mockPdfGenerationService = createMock(); await TestBed.configureTestingModule({ @@ -41,6 +44,10 @@ describe('ReviewSubmitComponent', () => { provide: ApplicationDocumentService, useValue: mockAppDocumentService, }, + { + provide: ToastService, + useValue: mockToastService, + }, { provide: PdfGenerationService, useValue: mockPdfGenerationService, diff --git a/portal-frontend/src/app/features/applications/review-submission/review-submit/review-submit.component.ts b/portal-frontend/src/app/features/applications/review-submission/review-submit/review-submit.component.ts index 0ee3796c66..b6a47e87fb 100644 --- a/portal-frontend/src/app/features/applications/review-submission/review-submit/review-submit.component.ts +++ b/portal-frontend/src/app/features/applications/review-submission/review-submit/review-submit.component.ts @@ -12,6 +12,7 @@ import { CustomStepperComponent } from '../../../../shared/custom-stepper/custom import { DOCUMENT_TYPE } from '../../../../shared/dto/document.dto'; import { MOBILE_BREAKPOINT } from '../../../../shared/utils/breakpoints'; import { ReviewApplicationSteps } from '../review-submission.component'; +import { ToastService } from '../../../../services/toast/toast.service'; @Component({ selector: 'app-review-submit[stepper]', @@ -46,6 +47,7 @@ export class ReviewSubmitComponent implements OnInit, OnDestroy { private router: Router, private applicationReviewService: ApplicationSubmissionReviewService, private applicationDocumentService: ApplicationDocumentService, + private toastService: ToastService, private pdfGenerationService: PdfGenerationService ) {} @@ -158,6 +160,8 @@ export class ReviewSubmitComponent implements OnInit, OnDestroy { }); } + this.toastService.showErrorToast('Please correct all errors before submitting the form'); + return contactInfoValid && ocpValid && zoningValid && authorizationValid && attachmentsValid; } return false; diff --git a/portal-frontend/src/app/features/notice-of-intents/alcs-edit-submission/remove-file-confirmation-dialog/remove-file-confirmation-dialog.component.html b/portal-frontend/src/app/features/notice-of-intents/alcs-edit-submission/remove-file-confirmation-dialog/remove-file-confirmation-dialog.component.html index e4aa159b4d..5f486cb803 100644 --- a/portal-frontend/src/app/features/notice-of-intents/alcs-edit-submission/remove-file-confirmation-dialog/remove-file-confirmation-dialog.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/alcs-edit-submission/remove-file-confirmation-dialog/remove-file-confirmation-dialog.component.html @@ -4,8 +4,15 @@

Remove Submission Document

- Warning: This document will be immediately deleted from ALCS and the Portal and cannot be undone. To retain, - first download a copy from the Documents tab in ALCS then return to complete this action. +
+ Warning: This document will be immediately deleted from ALCS and the Portal and cannot be undone. To retain + the document, first download a copy from the Documents tab in ALCS then return to complete this action. +
+
+
+ To replace the document on the Submission: delete current, upload new, then update the submission (via Review & + Submit). +
From 83baad4712b1450214a5de28fab6188e3ec8f4ec Mon Sep 17 00:00:00 2001 From: "to. sandra" <76515860+sandratoh@users.noreply.github.com> Date: Fri, 1 Sep 2023 11:08:52 -0700 Subject: [PATCH 330/954] Fix form validation to run by field state instead of button click (#934) --- .../additional-information.component.html | 3 ++- .../additional-information.component.ts | 17 +++++++---------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component.html index 29935d6930..40cdb0efee 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component.html @@ -114,7 +114,7 @@

Additional Proposal Information

Action - + @@ -137,6 +137,7 @@

Additional Proposal Information

color="primary" (click)="onStructureAdd()" [ngClass]="{ 'mat-error': proposedStructures.length < 1 && showErrors }" + type="button" > + Add Structure diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component.ts index 1c3cccbbb5..82ff5f4a63 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component.ts @@ -1,4 +1,4 @@ -import { Component, Input, OnDestroy, OnInit } from '@angular/core'; +import { Component, OnDestroy, OnInit } from '@angular/core'; import { FormControl, FormGroup, Validators } from '@angular/forms'; import { MatButtonToggleChange } from '@angular/material/button-toggle'; import { MatDialog } from '@angular/material/dialog'; @@ -146,7 +146,7 @@ export class AdditionalInformationComponent extends FilesStepComponent implement ) ) { this.isSoilStructureResidentialUseReasonVisible = true; - this.setRequiredAsync(this.soilStructureResidentialUseReason); + this.setRequired(this.soilStructureResidentialUseReason); } else { this.isSoilStructureResidentialUseReasonVisible = false; this.soilStructureResidentialUseReason.removeValidators([Validators.required]); @@ -157,7 +157,7 @@ export class AdditionalInformationComponent extends FilesStepComponent implement private setVisibilityAndValidatorsForAccessoryFields() { if (this.proposedStructures.some((structure) => structure.type === STRUCTURE_TYPES.ACCESSORY_STRUCTURE)) { this.isSoilStructureResidentialAccessoryUseReasonVisible = true; - this.setRequiredAsync(this.soilStructureResidentialAccessoryUseReason); + this.setRequired(this.soilStructureResidentialAccessoryUseReason); } else { this.isSoilStructureResidentialAccessoryUseReasonVisible = false; this.soilStructureResidentialAccessoryUseReason.removeValidators([Validators.required]); @@ -169,8 +169,8 @@ export class AdditionalInformationComponent extends FilesStepComponent implement if (this.proposedStructures.some((structure) => structure.type === STRUCTURE_TYPES.FARM_STRUCTURE)) { this.isSoilAgriParcelActivityVisible = true; this.isSoilStructureFarmUseReasonVisible = true; - this.setRequiredAsync(this.soilAgriParcelActivity); - this.setRequiredAsync(this.soilStructureFarmUseReason); + this.setRequired(this.soilAgriParcelActivity); + this.setRequired(this.soilStructureFarmUseReason); } else { this.isSoilAgriParcelActivityVisible = false; this.isSoilStructureFarmUseReasonVisible = false; @@ -293,10 +293,7 @@ export class AdditionalInformationComponent extends FilesStepComponent implement this.form.markAsDirty(); } - private setRequiredAsync(formControl: FormControl) { - //We set these asynchronously so they don't run immediately - setTimeout(() => { - formControl.setValidators([Validators.required]); - }); + private setRequired(formControl: FormControl) { + formControl.setValidators([Validators.required]); } } From 84c7fdffd5faec5afb31861999f006eac10a8bcc Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Fri, 1 Sep 2023 14:35:24 -0700 Subject: [PATCH 331/954] Rename Notifications -> Messages --- .../message.dto.ts} | 2 +- .../message.service.ts} | 10 ++--- .../src/app/shared/header/header.component.ts | 8 ++-- .../notifications.component.spec.ts | 4 +- .../notifications/notifications.component.ts | 4 +- services/apps/alcs/src/alcs/alcs.module.ts | 6 +-- .../application.controller.spec.ts | 12 +++--- .../alcs/application/application.module.ts | 4 +- .../apps/alcs/src/alcs/card/card.module.ts | 4 +- .../alcs/src/alcs/card/card.service.spec.ts | 10 ++--- .../apps/alcs/src/alcs/card/card.service.ts | 6 +-- .../alcs/comment/comment.controller.spec.ts | 8 ++-- .../alcs/src/alcs/comment/comment.module.ts | 4 +- .../src/alcs/comment/comment.service.spec.ts | 8 ++-- .../alcs/src/alcs/comment/comment.service.ts | 4 +- .../message.controller.spec.ts} | 30 +++++++------- .../message.controller.ts} | 36 ++++++++--------- .../message.dto.ts} | 4 +- .../message.entity.ts} | 4 +- .../alcs/src/alcs/message/message.module.ts | 14 +++++++ .../message.service.spec.ts} | 40 +++++++++---------- .../message.service.ts} | 32 +++++++-------- .../alcs/notification/notification.module.ts | 14 ------- ...ofile.ts => message.automapper.profile.ts} | 10 ++--- ...02985709-rename_notification_to_message.ts | 17 ++++++++ .../cleanUpNotifications.consumer.spec.ts | 8 ++-- .../cleanUpNotifications.consumer.ts | 4 +- .../src/queues/scheduler/scheduler.module.ts | 4 +- 28 files changed, 162 insertions(+), 149 deletions(-) rename alcs-frontend/src/app/services/{notification/notification.dto.ts => message/message.dto.ts} (79%) rename alcs-frontend/src/app/services/{notification/notification.service.ts => message/message.service.ts} (66%) rename services/apps/alcs/src/alcs/{notification/notification.controller.spec.ts => message/message.controller.spec.ts} (78%) rename services/apps/alcs/src/alcs/{notification/notification.controller.ts => message/message.controller.ts} (54%) rename services/apps/alcs/src/alcs/{notification/notification.dto.ts => message/message.dto.ts} (79%) rename services/apps/alcs/src/alcs/{notification/notification.entity.ts => message/message.entity.ts} (91%) create mode 100644 services/apps/alcs/src/alcs/message/message.module.ts rename services/apps/alcs/src/alcs/{notification/notification.service.spec.ts => message/message.service.spec.ts} (66%) rename services/apps/alcs/src/alcs/{notification/notification.service.ts => message/message.service.ts} (69%) delete mode 100644 services/apps/alcs/src/alcs/notification/notification.module.ts rename services/apps/alcs/src/common/automapper/{notification.automapper.profile.ts => message.automapper.profile.ts} (65%) create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1693602985709-rename_notification_to_message.ts diff --git a/alcs-frontend/src/app/services/notification/notification.dto.ts b/alcs-frontend/src/app/services/message/message.dto.ts similarity index 79% rename from alcs-frontend/src/app/services/notification/notification.dto.ts rename to alcs-frontend/src/app/services/message/message.dto.ts index 45d32b4721..2f8139b512 100644 --- a/alcs-frontend/src/app/services/notification/notification.dto.ts +++ b/alcs-frontend/src/app/services/message/message.dto.ts @@ -1,4 +1,4 @@ -export interface NotificationDto { +export interface MessageDto { uuid: string; title: string; body: string; diff --git a/alcs-frontend/src/app/services/notification/notification.service.ts b/alcs-frontend/src/app/services/message/message.service.ts similarity index 66% rename from alcs-frontend/src/app/services/notification/notification.service.ts rename to alcs-frontend/src/app/services/message/message.service.ts index c968c8ae09..3eb12d210a 100644 --- a/alcs-frontend/src/app/services/notification/notification.service.ts +++ b/alcs-frontend/src/app/services/message/message.service.ts @@ -2,23 +2,23 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { firstValueFrom } from 'rxjs'; import { environment } from '../../../environments/environment'; -import { NotificationDto } from './notification.dto'; +import { MessageDto } from './message.dto'; @Injectable({ providedIn: 'root', }) -export class NotificationService { +export class MessageService { constructor(private http: HttpClient) {} fetchMyNotifications() { - return firstValueFrom(this.http.get(`${environment.apiUrl}/notification`)); + return firstValueFrom(this.http.get(`${environment.apiUrl}/message`)); } markRead(uuid: string) { - return firstValueFrom(this.http.post(`${environment.apiUrl}/notification/${uuid}`, {})); + return firstValueFrom(this.http.post(`${environment.apiUrl}/message/${uuid}`, {})); } markAllRead() { - return firstValueFrom(this.http.post(`${environment.apiUrl}/notification`, {})); + return firstValueFrom(this.http.post(`${environment.apiUrl}/message`, {})); } } diff --git a/alcs-frontend/src/app/shared/header/header.component.ts b/alcs-frontend/src/app/shared/header/header.component.ts index f6cf5e9e24..a8f0e184de 100644 --- a/alcs-frontend/src/app/shared/header/header.component.ts +++ b/alcs-frontend/src/app/shared/header/header.component.ts @@ -5,8 +5,8 @@ import { ROLES_ALLOWED_APPLICATIONS } from '../../app-routing.module'; import { ApplicationService } from '../../services/application/application.service'; import { AuthenticationService, ICurrentUser, ROLES } from '../../services/authentication/authentication.service'; import { BoardService, BoardWithFavourite } from '../../services/board/board.service'; -import { NotificationDto } from '../../services/notification/notification.dto'; -import { NotificationService } from '../../services/notification/notification.service'; +import { MessageDto } from '../../services/message/message.dto'; +import { MessageService } from '../../services/message/message.service'; import { ToastService } from '../../services/toast/toast.service'; import { UserDto } from '../../services/user/user.dto'; import { UserService } from '../../services/user/user.service'; @@ -23,7 +23,7 @@ export class HeaderComponent implements OnInit { hasRoles = false; allowedSearch = false; sortedBoards: BoardWithFavourite[] = []; - notifications: NotificationDto[] = []; + notifications: MessageDto[] = []; isCommissioner = false; isAdmin = false; @@ -34,7 +34,7 @@ export class HeaderComponent implements OnInit { private toastService: ToastService, private userService: UserService, private router: Router, - private notificationService: NotificationService + private notificationService: MessageService ) {} ngOnInit(): void { diff --git a/alcs-frontend/src/app/shared/header/notifications/notifications.component.spec.ts b/alcs-frontend/src/app/shared/header/notifications/notifications.component.spec.ts index e259514b8f..e9d79ab38e 100644 --- a/alcs-frontend/src/app/shared/header/notifications/notifications.component.spec.ts +++ b/alcs-frontend/src/app/shared/header/notifications/notifications.component.spec.ts @@ -2,7 +2,7 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MatMenuModule } from '@angular/material/menu'; import { RouterTestingModule } from '@angular/router/testing'; -import { NotificationService } from '../../../services/notification/notification.service'; +import { MessageService } from '../../../services/message/message.service'; import { NotificationsComponent } from './notifications.component'; @@ -15,7 +15,7 @@ describe('NotificationsComponent', () => { imports: [RouterTestingModule, MatMenuModule], providers: [ { - provide: NotificationService, + provide: MessageService, useValue: {}, }, ], diff --git a/alcs-frontend/src/app/shared/header/notifications/notifications.component.ts b/alcs-frontend/src/app/shared/header/notifications/notifications.component.ts index 292f47b0bd..d96af69cff 100644 --- a/alcs-frontend/src/app/shared/header/notifications/notifications.component.ts +++ b/alcs-frontend/src/app/shared/header/notifications/notifications.component.ts @@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core'; import { Router } from '@angular/router'; import moment from 'moment'; import { environment } from '../../../../environments/environment'; -import { NotificationService } from '../../../services/notification/notification.service'; +import { MessageService } from '../../../services/message/message.service'; type FormattedNotification = { uuid: string; @@ -24,7 +24,7 @@ export class NotificationsComponent implements OnInit { hasUnread = false; unreadCount = 0; - constructor(private router: Router, private notificationService: NotificationService) {} + constructor(private router: Router, private notificationService: MessageService) {} ngOnInit(): void { this.loadNotifications(); diff --git a/services/apps/alcs/src/alcs/alcs.module.ts b/services/apps/alcs/src/alcs/alcs.module.ts index f54beb3aaa..8a49f98dd7 100644 --- a/services/apps/alcs/src/alcs/alcs.module.ts +++ b/services/apps/alcs/src/alcs/alcs.module.ts @@ -18,7 +18,7 @@ import { NoticeOfIntentDecisionModule } from './notice-of-intent-decision/notice import { NoticeOfIntentTimelineModule } from './notice-of-intent/notice-of-intent-timeline/notice-of-intent-timeline.module'; import { NoticeOfIntentSubmissionStatusModule } from './notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.module'; import { NoticeOfIntentModule } from './notice-of-intent/notice-of-intent.module'; -import { NotificationModule } from './notification/notification.module'; +import { MessageModule } from './message/message.module'; import { PlanningReviewModule } from './planning-review/planning-review.module'; import { SearchModule } from './search/search.module'; import { StaffJournalModule } from './staff-journal/staff-journal.module'; @@ -28,7 +28,7 @@ import { StaffJournalModule } from './staff-journal/staff-journal.module'; ImportModule, ApplicationModule, CommentModule, - NotificationModule, + MessageModule, BoardModule, CodeModule, PlanningReviewModule, @@ -48,7 +48,7 @@ import { StaffJournalModule } from './staff-journal/staff-journal.module'; RouterModule.register([ { path: 'alcs', module: ApplicationModule }, { path: 'alcs', module: CommentModule }, - { path: 'alcs', module: NotificationModule }, + { path: 'alcs', module: MessageModule }, { path: 'alcs', module: BoardModule }, { path: 'alcs', module: CodeModule }, { path: 'alcs', module: PlanningReviewModule }, diff --git a/services/apps/alcs/src/alcs/application/application.controller.spec.ts b/services/apps/alcs/src/alcs/application/application.controller.spec.ts index f091fd4ec8..d99a9356b7 100644 --- a/services/apps/alcs/src/alcs/application/application.controller.spec.ts +++ b/services/apps/alcs/src/alcs/application/application.controller.spec.ts @@ -15,7 +15,7 @@ import { CardStatusDto } from '../card/card-status/card-status.dto'; import { CardDto } from '../card/card.dto'; import { Card } from '../card/card.entity'; import { CardService } from '../card/card.service'; -import { NotificationService } from '../notification/notification.service'; +import { MessageService } from '../message/message.service'; import { ApplicationTimeData } from './application-time-tracking.service'; import { ApplicationController } from './application.controller'; import { ApplicationDto, UpdateApplicationDto } from './application.dto'; @@ -31,7 +31,7 @@ import { SUBMISSION_STATUS } from './application-submission-status/submission-st describe('ApplicationController', () => { let controller: ApplicationController; let applicationService: DeepMocked; - let notificationService: DeepMocked; + let notificationService: DeepMocked; let cardService: DeepMocked; let emailService: DeepMocked; @@ -72,7 +72,7 @@ describe('ApplicationController', () => { beforeEach(async () => { applicationService = createMock(); - notificationService = createMock(); + notificationService = createMock(); cardService = createMock(); emailService = createMock(); @@ -86,7 +86,7 @@ describe('ApplicationController', () => { useValue: applicationService, }, { - provide: NotificationService, + provide: MessageService, useValue: notificationService, }, { @@ -119,7 +119,7 @@ describe('ApplicationController', () => { }); applicationService.mapToDtos.mockResolvedValue([mockApplicationDto]); - notificationService.createNotification.mockResolvedValue(); + notificationService.create.mockResolvedValue(); }); it('should be defined', () => { @@ -174,7 +174,7 @@ describe('ApplicationController', () => { expect(res.applicant).toEqual(mockUpdate.applicant); expect(applicationService.update).toHaveBeenCalledTimes(1); - expect(notificationService.createNotification).not.toHaveBeenCalled(); + expect(notificationService.create).not.toHaveBeenCalled(); expect(applicationService.update).toHaveBeenCalledWith( mockApplicationEntity, mockUpdate, diff --git a/services/apps/alcs/src/alcs/application/application.module.ts b/services/apps/alcs/src/alcs/application/application.module.ts index ef4937d3f9..9b75149e09 100644 --- a/services/apps/alcs/src/alcs/application/application.module.ts +++ b/services/apps/alcs/src/alcs/application/application.module.ts @@ -20,7 +20,7 @@ import { ApplicationType } from '../code/application-code/application-type/appli import { CodeModule } from '../code/code.module'; import { LocalGovernment } from '../local-government/local-government.entity'; import { LocalGovernmentModule } from '../local-government/local-government.module'; -import { NotificationModule } from '../notification/notification.module'; +import { MessageModule } from '../message/message.module'; import { LocalGovernmentController } from '../local-government/local-government.controller'; import { LocalGovernmentService } from '../local-government/local-government.service'; import { DocumentCode } from '../../document/document-code.entity'; @@ -59,7 +59,7 @@ import { ApplicationService } from './application.service'; ApplicationSubmissionToSubmissionStatus, LocalGovernment, ]), - NotificationModule, + MessageModule, DocumentModule, CardModule, CodeModule, diff --git a/services/apps/alcs/src/alcs/card/card.module.ts b/services/apps/alcs/src/alcs/card/card.module.ts index 4cb2525d26..027116f491 100644 --- a/services/apps/alcs/src/alcs/card/card.module.ts +++ b/services/apps/alcs/src/alcs/card/card.module.ts @@ -2,7 +2,7 @@ import { Module } from '@nestjs/common'; import { TypeOrmModule } from '@nestjs/typeorm'; import { CodeModule } from '../code/code.module'; import { CardProfile } from '../../common/automapper/card.automapper.profile'; -import { NotificationModule } from '../notification/notification.module'; +import { MessageModule } from '../message/message.module'; import { CardHistory } from './card-history/card-history.entity'; import { CardSubscriber } from './card-history/card.subscriber'; import { CardStatus } from './card-status/card-status.entity'; @@ -27,7 +27,7 @@ import { CardService } from './card.service'; CardHistory, ]), CodeModule, - NotificationModule, + MessageModule, ], controllers: [CardSubtaskController, CardController], providers: [ diff --git a/services/apps/alcs/src/alcs/card/card.service.spec.ts b/services/apps/alcs/src/alcs/card/card.service.spec.ts index 4e7bd197ce..c7556c53db 100644 --- a/services/apps/alcs/src/alcs/card/card.service.spec.ts +++ b/services/apps/alcs/src/alcs/card/card.service.spec.ts @@ -13,7 +13,7 @@ import { } from '../../../test/mocks/mockEntities'; import { User } from '../../user/user.entity'; import { Board } from '../board/board.entity'; -import { NotificationService } from '../notification/notification.service'; +import { MessageService } from '../message/message.service'; import { CardSubtask } from './card-subtask/card-subtask.entity'; import { CardSubtaskService } from './card-subtask/card-subtask.service'; import { CARD_TYPE, CardType } from './card-type/card-type.entity'; @@ -27,7 +27,7 @@ describe('CardService', () => { let cardTypeRepositoryMock: DeepMocked>; let mockCardEntity; let mockSubtaskService: DeepMocked; - let mockNotificationService: DeepMocked; + let mockNotificationService: DeepMocked; beforeEach(async () => { cardRepositoryMock = createMock>(); @@ -61,7 +61,7 @@ describe('CardService', () => { useValue: mockSubtaskService, }, { - provide: NotificationService, + provide: MessageService, useValue: mockNotificationService, }, ], @@ -217,10 +217,10 @@ describe('CardService', () => { await service.update(fakeAuthor, 'fake', mockUpdate, 'Notification Text'); - expect(mockNotificationService.createNotification).toHaveBeenCalledTimes(1); + expect(mockNotificationService.create).toHaveBeenCalledTimes(1); const createNotificationServiceDto = - mockNotificationService.createNotification.mock.calls[0][0]; + mockNotificationService.create.mock.calls[0][0]; expect(createNotificationServiceDto.actor).toStrictEqual(fakeAuthor); expect(createNotificationServiceDto.receiverUuid).toStrictEqual( mockUserUuid, diff --git a/services/apps/alcs/src/alcs/card/card.service.ts b/services/apps/alcs/src/alcs/card/card.service.ts index 68bbd49257..54e18617db 100644 --- a/services/apps/alcs/src/alcs/card/card.service.ts +++ b/services/apps/alcs/src/alcs/card/card.service.ts @@ -8,7 +8,7 @@ import { IConfig } from 'config'; import { FindOptionsRelations, Not, Repository } from 'typeorm'; import { User } from '../../user/user.entity'; import { Board } from '../board/board.entity'; -import { NotificationService } from '../notification/notification.service'; +import { MessageService } from '../message/message.service'; import { CardSubtaskService } from './card-subtask/card-subtask.service'; import { CARD_TYPE, CardType } from './card-type/card-type.entity'; import { CardDetailedDto, CardDto, CardUpdateServiceDto } from './card.dto'; @@ -31,7 +31,7 @@ export class CardService { private cardTypeRepository: Repository, @Inject(CONFIG_TOKEN) private config: IConfig, private subtaskService: CardSubtaskService, - private notificationService: NotificationService, + private notificationService: MessageService, ) {} async getCardTypes() { @@ -113,7 +113,7 @@ export class CardService { if (shouldCreateNotification) { const frontEnd = this.config.get('ALCS.FRONTEND_ROOT'); - this.notificationService.createNotification({ + this.notificationService.create({ actor: user, receiverUuid: savedCard.assigneeUuid, title: "You've been assigned", diff --git a/services/apps/alcs/src/alcs/comment/comment.controller.spec.ts b/services/apps/alcs/src/alcs/comment/comment.controller.spec.ts index 90b705dbb8..8244c111e5 100644 --- a/services/apps/alcs/src/alcs/comment/comment.controller.spec.ts +++ b/services/apps/alcs/src/alcs/comment/comment.controller.spec.ts @@ -7,14 +7,14 @@ import { ClsService } from 'nestjs-cls'; import { CommentProfile } from '../../common/automapper/comment.automapper.profile'; import { initCommentMock } from '../../../test/mocks/mockEntities'; import { mockKeyCloakProviders } from '../../../test/mocks/mockTypes'; -import { NotificationService } from '../notification/notification.service'; +import { MessageService } from '../message/message.service'; import { CommentController } from './comment.controller'; import { CommentService } from './comment.service'; describe('CommentController', () => { let controller: CommentController; let mockCommentService: DeepMocked; - let mockNotificationService: DeepMocked; + let mockNotificationService: DeepMocked; let comment; let user; @@ -23,7 +23,7 @@ describe('CommentController', () => { beforeEach(async () => { mockCommentService = createMock(); - mockNotificationService = createMock(); + mockNotificationService = createMock(); user = { name: 'Bruce Wayne', @@ -55,7 +55,7 @@ describe('CommentController', () => { useValue: mockCommentService, }, { - provide: NotificationService, + provide: MessageService, useValue: mockNotificationService, }, { diff --git a/services/apps/alcs/src/alcs/comment/comment.module.ts b/services/apps/alcs/src/alcs/comment/comment.module.ts index 96e1932ef0..389df988c2 100644 --- a/services/apps/alcs/src/alcs/comment/comment.module.ts +++ b/services/apps/alcs/src/alcs/comment/comment.module.ts @@ -3,7 +3,7 @@ import { TypeOrmModule } from '@nestjs/typeorm'; import { ApplicationModule } from '../application/application.module'; import { CardModule } from '../card/card.module'; import { CommentProfile } from '../../common/automapper/comment.automapper.profile'; -import { NotificationModule } from '../notification/notification.module'; +import { MessageModule } from '../message/message.module'; import { CommentController } from './comment.controller'; import { Comment } from './comment.entity'; import { CommentService } from './comment.service'; @@ -14,7 +14,7 @@ import { CommentMentionService } from './mention/comment-mention.service'; imports: [ TypeOrmModule.forFeature([Comment, CommentMention]), ApplicationModule, - NotificationModule, + MessageModule, CardModule, ], controllers: [CommentController], diff --git a/services/apps/alcs/src/alcs/comment/comment.service.spec.ts b/services/apps/alcs/src/alcs/comment/comment.service.spec.ts index 23b96f1c33..25cc65fbda 100644 --- a/services/apps/alcs/src/alcs/comment/comment.service.spec.ts +++ b/services/apps/alcs/src/alcs/comment/comment.service.spec.ts @@ -9,7 +9,7 @@ import { } from '../../../test/mocks/mockEntities'; import { Card } from '../card/card.entity'; import { CardService } from '../card/card.service'; -import { NotificationService } from '../notification/notification.service'; +import { MessageService } from '../message/message.service'; import { User } from '../../user/user.entity'; import { Comment } from './comment.entity'; import { CommentService } from './comment.service'; @@ -19,7 +19,7 @@ describe('CommentService', () => { let service: CommentService; let mockCommentRepository: DeepMocked>; let mockCommentMentionService: DeepMocked; - let mockNotificationService: DeepMocked; + let mockNotificationService: DeepMocked; let mockCardService: DeepMocked; let comment; @@ -27,7 +27,7 @@ describe('CommentService', () => { beforeEach(async () => { mockCommentRepository = createMock>(); mockCommentMentionService = createMock(); - mockNotificationService = createMock(); + mockNotificationService = createMock(); mockCardService = createMock(); mockCommentMentionService.updateMentions.mockResolvedValue([]); @@ -47,7 +47,7 @@ describe('CommentService', () => { useValue: mockCommentMentionService, }, { - provide: NotificationService, + provide: MessageService, useValue: mockNotificationService, }, { provide: CardService, useValue: mockCardService }, diff --git a/services/apps/alcs/src/alcs/comment/comment.service.ts b/services/apps/alcs/src/alcs/comment/comment.service.ts index d3287a69b4..dd9ad32374 100644 --- a/services/apps/alcs/src/alcs/comment/comment.service.ts +++ b/services/apps/alcs/src/alcs/comment/comment.service.ts @@ -7,7 +7,7 @@ import { InjectRepository } from '@nestjs/typeorm'; import { FindOptionsRelations, Repository } from 'typeorm'; import { Card } from '../card/card.entity'; import { CardService } from '../card/card.service'; -import { NotificationService } from '../notification/notification.service'; +import { MessageService } from '../message/message.service'; import { User } from '../../user/user.entity'; import { Comment } from './comment.entity'; import { CommentMention } from './mention/comment-mention.entity'; @@ -25,7 +25,7 @@ export class CommentService { private commentRepository: Repository, private cardService: CardService, private commentMentionService: CommentMentionService, - private notificationService: NotificationService, + private notificationService: MessageService, ) {} async fetch(cardUuid: string) { diff --git a/services/apps/alcs/src/alcs/notification/notification.controller.spec.ts b/services/apps/alcs/src/alcs/message/message.controller.spec.ts similarity index 78% rename from services/apps/alcs/src/alcs/notification/notification.controller.spec.ts rename to services/apps/alcs/src/alcs/message/message.controller.spec.ts index e27f4d770a..6d38e5b12c 100644 --- a/services/apps/alcs/src/alcs/notification/notification.controller.spec.ts +++ b/services/apps/alcs/src/alcs/message/message.controller.spec.ts @@ -3,18 +3,18 @@ import { AutomapperModule } from '@automapper/nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { ClsService } from 'nestjs-cls'; -import { NotificationProfile } from '../../common/automapper/notification.automapper.profile'; import { mockKeyCloakProviders } from '../../../test/mocks/mockTypes'; -import { NotificationController } from './notification.controller'; -import { NotificationService } from './notification.service'; -import { Notification } from './notification.entity'; +import { MessageProfile } from '../../common/automapper/message.automapper.profile'; +import { MessageController } from './message.controller'; +import { Message } from './message.entity'; +import { MessageService } from './message.service'; -describe('NotificationController', () => { - let controller: NotificationController; - let notificationService: DeepMocked; +describe('MessageController', () => { + let controller: MessageController; + let notificationService: DeepMocked; beforeEach(async () => { - notificationService = createMock(); + notificationService = createMock(); const module: TestingModule = await Test.createTestingModule({ imports: [ @@ -22,22 +22,22 @@ describe('NotificationController', () => { strategyInitializer: classes(), }), ], - controllers: [NotificationController], + controllers: [MessageController], providers: [ - NotificationProfile, + MessageProfile, { provide: ClsService, useValue: {}, }, { - provide: NotificationService, + provide: MessageService, useValue: notificationService, }, ...mockKeyCloakProviders, ], }).compile(); - controller = module.get(NotificationController); + controller = module.get(MessageController); }); it('should be defined', () => { @@ -49,7 +49,7 @@ describe('NotificationController', () => { notificationService.list.mockResolvedValue([ { createdAt: date, - } as Notification, + } as Message, ]); const res = await controller.getMyNotifications({ @@ -95,7 +95,7 @@ describe('NotificationController', () => { }); it('should call into service for markRead', async () => { - notificationService.get.mockResolvedValue({} as Notification); + notificationService.get.mockResolvedValue({} as Message); notificationService.markRead.mockResolvedValue({} as any); await controller.markRead( @@ -130,7 +130,7 @@ describe('NotificationController', () => { }, 'fake-notification', ), - ).rejects.toMatchObject(new Error(`Failed to find notification`)); + ).rejects.toMatchObject(new Error(`Failed to find message`)); expect(notificationService.markRead).not.toHaveBeenCalled(); }); diff --git a/services/apps/alcs/src/alcs/notification/notification.controller.ts b/services/apps/alcs/src/alcs/message/message.controller.ts similarity index 54% rename from services/apps/alcs/src/alcs/notification/notification.controller.ts rename to services/apps/alcs/src/alcs/message/message.controller.ts index 314eb78195..7ad91b30ee 100644 --- a/services/apps/alcs/src/alcs/notification/notification.controller.ts +++ b/services/apps/alcs/src/alcs/message/message.controller.ts @@ -14,26 +14,26 @@ import * as config from 'config'; import { RolesGuard } from '../../common/authorization/roles-guard.service'; import { ANY_AUTH_ROLE } from '../../common/authorization/roles'; import { UserRoles } from '../../common/authorization/roles.decorator'; -import { NotificationDto } from './notification.dto'; -import { Notification } from './notification.entity'; -import { NotificationService } from './notification.service'; +import { MessageDto } from './message.dto'; +import { Message } from './message.entity'; +import { MessageService } from './message.service'; @ApiOAuth2(config.get('KEYCLOAK.SCOPES')) -@Controller('notification') +@Controller('message') @UseGuards(RolesGuard) -export class NotificationController { +export class MessageController { constructor( - private notificationService: NotificationService, + private messageService: MessageService, @InjectMapper() private autoMapper: Mapper, ) {} @Get() @UserRoles(...ANY_AUTH_ROLE) - async getMyNotifications(@Req() req): Promise { + async getMyNotifications(@Req() req): Promise { const userId = req.user.entity.uuid; if (userId) { - const notifications = await this.notificationService.list(userId); - return this.mapToDto(notifications); + const messages = await this.messageService.list(userId); + return this.mapToDto(messages); } else { return []; } @@ -43,26 +43,22 @@ export class NotificationController { @UserRoles(...ANY_AUTH_ROLE) async markAllRead(@Req() req): Promise { const userId = req.user.entity.uuid; - await this.notificationService.markAllRead(userId); + await this.messageService.markAllRead(userId); } @Post('/:uuid') @UserRoles(...ANY_AUTH_ROLE) async markRead(@Req() req, @Param('uuid') id): Promise { const userId = req.user.entity.uuid; - const notification = await this.notificationService.get(id, userId); - if (notification) { - await this.notificationService.markRead(id); + const message = await this.messageService.get(id, userId); + if (message) { + await this.messageService.markRead(id); } else { - throw new NotFoundException('Failed to find notification'); + throw new NotFoundException('Failed to find message'); } } - private mapToDto(notifications: Notification[]): NotificationDto[] { - return this.autoMapper.mapArray( - notifications, - Notification, - NotificationDto, - ); + private mapToDto(notifications: Message[]): MessageDto[] { + return this.autoMapper.mapArray(notifications, Message, MessageDto); } } diff --git a/services/apps/alcs/src/alcs/notification/notification.dto.ts b/services/apps/alcs/src/alcs/message/message.dto.ts similarity index 79% rename from services/apps/alcs/src/alcs/notification/notification.dto.ts rename to services/apps/alcs/src/alcs/message/message.dto.ts index 773c11a676..40e23249f7 100644 --- a/services/apps/alcs/src/alcs/notification/notification.dto.ts +++ b/services/apps/alcs/src/alcs/message/message.dto.ts @@ -1,6 +1,6 @@ import { User } from '../../user/user.entity'; -export class NotificationDto { +export class MessageDto { uuid: string; title: string; body: string; @@ -10,7 +10,7 @@ export class NotificationDto { link: string; } -export class CreateNotificationServiceDto { +export class CreateMessageServiceDto { actor: User; receiverUuid: string; body: string; diff --git a/services/apps/alcs/src/alcs/notification/notification.entity.ts b/services/apps/alcs/src/alcs/message/message.entity.ts similarity index 91% rename from services/apps/alcs/src/alcs/notification/notification.entity.ts rename to services/apps/alcs/src/alcs/message/message.entity.ts index 0b87204227..98b5978724 100644 --- a/services/apps/alcs/src/alcs/notification/notification.entity.ts +++ b/services/apps/alcs/src/alcs/message/message.entity.ts @@ -9,8 +9,8 @@ import { import { User } from '../../user/user.entity'; @Entity() -export class Notification { - constructor(data?: Partial) { +export class Message { + constructor(data?: Partial) { if (data) { Object.assign(this, data); } diff --git a/services/apps/alcs/src/alcs/message/message.module.ts b/services/apps/alcs/src/alcs/message/message.module.ts new file mode 100644 index 0000000000..2bb8721659 --- /dev/null +++ b/services/apps/alcs/src/alcs/message/message.module.ts @@ -0,0 +1,14 @@ +import { Module } from '@nestjs/common'; +import { TypeOrmModule } from '@nestjs/typeorm'; +import { MessageProfile } from '../../common/automapper/message.automapper.profile'; +import { Message } from './message.entity'; +import { MessageService } from './message.service'; +import { MessageController } from './message.controller'; + +@Module({ + imports: [TypeOrmModule.forFeature([Message])], + providers: [MessageService, MessageProfile], + controllers: [MessageController], + exports: [MessageService], +}) +export class MessageModule {} diff --git a/services/apps/alcs/src/alcs/notification/notification.service.spec.ts b/services/apps/alcs/src/alcs/message/message.service.spec.ts similarity index 66% rename from services/apps/alcs/src/alcs/notification/notification.service.spec.ts rename to services/apps/alcs/src/alcs/message/message.service.spec.ts index cfc3a57d7e..4a1c3aacd7 100644 --- a/services/apps/alcs/src/alcs/notification/notification.service.spec.ts +++ b/services/apps/alcs/src/alcs/message/message.service.spec.ts @@ -4,18 +4,18 @@ import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; import * as config from 'config'; import { Repository, UpdateResult } from 'typeorm'; -import { Notification } from './notification.entity'; -import { NotificationService } from './notification.service'; +import { Message } from './message.entity'; +import { MessageService } from './message.service'; -describe('NotificationService', () => { - let service: NotificationService; - let mockRepository: DeepMocked>; - let fakeNotification: Notification; +describe('MessageService', () => { + let service: MessageService; + let mockRepository: DeepMocked>; + let mockmessage: Message; beforeEach(async () => { - mockRepository = createMock>(); + mockRepository = createMock>(); - fakeNotification = { + mockmessage = new Message({ createdAt: new Date(), targetType: 'application', uuid: 'fake-uuid', @@ -24,13 +24,13 @@ describe('NotificationService', () => { link: 'link goes here', title: 'title goes here', read: false, - } as Notification; + }); const module: TestingModule = await Test.createTestingModule({ providers: [ - NotificationService, + MessageService, { - provide: getRepositoryToken(Notification), + provide: getRepositoryToken(Message), useValue: mockRepository, }, { @@ -40,28 +40,28 @@ describe('NotificationService', () => { ], }).compile(); - service = module.get(NotificationService); + service = module.get(MessageService); }); it('should be defined', () => { expect(service).toBeDefined(); }); - it('should call find when loading notifications', async () => { - mockRepository.find.mockResolvedValue([fakeNotification]); + it('should call find when loading messages', async () => { + mockRepository.find.mockResolvedValue([mockmessage]); - const notifications = await service.list('fake-user'); - expect(notifications.length).toEqual(1); - expect(notifications[0]).toEqual(fakeNotification); + const messages = await service.list('fake-user'); + expect(messages.length).toEqual(1); + expect(messages[0]).toEqual(mockmessage); }); it('should call update with correct uuid when marking read', async () => { mockRepository.update.mockResolvedValue({} as UpdateResult); - await service.markRead(fakeNotification.uuid); + await service.markRead(mockmessage.uuid); expect(mockRepository.update).toHaveBeenCalledTimes(1); expect(mockRepository.update.mock.calls[0][0]).toEqual({ - uuid: fakeNotification.uuid, + uuid: mockmessage.uuid, }); }); @@ -84,7 +84,7 @@ describe('NotificationService', () => { }); it('should call findOne when doing get', async () => { - mockRepository.findOne.mockResolvedValue({} as Notification); + mockRepository.findOne.mockResolvedValue({} as Message); await service.get('fake-uuid', 'fake-receiever'); expect(mockRepository.findOne).toHaveBeenCalledTimes(1); diff --git a/services/apps/alcs/src/alcs/notification/notification.service.ts b/services/apps/alcs/src/alcs/message/message.service.ts similarity index 69% rename from services/apps/alcs/src/alcs/notification/notification.service.ts rename to services/apps/alcs/src/alcs/message/message.service.ts index c6812798b1..8d68e22e35 100644 --- a/services/apps/alcs/src/alcs/notification/notification.service.ts +++ b/services/apps/alcs/src/alcs/message/message.service.ts @@ -6,19 +6,19 @@ import { IConfig } from 'config'; import { LessThan, Repository } from 'typeorm'; import { Card } from '../card/card.entity'; import { User } from '../../user/user.entity'; -import { CreateNotificationServiceDto } from './notification.dto'; -import { Notification } from './notification.entity'; +import { CreateMessageServiceDto } from './message.dto'; +import { Message } from './message.entity'; @Injectable() -export class NotificationService { +export class MessageService { constructor( - @InjectRepository(Notification) - private notificationRepository: Repository, + @InjectRepository(Message) + private messageRepository: Repository, @Inject(CONFIG_TOKEN) private config: IConfig, ) {} async list(userUuid: string) { - return await this.notificationRepository.find({ + return await this.messageRepository.find({ where: { receiver: { uuid: userUuid, @@ -37,7 +37,7 @@ export class NotificationService { ); } - return this.notificationRepository.findOne({ + return this.messageRepository.findOne({ where: { uuid, receiverUuid, @@ -45,15 +45,15 @@ export class NotificationService { }); } - async createNotification(notificationDto: CreateNotificationServiceDto) { - const notification = new Notification({ - ...notificationDto, + async create(messageServiceDto: CreateMessageServiceDto) { + const notification = new Message({ + ...messageServiceDto, }); - await this.notificationRepository.save(notification); + await this.messageRepository.save(notification); } async markRead(uuid: string) { - return await this.notificationRepository.update( + return await this.messageRepository.update( { uuid, }, @@ -64,7 +64,7 @@ export class NotificationService { } async markAllRead(receiverUuid: string) { - return await this.notificationRepository.update( + return await this.messageRepository.update( { receiverUuid, }, @@ -75,7 +75,7 @@ export class NotificationService { } async cleanUp(olderThan: Date, read = true) { - return await this.notificationRepository.delete({ + return await this.messageRepository.delete({ createdAt: LessThan(olderThan), read, }); @@ -94,7 +94,7 @@ export class NotificationService { throw new Error('Cannot set notifications without proper card'); } - const notification = new Notification({ + const message = new Message({ body, title: title, link: `${frontEnd}/board/${card.board.code}?card=${card.uuid}&type=${card.type.code}`, @@ -102,6 +102,6 @@ export class NotificationService { actor: author, receiverUuid, }); - await this.notificationRepository.save(notification); + await this.messageRepository.save(message); } } diff --git a/services/apps/alcs/src/alcs/notification/notification.module.ts b/services/apps/alcs/src/alcs/notification/notification.module.ts deleted file mode 100644 index a5dac3cc3a..0000000000 --- a/services/apps/alcs/src/alcs/notification/notification.module.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { Module } from '@nestjs/common'; -import { TypeOrmModule } from '@nestjs/typeorm'; -import { NotificationProfile } from '../../common/automapper/notification.automapper.profile'; -import { Notification } from './notification.entity'; -import { NotificationService } from './notification.service'; -import { NotificationController } from './notification.controller'; - -@Module({ - imports: [TypeOrmModule.forFeature([Notification])], - providers: [NotificationService, NotificationProfile], - controllers: [NotificationController], - exports: [NotificationService], -}) -export class NotificationModule {} diff --git a/services/apps/alcs/src/common/automapper/notification.automapper.profile.ts b/services/apps/alcs/src/common/automapper/message.automapper.profile.ts similarity index 65% rename from services/apps/alcs/src/common/automapper/notification.automapper.profile.ts rename to services/apps/alcs/src/common/automapper/message.automapper.profile.ts index b9a023bda5..28ac30502b 100644 --- a/services/apps/alcs/src/common/automapper/notification.automapper.profile.ts +++ b/services/apps/alcs/src/common/automapper/message.automapper.profile.ts @@ -1,11 +1,11 @@ import { createMap, forMember, mapFrom, Mapper } from '@automapper/core'; import { AutomapperProfile, InjectMapper } from '@automapper/nestjs'; import { Injectable } from '@nestjs/common'; -import { NotificationDto } from '../../alcs/notification/notification.dto'; -import { Notification } from '../../alcs/notification/notification.entity'; +import { MessageDto } from '../../alcs/message/message.dto'; +import { Message } from '../../alcs/message/message.entity'; @Injectable() -export class NotificationProfile extends AutomapperProfile { +export class MessageProfile extends AutomapperProfile { constructor(@InjectMapper() mapper: Mapper) { super(mapper); } @@ -14,8 +14,8 @@ export class NotificationProfile extends AutomapperProfile { return (mapper) => { createMap( mapper, - Notification, - NotificationDto, + Message, + MessageDto, forMember( (n) => n.createdAt, mapFrom((n) => n.createdAt.getTime()), diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1693602985709-rename_notification_to_message.ts b/services/apps/alcs/src/providers/typeorm/migrations/1693602985709-rename_notification_to_message.ts new file mode 100644 index 0000000000..02f2445bbd --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1693602985709-rename_notification_to_message.ts @@ -0,0 +1,17 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class renameNotificationToMessage1693602985709 + implements MigrationInterface +{ + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query(` + ALTER TABLE "alcs"."notification" RENAME TO "message"; + `); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query(` + ALTER TABLE "alcs"."message" RENAME TO "notification"; + `); + } +} diff --git a/services/apps/alcs/src/queues/scheduler/cleanUpNotifications.consumer.spec.ts b/services/apps/alcs/src/queues/scheduler/cleanUpNotifications.consumer.spec.ts index e9168031d3..1ff6aeb03b 100644 --- a/services/apps/alcs/src/queues/scheduler/cleanUpNotifications.consumer.spec.ts +++ b/services/apps/alcs/src/queues/scheduler/cleanUpNotifications.consumer.spec.ts @@ -2,22 +2,22 @@ import { ConfigModule } from '@app/common/config/config.module'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { DeleteResult } from 'typeorm'; -import { NotificationService } from '../../alcs/notification/notification.service'; +import { MessageService } from '../../alcs/message/message.service'; import { CleanUpNotificationsConsumer } from './cleanUpNotifications.consumer'; describe('SchedulerConsumerService', () => { let notificationCleanUpConsumer: CleanUpNotificationsConsumer; - let mockNotificationService: DeepMocked; + let mockNotificationService: DeepMocked; beforeEach(async () => { - mockNotificationService = createMock(); + mockNotificationService = createMock(); const module: TestingModule = await Test.createTestingModule({ imports: [ConfigModule], providers: [ CleanUpNotificationsConsumer, { - provide: NotificationService, + provide: MessageService, useValue: mockNotificationService, }, ], diff --git a/services/apps/alcs/src/queues/scheduler/cleanUpNotifications.consumer.ts b/services/apps/alcs/src/queues/scheduler/cleanUpNotifications.consumer.ts index 1225233083..0078c2234b 100644 --- a/services/apps/alcs/src/queues/scheduler/cleanUpNotifications.consumer.ts +++ b/services/apps/alcs/src/queues/scheduler/cleanUpNotifications.consumer.ts @@ -1,7 +1,7 @@ import { Process, Processor } from '@nestjs/bull'; import { Logger } from '@nestjs/common'; import * as dayjs from 'dayjs'; -import { NotificationService } from '../../alcs/notification/notification.service'; +import { MessageService } from '../../alcs/message/message.service'; import { QUEUES } from './scheduler.service'; const DAYS_TO_RETAIN_READ = 30; @@ -11,7 +11,7 @@ const DAYS_TO_RETAIN_UNREAD = 365; export class CleanUpNotificationsConsumer { private logger = new Logger(CleanUpNotificationsConsumer.name); - constructor(private notificationService: NotificationService) {} + constructor(private notificationService: MessageService) {} @Process() async cleanUpNotifications() { diff --git a/services/apps/alcs/src/queues/scheduler/scheduler.module.ts b/services/apps/alcs/src/queues/scheduler/scheduler.module.ts index 77d6046237..0fe3b005c0 100644 --- a/services/apps/alcs/src/queues/scheduler/scheduler.module.ts +++ b/services/apps/alcs/src/queues/scheduler/scheduler.module.ts @@ -1,7 +1,7 @@ import { BullModule } from '@nestjs/bull'; import { Module, OnApplicationBootstrap } from '@nestjs/common'; import { ApplicationModule } from '../../alcs/application/application.module'; -import { NotificationModule } from '../../alcs/notification/notification.module'; +import { MessageModule } from '../../alcs/message/message.module'; import { EmailModule } from '../../providers/email/email.module'; import { BullConfigService } from '../bullConfig.service'; import { ApplicationExpiryConsumer } from './applicationExpiry.consumer'; @@ -21,7 +21,7 @@ import { QUEUES, SchedulerService } from './scheduler.service'; }), EmailModule, ApplicationModule, - NotificationModule, + MessageModule, ], providers: [ SchedulerService, From fa868649527c52da2ecdcce89ab3e0d2c7cd164d Mon Sep 17 00:00:00 2001 From: Liam Stoddard Date: Fri, 1 Sep 2023 16:52:38 -0700 Subject: [PATCH 332/954] initial commit, functional code --- .../submissions/app_submissions.py | 40 +++++- .../submissions/submap/__init__.py | 3 +- .../submissions/submap/soil_elements.py | 129 ++++++++++++++++++ 3 files changed, 165 insertions(+), 7 deletions(-) create mode 100644 bin/migrate-oats-data/submissions/submap/soil_elements.py diff --git a/bin/migrate-oats-data/submissions/app_submissions.py b/bin/migrate-oats-data/submissions/app_submissions.py index 99c096b66c..8cbb51ba06 100644 --- a/bin/migrate-oats-data/submissions/app_submissions.py +++ b/bin/migrate-oats-data/submissions/app_submissions.py @@ -12,6 +12,10 @@ create_subdiv_dict, add_subdiv, map_subdiv_lots, + get_soil_rows, + create_soil_dict, + map_soil_data, + add_soil_field, ) from db import inject_conn_pool from constants import BATCH_UPLOAD_SIZE @@ -67,10 +71,11 @@ def process_alcs_app_submissions(conn=None, batch_size=BATCH_UPLOAD_SIZE): direction_data = get_direction_data(rows, cursor) subdiv_data = get_subdiv_data(rows, cursor) + soil_data = get_soil_data(rows, cursor) submissions_to_be_inserted_count = len(rows) - insert_app_sub_records(conn, batch_size, cursor, rows, direction_data, subdiv_data) + insert_app_sub_records(conn, batch_size, cursor, rows, direction_data, subdiv_data, soil_data) successful_inserts_count = ( successful_inserts_count + submissions_to_be_inserted_count @@ -94,7 +99,7 @@ def process_alcs_app_submissions(conn=None, batch_size=BATCH_UPLOAD_SIZE): print("Total failed inserts:", failed_inserts) log_end(etl_name) -def insert_app_sub_records(conn, batch_size, cursor, rows, direction_data, subdiv_data): +def insert_app_sub_records(conn, batch_size, cursor, rows, direction_data, subdiv_data, soil_data): """ Function to insert submission records in batches. @@ -113,7 +118,7 @@ def insert_app_sub_records(conn, batch_size, cursor, rows, direction_data, subdi nfu_data_list, other_data_list, inc_exc_data_list, - ) = prepare_app_sub_data(rows, direction_data, subdiv_data) + ) = prepare_app_sub_data(rows, direction_data, subdiv_data, soil_data) if len(nfu_data_list) > 0: execute_batch( @@ -141,7 +146,7 @@ def insert_app_sub_records(conn, batch_size, cursor, rows, direction_data, subdi conn.commit() -def prepare_app_sub_data(app_sub_raw_data_list, direction_data, subdiv_data): +def prepare_app_sub_data(app_sub_raw_data_list, direction_data, subdiv_data, soil_data): """ This function prepares different lists of data based on the 'alr_change_code' field of each data dict in 'app_sub_raw_data_list'. @@ -165,10 +170,13 @@ def prepare_app_sub_data(app_sub_raw_data_list, direction_data, subdiv_data): data = dict(row) data = add_direction_field(data) data = add_subdiv(data,json) + data = add_soil_field(data) if data['alr_appl_component_id'] in subdiv_data: data = map_subdiv_lots(data, subdiv_data, json) if data["alr_application_id"] in direction_data: data = map_direction_values(data, direction_data) + if data["alr_appl_component_id"] in soil_data: + data = map_soil_data(data, soil_data) if data["alr_change_code"] == ALRChangeCode.NFU.value: nfu_data_list.append(data) elif data["alr_change_code"] == ALRChangeCode.EXC.value or data["alr_change_code"] == ALRChangeCode.INC.value: @@ -222,8 +230,24 @@ def get_insert_query(unique_fields,unique_values): return query.format(unique_fields=unique_fields, unique_values=unique_values) def get_insert_query_for_nfu(): - unique_fields = ", nfu_hectares" - unique_values = ", %(alr_area)s" + unique_fields = """, nfu_hectares, + nfu_will_import_fill, + nfu_fill_volume, + nfu_max_fill_depth, + nfu_project_duration_amount, + nfu_fill_type_description, + nfu_fill_origin_description, + nfu_project_duration_unit + """ + unique_values = """, %(alr_area)s, + %(import_fill)s, + %(total_fill)s, + %(max_fill_depth)s, + %(fill_duration)s, + %(fill_type)s, + %(fill_origin)s, + %(fill_duration_unit)s + """ return get_insert_query(unique_fields,unique_values) def get_insert_query_for_inc_exc(): @@ -243,6 +267,10 @@ def get_subdiv_data(rows, cursor): subdiv_data = create_subdiv_dict(subdiv_rows) return subdiv_data +def get_soil_data(rows, cursor): + soil_rows = get_soil_rows(rows, cursor) + soil_data = create_soil_dict(soil_rows) + return soil_data @inject_conn_pool def clean_application_submission(conn=None): diff --git a/bin/migrate-oats-data/submissions/submap/__init__.py b/bin/migrate-oats-data/submissions/submap/__init__.py index 39cbcf6a23..369c5be915 100644 --- a/bin/migrate-oats-data/submissions/submap/__init__.py +++ b/bin/migrate-oats-data/submissions/submap/__init__.py @@ -1,2 +1,3 @@ from .direction_mapping import * -from .subdiv_plot import * \ No newline at end of file +from .subdiv_plot import * +from .soil_elements import * \ No newline at end of file diff --git a/bin/migrate-oats-data/submissions/submap/soil_elements.py b/bin/migrate-oats-data/submissions/submap/soil_elements.py new file mode 100644 index 0000000000..6a72f36721 --- /dev/null +++ b/bin/migrate-oats-data/submissions/submap/soil_elements.py @@ -0,0 +1,129 @@ +def get_soil_rows(rows, cursor): + # fetches adjacent land use data, specifically direction, description and type code + component_ids = [dict(item)["alr_appl_component_id"] for item in rows] + component_ids_string = ', '.join(str(item) for item in component_ids) + soil_rows_query = f"""SELECT * from + oats.oats_soil_change_elements osc + WHERE osc.alr_appl_component_id in ({component_ids_string}) + """ + cursor.execute(soil_rows_query) + soil_rows = cursor.fetchall() + return soil_rows + +def create_soil_dict(soil_rows): + # creates dict contailing fill and remove data + alr_id = 'alr_appl_component_id' + area = 'project_area' + desc = 'material_desc' + origin_desc = 'material_origin_desc' + duration = 'project_duration' + volume = 'volume' + depth = 'depth' + code = 'soil_change_code' + + soil_dict = {} + for row in soil_rows: + app_component_id = row[alr_id] + if app_component_id in soil_dict: + + if row[code] == 'REMOVE': + # if soil_dict[app_component_id]['RMV'] == True: + if 'RMV' in soil_dict.get(app_component_id, {}): + print('ignored element_id:',row['soil_change_element_id']) + else: + soil_dict[app_component_id]['remove_type'] = row[desc] + soil_dict[app_component_id]['remove_origin'] = row[origin_desc] + soil_dict[app_component_id]['max_remove_depth'] = row[depth] + soil_dict[app_component_id]['total_remove'] = row[volume] + soil_dict[app_component_id]['remove_duration'] = row[duration] + soil_dict[app_component_id]['remove_area'] = row[area] + if 'import_fill' not in soil_dict.get(app_component_id, {}): + soil_dict[app_component_id]['import_fill'] = False + + soil_dict[app_component_id]['RMV'] = True + + + elif row[code] == 'ADD': + # if soil_dict[app_component_id]['ADD'] == True: + if 'ADD' in soil_dict.get(app_component_id, {}): + print('ignored element_id:',row['soil_change_element_id']) + else: + soil_dict[app_component_id]['fill_type'] = row[desc] + soil_dict[app_component_id]['fill_origin'] = row[origin_desc] + soil_dict[app_component_id]['total_fill'] = row[volume] + soil_dict[app_component_id]['max_fill_depth'] = row[depth] + soil_dict[app_component_id]['fill_duration'] = row[duration] + soil_dict[app_component_id]['fill_area'] = row[area] + soil_dict[app_component_id]['import_fill'] = True + + soil_dict[app_component_id]['ADD'] = True + + else: + print('unknown soil action') + else: + soil_dict[app_component_id] = {} + soil_dict[app_component_id][alr_id] = row[alr_id] + if row[code] == 'REMOVE': + soil_dict[app_component_id]['remove_type'] = row[desc] + soil_dict[app_component_id]['remove_origin'] = row[origin_desc] + soil_dict[app_component_id]['max_remove_depth'] = row[depth] + soil_dict[app_component_id]['total_remove'] = row[volume] + soil_dict[app_component_id]['remove_duration'] = row[duration] + soil_dict[app_component_id]['remove_area'] = row[area] + soil_dict[app_component_id]['RMV'] = True + soil_dict[app_component_id]['import_fill'] = False + + + elif row[code] == 'ADD': + soil_dict[app_component_id]['fill_type'] = row[desc] + soil_dict[app_component_id]['fill_origin'] = row[origin_desc] + soil_dict[app_component_id]['total_fill'] = row[volume] + soil_dict[app_component_id]['max_fill_depth'] = row[depth] + soil_dict[app_component_id]['fill_duration'] = row[duration] + soil_dict[app_component_id]['fill_area'] = row[area] + soil_dict[app_component_id]['import_fill'] = True + soil_dict[app_component_id]['ADD'] = True + + else: + print('unknown soil action') + return soil_dict + + +def map_soil_data(data, soil_data): + #map soil data into data + app_component_id = 'alr_appl_component_id' + data['fill_type'] = soil_data.get(data[app_component_id], {}).get('fill_type', None) + data['fill_origin'] = soil_data.get(data[app_component_id], {}).get('fill_origin', None) + data['total_fill'] = soil_data.get(data[app_component_id], {}).get('total_fill', None) + data['max_fill_depth'] = soil_data.get(data[app_component_id], {}).get('max_fill_depth', None) + data['fill_duration'] = soil_data.get(data[app_component_id], {}).get('fill_duration', None) + data['fill_area'] = soil_data.get(data[app_component_id], {}).get('fill_area', None) + data['import_fill'] = soil_data.get(data[app_component_id], {}).get('import_fill', None) + data['fill_duration_unit'] = 'duration_unit' + data['remove_duration_unit'] = 'duration_unit' + data['remove_type'] = soil_data.get(data[app_component_id], {}).get('remove_type', None) + data['remove_origin'] = soil_data.get(data[app_component_id], {}).get('remove_origin', None) + data['total_remove'] = soil_data.get(data[app_component_id], {}).get('total_remove', None) + data['max_remove_depth'] = soil_data.get(data[app_component_id], {}).get('max_remove_depth', None) + data['remove_duration'] = soil_data.get(data[app_component_id], {}).get('remove_duration', None) + data['remove_area'] = soil_data.get(data[app_component_id], {}).get('remove_area', None) + return data + +def add_soil_field(data): + # populates columns to be inserted + data['fill_type'] = None + data['fill_origin'] = None + data['total_fill'] = None + data['max_fill_depth'] = None + data['fill_duration'] = None + data['fill_area'] = None + data['import_fill'] = None + data['remove_type'] = None + data['remove_origin'] = None + data['total_remove'] = None + data['max_remove_depth'] = None + data['remove_duration'] = None + data['remove_area'] = None + data['fill_duration_unit'] = None + data['remove_duration_unit'] = None + return data From 1fe45aec128bfccb97d51dd27b97e7a01dee4385 Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Tue, 5 Sep 2023 09:42:29 -0700 Subject: [PATCH 333/954] Feature/alcs 957 part 2 non applications search (#936) non-applications search --- ...application-search-table.component.spec.ts | 4 +- ...on-application-search-table.component.html | 56 +++++++++ ...on-application-search-table.component.scss | 0 ...application-search-table.component.spec.ts | 33 ++++++ .../non-application-search-table.component.ts | 105 +++++++++++++++++ .../app/features/search/search.component.html | 16 ++- .../app/features/search/search.component.ts | 91 ++++++++++----- .../src/app/features/search/search.module.ts | 3 +- .../src/app/services/search/search.dto.ts | 24 +++- .../services/search/search.service.spec.ts | 32 +++++- .../src/app/services/search/search.service.ts | 17 +++ .../non-applications-view.entity.ts | 90 +++++++++++++++ .../non-applications.service.spec.ts | 89 +++++++++++++++ .../non-applications.service.ts | 96 ++++++++++++++++ .../src/alcs/search/search.controller.spec.ts | 107 +++++++++++++++--- .../alcs/src/alcs/search/search.controller.ts | 86 +++++++++++--- .../apps/alcs/src/alcs/search/search.dto.ts | 56 +++++++-- .../alcs/src/alcs/search/search.module.ts | 4 + .../1693606128323-non_application_view.ts | 72 ++++++++++++ 19 files changed, 898 insertions(+), 83 deletions(-) create mode 100644 alcs-frontend/src/app/features/search/non-application-search-table/non-application-search-table.component.html create mode 100644 alcs-frontend/src/app/features/search/non-application-search-table/non-application-search-table.component.scss create mode 100644 alcs-frontend/src/app/features/search/non-application-search-table/non-application-search-table.component.spec.ts create mode 100644 alcs-frontend/src/app/features/search/non-application-search-table/non-application-search-table.component.ts create mode 100644 services/apps/alcs/src/alcs/search/non-applications/non-applications-view.entity.ts create mode 100644 services/apps/alcs/src/alcs/search/non-applications/non-applications.service.spec.ts create mode 100644 services/apps/alcs/src/alcs/search/non-applications/non-applications.service.ts create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1693606128323-non_application_view.ts diff --git a/alcs-frontend/src/app/features/search/application-search-table/application-search-table.component.spec.ts b/alcs-frontend/src/app/features/search/application-search-table/application-search-table.component.spec.ts index 769348d3ca..4c320b829d 100644 --- a/alcs-frontend/src/app/features/search/application-search-table/application-search-table.component.spec.ts +++ b/alcs-frontend/src/app/features/search/application-search-table/application-search-table.component.spec.ts @@ -1,6 +1,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { Router } from '@angular/router'; -import { DeepMocked } from '@golevelup/ts-jest'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { ApplicationSearchTableComponent } from './application-search-table.component'; @@ -10,6 +10,8 @@ describe('ApplicationSearchTableComponent', () => { let mockRouter: DeepMocked; beforeEach(async () => { + mockRouter = createMock(); + await TestBed.configureTestingModule({ declarations: [ApplicationSearchTableComponent], providers: [ diff --git a/alcs-frontend/src/app/features/search/non-application-search-table/non-application-search-table.component.html b/alcs-frontend/src/app/features/search/non-application-search-table/non-application-search-table.component.html new file mode 100644 index 0000000000..db05dcf09b --- /dev/null +++ b/alcs-frontend/src/app/features/search/non-application-search-table/non-application-search-table.component.html @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
File ID + {{ element.fileNumber | emptyColumn }} + Type + + + Owner Name + {{ element.applicant | emptyColumn }} + Local/First Nation Government + {{ element.localGovernmentName | emptyColumn }} +
+
No Search results.
+
Please adjust criteria and try again.
+
+ diff --git a/alcs-frontend/src/app/features/search/non-application-search-table/non-application-search-table.component.scss b/alcs-frontend/src/app/features/search/non-application-search-table/non-application-search-table.component.scss new file mode 100644 index 0000000000..e69de29bb2 diff --git a/alcs-frontend/src/app/features/search/non-application-search-table/non-application-search-table.component.spec.ts b/alcs-frontend/src/app/features/search/non-application-search-table/non-application-search-table.component.spec.ts new file mode 100644 index 0000000000..b23aefd68b --- /dev/null +++ b/alcs-frontend/src/app/features/search/non-application-search-table/non-application-search-table.component.spec.ts @@ -0,0 +1,33 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { Router } from '@angular/router'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; + +import { NonApplicationSearchTableComponent } from './non-application-search-table.component'; + +describe('NonApplicationSearchTableComponent', () => { + let component: NonApplicationSearchTableComponent; + let fixture: ComponentFixture; + let mockRouter: DeepMocked; + + beforeEach(async () => { + mockRouter = createMock(); + + await TestBed.configureTestingModule({ + declarations: [NonApplicationSearchTableComponent], + providers: [ + { + provide: Router, + useValue: mockRouter, + }, + ], + }).compileComponents(); + + fixture = TestBed.createComponent(NonApplicationSearchTableComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/alcs-frontend/src/app/features/search/non-application-search-table/non-application-search-table.component.ts b/alcs-frontend/src/app/features/search/non-application-search-table/non-application-search-table.component.ts new file mode 100644 index 0000000000..db05df9501 --- /dev/null +++ b/alcs-frontend/src/app/features/search/non-application-search-table/non-application-search-table.component.ts @@ -0,0 +1,105 @@ +import { AfterViewInit, Component, EventEmitter, Input, OnDestroy, Output, ViewChild } from '@angular/core'; +import { MatPaginator, PageEvent } from '@angular/material/paginator'; +import { MatSort } from '@angular/material/sort'; +import { Router } from '@angular/router'; +import { Subject, takeUntil } from 'rxjs'; +import { NonApplicationSearchResultDto } from '../../../services/search/search.dto'; +import { COVENANT_TYPE_LABEL, PLANNING_TYPE_LABEL } from '../../../shared/application-type-pill/application-type-pill.constants'; +import { TableChange } from '../search.interface'; + +interface SearchResult { + fileNumber: string; + applicant: string; + localGovernmentName?: string; + referenceId: string; + board?: string; + class: string; +} + +@Component({ + selector: 'app-non-application-search-table', + templateUrl: './non-application-search-table.component.html', + styleUrls: ['./non-application-search-table.component.scss'], +}) +export class NonApplicationSearchTableComponent implements AfterViewInit, OnDestroy { + $destroy = new Subject(); + + @ViewChild(MatPaginator) paginator!: MatPaginator; + @ViewChild(MatSort) sort?: MatSort; + + _nonApplications: NonApplicationSearchResultDto[] = []; + @Input() set nonApplications(nonApplications: NonApplicationSearchResultDto[]) { + this._nonApplications = nonApplications; + this.dataSource = this.mapNonApplications(nonApplications); + } + + @Input() totalCount = 0; + @Output() tableChange = new EventEmitter(); + + displayedColumns = ['fileId', 'type', 'applicant', 'government']; + dataSource: NonApplicationSearchResultDto[] = []; + pageIndex = 0; + itemsPerPage = 20; + total = 0; + sortDirection = 'DESC'; + sortField = 'fileId'; + + COVENANT_TYPE_LABEL = COVENANT_TYPE_LABEL + PLANNING_TYPE_LABEL = PLANNING_TYPE_LABEL + + constructor(private router: Router) {} + + ngAfterViewInit() { + if (this.sort) { + this.sort.sortChange.pipe(takeUntil(this.$destroy)).subscribe(async (sortObj) => { + this.paginator.pageIndex = 0; + this.pageIndex = 0; + this.sortDirection = sortObj.direction.toUpperCase(); + this.sortField = sortObj.active; + + await this.onTableChange(); + }); + } + } + + ngOnDestroy(): void { + this.$destroy.next(); + this.$destroy.complete(); + } + + async onTableChange() { + this.tableChange.emit({ + pageIndex: this.pageIndex, + itemsPerPage: this.itemsPerPage, + sortDirection: this.sortDirection, + sortField: this.sortField, + tableType: 'NONAPP', + }); + } + + async onPageChange($event: PageEvent) { + this.pageIndex = $event.pageIndex; + this.itemsPerPage = $event.pageSize; + + await this.onTableChange(); + } + + async onSelectRecord(record: SearchResult) { + await this.router.navigateByUrl(`/board/${record.board}?card=${record.referenceId}&type=${record.class}`); + } + + private mapNonApplications(nonApplications: NonApplicationSearchResultDto[]): NonApplicationSearchResultDto[] { + return nonApplications.map((e) => { + return { + fileNumber: e.fileNumber, + type: e.type, + applicant: e.applicant, + boardCode: e.boardCode, + localGovernmentName: e.localGovernmentName, + referenceId: e.referenceId, + board: e.boardCode, + class: e.class, + }; + }); + } +} diff --git a/alcs-frontend/src/app/features/search/search.component.html b/alcs-frontend/src/app/features/search/search.component.html index 3a4b561a2f..9ab3f405f2 100644 --- a/alcs-frontend/src/app/features/search/search.component.html +++ b/alcs-frontend/src/app/features/search/search.component.html @@ -12,13 +12,13 @@
Provide one or more of the following criteria:
File ID - +
Name - +
Search by Primary Contact, Parcel Owner, Organization, Ministry or Department
@@ -29,7 +29,7 @@
Provide one or more of the following criteria:
PID - + Civic Address @@ -233,7 +233,7 @@
Provide one or more of the following criteria:

Search Results:

- + Applications: {{ applicationTotal }} Search Results:
- Non-Applications: 0 + Non-Applications: {{ nonApplicationsTotal }} + +
diff --git a/alcs-frontend/src/app/features/search/search.component.ts b/alcs-frontend/src/app/features/search/search.component.ts index 57c8e400ca..c227623a2f 100644 --- a/alcs-frontend/src/app/features/search/search.component.ts +++ b/alcs-frontend/src/app/features/search/search.component.ts @@ -3,6 +3,7 @@ import { FormControl, FormGroup } from '@angular/forms'; import { MatAutocompleteSelectedEvent } from '@angular/material/autocomplete'; import { MatPaginator } from '@angular/material/paginator'; import { MatSort } from '@angular/material/sort'; +import { MatTabGroup } from '@angular/material/tabs'; import { ActivatedRoute } from '@angular/router'; import moment from 'moment'; import { combineLatestWith, map, Observable, startWith, Subject, takeUntil } from 'rxjs'; @@ -14,6 +15,7 @@ import { ApplicationService } from '../../services/application/application.servi import { AdvancedSearchResponseDto, ApplicationSearchResultDto, + NonApplicationSearchResultDto, NoticeOfIntentSearchResultDto, SearchRequestDto, } from '../../services/search/search.dto'; @@ -24,6 +26,11 @@ import { TableChange } from './search.interface'; export const defaultStatusBackgroundColour = '#ffffff'; export const defaultStatusColour = '#313132'; + +const APPLICATION_TAB_INDEX = 0; +const NOTICE_OF_INTENT_TAB_INDEX = 1; +const NON_APPLICATION_TAB_INDEX = 2; + @Component({ selector: 'app-search', templateUrl: './search.component.html', @@ -34,6 +41,7 @@ export class SearchComponent implements OnInit, OnDestroy { @ViewChild(MatPaginator) paginator!: MatPaginator; @ViewChild(MatSort) sort?: MatSort; + @ViewChild('searchResultTabs') tabGroup!: MatTabGroup; applications: ApplicationSearchResultDto[] = []; applicationTotal = 0; @@ -41,6 +49,9 @@ export class SearchComponent implements OnInit, OnDestroy { noticeOfIntents: NoticeOfIntentSearchResultDto[] = []; noticeOfIntentTotal = 0; + nonApplications: NonApplicationSearchResultDto[] = []; + nonApplicationsTotal = 0; + isSearchExpanded = false; pageIndex = 0; itemsPerPage = 20; @@ -133,24 +144,6 @@ export class SearchComponent implements OnInit, OnDestroy { this.$destroy.complete(); } - // TODO: remove this once the search is complete - // async onSelectCard(record: SearchResult) { - // switch (record.class) { - // case 'APP': - // await this.router.navigateByUrl(`/application/${record.referenceId}`); - // break; - // case 'NOI': - // await this.router.navigateByUrl(`/notice-of-intent/${record.referenceId}`); - // break; - // case 'COV': - // case 'PLAN': - // await this.router.navigateByUrl(`/board/${record.board}?card=${record.referenceId}&type=${record.type}`); - // break; - // default: - // this.toastService.showErrorToast(`Unable to navigate to ${record.referenceId}`); - // } - // } - async onSubmit() { await this.onSearch(); } @@ -191,9 +184,12 @@ export class SearchComponent implements OnInit, OnDestroy { const searchParams = this.getSearchParams(); const result = await this.searchService.advancedSearchFetch(searchParams); this.mapSearchResults(result); + + this.setActiveTab(); } getSearchParams(): SearchRequestDto { + const resolutionNumberString = this.formatStringSearchParam(this.searchForm.controls.resolutionNumber.value); return { // pagination pageSize: this.itemsPerPage, @@ -201,22 +197,17 @@ export class SearchComponent implements OnInit, OnDestroy { // sorting sortField: this.sortField, sortDirection: this.sortDirection, - // TODO move condition into helper function? - fileNumber: - this.searchForm.controls.fileNumber.value && this.searchForm.controls.fileNumber.value !== '' - ? this.searchForm.controls.fileNumber.value - : undefined, - legacyId: this.searchForm.controls.legacyId.value ?? undefined, - name: this.searchForm.controls.name.value ?? undefined, - civicAddress: this.searchForm.controls.civicAddress.value ?? undefined, - pid: this.searchForm.controls.pid.value ?? undefined, + // search parameters + fileNumber: this.formatStringSearchParam(this.searchForm.controls.fileNumber.value), + legacyId: this.formatStringSearchParam(this.searchForm.controls.legacyId.value), + name: this.formatStringSearchParam(this.searchForm.controls.name.value), + civicAddress: this.formatStringSearchParam(this.searchForm.controls.civicAddress.value), + pid: this.formatStringSearchParam(this.searchForm.controls.pid.value), isIncludeOtherParcels: this.searchForm.controls.isIncludeOtherParcels.value ?? false, - resolutionNumber: this.searchForm.controls.resolutionNumber.value - ? parseInt(this.searchForm.controls.resolutionNumber.value) - : undefined, + resolutionNumber: resolutionNumberString ? parseInt(resolutionNumberString) : undefined, resolutionYear: this.searchForm.controls.resolutionYear.value ?? undefined, portalStatusCode: this.searchForm.controls.portalStatus.value ?? undefined, - governmentName: this.searchForm.controls.government.value ?? undefined, + governmentName: this.formatStringSearchParam(this.searchForm.controls.government.value), regionCode: this.searchForm.controls.region.value ?? undefined, dateSubmittedFrom: this.searchForm.controls.dateSubmittedFrom.value ? formatDateForApi(this.searchForm.controls.dateSubmittedFrom.value) @@ -253,6 +244,14 @@ export class SearchComponent implements OnInit, OnDestroy { this.noticeOfIntentTotal = result?.total ?? 0; } + async onNonApplicationSearch() { + const searchParams = this.getSearchParams(); + const result = await this.searchService.advancedSearchNonApplicationsFetch(searchParams); + + this.nonApplications = result?.data ?? []; + this.nonApplicationsTotal = result?.total ?? 0; + } + async onTableChange(event: TableChange) { this.pageIndex = event.pageIndex; this.itemsPerPage = event.itemsPerPage; @@ -266,6 +265,9 @@ export class SearchComponent implements OnInit, OnDestroy { case 'NOI': await this.onApplicationSearch(); break; + case 'NONAPP': + await this.onNonApplicationSearch(); + break; default: this.toastService.showErrorToast('Not implemented'); } @@ -291,8 +293,10 @@ export class SearchComponent implements OnInit, OnDestroy { searchResult = { applications: [], noticeOfIntents: [], + nonApplications: [], totalApplications: 0, totalNoticeOfIntents: 0, + totalNonApplications: 0, }; } @@ -301,5 +305,30 @@ export class SearchComponent implements OnInit, OnDestroy { this.noticeOfIntentTotal = searchResult.totalNoticeOfIntents; this.noticeOfIntents = searchResult.noticeOfIntents; + + this.nonApplicationsTotal = searchResult.totalNonApplications; + this.nonApplications = searchResult.nonApplications; + } + + private setActiveTab() { + let maxVal = Math.max(this.applicationTotal, this.noticeOfIntentTotal, this.nonApplicationsTotal); + this.tabGroup.selectedIndex = + maxVal === this.applicationTotal + ? APPLICATION_TAB_INDEX + : maxVal === this.noticeOfIntentTotal + ? NOTICE_OF_INTENT_TAB_INDEX + : NON_APPLICATION_TAB_INDEX; + } + + private formatStringSearchParam(value: string | undefined | null) { + if (value === undefined || value === null) { + return undefined; + } + + if (value.trim() === '') { + return undefined; + } else { + return value.trim(); + } } } diff --git a/alcs-frontend/src/app/features/search/search.module.ts b/alcs-frontend/src/app/features/search/search.module.ts index 48530f0a02..a7aac6457d 100644 --- a/alcs-frontend/src/app/features/search/search.module.ts +++ b/alcs-frontend/src/app/features/search/search.module.ts @@ -7,6 +7,7 @@ import { SharedModule } from '../../shared/shared.module'; import { SearchComponent } from './search.component'; import { ApplicationSearchTableComponent } from './application-search-table/application-search-table.component'; import { NoticeOfIntentSearchTableComponent } from './notice-of-intent-search-table/notice-of-intent-search-table.component'; +import { NonApplicationSearchTableComponent } from './non-application-search-table/non-application-search-table.component'; const routes: Routes = [ { @@ -16,7 +17,7 @@ const routes: Routes = [ ]; @NgModule({ - declarations: [SearchComponent, ApplicationSearchTableComponent, NoticeOfIntentSearchTableComponent], + declarations: [SearchComponent, ApplicationSearchTableComponent, NoticeOfIntentSearchTableComponent, NonApplicationSearchTableComponent], imports: [CommonModule, SharedModule.forRoot(), RouterModule.forChild(routes), MatTabsModule, MatPaginatorModule], }) export class SearchModule {} diff --git a/alcs-frontend/src/app/services/search/search.dto.ts b/alcs-frontend/src/app/services/search/search.dto.ts index 2cb7223441..a408638827 100644 --- a/alcs-frontend/src/app/services/search/search.dto.ts +++ b/alcs-frontend/src/app/services/search/search.dto.ts @@ -16,11 +16,23 @@ export interface ApplicationSearchResultDto { export interface NoticeOfIntentSearchResultDto extends ApplicationSearchResultDto {} +export interface NonApplicationSearchResultDto { + type: string | null; + applicant: string | null; + referenceId: string | null; + localGovernmentName: string | null; + fileNumber: string; + boardCode: string | null; + class: 'PLAN' | 'COV'; +} + export interface AdvancedSearchResponseDto { applications: ApplicationSearchResultDto[]; noticeOfIntents: NoticeOfIntentSearchResultDto[]; + nonApplications: NonApplicationSearchResultDto[]; totalApplications: number; totalNoticeOfIntents: number; + totalNonApplications: number; } export interface AdvancedSearchEntityResponseDto { @@ -28,11 +40,14 @@ export interface AdvancedSearchEntityResponseDto { total: number; } -export interface SearchRequestDto { +export interface PagingRequestDto { pageSize: number; page: number; sortField: string; sortDirection: string; +} + +export interface SearchRequestDto extends PagingRequestDto { fileNumber?: string; legacyId?: string; name?: string; @@ -51,6 +66,13 @@ export interface SearchRequestDto { applicationFileTypes: string[]; } +export interface NonApplicationsSearchRequestDto extends PagingRequestDto { + fileNumber?: string; + governmentName?: string; + regionCode?: string; + name?: string; +} + export interface SearchResultDto { fileNumber: string; type: string; diff --git a/alcs-frontend/src/app/services/search/search.service.spec.ts b/alcs-frontend/src/app/services/search/search.service.spec.ts index 2ce634722d..5af45138fc 100644 --- a/alcs-frontend/src/app/services/search/search.service.spec.ts +++ b/alcs-frontend/src/app/services/search/search.service.spec.ts @@ -43,9 +43,11 @@ describe('SearchService', () => { const mockAdvancedSearchResult = { applications: [], - noticeOfIntents: [], totalApplications: 0, + noticeOfIntents: [], totalNoticeOfIntents: 0, + nonApplications: [], + totalNonApplications: 0, }; const mockSearchRequestDto = { @@ -115,6 +117,8 @@ describe('SearchService', () => { expect(res?.applications).toEqual([]); expect(res?.totalNoticeOfIntents).toEqual(0); expect(res?.noticeOfIntents).toEqual([]); + expect(res?.totalNonApplications).toEqual(0); + expect(res?.nonApplications).toEqual([]); }); it('should show an error toast message if search fails', async () => { @@ -180,4 +184,30 @@ describe('SearchService', () => { expect(res).toBeUndefined(); expect(mockToastService.showErrorToast).toHaveBeenCalledTimes(1); }); + + + it('should fetch Non Applications advanced search results by AdvancedSearchRequestDto', async () => { + mockHttpClient.post.mockReturnValue(of(mockAdvancedSearchEntityResult)); + + const res = await service.advancedSearchNonApplicationsFetch(mockSearchRequestDto); + + expect(mockHttpClient.post).toHaveBeenCalledTimes(1); + expect(res).toBeDefined(); + expect(res?.total).toEqual(0); + expect(res?.data).toEqual([]); + }); + + it('should show an error toast message if NOI advanced search fails', async () => { + mockHttpClient.post.mockReturnValue( + throwError(() => { + new Error(''); + }) + ); + + const res = await service.advancedSearchNonApplicationsFetch(mockSearchRequestDto); + + expect(mockHttpClient.post).toHaveBeenCalledTimes(1); + expect(res).toBeUndefined(); + expect(mockToastService.showErrorToast).toHaveBeenCalledTimes(1); + }); }); diff --git a/alcs-frontend/src/app/services/search/search.service.ts b/alcs-frontend/src/app/services/search/search.service.ts index 77ed377de3..f0eaa71c9f 100644 --- a/alcs-frontend/src/app/services/search/search.service.ts +++ b/alcs-frontend/src/app/services/search/search.service.ts @@ -7,6 +7,8 @@ import { AdvancedSearchEntityResponseDto, AdvancedSearchResponseDto, ApplicationSearchResultDto, + NonApplicationSearchResultDto, + NonApplicationsSearchRequestDto, NoticeOfIntentSearchResultDto, SearchRequestDto, SearchResultDto, @@ -69,4 +71,19 @@ export class SearchService { return undefined; } } + + async advancedSearchNonApplicationsFetch(searchDto: NonApplicationsSearchRequestDto) { + try { + return await firstValueFrom( + this.http.post>( + `${this.baseUrl}/advanced/non-applications`, + searchDto + ) + ); + } catch (e) { + console.error(e); + this.toastService.showErrorToast(`Search failed. Please refresh the page and try again`); + return undefined; + } + } } diff --git a/services/apps/alcs/src/alcs/search/non-applications/non-applications-view.entity.ts b/services/apps/alcs/src/alcs/search/non-applications/non-applications-view.entity.ts new file mode 100644 index 0000000000..a27f5384a1 --- /dev/null +++ b/services/apps/alcs/src/alcs/search/non-applications/non-applications-view.entity.ts @@ -0,0 +1,90 @@ +import { + JoinColumn, + ManyToOne, + PrimaryColumn, + ViewColumn, + ViewEntity, +} from 'typeorm'; +import { LocalGovernment } from '../../local-government/local-government.entity'; + +@ViewEntity({ + expression: ` + SELECT + non_applications."uuid" + ,non_applications."file_number" + ,non_applications."applicant" + ,non_applications."type" + ,non_applications."class" + ,non_applications."local_government_uuid" as "local_government_uuid" + ,non_applications."card_uuid" + ,non_applications."board_code" + FROM + ( + SELECT + cov.uuid AS "uuid", + cov.file_number AS "file_number", + "applicant", + NULL AS "type", + 'COV' AS "class", + cov.local_government_uuid AS "local_government_uuid", + card.uuid AS "card_uuid", + board.code AS "board_code" + FROM + alcs.covenant cov + LEFT JOIN alcs.card card ON + cov.card_uuid = card.uuid AND card.audit_deleted_date_at IS NULL + LEFT JOIN alcs.board board ON + board.uuid = card.board_uuid AND board.audit_deleted_date_at IS NULL + WHERE cov.audit_deleted_date_at IS NULL + UNION + SELECT + planning_review.uuid AS "uuid", + planning_review.file_number AS "file_number", + NULL AS "applicant", + "type", + 'PLAN' AS "class", + planning_review.local_government_uuid AS "local_government_uuid", + card.uuid AS "card_uuid", + board.code AS "board_code" + FROM + alcs.planning_review planning_review + LEFT JOIN alcs.card card ON + planning_review.card_uuid = card.uuid AND card.audit_deleted_date_at IS NULL + LEFT JOIN alcs.board board ON + board.uuid = card.board_uuid AND board.audit_deleted_date_at IS NULL + WHERE planning_review.audit_deleted_date_at IS NULL + ) AS non_applications +`, +}) +export class NonApplicationSearchView { + @ViewColumn() + @PrimaryColumn() + uuid: string; + + @ViewColumn() + fileNumber: string; + + @ViewColumn() + applicant: string | null; + + @ViewColumn() + type: string | null; + + @ViewColumn() + localGovernmentUuid: string | null; + + @ViewColumn() + class: 'COV' | 'PLAN'; + + @ViewColumn() + cardUuid: string | null; + + @ViewColumn() + boardCode: string | null; + + @ManyToOne(() => LocalGovernment, { + nullable: true, + }) + @JoinColumn({ name: 'local_government_uuid' }) + localGovernment: LocalGovernment | null; +} diff --git a/services/apps/alcs/src/alcs/search/non-applications/non-applications.service.spec.ts b/services/apps/alcs/src/alcs/search/non-applications/non-applications.service.spec.ts new file mode 100644 index 0000000000..c09bf228f3 --- /dev/null +++ b/services/apps/alcs/src/alcs/search/non-applications/non-applications.service.spec.ts @@ -0,0 +1,89 @@ +import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; +import { Test, TestingModule } from '@nestjs/testing'; +import { getRepositoryToken } from '@nestjs/typeorm'; +import { Repository } from 'typeorm'; +import { NonApplicationsSearchRequestDto } from '../search.dto'; +import { NonApplicationSearchView } from './non-applications-view.entity'; +import { NonApplicationsAdvancedSearchService } from './non-applications.service'; + +describe('NonApplicationsService', () => { + let service: NonApplicationsAdvancedSearchService; + let mockNonApplicationsRepository: DeepMocked< + Repository + >; + + let mockQuery: any = {}; + + const mockSearchRequestDto: NonApplicationsSearchRequestDto = { + fileNumber: '123', + governmentName: 'B', + regionCode: 'C', + name: 'D', + page: 1, + pageSize: 10, + sortField: 'applicant', + sortDirection: 'ASC', + }; + + beforeEach(async () => { + mockNonApplicationsRepository = createMock(); + + mockQuery = { + getManyAndCount: jest.fn().mockResolvedValue([[], 0]), + orderBy: jest.fn().mockReturnThis(), + offset: jest.fn().mockReturnThis(), + limit: jest.fn().mockReturnThis(), + leftJoinAndMapOne: jest.fn().mockReturnThis(), + groupBy: jest.fn().mockReturnThis(), + where: jest.fn().mockReturnThis(), + andWhere: jest.fn().mockReturnThis(), + }; + + const module: TestingModule = await Test.createTestingModule({ + providers: [ + NonApplicationsAdvancedSearchService, + { + provide: getRepositoryToken(NonApplicationSearchView), + useValue: mockNonApplicationsRepository, + }, + ], + }).compile(); + + service = module.get( + NonApplicationsAdvancedSearchService, + ); + }); + + it('should be defined', () => { + expect(service).toBeDefined(); + }); + + it('should successfully build a query using all search parameters defined', async () => { + mockNonApplicationsRepository.createQueryBuilder.mockReturnValue( + mockQuery as any, + ); + + const result = await service.searchNonApplications(mockSearchRequestDto); + + expect(result).toEqual({ data: [], total: 0 }); + expect(mockNonApplicationsRepository.createQueryBuilder).toBeCalledTimes(1); + expect(mockQuery.andWhere).toBeCalledTimes(4); + expect(mockQuery.where).toBeCalledTimes(1); + }); + + it('should call compileSearchQuery method correctly', async () => { + const compileNonApplicationSearchQuerySpy = jest + .spyOn(service as any, 'compileSearchQuery') + .mockResolvedValue(mockQuery); + + const result = await service.searchNonApplications(mockSearchRequestDto); + + expect(result).toEqual({ data: [], total: 0 }); + expect(compileNonApplicationSearchQuerySpy).toBeCalledWith( + mockSearchRequestDto, + ); + expect(mockQuery.orderBy).toHaveBeenCalledTimes(1); + expect(mockQuery.offset).toHaveBeenCalledTimes(1); + expect(mockQuery.limit).toHaveBeenCalledTimes(1); + }); +}); diff --git a/services/apps/alcs/src/alcs/search/non-applications/non-applications.service.ts b/services/apps/alcs/src/alcs/search/non-applications/non-applications.service.ts new file mode 100644 index 0000000000..70d0c9762a --- /dev/null +++ b/services/apps/alcs/src/alcs/search/non-applications/non-applications.service.ts @@ -0,0 +1,96 @@ +import { Injectable } from '@nestjs/common'; +import { InjectRepository } from '@nestjs/typeorm'; +import { Repository } from 'typeorm'; +import { formatStringToPostgresSearchStringArrayWithWildCard } from '../../../utils/search-helper'; +import { LocalGovernment } from '../../local-government/local-government.entity'; +import { + AdvancedSearchResultDto, + NonApplicationsSearchRequestDto, +} from '../search.dto'; +import { NonApplicationSearchView } from './non-applications-view.entity'; + +@Injectable() +export class NonApplicationsAdvancedSearchService { + constructor( + @InjectRepository(NonApplicationSearchView) + private nonApplicationSearchRepository: Repository, + ) {} + + async searchNonApplications( + searchDto: NonApplicationsSearchRequestDto, + ): Promise> { + let query = await this.compileSearchQuery(searchDto); + + const sortQuery = this.compileSortQuery(searchDto); + + query = query + .orderBy(sortQuery, searchDto.sortDirection) + .offset((searchDto.page - 1) * searchDto.pageSize) + .limit(searchDto.pageSize); + + const result = await query.getManyAndCount(); + + return { + data: result[0], + total: result[1], + }; + } + + private compileSortQuery(searchDto: NonApplicationsSearchRequestDto) { + switch (searchDto.sortField) { + case 'applicant': + return '"nonApp"."applicant"'; + + case 'government': + return '"localGovernment"."name"'; + + case 'type': + return '"nonApp"."class"'; + + default: + case 'fileId': + return '"nonApp"."file_number"'; + } + } + + private async compileSearchQuery(searchDto: NonApplicationsSearchRequestDto) { + let query = this.nonApplicationSearchRepository + .createQueryBuilder('nonApp') + .leftJoinAndMapOne( + 'nonApp.localGovernment', + LocalGovernment, + 'localGovernment', + '"nonApp"."local_government_uuid" = "localGovernment".uuid', + ) + .where('1 = 1'); + + if (searchDto.fileNumber) { + query = query.andWhere('nonApp.file_number = :fileNumber', { + fileNumber: searchDto.fileNumber ?? null, + }); + } + + if (searchDto.regionCode) { + query = query.andWhere('nonApp.region_code = :regionCode', { + regionCode: searchDto.regionCode, + }); + } + + if (searchDto.governmentName) { + query = query.andWhere('localGovernment.name = :localGovernmentName', { + localGovernmentName: searchDto.governmentName, + }); + } + + if (searchDto.name) { + const formattedSearchString = + formatStringToPostgresSearchStringArrayWithWildCard(searchDto.name!); + + query = query.andWhere('LOWER(nonApp.applicant) LIKE ANY (:names)', { + names: formattedSearchString, + }); + } + + return query; + } +} diff --git a/services/apps/alcs/src/alcs/search/search.controller.spec.ts b/services/apps/alcs/src/alcs/search/search.controller.spec.ts index 41d2380130..3e51a64d9a 100644 --- a/services/apps/alcs/src/alcs/search/search.controller.spec.ts +++ b/services/apps/alcs/src/alcs/search/search.controller.spec.ts @@ -12,10 +12,16 @@ import { NoticeOfIntent } from '../notice-of-intent/notice-of-intent.entity'; import { PlanningReview } from '../planning-review/planning-review.entity'; import { ApplicationAdvancedSearchService } from './application/application-advanced-search.service'; import { ApplicationSubmissionSearchView } from './application/application-search-view.entity'; +import { NonApplicationSearchView } from './non-applications/non-applications-view.entity'; +import { NonApplicationsAdvancedSearchService } from './non-applications/non-applications.service'; import { NoticeOfIntentAdvancedSearchService } from './notice-of-intent/notice-of-intent-advanced-search.service'; import { NoticeOfIntentSubmissionSearchView } from './notice-of-intent/notice-of-intent-search-view.entity'; import { SearchController } from './search.controller'; -import { AdvancedSearchResultDto, SearchRequestDto } from './search.dto'; +import { + AdvancedSearchResultDto, + NonApplicationsSearchRequestDto, + SearchRequestDto, +} from './search.dto'; import { SearchService } from './search.service'; describe('SearchController', () => { @@ -23,11 +29,13 @@ describe('SearchController', () => { let mockSearchService: DeepMocked; let mockNoticeOfIntentAdvancedSearchService: DeepMocked; let mockApplicationAdvancedSearchService: DeepMocked; + let mockNonApplicationsAdvancedSearchService: DeepMocked; beforeEach(async () => { mockSearchService = createMock(); mockNoticeOfIntentAdvancedSearchService = createMock(); mockApplicationAdvancedSearchService = createMock(); + mockNonApplicationsAdvancedSearchService = createMock(); const module: TestingModule = await Test.createTestingModule({ imports: [ @@ -48,6 +56,10 @@ describe('SearchController', () => { provide: ApplicationAdvancedSearchService, useValue: mockApplicationAdvancedSearchService, }, + { + provide: NonApplicationsAdvancedSearchService, + useValue: mockNonApplicationsAdvancedSearchService, + }, { provide: ClsService, useValue: {}, @@ -85,7 +97,6 @@ describe('SearchController', () => { >(); mockNoiResult.data = new Array(); mockNoiResult.total = 0; - mockNoticeOfIntentAdvancedSearchService.searchNoticeOfIntents.mockResolvedValue( mockNoiResult, ); @@ -95,10 +106,18 @@ describe('SearchController', () => { >(); mockApplicationResult.data = new Array(); mockApplicationResult.total = 0; - mockApplicationAdvancedSearchService.searchApplications.mockResolvedValue( mockApplicationResult, ); + + const mockNonApplicationResult = new AdvancedSearchResultDto< + NonApplicationSearchView[] + >(); + mockNonApplicationResult.data = new Array(); + mockNonApplicationResult.total = 0; + mockNonApplicationsAdvancedSearchService.searchNonApplications.mockResolvedValue( + mockNonApplicationResult, + ); }); it('should be defined', () => { @@ -121,7 +140,7 @@ describe('SearchController', () => { expect(result.length).toBe(4); }); - it('should call applications advanced search to retrieve Applications', async () => { + it('should call advanced search to retrieve Applications, NOIs, PlanningReviews, Covenants', async () => { const mockSearchRequestDto = { pageSize: 1, page: 1, @@ -131,11 +150,6 @@ describe('SearchController', () => { applicationFileTypes: [], }; - mockApplicationAdvancedSearchService.searchApplications.mockResolvedValue({ - data: [], - total: 0, - }); - const result = await controller.advancedSearch( mockSearchRequestDto as SearchRequestDto, ); @@ -148,9 +162,27 @@ describe('SearchController', () => { ).toBeCalledWith(mockSearchRequestDto); expect(result.applications).toBeDefined(); expect(result.totalApplications).toBe(0); + + expect( + mockNoticeOfIntentAdvancedSearchService.searchNoticeOfIntents, + ).toBeCalledTimes(1); + expect( + mockNoticeOfIntentAdvancedSearchService.searchNoticeOfIntents, + ).toBeCalledWith(mockSearchRequestDto); + expect(result.noticeOfIntents).toBeDefined(); + expect(result.totalNoticeOfIntents).toBe(0); + + expect( + mockNonApplicationsAdvancedSearchService.searchNonApplications, + ).toBeCalledTimes(1); + expect( + mockNonApplicationsAdvancedSearchService.searchNonApplications, + ).toBeCalledWith(mockSearchRequestDto); + expect(result.nonApplications).toBeDefined(); + expect(result.totalNonApplications).toBe(0); }); - it('should call NOI advanced search to retrieve NOIs', async () => { + it('should call applications advanced search to retrieve Applications', async () => { const mockSearchRequestDto = { pageSize: 1, page: 1, @@ -160,14 +192,31 @@ describe('SearchController', () => { applicationFileTypes: [], }; - mockNoticeOfIntentAdvancedSearchService.searchNoticeOfIntents.mockResolvedValue( - { - data: [], - total: 0, - }, + const result = await controller.advancedSearchApplications( + mockSearchRequestDto as SearchRequestDto, ); - const result = await controller.advancedSearch( + expect( + mockApplicationAdvancedSearchService.searchApplications, + ).toBeCalledTimes(1); + expect( + mockApplicationAdvancedSearchService.searchApplications, + ).toBeCalledWith(mockSearchRequestDto); + expect(result.data).toBeDefined(); + expect(result.total).toBe(0); + }); + + it('should call NOI advanced search to retrieve NOIs', async () => { + const mockSearchRequestDto = { + pageSize: 1, + page: 1, + sortField: '1', + sortDirection: 'ASC', + isIncludeOtherParcels: false, + applicationFileTypes: [], + }; + + const result = await controller.advancedSearchNoticeOfIntents( mockSearchRequestDto as SearchRequestDto, ); @@ -177,7 +226,29 @@ describe('SearchController', () => { expect( mockNoticeOfIntentAdvancedSearchService.searchNoticeOfIntents, ).toBeCalledWith(mockSearchRequestDto); - expect(result.applications).toBeDefined(); - expect(result.totalApplications).toBe(0); + expect(result.data).toBeDefined(); + expect(result.total).toBe(0); + }); + + it('should call non-applications advanced search to retrieve Non-Applications', async () => { + const mockSearchRequestDto: NonApplicationsSearchRequestDto = { + pageSize: 1, + page: 1, + sortField: '1', + sortDirection: 'ASC', + }; + + const result = await controller.advancedSearchNonApplications( + mockSearchRequestDto, + ); + + expect( + mockNonApplicationsAdvancedSearchService.searchNonApplications, + ).toBeCalledTimes(1); + expect( + mockNonApplicationsAdvancedSearchService.searchNonApplications, + ).toBeCalledWith(mockSearchRequestDto); + expect(result.data).toBeDefined(); + expect(result.total).toBe(0); }); }); diff --git a/services/apps/alcs/src/alcs/search/search.controller.ts b/services/apps/alcs/src/alcs/search/search.controller.ts index 9d6f5e753c..b9141722a4 100644 --- a/services/apps/alcs/src/alcs/search/search.controller.ts +++ b/services/apps/alcs/src/alcs/search/search.controller.ts @@ -15,12 +15,16 @@ import { NoticeOfIntent } from '../notice-of-intent/notice-of-intent.entity'; import { PlanningReview } from '../planning-review/planning-review.entity'; import { ApplicationAdvancedSearchService } from './application/application-advanced-search.service'; import { ApplicationSubmissionSearchView } from './application/application-search-view.entity'; +import { NonApplicationSearchView } from './non-applications/non-applications-view.entity'; +import { NonApplicationsAdvancedSearchService } from './non-applications/non-applications.service'; import { NoticeOfIntentAdvancedSearchService } from './notice-of-intent/notice-of-intent-advanced-search.service'; import { NoticeOfIntentSubmissionSearchView } from './notice-of-intent/notice-of-intent-search-view.entity'; import { AdvancedSearchResponseDto, AdvancedSearchResultDto, ApplicationSearchResultDto, + NonApplicationSearchResultDto, + NonApplicationsSearchRequestDto, NoticeOfIntentSearchResultDto, SearchRequestDto, SearchResultDto, @@ -36,6 +40,7 @@ export class SearchController { @InjectMapper() private mapper: Mapper, private noticeOfIntentSearchService: NoticeOfIntentAdvancedSearchService, private applicationSearchService: ApplicationAdvancedSearchService, + private nonApplicationsSearchService: NonApplicationsAdvancedSearchService, ) {} @UserRoles(...ROLES_ALLOWED_APPLICATIONS) @@ -145,9 +150,13 @@ export class SearchController { const noticeOfIntentSearchService = await this.noticeOfIntentSearchService.searchNoticeOfIntents(searchDto); + const nonApplications = + await this.nonApplicationsSearchService.searchNonApplications(searchDto); + const mappedSearchResult = this.mapAdvancedSearchResults( applicationSearchResult, noticeOfIntentSearchService, + nonApplications, ); return mappedSearchResult; @@ -158,11 +167,13 @@ export class SearchController { async advancedSearchApplications( @Body() searchDto: SearchRequestDto, ): Promise> { - const applicationSearchResult = - await this.applicationSearchService.searchApplications(searchDto); + const applications = await this.applicationSearchService.searchApplications( + searchDto, + ); const mappedSearchResult = this.mapAdvancedSearchResults( - applicationSearchResult, + applications, + null, null, ); @@ -177,12 +188,13 @@ export class SearchController { async advancedSearchNoticeOfIntents( @Body() searchDto: SearchRequestDto, ): Promise> { - const noticeOfIntentSearchService = + const noticeOfIntents = await this.noticeOfIntentSearchService.searchNoticeOfIntents(searchDto); const mappedSearchResult = this.mapAdvancedSearchResults( null, - noticeOfIntentSearchService, + noticeOfIntents, + null, ); return { @@ -191,6 +203,26 @@ export class SearchController { }; } + @Post('/advanced/non-applications') + @UserRoles(...ROLES_ALLOWED_APPLICATIONS) + async advancedSearchNonApplications( + @Body() searchDto: NonApplicationsSearchRequestDto, + ): Promise> { + const nonApplications = + await this.nonApplicationsSearchService.searchNonApplications(searchDto); + + const mappedSearchResult = this.mapAdvancedSearchResults( + null, + null, + nonApplications, + ); + + return { + total: mappedSearchResult.totalNonApplications, + data: mappedSearchResult.nonApplications, + }; + } + private mapAdvancedSearchResults( applications: AdvancedSearchResultDto< ApplicationSubmissionSearchView[] @@ -198,6 +230,7 @@ export class SearchController { noticeOfIntents: AdvancedSearchResultDto< NoticeOfIntentSubmissionSearchView[] > | null, + nonApplications: AdvancedSearchResultDto | null, ) { const response = new AdvancedSearchResponseDto(); @@ -219,21 +252,32 @@ export class SearchController { ); } + const mappedNonApplications: NonApplicationSearchResultDto[] = []; + if (nonApplications?.data && nonApplications?.data.length > 0) { + mappedNonApplications.push( + ...nonApplications.data.map((nonApplication) => + this.mapNonApplicationToAdvancedSearchResult(nonApplication), + ), + ); + } + response.applications = mappedApplications; response.totalApplications = applications?.total ?? 0; response.noticeOfIntents = mappedNoticeOfIntents; response.totalNoticeOfIntents = noticeOfIntents?.total ?? 0; + response.nonApplications = mappedNonApplications; + response.totalNonApplications = nonApplications?.total ?? 0; return response; } private mapApplicationToAdvancedSearchResult( application: ApplicationSubmissionSearchView, - ) { - const result = { + ): ApplicationSearchResultDto { + return { referenceId: application.fileNumber, fileNumber: application.fileNumber, - dateSubmitted: application.dateSubmittedToAlc, + dateSubmitted: application.dateSubmittedToAlc?.getTime(), type: this.mapper.map( application.applicationType, ApplicationType, @@ -243,18 +287,16 @@ export class SearchController { ownerName: application.applicant, class: 'APP', status: application.status.status_type_code, - } as ApplicationSearchResultDto; - - return result; + }; } private mapNoticeOfIntentToAdvancedSearchResult( noi: NoticeOfIntentSubmissionSearchView, - ) { - const result = { + ): NoticeOfIntentSearchResultDto { + return { referenceId: noi.fileNumber, fileNumber: noi.fileNumber, - dateSubmitted: noi.dateSubmittedToAlc, + dateSubmitted: noi.dateSubmittedToAlc?.getTime(), type: this.mapper.map( noi.noticeOfIntentType, ApplicationType, @@ -264,8 +306,20 @@ export class SearchController { ownerName: noi.applicant, class: 'NOI', status: noi.status.status_type_code, - } as NoticeOfIntentSearchResultDto; + }; + } - return result; + private mapNonApplicationToAdvancedSearchResult( + nonApplication: NonApplicationSearchView, + ): NonApplicationSearchResultDto { + return { + referenceId: nonApplication.cardUuid, + fileNumber: nonApplication.fileNumber, + applicant: nonApplication.applicant, + boardCode: nonApplication.boardCode, + type: nonApplication.type, + localGovernmentName: nonApplication.localGovernment?.name ?? null, + class: nonApplication.class, + }; } } diff --git a/services/apps/alcs/src/alcs/search/search.dto.ts b/services/apps/alcs/src/alcs/search/search.dto.ts index 0a3ff0db2d..dce8b16d4f 100644 --- a/services/apps/alcs/src/alcs/search/search.dto.ts +++ b/services/apps/alcs/src/alcs/search/search.dto.ts @@ -18,31 +18,49 @@ export class SearchResultDto { label?: ApplicationTypeDto; } +export type SearchEntityClass = 'APP' | 'NOI' | 'PLAN' | 'COV'; + export class ApplicationSearchResultDto { type: ApplicationTypeDto; referenceId: string; ownerName?: string; - localGovernmentName: string; + localGovernmentName?: string; fileNumber: string; boardCode?: string; status: string; + dateSubmitted?: number; + class: SearchEntityClass; } export class NoticeOfIntentSearchResultDto { type: ApplicationTypeDto; referenceId: string; ownerName?: string; - localGovernmentName: string; + localGovernmentName?: string; fileNumber: string; boardCode?: string; status: string; + dateSubmitted?: number; + class: SearchEntityClass; +} + +export class NonApplicationSearchResultDto { + type: string | null; + applicant: string | null; + referenceId: string | null; + localGovernmentName: string | null; + fileNumber: string; + boardCode: string | null; + class: SearchEntityClass; } export class AdvancedSearchResponseDto { applications: ApplicationSearchResultDto[]; noticeOfIntents: NoticeOfIntentSearchResultDto[]; + nonApplications: NonApplicationSearchResultDto[]; totalApplications: number; totalNoticeOfIntents: number; + totalNonApplications: number; } export class AdvancedSearchResultDto { @@ -50,7 +68,21 @@ export class AdvancedSearchResultDto { total: number; } -export class SearchRequestDto { +export class PagingRequestDto { + @IsNumber() + page: number; + + @IsNumber() + pageSize: number; + + @IsString() + sortField: string; + + @IsString() + sortDirection: 'ASC' | 'DESC'; +} + +export class SearchRequestDto extends PagingRequestDto { @IsString() @IsOptional() @MinLength(3) @@ -118,16 +150,22 @@ export class SearchRequestDto { @IsArray() applicationFileTypes: string[]; +} - @IsNumber() - page: number; +export class NonApplicationsSearchRequestDto extends PagingRequestDto { + @IsString() + @IsOptional() + fileNumber?: string; - @IsNumber() - pageSize: number; + @IsString() + @IsOptional() + governmentName?: string; @IsString() - sortField: string; + @IsOptional() + regionCode?: string; @IsString() - sortDirection: 'ASC' | 'DESC'; + @IsOptional() + name?: string; } diff --git a/services/apps/alcs/src/alcs/search/search.module.ts b/services/apps/alcs/src/alcs/search/search.module.ts index b3fee1cb95..33145255b5 100644 --- a/services/apps/alcs/src/alcs/search/search.module.ts +++ b/services/apps/alcs/src/alcs/search/search.module.ts @@ -8,6 +8,8 @@ import { NoticeOfIntent } from '../notice-of-intent/notice-of-intent.entity'; import { PlanningReview } from '../planning-review/planning-review.entity'; import { ApplicationAdvancedSearchService } from './application/application-advanced-search.service'; import { ApplicationSubmissionSearchView } from './application/application-search-view.entity'; +import { NonApplicationSearchView } from './non-applications/non-applications-view.entity'; +import { NonApplicationsAdvancedSearchService } from './non-applications/non-applications.service'; import { NoticeOfIntentAdvancedSearchService } from './notice-of-intent/notice-of-intent-advanced-search.service'; import { NoticeOfIntentSubmissionSearchView } from './notice-of-intent/notice-of-intent-search-view.entity'; import { SearchController } from './search.controller'; @@ -23,6 +25,7 @@ import { SearchService } from './search.service'; LocalGovernment, ApplicationSubmissionSearchView, NoticeOfIntentSubmissionSearchView, + NonApplicationSearchView, ]), ], providers: [ @@ -30,6 +33,7 @@ import { SearchService } from './search.service'; ApplicationProfile, ApplicationAdvancedSearchService, NoticeOfIntentAdvancedSearchService, + NonApplicationsAdvancedSearchService, ], controllers: [SearchController], }) diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1693606128323-non_application_view.ts b/services/apps/alcs/src/providers/typeorm/migrations/1693606128323-non_application_view.ts new file mode 100644 index 0000000000..344de8d29e --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1693606128323-non_application_view.ts @@ -0,0 +1,72 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class nonApplicationView1693606128323 implements MigrationInterface { + name = 'nonApplicationView1693606128323'; + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query(`CREATE VIEW "alcs"."non_application_search_view" AS + SELECT + non_applications."uuid" + ,non_applications."file_number" + ,non_applications."applicant" + ,non_applications."type" + ,non_applications."class" + ,non_applications."local_government_uuid" as "local_government_uuid" + ,non_applications."card_uuid" + ,non_applications."board_code" + FROM + ( + SELECT + cov.uuid AS "uuid", + cov.file_number AS "file_number", + "applicant", + NULL AS "type", + 'COV' AS "class", + cov.local_government_uuid AS "local_government_uuid", + card.uuid AS "card_uuid", + board.code AS "board_code" + FROM + alcs.covenant cov + LEFT JOIN alcs.card card ON + cov.card_uuid = card.uuid AND card.audit_deleted_date_at IS NULL + LEFT JOIN alcs.board board ON + board.uuid = card.board_uuid AND board.audit_deleted_date_at IS NULL + WHERE cov.audit_deleted_date_at IS NULL + UNION + SELECT + planning_review.uuid AS "uuid", + planning_review.file_number AS "file_number", + NULL AS "applicant", + "type", + 'PLAN' AS "class", + planning_review.local_government_uuid AS "local_government_uuid", + card.uuid AS "card_uuid", + board.code AS "board_code" + FROM + alcs.planning_review planning_review + LEFT JOIN alcs.card card ON + planning_review.card_uuid = card.uuid AND card.audit_deleted_date_at IS NULL + LEFT JOIN alcs.board board ON + board.uuid = card.board_uuid AND board.audit_deleted_date_at IS NULL + WHERE planning_review.audit_deleted_date_at IS NULL + ) AS non_applications +`); + await queryRunner.query( + `INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, + [ + 'alcs', + 'VIEW', + 'non_application_search_view', + 'SELECT\n non_applications."uuid"\n ,non_applications."file_number"\n ,non_applications."applicant" \n ,non_applications."type"\n ,non_applications."class"\n ,non_applications."local_government_uuid" as "local_government_uuid"\n ,non_applications."card_uuid"\n ,non_applications."board_code"\n FROM\n (\n SELECT\n cov.uuid AS "uuid",\n cov.file_number AS "file_number",\n "applicant",\n NULL AS "type",\n \'COV\' AS "class",\n cov.local_government_uuid AS "local_government_uuid",\n card.uuid AS "card_uuid",\n board.code AS "board_code"\n FROM\n alcs.covenant cov\n LEFT JOIN alcs.card card ON\n cov.card_uuid = card.uuid AND card.audit_deleted_date_at IS NULL\n LEFT JOIN alcs.board board ON\n board.uuid = card.board_uuid AND board.audit_deleted_date_at IS NULL\n WHERE cov.audit_deleted_date_at IS NULL\n UNION\n SELECT\n planning_review.uuid AS "uuid",\n planning_review.file_number AS "file_number",\n NULL AS "applicant",\n "type",\n \'PLAN\' AS "class",\n planning_review.local_government_uuid AS "local_government_uuid",\n card.uuid AS "card_uuid",\n board.code AS "board_code"\n FROM\n alcs.planning_review planning_review \n LEFT JOIN alcs.card card ON\n planning_review.card_uuid = card.uuid AND card.audit_deleted_date_at IS NULL\n LEFT JOIN alcs.board board ON\n board.uuid = card.board_uuid AND board.audit_deleted_date_at IS NULL\n WHERE planning_review.audit_deleted_date_at IS NULL\n ) AS non_applications', + ], + ); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, + ['VIEW', 'non_application_search_view', 'alcs'], + ); + await queryRunner.query(`DROP VIEW "alcs"."non_application_search_view"`); + } +} From 606ff275d9ea4a2643003683b43996e5cf2d3fc6 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Tue, 5 Sep 2023 10:03:30 -0700 Subject: [PATCH 334/954] Add SRWs / Notifications * Rename AppParcelType => ParcelType and share across all 3 * Add lots of SRW stuff --- portal-frontend/src/app/app-routing.module.ts | 16 + .../create-submission-dialog.component.html | 52 ++- .../create-submission-dialog.component.scss | 9 + ...create-submission-dialog.component.spec.ts | 5 + .../create-submission-dialog.component.ts | 29 +- .../edit-submission-base.module.ts | 12 + .../edit-submission.component.html | 60 +++ .../edit-submission.component.scss | 346 ++++++++++++++++++ .../edit-submission.component.spec.ts | 46 +++ .../edit-submission.component.ts | 179 +++++++++ .../edit-submission/edit-submission.module.ts | 26 ++ .../edit-submission/files-step.partial.ts | 75 ++++ .../edit-submission/step.partial.ts | 33 ++ ...iew-notification-submission.component.html | 91 +++++ ...iew-notification-submission.component.scss | 183 +++++++++ ...-notification-submission.component.spec.ts | 46 +++ .../view-notification-submission.component.ts | 64 ++++ .../view-notification-submission.module.ts | 19 + .../notification-parcel.dto.ts | 22 ++ .../notification-parcel.service.spec.ts | 101 +++++ .../notification-parcel.service.ts | 87 +++++ .../notification-submission.dto.ts | 26 ++ .../notification-submission.service.spec.ts | 132 +++++++ .../notification-submission.service.ts | 117 ++++++ .../notification-transferee.dto.ts | 50 +++ .../notification-transferee.service.spec.ts | 189 ++++++++++ .../notification-transferee.service.ts | 143 ++++++++ .../notice-of-intent-modification.dto.ts | 2 +- .../notice-of-intent-type.dto.ts | 2 +- .../notice-of-intent-type.entity.ts | 2 +- .../notice-of-intent/notice-of-intent.dto.ts | 2 +- .../notice-of-intent.entity.ts | 2 +- .../notice-of-intent.module.ts | 2 +- .../notice-of-intent.service.spec.ts | 2 +- .../notice-of-intent.service.ts | 2 +- .../notification-type.dto.ts | 13 + .../notification-type.entity.ts | 25 ++ .../notification.controller.spec.ts | 84 +++++ .../notification/notification.controller.ts | 61 +++ .../src/alcs/notification/notification.dto.ts | 76 ++++ .../alcs/notification/notification.entity.ts | 82 +++++ .../alcs/notification/notification.module.ts | 30 ++ .../notification/notification.service.spec.ts | 265 ++++++++++++++ .../alcs/notification/notification.service.ts | 321 ++++++++++++++++ .../notice-of-intent-search-view.entity.ts | 2 +- .../application-parcel.automapper.profile.ts | 20 +- ...ice-of-intent-parcel.automapper.profile.ts | 20 +- .../notice-of-intent.automapper.profile.ts | 4 +- .../notification-parcel.automapper.profile.ts | 46 +++ ...ification-submission.automapper.profile.ts | 55 +++ ...ification-transferee.automapper.profile.ts | 29 ++ .../notification.automapper.profile.ts | 34 ++ .../parcel-ownership-type.entity.ts | 8 + .../application-submission-draft.module.ts | 4 +- ...pplication-parcel-ownership-type.entity.ts | 5 - .../application-parcel.entity.ts | 6 +- .../application-submission.module.ts | 4 +- ...-of-intent-parcel-ownership-type.entity.ts | 5 - .../notice-of-intent-parcel.dto.ts | 6 +- .../notice-of-intent-parcel.entity.ts | 6 +- .../notice-of-intent-submission.module.ts | 6 +- ...otice-of-intent-submission.service.spec.ts | 2 +- .../notification-parcel.controller.spec.ts | 158 ++++++++ .../notification-parcel.controller.ts | 95 +++++ .../notification-parcel.dto.ts | 93 +++++ .../notification-parcel.entity.ts | 90 +++++ .../notification-parcel.service.spec.ts | 199 ++++++++++ .../notification-parcel.service.ts | 92 +++++ ...notification-submission.controller.spec.ts | 264 +++++++++++++ .../notification-submission.controller.ts | 149 ++++++++ .../notification-submission.dto.ts | 59 +++ .../notification-submission.entity.ts | 88 +++++ .../notification-submission.module.ts | 58 +++ .../notification-submission.service.spec.ts | 248 +++++++++++++ .../notification-submission.service.ts | 336 +++++++++++++++++ ...notification-transferee.controller.spec.ts | 202 ++++++++++ .../notification-transferee.controller.ts | 137 +++++++ .../notification-transferee.dto.ts | 63 ++++ .../notification-transferee.entity.ts | 61 +++ .../notification-transferee.service.spec.ts | 217 +++++++++++ .../notification-transferee.service.ts | 196 ++++++++++ .../apps/alcs/src/portal/portal.module.ts | 3 + .../1693608113088-add_notifications.ts | 170 +++++++++ .../1693610085203-seed_notification_tables.ts | 17 + 84 files changed, 6312 insertions(+), 76 deletions(-) create mode 100644 portal-frontend/src/app/features/notifications/edit-submission/edit-submission-base.module.ts create mode 100644 portal-frontend/src/app/features/notifications/edit-submission/edit-submission.component.html create mode 100644 portal-frontend/src/app/features/notifications/edit-submission/edit-submission.component.scss create mode 100644 portal-frontend/src/app/features/notifications/edit-submission/edit-submission.component.spec.ts create mode 100644 portal-frontend/src/app/features/notifications/edit-submission/edit-submission.component.ts create mode 100644 portal-frontend/src/app/features/notifications/edit-submission/edit-submission.module.ts create mode 100644 portal-frontend/src/app/features/notifications/edit-submission/files-step.partial.ts create mode 100644 portal-frontend/src/app/features/notifications/edit-submission/step.partial.ts create mode 100644 portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.html create mode 100644 portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.scss create mode 100644 portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.spec.ts create mode 100644 portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.ts create mode 100644 portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.module.ts create mode 100644 portal-frontend/src/app/services/notification-parcel/notification-parcel.dto.ts create mode 100644 portal-frontend/src/app/services/notification-parcel/notification-parcel.service.spec.ts create mode 100644 portal-frontend/src/app/services/notification-parcel/notification-parcel.service.ts create mode 100644 portal-frontend/src/app/services/notification-submission/notification-submission.dto.ts create mode 100644 portal-frontend/src/app/services/notification-submission/notification-submission.service.spec.ts create mode 100644 portal-frontend/src/app/services/notification-submission/notification-submission.service.ts create mode 100644 portal-frontend/src/app/services/notification-transferee/notification-transferee.dto.ts create mode 100644 portal-frontend/src/app/services/notification-transferee/notification-transferee.service.spec.ts create mode 100644 portal-frontend/src/app/services/notification-transferee/notification-transferee.service.ts rename services/apps/alcs/src/alcs/{code/application-code => notice-of-intent}/notice-of-intent-type/notice-of-intent-type.dto.ts (77%) rename services/apps/alcs/src/alcs/{code/application-code => notice-of-intent}/notice-of-intent-type/notice-of-intent-type.entity.ts (86%) create mode 100644 services/apps/alcs/src/alcs/notification/notification-type/notification-type.dto.ts create mode 100644 services/apps/alcs/src/alcs/notification/notification-type/notification-type.entity.ts create mode 100644 services/apps/alcs/src/alcs/notification/notification.controller.spec.ts create mode 100644 services/apps/alcs/src/alcs/notification/notification.controller.ts create mode 100644 services/apps/alcs/src/alcs/notification/notification.dto.ts create mode 100644 services/apps/alcs/src/alcs/notification/notification.entity.ts create mode 100644 services/apps/alcs/src/alcs/notification/notification.module.ts create mode 100644 services/apps/alcs/src/alcs/notification/notification.service.spec.ts create mode 100644 services/apps/alcs/src/alcs/notification/notification.service.ts create mode 100644 services/apps/alcs/src/common/automapper/notification-parcel.automapper.profile.ts create mode 100644 services/apps/alcs/src/common/automapper/notification-submission.automapper.profile.ts create mode 100644 services/apps/alcs/src/common/automapper/notification-transferee.automapper.profile.ts create mode 100644 services/apps/alcs/src/common/automapper/notification.automapper.profile.ts create mode 100644 services/apps/alcs/src/common/entities/parcel-ownership-type/parcel-ownership-type.entity.ts delete mode 100644 services/apps/alcs/src/portal/application-submission/application-parcel/application-parcel-ownership-type/application-parcel-ownership-type.entity.ts delete mode 100644 services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel-ownership-type/notice-of-intent-parcel-ownership-type.entity.ts create mode 100644 services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.controller.spec.ts create mode 100644 services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.controller.ts create mode 100644 services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.dto.ts create mode 100644 services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.entity.ts create mode 100644 services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.service.spec.ts create mode 100644 services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.service.ts create mode 100644 services/apps/alcs/src/portal/notification-submission/notification-submission.controller.spec.ts create mode 100644 services/apps/alcs/src/portal/notification-submission/notification-submission.controller.ts create mode 100644 services/apps/alcs/src/portal/notification-submission/notification-submission.dto.ts create mode 100644 services/apps/alcs/src/portal/notification-submission/notification-submission.entity.ts create mode 100644 services/apps/alcs/src/portal/notification-submission/notification-submission.module.ts create mode 100644 services/apps/alcs/src/portal/notification-submission/notification-submission.service.spec.ts create mode 100644 services/apps/alcs/src/portal/notification-submission/notification-submission.service.ts create mode 100644 services/apps/alcs/src/portal/notification-submission/notification-transferee/notification-transferee.controller.spec.ts create mode 100644 services/apps/alcs/src/portal/notification-submission/notification-transferee/notification-transferee.controller.ts create mode 100644 services/apps/alcs/src/portal/notification-submission/notification-transferee/notification-transferee.dto.ts create mode 100644 services/apps/alcs/src/portal/notification-submission/notification-transferee/notification-transferee.entity.ts create mode 100644 services/apps/alcs/src/portal/notification-submission/notification-transferee/notification-transferee.service.spec.ts create mode 100644 services/apps/alcs/src/portal/notification-submission/notification-transferee/notification-transferee.service.ts create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1693608113088-add_notifications.ts create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1693610085203-seed_notification_tables.ts diff --git a/portal-frontend/src/app/app-routing.module.ts b/portal-frontend/src/app/app-routing.module.ts index 51e9d2e4d3..0a531eb326 100644 --- a/portal-frontend/src/app/app-routing.module.ts +++ b/portal-frontend/src/app/app-routing.module.ts @@ -88,6 +88,22 @@ const routes: Routes = [ loadChildren: () => import('./features/notice-of-intents/edit-submission/edit-submission.module').then((m) => m.EditSubmissionModule), }, + { + title: 'View SRW', + path: 'notification/:fileId', + canActivate: [AuthGuard], + loadChildren: () => + import('./features/notifications/view-submission/view-notification-submission.module').then( + (m) => m.ViewNotificationSubmissionModule + ), + }, + { + title: 'Edit SRW', + path: 'notification/:fileId/edit', + canActivate: [AuthGuard], + loadChildren: () => + import('./features/notifications/edit-submission/edit-submission.module').then((m) => m.EditSubmissionModule), + }, { path: '', redirectTo: '/login', pathMatch: 'full' }, ]; diff --git a/portal-frontend/src/app/features/create-submission-dialog/create-submission-dialog.component.html b/portal-frontend/src/app/features/create-submission-dialog/create-submission-dialog.component.html index c263c8a6cf..6b82c5c50b 100644 --- a/portal-frontend/src/app/features/create-submission-dialog/create-submission-dialog.component.html +++ b/portal-frontend/src/app/features/create-submission-dialog/create-submission-dialog.component.html @@ -10,7 +10,11 @@

Select an option to learn more about the submission type.
- + + +
+ Submitting a notification of Statutory Right of Way (SRW) only applies to a SRW described in + s. 218 of the Land Title Act. +
+
+
+ Before you create a notification of SRW: +
+
+
    +
  1. + Permitted Uses: If you intend to use, construct works, or remove soil or place fill (including gravel) + within the SRW beyond what is permitted in the ALR Use Regulation, application or notice of intent to the + ALC is required. Creating a notification of SRW in no way constitutes such an approval. +
    2. +
  2. + ALC Decision Condition Compliance: This notification of SRW is not meant to submit or confirm ALC decision + condition compliance (e.g. subdivision plan), please refer back to the ALC decision letter for + instructions. +
    3. +
  3. + Submitting a Notification of SRW: Ensure that you are ready to submit your SRW package to the Land Title + Survey Authority and all necessary documents including the ‘Terms of SRW’ and survey plan (if any) have + been signed and finalized. You will not be able to submit this notification of SRW to the ALC without + attaching the finalized Terms of SRW. +
    4. +
+ The ALC's automatically generated notification response will need to be attached as a supporting document to + your Land Title Survey Authority SRW package. +

+ If you have any questions, please contact the ALC.
+ Email: ALC.Portal@gov.bc.ca
+ Phone: 236-468-3342 or 1-800-663-7867 +
+ Read {{ readMoreClicked ? 'Less' : 'More' }} +
+

@@ -125,6 +171,10 @@

create

+
+ + +
+
+ + + help_outline + +
+
+
+ + + + + +
+ + + +
+ + + +
+ + + +
+ + + +
+ + + +
+ + + +
+ + diff --git a/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.component.scss b/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.component.scss new file mode 100644 index 0000000000..8125565891 --- /dev/null +++ b/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.component.scss @@ -0,0 +1,346 @@ +@use '../../../../styles/functions' as *; +@use '../../../../styles/colors'; + +.header { + margin: rem(24) 0; + display: flex; + justify-content: space-between; + flex-flow: row wrap; + + h6 { + display: flex; + align-items: center; + justify-content: center; + } + + .header-btn-wrapper { + display: flex; + align-items: center; + flex-wrap: wrap; + margin-top: rem(16); + width: 100%; + + button { + width: 100%; + } + } + + .change-app-type-btn-wrapper { + display: flex; + align-items: center; + margin-top: rem(16); + margin-left: 0; + width: 100%; + + button { + width: 100%; + } + + .mat-icon { + margin-left: rem(8); + width: rem(22); + height: rem(22); + font-size: rem(22); + } + } + + @media screen and (min-width: $tabletBreakpoint) { + .header-btn-wrapper { + margin-top: 0; + width: unset; + + button { + width: auto; + } + + .change-app-type-btn-wrapper { + width: auto; + display: flex; + align-items: center; + margin-top: 0; + margin-left: rem(16); + + button { + width: auto; + } + + .mat-icon { + margin-left: rem(16); + font-size: rem(24); + } + } + } + } +} + +:host::ng-deep { + .step-description { + display: grid; + grid-template-columns: 1fr; + grid-row-gap: rem(24); + margin-bottom: rem(32); + } + + .step-documents { + border: rem(1) solid colors.$secondary-color; + border-radius: rem(4); + padding: rem(8); + + h6 { + color: colors.$secondary-color; + margin-top: unset !important; + } + } + + .mat-icon.mat-icon-inline { + line-height: initial; + } + + .mat-horizontal-content-container { + padding: 0; + min-height: 100%; + } + + .mat-horizontal-stepper-wrapper { + min-height: 100%; + } + + .subtext { + margin-bottom: rem(8) !important; + } + + .mat-step-header .mat-step-icon-selected { + color: #fff; + } + + .mat-step-header .mat-step-label.mat-step-label-active { + display: none; + } + + .mat-step-label { + display: none; + } + + .section { + margin: rem(24) 0; + } + + .date-picker { + ::ng-deep.mat-form-field-infix { + display: flex; + padding: rem(3) 0; + } + } + + .mat-button-wrapper { + white-space: break-spaces; + } + + .parcel-buttons-wrappers button { + margin-top: 1.2rem !important; + } + + @media screen and (min-width: $tabletBreakpoint) { + .mat-step-header .mat-step-label.mat-step-label-active { + display: inherit; + } + + .mat-step-label { + display: inherit; + } + } + + .review-step { + min-height: 100%; + } + + .mobile-hidden { + display: none !important; + + @media screen and (min-width: $tabletBreakpoint) { + display: initial !important; + } + } + + .tablet-hidden { + display: initial !important; + + @media screen and (min-width: $tabletBreakpoint) { + display: none !important; + } + } + + .mat-button-toggle-appearance-standard .mat-button-toggle-label-content { + line-height: rem(33); + } + + .mat-button-toggle-checked.mat-button-toggle-appearance-standard { + background-color: colors.$primary-color-light; + } + + .edit-application { + .description { + margin-top: rem(12); + margin-bottom: rem(20); + display: flex; + flex-direction: column; + + div { + display: flex; + align-items: center; + } + + .save-button { + margin-top: rem(16) !important; + width: 100%; + } + + @media screen and (min-width: $tabletBreakpoint) { + flex-direction: row; + justify-content: space-between; + + .save-button { + margin-left: rem(12) !important; + margin-top: unset !important; + width: unset; + } + } + } + + .button-container { + margin-top: rem(40); + margin-bottom: rem(24); + display: flex; + flex-direction: column-reverse; + justify-content: space-between; + + @media screen and (min-width: $tabletBreakpoint) { + flex-direction: row; + justify-content: space-between; + } + + div { + display: grid; + grid-template-columns: 1fr 1fr; + grid-column-gap: rem(8); + + @media screen and (min-width: $tabletBreakpoint) { + display: flex; + justify-content: space-between; + } + + button { + margin-bottom: rem(24) !important; + + @media screen and (min-width: $tabletBreakpoint) { + margin-left: rem(24) !important; + margin-bottom: 0 !important; + } + } + } + } + } + + // parcel entry details + .float-right { + float: right; + } + + .container { + margin: rem(20) 0 rem(20) 0; + } + + .parcel-checkbox { + margin: rem(20) 0 0 0; + } + + .type { + margin-bottom: rem(30); + } + + .pmbc-search { + border: 1px solid colors.$primary-color-dark; + border-radius: rem(4); + background-color: rgba(colors.$accent-color-light, 0.2); + padding: rem(16); + } + + .field-error { + color: colors.$error-color; + font-size: rem(15); + font-weight: 700; + display: flex; + align-items: center; + margin-top: rem(4); + } + + .form-row { + margin-top: rem(16); + display: grid; + grid-template-columns: 1fr; + grid-column-gap: rem(30); + + @media screen and (min-width: $desktopBreakpoint) { + & { + grid-template-columns: 1fr 1fr; + } + + .full-row { + grid-column: 1/3; + } + } + } + + .radio-row { + margin: rem(10) 0; + display: block; + + .mat-radio-button { + margin-right: rem(12); + } + } + + .full-width-input { + width: 100%; + } + + .mat-expansion-panel { + margin-bottom: rem(16); + } + + .mat-checkbox { + display: flex; + justify-content: center; + .mat-checkbox-layout { + white-space: break-spaces; + } + } + + .flex-center-wrap { + display: flex; + justify-content: center; + flex-wrap: wrap; + } + + .flex-evenly-wrap { + display: flex; + justify-content: space-evenly; + flex-wrap: wrap; + } + + .flex-space-between-wrap { + display: flex; + justify-content: space-between; + flex-wrap: wrap; + } + + .owner-table-wrapper { + display: block; + overflow: auto; + width: 100%; + } + + .display-block { + display: block; + } +} diff --git a/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.component.spec.ts b/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.component.spec.ts new file mode 100644 index 0000000000..cc48c1cd01 --- /dev/null +++ b/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.component.spec.ts @@ -0,0 +1,46 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { MatDialog } from '@angular/material/dialog'; +import { ActivatedRoute } from '@angular/router'; +import { NotificationSubmissionService } from '../../../services/notification-submission/notification-submission.service'; +import { ToastService } from '../../../services/toast/toast.service'; + +import { EditSubmissionComponent } from './edit-submission.component'; + +describe('EditSubmissionComponent', () => { + let component: EditSubmissionComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [EditSubmissionComponent], + providers: [ + { + provide: NotificationSubmissionService, + useValue: {}, + }, + { + provide: ToastService, + useValue: {}, + }, + { + provide: ActivatedRoute, + useValue: {}, + }, + { + provide: MatDialog, + useValue: {}, + }, + ], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(EditSubmissionComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.component.ts b/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.component.ts new file mode 100644 index 0000000000..42bf3c4530 --- /dev/null +++ b/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.component.ts @@ -0,0 +1,179 @@ +import { StepperSelectionEvent } from '@angular/cdk/stepper'; +import { AfterViewInit, Component, OnDestroy, ViewChild } from '@angular/core'; +import { MatDialog } from '@angular/material/dialog'; +import { ActivatedRoute, Router } from '@angular/router'; +import { BehaviorSubject, combineLatest, Observable, of, Subject, takeUntil } from 'rxjs'; +import { NoticeOfIntentDocumentDto } from '../../../services/notice-of-intent-document/notice-of-intent-document.dto'; +import { + NOI_SUBMISSION_STATUS, + NoticeOfIntentSubmissionDetailedDto, +} from '../../../services/notice-of-intent-submission/notice-of-intent-submission.dto'; +import { NotificationSubmissionDetailedDto } from '../../../services/notification-submission/notification-submission.dto'; +import { NotificationSubmissionService } from '../../../services/notification-submission/notification-submission.service'; +import { ToastService } from '../../../services/toast/toast.service'; +import { CustomStepperComponent } from '../../../shared/custom-stepper/custom-stepper.component'; +import { OverlaySpinnerService } from '../../../shared/overlay-spinner/overlay-spinner.service'; +import { scrollToElement } from '../../../shared/utils/scroll-helper'; + +export enum EditNotificationSteps { + Parcel = 0, + Transferees = 1, + PrimaryContact = 2, + Government = 3, + Proposal = 4, + Attachments = 5, + ReviewAndSubmit = 6, +} + +@Component({ + selector: 'app-edit-submission', + templateUrl: './edit-submission.component.html', + styleUrls: ['./edit-submission.component.scss'], +}) +export class EditSubmissionComponent implements OnDestroy, AfterViewInit { + fileId = ''; + + $destroy = new Subject(); + $notificationSubmission = new BehaviorSubject(undefined); + $notificationDocuments = new BehaviorSubject([]); + notificationSubmission: NotificationSubmissionDetailedDto | undefined; + + steps = EditNotificationSteps; + expandedParcelUuid?: string; + showValidationErrors = false; + + @ViewChild('cdkStepper') public customStepper!: CustomStepperComponent; + + constructor( + private notificationSubmissionService: NotificationSubmissionService, + private activatedRoute: ActivatedRoute, + private dialog: MatDialog, + private toastService: ToastService, + private overlayService: OverlaySpinnerService, + private router: Router + ) { + this.expandedParcelUuid = undefined; + + this.$notificationSubmission.pipe(takeUntil(this.$destroy)).subscribe((submission) => { + this.notificationSubmission = submission; + }); + } + + ngAfterViewInit(): void { + combineLatest([this.activatedRoute.queryParamMap, this.activatedRoute.paramMap]) + .pipe(takeUntil(this.$destroy)) + .subscribe(([queryParamMap, paramMap]) => { + const fileId = paramMap.get('fileId'); + if (fileId) { + this.loadSubmission(fileId).then(() => { + const stepInd = paramMap.get('stepInd'); + const parcelUuid = queryParamMap.get('parcelUuid'); + const showErrors = queryParamMap.get('errors'); + if (showErrors) { + this.showValidationErrors = showErrors === 't'; + } + + if (stepInd) { + // setTimeout is required for stepper to be initialized + setTimeout(() => { + this.customStepper.navigateToStep(parseInt(stepInd), true); + + if (parcelUuid) { + this.expandedParcelUuid = parcelUuid; + } + }); + } + }); + } + }); + } + + async onExit() { + await this.router.navigateByUrl(`/notification/${this.fileId}`); + } + + ngOnDestroy(): void { + this.$destroy.next(); + this.$destroy.complete(); + } + + // this gets fired whenever applicant navigates away from edit page + async canDeactivate(): Promise> { + await this.saveSubmission(this.customStepper.selectedIndex); + + return of(true); + } + + async onStepChange($event: StepperSelectionEvent) { + // scrolls to step if step selected programmatically + scrollToElement({ id: `stepWrapper_${$event.selectedIndex}`, center: false }); + } + + async switchStep(index: number) { + // navigation to url will cause step change based on the index (index starts from 0) + // The save will be triggered using canDeactivate guard + this.showValidationErrors = this.customStepper.selectedIndex === EditNotificationSteps.ReviewAndSubmit; + await this.router.navigateByUrl(`notification/${this.fileId}/edit/${index}`); + } + + async saveSubmission(step: number) { + switch (step) { + case EditNotificationSteps.Parcel: + case EditNotificationSteps.Transferees: + case EditNotificationSteps.PrimaryContact: + case EditNotificationSteps.Government: + case EditNotificationSteps.Proposal: + case EditNotificationSteps.Attachments: + case EditNotificationSteps.ReviewAndSubmit: + //DO NOTHING + break; + default: + this.toastService.showErrorToast('Error updating SRW.'); + } + } + + async onDownloadPdf(fileNumber: string | undefined) { + if (fileNumber) { + //TODO: Hook this up later + } + } + + onChangeSubmissionType() { + //TODO + } + + async onSubmit() { + //TODO + } + + private async submit() { + const submission = this.notificationSubmission; + if (submission) { + const didSubmit = await this.notificationSubmissionService.submitToAlcs(submission.uuid); + if (didSubmit) { + await this.router.navigateByUrl(`/notification/${submission?.fileNumber}`); + } + } + } + + private async loadSubmission(fileId: string, reload = false) { + if (!this.notificationSubmission || reload) { + this.overlayService.showSpinner(); + this.notificationSubmission = await this.notificationSubmissionService.getByFileId(fileId); + this.fileId = fileId; + + // if (this.notificationSubmission?.status.code !== NOI_SUBMISSION_STATUS.IN_PROGRESS) { + // this.toastService.showErrorToast('Unable to edit Notice of Intent'); + // await this.router.navigateByUrl(`/home`); + // } + + const documents: NoticeOfIntentDocumentDto[] = []; //TODO await this.noticeOfIntentDocumentService.getByFileId(fileId); + if (documents) { + this.$notificationDocuments.next(documents); + } + + this.$notificationSubmission.next(this.notificationSubmission); + this.overlayService.hideSpinner(); + } + } +} diff --git a/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.module.ts b/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.module.ts new file mode 100644 index 0000000000..ba969b4f33 --- /dev/null +++ b/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.module.ts @@ -0,0 +1,26 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { RouterModule, Routes } from '@angular/router'; +import { CanDeactivateGuard } from '../../../shared/guard/can-deactivate.guard'; +import { SharedModule } from '../../../shared/shared.module'; +import { EditSubmissionBaseModule } from './edit-submission-base.module'; +import { EditSubmissionComponent } from './edit-submission.component'; +import { StepComponent } from './step.partial'; + +const routes: Routes = [ + { + path: '', + component: EditSubmissionComponent, + }, + { + path: ':stepInd', + component: EditSubmissionComponent, + canDeactivate: [CanDeactivateGuard], + }, +]; + +@NgModule({ + declarations: [StepComponent], + imports: [CommonModule, SharedModule, RouterModule.forChild(routes), EditSubmissionBaseModule], +}) +export class EditSubmissionModule {} diff --git a/portal-frontend/src/app/features/notifications/edit-submission/files-step.partial.ts b/portal-frontend/src/app/features/notifications/edit-submission/files-step.partial.ts new file mode 100644 index 0000000000..5c5cdcf681 --- /dev/null +++ b/portal-frontend/src/app/features/notifications/edit-submission/files-step.partial.ts @@ -0,0 +1,75 @@ +import { Component, Input } from '@angular/core'; +import { MatDialog } from '@angular/material/dialog'; +import { BehaviorSubject } from 'rxjs'; +import { NoticeOfIntentDocumentDto } from '../../../services/notice-of-intent-document/notice-of-intent-document.dto'; +import { NoticeOfIntentDocumentService } from '../../../services/notice-of-intent-document/notice-of-intent-document.service'; +import { DOCUMENT_TYPE } from '../../../shared/dto/document.dto'; +import { FileHandle } from '../../../shared/file-drag-drop/drag-drop.directive'; +import { RemoveFileConfirmationDialogComponent } from '../../applications/alcs-edit-submission/remove-file-confirmation-dialog/remove-file-confirmation-dialog.component'; +import { StepComponent } from './step.partial'; + +@Component({ + selector: 'app-file-step', + template: '

', + styleUrls: [], +}) +export abstract class FilesStepComponent extends StepComponent { + @Input() $noiDocuments!: BehaviorSubject; + + DOCUMENT_TYPE = DOCUMENT_TYPE; + + protected fileId = ''; + + protected abstract save(): Promise; + + protected constructor( + protected noticeOfIntentDocumentService: NoticeOfIntentDocumentService, + protected dialog: MatDialog + ) { + super(); + } + + async attachFile(file: FileHandle, documentType: DOCUMENT_TYPE | null) { + if (this.fileId) { + await this.save(); + const mappedFiles = file.file; + await this.noticeOfIntentDocumentService.attachExternalFile(this.fileId, mappedFiles, documentType); + const documents = await this.noticeOfIntentDocumentService.getByFileId(this.fileId); + if (documents) { + this.$noiDocuments.next(documents); + } + } + } + + async onDeleteFile($event: NoticeOfIntentDocumentDto) { + if (this.draftMode) { + this.dialog + .open(RemoveFileConfirmationDialogComponent) + .beforeClosed() + .subscribe(async (didConfirm) => { + if (didConfirm) { + this.deleteFile($event); + } + }); + } else { + await this.deleteFile($event); + } + } + + private async deleteFile($event: NoticeOfIntentDocumentDto) { + await this.noticeOfIntentDocumentService.deleteExternalFile($event.uuid); + if (this.fileId) { + const documents = await this.noticeOfIntentDocumentService.getByFileId(this.fileId); + if (documents) { + this.$noiDocuments.next(documents); + } + } + } + + async openFile(uuid: string) { + const res = await this.noticeOfIntentDocumentService.openFile(uuid); + if (res) { + window.open(res.url, '_blank'); + } + } +} diff --git a/portal-frontend/src/app/features/notifications/edit-submission/step.partial.ts b/portal-frontend/src/app/features/notifications/edit-submission/step.partial.ts new file mode 100644 index 0000000000..c3d7d8a6ac --- /dev/null +++ b/portal-frontend/src/app/features/notifications/edit-submission/step.partial.ts @@ -0,0 +1,33 @@ +import { Component, EventEmitter, Input, OnDestroy, Output } from '@angular/core'; +import { BehaviorSubject, Subject } from 'rxjs'; +import { NotificationSubmissionDto } from '../../../services/notification-submission/notification-submission.dto'; + +@Component({ + selector: 'app-step', + template: '

', + styleUrls: [], +}) +export class StepComponent implements OnDestroy { + protected $destroy = new Subject(); + + @Input() $notificationSubmission!: BehaviorSubject; + + @Input() showErrors = false; + @Input() draftMode = false; + + @Output() navigateToStep = new EventEmitter(); + @Output() exit = new EventEmitter(); + + async onSaveExit() { + this.exit.emit(); + } + + onNavigateToStep(step: number) { + this.navigateToStep.emit(step); + } + + async ngOnDestroy() { + this.$destroy.next(); + this.$destroy.complete(); + } +} diff --git a/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.html b/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.html new file mode 100644 index 0000000000..421cdfab6d --- /dev/null +++ b/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.html @@ -0,0 +1,91 @@ + + + +
+
+ + +
+
+
+

Applicant Submission

+
+ + + +
+
+
TODO
+
+
+
+
+ +
+
+ +
+
+ + +
To Add Later
+ + +
+
+
+ +
diff --git a/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.scss b/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.scss new file mode 100644 index 0000000000..2b720dbcd3 --- /dev/null +++ b/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.scss @@ -0,0 +1,183 @@ +@use '../../../../styles/functions' as *; +@use '../../../../styles/colors'; + +.navigation { + ::ng-deep .mdc-tab__text-label { + font-weight: bold; + } +} + +.content { + margin: rem(24) 0; +} + +:host::ng-deep { + .header { + display: flex; + justify-content: space-between; + align-items: center; + margin-bottom: rem(24); + flex-direction: column; + + @media screen and (min-width: $tabletBreakpoint) { + flex-direction: row; + } + + h3 { + margin-top: rem(8) !important; + } + + .btns-wrapper { + display: flex; + flex-direction: column-reverse; + width: 100%; + + button { + margin-top: rem(16) !important; + } + + @media screen and (min-width: $tabletBreakpoint) { + display: inline-block; + width: unset; + + button { + margin-right: rem(16) !important; + margin-top: rem(8) !important; + } + + button:last-child { + margin-right: 0 !important; + } + } + } + } +} + +.absolute { + position: absolute; + left: 0; + right: 0; +} + +.banner { + background-color: colors.$secondary-color; + width: 100%; + color: #fff; + padding: rem(16) rem(24); + margin-bottom: rem(32); + + @media screen and (min-width: $tabletBreakpoint) { + padding: rem(12) rem(36) !important; + } + + // TODO: this is just a placeholder and will be addressed later + @media screen and (min-width: $desktopBreakpoint) { + padding: rem(18) rem(80) !important; + } + + .banner-status { + margin: rem(16) 0; + display: grid; + grid-template-columns: 1fr; + + div { + margin-top: rem(16); + } + + @media screen and (min-width: $tabletBreakpoint) { + grid-template-columns: 1fr 1fr; + margin-bottom: 0; + } + } +} + +.buttons { + display: flex; + flex-direction: column-reverse; + justify-content: center; + + button { + width: 100%; + margin-bottom: rem(16) !important; + } + + @media screen and (min-width: $tabletBreakpoint) { + flex-direction: row; + + div { + margin-right: rem(16); + } + + div:last-child { + margin-right: 0 !important; + } + } +} + +.action-bar { + position: fixed; + bottom: 0; + left: 0; + right: 0; + width: 100%; + background-color: colors.$primary-color-light; + display: flex; + justify-content: center; + align-items: center; + height: rem(56); + z-index: 2; + + button { + width: 100%; + height: 100%; + text-align: right !important; + display: flex; + justify-content: flex-end; + padding: rem(8) rem(24); + + @media screen and (min-width: $tabletBreakpoint) { + padding: rem(12) rem(36); + } + + @media screen and (min-width: $desktopBreakpoint) { + padding: rem(18) rem(80); + } + } + + div { + display: flex; + align-items: center; + justify-content: center; + + .mat-icon { + margin-left: rem(6); + } + } +} + +.page-selector { + width: 100%; + margin-bottom: rem(24); +} + +.change-step { + width: 100%; +} + +.no-comment { + color: colors.$grey-dark; + font-style: italic; +} + +.tractor { + width: 100%; + margin-bottom: rem(16); +} + +section { + margin-bottom: rem(24); +} + +.document { + margin-bottom: rem(8); +} diff --git a/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.spec.ts b/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.spec.ts new file mode 100644 index 0000000000..bbbfa7a822 --- /dev/null +++ b/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.spec.ts @@ -0,0 +1,46 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { ActivatedRoute } from '@angular/router'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { BehaviorSubject } from 'rxjs'; +import { NotificationSubmissionService } from '../../../services/notification-submission/notification-submission.service'; + +import { ViewNotificationSubmissionComponent } from './view-notification-submission.component'; + +describe('ViewNotificationSubmissionComponent', () => { + let component: ViewNotificationSubmissionComponent; + let fixture: ComponentFixture; + + let mockNotificationSubmissionService: DeepMocked; + let mockActivatedRoute: DeepMocked; + + beforeEach(async () => { + mockNotificationSubmissionService = createMock(); + mockActivatedRoute = createMock(); + + mockActivatedRoute.paramMap = new BehaviorSubject(new Map()); + + await TestBed.configureTestingModule({ + declarations: [ViewNotificationSubmissionComponent], + providers: [ + { + provide: NotificationSubmissionService, + useValue: mockNotificationSubmissionService, + }, + { + provide: ActivatedRoute, + useValue: mockActivatedRoute, + }, + ], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(ViewNotificationSubmissionComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.ts b/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.ts new file mode 100644 index 0000000000..3bafb2e64c --- /dev/null +++ b/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.ts @@ -0,0 +1,64 @@ +import { Component, OnDestroy, OnInit } from '@angular/core'; +import { ActivatedRoute, Router } from '@angular/router'; +import { BehaviorSubject, Subject, takeUntil } from 'rxjs'; +import { NoticeOfIntentSubmissionDetailedDto } from '../../../services/notice-of-intent-submission/notice-of-intent-submission.dto'; +import { NotificationSubmissionDto } from '../../../services/notification-submission/notification-submission.dto'; +import { NotificationSubmissionService } from '../../../services/notification-submission/notification-submission.service'; + +@Component({ + selector: 'app-view-notification-submission', + templateUrl: './view-notification-submission.component.html', + styleUrls: ['./view-notification-submission.component.scss'], +}) +export class ViewNotificationSubmissionComponent implements OnInit, OnDestroy { + $destroy = new Subject(); + $notificationSubmission = new BehaviorSubject(undefined); + submission: NotificationSubmissionDto | undefined; + + constructor( + private notificationSubmissionService: NotificationSubmissionService, + private route: ActivatedRoute, + private router: Router + ) {} + + ngOnInit(): void { + this.route.paramMap.pipe(takeUntil(this.$destroy)).subscribe((paramMap) => { + const fileId = paramMap.get('fileId'); + if (fileId) { + this.loadSubmission(fileId); + this.loadDocuments(fileId); + } + }); + } + + async loadSubmission(fileId: string) { + const notificationSubmission = await this.notificationSubmissionService.getByFileId(fileId); + this.submission = notificationSubmission; + this.$notificationSubmission.next(notificationSubmission); + } + + async loadDocuments(fileId: string) { + // const documents = await this.noiDocumentService.getByFileId(fileId); + // if (documents) { + // this.$noiDocuments.next(documents); + // } + } + + ngOnDestroy(): void { + this.$destroy.next(); + this.$destroy.complete(); + } + + async onNavigateHome() { + await this.router.navigateByUrl(`home`); + } + + async onCancel(uuid: string) { + await this.notificationSubmissionService.cancel(uuid); + await this.router.navigateByUrl(`home`); + } + + onDownloadSubmissionPdf(fileNumber: string) { + //TODO: When we add PDFs + } +} diff --git a/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.module.ts b/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.module.ts new file mode 100644 index 0000000000..700cda7875 --- /dev/null +++ b/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.module.ts @@ -0,0 +1,19 @@ +import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from '@angular/router'; +import { NgxMaskDirective, NgxMaskPipe } from 'ngx-mask'; +import { SharedModule } from '../../../shared/shared.module'; +import { ViewNotificationSubmissionComponent } from './view-notification-submission.component'; + +const routes: Routes = [ + { + path: '', + component: ViewNotificationSubmissionComponent, + }, +]; + +@NgModule({ + imports: [CommonModule, SharedModule, RouterModule.forChild(routes), NgxMaskDirective, NgxMaskPipe], + declarations: [ViewNotificationSubmissionComponent], +}) +export class ViewNotificationSubmissionModule {} diff --git a/portal-frontend/src/app/services/notification-parcel/notification-parcel.dto.ts b/portal-frontend/src/app/services/notification-parcel/notification-parcel.dto.ts new file mode 100644 index 0000000000..0e7ec19785 --- /dev/null +++ b/portal-frontend/src/app/services/notification-parcel/notification-parcel.dto.ts @@ -0,0 +1,22 @@ +import { BaseCodeDto } from '../../shared/dto/base.dto'; + +export interface NotificationParcelUpdateDto { + uuid: string; + pid?: string | null; + pin?: string | null; + civicAddress?: string | null; + legalDescription?: string | null; + mapAreaHectares?: string | null; + ownershipTypeCode?: string | null; + crownLandOwnerType?: string | null; + isConfirmedByApplicant: boolean; +} + +export interface NotificationParcelDto extends Omit { + ownershipType?: BaseCodeDto; +} + +export enum PARCEL_OWNERSHIP_TYPE { + FEE_SIMPLE = 'SMPL', + CROWN = 'CRWN', +} diff --git a/portal-frontend/src/app/services/notification-parcel/notification-parcel.service.spec.ts b/portal-frontend/src/app/services/notification-parcel/notification-parcel.service.spec.ts new file mode 100644 index 0000000000..b66c572ec1 --- /dev/null +++ b/portal-frontend/src/app/services/notification-parcel/notification-parcel.service.spec.ts @@ -0,0 +1,101 @@ +import { HttpClient } from '@angular/common/http'; +import { TestBed } from '@angular/core/testing'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { of, throwError } from 'rxjs'; +import { DocumentService } from '../document/document.service'; +import { ToastService } from '../toast/toast.service'; +import { NotificationParcelUpdateDto } from './notification-parcel.dto'; +import { NotificationParcelService } from './notification-parcel.service'; + +describe('NotificationParcelService', () => { + let service: NotificationParcelService; + let mockHttpClient: DeepMocked; + let mockDocumentService: DeepMocked; + let mockToastService: DeepMocked; + + const mockUuid = 'fake_uuid'; + + beforeEach(() => { + mockHttpClient = createMock(); + mockToastService = createMock(); + + TestBed.configureTestingModule({ + imports: [], + providers: [ + { + provide: ToastService, + useValue: mockToastService, + }, + { + provide: HttpClient, + useValue: mockHttpClient, + }, + { + provide: DocumentService, + useValue: mockDocumentService, + }, + ], + }); + service = TestBed.inject(NotificationParcelService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); + + it('should make a get request for loading parcels', async () => { + mockHttpClient.get.mockReturnValue(of({})); + + await service.fetchBySubmissionUuid(mockUuid); + + expect(mockHttpClient.get).toHaveBeenCalledTimes(1); + expect(mockHttpClient.get.mock.calls[0][0]).toContain('notification-parcel'); + }); + + it('should show an error toast if getting parcel fails', async () => { + mockHttpClient.get.mockReturnValue(throwError(() => ({}))); + + await service.fetchBySubmissionUuid(mockUuid); + + expect(mockHttpClient.get).toHaveBeenCalledTimes(1); + expect(mockToastService.showErrorToast).toHaveBeenCalledTimes(1); + }); + + it('should make a post request for create', async () => { + mockHttpClient.post.mockReturnValue(of({})); + + await service.create(mockUuid); + + expect(mockHttpClient.post).toHaveBeenCalledTimes(1); + expect(mockHttpClient.post.mock.calls[0][0]).toContain('notification-parcel'); + }); + + it('should show an error toast if creating a parcel fails', async () => { + mockHttpClient.post.mockReturnValue(throwError(() => ({}))); + + await service.create(mockUuid); + + expect(mockHttpClient.post).toHaveBeenCalledTimes(1); + expect(mockToastService.showErrorToast).toHaveBeenCalledTimes(1); + }); + + it('should make a put request for update', async () => { + mockHttpClient.put.mockReturnValue(of({})); + let mockUuid = 'fake'; + + await service.update([{ uuid: mockUuid }] as NotificationParcelUpdateDto[]); + + expect(mockHttpClient.put).toHaveBeenCalledTimes(1); + expect(mockToastService.showSuccessToast).toHaveBeenCalledTimes(1); + expect(mockHttpClient.put.mock.calls[0][0]).toContain('notification-parcel'); + }); + + it('should show an error toast if updating a parcel fails', async () => { + mockHttpClient.put.mockReturnValue(throwError(() => ({}))); + + await service.update([{}] as NotificationParcelUpdateDto[]); + + expect(mockHttpClient.put).toHaveBeenCalledTimes(1); + expect(mockToastService.showErrorToast).toHaveBeenCalledTimes(1); + }); +}); diff --git a/portal-frontend/src/app/services/notification-parcel/notification-parcel.service.ts b/portal-frontend/src/app/services/notification-parcel/notification-parcel.service.ts new file mode 100644 index 0000000000..8ad3bcd735 --- /dev/null +++ b/portal-frontend/src/app/services/notification-parcel/notification-parcel.service.ts @@ -0,0 +1,87 @@ +import { HttpClient } from '@angular/common/http'; +import { Injectable } from '@angular/core'; +import { firstValueFrom } from 'rxjs'; +import { environment } from '../../../environments/environment'; +import { OverlaySpinnerService } from '../../shared/overlay-spinner/overlay-spinner.service'; +import { DocumentService } from '../document/document.service'; +import { ToastService } from '../toast/toast.service'; +import { NotificationParcelDto, NotificationParcelUpdateDto } from './notification-parcel.dto'; + +@Injectable({ + providedIn: 'root', +}) +export class NotificationParcelService { + private serviceUrl = `${environment.apiUrl}/notification-parcel`; + + constructor( + private httpClient: HttpClient, + private toastService: ToastService, + private documentService: DocumentService, + private overlayService: OverlaySpinnerService + ) {} + + async fetchBySubmissionUuid(submissionUuid: string) { + try { + return await firstValueFrom( + this.httpClient.get(`${this.serviceUrl}/submission/${submissionUuid}`) + ); + } catch (e) { + console.error(e); + this.toastService.showErrorToast('Failed to load Parcel, please try again later'); + } + return undefined; + } + + async create(notificationSubmissionUuid: string, ownerUuid?: string) { + try { + return await firstValueFrom( + this.httpClient.post(`${this.serviceUrl}`, { + noticeOfIntentSubmissionUuid: notificationSubmissionUuid, + ownerUuid, + }) + ); + } catch (e) { + console.error(e); + this.toastService.showErrorToast('Failed to create Parcel, please try again later'); + return undefined; + } + } + + async update(updateDtos: NotificationParcelUpdateDto[]) { + try { + this.overlayService.showSpinner(); + const formattedDtos = updateDtos.map((e) => ({ + ...e, + mapAreaHectares: e.mapAreaHectares ? parseFloat(e.mapAreaHectares) : e.mapAreaHectares, + })); + + const result = await firstValueFrom( + this.httpClient.put(`${this.serviceUrl}`, formattedDtos) + ); + + this.toastService.showSuccessToast('Parcel saved'); + return result; + } catch (e) { + console.error(e); + this.toastService.showErrorToast('Failed to update Parcel, please try again later'); + } finally { + this.overlayService.hideSpinner(); + } + return undefined; + } + + async deleteMany(parcelUuids: string[]) { + try { + this.overlayService.showSpinner(); + const result = await firstValueFrom(this.httpClient.delete(`${this.serviceUrl}`, { body: parcelUuids })); + this.toastService.showSuccessToast('Parcel deleted'); + return result; + } catch (e) { + console.error(e); + this.toastService.showErrorToast('Failed to delete Parcel, please try again'); + } finally { + this.overlayService.hideSpinner(); + } + return undefined; + } +} diff --git a/portal-frontend/src/app/services/notification-submission/notification-submission.dto.ts b/portal-frontend/src/app/services/notification-submission/notification-submission.dto.ts new file mode 100644 index 0000000000..4cc056db23 --- /dev/null +++ b/portal-frontend/src/app/services/notification-submission/notification-submission.dto.ts @@ -0,0 +1,26 @@ +import { NotificationTransfereeDto } from '../notification-transferee/notification-transferee.dto'; + +export interface NotificationSubmissionDto { + fileNumber: string; + uuid: string; + createdAt: number; + updatedAt: number; + applicant: string; + localGovernmentUuid: string; + type: string; + typeCode: string; + lastStatusUpdate: number; + owners: NotificationTransfereeDto[]; + canEdit: boolean; + canView: boolean; +} + +export interface NotificationSubmissionDetailedDto extends NotificationSubmissionDto { + purpose: string | null; +} + +export interface NotificationSubmissionUpdateDto { + applicant?: string | null; + purpose?: string | null; + localGovernmentUuid?: string | null; +} diff --git a/portal-frontend/src/app/services/notification-submission/notification-submission.service.spec.ts b/portal-frontend/src/app/services/notification-submission/notification-submission.service.spec.ts new file mode 100644 index 0000000000..4f902eb57d --- /dev/null +++ b/portal-frontend/src/app/services/notification-submission/notification-submission.service.spec.ts @@ -0,0 +1,132 @@ +import { HttpClient } from '@angular/common/http'; +import { HttpClientTestingModule } from '@angular/common/http/testing'; +import { TestBed } from '@angular/core/testing'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { of, throwError } from 'rxjs'; +import { ToastService } from '../toast/toast.service'; + +import { NotificationSubmissionService } from './notification-submission.service'; + +describe('NotificationSubmissionService', () => { + let service: NotificationSubmissionService; + let mockToastService: DeepMocked; + let mockHttpClient: DeepMocked; + + beforeEach(() => { + mockToastService = createMock(); + mockHttpClient = createMock(); + + TestBed.configureTestingModule({ + imports: [HttpClientTestingModule], + providers: [ + { + provide: ToastService, + useValue: mockToastService, + }, + { + provide: HttpClient, + useValue: mockHttpClient, + }, + ], + }); + service = TestBed.inject(NotificationSubmissionService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); + + it('should make a get request for loading notifications', async () => { + mockHttpClient.get.mockReturnValue(of({})); + + await service.getNotifications(); + + expect(mockHttpClient.get).toHaveBeenCalledTimes(1); + expect(mockHttpClient.get.mock.calls[0][0]).toContain('notification'); + }); + + it('should show an error toast if getting notifications fails', async () => { + mockHttpClient.get.mockReturnValue(throwError(() => ({}))); + + await service.getNotifications(); + + expect(mockHttpClient.get).toHaveBeenCalledTimes(1); + expect(mockToastService.showErrorToast).toHaveBeenCalledTimes(1); + }); + + it('should make a get request for loading a single notification', async () => { + mockHttpClient.get.mockReturnValue(of({})); + let mockFileId = 'file-id'; + + await service.getByFileId(mockFileId); + + expect(mockHttpClient.get).toHaveBeenCalledTimes(1); + expect(mockHttpClient.get.mock.calls[0][0]).toContain('notification'); + expect(mockHttpClient.get.mock.calls[0][0]).toContain(mockFileId); + }); + + it('should show an error toast if getting a specific notification fails', async () => { + mockHttpClient.get.mockReturnValue(throwError(() => ({}))); + + await service.getByFileId('file-id'); + + expect(mockHttpClient.get).toHaveBeenCalledTimes(1); + expect(mockToastService.showErrorToast).toHaveBeenCalledTimes(1); + }); + + it('should make a post request for create', async () => { + mockHttpClient.post.mockReturnValue(of({})); + + await service.create(); + + expect(mockHttpClient.post).toHaveBeenCalledTimes(1); + expect(mockHttpClient.post.mock.calls[0][0]).toContain('notification'); + }); + + it('should show an error toast if creating an notification fails', async () => { + mockHttpClient.post.mockReturnValue(throwError(() => ({}))); + + await service.create(); + + expect(mockHttpClient.post).toHaveBeenCalledTimes(1); + expect(mockToastService.showErrorToast).toHaveBeenCalledTimes(1); + }); + + it('should make a put request for update', async () => { + mockHttpClient.put.mockReturnValue(of({})); + let mockFileId = 'fileId'; + + await service.updatePending('fileId', {}); + + expect(mockHttpClient.put).toHaveBeenCalledTimes(1); + expect(mockHttpClient.put.mock.calls[0][0]).toContain('notification'); + expect(mockHttpClient.put.mock.calls[0][0]).toContain(mockFileId); + }); + + it('should show an error toast if updating an notification fails', async () => { + mockHttpClient.put.mockReturnValue(throwError(() => ({}))); + + await service.updatePending('file-id', {}); + + expect(mockHttpClient.put).toHaveBeenCalledTimes(1); + expect(mockToastService.showErrorToast).toHaveBeenCalledTimes(1); + }); + + it('should make a post request for cancelling', async () => { + mockHttpClient.post.mockReturnValue(of({})); + + await service.cancel('fileId'); + + expect(mockHttpClient.post).toHaveBeenCalledTimes(1); + expect(mockHttpClient.post.mock.calls[0][0]).toContain('notification'); + }); + + it('should show an error toast if cancelling a file fails', async () => { + mockHttpClient.post.mockReturnValue(throwError(() => ({}))); + + await service.cancel('fileId'); + + expect(mockHttpClient.post).toHaveBeenCalledTimes(1); + expect(mockToastService.showErrorToast).toHaveBeenCalledTimes(1); + }); +}); diff --git a/portal-frontend/src/app/services/notification-submission/notification-submission.service.ts b/portal-frontend/src/app/services/notification-submission/notification-submission.service.ts new file mode 100644 index 0000000000..088aa3c689 --- /dev/null +++ b/portal-frontend/src/app/services/notification-submission/notification-submission.service.ts @@ -0,0 +1,117 @@ +import { HttpClient } from '@angular/common/http'; +import { Injectable } from '@angular/core'; +import { firstValueFrom } from 'rxjs'; +import { environment } from '../../../environments/environment'; +import { OverlaySpinnerService } from '../../shared/overlay-spinner/overlay-spinner.service'; +import { ToastService } from '../toast/toast.service'; +import { + NotificationSubmissionDetailedDto, + NotificationSubmissionDto, + NotificationSubmissionUpdateDto, +} from './notification-submission.dto'; + +@Injectable({ + providedIn: 'root', +}) +export class NotificationSubmissionService { + private serviceUrl = `${environment.apiUrl}/notification-submission`; + + constructor( + private httpClient: HttpClient, + private toastService: ToastService, + private overlayService: OverlaySpinnerService + ) {} + + async getNotifications() { + try { + return await firstValueFrom(this.httpClient.get(`${this.serviceUrl}`)); + } catch (e) { + console.error(e); + this.toastService.showErrorToast('Failed to load SRWs, please try again later'); + return []; + } + } + + async getByFileId(fileId: string) { + try { + return await firstValueFrom( + this.httpClient.get(`${this.serviceUrl}/notification/${fileId}`) + ); + } catch (e) { + console.error(e); + this.toastService.showErrorToast('Failed to load SRW, please try again later'); + return undefined; + } + } + + async getByUuid(uuid: string) { + try { + return await firstValueFrom(this.httpClient.get(`${this.serviceUrl}/${uuid}`)); + } catch (e) { + console.error(e); + this.toastService.showErrorToast('Failed to load SRW, please try again later'); + return undefined; + } + } + + async create() { + try { + this.overlayService.showSpinner(); + return await firstValueFrom(this.httpClient.post<{ fileId: string }>(`${this.serviceUrl}`, {})); + } catch (e) { + console.error(e); + this.toastService.showErrorToast('Failed to create SRW, please try again later'); + } finally { + this.overlayService.hideSpinner(); + } + return undefined; + } + + async updatePending(uuid: string, updateDto: NotificationSubmissionUpdateDto) { + try { + this.overlayService.showSpinner(); + const result = await firstValueFrom( + this.httpClient.put(`${this.serviceUrl}/${uuid}`, updateDto) + ); + this.toastService.showSuccessToast('SRW Saved'); + return result; + } catch (e) { + console.error(e); + this.toastService.showErrorToast('Failed to update SRW, please try again'); + } finally { + this.overlayService.hideSpinner(); + } + + return undefined; + } + + async cancel(uuid: string) { + try { + this.overlayService.showSpinner(); + return await firstValueFrom(this.httpClient.post<{ fileId: string }>(`${this.serviceUrl}/${uuid}/cancel`, {})); + } catch (e) { + console.error(e); + this.toastService.showErrorToast('Failed to cancel SRW, please try again later'); + } finally { + this.overlayService.hideSpinner(); + } + return undefined; + } + + async submitToAlcs(uuid: string) { + let res; + try { + this.overlayService.showSpinner(); + res = await firstValueFrom( + this.httpClient.post(`${this.serviceUrl}/alcs/submit/${uuid}`, {}) + ); + this.toastService.showSuccessToast('SRW Submitted'); + } catch (e) { + console.error(e); + this.toastService.showErrorToast('Failed to submit SRW, please try again'); + } finally { + this.overlayService.hideSpinner(); + } + return res; + } +} diff --git a/portal-frontend/src/app/services/notification-transferee/notification-transferee.dto.ts b/portal-frontend/src/app/services/notification-transferee/notification-transferee.dto.ts new file mode 100644 index 0000000000..2f796b2fe2 --- /dev/null +++ b/portal-frontend/src/app/services/notification-transferee/notification-transferee.dto.ts @@ -0,0 +1,50 @@ +import { BaseCodeDto } from '../../shared/dto/base.dto'; + +export enum OWNER_TYPE { + INDIVIDUAL = 'INDV', + ORGANIZATION = 'ORGZ', + AGENT = 'AGEN', + CROWN = 'CRWN', + GOVERNMENT = 'GOVR', +} + +export interface OwnerTypeDto extends BaseCodeDto { + code: OWNER_TYPE; +} + +export interface NotificationTransfereeDto { + uuid: string; + notificationSubmissionUuid: string; + displayName: string; + firstName: string | null; + lastName: string | null; + organizationName: string | null; + phoneNumber: string | null; + email: string | null; + type: OwnerTypeDto; +} + +export interface NotificationOwnerUpdateDto { + firstName?: string | null; + lastName?: string | null; + organizationName?: string | null; + phoneNumber: string; + email: string; + typeCode: string; + corporateSummaryUuid?: string | null; +} + +export interface NotificationOwnerCreateDto extends NotificationOwnerUpdateDto { + noticeOfIntentSubmissionUuid: string; +} + +export interface SetPrimaryContactDto { + firstName?: string; + lastName?: string; + organization?: string; + phoneNumber?: string; + email?: string; + type?: OWNER_TYPE; + ownerUuid?: string; + noticeOfIntentSubmissionUuid: string; +} diff --git a/portal-frontend/src/app/services/notification-transferee/notification-transferee.service.spec.ts b/portal-frontend/src/app/services/notification-transferee/notification-transferee.service.spec.ts new file mode 100644 index 0000000000..bb8b61c98d --- /dev/null +++ b/portal-frontend/src/app/services/notification-transferee/notification-transferee.service.spec.ts @@ -0,0 +1,189 @@ +import { HttpClient } from '@angular/common/http'; +import { TestBed } from '@angular/core/testing'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { of, throwError } from 'rxjs'; +import { DocumentService } from '../document/document.service'; +import { ToastService } from '../toast/toast.service'; + +import { NotificationTransfereeService } from './notification-transferee.service'; + +describe('NotificationTransfereeService', () => { + let service: NotificationTransfereeService; + let mockHttpClient: DeepMocked; + let mockToastService: DeepMocked; + let mockDocumentService: DeepMocked; + + let fileId = '123'; + + beforeEach(() => { + mockHttpClient = createMock(); + mockToastService = createMock(); + mockDocumentService = createMock(); + + TestBed.configureTestingModule({ + providers: [ + { + provide: HttpClient, + useValue: mockHttpClient, + }, + { + provide: ToastService, + useValue: mockToastService, + }, + { + provide: DocumentService, + useValue: mockDocumentService, + }, + ], + }); + service = TestBed.inject(NotificationTransfereeService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); + + it('should make a get request for loading owners', async () => { + mockHttpClient.get.mockReturnValue(of({})); + + await service.fetchBySubmissionId(fileId); + + expect(mockHttpClient.get).toHaveBeenCalledTimes(1); + expect(mockHttpClient.get.mock.calls[0][0]).toContain('notification-transferee'); + }); + + it('should show an error toast if getting owners fails', async () => { + mockHttpClient.get.mockReturnValue(throwError(() => ({}))); + + await service.fetchBySubmissionId(fileId); + + expect(mockHttpClient.get).toHaveBeenCalledTimes(1); + expect(mockToastService.showErrorToast).toHaveBeenCalledTimes(1); + }); + + it('should make a post request for create', async () => { + mockHttpClient.post.mockReturnValue(of({})); + + await service.create({ + noticeOfIntentSubmissionUuid: '', + email: '', + phoneNumber: '', + typeCode: '', + }); + + expect(mockHttpClient.post).toHaveBeenCalledTimes(1); + expect(mockHttpClient.post.mock.calls[0][0]).toContain('notification-transferee'); + }); + + it('should show an error toast if creating owner fails', async () => { + mockHttpClient.post.mockReturnValue(throwError(() => ({}))); + + await service.create({ + noticeOfIntentSubmissionUuid: '', + email: '', + phoneNumber: '', + typeCode: '', + }); + + expect(mockHttpClient.post).toHaveBeenCalledTimes(1); + expect(mockToastService.showErrorToast).toHaveBeenCalledTimes(1); + }); + + it('should make a patch request for update', async () => { + mockHttpClient.patch.mockReturnValue(of({})); + + await service.update('', { + email: '', + phoneNumber: '', + typeCode: '', + }); + + expect(mockHttpClient.patch).toHaveBeenCalledTimes(1); + expect(mockHttpClient.patch.mock.calls[0][0]).toContain('notification-transferee'); + }); + + it('should show an error toast if updating owner fails', async () => { + mockHttpClient.patch.mockReturnValue(throwError(() => ({}))); + + await service.update('', { + email: '', + phoneNumber: '', + typeCode: '', + }); + + expect(mockHttpClient.patch).toHaveBeenCalledTimes(1); + expect(mockToastService.showErrorToast).toHaveBeenCalledTimes(1); + }); + + it('should make a delete request for delete', async () => { + mockHttpClient.delete.mockReturnValue(of({})); + + await service.delete(''); + + expect(mockHttpClient.delete).toHaveBeenCalledTimes(1); + expect(mockHttpClient.delete.mock.calls[0][0]).toContain('notification-transferee'); + }); + + it('should show an error toast if delete owner fails', async () => { + mockHttpClient.delete.mockReturnValue(throwError(() => ({}))); + + await service.delete(''); + + expect(mockHttpClient.delete).toHaveBeenCalledTimes(1); + expect(mockToastService.showErrorToast).toHaveBeenCalledTimes(1); + }); + + it('should make a post request for removeFromParcel', async () => { + mockHttpClient.post.mockReturnValue(of({})); + + await service.removeFromParcel('', ''); + + expect(mockHttpClient.post).toHaveBeenCalledTimes(1); + expect(mockHttpClient.post.mock.calls[0][0]).toContain('notification-transferee'); + }); + + it('should show an error toast if removeFromParcel', async () => { + mockHttpClient.post.mockReturnValue(throwError(() => ({}))); + + await service.removeFromParcel('', ''); + + expect(mockHttpClient.post).toHaveBeenCalledTimes(1); + expect(mockToastService.showErrorToast).toHaveBeenCalledTimes(1); + }); + + it('should make a post request for linkToParcel', async () => { + mockHttpClient.post.mockReturnValue(of({})); + + await service.linkToParcel('', ''); + + expect(mockHttpClient.post).toHaveBeenCalledTimes(1); + expect(mockHttpClient.post.mock.calls[0][0]).toContain('notification-transferee'); + }); + + it('should show an error toast if linkToParcel', async () => { + mockHttpClient.post.mockReturnValue(throwError(() => ({}))); + + await service.linkToParcel('', ''); + + expect(mockHttpClient.post).toHaveBeenCalledTimes(1); + expect(mockToastService.showErrorToast).toHaveBeenCalledTimes(1); + }); + + it('should make a post request for setPrimaryContact', async () => { + mockHttpClient.post.mockReturnValue(of({})); + + await service.setPrimaryContact({ noticeOfIntentSubmissionUuid: '' }); + + expect(mockHttpClient.post).toHaveBeenCalledTimes(1); + expect(mockHttpClient.post.mock.calls[0][0]).toContain('notification-transferee'); + }); + + it('should show an error toast if setPrimaryContact', async () => { + mockHttpClient.post.mockReturnValue(throwError(() => ({}))); + + await service.setPrimaryContact({ noticeOfIntentSubmissionUuid: '' }); + + expect(mockHttpClient.post).toHaveBeenCalledTimes(1); + expect(mockToastService.showErrorToast).toHaveBeenCalledTimes(1); + }); +}); diff --git a/portal-frontend/src/app/services/notification-transferee/notification-transferee.service.ts b/portal-frontend/src/app/services/notification-transferee/notification-transferee.service.ts new file mode 100644 index 0000000000..f5ea226734 --- /dev/null +++ b/portal-frontend/src/app/services/notification-transferee/notification-transferee.service.ts @@ -0,0 +1,143 @@ +import { HttpClient } from '@angular/common/http'; +import { Injectable } from '@angular/core'; +import { firstValueFrom } from 'rxjs'; +import { environment } from '../../../environments/environment'; +import { DOCUMENT_SOURCE, DOCUMENT_TYPE } from '../../shared/dto/document.dto'; +import { DocumentService } from '../document/document.service'; +import { ToastService } from '../toast/toast.service'; +import { + NotificationOwnerCreateDto, + NotificationTransfereeDto, + NotificationOwnerUpdateDto, + SetPrimaryContactDto, +} from './notification-transferee.dto'; + +@Injectable({ + providedIn: 'root', +}) +export class NotificationTransfereeService { + private serviceUrl = `${environment.apiUrl}/notification-transferee`; + + constructor( + private httpClient: HttpClient, + private toastService: ToastService, + private documentService: DocumentService + ) {} + async fetchBySubmissionId(submissionUuid: string) { + try { + return await firstValueFrom( + this.httpClient.get(`${this.serviceUrl}/submission/${submissionUuid}`) + ); + } catch (e) { + console.error(e); + this.toastService.showErrorToast('Failed to load Owners, please try again later'); + } + return undefined; + } + + async create(dto: NotificationOwnerCreateDto) { + try { + const res = await firstValueFrom(this.httpClient.post(`${this.serviceUrl}`, dto)); + this.toastService.showSuccessToast('Owner created'); + return res; + } catch (e) { + console.error(e); + this.toastService.showErrorToast('Failed to create Owner, please try again later'); + return undefined; + } + } + + async update(uuid: string, updateDto: NotificationOwnerUpdateDto) { + try { + const res = await firstValueFrom( + this.httpClient.patch(`${this.serviceUrl}/${uuid}`, updateDto) + ); + this.toastService.showSuccessToast('Owner saved'); + return res; + } catch (e) { + console.error(e); + this.toastService.showErrorToast('Failed to update Owner, please try again later'); + return undefined; + } + } + + async setPrimaryContact(updateDto: SetPrimaryContactDto) { + try { + const res = await firstValueFrom( + this.httpClient.post(`${this.serviceUrl}/setPrimaryContact`, updateDto) + ); + this.toastService.showSuccessToast('Notice of Intent saved'); + return res; + } catch (e) { + console.error(e); + this.toastService.showErrorToast('Failed to update Notice of Intent, please try again later'); + return undefined; + } + } + + async delete(uuid: string) { + try { + const result = await firstValueFrom(this.httpClient.delete(`${this.serviceUrl}/${uuid}`)); + this.toastService.showSuccessToast('Owner deleted'); + return result; + } catch (e) { + console.error(e); + this.toastService.showErrorToast('Failed to delete Owner, please try again'); + } + return undefined; + } + + async removeFromParcel(ownerUuid: string, parcelUuid: string) { + try { + const result = await firstValueFrom( + this.httpClient.post(`${this.serviceUrl}/${ownerUuid}/unlink/${parcelUuid}`, {}) + ); + this.toastService.showSuccessToast('Owner removed from parcel'); + return result; + } catch (e) { + console.error(e); + this.toastService.showErrorToast('Failed to remove Owner, please try again'); + } + return undefined; + } + + async linkToParcel(ownerUuid: any, parcelUuid: string) { + try { + const result = await firstValueFrom( + this.httpClient.post(`${this.serviceUrl}/${ownerUuid}/link/${parcelUuid}`, {}) + ); + this.toastService.showSuccessToast('Owner linked to parcel'); + return result; + } catch (e) { + console.error(e); + this.toastService.showErrorToast('Failed to link Owner, please try again'); + } + return undefined; + } + + sortOwners(a: NotificationTransfereeDto, b: NotificationTransfereeDto) { + if (a.displayName < b.displayName) { + return -1; + } + if (a.displayName > b.displayName) { + return 1; + } + return 0; + } + + async uploadCorporateSummary(noticeOfIntentFileId: string, file: File) { + try { + return await this.documentService.uploadFile<{ uuid: string }>( + noticeOfIntentFileId, + file, + DOCUMENT_TYPE.CORPORATE_SUMMARY, + DOCUMENT_SOURCE.APPLICANT, + `${this.serviceUrl}/attachCorporateSummary` + ); + } catch (e) { + console.error(e); + this.toastService.showErrorToast('Failed to attach document to Owner, please try again'); + } + return undefined; + } +} diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-modification/notice-of-intent-modification.dto.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-modification/notice-of-intent-modification.dto.ts index 54cffee43d..6b420e72f2 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-modification/notice-of-intent-modification.dto.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-modification/notice-of-intent-modification.dto.ts @@ -8,7 +8,7 @@ import { IsString, } from 'class-validator'; import { BaseCodeDto } from '../../../common/dtos/base.dto'; -import { NoticeOfIntentTypeDto } from '../../code/application-code/notice-of-intent-type/notice-of-intent-type.dto'; +import { NoticeOfIntentTypeDto } from '../../notice-of-intent/notice-of-intent-type/notice-of-intent-type.dto'; import { LocalGovernmentDto } from '../../local-government/local-government.dto'; import { CardDto } from '../../card/card.dto'; import { ApplicationRegionDto } from '../../code/application-code/application-region/application-region.dto'; diff --git a/services/apps/alcs/src/alcs/code/application-code/notice-of-intent-type/notice-of-intent-type.dto.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-type/notice-of-intent-type.dto.ts similarity index 77% rename from services/apps/alcs/src/alcs/code/application-code/notice-of-intent-type/notice-of-intent-type.dto.ts rename to services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-type/notice-of-intent-type.dto.ts index 0f555620b9..ee97b9c460 100644 --- a/services/apps/alcs/src/alcs/code/application-code/notice-of-intent-type/notice-of-intent-type.dto.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-type/notice-of-intent-type.dto.ts @@ -1,5 +1,5 @@ import { AutoMap } from '@automapper/classes'; -import { BaseCodeDto } from '../../../../common/dtos/base.dto'; +import { BaseCodeDto } from '../../../common/dtos/base.dto'; export class NoticeOfIntentTypeDto extends BaseCodeDto { @AutoMap() diff --git a/services/apps/alcs/src/alcs/code/application-code/notice-of-intent-type/notice-of-intent-type.entity.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-type/notice-of-intent-type.entity.ts similarity index 86% rename from services/apps/alcs/src/alcs/code/application-code/notice-of-intent-type/notice-of-intent-type.entity.ts rename to services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-type/notice-of-intent-type.entity.ts index ca9959746a..13355ff1b2 100644 --- a/services/apps/alcs/src/alcs/code/application-code/notice-of-intent-type/notice-of-intent-type.entity.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-type/notice-of-intent-type.entity.ts @@ -1,6 +1,6 @@ import { AutoMap } from '@automapper/classes'; import { Column, Entity } from 'typeorm'; -import { BaseCodeEntity } from '../../../../common/entities/base.code.entity'; +import { BaseCodeEntity } from '../../../common/entities/base.code.entity'; @Entity() export class NoticeOfIntentType extends BaseCodeEntity { diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.dto.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.dto.ts index 9b3ee13dae..e9ec34fd2d 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.dto.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.dto.ts @@ -13,7 +13,7 @@ import { NoticeOfIntentOwnerDto } from '../../portal/notice-of-intent-submission import { NoticeOfIntentSubmissionDetailedDto } from '../../portal/notice-of-intent-submission/notice-of-intent-submission.dto'; import { CardDto } from '../card/card.dto'; import { ApplicationRegionDto } from '../code/application-code/application-region/application-region.dto'; -import { NoticeOfIntentTypeDto } from '../code/application-code/notice-of-intent-type/notice-of-intent-type.dto'; +import { NoticeOfIntentTypeDto } from './notice-of-intent-type/notice-of-intent-type.dto'; import { LocalGovernmentDto } from '../local-government/local-government.dto'; export class AlcsNoticeOfIntentSubmissionDto extends NoticeOfIntentSubmissionDetailedDto { diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.entity.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.entity.ts index d4001d18e1..384a1f08d1 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.entity.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.entity.ts @@ -15,7 +15,7 @@ import { Base } from '../../common/entities/base.entity'; import { ColumnNumericTransformer } from '../../utils/column-numeric-transform'; import { Card } from '../card/card.entity'; import { ApplicationRegion } from '../code/application-code/application-region/application-region.entity'; -import { NoticeOfIntentType } from '../code/application-code/notice-of-intent-type/notice-of-intent-type.entity'; +import { NoticeOfIntentType } from './notice-of-intent-type/notice-of-intent-type.entity'; import { LocalGovernment } from '../local-government/local-government.entity'; import { NoticeOfIntentDocument } from './notice-of-intent-document/notice-of-intent-document.entity'; import { NoticeOfIntentSubtype } from './notice-of-intent-subtype.entity'; diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.module.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.module.ts index 5c73a57a42..98ebf77cc2 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.module.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.module.ts @@ -9,7 +9,7 @@ import { NoticeOfIntentSubmission } from '../../portal/notice-of-intent-submissi import { NoticeOfIntentSubmissionModule } from '../../portal/notice-of-intent-submission/notice-of-intent-submission.module'; import { BoardModule } from '../board/board.module'; import { CardModule } from '../card/card.module'; -import { NoticeOfIntentType } from '../code/application-code/notice-of-intent-type/notice-of-intent-type.entity'; +import { NoticeOfIntentType } from './notice-of-intent-type/notice-of-intent-type.entity'; import { CodeModule } from '../code/code.module'; import { LocalGovernmentModule } from '../local-government/local-government.module'; import { NoticeOfIntentDocumentController } from './notice-of-intent-document/notice-of-intent-document.controller'; diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.spec.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.spec.ts index 13436a77b9..05edfe12dc 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.spec.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.spec.ts @@ -15,7 +15,7 @@ import { Board } from '../board/board.entity'; import { Card } from '../card/card.entity'; import { CardService } from '../card/card.service'; import { ApplicationRegion } from '../code/application-code/application-region/application-region.entity'; -import { NoticeOfIntentType } from '../code/application-code/notice-of-intent-type/notice-of-intent-type.entity'; +import { NoticeOfIntentType } from './notice-of-intent-type/notice-of-intent-type.entity'; import { CodeService } from '../code/code.service'; import { LocalGovernmentService } from '../local-government/local-government.service'; import { NOI_SUBMISSION_STATUS } from './notice-of-intent-submission-status/notice-of-intent-status.dto'; diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.ts index 81c0130b04..2a48a521ce 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.ts @@ -26,7 +26,7 @@ import { Board } from '../board/board.entity'; import { CARD_TYPE } from '../card/card-type/card-type.entity'; import { Card } from '../card/card.entity'; import { CardService } from '../card/card.service'; -import { NoticeOfIntentType } from '../code/application-code/notice-of-intent-type/notice-of-intent-type.entity'; +import { NoticeOfIntentType } from './notice-of-intent-type/notice-of-intent-type.entity'; import { CodeService } from '../code/code.service'; import { LocalGovernmentService } from '../local-government/local-government.service'; import { NOI_SUBMISSION_STATUS } from './notice-of-intent-submission-status/notice-of-intent-status.dto'; diff --git a/services/apps/alcs/src/alcs/notification/notification-type/notification-type.dto.ts b/services/apps/alcs/src/alcs/notification/notification-type/notification-type.dto.ts new file mode 100644 index 0000000000..cdb075dac1 --- /dev/null +++ b/services/apps/alcs/src/alcs/notification/notification-type/notification-type.dto.ts @@ -0,0 +1,13 @@ +import { AutoMap } from '@automapper/classes'; +import { BaseCodeDto } from '../../../common/dtos/base.dto'; + +export class NotificationTypeDto extends BaseCodeDto { + @AutoMap() + shortLabel: string; + + @AutoMap() + backgroundColor: string; + + @AutoMap() + textColor: string; +} diff --git a/services/apps/alcs/src/alcs/notification/notification-type/notification-type.entity.ts b/services/apps/alcs/src/alcs/notification/notification-type/notification-type.entity.ts new file mode 100644 index 0000000000..318e214a32 --- /dev/null +++ b/services/apps/alcs/src/alcs/notification/notification-type/notification-type.entity.ts @@ -0,0 +1,25 @@ +import { AutoMap } from '@automapper/classes'; +import { Column, Entity } from 'typeorm'; +import { BaseCodeEntity } from '../../../common/entities/base.code.entity'; + +@Entity() +export class NotificationType extends BaseCodeEntity { + constructor(data?: Partial) { + super(); + if (data) { + Object.assign(this, data); + } + } + + @AutoMap() + @Column() + shortLabel: string; + + @AutoMap() + @Column({ type: 'text', default: '' }) + htmlDescription: string; + + @AutoMap() + @Column({ type: 'text', default: '' }) + portalLabel: string; +} diff --git a/services/apps/alcs/src/alcs/notification/notification.controller.spec.ts b/services/apps/alcs/src/alcs/notification/notification.controller.spec.ts new file mode 100644 index 0000000000..cb749cb202 --- /dev/null +++ b/services/apps/alcs/src/alcs/notification/notification.controller.spec.ts @@ -0,0 +1,84 @@ +import { classes } from '@automapper/classes'; +import { AutomapperModule } from '@automapper/nestjs'; +import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; +import { Test, TestingModule } from '@nestjs/testing'; +import { ClsService } from 'nestjs-cls'; +import { mockKeyCloakProviders } from '../../../test/mocks/mockTypes'; +import { NotificationController } from './notification.controller'; +import { Notification } from './notification.entity'; +import { NotificationService } from './notification.service'; + +describe('NotificationController', () => { + let controller: NotificationController; + let mockService: DeepMocked; + + beforeEach(async () => { + mockService = createMock(); + + const module: TestingModule = await Test.createTestingModule({ + imports: [ + AutomapperModule.forRoot({ + strategyInitializer: classes(), + }), + ], + controllers: [NotificationController], + providers: [ + { + provide: NotificationService, + useValue: mockService, + }, + { + provide: ClsService, + useValue: {}, + }, + ...mockKeyCloakProviders, + ], + }).compile(); + + controller = module.get(NotificationController); + }); + + it('should be defined', () => { + expect(controller).toBeDefined(); + }); + + it('should call through to service for get', async () => { + mockService.getByFileNumber.mockResolvedValue(new Notification()); + mockService.mapToDtos.mockResolvedValue([]); + + await controller.get('fileNumber'); + + expect(mockService.getByFileNumber).toHaveBeenCalledTimes(1); + expect(mockService.mapToDtos).toHaveBeenCalledTimes(1); + }); + + it('should call through to service for search', async () => { + mockService.searchByFileNumber.mockResolvedValue([new Notification()]); + mockService.mapToDtos.mockResolvedValue([]); + + await controller.search('fileNumber'); + + expect(mockService.searchByFileNumber).toHaveBeenCalledTimes(1); + expect(mockService.mapToDtos).toHaveBeenCalledTimes(1); + }); + + it('should call through to service for update', async () => { + mockService.update.mockResolvedValue(new Notification()); + mockService.mapToDtos.mockResolvedValue([]); + + await controller.update({}, 'fileNumber'); + + expect(mockService.update).toHaveBeenCalledTimes(1); + expect(mockService.mapToDtos).toHaveBeenCalledTimes(1); + }); + + it('should call through to service for get card', async () => { + mockService.getByCardUuid.mockResolvedValue(new Notification()); + mockService.mapToDtos.mockResolvedValue([]); + + await controller.getByCard('uuid'); + + expect(mockService.getByCardUuid).toHaveBeenCalledTimes(1); + expect(mockService.mapToDtos).toHaveBeenCalledTimes(1); + }); +}); diff --git a/services/apps/alcs/src/alcs/notification/notification.controller.ts b/services/apps/alcs/src/alcs/notification/notification.controller.ts new file mode 100644 index 0000000000..67995f54cd --- /dev/null +++ b/services/apps/alcs/src/alcs/notification/notification.controller.ts @@ -0,0 +1,61 @@ +import { Mapper } from '@automapper/core'; +import { InjectMapper } from '@automapper/nestjs'; +import { Body, Controller, Get, Param, Post } from '@nestjs/common'; +import { + ROLES_ALLOWED_APPLICATIONS, + ROLES_ALLOWED_BOARDS, +} from '../../common/authorization/roles'; +import { UserRoles } from '../../common/authorization/roles.decorator'; +import { UpdateNotificationDto } from './notification.dto'; +import { NotificationService } from './notification.service'; + +@Controller('notification') +export class NotificationController { + constructor( + private notificationService: NotificationService, + @InjectMapper() private mapper: Mapper, + ) {} + + @Get('/:fileNumber') + @UserRoles(...ROLES_ALLOWED_BOARDS) + async get(@Param('fileNumber') fileNumber: string) { + const notification = await this.notificationService.getByFileNumber( + fileNumber, + ); + const mapped = await this.notificationService.mapToDtos([notification]); + return mapped[0]; + } + + @Get('/card/:uuid') + @UserRoles(...ROLES_ALLOWED_BOARDS) + async getByCard(@Param('uuid') cardUuid: string) { + const notification = await this.notificationService.getByCardUuid(cardUuid); + const mapped = await this.notificationService.mapToDtos([notification]); + return mapped[0]; + } + + @Post('/:fileNumber') + @UserRoles(...ROLES_ALLOWED_BOARDS) + async update( + @Body() updateDto: UpdateNotificationDto, + @Param('fileNumber') fileNumber: string, + ) { + const updatedNotification = await this.notificationService.update( + fileNumber, + updateDto, + ); + const mapped = await this.notificationService.mapToDtos([ + updatedNotification, + ]); + return mapped[0]; + } + + @Get('/search/:fileNumber') + @UserRoles(...ROLES_ALLOWED_APPLICATIONS) + async search(@Param('fileNumber') fileNumber: string) { + const noticeOfIntents = await this.notificationService.searchByFileNumber( + fileNumber, + ); + return this.notificationService.mapToDtos(noticeOfIntents); + } +} diff --git a/services/apps/alcs/src/alcs/notification/notification.dto.ts b/services/apps/alcs/src/alcs/notification/notification.dto.ts new file mode 100644 index 0000000000..c1f7cae2e3 --- /dev/null +++ b/services/apps/alcs/src/alcs/notification/notification.dto.ts @@ -0,0 +1,76 @@ +import { AutoMap } from '@automapper/classes'; +import { + IsNotEmpty, + IsNumber, + IsOptional, + IsString, + IsUUID, +} from 'class-validator'; +import { CardDto } from '../card/card.dto'; +import { ApplicationRegionDto } from '../code/application-code/application-region/application-region.dto'; +import { LocalGovernmentDto } from '../local-government/local-government.dto'; +import { NotificationTypeDto } from './notification-type/notification-type.dto'; + +export class NotificationDto { + @AutoMap() + uuid: string; + + @AutoMap() + fileNumber: string; + + @AutoMap() + applicant: string; + + @AutoMap() + card: CardDto; + + dateSubmittedToAlc?: number; + + @AutoMap() + localGovernment: LocalGovernmentDto; + + @AutoMap() + region: ApplicationRegionDto; + + @AutoMap(() => String) + summary?: string; + + @AutoMap(() => NotificationTypeDto) + type: NotificationTypeDto; + + @AutoMap(() => String) + staffObservations?: string; + + proposalEndDate?: number; +} + +export class UpdateNotificationDto { + @IsOptional() + @IsNumber() + dateSubmittedToAlc?: number; + + @IsOptional() + @IsUUID() + localGovernmentUuid?: string; + + @IsString() + @IsOptional() + summary?: string; + + @IsOptional() + @IsString() + staffObservations?: string; + + @IsOptional() + @IsNumber() + proposalEndDate?: number; +} + +export class CreateNotificationServiceDto { + fileNumber: string; + applicant: string; + typeCode: string; + dateSubmittedToAlc?: Date | null | undefined; + regionCode?: string; + localGovernmentUuid?: string; +} diff --git a/services/apps/alcs/src/alcs/notification/notification.entity.ts b/services/apps/alcs/src/alcs/notification/notification.entity.ts new file mode 100644 index 0000000000..c8ce3c0544 --- /dev/null +++ b/services/apps/alcs/src/alcs/notification/notification.entity.ts @@ -0,0 +1,82 @@ +import { AutoMap } from '@automapper/classes'; +import { Type } from 'class-transformer'; +import { + Column, + Entity, + Index, + JoinColumn, + ManyToOne, + OneToOne, +} from 'typeorm'; +import { Base } from '../../common/entities/base.entity'; +import { Card } from '../card/card.entity'; +import { ApplicationRegion } from '../code/application-code/application-region/application-region.entity'; +import { LocalGovernment } from '../local-government/local-government.entity'; +import { NotificationType } from './notification-type/notification-type.entity'; + +@Entity() +export class Notification extends Base { + constructor(data?: Partial) { + super(); + if (data) { + Object.assign(this, data); + } + } + + @Index() + @Column({ unique: true }) + fileNumber: string; + + @Column() + applicant: string; + + @Column({ type: 'uuid', nullable: true }) + cardUuid: string; + + @OneToOne(() => Card, { cascade: true }) + @JoinColumn() + @Type(() => Card) + card: Card | null; + + @ManyToOne(() => LocalGovernment, { nullable: true }) + localGovernment?: LocalGovernment; + + @Index() + @Column({ + type: 'uuid', + nullable: true, + }) + localGovernmentUuid?: string; + + @ManyToOne(() => ApplicationRegion, { nullable: true }) + region?: ApplicationRegion; + + @Column({ nullable: true }) + regionCode?: string; + + @AutoMap(() => String) + @Column({ type: 'text', nullable: true }) + summary: string | null; + + @Column({ + type: 'timestamptz', + nullable: true, + }) + dateSubmittedToAlc: Date | null; + + @AutoMap(() => String) + @Column({ + type: 'text', + comment: 'ALC Staff Observations and Comments', + nullable: true, + }) + staffObservations?: string | null; + + @ManyToOne(() => NotificationType, { + nullable: false, + }) + type: NotificationType; + + @Column() + typeCode: string; +} diff --git a/services/apps/alcs/src/alcs/notification/notification.module.ts b/services/apps/alcs/src/alcs/notification/notification.module.ts new file mode 100644 index 0000000000..4ed9401bc3 --- /dev/null +++ b/services/apps/alcs/src/alcs/notification/notification.module.ts @@ -0,0 +1,30 @@ +import { forwardRef, Module } from '@nestjs/common'; +import { TypeOrmModule } from '@nestjs/typeorm'; +import { NotificationProfile } from '../../common/automapper/notification.automapper.profile'; +import { DocumentCode } from '../../document/document-code.entity'; +import { DocumentModule } from '../../document/document.module'; +import { FileNumberModule } from '../../file-number/file-number.module'; +import { BoardModule } from '../board/board.module'; +import { CardModule } from '../card/card.module'; +import { CodeModule } from '../code/code.module'; +import { LocalGovernmentModule } from '../local-government/local-government.module'; +import { NotificationType } from './notification-type/notification-type.entity'; +import { NotificationController } from './notification.controller'; +import { NotificationService } from './notification.service'; +import { Notification } from './notification.entity'; + +@Module({ + imports: [ + TypeOrmModule.forFeature([Notification, NotificationType, DocumentCode]), + forwardRef(() => BoardModule), + CardModule, + FileNumberModule, + DocumentModule, + CodeModule, + LocalGovernmentModule, + ], + providers: [NotificationService, NotificationProfile], + controllers: [NotificationController], + exports: [NotificationService], +}) +export class NotificationModule {} diff --git a/services/apps/alcs/src/alcs/notification/notification.service.spec.ts b/services/apps/alcs/src/alcs/notification/notification.service.spec.ts new file mode 100644 index 0000000000..fce06155dc --- /dev/null +++ b/services/apps/alcs/src/alcs/notification/notification.service.spec.ts @@ -0,0 +1,265 @@ +import { classes } from '@automapper/classes'; +import { AutomapperModule } from '@automapper/nestjs'; +import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; +import { Test, TestingModule } from '@nestjs/testing'; +import { getRepositoryToken } from '@nestjs/typeorm'; +import { Repository } from 'typeorm'; +import { ServiceNotFoundException } from '../../../../../libs/common/src/exceptions/base.exception'; +import { NotificationProfile } from '../../common/automapper/notification.automapper.profile'; +import { FileNumberService } from '../../file-number/file-number.service'; +import { NotificationSubmissionService } from '../../portal/notification-submission/notification-submission.service'; +import { Board } from '../board/board.entity'; +import { Card } from '../card/card.entity'; +import { CardService } from '../card/card.service'; +import { ApplicationRegion } from '../code/application-code/application-region/application-region.entity'; +import { CodeService } from '../code/code.service'; +import { LocalGovernmentService } from '../local-government/local-government.service'; +import { NotificationType } from './notification-type/notification-type.entity'; +import { Notification } from './notification.entity'; +import { NotificationService } from './notification.service'; + +describe('NotificationService', () => { + let service: NotificationService; + let mockCardService: DeepMocked; + let mockRepository: DeepMocked>; + let mockTypeRepository: DeepMocked>; + let mockFileNumberService: DeepMocked; + let mockLocalGovernmentService: DeepMocked; + let mockCodeService: DeepMocked; + let mockNotificationSubmissionService: DeepMocked; + + beforeEach(async () => { + mockCardService = createMock(); + mockRepository = createMock(); + mockFileNumberService = createMock(); + mockTypeRepository = createMock(); + mockLocalGovernmentService = createMock(); + mockCodeService = createMock(); + mockNotificationSubmissionService = createMock(); + + const module: TestingModule = await Test.createTestingModule({ + imports: [ + AutomapperModule.forRoot({ + strategyInitializer: classes(), + }), + ], + providers: [ + NotificationService, + NotificationProfile, + { + provide: getRepositoryToken(Notification), + useValue: mockRepository, + }, + { + provide: getRepositoryToken(NotificationType), + useValue: mockTypeRepository, + }, + { + provide: CardService, + useValue: mockCardService, + }, + { + provide: FileNumberService, + useValue: mockFileNumberService, + }, + { + provide: LocalGovernmentService, + useValue: mockLocalGovernmentService, + }, + { + provide: CodeService, + useValue: mockCodeService, + }, + { + provide: NotificationSubmissionService, + useValue: mockNotificationSubmissionService, + }, + ], + }).compile(); + + service = module.get(NotificationService); + }); + + it('should be defined', () => { + expect(service).toBeDefined(); + }); + + it('should load the type code and call the repo to save when creating', async () => { + const mockCard = {} as Card; + const fakeBoard = {} as Board; + + mockRepository.findOne.mockResolvedValue(new Notification()); + mockRepository.save.mockResolvedValue(new Notification()); + mockCardService.create.mockResolvedValue(mockCard); + mockFileNumberService.checkValidFileNumber.mockResolvedValue(true); + mockCodeService.fetchRegion.mockResolvedValue(new ApplicationRegion()); + mockTypeRepository.findOneOrFail.mockResolvedValue(new NotificationType()); + + const res = await service.create( + { + applicant: 'fake-applicant', + fileNumber: '1512311', + localGovernmentUuid: 'fake-uuid', + regionCode: 'region-code', + typeCode: '', + dateSubmittedToAlc: new Date(0), + }, + fakeBoard, + ); + + expect(mockFileNumberService.checkValidFileNumber).toHaveBeenCalledTimes(1); + expect(mockRepository.findOne).toHaveBeenCalledTimes(1); + expect(mockCardService.create).toHaveBeenCalledTimes(1); + expect(mockRepository.save).toHaveBeenCalledTimes(1); + expect(mockRepository.save.mock.calls[0][0].card).toBe(mockCard); + expect(mockTypeRepository.findOneOrFail).toHaveBeenCalledTimes(1); + }); + + it('should call through to the repo for get by card', async () => { + mockRepository.findOne.mockResolvedValue(new Notification()); + const cardUuid = 'fake-card-uuid'; + await service.getByCardUuid(cardUuid); + + expect(mockRepository.findOne).toHaveBeenCalledTimes(1); + }); + + it('should throw an exception when getting by card fails', async () => { + mockRepository.findOne.mockResolvedValue(null); + const cardUuid = 'fake-card-uuid'; + const promise = service.getByCardUuid(cardUuid); + + await expect(promise).rejects.toMatchObject( + new Error(`Failed to find notice of intent with card uuid ${cardUuid}`), + ); + + expect(mockRepository.findOne).toHaveBeenCalledTimes(1); + }); + + it('should call through to the repo for get cards', async () => { + mockRepository.find.mockResolvedValue([]); + await service.getByBoard('fake'); + + expect(mockRepository.find).toHaveBeenCalledTimes(1); + }); + + it('should call through to the repo for getBy', async () => { + const mockFilter = { + uuid: '5', + }; + mockRepository.find.mockResolvedValue([]); + await service.getBy(mockFilter); + + expect(mockRepository.find).toHaveBeenCalledTimes(1); + expect(mockRepository.find.mock.calls[0][0]!.where).toEqual(mockFilter); + }); + + it('should call throw an exception when getOrFailByUuid fails', async () => { + mockRepository.findOne.mockResolvedValue(null); + const promise = service.getOrFailByUuid('uuid'); + + await expect(promise).rejects.toMatchObject( + new ServiceNotFoundException( + `Failed to find notice of intent with uuid uuid`, + ), + ); + + expect(mockRepository.findOne).toHaveBeenCalledTimes(1); + }); + + it('should call through to the repo for getByFileNumber', async () => { + mockRepository.findOneOrFail.mockResolvedValue(new Notification()); + await service.getByFileNumber('file'); + + expect(mockRepository.findOneOrFail).toHaveBeenCalledTimes(1); + }); + + it('should call through to the repo for searchByFileNumber', async () => { + mockRepository.find.mockResolvedValue([new Notification()]); + const res = await service.searchByFileNumber('file'); + + expect(mockRepository.find).toHaveBeenCalledTimes(1); + expect(res.length).toEqual(1); + }); + + it('should call through to the repo for getFileNumber', async () => { + mockRepository.findOneOrFail.mockResolvedValue( + new Notification({ + fileNumber: 'fileNumber', + }), + ); + const res = await service.getFileNumber('file'); + + expect(mockRepository.findOneOrFail).toHaveBeenCalledTimes(1); + expect(res).toEqual('fileNumber'); + }); + + it('should call through to the repo for getUuid', async () => { + mockRepository.findOneOrFail.mockResolvedValue( + new Notification({ + uuid: 'uuid', + }), + ); + const res = await service.getUuid('file'); + + expect(mockRepository.findOneOrFail).toHaveBeenCalledTimes(1); + expect(res).toEqual('uuid'); + }); + + it('should set values and call save for update', async () => { + const notice = new Notification({ + summary: 'old-summary', + }); + mockRepository.findOneOrFail.mockResolvedValue(notice); + mockRepository.save.mockResolvedValue(new Notification()); + const res = await service.update('file', { + summary: 'new-summary', + }); + + expect(res).toBeDefined(); + expect(mockRepository.findOneOrFail).toHaveBeenCalledTimes(2); + expect(mockRepository.save).toHaveBeenCalledTimes(1); + expect(notice.summary).toEqual('new-summary'); + }); + + it('should load deleted cards', async () => { + mockRepository.find.mockResolvedValue([]); + + await service.getDeletedCards('file-number'); + + expect(mockRepository.find).toHaveBeenCalledTimes(1); + expect(mockRepository.find.mock.calls[0][0]!.withDeleted).toEqual(true); + }); + + it('should call the repo for get update applicant', async () => { + mockRepository.update.mockResolvedValue({} as any); + + await service.updateApplicant('file-number', 'applicant'); + + expect(mockRepository.update).toHaveBeenCalledTimes(1); + }); + + it('should create a card and save it for submit', async () => { + const mockNoi = new Notification(); + mockRepository.findOne.mockResolvedValue(mockNoi); + mockRepository.findOneOrFail.mockResolvedValue(mockNoi); + mockCodeService.fetchRegion.mockResolvedValue(new ApplicationRegion()); + mockRepository.save.mockResolvedValue({} as any); + + await service.submit({ + applicant: 'Bruce Wayne', + typeCode: 'CAT', + fileNumber: 'fileNumber', + localGovernmentUuid: 'governmentUuid', + regionCode: 'REGION', + }); + + expect(mockNoi.fileNumber).toEqual('fileNumber'); + expect(mockNoi.region).toBeDefined(); + expect(mockNoi.card).toBeDefined(); + expect(mockCodeService.fetchRegion).toHaveBeenCalledTimes(1); + expect(mockRepository.findOne).toHaveBeenCalledTimes(1); + 0; + expect(mockRepository.findOneOrFail).toHaveBeenCalledTimes(1); + expect(mockRepository.save).toHaveBeenCalledTimes(1); + }); +}); diff --git a/services/apps/alcs/src/alcs/notification/notification.service.ts b/services/apps/alcs/src/alcs/notification/notification.service.ts new file mode 100644 index 0000000000..018aaed3a2 --- /dev/null +++ b/services/apps/alcs/src/alcs/notification/notification.service.ts @@ -0,0 +1,321 @@ +import { + ServiceNotFoundException, + ServiceValidationException, +} from '@app/common/exceptions/base.exception'; +import { Mapper } from '@automapper/core'; +import { InjectMapper } from '@automapper/nestjs'; +import { Injectable, Logger } from '@nestjs/common'; +import { InjectRepository } from '@nestjs/typeorm'; +import { + FindOptionsRelations, + FindOptionsWhere, + IsNull, + Like, + Not, + Repository, +} from 'typeorm'; +import { FileNumberService } from '../../file-number/file-number.service'; +import { filterUndefined } from '../../utils/undefined'; +import { ApplicationTimeData } from '../application/application-time-tracking.service'; +import { Board } from '../board/board.entity'; +import { CARD_TYPE } from '../card/card-type/card-type.entity'; +import { Card } from '../card/card.entity'; +import { CardService } from '../card/card.service'; +import { CodeService } from '../code/code.service'; +import { LocalGovernmentService } from '../local-government/local-government.service'; +import { NotificationType } from './notification-type/notification-type.entity'; +import { + CreateNotificationServiceDto, + NotificationDto, + UpdateNotificationDto, +} from './notification.dto'; +import { Notification } from './notification.entity'; + +@Injectable() +export class NotificationService { + private logger = new Logger(NotificationService.name); + + private CARD_RELATIONS = { + board: true, + type: true, + status: true, + assignee: true, + }; + + private DEFAULT_RELATIONS: FindOptionsRelations = { + card: this.CARD_RELATIONS, + localGovernment: true, + region: true, + type: true, + }; + + constructor( + private cardService: CardService, + @InjectRepository(Notification) + private repository: Repository, + @InjectRepository(NotificationType) + private typeRepository: Repository, + @InjectMapper() private mapper: Mapper, + private fileNumberService: FileNumberService, + private codeService: CodeService, + private localGovernmentService: LocalGovernmentService, + ) {} + + async create( + createDto: CreateNotificationServiceDto, + board?: Board, + persist = true, + ) { + await this.fileNumberService.checkValidFileNumber(createDto.fileNumber); + + const type = await this.typeRepository.findOneOrFail({ + where: { + code: createDto.typeCode, + }, + }); + + const notification = new Notification({ + localGovernmentUuid: createDto.localGovernmentUuid, + fileNumber: createDto.fileNumber, + regionCode: createDto.regionCode, + applicant: createDto.applicant, + dateSubmittedToAlc: createDto.dateSubmittedToAlc, + type, + }); + + if (board) { + notification.card = await this.cardService.create( + CARD_TYPE.NOI, + board, + false, + ); + } + + if (persist) { + const savedNotification = await this.repository.save(notification); + + return this.getOrFailByUuid(savedNotification.uuid); + } + return notification; + } + + async getOrFailByUuid(uuid: string) { + const notification = await this.get(uuid); + if (!notification) { + throw new ServiceNotFoundException( + `Failed to find notice of intent with uuid ${uuid}`, + ); + } + + return notification; + } + + async mapToDtos(notifications: Notification[]) { + return this.mapper.mapArray(notifications, Notification, NotificationDto); + } + + async getByCardUuid(cardUuid: string) { + const notification = await this.repository.findOne({ + where: { cardUuid }, + relations: this.DEFAULT_RELATIONS, + }); + + if (!notification) { + throw new ServiceNotFoundException( + `Failed to find notice of intent with card uuid ${cardUuid}`, + ); + } + + return notification; + } + + getBy(findOptions: FindOptionsWhere) { + return this.repository.find({ + where: findOptions, + relations: this.DEFAULT_RELATIONS, + }); + } + + getDeletedCards(fileNumber: string) { + return this.repository.find({ + where: { + fileNumber, + card: { + auditDeletedDateAt: Not(IsNull()), + }, + }, + withDeleted: true, + relations: this.DEFAULT_RELATIONS, + }); + } + + private get(uuid: string) { + return this.repository.findOne({ + where: { + uuid, + }, + relations: { + ...this.DEFAULT_RELATIONS, + card: { ...this.CARD_RELATIONS, board: false }, + }, + }); + } + + async getByBoard(boardUuid: string) { + return this.repository.find({ + where: { card: { boardUuid } }, + relations: this.DEFAULT_RELATIONS, + }); + } + + async getWithIncompleteSubtaskByType(subtaskType: string) { + return this.repository.find({ + where: { + card: { + subtasks: { + completedAt: IsNull(), + type: { + code: subtaskType, + }, + }, + }, + }, + relations: { + card: { + status: true, + board: true, + type: true, + subtasks: { type: true, assignee: true }, + }, + }, + }); + } + + async getByFileNumber(fileNumber: string) { + return this.repository.findOneOrFail({ + where: { fileNumber }, + relations: this.DEFAULT_RELATIONS, + }); + } + + async update(fileNumber: string, updateDto: UpdateNotificationDto) { + const notification = await this.getByFileNumber(fileNumber); + + notification.summary = filterUndefined( + updateDto.summary, + notification.summary, + ); + if (updateDto.localGovernmentUuid) { + notification.localGovernmentUuid = updateDto.localGovernmentUuid; + } + + notification.staffObservations = filterUndefined( + updateDto.staffObservations, + notification.staffObservations, + ); + + await this.repository.save(notification); + + return this.getByFileNumber(notification.fileNumber); + } + + async listTypes() { + return this.typeRepository.find(); + } + + async updateByUuid(uuid: string, updates: Partial) { + await this.repository.update(uuid, updates); + } + + async searchByFileNumber(fileNumber: string) { + return this.repository.find({ + where: { + fileNumber: Like(`${fileNumber}%`), + }, + order: { + fileNumber: 'ASC', + }, + relations: { + region: true, + localGovernment: true, + }, + }); + } + + async getFileNumber(uuid: string) { + const notification = await this.repository.findOneOrFail({ + where: { + uuid, + }, + select: { + fileNumber: true, + }, + }); + return notification.fileNumber; + } + + async getUuid(fileNumber: string) { + const notification = await this.repository.findOneOrFail({ + where: { + fileNumber, + }, + select: { + uuid: true, + }, + }); + return notification.uuid; + } + + async submit(createDto: CreateNotificationServiceDto) { + const existingNotification = await this.repository.findOne({ + where: { fileNumber: createDto.fileNumber }, + }); + + if (!existingNotification) { + throw new ServiceValidationException( + `Notification with file number does not exist ${createDto.fileNumber}`, + ); + } + + if (!createDto.localGovernmentUuid) { + throw new ServiceValidationException( + `Local government is not set for notification ${createDto.fileNumber}`, + ); + } + + let region = createDto.regionCode + ? await this.codeService.fetchRegion(createDto.regionCode) + : undefined; + + if (!region) { + const localGov = await this.localGovernmentService.getByUuid( + createDto.localGovernmentUuid, + ); + region = localGov?.preferredRegion; + } + + existingNotification.fileNumber = createDto.fileNumber; + existingNotification.applicant = createDto.applicant; + existingNotification.dateSubmittedToAlc = + createDto.dateSubmittedToAlc || null; + existingNotification.localGovernmentUuid = createDto.localGovernmentUuid; + existingNotification.typeCode = createDto.typeCode; + existingNotification.region = region; + existingNotification.card = new Card(); + existingNotification.card.typeCode = CARD_TYPE.NOI; + + await this.repository.save(existingNotification); + return this.getByFileNumber(createDto.fileNumber); + } + + async updateApplicant(fileNumber: string, applicant: string) { + await this.repository.update( + { + fileNumber, + }, + { + applicant, + }, + ); + } +} diff --git a/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-search-view.entity.ts b/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-search-view.entity.ts index 8c1c397a93..6dfb3d0fec 100644 --- a/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-search-view.entity.ts +++ b/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-search-view.entity.ts @@ -7,7 +7,7 @@ import { ViewEntity, } from 'typeorm'; import { NoticeOfIntentSubmission } from '../../../portal/notice-of-intent-submission/notice-of-intent-submission.entity'; -import { NoticeOfIntentType } from '../../code/application-code/notice-of-intent-type/notice-of-intent-type.entity'; +import { NoticeOfIntentType } from '../../notice-of-intent/notice-of-intent-type/notice-of-intent-type.entity'; import { LocalGovernment } from '../../local-government/local-government.entity'; import { NoticeOfIntent } from '../../notice-of-intent/notice-of-intent.entity'; diff --git a/services/apps/alcs/src/common/automapper/application-parcel.automapper.profile.ts b/services/apps/alcs/src/common/automapper/application-parcel.automapper.profile.ts index 1b44f6e07a..e013581ec1 100644 --- a/services/apps/alcs/src/common/automapper/application-parcel.automapper.profile.ts +++ b/services/apps/alcs/src/common/automapper/application-parcel.automapper.profile.ts @@ -5,12 +5,12 @@ import { ApplicationDocumentDto } from '../../alcs/application/application-docum import { ApplicationDocument } from '../../alcs/application/application-document/application-document.entity'; import { ApplicationOwnerDto } from '../../portal/application-submission/application-owner/application-owner.dto'; import { ApplicationOwner } from '../../portal/application-submission/application-owner/application-owner.entity'; -import { ApplicationParcelOwnershipType } from '../../portal/application-submission/application-parcel/application-parcel-ownership-type/application-parcel-ownership-type.entity'; -import { - ApplicationParcelDto, - ApplicationParcelOwnershipTypeDto, -} from '../../portal/application-submission/application-parcel/application-parcel.dto'; +import { ApplicationParcelDto } from '../../portal/application-submission/application-parcel/application-parcel.dto'; import { ApplicationParcel } from '../../portal/application-submission/application-parcel/application-parcel.entity'; +import { + ParcelOwnershipType, + ParcelOwnershipTypeDto, +} from '../entities/parcel-ownership-type/parcel-ownership-type.entity'; @Injectable() export class ApplicationParcelProfile extends AutomapperProfile { @@ -65,8 +65,8 @@ export class ApplicationParcelProfile extends AutomapperProfile { if (pd.ownershipType) { return this.mapper.map( pd.ownershipType, - ApplicationParcelOwnershipType, - ApplicationParcelOwnershipTypeDto, + ParcelOwnershipType, + ParcelOwnershipTypeDto, ); } else { return undefined; @@ -75,11 +75,7 @@ export class ApplicationParcelProfile extends AutomapperProfile { ), ); - createMap( - mapper, - ApplicationParcelOwnershipType, - ApplicationParcelOwnershipTypeDto, - ); + createMap(mapper, ParcelOwnershipType, ParcelOwnershipTypeDto); }; } } diff --git a/services/apps/alcs/src/common/automapper/notice-of-intent-parcel.automapper.profile.ts b/services/apps/alcs/src/common/automapper/notice-of-intent-parcel.automapper.profile.ts index eb57ac85aa..9ae88c39bc 100644 --- a/services/apps/alcs/src/common/automapper/notice-of-intent-parcel.automapper.profile.ts +++ b/services/apps/alcs/src/common/automapper/notice-of-intent-parcel.automapper.profile.ts @@ -5,12 +5,12 @@ import { NoticeOfIntentDocumentDto } from '../../alcs/notice-of-intent/notice-of import { NoticeOfIntentDocument } from '../../alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.entity'; import { NoticeOfIntentOwnerDto } from '../../portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.dto'; import { NoticeOfIntentOwner } from '../../portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.entity'; -import { NoticeOfIntentParcelOwnershipType } from '../../portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel-ownership-type/notice-of-intent-parcel-ownership-type.entity'; -import { - NoticeOfIntentParcelDto, - NoticeOfIntentParcelOwnershipTypeDto, -} from '../../portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.dto'; +import { NoticeOfIntentParcelDto } from '../../portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.dto'; import { NoticeOfIntentParcel } from '../../portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.entity'; +import { + ParcelOwnershipType, + ParcelOwnershipTypeDto, +} from '../entities/parcel-ownership-type/parcel-ownership-type.entity'; @Injectable() export class NoticeOfIntentParcelProfile extends AutomapperProfile { @@ -65,8 +65,8 @@ export class NoticeOfIntentParcelProfile extends AutomapperProfile { if (pd.ownershipType) { return this.mapper.map( pd.ownershipType, - NoticeOfIntentParcelOwnershipType, - NoticeOfIntentParcelOwnershipTypeDto, + ParcelOwnershipType, + ParcelOwnershipTypeDto, ); } else { return undefined; @@ -75,11 +75,7 @@ export class NoticeOfIntentParcelProfile extends AutomapperProfile { ), ); - createMap( - mapper, - NoticeOfIntentParcelOwnershipType, - NoticeOfIntentParcelOwnershipTypeDto, - ); + createMap(mapper, ParcelOwnershipType, ParcelOwnershipTypeDto); }; } } diff --git a/services/apps/alcs/src/common/automapper/notice-of-intent.automapper.profile.ts b/services/apps/alcs/src/common/automapper/notice-of-intent.automapper.profile.ts index 54d47bc7f6..41c1976f81 100644 --- a/services/apps/alcs/src/common/automapper/notice-of-intent.automapper.profile.ts +++ b/services/apps/alcs/src/common/automapper/notice-of-intent.automapper.profile.ts @@ -1,8 +1,8 @@ import { createMap, forMember, mapFrom, Mapper } from '@automapper/core'; import { AutomapperProfile, InjectMapper } from '@automapper/nestjs'; import { Injectable } from '@nestjs/common'; -import { NoticeOfIntentTypeDto } from '../../alcs/code/application-code/notice-of-intent-type/notice-of-intent-type.dto'; -import { NoticeOfIntentType } from '../../alcs/code/application-code/notice-of-intent-type/notice-of-intent-type.entity'; +import { NoticeOfIntentTypeDto } from '../../alcs/notice-of-intent/notice-of-intent-type/notice-of-intent-type.dto'; +import { NoticeOfIntentType } from '../../alcs/notice-of-intent/notice-of-intent-type/notice-of-intent-type.entity'; import { NoticeOfIntentDocumentDto } from '../../alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.dto'; import { NoticeOfIntentDocument } from '../../alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.entity'; diff --git a/services/apps/alcs/src/common/automapper/notification-parcel.automapper.profile.ts b/services/apps/alcs/src/common/automapper/notification-parcel.automapper.profile.ts new file mode 100644 index 0000000000..e54b68e853 --- /dev/null +++ b/services/apps/alcs/src/common/automapper/notification-parcel.automapper.profile.ts @@ -0,0 +1,46 @@ +import { createMap, forMember, mapFrom, Mapper } from '@automapper/core'; +import { AutomapperProfile, InjectMapper } from '@automapper/nestjs'; +import { Injectable } from '@nestjs/common'; +import { NotificationParcelDto } from '../../portal/notification-submission/notification-parcel/notification-parcel.dto'; +import { NotificationParcel } from '../../portal/notification-submission/notification-parcel/notification-parcel.entity'; +import { + ParcelOwnershipType, + ParcelOwnershipTypeDto, +} from '../entities/parcel-ownership-type/parcel-ownership-type.entity'; + +@Injectable() +export class NotificationParcelProfile extends AutomapperProfile { + constructor(@InjectMapper() mapper: Mapper) { + super(mapper); + } + + override get profile() { + return (mapper) => { + createMap( + mapper, + NotificationParcel, + NotificationParcelDto, + forMember( + (pd) => pd.ownershipTypeCode, + mapFrom((p) => p.ownershipTypeCode), + ), + forMember( + (p) => p.ownershipType, + mapFrom((pd) => { + if (pd.ownershipType) { + return this.mapper.map( + pd.ownershipType, + ParcelOwnershipType, + ParcelOwnershipTypeDto, + ); + } else { + return undefined; + } + }), + ), + ); + + createMap(mapper, ParcelOwnershipType, ParcelOwnershipTypeDto); + }; + } +} diff --git a/services/apps/alcs/src/common/automapper/notification-submission.automapper.profile.ts b/services/apps/alcs/src/common/automapper/notification-submission.automapper.profile.ts new file mode 100644 index 0000000000..a6227876d7 --- /dev/null +++ b/services/apps/alcs/src/common/automapper/notification-submission.automapper.profile.ts @@ -0,0 +1,55 @@ +import { createMap, forMember, mapFrom, Mapper } from '@automapper/core'; +import { AutomapperProfile, InjectMapper } from '@automapper/nestjs'; +import { Injectable } from '@nestjs/common'; +import { + NotificationSubmissionDetailedDto, + NotificationSubmissionDto, +} from '../../portal/notification-submission/notification-submission.dto'; +import { NotificationSubmission } from '../../portal/notification-submission/notification-submission.entity'; + +@Injectable() +export class NotificationSubmissionProfile extends AutomapperProfile { + constructor(@InjectMapper() mapper: Mapper) { + super(mapper); + } + + override get profile() { + return (mapper) => { + createMap( + mapper, + NotificationSubmission, + NotificationSubmissionDto, + forMember( + (a) => a.createdAt, + mapFrom((ad) => { + return ad.auditCreatedAt.getTime(); + }), + ), + forMember( + (a) => a.updatedAt, + mapFrom((ad) => { + return ad.auditUpdatedAt?.getTime(); + }), + ), + ); + + createMap( + mapper, + NotificationSubmission, + NotificationSubmissionDetailedDto, + forMember( + (a) => a.createdAt, + mapFrom((ad) => { + return ad.auditCreatedAt.getTime(); + }), + ), + forMember( + (a) => a.updatedAt, + mapFrom((ad) => { + return ad.auditUpdatedAt?.getTime(); + }), + ), + ); + }; + } +} diff --git a/services/apps/alcs/src/common/automapper/notification-transferee.automapper.profile.ts b/services/apps/alcs/src/common/automapper/notification-transferee.automapper.profile.ts new file mode 100644 index 0000000000..542db36397 --- /dev/null +++ b/services/apps/alcs/src/common/automapper/notification-transferee.automapper.profile.ts @@ -0,0 +1,29 @@ +import { createMap, forMember, mapFrom, Mapper } from '@automapper/core'; +import { AutomapperProfile, InjectMapper } from '@automapper/nestjs'; +import { Injectable } from '@nestjs/common'; +import { NotificationTransfereeDto } from '../../portal/notification-submission/notification-transferee/notification-transferee.dto'; +import { NotificationTransferee } from '../../portal/notification-submission/notification-transferee/notification-transferee.entity'; +import { OwnerType, OwnerTypeDto } from '../owner-type/owner-type.entity'; + +@Injectable() +export class NotificationTransfereeProfile extends AutomapperProfile { + constructor(@InjectMapper() mapper: Mapper) { + super(mapper); + } + + override get profile() { + return (mapper) => { + createMap( + mapper, + NotificationTransferee, + NotificationTransfereeDto, + forMember( + (pd) => pd.displayName, + mapFrom((p) => `${p.firstName} ${p.lastName}`), + ), + ); + + createMap(mapper, OwnerType, OwnerTypeDto); + }; + } +} diff --git a/services/apps/alcs/src/common/automapper/notification.automapper.profile.ts b/services/apps/alcs/src/common/automapper/notification.automapper.profile.ts new file mode 100644 index 0000000000..9e5838daaa --- /dev/null +++ b/services/apps/alcs/src/common/automapper/notification.automapper.profile.ts @@ -0,0 +1,34 @@ +import { createMap, forMember, mapFrom, Mapper } from '@automapper/core'; +import { AutomapperProfile, InjectMapper } from '@automapper/nestjs'; +import { Injectable } from '@nestjs/common'; +import { NotificationTypeDto } from '../../alcs/notification/notification-type/notification-type.dto'; +import { NotificationType } from '../../alcs/notification/notification-type/notification-type.entity'; +import { NotificationDto } from '../../alcs/notification/notification.dto'; +import { DocumentCode } from '../../document/document-code.entity'; +import { DocumentTypeDto } from '../../document/document.dto'; +import { Notification } from '../../alcs/notification/notification.entity'; + +@Injectable() +export class NotificationProfile extends AutomapperProfile { + constructor(@InjectMapper() mapper: Mapper) { + super(mapper); + } + + override get profile() { + return (mapper) => { + createMap(mapper, NotificationType, NotificationTypeDto); + + createMap( + mapper, + Notification, + NotificationDto, + forMember( + (a) => a.dateSubmittedToAlc, + mapFrom((ad) => ad.dateSubmittedToAlc?.getTime()), + ), + ); + + createMap(mapper, DocumentCode, DocumentTypeDto); + }; + } +} diff --git a/services/apps/alcs/src/common/entities/parcel-ownership-type/parcel-ownership-type.entity.ts b/services/apps/alcs/src/common/entities/parcel-ownership-type/parcel-ownership-type.entity.ts new file mode 100644 index 0000000000..6ae47f4d92 --- /dev/null +++ b/services/apps/alcs/src/common/entities/parcel-ownership-type/parcel-ownership-type.entity.ts @@ -0,0 +1,8 @@ +import { Entity } from 'typeorm'; +import { BaseCodeDto } from '../../dtos/base.dto'; +import { BaseCodeEntity } from '../base.code.entity'; + +export class ParcelOwnershipTypeDto extends BaseCodeDto {} + +@Entity() +export class ParcelOwnershipType extends BaseCodeEntity {} diff --git a/services/apps/alcs/src/portal/application-submission-draft/application-submission-draft.module.ts b/services/apps/alcs/src/portal/application-submission-draft/application-submission-draft.module.ts index fc9d96e259..1ff7684867 100644 --- a/services/apps/alcs/src/portal/application-submission-draft/application-submission-draft.module.ts +++ b/services/apps/alcs/src/portal/application-submission-draft/application-submission-draft.module.ts @@ -2,9 +2,9 @@ import { Module } from '@nestjs/common'; import { TypeOrmModule } from '@nestjs/typeorm'; import { ApplicationSubmissionStatusModule } from '../../alcs/application/application-submission-status/application-submission-status.module'; import { ApplicationSubmissionStatusType } from '../../alcs/application/application-submission-status/submission-status-type.entity'; +import { ParcelOwnershipType } from '../../common/entities/parcel-ownership-type/parcel-ownership-type.entity'; import { OwnerType } from '../../common/owner-type/owner-type.entity'; import { ApplicationOwner } from '../application-submission/application-owner/application-owner.entity'; -import { ApplicationParcelOwnershipType } from '../application-submission/application-parcel/application-parcel-ownership-type/application-parcel-ownership-type.entity'; import { ApplicationParcel } from '../application-submission/application-parcel/application-parcel.entity'; import { ApplicationSubmission } from '../application-submission/application-submission.entity'; import { ApplicationSubmissionModule } from '../application-submission/application-submission.module'; @@ -18,7 +18,7 @@ import { ApplicationSubmissionDraftService } from './application-submission-draf ApplicationSubmission, ApplicationSubmissionStatusType, ApplicationParcel, - ApplicationParcelOwnershipType, + ParcelOwnershipType, ApplicationOwner, OwnerType, ]), diff --git a/services/apps/alcs/src/portal/application-submission/application-parcel/application-parcel-ownership-type/application-parcel-ownership-type.entity.ts b/services/apps/alcs/src/portal/application-submission/application-parcel/application-parcel-ownership-type/application-parcel-ownership-type.entity.ts deleted file mode 100644 index fc19749d91..0000000000 --- a/services/apps/alcs/src/portal/application-submission/application-parcel/application-parcel-ownership-type/application-parcel-ownership-type.entity.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { Entity } from 'typeorm'; -import { BaseCodeEntity } from '../../../../common/entities/base.code.entity'; - -@Entity() -export class ApplicationParcelOwnershipType extends BaseCodeEntity {} diff --git a/services/apps/alcs/src/portal/application-submission/application-parcel/application-parcel.entity.ts b/services/apps/alcs/src/portal/application-submission/application-parcel/application-parcel.entity.ts index 3fd81342d6..659d40f7ac 100644 --- a/services/apps/alcs/src/portal/application-submission/application-parcel/application-parcel.entity.ts +++ b/services/apps/alcs/src/portal/application-submission/application-parcel/application-parcel.entity.ts @@ -10,10 +10,10 @@ import { import { ApplicationDocumentDto } from '../../../alcs/application/application-document/application-document.dto'; import { ApplicationDocument } from '../../../alcs/application/application-document/application-document.entity'; import { Base } from '../../../common/entities/base.entity'; +import { ParcelOwnershipType } from '../../../common/entities/parcel-ownership-type/parcel-ownership-type.entity'; import { ColumnNumericTransformer } from '../../../utils/column-numeric-transform'; import { ApplicationOwner } from '../application-owner/application-owner.entity'; import { ApplicationSubmission } from '../application-submission.entity'; -import { ApplicationParcelOwnershipType } from './application-parcel-ownership-type/application-parcel-ownership-type.entity'; @Entity() export class ApplicationParcel extends Base { @@ -117,8 +117,8 @@ export class ApplicationParcel extends Base { ownershipTypeCode?: string | null; @AutoMap() - @ManyToOne(() => ApplicationParcelOwnershipType) - ownershipType: ApplicationParcelOwnershipType; + @ManyToOne(() => ParcelOwnershipType) + ownershipType: ParcelOwnershipType; @AutoMap(() => Boolean) @Column({ diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.module.ts b/services/apps/alcs/src/portal/application-submission/application-submission.module.ts index 8960faeeae..e21e206c59 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.module.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.module.ts @@ -8,6 +8,7 @@ import { AuthorizationModule } from '../../common/authorization/authorization.mo import { ApplicationOwnerProfile } from '../../common/automapper/application-owner.automapper.profile'; import { ApplicationParcelProfile } from '../../common/automapper/application-parcel.automapper.profile'; import { ApplicationSubmissionProfile } from '../../common/automapper/application-submission.automapper.profile'; +import { ParcelOwnershipType } from '../../common/entities/parcel-ownership-type/parcel-ownership-type.entity'; import { DocumentModule } from '../../document/document.module'; import { FileNumberModule } from '../../file-number/file-number.module'; import { PdfGenerationModule } from '../pdf-generation/pdf-generation.module'; @@ -15,7 +16,6 @@ import { OwnerType } from '../../common/owner-type/owner-type.entity'; import { ApplicationOwnerController } from './application-owner/application-owner.controller'; import { ApplicationOwner } from './application-owner/application-owner.entity'; import { ApplicationOwnerService } from './application-owner/application-owner.service'; -import { ApplicationParcelOwnershipType } from './application-parcel/application-parcel-ownership-type/application-parcel-ownership-type.entity'; import { ApplicationParcelController } from './application-parcel/application-parcel.controller'; import { ApplicationParcel } from './application-parcel/application-parcel.entity'; import { ApplicationParcelService } from './application-parcel/application-parcel.service'; @@ -31,7 +31,7 @@ import { NaruSubtype } from './naru-subtype/naru-subtype.entity'; ApplicationSubmission, ApplicationSubmissionStatusType, ApplicationParcel, - ApplicationParcelOwnershipType, + ParcelOwnershipType, ApplicationOwner, OwnerType, NaruSubtype, diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel-ownership-type/notice-of-intent-parcel-ownership-type.entity.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel-ownership-type/notice-of-intent-parcel-ownership-type.entity.ts deleted file mode 100644 index e6d3229bd5..0000000000 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel-ownership-type/notice-of-intent-parcel-ownership-type.entity.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { Entity } from 'typeorm'; -import { BaseCodeEntity } from '../../../../common/entities/base.code.entity'; - -@Entity() -export class NoticeOfIntentParcelOwnershipType extends BaseCodeEntity {} diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.dto.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.dto.ts index 2e6732dd14..77f20736f8 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.dto.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.dto.ts @@ -8,11 +8,9 @@ import { IsString, } from 'class-validator'; import { NoticeOfIntentDocumentDto } from '../../../alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.dto'; -import { BaseCodeDto } from '../../../common/dtos/base.dto'; +import { ParcelOwnershipTypeDto } from '../../../common/entities/parcel-ownership-type/parcel-ownership-type.entity'; import { NoticeOfIntentOwnerDto } from '../notice-of-intent-owner/notice-of-intent-owner.dto'; -export class NoticeOfIntentParcelOwnershipTypeDto extends BaseCodeDto {} - export class NoticeOfIntentParcelDto { @AutoMap() uuid: string; @@ -53,7 +51,7 @@ export class NoticeOfIntentParcelDto { @AutoMap(() => String) crownLandOwnerType?: string | null; - ownershipType?: NoticeOfIntentParcelOwnershipTypeDto; + ownershipType?: ParcelOwnershipTypeDto; @AutoMap(() => String) parcelType: string; diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.entity.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.entity.ts index 12b817142c..3215f14c90 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.entity.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.entity.ts @@ -10,10 +10,10 @@ import { import { NoticeOfIntentDocumentDto } from '../../../alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.dto'; import { NoticeOfIntentDocument } from '../../../alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.entity'; import { Base } from '../../../common/entities/base.entity'; +import { ParcelOwnershipType } from '../../../common/entities/parcel-ownership-type/parcel-ownership-type.entity'; import { ColumnNumericTransformer } from '../../../utils/column-numeric-transform'; import { NoticeOfIntentOwner } from '../notice-of-intent-owner/notice-of-intent-owner.entity'; import { NoticeOfIntentSubmission } from '../notice-of-intent-submission.entity'; -import { NoticeOfIntentParcelOwnershipType } from './notice-of-intent-parcel-ownership-type/notice-of-intent-parcel-ownership-type.entity'; @Entity() export class NoticeOfIntentParcel extends Base { @@ -107,8 +107,8 @@ export class NoticeOfIntentParcel extends Base { ownershipTypeCode?: string | null; @AutoMap() - @ManyToOne(() => NoticeOfIntentParcelOwnershipType) - ownershipType: NoticeOfIntentParcelOwnershipType; + @ManyToOne(() => ParcelOwnershipType) + ownershipType: ParcelOwnershipType; @AutoMap(() => Boolean) @Column({ diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.module.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.module.ts index 257dce1c7a..d67b02181b 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.module.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.module.ts @@ -2,19 +2,20 @@ import { forwardRef, Module } from '@nestjs/common'; import { TypeOrmModule } from '@nestjs/typeorm'; import { BoardModule } from '../../alcs/board/board.module'; import { LocalGovernmentModule } from '../../alcs/local-government/local-government.module'; +import { NoticeOfIntentSubmissionStatusType } from '../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status-type.entity'; import { NoticeOfIntentSubmissionStatusModule } from '../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.module'; import { NoticeOfIntentModule } from '../../alcs/notice-of-intent/notice-of-intent.module'; import { AuthorizationModule } from '../../common/authorization/authorization.module'; import { NoticeOfIntentOwnerProfile } from '../../common/automapper/notice-of-intent-owner.automapper.profile'; import { NoticeOfIntentParcelProfile } from '../../common/automapper/notice-of-intent-parcel.automapper.profile'; import { NoticeOfIntentSubmissionProfile } from '../../common/automapper/notice-of-intent-submission.automapper.profile'; +import { ParcelOwnershipType } from '../../common/entities/parcel-ownership-type/parcel-ownership-type.entity'; import { OwnerType } from '../../common/owner-type/owner-type.entity'; import { DocumentModule } from '../../document/document.module'; import { FileNumberModule } from '../../file-number/file-number.module'; import { NoticeOfIntentOwnerController } from './notice-of-intent-owner/notice-of-intent-owner.controller'; import { NoticeOfIntentOwner } from './notice-of-intent-owner/notice-of-intent-owner.entity'; import { NoticeOfIntentOwnerService } from './notice-of-intent-owner/notice-of-intent-owner.service'; -import { NoticeOfIntentParcelOwnershipType } from './notice-of-intent-parcel/notice-of-intent-parcel-ownership-type/notice-of-intent-parcel-ownership-type.entity'; import { NoticeOfIntentParcelController } from './notice-of-intent-parcel/notice-of-intent-parcel.controller'; import { NoticeOfIntentParcel } from './notice-of-intent-parcel/notice-of-intent-parcel.entity'; import { NoticeOfIntentParcelService } from './notice-of-intent-parcel/notice-of-intent-parcel.service'; @@ -22,14 +23,13 @@ import { NoticeOfIntentSubmissionValidatorService } from './notice-of-intent-sub import { NoticeOfIntentSubmissionController } from './notice-of-intent-submission.controller'; import { NoticeOfIntentSubmission } from './notice-of-intent-submission.entity'; import { NoticeOfIntentSubmissionService } from './notice-of-intent-submission.service'; -import { NoticeOfIntentSubmissionStatusType } from '../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status-type.entity'; @Module({ imports: [ TypeOrmModule.forFeature([ NoticeOfIntentSubmission, NoticeOfIntentParcel, - NoticeOfIntentParcelOwnershipType, + ParcelOwnershipType, OwnerType, NoticeOfIntentOwner, NoticeOfIntentSubmissionStatusType, diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts index 5cb5e32961..b09fc2a10a 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts @@ -5,7 +5,7 @@ import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { NoticeOfIntentType } from '../../alcs/code/application-code/notice-of-intent-type/notice-of-intent-type.entity'; +import { NoticeOfIntentType } from '../../alcs/notice-of-intent/notice-of-intent-type/notice-of-intent-type.entity'; import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; import { NoticeOfIntentDocumentService } from '../../alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.service'; import { NoticeOfIntentSubmissionToSubmissionStatus } from '../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status.entity'; diff --git a/services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.controller.spec.ts b/services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.controller.spec.ts new file mode 100644 index 0000000000..9c336f99aa --- /dev/null +++ b/services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.controller.spec.ts @@ -0,0 +1,158 @@ +import { classes } from '@automapper/classes'; +import { AutomapperModule } from '@automapper/nestjs'; +import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; +import { Test, TestingModule } from '@nestjs/testing'; +import { ClsService } from 'nestjs-cls'; +import { mockKeyCloakProviders } from '../../../../test/mocks/mockTypes'; +import { NoticeOfIntentParcelProfile } from '../../../common/automapper/notice-of-intent-parcel.automapper.profile'; +import { NotificationParcelProfile } from '../../../common/automapper/notification-parcel.automapper.profile'; +import { NotificationProfile } from '../../../common/automapper/notification.automapper.profile'; +import { DocumentService } from '../../../document/document.service'; +import { User } from '../../../user/user.entity'; +import { NotificationSubmission } from '../notification-submission.entity'; +import { NotificationSubmissionService } from '../notification-submission.service'; +import { NotificationTransfereeService } from '../notification-transferee/notification-transferee.service'; +import { NotificationParcelController } from './notification-parcel.controller'; +import { NotificationParcelUpdateDto } from './notification-parcel.dto'; +import { NotificationParcel } from './notification-parcel.entity'; +import { NotificationParcelService } from './notification-parcel.service'; + +describe('NotificationParcelController', () => { + let controller: NotificationParcelController; + let mockNotificationParcelService: DeepMocked; + let mockNotificationSubmissionsService: DeepMocked; + let mockNotificationTransfereeService: DeepMocked; + let mockDocumentService: DeepMocked; + let mockSubmission; + + beforeEach(async () => { + mockNotificationParcelService = createMock(); + mockNotificationSubmissionsService = createMock(); + mockNotificationTransfereeService = createMock(); + mockDocumentService = createMock(); + + mockSubmission = new NotificationSubmission({ + createdBy: new User(), + }); + + const module: TestingModule = await Test.createTestingModule({ + imports: [ + AutomapperModule.forRoot({ + strategyInitializer: classes(), + }), + ], + controllers: [NotificationParcelController], + providers: [ + NotificationProfile, + NotificationParcelProfile, + { + provide: NotificationParcelService, + useValue: mockNotificationParcelService, + }, + { + provide: NotificationSubmissionService, + useValue: mockNotificationSubmissionsService, + }, + { + provide: NotificationTransfereeService, + useValue: mockNotificationTransfereeService, + }, + { + provide: DocumentService, + useValue: mockDocumentService, + }, + { + provide: ClsService, + useValue: {}, + }, + ...mockKeyCloakProviders, + ], + }).compile(); + + controller = module.get( + NotificationParcelController, + ); + }); + + it('should be defined', () => { + expect(controller).toBeDefined(); + }); + + it('should call out to service when fetching parcels', async () => { + mockNotificationParcelService.fetchByApplicationSubmissionUuid.mockResolvedValue( + [], + ); + + const parcels = await controller.fetchByFileId('mockFileID'); + + expect(parcels).toBeDefined(); + expect( + mockNotificationParcelService.fetchByApplicationSubmissionUuid, + ).toHaveBeenCalledTimes(1); + }); + + it('should call out to service when creating parcels', async () => { + mockNotificationSubmissionsService.getByUuid.mockResolvedValue( + mockSubmission, + ); + mockNotificationParcelService.create.mockResolvedValue( + {} as NotificationParcel, + ); + + const parcel = await controller.create( + { + notificationSubmissionUuid: 'fake', + }, + { + user: { + entity: new User(), + }, + }, + ); + + expect(mockNotificationSubmissionsService.getByUuid).toBeCalledTimes(1); + expect(mockNotificationParcelService.create).toBeCalledTimes(1); + expect(parcel).toBeDefined(); + }); + + it('should call out to service when updating parcel', async () => { + const mockUpdateDto: NotificationParcelUpdateDto[] = [ + { + uuid: 'fake_uuid', + pid: 'mock_pid', + pin: 'mock_pin', + legalDescription: 'mock_legal', + mapAreaHectares: 2, + isConfirmedByApplicant: true, + ownershipTypeCode: 'SMPL', + }, + ]; + + mockNotificationParcelService.update.mockResolvedValue([ + {}, + ] as NotificationParcel[]); + + const parcel = await controller.update(mockUpdateDto, { + user: { + entity: new User(), + }, + }); + + expect(mockNotificationParcelService.update).toBeCalledTimes(1); + expect(parcel).toBeDefined(); + }); + + it('should call out to service when deleting parcel', async () => { + const fakeUuid = 'fake_uuid'; + mockNotificationParcelService.deleteMany.mockResolvedValue([]); + + const result = await controller.delete([fakeUuid], { + user: { + entity: new User(), + }, + }); + + expect(mockNotificationParcelService.deleteMany).toBeCalledTimes(1); + expect(result).toBeDefined(); + }); +}); diff --git a/services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.controller.ts b/services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.controller.ts new file mode 100644 index 0000000000..7174dac2bb --- /dev/null +++ b/services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.controller.ts @@ -0,0 +1,95 @@ +import { Mapper } from '@automapper/core'; +import { InjectMapper } from '@automapper/nestjs'; +import { + Body, + Controller, + Delete, + Get, + Param, + Post, + Put, + Req, + UseGuards, +} from '@nestjs/common'; +import { PortalAuthGuard } from '../../../common/authorization/portal-auth-guard.service'; +import { DocumentService } from '../../../document/document.service'; +import { NotificationSubmissionService } from '../notification-submission.service'; +import { + NotificationParcelCreateDto, + NotificationParcelDto, + NotificationParcelUpdateDto, +} from './notification-parcel.dto'; +import { NotificationParcel } from './notification-parcel.entity'; +import { NotificationParcelService } from './notification-parcel.service'; + +@Controller('notification-parcel') +@UseGuards(PortalAuthGuard) +export class NotificationParcelController { + constructor( + private parcelService: NotificationParcelService, + private notificationSubmissionService: NotificationSubmissionService, + @InjectMapper() private mapper: Mapper, + private documentService: DocumentService, + ) {} + + @Get('submission/:submissionUuid') + async fetchByFileId( + @Param('submissionUuid') submissionUuid: string, + ): Promise { + const parcels = await this.parcelService.fetchByApplicationSubmissionUuid( + submissionUuid, + ); + return this.mapper.mapArrayAsync( + parcels, + NotificationParcel, + NotificationParcelDto, + ); + } + + @Post() + async create( + @Body() createDto: NotificationParcelCreateDto, + @Req() req, + ): Promise { + const user = req.user.entity; + const notificationSubmission = + await this.notificationSubmissionService.getByUuid( + createDto.notificationSubmissionUuid, + user, + ); + const parcel = await this.parcelService.create(notificationSubmission.uuid); + + return this.mapper.mapAsync( + parcel, + NotificationParcel, + NotificationParcelDto, + ); + } + + @Put('/') + async update( + @Body() updateDtos: NotificationParcelUpdateDto[], + @Req() req, + ): Promise { + const updatedParcels = await this.parcelService.update(updateDtos); + + return this.mapper.mapArrayAsync( + updatedParcels, + NotificationParcel, + NotificationParcelDto, + ); + } + + @Delete() + async delete(@Body() uuids: string[], @Req() req) { + const deletedParcels = await this.parcelService.deleteMany( + uuids, + req.user.entity, + ); + return this.mapper.mapArrayAsync( + deletedParcels, + NotificationParcel, + NotificationParcelDto, + ); + } +} diff --git a/services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.dto.ts b/services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.dto.ts new file mode 100644 index 0000000000..4a2a541c8b --- /dev/null +++ b/services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.dto.ts @@ -0,0 +1,93 @@ +import { AutoMap } from '@automapper/classes'; +import { + IsBoolean, + IsNotEmpty, + IsNumber, + IsOptional, + IsString, +} from 'class-validator'; +import { ParcelOwnershipTypeDto } from '../../../common/entities/parcel-ownership-type/parcel-ownership-type.entity'; + +export class NotificationParcelDto { + @AutoMap() + uuid: string; + + @AutoMap() + notificationSubmissionUuid: string; + + @AutoMap(() => String) + pid?: string | null; + + @AutoMap(() => String) + pin?: string | null; + + @AutoMap(() => String) + legalDescription?: string | null; + + @AutoMap(() => String) + civicAddress?: string | null; + + @AutoMap(() => Number) + mapAreaHectares?: number | null; + + @AutoMap(() => Boolean) + isConfirmedByApplicant?: boolean; + + @AutoMap(() => String) + parcelType: string; + + @AutoMap(() => Number) + alrArea: number | null; + + ownershipType?: ParcelOwnershipTypeDto; + + @AutoMap(() => String) + ownershipTypeCode?: string; +} + +export class NotificationParcelCreateDto { + @IsNotEmpty() + @IsString() + notificationSubmissionUuid: string; + + @IsOptional() + @IsString() + parcelType?: string; +} + +export class NotificationParcelUpdateDto { + @IsString() + uuid: string; + + @IsString() + @IsOptional() + pid?: string | null; + + @IsString() + @IsOptional() + pin?: string | null; + + @IsString() + @IsOptional() + civicAddress?: string | null; + + @IsString() + @IsOptional() + legalDescription?: string | null; + + @IsNumber() + @IsOptional() + mapAreaHectares?: number | null; + + @IsBoolean() + @IsOptional() + isConfirmedByApplicant?: boolean; + + @IsString() + @IsOptional() + ownershipTypeCode?: string | null; + + @IsString() + @IsOptional() + crownLandOwnerType?: string | null; +} diff --git a/services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.entity.ts b/services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.entity.ts new file mode 100644 index 0000000000..aced2c8b95 --- /dev/null +++ b/services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.entity.ts @@ -0,0 +1,90 @@ +import { AutoMap } from '@automapper/classes'; +import { IsOptional, IsString } from 'class-validator'; +import { Column, Entity, ManyToOne } from 'typeorm'; +import { Base } from '../../../common/entities/base.entity'; +import { ParcelOwnershipType } from '../../../common/entities/parcel-ownership-type/parcel-ownership-type.entity'; +import { NotificationSubmission } from '../notification-submission.entity'; + +@Entity() +export class NotificationParcel extends Base { + constructor(data?: Partial) { + super(); + if (data) { + Object.assign(this, data); + } + } + + @AutoMap(() => String) + @Column({ + type: 'varchar', + comment: + 'The Parcels pid entered by the user or populated from third-party data', + nullable: true, + }) + pid?: string | null; + + @AutoMap(() => String) + @Column({ + type: 'varchar', + comment: + 'The Parcels pin entered by the user or populated from third-party data', + nullable: true, + }) + pin?: string | null; + + @AutoMap(() => String) + @Column({ + type: 'varchar', + comment: + 'The Parcels legalDescription entered by the user or populated from third-party data', + nullable: true, + }) + legalDescription?: string | null; + + @AutoMap(() => String) + @Column({ + type: 'varchar', + comment: 'The standard address for the parcel', + nullable: true, + }) + civicAddress?: string | null; + + @AutoMap(() => String) + @Column({ + type: 'float', + comment: + 'The Parcels map are in hectares entered by the user or populated from third-party data', + nullable: true, + }) + mapAreaHectares?: number | null; + + @AutoMap(() => Boolean) + @Column({ + type: 'boolean', + comment: + 'The Parcels indication whether applicant signed off provided data including the Certificate of Title', + nullable: false, + default: false, + }) + isConfirmedByApplicant: boolean; + + @IsString() + @IsOptional() + crownLandOwnerType?: string | null; + + @AutoMap(() => String) + @Column({ nullable: true }) + ownershipTypeCode?: string | null; + + @AutoMap() + @ManyToOne(() => ParcelOwnershipType) + ownershipType: ParcelOwnershipType; + + @AutoMap() + @ManyToOne(() => NotificationSubmission) + notificationSubmission: NotificationSubmission; + + @AutoMap() + @Column() + notificationSubmissionUuid: string; +} diff --git a/services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.service.spec.ts b/services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.service.spec.ts new file mode 100644 index 0000000000..17a7c1c22e --- /dev/null +++ b/services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.service.spec.ts @@ -0,0 +1,199 @@ +import { ServiceValidationException } from '@app/common/exceptions/base.exception'; +import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; +import { Test, TestingModule } from '@nestjs/testing'; +import { getRepositoryToken } from '@nestjs/typeorm'; +import { In, Repository } from 'typeorm'; +import { User } from '../../../user/user.entity'; +import { NotificationTransfereeService } from '../notification-transferee/notification-transferee.service'; +import { NotificationParcelUpdateDto } from './notification-parcel.dto'; +import { NotificationParcel } from './notification-parcel.entity'; +import { NotificationParcelService } from './notification-parcel.service'; + +describe('NotificationParcelService', () => { + let service: NotificationParcelService; + let mockParcelRepo: DeepMocked>; + let mockOwnerService: DeepMocked; + + const mockFileNumber = 'mock_applicationFileNumber'; + const mockUuid = 'mock_uuid'; + const mockNOIParcel = new NotificationParcel({ + uuid: mockUuid, + pid: 'mock_pid', + pin: 'mock_pin', + legalDescription: 'mock_legalDescription', + mapAreaHectares: 1, + isConfirmedByApplicant: true, + notificationSubmissionUuid: mockFileNumber, + ownershipTypeCode: 'mock_ownershipTypeCode', + }); + const mockError = new Error('Parcel does not exist.'); + + beforeEach(async () => { + mockParcelRepo = createMock(); + mockOwnerService = createMock(); + const module: TestingModule = await Test.createTestingModule({ + providers: [ + NotificationParcelService, + { + provide: getRepositoryToken(NotificationParcel), + useValue: mockParcelRepo, + }, + { + provide: NotificationTransfereeService, + useValue: mockOwnerService, + }, + ], + }).compile(); + + service = module.get(NotificationParcelService); + }); + + it('should be defined', () => { + expect(service).toBeDefined(); + }); + + it('should fetch parcels by fileNumber', async () => { + mockParcelRepo.find.mockResolvedValue([mockNOIParcel]); + + const result = await service.fetchByFileId(mockFileNumber); + + expect(result).toEqual([mockNOIParcel]); + expect(mockParcelRepo.find).toBeCalledTimes(1); + expect(mockParcelRepo.find).toBeCalledWith({ + where: { + notificationSubmission: { + fileNumber: mockFileNumber, + }, + }, + order: { auditCreatedAt: 'ASC' }, + }); + }); + + it('should get one parcel by id', async () => { + mockParcelRepo.findOneOrFail.mockResolvedValue(mockNOIParcel); + + const result = await service.getOneOrFail(mockUuid); + + expect(result).toEqual(mockNOIParcel); + expect(mockParcelRepo.findOneOrFail).toBeCalledTimes(1); + expect(mockParcelRepo.findOneOrFail).toBeCalledWith({ + where: { uuid: mockUuid }, + }); + }); + + it('should raise error on get parcel by uuid if the parcel does not exist', async () => { + mockParcelRepo.findOneOrFail.mockRejectedValue(mockError); + + await expect(service.getOneOrFail(mockUuid)).rejects.toMatchObject( + mockError, + ); + expect(mockParcelRepo.findOneOrFail).toBeCalledTimes(1); + expect(mockParcelRepo.findOneOrFail).toBeCalledWith({ + where: { uuid: mockUuid }, + }); + }); + + it('should successfully update parcel', async () => { + const updateParcelDto = [ + { + uuid: mockUuid, + pid: 'mock_pid', + pin: 'mock_pin', + legalDescription: 'mock_legalDescription', + mapAreaHectares: 1, + isConfirmedByApplicant: true, + ownershipTypeCode: 'mock_ownershipTypeCode', + }, + ] as NotificationParcelUpdateDto[]; + + mockParcelRepo.findOneOrFail.mockResolvedValue(mockNOIParcel); + mockParcelRepo.save.mockResolvedValue({} as NotificationParcel); + + await service.update(updateParcelDto); + + expect(mockParcelRepo.findOneOrFail).toBeCalledTimes(1); + expect(mockParcelRepo.findOneOrFail).toBeCalledWith({ + where: { uuid: mockUuid }, + }); + expect(mockParcelRepo.save).toBeCalledTimes(1); + }); + + it('it should fail to update a parcel if the parcel does not exist. ', async () => { + const updateParcelDto: NotificationParcelUpdateDto[] = [ + { + uuid: mockUuid, + pid: 'mock_pid', + pin: 'mock_pin', + legalDescription: 'mock_legalDescription', + mapAreaHectares: 1, + isConfirmedByApplicant: true, + ownershipTypeCode: 'mock_ownershipTypeCode', + }, + ]; + const mockError = new Error('Parcel does not exist.'); + + mockParcelRepo.findOneOrFail.mockRejectedValue(mockError); + mockParcelRepo.save.mockResolvedValue(new NotificationParcel()); + + await expect(service.update(updateParcelDto)).rejects.toMatchObject( + mockError, + ); + expect(mockParcelRepo.findOneOrFail).toBeCalledTimes(1); + expect(mockParcelRepo.findOneOrFail).toBeCalledWith({ + where: { uuid: mockUuid }, + }); + expect(mockParcelRepo.save).toBeCalledTimes(0); + }); + + it('should successfully delete a parcel and update applicant', async () => { + mockParcelRepo.find.mockResolvedValue([mockNOIParcel]); + mockParcelRepo.remove.mockResolvedValue(new NotificationParcel()); + mockOwnerService.updateSubmissionApplicant.mockResolvedValue(); + + const result = await service.deleteMany([mockUuid], new User()); + + expect(result).toBeDefined(); + expect(mockParcelRepo.find).toBeCalledTimes(1); + expect(mockParcelRepo.find).toBeCalledWith({ + where: { uuid: In([mockUuid]) }, + }); + expect(mockParcelRepo.remove).toBeCalledWith([mockNOIParcel]); + expect(mockParcelRepo.remove).toBeCalledTimes(1); + expect(mockOwnerService.updateSubmissionApplicant).toHaveBeenCalledTimes(1); + }); + + it('should not call remove if the parcel does not exist', async () => { + const exception = new ServiceValidationException( + `Unable to find parcels with provided uuids: ${mockUuid}.`, + ); + + mockParcelRepo.find.mockResolvedValue([]); + mockParcelRepo.remove.mockResolvedValue(new NotificationParcel()); + + await expect( + service.deleteMany([mockUuid], new User()), + ).rejects.toMatchObject(exception); + expect(mockParcelRepo.find).toBeCalledTimes(1); + expect(mockParcelRepo.find).toBeCalledWith({ + where: { uuid: In([mockUuid]) }, + }); + expect(mockParcelRepo.remove).toBeCalledTimes(0); + }); + + it('should successfully create a parcel', async () => { + mockParcelRepo.save.mockResolvedValue({ + uuid: mockUuid, + notificationSubmissionUuid: mockFileNumber, + } as NotificationParcel); + + const mockParcel = new NotificationParcel({ + uuid: mockUuid, + notificationSubmissionUuid: mockFileNumber, + }); + + const result = await service.create(mockFileNumber); + + expect(result).toEqual(mockParcel); + expect(mockParcelRepo.save).toBeCalledTimes(1); + }); +}); diff --git a/services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.service.ts b/services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.service.ts new file mode 100644 index 0000000000..8328997211 --- /dev/null +++ b/services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.service.ts @@ -0,0 +1,92 @@ +import { ServiceValidationException } from '@app/common/exceptions/base.exception'; +import { forwardRef, Inject, Injectable } from '@nestjs/common'; +import { InjectRepository } from '@nestjs/typeorm'; +import { In, Repository } from 'typeorm'; +import { User } from '../../../user/user.entity'; +import { filterUndefined } from '../../../utils/undefined'; +import { NotificationTransfereeService } from '../notification-transferee/notification-transferee.service'; +import { NotificationParcelUpdateDto } from './notification-parcel.dto'; +import { NotificationParcel } from './notification-parcel.entity'; + +@Injectable() +export class NotificationParcelService { + constructor( + @InjectRepository(NotificationParcel) + private parcelRepository: Repository, + @Inject(forwardRef(() => NotificationTransfereeService)) + private noticeOfIntentOwnerService: NotificationTransfereeService, + ) {} + + async fetchByFileId(fileId: string) { + return this.parcelRepository.find({ + where: { + notificationSubmission: { fileNumber: fileId }, + }, + order: { auditCreatedAt: 'ASC' }, + }); + } + + async fetchByApplicationSubmissionUuid(uuid: string) { + return this.parcelRepository.find({ + where: { notificationSubmissionUuid: uuid }, + order: { auditCreatedAt: 'ASC' }, + }); + } + + async create(notificationSubmissionUuid: string) { + const parcel = new NotificationParcel({ + notificationSubmissionUuid, + }); + + return this.parcelRepository.save(parcel); + } + + async getOneOrFail(uuid: string) { + return this.parcelRepository.findOneOrFail({ + where: { uuid }, + }); + } + + async update(updateDtos: NotificationParcelUpdateDto[]) { + const updatedParcels: NotificationParcel[] = []; + + for (const updateDto of updateDtos) { + const parcel = await this.getOneOrFail(updateDto.uuid); + + parcel.pid = updateDto.pid; + parcel.pin = updateDto.pin; + parcel.legalDescription = updateDto.legalDescription; + parcel.mapAreaHectares = updateDto.mapAreaHectares; + parcel.civicAddress = updateDto.civicAddress; + parcel.isConfirmedByApplicant = filterUndefined( + updateDto.isConfirmedByApplicant, + parcel.isConfirmedByApplicant, + ); + parcel.crownLandOwnerType = updateDto.crownLandOwnerType; + + updatedParcels.push(parcel); + } + + return await this.parcelRepository.save(updatedParcels); + } + + async deleteMany(uuids: string[], user: User) { + const parcels = await this.parcelRepository.find({ + where: { uuid: In(uuids) }, + }); + + if (parcels.length === 0) { + throw new ServiceValidationException( + `Unable to find parcels with provided uuids: ${uuids}.`, + ); + } + + const result = await this.parcelRepository.remove(parcels); + await this.noticeOfIntentOwnerService.updateSubmissionApplicant( + parcels[0].notificationSubmissionUuid, + user, + ); + + return result; + } +} diff --git a/services/apps/alcs/src/portal/notification-submission/notification-submission.controller.spec.ts b/services/apps/alcs/src/portal/notification-submission/notification-submission.controller.spec.ts new file mode 100644 index 0000000000..53eed12b80 --- /dev/null +++ b/services/apps/alcs/src/portal/notification-submission/notification-submission.controller.spec.ts @@ -0,0 +1,264 @@ +import { classes } from '@automapper/classes'; +import { AutomapperModule } from '@automapper/nestjs'; +import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; +import { Test, TestingModule } from '@nestjs/testing'; +import { ClsService } from 'nestjs-cls'; +import { mockKeyCloakProviders } from '../../../test/mocks/mockTypes'; +import { LocalGovernment } from '../../alcs/local-government/local-government.entity'; +import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; +import { NoticeOfIntentDocumentService } from '../../alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.service'; +import { NoticeOfIntent } from '../../alcs/notice-of-intent/notice-of-intent.entity'; +import { NotificationSubmissionProfile } from '../../common/automapper/notification-submission.automapper.profile'; +import { EmailService } from '../../providers/email/email.service'; +import { User } from '../../user/user.entity'; +import { NotificationSubmissionController } from './notification-submission.controller'; +import { + NotificationSubmissionDetailedDto, + NotificationSubmissionDto, +} from './notification-submission.dto'; +import { NotificationSubmission } from './notification-submission.entity'; +import { NotificationSubmissionService } from './notification-submission.service'; +import { NotificationTransferee } from './notification-transferee/notification-transferee.entity'; + +describe('NotificationSubmissionController', () => { + let controller: NotificationSubmissionController; + let mockNoiSubmissionService: DeepMocked; + let mockDocumentService: DeepMocked; + let mockLgService: DeepMocked; + let mockEmailService: DeepMocked; + + const primaryContactOwnerUuid = 'primary-contact'; + const localGovernmentUuid = 'local-government'; + const applicant = 'fake-applicant'; + const bceidBusinessGuid = 'business-guid'; + + beforeEach(async () => { + mockNoiSubmissionService = createMock(); + mockDocumentService = createMock(); + mockLgService = createMock(); + mockEmailService = createMock(); + + const module: TestingModule = await Test.createTestingModule({ + controllers: [NotificationSubmissionController], + providers: [ + NotificationSubmissionProfile, + { + provide: NotificationSubmissionService, + useValue: mockNoiSubmissionService, + }, + { + provide: NoticeOfIntentDocumentService, + useValue: mockDocumentService, + }, + { + provide: LocalGovernmentService, + useValue: mockLgService, + }, + { + provide: EmailService, + useValue: mockEmailService, + }, + { + provide: ClsService, + useValue: {}, + }, + ...mockKeyCloakProviders, + ], + imports: [ + AutomapperModule.forRoot({ + strategyInitializer: classes(), + }), + ], + }).compile(); + + controller = module.get( + NotificationSubmissionController, + ); + + mockNoiSubmissionService.update.mockResolvedValue( + new NotificationSubmission({ + applicant: applicant, + localGovernmentUuid, + }), + ); + + mockNoiSubmissionService.create.mockResolvedValue('2'); + mockNoiSubmissionService.getByFileNumber.mockResolvedValue( + new NotificationSubmission(), + ); + mockNoiSubmissionService.getByUuid.mockResolvedValue( + new NotificationSubmission(), + ); + + mockNoiSubmissionService.mapToDTOs.mockResolvedValue([]); + mockLgService.list.mockResolvedValue([ + new LocalGovernment({ + uuid: localGovernmentUuid, + bceidBusinessGuid, + name: 'fake-name', + isFirstNation: false, + }), + ]); + }); + + it('should be defined', () => { + expect(controller).toBeDefined(); + }); + + it('should call out to service when fetching notice of intents', async () => { + mockNoiSubmissionService.getAllByUser.mockResolvedValue([]); + + const submissions = await controller.getSubmissions({ + user: { + entity: new User(), + }, + }); + + expect(submissions).toBeDefined(); + expect(mockNoiSubmissionService.getAllByUser).toHaveBeenCalledTimes(1); + }); + + it('should call out to service when fetching a notice of intent', async () => { + mockNoiSubmissionService.mapToDetailedDTO.mockResolvedValue( + {} as NotificationSubmissionDetailedDto, + ); + + const noticeOfIntent = controller.getSubmission( + { + user: { + entity: new User(), + }, + }, + '', + ); + + expect(noticeOfIntent).toBeDefined(); + expect(mockNoiSubmissionService.getByUuid).toHaveBeenCalledTimes(1); + }); + + it('should fetch notice of intent by bceid if user has same guid as a local government', async () => { + mockNoiSubmissionService.mapToDetailedDTO.mockResolvedValue( + {} as NotificationSubmissionDetailedDto, + ); + mockNoiSubmissionService.getByUuid.mockResolvedValue( + new NotificationSubmission({ + localGovernmentUuid: '', + }), + ); + + const noiSubmission = controller.getSubmission( + { + user: { + entity: new User({ + bceidBusinessGuid: 'guid', + }), + }, + }, + '', + ); + + expect(noiSubmission).toBeDefined(); + expect(mockNoiSubmissionService.getByUuid).toHaveBeenCalledTimes(1); + }); + + it('should call out to service when creating an notice of intent', async () => { + mockNoiSubmissionService.create.mockResolvedValue(''); + mockNoiSubmissionService.mapToDTOs.mockResolvedValue([ + {} as NotificationSubmissionDto, + ]); + + const noiSubmission = await controller.create({ + user: { + entity: new User(), + }, + }); + + expect(noiSubmission).toBeDefined(); + expect(mockNoiSubmissionService.create).toHaveBeenCalledTimes(1); + }); + + it('should call out to service for update and map', async () => { + mockNoiSubmissionService.mapToDetailedDTO.mockResolvedValue( + {} as NotificationSubmissionDetailedDto, + ); + mockNoiSubmissionService.getByUuid.mockResolvedValue( + new NotificationSubmission({}), + ); + + await controller.update( + 'file-id', + { + localGovernmentUuid, + applicant, + }, + { + user: { + entity: new User({ + clientRoles: [], + }), + }, + }, + ); + + expect(mockNoiSubmissionService.update).toHaveBeenCalledTimes(1); + expect(mockNoiSubmissionService.mapToDetailedDTO).toHaveBeenCalledTimes(1); + }); + + // it('should throw an exception when trying to update a not in progress noi', async () => { + // mockNoiSubmissionService.mapToDetailedDTO.mockResolvedValue( + // {} as NotificationSubmissionDetailedDto, + // ); + // + // const promise = controller.update( + // 'file-id', + // { + // localGovernmentUuid, + // applicant, + // }, + // { + // user: { + // entity: new User({ + // clientRoles: [], + // }), + // }, + // }, + // ); + // await expect(promise).rejects.toMatchObject( + // new BadRequestException('Can only edit in progress Notice of Intents'), + // ); + // + // expect(mockNoiSubmissionService.update).toHaveBeenCalledTimes(0); + // expect(mockNoiSubmissionService.mapToDetailedDTO).toHaveBeenCalledTimes(0); + // }); + + it('should call out to service on submitAlcs', async () => { + const mockFileId = 'file-id'; + const mockOwner = new NotificationTransferee({ + uuid: primaryContactOwnerUuid, + }); + const mockGovernment = new LocalGovernment({ uuid: localGovernmentUuid }); + const mockSubmission = new NotificationSubmission({ + fileNumber: mockFileId, + transferees: [mockOwner], + localGovernmentUuid, + }); + + mockNoiSubmissionService.submitToAlcs.mockResolvedValue( + new NoticeOfIntent(), + ); + mockNoiSubmissionService.getByUuid.mockResolvedValue(mockSubmission); + mockNoiSubmissionService.mapToDetailedDTO.mockResolvedValue( + {} as NotificationSubmissionDetailedDto, + ); + + await controller.submitAsApplicant(mockFileId, { + user: { + entity: new User(), + }, + }); + + expect(mockNoiSubmissionService.getByUuid).toHaveBeenCalledTimes(2); + expect(mockNoiSubmissionService.submitToAlcs).toHaveBeenCalledTimes(1); + expect(mockNoiSubmissionService.mapToDetailedDTO).toHaveBeenCalledTimes(1); + }); +}); diff --git a/services/apps/alcs/src/portal/notification-submission/notification-submission.controller.ts b/services/apps/alcs/src/portal/notification-submission/notification-submission.controller.ts new file mode 100644 index 0000000000..67a0b261ee --- /dev/null +++ b/services/apps/alcs/src/portal/notification-submission/notification-submission.controller.ts @@ -0,0 +1,149 @@ +import { + Body, + Controller, + Get, + Logger, + Param, + Post, + Put, + Req, + UseGuards, +} from '@nestjs/common'; +import { PortalAuthGuard } from '../../common/authorization/portal-auth-guard.service'; +import { User } from '../../user/user.entity'; +import { NotificationSubmissionUpdateDto } from './notification-submission.dto'; +import { NotificationSubmissionService } from './notification-submission.service'; + +@Controller('notification-submission') +@UseGuards(PortalAuthGuard) +export class NotificationSubmissionController { + private logger: Logger = new Logger(NotificationSubmissionController.name); + + constructor( + private notificationSubmissionService: NotificationSubmissionService, + ) {} + + @Get() + async getSubmissions(@Req() req) { + const user = req.user.entity as User; + + const notificationSubmissions = + await this.notificationSubmissionService.getAllByUser(user); + return this.notificationSubmissionService.mapToDTOs( + notificationSubmissions, + user, + ); + } + + @Get('/notification/:fileId') + async getSubmissionByFileId(@Req() req, @Param('fileId') fileId: string) { + const user = req.user.entity as User; + + const submission = await this.notificationSubmissionService.getByFileNumber( + fileId, + user, + ); + + return await this.notificationSubmissionService.mapToDetailedDTO( + submission, + user, + ); + } + + @Get('/:uuid') + async getSubmission(@Req() req, @Param('uuid') uuid: string) { + const user = req.user.entity as User; + + const submission = await this.notificationSubmissionService.getByUuid( + uuid, + user, + ); + + return await this.notificationSubmissionService.mapToDetailedDTO( + submission, + user, + ); + } + + @Post() + async create(@Req() req) { + const user = req.user.entity as User; + const newFileNumber = await this.notificationSubmissionService.create( + 'SRW', + user, + ); + return { + fileId: newFileNumber, + }; + } + + @Put('/:uuid') + async update( + @Param('uuid') uuid: string, + @Body() updateDto: NotificationSubmissionUpdateDto, + @Req() req, + ) { + // const noticeOfIntentSubmission = await this.notificationSubmissionService.getByUuid( + // uuid, + // req.user.entity, + // ); + // + // if ( + // noticeOfIntentSubmission.status.statusTypeCode !== + // NOI_SUBMISSION_STATUS.IN_PROGRESS && + // overlappingRoles.length === 0 + // ) { + // throw new BadRequestException('Can only edit in progress SRWs'); + // } + + const updatedSubmission = await this.notificationSubmissionService.update( + uuid, + updateDto, + req.user.entity, + ); + + return await this.notificationSubmissionService.mapToDetailedDTO( + updatedSubmission, + req.user.entity, + ); + } + + @Post('/:uuid/cancel') + async cancel(@Param('uuid') uuid: string, @Req() req) { + const noticeOfIntentSubmission = + await this.notificationSubmissionService.getByUuid(uuid, req.user.entity); + + // if ( + // noticeOfIntentSubmission.status.statusTypeCode !== + // NOI_SUBMISSION_STATUS.IN_PROGRESS + // ) { + // throw new BadRequestException('Can only cancel in progress SRWs'); + // } + + await this.notificationSubmissionService.cancel(noticeOfIntentSubmission); + + return { + cancelled: true, + }; + } + + @Post('/alcs/submit/:uuid') + async submitAsApplicant(@Param('uuid') uuid: string, @Req() req) { + const notificationSubmission = + await this.notificationSubmissionService.getByUuid(uuid, req.user.entity); + + await this.notificationSubmissionService.submitToAlcs( + notificationSubmission, + ); + + const finalSubmission = await this.notificationSubmissionService.getByUuid( + uuid, + req.user.entity, + ); + + return await this.notificationSubmissionService.mapToDetailedDTO( + finalSubmission, + req.user.entity, + ); + } +} diff --git a/services/apps/alcs/src/portal/notification-submission/notification-submission.dto.ts b/services/apps/alcs/src/portal/notification-submission/notification-submission.dto.ts new file mode 100644 index 0000000000..634a4b8fa7 --- /dev/null +++ b/services/apps/alcs/src/portal/notification-submission/notification-submission.dto.ts @@ -0,0 +1,59 @@ +import { AutoMap } from '@automapper/classes'; +import { IsOptional, IsString, IsUUID, MaxLength } from 'class-validator'; +import { NoticeOfIntentStatusDto } from '../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status.dto'; +import { NotificationTransfereeDto } from './notification-transferee/notification-transferee.dto'; + +export const MAX_DESCRIPTION_FIELD_LENGTH = 4000; + +export class NotificationSubmissionDto { + @AutoMap() + fileNumber: string; + + @AutoMap() + uuid: string; + + @AutoMap() + createdAt: number; + + @AutoMap() + updatedAt: number; + + @AutoMap() + applicant: string; + + @AutoMap() + localGovernmentUuid: string; + + @AutoMap() + type: string; + + @AutoMap() + typeCode: string; + + status: NoticeOfIntentStatusDto; + lastStatusUpdate: number; + owners: NotificationTransfereeDto[]; + + canEdit: boolean; + canView: boolean; +} + +export class NotificationSubmissionDetailedDto extends NotificationSubmissionDto { + @AutoMap(() => String) + purpose: string | null; +} + +export class NotificationSubmissionUpdateDto { + @IsString() + @IsOptional() + applicant?: string; + + @IsString() + @IsOptional() + @MaxLength(MAX_DESCRIPTION_FIELD_LENGTH) + purpose?: string; + + @IsUUID() + @IsOptional() + localGovernmentUuid?: string; +} diff --git a/services/apps/alcs/src/portal/notification-submission/notification-submission.entity.ts b/services/apps/alcs/src/portal/notification-submission/notification-submission.entity.ts new file mode 100644 index 0000000000..f74317f39c --- /dev/null +++ b/services/apps/alcs/src/portal/notification-submission/notification-submission.entity.ts @@ -0,0 +1,88 @@ +import { AutoMap } from '@automapper/classes'; +import { + Column, + Entity, + JoinColumn, + ManyToOne, + OneToMany, + PrimaryGeneratedColumn, +} from 'typeorm'; +import { Notification } from '../../alcs/notification/notification.entity'; +import { Base } from '../../common/entities/base.entity'; +import { User } from '../../user/user.entity'; +import { NotificationParcel } from './notification-parcel/notification-parcel.entity'; +import { NotificationTransferee } from './notification-transferee/notification-transferee.entity'; + +@Entity() +export class NotificationSubmission extends Base { + constructor(data?: Partial) { + super(); + if (data) { + Object.assign(this, data); + } + } + + @AutoMap() + @PrimaryGeneratedColumn('uuid') + uuid: string; + + @AutoMap({}) + @Column({ + comment: 'File Number of attached SRW', + }) + fileNumber: string; + + @AutoMap(() => String) + @Column({ + type: 'varchar', + comment: 'The Applicants name on the application', + nullable: true, + }) + applicant?: string | null; + + @AutoMap(() => String) + @Column({ + type: 'uuid', + comment: 'UUID of the Local Government', + nullable: true, + }) + localGovernmentUuid?: string | null; + + @AutoMap(() => String) + @Column({ + type: 'varchar', + comment: 'The purpose of the application', + nullable: true, + }) + purpose?: string | null; + + @AutoMap() + @ManyToOne(() => User) + createdBy: User; + + @AutoMap() + @Column({ + comment: 'SRW Type Code', + }) + typeCode: string; + + @AutoMap(() => Notification) + @ManyToOne(() => Notification) + @JoinColumn({ + name: 'file_number', + referencedColumnName: 'fileNumber', + }) + notification: Notification; + + @OneToMany( + () => NotificationTransferee, + (transferee) => transferee.notificationSubmission, + ) + transferees: NotificationTransferee[]; + + @OneToMany( + () => NotificationParcel, + (parcel) => parcel.notificationSubmission, + ) + parcels: NotificationParcel[]; +} diff --git a/services/apps/alcs/src/portal/notification-submission/notification-submission.module.ts b/services/apps/alcs/src/portal/notification-submission/notification-submission.module.ts new file mode 100644 index 0000000000..83c31fd910 --- /dev/null +++ b/services/apps/alcs/src/portal/notification-submission/notification-submission.module.ts @@ -0,0 +1,58 @@ +import { forwardRef, Module } from '@nestjs/common'; +import { TypeOrmModule } from '@nestjs/typeorm'; +import { BoardModule } from '../../alcs/board/board.module'; +import { LocalGovernmentModule } from '../../alcs/local-government/local-government.module'; +import { NotificationModule } from '../../alcs/notification/notification.module'; +import { AuthorizationModule } from '../../common/authorization/authorization.module'; +import { NotificationParcelProfile } from '../../common/automapper/notification-parcel.automapper.profile'; +import { NotificationSubmissionProfile } from '../../common/automapper/notification-submission.automapper.profile'; +import { NotificationTransfereeProfile } from '../../common/automapper/notification-transferee.automapper.profile'; +import { OwnerType } from '../../common/owner-type/owner-type.entity'; +import { DocumentModule } from '../../document/document.module'; +import { FileNumberModule } from '../../file-number/file-number.module'; +import { NotificationParcelController } from './notification-parcel/notification-parcel.controller'; +import { NotificationParcel } from './notification-parcel/notification-parcel.entity'; +import { NotificationParcelService } from './notification-parcel/notification-parcel.service'; +import { NotificationSubmissionController } from './notification-submission.controller'; +import { NotificationSubmission } from './notification-submission.entity'; +import { NotificationSubmissionService } from './notification-submission.service'; +import { NotificationTransfereeController } from './notification-transferee/notification-transferee.controller'; +import { NotificationTransferee } from './notification-transferee/notification-transferee.entity'; +import { NotificationTransfereeService } from './notification-transferee/notification-transferee.service'; + +@Module({ + imports: [ + TypeOrmModule.forFeature([ + NotificationSubmission, + NotificationParcel, + OwnerType, + NotificationTransferee, + ]), + forwardRef(() => NotificationModule), + forwardRef(() => AuthorizationModule), + forwardRef(() => DocumentModule), + forwardRef(() => BoardModule), + LocalGovernmentModule, + FileNumberModule, + ], + controllers: [ + NotificationSubmissionController, + NotificationParcelController, + NotificationTransfereeController, + ], + providers: [ + NotificationSubmissionService, + NotificationParcelService, + NotificationTransfereeService, + NotificationSubmissionProfile, + NotificationTransfereeProfile, + NotificationParcelProfile, + ], + exports: [ + NotificationSubmissionService, + NotificationParcelService, + NotificationParcelProfile, + NotificationTransfereeService, + ], +}) +export class NotificationSubmissionModule {} diff --git a/services/apps/alcs/src/portal/notification-submission/notification-submission.service.spec.ts b/services/apps/alcs/src/portal/notification-submission/notification-submission.service.spec.ts new file mode 100644 index 0000000000..efd7d9acbb --- /dev/null +++ b/services/apps/alcs/src/portal/notification-submission/notification-submission.service.spec.ts @@ -0,0 +1,248 @@ +import { BaseServiceException } from '@app/common/exceptions/base.exception'; +import { classes } from '@automapper/classes'; +import { AutomapperModule } from '@automapper/nestjs'; +import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; +import { Test, TestingModule } from '@nestjs/testing'; +import { getRepositoryToken } from '@nestjs/typeorm'; +import { Repository } from 'typeorm'; +import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; +import { NoticeOfIntentType } from '../../alcs/notice-of-intent/notice-of-intent-type/notice-of-intent-type.entity'; +import { Notification } from '../../alcs/notification/notification.entity'; +import { NotificationService } from '../../alcs/notification/notification.service'; +import { NotificationSubmissionProfile } from '../../common/automapper/notification-submission.automapper.profile'; +import { FileNumberService } from '../../file-number/file-number.service'; +import { User } from '../../user/user.entity'; +import { NotificationSubmission } from './notification-submission.entity'; +import { NotificationSubmissionService } from './notification-submission.service'; + +describe('NotificationSubmissionService', () => { + let service: NotificationSubmissionService; + let mockRepository: DeepMocked>; + let mockNotificationService: DeepMocked; + let mockLGService: DeepMocked; + let mockFileNumberService: DeepMocked; + let mockSubmission; + + beforeEach(async () => { + mockRepository = createMock(); + mockNotificationService = createMock(); + mockLGService = createMock(); + mockFileNumberService = createMock(); + + const module: TestingModule = await Test.createTestingModule({ + imports: [ + AutomapperModule.forRoot({ + strategyInitializer: classes(), + }), + ], + providers: [ + NotificationSubmissionService, + NotificationSubmissionProfile, + { + provide: getRepositoryToken(NotificationSubmission), + useValue: mockRepository, + }, + { + provide: NotificationService, + useValue: mockNotificationService, + }, + { + provide: LocalGovernmentService, + useValue: mockLGService, + }, + { + provide: FileNumberService, + useValue: mockFileNumberService, + }, + ], + }).compile(); + + service = module.get( + NotificationSubmissionService, + ); + + mockSubmission = new NotificationSubmission({ + fileNumber: 'file-number', + applicant: 'incognito', + typeCode: 'fake', + localGovernmentUuid: 'uuid', + createdBy: new User({ + clientRoles: [], + }), + }); + }); + + it('should be defined', () => { + expect(service).toBeDefined(); + }); + + it('should return the fetched notification', async () => { + const notificationSubmission = new NotificationSubmission(); + mockRepository.findOneOrFail.mockResolvedValue(notificationSubmission); + + const app = await service.getByFileNumber( + '', + new User({ + clientRoles: [], + }), + ); + expect(app).toBe(notificationSubmission); + }); + + it('should return the fetched notification when fetching with user', async () => { + const noiSubmission = new NotificationSubmission(); + mockRepository.findOneOrFail.mockResolvedValue(noiSubmission); + + const app = await service.getByFileNumber( + '', + new User({ + clientRoles: [], + }), + ); + expect(app).toBe(noiSubmission); + }); + + it('save a new noi for create', async () => { + const fileId = 'file-id'; + mockRepository.findOne.mockResolvedValue(null); + mockRepository.save.mockResolvedValue(new NotificationSubmission()); + mockFileNumberService.generateNextFileNumber.mockResolvedValue(fileId); + mockNotificationService.create.mockResolvedValue(new Notification()); + + const fileNumber = await service.create( + 'type', + new User({ + clientRoles: [], + }), + ); + + expect(fileNumber).toEqual(fileId); + expect(mockRepository.save).toHaveBeenCalledTimes(1); + expect(mockNotificationService.create).toHaveBeenCalledTimes(1); + }); + + it('should call through for get by user', async () => { + const noiSubmission = new NotificationSubmission(); + mockRepository.find.mockResolvedValue([noiSubmission]); + + const res = await service.getAllByUser( + new User({ + clientRoles: [], + }), + ); + expect(mockRepository.find).toHaveBeenCalledTimes(1); + expect(res.length).toEqual(1); + expect(res[0]).toBe(noiSubmission); + }); + + it('should call through for getByFileId', async () => { + const noiSubmission = new NotificationSubmission(); + mockRepository.findOneOrFail.mockResolvedValue(noiSubmission); + + const res = await service.getByFileNumber( + '', + new User({ + clientRoles: [], + }), + ); + expect(mockRepository.findOneOrFail).toHaveBeenCalledTimes(1); + expect(res).toBe(noiSubmission); + }); + + it('should use notification type service for mapping DTOs', async () => { + const applicant = 'Bruce Wayne'; + const typeCode = 'fake-code'; + + mockNotificationService.listTypes.mockResolvedValue([ + new NoticeOfIntentType({ + code: typeCode, + portalLabel: 'portalLabel', + htmlDescription: 'htmlDescription', + label: 'label', + }), + ]); + + const noiSubmission = new NotificationSubmission({ + applicant, + typeCode: typeCode, + auditCreatedAt: new Date(), + createdBy: new User(), + }); + mockRepository.findOne.mockResolvedValue(noiSubmission); + + const res = await service.mapToDTOs( + [noiSubmission], + new User({ + clientRoles: [], + }), + ); + expect(mockNotificationService.listTypes).toHaveBeenCalledTimes(1); + expect(res[0].type).toEqual('label'); + expect(res[0].applicant).toEqual(applicant); + }); + + it('should fail on submitToAlcs if error', async () => { + const applicant = 'Bruce Wayne'; + const typeCode = 'fake-code'; + const fileNumber = 'fake'; + const localGovernmentUuid = 'fake-uuid'; + const noticeOfIntentSubmission = new NotificationSubmission({ + fileNumber, + applicant, + typeCode, + localGovernmentUuid, + }); + + mockNotificationService.submit.mockRejectedValue(new Error()); + + await expect( + service.submitToAlcs(noticeOfIntentSubmission), + ).rejects.toMatchObject( + new BaseServiceException(`Failed to submit notification: ${fileNumber}`), + ); + }); + + it('should call out to service on submitToAlcs', async () => { + const notification = new Notification({ + dateSubmittedToAlc: new Date(), + }); + + mockNotificationService.submit.mockResolvedValue(notification); + await service.submitToAlcs(mockSubmission); + + expect(mockNotificationService.submit).toBeCalledTimes(1); + }); + + it('should update fields if notification exists', async () => { + const applicant = 'Bruce Wayne'; + const fileNumber = 'fake'; + const localGovernmentUuid = 'fake-uuid'; + + mockRepository.findOneOrFail.mockResolvedValue(mockSubmission); + mockRepository.save.mockResolvedValue(mockSubmission); + mockNotificationService.update.mockResolvedValue(new Notification()); + + const result = await service.update( + fileNumber, + { + applicant, + localGovernmentUuid, + }, + new User({ + clientRoles: [], + }), + ); + + expect(mockRepository.save).toBeCalledTimes(1); + expect(mockRepository.findOneOrFail).toBeCalledTimes(2); + }); + + it('should return the fetched notification when fetching with file number', async () => { + const noiSubmission = new NotificationSubmission(); + mockRepository.findOneOrFail.mockResolvedValue(noiSubmission); + + const app = await service.getOrFailByFileNumber(''); + + expect(app).toBe(noiSubmission); + }); +}); diff --git a/services/apps/alcs/src/portal/notification-submission/notification-submission.service.ts b/services/apps/alcs/src/portal/notification-submission/notification-submission.service.ts new file mode 100644 index 0000000000..581f183229 --- /dev/null +++ b/services/apps/alcs/src/portal/notification-submission/notification-submission.service.ts @@ -0,0 +1,336 @@ +import { BaseServiceException } from '@app/common/exceptions/base.exception'; +import { Mapper } from '@automapper/core'; +import { InjectMapper } from '@automapper/nestjs'; +import { Injectable, Logger } from '@nestjs/common'; +import { InjectRepository } from '@nestjs/typeorm'; +import { + FindOptionsRelations, + FindOptionsWhere, + IsNull, + Not, + Repository, +} from 'typeorm'; +import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; +import { NOI_SUBMISSION_STATUS } from '../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status.dto'; +import { NotificationService } from '../../alcs/notification/notification.service'; +import { ROLES_ALLOWED_APPLICATIONS } from '../../common/authorization/roles'; +import { FileNumberService } from '../../file-number/file-number.service'; +import { User } from '../../user/user.entity'; +import { FALLBACK_APPLICANT_NAME } from '../../utils/owner.constants'; +import { filterUndefined } from '../../utils/undefined'; +import { + NotificationSubmissionDetailedDto, + NotificationSubmissionDto, + NotificationSubmissionUpdateDto, +} from './notification-submission.dto'; +import { NotificationSubmission } from './notification-submission.entity'; + +@Injectable() +export class NotificationSubmissionService { + private logger: Logger = new Logger(NotificationSubmissionService.name); + + private DEFAULT_RELATIONS: FindOptionsRelations = { + createdBy: true, + transferees: { + type: true, + }, + parcels: true, + }; + + constructor( + @InjectRepository(NotificationSubmission) + private notificationSubmissionRepository: Repository, + private notificationService: NotificationService, + private localGovernmentService: LocalGovernmentService, + private fileNumberService: FileNumberService, + @InjectMapper() private mapper: Mapper, + ) {} + + async getOrFailByFileNumber(fileNumber: string) { + return await this.notificationSubmissionRepository.findOneOrFail({ + where: { + fileNumber, + }, + relations: this.DEFAULT_RELATIONS, + }); + } + + async create(type: string, createdBy: User) { + const fileNumber = await this.fileNumberService.generateNextFileNumber(); + + await this.notificationService.create({ + fileNumber, + applicant: FALLBACK_APPLICANT_NAME, + typeCode: type, + }); + + const noiSubmission = new NotificationSubmission({ + fileNumber, + typeCode: type, + createdBy, + }); + + const savedSubmission = await this.notificationSubmissionRepository.save( + noiSubmission, + ); + + // await this.noticeOfIntentSubmissionStatusService.setInitialStatuses( + // savedSubmission.uuid, + // ); + + return fileNumber; + } + + async update( + submissionUuid: string, + updateDto: NotificationSubmissionUpdateDto, + user: User, + ) { + const notificationSubmission = await this.getByUuid(submissionUuid, user); + + notificationSubmission.applicant = updateDto.applicant; + notificationSubmission.purpose = filterUndefined( + updateDto.purpose, + notificationSubmission.purpose, + ); + notificationSubmission.localGovernmentUuid = updateDto.localGovernmentUuid; + + await this.notificationSubmissionRepository.save(notificationSubmission); + + if (updateDto.localGovernmentUuid) { + await this.notificationService.update(notificationSubmission.fileNumber, { + localGovernmentUuid: updateDto.localGovernmentUuid, + }); + } + + return this.getByUuid(submissionUuid, user); + } + + async getFileNumber(submissionUuid: string) { + const submission = await this.notificationSubmissionRepository.findOne({ + where: { + uuid: submissionUuid, + }, + select: { + uuid: true, + fileNumber: true, + }, + }); + return submission?.fileNumber; + } + + async getAllByUser(user: User) { + const whereClauses = await this.generateWhereClauses({}, user); + + return this.notificationSubmissionRepository.find({ + where: whereClauses, + order: { + auditUpdatedAt: 'DESC', + }, + relations: this.DEFAULT_RELATIONS, + }); + } + + async getByFileNumber(fileNumber: string, user: User) { + const overlappingRoles = ROLES_ALLOWED_APPLICATIONS.filter((value) => + user.clientRoles!.includes(value), + ); + if (overlappingRoles.length > 0) { + return await this.getOrFailByFileNumber(fileNumber); + } + + const whereClauses = await this.generateWhereClauses( + { + fileNumber, + }, + user, + ); + + return this.notificationSubmissionRepository.findOneOrFail({ + where: whereClauses, + order: { + auditUpdatedAt: 'DESC', + }, + relations: this.DEFAULT_RELATIONS, + }); + } + + async getByUuid(uuid: string, user: User) { + const overlappingRoles = ROLES_ALLOWED_APPLICATIONS.filter((value) => + user.clientRoles!.includes(value), + ); + if (overlappingRoles.length > 0) { + return await this.notificationSubmissionRepository.findOneOrFail({ + where: { + uuid, + }, + relations: { + ...this.DEFAULT_RELATIONS, + }, + }); + } + + const findOptions = await this.generateWhereClauses( + { + uuid, + }, + user, + ); + + return this.notificationSubmissionRepository.findOneOrFail({ + where: findOptions, + relations: { + ...this.DEFAULT_RELATIONS, + }, + order: { + auditUpdatedAt: 'DESC', + }, + }); + } + + private async generateWhereClauses( + searchOptions: FindOptionsWhere, + user: User, + ) { + const searchQueries: FindOptionsWhere[] = []; + + searchQueries.push({ + ...searchOptions, + createdBy: { + uuid: user.uuid, + }, + }); + + if (user.bceidBusinessGuid) { + searchQueries.push({ + ...searchOptions, + createdBy: { + bceidBusinessGuid: user.bceidBusinessGuid, + }, + }); + + const matchingLocalGovernment = + await this.localGovernmentService.getByGuid(user.bceidBusinessGuid); + if (matchingLocalGovernment) { + searchQueries.push({ + ...searchOptions, + localGovernmentUuid: matchingLocalGovernment.uuid, + notification: { + dateSubmittedToAlc: Not(IsNull()), + }, + }); + } + } + + return searchQueries; + } + + async mapToDTOs(submissions: NotificationSubmission[], user: User) { + const types = await this.notificationService.listTypes(); + + return submissions.map((noiSubmission) => { + const isCreator = noiSubmission.createdBy.uuid === user.uuid; + const isSameAccount = + user.bceidBusinessGuid && + noiSubmission.createdBy.bceidBusinessGuid === user.bceidBusinessGuid; + + return { + ...this.mapper.map( + noiSubmission, + NotificationSubmission, + NotificationSubmissionDto, + ), + type: types.find((type) => type.code === noiSubmission.typeCode)!.label, + canEdit: isCreator || isSameAccount, + canView: true, + }; + }); + } + + async mapToDetailedDTO( + notificationSubmission: NotificationSubmission, + user: User, + ) { + const types = await this.notificationService.listTypes(); + const mappedApp = this.mapper.map( + notificationSubmission, + NotificationSubmission, + NotificationSubmissionDetailedDto, + ); + const isCreator = notificationSubmission.createdBy.uuid === user.uuid; + const isSameAccount = + user.bceidBusinessGuid && + notificationSubmission.createdBy.bceidBusinessGuid === + user.bceidBusinessGuid; + + return { + ...mappedApp, + type: types.find((type) => type.code === notificationSubmission.typeCode)! + .label, + canEdit: isCreator || isSameAccount, + canView: true, + }; + } + + async submitToAlcs(notificationSubmission: NotificationSubmission) { + try { + const submittedNotification = await this.notificationService.submit({ + fileNumber: notificationSubmission.fileNumber, + applicant: notificationSubmission.applicant!, + localGovernmentUuid: notificationSubmission.localGovernmentUuid!, + typeCode: notificationSubmission.typeCode, + dateSubmittedToAlc: new Date(), + }); + + // await this.noticeOfIntentSubmissionStatusService.setStatusDate( + // notificationSubmission.uuid, + // NOI_SUBMISSION_STATUS.SUBMITTED_TO_ALC, + // submittedNotification.dateSubmittedToAlc, + // ); + + return submittedNotification; + } catch (ex) { + this.logger.error(ex); + throw new BaseServiceException( + `Failed to submit notification: ${notificationSubmission.fileNumber}`, + ); + } + } + + async updateStatus( + uuid: string, + statusCode: NOI_SUBMISSION_STATUS, + effectiveDate?: Date | null, + ) { + const submission = await this.loadBarebonesSubmission(uuid); + // await this.noticeOfIntentSubmissionStatusService.setStatusDate( + // submission.uuid, + // statusCode, + // effectiveDate, + // ); + } + + async getStatus(code: NOI_SUBMISSION_STATUS) { + // return await this.noticeOfIntentStatusRepository.findOneOrFail({ + // where: { + // code, + // }, + // }); + } + + async cancel(submission: NotificationSubmission) { + // return await this.noticeOfIntentSubmissionStatusService.setStatusDate( + // noticeOfIntentSubmission.uuid, + // NOI_SUBMISSION_STATUS.CANCELLED, + // ); + } + + private loadBarebonesSubmission(uuid: string) { + //Load submission without relations to prevent save from crazy cascading + return this.notificationSubmissionRepository.findOneOrFail({ + where: { + uuid, + }, + }); + } +} diff --git a/services/apps/alcs/src/portal/notification-submission/notification-transferee/notification-transferee.controller.spec.ts b/services/apps/alcs/src/portal/notification-submission/notification-transferee/notification-transferee.controller.spec.ts new file mode 100644 index 0000000000..87fed7ade8 --- /dev/null +++ b/services/apps/alcs/src/portal/notification-submission/notification-transferee/notification-transferee.controller.spec.ts @@ -0,0 +1,202 @@ +import { classes } from '@automapper/classes'; +import { AutomapperModule } from '@automapper/nestjs'; +import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; +import { BadRequestException } from '@nestjs/common'; +import { Test, TestingModule } from '@nestjs/testing'; +import { ClsService } from 'nestjs-cls'; +import { mockKeyCloakProviders } from '../../../../test/mocks/mockTypes'; +import { NoticeOfIntentDocumentService } from '../../../alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.service'; +import { NotificationTransfereeProfile } from '../../../common/automapper/notification-transferee.automapper.profile'; +import { DocumentService } from '../../../document/document.service'; +import { NotificationSubmission } from '../notification-submission.entity'; +import { NotificationSubmissionService } from '../notification-submission.service'; +import { NotificationTransfereeController } from './notification-transferee.controller'; +import { NotificationTransferee } from './notification-transferee.entity'; +import { NotificationTransfereeService } from './notification-transferee.service'; + +describe('NotificationTransfereeController', () => { + let controller: NotificationTransfereeController; + let mockNOISubmissionService: DeepMocked; + let mockOwnerService: DeepMocked; + let mockDocumentService: DeepMocked; + let mockNOIDocumentService: DeepMocked; + + beforeEach(async () => { + mockNOISubmissionService = createMock(); + mockOwnerService = createMock(); + mockDocumentService = createMock(); + mockNOIDocumentService = createMock(); + + const module: TestingModule = await Test.createTestingModule({ + imports: [ + AutomapperModule.forRoot({ + strategyInitializer: classes(), + }), + ], + controllers: [NotificationTransfereeController], + providers: [ + { + provide: NotificationSubmissionService, + useValue: mockNOISubmissionService, + }, + { + provide: NotificationTransfereeService, + useValue: mockOwnerService, + }, + { + provide: DocumentService, + useValue: mockDocumentService, + }, + { + provide: NoticeOfIntentDocumentService, + useValue: mockNOIDocumentService, + }, + { + provide: ClsService, + useValue: {}, + }, + NotificationTransfereeProfile, + ...mockKeyCloakProviders, + ], + }).compile(); + + controller = module.get( + NotificationTransfereeController, + ); + }); + + it('should be defined', () => { + expect(controller).toBeDefined(); + }); + + it('should verify access before fetching applications and map displayName', async () => { + const transferee = new NotificationTransferee({ + firstName: 'Bruce', + lastName: 'Wayne', + }); + mockNOISubmissionService.getByUuid.mockResolvedValue( + new NotificationSubmission({ + transferees: [transferee], + }), + ); + + const owners = await controller.fetchByFileId('', { + user: { + entity: {}, + }, + }); + + expect(owners.length).toEqual(1); + expect(owners[0].displayName).toBe('Bruce Wayne'); + expect(mockNOISubmissionService.getByUuid).toHaveBeenCalledTimes(1); + }); + + it('should verify the dto and file access then create', async () => { + const owner = new NotificationTransferee({ + firstName: 'Bruce', + lastName: 'Wayne', + }); + mockNOISubmissionService.getByUuid.mockResolvedValue( + new NotificationSubmission(), + ); + mockOwnerService.create.mockResolvedValue(owner); + + const createdOwner = await controller.create( + { + firstName: 'B', + lastName: 'W', + notificationSubmissionUuid: '', + email: '', + phoneNumber: '', + typeCode: 'INDV', + }, + { + user: { + entity: {}, + }, + }, + ); + + expect(createdOwner).toBeDefined(); + expect(mockNOISubmissionService.getByUuid).toHaveBeenCalledTimes(1); + expect(mockOwnerService.create).toHaveBeenCalledTimes(1); + }); + + it('should throw an exception when creating an individual owner without first name', async () => { + const promise = controller.create( + { + lastName: 'W', + notificationSubmissionUuid: '', + email: '', + phoneNumber: '', + typeCode: 'INDV', + }, + { + user: { + entity: {}, + }, + }, + ); + await expect(promise).rejects.toMatchObject( + new BadRequestException('Individuals require both first and last name'), + ); + }); + + it('should throw an exception when creating an organization an org name', async () => { + const promise = controller.create( + { + notificationSubmissionUuid: '', + email: '', + phoneNumber: '', + typeCode: 'ORGZ', + }, + { + user: { + entity: {}, + }, + }, + ); + await expect(promise).rejects.toMatchObject( + new BadRequestException('Organizations must have an organizationName'), + ); + }); + + it('should call through for update', async () => { + mockOwnerService.update.mockResolvedValue(new NotificationTransferee()); + + const res = await controller.update( + '', + { + organizationName: 'orgName', + email: '', + phoneNumber: '', + typeCode: 'ORGZ', + }, + { + user: { + entity: {}, + }, + }, + ); + + expect(mockOwnerService.update).toHaveBeenCalledTimes(1); + }); + + it('should call through for delete', async () => { + mockOwnerService.delete.mockResolvedValue({} as any); + mockOwnerService.getOwner.mockResolvedValue(new NotificationTransferee()); + mockNOISubmissionService.getByUuid.mockResolvedValue( + new NotificationSubmission(), + ); + + await controller.delete('', { + user: { + entity: {}, + }, + }); + + expect(mockNOISubmissionService.getByUuid).toHaveBeenCalledTimes(1); + expect(mockOwnerService.delete).toHaveBeenCalledTimes(1); + expect(mockOwnerService.getOwner).toHaveBeenCalledTimes(1); + }); +}); diff --git a/services/apps/alcs/src/portal/notification-submission/notification-transferee/notification-transferee.controller.ts b/services/apps/alcs/src/portal/notification-submission/notification-transferee/notification-transferee.controller.ts new file mode 100644 index 0000000000..1262329846 --- /dev/null +++ b/services/apps/alcs/src/portal/notification-submission/notification-transferee/notification-transferee.controller.ts @@ -0,0 +1,137 @@ +import { Mapper } from '@automapper/core'; +import { InjectMapper } from '@automapper/nestjs'; +import { + BadRequestException, + Body, + Controller, + Delete, + Get, + Param, + Patch, + Post, + Req, + UseGuards, +} from '@nestjs/common'; +import { PortalAuthGuard } from '../../../common/authorization/portal-auth-guard.service'; +import { OWNER_TYPE } from '../../../common/owner-type/owner-type.entity'; +import { + NoticeOfIntentOwnerCreateDto, + NoticeOfIntentOwnerUpdateDto, +} from '../../notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.dto'; +import { NotificationSubmissionService } from '../notification-submission.service'; +import { + NotificationTransfereeCreateDto, + NotificationTransfereeDto, + NotificationTransfereeUpdateDto, +} from './notification-transferee.dto'; +import { NotificationTransferee } from './notification-transferee.entity'; +import { NotificationTransfereeService } from './notification-transferee.service'; + +@Controller('srw-transferee') +@UseGuards(PortalAuthGuard) +export class NotificationTransfereeController { + constructor( + private ownerService: NotificationTransfereeService, + private notificationSubmissionService: NotificationSubmissionService, + @InjectMapper() private mapper: Mapper, + ) {} + + @Get('submission/:submissionUuid') + async fetchByFileId( + @Param('submissionUuid') submissionUuid: string, + @Req() req, + ): Promise { + const notificationSubmission = + await this.notificationSubmissionService.getByUuid( + submissionUuid, + req.user.entity, + ); + + return this.mapper.mapArrayAsync( + notificationSubmission.transferees, + NotificationTransferee, + NotificationTransfereeDto, + ); + } + + @Post() + async create( + @Body() createDto: NotificationTransfereeCreateDto, + @Req() req, + ): Promise { + this.verifyDto(createDto); + + const noticeOfIntentSubmission = + await this.notificationSubmissionService.getByUuid( + createDto.notificationSubmissionUuid, + req.user.entity, + ); + const owner = await this.ownerService.create( + createDto, + noticeOfIntentSubmission, + ); + + return this.mapper.mapAsync( + owner, + NotificationTransferee, + NotificationTransfereeDto, + ); + } + + @Patch('/:uuid') + async update( + @Param('uuid') uuid: string, + @Body() updateDto: NotificationTransfereeUpdateDto, + @Req() req, + ) { + this.verifyDto(updateDto); + + const newParcel = await this.ownerService.update( + uuid, + updateDto, + req.user.entity, + ); + + return this.mapper.mapAsync( + newParcel, + NotificationTransferee, + NotificationTransfereeDto, + ); + } + + @Delete('/:uuid') + async delete(@Param('uuid') uuid: string, @Req() req) { + const owner = await this.verifyAccessAndGetOwner(req, uuid); + await this.ownerService.delete(owner, req.user.entity); + return { uuid }; + } + + private verifyDto( + dto: NoticeOfIntentOwnerUpdateDto | NoticeOfIntentOwnerCreateDto, + ) { + if ( + dto.typeCode === OWNER_TYPE.INDIVIDUAL && + (!dto.firstName || !dto.lastName) + ) { + throw new BadRequestException( + 'Individuals require both first and last name', + ); + } + + if (dto.typeCode === OWNER_TYPE.ORGANIZATION && !dto.organizationName) { + throw new BadRequestException( + 'Organizations must have an organizationName', + ); + } + } + + private async verifyAccessAndGetOwner(@Req() req, ownerUuid: string) { + const owner = await this.ownerService.getOwner(ownerUuid); + await this.notificationSubmissionService.getByUuid( + owner.notificationSubmissionUuid, + req.user.entity, + ); + + return owner; + } +} diff --git a/services/apps/alcs/src/portal/notification-submission/notification-transferee/notification-transferee.dto.ts b/services/apps/alcs/src/portal/notification-submission/notification-transferee/notification-transferee.dto.ts new file mode 100644 index 0000000000..c6441130de --- /dev/null +++ b/services/apps/alcs/src/portal/notification-submission/notification-transferee/notification-transferee.dto.ts @@ -0,0 +1,63 @@ +import { AutoMap } from '@automapper/classes'; +import { IsOptional, IsString, Matches } from 'class-validator'; +import { OwnerTypeDto } from '../../../common/owner-type/owner-type.entity'; +import { emailRegex } from '../../../utils/email.helper'; + +export class NotificationTransfereeDto { + @AutoMap() + uuid: string; + + @AutoMap() + notificationSubmissionUuid: string; + + displayName: string; + + @AutoMap(() => String) + firstName?: string | null; + + @AutoMap(() => String) + lastName?: string | null; + + @AutoMap(() => String) + organizationName?: string | null; + + @AutoMap(() => String) + phoneNumber?: string | null; + + @AutoMap(() => String) + email?: string | null; + + @AutoMap() + type: OwnerTypeDto; +} + +export class NotificationTransfereeUpdateDto { + @IsString() + @IsOptional() + firstName?: string; + + @IsString() + @IsOptional() + lastName?: string; + + @IsString() + @IsOptional() + organizationName?: string; + + @IsString() + @IsOptional() + phoneNumber?: string; + + @Matches(emailRegex) + @IsOptional() + email?: string; + + @IsString() + @IsOptional() + typeCode?: string; +} + +export class NotificationTransfereeCreateDto extends NotificationTransfereeUpdateDto { + @IsString() + notificationSubmissionUuid: string; +} diff --git a/services/apps/alcs/src/portal/notification-submission/notification-transferee/notification-transferee.entity.ts b/services/apps/alcs/src/portal/notification-submission/notification-transferee/notification-transferee.entity.ts new file mode 100644 index 0000000000..4913dd4981 --- /dev/null +++ b/services/apps/alcs/src/portal/notification-submission/notification-transferee/notification-transferee.entity.ts @@ -0,0 +1,61 @@ +import { AutoMap } from '@automapper/classes'; +import { Column, Entity, ManyToOne } from 'typeorm'; +import { Base } from '../../../common/entities/base.entity'; +import { OwnerType } from '../../../common/owner-type/owner-type.entity'; +import { NotificationSubmission } from '../notification-submission.entity'; + +@Entity() +export class NotificationTransferee extends Base { + constructor(data?: Partial) { + super(); + if (data) { + Object.assign(this, data); + } + } + + @AutoMap(() => String) + @Column({ + type: 'varchar', + nullable: true, + }) + firstName?: string | null; + + @AutoMap(() => String) + @Column({ + type: 'varchar', + nullable: true, + }) + lastName?: string | null; + + @AutoMap(() => String) + @Column({ + type: 'varchar', + nullable: true, + }) + organizationName?: string | null; + + @AutoMap(() => String) + @Column({ + type: 'varchar', + nullable: true, + }) + phoneNumber?: string | null; + + @AutoMap(() => String) + @Column({ + type: 'varchar', + nullable: true, + }) + email?: string | null; + + @AutoMap() + @ManyToOne(() => OwnerType, { nullable: false }) + type: OwnerType; + + @ManyToOne(() => NotificationSubmission, { nullable: false }) + notificationSubmission: NotificationSubmission; + + @AutoMap() + @Column() + notificationSubmissionUuid: string; +} diff --git a/services/apps/alcs/src/portal/notification-submission/notification-transferee/notification-transferee.service.spec.ts b/services/apps/alcs/src/portal/notification-submission/notification-transferee/notification-transferee.service.spec.ts new file mode 100644 index 0000000000..822dd90d5e --- /dev/null +++ b/services/apps/alcs/src/portal/notification-submission/notification-transferee/notification-transferee.service.spec.ts @@ -0,0 +1,217 @@ +import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; +import { Test, TestingModule } from '@nestjs/testing'; +import { getRepositoryToken } from '@nestjs/typeorm'; +import { Repository } from 'typeorm'; +import { NotificationService } from '../../../alcs/notification/notification.service'; +import { OwnerType } from '../../../common/owner-type/owner-type.entity'; +import { User } from '../../../user/user.entity'; +import { NotificationSubmission } from '../notification-submission.entity'; +import { NotificationSubmissionService } from '../notification-submission.service'; +import { NotificationTransferee } from './notification-transferee.entity'; +import { NotificationTransfereeService } from './notification-transferee.service'; + +describe('NotificationTransfereeService', () => { + let service: NotificationTransfereeService; + let mockRepo: DeepMocked>; + let mockTypeRepo: DeepMocked>; + let mockSubmissionService: DeepMocked; + let mockNotificationService: DeepMocked; + + beforeEach(async () => { + mockRepo = createMock(); + mockTypeRepo = createMock(); + mockSubmissionService = createMock(); + mockNotificationService = createMock(); + + const module: TestingModule = await Test.createTestingModule({ + providers: [ + NotificationTransfereeService, + { + provide: getRepositoryToken(NotificationTransferee), + useValue: mockRepo, + }, + { + provide: getRepositoryToken(OwnerType), + useValue: mockTypeRepo, + }, + { + provide: NotificationSubmissionService, + useValue: mockSubmissionService, + }, + { + provide: NotificationService, + useValue: mockNotificationService, + }, + ], + }).compile(); + + service = module.get( + NotificationTransfereeService, + ); + mockSubmissionService.update.mockResolvedValue( + new NotificationSubmission(), + ); + mockNotificationService.updateApplicant.mockResolvedValue(); + mockSubmissionService.getFileNumber.mockResolvedValue('file-number'); + }); + + it('should be defined', () => { + expect(service).toBeDefined(); + }); + + it('should call find for find', async () => { + mockRepo.find.mockResolvedValue([new NotificationTransferee()]); + + await service.fetchByFileId(''); + + expect(mockRepo.find).toHaveBeenCalledTimes(1); + }); + + it('should load the type and then call save for create', async () => { + mockRepo.save.mockResolvedValue(new NotificationTransferee()); + mockTypeRepo.findOneOrFail.mockResolvedValue(new OwnerType()); + + await service.create( + { + notificationSubmissionUuid: '', + email: '', + phoneNumber: '', + typeCode: '', + }, + new NotificationSubmission(), + ); + + expect(mockRepo.save).toHaveBeenCalledTimes(1); + expect(mockTypeRepo.findOneOrFail).toHaveBeenCalledTimes(1); + }); + + it('should set properties and call save for update', async () => { + const owner = new NotificationTransferee({ + firstName: 'Bruce', + lastName: 'Wayne', + }); + mockRepo.findOneOrFail.mockResolvedValue(owner); + mockRepo.save.mockResolvedValue(new NotificationTransferee()); + mockRepo.find.mockResolvedValue([new NotificationTransferee()]); + + await service.update( + '', + { + firstName: 'I Am', + lastName: 'Batman', + email: '', + phoneNumber: '', + typeCode: '', + }, + new User(), + ); + + expect(owner.firstName).toEqual('I Am'); + expect(owner.lastName).toEqual('Batman'); + expect(mockRepo.findOneOrFail).toHaveBeenCalledTimes(1); + expect(mockRepo.save).toHaveBeenCalledTimes(1); + }); + + it('should call through for delete', async () => { + mockRepo.remove.mockResolvedValue({} as any); + mockRepo.find.mockResolvedValue([new NotificationTransferee()]); + + await service.delete(new NotificationTransferee(), new User()); + + expect(mockRepo.remove).toHaveBeenCalledTimes(1); + }); + + it('should call through for verify', async () => { + mockRepo.findOneOrFail.mockResolvedValue(new NotificationTransferee()); + + await service.getOwner(''); + + expect(mockRepo.findOneOrFail).toHaveBeenCalledTimes(1); + }); + + it('should call through for getMany', async () => { + mockRepo.find.mockResolvedValue([new NotificationTransferee()]); + + await service.getMany([]); + + expect(mockRepo.find).toHaveBeenCalledTimes(1); + }); + + it('should call through for save', async () => { + mockRepo.save.mockResolvedValue(new NotificationTransferee()); + + await service.save(new NotificationTransferee()); + + expect(mockRepo.save).toHaveBeenCalledTimes(1); + }); + + it('should call update with the first transferees last name', async () => { + mockRepo.find.mockResolvedValue([ + new NotificationTransferee({ + firstName: 'B', + lastName: 'A', + }), + ]); + + await service.updateSubmissionApplicant('', new User()); + + expect(mockSubmissionService.update).toHaveBeenCalledTimes(1); + expect(mockSubmissionService.update.mock.calls[0][1].applicant).toEqual( + 'A', + ); + expect(mockSubmissionService.getFileNumber).toHaveBeenCalledTimes(1); + expect(mockNotificationService.updateApplicant).toHaveBeenCalledTimes(1); + }); + + it('should call update with the first owners last name', async () => { + const transferees = [ + new NotificationTransferee({ + firstName: 'F', + lastName: 'B', + }), + new NotificationTransferee({ + firstName: 'F', + lastName: 'A', + }), + new NotificationTransferee({ + firstName: 'F', + lastName: '1', + }), + new NotificationTransferee({ + firstName: 'F', + lastName: 'C', + }), + ]; + mockRepo.find.mockResolvedValue(transferees); + + await service.updateSubmissionApplicant('', new User()); + + expect(mockSubmissionService.update).toHaveBeenCalledTimes(1); + expect(mockSubmissionService.update.mock.calls[0][1].applicant).toEqual( + 'A et al.', + ); + expect(mockSubmissionService.getFileNumber).toHaveBeenCalledTimes(1); + expect(mockNotificationService.updateApplicant).toHaveBeenCalledTimes(1); + }); + + it('should call update with the number owners last name', async () => { + const transferees = [ + new NotificationTransferee({ + firstName: '1', + lastName: '1', + }), + new NotificationTransferee({ + firstName: '2', + lastName: '2', + }), + ]; + mockRepo.find.mockResolvedValue(transferees); + + await service.updateSubmissionApplicant('', new User()); + + expect(mockSubmissionService.update).toHaveBeenCalledTimes(1); + expect(mockSubmissionService.update.mock.calls[0][1].applicant).toEqual( + '1 et al.', + ); + }); +}); diff --git a/services/apps/alcs/src/portal/notification-submission/notification-transferee/notification-transferee.service.ts b/services/apps/alcs/src/portal/notification-submission/notification-transferee/notification-transferee.service.ts new file mode 100644 index 0000000000..9359664545 --- /dev/null +++ b/services/apps/alcs/src/portal/notification-submission/notification-transferee/notification-transferee.service.ts @@ -0,0 +1,196 @@ +import { forwardRef, Inject, Injectable } from '@nestjs/common'; +import { InjectRepository } from '@nestjs/typeorm'; +import { Any, Repository } from 'typeorm'; +import { NotificationService } from '../../../alcs/notification/notification.service'; +import { OwnerType } from '../../../common/owner-type/owner-type.entity'; +import { User } from '../../../user/user.entity'; +import { FALLBACK_APPLICANT_NAME } from '../../../utils/owner.constants'; +import { NotificationSubmission } from '../notification-submission.entity'; +import { NotificationSubmissionService } from '../notification-submission.service'; +import { + NotificationTransfereeCreateDto, + NotificationTransfereeUpdateDto, +} from './notification-transferee.dto'; +import { NotificationTransferee } from './notification-transferee.entity'; + +@Injectable() +export class NotificationTransfereeService { + constructor( + @InjectRepository(NotificationTransferee) + private repository: Repository, + @InjectRepository(OwnerType) + private typeRepository: Repository, + @Inject(forwardRef(() => NotificationSubmissionService)) + private notificationSubmissionService: NotificationSubmissionService, + private notificationService: NotificationService, + ) {} + + async fetchByFileId(fileId: string) { + return this.repository.find({ + where: { + notificationSubmission: { + fileNumber: fileId, + }, + }, + relations: { + type: true, + }, + }); + } + + async create( + createDto: NotificationTransfereeCreateDto, + notificationSubmission: NotificationSubmission, + ) { + const type = await this.typeRepository.findOneOrFail({ + where: { + code: createDto.typeCode, + }, + }); + + const newOwner = new NotificationTransferee({ + firstName: createDto.firstName, + lastName: createDto.lastName, + organizationName: createDto.organizationName, + email: createDto.email, + phoneNumber: createDto.phoneNumber, + notificationSubmission: notificationSubmission, + type, + }); + + return await this.repository.save(newOwner); + } + + async save(owner: NotificationTransferee) { + await this.repository.save(owner); + } + + async update( + uuid: string, + updateDto: NotificationTransfereeUpdateDto, + user: User, + ) { + const existingOwner = await this.repository.findOneOrFail({ + where: { + uuid, + }, + }); + + if (updateDto.typeCode) { + existingOwner.type = await this.typeRepository.findOneOrFail({ + where: { + code: updateDto.typeCode, + }, + }); + } + existingOwner.organizationName = + updateDto.organizationName !== undefined + ? updateDto.organizationName + : existingOwner.organizationName; + + existingOwner.firstName = + updateDto.firstName !== undefined + ? updateDto.firstName + : existingOwner.firstName; + + existingOwner.lastName = + updateDto.lastName !== undefined + ? updateDto.lastName + : existingOwner.lastName; + + existingOwner.phoneNumber = + updateDto.phoneNumber !== undefined + ? updateDto.phoneNumber + : existingOwner.phoneNumber; + + existingOwner.email = + updateDto.email !== undefined ? updateDto.email : existingOwner.email; + + await this.updateSubmissionApplicant( + existingOwner.notificationSubmissionUuid, + user, + ); + + return await this.repository.save(existingOwner); + } + + async delete(owner: NotificationTransferee, user: User) { + const res = await this.repository.remove(owner); + await this.updateSubmissionApplicant( + owner.notificationSubmissionUuid, + user, + ); + return res; + } + + async getOwner(ownerUuid: string) { + return await this.repository.findOneOrFail({ + where: { + uuid: ownerUuid, + }, + relations: { + type: true, + }, + }); + } + + async getMany(ownerUuids: string[]) { + return await this.repository.find({ + where: { + uuid: Any(ownerUuids), + }, + }); + } + + async updateSubmissionApplicant(submissionUuid: string, user: User) { + const transferees = await this.repository.find({ + where: { + notificationSubmissionUuid: submissionUuid, + }, + }); + + //Filter to only alphabetic + const alphabetOwners = transferees.filter((owner) => + isNaN( + parseInt((owner.organizationName ?? owner.lastName ?? '').charAt(0)), + ), + ); + + //If no alphabetic use them all + if (alphabetOwners.length === 0) { + alphabetOwners.push(...transferees); + } + + const firstOwner = alphabetOwners.sort((a, b) => { + const mappedA = a.organizationName ?? a.lastName ?? ''; + const mappedB = b.organizationName ?? b.lastName ?? ''; + return mappedA.localeCompare(mappedB); + })[0]; + if (firstOwner) { + let applicantName = firstOwner.organizationName + ? firstOwner.organizationName + : firstOwner.lastName; + if (transferees.length > 1) { + applicantName += ' et al.'; + } + + await this.notificationSubmissionService.update( + submissionUuid, + { + applicant: applicantName || '', + }, + user, + ); + + const fileNumber = await this.notificationSubmissionService.getFileNumber( + submissionUuid, + ); + if (fileNumber) { + await this.notificationService.updateApplicant( + fileNumber, + applicantName || FALLBACK_APPLICANT_NAME, + ); + } + } + } +} diff --git a/services/apps/alcs/src/portal/portal.module.ts b/services/apps/alcs/src/portal/portal.module.ts index 1819e29a5b..89269be6d1 100644 --- a/services/apps/alcs/src/portal/portal.module.ts +++ b/services/apps/alcs/src/portal/portal.module.ts @@ -18,6 +18,7 @@ import { NoticeOfIntentSubmissionDraftModule } from './notice-of-intent-submissi import { NoticeOfIntentSubmissionModule } from './notice-of-intent-submission/notice-of-intent-submission.module'; import { ParcelModule } from './parcel/parcel.module'; import { PdfGenerationModule } from './pdf-generation/pdf-generation.module'; +import { NotificationSubmissionModule } from './notification-submission/notification-submission.module'; @Module({ imports: [ @@ -38,6 +39,7 @@ import { PdfGenerationModule } from './pdf-generation/pdf-generation.module'; PortalNoticeOfIntentDocumentModule, NoticeOfIntentSubmissionDraftModule, PortalNoticeOfIntentDecisionModule, + NotificationSubmissionModule, RouterModule.register([ { path: 'portal', module: ApplicationSubmissionModule }, { path: 'portal', module: NoticeOfIntentSubmissionModule }, @@ -51,6 +53,7 @@ import { PdfGenerationModule } from './pdf-generation/pdf-generation.module'; { path: 'portal', module: PortalNoticeOfIntentDocumentModule }, { path: 'portal', module: NoticeOfIntentSubmissionDraftModule }, { path: 'portal', module: PortalNoticeOfIntentDecisionModule }, + { path: 'portal', module: NotificationSubmissionModule }, ]), ], controllers: [CodeController], diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1693608113088-add_notifications.ts b/services/apps/alcs/src/providers/typeorm/migrations/1693608113088-add_notifications.ts new file mode 100644 index 0000000000..755ef69164 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1693608113088-add_notifications.ts @@ -0,0 +1,170 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class addNotifications1693608113088 implements MigrationInterface { + name = 'addNotifications1693608113088'; + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query(` + ALTER INDEX "alcs"."PK_b9fa421f94f7707ba109bf73b82" RENAME TO "PK_b9fa421f94fba109bf73b82"; + `); + await queryRunner.query( + `ALTER TABLE "alcs"."message" DROP CONSTRAINT "FK_fc0e9a26b0a8f7c76658ca1c6ca"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."message" DROP CONSTRAINT "FK_b776eec36c2a6b6879c14241e91"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_parcel" DROP CONSTRAINT "FK_33f7b06b2c4e0e128d670526c66"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_parcel" DROP CONSTRAINT "FK_7b23cfdc8574f66dd2f88e37f3f"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_parcel_ownership_type" RENAME TO "parcel_ownership_type"`, + ); + await queryRunner.query( + `CREATE TABLE "alcs"."notification_type" ("audit_deleted_date_at" TIMESTAMP WITH TIME ZONE, "audit_created_at" TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now(), "audit_updated_at" TIMESTAMP WITH TIME ZONE DEFAULT now(), "audit_created_by" character varying NOT NULL, "audit_updated_by" character varying, "label" character varying NOT NULL, "code" text NOT NULL, "description" text NOT NULL, "short_label" character varying NOT NULL, "html_description" text NOT NULL DEFAULT '', "portal_label" text NOT NULL DEFAULT '', CONSTRAINT "UQ_4c3787562f347d8d0ff63aa1a58" UNIQUE ("description"), CONSTRAINT "PK_585e07520c840e791dcfb7da013" PRIMARY KEY ("code"))`, + ); + await queryRunner.query( + `CREATE TABLE "alcs"."notification" ("audit_deleted_date_at" TIMESTAMP WITH TIME ZONE, "audit_created_at" TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now(), "audit_updated_at" TIMESTAMP WITH TIME ZONE DEFAULT now(), "audit_created_by" character varying NOT NULL, "audit_updated_by" character varying, "uuid" uuid NOT NULL DEFAULT gen_random_uuid(), "file_number" character varying NOT NULL, "applicant" character varying NOT NULL, "card_uuid" uuid, "local_government_uuid" uuid, "region_code" text, "summary" text, "date_submitted_to_alc" TIMESTAMP WITH TIME ZONE, "staff_observations" text, "type_code" text NOT NULL, CONSTRAINT "UQ_2b146911206953684d622397340" UNIQUE ("file_number"), CONSTRAINT "REL_ea8f1884038f559b573689d8de" UNIQUE ("card_uuid"), CONSTRAINT "PK_b9fa421f94f7707ba109bf73b82" PRIMARY KEY ("uuid")); COMMENT ON COLUMN "alcs"."notification"."staff_observations" IS 'ALC Staff Observations and Comments'`, + ); + await queryRunner.query( + `CREATE INDEX "IDX_2b146911206953684d62239734" ON "alcs"."notification" ("file_number") `, + ); + await queryRunner.query( + `CREATE INDEX "IDX_8a9fed11ce76672d806ac8b4b6" ON "alcs"."notification" ("local_government_uuid") `, + ); + await queryRunner.query( + `CREATE TABLE "alcs"."notification_parcel" ("audit_deleted_date_at" TIMESTAMP WITH TIME ZONE, "audit_created_at" TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now(), "audit_updated_at" TIMESTAMP WITH TIME ZONE DEFAULT now(), "audit_created_by" character varying NOT NULL, "audit_updated_by" character varying, "uuid" uuid NOT NULL DEFAULT gen_random_uuid(), "pid" character varying, "pin" character varying, "legal_description" character varying, "civic_address" character varying, "map_area_hectares" double precision, "is_confirmed_by_applicant" boolean NOT NULL DEFAULT false, "ownership_type_code" text, "notification_submission_uuid" uuid NOT NULL, CONSTRAINT "PK_0f33b7df283efdcfdb0ceceb11b" PRIMARY KEY ("uuid")); COMMENT ON COLUMN "alcs"."notification_parcel"."pid" IS 'The Parcels pid entered by the user or populated from third-party data'; COMMENT ON COLUMN "alcs"."notification_parcel"."pin" IS 'The Parcels pin entered by the user or populated from third-party data'; COMMENT ON COLUMN "alcs"."notification_parcel"."legal_description" IS 'The Parcels legalDescription entered by the user or populated from third-party data'; COMMENT ON COLUMN "alcs"."notification_parcel"."civic_address" IS 'The standard address for the parcel'; COMMENT ON COLUMN "alcs"."notification_parcel"."map_area_hectares" IS 'The Parcels map are in hectares entered by the user or populated from third-party data'; COMMENT ON COLUMN "alcs"."notification_parcel"."is_confirmed_by_applicant" IS 'The Parcels indication whether applicant signed off provided data including the Certificate of Title'`, + ); + await queryRunner.query( + `CREATE TABLE "alcs"."notification_transferee" ("audit_deleted_date_at" TIMESTAMP WITH TIME ZONE, "audit_created_at" TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now(), "audit_updated_at" TIMESTAMP WITH TIME ZONE DEFAULT now(), "audit_created_by" character varying NOT NULL, "audit_updated_by" character varying, "uuid" uuid NOT NULL DEFAULT gen_random_uuid(), "first_name" character varying, "last_name" character varying, "organization_name" character varying, "phone_number" character varying, "email" character varying, "notification_submission_uuid" uuid NOT NULL, "type_code" text NOT NULL, CONSTRAINT "PK_77e372de24341033c6f1242135d" PRIMARY KEY ("uuid"))`, + ); + await queryRunner.query( + `CREATE TABLE "alcs"."notification_submission" ("audit_deleted_date_at" TIMESTAMP WITH TIME ZONE, "audit_created_at" TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now(), "audit_updated_at" TIMESTAMP WITH TIME ZONE DEFAULT now(), "audit_created_by" character varying NOT NULL, "audit_updated_by" character varying, "uuid" uuid NOT NULL DEFAULT gen_random_uuid(), "file_number" character varying NOT NULL, "applicant" character varying, "local_government_uuid" uuid, "purpose" character varying, "type_code" character varying NOT NULL, "created_by_uuid" uuid, CONSTRAINT "PK_31d1568857de3aeec7cf5c8ad34" PRIMARY KEY ("uuid")); COMMENT ON COLUMN "alcs"."notification_submission"."file_number" IS 'File Number of attached SRW'; COMMENT ON COLUMN "alcs"."notification_submission"."applicant" IS 'The Applicants name on the application'; COMMENT ON COLUMN "alcs"."notification_submission"."local_government_uuid" IS 'UUID of the Local Government'; COMMENT ON COLUMN "alcs"."notification_submission"."purpose" IS 'The purpose of the application'; COMMENT ON COLUMN "alcs"."notification_submission"."type_code" IS 'SRW Type Code'`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."message" ADD CONSTRAINT "FK_f9d295dbeac38c6b05f0994b415" FOREIGN KEY ("actor_uuid") REFERENCES "alcs"."user"("uuid") ON DELETE NO ACTION ON UPDATE NO ACTION`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."message" ADD CONSTRAINT "FK_23212dcb31290e8972bd4e8aa4d" FOREIGN KEY ("receiver_uuid") REFERENCES "alcs"."user"("uuid") ON DELETE NO ACTION ON UPDATE NO ACTION`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notification" ADD CONSTRAINT "FK_ea8f1884038f559b573689d8de2" FOREIGN KEY ("card_uuid") REFERENCES "alcs"."card"("uuid") ON DELETE NO ACTION ON UPDATE NO ACTION`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notification" ADD CONSTRAINT "FK_8a9fed11ce76672d806ac8b4b6f" FOREIGN KEY ("local_government_uuid") REFERENCES "alcs"."local_government"("uuid") ON DELETE NO ACTION ON UPDATE NO ACTION`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notification" ADD CONSTRAINT "FK_569fdffb2b9c20c938390abf6a3" FOREIGN KEY ("region_code") REFERENCES "alcs"."application_region"("code") ON DELETE NO ACTION ON UPDATE NO ACTION`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notification" ADD CONSTRAINT "FK_585e07520c840e791dcfb7da013" FOREIGN KEY ("type_code") REFERENCES "alcs"."notification_type"("code") ON DELETE NO ACTION ON UPDATE NO ACTION`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_parcel" ADD CONSTRAINT "FK_33f7b06b2c4e0e128d670526c66" FOREIGN KEY ("ownership_type_code") REFERENCES "alcs"."parcel_ownership_type"("code") ON DELETE NO ACTION ON UPDATE NO ACTION`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_parcel" ADD CONSTRAINT "FK_7b23cfdc8574f66dd2f88e37f3f" FOREIGN KEY ("ownership_type_code") REFERENCES "alcs"."parcel_ownership_type"("code") ON DELETE NO ACTION ON UPDATE NO ACTION`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notification_parcel" ADD CONSTRAINT "FK_ee3c1a069b76e3877ad5fbfa80e" FOREIGN KEY ("ownership_type_code") REFERENCES "alcs"."parcel_ownership_type"("code") ON DELETE NO ACTION ON UPDATE NO ACTION`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notification_parcel" ADD CONSTRAINT "FK_3286388e9f39a4342f302d8ebc4" FOREIGN KEY ("notification_submission_uuid") REFERENCES "alcs"."notification_submission"("uuid") ON DELETE NO ACTION ON UPDATE NO ACTION`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notification_transferee" ADD CONSTRAINT "FK_b7a59b609714919f65604e2ad96" FOREIGN KEY ("type_code") REFERENCES "alcs"."owner_type"("code") ON DELETE NO ACTION ON UPDATE NO ACTION`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notification_transferee" ADD CONSTRAINT "FK_300863f6b4601735373ea3f6142" FOREIGN KEY ("notification_submission_uuid") REFERENCES "alcs"."notification_submission"("uuid") ON DELETE NO ACTION ON UPDATE NO ACTION`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notification_submission" ADD CONSTRAINT "FK_99aed25adf97bc0591103e246c2" FOREIGN KEY ("created_by_uuid") REFERENCES "alcs"."user"("uuid") ON DELETE NO ACTION ON UPDATE NO ACTION`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notification_submission" ADD CONSTRAINT "FK_5ef174c63d20561082cda20da3b" FOREIGN KEY ("file_number") REFERENCES "alcs"."notification"("file_number") ON DELETE NO ACTION ON UPDATE NO ACTION`, + ); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `ALTER TABLE "alcs"."notification_submission" DROP CONSTRAINT "FK_5ef174c63d20561082cda20da3b"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notification_submission" DROP CONSTRAINT "FK_99aed25adf97bc0591103e246c2"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notification_transferee" DROP CONSTRAINT "FK_300863f6b4601735373ea3f6142"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notification_transferee" DROP CONSTRAINT "FK_b7a59b609714919f65604e2ad96"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notification_parcel" DROP CONSTRAINT "FK_3286388e9f39a4342f302d8ebc4"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notification_parcel" DROP CONSTRAINT "FK_ee3c1a069b76e3877ad5fbfa80e"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_parcel" DROP CONSTRAINT "FK_7b23cfdc8574f66dd2f88e37f3f"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_parcel" DROP CONSTRAINT "FK_33f7b06b2c4e0e128d670526c66"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notification" DROP CONSTRAINT "FK_585e07520c840e791dcfb7da013"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notification" DROP CONSTRAINT "FK_569fdffb2b9c20c938390abf6a3"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notification" DROP CONSTRAINT "FK_8a9fed11ce76672d806ac8b4b6f"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notification" DROP CONSTRAINT "FK_ea8f1884038f559b573689d8de2"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_decision" DROP CONSTRAINT "FK_d4a78fa6d709aace10890017271"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."message" DROP CONSTRAINT "FK_23212dcb31290e8972bd4e8aa4d"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."message" DROP CONSTRAINT "FK_f9d295dbeac38c6b05f0994b415"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_decision" ALTER COLUMN "outcome_code" DROP NOT NULL`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_decision" ADD CONSTRAINT "FK_d4a78fa6d709aace10890017271" FOREIGN KEY ("outcome_code") REFERENCES "alcs"."notice_of_intent_decision_outcome"("code") ON DELETE NO ACTION ON UPDATE NO ACTION`, + ); + await queryRunner.query(`DROP TABLE "alcs"."notification_submission"`); + await queryRunner.query(`DROP TABLE "alcs"."notification_transferee"`); + await queryRunner.query(`DROP TABLE "alcs"."notification_parcel"`); + + await queryRunner.query( + `ALTER TABLE "alcs"."parcel_ownership_type" RENAME TO "application_parcel_ownership_type"`, + ); + await queryRunner.query( + `DROP INDEX "alcs"."IDX_8a9fed11ce76672d806ac8b4b6"`, + ); + await queryRunner.query( + `DROP INDEX "alcs"."IDX_2b146911206953684d62239734"`, + ); + await queryRunner.query(`DROP TABLE "alcs"."notification"`); + await queryRunner.query(`DROP TABLE "alcs"."notification_type"`); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_parcel" ADD CONSTRAINT "FK_7b23cfdc8574f66dd2f88e37f3f" FOREIGN KEY ("ownership_type_code") REFERENCES "alcs"."notice_of_intent_parcel_ownership_type"("code") ON DELETE NO ACTION ON UPDATE NO ACTION`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_parcel" ADD CONSTRAINT "FK_33f7b06b2c4e0e128d670526c66" FOREIGN KEY ("ownership_type_code") REFERENCES "alcs"."application_parcel_ownership_type"("code") ON DELETE NO ACTION ON UPDATE NO ACTION`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."message" ADD CONSTRAINT "FK_b776eec36c2a6b6879c14241e91" FOREIGN KEY ("receiver_uuid") REFERENCES "alcs"."user"("uuid") ON DELETE NO ACTION ON UPDATE NO ACTION`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."message" ADD CONSTRAINT "FK_fc0e9a26b0a8f7c76658ca1c6ca" FOREIGN KEY ("actor_uuid") REFERENCES "alcs"."user"("uuid") ON DELETE NO ACTION ON UPDATE NO ACTION`, + ); + } +} diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1693610085203-seed_notification_tables.ts b/services/apps/alcs/src/providers/typeorm/migrations/1693610085203-seed_notification_tables.ts new file mode 100644 index 0000000000..9f27d572b3 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1693610085203-seed_notification_tables.ts @@ -0,0 +1,17 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class seedNotificationTables1693610085203 implements MigrationInterface { + name = 'seedNotificationTables1693610085203'; + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query(` + INSERT INTO "alcs"."notification_type" + ("audit_deleted_date_at", "audit_created_at", "audit_updated_at", "audit_created_by", "audit_updated_by", "label", "code", "description", "short_label", "html_description", "portal_label") VALUES + (NULL, NOW(), NULL, 'migration_seed', NULL, 'Statutory Right of Way', 'SRW', 'Statutory Right of Way', 'SRW', 'TODO', 'Statutory Right of Way'); + `); + } + + public async down(): Promise { + //Nope + } +} From 9a16ed1cdb12d68cb21cdbb3d36df6ce18572e5b Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Tue, 5 Sep 2023 10:20:33 -0700 Subject: [PATCH 335/954] Sort statuses by weight not date for Uncancel * Should be sorted by weight to get correct result --- .../uncancel-application-dialog.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alcs-frontend/src/app/features/application/overview/uncancel-application-dialog/uncancel-application-dialog.component.ts b/alcs-frontend/src/app/features/application/overview/uncancel-application-dialog/uncancel-application-dialog.component.ts index 7eea9e85d5..73a760218d 100644 --- a/alcs-frontend/src/app/features/application/overview/uncancel-application-dialog/uncancel-application-dialog.component.ts +++ b/alcs-frontend/src/app/features/application/overview/uncancel-application-dialog/uncancel-application-dialog.component.ts @@ -43,7 +43,7 @@ export class UncancelApplicationDialogComponent { status.statusTypeCode !== SUBMISSION_STATUS.CANCELLED && status.effectiveDate < Date.now() ) - .sort((a, b) => a.effectiveDate! - b.effectiveDate!); + .sort((a, b) => b.status.weight! - a.status.weight!); if (validStatuses && validStatuses.length > 0) { const validStatus = validStatuses[0].status; this.status = { From b84512cd3ba00c315c01ba2e8c280e57e98c8bb1 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Tue, 5 Sep 2023 11:13:17 -0700 Subject: [PATCH 336/954] Code Review Feedback --- .../create-submission-dialog.component.scss | 2 +- .../edit-submission/edit-submission.component.ts | 2 +- .../notification-submission.controller.ts | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/portal-frontend/src/app/features/create-submission-dialog/create-submission-dialog.component.scss b/portal-frontend/src/app/features/create-submission-dialog/create-submission-dialog.component.scss index 6589d81fb6..0c33e790ba 100644 --- a/portal-frontend/src/app/features/create-submission-dialog/create-submission-dialog.component.scss +++ b/portal-frontend/src/app/features/create-submission-dialog/create-submission-dialog.component.scss @@ -60,7 +60,7 @@ ul { } .srw-list { - margin-left: -24px; + margin-left: rem(-24); margin-bottom: 0; li { diff --git a/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.component.ts b/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.component.ts index 42bf3c4530..2d77d82860 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.component.ts +++ b/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.component.ts @@ -104,7 +104,7 @@ export class EditSubmissionComponent implements OnDestroy, AfterViewInit { return of(true); } - async onStepChange($event: StepperSelectionEvent) { + onStepChange($event: StepperSelectionEvent) { // scrolls to step if step selected programmatically scrollToElement({ id: `stepWrapper_${$event.selectedIndex}`, center: false }); } diff --git a/services/apps/alcs/src/portal/notification-submission/notification-submission.controller.ts b/services/apps/alcs/src/portal/notification-submission/notification-submission.controller.ts index 67a0b261ee..818b1d8989 100644 --- a/services/apps/alcs/src/portal/notification-submission/notification-submission.controller.ts +++ b/services/apps/alcs/src/portal/notification-submission/notification-submission.controller.ts @@ -83,13 +83,13 @@ export class NotificationSubmissionController { @Body() updateDto: NotificationSubmissionUpdateDto, @Req() req, ) { - // const noticeOfIntentSubmission = await this.notificationSubmissionService.getByUuid( + // const submission = await this.notificationSubmissionService.getByUuid( // uuid, // req.user.entity, // ); // // if ( - // noticeOfIntentSubmission.status.statusTypeCode !== + // submission.status.statusTypeCode !== // NOI_SUBMISSION_STATUS.IN_PROGRESS && // overlappingRoles.length === 0 // ) { @@ -110,17 +110,17 @@ export class NotificationSubmissionController { @Post('/:uuid/cancel') async cancel(@Param('uuid') uuid: string, @Req() req) { - const noticeOfIntentSubmission = + const notificationSubmission = await this.notificationSubmissionService.getByUuid(uuid, req.user.entity); // if ( - // noticeOfIntentSubmission.status.statusTypeCode !== + // notificationSubmission.status.statusTypeCode !== // NOI_SUBMISSION_STATUS.IN_PROGRESS // ) { // throw new BadRequestException('Can only cancel in progress SRWs'); // } - await this.notificationSubmissionService.cancel(noticeOfIntentSubmission); + await this.notificationSubmissionService.cancel(notificationSubmission); return { cancelled: true, From 1c6eed4e9e14ccc1749fac8b175bc3e7b2dd33dc Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Tue, 5 Sep 2023 13:24:18 -0700 Subject: [PATCH 337/954] Add Notification Parcel UI * Cleanup isDraft flag since not needed for Notifications * Merge modules for the same reason * Delete unused parcel fields --- .../edit-submission-base.module.ts | 12 - .../edit-submission.component.html | 10 +- .../edit-submission.component.ts | 17 +- .../edit-submission/edit-submission.module.ts | 16 +- .../edit-submission/files-step.partial.ts | 16 -- .../delete-parcel-dialog.component.html | 36 +++ .../delete-parcel-dialog.component.scss | 24 ++ .../delete-parcel-dialog.component.spec.ts | 47 ++++ .../delete-parcel-dialog.component.ts | 52 ++++ .../parcels/parcel-details.component.html | 57 ++++ .../parcels/parcel-details.component.scss | 0 .../parcels/parcel-details.component.spec.ts | 60 +++++ .../parcels/parcel-details.component.ts | 138 ++++++++++ ...l-entry-confirmation-dialog.component.html | 35 +++ ...l-entry-confirmation-dialog.component.scss | 24 ++ ...ntry-confirmation-dialog.component.spec.ts | 35 +++ ...cel-entry-confirmation-dialog.component.ts | 33 +++ .../parcel-entry/parcel-entry.component.html | 136 ++++++++++ .../parcel-entry/parcel-entry.component.scss | 96 +++++++ .../parcel-entry.component.spec.ts | 62 +++++ .../parcel-entry/parcel-entry.component.ts | 247 ++++++++++++++++++ .../edit-submission/step.partial.ts | 8 +- .../notification-parcel.dto.ts | 2 - .../notification-parcel.service.ts | 5 +- .../notification-parcel.entity.ts | 14 - .../notification-parcel.service.spec.ts | 1 - .../notification-parcel.service.ts | 7 +- ...940144496-clean_up_notification_parcels.ts | 19 ++ 28 files changed, 1144 insertions(+), 65 deletions(-) delete mode 100644 portal-frontend/src/app/features/notifications/edit-submission/edit-submission-base.module.ts create mode 100644 portal-frontend/src/app/features/notifications/edit-submission/parcels/delete-parcel/delete-parcel-dialog.component.html create mode 100644 portal-frontend/src/app/features/notifications/edit-submission/parcels/delete-parcel/delete-parcel-dialog.component.scss create mode 100644 portal-frontend/src/app/features/notifications/edit-submission/parcels/delete-parcel/delete-parcel-dialog.component.spec.ts create mode 100644 portal-frontend/src/app/features/notifications/edit-submission/parcels/delete-parcel/delete-parcel-dialog.component.ts create mode 100644 portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-details.component.html create mode 100644 portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-details.component.scss create mode 100644 portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-details.component.spec.ts create mode 100644 portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-details.component.ts create mode 100644 portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-entry/parcel-entry-confirmation-dialog/parcel-entry-confirmation-dialog.component.html create mode 100644 portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-entry/parcel-entry-confirmation-dialog/parcel-entry-confirmation-dialog.component.scss create mode 100644 portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-entry/parcel-entry-confirmation-dialog/parcel-entry-confirmation-dialog.component.spec.ts create mode 100644 portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-entry/parcel-entry-confirmation-dialog/parcel-entry-confirmation-dialog.component.ts create mode 100644 portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-entry/parcel-entry.component.html create mode 100644 portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-entry/parcel-entry.component.scss create mode 100644 portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-entry/parcel-entry.component.spec.ts create mode 100644 portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-entry/parcel-entry.component.ts create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1693940144496-clean_up_notification_parcels.ts diff --git a/portal-frontend/src/app/features/notifications/edit-submission/edit-submission-base.module.ts b/portal-frontend/src/app/features/notifications/edit-submission/edit-submission-base.module.ts deleted file mode 100644 index 0caf1a7971..0000000000 --- a/portal-frontend/src/app/features/notifications/edit-submission/edit-submission-base.module.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { CommonModule } from '@angular/common'; -import { NgModule } from '@angular/core'; -import { NgxMaskDirective, NgxMaskPipe } from 'ngx-mask'; -import { SharedModule } from '../../../shared/shared.module'; -import { EditSubmissionComponent } from './edit-submission.component'; - -@NgModule({ - imports: [CommonModule, SharedModule, NgxMaskDirective, NgxMaskPipe], - declarations: [EditSubmissionComponent], - exports: [EditSubmissionComponent], -}) -export class EditSubmissionBaseModule {} diff --git a/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.component.html b/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.component.html index c16152382b..932a741a8a 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.component.html +++ b/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.component.html @@ -31,7 +31,15 @@
Notice of Intent ID: {{ notificationSubmissio > -
+
+ + +
diff --git a/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.component.ts b/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.component.ts index 2d77d82860..bd702397f0 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.component.ts +++ b/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.component.ts @@ -4,16 +4,13 @@ import { MatDialog } from '@angular/material/dialog'; import { ActivatedRoute, Router } from '@angular/router'; import { BehaviorSubject, combineLatest, Observable, of, Subject, takeUntil } from 'rxjs'; import { NoticeOfIntentDocumentDto } from '../../../services/notice-of-intent-document/notice-of-intent-document.dto'; -import { - NOI_SUBMISSION_STATUS, - NoticeOfIntentSubmissionDetailedDto, -} from '../../../services/notice-of-intent-submission/notice-of-intent-submission.dto'; import { NotificationSubmissionDetailedDto } from '../../../services/notification-submission/notification-submission.dto'; import { NotificationSubmissionService } from '../../../services/notification-submission/notification-submission.service'; import { ToastService } from '../../../services/toast/toast.service'; import { CustomStepperComponent } from '../../../shared/custom-stepper/custom-stepper.component'; import { OverlaySpinnerService } from '../../../shared/overlay-spinner/overlay-spinner.service'; import { scrollToElement } from '../../../shared/utils/scroll-helper'; +import { ParcelDetailsComponent } from './parcels/parcel-details.component'; export enum EditNotificationSteps { Parcel = 0, @@ -43,6 +40,7 @@ export class EditSubmissionComponent implements OnDestroy, AfterViewInit { showValidationErrors = false; @ViewChild('cdkStepper') public customStepper!: CustomStepperComponent; + @ViewChild(ParcelDetailsComponent) parcelDetailsComponent!: ParcelDetailsComponent; constructor( private notificationSubmissionService: NotificationSubmissionService, @@ -116,9 +114,20 @@ export class EditSubmissionComponent implements OnDestroy, AfterViewInit { await this.router.navigateByUrl(`notification/${this.fileId}/edit/${index}`); } + onParcelDetailsInitialized() { + if (this.expandedParcelUuid && this.parcelDetailsComponent) { + this.parcelDetailsComponent.openParcel(this.expandedParcelUuid); + this.expandedParcelUuid = undefined; + } + } + async saveSubmission(step: number) { switch (step) { case EditNotificationSteps.Parcel: + if (this.parcelDetailsComponent) { + await this.parcelDetailsComponent.onSave(); + } + break; case EditNotificationSteps.Transferees: case EditNotificationSteps.PrimaryContact: case EditNotificationSteps.Government: diff --git a/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.module.ts b/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.module.ts index ba969b4f33..b4bdc31cde 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.module.ts +++ b/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.module.ts @@ -3,8 +3,11 @@ import { CommonModule } from '@angular/common'; import { RouterModule, Routes } from '@angular/router'; import { CanDeactivateGuard } from '../../../shared/guard/can-deactivate.guard'; import { SharedModule } from '../../../shared/shared.module'; -import { EditSubmissionBaseModule } from './edit-submission-base.module'; import { EditSubmissionComponent } from './edit-submission.component'; +import { DeleteParcelDialogComponent } from './parcels/delete-parcel/delete-parcel-dialog.component'; +import { ParcelDetailsComponent } from './parcels/parcel-details.component'; +import { ParcelEntryConfirmationDialogComponent } from './parcels/parcel-entry/parcel-entry-confirmation-dialog/parcel-entry-confirmation-dialog.component'; +import { ParcelEntryComponent } from './parcels/parcel-entry/parcel-entry.component'; import { StepComponent } from './step.partial'; const routes: Routes = [ @@ -20,7 +23,14 @@ const routes: Routes = [ ]; @NgModule({ - declarations: [StepComponent], - imports: [CommonModule, SharedModule, RouterModule.forChild(routes), EditSubmissionBaseModule], + declarations: [ + StepComponent, + EditSubmissionComponent, + ParcelDetailsComponent, + ParcelEntryComponent, + ParcelEntryConfirmationDialogComponent, + DeleteParcelDialogComponent, + ], + imports: [CommonModule, SharedModule, RouterModule.forChild(routes)], }) export class EditSubmissionModule {} diff --git a/portal-frontend/src/app/features/notifications/edit-submission/files-step.partial.ts b/portal-frontend/src/app/features/notifications/edit-submission/files-step.partial.ts index 5c5cdcf681..000753042e 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/files-step.partial.ts +++ b/portal-frontend/src/app/features/notifications/edit-submission/files-step.partial.ts @@ -5,7 +5,6 @@ import { NoticeOfIntentDocumentDto } from '../../../services/notice-of-intent-do import { NoticeOfIntentDocumentService } from '../../../services/notice-of-intent-document/notice-of-intent-document.service'; import { DOCUMENT_TYPE } from '../../../shared/dto/document.dto'; import { FileHandle } from '../../../shared/file-drag-drop/drag-drop.directive'; -import { RemoveFileConfirmationDialogComponent } from '../../applications/alcs-edit-submission/remove-file-confirmation-dialog/remove-file-confirmation-dialog.component'; import { StepComponent } from './step.partial'; @Component({ @@ -42,21 +41,6 @@ export abstract class FilesStepComponent extends StepComponent { } async onDeleteFile($event: NoticeOfIntentDocumentDto) { - if (this.draftMode) { - this.dialog - .open(RemoveFileConfirmationDialogComponent) - .beforeClosed() - .subscribe(async (didConfirm) => { - if (didConfirm) { - this.deleteFile($event); - } - }); - } else { - await this.deleteFile($event); - } - } - - private async deleteFile($event: NoticeOfIntentDocumentDto) { await this.noticeOfIntentDocumentService.deleteExternalFile($event.uuid); if (this.fileId) { const documents = await this.noticeOfIntentDocumentService.getByFileId(this.fileId); diff --git a/portal-frontend/src/app/features/notifications/edit-submission/parcels/delete-parcel/delete-parcel-dialog.component.html b/portal-frontend/src/app/features/notifications/edit-submission/parcels/delete-parcel/delete-parcel-dialog.component.html new file mode 100644 index 0000000000..77c2809519 --- /dev/null +++ b/portal-frontend/src/app/features/notifications/edit-submission/parcels/delete-parcel/delete-parcel-dialog.component.html @@ -0,0 +1,36 @@ + + + + + + + + + + +
+

Delete Parcel #{{ parcelNumber }}

+
+ +
+
+ + Warning: All information relevant to this parcel, including information added in subsequent steps, will be + deleted. + + +
+ +
+
+ +
+
+
Are you sure you want to delete this? This action cannot be undone.
+
+ +
+ +
+
+
diff --git a/portal-frontend/src/app/features/notifications/edit-submission/parcels/delete-parcel/delete-parcel-dialog.component.scss b/portal-frontend/src/app/features/notifications/edit-submission/parcels/delete-parcel/delete-parcel-dialog.component.scss new file mode 100644 index 0000000000..1f78db7f1e --- /dev/null +++ b/portal-frontend/src/app/features/notifications/edit-submission/parcels/delete-parcel/delete-parcel-dialog.component.scss @@ -0,0 +1,24 @@ +@use '../../../../../../styles/functions' as *; + +.margin-bottom-1 { + margin-bottom: rem(16); +} + +.step-controls { + display: flex; + justify-content: space-between; +} + +.confirm-content { + margin: rem(24) 0; +} + +@media screen and (min-width: $desktopBreakpoint) { + .step-controls { + justify-content: flex-end; + + button { + margin-left: rem(25) !important; + } + } +} diff --git a/portal-frontend/src/app/features/notifications/edit-submission/parcels/delete-parcel/delete-parcel-dialog.component.spec.ts b/portal-frontend/src/app/features/notifications/edit-submission/parcels/delete-parcel/delete-parcel-dialog.component.spec.ts new file mode 100644 index 0000000000..59d4818b54 --- /dev/null +++ b/portal-frontend/src/app/features/notifications/edit-submission/parcels/delete-parcel/delete-parcel-dialog.component.spec.ts @@ -0,0 +1,47 @@ +import { HttpClient } from '@angular/common/http'; +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { NoticeOfIntentParcelService } from '../../../../../services/notice-of-intent-parcel/notice-of-intent-parcel.service'; +import { DeleteParcelDialogComponent } from './delete-parcel-dialog.component'; + +describe('DeleteParcelDialogComponent', () => { + let component: DeleteParcelDialogComponent; + let fixture: ComponentFixture; + let mockHttpClient: DeepMocked; + let mockNoiParcelService: DeepMocked; + + beforeEach(async () => { + mockHttpClient = createMock(); + mockNoiParcelService = createMock(); + + await TestBed.configureTestingModule({ + declarations: [DeleteParcelDialogComponent], + providers: [ + { + provide: HttpClient, + useValue: mockHttpClient, + }, + { + provide: NoticeOfIntentParcelService, + useValue: mockNoiParcelService, + }, + { + provide: MatDialogRef, + useValue: {}, + }, + { provide: MAT_DIALOG_DATA, useValue: {} }, + ], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(DeleteParcelDialogComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/notifications/edit-submission/parcels/delete-parcel/delete-parcel-dialog.component.ts b/portal-frontend/src/app/features/notifications/edit-submission/parcels/delete-parcel/delete-parcel-dialog.component.ts new file mode 100644 index 0000000000..7445939f2f --- /dev/null +++ b/portal-frontend/src/app/features/notifications/edit-submission/parcels/delete-parcel/delete-parcel-dialog.component.ts @@ -0,0 +1,52 @@ +import { Component, Inject } from '@angular/core'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; +import { NoticeOfIntentParcelService } from '../../../../../services/notice-of-intent-parcel/notice-of-intent-parcel.service'; + +export enum NotificationParcelDeleteStepsEnum { + warning = 0, + confirmation = 1, +} + +@Component({ + selector: 'app-delete-parcel-dialog', + templateUrl: './delete-parcel-dialog.component.html', + styleUrls: ['./delete-parcel-dialog.component.scss'], +}) +export class DeleteParcelDialogComponent { + parcelUuid!: string; + parcelNumber!: string; + + stepIdx = 0; + + warningStep = NotificationParcelDeleteStepsEnum.warning; + confirmationStep = NotificationParcelDeleteStepsEnum.confirmation; + + constructor( + private noticeOfIntentParcelService: NoticeOfIntentParcelService, + private dialogRef: MatDialogRef, + @Inject(MAT_DIALOG_DATA) public data: DeleteParcelDialogComponent + ) { + this.parcelUuid = data.parcelUuid; + this.parcelNumber = data.parcelNumber; + } + + async next() { + this.stepIdx += 1; + } + + async back() { + this.stepIdx -= 1; + } + + async onCancel(dialogResult: boolean = false) { + this.dialogRef.close(dialogResult); + } + + async onDelete() { + const result = await this.noticeOfIntentParcelService.deleteMany([this.parcelUuid]); + + if (result) { + this.onCancel(true); + } + } +} diff --git a/portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-details.component.html b/portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-details.component.html new file mode 100644 index 0000000000..6ce7b7f4b2 --- /dev/null +++ b/portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-details.component.html @@ -0,0 +1,57 @@ +
+
+

Identify Parcels Under SRW

+

Provide parcel identification and registered ownership information for each parcel.

+

*All fields are required unless stated optional.

+
+ + + Parcel #{{ parcelInd + 1 }} Details & Owner Information + + + + +
+
+ + +
+
+ + +
+ +
+ +
+ +
+
+ +
+
+
diff --git a/portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-details.component.scss b/portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-details.component.scss new file mode 100644 index 0000000000..e69de29bb2 diff --git a/portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-details.component.spec.ts b/portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-details.component.spec.ts new file mode 100644 index 0000000000..2d71c5772a --- /dev/null +++ b/portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-details.component.spec.ts @@ -0,0 +1,60 @@ +import { HttpClient } from '@angular/common/http'; +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { MatDialog } from '@angular/material/dialog'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { BehaviorSubject } from 'rxjs'; +import { NotificationParcelService } from '../../../../services/notification-parcel/notification-parcel.service'; +import { NotificationSubmissionDetailedDto } from '../../../../services/notification-submission/notification-submission.dto'; +import { ToastService } from '../../../../services/toast/toast.service'; +import { ParcelDetailsComponent } from './parcel-details.component'; + +describe('ParcelDetailsComponent', () => { + let component: ParcelDetailsComponent; + let fixture: ComponentFixture; + let mockHttpClient: DeepMocked; + let mockParcelService: DeepMocked; + let mockToastService: DeepMocked; + let mockMatDialog: DeepMocked; + let notificationPipe = new BehaviorSubject(undefined); + + beforeEach(async () => { + mockHttpClient = createMock(); + mockParcelService = createMock(); + mockToastService = createMock(); + mockMatDialog = createMock(); + + await TestBed.configureTestingModule({ + declarations: [ParcelDetailsComponent], + providers: [ + { + provide: HttpClient, + useValue: mockHttpClient, + }, + { + provide: NotificationParcelService, + useValue: mockParcelService, + }, + { + provide: ToastService, + useValue: mockToastService, + }, + { + provide: MatDialog, + useValue: mockMatDialog, + }, + ], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(ParcelDetailsComponent); + component = fixture.componentInstance; + component.$notificationSubmission = notificationPipe; + + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-details.component.ts b/portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-details.component.ts new file mode 100644 index 0000000000..d057afd748 --- /dev/null +++ b/portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-details.component.ts @@ -0,0 +1,138 @@ +import { AfterViewInit, Component, EventEmitter, OnInit, Output } from '@angular/core'; +import { MatDialog } from '@angular/material/dialog'; +import { Router } from '@angular/router'; +import { takeUntil } from 'rxjs'; +import { + NotificationParcelDto, + NotificationParcelUpdateDto, +} from '../../../../services/notification-parcel/notification-parcel.dto'; +import { NotificationParcelService } from '../../../../services/notification-parcel/notification-parcel.service'; +import { ToastService } from '../../../../services/toast/toast.service'; +import { EditNotificationSteps } from '../edit-submission.component'; +import { StepComponent } from '../step.partial'; +import { DeleteParcelDialogComponent } from './delete-parcel/delete-parcel-dialog.component'; +import { ParcelEntryFormData } from './parcel-entry/parcel-entry.component'; + +@Component({ + selector: 'app-notification-parcel-details', + templateUrl: './parcel-details.component.html', + styleUrls: ['./parcel-details.component.scss'], +}) +export class ParcelDetailsComponent extends StepComponent implements OnInit, AfterViewInit { + @Output() componentInitialized = new EventEmitter(); + + currentStep = EditNotificationSteps.Parcel; + fileId = ''; + submissionUuid = ''; + parcels: NotificationParcelDto[] = []; + newParcelAdded = false; + isDirty = false; + expandedParcel: string = ''; + + constructor( + private router: Router, + private notificationParcelService: NotificationParcelService, + private toastService: ToastService, + private dialog: MatDialog + ) { + super(); + } + + ngOnInit(): void { + this.$notificationSubmission.pipe(takeUntil(this.$destroy)).subscribe((noiSubmission) => { + if (noiSubmission) { + this.fileId = noiSubmission.fileNumber; + this.submissionUuid = noiSubmission.uuid; + this.loadParcels(); + } + }); + + this.newParcelAdded = false; + } + + ngAfterViewInit(): void { + setTimeout((_) => this.componentInitialized.emit(true)); + } + + openParcel(index: string) { + this.expandedParcel = index; + } + + async loadParcels() { + this.parcels = (await this.notificationParcelService.fetchBySubmissionUuid(this.submissionUuid)) || []; + if (!this.parcels || this.parcels.length === 0) { + await this.onAddParcel(); + } + } + + async onAddParcel() { + const parcel = await this.notificationParcelService.create(this.submissionUuid); + + if (parcel) { + this.parcels.push({ + uuid: parcel!.uuid, + }); + this.newParcelAdded = true; + } else { + this.toastService.showErrorToast('Error adding new parcel. Please refresh page and try again.'); + } + } + + async onParcelFormChange(formData: Partial) { + const parcel = this.parcels.find((e) => e.uuid === formData.uuid); + if (!parcel) { + this.toastService.showErrorToast('Error updating the parcel. Please refresh page and try again.'); + return; + } + + this.isDirty = true; + parcel.pid = formData.pid !== undefined ? formData.pid : parcel.pid; + parcel.pin = formData.pid !== undefined ? formData.pin : parcel.pin; + parcel.civicAddress = formData.civicAddress !== undefined ? formData.civicAddress : parcel.civicAddress; + parcel.legalDescription = + formData.legalDescription !== undefined ? formData.legalDescription : parcel.legalDescription; + + parcel.mapAreaHectares = formData.mapArea !== undefined ? formData.mapArea : parcel.mapAreaHectares; + parcel.ownershipTypeCode = formData.parcelType !== undefined ? formData.parcelType : parcel.ownershipTypeCode; + } + + private async saveProgress() { + if (this.isDirty || this.newParcelAdded) { + const parcelsToUpdate: NotificationParcelUpdateDto[] = []; + for (const parcel of this.parcels) { + parcelsToUpdate.push({ + uuid: parcel.uuid, + pid: parcel.pid?.toString() || null, + pin: parcel.pin?.toString() || null, + civicAddress: parcel.civicAddress ?? null, + legalDescription: parcel.legalDescription, + mapAreaHectares: parcel.mapAreaHectares, + ownershipTypeCode: parcel.ownershipTypeCode, + }); + } + await this.notificationParcelService.update(parcelsToUpdate); + } + } + + async onSave() { + await this.saveProgress(); + } + + async onDelete(parcelUuid: string, parcelNumber: number) { + this.dialog + .open(DeleteParcelDialogComponent, { + panelClass: 'no-padding', + disableClose: true, + data: { + parcelUuid, + parcelNumber, + }, + }) + .beforeClosed() + .subscribe((result) => { + if (result) { + this.loadParcels(); + } + }); + } +} diff --git a/portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-entry/parcel-entry-confirmation-dialog/parcel-entry-confirmation-dialog.component.html b/portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-entry/parcel-entry-confirmation-dialog/parcel-entry-confirmation-dialog.component.html new file mode 100644 index 0000000000..e7e96cb4c5 --- /dev/null +++ b/portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-entry/parcel-entry-confirmation-dialog/parcel-entry-confirmation-dialog.component.html @@ -0,0 +1,35 @@ + + + + + + + + + + +
+

Change Parcel Ownership Type

+
+ +
+
+ + Warning: Changing parcel ownership type will remove some inputs relevant to the current parcel. + + +
+ +
+
+ +
+
+
Are you sure you want to change parcel ownership type? This action cannot be undone.
+
+ +
+ +
+
+
diff --git a/portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-entry/parcel-entry-confirmation-dialog/parcel-entry-confirmation-dialog.component.scss b/portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-entry/parcel-entry-confirmation-dialog/parcel-entry-confirmation-dialog.component.scss new file mode 100644 index 0000000000..c4e03e5c59 --- /dev/null +++ b/portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-entry/parcel-entry-confirmation-dialog/parcel-entry-confirmation-dialog.component.scss @@ -0,0 +1,24 @@ +@use '../../../../../../../styles/functions' as *; + +.margin-bottom-1 { + margin-bottom: rem(16); +} + +.step-controls { + display: flex; + justify-content: space-between; +} + +.confirm-content { + margin: rem(24) 0; +} + +@media screen and (min-width: $desktopBreakpoint) { + .step-controls { + justify-content: flex-end; + + button { + margin-left: rem(25) !important; + } + } +} diff --git a/portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-entry/parcel-entry-confirmation-dialog/parcel-entry-confirmation-dialog.component.spec.ts b/portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-entry/parcel-entry-confirmation-dialog/parcel-entry-confirmation-dialog.component.spec.ts new file mode 100644 index 0000000000..705f0c459e --- /dev/null +++ b/portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-entry/parcel-entry-confirmation-dialog/parcel-entry-confirmation-dialog.component.spec.ts @@ -0,0 +1,35 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { MatDialog, MatDialogRef } from '@angular/material/dialog'; +import { ParcelEntryConfirmationDialogComponent } from './parcel-entry-confirmation-dialog.component'; + +describe('ParcelEntryConfirmationDialogComponent', () => { + let component: ParcelEntryConfirmationDialogComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ParcelEntryConfirmationDialogComponent], + providers: [ + { + provide: MatDialog, + useValue: {}, + }, + { + provide: MatDialogRef, + useValue: {}, + }, + ], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(ParcelEntryConfirmationDialogComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-entry/parcel-entry-confirmation-dialog/parcel-entry-confirmation-dialog.component.ts b/portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-entry/parcel-entry-confirmation-dialog/parcel-entry-confirmation-dialog.component.ts new file mode 100644 index 0000000000..1a40b4b055 --- /dev/null +++ b/portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-entry/parcel-entry-confirmation-dialog/parcel-entry-confirmation-dialog.component.ts @@ -0,0 +1,33 @@ +import { Component } from '@angular/core'; +import { MatDialogRef } from '@angular/material/dialog'; +import { NotificationParcelDeleteStepsEnum } from '../../delete-parcel/delete-parcel-dialog.component'; + +@Component({ + selector: 'app-parcel-entry-confirmation-dialog', + templateUrl: './parcel-entry-confirmation-dialog.component.html', + styleUrls: ['./parcel-entry-confirmation-dialog.component.scss'], +}) +export class ParcelEntryConfirmationDialogComponent { + stepIdx = 0; + + warningStep = NotificationParcelDeleteStepsEnum.warning; + confirmationStep = NotificationParcelDeleteStepsEnum.confirmation; + + constructor(private dialogRef: MatDialogRef) {} + + async next() { + this.stepIdx += 1; + } + + async back() { + this.stepIdx -= 1; + } + + async onCancel(dialogResult: boolean = false) { + this.dialogRef.close(dialogResult); + } + + async onDelete() { + this.onCancel(true); + } +} diff --git a/portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-entry/parcel-entry.component.html b/portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-entry/parcel-entry.component.html new file mode 100644 index 0000000000..a10babbf69 --- /dev/null +++ b/portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-entry/parcel-entry.component.html @@ -0,0 +1,136 @@ +
+
+ +
+ The answer to the following question will change the rest of the notice of intent form. Do not change this answer + once selected. +
+ + Fee Simple + Crown + +
+ warning +
This field is required
+
+
+ +
Parcel Lookup
+
+
+ + +
Please ensure the auto-filled information is accurate by comparing with your records
+
+
+ + + Search by PID + Search by PIN + + + + + + +
+
+ + Powered by PMBC! +
+
+
+ +
+ +
Can be found on the parcel's Certificate of Title
+ + + +
+ warning +
This field is required
+
+
+ +
+ +
The area of the entire parcel in hectares, not just the area under application.
+ + + +
+ warning +
This field is required
+
+
+ +
+ +
A unique nine-digit number found on the parcel's Certificate of Title
+ + + +
+ warning +
This field is required
+
Invalid format
+
+
+ +
+ +
Unique numeric identifier for Crown land parcels
+ + + +
+ +
+ + + + +
+ warning +
This field is required
+
+
+
+
diff --git a/portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-entry/parcel-entry.component.scss b/portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-entry/parcel-entry.component.scss new file mode 100644 index 0000000000..223b120fa2 --- /dev/null +++ b/portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-entry/parcel-entry.component.scss @@ -0,0 +1,96 @@ +@use '../../../../../../styles/functions' as *; +@use '../../../../../../styles/colors'; + +.owner-option { + display: flex; + justify-content: space-between; + align-items: center; +} + +.new-owner { + margin: rem(8) 0 !important; +} + +.link-text { + color: colors.$link-color; + text-decoration: underline; +} + +.lookup-pid-fields { + display: flex; + align-items: center; + flex-direction: column; + + @media screen and (min-width: $desktopBreakpoint) { + flex-direction: row; + } +} + +.lookup-search-by { + margin-top: rem(8); + + @media screen and (min-width: $desktopBreakpoint) { + width: unset !important; + flex-grow: 1; + } +} + +.lookup-input { + margin-top: rem(8); + + @media screen and (min-width: $desktopBreakpoint) { + width: unset !important; + flex-grow: 5; + } +} + +.lookup-search-button { + width: 100%; + margin-top: rem(8) !important; + + @media screen and (min-width: $desktopBreakpoint) { + height: rem(55); + margin-top: rem(7) !important; + width: rem(150); + } +} + +.lookup-bottom-row { + display: flex; + align-items: center; + flex-direction: column; + margin-top: rem(24); + + .reset-button { + width: 100%; + margin-bottom: rem(8); + } + + @media screen and (min-width: $desktopBreakpoint) { + flex-direction: row; + justify-content: space-between; + + .reset-button { + width: unset; + } + } +} + +.crown-owner-type { + display: block; + margin-bottom: rem(24); + + .mat-mdc-radio-button ~ .mat-mdc-radio-button { + margin-left: rem(16); + } +} + +mat-button-toggle-group#isFarm { + height: rem(55); + + .mat-button-toggle { + display: flex; + align-items: center; + height: 100%; + } +} diff --git a/portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-entry/parcel-entry.component.spec.ts b/portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-entry/parcel-entry.component.spec.ts new file mode 100644 index 0000000000..304dfc245d --- /dev/null +++ b/portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-entry/parcel-entry.component.spec.ts @@ -0,0 +1,62 @@ +import { HttpClient } from '@angular/common/http'; +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { MatAutocompleteModule } from '@angular/material/autocomplete'; +import { MatDialog } from '@angular/material/dialog'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { NotificationParcelDto } from '../../../../../services/notification-parcel/notification-parcel.dto'; +import { NotificationParcelService } from '../../../../../services/notification-parcel/notification-parcel.service'; +import { ParcelService } from '../../../../../services/parcel/parcel.service'; +import { ParcelEntryComponent } from './parcel-entry.component'; + +describe('ParcelEntryComponent', () => { + let component: ParcelEntryComponent; + let fixture: ComponentFixture; + let mockParcelService: DeepMocked; + let mockHttpClient: DeepMocked; + let mockNotificationParcelService: DeepMocked; + + let mockParcel: NotificationParcelDto = { + uuid: '', + }; + + beforeEach(async () => { + mockParcelService = createMock(); + mockHttpClient = createMock(); + mockNotificationParcelService = createMock(); + + await TestBed.configureTestingModule({ + imports: [MatAutocompleteModule], + declarations: [ParcelEntryComponent], + providers: [ + { + provide: ParcelService, + useValue: mockParcelService, + }, + { + provide: HttpClient, + useValue: mockHttpClient, + }, + { + provide: NotificationParcelService, + useValue: mockNotificationParcelService, + }, + { + provide: MatDialog, + useValue: {}, + }, + ], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(ParcelEntryComponent); + component = fixture.componentInstance; + component.parcel = mockParcel; + + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-entry/parcel-entry.component.ts b/portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-entry/parcel-entry.component.ts new file mode 100644 index 0000000000..8107b14e6a --- /dev/null +++ b/portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-entry/parcel-entry.component.ts @@ -0,0 +1,247 @@ +import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; +import { FormControl, FormGroup, Validators } from '@angular/forms'; +import { MatButtonToggleChange } from '@angular/material/button-toggle'; +import { MatDialog } from '@angular/material/dialog'; +import { PARCEL_OWNERSHIP_TYPE } from '../../../../../services/application-parcel/application-parcel.dto'; +import { NotificationParcelDto } from '../../../../../services/notification-parcel/notification-parcel.dto'; +import { NotificationParcelService } from '../../../../../services/notification-parcel/notification-parcel.service'; +import { ParcelService } from '../../../../../services/parcel/parcel.service'; +import { ParcelEntryConfirmationDialogComponent } from './parcel-entry-confirmation-dialog/parcel-entry-confirmation-dialog.component'; + +export interface ParcelEntryFormData { + uuid: string; + legalDescription: string | undefined | null; + mapArea: string | undefined | null; + pin: string | undefined | null; + pid: string | undefined | null; + civicAddress: string | undefined | null; + parcelType: string | undefined | null; + isFarm: string | undefined | null; + purchaseDate?: Date | null; + crownLandOwnerType?: string | null; + isConfirmedByApplicant: boolean; +} + +@Component({ + selector: 'app-notification-parcel-entry[parcel][fileId][submissionUuid]', + templateUrl: './parcel-entry.component.html', + styleUrls: ['./parcel-entry.component.scss'], +}) +export class ParcelEntryComponent implements OnInit { + @Input() parcel!: NotificationParcelDto; + @Input() fileId!: string; + @Input() submissionUuid!: string; + + @Input() showErrors = false; + @Input() _disabled = false; + @Input() isDraft = false; + + @Input() + public set disabled(disabled: boolean) { + this._disabled = disabled; + this.onFormDisabled(); + } + + @Output() private onFormGroupChange = new EventEmitter>(); + @Output() private onSaveProgress = new EventEmitter(); + + searchBy = new FormControl(null); + isCrownLand: boolean | null = null; + + pidPin = new FormControl(''); + legalDescription = new FormControl(null, [Validators.required]); + mapArea = new FormControl(null, [Validators.required]); + pid = new FormControl(null, [Validators.required]); + pin = new FormControl(null); + civicAddress = new FormControl(null, [Validators.required]); + parcelType = new FormControl(null, [Validators.required]); + parcelForm = new FormGroup({ + pidPin: this.pidPin, + legalDescription: this.legalDescription, + mapArea: this.mapArea, + pin: this.pin, + pid: this.pid, + civicAddress: this.civicAddress, + parcelType: this.parcelType, + searchBy: this.searchBy, + }); + pidPinPlaceholder = ''; + + ownerInput = new FormControl(null); + + PARCEL_OWNERSHIP_TYPES = PARCEL_OWNERSHIP_TYPE; + maxPurchasedDate = new Date(); + + constructor( + private parcelService: ParcelService, + private notificationParcelService: NotificationParcelService, + private dialog: MatDialog + ) {} + + ngOnInit(): void { + this.setupForm(); + } + + async onSearch() { + let result; + if (this.searchBy.getRawValue() === 'pin') { + result = await this.parcelService.getByPin(this.pidPin.getRawValue()!); + } else { + result = await this.parcelService.getByPid(this.pidPin.getRawValue()!); + } + + this.onReset(); + if (result) { + this.legalDescription.setValue(result.legalDescription); + this.mapArea.setValue(result.mapArea); + + if (result.pin) { + this.pin.setValue(result.pin); + } + + if (result.pid) { + this.pid.setValue(result.pid); + } + + this.emitFormChangeOnSearchActions(); + } + } + + onReset() { + this.parcelForm.controls.pidPin.reset(); + this.parcelForm.controls.pid.reset(); + this.parcelForm.controls.pin.reset(); + this.parcelForm.controls.legalDescription.reset(); + this.parcelForm.controls.mapArea.reset(); + this.parcelForm.controls.civicAddress.reset(); + + this.emitFormChangeOnSearchActions(); + + if (this.showErrors) { + this.parcelForm.markAllAsTouched(); + } + } + + private emitFormChangeOnSearchActions() { + this.onFormGroupChange.emit({ + uuid: this.parcel.uuid, + legalDescription: this.legalDescription.getRawValue(), + mapArea: this.mapArea.getRawValue(), + pin: this.pin.getRawValue(), + pid: this.pid.getRawValue(), + }); + } + + onChangeParcelType($event: MatButtonToggleChange) { + const dirtyForm = + this.legalDescription.value || this.mapArea.value || this.pid.value || this.pin.value || this.civicAddress.value; + + const changeParcelType = () => { + if ($event.value === this.PARCEL_OWNERSHIP_TYPES.CROWN) { + this.searchBy.setValue(null); + this.pidPinPlaceholder = ''; + this.isCrownLand = true; + this.pid.setValidators([]); + } else { + this.searchBy.setValue('pid'); + this.pidPinPlaceholder = 'Type 9 digit PID'; + this.isCrownLand = false; + this.pid.setValidators([Validators.required]); + } + + this.pid.updateValueAndValidity(); + }; + + if (dirtyForm && this.isCrownLand !== null) { + this.dialog + .open(ParcelEntryConfirmationDialogComponent, { + panelClass: 'no-padding', + disableClose: true, + }) + .beforeClosed() + .subscribe(async (result) => { + if (result) { + this.onReset(); + return changeParcelType(); + } else { + const newParcelType = this.parcelType.getRawValue(); + + const prevParcelType = + newParcelType === this.PARCEL_OWNERSHIP_TYPES.CROWN + ? this.PARCEL_OWNERSHIP_TYPES.FEE_SIMPLE + : this.PARCEL_OWNERSHIP_TYPES.CROWN; + + this.parcelType.setValue(prevParcelType); + } + }); + } else { + return changeParcelType(); + } + } + + private setupForm() { + this.parcelForm.patchValue({ + legalDescription: this.parcel.legalDescription, + mapArea: this.parcel.mapAreaHectares, + pid: this.parcel.pid, + pin: this.parcel.pin, + civicAddress: this.parcel.civicAddress, + parcelType: this.parcel.ownershipTypeCode, + }); + + this.isCrownLand = this.parcelType.value + ? this.parcelType.getRawValue() === this.PARCEL_OWNERSHIP_TYPES.CROWN + : null; + + if (this.isCrownLand) { + this.pidPin.disable(); + this.pid.setValidators([]); + this.pidPinPlaceholder = ''; + } else { + this.pidPinPlaceholder = 'Type 9 digit PID'; + } + + if (this.showErrors) { + this.parcelForm.markAllAsTouched(); + } + + this.parcelForm.valueChanges.subscribe((formData) => { + if (!this.parcelForm.dirty) { + return; + } + + if ((this.isCrownLand && !this.searchBy.getRawValue()) || this.disabled) { + this.pidPin.disable({ + emitEvent: false, + }); + } else { + this.pidPin.enable({ + emitEvent: false, + }); + } + + return this.onFormGroupChange.emit({ + ...formData, + uuid: this.parcel.uuid, + }); + }); + } + + private onFormDisabled() { + if (this._disabled) { + this.parcelForm.disable(); + this.ownerInput.disable(); + } else { + this.parcelForm.enable(); + this.ownerInput.enable(); + } + } + + onChangeSearchBy(value: string) { + if (value === 'pid') { + this.pidPinPlaceholder = 'Type 9 digit PID'; + } else { + this.pidPinPlaceholder = 'Type PIN'; + } + } +} diff --git a/portal-frontend/src/app/features/notifications/edit-submission/step.partial.ts b/portal-frontend/src/app/features/notifications/edit-submission/step.partial.ts index c3d7d8a6ac..519bde91dd 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/step.partial.ts +++ b/portal-frontend/src/app/features/notifications/edit-submission/step.partial.ts @@ -1,6 +1,9 @@ import { Component, EventEmitter, Input, OnDestroy, Output } from '@angular/core'; import { BehaviorSubject, Subject } from 'rxjs'; -import { NotificationSubmissionDto } from '../../../services/notification-submission/notification-submission.dto'; +import { + NotificationSubmissionDetailedDto, + NotificationSubmissionDto, +} from '../../../services/notification-submission/notification-submission.dto'; @Component({ selector: 'app-step', @@ -10,10 +13,9 @@ import { NotificationSubmissionDto } from '../../../services/notification-submis export class StepComponent implements OnDestroy { protected $destroy = new Subject(); - @Input() $notificationSubmission!: BehaviorSubject; + @Input() $notificationSubmission!: BehaviorSubject; @Input() showErrors = false; - @Input() draftMode = false; @Output() navigateToStep = new EventEmitter(); @Output() exit = new EventEmitter(); diff --git a/portal-frontend/src/app/services/notification-parcel/notification-parcel.dto.ts b/portal-frontend/src/app/services/notification-parcel/notification-parcel.dto.ts index 0e7ec19785..922b4a3f8e 100644 --- a/portal-frontend/src/app/services/notification-parcel/notification-parcel.dto.ts +++ b/portal-frontend/src/app/services/notification-parcel/notification-parcel.dto.ts @@ -8,8 +8,6 @@ export interface NotificationParcelUpdateDto { legalDescription?: string | null; mapAreaHectares?: string | null; ownershipTypeCode?: string | null; - crownLandOwnerType?: string | null; - isConfirmedByApplicant: boolean; } export interface NotificationParcelDto extends Omit { diff --git a/portal-frontend/src/app/services/notification-parcel/notification-parcel.service.ts b/portal-frontend/src/app/services/notification-parcel/notification-parcel.service.ts index 8ad3bcd735..1c35d65a57 100644 --- a/portal-frontend/src/app/services/notification-parcel/notification-parcel.service.ts +++ b/portal-frontend/src/app/services/notification-parcel/notification-parcel.service.ts @@ -32,12 +32,11 @@ export class NotificationParcelService { return undefined; } - async create(notificationSubmissionUuid: string, ownerUuid?: string) { + async create(notificationSubmissionUuid: string) { try { return await firstValueFrom( this.httpClient.post(`${this.serviceUrl}`, { - noticeOfIntentSubmissionUuid: notificationSubmissionUuid, - ownerUuid, + notificationSubmissionUuid: notificationSubmissionUuid, }) ); } catch (e) { diff --git a/services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.entity.ts b/services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.entity.ts index aced2c8b95..db3e0522f0 100644 --- a/services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.entity.ts +++ b/services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.entity.ts @@ -58,20 +58,6 @@ export class NotificationParcel extends Base { }) mapAreaHectares?: number | null; - @AutoMap(() => Boolean) - @Column({ - type: 'boolean', - comment: - 'The Parcels indication whether applicant signed off provided data including the Certificate of Title', - nullable: false, - default: false, - }) - isConfirmedByApplicant: boolean; - - @IsString() - @IsOptional() - crownLandOwnerType?: string | null; - @AutoMap(() => String) @Column({ nullable: true }) ownershipTypeCode?: string | null; diff --git a/services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.service.spec.ts b/services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.service.spec.ts index 17a7c1c22e..0a031358a3 100644 --- a/services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.service.spec.ts +++ b/services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.service.spec.ts @@ -22,7 +22,6 @@ describe('NotificationParcelService', () => { pin: 'mock_pin', legalDescription: 'mock_legalDescription', mapAreaHectares: 1, - isConfirmedByApplicant: true, notificationSubmissionUuid: mockFileNumber, ownershipTypeCode: 'mock_ownershipTypeCode', }); diff --git a/services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.service.ts b/services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.service.ts index 8328997211..28f3dacc19 100644 --- a/services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.service.ts +++ b/services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.service.ts @@ -3,7 +3,6 @@ import { forwardRef, Inject, Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { In, Repository } from 'typeorm'; import { User } from '../../../user/user.entity'; -import { filterUndefined } from '../../../utils/undefined'; import { NotificationTransfereeService } from '../notification-transferee/notification-transferee.service'; import { NotificationParcelUpdateDto } from './notification-parcel.dto'; import { NotificationParcel } from './notification-parcel.entity'; @@ -58,11 +57,7 @@ export class NotificationParcelService { parcel.legalDescription = updateDto.legalDescription; parcel.mapAreaHectares = updateDto.mapAreaHectares; parcel.civicAddress = updateDto.civicAddress; - parcel.isConfirmedByApplicant = filterUndefined( - updateDto.isConfirmedByApplicant, - parcel.isConfirmedByApplicant, - ); - parcel.crownLandOwnerType = updateDto.crownLandOwnerType; + parcel.ownershipTypeCode = updateDto.ownershipTypeCode; updatedParcels.push(parcel); } diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1693940144496-clean_up_notification_parcels.ts b/services/apps/alcs/src/providers/typeorm/migrations/1693940144496-clean_up_notification_parcels.ts new file mode 100644 index 0000000000..d2f098a09c --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1693940144496-clean_up_notification_parcels.ts @@ -0,0 +1,19 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class cleanUpNotificationParcels1693940144496 + implements MigrationInterface +{ + name = 'cleanUpNotificationParcels1693940144496'; + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `ALTER TABLE "alcs"."notification_parcel" DROP COLUMN "is_confirmed_by_applicant"`, + ); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `ALTER TABLE "alcs"."notification_parcel" ADD "is_confirmed_by_applicant" boolean NOT NULL DEFAULT false`, + ); + } +} From 6de352c78c76a09823bc4aee6104edee20a38239 Mon Sep 17 00:00:00 2001 From: Liam Stoddard Date: Tue, 5 Sep 2023 13:45:55 -0700 Subject: [PATCH 338/954] add migration --- .../1693945647800-rename_nfu_placement.ts | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1693945647800-rename_nfu_placement.ts diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1693945647800-rename_nfu_placement.ts b/services/apps/alcs/src/providers/typeorm/migrations/1693945647800-rename_nfu_placement.ts new file mode 100644 index 0000000000..4da33dd170 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1693945647800-rename_nfu_placement.ts @@ -0,0 +1,29 @@ +import { MigrationInterface, QueryRunner } from "typeorm" + +export class renameNfuPlacement1693945647800 implements MigrationInterface { + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" ADD "nfu_total_fill_area" numeric(12,2)`, + ); + await queryRunner.query( + `UPDATE "alcs"."application_submission" SET "nfu_total_fill_area" = "nfu_total_fill_placement"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" DROP COLUMN "nfu_total_fill_placement"`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."application_submission"."nfu_total_fill_area" IS 'Area for nfu placement of fill'`, + ); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."application_submission"."nfu_total_fill_area" IS 'Area for nfu placement of fill'`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" DROP COLUMN "nfu_total_fill_area"`, + ); + } + +} From 6c2a02ca49b788e7a53cf0091141ade0b9b8bf85 Mon Sep 17 00:00:00 2001 From: "to. sandra" <76515860+sandratoh@users.noreply.github.com> Date: Tue, 5 Sep 2023 14:09:24 -0700 Subject: [PATCH 339/954] Add NOI timeline and status to detailed page (#939) * Fetch NOI submission status from overview page * Bold noi timeline statuses and update unit tests * Retrieve current noi status and show badge in details header * Refactor and pass unit test * Pass status service as detail header input --- .../application/application.component.html | 1 + .../application/application.component.spec.ts | 7 ++ .../application/application.component.ts | 4 +- .../notice-of-intent.component.html | 2 + .../notice-of-intent.component.spec.ts | 8 +- .../notice-of-intent.component.ts | 4 +- .../overview/overview.component.spec.ts | 14 ++-- .../overview/overview.component.ts | 28 ++++++- .../application-timeline.service.ts | 2 +- .../details-header.component.spec.ts | 12 +-- .../details-header.component.ts | 21 +++--- .../application-timeline.service.spec.ts | 3 - .../notice-of-intent-timeline.module.ts | 2 + .../notice-of-intent-timeline.service.spec.ts | 54 ++++++++++++- .../notice-of-intent-timeline.service.ts | 75 +++++++++++-------- 15 files changed, 167 insertions(+), 70 deletions(-) diff --git a/alcs-frontend/src/app/features/application/application.component.html b/alcs-frontend/src/app/features/application/application.component.html index 88d26342b3..5e2933a43d 100644 --- a/alcs-frontend/src/app/features/application/application.component.html +++ b/alcs-frontend/src/app/features/application/application.component.html @@ -7,6 +7,7 @@ days="Business Days" heading="Application" [showStatus]="true" + [submissionStatusService]="applicationStatusService" >
diff --git a/alcs-frontend/src/app/features/application/application.component.spec.ts b/alcs-frontend/src/app/features/application/application.component.spec.ts index 922f255b51..c7075098d1 100644 --- a/alcs-frontend/src/app/features/application/application.component.spec.ts +++ b/alcs-frontend/src/app/features/application/application.component.spec.ts @@ -12,6 +12,7 @@ import { ApplicationReviewService } from '../../services/application/application import { ApplicationDto } from '../../services/application/application.dto'; import { ApplicationService } from '../../services/application/application.service'; import { ApplicationSubmissionService } from '../../services/application/application-submission/application-submission.service'; +import { ApplicationSubmissionStatusService } from '../../services/application/application-submission-status/application-submission-status.service'; import { ApplicationComponent } from './application.component'; @@ -23,6 +24,7 @@ describe('ApplicationComponent', () => { let mockModificationService: DeepMocked; let mockReviewService: DeepMocked; let mockAppSubmissionService: DeepMocked; + let mockAppStatusService: DeepMocked; beforeEach(async () => { mockAppDetailService = createMock(); @@ -36,6 +38,7 @@ describe('ApplicationComponent', () => { mockReviewService = createMock(); mockAppSubmissionService = createMock(); + mockAppStatusService = createMock(); await TestBed.configureTestingModule({ providers: [ @@ -63,6 +66,10 @@ describe('ApplicationComponent', () => { provide: ApplicationSubmissionService, useValue: mockAppSubmissionService, }, + { + provide: ApplicationSubmissionStatusService, + useValue: mockAppStatusService, + }, { provide: ActivatedRoute, useValue: { diff --git a/alcs-frontend/src/app/features/application/application.component.ts b/alcs-frontend/src/app/features/application/application.component.ts index d71435a940..1c8bc34267 100644 --- a/alcs-frontend/src/app/features/application/application.component.ts +++ b/alcs-frontend/src/app/features/application/application.component.ts @@ -26,6 +26,7 @@ import { OverviewComponent } from './overview/overview.component'; import { PostDecisionComponent } from './post-decision/post-decision.component'; import { ProposalComponent } from './proposal/proposal.component'; import { ReviewComponent } from './review/review.component'; +import { ApplicationSubmissionStatusService } from '../../services/application/application-submission-status/application-submission-status.service'; export const unsubmittedRoutes = [ { @@ -183,7 +184,8 @@ export class ApplicationComponent implements OnInit, OnDestroy { private reconsiderationService: ApplicationReconsiderationService, private modificationService: ApplicationModificationService, private route: ActivatedRoute, - private titleService: Title + private titleService: Title, + public applicationStatusService: ApplicationSubmissionStatusService ) {} ngOnInit(): void { diff --git a/alcs-frontend/src/app/features/notice-of-intent/notice-of-intent.component.html b/alcs-frontend/src/app/features/notice-of-intent/notice-of-intent.component.html index a2892276a2..12df253cf8 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/notice-of-intent.component.html +++ b/alcs-frontend/src/app/features/notice-of-intent/notice-of-intent.component.html @@ -6,6 +6,8 @@ [reconsiderations]="[]" [modifications]="modifications" days="Calendar Days" + [showStatus]="true" + [submissionStatusService]="noticeOfIntentStatusService" >
diff --git a/alcs-frontend/src/app/features/notice-of-intent/notice-of-intent.component.spec.ts b/alcs-frontend/src/app/features/notice-of-intent/notice-of-intent.component.spec.ts index 77713f6114..c8ee869f36 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/notice-of-intent.component.spec.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/notice-of-intent.component.spec.ts @@ -7,6 +7,7 @@ import { NoticeOfIntentDetailService } from '../../services/notice-of-intent/not import { NoticeOfIntentModificationDto } from '../../services/notice-of-intent/notice-of-intent-modification/notice-of-intent-modification.dto'; import { NoticeOfIntentModificationService } from '../../services/notice-of-intent/notice-of-intent-modification/notice-of-intent-modification.service'; import { NoticeOfIntentDto } from '../../services/notice-of-intent/notice-of-intent.dto'; +import { NoticeOfIntentSubmissionStatusService } from '../../services/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service'; import { NoticeOfIntentComponent } from './notice-of-intent.component'; @@ -15,13 +16,14 @@ describe('NoticeOfIntentComponent', () => { let fixture: ComponentFixture; let mockNOIDetailService: DeepMocked; let mockNOIModificationService: DeepMocked; + let mockNOIStatusService: DeepMocked; beforeEach(async () => { mockNOIDetailService = createMock(); mockNOIDetailService.$noticeOfIntent = new BehaviorSubject(undefined); mockNOIModificationService = createMock(); - mockNOIModificationService.$modifications = new BehaviorSubject([]); + mockNOIStatusService = createMock(); await TestBed.configureTestingModule({ providers: [ @@ -39,6 +41,10 @@ describe('NoticeOfIntentComponent', () => { provide: NoticeOfIntentModificationService, useValue: mockNOIModificationService, }, + { + provide: NoticeOfIntentSubmissionStatusService, + useValue: mockNOIStatusService, + }, { provide: Router, useValue: {}, diff --git a/alcs-frontend/src/app/features/notice-of-intent/notice-of-intent.component.ts b/alcs-frontend/src/app/features/notice-of-intent/notice-of-intent.component.ts index 3b5486bc9b..a856eda4ab 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/notice-of-intent.component.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/notice-of-intent.component.ts @@ -15,6 +15,7 @@ import { IntakeComponent } from './intake/intake.component'; import { OverviewComponent } from './overview/overview.component'; import { PostDecisionComponent } from './post-decision/post-decision.component'; import { ProposalComponent } from './proposal/proposal.component'; +import { NoticeOfIntentSubmissionStatusService } from '../../services/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service'; export const childRoutes = [ { @@ -89,7 +90,8 @@ export class NoticeOfIntentComponent implements OnInit, OnDestroy { private noticeOfIntentDetailService: NoticeOfIntentDetailService, private noticeOfIntentModificationService: NoticeOfIntentModificationService, private route: ActivatedRoute, - private titleService: Title + private titleService: Title, + public noticeOfIntentStatusService: NoticeOfIntentSubmissionStatusService ) {} ngOnInit(): void { diff --git a/alcs-frontend/src/app/features/notice-of-intent/overview/overview.component.spec.ts b/alcs-frontend/src/app/features/notice-of-intent/overview/overview.component.spec.ts index ecfae7257b..8bbd55cfa1 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/overview/overview.component.spec.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/overview/overview.component.spec.ts @@ -3,15 +3,12 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { BehaviorSubject } from 'rxjs'; import { NoticeOfIntentDecisionService } from '../../../services/notice-of-intent/decision/notice-of-intent-decision.service'; -import { NoticeOfIntentMeetingDto } from '../../../services/notice-of-intent/meeting/notice-of-intent-meeting.dto'; -import { NoticeOfIntentMeetingService } from '../../../services/notice-of-intent/meeting/notice-of-intent-meeting.service'; import { NoticeOfIntentDetailService } from '../../../services/notice-of-intent/notice-of-intent-detail.service'; -import { NoticeOfIntentModificationDto } from '../../../services/notice-of-intent/notice-of-intent-modification/notice-of-intent-modification.dto'; -import { NoticeOfIntentModificationService } from '../../../services/notice-of-intent/notice-of-intent-modification/notice-of-intent-modification.service'; import { NoticeOfIntentTimelineService } from '../../../services/notice-of-intent/notice-of-intent-timeline/notice-of-intent-timeline.service'; import { NoticeOfIntentDto } from '../../../services/notice-of-intent/notice-of-intent.dto'; import { OverviewComponent } from './overview.component'; +import { NoticeOfIntentSubmissionStatusService } from '../../../services/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service'; describe('OverviewComponent', () => { let component: OverviewComponent; @@ -30,7 +27,14 @@ describe('OverviewComponent', () => { provide: NoticeOfIntentDetailService, useValue: mockNOIDetailService, }, - { provide: NoticeOfIntentTimelineService, useValue: {} }, + { + provide: NoticeOfIntentTimelineService, + useValue: {}, + }, + { + provide: NoticeOfIntentSubmissionStatusService, + useValue: {}, + }, ], declarations: [OverviewComponent], schemas: [NO_ERRORS_SCHEMA], diff --git a/alcs-frontend/src/app/features/notice-of-intent/overview/overview.component.ts b/alcs-frontend/src/app/features/notice-of-intent/overview/overview.component.ts index 240cb4c737..020785d29d 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/overview/overview.component.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/overview/overview.component.ts @@ -3,7 +3,12 @@ import { Subject, takeUntil } from 'rxjs'; import { NoticeOfIntentDetailService } from '../../../services/notice-of-intent/notice-of-intent-detail.service'; import { TimelineEventDto } from '../../../services/notice-of-intent/notice-of-intent-timeline/notice-of-intent-timeline.dto'; import { NoticeOfIntentTimelineService } from '../../../services/notice-of-intent/notice-of-intent-timeline/notice-of-intent-timeline.service'; -import { NoticeOfIntentDto } from '../../../services/notice-of-intent/notice-of-intent.dto'; +import { + NOI_SUBMISSION_STATUS, + NoticeOfIntentDto, + NoticeOfIntentSubmissionToSubmissionStatusDto, +} from '../../../services/notice-of-intent/notice-of-intent.dto'; +import { NoticeOfIntentSubmissionStatusService } from '../../../services/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service'; @Component({ selector: 'app-overview', @@ -15,9 +20,11 @@ export class OverviewComponent implements OnInit, OnDestroy { noticeOfIntent?: NoticeOfIntentDto; events: TimelineEventDto[] = []; summary = ''; + isCancelled = false; constructor( private noticeOfIntentDetailService: NoticeOfIntentDetailService, + private noticeOfIntentSubmissionStatusService: NoticeOfIntentSubmissionStatusService, private noticeOfIntentTimelineService: NoticeOfIntentTimelineService ) {} @@ -26,7 +33,9 @@ export class OverviewComponent implements OnInit, OnDestroy { .pipe(takeUntil(this.$destroy)) .subscribe(async (noticeOfIntent) => { if (noticeOfIntent) { + this.noticeOfIntent = noticeOfIntent; this.events = await this.noticeOfIntentTimelineService.fetchByFileNumber(noticeOfIntent.fileNumber); + this.loadStatusHistory(this.noticeOfIntent.fileNumber); } }); } @@ -43,4 +52,21 @@ export class OverviewComponent implements OnInit, OnDestroy { }); } } + + private async loadStatusHistory(fileNumber: string) { + let statusHistory: NoticeOfIntentSubmissionToSubmissionStatusDto[] = []; + try { + statusHistory = await this.noticeOfIntentSubmissionStatusService.fetchSubmissionStatusesByFileNumber( + fileNumber, + false + ); + } catch (e) { + console.warn(`No statuses for ${fileNumber}. Is it a manually created submission?`); + } + + this.isCancelled = + statusHistory.filter( + (status) => status.effectiveDate && status.statusTypeCode === NOI_SUBMISSION_STATUS.CANCELLED + ).length > 0; + } } diff --git a/alcs-frontend/src/app/services/application/application-timeline/application-timeline.service.ts b/alcs-frontend/src/app/services/application/application-timeline/application-timeline.service.ts index f352192b1b..ef4d70d910 100644 --- a/alcs-frontend/src/app/services/application/application-timeline/application-timeline.service.ts +++ b/alcs-frontend/src/app/services/application/application-timeline/application-timeline.service.ts @@ -18,7 +18,7 @@ export class ApplicationTimelineService { return await firstValueFrom(this.http.get(`${this.url}/${fileNumber}`)); } catch (err) { console.error(err); - this.toastService.showErrorToast('Failed to timeline events'); + this.toastService.showErrorToast('Failed to fetch timeline events'); } return []; } diff --git a/alcs-frontend/src/app/shared/details-header/details-header.component.spec.ts b/alcs-frontend/src/app/shared/details-header/details-header.component.spec.ts index e60103b521..9172e881a3 100644 --- a/alcs-frontend/src/app/shared/details-header/details-header.component.spec.ts +++ b/alcs-frontend/src/app/shared/details-header/details-header.component.spec.ts @@ -1,27 +1,17 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; -import { createMock, DeepMocked } from '@golevelup/ts-jest'; -import { ApplicationSubmissionStatusService } from '../../services/application/application-submission-status/application-submission-status.service'; import { DetailsHeaderComponent } from './details-header.component'; describe('DetailsHeaderComponent', () => { let component: DetailsHeaderComponent; let fixture: ComponentFixture; - let mockApplicationSubmissionStatusService: DeepMocked; beforeEach(async () => { - mockApplicationSubmissionStatusService = createMock(); - await TestBed.configureTestingModule({ imports: [RouterTestingModule], declarations: [DetailsHeaderComponent], - providers: [ - { - provide: ApplicationSubmissionStatusService, - useValue: mockApplicationSubmissionStatusService, - }, - ], + providers: [], }).compileComponents(); fixture = TestBed.createComponent(DetailsHeaderComponent); diff --git a/alcs-frontend/src/app/shared/details-header/details-header.component.ts b/alcs-frontend/src/app/shared/details-header/details-header.component.ts index 607858a36d..7880383436 100644 --- a/alcs-frontend/src/app/shared/details-header/details-header.component.ts +++ b/alcs-frontend/src/app/shared/details-header/details-header.component.ts @@ -17,6 +17,7 @@ import { RECON_TYPE_LABEL, RETROACTIVE_TYPE_LABEL, } from '../application-type-pill/application-type-pill.constants'; +import { NoticeOfIntentSubmissionStatusService } from '../../services/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service'; @Component({ selector: 'app-details-header[application]', @@ -30,6 +31,7 @@ export class DetailsHeaderComponent { @Input() types: ApplicationTypeDto[] = []; @Input() days = 'Calendar Days'; @Input() showStatus = false; + @Input() submissionStatusService?: ApplicationSubmissionStatusService | NoticeOfIntentSubmissionStatusService; legacyId?: string; @@ -61,17 +63,16 @@ export class DetailsHeaderComponent { this.legacyId = application.legacyId; } - if (this.showStatus) { + if (this.showStatus && this.submissionStatusService) { this.submissionStatusService .fetchCurrentStatusByFileNumber(application.fileNumber, false) - .then( - (status) => - (this.currentStatus = { - label: status.status.label, - backgroundColor: status.status.alcsBackgroundColor, - textColor: status.status.alcsColor, - }) - ) + .then((res) => { + this.currentStatus = { + label: res.status.label, + backgroundColor: res.status.alcsBackgroundColor, + textColor: res.status.alcsColor, + }; + }) .catch((e) => { console.warn(`No statuses for ${application.fileNumber}. Is it a manually created submission?`); this.currentStatus = DEFAULT_NO_STATUS; @@ -106,7 +107,7 @@ export class DetailsHeaderComponent { isNOI = false; currentStatus?: ApplicationSubmissionStatusPill; - constructor(private router: Router, private submissionStatusService: ApplicationSubmissionStatusService) {} + constructor(private router: Router) {} async onGoToCard(card: CardDto) { const boardCode = card.boardCode; diff --git a/services/apps/alcs/src/alcs/application/application-timeline/application-timeline.service.spec.ts b/services/apps/alcs/src/alcs/application/application-timeline/application-timeline.service.spec.ts index b675cd35f1..564840e87a 100644 --- a/services/apps/alcs/src/alcs/application/application-timeline/application-timeline.service.spec.ts +++ b/services/apps/alcs/src/alcs/application/application-timeline/application-timeline.service.spec.ts @@ -8,9 +8,6 @@ import { ApplicationModification } from '../../application-decision/application- import { ApplicationReconsideration } from '../../application-decision/application-reconsideration/application-reconsideration.entity'; import { ApplicationReconsiderationOutcomeType } from '../../application-decision/application-reconsideration/reconsideration-outcome-type/application-reconsideration-outcome-type.entity'; import { ApplicationReconsiderationType } from '../../application-decision/application-reconsideration/reconsideration-type/application-reconsideration-type.entity'; -import { NoticeOfIntentMeetingType } from '../../notice-of-intent/notice-of-intent-meeting/notice-of-intent-meeting-type.entity'; -import { NoticeOfIntentMeeting } from '../../notice-of-intent/notice-of-intent-meeting/notice-of-intent-meeting.entity'; -import { NoticeOfIntent } from '../../notice-of-intent/notice-of-intent.entity'; import { ApplicationMeeting } from '../application-meeting/application-meeting.entity'; import { ApplicationMeetingService } from '../application-meeting/application-meeting.service'; import { ApplicationPaused } from '../application-paused.entity'; diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-timeline/notice-of-intent-timeline.module.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-timeline/notice-of-intent-timeline.module.ts index 45ed940a72..a904ce6ca9 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-timeline/notice-of-intent-timeline.module.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-timeline/notice-of-intent-timeline.module.ts @@ -6,6 +6,7 @@ import { NoticeOfIntent } from '../notice-of-intent.entity'; import { NoticeOfIntentModule } from '../notice-of-intent.module'; import { NoticeOfIntentTimelineController } from './notice-of-intent-timeline.controller'; import { NoticeOfIntentTimelineService } from './notice-of-intent-timeline.service'; +import { NoticeOfIntentSubmissionStatusModule } from '../notice-of-intent-submission-status/notice-of-intent-submission-status.module'; @Module({ imports: [ @@ -15,6 +16,7 @@ import { NoticeOfIntentTimelineService } from './notice-of-intent-timeline.servi NoticeOfIntentDecision, ]), NoticeOfIntentModule, + NoticeOfIntentSubmissionStatusModule, ], providers: [NoticeOfIntentTimelineService], controllers: [NoticeOfIntentTimelineController], diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-timeline/notice-of-intent-timeline.service.spec.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-timeline/notice-of-intent-timeline.service.spec.ts index 6bed075791..3204ca01cb 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-timeline/notice-of-intent-timeline.service.spec.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-timeline/notice-of-intent-timeline.service.spec.ts @@ -11,6 +11,9 @@ import { NoticeOfIntentMeetingService } from '../notice-of-intent-meeting/notice import { NoticeOfIntent } from '../notice-of-intent.entity'; import { NoticeOfIntentService } from '../notice-of-intent.service'; import { NoticeOfIntentTimelineService } from './notice-of-intent-timeline.service'; +import { NoticeOfIntentSubmissionStatusService } from '../notice-of-intent-submission-status/notice-of-intent-submission-status.service'; +import { NoticeOfIntentSubmissionToSubmissionStatus } from '../notice-of-intent-submission-status/notice-of-intent-status.entity'; +import { NOI_SUBMISSION_STATUS } from '../notice-of-intent-submission-status/notice-of-intent-status.dto'; describe('NoticeOfIntentTimelineService', () => { let service: NoticeOfIntentTimelineService; @@ -21,6 +24,7 @@ describe('NoticeOfIntentTimelineService', () => { let mockNOIDecisionRepo: DeepMocked>; let mockNOIService: DeepMocked; let mockNOIMeetingService: DeepMocked; + let mockNOIStatusService: DeepMocked; beforeEach(async () => { mockNOIRepo = createMock(); @@ -28,6 +32,7 @@ describe('NoticeOfIntentTimelineService', () => { mockNOIDecisionRepo = createMock(); mockNOIService = createMock(); mockNOIMeetingService = createMock(); + mockNOIStatusService = createMock(); const module: TestingModule = await Test.createTestingModule({ providers: [ @@ -51,6 +56,10 @@ describe('NoticeOfIntentTimelineService', () => { provide: NoticeOfIntentMeetingService, useValue: mockNOIMeetingService, }, + { + provide: NoticeOfIntentSubmissionStatusService, + useValue: mockNOIStatusService, + }, NoticeOfIntentTimelineService, ], }).compile(); @@ -64,6 +73,7 @@ describe('NoticeOfIntentTimelineService', () => { mockNOIModificationRepo.find.mockResolvedValue([]); mockNOIMeetingService.getByFileNumber.mockResolvedValue([]); mockNOIService.mapToDtos.mockResolvedValue([]); + mockNOIStatusService.getCurrentStatusesByFileNumber.mockResolvedValue([]); }); it('should be defined', () => { @@ -91,12 +101,9 @@ describe('NoticeOfIntentTimelineService', () => { const res = await service.getTimelineEvents('file-number'); expect(res).toBeDefined(); - expect(res.length).toEqual(5); + expect(res.length).toEqual(2); expect(res[0].htmlText).toEqual('Acknowledged Complete'); expect(res[1].htmlText).toEqual('Fee Received Date'); - expect(res[2].htmlText).toEqual('Received All Items'); - expect(res[3].htmlText).toEqual('Acknowledged Incomplete'); - expect(res[4].htmlText).toEqual('Submitted to ALC'); }); it('should map Decision Events', async () => { @@ -184,4 +191,43 @@ describe('NoticeOfIntentTimelineService', () => { expect(res[1].htmlText).toEqual('Meeting #1'); expect(res[0].htmlText).toEqual('Meeting #2'); }); + + it('should map Status Events', async () => { + const sameDate = new Date(); + mockNOIStatusService.getCurrentStatusesByFileNumber.mockResolvedValue([ + new NoticeOfIntentSubmissionToSubmissionStatus({ + statusType: { + code: NOI_SUBMISSION_STATUS.RECEIVED_BY_ALC, + weight: 2, + } as any, + effectiveDate: sameDate, + }), + new NoticeOfIntentSubmissionToSubmissionStatus({ + statusType: { + code: NOI_SUBMISSION_STATUS.IN_PROGRESS, + weight: 0, + } as any, + effectiveDate: sameDate, + }), + new NoticeOfIntentSubmissionToSubmissionStatus({ + statusType: { + code: NOI_SUBMISSION_STATUS.SUBMITTED_TO_ALC_INCOMPLETE, + weight: 1, + } as any, + effectiveDate: sameDate, + }), + ]); + + const res = await service.getTimelineEvents('file-number'); + + expect(res).toBeDefined(); + expect(res.length).toEqual(3); + expect(res[2].htmlText).toEqual('Created - In Progress'); + expect(res[1].htmlText).toEqual( + 'Acknowledged Incomplete - Submitted to ALC - Incomplete', + ); + expect(res[0].htmlText).toEqual( + 'Received All Items - Received by ALC', + ); + }); }); diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-timeline/notice-of-intent-timeline.service.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-timeline/notice-of-intent-timeline.service.ts index 1f538aebd3..8c0d7283bf 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-timeline/notice-of-intent-timeline.service.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-timeline/notice-of-intent-timeline.service.ts @@ -7,6 +7,8 @@ import { NoticeOfIntentModification } from '../../notice-of-intent-decision/noti import { NoticeOfIntentMeetingService } from '../notice-of-intent-meeting/notice-of-intent-meeting.service'; import { NoticeOfIntent } from '../notice-of-intent.entity'; import { NoticeOfIntentService } from '../notice-of-intent.service'; +import { NoticeOfIntentSubmissionStatusService } from '../notice-of-intent-submission-status/notice-of-intent-submission-status.service'; +import { NOI_SUBMISSION_STATUS } from '../notice-of-intent-submission-status/notice-of-intent-status.dto'; export interface TimelineEvent { htmlText: string; @@ -45,6 +47,7 @@ export class NoticeOfIntentTimelineService { private noticeOfIntentDecisionRepo: Repository, private noticeOfIntentService: NoticeOfIntentService, private noticeOfIntentMeetingService: NoticeOfIntentMeetingService, + private noticeOfIntentSubmissionStatusService: NoticeOfIntentSubmissionStatusService, ) {} async getTimelineEvents(fileNumber: string) { @@ -67,6 +70,7 @@ export class NoticeOfIntentTimelineService { await this.addDecisionEvents(noticeOfIntent, events); await this.addModificationEvents(noticeOfIntent, events); await this.addMeetingEvents(noticeOfIntent, events); + await this.addStatusEvents(noticeOfIntent, events); if (noticeOfIntent.card) { for (const subtask of noticeOfIntent.card.subtasks) { @@ -83,27 +87,6 @@ export class NoticeOfIntentTimelineService { noticeOfIntent: NoticeOfIntent, events: TimelineEvent[], ) { - if (noticeOfIntent.dateSubmittedToAlc) { - events.push({ - htmlText: 'Submitted to ALC', - startDate: - noticeOfIntent.dateSubmittedToAlc.getTime() + SORTING_ORDER.SUBMITTED, - isFulfilled: true, - fulfilledDate: null, - }); - } - - if (noticeOfIntent.dateAcknowledgedIncomplete) { - events.push({ - htmlText: 'Acknowledged Incomplete', - startDate: - noticeOfIntent.dateAcknowledgedIncomplete.getTime() + - SORTING_ORDER.ACKNOWLEDGED_INCOMPLETE, - isFulfilled: true, - fulfilledDate: null, - }); - } - if (noticeOfIntent.dateAcknowledgedComplete) { events.push({ htmlText: 'Acknowledged Complete', @@ -124,17 +107,6 @@ export class NoticeOfIntentTimelineService { fulfilledDate: null, }); } - - if (noticeOfIntent.dateReceivedAllItems) { - events.push({ - htmlText: 'Received All Items', - startDate: - noticeOfIntent.dateReceivedAllItems.getTime() + - SORTING_ORDER.FEE_RECEIVED, - isFulfilled: true, - fulfilledDate: null, - }); - } } private mapSubtaskToEvent(subtask: CardSubtask): TimelineEvent { @@ -264,4 +236,43 @@ export class NoticeOfIntentTimelineService { typeCount.set(meeting.type.code, count + 1); }); } + + private async addStatusEvents( + noticeOfIntent: NoticeOfIntent, + events: TimelineEvent[], + ) { + const statusHistory = + await this.noticeOfIntentSubmissionStatusService.getCurrentStatusesByFileNumber( + noticeOfIntent.fileNumber, + ); + + for (const status of statusHistory) { + if (status.effectiveDate) { + let htmlText = `${status.statusType.label}`; + + if (status.statusType.code === NOI_SUBMISSION_STATUS.IN_PROGRESS) { + htmlText = 'Created - In Progress'; + } + + if ( + status.statusType.code === + NOI_SUBMISSION_STATUS.SUBMITTED_TO_ALC_INCOMPLETE + ) { + htmlText = + 'Acknowledged Incomplete - Submitted to ALC - Incomplete'; + } + + if (status.statusType.code === NOI_SUBMISSION_STATUS.RECEIVED_BY_ALC) { + htmlText = 'Received All Items - Received by ALC'; + } + + events.push({ + htmlText, + startDate: status.effectiveDate.getTime() + status.statusType.weight, + fulfilledDate: null, + isFulfilled: true, + }); + } + } + } } From 1276c919075c7379fa03d7cc76462daed1278df0 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Tue, 5 Sep 2023 15:51:48 -0700 Subject: [PATCH 340/954] Add Notification Statuses * Add statuses to notifications --- ...iew-notification-submission.component.html | 4 +- .../view-notification-submission.component.ts | 1 - .../notification-submission.dto.ts | 23 + .../notification-status-type.entity.ts | 40 ++ .../notification-status.dto.ts | 40 ++ .../notification-status.entity.ts | 50 +++ ...ation-submission-status.controller.spec.ts | 87 ++++ ...tification-submission-status.controller.ts | 45 ++ .../notification-submission-status.module.ts | 21 + ...fication-submission-status.service.spec.ts | 395 ++++++++++++++++++ .../notification-submission-status.service.ts | 126 ++++++ .../alcs/notification/notification.module.ts | 2 + ...of-intent-submission.automapper.profile.ts | 13 +- ...ification-submission.automapper.profile.ts | 52 +++ ...notification-submission.controller.spec.ts | 143 ++++--- .../notification-submission.controller.ts | 34 +- .../notification-submission.entity.ts | 45 ++ .../notification-submission.module.ts | 2 + .../notification-submission.service.spec.ts | 16 + .../notification-submission.service.ts | 48 +-- ...1693952313867-add_notification_statuses.ts | 37 ++ ...693952400742-seed_notification_statuses.ts | 20 + 22 files changed, 1133 insertions(+), 111 deletions(-) create mode 100644 services/apps/alcs/src/alcs/notification/notification-submission-status/notification-status-type.entity.ts create mode 100644 services/apps/alcs/src/alcs/notification/notification-submission-status/notification-status.dto.ts create mode 100644 services/apps/alcs/src/alcs/notification/notification-submission-status/notification-status.entity.ts create mode 100644 services/apps/alcs/src/alcs/notification/notification-submission-status/notification-submission-status.controller.spec.ts create mode 100644 services/apps/alcs/src/alcs/notification/notification-submission-status/notification-submission-status.controller.ts create mode 100644 services/apps/alcs/src/alcs/notification/notification-submission-status/notification-submission-status.module.ts create mode 100644 services/apps/alcs/src/alcs/notification/notification-submission-status/notification-submission-status.service.spec.ts create mode 100644 services/apps/alcs/src/alcs/notification/notification-submission-status/notification-submission-status.service.ts create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1693952313867-add_notification_statuses.ts create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1693952400742-seed_notification_statuses.ts diff --git a/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.html b/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.html index 421cdfab6d..1809b0a6e6 100644 --- a/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.html +++ b/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.html @@ -9,7 +9,7 @@

SRW ID: {{ submission.fileNumber }}

SRW Status
- TODO + {{ submission.status.label }}
@@ -24,7 +24,7 @@

SRW ID: {{ submission.fileNumber }}

SRW Status
- TODO + {{ submission.status.label }}
diff --git a/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.ts b/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.ts index 3bafb2e64c..b14c06927f 100644 --- a/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.ts +++ b/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.ts @@ -1,7 +1,6 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; import { BehaviorSubject, Subject, takeUntil } from 'rxjs'; -import { NoticeOfIntentSubmissionDetailedDto } from '../../../services/notice-of-intent-submission/notice-of-intent-submission.dto'; import { NotificationSubmissionDto } from '../../../services/notification-submission/notification-submission.dto'; import { NotificationSubmissionService } from '../../../services/notification-submission/notification-submission.service'; diff --git a/portal-frontend/src/app/services/notification-submission/notification-submission.dto.ts b/portal-frontend/src/app/services/notification-submission/notification-submission.dto.ts index 4cc056db23..70dcc62f46 100644 --- a/portal-frontend/src/app/services/notification-submission/notification-submission.dto.ts +++ b/portal-frontend/src/app/services/notification-submission/notification-submission.dto.ts @@ -1,5 +1,27 @@ +import { BaseCodeDto } from '../../shared/dto/base.dto'; +import { NOI_SUBMISSION_STATUS } from '../notice-of-intent-submission/notice-of-intent-submission.dto'; import { NotificationTransfereeDto } from '../notification-transferee/notification-transferee.dto'; +export enum NOTIFICATION_STATUS { + IN_PROGRESS = 'PROG', + SUBMITTED_TO_ALC = 'SUBM', //Submitted to ALC + ALC_RESPONSE = 'ALCR', // Response sent + CANCELLED = 'CANC', +} + +export interface NotificationSubmissionStatusDto extends BaseCodeDto { + code: NOI_SUBMISSION_STATUS; + portalBackgroundColor: string; + portalColor: string; +} + +export interface NotificationSubmissionToSubmissionStatusDto { + submissionUuid: string; + effectiveDate: number | null; + statusTypeCode: string; + status: NotificationSubmissionStatusDto; +} + export interface NotificationSubmissionDto { fileNumber: string; uuid: string; @@ -9,6 +31,7 @@ export interface NotificationSubmissionDto { localGovernmentUuid: string; type: string; typeCode: string; + status: NotificationSubmissionStatusDto; lastStatusUpdate: number; owners: NotificationTransfereeDto[]; canEdit: boolean; diff --git a/services/apps/alcs/src/alcs/notification/notification-submission-status/notification-status-type.entity.ts b/services/apps/alcs/src/alcs/notification/notification-submission-status/notification-status-type.entity.ts new file mode 100644 index 0000000000..dea2524aa9 --- /dev/null +++ b/services/apps/alcs/src/alcs/notification/notification-submission-status/notification-status-type.entity.ts @@ -0,0 +1,40 @@ +import { AutoMap } from '@automapper/classes'; +import { Column, Entity, OneToMany } from 'typeorm'; +import { BaseCodeEntity } from '../../../common/entities/base.code.entity'; +import { NotificationSubmissionToSubmissionStatus } from './notification-status.entity'; + +@Entity() +export class NotificationSubmissionStatusType extends BaseCodeEntity { + constructor(data?: Partial) { + super(); + if (data) { + Object.assign(this, data); + } + } + + @AutoMap(() => Number) + @Column({ type: 'smallint', default: 0 }) + weight: number; + + @OneToMany( + () => NotificationSubmissionToSubmissionStatus, + (s) => s.statusType, + ) + public submissionStatuses: NotificationSubmissionToSubmissionStatus[]; + + @AutoMap() + @Column() + alcsBackgroundColor: string; + + @AutoMap() + @Column() + alcsColor: string; + + @AutoMap() + @Column() + portalBackgroundColor: string; + + @AutoMap() + @Column() + portalColor: string; +} diff --git a/services/apps/alcs/src/alcs/notification/notification-submission-status/notification-status.dto.ts b/services/apps/alcs/src/alcs/notification/notification-submission-status/notification-status.dto.ts new file mode 100644 index 0000000000..79a2b17821 --- /dev/null +++ b/services/apps/alcs/src/alcs/notification/notification-submission-status/notification-status.dto.ts @@ -0,0 +1,40 @@ +import { AutoMap } from '@automapper/classes'; +import { BaseCodeDto } from '../../../common/dtos/base.dto'; + +export enum NOTIFICATION_STATUS { + IN_PROGRESS = 'PROG', + SUBMITTED_TO_ALC = 'SUBM', //Submitted to ALC + ALC_RESPONSE_SENT = 'ALCR', //Response sent to applicant + CANCELLED = 'CANC', +} + +export class NotificationStatusDto extends BaseCodeDto { + @AutoMap() + alcsBackgroundColor: string; + + @AutoMap() + alcsColor: string; + + @AutoMap() + portalBackgroundColor: string; + + @AutoMap() + portalColor: string; + + @AutoMap() + weight: number; +} + +export class NotificationSubmissionToSubmissionStatusDto { + @AutoMap() + submissionUuid: string; + + @AutoMap() + effectiveDate: number; + + @AutoMap() + statusTypeCode: string; + + @AutoMap(() => NotificationStatusDto) + status: NotificationStatusDto; +} diff --git a/services/apps/alcs/src/alcs/notification/notification-submission-status/notification-status.entity.ts b/services/apps/alcs/src/alcs/notification/notification-submission-status/notification-status.entity.ts new file mode 100644 index 0000000000..b21e291e41 --- /dev/null +++ b/services/apps/alcs/src/alcs/notification/notification-submission-status/notification-status.entity.ts @@ -0,0 +1,50 @@ +import { AutoMap } from '@automapper/classes'; +import { + BaseEntity, + Column, + Entity, + JoinColumn, + ManyToOne, + PrimaryColumn, +} from 'typeorm'; +import { NotificationSubmission } from '../../../portal/notification-submission/notification-submission.entity'; +import { NotificationSubmissionStatusType } from './notification-status-type.entity'; + +@Entity() +export class NotificationSubmissionToSubmissionStatus extends BaseEntity { + constructor(data?: Partial) { + super(); + if (data) { + Object.assign(this, data); + } + } + + @AutoMap(() => Date) + @Column({ type: 'timestamptz', nullable: true }) + effectiveDate: Date | null; + + @AutoMap() + @PrimaryColumn({ type: 'uuid' }) + submissionUuid: string; + + @AutoMap() + @ManyToOne( + () => NotificationSubmission, + (submission) => submission.submissionStatuses, + ) + @JoinColumn({ name: 'submission_uuid' }) + submission: NotificationSubmission; + + @AutoMap() + @PrimaryColumn() + statusTypeCode: string; + + @AutoMap() + @ManyToOne( + () => NotificationSubmissionStatusType, + (status) => status.submissionStatuses, + { eager: true }, + ) + @JoinColumn({ name: 'status_type_code' }) + statusType: NotificationSubmissionStatusType; +} diff --git a/services/apps/alcs/src/alcs/notification/notification-submission-status/notification-submission-status.controller.spec.ts b/services/apps/alcs/src/alcs/notification/notification-submission-status/notification-submission-status.controller.spec.ts new file mode 100644 index 0000000000..c066f98dfa --- /dev/null +++ b/services/apps/alcs/src/alcs/notification/notification-submission-status/notification-submission-status.controller.spec.ts @@ -0,0 +1,87 @@ +import { classes } from '@automapper/classes'; +import { AutomapperModule } from '@automapper/nestjs'; +import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; +import { Test, TestingModule } from '@nestjs/testing'; +import { ClsService } from 'nestjs-cls'; +import { mockKeyCloakProviders } from '../../../../test/mocks/mockTypes'; +import { NotificationSubmissionProfile } from '../../../common/automapper/notification-submission.automapper.profile'; +import { NotificationSubmissionToSubmissionStatus } from './notification-status.entity'; +import { NotificationSubmissionStatusController } from './notification-submission-status.controller'; +import { NotificationSubmissionStatusService } from './notification-submission-status.service'; + +describe('NotificationSubmissionStatusController', () => { + let controller: NotificationSubmissionStatusController; + let mockNoticeOfIntentSubmissionStatusService: DeepMocked; + + beforeEach(async () => { + mockNoticeOfIntentSubmissionStatusService = createMock(); + + const module: TestingModule = await Test.createTestingModule({ + controllers: [NotificationSubmissionStatusController], + providers: [ + NotificationSubmissionProfile, + { + provide: NotificationSubmissionStatusService, + useValue: mockNoticeOfIntentSubmissionStatusService, + }, + { + provide: ClsService, + useValue: {}, + }, + ...mockKeyCloakProviders, + ], + imports: [ + AutomapperModule.forRoot({ + strategyInitializer: classes(), + }), + ], + }).compile(); + + controller = module.get( + NotificationSubmissionStatusController, + ); + }); + + it('should be defined', () => { + expect(controller).toBeDefined(); + }); + + it('should call service to get statuses by file number', async () => { + const fakeFileNumber = 'fake'; + + mockNoticeOfIntentSubmissionStatusService.getCurrentStatusesByFileNumber.mockResolvedValue( + [new NotificationSubmissionToSubmissionStatus()], + ); + + const result = await controller.getStatusesByFileNumber(fakeFileNumber); + + expect( + mockNoticeOfIntentSubmissionStatusService.getCurrentStatusesByFileNumber, + ).toBeCalledTimes(1); + expect( + mockNoticeOfIntentSubmissionStatusService.getCurrentStatusesByFileNumber, + ).toBeCalledWith(fakeFileNumber); + expect(result.length).toEqual(1); + expect(result).toBeDefined(); + }); + + it('should call service to get current submission status by file number', async () => { + const fakeFileNumber = 'fake'; + + mockNoticeOfIntentSubmissionStatusService.getCurrentStatusByFileNumber.mockResolvedValue( + new NotificationSubmissionToSubmissionStatus(), + ); + + const result = await controller.getCurrentStatusByFileNumber( + fakeFileNumber, + ); + + expect( + mockNoticeOfIntentSubmissionStatusService.getCurrentStatusByFileNumber, + ).toBeCalledTimes(1); + expect( + mockNoticeOfIntentSubmissionStatusService.getCurrentStatusByFileNumber, + ).toBeCalledWith(fakeFileNumber); + expect(result).toBeDefined(); + }); +}); diff --git a/services/apps/alcs/src/alcs/notification/notification-submission-status/notification-submission-status.controller.ts b/services/apps/alcs/src/alcs/notification/notification-submission-status/notification-submission-status.controller.ts new file mode 100644 index 0000000000..501c6d8246 --- /dev/null +++ b/services/apps/alcs/src/alcs/notification/notification-submission-status/notification-submission-status.controller.ts @@ -0,0 +1,45 @@ +import { Mapper } from '@automapper/core'; +import { InjectMapper } from '@automapper/nestjs'; +import { Controller, Get, Param } from '@nestjs/common'; +import { ANY_AUTH_ROLE } from '../../../common/authorization/roles'; +import { UserRoles } from '../../../common/authorization/roles.decorator'; +import { NotificationSubmissionToSubmissionStatusDto } from './notification-status.dto'; +import { NotificationSubmissionToSubmissionStatus } from './notification-status.entity'; +import { NotificationSubmissionStatusService } from './notification-submission-status.service'; + +@Controller('notification-submission-status') +@UserRoles(...ANY_AUTH_ROLE) +export class NotificationSubmissionStatusController { + constructor( + private notificationSubmissionStatusService: NotificationSubmissionStatusService, + @InjectMapper() private mapper: Mapper, + ) {} + + @Get('/:fileNumber') + async getStatusesByFileNumber(@Param('fileNumber') fileNumber) { + const statuses = + await this.notificationSubmissionStatusService.getCurrentStatusesByFileNumber( + fileNumber, + ); + + return this.mapper.mapArrayAsync( + statuses, + NotificationSubmissionToSubmissionStatus, + NotificationSubmissionToSubmissionStatusDto, + ); + } + + @Get('/current-status/:fileNumber') + async getCurrentStatusByFileNumber(@Param('fileNumber') fileNumber) { + const status = + await this.notificationSubmissionStatusService.getCurrentStatusByFileNumber( + fileNumber, + ); + + return this.mapper.mapAsync( + status, + NotificationSubmissionToSubmissionStatus, + NotificationSubmissionToSubmissionStatusDto, + ); + } +} diff --git a/services/apps/alcs/src/alcs/notification/notification-submission-status/notification-submission-status.module.ts b/services/apps/alcs/src/alcs/notification/notification-submission-status/notification-submission-status.module.ts new file mode 100644 index 0000000000..d90a36722a --- /dev/null +++ b/services/apps/alcs/src/alcs/notification/notification-submission-status/notification-submission-status.module.ts @@ -0,0 +1,21 @@ +import { Module } from '@nestjs/common'; +import { TypeOrmModule } from '@nestjs/typeorm'; +import { NotificationSubmission } from '../../../portal/notification-submission/notification-submission.entity'; +import { NotificationSubmissionStatusType } from './notification-status-type.entity'; +import { NotificationSubmissionToSubmissionStatus } from './notification-status.entity'; +import { NotificationSubmissionStatusController } from './notification-submission-status.controller'; +import { NotificationSubmissionStatusService } from './notification-submission-status.service'; + +@Module({ + imports: [ + TypeOrmModule.forFeature([ + NotificationSubmissionToSubmissionStatus, + NotificationSubmissionStatusType, + NotificationSubmission, + ]), + ], + providers: [NotificationSubmissionStatusService], + exports: [NotificationSubmissionStatusService], + controllers: [NotificationSubmissionStatusController], +}) +export class NotificationSubmissionStatusModule {} diff --git a/services/apps/alcs/src/alcs/notification/notification-submission-status/notification-submission-status.service.spec.ts b/services/apps/alcs/src/alcs/notification/notification-submission-status/notification-submission-status.service.spec.ts new file mode 100644 index 0000000000..8bd6592946 --- /dev/null +++ b/services/apps/alcs/src/alcs/notification/notification-submission-status/notification-submission-status.service.spec.ts @@ -0,0 +1,395 @@ +import { ServiceNotFoundException } from '@app/common/exceptions/base.exception'; +import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; +import { Test, TestingModule } from '@nestjs/testing'; +import { getRepositoryToken } from '@nestjs/typeorm'; +import * as dayjs from 'dayjs'; +import * as timezone from 'dayjs/plugin/timezone'; +import * as utc from 'dayjs/plugin/utc'; +import { Repository } from 'typeorm'; +import { NotificationSubmission } from '../../../portal/notification-submission/notification-submission.entity'; +import { NotificationSubmissionStatusType } from './notification-status-type.entity'; +import { NOTIFICATION_STATUS } from './notification-status.dto'; +import { NotificationSubmissionToSubmissionStatus } from './notification-status.entity'; +import { NotificationSubmissionStatusService } from './notification-submission-status.service'; + +dayjs.extend(utc); +dayjs.extend(timezone); + +describe('NotificationSubmissionStatusService', () => { + let service: NotificationSubmissionStatusService; + let mockSubmissionToSubmissionStatusRepository: DeepMocked< + Repository + >; + let mockSubmissionStatusTypeRepository: DeepMocked< + Repository + >; + let mockNotificationSubmissionRepository: DeepMocked< + Repository + >; + + beforeEach(async () => { + jest.useFakeTimers().setSystemTime(new Date('2022-01-01')); + + mockSubmissionToSubmissionStatusRepository = createMock(); + mockSubmissionStatusTypeRepository = createMock(); + mockNotificationSubmissionRepository = createMock(); + + const module: TestingModule = await Test.createTestingModule({ + providers: [ + NotificationSubmissionStatusService, + { + provide: getRepositoryToken(NotificationSubmissionToSubmissionStatus), + useValue: mockSubmissionToSubmissionStatusRepository, + }, + { + provide: getRepositoryToken(NotificationSubmissionStatusType), + useValue: mockSubmissionStatusTypeRepository, + }, + { + provide: getRepositoryToken(NotificationSubmission), + useValue: mockNotificationSubmissionRepository, + }, + ], + }).compile(); + + service = module.get( + NotificationSubmissionStatusService, + ); + }); + + it('should be defined', () => { + expect(service).toBeDefined(); + }); + + it('should successfully set initial statuses', async () => { + mockSubmissionStatusTypeRepository.find.mockResolvedValue([ + new NotificationSubmissionStatusType({ + weight: 0, + code: NOTIFICATION_STATUS.IN_PROGRESS, + }), + new NotificationSubmissionStatusType({ + weight: 1, + code: NOTIFICATION_STATUS.ALC_RESPONSE_SENT, + }), + ]); + + const fakeSubmissionUuid = 'fake'; + + const savedStatuses: NotificationSubmissionToSubmissionStatus[] = [ + new NotificationSubmissionToSubmissionStatus({ + submissionUuid: fakeSubmissionUuid, + statusTypeCode: NOTIFICATION_STATUS.ALC_RESPONSE_SENT, + }), + new NotificationSubmissionToSubmissionStatus({ + submissionUuid: fakeSubmissionUuid, + statusTypeCode: NOTIFICATION_STATUS.IN_PROGRESS, + effectiveDate: new Date(), + }), + ]; + + mockSubmissionToSubmissionStatusRepository.save.mockResolvedValue( + savedStatuses as any, + ); + + const result = await service.setInitialStatuses(fakeSubmissionUuid); + + expect(mockSubmissionStatusTypeRepository.find).toBeCalledTimes(1); + expect(mockSubmissionStatusTypeRepository.find).toBeCalledWith(); + + expect(mockSubmissionToSubmissionStatusRepository.save).toBeCalledTimes(1); + expect(result).toMatchObject(savedStatuses); + }); + + it('Should return current statuses by submission uuid', async () => { + const fakeSubmissionUuid = 'fake'; + const mockStatuses = [ + new NotificationSubmissionToSubmissionStatus({ + submissionUuid: fakeSubmissionUuid, + statusTypeCode: NOTIFICATION_STATUS.IN_PROGRESS, + effectiveDate: new Date(), + }), + ]; + + mockSubmissionToSubmissionStatusRepository.findBy.mockResolvedValue( + mockStatuses, + ); + + const statuses = await service.getCurrentStatusesBy(fakeSubmissionUuid); + + expect( + mockSubmissionToSubmissionStatusRepository.findBy, + ).toHaveBeenCalledTimes(1); + expect( + mockSubmissionToSubmissionStatusRepository.findBy, + ).toHaveBeenCalledWith({ + submissionUuid: fakeSubmissionUuid, + }); + expect(statuses).toEqual(mockStatuses); + }); + + it('Should return current statuses by fileNumber', async () => { + const fakeSubmissionUuid = 'fake'; + const fakeFileNumber = 'fake-number'; + const mockStatuses = [ + new NotificationSubmissionToSubmissionStatus({ + submissionUuid: fakeSubmissionUuid, + statusTypeCode: NOTIFICATION_STATUS.IN_PROGRESS, + effectiveDate: new Date(), + }), + ]; + + mockSubmissionToSubmissionStatusRepository.findBy.mockResolvedValue( + mockStatuses, + ); + mockNotificationSubmissionRepository.findOneBy.mockResolvedValue( + new NotificationSubmission({ + uuid: fakeSubmissionUuid, + fileNumber: fakeFileNumber, + }), + ); + + const statuses = await service.getCurrentStatusesByFileNumber( + fakeFileNumber, + ); + + expect( + mockSubmissionToSubmissionStatusRepository.findBy, + ).toHaveBeenCalledTimes(1); + expect( + mockSubmissionToSubmissionStatusRepository.findBy, + ).toHaveBeenCalledWith({ + submissionUuid: fakeSubmissionUuid, + }); + expect(statuses).toEqual(mockStatuses); + expect( + mockNotificationSubmissionRepository.findOneBy, + ).toHaveBeenCalledTimes(1); + expect(mockNotificationSubmissionRepository.findOneBy).toHaveBeenCalledWith( + { + fileNumber: fakeFileNumber, + }, + ); + }); + + it('Should fail return current statuses by fileNumber if submission not found', async () => { + const fakeSubmissionUuid = 'fake'; + const fakeFileNumber = 'fake-number'; + const mockStatuses = [ + new NotificationSubmissionToSubmissionStatus({ + submissionUuid: fakeSubmissionUuid, + statusTypeCode: NOTIFICATION_STATUS.IN_PROGRESS, + effectiveDate: new Date(), + }), + ]; + + mockSubmissionToSubmissionStatusRepository.findBy.mockResolvedValue( + mockStatuses, + ); + mockNotificationSubmissionRepository.findOneBy.mockResolvedValue(null); + + await expect( + service.getCurrentStatusesByFileNumber(fakeFileNumber), + ).rejects.toMatchObject( + new ServiceNotFoundException( + `Submission does not exist for provided notice of intent ${fakeFileNumber}. Only notice of intents originated in portal have statuses.`, + ), + ); + + expect( + mockSubmissionToSubmissionStatusRepository.findBy, + ).toHaveBeenCalledTimes(0); + expect( + mockNotificationSubmissionRepository.findOneBy, + ).toHaveBeenCalledTimes(1); + }); + + it('Should set status effective date to now if no effective date passed', async () => { + const fakeSubmissionUuid = 'fake'; + const mockStatus = new NotificationSubmissionToSubmissionStatus({ + submissionUuid: fakeSubmissionUuid, + statusTypeCode: NOTIFICATION_STATUS.IN_PROGRESS, + effectiveDate: new Date(), + }); + + mockSubmissionToSubmissionStatusRepository.findOneOrFail.mockResolvedValue( + mockStatus, + ); + mockSubmissionToSubmissionStatusRepository.save.mockResolvedValue( + mockStatus, + ); + + const result = await service.setStatusDate( + fakeSubmissionUuid, + NOTIFICATION_STATUS.IN_PROGRESS, + ); + + expect( + mockSubmissionToSubmissionStatusRepository.findOneOrFail, + ).toBeCalledTimes(1); + expect( + mockSubmissionToSubmissionStatusRepository.findOneOrFail, + ).toBeCalledWith({ + where: { + submissionUuid: fakeSubmissionUuid, + statusTypeCode: NOTIFICATION_STATUS.IN_PROGRESS, + }, + }); + expect(result).toMatchObject(mockStatus); + }); + + it('Should set status effective date', async () => { + const fakeSubmissionUuid = 'fake'; + const mockStatus = new NotificationSubmissionToSubmissionStatus({ + submissionUuid: fakeSubmissionUuid, + statusTypeCode: NOTIFICATION_STATUS.IN_PROGRESS, + effectiveDate: new Date(), + }); + + mockSubmissionToSubmissionStatusRepository.findOneOrFail.mockResolvedValue( + mockStatus, + ); + mockSubmissionToSubmissionStatusRepository.save.mockResolvedValue( + new NotificationSubmissionToSubmissionStatus({ + ...mockStatus, + effectiveDate: new Date(1, 1, 1), + }), + ); + + const result = await service.setStatusDate( + fakeSubmissionUuid, + NOTIFICATION_STATUS.IN_PROGRESS, + ); + + expect( + mockSubmissionToSubmissionStatusRepository.findOneOrFail, + ).toBeCalledTimes(1); + expect( + mockSubmissionToSubmissionStatusRepository.findOneOrFail, + ).toBeCalledWith({ + where: { + submissionUuid: fakeSubmissionUuid, + statusTypeCode: NOTIFICATION_STATUS.IN_PROGRESS, + }, + }); + expect(result).toMatchObject( + new NotificationSubmissionToSubmissionStatus({ + ...mockStatus, + effectiveDate: new Date(1, 1, 1), + }), + ); + }); + + it('Should set status effective date by fileNumber', async () => { + const fakeSubmissionUuid = 'fake'; + const fakeFileNumber = 'fake-number'; + const mockStatus = new NotificationSubmissionToSubmissionStatus({ + submissionUuid: fakeSubmissionUuid, + statusTypeCode: NOTIFICATION_STATUS.IN_PROGRESS, + effectiveDate: new Date(), + }); + + mockSubmissionToSubmissionStatusRepository.findOneOrFail.mockResolvedValue( + mockStatus, + ); + mockSubmissionToSubmissionStatusRepository.save.mockResolvedValue( + mockStatus, + ); + mockNotificationSubmissionRepository.findOneBy.mockResolvedValue( + new NotificationSubmission({ + uuid: fakeSubmissionUuid, + fileNumber: fakeFileNumber, + }), + ); + + const result = await service.setStatusDateByFileNumber( + fakeFileNumber, + NOTIFICATION_STATUS.IN_PROGRESS, + ); + + expect( + mockSubmissionToSubmissionStatusRepository.findOneOrFail, + ).toBeCalledTimes(1); + expect( + mockSubmissionToSubmissionStatusRepository.findOneOrFail, + ).toBeCalledWith({ + where: { + submissionUuid: fakeSubmissionUuid, + statusTypeCode: NOTIFICATION_STATUS.IN_PROGRESS, + }, + }); + expect(result).toMatchObject(mockStatus); + expect( + mockNotificationSubmissionRepository.findOneBy, + ).toHaveBeenCalledTimes(1); + expect(mockNotificationSubmissionRepository.findOneBy).toHaveBeenCalledWith( + { + fileNumber: fakeFileNumber, + }, + ); + }); + + it('Should return current status by fileNumber', async () => { + const fakeSubmissionUuid = 'fake'; + const fakeFileNumber = 'fake-number'; + const mockStatus = new NotificationSubmissionToSubmissionStatus({ + submissionUuid: fakeSubmissionUuid, + statusTypeCode: NOTIFICATION_STATUS.IN_PROGRESS, + effectiveDate: new Date(), + }); + + mockNotificationSubmissionRepository.findOneBy.mockResolvedValue( + new NotificationSubmission({ + uuid: fakeSubmissionUuid, + fileNumber: fakeFileNumber, + status: mockStatus, + }), + ); + + const status = await service.getCurrentStatusByFileNumber(fakeFileNumber); + + expect(status).toEqual(mockStatus); + expect( + mockNotificationSubmissionRepository.findOneBy, + ).toHaveBeenCalledTimes(1); + expect(mockNotificationSubmissionRepository.findOneBy).toHaveBeenCalledWith( + { + fileNumber: fakeFileNumber, + }, + ); + }); + + it('Should remove statuses', async () => { + const fakeSubmissionUuid = 'fake'; + const mockStatuses = [ + new NotificationSubmissionToSubmissionStatus({ + submissionUuid: fakeSubmissionUuid, + statusTypeCode: NOTIFICATION_STATUS.IN_PROGRESS, + effectiveDate: new Date(), + }), + ]; + + mockSubmissionToSubmissionStatusRepository.findBy.mockResolvedValue( + mockStatuses, + ); + mockSubmissionToSubmissionStatusRepository.remove.mockResolvedValue( + {} as any, + ); + + await service.removeStatuses(fakeSubmissionUuid); + + expect( + mockSubmissionToSubmissionStatusRepository.findBy, + ).toHaveBeenCalledTimes(1); + expect( + mockSubmissionToSubmissionStatusRepository.findBy, + ).toHaveBeenCalledWith({ + submissionUuid: fakeSubmissionUuid, + }); + expect(mockSubmissionToSubmissionStatusRepository.remove).toBeCalledTimes( + 1, + ); + expect(mockSubmissionToSubmissionStatusRepository.remove).toBeCalledWith( + mockStatuses, + ); + }); +}); diff --git a/services/apps/alcs/src/alcs/notification/notification-submission-status/notification-submission-status.service.ts b/services/apps/alcs/src/alcs/notification/notification-submission-status/notification-submission-status.service.ts new file mode 100644 index 0000000000..cffbdef72f --- /dev/null +++ b/services/apps/alcs/src/alcs/notification/notification-submission-status/notification-submission-status.service.ts @@ -0,0 +1,126 @@ +import { ServiceNotFoundException } from '@app/common/exceptions/base.exception'; +import { Injectable } from '@nestjs/common'; +import { InjectRepository } from '@nestjs/typeorm'; +import * as dayjs from 'dayjs'; +import * as timezone from 'dayjs/plugin/timezone'; +import * as utc from 'dayjs/plugin/utc'; +import { Repository } from 'typeorm'; +import { NotificationSubmission } from '../../../portal/notification-submission/notification-submission.entity'; +import { NotificationSubmissionStatusType } from './notification-status-type.entity'; +import { NOTIFICATION_STATUS } from './notification-status.dto'; +import { NotificationSubmissionToSubmissionStatus } from './notification-status.entity'; + +dayjs.extend(utc); +dayjs.extend(timezone); + +@Injectable() +export class NotificationSubmissionStatusService { + constructor( + @InjectRepository(NotificationSubmissionToSubmissionStatus) + private statusesRepository: Repository, + @InjectRepository(NotificationSubmissionStatusType) + private submissionStatusTypeRepository: Repository, + @InjectRepository(NotificationSubmission) + private notificationSubmissionRepository: Repository, + ) {} + + async setInitialStatuses(submissionUuid: string, persist = true) { + const statuses = await this.submissionStatusTypeRepository.find(); + const newStatuses: NotificationSubmissionToSubmissionStatus[] = []; + + for (const status of statuses) { + const newStatus = new NotificationSubmissionToSubmissionStatus({ + submissionUuid: submissionUuid, + statusTypeCode: status.code, + }); + + if (newStatus.statusTypeCode === NOTIFICATION_STATUS.IN_PROGRESS) { + newStatus.effectiveDate = dayjs() + .tz('Canada/Pacific') + .startOf('day') + .toDate(); + } + + newStatuses.push(newStatus); + } + + if (persist) { + return await this.statusesRepository.save(newStatuses); + } + + return newStatuses; + } + + async setStatusDate( + submissionUuid: string, + statusTypeCode: string, + effectiveDate?: Date | null, + ) { + const status = await this.statusesRepository.findOneOrFail({ + where: { + submissionUuid, + statusTypeCode, + }, + }); + + let date = new Date(); + if (effectiveDate) { + date = effectiveDate; + } + date = dayjs(date).tz('Canada/Pacific').startOf('day').toDate(); + status.effectiveDate = effectiveDate !== null ? date : effectiveDate; + + return this.statusesRepository.save(status); + } + + async setStatusDateByFileNumber( + fileNumber: string, + statusTypeCode: string, + effectiveDate?: Date | null, + ) { + const submission = await this.getSubmission(fileNumber); + return await this.setStatusDate( + submission.uuid, + statusTypeCode, + effectiveDate, + ); + } + + async getCurrentStatusesBy(submissionUuid: string) { + return await this.statusesRepository.findBy({ submissionUuid }); + } + + async getCurrentStatusesByFileNumber(fileNumber: string) { + const submission = await this.getSubmission(fileNumber); + + return await this.statusesRepository.findBy({ + submissionUuid: submission?.uuid, + }); + } + + async getCurrentStatusByFileNumber(fileNumber: string) { + const submission = await this.getSubmission(fileNumber); + + return submission.status; + } + + private async getSubmission(fileNumber: string) { + const submission = await this.notificationSubmissionRepository.findOneBy({ + fileNumber, + }); + + if (!submission) { + throw new ServiceNotFoundException( + `Submission does not exist for provided notice of intent ${fileNumber}. Only notice of intents originated in portal have statuses.`, + ); + } + + return submission; + } + + async removeStatuses(submissionUuid: string) { + const statusesToRemove = await this.getCurrentStatusesBy(submissionUuid); + + return await this.statusesRepository.remove(statusesToRemove); + } +} diff --git a/services/apps/alcs/src/alcs/notification/notification.module.ts b/services/apps/alcs/src/alcs/notification/notification.module.ts index 4ed9401bc3..626e18522d 100644 --- a/services/apps/alcs/src/alcs/notification/notification.module.ts +++ b/services/apps/alcs/src/alcs/notification/notification.module.ts @@ -8,6 +8,7 @@ import { BoardModule } from '../board/board.module'; import { CardModule } from '../card/card.module'; import { CodeModule } from '../code/code.module'; import { LocalGovernmentModule } from '../local-government/local-government.module'; +import { NotificationSubmissionStatusModule } from './notification-submission-status/notification-submission-status.module'; import { NotificationType } from './notification-type/notification-type.entity'; import { NotificationController } from './notification.controller'; import { NotificationService } from './notification.service'; @@ -22,6 +23,7 @@ import { Notification } from './notification.entity'; DocumentModule, CodeModule, LocalGovernmentModule, + NotificationSubmissionStatusModule, ], providers: [NotificationService, NotificationProfile], controllers: [NotificationController], diff --git a/services/apps/alcs/src/common/automapper/notice-of-intent-submission.automapper.profile.ts b/services/apps/alcs/src/common/automapper/notice-of-intent-submission.automapper.profile.ts index eb6bb96886..e6d5527d23 100644 --- a/services/apps/alcs/src/common/automapper/notice-of-intent-submission.automapper.profile.ts +++ b/services/apps/alcs/src/common/automapper/notice-of-intent-submission.automapper.profile.ts @@ -127,13 +127,12 @@ export class NoticeOfIntentSubmissionProfile extends AutomapperProfile { mapper, NoticeOfIntentSubmission, AlcsNoticeOfIntentSubmissionDto, - // TODO uncomment when working on statuses - // forMember( - // (a) => a.lastStatusUpdate, - // mapFrom((ad) => { - // return ad.status?.effectiveDate?.getTime(); - // }), - // ), + forMember( + (a) => a.lastStatusUpdate, + mapFrom((ad) => { + return ad.status?.effectiveDate?.getTime(); + }), + ), forMember( (a) => a.status, mapFrom((ad) => { diff --git a/services/apps/alcs/src/common/automapper/notification-submission.automapper.profile.ts b/services/apps/alcs/src/common/automapper/notification-submission.automapper.profile.ts index a6227876d7..3920e50f9d 100644 --- a/services/apps/alcs/src/common/automapper/notification-submission.automapper.profile.ts +++ b/services/apps/alcs/src/common/automapper/notification-submission.automapper.profile.ts @@ -1,6 +1,12 @@ import { createMap, forMember, mapFrom, Mapper } from '@automapper/core'; import { AutomapperProfile, InjectMapper } from '@automapper/nestjs'; import { Injectable } from '@nestjs/common'; +import { NotificationSubmissionStatusType } from '../../alcs/notification/notification-submission-status/notification-status-type.entity'; +import { + NotificationStatusDto, + NotificationSubmissionToSubmissionStatusDto, +} from '../../alcs/notification/notification-submission-status/notification-status.dto'; +import { NotificationSubmissionToSubmissionStatus } from '../../alcs/notification/notification-submission-status/notification-status.entity'; import { NotificationSubmissionDetailedDto, NotificationSubmissionDto, @@ -31,6 +37,18 @@ export class NotificationSubmissionProfile extends AutomapperProfile { return ad.auditUpdatedAt?.getTime(); }), ), + forMember( + (a) => a.status, + mapFrom((ad) => { + return ad.status.statusType; + }), + ), + forMember( + (a) => a.lastStatusUpdate, + mapFrom((ad) => { + return ad.status?.effectiveDate?.getTime(); + }), + ), ); createMap( @@ -49,6 +67,40 @@ export class NotificationSubmissionProfile extends AutomapperProfile { return ad.auditUpdatedAt?.getTime(); }), ), + forMember( + (a) => a.status, + mapFrom((ad) => { + return ad.status.statusType; + }), + ), + forMember( + (a) => a.lastStatusUpdate, + mapFrom((ad) => { + return ad.status?.effectiveDate?.getTime(); + }), + ), + ); + + createMap( + mapper, + NotificationSubmissionToSubmissionStatus, + NotificationSubmissionToSubmissionStatusDto, + forMember( + (a) => a.effectiveDate, + mapFrom((ad) => { + return ad.effectiveDate?.getTime(); + }), + ), + forMember( + (a) => a.status, + mapFrom((ad) => { + return this.mapper.map( + ad.statusType, + NotificationSubmissionStatusType, + NotificationStatusDto, + ); + }), + ), ); }; } diff --git a/services/apps/alcs/src/portal/notification-submission/notification-submission.controller.spec.ts b/services/apps/alcs/src/portal/notification-submission/notification-submission.controller.spec.ts index 53eed12b80..1735fe4aae 100644 --- a/services/apps/alcs/src/portal/notification-submission/notification-submission.controller.spec.ts +++ b/services/apps/alcs/src/portal/notification-submission/notification-submission.controller.spec.ts @@ -1,6 +1,7 @@ import { classes } from '@automapper/classes'; import { AutomapperModule } from '@automapper/nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; +import { BadRequestException } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; import { ClsService } from 'nestjs-cls'; import { mockKeyCloakProviders } from '../../../test/mocks/mockTypes'; @@ -8,6 +9,8 @@ import { LocalGovernment } from '../../alcs/local-government/local-government.en import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; import { NoticeOfIntentDocumentService } from '../../alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.service'; import { NoticeOfIntent } from '../../alcs/notice-of-intent/notice-of-intent.entity'; +import { NOTIFICATION_STATUS } from '../../alcs/notification/notification-submission-status/notification-status.dto'; +import { NotificationSubmissionToSubmissionStatus } from '../../alcs/notification/notification-submission-status/notification-status.entity'; import { NotificationSubmissionProfile } from '../../common/automapper/notification-submission.automapper.profile'; import { EmailService } from '../../providers/email/email.service'; import { User } from '../../user/user.entity'; @@ -22,7 +25,7 @@ import { NotificationTransferee } from './notification-transferee/notification-t describe('NotificationSubmissionController', () => { let controller: NotificationSubmissionController; - let mockNoiSubmissionService: DeepMocked; + let mockNotificationSubmissionService: DeepMocked; let mockDocumentService: DeepMocked; let mockLgService: DeepMocked; let mockEmailService: DeepMocked; @@ -33,7 +36,7 @@ describe('NotificationSubmissionController', () => { const bceidBusinessGuid = 'business-guid'; beforeEach(async () => { - mockNoiSubmissionService = createMock(); + mockNotificationSubmissionService = createMock(); mockDocumentService = createMock(); mockLgService = createMock(); mockEmailService = createMock(); @@ -44,7 +47,7 @@ describe('NotificationSubmissionController', () => { NotificationSubmissionProfile, { provide: NotificationSubmissionService, - useValue: mockNoiSubmissionService, + useValue: mockNotificationSubmissionService, }, { provide: NoticeOfIntentDocumentService, @@ -75,22 +78,22 @@ describe('NotificationSubmissionController', () => { NotificationSubmissionController, ); - mockNoiSubmissionService.update.mockResolvedValue( + mockNotificationSubmissionService.update.mockResolvedValue( new NotificationSubmission({ applicant: applicant, localGovernmentUuid, }), ); - mockNoiSubmissionService.create.mockResolvedValue('2'); - mockNoiSubmissionService.getByFileNumber.mockResolvedValue( + mockNotificationSubmissionService.create.mockResolvedValue('2'); + mockNotificationSubmissionService.getByFileNumber.mockResolvedValue( new NotificationSubmission(), ); - mockNoiSubmissionService.getByUuid.mockResolvedValue( + mockNotificationSubmissionService.getByUuid.mockResolvedValue( new NotificationSubmission(), ); - mockNoiSubmissionService.mapToDTOs.mockResolvedValue([]); + mockNotificationSubmissionService.mapToDTOs.mockResolvedValue([]); mockLgService.list.mockResolvedValue([ new LocalGovernment({ uuid: localGovernmentUuid, @@ -106,7 +109,7 @@ describe('NotificationSubmissionController', () => { }); it('should call out to service when fetching notice of intents', async () => { - mockNoiSubmissionService.getAllByUser.mockResolvedValue([]); + mockNotificationSubmissionService.getAllByUser.mockResolvedValue([]); const submissions = await controller.getSubmissions({ user: { @@ -115,11 +118,13 @@ describe('NotificationSubmissionController', () => { }); expect(submissions).toBeDefined(); - expect(mockNoiSubmissionService.getAllByUser).toHaveBeenCalledTimes(1); + expect( + mockNotificationSubmissionService.getAllByUser, + ).toHaveBeenCalledTimes(1); }); it('should call out to service when fetching a notice of intent', async () => { - mockNoiSubmissionService.mapToDetailedDTO.mockResolvedValue( + mockNotificationSubmissionService.mapToDetailedDTO.mockResolvedValue( {} as NotificationSubmissionDetailedDto, ); @@ -133,14 +138,16 @@ describe('NotificationSubmissionController', () => { ); expect(noticeOfIntent).toBeDefined(); - expect(mockNoiSubmissionService.getByUuid).toHaveBeenCalledTimes(1); + expect(mockNotificationSubmissionService.getByUuid).toHaveBeenCalledTimes( + 1, + ); }); it('should fetch notice of intent by bceid if user has same guid as a local government', async () => { - mockNoiSubmissionService.mapToDetailedDTO.mockResolvedValue( + mockNotificationSubmissionService.mapToDetailedDTO.mockResolvedValue( {} as NotificationSubmissionDetailedDto, ); - mockNoiSubmissionService.getByUuid.mockResolvedValue( + mockNotificationSubmissionService.getByUuid.mockResolvedValue( new NotificationSubmission({ localGovernmentUuid: '', }), @@ -158,12 +165,14 @@ describe('NotificationSubmissionController', () => { ); expect(noiSubmission).toBeDefined(); - expect(mockNoiSubmissionService.getByUuid).toHaveBeenCalledTimes(1); + expect(mockNotificationSubmissionService.getByUuid).toHaveBeenCalledTimes( + 1, + ); }); it('should call out to service when creating an notice of intent', async () => { - mockNoiSubmissionService.create.mockResolvedValue(''); - mockNoiSubmissionService.mapToDTOs.mockResolvedValue([ + mockNotificationSubmissionService.create.mockResolvedValue(''); + mockNotificationSubmissionService.mapToDTOs.mockResolvedValue([ {} as NotificationSubmissionDto, ]); @@ -174,15 +183,19 @@ describe('NotificationSubmissionController', () => { }); expect(noiSubmission).toBeDefined(); - expect(mockNoiSubmissionService.create).toHaveBeenCalledTimes(1); + expect(mockNotificationSubmissionService.create).toHaveBeenCalledTimes(1); }); it('should call out to service for update and map', async () => { - mockNoiSubmissionService.mapToDetailedDTO.mockResolvedValue( + mockNotificationSubmissionService.mapToDetailedDTO.mockResolvedValue( {} as NotificationSubmissionDetailedDto, ); - mockNoiSubmissionService.getByUuid.mockResolvedValue( - new NotificationSubmission({}), + mockNotificationSubmissionService.getByUuid.mockResolvedValue( + new NotificationSubmission({ + status: new NotificationSubmissionToSubmissionStatus({ + statusTypeCode: NOTIFICATION_STATUS.IN_PROGRESS, + }), + }), ); await controller.update( @@ -200,54 +213,66 @@ describe('NotificationSubmissionController', () => { }, ); - expect(mockNoiSubmissionService.update).toHaveBeenCalledTimes(1); - expect(mockNoiSubmissionService.mapToDetailedDTO).toHaveBeenCalledTimes(1); + expect(mockNotificationSubmissionService.update).toHaveBeenCalledTimes(1); + expect( + mockNotificationSubmissionService.mapToDetailedDTO, + ).toHaveBeenCalledTimes(1); }); - // it('should throw an exception when trying to update a not in progress noi', async () => { - // mockNoiSubmissionService.mapToDetailedDTO.mockResolvedValue( - // {} as NotificationSubmissionDetailedDto, - // ); - // - // const promise = controller.update( - // 'file-id', - // { - // localGovernmentUuid, - // applicant, - // }, - // { - // user: { - // entity: new User({ - // clientRoles: [], - // }), - // }, - // }, - // ); - // await expect(promise).rejects.toMatchObject( - // new BadRequestException('Can only edit in progress Notice of Intents'), - // ); - // - // expect(mockNoiSubmissionService.update).toHaveBeenCalledTimes(0); - // expect(mockNoiSubmissionService.mapToDetailedDTO).toHaveBeenCalledTimes(0); - // }); + it('should throw an exception when trying to update a not in progress notification', async () => { + mockNotificationSubmissionService.mapToDetailedDTO.mockResolvedValue( + {} as NotificationSubmissionDetailedDto, + ); + mockNotificationSubmissionService.getByUuid.mockResolvedValue( + new NotificationSubmission({ + status: new NotificationSubmissionToSubmissionStatus({ + statusTypeCode: NOTIFICATION_STATUS.CANCELLED, + }), + }), + ); + + const promise = controller.update( + 'file-id', + { + localGovernmentUuid, + applicant, + }, + { + user: { + entity: new User({ + clientRoles: [], + }), + }, + }, + ); + await expect(promise).rejects.toMatchObject( + new BadRequestException('Can only edit in progress SRWs'), + ); + + expect(mockNotificationSubmissionService.update).toHaveBeenCalledTimes(0); + expect( + mockNotificationSubmissionService.mapToDetailedDTO, + ).toHaveBeenCalledTimes(0); + }); it('should call out to service on submitAlcs', async () => { const mockFileId = 'file-id'; const mockOwner = new NotificationTransferee({ uuid: primaryContactOwnerUuid, }); - const mockGovernment = new LocalGovernment({ uuid: localGovernmentUuid }); const mockSubmission = new NotificationSubmission({ fileNumber: mockFileId, transferees: [mockOwner], localGovernmentUuid, }); - mockNoiSubmissionService.submitToAlcs.mockResolvedValue( + mockNotificationSubmissionService.submitToAlcs.mockResolvedValue( new NoticeOfIntent(), ); - mockNoiSubmissionService.getByUuid.mockResolvedValue(mockSubmission); - mockNoiSubmissionService.mapToDetailedDTO.mockResolvedValue( + mockNotificationSubmissionService.getByUuid.mockResolvedValue( + mockSubmission, + ); + mockNotificationSubmissionService.mapToDetailedDTO.mockResolvedValue( {} as NotificationSubmissionDetailedDto, ); @@ -257,8 +282,14 @@ describe('NotificationSubmissionController', () => { }, }); - expect(mockNoiSubmissionService.getByUuid).toHaveBeenCalledTimes(2); - expect(mockNoiSubmissionService.submitToAlcs).toHaveBeenCalledTimes(1); - expect(mockNoiSubmissionService.mapToDetailedDTO).toHaveBeenCalledTimes(1); + expect(mockNotificationSubmissionService.getByUuid).toHaveBeenCalledTimes( + 2, + ); + expect( + mockNotificationSubmissionService.submitToAlcs, + ).toHaveBeenCalledTimes(1); + expect( + mockNotificationSubmissionService.mapToDetailedDTO, + ).toHaveBeenCalledTimes(1); }); }); diff --git a/services/apps/alcs/src/portal/notification-submission/notification-submission.controller.ts b/services/apps/alcs/src/portal/notification-submission/notification-submission.controller.ts index 818b1d8989..6be4e1d581 100644 --- a/services/apps/alcs/src/portal/notification-submission/notification-submission.controller.ts +++ b/services/apps/alcs/src/portal/notification-submission/notification-submission.controller.ts @@ -1,4 +1,5 @@ import { + BadRequestException, Body, Controller, Get, @@ -9,6 +10,7 @@ import { Req, UseGuards, } from '@nestjs/common'; +import { NOTIFICATION_STATUS } from '../../alcs/notification/notification-submission-status/notification-status.dto'; import { PortalAuthGuard } from '../../common/authorization/portal-auth-guard.service'; import { User } from '../../user/user.entity'; import { NotificationSubmissionUpdateDto } from './notification-submission.dto'; @@ -83,18 +85,14 @@ export class NotificationSubmissionController { @Body() updateDto: NotificationSubmissionUpdateDto, @Req() req, ) { - // const submission = await this.notificationSubmissionService.getByUuid( - // uuid, - // req.user.entity, - // ); - // - // if ( - // submission.status.statusTypeCode !== - // NOI_SUBMISSION_STATUS.IN_PROGRESS && - // overlappingRoles.length === 0 - // ) { - // throw new BadRequestException('Can only edit in progress SRWs'); - // } + const submission = await this.notificationSubmissionService.getByUuid( + uuid, + req.user.entity, + ); + + if (submission.status.statusTypeCode !== NOTIFICATION_STATUS.IN_PROGRESS) { + throw new BadRequestException('Can only edit in progress SRWs'); + } const updatedSubmission = await this.notificationSubmissionService.update( uuid, @@ -113,12 +111,12 @@ export class NotificationSubmissionController { const notificationSubmission = await this.notificationSubmissionService.getByUuid(uuid, req.user.entity); - // if ( - // notificationSubmission.status.statusTypeCode !== - // NOI_SUBMISSION_STATUS.IN_PROGRESS - // ) { - // throw new BadRequestException('Can only cancel in progress SRWs'); - // } + if ( + notificationSubmission.status.statusTypeCode !== + NOTIFICATION_STATUS.IN_PROGRESS + ) { + throw new BadRequestException('Can only cancel in progress SRWs'); + } await this.notificationSubmissionService.cancel(notificationSubmission); diff --git a/services/apps/alcs/src/portal/notification-submission/notification-submission.entity.ts b/services/apps/alcs/src/portal/notification-submission/notification-submission.entity.ts index f74317f39c..cbfec5a6f2 100644 --- a/services/apps/alcs/src/portal/notification-submission/notification-submission.entity.ts +++ b/services/apps/alcs/src/portal/notification-submission/notification-submission.entity.ts @@ -1,5 +1,6 @@ import { AutoMap } from '@automapper/classes'; import { + AfterLoad, Column, Entity, JoinColumn, @@ -7,6 +8,8 @@ import { OneToMany, PrimaryGeneratedColumn, } from 'typeorm'; +import { NoticeOfIntentSubmissionToSubmissionStatus } from '../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status.entity'; +import { NotificationSubmissionToSubmissionStatus } from '../../alcs/notification/notification-submission-status/notification-status.entity'; import { Notification } from '../../alcs/notification/notification.entity'; import { Base } from '../../common/entities/base.entity'; import { User } from '../../user/user.entity'; @@ -85,4 +88,46 @@ export class NotificationSubmission extends Base { (parcel) => parcel.notificationSubmission, ) parcels: NotificationParcel[]; + + @OneToMany( + () => NotificationSubmissionToSubmissionStatus, + (status) => status.submission, + { + eager: true, + persistence: false, + }, + ) + submissionStatuses: NotificationSubmissionToSubmissionStatus[] = []; + + private _status: NotificationSubmissionToSubmissionStatus; + + get status(): NotificationSubmissionToSubmissionStatus { + return this._status; + } + + private set status(value: NotificationSubmissionToSubmissionStatus) { + this._status = value; + } + + @AfterLoad() + populateCurrentStatus() { + // using JS date object is intentional for performance reasons + const now = Date.now(); + + for (const status of this.submissionStatuses) { + const effectiveDate = status.effectiveDate?.getTime(); + const currentEffectiveDate = this.status?.effectiveDate?.getTime(); + + if ( + effectiveDate && + effectiveDate <= now && + (!currentEffectiveDate || + effectiveDate > currentEffectiveDate || + (effectiveDate === currentEffectiveDate && + status.statusType.weight > this.status.statusType.weight)) + ) { + this.status = status; + } + } + } } diff --git a/services/apps/alcs/src/portal/notification-submission/notification-submission.module.ts b/services/apps/alcs/src/portal/notification-submission/notification-submission.module.ts index 83c31fd910..62d5b44899 100644 --- a/services/apps/alcs/src/portal/notification-submission/notification-submission.module.ts +++ b/services/apps/alcs/src/portal/notification-submission/notification-submission.module.ts @@ -2,6 +2,7 @@ import { forwardRef, Module } from '@nestjs/common'; import { TypeOrmModule } from '@nestjs/typeorm'; import { BoardModule } from '../../alcs/board/board.module'; import { LocalGovernmentModule } from '../../alcs/local-government/local-government.module'; +import { NotificationSubmissionStatusModule } from '../../alcs/notification/notification-submission-status/notification-submission-status.module'; import { NotificationModule } from '../../alcs/notification/notification.module'; import { AuthorizationModule } from '../../common/authorization/authorization.module'; import { NotificationParcelProfile } from '../../common/automapper/notification-parcel.automapper.profile'; @@ -34,6 +35,7 @@ import { NotificationTransfereeService } from './notification-transferee/notific forwardRef(() => BoardModule), LocalGovernmentModule, FileNumberModule, + NotificationSubmissionStatusModule, ], controllers: [ NotificationSubmissionController, diff --git a/services/apps/alcs/src/portal/notification-submission/notification-submission.service.spec.ts b/services/apps/alcs/src/portal/notification-submission/notification-submission.service.spec.ts index efd7d9acbb..c98e98df0d 100644 --- a/services/apps/alcs/src/portal/notification-submission/notification-submission.service.spec.ts +++ b/services/apps/alcs/src/portal/notification-submission/notification-submission.service.spec.ts @@ -7,6 +7,8 @@ import { getRepositoryToken } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; import { NoticeOfIntentType } from '../../alcs/notice-of-intent/notice-of-intent-type/notice-of-intent-type.entity'; +import { NotificationSubmissionToSubmissionStatus } from '../../alcs/notification/notification-submission-status/notification-status.entity'; +import { NotificationSubmissionStatusService } from '../../alcs/notification/notification-submission-status/notification-submission-status.service'; import { Notification } from '../../alcs/notification/notification.entity'; import { NotificationService } from '../../alcs/notification/notification.service'; import { NotificationSubmissionProfile } from '../../common/automapper/notification-submission.automapper.profile'; @@ -21,6 +23,7 @@ describe('NotificationSubmissionService', () => { let mockNotificationService: DeepMocked; let mockLGService: DeepMocked; let mockFileNumberService: DeepMocked; + let mockStatusService: DeepMocked; let mockSubmission; beforeEach(async () => { @@ -28,6 +31,7 @@ describe('NotificationSubmissionService', () => { mockNotificationService = createMock(); mockLGService = createMock(); mockFileNumberService = createMock(); + mockStatusService = createMock(); const module: TestingModule = await Test.createTestingModule({ imports: [ @@ -54,6 +58,10 @@ describe('NotificationSubmissionService', () => { provide: FileNumberService, useValue: mockFileNumberService, }, + { + provide: NotificationSubmissionStatusService, + useValue: mockStatusService, + }, ], }).compile(); @@ -108,6 +116,7 @@ describe('NotificationSubmissionService', () => { mockRepository.save.mockResolvedValue(new NotificationSubmission()); mockFileNumberService.generateNextFileNumber.mockResolvedValue(fileId); mockNotificationService.create.mockResolvedValue(new Notification()); + mockStatusService.setInitialStatuses.mockResolvedValue([]); const fileNumber = await service.create( 'type', @@ -119,6 +128,7 @@ describe('NotificationSubmissionService', () => { expect(fileNumber).toEqual(fileId); expect(mockRepository.save).toHaveBeenCalledTimes(1); expect(mockNotificationService.create).toHaveBeenCalledTimes(1); + expect(mockStatusService.setInitialStatuses).toHaveBeenCalledTimes(1); }); it('should call through for get by user', async () => { @@ -167,6 +177,8 @@ describe('NotificationSubmissionService', () => { typeCode: typeCode, auditCreatedAt: new Date(), createdBy: new User(), + submissionStatuses: [], + status: new NotificationSubmissionToSubmissionStatus(), }); mockRepository.findOne.mockResolvedValue(noiSubmission); @@ -206,11 +218,15 @@ describe('NotificationSubmissionService', () => { const notification = new Notification({ dateSubmittedToAlc: new Date(), }); + mockStatusService.setStatusDate.mockResolvedValue( + new NotificationSubmissionToSubmissionStatus(), + ); mockNotificationService.submit.mockResolvedValue(notification); await service.submitToAlcs(mockSubmission); expect(mockNotificationService.submit).toBeCalledTimes(1); + expect(mockStatusService.setStatusDate).toHaveBeenCalledTimes(1); }); it('should update fields if notification exists', async () => { diff --git a/services/apps/alcs/src/portal/notification-submission/notification-submission.service.ts b/services/apps/alcs/src/portal/notification-submission/notification-submission.service.ts index 581f183229..75e7979baf 100644 --- a/services/apps/alcs/src/portal/notification-submission/notification-submission.service.ts +++ b/services/apps/alcs/src/portal/notification-submission/notification-submission.service.ts @@ -11,7 +11,8 @@ import { Repository, } from 'typeorm'; import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; -import { NOI_SUBMISSION_STATUS } from '../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status.dto'; +import { NOTIFICATION_STATUS } from '../../alcs/notification/notification-submission-status/notification-status.dto'; +import { NotificationSubmissionStatusService } from '../../alcs/notification/notification-submission-status/notification-submission-status.service'; import { NotificationService } from '../../alcs/notification/notification.service'; import { ROLES_ALLOWED_APPLICATIONS } from '../../common/authorization/roles'; import { FileNumberService } from '../../file-number/file-number.service'; @@ -43,6 +44,7 @@ export class NotificationSubmissionService { private notificationService: NotificationService, private localGovernmentService: LocalGovernmentService, private fileNumberService: FileNumberService, + private notificationSubmissionStatusService: NotificationSubmissionStatusService, @InjectMapper() private mapper: Mapper, ) {} @@ -74,9 +76,9 @@ export class NotificationSubmissionService { noiSubmission, ); - // await this.noticeOfIntentSubmissionStatusService.setInitialStatuses( - // savedSubmission.uuid, - // ); + await this.notificationSubmissionStatusService.setInitialStatuses( + savedSubmission.uuid, + ); return fileNumber; } @@ -282,11 +284,11 @@ export class NotificationSubmissionService { dateSubmittedToAlc: new Date(), }); - // await this.noticeOfIntentSubmissionStatusService.setStatusDate( - // notificationSubmission.uuid, - // NOI_SUBMISSION_STATUS.SUBMITTED_TO_ALC, - // submittedNotification.dateSubmittedToAlc, - // ); + await this.notificationSubmissionStatusService.setStatusDate( + notificationSubmission.uuid, + NOTIFICATION_STATUS.SUBMITTED_TO_ALC, + submittedNotification.dateSubmittedToAlc, + ); return submittedNotification; } catch (ex) { @@ -299,30 +301,22 @@ export class NotificationSubmissionService { async updateStatus( uuid: string, - statusCode: NOI_SUBMISSION_STATUS, + statusCode: NOTIFICATION_STATUS, effectiveDate?: Date | null, ) { const submission = await this.loadBarebonesSubmission(uuid); - // await this.noticeOfIntentSubmissionStatusService.setStatusDate( - // submission.uuid, - // statusCode, - // effectiveDate, - // ); - } - - async getStatus(code: NOI_SUBMISSION_STATUS) { - // return await this.noticeOfIntentStatusRepository.findOneOrFail({ - // where: { - // code, - // }, - // }); + await this.notificationSubmissionStatusService.setStatusDate( + submission.uuid, + statusCode, + effectiveDate, + ); } async cancel(submission: NotificationSubmission) { - // return await this.noticeOfIntentSubmissionStatusService.setStatusDate( - // noticeOfIntentSubmission.uuid, - // NOI_SUBMISSION_STATUS.CANCELLED, - // ); + return await this.notificationSubmissionStatusService.setStatusDate( + submission.uuid, + NOTIFICATION_STATUS.CANCELLED, + ); } private loadBarebonesSubmission(uuid: string) { diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1693952313867-add_notification_statuses.ts b/services/apps/alcs/src/providers/typeorm/migrations/1693952313867-add_notification_statuses.ts new file mode 100644 index 0000000000..0e5d15c5fb --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1693952313867-add_notification_statuses.ts @@ -0,0 +1,37 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class addNotificationStatuses1693952313867 + implements MigrationInterface +{ + name = 'addNotificationStatuses1693952313867'; + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `CREATE TABLE "alcs"."notification_submission_status_type" ("audit_deleted_date_at" TIMESTAMP WITH TIME ZONE, "audit_created_at" TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now(), "audit_updated_at" TIMESTAMP WITH TIME ZONE DEFAULT now(), "audit_created_by" character varying NOT NULL, "audit_updated_by" character varying, "label" character varying NOT NULL, "code" text NOT NULL, "description" text NOT NULL, "weight" smallint NOT NULL DEFAULT '0', "alcs_background_color" character varying NOT NULL, "alcs_color" character varying NOT NULL, "portal_background_color" character varying NOT NULL, "portal_color" character varying NOT NULL, CONSTRAINT "UQ_7fb8eeb106bb4bb0b0738bd1106" UNIQUE ("description"), CONSTRAINT "PK_9a28eacfd5a7b00f06bdf234bcd" PRIMARY KEY ("code"))`, + ); + await queryRunner.query( + `CREATE TABLE "alcs"."notification_submission_to_submission_status" ("effective_date" TIMESTAMP WITH TIME ZONE, "submission_uuid" uuid NOT NULL, "status_type_code" text NOT NULL, CONSTRAINT "PK_913960c8fe5b20339701b6be841" PRIMARY KEY ("submission_uuid", "status_type_code"))`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notification_submission_to_submission_status" ADD CONSTRAINT "FK_279dfb38cef709b730605d296a1" FOREIGN KEY ("submission_uuid") REFERENCES "alcs"."notification_submission"("uuid") ON DELETE NO ACTION ON UPDATE NO ACTION`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notification_submission_to_submission_status" ADD CONSTRAINT "FK_a38303f5bfdee8a260a48320b24" FOREIGN KEY ("status_type_code") REFERENCES "alcs"."notification_submission_status_type"("code") ON DELETE NO ACTION ON UPDATE NO ACTION`, + ); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `ALTER TABLE "alcs"."notification_submission_to_submission_status" DROP CONSTRAINT "FK_a38303f5bfdee8a260a48320b24"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notification_submission_to_submission_status" DROP CONSTRAINT "FK_279dfb38cef709b730605d296a1"`, + ); + await queryRunner.query( + `DROP TABLE "alcs"."notification_submission_to_submission_status"`, + ); + await queryRunner.query( + `DROP TABLE "alcs"."notification_submission_status_type"`, + ); + } +} diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1693952400742-seed_notification_statuses.ts b/services/apps/alcs/src/providers/typeorm/migrations/1693952400742-seed_notification_statuses.ts new file mode 100644 index 0000000000..a6e8486caa --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1693952400742-seed_notification_statuses.ts @@ -0,0 +1,20 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class seedNotificationStatuses1693952400742 + implements MigrationInterface +{ + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query(` + INSERT INTO "alcs"."notification_submission_status_type" + ("audit_deleted_date_at", "audit_created_at", "audit_updated_at", "audit_created_by", "audit_updated_by", "label", "code", "description", "weight", "alcs_background_color", "alcs_color", "portal_background_color", "portal_color") VALUES + (NULL, NOW(), NULL, 'migration_seed', NULL, 'ALC Response Sent', 'ALCR', 'Response sent to applicant', 3, '#94c6ac', '#002f17', '#94c6ac', '#002f17'), + (NULL, NOW(), NULL, 'migration_seed', NULL, 'Cancelled', 'CANC', 'Notification has been cancelled', 2, '#efefef', '#565656', '#efefef', '#565656'), + (NULL, NOW(), NULL, 'migration_seed', NULL, 'In Progress', 'PROG', 'Notification is in progress and has not been submitted', 0, '#fee9b5', '#313132', '#acd2ed', '#0c2e46'), + (NULL, NOW(), NULL, 'migration_seed', NULL, 'Submitted to ALC', 'SUBM', 'Notification has been submitted', 1, '#94c6ac', '#002f17', '#94c6ac', '#002f17'); + `); + } + + public async down(): Promise { + //No + } +} From 8f37d1c4c986c845355284772fc7833d0fd8fdf4 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Wed, 6 Sep 2023 09:15:36 -0700 Subject: [PATCH 341/954] Code Review Feedback --- .../notification-submission-status.service.spec.ts | 2 +- .../notification-submission-status.service.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/services/apps/alcs/src/alcs/notification/notification-submission-status/notification-submission-status.service.spec.ts b/services/apps/alcs/src/alcs/notification/notification-submission-status/notification-submission-status.service.spec.ts index 8bd6592946..b0dd51a9be 100644 --- a/services/apps/alcs/src/alcs/notification/notification-submission-status/notification-submission-status.service.spec.ts +++ b/services/apps/alcs/src/alcs/notification/notification-submission-status/notification-submission-status.service.spec.ts @@ -191,7 +191,7 @@ describe('NotificationSubmissionStatusService', () => { service.getCurrentStatusesByFileNumber(fakeFileNumber), ).rejects.toMatchObject( new ServiceNotFoundException( - `Submission does not exist for provided notice of intent ${fakeFileNumber}. Only notice of intents originated in portal have statuses.`, + `Submission does not exist for provided notification ${fakeFileNumber}. Only notifications originated in portal have statuses.`, ), ); diff --git a/services/apps/alcs/src/alcs/notification/notification-submission-status/notification-submission-status.service.ts b/services/apps/alcs/src/alcs/notification/notification-submission-status/notification-submission-status.service.ts index cffbdef72f..b650be65e8 100644 --- a/services/apps/alcs/src/alcs/notification/notification-submission-status/notification-submission-status.service.ts +++ b/services/apps/alcs/src/alcs/notification/notification-submission-status/notification-submission-status.service.ts @@ -111,7 +111,7 @@ export class NotificationSubmissionStatusService { if (!submission) { throw new ServiceNotFoundException( - `Submission does not exist for provided notice of intent ${fileNumber}. Only notice of intents originated in portal have statuses.`, + `Submission does not exist for provided notification ${fileNumber}. Only notifications originated in portal have statuses.`, ); } From ff74bed809782b800f04582915bc7f6f9ef04f2a Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Wed, 6 Sep 2023 10:12:36 -0700 Subject: [PATCH 342/954] Add Transferees UI * Add Transferee to Step 2 --- .../edit-submission.component.html | 28 ++--- .../edit-submission/edit-submission.module.ts | 18 ++- .../transferee-dialog.component.html | 84 +++++++++++++ .../transferee-dialog.component.scss | 19 +++ .../transferee-dialog.component.spec.ts | 48 ++++++++ .../transferee-dialog.component.ts | 110 ++++++++++++++++++ .../transferees/transferees.component.html | 89 ++++++++++++++ .../transferees/transferees.component.scss | 38 ++++++ .../transferees/transferees.component.spec.ts | 43 +++++++ .../transferees/transferees.component.ts | 91 +++++++++++++++ .../notification-transferee.dto.ts | 21 +--- .../notification-transferee.service.spec.ts | 68 ++--------- .../notification-transferee.service.ts | 90 ++------------ portal-frontend/src/styles.scss | 7 ++ .../notification-transferee.controller.ts | 2 +- 15 files changed, 584 insertions(+), 172 deletions(-) create mode 100644 portal-frontend/src/app/features/notifications/edit-submission/transferees/transferee-dialog/transferee-dialog.component.html create mode 100644 portal-frontend/src/app/features/notifications/edit-submission/transferees/transferee-dialog/transferee-dialog.component.scss create mode 100644 portal-frontend/src/app/features/notifications/edit-submission/transferees/transferee-dialog/transferee-dialog.component.spec.ts create mode 100644 portal-frontend/src/app/features/notifications/edit-submission/transferees/transferee-dialog/transferee-dialog.component.ts create mode 100644 portal-frontend/src/app/features/notifications/edit-submission/transferees/transferees.component.html create mode 100644 portal-frontend/src/app/features/notifications/edit-submission/transferees/transferees.component.scss create mode 100644 portal-frontend/src/app/features/notifications/edit-submission/transferees/transferees.component.spec.ts create mode 100644 portal-frontend/src/app/features/notifications/edit-submission/transferees/transferees.component.ts diff --git a/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.component.html b/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.component.html index 932a741a8a..32d6dae0f4 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.component.html +++ b/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.component.html @@ -1,6 +1,8 @@
-
Notice of Intent ID: {{ notificationSubmission.fileNumber }} | {{ notificationSubmission.type }}
+
+ Notification ID: {{ notificationSubmission.fileNumber }} | {{ notificationSubmission.type }} +
-
- - - help_outline - -
@@ -33,17 +26,26 @@
Notice of Intent ID: {{ notificationSubmissio
+ (exit)="onExit()" + >
-
+
+ + +
diff --git a/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.module.ts b/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.module.ts index b4bdc31cde..9653d0b94b 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.module.ts +++ b/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.module.ts @@ -1,6 +1,10 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { MatButtonModule } from '@angular/material/button'; +import { MatIconModule } from '@angular/material/icon'; +import { MatTableModule } from '@angular/material/table'; import { RouterModule, Routes } from '@angular/router'; +import { NgxMaskPipe } from 'ngx-mask'; import { CanDeactivateGuard } from '../../../shared/guard/can-deactivate.guard'; import { SharedModule } from '../../../shared/shared.module'; import { EditSubmissionComponent } from './edit-submission.component'; @@ -9,6 +13,8 @@ import { ParcelDetailsComponent } from './parcels/parcel-details.component'; import { ParcelEntryConfirmationDialogComponent } from './parcels/parcel-entry/parcel-entry-confirmation-dialog/parcel-entry-confirmation-dialog.component'; import { ParcelEntryComponent } from './parcels/parcel-entry/parcel-entry.component'; import { StepComponent } from './step.partial'; +import { TransfereeDialogComponent } from './transferees/transferee-dialog/transferee-dialog.component'; +import { TransfereesComponent } from './transferees/transferees.component'; const routes: Routes = [ { @@ -30,7 +36,17 @@ const routes: Routes = [ ParcelEntryComponent, ParcelEntryConfirmationDialogComponent, DeleteParcelDialogComponent, + TransfereesComponent, + TransfereeDialogComponent, + ], + imports: [ + CommonModule, + SharedModule, + RouterModule.forChild(routes), + MatButtonModule, + MatIconModule, + MatTableModule, + NgxMaskPipe, ], - imports: [CommonModule, SharedModule, RouterModule.forChild(routes)], }) export class EditSubmissionModule {} diff --git a/portal-frontend/src/app/features/notifications/edit-submission/transferees/transferee-dialog/transferee-dialog.component.html b/portal-frontend/src/app/features/notifications/edit-submission/transferees/transferee-dialog/transferee-dialog.component.html new file mode 100644 index 0000000000..74498dc2e2 --- /dev/null +++ b/portal-frontend/src/app/features/notifications/edit-submission/transferees/transferee-dialog/transferee-dialog.component.html @@ -0,0 +1,84 @@ +
+

Add New Transferee

+

Edit Transferee

+
+
+
+
+
+ + + Individual + Organization + +
+
+ + + + +
+ warning +
This field is required
+
+
+

Organization Contact Info

+
+ + + + +
+ warning +
This field is required
+
+
+
+ + + + +
+ warning +
This field is required
+
+
+
+ + + + +
+ warning +
This field is required
+
Invalid format
+
+
+
+ + + + +
+ warning +
This field is required
+
Invalid format
+
+
+
+
+
+
+ + + +
diff --git a/portal-frontend/src/app/features/notifications/edit-submission/transferees/transferee-dialog/transferee-dialog.component.scss b/portal-frontend/src/app/features/notifications/edit-submission/transferees/transferee-dialog/transferee-dialog.component.scss new file mode 100644 index 0000000000..2af88008a7 --- /dev/null +++ b/portal-frontend/src/app/features/notifications/edit-submission/transferees/transferee-dialog/transferee-dialog.component.scss @@ -0,0 +1,19 @@ +@use '../../../../../../styles/functions' as *; +@use '../../../../../../styles/colors'; + +.actions { + button:not(:last-child) { + margin-right: rem(8) !important; + } +} + +:host::ng-deep { + .field-error { + color: colors.$error-color; + font-size: rem(15); + font-weight: 700; + display: flex; + align-items: center; + margin-top: rem(4); + } +} diff --git a/portal-frontend/src/app/features/notifications/edit-submission/transferees/transferee-dialog/transferee-dialog.component.spec.ts b/portal-frontend/src/app/features/notifications/edit-submission/transferees/transferee-dialog/transferee-dialog.component.spec.ts new file mode 100644 index 0000000000..dacebfb382 --- /dev/null +++ b/portal-frontend/src/app/features/notifications/edit-submission/transferees/transferee-dialog/transferee-dialog.component.spec.ts @@ -0,0 +1,48 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { MAT_DIALOG_DATA, MatDialog, MatDialogRef } from '@angular/material/dialog'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { NotificationTransfereeService } from '../../../../../services/notification-transferee/notification-transferee.service'; + +import { TransfereeDialogComponent } from './transferee-dialog.component'; + +describe('TransfereeDialogComponent', () => { + let component: TransfereeDialogComponent; + let fixture: ComponentFixture; + let mockTransfereeService: DeepMocked; + + beforeEach(async () => { + mockTransfereeService = createMock(); + + await TestBed.configureTestingModule({ + providers: [ + { + provide: NotificationTransfereeService, + useValue: mockTransfereeService, + }, + { + provide: MatDialogRef, + useValue: {}, + }, + { + provide: MAT_DIALOG_DATA, + useValue: {}, + }, + { + provide: MatDialog, + useValue: {}, + }, + ], + declarations: [TransfereeDialogComponent], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(TransfereeDialogComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/notifications/edit-submission/transferees/transferee-dialog/transferee-dialog.component.ts b/portal-frontend/src/app/features/notifications/edit-submission/transferees/transferee-dialog/transferee-dialog.component.ts new file mode 100644 index 0000000000..2b9dca88b8 --- /dev/null +++ b/portal-frontend/src/app/features/notifications/edit-submission/transferees/transferee-dialog/transferee-dialog.component.ts @@ -0,0 +1,110 @@ +import { Component, Inject } from '@angular/core'; +import { FormControl, FormGroup, Validators } from '@angular/forms'; +import { MatButtonToggleChange } from '@angular/material/button-toggle'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; +import { + NotificationTransfereeCreateDto, + NotificationTransfereeDto, + NotificationTransfereeUpdateDto, +} from '../../../../../services/notification-transferee/notification-transferee.dto'; +import { NotificationTransfereeService } from '../../../../../services/notification-transferee/notification-transferee.service'; +import { OWNER_TYPE } from '../../../../../shared/dto/owner.dto'; + +@Component({ + selector: 'app-transferee-dialog', + templateUrl: './transferee-dialog.component.html', + styleUrls: ['./transferee-dialog.component.scss'], +}) +export class TransfereeDialogComponent { + OWNER_TYPE = OWNER_TYPE; + type = new FormControl(OWNER_TYPE.INDIVIDUAL); + firstName = new FormControl('', [Validators.required]); + lastName = new FormControl('', [Validators.required]); + organizationName = new FormControl(''); + phoneNumber = new FormControl('', [Validators.required]); + email = new FormControl('', [Validators.required, Validators.email]); + + isEdit = false; + existingUuid: string | undefined; + + form = new FormGroup({ + type: this.type, + firstName: this.firstName, + lastName: this.lastName, + organizationName: this.organizationName, + phoneNumber: this.phoneNumber, + email: this.email, + }); + + constructor( + private dialogRef: MatDialogRef, + private transfereeService: NotificationTransfereeService, + @Inject(MAT_DIALOG_DATA) + public data: { + submissionUuid: string; + existingTransferee?: NotificationTransfereeDto; + } + ) { + if (data && data.existingTransferee) { + this.onChangeType({ + value: data.existingTransferee.type.code, + } as any); + this.isEdit = true; + this.type.setValue(data.existingTransferee.type.code); + this.firstName.setValue(data.existingTransferee.firstName); + this.lastName.setValue(data.existingTransferee.lastName); + this.organizationName.setValue(data.existingTransferee.organizationName); + this.phoneNumber.setValue(data.existingTransferee.phoneNumber); + this.email.setValue(data.existingTransferee.email); + this.existingUuid = data.existingTransferee.uuid; + } + } + + onChangeType($event: MatButtonToggleChange) { + if ($event.value === OWNER_TYPE.ORGANIZATION) { + this.organizationName.setValidators([Validators.required]); + } else { + this.organizationName.setValidators([]); + this.organizationName.reset(); + } + } + + async onCreate() { + if (!this.data.submissionUuid) { + console.error('TransfereeDialogComponent misconfigured, needs submissionUuid for create'); + return; + } + + const createDto: NotificationTransfereeCreateDto = { + organizationName: this.organizationName.getRawValue() || undefined, + firstName: this.firstName.getRawValue() || undefined, + lastName: this.lastName.getRawValue() || undefined, + email: this.email.getRawValue()!, + phoneNumber: this.phoneNumber.getRawValue()!, + typeCode: this.type.getRawValue()!, + notificationSubmissionUuid: this.data.submissionUuid, + }; + + await this.transfereeService.create(createDto); + this.dialogRef.close(true); + } + + async onClose() { + this.dialogRef.close(false); + } + + async onSave() { + const updateDto: NotificationTransfereeUpdateDto = { + organizationName: this.organizationName.getRawValue(), + firstName: this.firstName.getRawValue(), + lastName: this.lastName.getRawValue(), + email: this.email.getRawValue()!, + phoneNumber: this.phoneNumber.getRawValue()!, + typeCode: this.type.getRawValue()!, + }; + if (this.existingUuid) { + await this.transfereeService.update(this.existingUuid, updateDto); + this.dialogRef.close(true); + } + } +} diff --git a/portal-frontend/src/app/features/notifications/edit-submission/transferees/transferees.component.html b/portal-frontend/src/app/features/notifications/edit-submission/transferees/transferees.component.html new file mode 100644 index 0000000000..318f8f0a10 --- /dev/null +++ b/portal-frontend/src/app/features/notifications/edit-submission/transferees/transferees.component.html @@ -0,0 +1,89 @@ +
+

Identify Transferee(s)

+

Provide the name and contact information for all transferees who will be registered owners of the SRW.

+

*All fields are required unless stated optional.

+
+
+
+

All Transferees

+
+ + + At least one transferee is required + +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Type{{ element.type.code === 'INVD' ? 'Individual' : 'Organization' }}Full Name{{ element.displayName }}Organization Name + + {{ element.organizationName }} + + No Data + Phone + {{ element.phoneNumber | mask : '(000) 000-0000' }} + Email + {{ element.email }} + Actions + + +
+ No Transferee added. Use ‘Add New Transferee’ button to the right to add your first transferee. +
+
+
+
+ +
+ + +
+
diff --git a/portal-frontend/src/app/features/notifications/edit-submission/transferees/transferees.component.scss b/portal-frontend/src/app/features/notifications/edit-submission/transferees/transferees.component.scss new file mode 100644 index 0000000000..b0180f9d5f --- /dev/null +++ b/portal-frontend/src/app/features/notifications/edit-submission/transferees/transferees.component.scss @@ -0,0 +1,38 @@ +@use '../../../../../styles/functions' as *; +@use '../../../../../styles/colors'; + +.no-data { + color: colors.$grey; + text-align: center; + padding: rem(8); +} + +.actions-cell { + button:not(:last-child) { + margin-right: rem(12) !important; + } +} + +.split { + margin-bottom: rem(16); +} + +@media screen and (max-width: $desktopBreakpoint) { + .table { + overflow-x: auto; + max-width: 100vw; + + table { + white-space: nowrap; + } + } + + .split { + flex-direction: column; + align-items: start; + + button { + width: 100%; + } + } +} diff --git a/portal-frontend/src/app/features/notifications/edit-submission/transferees/transferees.component.spec.ts b/portal-frontend/src/app/features/notifications/edit-submission/transferees/transferees.component.spec.ts new file mode 100644 index 0000000000..4e99960555 --- /dev/null +++ b/portal-frontend/src/app/features/notifications/edit-submission/transferees/transferees.component.spec.ts @@ -0,0 +1,43 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { MatDialog } from '@angular/material/dialog'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { BehaviorSubject } from 'rxjs'; +import { NotificationSubmissionDetailedDto } from '../../../../services/notification-submission/notification-submission.dto'; +import { NotificationTransfereeService } from '../../../../services/notification-transferee/notification-transferee.service'; + +import { TransfereesComponent } from './transferees.component'; + +describe('TransfereesComponent', () => { + let component: TransfereesComponent; + let fixture: ComponentFixture; + let mockTransfereeService: DeepMocked; + + beforeEach(async () => { + mockTransfereeService = createMock(); + + await TestBed.configureTestingModule({ + providers: [ + { + provide: NotificationTransfereeService, + useValue: mockTransfereeService, + }, + { + provide: MatDialog, + useValue: {}, + }, + ], + declarations: [TransfereesComponent], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(TransfereesComponent); + component = fixture.componentInstance; + component.$notificationSubmission = new BehaviorSubject(undefined); + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/notifications/edit-submission/transferees/transferees.component.ts b/portal-frontend/src/app/features/notifications/edit-submission/transferees/transferees.component.ts new file mode 100644 index 0000000000..7988c8735a --- /dev/null +++ b/portal-frontend/src/app/features/notifications/edit-submission/transferees/transferees.component.ts @@ -0,0 +1,91 @@ +import { Component, OnDestroy, OnInit } from '@angular/core'; +import { MatDialog } from '@angular/material/dialog'; +import { Router } from '@angular/router'; +import { takeUntil } from 'rxjs'; +import { NotificationTransfereeDto } from '../../../../services/notification-transferee/notification-transferee.dto'; +import { NotificationTransfereeService } from '../../../../services/notification-transferee/notification-transferee.service'; +import { EditNotificationSteps } from '../edit-submission.component'; +import { StepComponent } from '../step.partial'; +import { TransfereeDialogComponent } from './transferee-dialog/transferee-dialog.component'; + +@Component({ + selector: 'app-transferees', + templateUrl: './transferees.component.html', + styleUrls: ['./transferees.component.scss'], +}) +export class TransfereesComponent extends StepComponent implements OnInit, OnDestroy { + currentStep = EditNotificationSteps.Transferees; + + transferees: NotificationTransfereeDto[] = []; + isDirty = false; + displayedColumns: string[] = ['type', 'fullName', 'organizationName', 'phone', 'email', 'actions']; + + private submissionUuid = ''; + + constructor( + private router: Router, + private notificationTransfereeService: NotificationTransfereeService, + private dialog: MatDialog + ) { + super(); + } + + ngOnInit(): void { + this.$notificationSubmission.pipe(takeUntil(this.$destroy)).subscribe((submission) => { + if (submission) { + this.submissionUuid = submission.uuid; + this.loadTransferees(submission.uuid); + } + }); + } + + protected async save() { + //Do Nothing + } + + private async loadTransferees(submissionUuid: string, primaryContactOwnerUuid?: string | null) { + const transferees = await this.notificationTransfereeService.fetchBySubmissionId(submissionUuid); + if (transferees) { + this.transferees = transferees; + } + } + + onAdd() { + this.dialog + .open(TransfereeDialogComponent, { + data: { + submissionUuid: this.submissionUuid, + }, + }) + .beforeClosed() + .subscribe((didCreate) => { + if (didCreate) { + this.loadTransferees(this.submissionUuid); + } + }); + } + + onEdit(uuid: string) { + const selectedTransferee = this.transferees.find((transferee) => transferee.uuid === uuid); + this.dialog + .open(TransfereeDialogComponent, { + data: { + submissionUuid: this.submissionUuid, + existingTransferee: selectedTransferee, + }, + }) + .beforeClosed() + .subscribe((didSave) => { + if (didSave) { + this.loadTransferees(this.submissionUuid); + } + }); + } + + async onDelete(uuid: string) { + await this.notificationTransfereeService.delete(uuid); + await this.loadTransferees(this.submissionUuid); + } + + protected readonly undefined = undefined; +} diff --git a/portal-frontend/src/app/services/notification-transferee/notification-transferee.dto.ts b/portal-frontend/src/app/services/notification-transferee/notification-transferee.dto.ts index 2f796b2fe2..a6e60023b3 100644 --- a/portal-frontend/src/app/services/notification-transferee/notification-transferee.dto.ts +++ b/portal-frontend/src/app/services/notification-transferee/notification-transferee.dto.ts @@ -3,9 +3,6 @@ import { BaseCodeDto } from '../../shared/dto/base.dto'; export enum OWNER_TYPE { INDIVIDUAL = 'INDV', ORGANIZATION = 'ORGZ', - AGENT = 'AGEN', - CROWN = 'CRWN', - GOVERNMENT = 'GOVR', } export interface OwnerTypeDto extends BaseCodeDto { @@ -24,27 +21,15 @@ export interface NotificationTransfereeDto { type: OwnerTypeDto; } -export interface NotificationOwnerUpdateDto { +export interface NotificationTransfereeUpdateDto { firstName?: string | null; lastName?: string | null; organizationName?: string | null; phoneNumber: string; email: string; typeCode: string; - corporateSummaryUuid?: string | null; } -export interface NotificationOwnerCreateDto extends NotificationOwnerUpdateDto { - noticeOfIntentSubmissionUuid: string; -} - -export interface SetPrimaryContactDto { - firstName?: string; - lastName?: string; - organization?: string; - phoneNumber?: string; - email?: string; - type?: OWNER_TYPE; - ownerUuid?: string; - noticeOfIntentSubmissionUuid: string; +export interface NotificationTransfereeCreateDto extends NotificationTransfereeUpdateDto { + notificationSubmissionUuid: string; } diff --git a/portal-frontend/src/app/services/notification-transferee/notification-transferee.service.spec.ts b/portal-frontend/src/app/services/notification-transferee/notification-transferee.service.spec.ts index bb8b61c98d..986e30a836 100644 --- a/portal-frontend/src/app/services/notification-transferee/notification-transferee.service.spec.ts +++ b/portal-frontend/src/app/services/notification-transferee/notification-transferee.service.spec.ts @@ -43,7 +43,7 @@ describe('NotificationTransfereeService', () => { expect(service).toBeTruthy(); }); - it('should make a get request for loading owners', async () => { + it('should make a get request for loading transferees', async () => { mockHttpClient.get.mockReturnValue(of({})); await service.fetchBySubmissionId(fileId); @@ -52,7 +52,7 @@ describe('NotificationTransfereeService', () => { expect(mockHttpClient.get.mock.calls[0][0]).toContain('notification-transferee'); }); - it('should show an error toast if getting owners fails', async () => { + it('should show an error toast if getting transferees fails', async () => { mockHttpClient.get.mockReturnValue(throwError(() => ({}))); await service.fetchBySubmissionId(fileId); @@ -65,7 +65,7 @@ describe('NotificationTransfereeService', () => { mockHttpClient.post.mockReturnValue(of({})); await service.create({ - noticeOfIntentSubmissionUuid: '', + notificationSubmissionUuid: '', email: '', phoneNumber: '', typeCode: '', @@ -75,11 +75,11 @@ describe('NotificationTransfereeService', () => { expect(mockHttpClient.post.mock.calls[0][0]).toContain('notification-transferee'); }); - it('should show an error toast if creating owner fails', async () => { + it('should show an error toast if creating transferee fails', async () => { mockHttpClient.post.mockReturnValue(throwError(() => ({}))); await service.create({ - noticeOfIntentSubmissionUuid: '', + notificationSubmissionUuid: '', email: '', phoneNumber: '', typeCode: '', @@ -102,7 +102,7 @@ describe('NotificationTransfereeService', () => { expect(mockHttpClient.patch.mock.calls[0][0]).toContain('notification-transferee'); }); - it('should show an error toast if updating owner fails', async () => { + it('should show an error toast if updating transferee fails', async () => { mockHttpClient.patch.mockReturnValue(throwError(() => ({}))); await service.update('', { @@ -124,7 +124,7 @@ describe('NotificationTransfereeService', () => { expect(mockHttpClient.delete.mock.calls[0][0]).toContain('notification-transferee'); }); - it('should show an error toast if delete owner fails', async () => { + it('should show an error toast if delete transferee fails', async () => { mockHttpClient.delete.mockReturnValue(throwError(() => ({}))); await service.delete(''); @@ -132,58 +132,4 @@ describe('NotificationTransfereeService', () => { expect(mockHttpClient.delete).toHaveBeenCalledTimes(1); expect(mockToastService.showErrorToast).toHaveBeenCalledTimes(1); }); - - it('should make a post request for removeFromParcel', async () => { - mockHttpClient.post.mockReturnValue(of({})); - - await service.removeFromParcel('', ''); - - expect(mockHttpClient.post).toHaveBeenCalledTimes(1); - expect(mockHttpClient.post.mock.calls[0][0]).toContain('notification-transferee'); - }); - - it('should show an error toast if removeFromParcel', async () => { - mockHttpClient.post.mockReturnValue(throwError(() => ({}))); - - await service.removeFromParcel('', ''); - - expect(mockHttpClient.post).toHaveBeenCalledTimes(1); - expect(mockToastService.showErrorToast).toHaveBeenCalledTimes(1); - }); - - it('should make a post request for linkToParcel', async () => { - mockHttpClient.post.mockReturnValue(of({})); - - await service.linkToParcel('', ''); - - expect(mockHttpClient.post).toHaveBeenCalledTimes(1); - expect(mockHttpClient.post.mock.calls[0][0]).toContain('notification-transferee'); - }); - - it('should show an error toast if linkToParcel', async () => { - mockHttpClient.post.mockReturnValue(throwError(() => ({}))); - - await service.linkToParcel('', ''); - - expect(mockHttpClient.post).toHaveBeenCalledTimes(1); - expect(mockToastService.showErrorToast).toHaveBeenCalledTimes(1); - }); - - it('should make a post request for setPrimaryContact', async () => { - mockHttpClient.post.mockReturnValue(of({})); - - await service.setPrimaryContact({ noticeOfIntentSubmissionUuid: '' }); - - expect(mockHttpClient.post).toHaveBeenCalledTimes(1); - expect(mockHttpClient.post.mock.calls[0][0]).toContain('notification-transferee'); - }); - - it('should show an error toast if setPrimaryContact', async () => { - mockHttpClient.post.mockReturnValue(throwError(() => ({}))); - - await service.setPrimaryContact({ noticeOfIntentSubmissionUuid: '' }); - - expect(mockHttpClient.post).toHaveBeenCalledTimes(1); - expect(mockToastService.showErrorToast).toHaveBeenCalledTimes(1); - }); }); diff --git a/portal-frontend/src/app/services/notification-transferee/notification-transferee.service.ts b/portal-frontend/src/app/services/notification-transferee/notification-transferee.service.ts index f5ea226734..6493cf3d0c 100644 --- a/portal-frontend/src/app/services/notification-transferee/notification-transferee.service.ts +++ b/portal-frontend/src/app/services/notification-transferee/notification-transferee.service.ts @@ -2,14 +2,11 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { firstValueFrom } from 'rxjs'; import { environment } from '../../../environments/environment'; -import { DOCUMENT_SOURCE, DOCUMENT_TYPE } from '../../shared/dto/document.dto'; -import { DocumentService } from '../document/document.service'; import { ToastService } from '../toast/toast.service'; import { - NotificationOwnerCreateDto, + NotificationTransfereeCreateDto, NotificationTransfereeDto, - NotificationOwnerUpdateDto, - SetPrimaryContactDto, + NotificationTransfereeUpdateDto, } from './notification-transferee.dto'; @Injectable({ @@ -18,11 +15,7 @@ import { export class NotificationTransfereeService { private serviceUrl = `${environment.apiUrl}/notification-transferee`; - constructor( - private httpClient: HttpClient, - private toastService: ToastService, - private documentService: DocumentService - ) {} + constructor(private httpClient: HttpClient, private toastService: ToastService) {} async fetchBySubmissionId(submissionUuid: string) { try { return await firstValueFrom( @@ -30,87 +23,44 @@ export class NotificationTransfereeService { ); } catch (e) { console.error(e); - this.toastService.showErrorToast('Failed to load Owners, please try again later'); + this.toastService.showErrorToast('Failed to load Transferees, please try again later'); } return undefined; } - async create(dto: NotificationOwnerCreateDto) { + async create(dto: NotificationTransfereeCreateDto) { try { const res = await firstValueFrom(this.httpClient.post(`${this.serviceUrl}`, dto)); - this.toastService.showSuccessToast('Owner created'); + this.toastService.showSuccessToast('Transferee created'); return res; } catch (e) { console.error(e); - this.toastService.showErrorToast('Failed to create Owner, please try again later'); + this.toastService.showErrorToast('Failed to create Transferee, please try again later'); return undefined; } } - async update(uuid: string, updateDto: NotificationOwnerUpdateDto) { + async update(uuid: string, updateDto: NotificationTransfereeUpdateDto) { try { const res = await firstValueFrom( this.httpClient.patch(`${this.serviceUrl}/${uuid}`, updateDto) ); - this.toastService.showSuccessToast('Owner saved'); + this.toastService.showSuccessToast('Transferee saved'); return res; } catch (e) { console.error(e); - this.toastService.showErrorToast('Failed to update Owner, please try again later'); + this.toastService.showErrorToast('Failed to update Transferee, please try again later'); return undefined; } } - - async setPrimaryContact(updateDto: SetPrimaryContactDto) { - try { - const res = await firstValueFrom( - this.httpClient.post(`${this.serviceUrl}/setPrimaryContact`, updateDto) - ); - this.toastService.showSuccessToast('Notice of Intent saved'); - return res; - } catch (e) { - console.error(e); - this.toastService.showErrorToast('Failed to update Notice of Intent, please try again later'); - return undefined; - } - } - async delete(uuid: string) { try { const result = await firstValueFrom(this.httpClient.delete(`${this.serviceUrl}/${uuid}`)); - this.toastService.showSuccessToast('Owner deleted'); + this.toastService.showSuccessToast('Transferees deleted'); return result; } catch (e) { console.error(e); - this.toastService.showErrorToast('Failed to delete Owner, please try again'); - } - return undefined; - } - - async removeFromParcel(ownerUuid: string, parcelUuid: string) { - try { - const result = await firstValueFrom( - this.httpClient.post(`${this.serviceUrl}/${ownerUuid}/unlink/${parcelUuid}`, {}) - ); - this.toastService.showSuccessToast('Owner removed from parcel'); - return result; - } catch (e) { - console.error(e); - this.toastService.showErrorToast('Failed to remove Owner, please try again'); - } - return undefined; - } - - async linkToParcel(ownerUuid: any, parcelUuid: string) { - try { - const result = await firstValueFrom( - this.httpClient.post(`${this.serviceUrl}/${ownerUuid}/link/${parcelUuid}`, {}) - ); - this.toastService.showSuccessToast('Owner linked to parcel'); - return result; - } catch (e) { - console.error(e); - this.toastService.showErrorToast('Failed to link Owner, please try again'); + this.toastService.showErrorToast('Failed to delete Transferee, please try again'); } return undefined; } @@ -124,20 +74,4 @@ export class NotificationTransfereeService { } return 0; } - - async uploadCorporateSummary(noticeOfIntentFileId: string, file: File) { - try { - return await this.documentService.uploadFile<{ uuid: string }>( - noticeOfIntentFileId, - file, - DOCUMENT_TYPE.CORPORATE_SUMMARY, - DOCUMENT_SOURCE.APPLICANT, - `${this.serviceUrl}/attachCorporateSummary` - ); - } catch (e) { - console.error(e); - this.toastService.showErrorToast('Failed to attach document to Owner, please try again'); - } - return undefined; - } } diff --git a/portal-frontend/src/styles.scss b/portal-frontend/src/styles.scss index 2ead013f21..4dfc2c171f 100644 --- a/portal-frontend/src/styles.scss +++ b/portal-frontend/src/styles.scss @@ -48,6 +48,13 @@ a { align-items: center; } +.split { + display: flex; + align-content: center; + justify-content: space-between; + align-items: center; +} + .no-padding .mat-dialog-container { padding: 0; } diff --git a/services/apps/alcs/src/portal/notification-submission/notification-transferee/notification-transferee.controller.ts b/services/apps/alcs/src/portal/notification-submission/notification-transferee/notification-transferee.controller.ts index 1262329846..bbac88444a 100644 --- a/services/apps/alcs/src/portal/notification-submission/notification-transferee/notification-transferee.controller.ts +++ b/services/apps/alcs/src/portal/notification-submission/notification-transferee/notification-transferee.controller.ts @@ -27,7 +27,7 @@ import { import { NotificationTransferee } from './notification-transferee.entity'; import { NotificationTransfereeService } from './notification-transferee.service'; -@Controller('srw-transferee') +@Controller('notification-transferee') @UseGuards(PortalAuthGuard) export class NotificationTransfereeController { constructor( From ce4a6303ad8b08b1b7c799c0f5ef7f16f67408e1 Mon Sep 17 00:00:00 2001 From: Liam Stoddard Date: Wed, 6 Sep 2023 10:22:04 -0700 Subject: [PATCH 343/954] duration in months --- bin/migrate-oats-data/submissions/submap/soil_elements.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/migrate-oats-data/submissions/submap/soil_elements.py b/bin/migrate-oats-data/submissions/submap/soil_elements.py index 6a72f36721..055aaed3b4 100644 --- a/bin/migrate-oats-data/submissions/submap/soil_elements.py +++ b/bin/migrate-oats-data/submissions/submap/soil_elements.py @@ -99,8 +99,8 @@ def map_soil_data(data, soil_data): data['fill_duration'] = soil_data.get(data[app_component_id], {}).get('fill_duration', None) data['fill_area'] = soil_data.get(data[app_component_id], {}).get('fill_area', None) data['import_fill'] = soil_data.get(data[app_component_id], {}).get('import_fill', None) - data['fill_duration_unit'] = 'duration_unit' - data['remove_duration_unit'] = 'duration_unit' + data['fill_duration_unit'] = 'months' + data['remove_duration_unit'] = 'months' data['remove_type'] = soil_data.get(data[app_component_id], {}).get('remove_type', None) data['remove_origin'] = soil_data.get(data[app_component_id], {}).get('remove_origin', None) data['total_remove'] = soil_data.get(data[app_component_id], {}).get('total_remove', None) From b7ab6b7bb5628374c7650431e2a015255a33f000 Mon Sep 17 00:00:00 2001 From: Liam Stoddard Date: Wed, 6 Sep 2023 10:25:16 -0700 Subject: [PATCH 344/954] Fixed type code issue --- bin/migrate-oats-data/noi/noi.py | 5 +++-- bin/migrate-oats-data/noi/sql/insert_noi.sql | 23 ++++++++++++++++++-- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/bin/migrate-oats-data/noi/noi.py b/bin/migrate-oats-data/noi/noi.py index c7ce704e89..82a6094c2f 100644 --- a/bin/migrate-oats-data/noi/noi.py +++ b/bin/migrate-oats-data/noi/noi.py @@ -4,7 +4,7 @@ def noi_insert_query(number_of_rows_to_insert): nois_to_insert = ",".join(["%s"] * number_of_rows_to_insert) return f""" INSERT INTO alcs.notice_of_intent (file_number, - applicant, region_code, local_government_uuid, audit_created_by) + applicant, region_code, local_government_uuid, audit_created_by, type_code) VALUES{nois_to_insert} ON CONFLICT (file_number) DO UPDATE SET @@ -12,7 +12,8 @@ def noi_insert_query(number_of_rows_to_insert): applicant = EXCLUDED.applicant, region_code = EXCLUDED.region_code, local_government_uuid = EXCLUDED.local_government_uuid, - audit_created_by = EXCLUDED.audit_created_by + audit_created_by = EXCLUDED.audit_created_by, + type_code = EXCLUDED.type_code """ @inject_conn_pool diff --git a/bin/migrate-oats-data/noi/sql/insert_noi.sql b/bin/migrate-oats-data/noi/sql/insert_noi.sql index 205f68e5b6..48bba19aae 100644 --- a/bin/migrate-oats-data/noi/sql/insert_noi.sql +++ b/bin/migrate-oats-data/noi/sql/insert_noi.sql @@ -129,6 +129,18 @@ WITH WHERE oo2.organization_type_cd = 'PANEL' OR oo3.organization_type_cd = 'PANEL' + ), + application_type_lookup AS ( + SELECT + oaac.alr_application_id AS application_id, + oacc."description" AS "description", + oaac.alr_change_code AS code + FROM + oats.oats_alr_appl_components AS oaac + JOIN oats.oats_alr_change_codes oacc ON oaac.alr_change_code = oacc.alr_change_code + LEFT JOIN oats.alcs_etl_application_exclude aee ON oaac.alr_appl_component_id = aee.component_id + WHERE + aee.component_id IS NULL ) SELECT ng.noi_application_id :: text AS file_number, @@ -142,10 +154,17 @@ SELECT WHEN alcs_gov.gov_uuid IS NOT NULL THEN alcs_gov.gov_uuid ELSE '001cfdad-bc6e-4d25-9294-1550603da980' --Peace River if unable to find uuid END AS local_government_uuid, - 'oats_etl' AS audit_created_by + 'oats_etl' AS audit_created_by, + CASE + WHEN atl.code = 'SCH' THEN 'PFRS' + WHEN atl.code = 'EXT' THEN 'ROSO' + WHEN atl.code = 'FILL' THEN 'POFO' + ELSE 'POFO' -- POFO if value is null + END AS type_code FROM noi_grouped AS ng LEFT JOIN applicant_lookup ON ng.noi_application_id = applicant_lookup.application_id LEFT JOIN panel_lookup ON ng.noi_application_id = panel_lookup.application_id LEFT JOIN alcs.application_region ar ON panel_lookup.panel_region = ar."label" - LEFT JOIN alcs_gov ON ng.noi_application_id = alcs_gov.application_id \ No newline at end of file + LEFT JOIN alcs_gov ON ng.noi_application_id = alcs_gov.application_id + LEFT JOIN application_type_lookup AS atl ON ng.noi_application_id = atl.application_id \ No newline at end of file From 2c66de8b8c625d079c117b5a327b044fbb32fbdd Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Wed, 6 Sep 2023 10:26:43 -0700 Subject: [PATCH 345/954] Feature/alcs 957 part 3 file type filter (#942) file type search dropdown --- .../file-type-filter-drop-down.component.html | 40 ++++ .../file-type-filter-drop-down.component.scss | 3 + ...le-type-filter-drop-down.component.spec.ts | 26 +++ .../file-type-filter-drop-down.component.ts | 185 ++++++++++++++++++ .../app/features/search/search.component.html | 13 +- .../app/features/search/search.component.scss | 184 ++++++++--------- .../app/features/search/search.component.ts | 15 +- .../src/app/features/search/search.module.ts | 23 ++- .../file-type-data-source.service.spec.ts | 34 ++++ .../file-type-data-source.service.ts | 118 +++++++++++ ...-of-intent-advanced-search.service.spec.ts | 2 +- ...otice-of-intent-advanced-search.service.ts | 39 ---- .../src/alcs/search/search.controller.spec.ts | 74 +++++++ .../alcs/src/alcs/search/search.controller.ts | 68 ++++++- .../generate-submission-document.service.ts | 6 + 15 files changed, 676 insertions(+), 154 deletions(-) create mode 100644 alcs-frontend/src/app/features/search/file-type-filter-drop-down/file-type-filter-drop-down.component.html create mode 100644 alcs-frontend/src/app/features/search/file-type-filter-drop-down/file-type-filter-drop-down.component.scss create mode 100644 alcs-frontend/src/app/features/search/file-type-filter-drop-down/file-type-filter-drop-down.component.spec.ts create mode 100644 alcs-frontend/src/app/features/search/file-type-filter-drop-down/file-type-filter-drop-down.component.ts create mode 100644 alcs-frontend/src/app/services/search/file-type/file-type-data-source.service.spec.ts create mode 100644 alcs-frontend/src/app/services/search/file-type/file-type-data-source.service.ts diff --git a/alcs-frontend/src/app/features/search/file-type-filter-drop-down/file-type-filter-drop-down.component.html b/alcs-frontend/src/app/features/search/file-type-filter-drop-down/file-type-filter-drop-down.component.html new file mode 100644 index 0000000000..ae960ea80f --- /dev/null +++ b/alcs-frontend/src/app/features/search/file-type-filter-drop-down/file-type-filter-drop-down.component.html @@ -0,0 +1,40 @@ + + + + Please select an item from below + + + + {{ node.item?.label ?? node.item }} + + + + + + {{ node.item?.label ?? node.item }} + + + + diff --git a/alcs-frontend/src/app/features/search/file-type-filter-drop-down/file-type-filter-drop-down.component.scss b/alcs-frontend/src/app/features/search/file-type-filter-drop-down/file-type-filter-drop-down.component.scss new file mode 100644 index 0000000000..39864d8e44 --- /dev/null +++ b/alcs-frontend/src/app/features/search/file-type-filter-drop-down/file-type-filter-drop-down.component.scss @@ -0,0 +1,3 @@ +.file-type-input { + width: 100%; +} \ No newline at end of file diff --git a/alcs-frontend/src/app/features/search/file-type-filter-drop-down/file-type-filter-drop-down.component.spec.ts b/alcs-frontend/src/app/features/search/file-type-filter-drop-down/file-type-filter-drop-down.component.spec.ts new file mode 100644 index 0000000000..98cd31ef11 --- /dev/null +++ b/alcs-frontend/src/app/features/search/file-type-filter-drop-down/file-type-filter-drop-down.component.spec.ts @@ -0,0 +1,26 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { MatAutocompleteModule } from '@angular/material/autocomplete'; + +import { FileTypeFilterDropDownComponent } from './file-type-filter-drop-down.component'; + +describe('FileTypeFilterDropDownComponent', () => { + let component: FileTypeFilterDropDownComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [FileTypeFilterDropDownComponent], + schemas: [NO_ERRORS_SCHEMA], + imports: [MatAutocompleteModule], + }).compileComponents(); + + fixture = TestBed.createComponent(FileTypeFilterDropDownComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/alcs-frontend/src/app/features/search/file-type-filter-drop-down/file-type-filter-drop-down.component.ts b/alcs-frontend/src/app/features/search/file-type-filter-drop-down/file-type-filter-drop-down.component.ts new file mode 100644 index 0000000000..f077c50fa0 --- /dev/null +++ b/alcs-frontend/src/app/features/search/file-type-filter-drop-down/file-type-filter-drop-down.component.ts @@ -0,0 +1,185 @@ +import { SelectionModel } from '@angular/cdk/collections'; +import { FlatTreeControl } from '@angular/cdk/tree'; +import { AfterViewInit, Component, EventEmitter, Output } from '@angular/core'; +import { FormControl } from '@angular/forms'; +import { MatTreeFlatDataSource, MatTreeFlattener } from '@angular/material/tree'; +import { Observable } from 'rxjs'; +import { FileTypeDataSourceService, FlatTreeNode, TreeNode } from '../../../services/search/file-type/file-type-data-source.service'; + +@Component({ + selector: 'app-file-type-filter-drop-down', + templateUrl: './file-type-filter-drop-down.component.html', + styleUrls: ['./file-type-filter-drop-down.component.scss'], +}) +export class FileTypeFilterDropDownComponent implements AfterViewInit { + /** Map from flat node to nested node. This helps us finding the nested node to be modified */ + flatNodeMap = new Map(); + + /** Map from nested node to flattened node. This helps us to keep the same object for selection */ + nestedNodeMap = new Map(); + + treeControl: FlatTreeControl; + + treeFlattener: MatTreeFlattener; + + dataSource: MatTreeFlatDataSource; + + /** The selection for checklist */ + checklistSelection = new SelectionModel(true); + + filteredOptions = new Observable(); + componentTypeControl = new FormControl(undefined); + @Output() fileTypeChange = new EventEmitter(); + + constructor(private fileTypeData: FileTypeDataSourceService) { + this.treeFlattener = new MatTreeFlattener(this.transformer, this.getLevel, this.isExpandable, this.getChildren); + this.treeControl = new FlatTreeControl(this.getLevel, this.isExpandable); + this.dataSource = new MatTreeFlatDataSource(this.treeControl, this.treeFlattener); + + fileTypeData.dataChange.subscribe((data) => { + this.dataSource.data = data; + }); + } + + getLevel = (node: FlatTreeNode) => node.level; + + isExpandable = (node: FlatTreeNode) => node.expandable; + + getChildren = (node: TreeNode): TreeNode[] | undefined => node.children; + + hasChild = (_: number, _nodeData: FlatTreeNode) => _nodeData.expandable; + + hasNoContent = (_: number, _nodeData: FlatTreeNode) => _nodeData.item.value === ''; + + /** + * Transformer to convert nested node to flat node. Record the nodes in maps for later use. + */ + transformer = (node: TreeNode, level: number) => { + const existingNode = this.nestedNodeMap.get(node); + const flatNode = existingNode && existingNode.item.value === node.item.value ? existingNode : ({} as FlatTreeNode); + flatNode.item = node.item; + flatNode.level = level; + flatNode.expandable = !!node.children; + + this.flatNodeMap.set(flatNode, node); + this.nestedNodeMap.set(node, flatNode); + + return flatNode; + }; + + /** Whether all the descendants of the node are selected. */ + descendantsAllSelected(node: FlatTreeNode): boolean { + const descendants = this.treeControl.getDescendants(node); + const descAllSelected = descendants.every((child) => this.checklistSelection.isSelected(child)); + return descAllSelected; + } + + /** Whether part of the descendants are selected */ + descendantsPartiallySelected(node: FlatTreeNode): boolean { + const descendants = this.treeControl.getDescendants(node); + const result = descendants.some((child) => this.checklistSelection.isSelected(child)); + return result && !this.descendantsAllSelected(node); + } + + /** Toggle the to-do item selection. Select/deselect all the descendants node */ + todoItemSelectionToggle(node: FlatTreeNode): void { + this.checklistSelection.toggle(node); + const descendants = this.treeControl.getDescendants(node); + this.checklistSelection.isSelected(node) + ? this.checklistSelection.select(...descendants) + : this.checklistSelection.deselect(...descendants); + + // Force update for the parent + descendants.every((child) => this.checklistSelection.isSelected(child)); + this.checkAllParentsSelection(node); + } + + /** Toggle a leaf to-do item selection. Check all the parents to see if they changed */ + todoLeafItemSelectionToggle(node: FlatTreeNode): void { + this.checklistSelection.toggle(node); + this.checkAllParentsSelection(node); + } + + /* Checks all the parents when a leaf node is selected/unselected */ + checkAllParentsSelection(node: FlatTreeNode): void { + let parent: FlatTreeNode | null = this.getParentNodeAndChange(node); + while (parent) { + this.checkRootNodeSelection(parent); + parent = this.getParentNodeAndChange(parent); + } + } + + /** Check root node checked state and change it accordingly */ + checkRootNodeSelection(node: FlatTreeNode): void { + const nodeSelected = this.checklistSelection.isSelected(node); + const descendants = this.treeControl.getDescendants(node); + const descAllSelected = descendants.every((child) => this.checklistSelection.isSelected(child)); + if (nodeSelected && !descAllSelected) { + this.checklistSelection.deselect(node); + } else if (!nodeSelected && descAllSelected) { + this.checklistSelection.select(node); + } + } + + /* Get the parent node of a node and emit onChange*/ + getParentNodeAndChange(node: FlatTreeNode): FlatTreeNode | null { + this.onChange(); + + const currentLevel = this.getLevel(node); + + if (currentLevel < 1) { + return null; + } + + const startIndex = this.treeControl.dataNodes.indexOf(node) - 1; + + for (let i = startIndex; i >= 0; i--) { + const currentNode = this.treeControl.dataNodes[i]; + + if (this.getLevel(currentNode) < currentLevel) { + return currentNode; + } + } + return null; + } + + getSelectedItems(): string { + if (!this.checklistSelection.selected.length) { + return ''; + } + + return this.checklistSelection.selected + .filter((selectedItem) => selectedItem.item.value !== null) + .map((selectedItem) => selectedItem.item?.label) + .join(', '); + } + + filterChanged($event: any) { + const filterText = $event.target.value; + // FileTypeTreeComponent.filter method which actually filters the tree and gives back a tree structure + + this.fileTypeData.filter(filterText); + if (filterText) { + this.treeControl.expandAll(); + } else { + this.treeControl.collapseAll(); + } + } + + onChange() { + this.fileTypeChange.emit( + this.checklistSelection.selected + .filter((selectedItem) => selectedItem.item.value) + .map((selectedItem) => selectedItem.item.value!) + ); + } + + reset() { + this.componentTypeControl.reset(); + this.checklistSelection.selected.forEach((selectedItem) => this.checklistSelection.deselect(selectedItem)); + } + + ngAfterViewInit(): void { + this.treeControl.expandAll(); + } +} diff --git a/alcs-frontend/src/app/features/search/search.component.html b/alcs-frontend/src/app/features/search/search.component.html index 9ab3f405f2..5004e5b341 100644 --- a/alcs-frontend/src/app/features/search/search.component.html +++ b/alcs-frontend/src/app/features/search/search.component.html @@ -115,10 +115,7 @@
Provide one or more of the following criteria:
- - File Type (To be implemented) - - +
Note: This field searches both proposal and decision component type
@@ -224,11 +221,11 @@
Provide one or more of the following criteria:
+
+ + +
-
- - -

Search Results:

diff --git a/alcs-frontend/src/app/features/search/search.component.scss b/alcs-frontend/src/app/features/search/search.component.scss index f2b6428f48..a57495575d 100644 --- a/alcs-frontend/src/app/features/search/search.component.scss +++ b/alcs-frontend/src/app/features/search/search.component.scss @@ -1,24 +1,24 @@ @use '../../../styles/colors'; -h3, -div, -span { - color: colors.$black; -} +:host::ng-deep { + h3, + div, + span { + color: colors.$black; + } -.search-title { - width: 100%; - margin-top: 42px; - margin-bottom: 24px; - display: flex; - justify-content: left; - align-items: center; + .search-title { + width: 100%; + margin-top: 42px; + margin-bottom: 24px; + display: flex; + justify-content: left; + align-items: center; - h4 { - margin-right: 12px !important; + h4 { + margin-right: 12px !important; + } } -} -:host::ng-deep { .table { width: 100%; margin-top: 12px; @@ -49,106 +49,106 @@ span { height: 32px; } } -} -.search-fields-wrapper { - padding: 0 80px; -} + .search-fields-wrapper { + padding: 0 80px; + } -.row { - display: flex; - flex-direction: row; - flex-wrap: wrap; - gap: 24px; - width: 100%; - margin: 24px 0; + .row { + display: flex; + flex-direction: row; + flex-wrap: wrap; + gap: 24px; + width: 100%; + margin: 24px 0; - &.date-row { - margin: 0 0 12px 0; - } + &.date-row { + margin: 0 0 12px 0; + } - &.date-row-label { - margin: 0 0 4px 0; - gap: 4px; - } + &.date-row-label { + margin: 0 0 4px 0; + gap: 4px; + } - .column { - display: flex; - flex-direction: column; - flex-basis: 100%; - flex: 1; - } + .column { + display: flex; + flex-direction: column; + flex-basis: 100%; + flex: 1; + } - .resolution-wrapper { - gap: 12px; - margin: 0; + .resolution-wrapper { + gap: 12px; + margin: 0; + } } -} -.address-search-fields-wrapper { - background-color: #fee9b580; - padding: 12px 80px; + .address-search-fields-wrapper { + background-color: #fee9b580; + padding: 12px 80px; - .row { - margin: 4px 0; - } - .column { - background-color: white; + .row { + margin: 4px 0; + } + .column { + background-color: white; + } } -} - -.expand-search { - display: flex; - align-items: center; - justify-content: right; - .expand-search-btn { + .expand-search { display: flex; align-items: center; - cursor: pointer; - color: #1a5a96; + justify-content: right; - span { + .expand-search-btn { + display: flex; + align-items: center; + cursor: pointer; color: #1a5a96; + + span { + color: #1a5a96; + } } } -} - -.btn-controls { - padding: 12px 80px; - display: flex; - justify-content: space-between; -} - -.title { - margin: 36px 80px; -} -.subtitle { - margin: 18px 80px; -} + .btn-controls { + padding: 12px 80px; + display: flex; + justify-content: space-between; + } -.info-banner { - display: flex; - align-items: center; + .title { + margin: 36px 80px; + } - .info-description { - min-width: 0; - word-break: break-word; + .subtitle { + margin: 18px 80px; } - .icon { + .info-banner { display: flex; - justify-content: center; - mat-icon { - font-size: 18px; - height: 18px; - width: 18px; + align-items: center; + + .info-description { + min-width: 0; + word-break: break-word; + } + + .icon { + display: flex; + justify-content: center; + mat-icon { + font-size: 18px; + height: 18px; + width: 18px; + } } } -} -.search-result-wrapper { - margin-top: 60px; - margin-bottom: 60px; + .search-result-wrapper { + margin-top: 60px; + margin-bottom: 60px; + } } diff --git a/alcs-frontend/src/app/features/search/search.component.ts b/alcs-frontend/src/app/features/search/search.component.ts index c227623a2f..7615895dd5 100644 --- a/alcs-frontend/src/app/features/search/search.component.ts +++ b/alcs-frontend/src/app/features/search/search.component.ts @@ -22,6 +22,7 @@ import { import { SearchService } from '../../services/search/search.service'; import { ToastService } from '../../services/toast/toast.service'; import { formatDateForApi } from '../../shared/utils/api-date-formatter'; +import { FileTypeFilterDropDownComponent } from './file-type-filter-drop-down/file-type-filter-drop-down.component'; import { TableChange } from './search.interface'; export const defaultStatusBackgroundColour = '#ffffff'; @@ -42,6 +43,7 @@ export class SearchComponent implements OnInit, OnDestroy { @ViewChild(MatPaginator) paginator!: MatPaginator; @ViewChild(MatSort) sort?: MatSort; @ViewChild('searchResultTabs') tabGroup!: MatTabGroup; + @ViewChild('fileTypeDropDown') fileTypeFilterDropDownComponent!: FileTypeFilterDropDownComponent; applications: ApplicationSearchResultDto[] = []; applicationTotal = 0; @@ -60,6 +62,7 @@ export class SearchComponent implements OnInit, OnDestroy { localGovernmentControl = new FormControl(undefined); portalStatusControl = new FormControl(undefined); + componentTypeControl = new FormControl(undefined); searchForm = new FormGroup({ fileNumber: new FormControl(undefined), name: new FormControl(undefined), @@ -70,7 +73,7 @@ export class SearchComponent implements OnInit, OnDestroy { resolutionYear: new FormControl(undefined), legacyId: new FormControl(undefined), portalStatus: this.portalStatusControl, - componentType: new FormControl(undefined), + componentType: this.componentTypeControl, government: this.localGovernmentControl, region: new FormControl(undefined), dateSubmittedFrom: new FormControl(undefined), @@ -163,7 +166,7 @@ export class SearchComponent implements OnInit, OnDestroy { } onBlur() { - //Blur will fire before onChange above, so use setTimeout to delay it + //Blur will fire before onGovernmentChange above, so use setTimeout to delay it setTimeout(() => { const localGovernmentName = this.localGovernmentControl.getRawValue(); if (localGovernmentName) { @@ -178,6 +181,7 @@ export class SearchComponent implements OnInit, OnDestroy { onReset() { this.searchForm.reset(); + this.fileTypeFilterDropDownComponent.reset(); } async onSearch() { @@ -221,9 +225,8 @@ export class SearchComponent implements OnInit, OnDestroy { dateDecidedTo: this.searchForm.controls.dateDecidedTo.value ? formatDateForApi(this.searchForm.controls.dateDecidedTo.value) : undefined, - // TODO this will be reworked in later tickets applicationFileTypes: this.searchForm.controls.componentType.value - ? this.searchForm.controls.componentType.value.split(',') + ? this.searchForm.controls.componentType.value : [], }; } @@ -273,6 +276,10 @@ export class SearchComponent implements OnInit, OnDestroy { } } + onFileTypeChange(fileTypes: string[]) { + this.componentTypeControl.setValue(fileTypes); + } + private async loadGovernments() { const governments = await this.localGovernmentService.list(); this.localGovernments = governments.sort((a, b) => (a.name > b.name ? 1 : -1)); diff --git a/alcs-frontend/src/app/features/search/search.module.ts b/alcs-frontend/src/app/features/search/search.module.ts index a7aac6457d..5923c66331 100644 --- a/alcs-frontend/src/app/features/search/search.module.ts +++ b/alcs-frontend/src/app/features/search/search.module.ts @@ -2,12 +2,14 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { MatPaginatorModule } from '@angular/material/paginator'; import { MatTabsModule } from '@angular/material/tabs'; +import { MatTreeModule } from '@angular/material/tree'; import { RouterModule, Routes } from '@angular/router'; import { SharedModule } from '../../shared/shared.module'; -import { SearchComponent } from './search.component'; import { ApplicationSearchTableComponent } from './application-search-table/application-search-table.component'; -import { NoticeOfIntentSearchTableComponent } from './notice-of-intent-search-table/notice-of-intent-search-table.component'; +import { FileTypeFilterDropDownComponent } from './file-type-filter-drop-down/file-type-filter-drop-down.component'; import { NonApplicationSearchTableComponent } from './non-application-search-table/non-application-search-table.component'; +import { NoticeOfIntentSearchTableComponent } from './notice-of-intent-search-table/notice-of-intent-search-table.component'; +import { SearchComponent } from './search.component'; const routes: Routes = [ { @@ -17,7 +19,20 @@ const routes: Routes = [ ]; @NgModule({ - declarations: [SearchComponent, ApplicationSearchTableComponent, NoticeOfIntentSearchTableComponent, NonApplicationSearchTableComponent], - imports: [CommonModule, SharedModule.forRoot(), RouterModule.forChild(routes), MatTabsModule, MatPaginatorModule], + declarations: [ + SearchComponent, + ApplicationSearchTableComponent, + NoticeOfIntentSearchTableComponent, + NonApplicationSearchTableComponent, + FileTypeFilterDropDownComponent, + ], + imports: [ + CommonModule, + SharedModule.forRoot(), + RouterModule.forChild(routes), + MatTabsModule, + MatPaginatorModule, + MatTreeModule, + ], }) export class SearchModule {} diff --git a/alcs-frontend/src/app/services/search/file-type/file-type-data-source.service.spec.ts b/alcs-frontend/src/app/services/search/file-type/file-type-data-source.service.spec.ts new file mode 100644 index 0000000000..dc0a50f658 --- /dev/null +++ b/alcs-frontend/src/app/services/search/file-type/file-type-data-source.service.spec.ts @@ -0,0 +1,34 @@ +import { TestBed } from '@angular/core/testing'; +import { FileTypeDataSourceService, TreeNode } from './file-type-data-source.service'; + +describe('FileTypeDataSourceService', () => { + let service: FileTypeDataSourceService; + + beforeEach(() => { + TestBed.configureTestingModule({}); + service = TestBed.inject(FileTypeDataSourceService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); + + it('should load initial data', () => { + expect(service.data).toBeTruthy(); + expect(service.data.length).toBeGreaterThan(0); + }); + + it('should filter data', () => { + service.filter('Covenants'); + expect(service.data.length).toBe(1); + + const node: TreeNode = service.data[0]; + console.log(service.dataChange.getValue()); + expect(node.item.label).toEqual('Non-Application'); + }); + + it('should reset data when filtering with empty text', () => { + service.filter(''); + expect(service.data.length).toBeGreaterThan(0); + }); +}); diff --git a/alcs-frontend/src/app/services/search/file-type/file-type-data-source.service.ts b/alcs-frontend/src/app/services/search/file-type/file-type-data-source.service.ts new file mode 100644 index 0000000000..3b84bbe2be --- /dev/null +++ b/alcs-frontend/src/app/services/search/file-type/file-type-data-source.service.ts @@ -0,0 +1,118 @@ +import { Injectable } from '@angular/core'; +import { BehaviorSubject } from 'rxjs'; + +export interface TreeNodeItem { + label: string; + value: string | null; +} +/** + * Node for to-do item + */ +export interface TreeNode { + children?: TreeNode[]; + item: TreeNodeItem; +} + +/** Flat to-do item node with expandable and level information */ +export interface FlatTreeNode { + item: TreeNodeItem; + level: number; + expandable: boolean; +} + +const TREE_DATA: TreeNode[] = [ + { + item: { label: 'Application', value: null }, + children: [ + { item: { label: 'Exclusion', value: 'EXCL' } }, + { item: { label: 'Inclusion', value: 'INCL' } }, + { + item: { label: 'Non-Adhering Residential Use', value: 'NARU' }, + }, + { + item: { label: 'Non-Farm Use', value: 'NFUP' }, + }, + { + item: { label: 'Placement of Fill', value: 'POFO' }, + }, + { + item: { label: 'Removal of Soil and Placement of Fill', value: 'PFRS' }, + }, + { + item: { label: 'Removal of Soil Only', value: 'ROSO' }, + }, + { + item: { label: 'Subdivision', value: 'SUBD' }, + }, + { + item: { label: 'Transportation, Utility, Trail Permits', value: 'TURP' }, + }, + ], + }, + { + item: { label: 'Notice of Intent', value: 'NOI' }, + }, + { + item: { label: 'Non-Application', value: null }, + + children: [ + { + item: { label: 'Covenants', value: 'COV' }, + }, + { + item: { label: 'Notification of SRW', value: 'SRW' }, + }, + { + item: { label: 'Planning Review', value: 'PLAN' }, + }, + ], + }, +]; + +@Injectable({ providedIn: 'root' }) +export class FileTypeDataSourceService { + dataChange = new BehaviorSubject([]); + treeData: TreeNode[] = []; + + get data(): TreeNode[] { + return this.dataChange.value; + } + + constructor() { + this.initialize(); + } + + initialize() { + this.treeData = TREE_DATA; + this.dataChange.next(TREE_DATA); + } + + public filter(filterText: string) { + let filteredTreeData; + if (filterText) { + // Filter the tree + const filter = (array: TreeNode[], text: string) => { + const getChildren = (result: any, object: any) => { + console.log(text, object.item.label, object.item.label.toLowerCase().includes(text.toLowerCase())); + if (object.item.label.toLowerCase().includes(text.toLowerCase())) { + result.push(object); + return result; + } + if (Array.isArray(object.children)) { + const children = object.children.reduce(getChildren, []); + if (children.length) result.push({ ...object, children }); + } + return result; + }; + + return array.reduce(getChildren, []); + }; + + filteredTreeData = filter(this.treeData, filterText); + } else { + // Return the initial tree + filteredTreeData = this.treeData; + } + this.dataChange.next(filteredTreeData); + } +} diff --git a/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-advanced-search.service.spec.ts b/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-advanced-search.service.spec.ts index ce29c4b358..2ac66de0c5 100644 --- a/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-advanced-search.service.spec.ts +++ b/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-advanced-search.service.spec.ts @@ -93,7 +93,7 @@ describe('NoticeOfIntentService', () => { expect( mockNoticeOfIntentSubmissionSearchViewRepository.createQueryBuilder, ).toBeCalledTimes(1); - expect(mockQuery.andWhere).toBeCalledTimes(14); + expect(mockQuery.andWhere).toBeCalledTimes(13); expect(mockQuery.where).toBeCalledTimes(1); }); diff --git a/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-advanced-search.service.ts b/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-advanced-search.service.ts index 4ba8d3fbdf..312a0f8dbe 100644 --- a/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-advanced-search.service.ts +++ b/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-advanced-search.service.ts @@ -149,8 +149,6 @@ export class NoticeOfIntentAdvancedSearchService { query = this.compileDecisionSearchQuery(searchDto, query); - query = this.compileFileTypeSearchQuery(searchDto, query); - query = this.compileDateRangeSearchQuery(searchDto, query); return query; @@ -296,41 +294,4 @@ export class NoticeOfIntentAdvancedSearchService { } return query; } - - private compileFileTypeSearchQuery(searchDto: SearchRequestDto, query) { - query = query; - - if (searchDto.applicationFileTypes.length > 0) { - // if decision is not joined yet -> join it. The join of decision happens in compileApplicationDecisionSearchQuery - if ( - searchDto.resolutionNumber === undefined && - searchDto.resolutionYear === undefined - ) { - query = this.joinDecision(query); - } - - query = query.leftJoin( - NoticeOfIntentDecisionComponent, - 'decisionComponent', - 'decisionComponent.notice_of_intent_decision_uuid = decision.uuid', - ); - - query = query.andWhere( - new Brackets((qb) => - qb - .where('noiSearch.notice_of_intent_type_code IN (:...typeCodes)', { - typeCodes: searchDto.applicationFileTypes, - }) - .orWhere( - 'decisionComponent.notice_of_intent_decision_component_type_code IN (:...typeCodes)', - { - typeCodes: searchDto.applicationFileTypes, - }, - ), - ), - ); - } - - return query; - } } diff --git a/services/apps/alcs/src/alcs/search/search.controller.spec.ts b/services/apps/alcs/src/alcs/search/search.controller.spec.ts index 3e51a64d9a..ddac32eec0 100644 --- a/services/apps/alcs/src/alcs/search/search.controller.spec.ts +++ b/services/apps/alcs/src/alcs/search/search.controller.spec.ts @@ -251,4 +251,78 @@ describe('SearchController', () => { expect(result.data).toBeDefined(); expect(result.total).toBe(0); }); + + it('should call advanced search to retrieve Applications only when application file type selected', async () => { + const mockSearchRequestDto = { + pageSize: 1, + page: 1, + sortField: '1', + sortDirection: 'ASC', + isIncludeOtherParcels: false, + applicationFileTypes: ['NFUP'], + }; + + const result = await controller.advancedSearch( + mockSearchRequestDto as SearchRequestDto, + ); + + expect( + mockApplicationAdvancedSearchService.searchApplications, + ).toBeCalledTimes(1); + expect( + mockApplicationAdvancedSearchService.searchApplications, + ).toBeCalledWith(mockSearchRequestDto); + expect(result.applications).toBeDefined(); + expect(result.totalApplications).toBe(0); + }); + + it('should call advanced search to retrieve NOIs only when NOI file type selected', async () => { + const mockSearchRequestDto = { + pageSize: 1, + page: 1, + sortField: '1', + sortDirection: 'ASC', + isIncludeOtherParcels: false, + applicationFileTypes: ['NOI'], + }; + + const result = await controller.advancedSearch( + mockSearchRequestDto as SearchRequestDto, + ); + + expect( + mockNoticeOfIntentAdvancedSearchService.searchNoticeOfIntents, + ).toBeCalledTimes(1); + expect( + mockNoticeOfIntentAdvancedSearchService.searchNoticeOfIntents, + ).toBeCalledWith(mockSearchRequestDto); + expect(result.noticeOfIntents).toBeDefined(); + expect(result.totalNoticeOfIntents).toBe(0); + }); + + it('should call advanced search to retrieve Non Applications only when non application file type selected', async () => { + const mockSearchRequestDto = { + pageSize: 1, + page: 1, + sortField: '1', + sortDirection: 'ASC', + isIncludeOtherParcels: false, + applicationFileTypes: ['COV'], + }; + + const result = await controller.advancedSearch( + mockSearchRequestDto as SearchRequestDto, + ); + + expect(result.totalNoticeOfIntents).toBe(0); + + expect( + mockNonApplicationsAdvancedSearchService.searchNonApplications, + ).toBeCalledTimes(1); + expect( + mockNonApplicationsAdvancedSearchService.searchNonApplications, + ).toBeCalledWith(mockSearchRequestDto); + expect(result.nonApplications).toBeDefined(); + expect(result.totalNonApplications).toBe(0); + }); }); diff --git a/services/apps/alcs/src/alcs/search/search.controller.ts b/services/apps/alcs/src/alcs/search/search.controller.ts index b9141722a4..6221021f88 100644 --- a/services/apps/alcs/src/alcs/search/search.controller.ts +++ b/services/apps/alcs/src/alcs/search/search.controller.ts @@ -6,6 +6,7 @@ import * as config from 'config'; import { ROLES_ALLOWED_APPLICATIONS } from '../../common/authorization/roles'; import { RolesGuard } from '../../common/authorization/roles-guard.service'; import { UserRoles } from '../../common/authorization/roles.decorator'; +import { APPLICATION_SUBMISSION_TYPES } from '../../portal/pdf-generation/generate-submission-document.service'; import { Application } from '../application/application.entity'; import { CARD_TYPE } from '../card/card-type/card-type.entity'; import { ApplicationTypeDto } from '../code/application-code/application-type/application-type.dto'; @@ -144,14 +145,43 @@ export class SearchController { @Post('/advanced') @UserRoles(...ROLES_ALLOWED_APPLICATIONS) async advancedSearch(@Body() searchDto: SearchRequestDto) { - const applicationSearchResult = - await this.applicationSearchService.searchApplications(searchDto); + let searchApplications = true; + let searchNoi = true; + let searchNonApplications = true; + + ({ searchApplications, searchNoi, searchNonApplications } = + this.getEntitiesTypeToSearch( + searchDto, + searchApplications, + searchNoi, + searchNonApplications, + )); + + let applicationSearchResult: AdvancedSearchResultDto< + ApplicationSubmissionSearchView[] + > | null = null; + if (searchApplications) { + applicationSearchResult = + await this.applicationSearchService.searchApplications(searchDto); + } - const noticeOfIntentSearchService = - await this.noticeOfIntentSearchService.searchNoticeOfIntents(searchDto); + let noticeOfIntentSearchService: AdvancedSearchResultDto< + NoticeOfIntentSubmissionSearchView[] + > | null = null; + if (searchNoi) { + noticeOfIntentSearchService = + await this.noticeOfIntentSearchService.searchNoticeOfIntents(searchDto); + } - const nonApplications = - await this.nonApplicationsSearchService.searchNonApplications(searchDto); + let nonApplications: AdvancedSearchResultDto< + NonApplicationSearchView[] + > | null = null; + if (searchNonApplications) { + nonApplications = + await this.nonApplicationsSearchService.searchNonApplications( + searchDto, + ); + } const mappedSearchResult = this.mapAdvancedSearchResults( applicationSearchResult, @@ -162,6 +192,32 @@ export class SearchController { return mappedSearchResult; } + private getEntitiesTypeToSearch( + searchDto: SearchRequestDto, + searchApplications: boolean, + searchNoi: boolean, + searchNonApplications: boolean, + ) { + if (searchDto.applicationFileTypes.length > 0) { + searchApplications = + searchDto.applicationFileTypes.filter((searchType) => + Object.values(APPLICATION_SUBMISSION_TYPES).includes( + APPLICATION_SUBMISSION_TYPES[ + searchType as keyof typeof APPLICATION_SUBMISSION_TYPES + ], + ), + ).length > 0; + + searchNoi = searchDto.applicationFileTypes.includes('NOI'); + + searchNonApplications = + searchDto.applicationFileTypes.filter((searchType) => + ['COV', 'PLAN', 'SRW'].includes(searchType), + ).length > 0; + } + return { searchApplications, searchNoi, searchNonApplications }; + } + @Post('/advanced/application') @UserRoles(...ROLES_ALLOWED_APPLICATIONS) async advancedSearchApplications( diff --git a/services/apps/alcs/src/portal/pdf-generation/generate-submission-document.service.ts b/services/apps/alcs/src/portal/pdf-generation/generate-submission-document.service.ts index 6d087bfb97..9a1cc5e55a 100644 --- a/services/apps/alcs/src/portal/pdf-generation/generate-submission-document.service.ts +++ b/services/apps/alcs/src/portal/pdf-generation/generate-submission-document.service.ts @@ -31,7 +31,13 @@ import { ApplicationSubmissionService } from '../application-submission/applicat export enum APPLICATION_SUBMISSION_TYPES { NFUP = 'NFUP', TURP = 'TURP', + POFO = 'POFO', + ROSO = 'ROSO', + PFRS = 'PFRS', + NARU = 'NARU', SUBD = 'SUBD', + INCL = 'INCL', + EXCL = 'EXCL', } class PdfTemplate { From b1a227cfb3c125920b732fefde24d520a8e5072e Mon Sep 17 00:00:00 2001 From: Liam Stoddard Date: Wed, 6 Sep 2023 10:57:44 -0700 Subject: [PATCH 346/954] ready for MR --- bin/migrate-oats-data/submissions/app_submissions.py | 6 ++++-- .../migrations/1693945647800-rename_nfu_placement.ts | 8 +------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/bin/migrate-oats-data/submissions/app_submissions.py b/bin/migrate-oats-data/submissions/app_submissions.py index 8cbb51ba06..d6f315908b 100644 --- a/bin/migrate-oats-data/submissions/app_submissions.py +++ b/bin/migrate-oats-data/submissions/app_submissions.py @@ -237,7 +237,8 @@ def get_insert_query_for_nfu(): nfu_project_duration_amount, nfu_fill_type_description, nfu_fill_origin_description, - nfu_project_duration_unit + nfu_project_duration_unit, + nfu_total_fill_area """ unique_values = """, %(alr_area)s, %(import_fill)s, @@ -246,7 +247,8 @@ def get_insert_query_for_nfu(): %(fill_duration)s, %(fill_type)s, %(fill_origin)s, - %(fill_duration_unit)s + %(fill_duration_unit)s, + %(fill_area)s """ return get_insert_query(unique_fields,unique_values) diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1693945647800-rename_nfu_placement.ts b/services/apps/alcs/src/providers/typeorm/migrations/1693945647800-rename_nfu_placement.ts index 4da33dd170..c21373ab93 100644 --- a/services/apps/alcs/src/providers/typeorm/migrations/1693945647800-rename_nfu_placement.ts +++ b/services/apps/alcs/src/providers/typeorm/migrations/1693945647800-rename_nfu_placement.ts @@ -4,13 +4,7 @@ export class renameNfuPlacement1693945647800 implements MigrationInterface { public async up(queryRunner: QueryRunner): Promise { await queryRunner.query( - `ALTER TABLE "alcs"."application_submission" ADD "nfu_total_fill_area" numeric(12,2)`, - ); - await queryRunner.query( - `UPDATE "alcs"."application_submission" SET "nfu_total_fill_area" = "nfu_total_fill_placement"`, - ); - await queryRunner.query( - `ALTER TABLE "alcs"."application_submission" DROP COLUMN "nfu_total_fill_placement"`, + `ALTER TABLE "alcs"."application_submission" RENAME COLUMN "nfu_total_fill_placement" TO "nfu_total_fill_area"`, ); await queryRunner.query( `COMMENT ON COLUMN "alcs"."application_submission"."nfu_total_fill_area" IS 'Area for nfu placement of fill'`, From 0b997cad6f6b31dbff2ee9aa541c9113aafabbb6 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Wed, 6 Sep 2023 11:45:08 -0700 Subject: [PATCH 347/954] Add Primary Contact and L/FNG Selection for Notifications * Also fix small bug with Parcels using the wrong service --- .../edit-submission.component.html | 20 ++- .../edit-submission.component.ts | 27 +++- .../edit-submission/edit-submission.module.ts | 4 + .../delete-parcel-dialog.component.spec.ts | 10 +- .../delete-parcel-dialog.component.ts | 6 +- .../primary-contact.component.html | 112 ++++++++++++++ .../primary-contact.component.scss | 26 ++++ .../primary-contact.component.spec.ts | 52 +++++++ .../primary-contact.component.ts | 87 +++++++++++ .../select-government.component.html | 67 ++++++++ .../select-government.component.scss | 0 .../select-government.component.spec.ts | 43 ++++++ .../select-government.component.ts | 144 ++++++++++++++++++ .../notification-submission.dto.ts | 13 +- .../notification-parcel.controller.spec.ts | 6 +- .../notification-parcel.controller.ts | 7 +- .../notification-parcel.service.spec.ts | 18 +-- .../notification-parcel.service.ts | 16 +- .../notification-submission.dto.ts | 36 +++++ .../notification-submission.entity.ts | 40 +++++ .../notification-submission.service.ts | 21 +++ ...4021090-add_notification_contact_fields.ts | 58 +++++++ 22 files changed, 759 insertions(+), 54 deletions(-) create mode 100644 portal-frontend/src/app/features/notifications/edit-submission/primary-contact/primary-contact.component.html create mode 100644 portal-frontend/src/app/features/notifications/edit-submission/primary-contact/primary-contact.component.scss create mode 100644 portal-frontend/src/app/features/notifications/edit-submission/primary-contact/primary-contact.component.spec.ts create mode 100644 portal-frontend/src/app/features/notifications/edit-submission/primary-contact/primary-contact.component.ts create mode 100644 portal-frontend/src/app/features/notifications/edit-submission/select-government/select-government.component.html create mode 100644 portal-frontend/src/app/features/notifications/edit-submission/select-government/select-government.component.scss create mode 100644 portal-frontend/src/app/features/notifications/edit-submission/select-government/select-government.component.spec.ts create mode 100644 portal-frontend/src/app/features/notifications/edit-submission/select-government/select-government.component.ts create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1694024021090-add_notification_contact_fields.ts diff --git a/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.component.html b/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.component.html index 32d6dae0f4..b906c29f4c 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.component.html +++ b/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.component.html @@ -49,11 +49,27 @@
-
+
+ + +
-
+
+ + +
diff --git a/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.component.ts b/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.component.ts index bd702397f0..2d718d73e8 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.component.ts +++ b/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.component.ts @@ -4,13 +4,18 @@ import { MatDialog } from '@angular/material/dialog'; import { ActivatedRoute, Router } from '@angular/router'; import { BehaviorSubject, combineLatest, Observable, of, Subject, takeUntil } from 'rxjs'; import { NoticeOfIntentDocumentDto } from '../../../services/notice-of-intent-document/notice-of-intent-document.dto'; -import { NotificationSubmissionDetailedDto } from '../../../services/notification-submission/notification-submission.dto'; +import { + NOTIFICATION_STATUS, + NotificationSubmissionDetailedDto, +} from '../../../services/notification-submission/notification-submission.dto'; import { NotificationSubmissionService } from '../../../services/notification-submission/notification-submission.service'; import { ToastService } from '../../../services/toast/toast.service'; import { CustomStepperComponent } from '../../../shared/custom-stepper/custom-stepper.component'; import { OverlaySpinnerService } from '../../../shared/overlay-spinner/overlay-spinner.service'; import { scrollToElement } from '../../../shared/utils/scroll-helper'; import { ParcelDetailsComponent } from './parcels/parcel-details.component'; +import { PrimaryContactComponent } from './primary-contact/primary-contact.component'; +import { SelectGovernmentComponent } from './select-government/select-government.component'; export enum EditNotificationSteps { Parcel = 0, @@ -41,6 +46,8 @@ export class EditSubmissionComponent implements OnDestroy, AfterViewInit { @ViewChild('cdkStepper') public customStepper!: CustomStepperComponent; @ViewChild(ParcelDetailsComponent) parcelDetailsComponent!: ParcelDetailsComponent; + @ViewChild(PrimaryContactComponent) primaryContactComponent!: PrimaryContactComponent; + @ViewChild(SelectGovernmentComponent) selectGovernmentComponent!: SelectGovernmentComponent; constructor( private notificationSubmissionService: NotificationSubmissionService, @@ -129,8 +136,18 @@ export class EditSubmissionComponent implements OnDestroy, AfterViewInit { } break; case EditNotificationSteps.Transferees: + //DO NOTHING + break; case EditNotificationSteps.PrimaryContact: + if (this.primaryContactComponent) { + await this.primaryContactComponent.onSave(); + } + break; case EditNotificationSteps.Government: + if (this.selectGovernmentComponent) { + await this.selectGovernmentComponent.onSave(); + } + break; case EditNotificationSteps.Proposal: case EditNotificationSteps.Attachments: case EditNotificationSteps.ReviewAndSubmit: @@ -171,10 +188,10 @@ export class EditSubmissionComponent implements OnDestroy, AfterViewInit { this.notificationSubmission = await this.notificationSubmissionService.getByFileId(fileId); this.fileId = fileId; - // if (this.notificationSubmission?.status.code !== NOI_SUBMISSION_STATUS.IN_PROGRESS) { - // this.toastService.showErrorToast('Unable to edit Notice of Intent'); - // await this.router.navigateByUrl(`/home`); - // } + if (this.notificationSubmission?.status.code !== NOTIFICATION_STATUS.IN_PROGRESS) { + this.toastService.showErrorToast('Unable to edit Notification'); + await this.router.navigateByUrl(`/home`); + } const documents: NoticeOfIntentDocumentDto[] = []; //TODO await this.noticeOfIntentDocumentService.getByFileId(fileId); if (documents) { diff --git a/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.module.ts b/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.module.ts index 9653d0b94b..6124c74f91 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.module.ts +++ b/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.module.ts @@ -12,6 +12,8 @@ import { DeleteParcelDialogComponent } from './parcels/delete-parcel/delete-parc import { ParcelDetailsComponent } from './parcels/parcel-details.component'; import { ParcelEntryConfirmationDialogComponent } from './parcels/parcel-entry/parcel-entry-confirmation-dialog/parcel-entry-confirmation-dialog.component'; import { ParcelEntryComponent } from './parcels/parcel-entry/parcel-entry.component'; +import { PrimaryContactComponent } from './primary-contact/primary-contact.component'; +import { SelectGovernmentComponent } from './select-government/select-government.component'; import { StepComponent } from './step.partial'; import { TransfereeDialogComponent } from './transferees/transferee-dialog/transferee-dialog.component'; import { TransfereesComponent } from './transferees/transferees.component'; @@ -38,6 +40,8 @@ const routes: Routes = [ DeleteParcelDialogComponent, TransfereesComponent, TransfereeDialogComponent, + PrimaryContactComponent, + SelectGovernmentComponent, ], imports: [ CommonModule, diff --git a/portal-frontend/src/app/features/notifications/edit-submission/parcels/delete-parcel/delete-parcel-dialog.component.spec.ts b/portal-frontend/src/app/features/notifications/edit-submission/parcels/delete-parcel/delete-parcel-dialog.component.spec.ts index 59d4818b54..adb0afffb3 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/parcels/delete-parcel/delete-parcel-dialog.component.spec.ts +++ b/portal-frontend/src/app/features/notifications/edit-submission/parcels/delete-parcel/delete-parcel-dialog.component.spec.ts @@ -3,18 +3,18 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { createMock, DeepMocked } from '@golevelup/ts-jest'; -import { NoticeOfIntentParcelService } from '../../../../../services/notice-of-intent-parcel/notice-of-intent-parcel.service'; +import { NotificationParcelService } from '../../../../../services/notification-parcel/notification-parcel.service'; import { DeleteParcelDialogComponent } from './delete-parcel-dialog.component'; describe('DeleteParcelDialogComponent', () => { let component: DeleteParcelDialogComponent; let fixture: ComponentFixture; let mockHttpClient: DeepMocked; - let mockNoiParcelService: DeepMocked; + let mockNotificationParcelService: DeepMocked; beforeEach(async () => { mockHttpClient = createMock(); - mockNoiParcelService = createMock(); + mockNotificationParcelService = createMock(); await TestBed.configureTestingModule({ declarations: [DeleteParcelDialogComponent], @@ -24,8 +24,8 @@ describe('DeleteParcelDialogComponent', () => { useValue: mockHttpClient, }, { - provide: NoticeOfIntentParcelService, - useValue: mockNoiParcelService, + provide: NotificationParcelService, + useValue: mockNotificationParcelService, }, { provide: MatDialogRef, diff --git a/portal-frontend/src/app/features/notifications/edit-submission/parcels/delete-parcel/delete-parcel-dialog.component.ts b/portal-frontend/src/app/features/notifications/edit-submission/parcels/delete-parcel/delete-parcel-dialog.component.ts index 7445939f2f..684354f6ad 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/parcels/delete-parcel/delete-parcel-dialog.component.ts +++ b/portal-frontend/src/app/features/notifications/edit-submission/parcels/delete-parcel/delete-parcel-dialog.component.ts @@ -1,6 +1,6 @@ import { Component, Inject } from '@angular/core'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; -import { NoticeOfIntentParcelService } from '../../../../../services/notice-of-intent-parcel/notice-of-intent-parcel.service'; +import { NotificationParcelService } from '../../../../../services/notification-parcel/notification-parcel.service'; export enum NotificationParcelDeleteStepsEnum { warning = 0, @@ -22,7 +22,7 @@ export class DeleteParcelDialogComponent { confirmationStep = NotificationParcelDeleteStepsEnum.confirmation; constructor( - private noticeOfIntentParcelService: NoticeOfIntentParcelService, + private notificationParcelService: NotificationParcelService, private dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) public data: DeleteParcelDialogComponent ) { @@ -43,7 +43,7 @@ export class DeleteParcelDialogComponent { } async onDelete() { - const result = await this.noticeOfIntentParcelService.deleteMany([this.parcelUuid]); + const result = await this.notificationParcelService.deleteMany([this.parcelUuid]); if (result) { this.onCancel(true); diff --git a/portal-frontend/src/app/features/notifications/edit-submission/primary-contact/primary-contact.component.html b/portal-frontend/src/app/features/notifications/edit-submission/primary-contact/primary-contact.component.html new file mode 100644 index 0000000000..c91737b379 --- /dev/null +++ b/portal-frontend/src/app/features/notifications/edit-submission/primary-contact/primary-contact.component.html @@ -0,0 +1,112 @@ +
+

Primary Contact

+

+ Enter the contact information for the person who is submitting the SRW package to the Land Title Survey Authority. +

+

*All fields are required unless stated optional.

+
+
+
+

Primary Contact Information

+
+
+
+ + + + +
+ warning +
This field is required
+
+
+
+ + + + +
+ warning +
This field is required
+
+
+
+ + + + +
+ warning +
This field is required
+
+
+
+ + + + +
+ warning +
This field is required
+
Invalid format
+
+
+
+ + + + +
+ warning +
This field is required
+
Invalid format
+
+
+
+ + + + +
+ warning +
This field is required
+
Invalid format
+
Emails do not match
+
+
+
+
+ + The ALC's automatically generated notification response, needed to complete the LTSA SRW package, will be sent to + the Primary Contact email address provided above. + +
+
+
+ +
+ + +
+
diff --git a/portal-frontend/src/app/features/notifications/edit-submission/primary-contact/primary-contact.component.scss b/portal-frontend/src/app/features/notifications/edit-submission/primary-contact/primary-contact.component.scss new file mode 100644 index 0000000000..37f0ad1476 --- /dev/null +++ b/portal-frontend/src/app/features/notifications/edit-submission/primary-contact/primary-contact.component.scss @@ -0,0 +1,26 @@ +@use '../../../../../styles/functions' as *; +@use '../../../../../styles/colors'; + +section { + margin-bottom: rem(32); +} + +.form { + .form-row { + grid-template-columns: 1fr; + } + + .form-row .full-row { + grid-column: 1/2; + } + + @media screen and (min-width: $tabletBreakpoint) { + .form-row { + grid-template-columns: 1fr 1fr; + } + + .form-row .full-row { + grid-column: 1/3; + } + } +} diff --git a/portal-frontend/src/app/features/notifications/edit-submission/primary-contact/primary-contact.component.spec.ts b/portal-frontend/src/app/features/notifications/edit-submission/primary-contact/primary-contact.component.spec.ts new file mode 100644 index 0000000000..011af9e170 --- /dev/null +++ b/portal-frontend/src/app/features/notifications/edit-submission/primary-contact/primary-contact.component.spec.ts @@ -0,0 +1,52 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { MatDialog } from '@angular/material/dialog'; +import { DeepMocked, createMock } from '@golevelup/ts-jest'; +import { BehaviorSubject } from 'rxjs'; +import { ApplicationDocumentDto } from '../../../../services/application-document/application-document.dto'; +import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; +import { ApplicationOwnerService } from '../../../../services/application-owner/application-owner.service'; +import { ApplicationSubmissionDetailedDto } from '../../../../services/application-submission/application-submission.dto'; +import { ApplicationSubmissionService } from '../../../../services/application-submission/application-submission.service'; +import { UserDto } from '../../../../services/authentication/authentication.dto'; +import { AuthenticationService } from '../../../../services/authentication/authentication.service'; +import { NotificationSubmissionDetailedDto } from '../../../../services/notification-submission/notification-submission.dto'; +import { NotificationSubmissionService } from '../../../../services/notification-submission/notification-submission.service'; + +import { PrimaryContactComponent } from './primary-contact.component'; + +describe('PrimaryContactComponent', () => { + let component: PrimaryContactComponent; + let fixture: ComponentFixture; + let mockNotificationSubmissionService: DeepMocked; + + let applicationDocumentPipe = new BehaviorSubject([]); + + beforeEach(async () => { + mockNotificationSubmissionService = createMock(); + + await TestBed.configureTestingModule({ + providers: [ + { + provide: NotificationSubmissionService, + useValue: mockNotificationSubmissionService, + }, + { + provide: MatDialog, + useValue: {}, + }, + ], + declarations: [PrimaryContactComponent], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(PrimaryContactComponent); + component = fixture.componentInstance; + component.$notificationSubmission = new BehaviorSubject(undefined); + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/notifications/edit-submission/primary-contact/primary-contact.component.ts b/portal-frontend/src/app/features/notifications/edit-submission/primary-contact/primary-contact.component.ts new file mode 100644 index 0000000000..751d7250de --- /dev/null +++ b/portal-frontend/src/app/features/notifications/edit-submission/primary-contact/primary-contact.component.ts @@ -0,0 +1,87 @@ +import { Component, OnDestroy, OnInit } from '@angular/core'; +import { FormControl, FormGroup, Validators } from '@angular/forms'; +import { takeUntil } from 'rxjs'; +import { NotificationSubmissionService } from '../../../../services/notification-submission/notification-submission.service'; +import { EditNotificationSteps } from '../edit-submission.component'; +import { StepComponent } from '../step.partial'; + +@Component({ + selector: 'app-primary-contact', + templateUrl: './primary-contact.component.html', + styleUrls: ['./primary-contact.component.scss'], +}) +export class PrimaryContactComponent extends StepComponent implements OnInit, OnDestroy { + currentStep = EditNotificationSteps.PrimaryContact; + + firstName = new FormControl('', [Validators.required]); + lastName = new FormControl('', [Validators.required]); + organizationName = new FormControl(''); + phoneNumber = new FormControl('', [Validators.required]); + email = new FormControl('', [Validators.required, Validators.email]); + confirmEmail = new FormControl('', [Validators.required, Validators.email]); + + form = new FormGroup({ + firstName: this.firstName, + lastName: this.lastName, + organizationName: this.organizationName, + phoneNumber: this.phoneNumber, + email: this.email, + confirmEmail: this.confirmEmail, + }); + + private submissionUuid = ''; + + constructor(private notificationSubmissionService: NotificationSubmissionService) { + super(); + } + + ngOnInit(): void { + this.$notificationSubmission.pipe(takeUntil(this.$destroy)).subscribe((submission) => { + if (submission) { + this.submissionUuid = submission.uuid; + + this.form.patchValue({ + firstName: submission.contactFirstName, + lastName: submission.contactLastName, + organizationName: submission.contactOrganization, + phoneNumber: submission.contactPhone, + email: submission.contactEmail, + confirmEmail: submission.contactEmail, + }); + } + }); + } + + async onSave() { + await this.save(); + } + + protected async save() { + if (this.form.dirty) { + const confirmEmail = this.confirmEmail.value; + const email = this.email.value; + + const updated = await this.notificationSubmissionService.updatePending(this.submissionUuid, { + contactFirstName: this.firstName.value, + contactLastName: this.lastName.value, + contactOrganization: this.organizationName.value, + contactPhone: this.phoneNumber.value, + contactEmail: confirmEmail === email ? email : null, + }); + this.$notificationSubmission.next(updated); + } + } + + onChangeConfirmationEmail() { + const confirmEmail = this.confirmEmail.value; + const email = this.email.value; + + if (confirmEmail !== email) { + this.confirmEmail.setErrors({ + notMatch: 'true', + }); + } else { + this.confirmEmail.updateValueAndValidity(); + } + } +} diff --git a/portal-frontend/src/app/features/notifications/edit-submission/select-government/select-government.component.html b/portal-frontend/src/app/features/notifications/edit-submission/select-government/select-government.component.html new file mode 100644 index 0000000000..f0d962adb0 --- /dev/null +++ b/portal-frontend/src/app/features/notifications/edit-submission/select-government/select-government.component.html @@ -0,0 +1,67 @@ +
+

Government

+

+ Please indicate the local government in which the parcel(s) under Notification of SRW is located. If the property is + located within the Islands Trust, please select 'Islands Trust' and not a specific island. +

+

*All fields are required unless stated optional.

+
+
+
+
+ + + + + + {{ option.name }} + + + +
+ warning +
This field is required
+
+
+
+
+ + This Local/First Nation Government has not yet been set up with the ALC Portal to receive applications. To submit, you + will need to contact the ALC directly:  ALC.Portal@gov.bc.ca / 236-468-3342 + + + 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 application is + submitted. + +

+ Please Note: If your Local or First Nation Government is not listed, please contact the ALC directly. + ALC.Portal@gov.bc.ca / 236-468-3342 +

+
+ +
+ + +
+
diff --git a/portal-frontend/src/app/features/notifications/edit-submission/select-government/select-government.component.scss b/portal-frontend/src/app/features/notifications/edit-submission/select-government/select-government.component.scss new file mode 100644 index 0000000000..e69de29bb2 diff --git a/portal-frontend/src/app/features/notifications/edit-submission/select-government/select-government.component.spec.ts b/portal-frontend/src/app/features/notifications/edit-submission/select-government/select-government.component.spec.ts new file mode 100644 index 0000000000..29b4e16495 --- /dev/null +++ b/portal-frontend/src/app/features/notifications/edit-submission/select-government/select-government.component.spec.ts @@ -0,0 +1,43 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { MatAutocomplete } from '@angular/material/autocomplete'; +import { DeepMocked, createMock } from '@golevelup/ts-jest'; +import { BehaviorSubject } from 'rxjs'; +import { CodeService } from '../../../../services/code/code.service'; +import { NotificationSubmissionDetailedDto } from '../../../../services/notification-submission/notification-submission.dto'; +import { NotificationSubmissionService } from '../../../../services/notification-submission/notification-submission.service'; + +import { SelectGovernmentComponent } from './select-government.component'; + +describe('SelectGovernmentComponent', () => { + let component: SelectGovernmentComponent; + let fixture: ComponentFixture; + let mockCodeService: DeepMocked; + let mockNotificationSubmissionService: DeepMocked; + + beforeEach(async () => { + mockCodeService = createMock(); + mockNotificationSubmissionService = createMock(); + + await TestBed.configureTestingModule({ + declarations: [SelectGovernmentComponent, MatAutocomplete], + providers: [ + { + provide: CodeService, + useValue: mockCodeService, + }, + { provide: NotificationSubmissionService, useValue: mockNotificationSubmissionService }, + ], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(SelectGovernmentComponent); + component = fixture.componentInstance; + component.$notificationSubmission = new BehaviorSubject(undefined); + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/notifications/edit-submission/select-government/select-government.component.ts b/portal-frontend/src/app/features/notifications/edit-submission/select-government/select-government.component.ts new file mode 100644 index 0000000000..57e9d676e9 --- /dev/null +++ b/portal-frontend/src/app/features/notifications/edit-submission/select-government/select-government.component.ts @@ -0,0 +1,144 @@ +import { Component, OnDestroy, OnInit } from '@angular/core'; +import { FormControl, FormGroup, Validators } from '@angular/forms'; +import { MatAutocompleteSelectedEvent } from '@angular/material/autocomplete'; +import { map, Observable, startWith, takeUntil } from 'rxjs'; +import { LocalGovernmentDto } from '../../../../services/code/code.dto'; +import { CodeService } from '../../../../services/code/code.service'; +import { NotificationSubmissionService } from '../../../../services/notification-submission/notification-submission.service'; +import { EditNotificationSteps } from '../edit-submission.component'; +import { StepComponent } from '../step.partial'; + +@Component({ + selector: 'app-select-government', + templateUrl: './select-government.component.html', + styleUrls: ['./select-government.component.scss'], +}) +export class SelectGovernmentComponent extends StepComponent implements OnInit, OnDestroy { + currentStep = EditNotificationSteps.Government; + + private fileId = ''; + private submissionUuid = ''; + + localGovernment = new FormControl('', [Validators.required]); + showWarning = false; + selectedOwnGovernment = false; + selectGovernmentUuid = ''; + localGovernments: LocalGovernmentDto[] = []; + filteredLocalGovernments!: Observable; + isDirty = false; + + form = new FormGroup({ + localGovernment: this.localGovernment, + }); + + constructor(private codeService: CodeService, private notificationSubmissionService: NotificationSubmissionService) { + super(); + } + + ngOnInit(): void { + this.loadGovernments(); + + this.$notificationSubmission.pipe(takeUntil(this.$destroy)).subscribe((submission) => { + if (submission) { + this.selectGovernmentUuid = submission.localGovernmentUuid; + this.fileId = submission.fileNumber; + this.submissionUuid = submission.uuid; + this.populateLocalGovernment(submission.localGovernmentUuid); + } + }); + + this.filteredLocalGovernments = this.localGovernment.valueChanges.pipe( + startWith(''), + map((value) => this.filter(value || '')) + ); + + if (this.showErrors) { + this.form.markAllAsTouched(); + } + } + + onChange($event: MatAutocompleteSelectedEvent) { + this.isDirty = true; + const localGovernmentName = $event.option.value; + if (localGovernmentName) { + const localGovernment = this.localGovernments.find((lg) => lg.name == localGovernmentName); + if (localGovernment) { + this.showWarning = !localGovernment.hasGuid; + + this.localGovernment.setValue(localGovernment.name); + if (localGovernment.hasGuid) { + this.localGovernment.setErrors(null); + } else { + this.localGovernment.setErrors({ invalid: localGovernment.hasGuid }); + } + + this.selectedOwnGovernment = localGovernment.matchesUserGuid; + } + } + } + + onBlur() { + //Blur will fire before onChange above, so use setTimeout to delay it + setTimeout(() => { + const localGovernmentName = this.localGovernment.getRawValue(); + if (localGovernmentName) { + const localGovernment = this.localGovernments.find((lg) => lg.name == localGovernmentName); + if (!localGovernment) { + this.localGovernment.setValue(null); + console.log('Clearing Local Government field'); + } + } + }, 500); + } + + async onSave() { + await this.save(); + } + + private async save() { + if (this.isDirty) { + const localGovernmentName = this.localGovernment.getRawValue(); + if (localGovernmentName) { + const localGovernment = this.localGovernments.find((lg) => lg.name == localGovernmentName); + + if (localGovernment) { + const res = await this.notificationSubmissionService.updatePending(this.submissionUuid, { + localGovernmentUuid: localGovernment.uuid, + }); + this.$notificationSubmission.next(res); + } + } + this.isDirty = false; + } + } + + private filter(value: string): LocalGovernmentDto[] { + if (this.localGovernments) { + const filterValue = value.toLowerCase(); + return this.localGovernments.filter((localGovernment) => + localGovernment.name.toLowerCase().includes(filterValue) + ); + } + return []; + } + + private async loadGovernments() { + const codes = await this.codeService.loadCodes(); + this.localGovernments = codes.localGovernments.sort((a, b) => (a.name > b.name ? 1 : -1)); + if (this.selectGovernmentUuid) { + this.populateLocalGovernment(this.selectGovernmentUuid); + } + } + + private populateLocalGovernment(governmentUuid: string) { + const lg = this.localGovernments.find((lg) => lg.uuid === governmentUuid); + if (lg) { + this.localGovernment.patchValue(lg.name); + this.showWarning = !lg.hasGuid; + if (!lg.hasGuid) { + this.localGovernment.setErrors({ invalid: true }); + } + this.selectedOwnGovernment = lg.matchesUserGuid; + } + } +} diff --git a/portal-frontend/src/app/services/notification-submission/notification-submission.dto.ts b/portal-frontend/src/app/services/notification-submission/notification-submission.dto.ts index 70dcc62f46..07ed0ad669 100644 --- a/portal-frontend/src/app/services/notification-submission/notification-submission.dto.ts +++ b/portal-frontend/src/app/services/notification-submission/notification-submission.dto.ts @@ -1,5 +1,4 @@ import { BaseCodeDto } from '../../shared/dto/base.dto'; -import { NOI_SUBMISSION_STATUS } from '../notice-of-intent-submission/notice-of-intent-submission.dto'; import { NotificationTransfereeDto } from '../notification-transferee/notification-transferee.dto'; export enum NOTIFICATION_STATUS { @@ -10,7 +9,7 @@ export enum NOTIFICATION_STATUS { } export interface NotificationSubmissionStatusDto extends BaseCodeDto { - code: NOI_SUBMISSION_STATUS; + code: NOTIFICATION_STATUS; portalBackgroundColor: string; portalColor: string; } @@ -36,6 +35,11 @@ export interface NotificationSubmissionDto { owners: NotificationTransfereeDto[]; canEdit: boolean; canView: boolean; + contactFirstName: string | null; + contactLastName: string | null; + contactOrganization: string | null; + contactPhone: string | null; + contactEmail: string | null; } export interface NotificationSubmissionDetailedDto extends NotificationSubmissionDto { @@ -46,4 +50,9 @@ export interface NotificationSubmissionUpdateDto { applicant?: string | null; purpose?: string | null; localGovernmentUuid?: string | null; + contactFirstName?: string | null; + contactLastName?: string | null; + contactOrganization?: string | null; + contactPhone?: string | null; + contactEmail?: string | null; } diff --git a/services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.controller.spec.ts b/services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.controller.spec.ts index 9c336f99aa..5415df50ea 100644 --- a/services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.controller.spec.ts +++ b/services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.controller.spec.ts @@ -146,11 +146,7 @@ describe('NotificationParcelController', () => { const fakeUuid = 'fake_uuid'; mockNotificationParcelService.deleteMany.mockResolvedValue([]); - const result = await controller.delete([fakeUuid], { - user: { - entity: new User(), - }, - }); + const result = await controller.delete([fakeUuid]); expect(mockNotificationParcelService.deleteMany).toBeCalledTimes(1); expect(result).toBeDefined(); diff --git a/services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.controller.ts b/services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.controller.ts index 7174dac2bb..b71ae3cedd 100644 --- a/services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.controller.ts +++ b/services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.controller.ts @@ -81,11 +81,8 @@ export class NotificationParcelController { } @Delete() - async delete(@Body() uuids: string[], @Req() req) { - const deletedParcels = await this.parcelService.deleteMany( - uuids, - req.user.entity, - ); + async delete(@Body() uuids: string[]) { + const deletedParcels = await this.parcelService.deleteMany(uuids); return this.mapper.mapArrayAsync( deletedParcels, NotificationParcel, diff --git a/services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.service.spec.ts b/services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.service.spec.ts index 0a031358a3..4eafffd096 100644 --- a/services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.service.spec.ts +++ b/services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.service.spec.ts @@ -3,8 +3,6 @@ import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; import { In, Repository } from 'typeorm'; -import { User } from '../../../user/user.entity'; -import { NotificationTransfereeService } from '../notification-transferee/notification-transferee.service'; import { NotificationParcelUpdateDto } from './notification-parcel.dto'; import { NotificationParcel } from './notification-parcel.entity'; import { NotificationParcelService } from './notification-parcel.service'; @@ -12,7 +10,6 @@ import { NotificationParcelService } from './notification-parcel.service'; describe('NotificationParcelService', () => { let service: NotificationParcelService; let mockParcelRepo: DeepMocked>; - let mockOwnerService: DeepMocked; const mockFileNumber = 'mock_applicationFileNumber'; const mockUuid = 'mock_uuid'; @@ -29,7 +26,6 @@ describe('NotificationParcelService', () => { beforeEach(async () => { mockParcelRepo = createMock(); - mockOwnerService = createMock(); const module: TestingModule = await Test.createTestingModule({ providers: [ NotificationParcelService, @@ -37,10 +33,6 @@ describe('NotificationParcelService', () => { provide: getRepositoryToken(NotificationParcel), useValue: mockParcelRepo, }, - { - provide: NotificationTransfereeService, - useValue: mockOwnerService, - }, ], }).compile(); @@ -147,9 +139,8 @@ describe('NotificationParcelService', () => { it('should successfully delete a parcel and update applicant', async () => { mockParcelRepo.find.mockResolvedValue([mockNOIParcel]); mockParcelRepo.remove.mockResolvedValue(new NotificationParcel()); - mockOwnerService.updateSubmissionApplicant.mockResolvedValue(); - const result = await service.deleteMany([mockUuid], new User()); + const result = await service.deleteMany([mockUuid]); expect(result).toBeDefined(); expect(mockParcelRepo.find).toBeCalledTimes(1); @@ -158,7 +149,6 @@ describe('NotificationParcelService', () => { }); expect(mockParcelRepo.remove).toBeCalledWith([mockNOIParcel]); expect(mockParcelRepo.remove).toBeCalledTimes(1); - expect(mockOwnerService.updateSubmissionApplicant).toHaveBeenCalledTimes(1); }); it('should not call remove if the parcel does not exist', async () => { @@ -169,9 +159,9 @@ describe('NotificationParcelService', () => { mockParcelRepo.find.mockResolvedValue([]); mockParcelRepo.remove.mockResolvedValue(new NotificationParcel()); - await expect( - service.deleteMany([mockUuid], new User()), - ).rejects.toMatchObject(exception); + await expect(service.deleteMany([mockUuid])).rejects.toMatchObject( + exception, + ); expect(mockParcelRepo.find).toBeCalledTimes(1); expect(mockParcelRepo.find).toBeCalledWith({ where: { uuid: In([mockUuid]) }, diff --git a/services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.service.ts b/services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.service.ts index 28f3dacc19..9dacb9fa06 100644 --- a/services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.service.ts +++ b/services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.service.ts @@ -1,9 +1,7 @@ import { ServiceValidationException } from '@app/common/exceptions/base.exception'; -import { forwardRef, Inject, Injectable } from '@nestjs/common'; +import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { In, Repository } from 'typeorm'; -import { User } from '../../../user/user.entity'; -import { NotificationTransfereeService } from '../notification-transferee/notification-transferee.service'; import { NotificationParcelUpdateDto } from './notification-parcel.dto'; import { NotificationParcel } from './notification-parcel.entity'; @@ -12,8 +10,6 @@ export class NotificationParcelService { constructor( @InjectRepository(NotificationParcel) private parcelRepository: Repository, - @Inject(forwardRef(() => NotificationTransfereeService)) - private noticeOfIntentOwnerService: NotificationTransfereeService, ) {} async fetchByFileId(fileId: string) { @@ -65,7 +61,7 @@ export class NotificationParcelService { return await this.parcelRepository.save(updatedParcels); } - async deleteMany(uuids: string[], user: User) { + async deleteMany(uuids: string[]) { const parcels = await this.parcelRepository.find({ where: { uuid: In(uuids) }, }); @@ -76,12 +72,6 @@ export class NotificationParcelService { ); } - const result = await this.parcelRepository.remove(parcels); - await this.noticeOfIntentOwnerService.updateSubmissionApplicant( - parcels[0].notificationSubmissionUuid, - user, - ); - - return result; + return await this.parcelRepository.remove(parcels); } } diff --git a/services/apps/alcs/src/portal/notification-submission/notification-submission.dto.ts b/services/apps/alcs/src/portal/notification-submission/notification-submission.dto.ts index 634a4b8fa7..6444eb733b 100644 --- a/services/apps/alcs/src/portal/notification-submission/notification-submission.dto.ts +++ b/services/apps/alcs/src/portal/notification-submission/notification-submission.dto.ts @@ -1,5 +1,6 @@ import { AutoMap } from '@automapper/classes'; import { IsOptional, IsString, IsUUID, MaxLength } from 'class-validator'; +import { Column } from 'typeorm'; import { NoticeOfIntentStatusDto } from '../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status.dto'; import { NotificationTransfereeDto } from './notification-transferee/notification-transferee.dto'; @@ -21,6 +22,21 @@ export class NotificationSubmissionDto { @AutoMap() applicant: string; + @AutoMap(() => String) + contactFirstName: string | null; + + @AutoMap(() => String) + contactLastName: string | null; + + @AutoMap(() => String) + contactOrganization: string | null; + + @AutoMap(() => String) + contactPhone: string | null; + + @AutoMap(() => String) + contactEmail: string | null; + @AutoMap() localGovernmentUuid: string; @@ -56,4 +72,24 @@ export class NotificationSubmissionUpdateDto { @IsUUID() @IsOptional() localGovernmentUuid?: string; + + @IsString() + @IsOptional() + contactFirstName?: string | null; + + @IsString() + @IsOptional() + contactLastName?: string | null; + + @IsString() + @IsOptional() + contactOrganization?: string | null; + + @IsString() + @IsOptional() + contactPhone?: string | null; + + @IsString() + @IsOptional() + contactEmail?: string | null; } diff --git a/services/apps/alcs/src/portal/notification-submission/notification-submission.entity.ts b/services/apps/alcs/src/portal/notification-submission/notification-submission.entity.ts index cbfec5a6f2..7f249ea887 100644 --- a/services/apps/alcs/src/portal/notification-submission/notification-submission.entity.ts +++ b/services/apps/alcs/src/portal/notification-submission/notification-submission.entity.ts @@ -69,6 +69,46 @@ export class NotificationSubmission extends Base { }) typeCode: string; + @AutoMap(() => String) + @Column({ + nullable: true, + type: 'varchar', + comment: 'Primary Contacts First Name', + }) + contactFirstName: string | null; + + @AutoMap(() => String) + @Column({ + nullable: true, + type: 'varchar', + comment: 'Primary Contacts Last Name', + }) + contactLastName: string | null; + + @AutoMap(() => String) + @Column({ + nullable: true, + type: 'varchar', + comment: 'Primary Contacts Organization Name', + }) + contactOrganization: string | null; + + @AutoMap(() => String) + @Column({ + nullable: true, + type: 'varchar', + comment: 'Primary Contacts Phone', + }) + contactPhone: string | null; + + @AutoMap(() => String) + @Column({ + nullable: true, + type: 'varchar', + comment: 'Primary Contacts Email', + }) + contactEmail: string | null; + @AutoMap(() => Notification) @ManyToOne(() => Notification) @JoinColumn({ diff --git a/services/apps/alcs/src/portal/notification-submission/notification-submission.service.ts b/services/apps/alcs/src/portal/notification-submission/notification-submission.service.ts index 75e7979baf..afc142adbd 100644 --- a/services/apps/alcs/src/portal/notification-submission/notification-submission.service.ts +++ b/services/apps/alcs/src/portal/notification-submission/notification-submission.service.ts @@ -2,6 +2,7 @@ import { BaseServiceException } from '@app/common/exceptions/base.exception'; import { Mapper } from '@automapper/core'; import { InjectMapper } from '@automapper/nestjs'; import { Injectable, Logger } from '@nestjs/common'; +import { filterMiddleware } from '@nestjs/core/middleware/utils'; import { InjectRepository } from '@nestjs/typeorm'; import { FindOptionsRelations, @@ -96,6 +97,26 @@ export class NotificationSubmissionService { notificationSubmission.purpose, ); notificationSubmission.localGovernmentUuid = updateDto.localGovernmentUuid; + notificationSubmission.contactFirstName = filterUndefined( + updateDto.contactFirstName, + notificationSubmission.contactFirstName, + ); + notificationSubmission.contactLastName = filterUndefined( + updateDto.contactLastName, + notificationSubmission.contactLastName, + ); + notificationSubmission.contactOrganization = filterUndefined( + updateDto.contactOrganization, + notificationSubmission.contactOrganization, + ); + notificationSubmission.contactPhone = filterUndefined( + updateDto.contactPhone, + notificationSubmission.contactPhone, + ); + notificationSubmission.contactEmail = filterUndefined( + updateDto.contactEmail, + notificationSubmission.contactEmail, + ); await this.notificationSubmissionRepository.save(notificationSubmission); diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1694024021090-add_notification_contact_fields.ts b/services/apps/alcs/src/providers/typeorm/migrations/1694024021090-add_notification_contact_fields.ts new file mode 100644 index 0000000000..493c636748 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1694024021090-add_notification_contact_fields.ts @@ -0,0 +1,58 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class addNotificationContactFields1694024021090 + implements MigrationInterface +{ + name = 'addNotificationContactFields1694024021090'; + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `ALTER TABLE "alcs"."notification_submission" ADD "contact_first_name" character varying`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."notification_submission"."contact_first_name" IS 'Primary Contacts First Name'`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notification_submission" ADD "contact_last_name" character varying`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."notification_submission"."contact_last_name" IS 'Primary Contacts Last Name'`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notification_submission" ADD "contact_organization" character varying`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."notification_submission"."contact_organization" IS 'Primary Contacts Organization Name'`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notification_submission" ADD "contact_phone" character varying`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."notification_submission"."contact_phone" IS 'Primary Contacts Phone'`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notification_submission" ADD "contact_email" character varying`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."notification_submission"."contact_email" IS 'Primary Contacts Email'`, + ); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `ALTER TABLE "alcs"."notification_submission" DROP COLUMN "contact_email"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notification_submission" DROP COLUMN "contact_phone"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notification_submission" DROP COLUMN "contact_organization"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notification_submission" DROP COLUMN "contact_last_name"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notification_submission" DROP COLUMN "contact_first_name"`, + ); + } +} From 37af5d5866b9511a82c1e8fdb4d4fac4411ecdf0 Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Wed, 6 Sep 2023 11:55:26 -0700 Subject: [PATCH 348/954] add search rules, ui adjustment (#946) --- .../application-search-table.component.html | 2 +- .../file-type-filter-drop-down.component.html | 2 +- .../file-type-filter-drop-down.component.scss | 8 ++- ...on-application-search-table.component.html | 2 +- ...tice-of-intent-search-table.component.html | 2 +- .../app/features/search/search.component.html | 27 ++++++-- .../app/features/search/search.component.scss | 35 ++++++++--- .../app/features/search/search.component.ts | 34 +++++++---- alcs-frontend/src/styles.scss | 3 + alcs-frontend/src/styles/autocomplete.scss | 3 + .../alcs/src/alcs/search/search.controller.ts | 61 +++++++++++-------- .../apps/alcs/src/utils/string-helper.spec.ts | 24 ++++++++ services/apps/alcs/src/utils/string-helper.ts | 3 + 13 files changed, 151 insertions(+), 55 deletions(-) create mode 100644 alcs-frontend/src/styles/autocomplete.scss create mode 100644 services/apps/alcs/src/utils/string-helper.spec.ts create mode 100644 services/apps/alcs/src/utils/string-helper.ts diff --git a/alcs-frontend/src/app/features/search/application-search-table/application-search-table.component.html b/alcs-frontend/src/app/features/search/application-search-table/application-search-table.component.html index bd7ef5c617..cefaa4aebd 100644 --- a/alcs-frontend/src/app/features/search/application-search-table/application-search-table.component.html +++ b/alcs-frontend/src/app/features/search/application-search-table/application-search-table.component.html @@ -59,7 +59,7 @@ -
No Search results.
+
No applications found.
Please adjust criteria and try again.
diff --git a/alcs-frontend/src/app/features/search/file-type-filter-drop-down/file-type-filter-drop-down.component.html b/alcs-frontend/src/app/features/search/file-type-filter-drop-down/file-type-filter-drop-down.component.html index ae960ea80f..882625db80 100644 --- a/alcs-frontend/src/app/features/search/file-type-filter-drop-down/file-type-filter-drop-down.component.html +++ b/alcs-frontend/src/app/features/search/file-type-filter-drop-down/file-type-filter-drop-down.component.html @@ -8,7 +8,7 @@ [matAutocomplete]="auto" [formControl]="componentTypeControl" /> - + Please select an item from below diff --git a/alcs-frontend/src/app/features/search/file-type-filter-drop-down/file-type-filter-drop-down.component.scss b/alcs-frontend/src/app/features/search/file-type-filter-drop-down/file-type-filter-drop-down.component.scss index 39864d8e44..cd3259d384 100644 --- a/alcs-frontend/src/app/features/search/file-type-filter-drop-down/file-type-filter-drop-down.component.scss +++ b/alcs-frontend/src/app/features/search/file-type-filter-drop-down/file-type-filter-drop-down.component.scss @@ -1,3 +1,7 @@ .file-type-input { - width: 100%; -} \ No newline at end of file + width: 100%; +} + +.tall-autocomplete { + max-height: 600px !important; +} diff --git a/alcs-frontend/src/app/features/search/non-application-search-table/non-application-search-table.component.html b/alcs-frontend/src/app/features/search/non-application-search-table/non-application-search-table.component.html index db05dcf09b..8e702f9959 100644 --- a/alcs-frontend/src/app/features/search/non-application-search-table/non-application-search-table.component.html +++ b/alcs-frontend/src/app/features/search/non-application-search-table/non-application-search-table.component.html @@ -42,7 +42,7 @@ -
No Search results.
+
No non-applications found.
Please adjust criteria and try again.
diff --git a/alcs-frontend/src/app/features/search/notice-of-intent-search-table/notice-of-intent-search-table.component.html b/alcs-frontend/src/app/features/search/notice-of-intent-search-table/notice-of-intent-search-table.component.html index bd7ef5c617..18bb07fbd3 100644 --- a/alcs-frontend/src/app/features/search/notice-of-intent-search-table/notice-of-intent-search-table.component.html +++ b/alcs-frontend/src/app/features/search/notice-of-intent-search-table/notice-of-intent-search-table.component.html @@ -59,7 +59,7 @@ -
No Search results.
+
No notice of intent found.
Please adjust criteria and try again.
diff --git a/alcs-frontend/src/app/features/search/search.component.html b/alcs-frontend/src/app/features/search/search.component.html index 5004e5b341..f4078570f9 100644 --- a/alcs-frontend/src/app/features/search/search.component.html +++ b/alcs-frontend/src/app/features/search/search.component.html @@ -18,24 +18,35 @@
Provide one or more of the following criteria:
Name - +
Search by Primary Contact, Parcel Owner, Organization, Ministry or Department
+
+ warning +
Enter 3 or more characters to search by name
+
- + PID - + + Civic Address
+
+
+ warning +
PID must be 9 digits including leading zeroes
+
+
@@ -223,7 +234,15 @@
Provide one or more of the following criteria:
- +
diff --git a/alcs-frontend/src/app/features/search/search.component.scss b/alcs-frontend/src/app/features/search/search.component.scss index a57495575d..bf1a900ba6 100644 --- a/alcs-frontend/src/app/features/search/search.component.scss +++ b/alcs-frontend/src/app/features/search/search.component.scss @@ -39,14 +39,12 @@ transform: scale(1); } - tr.no-data { - border: none; - background-color: colors.$grey-light; - align-items: center; - justify-content: center; - cursor: auto; - box-shadow: none !important; - height: 32px; + tr.no-data td { + text-align: start; + + > div:first-child { + margin-top: 28px; + } } } @@ -151,4 +149,25 @@ margin-top: 60px; margin-bottom: 60px; } + + .field-error { + color: colors.$error-color; + font-size: 15px; + font-weight: 700; + display: flex; + align-items: center; + margin-top: 4px; + + div { + color: colors.$error-color; + } + } + + .btn-controls .search-btn span { + color: #fff !important; + } + + .mat-mdc-select-placeholder { + color: rgba(0, 0, 0, 0.6); + } } diff --git a/alcs-frontend/src/app/features/search/search.component.ts b/alcs-frontend/src/app/features/search/search.component.ts index 7615895dd5..0d904a694b 100644 --- a/alcs-frontend/src/app/features/search/search.component.ts +++ b/alcs-frontend/src/app/features/search/search.component.ts @@ -63,10 +63,12 @@ export class SearchComponent implements OnInit, OnDestroy { localGovernmentControl = new FormControl(undefined); portalStatusControl = new FormControl(undefined); componentTypeControl = new FormControl(undefined); + pidControl = new FormControl(undefined); + nameControl = new FormControl(undefined); searchForm = new FormGroup({ fileNumber: new FormControl(undefined), - name: new FormControl(undefined), - pid: new FormControl(undefined), + name: this.nameControl, + pid: this.pidControl, civicAddress: new FormControl(undefined), isIncludeOtherParcels: new FormControl(false), resolutionNumber: new FormControl(undefined), @@ -87,6 +89,8 @@ export class SearchComponent implements OnInit, OnDestroy { regions: ApplicationRegionDto[] = []; statuses: ApplicationStatusDto[] = []; + formEmpty = true; + constructor( private searchService: SearchService, private activatedRoute: ActivatedRoute, @@ -123,6 +127,18 @@ export class SearchComponent implements OnInit, OnDestroy { .then((result) => this.mapSearchResults(result)); } }); + + this.searchForm.valueChanges.subscribe(() => { + let isEmpty = true; + for (let key in this.searchForm.controls) { + let value = this.searchForm.controls[key as keyof typeof this.searchForm.controls].value; + if (value && !(Array.isArray(value) && value.length === 0)) { + isEmpty = false; + break; + } + } + this.formEmpty = isEmpty; + }); } private setup() { @@ -148,7 +164,11 @@ export class SearchComponent implements OnInit, OnDestroy { } async onSubmit() { - await this.onSearch(); + const searchParams = this.getSearchParams(); + const result = await this.searchService.advancedSearchFetch(searchParams); + this.mapSearchResults(result); + + this.setActiveTab(); } expandSearchClicked() { @@ -184,14 +204,6 @@ export class SearchComponent implements OnInit, OnDestroy { this.fileTypeFilterDropDownComponent.reset(); } - async onSearch() { - const searchParams = this.getSearchParams(); - const result = await this.searchService.advancedSearchFetch(searchParams); - this.mapSearchResults(result); - - this.setActiveTab(); - } - getSearchParams(): SearchRequestDto { const resolutionNumberString = this.formatStringSearchParam(this.searchForm.controls.resolutionNumber.value); return { diff --git a/alcs-frontend/src/styles.scss b/alcs-frontend/src/styles.scss index a7059bdbbf..1f64919524 100644 --- a/alcs-frontend/src/styles.scss +++ b/alcs-frontend/src/styles.scss @@ -10,6 +10,9 @@ @use 'styles/buttons'; @use 'styles/ngselect'; +// mat-autocomplete +@use 'styles/autocomplete'; + // ng-select @use '@ng-select/ng-select/themes/material.theme.css'; diff --git a/alcs-frontend/src/styles/autocomplete.scss b/alcs-frontend/src/styles/autocomplete.scss new file mode 100644 index 0000000000..e52fc2e876 --- /dev/null +++ b/alcs-frontend/src/styles/autocomplete.scss @@ -0,0 +1,3 @@ +.tall-autocomplete { + max-height: 600px !important; +} diff --git a/services/apps/alcs/src/alcs/search/search.controller.ts b/services/apps/alcs/src/alcs/search/search.controller.ts index 6221021f88..f6af69df8b 100644 --- a/services/apps/alcs/src/alcs/search/search.controller.ts +++ b/services/apps/alcs/src/alcs/search/search.controller.ts @@ -7,6 +7,7 @@ import { ROLES_ALLOWED_APPLICATIONS } from '../../common/authorization/roles'; import { RolesGuard } from '../../common/authorization/roles-guard.service'; import { UserRoles } from '../../common/authorization/roles.decorator'; import { APPLICATION_SUBMISSION_TYPES } from '../../portal/pdf-generation/generate-submission-document.service'; +import { isStringSetAndNotEmpty } from '../../utils/string-helper'; import { Application } from '../application/application.entity'; import { CARD_TYPE } from '../card/card-type/card-type.entity'; import { ApplicationTypeDto } from '../code/application-code/application-type/application-type.dto'; @@ -192,32 +193,6 @@ export class SearchController { return mappedSearchResult; } - private getEntitiesTypeToSearch( - searchDto: SearchRequestDto, - searchApplications: boolean, - searchNoi: boolean, - searchNonApplications: boolean, - ) { - if (searchDto.applicationFileTypes.length > 0) { - searchApplications = - searchDto.applicationFileTypes.filter((searchType) => - Object.values(APPLICATION_SUBMISSION_TYPES).includes( - APPLICATION_SUBMISSION_TYPES[ - searchType as keyof typeof APPLICATION_SUBMISSION_TYPES - ], - ), - ).length > 0; - - searchNoi = searchDto.applicationFileTypes.includes('NOI'); - - searchNonApplications = - searchDto.applicationFileTypes.filter((searchType) => - ['COV', 'PLAN', 'SRW'].includes(searchType), - ).length > 0; - } - return { searchApplications, searchNoi, searchNonApplications }; - } - @Post('/advanced/application') @UserRoles(...ROLES_ALLOWED_APPLICATIONS) async advancedSearchApplications( @@ -279,6 +254,40 @@ export class SearchController { }; } + private getEntitiesTypeToSearch( + searchDto: SearchRequestDto, + searchApplications: boolean, + searchNoi: boolean, + searchNonApplications: boolean, + ) { + if (searchDto.applicationFileTypes.length > 0) { + searchApplications = + searchDto.applicationFileTypes.filter((searchType) => + Object.values(APPLICATION_SUBMISSION_TYPES).includes( + APPLICATION_SUBMISSION_TYPES[ + searchType as keyof typeof APPLICATION_SUBMISSION_TYPES + ], + ), + ).length > 0; + + searchNoi = searchDto.applicationFileTypes.includes('NOI'); + + searchNonApplications = + searchDto.applicationFileTypes.filter((searchType) => + ['COV', 'PLAN', 'SRW'].includes(searchType), + ).length > 0; + } + + searchNonApplications = + searchNonApplications || + isStringSetAndNotEmpty(searchDto.fileNumber) || + isStringSetAndNotEmpty(searchDto.governmentName) || + isStringSetAndNotEmpty(searchDto.regionCode) || + isStringSetAndNotEmpty(searchDto.name); + + return { searchApplications, searchNoi, searchNonApplications }; + } + private mapAdvancedSearchResults( applications: AdvancedSearchResultDto< ApplicationSubmissionSearchView[] diff --git a/services/apps/alcs/src/utils/string-helper.spec.ts b/services/apps/alcs/src/utils/string-helper.spec.ts new file mode 100644 index 0000000000..1585bd17df --- /dev/null +++ b/services/apps/alcs/src/utils/string-helper.spec.ts @@ -0,0 +1,24 @@ +import { expect, test } from '@jest/globals'; +import { isStringSetAndNotEmpty } from './string-helper'; + +describe('isStringSetAndNotEmpty', () => { + test('should return false if value is undefined', () => { + expect(isStringSetAndNotEmpty(undefined)).toBeFalsy(); + }); + + test('should return false if value is null', () => { + expect(isStringSetAndNotEmpty(null)).toBeFalsy(); + }); + + test('should return false if value is empty string', () => { + expect(isStringSetAndNotEmpty('')).toBeFalsy(); + }); + + test('should return false if value is string of all spaces', () => { + expect(isStringSetAndNotEmpty(' ')).toBeFalsy(); + }); + + test('should return true if value is non-empty string', () => { + expect(isStringSetAndNotEmpty('Hello')).toBeTruthy(); + }); +}); diff --git a/services/apps/alcs/src/utils/string-helper.ts b/services/apps/alcs/src/utils/string-helper.ts new file mode 100644 index 0000000000..46a8555afb --- /dev/null +++ b/services/apps/alcs/src/utils/string-helper.ts @@ -0,0 +1,3 @@ +export const isStringSetAndNotEmpty = (value: string | undefined | null) => { + return value !== undefined && value !== null && value.trim() !== ''; +}; From b6e43b36e0aa0c40e5b567ba663d17dca1ee22cf Mon Sep 17 00:00:00 2001 From: Liam Stoddard Date: Wed, 6 Sep 2023 13:25:56 -0700 Subject: [PATCH 349/954] removed unused code & added comments --- bin/migrate-oats-data/submissions/app_submissions.py | 6 +++++- bin/migrate-oats-data/submissions/submap/soil_elements.py | 2 -- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/bin/migrate-oats-data/submissions/app_submissions.py b/bin/migrate-oats-data/submissions/app_submissions.py index d6f315908b..585206a424 100644 --- a/bin/migrate-oats-data/submissions/app_submissions.py +++ b/bin/migrate-oats-data/submissions/app_submissions.py @@ -110,6 +110,7 @@ def insert_app_sub_records(conn, batch_size, cursor, rows, direction_data, subdi rows (list): Rows of data to insert in the database. direction_data (dict): Dictionary of adjacent parcel data subdiv_data: dictionary of subdivision data lists + soil_data: dictonary of soil element data. Returns: None: Commits the changes to the database. @@ -152,13 +153,16 @@ def prepare_app_sub_data(app_sub_raw_data_list, direction_data, subdiv_data, soi :param app_sub_raw_data_list: A list of raw data dictionaries. :param direction_data: A dictionary of adjacent parcel data. - :param subdiv_data: dictionary of subdivision data lists + :param subdiv_data: dictionary of subdivision data lists. + :param soil_data: dictonary of soil element data. :return: Five lists, each containing dictionaries from 'app_sub_raw_data_list' and 'direction_data' grouped based on the 'alr_change_code' field Detailed Workflow: - Initializes empty lists - Iterates over 'app_sub_raw_data_list' - Maps adjacent parcel data based on alr_application_id + - Maps subdivision data on appl_component_id + _ Maps soil data based on appl_component_id - Maps the basic fields of the data dictionary based on the alr_change_code - Returns the mapped lists """ diff --git a/bin/migrate-oats-data/submissions/submap/soil_elements.py b/bin/migrate-oats-data/submissions/submap/soil_elements.py index 055aaed3b4..0e7ed81ae8 100644 --- a/bin/migrate-oats-data/submissions/submap/soil_elements.py +++ b/bin/migrate-oats-data/submissions/submap/soil_elements.py @@ -27,7 +27,6 @@ def create_soil_dict(soil_rows): if app_component_id in soil_dict: if row[code] == 'REMOVE': - # if soil_dict[app_component_id]['RMV'] == True: if 'RMV' in soil_dict.get(app_component_id, {}): print('ignored element_id:',row['soil_change_element_id']) else: @@ -44,7 +43,6 @@ def create_soil_dict(soil_rows): elif row[code] == 'ADD': - # if soil_dict[app_component_id]['ADD'] == True: if 'ADD' in soil_dict.get(app_component_id, {}): print('ignored element_id:',row['soil_change_element_id']) else: From f65d4c905596a67f59f3cc787b7b114c04b37f34 Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Wed, 6 Sep 2023 14:49:37 -0700 Subject: [PATCH 350/954] open search result in new tab (#948) * open search result in new tab --- .../application-search-table.component.ts | 4 +++- .../non-application-search-table.component.ts | 17 +++++++++++++---- .../notice-of-intent-search-table.component.ts | 4 +++- 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/alcs-frontend/src/app/features/search/application-search-table/application-search-table.component.ts b/alcs-frontend/src/app/features/search/application-search-table/application-search-table.component.ts index 25f980db36..d02dbe34ab 100644 --- a/alcs-frontend/src/app/features/search/application-search-table/application-search-table.component.ts +++ b/alcs-frontend/src/app/features/search/application-search-table/application-search-table.component.ts @@ -92,7 +92,9 @@ export class ApplicationSearchTableComponent implements AfterViewInit, OnDestroy } async onSelectRecord(record: SearchResult) { - await this.router.navigateByUrl(`/application/${record.referenceId}`); + const url = this.router.serializeUrl(this.router.createUrlTree([`/application/${record.referenceId}`])); + + window.open(url, '_blank'); } private mapApplications(applications: ApplicationSearchResultDto[]): SearchResult[] { diff --git a/alcs-frontend/src/app/features/search/non-application-search-table/non-application-search-table.component.ts b/alcs-frontend/src/app/features/search/non-application-search-table/non-application-search-table.component.ts index db05df9501..7413db2792 100644 --- a/alcs-frontend/src/app/features/search/non-application-search-table/non-application-search-table.component.ts +++ b/alcs-frontend/src/app/features/search/non-application-search-table/non-application-search-table.component.ts @@ -4,7 +4,10 @@ import { MatSort } from '@angular/material/sort'; import { Router } from '@angular/router'; import { Subject, takeUntil } from 'rxjs'; import { NonApplicationSearchResultDto } from '../../../services/search/search.dto'; -import { COVENANT_TYPE_LABEL, PLANNING_TYPE_LABEL } from '../../../shared/application-type-pill/application-type-pill.constants'; +import { + COVENANT_TYPE_LABEL, + PLANNING_TYPE_LABEL, +} from '../../../shared/application-type-pill/application-type-pill.constants'; import { TableChange } from '../search.interface'; interface SearchResult { @@ -44,8 +47,8 @@ export class NonApplicationSearchTableComponent implements AfterViewInit, OnDest sortDirection = 'DESC'; sortField = 'fileId'; - COVENANT_TYPE_LABEL = COVENANT_TYPE_LABEL - PLANNING_TYPE_LABEL = PLANNING_TYPE_LABEL + COVENANT_TYPE_LABEL = COVENANT_TYPE_LABEL; + PLANNING_TYPE_LABEL = PLANNING_TYPE_LABEL; constructor(private router: Router) {} @@ -85,7 +88,13 @@ export class NonApplicationSearchTableComponent implements AfterViewInit, OnDest } async onSelectRecord(record: SearchResult) { - await this.router.navigateByUrl(`/board/${record.board}?card=${record.referenceId}&type=${record.class}`); + const url = this.router.serializeUrl( + this.router.createUrlTree([`/board/${record.board}`], { + queryParams: { card: record.referenceId, type: record.class }, + }) + ); + + window.open(url, '_blank'); } private mapNonApplications(nonApplications: NonApplicationSearchResultDto[]): NonApplicationSearchResultDto[] { diff --git a/alcs-frontend/src/app/features/search/notice-of-intent-search-table/notice-of-intent-search-table.component.ts b/alcs-frontend/src/app/features/search/notice-of-intent-search-table/notice-of-intent-search-table.component.ts index 536701d449..b3868dcdce 100644 --- a/alcs-frontend/src/app/features/search/notice-of-intent-search-table/notice-of-intent-search-table.component.ts +++ b/alcs-frontend/src/app/features/search/notice-of-intent-search-table/notice-of-intent-search-table.component.ts @@ -92,7 +92,9 @@ export class NoticeOfIntentSearchTableComponent implements AfterViewInit, OnDest } async onSelectRecord(record: SearchResult) { - await this.router.navigateByUrl(`/notice-of-intent/${record.referenceId}`); + const url = this.router.serializeUrl(this.router.createUrlTree([`/notice-of-intent/${record.referenceId}`])); + + window.open(url, '_blank'); } private mapNoticeOfIntent(applications: NoticeOfIntentSearchResultDto[]) { From 2a61b21dc0a8ffc1db4c6ee2015bc2b0b45a8bf6 Mon Sep 17 00:00:00 2001 From: Liam Stoddard Date: Wed, 6 Sep 2023 14:53:53 -0700 Subject: [PATCH 351/954] verified front-end changes --- ...ation-submission-validator.service.spec.ts | 4 ++-- ...pplication-submission-validator.service.ts | 2 +- .../application-submission.dto.ts | 4 ++-- .../application-submission.entity.ts | 2 +- .../application-submission.service.ts | 6 ++--- .../generate-submission-document.service.ts | 2 +- .../1693945647800-rename_nfu_placement.ts | 23 ------------------- .../1694033215304-rename_nfu_placement.ts | 23 +++++++++++++++++++ 8 files changed, 33 insertions(+), 33 deletions(-) delete mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1693945647800-rename_nfu_placement.ts create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1694033215304-rename_nfu_placement.ts diff --git a/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.spec.ts b/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.spec.ts index 4c11f99ea3..0d32a6b4f2 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.spec.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.spec.ts @@ -549,7 +549,7 @@ describe('ApplicationSubmissionValidatorService', () => { nfuWillImportFill: true, nfuFillTypeDescription: 'VALID', nfuFillOriginDescription: 'VALID', - nfuTotalFillPlacement: 0.0, + nfuTotalFillArea: 0.0, nfuMaxFillDepth: 1.5125, nfuAverageFillDepth: 1261.21, nfuFillVolume: 742.1, @@ -598,7 +598,7 @@ describe('ApplicationSubmissionValidatorService', () => { nfuWillImportFill: true, nfuFillTypeDescription: 'VALID', nfuFillOriginDescription: null, - nfuTotalFillPlacement: 0.0, + nfuTotalFillArea: 0.0, nfuMaxFillDepth: 1.5125, nfuAverageFillDepth: 121, nfuFillVolume: 742.1, diff --git a/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.ts b/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.ts index bcf00d8681..e7864c88b2 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.ts @@ -413,7 +413,7 @@ export class ApplicationSubmissionValidatorService { if ( !applicationSubmission.nfuFillTypeDescription || !applicationSubmission.nfuFillOriginDescription || - applicationSubmission.nfuTotalFillPlacement === null || + applicationSubmission.nfuTotalFillArea === null || applicationSubmission.nfuMaxFillDepth === null || applicationSubmission.nfuAverageFillDepth === null || applicationSubmission.nfuFillVolume === null || diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.dto.ts b/services/apps/alcs/src/portal/application-submission/application-submission.dto.ts index 7072eb34ea..a5f2092a88 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.dto.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.dto.ts @@ -102,7 +102,7 @@ export class ApplicationSubmissionDetailedDto extends ApplicationSubmissionDto { nfuWillImportFill?: boolean | null; @AutoMap(() => Number) - nfuTotalFillPlacement?: number | null; + nfuTotalFillArea?: number | null; @AutoMap(() => Number) nfuMaxFillDepth?: number | null; @@ -415,7 +415,7 @@ export class ApplicationSubmissionUpdateDto { @IsNumber() @IsOptional() - nfuTotalFillPlacement?: number | null; + nfuTotalFillArea?: number | null; @IsNumber() @IsOptional() diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts b/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts index 099b291103..1eda7691ca 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts @@ -238,7 +238,7 @@ export class ApplicationSubmission extends Base { scale: 2, transformer: new ColumnNumericTransformer(), }) - nfuTotalFillPlacement: number | null; + nfuTotalFillArea: number | null; @AutoMap(() => Number) @Column({ diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.service.ts b/services/apps/alcs/src/portal/application-submission/application-submission.service.ts index 0b9f8c0df4..2e25515371 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.service.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.service.ts @@ -690,9 +690,9 @@ export class ApplicationSubmissionService { updateDto.nfuWillImportFill, application.nfuWillImportFill, ); - application.nfuTotalFillPlacement = filterUndefined( - updateDto.nfuTotalFillPlacement, - application.nfuTotalFillPlacement, + application.nfuTotalFillArea = filterUndefined( + updateDto.nfuTotalFillArea, + application.nfuTotalFillArea, ); application.nfuMaxFillDepth = filterUndefined( updateDto.nfuMaxFillDepth, diff --git a/services/apps/alcs/src/portal/pdf-generation/generate-submission-document.service.ts b/services/apps/alcs/src/portal/pdf-generation/generate-submission-document.service.ts index 6d087bfb97..b78e6b4d1f 100644 --- a/services/apps/alcs/src/portal/pdf-generation/generate-submission-document.service.ts +++ b/services/apps/alcs/src/portal/pdf-generation/generate-submission-document.service.ts @@ -303,7 +303,7 @@ export class GenerateSubmissionDocumentService { // NFU Proposal => Soil and Fill nfuFillTypeDescription: submission.nfuFillTypeDescription, nfuFillOriginDescription: submission.nfuFillOriginDescription, - nfuTotalFillPlacement: submission.nfuTotalFillPlacement, + nfuTotalFillArea: submission.nfuTotalFillArea, nfuMaxFillDepth: submission.nfuMaxFillDepth, nfuAverageFillDepth: submission.nfuAverageFillDepth, nfuFillVolume: submission.nfuFillVolume, diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1693945647800-rename_nfu_placement.ts b/services/apps/alcs/src/providers/typeorm/migrations/1693945647800-rename_nfu_placement.ts deleted file mode 100644 index c21373ab93..0000000000 --- a/services/apps/alcs/src/providers/typeorm/migrations/1693945647800-rename_nfu_placement.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { MigrationInterface, QueryRunner } from "typeorm" - -export class renameNfuPlacement1693945647800 implements MigrationInterface { - - public async up(queryRunner: QueryRunner): Promise { - await queryRunner.query( - `ALTER TABLE "alcs"."application_submission" RENAME COLUMN "nfu_total_fill_placement" TO "nfu_total_fill_area"`, - ); - await queryRunner.query( - `COMMENT ON COLUMN "alcs"."application_submission"."nfu_total_fill_area" IS 'Area for nfu placement of fill'`, - ); - } - - public async down(queryRunner: QueryRunner): Promise { - await queryRunner.query( - `COMMENT ON COLUMN "alcs"."application_submission"."nfu_total_fill_area" IS 'Area for nfu placement of fill'`, - ); - await queryRunner.query( - `ALTER TABLE "alcs"."application_submission" DROP COLUMN "nfu_total_fill_area"`, - ); - } - -} diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1694033215304-rename_nfu_placement.ts b/services/apps/alcs/src/providers/typeorm/migrations/1694033215304-rename_nfu_placement.ts new file mode 100644 index 0000000000..b86f8e931c --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1694033215304-rename_nfu_placement.ts @@ -0,0 +1,23 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class renameNfuPlacement1694033215304 implements MigrationInterface { + name = 'renameNfuPlacement1694033215304'; + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" RENAME COLUMN "nfu_total_fill_placement" TO "nfu_total_fill_area"`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."application_submission"."nfu_total_fill_area" IS NULL`, + ); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."application_submission"."nfu_total_fill_area" IS 'Area for nfu placement of fill'`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" RENAME COLUMN "nfu_total_fill_area" TO "nfu_total_fill_placement"`, + ); + } +} From c2f1d1bccaeeb59c3d10e864adc4569747199763 Mon Sep 17 00:00:00 2001 From: Liam Stoddard Date: Wed, 6 Sep 2023 15:15:17 -0700 Subject: [PATCH 352/954] added frontend file changes --- .../application-details.component.spec.ts | 2 +- .../nfu-details/nfu-details.component.html | 2 +- .../application-submission.service.spec.ts | 2 +- .../src/app/services/application/application.dto.ts | 2 +- .../nfu-details/nfu-details.component.html | 6 +++--- .../proposal/nfu-proposal/nfu-proposal.component.ts | 4 ++-- .../application-submission/application-submission.dto.ts | 4 ++-- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.spec.ts b/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.spec.ts index 9edda8f531..0f2f203f54 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.spec.ts +++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.spec.ts @@ -82,7 +82,7 @@ describe('ApplicationDetailsComponent', () => { nfuOutsideLands: null, nfuProjectDurationAmount: null, nfuProjectDurationUnit: null, - nfuTotalFillPlacement: null, + nfuTotalFillArea: null, nfuWillImportFill: null, soilAlreadyPlacedArea: null, soilAlreadyPlacedAverageDepth: null, diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/nfu-details/nfu-details.component.html b/alcs-frontend/src/app/features/application/applicant-info/application-details/nfu-details/nfu-details.component.html index 2e25f03054..ed166225e5 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/application-details/nfu-details/nfu-details.component.html +++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/nfu-details/nfu-details.component.html @@ -56,7 +56,7 @@

Soil and Fill Components

Volume
{{ applicationSubmission.nfuFillVolume }} m3
Area
-
{{ applicationSubmission.nfuTotalFillPlacement }} ha
+
{{ applicationSubmission.nfuTotalFillArea }} ha
Maximum Depth
{{ applicationSubmission.nfuMaxFillDepth }} m
Average Depth
diff --git a/alcs-frontend/src/app/services/application/application-submission/application-submission.service.spec.ts b/alcs-frontend/src/app/services/application/application-submission/application-submission.service.spec.ts index db44990ab8..e891624796 100644 --- a/alcs-frontend/src/app/services/application/application-submission/application-submission.service.spec.ts +++ b/alcs-frontend/src/app/services/application/application-submission/application-submission.service.spec.ts @@ -75,7 +75,7 @@ describe('ApplicationSubmissionService', () => { nfuProjectDurationAmount: null, nfuProjectDurationUnit: null, purpose: '', - nfuTotalFillPlacement: null, + nfuTotalFillArea: null, nfuWillImportFill: null, soilAlreadyPlacedArea: null, soilAlreadyPlacedAverageDepth: null, diff --git a/alcs-frontend/src/app/services/application/application.dto.ts b/alcs-frontend/src/app/services/application/application.dto.ts index 58f073bb2e..0e3b34dae0 100644 --- a/alcs-frontend/src/app/services/application/application.dto.ts +++ b/alcs-frontend/src/app/services/application/application.dto.ts @@ -137,7 +137,7 @@ export interface ApplicationSubmissionDto { nfuOutsideLands: string | null; nfuAgricultureSupport: string | null; nfuWillImportFill: boolean | null; - nfuTotalFillPlacement: number | null; + nfuTotalFillArea: number | null; nfuMaxFillDepth: number | null; nfuAverageFillDepth: number | null; nfuFillVolume: number | null; diff --git a/portal-frontend/src/app/features/applications/application-details/nfu-details/nfu-details.component.html b/portal-frontend/src/app/features/applications/application-details/nfu-details/nfu-details.component.html index 5dcc330bc5..0e4fbedb2d 100644 --- a/portal-frontend/src/app/features/applications/application-details/nfu-details/nfu-details.component.html +++ b/portal-frontend/src/app/features/applications/application-details/nfu-details/nfu-details.component.html @@ -85,11 +85,11 @@

Soil and Fill Components

Area
- {{ applicationSubmission.nfuTotalFillPlacement }} - ha + {{ applicationSubmission.nfuTotalFillArea }} + ha
Maximum Depth
diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/nfu-proposal/nfu-proposal.component.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/nfu-proposal/nfu-proposal.component.ts index 61620fafe9..dbc27c67ab 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/nfu-proposal/nfu-proposal.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/nfu-proposal/nfu-proposal.component.ts @@ -75,7 +75,7 @@ export class NfuProposalComponent extends FilesStepComponent implements OnInit, this.fillTableData = { volume: applicationSubmission.nfuFillVolume ?? undefined, - area: applicationSubmission.nfuTotalFillPlacement ?? undefined, + area: applicationSubmission.nfuTotalFillArea ?? undefined, maximumDepth: applicationSubmission.nfuMaxFillDepth ?? undefined, averageDepth: applicationSubmission.nfuAverageFillDepth ?? undefined, }; @@ -118,7 +118,7 @@ export class NfuProposalComponent extends FilesStepComponent implements OnInit, nfuOutsideLands, nfuAgricultureSupport, nfuWillImportFill: parseStringToBoolean(nfuWillImportFill), - nfuTotalFillPlacement: this.fillTableData.area ?? null, + nfuTotalFillArea: this.fillTableData.area ?? null, nfuMaxFillDepth: this.fillTableData.maximumDepth ?? null, nfuAverageFillDepth: this.fillTableData.averageDepth ?? null, nfuFillVolume: this.fillTableData.volume ?? null, diff --git a/portal-frontend/src/app/services/application-submission/application-submission.dto.ts b/portal-frontend/src/app/services/application-submission/application-submission.dto.ts index 318892f119..ca710bbd4f 100644 --- a/portal-frontend/src/app/services/application-submission/application-submission.dto.ts +++ b/portal-frontend/src/app/services/application-submission/application-submission.dto.ts @@ -77,7 +77,7 @@ export interface ApplicationSubmissionDetailedDto extends ApplicationSubmissionD nfuOutsideLands: string | null; nfuAgricultureSupport: string | null; nfuWillImportFill: boolean | null; - nfuTotalFillPlacement: number | null; + nfuTotalFillArea: number | null; nfuMaxFillDepth: number | null; nfuAverageFillDepth: number | null; nfuFillVolume: number | null; @@ -182,7 +182,7 @@ export interface ApplicationSubmissionUpdateDto { nfuOutsideLands?: string | null; nfuAgricultureSupport?: string | null; nfuWillImportFill?: boolean | null; - nfuTotalFillPlacement?: number | null; + nfuTotalFillArea?: number | null; nfuMaxFillDepth?: number | null; nfuAverageFillDepth?: number | null; nfuFillVolume?: number | null; From 31d23dc4c775732b0f30d5d5b36cd6f3eada0952 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Wed, 6 Sep 2023 15:50:42 -0700 Subject: [PATCH 353/954] Add Notification Documents * Add Notification Documents and Other Attachments Page --- .../edit-submission.component.html | 11 +- .../edit-submission.component.spec.ts | 5 + .../edit-submission.component.ts | 18 +- .../edit-submission/edit-submission.module.ts | 2 + .../edit-submission/files-step.partial.ts | 24 +- .../other-attachments.component.html | 104 ++++++ .../other-attachments.component.scss | 38 ++ .../other-attachments.component.spec.ts | 68 ++++ .../other-attachments.component.ts | 121 +++++++ .../notification-document.dto.ts | 18 + .../notification-document.service.spec.ts | 109 ++++++ .../notification-document.service.ts | 103 ++++++ services/apps/alcs/src/alcs/alcs.module.ts | 3 + .../notification-document.controller.spec.ts | 189 ++++++++++ .../notification-document.controller.ts | 211 +++++++++++ .../notification-document.dto.ts | 29 ++ .../notification-document.entity.ts | 67 ++++ .../notification-document.service.spec.ts | 342 ++++++++++++++++++ .../notification-document.service.ts | 305 ++++++++++++++++ .../alcs/notification/notification.entity.ts | 6 + .../alcs/notification/notification.module.ts | 20 +- .../notification.automapper.profile.ts | 41 ++- .../notification-document.controller.spec.ts | 197 ++++++++++ .../notification-document.controller.ts | 172 +++++++++ .../notification-document.dto.ts | 30 ++ .../notification-document.module.ts | 13 + ...notification-submission.controller.spec.ts | 4 +- .../apps/alcs/src/portal/portal.module.ts | 3 + ...694037493007-add_notification_documents.ts | 35 ++ 29 files changed, 2262 insertions(+), 26 deletions(-) create mode 100644 portal-frontend/src/app/features/notifications/edit-submission/other-attachments/other-attachments.component.html create mode 100644 portal-frontend/src/app/features/notifications/edit-submission/other-attachments/other-attachments.component.scss create mode 100644 portal-frontend/src/app/features/notifications/edit-submission/other-attachments/other-attachments.component.spec.ts create mode 100644 portal-frontend/src/app/features/notifications/edit-submission/other-attachments/other-attachments.component.ts create mode 100644 portal-frontend/src/app/services/notification-document/notification-document.dto.ts create mode 100644 portal-frontend/src/app/services/notification-document/notification-document.service.spec.ts create mode 100644 portal-frontend/src/app/services/notification-document/notification-document.service.ts create mode 100644 services/apps/alcs/src/alcs/notification/notification-document/notification-document.controller.spec.ts create mode 100644 services/apps/alcs/src/alcs/notification/notification-document/notification-document.controller.ts create mode 100644 services/apps/alcs/src/alcs/notification/notification-document/notification-document.dto.ts create mode 100644 services/apps/alcs/src/alcs/notification/notification-document/notification-document.entity.ts create mode 100644 services/apps/alcs/src/alcs/notification/notification-document/notification-document.service.spec.ts create mode 100644 services/apps/alcs/src/alcs/notification/notification-document/notification-document.service.ts create mode 100644 services/apps/alcs/src/portal/notification-document/notification-document.controller.spec.ts create mode 100644 services/apps/alcs/src/portal/notification-document/notification-document.controller.ts create mode 100644 services/apps/alcs/src/portal/notification-document/notification-document.dto.ts create mode 100644 services/apps/alcs/src/portal/notification-document/notification-document.module.ts create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1694037493007-add_notification_documents.ts diff --git a/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.component.html b/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.component.html index b906c29f4c..6e94936da9 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.component.html +++ b/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.component.html @@ -77,7 +77,16 @@
-
+
+ + +
diff --git a/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.component.spec.ts b/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.component.spec.ts index cc48c1cd01..72e2b1f4e7 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.component.spec.ts +++ b/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.component.spec.ts @@ -2,6 +2,7 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MatDialog } from '@angular/material/dialog'; import { ActivatedRoute } from '@angular/router'; +import { NotificationDocumentService } from '../../../services/notification-document/notification-document.service'; import { NotificationSubmissionService } from '../../../services/notification-submission/notification-submission.service'; import { ToastService } from '../../../services/toast/toast.service'; @@ -19,6 +20,10 @@ describe('EditSubmissionComponent', () => { provide: NotificationSubmissionService, useValue: {}, }, + { + provide: NotificationDocumentService, + useValue: {}, + }, { provide: ToastService, useValue: {}, diff --git a/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.component.ts b/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.component.ts index 2d718d73e8..695ab88ad4 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.component.ts +++ b/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.component.ts @@ -4,6 +4,8 @@ import { MatDialog } from '@angular/material/dialog'; import { ActivatedRoute, Router } from '@angular/router'; import { BehaviorSubject, combineLatest, Observable, of, Subject, takeUntil } from 'rxjs'; import { NoticeOfIntentDocumentDto } from '../../../services/notice-of-intent-document/notice-of-intent-document.dto'; +import { NotificationDocumentDto } from '../../../services/notification-document/notification-document.dto'; +import { NotificationDocumentService } from '../../../services/notification-document/notification-document.service'; import { NOTIFICATION_STATUS, NotificationSubmissionDetailedDto, @@ -13,6 +15,7 @@ import { ToastService } from '../../../services/toast/toast.service'; import { CustomStepperComponent } from '../../../shared/custom-stepper/custom-stepper.component'; import { OverlaySpinnerService } from '../../../shared/overlay-spinner/overlay-spinner.service'; import { scrollToElement } from '../../../shared/utils/scroll-helper'; +import { OtherAttachmentsComponent } from './other-attachments/other-attachments.component'; import { ParcelDetailsComponent } from './parcels/parcel-details.component'; import { PrimaryContactComponent } from './primary-contact/primary-contact.component'; import { SelectGovernmentComponent } from './select-government/select-government.component'; @@ -37,7 +40,7 @@ export class EditSubmissionComponent implements OnDestroy, AfterViewInit { $destroy = new Subject(); $notificationSubmission = new BehaviorSubject(undefined); - $notificationDocuments = new BehaviorSubject([]); + $notificationDocuments = new BehaviorSubject([]); notificationSubmission: NotificationSubmissionDetailedDto | undefined; steps = EditNotificationSteps; @@ -48,9 +51,11 @@ export class EditSubmissionComponent implements OnDestroy, AfterViewInit { @ViewChild(ParcelDetailsComponent) parcelDetailsComponent!: ParcelDetailsComponent; @ViewChild(PrimaryContactComponent) primaryContactComponent!: PrimaryContactComponent; @ViewChild(SelectGovernmentComponent) selectGovernmentComponent!: SelectGovernmentComponent; + @ViewChild(OtherAttachmentsComponent) otherAttachmentsComponent!: OtherAttachmentsComponent; constructor( private notificationSubmissionService: NotificationSubmissionService, + private notificationDocumentService: NotificationDocumentService, private activatedRoute: ActivatedRoute, private dialog: MatDialog, private toastService: ToastService, @@ -149,7 +154,12 @@ export class EditSubmissionComponent implements OnDestroy, AfterViewInit { } break; case EditNotificationSteps.Proposal: + break; case EditNotificationSteps.Attachments: + if (this.otherAttachmentsComponent) { + await this.otherAttachmentsComponent.onSave(); + } + break; case EditNotificationSteps.ReviewAndSubmit: //DO NOTHING break; @@ -164,10 +174,6 @@ export class EditSubmissionComponent implements OnDestroy, AfterViewInit { } } - onChangeSubmissionType() { - //TODO - } - async onSubmit() { //TODO } @@ -193,7 +199,7 @@ export class EditSubmissionComponent implements OnDestroy, AfterViewInit { await this.router.navigateByUrl(`/home`); } - const documents: NoticeOfIntentDocumentDto[] = []; //TODO await this.noticeOfIntentDocumentService.getByFileId(fileId); + const documents = await this.notificationDocumentService.getByFileId(fileId); if (documents) { this.$notificationDocuments.next(documents); } diff --git a/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.module.ts b/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.module.ts index 6124c74f91..08d1f751b4 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.module.ts +++ b/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.module.ts @@ -8,6 +8,7 @@ import { NgxMaskPipe } from 'ngx-mask'; import { CanDeactivateGuard } from '../../../shared/guard/can-deactivate.guard'; import { SharedModule } from '../../../shared/shared.module'; import { EditSubmissionComponent } from './edit-submission.component'; +import { OtherAttachmentsComponent } from './other-attachments/other-attachments.component'; import { DeleteParcelDialogComponent } from './parcels/delete-parcel/delete-parcel-dialog.component'; import { ParcelDetailsComponent } from './parcels/parcel-details.component'; import { ParcelEntryConfirmationDialogComponent } from './parcels/parcel-entry/parcel-entry-confirmation-dialog/parcel-entry-confirmation-dialog.component'; @@ -42,6 +43,7 @@ const routes: Routes = [ TransfereeDialogComponent, PrimaryContactComponent, SelectGovernmentComponent, + OtherAttachmentsComponent, ], imports: [ CommonModule, diff --git a/portal-frontend/src/app/features/notifications/edit-submission/files-step.partial.ts b/portal-frontend/src/app/features/notifications/edit-submission/files-step.partial.ts index 000753042e..152f173c0a 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/files-step.partial.ts +++ b/portal-frontend/src/app/features/notifications/edit-submission/files-step.partial.ts @@ -1,8 +1,8 @@ import { Component, Input } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; import { BehaviorSubject } from 'rxjs'; -import { NoticeOfIntentDocumentDto } from '../../../services/notice-of-intent-document/notice-of-intent-document.dto'; -import { NoticeOfIntentDocumentService } from '../../../services/notice-of-intent-document/notice-of-intent-document.service'; +import { NotificationDocumentDto } from '../../../services/notification-document/notification-document.dto'; +import { NotificationDocumentService } from '../../../services/notification-document/notification-document.service'; import { DOCUMENT_TYPE } from '../../../shared/dto/document.dto'; import { FileHandle } from '../../../shared/file-drag-drop/drag-drop.directive'; import { StepComponent } from './step.partial'; @@ -13,7 +13,7 @@ import { StepComponent } from './step.partial'; styleUrls: [], }) export abstract class FilesStepComponent extends StepComponent { - @Input() $noiDocuments!: BehaviorSubject; + @Input() $notificationDocuments!: BehaviorSubject; DOCUMENT_TYPE = DOCUMENT_TYPE; @@ -22,7 +22,7 @@ export abstract class FilesStepComponent extends StepComponent { protected abstract save(): Promise; protected constructor( - protected noticeOfIntentDocumentService: NoticeOfIntentDocumentService, + protected notificationDocumentService: NotificationDocumentService, protected dialog: MatDialog ) { super(); @@ -32,26 +32,26 @@ export abstract class FilesStepComponent extends StepComponent { if (this.fileId) { await this.save(); const mappedFiles = file.file; - await this.noticeOfIntentDocumentService.attachExternalFile(this.fileId, mappedFiles, documentType); - const documents = await this.noticeOfIntentDocumentService.getByFileId(this.fileId); + await this.notificationDocumentService.attachExternalFile(this.fileId, mappedFiles, documentType); + const documents = await this.notificationDocumentService.getByFileId(this.fileId); if (documents) { - this.$noiDocuments.next(documents); + this.$notificationDocuments.next(documents); } } } - async onDeleteFile($event: NoticeOfIntentDocumentDto) { - await this.noticeOfIntentDocumentService.deleteExternalFile($event.uuid); + async onDeleteFile($event: NotificationDocumentDto) { + await this.notificationDocumentService.deleteExternalFile($event.uuid); if (this.fileId) { - const documents = await this.noticeOfIntentDocumentService.getByFileId(this.fileId); + const documents = await this.notificationDocumentService.getByFileId(this.fileId); if (documents) { - this.$noiDocuments.next(documents); + this.$notificationDocuments.next(documents); } } } async openFile(uuid: string) { - const res = await this.noticeOfIntentDocumentService.openFile(uuid); + const res = await this.notificationDocumentService.openFile(uuid); if (res) { window.open(res.url, '_blank'); } diff --git a/portal-frontend/src/app/features/notifications/edit-submission/other-attachments/other-attachments.component.html b/portal-frontend/src/app/features/notifications/edit-submission/other-attachments/other-attachments.component.html new file mode 100644 index 0000000000..ccd065dabd --- /dev/null +++ b/portal-frontend/src/app/features/notifications/edit-submission/other-attachments/other-attachments.component.html @@ -0,0 +1,104 @@ +
+

Optional Attachments

+

+ Please upload any optional supporting documents. Where possible, provide KML/KMZ Google Earth files or GIS + shapefiles and geodatabases. +

+
+
+

Upload Optional Attachments (Max. 100 MB per attachment)

+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
Type + + + {{ type.label }} + + +
+ warning +
This field is required
+
+ 		Description + + + +
+ warning +
+ This field is required +
+
+ 		File Name + {{ element.fileName }} + Action + +
No attachments
+
+
+
+ +
+
+
+ +
+ + +
+
diff --git a/portal-frontend/src/app/features/notifications/edit-submission/other-attachments/other-attachments.component.scss b/portal-frontend/src/app/features/notifications/edit-submission/other-attachments/other-attachments.component.scss new file mode 100644 index 0000000000..7a223440c8 --- /dev/null +++ b/portal-frontend/src/app/features/notifications/edit-submission/other-attachments/other-attachments.component.scss @@ -0,0 +1,38 @@ +@use '../../../../../styles/functions' as *; +@use '../../../../../styles/colors'; + +section { + margin-top: rem(32); +} + +.uploader { + margin-top: rem(24); +} + +h4 { + margin-bottom: rem(8) !important; +} + +.scrollable { + overflow-x: auto; +} + +.mat-mdc-table .mdc-data-table__row { + height: rem(75); +} + +.mat-mdc-form-field { + width: 100%; +} + +:host::ng-deep { + .mdc-text-field--invalid { + margin-top: rem(8); + } +} + +.no-data-text { + text-align: center; + color: colors.$grey; + padding-top: rem(12); +} diff --git a/portal-frontend/src/app/features/notifications/edit-submission/other-attachments/other-attachments.component.spec.ts b/portal-frontend/src/app/features/notifications/edit-submission/other-attachments/other-attachments.component.spec.ts new file mode 100644 index 0000000000..333944d2cc --- /dev/null +++ b/portal-frontend/src/app/features/notifications/edit-submission/other-attachments/other-attachments.component.spec.ts @@ -0,0 +1,68 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { MatDialog } from '@angular/material/dialog'; +import { Router } from '@angular/router'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { BehaviorSubject } from 'rxjs'; +import { CodeService } from '../../../../services/code/code.service'; +import { NotificationDocumentDto } from '../../../../services/notification-document/notification-document.dto'; +import { NotificationDocumentService } from '../../../../services/notification-document/notification-document.service'; +import { NotificationSubmissionDetailedDto } from '../../../../services/notification-submission/notification-submission.dto'; +import { NotificationSubmissionService } from '../../../../services/notification-submission/notification-submission.service'; + +import { OtherAttachmentsComponent } from './other-attachments.component'; + +describe('OtherAttachmentsComponent', () => { + let component: OtherAttachmentsComponent; + let fixture: ComponentFixture; + let mockNotificationSubmissionService: DeepMocked; + let mockNotificationDocumentService: DeepMocked; + let mockRouter: DeepMocked; + let mockCodeService: DeepMocked; + + let documentPipe = new BehaviorSubject([]); + + beforeEach(async () => { + mockNotificationSubmissionService = createMock(); + mockNotificationDocumentService = createMock(); + mockRouter = createMock(); + mockCodeService = createMock(); + + await TestBed.configureTestingModule({ + providers: [ + { + provide: NotificationSubmissionService, + useValue: mockNotificationSubmissionService, + }, + { + provide: NotificationDocumentService, + useValue: mockNotificationDocumentService, + }, + { + provide: Router, + useValue: mockRouter, + }, + { + provide: CodeService, + useValue: mockCodeService, + }, + { + provide: MatDialog, + useValue: {}, + }, + ], + declarations: [OtherAttachmentsComponent], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(OtherAttachmentsComponent); + component = fixture.componentInstance; + component.$notificationSubmission = new BehaviorSubject(undefined); + component.$notificationDocuments = documentPipe; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/notifications/edit-submission/other-attachments/other-attachments.component.ts b/portal-frontend/src/app/features/notifications/edit-submission/other-attachments/other-attachments.component.ts new file mode 100644 index 0000000000..920bc18586 --- /dev/null +++ b/portal-frontend/src/app/features/notifications/edit-submission/other-attachments/other-attachments.component.ts @@ -0,0 +1,121 @@ +import { Component, OnDestroy, OnInit } from '@angular/core'; +import { FormControl, FormGroup, Validators } from '@angular/forms'; +import { MatDialog } from '@angular/material/dialog'; +import { Router } from '@angular/router'; +import { takeUntil } from 'rxjs'; +import { CodeService } from '../../../../services/code/code.service'; +import { + NotificationDocumentDto, + NotificationDocumentUpdateDto, +} from '../../../../services/notification-document/notification-document.dto'; +import { NotificationDocumentService } from '../../../../services/notification-document/notification-document.service'; +import { NotificationSubmissionService } from '../../../../services/notification-submission/notification-submission.service'; +import { DOCUMENT_SOURCE, DOCUMENT_TYPE, DocumentTypeDto } from '../../../../shared/dto/document.dto'; +import { EditNotificationSteps } from '../edit-submission.component'; +import { FilesStepComponent } from '../files-step.partial'; + +const USER_CONTROLLED_TYPES = [DOCUMENT_TYPE.PHOTOGRAPH, DOCUMENT_TYPE.PROFESSIONAL_REPORT, DOCUMENT_TYPE.OTHER]; + +@Component({ + selector: 'app-other-attachments', + templateUrl: './other-attachments.component.html', + styleUrls: ['./other-attachments.component.scss'], +}) +export class OtherAttachmentsComponent extends FilesStepComponent implements OnInit, OnDestroy { + currentStep = EditNotificationSteps.Attachments; + + displayedColumns = ['type', 'description', 'fileName', 'actions']; + selectableTypes: DocumentTypeDto[] = []; + otherFiles: NotificationDocumentDto[] = []; + + private isDirty = false; + + form = new FormGroup({} as any); + private documentCodes: DocumentTypeDto[] = []; + + constructor( + private router: Router, + private applicationService: NotificationSubmissionService, + private codeService: CodeService, + notificationDocumentService: NotificationDocumentService, + dialog: MatDialog + ) { + super(notificationDocumentService, dialog); + } + + ngOnInit(): void { + this.$notificationSubmission.pipe(takeUntil(this.$destroy)).subscribe((submission) => { + if (submission) { + this.fileId = submission.fileNumber; + } + }); + + this.loadDocumentCodes(); + + this.$notificationDocuments.pipe(takeUntil(this.$destroy)).subscribe((documents) => { + this.otherFiles = documents + .filter((file) => (file.type ? USER_CONTROLLED_TYPES.includes(file.type.code) : true)) + .filter((file) => file.source === DOCUMENT_SOURCE.APPLICANT) + .sort((a, b) => { + return a.uploadedAt - b.uploadedAt; + }); + const newForm = new FormGroup({}); + for (const file of this.otherFiles) { + newForm.addControl(`${file.uuid}-type`, new FormControl(file.type?.code, [Validators.required])); + newForm.addControl(`${file.uuid}-description`, new FormControl(file.description, [Validators.required])); + } + this.form = newForm; + if (this.showErrors) { + this.form.markAllAsTouched(); + } + }); + } + + async onSave() { + await this.save(); + } + + protected async save() { + if (this.isDirty) { + const updateDtos: NotificationDocumentUpdateDto[] = this.otherFiles.map((file) => ({ + uuid: file.uuid, + description: file.description, + type: file.type?.code ?? null, + })); + await this.notificationDocumentService.update(this.fileId, updateDtos); + } + } + + onChangeDescription(uuid: string, event: Event) { + this.isDirty = true; + const input = event.target as HTMLInputElement; + const description = input.value; + this.otherFiles = this.otherFiles.map((file) => { + if (uuid === file.uuid) { + file.description = description; + } + return file; + }); + } + + onChangeType(uuid: string, selectedValue: DOCUMENT_TYPE) { + this.isDirty = true; + this.otherFiles = this.otherFiles.map((file) => { + if (uuid === file.uuid) { + const newType = this.documentCodes.find((code) => code.code === selectedValue); + if (newType) { + file.type = newType; + } else { + console.error('Failed to find matching document type'); + } + } + return file; + }); + } + + private async loadDocumentCodes() { + const codes = await this.codeService.loadCodes(); + this.documentCodes = codes.documentTypes; + this.selectableTypes = this.documentCodes.filter((code) => USER_CONTROLLED_TYPES.includes(code.code)); + } +} diff --git a/portal-frontend/src/app/services/notification-document/notification-document.dto.ts b/portal-frontend/src/app/services/notification-document/notification-document.dto.ts new file mode 100644 index 0000000000..9e345f8edf --- /dev/null +++ b/portal-frontend/src/app/services/notification-document/notification-document.dto.ts @@ -0,0 +1,18 @@ +import { DOCUMENT_SOURCE, DOCUMENT_TYPE, DocumentTypeDto } from '../../shared/dto/document.dto'; + +export interface NotificationDocumentDto { + type: DocumentTypeDto | null; + description?: string | null; + uuid: string; + fileName: string; + fileSize: number; + uploadedBy: string; + uploadedAt: number; + source: DOCUMENT_SOURCE; +} + +export interface NotificationDocumentUpdateDto { + uuid: string; + type: DOCUMENT_TYPE | null; + description?: string | null; +} diff --git a/portal-frontend/src/app/services/notification-document/notification-document.service.spec.ts b/portal-frontend/src/app/services/notification-document/notification-document.service.spec.ts new file mode 100644 index 0000000000..b5d044ac77 --- /dev/null +++ b/portal-frontend/src/app/services/notification-document/notification-document.service.spec.ts @@ -0,0 +1,109 @@ +import { HttpClient } from '@angular/common/http'; +import { HttpClientTestingModule } from '@angular/common/http/testing'; +import { TestBed } from '@angular/core/testing'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { of, throwError } from 'rxjs'; +import { ToastService } from '../toast/toast.service'; +import { NotificationDocumentService } from './notification-document.service'; + +describe('NotificationDocumentService', () => { + let service: NotificationDocumentService; + let mockToastService: DeepMocked; + let mockHttpClient: DeepMocked; + + beforeEach(() => { + mockToastService = createMock(); + mockHttpClient = createMock(); + + TestBed.configureTestingModule({ + imports: [HttpClientTestingModule], + providers: [ + { + provide: ToastService, + useValue: mockToastService, + }, + { + provide: HttpClient, + useValue: mockHttpClient, + }, + ], + }); + service = TestBed.inject(NotificationDocumentService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); + + it('should make a get request for open file', async () => { + mockHttpClient.get.mockReturnValue(of({})); + + await service.openFile('fileId'); + + expect(mockHttpClient.get).toHaveBeenCalledTimes(1); + expect(mockHttpClient.get.mock.calls[0][0]).toContain('notification-document'); + }); + + it('should show an error toast if opening a file fails', async () => { + mockHttpClient.get.mockReturnValue(throwError(() => ({}))); + + await service.openFile('fileId'); + + expect(mockHttpClient.get).toHaveBeenCalledTimes(1); + expect(mockToastService.showErrorToast).toHaveBeenCalledTimes(1); + }); + + it('should make a delete request for delete file', async () => { + mockHttpClient.delete.mockReturnValue(of({})); + + await service.deleteExternalFile('fileId'); + + expect(mockHttpClient.delete).toHaveBeenCalledTimes(1); + expect(mockHttpClient.delete.mock.calls[0][0]).toContain('notification-document'); + }); + + it('should show an error toast if deleting a file fails', async () => { + mockHttpClient.delete.mockReturnValue(throwError(() => ({}))); + + await service.deleteExternalFile('fileId'); + + expect(mockHttpClient.delete).toHaveBeenCalledTimes(1); + expect(mockToastService.showErrorToast).toHaveBeenCalledTimes(1); + }); + + it('should make a patch request for update file', async () => { + mockHttpClient.patch.mockReturnValue(of({})); + + await service.update('fileId', []); + + expect(mockHttpClient.patch).toHaveBeenCalledTimes(1); + expect(mockHttpClient.patch.mock.calls[0][0]).toContain('notification-document'); + }); + + it('should show an error toast if updating a file fails', async () => { + mockHttpClient.patch.mockReturnValue(throwError(() => ({}))); + + await service.update('fileId', []); + + expect(mockHttpClient.patch).toHaveBeenCalledTimes(1); + expect(mockToastService.showErrorToast).toHaveBeenCalledTimes(1); + }); + + it('should make a post request for deleting multiple files', async () => { + mockHttpClient.post.mockReturnValue(of({})); + + await service.deleteExternalFiles(['fileId']); + + expect(mockHttpClient.post).toHaveBeenCalledTimes(1); + expect(mockHttpClient.post.mock.calls[0][0]).toContain('notification-document'); + }); + + it('should show an error toast if deleting a file fails', async () => { + mockHttpClient.post.mockReturnValue(throwError(() => ({}))); + + await service.deleteExternalFiles(['fileId']); + + expect(mockHttpClient.post).toHaveBeenCalledTimes(1); + expect(mockToastService.showErrorToast).toHaveBeenCalledTimes(1); + }); +}); diff --git a/portal-frontend/src/app/services/notification-document/notification-document.service.ts b/portal-frontend/src/app/services/notification-document/notification-document.service.ts new file mode 100644 index 0000000000..60eff39d81 --- /dev/null +++ b/portal-frontend/src/app/services/notification-document/notification-document.service.ts @@ -0,0 +1,103 @@ +import { HttpClient } from '@angular/common/http'; +import { Injectable } from '@angular/core'; +import { firstValueFrom } from 'rxjs'; +import { environment } from '../../../environments/environment'; +import { DOCUMENT_SOURCE, DOCUMENT_TYPE } from '../../shared/dto/document.dto'; +import { OverlaySpinnerService } from '../../shared/overlay-spinner/overlay-spinner.service'; +import { DocumentService } from '../document/document.service'; +import { ToastService } from '../toast/toast.service'; +import { NotificationDocumentDto, NotificationDocumentUpdateDto } from './notification-document.dto'; + +@Injectable({ + providedIn: 'root', +}) +export class NotificationDocumentService { + private serviceUrl = `${environment.apiUrl}/notification-document`; + + constructor( + private httpClient: HttpClient, + private toastService: ToastService, + private documentService: DocumentService, + private overlayService: OverlaySpinnerService + ) {} + + async attachExternalFile( + fileNumber: string, + file: File, + documentType: DOCUMENT_TYPE | null, + source = DOCUMENT_SOURCE.APPLICANT + ) { + try { + const res = await this.documentService.uploadFile( + fileNumber, + file, + documentType, + source, + `${this.serviceUrl}/notification/${fileNumber}/attachExternal` + ); + this.toastService.showSuccessToast('Document uploaded'); + return res; + } catch (e) { + console.error(e); + this.toastService.showErrorToast('Failed to attach document, please try again'); + } + return undefined; + } + + async openFile(fileUuid: string) { + try { + return await firstValueFrom(this.httpClient.get<{ url: string }>(`${this.serviceUrl}/${fileUuid}/open`)); + } catch (e) { + console.error(e); + this.toastService.showErrorToast('Failed to open the document, please try again'); + } + return undefined; + } + + async deleteExternalFile(fileUuid: string) { + try { + this.overlayService.showSpinner(); + await firstValueFrom(this.httpClient.delete(`${this.serviceUrl}/${fileUuid}`)); + this.toastService.showSuccessToast('Document deleted'); + } catch (e) { + console.error(e); + this.toastService.showErrorToast('Failed to delete document, please try again'); + } finally { + this.overlayService.hideSpinner(); + } + } + + async deleteExternalFiles(fileUuids: string[]) { + try { + this.overlayService.showSpinner(); + await firstValueFrom(this.httpClient.post(`${this.serviceUrl}/delete-files`, fileUuids)); + } catch (e) { + console.error(e); + this.toastService.showErrorToast('Failed to delete documents'); + } finally { + this.overlayService.hideSpinner(); + } + } + + async update(fileNumber: string | undefined, updateDtos: NotificationDocumentUpdateDto[]) { + try { + await firstValueFrom(this.httpClient.patch(`${this.serviceUrl}/notification/${fileNumber}`, updateDtos)); + } catch (e) { + console.error(e); + this.toastService.showErrorToast('Failed to update documents, please try again'); + } + return undefined; + } + + async getByFileId(fileNumber: string) { + try { + return await firstValueFrom( + this.httpClient.get(`${this.serviceUrl}/notification/${fileNumber}`) + ); + } catch (e) { + console.error(e); + this.toastService.showErrorToast('Failed to fetch documents, please try again'); + } + return undefined; + } +} diff --git a/services/apps/alcs/src/alcs/alcs.module.ts b/services/apps/alcs/src/alcs/alcs.module.ts index 8a49f98dd7..29bbc475a5 100644 --- a/services/apps/alcs/src/alcs/alcs.module.ts +++ b/services/apps/alcs/src/alcs/alcs.module.ts @@ -19,6 +19,7 @@ import { NoticeOfIntentTimelineModule } from './notice-of-intent/notice-of-inten import { NoticeOfIntentSubmissionStatusModule } from './notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.module'; import { NoticeOfIntentModule } from './notice-of-intent/notice-of-intent.module'; import { MessageModule } from './message/message.module'; +import { NotificationModule } from './notification/notification.module'; import { PlanningReviewModule } from './planning-review/planning-review.module'; import { SearchModule } from './search/search.module'; import { StaffJournalModule } from './staff-journal/staff-journal.module'; @@ -45,6 +46,7 @@ import { StaffJournalModule } from './staff-journal/staff-journal.module'; NoticeOfIntentTimelineModule, SearchModule, LocalGovernmentModule, + NotificationModule, RouterModule.register([ { path: 'alcs', module: ApplicationModule }, { path: 'alcs', module: CommentModule }, @@ -67,6 +69,7 @@ import { StaffJournalModule } from './staff-journal/staff-journal.module'; { path: 'alcs', module: LocalGovernmentModule }, { path: 'alcs', module: ApplicationTimelineModule }, { path: 'alcs', module: NoticeOfIntentTimelineModule }, + { path: 'alcs', module: NotificationModule }, ]), ], controllers: [], diff --git a/services/apps/alcs/src/alcs/notification/notification-document/notification-document.controller.spec.ts b/services/apps/alcs/src/alcs/notification/notification-document/notification-document.controller.spec.ts new file mode 100644 index 0000000000..99172858f8 --- /dev/null +++ b/services/apps/alcs/src/alcs/notification/notification-document/notification-document.controller.spec.ts @@ -0,0 +1,189 @@ +import { classes } from '@automapper/classes'; +import { AutomapperModule } from '@automapper/nestjs'; +import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; +import { BadRequestException } from '@nestjs/common'; +import { Test, TestingModule } from '@nestjs/testing'; +import { ClsService } from 'nestjs-cls'; +import { mockKeyCloakProviders } from '../../../../test/mocks/mockTypes'; +import { NotificationProfile } from '../../../common/automapper/notification.automapper.profile'; +import { DOCUMENT_TYPE } from '../../../document/document-code.entity'; +import { DOCUMENT_SOURCE } from '../../../document/document.dto'; +import { Document } from '../../../document/document.entity'; +import { User } from '../../../user/user.entity'; +import { CodeService } from '../../code/code.service'; +import { NotificationDocumentController } from './notification-document.controller'; +import { NotificationDocument } from './notification-document.entity'; +import { NotificationDocumentService } from './notification-document.service'; + +describe('NotificationDocumentController', () => { + let controller: NotificationDocumentController; + let notificationDocumentService: DeepMocked; + + const mockDocument = new NotificationDocument({ + document: new Document({ + mimeType: 'mimeType', + uploadedBy: new User(), + uploadedAt: new Date(), + }), + }); + + beforeEach(async () => { + notificationDocumentService = createMock(); + + const module: TestingModule = await Test.createTestingModule({ + imports: [ + AutomapperModule.forRoot({ + strategyInitializer: classes(), + }), + ], + controllers: [NotificationDocumentController], + providers: [ + { + provide: CodeService, + useValue: {}, + }, + NotificationProfile, + { + provide: NotificationDocumentService, + useValue: notificationDocumentService, + }, + { + provide: ClsService, + useValue: {}, + }, + ...mockKeyCloakProviders, + ], + }).compile(); + controller = module.get( + NotificationDocumentController, + ); + }); + + it('should be defined', () => { + expect(controller).toBeDefined(); + }); + + it('should return the attached document', async () => { + const mockFile = {}; + const mockUser = {}; + + notificationDocumentService.attachDocument.mockResolvedValue(mockDocument); + + const res = await controller.attachDocument('fileNumber', { + isMultipart: () => true, + body: { + documentType: { + value: DOCUMENT_TYPE.CERTIFICATE_OF_TITLE, + }, + fileName: { + value: 'file', + }, + source: { + value: DOCUMENT_SOURCE.APPLICANT, + }, + visibilityFlags: { + value: '', + }, + file: mockFile, + }, + user: { + entity: mockUser, + }, + }); + + expect(res.mimeType).toEqual(mockDocument.document.mimeType); + + expect(notificationDocumentService.attachDocument).toHaveBeenCalledTimes(1); + const callData = + notificationDocumentService.attachDocument.mock.calls[0][0]; + expect(callData.fileName).toEqual('file'); + expect(callData.file).toEqual(mockFile); + expect(callData.user).toEqual(mockUser); + }); + + it('should throw an exception if request is not the right type', async () => { + const mockFile = {}; + const mockUser = {}; + + notificationDocumentService.attachDocument.mockResolvedValue(mockDocument); + + await expect( + controller.attachDocument('fileNumber', { + isMultipart: () => false, + file: () => mockFile, + user: { + entity: mockUser, + }, + }), + ).rejects.toMatchObject( + new BadRequestException('Request is not multipart'), + ); + }); + + it('should list documents', async () => { + notificationDocumentService.list.mockResolvedValue([mockDocument]); + + const res = await controller.listDocuments( + 'fake-number', + DOCUMENT_TYPE.DECISION_DOCUMENT, + ); + + expect(res[0].mimeType).toEqual(mockDocument.document.mimeType); + }); + + it('should call through to delete documents', async () => { + notificationDocumentService.delete.mockResolvedValue(mockDocument); + notificationDocumentService.get.mockResolvedValue(mockDocument); + + await controller.delete('fake-uuid'); + + expect(notificationDocumentService.get).toHaveBeenCalledTimes(1); + expect(notificationDocumentService.delete).toHaveBeenCalledTimes(1); + }); + + it('should call through for open', async () => { + const fakeUrl = 'fake-url'; + notificationDocumentService.getInlineUrl.mockResolvedValue(fakeUrl); + notificationDocumentService.get.mockResolvedValue(mockDocument); + + const res = await controller.open('fake-uuid'); + + expect(res.url).toEqual(fakeUrl); + }); + + it('should call through for download', async () => { + const fakeUrl = 'fake-url'; + notificationDocumentService.getDownloadUrl.mockResolvedValue(fakeUrl); + notificationDocumentService.get.mockResolvedValue(mockDocument); + + const res = await controller.download('fake-uuid'); + + expect(res.url).toEqual(fakeUrl); + }); + + it('should call through for list types', async () => { + notificationDocumentService.fetchTypes.mockResolvedValue([]); + + const res = await controller.listTypes(); + + expect(notificationDocumentService.fetchTypes).toHaveBeenCalledTimes(1); + }); + + it('should call through for list app documents', async () => { + notificationDocumentService.getApplicantDocuments.mockResolvedValue([]); + + const res = await controller.listApplicantDocuments(''); + + expect( + notificationDocumentService.getApplicantDocuments, + ).toHaveBeenCalledTimes(1); + }); + + it('should call through for list review documents', async () => { + notificationDocumentService.list.mockResolvedValue([]); + + const res = await controller.listReviewDocuments(''); + + expect(notificationDocumentService.list).toHaveBeenCalledTimes(1); + }); +}); diff --git a/services/apps/alcs/src/alcs/notification/notification-document/notification-document.controller.ts b/services/apps/alcs/src/alcs/notification/notification-document/notification-document.controller.ts new file mode 100644 index 0000000000..c7633e4fcd --- /dev/null +++ b/services/apps/alcs/src/alcs/notification/notification-document/notification-document.controller.ts @@ -0,0 +1,211 @@ +import { Mapper } from '@automapper/core'; +import { InjectMapper } from '@automapper/nestjs'; +import { + BadRequestException, + Controller, + Delete, + Get, + Param, + Post, + Req, + UseGuards, +} from '@nestjs/common'; +import { ApiOAuth2 } from '@nestjs/swagger'; +import * as config from 'config'; +import { ANY_AUTH_ROLE } from '../../../common/authorization/roles'; +import { RolesGuard } from '../../../common/authorization/roles-guard.service'; +import { UserRoles } from '../../../common/authorization/roles.decorator'; +import { + DOCUMENT_TYPE, + DocumentCode, +} from '../../../document/document-code.entity'; +import { + DOCUMENT_SOURCE, + DOCUMENT_SYSTEM, + DocumentTypeDto, +} from '../../../document/document.dto'; +import { NotificationDocumentDto } from './notification-document.dto'; +import { + NotificationDocument, + VISIBILITY_FLAG, +} from './notification-document.entity'; +import { NotificationDocumentService } from './notification-document.service'; + +@ApiOAuth2(config.get('KEYCLOAK.SCOPES')) +@UseGuards(RolesGuard) +@Controller('notification-document') +export class NotificationDocumentController { + constructor( + private notificationDocumentService: NotificationDocumentService, + @InjectMapper() private mapper: Mapper, + ) {} + + @Get('/notification/:fileNumber') + @UserRoles(...ANY_AUTH_ROLE) + async listAll( + @Param('fileNumber') fileNumber: string, + ): Promise { + const documents = await this.notificationDocumentService.list(fileNumber); + return this.mapper.mapArray( + documents, + NotificationDocument, + NotificationDocumentDto, + ); + } + + @Post('/notification/:fileNumber') + @UserRoles(...ANY_AUTH_ROLE) + async attachDocument( + @Param('fileNumber') fileNumber: string, + @Req() req, + ): Promise { + if (!req.isMultipart()) { + throw new BadRequestException('Request is not multipart'); + } + + const savedDocument = await this.saveUploadedFile(req, fileNumber); + + return this.mapper.map( + savedDocument, + NotificationDocument, + NotificationDocumentDto, + ); + } + + @Post('/:uuid') + @UserRoles(...ANY_AUTH_ROLE) + async updateDocument( + @Param('uuid') documentUuid: string, + @Req() req, + ): Promise { + if (!req.isMultipart()) { + throw new BadRequestException('Request is not multipart'); + } + + const documentType = req.body.documentType.value as DOCUMENT_TYPE; + const file = req.body.file; + const fileName = req.body.fileName.value as string; + const documentSource = req.body.source.value as DOCUMENT_SOURCE; + const visibilityFlags = req.body.visibilityFlags.value.split(', '); + + const savedDocument = await this.notificationDocumentService.update({ + uuid: documentUuid, + fileName, + file, + documentType: documentType as DOCUMENT_TYPE, + source: documentSource, + visibilityFlags, + user: req.user.entity, + }); + + return this.mapper.map( + savedDocument, + NotificationDocument, + NotificationDocumentDto, + ); + } + + @Get('/notification/:fileNumber/reviewDocuments') + @UserRoles(...ANY_AUTH_ROLE) + async listReviewDocuments( + @Param('fileNumber') fileNumber: string, + ): Promise { + const documents = await this.notificationDocumentService.list(fileNumber); + const reviewDocuments = documents.filter( + (doc) => doc.document.source === DOCUMENT_SOURCE.LFNG, + ); + + return this.mapper.mapArray( + reviewDocuments, + NotificationDocument, + NotificationDocumentDto, + ); + } + + @Get('/notification/:fileNumber/applicantDocuments') + @UserRoles(...ANY_AUTH_ROLE) + async listApplicantDocuments( + @Param('fileNumber') fileNumber: string, + ): Promise { + const documents = + await this.notificationDocumentService.getApplicantDocuments(fileNumber); + + return this.mapper.mapArray( + documents, + NotificationDocument, + NotificationDocumentDto, + ); + } + + @Get('/notification/:fileNumber/:visibilityFlags') + @UserRoles(...ANY_AUTH_ROLE) + async listDocuments( + @Param('fileNumber') fileNumber: string, + @Param('visibilityFlags') visibilityFlags: string, + ): Promise { + const mappedFlags = visibilityFlags.split('') as VISIBILITY_FLAG[]; + const documents = await this.notificationDocumentService.list( + fileNumber, + mappedFlags, + ); + return this.mapper.mapArray( + documents, + NotificationDocument, + NotificationDocumentDto, + ); + } + + @Get('/types') + @UserRoles(...ANY_AUTH_ROLE) + async listTypes() { + const types = await this.notificationDocumentService.fetchTypes(); + return this.mapper.mapArray(types, DocumentCode, DocumentTypeDto); + } + + @Get('/:uuid/open') + @UserRoles(...ANY_AUTH_ROLE) + async open(@Param('uuid') fileUuid: string) { + const document = await this.notificationDocumentService.get(fileUuid); + const url = await this.notificationDocumentService.getInlineUrl(document); + return { + url, + }; + } + + @Get('/:uuid/download') + @UserRoles(...ANY_AUTH_ROLE) + async download(@Param('uuid') fileUuid: string) { + const document = await this.notificationDocumentService.get(fileUuid); + const url = await this.notificationDocumentService.getDownloadUrl(document); + return { + url, + }; + } + + @Delete('/:uuid') + @UserRoles(...ANY_AUTH_ROLE) + async delete(@Param('uuid') fileUuid: string) { + const document = await this.notificationDocumentService.get(fileUuid); + await this.notificationDocumentService.delete(document); + return {}; + } + + private async saveUploadedFile(req, fileNumber: string) { + const documentType = req.body.documentType.value as DOCUMENT_TYPE; + const file = req.body.file; + const fileName = req.body.fileName.value as string; + const documentSource = req.body.source.value as DOCUMENT_SOURCE; + const visibilityFlags = req.body.visibilityFlags.value.split(', '); + + return await this.notificationDocumentService.attachDocument({ + fileNumber, + fileName, + file, + user: req.user.entity, + documentType: documentType as DOCUMENT_TYPE, + source: documentSource, + visibilityFlags, + system: DOCUMENT_SYSTEM.ALCS, + }); + } +} diff --git a/services/apps/alcs/src/alcs/notification/notification-document/notification-document.dto.ts b/services/apps/alcs/src/alcs/notification/notification-document/notification-document.dto.ts new file mode 100644 index 0000000000..4a909c1efc --- /dev/null +++ b/services/apps/alcs/src/alcs/notification/notification-document/notification-document.dto.ts @@ -0,0 +1,29 @@ +import { AutoMap } from '@automapper/classes'; +import { DocumentTypeDto } from '../../../document/document.dto'; + +export class NotificationDocumentDto { + @AutoMap(() => String) + description?: string; + + @AutoMap() + uuid: string; + + @AutoMap(() => DocumentTypeDto) + type?: DocumentTypeDto; + + @AutoMap(() => [String]) + visibilityFlags: string[]; + + @AutoMap(() => [Number]) + evidentiaryRecordSorting?: number; + + //Document Fields + documentUuid: string; + fileName: string; + fileSize?: number; + source: string; + system: string; + mimeType: string; + uploadedBy: string; + uploadedAt: number; +} diff --git a/services/apps/alcs/src/alcs/notification/notification-document/notification-document.entity.ts b/services/apps/alcs/src/alcs/notification/notification-document/notification-document.entity.ts new file mode 100644 index 0000000000..c8c2fe60d0 --- /dev/null +++ b/services/apps/alcs/src/alcs/notification/notification-document/notification-document.entity.ts @@ -0,0 +1,67 @@ +import { AutoMap } from '@automapper/classes'; +import { + BaseEntity, + Column, + Entity, + JoinColumn, + ManyToOne, + OneToOne, + PrimaryGeneratedColumn, +} from 'typeorm'; +import { DocumentCode } from '../../../document/document-code.entity'; +import { Document } from '../../../document/document.entity'; +import { Notification } from '../notification.entity'; + +export enum VISIBILITY_FLAG { + APPLICANT = 'A', + COMMISSIONER = 'C', + PUBLIC = 'P', + GOVERNMENT = 'G', +} + +@Entity() +export class NotificationDocument extends BaseEntity { + constructor(data?: Partial) { + super(); + if (data) { + Object.assign(this, data); + } + } + + @AutoMap() + @PrimaryGeneratedColumn('uuid') + uuid: string; + + @ManyToOne(() => DocumentCode) + type?: DocumentCode; + + @Column({ nullable: true }) + typeCode?: string | null; + + @Column({ type: 'text', nullable: true }) + description?: string | null; + + @ManyToOne(() => Notification, { nullable: false }) + notification: Notification; + + @Column() + notificationUuid: string; + + @Column({ nullable: true, type: 'uuid' }) + documentUuid?: string | null; + + @AutoMap(() => [String]) + @Column({ default: [], array: true, type: 'text' }) + visibilityFlags: VISIBILITY_FLAG[]; + + @OneToOne(() => Document) + @JoinColumn() + document: Document; + + @Column({ + nullable: true, + type: 'text', + comment: 'used only for oats etl process', + }) + auditCreatedBy?: string | null; +} diff --git a/services/apps/alcs/src/alcs/notification/notification-document/notification-document.service.spec.ts b/services/apps/alcs/src/alcs/notification/notification-document/notification-document.service.spec.ts new file mode 100644 index 0000000000..cc44d8acfd --- /dev/null +++ b/services/apps/alcs/src/alcs/notification/notification-document/notification-document.service.spec.ts @@ -0,0 +1,342 @@ +import { ServiceNotFoundException } from '@app/common/exceptions/base.exception'; +import { MultipartFile } from '@fastify/multipart'; +import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; +import { Test, TestingModule } from '@nestjs/testing'; +import { getRepositoryToken } from '@nestjs/typeorm'; +import { Repository } from 'typeorm'; +import { + DOCUMENT_TYPE, + DocumentCode, +} from '../../../document/document-code.entity'; +import { + DOCUMENT_SOURCE, + DOCUMENT_SYSTEM, +} from '../../../document/document.dto'; +import { Document } from '../../../document/document.entity'; +import { DocumentService } from '../../../document/document.service'; +import { User } from '../../../user/user.entity'; +import { UserService } from '../../../user/user.service'; +import { Notification } from '../notification.entity'; +import { NotificationService } from '../notification.service'; +import { NotificationDocument } from './notification-document.entity'; +import { NotificationDocumentService } from './notification-document.service'; + +describe('NotificationDocumentService', () => { + let service: NotificationDocumentService; + let mockDocumentService: DeepMocked; + let mockNotificationService: DeepMocked; + let mockRepository: DeepMocked>; + let mockTypeRepository: DeepMocked>; + + let mockNotification; + const fileNumber = '12345'; + + beforeEach(async () => { + mockDocumentService = createMock(); + mockNotificationService = createMock(); + mockRepository = createMock(); + mockTypeRepository = createMock(); + + mockNotification = new Notification(); + mockNotificationService.getByFileNumber.mockResolvedValue(mockNotification); + mockDocumentService.create.mockResolvedValue({} as Document); + + const module: TestingModule = await Test.createTestingModule({ + providers: [ + NotificationDocumentService, + { + provide: DocumentService, + useValue: mockDocumentService, + }, + { + provide: NotificationService, + useValue: mockNotificationService, + }, + { + provide: getRepositoryToken(DocumentCode), + useValue: mockTypeRepository, + }, + { + provide: getRepositoryToken(NotificationDocument), + useValue: mockRepository, + }, + { + provide: UserService, + useValue: createMock(), + }, + ], + }).compile(); + + service = module.get( + NotificationDocumentService, + ); + }); + + it('should be defined', () => { + expect(service).toBeDefined(); + }); + + it('should create a document in the happy path', async () => { + const mockUser = new User(); + const mockFile = {}; + const mockSavedDocument = {}; + + mockRepository.save.mockResolvedValue( + mockSavedDocument as NotificationDocument, + ); + + const res = await service.attachDocument({ + fileNumber, + file: mockFile as MultipartFile, + user: mockUser, + documentType: DOCUMENT_TYPE.DECISION_DOCUMENT, + fileName: '', + source: DOCUMENT_SOURCE.APPLICANT, + system: DOCUMENT_SYSTEM.PORTAL, + visibilityFlags: [], + }); + + expect(mockNotificationService.getByFileNumber).toHaveBeenCalledTimes(1); + expect(mockDocumentService.create).toHaveBeenCalledTimes(1); + expect(mockDocumentService.create.mock.calls[0][0]).toBe( + 'notification/12345', + ); + expect(mockDocumentService.create.mock.calls[0][2]).toBe(mockFile); + expect(mockDocumentService.create.mock.calls[0][3]).toBe(mockUser); + + expect(mockRepository.save).toHaveBeenCalledTimes(1); + expect(mockRepository.save.mock.calls[0][0].notification).toBe( + mockNotification, + ); + + expect(res).toBe(mockSavedDocument); + }); + + it('should delete document and application document when deleting', async () => { + const mockDocument = {}; + const mockAppDocument = { + uuid: '1', + document: mockDocument, + } as NotificationDocument; + + mockDocumentService.softRemove.mockResolvedValue(); + mockRepository.remove.mockResolvedValue({} as any); + + await service.delete(mockAppDocument); + + expect(mockDocumentService.softRemove).toHaveBeenCalledTimes(1); + expect(mockDocumentService.softRemove.mock.calls[0][0]).toBe(mockDocument); + + expect(mockRepository.remove).toHaveBeenCalledTimes(1); + expect(mockRepository.remove.mock.calls[0][0]).toBe(mockAppDocument); + }); + + it('should call through for get', async () => { + const mockDocument = {}; + const mockAppDocument = { + uuid: '1', + document: mockDocument, + } as NotificationDocument; + + mockDocumentService.softRemove.mockResolvedValue(); + mockRepository.findOne.mockResolvedValue(mockAppDocument); + + const res = await service.get('fake-uuid'); + expect(res).toBe(mockAppDocument); + }); + + it("should throw an exception when getting a document that doesn't exist", async () => { + const mockDocument = {}; + const mockAppDocument = { + uuid: '1', + document: mockDocument, + } as NotificationDocument; + + mockDocumentService.softRemove.mockResolvedValue(); + mockRepository.findOne.mockResolvedValue(null); + + await expect(service.get(mockAppDocument.uuid)).rejects.toMatchObject( + new ServiceNotFoundException( + `Failed to find document ${mockAppDocument.uuid}`, + ), + ); + }); + + it('should call through for list', async () => { + const mockDocument = {}; + const mockAppDocument = { + uuid: '1', + document: mockDocument, + } as NotificationDocument; + mockRepository.find.mockResolvedValue([mockAppDocument]); + + const res = await service.list(fileNumber); + + expect(mockRepository.find).toHaveBeenCalledTimes(1); + expect(res[0]).toBe(mockAppDocument); + }); + + it('should call through for download', async () => { + const mockDocument = {}; + const mockAppDocument = { + uuid: '1', + document: mockDocument, + } as NotificationDocument; + + const fakeUrl = 'mock-url'; + mockDocumentService.getDownloadUrl.mockResolvedValue(fakeUrl); + + const res = await service.getInlineUrl(mockAppDocument); + + expect(mockDocumentService.getDownloadUrl).toHaveBeenCalledTimes(1); + expect(res).toEqual(fakeUrl); + }); + + it('should load all applicant sourced documents correctly', async () => { + const mockAppDocument = new NotificationDocument({ + uuid: '1', + document: new Document({ + source: DOCUMENT_SOURCE.APPLICANT, + }), + }); + const mockLgDocument = new NotificationDocument({ + uuid: '2', + document: new Document({ + source: DOCUMENT_SOURCE.LFNG, + }), + }); + + mockRepository.find.mockResolvedValue([mockAppDocument, mockLgDocument]); + + const res = await service.getApplicantDocuments('1'); + + expect(mockRepository.find).toHaveBeenCalledTimes(1); + expect(res.length).toEqual(1); + expect(res[0]).toBe(mockAppDocument); + }); + + it('should call delete for each document loaded', async () => { + const mockAppDocument = new NotificationDocument({ + uuid: '1', + document: new Document({ + source: DOCUMENT_SOURCE.APPLICANT, + }), + }); + const mockLgDocument = new NotificationDocument({ + uuid: '2', + document: new Document({ + source: DOCUMENT_SOURCE.LFNG, + }), + }); + + mockRepository.find.mockResolvedValue([mockAppDocument, mockLgDocument]); + mockDocumentService.softRemove.mockResolvedValue(); + mockRepository.remove.mockResolvedValue({} as any); + + const res = await service.deleteByType(DOCUMENT_TYPE.STAFF_REPORT, ''); + + expect(mockRepository.find).toHaveBeenCalledTimes(1); + expect(mockDocumentService.softRemove).toHaveBeenCalledTimes(2); + }); + + it('should call through for fetchTypes', async () => { + mockTypeRepository.find.mockResolvedValue([]); + + const res = await service.fetchTypes(); + + expect(mockTypeRepository.find).toHaveBeenCalledTimes(1); + expect(res).toBeDefined(); + }); + + it('should set the type and description for multiple files', async () => { + const mockDocument1 = new NotificationDocument({ + typeCode: DOCUMENT_TYPE.DECISION_DOCUMENT, + description: undefined, + }); + const mockDocument2 = new NotificationDocument({ + typeCode: DOCUMENT_TYPE.DECISION_DOCUMENT, + description: undefined, + }); + mockRepository.findOne + .mockResolvedValueOnce(mockDocument1) + .mockResolvedValueOnce(mockDocument2); + mockRepository.save.mockResolvedValue(new NotificationDocument()); + const mockUpdates = [ + { + uuid: '1', + type: DOCUMENT_TYPE.CERTIFICATE_OF_TITLE, + description: 'Secret Documents', + }, + { + uuid: '2', + type: DOCUMENT_TYPE.RESOLUTION_DOCUMENT, + description: 'New Description', + }, + ]; + + const res = await service.updateDescriptionAndType(mockUpdates, ''); + + expect(mockRepository.findOne).toHaveBeenCalledTimes(2); + expect(mockRepository.save).toHaveBeenCalledTimes(2); + expect(res).toBeDefined(); + expect(res.length).toEqual(2); + expect(mockDocument1.typeCode).toEqual(DOCUMENT_TYPE.CERTIFICATE_OF_TITLE); + expect(mockDocument1.description).toEqual('Secret Documents'); + expect(mockDocument2.typeCode).toEqual(DOCUMENT_TYPE.RESOLUTION_DOCUMENT); + expect(mockDocument2.description).toEqual('New Description'); + }); + + it('should create a record for external documents', async () => { + mockRepository.save.mockResolvedValue(new NotificationDocument()); + mockNotificationService.getUuid.mockResolvedValueOnce('app-uuid'); + mockRepository.findOne.mockResolvedValue(new NotificationDocument()); + + const res = await service.attachExternalDocument( + '', + { + type: DOCUMENT_TYPE.CERTIFICATE_OF_TITLE, + description: '', + documentUuid: 'fake-uuid', + }, + [], + ); + + expect(mockNotificationService.getUuid).toHaveBeenCalledTimes(1); + expect(mockRepository.save).toHaveBeenCalledTimes(1); + expect(mockRepository.save.mock.calls[0][0].notificationUuid).toEqual( + 'app-uuid', + ); + expect(mockRepository.save.mock.calls[0][0].typeCode).toEqual( + DOCUMENT_TYPE.CERTIFICATE_OF_TITLE, + ); + expect(mockRepository.findOne).toHaveBeenCalledTimes(1); + expect(res).toBeDefined(); + }); + + it('should delete the existing file and create a new when updating', async () => { + mockRepository.findOne.mockResolvedValue( + new NotificationDocument({ + document: new Document(), + }), + ); + mockNotificationService.getFileNumber.mockResolvedValue('app-uuid'); + mockRepository.save.mockResolvedValue(new NotificationDocument()); + mockDocumentService.create.mockResolvedValue(new Document()); + mockDocumentService.softRemove.mockResolvedValue(); + + const res = await service.update({ + source: DOCUMENT_SOURCE.APPLICANT, + fileName: 'fileName', + user: new User(), + file: {} as File, + uuid: '', + documentType: DOCUMENT_TYPE.DECISION_DOCUMENT, + visibilityFlags: [], + }); + + expect(mockRepository.findOne).toHaveBeenCalledTimes(1); + expect(mockNotificationService.getFileNumber).toHaveBeenCalledTimes(1); + expect(mockDocumentService.create).toHaveBeenCalledTimes(1); + expect(mockRepository.save).toHaveBeenCalledTimes(1); + }); +}); diff --git a/services/apps/alcs/src/alcs/notification/notification-document/notification-document.service.ts b/services/apps/alcs/src/alcs/notification/notification-document/notification-document.service.ts new file mode 100644 index 0000000000..fbca313a7a --- /dev/null +++ b/services/apps/alcs/src/alcs/notification/notification-document/notification-document.service.ts @@ -0,0 +1,305 @@ +import { MultipartFile } from '@fastify/multipart'; +import { + BadRequestException, + Injectable, + NotFoundException, +} from '@nestjs/common'; +import { InjectRepository } from '@nestjs/typeorm'; +import { + ArrayOverlap, + FindOptionsRelations, + FindOptionsWhere, + Repository, +} from 'typeorm'; +import { + DOCUMENT_TYPE, + DocumentCode, +} from '../../../document/document-code.entity'; +import { + DOCUMENT_SOURCE, + DOCUMENT_SYSTEM, +} from '../../../document/document.dto'; +import { DocumentService } from '../../../document/document.service'; +import { PortalNotificationDocumentUpdateDto } from '../../../portal/notification-document/notification-document.dto'; +import { User } from '../../../user/user.entity'; +import { NotificationService } from '../notification.service'; +import { + NotificationDocument, + VISIBILITY_FLAG, +} from './notification-document.entity'; + +@Injectable() +export class NotificationDocumentService { + private DEFAULT_RELATIONS: FindOptionsRelations = { + document: true, + type: true, + }; + + constructor( + private documentService: DocumentService, + private notificationService: NotificationService, + @InjectRepository(NotificationDocument) + private notificationDocumentRepository: Repository, + @InjectRepository(DocumentCode) + private documentCodeRepository: Repository, + ) {} + + async attachDocument({ + fileNumber, + fileName, + file, + documentType, + user, + system, + source = DOCUMENT_SOURCE.ALC, + visibilityFlags, + }: { + fileNumber: string; + fileName: string; + file: MultipartFile; + user: User; + documentType: DOCUMENT_TYPE; + source?: DOCUMENT_SOURCE; + system: DOCUMENT_SYSTEM; + visibilityFlags: VISIBILITY_FLAG[]; + }) { + const notification = await this.notificationService.getByFileNumber( + fileNumber, + ); + const document = await this.documentService.create( + `notification/${fileNumber}`, + fileName, + file, + user, + source, + system, + ); + const appDocument = new NotificationDocument({ + typeCode: documentType, + notification, + document, + visibilityFlags, + }); + + return this.notificationDocumentRepository.save(appDocument); + } + + async attachDocumentAsBuffer({ + fileNumber, + fileName, + file, + mimeType, + fileSize, + documentType, + user, + system, + source = DOCUMENT_SOURCE.ALC, + visibilityFlags, + }: { + fileNumber: string; + fileName: string; + file: Buffer; + mimeType: string; + fileSize: number; + user: User; + documentType: DOCUMENT_TYPE; + source?: DOCUMENT_SOURCE; + system: DOCUMENT_SYSTEM; + visibilityFlags: VISIBILITY_FLAG[]; + }) { + const notification = await this.notificationService.getByFileNumber( + fileNumber, + ); + const document = await this.documentService.createFromBuffer( + `notification/${fileNumber}`, + fileName, + file, + mimeType, + fileSize, + user, + source, + system, + ); + const appDocument = new NotificationDocument({ + typeCode: documentType, + notification, + document, + visibilityFlags, + }); + + return this.notificationDocumentRepository.save(appDocument); + } + + async get(uuid: string) { + const document = await this.notificationDocumentRepository.findOne({ + where: { + uuid: uuid, + }, + relations: this.DEFAULT_RELATIONS, + }); + if (!document) { + throw new NotFoundException(`Failed to find document ${uuid}`); + } + return document; + } + + async delete(document: NotificationDocument) { + await this.notificationDocumentRepository.remove(document); + await this.documentService.softRemove(document.document); + return document; + } + + async list(fileNumber: string, visibilityFlags?: VISIBILITY_FLAG[]) { + const where: FindOptionsWhere = { + notification: { + fileNumber, + }, + }; + if (visibilityFlags) { + where.visibilityFlags = ArrayOverlap(visibilityFlags); + } + return this.notificationDocumentRepository.find({ + where, + order: { + document: { + uploadedAt: 'DESC', + }, + }, + relations: this.DEFAULT_RELATIONS, + }); + } + + async getInlineUrl(document: NotificationDocument) { + return this.documentService.getDownloadUrl(document.document, true); + } + + async getDownloadUrl(document: NotificationDocument) { + return this.documentService.getDownloadUrl(document.document); + } + + async attachExternalDocument( + fileNumber: string, + data: { + type?: DOCUMENT_TYPE; + documentUuid: string; + description?: string; + }, + visibilityFlags: VISIBILITY_FLAG[], + ) { + const notificationUuid = await this.notificationService.getUuid(fileNumber); + const document = new NotificationDocument({ + notificationUuid, + typeCode: data.type, + documentUuid: data.documentUuid, + description: data.description, + visibilityFlags, + }); + + const savedDocument = await this.notificationDocumentRepository.save( + document, + ); + return this.get(savedDocument.uuid); + } + + async updateDescriptionAndType( + updates: PortalNotificationDocumentUpdateDto[], + notificationUuid: string, + ) { + const results: NotificationDocument[] = []; + for (const update of updates) { + const file = await this.notificationDocumentRepository.findOne({ + where: { + uuid: update.uuid, + notificationUuid, + }, + relations: { + document: true, + }, + }); + if (!file) { + throw new BadRequestException( + 'Failed to find file linked to provided notification', + ); + } + + file.typeCode = update.type; + file.description = update.description; + const updatedFile = await this.notificationDocumentRepository.save(file); + results.push(updatedFile); + } + return results; + } + + async deleteByType(documentType: DOCUMENT_TYPE, notificationUuid: string) { + const documents = await this.notificationDocumentRepository.find({ + where: { + notificationUuid, + typeCode: documentType, + }, + relations: { + document: true, + }, + }); + for (const document of documents) { + await this.documentService.softRemove(document.document); + await this.notificationDocumentRepository.remove(document); + } + + return; + } + + async getApplicantDocuments(fileNumber: string) { + const documents = await this.list(fileNumber); + return documents.filter( + (doc) => doc.document.source === DOCUMENT_SOURCE.APPLICANT, + ); + } + + async fetchTypes() { + return await this.documentCodeRepository.find(); + } + + async update({ + uuid, + documentType, + file, + fileName, + source, + visibilityFlags, + user, + }: { + uuid: string; + file?: any; + fileName: string; + documentType: DOCUMENT_TYPE; + visibilityFlags: VISIBILITY_FLAG[]; + source: DOCUMENT_SOURCE; + user: User; + }) { + const notificationDocument = await this.get(uuid); + + if (file) { + const fileNumber = await this.notificationService.getFileNumber( + notificationDocument.notificationUuid, + ); + await this.documentService.softRemove(notificationDocument.document); + notificationDocument.document = await this.documentService.create( + `notification/${fileNumber}`, + fileName, + file, + user, + source, + notificationDocument.document.system as DOCUMENT_SYSTEM, + ); + } else { + await this.documentService.update(notificationDocument.document, { + fileName, + source, + }); + } + notificationDocument.type = undefined; + notificationDocument.typeCode = documentType; + notificationDocument.visibilityFlags = visibilityFlags; + return await this.notificationDocumentRepository.save(notificationDocument); + } +} diff --git a/services/apps/alcs/src/alcs/notification/notification.entity.ts b/services/apps/alcs/src/alcs/notification/notification.entity.ts index c8ce3c0544..f594854341 100644 --- a/services/apps/alcs/src/alcs/notification/notification.entity.ts +++ b/services/apps/alcs/src/alcs/notification/notification.entity.ts @@ -6,12 +6,14 @@ import { Index, JoinColumn, ManyToOne, + OneToMany, OneToOne, } from 'typeorm'; import { Base } from '../../common/entities/base.entity'; import { Card } from '../card/card.entity'; import { ApplicationRegion } from '../code/application-code/application-region/application-region.entity'; import { LocalGovernment } from '../local-government/local-government.entity'; +import { NotificationDocument } from './notification-document/notification-document.entity'; import { NotificationType } from './notification-type/notification-type.entity'; @Entity() @@ -79,4 +81,8 @@ export class Notification extends Base { @Column() typeCode: string; + + @AutoMap() + @OneToMany(() => NotificationDocument, (document) => document.notification) + documents: NotificationDocument[]; } diff --git a/services/apps/alcs/src/alcs/notification/notification.module.ts b/services/apps/alcs/src/alcs/notification/notification.module.ts index 626e18522d..ee4d21c5e8 100644 --- a/services/apps/alcs/src/alcs/notification/notification.module.ts +++ b/services/apps/alcs/src/alcs/notification/notification.module.ts @@ -8,6 +8,9 @@ import { BoardModule } from '../board/board.module'; import { CardModule } from '../card/card.module'; import { CodeModule } from '../code/code.module'; import { LocalGovernmentModule } from '../local-government/local-government.module'; +import { NotificationDocumentController } from './notification-document/notification-document.controller'; +import { NotificationDocument } from './notification-document/notification-document.entity'; +import { NotificationDocumentService } from './notification-document/notification-document.service'; import { NotificationSubmissionStatusModule } from './notification-submission-status/notification-submission-status.module'; import { NotificationType } from './notification-type/notification-type.entity'; import { NotificationController } from './notification.controller'; @@ -16,7 +19,12 @@ import { Notification } from './notification.entity'; @Module({ imports: [ - TypeOrmModule.forFeature([Notification, NotificationType, DocumentCode]), + TypeOrmModule.forFeature([ + Notification, + NotificationType, + NotificationDocument, + DocumentCode, + ]), forwardRef(() => BoardModule), CardModule, FileNumberModule, @@ -25,8 +33,12 @@ import { Notification } from './notification.entity'; LocalGovernmentModule, NotificationSubmissionStatusModule, ], - providers: [NotificationService, NotificationProfile], - controllers: [NotificationController], - exports: [NotificationService], + providers: [ + NotificationService, + NotificationProfile, + NotificationDocumentService, + ], + controllers: [NotificationController, NotificationDocumentController], + exports: [NotificationService, NotificationDocumentService], }) export class NotificationModule {} diff --git a/services/apps/alcs/src/common/automapper/notification.automapper.profile.ts b/services/apps/alcs/src/common/automapper/notification.automapper.profile.ts index 9e5838daaa..b9bce4509a 100644 --- a/services/apps/alcs/src/common/automapper/notification.automapper.profile.ts +++ b/services/apps/alcs/src/common/automapper/notification.automapper.profile.ts @@ -1,12 +1,14 @@ import { createMap, forMember, mapFrom, Mapper } from '@automapper/core'; import { AutomapperProfile, InjectMapper } from '@automapper/nestjs'; import { Injectable } from '@nestjs/common'; +import { NotificationDocumentDto } from '../../alcs/notification/notification-document/notification-document.dto'; +import { NotificationDocument } from '../../alcs/notification/notification-document/notification-document.entity'; import { NotificationTypeDto } from '../../alcs/notification/notification-type/notification-type.dto'; import { NotificationType } from '../../alcs/notification/notification-type/notification-type.entity'; import { NotificationDto } from '../../alcs/notification/notification.dto'; +import { Notification } from '../../alcs/notification/notification.entity'; import { DocumentCode } from '../../document/document-code.entity'; import { DocumentTypeDto } from '../../document/document.dto'; -import { Notification } from '../../alcs/notification/notification.entity'; @Injectable() export class NotificationProfile extends AutomapperProfile { @@ -28,6 +30,43 @@ export class NotificationProfile extends AutomapperProfile { ), ); + createMap( + mapper, + NotificationDocument, + NotificationDocumentDto, + forMember( + (a) => a.mimeType, + mapFrom((ad) => ad.document.mimeType), + ), + forMember( + (a) => a.fileName, + mapFrom((ad) => ad.document.fileName), + ), + forMember( + (a) => a.fileSize, + mapFrom((ad) => ad.document.fileSize), + ), + forMember( + (a) => a.uploadedBy, + mapFrom((ad) => ad.document.uploadedBy?.name), + ), + forMember( + (a) => a.uploadedAt, + mapFrom((ad) => ad.document.uploadedAt.getTime()), + ), + forMember( + (a) => a.documentUuid, + mapFrom((ad) => ad.document.uuid), + ), + forMember( + (a) => a.source, + mapFrom((ad) => ad.document.source), + ), + forMember( + (a) => a.system, + mapFrom((ad) => ad.document.system), + ), + ); createMap(mapper, DocumentCode, DocumentTypeDto); }; } diff --git a/services/apps/alcs/src/portal/notification-document/notification-document.controller.spec.ts b/services/apps/alcs/src/portal/notification-document/notification-document.controller.spec.ts new file mode 100644 index 0000000000..6073fc54db --- /dev/null +++ b/services/apps/alcs/src/portal/notification-document/notification-document.controller.spec.ts @@ -0,0 +1,197 @@ +import { classes } from '@automapper/classes'; +import { AutomapperModule } from '@automapper/nestjs'; +import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; +import { Test, TestingModule } from '@nestjs/testing'; +import { ClsService } from 'nestjs-cls'; +import { mockKeyCloakProviders } from '../../../test/mocks/mockTypes'; +import { NotificationDocument } from '../../alcs/notification/notification-document/notification-document.entity'; +import { NotificationDocumentService } from '../../alcs/notification/notification-document/notification-document.service'; +import { NotificationService } from '../../alcs/notification/notification.service'; +import { NotificationProfile } from '../../common/automapper/notification.automapper.profile'; +import { DocumentCode } from '../../document/document-code.entity'; +import { DOCUMENT_SOURCE, DOCUMENT_SYSTEM } from '../../document/document.dto'; +import { Document } from '../../document/document.entity'; +import { DocumentService } from '../../document/document.service'; +import { User } from '../../user/user.entity'; +import { NotificationSubmission } from '../notification-submission/notification-submission.entity'; +import { NotificationSubmissionService } from '../notification-submission/notification-submission.service'; +import { NotificationDocumentController } from './notification-document.controller'; +import { AttachExternalDocumentDto } from './notification-document.dto'; + +describe('NotificationDocumentController', () => { + let controller: NotificationDocumentController; + let mockNotificationDocumentService: DeepMocked; + let mockNotificationSubmissionService: DeepMocked; + let mockDocumentService: DeepMocked; + let mockNotificationService: DeepMocked; + + const mockDocument = new NotificationDocument({ + document: new Document({ + fileName: 'fileName', + uploadedAt: new Date(), + uploadedBy: new User(), + }), + }); + + beforeEach(async () => { + mockNotificationDocumentService = createMock(); + mockDocumentService = createMock(); + mockNotificationSubmissionService = createMock(); + mockNotificationService = createMock(); + + const module: TestingModule = await Test.createTestingModule({ + imports: [ + AutomapperModule.forRoot({ + strategyInitializer: classes(), + }), + ], + controllers: [NotificationDocumentController], + providers: [ + NotificationProfile, + { + provide: NotificationDocumentService, + useValue: mockNotificationDocumentService, + }, + { + provide: ClsService, + useValue: {}, + }, + { + provide: NotificationSubmissionService, + useValue: mockNotificationSubmissionService, + }, + { + provide: DocumentService, + useValue: mockDocumentService, + }, + { + provide: NotificationService, + useValue: mockNotificationService, + }, + ...mockKeyCloakProviders, + ], + }).compile(); + controller = module.get( + NotificationDocumentController, + ); + + mockNotificationSubmissionService.getByFileNumber.mockResolvedValue( + new NotificationSubmission(), + ); + mockNotificationService.getUuid.mockResolvedValue('uuid'); + }); + + it('should be defined', () => { + expect(controller).toBeDefined(); + }); + + it('should call through to delete documents', async () => { + mockNotificationDocumentService.delete.mockResolvedValue(mockDocument); + mockNotificationDocumentService.get.mockResolvedValue(mockDocument); + + await controller.delete('fake-uuid', { + user: { + entity: {}, + }, + }); + + expect(mockNotificationDocumentService.get).toHaveBeenCalledTimes(1); + expect(mockNotificationDocumentService.delete).toHaveBeenCalledTimes(1); + }); + + it('should call through to update documents', async () => { + mockNotificationDocumentService.updateDescriptionAndType.mockResolvedValue( + [], + ); + + await controller.update( + 'file-number', + { + user: { + entity: {}, + }, + }, + [], + ); + + expect( + mockNotificationDocumentService.updateDescriptionAndType, + ).toHaveBeenCalledTimes(1); + }); + + it('should call through for open', async () => { + const fakeUrl = 'fake-url'; + mockNotificationDocumentService.getInlineUrl.mockResolvedValue(fakeUrl); + mockNotificationDocumentService.get.mockResolvedValue(mockDocument); + + const res = await controller.open('fake-uuid', { + user: { + entity: {}, + }, + }); + + expect(res.url).toEqual(fakeUrl); + }); + + it('should call through for download', async () => { + const fakeUrl = 'fake-url'; + mockNotificationDocumentService.getDownloadUrl.mockResolvedValue(fakeUrl); + mockNotificationDocumentService.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'; + const docObj = new Document({ uuid: 'fake-uuid' }); + const userEntity = new User({ + name: user.user.entity, + }); + + const docDto: AttachExternalDocumentDto = { + fileSize: 0, + mimeType: 'mimeType', + fileName: 'fileName', + fileKey: 'fileKey', + source: DOCUMENT_SOURCE.APPLICANT, + }; + + mockDocumentService.createDocumentRecord.mockResolvedValue(docObj); + + mockNotificationDocumentService.attachExternalDocument.mockResolvedValue( + new NotificationDocument({ + notification: undefined, + type: new DocumentCode(), + uuid: fakeUuid, + document: new Document({ + uploadedAt: new Date(), + uploadedBy: userEntity, + }), + }), + ); + + const res = await controller.attachExternalDocument( + 'fake-number', + docDto, + user, + ); + + expect(mockDocumentService.createDocumentRecord).toBeCalledTimes(1); + expect( + mockNotificationDocumentService.attachExternalDocument, + ).toBeCalledTimes(1); + expect(mockDocumentService.createDocumentRecord).toBeCalledWith({ + ...docDto, + system: DOCUMENT_SYSTEM.PORTAL, + }); + expect(res.uploadedBy).toEqual(user.user.entity); + expect(res.uuid).toEqual(fakeUuid); + }); +}); diff --git a/services/apps/alcs/src/portal/notification-document/notification-document.controller.ts b/services/apps/alcs/src/portal/notification-document/notification-document.controller.ts new file mode 100644 index 0000000000..cfe6e67121 --- /dev/null +++ b/services/apps/alcs/src/portal/notification-document/notification-document.controller.ts @@ -0,0 +1,172 @@ +import { Mapper } from '@automapper/core'; +import { InjectMapper } from '@automapper/nestjs'; +import { + Body, + Controller, + Delete, + Get, + Param, + Patch, + Post, + Req, + UseGuards, +} from '@nestjs/common'; +import { ApiOAuth2 } from '@nestjs/swagger'; +import * as config from 'config'; +import { NotificationDocumentDto } from '../../alcs/notification/notification-document/notification-document.dto'; +import { + NotificationDocument, + VISIBILITY_FLAG, +} from '../../alcs/notification/notification-document/notification-document.entity'; +import { NotificationDocumentService } from '../../alcs/notification/notification-document/notification-document.service'; +import { NotificationService } from '../../alcs/notification/notification.service'; +import { PortalAuthGuard } from '../../common/authorization/portal-auth-guard.service'; +import { DOCUMENT_TYPE } from '../../document/document-code.entity'; +import { DOCUMENT_SYSTEM } from '../../document/document.dto'; +import { DocumentService } from '../../document/document.service'; +import { NotificationSubmissionService } from '../notification-submission/notification-submission.service'; +import { + AttachExternalDocumentDto, + PortalNotificationDocumentUpdateDto, +} from './notification-document.dto'; + +@ApiOAuth2(config.get('KEYCLOAK.SCOPES')) +@UseGuards(PortalAuthGuard) +@Controller('notification-document') +export class NotificationDocumentController { + constructor( + private notificationDocumentService: NotificationDocumentService, + private notificationSubmissionService: NotificationSubmissionService, + private notificationService: NotificationService, + private documentService: DocumentService, + @InjectMapper() private mapper: Mapper, + ) {} + + @Get('/notification/:fileNumber') + async listApplicantDocuments( + @Param('fileNumber') fileNumber: string, + @Param('documentType') documentType: DOCUMENT_TYPE | null, + @Req() req, + ): Promise { + await this.notificationSubmissionService.getByFileNumber( + fileNumber, + req.user.entity, + ); + + const documents = await this.notificationDocumentService.list(fileNumber, [ + VISIBILITY_FLAG.APPLICANT, + ]); + return this.mapPortalDocuments(documents); + } + + @Get('/:uuid/open') + async open(@Param('uuid') fileUuid: string, @Req() req) { + const document = await this.notificationDocumentService.get(fileUuid); + + //TODO: How do we know which documents applicant can access? + // await this.notificationSubmissionService.verifyAccess( + // document.applicationUuid, + // req.user.entity, + // ); + + const url = await this.notificationDocumentService.getInlineUrl(document); + return { url }; + } + + @Get('/:uuid/download') + async download(@Param('uuid') fileUuid: string, @Req() req) { + const document = await this.notificationDocumentService.get(fileUuid); + + //TODO: How do we know which documents applicant can access? + // await this.notificationSubmissionService.verifyAccess( + // document.applicationUuid, + // req.user.entity, + // ); + + const url = await this.notificationDocumentService.getDownloadUrl(document); + return { url }; + } + + @Patch('/notification/:fileNumber') + async update( + @Param('fileNumber') fileNumber: string, + @Req() req, + @Body() body: PortalNotificationDocumentUpdateDto[], + ) { + await this.notificationSubmissionService.getByFileNumber( + fileNumber, + req.user.entity, + ); + + //Map from file number to uuid + const notificationUuid = await this.notificationService.getUuid(fileNumber); + + const res = await this.notificationDocumentService.updateDescriptionAndType( + body, + notificationUuid, + ); + return this.mapPortalDocuments(res); + } + + @Delete('/:uuid') + async delete(@Param('uuid') fileUuid: string, @Req() req) { + const document = await this.notificationDocumentService.get(fileUuid); + + //TODO: How do we know which documents applicant can delete? + // await this.notificationSubmissionService.verifyAccess( + // document.applicationUuid, + // req.user.entity, + // ); + + await this.notificationDocumentService.delete(document); + return {}; + } + + @Post('/notification/:uuid/attachExternal') + async attachExternalDocument( + @Param('uuid') fileNumber: string, + @Body() data: AttachExternalDocumentDto, + @Req() req, + ): Promise { + const submission = await this.notificationSubmissionService.getByFileNumber( + fileNumber, + req.user.entity, + ); + + const document = await this.documentService.createDocumentRecord({ + ...data, + system: DOCUMENT_SYSTEM.PORTAL, + }); + + const savedDocument = + await this.notificationDocumentService.attachExternalDocument( + submission.fileNumber, + { + documentUuid: document.uuid, + type: data.documentType, + }, + [ + VISIBILITY_FLAG.APPLICANT, + VISIBILITY_FLAG.GOVERNMENT, + VISIBILITY_FLAG.COMMISSIONER, + ], + ); + + const mappedDocs = this.mapPortalDocuments([savedDocument]); + return mappedDocs[0]; + } + + private mapPortalDocuments(documents: NotificationDocument[]) { + const labeledDocuments = documents.map((document) => { + if (document.type?.portalLabel) { + document.type.label = document.type.portalLabel; + } + return document; + }); + return this.mapper.mapArray( + labeledDocuments, + NotificationDocument, + NotificationDocumentDto, + ); + } +} diff --git a/services/apps/alcs/src/portal/notification-document/notification-document.dto.ts b/services/apps/alcs/src/portal/notification-document/notification-document.dto.ts new file mode 100644 index 0000000000..d377534e57 --- /dev/null +++ b/services/apps/alcs/src/portal/notification-document/notification-document.dto.ts @@ -0,0 +1,30 @@ +import { IsNumber, IsOptional, IsString } from 'class-validator'; +import { DOCUMENT_TYPE } from '../../document/document-code.entity'; +import { DOCUMENT_SOURCE } from '../../document/document.dto'; + +export class AttachExternalDocumentDto { + @IsString() + mimeType: string; + + @IsString() + fileName: string; + + @IsNumber() + fileSize: number; + + @IsString() + fileKey: string; + + @IsString() + source: DOCUMENT_SOURCE.APPLICANT; + + @IsString() + @IsOptional() + documentType?: DOCUMENT_TYPE; +} + +export class PortalNotificationDocumentUpdateDto { + uuid: string; + type: DOCUMENT_TYPE | null; + description: string | null; +} diff --git a/services/apps/alcs/src/portal/notification-document/notification-document.module.ts b/services/apps/alcs/src/portal/notification-document/notification-document.module.ts new file mode 100644 index 0000000000..fb544d8268 --- /dev/null +++ b/services/apps/alcs/src/portal/notification-document/notification-document.module.ts @@ -0,0 +1,13 @@ +import { Module } from '@nestjs/common'; +import { NotificationModule } from '../../alcs/notification/notification.module'; +import { DocumentModule } from '../../document/document.module'; +import { NotificationSubmissionModule } from '../notification-submission/notification-submission.module'; +import { NotificationDocumentController } from './notification-document.controller'; + +@Module({ + imports: [DocumentModule, NotificationModule, NotificationSubmissionModule], + controllers: [NotificationDocumentController], + providers: [], + exports: [], +}) +export class PortalNotificationDocumentModule {} diff --git a/services/apps/alcs/src/portal/notification-submission/notification-submission.controller.spec.ts b/services/apps/alcs/src/portal/notification-submission/notification-submission.controller.spec.ts index 1735fe4aae..73f24fdeac 100644 --- a/services/apps/alcs/src/portal/notification-submission/notification-submission.controller.spec.ts +++ b/services/apps/alcs/src/portal/notification-submission/notification-submission.controller.spec.ts @@ -8,9 +8,9 @@ import { mockKeyCloakProviders } from '../../../test/mocks/mockTypes'; import { LocalGovernment } from '../../alcs/local-government/local-government.entity'; import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; import { NoticeOfIntentDocumentService } from '../../alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.service'; -import { NoticeOfIntent } from '../../alcs/notice-of-intent/notice-of-intent.entity'; import { NOTIFICATION_STATUS } from '../../alcs/notification/notification-submission-status/notification-status.dto'; import { NotificationSubmissionToSubmissionStatus } from '../../alcs/notification/notification-submission-status/notification-status.entity'; +import { Notification } from '../../alcs/notification/notification.entity'; import { NotificationSubmissionProfile } from '../../common/automapper/notification-submission.automapper.profile'; import { EmailService } from '../../providers/email/email.service'; import { User } from '../../user/user.entity'; @@ -267,7 +267,7 @@ describe('NotificationSubmissionController', () => { }); mockNotificationSubmissionService.submitToAlcs.mockResolvedValue( - new NoticeOfIntent(), + new Notification(), ); mockNotificationSubmissionService.getByUuid.mockResolvedValue( mockSubmission, diff --git a/services/apps/alcs/src/portal/portal.module.ts b/services/apps/alcs/src/portal/portal.module.ts index 89269be6d1..f7b1ebb88a 100644 --- a/services/apps/alcs/src/portal/portal.module.ts +++ b/services/apps/alcs/src/portal/portal.module.ts @@ -16,6 +16,7 @@ import { PortalNoticeOfIntentDecisionModule } from './notice-of-intent-decision/ import { PortalNoticeOfIntentDocumentModule } from './notice-of-intent-document/notice-of-intent-document.module'; import { NoticeOfIntentSubmissionDraftModule } from './notice-of-intent-submission-draft/notice-of-intent-submission-draft.module'; import { NoticeOfIntentSubmissionModule } from './notice-of-intent-submission/notice-of-intent-submission.module'; +import { PortalNotificationDocumentModule } from './notification-document/notification-document.module'; import { ParcelModule } from './parcel/parcel.module'; import { PdfGenerationModule } from './pdf-generation/pdf-generation.module'; import { NotificationSubmissionModule } from './notification-submission/notification-submission.module'; @@ -40,6 +41,7 @@ import { NotificationSubmissionModule } from './notification-submission/notifica NoticeOfIntentSubmissionDraftModule, PortalNoticeOfIntentDecisionModule, NotificationSubmissionModule, + PortalNotificationDocumentModule, RouterModule.register([ { path: 'portal', module: ApplicationSubmissionModule }, { path: 'portal', module: NoticeOfIntentSubmissionModule }, @@ -54,6 +56,7 @@ import { NotificationSubmissionModule } from './notification-submission/notifica { path: 'portal', module: NoticeOfIntentSubmissionDraftModule }, { path: 'portal', module: PortalNoticeOfIntentDecisionModule }, { path: 'portal', module: NotificationSubmissionModule }, + { path: 'portal', module: PortalNotificationDocumentModule }, ]), ], controllers: [CodeController], diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1694037493007-add_notification_documents.ts b/services/apps/alcs/src/providers/typeorm/migrations/1694037493007-add_notification_documents.ts new file mode 100644 index 0000000000..9e80077254 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1694037493007-add_notification_documents.ts @@ -0,0 +1,35 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class addNotificationDocuments1694037493007 + implements MigrationInterface +{ + name = 'addNotificationDocuments1694037493007'; + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `CREATE TABLE "alcs"."notification_document" ("uuid" uuid NOT NULL DEFAULT gen_random_uuid(), "type_code" text, "description" text, "notification_uuid" uuid NOT NULL, "document_uuid" uuid, "visibility_flags" text array NOT NULL DEFAULT '{}', "audit_created_by" text, CONSTRAINT "REL_754c65b2ab78e39c64c31f2f9f" UNIQUE ("document_uuid"), CONSTRAINT "PK_cb4155e1f9d5b5ebd27c8de6381" PRIMARY KEY ("uuid")); COMMENT ON COLUMN "alcs"."notification_document"."audit_created_by" IS 'used only for oats etl process'`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notification_document" ADD CONSTRAINT "FK_dc6a7789a73ec2e0eac2b2307d3" FOREIGN KEY ("type_code") REFERENCES "alcs"."document_code"("code") ON DELETE NO ACTION ON UPDATE NO ACTION`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notification_document" ADD CONSTRAINT "FK_fdb3697b2dfc6ee1e72e85b01e2" FOREIGN KEY ("notification_uuid") REFERENCES "alcs"."notification"("uuid") ON DELETE NO ACTION ON UPDATE NO ACTION`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notification_document" ADD CONSTRAINT "FK_754c65b2ab78e39c64c31f2f9f9" FOREIGN KEY ("document_uuid") REFERENCES "alcs"."document"("uuid") ON DELETE NO ACTION ON UPDATE NO ACTION`, + ); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `ALTER TABLE "alcs"."notification_document" DROP CONSTRAINT "FK_754c65b2ab78e39c64c31f2f9f9"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notification_document" DROP CONSTRAINT "FK_fdb3697b2dfc6ee1e72e85b01e2"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notification_document" DROP CONSTRAINT "FK_dc6a7789a73ec2e0eac2b2307d3"`, + ); + await queryRunner.query(`DROP TABLE "alcs"."notification_document"`); + } +} From a70a4da33338ea17060bc78e121a9bb8d3797476 Mon Sep 17 00:00:00 2001 From: Liam Stoddard Date: Wed, 6 Sep 2023 17:22:18 -0700 Subject: [PATCH 354/954] added enum --- .../submissions/submap/soil_elements.py | 23 +++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/bin/migrate-oats-data/submissions/submap/soil_elements.py b/bin/migrate-oats-data/submissions/submap/soil_elements.py index 0e7ed81ae8..1fab172e06 100644 --- a/bin/migrate-oats-data/submissions/submap/soil_elements.py +++ b/bin/migrate-oats-data/submissions/submap/soil_elements.py @@ -1,3 +1,4 @@ +from enum import Enum def get_soil_rows(rows, cursor): # fetches adjacent land use data, specifically direction, description and type code component_ids = [dict(item)["alr_appl_component_id"] for item in rows] @@ -12,6 +13,10 @@ def get_soil_rows(rows, cursor): def create_soil_dict(soil_rows): # creates dict contailing fill and remove data + + class SoilAction(Enum): + RMV = 'REMOVE' + ADD = 'ADD' alr_id = 'alr_appl_component_id' area = 'project_area' desc = 'material_desc' @@ -26,9 +31,9 @@ def create_soil_dict(soil_rows): app_component_id = row[alr_id] if app_component_id in soil_dict: - if row[code] == 'REMOVE': + if row[code] == SoilAction.RMV.value: if 'RMV' in soil_dict.get(app_component_id, {}): - print('ignored element_id:',row['soil_change_element_id']) + print('ignored element_id:',row['soil_change_element_id']) else: soil_dict[app_component_id]['remove_type'] = row[desc] soil_dict[app_component_id]['remove_origin'] = row[origin_desc] @@ -39,10 +44,10 @@ def create_soil_dict(soil_rows): if 'import_fill' not in soil_dict.get(app_component_id, {}): soil_dict[app_component_id]['import_fill'] = False - soil_dict[app_component_id]['RMV'] = True + soil_dict[app_component_id][SoilAction.RMV.name] = True - elif row[code] == 'ADD': + elif row[code] == SoilAction.ADD.value: if 'ADD' in soil_dict.get(app_component_id, {}): print('ignored element_id:',row['soil_change_element_id']) else: @@ -54,25 +59,25 @@ def create_soil_dict(soil_rows): soil_dict[app_component_id]['fill_area'] = row[area] soil_dict[app_component_id]['import_fill'] = True - soil_dict[app_component_id]['ADD'] = True + soil_dict[app_component_id][SoilAction.ADD.name] = True else: print('unknown soil action') else: soil_dict[app_component_id] = {} soil_dict[app_component_id][alr_id] = row[alr_id] - if row[code] == 'REMOVE': + if row[code] == SoilAction.RMV.value: soil_dict[app_component_id]['remove_type'] = row[desc] soil_dict[app_component_id]['remove_origin'] = row[origin_desc] soil_dict[app_component_id]['max_remove_depth'] = row[depth] soil_dict[app_component_id]['total_remove'] = row[volume] soil_dict[app_component_id]['remove_duration'] = row[duration] soil_dict[app_component_id]['remove_area'] = row[area] - soil_dict[app_component_id]['RMV'] = True + soil_dict[app_component_id][SoilAction.RMV.name] = True soil_dict[app_component_id]['import_fill'] = False - elif row[code] == 'ADD': + elif row[code] == SoilAction.ADD.value: soil_dict[app_component_id]['fill_type'] = row[desc] soil_dict[app_component_id]['fill_origin'] = row[origin_desc] soil_dict[app_component_id]['total_fill'] = row[volume] @@ -80,7 +85,7 @@ def create_soil_dict(soil_rows): soil_dict[app_component_id]['fill_duration'] = row[duration] soil_dict[app_component_id]['fill_area'] = row[area] soil_dict[app_component_id]['import_fill'] = True - soil_dict[app_component_id]['ADD'] = True + soil_dict[app_component_id][SoilAction.ADD.name] = True else: print('unknown soil action') From c52570a27a4c9b708636b553631a3bdf813d58c9 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Thu, 7 Sep 2023 10:16:52 -0700 Subject: [PATCH 355/954] Add Proposal Step for Notifications * Add new file specific fields for Survey Plans * Add new fields * Add table comments for Notification Tables --- .../edit-submission.component.html | 11 +- .../edit-submission.component.ts | 5 + .../edit-submission/edit-submission.module.ts | 2 + .../edit-submission/files-step.partial.ts | 4 +- .../proposal/proposal.component.html | 222 ++++++++++++++++++ .../proposal/proposal.component.scss | 5 + .../proposal/proposal.component.spec.ts | 61 +++++ .../proposal/proposal.component.ts | 150 ++++++++++++ .../notification-document.dto.ts | 6 +- .../notification-submission.dto.ts | 6 + .../src/app/shared/dto/document.dto.ts | 4 + .../notification-document.dto.ts | 8 +- .../notification-document.entity.ts | 6 + .../notification-document.service.ts | 2 + .../alcs/src/document/document-code.entity.ts | 2 + .../notification-document.dto.ts | 22 +- .../notification-submission.dto.ts | 30 ++- .../notification-submission.entity.ts | 23 ++ .../notification-submission.service.ts | 13 + ...857-add_plans_to_notification_documents.ts | 25 ++ ...94044003667-add_notification_srw_fields.ts | 34 +++ ...6690840-add_notification_table_comments.ts | 33 +++ 22 files changed, 666 insertions(+), 8 deletions(-) create mode 100644 portal-frontend/src/app/features/notifications/edit-submission/proposal/proposal.component.html create mode 100644 portal-frontend/src/app/features/notifications/edit-submission/proposal/proposal.component.scss create mode 100644 portal-frontend/src/app/features/notifications/edit-submission/proposal/proposal.component.spec.ts create mode 100644 portal-frontend/src/app/features/notifications/edit-submission/proposal/proposal.component.ts create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1694042348857-add_plans_to_notification_documents.ts create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1694044003667-add_notification_srw_fields.ts create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1694106690840-add_notification_table_comments.ts diff --git a/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.component.html b/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.component.html index 6e94936da9..8cd539d7f5 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.component.html +++ b/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.component.html @@ -73,7 +73,16 @@
-
+
+ + +
diff --git a/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.component.ts b/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.component.ts index 695ab88ad4..2897bc6620 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.component.ts +++ b/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.component.ts @@ -18,6 +18,7 @@ import { scrollToElement } from '../../../shared/utils/scroll-helper'; import { OtherAttachmentsComponent } from './other-attachments/other-attachments.component'; import { ParcelDetailsComponent } from './parcels/parcel-details.component'; import { PrimaryContactComponent } from './primary-contact/primary-contact.component'; +import { ProposalComponent } from './proposal/proposal.component'; import { SelectGovernmentComponent } from './select-government/select-government.component'; export enum EditNotificationSteps { @@ -51,6 +52,7 @@ export class EditSubmissionComponent implements OnDestroy, AfterViewInit { @ViewChild(ParcelDetailsComponent) parcelDetailsComponent!: ParcelDetailsComponent; @ViewChild(PrimaryContactComponent) primaryContactComponent!: PrimaryContactComponent; @ViewChild(SelectGovernmentComponent) selectGovernmentComponent!: SelectGovernmentComponent; + @ViewChild(ProposalComponent) proposalComponent!: ProposalComponent; @ViewChild(OtherAttachmentsComponent) otherAttachmentsComponent!: OtherAttachmentsComponent; constructor( @@ -154,6 +156,9 @@ export class EditSubmissionComponent implements OnDestroy, AfterViewInit { } break; case EditNotificationSteps.Proposal: + if (this.proposalComponent) { + await this.proposalComponent.onSave(); + } break; case EditNotificationSteps.Attachments: if (this.otherAttachmentsComponent) { diff --git a/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.module.ts b/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.module.ts index 08d1f751b4..691f4d8558 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.module.ts +++ b/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.module.ts @@ -14,6 +14,7 @@ import { ParcelDetailsComponent } from './parcels/parcel-details.component'; import { ParcelEntryConfirmationDialogComponent } from './parcels/parcel-entry/parcel-entry-confirmation-dialog/parcel-entry-confirmation-dialog.component'; import { ParcelEntryComponent } from './parcels/parcel-entry/parcel-entry.component'; import { PrimaryContactComponent } from './primary-contact/primary-contact.component'; +import { ProposalComponent } from './proposal/proposal.component'; import { SelectGovernmentComponent } from './select-government/select-government.component'; import { StepComponent } from './step.partial'; import { TransfereeDialogComponent } from './transferees/transferee-dialog/transferee-dialog.component'; @@ -43,6 +44,7 @@ const routes: Routes = [ TransfereeDialogComponent, PrimaryContactComponent, SelectGovernmentComponent, + ProposalComponent, OtherAttachmentsComponent, ], imports: [ diff --git a/portal-frontend/src/app/features/notifications/edit-submission/files-step.partial.ts b/portal-frontend/src/app/features/notifications/edit-submission/files-step.partial.ts index 152f173c0a..94ec045c94 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/files-step.partial.ts +++ b/portal-frontend/src/app/features/notifications/edit-submission/files-step.partial.ts @@ -1,6 +1,7 @@ import { Component, Input } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; import { BehaviorSubject } from 'rxjs'; +import { ApplicationDocumentDto } from '../../../services/application-document/application-document.dto'; import { NotificationDocumentDto } from '../../../services/notification-document/notification-document.dto'; import { NotificationDocumentService } from '../../../services/notification-document/notification-document.service'; import { DOCUMENT_TYPE } from '../../../shared/dto/document.dto'; @@ -40,7 +41,8 @@ export abstract class FilesStepComponent extends StepComponent { } } - async onDeleteFile($event: NotificationDocumentDto) { + //Using ApplicationDocumentDto is "correct" here, quack quack + async onDeleteFile($event: ApplicationDocumentDto) { await this.notificationDocumentService.deleteExternalFile($event.uuid); if (this.fileId) { const documents = await this.notificationDocumentService.getByFileId(this.fileId); diff --git a/portal-frontend/src/app/features/notifications/edit-submission/proposal/proposal.component.html b/portal-frontend/src/app/features/notifications/edit-submission/proposal/proposal.component.html new file mode 100644 index 0000000000..f4af76c4cf --- /dev/null +++ b/portal-frontend/src/app/features/notifications/edit-submission/proposal/proposal.component.html @@ -0,0 +1,222 @@ +
+

Purpose of SRW

+

All fields are required unless stated optional.

+
+ + The information entered below will be reflected in the automatically generated notification response and must match + the finalized SRW documents that you will submit to the Land Title Survey Authority + +
+
+
+ +
+ + + + +
+ warning +
This field is required
+
+
+
+
+ +
+ Include why you are placing a SRW and what the SRW will achieve. Include any other associated encumbrances, uses + or ancillary rights over the parcel(s) (e.g. for access through the parcel(s) to get to and from the SRW area). +
+ + + +
+ warning +
This field is required
+
+
Characters left: {{ 4000 - purposeText.textLength }}
+
+ +
+ +
Provide in hectares. If SRW is for the whole parcel, indicate total parcel area
+ + + ha + +
+ warning +
This field is required
+
+
+ +
+ +
The signed and finalized terms that are to be included in the SRW package to LTSA
+ +
+ +
+ +
+ + Yes + + No + + +
+
+ +
+ + +
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
File Name + {{ element.fileName }} + Survey Plan Number + + + +
+ warning +
+ This field is required +
+
+ 		Control Number + + + +
+ warning +
+ This field is required +
+
+ 		Action + +
No attachments
+
+
+
+ +
+ + +
+
diff --git a/portal-frontend/src/app/features/notifications/edit-submission/proposal/proposal.component.scss b/portal-frontend/src/app/features/notifications/edit-submission/proposal/proposal.component.scss new file mode 100644 index 0000000000..8223c57759 --- /dev/null +++ b/portal-frontend/src/app/features/notifications/edit-submission/proposal/proposal.component.scss @@ -0,0 +1,5 @@ +@use '../../../../../styles/functions' as *; + +section { + margin-top: rem(36); +} diff --git a/portal-frontend/src/app/features/notifications/edit-submission/proposal/proposal.component.spec.ts b/portal-frontend/src/app/features/notifications/edit-submission/proposal/proposal.component.spec.ts new file mode 100644 index 0000000000..21276e7013 --- /dev/null +++ b/portal-frontend/src/app/features/notifications/edit-submission/proposal/proposal.component.spec.ts @@ -0,0 +1,61 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { MatDialog } from '@angular/material/dialog'; +import { Router } from '@angular/router'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { BehaviorSubject } from 'rxjs'; +import { NotificationDocumentDto } from '../../../../services/notification-document/notification-document.dto'; +import { NotificationDocumentService } from '../../../../services/notification-document/notification-document.service'; +import { NotificationSubmissionDetailedDto } from '../../../../services/notification-submission/notification-submission.dto'; +import { NotificationSubmissionService } from '../../../../services/notification-submission/notification-submission.service'; + +import { ProposalComponent } from './proposal.component'; + +describe('ProposalComponent', () => { + let component: ProposalComponent; + let fixture: ComponentFixture; + let mockNotificationSubmissionService: DeepMocked; + let mockNotificationDocumentService: DeepMocked; + let mockRouter: DeepMocked; + + let documentPipe = new BehaviorSubject([]); + + beforeEach(async () => { + mockNotificationSubmissionService = createMock(); + mockRouter = createMock(); + mockNotificationDocumentService = createMock(); + + await TestBed.configureTestingModule({ + providers: [ + { + provide: NotificationSubmissionService, + useValue: mockNotificationSubmissionService, + }, + { + provide: Router, + useValue: mockRouter, + }, + { + provide: NotificationDocumentService, + useValue: mockNotificationDocumentService, + }, + { + provide: MatDialog, + useValue: {}, + }, + ], + declarations: [ProposalComponent], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(ProposalComponent); + component = fixture.componentInstance; + component.$notificationSubmission = new BehaviorSubject(undefined); + component.$notificationDocuments = documentPipe; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/notifications/edit-submission/proposal/proposal.component.ts b/portal-frontend/src/app/features/notifications/edit-submission/proposal/proposal.component.ts new file mode 100644 index 0000000000..68f2feb014 --- /dev/null +++ b/portal-frontend/src/app/features/notifications/edit-submission/proposal/proposal.component.ts @@ -0,0 +1,150 @@ +import { Component, OnDestroy, OnInit } from '@angular/core'; +import { FormControl, FormGroup, Validators } from '@angular/forms'; +import { MatDialog } from '@angular/material/dialog'; +import { Router } from '@angular/router'; +import { takeUntil } from 'rxjs'; +import { + NotificationDocumentDto, + NotificationDocumentUpdateDto, +} from '../../../../services/notification-document/notification-document.dto'; +import { NotificationDocumentService } from '../../../../services/notification-document/notification-document.service'; +import { NotificationSubmissionUpdateDto } from '../../../../services/notification-submission/notification-submission.dto'; +import { NotificationSubmissionService } from '../../../../services/notification-submission/notification-submission.service'; +import { DOCUMENT_TYPE } from '../../../../shared/dto/document.dto'; +import { formatBooleanToString } from '../../../../shared/utils/boolean-helper'; +import { parseStringToBoolean } from '../../../../shared/utils/string-helper'; +import { EditNotificationSteps } from '../edit-submission.component'; +import { FilesStepComponent } from '../files-step.partial'; + +@Component({ + selector: 'app-proposal', + templateUrl: './proposal.component.html', + styleUrls: ['./proposal.component.scss'], +}) +export class ProposalComponent extends FilesStepComponent implements OnInit, OnDestroy { + currentStep = EditNotificationSteps.Proposal; + DOCUMENT = DOCUMENT_TYPE; + allowSurveyPlanUploads = false; + + terms: NotificationDocumentDto[] = []; + surveyPlans: NotificationDocumentDto[] = []; + displayedColumns = ['fileName', 'surveyPlan', 'control', 'actions']; + + purpose = new FormControl(null, [Validators.required]); + totalArea = new FormControl(null, [Validators.required]); + fileNumber = new FormControl(null, [Validators.required]); + hasSurveyPlan = new FormControl(null, [Validators.required]); + + form = new FormGroup({ + fileNumber: this.fileNumber, + purpose: this.purpose, + totalArea: this.totalArea, + hasSurveyPlan: this.hasSurveyPlan, + }); + + private submissionUuid = ''; + private isDirty = false; + surveyForm = new FormGroup({} as any); + + constructor( + private router: Router, + private notificationSubmissionService: NotificationSubmissionService, + notificationDocumentService: NotificationDocumentService, + dialog: MatDialog + ) { + super(notificationDocumentService, dialog); + } + + ngOnInit(): void { + this.$notificationSubmission.pipe(takeUntil(this.$destroy)).subscribe((submission) => { + if (submission) { + this.fileId = submission.fileNumber; + this.submissionUuid = submission.uuid; + + this.allowSurveyPlanUploads = !!submission.hasSurveyPlan; + + this.form.patchValue({ + fileNumber: submission.submittersFileNumber, + purpose: submission.purpose, + hasSurveyPlan: formatBooleanToString(submission.hasSurveyPlan), + totalArea: submission.totalArea?.toString(), + }); + if (this.showErrors) { + this.form.markAllAsTouched(); + } + } + }); + + this.$notificationDocuments.pipe(takeUntil(this.$destroy)).subscribe((documents) => { + this.terms = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.SRW_TERMS); + this.surveyPlans = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.SURVEY_PLAN); + + const newForm = new FormGroup({}); + for (const file of this.surveyPlans) { + newForm.addControl(`${file.uuid}-surveyPlan`, new FormControl(file.surveyPlanNumber, [Validators.required])); + newForm.addControl(`${file.uuid}-control`, new FormControl(file.controlNumber, [Validators.required])); + } + this.surveyForm = newForm; + }); + } + + async onSave() { + await this.save(); + } + + protected async save() { + if (this.fileId && this.form.dirty) { + const purpose = this.purpose.value; + const submittersFileNumber = this.fileNumber.value; + const totalArea = this.totalArea.value; + const hasSurveyPlan = this.hasSurveyPlan.value; + + const updateDto: NotificationSubmissionUpdateDto = { + purpose, + submittersFileNumber, + totalArea: totalArea ? parseFloat(totalArea) : null, + hasSurveyPlan: parseStringToBoolean(hasSurveyPlan), + }; + + const updatedApp = await this.notificationSubmissionService.updatePending(this.submissionUuid, updateDto); + this.$notificationSubmission.next(updatedApp); + } + + if (this.isDirty) { + const updateDtos: NotificationDocumentUpdateDto[] = this.surveyPlans.map((file) => ({ + uuid: file.uuid, + surveyPlanNumber: file.surveyPlanNumber, + controlNumber: file.controlNumber, + })); + await this.notificationDocumentService.update(this.fileId, updateDtos); + } + } + + onChangeHasSurveyPlan(selectedValue: string) { + this.allowSurveyPlanUploads = selectedValue === 'true'; + } + + onChangeControlNumber(uuid: any, event: Event) { + this.isDirty = true; + const input = event.target as HTMLInputElement; + const controlPlanNumber = input.value; + this.surveyPlans = this.surveyPlans.map((file) => { + if (uuid === file.uuid) { + file.controlNumber = controlPlanNumber; + } + return file; + }); + } + + onChangeSurveyPlan(uuid: any, event: Event) { + this.isDirty = true; + const input = event.target as HTMLInputElement; + const surveyPlanNumber = input.value; + this.surveyPlans = this.surveyPlans.map((file) => { + if (uuid === file.uuid) { + file.surveyPlanNumber = surveyPlanNumber; + } + return file; + }); + } +} diff --git a/portal-frontend/src/app/services/notification-document/notification-document.dto.ts b/portal-frontend/src/app/services/notification-document/notification-document.dto.ts index 9e345f8edf..d40228dd49 100644 --- a/portal-frontend/src/app/services/notification-document/notification-document.dto.ts +++ b/portal-frontend/src/app/services/notification-document/notification-document.dto.ts @@ -9,10 +9,14 @@ export interface NotificationDocumentDto { uploadedBy: string; uploadedAt: number; source: DOCUMENT_SOURCE; + surveyPlanNumber: string | null; + controlNumber: string | null; } export interface NotificationDocumentUpdateDto { uuid: string; - type: DOCUMENT_TYPE | null; + type?: DOCUMENT_TYPE | null; description?: string | null; + surveyPlanNumber?: string | null; + controlNumber?: string | null; } diff --git a/portal-frontend/src/app/services/notification-submission/notification-submission.dto.ts b/portal-frontend/src/app/services/notification-submission/notification-submission.dto.ts index 07ed0ad669..f0507ee88b 100644 --- a/portal-frontend/src/app/services/notification-submission/notification-submission.dto.ts +++ b/portal-frontend/src/app/services/notification-submission/notification-submission.dto.ts @@ -44,11 +44,17 @@ export interface NotificationSubmissionDto { export interface NotificationSubmissionDetailedDto extends NotificationSubmissionDto { purpose: string | null; + submittersFileNumber: string | null; + totalArea: number | null; + hasSurveyPlan: boolean | null; } export interface NotificationSubmissionUpdateDto { applicant?: string | null; purpose?: string | null; + submittersFileNumber?: string | null; + totalArea?: number | null; + hasSurveyPlan?: boolean | null; localGovernmentUuid?: string | null; contactFirstName?: string | null; contactLastName?: string | null; diff --git a/portal-frontend/src/app/shared/dto/document.dto.ts b/portal-frontend/src/app/shared/dto/document.dto.ts index b68976bb1e..f859679a1c 100644 --- a/portal-frontend/src/app/shared/dto/document.dto.ts +++ b/portal-frontend/src/app/shared/dto/document.dto.ts @@ -29,6 +29,10 @@ export enum DOCUMENT_TYPE { //NOI DOCUMENTS BUILDING_PLAN = 'BLDP', + + //SRW DOCUMENTS + SRW_TERMS = 'SRTD', + SURVEY_PLAN = 'SURV', } export enum DOCUMENT_SOURCE { diff --git a/services/apps/alcs/src/alcs/notification/notification-document/notification-document.dto.ts b/services/apps/alcs/src/alcs/notification/notification-document/notification-document.dto.ts index 4a909c1efc..0ac94d8e01 100644 --- a/services/apps/alcs/src/alcs/notification/notification-document/notification-document.dto.ts +++ b/services/apps/alcs/src/alcs/notification/notification-document/notification-document.dto.ts @@ -14,9 +14,15 @@ export class NotificationDocumentDto { @AutoMap(() => [String]) visibilityFlags: string[]; - @AutoMap(() => [Number]) + @AutoMap(() => Number) evidentiaryRecordSorting?: number; + @AutoMap(() => String) + surveyPlanNumber: string | null; + + @AutoMap(() => String) + controlNumber: string | null; + //Document Fields documentUuid: string; fileName: string; diff --git a/services/apps/alcs/src/alcs/notification/notification-document/notification-document.entity.ts b/services/apps/alcs/src/alcs/notification/notification-document/notification-document.entity.ts index c8c2fe60d0..22756af305 100644 --- a/services/apps/alcs/src/alcs/notification/notification-document/notification-document.entity.ts +++ b/services/apps/alcs/src/alcs/notification/notification-document/notification-document.entity.ts @@ -41,6 +41,12 @@ export class NotificationDocument extends BaseEntity { @Column({ type: 'text', nullable: true }) description?: string | null; + @Column({ type: 'text', nullable: true }) + surveyPlanNumber?: string | null; + + @Column({ type: 'text', nullable: true }) + controlNumber?: string | null; + @ManyToOne(() => Notification, { nullable: false }) notification: Notification; diff --git a/services/apps/alcs/src/alcs/notification/notification-document/notification-document.service.ts b/services/apps/alcs/src/alcs/notification/notification-document/notification-document.service.ts index fbca313a7a..8fe160e506 100644 --- a/services/apps/alcs/src/alcs/notification/notification-document/notification-document.service.ts +++ b/services/apps/alcs/src/alcs/notification/notification-document/notification-document.service.ts @@ -224,6 +224,8 @@ export class NotificationDocumentService { file.typeCode = update.type; file.description = update.description; + file.controlNumber = update.controlNumber; + file.surveyPlanNumber = update.surveyPlanNumber; const updatedFile = await this.notificationDocumentRepository.save(file); results.push(updatedFile); } diff --git a/services/apps/alcs/src/document/document-code.entity.ts b/services/apps/alcs/src/document/document-code.entity.ts index b4618f9a4a..b06096c7cc 100644 --- a/services/apps/alcs/src/document/document-code.entity.ts +++ b/services/apps/alcs/src/document/document-code.entity.ts @@ -27,6 +27,8 @@ export enum DOCUMENT_TYPE { REPORT_OF_PUBLIC_HEARING = 'ROPH', PROOF_OF_ADVERTISING = 'POAA', BUILDING_PLAN = 'BLDP', + SRW_TERMS = 'SRTD', + SURVEY_PLAN = 'SURV', ORIGINAL_SUBMISSION = 'SUBO', UPDATED_SUBMISSION = 'SUBU', diff --git a/services/apps/alcs/src/portal/notification-document/notification-document.dto.ts b/services/apps/alcs/src/portal/notification-document/notification-document.dto.ts index d377534e57..0fed402dee 100644 --- a/services/apps/alcs/src/portal/notification-document/notification-document.dto.ts +++ b/services/apps/alcs/src/portal/notification-document/notification-document.dto.ts @@ -1,4 +1,5 @@ -import { IsNumber, IsOptional, IsString } from 'class-validator'; +import { AutoMap } from '@automapper/classes'; +import { IsNumber, IsOptional, IsString, IsUUID } from 'class-validator'; import { DOCUMENT_TYPE } from '../../document/document-code.entity'; import { DOCUMENT_SOURCE } from '../../document/document.dto'; @@ -24,7 +25,22 @@ export class AttachExternalDocumentDto { } export class PortalNotificationDocumentUpdateDto { + @IsUUID() uuid: string; - type: DOCUMENT_TYPE | null; - description: string | null; + + @IsString() + @IsOptional() + type?: DOCUMENT_TYPE | null; + + @IsString() + @IsOptional() + description?: string | null; + + @IsString() + @IsOptional() + surveyPlanNumber?: string | null; + + @IsString() + @IsOptional() + controlNumber?: string | null; } diff --git a/services/apps/alcs/src/portal/notification-submission/notification-submission.dto.ts b/services/apps/alcs/src/portal/notification-submission/notification-submission.dto.ts index 6444eb733b..5c7cf5deba 100644 --- a/services/apps/alcs/src/portal/notification-submission/notification-submission.dto.ts +++ b/services/apps/alcs/src/portal/notification-submission/notification-submission.dto.ts @@ -1,5 +1,12 @@ import { AutoMap } from '@automapper/classes'; -import { IsOptional, IsString, IsUUID, MaxLength } from 'class-validator'; +import { + IsBoolean, + IsNumber, + IsOptional, + IsString, + IsUUID, + MaxLength, +} from 'class-validator'; import { Column } from 'typeorm'; import { NoticeOfIntentStatusDto } from '../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status.dto'; import { NotificationTransfereeDto } from './notification-transferee/notification-transferee.dto'; @@ -55,8 +62,17 @@ export class NotificationSubmissionDto { } export class NotificationSubmissionDetailedDto extends NotificationSubmissionDto { + @AutoMap(() => String) + submittersFileNumber: string | null; + @AutoMap(() => String) purpose: string | null; + + @AutoMap(() => Number) + totalArea: number | null; + + @AutoMap(() => Boolean) + hasSurveyPlan: boolean | null; } export class NotificationSubmissionUpdateDto { @@ -69,6 +85,18 @@ export class NotificationSubmissionUpdateDto { @MaxLength(MAX_DESCRIPTION_FIELD_LENGTH) purpose?: string; + @IsString() + @IsOptional() + submittersFileNumber?: string | null; + + @IsNumber() + @IsOptional() + totalArea?: number | null; + + @IsBoolean() + @IsOptional() + hasSurveyPlan?: boolean | null; + @IsUUID() @IsOptional() localGovernmentUuid?: string; diff --git a/services/apps/alcs/src/portal/notification-submission/notification-submission.entity.ts b/services/apps/alcs/src/portal/notification-submission/notification-submission.entity.ts index 7f249ea887..d7251769fc 100644 --- a/services/apps/alcs/src/portal/notification-submission/notification-submission.entity.ts +++ b/services/apps/alcs/src/portal/notification-submission/notification-submission.entity.ts @@ -13,6 +13,7 @@ import { NotificationSubmissionToSubmissionStatus } from '../../alcs/notificatio import { Notification } from '../../alcs/notification/notification.entity'; import { Base } from '../../common/entities/base.entity'; import { User } from '../../user/user.entity'; +import { ColumnNumericTransformer } from '../../utils/column-numeric-transform'; import { NotificationParcel } from './notification-parcel/notification-parcel.entity'; import { NotificationTransferee } from './notification-transferee/notification-transferee.entity'; @@ -51,6 +52,14 @@ export class NotificationSubmission extends Base { }) localGovernmentUuid?: string | null; + @AutoMap(() => String) + @Column({ + type: 'varchar', + comment: 'File number provided by Applicant from the LTSA', + nullable: true, + }) + submittersFileNumber?: string | null; + @AutoMap(() => String) @Column({ type: 'varchar', @@ -59,6 +68,20 @@ export class NotificationSubmission extends Base { }) purpose?: string | null; + @AutoMap(() => Number) + @Column({ + type: 'decimal', + nullable: true, + precision: 12, + scale: 2, + transformer: new ColumnNumericTransformer(), + }) + totalArea: number | null; + + @AutoMap(() => Boolean) + @Column({ type: 'boolean', nullable: true }) + hasSurveyPlan: boolean | null; + @AutoMap() @ManyToOne(() => User) createdBy: User; diff --git a/services/apps/alcs/src/portal/notification-submission/notification-submission.service.ts b/services/apps/alcs/src/portal/notification-submission/notification-submission.service.ts index afc142adbd..83cf02da1f 100644 --- a/services/apps/alcs/src/portal/notification-submission/notification-submission.service.ts +++ b/services/apps/alcs/src/portal/notification-submission/notification-submission.service.ts @@ -92,10 +92,23 @@ export class NotificationSubmissionService { const notificationSubmission = await this.getByUuid(submissionUuid, user); notificationSubmission.applicant = updateDto.applicant; + notificationSubmission.submittersFileNumber = filterUndefined( + updateDto.submittersFileNumber, + notificationSubmission.submittersFileNumber, + ); notificationSubmission.purpose = filterUndefined( updateDto.purpose, notificationSubmission.purpose, ); + notificationSubmission.totalArea = filterUndefined( + updateDto.totalArea, + notificationSubmission.totalArea, + ); + notificationSubmission.hasSurveyPlan = filterUndefined( + updateDto.hasSurveyPlan, + notificationSubmission.hasSurveyPlan, + ); + notificationSubmission.localGovernmentUuid = updateDto.localGovernmentUuid; notificationSubmission.contactFirstName = filterUndefined( updateDto.contactFirstName, diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1694042348857-add_plans_to_notification_documents.ts b/services/apps/alcs/src/providers/typeorm/migrations/1694042348857-add_plans_to_notification_documents.ts new file mode 100644 index 0000000000..e3cfffc0f9 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1694042348857-add_plans_to_notification_documents.ts @@ -0,0 +1,25 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class addPlansToNotificationDocuments1694042348857 + implements MigrationInterface +{ + name = 'addPlansToNotificationDocuments1694042348857'; + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `ALTER TABLE "alcs"."notification_document" ADD "survey_plan_number" text`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notification_document" ADD "control_number" text`, + ); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `ALTER TABLE "alcs"."notification_document" DROP COLUMN "control_number"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notification_document" DROP COLUMN "survey_plan_number"`, + ); + } +} diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1694044003667-add_notification_srw_fields.ts b/services/apps/alcs/src/providers/typeorm/migrations/1694044003667-add_notification_srw_fields.ts new file mode 100644 index 0000000000..e057d1ade0 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1694044003667-add_notification_srw_fields.ts @@ -0,0 +1,34 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class addNotificationSrwFields1694044003667 + implements MigrationInterface +{ + name = 'addNotificationSrwFields1694044003667'; + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `ALTER TABLE "alcs"."notification_submission" ADD "submitters_file_number" character varying`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."notification_submission"."submitters_file_number" IS 'File number provided by Applicant from the LTSA'`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notification_submission" ADD "total_area" numeric(12,2)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notification_submission" ADD "has_survey_plan" boolean`, + ); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `ALTER TABLE "alcs"."notification_submission" DROP COLUMN "has_survey_plan"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notification_submission" DROP COLUMN "total_area"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notification_submission" DROP COLUMN "submitters_file_number"`, + ); + } +} diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1694106690840-add_notification_table_comments.ts b/services/apps/alcs/src/providers/typeorm/migrations/1694106690840-add_notification_table_comments.ts new file mode 100644 index 0000000000..f89a8b3b05 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1694106690840-add_notification_table_comments.ts @@ -0,0 +1,33 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class addNotificationTableComments1694106690840 + implements MigrationInterface +{ + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `COMMENT ON TABLE "alcs"."notification" IS 'Stores Notification Class Applications such as SRWs'`, + ); + await queryRunner.query( + `COMMENT ON TABLE "alcs"."notification_parcel" IS 'Parcels Related to Notification Applications'`, + ); + await queryRunner.query( + `COMMENT ON TABLE "alcs"."notification_transferee" IS 'The Transferees related to Notification Applications'`, + ); + await queryRunner.query( + `COMMENT ON TABLE "alcs"."notification_submission" IS 'Portal Submissions for Notifications'`, + ); + await queryRunner.query( + `COMMENT ON TABLE "alcs"."notification_submission_status_type" IS 'Statuses for Notification Submissions'`, + ); + await queryRunner.query( + `COMMENT ON TABLE "alcs"."notification_submission_to_submission_status" IS 'Links Notifications to their Statuses with Dates'`, + ); + await queryRunner.query( + `COMMENT ON TABLE "alcs"."notification_document" IS 'Documents for Notifications'`, + ); + } + + public async down(): Promise { + //No + } +} From 74cb173c8fd5a7eb6788b46b93938b4e8b73619e Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Thu, 7 Sep 2023 10:19:57 -0700 Subject: [PATCH 356/954] update timeline and decision emails (#950) --- .../release-dialog.component.html | 3 +-- .../release-dialog.component.html | 5 +---- ...application-decision-v2.controller.spec.ts | 6 ------ .../application-decision-v2.controller.ts | 10 --------- .../application-timeline.service.spec.ts | 11 +++++++--- .../application-timeline.service.ts | 19 +++++++++++++---- ...e-of-intent-decision-v2.controller.spec.ts | 18 ++++++---------- ...notice-of-intent-decision-v2.controller.ts | 10 --------- .../notice-of-intent-timeline.service.ts | 18 ++++++++++++++-- .../alcs/src/providers/email/email.service.ts | 21 ++++++++----------- .../decision-released/application.template.ts | 2 +- .../notice-of-intent.template.ts | 6 +++--- 12 files changed, 60 insertions(+), 69 deletions(-) diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/release-dialog/release-dialog.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/release-dialog/release-dialog.component.html index 3db6231291..7c0956c1a9 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/release-dialog/release-dialog.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/release-dialog/release-dialog.component.html @@ -4,8 +4,7 @@

Confirm Release Decision

- This decision and document will be immediately visible to the Applicant and Local/First Nation Government. The - decision will be visible to the Public after the prescribed amount of days is exhausted. + This decision and document will be immediately visible to the Applicant and Local/First Nation Government.

Upon releasing the decision, the application will be updated to the status: diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/release-dialog/release-dialog.component.html b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/release-dialog/release-dialog.component.html index 3db6231291..9bf43149ac 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/release-dialog/release-dialog.component.html +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/release-dialog/release-dialog.component.html @@ -3,10 +3,7 @@

Confirm Release Decision

-

- This decision and document will be immediately visible to the Applicant and Local/First Nation Government. The - decision will be visible to the Public after the prescribed amount of days is exhausted. -

+

This decision and document will be immediately visible to the Applicant and Local/First Nation Government.

Upon releasing the decision, the application will be updated to the status: diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.controller.spec.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.controller.spec.ts index b9b93ddd3e..7b7562c988 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.controller.spec.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.controller.spec.ts @@ -328,12 +328,6 @@ describe('ApplicationDecisionV2Controller', () => { parentType: 'application', primaryContact: mockOwner, ccGovernment: true, - decisionDate: new Date().toLocaleDateString('en-CA', { - weekday: 'long', - year: 'numeric', - month: 'long', - day: 'numeric', - }), }); }); diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.controller.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.controller.ts index 877430a398..ea26ae4f99 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.controller.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.controller.ts @@ -309,15 +309,6 @@ export class ApplicationDecisionV2Controller { const { applicationSubmission, primaryContact, submissionGovernment } = await this.emailService.getApplicationEmailData(fileNumber); - const date = decision.date ? new Date(decision.date) : new Date(); - - const options: Intl.DateTimeFormatOptions = { - weekday: 'long', - year: 'numeric', - month: 'long', - day: 'numeric', - }; - if (primaryContact) { await this.emailService.sendApplicationStatusEmail({ generateStatusHtml: generateALCDApplicationHtml, @@ -327,7 +318,6 @@ export class ApplicationDecisionV2Controller { parentType: PARENT_TYPE.APPLICATION, primaryContact, ccGovernment: true, - decisionDate: date.toLocaleDateString('en-CA', options), }); } } diff --git a/services/apps/alcs/src/alcs/application/application-timeline/application-timeline.service.spec.ts b/services/apps/alcs/src/alcs/application/application-timeline/application-timeline.service.spec.ts index 564840e87a..41523fa130 100644 --- a/services/apps/alcs/src/alcs/application/application-timeline/application-timeline.service.spec.ts +++ b/services/apps/alcs/src/alcs/application/application-timeline/application-timeline.service.spec.ts @@ -29,6 +29,7 @@ describe('ApplicationTimelineService', () => { let mockAppService: DeepMocked; let mockAppMeetingService: DeepMocked; let mockAppStatusService: DeepMocked; + const mockSameDate = new Date(); beforeEach(async () => { mockAppRepo = createMock(); @@ -77,7 +78,9 @@ describe('ApplicationTimelineService', () => { ApplicationTimelineService, ); - mockAppRepo.findOneOrFail.mockResolvedValue(new Application()); + mockAppRepo.findOneOrFail.mockResolvedValue( + new Application({ decisionDate: mockSameDate }), + ); mockAppModificationRepo.find.mockResolvedValue([]); mockAppReconsiderationRepo.find.mockResolvedValue([]); mockAppDecisionRepo.find.mockResolvedValue([]); @@ -128,7 +131,7 @@ describe('ApplicationTimelineService', () => { new ApplicationDecision({ auditDate: new Date(sameDate.getTime() + 1000), chairReviewDate: new Date(sameDate.getTime() + 1000), - date: new Date(sameDate.getTime() + 1000), + date: new Date(mockSameDate.getTime() + 1000), }), new ApplicationDecision({ auditDate: sameDate, @@ -141,7 +144,9 @@ describe('ApplicationTimelineService', () => { expect(res).toBeDefined(); expect(res.length).toEqual(6); - expect(res[5].htmlText).toEqual('Decision #1 Made - Active Days: 6'); + expect(res[5].htmlText).toEqual( + 'Decision #1 Made - Active Days: 6 - Decision Released', + ); expect(res[4].htmlText).toEqual('Audited Decision #1'); expect(res[3].htmlText).toEqual('Chair Reviewed Decision #1'); expect(res[2].htmlText).toEqual('Decision #2 Made'); diff --git a/services/apps/alcs/src/alcs/application/application-timeline/application-timeline.service.ts b/services/apps/alcs/src/alcs/application/application-timeline/application-timeline.service.ts index d74fd9633d..bf953c6862 100644 --- a/services/apps/alcs/src/alcs/application/application-timeline/application-timeline.service.ts +++ b/services/apps/alcs/src/alcs/application/application-timeline/application-timeline.service.ts @@ -184,10 +184,20 @@ export class ApplicationTimelineService { }); } + const isAddDecisionReleasedTitle = + application.decisionDate !== null && + decision.date !== null && + application.decisionDate?.toDateString() === + decision.date?.toDateString(); + + const decisionReleasedTitle = ' - Decision Released'; + events.push({ htmlText: `Decision #${decisions.length - index} Made${ decisions.length - 1 === index - ? ` - Active Days: ${mappedApplication.activeDays}` + ? ` - Active Days: ${mappedApplication.activeDays}${ + isAddDecisionReleasedTitle ? decisionReleasedTitle : '' + }` : '' }`, startDate: decision.date!.getTime() + SORTING_ORDER.DECISION_MADE, @@ -373,9 +383,10 @@ export class ApplicationTimelineService { const statusesToInclude = statusHistory.filter( (status) => - ![SUBMISSION_STATUS.IN_REVIEW_BY_ALC].includes( - status.statusType.code, - ), + ![ + SUBMISSION_STATUS.IN_REVIEW_BY_ALC, + SUBMISSION_STATUS.ALC_DECISION, + ].includes(status.statusType.code), ); for (const status of statusesToInclude) { if (status.effectiveDate) { diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.controller.spec.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.controller.spec.ts index 74a21fc925..8cbd866019 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.controller.spec.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.controller.spec.ts @@ -3,12 +3,18 @@ import { AutomapperModule } from '@automapper/nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { ClsService } from 'nestjs-cls'; +import { generateALCDNoticeOfIntentHtml } from '../../../../../../templates/emails/decision-released'; import { mockKeyCloakProviders } from '../../../../test/mocks/mockTypes'; import { NoticeOfIntentDecisionProfile } from '../../../common/automapper/notice-of-intent-decision.automapper.profile'; import { NoticeOfIntentProfile } from '../../../common/automapper/notice-of-intent.automapper.profile'; import { UserProfile } from '../../../common/automapper/user.automapper.profile'; +import { NoticeOfIntentOwner } from '../../../portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.entity'; +import { NoticeOfIntentSubmission } from '../../../portal/notice-of-intent-submission/notice-of-intent-submission.entity'; +import { NoticeOfIntentSubmissionService } from '../../../portal/notice-of-intent-submission/notice-of-intent-submission.service'; import { EmailService } from '../../../providers/email/email.service'; import { CodeService } from '../../code/code.service'; +import { LocalGovernment } from '../../local-government/local-government.entity'; +import { NOI_SUBMISSION_STATUS } from '../../notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status.dto'; import { NoticeOfIntent } from '../../notice-of-intent/notice-of-intent.entity'; import { NoticeOfIntentService } from '../../notice-of-intent/notice-of-intent.service'; import { NoticeOfIntentDecisionOutcome } from '../notice-of-intent-decision-outcome.entity'; @@ -20,12 +26,6 @@ import { NoticeOfIntentDecision } from '../notice-of-intent-decision.entity'; import { NoticeOfIntentModificationService } from '../notice-of-intent-modification/notice-of-intent-modification.service'; import { NoticeOfIntentDecisionV2Controller } from './notice-of-intent-decision-v2.controller'; import { NoticeOfIntentDecisionV2Service } from './notice-of-intent-decision-v2.service'; -import { NoticeOfIntentSubmissionService } from '../../../portal/notice-of-intent-submission/notice-of-intent-submission.service'; -import { NoticeOfIntentOwner } from '../../../portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.entity'; -import { NoticeOfIntentSubmission } from '../../../portal/notice-of-intent-submission/notice-of-intent-submission.entity'; -import { LocalGovernment } from '../../local-government/local-government.entity'; -import { generateALCDNoticeOfIntentHtml } from '../../../../../../templates/emails/decision-released'; -import { NOI_SUBMISSION_STATUS } from '../../notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status.dto'; describe('NoticeOfIntentDecisionV2Controller', () => { let controller: NoticeOfIntentDecisionV2Controller; @@ -325,12 +325,6 @@ describe('NoticeOfIntentDecisionV2Controller', () => { parentType: 'notice-of-intent', primaryContact: mockOwner, ccGovernment: true, - decisionDate: new Date().toLocaleDateString('en-CA', { - weekday: 'long', - year: 'numeric', - month: 'long', - day: 'numeric', - }), }); }); diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.controller.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.controller.ts index 38edcfad1c..5171a62292 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.controller.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.controller.ts @@ -265,15 +265,6 @@ export class NoticeOfIntentDecisionV2Controller { noticeOfIntentSubmission, ); - const date = decision.date ? new Date(decision.date) : new Date(); - - const options: Intl.DateTimeFormatOptions = { - weekday: 'long', - year: 'numeric', - month: 'long', - day: 'numeric', - }; - if (primaryContact) { await this.emailService.sendNoticeOfIntentStatusEmail({ generateStatusHtml: generateALCDNoticeOfIntentHtml, @@ -283,7 +274,6 @@ export class NoticeOfIntentDecisionV2Controller { parentType: PARENT_TYPE.NOTICE_OF_INTENT, primaryContact, ccGovernment: true, - decisionDate: date.toLocaleDateString('en-CA', options), }); } } diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-timeline/notice-of-intent-timeline.service.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-timeline/notice-of-intent-timeline.service.ts index 8c0d7283bf..bfa5b7051d 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-timeline/notice-of-intent-timeline.service.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-timeline/notice-of-intent-timeline.service.ts @@ -148,10 +148,20 @@ export class NoticeOfIntentTimelineService { }); } + const isAddDecisionReleasedTitle = + noticeOfIntent.decisionDate !== null && + decision.date !== null && + noticeOfIntent.decisionDate?.toDateString() === + decision.date?.toDateString(); + + const decisionReleasedTitle = ' - Decision Released'; + events.push({ htmlText: `Decision #${decisions.length - index} Made${ decisions.length - 1 === index - ? ` - Active Days: ${mappedNOI.activeDays}` + ? ` - Active Days: ${mappedNOI.activeDays}${ + isAddDecisionReleasedTitle ? decisionReleasedTitle : '' + }` : '' }`, startDate: decision.date!.getTime() + SORTING_ORDER.DECISION_MADE, @@ -246,7 +256,11 @@ export class NoticeOfIntentTimelineService { noticeOfIntent.fileNumber, ); - for (const status of statusHistory) { + const statusesToInclude = statusHistory.filter( + (status) => NOI_SUBMISSION_STATUS.ALC_DECISION !== status.statusType.code, + ); + + for (const status of statusesToInclude) { if (status.effectiveDate) { let htmlText = `${status.statusType.label}`; diff --git a/services/apps/alcs/src/providers/email/email.service.ts b/services/apps/alcs/src/providers/email/email.service.ts index cf698dfaaa..0afc39f5b6 100644 --- a/services/apps/alcs/src/providers/email/email.service.ts +++ b/services/apps/alcs/src/providers/email/email.service.ts @@ -5,21 +5,21 @@ import { InjectRepository } from '@nestjs/typeorm'; import { MJMLParseResults } from 'mjml-core'; import { firstValueFrom } from 'rxjs'; import { Repository } from 'typeorm'; -import { EmailStatus } from './email-status.entity'; -import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; -import { ApplicationSubmission } from '../../portal/application-submission/application-submission.entity'; import { SUBMISSION_STATUS } from '../../alcs/application/application-submission-status/submission-status.dto'; +import { ApplicationService } from '../../alcs/application/application.service'; +import { PARENT_TYPE } from '../../alcs/card/card-subtask/card-subtask.dto'; import { LocalGovernment } from '../../alcs/local-government/local-government.entity'; +import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; +import { NOI_SUBMISSION_STATUS } from '../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status.dto'; +import { NoticeOfIntentService } from '../../alcs/notice-of-intent/notice-of-intent.service'; import { ApplicationOwner } from '../../portal/application-submission/application-owner/application-owner.entity'; +import { ApplicationSubmission } from '../../portal/application-submission/application-submission.entity'; import { ApplicationSubmissionService } from '../../portal/application-submission/application-submission.service'; -import { ApplicationService } from '../../alcs/application/application.service'; -import { FALLBACK_APPLICANT_NAME } from '../../utils/owner.constants'; -import { PARENT_TYPE } from '../../alcs/card/card-subtask/card-subtask.dto'; -import { NoticeOfIntentSubmission } from '../../portal/notice-of-intent-submission/notice-of-intent-submission.entity'; import { NoticeOfIntentOwner } from '../../portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.entity'; +import { NoticeOfIntentSubmission } from '../../portal/notice-of-intent-submission/notice-of-intent-submission.entity'; import { NoticeOfIntentSubmissionService } from '../../portal/notice-of-intent-submission/notice-of-intent-submission.service'; -import { NoticeOfIntentService } from '../../alcs/notice-of-intent/notice-of-intent.service'; -import { NOI_SUBMISSION_STATUS } from '../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status.dto'; +import { FALLBACK_APPLICANT_NAME } from '../../utils/owner.constants'; +import { EmailStatus } from './email-status.entity'; export interface StatusUpdateEmail { fileNumber: string; @@ -35,7 +35,6 @@ type BaseStatusEmailData = { government: LocalGovernment | null; parentType: PARENT_TYPE; ccGovernment?: boolean; - decisionDate?: string; }; type ApplicationEmailData = BaseStatusEmailData & { applicationSubmission: ApplicationSubmission; @@ -296,7 +295,6 @@ export class EmailService { governmentName: data.government?.name, status: status.label, parentTypeLabel: parentTypeLabel[data.parentType], - decisionDate: data?.decisionDate, }); const parentId = await this.applicationService.getUuid(fileNumber); @@ -336,7 +334,6 @@ export class EmailService { governmentName: data.government?.name, status: status.label, parentTypeLabel: parentTypeLabel[data.parentType], - decisionDate: data?.decisionDate, }); const parentId = await this.noticeOfIntentService.getUuid(fileNumber); diff --git a/services/templates/emails/decision-released/application.template.ts b/services/templates/emails/decision-released/application.template.ts index 050496fb37..bfa0d4ea12 100644 --- a/services/templates/emails/decision-released/application.template.ts +++ b/services/templates/emails/decision-released/application.template.ts @@ -28,7 +28,7 @@ const template = ` This email is to advise that the Reasons for Decision for the above noted application has been released. - Please log into the ALC Portal to view the Reasons for Decision. The document can be found by clicking 'View' from the Inbox table and then navigating to the 'ALC Review and Decision' tab. The Reasons for Decision will be available to the public on {{ decisionDate }}. + Please log into the ALC Portal to view the Reasons for Decision. The document can be found by clicking 'View' from the Inbox table and then navigating to the 'ALC Review and Decision' tab. The Reasons for Decision will also be available to the public. Further correspondence with respect to this application should be directed to the ALC Land Use Planner for your region, found on the ALC website Contact Us page. diff --git a/services/templates/emails/decision-released/notice-of-intent.template.ts b/services/templates/emails/decision-released/notice-of-intent.template.ts index e8d0db1b2f..53b74e634c 100644 --- a/services/templates/emails/decision-released/notice-of-intent.template.ts +++ b/services/templates/emails/decision-released/notice-of-intent.template.ts @@ -1,7 +1,7 @@ import { MJMLParseResults } from 'mjml-core'; -import { EmailTemplateService } from '../../../libs/common/src/email-template-service/email-template.service'; -import { header, footer, notificationOnly, portalButton } from '../partials'; import { StatusUpdateEmail } from '../../../apps/alcs/src/providers/email/email.service'; +import { EmailTemplateService } from '../../../libs/common/src/email-template-service/email-template.service'; +import { footer, header, notificationOnly, portalButton } from '../partials'; type DecisionReleasedStatusEmail = StatusUpdateEmail & { decisionDate: number; @@ -28,7 +28,7 @@ const template = ` The decision for the above noted Notice of Intent (NOI) has been released on the the ALC Portal. - The decision document can be found by clicking 'View' from the NOI Inbox table in the ALC Portal, and then navigating to the 'ALC Review and Decision' tab. The decision will be available to the public on {{ decisionDate }}. + The decision document can be found by clicking 'View' from the NOI Inbox table in the ALC Portal, and then navigating to the 'ALC Review and Decision' tab. The decision will also be available to the public. Further correspondence with respect to this NOI should be directed to ALC.Soil@gov.bc.ca. From a5ade17f896ff10f69f9b48820f49cc72a531583 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Thu, 7 Sep 2023 10:39:52 -0700 Subject: [PATCH 357/954] Trigger CanDeactivate when URL has no Step Index --- .../notice-of-intents/edit-submission/edit-submission.module.ts | 1 + .../notifications/edit-submission/edit-submission.module.ts | 1 + 2 files changed, 2 insertions(+) diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.module.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.module.ts index ba969b4f33..6fac8c054b 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.module.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.module.ts @@ -11,6 +11,7 @@ const routes: Routes = [ { path: '', component: EditSubmissionComponent, + canDeactivate: [CanDeactivateGuard], }, { path: ':stepInd', diff --git a/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.module.ts b/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.module.ts index 08d1f751b4..d46d9ac7be 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.module.ts +++ b/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.module.ts @@ -23,6 +23,7 @@ const routes: Routes = [ { path: '', component: EditSubmissionComponent, + canDeactivate: [CanDeactivateGuard], }, { path: ':stepInd', From fd5fded92416dad49b8ba2a202bed14a6f538992 Mon Sep 17 00:00:00 2001 From: Liam Stoddard Date: Thu, 7 Sep 2023 11:28:30 -0700 Subject: [PATCH 358/954] MR feedback --- .../submissions/submap/soil_elements.py | 90 ++++++++----------- 1 file changed, 39 insertions(+), 51 deletions(-) diff --git a/bin/migrate-oats-data/submissions/submap/soil_elements.py b/bin/migrate-oats-data/submissions/submap/soil_elements.py index 1fab172e06..f25dab306c 100644 --- a/bin/migrate-oats-data/submissions/submap/soil_elements.py +++ b/bin/migrate-oats-data/submissions/submap/soil_elements.py @@ -1,4 +1,17 @@ from enum import Enum + +class SoilAction(Enum): + RMV = 'REMOVE' + ADD = 'ADD' + +alr_id = 'alr_appl_component_id' +area = 'project_area' +desc = 'material_desc' +origin_desc = 'material_origin_desc' +duration = 'project_duration' +volume = 'volume' +depth = 'depth' + def get_soil_rows(rows, cursor): # fetches adjacent land use data, specifically direction, description and type code component_ids = [dict(item)["alr_appl_component_id"] for item in rows] @@ -13,80 +26,34 @@ def get_soil_rows(rows, cursor): def create_soil_dict(soil_rows): # creates dict contailing fill and remove data - - class SoilAction(Enum): - RMV = 'REMOVE' - ADD = 'ADD' - alr_id = 'alr_appl_component_id' - area = 'project_area' - desc = 'material_desc' - origin_desc = 'material_origin_desc' - duration = 'project_duration' - volume = 'volume' - depth = 'depth' code = 'soil_change_code' - soil_dict = {} for row in soil_rows: app_component_id = row[alr_id] if app_component_id in soil_dict: - if row[code] == SoilAction.RMV.value: if 'RMV' in soil_dict.get(app_component_id, {}): print('ignored element_id:',row['soil_change_element_id']) else: - soil_dict[app_component_id]['remove_type'] = row[desc] - soil_dict[app_component_id]['remove_origin'] = row[origin_desc] - soil_dict[app_component_id]['max_remove_depth'] = row[depth] - soil_dict[app_component_id]['total_remove'] = row[volume] - soil_dict[app_component_id]['remove_duration'] = row[duration] - soil_dict[app_component_id]['remove_area'] = row[area] + dict_rmv_insert(soil_dict, app_component_id, row) if 'import_fill' not in soil_dict.get(app_component_id, {}): soil_dict[app_component_id]['import_fill'] = False - - soil_dict[app_component_id][SoilAction.RMV.name] = True - - + elif row[code] == SoilAction.ADD.value: if 'ADD' in soil_dict.get(app_component_id, {}): print('ignored element_id:',row['soil_change_element_id']) else: - soil_dict[app_component_id]['fill_type'] = row[desc] - soil_dict[app_component_id]['fill_origin'] = row[origin_desc] - soil_dict[app_component_id]['total_fill'] = row[volume] - soil_dict[app_component_id]['max_fill_depth'] = row[depth] - soil_dict[app_component_id]['fill_duration'] = row[duration] - soil_dict[app_component_id]['fill_area'] = row[area] - soil_dict[app_component_id]['import_fill'] = True - - soil_dict[app_component_id][SoilAction.ADD.name] = True - + dict_fill_insert(soil_dict, app_component_id, row) else: print('unknown soil action') else: soil_dict[app_component_id] = {} soil_dict[app_component_id][alr_id] = row[alr_id] if row[code] == SoilAction.RMV.value: - soil_dict[app_component_id]['remove_type'] = row[desc] - soil_dict[app_component_id]['remove_origin'] = row[origin_desc] - soil_dict[app_component_id]['max_remove_depth'] = row[depth] - soil_dict[app_component_id]['total_remove'] = row[volume] - soil_dict[app_component_id]['remove_duration'] = row[duration] - soil_dict[app_component_id]['remove_area'] = row[area] - soil_dict[app_component_id][SoilAction.RMV.name] = True + dict_rmv_insert(soil_dict, app_component_id, row) soil_dict[app_component_id]['import_fill'] = False - - elif row[code] == SoilAction.ADD.value: - soil_dict[app_component_id]['fill_type'] = row[desc] - soil_dict[app_component_id]['fill_origin'] = row[origin_desc] - soil_dict[app_component_id]['total_fill'] = row[volume] - soil_dict[app_component_id]['max_fill_depth'] = row[depth] - soil_dict[app_component_id]['fill_duration'] = row[duration] - soil_dict[app_component_id]['fill_area'] = row[area] - soil_dict[app_component_id]['import_fill'] = True - soil_dict[app_component_id][SoilAction.ADD.name] = True - + dict_fill_insert(soil_dict, app_component_id, row) else: print('unknown soil action') return soil_dict @@ -130,3 +97,24 @@ def add_soil_field(data): data['fill_duration_unit'] = None data['remove_duration_unit'] = None return data + +def dict_fill_insert(soil_dict, app_component_id, row): + soil_dict[app_component_id]['fill_type'] = row[desc] + soil_dict[app_component_id]['fill_origin'] = row[origin_desc] + soil_dict[app_component_id]['total_fill'] = row[volume] + soil_dict[app_component_id]['max_fill_depth'] = row[depth] + soil_dict[app_component_id]['fill_duration'] = row[duration] + soil_dict[app_component_id]['fill_area'] = row[area] + soil_dict[app_component_id]['import_fill'] = True + soil_dict[app_component_id][SoilAction.ADD.name] = True + return + +def dict_rmv_insert(soil_dict, app_component_id, row): + soil_dict[app_component_id]['remove_type'] = row[desc] + soil_dict[app_component_id]['remove_origin'] = row[origin_desc] + soil_dict[app_component_id]['max_remove_depth'] = row[depth] + soil_dict[app_component_id]['total_remove'] = row[volume] + soil_dict[app_component_id]['remove_duration'] = row[duration] + soil_dict[app_component_id]['remove_area'] = row[area] + soil_dict[app_component_id][SoilAction.RMV.name] = True + return \ No newline at end of file From c0cf567f921c76b8509e6eb1220eadc9e36655c7 Mon Sep 17 00:00:00 2001 From: Liam Stoddard Date: Thu, 7 Sep 2023 12:01:01 -0700 Subject: [PATCH 359/954] using refactored soil dict --- .../submissions/submap/soil_elements.py | 42 +++++++------------ 1 file changed, 14 insertions(+), 28 deletions(-) diff --git a/bin/migrate-oats-data/submissions/submap/soil_elements.py b/bin/migrate-oats-data/submissions/submap/soil_elements.py index f25dab306c..94061c4159 100644 --- a/bin/migrate-oats-data/submissions/submap/soil_elements.py +++ b/bin/migrate-oats-data/submissions/submap/soil_elements.py @@ -25,37 +25,23 @@ def get_soil_rows(rows, cursor): return soil_rows def create_soil_dict(soil_rows): - # creates dict contailing fill and remove data - code = 'soil_change_code' - soil_dict = {} + # creates dict containing fill & remove data + soil_dict = dict() + for row in soil_rows: app_component_id = row[alr_id] - if app_component_id in soil_dict: - if row[code] == SoilAction.RMV.value: - if 'RMV' in soil_dict.get(app_component_id, {}): - print('ignored element_id:',row['soil_change_element_id']) - else: - dict_rmv_insert(soil_dict, app_component_id, row) - if 'import_fill' not in soil_dict.get(app_component_id, {}): - soil_dict[app_component_id]['import_fill'] = False - - elif row[code] == SoilAction.ADD.value: - if 'ADD' in soil_dict.get(app_component_id, {}): - print('ignored element_id:',row['soil_change_element_id']) - else: - dict_fill_insert(soil_dict, app_component_id, row) - else: - print('unknown soil action') + soil_dict.setdefault(app_component_id, {alr_id: row[alr_id]}) + + if (row['soil_change_code'] == SoilAction.RMV.value and 'RMV' not in soil_dict[app_component_id]) or \ + (row['soil_change_code'] == SoilAction.ADD.value and 'ADD' not in soil_dict[app_component_id]): + action_function = dict_rmv_insert if row['soil_change_code'] == SoilAction.RMV.value else dict_fill_insert + action_function(soil_dict, app_component_id, row) + + elif row['soil_change_code'] not in [SoilAction.ADD.value, SoilAction.RMV.value]: + print('unknown soil action') else: - soil_dict[app_component_id] = {} - soil_dict[app_component_id][alr_id] = row[alr_id] - if row[code] == SoilAction.RMV.value: - dict_rmv_insert(soil_dict, app_component_id, row) - soil_dict[app_component_id]['import_fill'] = False - elif row[code] == SoilAction.ADD.value: - dict_fill_insert(soil_dict, app_component_id, row) - else: - print('unknown soil action') + print('ignored element_id:', row['soil_change_element_id']) + return soil_dict From 760763bb42ad024f143692150d08cc8a8b491c3d Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Thu, 7 Sep 2023 13:08:50 -0700 Subject: [PATCH 360/954] error outline on noi decision for Decision Maker field (#953) --- .../decision-input/decision-input-v2.component.html | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-input-v2.component.html b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-input-v2.component.html index 8178384585..029b499c77 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-input-v2.component.html +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-input-v2.component.html @@ -66,8 +66,15 @@

Resolution

- Decision Maker* - + Decision Maker* + CEO Delegate CEO From ae835e9819851f1d00424e740086266dca985035 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Thu, 7 Sep 2023 13:23:33 -0700 Subject: [PATCH 361/954] Review & Submit for Notifications * Setup Step 7 for Review * Fixes for other steps * Add confirmation dialog to Proposal Step. --- .../review-and-submit.component.ts | 4 +- .../edit-submission.component.html | 12 +- .../edit-submission.component.ts | 13 +- .../edit-submission/edit-submission.module.ts | 6 + .../proposal/proposal.component.ts | 22 ++- .../review-and-submit.component.html | 27 ++++ .../review-and-submit.component.scss | 0 .../review-and-submit.component.spec.ts | 57 +++++++ .../review-and-submit.component.ts | 52 ++++++ .../submit-confirmation-dialog.component.html | 45 ++++++ .../submit-confirmation-dialog.component.scss | 18 +++ ...bmit-confirmation-dialog.component.spec.ts | 39 +++++ .../submit-confirmation-dialog.component.ts | 14 ++ .../notification-details.component.html | 105 ++++++++++++ .../notification-details.component.scss | 151 ++++++++++++++++++ .../notification-details.component.spec.ts | 62 +++++++ .../notification-details.component.ts | 91 +++++++++++ .../notification-details.module.ts | 14 ++ .../parcel/parcel.component.html | 71 ++++++++ .../parcel/parcel.component.scss | 39 +++++ .../parcel/parcel.component.spec.ts | 43 +++++ .../parcel/parcel.component.ts | 59 +++++++ .../proposal-details.component.html | 59 +++++++ .../proposal-details.component.scss | 8 + .../proposal-details.component.spec.ts | 35 ++++ .../proposal-details.component.ts | 46 ++++++ .../notification-parcel.controller.spec.ts | 6 +- .../notification-parcel.controller.ts | 2 +- .../notification-parcel.service.ts | 5 +- 29 files changed, 1093 insertions(+), 12 deletions(-) create mode 100644 portal-frontend/src/app/features/notifications/edit-submission/review-and-submit/review-and-submit.component.html create mode 100644 portal-frontend/src/app/features/notifications/edit-submission/review-and-submit/review-and-submit.component.scss create mode 100644 portal-frontend/src/app/features/notifications/edit-submission/review-and-submit/review-and-submit.component.spec.ts create mode 100644 portal-frontend/src/app/features/notifications/edit-submission/review-and-submit/review-and-submit.component.ts create mode 100644 portal-frontend/src/app/features/notifications/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.html create mode 100644 portal-frontend/src/app/features/notifications/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.scss create mode 100644 portal-frontend/src/app/features/notifications/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.spec.ts create mode 100644 portal-frontend/src/app/features/notifications/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.ts create mode 100644 portal-frontend/src/app/features/notifications/notification-details/notification-details.component.html create mode 100644 portal-frontend/src/app/features/notifications/notification-details/notification-details.component.scss create mode 100644 portal-frontend/src/app/features/notifications/notification-details/notification-details.component.spec.ts create mode 100644 portal-frontend/src/app/features/notifications/notification-details/notification-details.component.ts create mode 100644 portal-frontend/src/app/features/notifications/notification-details/notification-details.module.ts create mode 100644 portal-frontend/src/app/features/notifications/notification-details/parcel/parcel.component.html create mode 100644 portal-frontend/src/app/features/notifications/notification-details/parcel/parcel.component.scss create mode 100644 portal-frontend/src/app/features/notifications/notification-details/parcel/parcel.component.spec.ts create mode 100644 portal-frontend/src/app/features/notifications/notification-details/parcel/parcel.component.ts create mode 100644 portal-frontend/src/app/features/notifications/notification-details/proposal-details/proposal-details.component.html create mode 100644 portal-frontend/src/app/features/notifications/notification-details/proposal-details/proposal-details.component.scss create mode 100644 portal-frontend/src/app/features/notifications/notification-details/proposal-details/proposal-details.component.spec.ts create mode 100644 portal-frontend/src/app/features/notifications/notification-details/proposal-details/proposal-details.component.ts diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/review-and-submit/review-and-submit.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/review-and-submit/review-and-submit.component.ts index 7c758da6e2..e6e62f3181 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/review-and-submit/review-and-submit.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/review-and-submit/review-and-submit.component.ts @@ -36,9 +36,9 @@ export class ReviewAndSubmitComponent extends StepComponent implements OnInit, O override async onNavigateToStep(step: number) { if (this.draftMode) { - await this.router.navigateByUrl(`alcs/application/${this.noiSubmission?.fileNumber}/edit/${step}?errors=t`); + await this.router.navigateByUrl(`alcs/notice-of-intent/${this.noiSubmission?.fileNumber}/edit/${step}?errors=t`); } else { - await this.router.navigateByUrl(`application/${this.noiSubmission?.fileNumber}/edit/${step}?errors=t`); + await this.router.navigateByUrl(`notice-of-intent/${this.noiSubmission?.fileNumber}/edit/${step}?errors=t`); } } diff --git a/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.component.html b/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.component.html index 8cd539d7f5..78ad8d9568 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.component.html +++ b/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.component.html @@ -99,6 +99,16 @@
-
+
+ + +
diff --git a/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.component.ts b/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.component.ts index 2897bc6620..11d0ada6ee 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.component.ts +++ b/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.component.ts @@ -3,7 +3,6 @@ import { AfterViewInit, Component, OnDestroy, ViewChild } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; import { ActivatedRoute, Router } from '@angular/router'; import { BehaviorSubject, combineLatest, Observable, of, Subject, takeUntil } from 'rxjs'; -import { NoticeOfIntentDocumentDto } from '../../../services/notice-of-intent-document/notice-of-intent-document.dto'; import { NotificationDocumentDto } from '../../../services/notification-document/notification-document.dto'; import { NotificationDocumentService } from '../../../services/notification-document/notification-document.service'; import { @@ -19,6 +18,7 @@ import { OtherAttachmentsComponent } from './other-attachments/other-attachments import { ParcelDetailsComponent } from './parcels/parcel-details.component'; import { PrimaryContactComponent } from './primary-contact/primary-contact.component'; import { ProposalComponent } from './proposal/proposal.component'; +import { SubmitConfirmationDialogComponent } from './review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component'; import { SelectGovernmentComponent } from './select-government/select-government.component'; export enum EditNotificationSteps { @@ -180,7 +180,16 @@ export class EditSubmissionComponent implements OnDestroy, AfterViewInit { } async onSubmit() { - //TODO + if (this.notificationSubmission) { + this.dialog + .open(SubmitConfirmationDialogComponent) + .beforeClosed() + .subscribe((didConfirm) => { + if (didConfirm) { + this.submit(); + } + }); + } } private async submit() { diff --git a/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.module.ts b/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.module.ts index 691f4d8558..ecc4434f91 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.module.ts +++ b/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.module.ts @@ -7,6 +7,7 @@ import { RouterModule, Routes } from '@angular/router'; import { NgxMaskPipe } from 'ngx-mask'; import { CanDeactivateGuard } from '../../../shared/guard/can-deactivate.guard'; import { SharedModule } from '../../../shared/shared.module'; +import { NotificationDetailsModule } from '../notification-details/notification-details.module'; import { EditSubmissionComponent } from './edit-submission.component'; import { OtherAttachmentsComponent } from './other-attachments/other-attachments.component'; import { DeleteParcelDialogComponent } from './parcels/delete-parcel/delete-parcel-dialog.component'; @@ -15,6 +16,8 @@ import { ParcelEntryConfirmationDialogComponent } from './parcels/parcel-entry/p import { ParcelEntryComponent } from './parcels/parcel-entry/parcel-entry.component'; import { PrimaryContactComponent } from './primary-contact/primary-contact.component'; import { ProposalComponent } from './proposal/proposal.component'; +import { ReviewAndSubmitComponent } from './review-and-submit/review-and-submit.component'; +import { SubmitConfirmationDialogComponent } from './review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component'; import { SelectGovernmentComponent } from './select-government/select-government.component'; import { StepComponent } from './step.partial'; import { TransfereeDialogComponent } from './transferees/transferee-dialog/transferee-dialog.component'; @@ -46,6 +49,8 @@ const routes: Routes = [ SelectGovernmentComponent, ProposalComponent, OtherAttachmentsComponent, + ReviewAndSubmitComponent, + SubmitConfirmationDialogComponent, ], imports: [ CommonModule, @@ -55,6 +60,7 @@ const routes: Routes = [ MatIconModule, MatTableModule, NgxMaskPipe, + NotificationDetailsModule, ], }) export class EditSubmissionModule {} diff --git a/portal-frontend/src/app/features/notifications/edit-submission/proposal/proposal.component.ts b/portal-frontend/src/app/features/notifications/edit-submission/proposal/proposal.component.ts index 68f2feb014..871b326e3a 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/proposal/proposal.component.ts +++ b/portal-frontend/src/app/features/notifications/edit-submission/proposal/proposal.component.ts @@ -10,6 +10,7 @@ import { import { NotificationDocumentService } from '../../../../services/notification-document/notification-document.service'; import { NotificationSubmissionUpdateDto } from '../../../../services/notification-submission/notification-submission.dto'; import { NotificationSubmissionService } from '../../../../services/notification-submission/notification-submission.service'; +import { ConfirmationDialogService } from '../../../../shared/confirmation-dialog/confirmation-dialog.service'; import { DOCUMENT_TYPE } from '../../../../shared/dto/document.dto'; import { formatBooleanToString } from '../../../../shared/utils/boolean-helper'; import { parseStringToBoolean } from '../../../../shared/utils/string-helper'; @@ -50,6 +51,7 @@ export class ProposalComponent extends FilesStepComponent implements OnInit, OnD private router: Router, private notificationSubmissionService: NotificationSubmissionService, notificationDocumentService: NotificationDocumentService, + private confirmationDialogService: ConfirmationDialogService, dialog: MatDialog ) { super(notificationDocumentService, dialog); @@ -121,7 +123,25 @@ export class ProposalComponent extends FilesStepComponent implements OnInit, OnD } onChangeHasSurveyPlan(selectedValue: string) { - this.allowSurveyPlanUploads = selectedValue === 'true'; + if (selectedValue === 'false' && this.surveyPlans.length > 0) { + this.confirmationDialogService + .openDialog({ + body: 'Warning: Changing this answer will remove the uploaded survey plans.', + }) + .subscribe(async (didConfirm) => { + if (didConfirm) { + for (const file of this.surveyPlans) { + await this.onDeleteFile(file); + } + this.allowSurveyPlanUploads = false; + } else { + this.allowSurveyPlanUploads = true; + this.hasSurveyPlan.setValue('true'); + } + }); + } else { + this.allowSurveyPlanUploads = selectedValue === 'true'; + } } onChangeControlNumber(uuid: any, event: Event) { diff --git a/portal-frontend/src/app/features/notifications/edit-submission/review-and-submit/review-and-submit.component.html b/portal-frontend/src/app/features/notifications/edit-submission/review-and-submit/review-and-submit.component.html new file mode 100644 index 0000000000..67656e913b --- /dev/null +++ b/portal-frontend/src/app/features/notifications/edit-submission/review-and-submit/review-and-submit.component.html @@ -0,0 +1,27 @@ +
+ +
+ +
+ +
+ + +
+ + +
+
+
diff --git a/portal-frontend/src/app/features/notifications/edit-submission/review-and-submit/review-and-submit.component.scss b/portal-frontend/src/app/features/notifications/edit-submission/review-and-submit/review-and-submit.component.scss new file mode 100644 index 0000000000..e69de29bb2 diff --git a/portal-frontend/src/app/features/notifications/edit-submission/review-and-submit/review-and-submit.component.spec.ts b/portal-frontend/src/app/features/notifications/edit-submission/review-and-submit/review-and-submit.component.spec.ts new file mode 100644 index 0000000000..1b4c879efa --- /dev/null +++ b/portal-frontend/src/app/features/notifications/edit-submission/review-and-submit/review-and-submit.component.spec.ts @@ -0,0 +1,57 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { Router } from '@angular/router'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { BehaviorSubject } from 'rxjs'; +import { NotificationSubmissionDetailedDto } from '../../../../services/notification-submission/notification-submission.dto'; +import { NotificationSubmissionService } from '../../../../services/notification-submission/notification-submission.service'; +import { PdfGenerationService } from '../../../../services/pdf-generation/pdf-generation.service'; +import { ToastService } from '../../../../services/toast/toast.service'; + +import { ReviewAndSubmitComponent } from './review-and-submit.component'; + +describe('ReviewAndSubmitComponent', () => { + let component: ReviewAndSubmitComponent; + let fixture: ComponentFixture; + let mockToastService: DeepMocked; + let mockRouter: DeepMocked; + let mockNotificationSubmissionService: DeepMocked; + + beforeEach(async () => { + mockToastService = createMock(); + mockRouter = createMock(); + mockNotificationSubmissionService = createMock(); + + await TestBed.configureTestingModule({ + declarations: [ReviewAndSubmitComponent], + schemas: [NO_ERRORS_SCHEMA], + providers: [ + { + provide: ToastService, + useValue: mockToastService, + }, + { + provide: Router, + useValue: mockRouter, + }, + { + provide: NotificationSubmissionService, + useValue: mockNotificationSubmissionService, + }, + { + provide: PdfGenerationService, + useValue: {}, + }, + ], + }).compileComponents(); + + fixture = TestBed.createComponent(ReviewAndSubmitComponent); + component = fixture.componentInstance; + component.$notificationSubmission = new BehaviorSubject(undefined); + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/notifications/edit-submission/review-and-submit/review-and-submit.component.ts b/portal-frontend/src/app/features/notifications/edit-submission/review-and-submit/review-and-submit.component.ts new file mode 100644 index 0000000000..6a5c201989 --- /dev/null +++ b/portal-frontend/src/app/features/notifications/edit-submission/review-and-submit/review-and-submit.component.ts @@ -0,0 +1,52 @@ +import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core'; +import { Router } from '@angular/router'; +import { BehaviorSubject, takeUntil } from 'rxjs'; +import { NotificationDocumentDto } from '../../../../services/notification-document/notification-document.dto'; +import { NotificationSubmissionDetailedDto } from '../../../../services/notification-submission/notification-submission.dto'; +import { ToastService } from '../../../../services/toast/toast.service'; +import { StepComponent } from '../step.partial'; + +@Component({ + selector: 'app-review-and-submit', + templateUrl: './review-and-submit.component.html', + styleUrls: ['./review-and-submit.component.scss'], +}) +export class ReviewAndSubmitComponent extends StepComponent implements OnInit, OnDestroy { + @Input() $notificationDocuments!: BehaviorSubject; + @Output() submit = new EventEmitter(); + + notificationSubmission: NotificationSubmissionDetailedDto | undefined; + + constructor(private router: Router, private toastService: ToastService) { + super(); + } + + ngOnInit(): void { + this.$notificationSubmission.pipe(takeUntil(this.$destroy)).subscribe((submission) => { + this.notificationSubmission = submission; + }); + } + + override async onNavigateToStep(step: number) { + await this.router.navigateByUrl(`notification/${this.notificationSubmission?.fileNumber}/edit/${step}?errors=t`); + } + + async onSubmitToAlcs() { + if (this.notificationSubmission) { + const el = document.getElementsByClassName('error'); + if (el && el.length > 0) { + el[0].scrollIntoView({ + behavior: 'smooth', + block: 'center', + }); + this.toastService.showErrorToast('Please correct all errors before submitting the form'); + } else { + this.submit.emit(); + } + } + } + + async onDownloadPdf(fileNumber: string | undefined) { + //TODO + } +} diff --git a/portal-frontend/src/app/features/notifications/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.html b/portal-frontend/src/app/features/notifications/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.html new file mode 100644 index 0000000000..1e91e2b708 --- /dev/null +++ b/portal-frontend/src/app/features/notifications/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.html @@ -0,0 +1,45 @@ +
+

Submit Notification of SRW

+
+ +
+

Your Notification of SRW will be submitted to the ALC.

+
+
Terms and Conditions:
+ + I/we confirm that the information provided to the ALC matches the SRW package that will be submitted to the Land + Title Survey Authority (LTSA). + + + I/we consent to the use of the information provided in the Notification of SRW and all supporting documents to + process the application in accordance with the Agricultural Land Commission Act, the Agricultural Land Reserve + General Regulation, and the Agricultural Land Reserve Use Regulation. + + + I/we declare that the information provided in the Notification of SRW and all the supporting documents are, to the + best of my/our knowledge, true and correct. + + + check_box I/we understand that the Agricultural Land Commission will take the steps necessary to confirm the + accuracy of the information and documents provided. This information will be available for review by any member of + the public. + +
+

+ If you have any questions about the collection or use of this information, please contact the Agricultural Land + Commission. +

+
+
+ + +
+
+
diff --git a/portal-frontend/src/app/features/notifications/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.scss b/portal-frontend/src/app/features/notifications/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.scss new file mode 100644 index 0000000000..93f22cbbcb --- /dev/null +++ b/portal-frontend/src/app/features/notifications/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.scss @@ -0,0 +1,18 @@ +@use '../../../../../../styles/functions' as *; + +.checkbox { + margin: rem(10) 0; +} + +p { + margin: rem(28) 0 !important; +} + +.step-controls { + display: flex; + justify-content: flex-end; + + button:not(:last-child) { + margin-right: rem(16) !important; + } +} diff --git a/portal-frontend/src/app/features/notifications/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.spec.ts b/portal-frontend/src/app/features/notifications/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.spec.ts new file mode 100644 index 0000000000..7d6d06ed68 --- /dev/null +++ b/portal-frontend/src/app/features/notifications/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.spec.ts @@ -0,0 +1,39 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { MAT_DIALOG_DATA, MatDialog, MatDialogRef } from '@angular/material/dialog'; +import { SubmitConfirmationDialogComponent } from './submit-confirmation-dialog.component'; + +describe('SubmitConfirmationDialogComponent', () => { + let component: SubmitConfirmationDialogComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [SubmitConfirmationDialogComponent], + providers: [ + { + provide: MatDialog, + useValue: {}, + }, + { + provide: MatDialogRef, + useValue: {}, + }, + { + provide: MAT_DIALOG_DATA, + useValue: {}, + }, + ], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(SubmitConfirmationDialogComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/notifications/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.ts b/portal-frontend/src/app/features/notifications/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.ts new file mode 100644 index 0000000000..79c353d727 --- /dev/null +++ b/portal-frontend/src/app/features/notifications/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.ts @@ -0,0 +1,14 @@ +import { Component, Inject } from '@angular/core'; +import { MAT_DIALOG_DATA } from '@angular/material/dialog'; + +@Component({ + selector: 'app-submit-confirmation-dialog', + templateUrl: './submit-confirmation-dialog.component.html', + styleUrls: ['./submit-confirmation-dialog.component.scss'], +}) +export class SubmitConfirmationDialogComponent { + constructor( + @Inject(MAT_DIALOG_DATA) + protected data: {} + ) {} +} diff --git a/portal-frontend/src/app/features/notifications/notification-details/notification-details.component.html b/portal-frontend/src/app/features/notifications/notification-details/notification-details.component.html new file mode 100644 index 0000000000..412f8e83a0 --- /dev/null +++ b/portal-frontend/src/app/features/notifications/notification-details/notification-details.component.html @@ -0,0 +1,105 @@ +
+ +
+
+

3. Primary Contact

+
+
First Name
+
+ {{ notificationSubmission.contactFirstName }} + +
+
Last Name
+
+ {{ notificationSubmission.contactLastName }} + +
+
+ Organization (optional) +
+
+ {{ notificationSubmission.contactOrganization }} + +
+
Phone
+
+ {{ notificationSubmission.contactPhone }} + + Invalid Format +
+
Email
+
+ {{ notificationSubmission.contactEmail }} + + Invalid Format +
+
+ +
+
+
+
+

4. Government

+
+
Local or First Nation Government
+
+ {{ localGovernment?.name }} + + + This Local/First Nation Government has not yet been set up with the ALC Portal to receive notice of intents. To + submit, you will need to contact the ALC directly:  ALC.Portal@gov.bc.ca / 236-468-3342 + +
+
+ +
+
+
+
+

5. Proposal

+ +
+
+

6. Optional Attachments

+
+
+
Type
+
Description
+
File Name
+ +
+ {{ file.type?.label }} + +
+
+ {{ file.description }} + +
+
+ {{ file.fileName }} +
+ +
+ +
+
+
+ +
+
+
diff --git a/portal-frontend/src/app/features/notifications/notification-details/notification-details.component.scss b/portal-frontend/src/app/features/notifications/notification-details/notification-details.component.scss new file mode 100644 index 0000000000..7ef4dbb6b8 --- /dev/null +++ b/portal-frontend/src/app/features/notifications/notification-details/notification-details.component.scss @@ -0,0 +1,151 @@ +@use '../../../../styles/functions' as *; +@use '../../../../styles/colors'; + +:host::ng-deep { + .view-grid-item { + display: grid; + grid-template-columns: minmax(rem(100), 0.5fr) 1fr; + column-gap: rem(16); + margin-bottom: rem(12); + } + + .details-wrapper { + margin-top: rem(24); + margin-bottom: rem(24); + + .title { + margin-bottom: rem(16) !important; + } + } + + h3 .subtext { + margin: 0.5rem 0 !important; + } + + label { + font-weight: 600; + } + + .no-data-text { + text-align: center; + color: colors.$grey; + padding-top: rem(12); + + .error { + justify-content: center; + } + } + + .custom-mat-expansion-panel-header { + height: fit-content; + } + + .table-wrapper { + overflow-x: auto; + width: 100%; + } + + @media screen and (min-width: $tabletBreakpoint) { + .flex-item { + display: flex; + gap: rem(16); + } + } +} + +:host::ng-deep { + .scrollable { + overflow-x: auto; + } + + .soil-table { + display: grid; + grid-template-columns: max-content max-content; + overflow-x: auto; + grid-column-gap: rem(36); + grid-row-gap: rem(12); + } + + .other-attachments { + display: grid; + grid-template-columns: max-content max-content max-content; + overflow-x: auto; + grid-column-gap: rem(36); + grid-row-gap: rem(12); + + .full-width { + grid-column: 1/3; + } + } + + .adjacent-parcels { + display: grid; + grid-template-columns: max-content max-content max-content; + overflow-x: auto; + grid-column-gap: rem(36); + grid-row-gap: rem(12); + + .full-width { + grid-column: 1/4; + } + } + + .review-table { + padding: rem(8); + margin: rem(12) 0 rem(20) 0; + background-color: colors.$grey-light; + display: grid; + grid-row-gap: rem(24); + grid-column-gap: rem(16); + grid-template-columns: 1fr; + word-wrap: break-word; + hyphens: auto; + + .edit-button { + display: flex; + justify-content: center; + + button { + width: 100%; + + @media screen and (min-width: $tabletBreakpoint) { + width: unset; + } + } + } + + .subheading2 { + margin-bottom: rem(4) !important; + } + + @media screen and (min-width: $tabletBreakpoint) { + padding: rem(16); + margin: rem(24) 0 rem(40) 0; + grid-template-columns: minmax(rem(60), 1fr) minmax(rem(60), 1fr) minmax(rem(60), 1fr) minmax(rem(60), 1fr); + + .full-width { + grid-column: 1/5; + } + + .grid-double { + grid-column: 2/5; + } + + .grid-1 { + grid-column: 1/2; + } + + .grid-2 { + grid-column: 2/3; + } + + .grid-3 { + grid-column: 3/5; + } + + .edit-button { + grid-column: 1/5; + } + } + } +} diff --git a/portal-frontend/src/app/features/notifications/notification-details/notification-details.component.spec.ts b/portal-frontend/src/app/features/notifications/notification-details/notification-details.component.spec.ts new file mode 100644 index 0000000000..69b527af07 --- /dev/null +++ b/portal-frontend/src/app/features/notifications/notification-details/notification-details.component.spec.ts @@ -0,0 +1,62 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { Router } from '@angular/router'; +import { DeepMocked, createMock } from '@golevelup/ts-jest'; +import { BehaviorSubject } from 'rxjs'; +import { CodeService } from '../../../services/code/code.service'; +import { NoticeOfIntentDocumentDto } from '../../../services/notice-of-intent-document/notice-of-intent-document.dto'; +import { NoticeOfIntentDocumentService } from '../../../services/notice-of-intent-document/notice-of-intent-document.service'; +import { NoticeOfIntentSubmissionDetailedDto } from '../../../services/notice-of-intent-submission/notice-of-intent-submission.dto'; +import { NoticeOfIntentSubmissionService } from '../../../services/notice-of-intent-submission/notice-of-intent-submission.service'; +import { NotificationDocumentDto } from '../../../services/notification-document/notification-document.dto'; +import { NotificationDocumentService } from '../../../services/notification-document/notification-document.service'; +import { NotificationSubmissionDetailedDto } from '../../../services/notification-submission/notification-submission.dto'; +import { NotificationSubmissionService } from '../../../services/notification-submission/notification-submission.service'; +import { ToastService } from '../../../services/toast/toast.service'; + +import { NotificationDetailsComponent } from './notification-details.component'; + +describe('NoticeOfIntentDetailsComponent', () => { + let component: NotificationDetailsComponent; + let fixture: ComponentFixture; + let mockCodeService: DeepMocked; + let mockDocumentService: DeepMocked; + let mockRouter: DeepMocked; + + let documentPipe = new BehaviorSubject([]); + + beforeEach(async () => { + mockCodeService = createMock(); + mockDocumentService = createMock(); + mockRouter = createMock(); + + await TestBed.configureTestingModule({ + providers: [ + { + provide: CodeService, + useValue: mockCodeService, + }, + { + provide: NotificationDocumentService, + useValue: mockDocumentService, + }, + { + provide: Router, + useValue: mockRouter, + }, + ], + declarations: [NotificationDetailsComponent], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(NotificationDetailsComponent); + component = fixture.componentInstance; + component.$notificationSubmission = new BehaviorSubject(undefined); + component.$notificationDocuments = documentPipe; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/notifications/notification-details/notification-details.component.ts b/portal-frontend/src/app/features/notifications/notification-details/notification-details.component.ts new file mode 100644 index 0000000000..ff6fdc05f1 --- /dev/null +++ b/portal-frontend/src/app/features/notifications/notification-details/notification-details.component.ts @@ -0,0 +1,91 @@ +import { Component, Input, OnDestroy, OnInit } from '@angular/core'; +import { Router } from '@angular/router'; +import { BehaviorSubject, Subject, takeUntil } from 'rxjs'; +import { PARCEL_TYPE } from '../../../services/application-parcel/application-parcel.dto'; +import { LocalGovernmentDto } from '../../../services/code/code.dto'; +import { CodeService } from '../../../services/code/code.service'; +import { NotificationDocumentDto } from '../../../services/notification-document/notification-document.dto'; +import { NotificationDocumentService } from '../../../services/notification-document/notification-document.service'; +import { NotificationSubmissionDetailedDto } from '../../../services/notification-submission/notification-submission.dto'; +import { DOCUMENT_SOURCE, DOCUMENT_TYPE } from '../../../shared/dto/document.dto'; +import { OWNER_TYPE } from '../../../shared/dto/owner.dto'; + +@Component({ + selector: 'app-notification-details', + templateUrl: './notification-details.component.html', + styleUrls: ['./notification-details.component.scss'], +}) +export class NotificationDetailsComponent implements OnInit, OnDestroy { + $destroy = new Subject(); + + @Input() $notificationSubmission!: BehaviorSubject; + @Input() $notificationDocuments!: BehaviorSubject; + @Input() showErrors = true; + @Input() showEdit = true; + + parcelType = PARCEL_TYPE; + notificationSubmission: NotificationSubmissionDetailedDto | undefined; + localGovernment: LocalGovernmentDto | undefined; + otherFiles: NotificationDocumentDto[] = []; + notificationDocuments: NotificationDocumentDto[] = []; + OWNER_TYPE = OWNER_TYPE; + + private localGovernments: LocalGovernmentDto[] = []; + private otherFileTypes = [DOCUMENT_TYPE.PHOTOGRAPH, DOCUMENT_TYPE.PROFESSIONAL_REPORT, DOCUMENT_TYPE.OTHER]; + + constructor( + private codeService: CodeService, + private notificationDocumentService: NotificationDocumentService, + private router: Router + ) {} + + ngOnInit(): void { + this.loadGovernments(); + this.$notificationSubmission.pipe(takeUntil(this.$destroy)).subscribe((notificationSubmission) => { + this.notificationSubmission = notificationSubmission; + if (notificationSubmission) { + this.populateLocalGovernment(notificationSubmission.localGovernmentUuid); + } + }); + + this.$notificationDocuments.pipe(takeUntil(this.$destroy)).subscribe((documents) => { + this.otherFiles = documents + .filter((file) => (file.type ? this.otherFileTypes.includes(file.type.code) : true)) + .filter((file) => file.source === DOCUMENT_SOURCE.APPLICANT) + .sort((a, b) => { + return a.uploadedAt - b.uploadedAt; + }); + + this.notificationDocuments = documents; + }); + } + + ngOnDestroy(): void { + this.$destroy.next(); + this.$destroy.complete(); + } + + async openFile(uuid: string) { + const res = await this.notificationDocumentService.openFile(uuid); + window.open(res?.url, '_blank'); + } + + async onNavigateToStep(step: number) { + await this.router.navigateByUrl(`notification/${this.notificationSubmission?.fileNumber}/edit/${step}?errors=t`); + } + + private async loadGovernments() { + const codes = await this.codeService.loadCodes(); + this.localGovernments = codes.localGovernments.sort((a, b) => (a.name > b.name ? 1 : -1)); + if (this.notificationSubmission?.localGovernmentUuid) { + this.populateLocalGovernment(this.notificationSubmission?.localGovernmentUuid); + } + } + + private populateLocalGovernment(governmentUuid: string) { + const lg = this.localGovernments.find((lg) => lg.uuid === governmentUuid); + if (lg) { + this.localGovernment = lg; + } + } +} diff --git a/portal-frontend/src/app/features/notifications/notification-details/notification-details.module.ts b/portal-frontend/src/app/features/notifications/notification-details/notification-details.module.ts new file mode 100644 index 0000000000..c7499b1cfe --- /dev/null +++ b/portal-frontend/src/app/features/notifications/notification-details/notification-details.module.ts @@ -0,0 +1,14 @@ +import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; +import { NgxMaskPipe } from 'ngx-mask'; +import { SharedModule } from '../../../shared/shared.module'; +import { NotificationDetailsComponent } from './notification-details.component'; +import { ParcelComponent } from './parcel/parcel.component'; +import { ProposalDetailsComponent } from './proposal-details/proposal-details.component'; + +@NgModule({ + declarations: [ParcelComponent, ProposalDetailsComponent, NotificationDetailsComponent], + imports: [CommonModule, SharedModule, NgxMaskPipe], + exports: [NotificationDetailsComponent], +}) +export class NotificationDetailsModule {} diff --git a/portal-frontend/src/app/features/notifications/notification-details/parcel/parcel.component.html b/portal-frontend/src/app/features/notifications/notification-details/parcel/parcel.component.html new file mode 100644 index 0000000000..2f315378b6 --- /dev/null +++ b/portal-frontend/src/app/features/notifications/notification-details/parcel/parcel.component.html @@ -0,0 +1,71 @@ +

1. Identify Parcel(s) Under Application

+
+ +
+

Parcel {{ parcelInd + 1 }}: Parcel and Owner Information

+
+ +
+
+
Parcel Information
+
Ownership Type
+
+ {{ parcel.ownershipType?.label }} + +
+
Legal Description
+
+ {{ parcel.legalDescription }} + +
+
Area (Hectares)
+
+ {{ parcel.mapAreaHectares }} + +
+
+ PID {{ parcel.ownershipType?.code === PARCEL_OWNERSHIP_TYPES.CROWN ? '(optional)' : '' }} +
+
+ {{ parcel.pid | mask : '000-000-000' }} + + + Invalid Format + +
+ +
PIN (optional)
+
+ {{ parcel.pin }} + +
+ +
Civic Address
+
+ {{ parcel.civicAddress }} + +
+
+ +
+ +
+ +
+
diff --git a/portal-frontend/src/app/features/notifications/notification-details/parcel/parcel.component.scss b/portal-frontend/src/app/features/notifications/notification-details/parcel/parcel.component.scss new file mode 100644 index 0000000000..ecf9d4a24c --- /dev/null +++ b/portal-frontend/src/app/features/notifications/notification-details/parcel/parcel.component.scss @@ -0,0 +1,39 @@ +@use '../../../../../styles/functions' as *; + +.owner-information { + display: grid; + grid-template-columns: max-content max-content max-content max-content max-content max-content; + overflow-x: auto; + grid-column-gap: rem(36); + grid-row-gap: rem(12); + + .full-width { + grid-column: 1/3; + } +} + +.review-table { + grid-template-columns: 1fr 1fr !important; + + .full-width { + grid-column: 1/3; + } + + .edit-button { + grid-column: 1/3; + } + + @media screen and (min-width: $tabletBreakpoint) { + .full-width { + grid-column: 1/5; + } + + .edit-button { + grid-column: 1/5; + } + } +} + +.crown-land { + text-transform: capitalize; +} diff --git a/portal-frontend/src/app/features/notifications/notification-details/parcel/parcel.component.spec.ts b/portal-frontend/src/app/features/notifications/notification-details/parcel/parcel.component.spec.ts new file mode 100644 index 0000000000..6ba3abd1dc --- /dev/null +++ b/portal-frontend/src/app/features/notifications/notification-details/parcel/parcel.component.spec.ts @@ -0,0 +1,43 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { Router } from '@angular/router'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { BehaviorSubject } from 'rxjs'; +import { NotificationParcelService } from '../../../../services/notification-parcel/notification-parcel.service'; +import { NotificationSubmissionDetailedDto } from '../../../../services/notification-submission/notification-submission.dto'; +import { ParcelComponent } from './parcel.component'; + +describe('ParcelComponent', () => { + let component: ParcelComponent; + let fixture: ComponentFixture; + + let mockNotificationParcelService: DeepMocked; + + beforeEach(async () => { + mockNotificationParcelService = createMock(); + + await TestBed.configureTestingModule({ + declarations: [ParcelComponent], + providers: [ + { + provide: NotificationParcelService, + useValue: mockNotificationParcelService, + }, + { + provides: Router, + useValue: {}, + }, + ], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(ParcelComponent); + component = fixture.componentInstance; + component.$notificationSubmission = new BehaviorSubject(undefined); + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/notifications/notification-details/parcel/parcel.component.ts b/portal-frontend/src/app/features/notifications/notification-details/parcel/parcel.component.ts new file mode 100644 index 0000000000..c7430df8dd --- /dev/null +++ b/portal-frontend/src/app/features/notifications/notification-details/parcel/parcel.component.ts @@ -0,0 +1,59 @@ +import { Component, Input } from '@angular/core'; +import { Router } from '@angular/router'; +import { BehaviorSubject, Subject, takeUntil } from 'rxjs'; +import { PARCEL_OWNERSHIP_TYPE } from '../../../../services/application-parcel/application-parcel.dto'; +import { NotificationParcelDto } from '../../../../services/notification-parcel/notification-parcel.dto'; +import { NotificationParcelService } from '../../../../services/notification-parcel/notification-parcel.service'; +import { NotificationSubmissionDetailedDto } from '../../../../services/notification-submission/notification-submission.dto'; + +@Component({ + selector: 'app-parcel', + templateUrl: './parcel.component.html', + styleUrls: ['./parcel.component.scss'], +}) +export class ParcelComponent { + $destroy = new Subject(); + + @Input() $notificationSubmission!: BehaviorSubject; + @Input() showErrors = true; + @Input() showEdit = true; + + PARCEL_OWNERSHIP_TYPES = PARCEL_OWNERSHIP_TYPE; + + fileId = ''; + submissionUuid = ''; + parcels: NotificationParcelDto[] = []; + noticeOfIntentSubmission!: NotificationSubmissionDetailedDto; + updatedFields: string[] = []; + + constructor(private noticeOfIntentParcelService: NotificationParcelService, private router: Router) {} + + ngOnInit(): void { + this.$notificationSubmission.pipe(takeUntil(this.$destroy)).subscribe((noiSubmission) => { + if (noiSubmission) { + this.fileId = noiSubmission.fileNumber; + this.submissionUuid = noiSubmission.uuid; + this.noticeOfIntentSubmission = noiSubmission; + this.loadParcels(); + } + }); + } + + ngOnDestroy(): void { + this.$destroy.next(); + this.$destroy.complete(); + } + + async loadParcels() { + this.parcels = (await this.noticeOfIntentParcelService.fetchBySubmissionUuid(this.submissionUuid)) || []; + } + + async onEditParcelsClick($event: any) { + $event.stopPropagation(); + await this.router.navigateByUrl(`notification/${this.fileId}/edit/0?errors=t`); + } + + async onEditParcelClick(uuid: string) { + await this.router.navigateByUrl(`notification/${this.fileId}/edit/0?parcelUuid=${uuid}&errors=t`); + } +} diff --git a/portal-frontend/src/app/features/notifications/notification-details/proposal-details/proposal-details.component.html b/portal-frontend/src/app/features/notifications/notification-details/proposal-details/proposal-details.component.html new file mode 100644 index 0000000000..6e8283ed1c --- /dev/null +++ b/portal-frontend/src/app/features/notifications/notification-details/proposal-details/proposal-details.component.html @@ -0,0 +1,59 @@ +
+
Submitter’s File Number
+
+ {{ _notificationSubmission.submittersFileNumber }} + +
+ +
What is the purpose of the SRW?
+
+ {{ _notificationSubmission.purpose }} + +
+ +
Total area of the SRW
+
+ {{ _notificationSubmission.totalArea }} + +
+ +
Upload Terms of the SRW
+
+ + {{ file.fileName }} + + +
+ +
Is there a survey plan associated with the SRW?
+
+ + {{ _notificationSubmission.hasSurveyPlan ? 'Yes' : 'No' }} + + +
+ + +
+
File Name
+
Survey Plan Number
+
Control Number
+ +
{{ file.fileName }}
+
+ {{ file.surveyPlanNumber }} + +
+
+ {{ file.controlNumber }} + +
+ + +
+ + +
+ +
+
diff --git a/portal-frontend/src/app/features/notifications/notification-details/proposal-details/proposal-details.component.scss b/portal-frontend/src/app/features/notifications/notification-details/proposal-details/proposal-details.component.scss new file mode 100644 index 0000000000..8ce457dba6 --- /dev/null +++ b/portal-frontend/src/app/features/notifications/notification-details/proposal-details/proposal-details.component.scss @@ -0,0 +1,8 @@ +@use '../../../../../styles/functions' as *; + +.survey-table { + display: grid; + grid-column-gap: rem(16); + grid-row-gap: rem(8); + grid-template-columns: max-content max-content max-content; +} diff --git a/portal-frontend/src/app/features/notifications/notification-details/proposal-details/proposal-details.component.spec.ts b/portal-frontend/src/app/features/notifications/notification-details/proposal-details/proposal-details.component.spec.ts new file mode 100644 index 0000000000..6bc8714fa7 --- /dev/null +++ b/portal-frontend/src/app/features/notifications/notification-details/proposal-details/proposal-details.component.spec.ts @@ -0,0 +1,35 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { NoticeOfIntentDocumentService } from '../../../../services/notice-of-intent-document/notice-of-intent-document.service'; +import { NoticeOfIntentParcelService } from '../../../../services/notice-of-intent-parcel/notice-of-intent-parcel.service'; +import { NotificationDocumentService } from '../../../../services/notification-document/notification-document.service'; + +import { ProposalDetailsComponent } from './proposal-details.component'; + +describe('ProposalDetailsComponent', () => { + let component: ProposalDetailsComponent; + let fixture: ComponentFixture; + let mockNoiDocumentService: DeepMocked; + + beforeEach(async () => { + mockNoiDocumentService = createMock(); + + await TestBed.configureTestingModule({ + declarations: [ProposalDetailsComponent], + providers: [ + { + provide: NotificationDocumentService, + useValue: mockNoiDocumentService, + }, + ], + }).compileComponents(); + + fixture = TestBed.createComponent(ProposalDetailsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/notifications/notification-details/proposal-details/proposal-details.component.ts b/portal-frontend/src/app/features/notifications/notification-details/proposal-details/proposal-details.component.ts new file mode 100644 index 0000000000..5db233e2db --- /dev/null +++ b/portal-frontend/src/app/features/notifications/notification-details/proposal-details/proposal-details.component.ts @@ -0,0 +1,46 @@ +import { Component, Input } from '@angular/core'; +import { Router } from '@angular/router'; +import { NoticeOfIntentDocumentDto } from '../../../../services/notice-of-intent-document/notice-of-intent-document.dto'; +import { NoticeOfIntentDocumentService } from '../../../../services/notice-of-intent-document/notice-of-intent-document.service'; +import { NoticeOfIntentSubmissionDetailedDto } from '../../../../services/notice-of-intent-submission/notice-of-intent-submission.dto'; +import { NotificationDocumentDto } from '../../../../services/notification-document/notification-document.dto'; +import { NotificationDocumentService } from '../../../../services/notification-document/notification-document.service'; +import { NotificationSubmissionDetailedDto } from '../../../../services/notification-submission/notification-submission.dto'; +import { DOCUMENT_TYPE } from '../../../../shared/dto/document.dto'; + +@Component({ + selector: 'app-proposal-details[notificationSubmission]', + templateUrl: './proposal-details.component.html', + styleUrls: ['./proposal-details.component.scss'], +}) +export class ProposalDetailsComponent { + @Input() showErrors = true; + @Input() showEdit = true; + + _notificationSubmission: NotificationSubmissionDetailedDto | undefined; + + @Input() set notificationSubmission(notificationSubmission: NotificationSubmissionDetailedDto | undefined) { + if (notificationSubmission) { + this._notificationSubmission = notificationSubmission; + } + } + + @Input() set notificationDocuments(documents: NotificationDocumentDto[]) { + this.surveyPlans = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.SURVEY_PLAN); + this.srwTerms = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.SRW_TERMS); + } + + surveyPlans: NotificationDocumentDto[] = []; + srwTerms: NotificationDocumentDto[] = []; + + constructor(private router: Router, private notificationDocumentService: NotificationDocumentService) {} + + async onEditSection(step: number) { + await this.router.navigateByUrl(`notification/${this._notificationSubmission?.fileNumber}/edit/${step}?errors=t`); + } + + async openFile(uuid: string) { + const res = await this.notificationDocumentService.openFile(uuid); + window.open(res?.url, '_blank'); + } +} diff --git a/services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.controller.spec.ts b/services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.controller.spec.ts index 5415df50ea..2061680d07 100644 --- a/services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.controller.spec.ts +++ b/services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.controller.spec.ts @@ -79,15 +79,13 @@ describe('NotificationParcelController', () => { }); it('should call out to service when fetching parcels', async () => { - mockNotificationParcelService.fetchByApplicationSubmissionUuid.mockResolvedValue( - [], - ); + mockNotificationParcelService.fetchBySubmissionUuid.mockResolvedValue([]); const parcels = await controller.fetchByFileId('mockFileID'); expect(parcels).toBeDefined(); expect( - mockNotificationParcelService.fetchByApplicationSubmissionUuid, + mockNotificationParcelService.fetchBySubmissionUuid, ).toHaveBeenCalledTimes(1); }); diff --git a/services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.controller.ts b/services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.controller.ts index b71ae3cedd..94c8f4d285 100644 --- a/services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.controller.ts +++ b/services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.controller.ts @@ -36,7 +36,7 @@ export class NotificationParcelController { async fetchByFileId( @Param('submissionUuid') submissionUuid: string, ): Promise { - const parcels = await this.parcelService.fetchByApplicationSubmissionUuid( + const parcels = await this.parcelService.fetchBySubmissionUuid( submissionUuid, ); return this.mapper.mapArrayAsync( diff --git a/services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.service.ts b/services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.service.ts index 9dacb9fa06..376b93981e 100644 --- a/services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.service.ts +++ b/services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.service.ts @@ -21,10 +21,13 @@ export class NotificationParcelService { }); } - async fetchByApplicationSubmissionUuid(uuid: string) { + async fetchBySubmissionUuid(uuid: string) { return this.parcelRepository.find({ where: { notificationSubmissionUuid: uuid }, order: { auditCreatedAt: 'ASC' }, + relations: { + ownershipType: true, + }, }); } From 4d9b7751a91f674dea165a19d6c7feacd440cb7d Mon Sep 17 00:00:00 2001 From: "to. sandra" <76515860+sandratoh@users.noreply.github.com> Date: Thu, 7 Sep 2023 15:43:32 -0700 Subject: [PATCH 362/954] Update top nav with advanced search (#955) * Update searchbar with icon toggle and advanced search button * Close input when clicked outside of search component * Add search bar slide in animation and update toggle behaviour --- .../search-bar/search-bar.component.html | 42 ++++++--- .../search-bar/search-bar.component.scss | 90 ++++++++++++++----- .../header/search-bar/search-bar.component.ts | 32 ++++++- 3 files changed, 127 insertions(+), 37 deletions(-) diff --git a/alcs-frontend/src/app/shared/header/search-bar/search-bar.component.html b/alcs-frontend/src/app/shared/header/search-bar/search-bar.component.html index bdc29dafa4..16290e8d95 100644 --- a/alcs-frontend/src/app/shared/header/search-bar/search-bar.component.html +++ b/alcs-frontend/src/app/shared/header/search-bar/search-bar.component.html @@ -1,13 +1,31 @@ -
- - - search - + +
+
+ + + + +
+
+ + + +
diff --git a/alcs-frontend/src/app/shared/header/search-bar/search-bar.component.scss b/alcs-frontend/src/app/shared/header/search-bar/search-bar.component.scss index 54007f9094..d388448423 100644 --- a/alcs-frontend/src/app/shared/header/search-bar/search-bar.component.scss +++ b/alcs-frontend/src/app/shared/header/search-bar/search-bar.component.scss @@ -1,13 +1,52 @@ @use '../../../../styles/colors'; -.search-bar { - background-color: colors.$primary-color-dark; - font-size: 16px; +.icon { color: colors.$white; +} + +.search-container { + display: flex; + width: fit-content; + flex-direction: column; + position: relative; +} + +.advanced-search { + background: colors.$white; + position: absolute; + top: 56px; + right: 0; + left: 0; + bottom: 0; + height: fit-content; + padding: 12px; + box-shadow: 0 2px 8px 1px rgba(0, 0, 0, 0.25); + border-radius: 0 0 4px 4px; + z-index: 9999; + + a { + display: flex; + height: fit-content; + text-decoration: none; + } + + button { + width: 100%; + background: colors.$white; + } +} + +.search-bar { + align-items: center; + background-color: colors.$white; border-radius: 4px; + color: colors.$primary-color; + font-size: 16px; + display: flex; + height: 56px; .mat-icon { - font-size: 125%; + font-size: 175%; } ::ng-deep .mat-mdc-form-field-subscript-wrapper { @@ -18,25 +57,37 @@ .mdc-notched-outline__leading, .mdc-notched-outline__trailing, .mdc-notched-outline__notch { - border-color: #fff !important; + border-color: colors.$primary-color-light !important; } } + + ::ng-deep .mdc-text-field--outlined { + .mdc-notched-outline__leading, + .mdc-notched-outline__trailing, + .mdc-notched-outline__notch { + border-top-right-radius: 0 !important; + border-bottom-right-radius: 0 !important; + border-bottom-left-radius: 0 !important; + border-color: colors.$primary-color !important; + } + } + + button { + align-items: center; + background: colors.$primary-color-dark; + border-radius: 0 4px 0 0; + color: colors.$white; + display: flex; + height: 100%; + } } input { - color: colors.$white; + color: colors.$primary-color; } .mat-mdc-input-element { - color: #fff !important; - &::placeholder { - color: colors.$grey-light !important; - letter-spacing: 0.5px; - } -} - -:host ::ng-deep .mat-form-field-flex { - border-radius: 4px; + color: colors.$primary-color !important; } :host ::ng-deep .mat-form-field-wrapper { @@ -55,12 +106,3 @@ input { :host ::ng-deep .mat-form-field-appearance-outline .mat-form-field-outline { top: 0; } - -:host ::ng-deep .mdc-form-field-appearance--outlined.mdc--focused:hover .mdc-form-field--outlined, -:host ::ng-deep .mdc-form-field-appearance--outlined.mdc--focused .mdc-form-field--outlined { - color: colors.$primary-color-light !important; -} - -:host ::ng-deep .mat-mdc-form-field-appearance-outline:hover .mat-mdc-form-field-outline { - color: rgba(colors.$primary-color-light, 0.7); -} diff --git a/alcs-frontend/src/app/shared/header/search-bar/search-bar.component.ts b/alcs-frontend/src/app/shared/header/search-bar/search-bar.component.ts index cd1278ee1e..6da7767275 100644 --- a/alcs-frontend/src/app/shared/header/search-bar/search-bar.component.ts +++ b/alcs-frontend/src/app/shared/header/search-bar/search-bar.component.ts @@ -1,21 +1,49 @@ import { HttpErrorResponse } from '@angular/common/http'; -import { Component, ElementRef, ViewChild } from '@angular/core'; +import { Component, ElementRef, HostListener, ViewChild } from '@angular/core'; import { Router } from '@angular/router'; import { SearchService } from '../../../services/search/search.service'; import { ToastService } from '../../../services/toast/toast.service'; +import { animate, style, transition, trigger } from '@angular/animations'; @Component({ selector: 'app-search-bar', templateUrl: './search-bar.component.html', styleUrls: ['./search-bar.component.scss'], + animations: [ + trigger('inAnimation', [transition(':enter', [style({ height: 0, opacity: 0 }), animate('100ms ease-out')])]), + ], }) export class SearchBarComponent { searchText = ''; + showInput = false; + wasInside = false; @ViewChild('searchInput') input!: ElementRef; constructor(private toastService: ToastService, private router: Router, private searchService: SearchService) {} + @HostListener('click') + clickInside() { + this.wasInside = true; + } + + @HostListener('document:click') + clickOutside() { + if (!this.wasInside) { + this.showInput = false; + } + this.wasInside = false; + } + + async toggleInput() { + this.showInput = !this.showInput; + } + async onSearch() { + if (!this.searchText) { + this.toastService.showErrorToast(`File not found, try again`); + return; + } + try { const searchResult = await this.searchService.fetch(this.searchText); if (!searchResult || searchResult.length < 1) { @@ -41,10 +69,12 @@ export class SearchBarComponent { default: this.toastService.showErrorToast(`Unable to navigate to ${result.referenceId}`); } + this.toggleInput(); } if (searchResult?.length > 1) { await this.router.navigateByUrl(`/search?searchText=${this.searchText}`); + this.toggleInput(); } this.searchText = ''; From 368767e05645291134eaa9c6a2f412ddce4118f2 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Thu, 7 Sep 2023 15:58:17 -0700 Subject: [PATCH 363/954] Add special handling for Corporate Summary / Certificate of Title * Add loading of owners / parcels * Mark previous documents as superseded --- .../document-upload-dialog.component.ts | 15 +- .../document-upload-dialog.component.spec.ts | 12 + .../document-upload-dialog.component.ts | 91 +++++++- .../notice-of-intent/notice-of-intent.dto.ts | 2 +- ...tice-of-intent-document.controller.spec.ts | 216 +++++++++--------- .../notice-of-intent-document.controller.ts | 135 ++++++----- 6 files changed, 279 insertions(+), 192 deletions(-) diff --git a/alcs-frontend/src/app/features/application/documents/document-upload-dialog/document-upload-dialog.component.ts b/alcs-frontend/src/app/features/application/documents/document-upload-dialog/document-upload-dialog.component.ts index 0c24522f27..5b88dd2263 100644 --- a/alcs-frontend/src/app/features/application/documents/document-upload-dialog/document-upload-dialog.component.ts +++ b/alcs-frontend/src/app/features/application/documents/document-upload-dialog/document-upload-dialog.component.ts @@ -2,12 +2,6 @@ import { Component, Inject, OnDestroy, OnInit } from '@angular/core'; import { FormControl, FormGroup, Validators } from '@angular/forms'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { Subject } from 'rxjs'; -import { - DOCUMENT_SOURCE, - DOCUMENT_SYSTEM, - DOCUMENT_TYPE, - DocumentTypeDto, -} from '../../../../shared/document/document.dto'; import { ApplicationDocumentDto, UpdateDocumentDto, @@ -15,7 +9,12 @@ import { import { ApplicationDocumentService } from '../../../../services/application/application-document/application-document.service'; import { ApplicationParcelService } from '../../../../services/application/application-parcel/application-parcel.service'; import { ApplicationSubmissionService } from '../../../../services/application/application-submission/application-submission.service'; -import { SubmittedApplicationOwnerDto } from '../../../../services/application/application.dto'; +import { + DOCUMENT_SOURCE, + DOCUMENT_SYSTEM, + DOCUMENT_TYPE, + DocumentTypeDto, +} from '../../../../shared/document/document.dto'; @Component({ selector: 'app-document-upload-dialog', @@ -63,7 +62,7 @@ export class DocumentUploadDialogComponent implements OnInit, OnDestroy { constructor( @Inject(MAT_DIALOG_DATA) - public data: { fileId: string; owners: SubmittedApplicationOwnerDto[]; existingDocument?: ApplicationDocumentDto }, + public data: { fileId: string; existingDocument?: ApplicationDocumentDto }, protected dialog: MatDialogRef, private applicationDocumentService: ApplicationDocumentService, private parcelService: ApplicationParcelService, diff --git a/alcs-frontend/src/app/features/notice-of-intent/documents/document-upload-dialog/document-upload-dialog.component.spec.ts b/alcs-frontend/src/app/features/notice-of-intent/documents/document-upload-dialog/document-upload-dialog.component.spec.ts index 9d762e6135..8ae40d3a2b 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/documents/document-upload-dialog/document-upload-dialog.component.spec.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/documents/document-upload-dialog/document-upload-dialog.component.spec.ts @@ -3,6 +3,8 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MAT_DIALOG_DATA, MatDialogModule, MatDialogRef } from '@angular/material/dialog'; import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { NoiDocumentService } from '../../../../services/notice-of-intent/noi-document/noi-document.service'; +import { NoticeOfIntentParcelService } from '../../../../services/notice-of-intent/notice-of-intent-parcel/notice-of-intent-parcel.service'; +import { NoticeOfIntentSubmissionService } from '../../../../services/notice-of-intent/notice-of-intent-submission/notice-of-intent-submission.service'; import { DocumentUploadDialogComponent } from './document-upload-dialog.component'; @@ -11,6 +13,8 @@ describe('DocumentUploadDialogComponent', () => { let fixture: ComponentFixture; let mockNoiDocService: DeepMocked; + let mockParcelService: DeepMocked; + let mockSubmissionService: DeepMocked; beforeEach(async () => { mockNoiDocService = createMock(); @@ -29,6 +33,14 @@ describe('DocumentUploadDialogComponent', () => { provide: NoiDocumentService, useValue: mockNoiDocService, }, + { + provide: NoticeOfIntentParcelService, + useValue: mockParcelService, + }, + { + provide: NoticeOfIntentSubmissionService, + useValue: mockSubmissionService, + }, { provide: MatDialogRef, useValue: mockDialogRef }, { provide: MAT_DIALOG_DATA, useValue: {} }, ], diff --git a/alcs-frontend/src/app/features/notice-of-intent/documents/document-upload-dialog/document-upload-dialog.component.ts b/alcs-frontend/src/app/features/notice-of-intent/documents/document-upload-dialog/document-upload-dialog.component.ts index 05d6eb9077..f1daabbe0f 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/documents/document-upload-dialog/document-upload-dialog.component.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/documents/document-upload-dialog/document-upload-dialog.component.ts @@ -2,6 +2,8 @@ import { Component, Inject, OnDestroy, OnInit } from '@angular/core'; import { FormControl, FormGroup, Validators } from '@angular/forms'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { Subject } from 'rxjs'; +import { NoticeOfIntentParcelService } from '../../../../services/notice-of-intent/notice-of-intent-parcel/notice-of-intent-parcel.service'; +import { NoticeOfIntentSubmissionService } from '../../../../services/notice-of-intent/notice-of-intent-submission/notice-of-intent-submission.service'; import { DOCUMENT_SOURCE, DOCUMENT_SYSTEM, @@ -62,7 +64,9 @@ export class DocumentUploadDialogComponent implements OnInit, OnDestroy { @Inject(MAT_DIALOG_DATA) public data: { fileId: string; existingDocument?: NoticeOfIntentDocumentDto }, protected dialog: MatDialogRef, - private applicationDocumentService: NoiDocumentService + private noiDocumentService: NoiDocumentService, + private noiSubmissionService: NoticeOfIntentSubmissionService, + private noiParcelService: NoticeOfIntentParcelService ) {} ngOnInit(): void { @@ -72,6 +76,16 @@ export class DocumentUploadDialogComponent implements OnInit, OnDestroy { const document = this.data.existingDocument; this.title = 'Edit'; this.allowsFileEdit = document.system === DOCUMENT_SYSTEM.ALCS; + + if (document.type?.code === DOCUMENT_TYPE.CERTIFICATE_OF_TITLE) { + this.prepareCertificateOfTitleUpload(document.uuid); + this.allowsFileEdit = false; + } + if (document.type?.code === DOCUMENT_TYPE.CORPORATE_SUMMARY) { + this.allowsFileEdit = false; + this.prepareCorporateSummaryUpload(document.uuid); + } + this.form.patchValue({ name: document.fileName, type: document.type?.code, @@ -111,9 +125,9 @@ export class DocumentUploadDialogComponent implements OnInit, OnDestroy { const file = this.pendingFile; this.isSaving = true; if (this.data.existingDocument) { - await this.applicationDocumentService.update(this.data.existingDocument.uuid, dto); + await this.noiDocumentService.update(this.data.existingDocument.uuid, dto); } else if (file !== undefined) { - await this.applicationDocumentService.upload(this.data.fileId, { + await this.noiDocumentService.upload(this.data.fileId, { ...dto, file, }); @@ -141,6 +155,24 @@ export class DocumentUploadDialogComponent implements OnInit, OnDestroy { } else { this.type.setValue(undefined); } + + if (this.type.value === DOCUMENT_TYPE.CERTIFICATE_OF_TITLE) { + await this.prepareCertificateOfTitleUpload(); + this.visibleToInternal.setValue(true); + } else { + this.parcelId.setValue(null); + this.parcelId.setValidators([]); + this.parcelId.updateValueAndValidity(); + } + + if (this.type.value === DOCUMENT_TYPE.CORPORATE_SUMMARY) { + await this.prepareCorporateSummaryUpload(); + this.visibleToInternal.setValue(true); + } else { + this.ownerId.setValue(null); + this.ownerId.setValidators([]); + this.ownerId.updateValueAndValidity(); + } } uploadFile(event: Event) { @@ -166,15 +198,58 @@ export class DocumentUploadDialogComponent implements OnInit, OnDestroy { async openExistingFile() { if (this.data.existingDocument) { - await this.applicationDocumentService.download( - this.data.existingDocument.uuid, - this.data.existingDocument.fileName - ); + await this.noiDocumentService.download(this.data.existingDocument.uuid, this.data.existingDocument.fileName); + } + } + + private async prepareCertificateOfTitleUpload(uuid?: string) { + const parcels = await this.noiParcelService.fetchParcels(this.data.fileId); + if (parcels.length > 0) { + this.parcelId.setValidators([Validators.required]); + this.parcelId.updateValueAndValidity(); + this.source.setValue(DOCUMENT_SOURCE.APPLICANT); + + const selectedParcel = parcels.find((parcel) => parcel.certificateOfTitleUuid === uuid); + if (selectedParcel) { + this.parcelId.setValue(selectedParcel.uuid); + } else if (uuid) { + this.showSupersededWarning = true; + } + + this.selectableParcels = parcels.map((parcel, index) => ({ + uuid: parcel.uuid, + pid: parcel.pid, + index: index, + })); + } + } + + private async prepareCorporateSummaryUpload(uuid?: string) { + const submission = await this.noiSubmissionService.fetchSubmission(this.data.fileId); + if (submission.owners.length > 0) { + const owners = submission.owners; + this.ownerId.setValidators([Validators.required]); + this.ownerId.updateValueAndValidity(); + this.source.setValue(DOCUMENT_SOURCE.APPLICANT); + + const selectedOwner = owners.find((owner) => owner.corporateSummaryUuid === uuid); + if (selectedOwner) { + this.ownerId.setValue(selectedOwner.uuid); + } else if (uuid) { + this.showSupersededWarning = true; + } + + this.selectableOwners = owners + .filter((owner) => owner.type.code === 'ORGZ') + .map((owner, index) => ({ + label: owner.organizationName ?? owner.displayName, + uuid: owner.uuid, + })); } } private async loadDocumentTypes() { - const docTypes = await this.applicationDocumentService.fetchTypes(); + const docTypes = await this.noiDocumentService.fetchTypes(); docTypes.sort((a, b) => (a.label > b.label ? 1 : -1)); this.documentTypes = docTypes.filter((type) => type.code !== DOCUMENT_TYPE.ORIGINAL_APPLICATION); } diff --git a/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent.dto.ts b/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent.dto.ts index 2782671139..4ae66cf6d0 100644 --- a/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent.dto.ts +++ b/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent.dto.ts @@ -283,6 +283,7 @@ export enum STRUCTURE_TYPES { export interface NoticeOfIntentOwnerDto { uuid: string; noticeOfIntentSubmissionUuid: string; + corporateSummaryUuid?: string; displayName: string; firstName: string | null; lastName: string | null; @@ -332,7 +333,6 @@ export interface NoticeOfIntentParcelDto { isFarm?: boolean; ownershipType?: string; crownLandOwnerType?: string; - parcelType?: string; certificateOfTitleUuid?: string; owners: SubmittedNoticeOfIntentOwnerDto[]; alrArea: number; diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.controller.spec.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.controller.spec.ts index 3891462cba..9a6fdfcc3e 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.controller.spec.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.controller.spec.ts @@ -9,8 +9,10 @@ import { NoticeOfIntentProfile } from '../../../common/automapper/notice-of-inte import { DOCUMENT_TYPE } from '../../../document/document-code.entity'; import { DOCUMENT_SOURCE } from '../../../document/document.dto'; import { Document } from '../../../document/document.entity'; -import { ApplicationOwnerService } from '../../../portal/application-submission/application-owner/application-owner.service'; -import { ApplicationParcelService } from '../../../portal/application-submission/application-parcel/application-parcel.service'; +import { NoticeOfIntentOwner } from '../../../portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.entity'; +import { NoticeOfIntentOwnerService } from '../../../portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.service'; +import { NoticeOfIntentParcel } from '../../../portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.entity'; +import { NoticeOfIntentParcelService } from '../../../portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.service'; import { User } from '../../../user/user.entity'; import { CodeService } from '../../code/code.service'; import { NoticeOfIntentDocumentController } from './notice-of-intent-document.controller'; @@ -20,8 +22,8 @@ import { NoticeOfIntentDocumentService } from './notice-of-intent-document.servi describe('NoticeOfIntentDocumentController', () => { let controller: NoticeOfIntentDocumentController; let appDocumentService: DeepMocked; - let mockParcelService: DeepMocked; - let mockOwnerService: DeepMocked; + let mockParcelService: DeepMocked; + let mockOwnerService: DeepMocked; const mockDocument = new NoticeOfIntentDocument({ document: new Document({ @@ -54,11 +56,11 @@ describe('NoticeOfIntentDocumentController', () => { useValue: appDocumentService, }, { - provide: ApplicationParcelService, + provide: NoticeOfIntentParcelService, useValue: mockParcelService, }, { - provide: ApplicationOwnerService, + provide: NoticeOfIntentOwnerService, useValue: mockOwnerService, }, { @@ -198,105 +200,105 @@ describe('NoticeOfIntentDocumentController', () => { expect(appDocumentService.list).toHaveBeenCalledTimes(1); }); - // Re-enable as part of adding step 1 - // it('should set the certificate of title on the supplied parcel', async () => { - // const mockFile = {}; - // const mockUser = {}; - // - // appDocumentService.attachDocument.mockResolvedValue( - // new NoticeOfIntentDocument({ - // ...mockDocument, - // typeCode: DOCUMENT_TYPE.CERTIFICATE_OF_TITLE, - // }), - // ); - // mockParcelService.getOneOrFail.mockResolvedValue(new ApplicationParcel()); - // mockParcelService.setCertificateOfTitle.mockResolvedValue( - // new ApplicationParcel(), - // ); - // - // const res = await controller.attachDocument('fileNumber', { - // isMultipart: () => true, - // body: { - // documentType: { - // value: DOCUMENT_TYPE.CERTIFICATE_OF_TITLE, - // }, - // fileName: { - // value: 'file', - // }, - // source: { - // value: DOCUMENT_SOURCE.APPLICANT, - // }, - // visibilityFlags: { - // value: '', - // }, - // parcelUuid: { - // value: 'parcel-uuid', - // }, - // file: mockFile, - // }, - // user: { - // entity: mockUser, - // }, - // }); - // - // expect(res.mimeType).toEqual(mockDocument.document.mimeType); - // - // expect(appDocumentService.attachDocument).toHaveBeenCalledTimes(1); - // const callData = appDocumentService.attachDocument.mock.calls[0][0]; - // expect(callData.fileName).toEqual('file'); - // expect(callData.file).toEqual(mockFile); - // expect(callData.user).toEqual(mockUser); - // expect(mockParcelService.getOneOrFail).toHaveBeenCalledTimes(1); - // expect(mockParcelService.setCertificateOfTitle).toHaveBeenCalledTimes(1); - // }); - - // TODO: Re-enable as part of adding Step 1 - // it('should set the corporate summary on the supplied owner', async () => { - // const mockFile = {}; - // const mockUser = {}; - // - // appDocumentService.attachDocument.mockResolvedValue( - // new NoticeOfIntentDocument({ - // ...mockDocument, - // typeCode: DOCUMENT_TYPE.CORPORATE_SUMMARY, - // }), - // ); - // mockOwnerService.getOwner.mockResolvedValue(new ApplicationOwner()); - // mockOwnerService.save.mockResolvedValue(); - // - // const res = await controller.attachDocument('fileNumber', { - // isMultipart: () => true, - // body: { - // documentType: { - // value: DOCUMENT_TYPE.CORPORATE_SUMMARY, - // }, - // fileName: { - // value: 'file', - // }, - // source: { - // value: DOCUMENT_SOURCE.APPLICANT, - // }, - // visibilityFlags: { - // value: '', - // }, - // ownerUuid: { - // value: 'parcel-uuid', - // }, - // file: mockFile, - // }, - // user: { - // entity: mockUser, - // }, - // }); - // - // expect(res.mimeType).toEqual(mockDocument.document.mimeType); - // - // expect(appDocumentService.attachDocument).toHaveBeenCalledTimes(1); - // const callData = appDocumentService.attachDocument.mock.calls[0][0]; - // expect(callData.fileName).toEqual('file'); - // expect(callData.file).toEqual(mockFile); - // expect(callData.user).toEqual(mockUser); - // expect(mockOwnerService.getOwner).toHaveBeenCalledTimes(1); - // expect(mockOwnerService.save).toHaveBeenCalledTimes(1); - // }); + it('should set the certificate of title on the supplied parcel', async () => { + const mockFile = {}; + const mockUser = {}; + + appDocumentService.attachDocument.mockResolvedValue( + new NoticeOfIntentDocument({ + ...mockDocument, + typeCode: DOCUMENT_TYPE.CERTIFICATE_OF_TITLE, + }), + ); + mockParcelService.getOneOrFail.mockResolvedValue( + new NoticeOfIntentParcel(), + ); + mockParcelService.setCertificateOfTitle.mockResolvedValue( + new NoticeOfIntentParcel(), + ); + + const res = await controller.attachDocument('fileNumber', { + isMultipart: () => true, + body: { + documentType: { + value: DOCUMENT_TYPE.CERTIFICATE_OF_TITLE, + }, + fileName: { + value: 'file', + }, + source: { + value: DOCUMENT_SOURCE.APPLICANT, + }, + visibilityFlags: { + value: '', + }, + parcelUuid: { + value: 'parcel-uuid', + }, + file: mockFile, + }, + user: { + entity: mockUser, + }, + }); + + expect(res.mimeType).toEqual(mockDocument.document.mimeType); + + expect(appDocumentService.attachDocument).toHaveBeenCalledTimes(1); + const callData = appDocumentService.attachDocument.mock.calls[0][0]; + expect(callData.fileName).toEqual('file'); + expect(callData.file).toEqual(mockFile); + expect(callData.user).toEqual(mockUser); + expect(mockParcelService.getOneOrFail).toHaveBeenCalledTimes(1); + expect(mockParcelService.setCertificateOfTitle).toHaveBeenCalledTimes(1); + }); + + it('should set the corporate summary on the supplied owner', async () => { + const mockFile = {}; + const mockUser = {}; + + appDocumentService.attachDocument.mockResolvedValue( + new NoticeOfIntentDocument({ + ...mockDocument, + typeCode: DOCUMENT_TYPE.CORPORATE_SUMMARY, + }), + ); + mockOwnerService.getOwner.mockResolvedValue(new NoticeOfIntentOwner()); + mockOwnerService.save.mockResolvedValue(); + + const res = await controller.attachDocument('fileNumber', { + isMultipart: () => true, + body: { + documentType: { + value: DOCUMENT_TYPE.CORPORATE_SUMMARY, + }, + fileName: { + value: 'file', + }, + source: { + value: DOCUMENT_SOURCE.APPLICANT, + }, + visibilityFlags: { + value: '', + }, + ownerUuid: { + value: 'parcel-uuid', + }, + file: mockFile, + }, + user: { + entity: mockUser, + }, + }); + + expect(res.mimeType).toEqual(mockDocument.document.mimeType); + + expect(appDocumentService.attachDocument).toHaveBeenCalledTimes(1); + const callData = appDocumentService.attachDocument.mock.calls[0][0]; + expect(callData.fileName).toEqual('file'); + expect(callData.file).toEqual(mockFile); + expect(callData.user).toEqual(mockUser); + expect(mockOwnerService.getOwner).toHaveBeenCalledTimes(1); + expect(mockOwnerService.save).toHaveBeenCalledTimes(1); + }); }); diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.controller.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.controller.ts index dc4c9df777..e1101d05e0 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.controller.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.controller.ts @@ -25,6 +25,8 @@ import { DOCUMENT_SYSTEM, DocumentTypeDto, } from '../../../document/document.dto'; +import { NoticeOfIntentOwnerService } from '../../../portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.service'; +import { NoticeOfIntentParcelService } from '../../../portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.service'; import { NoticeOfIntentDocumentDto } from './notice-of-intent-document.dto'; import { NoticeOfIntentDocument, @@ -38,6 +40,8 @@ import { NoticeOfIntentDocumentService } from './notice-of-intent-document.servi export class NoticeOfIntentDocumentController { constructor( private noticeOfIntentDocumentService: NoticeOfIntentDocumentService, + private noiParcelService: NoticeOfIntentParcelService, + private noiOwnerService: NoticeOfIntentOwnerService, @InjectMapper() private mapper: Mapper, ) {} @@ -66,22 +70,21 @@ export class NoticeOfIntentDocumentController { const savedDocument = await this.saveUploadedFile(req, fileNumber); - //TODO: Re-enable as part of creating Step 1 - // const parcelUuid = req.body.parcelUuid?.value as string | undefined; - // if ( - // parcelUuid && - // savedDocument.typeCode === DOCUMENT_TYPE.CERTIFICATE_OF_TITLE - // ) { - // await this.handleCertificateOfTitleUpdates(parcelUuid, savedDocument); - // } - // - // const ownerUuid = req.body.ownerUuid?.value as string | undefined; - // if ( - // ownerUuid && - // savedDocument.typeCode === DOCUMENT_TYPE.CORPORATE_SUMMARY - // ) { - // await this.handleCorporateSummaryUpdates(ownerUuid, savedDocument); - // } + const parcelUuid = req.body.parcelUuid?.value as string | undefined; + if ( + parcelUuid && + savedDocument.typeCode === DOCUMENT_TYPE.CERTIFICATE_OF_TITLE + ) { + await this.handleCertificateOfTitleUpdates(parcelUuid, savedDocument); + } + + const ownerUuid = req.body.ownerUuid?.value as string | undefined; + if ( + ownerUuid && + savedDocument.typeCode === DOCUMENT_TYPE.CORPORATE_SUMMARY + ) { + await this.handleCorporateSummaryUpdates(ownerUuid, savedDocument); + } return this.mapper.map( savedDocument, @@ -116,22 +119,21 @@ export class NoticeOfIntentDocumentController { user: req.user.entity, }); - //TODO: Re-enable as part of creating Step 1 - // const parcelUuid = req.body.parcelUuid?.value as string | undefined; - // if ( - // parcelUuid && - // savedDocument.typeCode === DOCUMENT_TYPE.CERTIFICATE_OF_TITLE - // ) { - // await this.handleCertificateOfTitleUpdates(parcelUuid, savedDocument); - // } - // - // const ownerUuid = req.body.ownerUuid?.value as string | undefined; - // if ( - // ownerUuid && - // savedDocument.typeCode === DOCUMENT_TYPE.CORPORATE_SUMMARY - // ) { - // await this.handleCorporateSummaryUpdates(ownerUuid, savedDocument); - // } + const parcelUuid = req.body.parcelUuid?.value as string | undefined; + if ( + parcelUuid && + savedDocument.typeCode === DOCUMENT_TYPE.CERTIFICATE_OF_TITLE + ) { + await this.handleCertificateOfTitleUpdates(parcelUuid, savedDocument); + } + + const ownerUuid = req.body.ownerUuid?.value as string | undefined; + if ( + ownerUuid && + savedDocument.typeCode === DOCUMENT_TYPE.CORPORATE_SUMMARY + ) { + await this.handleCorporateSummaryUpdates(ownerUuid, savedDocument); + } return this.mapper.map( savedDocument, @@ -229,43 +231,40 @@ export class NoticeOfIntentDocumentController { return {}; } - //TODO: Re-enable as part of creating Step 1 - // - // private async handleCertificateOfTitleUpdates( - // parcelUuid: string, - // savedDocument: NoticeOfIntentDocument, - // ) { - // const parcel = await this.parcelService.getOneOrFail(parcelUuid); - // if (parcel) { - // if ( - // parcel.certificateOfTitleUuid && - // parcel.certificateOfTitleUuid !== savedDocument.uuid - // ) { - // await this.supersedeDocument(parcel.certificateOfTitleUuid); - // } - // - // await this.parcelService.setCertificateOfTitle(parcel, savedDocument); - // } - // } + private async handleCertificateOfTitleUpdates( + parcelUuid: string, + savedDocument: NoticeOfIntentDocument, + ) { + const parcel = await this.noiParcelService.getOneOrFail(parcelUuid); + if (parcel) { + if ( + parcel.certificateOfTitleUuid && + parcel.certificateOfTitleUuid !== savedDocument.uuid + ) { + await this.supersedeDocument(parcel.certificateOfTitleUuid); + } - // - // private async handleCorporateSummaryUpdates( - // ownerUuid: string, - // savedDocument: NoticeOfIntentDocument, - // ) { - // const owner = await this.ownerService.getOwner(ownerUuid); - // if (owner) { - // if ( - // owner.corporateSummaryUuid && - // owner.corporateSummaryUuid !== savedDocument.uuid - // ) { - // await this.supersedeDocument(owner.corporateSummaryUuid); - // } - // - // owner.corporateSummary = savedDocument; - // await this.ownerService.save(owner); - // } - // } + await this.noiParcelService.setCertificateOfTitle(parcel, savedDocument); + } + } + + private async handleCorporateSummaryUpdates( + ownerUuid: string, + savedDocument: NoticeOfIntentDocument, + ) { + const owner = await this.noiOwnerService.getOwner(ownerUuid); + if (owner) { + if ( + owner.corporateSummaryUuid && + owner.corporateSummaryUuid !== savedDocument.uuid + ) { + await this.supersedeDocument(owner.corporateSummaryUuid); + } + + owner.corporateSummary = savedDocument; + await this.noiOwnerService.save(owner); + } + } private async supersedeDocument(documentUuid: string) { const document = await this.noticeOfIntentDocumentService.get(documentUuid); From 32ec7179fea78def962f35c1a11564e37f113214 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Thu, 7 Sep 2023 16:11:02 -0700 Subject: [PATCH 364/954] Code Review Feedback * Remove dead imports --- .../notification-details.component.spec.ts | 6 ------ .../proposal-details/proposal-details.component.spec.ts | 2 -- .../proposal-details/proposal-details.component.ts | 3 --- 3 files changed, 11 deletions(-) diff --git a/portal-frontend/src/app/features/notifications/notification-details/notification-details.component.spec.ts b/portal-frontend/src/app/features/notifications/notification-details/notification-details.component.spec.ts index 69b527af07..b0996f7eae 100644 --- a/portal-frontend/src/app/features/notifications/notification-details/notification-details.component.spec.ts +++ b/portal-frontend/src/app/features/notifications/notification-details/notification-details.component.spec.ts @@ -4,15 +4,9 @@ import { Router } from '@angular/router'; import { DeepMocked, createMock } from '@golevelup/ts-jest'; import { BehaviorSubject } from 'rxjs'; import { CodeService } from '../../../services/code/code.service'; -import { NoticeOfIntentDocumentDto } from '../../../services/notice-of-intent-document/notice-of-intent-document.dto'; -import { NoticeOfIntentDocumentService } from '../../../services/notice-of-intent-document/notice-of-intent-document.service'; -import { NoticeOfIntentSubmissionDetailedDto } from '../../../services/notice-of-intent-submission/notice-of-intent-submission.dto'; -import { NoticeOfIntentSubmissionService } from '../../../services/notice-of-intent-submission/notice-of-intent-submission.service'; import { NotificationDocumentDto } from '../../../services/notification-document/notification-document.dto'; import { NotificationDocumentService } from '../../../services/notification-document/notification-document.service'; import { NotificationSubmissionDetailedDto } from '../../../services/notification-submission/notification-submission.dto'; -import { NotificationSubmissionService } from '../../../services/notification-submission/notification-submission.service'; -import { ToastService } from '../../../services/toast/toast.service'; import { NotificationDetailsComponent } from './notification-details.component'; diff --git a/portal-frontend/src/app/features/notifications/notification-details/proposal-details/proposal-details.component.spec.ts b/portal-frontend/src/app/features/notifications/notification-details/proposal-details/proposal-details.component.spec.ts index 6bc8714fa7..6c4c6019bc 100644 --- a/portal-frontend/src/app/features/notifications/notification-details/proposal-details/proposal-details.component.spec.ts +++ b/portal-frontend/src/app/features/notifications/notification-details/proposal-details/proposal-details.component.spec.ts @@ -1,7 +1,5 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { createMock, DeepMocked } from '@golevelup/ts-jest'; -import { NoticeOfIntentDocumentService } from '../../../../services/notice-of-intent-document/notice-of-intent-document.service'; -import { NoticeOfIntentParcelService } from '../../../../services/notice-of-intent-parcel/notice-of-intent-parcel.service'; import { NotificationDocumentService } from '../../../../services/notification-document/notification-document.service'; import { ProposalDetailsComponent } from './proposal-details.component'; diff --git a/portal-frontend/src/app/features/notifications/notification-details/proposal-details/proposal-details.component.ts b/portal-frontend/src/app/features/notifications/notification-details/proposal-details/proposal-details.component.ts index 5db233e2db..457e1cf731 100644 --- a/portal-frontend/src/app/features/notifications/notification-details/proposal-details/proposal-details.component.ts +++ b/portal-frontend/src/app/features/notifications/notification-details/proposal-details/proposal-details.component.ts @@ -1,8 +1,5 @@ import { Component, Input } from '@angular/core'; import { Router } from '@angular/router'; -import { NoticeOfIntentDocumentDto } from '../../../../services/notice-of-intent-document/notice-of-intent-document.dto'; -import { NoticeOfIntentDocumentService } from '../../../../services/notice-of-intent-document/notice-of-intent-document.service'; -import { NoticeOfIntentSubmissionDetailedDto } from '../../../../services/notice-of-intent-submission/notice-of-intent-submission.dto'; import { NotificationDocumentDto } from '../../../../services/notification-document/notification-document.dto'; import { NotificationDocumentService } from '../../../../services/notification-document/notification-document.service'; import { NotificationSubmissionDetailedDto } from '../../../../services/notification-submission/notification-submission.dto'; From 334b7aa1adb53087a81465289be441a0f329c82a Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Thu, 7 Sep 2023 16:27:01 -0700 Subject: [PATCH 365/954] Add Notifications to Inbox and add View to View Page --- portal-frontend/src/app/app.module.ts | 2 + .../src/app/features/home/home.component.html | 11 +++- .../home/noi-list/noi-list.component.html | 2 +- .../notification-list.component.html | 61 +++++++++++++++++++ .../notification-list.component.scss | 31 ++++++++++ .../notification-list.component.spec.ts | 36 +++++++++++ .../notification-list.component.ts | 37 +++++++++++ .../parcel/parcel.component.html | 7 +-- ...iew-notification-submission.component.html | 13 +++- ...-notification-submission.component.spec.ts | 12 ++++ .../view-notification-submission.component.ts | 37 ++++++++--- .../view-notification-submission.module.ts | 10 ++- .../notification-submission.service.ts | 35 ++++++++--- 13 files changed, 265 insertions(+), 29 deletions(-) create mode 100644 portal-frontend/src/app/features/home/notification-list/notification-list.component.html create mode 100644 portal-frontend/src/app/features/home/notification-list/notification-list.component.scss create mode 100644 portal-frontend/src/app/features/home/notification-list/notification-list.component.spec.ts create mode 100644 portal-frontend/src/app/features/home/notification-list/notification-list.component.ts diff --git a/portal-frontend/src/app/app.module.ts b/portal-frontend/src/app/app.module.ts index 591e13de37..ad4805b936 100644 --- a/portal-frontend/src/app/app.module.ts +++ b/portal-frontend/src/app/app.module.ts @@ -13,6 +13,7 @@ import { CreateSubmissionDialogComponent } from './features/create-submission-di import { ApplicationListComponent } from './features/home/application-list/application-list.component'; import { HomeComponent } from './features/home/home.component'; import { NoiListComponent } from './features/home/noi-list/noi-list.component'; +import { NotificationListComponent } from './features/home/notification-list/notification-list.component'; import { LandingPageComponent } from './features/landing-page/landing-page.component'; import { LoginComponent } from './features/login/login.component'; import { AuthInterceptorService } from './services/authentication/auth-interceptor.service'; @@ -33,6 +34,7 @@ import { SharedModule } from './shared/shared.module'; AuthorizationComponent, ApplicationListComponent, NoiListComponent, + NotificationListComponent, CreateSubmissionDialogComponent, LandingPageComponent, ConfirmationDialogComponent, diff --git a/portal-frontend/src/app/features/home/home.component.html b/portal-frontend/src/app/features/home/home.component.html index 03c59ba5d7..9830090366 100644 --- a/portal-frontend/src/app/features/home/home.component.html +++ b/portal-frontend/src/app/features/home/home.component.html @@ -39,7 +39,16 @@

Portal Inbox

- Notification of SRW + + + Create a Notification of Statutory Right of Way to the ALC if you plan to register a SRW under + s. 218 of the Land Title Act + in the ALR. + + +
diff --git a/portal-frontend/src/app/features/home/noi-list/noi-list.component.html b/portal-frontend/src/app/features/home/noi-list/noi-list.component.html index e22f232d71..e9e9d22972 100644 --- a/portal-frontend/src/app/features/home/noi-list/noi-list.component.html +++ b/portal-frontend/src/app/features/home/noi-list/noi-list.component.html @@ -61,6 +61,6 @@ - +
diff --git a/portal-frontend/src/app/features/home/notification-list/notification-list.component.html b/portal-frontend/src/app/features/home/notification-list/notification-list.component.html new file mode 100644 index 0000000000..f0613608bb --- /dev/null +++ b/portal-frontend/src/app/features/home/notification-list/notification-list.component.html @@ -0,0 +1,61 @@ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
No NOIs Created
Notification ID{{ row.fileNumber }}Date Created{{ row.createdAt | date }}Name{{ row.applicant || '(Unknown)' }}Type{{ row.type }}Status +
+ {{ row.status.label }} +
+ 		Last Updated{{ row.updatedAt | date }}Actions + +
+ +
+
diff --git a/portal-frontend/src/app/features/home/notification-list/notification-list.component.scss b/portal-frontend/src/app/features/home/notification-list/notification-list.component.scss new file mode 100644 index 0000000000..5eb8d7a15e --- /dev/null +++ b/portal-frontend/src/app/features/home/notification-list/notification-list.component.scss @@ -0,0 +1,31 @@ +@use '../../../../styles/functions' as *; +@use '../../../../styles/colors'; + +.label { + display: inline-block; + padding: rem(4) rem(16); + border-radius: rem(16); + font-weight: bold; +} + +.table-wrapper { + overflow-x: auto; + + .table-container { + display: table; + width: 100%; + + table { + width: 100%; + } + + ::ng-deep .mat-table { + ::ng-deep .mat-cell, + ::ng-deep .mat-header-cell, + ::ng-deep .mat-row, + ::ng-deep .mat-header-row { + min-width: rem(150); + } + } + } +} diff --git a/portal-frontend/src/app/features/home/notification-list/notification-list.component.spec.ts b/portal-frontend/src/app/features/home/notification-list/notification-list.component.spec.ts new file mode 100644 index 0000000000..a5b90d4182 --- /dev/null +++ b/portal-frontend/src/app/features/home/notification-list/notification-list.component.spec.ts @@ -0,0 +1,36 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { NotificationSubmissionService } from '../../../services/notification-submission/notification-submission.service'; +import { ConfirmationDialogService } from '../../../shared/confirmation-dialog/confirmation-dialog.service'; + +import { NotificationListComponent } from './notification-list.component'; + +describe('NotificationListComponent', () => { + let component: NotificationListComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [NotificationListComponent], + providers: [ + { + provide: NotificationSubmissionService, + useValue: {}, + }, + { + provide: ConfirmationDialogService, + useValue: {}, + }, + ], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(NotificationListComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/home/notification-list/notification-list.component.ts b/portal-frontend/src/app/features/home/notification-list/notification-list.component.ts new file mode 100644 index 0000000000..ca930f1122 --- /dev/null +++ b/portal-frontend/src/app/features/home/notification-list/notification-list.component.ts @@ -0,0 +1,37 @@ +import { Component, OnInit, ViewChild } from '@angular/core'; +import { MatPaginator } from '@angular/material/paginator'; +import { MatTableDataSource } from '@angular/material/table'; +import { NotificationSubmissionDto } from '../../../services/notification-submission/notification-submission.dto'; +import { NotificationSubmissionService } from '../../../services/notification-submission/notification-submission.service'; + +@Component({ + selector: 'app-notification-list', + templateUrl: './notification-list.component.html', + styleUrls: ['./notification-list.component.scss'], +}) +export class NotificationListComponent implements OnInit { + dataSource: MatTableDataSource = new MatTableDataSource(); + displayedColumns: string[] = [ + 'fileNumber', + 'dateCreated', + 'applicant', + 'applicationType', + 'status', + 'lastUpdated', + 'actions', + ]; + + @ViewChild(MatPaginator) paginator!: MatPaginator; + + constructor(private notificationSubmissionService: NotificationSubmissionService) {} + + ngOnInit(): void { + this.loadNotifications(); + } + + async loadNotifications() { + const notifications = await this.notificationSubmissionService.getNotifications(); + this.dataSource = new MatTableDataSource(notifications); + this.dataSource.paginator = this.paginator; + } +} diff --git a/portal-frontend/src/app/features/notifications/notification-details/parcel/parcel.component.html b/portal-frontend/src/app/features/notifications/notification-details/parcel/parcel.component.html index 2f315378b6..e0a1efdf77 100644 --- a/portal-frontend/src/app/features/notifications/notification-details/parcel/parcel.component.html +++ b/portal-frontend/src/app/features/notifications/notification-details/parcel/parcel.component.html @@ -1,4 +1,4 @@ -

1. Identify Parcel(s) Under Application

+

1. Identify Parcel(s) Under The Statutory Right of Way

@@ -48,10 +48,7 @@

Parcel {{ parcelInd + 1 }}: Parcel and Owner Information

PIN (optional)
{{ parcel.pin }} - +
Civic Address
diff --git a/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.html b/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.html index 1809b0a6e6..aa28457dfe 100644 --- a/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.html +++ b/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.html @@ -54,7 +54,14 @@

Applicant Submission

-
TODO
+
+ +
@@ -75,8 +82,8 @@

Applicant Submission

- -
To Add Later
+ +
//TODO
diff --git a/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.spec.ts b/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.spec.ts index bbbfa7a822..f105bb2fcd 100644 --- a/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.spec.ts +++ b/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.spec.ts @@ -3,7 +3,9 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ActivatedRoute } from '@angular/router'; import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { BehaviorSubject } from 'rxjs'; +import { NotificationDocumentService } from '../../../services/notification-document/notification-document.service'; import { NotificationSubmissionService } from '../../../services/notification-submission/notification-submission.service'; +import { ConfirmationDialogService } from '../../../shared/confirmation-dialog/confirmation-dialog.service'; import { ViewNotificationSubmissionComponent } from './view-notification-submission.component'; @@ -12,10 +14,12 @@ describe('ViewNotificationSubmissionComponent', () => { let fixture: ComponentFixture; let mockNotificationSubmissionService: DeepMocked; + let mockNotificationDocumentService: DeepMocked; let mockActivatedRoute: DeepMocked; beforeEach(async () => { mockNotificationSubmissionService = createMock(); + mockNotificationDocumentService = createMock(); mockActivatedRoute = createMock(); mockActivatedRoute.paramMap = new BehaviorSubject(new Map()); @@ -27,10 +31,18 @@ describe('ViewNotificationSubmissionComponent', () => { provide: NotificationSubmissionService, useValue: mockNotificationSubmissionService, }, + { + provide: NotificationDocumentService, + useValue: mockNotificationDocumentService, + }, { provide: ActivatedRoute, useValue: mockActivatedRoute, }, + { + provide: ConfirmationDialogService, + useValue: {}, + }, ], schemas: [NO_ERRORS_SCHEMA], }).compileComponents(); diff --git a/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.ts b/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.ts index b14c06927f..b21120939e 100644 --- a/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.ts +++ b/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.ts @@ -1,8 +1,14 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; import { BehaviorSubject, Subject, takeUntil } from 'rxjs'; -import { NotificationSubmissionDto } from '../../../services/notification-submission/notification-submission.dto'; +import { NotificationDocumentDto } from '../../../services/notification-document/notification-document.dto'; +import { NotificationDocumentService } from '../../../services/notification-document/notification-document.service'; +import { + NotificationSubmissionDetailedDto, + NotificationSubmissionDto, +} from '../../../services/notification-submission/notification-submission.dto'; import { NotificationSubmissionService } from '../../../services/notification-submission/notification-submission.service'; +import { ConfirmationDialogService } from '../../../shared/confirmation-dialog/confirmation-dialog.service'; @Component({ selector: 'app-view-notification-submission', @@ -11,11 +17,14 @@ import { NotificationSubmissionService } from '../../../services/notification-su }) export class ViewNotificationSubmissionComponent implements OnInit, OnDestroy { $destroy = new Subject(); - $notificationSubmission = new BehaviorSubject(undefined); - submission: NotificationSubmissionDto | undefined; + $notificationSubmission = new BehaviorSubject(undefined); + $notificationDocuments = new BehaviorSubject([]); + submission: NotificationSubmissionDetailedDto | undefined; constructor( private notificationSubmissionService: NotificationSubmissionService, + private notificationDocumentService: NotificationDocumentService, + private confirmationDialogService: ConfirmationDialogService, private route: ActivatedRoute, private router: Router ) {} @@ -37,10 +46,10 @@ export class ViewNotificationSubmissionComponent implements OnInit, OnDestroy { } async loadDocuments(fileId: string) { - // const documents = await this.noiDocumentService.getByFileId(fileId); - // if (documents) { - // this.$noiDocuments.next(documents); - // } + const documents = await this.notificationDocumentService.getByFileId(fileId); + if (documents) { + this.$notificationDocuments.next(documents); + } } ngOnDestroy(): void { @@ -53,8 +62,18 @@ export class ViewNotificationSubmissionComponent implements OnInit, OnDestroy { } async onCancel(uuid: string) { - await this.notificationSubmissionService.cancel(uuid); - await this.router.navigateByUrl(`home`); + const dialog = this.confirmationDialogService.openDialog({ + body: 'Are you sure you want to cancel the notification? A cancelled notification cannot be edited or submitted to the ALC. This cannot be undone.', + confirmAction: 'Confirm', + cancelAction: 'Return', + }); + + dialog.subscribe(async (isConfirmed) => { + if (isConfirmed) { + await this.notificationSubmissionService.cancel(uuid); + await this.router.navigateByUrl(`home`); + } + }); } onDownloadSubmissionPdf(fileNumber: string) { diff --git a/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.module.ts b/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.module.ts index 700cda7875..8e9c36c202 100644 --- a/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.module.ts +++ b/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.module.ts @@ -3,6 +3,7 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; import { NgxMaskDirective, NgxMaskPipe } from 'ngx-mask'; import { SharedModule } from '../../../shared/shared.module'; +import { NotificationDetailsModule } from '../notification-details/notification-details.module'; import { ViewNotificationSubmissionComponent } from './view-notification-submission.component'; const routes: Routes = [ @@ -13,7 +14,14 @@ const routes: Routes = [ ]; @NgModule({ - imports: [CommonModule, SharedModule, RouterModule.forChild(routes), NgxMaskDirective, NgxMaskPipe], + imports: [ + CommonModule, + SharedModule, + RouterModule.forChild(routes), + NgxMaskDirective, + NgxMaskPipe, + NotificationDetailsModule, + ], declarations: [ViewNotificationSubmissionComponent], }) export class ViewNotificationSubmissionModule {} diff --git a/services/apps/alcs/src/portal/notification-submission/notification-submission.service.ts b/services/apps/alcs/src/portal/notification-submission/notification-submission.service.ts index 83cf02da1f..77257a787e 100644 --- a/services/apps/alcs/src/portal/notification-submission/notification-submission.service.ts +++ b/services/apps/alcs/src/portal/notification-submission/notification-submission.service.ts @@ -11,7 +11,9 @@ import { Not, Repository, } from 'typeorm'; +import { SUBMISSION_STATUS } from '../../alcs/application/application-submission-status/submission-status.dto'; import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; +import { NOI_SUBMISSION_STATUS } from '../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status.dto'; import { NOTIFICATION_STATUS } from '../../alcs/notification/notification-submission-status/notification-status.dto'; import { NotificationSubmissionStatusService } from '../../alcs/notification/notification-submission-status/notification-submission-status.service'; import { NotificationService } from '../../alcs/notification/notification.service'; @@ -264,21 +266,30 @@ export class NotificationSubmissionService { async mapToDTOs(submissions: NotificationSubmission[], user: User) { const types = await this.notificationService.listTypes(); - return submissions.map((noiSubmission) => { - const isCreator = noiSubmission.createdBy.uuid === user.uuid; + return submissions.map((notificationSubmission) => { + const isCreator = notificationSubmission.createdBy.uuid === user.uuid; const isSameAccount = user.bceidBusinessGuid && - noiSubmission.createdBy.bceidBusinessGuid === user.bceidBusinessGuid; + notificationSubmission.createdBy.bceidBusinessGuid === + user.bceidBusinessGuid; return { ...this.mapper.map( - noiSubmission, + notificationSubmission, NotificationSubmission, NotificationSubmissionDto, ), - type: types.find((type) => type.code === noiSubmission.typeCode)!.label, - canEdit: isCreator || isSameAccount, - canView: true, + type: types.find( + (type) => type.code === notificationSubmission.typeCode, + )!.label, + canEdit: + [NOTIFICATION_STATUS.IN_PROGRESS].includes( + notificationSubmission.status.statusTypeCode as NOTIFICATION_STATUS, + ) && + (isCreator || isSameAccount), + canView: + notificationSubmission.status.statusTypeCode !== + SUBMISSION_STATUS.CANCELLED, }; }); } @@ -303,8 +314,14 @@ export class NotificationSubmissionService { ...mappedApp, type: types.find((type) => type.code === notificationSubmission.typeCode)! .label, - canEdit: isCreator || isSameAccount, - canView: true, + canEdit: + [NOTIFICATION_STATUS.IN_PROGRESS].includes( + notificationSubmission.status.statusTypeCode as NOTIFICATION_STATUS, + ) && + (isCreator || isSameAccount), + canView: + notificationSubmission.status.statusTypeCode !== + SUBMISSION_STATUS.CANCELLED, }; } From 0b1acf749cac51d5e370a460d67a04ea473029b4 Mon Sep 17 00:00:00 2001 From: Liam Stoddard Date: Fri, 8 Sep 2023 09:52:48 -0700 Subject: [PATCH 366/954] renamed no data string --- bin/migrate-oats-data/submissions/submap/direction_mapping.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/migrate-oats-data/submissions/submap/direction_mapping.py b/bin/migrate-oats-data/submissions/submap/direction_mapping.py index ac086e8507..b61c27c721 100644 --- a/bin/migrate-oats-data/submissions/submap/direction_mapping.py +++ b/bin/migrate-oats-data/submissions/submap/direction_mapping.py @@ -25,7 +25,7 @@ def get_directions_rows(rows, cursor): def map_direction_values(data, direction_data): # adds direction field values into data row - no_data = 'No data found' + no_data = 'No data found in OATS' app_id = "alr_application_id" data['east_land_use_type_description'] = direction_data.get(data[app_id], {}).get('east_description', no_data) data['east_land_use_type'] = direction_data.get(data[app_id], {}).get('east_type_code', None) From 0f88b00a07b2135d460763f371920e851f36b619 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Fri, 8 Sep 2023 10:48:48 -0700 Subject: [PATCH 367/954] Add Required Errors to Soil and Structure Tables --- .../subd-proposal.component.html | 123 +++++++++------- .../subd-proposal.component.scss | 4 + .../subd-proposal/subd-proposal.component.ts | 44 ++++-- .../additional-information.component.html | 135 ++++++++++-------- .../additional-information.component.ts | 57 +++++--- 5 files changed, 231 insertions(+), 132 deletions(-) diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.html index 8defadda06..a6f6417554 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.html @@ -60,58 +60,85 @@
Documents needed for this step:
- - - - - - + + +
#{{ i + 1 }}
+ + + + - - - - + + + + - - - - + + + + - - + + - - - -
#{{ i + 1 }}Type - - - Lot - Road Dedication - - - Type + + + Lot + Road Dedication + + +
+ warning +
This field is required
+
+ 		Size - - - ha - - Size + + + ha + +
+ warning +
This field is required
+
+
No Proposed Lots Entered
-
Total area of the proposed lots: {{ totalAcres }} ha
-
- warning -
The total lot area proposed must match {{ totalTargetAcres }} hectares as provided in Step 1
-
+ + No Proposed Lots Entered + + +
Total area of the proposed lots: {{ totalAcres }} ha
+
+ warning +
The total lot area proposed must match {{ totalTargetAcres }} hectares as provided in Step 1
+
+
diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.scss b/portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.scss index c56600402d..1dd31dde9d 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.scss +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.scss @@ -7,3 +7,7 @@ section { .toggle-button { min-width: rem(170); } + +.proposed-lots { + margin-bottom: rem(16); +} diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.ts index 9410136d51..fe3ffdb90d 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.ts @@ -8,13 +8,16 @@ import { ApplicationDocumentDto } from '../../../../../services/application-docu import { ApplicationDocumentService } from '../../../../../services/application-document/application-document.service'; import { PARCEL_TYPE } from '../../../../../services/application-parcel/application-parcel.dto'; import { ApplicationParcelService } from '../../../../../services/application-parcel/application-parcel.service'; -import { ApplicationSubmissionUpdateDto } from '../../../../../services/application-submission/application-submission.dto'; +import { + ApplicationSubmissionUpdateDto, + ProposedLot, +} from '../../../../../services/application-submission/application-submission.dto'; import { ApplicationSubmissionService } from '../../../../../services/application-submission/application-submission.service'; import { DOCUMENT_TYPE } from '../../../../../shared/dto/document.dto'; import { EditApplicationSteps } from '../../edit-submission.component'; import { FilesStepComponent } from '../../files-step.partial'; -type ProposedLot = { type: 'Lot' | 'Road Dedication' | null; size: string | null }; +type FormProposedLot = { type: 'Lot' | 'Road Dedication' | null; size: string | null }; @Component({ selector: 'app-subd-proposal', @@ -35,7 +38,7 @@ export class SubdProposalComponent extends FilesStepComponent implements OnInit, totalTargetAcres = '0'; totalAcres = '0'; - proposedLots: ProposedLot[] = []; + proposedLots: FormProposedLot[] = []; lotsSource = new MatTableDataSource(this.proposedLots); displayedColumns = ['index', 'type', 'size']; @@ -46,6 +49,7 @@ export class SubdProposalComponent extends FilesStepComponent implements OnInit, agriculturalSupport: this.agriculturalSupport, isHomeSiteSeverance: this.isHomeSiteSeverance, }); + lotsForm = new FormGroup({} as any); private submissionUuid = ''; constructor( @@ -81,6 +85,14 @@ export class SubdProposalComponent extends FilesStepComponent implements OnInit, size: lot.size ? lot.size.toString(10) : null, })); this.lotsSource = new MatTableDataSource(this.proposedLots); + + const newForm = new FormGroup({}); + for (const [index, lot] of applicationSubmission.subdProposedLots.entries()) { + newForm.addControl(`${index}-type`, new FormControl(lot.type, [Validators.required])); + newForm.addControl(`${index}-size`, new FormControl(lot.size, [Validators.required])); + } + this.lotsForm = newForm; + this.calculateLotSize(); if (this.showErrors) { @@ -102,21 +114,28 @@ export class SubdProposalComponent extends FilesStepComponent implements OnInit, } protected async save() { - if (this.fileId && this.form.dirty) { + if (this.fileId && (this.form.dirty || this.lotsForm.dirty)) { const purpose = this.purpose.getRawValue(); const subdSuitability = this.suitability.getRawValue(); const subdAgricultureSupport = this.agriculturalSupport.getRawValue(); const subdIsHomeSiteSeverance = this.isHomeSiteSeverance.getRawValue(); + const updatedStructures: ProposedLot[] = []; + for (const [index, lot] of this.proposedLots.entries()) { + const lotType = this.lotsForm.controls[`${index}-type`].value; + const lotSize = this.lotsForm.controls[`${index}-size`].value; + updatedStructures.push({ + type: lotType, + size: lotSize ? parseFloat(lotSize) : null, + }); + } + const updateDto: ApplicationSubmissionUpdateDto = { purpose, subdSuitability, subdAgricultureSupport, subdIsHomeSiteSeverance: subdIsHomeSiteSeverance !== null ? subdIsHomeSiteSeverance === 'true' : null, - subdProposedLots: this.proposedLots.map((lot) => ({ - ...lot, - size: lot.size ? parseFloat(lot.size) : null, - })), + subdProposedLots: updatedStructures, }; const updatedApp = await this.applicationService.updatePending(this.submissionUuid, updateDto); @@ -128,12 +147,21 @@ export class SubdProposalComponent extends FilesStepComponent implements OnInit, const targetString = (event.target as HTMLInputElement).value; const targetCount = parseInt(targetString); + for (let index = this.proposedLots.length; index > targetCount; index--) { + this.lotsForm.removeControl(`${index}-type`); + this.lotsForm.removeControl(`${index}-size`); + } + this.proposedLots = this.proposedLots.slice(0, targetCount); while (this.proposedLots.length < targetCount) { this.proposedLots.push({ size: '0', type: null, }); + + const index = this.proposedLots.length - 1; + this.lotsForm.addControl(`${index}-type`, new FormControl(null, [Validators.required])); + this.lotsForm.addControl(`${index}-size`, new FormControl(null, [Validators.required])); } this.lotsSource = new MatTableDataSource(this.proposedLots); this.calculateLotSize(); diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component.html index 40cdb0efee..1cdb76bb5a 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component.html @@ -58,75 +58,96 @@

Additional Proposal Information

Note: The form will be updated with additional required questions if you are building a structure + >Note: The form will be updated with additional required questions if you are building a structure +
- - - - - - + + +
#{{ i + 1 }}
+ + + + - - - + - + warning +
This field is required
+ + + - - - - + + + + - - - - + + + + - - + + - - - -
#{{ i + 1 }}Type - - + Type + + + + {{ type }} + + + +
- - {{ type }} - - - -
Total Floor Area - - - m2 - - Total Floor Area + + + m2 + +
+ warning +
This field is required
+
+ 		Action - - Action + +
- No Proposed Structures Entered. Use the button below to add your first structure. -
+ + + No Proposed Structures Entered. Use the button below to add your first structure. + + + +
diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component.ts index 82ff5f4a63..fb08fa5f3a 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component.ts @@ -6,7 +6,10 @@ import { MatTableDataSource } from '@angular/material/table'; import { takeUntil } from 'rxjs'; import { NoticeOfIntentDocumentDto } from '../../../../services/notice-of-intent-document/notice-of-intent-document.dto'; import { NoticeOfIntentDocumentService } from '../../../../services/notice-of-intent-document/notice-of-intent-document.service'; -import { NoticeOfIntentSubmissionUpdateDto } from '../../../../services/notice-of-intent-submission/notice-of-intent-submission.dto'; +import { + NoticeOfIntentSubmissionUpdateDto, + ProposedStructure, +} from '../../../../services/notice-of-intent-submission/notice-of-intent-submission.dto'; import { NoticeOfIntentSubmissionService } from '../../../../services/notice-of-intent-submission/notice-of-intent-submission.service'; import { DOCUMENT_TYPE } from '../../../../shared/dto/document.dto'; import { formatBooleanToString } from '../../../../shared/utils/boolean-helper'; @@ -23,7 +26,7 @@ export enum STRUCTURE_TYPES { ACCESSORY_STRUCTURE = 'Residential - Accessory Structure', } -type ProposedStructure = { type: STRUCTURE_TYPES | null; area: string | null }; +type FormProposedStructure = { type: STRUCTURE_TYPES | null; area: string | null }; export const RESIDENTIAL_STRUCTURE_TYPES = [ STRUCTURE_TYPES.ACCESSORY_STRUCTURE, @@ -52,7 +55,7 @@ export class AdditionalInformationComponent extends FilesStepComponent implement confirmRemovalOfSoil = false; buildingPlans: NoticeOfIntentDocumentDto[] = []; - proposedStructures: ProposedStructure[] = []; + proposedStructures: FormProposedStructure[] = []; structuresSource = new MatTableDataSource(this.proposedStructures); displayedColumns = ['index', 'type', 'area', 'action']; @@ -75,6 +78,8 @@ export class AdditionalInformationComponent extends FilesStepComponent implement soilStructureResidentialAccessoryUseReason: this.soilStructureResidentialAccessoryUseReason, }); + lotsForm = new FormGroup({} as any); + firstQuestion: string = 'FIX THIS'; constructor( @@ -119,10 +124,19 @@ export class AdditionalInformationComponent extends FilesStepComponent implement ...structure, area: structure.area ? structure.area.toString(10) : null, })); + + const newForm = new FormGroup({}); + for (const [index, lot] of noiSubmission.soilProposedStructures.entries()) { + newForm.addControl(`${index}-type`, new FormControl(lot.type, [Validators.required])); + newForm.addControl(`${index}-area`, new FormControl(lot.area, [Validators.required])); + } + this.lotsForm = newForm; + this.structuresSource = new MatTableDataSource(this.proposedStructures); this.prepareStructureSpecificTextInputs(); if (this.showErrors) { + this.lotsForm.markAllAsTouched(); this.form.markAllAsTouched(); } } @@ -186,23 +200,30 @@ export class AdditionalInformationComponent extends FilesStepComponent implement } protected async save(): Promise { - if (this.fileId && this.form.dirty) { + if (this.fileId && (this.form.dirty || this.lotsForm.dirty)) { const isRemovingSoilForNewStructure = this.isRemovingSoilForNewStructure.getRawValue(); const soilStructureFarmUseReason = this.soilStructureFarmUseReason.getRawValue(); const soilStructureResidentialUseReason = this.soilStructureResidentialUseReason.getRawValue(); const soilAgriParcelActivity = this.soilAgriParcelActivity.getRawValue(); const soilStructureResidentialAccessoryUseReason = this.soilStructureResidentialAccessoryUseReason.getRawValue(); + const updatedStructures: ProposedStructure[] = []; + for (const [index, lot] of this.proposedStructures.entries()) { + const lotType = this.lotsForm.controls[`${index}-type`].value; + const lotArea = this.lotsForm.controls[`${index}-area`].value; + updatedStructures.push({ + type: lotType, + area: lotArea ? parseFloat(lotArea) : null, + }); + } + const updateDto: NoticeOfIntentSubmissionUpdateDto = { soilStructureFarmUseReason, soilStructureResidentialUseReason, soilIsRemovingSoilForNewStructure: parseStringToBoolean(isRemovingSoilForNewStructure), soilAgriParcelActivity, soilStructureResidentialAccessoryUseReason, - soilProposedStructures: this.proposedStructures.map((structure) => ({ - ...structure, - area: structure.area ? parseFloat(structure.area) : null, - })), + soilProposedStructures: updatedStructures, }; const updatedApp = await this.noticeOfIntentSubmissionService.updatePending(this.submissionUuid, updateDto); @@ -242,11 +263,8 @@ export class AdditionalInformationComponent extends FilesStepComponent implement } } - onChangeStructureType(index: number, value: STRUCTURE_TYPES) { - this.proposedStructures[index].type = value; - + onChangeStructureType() { this.prepareStructureSpecificTextInputs(); - this.form.markAsDirty(); } @@ -265,8 +283,11 @@ export class AdditionalInformationComponent extends FilesStepComponent implement } private deleteStructure(index: number) { - const deletedStructure: ProposedStructure = this.proposedStructures.splice(index, 1)[0]; + const deletedStructure: FormProposedStructure = this.proposedStructures.splice(index, 1)[0]; this.structuresSource = new MatTableDataSource(this.proposedStructures); + this.lotsForm.removeControl(`${index}-type`); + this.lotsForm.removeControl(`${index}-area`); + this.lotsForm.markAsDirty(); if (deletedStructure.type === STRUCTURE_TYPES.FARM_STRUCTURE) { this.setVisibilityAndValidatorsForFarmFields(); @@ -279,18 +300,16 @@ export class AdditionalInformationComponent extends FilesStepComponent implement if (deletedStructure.type && RESIDENTIAL_STRUCTURE_TYPES.includes(deletedStructure.type)) { this.setVisibilityAndValidatorsForResidentialFields(); } - - this.form.markAsDirty(); } onStructureAdd() { this.proposedStructures.push({ type: null, area: '' }); this.structuresSource = new MatTableDataSource(this.proposedStructures); - this.form.markAsDirty(); - } - onAreaChange() { - this.form.markAsDirty(); + const index = this.proposedStructures.length - 1; + this.lotsForm.addControl(`${index}-type`, new FormControl(null, [Validators.required])); + this.lotsForm.addControl(`${index}-area`, new FormControl(null, [Validators.required])); + this.lotsForm.markAsDirty(); } private setRequired(formControl: FormControl) { From 47ec80099732ab312eaceb70be04b90002ead776 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Fri, 8 Sep 2023 11:52:45 -0700 Subject: [PATCH 368/954] Add Validation to Notification Submission * Add ALC Tab content and documents --- .../submit-confirmation-dialog.component.html | 2 +- .../transferees/transferees.component.html | 2 +- .../notification-details.component.html | 2 +- .../alc-review/alc-review.component.html | 26 ++ .../alc-review/alc-review.component.scss | 8 + .../alc-review/alc-review.component.spec.ts | 23 ++ .../alc-review/alc-review.component.ts | 35 +++ .../submission-documents.component.html | 43 +++ .../submission-documents.component.scss | 25 ++ .../submission-documents.component.spec.ts | 36 +++ .../submission-documents.component.ts | 45 +++ ...iew-notification-submission.component.html | 9 +- .../view-notification-submission.module.ts | 4 +- ...ation-submission-validator.service.spec.ts | 258 ++++++++++++++++++ ...tification-submission-validator.service.ts | 233 ++++++++++++++++ ...notification-submission.controller.spec.ts | 15 + .../notification-submission.controller.ts | 42 ++- .../notification-submission.module.ts | 2 + .../notification-submission.service.spec.ts | 7 +- .../notification-submission.service.ts | 7 +- .../notification-transferee.controller.ts | 1 + .../notification-transferee.service.spec.ts | 3 + .../notification-transferee.service.ts | 6 + 23 files changed, 810 insertions(+), 24 deletions(-) create mode 100644 portal-frontend/src/app/features/notifications/view-submission/alc-review/alc-review.component.html create mode 100644 portal-frontend/src/app/features/notifications/view-submission/alc-review/alc-review.component.scss create mode 100644 portal-frontend/src/app/features/notifications/view-submission/alc-review/alc-review.component.spec.ts create mode 100644 portal-frontend/src/app/features/notifications/view-submission/alc-review/alc-review.component.ts create mode 100644 portal-frontend/src/app/features/notifications/view-submission/alc-review/submission-documents/submission-documents.component.html create mode 100644 portal-frontend/src/app/features/notifications/view-submission/alc-review/submission-documents/submission-documents.component.scss create mode 100644 portal-frontend/src/app/features/notifications/view-submission/alc-review/submission-documents/submission-documents.component.spec.ts create mode 100644 portal-frontend/src/app/features/notifications/view-submission/alc-review/submission-documents/submission-documents.component.ts create mode 100644 services/apps/alcs/src/portal/notification-submission/notification-submission-validator.service.spec.ts create mode 100644 services/apps/alcs/src/portal/notification-submission/notification-submission-validator.service.ts diff --git a/portal-frontend/src/app/features/notifications/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.html b/portal-frontend/src/app/features/notifications/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.html index 1e91e2b708..865e3302a1 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.html +++ b/portal-frontend/src/app/features/notifications/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.html @@ -20,7 +20,7 @@

Submit Notification of SRW

best of my/our knowledge, true and correct. - check_box I/we understand that the Agricultural Land Commission will take the steps necessary to confirm the + I/we understand that the Agricultural Land Commission will take the steps necessary to confirm the accuracy of the information and documents provided. This information will be available for review by any member of the public. diff --git a/portal-frontend/src/app/features/notifications/edit-submission/transferees/transferees.component.html b/portal-frontend/src/app/features/notifications/edit-submission/transferees/transferees.component.html index 318f8f0a10..3b3bbd8596 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/transferees/transferees.component.html +++ b/portal-frontend/src/app/features/notifications/edit-submission/transferees/transferees.component.html @@ -26,7 +26,7 @@

All Transferees

- + diff --git a/portal-frontend/src/app/features/notifications/notification-details/notification-details.component.html b/portal-frontend/src/app/features/notifications/notification-details/notification-details.component.html index 412f8e83a0..22ffb74cb1 100644 --- a/portal-frontend/src/app/features/notifications/notification-details/notification-details.component.html +++ b/portal-frontend/src/app/features/notifications/notification-details/notification-details.component.html @@ -23,7 +23,7 @@

3. Primary Contact

{{ notificationSubmission.contactOrganization }} - +
Phone
diff --git a/portal-frontend/src/app/features/notifications/view-submission/alc-review/alc-review.component.html b/portal-frontend/src/app/features/notifications/view-submission/alc-review/alc-review.component.html new file mode 100644 index 0000000000..3194abed39 --- /dev/null +++ b/portal-frontend/src/app/features/notifications/view-submission/alc-review/alc-review.component.html @@ -0,0 +1,26 @@ +
+
+

ALC Review and Response

+
+ +
+
+
+ This section will update after the notification is submitted to the ALC. +
+
+ +
+
diff --git a/portal-frontend/src/app/features/notifications/view-submission/alc-review/alc-review.component.scss b/portal-frontend/src/app/features/notifications/view-submission/alc-review/alc-review.component.scss new file mode 100644 index 0000000000..7ca8d1c637 --- /dev/null +++ b/portal-frontend/src/app/features/notifications/view-submission/alc-review/alc-review.component.scss @@ -0,0 +1,8 @@ +@use '../../../../../styles/functions' as *; +@use '../../../../../styles/colors'; + +.warning { + background-color: rgba(colors.$accent-color-light, 0.5); + padding: rem(16); + margin-bottom: rem(24); +} diff --git a/portal-frontend/src/app/features/notifications/view-submission/alc-review/alc-review.component.spec.ts b/portal-frontend/src/app/features/notifications/view-submission/alc-review/alc-review.component.spec.ts new file mode 100644 index 0000000000..5c4cd95735 --- /dev/null +++ b/portal-frontend/src/app/features/notifications/view-submission/alc-review/alc-review.component.spec.ts @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { AlcReviewComponent } from './alc-review.component'; + +describe('AlcsReviewComponent', () => { + let component: AlcReviewComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + providers: [], + declarations: [AlcReviewComponent], + }).compileComponents(); + + fixture = TestBed.createComponent(AlcReviewComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/notifications/view-submission/alc-review/alc-review.component.ts b/portal-frontend/src/app/features/notifications/view-submission/alc-review/alc-review.component.ts new file mode 100644 index 0000000000..8961327a4f --- /dev/null +++ b/portal-frontend/src/app/features/notifications/view-submission/alc-review/alc-review.component.ts @@ -0,0 +1,35 @@ +import { Component, Input, OnDestroy, OnInit } from '@angular/core'; +import { BehaviorSubject, Subject, takeUntil } from 'rxjs'; +import { NotificationDocumentDto } from '../../../../services/notification-document/notification-document.dto'; +import { + NOTIFICATION_STATUS, + NotificationSubmissionDetailedDto, +} from '../../../../services/notification-submission/notification-submission.dto'; + +@Component({ + selector: 'app-alc-review', + templateUrl: './alc-review.component.html', + styleUrls: ['./alc-review.component.scss'], +}) +export class AlcReviewComponent implements OnInit, OnDestroy { + private $destroy = new Subject(); + + @Input() $notificationSubmission = new BehaviorSubject(undefined); + @Input() $notificationDocuments = new BehaviorSubject([]); + + notificationSubmission: NotificationSubmissionDetailedDto | undefined; + NOTIFICATION_STATUS = NOTIFICATION_STATUS; + + constructor() {} + + ngOnInit(): void { + this.$notificationSubmission.pipe(takeUntil(this.$destroy)).subscribe((noiSubmission) => { + this.notificationSubmission = noiSubmission; + }); + } + + ngOnDestroy(): void { + this.$destroy.next(); + this.$destroy.complete(); + } +} diff --git a/portal-frontend/src/app/features/notifications/view-submission/alc-review/submission-documents/submission-documents.component.html b/portal-frontend/src/app/features/notifications/view-submission/alc-review/submission-documents/submission-documents.component.html new file mode 100644 index 0000000000..e359f0710a --- /dev/null +++ b/portal-frontend/src/app/features/notifications/view-submission/alc-review/submission-documents/submission-documents.component.html @@ -0,0 +1,43 @@ +

SRW Documents

+
+
Type{{ element.type.code === 'INVD' ? 'Individual' : 'Organization' }}{{ element.type.code === 'INDV' ? 'Individual' : 'Organization' }}
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Type + {{ element.type?.label }} + Document Name + {{ element.fileName }} + Source{{ element.source }}Upload Date{{ element.uploadedAt | date }}Actions + +
Documents will be visible here once provided by ALC
+
diff --git a/portal-frontend/src/app/features/notifications/view-submission/alc-review/submission-documents/submission-documents.component.scss b/portal-frontend/src/app/features/notifications/view-submission/alc-review/submission-documents/submission-documents.component.scss new file mode 100644 index 0000000000..0027146765 --- /dev/null +++ b/portal-frontend/src/app/features/notifications/view-submission/alc-review/submission-documents/submission-documents.component.scss @@ -0,0 +1,25 @@ +@use '../../../../../../styles/colors'; +@use '../../../../../../styles/functions' as *; + +.header { + display: flex; + justify-content: space-between; +} + +.table-container { + margin: rem(4); + overflow-x: auto; +} + +.documents { + margin-top: rem(12); +} + +.mat-mdc-no-data-row { + height: rem(56); + color: colors.$grey-dark; +} + +a { + word-break: break-all; +} diff --git a/portal-frontend/src/app/features/notifications/view-submission/alc-review/submission-documents/submission-documents.component.spec.ts b/portal-frontend/src/app/features/notifications/view-submission/alc-review/submission-documents/submission-documents.component.spec.ts new file mode 100644 index 0000000000..3359ec78d2 --- /dev/null +++ b/portal-frontend/src/app/features/notifications/view-submission/alc-review/submission-documents/submission-documents.component.spec.ts @@ -0,0 +1,36 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { NoticeOfIntentDocumentService } from '../../../../../services/notice-of-intent-document/notice-of-intent-document.service'; +import { NotificationDocumentService } from '../../../../../services/notification-document/notification-document.service'; + +import { SubmissionDocumentsComponent } from './submission-documents.component'; + +describe('SubmissionDocumentsComponent', () => { + let component: SubmissionDocumentsComponent; + let fixture: ComponentFixture; + let mockNotificationDocumentService: DeepMocked; + + beforeEach(async () => { + mockNotificationDocumentService = createMock(); + + await TestBed.configureTestingModule({ + declarations: [SubmissionDocumentsComponent], + providers: [ + { + provide: NotificationDocumentService, + useValue: mockNotificationDocumentService, + }, + ], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(SubmissionDocumentsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/notifications/view-submission/alc-review/submission-documents/submission-documents.component.ts b/portal-frontend/src/app/features/notifications/view-submission/alc-review/submission-documents/submission-documents.component.ts new file mode 100644 index 0000000000..2410063047 --- /dev/null +++ b/portal-frontend/src/app/features/notifications/view-submission/alc-review/submission-documents/submission-documents.component.ts @@ -0,0 +1,45 @@ +import { Component, Input, OnDestroy, OnInit, ViewChild } from '@angular/core'; +import { MatSort } from '@angular/material/sort'; +import { MatTableDataSource } from '@angular/material/table'; +import { BehaviorSubject, Subject, takeUntil } from 'rxjs'; +import { NotificationDocumentDto } from '../../../../../services/notification-document/notification-document.dto'; +import { NotificationDocumentService } from '../../../../../services/notification-document/notification-document.service'; + +@Component({ + selector: 'app-submission-documents', + templateUrl: './submission-documents.component.html', + styleUrls: ['./submission-documents.component.scss'], +}) +export class SubmissionDocumentsComponent implements OnInit, OnDestroy { + private $destroy = new Subject(); + + displayedColumns: string[] = ['type', 'fileName', 'source', 'uploadedAt', 'actions']; + documents: NotificationDocumentDto[] = []; + + @Input() $notificationDocuments = new BehaviorSubject([]); + + @ViewChild(MatSort) sort!: MatSort; + dataSource: MatTableDataSource = new MatTableDataSource(); + + constructor(private notificationDocumentService: NotificationDocumentService) {} + + ngOnInit(): void { + this.$notificationDocuments.pipe(takeUntil(this.$destroy)).subscribe((documents) => { + this.dataSource = new MatTableDataSource(documents); + }); + } + + async openFile(uuid: string) { + const res = await this.notificationDocumentService.openFile(uuid); + if (res) { + window.open(res.url, '_blank'); + } + } + + ngOnDestroy(): void { + this.$destroy.next(); + this.$destroy.complete(); + } + + protected readonly open = open; +} diff --git a/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.html b/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.html index aa28457dfe..066ca7591b 100644 --- a/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.html +++ b/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.html @@ -82,8 +82,13 @@

Applicant Submission

- -
//TODO
+ +
+ +
diff --git a/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.module.ts b/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.module.ts index 8e9c36c202..695ed72b7f 100644 --- a/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.module.ts +++ b/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.module.ts @@ -4,6 +4,8 @@ import { RouterModule, Routes } from '@angular/router'; import { NgxMaskDirective, NgxMaskPipe } from 'ngx-mask'; import { SharedModule } from '../../../shared/shared.module'; import { NotificationDetailsModule } from '../notification-details/notification-details.module'; +import { AlcReviewComponent } from './alc-review/alc-review.component'; +import { SubmissionDocumentsComponent } from './alc-review/submission-documents/submission-documents.component'; import { ViewNotificationSubmissionComponent } from './view-notification-submission.component'; const routes: Routes = [ @@ -22,6 +24,6 @@ const routes: Routes = [ NgxMaskPipe, NotificationDetailsModule, ], - declarations: [ViewNotificationSubmissionComponent], + declarations: [ViewNotificationSubmissionComponent, AlcReviewComponent, SubmissionDocumentsComponent], }) export class ViewNotificationSubmissionModule {} diff --git a/services/apps/alcs/src/portal/notification-submission/notification-submission-validator.service.spec.ts b/services/apps/alcs/src/portal/notification-submission/notification-submission-validator.service.spec.ts new file mode 100644 index 0000000000..611feac0c9 --- /dev/null +++ b/services/apps/alcs/src/portal/notification-submission/notification-submission-validator.service.spec.ts @@ -0,0 +1,258 @@ +import { ServiceValidationException } from '@app/common/exceptions/base.exception'; +import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; +import { Test, TestingModule } from '@nestjs/testing'; +import { LocalGovernment } from '../../alcs/local-government/local-government.entity'; +import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; +import { NotificationDocument } from '../../alcs/notification/notification-document/notification-document.entity'; +import { NotificationDocumentService } from '../../alcs/notification/notification-document/notification-document.service'; +import { + DOCUMENT_TYPE, + DocumentCode, +} from '../../document/document-code.entity'; +import { DOCUMENT_SOURCE } from '../../document/document.dto'; +import { Document } from '../../document/document.entity'; +import { NotificationParcel } from './notification-parcel/notification-parcel.entity'; +import { NotificationParcelService } from './notification-parcel/notification-parcel.service'; +import { NotificationSubmissionValidatorService } from './notification-submission-validator.service'; +import { NotificationSubmission } from './notification-submission.entity'; + +function includesError(errors: Error[], target: Error) { + return errors.some((error) => error.message === target.message); +} + +describe('NotificationSubmissionValidatorService', () => { + let service: NotificationSubmissionValidatorService; + let mockLGService: DeepMocked; + let mockParcelService: DeepMocked; + let mockNotificationDocumentService: DeepMocked; + + beforeEach(async () => { + mockLGService = createMock(); + mockParcelService = createMock(); + mockNotificationDocumentService = createMock(); + + const module: TestingModule = await Test.createTestingModule({ + providers: [ + NotificationSubmissionValidatorService, + { + provide: LocalGovernmentService, + useValue: mockLGService, + }, + { + provide: NotificationParcelService, + useValue: mockParcelService, + }, + { + provide: NotificationDocumentService, + useValue: mockNotificationDocumentService, + }, + ], + }).compile(); + + mockLGService.list.mockResolvedValue([]); + mockParcelService.fetchByFileId.mockResolvedValue([]); + mockNotificationDocumentService.getApplicantDocuments.mockResolvedValue([]); + + service = module.get( + NotificationSubmissionValidatorService, + ); + }); + + it('should be defined', () => { + expect(service).toBeDefined(); + }); + + it('should return an error for missing applicant', async () => { + const noticeOfIntentSubmission = new NotificationSubmission({}); + + const res = await service.validateSubmission(noticeOfIntentSubmission); + + expect(includesError(res.errors, new Error('Missing applicant'))).toBe( + true, + ); + }); + + it('should return an error for missing purpose', async () => { + const noticeOfIntentSubmission = new NotificationSubmission({}); + + const res = await service.validateSubmission(noticeOfIntentSubmission); + + expect(includesError(res.errors, new Error('Missing purpose'))).toBe(true); + }); + + it('should return an error for no parcels', async () => { + const noticeOfIntentSubmission = new NotificationSubmission({}); + + const res = await service.validateSubmission(noticeOfIntentSubmission); + + expect(includesError(res.errors, new Error('Missing applicant'))).toBe( + true, + ); + }); + + it('provide errors for invalid parcel', async () => { + const noticeOfIntentSubmission = new NotificationSubmission({}); + const parcel = new NotificationParcel({ + uuid: 'parcel-1', + ownershipTypeCode: 'SMPL', + legalDescription: null, + }); + + mockParcelService.fetchByFileId.mockResolvedValue([parcel]); + + const res = await service.validateSubmission(noticeOfIntentSubmission); + + expect( + includesError( + res.errors, + new ServiceValidationException(`Invalid Parcel ${parcel.uuid}`), + ), + ).toBe(true); + expect( + includesError( + res.errors, + new ServiceValidationException( + `Fee Simple Parcel ${parcel.uuid} has no PID`, + ), + ), + ).toBe(true); + }); + + it('should report an invalid PID', async () => { + const noticeOfIntentSubmission = new NotificationSubmission({}); + const parcel = new NotificationParcel({ + uuid: 'parcel-1', + ownershipTypeCode: 'SMPL', + pid: '1251251', + }); + + mockParcelService.fetchByFileId.mockResolvedValue([parcel]); + + const res = await service.validateSubmission(noticeOfIntentSubmission); + + expect( + includesError( + res.errors, + new ServiceValidationException(`Parcel ${parcel.uuid} has invalid PID`), + ), + ).toBe(true); + }); + + it('should return an error for invalid primary contact', async () => { + const noticeOfIntentSubmission = new NotificationSubmission({}); + + const res = await service.validateSubmission(noticeOfIntentSubmission); + + expect( + includesError( + res.errors, + new Error(`Invalid Primary Contact Information`), + ), + ).toBe(true); + }); + + it('should return an error for incomplete proposal', async () => { + const noticeOfIntentSubmission = new NotificationSubmission({ + typeCode: 'SRW', + }); + + const res = await service.validateSubmission(noticeOfIntentSubmission); + + expect( + includesError(res.errors, new Error(`Incomplete Proposal Information`)), + ).toBe(true); + expect( + includesError(res.errors, new Error(`SRW proposal missing SRW Terms`)), + ).toBe(true); + }); + + it('should produce an error for missing local government', async () => { + const noticeOfIntentSubmission = new NotificationSubmission({}); + + const res = await service.validateSubmission(noticeOfIntentSubmission); + + expect( + includesError( + res.errors, + new Error('Notification has no local government'), + ), + ).toBe(true); + }); + + it('should accept local government when its valid', async () => { + const mockLg = new LocalGovernment({ + uuid: 'lg-uuid', + name: 'lg', + bceidBusinessGuid: 'CATS', + isFirstNation: false, + }); + mockLGService.list.mockResolvedValue([mockLg]); + + const noticeOfIntentSubmission = new NotificationSubmission({ + localGovernmentUuid: mockLg.uuid, + }); + + const res = await service.validateSubmission(noticeOfIntentSubmission); + + expect( + includesError( + res.errors, + new Error( + `Selected local government is setup in portal ${mockLg.name}`, + ), + ), + ).toBe(false); + }); + + it('should report error for document missing type', async () => { + const incompleteDocument = new NotificationDocument({ + type: undefined, + document: new Document({ + source: DOCUMENT_SOURCE.APPLICANT, + }), + }); + + const documents = [incompleteDocument]; + mockNotificationDocumentService.getApplicantDocuments.mockResolvedValue( + documents, + ); + + const noticeOfIntentSubmission = new NotificationSubmission({}); + + const res = await service.validateSubmission(noticeOfIntentSubmission); + + expect( + includesError( + res.errors, + new Error(`Document ${incompleteDocument.uuid} missing type`), + ), + ).toBe(true); + }); + + it('should report error for other document missing description', async () => { + const incompleteDocument = new NotificationDocument({ + type: new DocumentCode({ + code: DOCUMENT_TYPE.OTHER, + }), + document: new Document({ + source: DOCUMENT_SOURCE.APPLICANT, + }), + description: undefined, + }); + const noticeOfIntentSubmission = new NotificationSubmission({}); + + const documents = [incompleteDocument]; + mockNotificationDocumentService.getApplicantDocuments.mockResolvedValue( + documents, + ); + + const res = await service.validateSubmission(noticeOfIntentSubmission); + + expect( + includesError( + res.errors, + new Error(`Document ${incompleteDocument.uuid} missing description`), + ), + ).toBe(true); + }); +}); diff --git a/services/apps/alcs/src/portal/notification-submission/notification-submission-validator.service.ts b/services/apps/alcs/src/portal/notification-submission/notification-submission-validator.service.ts new file mode 100644 index 0000000000..bb93adff0e --- /dev/null +++ b/services/apps/alcs/src/portal/notification-submission/notification-submission-validator.service.ts @@ -0,0 +1,233 @@ +import { ServiceValidationException } from '@app/common/exceptions/base.exception'; +import { Injectable, Logger } from '@nestjs/common'; +import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; +import { NotificationDocument } from '../../alcs/notification/notification-document/notification-document.entity'; +import { NotificationDocumentService } from '../../alcs/notification/notification-document/notification-document.service'; +import { DOCUMENT_TYPE } from '../../document/document-code.entity'; +import { NotificationParcelService } from './notification-parcel/notification-parcel.service'; +import { NotificationSubmission } from './notification-submission.entity'; + +export class ValidatedNotificationSubmission extends NotificationSubmission { + applicant: string; + localGovernmentUuid: string; +} + +@Injectable() +export class NotificationSubmissionValidatorService { + private logger: Logger = new Logger( + NotificationSubmissionValidatorService.name, + ); + + constructor( + private localGovernmentService: LocalGovernmentService, + private notificationParcelService: NotificationParcelService, + private notificationDocumentService: NotificationDocumentService, + ) {} + + async validateSubmission(notificationSubmission: NotificationSubmission) { + const errors: Error[] = []; + + if (!notificationSubmission.applicant) { + errors.push(new ServiceValidationException('Missing applicant')); + } + + if (!notificationSubmission.purpose) { + errors.push(new ServiceValidationException('Missing purpose')); + } + + await this.validateParcels(notificationSubmission, errors); + + const applicantDocuments = + await this.notificationDocumentService.getApplicantDocuments( + notificationSubmission.fileNumber, + ); + + await this.validatePrimaryContact(notificationSubmission, errors); + + await this.validateLocalGovernment(notificationSubmission, errors); + await this.validateProposal( + notificationSubmission, + applicantDocuments, + errors, + ); + await this.validateOptionalDocuments(applicantDocuments, errors); + + return { + errors, + noticeOfIntentSubmission: + errors.length === 0 + ? (notificationSubmission as ValidatedNotificationSubmission) + : undefined, + }; + } + + private async validateParcels( + notificationSubmission: NotificationSubmission, + errors: Error[], + ) { + const parcels = await this.notificationParcelService.fetchByFileId( + notificationSubmission.fileNumber, + ); + + if (parcels.length === 0) { + errors.push( + new ServiceValidationException(`Notification has no parcels`), + ); + } + + for (const parcel of parcels) { + if ( + parcel.ownershipTypeCode === null || + parcel.legalDescription === null || + parcel.mapAreaHectares === null || + parcel.civicAddress === null + ) { + errors.push( + new ServiceValidationException(`Invalid Parcel ${parcel.uuid}`), + ); + } + + if (parcel.ownershipTypeCode === 'SMPL' && !parcel.pid) { + errors.push( + new ServiceValidationException( + `Fee Simple Parcel ${parcel.uuid} has no PID`, + ), + ); + } + + if (parcel.pid && parcel.pid.length !== 9) { + errors.push( + new ServiceValidationException( + `Parcel ${parcel.uuid} has invalid PID`, + ), + ); + } + } + + if (errors.length === 0) { + return parcels; + } + } + + private async validatePrimaryContact( + notificationSubmission: NotificationSubmission, + errors: Error[], + ) { + if ( + !notificationSubmission.contactFirstName || + !notificationSubmission.contactLastName || + !notificationSubmission.contactPhone || + !notificationSubmission.contactEmail + ) { + errors.push( + new ServiceValidationException(`Invalid Primary Contact Information`), + ); + } + } + + private async validateLocalGovernment( + notificationSubmission: NotificationSubmission, + errors: Error[], + ) { + const localGovernments = await this.localGovernmentService.list(); + const matchingLg = localGovernments.find( + (lg) => lg.uuid === notificationSubmission.localGovernmentUuid, + ); + if (!notificationSubmission.localGovernmentUuid) { + errors.push( + new ServiceValidationException('Notification has no local government'), + ); + } + + if (!matchingLg) { + errors.push( + new ServiceValidationException( + 'Cannot find local government set on Notification', + ), + ); + return; + } + + if (!matchingLg.bceidBusinessGuid) { + errors.push( + new ServiceValidationException( + `Selected local government is setup in portal ${matchingLg.name}`, + ), + ); + } + } + + private async validateOptionalDocuments( + applicantDocuments: NotificationDocument[], + errors: Error[], + ) { + const untypedDocuments = applicantDocuments.filter( + (document) => !document.type, + ); + for (const document of untypedDocuments) { + errors.push( + new ServiceValidationException( + `Document ${document.uuid} missing type`, + ), + ); + } + + const optionalDocuments = applicantDocuments.filter((document) => + [ + DOCUMENT_TYPE.OTHER, + DOCUMENT_TYPE.PHOTOGRAPH, + DOCUMENT_TYPE.PROFESSIONAL_REPORT, + ].includes(document.type?.code as DOCUMENT_TYPE), + ); + for (const document of optionalDocuments) { + if (!document.description) { + errors.push( + new ServiceValidationException( + `Document ${document.uuid} missing description`, + ), + ); + } + } + } + + private validateProposal( + notificationSubmission: NotificationSubmission, + applicantDocuments: NotificationDocument[], + errors: Error[], + ) { + if ( + !notificationSubmission.submittersFileNumber || + !notificationSubmission.purpose || + !notificationSubmission.totalArea || + notificationSubmission.hasSurveyPlan === null + ) { + errors.push( + new ServiceValidationException(`Incomplete Proposal Information`), + ); + } + + const srwTerms = applicantDocuments.filter( + (document) => document.typeCode === DOCUMENT_TYPE.SRW_TERMS, + ); + if (srwTerms.length === 0) { + errors.push( + new ServiceValidationException( + `${notificationSubmission.typeCode} proposal missing SRW Terms`, + ), + ); + } + + if (notificationSubmission.hasSurveyPlan) { + const surveyPlans = applicantDocuments.filter( + (document) => document.typeCode === DOCUMENT_TYPE.SURVEY_PLAN, + ); + if (surveyPlans.length === 0) { + errors.push( + new ServiceValidationException( + `${notificationSubmission.typeCode} proposal missing Survey Plans`, + ), + ); + } + } + } +} diff --git a/services/apps/alcs/src/portal/notification-submission/notification-submission.controller.spec.ts b/services/apps/alcs/src/portal/notification-submission/notification-submission.controller.spec.ts index 73f24fdeac..e813a9cc24 100644 --- a/services/apps/alcs/src/portal/notification-submission/notification-submission.controller.spec.ts +++ b/services/apps/alcs/src/portal/notification-submission/notification-submission.controller.spec.ts @@ -14,6 +14,10 @@ import { Notification } from '../../alcs/notification/notification.entity'; import { NotificationSubmissionProfile } from '../../common/automapper/notification-submission.automapper.profile'; import { EmailService } from '../../providers/email/email.service'; import { User } from '../../user/user.entity'; +import { + NotificationSubmissionValidatorService, + ValidatedNotificationSubmission, +} from './notification-submission-validator.service'; import { NotificationSubmissionController } from './notification-submission.controller'; import { NotificationSubmissionDetailedDto, @@ -26,6 +30,7 @@ import { NotificationTransferee } from './notification-transferee/notification-t describe('NotificationSubmissionController', () => { let controller: NotificationSubmissionController; let mockNotificationSubmissionService: DeepMocked; + let mockNotificationValidationService: DeepMocked; let mockDocumentService: DeepMocked; let mockLgService: DeepMocked; let mockEmailService: DeepMocked; @@ -40,6 +45,7 @@ describe('NotificationSubmissionController', () => { mockDocumentService = createMock(); mockLgService = createMock(); mockEmailService = createMock(); + mockNotificationValidationService = createMock(); const module: TestingModule = await Test.createTestingModule({ controllers: [NotificationSubmissionController], @@ -53,6 +59,10 @@ describe('NotificationSubmissionController', () => { provide: NoticeOfIntentDocumentService, useValue: mockDocumentService, }, + { + provide: NotificationSubmissionValidatorService, + useValue: mockNotificationValidationService, + }, { provide: LocalGovernmentService, useValue: mockLgService, @@ -275,6 +285,11 @@ describe('NotificationSubmissionController', () => { mockNotificationSubmissionService.mapToDetailedDTO.mockResolvedValue( {} as NotificationSubmissionDetailedDto, ); + mockNotificationValidationService.validateSubmission.mockResolvedValue({ + noticeOfIntentSubmission: + mockSubmission as ValidatedNotificationSubmission, + errors: [], + }); await controller.submitAsApplicant(mockFileId, { user: { diff --git a/services/apps/alcs/src/portal/notification-submission/notification-submission.controller.ts b/services/apps/alcs/src/portal/notification-submission/notification-submission.controller.ts index 6be4e1d581..13f1e08f46 100644 --- a/services/apps/alcs/src/portal/notification-submission/notification-submission.controller.ts +++ b/services/apps/alcs/src/portal/notification-submission/notification-submission.controller.ts @@ -13,6 +13,7 @@ import { import { NOTIFICATION_STATUS } from '../../alcs/notification/notification-submission-status/notification-status.dto'; import { PortalAuthGuard } from '../../common/authorization/portal-auth-guard.service'; import { User } from '../../user/user.entity'; +import { NotificationSubmissionValidatorService } from './notification-submission-validator.service'; import { NotificationSubmissionUpdateDto } from './notification-submission.dto'; import { NotificationSubmissionService } from './notification-submission.service'; @@ -23,6 +24,7 @@ export class NotificationSubmissionController { constructor( private notificationSubmissionService: NotificationSubmissionService, + private notificationValidationService: NotificationSubmissionValidatorService, ) {} @Get() @@ -130,18 +132,32 @@ export class NotificationSubmissionController { const notificationSubmission = await this.notificationSubmissionService.getByUuid(uuid, req.user.entity); - await this.notificationSubmissionService.submitToAlcs( - notificationSubmission, - ); - - const finalSubmission = await this.notificationSubmissionService.getByUuid( - uuid, - req.user.entity, - ); - - return await this.notificationSubmissionService.mapToDetailedDTO( - finalSubmission, - req.user.entity, - ); + const validationResult = + await this.notificationValidationService.validateSubmission( + notificationSubmission, + ); + + if (validationResult.noticeOfIntentSubmission) { + const validatedApplicationSubmission = + validationResult.noticeOfIntentSubmission; + + await this.notificationSubmissionService.submitToAlcs( + validatedApplicationSubmission, + ); + + const finalSubmission = + await this.notificationSubmissionService.getByUuid( + uuid, + req.user.entity, + ); + + return await this.notificationSubmissionService.mapToDetailedDTO( + finalSubmission, + req.user.entity, + ); + } else { + this.logger.debug(validationResult.errors); + throw new BadRequestException('Invalid Notification'); + } } } diff --git a/services/apps/alcs/src/portal/notification-submission/notification-submission.module.ts b/services/apps/alcs/src/portal/notification-submission/notification-submission.module.ts index 62d5b44899..095ccccaa1 100644 --- a/services/apps/alcs/src/portal/notification-submission/notification-submission.module.ts +++ b/services/apps/alcs/src/portal/notification-submission/notification-submission.module.ts @@ -14,6 +14,7 @@ import { FileNumberModule } from '../../file-number/file-number.module'; import { NotificationParcelController } from './notification-parcel/notification-parcel.controller'; import { NotificationParcel } from './notification-parcel/notification-parcel.entity'; import { NotificationParcelService } from './notification-parcel/notification-parcel.service'; +import { NotificationSubmissionValidatorService } from './notification-submission-validator.service'; import { NotificationSubmissionController } from './notification-submission.controller'; import { NotificationSubmission } from './notification-submission.entity'; import { NotificationSubmissionService } from './notification-submission.service'; @@ -44,6 +45,7 @@ import { NotificationTransfereeService } from './notification-transferee/notific ], providers: [ NotificationSubmissionService, + NotificationSubmissionValidatorService, NotificationParcelService, NotificationTransfereeService, NotificationSubmissionProfile, diff --git a/services/apps/alcs/src/portal/notification-submission/notification-submission.service.spec.ts b/services/apps/alcs/src/portal/notification-submission/notification-submission.service.spec.ts index c98e98df0d..e01a708832 100644 --- a/services/apps/alcs/src/portal/notification-submission/notification-submission.service.spec.ts +++ b/services/apps/alcs/src/portal/notification-submission/notification-submission.service.spec.ts @@ -14,6 +14,7 @@ import { NotificationService } from '../../alcs/notification/notification.servic import { NotificationSubmissionProfile } from '../../common/automapper/notification-submission.automapper.profile'; import { FileNumberService } from '../../file-number/file-number.service'; import { User } from '../../user/user.entity'; +import { ValidatedNotificationSubmission } from './notification-submission-validator.service'; import { NotificationSubmission } from './notification-submission.entity'; import { NotificationSubmissionService } from './notification-submission.service'; @@ -193,7 +194,7 @@ describe('NotificationSubmissionService', () => { expect(res[0].applicant).toEqual(applicant); }); - it('should fail on submitToAlcs if error', async () => { + it('should fail on submitToAlcs if validation fails', async () => { const applicant = 'Bruce Wayne'; const typeCode = 'fake-code'; const fileNumber = 'fake'; @@ -208,7 +209,9 @@ describe('NotificationSubmissionService', () => { mockNotificationService.submit.mockRejectedValue(new Error()); await expect( - service.submitToAlcs(noticeOfIntentSubmission), + service.submitToAlcs( + noticeOfIntentSubmission as ValidatedNotificationSubmission, + ), ).rejects.toMatchObject( new BaseServiceException(`Failed to submit notification: ${fileNumber}`), ); diff --git a/services/apps/alcs/src/portal/notification-submission/notification-submission.service.ts b/services/apps/alcs/src/portal/notification-submission/notification-submission.service.ts index 77257a787e..d3f658a872 100644 --- a/services/apps/alcs/src/portal/notification-submission/notification-submission.service.ts +++ b/services/apps/alcs/src/portal/notification-submission/notification-submission.service.ts @@ -22,6 +22,7 @@ import { FileNumberService } from '../../file-number/file-number.service'; import { User } from '../../user/user.entity'; import { FALLBACK_APPLICANT_NAME } from '../../utils/owner.constants'; import { filterUndefined } from '../../utils/undefined'; +import { ValidatedNotificationSubmission } from './notification-submission-validator.service'; import { NotificationSubmissionDetailedDto, NotificationSubmissionDto, @@ -325,12 +326,12 @@ export class NotificationSubmissionService { }; } - async submitToAlcs(notificationSubmission: NotificationSubmission) { + async submitToAlcs(notificationSubmission: ValidatedNotificationSubmission) { try { const submittedNotification = await this.notificationService.submit({ fileNumber: notificationSubmission.fileNumber, - applicant: notificationSubmission.applicant!, - localGovernmentUuid: notificationSubmission.localGovernmentUuid!, + applicant: notificationSubmission.applicant, + localGovernmentUuid: notificationSubmission.localGovernmentUuid, typeCode: notificationSubmission.typeCode, dateSubmittedToAlc: new Date(), }); diff --git a/services/apps/alcs/src/portal/notification-submission/notification-transferee/notification-transferee.controller.ts b/services/apps/alcs/src/portal/notification-submission/notification-transferee/notification-transferee.controller.ts index bbac88444a..43a68adba9 100644 --- a/services/apps/alcs/src/portal/notification-submission/notification-transferee/notification-transferee.controller.ts +++ b/services/apps/alcs/src/portal/notification-submission/notification-transferee/notification-transferee.controller.ts @@ -69,6 +69,7 @@ export class NotificationTransfereeController { const owner = await this.ownerService.create( createDto, noticeOfIntentSubmission, + req.user.entity, ); return this.mapper.mapAsync( diff --git a/services/apps/alcs/src/portal/notification-submission/notification-transferee/notification-transferee.service.spec.ts b/services/apps/alcs/src/portal/notification-submission/notification-transferee/notification-transferee.service.spec.ts index 822dd90d5e..269b9edc7f 100644 --- a/services/apps/alcs/src/portal/notification-submission/notification-transferee/notification-transferee.service.spec.ts +++ b/services/apps/alcs/src/portal/notification-submission/notification-transferee/notification-transferee.service.spec.ts @@ -2,6 +2,7 @@ import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; +import { Notification } from '../../../alcs/notification/notification.entity'; import { NotificationService } from '../../../alcs/notification/notification.service'; import { OwnerType } from '../../../common/owner-type/owner-type.entity'; import { User } from '../../../user/user.entity'; @@ -70,6 +71,7 @@ describe('NotificationTransfereeService', () => { it('should load the type and then call save for create', async () => { mockRepo.save.mockResolvedValue(new NotificationTransferee()); mockTypeRepo.findOneOrFail.mockResolvedValue(new OwnerType()); + mockRepo.find.mockResolvedValue([]); await service.create( { @@ -79,6 +81,7 @@ describe('NotificationTransfereeService', () => { typeCode: '', }, new NotificationSubmission(), + new User(), ); expect(mockRepo.save).toHaveBeenCalledTimes(1); diff --git a/services/apps/alcs/src/portal/notification-submission/notification-transferee/notification-transferee.service.ts b/services/apps/alcs/src/portal/notification-submission/notification-transferee/notification-transferee.service.ts index 9359664545..da5b942f18 100644 --- a/services/apps/alcs/src/portal/notification-submission/notification-transferee/notification-transferee.service.ts +++ b/services/apps/alcs/src/portal/notification-submission/notification-transferee/notification-transferee.service.ts @@ -41,6 +41,7 @@ export class NotificationTransfereeService { async create( createDto: NotificationTransfereeCreateDto, notificationSubmission: NotificationSubmission, + user: User, ) { const type = await this.typeRepository.findOneOrFail({ where: { @@ -58,6 +59,11 @@ export class NotificationTransfereeService { type, }); + await this.updateSubmissionApplicant( + newOwner.notificationSubmissionUuid, + user, + ); + return await this.repository.save(newOwner); } From c3cec43988ddfd1bbec76524cf96ab89a0e29994 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Fri, 8 Sep 2023 15:04:13 -0700 Subject: [PATCH 369/954] Add Preview State for NOIs --- .../notice-of-intent.component.html | 15 ++++- .../notice-of-intent.component.ts | 33 ++++++++-- .../notice-of-intent-timeline.service.ts | 62 ++++++++++--------- 3 files changed, 77 insertions(+), 33 deletions(-) diff --git a/alcs-frontend/src/app/features/notice-of-intent/notice-of-intent.component.html b/alcs-frontend/src/app/features/notice-of-intent/notice-of-intent.component.html index 12df253cf8..843d18baa1 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/notice-of-intent.component.html +++ b/alcs-frontend/src/app/features/notice-of-intent/notice-of-intent.component.html @@ -10,7 +10,7 @@ [submissionStatusService]="noticeOfIntentStatusService" >
-
+
+
+
+
+ {{ route.icon }} + {{ route.menuTitle }} +
+
+
diff --git a/alcs-frontend/src/app/features/notice-of-intent/notice-of-intent.component.ts b/alcs-frontend/src/app/features/notice-of-intent/notice-of-intent.component.ts index a856eda4ab..0421207861 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/notice-of-intent.component.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/notice-of-intent.component.ts @@ -6,7 +6,9 @@ import { environment } from '../../../environments/environment'; import { NoticeOfIntentDetailService } from '../../services/notice-of-intent/notice-of-intent-detail.service'; import { NoticeOfIntentModificationDto } from '../../services/notice-of-intent/notice-of-intent-modification/notice-of-intent-modification.dto'; import { NoticeOfIntentModificationService } from '../../services/notice-of-intent/notice-of-intent-modification/notice-of-intent-modification.service'; -import { NoticeOfIntentDto } from '../../services/notice-of-intent/notice-of-intent.dto'; +import { NoticeOfIntentSubmissionStatusService } from '../../services/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service'; +import { NOI_SUBMISSION_STATUS, NoticeOfIntentDto } from '../../services/notice-of-intent/notice-of-intent.dto'; +import { SYSTEM_SOURCE_TYPES } from '../../shared/dto/system-source.types.dto'; import { ApplicantInfoComponent } from './applicant-info/applicant-info.component'; import { decisionChildRoutes, DecisionModule } from './decision/decision.module'; import { NoiDocumentsComponent } from './documents/documents.component'; @@ -15,7 +17,6 @@ import { IntakeComponent } from './intake/intake.component'; import { OverviewComponent } from './overview/overview.component'; import { PostDecisionComponent } from './post-decision/post-decision.component'; import { ProposalComponent } from './proposal/proposal.component'; -import { NoticeOfIntentSubmissionStatusService } from '../../services/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service'; export const childRoutes = [ { @@ -71,6 +72,22 @@ export const childRoutes = [ }, ]; +const preSubmissionRoutes = [ + { + path: '', + menuTitle: 'Overview', + icon: 'summarize', + component: OverviewComponent, + }, + { + path: 'applicant-info', + menuTitle: 'NOI Preview', + icon: 'persons', + component: ApplicantInfoComponent, + portalOnly: true, + }, +]; + @Component({ selector: 'app-notice-of-intent', templateUrl: './notice-of-intent.component.html', @@ -79,12 +96,14 @@ export const childRoutes = [ export class NoticeOfIntentComponent implements OnInit, OnDestroy { destroy = new Subject(); childRoutes = childRoutes; + preSubmissionRoute = preSubmissionRoutes; fileNumber?: string; noticeOfIntent: NoticeOfIntentDto | undefined; modifications: NoticeOfIntentModificationDto[] = []; - isAuthorized = true; + isApplicantSubmission = false; + showSubmittedToAlcMenuItems = false; constructor( private noticeOfIntentDetailService: NoticeOfIntentDetailService, @@ -101,12 +120,18 @@ export class NoticeOfIntentComponent implements OnInit, OnDestroy { this.load(); }); - this.noticeOfIntentDetailService.$noticeOfIntent.pipe(takeUntil(this.destroy)).subscribe((noticeOfIntent) => { + this.noticeOfIntentDetailService.$noticeOfIntent.pipe(takeUntil(this.destroy)).subscribe(async (noticeOfIntent) => { if (noticeOfIntent) { this.titleService.setTitle( `${environment.siteName} | ${noticeOfIntent.fileNumber} (${noticeOfIntent.applicant})` ); + this.isApplicantSubmission = noticeOfIntent.source === SYSTEM_SOURCE_TYPES.APPLICANT; + + if (this.isApplicantSubmission) { + this.showSubmittedToAlcMenuItems = !!noticeOfIntent.dateSubmittedToAlc; + } + this.noticeOfIntentModificationService.fetchByFileNumber(noticeOfIntent.fileNumber); this.noticeOfIntent = noticeOfIntent; } diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-timeline/notice-of-intent-timeline.service.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-timeline/notice-of-intent-timeline.service.ts index bfa5b7051d..fcea9a7a37 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-timeline/notice-of-intent-timeline.service.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-timeline/notice-of-intent-timeline.service.ts @@ -251,41 +251,47 @@ export class NoticeOfIntentTimelineService { noticeOfIntent: NoticeOfIntent, events: TimelineEvent[], ) { - const statusHistory = - await this.noticeOfIntentSubmissionStatusService.getCurrentStatusesByFileNumber( - noticeOfIntent.fileNumber, + if (noticeOfIntent.source === 'APPLICANT') { + const statusHistory = + await this.noticeOfIntentSubmissionStatusService.getCurrentStatusesByFileNumber( + noticeOfIntent.fileNumber, + ); + + const statusesToInclude = statusHistory.filter( + (status) => + NOI_SUBMISSION_STATUS.ALC_DECISION !== status.statusType.code, ); - const statusesToInclude = statusHistory.filter( - (status) => NOI_SUBMISSION_STATUS.ALC_DECISION !== status.statusType.code, - ); + for (const status of statusesToInclude) { + if (status.effectiveDate) { + let htmlText = `${status.statusType.label}`; - for (const status of statusesToInclude) { - if (status.effectiveDate) { - let htmlText = `${status.statusType.label}`; + if (status.statusType.code === NOI_SUBMISSION_STATUS.IN_PROGRESS) { + htmlText = 'Created - In Progress'; + } - if (status.statusType.code === NOI_SUBMISSION_STATUS.IN_PROGRESS) { - htmlText = 'Created - In Progress'; - } + if ( + status.statusType.code === + NOI_SUBMISSION_STATUS.SUBMITTED_TO_ALC_INCOMPLETE + ) { + htmlText = + 'Acknowledged Incomplete - Submitted to ALC - Incomplete'; + } - if ( - status.statusType.code === - NOI_SUBMISSION_STATUS.SUBMITTED_TO_ALC_INCOMPLETE - ) { - htmlText = - 'Acknowledged Incomplete - Submitted to ALC - Incomplete'; - } + if ( + status.statusType.code === NOI_SUBMISSION_STATUS.RECEIVED_BY_ALC + ) { + htmlText = 'Received All Items - Received by ALC'; + } - if (status.statusType.code === NOI_SUBMISSION_STATUS.RECEIVED_BY_ALC) { - htmlText = 'Received All Items - Received by ALC'; + events.push({ + htmlText, + startDate: + status.effectiveDate.getTime() + status.statusType.weight, + fulfilledDate: null, + isFulfilled: true, + }); } - - events.push({ - htmlText, - startDate: status.effectiveDate.getTime() + status.statusType.weight, - fulfilledDate: null, - isFulfilled: true, - }); } } } From 5a179c670c688e7426eb72028e176a0250d3b763 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Fri, 8 Sep 2023 15:12:42 -0700 Subject: [PATCH 370/954] Require at least one file to release a decision --- .../decision-v2/decision-input/decision-input-v2.component.ts | 2 ++ .../decision-v2/decision-input/decision-input-v2.component.ts | 2 ++ 2 files changed, 4 insertions(+) diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.ts index 073a1059cf..51d6383cb8 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.ts @@ -548,6 +548,8 @@ export class DecisionInputV2Component implements OnInit, OnDestroy { if ( !this.form.valid || + !this.existingDecision || + this.existingDecision.documents.length === 0 || !this.conditionsValid || !this.componentsValid || (this.components.length === 0 && requiresComponents) || diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-input-v2.component.ts b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-input-v2.component.ts index 2b2987090e..919359f8f3 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-input-v2.component.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-input-v2.component.ts @@ -386,6 +386,8 @@ export class DecisionInputV2Component implements OnInit, OnDestroy { if ( !this.form.valid || + !this.existingDecision || + this.existingDecision.documents.length === 0 || !this.conditionsValid || !this.componentsValid || (this.components.length === 0 && requiresComponents) || From aab17eef702fd91d8f0e281c62774ae8152d57c3 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Fri, 8 Sep 2023 15:16:07 -0700 Subject: [PATCH 371/954] Show documents in ALC tab for all statuses after Submitted --- .../view-submission/alc-review/alc-review.component.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/portal-frontend/src/app/features/applications/view-submission/alc-review/alc-review.component.html b/portal-frontend/src/app/features/applications/view-submission/alc-review/alc-review.component.html index 30845c0dd5..4ea1d813f6 100644 --- a/portal-frontend/src/app/features/applications/view-submission/alc-review/alc-review.component.html +++ b/portal-frontend/src/app/features/applications/view-submission/alc-review/alc-review.component.html @@ -33,6 +33,9 @@

ALC Review and Decision

From 155c94b3d1a293a0691e04f5d89a2fad49e7790c Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Fri, 8 Sep 2023 15:26:06 -0700 Subject: [PATCH 372/954] Don't load statuses for non-applicant source timelines --- .../application-timeline.service.spec.ts | 2 +- .../application-timeline.service.ts | 4 +- .../notice-of-intent-timeline.service.spec.ts | 6 +- .../notice-of-intent-timeline.service.ts | 67 +++++++++---------- 4 files changed, 40 insertions(+), 39 deletions(-) diff --git a/services/apps/alcs/src/alcs/application/application-timeline/application-timeline.service.spec.ts b/services/apps/alcs/src/alcs/application/application-timeline/application-timeline.service.spec.ts index 41523fa130..cf7e7fec5c 100644 --- a/services/apps/alcs/src/alcs/application/application-timeline/application-timeline.service.spec.ts +++ b/services/apps/alcs/src/alcs/application/application-timeline/application-timeline.service.spec.ts @@ -79,7 +79,7 @@ describe('ApplicationTimelineService', () => { ); mockAppRepo.findOneOrFail.mockResolvedValue( - new Application({ decisionDate: mockSameDate }), + new Application({ decisionDate: mockSameDate, source: 'APPLICANT' }), ); mockAppModificationRepo.find.mockResolvedValue([]); mockAppReconsiderationRepo.find.mockResolvedValue([]); diff --git a/services/apps/alcs/src/alcs/application/application-timeline/application-timeline.service.ts b/services/apps/alcs/src/alcs/application/application-timeline/application-timeline.service.ts index bf953c6862..9e35e6f2d0 100644 --- a/services/apps/alcs/src/alcs/application/application-timeline/application-timeline.service.ts +++ b/services/apps/alcs/src/alcs/application/application-timeline/application-timeline.service.ts @@ -83,7 +83,9 @@ export class ApplicationTimelineService { await this.addReconsiderationEvents(application, events); await this.addModificationEvents(application, events); await this.addMeetingEvents(application, events); - await this.addStatusEvents(application, events); + if (application.source === 'APPLICANT') { + await this.addStatusEvents(application, events); + } if (application.card) { for (const subtask of application.card.subtasks) { diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-timeline/notice-of-intent-timeline.service.spec.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-timeline/notice-of-intent-timeline.service.spec.ts index 3204ca01cb..db7857b897 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-timeline/notice-of-intent-timeline.service.spec.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-timeline/notice-of-intent-timeline.service.spec.ts @@ -68,7 +68,11 @@ describe('NoticeOfIntentTimelineService', () => { NoticeOfIntentTimelineService, ); - mockNOIRepo.findOneOrFail.mockResolvedValue(new NoticeOfIntent()); + mockNOIRepo.findOneOrFail.mockResolvedValue( + new NoticeOfIntent({ + source: 'APPLICANT', + }), + ); mockNOIDecisionRepo.find.mockResolvedValue([]); mockNOIModificationRepo.find.mockResolvedValue([]); mockNOIMeetingService.getByFileNumber.mockResolvedValue([]); diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-timeline/notice-of-intent-timeline.service.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-timeline/notice-of-intent-timeline.service.ts index fcea9a7a37..7e18208d07 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-timeline/notice-of-intent-timeline.service.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-timeline/notice-of-intent-timeline.service.ts @@ -70,8 +70,9 @@ export class NoticeOfIntentTimelineService { await this.addDecisionEvents(noticeOfIntent, events); await this.addModificationEvents(noticeOfIntent, events); await this.addMeetingEvents(noticeOfIntent, events); - await this.addStatusEvents(noticeOfIntent, events); - + if (noticeOfIntent.source === 'APPLICANT') { + await this.addStatusEvents(noticeOfIntent, events); + } if (noticeOfIntent.card) { for (const subtask of noticeOfIntent.card.subtasks) { const mappedEvent = this.mapSubtaskToEvent(subtask); @@ -251,47 +252,41 @@ export class NoticeOfIntentTimelineService { noticeOfIntent: NoticeOfIntent, events: TimelineEvent[], ) { - if (noticeOfIntent.source === 'APPLICANT') { - const statusHistory = - await this.noticeOfIntentSubmissionStatusService.getCurrentStatusesByFileNumber( - noticeOfIntent.fileNumber, - ); - - const statusesToInclude = statusHistory.filter( - (status) => - NOI_SUBMISSION_STATUS.ALC_DECISION !== status.statusType.code, + const statusHistory = + await this.noticeOfIntentSubmissionStatusService.getCurrentStatusesByFileNumber( + noticeOfIntent.fileNumber, ); - for (const status of statusesToInclude) { - if (status.effectiveDate) { - let htmlText = `${status.statusType.label}`; + const statusesToInclude = statusHistory.filter( + (status) => NOI_SUBMISSION_STATUS.ALC_DECISION !== status.statusType.code, + ); - if (status.statusType.code === NOI_SUBMISSION_STATUS.IN_PROGRESS) { - htmlText = 'Created - In Progress'; - } + for (const status of statusesToInclude) { + if (status.effectiveDate) { + let htmlText = `${status.statusType.label}`; - if ( - status.statusType.code === - NOI_SUBMISSION_STATUS.SUBMITTED_TO_ALC_INCOMPLETE - ) { - htmlText = - 'Acknowledged Incomplete - Submitted to ALC - Incomplete'; - } + if (status.statusType.code === NOI_SUBMISSION_STATUS.IN_PROGRESS) { + htmlText = 'Created - In Progress'; + } - if ( - status.statusType.code === NOI_SUBMISSION_STATUS.RECEIVED_BY_ALC - ) { - htmlText = 'Received All Items - Received by ALC'; - } + if ( + status.statusType.code === + NOI_SUBMISSION_STATUS.SUBMITTED_TO_ALC_INCOMPLETE + ) { + htmlText = + 'Acknowledged Incomplete - Submitted to ALC - Incomplete'; + } - events.push({ - htmlText, - startDate: - status.effectiveDate.getTime() + status.statusType.weight, - fulfilledDate: null, - isFulfilled: true, - }); + if (status.statusType.code === NOI_SUBMISSION_STATUS.RECEIVED_BY_ALC) { + htmlText = 'Received All Items - Received by ALC'; } + + events.push({ + htmlText, + startDate: status.effectiveDate.getTime() + status.statusType.weight, + fulfilledDate: null, + isFulfilled: true, + }); } } } From 10d92d93490ffa3a78084292eb83c2852b51fd28 Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Mon, 11 Sep 2023 13:47:41 -0700 Subject: [PATCH 373/954] delayed status email sending ALCD and REVA for Application and NOI (#962) delayed status email sending REVA ALCD for application and NOI enable bull mq minor fixes --- .../file-type-data-source.service.spec.ts | 1 - .../file-type-data-source.service.ts | 1 - ...cation-decision-meeting.controller.spec.ts | 68 +------ ...application-decision-meeting.controller.ts | 31 +-- ...application-decision-v2.controller.spec.ts | 95 +-------- .../application-decision-v2.controller.ts | 32 +--- ...lication-submission-status.service.spec.ts | 50 ++++- .../application-submission-status.service.ts | 26 ++- .../submission-status.entity.ts | 9 + ...e-of-intent-decision-v2.controller.spec.ts | 92 --------- ...notice-of-intent-decision-v2.controller.ts | 39 +--- .../notice-of-intent-status.entity.ts | 9 + ...f-intent-submission-status.service.spec.ts | 38 +++- ...ice-of-intent-submission-status.service.ts | 25 ++- services/apps/alcs/src/main.module.ts | 2 + .../alcs/src/providers/email/email.service.ts | 12 +- ...694195607654-email_sent_in_status_table.ts | 23 +++ ...ail_sent_in_noi_submission_status_table.ts | 25 +++ .../application-expiry.consumer.spec.ts} | 8 +- .../application-expiry.consumer.ts} | 6 +- .../status-emails.consumer.spec.ts | 180 ++++++++++++++++++ .../status-emails/status-emails.consumer.ts | 114 +++++++++++ .../status-emails.consumer.spec.ts | 134 +++++++++++++ .../status-emails.consumer.ts | 80 ++++++++ .../src/queues/scheduler/scheduler.module.ts | 16 +- .../scheduler/scheduler.service.spec.ts | 43 +++++ .../src/queues/scheduler/scheduler.service.ts | 23 +++ 27 files changed, 810 insertions(+), 372 deletions(-) create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1694195607654-email_sent_in_status_table.ts create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1694214288431-email_sent_in_noi_submission_status_table.ts rename services/apps/alcs/src/queues/scheduler/{applicationExpiry.consumer.spec.ts => application/application-expiry/application-expiry.consumer.spec.ts} (88%) rename services/apps/alcs/src/queues/scheduler/{applicationExpiry.consumer.ts => application/application-expiry/application-expiry.consumer.ts} (91%) create mode 100644 services/apps/alcs/src/queues/scheduler/application/status-emails/status-emails.consumer.spec.ts create mode 100644 services/apps/alcs/src/queues/scheduler/application/status-emails/status-emails.consumer.ts create mode 100644 services/apps/alcs/src/queues/scheduler/notice-of-intent/status-emails.consumer.spec.ts create mode 100644 services/apps/alcs/src/queues/scheduler/notice-of-intent/status-emails.consumer.ts diff --git a/alcs-frontend/src/app/services/search/file-type/file-type-data-source.service.spec.ts b/alcs-frontend/src/app/services/search/file-type/file-type-data-source.service.spec.ts index dc0a50f658..b691389f45 100644 --- a/alcs-frontend/src/app/services/search/file-type/file-type-data-source.service.spec.ts +++ b/alcs-frontend/src/app/services/search/file-type/file-type-data-source.service.spec.ts @@ -23,7 +23,6 @@ describe('FileTypeDataSourceService', () => { expect(service.data.length).toBe(1); const node: TreeNode = service.data[0]; - console.log(service.dataChange.getValue()); expect(node.item.label).toEqual('Non-Application'); }); diff --git a/alcs-frontend/src/app/services/search/file-type/file-type-data-source.service.ts b/alcs-frontend/src/app/services/search/file-type/file-type-data-source.service.ts index 3b84bbe2be..9332020e4f 100644 --- a/alcs-frontend/src/app/services/search/file-type/file-type-data-source.service.ts +++ b/alcs-frontend/src/app/services/search/file-type/file-type-data-source.service.ts @@ -93,7 +93,6 @@ export class FileTypeDataSourceService { // Filter the tree const filter = (array: TreeNode[], text: string) => { const getChildren = (result: any, object: any) => { - console.log(text, object.item.label, object.item.label.toLowerCase().includes(text.toLowerCase())); if (object.item.label.toLowerCase().includes(text.toLowerCase())) { result.push(object); return result; diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v1/application-decision-meeting/application-decision-meeting.controller.spec.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v1/application-decision-meeting/application-decision-meeting.controller.spec.ts index 3f02420d41..6706ecfb85 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v1/application-decision-meeting/application-decision-meeting.controller.spec.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v1/application-decision-meeting/application-decision-meeting.controller.spec.ts @@ -11,6 +11,7 @@ import { import { mockKeyCloakProviders } from '../../../../../test/mocks/mockTypes'; import { ApplicationDecisionProfile } from '../../../../common/automapper/application-decision-v1.automapper.profile'; import { UserProfile } from '../../../../common/automapper/user.automapper.profile'; +import { EmailService } from '../../../../providers/email/email.service'; import { ApplicationService } from '../../../application/application.service'; import { Board } from '../../../board/board.entity'; import { ApplicationReconsiderationService } from '../../application-reconsideration/application-reconsideration.service'; @@ -20,13 +21,6 @@ import { CreateApplicationDecisionMeetingDto, } from './application-decision-meeting.dto'; import { ApplicationDecisionMeetingService } from './application-decision-meeting.service'; -import { EmailService } from '../../../../providers/email/email.service'; -import { ApplicationDecisionMeeting } from './application-decision-meeting.entity'; -import { ApplicationSubmission } from '../../../../portal/application-submission/application-submission.entity'; -import { ApplicationOwner } from '../../../../portal/application-submission/application-owner/application-owner.entity'; -import { LocalGovernment } from '../../../local-government/local-government.entity'; -import { generateREVAHtml } from '../../../../../../../templates/emails/under-review-by-alc.template'; -import { SUBMISSION_STATUS } from '../../../application/application-submission-status/submission-status.dto'; describe('ApplicationDecisionMeetingController', () => { let controller: ApplicationDecisionMeetingController; @@ -135,66 +129,6 @@ describe('ApplicationDecisionMeetingController', () => { }); }); - it('should send status email for first review discussion', async () => { - const primaryContactOwnerUuid = 'fake-owner'; - const localGovernmentUuid = 'local-government'; - - const mockGovernment = new LocalGovernment({ uuid: localGovernmentUuid }); - const mockOwner = new ApplicationOwner({ uuid: primaryContactOwnerUuid }); - const mockSubmission = new ApplicationSubmission({ - owners: [mockOwner], - primaryContactOwnerUuid, - localGovernmentUuid, - }); - - mockApplicationService.getOrFail.mockResolvedValue(mockApplication); - mockMeetingService.getByAppFileNumber.mockResolvedValue([ - new ApplicationDecisionMeeting(), - ]); - mockEmailService.getApplicationEmailData.mockResolvedValue({ - applicationSubmission: mockSubmission, - primaryContact: mockOwner, - submissionGovernment: mockGovernment, - }); - mockEmailService.sendApplicationStatusEmail.mockResolvedValue(); - - const meetingToUpdate = { - date: new Date(2022, 2, 2, 2, 2, 2, 2).valueOf(), - applicationFileNumber: mockApplication.fileNumber, - } as CreateApplicationDecisionMeetingDto; - - await controller.create(meetingToUpdate); - - expect(mockEmailService.sendApplicationStatusEmail).toBeCalledTimes(1); - expect(mockEmailService.sendApplicationStatusEmail).toBeCalledWith({ - generateStatusHtml: generateREVAHtml, - status: SUBMISSION_STATUS.IN_REVIEW_BY_ALC, - applicationSubmission: mockSubmission, - government: mockGovernment, - parentType: 'application', - primaryContact: mockOwner, - ccGovernment: true, - }); - }); - - it('should not send status email for additional review discussions', async () => { - mockApplicationService.getOrFail.mockResolvedValue(mockApplication); - mockMeetingService.getByAppFileNumber.mockResolvedValue([ - new ApplicationDecisionMeeting(), - new ApplicationDecisionMeeting(), - ]); - mockEmailService.sendApplicationStatusEmail.mockResolvedValue(); - - const meetingToUpdate = { - date: new Date(2022, 2, 2, 2, 2, 2, 2).valueOf(), - applicationFileNumber: mockApplication.fileNumber, - } as CreateApplicationDecisionMeetingDto; - - await controller.create(meetingToUpdate); - - expect(mockEmailService.sendApplicationStatusEmail).toBeCalledTimes(0); - }); - it('should update meeting', async () => { const meetingToUpdate = { uuid: mockMeeting.uuid, diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v1/application-decision-meeting/application-decision-meeting.controller.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v1/application-decision-meeting/application-decision-meeting.controller.ts index 9cebc2dfe6..c2c46359d1 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v1/application-decision-meeting/application-decision-meeting.controller.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v1/application-decision-meeting/application-decision-meeting.controller.ts @@ -13,12 +13,13 @@ import { import { ApiOAuth2 } from '@nestjs/swagger'; import * as config from 'config'; import { Any } from 'typeorm'; -import { ApplicationService } from '../../../application/application.service'; import { ANY_AUTH_ROLE } from '../../../../common/authorization/roles'; import { RolesGuard } from '../../../../common/authorization/roles-guard.service'; import { UserRoles } from '../../../../common/authorization/roles.decorator'; import { UserDto } from '../../../../user/user.dto'; import { User } from '../../../../user/user.entity'; +import { formatIncomingDate } from '../../../../utils/incoming-date.formatter'; +import { ApplicationService } from '../../../application/application.service'; import { ApplicationReconsiderationService } from '../../application-reconsideration/application-reconsideration.service'; import { ApplicationDecisionMeetingDto, @@ -28,12 +29,8 @@ import { } from './application-decision-meeting.dto'; import { ApplicationDecisionMeeting } from './application-decision-meeting.entity'; import { ApplicationDecisionMeetingService } from './application-decision-meeting.service'; -import { formatIncomingDate } from '../../../../utils/incoming-date.formatter'; import { EmailService } from '../../../../providers/email/email.service'; -import { generateREVAHtml } from '../../../../../../../templates/emails/under-review-by-alc.template'; -import { SUBMISSION_STATUS } from '../../../application/application-submission-status/submission-status.dto'; -import { PARENT_TYPE } from '../../../card/card-subtask/card-subtask.dto'; @ApiOAuth2(config.get('KEYCLOAK.SCOPES')) @Controller('application-decision-meeting') @@ -111,30 +108,6 @@ export class ApplicationDecisionMeetingController { applicationUuid: application.uuid, }); - const meetings = await this.appDecisionMeetingService.getByAppFileNumber( - meeting.applicationFileNumber, - ); - - // Send status email for first review discussion - if (meetings.length === 1) { - const { applicationSubmission, primaryContact, submissionGovernment } = - await this.emailService.getApplicationEmailData( - meeting.applicationFileNumber, - ); - - if (primaryContact) { - await this.emailService.sendApplicationStatusEmail({ - generateStatusHtml: generateREVAHtml, - status: SUBMISSION_STATUS.IN_REVIEW_BY_ALC, - applicationSubmission, - government: submissionGovernment, - parentType: PARENT_TYPE.APPLICATION, - primaryContact, - ccGovernment: true, - }); - } - } - return this.mapper.map( newMeeting, ApplicationDecisionMeeting, diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.controller.spec.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.controller.spec.ts index 7b7562c988..174ebb5664 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.controller.spec.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.controller.spec.ts @@ -11,9 +11,11 @@ import { mockKeyCloakProviders } from '../../../../../test/mocks/mockTypes'; import { ApplicationDecisionProfile } from '../../../../common/automapper/application-decision-v2.automapper.profile'; import { ApplicationProfile } from '../../../../common/automapper/application.automapper.profile'; import { UserProfile } from '../../../../common/automapper/user.automapper.profile'; +import { EmailService } from '../../../../providers/email/email.service'; import { ApplicationService } from '../../../application/application.service'; import { CodeService } from '../../../code/code.service'; import { ApplicationDecisionOutcomeCode } from '../../application-decision-outcome.entity'; +import { ApplicationDecision } from '../../application-decision.entity'; import { ApplicationModificationService } from '../../application-modification/application-modification.service'; import { ApplicationReconsiderationService } from '../../application-reconsideration/application-reconsideration.service'; import { ApplicationDecisionV2Controller } from './application-decision-v2.controller'; @@ -22,13 +24,6 @@ import { CreateApplicationDecisionDto, UpdateApplicationDecisionDto, } from './application-decision.dto'; -import { EmailService } from '../../../../providers/email/email.service'; -import { ApplicationSubmission } from '../../../../portal/application-submission/application-submission.entity'; -import { LocalGovernment } from '../../../local-government/local-government.entity'; -import { ApplicationOwner } from '../../../../portal/application-submission/application-owner/application-owner.entity'; -import { generateALCDApplicationHtml } from '../../../../../../../templates/emails/decision-released'; -import { SUBMISSION_STATUS } from '../../../application/application-submission-status/submission-status.dto'; -import { ApplicationDecision } from '../../application-decision.entity'; describe('ApplicationDecisionV2Controller', () => { let controller: ApplicationDecisionV2Controller; @@ -273,90 +268,4 @@ describe('ApplicationDecisionV2Controller', () => { expect(mockDecisionService.generateResolutionNumber).toBeCalledTimes(1); expect(mockDecisionService.generateResolutionNumber).toBeCalledWith(2023); }); - - it('should send status email after the first release of any decisions', async () => { - const fileNumber = 'fake-file-number'; - const primaryContactOwnerUuid = 'primary-contact'; - const mockOwner = new ApplicationOwner({ uuid: primaryContactOwnerUuid }); - const localGovernmentUuid = 'fake-government'; - const mockGovernment = new LocalGovernment({ uuid: localGovernmentUuid }); - const mockApplicationSubmission = new ApplicationSubmission({ - fileNumber, - primaryContactOwnerUuid, - owners: [mockOwner], - localGovernmentUuid, - }); - - mockApplicationService.getFileNumber.mockResolvedValue(fileNumber); - mockDecisionService.get.mockResolvedValue( - new ApplicationDecision({ wasReleased: false }), - ); - mockDecisionService.update.mockResolvedValue(mockDecision); - mockEmailService.getApplicationEmailData.mockResolvedValue({ - applicationSubmission: mockApplicationSubmission, - primaryContact: mockOwner, - submissionGovernment: mockGovernment, - }); - mockEmailService.sendApplicationStatusEmail.mockResolvedValue(); - - const updates = { - outcome: 'New Outcome', - date: new Date(2022, 2, 2, 2, 2, 2, 2).valueOf(), - isDraft: false, - } as UpdateApplicationDecisionDto; - - await controller.update('fake-uuid', updates); - - expect(mockDecisionService.update).toBeCalledTimes(1); - expect(mockDecisionService.update).toBeCalledWith( - 'fake-uuid', - { - outcome: 'New Outcome', - date: updates.date, - isDraft: false, - }, - undefined, - undefined, - ); - - expect(mockEmailService.sendApplicationStatusEmail).toBeCalledTimes(1); - expect(mockEmailService.sendApplicationStatusEmail).toBeCalledWith({ - generateStatusHtml: generateALCDApplicationHtml, - status: SUBMISSION_STATUS.ALC_DECISION, - applicationSubmission: mockApplicationSubmission, - government: mockGovernment, - parentType: 'application', - primaryContact: mockOwner, - ccGovernment: true, - }); - }); - - it('should not send status email on subsequent decision releases', async () => { - mockDecisionService.get.mockResolvedValue( - new ApplicationDecision({ wasReleased: true }), - ); - mockDecisionService.update.mockResolvedValue(mockDecision); - mockEmailService.sendApplicationStatusEmail.mockResolvedValue(); - - const updates = { - outcome: 'New Outcome', - date: new Date(2022, 2, 2, 2, 2, 2, 2).valueOf(), - isDraft: false, - } as UpdateApplicationDecisionDto; - - await controller.update('fake-uuid', updates); - - expect(mockDecisionService.update).toBeCalledTimes(1); - expect(mockDecisionService.update).toBeCalledWith( - 'fake-uuid', - { - outcome: 'New Outcome', - date: updates.date, - isDraft: false, - }, - undefined, - undefined, - ); - expect(mockEmailService.sendApplicationStatusEmail).toBeCalledTimes(0); - }); }); diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.controller.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.controller.ts index ea26ae4f99..f8163272e9 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.controller.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.controller.ts @@ -19,6 +19,7 @@ import { RolesGuard } from '../../../../common/authorization/roles-guard.service import { UserRoles } from '../../../../common/authorization/roles.decorator'; import { NaruSubtypeDto } from '../../../../portal/application-submission/application-submission.dto'; import { NaruSubtype } from '../../../../portal/application-submission/naru-subtype/naru-subtype.entity'; +import { EmailService } from '../../../../providers/email/email.service'; import { ApplicationService } from '../../../application/application.service'; import { ApplicationCeoCriterionCode } from '../../application-ceo-criterion/application-ceo-criterion.entity'; import { ApplicationDecisionConditionType } from '../../application-decision-condition/application-decision-condition-code.entity'; @@ -41,10 +42,6 @@ import { CeoCriterionCodeDto } from './ceo-criterion/ceo-criterion.dto'; import { ApplicationDecisionComponentType } from './component/application-decision-component-type.entity'; import { ApplicationDecisionComponentTypeDto } from './component/application-decision-component.dto'; import { LinkedResolutionOutcomeType } from './linked-resolution-outcome-type.entity'; -import { EmailService } from '../../../../providers/email/email.service'; -import { SUBMISSION_STATUS } from '../../../application/application-submission-status/submission-status.dto'; -import { generateALCDApplicationHtml } from '../../../../../../../templates/emails/decision-released'; -import { PARENT_TYPE } from '../../../card/card-subtask/card-subtask.dto'; @ApiOAuth2(config.get('KEYCLOAK.SCOPES')) @Controller('application-decision') @@ -197,8 +194,6 @@ export class ApplicationDecisionV2Controller { reconsiders = null; } - const decision = await this.appDecisionService.get(uuid); - const updatedDecision = await this.appDecisionService.update( uuid, updateDto, @@ -206,10 +201,6 @@ export class ApplicationDecisionV2Controller { reconsiders, ); - if (!decision.wasReleased && updateDto.isDraft === false) { - this.sendDecisionReleasedEmail(updatedDecision); - } - return this.mapper.mapAsync( updatedDecision, ApplicationDecision, @@ -300,25 +291,4 @@ export class ApplicationDecisionV2Controller { ) { return this.appDecisionService.generateResolutionNumber(resolutionYear); } - - private async sendDecisionReleasedEmail(decision: ApplicationDecision) { - const fileNumber = await this.applicationService.getFileNumber( - decision.applicationUuid, - ); - - const { applicationSubmission, primaryContact, submissionGovernment } = - await this.emailService.getApplicationEmailData(fileNumber); - - if (primaryContact) { - await this.emailService.sendApplicationStatusEmail({ - generateStatusHtml: generateALCDApplicationHtml, - status: SUBMISSION_STATUS.ALC_DECISION, - applicationSubmission, - government: submissionGovernment, - parentType: PARENT_TYPE.APPLICATION, - primaryContact, - ccGovernment: true, - }); - } - } } diff --git a/services/apps/alcs/src/alcs/application/application-submission-status/application-submission-status.service.spec.ts b/services/apps/alcs/src/alcs/application/application-submission-status/application-submission-status.service.spec.ts index db4f84dafe..a8239a42d3 100644 --- a/services/apps/alcs/src/alcs/application/application-submission-status/application-submission-status.service.spec.ts +++ b/services/apps/alcs/src/alcs/application/application-submission-status/application-submission-status.service.spec.ts @@ -1,11 +1,11 @@ +import { ServiceNotFoundException } from '@app/common/exceptions/base.exception'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; import * as dayjs from 'dayjs'; import * as timezone from 'dayjs/plugin/timezone'; import * as utc from 'dayjs/plugin/utc'; -import { Repository } from 'typeorm'; -import { ServiceNotFoundException } from '@app/common/exceptions/base.exception'; +import { In, IsNull, LessThanOrEqual, Repository } from 'typeorm'; import { ApplicationSubmission } from '../../../portal/application-submission/application-submission.entity'; import { ApplicationSubmissionStatusService } from './application-submission-status.service'; import { ApplicationSubmissionStatusType } from './submission-status-type.entity'; @@ -431,4 +431,50 @@ describe('ApplicationSubmissionStatusService', () => { expect(result).toMatchObject(copiedStatuses); }); + + it('should call find to retrieve ALCD and REVA statuses', async () => { + mockApplicationSubmissionToSubmissionStatusRepository.find.mockResolvedValue( + [], + ); + const date = new Date(); + + await service.getSubmissionToSubmissionStatusForSendingEmails(date); + + expect( + mockApplicationSubmissionToSubmissionStatusRepository.find, + ).toBeCalledTimes(1); + expect( + mockApplicationSubmissionToSubmissionStatusRepository.find, + ).toBeCalledWith({ + where: { + statusTypeCode: In([ + SUBMISSION_STATUS.ALC_DECISION, + SUBMISSION_STATUS.IN_REVIEW_BY_ALC, + ]), + emailSentDate: IsNull(), + effectiveDate: LessThanOrEqual(date), + }, + relations: { + submission: true, + }, + }); + }); + + it('should call save to save SubmissionToSubmissionStatus', async () => { + const mockApp = new ApplicationSubmissionToSubmissionStatus(); + + mockApplicationSubmissionToSubmissionStatusRepository.save.mockResolvedValue( + mockApp, + ); + + const result = await service.saveSubmissionToSubmissionStatus(mockApp); + + expect( + mockApplicationSubmissionToSubmissionStatusRepository.save, + ).toBeCalledTimes(1); + expect( + mockApplicationSubmissionToSubmissionStatusRepository.save, + ).toBeCalledWith(mockApp); + expect(result).toEqual(mockApp); + }); }); diff --git a/services/apps/alcs/src/alcs/application/application-submission-status/application-submission-status.service.ts b/services/apps/alcs/src/alcs/application/application-submission-status/application-submission-status.service.ts index 5e3d8ffb15..33c9f1b66e 100644 --- a/services/apps/alcs/src/alcs/application/application-submission-status/application-submission-status.service.ts +++ b/services/apps/alcs/src/alcs/application/application-submission-status/application-submission-status.service.ts @@ -1,10 +1,10 @@ +import { ServiceNotFoundException } from '@app/common/exceptions/base.exception'; import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import * as dayjs from 'dayjs'; import * as timezone from 'dayjs/plugin/timezone'; import * as utc from 'dayjs/plugin/utc'; -import { Repository } from 'typeorm'; -import { ServiceNotFoundException } from '@app/common/exceptions/base.exception'; +import { In, IsNull, LessThanOrEqual, Repository } from 'typeorm'; import { ApplicationSubmission } from '../../../portal/application-submission/application-submission.entity'; import { ApplicationSubmissionStatusType } from './submission-status-type.entity'; import { SUBMISSION_STATUS } from './submission-status.dto'; @@ -143,4 +143,26 @@ export class ApplicationSubmissionStatusService { return newStatuses; } + + async getSubmissionToSubmissionStatusForSendingEmails(date: Date) { + return await this.statusesRepository.find({ + where: { + statusTypeCode: In([ + SUBMISSION_STATUS.ALC_DECISION, + SUBMISSION_STATUS.IN_REVIEW_BY_ALC, + ]), + emailSentDate: IsNull(), + effectiveDate: LessThanOrEqual(date), // this will get only statuses <= today since the status service converts all days to .startOf('day') + }, + relations: { + submission: true, + }, + }); + } + + async saveSubmissionToSubmissionStatus( + submissionStatus: ApplicationSubmissionToSubmissionStatus, + ) { + return await this.statusesRepository.save(submissionStatus); + } } diff --git a/services/apps/alcs/src/alcs/application/application-submission-status/submission-status.entity.ts b/services/apps/alcs/src/alcs/application/application-submission-status/submission-status.entity.ts index fc61e03aa3..4af0f93fcd 100644 --- a/services/apps/alcs/src/alcs/application/application-submission-status/submission-status.entity.ts +++ b/services/apps/alcs/src/alcs/application/application-submission-status/submission-status.entity.ts @@ -23,6 +23,15 @@ export class ApplicationSubmissionToSubmissionStatus extends BaseEntity { @Column({ type: 'timestamptz', nullable: true }) effectiveDate: Date | null; + @AutoMap(() => Date) + @Column({ + nullable: true, + type: 'timestamptz', + comment: + 'Applicable only for "REVA" (Under Review by ALC) and ALCD("Decision released") statuses all others always set to null', + }) + emailSentDate?: Date | null; + @AutoMap() @PrimaryColumn({ type: 'uuid' }) submissionUuid: string; diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.controller.spec.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.controller.spec.ts index 8cbd866019..6d038e0a59 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.controller.spec.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.controller.spec.ts @@ -3,18 +3,13 @@ import { AutomapperModule } from '@automapper/nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { ClsService } from 'nestjs-cls'; -import { generateALCDNoticeOfIntentHtml } from '../../../../../../templates/emails/decision-released'; import { mockKeyCloakProviders } from '../../../../test/mocks/mockTypes'; import { NoticeOfIntentDecisionProfile } from '../../../common/automapper/notice-of-intent-decision.automapper.profile'; import { NoticeOfIntentProfile } from '../../../common/automapper/notice-of-intent.automapper.profile'; import { UserProfile } from '../../../common/automapper/user.automapper.profile'; -import { NoticeOfIntentOwner } from '../../../portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.entity'; -import { NoticeOfIntentSubmission } from '../../../portal/notice-of-intent-submission/notice-of-intent-submission.entity'; import { NoticeOfIntentSubmissionService } from '../../../portal/notice-of-intent-submission/notice-of-intent-submission.service'; import { EmailService } from '../../../providers/email/email.service'; import { CodeService } from '../../code/code.service'; -import { LocalGovernment } from '../../local-government/local-government.entity'; -import { NOI_SUBMISSION_STATUS } from '../../notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status.dto'; import { NoticeOfIntent } from '../../notice-of-intent/notice-of-intent.entity'; import { NoticeOfIntentService } from '../../notice-of-intent/notice-of-intent.service'; import { NoticeOfIntentDecisionOutcome } from '../notice-of-intent-decision-outcome.entity'; @@ -268,91 +263,4 @@ describe('NoticeOfIntentDecisionV2Controller', () => { expect(mockDecisionService.generateResolutionNumber).toBeCalledTimes(1); expect(mockDecisionService.generateResolutionNumber).toBeCalledWith(2023); }); - - it('should send status email after the first release of any decisions', async () => { - const fileNumber = 'fake-file-number'; - const primaryContactOwnerUuid = 'primary-contact'; - const mockOwner = new NoticeOfIntentOwner({ - uuid: primaryContactOwnerUuid, - }); - const localGovernmentUuid = 'fake-government'; - const mockGovernment = new LocalGovernment({ uuid: localGovernmentUuid }); - const mockNoticeOfIntentSubmission = new NoticeOfIntentSubmission({ - fileNumber, - primaryContactOwnerUuid, - owners: [mockOwner], - localGovernmentUuid, - }); - - mockNoticeOfIntentService.getFileNumber.mockResolvedValue(fileNumber); - mockDecisionService.get.mockResolvedValue( - new NoticeOfIntentDecision({ wasReleased: false }), - ); - mockDecisionService.update.mockResolvedValue(mockDecision); - mockNoticeOfIntentSubmissionService.getOrFailByFileNumber.mockResolvedValue( - mockNoticeOfIntentSubmission, - ); - mockEmailService.getNoticeOfIntentEmailData.mockResolvedValue({ - primaryContact: mockOwner, - submissionGovernment: mockGovernment, - }); - mockEmailService.sendNoticeOfIntentStatusEmail.mockResolvedValue(); - - const updates = { - outcome: 'New Outcome', - date: new Date(2023, 3, 3, 3, 3, 3, 3).valueOf(), - isDraft: false, - } as UpdateNoticeOfIntentDecisionDto; - - await controller.update('fake-uuid', updates); - - expect(mockDecisionService.update).toBeCalledTimes(1); - expect(mockDecisionService.update).toBeCalledWith( - 'fake-uuid', - { - outcome: 'New Outcome', - date: updates.date, - isDraft: false, - }, - undefined, - ); - expect(mockEmailService.sendNoticeOfIntentStatusEmail).toBeCalledTimes(1); - expect(mockEmailService.sendNoticeOfIntentStatusEmail).toBeCalledWith({ - generateStatusHtml: generateALCDNoticeOfIntentHtml, - status: NOI_SUBMISSION_STATUS.ALC_DECISION, - noticeOfIntentSubmission: mockNoticeOfIntentSubmission, - government: mockGovernment, - parentType: 'notice-of-intent', - primaryContact: mockOwner, - ccGovernment: true, - }); - }); - - it('should not send status email on subsequent decision releases', async () => { - mockDecisionService.get.mockResolvedValue( - new NoticeOfIntentDecision({ wasReleased: true }), - ); - mockDecisionService.update.mockResolvedValue(mockDecision); - mockEmailService.sendNoticeOfIntentStatusEmail.mockResolvedValue(); - - const updates = { - outcome: 'New Outcome', - date: new Date(2023, 3, 3, 3, 3, 3, 3).valueOf(), - isDraft: false, - } as UpdateNoticeOfIntentDecisionDto; - - await controller.update('fake-uuid', updates); - - expect(mockDecisionService.update).toBeCalledTimes(1); - expect(mockDecisionService.update).toBeCalledWith( - 'fake-uuid', - { - outcome: 'New Outcome', - date: updates.date, - isDraft: false, - }, - undefined, - ); - expect(mockEmailService.sendNoticeOfIntentStatusEmail).toBeCalledTimes(0); - }); }); diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.controller.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.controller.ts index 5171a62292..2a2011266a 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.controller.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.controller.ts @@ -17,6 +17,7 @@ import * as config from 'config'; import { ANY_AUTH_ROLE } from '../../../common/authorization/roles'; import { RolesGuard } from '../../../common/authorization/roles-guard.service'; import { UserRoles } from '../../../common/authorization/roles.decorator'; +import { NoticeOfIntentSubmissionService } from '../../../portal/notice-of-intent-submission/notice-of-intent-submission.service'; import { EmailService } from '../../../providers/email/email.service'; import { NoticeOfIntentService } from '../../notice-of-intent/notice-of-intent.service'; import { NoticeOfIntentDecisionComponentType } from '../notice-of-intent-decision-component/notice-of-intent-decision-component-type.entity'; @@ -33,10 +34,6 @@ import { import { NoticeOfIntentDecision } from '../notice-of-intent-decision.entity'; import { NoticeOfIntentModificationService } from '../notice-of-intent-modification/notice-of-intent-modification.service'; import { NoticeOfIntentDecisionV2Service } from './notice-of-intent-decision-v2.service'; -import { generateALCDNoticeOfIntentHtml } from '../../../../../../templates/emails/decision-released'; -import { NOI_SUBMISSION_STATUS } from '../../notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status.dto'; -import { PARENT_TYPE } from '../../card/card-subtask/card-subtask.dto'; -import { NoticeOfIntentSubmissionService } from '../../../portal/notice-of-intent-submission/notice-of-intent-submission.service'; @ApiOAuth2(config.get('KEYCLOAK.SCOPES')) @Controller('notice-of-intent-decision/v2') @@ -142,18 +139,12 @@ export class NoticeOfIntentDecisionV2Controller { modifies = null; } - const decision = await this.noticeOfIntentDecisionV2Service.get(uuid); - const updatedDecision = await this.noticeOfIntentDecisionV2Service.update( uuid, updateDto, modifies, ); - if (!decision.wasReleased && updateDto.isDraft === false) { - this.sendDecisionReleasedEmail(updatedDecision); - } - return this.mapper.mapAsync( updatedDecision, NoticeOfIntentDecision, @@ -249,32 +240,4 @@ export class NoticeOfIntentDecisionV2Controller { resolutionYear, ); } - - private async sendDecisionReleasedEmail(decision: NoticeOfIntentDecision) { - const fileNumber = await this.noticeOfIntentService.getFileNumber( - decision.noticeOfIntentUuid, - ); - - const noticeOfIntentSubmission = - await this.noticeOfIntentSubmissionService.getOrFailByFileNumber( - fileNumber, - ); - - const { primaryContact, submissionGovernment } = - await this.emailService.getNoticeOfIntentEmailData( - noticeOfIntentSubmission, - ); - - if (primaryContact) { - await this.emailService.sendNoticeOfIntentStatusEmail({ - generateStatusHtml: generateALCDNoticeOfIntentHtml, - status: NOI_SUBMISSION_STATUS.ALC_DECISION, - noticeOfIntentSubmission, - government: submissionGovernment, - parentType: PARENT_TYPE.NOTICE_OF_INTENT, - primaryContact, - ccGovernment: true, - }); - } - } } diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status.entity.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status.entity.ts index 744fbf4e72..eb9c822590 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status.entity.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status.entity.ts @@ -23,6 +23,15 @@ export class NoticeOfIntentSubmissionToSubmissionStatus extends BaseEntity { @Column({ type: 'timestamptz', nullable: true }) effectiveDate: Date | null; + @AutoMap(() => Date) + @Column({ + nullable: true, + type: 'timestamptz', + comment: + 'Applicable only for ALCD("Decision released") status all others always set to null', + }) + emailSentDate?: Date | null; + @AutoMap() @PrimaryColumn({ type: 'uuid' }) submissionUuid: string; diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service.spec.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service.spec.ts index 9675ce8e62..76f066f522 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service.spec.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service.spec.ts @@ -5,7 +5,7 @@ import { getRepositoryToken } from '@nestjs/typeorm'; import * as dayjs from 'dayjs'; import * as timezone from 'dayjs/plugin/timezone'; import * as utc from 'dayjs/plugin/utc'; -import { Repository } from 'typeorm'; +import { In, IsNull, LessThanOrEqual, Repository } from 'typeorm'; import { NoticeOfIntentSubmission } from '../../../portal/notice-of-intent-submission/notice-of-intent-submission.entity'; import { NoticeOfIntentSubmissionStatusType } from './notice-of-intent-status-type.entity'; import { NOI_SUBMISSION_STATUS } from './notice-of-intent-status.dto'; @@ -421,4 +421,40 @@ describe('NoticeOfIntentSubmissionStatusService', () => { expect(result).toMatchObject(copiedStatuses); }); + + it('should call find to retrieve ALCD statuses', async () => { + mockSubmissionToSubmissionStatusRepository.find.mockResolvedValue([]); + const date = new Date(); + + await service.getSubmissionToSubmissionStatusForSendingEmails(date); + + expect(mockSubmissionToSubmissionStatusRepository.find).toBeCalledTimes(1); + expect(mockSubmissionToSubmissionStatusRepository.find).toBeCalledWith({ + where: { + statusTypeCode: In([NOI_SUBMISSION_STATUS.ALC_DECISION]), + emailSentDate: IsNull(), + effectiveDate: LessThanOrEqual(date), + }, + relations: { + submission: { + owners: true, + submissionStatuses: true, + }, + }, + }); + }); + + it('should call save to save SubmissionToSubmissionStatus', async () => { + const mockNoi = new NoticeOfIntentSubmissionToSubmissionStatus(); + + mockSubmissionToSubmissionStatusRepository.save.mockResolvedValue(mockNoi); + + const result = await service.saveSubmissionToSubmissionStatus(mockNoi); + + expect(mockSubmissionToSubmissionStatusRepository.save).toBeCalledTimes(1); + expect(mockSubmissionToSubmissionStatusRepository.save).toBeCalledWith( + mockNoi, + ); + expect(result).toEqual(mockNoi); + }); }); diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service.ts index 431437b760..1259bb3ee3 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service.ts @@ -4,7 +4,7 @@ import { InjectRepository } from '@nestjs/typeorm'; import * as dayjs from 'dayjs'; import * as timezone from 'dayjs/plugin/timezone'; import * as utc from 'dayjs/plugin/utc'; -import { Repository } from 'typeorm'; +import { In, IsNull, LessThanOrEqual, Repository } from 'typeorm'; import { NoticeOfIntentSubmission } from '../../../portal/notice-of-intent-submission/notice-of-intent-submission.entity'; import { NoticeOfIntentSubmissionStatusType } from './notice-of-intent-status-type.entity'; import { NOI_SUBMISSION_STATUS } from './notice-of-intent-status.dto'; @@ -141,4 +141,27 @@ export class NoticeOfIntentSubmissionStatusService { return newStatuses; } + + async getSubmissionToSubmissionStatusForSendingEmails(date: Date) { + return await this.statusesRepository.find({ + where: { + statusTypeCode: In([NOI_SUBMISSION_STATUS.ALC_DECISION]), + emailSentDate: IsNull(), + effectiveDate: LessThanOrEqual(date), // this will get only statuses <= today since the status service converts all days to .startOf('day'). + }, + relations: { + submission: { + owners: true, + submissionStatuses: true, + }, + }, + }); + } + + async saveSubmissionToSubmissionStatus( + submissionStatus: NoticeOfIntentSubmissionToSubmissionStatus, + ) { + console.log('save', submissionStatus); + return await this.statusesRepository.save(submissionStatus); + } } diff --git a/services/apps/alcs/src/main.module.ts b/services/apps/alcs/src/main.module.ts index 552a4ed0b2..44c4bd769d 100644 --- a/services/apps/alcs/src/main.module.ts +++ b/services/apps/alcs/src/main.module.ts @@ -23,6 +23,7 @@ import { MainService } from './main.service'; import { NoticeOfIntentSubmissionModule } from './portal/notice-of-intent-submission/notice-of-intent-submission.module'; import { PortalModule } from './portal/portal.module'; import { TypeormConfigService } from './providers/typeorm/typeorm.service'; +import { SchedulerModule } from './queues/scheduler/scheduler.module'; import { UserModule } from './user/user.module'; @Module({ @@ -64,6 +65,7 @@ import { UserModule } from './user/user.module'; UserModule, FileNumberModule, NoticeOfIntentSubmissionModule, + SchedulerModule, // this will init BullMQ ], controllers: [MainController, LogoutController], providers: [ diff --git a/services/apps/alcs/src/providers/email/email.service.ts b/services/apps/alcs/src/providers/email/email.service.ts index 0afc39f5b6..2f29c93c04 100644 --- a/services/apps/alcs/src/providers/email/email.service.ts +++ b/services/apps/alcs/src/providers/email/email.service.ts @@ -84,7 +84,7 @@ export class EmailService { private applicationSubmissionService: ApplicationSubmissionService, private applicationService: ApplicationService, private noticeOfIntentService: NoticeOfIntentService, - private noticeOfInterntSubmissionService: NoticeOfIntentSubmissionService, + private noticeOfIntentSubmissionService: NoticeOfIntentSubmissionService, ) {} private token = ''; @@ -309,7 +309,7 @@ export class EmailService { } private async setNoticeOfIntentEmailTemplate(data: NoticeOfIntentEmailData) { - const status = await this.noticeOfInterntSubmissionService.getStatus( + const status = await this.noticeOfIntentSubmissionService.getStatus( data.status, ); @@ -356,21 +356,21 @@ export class EmailService { async sendNoticeOfIntentStatusEmail(data: NoticeOfIntentEmailData) { const email = await this.setNoticeOfIntentEmailTemplate(data); - this.sendStatusEmail(data, email); + await this.sendStatusEmail(data, email); } - private sendStatusEmail( + private async sendStatusEmail( data: ApplicationEmailData | NoticeOfIntentEmailData, email, ) { if (data.primaryContact && data.primaryContact.email) { - this.sendEmail({ + await this.sendEmail({ ...email, to: [data.primaryContact.email], cc: data.ccGovernment ? data.government?.emails : [], }); } else if (data.government && data.government.emails.length > 0) { - this.sendEmail({ + await this.sendEmail({ ...email, to: data.government.emails, }); diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1694195607654-email_sent_in_status_table.ts b/services/apps/alcs/src/providers/typeorm/migrations/1694195607654-email_sent_in_status_table.ts new file mode 100644 index 0000000000..e63f5ea4c1 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1694195607654-email_sent_in_status_table.ts @@ -0,0 +1,23 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class emailSentInStatusTable1694195607654 implements MigrationInterface { + name = 'emailSentInStatusTable1694195607654'; + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission_to_submission_status" ADD "email_sent_date" TIMESTAMP WITH TIME ZONE`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."application_submission_to_submission_status"."email_sent_date" IS 'Applicable only for "REVA" (Under Review by ALC) and ALCD("Decision released") statuses all others always set to null'`, + ); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."application_submission_to_submission_status"."email_sent_date" IS 'Applicable only for "REVA" (Under Review by ALC) and ALCD("Decision released") statuses all others always set to null'`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission_to_submission_status" DROP COLUMN "email_sent_date"`, + ); + } +} diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1694214288431-email_sent_in_noi_submission_status_table.ts b/services/apps/alcs/src/providers/typeorm/migrations/1694214288431-email_sent_in_noi_submission_status_table.ts new file mode 100644 index 0000000000..23d04b3468 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1694214288431-email_sent_in_noi_submission_status_table.ts @@ -0,0 +1,25 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class emailSentInNoiSubmissionStatusTable1694214288431 + implements MigrationInterface +{ + name = 'emailSentInNoiSubmissionStatusTable1694214288431'; + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission_to_submission_status" ADD "email_sent_date" TIMESTAMP WITH TIME ZONE`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."notice_of_intent_submission_to_submission_status"."email_sent_date" IS 'Applicable only for ALCD("Decision released") status all others always set to null'`, + ); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."notice_of_intent_submission_to_submission_status"."email_sent_date" IS 'Applicable only for ALCD("Decision released") status all others always set to null'`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission_to_submission_status" DROP COLUMN "email_sent_date"`, + ); + } +} diff --git a/services/apps/alcs/src/queues/scheduler/applicationExpiry.consumer.spec.ts b/services/apps/alcs/src/queues/scheduler/application/application-expiry/application-expiry.consumer.spec.ts similarity index 88% rename from services/apps/alcs/src/queues/scheduler/applicationExpiry.consumer.spec.ts rename to services/apps/alcs/src/queues/scheduler/application/application-expiry/application-expiry.consumer.spec.ts index c7c8d47637..5c91339a98 100644 --- a/services/apps/alcs/src/queues/scheduler/applicationExpiry.consumer.spec.ts +++ b/services/apps/alcs/src/queues/scheduler/application/application-expiry/application-expiry.consumer.spec.ts @@ -2,10 +2,10 @@ import { ConfigModule } from '@app/common/config/config.module'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import * as config from 'config'; -import { ApplicationService } from '../../alcs/application/application.service'; -import { initApplicationMockEntity } from '../../../test/mocks/mockEntities'; -import { EmailService } from '../../providers/email/email.service'; -import { ApplicationExpiryConsumer } from './applicationExpiry.consumer'; +import { initApplicationMockEntity } from '../../../../../test/mocks/mockEntities'; +import { ApplicationService } from '../../../../alcs/application/application.service'; +import { EmailService } from '../../../../providers/email/email.service'; +import { ApplicationExpiryConsumer } from './application-expiry.consumer'; describe('SchedulerConsumerService', () => { let applicationExpiryConsumer: ApplicationExpiryConsumer; diff --git a/services/apps/alcs/src/queues/scheduler/applicationExpiry.consumer.ts b/services/apps/alcs/src/queues/scheduler/application/application-expiry/application-expiry.consumer.ts similarity index 91% rename from services/apps/alcs/src/queues/scheduler/applicationExpiry.consumer.ts rename to services/apps/alcs/src/queues/scheduler/application/application-expiry/application-expiry.consumer.ts index 0ef1fe09d9..9e90de5bb5 100644 --- a/services/apps/alcs/src/queues/scheduler/applicationExpiry.consumer.ts +++ b/services/apps/alcs/src/queues/scheduler/application/application-expiry/application-expiry.consumer.ts @@ -5,9 +5,9 @@ import * as dayjs from 'dayjs'; import { ApplicationService, APPLICATION_EXPIRATION_DAY_RANGES, -} from '../../alcs/application/application.service'; -import { EmailService } from '../../providers/email/email.service'; -import { QUEUES } from './scheduler.service'; +} from '../../../../alcs/application/application.service'; +import { EmailService } from '../../../../providers/email/email.service'; +import { QUEUES } from '../../scheduler.service'; @Processor(QUEUES.APP_EXPIRY) export class ApplicationExpiryConsumer { diff --git a/services/apps/alcs/src/queues/scheduler/application/status-emails/status-emails.consumer.spec.ts b/services/apps/alcs/src/queues/scheduler/application/status-emails/status-emails.consumer.spec.ts new file mode 100644 index 0000000000..4b8a7e27bb --- /dev/null +++ b/services/apps/alcs/src/queues/scheduler/application/status-emails/status-emails.consumer.spec.ts @@ -0,0 +1,180 @@ +import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; +import { Test, TestingModule } from '@nestjs/testing'; +import { generateALCDApplicationHtml } from '../../../../../../../templates/emails/decision-released'; +import { generateREVAHtml } from '../../../../../../../templates/emails/under-review-by-alc.template'; +import { ApplicationSubmissionStatusService } from '../../../../alcs/application/application-submission-status/application-submission-status.service'; +import { SUBMISSION_STATUS } from '../../../../alcs/application/application-submission-status/submission-status.dto'; +import { ApplicationSubmissionToSubmissionStatus } from '../../../../alcs/application/application-submission-status/submission-status.entity'; +import { PARENT_TYPE } from '../../../../alcs/card/card-subtask/card-subtask.dto'; +import { LocalGovernment } from '../../../../alcs/local-government/local-government.entity'; +import { ApplicationOwner } from '../../../../portal/application-submission/application-owner/application-owner.entity'; +import { ApplicationSubmission } from '../../../../portal/application-submission/application-submission.entity'; +import { EmailService } from '../../../../providers/email/email.service'; +import { ApplicationSubmissionStatusEmailConsumer } from './status-emails.consumer'; + +describe('ApplicationSubmissionStatusEmailConsumer', () => { + let consumer: ApplicationSubmissionStatusEmailConsumer; + let mockEmailService: DeepMocked; + let mockApplicationSubmissionStatusService: DeepMocked; + + beforeEach(async () => { + mockEmailService = createMock(); + mockApplicationSubmissionStatusService = + createMock(); + + const module: TestingModule = await Test.createTestingModule({ + providers: [ + ApplicationSubmissionStatusEmailConsumer, + { + provide: EmailService, + useValue: mockEmailService, + }, + { + provide: ApplicationSubmissionStatusService, + useValue: mockApplicationSubmissionStatusService, + }, + ], + }).compile(); + + consumer = module.get( + ApplicationSubmissionStatusEmailConsumer, + ); + + mockEmailService.sendEmail.mockResolvedValue(); + }); + + it('should be defined', () => { + expect(consumer).toBeDefined(); + }); + + it('should send email and update submissionToStatus entry of IN_REVIEW_BY_ALC status', async () => { + const mockSubmission = new ApplicationSubmission({ fileNumber: 'fake' }); + const mockPrimaryContact = new ApplicationOwner(); + const mockLocalGovernment = new LocalGovernment(); + + mockApplicationSubmissionStatusService.getSubmissionToSubmissionStatusForSendingEmails.mockResolvedValue( + [ + new ApplicationSubmissionToSubmissionStatus({ + submission: mockSubmission, + statusTypeCode: SUBMISSION_STATUS.IN_REVIEW_BY_ALC, + }), + ], + ); + mockApplicationSubmissionStatusService.saveSubmissionToSubmissionStatus.mockResolvedValue( + new ApplicationSubmissionToSubmissionStatus(), + ); + + mockEmailService.getApplicationEmailData.mockResolvedValue({ + applicationSubmission: mockSubmission, + primaryContact: mockPrimaryContact, + submissionGovernment: mockLocalGovernment, + }); + mockEmailService.sendApplicationStatusEmail.mockResolvedValue(); + + await consumer.processSubmissionStatusesAndSendEmails(); + + expect( + mockApplicationSubmissionStatusService.getSubmissionToSubmissionStatusForSendingEmails, + ).toBeCalledTimes(1); + expect( + mockApplicationSubmissionStatusService.saveSubmissionToSubmissionStatus, + ).toBeCalledTimes(1); + + expect(mockEmailService.getApplicationEmailData).toBeCalledWith('fake'); + expect(mockEmailService.getApplicationEmailData).toBeCalledTimes(1); + expect(mockEmailService.sendApplicationStatusEmail).toBeCalledTimes(1); + expect(mockEmailService.sendApplicationStatusEmail).toBeCalledWith({ + applicationSubmission: mockSubmission, + government: mockLocalGovernment, + parentType: PARENT_TYPE.APPLICATION, + primaryContact: mockPrimaryContact, + ccGovernment: true, + generateStatusHtml: generateREVAHtml, + status: SUBMISSION_STATUS.IN_REVIEW_BY_ALC, + }); + }); + + it('should send email and update submissionToStatus entry of ALC_DECISION status', async () => { + const mockSubmission = new ApplicationSubmission({ fileNumber: 'fake' }); + const mockPrimaryContact = new ApplicationOwner(); + const mockLocalGovernment = new LocalGovernment(); + + mockApplicationSubmissionStatusService.getSubmissionToSubmissionStatusForSendingEmails.mockResolvedValue( + [ + new ApplicationSubmissionToSubmissionStatus({ + submission: mockSubmission, + statusTypeCode: SUBMISSION_STATUS.ALC_DECISION, + }), + ], + ); + mockApplicationSubmissionStatusService.saveSubmissionToSubmissionStatus.mockResolvedValue( + new ApplicationSubmissionToSubmissionStatus(), + ); + + mockEmailService.getApplicationEmailData.mockResolvedValue({ + applicationSubmission: mockSubmission, + primaryContact: mockPrimaryContact, + submissionGovernment: mockLocalGovernment, + }); + mockEmailService.sendApplicationStatusEmail.mockResolvedValue(); + + await consumer.processSubmissionStatusesAndSendEmails(); + + expect( + mockApplicationSubmissionStatusService.getSubmissionToSubmissionStatusForSendingEmails, + ).toBeCalledTimes(1); + expect( + mockApplicationSubmissionStatusService.saveSubmissionToSubmissionStatus, + ).toBeCalledTimes(1); + + expect(mockEmailService.getApplicationEmailData).toBeCalledWith('fake'); + expect(mockEmailService.getApplicationEmailData).toBeCalledTimes(1); + expect(mockEmailService.sendApplicationStatusEmail).toBeCalledTimes(1); + expect(mockEmailService.sendApplicationStatusEmail).toBeCalledWith({ + applicationSubmission: mockSubmission, + government: mockLocalGovernment, + parentType: PARENT_TYPE.APPLICATION, + primaryContact: mockPrimaryContact, + ccGovernment: true, + generateStatusHtml: generateALCDApplicationHtml, + status: SUBMISSION_STATUS.ALC_DECISION, + }); + }); + + it('should not send email if no primary contact', async () => { + const mockSubmission = new ApplicationSubmission({ fileNumber: 'fake' }); + const mockLocalGovernment = new LocalGovernment(); + + mockApplicationSubmissionStatusService.getSubmissionToSubmissionStatusForSendingEmails.mockResolvedValue( + [ + new ApplicationSubmissionToSubmissionStatus({ + submission: mockSubmission, + statusTypeCode: SUBMISSION_STATUS.ALC_DECISION, + }), + ], + ); + mockApplicationSubmissionStatusService.saveSubmissionToSubmissionStatus.mockResolvedValue( + new ApplicationSubmissionToSubmissionStatus(), + ); + + mockEmailService.getApplicationEmailData.mockResolvedValue({ + applicationSubmission: mockSubmission, + primaryContact: undefined, + submissionGovernment: mockLocalGovernment, + }); + mockEmailService.sendApplicationStatusEmail.mockResolvedValue(); + + await consumer.processSubmissionStatusesAndSendEmails(); + + expect( + mockApplicationSubmissionStatusService.getSubmissionToSubmissionStatusForSendingEmails, + ).toBeCalledTimes(1); + expect( + mockApplicationSubmissionStatusService.saveSubmissionToSubmissionStatus, + ).toBeCalledTimes(0); + + expect(mockEmailService.getApplicationEmailData).toBeCalledWith('fake'); + expect(mockEmailService.getApplicationEmailData).toBeCalledTimes(1); + expect(mockEmailService.sendApplicationStatusEmail).toBeCalledTimes(0); + }); +}); diff --git a/services/apps/alcs/src/queues/scheduler/application/status-emails/status-emails.consumer.ts b/services/apps/alcs/src/queues/scheduler/application/status-emails/status-emails.consumer.ts new file mode 100644 index 0000000000..24238c5be0 --- /dev/null +++ b/services/apps/alcs/src/queues/scheduler/application/status-emails/status-emails.consumer.ts @@ -0,0 +1,114 @@ +import { Process, Processor } from '@nestjs/bull'; +import { Logger } from '@nestjs/common'; +import * as dayjs from 'dayjs'; +import * as timezone from 'dayjs/plugin/timezone'; +import * as utc from 'dayjs/plugin/utc'; +import { generateALCDApplicationHtml } from '../../../../../../../templates/emails/decision-released'; +import { generateREVAHtml } from '../../../../../../../templates/emails/under-review-by-alc.template'; +import { ApplicationSubmissionStatusService } from '../../../../alcs/application/application-submission-status/application-submission-status.service'; +import { SUBMISSION_STATUS } from '../../../../alcs/application/application-submission-status/submission-status.dto'; +import { ApplicationSubmissionToSubmissionStatus } from '../../../../alcs/application/application-submission-status/submission-status.entity'; +import { PARENT_TYPE } from '../../../../alcs/card/card-subtask/card-subtask.dto'; +import { LocalGovernment } from '../../../../alcs/local-government/local-government.entity'; +import { ApplicationOwner } from '../../../../portal/application-submission/application-owner/application-owner.entity'; +import { ApplicationSubmission } from '../../../../portal/application-submission/application-submission.entity'; +import { EmailService } from '../../../../providers/email/email.service'; +import { QUEUES } from '../../scheduler.service'; + +dayjs.extend(utc); +dayjs.extend(timezone); + +@Processor(QUEUES.APPLICATION_STATUS_EMAILS) +export class ApplicationSubmissionStatusEmailConsumer { + private logger = new Logger(ApplicationSubmissionStatusEmailConsumer.name); + + constructor( + private submissionStatusService: ApplicationSubmissionStatusService, + private emailService: EmailService, + ) {} + + @Process() + async processSubmissionStatusesAndSendEmails() { + try { + const today = dayjs(new Date()) + .tz('Canada/Pacific') + .startOf('day') + .toDate(); + + const submissionStatuses = + await this.submissionStatusService.getSubmissionToSubmissionStatusForSendingEmails( + today, + ); + + for (const submissionStatus of submissionStatuses) { + try { + const { + applicationSubmission, + primaryContact, + submissionGovernment, + } = await this.emailService.getApplicationEmailData( + submissionStatus.submission.fileNumber, + ); + + await this.sendEmailAndUpdateStatus( + applicationSubmission, + submissionGovernment, + primaryContact, + submissionStatus, + today, + ); + } catch (e) { + this.logger.error(e); + } + } + } catch (e) { + this.logger.error(e); + } + } + + private async sendEmailAndUpdateStatus( + applicationSubmission: ApplicationSubmission, + submissionGovernment: LocalGovernment | null, + primaryContact: ApplicationOwner | undefined, + submissionStatus: ApplicationSubmissionToSubmissionStatus, + today: Date, + ) { + if ( + primaryContact && + [ + SUBMISSION_STATUS.IN_REVIEW_BY_ALC, + SUBMISSION_STATUS.ALC_DECISION, + ].includes(submissionStatus.statusTypeCode) + ) { + const generateStatusHtml = + submissionStatus.statusTypeCode === SUBMISSION_STATUS.ALC_DECISION + ? generateALCDApplicationHtml + : generateREVAHtml; + + await this.emailService.sendApplicationStatusEmail({ + applicationSubmission, + government: submissionGovernment, + parentType: PARENT_TYPE.APPLICATION, + primaryContact, + ccGovernment: true, + generateStatusHtml, + status: submissionStatus.statusTypeCode, + }); + + await this.updateSubmissionStatus(submissionStatus, today); + this.logger.debug( + `Status email sent for Application {submissionStatus.submissionUuid} status code: {submissionStatus.statusTypeCode}`, + ); + } + } + + private async updateSubmissionStatus( + submissionStatus: ApplicationSubmissionToSubmissionStatus, + today: Date, + ) { + submissionStatus.emailSentDate = today; + await this.submissionStatusService.saveSubmissionToSubmissionStatus( + submissionStatus, + ); + } +} diff --git a/services/apps/alcs/src/queues/scheduler/notice-of-intent/status-emails.consumer.spec.ts b/services/apps/alcs/src/queues/scheduler/notice-of-intent/status-emails.consumer.spec.ts new file mode 100644 index 0000000000..7773a692d7 --- /dev/null +++ b/services/apps/alcs/src/queues/scheduler/notice-of-intent/status-emails.consumer.spec.ts @@ -0,0 +1,134 @@ +import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; +import { Test, TestingModule } from '@nestjs/testing'; +import { generateALCDNoticeOfIntentHtml } from '../../../../../../templates/emails/decision-released'; +import { PARENT_TYPE } from '../../../alcs/card/card-subtask/card-subtask.dto'; +import { LocalGovernment } from '../../../alcs/local-government/local-government.entity'; +import { NOI_SUBMISSION_STATUS } from '../../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status.dto'; +import { NoticeOfIntentSubmissionToSubmissionStatus } from '../../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status.entity'; +import { NoticeOfIntentSubmissionStatusService } from '../../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service'; +import { NoticeOfIntentOwner } from '../../../portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.entity'; +import { NoticeOfIntentSubmission } from '../../../portal/notice-of-intent-submission/notice-of-intent-submission.entity'; +import { EmailService } from '../../../providers/email/email.service'; +import { NoticeOfIntentSubmissionStatusEmailConsumer } from './status-emails.consumer'; + +describe('NoticeOfIntentSubmissionStatusEmailConsumer', () => { + let consumer: NoticeOfIntentSubmissionStatusEmailConsumer; + let mockEmailService: DeepMocked; + let mockNoticeOfIntentSubmissionStatusService: DeepMocked; + + beforeEach(async () => { + mockEmailService = createMock(); + mockNoticeOfIntentSubmissionStatusService = + createMock(); + + const module: TestingModule = await Test.createTestingModule({ + providers: [ + NoticeOfIntentSubmissionStatusEmailConsumer, + { + provide: EmailService, + useValue: mockEmailService, + }, + { + provide: NoticeOfIntentSubmissionStatusService, + useValue: mockNoticeOfIntentSubmissionStatusService, + }, + ], + }).compile(); + + consumer = module.get( + NoticeOfIntentSubmissionStatusEmailConsumer, + ); + + mockEmailService.sendEmail.mockResolvedValue(); + }); + + it('should be defined', () => { + expect(consumer).toBeDefined(); + }); + + it('should send email and update submissionToStatus entry of ALC_DECISION status', async () => { + const mockSubmission = new NoticeOfIntentSubmission({ fileNumber: 'fake' }); + const mockPrimaryContact = new NoticeOfIntentOwner(); + const mockLocalGovernment = new LocalGovernment(); + + mockNoticeOfIntentSubmissionStatusService.getSubmissionToSubmissionStatusForSendingEmails.mockResolvedValue( + [ + new NoticeOfIntentSubmissionToSubmissionStatus({ + submission: mockSubmission, + statusTypeCode: NOI_SUBMISSION_STATUS.ALC_DECISION, + }), + ], + ); + mockNoticeOfIntentSubmissionStatusService.saveSubmissionToSubmissionStatus.mockResolvedValue( + new NoticeOfIntentSubmissionToSubmissionStatus(), + ); + + mockEmailService.getNoticeOfIntentEmailData.mockResolvedValue({ + primaryContact: mockPrimaryContact, + submissionGovernment: mockLocalGovernment, + }); + mockEmailService.sendNoticeOfIntentStatusEmail.mockResolvedValue(); + + await consumer.processSubmissionStatusesAndSendEmails(); + + expect( + mockNoticeOfIntentSubmissionStatusService.getSubmissionToSubmissionStatusForSendingEmails, + ).toBeCalledTimes(1); + expect( + mockNoticeOfIntentSubmissionStatusService.saveSubmissionToSubmissionStatus, + ).toBeCalledTimes(1); + + expect(mockEmailService.getNoticeOfIntentEmailData).toBeCalledWith( + mockSubmission, + ); + expect(mockEmailService.getNoticeOfIntentEmailData).toBeCalledTimes(1); + expect(mockEmailService.sendNoticeOfIntentStatusEmail).toBeCalledTimes(1); + expect(mockEmailService.sendNoticeOfIntentStatusEmail).toBeCalledWith({ + noticeOfIntentSubmission: mockSubmission, + government: mockLocalGovernment, + parentType: PARENT_TYPE.NOTICE_OF_INTENT, + primaryContact: mockPrimaryContact, + ccGovernment: true, + generateStatusHtml: generateALCDNoticeOfIntentHtml, + status: NOI_SUBMISSION_STATUS.ALC_DECISION, + }); + }); + + it('should not send email if no primary contact', async () => { + const mockSubmission = new NoticeOfIntentSubmission({ fileNumber: 'fake' }); + const mockLocalGovernment = new LocalGovernment(); + + mockNoticeOfIntentSubmissionStatusService.getSubmissionToSubmissionStatusForSendingEmails.mockResolvedValue( + [ + new NoticeOfIntentSubmissionToSubmissionStatus({ + submission: mockSubmission, + statusTypeCode: NOI_SUBMISSION_STATUS.ALC_DECISION, + }), + ], + ); + mockNoticeOfIntentSubmissionStatusService.saveSubmissionToSubmissionStatus.mockResolvedValue( + new NoticeOfIntentSubmissionToSubmissionStatus(), + ); + + mockEmailService.getNoticeOfIntentEmailData.mockResolvedValue({ + primaryContact: undefined, + submissionGovernment: mockLocalGovernment, + }); + mockEmailService.sendNoticeOfIntentStatusEmail.mockResolvedValue(); + + await consumer.processSubmissionStatusesAndSendEmails(); + + expect( + mockNoticeOfIntentSubmissionStatusService.getSubmissionToSubmissionStatusForSendingEmails, + ).toBeCalledTimes(1); + expect( + mockNoticeOfIntentSubmissionStatusService.saveSubmissionToSubmissionStatus, + ).toBeCalledTimes(0); + + expect(mockEmailService.getNoticeOfIntentEmailData).toBeCalledWith( + mockSubmission, + ); + expect(mockEmailService.getNoticeOfIntentEmailData).toBeCalledTimes(1); + expect(mockEmailService.sendNoticeOfIntentStatusEmail).toBeCalledTimes(0); + }); +}); diff --git a/services/apps/alcs/src/queues/scheduler/notice-of-intent/status-emails.consumer.ts b/services/apps/alcs/src/queues/scheduler/notice-of-intent/status-emails.consumer.ts new file mode 100644 index 0000000000..19ecc75ca4 --- /dev/null +++ b/services/apps/alcs/src/queues/scheduler/notice-of-intent/status-emails.consumer.ts @@ -0,0 +1,80 @@ +import { Process, Processor } from '@nestjs/bull'; +import { Logger } from '@nestjs/common'; +import * as dayjs from 'dayjs'; +import * as timezone from 'dayjs/plugin/timezone'; +import * as utc from 'dayjs/plugin/utc'; +import { generateALCDNoticeOfIntentHtml } from '../../../../../../templates/emails/decision-released'; +import { PARENT_TYPE } from '../../../alcs/card/card-subtask/card-subtask.dto'; +import { NOI_SUBMISSION_STATUS } from '../../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status.dto'; +import { NoticeOfIntentSubmissionToSubmissionStatus } from '../../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status.entity'; +import { NoticeOfIntentSubmissionStatusService } from '../../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service'; +import { EmailService } from '../../../providers/email/email.service'; +import { QUEUES } from '../scheduler.service'; + +dayjs.extend(utc); +dayjs.extend(timezone); + +@Processor(QUEUES.NOTICE_OF_INTENTS_STATUS_EMAILS) +export class NoticeOfIntentSubmissionStatusEmailConsumer { + private logger = new Logger(NoticeOfIntentSubmissionStatusEmailConsumer.name); + + constructor( + private submissionStatusService: NoticeOfIntentSubmissionStatusService, + private emailService: EmailService, + ) {} + + @Process() + async processSubmissionStatusesAndSendEmails() { + try { + const today = dayjs(new Date()) + .tz('Canada/Pacific') + .startOf('day') + .toDate(); + + const submissionStatuses = + await this.submissionStatusService.getSubmissionToSubmissionStatusForSendingEmails( + today, + ); + + for (const submissionStatus of submissionStatuses) { + try { + const { primaryContact, submissionGovernment } = + await this.emailService.getNoticeOfIntentEmailData( + submissionStatus.submission, + ); + + if (primaryContact) { + await this.emailService.sendNoticeOfIntentStatusEmail({ + generateStatusHtml: generateALCDNoticeOfIntentHtml, + status: NOI_SUBMISSION_STATUS.ALC_DECISION, + noticeOfIntentSubmission: submissionStatus.submission, + government: submissionGovernment, + parentType: PARENT_TYPE.NOTICE_OF_INTENT, + primaryContact, + ccGovernment: true, + }); + + await this.updateSubmissionStatus(submissionStatus, today); + this.logger.debug( + `Status email sent for NOI {submissionStatus.submissionUuid}`, + ); + } + } catch (e) { + this.logger.error(e); + } + } + } catch (e) { + this.logger.error(e); + } + } + + private async updateSubmissionStatus( + submissionStatus: NoticeOfIntentSubmissionToSubmissionStatus, + today: Date, + ) { + submissionStatus.emailSentDate = today; + await this.submissionStatusService.saveSubmissionToSubmissionStatus( + submissionStatus, + ); + } +} diff --git a/services/apps/alcs/src/queues/scheduler/scheduler.module.ts b/services/apps/alcs/src/queues/scheduler/scheduler.module.ts index 0fe3b005c0..4f113b6778 100644 --- a/services/apps/alcs/src/queues/scheduler/scheduler.module.ts +++ b/services/apps/alcs/src/queues/scheduler/scheduler.module.ts @@ -1,11 +1,15 @@ import { BullModule } from '@nestjs/bull'; import { Module, OnApplicationBootstrap } from '@nestjs/common'; +import { ApplicationSubmissionStatusModule } from '../../alcs/application/application-submission-status/application-submission-status.module'; import { ApplicationModule } from '../../alcs/application/application.module'; import { MessageModule } from '../../alcs/message/message.module'; +import { NoticeOfIntentSubmissionStatusModule } from '../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.module'; import { EmailModule } from '../../providers/email/email.module'; import { BullConfigService } from '../bullConfig.service'; -import { ApplicationExpiryConsumer } from './applicationExpiry.consumer'; +import { ApplicationExpiryConsumer } from './application/application-expiry/application-expiry.consumer'; +import { ApplicationSubmissionStatusEmailConsumer } from './application/status-emails/status-emails.consumer'; import { CleanUpNotificationsConsumer } from './cleanUpNotifications.consumer'; +import { NoticeOfIntentSubmissionStatusEmailConsumer } from './notice-of-intent/status-emails.consumer'; import { QUEUES, SchedulerService } from './scheduler.service'; @Module({ @@ -19,14 +23,24 @@ import { QUEUES, SchedulerService } from './scheduler.service'; BullModule.registerQueue({ name: QUEUES.CLEANUP_NOTIFICATIONS, }), + BullModule.registerQueue({ + name: QUEUES.APPLICATION_STATUS_EMAILS, + }), + BullModule.registerQueue({ + name: QUEUES.NOTICE_OF_INTENTS_STATUS_EMAILS, + }), EmailModule, ApplicationModule, MessageModule, + ApplicationSubmissionStatusModule, + NoticeOfIntentSubmissionStatusModule, ], providers: [ SchedulerService, ApplicationExpiryConsumer, CleanUpNotificationsConsumer, + ApplicationSubmissionStatusEmailConsumer, + NoticeOfIntentSubmissionStatusEmailConsumer, ], exports: [SchedulerService], }) diff --git a/services/apps/alcs/src/queues/scheduler/scheduler.service.spec.ts b/services/apps/alcs/src/queues/scheduler/scheduler.service.spec.ts index bc2cf5464c..c2ea9de4d8 100644 --- a/services/apps/alcs/src/queues/scheduler/scheduler.service.spec.ts +++ b/services/apps/alcs/src/queues/scheduler/scheduler.service.spec.ts @@ -4,6 +4,7 @@ import { Test, TestingModule } from '@nestjs/testing'; import { BullConfigService } from '../bullConfig.service'; import { EVERYDAY_MIDNIGHT, + EVERY_15_MINUTES_STARTING_FROM_8AM, QUEUES, SchedulerService, } from './scheduler.service'; @@ -12,6 +13,8 @@ describe('SchedulerService', () => { let schedulerService: SchedulerService; let mockAppExpiryQueue; let mockNotificationCleanUpQueue; + let mockApplicationStatusEmailsQueue; + let mockNoticeOfIntentStatusEmailsQueue; beforeEach(async () => { mockAppExpiryQueue = { @@ -26,6 +29,18 @@ describe('SchedulerService', () => { empty: jest.fn(), }; + mockApplicationStatusEmailsQueue = { + add: jest.fn(), + process: jest.fn(), + empty: jest.fn(), + }; + + mockNoticeOfIntentStatusEmailsQueue = { + add: jest.fn(), + process: jest.fn(), + empty: jest.fn(), + }; + const module: TestingModule = await Test.createTestingModule({ imports: [ ConfigModule, @@ -44,6 +59,14 @@ describe('SchedulerService', () => { provide: getQueueToken(QUEUES.CLEANUP_NOTIFICATIONS), useValue: mockNotificationCleanUpQueue, }, + { + provide: getQueueToken(QUEUES.APPLICATION_STATUS_EMAILS), + useValue: mockApplicationStatusEmailsQueue, + }, + { + provide: getQueueToken(QUEUES.NOTICE_OF_INTENTS_STATUS_EMAILS), + useValue: mockNoticeOfIntentStatusEmailsQueue, + }, ], }).compile(); @@ -74,4 +97,24 @@ describe('SchedulerService', () => { { repeat: { cron: EVERYDAY_MIDNIGHT } }, ); }); + + it('should call add for application status email', async () => { + await schedulerService.setup(); + expect(mockApplicationStatusEmailsQueue.empty).toBeCalledTimes(1); + expect(mockApplicationStatusEmailsQueue.add).toBeCalledTimes(1); + expect(mockApplicationStatusEmailsQueue.add).toBeCalledWith( + {}, + { repeat: { cron: EVERY_15_MINUTES_STARTING_FROM_8AM } }, + ); + }); + + it('should call add for notice of intent status email', async () => { + await schedulerService.setup(); + expect(mockNoticeOfIntentStatusEmailsQueue.empty).toBeCalledTimes(1); + expect(mockNoticeOfIntentStatusEmailsQueue.add).toBeCalledTimes(1); + expect(mockNoticeOfIntentStatusEmailsQueue.add).toBeCalledWith( + {}, + { repeat: { cron: EVERY_15_MINUTES_STARTING_FROM_8AM } }, + ); + }); }); diff --git a/services/apps/alcs/src/queues/scheduler/scheduler.service.ts b/services/apps/alcs/src/queues/scheduler/scheduler.service.ts index 29022b578b..1fef60a1d7 100644 --- a/services/apps/alcs/src/queues/scheduler/scheduler.service.ts +++ b/services/apps/alcs/src/queues/scheduler/scheduler.service.ts @@ -4,10 +4,13 @@ import { Queue } from 'bull'; export const MONDAY_TO_FRIDAY_AT_2AM = '0 0 2 * * 1-5'; export const EVERYDAY_MIDNIGHT = '0 0 0 * * *'; +export const EVERY_15_MINUTES_STARTING_FROM_8AM = '0/15 8-23 * * *'; export const QUEUES = { APP_EXPIRY: 'ApplicationExpiry', CLEANUP_NOTIFICATIONS: 'CleanupNotifications', + APPLICATION_STATUS_EMAILS: 'ApplicationSubmissionStatusEmails', + NOTICE_OF_INTENTS_STATUS_EMAILS: 'NoticeOfIntentSubmissionStatusEmails', }; @Injectable() @@ -16,6 +19,10 @@ export class SchedulerService { @InjectQueue(QUEUES.APP_EXPIRY) private applicationExpiryQueue: Queue, @InjectQueue(QUEUES.CLEANUP_NOTIFICATIONS) private cleanupNotificationsQueue: Queue, + @InjectQueue(QUEUES.APPLICATION_STATUS_EMAILS) + private applicationSubmissionStatusEmails: Queue, + @InjectQueue(QUEUES.NOTICE_OF_INTENTS_STATUS_EMAILS) + private noticeOfIntentSubmissionStatusEmails: Queue, ) {} async setup() { @@ -24,6 +31,8 @@ export class SchedulerService { // await this.scheduleApplicationExpiry(); await this.scheduleCleanupNotifications(); + + await this.scheduleSubmissionEmails(); } private async scheduleApplicationExpiry() { @@ -41,4 +50,18 @@ export class SchedulerService { { repeat: { cron: EVERYDAY_MIDNIGHT } }, ); } + + private async scheduleSubmissionEmails() { + await this.applicationSubmissionStatusEmails.empty(); + await this.applicationSubmissionStatusEmails.add( + {}, + { repeat: { cron: EVERY_15_MINUTES_STARTING_FROM_8AM } }, + ); + + await this.noticeOfIntentSubmissionStatusEmails.empty(); + await this.noticeOfIntentSubmissionStatusEmails.add( + {}, + { repeat: { cron: EVERY_15_MINUTES_STARTING_FROM_8AM } }, + ); + } } From 3d4a56a2daaeb31c51070b9ae90e6fbff752d6ce Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Mon, 11 Sep 2023 16:37:44 -0700 Subject: [PATCH 374/954] Add Notification Detail Page * Timeline, Overview, Staff Journal, App Info, App Preview, etc. * Add missing Transferees section to the portal --- alcs-frontend/src/app/app-routing.module.ts | 8 + .../applicant-info.component.html | 10 ++ .../applicant-info.component.scss | 10 ++ .../applicant-info.component.spec.ts | 40 +++++ .../applicant-info.component.ts | 43 +++++ .../notification-details.component.html | 129 +++++++++++++ .../notification-details.component.scss | 115 ++++++++++++ .../notification-details.component.spec.ts | 97 ++++++++++ .../notification-details.component.ts | 63 +++++++ .../notification-details.module.ts | 13 ++ .../parcel/parcel.component.html | 50 ++++++ .../parcel/parcel.component.scss | 24 +++ .../parcel/parcel.component.spec.ts | 48 +++++ .../parcel/parcel.component.ts | 60 +++++++ .../document-upload-dialog.component.html | 101 +++++++++++ .../document-upload-dialog.component.scss | 51 ++++++ .../document-upload-dialog.component.spec.ts | 50 ++++++ .../document-upload-dialog.component.ts | 170 ++++++++++++++++++ .../documents/documents.component.html | 60 +++++++ .../documents/documents.component.scss | 19 ++ .../documents/documents.component.spec.ts | 59 ++++++ .../documents/documents.component.ts | 119 ++++++++++++ .../notification/notification.component.html | 30 ++++ .../notification/notification.component.scss | 78 ++++++++ .../notification.component.spec.ts | 56 ++++++ .../notification/notification.component.ts | 97 ++++++++++ .../notification/notification.module.ts | 31 ++++ .../overview/overview.component.html | 18 ++ .../overview/overview.component.scss | 7 + .../overview/overview.component.spec.ts | 47 +++++ .../overview/overview.component.ts | 57 ++++++ .../application/application-detail.service.ts | 1 - .../staff-journal.dto.ts | 5 + .../staff-journal.service.ts | 7 + .../notification-detail.service.spec.ts | 61 +++++++ .../notification-detail.service.ts | 29 +++ .../notification-document.dto.ts | 34 ++++ .../notification-document.service.spec.ts | 99 ++++++++++ .../notification-document.service.ts | 94 ++++++++++ .../notification-parcel.dto.ts | 9 + .../notification-parcel.service.spec.ts | 42 +++++ .../notification-parcel.service.ts | 24 +++ .../notification-submission-status.dto.ts | 24 +++ ...fication-submission-status.service.spec.ts | 98 ++++++++++ .../notification-submission-status.service.ts | 45 +++++ .../notification-submission.service.spec.ts | 73 ++++++++ .../notification-submission.service.ts | 37 ++++ .../notification-timeline.dto.ts | 7 + .../notification-timeline.service.spec.ts | 45 +++++ .../notification-timeline.service.ts | 25 +++ .../services/notification/notification.dto.ts | 104 +++++++++++ .../notification/notification.service.spec.ts | 63 +++++++ .../notification/notification.service.ts | 55 ++++++ .../src/app/shared/card/card.component.ts | 1 + .../details-header.component.html | 2 +- .../details-header.component.ts | 18 +- .../src/app/shared/document/document.dto.ts | 4 + .../header/search-bar/search-bar.component.ts | 4 + .../staff-journal/staff-journal.component.ts | 7 +- .../time-tracker/time-tracker.component.ts | 2 +- .../notification-details.component.html | 25 +++ .../notification-details.component.scss | 8 +- .../notification-submission.dto.ts | 2 +- services/apps/alcs/src/alcs/alcs.module.ts | 5 + .../alcs/card/card-type/card-type.entity.ts | 1 + ...ce-of-intent-submission.controller.spec.ts | 2 +- .../notification-document.controller.spec.ts | 8 - .../notification-document.controller.ts | 17 -- .../notification-document.service.ts | 46 ----- .../notification-parcel.controller.spec.ts | 52 ++++++ .../notification-parcel.controller.ts | 30 ++++ .../notification-submission-status.module.ts | 6 +- ...notification-submission.controller.spec.ts | 87 +++++++++ .../notification-submission.controller.ts | 52 ++++++ .../notification-submission.service.spec.ts | 156 ++++++++++++++++ .../notification-submission.service.ts | 71 ++++++++ .../notification-timeline.controller.spec.ts | 49 +++++ .../notification-timeline.controller.ts | 20 +++ .../notification-timeline.module.ts | 18 ++ .../notification-timeline.service.spec.ts | 78 ++++++++ .../notification-timeline.service.ts | 91 ++++++++++ .../src/alcs/notification/notification.dto.ts | 8 +- .../alcs/notification/notification.module.ts | 17 +- .../alcs/notification/notification.service.ts | 2 +- .../src/alcs/search/search.controller.spec.ts | 8 +- .../alcs/src/alcs/search/search.controller.ts | 31 +++- .../alcs/src/alcs/search/search.module.ts | 2 + .../src/alcs/search/search.service.spec.ts | 27 +++ .../alcs/src/alcs/search/search.service.ts | 14 ++ .../staff-journal/staff-journal.controller.ts | 16 ++ .../alcs/staff-journal/staff-journal.dto.ts | 10 ++ .../staff-journal/staff-journal.entity.ts | 8 + .../staff-journal/staff-journal.service.ts | 17 ++ ...ification-submission.automapper.profile.ts | 6 + .../notification-parcel.service.spec.ts | 3 + .../notification-parcel.service.ts | 3 + .../notification-submission.dto.ts | 5 +- .../notification-submission.entity.ts | 2 + ...56197990-add_notification_staff_journal.ts | 31 ++++ ...457087578-rename_notification_card_type.ts | 15 ++ 100 files changed, 3724 insertions(+), 104 deletions(-) create mode 100644 alcs-frontend/src/app/features/notification/applicant-info/applicant-info.component.html create mode 100644 alcs-frontend/src/app/features/notification/applicant-info/applicant-info.component.scss create mode 100644 alcs-frontend/src/app/features/notification/applicant-info/applicant-info.component.spec.ts create mode 100644 alcs-frontend/src/app/features/notification/applicant-info/applicant-info.component.ts create mode 100644 alcs-frontend/src/app/features/notification/applicant-info/notification-details/notification-details.component.html create mode 100644 alcs-frontend/src/app/features/notification/applicant-info/notification-details/notification-details.component.scss create mode 100644 alcs-frontend/src/app/features/notification/applicant-info/notification-details/notification-details.component.spec.ts create mode 100644 alcs-frontend/src/app/features/notification/applicant-info/notification-details/notification-details.component.ts create mode 100644 alcs-frontend/src/app/features/notification/applicant-info/notification-details/notification-details.module.ts create mode 100644 alcs-frontend/src/app/features/notification/applicant-info/notification-details/parcel/parcel.component.html create mode 100644 alcs-frontend/src/app/features/notification/applicant-info/notification-details/parcel/parcel.component.scss create mode 100644 alcs-frontend/src/app/features/notification/applicant-info/notification-details/parcel/parcel.component.spec.ts create mode 100644 alcs-frontend/src/app/features/notification/applicant-info/notification-details/parcel/parcel.component.ts create mode 100644 alcs-frontend/src/app/features/notification/documents/document-upload-dialog/document-upload-dialog.component.html create mode 100644 alcs-frontend/src/app/features/notification/documents/document-upload-dialog/document-upload-dialog.component.scss create mode 100644 alcs-frontend/src/app/features/notification/documents/document-upload-dialog/document-upload-dialog.component.spec.ts create mode 100644 alcs-frontend/src/app/features/notification/documents/document-upload-dialog/document-upload-dialog.component.ts create mode 100644 alcs-frontend/src/app/features/notification/documents/documents.component.html create mode 100644 alcs-frontend/src/app/features/notification/documents/documents.component.scss create mode 100644 alcs-frontend/src/app/features/notification/documents/documents.component.spec.ts create mode 100644 alcs-frontend/src/app/features/notification/documents/documents.component.ts create mode 100644 alcs-frontend/src/app/features/notification/notification.component.html create mode 100644 alcs-frontend/src/app/features/notification/notification.component.scss create mode 100644 alcs-frontend/src/app/features/notification/notification.component.spec.ts create mode 100644 alcs-frontend/src/app/features/notification/notification.component.ts create mode 100644 alcs-frontend/src/app/features/notification/notification.module.ts create mode 100644 alcs-frontend/src/app/features/notification/overview/overview.component.html create mode 100644 alcs-frontend/src/app/features/notification/overview/overview.component.scss create mode 100644 alcs-frontend/src/app/features/notification/overview/overview.component.spec.ts create mode 100644 alcs-frontend/src/app/features/notification/overview/overview.component.ts create mode 100644 alcs-frontend/src/app/services/notification/notification-detail.service.spec.ts create mode 100644 alcs-frontend/src/app/services/notification/notification-detail.service.ts create mode 100644 alcs-frontend/src/app/services/notification/notification-document/notification-document.dto.ts create mode 100644 alcs-frontend/src/app/services/notification/notification-document/notification-document.service.spec.ts create mode 100644 alcs-frontend/src/app/services/notification/notification-document/notification-document.service.ts create mode 100644 alcs-frontend/src/app/services/notification/notification-parcel/notification-parcel.dto.ts create mode 100644 alcs-frontend/src/app/services/notification/notification-parcel/notification-parcel.service.spec.ts create mode 100644 alcs-frontend/src/app/services/notification/notification-parcel/notification-parcel.service.ts create mode 100644 alcs-frontend/src/app/services/notification/notification-submission-status/notification-submission-status.dto.ts create mode 100644 alcs-frontend/src/app/services/notification/notification-submission-status/notification-submission-status.service.spec.ts create mode 100644 alcs-frontend/src/app/services/notification/notification-submission-status/notification-submission-status.service.ts create mode 100644 alcs-frontend/src/app/services/notification/notification-submission/notification-submission.service.spec.ts create mode 100644 alcs-frontend/src/app/services/notification/notification-submission/notification-submission.service.ts create mode 100644 alcs-frontend/src/app/services/notification/notification-timeline/notification-timeline.dto.ts create mode 100644 alcs-frontend/src/app/services/notification/notification-timeline/notification-timeline.service.spec.ts create mode 100644 alcs-frontend/src/app/services/notification/notification-timeline/notification-timeline.service.ts create mode 100644 alcs-frontend/src/app/services/notification/notification.dto.ts create mode 100644 alcs-frontend/src/app/services/notification/notification.service.spec.ts create mode 100644 alcs-frontend/src/app/services/notification/notification.service.ts create mode 100644 services/apps/alcs/src/alcs/notification/notification-parcel/notification-parcel.controller.spec.ts create mode 100644 services/apps/alcs/src/alcs/notification/notification-parcel/notification-parcel.controller.ts create mode 100644 services/apps/alcs/src/alcs/notification/notification-submission/notification-submission.controller.spec.ts create mode 100644 services/apps/alcs/src/alcs/notification/notification-submission/notification-submission.controller.ts create mode 100644 services/apps/alcs/src/alcs/notification/notification-submission/notification-submission.service.spec.ts create mode 100644 services/apps/alcs/src/alcs/notification/notification-submission/notification-submission.service.ts create mode 100644 services/apps/alcs/src/alcs/notification/notification-timeline/notification-timeline.controller.spec.ts create mode 100644 services/apps/alcs/src/alcs/notification/notification-timeline/notification-timeline.controller.ts create mode 100644 services/apps/alcs/src/alcs/notification/notification-timeline/notification-timeline.module.ts create mode 100644 services/apps/alcs/src/alcs/notification/notification-timeline/notification-timeline.service.spec.ts create mode 100644 services/apps/alcs/src/alcs/notification/notification-timeline/notification-timeline.service.ts create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1694456197990-add_notification_staff_journal.ts create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1694457087578-rename_notification_card_type.ts diff --git a/alcs-frontend/src/app/app-routing.module.ts b/alcs-frontend/src/app/app-routing.module.ts index e3d3768667..94d71b7f2f 100644 --- a/alcs-frontend/src/app/app-routing.module.ts +++ b/alcs-frontend/src/app/app-routing.module.ts @@ -45,6 +45,14 @@ const routes: Routes = [ loadChildren: () => import('./features/notice-of-intent/notice-of-intent.module').then((m) => m.NoticeOfIntentModule), }, + { + path: 'notification', + canActivate: [HasRolesGuard], + data: { + roles: ROLES_ALLOWED_APPLICATIONS, + }, + loadChildren: () => import('./features/notification/notification.module').then((m) => m.NotificationModule), + }, { path: 'schedule', canActivate: [HasRolesGuard], diff --git a/alcs-frontend/src/app/features/notification/applicant-info/applicant-info.component.html b/alcs-frontend/src/app/features/notification/applicant-info/applicant-info.component.html new file mode 100644 index 0000000000..3b5fe1af46 --- /dev/null +++ b/alcs-frontend/src/app/features/notification/applicant-info/applicant-info.component.html @@ -0,0 +1,10 @@ +
+
+ +
+
diff --git a/alcs-frontend/src/app/features/notification/applicant-info/applicant-info.component.scss b/alcs-frontend/src/app/features/notification/applicant-info/applicant-info.component.scss new file mode 100644 index 0000000000..480cb3d0e2 --- /dev/null +++ b/alcs-frontend/src/app/features/notification/applicant-info/applicant-info.component.scss @@ -0,0 +1,10 @@ +.applicant-info { + & > div { + margin: 32px 0; + } + } + + .subheading1 { + margin-bottom: 4px !important; + } + \ No newline at end of file diff --git a/alcs-frontend/src/app/features/notification/applicant-info/applicant-info.component.spec.ts b/alcs-frontend/src/app/features/notification/applicant-info/applicant-info.component.spec.ts new file mode 100644 index 0000000000..211efd2032 --- /dev/null +++ b/alcs-frontend/src/app/features/notification/applicant-info/applicant-info.component.spec.ts @@ -0,0 +1,40 @@ +import { HttpClientTestingModule } from '@angular/common/http/testing'; +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { BehaviorSubject } from 'rxjs'; +import { NotificationDetailService } from '../../../services/notification/notification-detail.service'; +import { NotificationDto } from '../../../services/notification/notification.dto'; +import { ToastService } from '../../../services/toast/toast.service'; + +import { ApplicantInfoComponent } from './applicant-info.component'; + +describe('ApplicantInfoComponent', () => { + let component: ApplicantInfoComponent; + let fixture: ComponentFixture; + let mockAppDetailService: DeepMocked; + let mockToastService: DeepMocked; + + beforeEach(async () => { + mockAppDetailService = createMock(); + mockAppDetailService.$notification = new BehaviorSubject(undefined); + + await TestBed.configureTestingModule({ + imports: [HttpClientTestingModule], + declarations: [ApplicantInfoComponent], + providers: [ + { provide: NotificationDetailService, useValue: mockAppDetailService }, + { provide: ToastService, useValue: mockToastService }, + ], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(ApplicantInfoComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/alcs-frontend/src/app/features/notification/applicant-info/applicant-info.component.ts b/alcs-frontend/src/app/features/notification/applicant-info/applicant-info.component.ts new file mode 100644 index 0000000000..eaeaf9db1a --- /dev/null +++ b/alcs-frontend/src/app/features/notification/applicant-info/applicant-info.component.ts @@ -0,0 +1,43 @@ +import { Component, OnDestroy, OnInit } from '@angular/core'; +import { Subject, takeUntil } from 'rxjs'; +import { NotificationDetailService } from '../../../services/notification/notification-detail.service'; +import { NotificationSubmissionService } from '../../../services/notification/notification-submission/notification-submission.service'; +import { NotificationDto, NotificationSubmissionDetailedDto } from '../../../services/notification/notification.dto'; +import { DOCUMENT_TYPE } from '../../../shared/document/document.dto'; + +@Component({ + selector: 'app-applicant-info', + templateUrl: './applicant-info.component.html', + styleUrls: ['./applicant-info.component.scss'], +}) +export class ApplicantInfoComponent implements OnInit, OnDestroy { + fileNumber: string = ''; + applicant: string = ''; + destroy = new Subject(); + DOCUMENT_TYPE = DOCUMENT_TYPE; + notification: NotificationDto | undefined; + submission?: NotificationSubmissionDetailedDto = undefined; + isSubmittedToAlc = false; + + constructor( + private notificationDetailService: NotificationDetailService, + private notificationSubmissionService: NotificationSubmissionService + ) {} + + ngOnInit(): void { + this.notificationDetailService.$notification.pipe(takeUntil(this.destroy)).subscribe(async (notification) => { + if (notification) { + this.notification = notification; + this.fileNumber = notification.fileNumber; + + this.submission = await this.notificationSubmissionService.fetchSubmission(this.fileNumber); + this.isSubmittedToAlc = !!notification.dateSubmittedToAlc; + } + }); + } + + ngOnDestroy(): void { + this.destroy.next(); + this.destroy.complete(); + } +} diff --git a/alcs-frontend/src/app/features/notification/applicant-info/notification-details/notification-details.component.html b/alcs-frontend/src/app/features/notification/applicant-info/notification-details/notification-details.component.html new file mode 100644 index 0000000000..3ef70a3acb --- /dev/null +++ b/alcs-frontend/src/app/features/notification/applicant-info/notification-details/notification-details.component.html @@ -0,0 +1,129 @@ +
+ +
+
+

Transferees

+
+
+
Type
+
Full Name
+
Organization
+
Phone
+
Email
+ +
{{ transferee.type.label }}
+
{{ transferee.displayName }}
+
+ {{ transferee.organizationName }} + +
+
+ {{ transferee.phoneNumber | mask : '(000) 000-0000' }} +
+
{{ transferee.email }}
+ +
+
+
+
+

Primary Contact Information

+
+
Type
+
+ {{ submission.contactFirstName }} + +
+
Last Name
+
+ {{ submission.contactLastName }} + +
+
Organization
+
+ {{ submission.contactOrganization }} + +
+
Phone
+
+ {{ submission.contactPhone }} + +
+
Email
+
+ {{ submission.contactEmail }} + +
+
+
+
+

Proposal

+
+
Submitter’s File Number
+
+ {{ submission.submittersFileNumber }} + +
+
What is the purpose of the SRW?
+
+ {{ submission.purpose }} + +
+
Total area of the SRW
+
+ {{ submission.totalArea }} + +
+
Upload Terms of the SRW
+
+ +
+
Is there a survey plan associated with the SRW?
+
+ {{ submission.hasSurveyPlan ? 'Yes' : 'No' }} +
+
+
File Name
+
Survey Plan Number
+
Control Number
+ + +
+ {{ document.surveyPlanNumber }} +
+
+ {{ document.controlNumber }} +
+ +
+
+
+
+

Optional Documents

+
+
+
Type
+
Description
+
File Name
+ +
+ {{ file.type?.label }} +
+
+ {{ file.description }} +
+
+ {{ file.fileName }} +
+ +
No optional attachments
+
+
+
diff --git a/alcs-frontend/src/app/features/notification/applicant-info/notification-details/notification-details.component.scss b/alcs-frontend/src/app/features/notification/applicant-info/notification-details/notification-details.component.scss new file mode 100644 index 0000000000..b7cc10222d --- /dev/null +++ b/alcs-frontend/src/app/features/notification/applicant-info/notification-details/notification-details.component.scss @@ -0,0 +1,115 @@ +@use '../../../../../styles/colors'; + +:host::ng-deep { + .view-grid-item { + display: grid; + grid-template-columns: minmax(100px, 0.5fr) 1fr; + column-gap: 16px; + margin-bottom: 12px; + } + + .details-wrapper { + margin-top: 24px; + margin-bottom: 24px; + + .title { + margin-bottom: 16px !important; + } + } + + h3 .subtext { + margin: 0.5rem 0 !important; + } + + label { + font-weight: 600; + } + + .no-data-text { + text-align: center; + color: colors.$grey; + padding-top: rem(12); + + .error { + justify-content: center; + } + } + + .table-wrapper { + overflow-x: auto; + width: 100%; + } +} + +:host::ng-deep { + .transferee-table { + display: grid; + grid-template-columns: max-content max-content max-content max-content max-content; + overflow-x: auto; + grid-column-gap: 36px; + grid-row-gap: 12px; + overflow: unset; + } + + .survey-plan-table { + display: grid; + grid-template-columns: max-content max-content max-content; + overflow-x: auto; + grid-column-gap: 36px; + grid-row-gap: 12px; + overflow: unset; + } + + .scrollable { + overflow-x: auto; + } + + .other-attachments { + display: grid; + grid-template-columns: max-content max-content max-content; + overflow-x: auto; + overflow-y: hidden; + grid-column-gap: 36px; + grid-row-gap: 12px; + + .full-width { + grid-column: 1/3; + } + } + + .review-table { + background-color: colors.$grey-light; + display: grid; + grid-row-gap: 24px; + grid-column-gap: 16px; + word-wrap: break-word; + hyphens: auto; + padding: 16px; + margin: 24px 0 40px 0; + grid-template-columns: minmax(60px, 1fr) minmax(60px, 1fr) minmax(60px, 1fr) minmax(60px, 1fr); + + .full-width { + grid-column: 1/5; + } + + .grid-double { + grid-column: 2/5; + } + + .grid-1 { + grid-column: 1/2; + } + + .grid-2 { + grid-column: 2/3; + } + + .grid-3 { + grid-column: 3/5; + } + + .subheading2 { + margin-bottom: 4px !important; + } + } +} diff --git a/alcs-frontend/src/app/features/notification/applicant-info/notification-details/notification-details.component.spec.ts b/alcs-frontend/src/app/features/notification/applicant-info/notification-details/notification-details.component.spec.ts new file mode 100644 index 0000000000..7949eb031f --- /dev/null +++ b/alcs-frontend/src/app/features/notification/applicant-info/notification-details/notification-details.component.spec.ts @@ -0,0 +1,97 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { Router } from '@angular/router'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { NoiDocumentService } from '../../../../services/notice-of-intent/noi-document/noi-document.service'; +import { NoticeOfIntentSubmissionService } from '../../../../services/notice-of-intent/notice-of-intent-submission/notice-of-intent-submission.service'; +import { + NOI_SUBMISSION_STATUS, + NoticeOfIntentSubmissionStatusDto, +} from '../../../../services/notice-of-intent/notice-of-intent.dto'; +import { NotificationDocumentService } from '../../../../services/notification/notification-document/notification-document.service'; +import { NotificationSubmissionService } from '../../../../services/notification/notification-submission/notification-submission.service'; +import { + NOTIFICATION_STATUS, + NotificationSubmissionStatusDto, +} from '../../../../services/notification/notification.dto'; +import { ToastService } from '../../../../services/toast/toast.service'; + +import { NotificationDetailsComponent } from './notification-details.component'; + +describe('NotificationDetailsComponent', () => { + let component: NotificationDetailsComponent; + let fixture: ComponentFixture; + + let mockDocumentService: DeepMocked; + let mockRouter: DeepMocked; + let mockToastService: DeepMocked; + let mockSubmissionService: DeepMocked; + + beforeEach(async () => { + mockDocumentService = createMock(); + mockRouter = createMock(); + mockSubmissionService = createMock(); + + await TestBed.configureTestingModule({ + providers: [ + { + provide: NotificationDocumentService, + useValue: mockDocumentService, + }, + { + provide: Router, + useValue: mockRouter, + }, + { + provide: ToastService, + useValue: mockToastService, + }, + { + provide: NotificationSubmissionService, + useValue: mockSubmissionService, + }, + ], + declarations: [NotificationDetailsComponent], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(NotificationDetailsComponent); + component = fixture.componentInstance; + component.submission = { + contactEmail: null, + contactFirstName: null, + contactLastName: null, + contactOrganization: null, + contactPhone: null, + hasSurveyPlan: null, + lastStatusUpdate: 0, + submittersFileNumber: null, + totalArea: null, + transferees: [], + fileNumber: '', + uuid: '', + createdAt: 1, + updatedAt: 1, + applicant: '', + localGovernmentUuid: '', + type: '', + typeCode: '', + status: { + code: NOTIFICATION_STATUS.IN_PROGRESS, + portalBackgroundColor: '', + portalColor: '', + label: '', + description: '', + } as NotificationSubmissionStatusDto, + canEdit: false, + canView: false, + purpose: '', + }; + component.fileNumber = 'fake'; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/alcs-frontend/src/app/features/notification/applicant-info/notification-details/notification-details.component.ts b/alcs-frontend/src/app/features/notification/applicant-info/notification-details/notification-details.component.ts new file mode 100644 index 0000000000..bd937eebba --- /dev/null +++ b/alcs-frontend/src/app/features/notification/applicant-info/notification-details/notification-details.component.ts @@ -0,0 +1,63 @@ +import { Component, Input, OnChanges, OnDestroy, OnInit, SimpleChanges } from '@angular/core'; +import { doc } from 'prettier'; +import { Subject } from 'rxjs'; +import { NotificationDocumentDto } from '../../../../services/notification/notification-document/notification-document.dto'; +import { NotificationDocumentService } from '../../../../services/notification/notification-document/notification-document.service'; +import { NotificationSubmissionDetailedDto } from '../../../../services/notification/notification.dto'; +import { DOCUMENT_TYPE } from '../../../../shared/document/document.dto'; + +@Component({ + selector: 'app-notification-details', + templateUrl: './notification-details.component.html', + styleUrls: ['./notification-details.component.scss'], +}) +export class NotificationDetailsComponent implements OnInit, OnChanges, OnDestroy { + $destroy = new Subject(); + + @Input() submission!: NotificationSubmissionDetailedDto; + @Input() fileNumber!: string; + @Input() showEdit = false; + @Input() isSubmittedToAlc = true; + + otherFiles: NotificationDocumentDto[] = []; + files: NotificationDocumentDto[] | undefined; + srwTerms: NotificationDocumentDto[] = []; + surveyPlans: NotificationDocumentDto[] = []; + + disableEdit = false; + showFullApp = false; + + constructor(private notificationDocumentService: NotificationDocumentService) {} + + ngOnInit(): void { + this.loadDocuments(); + } + + ngOnChanges(changes: SimpleChanges): void { + this.disableEdit = !this.isSubmittedToAlc; + this.showFullApp = this.isSubmittedToAlc; + } + + ngOnDestroy(): void { + this.$destroy.next(); + this.$destroy.complete(); + } + + async openFile(uuid: string) { + await this.notificationDocumentService.download(uuid, ''); + } + + private async loadDocuments() { + const documents = await this.notificationDocumentService.getApplicantDocuments(this.fileNumber); + this.surveyPlans = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.SURVEY_PLAN); + this.srwTerms = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.SRW_TERMS); + this.otherFiles = documents.filter( + (document) => + document.type && + [DOCUMENT_TYPE.PHOTOGRAPH, DOCUMENT_TYPE.OTHER, DOCUMENT_TYPE.PROFESSIONAL_REPORT].includes(document.type.code) + ); + this.files = documents; + } + + protected readonly doc = doc; +} diff --git a/alcs-frontend/src/app/features/notification/applicant-info/notification-details/notification-details.module.ts b/alcs-frontend/src/app/features/notification/applicant-info/notification-details/notification-details.module.ts new file mode 100644 index 0000000000..1d7f86adb0 --- /dev/null +++ b/alcs-frontend/src/app/features/notification/applicant-info/notification-details/notification-details.module.ts @@ -0,0 +1,13 @@ +import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; +import { NgxMaskPipe } from 'ngx-mask'; +import { SharedModule } from '../../../../shared/shared.module'; +import { NotificationDetailsComponent } from './notification-details.component'; +import { ParcelComponent } from './parcel/parcel.component'; + +@NgModule({ + declarations: [ParcelComponent, NotificationDetailsComponent], + imports: [CommonModule, SharedModule, NgxMaskPipe, NgxMaskPipe], + exports: [NotificationDetailsComponent], +}) +export class NotificationDetailsModule {} diff --git a/alcs-frontend/src/app/features/notification/applicant-info/notification-details/parcel/parcel.component.html b/alcs-frontend/src/app/features/notification/applicant-info/notification-details/parcel/parcel.component.html new file mode 100644 index 0000000000..8fd694e97f --- /dev/null +++ b/alcs-frontend/src/app/features/notification/applicant-info/notification-details/parcel/parcel.component.html @@ -0,0 +1,50 @@ +

Notification Parcels

+ +
+ +
+

Parcel {{ parcelInd + 1 }}: Parcel and Owner Information

+
+
Parcel Information
+
Ownership Type
+
+ {{ parcel.ownershipType?.label }} + +
+
Legal Description
+
+ {{ parcel.legalDescription }} + +
+
Area (Hectares)
+
+ {{ parcel.mapAreaHectares }} + +
+
+ PID {{ parcel.ownershipType?.code === PARCEL_OWNERSHIP_TYPES.CROWN ? '(optional)' : '' }} +
+
+ {{ parcel.pid | mask : '000-000-000' }} + +
+ +
PIN (optional)
+
+ {{ parcel.pin }} +
+ +
Civic Address
+
+ {{ parcel.civicAddress }} + +
+ +
Crown Selection
+
+ {{ parcel.crownLandOwnerType }} + +
+ + +
diff --git a/alcs-frontend/src/app/features/notification/applicant-info/notification-details/parcel/parcel.component.scss b/alcs-frontend/src/app/features/notification/applicant-info/notification-details/parcel/parcel.component.scss new file mode 100644 index 0000000000..e79cc4a08f --- /dev/null +++ b/alcs-frontend/src/app/features/notification/applicant-info/notification-details/parcel/parcel.component.scss @@ -0,0 +1,24 @@ +.owner-information { + display: grid; + grid-template-columns: max-content max-content max-content max-content max-content max-content; + overflow-x: auto; + overflow-y: hidden; + grid-column-gap: 36px; + grid-row-gap: 12px; + + .full-width { + grid-column: 1/3; + } +} + +.review-table { + grid-template-columns: 1fr 1fr !important; + + .full-width { + grid-column: 1/5; + } +} + +.crown-land { + text-transform: capitalize; +} diff --git a/alcs-frontend/src/app/features/notification/applicant-info/notification-details/parcel/parcel.component.spec.ts b/alcs-frontend/src/app/features/notification/applicant-info/notification-details/parcel/parcel.component.spec.ts new file mode 100644 index 0000000000..665c828bd1 --- /dev/null +++ b/alcs-frontend/src/app/features/notification/applicant-info/notification-details/parcel/parcel.component.spec.ts @@ -0,0 +1,48 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { ActivatedRoute, Router } from '@angular/router'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { Observable } from 'rxjs'; +import { NoiDocumentService } from '../../../../../services/notice-of-intent/noi-document/noi-document.service'; +import { NoticeOfIntentParcelService } from '../../../../../services/notice-of-intent/notice-of-intent-parcel/notice-of-intent-parcel.service'; +import { NotificationDocumentService } from '../../../../../services/notification/notification-document/notification-document.service'; +import { NotificationParcelService } from '../../../../../services/notification/notification-parcel/notification-parcel.service'; +import { ParcelComponent } from './parcel.component'; + +describe('ParcelComponent', () => { + let component: ParcelComponent; + let fixture: ComponentFixture; + + let mockParcelService: DeepMocked; + let mockRoute: DeepMocked; + + beforeEach(async () => { + mockParcelService = createMock(); + mockRoute = createMock(); + mockRoute.fragment = new Observable(); + + await TestBed.configureTestingModule({ + declarations: [ParcelComponent], + providers: [ + { + provide: NotificationParcelService, + useValue: mockParcelService, + }, + { + provide: ActivatedRoute, + useValue: mockRoute, + }, + ], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(ParcelComponent); + component = fixture.componentInstance; + component.parcels = []; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/alcs-frontend/src/app/features/notification/applicant-info/notification-details/parcel/parcel.component.ts b/alcs-frontend/src/app/features/notification/applicant-info/notification-details/parcel/parcel.component.ts new file mode 100644 index 0000000000..cad036abdf --- /dev/null +++ b/alcs-frontend/src/app/features/notification/applicant-info/notification-details/parcel/parcel.component.ts @@ -0,0 +1,60 @@ +import { AfterContentChecked, Component, Input, OnChanges, OnDestroy, OnInit, SimpleChanges } from '@angular/core'; +import { ActivatedRoute } from '@angular/router'; +import { Subject, takeUntil } from 'rxjs'; +import { NotificationParcelService } from '../../../../../services/notification/notification-parcel/notification-parcel.service'; +import { NotificationSubmissionDto } from '../../../../../services/notification/notification.dto'; +import { PARCEL_OWNERSHIP_TYPE } from '../../../../../shared/dto/parcel-ownership.type.dto'; + +@Component({ + selector: 'app-parcel', + templateUrl: './parcel.component.html', + styleUrls: ['./parcel.component.scss'], +}) +export class ParcelComponent implements OnInit, OnChanges, OnDestroy, AfterContentChecked { + $destroy = new Subject(); + + @Input() notificationSubmission!: NotificationSubmissionDto; + + fileId: string = ''; + parcels: any[] = []; + + PARCEL_OWNERSHIP_TYPES = PARCEL_OWNERSHIP_TYPE; + private anchoredParcelUuid: string | undefined; + + constructor(private notificationParcelService: NotificationParcelService, private route: ActivatedRoute) {} + + ngOnInit(): void { + this.route.fragment.pipe(takeUntil(this.$destroy)).subscribe((fragment) => { + if (fragment) { + this.anchoredParcelUuid = fragment; + } + }); + } + + async loadParcels(fileNumber: string) { + this.parcels = await this.notificationParcelService.fetchParcels(fileNumber); + } + + ngOnChanges(changes: SimpleChanges): void { + this.loadParcels(this.notificationSubmission.fileNumber); + } + + ngOnDestroy(): void { + this.$destroy.next(); + this.$destroy.complete(); + } + + ngAfterContentChecked(): void { + if (this.anchoredParcelUuid) { + const el = document.getElementById(this.anchoredParcelUuid); + if (el) { + this.anchoredParcelUuid = undefined; + el.scrollIntoView({ + behavior: 'smooth', + block: 'start', + inline: 'start', + }); + } + } + } +} diff --git a/alcs-frontend/src/app/features/notification/documents/document-upload-dialog/document-upload-dialog.component.html b/alcs-frontend/src/app/features/notification/documents/document-upload-dialog/document-upload-dialog.component.html new file mode 100644 index 0000000000..d12bb4f309 --- /dev/null +++ b/alcs-frontend/src/app/features/notification/documents/document-upload-dialog/document-upload-dialog.component.html @@ -0,0 +1,101 @@ +
+

{{ title }} Document

+
+
+
+
+
+ Document Upload* +
+ + +
+
+ {{ pendingFile.name }} +  ({{ pendingFile.size | filesize }}) +
+ +
+
+
+ {{ existingFile.name }} +  ({{ existingFile.size | filesize }}) +
+ +
+
+ +
+ + Document Name + + +
+ +
+ + +
+
+ + Source + + {{ source }} + + +
+
+ Visible To: +
+ Applicant, L/FNG +
+
+ Public +
+
+
+ + +
+ + + +
+ +
diff --git a/alcs-frontend/src/app/features/notification/documents/document-upload-dialog/document-upload-dialog.component.scss b/alcs-frontend/src/app/features/notification/documents/document-upload-dialog/document-upload-dialog.component.scss new file mode 100644 index 0000000000..de0c2bac88 --- /dev/null +++ b/alcs-frontend/src/app/features/notification/documents/document-upload-dialog/document-upload-dialog.component.scss @@ -0,0 +1,51 @@ +@use '../../../../../styles/colors'; + +.form { + display: grid; + grid-template-columns: 1fr 1fr; + row-gap: 32px; + column-gap: 32px; + + .double { + grid-column: 1/3; + } +} + +.full-width { + width: 100%; +} + +a { + word-break: break-all; +} + +.file { + border: 1px solid #000; + border-radius: 8px; + display: flex; + justify-content: space-between; + align-items: center; + padding: 8px; +} + +.upload-button { + margin-top: 6px !important; +} + +.spinner { + display: inline-block; + margin-right: 4px; +} + +:host::ng-deep { + .mdc-button__label { + display: flex; + align-items: center; + } +} + +.superseded-warning { + background-color: colors.$secondary-color-dark; + color: #fff; + padding: 0 4px; +} diff --git a/alcs-frontend/src/app/features/notification/documents/document-upload-dialog/document-upload-dialog.component.spec.ts b/alcs-frontend/src/app/features/notification/documents/document-upload-dialog/document-upload-dialog.component.spec.ts new file mode 100644 index 0000000000..dcacacc593 --- /dev/null +++ b/alcs-frontend/src/app/features/notification/documents/document-upload-dialog/document-upload-dialog.component.spec.ts @@ -0,0 +1,50 @@ +import { EventEmitter, NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { MAT_DIALOG_DATA, MatDialogModule, MatDialogRef } from '@angular/material/dialog'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { NoiDocumentService } from '../../../../services/notice-of-intent/noi-document/noi-document.service'; +import { NoticeOfIntentParcelService } from '../../../../services/notice-of-intent/notice-of-intent-parcel/notice-of-intent-parcel.service'; +import { NoticeOfIntentSubmissionService } from '../../../../services/notice-of-intent/notice-of-intent-submission/notice-of-intent-submission.service'; +import { NotificationDocumentService } from '../../../../services/notification/notification-document/notification-document.service'; + +import { DocumentUploadDialogComponent } from './document-upload-dialog.component'; + +describe('DocumentUploadDialogComponent', () => { + let component: DocumentUploadDialogComponent; + let fixture: ComponentFixture; + + let mockNotificationDocumentService: DeepMocked; + + beforeEach(async () => { + mockNotificationDocumentService = createMock(); + + const mockDialogRef = { + close: jest.fn(), + afterClosed: jest.fn(), + subscribe: jest.fn(), + backdropClick: () => new EventEmitter(), + }; + + await TestBed.configureTestingModule({ + declarations: [DocumentUploadDialogComponent], + providers: [ + { + provide: NotificationDocumentService, + useValue: mockNotificationDocumentService, + }, + { provide: MatDialogRef, useValue: mockDialogRef }, + { provide: MAT_DIALOG_DATA, useValue: {} }, + ], + imports: [MatDialogModule], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(DocumentUploadDialogComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/alcs-frontend/src/app/features/notification/documents/document-upload-dialog/document-upload-dialog.component.ts b/alcs-frontend/src/app/features/notification/documents/document-upload-dialog/document-upload-dialog.component.ts new file mode 100644 index 0000000000..270c409890 --- /dev/null +++ b/alcs-frontend/src/app/features/notification/documents/document-upload-dialog/document-upload-dialog.component.ts @@ -0,0 +1,170 @@ +import { Component, Inject, OnDestroy, OnInit } from '@angular/core'; +import { FormControl, FormGroup, Validators } from '@angular/forms'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; +import { Subject } from 'rxjs'; +import { UpdateNoticeOfIntentDocumentDto } from '../../../../services/notice-of-intent/noi-document/noi-document.dto'; +import { NotificationDocumentDto } from '../../../../services/notification/notification-document/notification-document.dto'; +import { NotificationDocumentService } from '../../../../services/notification/notification-document/notification-document.service'; +import { + DOCUMENT_SOURCE, + DOCUMENT_SYSTEM, + DOCUMENT_TYPE, + DocumentTypeDto, +} from '../../../../shared/document/document.dto'; + +@Component({ + selector: 'app-document-upload-dialog', + templateUrl: './document-upload-dialog.component.html', + styleUrls: ['./document-upload-dialog.component.scss'], +}) +export class DocumentUploadDialogComponent implements OnInit, OnDestroy { + $destroy = new Subject(); + DOCUMENT_TYPE = DOCUMENT_TYPE; + + title = 'Create'; + isDirty = false; + isSaving = false; + allowsFileEdit = true; + documentTypeAhead: string | undefined = undefined; + + name = new FormControl('', [Validators.required]); + type = new FormControl(undefined, [Validators.required]); + source = new FormControl('', [Validators.required]); + + visibleToInternal = new FormControl(false, [Validators.required]); + visibleToPublic = new FormControl(false, [Validators.required]); + + documentTypes: DocumentTypeDto[] = []; + documentSources = Object.values(DOCUMENT_SOURCE); + + form = new FormGroup({ + name: this.name, + type: this.type, + source: this.source, + visibleToInternal: this.visibleToInternal, + visibleToPublic: this.visibleToPublic, + }); + + pendingFile: File | undefined; + existingFile: { name: string; size: number } | undefined; + + constructor( + @Inject(MAT_DIALOG_DATA) + public data: { fileId: string; existingDocument?: NotificationDocumentDto }, + protected dialog: MatDialogRef, + private notificationDocumentService: NotificationDocumentService + ) {} + + ngOnInit(): void { + this.loadDocumentTypes(); + + if (this.data.existingDocument) { + const document = this.data.existingDocument; + this.title = 'Edit'; + this.allowsFileEdit = document.system === DOCUMENT_SYSTEM.ALCS; + + this.form.patchValue({ + name: document.fileName, + type: document.type?.code, + source: document.source, + visibleToInternal: document.visibilityFlags.includes('A'), + visibleToPublic: document.visibilityFlags.includes('P'), + }); + this.documentTypeAhead = document.type!.code; + this.existingFile = { + name: document.fileName, + size: 0, + }; + } + } + + async onSubmit() { + const visibilityFlags: ('A' | 'G' | 'P')[] = []; + + if (this.visibleToInternal.getRawValue()) { + visibilityFlags.push('A'); + visibilityFlags.push('G'); + } + + if (this.visibleToPublic.getRawValue()) { + visibilityFlags.push('P'); + } + + const dto: UpdateNoticeOfIntentDocumentDto = { + fileName: this.name.value!, + source: this.source.value as DOCUMENT_SOURCE, + typeCode: this.type.value as DOCUMENT_TYPE, + visibilityFlags, + }; + + const file = this.pendingFile; + this.isSaving = true; + if (this.data.existingDocument) { + await this.notificationDocumentService.update(this.data.existingDocument.uuid, dto); + } else if (file !== undefined) { + await this.notificationDocumentService.upload(this.data.fileId, { + ...dto, + file, + }); + } + this.dialog.close(true); + this.isSaving = false; + } + + ngOnDestroy(): void { + this.$destroy.next(); + this.$destroy.complete(); + } + + filterDocumentTypes(term: string, item: DocumentTypeDto) { + const termLower = term.toLocaleLowerCase(); + return ( + item.label.toLocaleLowerCase().indexOf(termLower) > -1 || + item.oatsCode.toLocaleLowerCase().indexOf(termLower) > -1 + ); + } + + async onDocTypeSelected($event?: DocumentTypeDto) { + if ($event) { + this.type.setValue($event.code); + } else { + this.type.setValue(undefined); + } + } + + uploadFile(event: Event) { + const element = event.target as HTMLInputElement; + const selectedFiles = element.files; + if (selectedFiles && selectedFiles[0]) { + this.pendingFile = selectedFiles[0]; + this.name.setValue(selectedFiles[0].name); + } + } + + onRemoveFile() { + this.pendingFile = undefined; + this.existingFile = undefined; + } + + openFile() { + if (this.pendingFile) { + const fileURL = URL.createObjectURL(this.pendingFile); + window.open(fileURL, '_blank'); + } + } + + async openExistingFile() { + if (this.data.existingDocument) { + await this.notificationDocumentService.download( + this.data.existingDocument.uuid, + this.data.existingDocument.fileName + ); + } + } + + private async loadDocumentTypes() { + const docTypes = await this.notificationDocumentService.fetchTypes(); + docTypes.sort((a, b) => (a.label > b.label ? 1 : -1)); + this.documentTypes = docTypes.filter((type) => type.code !== DOCUMENT_TYPE.ORIGINAL_APPLICATION); + } +} diff --git a/alcs-frontend/src/app/features/notification/documents/documents.component.html b/alcs-frontend/src/app/features/notification/documents/documents.component.html new file mode 100644 index 0000000000..e19dc4ba0a --- /dev/null +++ b/alcs-frontend/src/app/features/notification/documents/documents.component.html @@ -0,0 +1,60 @@ +
+

Documents

+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Type + {{ element.type.oatsCode }} + Document Name + {{ element.fileName }} + Source - System{{ element.source }} - {{ element.system }}Visibility + A, + C, + G, + P + Upload Date{{ element.uploadedAt | date }}Actions + + + +
No Documents
diff --git a/alcs-frontend/src/app/features/notification/documents/documents.component.scss b/alcs-frontend/src/app/features/notification/documents/documents.component.scss new file mode 100644 index 0000000000..eed82b73fa --- /dev/null +++ b/alcs-frontend/src/app/features/notification/documents/documents.component.scss @@ -0,0 +1,19 @@ +@use '../../../../styles/colors'; + +.header { + display: flex; + justify-content: space-between; +} + +.documents { + margin-top: 64px; +} + +.mat-mdc-no-data-row { + height: 56px; + color: colors.$grey-dark; +} + +a { + word-break: break-all; +} diff --git a/alcs-frontend/src/app/features/notification/documents/documents.component.spec.ts b/alcs-frontend/src/app/features/notification/documents/documents.component.spec.ts new file mode 100644 index 0000000000..71c5ade49f --- /dev/null +++ b/alcs-frontend/src/app/features/notification/documents/documents.component.spec.ts @@ -0,0 +1,59 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { MatDialog } from '@angular/material/dialog'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { BehaviorSubject } from 'rxjs'; +import { NotificationDetailService } from '../../../services/notification/notification-detail.service'; +import { NotificationDocumentService } from '../../../services/notification/notification-document/notification-document.service'; +import { NotificationDto } from '../../../services/notification/notification.dto'; +import { ToastService } from '../../../services/toast/toast.service'; + +import { NotificationDocumentsComponent } from './documents.component'; + +describe('NotificationDocumentsComponent', () => { + let component: NotificationDocumentsComponent; + let fixture: ComponentFixture; + let mockNotificationDocumentService: DeepMocked; + let mockNotificationDetailService: DeepMocked; + let mockDialog: DeepMocked; + let mockToastService: DeepMocked; + + beforeEach(async () => { + mockNotificationDocumentService = createMock(); + mockNotificationDetailService = createMock(); + mockDialog = createMock(); + mockToastService = createMock(); + mockNotificationDetailService.$notification = new BehaviorSubject(undefined); + + await TestBed.configureTestingModule({ + declarations: [NotificationDocumentsComponent], + providers: [ + { + provide: NotificationDocumentService, + useValue: mockNotificationDocumentService, + }, + { + provide: NotificationDetailService, + useValue: mockNotificationDetailService, + }, + { + provide: MatDialog, + useValue: mockDialog, + }, + { + provide: ToastService, + useValue: mockToastService, + }, + ], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(NotificationDocumentsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/alcs-frontend/src/app/features/notification/documents/documents.component.ts b/alcs-frontend/src/app/features/notification/documents/documents.component.ts new file mode 100644 index 0000000000..b4d87cfd82 --- /dev/null +++ b/alcs-frontend/src/app/features/notification/documents/documents.component.ts @@ -0,0 +1,119 @@ +import { Component, OnInit, ViewChild } from '@angular/core'; +import { MatDialog } from '@angular/material/dialog'; +import { MatSort } from '@angular/material/sort'; +import { MatTableDataSource } from '@angular/material/table'; +import { ApplicationDocumentDto } from '../../../services/application/application-document/application-document.dto'; +import { NoticeOfIntentDocumentDto } from '../../../services/notice-of-intent/noi-document/noi-document.dto'; +import { NotificationDetailService } from '../../../services/notification/notification-detail.service'; +import { NotificationDocumentDto } from '../../../services/notification/notification-document/notification-document.dto'; +import { NotificationDocumentService } from '../../../services/notification/notification-document/notification-document.service'; +import { ToastService } from '../../../services/toast/toast.service'; +import { ConfirmationDialogService } from '../../../shared/confirmation-dialog/confirmation-dialog.service'; +import { DOCUMENT_SYSTEM } from '../../../shared/document/document.dto'; +import { DocumentUploadDialogComponent } from './document-upload-dialog/document-upload-dialog.component'; + +@Component({ + selector: 'app-notification-documents', + templateUrl: './documents.component.html', + styleUrls: ['./documents.component.scss'], +}) +export class NotificationDocumentsComponent implements OnInit { + displayedColumns: string[] = ['type', 'fileName', 'source', 'visibilityFlags', 'uploadedAt', 'actions']; + documents: NotificationDocumentDto[] = []; + private fileId = ''; + + DOCUMENT_SYSTEM = DOCUMENT_SYSTEM; + + @ViewChild(MatSort) sort!: MatSort; + dataSource: MatTableDataSource = new MatTableDataSource(); + + constructor( + private notificationDocumentService: NotificationDocumentService, + private notificationDetailService: NotificationDetailService, + private confirmationDialogService: ConfirmationDialogService, + private toastService: ToastService, + public dialog: MatDialog + ) {} + + ngOnInit(): void { + this.notificationDetailService.$notification.subscribe((notification) => { + if (notification) { + this.fileId = notification.fileNumber; + this.loadDocuments(notification.fileNumber); + } + }); + } + + async onUploadFile() { + this.dialog + .open(DocumentUploadDialogComponent, { + minWidth: '600px', + maxWidth: '800px', + width: '70%', + data: { + fileId: this.fileId, + }, + }) + .beforeClosed() + .subscribe((isDirty) => { + if (isDirty) { + this.loadDocuments(this.fileId); + } + }); + } + + async openFile(uuid: string, fileName: string) { + await this.notificationDocumentService.download(uuid, fileName); + } + + async downloadFile(uuid: string, fileName: string) { + await this.notificationDocumentService.download(uuid, fileName, false); + } + + private async loadDocuments(fileNumber: string) { + this.documents = await this.notificationDocumentService.listAll(fileNumber); + this.dataSource = new MatTableDataSource(this.documents); + this.dataSource.sortingDataAccessor = (item, property) => { + switch (property) { + case 'type': + return item.type?.oatsCode; + default: // @ts-ignore Does not like using String for Key access, but that's what Angular provides + return item[property]; + } + }; + this.dataSource.sort = this.sort; + } + + onEditFile(element: NoticeOfIntentDocumentDto) { + this.dialog + .open(DocumentUploadDialogComponent, { + minWidth: '600px', + maxWidth: '800px', + width: '70%', + data: { + fileId: this.fileId, + existingDocument: element, + }, + }) + .beforeClosed() + .subscribe((isDirty: boolean) => { + if (isDirty) { + this.loadDocuments(this.fileId); + } + }); + } + + onDeleteFile(element: ApplicationDocumentDto) { + this.confirmationDialogService + .openDialog({ + body: 'Are you sure you want to delete the selected file?', + }) + .subscribe(async (accepted) => { + if (accepted) { + await this.notificationDocumentService.delete(element.uuid); + this.loadDocuments(this.fileId); + this.toastService.showSuccessToast('Document deleted'); + } + }); + } +} diff --git a/alcs-frontend/src/app/features/notification/notification.component.html b/alcs-frontend/src/app/features/notification/notification.component.html new file mode 100644 index 0000000000..ba1c2052c7 --- /dev/null +++ b/alcs-frontend/src/app/features/notification/notification.component.html @@ -0,0 +1,30 @@ +
+
+ +
+
+
+
+ {{ route.icon }} + {{ route.menuTitle }} +
+
+
+
+ +
+
+
+
diff --git a/alcs-frontend/src/app/features/notification/notification.component.scss b/alcs-frontend/src/app/features/notification/notification.component.scss new file mode 100644 index 0000000000..55dfeb4d75 --- /dev/null +++ b/alcs-frontend/src/app/features/notification/notification.component.scss @@ -0,0 +1,78 @@ +@use '../../../styles/colors'; + +.layout { + display: flex; + flex-direction: row; + height: 100%; + width: 100%; + justify-content: center; +} + +.application { + width: 100%; + display: flex; + flex-direction: column; +} + +.content { + display: flex; + flex-grow: 1; + padding-right: 80px; +} + +.child-content { + margin: 24px 0 0 48px; + flex-grow: 1; +} + +.nav { + background-color: colors.$bg-color; + min-width: 240px; + width: 240px; + height: 100%; +} + +.nav-link { + + div { + padding: 12px 24px; + border: 2px solid transparent; + } + + div.active { + font-weight: bold; + background-color: colors.$primary-color-dark; + color: colors.$white; + border-color: colors.$primary-color-dark; + + &:hover { + cursor: default; + background-color: colors.$primary-color-dark; + color: colors.$white; + } + } + + div:not(.disabled):hover { + cursor: pointer; + border-color: colors.$primary-color-dark; + color: colors.$dark-contrast-text; + } + + div.active:not(.disabled):hover { + color: colors.$white; + } +} + +.nav-item { + display: flex; + align-items: center; + white-space: pre-wrap; + + .mat-icon { + padding-right: 32px; + } + + &.disabled { + opacity: 0.5; + } +} diff --git a/alcs-frontend/src/app/features/notification/notification.component.spec.ts b/alcs-frontend/src/app/features/notification/notification.component.spec.ts new file mode 100644 index 0000000000..07af784a06 --- /dev/null +++ b/alcs-frontend/src/app/features/notification/notification.component.spec.ts @@ -0,0 +1,56 @@ +import { EventEmitter, NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { ActivatedRoute, Router } from '@angular/router'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { BehaviorSubject } from 'rxjs'; +import { NotificationDetailService } from '../../services/notification/notification-detail.service'; +import { NotificationSubmissionStatusService } from '../../services/notification/notification-submission-status/notification-submission-status.service'; +import { NotificationDto } from '../../services/notification/notification.dto'; + +import { NotificationComponent } from './notification.component'; + +describe('NotificationComponent', () => { + let component: NotificationComponent; + let fixture: ComponentFixture; + let mockNotificationDetailService: DeepMocked; + let mockNotificationStatusService: DeepMocked; + + beforeEach(async () => { + mockNotificationDetailService = createMock(); + mockNotificationDetailService.$notification = new BehaviorSubject(undefined); + mockNotificationStatusService = createMock(); + + await TestBed.configureTestingModule({ + providers: [ + { + provide: NotificationDetailService, + useValue: mockNotificationDetailService, + }, + { + provide: ActivatedRoute, + useValue: { + params: new EventEmitter(), + }, + }, + { + provide: NotificationSubmissionStatusService, + useValue: mockNotificationStatusService, + }, + { + provide: Router, + useValue: {}, + }, + ], + declarations: [NotificationComponent], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(NotificationComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/alcs-frontend/src/app/features/notification/notification.component.ts b/alcs-frontend/src/app/features/notification/notification.component.ts new file mode 100644 index 0000000000..09ee6458d1 --- /dev/null +++ b/alcs-frontend/src/app/features/notification/notification.component.ts @@ -0,0 +1,97 @@ +import { Component, OnDestroy, OnInit } from '@angular/core'; +import { Title } from '@angular/platform-browser'; +import { ActivatedRoute } from '@angular/router'; +import { Subject, takeUntil } from 'rxjs'; +import { environment } from '../../../environments/environment'; +import { NotificationDetailService } from '../../services/notification/notification-detail.service'; +import { NotificationSubmissionStatusService } from '../../services/notification/notification-submission-status/notification-submission-status.service'; +import { NotificationDto } from '../../services/notification/notification.dto'; +import { ApplicantInfoComponent } from './applicant-info/applicant-info.component'; +import { NotificationDocumentsComponent } from './documents/documents.component'; +import { OverviewComponent } from './overview/overview.component'; + +export const preSubmissionRoutes = [ + { + path: '', + menuTitle: 'Overview', + icon: 'summarize', + component: OverviewComponent, + }, + { + path: 'applicant-info', + menuTitle: 'App Preview', + icon: 'persons', + component: ApplicantInfoComponent, + portalOnly: true, + }, +]; + +export const postSubmissionRoutes = [ + { + path: '', + menuTitle: 'Overview', + icon: 'summarize', + component: OverviewComponent, + }, + { + path: 'applicant-info', + menuTitle: 'Applicant Info', + icon: 'persons', + component: ApplicantInfoComponent, + portalOnly: true, + }, + { + path: 'documents', + menuTitle: 'Documents', + icon: 'description', + component: NotificationDocumentsComponent, + }, +]; + +@Component({ + selector: 'app-notice-of-intent', + templateUrl: './notification.component.html', + styleUrls: ['./notification.component.scss'], +}) +export class NotificationComponent implements OnInit, OnDestroy { + destroy = new Subject(); + childRoutes: any[] = preSubmissionRoutes; + + fileNumber?: string; + notification: NotificationDto | undefined; + + isAuthorized = true; + + constructor( + private notificationDetailService: NotificationDetailService, + private route: ActivatedRoute, + private titleService: Title, + public notificationSubmissionStatusService: NotificationSubmissionStatusService + ) {} + + ngOnInit(): void { + this.route.params.pipe(takeUntil(this.destroy)).subscribe(async (routeParams) => { + const { fileNumber } = routeParams; + this.fileNumber = fileNumber; + this.load(); + }); + + this.notificationDetailService.$notification.pipe(takeUntil(this.destroy)).subscribe((notification) => { + if (notification) { + this.titleService.setTitle(`${environment.siteName} | ${notification.fileNumber} (${notification.applicant})`); + this.notification = notification; + this.childRoutes = !!notification.dateSubmittedToAlc ? postSubmissionRoutes : preSubmissionRoutes; + } + }); + } + + async load() { + await this.notificationDetailService.load(this.fileNumber!); + } + + ngOnDestroy(): void { + this.notificationDetailService.clear(); + this.destroy.next(); + this.destroy.complete(); + } +} diff --git a/alcs-frontend/src/app/features/notification/notification.module.ts b/alcs-frontend/src/app/features/notification/notification.module.ts new file mode 100644 index 0000000000..eaba082b24 --- /dev/null +++ b/alcs-frontend/src/app/features/notification/notification.module.ts @@ -0,0 +1,31 @@ +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from '@angular/router'; +import { NotificationDetailService } from '../../services/notification/notification-detail.service'; +import { SharedModule } from '../../shared/shared.module'; +import { ApplicantInfoComponent } from './applicant-info/applicant-info.component'; +import { NotificationDetailsModule } from './applicant-info/notification-details/notification-details.module'; +import { DocumentUploadDialogComponent } from './documents/document-upload-dialog/document-upload-dialog.component'; +import { NotificationDocumentsComponent } from './documents/documents.component'; +import { NotificationComponent, postSubmissionRoutes } from './notification.component'; +import { OverviewComponent } from './overview/overview.component'; + +const routes: Routes = [ + { + path: ':fileNumber', + component: NotificationComponent, + children: postSubmissionRoutes, + }, +]; + +@NgModule({ + providers: [NotificationDetailService], + declarations: [ + NotificationComponent, + OverviewComponent, + NotificationDocumentsComponent, + DocumentUploadDialogComponent, + ApplicantInfoComponent, + ], + imports: [SharedModule.forRoot(), RouterModule.forChild(routes), NotificationDetailsModule], +}) +export class NotificationModule {} diff --git a/alcs-frontend/src/app/features/notification/overview/overview.component.html b/alcs-frontend/src/app/features/notification/overview/overview.component.html new file mode 100644 index 0000000000..79458c669e --- /dev/null +++ b/alcs-frontend/src/app/features/notification/overview/overview.component.html @@ -0,0 +1,18 @@ +

Overview

+
+
Proposal Summary
+ +
+
+
+ +
+
+
+
Notification Event Timeline
+ +
diff --git a/alcs-frontend/src/app/features/notification/overview/overview.component.scss b/alcs-frontend/src/app/features/notification/overview/overview.component.scss new file mode 100644 index 0000000000..439e3e77c2 --- /dev/null +++ b/alcs-frontend/src/app/features/notification/overview/overview.component.scss @@ -0,0 +1,7 @@ +h5 { + margin: 16px 0 !important; +} + +section { + margin: 32px 0; +} diff --git a/alcs-frontend/src/app/features/notification/overview/overview.component.spec.ts b/alcs-frontend/src/app/features/notification/overview/overview.component.spec.ts new file mode 100644 index 0000000000..ab11080cbb --- /dev/null +++ b/alcs-frontend/src/app/features/notification/overview/overview.component.spec.ts @@ -0,0 +1,47 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { BehaviorSubject } from 'rxjs'; +import { NotificationDetailService } from '../../../services/notification/notification-detail.service'; +import { NotificationSubmissionStatusService } from '../../../services/notification/notification-submission-status/notification-submission-status.service'; +import { NotificationTimelineService } from '../../../services/notification/notification-timeline/notification-timeline.service'; +import { NotificationDto } from '../../../services/notification/notification.dto'; + +import { OverviewComponent } from './overview.component'; + +describe('OverviewComponent', () => { + let component: OverviewComponent; + let fixture: ComponentFixture; + let mockNOIDetailService: DeepMocked; + + beforeEach(async () => { + mockNOIDetailService = createMock(); + mockNOIDetailService.$notification = new BehaviorSubject(undefined); + await TestBed.configureTestingModule({ + providers: [ + { + provide: NotificationDetailService, + useValue: mockNOIDetailService, + }, + { + provide: NotificationTimelineService, + useValue: {}, + }, + { + provide: NotificationSubmissionStatusService, + useValue: {}, + }, + ], + declarations: [OverviewComponent], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(OverviewComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/alcs-frontend/src/app/features/notification/overview/overview.component.ts b/alcs-frontend/src/app/features/notification/overview/overview.component.ts new file mode 100644 index 0000000000..4a97c9ae50 --- /dev/null +++ b/alcs-frontend/src/app/features/notification/overview/overview.component.ts @@ -0,0 +1,57 @@ +import { Component, OnDestroy, OnInit } from '@angular/core'; +import { Subject, takeUntil } from 'rxjs'; +import { TimelineEventDto } from '../../../services/notice-of-intent/notice-of-intent-timeline/notice-of-intent-timeline.dto'; +import { NotificationDetailService } from '../../../services/notification/notification-detail.service'; +import { NotificationSubmissionStatusService } from '../../../services/notification/notification-submission-status/notification-submission-status.service'; +import { NotificationTimelineService } from '../../../services/notification/notification-timeline/notification-timeline.service'; +import { NOTIFICATION_STATUS, NotificationDto } from '../../../services/notification/notification.dto'; + +@Component({ + selector: 'app-overview', + templateUrl: './overview.component.html', + styleUrls: ['./overview.component.scss'], +}) +export class OverviewComponent implements OnInit, OnDestroy { + $destroy = new Subject(); + notification?: NotificationDto; + events: TimelineEventDto[] = []; + summary = ''; + isCancelled = false; + + constructor( + private notificationDetailService: NotificationDetailService, + private notificationSubmissionService: NotificationSubmissionStatusService, + private notificationTimelineService: NotificationTimelineService + ) {} + + ngOnInit(): void { + this.notificationDetailService.$notification.pipe(takeUntil(this.$destroy)).subscribe(async (notification) => { + if (notification) { + this.notification = notification; + this.events = await this.notificationTimelineService.fetchByFileNumber(notification.fileNumber); + this.loadStatusHistory(this.notification.fileNumber); + } + }); + } + + ngOnDestroy(): void { + this.$destroy.next(); + this.$destroy.complete(); + } + + async onSaveSummary(updatedSummary: string) { + if (this.notification) { + await this.notificationDetailService.update(this.notification.fileNumber, { + summary: updatedSummary ?? null, + }); + } + } + + private async loadStatusHistory(fileNumber: string) { + const statusHistory = await this.notificationSubmissionService.fetchSubmissionStatusesByFileNumber(fileNumber); + + this.isCancelled = + statusHistory.filter((status) => status.effectiveDate && status.statusTypeCode === NOTIFICATION_STATUS.CANCELLED) + .length > 0; + } +} diff --git a/alcs-frontend/src/app/services/application/application-detail.service.ts b/alcs-frontend/src/app/services/application/application-detail.service.ts index d2c52ed659..d121b4b697 100644 --- a/alcs-frontend/src/app/services/application/application-detail.service.ts +++ b/alcs-frontend/src/app/services/application/application-detail.service.ts @@ -1,6 +1,5 @@ import { Injectable } from '@angular/core'; import { BehaviorSubject } from 'rxjs'; -import { ToastService } from '../toast/toast.service'; import { ApplicationDto, UpdateApplicationDto } from './application.dto'; import { ApplicationService } from './application.service'; diff --git a/alcs-frontend/src/app/services/application/application-staff-journal/staff-journal.dto.ts b/alcs-frontend/src/app/services/application/application-staff-journal/staff-journal.dto.ts index c199598cb3..ee49144c3d 100644 --- a/alcs-frontend/src/app/services/application/application-staff-journal/staff-journal.dto.ts +++ b/alcs-frontend/src/app/services/application/application-staff-journal/staff-journal.dto.ts @@ -17,6 +17,11 @@ export interface CreateNoticeOfIntentStaffJournalDto { body: string; } +export interface CreateNotificationStaffJournalDto { + notificationUuid: string; + body: string; +} + export interface UpdateStaffJournalDto { uuid: string; body: string; diff --git a/alcs-frontend/src/app/services/application/application-staff-journal/staff-journal.service.ts b/alcs-frontend/src/app/services/application/application-staff-journal/staff-journal.service.ts index 47315d0463..b23283707d 100644 --- a/alcs-frontend/src/app/services/application/application-staff-journal/staff-journal.service.ts +++ b/alcs-frontend/src/app/services/application/application-staff-journal/staff-journal.service.ts @@ -8,6 +8,7 @@ import { CreateApplicationStaffJournalDto, UpdateStaffJournalDto, CreateNoticeOfIntentStaffJournalDto, + CreateNotificationStaffJournalDto, } from './staff-journal.dto'; @Injectable({ @@ -33,6 +34,12 @@ export class StaffJournalService { return createdNote; } + async createNoteForNotification(note: CreateNotificationStaffJournalDto) { + const createdNote = firstValueFrom(this.http.post(`${this.baseUrl}/notification`, note)); + this.toastService.showSuccessToast('Journal note created'); + return createdNote; + } + async updateNote(note: UpdateStaffJournalDto) { const updatedNote = firstValueFrom(this.http.patch(`${this.baseUrl}`, note)); this.toastService.showSuccessToast('Journal note updated'); diff --git a/alcs-frontend/src/app/services/notification/notification-detail.service.spec.ts b/alcs-frontend/src/app/services/notification/notification-detail.service.spec.ts new file mode 100644 index 0000000000..7bda936631 --- /dev/null +++ b/alcs-frontend/src/app/services/notification/notification-detail.service.spec.ts @@ -0,0 +1,61 @@ +import { TestBed } from '@angular/core/testing'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { firstValueFrom } from 'rxjs'; +import { ToastService } from '../toast/toast.service'; +import { NotificationDetailService } from './notification-detail.service'; +import { NotificationDto } from './notification.dto'; +import { NotificationService } from './notification.service'; + +describe('NotificationDetailService', () => { + let service: NotificationDetailService; + let notificationService: DeepMocked; + + beforeEach(() => { + notificationService = createMock(); + + TestBed.configureTestingModule({ + providers: [ + NotificationDetailService, + { + provide: NotificationService, + useValue: notificationService, + }, + { + provide: ToastService, + useValue: {}, + }, + ], + }); + service = TestBed.inject(NotificationDetailService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); + + it('should publish the loaded noi', async () => { + notificationService.fetchByFileNumber.mockResolvedValue({ + fileNumber: '1', + } as NotificationDto); + + await service.load('1'); + const res = await firstValueFrom(service.$notification); + + expect(notificationService.fetchByFileNumber).toHaveBeenCalledTimes(1); + expect(res).toBeDefined(); + expect(res!.fileNumber).toEqual('1'); + }); + + it('should publish the updated noi for update', async () => { + notificationService.update.mockResolvedValue({ + fileNumber: '1', + } as NotificationDto); + + await service.update('1', {}); + const res = await firstValueFrom(service.$notification); + + expect(notificationService.update).toHaveBeenCalledTimes(1); + expect(res).toBeDefined(); + expect(res!.fileNumber).toEqual('1'); + }); +}); diff --git a/alcs-frontend/src/app/services/notification/notification-detail.service.ts b/alcs-frontend/src/app/services/notification/notification-detail.service.ts new file mode 100644 index 0000000000..d6d3d398f6 --- /dev/null +++ b/alcs-frontend/src/app/services/notification/notification-detail.service.ts @@ -0,0 +1,29 @@ +import { Injectable } from '@angular/core'; +import { BehaviorSubject } from 'rxjs'; +import { NotificationDto, UpdateNotificationDto } from './notification.dto'; +import { NotificationService } from './notification.service'; + +@Injectable() +export class NotificationDetailService { + $notification = new BehaviorSubject(undefined); + + constructor(private notificationService: NotificationService) {} + + async load(fileNumber: string) { + this.clear(); + const notification = await this.notificationService.fetchByFileNumber(fileNumber); + this.$notification.next(notification); + } + + clear() { + this.$notification.next(undefined); + } + + async update(fileNumber: string, updateDto: UpdateNotificationDto) { + const updatedNotification = await this.notificationService.update(fileNumber, updateDto); + if (updatedNotification) { + this.$notification.next(updatedNotification); + } + return updatedNotification; + } +} diff --git a/alcs-frontend/src/app/services/notification/notification-document/notification-document.dto.ts b/alcs-frontend/src/app/services/notification/notification-document/notification-document.dto.ts new file mode 100644 index 0000000000..64d4cb71c1 --- /dev/null +++ b/alcs-frontend/src/app/services/notification/notification-document/notification-document.dto.ts @@ -0,0 +1,34 @@ +import { + DOCUMENT_SOURCE, + DOCUMENT_SYSTEM, + DOCUMENT_TYPE, + DocumentTypeDto, +} from '../../../shared/document/document.dto'; + +export interface NotificationDocumentDto { + uuid: string; + documentUuid: string; + type?: DocumentTypeDto; + description?: string; + visibilityFlags: string[]; + source: DOCUMENT_SOURCE; + system: DOCUMENT_SYSTEM; + fileName: string; + mimeType: string; + uploadedBy: string; + uploadedAt: number; + surveyPlanNumber: string | null; + controlNumber: string | null; +} + +export interface UpdateNotificationDocumentDto { + file?: File; + fileName: string; + typeCode: DOCUMENT_TYPE; + source: DOCUMENT_SOURCE; + visibilityFlags: ('A' | 'C' | 'G' | 'P')[]; +} + +export interface CreateNotificationDocumentDto extends UpdateNotificationDocumentDto { + file: File; +} diff --git a/alcs-frontend/src/app/services/notification/notification-document/notification-document.service.spec.ts b/alcs-frontend/src/app/services/notification/notification-document/notification-document.service.spec.ts new file mode 100644 index 0000000000..d31350dfd9 --- /dev/null +++ b/alcs-frontend/src/app/services/notification/notification-document/notification-document.service.spec.ts @@ -0,0 +1,99 @@ +import { HttpClient } from '@angular/common/http'; +import { TestBed } from '@angular/core/testing'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { of } from 'rxjs'; +import { environment } from '../../../../environments/environment'; +import { DOCUMENT_SOURCE, DOCUMENT_TYPE } from '../../../shared/document/document.dto'; +import { ToastService } from '../../toast/toast.service'; +import { NotificationDocumentService } from './notification-document.service'; + +describe('NoiDocumentService', () => { + let service: NotificationDocumentService; + let httpClient: DeepMocked; + let toastService: DeepMocked; + + beforeEach(() => { + httpClient = createMock(); + toastService = createMock(); + + TestBed.configureTestingModule({ + providers: [ + { + provide: HttpClient, + useValue: httpClient, + }, + { + provide: ToastService, + useValue: toastService, + }, + ], + }); + service = TestBed.inject(NotificationDocumentService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); + + it('should make a get call for list', async () => { + httpClient.get.mockReturnValue( + of([ + { + uuid: '1', + }, + ]) + ); + + const res = await service.listByVisibility('1', []); + + expect(httpClient.get).toHaveBeenCalledTimes(1); + expect(res.length).toEqual(1); + expect(res[0].uuid).toEqual('1'); + }); + + it('should make a delete call for delete', async () => { + httpClient.delete.mockReturnValue( + of({ + uuid: '1', + }) + ); + + const res = await service.delete('1'); + + expect(httpClient.delete).toHaveBeenCalledTimes(1); + expect(res).toBeDefined(); + expect(res.uuid).toEqual('1'); + }); + + it('should show a toast warning when uploading a file thats too large', async () => { + const file = createMock(); + Object.defineProperty(file, 'size', { value: environment.maxFileSize + 1 }); + + await service.upload('', { + file, + fileName: '', + typeCode: DOCUMENT_TYPE.AUTHORIZATION_LETTER, + source: DOCUMENT_SOURCE.APPLICANT, + visibilityFlags: [], + }); + + expect(toastService.showWarningToast).toHaveBeenCalledTimes(1); + expect(httpClient.post).toHaveBeenCalledTimes(0); + }); + + it('should make a get call for list review documents', async () => { + httpClient.get.mockReturnValue( + of([ + { + uuid: '1', + }, + ]) + ); + + const res = await service.getReviewDocuments('1'); + + expect(httpClient.get).toHaveBeenCalledTimes(1); + expect(res.length).toEqual(1); + expect(res[0].uuid).toEqual('1'); + }); +}); diff --git a/alcs-frontend/src/app/services/notification/notification-document/notification-document.service.ts b/alcs-frontend/src/app/services/notification/notification-document/notification-document.service.ts new file mode 100644 index 0000000000..a153d27d08 --- /dev/null +++ b/alcs-frontend/src/app/services/notification/notification-document/notification-document.service.ts @@ -0,0 +1,94 @@ +import { HttpClient } from '@angular/common/http'; +import { Injectable } from '@angular/core'; +import { firstValueFrom } from 'rxjs'; +import { environment } from '../../../../environments/environment'; +import { DocumentTypeDto } from '../../../shared/document/document.dto'; +import { downloadFileFromUrl, openFileInline } from '../../../shared/utils/file'; +import { verifyFileSize } from '../../../shared/utils/file-size-checker'; +import { ToastService } from '../../toast/toast.service'; +import { + CreateNotificationDocumentDto, + NotificationDocumentDto, + UpdateNotificationDocumentDto, +} from './notification-document.dto'; + +@Injectable({ + providedIn: 'root', +}) +export class NotificationDocumentService { + private url = `${environment.apiUrl}/notification-document`; + + constructor(private http: HttpClient, private toastService: ToastService) {} + + async listAll(fileNumber: string) { + return firstValueFrom(this.http.get(`${this.url}/notification/${fileNumber}`)); + } + + async listByVisibility(fileNumber: string, visibilityFlags: string[]) { + return firstValueFrom( + this.http.get(`${this.url}/notification/${fileNumber}/${visibilityFlags.join()}`) + ); + } + + async upload(fileNumber: string, createDto: CreateNotificationDocumentDto) { + const file = createDto.file; + const isValidSize = verifyFileSize(file, this.toastService); + if (!isValidSize) { + return; + } + let formData = this.convertDtoToFormData(createDto); + + const res = await firstValueFrom(this.http.post(`${this.url}/noi/${fileNumber}`, formData)); + this.toastService.showSuccessToast('Document uploaded'); + return res; + } + + async delete(uuid: string) { + return firstValueFrom(this.http.delete(`${this.url}/${uuid}`)); + } + + async download(uuid: string, fileName: string, isInline = true) { + const url = isInline ? `${this.url}/${uuid}/open` : `${this.url}/${uuid}/download`; + const data = await firstValueFrom(this.http.get<{ url: string }>(url)); + if (isInline) { + openFileInline(data.url, fileName); + } else { + downloadFileFromUrl(data.url, fileName); + } + } + + async getReviewDocuments(fileNumber: string) { + return firstValueFrom( + this.http.get(`${this.url}/notification/${fileNumber}/reviewDocuments`) + ); + } + + async getApplicantDocuments(fileNumber: string) { + return firstValueFrom( + this.http.get(`${this.url}/notification/${fileNumber}/applicantDocuments`) + ); + } + + async fetchTypes() { + return firstValueFrom(this.http.get(`${this.url}/types`)); + } + + async update(uuid: string, updateDto: UpdateNotificationDocumentDto) { + let formData = this.convertDtoToFormData(updateDto); + const res = await firstValueFrom(this.http.post(`${this.url}/${uuid}`, formData)); + this.toastService.showSuccessToast('Document uploaded'); + return res; + } + + private convertDtoToFormData(dto: UpdateNotificationDocumentDto) { + let formData: FormData = new FormData(); + formData.append('documentType', dto.typeCode); + formData.append('source', dto.source); + formData.append('visibilityFlags', dto.visibilityFlags.join(', ')); + formData.append('fileName', dto.fileName); + if (dto.file) { + formData.append('file', dto.file, dto.file.name); + } + return formData; + } +} diff --git a/alcs-frontend/src/app/services/notification/notification-parcel/notification-parcel.dto.ts b/alcs-frontend/src/app/services/notification/notification-parcel/notification-parcel.dto.ts new file mode 100644 index 0000000000..37aaa070d4 --- /dev/null +++ b/alcs-frontend/src/app/services/notification/notification-parcel/notification-parcel.dto.ts @@ -0,0 +1,9 @@ +export interface NotificationParcelDto { + uuid: string; + pid?: string | null; + pin?: string | null; + civicAddress?: string | null; + legalDescription?: string | null; + mapAreaHectares?: string | null; + ownershipTypeCode?: string | null; +} diff --git a/alcs-frontend/src/app/services/notification/notification-parcel/notification-parcel.service.spec.ts b/alcs-frontend/src/app/services/notification/notification-parcel/notification-parcel.service.spec.ts new file mode 100644 index 0000000000..cdf426feb3 --- /dev/null +++ b/alcs-frontend/src/app/services/notification/notification-parcel/notification-parcel.service.spec.ts @@ -0,0 +1,42 @@ +import { HttpClient } from '@angular/common/http'; +import { TestBed } from '@angular/core/testing'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { ToastService } from '../../toast/toast.service'; +import { of } from 'rxjs'; + +import { NotificationParcelService } from './notification-parcel.service'; + +describe('NotificationParcelService', () => { + let service: NotificationParcelService; + let mockToastService: DeepMocked; + let mockHttpClient: DeepMocked; + + beforeEach(() => { + mockToastService = createMock(); + mockHttpClient = createMock(); + + TestBed.configureTestingModule({ + providers: [ + { provide: ToastService, useValue: mockToastService }, + { + provide: HttpClient, + useValue: mockHttpClient, + }, + ], + }); + service = TestBed.inject(NotificationParcelService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); + + it('should successfully fetch parcels', async () => { + mockHttpClient.get.mockReturnValue(of([])); + + const result = await service.fetchParcels('1'); + + expect(result).toEqual([]); + expect(mockHttpClient.get).toBeCalledTimes(1); + }); +}); diff --git a/alcs-frontend/src/app/services/notification/notification-parcel/notification-parcel.service.ts b/alcs-frontend/src/app/services/notification/notification-parcel/notification-parcel.service.ts new file mode 100644 index 0000000000..d950455da2 --- /dev/null +++ b/alcs-frontend/src/app/services/notification/notification-parcel/notification-parcel.service.ts @@ -0,0 +1,24 @@ +import { HttpClient } from '@angular/common/http'; +import { Injectable } from '@angular/core'; +import { firstValueFrom } from 'rxjs'; +import { environment } from '../../../../environments/environment'; +import { ToastService } from '../../toast/toast.service'; +import { NotificationParcelDto } from './notification-parcel.dto'; + +@Injectable({ + providedIn: 'root', +}) +export class NotificationParcelService { + private baseUrl = `${environment.apiUrl}/notification-parcel`; + + constructor(private http: HttpClient, private toastService: ToastService) {} + + async fetchParcels(fileNumber: string): Promise { + try { + return firstValueFrom(this.http.get(`${this.baseUrl}/${fileNumber}`)); + } catch (e) { + this.toastService.showErrorToast('Failed to fetch Notification Parcels'); + throw e; + } + } +} diff --git a/alcs-frontend/src/app/services/notification/notification-submission-status/notification-submission-status.dto.ts b/alcs-frontend/src/app/services/notification/notification-submission-status/notification-submission-status.dto.ts new file mode 100644 index 0000000000..2c7a9c7e9c --- /dev/null +++ b/alcs-frontend/src/app/services/notification/notification-submission-status/notification-submission-status.dto.ts @@ -0,0 +1,24 @@ +import { BaseCodeDto } from '../../../shared/dto/base.dto'; +import { NOTIFICATION_STATUS } from '../notification.dto'; + +export interface NotificationSubmissionStatusDto extends BaseCodeDto { + alcsBackgroundColor: string; + alcsColor: string; + portalBackgroundColor: string; + portalColor: string; + code: NOTIFICATION_STATUS; + weight: number; +} + +export interface NotificationSubmissionToSubmissionStatusDto { + submissionUuid: string; + effectiveDate: number | null; + statusTypeCode: string; + status: NotificationSubmissionStatusDto; +} + +export const DEFAULT_NO_STATUS = { + backgroundColor: '#929292', + textColor: '#EFEFEF', + label: 'No Status', +}; diff --git a/alcs-frontend/src/app/services/notification/notification-submission-status/notification-submission-status.service.spec.ts b/alcs-frontend/src/app/services/notification/notification-submission-status/notification-submission-status.service.spec.ts new file mode 100644 index 0000000000..2f3b0bbbd5 --- /dev/null +++ b/alcs-frontend/src/app/services/notification/notification-submission-status/notification-submission-status.service.spec.ts @@ -0,0 +1,98 @@ +import { HttpClient } from '@angular/common/http'; +import { TestBed } from '@angular/core/testing'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { of, throwError } from 'rxjs'; +import { ToastService } from '../../toast/toast.service'; +import { NotificationSubmissionStatusService } from './notification-submission-status.service'; + +describe('NotificationSubmissionStatusService', () => { + let service: NotificationSubmissionStatusService; + let mockHttpClient: DeepMocked; + let mockToastService: DeepMocked; + + beforeEach(() => { + mockToastService = createMock(); + mockHttpClient = createMock(); + + TestBed.configureTestingModule({ + providers: [ + { + provide: HttpClient, + useValue: mockHttpClient, + }, + { + provide: ToastService, + useValue: mockToastService, + }, + ], + }); + service = TestBed.inject(NotificationSubmissionStatusService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); + + it('should fetch statuses by fileNumber', async () => { + mockHttpClient.get.mockReturnValue( + of([ + { + submissionUuid: 'fake', + }, + ]) + ); + + const res = await service.fetchSubmissionStatusesByFileNumber('1'); + + expect(mockHttpClient.get).toHaveBeenCalledTimes(1); + expect(res.length).toEqual(1); + expect(res[0].submissionUuid).toEqual('fake'); + }); + + it('should show a toast message if fetch statuses by fileNumber fails', async () => { + mockHttpClient.get.mockReturnValue( + throwError(() => { + new Error(''); + }) + ); + + try { + await service.fetchSubmissionStatusesByFileNumber('1'); + } catch { + // suppress error message + } + + expect(mockHttpClient.get).toHaveBeenCalledTimes(1); + expect(mockToastService.showErrorToast).toHaveBeenCalledTimes(1); + }); + + it('should fetch current status by fileNumber', async () => { + mockHttpClient.get.mockReturnValue( + of({ + submissionUuid: 'fake', + }) + ); + + const res = await service.fetchCurrentStatusByFileNumber('1'); + + expect(mockHttpClient.get).toHaveBeenCalledTimes(1); + expect(res.submissionUuid).toEqual('fake'); + }); + + it('should show a toast message if fetch current status by fileNumber fails', async () => { + mockHttpClient.get.mockReturnValue( + throwError(() => { + new Error(''); + }) + ); + + try { + await service.fetchCurrentStatusByFileNumber('1'); + } catch { + // suppress error message + } + + expect(mockHttpClient.get).toHaveBeenCalledTimes(1); + expect(mockToastService.showErrorToast).toHaveBeenCalledTimes(1); + }); +}); diff --git a/alcs-frontend/src/app/services/notification/notification-submission-status/notification-submission-status.service.ts b/alcs-frontend/src/app/services/notification/notification-submission-status/notification-submission-status.service.ts new file mode 100644 index 0000000000..73eaf438d1 --- /dev/null +++ b/alcs-frontend/src/app/services/notification/notification-submission-status/notification-submission-status.service.ts @@ -0,0 +1,45 @@ +import { HttpClient } from '@angular/common/http'; +import { Injectable } from '@angular/core'; +import { firstValueFrom } from 'rxjs'; +import { environment } from '../../../../environments/environment'; +import { ToastService } from '../../toast/toast.service'; +import { NotificationSubmissionToSubmissionStatusDto } from '../notification.dto'; + +@Injectable({ + providedIn: 'root', +}) +export class NotificationSubmissionStatusService { + private baseUrl = `${environment.apiUrl}/notification-submission-status`; + + constructor(private http: HttpClient, private toastService: ToastService) {} + + async fetchSubmissionStatusesByFileNumber( + fileNumber: string + ): Promise { + try { + return await firstValueFrom( + this.http.get(`${this.baseUrl}/${fileNumber}`) + ); + } catch (e) { + this.toastService.showErrorToast('Failed to fetch Notification Submission Statuses'); + return []; + } + } + + async fetchCurrentStatusByFileNumber( + fileNumber: string, + showErrorToast = true + ): Promise { + try { + const result = await firstValueFrom( + this.http.get(`${this.baseUrl}/current-status/${fileNumber}`) + ); + return result; + } catch (e) { + if (showErrorToast) { + this.toastService.showErrorToast('Failed to fetch Notification Submission Status'); + } + throw e; + } + } +} diff --git a/alcs-frontend/src/app/services/notification/notification-submission/notification-submission.service.spec.ts b/alcs-frontend/src/app/services/notification/notification-submission/notification-submission.service.spec.ts new file mode 100644 index 0000000000..3f11c21bff --- /dev/null +++ b/alcs-frontend/src/app/services/notification/notification-submission/notification-submission.service.spec.ts @@ -0,0 +1,73 @@ +import { HttpClient } from '@angular/common/http'; +import { TestBed } from '@angular/core/testing'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { of } from 'rxjs'; +import { ToastService } from '../../toast/toast.service'; +import { NOTIFICATION_STATUS, NotificationSubmissionDto } from '../notification.dto'; + +import { NotificationSubmissionService } from './notification-submission.service'; + +describe('NotificationSubmissionService', () => { + let service: NotificationSubmissionService; + let mockToastService: DeepMocked; + let mockHttpClient: DeepMocked; + + const mockSubmittedNOI: NotificationSubmissionDto = { + contactEmail: null, + contactFirstName: null, + contactLastName: null, + contactOrganization: null, + contactPhone: null, + lastStatusUpdate: 0, + transferees: [], + fileNumber: '', + uuid: '', + createdAt: 0, + updatedAt: 0, + applicant: '', + localGovernmentUuid: '', + type: '', + typeCode: '', + status: { + code: NOTIFICATION_STATUS.IN_PROGRESS, + portalBackgroundColor: '', + portalColor: '', + label: '', + description: '', + alcsBackgroundColor: '', + weight: 0, + alcsColor: '', + }, + canEdit: false, + canView: false, + }; + + beforeEach(() => { + mockToastService = createMock(); + mockHttpClient = createMock(); + + TestBed.configureTestingModule({ + providers: [ + { provide: ToastService, useValue: mockToastService }, + { + provide: HttpClient, + useValue: mockHttpClient, + }, + ], + }); + service = TestBed.inject(NotificationSubmissionService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); + + it('should successfully fetch noi submission', async () => { + mockHttpClient.get.mockReturnValue(of(mockSubmittedNOI)); + + const result = await service.fetchSubmission('1'); + + expect(result).toEqual(mockSubmittedNOI); + expect(mockHttpClient.get).toBeCalledTimes(1); + }); +}); diff --git a/alcs-frontend/src/app/services/notification/notification-submission/notification-submission.service.ts b/alcs-frontend/src/app/services/notification/notification-submission/notification-submission.service.ts new file mode 100644 index 0000000000..fade1b19e7 --- /dev/null +++ b/alcs-frontend/src/app/services/notification/notification-submission/notification-submission.service.ts @@ -0,0 +1,37 @@ +import { HttpClient } from '@angular/common/http'; +import { Injectable } from '@angular/core'; +import { firstValueFrom } from 'rxjs'; +import { environment } from '../../../../environments/environment'; +import { ToastService } from '../../toast/toast.service'; +import { NotificationSubmissionDetailedDto, NotificationSubmissionDto } from '../notification.dto'; + +@Injectable({ + providedIn: 'root', +}) +export class NotificationSubmissionService { + private baseUrl = `${environment.apiUrl}/notification-submission`; + + constructor(private http: HttpClient, private toastService: ToastService) {} + + async fetchSubmission(fileNumber: string): Promise { + try { + return firstValueFrom(this.http.get(`${this.baseUrl}/${fileNumber}`)); + } catch (e) { + this.toastService.showErrorToast('Failed to fetch Notification Submission'); + throw e; + } + } + + async setSubmissionStatus(fileNumber: string, statusCode: string): Promise { + try { + return firstValueFrom( + this.http.patch(`${this.baseUrl}/${fileNumber}/update-status`, { + statusCode, + }) + ); + } catch (e) { + this.toastService.showErrorToast('Failed to update Notification Submission Status'); + throw e; + } + } +} diff --git a/alcs-frontend/src/app/services/notification/notification-timeline/notification-timeline.dto.ts b/alcs-frontend/src/app/services/notification/notification-timeline/notification-timeline.dto.ts new file mode 100644 index 0000000000..cc1519a556 --- /dev/null +++ b/alcs-frontend/src/app/services/notification/notification-timeline/notification-timeline.dto.ts @@ -0,0 +1,7 @@ +export interface TimelineEventDto { + htmlText: string; + startDate: number; + fulfilledDate: number | null; + isFulfilled: boolean; + link: string | null; +} diff --git a/alcs-frontend/src/app/services/notification/notification-timeline/notification-timeline.service.spec.ts b/alcs-frontend/src/app/services/notification/notification-timeline/notification-timeline.service.spec.ts new file mode 100644 index 0000000000..e88af76e6b --- /dev/null +++ b/alcs-frontend/src/app/services/notification/notification-timeline/notification-timeline.service.spec.ts @@ -0,0 +1,45 @@ +import { HttpClient } from '@angular/common/http'; +import { TestBed } from '@angular/core/testing'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { of } from 'rxjs'; +import { ToastService } from '../../toast/toast.service'; + +import { NotificationTimelineService } from './notification-timeline.service'; + +describe('NotificationTimelineService', () => { + let service: NotificationTimelineService; + let httpClient: DeepMocked; + let toastService: DeepMocked; + + beforeEach(() => { + httpClient = createMock(); + toastService = createMock(); + + TestBed.configureTestingModule({ + providers: [ + { + provide: HttpClient, + useValue: httpClient, + }, + { + provide: ToastService, + useValue: toastService, + }, + ], + }); + service = TestBed.inject(NotificationTimelineService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); + + it('should call get to fetch timeline events', async () => { + httpClient.get.mockReturnValue(of([])); + + const res = await service.fetchByFileNumber('1'); + + expect(httpClient.get).toHaveBeenCalledTimes(1); + expect(res.length).toEqual(0); + }); +}); diff --git a/alcs-frontend/src/app/services/notification/notification-timeline/notification-timeline.service.ts b/alcs-frontend/src/app/services/notification/notification-timeline/notification-timeline.service.ts new file mode 100644 index 0000000000..da624225d4 --- /dev/null +++ b/alcs-frontend/src/app/services/notification/notification-timeline/notification-timeline.service.ts @@ -0,0 +1,25 @@ +import { HttpClient } from '@angular/common/http'; +import { Injectable } from '@angular/core'; +import { firstValueFrom } from 'rxjs'; +import { environment } from '../../../../environments/environment'; +import { ToastService } from '../../toast/toast.service'; +import { TimelineEventDto } from './notification-timeline.dto'; + +@Injectable({ + providedIn: 'root', +}) +export class NotificationTimelineService { + private url = `${environment.apiUrl}/notification-timeline`; + + constructor(private http: HttpClient, private toastService: ToastService) {} + + async fetchByFileNumber(fileNumber: string) { + try { + return await firstValueFrom(this.http.get(`${this.url}/${fileNumber}`)); + } catch (err) { + console.error(err); + this.toastService.showErrorToast('Failed to fetch timeline events'); + } + return []; + } +} diff --git a/alcs-frontend/src/app/services/notification/notification.dto.ts b/alcs-frontend/src/app/services/notification/notification.dto.ts new file mode 100644 index 0000000000..0c21da24e5 --- /dev/null +++ b/alcs-frontend/src/app/services/notification/notification.dto.ts @@ -0,0 +1,104 @@ +import { BaseCodeDto } from '../../shared/dto/base.dto'; +import { LocalGovernmentDto } from '../admin-local-government/admin-local-government.dto'; +import { ApplicationRegionDto } from '../application/application-code.dto'; +import { CardDto } from '../card/card.dto'; + +export interface NotificationDto { + uuid: string; + fileNumber: string; + applicant: string; + card: CardDto; + dateSubmittedToAlc?: number; + localGovernment: LocalGovernmentDto; + region: ApplicationRegionDto; + summary?: string; + type: NotificationTypeDto; + staffObservations?: string; + proposalEndDate?: number; +} + +export enum NOTIFICATION_STATUS { + IN_PROGRESS = 'PROG', + SUBMITTED_TO_ALC = 'SUBM', //Submitted to ALC + ALC_RESPONSE = 'ALCR', // Response sent + CANCELLED = 'CANC', +} + +export interface UpdateNotificationDto { + dateSubmittedToAlc?: number; + localGovernmentUuid?: string; + summary?: string; + staffObservations?: string; + proposalEndDate?: number; +} + +export interface NotificationTypeDto extends BaseCodeDto { + shortLabel: string; + backgroundColor: string; + textColor: string; +} + +export interface NotificationSubmissionStatusDto extends BaseCodeDto { + code: NOTIFICATION_STATUS; + alcsBackgroundColor: string; + alcsColor: string; + portalBackgroundColor: string; + portalColor: string; + weight: number; +} + +export interface NotificationSubmissionToSubmissionStatusDto { + submissionUuid: string; + effectiveDate: number | null; + statusTypeCode: string; + status: NotificationSubmissionStatusDto; +} + +export interface NotificationSubmissionDto { + fileNumber: string; + uuid: string; + createdAt: number; + updatedAt: number; + applicant: string; + localGovernmentUuid: string; + type: string; + typeCode: string; + status: NotificationSubmissionStatusDto; + lastStatusUpdate: number; + transferees: NotificationTransfereeDto[]; + canEdit: boolean; + canView: boolean; + contactFirstName: string | null; + contactLastName: string | null; + contactOrganization: string | null; + contactPhone: string | null; + contactEmail: string | null; +} + +export interface NotificationSubmissionDetailedDto extends NotificationSubmissionDto { + purpose: string | null; + submittersFileNumber: string | null; + totalArea: number | null; + hasSurveyPlan: boolean | null; +} + +export interface NotificationTransfereeDto { + uuid: string; + notificationSubmissionUuid: string; + displayName: string; + firstName: string | null; + lastName: string | null; + organizationName: string | null; + phoneNumber: string | null; + email: string | null; + type: OwnerTypeDto; +} + +export enum OWNER_TYPE { + INDIVIDUAL = 'INDV', + ORGANIZATION = 'ORGZ', +} + +export interface OwnerTypeDto extends BaseCodeDto { + code: OWNER_TYPE; +} diff --git a/alcs-frontend/src/app/services/notification/notification.service.spec.ts b/alcs-frontend/src/app/services/notification/notification.service.spec.ts new file mode 100644 index 0000000000..6905860aaf --- /dev/null +++ b/alcs-frontend/src/app/services/notification/notification.service.spec.ts @@ -0,0 +1,63 @@ +import { HttpClient } from '@angular/common/http'; +import { TestBed } from '@angular/core/testing'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { of, throwError } from 'rxjs'; +import { ToastService } from '../toast/toast.service'; + +import { NotificationService } from './notification.service'; + +describe('NotificationService', () => { + let service: NotificationService; + let httpClient: DeepMocked; + let toastService: DeepMocked; + + beforeEach(() => { + httpClient = createMock(); + toastService = createMock(); + + TestBed.configureTestingModule({ + providers: [ + { + provide: HttpClient, + useValue: httpClient, + }, + { + provide: ToastService, + useValue: toastService, + }, + ], + }); + service = TestBed.inject(NotificationService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); + + it('should fetch by card', async () => { + httpClient.get.mockReturnValue( + of({ + fileNumber: '1', + }) + ); + + const res = await service.fetchByCardUuid('1'); + + expect(httpClient.get).toHaveBeenCalledTimes(1); + expect(res).toBeDefined(); + expect(res!.fileNumber).toEqual('1'); + }); + + it('should show an error toast message if fetch by card fails', async () => { + httpClient.get.mockReturnValue( + throwError(() => { + new Error(''); + }) + ); + + await service.fetchByCardUuid('1'); + + expect(httpClient.get).toHaveBeenCalledTimes(1); + expect(toastService.showErrorToast).toHaveBeenCalledTimes(1); + }); +}); diff --git a/alcs-frontend/src/app/services/notification/notification.service.ts b/alcs-frontend/src/app/services/notification/notification.service.ts new file mode 100644 index 0000000000..3dd2a8572d --- /dev/null +++ b/alcs-frontend/src/app/services/notification/notification.service.ts @@ -0,0 +1,55 @@ +import { HttpClient } from '@angular/common/http'; +import { Injectable } from '@angular/core'; +import { firstValueFrom } from 'rxjs'; +import { environment } from '../../../environments/environment'; +import { ToastService } from '../toast/toast.service'; +import { NotificationDto, UpdateNotificationDto } from './notification.dto'; + +@Injectable({ + providedIn: 'root', +}) +export class NotificationService { + private url = `${environment.apiUrl}/notification`; + + constructor(private http: HttpClient, private toastService: ToastService) {} + + async fetchByCardUuid(id: string) { + try { + return await firstValueFrom(this.http.get(`${this.url}/card/${id}`)); + } catch (e) { + console.error(e); + this.toastService.showErrorToast('Failed to fetch Notification'); + } + return; + } + + async fetchByFileNumber(fileNumber: string) { + try { + return await firstValueFrom(this.http.get(`${this.url}/${fileNumber}`)); + } catch (e) { + console.error(e); + this.toastService.showErrorToast('Failed to fetch Notification'); + } + return; + } + + async update(fileNumber: string, updateDto: UpdateNotificationDto) { + try { + return await firstValueFrom(this.http.post(`${this.url}/${fileNumber}`, updateDto)); + } catch (e) { + console.error(e); + this.toastService.showErrorToast('Failed to create Notification'); + return undefined; + } + } + + async searchByFileNumber(searchText: string) { + try { + return await firstValueFrom(this.http.get(`${this.url}/search/${searchText}`)); + } catch (e) { + console.error(e); + this.toastService.showErrorToast('Failed to search Notifications'); + } + return []; + } +} diff --git a/alcs-frontend/src/app/shared/card/card.component.ts b/alcs-frontend/src/app/shared/card/card.component.ts index 3779913ce1..92f84aa816 100644 --- a/alcs-frontend/src/app/shared/card/card.component.ts +++ b/alcs-frontend/src/app/shared/card/card.component.ts @@ -40,6 +40,7 @@ export enum CardType { COV = 'COV', NOI = 'NOI', NOI_MODI = 'NOIM', + NOTIFICATION = 'NOTI', } const lineHeight = 24; diff --git a/alcs-frontend/src/app/shared/details-header/details-header.component.html b/alcs-frontend/src/app/shared/details-header/details-header.component.html index c1880bd6a1..ca309cbb5d 100644 --- a/alcs-frontend/src/app/shared/details-header/details-header.component.html +++ b/alcs-frontend/src/app/shared/details-header/details-header.component.html @@ -47,7 +47,7 @@
{{ _application.fileNumber }} ({{ _application.applicant }})
- +
{{ days }}:
 diff --git a/alcs-frontend/src/app/shared/details-header/details-header.component.ts b/alcs-frontend/src/app/shared/details-header/details-header.component.ts index 7880383436..c202a49a5c 100644 --- a/alcs-frontend/src/app/shared/details-header/details-header.component.ts +++ b/alcs-frontend/src/app/shared/details-header/details-header.component.ts @@ -11,6 +11,8 @@ import { CardDto } from '../../services/card/card.dto'; import { CommissionerApplicationDto } from '../../services/commissioner/commissioner.dto'; import { NoticeOfIntentModificationDto } from '../../services/notice-of-intent/notice-of-intent-modification/notice-of-intent-modification.dto'; import { NoticeOfIntentDto } from '../../services/notice-of-intent/notice-of-intent.dto'; +import { NotificationSubmissionStatusService } from '../../services/notification/notification-submission-status/notification-submission-status.service'; +import { NotificationDto } from '../../services/notification/notification.dto'; import { ApplicationSubmissionStatusPill } from '../application-submission-status-type-pill/application-submission-status-type-pill.component'; import { MODIFICATION_TYPE_LABEL, @@ -31,13 +33,18 @@ export class DetailsHeaderComponent { @Input() types: ApplicationTypeDto[] = []; @Input() days = 'Calendar Days'; @Input() showStatus = false; - @Input() submissionStatusService?: ApplicationSubmissionStatusService | NoticeOfIntentSubmissionStatusService; + @Input() submissionStatusService?: + | ApplicationSubmissionStatusService + | NoticeOfIntentSubmissionStatusService + | NotificationSubmissionStatusService; legacyId?: string; - _application: ApplicationDto | CommissionerApplicationDto | NoticeOfIntentDto | undefined; + _application: ApplicationDto | CommissionerApplicationDto | NoticeOfIntentDto | NotificationDto | undefined; - @Input() set application(application: ApplicationDto | CommissionerApplicationDto | NoticeOfIntentDto | undefined) { + @Input() set application( + application: ApplicationDto | CommissionerApplicationDto | NoticeOfIntentDto | NotificationDto | undefined + ) { if (application) { this._application = application; @@ -45,6 +52,10 @@ export class DetailsHeaderComponent { this.isNOI = true; } + if ('pausedDays' in application) { + this.isTimeTrackable = true; + } + if ('type' in application) { this.types = [application.type]; } @@ -105,6 +116,7 @@ export class DetailsHeaderComponent { showRetroLabel = false; linkedCards: (CardDto & { displayName: string })[] = []; isNOI = false; + isTimeTrackable = false; currentStatus?: ApplicationSubmissionStatusPill; constructor(private router: Router) {} diff --git a/alcs-frontend/src/app/shared/document/document.dto.ts b/alcs-frontend/src/app/shared/document/document.dto.ts index e177053562..ed87359c31 100644 --- a/alcs-frontend/src/app/shared/document/document.dto.ts +++ b/alcs-frontend/src/app/shared/document/document.dto.ts @@ -30,6 +30,10 @@ export enum DOCUMENT_TYPE { // NOI Documents BUILDING_PLAN = 'BLDP', + + //SRW + SRW_TERMS = 'SRTD', + SURVEY_PLAN = 'SURV', } export enum DOCUMENT_SOURCE { diff --git a/alcs-frontend/src/app/shared/header/search-bar/search-bar.component.ts b/alcs-frontend/src/app/shared/header/search-bar/search-bar.component.ts index 6da7767275..b2c798c1ee 100644 --- a/alcs-frontend/src/app/shared/header/search-bar/search-bar.component.ts +++ b/alcs-frontend/src/app/shared/header/search-bar/search-bar.component.ts @@ -60,6 +60,10 @@ export class SearchBarComponent { case 'NOI': await this.router.navigate(['notice-of-intent', result.referenceId]); break; + case 'NOTI': + await this.router.navigate(['notification', result.referenceId]); + debugger; + break; case 'COV': case 'PLAN': await this.router.navigateByUrl( diff --git a/alcs-frontend/src/app/shared/staff-journal/staff-journal.component.ts b/alcs-frontend/src/app/shared/staff-journal/staff-journal.component.ts index ab5e645745..a1e52d7651 100644 --- a/alcs-frontend/src/app/shared/staff-journal/staff-journal.component.ts +++ b/alcs-frontend/src/app/shared/staff-journal/staff-journal.component.ts @@ -14,7 +14,7 @@ import { ConfirmationDialogService } from '../confirmation-dialog/confirmation-d }) export class StaffJournalComponent implements OnChanges { @Input() parentUuid: string = ''; - @Input() parentType: 'Application' | 'NOI' = 'Application'; + @Input() parentType: 'Application' | 'NOI' | 'Notification' = 'Application'; labelText = 'Add a journal note'; @@ -63,6 +63,11 @@ export class StaffJournalComponent implements OnChanges { applicationUuid: this.parentUuid, body: note, }); + } else if (this.parentType === 'Notification') { + await this.staffJournalService.createNoteForNotification({ + notificationUuid: this.parentUuid, + body: note, + }); } else { await this.staffJournalService.createNoteForNoticeOfIntent({ noticeOfIntentUuid: this.parentUuid, diff --git a/alcs-frontend/src/app/shared/time-tracker/time-tracker.component.ts b/alcs-frontend/src/app/shared/time-tracker/time-tracker.component.ts index 9d8e38f169..f6042b0326 100644 --- a/alcs-frontend/src/app/shared/time-tracker/time-tracker.component.ts +++ b/alcs-frontend/src/app/shared/time-tracker/time-tracker.component.ts @@ -23,7 +23,7 @@ export class TimeTrackerComponent implements OnChanges { dueDate: Date | null = null; isOverdue = false; - @Input() data: TimeTrackable | undefined; + @Input() data: TimeTrackable | any | undefined; @Input() maxActiveDays: number | undefined; constructor() {} diff --git a/portal-frontend/src/app/features/notifications/notification-details/notification-details.component.html b/portal-frontend/src/app/features/notifications/notification-details/notification-details.component.html index 22ffb74cb1..b5626f2247 100644 --- a/portal-frontend/src/app/features/notifications/notification-details/notification-details.component.html +++ b/portal-frontend/src/app/features/notifications/notification-details/notification-details.component.html @@ -5,6 +5,31 @@ [showEdit]="showEdit" > +

2. Identify Transferees

+
+
+
Type
+
Full Name
+
Organization
+
Phone
+
Email
+ +
{{ transferee.type.label }}
+
{{ transferee.displayName }}
+
+ {{ transferee.organizationName }} + +
+
+ {{ transferee.phoneNumber | mask : '(000) 000-0000' }} +
+
{{ transferee.displayName }}
+ +
+
+ +
+

3. Primary Contact

diff --git a/portal-frontend/src/app/features/notifications/notification-details/notification-details.component.scss b/portal-frontend/src/app/features/notifications/notification-details/notification-details.component.scss index 7ef4dbb6b8..1c22c1aca0 100644 --- a/portal-frontend/src/app/features/notifications/notification-details/notification-details.component.scss +++ b/portal-frontend/src/app/features/notifications/notification-details/notification-details.component.scss @@ -78,16 +78,12 @@ } } - .adjacent-parcels { + .transferee-table { display: grid; - grid-template-columns: max-content max-content max-content; + grid-template-columns: max-content max-content max-content max-content max-content; overflow-x: auto; grid-column-gap: rem(36); grid-row-gap: rem(12); - - .full-width { - grid-column: 1/4; - } } .review-table { diff --git a/portal-frontend/src/app/services/notification-submission/notification-submission.dto.ts b/portal-frontend/src/app/services/notification-submission/notification-submission.dto.ts index f0507ee88b..a094f285a3 100644 --- a/portal-frontend/src/app/services/notification-submission/notification-submission.dto.ts +++ b/portal-frontend/src/app/services/notification-submission/notification-submission.dto.ts @@ -32,7 +32,7 @@ export interface NotificationSubmissionDto { typeCode: string; status: NotificationSubmissionStatusDto; lastStatusUpdate: number; - owners: NotificationTransfereeDto[]; + transferees: NotificationTransfereeDto[]; canEdit: boolean; canView: boolean; contactFirstName: string | null; diff --git a/services/apps/alcs/src/alcs/alcs.module.ts b/services/apps/alcs/src/alcs/alcs.module.ts index 29bbc475a5..eda56204d1 100644 --- a/services/apps/alcs/src/alcs/alcs.module.ts +++ b/services/apps/alcs/src/alcs/alcs.module.ts @@ -19,6 +19,8 @@ import { NoticeOfIntentTimelineModule } from './notice-of-intent/notice-of-inten import { NoticeOfIntentSubmissionStatusModule } from './notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.module'; import { NoticeOfIntentModule } from './notice-of-intent/notice-of-intent.module'; import { MessageModule } from './message/message.module'; +import { NotificationSubmissionStatusModule } from './notification/notification-submission-status/notification-submission-status.module'; +import { NotificationTimelineModule } from './notification/notification-timeline/notification-timeline.module'; import { NotificationModule } from './notification/notification.module'; import { PlanningReviewModule } from './planning-review/planning-review.module'; import { SearchModule } from './search/search.module'; @@ -47,6 +49,7 @@ import { StaffJournalModule } from './staff-journal/staff-journal.module'; SearchModule, LocalGovernmentModule, NotificationModule, + NotificationTimelineModule, RouterModule.register([ { path: 'alcs', module: ApplicationModule }, { path: 'alcs', module: CommentModule }, @@ -70,6 +73,8 @@ import { StaffJournalModule } from './staff-journal/staff-journal.module'; { path: 'alcs', module: ApplicationTimelineModule }, { path: 'alcs', module: NoticeOfIntentTimelineModule }, { path: 'alcs', module: NotificationModule }, + { path: 'alcs', module: NotificationSubmissionStatusModule }, + { path: 'alcs', module: NotificationTimelineModule }, ]), ], controllers: [], diff --git a/services/apps/alcs/src/alcs/card/card-type/card-type.entity.ts b/services/apps/alcs/src/alcs/card/card-type/card-type.entity.ts index 65de22b067..ca7a9535bd 100644 --- a/services/apps/alcs/src/alcs/card/card-type/card-type.entity.ts +++ b/services/apps/alcs/src/alcs/card/card-type/card-type.entity.ts @@ -10,6 +10,7 @@ export enum CARD_TYPE { COV = 'COV', NOI = 'NOI', NOI_MODI = 'NOIM', + NOTIFICATION = 'NOTI', } @Entity() diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission/notice-of-intent-submission.controller.spec.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission/notice-of-intent-submission.controller.spec.ts index 04da3b69a3..4efc6509b7 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission/notice-of-intent-submission.controller.spec.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission/notice-of-intent-submission.controller.spec.ts @@ -47,7 +47,7 @@ describe('NoticeOfIntentSubmissionController', () => { expect(controller).toBeDefined(); }); - it('should call NoticeOfIntentSubmissionService to get Notice of Intent Submission', async () => { + it('should call NotificationSubmissionService to get Notice of Intent Submission', async () => { const fakeFileNumber = 'fake'; mockNoticeOfIntentSubmissionService.get.mockResolvedValue({ diff --git a/services/apps/alcs/src/alcs/notification/notification-document/notification-document.controller.spec.ts b/services/apps/alcs/src/alcs/notification/notification-document/notification-document.controller.spec.ts index 99172858f8..2636b080f8 100644 --- a/services/apps/alcs/src/alcs/notification/notification-document/notification-document.controller.spec.ts +++ b/services/apps/alcs/src/alcs/notification/notification-document/notification-document.controller.spec.ts @@ -178,12 +178,4 @@ describe('NotificationDocumentController', () => { notificationDocumentService.getApplicantDocuments, ).toHaveBeenCalledTimes(1); }); - - it('should call through for list review documents', async () => { - notificationDocumentService.list.mockResolvedValue([]); - - const res = await controller.listReviewDocuments(''); - - expect(notificationDocumentService.list).toHaveBeenCalledTimes(1); - }); }); diff --git a/services/apps/alcs/src/alcs/notification/notification-document/notification-document.controller.ts b/services/apps/alcs/src/alcs/notification/notification-document/notification-document.controller.ts index c7633e4fcd..1438b948f0 100644 --- a/services/apps/alcs/src/alcs/notification/notification-document/notification-document.controller.ts +++ b/services/apps/alcs/src/alcs/notification/notification-document/notification-document.controller.ts @@ -105,23 +105,6 @@ export class NotificationDocumentController { ); } - @Get('/notification/:fileNumber/reviewDocuments') - @UserRoles(...ANY_AUTH_ROLE) - async listReviewDocuments( - @Param('fileNumber') fileNumber: string, - ): Promise { - const documents = await this.notificationDocumentService.list(fileNumber); - const reviewDocuments = documents.filter( - (doc) => doc.document.source === DOCUMENT_SOURCE.LFNG, - ); - - return this.mapper.mapArray( - reviewDocuments, - NotificationDocument, - NotificationDocumentDto, - ); - } - @Get('/notification/:fileNumber/applicantDocuments') @UserRoles(...ANY_AUTH_ROLE) async listApplicantDocuments( diff --git a/services/apps/alcs/src/alcs/notification/notification-document/notification-document.service.ts b/services/apps/alcs/src/alcs/notification/notification-document/notification-document.service.ts index 8fe160e506..5266b19f00 100644 --- a/services/apps/alcs/src/alcs/notification/notification-document/notification-document.service.ts +++ b/services/apps/alcs/src/alcs/notification/notification-document/notification-document.service.ts @@ -84,52 +84,6 @@ export class NotificationDocumentService { return this.notificationDocumentRepository.save(appDocument); } - async attachDocumentAsBuffer({ - fileNumber, - fileName, - file, - mimeType, - fileSize, - documentType, - user, - system, - source = DOCUMENT_SOURCE.ALC, - visibilityFlags, - }: { - fileNumber: string; - fileName: string; - file: Buffer; - mimeType: string; - fileSize: number; - user: User; - documentType: DOCUMENT_TYPE; - source?: DOCUMENT_SOURCE; - system: DOCUMENT_SYSTEM; - visibilityFlags: VISIBILITY_FLAG[]; - }) { - const notification = await this.notificationService.getByFileNumber( - fileNumber, - ); - const document = await this.documentService.createFromBuffer( - `notification/${fileNumber}`, - fileName, - file, - mimeType, - fileSize, - user, - source, - system, - ); - const appDocument = new NotificationDocument({ - typeCode: documentType, - notification, - document, - visibilityFlags, - }); - - return this.notificationDocumentRepository.save(appDocument); - } - async get(uuid: string) { const document = await this.notificationDocumentRepository.findOne({ where: { diff --git a/services/apps/alcs/src/alcs/notification/notification-parcel/notification-parcel.controller.spec.ts b/services/apps/alcs/src/alcs/notification/notification-parcel/notification-parcel.controller.spec.ts new file mode 100644 index 0000000000..e8f8e46dff --- /dev/null +++ b/services/apps/alcs/src/alcs/notification/notification-parcel/notification-parcel.controller.spec.ts @@ -0,0 +1,52 @@ +import { classes } from '@automapper/classes'; +import { AutomapperModule } from '@automapper/nestjs'; +import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; +import { Test, TestingModule } from '@nestjs/testing'; +import { ClsService } from 'nestjs-cls'; +import { mockKeyCloakProviders } from '../../../../test/mocks/mockTypes'; +import { NotificationParcelService } from '../../../portal/notification-submission/notification-parcel/notification-parcel.service'; +import { NotificationParcelController } from './notification-parcel.controller'; + +describe('NotificationParcelController', () => { + let controller: NotificationParcelController; + let mockParcelService: DeepMocked; + + beforeEach(async () => { + mockParcelService = createMock(); + + const module: TestingModule = await Test.createTestingModule({ + imports: [ + AutomapperModule.forRoot({ + strategyInitializer: classes(), + }), + ], + controllers: [NotificationParcelController], + providers: [ + { + provide: NotificationParcelService, + useValue: mockParcelService, + }, + { + provide: ClsService, + useValue: {}, + }, + ...mockKeyCloakProviders, + ], + }).compile(); + + controller = module.get( + NotificationParcelController, + ); + }); + + it('should be defined', () => { + expect(controller).toBeDefined(); + }); + + it('should call through to service for get', async () => { + mockParcelService.fetchByFileId.mockResolvedValue([]); + + await controller.get(''); + expect(mockParcelService.fetchByFileId).toHaveBeenCalledTimes(1); + }); +}); diff --git a/services/apps/alcs/src/alcs/notification/notification-parcel/notification-parcel.controller.ts b/services/apps/alcs/src/alcs/notification/notification-parcel/notification-parcel.controller.ts new file mode 100644 index 0000000000..f66ab48722 --- /dev/null +++ b/services/apps/alcs/src/alcs/notification/notification-parcel/notification-parcel.controller.ts @@ -0,0 +1,30 @@ +import { Mapper } from '@automapper/core'; +import { InjectMapper } from '@automapper/nestjs'; +import { Controller, Get, Param } from '@nestjs/common'; +import { ANY_AUTH_ROLE } from '../../../common/authorization/roles'; +import { UserRoles } from '../../../common/authorization/roles.decorator'; +import { NotificationParcelDto } from '../../../portal/notification-submission/notification-parcel/notification-parcel.dto'; +import { NotificationParcel } from '../../../portal/notification-submission/notification-parcel/notification-parcel.entity'; +import { NotificationParcelService } from '../../../portal/notification-submission/notification-parcel/notification-parcel.service'; + +@Controller('notification-parcel') +export class NotificationParcelController { + constructor( + private notificationParcelService: NotificationParcelService, + @InjectMapper() private mapper: Mapper, + ) {} + + @UserRoles(...ANY_AUTH_ROLE) + @Get('/:fileNumber') + async get(@Param('fileNumber') fileNumber: string) { + const parcels = await this.notificationParcelService.fetchByFileId( + fileNumber, + ); + + return this.mapper.mapArray( + parcels, + NotificationParcel, + NotificationParcelDto, + ); + } +} diff --git a/services/apps/alcs/src/alcs/notification/notification-submission-status/notification-submission-status.module.ts b/services/apps/alcs/src/alcs/notification/notification-submission-status/notification-submission-status.module.ts index d90a36722a..11243856cb 100644 --- a/services/apps/alcs/src/alcs/notification/notification-submission-status/notification-submission-status.module.ts +++ b/services/apps/alcs/src/alcs/notification/notification-submission-status/notification-submission-status.module.ts @@ -1,5 +1,6 @@ import { Module } from '@nestjs/common'; import { TypeOrmModule } from '@nestjs/typeorm'; +import { NotificationSubmissionProfile } from '../../../common/automapper/notification-submission.automapper.profile'; import { NotificationSubmission } from '../../../portal/notification-submission/notification-submission.entity'; import { NotificationSubmissionStatusType } from './notification-status-type.entity'; import { NotificationSubmissionToSubmissionStatus } from './notification-status.entity'; @@ -14,7 +15,10 @@ import { NotificationSubmissionStatusService } from './notification-submission-s NotificationSubmission, ]), ], - providers: [NotificationSubmissionStatusService], + providers: [ + NotificationSubmissionStatusService, + NotificationSubmissionProfile, + ], exports: [NotificationSubmissionStatusService], controllers: [NotificationSubmissionStatusController], }) diff --git a/services/apps/alcs/src/alcs/notification/notification-submission/notification-submission.controller.spec.ts b/services/apps/alcs/src/alcs/notification/notification-submission/notification-submission.controller.spec.ts new file mode 100644 index 0000000000..dd5a09e2de --- /dev/null +++ b/services/apps/alcs/src/alcs/notification/notification-submission/notification-submission.controller.spec.ts @@ -0,0 +1,87 @@ +import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; +import { Test, TestingModule } from '@nestjs/testing'; +import { ClsService } from 'nestjs-cls'; +import { mockKeyCloakProviders } from '../../../../test/mocks/mockTypes'; +import { Document } from '../../../document/document.entity'; +import { DocumentService } from '../../../document/document.service'; +import { NotificationSubmissionDetailedDto } from '../../../portal/notification-submission/notification-submission.dto'; +import { NotificationSubmission } from '../../../portal/notification-submission/notification-submission.entity'; +import { NotificationSubmissionController } from './notification-submission.controller'; +import { NotificationSubmissionService } from './notification-submission.service'; + +describe('NotificationSubmissionController', () => { + let controller: NotificationSubmissionController; + + let mockNotificationSubmissionService: DeepMocked; + let mockDocumentService: DeepMocked; + + beforeEach(async () => { + mockNotificationSubmissionService = createMock(); + mockDocumentService = createMock(); + + const module: TestingModule = await Test.createTestingModule({ + controllers: [NotificationSubmissionController], + providers: [ + { + provide: NotificationSubmissionService, + useValue: mockNotificationSubmissionService, + }, + { + provide: DocumentService, + useValue: mockDocumentService, + }, + { + provide: ClsService, + useValue: {}, + }, + ...mockKeyCloakProviders, + ], + }).compile(); + + controller = module.get( + NotificationSubmissionController, + ); + }); + + it('should be defined', () => { + expect(controller).toBeDefined(); + }); + + it('should call NotificationSubmissionService to get Notice of Intent Submission', async () => { + const fakeFileNumber = 'fake'; + + mockNotificationSubmissionService.get.mockResolvedValue( + new NotificationSubmission({ + fileNumber: fakeFileNumber, + }), + ); + mockNotificationSubmissionService.mapToDto.mockResolvedValue( + createMock(), + ); + + const result = await controller.get(fakeFileNumber); + + expect(mockNotificationSubmissionService.get).toBeCalledTimes(1); + expect(mockNotificationSubmissionService.mapToDto).toBeCalledTimes(1); + expect(result).toBeDefined(); + }); + + it('should call documentService to get inline download url Submission', async () => { + const fakeDownloadUrl = 'fake_download'; + const fakeUuid = 'fake'; + + mockDocumentService.getDocument.mockResolvedValue({} as Document); + mockDocumentService.getDownloadUrl.mockResolvedValue(fakeDownloadUrl); + + const result = await controller.downloadFile(fakeUuid); + + expect(mockDocumentService.getDocument).toBeCalledTimes(1); + expect(mockDocumentService.getDownloadUrl).toBeCalledTimes(1); + expect(mockDocumentService.getDocument).toBeCalledWith(fakeUuid); + expect(mockDocumentService.getDownloadUrl).toBeCalledWith( + {} as Document, + true, + ); + expect(result).toEqual({ url: fakeDownloadUrl }); + }); +}); diff --git a/services/apps/alcs/src/alcs/notification/notification-submission/notification-submission.controller.ts b/services/apps/alcs/src/alcs/notification/notification-submission/notification-submission.controller.ts new file mode 100644 index 0000000000..00670490dd --- /dev/null +++ b/services/apps/alcs/src/alcs/notification/notification-submission/notification-submission.controller.ts @@ -0,0 +1,52 @@ +import { Body, Controller, Get, Param, Patch, UseGuards } from '@nestjs/common'; +import { ApiOAuth2 } from '@nestjs/swagger'; +import * as config from 'config'; +import { ServiceValidationException } from '../../../../../../libs/common/src/exceptions/base.exception'; +import { ANY_AUTH_ROLE } from '../../../common/authorization/roles'; +import { RolesGuard } from '../../../common/authorization/roles-guard.service'; +import { UserRoles } from '../../../common/authorization/roles.decorator'; +import { DocumentService } from '../../../document/document.service'; +import { NOTIFICATION_STATUS } from '../notification-submission-status/notification-status.dto'; +import { NotificationSubmissionService } from './notification-submission.service'; + +@ApiOAuth2(config.get('KEYCLOAK.SCOPES')) +@UseGuards(RolesGuard) +@Controller('notification-submission') +export class NotificationSubmissionController { + constructor( + private notificationSubmissionService: NotificationSubmissionService, + private documentService: DocumentService, + ) {} + + @UserRoles(...ANY_AUTH_ROLE) + @Get('/:fileNumber') + async get(@Param('fileNumber') fileNumber: string) { + const submission = await this.notificationSubmissionService.get(fileNumber); + + return await this.notificationSubmissionService.mapToDto(submission); + } + + @UserRoles(...ANY_AUTH_ROLE) + @Get('/document/:uuid/open') + async downloadFile(@Param('uuid') uuid: string) { + const document = await this.documentService.getDocument(uuid); + const url = await this.documentService.getDownloadUrl(document, true); + return { url }; + } + + @UserRoles(...ANY_AUTH_ROLE) + @Patch('/:fileNumber/update-status') + async updateStatus( + @Param('fileNumber') fileNumber: string, + @Body('statusCode') status: string, + ) { + if (!fileNumber) { + throw new ServiceValidationException('File number is required'); + } + await this.notificationSubmissionService.updateStatus( + fileNumber, + status as NOTIFICATION_STATUS, + ); + return this.get(fileNumber); + } +} diff --git a/services/apps/alcs/src/alcs/notification/notification-submission/notification-submission.service.spec.ts b/services/apps/alcs/src/alcs/notification/notification-submission/notification-submission.service.spec.ts new file mode 100644 index 0000000000..28be770350 --- /dev/null +++ b/services/apps/alcs/src/alcs/notification/notification-submission/notification-submission.service.spec.ts @@ -0,0 +1,156 @@ +import { classes } from '@automapper/classes'; +import { AutomapperModule } from '@automapper/nestjs'; +import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; +import { Test, TestingModule } from '@nestjs/testing'; +import { getRepositoryToken } from '@nestjs/typeorm'; +import { Repository } from 'typeorm'; +import { NotificationSubmissionProfile } from '../../../common/automapper/notification-submission.automapper.profile'; +import { NotificationTransfereeProfile } from '../../../common/automapper/notification-transferee.automapper.profile'; +import { NotificationSubmission } from '../../../portal/notification-submission/notification-submission.entity'; +import { NotificationTransferee } from '../../../portal/notification-submission/notification-transferee/notification-transferee.entity'; +import { NotificationSubmissionStatusType } from '../notification-submission-status/notification-status-type.entity'; +import { NOTIFICATION_STATUS } from '../notification-submission-status/notification-status.dto'; +import { NotificationSubmissionStatusService } from '../notification-submission-status/notification-submission-status.service'; +import { NotificationSubmissionService } from './notification-submission.service'; + +describe('NotificationSubmissionService', () => { + let service: NotificationSubmissionService; + + let mockNotificationSubmissionRepo: DeepMocked< + Repository + >; + let mockNotificationSubmissionStatusRepo: DeepMocked< + Repository + >; + let mockNotificationSubmissionStatusService: DeepMocked; + + beforeEach(async () => { + mockNotificationSubmissionRepo = createMock(); + mockNotificationSubmissionStatusRepo = createMock(); + mockNotificationSubmissionStatusService = createMock(); + + const module: TestingModule = await Test.createTestingModule({ + imports: [ + AutomapperModule.forRoot({ + strategyInitializer: classes(), + }), + ], + providers: [ + NotificationSubmissionService, + NotificationSubmissionProfile, + NotificationTransfereeProfile, + { + provide: getRepositoryToken(NotificationSubmission), + useValue: mockNotificationSubmissionRepo, + }, + { + provide: getRepositoryToken(NotificationSubmissionStatusType), + useValue: mockNotificationSubmissionStatusRepo, + }, + { + provide: NotificationSubmissionStatusService, + useValue: mockNotificationSubmissionStatusService, + }, + ], + }).compile(); + + mockNotificationSubmissionStatusService.setStatusDate.mockResolvedValue( + {} as any, + ); + + service = module.get( + NotificationSubmissionService, + ); + }); + + it('should be defined', () => { + expect(service).toBeDefined(); + }); + + it('should successfully find NotificationSubmission', async () => { + const fakeFileNumber = 'fake'; + + mockNotificationSubmissionRepo.findOneOrFail.mockResolvedValue( + new NotificationSubmission(), + ); + + const result = await service.get(fakeFileNumber); + + expect(result).toBeDefined(); + expect(mockNotificationSubmissionRepo.findOneOrFail).toBeCalledTimes(1); + expect(mockNotificationSubmissionRepo.findOneOrFail).toBeCalledWith({ + where: { fileNumber: fakeFileNumber }, + relations: { + notification: { + documents: { + document: true, + }, + }, + transferees: { + type: true, + }, + }, + }); + }); + + it('should properly map to dto', async () => { + const fakeSubmission = createMock({ + auditCreatedAt: new Date(), + auditUpdatedAt: new Date(), + }); + fakeSubmission.transferees = [ + new NotificationTransferee({ + uuid: 'uuid', + }), + ]; + + const result = await service.mapToDto(fakeSubmission); + + expect(result).toBeDefined(); + expect(result.transferees.length).toEqual(1); + }); + + it('should successfully retrieve status from repo', async () => { + mockNotificationSubmissionStatusRepo.findOneOrFail.mockResolvedValue( + new NotificationSubmissionStatusType(), + ); + + const result = await service.getStatus( + NOTIFICATION_STATUS.ALC_RESPONSE_SENT, + ); + + expect(result).toBeDefined(); + expect(mockNotificationSubmissionStatusRepo.findOneOrFail).toBeCalledTimes( + 1, + ); + expect(mockNotificationSubmissionStatusRepo.findOneOrFail).toBeCalledWith({ + where: { code: NOTIFICATION_STATUS.ALC_RESPONSE_SENT }, + }); + }); + + it('should successfully update the status', async () => { + mockNotificationSubmissionStatusRepo.findOneOrFail.mockResolvedValue( + new NotificationSubmissionStatusType(), + ); + mockNotificationSubmissionRepo.findOneOrFail.mockResolvedValue( + new NotificationSubmission({ + uuid: 'fake', + }), + ); + + await service.updateStatus('fake', NOTIFICATION_STATUS.ALC_RESPONSE_SENT); + + expect(mockNotificationSubmissionRepo.findOneOrFail).toBeCalledTimes(1); + expect(mockNotificationSubmissionRepo.findOneOrFail).toBeCalledWith({ + where: { + fileNumber: 'fake', + }, + }); + expect( + mockNotificationSubmissionStatusService.setStatusDate, + ).toBeCalledTimes(1); + expect( + mockNotificationSubmissionStatusService.setStatusDate, + ).toBeCalledWith('fake', NOTIFICATION_STATUS.ALC_RESPONSE_SENT); + }); +}); diff --git a/services/apps/alcs/src/alcs/notification/notification-submission/notification-submission.service.ts b/services/apps/alcs/src/alcs/notification/notification-submission/notification-submission.service.ts new file mode 100644 index 0000000000..0aeec8658c --- /dev/null +++ b/services/apps/alcs/src/alcs/notification/notification-submission/notification-submission.service.ts @@ -0,0 +1,71 @@ +import { Mapper } from '@automapper/core'; +import { InjectMapper } from '@automapper/nestjs'; +import { Injectable } from '@nestjs/common'; +import { InjectRepository } from '@nestjs/typeorm'; +import { Repository } from 'typeorm'; +import { NotificationSubmissionDetailedDto } from '../../../portal/notification-submission/notification-submission.dto'; +import { NotificationSubmission } from '../../../portal/notification-submission/notification-submission.entity'; +import { NotificationSubmissionStatusType } from '../notification-submission-status/notification-status-type.entity'; +import { NOTIFICATION_STATUS } from '../notification-submission-status/notification-status.dto'; +import { NotificationSubmissionStatusService } from '../notification-submission-status/notification-submission-status.service'; + +@Injectable() +export class NotificationSubmissionService { + constructor( + @InjectRepository(NotificationSubmission) + private notificationSubmissionRepo: Repository, + @InjectRepository(NotificationSubmissionStatusType) + private notificationSubmissionStatusTypeRepo: Repository, + @InjectMapper() private mapper: Mapper, + private notificationSubmissionStatusService: NotificationSubmissionStatusService, + ) {} + + async get(fileNumber: string) { + return await this.notificationSubmissionRepo.findOneOrFail({ + where: { fileNumber }, + relations: { + notification: { + documents: { + document: true, + }, + }, + transferees: { + type: true, + }, + }, + }); + } + + async mapToDto(submission: NotificationSubmission) { + return await this.mapper.mapAsync( + submission, + NotificationSubmission, + NotificationSubmissionDetailedDto, + ); + } + + async getStatus(code: NOTIFICATION_STATUS) { + return await this.notificationSubmissionStatusTypeRepo.findOneOrFail({ + where: { + code, + }, + }); + } + + async updateStatus(fileNumber: string, statusCode: NOTIFICATION_STATUS) { + const submission = await this.loadBarebonesSubmission(fileNumber); + await this.notificationSubmissionStatusService.setStatusDate( + submission.uuid, + statusCode, + ); + } + + public loadBarebonesSubmission(fileNumber: string) { + //Load submission without relations to prevent save from crazy cascading + return this.notificationSubmissionRepo.findOneOrFail({ + where: { + fileNumber, + }, + }); + } +} diff --git a/services/apps/alcs/src/alcs/notification/notification-timeline/notification-timeline.controller.spec.ts b/services/apps/alcs/src/alcs/notification/notification-timeline/notification-timeline.controller.spec.ts new file mode 100644 index 0000000000..408b131acc --- /dev/null +++ b/services/apps/alcs/src/alcs/notification/notification-timeline/notification-timeline.controller.spec.ts @@ -0,0 +1,49 @@ +import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; +import { Test, TestingModule } from '@nestjs/testing'; +import { ClsService } from 'nestjs-cls'; +import { mockKeyCloakProviders } from '../../../../test/mocks/mockTypes'; +import { NotificationTimelineController } from './notification-timeline.controller'; +import { NotificationTimelineService } from './notification-timeline.service'; + +describe('NoticeOfIntentTimelineController', () => { + let controller: NotificationTimelineController; + let mockTimelineService: DeepMocked; + + beforeEach(async () => { + mockTimelineService = createMock(); + + const module: TestingModule = await Test.createTestingModule({ + providers: [ + { + provide: NotificationTimelineService, + useValue: mockTimelineService, + }, + { + provide: ClsService, + useValue: {}, + }, + ...mockKeyCloakProviders, + ], + controllers: [NotificationTimelineController], + }).compile(); + + controller = module.get( + NotificationTimelineController, + ); + }); + + it('should be defined', () => { + expect(controller).toBeDefined(); + }); + + it('should call through to get timeline events', async () => { + mockTimelineService.getTimelineEvents.mockResolvedValue([]); + const res = await controller.fetchTimelineEvents('fileNumber'); + + expect(res).toBeDefined(); + expect(mockTimelineService.getTimelineEvents).toHaveBeenCalledTimes(1); + expect(mockTimelineService.getTimelineEvents).toHaveBeenCalledWith( + 'fileNumber', + ); + }); +}); diff --git a/services/apps/alcs/src/alcs/notification/notification-timeline/notification-timeline.controller.ts b/services/apps/alcs/src/alcs/notification/notification-timeline/notification-timeline.controller.ts new file mode 100644 index 0000000000..0116e3a280 --- /dev/null +++ b/services/apps/alcs/src/alcs/notification/notification-timeline/notification-timeline.controller.ts @@ -0,0 +1,20 @@ +import { Controller, Get, Param, UseGuards } from '@nestjs/common'; +import { ApiOAuth2 } from '@nestjs/swagger'; +import * as config from 'config'; +import { AUTH_ROLE } from '../../../common/authorization/roles'; +import { RolesGuard } from '../../../common/authorization/roles-guard.service'; +import { UserRoles } from '../../../common/authorization/roles.decorator'; +import { NotificationTimelineService } from './notification-timeline.service'; + +@ApiOAuth2(config.get('KEYCLOAK.SCOPES')) +@Controller('notification-timeline') +@UseGuards(RolesGuard) +export class NotificationTimelineController { + constructor(private noiTimelineService: NotificationTimelineService) {} + + @Get('/:fileNumber') + @UserRoles(AUTH_ROLE.ADMIN) + async fetchTimelineEvents(@Param('fileNumber') fileNumber: string) { + return await this.noiTimelineService.getTimelineEvents(fileNumber); + } +} diff --git a/services/apps/alcs/src/alcs/notification/notification-timeline/notification-timeline.module.ts b/services/apps/alcs/src/alcs/notification/notification-timeline/notification-timeline.module.ts new file mode 100644 index 0000000000..b3f8bcc8d0 --- /dev/null +++ b/services/apps/alcs/src/alcs/notification/notification-timeline/notification-timeline.module.ts @@ -0,0 +1,18 @@ +import { Module } from '@nestjs/common'; +import { TypeOrmModule } from '@nestjs/typeorm'; +import { NotificationSubmissionStatusModule } from '../notification-submission-status/notification-submission-status.module'; +import { NotificationModule } from '../notification.module'; +import { NotificationTimelineController } from './notification-timeline.controller'; +import { NotificationTimelineService } from './notification-timeline.service'; +import { Notification } from '../notification.entity'; + +@Module({ + imports: [ + TypeOrmModule.forFeature([Notification]), + NotificationModule, + NotificationSubmissionStatusModule, + ], + providers: [NotificationTimelineService], + controllers: [NotificationTimelineController], +}) +export class NotificationTimelineModule {} diff --git a/services/apps/alcs/src/alcs/notification/notification-timeline/notification-timeline.service.spec.ts b/services/apps/alcs/src/alcs/notification/notification-timeline/notification-timeline.service.spec.ts new file mode 100644 index 0000000000..c2d05c083a --- /dev/null +++ b/services/apps/alcs/src/alcs/notification/notification-timeline/notification-timeline.service.spec.ts @@ -0,0 +1,78 @@ +import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; +import { Test, TestingModule } from '@nestjs/testing'; +import { getRepositoryToken } from '@nestjs/typeorm'; +import { Repository } from 'typeorm'; +import { NOTIFICATION_STATUS } from '../notification-submission-status/notification-status.dto'; +import { NotificationSubmissionToSubmissionStatus } from '../notification-submission-status/notification-status.entity'; +import { NotificationSubmissionStatusService } from '../notification-submission-status/notification-submission-status.service'; +import { Notification } from '../notification.entity'; +import { NotificationService } from '../notification.service'; +import { NotificationTimelineService } from './notification-timeline.service'; + +describe('NotificationTimelineService', () => { + let service: NotificationTimelineService; + let mockNOIRepo: DeepMocked>; + let mockNOIService: DeepMocked; + let mockNOIStatusService: DeepMocked; + + beforeEach(async () => { + mockNOIRepo = createMock(); + mockNOIService = createMock(); + mockNOIStatusService = createMock(); + + const module: TestingModule = await Test.createTestingModule({ + providers: [ + { + provide: getRepositoryToken(Notification), + useValue: mockNOIRepo, + }, + { + provide: NotificationService, + useValue: mockNOIService, + }, + { + provide: NotificationSubmissionStatusService, + useValue: mockNOIStatusService, + }, + NotificationTimelineService, + ], + }).compile(); + + service = module.get( + NotificationTimelineService, + ); + + mockNOIRepo.findOneOrFail.mockResolvedValue(new Notification()); + mockNOIService.mapToDtos.mockResolvedValue([]); + mockNOIStatusService.getCurrentStatusesByFileNumber.mockResolvedValue([]); + }); + + it('should be defined', () => { + expect(service).toBeDefined(); + }); + + it('should return nothing for empty Notification', async () => { + const res = await service.getTimelineEvents('file-number'); + + expect(res).toBeDefined(); + }); + + it('should map Status Events', async () => { + const sameDate = new Date(); + mockNOIStatusService.getCurrentStatusesByFileNumber.mockResolvedValue([ + new NotificationSubmissionToSubmissionStatus({ + statusType: { + code: NOTIFICATION_STATUS.IN_PROGRESS, + weight: 0, + } as any, + effectiveDate: sameDate, + }), + ]); + + const res = await service.getTimelineEvents('file-number'); + + expect(res).toBeDefined(); + expect(res.length).toEqual(1); + expect(res[0].htmlText).toEqual('Created - In Progress'); + }); +}); diff --git a/services/apps/alcs/src/alcs/notification/notification-timeline/notification-timeline.service.ts b/services/apps/alcs/src/alcs/notification/notification-timeline/notification-timeline.service.ts new file mode 100644 index 0000000000..8c1d590b85 --- /dev/null +++ b/services/apps/alcs/src/alcs/notification/notification-timeline/notification-timeline.service.ts @@ -0,0 +1,91 @@ +import { Injectable } from '@nestjs/common'; +import { InjectRepository } from '@nestjs/typeorm'; +import { Repository } from 'typeorm'; +import { CardSubtask } from '../../card/card-subtask/card-subtask.entity'; +import { NOTIFICATION_STATUS } from '../notification-submission-status/notification-status.dto'; +import { NotificationSubmissionStatusService } from '../notification-submission-status/notification-submission-status.service'; +import { Notification } from '../notification.entity'; +import { NotificationService } from '../notification.service'; + +export interface TimelineEvent { + htmlText: string; + startDate: number; + fulfilledDate: number | null; + isFulfilled: boolean; + link?: string | null; +} + +@Injectable() +export class NotificationTimelineService { + constructor( + @InjectRepository(Notification) + private notificationRepo: Repository, + private noticeOfIntentService: NotificationService, + private noticeOfIntentSubmissionStatusService: NotificationSubmissionStatusService, + ) {} + + async getTimelineEvents(fileNumber: string) { + const events: TimelineEvent[] = []; + const notification = await this.notificationRepo.findOneOrFail({ + where: { + fileNumber, + }, + relations: { + card: { + type: true, + subtasks: { + type: true, + }, + }, + }, + withDeleted: true, + }); + await this.addStatusEvents(notification, events); + + if (notification.card) { + for (const subtask of notification.card.subtasks) { + const mappedEvent = this.mapSubtaskToEvent(subtask); + events.push(mappedEvent); + } + } + + events.sort((a, b) => b.startDate - a.startDate); + return events; + } + + private mapSubtaskToEvent(subtask: CardSubtask): TimelineEvent { + return { + htmlText: `${subtask.type.label} Subtask`, + fulfilledDate: subtask.completedAt?.getTime() ?? null, + startDate: subtask.createdAt.getTime(), + isFulfilled: !!subtask.completedAt, + }; + } + + private async addStatusEvents( + notification: Notification, + events: TimelineEvent[], + ) { + const statusHistory = + await this.noticeOfIntentSubmissionStatusService.getCurrentStatusesByFileNumber( + notification.fileNumber, + ); + + for (const status of statusHistory) { + if (status.effectiveDate) { + let htmlText = `${status.statusType.label}`; + + if (status.statusType.code === NOTIFICATION_STATUS.IN_PROGRESS) { + htmlText = 'Created - In Progress'; + } + + events.push({ + htmlText, + startDate: status.effectiveDate.getTime() + status.statusType.weight, + fulfilledDate: null, + isFulfilled: true, + }); + } + } + } +} diff --git a/services/apps/alcs/src/alcs/notification/notification.dto.ts b/services/apps/alcs/src/alcs/notification/notification.dto.ts index c1f7cae2e3..225039ddc8 100644 --- a/services/apps/alcs/src/alcs/notification/notification.dto.ts +++ b/services/apps/alcs/src/alcs/notification/notification.dto.ts @@ -1,11 +1,5 @@ import { AutoMap } from '@automapper/classes'; -import { - IsNotEmpty, - IsNumber, - IsOptional, - IsString, - IsUUID, -} from 'class-validator'; +import { IsNumber, IsOptional, IsString, IsUUID } from 'class-validator'; import { CardDto } from '../card/card.dto'; import { ApplicationRegionDto } from '../code/application-code/application-region/application-region.dto'; import { LocalGovernmentDto } from '../local-government/local-government.dto'; diff --git a/services/apps/alcs/src/alcs/notification/notification.module.ts b/services/apps/alcs/src/alcs/notification/notification.module.ts index ee4d21c5e8..6ad563aa5b 100644 --- a/services/apps/alcs/src/alcs/notification/notification.module.ts +++ b/services/apps/alcs/src/alcs/notification/notification.module.ts @@ -4,6 +4,8 @@ import { NotificationProfile } from '../../common/automapper/notification.automa import { DocumentCode } from '../../document/document-code.entity'; import { DocumentModule } from '../../document/document.module'; import { FileNumberModule } from '../../file-number/file-number.module'; +import { NotificationSubmission } from '../../portal/notification-submission/notification-submission.entity'; +import { NotificationSubmissionModule } from '../../portal/notification-submission/notification-submission.module'; import { BoardModule } from '../board/board.module'; import { CardModule } from '../card/card.module'; import { CodeModule } from '../code/code.module'; @@ -11,7 +13,11 @@ import { LocalGovernmentModule } from '../local-government/local-government.modu import { NotificationDocumentController } from './notification-document/notification-document.controller'; import { NotificationDocument } from './notification-document/notification-document.entity'; import { NotificationDocumentService } from './notification-document/notification-document.service'; +import { NotificationParcelController } from './notification-parcel/notification-parcel.controller'; +import { NotificationSubmissionStatusType } from './notification-submission-status/notification-status-type.entity'; import { NotificationSubmissionStatusModule } from './notification-submission-status/notification-submission-status.module'; +import { NotificationSubmissionController } from './notification-submission/notification-submission.controller'; +import { NotificationSubmissionService } from './notification-submission/notification-submission.service'; import { NotificationType } from './notification-type/notification-type.entity'; import { NotificationController } from './notification.controller'; import { NotificationService } from './notification.service'; @@ -23,6 +29,8 @@ import { Notification } from './notification.entity'; Notification, NotificationType, NotificationDocument, + NotificationSubmission, + NotificationSubmissionStatusType, DocumentCode, ]), forwardRef(() => BoardModule), @@ -32,13 +40,20 @@ import { Notification } from './notification.entity'; CodeModule, LocalGovernmentModule, NotificationSubmissionStatusModule, + forwardRef(() => NotificationSubmissionModule), ], providers: [ NotificationService, NotificationProfile, NotificationDocumentService, + NotificationSubmissionService, + ], + controllers: [ + NotificationController, + NotificationDocumentController, + NotificationSubmissionController, + NotificationParcelController, ], - controllers: [NotificationController, NotificationDocumentController], exports: [NotificationService, NotificationDocumentService], }) export class NotificationModule {} diff --git a/services/apps/alcs/src/alcs/notification/notification.service.ts b/services/apps/alcs/src/alcs/notification/notification.service.ts index 018aaed3a2..596440cae9 100644 --- a/services/apps/alcs/src/alcs/notification/notification.service.ts +++ b/services/apps/alcs/src/alcs/notification/notification.service.ts @@ -302,7 +302,7 @@ export class NotificationService { existingNotification.typeCode = createDto.typeCode; existingNotification.region = region; existingNotification.card = new Card(); - existingNotification.card.typeCode = CARD_TYPE.NOI; + existingNotification.card.typeCode = CARD_TYPE.NOTIFICATION; await this.repository.save(existingNotification); return this.getByFileNumber(createDto.fileNumber); diff --git a/services/apps/alcs/src/alcs/search/search.controller.spec.ts b/services/apps/alcs/src/alcs/search/search.controller.spec.ts index ddac32eec0..f96080cb21 100644 --- a/services/apps/alcs/src/alcs/search/search.controller.spec.ts +++ b/services/apps/alcs/src/alcs/search/search.controller.spec.ts @@ -9,6 +9,7 @@ import { Board } from '../board/board.entity'; import { Card } from '../card/card.entity'; import { Covenant } from '../covenant/covenant.entity'; import { NoticeOfIntent } from '../notice-of-intent/notice-of-intent.entity'; +import { Notification } from '../notification/notification.entity'; import { PlanningReview } from '../planning-review/planning-review.entity'; import { ApplicationAdvancedSearchService } from './application/application-advanced-search.service'; import { ApplicationSubmissionSearchView } from './application/application-search-view.entity'; @@ -73,6 +74,7 @@ describe('SearchController', () => { mockSearchService.getApplication.mockResolvedValue(new Application()); mockSearchService.getNoi.mockResolvedValue(new NoticeOfIntent()); + mockSearchService.getNotification.mockResolvedValue(new Notification()); mockSearchService.getPlanningReview.mockResolvedValue( new PlanningReview({ card: { @@ -124,7 +126,7 @@ describe('SearchController', () => { expect(controller).toBeDefined(); }); - it('should call service to retrieve Application, Noi, Planning, Covenant by file number', async () => { + it('should call service to retrieve Application, Noi, Planning, Covenant, Notification, by file number', async () => { const searchString = 'fake'; const result = await controller.search(searchString); @@ -136,8 +138,10 @@ describe('SearchController', () => { expect(mockSearchService.getPlanningReview).toBeCalledWith(searchString); expect(mockSearchService.getCovenant).toBeCalledTimes(1); expect(mockSearchService.getCovenant).toBeCalledWith(searchString); + expect(mockSearchService.getNotification).toHaveBeenCalledTimes(1); + expect(mockSearchService.getNotification).toBeCalledWith(searchString); expect(result).toBeDefined(); - expect(result.length).toBe(4); + expect(result.length).toBe(5); }); it('should call advanced search to retrieve Applications, NOIs, PlanningReviews, Covenants', async () => { diff --git a/services/apps/alcs/src/alcs/search/search.controller.ts b/services/apps/alcs/src/alcs/search/search.controller.ts index f6af69df8b..00d9d74206 100644 --- a/services/apps/alcs/src/alcs/search/search.controller.ts +++ b/services/apps/alcs/src/alcs/search/search.controller.ts @@ -14,6 +14,7 @@ import { ApplicationTypeDto } from '../code/application-code/application-type/ap import { ApplicationType } from '../code/application-code/application-type/application-type.entity'; import { Covenant } from '../covenant/covenant.entity'; import { NoticeOfIntent } from '../notice-of-intent/notice-of-intent.entity'; +import { Notification } from '../notification/notification.entity'; import { PlanningReview } from '../planning-review/planning-review.entity'; import { ApplicationAdvancedSearchService } from './application/application-advanced-search.service'; import { ApplicationSubmissionSearchView } from './application/application-search-view.entity'; @@ -49,18 +50,23 @@ export class SearchController { @Get('/:searchTerm') async search(@Param('searchTerm') searchTerm) { const application = await this.searchService.getApplication(searchTerm); - const noi = await this.searchService.getNoi(searchTerm); - const planningReview = await this.searchService.getPlanningReview( searchTerm, ); - const covenant = await this.searchService.getCovenant(searchTerm); + const notification = await this.searchService.getNotification(searchTerm); const result: SearchResultDto[] = []; - this.mapSearchResults(result, application, noi, planningReview, covenant); + this.mapSearchResults( + result, + application, + noi, + planningReview, + covenant, + notification, + ); return result; } @@ -71,6 +77,7 @@ export class SearchController { noi: NoticeOfIntent | null, planningReview: PlanningReview | null, covenant: Covenant | null, + notification: Notification | null, ) { if (application) { result.push(this.mapApplicationToSearchResult(application)); @@ -87,6 +94,10 @@ export class SearchController { if (covenant) { result.push(this.mapCovenantToSearchResult(covenant)); } + + if (notification) { + result.push(this.mapNotificationToSearchResult(notification)); + } } private mapApplicationToSearchResult(application: Application) { @@ -143,6 +154,18 @@ export class SearchController { return result; } + private mapNotificationToSearchResult(notification: Notification) { + const result = { + type: CARD_TYPE.NOTIFICATION, + referenceId: notification.fileNumber, + localGovernmentName: notification.localGovernment?.name, + applicant: notification.applicant, + fileNumber: notification.fileNumber, + } as SearchResultDto; + + return result; + } + @Post('/advanced') @UserRoles(...ROLES_ALLOWED_APPLICATIONS) async advancedSearch(@Body() searchDto: SearchRequestDto) { diff --git a/services/apps/alcs/src/alcs/search/search.module.ts b/services/apps/alcs/src/alcs/search/search.module.ts index 33145255b5..010916870b 100644 --- a/services/apps/alcs/src/alcs/search/search.module.ts +++ b/services/apps/alcs/src/alcs/search/search.module.ts @@ -5,6 +5,7 @@ import { Application } from '../application/application.entity'; import { Covenant } from '../covenant/covenant.entity'; import { LocalGovernment } from '../local-government/local-government.entity'; import { NoticeOfIntent } from '../notice-of-intent/notice-of-intent.entity'; +import { Notification } from '../notification/notification.entity'; import { PlanningReview } from '../planning-review/planning-review.entity'; import { ApplicationAdvancedSearchService } from './application/application-advanced-search.service'; import { ApplicationSubmissionSearchView } from './application/application-search-view.entity'; @@ -22,6 +23,7 @@ import { SearchService } from './search.service'; NoticeOfIntent, PlanningReview, Covenant, + Notification, LocalGovernment, ApplicationSubmissionSearchView, NoticeOfIntentSubmissionSearchView, diff --git a/services/apps/alcs/src/alcs/search/search.service.spec.ts b/services/apps/alcs/src/alcs/search/search.service.spec.ts index a75070366e..e901b4bc0c 100644 --- a/services/apps/alcs/src/alcs/search/search.service.spec.ts +++ b/services/apps/alcs/src/alcs/search/search.service.spec.ts @@ -6,6 +6,7 @@ import { Application } from '../application/application.entity'; import { Covenant } from '../covenant/covenant.entity'; import { LocalGovernment } from '../local-government/local-government.entity'; import { NoticeOfIntent } from '../notice-of-intent/notice-of-intent.entity'; +import { Notification } from '../notification/notification.entity'; import { PlanningReview } from '../planning-review/planning-review.entity'; import { ApplicationSubmissionSearchView } from './application/application-search-view.entity'; import { SearchService } from './search.service'; @@ -20,6 +21,7 @@ describe('SearchService', () => { Repository >; let mockLocalGovernment: DeepMocked>; + let mockNotificationRepository: DeepMocked>; const fakeFileNumber = 'fake'; @@ -30,6 +32,7 @@ describe('SearchService', () => { mockCovenantRepository = createMock(); mockApplicationSubmissionSearchView = createMock(); mockLocalGovernment = createMock(); + mockNotificationRepository = createMock(); const module: TestingModule = await Test.createTestingModule({ providers: [ @@ -50,6 +53,10 @@ describe('SearchService', () => { provide: getRepositoryToken(Covenant), useValue: mockCovenantRepository, }, + { + provide: getRepositoryToken(Notification), + useValue: mockNotificationRepository, + }, { provide: getRepositoryToken(ApplicationSubmissionSearchView), useValue: mockApplicationSubmissionSearchView, @@ -148,4 +155,24 @@ describe('SearchService', () => { }); expect(result).toBeDefined(); }); + + it('should call repository to get notification', async () => { + mockNotificationRepository.findOne.mockResolvedValue(new Notification()); + + const result = await service.getNotification('fake'); + + expect(mockNotificationRepository.findOne).toBeCalledTimes(1); + expect(mockNotificationRepository.findOne).toBeCalledWith({ + where: { + fileNumber: fakeFileNumber, + }, + relations: { + card: { + board: true, + }, + localGovernment: true, + }, + }); + expect(result).toBeDefined(); + }); }); diff --git a/services/apps/alcs/src/alcs/search/search.service.ts b/services/apps/alcs/src/alcs/search/search.service.ts index 57b062c174..99f366391b 100644 --- a/services/apps/alcs/src/alcs/search/search.service.ts +++ b/services/apps/alcs/src/alcs/search/search.service.ts @@ -4,6 +4,7 @@ import { Repository } from 'typeorm'; import { Application } from '../application/application.entity'; import { Covenant } from '../covenant/covenant.entity'; import { NoticeOfIntent } from '../notice-of-intent/notice-of-intent.entity'; +import { Notification } from '../notification/notification.entity'; import { PlanningReview } from '../planning-review/planning-review.entity'; const CARD_RELATIONSHIP = { @@ -24,6 +25,8 @@ export class SearchService { private planningReviewRepository: Repository, @InjectRepository(Covenant) private covenantRepository: Repository, + @InjectRepository(Notification) + private notificationRepository: Repository, ) {} async getApplication(fileNumber: string) { @@ -78,4 +81,15 @@ export class SearchService { return covenant; } + + async getNotification(fileNumber: string) { + const notification = await this.notificationRepository.findOne({ + where: { + fileNumber, + }, + relations: CARD_RELATIONSHIP, + }); + + return notification; + } } diff --git a/services/apps/alcs/src/alcs/staff-journal/staff-journal.controller.ts b/services/apps/alcs/src/alcs/staff-journal/staff-journal.controller.ts index 23b9099653..48840ba6fd 100644 --- a/services/apps/alcs/src/alcs/staff-journal/staff-journal.controller.ts +++ b/services/apps/alcs/src/alcs/staff-journal/staff-journal.controller.ts @@ -23,6 +23,7 @@ import { CreateApplicationStaffJournalDto, UpdateStaffJournalDto, CreateNoticeOfIntentStaffJournalDto, + CreateNotificationStaffJournalDto, } from './staff-journal.dto'; import { StaffJournal } from './staff-journal.entity'; import { StaffJournalService } from './staff-journal.service'; @@ -76,6 +77,21 @@ export class StaffJournalController { return this.autoMapper.map(newRecord, StaffJournal, StaffJournalDto); } + @Post('/notification') + @UserRoles(...ROLES_ALLOWED_BOARDS) + async createForNotification( + @Body() record: CreateNotificationStaffJournalDto, + @Req() req, + ): Promise { + const newRecord = await this.staffJournalService.createForNotification( + record.notificationUuid, + record.body, + req.user.entity, + ); + + return this.autoMapper.map(newRecord, StaffJournal, StaffJournalDto); + } + @Patch() @UserRoles(...ROLES_ALLOWED_BOARDS) async update( diff --git a/services/apps/alcs/src/alcs/staff-journal/staff-journal.dto.ts b/services/apps/alcs/src/alcs/staff-journal/staff-journal.dto.ts index 82c03c9c46..576a913025 100644 --- a/services/apps/alcs/src/alcs/staff-journal/staff-journal.dto.ts +++ b/services/apps/alcs/src/alcs/staff-journal/staff-journal.dto.ts @@ -40,6 +40,16 @@ export class CreateNoticeOfIntentStaffJournalDto { body: string; } +export class CreateNotificationStaffJournalDto { + @IsString() + @IsNotEmpty() + notificationUuid: string; + + @IsString() + @IsNotEmpty() + body: string; +} + export class UpdateStaffJournalDto { @IsString() @IsNotEmpty() diff --git a/services/apps/alcs/src/alcs/staff-journal/staff-journal.entity.ts b/services/apps/alcs/src/alcs/staff-journal/staff-journal.entity.ts index f4d31628a8..1f0b24e65c 100644 --- a/services/apps/alcs/src/alcs/staff-journal/staff-journal.entity.ts +++ b/services/apps/alcs/src/alcs/staff-journal/staff-journal.entity.ts @@ -4,6 +4,7 @@ import { Base } from '../../common/entities/base.entity'; import { User } from '../../user/user.entity'; import { Application } from '../application/application.entity'; import { NoticeOfIntent } from '../notice-of-intent/notice-of-intent.entity'; +import { Notification } from '../notification/notification.entity'; @Entity() export class StaffJournal extends Base { @@ -40,4 +41,11 @@ export class StaffJournal extends Base { @Column({ nullable: true }) @Index() noticeOfIntentUuid: string; + + @ManyToOne(() => Notification) + notification: Notification | null; + + @Column({ nullable: true }) + @Index() + notificationUuid: string; } diff --git a/services/apps/alcs/src/alcs/staff-journal/staff-journal.service.ts b/services/apps/alcs/src/alcs/staff-journal/staff-journal.service.ts index 0094f707f4..729d6ca212 100644 --- a/services/apps/alcs/src/alcs/staff-journal/staff-journal.service.ts +++ b/services/apps/alcs/src/alcs/staff-journal/staff-journal.service.ts @@ -29,6 +29,9 @@ export class StaffJournalService { { noticeOfIntentUuid: parentUuid, }, + { + notificationUuid: parentUuid, + }, ], relations: this.DEFAULT_STAFF_JOURNAL_RELATIONS, order: { @@ -74,6 +77,20 @@ export class StaffJournalService { return await this.staffJournalRepository.save(record); } + async createForNotification( + notificationUuid: string, + noteBody: string, + author: User, + ) { + const record = new StaffJournal({ + body: noteBody, + notificationUuid, + author, + }); + + return await this.staffJournalRepository.save(record); + } + async delete(uuid: string): Promise { const note = await this.staffJournalRepository.findOne({ where: { uuid }, diff --git a/services/apps/alcs/src/common/automapper/notification-submission.automapper.profile.ts b/services/apps/alcs/src/common/automapper/notification-submission.automapper.profile.ts index 3920e50f9d..1a8ab2cf73 100644 --- a/services/apps/alcs/src/common/automapper/notification-submission.automapper.profile.ts +++ b/services/apps/alcs/src/common/automapper/notification-submission.automapper.profile.ts @@ -81,6 +81,12 @@ export class NotificationSubmissionProfile extends AutomapperProfile { ), ); + createMap( + mapper, + NotificationSubmissionStatusType, + NotificationStatusDto, + ); + createMap( mapper, NotificationSubmissionToSubmissionStatus, diff --git a/services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.service.spec.ts b/services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.service.spec.ts index 4eafffd096..d7c54b5778 100644 --- a/services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.service.spec.ts +++ b/services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.service.spec.ts @@ -56,6 +56,9 @@ describe('NotificationParcelService', () => { fileNumber: mockFileNumber, }, }, + relations: { + ownershipType: true, + }, order: { auditCreatedAt: 'ASC' }, }); }); diff --git a/services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.service.ts b/services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.service.ts index 376b93981e..42415e3107 100644 --- a/services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.service.ts +++ b/services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.service.ts @@ -18,6 +18,9 @@ export class NotificationParcelService { notificationSubmission: { fileNumber: fileId }, }, order: { auditCreatedAt: 'ASC' }, + relations: { + ownershipType: true, + }, }); } diff --git a/services/apps/alcs/src/portal/notification-submission/notification-submission.dto.ts b/services/apps/alcs/src/portal/notification-submission/notification-submission.dto.ts index 5c7cf5deba..911534b67c 100644 --- a/services/apps/alcs/src/portal/notification-submission/notification-submission.dto.ts +++ b/services/apps/alcs/src/portal/notification-submission/notification-submission.dto.ts @@ -23,7 +23,6 @@ export class NotificationSubmissionDto { @AutoMap() createdAt: number; - @AutoMap() updatedAt: number; @AutoMap() @@ -55,7 +54,9 @@ export class NotificationSubmissionDto { status: NoticeOfIntentStatusDto; lastStatusUpdate: number; - owners: NotificationTransfereeDto[]; + + @AutoMap(() => [NotificationTransfereeDto]) + transferees: NotificationTransfereeDto[]; canEdit: boolean; canView: boolean; diff --git a/services/apps/alcs/src/portal/notification-submission/notification-submission.entity.ts b/services/apps/alcs/src/portal/notification-submission/notification-submission.entity.ts index d7251769fc..f9f47e658a 100644 --- a/services/apps/alcs/src/portal/notification-submission/notification-submission.entity.ts +++ b/services/apps/alcs/src/portal/notification-submission/notification-submission.entity.ts @@ -15,6 +15,7 @@ import { Base } from '../../common/entities/base.entity'; import { User } from '../../user/user.entity'; import { ColumnNumericTransformer } from '../../utils/column-numeric-transform'; import { NotificationParcel } from './notification-parcel/notification-parcel.entity'; +import { NotificationTransfereeDto } from './notification-transferee/notification-transferee.dto'; import { NotificationTransferee } from './notification-transferee/notification-transferee.entity'; @Entity() @@ -140,6 +141,7 @@ export class NotificationSubmission extends Base { }) notification: Notification; + @AutoMap(() => [NotificationTransferee]) @OneToMany( () => NotificationTransferee, (transferee) => transferee.notificationSubmission, diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1694456197990-add_notification_staff_journal.ts b/services/apps/alcs/src/providers/typeorm/migrations/1694456197990-add_notification_staff_journal.ts new file mode 100644 index 0000000000..2bbc33f878 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1694456197990-add_notification_staff_journal.ts @@ -0,0 +1,31 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class addNotificationStaffJournal1694456197990 + implements MigrationInterface +{ + name = 'addNotificationStaffJournal1694456197990'; + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `ALTER TABLE "alcs"."staff_journal" ADD "notification_uuid" uuid`, + ); + await queryRunner.query( + `CREATE INDEX "IDX_48498a0c9b847d726d2b582f50" ON "alcs"."staff_journal" ("notification_uuid") `, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."staff_journal" ADD CONSTRAINT "FK_48498a0c9b847d726d2b582f50a" FOREIGN KEY ("notification_uuid") REFERENCES "alcs"."notification"("uuid") ON DELETE NO ACTION ON UPDATE NO ACTION`, + ); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `ALTER TABLE "alcs"."staff_journal" DROP CONSTRAINT "FK_48498a0c9b847d726d2b582f50a"`, + ); + await queryRunner.query( + `DROP INDEX "alcs"."IDX_48498a0c9b847d726d2b582f50"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."staff_journal" DROP COLUMN "notification_uuid"`, + ); + } +} diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1694457087578-rename_notification_card_type.ts b/services/apps/alcs/src/providers/typeorm/migrations/1694457087578-rename_notification_card_type.ts new file mode 100644 index 0000000000..06620e5d2b --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1694457087578-rename_notification_card_type.ts @@ -0,0 +1,15 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class renameNotificationCardType1694457087578 + implements MigrationInterface +{ + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query(` + UPDATE "alcs"."card_type" SET "code" = 'NOTI', "description" = 'Card type for notifications (currently SRW)' WHERE "code" = 'SRW'; + `); + } + + public async down(): Promise { + //Nope + } +} From 9753bdb86d64ce98fc8cfd48cf313780a6c20dac Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Tue, 12 Sep 2023 09:23:54 -0700 Subject: [PATCH 375/954] Code Review Feedback --- .../app/shared/details-header/details-header.component.html | 2 +- .../src/app/shared/details-header/details-header.component.ts | 4 +++- .../src/app/shared/header/search-bar/search-bar.component.ts | 1 - .../src/app/shared/time-tracker/time-tracker.component.ts | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/alcs-frontend/src/app/shared/details-header/details-header.component.html b/alcs-frontend/src/app/shared/details-header/details-header.component.html index ca309cbb5d..2fe9801a39 100644 --- a/alcs-frontend/src/app/shared/details-header/details-header.component.html +++ b/alcs-frontend/src/app/shared/details-header/details-header.component.html @@ -49,7 +49,7 @@
{{ _application.fileNumber }} ({{ _application.applicant }})
{{ days }}:
- +
diff --git a/alcs-frontend/src/app/shared/details-header/details-header.component.ts b/alcs-frontend/src/app/shared/details-header/details-header.component.ts index c202a49a5c..1ee317577e 100644 --- a/alcs-frontend/src/app/shared/details-header/details-header.component.ts +++ b/alcs-frontend/src/app/shared/details-header/details-header.component.ts @@ -20,6 +20,7 @@ import { RETROACTIVE_TYPE_LABEL, } from '../application-type-pill/application-type-pill.constants'; import { NoticeOfIntentSubmissionStatusService } from '../../services/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service'; +import { TimeTrackable } from '../time-tracker/time-tracker.component'; @Component({ selector: 'app-details-header[application]', @@ -41,6 +42,7 @@ export class DetailsHeaderComponent { legacyId?: string; _application: ApplicationDto | CommissionerApplicationDto | NoticeOfIntentDto | NotificationDto | undefined; + timeTrackable?: TimeTrackable; @Input() set application( application: ApplicationDto | CommissionerApplicationDto | NoticeOfIntentDto | NotificationDto | undefined @@ -53,7 +55,7 @@ export class DetailsHeaderComponent { } if ('pausedDays' in application) { - this.isTimeTrackable = true; + this.timeTrackable = application; } if ('type' in application) { diff --git a/alcs-frontend/src/app/shared/header/search-bar/search-bar.component.ts b/alcs-frontend/src/app/shared/header/search-bar/search-bar.component.ts index b2c798c1ee..ea3922c9d7 100644 --- a/alcs-frontend/src/app/shared/header/search-bar/search-bar.component.ts +++ b/alcs-frontend/src/app/shared/header/search-bar/search-bar.component.ts @@ -62,7 +62,6 @@ export class SearchBarComponent { break; case 'NOTI': await this.router.navigate(['notification', result.referenceId]); - debugger; break; case 'COV': case 'PLAN': diff --git a/alcs-frontend/src/app/shared/time-tracker/time-tracker.component.ts b/alcs-frontend/src/app/shared/time-tracker/time-tracker.component.ts index f6042b0326..9d8e38f169 100644 --- a/alcs-frontend/src/app/shared/time-tracker/time-tracker.component.ts +++ b/alcs-frontend/src/app/shared/time-tracker/time-tracker.component.ts @@ -23,7 +23,7 @@ export class TimeTrackerComponent implements OnChanges { dueDate: Date | null = null; isOverdue = false; - @Input() data: TimeTrackable | any | undefined; + @Input() data: TimeTrackable | undefined; @Input() maxActiveDays: number | undefined; constructor() {} From 681a8cd2c68208595bd8d8be1dc704d0cd781cde Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Tue, 12 Sep 2023 09:23:54 -0700 Subject: [PATCH 376/954] Code Review Feedback --- .../app/shared/details-header/details-header.component.html | 4 ++-- .../app/shared/details-header/details-header.component.ts | 5 +++-- .../src/app/shared/header/search-bar/search-bar.component.ts | 1 - .../src/app/shared/time-tracker/time-tracker.component.ts | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/alcs-frontend/src/app/shared/details-header/details-header.component.html b/alcs-frontend/src/app/shared/details-header/details-header.component.html index ca309cbb5d..7e35fea14c 100644 --- a/alcs-frontend/src/app/shared/details-header/details-header.component.html +++ b/alcs-frontend/src/app/shared/details-header/details-header.component.html @@ -47,9 +47,9 @@
{{ _application.fileNumber }} ({{ _application.applicant }})
- +
{{ days }}:
- +
diff --git a/alcs-frontend/src/app/shared/details-header/details-header.component.ts b/alcs-frontend/src/app/shared/details-header/details-header.component.ts index c202a49a5c..3e359fdf12 100644 --- a/alcs-frontend/src/app/shared/details-header/details-header.component.ts +++ b/alcs-frontend/src/app/shared/details-header/details-header.component.ts @@ -20,6 +20,7 @@ import { RETROACTIVE_TYPE_LABEL, } from '../application-type-pill/application-type-pill.constants'; import { NoticeOfIntentSubmissionStatusService } from '../../services/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service'; +import { TimeTrackable } from '../time-tracker/time-tracker.component'; @Component({ selector: 'app-details-header[application]', @@ -41,6 +42,7 @@ export class DetailsHeaderComponent { legacyId?: string; _application: ApplicationDto | CommissionerApplicationDto | NoticeOfIntentDto | NotificationDto | undefined; + timeTrackable?: TimeTrackable; @Input() set application( application: ApplicationDto | CommissionerApplicationDto | NoticeOfIntentDto | NotificationDto | undefined @@ -53,7 +55,7 @@ export class DetailsHeaderComponent { } if ('pausedDays' in application) { - this.isTimeTrackable = true; + this.timeTrackable = application; } if ('type' in application) { @@ -116,7 +118,6 @@ export class DetailsHeaderComponent { showRetroLabel = false; linkedCards: (CardDto & { displayName: string })[] = []; isNOI = false; - isTimeTrackable = false; currentStatus?: ApplicationSubmissionStatusPill; constructor(private router: Router) {} diff --git a/alcs-frontend/src/app/shared/header/search-bar/search-bar.component.ts b/alcs-frontend/src/app/shared/header/search-bar/search-bar.component.ts index b2c798c1ee..ea3922c9d7 100644 --- a/alcs-frontend/src/app/shared/header/search-bar/search-bar.component.ts +++ b/alcs-frontend/src/app/shared/header/search-bar/search-bar.component.ts @@ -62,7 +62,6 @@ export class SearchBarComponent { break; case 'NOTI': await this.router.navigate(['notification', result.referenceId]); - debugger; break; case 'COV': case 'PLAN': diff --git a/alcs-frontend/src/app/shared/time-tracker/time-tracker.component.ts b/alcs-frontend/src/app/shared/time-tracker/time-tracker.component.ts index f6042b0326..9d8e38f169 100644 --- a/alcs-frontend/src/app/shared/time-tracker/time-tracker.component.ts +++ b/alcs-frontend/src/app/shared/time-tracker/time-tracker.component.ts @@ -23,7 +23,7 @@ export class TimeTrackerComponent implements OnChanges { dueDate: Date | null = null; isOverdue = false; - @Input() data: TimeTrackable | any | undefined; + @Input() data: TimeTrackable | undefined; @Input() maxActiveDays: number | undefined; constructor() {} From fd13a27eb482492aa907579f029fe0582deb55e0 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Tue, 12 Sep 2023 11:13:10 -0700 Subject: [PATCH 377/954] Add Cancel/Uncancel and Type Colors * For both NOI and Notifications --- ...notice-of-intent-details.component.spec.ts | 8 +-- .../notice-of-intent.component.html | 2 + .../notice-of-intent.module.ts | 2 + .../overview/overview.component.html | 12 +++- .../overview/overview.component.spec.ts | 10 ++++ .../overview/overview.component.ts | 42 ++++++++++++- ...cel-notice-of-intent-dialog.component.html | 22 +++++++ ...cel-notice-of-intent-dialog.component.scss | 6 ++ ...-notice-of-intent-dialog.component.spec.ts | 34 +++++++++++ ...ancel-notice-of-intent-dialog.component.ts | 60 +++++++++++++++++++ .../notification-details.component.spec.ts | 6 -- .../notification/notification.component.html | 3 +- .../notification/notification.module.ts | 2 + .../overview/overview.component.html | 12 +++- .../overview/overview.component.spec.ts | 10 ++++ .../overview/overview.component.ts | 41 ++++++++++++- ...ncancel-notification-dialog.component.html | 22 +++++++ ...ncancel-notification-dialog.component.scss | 6 ++ ...ncel-notification-dialog.component.spec.ts | 34 +++++++++++ .../uncancel-notification-dialog.component.ts | 57 ++++++++++++++++++ .../notice-of-intent-detail.service.ts | 10 ++++ ...otice-of-intent-submission.service.spec.ts | 3 + .../notice-of-intent/notice-of-intent.dto.ts | 11 +--- .../notice-of-intent.service.spec.ts | 24 ++++++++ .../notice-of-intent.service.ts | 19 ++++++ .../notification-detail.service.ts | 10 ++++ .../notification/notification.service.spec.ts | 24 ++++++++ .../notification/notification.service.ts | 19 ++++++ .../details-header.component.html | 8 +-- .../parcel/parcel.component.html | 1 - .../proposal-details.component.html | 6 +- .../notice-of-intent-type.entity.ts | 8 +++ .../notice-of-intent.controller.spec.ts | 44 +++++++++++++- .../notice-of-intent.controller.ts | 24 ++++++++ .../notification-type.entity.ts | 8 +++ .../notification.controller.spec.ts | 41 ++++++++++++- .../notification/notification.controller.ts | 22 +++++++ .../alcs/notification/notification.service.ts | 1 - ...4540511529-add_alcs_colors_to_new_types.ts | 37 ++++++++++++ .../1694541245524-seed_alcs_colors.ts | 45 ++++++++++++++ 40 files changed, 719 insertions(+), 37 deletions(-) create mode 100644 alcs-frontend/src/app/features/notice-of-intent/overview/uncancel-notice-of-intent-dialog/uncancel-notice-of-intent-dialog.component.html create mode 100644 alcs-frontend/src/app/features/notice-of-intent/overview/uncancel-notice-of-intent-dialog/uncancel-notice-of-intent-dialog.component.scss create mode 100644 alcs-frontend/src/app/features/notice-of-intent/overview/uncancel-notice-of-intent-dialog/uncancel-notice-of-intent-dialog.component.spec.ts create mode 100644 alcs-frontend/src/app/features/notice-of-intent/overview/uncancel-notice-of-intent-dialog/uncancel-notice-of-intent-dialog.component.ts create mode 100644 alcs-frontend/src/app/features/notification/overview/uncancel-notification-dialog/uncancel-notification-dialog.component.html create mode 100644 alcs-frontend/src/app/features/notification/overview/uncancel-notification-dialog/uncancel-notification-dialog.component.scss create mode 100644 alcs-frontend/src/app/features/notification/overview/uncancel-notification-dialog/uncancel-notification-dialog.component.spec.ts create mode 100644 alcs-frontend/src/app/features/notification/overview/uncancel-notification-dialog/uncancel-notification-dialog.component.ts create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1694540511529-add_alcs_colors_to_new_types.ts create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1694541245524-seed_alcs_colors.ts diff --git a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/notice-of-intent-details.component.spec.ts b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/notice-of-intent-details.component.spec.ts index 00498e5108..8151e0a9ea 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/notice-of-intent-details.component.spec.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/notice-of-intent-details.component.spec.ts @@ -3,11 +3,9 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { Router } from '@angular/router'; import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { NoiDocumentService } from '../../../../services/notice-of-intent/noi-document/noi-document.service'; +import { NoticeOfIntentStatusDto } from '../../../../services/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.dto'; import { NoticeOfIntentSubmissionService } from '../../../../services/notice-of-intent/notice-of-intent-submission/notice-of-intent-submission.service'; -import { - NOI_SUBMISSION_STATUS, - NoticeOfIntentSubmissionStatusDto, -} from '../../../../services/notice-of-intent/notice-of-intent.dto'; +import { NOI_SUBMISSION_STATUS } from '../../../../services/notice-of-intent/notice-of-intent.dto'; import { ToastService } from '../../../../services/toast/toast.service'; import { NoticeOfIntentDetailsComponent } from './notice-of-intent-details.component'; @@ -64,7 +62,7 @@ describe('NoticeOfIntentDetailsComponent', () => { code: NOI_SUBMISSION_STATUS.IN_PROGRESS, portalBackgroundColor: '', portalColor: '', - } as NoticeOfIntentSubmissionStatusDto, + } as NoticeOfIntentStatusDto, submissionStatuses: [], owners: [], canEdit: false, diff --git a/alcs-frontend/src/app/features/notice-of-intent/notice-of-intent.component.html b/alcs-frontend/src/app/features/notice-of-intent/notice-of-intent.component.html index 12df253cf8..80d34b9358 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/notice-of-intent.component.html +++ b/alcs-frontend/src/app/features/notice-of-intent/notice-of-intent.component.html @@ -1,10 +1,12 @@
Overview +
+

Overview

+
+ + +
+
Proposal Summary
{ provide: NoticeOfIntentSubmissionStatusService, useValue: {}, }, + { + provide: ConfirmationDialogService, + useValue: {}, + }, + { + provide: MatDialog, + useValue: {}, + }, ], declarations: [OverviewComponent], schemas: [NO_ERRORS_SCHEMA], diff --git a/alcs-frontend/src/app/features/notice-of-intent/overview/overview.component.ts b/alcs-frontend/src/app/features/notice-of-intent/overview/overview.component.ts index 020785d29d..ec012866c2 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/overview/overview.component.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/overview/overview.component.ts @@ -1,6 +1,8 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; +import { MatDialog } from '@angular/material/dialog'; import { Subject, takeUntil } from 'rxjs'; import { NoticeOfIntentDetailService } from '../../../services/notice-of-intent/notice-of-intent-detail.service'; +import { NoticeOfIntentSubmissionStatusService } from '../../../services/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service'; import { TimelineEventDto } from '../../../services/notice-of-intent/notice-of-intent-timeline/notice-of-intent-timeline.dto'; import { NoticeOfIntentTimelineService } from '../../../services/notice-of-intent/notice-of-intent-timeline/notice-of-intent-timeline.service'; import { @@ -8,7 +10,8 @@ import { NoticeOfIntentDto, NoticeOfIntentSubmissionToSubmissionStatusDto, } from '../../../services/notice-of-intent/notice-of-intent.dto'; -import { NoticeOfIntentSubmissionStatusService } from '../../../services/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service'; +import { ConfirmationDialogService } from '../../../shared/confirmation-dialog/confirmation-dialog.service'; +import { UncancelNoticeOfIntentDialogComponent } from './uncancel-notice-of-intent-dialog/uncancel-notice-of-intent-dialog.component'; @Component({ selector: 'app-overview', @@ -25,7 +28,9 @@ export class OverviewComponent implements OnInit, OnDestroy { constructor( private noticeOfIntentDetailService: NoticeOfIntentDetailService, private noticeOfIntentSubmissionStatusService: NoticeOfIntentSubmissionStatusService, - private noticeOfIntentTimelineService: NoticeOfIntentTimelineService + private noticeOfIntentTimelineService: NoticeOfIntentTimelineService, + private confirmationDialogService: ConfirmationDialogService, + private dialog: MatDialog ) {} ngOnInit(): void { @@ -69,4 +74,37 @@ export class OverviewComponent implements OnInit, OnDestroy { (status) => status.effectiveDate && status.statusTypeCode === NOI_SUBMISSION_STATUS.CANCELLED ).length > 0; } + + async onCancel() { + this.confirmationDialogService + .openDialog({ + body: `Are you sure you want to cancel this Notice of Intent?`, + cancelButtonText: 'No', + title: 'Cancel Notice of Intent', + }) + .subscribe(async (didConfirm) => { + if (didConfirm && this.noticeOfIntent) { + await this.noticeOfIntentDetailService.cancel(this.noticeOfIntent.fileNumber); + await this.loadStatusHistory(this.noticeOfIntent.fileNumber); + } + }); + } + + async onUncancel() { + if (this.noticeOfIntent) { + this.dialog + .open(UncancelNoticeOfIntentDialogComponent, { + data: { + fileNumber: this.noticeOfIntent.fileNumber, + }, + }) + .beforeClosed() + .subscribe(async (didConfirm) => { + if (didConfirm && this.noticeOfIntent) { + await this.noticeOfIntentDetailService.uncancel(this.noticeOfIntent.fileNumber); + await this.loadStatusHistory(this.noticeOfIntent.fileNumber); + } + }); + } + } } diff --git a/alcs-frontend/src/app/features/notice-of-intent/overview/uncancel-notice-of-intent-dialog/uncancel-notice-of-intent-dialog.component.html b/alcs-frontend/src/app/features/notice-of-intent/overview/uncancel-notice-of-intent-dialog/uncancel-notice-of-intent-dialog.component.html new file mode 100644 index 0000000000..eb1fd4b617 --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/overview/uncancel-notice-of-intent-dialog/uncancel-notice-of-intent-dialog.component.html @@ -0,0 +1,22 @@ +
+

Uncancel Notice of Intent

+
+ +
+

+ The notice of intents's portal status will revert back to:

+ +

+

Are you sure you want to undo cancellation?

+
+ + + +
+ + +
+ diff --git a/alcs-frontend/src/app/features/notice-of-intent/overview/uncancel-notice-of-intent-dialog/uncancel-notice-of-intent-dialog.component.scss b/alcs-frontend/src/app/features/notice-of-intent/overview/uncancel-notice-of-intent-dialog/uncancel-notice-of-intent-dialog.component.scss new file mode 100644 index 0000000000..756d26e192 --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/overview/uncancel-notice-of-intent-dialog/uncancel-notice-of-intent-dialog.component.scss @@ -0,0 +1,6 @@ +.grid { + display: grid; + grid-template-columns: 1fr; + grid-column-gap: 24px; + grid-row-gap: 24px; +} diff --git a/alcs-frontend/src/app/features/notice-of-intent/overview/uncancel-notice-of-intent-dialog/uncancel-notice-of-intent-dialog.component.spec.ts b/alcs-frontend/src/app/features/notice-of-intent/overview/uncancel-notice-of-intent-dialog/uncancel-notice-of-intent-dialog.component.spec.ts new file mode 100644 index 0000000000..ecffb94656 --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/overview/uncancel-notice-of-intent-dialog/uncancel-notice-of-intent-dialog.component.spec.ts @@ -0,0 +1,34 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; +import { NoticeOfIntentSubmissionStatusService } from '../../../../services/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service'; + +import { UncancelNoticeOfIntentDialogComponent } from './uncancel-notice-of-intent-dialog.component'; + +describe('UncancelNoticeOfIntentDialogComponent', () => { + let component: UncancelNoticeOfIntentDialogComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [UncancelNoticeOfIntentDialogComponent], + providers: [ + { provide: MatDialogRef, useValue: {} }, + { + provide: NoticeOfIntentSubmissionStatusService, + useValue: {}, + }, + { provide: MAT_DIALOG_DATA, useValue: {} }, + ], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(UncancelNoticeOfIntentDialogComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/alcs-frontend/src/app/features/notice-of-intent/overview/uncancel-notice-of-intent-dialog/uncancel-notice-of-intent-dialog.component.ts b/alcs-frontend/src/app/features/notice-of-intent/overview/uncancel-notice-of-intent-dialog/uncancel-notice-of-intent-dialog.component.ts new file mode 100644 index 0000000000..1bc3c29baf --- /dev/null +++ b/alcs-frontend/src/app/features/notice-of-intent/overview/uncancel-notice-of-intent-dialog/uncancel-notice-of-intent-dialog.component.ts @@ -0,0 +1,60 @@ +import { Component, Inject } from '@angular/core'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; +import { DEFAULT_NO_STATUS } from '../../../../services/application/application-submission-status/application-submission-status.dto'; +import { SUBMISSION_STATUS } from '../../../../services/application/application.dto'; +import { NoticeOfIntentSubmissionStatusService } from '../../../../services/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service'; +import { NoticeOfIntentSubmissionToSubmissionStatusDto } from '../../../../services/notice-of-intent/notice-of-intent.dto'; +import { ApplicationSubmissionStatusPill } from '../../../../shared/application-submission-status-type-pill/application-submission-status-type-pill.component'; + +@Component({ + selector: 'app-uncancel-notice-of-intent-dialog', + templateUrl: './uncancel-notice-of-intent-dialog.component.html', + styleUrls: ['./uncancel-notice-of-intent-dialog.component.scss'], +}) +export class UncancelNoticeOfIntentDialogComponent { + status?: ApplicationSubmissionStatusPill; + + constructor( + public matDialogRef: MatDialogRef, + private applicationSubmissionStatusService: NoticeOfIntentSubmissionStatusService, + @Inject(MAT_DIALOG_DATA) data: { fileNumber: string } + ) { + this.calculateStatusChange(data.fileNumber); + } + + async calculateStatusChange(fileNumber: string) { + let statusHistory: NoticeOfIntentSubmissionToSubmissionStatusDto[] = []; + + try { + statusHistory = await this.applicationSubmissionStatusService.fetchSubmissionStatusesByFileNumber( + fileNumber, + false + ); + } catch (e) { + console.warn(`No statuses for ${fileNumber}. Is it a manually created submission?`); + } + + const validStatuses = statusHistory + .filter( + (status) => + status.effectiveDate && + status.statusTypeCode !== SUBMISSION_STATUS.CANCELLED && + status.effectiveDate < Date.now() + ) + .sort((a, b) => b.status.weight! - a.status.weight!); + if (validStatuses && validStatuses.length > 0) { + const validStatus = validStatuses[0].status; + this.status = { + backgroundColor: validStatus.alcsBackgroundColor, + textColor: validStatus.alcsColor, + label: validStatus.label, + }; + } else { + this.status = DEFAULT_NO_STATUS; + } + } + + onConfirm() { + this.matDialogRef.close(true); + } +} diff --git a/alcs-frontend/src/app/features/notification/applicant-info/notification-details/notification-details.component.spec.ts b/alcs-frontend/src/app/features/notification/applicant-info/notification-details/notification-details.component.spec.ts index 7949eb031f..ec06ca73f6 100644 --- a/alcs-frontend/src/app/features/notification/applicant-info/notification-details/notification-details.component.spec.ts +++ b/alcs-frontend/src/app/features/notification/applicant-info/notification-details/notification-details.component.spec.ts @@ -2,12 +2,6 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { Router } from '@angular/router'; import { createMock, DeepMocked } from '@golevelup/ts-jest'; -import { NoiDocumentService } from '../../../../services/notice-of-intent/noi-document/noi-document.service'; -import { NoticeOfIntentSubmissionService } from '../../../../services/notice-of-intent/notice-of-intent-submission/notice-of-intent-submission.service'; -import { - NOI_SUBMISSION_STATUS, - NoticeOfIntentSubmissionStatusDto, -} from '../../../../services/notice-of-intent/notice-of-intent.dto'; import { NotificationDocumentService } from '../../../../services/notification/notification-document/notification-document.service'; import { NotificationSubmissionService } from '../../../../services/notification/notification-submission/notification-submission.service'; import { diff --git a/alcs-frontend/src/app/features/notification/notification.component.html b/alcs-frontend/src/app/features/notification/notification.component.html index ba1c2052c7..fff5db19c8 100644 --- a/alcs-frontend/src/app/features/notification/notification.component.html +++ b/alcs-frontend/src/app/features/notification/notification.component.html @@ -1,9 +1,10 @@
Overview +
+

Overview

+
+ + +
+
Proposal Summary
{ provide: NotificationSubmissionStatusService, useValue: {}, }, + { + provide: ConfirmationDialogService, + useValue: {}, + }, + { + provide: MatDialog, + useValue: {}, + }, ], declarations: [OverviewComponent], schemas: [NO_ERRORS_SCHEMA], diff --git a/alcs-frontend/src/app/features/notification/overview/overview.component.ts b/alcs-frontend/src/app/features/notification/overview/overview.component.ts index 4a97c9ae50..3511807ce9 100644 --- a/alcs-frontend/src/app/features/notification/overview/overview.component.ts +++ b/alcs-frontend/src/app/features/notification/overview/overview.component.ts @@ -1,10 +1,14 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; +import { MatDialog } from '@angular/material/dialog'; import { Subject, takeUntil } from 'rxjs'; import { TimelineEventDto } from '../../../services/notice-of-intent/notice-of-intent-timeline/notice-of-intent-timeline.dto'; import { NotificationDetailService } from '../../../services/notification/notification-detail.service'; import { NotificationSubmissionStatusService } from '../../../services/notification/notification-submission-status/notification-submission-status.service'; import { NotificationTimelineService } from '../../../services/notification/notification-timeline/notification-timeline.service'; import { NOTIFICATION_STATUS, NotificationDto } from '../../../services/notification/notification.dto'; +import { ConfirmationDialogService } from '../../../shared/confirmation-dialog/confirmation-dialog.service'; +import { UncancelApplicationDialogComponent } from '../../application/overview/uncancel-application-dialog/uncancel-application-dialog.component'; +import { UncancelNotificationDialogComponent } from './uncancel-notification-dialog/uncancel-notification-dialog.component'; @Component({ selector: 'app-overview', @@ -21,7 +25,9 @@ export class OverviewComponent implements OnInit, OnDestroy { constructor( private notificationDetailService: NotificationDetailService, private notificationSubmissionService: NotificationSubmissionStatusService, - private notificationTimelineService: NotificationTimelineService + private notificationTimelineService: NotificationTimelineService, + private confirmationDialogService: ConfirmationDialogService, + private dialog: MatDialog ) {} ngOnInit(): void { @@ -54,4 +60,37 @@ export class OverviewComponent implements OnInit, OnDestroy { statusHistory.filter((status) => status.effectiveDate && status.statusTypeCode === NOTIFICATION_STATUS.CANCELLED) .length > 0; } + + async onCancel() { + this.confirmationDialogService + .openDialog({ + body: `Are you sure you want to cancel this Notification?`, + cancelButtonText: 'No', + title: 'Cancel Notification', + }) + .subscribe(async (didConfirm) => { + if (didConfirm && this.notification) { + await this.notificationDetailService.cancel(this.notification.fileNumber); + await this.loadStatusHistory(this.notification.fileNumber); + } + }); + } + + async onUncancel() { + if (this.notification) { + this.dialog + .open(UncancelNotificationDialogComponent, { + data: { + fileNumber: this.notification.fileNumber, + }, + }) + .beforeClosed() + .subscribe(async (didConfirm) => { + if (didConfirm && this.notification) { + await this.notificationDetailService.uncancel(this.notification.fileNumber); + await this.loadStatusHistory(this.notification.fileNumber); + } + }); + } + } } diff --git a/alcs-frontend/src/app/features/notification/overview/uncancel-notification-dialog/uncancel-notification-dialog.component.html b/alcs-frontend/src/app/features/notification/overview/uncancel-notification-dialog/uncancel-notification-dialog.component.html new file mode 100644 index 0000000000..e5cecaadf4 --- /dev/null +++ b/alcs-frontend/src/app/features/notification/overview/uncancel-notification-dialog/uncancel-notification-dialog.component.html @@ -0,0 +1,22 @@ +
+

Uncancel Notification

+
+ +
+

+ The notification's portal status will revert back to:

+ +

+

Are you sure you want to undo cancellation?

+
+ + + +
+ + +
+ diff --git a/alcs-frontend/src/app/features/notification/overview/uncancel-notification-dialog/uncancel-notification-dialog.component.scss b/alcs-frontend/src/app/features/notification/overview/uncancel-notification-dialog/uncancel-notification-dialog.component.scss new file mode 100644 index 0000000000..756d26e192 --- /dev/null +++ b/alcs-frontend/src/app/features/notification/overview/uncancel-notification-dialog/uncancel-notification-dialog.component.scss @@ -0,0 +1,6 @@ +.grid { + display: grid; + grid-template-columns: 1fr; + grid-column-gap: 24px; + grid-row-gap: 24px; +} diff --git a/alcs-frontend/src/app/features/notification/overview/uncancel-notification-dialog/uncancel-notification-dialog.component.spec.ts b/alcs-frontend/src/app/features/notification/overview/uncancel-notification-dialog/uncancel-notification-dialog.component.spec.ts new file mode 100644 index 0000000000..7e5e826983 --- /dev/null +++ b/alcs-frontend/src/app/features/notification/overview/uncancel-notification-dialog/uncancel-notification-dialog.component.spec.ts @@ -0,0 +1,34 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; +import { NotificationSubmissionStatusService } from '../../../../services/notification/notification-submission-status/notification-submission-status.service'; + +import { UncancelNotificationDialogComponent } from './uncancel-notification-dialog.component'; + +describe('UncancelNotificationDialogComponent', () => { + let component: UncancelNotificationDialogComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [UncancelNotificationDialogComponent], + providers: [ + { provide: MatDialogRef, useValue: {} }, + { + provide: NotificationSubmissionStatusService, + useValue: {}, + }, + { provide: MAT_DIALOG_DATA, useValue: {} }, + ], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(UncancelNotificationDialogComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/alcs-frontend/src/app/features/notification/overview/uncancel-notification-dialog/uncancel-notification-dialog.component.ts b/alcs-frontend/src/app/features/notification/overview/uncancel-notification-dialog/uncancel-notification-dialog.component.ts new file mode 100644 index 0000000000..1e5c97aa7e --- /dev/null +++ b/alcs-frontend/src/app/features/notification/overview/uncancel-notification-dialog/uncancel-notification-dialog.component.ts @@ -0,0 +1,57 @@ +import { Component, Inject } from '@angular/core'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; +import { DEFAULT_NO_STATUS } from '../../../../services/application/application-submission-status/application-submission-status.dto'; +import { SUBMISSION_STATUS } from '../../../../services/application/application.dto'; +import { NotificationSubmissionStatusService } from '../../../../services/notification/notification-submission-status/notification-submission-status.service'; +import { NotificationSubmissionToSubmissionStatusDto } from '../../../../services/notification/notification.dto'; +import { ApplicationSubmissionStatusPill } from '../../../../shared/application-submission-status-type-pill/application-submission-status-type-pill.component'; + +@Component({ + selector: 'app-uncancel-notice-of-intent-dialog', + templateUrl: './uncancel-notification-dialog.component.html', + styleUrls: ['./uncancel-notification-dialog.component.scss'], +}) +export class UncancelNotificationDialogComponent { + status?: ApplicationSubmissionStatusPill; + + constructor( + public matDialogRef: MatDialogRef, + private notificationSubmissionStatusService: NotificationSubmissionStatusService, + @Inject(MAT_DIALOG_DATA) data: { fileNumber: string } + ) { + this.calculateStatusChange(data.fileNumber); + } + + async calculateStatusChange(fileNumber: string) { + let statusHistory: NotificationSubmissionToSubmissionStatusDto[] = []; + + try { + statusHistory = await this.notificationSubmissionStatusService.fetchSubmissionStatusesByFileNumber(fileNumber); + } catch (e) { + console.warn(`No statuses for ${fileNumber}. Is it a manually created submission?`); + } + + const validStatuses = statusHistory + .filter( + (status) => + status.effectiveDate && + status.statusTypeCode !== SUBMISSION_STATUS.CANCELLED && + status.effectiveDate < Date.now() + ) + .sort((a, b) => b.status.weight! - a.status.weight!); + if (validStatuses && validStatuses.length > 0) { + const validStatus = validStatuses[0].status; + this.status = { + backgroundColor: validStatus.alcsBackgroundColor, + textColor: validStatus.alcsColor, + label: validStatus.label, + }; + } else { + this.status = DEFAULT_NO_STATUS; + } + } + + onConfirm() { + this.matDialogRef.close(true); + } +} diff --git a/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent-detail.service.ts b/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent-detail.service.ts index d8ac8bfa61..90c6ddd261 100644 --- a/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent-detail.service.ts +++ b/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent-detail.service.ts @@ -26,4 +26,14 @@ export class NoticeOfIntentDetailService { } return updatedNoticeOfIntent; } + + async cancel(fileNumber: string) { + await this.noticeOfIntentService.cancel(fileNumber); + await this.load(fileNumber); + } + + async uncancel(fileNumber: string) { + await this.noticeOfIntentService.uncancel(fileNumber); + await this.load(fileNumber); + } } diff --git a/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts b/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts index d98b15bfc6..8141055f06 100644 --- a/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts +++ b/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts @@ -27,6 +27,9 @@ describe('NoticeOfIntentSubmissionService', () => { portalColor: '', label: '', description: '', + alcsColor: '', + alcsBackgroundColor: '', + weight: 0, }, submissionStatuses: [], owners: [], diff --git a/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent.dto.ts b/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent.dto.ts index 4ae66cf6d0..a04374f568 100644 --- a/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent.dto.ts +++ b/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent.dto.ts @@ -3,6 +3,7 @@ import { SYSTEM_SOURCE_TYPES } from '../../shared/dto/system-source.types.dto'; import { ApplicationRegionDto } from '../application/application-code.dto'; import { ApplicationLocalGovernmentDto } from '../application/application-local-government/application-local-government.dto'; import { CardDto } from '../card/card.dto'; +import { NoticeOfIntentStatusDto } from './notice-of-intent-submission-status/notice-of-intent-submission-status.dto'; export interface NoticeOfIntentSubtypeDto extends BaseCodeDto { isActive: boolean; @@ -90,17 +91,11 @@ export enum NOI_SUBMISSION_STATUS { CANCELLED = 'CANC', } -export interface NoticeOfIntentSubmissionStatusDto extends BaseCodeDto { - code: NOI_SUBMISSION_STATUS; - portalBackgroundColor: string; - portalColor: string; -} - export interface NoticeOfIntentSubmissionToSubmissionStatusDto { submissionUuid: string; effectiveDate: number | null; statusTypeCode: string; - status: NoticeOfIntentSubmissionStatusDto; + status: NoticeOfIntentStatusDto; } export interface NoticeOfIntentSubmissionDto { @@ -112,7 +107,7 @@ export interface NoticeOfIntentSubmissionDto { localGovernmentUuid: string; type: string; typeCode: string; - status: NoticeOfIntentSubmissionStatusDto; + status: NoticeOfIntentStatusDto; submissionStatuses: NoticeOfIntentSubmissionToSubmissionStatusDto[]; owners: NoticeOfIntentOwnerDto[]; canEdit: boolean; diff --git a/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent.service.spec.ts b/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent.service.spec.ts index ee26bea4b1..1f8ac7de48 100644 --- a/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent.service.spec.ts +++ b/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent.service.spec.ts @@ -102,4 +102,28 @@ describe('NoticeOfIntentService', () => { expect(httpClient.get).toHaveBeenCalledTimes(1); expect(toastService.showErrorToast).toHaveBeenCalledTimes(1); }); + + it('should call post for cancel', async () => { + httpClient.post.mockReturnValue( + of({ + fileNumber: '1', + }) + ); + + await service.cancel('file-number'); + + expect(httpClient.post).toHaveBeenCalledTimes(1); + }); + + it('should call post for uncancel', async () => { + httpClient.post.mockReturnValue( + of({ + fileNumber: '1', + }) + ); + + await service.uncancel('file-number'); + + expect(httpClient.post).toHaveBeenCalledTimes(1); + }); }); diff --git a/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent.service.ts b/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent.service.ts index 823cf9f663..2a804c395b 100644 --- a/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent.service.ts +++ b/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent.service.ts @@ -2,6 +2,7 @@ import { HttpClient, HttpErrorResponse } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { firstValueFrom } from 'rxjs'; import { environment } from '../../../environments/environment'; +import { ApplicationDto } from '../application/application.dto'; import { ToastService } from '../toast/toast.service'; import { CreateNoticeOfIntentDto, @@ -83,4 +84,22 @@ export class NoticeOfIntentService { } return []; } + + async cancel(fileNumber: string) { + try { + return await firstValueFrom(this.http.post(`${this.url}/${fileNumber}/cancel`, {})); + } catch (e) { + this.toastService.showErrorToast('Failed to cancel Notice of Intent'); + } + return; + } + + async uncancel(fileNumber: string) { + try { + return await firstValueFrom(this.http.post(`${this.url}/${fileNumber}/uncancel`, {})); + } catch (e) { + this.toastService.showErrorToast('Failed to uncancel Notice of Intent'); + } + return; + } } diff --git a/alcs-frontend/src/app/services/notification/notification-detail.service.ts b/alcs-frontend/src/app/services/notification/notification-detail.service.ts index d6d3d398f6..c034970e4f 100644 --- a/alcs-frontend/src/app/services/notification/notification-detail.service.ts +++ b/alcs-frontend/src/app/services/notification/notification-detail.service.ts @@ -26,4 +26,14 @@ export class NotificationDetailService { } return updatedNotification; } + + async cancel(fileNumber: string) { + await this.notificationService.cancel(fileNumber); + await this.load(fileNumber); + } + + async uncancel(fileNumber: string) { + await this.notificationService.uncancel(fileNumber); + await this.load(fileNumber); + } } diff --git a/alcs-frontend/src/app/services/notification/notification.service.spec.ts b/alcs-frontend/src/app/services/notification/notification.service.spec.ts index 6905860aaf..dc408e4d98 100644 --- a/alcs-frontend/src/app/services/notification/notification.service.spec.ts +++ b/alcs-frontend/src/app/services/notification/notification.service.spec.ts @@ -60,4 +60,28 @@ describe('NotificationService', () => { expect(httpClient.get).toHaveBeenCalledTimes(1); expect(toastService.showErrorToast).toHaveBeenCalledTimes(1); }); + + it('should call post for cancel', async () => { + httpClient.post.mockReturnValue( + of({ + fileNumber: '1', + }) + ); + + await service.cancel('file-number'); + + expect(httpClient.post).toHaveBeenCalledTimes(1); + }); + + it('should call post for uncancel', async () => { + httpClient.post.mockReturnValue( + of({ + fileNumber: '1', + }) + ); + + await service.uncancel('file-number'); + + expect(httpClient.post).toHaveBeenCalledTimes(1); + }); }); diff --git a/alcs-frontend/src/app/services/notification/notification.service.ts b/alcs-frontend/src/app/services/notification/notification.service.ts index 3dd2a8572d..ecf5e27f9d 100644 --- a/alcs-frontend/src/app/services/notification/notification.service.ts +++ b/alcs-frontend/src/app/services/notification/notification.service.ts @@ -2,6 +2,7 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { firstValueFrom } from 'rxjs'; import { environment } from '../../../environments/environment'; +import { ApplicationDto } from '../application/application.dto'; import { ToastService } from '../toast/toast.service'; import { NotificationDto, UpdateNotificationDto } from './notification.dto'; @@ -52,4 +53,22 @@ export class NotificationService { } return []; } + + async cancel(fileNumber: string) { + try { + return await firstValueFrom(this.http.post(`${this.url}/${fileNumber}/cancel`, {})); + } catch (e) { + this.toastService.showErrorToast('Failed to cancel Notification'); + } + return; + } + + async uncancel(fileNumber: string) { + try { + return await firstValueFrom(this.http.post(`${this.url}/${fileNumber}/uncancel`, {})); + } catch (e) { + this.toastService.showErrorToast('Failed to uncancel Notification'); + } + return; + } } diff --git a/alcs-frontend/src/app/shared/details-header/details-header.component.html b/alcs-frontend/src/app/shared/details-header/details-header.component.html index 7e35fea14c..60bf4353e0 100644 --- a/alcs-frontend/src/app/shared/details-header/details-header.component.html +++ b/alcs-frontend/src/app/shared/details-header/details-header.component.html @@ -40,14 +40,14 @@
{{ _application.fileNumber }} ({{ _application.applicant }})
-
Local Government:
+
Local/First Nation Government:
{{ _application.localGovernment?.name }}
- +
{{ days }}:
 @@ -58,9 +58,5 @@
{{ _application.fileNumber }} ({{ _application.applicant }})
[type]="currentStatus" >
-
- - -
diff --git a/portal-frontend/src/app/features/notifications/notification-details/parcel/parcel.component.html b/portal-frontend/src/app/features/notifications/notification-details/parcel/parcel.component.html index e0a1efdf77..ab6eb9cefb 100644 --- a/portal-frontend/src/app/features/notifications/notification-details/parcel/parcel.component.html +++ b/portal-frontend/src/app/features/notifications/notification-details/parcel/parcel.component.html @@ -15,7 +15,6 @@

Parcel {{ parcelInd + 1 }}: Parcel and Owner Information

-
Parcel Information
Ownership Type
{{ parcel.ownershipType?.label }} diff --git a/portal-frontend/src/app/features/notifications/notification-details/proposal-details/proposal-details.component.html b/portal-frontend/src/app/features/notifications/notification-details/proposal-details/proposal-details.component.html index 6e8283ed1c..b0bc30d47a 100644 --- a/portal-frontend/src/app/features/notifications/notification-details/proposal-details/proposal-details.component.html +++ b/portal-frontend/src/app/features/notifications/notification-details/proposal-details/proposal-details.component.html @@ -38,8 +38,10 @@
File Name
Survey Plan Number
Control Number
- -
{{ file.fileName }}
+ +
{{ file.surveyPlanNumber }} diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-type/notice-of-intent-type.entity.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-type/notice-of-intent-type.entity.ts index 13355ff1b2..a707e20281 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-type/notice-of-intent-type.entity.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-type/notice-of-intent-type.entity.ts @@ -15,6 +15,14 @@ export class NoticeOfIntentType extends BaseCodeEntity { @Column() shortLabel: string; + @AutoMap() + @Column() + backgroundColor: string; + + @AutoMap() + @Column() + textColor: string; + @AutoMap() @Column({ type: 'text', default: '' }) htmlDescription: string; diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.controller.spec.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.controller.spec.ts index 6f9ec113dc..3287c9cf00 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.controller.spec.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.controller.spec.ts @@ -3,9 +3,11 @@ import { AutomapperModule } from '@automapper/nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { ClsService } from 'nestjs-cls'; +import { mockKeyCloakProviders } from '../../../test/mocks/mockTypes'; import { Board } from '../board/board.entity'; import { BoardService } from '../board/board.service'; -import { mockKeyCloakProviders } from '../../../test/mocks/mockTypes'; +import { NOI_SUBMISSION_STATUS } from './notice-of-intent-submission-status/notice-of-intent-status.dto'; +import { NoticeOfIntentSubmissionStatusService } from './notice-of-intent-submission-status/notice-of-intent-submission-status.service'; import { NoticeOfIntentController } from './notice-of-intent.controller'; import { NoticeOfIntent } from './notice-of-intent.entity'; import { NoticeOfIntentService } from './notice-of-intent.service'; @@ -14,10 +16,12 @@ describe('NoticeOfIntentController', () => { let controller: NoticeOfIntentController; let mockService: DeepMocked; let mockBoardService: DeepMocked; + let mockSubmissionStatusService: DeepMocked; beforeEach(async () => { mockService = createMock(); mockBoardService = createMock(); + mockSubmissionStatusService = createMock(); const module: TestingModule = await Test.createTestingModule({ imports: [ @@ -35,6 +39,10 @@ describe('NoticeOfIntentController', () => { provide: BoardService, useValue: mockBoardService, }, + { + provide: NoticeOfIntentSubmissionStatusService, + useValue: mockSubmissionStatusService, + }, { provide: ClsService, useValue: {}, @@ -117,4 +125,38 @@ describe('NoticeOfIntentController', () => { expect(mockService.listSubtypes).toHaveBeenCalledTimes(1); }); + + it('should call through to submission service for cancel', async () => { + mockSubmissionStatusService.setStatusDateByFileNumber.mockResolvedValue( + {} as any, + ); + + await controller.cancel('file-number'); + + expect( + mockSubmissionStatusService.setStatusDateByFileNumber, + ).toHaveBeenCalledTimes(1); + expect( + mockSubmissionStatusService.setStatusDateByFileNumber, + ).toHaveBeenCalledWith('file-number', NOI_SUBMISSION_STATUS.CANCELLED); + }); + + it('should call through to submission service for uncancel', async () => { + mockSubmissionStatusService.setStatusDateByFileNumber.mockResolvedValue( + {} as any, + ); + + await controller.uncancel('file-number'); + + expect( + mockSubmissionStatusService.setStatusDateByFileNumber, + ).toHaveBeenCalledTimes(1); + expect( + mockSubmissionStatusService.setStatusDateByFileNumber, + ).toHaveBeenCalledWith( + 'file-number', + NOI_SUBMISSION_STATUS.CANCELLED, + null, + ); + }); }); diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.controller.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.controller.ts index ad759a6dc7..bf8e327a67 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.controller.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.controller.ts @@ -8,6 +8,10 @@ import { import { UserRoles } from '../../common/authorization/roles.decorator'; import { formatIncomingDate } from '../../utils/incoming-date.formatter'; import { BoardService } from '../board/board.service'; +import { NOTIFICATION_STATUS } from '../notification/notification-submission-status/notification-status.dto'; +import { UpdateNotificationDto } from '../notification/notification.dto'; +import { NOI_SUBMISSION_STATUS } from './notice-of-intent-submission-status/notice-of-intent-status.dto'; +import { NoticeOfIntentSubmissionStatusService } from './notice-of-intent-submission-status/notice-of-intent-submission-status.service'; import { NoticeOfIntentSubtype } from './notice-of-intent-subtype.entity'; import { CreateNoticeOfIntentDto, @@ -20,6 +24,7 @@ import { NoticeOfIntentService } from './notice-of-intent.service'; export class NoticeOfIntentController { constructor( private noticeOfIntentService: NoticeOfIntentService, + private noticeOfIntentSubmissionStatusService: NoticeOfIntentSubmissionStatusService, private boardService: BoardService, @InjectMapper() private mapper: Mapper, ) {} @@ -86,6 +91,25 @@ export class NoticeOfIntentController { return mapped[0]; } + @Post('/:fileNumber/cancel') + @UserRoles(...ROLES_ALLOWED_BOARDS) + async cancel(@Param('fileNumber') fileNumber: string) { + await this.noticeOfIntentSubmissionStatusService.setStatusDateByFileNumber( + fileNumber, + NOI_SUBMISSION_STATUS.CANCELLED, + ); + } + + @Post('/:fileNumber/uncancel') + @UserRoles(...ROLES_ALLOWED_BOARDS) + async uncancel(@Param('fileNumber') fileNumber: string) { + await this.noticeOfIntentSubmissionStatusService.setStatusDateByFileNumber( + fileNumber, + NOI_SUBMISSION_STATUS.CANCELLED, + null, + ); + } + @Get('/search/:fileNumber') @UserRoles(...ROLES_ALLOWED_APPLICATIONS) async search(@Param('fileNumber') fileNumber: string) { diff --git a/services/apps/alcs/src/alcs/notification/notification-type/notification-type.entity.ts b/services/apps/alcs/src/alcs/notification/notification-type/notification-type.entity.ts index 318e214a32..dc59607527 100644 --- a/services/apps/alcs/src/alcs/notification/notification-type/notification-type.entity.ts +++ b/services/apps/alcs/src/alcs/notification/notification-type/notification-type.entity.ts @@ -15,6 +15,14 @@ export class NotificationType extends BaseCodeEntity { @Column() shortLabel: string; + @AutoMap() + @Column() + backgroundColor: string; + + @AutoMap() + @Column() + textColor: string; + @AutoMap() @Column({ type: 'text', default: '' }) htmlDescription: string; diff --git a/services/apps/alcs/src/alcs/notification/notification.controller.spec.ts b/services/apps/alcs/src/alcs/notification/notification.controller.spec.ts index cb749cb202..f2b5b4aa53 100644 --- a/services/apps/alcs/src/alcs/notification/notification.controller.spec.ts +++ b/services/apps/alcs/src/alcs/notification/notification.controller.spec.ts @@ -4,6 +4,9 @@ import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { ClsService } from 'nestjs-cls'; import { mockKeyCloakProviders } from '../../../test/mocks/mockTypes'; +import { NOI_SUBMISSION_STATUS } from '../notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status.dto'; +import { NOTIFICATION_STATUS } from './notification-submission-status/notification-status.dto'; +import { NotificationSubmissionStatusService } from './notification-submission-status/notification-submission-status.service'; import { NotificationController } from './notification.controller'; import { Notification } from './notification.entity'; import { NotificationService } from './notification.service'; @@ -11,9 +14,11 @@ import { NotificationService } from './notification.service'; describe('NotificationController', () => { let controller: NotificationController; let mockService: DeepMocked; + let mockSubmissionStatusService: DeepMocked; beforeEach(async () => { - mockService = createMock(); + mockService = createMock(); + mockSubmissionStatusService = createMock(); const module: TestingModule = await Test.createTestingModule({ imports: [ @@ -27,6 +32,10 @@ describe('NotificationController', () => { provide: NotificationService, useValue: mockService, }, + { + provide: NotificationSubmissionStatusService, + useValue: mockSubmissionStatusService, + }, { provide: ClsService, useValue: {}, @@ -81,4 +90,34 @@ describe('NotificationController', () => { expect(mockService.getByCardUuid).toHaveBeenCalledTimes(1); expect(mockService.mapToDtos).toHaveBeenCalledTimes(1); }); + + it('should call through to submission service for cancel', async () => { + mockSubmissionStatusService.setStatusDateByFileNumber.mockResolvedValue( + {} as any, + ); + + await controller.cancel('file-number'); + + expect( + mockSubmissionStatusService.setStatusDateByFileNumber, + ).toHaveBeenCalledTimes(1); + expect( + mockSubmissionStatusService.setStatusDateByFileNumber, + ).toHaveBeenCalledWith('file-number', NOTIFICATION_STATUS.CANCELLED); + }); + + it('should call through to submission service for uncancel', async () => { + mockSubmissionStatusService.setStatusDateByFileNumber.mockResolvedValue( + {} as any, + ); + + await controller.uncancel('file-number'); + + expect( + mockSubmissionStatusService.setStatusDateByFileNumber, + ).toHaveBeenCalledTimes(1); + expect( + mockSubmissionStatusService.setStatusDateByFileNumber, + ).toHaveBeenCalledWith('file-number', NOTIFICATION_STATUS.CANCELLED, null); + }); }); diff --git a/services/apps/alcs/src/alcs/notification/notification.controller.ts b/services/apps/alcs/src/alcs/notification/notification.controller.ts index 67995f54cd..ca85b61a92 100644 --- a/services/apps/alcs/src/alcs/notification/notification.controller.ts +++ b/services/apps/alcs/src/alcs/notification/notification.controller.ts @@ -6,6 +6,8 @@ import { ROLES_ALLOWED_BOARDS, } from '../../common/authorization/roles'; import { UserRoles } from '../../common/authorization/roles.decorator'; +import { NOTIFICATION_STATUS } from './notification-submission-status/notification-status.dto'; +import { NotificationSubmissionStatusService } from './notification-submission-status/notification-submission-status.service'; import { UpdateNotificationDto } from './notification.dto'; import { NotificationService } from './notification.service'; @@ -13,6 +15,7 @@ import { NotificationService } from './notification.service'; export class NotificationController { constructor( private notificationService: NotificationService, + private notificationSubmissionStatusService: NotificationSubmissionStatusService, @InjectMapper() private mapper: Mapper, ) {} @@ -50,6 +53,25 @@ export class NotificationController { return mapped[0]; } + @Post('/:fileNumber/cancel') + @UserRoles(...ROLES_ALLOWED_BOARDS) + async cancel(@Param('fileNumber') fileNumber: string) { + await this.notificationSubmissionStatusService.setStatusDateByFileNumber( + fileNumber, + NOTIFICATION_STATUS.CANCELLED, + ); + } + + @Post('/:fileNumber/uncancel') + @UserRoles(...ROLES_ALLOWED_BOARDS) + async uncancel(@Param('fileNumber') fileNumber: string) { + await this.notificationSubmissionStatusService.setStatusDateByFileNumber( + fileNumber, + NOTIFICATION_STATUS.CANCELLED, + null, + ); + } + @Get('/search/:fileNumber') @UserRoles(...ROLES_ALLOWED_APPLICATIONS) async search(@Param('fileNumber') fileNumber: string) { diff --git a/services/apps/alcs/src/alcs/notification/notification.service.ts b/services/apps/alcs/src/alcs/notification/notification.service.ts index 596440cae9..c86239aa09 100644 --- a/services/apps/alcs/src/alcs/notification/notification.service.ts +++ b/services/apps/alcs/src/alcs/notification/notification.service.ts @@ -16,7 +16,6 @@ import { } from 'typeorm'; import { FileNumberService } from '../../file-number/file-number.service'; import { filterUndefined } from '../../utils/undefined'; -import { ApplicationTimeData } from '../application/application-time-tracking.service'; import { Board } from '../board/board.entity'; import { CARD_TYPE } from '../card/card-type/card-type.entity'; import { Card } from '../card/card.entity'; diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1694540511529-add_alcs_colors_to_new_types.ts b/services/apps/alcs/src/providers/typeorm/migrations/1694540511529-add_alcs_colors_to_new_types.ts new file mode 100644 index 0000000000..4060ad67fb --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1694540511529-add_alcs_colors_to_new_types.ts @@ -0,0 +1,37 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class addAlcsColorsToNewTypes1694540511529 + implements MigrationInterface +{ + name = 'addAlcsColorsToNewTypes1694540511529'; + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_type" ADD "background_color" character varying`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_type" ADD "text_color" character varying`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notification_type" ADD "background_color" character varying`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notification_type" ADD "text_color" character varying`, + ); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `ALTER TABLE "alcs"."notification_type" DROP COLUMN "text_color"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notification_type" DROP COLUMN "background_color"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_type" DROP COLUMN "text_color"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_type" DROP COLUMN "background_color"`, + ); + } +} diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1694541245524-seed_alcs_colors.ts b/services/apps/alcs/src/providers/typeorm/migrations/1694541245524-seed_alcs_colors.ts new file mode 100644 index 0000000000..0111687959 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1694541245524-seed_alcs_colors.ts @@ -0,0 +1,45 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class seedAlcsColors1694541245524 implements MigrationInterface { + name = 'seedAlcsColors1694541245524'; + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query(` + UPDATE "alcs"."notice_of_intent_type" SET "background_color" = '#084299', "text_color" = '#fff' WHERE "code" = 'PFRS'; + UPDATE "alcs"."notice_of_intent_type" SET "background_color" = '#084299', "text_color" = '#fff' WHERE "code" = 'POFO'; + UPDATE "alcs"."notice_of_intent_type" SET "background_color" = '#084299', "text_color" = '#fff' WHERE "code" = 'ROSO'; + `); + + await queryRunner.query(` + UPDATE "alcs"."notification_type" SET "background_color" = '#59ADFA', "text_color" = '#000' WHERE "code" = 'SRW'; + `); + + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_type" ALTER COLUMN "background_color" SET NOT NULL`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_type" ALTER COLUMN "text_color" SET NOT NULL`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notification_type" ALTER COLUMN "background_color" SET NOT NULL`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notification_type" ALTER COLUMN "text_color" SET NOT NULL`, + ); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `ALTER TABLE "alcs"."notification_type" ALTER COLUMN "text_color" DROP NOT NULL`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notification_type" ALTER COLUMN "background_color" DROP NOT NULL`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_type" ALTER COLUMN "text_color" DROP NOT NULL`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_type" ALTER COLUMN "background_color" DROP NOT NULL`, + ); + } +} From 9eaf20203197851b3b5c47ef2ead251e3ba40154 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Tue, 12 Sep 2023 13:40:57 -0700 Subject: [PATCH 378/954] Text Changes --- .../notification-details/parcel/parcel.component.html | 3 +-- .../notification-details/parcel/parcel.component.html | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/alcs-frontend/src/app/features/notification/applicant-info/notification-details/parcel/parcel.component.html b/alcs-frontend/src/app/features/notification/applicant-info/notification-details/parcel/parcel.component.html index 8fd694e97f..0bdff94a3a 100644 --- a/alcs-frontend/src/app/features/notification/applicant-info/notification-details/parcel/parcel.component.html +++ b/alcs-frontend/src/app/features/notification/applicant-info/notification-details/parcel/parcel.component.html @@ -3,9 +3,8 @@

Notification Parcels

-

Parcel {{ parcelInd + 1 }}: Parcel and Owner Information

+

Parcel {{ parcelInd + 1 }} Information

-
Parcel Information
Ownership Type
{{ parcel.ownershipType?.label }} diff --git a/portal-frontend/src/app/features/notifications/notification-details/parcel/parcel.component.html b/portal-frontend/src/app/features/notifications/notification-details/parcel/parcel.component.html index ab6eb9cefb..1c72c8af27 100644 --- a/portal-frontend/src/app/features/notifications/notification-details/parcel/parcel.component.html +++ b/portal-frontend/src/app/features/notifications/notification-details/parcel/parcel.component.html @@ -2,7 +2,7 @@

1. Identify Parcel(s) Under The Statutory Right of Way

-

Parcel {{ parcelInd + 1 }}: Parcel and Owner Information

+

Parcel {{ parcelInd + 1 }} Information

Total area of corridor -
{{ diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.ts index fe3ffdb90d..8266d7abe0 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.ts @@ -97,6 +97,7 @@ export class SubdProposalComponent extends FilesStepComponent implements OnInit, if (this.showErrors) { this.form.markAllAsTouched(); + this.lotsForm.markAllAsTouched(); } this.loadParcels(this.submissionUuid); diff --git a/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.service.ts b/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.service.ts index 60038328fb..49392f6cd4 100644 --- a/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.service.ts +++ b/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.service.ts @@ -86,11 +86,11 @@ export class ApplicationOwnerService { const parcel = await this.applicationParcelService.getOneOrFail(parcelUuid); existingOwner.parcels.push(parcel); + await this.repository.save(existingOwner); + await this.updateSubmissionApplicant( existingOwner.applicationSubmissionUuid, ); - - await this.repository.save(existingOwner); } async save(owner: ApplicationOwner) { @@ -111,11 +111,11 @@ export class ApplicationOwnerService { (parcel) => parcel.uuid !== parcelUuid, ); + await this.repository.save(existingOwner); + await this.updateSubmissionApplicant( existingOwner.applicationSubmissionUuid, ); - - await this.repository.save(existingOwner); } async update(uuid: string, updateDto: ApplicationOwnerUpdateDto) { @@ -177,11 +177,14 @@ export class ApplicationOwnerService { existingOwner.email = updateDto.email !== undefined ? updateDto.email : existingOwner.email; + const result = await this.repository.save(existingOwner); + + //Save owner before updating await this.updateSubmissionApplicant( existingOwner.applicationSubmissionUuid, ); - return await this.repository.save(existingOwner); + return result; } async delete(owner: ApplicationOwner) { diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.service.ts b/services/apps/alcs/src/portal/application-submission/application-submission.service.ts index 2e25515371..216affaf5d 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.service.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.service.ts @@ -730,20 +730,26 @@ export class ApplicationSubmissionService { application: ApplicationSubmission, updateDto: ApplicationSubmissionUpdateDto, ) { - application.turAgriculturalActivities = - updateDto.turAgriculturalActivities || - application.turAgriculturalActivities; - application.turReduceNegativeImpacts = - updateDto.turReduceNegativeImpacts || - application.turReduceNegativeImpacts; - application.turOutsideLands = - updateDto.turOutsideLands || application.turOutsideLands; - application.turTotalCorridorArea = - updateDto.turTotalCorridorArea || application.turTotalCorridorArea; - application.turAllOwnersNotified = - updateDto.turAllOwnersNotified !== undefined - ? updateDto.turAllOwnersNotified - : application.turAllOwnersNotified; + application.turAgriculturalActivities = filterUndefined( + updateDto.turAgriculturalActivities, + application.turAgriculturalActivities, + ); + application.turReduceNegativeImpacts = filterUndefined( + updateDto.turReduceNegativeImpacts, + application.turReduceNegativeImpacts, + ); + application.turOutsideLands = filterUndefined( + updateDto.turOutsideLands, + application.turOutsideLands, + ); + application.turTotalCorridorArea = filterUndefined( + updateDto.turTotalCorridorArea, + application.turTotalCorridorArea, + ); + application.turAllOwnersNotified = filterUndefined( + updateDto.turAllOwnersNotified, + application.turAllOwnersNotified, + ); return application; } @@ -751,18 +757,22 @@ export class ApplicationSubmissionService { applicationSubmission: ApplicationSubmission, updateDto: ApplicationSubmissionUpdateDto, ) { - applicationSubmission.subdSuitability = - updateDto.subdSuitability || applicationSubmission.subdSuitability; - applicationSubmission.subdAgricultureSupport = - updateDto.subdAgricultureSupport || - applicationSubmission.subdAgricultureSupport; - applicationSubmission.subdIsHomeSiteSeverance = - updateDto.subdIsHomeSiteSeverance !== undefined - ? updateDto.subdIsHomeSiteSeverance - : applicationSubmission.subdIsHomeSiteSeverance; - applicationSubmission.subdProposedLots = - updateDto.subdProposedLots || applicationSubmission.subdProposedLots; - + applicationSubmission.subdSuitability = filterUndefined( + updateDto.subdSuitability, + applicationSubmission.subdSuitability, + ); + applicationSubmission.subdAgricultureSupport = filterUndefined( + updateDto.subdAgricultureSupport, + applicationSubmission.subdAgricultureSupport, + ); + applicationSubmission.subdIsHomeSiteSeverance = filterUndefined( + updateDto.subdIsHomeSiteSeverance, + applicationSubmission.subdIsHomeSiteSeverance, + ); + applicationSubmission.subdProposedLots = filterUndefined( + updateDto.subdProposedLots, + applicationSubmission.subdProposedLots, + ); if (updateDto.subdIsHomeSiteSeverance === false) { const applicationUuid = await this.applicationService.getUuid( applicationSubmission.fileNumber, From c2de96a0bb2599043a8ba52ed1be996f528d41e6 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Wed, 13 Sep 2023 14:52:45 -0700 Subject: [PATCH 381/954] Set Structure Types Directly on Value Change --- .../additional-information.component.html | 2 +- .../additional-information/additional-information.component.ts | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component.html index 1cdb76bb5a..d7927cab2d 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component.html @@ -82,7 +82,7 @@

Additional Proposal Information

[value]="element.type" placeholder="Please select" [formControlName]="i + '-type'" - (valueChange)="onChangeStructureType()" + (valueChange)="onChangeStructureType(i, $event)" > {{ type }} diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component.ts index fb08fa5f3a..af693624ed 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component.ts @@ -263,7 +263,8 @@ export class AdditionalInformationComponent extends FilesStepComponent implement } } - onChangeStructureType() { + onChangeStructureType(index: number, value: STRUCTURE_TYPES) { + this.proposedStructures[index].type = value; this.prepareStructureSpecificTextInputs(); this.form.markAsDirty(); } From 62a0a56cf45fc45131610c2ac430637838e999a9 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Wed, 13 Sep 2023 14:52:57 -0700 Subject: [PATCH 382/954] Show Documents when in status thats NOT in progress --- .../view-submission/alc-review/alc-review.component.html | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/portal-frontend/src/app/features/notice-of-intents/view-submission/alc-review/alc-review.component.html b/portal-frontend/src/app/features/notice-of-intents/view-submission/alc-review/alc-review.component.html index a080e0c620..62ad509a57 100644 --- a/portal-frontend/src/app/features/notice-of-intents/view-submission/alc-review/alc-review.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/view-submission/alc-review/alc-review.component.html @@ -15,12 +15,7 @@

ALC Review and Decision

This section will update after the Notice of Intent is submitted to the ALC.
-
+
From 8cd95f15323b12f53fc4388d78ac48b75f9bfe63 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Wed, 13 Sep 2023 15:27:20 -0700 Subject: [PATCH 383/954] More Bug Fixes * Apply applicant fixes to NOIs and Notifications * Fix type not showing in NOI / Notification header * Remove government label for Notifications (no review) --- .../notice-of-intent-dialog.component.html | 1 + .../notice-of-intent.component.html | 3 --- .../notice-of-intent.component.ts | 2 +- .../notification/notification.component.html | 2 -- .../details-header.component.ts | 2 +- .../select-government.component.html | 5 ----- .../select-government.component.ts | 4 ---- .../notice-of-intent.controller.ts | 2 -- ...tice-of-intent-submission-draft.service.ts | 1 + .../notice-of-intent-owner.controller.ts | 2 ++ .../notice-of-intent-owner.service.spec.ts | 1 + .../notice-of-intent-owner.service.ts | 21 +++++++++++++------ .../notification-transferee.service.ts | 8 +++++-- 13 files changed, 28 insertions(+), 26 deletions(-) diff --git a/alcs-frontend/src/app/features/board/dialogs/notice-of-intent/notice-of-intent-dialog.component.html b/alcs-frontend/src/app/features/board/dialogs/notice-of-intent/notice-of-intent-dialog.component.html index 56fb88abcc..29b4761b72 100644 --- a/alcs-frontend/src/app/features/board/dialogs/notice-of-intent/notice-of-intent-dialog.component.html +++ b/alcs-frontend/src/app/features/board/dialogs/notice-of-intent/notice-of-intent-dialog.component.html @@ -9,6 +9,7 @@
Notice of Intent

{{ cardTitle }} +
(); @Input() heading = 'Title Here'; - @Input() types: ApplicationTypeDto[] = []; @Input() days = 'Calendar Days'; @Input() showStatus = false; @Input() submissionStatusService?: @@ -42,6 +41,7 @@ export class DetailsHeaderComponent { legacyId?: string; _application: ApplicationDto | CommissionerApplicationDto | NoticeOfIntentDto | NotificationDto | undefined; + types: ApplicationTypeDto[] = []; timeTrackable?: TimeTrackable; @Input() set application( diff --git a/portal-frontend/src/app/features/notifications/edit-submission/select-government/select-government.component.html b/portal-frontend/src/app/features/notifications/edit-submission/select-government/select-government.component.html index f0d962adb0..0f12565ff4 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/select-government/select-government.component.html +++ b/portal-frontend/src/app/features/notifications/edit-submission/select-government/select-government.component.html @@ -45,11 +45,6 @@

Government

will need to contact the ALC directly:  ALC.Portal@gov.bc.ca / 236-468-3342 - - 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 application is - submitted. -

Please Note: If your Local or First Nation Government is not listed, please contact the ALC directly. ALC.Portal@gov.bc.ca / 236-468-3342 diff --git a/portal-frontend/src/app/features/notifications/edit-submission/select-government/select-government.component.ts b/portal-frontend/src/app/features/notifications/edit-submission/select-government/select-government.component.ts index 57e9d676e9..a7d986ce17 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/select-government/select-government.component.ts +++ b/portal-frontend/src/app/features/notifications/edit-submission/select-government/select-government.component.ts @@ -21,7 +21,6 @@ export class SelectGovernmentComponent extends StepComponent implements OnInit, localGovernment = new FormControl('', [Validators.required]); showWarning = false; - selectedOwnGovernment = false; selectGovernmentUuid = ''; localGovernments: LocalGovernmentDto[] = []; filteredLocalGovernments!: Observable; @@ -71,8 +70,6 @@ export class SelectGovernmentComponent extends StepComponent implements OnInit, } else { this.localGovernment.setErrors({ invalid: localGovernment.hasGuid }); } - - this.selectedOwnGovernment = localGovernment.matchesUserGuid; } } } @@ -138,7 +135,6 @@ export class SelectGovernmentComponent extends StepComponent implements OnInit, if (!lg.hasGuid) { this.localGovernment.setErrors({ invalid: true }); } - this.selectedOwnGovernment = lg.matchesUserGuid; } } } diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.controller.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.controller.ts index bf8e327a67..be8af36657 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.controller.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.controller.ts @@ -8,8 +8,6 @@ import { import { UserRoles } from '../../common/authorization/roles.decorator'; import { formatIncomingDate } from '../../utils/incoming-date.formatter'; import { BoardService } from '../board/board.service'; -import { NOTIFICATION_STATUS } from '../notification/notification-submission-status/notification-status.dto'; -import { UpdateNotificationDto } from '../notification/notification.dto'; import { NOI_SUBMISSION_STATUS } from './notice-of-intent-submission-status/notice-of-intent-status.dto'; import { NoticeOfIntentSubmissionStatusService } from './notice-of-intent-submission-status/notice-of-intent-submission-status.service'; import { NoticeOfIntentSubtype } from './notice-of-intent-subtype.entity'; diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission-draft/notice-of-intent-submission-draft.service.ts b/services/apps/alcs/src/portal/notice-of-intent-submission-draft/notice-of-intent-submission-draft.service.ts index c3155ba577..0694fa8a79 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission-draft/notice-of-intent-submission-draft.service.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission-draft/notice-of-intent-submission-draft.service.ts @@ -120,6 +120,7 @@ export class NoticeOfIntentSubmissionDraftService { noticeOfIntentSubmissionUuid: savedSubmission.uuid, }, savedSubmission, + user, ); ownerUuidMap.set(owner.uuid, savedOwner.uuid); } diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.controller.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.controller.ts index ed651d0bd1..5ee792ba26 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.controller.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.controller.ts @@ -77,6 +77,7 @@ export class NoticeOfIntentOwnerController { const owner = await this.ownerService.create( createDto, noticeOfIntentSubmission, + req.user.entity, ); return this.mapper.mapAsync( @@ -189,6 +190,7 @@ export class NoticeOfIntentOwnerController { noticeOfIntentSubmissionUuid: data.noticeOfIntentSubmissionUuid, }, applicationSubmission, + req.user.entity, ); await this.ownerService.setPrimaryContact( applicationSubmission.uuid, diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.service.spec.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.service.spec.ts index 1d3754d0bc..e95afb4044 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.service.spec.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.service.spec.ts @@ -101,6 +101,7 @@ describe('NoticeOfIntentOwnerService', () => { typeCode: '', }, new NoticeOfIntentSubmission(), + new User(), ); expect(mockRepo.save).toHaveBeenCalledTimes(1); diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.service.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.service.ts index 0640d90f05..0081fb4d38 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.service.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.service.ts @@ -52,6 +52,7 @@ export class NoticeOfIntentOwnerService { async create( createDto: NoticeOfIntentOwnerCreateDto, noticeOfIntentSubmission: NoticeOfIntentSubmission, + user: User, ) { const type = await this.typeRepository.findOneOrFail({ where: { @@ -70,7 +71,14 @@ export class NoticeOfIntentOwnerService { type, }); - return await this.repository.save(newOwner); + const savedOwner = await this.repository.save(newOwner); + + await this.updateSubmissionApplicant( + savedOwner.noticeOfIntentSubmissionUuid, + user, + ); + + return savedOwner; } async attachToParcel(uuid: string, parcelUuid: string, user: User) { @@ -88,12 +96,12 @@ export class NoticeOfIntentOwnerService { ); existingOwner.parcels.push(parcel); + await this.repository.save(existingOwner); + await this.updateSubmissionApplicant( existingOwner.noticeOfIntentSubmissionUuid, user, ); - - await this.repository.save(existingOwner); } async save(owner: NoticeOfIntentOwner) { @@ -113,13 +121,12 @@ export class NoticeOfIntentOwnerService { existingOwner.parcels = existingOwner.parcels.filter( (parcel) => parcel.uuid !== parcelUuid, ); + await this.repository.save(existingOwner); await this.updateSubmissionApplicant( existingOwner.noticeOfIntentSubmissionUuid, user, ); - - await this.repository.save(existingOwner); } async update( @@ -185,12 +192,14 @@ export class NoticeOfIntentOwnerService { existingOwner.email = updateDto.email !== undefined ? updateDto.email : existingOwner.email; + const savedOwner = await this.repository.save(existingOwner); + await this.updateSubmissionApplicant( existingOwner.noticeOfIntentSubmissionUuid, user, ); - return await this.repository.save(existingOwner); + return savedOwner; } async delete(owner: NoticeOfIntentOwner, user: User) { diff --git a/services/apps/alcs/src/portal/notification-submission/notification-transferee/notification-transferee.service.ts b/services/apps/alcs/src/portal/notification-submission/notification-transferee/notification-transferee.service.ts index da5b942f18..c23d3e0e63 100644 --- a/services/apps/alcs/src/portal/notification-submission/notification-transferee/notification-transferee.service.ts +++ b/services/apps/alcs/src/portal/notification-submission/notification-transferee/notification-transferee.service.ts @@ -59,12 +59,14 @@ export class NotificationTransfereeService { type, }); + const savedOwner = await this.repository.save(newOwner); + await this.updateSubmissionApplicant( newOwner.notificationSubmissionUuid, user, ); - return await this.repository.save(newOwner); + return savedOwner; } async save(owner: NotificationTransferee) { @@ -112,12 +114,14 @@ export class NotificationTransfereeService { existingOwner.email = updateDto.email !== undefined ? updateDto.email : existingOwner.email; + const savedOwner = await this.repository.save(existingOwner); + await this.updateSubmissionApplicant( existingOwner.notificationSubmissionUuid, user, ); - return await this.repository.save(existingOwner); + return savedOwner; } async delete(owner: NotificationTransferee, user: User) { From a7668844bca31bb8a68a9e90accce75bbdced8ff Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Wed, 13 Sep 2023 15:55:49 -0700 Subject: [PATCH 384/954] Show Release Status in NOI Release Decision Dialog --- .../release-dialog.component.spec.ts | 12 +++--- .../release-dialog.component.ts | 37 ++++++++++--------- ...f-intent-submission-status.service.spec.ts | 16 ++++++++ ...ice-of-intent-submission-status.service.ts | 14 ++++++- ...ntent-submission-status.controller.spec.ts | 11 ++++++ ...-of-intent-submission-status.controller.ts | 18 ++++++++- ...f-intent-submission-status.service.spec.ts | 7 ++++ ...ice-of-intent-submission-status.service.ts | 4 ++ 8 files changed, 93 insertions(+), 26 deletions(-) diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/release-dialog/release-dialog.component.spec.ts b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/release-dialog/release-dialog.component.spec.ts index 4ff7b1b86f..2bca511f5d 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/release-dialog/release-dialog.component.spec.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/release-dialog/release-dialog.component.spec.ts @@ -3,21 +3,19 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { BehaviorSubject } from 'rxjs'; -import { ApplicationService } from '../../../../../services/application/application.service'; -import { ApplicationDecisionV2Service } from '../../../../../services/application/decision/application-decision-v2/application-decision-v2.service'; import { NoticeOfIntentDecisionV2Service } from '../../../../../services/notice-of-intent/decision-v2/notice-of-intent-decision-v2.service'; import { NoticeOfIntentDecisionDto } from '../../../../../services/notice-of-intent/decision/notice-of-intent-decision.dto'; -import { NoticeOfIntentService } from '../../../../../services/notice-of-intent/notice-of-intent.service'; +import { NoticeOfIntentSubmissionStatusService } from '../../../../../services/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service'; import { ReleaseDialogComponent } from './release-dialog.component'; describe('ReleaseDialogComponent', () => { let component: ReleaseDialogComponent; let fixture: ComponentFixture; - let mockNOIService: DeepMocked; + let mockNOISubmissionStatusService: DeepMocked; let mockNOIDecisionV2Service: DeepMocked; beforeEach(async () => { - mockNOIService = createMock(); + mockNOISubmissionStatusService = createMock(); mockNOIDecisionV2Service = createMock(); mockNOIDecisionV2Service.$decision = new BehaviorSubject(undefined); @@ -25,8 +23,8 @@ describe('ReleaseDialogComponent', () => { declarations: [ReleaseDialogComponent], providers: [ { - provide: NoticeOfIntentService, - useValue: mockNOIService, + provide: NoticeOfIntentSubmissionStatusService, + useValue: mockNOISubmissionStatusService, }, { provide: NoticeOfIntentDecisionV2Service, diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/release-dialog/release-dialog.component.ts b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/release-dialog/release-dialog.component.ts index 9411c72448..ff6be9d9c4 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/release-dialog/release-dialog.component.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/release-dialog/release-dialog.component.ts @@ -2,7 +2,8 @@ import { Component, Inject, OnDestroy, OnInit } from '@angular/core'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { Subject, takeUntil } from 'rxjs'; import { NoticeOfIntentDecisionV2Service } from '../../../../../services/notice-of-intent/decision-v2/notice-of-intent-decision-v2.service'; -import { NoticeOfIntentService } from '../../../../../services/notice-of-intent/notice-of-intent.service'; +import { NoticeOfIntentSubmissionStatusService } from '../../../../../services/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service'; +import { NOI_SUBMISSION_STATUS } from '../../../../../services/notice-of-intent/notice-of-intent.dto'; import { ApplicationPill } from '../../../../../shared/application-type-pill/application-type-pill.component'; @Component({ @@ -16,33 +17,35 @@ export class ReleaseDialogComponent implements OnInit, OnDestroy { wasReleased = false; constructor( - private noticeOfIntentService: NoticeOfIntentService, + private noticeOfIntentSubmissionStatusService: NoticeOfIntentSubmissionStatusService, private decisionService: NoticeOfIntentDecisionV2Service, public matDialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) data: any ) {} ngOnInit(): void { - // this.applicationService.$applicationStatuses.pipe(takeUntil(this.$destroy)).subscribe((statuses) => { - // if (statuses) { - // const releasedStatus = statuses.find((status) => status.code === SUBMISSION_STATUS.ALC_DECISION); - // if (releasedStatus) { - // this.mappedType = { - // label: releasedStatus.label, - // backgroundColor: releasedStatus.alcsBackgroundColor, - // borderColor: releasedStatus.alcsBackgroundColor, - // textColor: releasedStatus.alcsColor, - // shortLabel: releasedStatus.label, - // }; - // } - // } - // }); - this.decisionService.$decision.pipe(takeUntil(this.$destroy)).subscribe((decision) => { if (decision) { this.wasReleased = decision.wasReleased; } }); + this.loadStatuses(); + } + + private async loadStatuses() { + const statuses = await this.noticeOfIntentSubmissionStatusService.listStatuses(); + if (statuses) { + const releasedStatus = statuses.find((status) => status.code === NOI_SUBMISSION_STATUS.ALC_DECISION); + if (releasedStatus) { + this.mappedType = { + label: releasedStatus.label, + backgroundColor: releasedStatus.alcsBackgroundColor, + borderColor: releasedStatus.alcsBackgroundColor, + textColor: releasedStatus.alcsColor, + shortLabel: releasedStatus.label, + }; + } + } } ngOnDestroy(): void { diff --git a/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service.spec.ts b/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service.spec.ts index d55254c01d..e92847e27a 100644 --- a/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service.spec.ts +++ b/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service.spec.ts @@ -33,6 +33,22 @@ describe('NoticeOfIntentSubmissionStatusService', () => { expect(service).toBeTruthy(); }); + it('should call get for list all statuses', async () => { + mockHttpClient.get.mockReturnValue( + of([ + { + code: 'fake', + }, + ]) + ); + + const res = await service.listStatuses(); + + expect(mockHttpClient.get).toHaveBeenCalledTimes(1); + expect(res.length).toEqual(1); + expect(res[0].code).toEqual('fake'); + }); + it('should fetch statuses by fileNumber', async () => { mockHttpClient.get.mockReturnValue( of([ diff --git a/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service.ts b/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service.ts index 8e814dba64..29592dc7dd 100644 --- a/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service.ts +++ b/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service.ts @@ -3,7 +3,10 @@ import { Injectable } from '@angular/core'; import { firstValueFrom } from 'rxjs'; import { environment } from '../../../../environments/environment'; import { ToastService } from '../../toast/toast.service'; -import { NoticeOfIntentSubmissionToSubmissionStatusDto } from './notice-of-intent-submission-status.dto'; +import { + NoticeOfIntentStatusDto, + NoticeOfIntentSubmissionToSubmissionStatusDto, +} from './notice-of-intent-submission-status.dto'; @Injectable({ providedIn: 'root', @@ -13,6 +16,15 @@ export class NoticeOfIntentSubmissionStatusService { constructor(private http: HttpClient, private toastService: ToastService) {} + async listStatuses(): Promise { + try { + return await firstValueFrom(this.http.get(`${this.baseUrl}`)); + } catch (e) { + this.toastService.showErrorToast('Failed to fetch NOI Statuses'); + throw e; + } + } + async fetchSubmissionStatusesByFileNumber( fileNumber: string, showErrorToast = true diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.controller.spec.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.controller.spec.ts index ae0c05be98..e8b908a840 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.controller.spec.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.controller.spec.ts @@ -46,6 +46,17 @@ describe('NoticeOfIntentSubmissionStatusController', () => { expect(controller).toBeDefined(); }); + it('should call the service for list statuses', async () => { + mockNoticeOfIntentSubmissionStatusService.listStatuses.mockResolvedValue( + [], + ); + + await controller.listStatuses(); + expect( + mockNoticeOfIntentSubmissionStatusService.listStatuses, + ).toHaveBeenCalledTimes(1); + }); + it('should call service to get statuses by file number', async () => { const fakeFileNumber = 'fake'; diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.controller.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.controller.ts index c1810cfe9d..6ad45643f4 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.controller.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.controller.ts @@ -3,7 +3,11 @@ import { InjectMapper } from '@automapper/nestjs'; import { Controller, Get, Param } from '@nestjs/common'; import { ANY_AUTH_ROLE } from '../../../common/authorization/roles'; import { UserRoles } from '../../../common/authorization/roles.decorator'; -import { NoticeOfIntentSubmissionToSubmissionStatusDto } from './notice-of-intent-status.dto'; +import { NoticeOfIntentSubmissionStatusType } from './notice-of-intent-status-type.entity'; +import { + NoticeOfIntentStatusDto, + NoticeOfIntentSubmissionToSubmissionStatusDto, +} from './notice-of-intent-status.dto'; import { NoticeOfIntentSubmissionToSubmissionStatus } from './notice-of-intent-status.entity'; import { NoticeOfIntentSubmissionStatusService } from './notice-of-intent-submission-status.service'; @@ -15,6 +19,18 @@ export class NoticeOfIntentSubmissionStatusController { @InjectMapper() private mapper: Mapper, ) {} + @Get('') + async listStatuses() { + const statuses = + await this.noticeOfIntentSubmissionStatusService.listStatuses(); + + return this.mapper.mapArrayAsync( + statuses, + NoticeOfIntentSubmissionStatusType, + NoticeOfIntentStatusDto, + ); + } + @Get('/:fileNumber') async getStatusesByFileNumber(@Param('fileNumber') fileNumber) { const statuses = diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service.spec.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service.spec.ts index 76f066f522..44c5533dc9 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service.spec.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service.spec.ts @@ -63,6 +63,13 @@ describe('NoticeOfIntentSubmissionStatusService', () => { expect(service).toBeDefined(); }); + it('should load all statuses from the repo', async () => { + mockSubmissionStatusTypeRepository.find.mockResolvedValue([]); + + await service.listStatuses(); + expect(mockSubmissionStatusTypeRepository.find).toHaveBeenCalledTimes(1); + }); + it('should successfully set initial statuses', async () => { mockSubmissionStatusTypeRepository.find.mockResolvedValue([ new NoticeOfIntentSubmissionStatusType({ diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service.ts index 1259bb3ee3..8e0c467a02 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service.ts @@ -24,6 +24,10 @@ export class NoticeOfIntentSubmissionStatusService { private noticeOfIntentSubmissionRepository: Repository, ) {} + async listStatuses() { + return this.submissionStatusTypeRepository.find(); + } + async setInitialStatuses(submissionUuid: string, persist = true) { const statuses = await this.submissionStatusTypeRepository.find(); const newStatuses: NoticeOfIntentSubmissionToSubmissionStatus[] = []; From b033331d47656a09ad9831b1942547df6fdd6a4e Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Thu, 14 Sep 2023 13:03:17 -0700 Subject: [PATCH 385/954] Add SRW PDF Generation * Add new template * Generate and attach PDF on submission * Set status to ALC Response --- .../notification-document.service.ts | 46 ++++++ .../alcs/src/document/document-code.entity.ts | 3 + ...notification-submission.controller.spec.ts | 17 ++ .../notification-submission.controller.ts | 17 ++ .../notification-submission.module.ts | 2 + .../notification-submission.service.ts | 2 +- .../generate-srw-document.service.spec.ts | 104 ++++++++++++ .../generate-srw-document.service.ts | 152 ++++++++++++++++++ .../pdf-generation/pdf-generation.module.ts | 17 +- .../1694719959518-add_ltsa_doc_type.ts | 13 ++ services/apps/alcs/src/utils/pid-formatter.ts | 3 + .../templates/pdf/srw-response-template.docx | Bin 0 -> 21166 bytes 12 files changed, 373 insertions(+), 3 deletions(-) create mode 100644 services/apps/alcs/src/portal/pdf-generation/generate-srw-document.service.spec.ts create mode 100644 services/apps/alcs/src/portal/pdf-generation/generate-srw-document.service.ts create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1694719959518-add_ltsa_doc_type.ts create mode 100644 services/apps/alcs/src/utils/pid-formatter.ts create mode 100644 services/templates/pdf/srw-response-template.docx diff --git a/services/apps/alcs/src/alcs/notification/notification-document/notification-document.service.ts b/services/apps/alcs/src/alcs/notification/notification-document/notification-document.service.ts index 5266b19f00..8fe160e506 100644 --- a/services/apps/alcs/src/alcs/notification/notification-document/notification-document.service.ts +++ b/services/apps/alcs/src/alcs/notification/notification-document/notification-document.service.ts @@ -84,6 +84,52 @@ export class NotificationDocumentService { return this.notificationDocumentRepository.save(appDocument); } + async attachDocumentAsBuffer({ + fileNumber, + fileName, + file, + mimeType, + fileSize, + documentType, + user, + system, + source = DOCUMENT_SOURCE.ALC, + visibilityFlags, + }: { + fileNumber: string; + fileName: string; + file: Buffer; + mimeType: string; + fileSize: number; + user: User; + documentType: DOCUMENT_TYPE; + source?: DOCUMENT_SOURCE; + system: DOCUMENT_SYSTEM; + visibilityFlags: VISIBILITY_FLAG[]; + }) { + const notification = await this.notificationService.getByFileNumber( + fileNumber, + ); + const document = await this.documentService.createFromBuffer( + `notification/${fileNumber}`, + fileName, + file, + mimeType, + fileSize, + user, + source, + system, + ); + const appDocument = new NotificationDocument({ + typeCode: documentType, + notification, + document, + visibilityFlags, + }); + + return this.notificationDocumentRepository.save(appDocument); + } + async get(uuid: string) { const document = await this.notificationDocumentRepository.findOne({ where: { diff --git a/services/apps/alcs/src/document/document-code.entity.ts b/services/apps/alcs/src/document/document-code.entity.ts index b06096c7cc..acbe31bad9 100644 --- a/services/apps/alcs/src/document/document-code.entity.ts +++ b/services/apps/alcs/src/document/document-code.entity.ts @@ -30,6 +30,9 @@ export enum DOCUMENT_TYPE { SRW_TERMS = 'SRTD', SURVEY_PLAN = 'SURV', + //Notifications + LTSA_LETTER = 'LTSA', + ORIGINAL_SUBMISSION = 'SUBO', UPDATED_SUBMISSION = 'SUBU', } diff --git a/services/apps/alcs/src/portal/notification-submission/notification-submission.controller.spec.ts b/services/apps/alcs/src/portal/notification-submission/notification-submission.controller.spec.ts index e813a9cc24..da1a7918d4 100644 --- a/services/apps/alcs/src/portal/notification-submission/notification-submission.controller.spec.ts +++ b/services/apps/alcs/src/portal/notification-submission/notification-submission.controller.spec.ts @@ -14,6 +14,7 @@ import { Notification } from '../../alcs/notification/notification.entity'; import { NotificationSubmissionProfile } from '../../common/automapper/notification-submission.automapper.profile'; import { EmailService } from '../../providers/email/email.service'; import { User } from '../../user/user.entity'; +import { GenerateSrwDocumentService } from '../pdf-generation/generate-srw-document.service'; import { NotificationSubmissionValidatorService, ValidatedNotificationSubmission, @@ -34,6 +35,7 @@ describe('NotificationSubmissionController', () => { let mockDocumentService: DeepMocked; let mockLgService: DeepMocked; let mockEmailService: DeepMocked; + let mockSrwDocumentService: DeepMocked; const primaryContactOwnerUuid = 'primary-contact'; const localGovernmentUuid = 'local-government'; @@ -46,6 +48,7 @@ describe('NotificationSubmissionController', () => { mockLgService = createMock(); mockEmailService = createMock(); mockNotificationValidationService = createMock(); + mockSrwDocumentService = createMock(); const module: TestingModule = await Test.createTestingModule({ controllers: [NotificationSubmissionController], @@ -71,6 +74,10 @@ describe('NotificationSubmissionController', () => { provide: EmailService, useValue: mockEmailService, }, + { + provide: GenerateSrwDocumentService, + useValue: mockSrwDocumentService, + }, { provide: ClsService, useValue: {}, @@ -290,6 +297,8 @@ describe('NotificationSubmissionController', () => { mockSubmission as ValidatedNotificationSubmission, errors: [], }); + mockSrwDocumentService.generateAndAttach.mockResolvedValue(); + mockNotificationSubmissionService.updateStatus.mockResolvedValue(); await controller.submitAsApplicant(mockFileId, { user: { @@ -306,5 +315,13 @@ describe('NotificationSubmissionController', () => { expect( mockNotificationSubmissionService.mapToDetailedDTO, ).toHaveBeenCalledTimes(1); + expect(mockSrwDocumentService.generateAndAttach).toHaveBeenCalledTimes(1); + expect( + mockNotificationSubmissionService.updateStatus, + ).toHaveBeenCalledTimes(1); + expect(mockNotificationSubmissionService.updateStatus).toHaveBeenCalledWith( + undefined, + NOTIFICATION_STATUS.ALC_RESPONSE_SENT, + ); }); }); diff --git a/services/apps/alcs/src/portal/notification-submission/notification-submission.controller.ts b/services/apps/alcs/src/portal/notification-submission/notification-submission.controller.ts index 13f1e08f46..6d091ec10a 100644 --- a/services/apps/alcs/src/portal/notification-submission/notification-submission.controller.ts +++ b/services/apps/alcs/src/portal/notification-submission/notification-submission.controller.ts @@ -13,8 +13,10 @@ import { import { NOTIFICATION_STATUS } from '../../alcs/notification/notification-submission-status/notification-status.dto'; import { PortalAuthGuard } from '../../common/authorization/portal-auth-guard.service'; import { User } from '../../user/user.entity'; +import { GenerateSrwDocumentService } from '../pdf-generation/generate-srw-document.service'; import { NotificationSubmissionValidatorService } from './notification-submission-validator.service'; import { NotificationSubmissionUpdateDto } from './notification-submission.dto'; +import { NotificationSubmission } from './notification-submission.entity'; import { NotificationSubmissionService } from './notification-submission.service'; @Controller('notification-submission') @@ -25,6 +27,7 @@ export class NotificationSubmissionController { constructor( private notificationSubmissionService: NotificationSubmissionService, private notificationValidationService: NotificationSubmissionValidatorService, + private generateSrwDocumentService: GenerateSrwDocumentService, ) {} @Get() @@ -145,6 +148,8 @@ export class NotificationSubmissionController { validatedApplicationSubmission, ); + await this.generatePdf(notificationSubmission, req.user.entity); + const finalSubmission = await this.notificationSubmissionService.getByUuid( uuid, @@ -160,4 +165,16 @@ export class NotificationSubmissionController { throw new BadRequestException('Invalid Notification'); } } + + private async generatePdf(submission: NotificationSubmission, user: User) { + await this.generateSrwDocumentService.generateAndAttach( + submission.fileNumber, + user, + ); + + await this.notificationSubmissionService.updateStatus( + submission.uuid, + NOTIFICATION_STATUS.ALC_RESPONSE_SENT, + ); + } } diff --git a/services/apps/alcs/src/portal/notification-submission/notification-submission.module.ts b/services/apps/alcs/src/portal/notification-submission/notification-submission.module.ts index 095ccccaa1..bf855caf97 100644 --- a/services/apps/alcs/src/portal/notification-submission/notification-submission.module.ts +++ b/services/apps/alcs/src/portal/notification-submission/notification-submission.module.ts @@ -11,6 +11,7 @@ import { NotificationTransfereeProfile } from '../../common/automapper/notificat import { OwnerType } from '../../common/owner-type/owner-type.entity'; import { DocumentModule } from '../../document/document.module'; import { FileNumberModule } from '../../file-number/file-number.module'; +import { PdfGenerationModule } from '../pdf-generation/pdf-generation.module'; import { NotificationParcelController } from './notification-parcel/notification-parcel.controller'; import { NotificationParcel } from './notification-parcel/notification-parcel.entity'; import { NotificationParcelService } from './notification-parcel/notification-parcel.service'; @@ -34,6 +35,7 @@ import { NotificationTransfereeService } from './notification-transferee/notific forwardRef(() => AuthorizationModule), forwardRef(() => DocumentModule), forwardRef(() => BoardModule), + forwardRef(() => PdfGenerationModule), LocalGovernmentModule, FileNumberModule, NotificationSubmissionStatusModule, diff --git a/services/apps/alcs/src/portal/notification-submission/notification-submission.service.ts b/services/apps/alcs/src/portal/notification-submission/notification-submission.service.ts index d3f658a872..bcd2c796f1 100644 --- a/services/apps/alcs/src/portal/notification-submission/notification-submission.service.ts +++ b/services/apps/alcs/src/portal/notification-submission/notification-submission.service.ts @@ -185,7 +185,7 @@ export class NotificationSubmissionService { user, ); - return this.notificationSubmissionRepository.findOneOrFail({ + return await this.notificationSubmissionRepository.findOneOrFail({ where: whereClauses, order: { auditUpdatedAt: 'DESC', diff --git a/services/apps/alcs/src/portal/pdf-generation/generate-srw-document.service.spec.ts b/services/apps/alcs/src/portal/pdf-generation/generate-srw-document.service.spec.ts new file mode 100644 index 0000000000..fc4d9d5c6d --- /dev/null +++ b/services/apps/alcs/src/portal/pdf-generation/generate-srw-document.service.spec.ts @@ -0,0 +1,104 @@ +import { CdogsService } from '@app/common/cdogs/cdogs.service'; +import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; +import { Test, TestingModule } from '@nestjs/testing'; +import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; +import { NotificationDocument } from '../../alcs/notification/notification-document/notification-document.entity'; +import { NotificationDocumentService } from '../../alcs/notification/notification-document/notification-document.service'; +import { Notification } from '../../alcs/notification/notification.entity'; +import { NotificationService } from '../../alcs/notification/notification.service'; +import { + DOCUMENT_TYPE, + DocumentCode, +} from '../../document/document-code.entity'; +import { User } from '../../user/user.entity'; +import { NotificationParcelService } from '../notification-submission/notification-parcel/notification-parcel.service'; +import { NotificationSubmission } from '../notification-submission/notification-submission.entity'; +import { NotificationSubmissionService } from '../notification-submission/notification-submission.service'; +import { GenerateSrwDocumentService } from './generate-srw-document.service'; +import { Document } from '../../document/document.entity'; + +describe('GenerateSrwDocumentService', () => { + let service: GenerateSrwDocumentService; + let mockCdogsService: DeepMocked; + let mockNotificationSubmissionService: DeepMocked; + let mockLocalGovernmentService: DeepMocked; + let mockNotificationService: DeepMocked; + let mockNotificationDocumentService: DeepMocked; + let mockParcelService: DeepMocked; + + beforeEach(async () => { + mockCdogsService = createMock(); + mockNotificationSubmissionService = createMock(); + mockLocalGovernmentService = createMock(); + mockNotificationService = createMock(); + mockNotificationDocumentService = createMock(); + mockParcelService = createMock(); + + const module: TestingModule = await Test.createTestingModule({ + providers: [ + GenerateSrwDocumentService, + { provide: CdogsService, useValue: mockCdogsService }, + { + provide: NotificationSubmissionService, + useValue: mockNotificationSubmissionService, + }, + { + provide: LocalGovernmentService, + useValue: mockLocalGovernmentService, + }, + { provide: NotificationService, useValue: mockNotificationService }, + { + provide: NotificationDocumentService, + useValue: mockNotificationDocumentService, + }, + { + provide: NotificationParcelService, + useValue: mockParcelService, + }, + ], + }).compile(); + + service = module.get(GenerateSrwDocumentService); + }); + + it('should be defined', () => { + expect(service).toBeDefined(); + }); + + it('should call cdogs service to generate pdf', async () => { + mockCdogsService.generateDocument.mockResolvedValue({} as any); + + mockNotificationSubmissionService.getByFileNumber.mockResolvedValue( + new NotificationSubmission({ + fileNumber: 'fake', + localGovernmentUuid: 'fake-lg', + typeCode: 'NFUP', + transferees: [], + }), + ); + + mockParcelService.fetchByFileId.mockResolvedValue([]); + + mockNotificationDocumentService.list.mockResolvedValue([ + new NotificationDocument({ + document: new Document(), + type: new DocumentCode({ + code: DOCUMENT_TYPE.SRW_TERMS, + }), + }), + ]); + mockNotificationService.getByFileNumber.mockResolvedValue( + new Notification(), + ); + mockLocalGovernmentService.getByUuid.mockResolvedValue(null); + const userEntity = new User({ + name: 'Bruce Wayne', + }); + + const res = await service.generate('fake', userEntity); + + expect(mockCdogsService.generateDocument).toBeCalledTimes(1); + expect(mockLocalGovernmentService.getByUuid).toBeCalledTimes(1); + expect(res).toBeDefined(); + }); +}); diff --git a/services/apps/alcs/src/portal/pdf-generation/generate-srw-document.service.ts b/services/apps/alcs/src/portal/pdf-generation/generate-srw-document.service.ts new file mode 100644 index 0000000000..a35952b32a --- /dev/null +++ b/services/apps/alcs/src/portal/pdf-generation/generate-srw-document.service.ts @@ -0,0 +1,152 @@ +import { CdogsService } from '@app/common/cdogs/cdogs.service'; +import { HttpStatus, Injectable } from '@nestjs/common'; +import * as config from 'config'; +import * as dayjs from 'dayjs'; +import * as timezone from 'dayjs/plugin/timezone'; +import * as utc from 'dayjs/plugin/utc'; +import { VISIBILITY_FLAG } from '../../alcs/application/application-document/application-document.entity'; +import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; +import { NotificationDocument } from '../../alcs/notification/notification-document/notification-document.entity'; +import { NotificationDocumentService } from '../../alcs/notification/notification-document/notification-document.service'; +import { NotificationService } from '../../alcs/notification/notification.service'; +import { DOCUMENT_TYPE } from '../../document/document-code.entity'; +import { DOCUMENT_SOURCE, DOCUMENT_SYSTEM } from '../../document/document.dto'; +import { User } from '../../user/user.entity'; +import { formatPid } from '../../utils/pid-formatter'; +import { NotificationParcelService } from '../notification-submission/notification-parcel/notification-parcel.service'; +import { NotificationSubmission } from '../notification-submission/notification-submission.entity'; +import { NotificationSubmissionService } from '../notification-submission/notification-submission.service'; + +const SRW_TEMPLATE_FILENAME = 'srw-response-template.docx'; +const NO_DATA = 'No Data'; + +dayjs.extend(utc); +dayjs.extend(timezone); + +@Injectable() +export class GenerateSrwDocumentService { + constructor( + private documentGenerationService: CdogsService, + private notificationSubmissionService: NotificationSubmissionService, + private notificationDocumentService: NotificationDocumentService, + private localGovernmentService: LocalGovernmentService, + private notificationParcelService: NotificationParcelService, + private notificationService: NotificationService, + ) {} + + async generate(fileNumber: string, user: User) { + const submission = await this.notificationSubmissionService.getByFileNumber( + fileNumber, + user, + ); + + const documents = await this.notificationDocumentService.list(fileNumber); + + const payload = await this.preparePdfPayload(submission, documents); + + return await this.documentGenerationService.generateDocument( + `${fileNumber}_SRW_Date_Time`, + `${config.get('CDOGS.TEMPLATE_FOLDER')}/${SRW_TEMPLATE_FILENAME}`, + payload, + ); + } + + async generateAndAttach(fileNumber: string, user: User) { + const reviewRes = await this.generate(fileNumber, user); + + if (reviewRes.status === HttpStatus.OK) { + await this.notificationDocumentService.attachDocumentAsBuffer({ + fileNumber: fileNumber, + fileName: `SRW${fileNumber}m1.pdf`, + user: user, + file: reviewRes.data, + mimeType: 'application/pdf', + fileSize: reviewRes.data.length, + documentType: DOCUMENT_TYPE.LTSA_LETTER, + source: DOCUMENT_SOURCE.ALC, + system: DOCUMENT_SYSTEM.PORTAL, + visibilityFlags: [VISIBILITY_FLAG.APPLICANT, VISIBILITY_FLAG.PUBLIC], + }); + } + } + + private async preparePdfPayload( + submission: NotificationSubmission, + documents: NotificationDocument[], + ) { + const notification = await this.notificationService.getByFileNumber( + submission.fileNumber, + ); + + const localGovernment = submission.localGovernmentUuid + ? await this.localGovernmentService.getByUuid( + submission.localGovernmentUuid, + ) + : undefined; + + const termsDocuments = documents.filter( + (document) => document.type?.code === DOCUMENT_TYPE.SRW_TERMS, + ); + + const surveyPlans = documents + .filter((document) => document.type?.code === DOCUMENT_TYPE.SURVEY_PLAN) + .map((document) => ({ + planNumber: document.surveyPlanNumber, + controlNumber: document.controlNumber, + })); + + if (surveyPlans.length === 0) { + surveyPlans.push({ + planNumber: 'N/A', + controlNumber: 'N/A', + }); + } + + const parcels = await this.fetchAndMapParcels(submission.fileNumber); + + const transfereeNames = submission.transferees + .map((transferee) => + transferee.organizationName + ? transferee.organizationName + : transferee.lastName, + ) + .join(', '); + + return { + generatedDateTime: dayjs + .tz(new Date(), 'Canada/Pacific') + .format('MMM DD, YYYY hh:mm:ss Z'), + dateSubmitted: dayjs + .tz(notification.dateSubmittedToAlc, 'Canada/Pacific') + .format('MMMM DD, YYYY'), + fileNumber: submission.fileNumber, + applicant: submission.applicant, + firstName: submission.contactFirstName, + lastName: submission.contactLastName, + email: submission.contactEmail, + submittersFileNumber: submission.submittersFileNumber, + totalArea: submission.totalArea, + purpose: submission.purpose, + localGovernment: localGovernment ? localGovernment.name : NO_DATA, + isFirstNationGovernment: localGovernment?.isFirstNation ?? false, + termsDocument: termsDocuments[0].document.fileName, + surveyPlans, + parcels, + noData: NO_DATA, + transfereeNames, + }; + } + + private async fetchAndMapParcels(fileNumber: string) { + const parcels = await this.notificationParcelService.fetchByFileId( + fileNumber, + ); + + return parcels.map((parcel) => ({ + pid: parcel.pid ? formatPid(parcel.pid) : 'N/A', + pin: parcel.pin ?? 'N/A', + civicAddress: parcel.civicAddress, + legalDescription: parcel.legalDescription, + })); + } +} diff --git a/services/apps/alcs/src/portal/pdf-generation/pdf-generation.module.ts b/services/apps/alcs/src/portal/pdf-generation/pdf-generation.module.ts index 0cd2c0804c..7bc26faea1 100644 --- a/services/apps/alcs/src/portal/pdf-generation/pdf-generation.module.ts +++ b/services/apps/alcs/src/portal/pdf-generation/pdf-generation.module.ts @@ -1,9 +1,12 @@ import { CdogsModule } from '@app/common/cdogs/cdogs.module'; import { forwardRef, Module } from '@nestjs/common'; import { ApplicationModule } from '../../alcs/application/application.module'; +import { NotificationModule } from '../../alcs/notification/notification.module'; import { ApplicationSubmissionReviewModule } from '../application-submission-review/application-submission-review.module'; import { ApplicationSubmissionModule } from '../application-submission/application-submission.module'; +import { NotificationSubmissionModule } from '../notification-submission/notification-submission.module'; import { GenerateReviewDocumentService } from './generate-review-document.service'; +import { GenerateSrwDocumentService } from './generate-srw-document.service'; import { GenerateSubmissionDocumentService } from './generate-submission-document.service'; import { PdfGenerationController } from './pdf-generation.controller'; @@ -13,9 +16,19 @@ import { PdfGenerationController } from './pdf-generation.controller'; forwardRef(() => ApplicationSubmissionModule), forwardRef(() => ApplicationModule), forwardRef(() => ApplicationSubmissionReviewModule), + forwardRef(() => NotificationModule), + forwardRef(() => NotificationSubmissionModule), + ], + providers: [ + GenerateSubmissionDocumentService, + GenerateReviewDocumentService, + GenerateSrwDocumentService, ], - providers: [GenerateSubmissionDocumentService, GenerateReviewDocumentService], controllers: [PdfGenerationController], - exports: [GenerateSubmissionDocumentService, GenerateReviewDocumentService], + exports: [ + GenerateSubmissionDocumentService, + GenerateReviewDocumentService, + GenerateSrwDocumentService, + ], }) export class PdfGenerationModule {} diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1694719959518-add_ltsa_doc_type.ts b/services/apps/alcs/src/providers/typeorm/migrations/1694719959518-add_ltsa_doc_type.ts new file mode 100644 index 0000000000..565ef7712d --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1694719959518-add_ltsa_doc_type.ts @@ -0,0 +1,13 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class addLtsaDocType1694719959518 implements MigrationInterface { + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query(` + INSERT INTO "alcs"."document_code" + ("audit_deleted_date_at", "audit_created_at", "audit_updated_at", "audit_created_by", "audit_updated_by", "label", "code", "description", "oats_code") VALUES + (NULL, NOW(), NULL, 'migration_seed', NULL, 'Letter to LTSA', 'LTSA', 'Letter to LTSA', 'LTSA'); + `); + } + + public async down(queryRunner: QueryRunner): Promise {} +} diff --git a/services/apps/alcs/src/utils/pid-formatter.ts b/services/apps/alcs/src/utils/pid-formatter.ts new file mode 100644 index 0000000000..eb0e2f47b8 --- /dev/null +++ b/services/apps/alcs/src/utils/pid-formatter.ts @@ -0,0 +1,3 @@ +export const formatPid = (pid: string) => { + return pid.slice(0, 3) + '-' + pid.slice(3, 6) + '-' + pid.slice(6); +}; diff --git a/services/templates/pdf/srw-response-template.docx b/services/templates/pdf/srw-response-template.docx new file mode 100644 index 0000000000000000000000000000000000000000..b51b58b4357519c603d016b876820097698db14f GIT binary patch literal 21166 zcmaHxV{m3c*REsRwkNioiJf_3+qP{xnQ&s;b~3STTThHL?|bT0eSglkt9Dmc?OoNY z`&xBZue)1G790Wt1O^5Mq%xOL9pryJ@c;VyPNp`_OpO0&tLOV=z*$hBcD?hAGQHhf zeud1-AuBrqqk;@C z2J&}ZpPRbEp?)+r4X4>Wzy8F@`9lV#gA zoqf9@x%M_cO`PgiO^{{eg@crJ%PlhgjlQL$YJ#M>`h726I!SQ$lvQN8zwyvNUMLVh zlO++IoVVr+sw4{ybL8|Se)@0vvtS?~O8?&lLjCuLiM_Fslf8p8ld-*%DWiw2O{j{p z;s7&>-?KWsuUpf`tOYoE#63i0Bpcd}jJvSwMOKUP?adV@r?Rx%o5S;#`_2~7j-BT) zvlZG_oOF~12jwvEP=fBzEk-Z7-9Mb)I8#m&AcgaX9EUx!_NR`ro`uJ9D3~oI&J3)y zSUcXIoaQJan-?S}GpIOHT?f_E-N)m`mK;qpcr@Q%> zb9haEOlXXFg;=GUKuswDYT*qh-9v^f0V-#VaEcforxQIiD0Z@xglE*RRDJjsw}OMU zxHDH$%DVgYY?=;eQs|0$jU~sV{d7Z$1q&AV|9-EpT!WH(=RQIW8r9QyrNpZx(V+`u81-D9Z_Fd0h%c<`+akRw0L0Df@nfzq# z>wymX+kjQt{+%flPt{{ik4|Y_6wvMudBAiEzGhJ_ynz>ULJ*Sqp4w~`mavD}Gzp=A zrNASz#d?u1Nb1SIOpr_QZ7HIGVfdT0O#_88g?tJB&3$xj?Q5kerK>YWr1S?lroAy4@=LsA7R?x z_$ApikKnXm@4s9Q(erIIC2JHW3-q`LDa4JADGGPoaDRgoRcMmX9x@~#5C=OBw|vRj z<-jketM}r`@!i10widfdyvt?9jDMrKFpXCjWjS6zS%fTPL<5v8%I-z3qRYOxME=Fk^)7 zZI!~TZKy#f&NoGK^Qk>2Y`1_q+mFdd`+AcHUB`tJ3o0xKe2P_}tf5-9GyR|iVL(Kp zX0ZP(=9cas-!&i#$v=Xk?{r(yA%~0@2aTpDvF0houqs}i-bGC3F=ix}uvf`-RAG;s z9>~1h2TkTxTT)&NMSmsp;d#9~=lGOGGTFI#*|sP3w*BL0zVY8o+gk<+NdFi0-M{z$ zuM`CTzPj5xnK1odJ^d#duC}IjF8`U^f3jJ5y)z{o|6U8APT`WcZ!ZogT|Tv>mh zfUfAsSq<)fD_oQ+TDq=Gir_d*4Zu5*s-?zS4stM5?|^bJCaIQziTB~LG#32N>3D0$ z8*$c(e-$k)wnF@kIkHEKM^35xPGRo@f!jGOJNSav-x*&1XP|w@;fYo!r@wmMQGCbI zkM#NCfELjOUTVjUvlq~l4;)+M{E`KlM=~d7^XtU ze*(DDwYA4@NB!E?7b(+sDyw!MZ@Ip#Bpc-^h%=T_K$1|#SY)KEKW2QEsxi@Z6#fzu z!nF9-@slrfK|AIU(=Q! ztzLSuo{rsRc++>fY0E()v3)74Bk&I5||s#|_U!CK|_ zdQFh$sAT(Ad}@-+J3VAK@upA2r#xmXgNT#pbb=lk{wx7>gAPhjSE6nend;BI$|S$W z5p+&cO8CZ_EXT6Ckc-TyfO<8b<8|+){Irp_brQ0wO^x}JqP4pfvJp`6ms@m*3}+4% zdy}62;IG0`*7L;@ubKOwR#tzj>J8K~a|p27g}e}zxkM1@pj;G_c#z?FRG3AnH~5d( z%RFaO|1dLBoJ@B!HG(uhBMit!K!w3JrSTkYC#z+RGK=={@B0KxeE5St)B_```GF;s ztd(bH%hXgj-a?`#=vQ*6L8zP>E)kJQJ{OyeiHKViX&6q<42XVOL~1}F1!M|&se*|G zJ79(AB)m9XfVHTgg`=ZDPulUbZix;T>%6B(*t~rlq`yo|%$^Ptx1RQq7$fGYbEdg{ zOq8i{))EVEHQ`u)p&qRrVPdD3yZxfKOe-3a=&RM=5y%9 z1TJDpwuKK@!pZc4LFKVffr3NQ_gNM2EIz(lcPNbtZAi=T;Ksi^N$@LhXUPN4mBI;P zrxrD)tPow|&l&F&z_s^Hy5q(cG9#vq#G_B7dRfro29%hHxj~)JqD2dq%ZA@9*YhZf zH)gY|9z7~1&1a_Ihk4z38%`D1NtDA*5Y9Y^*#Xb9Toq3F-YWAIXeb*eb*U2>tVQC_ zao73fCibqzHS5E8Z)!Li1G+0YfQo`4g)7eWu` z5~j-Nq7vEHIZUt-hN{dpFB{NWg`;a!{xgnVEWLxQQ= zJq1gNNO$7gN9-dg7#_Z*%6gX>D+x{jkytprD=*)Y z^vXP$^o~nPKghRjWU6#Co;%yRrE;Y)+Y#J_j(Q&$s>+~OeyPZ;t&u&Qp&IyZXZqc&5f z7Zg_o$s`87mmAGnv7W<9RN->9d?%SX4U0<|ygScYsN13!3?Zm1gt!H$T-(6NE2`V} zjWE}xjTf;O(J$$woq4pfS#-;!SycuC#^4|bZ1zn;C$)z2+wpV@y!v+J;(aCrdv>8H zQWaK{nfXo#XTkF)R4&%PoN?b)*qdAON*-MVZ7rL#{#=VYGGW#6s)#5Uaw&MR!nBR( z@?o*pv|T(s3|OSN*~o>OagA1YgSI~L+L7!Y9)$ZRAB!}~c(E4=QVK0dfUdcX>5bIc z#bfau76%oJDH@ja8*%QZblG=PP4zax-?jw1_lt)oxHU_!U!7m;E!kzkHMQisiq<+= zaNr>aEW19HM#IGL6X^w=P3LUc$#?QI@(g^UOsShG6aYluzuLC2a$kM)N(O!?9#-++ zPY~%!QX5}hvswSu@bg0Q?NQwf^qELb!_4By#~!V0`~r8{MD(<3fdZDElGI^}VVufe)Q z%PDsX$eGWK278dpvThx)x9oC$R%_a|kR?;$;kvq2n#yH5@5u2rFY9?C8>x1-o;773 zr7_eTG2-2Iwxq^=QI!WA zP-S$C>3-I+qk%9f#AuGzOQH3AuUfQdH^DX}Up7@q$b8XyW;j%u5WKxm3_LqHbB5_A zkcSZBj}Oq%R}K8PF$dE##1urXtkcv8)gPzR(OtFvb)hb26QvZ^VvlK_!vnXhQ+XKE zHu1CcLB4bnw*xnHurDAq^`m4h*FbGA|L3XtwyaNaB_#$Pt0t`Z%r3d|`GNC%Oe7_c z`d+FD2!u;K;eZELNgjJ^e+*-PFwYNaTlN=V` zZoY#Yw53fwdNLRgIYWP0iQ2}XD#ylQTujbN@PR-x$QYRuXgajW7UqGuXiW7ILwlSI z|7u`iM>xo^DmXw>C{-8WbQc?=O1FM~5dLl91h$aS=DAARSFYd;9B*Y8$#Y!Eu~C+& znpax?Js0p9#v+nDHvK@DuMPJS;7TMn@*qFM=Lm-^xQ%J!ivTrg%+D$w_h1b@6dsnf zD%DH^-lWHT_GA}C%}&!UaF$|ChEoBtKaOH%kRO?;B8J6ErOInev4krKyAn_!o-W

s3v5wqVr;&ifF^<=i@aaMbs%VKw ztHMod7C~GFknMH9_NT(!f#-mMddOZyUUXvE&OfZ0IbmLO#-NvMqQ1lqAP9zx6-z7x zBOo_HF2-!BQQ44qx*EK%vf!^__M$pAaV!!dx*p~2bvXVpD&Aa5* z>aE!&KGP>W8(yt<4o?WM)){u%?MF}l@SZL$GB*4=WsyUIO76=tq>}B2)Y};a^IqjoP!@N}~P)Yc&go(zpmHZUVxRt-F%~FrfKXq{6UYd-{d2vi)?a8^NVY? zpHtVax}%rWpCUG~|LM&Qrxm^IkWY0S{6Wi+I5TWzzE9<_`PQgA5aA-*tD&M0o5b+Ul>1wES-z zx{UxfSsUae$=b@eSBMwB<>|1aIN%bUTx+%7_@0txp*!0z=98Y^f08xEFNG&7WCi)2 z$b`u$#KM`(sA<<&G9J|?!`N7|P0mp<;S?%sjvwn5{{+QjFl~8U^_bAfy?b3H%6I#H zW{PJ~l?{)T)H}4UFdXrMN#BHFQC^E>t6d>=UU*#*SR8I)SnL>9eBpn4^91#|=}VZ> z^5R2|O<0o(hl2PHf~CauyW!sJM9xGho3^L;4ntO>l#3SS&Sn+W!Y<}n=^JU%4dtT* zQ};CFlWaQKmYaAlK(E#d&9NQtq`Y7A0}bq+b}{3^YL6^vx}b;Ae$gwRd>VH$wnH;a z8~1VbtgE%b!CBH49bI-bg|q@;eEg0An|pgi(i}qZf3h3*>P2Xf8tr660N-xj1?B|= ziMsHRRzjx^*sfiD^;x>_`t3w(X{L&|4^#V*SC!u!#s;7H%W zv|ZlC8&`|4oz%y+uy>07Tz=ZMoIRX)m-aomL*7C_Ka6`;k(IBRPrKUqr)4^2&V5_e45PHdE6eXOQJbNPn3up@V(*`$GR!+j)e&y~@ZoTn20hUDg#f^U za2@m&U9o=^3H$?c#@({RcvloO7h`hTh!Tc4C&%(5`D=B%M!0|gxH*20((58J%*~OJ zMjhg=bSeVeV7rYgQ4mZt4c*CeJgu4nLWI{3B_F53t?)r8rXB2d+FexvFSfy-xXJ4@ zX%vhg$I4=7jllHQttA33KIAd~!b5J#xfV81P2yjJ+6X)e1mv|RL7YsSbw2bD=h-`r z?|{pH*^7sL!`bk$%>a2S{lHt*`j*{%Z$3OvL@o@nAM%&Kc&~%CFNXRzo8ja(bDJNi~L1}apv zCiI-3k2PeR8{xbo8xa~*NyOYt)7-UwChyfwe*!A0w|~=yXunTcY3(8oNB`Io3D#; z;~AK^7t53UhW<~@>J1ntaYX_FVQ~51YF6a`SF<|1c-ojc|Hm@8(zLbT=SKPR>m{3T z$1~8BnVZKPg>6=euY~&qrNX)8taomqJ@WgEBMk52LD8$3&$Sb>$;S0&eV9DRbbPyd zm&D<|$$%d??X%rt*M(NiV}Q{`++0~}n{y^4Mb*s@Q08}V*J#_h@qcf*f^Ubfb1)FX z{JiSZmBj@LD85(|kU0*L$%(X@@Qb4ny-sYf_C#<$)T0;(B6PVmt^q~G%d#^pU1h>V z_noO$RkmN~A6K2EeX8X9p8%@gSWuCHv$Y3O5ic85Rsr2G(yY{=iF{Wv7a@M%juN<% z4GpDG!m_55}4xcUr`rZ6l9!t>VPQ^jE>whU8KqU8Z%yki?-#{)j7V zzE`d!`ZrEt1E$3#Eu7;$Bl)u9x4<$kkX6raJjhlu0cskowq#>N5d4h^yv280NuTPR z5-w!!$1a-V!Xc@s;9MPa$bNe4K3tG{+fT5ySFci$(LTPaCt4$V%43JIj*$suAr}1I z;z^?yrlbjT(1UUB<{7PzFdhb|SLw$E=~~$s=omFytJE?>428cGh_GER(d!Xnci~Or zq>lEG*41-(cQPH_h6M7gBPueqQ|PzC7^_LM1zY221G`h4Dvl>-0%MegjMTrW8?^qi zvZ=hDeOSczx?Oij@cPuxlBN;PR3HbC5f4n8E~SK@P#n<>sDw?CnfFf2{gqi8PibBd z7^mz>GFF&~2Aiu&RGY6Hc>Oks3r}H%y-HJ#OV1cg36ur-^NB~T>w-6l#k^3awdJH% zf4N!qlOBO3m5l}*FoDzk2TNxn3qu5U*(zkiPV3z50d7x$>w$Pxh@f6mmCyyX1N<&( z6<|8{u=*v1fxof@nt_VDYu+@lyxP31d@k$U?XP%+#&QV3tEq+eG-D~9k%&U|1iQ`4 zqy%rFg14Wl2WJA+7uWoEltEzSNRnftgK$|gpS@H=biwCGy6);2Cbu2umkz4+KyR+} z6BTNO_RoNec2|e>GAjt`SiGo{-p1kU7{~opkU6WBY>eD7f`_&)1yoGj1`T#gx4gYA zV~Kz>8cE!fRJ4DF+sTZjrO~A(lHN^{+U4GlV^LUFPl2r1Lq=yGkKQW)(hVX0;t3Q` zT-e0@YuWPYWE3e>uuCtI~>EgS0EW*Nk z72c0}U^(z9N`J3$Hxc9OTltp2Du!oPgc9dGkLFIyI;Z>X@YuUp)4t@ZNa?I-S#Q@Q z_Xw+F8IOc9s`|VEBi!wDA|?EI(UC=fMG&web&=WrGv0d^lW1-@g9S*mQH|mZjm2#? zj2UhuTl!FNbgOef$4Lh+)ljr>MQCrw|L>%yb<_7utM#&TBNYe3SRJ$+bJU1aAvbNN zhV$u?Sn8F!O$G>X?Q5t}$N+}%7%F&;%kgArDf*#53;p+yM=|sLTkM}-NJ{j-=`Ys* z(_dRt6H7xTOIt&8Qx--m2UGKAFK9K@t=1EXtRNhvD5*#l2nq4>!h|v@bW{|`VhIUh zVPT~+iafP)R1_tQLJUyaL@JqR7gW@<9FznFl7bL;OXtt8n{H40Z7%DnNiF9Fg^BU* z=il8k_TNwTJ0Su?xeyRc_&E3=1OxpJ5N!H0#e=`Jj?_mdM`wp)Ye5OQ2p5wy`6wt@%x%s_71)dA z-+(fbUVlm|=krQH zvb4;bX3llzxtQ5mdu%*E!%~4$+MIFEzklmqcXkMPeGIM42$3+;^OLcjYr4p(+()M@ zHl^3jH#Rss?VKE8`_TNTE&EUdzRJ29t2)bCZ?rz$2z2{?f(MHYk{6Yq?XWdEKfp&X zHUnej*Rk5VA4VCG0+J7QHiXtGA=a8NW{7UT>Z6U*ck;kP+S=lOAFuiM2R+9||diyq6^T&A-y21l}a&i*R9;JmK z3B2-UiJ~;j&oKfZ+`5nIUs7#q6FOS9%#8}Es(aG;R+TjMOn7)6**;HpyD-G1^px%( zg%5O9!xVWG;p4B)4MZ7Ip?7IW4)$M-W#~tn_sAqEKJ;5r-Jvf`ndrxxkN}b;Y zBWA-ixv;UyKAk^)mPhTk^2>$RkmHeJO`+t!aBTQYDDh!RTeC{D;=#j5AExkABq(ZS zCEc`j%~VaMn9>vxpAK;6NdBw`1wUV;6DvzbWOr{2?5=UK=A6~N&>w_qBQh*IcZ08r zBepT9$wX8dVu@^wuZ}IR8?VM{yk*VCI_E*FezB#r-D>CMYPY=Zw}?F{((-|3>>XmG zr+xMam3`+h6+fwlF^q<1Vt5Pfx*(skYT@;n(BE_-A|xXC~ud8!i*2= z>CCdOS}o-9;V>Ib3^BPpF}=G}@uhYFA_xcOKa*b-92uNe&F@{<2s?Z~9HSt0X>*x5 zA@EsQYLdFqRN!JtY%oRU=CqVKhK;WJnRKjQ{Z`s5wyHRP6rgv%AvH7T94Uz&R#&!{ zoX0^!bxGH5IcFaT^g44~ij^vlUetz|Q^ev69!F5+MDZe6a7d)Ap;iRr$k6ZFg-I`) z3Z`VrY)FIPBuV99bN%__Sgl-9M7(3%oikw`xbNqfP9cUFQ|hw$Z^u}C>#`u0Lcdq@ zyk}PJw4Xpt&AP9^G*J5T0-qlDeT{YD`b9Qp7lM5bLkJ2AE~t?d9T z$!rE1_Ntb6<8h1;Mc9nusc^}U1;U-FAF}Y89ls6H>yVoQYm@hk0yt@U zl|I|LU=Co?x4rO=;N+{1n~bZffIT;$(JW}Z=979}wlduT`+W3{_n~8`W`%74_WE_1 z_U^~x|F#DWc(&aOLA8b&uN1IzS|H-e$Z!Wv0Xs3%5kSD@FVas*jb6p^KH)0a9w5pB zJ(YYg@*b`h#z`&Tb6@PH@(t!8#b0)zWvL@=C{+(^aw-d9W$GI7$b84mwnA@je$8+e zRpD1=YA2?0Fcw^xElHC{?+-vOLyaODG(@hzkJH>z*tMfhg%aH-|8%S5iu@^$O!{N& zV7aq$I$6j#-Rih!`fsF?y@wIfRQG*bQnfNp9KOuYoS~XqTC>n*=jgn-d?w-Br3hwY zf>W!>V6d4cBrw+>fvPr3Ud>UYtHTW$q?uRD-$cIlZQP`4Qb(MDK~Zzv?O7qe|IV_{ z^Nzdr)XvBllAnvC@Fxm;7WrY*P6Rl6G!DoxKlI>j#4ABMOpvEEu|_BvgHz8;*OL(_ zmuGK@(aWBrZmbT>#Wlmf4IKAJVZG`2muG>IW#M|-h121h=Oo|IJU?@V=PFYv=IQYH zhTR0W=$IXNPv{&TpNo9Ywv2ey6Dg+3(*{Ex9YGVt(K%V`<2ByO%Pyl;Hk)TKT)GPd{j-?V8fLL1I=>Dl8 zGF|4uHre{Od@M-w%|X+kYW7F^CqRBS9Z&Pcm&;9R+^?k#!sSy9H#<__v3PVd&ANUNcwsM!du$m zx?utxEAB(3kBuGoDHwSd1zv8Kuhy|h0Uc5D5cLD~C1VD`QHvOi3P)`O9`yTPb+;Vg zgb|(BEjIN@7tD0zzhYn%2hbuBZN}D{cvKRgPrM&&UNN2Z^ebm#VALk*jC5YzslFwo zqsuOnARgps%f_J3oUy>^itgiomD#ET(MVa&b&Co4%v1zce0AE_?&)BOtOiSyp4|4D zaup^|fT>#t=RASUjz36qEC@Mg`y?EU!1Dzv8bGT0k)vH#1|>5fwLGux@$H>cj(zW# zH0=jDPBV#BU0igV{OZYQ#+~?p{5OOgQ4!Rl;_Bub9YBg_B(nyuJxo1AoYI=Q^DaP& zT3}}i09xjYNWXS2D&aLyU;6r-(jrK{IId=(`4X;j|E-;P3VjAvAx@ALnKV#~}qB?CiHEU6})xJwA z17T^@BEP~TUHw6GCo*-6`;q9qWbl_jHY2H|{oOTvq%j!xKYNTZ`yIH^`r@E2Rww2y zRU%grU0xYgD^{SMbCHFV(i&wr#bD-I=0zrf+-{qJ6{u5aTMs%Y79;S@{syN9bKVH* zX~zcFfbQ3+txu6f8_YSt?y|q!6trgp!UT*!)S(}CZ)1sF6JE7Gv{ytKha&i5pnC7@ z+}lBQ%5cMo;+Xb8s%QAEs4>q}3B{%(sHv~eI|Ng>itmsAeRXbVH zCCL{2SbU!~EOSmCbpE!i*~K6K`NAUrQq;(>9al}VY`B((;l3()p7x(6MEJLfH~;P>XuoKL(1+aEXWRp9 zddlHVy^?S~4>xMdoeAey^Y%$8$#J0Oi%Z9h$|>FkpPk0i(Jl`& zH7axXSIL0{`VyiuTEjGQR;|NU$YUwgw*>yq%iH}n2Gm8i<#cFlJjPg_Q@L_Ltz25m zRcCGMv8j)Z*C{GwAHn%d5V|Rb>{%v09TJw;QpOqR>Ptzj<+>mGntXdAE`~z?bdH5)2$GI+J3~Dc-l#sDxejh!}qtIe$uY?4znu zCLi!GI2qtc`>-pyI6x_-@^-JmavhpVPcm@cs<7l$%OtT4b9M?wGyYFH^Zy@P`_~VB44G-X;-A9ucZ1>W?Tfsa2(!Q zt#`6=jx&Oxq*m366h?Jo)^dY3WrpX7Jc&I~a0aSx+jk}h8&C=f|0Tu9ZWX4-JJ`{4 z4C<{kBbrkDRkVoQi4{xF5W;TZdB(b=cP7_4U2u1!d;IFJytOf=OZP9IvTQAVZ*FIF zpD8F0PR%XlB9Vp(Xs9ZG;5(RXv%7WCZF1e9#4oU;GTk1St(wcG%OUux1N{rVLx@P5 zE9ae8RYEx2UM%L%$TAGDVQ+`_P=I?rs%m7k*QABJa(;hd@l4f1Wy(=>RGuGZhAoF) z*Yl(oi}sy@#3Zj-k+qXP28Ep;nVN7pT6}g4{2J9}vjFv+t{}|!A3h%9I-3CU3mvnR zF#)Ue^EFcK)-TJn4`?X?8)H6+pe)U#U|to~r?A+0xNh|B6|b)C^k>?gKknHwT~Z;w zJ+@LE*ViyLM`QX^am^k6IopcVV!y$pBd|fg(&&S*%?9zmfx|+G*c8`?p?{VqNw5Bn zpO(PFXm1VyX+GkNq>#jt-$lCW#0bUhXb6pb2A=nXubk5Qt#I&He}_Rtr;fCQcc-9` zdru@JHjG1!4Y}D#`KfFdd@v)rO8Gfe|M=X4;5OH5VU+C;t4_h#!MA;Cv`Mch*|AOx zUbL;Frz2MIWLDLYMX3@pEH!5JW@kAO^Bx#h&z-vsxwh@G7JKw1ke3%_5aZ%=y1f`l zHFz?M&rhT$lhAvpyS441Ze?*B==UNHJGOoF2VlnJ%oe@YoO5Ek|J~-En}lG;`K(e_ z3msr9`hkz*Xx|?Ri0kR?tuUltkW~S8o$YyWu|!|@x5wqR7B@du+Zlv)mv}Vna3wFz ziH2+y&lr{p((O)X8>!_OQOb6n>(nwgX({rz>xZn?vR`IF@^Wk{lYkdp_l*( z&cF6&lKir`F%=6F=h201<$GBr=}#qTV?Ow0{dPNKyfXx%O@0|qrORNO6VmDv!#*3s z8ViPBM(34JPCLdFX}2OtSKDE?L+_To<9JGxjPDFN9JneJzZn|#>YX@57VSNKc8@3d zM3PDzRhplJ+XAO%fqyd4x(9yIT7vz{CwXGE50sPSWCPpWWr|rnlS_4%aRj6WG_jUr z{#Qz7Tvs&zsUq_QpLo-`e;?GuB8R=D-`9O6&!dT~zGi{8rMH^GkA&3d1Y@b-Wwk2D zMaa4YQLYlWBDI!Sn&iA8IP=_0-1?`TR&5d$tob7&r9^5)?7T2lKdFa?z@Nlq_z{e0 zza~ZaT6zMz?^`+spW*#)_wU?X)6%!yplL)o8ljHLSE-6DLRCx#HeUlbngM36scyNy zqxE<1a8wt!4Q_10U?teoCOr2Zs-d&*%qgvW5PM=LW&6mxMXbj^<+zAKoPfDV z2p1MPHslu|rp%8ly|~0>?)44Ncc=ZbfSxSmJb8)R^PPl44MDdxvcy#q+V6YAL~Z-M z>PqN|Sj>j2ysFJs7b{sH&vN({+?XUY&S<_`SN~f9SLRP7>L`AI;L3JvT0Lwzur67o zIVv|gptex`kySp1N`)r-lu$01Z$vXBQ=(1##G|oOD*U5tFRPC{Igx4lry_Dw?%$Wx zhV8W1R z-|hNyR1L8Y5rST{R7+uqwd;&D>jL)VT3-;*4SwCa4qvhzVNlC(VqH>G`%$dk_FkF|wy+zg&Ad8NPV+n0eszTFGw9@U-c2~ySD z!n5S8uXi>f6%^PC3f4F&?tRqtoHbL;W8{BV<~%GbQ?u2b(!w)0@Q0wA_MNT}?kN!g zZtMHVG?OstvaP0NR{nX0m^elSh9_YWEi?;oxiV4wTG;VTq(w`=|ggqJ4 z=-k+}`FK|BfQ{11L=#m%*zEa%uaQ2Je33h4K76@_=^SIU0Tg##d@_o!xAEwzo0&q~ z^BwKc#-09ygC^bqM~|mjUmH+!((}N)mSXhHGBLSEMlbH@)Uk69QH8UGZFsk2_HWlS z8dt_%sUAm9KmBqU>Or&D(E*sxnJuYLJQq;P(g~)&3r|>je%bq;5FWEq&^M{$sb(3|C9wLT#77O%oNe{*^l~d(_aWhhQ4c}UvCTu zO+P2Jdlh6cS@*$H@_J5zziL(wIzc2y_9?udR4{1wVQGeT-vb>30C7rifX$p|F{i)s zg0|7$`4A}i4J~x%Q?sKGQm`29*7QPnkIra9=A`^*SEsU`_p^Jc?*Pv<85HYT%_cg2*PYY|~-k2(^xs&6^?96tER1g+Ei3A#d9iP<@ z4#MfL@&Vr1a{=GM##tBJEJTwId+p)2Nx!wIk02yzuH?Fkv8=mQdtmg@N1lS%=LNgi zNV&+pq?pHB)MEZ3bt}gXCCaW0SAiYowXq1o4f=^VlbZjeV*4g1L3B}FSSC|Wgjxx_mL^E z(!s1!#skL2ZDJMTEi~;xF2g>yeuBro?Bon$#hbc7oqGKAt99P4KZU|W{ceC*5eWr- zm3G*#tvK4lS(oEdxPdY>#HHw3c8*kwOm3X=swE={K`$oZ!zMNL8N~O!&>8bFn&{+h z`Q?i=7t%)*z|cS-EU9G}7$?BP&U`Z> zlC8f%l8vf%)pZCvZzb~pKv-qkOj-10v3R-LJ+y@g=ql(O2mIjdej^hzkf-*NM{Z2>V~jeThYMz(4cT}XH4ZvaD3qcJ+=w21 zGlS<(-i#3ZiBSS~#aJe%ZswXFA4rO^0X1dy$=&49ofT)@?2V@zTVK+hqx_wFn`Qa8 zLnCxOBxV(LfazYLl?AOn0ST85(GZ-cvJ6R!1)tj}dIywca_iG8Zh;p`ek)c&Wt4&5 zs3vu7ES-0V28%58)s0@$yXlN>HPJ+iIuxh9oT3O9Sd$z%>TTqUw9SJC$E906M6k|S z9&a9oO4Ud`&H8=r+LzdY2MZ>vMXnS9$dNB|&`g(~%~a9H_s@7Zo;uzWeqgMnNngy( z8?9+w(uuAC^Xx;I~8P2jYV1zI5@GCe6;T#y92^!Tr)MbG)2}W0zoN zl`CK9wuN9D0fi}Bu~Dzep;B4Q*S|7@&7dg1{?%@Cco>yNXuawXM*1^1e!xAWdh4U> zkVfAfGMBJrj%JyUIKr=skHcMpKUKQj8VqNnH)^9IR|9Pzjd{&p3yu)tV)lO)vPuD0 z)|JZCA0fxY&;zecOAMSl15gI}X%L9+7oZ1FpEx+)@;x3Y*Yj#5&rv*HCq-4mC^InD z%U0k!H^ot>;-AdgH3j$qvh1o3{LyzfJ`}&Sa{^Kar{243Vtsk0ORoogU)uFZj=Jnf zdB8+H(dMtzKxhOb-`c04>HvZoqtzh-Y8gi1Gnsr=-gKBVw6cp(UNOA$A2UX?&Du@K z`5$~PT=hO2C3=0`>~PjA&g^Q=CW=A63U1Q*yGr1=z#!o*d--K!@N~5vw3g;IVQo+d zY&}nxJYRuUAqa9vineigBkE~pElIMHGw;npGX-8ROH0JaMaMjojs(B~$0YYBdf3jA zyZtq-R%VYa2{v(X_F9WxC<_GNf`-Zhh3qEho4%Gp1Y#Rn{qj&$|FY4j<;lRfBS-hT zNW1n+;V3Ts0d~}8HT&pcY3B7q<)9J0AN)CqJa&rj3`)KR7upLJ_*|{xZZXxpK=6qg zM=4uUoGO=K+tjBS!C2QQ_ezyA_idJ01?e$AuSErXc3VFe)qWi_BCN| zY}u6zL>LhyQ9B)z+r~f>m^|2%g5YfqvXz2;dlk$IY)e0(NdSWxW(!=oM%tvQnV^{< z*aw$A9W!I`EGfgje@2&}8oS7?hWh z5WNv@(zuJW8_fL6INz zu=2j`_vAY3@79K!!3Jz?&(s2&0+?U7D}s$?E6_$6x(-*K#eS0lmt~jiW^1{0u|8pY zuoq?J2jVCJ4v2bZ>=@=-4&VGx1)_wI5b~v$I{Qs69VQvdA|C44ZN*Bpk#w6 zX1x8~8jY=%C+0l#T~ANXU^nh|!32PsvCuYtKithl6_ScuOli!X-c3DxXnqkd=3cfK5R`_W zkdG3d>(Q)-#pd=msS!EJx^hugwb&M#we0qqak(H5GYNYGK2Or9Zt4wkIwmrdIcQ}u58*vRCope{QySPHfP=1(SoiPwGRMc1jkXRo*Tz8@i4m*E` z%WteZw^{RoCKjrOvD-b`9b~7CZ+UOw4V6#wB)MX5dzgK&S7Zl?`@pFnpf#^;^B zSuz}2Z`c?x=A!70Ukyhb4$rpdFac_A#qic{~(!O#3%0Fq{n^VaVQ?vqu?0qIf zd5vO={K`Bpf~E$$HyY#&ilo&A0(s2~z*u9?w}wwq$gg#_Oi-{Qt;v>@5YdOB{D#B3 z{)old-CitMu_Wcup{fFy)T{ixi@!HLir_C)Mm5|%}ryzIC!CQ=5&n}-;d zo3%Dp?EOaIsSBv!u|%&z^xE6<7MH9<@cu2tWm655SG@zx=Q_k;7oRiiPhas%59|Wv zL6qdUN`qps`GvB!?cQg!eHroO$|vNtMU+fr`rFE#R~5%+0Lr68qnn&h0;1oG5~Y|L zH^D+%%@hs}PTT(p+ZZ+_5YH1euV3T5LTpEtQwhTifH#Q9l`zVf(G{c}qIztkxH0>@ zWiVaBf~2HALmxY2Xqyp@Ar@vpZ;kBfgvb?id|FF^9(2n1!~|Fc>F*azKnctI=j;f+ zeY&y`{S;Hyk!-CoJ2_4&p%&%rp|B$uy7Ytil@d-DXM?(&VBaPR?oo3`28;)|Um-#X zpFbk*Q?Ow8HV9Qv#Hy)AaBSqFn^)HpK*MMbo2kP6rE)p6It9Sn>DM6?2drI|mS+~x z2+}_ITyBS9IG>qU^I?c7k_x@PMsLD%;O|+o%`9q0veL=ALqO(bO~q1hV+AOTyC;Zq z40Ce!1$xC|lnX$=x?E^)ua8x zz8LR1X&wGXyCMQi5bgHi8vmL>d}6Tr2w$^u9-1^<02W2t^Gz_^o?q!vdC*LImsbZu zbmbW~BNctvro9t{1#8dHiETRcWh2Q(gKN>ERH7n0aB#03e%5KxENV%k6Oj~u=*=WD zo@T-8=tM?{fdkp*hM9~kbvsq8{Rhm!l5&FABwNM~`ULZYWcdKcvTWXngMjPrDXFM< zS#6swuyX5+?Zb=hKcSszcI~v@`bD0R!k$tT?ghRlm5GMPRhWRAT3x~3s&k69Zo0J% zh;3#BIY%vniHtzyW%ekr-${4~ux}%?zc_Dw#xZz!jyb$2?%=KikQ5!4sw5I-JP(&$ z-n^)zhV|hX-1K{gXh%ZrSO>1JcSE^*i-F)d@nC;&3R~!VoN-p+b%tZ7E2a_FwbnHJO~~hhOC`R zb&hR-vip2I;!@VqMso8P{AH-*G|U=?{>8DWqF=aEGUo)%UU^w5kmMjV4X@e&4D#CbJ*@Z!1#XUR4% zx4M&wV#u$HSU*hKnoSo*IW8v`pnTWY2X z{R1rn^0I2ofrCfbb70Pt`8! zsjrGUQzByEdbR~6gxFFQ7^`!{T!#|4bphF3G^>&DFA>yG<4PuA)X4G7Z9`J8Xb zecBi%&IZQb5~#K(dSwXoCY~$o%Ek+IfrtTG!A(STA)rEZrI4mSVty~|s_9p{f~+$W z_lJ|tk-5ak##whb%`>bt_Gk63XA#G7M(H5$zq}cmUu%X=2;xs&(gt>dSEJ(*<|q=S z`Q^{>|HwcLT=IpK&s9`#AI2oYA5KB-D3c-#K`AMSQu-2X^8URC)1v5k)vGgP-?+P# z^z6DH>_0EDRbu?&^GHmlG_v_K)J@6^j#(elx?EL=cL{+mUaO~}n5!yAXVN%MvrLKpWX!-w3H_a)>HK1+A@|G&a6dnPhhtfzV;cJUY6~ zcNG+UiVnP%H3F(K*TmBAdB!t}}>oLWOkpr5VNG`Hx}6L{pHM64Yk}pfT_}D%Kc0 z<-*3G$qX-jk40iAPR*;X)TdH1i4M}Z2Iap@1r7F3ZYF^z3 zy6V>7qsA%7|JcO$g$`YBdi zYa2}_#}G16ui~djN2DeVK25JXFOpx%_U~;H;=&g7@@N;F9n$t2Q$S$PC5EeLq8IRR zKig6@rgpxAxDa$Q;H3aNYQ$oMQb;wFHXI|#HXx&u;nbCsK&I@8nhEGoL(p_R0Bf}A zK+dSDkB)j@r4O?tvNmM#jFN07v?OZT8SD5 z%AaX~z(WV77V7EUdYMaHPlqXyTE~ycE4f`IuNa4A`~BjiJhRML*m$xbR9e1~M^%(K zD+i-y1@;({4s6D<|I^2L$5Z|9ah&X?beEbvtE_v4cdYYPT~I{EcQ8lA|1M zU(hsm003ciyZ0F3oS45NXH(P4&q&}{HszIpT!z8ph%Cs;9?D2{?7vu)=#0V?D5ZR2 z)m2?mpFADK@Vk9V(Fr^|AK%{=rjA$r zV2W!Io6Qd7pHVy@==Sj7`zCaCHSrlf>Rli(%-m*b($(ki0SD&_NfB&t?hAH4`wL*2 zG4aFa%b{!m4R9~Zq=nLkV}!kWxLn&a;3^hjpR8F?`t0iHrxQHSRk&l+2dAsZP*iZi zlb0NKQTU-l?AP_a3mYxG%sZJqjL&Co>lueV{qW=$gFHSSmD|$?Qu-u36 zE}F0voP-@L`zp0{sPr=k&>NZ_dsW8xwt2IsfFww zy}<70gHYfuH9h#}{(d~OoN%uwcE^$!c|-Qx@#C8b4eWfvY6Z(uM7M0{N0*4$pD`t7 zYxF2LP)%P^O`K0SYy|7wMAgT8zNAZylbC~4RD+@tYiEoqPW-Osgp34#Z(BJ=v>RXL zQBu?{s0*rLcDE!k+Rt41ke}Putcn><)~d7mlX%)i4ZDO$pUy_ji9t>@WfZwbx*%v2 zi&>Q&f8ZeyR|D77WAdIzxaQ^j#h_?BhE?duZX(pywyh_xTZb;~V{#OrM%?{m47r~R z;v6P>C(Uy^6(|gPJjZFhSn9jRAB>+Nx7MEQsz~-#K7cOBN!LoupU4sFf4vp?)P9GV zlnM7bU(az2O&9#Bg-C-Kkr|!TPrBRe-lT?0l39}pyG$z1gS@D{oONp=|Iv!3=neC_ zYo5C~fC;7~_otlc&N$!J9E)ccg;4&zsn`_U6%AhEHb~|h34PlwhTMBW_r$o2EpA>P zbKVPjlH)f~_(p+m_VMF1{Jn0ordtW=N)QMC=YaGA_ zt2NE)`+Uy;;2X^KH!FL0#+-Ziw0Gtasq5x|5gs;Ciwr$tEE3&Ta3*ri8d1N)b~y~h z$ZP_b4E$l>_PI6uTjSW6&OOkshtvgLTOvt^R zXPE`UvDEYrtEs+b@ygHkvzxMTTb}r5?r2LjYYv7lAt@r?$@&j*4Eu8#fW;7BKScOG z?zlOaoU?ymF8yakN-h~!MvYZ6>5=m*rxtQOc(ZU>DC0UPueEX0!2ZEDe{J06r`=s) zA8VYb{%r;JOlGDCwE(c6cpV056Zduuo#V;7L9a(N-5Xd3?hS!lAsmE(5$h=dTJ=+S zEfs82$f$b`KCT7xt_=6)5HGKe-0F~3e+X3_qW#u6gw<30)ba+(m6j;vD~wLX4qEy3 zwV~+vB7M=7kU@n7JIc8x@(GC!x^|f*olgu7oY(2ON$+SZrIiPNHftCx5-a?Ot`5r4-{?9x{WY|ORT$T_?3$}=-Rvz*dDn%X`n z7oRolEi6{>a?>Rpvb{w`VgV@82rx7Zp{F51EpE&BFjIb;)Hk`) z)p1QSh|_-}FtewLbc<2SKwVtoL`fvn%R}d9cSDszYGTTOxwHnuG9;GVuR^>2MovIm z9dEyk05v6^CAts3{4Ct-$O~43?O}y`2L`4p2=va7nvr0z$8t!k{Xai&eVdAQ-JKac?S=e6s-SR7w zSpwHoatJ~KrUVnRyW5w#j;7<~C3#|RL&MwKA&62Fldq`qP6pYM_0QH;gh7uX1RoFO z?+^`+GJ>m7pD6>UUlC{OODpD+(1w49@K>l)byHCC6YkrjR#QH?Gg@Rvtg)km3|sdTg%kEm=mxN$$7Xh#uuaF-{Q7JsKZRE*HRb+9t zx$ls)2C1F1qTmv$$*GV^;dx6S?5Rn3#e%#xl&gjaYb}gSvBjtpQ-1VGInxX?)TzC2 zpl?*cP;wMQGAZu$Av2)G0Mt#CF)sqOUB@<$b(;p)Cne) zcOG->z*5InV(>lGt66XbDdHzRNZR*btxJ*0mC5LfI%)tn)_}o9-MaVk?CYBB*qw!t zQl^|g%rvyPU~HXYCKAQ9p%}ieCeX_GU z0)y*X+c*~f7xA)X~QKr4*pgUlKpIDrjmC6$DX>uhjiBMBdD zPF%EilN_HzzF0U!QJ1v6pEhM^%K!u5BMu!u0DHCWwe@j+Ox0Xet8b$4tVCX#s*Toe zaF;6oh}f)*atTv=O}<3Uwbm{)ul;(XQ5HP$MyH5)lo=7;t@4#xpre!q>YF0o74Wis zH=i+_7}8(>U%yG#Ck?*xNDbIEJdCt)#uI!o9;HCZ@vtSfYVzGBQ#o_-!R1DBzOKy0 z{r52^=0re@zf@UgQREme``W@$_QTy+ajwIJ)SSutL^s|I6ao42&?u=B#Z zDD5umy6Eya#+6=0_8#bY_O!~~vcL@Ll&-Vec@Qn-2U}kj*J4$ym+-21i4L%yiu!L7h!cYj|DU@3eFD zjMeygHPn|xbp$681lJmDABt@zk+Q1EI`U{$(Pbb{k~D0+y_5Qu9@JrNXQ;&SM%^Z^ zEf!9zl$JOv8|Qxb4xtMBJ`8`(C5UShP}e!*I8*nQsksDj(@jDoCa6x7uws7()DU7o&Mwt!ss#-&O>IsTkMDV-4DG}ldr zg%_J!(bd+@1>sE<2Fh+`heQxf7Toank1-EO`}ZHEaRVALB;v_HYyqLO?}?#hS(`?w zVGj1&0p7M zK&^l5R&G^U30wKLIm=vRKQ(b{uFpp3n(_B3F25bt>SlVexkgez0QbCyXS16ff&l3v z)Xd8CQOaQ-czS*T%T2r9=<{R5I}IGnOXL`5aJ} Date: Fri, 15 Sep 2023 11:09:09 -0700 Subject: [PATCH 386/954] Add SRW LTSA Package Email * Split Email Service into StatusEmailService and EmailService * Update Email Service to allow sending of attachments --- .../application.controller.spec.ts | 23 +- .../application/application.controller.ts | 14 +- .../card/card-subtask/card-subtask.dto.ts | 1 + ...ation-submission-review.controller.spec.ts | 77 ++--- ...pplication-submission-review.controller.ts | 22 +- .../application-submission.controller.spec.ts | 92 +++--- .../application-submission.controller.ts | 38 +-- ...ce-of-intent-submission.controller.spec.ts | 94 +++--- .../notice-of-intent-submission.controller.ts | 26 +- ...notification-submission.controller.spec.ts | 13 +- .../notification-submission.controller.ts | 38 ++- .../notification-submission.service.ts | 47 ++- .../generate-srw-document.service.ts | 2 +- .../alcs/src/providers/email/email.module.ts | 7 +- .../src/providers/email/email.service.spec.ts | 171 +---------- .../alcs/src/providers/email/email.service.ts | 290 +++--------------- .../email/status-email.service.spec.ts | 200 ++++++++++++ .../providers/email/status-email.service.ts | 239 +++++++++++++++ .../status-emails.consumer.spec.ts | 61 ++-- .../status-emails/status-emails.consumer.ts | 8 +- .../status-emails.consumer.spec.ts | 63 ++-- .../status-emails.consumer.ts | 8 +- .../emails/cancelled/application.template.ts | 2 +- .../cancelled/notice-of-intent.template.ts | 2 +- .../decision-released/application.template.ts | 2 +- .../notice-of-intent.template.ts | 2 +- .../notifications/srw-notice.template.ts | 88 ++++++ .../emails/refused-to-forward.template.ts | 2 +- .../emails/returned-as-incomplete.template.ts | 2 +- .../submitted-to-alc/application.template.ts | 6 +- .../noi-applicant.template.ts | 11 +- .../noi-government.template.ts | 2 +- .../tur-applicant.template.ts | 2 +- .../tur-government.template.ts | 2 +- .../submitted-to-lfng/applicant.template.ts | 14 +- .../submitted-to-lfng/government.template.ts | 12 +- .../emails/under-review-by-alc.template.ts | 2 +- .../emails/under-review-by-lfng.template.ts | 2 +- .../templates/emails/wrong-lfng.template.ts | 2 +- 39 files changed, 990 insertions(+), 699 deletions(-) create mode 100644 services/apps/alcs/src/providers/email/status-email.service.spec.ts create mode 100644 services/apps/alcs/src/providers/email/status-email.service.ts create mode 100644 services/templates/emails/notifications/srw-notice.template.ts diff --git a/services/apps/alcs/src/alcs/application/application.controller.spec.ts b/services/apps/alcs/src/alcs/application/application.controller.spec.ts index d99a9356b7..1ffc8030ee 100644 --- a/services/apps/alcs/src/alcs/application/application.controller.spec.ts +++ b/services/apps/alcs/src/alcs/application/application.controller.spec.ts @@ -11,6 +11,7 @@ import { import { mockKeyCloakProviders } from '../../../test/mocks/mockTypes'; import { ApplicationProfile } from '../../common/automapper/application.automapper.profile'; import { UserProfile } from '../../common/automapper/user.automapper.profile'; +import { StatusEmailService } from '../../providers/email/status-email.service'; import { CardStatusDto } from '../card/card-status/card-status.dto'; import { CardDto } from '../card/card.dto'; import { Card } from '../card/card.entity'; @@ -33,7 +34,7 @@ describe('ApplicationController', () => { let applicationService: DeepMocked; let notificationService: DeepMocked; let cardService: DeepMocked; - let emailService: DeepMocked; + let statusEmailService: DeepMocked; const mockApplicationEntity = initApplicationMockEntity(); @@ -71,10 +72,10 @@ describe('ApplicationController', () => { }; beforeEach(async () => { - applicationService = createMock(); - notificationService = createMock(); - cardService = createMock(); - emailService = createMock(); + applicationService = createMock(); + notificationService = createMock(); + cardService = createMock(); + statusEmailService = createMock(); const module: TestingModule = await Test.createTestingModule({ controllers: [ApplicationController], @@ -94,8 +95,8 @@ describe('ApplicationController', () => { useValue: cardService, }, { - provide: EmailService, - useValue: emailService, + provide: StatusEmailService, + useValue: statusEmailService, }, { provide: ClsService, @@ -391,19 +392,19 @@ describe('ApplicationController', () => { localGovernmentUuid, }); - emailService.getApplicationEmailData.mockResolvedValue({ + statusEmailService.getApplicationEmailData.mockResolvedValue({ applicationSubmission: mockApplicationSubmission, primaryContact: mockOwner, submissionGovernment: mockGovernment, }); - emailService.sendApplicationStatusEmail.mockResolvedValue(); + statusEmailService.sendApplicationStatusEmail.mockResolvedValue(); applicationService.cancel.mockResolvedValue(); await controller.cancel(mockApplicationEntity.uuid); expect(applicationService.cancel).toBeCalledTimes(1); - expect(emailService.sendApplicationStatusEmail).toBeCalledTimes(1); - expect(emailService.sendApplicationStatusEmail).toBeCalledWith({ + expect(statusEmailService.sendApplicationStatusEmail).toBeCalledTimes(1); + expect(statusEmailService.sendApplicationStatusEmail).toBeCalledWith({ generateStatusHtml: generateCANCApplicationHtml, status: SUBMISSION_STATUS.CANCELLED, applicationSubmission: mockApplicationSubmission, diff --git a/services/apps/alcs/src/alcs/application/application.controller.ts b/services/apps/alcs/src/alcs/application/application.controller.ts index c3a11ee20e..b5f4e86c38 100644 --- a/services/apps/alcs/src/alcs/application/application.controller.ts +++ b/services/apps/alcs/src/alcs/application/application.controller.ts @@ -18,10 +18,14 @@ import { } from '@nestjs/common'; import { ApiOAuth2 } from '@nestjs/swagger'; import * as config from 'config'; +import { generateCANCApplicationHtml } from '../../../../../templates/emails/cancelled'; import { ROLES_ALLOWED_APPLICATIONS } from '../../common/authorization/roles'; import { RolesGuard } from '../../common/authorization/roles-guard.service'; import { UserRoles } from '../../common/authorization/roles.decorator'; +import { StatusEmailService } from '../../providers/email/status-email.service'; import { formatIncomingDate } from '../../utils/incoming-date.formatter'; +import { SUBMISSION_STATUS } from '../application/application-submission-status/submission-status.dto'; +import { PARENT_TYPE } from '../card/card-subtask/card-subtask.dto'; import { CardService } from '../card/card.service'; import { ApplicationDto, @@ -29,10 +33,6 @@ import { UpdateApplicationDto, } from './application.dto'; import { ApplicationService } from './application.service'; -import { EmailService } from '../../providers/email/email.service'; -import { generateCANCApplicationHtml } from '../../../../../templates/emails/cancelled'; -import { SUBMISSION_STATUS } from '../application/application-submission-status/submission-status.dto'; -import { PARENT_TYPE } from '../card/card-subtask/card-subtask.dto'; @ApiOAuth2(config.get('KEYCLOAK.SCOPES')) @Controller('application') @@ -41,7 +41,7 @@ export class ApplicationController { constructor( private applicationService: ApplicationService, private cardService: CardService, - private emailService: EmailService, + private statusEmailService: StatusEmailService, @Inject(CONFIG_TOKEN) private config: config.IConfig, ) {} @@ -128,10 +128,10 @@ export class ApplicationController { @UserRoles(...ROLES_ALLOWED_APPLICATIONS) async cancel(@Param('fileNumber') fileNumber): Promise { const { applicationSubmission, primaryContact, submissionGovernment } = - await this.emailService.getApplicationEmailData(fileNumber); + await this.statusEmailService.getApplicationEmailData(fileNumber); if (primaryContact) { - await this.emailService.sendApplicationStatusEmail({ + await this.statusEmailService.sendApplicationStatusEmail({ generateStatusHtml: generateCANCApplicationHtml, status: SUBMISSION_STATUS.CANCELLED, applicationSubmission, diff --git a/services/apps/alcs/src/alcs/card/card-subtask/card-subtask.dto.ts b/services/apps/alcs/src/alcs/card/card-subtask/card-subtask.dto.ts index a8464d5739..77dcebdd37 100644 --- a/services/apps/alcs/src/alcs/card/card-subtask/card-subtask.dto.ts +++ b/services/apps/alcs/src/alcs/card/card-subtask/card-subtask.dto.ts @@ -11,6 +11,7 @@ export enum PARENT_TYPE { MODIFICATION = 'modification', PLANNING_REVIEW = 'planning-review', NOTICE_OF_INTENT = 'notice-of-intent', + NOTIFICATION = 'notification', } export class UpdateCardSubtaskDto { @AutoMap() diff --git a/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.spec.ts b/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.spec.ts index 3feedf7fec..dfa850df68 100644 --- a/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.spec.ts +++ b/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.spec.ts @@ -2,6 +2,10 @@ import { BaseServiceException } from '@app/common/exceptions/base.exception'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { ClsService } from 'nestjs-cls'; +import { generateRFFGHtml } from '../../../../../templates/emails/refused-to-forward.template'; +import { generateINCMHtml } from '../../../../../templates/emails/returned-as-incomplete.template'; +import { generateSUBMApplicationHtml } from '../../../../../templates/emails/submitted-to-alc'; +import { generateWRNGHtml } from '../../../../../templates/emails/wrong-lfng.template'; import { mockKeyCloakProviders } from '../../../test/mocks/mockTypes'; import { ApplicationDocument } from '../../alcs/application/application-document/application-document.entity'; import { ApplicationDocumentService } from '../../alcs/application/application-document/application-document.service'; @@ -15,12 +19,12 @@ import { LocalGovernment } from '../../alcs/local-government/local-government.en import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; import { OwnerType } from '../../common/owner-type/owner-type.entity'; import { - DocumentCode, DOCUMENT_TYPE, + DocumentCode, } from '../../document/document-code.entity'; import { DOCUMENT_SOURCE } from '../../document/document.dto'; import { Document } from '../../document/document.entity'; -import { EmailService } from '../../providers/email/email.service'; +import { StatusEmailService } from '../../providers/email/status-email.service'; import { User } from '../../user/user.entity'; import { ApplicationOwner } from '../application-submission/application-owner/application-owner.entity'; import { @@ -33,10 +37,6 @@ import { ApplicationSubmissionReviewController } from './application-submission- import { ApplicationSubmissionReviewDto } from './application-submission-review.dto'; import { ApplicationSubmissionReview } from './application-submission-review.entity'; import { ApplicationSubmissionReviewService } from './application-submission-review.service'; -import { generateSUBMApplicationHtml } from '../../../../../templates/emails/submitted-to-alc'; -import { generateRFFGHtml } from '../../../../../templates/emails/refused-to-forward.template'; -import { generateINCMHtml } from '../../../../../templates/emails/returned-as-incomplete.template'; -import { generateWRNGHtml } from '../../../../../templates/emails/wrong-lfng.template'; describe('ApplicationSubmissionReviewController', () => { let controller: ApplicationSubmissionReviewController; @@ -46,7 +46,7 @@ describe('ApplicationSubmissionReviewController', () => { let mockAppDocService: DeepMocked; let mockAppValidatorService: DeepMocked; let mockAppService: DeepMocked; - let mockEmailService: DeepMocked; + let mockStatusEmailService: DeepMocked; let mockApplicationSubmissionStatusService: DeepMocked; const mockLG = new LocalGovernment({ @@ -67,7 +67,7 @@ describe('ApplicationSubmissionReviewController', () => { mockAppDocService = createMock(); mockAppValidatorService = createMock(); mockAppService = createMock(); - mockEmailService = createMock(); + mockStatusEmailService = createMock(); applicationReview = new ApplicationSubmissionReview({ applicationFileNumber: fileNumber, @@ -106,8 +106,8 @@ describe('ApplicationSubmissionReviewController', () => { useValue: mockAppService, }, { - provide: EmailService, - useValue: mockEmailService, + provide: StatusEmailService, + useValue: mockStatusEmailService, }, { provide: ClsService, @@ -217,7 +217,7 @@ describe('ApplicationSubmissionReviewController', () => { it('should send an email through the service when creating with a valid primary contact', async () => { mockLGService.getByGuid.mockResolvedValue(mockLG); mockAppReviewService.startReview.mockResolvedValue(applicationReview); - mockEmailService.sendApplicationStatusEmail.mockResolvedValue(); + mockStatusEmailService.sendApplicationStatusEmail.mockResolvedValue(); const user = new User({ bceidBusinessGuid: 'id', @@ -243,7 +243,6 @@ describe('ApplicationSubmissionReviewController', () => { label: '', }), ); - mockEmailService.sendEmail.mockResolvedValue(); await controller.create(fileNumber, { user: { @@ -251,9 +250,9 @@ describe('ApplicationSubmissionReviewController', () => { }, }); - expect(mockEmailService.sendApplicationStatusEmail).toHaveBeenCalledTimes( - 1, - ); + expect( + mockStatusEmailService.sendApplicationStatusEmail, + ).toHaveBeenCalledTimes(1); expect(mockLGService.getByGuid).toHaveBeenCalledTimes(2); expect(mockAppReviewService.startReview).toHaveBeenCalledTimes(1); expect( @@ -342,7 +341,7 @@ describe('ApplicationSubmissionReviewController', () => { ); mockAppReviewService.getByFileNumber.mockResolvedValue(applicationReview); mockAppDocService.list.mockResolvedValue([]); - mockEmailService.sendApplicationStatusEmail.mockResolvedValue(); + mockStatusEmailService.sendApplicationStatusEmail.mockResolvedValue(); mockAppReviewService.verifyComplete.mockReturnValue({ ...applicationReview, @@ -386,10 +385,12 @@ describe('ApplicationSubmissionReviewController', () => { expect(mockAppSubmissionService.updateStatus.mock.calls[0][1]).toEqual( SUBMISSION_STATUS.SUBMITTED_TO_ALC, ); - expect(mockEmailService.sendApplicationStatusEmail).toHaveBeenCalledTimes( - 1, - ); - expect(mockEmailService.sendApplicationStatusEmail).toHaveBeenCalledWith({ + expect( + mockStatusEmailService.sendApplicationStatusEmail, + ).toHaveBeenCalledTimes(1); + expect( + mockStatusEmailService.sendApplicationStatusEmail, + ).toHaveBeenCalledWith({ generateStatusHtml: generateSUBMApplicationHtml, status: SUBMISSION_STATUS.SUBMITTED_TO_ALC, applicationSubmission: mockSubmission, @@ -437,7 +438,7 @@ describe('ApplicationSubmissionReviewController', () => { errors: [], }); mockAppSubmissionService.updateStatus.mockResolvedValue({} as any); - mockEmailService.sendApplicationStatusEmail.mockResolvedValue(); + mockStatusEmailService.sendApplicationStatusEmail.mockResolvedValue(); mockAppDocService.list.mockResolvedValue([]); await controller.finish(fileNumber, { @@ -459,10 +460,12 @@ describe('ApplicationSubmissionReviewController', () => { expect(mockAppSubmissionService.updateStatus.mock.calls[0][1]).toEqual( SUBMISSION_STATUS.REFUSED_TO_FORWARD_LG, ); - expect(mockEmailService.sendApplicationStatusEmail).toHaveBeenCalledTimes( - 1, - ); - expect(mockEmailService.sendApplicationStatusEmail).toHaveBeenCalledWith({ + expect( + mockStatusEmailService.sendApplicationStatusEmail, + ).toHaveBeenCalledTimes(1); + expect( + mockStatusEmailService.sendApplicationStatusEmail, + ).toHaveBeenCalledWith({ generateStatusHtml: generateRFFGHtml, status: SUBMISSION_STATUS.REFUSED_TO_FORWARD_LG, applicationSubmission: mockSubmission, @@ -498,7 +501,7 @@ describe('ApplicationSubmissionReviewController', () => { mockAppSubmissionService.update.mockResolvedValue( new ApplicationSubmission(), ); - mockEmailService.sendApplicationStatusEmail.mockResolvedValue(); + mockStatusEmailService.sendApplicationStatusEmail.mockResolvedValue(); const documents = [ new ApplicationDocument({ @@ -559,10 +562,12 @@ describe('ApplicationSubmissionReviewController', () => { expect( mockApplicationSubmissionStatusService.setStatusDate, ).toHaveBeenCalledTimes(2); - expect(mockEmailService.sendApplicationStatusEmail).toHaveBeenCalledTimes( - 1, - ); - expect(mockEmailService.sendApplicationStatusEmail).toHaveBeenCalledWith({ + expect( + mockStatusEmailService.sendApplicationStatusEmail, + ).toHaveBeenCalledTimes(1); + expect( + mockStatusEmailService.sendApplicationStatusEmail, + ).toHaveBeenCalledWith({ generateStatusHtml: generateINCMHtml, status: SUBMISSION_STATUS.INCOMPLETE, applicationSubmission: mockSubmission, @@ -598,7 +603,7 @@ describe('ApplicationSubmissionReviewController', () => { mockAppSubmissionService.update.mockResolvedValue( new ApplicationSubmission(), ); - mockEmailService.sendApplicationStatusEmail.mockResolvedValue(); + mockStatusEmailService.sendApplicationStatusEmail.mockResolvedValue(); const documents = [ new ApplicationDocument({ @@ -635,10 +640,12 @@ describe('ApplicationSubmissionReviewController', () => { }, ); - expect(mockEmailService.sendApplicationStatusEmail).toHaveBeenCalledTimes( - 1, - ); - expect(mockEmailService.sendApplicationStatusEmail).toHaveBeenCalledWith({ + expect( + mockStatusEmailService.sendApplicationStatusEmail, + ).toHaveBeenCalledTimes(1); + expect( + mockStatusEmailService.sendApplicationStatusEmail, + ).toHaveBeenCalledWith({ generateStatusHtml: generateWRNGHtml, status: SUBMISSION_STATUS.WRONG_GOV, applicationSubmission: mockSubmission, diff --git a/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.ts b/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.ts index 12da1943ed..5df5e9761c 100644 --- a/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.ts +++ b/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.ts @@ -12,16 +12,20 @@ import { Req, UseGuards, } from '@nestjs/common'; +import { generateRFFGHtml } from '../../../../../templates/emails/refused-to-forward.template'; +import { generateINCMHtml } from '../../../../../templates/emails/returned-as-incomplete.template'; +import { generateSUBMApplicationHtml } from '../../../../../templates/emails/submitted-to-alc'; import { generateREVGHtml } from '../../../../../templates/emails/under-review-by-lfng.template'; import { generateWRNGHtml } from '../../../../../templates/emails/wrong-lfng.template'; import { ApplicationDocumentService } from '../../alcs/application/application-document/application-document.service'; import { ApplicationSubmissionStatusService } from '../../alcs/application/application-submission-status/application-submission-status.service'; import { SUBMISSION_STATUS } from '../../alcs/application/application-submission-status/submission-status.dto'; +import { PARENT_TYPE } from '../../alcs/card/card-subtask/card-subtask.dto'; import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; import { PortalAuthGuard } from '../../common/authorization/portal-auth-guard.service'; import { OWNER_TYPE } from '../../common/owner-type/owner-type.entity'; import { DOCUMENT_SOURCE } from '../../document/document.dto'; -import { EmailService } from '../../providers/email/email.service'; +import { StatusEmailService } from '../../providers/email/status-email.service'; import { User } from '../../user/user.entity'; import { ApplicationSubmissionValidatorService } from '../application-submission/application-submission-validator.service'; import { ApplicationSubmission } from '../application-submission/application-submission.entity'; @@ -32,10 +36,6 @@ import { UpdateApplicationSubmissionReviewDto, } from './application-submission-review.dto'; import { ApplicationSubmissionReviewService } from './application-submission-review.service'; -import { generateINCMHtml } from '../../../../../templates/emails/returned-as-incomplete.template'; -import { generateRFFGHtml } from '../../../../../templates/emails/refused-to-forward.template'; -import { generateSUBMApplicationHtml } from '../../../../../templates/emails/submitted-to-alc'; -import { PARENT_TYPE } from '../../alcs/card/card-subtask/card-subtask.dto'; @Controller('application-review') @UseGuards(PortalAuthGuard) @@ -46,7 +46,7 @@ export class ApplicationSubmissionReviewController { private applicationDocumentService: ApplicationDocumentService, private localGovernmentService: LocalGovernmentService, private applicationValidatorService: ApplicationSubmissionValidatorService, - private emailService: EmailService, + private statusEmailService: StatusEmailService, private applicationSubmissionStatusService: ApplicationSubmissionStatusService, ) {} @@ -189,7 +189,7 @@ export class ApplicationSubmissionReviewController { ); if (primaryContact) { - await this.emailService.sendApplicationStatusEmail({ + await this.statusEmailService.sendApplicationStatusEmail({ generateStatusHtml: generateREVGHtml, status: SUBMISSION_STATUS.IN_REVIEW_BY_LG, applicationSubmission, @@ -291,7 +291,7 @@ export class ApplicationSubmissionReviewController { ); if (primaryContact) { - await this.emailService.sendApplicationStatusEmail({ + await this.statusEmailService.sendApplicationStatusEmail({ generateStatusHtml: generateSUBMApplicationHtml, status: SUBMISSION_STATUS.SUBMITTED_TO_ALC, applicationSubmission: application, @@ -308,7 +308,7 @@ export class ApplicationSubmissionReviewController { ); if (primaryContact) { - await this.emailService.sendApplicationStatusEmail({ + await this.statusEmailService.sendApplicationStatusEmail({ generateStatusHtml: generateRFFGHtml, status: SUBMISSION_STATUS.REFUSED_TO_FORWARD_LG, applicationSubmission: application, @@ -394,7 +394,7 @@ export class ApplicationSubmissionReviewController { if (primaryContact) { if (returnDto.reasonForReturn === 'wrongGovernment') { - await this.emailService.sendApplicationStatusEmail({ + await this.statusEmailService.sendApplicationStatusEmail({ generateStatusHtml: generateWRNGHtml, status: SUBMISSION_STATUS.WRONG_GOV, applicationSubmission, @@ -405,7 +405,7 @@ export class ApplicationSubmissionReviewController { } if (returnDto.reasonForReturn === 'incomplete') { - await this.emailService.sendApplicationStatusEmail({ + await this.statusEmailService.sendApplicationStatusEmail({ generateStatusHtml: generateINCMHtml, status: SUBMISSION_STATUS.INCOMPLETE, applicationSubmission, diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.controller.spec.ts b/services/apps/alcs/src/portal/application-submission/application-submission.controller.spec.ts index 67cff64d3a..0ad4396331 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.controller.spec.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.controller.spec.ts @@ -5,6 +5,15 @@ import { BadRequestException } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; import { ClsService } from 'nestjs-cls'; import { ServiceValidationException } from '../../../../../libs/common/src/exceptions/base.exception'; +import { generateCANCApplicationHtml } from '../../../../../templates/emails/cancelled'; +import { + generateSUBGTurApplicantHtml, + generateSUBGTurGovernmentHtml, +} from '../../../../../templates/emails/submitted-to-alc'; +import { + generateSUBGApplicantHtml, + generateSUBGGovernmentHtml, +} from '../../../../../templates/emails/submitted-to-lfng'; import { mockKeyCloakProviders } from '../../../test/mocks/mockTypes'; import { ApplicationDocumentService } from '../../alcs/application/application-document/application-document.service'; import { ApplicationSubmissionStatusType } from '../../alcs/application/application-submission-status/submission-status-type.entity'; @@ -14,7 +23,9 @@ import { Application } from '../../alcs/application/application.entity'; import { LocalGovernment } from '../../alcs/local-government/local-government.entity'; import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; import { ApplicationProfile } from '../../common/automapper/application.automapper.profile'; +import { StatusEmailService } from '../../providers/email/status-email.service'; import { User } from '../../user/user.entity'; +import { ApplicationOwner } from './application-owner/application-owner.entity'; import { ApplicationSubmissionValidatorService, ValidatedApplicationSubmission, @@ -26,17 +37,6 @@ import { } from './application-submission.dto'; import { ApplicationSubmission } from './application-submission.entity'; import { ApplicationSubmissionService } from './application-submission.service'; -import { EmailService } from '../../providers/email/email.service'; -import { ApplicationOwner } from './application-owner/application-owner.entity'; -import { generateCANCApplicationHtml } from '../../../../../templates/emails/cancelled'; -import { - generateSUBGTurApplicantHtml, - generateSUBGTurGovernmentHtml, -} from '../../../../../templates/emails/submitted-to-alc'; -import { - generateSUBGApplicantHtml, - generateSUBGGovernmentHtml, -} from '../../../../../templates/emails/submitted-to-lfng'; describe('ApplicationSubmissionController', () => { let controller: ApplicationSubmissionController; @@ -44,7 +44,7 @@ describe('ApplicationSubmissionController', () => { let mockDocumentService: DeepMocked; let mockLgService: DeepMocked; let mockAppValidationService: DeepMocked; - let mockEmailService: DeepMocked; + let mockStatusEmailService: DeepMocked; const localGovernmentUuid = 'local-government'; const primaryContactOwnerUuid = 'primary-contact'; @@ -56,7 +56,7 @@ describe('ApplicationSubmissionController', () => { mockDocumentService = createMock(); mockLgService = createMock(); mockAppValidationService = createMock(); - mockEmailService = createMock(); + mockStatusEmailService = createMock(); const module: TestingModule = await Test.createTestingModule({ controllers: [ApplicationSubmissionController], @@ -79,8 +79,8 @@ describe('ApplicationSubmissionController', () => { useValue: mockAppValidationService, }, { - provide: EmailService, - useValue: mockEmailService, + provide: StatusEmailService, + useValue: mockStatusEmailService, }, { provide: ClsService, @@ -182,13 +182,13 @@ describe('ApplicationSubmissionController', () => { mockAppSubmissionService.cancel.mockResolvedValue(); const mockGovernment = new LocalGovernment({ uuid: localGovernmentUuid }); - mockEmailService.getApplicationEmailData.mockResolvedValue({ + mockStatusEmailService.getApplicationEmailData.mockResolvedValue({ applicationSubmission: mockApplication, primaryContact: mockOwner, submissionGovernment: mockGovernment, }); - mockEmailService.sendApplicationStatusEmail.mockResolvedValue(); + mockStatusEmailService.sendApplicationStatusEmail.mockResolvedValue(); const application = await controller.cancel('file-id', { user: { @@ -205,10 +205,12 @@ describe('ApplicationSubmissionController', () => { 'file-id', new User(), ); - expect(mockEmailService.sendApplicationStatusEmail).toHaveBeenCalledTimes( - 1, - ); - expect(mockEmailService.sendApplicationStatusEmail).toHaveBeenCalledWith({ + expect( + mockStatusEmailService.sendApplicationStatusEmail, + ).toHaveBeenCalledTimes(1); + expect( + mockStatusEmailService.sendApplicationStatusEmail, + ).toHaveBeenCalledWith({ generateStatusHtml: generateCANCApplicationHtml, status: SUBMISSION_STATUS.CANCELLED, applicationSubmission: mockApplication, @@ -397,13 +399,13 @@ describe('ApplicationSubmissionController', () => { }); const mockGovernment = new LocalGovernment({ uuid: localGovernmentUuid }); - mockEmailService.getApplicationEmailData.mockResolvedValue({ + mockStatusEmailService.getApplicationEmailData.mockResolvedValue({ applicationSubmission: mockApplicationSubmission, primaryContact: mockOwner, submissionGovernment: mockGovernment, }); - mockEmailService.sendApplicationStatusEmail.mockResolvedValue(); + mockStatusEmailService.sendApplicationStatusEmail.mockResolvedValue(); await controller.submitAsApplicant(mockFileId, { user: { @@ -416,10 +418,12 @@ describe('ApplicationSubmissionController', () => { ); expect(mockAppSubmissionService.submitToAlcs).toHaveBeenCalledTimes(1); expect(mockAppSubmissionService.updateStatus).toHaveBeenCalledTimes(1); - expect(mockEmailService.sendApplicationStatusEmail).toHaveBeenCalledTimes( - 2, - ); - expect(mockEmailService.sendApplicationStatusEmail).toHaveBeenCalledWith({ + expect( + mockStatusEmailService.sendApplicationStatusEmail, + ).toHaveBeenCalledTimes(2); + expect( + mockStatusEmailService.sendApplicationStatusEmail, + ).toHaveBeenCalledWith({ generateStatusHtml: generateSUBGTurApplicantHtml, status: SUBMISSION_STATUS.SUBMITTED_TO_ALC, applicationSubmission: mockApplicationSubmission, @@ -427,7 +431,9 @@ describe('ApplicationSubmissionController', () => { parentType: 'application', primaryContact: mockOwner, }); - expect(mockEmailService.sendApplicationStatusEmail).toHaveBeenCalledWith({ + expect( + mockStatusEmailService.sendApplicationStatusEmail, + ).toHaveBeenCalledWith({ generateStatusHtml: generateSUBGTurGovernmentHtml, status: SUBMISSION_STATUS.SUBMITTED_TO_ALC, applicationSubmission: mockApplicationSubmission, @@ -456,10 +462,10 @@ describe('ApplicationSubmissionController', () => { new ApplicationSubmission() as ValidatedApplicationSubmission, errors: [], }); - mockEmailService.sendApplicationStatusEmail.mockResolvedValue(); + mockStatusEmailService.sendApplicationStatusEmail.mockResolvedValue(); const mockGovernment = new LocalGovernment({ uuid: localGovernmentUuid }); - mockEmailService.getApplicationEmailData.mockResolvedValue({ + mockStatusEmailService.getApplicationEmailData.mockResolvedValue({ applicationSubmission: mockApplicationSubmission, primaryContact: mockOwner, submissionGovernment: mockGovernment, @@ -475,10 +481,12 @@ describe('ApplicationSubmissionController', () => { 1, ); expect(mockAppSubmissionService.submitToLg).toHaveBeenCalledTimes(1); - expect(mockEmailService.sendApplicationStatusEmail).toHaveBeenCalledTimes( - 2, - ); - expect(mockEmailService.sendApplicationStatusEmail).toHaveBeenCalledWith({ + expect( + mockStatusEmailService.sendApplicationStatusEmail, + ).toHaveBeenCalledTimes(2); + expect( + mockStatusEmailService.sendApplicationStatusEmail, + ).toHaveBeenCalledWith({ generateStatusHtml: generateSUBGApplicantHtml, status: SUBMISSION_STATUS.SUBMITTED_TO_LG, applicationSubmission: mockApplicationSubmission, @@ -486,7 +494,9 @@ describe('ApplicationSubmissionController', () => { parentType: 'application', primaryContact: mockOwner, }); - expect(mockEmailService.sendApplicationStatusEmail).toHaveBeenCalledWith({ + expect( + mockStatusEmailService.sendApplicationStatusEmail, + ).toHaveBeenCalledWith({ generateStatusHtml: generateSUBGGovernmentHtml, status: SUBMISSION_STATUS.SUBMITTED_TO_LG, applicationSubmission: mockApplicationSubmission, @@ -522,10 +532,10 @@ describe('ApplicationSubmissionController', () => { new ApplicationSubmission() as ValidatedApplicationSubmission, errors: [], }); - mockEmailService.sendApplicationStatusEmail.mockResolvedValue(); + mockStatusEmailService.sendApplicationStatusEmail.mockResolvedValue(); const mockGovernment = new LocalGovernment({ uuid: localGovernmentUuid }); - mockEmailService.getApplicationEmailData.mockResolvedValue({ + mockStatusEmailService.getApplicationEmailData.mockResolvedValue({ applicationSubmission: mockApplicationSubmission, primaryContact: mockOwner, submissionGovernment: mockGovernment, @@ -541,9 +551,9 @@ describe('ApplicationSubmissionController', () => { 1, ); expect(mockAppSubmissionService.submitToLg).toHaveBeenCalledTimes(1); - expect(mockEmailService.sendApplicationStatusEmail).toHaveBeenCalledTimes( - 0, - ); + expect( + mockStatusEmailService.sendApplicationStatusEmail, + ).toHaveBeenCalledTimes(0); }); it('should throw an exception if application fails validation', async () => { @@ -555,7 +565,7 @@ describe('ApplicationSubmissionController', () => { mockAppSubmissionService.verifyAccessByUuid.mockResolvedValue( mockApplicationSubmission, ); - mockEmailService.getApplicationEmailData.mockResolvedValue({ + mockStatusEmailService.getApplicationEmailData.mockResolvedValue({ applicationSubmission: mockApplicationSubmission, primaryContact: new ApplicationOwner(), submissionGovernment: new LocalGovernment(), diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.controller.ts b/services/apps/alcs/src/portal/application-submission/application-submission.controller.ts index b443e74b01..d49f137bff 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.controller.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.controller.ts @@ -11,10 +11,21 @@ import { UseGuards, } from '@nestjs/common'; import { ServiceValidationException } from '../../../../../libs/common/src/exceptions/base.exception'; +import { generateCANCApplicationHtml } from '../../../../../templates/emails/cancelled'; +import { + generateSUBGTurApplicantHtml, + generateSUBGTurGovernmentHtml, +} from '../../../../../templates/emails/submitted-to-alc'; +import { + generateSUBGApplicantHtml, + generateSUBGGovernmentHtml, +} from '../../../../../templates/emails/submitted-to-lfng'; import { SUBMISSION_STATUS } from '../../alcs/application/application-submission-status/submission-status.dto'; +import { PARENT_TYPE } from '../../alcs/card/card-subtask/card-subtask.dto'; import { LocalGovernment } from '../../alcs/local-government/local-government.entity'; import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; import { PortalAuthGuard } from '../../common/authorization/portal-auth-guard.service'; +import { StatusEmailService } from '../../providers/email/status-email.service'; import { User } from '../../user/user.entity'; import { ApplicationSubmissionValidatorService } from './application-submission-validator.service'; import { @@ -22,17 +33,6 @@ import { ApplicationSubmissionUpdateDto, } from './application-submission.dto'; import { ApplicationSubmissionService } from './application-submission.service'; -import { - generateSUBGApplicantHtml, - generateSUBGGovernmentHtml, -} from '../../../../../templates/emails/submitted-to-lfng'; -import { EmailService } from '../../providers/email/email.service'; -import { - generateSUBGTurApplicantHtml, - generateSUBGTurGovernmentHtml, -} from '../../../../../templates/emails/submitted-to-alc'; -import { generateCANCApplicationHtml } from '../../../../../templates/emails/cancelled'; -import { PARENT_TYPE } from '../../alcs/card/card-subtask/card-subtask.dto'; @Controller('application-submission') @UseGuards(PortalAuthGuard) @@ -43,7 +43,7 @@ export class ApplicationSubmissionController { private applicationSubmissionService: ApplicationSubmissionService, private localGovernmentService: LocalGovernmentService, private applicationSubmissionValidatorService: ApplicationSubmissionValidatorService, - private emailService: EmailService, + private statusEmailService: StatusEmailService, ) {} @Get() @@ -202,13 +202,13 @@ export class ApplicationSubmissionController { } const { primaryContact, submissionGovernment } = - await this.emailService.getApplicationEmailData( + await this.statusEmailService.getApplicationEmailData( application.fileNumber, application, ); if (primaryContact) { - await this.emailService.sendApplicationStatusEmail({ + await this.statusEmailService.sendApplicationStatusEmail({ generateStatusHtml: generateCANCApplicationHtml, status: SUBMISSION_STATUS.CANCELLED, applicationSubmission: application, @@ -240,7 +240,7 @@ export class ApplicationSubmissionController { ); const { primaryContact, submissionGovernment } = - await this.emailService.getApplicationEmailData( + await this.statusEmailService.getApplicationEmailData( applicationSubmission.fileNumber, applicationSubmission, ); @@ -254,7 +254,7 @@ export class ApplicationSubmissionController { ); if (primaryContact) { - await this.emailService.sendApplicationStatusEmail({ + await this.statusEmailService.sendApplicationStatusEmail({ generateStatusHtml: generateSUBGTurApplicantHtml, status: SUBMISSION_STATUS.SUBMITTED_TO_ALC, applicationSubmission, @@ -265,7 +265,7 @@ export class ApplicationSubmissionController { } if (submissionGovernment) { - await this.emailService.sendApplicationStatusEmail({ + await this.statusEmailService.sendApplicationStatusEmail({ generateStatusHtml: generateSUBGTurGovernmentHtml, status: SUBMISSION_STATUS.SUBMITTED_TO_ALC, applicationSubmission, @@ -294,7 +294,7 @@ export class ApplicationSubmissionController { // Send status emails for first time submissions if (!wasSubmittedToLfng) { if (primaryContact) { - await this.emailService.sendApplicationStatusEmail({ + await this.statusEmailService.sendApplicationStatusEmail({ generateStatusHtml: generateSUBGApplicantHtml, status: SUBMISSION_STATUS.SUBMITTED_TO_LG, applicationSubmission, @@ -305,7 +305,7 @@ export class ApplicationSubmissionController { } if (submissionGovernment) { - await this.emailService.sendApplicationStatusEmail({ + await this.statusEmailService.sendApplicationStatusEmail({ generateStatusHtml: generateSUBGGovernmentHtml, status: SUBMISSION_STATUS.SUBMITTED_TO_LG, applicationSubmission, diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.controller.spec.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.controller.spec.ts index 56d726b91a..6a008bdf28 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.controller.spec.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.controller.spec.ts @@ -4,6 +4,11 @@ import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { BadRequestException } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; import { ClsService } from 'nestjs-cls'; +import { generateCANCNoticeOfIntentHtml } from '../../../../../templates/emails/cancelled'; +import { + generateSUBMNoiApplicantHtml, + generateSUBMNoiGovernmentHtml, +} from '../../../../../templates/emails/submitted-to-alc'; import { mockKeyCloakProviders } from '../../../test/mocks/mockTypes'; import { LocalGovernment } from '../../alcs/local-government/local-government.entity'; import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; @@ -13,7 +18,9 @@ import { NOI_SUBMISSION_STATUS } from '../../alcs/notice-of-intent/notice-of-int import { NoticeOfIntentSubmissionToSubmissionStatus } from '../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status.entity'; import { NoticeOfIntent } from '../../alcs/notice-of-intent/notice-of-intent.entity'; import { NoticeOfIntentSubmissionProfile } from '../../common/automapper/notice-of-intent-submission.automapper.profile'; +import { StatusEmailService } from '../../providers/email/status-email.service'; import { User } from '../../user/user.entity'; +import { NoticeOfIntentOwner } from './notice-of-intent-owner/notice-of-intent-owner.entity'; import { NoticeOfIntentSubmissionValidatorService, ValidatedNoticeOfIntentSubmission, @@ -25,13 +32,6 @@ import { } from './notice-of-intent-submission.dto'; import { NoticeOfIntentSubmission } from './notice-of-intent-submission.entity'; import { NoticeOfIntentSubmissionService } from './notice-of-intent-submission.service'; -import { EmailService } from '../../providers/email/email.service'; -import { NoticeOfIntentOwner } from './notice-of-intent-owner/notice-of-intent-owner.entity'; -import { generateCANCNoticeOfIntentHtml } from '../../../../../templates/emails/cancelled'; -import { - generateSUBMNoiApplicantHtml, - generateSUBMNoiGovernmentHtml, -} from '../../../../../templates/emails/submitted-to-alc'; describe('NoticeOfIntentSubmissionController', () => { let controller: NoticeOfIntentSubmissionController; @@ -39,7 +39,7 @@ describe('NoticeOfIntentSubmissionController', () => { let mockDocumentService: DeepMocked; let mockLgService: DeepMocked; let mockNoiValidatorService: DeepMocked; - let mockEmailService: DeepMocked; + let mockStatusEmailService: DeepMocked; const primaryContactOwnerUuid = 'primary-contact'; const localGovernmentUuid = 'local-government'; @@ -51,7 +51,7 @@ describe('NoticeOfIntentSubmissionController', () => { mockDocumentService = createMock(); mockLgService = createMock(); mockNoiValidatorService = createMock(); - mockEmailService = createMock(); + mockStatusEmailService = createMock(); const module: TestingModule = await Test.createTestingModule({ controllers: [NoticeOfIntentSubmissionController], @@ -74,8 +74,8 @@ describe('NoticeOfIntentSubmissionController', () => { useValue: mockNoiValidatorService, }, { - provide: EmailService, - useValue: mockEmailService, + provide: StatusEmailService, + useValue: mockStatusEmailService, }, { provide: ClsService, @@ -159,11 +159,11 @@ describe('NoticeOfIntentSubmissionController', () => { mockNoiSubmissionService.cancel.mockResolvedValue( new NoticeOfIntentSubmissionToSubmissionStatus(), ); - mockEmailService.getNoticeOfIntentEmailData.mockResolvedValue({ + mockStatusEmailService.getNoticeOfIntentEmailData.mockResolvedValue({ primaryContact: mockOwner, submissionGovernment: mockGovernment, }); - mockEmailService.sendNoticeOfIntentStatusEmail.mockResolvedValue(); + mockStatusEmailService.sendNoticeOfIntentStatusEmail.mockResolvedValue(); const noticeOfIntentSubmission = await controller.cancel('file-id', { user: { @@ -179,19 +179,19 @@ describe('NoticeOfIntentSubmissionController', () => { new User(), ); expect( - mockEmailService.sendNoticeOfIntentStatusEmail, + mockStatusEmailService.sendNoticeOfIntentStatusEmail, ).toHaveBeenCalledTimes(1); - expect(mockEmailService.sendNoticeOfIntentStatusEmail).toHaveBeenCalledWith( - { - generateStatusHtml: generateCANCNoticeOfIntentHtml, - status: NOI_SUBMISSION_STATUS.CANCELLED, - noticeOfIntentSubmission: mockApplication, - government: mockGovernment, - parentType: 'application', - primaryContact: mockOwner, - ccGovernment: true, - }, - ); + expect( + mockStatusEmailService.sendNoticeOfIntentStatusEmail, + ).toHaveBeenCalledWith({ + generateStatusHtml: generateCANCNoticeOfIntentHtml, + status: NOI_SUBMISSION_STATUS.CANCELLED, + noticeOfIntentSubmission: mockApplication, + government: mockGovernment, + parentType: 'application', + primaryContact: mockOwner, + ccGovernment: true, + }); }); it('should throw an exception when trying to cancel a notice of intent that is not in progress', async () => { @@ -377,11 +377,11 @@ describe('NoticeOfIntentSubmissionController', () => { mockNoiSubmissionService.mapToDetailedDTO.mockResolvedValue( {} as NoticeOfIntentSubmissionDetailedDto, ); - mockEmailService.getNoticeOfIntentEmailData.mockResolvedValue({ + mockStatusEmailService.getNoticeOfIntentEmailData.mockResolvedValue({ primaryContact: mockOwner, submissionGovernment: mockGovernment, }); - mockEmailService.sendNoticeOfIntentStatusEmail.mockResolvedValue(); + mockStatusEmailService.sendNoticeOfIntentStatusEmail.mockResolvedValue(); await controller.submitAsApplicant(mockFileId, { user: { @@ -394,26 +394,26 @@ describe('NoticeOfIntentSubmissionController', () => { expect(mockNoiValidatorService.validateSubmission).toHaveBeenCalledTimes(1); expect(mockNoiSubmissionService.mapToDetailedDTO).toHaveBeenCalledTimes(1); expect( - mockEmailService.sendNoticeOfIntentStatusEmail, + mockStatusEmailService.sendNoticeOfIntentStatusEmail, ).toHaveBeenCalledTimes(2); - expect(mockEmailService.sendNoticeOfIntentStatusEmail).toHaveBeenCalledWith( - { - generateStatusHtml: generateSUBMNoiApplicantHtml, - status: NOI_SUBMISSION_STATUS.SUBMITTED_TO_ALC, - noticeOfIntentSubmission: mockSubmission, - government: mockGovernment, - parentType: 'notice-of-intent', - primaryContact: mockOwner, - }, - ); - expect(mockEmailService.sendNoticeOfIntentStatusEmail).toHaveBeenCalledWith( - { - generateStatusHtml: generateSUBMNoiGovernmentHtml, - status: NOI_SUBMISSION_STATUS.SUBMITTED_TO_ALC, - noticeOfIntentSubmission: mockSubmission, - government: mockGovernment, - parentType: 'notice-of-intent', - }, - ); + expect( + mockStatusEmailService.sendNoticeOfIntentStatusEmail, + ).toHaveBeenCalledWith({ + generateStatusHtml: generateSUBMNoiApplicantHtml, + status: NOI_SUBMISSION_STATUS.SUBMITTED_TO_ALC, + noticeOfIntentSubmission: mockSubmission, + government: mockGovernment, + parentType: 'notice-of-intent', + primaryContact: mockOwner, + }); + expect( + mockStatusEmailService.sendNoticeOfIntentStatusEmail, + ).toHaveBeenCalledWith({ + generateStatusHtml: generateSUBMNoiGovernmentHtml, + status: NOI_SUBMISSION_STATUS.SUBMITTED_TO_ALC, + noticeOfIntentSubmission: mockSubmission, + government: mockGovernment, + parentType: 'notice-of-intent', + }); }); }); diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.controller.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.controller.ts index 84d3b110d0..a4a78b2e24 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.controller.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.controller.ts @@ -10,9 +10,16 @@ import { Req, UseGuards, } from '@nestjs/common'; +import { generateCANCNoticeOfIntentHtml } from '../../../../../templates/emails/cancelled'; +import { + generateSUBMNoiApplicantHtml, + generateSUBMNoiGovernmentHtml, +} from '../../../../../templates/emails/submitted-to-alc'; +import { PARENT_TYPE } from '../../alcs/card/card-subtask/card-subtask.dto'; import { NOI_SUBMISSION_STATUS } from '../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status.dto'; import { PortalAuthGuard } from '../../common/authorization/portal-auth-guard.service'; import { ROLES_ALLOWED_APPLICATIONS } from '../../common/authorization/roles'; +import { StatusEmailService } from '../../providers/email/status-email.service'; import { User } from '../../user/user.entity'; import { NoticeOfIntentSubmissionValidatorService } from './notice-of-intent-submission-validator.service'; import { @@ -20,13 +27,6 @@ import { NoticeOfIntentSubmissionUpdateDto, } from './notice-of-intent-submission.dto'; import { NoticeOfIntentSubmissionService } from './notice-of-intent-submission.service'; -import { EmailService } from '../../providers/email/email.service'; -import { - generateSUBMNoiApplicantHtml, - generateSUBMNoiGovernmentHtml, -} from '../../../../../templates/emails/submitted-to-alc'; -import { PARENT_TYPE } from '../../alcs/card/card-subtask/card-subtask.dto'; -import { generateCANCNoticeOfIntentHtml } from '../../../../../templates/emails/cancelled'; @Controller('notice-of-intent-submission') @UseGuards(PortalAuthGuard) @@ -36,7 +36,7 @@ export class NoticeOfIntentSubmissionController { constructor( private noticeOfIntentSubmissionService: NoticeOfIntentSubmissionService, private noticeOfIntentValidatorService: NoticeOfIntentSubmissionValidatorService, - private emailService: EmailService, + private statusEmailService: StatusEmailService, ) {} @Get() @@ -145,12 +145,12 @@ export class NoticeOfIntentSubmissionController { } const { primaryContact, submissionGovernment } = - await this.emailService.getNoticeOfIntentEmailData( + await this.statusEmailService.getNoticeOfIntentEmailData( noticeOfIntentSubmission, ); if (primaryContact) { - await this.emailService.sendNoticeOfIntentStatusEmail({ + await this.statusEmailService.sendNoticeOfIntentStatusEmail({ generateStatusHtml: generateCANCNoticeOfIntentHtml, status: NOI_SUBMISSION_STATUS.CANCELLED, noticeOfIntentSubmission, @@ -190,12 +190,12 @@ export class NoticeOfIntentSubmissionController { ); const { primaryContact, submissionGovernment } = - await this.emailService.getNoticeOfIntentEmailData( + await this.statusEmailService.getNoticeOfIntentEmailData( noticeOfIntentSubmission, ); if (primaryContact) { - await this.emailService.sendNoticeOfIntentStatusEmail({ + await this.statusEmailService.sendNoticeOfIntentStatusEmail({ generateStatusHtml: generateSUBMNoiApplicantHtml, status: NOI_SUBMISSION_STATUS.SUBMITTED_TO_ALC, noticeOfIntentSubmission, @@ -206,7 +206,7 @@ export class NoticeOfIntentSubmissionController { } if (submissionGovernment) { - await this.emailService.sendNoticeOfIntentStatusEmail({ + await this.statusEmailService.sendNoticeOfIntentStatusEmail({ generateStatusHtml: generateSUBMNoiGovernmentHtml, status: NOI_SUBMISSION_STATUS.SUBMITTED_TO_ALC, noticeOfIntentSubmission, diff --git a/services/apps/alcs/src/portal/notification-submission/notification-submission.controller.spec.ts b/services/apps/alcs/src/portal/notification-submission/notification-submission.controller.spec.ts index da1a7918d4..659dec9b13 100644 --- a/services/apps/alcs/src/portal/notification-submission/notification-submission.controller.spec.ts +++ b/services/apps/alcs/src/portal/notification-submission/notification-submission.controller.spec.ts @@ -8,6 +8,7 @@ import { mockKeyCloakProviders } from '../../../test/mocks/mockTypes'; import { LocalGovernment } from '../../alcs/local-government/local-government.entity'; import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; import { NoticeOfIntentDocumentService } from '../../alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.service'; +import { NotificationDocument } from '../../alcs/notification/notification-document/notification-document.entity'; import { NOTIFICATION_STATUS } from '../../alcs/notification/notification-submission-status/notification-status.dto'; import { NotificationSubmissionToSubmissionStatus } from '../../alcs/notification/notification-submission-status/notification-status.entity'; import { Notification } from '../../alcs/notification/notification.entity'; @@ -283,6 +284,9 @@ describe('NotificationSubmissionController', () => { localGovernmentUuid, }); + mockNotificationSubmissionService.generateSrwEmailData.mockResolvedValue( + {} as any, + ); mockNotificationSubmissionService.submitToAlcs.mockResolvedValue( new Notification(), ); @@ -297,8 +301,11 @@ describe('NotificationSubmissionController', () => { mockSubmission as ValidatedNotificationSubmission, errors: [], }); - mockSrwDocumentService.generateAndAttach.mockResolvedValue(); + mockSrwDocumentService.generateAndAttach.mockResolvedValue( + new NotificationDocument(), + ); mockNotificationSubmissionService.updateStatus.mockResolvedValue(); + mockEmailService.sendEmail.mockResolvedValue(); await controller.submitAsApplicant(mockFileId, { user: { @@ -323,5 +330,9 @@ describe('NotificationSubmissionController', () => { undefined, NOTIFICATION_STATUS.ALC_RESPONSE_SENT, ); + expect( + mockNotificationSubmissionService.generateSrwEmailData, + ).toHaveBeenCalledTimes(1); + expect(mockEmailService.sendEmail).toHaveBeenCalledTimes(1); }); }); diff --git a/services/apps/alcs/src/portal/notification-submission/notification-submission.controller.ts b/services/apps/alcs/src/portal/notification-submission/notification-submission.controller.ts index 6d091ec10a..4d25427d83 100644 --- a/services/apps/alcs/src/portal/notification-submission/notification-submission.controller.ts +++ b/services/apps/alcs/src/portal/notification-submission/notification-submission.controller.ts @@ -10,8 +10,10 @@ import { Req, UseGuards, } from '@nestjs/common'; +import { PARENT_TYPE } from '../../alcs/card/card-subtask/card-subtask.dto'; import { NOTIFICATION_STATUS } from '../../alcs/notification/notification-submission-status/notification-status.dto'; import { PortalAuthGuard } from '../../common/authorization/portal-auth-guard.service'; +import { EmailService } from '../../providers/email/email.service'; import { User } from '../../user/user.entity'; import { GenerateSrwDocumentService } from '../pdf-generation/generate-srw-document.service'; import { NotificationSubmissionValidatorService } from './notification-submission-validator.service'; @@ -28,6 +30,7 @@ export class NotificationSubmissionController { private notificationSubmissionService: NotificationSubmissionService, private notificationValidationService: NotificationSubmissionValidatorService, private generateSrwDocumentService: GenerateSrwDocumentService, + private emailService: EmailService, ) {} @Get() @@ -167,14 +170,33 @@ export class NotificationSubmissionController { } private async generatePdf(submission: NotificationSubmission, user: User) { - await this.generateSrwDocumentService.generateAndAttach( - submission.fileNumber, - user, - ); + const savedDocument = + await this.generateSrwDocumentService.generateAndAttach( + submission.fileNumber, + user, + ); - await this.notificationSubmissionService.updateStatus( - submission.uuid, - NOTIFICATION_STATUS.ALC_RESPONSE_SENT, - ); + if (savedDocument) { + const templateData = + await this.notificationSubmissionService.generateSrwEmailData( + submission, + savedDocument, + ); + + await this.emailService.sendEmail({ + to: [templateData.to], + body: templateData.html, + subject: `Agricultural Land Commission SRW${submission.fileNumber} (${submission.applicant})`, + parentType: PARENT_TYPE.NOTIFICATION, + parentId: templateData.parentId, + cc: templateData.cc, + attachments: [savedDocument.document], + }); + + await this.notificationSubmissionService.updateStatus( + submission.uuid, + NOTIFICATION_STATUS.ALC_RESPONSE_SENT, + ); + } } } diff --git a/services/apps/alcs/src/portal/notification-submission/notification-submission.service.ts b/services/apps/alcs/src/portal/notification-submission/notification-submission.service.ts index bcd2c796f1..8134131ace 100644 --- a/services/apps/alcs/src/portal/notification-submission/notification-submission.service.ts +++ b/services/apps/alcs/src/portal/notification-submission/notification-submission.service.ts @@ -2,8 +2,8 @@ import { BaseServiceException } from '@app/common/exceptions/base.exception'; import { Mapper } from '@automapper/core'; import { InjectMapper } from '@automapper/nestjs'; import { Injectable, Logger } from '@nestjs/common'; -import { filterMiddleware } from '@nestjs/core/middleware/utils'; import { InjectRepository } from '@nestjs/typeorm'; +import * as dayjs from 'dayjs'; import { FindOptionsRelations, FindOptionsWhere, @@ -11,9 +11,10 @@ import { Not, Repository, } from 'typeorm'; +import { generateSRWTemplate } from '../../../../../templates/emails/notifications/srw-notice.template'; import { SUBMISSION_STATUS } from '../../alcs/application/application-submission-status/submission-status.dto'; import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; -import { NOI_SUBMISSION_STATUS } from '../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status.dto'; +import { NotificationDocument } from '../../alcs/notification/notification-document/notification-document.entity'; import { NOTIFICATION_STATUS } from '../../alcs/notification/notification-submission-status/notification-status.dto'; import { NotificationSubmissionStatusService } from '../../alcs/notification/notification-submission-status/notification-submission-status.service'; import { NotificationService } from '../../alcs/notification/notification.service'; @@ -379,4 +380,46 @@ export class NotificationSubmissionService { }, }); } + + async generateSrwEmailData( + submission: NotificationSubmission, + pdfDocument: NotificationDocument, + ) { + const notification = await this.notificationService.getByFileNumber( + submission.fileNumber, + ); + + const emailTemplate = generateSRWTemplate({ + fileNumber: submission.fileNumber, + contactName: `${submission.contactFirstName} ${submission.contactLastName}`, + status: 'ALC Response Sent', + dateSubmitted: dayjs(notification.dateSubmittedToAlc).format( + 'MMMM DD, YYYY', + ), + fileName: pdfDocument.document.fileName, + submittersFileNumber: submission.submittersFileNumber!, + }); + + let ccEmails: string[] = []; + if (submission.localGovernmentUuid) { + const localGovernment = await this.localGovernmentService.getByUuid( + submission.localGovernmentUuid, + ); + + if (localGovernment && localGovernment.emails) { + ccEmails = localGovernment.emails; + } + } + + const parentId = await this.notificationService.getUuid( + submission.fileNumber, + ); + + return { + html: emailTemplate.html, + cc: ccEmails, + to: submission.contactEmail!, + parentId, + }; + } } diff --git a/services/apps/alcs/src/portal/pdf-generation/generate-srw-document.service.ts b/services/apps/alcs/src/portal/pdf-generation/generate-srw-document.service.ts index a35952b32a..3e1216b3c0 100644 --- a/services/apps/alcs/src/portal/pdf-generation/generate-srw-document.service.ts +++ b/services/apps/alcs/src/portal/pdf-generation/generate-srw-document.service.ts @@ -55,7 +55,7 @@ export class GenerateSrwDocumentService { const reviewRes = await this.generate(fileNumber, user); if (reviewRes.status === HttpStatus.OK) { - await this.notificationDocumentService.attachDocumentAsBuffer({ + return await this.notificationDocumentService.attachDocumentAsBuffer({ fileNumber: fileNumber, fileName: `SRW${fileNumber}m1.pdf`, user: user, diff --git a/services/apps/alcs/src/providers/email/email.module.ts b/services/apps/alcs/src/providers/email/email.module.ts index 00ed8d94be..a62d8c5b60 100644 --- a/services/apps/alcs/src/providers/email/email.module.ts +++ b/services/apps/alcs/src/providers/email/email.module.ts @@ -1,23 +1,26 @@ import { HttpModule } from '@nestjs/axios'; import { Module, forwardRef } from '@nestjs/common'; import { TypeOrmModule } from '@nestjs/typeorm'; +import { DocumentModule } from '../../document/document.module'; import { EmailStatus } from './email-status.entity'; import { EmailService } from './email.service'; import { ApplicationSubmissionModule } from '../../portal/application-submission/application-submission.module'; import { ApplicationModule } from '../../alcs/application/application.module'; import { NoticeOfIntentModule } from '../../alcs/notice-of-intent/notice-of-intent.module'; import { NoticeOfIntentSubmissionModule } from '../../portal/notice-of-intent-submission/notice-of-intent-submission.module'; +import { StatusEmailService } from './status-email.service'; @Module({ imports: [ HttpModule, TypeOrmModule.forFeature([EmailStatus]), + DocumentModule, forwardRef(() => ApplicationModule), forwardRef(() => ApplicationSubmissionModule), forwardRef(() => NoticeOfIntentModule), forwardRef(() => NoticeOfIntentSubmissionModule), ], - providers: [EmailService], - exports: [EmailService], + providers: [EmailService, StatusEmailService], + exports: [EmailService, StatusEmailService], }) export class EmailModule {} diff --git a/services/apps/alcs/src/providers/email/email.service.spec.ts b/services/apps/alcs/src/providers/email/email.service.spec.ts index fca6ee04c6..48378eba6b 100644 --- a/services/apps/alcs/src/providers/email/email.service.spec.ts +++ b/services/apps/alcs/src/providers/email/email.service.spec.ts @@ -3,48 +3,23 @@ import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { HttpService } from '@nestjs/axios'; import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; -import { MJMLParseResults } from 'mjml-core'; import * as config from 'config'; import { of } from 'rxjs'; import { Repository } from 'typeorm'; +import { DocumentService } from '../../document/document.service'; import { EmailStatus } from './email-status.entity'; import { EmailService } from './email.service'; -import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; -import { ApplicationSubmissionService } from '../../portal/application-submission/application-submission.service'; -import { ApplicationService } from '../../alcs/application/application.service'; -import { ApplicationSubmission } from '../../portal/application-submission/application-submission.entity'; -import { LocalGovernment } from '../../alcs/local-government/local-government.entity'; -import { ApplicationOwner } from '../../portal/application-submission/application-owner/application-owner.entity'; -import { SUBMISSION_STATUS } from '../../alcs/application/application-submission-status/submission-status.dto'; -import { ApplicationSubmissionStatusType } from '../../alcs/application/application-submission-status/submission-status-type.entity'; -import { NoticeOfIntentService } from '../../alcs/notice-of-intent/notice-of-intent.service'; -import { NoticeOfIntentSubmissionService } from '../../portal/notice-of-intent-submission/notice-of-intent-submission.service'; -import { NoticeOfIntentSubmission } from '../../portal/notice-of-intent-submission/notice-of-intent-submission.entity'; -import { NOI_SUBMISSION_STATUS } from '../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status.dto'; -import { NoticeOfIntentOwner } from '../../portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.entity'; -import { NoticeOfIntentSubmissionStatusType } from '../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status-type.entity'; -import { PARENT_TYPE } from '../../alcs/card/card-subtask/card-subtask.dto'; describe('EmailService', () => { let service: EmailService; let mockHttpService; let mockRepo: DeepMocked>; - let mockLocalGovernmentService: DeepMocked; - let mockApplicationSubmissionService: DeepMocked; - let mockApplicationService: DeepMocked; - let mockNoticeOfIntentSubmissionService: DeepMocked; - let mockNoticeOfIntentService: DeepMocked; + let mockDocumentService: DeepMocked; beforeEach(async () => { mockHttpService = createMock(); mockRepo = createMock(); - mockLocalGovernmentService = createMock(); - mockApplicationSubmissionService = - createMock(); - mockApplicationService = createMock(); - mockNoticeOfIntentSubmissionService = - createMock(); - mockNoticeOfIntentService = createMock(); + mockDocumentService = createMock(); const module: TestingModule = await Test.createTestingModule({ imports: [ConfigModule], @@ -55,24 +30,8 @@ describe('EmailService', () => { useValue: mockHttpService, }, { - provide: LocalGovernmentService, - useValue: mockLocalGovernmentService, - }, - { - provide: ApplicationSubmissionService, - useValue: mockApplicationSubmissionService, - }, - { - provide: ApplicationService, - useValue: mockApplicationService, - }, - { - provide: NoticeOfIntentSubmissionService, - useValue: mockNoticeOfIntentSubmissionService, - }, - { - provide: NoticeOfIntentService, - useValue: mockNoticeOfIntentService, + provide: DocumentService, + useValue: mockDocumentService, }, { provide: getRepositoryToken(EmailStatus), @@ -156,124 +115,4 @@ describe('EmailService', () => { expect(mockRepo.save).toHaveBeenCalledTimes(2); expect(mockHttpService.post).toHaveBeenCalledTimes(3); }); - - it('should return submission government if found', async () => { - const localGovernmentUuid = 'fake-uuid'; - const mockGovernment = new LocalGovernment({ uuid: localGovernmentUuid }); - const mockApplicationSubmission = new ApplicationSubmission({ - localGovernmentUuid, - }); - - mockLocalGovernmentService.getByUuid.mockResolvedValue(mockGovernment); - - const res = await service.getSubmissionGovernmentOrFail( - mockApplicationSubmission, - ); - - expect(mockLocalGovernmentService.getByUuid).toHaveBeenCalledTimes(1); - expect(mockLocalGovernmentService.getByUuid).toHaveBeenCalledWith( - mockApplicationSubmission.localGovernmentUuid, - ); - expect(res).toStrictEqual(mockGovernment); - }); - - it('should throw an exception if no submission government is found', async () => { - mockLocalGovernmentService.getByUuid.mockResolvedValue(null); - - const mockApplicationSubmission = new ApplicationSubmission({ - localGovernmentUuid: 'fake-uuid', - }); - const promise = service.getSubmissionGovernmentOrFail( - mockApplicationSubmission, - ); - expect(mockLocalGovernmentService.getByUuid).toHaveBeenCalledTimes(1); - expect(mockLocalGovernmentService.getByUuid).toHaveBeenCalledWith( - mockApplicationSubmission.localGovernmentUuid, - ); - await expect(promise).rejects.toMatchObject( - new Error('Submission local government not found'), - ); - }); - - it('should call through services and return application data', async () => { - const mockSubmission = new ApplicationSubmission(); - mockApplicationSubmissionService.getOrFailByFileNumber.mockResolvedValue( - mockSubmission, - ); - - const res = await service.getApplicationEmailData('file-number'); - - expect( - mockApplicationSubmissionService.getOrFailByFileNumber, - ).toBeCalledTimes(1); - expect( - mockApplicationSubmissionService.getOrFailByFileNumber, - ).toBeCalledWith('file-number'); - expect(res).toStrictEqual({ - applicationSubmission: mockSubmission, - primaryContact: undefined, - submissionGovernment: null, - }); - }); - - it('should call through services and return notice of intent data', async () => { - const res = await service.getNoticeOfIntentEmailData( - new NoticeOfIntentSubmission(), - ); - - expect(res).toStrictEqual({ - primaryContact: undefined, - submissionGovernment: null, - }); - }); - - it('should call through services to set application email template', async () => { - const mockData = { - generateStatusHtml: () => ({} as MJMLParseResults), - status: SUBMISSION_STATUS.IN_REVIEW_BY_LG, - applicationSubmission: new ApplicationSubmission({ typeCode: 'TURP' }), - parentType: 'application' as PARENT_TYPE, - government: new LocalGovernment({ emails: [] }), - primaryContact: new ApplicationOwner(), - }; - - mockApplicationSubmissionService.getStatus.mockResolvedValue( - new ApplicationSubmissionStatusType(), - ); - mockApplicationService.fetchApplicationTypes.mockResolvedValue([]); - mockApplicationService.getUuid.mockResolvedValue('fake-uuid'); - - await service.sendApplicationStatusEmail(mockData); - - expect(mockApplicationSubmissionService.getStatus).toBeCalledTimes(1); - expect(mockApplicationSubmissionService.getStatus).toBeCalledWith( - mockData.status, - ); - expect(mockApplicationService.fetchApplicationTypes).toBeCalledTimes(1); - }); - - it('should call through services to set notice of intent email template', async () => { - const mockData = { - generateStatusHtml: () => ({} as MJMLParseResults), - status: NOI_SUBMISSION_STATUS.SUBMITTED_TO_ALC, - noticeOfIntentSubmission: new NoticeOfIntentSubmission(), - parentType: 'notice-of-intent' as PARENT_TYPE, - government: new LocalGovernment({ emails: [] }), - primaryContact: new NoticeOfIntentOwner(), - }; - - mockNoticeOfIntentSubmissionService.getStatus.mockResolvedValue( - new NoticeOfIntentSubmissionStatusType(), - ); - mockNoticeOfIntentService.listTypes.mockResolvedValue([]); - mockNoticeOfIntentService.getUuid.mockResolvedValue('fake-uuid'); - - await service.sendNoticeOfIntentStatusEmail(mockData); - - expect(mockNoticeOfIntentSubmissionService.getStatus).toBeCalledTimes(1); - expect(mockNoticeOfIntentSubmissionService.getStatus).toBeCalledWith( - mockData.status, - ); - expect(mockNoticeOfIntentService.listTypes).toBeCalledTimes(1); - }); }); diff --git a/services/apps/alcs/src/providers/email/email.service.ts b/services/apps/alcs/src/providers/email/email.service.ts index 2f29c93c04..0b9af52c56 100644 --- a/services/apps/alcs/src/providers/email/email.service.ts +++ b/services/apps/alcs/src/providers/email/email.service.ts @@ -1,74 +1,18 @@ import { CONFIG_TOKEN, IConfig } from '@app/common/config/config.module'; import { HttpService } from '@nestjs/axios'; -import { Inject, Injectable, Logger, NotFoundException } from '@nestjs/common'; +import { Inject, Injectable, Logger } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; -import { MJMLParseResults } from 'mjml-core'; import { firstValueFrom } from 'rxjs'; import { Repository } from 'typeorm'; -import { SUBMISSION_STATUS } from '../../alcs/application/application-submission-status/submission-status.dto'; -import { ApplicationService } from '../../alcs/application/application.service'; -import { PARENT_TYPE } from '../../alcs/card/card-subtask/card-subtask.dto'; -import { LocalGovernment } from '../../alcs/local-government/local-government.entity'; -import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; -import { NOI_SUBMISSION_STATUS } from '../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status.dto'; -import { NoticeOfIntentService } from '../../alcs/notice-of-intent/notice-of-intent.service'; -import { ApplicationOwner } from '../../portal/application-submission/application-owner/application-owner.entity'; -import { ApplicationSubmission } from '../../portal/application-submission/application-submission.entity'; -import { ApplicationSubmissionService } from '../../portal/application-submission/application-submission.service'; -import { NoticeOfIntentOwner } from '../../portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.entity'; -import { NoticeOfIntentSubmission } from '../../portal/notice-of-intent-submission/notice-of-intent-submission.entity'; -import { NoticeOfIntentSubmissionService } from '../../portal/notice-of-intent-submission/notice-of-intent-submission.service'; -import { FALLBACK_APPLICANT_NAME } from '../../utils/owner.constants'; +import { Document } from '../../document/document.entity'; +import { DocumentService } from '../../document/document.service'; import { EmailStatus } from './email-status.entity'; -export interface StatusUpdateEmail { - fileNumber: string; - applicantName: string; - status: string; - childType: string; - governmentName: string; - parentType: PARENT_TYPE; -} - -type BaseStatusEmailData = { - generateStatusHtml: MJMLParseResults; - government: LocalGovernment | null; - parentType: PARENT_TYPE; - ccGovernment?: boolean; -}; -type ApplicationEmailData = BaseStatusEmailData & { - applicationSubmission: ApplicationSubmission; - status: SUBMISSION_STATUS; - primaryContact?: ApplicationOwner; -}; - -type NoticeOfIntentEmailData = BaseStatusEmailData & { - noticeOfIntentSubmission: NoticeOfIntentSubmission; - status: NOI_SUBMISSION_STATUS; - primaryContact?: NoticeOfIntentOwner; -}; - -export const appFees = [ - { type: 'Exclusion', fee: 750 }, - { type: 'Subdivision', fee: 750 }, - { type: 'Non-Farm Use', fee: 750 }, - { type: 'Non-Adhering Residential Use', fee: 450 }, - { type: 'Soil or Fill Use', fee: 750 }, - { type: 'Inclusion', fee: 0 }, -]; - -export const noiFees = [ - { type: 'Removal of Soil', fee: 150 }, - { type: 'Placement of Fill', fee: 150 }, - { type: 'Placement of Fill/Removal of Soil', fee: 150 }, -]; - -const parentTypeLabel: Record< - PARENT_TYPE.APPLICATION | PARENT_TYPE.NOTICE_OF_INTENT, - string -> = { - application: 'Application', - 'notice-of-intent': 'NOI', +type ChesDocument = { + contentType: string; + content: string | ArrayBuffer; + filename: string; + encoding: 'base64' | 'binary' | 'hex' | 'utf-8'; }; @Injectable() @@ -80,11 +24,7 @@ export class EmailService { private httpService: HttpService, @InjectRepository(EmailStatus) private repository: Repository, - private localGovernmentService: LocalGovernmentService, - private applicationSubmissionService: ApplicationSubmissionService, - private applicationService: ApplicationService, - private noticeOfIntentService: NoticeOfIntentService, - private noticeOfIntentSubmissionService: NoticeOfIntentSubmissionService, + private documentService: DocumentService, ) {} private token = ''; @@ -124,6 +64,24 @@ export class EmailService { } } + async getEmailStatus(transactionId: string) { + const token = await this.getToken(); + const serviceUrl = this.config.get('CHES.URL'); + + const res = await firstValueFrom( + this.httpService.get( + `${serviceUrl}/api/v1/status?txId=${transactionId}`, + { + headers: { + Authorization: `Bearer ${token}`, + }, + }, + ), + ); + + return res.data; + } + async sendEmail({ to, body, @@ -133,6 +91,7 @@ export class EmailService { parentType, parentId, triggerStatus, + attachments = [], }: { to: string[]; body: string; @@ -142,11 +101,33 @@ export class EmailService { parentType?: string; parentId?: string; triggerStatus?: string; + attachments?: Document[]; }) { const serviceUrl = this.config.get('CHES.URL'); const from = this.config.get('CHES.FROM'); const token = await this.getToken(); + const preparedAttachments: ChesDocument[] = []; + for (const attachment of attachments) { + const fileUrl = await this.documentService.getDownloadUrl(attachment); + const fileData = await firstValueFrom( + this.httpService.get(fileUrl, { + responseType: 'arraybuffer', + }), + ); + + const encodedData = Buffer.from(fileData.data, 'binary').toString( + 'base64', + ); + + preparedAttachments.push({ + contentType: attachment.mimeType, + content: encodedData, + filename: attachment.fileName, + encoding: 'base64', + }); + } + try { if (this.config.get('CHES.MODE') !== 'production') { this.logger.log( @@ -173,6 +154,7 @@ export class EmailService { to, cc, bcc, + attachments: preparedAttachments, }, { headers: { @@ -212,174 +194,4 @@ export class EmailService { ); } } - - async getSubmissionGovernmentOrFail( - submission: ApplicationSubmission | NoticeOfIntentSubmission, - ) { - const submissionGovernment = await this.getSubmissionGovernment(submission); - if (!submissionGovernment) { - throw new NotFoundException('Submission local government not found'); - } - return submissionGovernment; - } - - private async getSubmissionGovernment( - submission: ApplicationSubmission | NoticeOfIntentSubmission, - ) { - if (submission.localGovernmentUuid) { - const localGovernment = await this.localGovernmentService.getByUuid( - submission.localGovernmentUuid, - ); - if (localGovernment) { - return localGovernment; - } - } - return undefined; - } - - async getApplicationEmailData( - fileNumber: string, - submission?: ApplicationSubmission, - ) { - const applicationSubmission = - submission || - (await this.applicationSubmissionService.getOrFailByFileNumber( - fileNumber, - )); - - const primaryContact = applicationSubmission.owners?.find( - (owner) => owner.uuid === applicationSubmission.primaryContactOwnerUuid, - ); - - const submissionGovernment = applicationSubmission.localGovernmentUuid - ? await this.getSubmissionGovernmentOrFail(applicationSubmission) - : null; - - return { applicationSubmission, primaryContact, submissionGovernment }; - } - - async getNoticeOfIntentEmailData(submission: NoticeOfIntentSubmission) { - const primaryContact = submission.owners?.find( - (owner) => owner.uuid === submission.primaryContactOwnerUuid, - ); - - const submissionGovernment = submission.localGovernmentUuid - ? await this.getSubmissionGovernmentOrFail(submission) - : null; - - return { primaryContact, submissionGovernment }; - } - - private async setApplicationEmailTemplate(data: ApplicationEmailData) { - const status = await this.applicationSubmissionService.getStatus( - data.status, - ); - - const types = await this.applicationService.fetchApplicationTypes(); - - const matchingType = types.find( - (type) => type.code === data.applicationSubmission.typeCode, - ); - - const fileNumber = data.applicationSubmission.fileNumber; - const applicantName = - data.applicationSubmission.applicant || FALLBACK_APPLICANT_NAME; - - const emailTemplate = data.generateStatusHtml({ - fileNumber, - applicantName, - childType: - matchingType?.portalLabel ?? - matchingType?.label ?? - FALLBACK_APPLICANT_NAME, - governmentName: data.government?.name, - status: status.label, - parentTypeLabel: parentTypeLabel[data.parentType], - }); - - const parentId = await this.applicationService.getUuid(fileNumber); - - return { - body: emailTemplate.html, - subject: `Agricultural Land Commission Application ID: ${fileNumber} (${applicantName})`, - parentType: data.parentType, - parentId, - triggerStatus: status.code, - }; - } - - private async setNoticeOfIntentEmailTemplate(data: NoticeOfIntentEmailData) { - const status = await this.noticeOfIntentSubmissionService.getStatus( - data.status, - ); - - const types = await this.noticeOfIntentService.listTypes(); - - const matchingType = types.find( - (type) => type.code === data.noticeOfIntentSubmission.typeCode, - ); - - const fileNumber = data.noticeOfIntentSubmission.fileNumber; - - const applicantName = - data.noticeOfIntentSubmission.applicant || FALLBACK_APPLICANT_NAME; - - const emailTemplate = data.generateStatusHtml({ - fileNumber, - applicantName, - childType: - matchingType?.portalLabel ?? - matchingType?.label ?? - FALLBACK_APPLICANT_NAME, - governmentName: data.government?.name, - status: status.label, - parentTypeLabel: parentTypeLabel[data.parentType], - }); - - const parentId = await this.noticeOfIntentService.getUuid(fileNumber); - - return { - body: emailTemplate.html, - subject: `Agricultural Land Commission NOI ID: ${fileNumber} (${applicantName})`, - parentType: data.parentType, - parentId, - triggerStatus: status.code, - }; - } - - async sendApplicationStatusEmail(data: ApplicationEmailData) { - const email = await this.setApplicationEmailTemplate(data); - - this.sendStatusEmail(data, email); - } - - async sendNoticeOfIntentStatusEmail(data: NoticeOfIntentEmailData) { - const email = await this.setNoticeOfIntentEmailTemplate(data); - - await this.sendStatusEmail(data, email); - } - - private async sendStatusEmail( - data: ApplicationEmailData | NoticeOfIntentEmailData, - email, - ) { - if (data.primaryContact && data.primaryContact.email) { - await this.sendEmail({ - ...email, - to: [data.primaryContact.email], - cc: data.ccGovernment ? data.government?.emails : [], - }); - } else if (data.government && data.government.emails.length > 0) { - await this.sendEmail({ - ...email, - to: data.government.emails, - }); - } else { - this.logger.warn( - `Cannot send status email, ${ - data.primaryContact?.email ? 'primary contact' : 'local government' - } has no email`, - ); - } - } } diff --git a/services/apps/alcs/src/providers/email/status-email.service.spec.ts b/services/apps/alcs/src/providers/email/status-email.service.spec.ts new file mode 100644 index 0000000000..f9083f3b36 --- /dev/null +++ b/services/apps/alcs/src/providers/email/status-email.service.spec.ts @@ -0,0 +1,200 @@ +import { ConfigModule } from '@app/common/config/config.module'; +import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; +import { HttpService } from '@nestjs/axios'; +import { Test, TestingModule } from '@nestjs/testing'; +import { MJMLParseResults } from 'mjml-core'; +import { ApplicationSubmissionStatusType } from '../../alcs/application/application-submission-status/submission-status-type.entity'; +import { SUBMISSION_STATUS } from '../../alcs/application/application-submission-status/submission-status.dto'; +import { ApplicationService } from '../../alcs/application/application.service'; +import { PARENT_TYPE } from '../../alcs/card/card-subtask/card-subtask.dto'; +import { LocalGovernment } from '../../alcs/local-government/local-government.entity'; +import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; +import { NoticeOfIntentSubmissionStatusType } from '../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status-type.entity'; +import { NOI_SUBMISSION_STATUS } from '../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status.dto'; +import { NoticeOfIntentService } from '../../alcs/notice-of-intent/notice-of-intent.service'; +import { ApplicationOwner } from '../../portal/application-submission/application-owner/application-owner.entity'; +import { ApplicationSubmission } from '../../portal/application-submission/application-submission.entity'; +import { ApplicationSubmissionService } from '../../portal/application-submission/application-submission.service'; +import { NoticeOfIntentOwner } from '../../portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.entity'; +import { NoticeOfIntentSubmission } from '../../portal/notice-of-intent-submission/notice-of-intent-submission.entity'; +import { NoticeOfIntentSubmissionService } from '../../portal/notice-of-intent-submission/notice-of-intent-submission.service'; +import { EmailService } from './email.service'; +import { StatusEmailService } from './status-email.service'; + +describe('StatusEmailService', () => { + let service: StatusEmailService; + let mockLocalGovernmentService: DeepMocked; + let mockApplicationSubmissionService: DeepMocked; + let mockApplicationService: DeepMocked; + let mockNoticeOfIntentSubmissionService: DeepMocked; + let mockNoticeOfIntentService: DeepMocked; + let mockEmailService: DeepMocked; + + beforeEach(async () => { + mockEmailService = createMock(); + mockLocalGovernmentService = createMock(); + mockApplicationSubmissionService = createMock(); + mockApplicationService = createMock(); + mockNoticeOfIntentSubmissionService = createMock(); + mockNoticeOfIntentService = createMock(); + + const module: TestingModule = await Test.createTestingModule({ + imports: [ConfigModule], + providers: [ + StatusEmailService, + { + provide: EmailService, + useValue: mockEmailService, + }, + { + provide: LocalGovernmentService, + useValue: mockLocalGovernmentService, + }, + { + provide: ApplicationSubmissionService, + useValue: mockApplicationSubmissionService, + }, + { + provide: ApplicationService, + useValue: mockApplicationService, + }, + { + provide: NoticeOfIntentSubmissionService, + useValue: mockNoticeOfIntentSubmissionService, + }, + { + provide: NoticeOfIntentService, + useValue: mockNoticeOfIntentService, + }, + ], + }).compile(); + + service = module.get(StatusEmailService); + + mockEmailService.sendEmail.mockResolvedValue(); + }); + + it('should be defined', () => { + expect(service).toBeDefined(); + }); + + it('should return submission government if found', async () => { + const localGovernmentUuid = 'fake-uuid'; + const mockGovernment = new LocalGovernment({ uuid: localGovernmentUuid }); + const mockApplicationSubmission = new ApplicationSubmission({ + localGovernmentUuid, + }); + + mockLocalGovernmentService.getByUuid.mockResolvedValue(mockGovernment); + + const res = await service.getSubmissionGovernmentOrFail( + mockApplicationSubmission, + ); + + expect(mockLocalGovernmentService.getByUuid).toHaveBeenCalledTimes(1); + expect(mockLocalGovernmentService.getByUuid).toHaveBeenCalledWith( + mockApplicationSubmission.localGovernmentUuid, + ); + expect(res).toStrictEqual(mockGovernment); + }); + + it('should throw an exception if no submission government is found', async () => { + mockLocalGovernmentService.getByUuid.mockResolvedValue(null); + + const mockApplicationSubmission = new ApplicationSubmission({ + localGovernmentUuid: 'fake-uuid', + }); + const promise = service.getSubmissionGovernmentOrFail( + mockApplicationSubmission, + ); + expect(mockLocalGovernmentService.getByUuid).toHaveBeenCalledTimes(1); + expect(mockLocalGovernmentService.getByUuid).toHaveBeenCalledWith( + mockApplicationSubmission.localGovernmentUuid, + ); + await expect(promise).rejects.toMatchObject( + new Error('Submission local government not found'), + ); + }); + + it('should call through services and return application data', async () => { + const mockSubmission = new ApplicationSubmission(); + mockApplicationSubmissionService.getOrFailByFileNumber.mockResolvedValue( + mockSubmission, + ); + + const res = await service.getApplicationEmailData('file-number'); + + expect( + mockApplicationSubmissionService.getOrFailByFileNumber, + ).toBeCalledTimes(1); + expect( + mockApplicationSubmissionService.getOrFailByFileNumber, + ).toBeCalledWith('file-number'); + expect(res).toStrictEqual({ + applicationSubmission: mockSubmission, + primaryContact: undefined, + submissionGovernment: null, + }); + }); + + it('should call through services and return notice of intent data', async () => { + const res = await service.getNoticeOfIntentEmailData( + new NoticeOfIntentSubmission(), + ); + + expect(res).toStrictEqual({ + primaryContact: undefined, + submissionGovernment: null, + }); + }); + + it('should call through services to set application email template', async () => { + const mockData = { + generateStatusHtml: () => ({} as MJMLParseResults), + status: SUBMISSION_STATUS.IN_REVIEW_BY_LG, + applicationSubmission: new ApplicationSubmission({ typeCode: 'TURP' }), + parentType: 'application' as PARENT_TYPE, + government: new LocalGovernment({ emails: [] }), + primaryContact: new ApplicationOwner(), + }; + + mockApplicationSubmissionService.getStatus.mockResolvedValue( + new ApplicationSubmissionStatusType(), + ); + mockApplicationService.fetchApplicationTypes.mockResolvedValue([]); + mockApplicationService.getUuid.mockResolvedValue('fake-uuid'); + + await service.sendApplicationStatusEmail(mockData); + + expect(mockApplicationSubmissionService.getStatus).toBeCalledTimes(1); + expect(mockApplicationSubmissionService.getStatus).toBeCalledWith( + mockData.status, + ); + expect(mockApplicationService.fetchApplicationTypes).toBeCalledTimes(1); + }); + + it('should call through services to set notice of intent email template', async () => { + const mockData = { + generateStatusHtml: () => ({} as MJMLParseResults), + status: NOI_SUBMISSION_STATUS.SUBMITTED_TO_ALC, + noticeOfIntentSubmission: new NoticeOfIntentSubmission(), + parentType: 'notice-of-intent' as PARENT_TYPE, + government: new LocalGovernment({ emails: [] }), + primaryContact: new NoticeOfIntentOwner(), + }; + + mockNoticeOfIntentSubmissionService.getStatus.mockResolvedValue( + new NoticeOfIntentSubmissionStatusType(), + ); + mockNoticeOfIntentService.listTypes.mockResolvedValue([]); + mockNoticeOfIntentService.getUuid.mockResolvedValue('fake-uuid'); + + await service.sendNoticeOfIntentStatusEmail(mockData); + + expect(mockNoticeOfIntentSubmissionService.getStatus).toBeCalledTimes(1); + expect(mockNoticeOfIntentSubmissionService.getStatus).toBeCalledWith( + mockData.status, + ); + expect(mockNoticeOfIntentService.listTypes).toBeCalledTimes(1); + }); +}); diff --git a/services/apps/alcs/src/providers/email/status-email.service.ts b/services/apps/alcs/src/providers/email/status-email.service.ts new file mode 100644 index 0000000000..e45aaa2535 --- /dev/null +++ b/services/apps/alcs/src/providers/email/status-email.service.ts @@ -0,0 +1,239 @@ +import { CONFIG_TOKEN, IConfig } from '@app/common/config/config.module'; +import { Inject, Injectable, Logger, NotFoundException } from '@nestjs/common'; +import { MJMLParseResults } from 'mjml-core'; +import { SUBMISSION_STATUS } from '../../alcs/application/application-submission-status/submission-status.dto'; +import { ApplicationService } from '../../alcs/application/application.service'; +import { PARENT_TYPE } from '../../alcs/card/card-subtask/card-subtask.dto'; +import { LocalGovernment } from '../../alcs/local-government/local-government.entity'; +import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; +import { NOI_SUBMISSION_STATUS } from '../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status.dto'; +import { NoticeOfIntentService } from '../../alcs/notice-of-intent/notice-of-intent.service'; +import { ApplicationOwner } from '../../portal/application-submission/application-owner/application-owner.entity'; +import { ApplicationSubmission } from '../../portal/application-submission/application-submission.entity'; +import { ApplicationSubmissionService } from '../../portal/application-submission/application-submission.service'; +import { NoticeOfIntentOwner } from '../../portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.entity'; +import { NoticeOfIntentSubmission } from '../../portal/notice-of-intent-submission/notice-of-intent-submission.entity'; +import { NoticeOfIntentSubmissionService } from '../../portal/notice-of-intent-submission/notice-of-intent-submission.service'; +import { FALLBACK_APPLICANT_NAME } from '../../utils/owner.constants'; +import { EmailService } from './email.service'; + +export interface StatusUpdateEmail { + fileNumber: string; + applicantName: string; + status: string; + childType: string; + governmentName: string; + parentType: PARENT_TYPE; +} + +type BaseStatusEmailData = { + generateStatusHtml: MJMLParseResults; + government: LocalGovernment | null; + parentType: PARENT_TYPE; + ccGovernment?: boolean; +}; + +type ApplicationEmailData = BaseStatusEmailData & { + applicationSubmission: ApplicationSubmission; + status: SUBMISSION_STATUS; + primaryContact?: ApplicationOwner; +}; + +type NoticeOfIntentEmailData = BaseStatusEmailData & { + noticeOfIntentSubmission: NoticeOfIntentSubmission; + status: NOI_SUBMISSION_STATUS; + primaryContact?: NoticeOfIntentOwner; +}; + +const parentTypeLabel: Record< + PARENT_TYPE.APPLICATION | PARENT_TYPE.NOTICE_OF_INTENT, + string +> = { + application: 'Application', + 'notice-of-intent': 'NOI', +}; + +@Injectable() +export class StatusEmailService { + private logger: Logger = new Logger(StatusEmailService.name); + + constructor( + @Inject(CONFIG_TOKEN) private config: IConfig, + private localGovernmentService: LocalGovernmentService, + private applicationSubmissionService: ApplicationSubmissionService, + private applicationService: ApplicationService, + private noticeOfIntentService: NoticeOfIntentService, + private noticeOfIntentSubmissionService: NoticeOfIntentSubmissionService, + private emailService: EmailService, + ) {} + + async getSubmissionGovernmentOrFail( + submission: ApplicationSubmission | NoticeOfIntentSubmission, + ) { + const submissionGovernment = await this.getSubmissionGovernment(submission); + if (!submissionGovernment) { + throw new NotFoundException('Submission local government not found'); + } + return submissionGovernment; + } + + private async getSubmissionGovernment( + submission: ApplicationSubmission | NoticeOfIntentSubmission, + ) { + if (submission.localGovernmentUuid) { + const localGovernment = await this.localGovernmentService.getByUuid( + submission.localGovernmentUuid, + ); + if (localGovernment) { + return localGovernment; + } + } + return undefined; + } + + async getApplicationEmailData( + fileNumber: string, + submission?: ApplicationSubmission, + ) { + const applicationSubmission = + submission || + (await this.applicationSubmissionService.getOrFailByFileNumber( + fileNumber, + )); + + const primaryContact = applicationSubmission.owners?.find( + (owner) => owner.uuid === applicationSubmission.primaryContactOwnerUuid, + ); + + const submissionGovernment = applicationSubmission.localGovernmentUuid + ? await this.getSubmissionGovernmentOrFail(applicationSubmission) + : null; + + return { applicationSubmission, primaryContact, submissionGovernment }; + } + + async getNoticeOfIntentEmailData(submission: NoticeOfIntentSubmission) { + const primaryContact = submission.owners?.find( + (owner) => owner.uuid === submission.primaryContactOwnerUuid, + ); + + const submissionGovernment = submission.localGovernmentUuid + ? await this.getSubmissionGovernmentOrFail(submission) + : null; + + return { primaryContact, submissionGovernment }; + } + + private async getApplicationEmailTemplate(data: ApplicationEmailData) { + const status = await this.applicationSubmissionService.getStatus( + data.status, + ); + + const types = await this.applicationService.fetchApplicationTypes(); + + const matchingType = types.find( + (type) => type.code === data.applicationSubmission.typeCode, + ); + + const fileNumber = data.applicationSubmission.fileNumber; + const applicantName = + data.applicationSubmission.applicant || FALLBACK_APPLICANT_NAME; + + const emailTemplate = data.generateStatusHtml({ + fileNumber, + applicantName, + childType: + matchingType?.portalLabel ?? + matchingType?.label ?? + FALLBACK_APPLICANT_NAME, + governmentName: data.government?.name, + status: status.label, + parentTypeLabel: parentTypeLabel[data.parentType], + }); + + const parentId = await this.applicationService.getUuid(fileNumber); + + return { + body: emailTemplate.html, + subject: `Agricultural Land Commission Application ID: ${fileNumber} (${applicantName})`, + parentType: data.parentType, + parentId, + triggerStatus: status.code, + }; + } + + private async getNoticeOfIntentEmailTemplate(data: NoticeOfIntentEmailData) { + const status = await this.noticeOfIntentSubmissionService.getStatus( + data.status, + ); + + const types = await this.noticeOfIntentService.listTypes(); + + const matchingType = types.find( + (type) => type.code === data.noticeOfIntentSubmission.typeCode, + ); + + const fileNumber = data.noticeOfIntentSubmission.fileNumber; + + const applicantName = + data.noticeOfIntentSubmission.applicant || FALLBACK_APPLICANT_NAME; + + const emailTemplate = data.generateStatusHtml({ + fileNumber, + applicantName, + childType: + matchingType?.portalLabel ?? + matchingType?.label ?? + FALLBACK_APPLICANT_NAME, + governmentName: data.government?.name, + status: status.label, + parentTypeLabel: parentTypeLabel[data.parentType], + }); + + const parentId = await this.noticeOfIntentService.getUuid(fileNumber); + + return { + body: emailTemplate.html, + subject: `Agricultural Land Commission NOI ID: ${fileNumber} (${applicantName})`, + parentType: data.parentType, + parentId, + triggerStatus: status.code, + }; + } + + async sendApplicationStatusEmail(data: ApplicationEmailData) { + const email = await this.getApplicationEmailTemplate(data); + + this.sendStatusEmail(data, email); + } + + async sendNoticeOfIntentStatusEmail(data: NoticeOfIntentEmailData) { + const email = await this.getNoticeOfIntentEmailTemplate(data); + + await this.sendStatusEmail(data, email); + } + + private async sendStatusEmail( + data: ApplicationEmailData | NoticeOfIntentEmailData, + email, + ) { + if (data.primaryContact && data.primaryContact.email) { + await this.emailService.sendEmail({ + ...email, + to: [data.primaryContact.email], + cc: data.ccGovernment ? data.government?.emails : [], + }); + } else if (data.government && data.government.emails.length > 0) { + await this.emailService.sendEmail({ + ...email, + to: data.government.emails, + }); + } else { + this.logger.warn( + `Cannot send status email, ${ + data.primaryContact?.email ? 'primary contact' : 'local government' + } has no email`, + ); + } + } +} diff --git a/services/apps/alcs/src/queues/scheduler/application/status-emails/status-emails.consumer.spec.ts b/services/apps/alcs/src/queues/scheduler/application/status-emails/status-emails.consumer.spec.ts index 4b8a7e27bb..962fe80a5a 100644 --- a/services/apps/alcs/src/queues/scheduler/application/status-emails/status-emails.consumer.spec.ts +++ b/services/apps/alcs/src/queues/scheduler/application/status-emails/status-emails.consumer.spec.ts @@ -9,25 +9,24 @@ import { PARENT_TYPE } from '../../../../alcs/card/card-subtask/card-subtask.dto import { LocalGovernment } from '../../../../alcs/local-government/local-government.entity'; import { ApplicationOwner } from '../../../../portal/application-submission/application-owner/application-owner.entity'; import { ApplicationSubmission } from '../../../../portal/application-submission/application-submission.entity'; -import { EmailService } from '../../../../providers/email/email.service'; +import { StatusEmailService } from '../../../../providers/email/status-email.service'; import { ApplicationSubmissionStatusEmailConsumer } from './status-emails.consumer'; describe('ApplicationSubmissionStatusEmailConsumer', () => { let consumer: ApplicationSubmissionStatusEmailConsumer; - let mockEmailService: DeepMocked; + let mockStatusEmailService: DeepMocked; let mockApplicationSubmissionStatusService: DeepMocked; beforeEach(async () => { - mockEmailService = createMock(); - mockApplicationSubmissionStatusService = - createMock(); + mockStatusEmailService = createMock(); + mockApplicationSubmissionStatusService = createMock(); const module: TestingModule = await Test.createTestingModule({ providers: [ ApplicationSubmissionStatusEmailConsumer, { - provide: EmailService, - useValue: mockEmailService, + provide: StatusEmailService, + useValue: mockStatusEmailService, }, { provide: ApplicationSubmissionStatusService, @@ -39,8 +38,6 @@ describe('ApplicationSubmissionStatusEmailConsumer', () => { consumer = module.get( ApplicationSubmissionStatusEmailConsumer, ); - - mockEmailService.sendEmail.mockResolvedValue(); }); it('should be defined', () => { @@ -64,12 +61,12 @@ describe('ApplicationSubmissionStatusEmailConsumer', () => { new ApplicationSubmissionToSubmissionStatus(), ); - mockEmailService.getApplicationEmailData.mockResolvedValue({ + mockStatusEmailService.getApplicationEmailData.mockResolvedValue({ applicationSubmission: mockSubmission, primaryContact: mockPrimaryContact, submissionGovernment: mockLocalGovernment, }); - mockEmailService.sendApplicationStatusEmail.mockResolvedValue(); + mockStatusEmailService.sendApplicationStatusEmail.mockResolvedValue(); await consumer.processSubmissionStatusesAndSendEmails(); @@ -80,10 +77,14 @@ describe('ApplicationSubmissionStatusEmailConsumer', () => { mockApplicationSubmissionStatusService.saveSubmissionToSubmissionStatus, ).toBeCalledTimes(1); - expect(mockEmailService.getApplicationEmailData).toBeCalledWith('fake'); - expect(mockEmailService.getApplicationEmailData).toBeCalledTimes(1); - expect(mockEmailService.sendApplicationStatusEmail).toBeCalledTimes(1); - expect(mockEmailService.sendApplicationStatusEmail).toBeCalledWith({ + expect(mockStatusEmailService.getApplicationEmailData).toBeCalledWith( + 'fake', + ); + expect(mockStatusEmailService.getApplicationEmailData).toBeCalledTimes(1); + expect(mockStatusEmailService.sendApplicationStatusEmail).toBeCalledTimes( + 1, + ); + expect(mockStatusEmailService.sendApplicationStatusEmail).toBeCalledWith({ applicationSubmission: mockSubmission, government: mockLocalGovernment, parentType: PARENT_TYPE.APPLICATION, @@ -111,12 +112,12 @@ describe('ApplicationSubmissionStatusEmailConsumer', () => { new ApplicationSubmissionToSubmissionStatus(), ); - mockEmailService.getApplicationEmailData.mockResolvedValue({ + mockStatusEmailService.getApplicationEmailData.mockResolvedValue({ applicationSubmission: mockSubmission, primaryContact: mockPrimaryContact, submissionGovernment: mockLocalGovernment, }); - mockEmailService.sendApplicationStatusEmail.mockResolvedValue(); + mockStatusEmailService.sendApplicationStatusEmail.mockResolvedValue(); await consumer.processSubmissionStatusesAndSendEmails(); @@ -127,10 +128,14 @@ describe('ApplicationSubmissionStatusEmailConsumer', () => { mockApplicationSubmissionStatusService.saveSubmissionToSubmissionStatus, ).toBeCalledTimes(1); - expect(mockEmailService.getApplicationEmailData).toBeCalledWith('fake'); - expect(mockEmailService.getApplicationEmailData).toBeCalledTimes(1); - expect(mockEmailService.sendApplicationStatusEmail).toBeCalledTimes(1); - expect(mockEmailService.sendApplicationStatusEmail).toBeCalledWith({ + expect(mockStatusEmailService.getApplicationEmailData).toBeCalledWith( + 'fake', + ); + expect(mockStatusEmailService.getApplicationEmailData).toBeCalledTimes(1); + expect(mockStatusEmailService.sendApplicationStatusEmail).toBeCalledTimes( + 1, + ); + expect(mockStatusEmailService.sendApplicationStatusEmail).toBeCalledWith({ applicationSubmission: mockSubmission, government: mockLocalGovernment, parentType: PARENT_TYPE.APPLICATION, @@ -157,12 +162,12 @@ describe('ApplicationSubmissionStatusEmailConsumer', () => { new ApplicationSubmissionToSubmissionStatus(), ); - mockEmailService.getApplicationEmailData.mockResolvedValue({ + mockStatusEmailService.getApplicationEmailData.mockResolvedValue({ applicationSubmission: mockSubmission, primaryContact: undefined, submissionGovernment: mockLocalGovernment, }); - mockEmailService.sendApplicationStatusEmail.mockResolvedValue(); + mockStatusEmailService.sendApplicationStatusEmail.mockResolvedValue(); await consumer.processSubmissionStatusesAndSendEmails(); @@ -173,8 +178,12 @@ describe('ApplicationSubmissionStatusEmailConsumer', () => { mockApplicationSubmissionStatusService.saveSubmissionToSubmissionStatus, ).toBeCalledTimes(0); - expect(mockEmailService.getApplicationEmailData).toBeCalledWith('fake'); - expect(mockEmailService.getApplicationEmailData).toBeCalledTimes(1); - expect(mockEmailService.sendApplicationStatusEmail).toBeCalledTimes(0); + expect(mockStatusEmailService.getApplicationEmailData).toBeCalledWith( + 'fake', + ); + expect(mockStatusEmailService.getApplicationEmailData).toBeCalledTimes(1); + expect(mockStatusEmailService.sendApplicationStatusEmail).toBeCalledTimes( + 0, + ); }); }); diff --git a/services/apps/alcs/src/queues/scheduler/application/status-emails/status-emails.consumer.ts b/services/apps/alcs/src/queues/scheduler/application/status-emails/status-emails.consumer.ts index 24238c5be0..719fb1ff82 100644 --- a/services/apps/alcs/src/queues/scheduler/application/status-emails/status-emails.consumer.ts +++ b/services/apps/alcs/src/queues/scheduler/application/status-emails/status-emails.consumer.ts @@ -12,7 +12,7 @@ import { PARENT_TYPE } from '../../../../alcs/card/card-subtask/card-subtask.dto import { LocalGovernment } from '../../../../alcs/local-government/local-government.entity'; import { ApplicationOwner } from '../../../../portal/application-submission/application-owner/application-owner.entity'; import { ApplicationSubmission } from '../../../../portal/application-submission/application-submission.entity'; -import { EmailService } from '../../../../providers/email/email.service'; +import { StatusEmailService } from '../../../../providers/email/status-email.service'; import { QUEUES } from '../../scheduler.service'; dayjs.extend(utc); @@ -24,7 +24,7 @@ export class ApplicationSubmissionStatusEmailConsumer { constructor( private submissionStatusService: ApplicationSubmissionStatusService, - private emailService: EmailService, + private statusEmailService: StatusEmailService, ) {} @Process() @@ -46,7 +46,7 @@ export class ApplicationSubmissionStatusEmailConsumer { applicationSubmission, primaryContact, submissionGovernment, - } = await this.emailService.getApplicationEmailData( + } = await this.statusEmailService.getApplicationEmailData( submissionStatus.submission.fileNumber, ); @@ -85,7 +85,7 @@ export class ApplicationSubmissionStatusEmailConsumer { ? generateALCDApplicationHtml : generateREVAHtml; - await this.emailService.sendApplicationStatusEmail({ + await this.statusEmailService.sendApplicationStatusEmail({ applicationSubmission, government: submissionGovernment, parentType: PARENT_TYPE.APPLICATION, diff --git a/services/apps/alcs/src/queues/scheduler/notice-of-intent/status-emails.consumer.spec.ts b/services/apps/alcs/src/queues/scheduler/notice-of-intent/status-emails.consumer.spec.ts index 7773a692d7..76a1c14940 100644 --- a/services/apps/alcs/src/queues/scheduler/notice-of-intent/status-emails.consumer.spec.ts +++ b/services/apps/alcs/src/queues/scheduler/notice-of-intent/status-emails.consumer.spec.ts @@ -8,25 +8,24 @@ import { NoticeOfIntentSubmissionToSubmissionStatus } from '../../../alcs/notice import { NoticeOfIntentSubmissionStatusService } from '../../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service'; import { NoticeOfIntentOwner } from '../../../portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.entity'; import { NoticeOfIntentSubmission } from '../../../portal/notice-of-intent-submission/notice-of-intent-submission.entity'; -import { EmailService } from '../../../providers/email/email.service'; +import { StatusEmailService } from '../../../providers/email/status-email.service'; import { NoticeOfIntentSubmissionStatusEmailConsumer } from './status-emails.consumer'; describe('NoticeOfIntentSubmissionStatusEmailConsumer', () => { let consumer: NoticeOfIntentSubmissionStatusEmailConsumer; - let mockEmailService: DeepMocked; + let mockStatusEmailService: DeepMocked; let mockNoticeOfIntentSubmissionStatusService: DeepMocked; beforeEach(async () => { - mockEmailService = createMock(); - mockNoticeOfIntentSubmissionStatusService = - createMock(); + mockStatusEmailService = createMock(); + mockNoticeOfIntentSubmissionStatusService = createMock(); const module: TestingModule = await Test.createTestingModule({ providers: [ NoticeOfIntentSubmissionStatusEmailConsumer, { - provide: EmailService, - useValue: mockEmailService, + provide: StatusEmailService, + useValue: mockStatusEmailService, }, { provide: NoticeOfIntentSubmissionStatusService, @@ -38,8 +37,6 @@ describe('NoticeOfIntentSubmissionStatusEmailConsumer', () => { consumer = module.get( NoticeOfIntentSubmissionStatusEmailConsumer, ); - - mockEmailService.sendEmail.mockResolvedValue(); }); it('should be defined', () => { @@ -63,11 +60,11 @@ describe('NoticeOfIntentSubmissionStatusEmailConsumer', () => { new NoticeOfIntentSubmissionToSubmissionStatus(), ); - mockEmailService.getNoticeOfIntentEmailData.mockResolvedValue({ + mockStatusEmailService.getNoticeOfIntentEmailData.mockResolvedValue({ primaryContact: mockPrimaryContact, submissionGovernment: mockLocalGovernment, }); - mockEmailService.sendNoticeOfIntentStatusEmail.mockResolvedValue(); + mockStatusEmailService.sendNoticeOfIntentStatusEmail.mockResolvedValue(); await consumer.processSubmissionStatusesAndSendEmails(); @@ -78,20 +75,26 @@ describe('NoticeOfIntentSubmissionStatusEmailConsumer', () => { mockNoticeOfIntentSubmissionStatusService.saveSubmissionToSubmissionStatus, ).toBeCalledTimes(1); - expect(mockEmailService.getNoticeOfIntentEmailData).toBeCalledWith( + expect(mockStatusEmailService.getNoticeOfIntentEmailData).toBeCalledWith( mockSubmission, ); - expect(mockEmailService.getNoticeOfIntentEmailData).toBeCalledTimes(1); - expect(mockEmailService.sendNoticeOfIntentStatusEmail).toBeCalledTimes(1); - expect(mockEmailService.sendNoticeOfIntentStatusEmail).toBeCalledWith({ - noticeOfIntentSubmission: mockSubmission, - government: mockLocalGovernment, - parentType: PARENT_TYPE.NOTICE_OF_INTENT, - primaryContact: mockPrimaryContact, - ccGovernment: true, - generateStatusHtml: generateALCDNoticeOfIntentHtml, - status: NOI_SUBMISSION_STATUS.ALC_DECISION, - }); + expect(mockStatusEmailService.getNoticeOfIntentEmailData).toBeCalledTimes( + 1, + ); + expect( + mockStatusEmailService.sendNoticeOfIntentStatusEmail, + ).toBeCalledTimes(1); + expect(mockStatusEmailService.sendNoticeOfIntentStatusEmail).toBeCalledWith( + { + noticeOfIntentSubmission: mockSubmission, + government: mockLocalGovernment, + parentType: PARENT_TYPE.NOTICE_OF_INTENT, + primaryContact: mockPrimaryContact, + ccGovernment: true, + generateStatusHtml: generateALCDNoticeOfIntentHtml, + status: NOI_SUBMISSION_STATUS.ALC_DECISION, + }, + ); }); it('should not send email if no primary contact', async () => { @@ -110,11 +113,11 @@ describe('NoticeOfIntentSubmissionStatusEmailConsumer', () => { new NoticeOfIntentSubmissionToSubmissionStatus(), ); - mockEmailService.getNoticeOfIntentEmailData.mockResolvedValue({ + mockStatusEmailService.getNoticeOfIntentEmailData.mockResolvedValue({ primaryContact: undefined, submissionGovernment: mockLocalGovernment, }); - mockEmailService.sendNoticeOfIntentStatusEmail.mockResolvedValue(); + mockStatusEmailService.sendNoticeOfIntentStatusEmail.mockResolvedValue(); await consumer.processSubmissionStatusesAndSendEmails(); @@ -125,10 +128,14 @@ describe('NoticeOfIntentSubmissionStatusEmailConsumer', () => { mockNoticeOfIntentSubmissionStatusService.saveSubmissionToSubmissionStatus, ).toBeCalledTimes(0); - expect(mockEmailService.getNoticeOfIntentEmailData).toBeCalledWith( + expect(mockStatusEmailService.getNoticeOfIntentEmailData).toBeCalledWith( mockSubmission, ); - expect(mockEmailService.getNoticeOfIntentEmailData).toBeCalledTimes(1); - expect(mockEmailService.sendNoticeOfIntentStatusEmail).toBeCalledTimes(0); + expect(mockStatusEmailService.getNoticeOfIntentEmailData).toBeCalledTimes( + 1, + ); + expect( + mockStatusEmailService.sendNoticeOfIntentStatusEmail, + ).toBeCalledTimes(0); }); }); diff --git a/services/apps/alcs/src/queues/scheduler/notice-of-intent/status-emails.consumer.ts b/services/apps/alcs/src/queues/scheduler/notice-of-intent/status-emails.consumer.ts index 19ecc75ca4..88ac1d32e3 100644 --- a/services/apps/alcs/src/queues/scheduler/notice-of-intent/status-emails.consumer.ts +++ b/services/apps/alcs/src/queues/scheduler/notice-of-intent/status-emails.consumer.ts @@ -8,7 +8,7 @@ import { PARENT_TYPE } from '../../../alcs/card/card-subtask/card-subtask.dto'; import { NOI_SUBMISSION_STATUS } from '../../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status.dto'; import { NoticeOfIntentSubmissionToSubmissionStatus } from '../../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status.entity'; import { NoticeOfIntentSubmissionStatusService } from '../../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service'; -import { EmailService } from '../../../providers/email/email.service'; +import { StatusEmailService } from '../../../providers/email/status-email.service'; import { QUEUES } from '../scheduler.service'; dayjs.extend(utc); @@ -20,7 +20,7 @@ export class NoticeOfIntentSubmissionStatusEmailConsumer { constructor( private submissionStatusService: NoticeOfIntentSubmissionStatusService, - private emailService: EmailService, + private statusEmailService: StatusEmailService, ) {} @Process() @@ -39,12 +39,12 @@ export class NoticeOfIntentSubmissionStatusEmailConsumer { for (const submissionStatus of submissionStatuses) { try { const { primaryContact, submissionGovernment } = - await this.emailService.getNoticeOfIntentEmailData( + await this.statusEmailService.getNoticeOfIntentEmailData( submissionStatus.submission, ); if (primaryContact) { - await this.emailService.sendNoticeOfIntentStatusEmail({ + await this.statusEmailService.sendNoticeOfIntentStatusEmail({ generateStatusHtml: generateALCDNoticeOfIntentHtml, status: NOI_SUBMISSION_STATUS.ALC_DECISION, noticeOfIntentSubmission: submissionStatus.submission, diff --git a/services/templates/emails/cancelled/application.template.ts b/services/templates/emails/cancelled/application.template.ts index 60df235aaf..003e8f5c9c 100644 --- a/services/templates/emails/cancelled/application.template.ts +++ b/services/templates/emails/cancelled/application.template.ts @@ -1,7 +1,7 @@ import { MJMLParseResults } from 'mjml-core'; +import { StatusUpdateEmail } from '../../../apps/alcs/src/providers/email/status-email.service'; import { EmailTemplateService } from '../../../libs/common/src/email-template-service/email-template.service'; import { header, footer, notificationOnly, portalButton } from '../partials'; -import { StatusUpdateEmail } from '../../../apps/alcs/src/providers/email/email.service'; const template = ` diff --git a/services/templates/emails/cancelled/notice-of-intent.template.ts b/services/templates/emails/cancelled/notice-of-intent.template.ts index dbc1a771f8..873a60cc88 100644 --- a/services/templates/emails/cancelled/notice-of-intent.template.ts +++ b/services/templates/emails/cancelled/notice-of-intent.template.ts @@ -1,7 +1,7 @@ import { MJMLParseResults } from 'mjml-core'; +import { StatusUpdateEmail } from '../../../apps/alcs/src/providers/email/status-email.service'; import { EmailTemplateService } from '../../../libs/common/src/email-template-service/email-template.service'; import { header, footer, notificationOnly, portalButton } from '../partials'; -import { StatusUpdateEmail } from '../../../apps/alcs/src/providers/email/email.service'; const template = ` diff --git a/services/templates/emails/decision-released/application.template.ts b/services/templates/emails/decision-released/application.template.ts index bfa0d4ea12..cd289aada1 100644 --- a/services/templates/emails/decision-released/application.template.ts +++ b/services/templates/emails/decision-released/application.template.ts @@ -1,7 +1,7 @@ import { MJMLParseResults } from 'mjml-core'; +import { StatusUpdateEmail } from '../../../apps/alcs/src/providers/email/status-email.service'; import { EmailTemplateService } from '../../../libs/common/src/email-template-service/email-template.service'; import { header, footer, notificationOnly, portalButton } from '../partials'; -import { StatusUpdateEmail } from '../../../apps/alcs/src/providers/email/email.service'; type DecisionReleasedStatusEmail = StatusUpdateEmail & { decisionDate: number; diff --git a/services/templates/emails/decision-released/notice-of-intent.template.ts b/services/templates/emails/decision-released/notice-of-intent.template.ts index 53b74e634c..5a5cf36907 100644 --- a/services/templates/emails/decision-released/notice-of-intent.template.ts +++ b/services/templates/emails/decision-released/notice-of-intent.template.ts @@ -1,5 +1,5 @@ import { MJMLParseResults } from 'mjml-core'; -import { StatusUpdateEmail } from '../../../apps/alcs/src/providers/email/email.service'; +import { StatusUpdateEmail } from '../../../apps/alcs/src/providers/email/status-email.service'; import { EmailTemplateService } from '../../../libs/common/src/email-template-service/email-template.service'; import { footer, header, notificationOnly, portalButton } from '../partials'; diff --git a/services/templates/emails/notifications/srw-notice.template.ts b/services/templates/emails/notifications/srw-notice.template.ts new file mode 100644 index 0000000000..faa57524b0 --- /dev/null +++ b/services/templates/emails/notifications/srw-notice.template.ts @@ -0,0 +1,88 @@ +import { MJMLParseResults } from 'mjml-core'; +import { EmailTemplateService } from '../../../libs/common/src/email-template-service/email-template.service'; +import { footer } from '../partials'; +import * as config from 'config'; + +type SrwNoticeTemplateData = { + contactName: string; + status: string; + dateSubmitted: string; + fileNumber: string; + submittersFileNumber: string; + fileName: string; +}; + +const template = ` + + + .line-height div { + line-height: 24px !important; + } + + .align-left { + float: left !important; + } + + + + + + + Notification ID #SRW{{fileNumber}} + Primary Contact: {{contactName}} + Status: {{status}} + {{dateSubmitted}} + Submitter’s File Number: {{submittersFileNumber}} + + + + + + + + + + + The ALC's attached PDF response is proof that the notification of statutory right of way has been provided for a s. 218 Statutory Right of Way of the Land Title Act as required by s.18.1(2) of the Agricultural Land Commission Act. + + + The ALC's attached PDF response must be appended as an additional document to the LTSA SRW application package. + + + Disclaimer for Transferee(s): + + + This letter is not an approval to use, construct, or remove soil or place fill (including gravel) within the SRW, nor does it compel the ALC to approve construction in the SRW. An application or notice of intent must be submitted to the ALC before starting any construction, fill placement, or soil removal within the SRW. Please consult the ALC for direction. + + + Please refer to ALC Notification ID SRW{{fileNumber}} in all future correspondence with this office. If you are acting on behalf of the transferee, it is your responsibility to advise your client(s) of this, and any future, correspondence. + + + Further correspondence with respect to this notification should be directed to ALC.LUPRT@gov.bc.ca. + + + PROVINCIAL AGRICULTURAL LAND COMMISSION + + + Attachment: {{fileName}} + + + + + ${footer} + + +`; + +export const generateSRWTemplate = ( + data: SrwNoticeTemplateData, +): MJMLParseResults => { + return new EmailTemplateService().generateEmailBase(template, data); +}; diff --git a/services/templates/emails/refused-to-forward.template.ts b/services/templates/emails/refused-to-forward.template.ts index 3cdba2e2cf..dbf25fcad6 100644 --- a/services/templates/emails/refused-to-forward.template.ts +++ b/services/templates/emails/refused-to-forward.template.ts @@ -1,7 +1,7 @@ import { MJMLParseResults } from 'mjml-core'; +import { StatusUpdateEmail } from '../../apps/alcs/src/providers/email/status-email.service'; import { EmailTemplateService } from '../../libs/common/src/email-template-service/email-template.service'; import { header, footer, notificationOnly, portalButton } from './partials'; -import { StatusUpdateEmail } from '../../apps/alcs/src/providers/email/email.service'; const template = ` diff --git a/services/templates/emails/returned-as-incomplete.template.ts b/services/templates/emails/returned-as-incomplete.template.ts index e97ce576b0..37a70c2713 100644 --- a/services/templates/emails/returned-as-incomplete.template.ts +++ b/services/templates/emails/returned-as-incomplete.template.ts @@ -1,7 +1,7 @@ import { MJMLParseResults } from 'mjml-core'; +import { StatusUpdateEmail } from '../../apps/alcs/src/providers/email/status-email.service'; import { EmailTemplateService } from '../../libs/common/src/email-template-service/email-template.service'; import { header, footer, notificationOnly, portalButton } from './partials'; -import { StatusUpdateEmail } from '../../apps/alcs/src/providers/email/email.service'; const template = ` diff --git a/services/templates/emails/submitted-to-alc/application.template.ts b/services/templates/emails/submitted-to-alc/application.template.ts index 4c4e32e8e3..c1612b60c7 100644 --- a/services/templates/emails/submitted-to-alc/application.template.ts +++ b/services/templates/emails/submitted-to-alc/application.template.ts @@ -1,10 +1,8 @@ import { MJMLParseResults } from 'mjml-core'; +import { StatusUpdateEmail } from '../../../apps/alcs/src/providers/email/status-email.service'; import { EmailTemplateService } from '../../../libs/common/src/email-template-service/email-template.service'; import { header, footer, notificationOnly, portalButton } from '../partials'; -import { - StatusUpdateEmail, - appFees, -} from '../../../apps/alcs/src/providers/email/email.service'; +import { appFees } from '../submitted-to-lfng'; const template = ` diff --git a/services/templates/emails/submitted-to-alc/noi-applicant.template.ts b/services/templates/emails/submitted-to-alc/noi-applicant.template.ts index e21577fab1..0f9bf914d5 100644 --- a/services/templates/emails/submitted-to-alc/noi-applicant.template.ts +++ b/services/templates/emails/submitted-to-alc/noi-applicant.template.ts @@ -1,10 +1,13 @@ import { MJMLParseResults } from 'mjml-core'; +import { StatusUpdateEmail } from '../../../apps/alcs/src/providers/email/status-email.service'; import { EmailTemplateService } from '../../../libs/common/src/email-template-service/email-template.service'; import { header, footer, notificationOnly, portalButton } from '../partials'; -import { - StatusUpdateEmail, - noiFees, -} from '../../../apps/alcs/src/providers/email/email.service'; + +const noiFees = [ + { type: 'Removal of Soil', fee: 150 }, + { type: 'Placement of Fill', fee: 150 }, + { type: 'Placement of Fill/Removal of Soil', fee: 150 }, +]; const template = ` diff --git a/services/templates/emails/submitted-to-alc/noi-government.template.ts b/services/templates/emails/submitted-to-alc/noi-government.template.ts index 84ed87c25d..20a4ab870b 100644 --- a/services/templates/emails/submitted-to-alc/noi-government.template.ts +++ b/services/templates/emails/submitted-to-alc/noi-government.template.ts @@ -1,7 +1,7 @@ import { MJMLParseResults } from 'mjml-core'; +import { StatusUpdateEmail } from '../../../apps/alcs/src/providers/email/status-email.service'; import { EmailTemplateService } from '../../../libs/common/src/email-template-service/email-template.service'; import { header, footer, notificationOnly, portalButton } from '../partials'; -import { StatusUpdateEmail } from '../../../apps/alcs/src/providers/email/email.service'; const template = ` diff --git a/services/templates/emails/submitted-to-alc/tur-applicant.template.ts b/services/templates/emails/submitted-to-alc/tur-applicant.template.ts index 1eb1ca18f5..758ecaccba 100644 --- a/services/templates/emails/submitted-to-alc/tur-applicant.template.ts +++ b/services/templates/emails/submitted-to-alc/tur-applicant.template.ts @@ -1,7 +1,7 @@ import { MJMLParseResults } from 'mjml-core'; +import { StatusUpdateEmail } from '../../../apps/alcs/src/providers/email/status-email.service'; import { EmailTemplateService } from '../../../libs/common/src/email-template-service/email-template.service'; import { header, footer, notificationOnly, portalButton } from '../partials'; -import { StatusUpdateEmail } from '../../../apps/alcs/src/providers/email/email.service'; const template = ` diff --git a/services/templates/emails/submitted-to-alc/tur-government.template.ts b/services/templates/emails/submitted-to-alc/tur-government.template.ts index c17f3e2125..b39d2ff217 100644 --- a/services/templates/emails/submitted-to-alc/tur-government.template.ts +++ b/services/templates/emails/submitted-to-alc/tur-government.template.ts @@ -1,7 +1,7 @@ import { MJMLParseResults } from 'mjml-core'; +import { StatusUpdateEmail } from '../../../apps/alcs/src/providers/email/status-email.service'; import { EmailTemplateService } from '../../../libs/common/src/email-template-service/email-template.service'; import { header, footer, notificationOnly, portalButton } from '../partials'; -import { StatusUpdateEmail } from '../../../apps/alcs/src/providers/email/email.service'; const template = ` diff --git a/services/templates/emails/submitted-to-lfng/applicant.template.ts b/services/templates/emails/submitted-to-lfng/applicant.template.ts index 5bce0d49c7..5a15a2fad8 100644 --- a/services/templates/emails/submitted-to-lfng/applicant.template.ts +++ b/services/templates/emails/submitted-to-lfng/applicant.template.ts @@ -1,10 +1,16 @@ import { MJMLParseResults } from 'mjml-core'; +import { StatusUpdateEmail } from '../../../apps/alcs/src/providers/email/status-email.service'; import { EmailTemplateService } from '../../../libs/common/src/email-template-service/email-template.service'; import { header, footer, notificationOnly, portalButton } from '../partials'; -import { - StatusUpdateEmail, - appFees, -} from '../../../apps/alcs/src/providers/email/email.service'; + +export const appFees = [ + { type: 'Exclusion', fee: 750 }, + { type: 'Subdivision', fee: 750 }, + { type: 'Non-Farm Use', fee: 750 }, + { type: 'Non-Adhering Residential Use', fee: 450 }, + { type: 'Soil or Fill Use', fee: 750 }, + { type: 'Inclusion', fee: 0 }, +]; const template = ` diff --git a/services/templates/emails/submitted-to-lfng/government.template.ts b/services/templates/emails/submitted-to-lfng/government.template.ts index 53c9e73d44..49c76363f8 100644 --- a/services/templates/emails/submitted-to-lfng/government.template.ts +++ b/services/templates/emails/submitted-to-lfng/government.template.ts @@ -1,16 +1,8 @@ import { MJMLParseResults } from 'mjml-core'; +import { StatusUpdateEmail } from '../../../apps/alcs/src/providers/email/status-email.service'; import { EmailTemplateService } from '../../../libs/common/src/email-template-service/email-template.service'; import { header, footer, notificationOnly, portalButton } from '../partials'; -import { StatusUpdateEmail } from '../../../apps/alcs/src/providers/email/email.service'; - -const appFees = [ - { type: 'Exclusion', fee: 750 }, - { type: 'Subdivision', fee: 750 }, - { type: 'Non-Farm Use', fee: 750 }, - { type: 'Non-Adhering Residential Use', fee: 450 }, - { type: 'Soil or Fill Use', fee: 750 }, - { type: 'Inclusion', fee: 0 }, -]; +import { appFees } from './applicant.template'; const template = ` diff --git a/services/templates/emails/under-review-by-alc.template.ts b/services/templates/emails/under-review-by-alc.template.ts index 0468eb67d6..f236a4de91 100644 --- a/services/templates/emails/under-review-by-alc.template.ts +++ b/services/templates/emails/under-review-by-alc.template.ts @@ -1,7 +1,7 @@ import { MJMLParseResults } from 'mjml-core'; +import { StatusUpdateEmail } from '../../apps/alcs/src/providers/email/status-email.service'; import { EmailTemplateService } from '../../libs/common/src/email-template-service/email-template.service'; import { header, footer, notificationOnly, portalButton } from './partials'; -import { StatusUpdateEmail } from '../../apps/alcs/src/providers/email/email.service'; const template = ` diff --git a/services/templates/emails/under-review-by-lfng.template.ts b/services/templates/emails/under-review-by-lfng.template.ts index bb37198427..60df856a79 100644 --- a/services/templates/emails/under-review-by-lfng.template.ts +++ b/services/templates/emails/under-review-by-lfng.template.ts @@ -1,7 +1,7 @@ import { MJMLParseResults } from 'mjml-core'; +import { StatusUpdateEmail } from '../../apps/alcs/src/providers/email/status-email.service'; import { EmailTemplateService } from '../../libs/common/src/email-template-service/email-template.service'; import { header, footer, notificationOnly, portalButton } from './partials'; -import { StatusUpdateEmail } from '../../apps/alcs/src/providers/email/email.service'; const template = ` diff --git a/services/templates/emails/wrong-lfng.template.ts b/services/templates/emails/wrong-lfng.template.ts index 7e6f856dd0..5f95a623cc 100644 --- a/services/templates/emails/wrong-lfng.template.ts +++ b/services/templates/emails/wrong-lfng.template.ts @@ -1,7 +1,7 @@ import { MJMLParseResults } from 'mjml-core'; +import { StatusUpdateEmail } from '../../apps/alcs/src/providers/email/status-email.service'; import { EmailTemplateService } from '../../libs/common/src/email-template-service/email-template.service'; import { header, footer, notificationOnly, portalButton } from './partials'; -import { StatusUpdateEmail } from '../../apps/alcs/src/providers/email/email.service'; const template = ` From 896be457217e51e0c14b9db3fa1680beffc57b5c Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Fri, 15 Sep 2023 11:20:22 -0700 Subject: [PATCH 387/954] release decision dialog update (#971) --- .../decision-v2/release-dialog/release-dialog.component.html | 3 ++- .../decision-v2/release-dialog/release-dialog.component.html | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/release-dialog/release-dialog.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/release-dialog/release-dialog.component.html index 7c0956c1a9..5b21922caa 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/release-dialog/release-dialog.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/release-dialog/release-dialog.component.html @@ -4,7 +4,8 @@

Confirm Release Decision

- This decision and document will be immediately visible to the Applicant and Local/First Nation Government. + This decision and document will be immediately visible to the Applicant, Local/First Nation Government, and + Public.

Upon releasing the decision, the application will be updated to the status: diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/release-dialog/release-dialog.component.html b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/release-dialog/release-dialog.component.html index 9bf43149ac..5b21922caa 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/release-dialog/release-dialog.component.html +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/release-dialog/release-dialog.component.html @@ -3,7 +3,10 @@

Confirm Release Decision

-

This decision and document will be immediately visible to the Applicant and Local/First Nation Government.

+

+ This decision and document will be immediately visible to the Applicant, Local/First Nation Government, and + Public. +

Upon releasing the decision, the application will be updated to the status: From affe71f41ec9734c0f2bc00117638a7ccdd62366 Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Fri, 15 Sep 2023 11:20:40 -0700 Subject: [PATCH 388/954] Feature/alcs 1117 (#969) Introduce "smart batch" that takes into account both batch size in bytes as well as the total count of documents Refactor code so all document import scripts share the same core functionality Allow running import commands for different file types in separate terminals Application documents could be run in multiple terminals with batch window --- bin/.gitignore | 6 +- bin/migrate-files/README.md | 96 +++++- .../application_docs/__init__.py | 1 + .../application_docs_import.py | 206 ++++++++++++ bin/migrate-files/common/__init__.py | 4 + bin/migrate-files/common/constants.py | 17 + .../common/document_import_helper.py | 66 ++++ .../common/document_upload_helper.py | 39 +++ bin/migrate-files/common/log_file_helper.py | 27 ++ bin/migrate-files/config.py | 18 + bin/migrate-files/issue_docs/__init__.py | 1 + .../issue_docs/issue_docs_import.py | 160 +++++++++ bin/migrate-files/migrate-files.py | 316 +++++------------- bin/migrate-files/planning_docs/__init__.py | 1 + .../planning_docs/planning_docs_import.py | 160 +++++++++ 15 files changed, 869 insertions(+), 249 deletions(-) create mode 100644 bin/migrate-files/application_docs/__init__.py create mode 100644 bin/migrate-files/application_docs/application_docs_import.py create mode 100644 bin/migrate-files/common/__init__.py create mode 100644 bin/migrate-files/common/constants.py create mode 100644 bin/migrate-files/common/document_import_helper.py create mode 100644 bin/migrate-files/common/document_upload_helper.py create mode 100644 bin/migrate-files/common/log_file_helper.py create mode 100644 bin/migrate-files/config.py create mode 100644 bin/migrate-files/issue_docs/__init__.py create mode 100644 bin/migrate-files/issue_docs/issue_docs_import.py create mode 100644 bin/migrate-files/planning_docs/__init__.py create mode 100644 bin/migrate-files/planning_docs/planning_docs_import.py diff --git a/bin/.gitignore b/bin/.gitignore index 12cddf3cc0..735edc3f3f 100644 --- a/bin/.gitignore +++ b/bin/.gitignore @@ -2,4 +2,8 @@ out tmp *.pickle -*etl_log.txt \ No newline at end of file +*etl_log.txt +__pycache__ +*last_imported_application_file.txt +last_imported_planning_file.txt +last_imported_issue_file.txt \ No newline at end of file diff --git a/bin/migrate-files/README.md b/bin/migrate-files/README.md index 691a63087d..adf7265fbb 100644 --- a/bin/migrate-files/README.md +++ b/bin/migrate-files/README.md @@ -16,8 +16,7 @@ os: used to interact with the file system dotenv: used to load environment variables from the .env file cx_Oracle: used to interact with the Oracle database boto3: used to interact with Amazon S3 -tqdm: used to show progress bars during the file upload process -pickle: used to store the last uploaded document id, so the upload process can be resumed from where it left off. +tqdm: used to show progress bars during the file upload process # Usage @@ -25,14 +24,33 @@ pickle: used to store the last uploaded document id, so the upload process can b The following environment variables are required: +DB_HOST +DB_PORT +DB_SERVICE_NAME DB_USERNAME: Oracle database username DB_PASSWORD: Oracle database password -DB_DSN: Oracle database DSN +DB_DSN: Oracle database service name ECS_HOSTNAME: Dell ECS S3 hostname ECS_BUCKET: Dell ECS bucket name ECS_ACCESS_KEY: Dell ECS access key -ECS_SECRET_KEY: Dell ECS secret key -These variables can be stored in the .env file. +ECS_SECRET_KEY: Dell ECS secret key + +Create .env file in ./migrate-files/ and populate listed values there + +## High level description of transport process + +Import queries Oracle DB and uploads blob column(binary data that represents file) to DELL ECS. The querying of DB is done based on the file type: application, planning review and issue. Each file type has a custom query that reads corresponding data. The upload is done in the following steps: + +1. find the maximum file size +2. add 3MB to it as data reserve - batch size cap +3. use the 'batch size cap' with the document count batch (limit the count of documents to be read in one transaction from DB) +4. read the data using the limit declared in step 3 +5. if import fails: + 1. if any document from import fails record it to file and stop the process + 2. the source of the issue that caused the import to fail will need to be addressed manually + 3. restart the import. Import records the last successful file upload and will automatically restart from where it left + +TIP: All 3 imports could be started in separate terminals at the same time. ## Arm64 quirks @@ -47,11 +65,71 @@ Force run python in emulation mode and reinstall requirements ## Running the Script To run the script, run the following command: - -`python migrate-files.py` +2023-09-14 12:26:19_last_imported_application_file + +```sh +# To start application document import +python migrate-files.py application +python migrate-files.py application --start_document_id=500240 --end_document_id=505260 --last_imported_document_id=500475 +``` + +Application document import supports running multiple terminals at the same time with specifying baches of data to import. + +``` +--- SQL --- +-- use following sql to determine the import batch size. +WITH documents_with_cumulative_file_size AS ( + SELECT + ROW_NUMBER() OVER( + ORDER BY DOCUMENT_ID ASC + ) row_num, + DOCUMENT_ID, + ALR_APPLICATION_ID, + FILE_NAME +FROM + OATS.OATS_DOCUMENTS +WHERE + dbms_lob.getLength(DOCUMENT_BLOB) > 0 + AND ALR_APPLICATION_ID IS NOT NULL +ORDER BY + DOCUMENT_ID ASC +) + SELECT * FROM documents_with_cumulative_file_size + WHERE row_num = 10000 +``` + +```sh +# start_document_id - starting document id of batch; end_document_id - end document id of batch; last_imported_document_id - the last successfully imported file id of batch. Could be found in [dateTime]_last_imported_application_file.txt or leave it empty and it defaults to 0. + +python migrate-files.py application --start_document_id=500240 --end_document_id=505260 --last_imported_document_id=500475 + +``` + +```sh +# to start planning review document import +python migrate-files.py planning +``` + +```sh +# to start issue document import +python migrate-files.py issue +``` M1: -`python3-intel64 migrate-files.py` +```sh +# to start application document import +python3-intel64 migrate-files.py application +``` + +```sh +# to start planning review document import +python3-intel64 migrate-files.py planning +``` + +```sh +# to start issue document import +python3-intel64 migrate-files.py issue +``` -The script will start uploading files from the Oracle database to DELL ECS. The upload progress will be displayed in a progress bar. The script will also save the last uploaded document id, so the upload process can be resumed from where it left off in case of any interruption. +The script will start uploading files from the Oracle database to DELL ECS. The upload progress will be displayed in a progress bar. For Planning and Issues documents the script will also save the last uploaded document id, so the upload process can be resumed from where it left off in case of any interruption. For Application documents import it is responsibility of whoever is running the process to specify "last_imported_document_id" diff --git a/bin/migrate-files/application_docs/__init__.py b/bin/migrate-files/application_docs/__init__.py new file mode 100644 index 0000000000..ed8598d5a6 --- /dev/null +++ b/bin/migrate-files/application_docs/__init__.py @@ -0,0 +1 @@ +from .application_docs_import import import_application_docs diff --git a/bin/migrate-files/application_docs/application_docs_import.py b/bin/migrate-files/application_docs/application_docs_import.py new file mode 100644 index 0000000000..01ce4c2fcd --- /dev/null +++ b/bin/migrate-files/application_docs/application_docs_import.py @@ -0,0 +1,206 @@ +from tqdm import tqdm +import cx_Oracle +from common import ( + LAST_IMPORTED_APPLICATION_FILE, + DocumentUploadBasePath, + upload_file_to_s3, + get_starting_document_id, + get_max_file_size, + EntityType, + handle_document_processing_error, + fetch_data_from_oracle, + process_results, + log_last_imported_file, + generate_log_file_name, +) + +log_file_name = generate_log_file_name(LAST_IMPORTED_APPLICATION_FILE) + + +def import_application_docs( + batch, + cursor, + conn, + s3, + start_document_id_arg, + end_document_id_arg, + last_imported_document_id_arg, +): + # Get total number of files + application_count = _get_total_number_of_files( + cursor, start_document_id_arg, end_document_id_arg + ) + last_imported_document_id_arg = last_imported_document_id_arg + offset = ( + last_imported_document_id_arg + if last_imported_document_id_arg == 0 + else _get_total_number_of_transferred_files( + cursor, start_document_id_arg, last_imported_document_id_arg + ) + ) + print( + f"{EntityType.APPLICATION.value} count = {application_count} offset = {offset}" + ) + starting_document_id = last_imported_document_id_arg + + # Track progress + documents_processed = 0 + last_document_id = starting_document_id + + try: + with tqdm( + total=application_count, + initial=offset, + unit="file", + desc=f"Uploading {EntityType.APPLICATION.value} files to S3", + ) as documents_upload_progress_bar: + max_file_size = get_max_file_size(cursor) + + while True: + starting_document_id = get_starting_document_id( + starting_document_id, last_document_id, EntityType.APPLICATION.value + ) + + params = { + "starting_document_id": starting_document_id, + "end_document_id": end_document_id_arg, + "max_file_size": max_file_size, + "batch_size": batch, + } + data = fetch_data_from_oracle(_document_query, cursor, params) + + if not data: + break + # Upload the batch to S3 with a progress bar + for ( + file_size, + document_id, + application_id, + filename, + file, + ) in data: + tqdm.write(f"{application_id}/{document_id}_{filename}") + + upload_file_to_s3( + s3, + DocumentUploadBasePath.APPLICATION.value, + file_size, + document_id, + application_id, + filename, + file, + ) + + documents_upload_progress_bar.update(1) + last_document_id = document_id + documents_processed += 1 + + log_last_imported_file(last_document_id, log_file_name) + + except Exception as error: + handle_document_processing_error( + cursor, + conn, + error, + EntityType.APPLICATION.value, + documents_processed, + last_document_id, + log_file_name, + ) + + # Display results + process_results( + EntityType.APPLICATION.value, + application_count, + documents_processed, + last_document_id, + log_file_name, + ) + + return + + +_document_query = """ + WITH documents_with_cumulative_file_size AS ( + SELECT + ROW_NUMBER() OVER( + ORDER BY DOCUMENT_ID ASC + ) row_num, + dbms_lob.getLength(DOCUMENT_BLOB) file_size, + SUM(dbms_lob.getLength(DOCUMENT_BLOB)) OVER (ORDER BY DOCUMENT_ID ASC ROWS UNBOUNDED PRECEDING) AS cumulative_file_size, + DOCUMENT_ID, + ALR_APPLICATION_ID, + FILE_NAME, + DOCUMENT_BLOB, + DOCUMENT_CODE, + DESCRIPTION, + DOCUMENT_SOURCE_CODE, + UPLOADED_DATE, + WHEN_UPDATED, + REVISION_COUNT + FROM + OATS.OATS_DOCUMENTS + WHERE + dbms_lob.getLength(DOCUMENT_BLOB) > 0 + AND DOCUMENT_ID > :starting_document_id + AND (:end_document_id = 0 OR DOCUMENT_ID <= :end_document_id) + AND ALR_APPLICATION_ID IS NOT NULL + ORDER BY + DOCUMENT_ID ASC + ) + SELECT + file_size, + DOCUMENT_ID, + ALR_APPLICATION_ID, + FILE_NAME, + DOCUMENT_BLOB + FROM + documents_with_cumulative_file_size + WHERE + cumulative_file_size < :max_file_size + AND row_num < :batch_size + ORDER BY + DOCUMENT_ID ASC + """ + + +def _get_total_number_of_files(cursor, start_document_id, end_document_id): + try: + cursor.execute( + """ + SELECT COUNT(*) + FROM OATS.OATS_DOCUMENTS + WHERE dbms_lob.getLength(DOCUMENT_BLOB) > 0 + AND ALR_APPLICATION_ID IS NOT NULL + AND (:start_document_id = 0 OR DOCUMENT_ID > :start_document_id) + AND (:end_document_id = 0 OR DOCUMENT_ID <= :end_document_id) + """, + { + "start_document_id": start_document_id, + "end_document_id": end_document_id, + }, + ) + return cursor.fetchone()[0] + except cx_Oracle.Error as e: + raise Exception("Oracle Error: {}".format(e)) + + +def _get_total_number_of_transferred_files(cursor, start_document_id, end_document_id): + try: + cursor.execute( + """ + SELECT COUNT(*) + FROM OATS.OATS_DOCUMENTS + WHERE dbms_lob.getLength(DOCUMENT_BLOB) > 0 + AND ALR_APPLICATION_ID IS NOT NULL + AND DOCUMENT_ID > :start_document_id + AND (:end_document_id = 0 OR DOCUMENT_ID <= :end_document_id) + """, + { + "start_document_id": start_document_id, + "end_document_id": end_document_id, + }, + ) + return cursor.fetchone()[0] + except cx_Oracle.Error as e: + raise Exception("Oracle Error: {}".format(e)) diff --git a/bin/migrate-files/common/__init__.py b/bin/migrate-files/common/__init__.py new file mode 100644 index 0000000000..a3d8e42f6d --- /dev/null +++ b/bin/migrate-files/common/__init__.py @@ -0,0 +1,4 @@ +from .constants import * +from .document_upload_helper import * +from .log_file_helper import * +from .document_import_helper import * diff --git a/bin/migrate-files/common/constants.py b/bin/migrate-files/common/constants.py new file mode 100644 index 0000000000..fd2d50d03f --- /dev/null +++ b/bin/migrate-files/common/constants.py @@ -0,0 +1,17 @@ +from enum import Enum + +LAST_IMPORTED_APPLICATION_FILE = "last_imported_application_file.txt" +LAST_IMPORTED_PLANNING_FILE = "last_imported_planning_file.txt" +LAST_IMPORTED_ISSUE_FILE = "last_imported_issue_file.txt" + + +class DocumentUploadBasePath(Enum): + APPLICATION = "migrate/application" + PLANNING = "migrate/planning_review" + ISSUE = "migrate/issue" + + +class EntityType(Enum): + APPLICATION = "application" + PLANNING = "planning review" + ISSUE = "issue" diff --git a/bin/migrate-files/common/document_import_helper.py b/bin/migrate-files/common/document_import_helper.py new file mode 100644 index 0000000000..26586382a9 --- /dev/null +++ b/bin/migrate-files/common/document_import_helper.py @@ -0,0 +1,66 @@ +from .log_file_helper import log_last_imported_file +from .constants import LAST_IMPORTED_APPLICATION_FILE +import traceback + + +def get_max_file_size(cursor): + file_size_reserve = 5242880 # 5 Megabytes in bytes + try: + cursor.execute( + "SELECT MAX(dbms_lob.getLength(DOCUMENT_BLOB)) FROM OATS.OATS_DOCUMENTS", + ) + max_file_size = cursor.fetchone()[0] + file_size_reserve + except Exception as e: + raise Exception("Oracle Error: {}".format(e)) + + default_max_size = 1073741824 # default the max_file_size to 1 Gigabyte in bytes + return default_max_size if default_max_size > max_file_size else max_file_size + + +def get_starting_document_id(starting_document_id, last_document_id, entity_type): + if int(starting_document_id) > int(last_document_id): + raise Exception( + f"ERROR: starting_document_id > last_document_id. Wrong order of {entity_type} import!", + starting_document_id, + last_document_id, + ) + + return last_document_id + + +def fetch_data_from_oracle(document_query, cursor, params): + cursor.execute(document_query, params) + + # Fetch the next batch of BLOB data + data = cursor.fetchmany(params["batch_size"]) + return data + + +def handle_document_processing_error( + cursor, + conn, + error, + entity_type, + documents_processed, + last_document_id, + log_file_name, +): + print(f"Something went wrong with {entity_type} document upload:") + print("".join(traceback.format_exception(None, error, error.__traceback__))) + print(f"Processed {documents_processed} {entity_type} files") + + log_last_imported_file(last_document_id, log_file_name) + + cursor.close() + conn.close() + exit() + + +def process_results( + entity_type, document_count, documents_processed, last_document_id, log_file_name +): + print( + f"Process complete: Successfully migrated {documents_processed} out of {document_count} {entity_type} files.", + ) + + log_last_imported_file(last_document_id, log_file_name) diff --git a/bin/migrate-files/common/document_upload_helper.py b/bin/migrate-files/common/document_upload_helper.py new file mode 100644 index 0000000000..534b4bea0a --- /dev/null +++ b/bin/migrate-files/common/document_upload_helper.py @@ -0,0 +1,39 @@ +from tqdm import tqdm +from config import ( + ecs_bucket, +) +import io + + +def record_file_into_new_file_obj(file): + """This is required since s3.upload_fileobj cannot always correctly identify the file size of cx.Oracle file""" + try: + file_size = file.size() + bytes_data = file.read() + new_file_object = io.BytesIO(bytes_data) # create file object from bytes + if file_size != len(new_file_object.getvalue()): + print("File sizes do not match") + + return new_file_object + except Exception as err: + print("Error in record_file_into_variable") + raise + + +def upload_file_to_s3( + s3, doc_upload_base_path, file_size, document_id, entity_id, filename, file +): + file_to_upload = record_file_into_new_file_obj(file) + + with tqdm( + total=file_size, unit="B", unit_scale=True, desc=filename + ) as upload_progress_bar: + s3.upload_fileobj( + file_to_upload, + ecs_bucket, + f"{doc_upload_base_path}/{entity_id}/{document_id}_{filename}", + Callback=lambda bytes_transferred: upload_progress_bar.update( + bytes_transferred + ), + ) + diff --git a/bin/migrate-files/common/log_file_helper.py b/bin/migrate-files/common/log_file_helper.py new file mode 100644 index 0000000000..e87badcd1a --- /dev/null +++ b/bin/migrate-files/common/log_file_helper.py @@ -0,0 +1,27 @@ +import os +from datetime import datetime + + +def generate_log_file_name(file_name): + return f"{get_current_date_with_seconds()}_{file_name}" + + +def get_current_date_with_seconds(): + return datetime.now().strftime("%Y-%m-%d %H:%M:%S") + + +def log_last_imported_file(last_document_id, log_file_name): + with open(log_file_name, "w") as file: + file.write(str(last_document_id)) + + +def get_last_successfully_uploaded_file_from_log(file_name, entity_type): + # Determine job resume status: retrieves last successfully uploaded document from log file + document_id = 0 + + if os.path.isfile(file_name): + with open(file_name, "r") as file: + document_id = file.read().strip() + print(f"Starting {entity_type} from: {document_id}") + + return int(document_id) \ No newline at end of file diff --git a/bin/migrate-files/config.py b/bin/migrate-files/config.py new file mode 100644 index 0000000000..9767bdcf0c --- /dev/null +++ b/bin/migrate-files/config.py @@ -0,0 +1,18 @@ +import os +from dotenv import load_dotenv + +# Load environment variables from .env file +load_dotenv() + +# Load Oracle DB connection details +db_host = os.getenv("DB_HOST") +db_port = os.getenv("DB_PORT") +db_service_name = os.getenv("DB_SERVICE_NAME") +db_username = os.getenv("DB_USERNAME") +db_password = os.getenv("DB_PASSWORD") + +# Load the ECS connection secrets from environment variables +ecs_host = os.getenv("ECS_HOSTNAME") +ecs_bucket = os.getenv("ECS_BUCKET") +ecs_access_key = os.getenv("ECS_ACCESS_KEY") +ecs_secret_key = os.getenv("ECS_SECRET_KEY") diff --git a/bin/migrate-files/issue_docs/__init__.py b/bin/migrate-files/issue_docs/__init__.py new file mode 100644 index 0000000000..5e0cce709b --- /dev/null +++ b/bin/migrate-files/issue_docs/__init__.py @@ -0,0 +1 @@ +from .issue_docs_import import import_issue_docs diff --git a/bin/migrate-files/issue_docs/issue_docs_import.py b/bin/migrate-files/issue_docs/issue_docs_import.py new file mode 100644 index 0000000000..be519884e5 --- /dev/null +++ b/bin/migrate-files/issue_docs/issue_docs_import.py @@ -0,0 +1,160 @@ +from tqdm import tqdm +import cx_Oracle +from common import ( + LAST_IMPORTED_ISSUE_FILE, + DocumentUploadBasePath, + upload_file_to_s3, + get_starting_document_id, + get_max_file_size, + EntityType, + handle_document_processing_error, + fetch_data_from_oracle, + process_results, + get_last_successfully_uploaded_file_from_log, +) + + +def import_issue_docs(batch, cursor, conn, s3): + starting_document_id = get_last_successfully_uploaded_file_from_log( + LAST_IMPORTED_ISSUE_FILE, EntityType.ISSUE.value + ) + + # Get total number of files + document_count = _get_total_number_of_files(cursor) + offset = _get_total_number_of_transferred_files(cursor, starting_document_id) + print(f"{EntityType.ISSUE.value} count = {document_count} offset = {offset}") + + # Track progress + documents_processed = 0 + last_document_id = starting_document_id + + try: + with tqdm( + total=document_count, + unit="file", + desc=f"Uploading {EntityType.ISSUE.value} files to S3", + ) as documents_upload_progress_bar: + while True: + starting_document_id = get_starting_document_id( + starting_document_id, last_document_id, EntityType.ISSUE.value + ) + max_file_size = get_max_file_size(cursor) + + params = { + "starting_document_id": starting_document_id, + "max_file_size": max_file_size, + "batch_size": batch, + } + data = fetch_data_from_oracle(_document_query, cursor, params) + + if not data: + break + # Upload the batch to S3 with a progress bar + for ( + file_size, + document_id, + issue_id, + filename, + file, + ) in data: + tqdm.write(f"{issue_id}/{document_id}_{filename}") + + upload_file_to_s3( + s3, + DocumentUploadBasePath.ISSUE.value, + file_size, + document_id, + issue_id, + filename, + file, + ) + + documents_upload_progress_bar.update(1) + last_document_id = document_id + documents_processed += 1 + + except Exception as error: + handle_document_processing_error( + cursor, + conn, + error, + EntityType.ISSUE.value, + documents_processed, + last_document_id, + LAST_IMPORTED_ISSUE_FILE, + ) + + # Display results + process_results( + EntityType.ISSUE.value, + document_count, + documents_processed, + last_document_id, + LAST_IMPORTED_ISSUE_FILE + ) + + return + + +_document_query = """ + WITH documents_with_cumulative_file_size AS ( + SELECT + ROW_NUMBER() OVER( + ORDER BY DOCUMENT_ID ASC + ) row_num, + dbms_lob.getLength(DOCUMENT_BLOB) file_size, + SUM(dbms_lob.getLength(DOCUMENT_BLOB)) OVER (ORDER BY DOCUMENT_ID ASC ROWS UNBOUNDED PRECEDING) AS cumulative_file_size, + DOCUMENT_ID, + ISSUE_ID, + FILE_NAME, + DOCUMENT_BLOB, + DOCUMENT_CODE, + DESCRIPTION, + DOCUMENT_SOURCE_CODE, + UPLOADED_DATE, + WHEN_UPDATED, + REVISION_COUNT + FROM + OATS.OATS_DOCUMENTS + WHERE + dbms_lob.getLength(DOCUMENT_BLOB) > 0 + AND DOCUMENT_ID > :starting_document_id + AND ISSUE_ID IS NOT NULL + ORDER BY + DOCUMENT_ID ASC + ) + SELECT + file_size, + DOCUMENT_ID, + ISSUE_ID, + FILE_NAME, + DOCUMENT_BLOB + FROM + documents_with_cumulative_file_size + WHERE + cumulative_file_size < :max_file_size + AND row_num < :batch_size + ORDER BY + DOCUMENT_ID ASC + """ + + +def _get_total_number_of_files(cursor): + try: + cursor.execute( + "SELECT COUNT(*) FROM OATS.OATS_DOCUMENTS WHERE dbms_lob.getLength(DOCUMENT_BLOB) > 0 AND ISSUE_ID IS NOT NULL" + ) + return cursor.fetchone()[0] + except cx_Oracle.Error as e: + raise Exception("Oracle Error: {}".format(e)) + + +def _get_total_number_of_transferred_files(cursor, document_id): + try: + cursor.execute( + "SELECT COUNT(*) FROM OATS.OATS_DOCUMENTS WHERE dbms_lob.getLength(DOCUMENT_BLOB) > 0 AND ISSUE_ID IS NOT NULL AND DOCUMENT_ID < :document_id", + {"document_id": document_id}, + ) + return cursor.fetchone()[0] + except cx_Oracle.Error as e: + raise Exception("Oracle Error: {}".format(e)) diff --git a/bin/migrate-files/migrate-files.py b/bin/migrate-files/migrate-files.py index 40e8e29676..fe6b62f1e8 100644 --- a/bin/migrate-files/migrate-files.py +++ b/bin/migrate-files/migrate-files.py @@ -1,31 +1,31 @@ -import os -from dotenv import load_dotenv import cx_Oracle import boto3 -from tqdm import tqdm -import pickle +from config import ( + db_host, + db_port, + db_service_name, + db_username, + db_password, + ecs_host, + ecs_access_key, + ecs_secret_key, +) +from application_docs import import_application_docs +from planning_docs import import_planning_review_docs +from issue_docs import import_issue_docs +import argparse +import sys -# Load environment variables from .env file -load_dotenv() -# Load the database connection secrets from environment variables -db_username = os.getenv("DB_USERNAME") -db_password = os.getenv("DB_PASSWORD") -db_dsn = os.getenv("DB_DSN") +# Connect to the Oracle database # db_path = os.getenv("DB_PATH") # only necessary if running on M1 +db_dsn = cx_Oracle.makedsn(db_host, db_port, service_name=db_service_name) -# Connect to the Oracle database # cx_Oracle.init_oracle_client(lib_dir=db_path) # only necessary if running on M1 conn = cx_Oracle.connect( user=db_username, password=db_password, dsn=db_dsn, encoding="UTF-8" ) -# Load the ECS connection secrets from environment variables -ecs_host = os.getenv("ECS_HOSTNAME") -ecs_bucket = os.getenv("ECS_BUCKET") -ecs_access_key = os.getenv("ECS_ACCESS_KEY") -ecs_secret_key = os.getenv("ECS_SECRET_KEY") - # Connect to S3 s3 = boto3.client( "s3", @@ -34,228 +34,66 @@ use_ssl=True, endpoint_url=ecs_host, ) - -def application_docs(starting_document_id,batch,cursor): - # Get total number of files - try: - cursor.execute ('SELECT COUNT(*) FROM OATS.OATS_DOCUMENTS WHERE dbms_lob.getLength(DOCUMENT_BLOB) > 0 AND ALR_APPLICATION_ID IS NOT NULL') - except cx_Oracle.Error as e: - error, = e.args - print(error.message) - - application_count = cursor.fetchone()[0] - print('Application count =', application_count) - - # # Execute the SQL query to retrieve the BLOB data and key column - cursor.execute(f""" - SELECT DOCUMENT_ID, ALR_APPLICATION_ID, FILE_NAME, DOCUMENT_BLOB, DOCUMENT_CODE, DESCRIPTION, DOCUMENT_SOURCE_CODE, UPLOADED_DATE, WHEN_UPDATED, REVISION_COUNT, dbms_lob.getLength(DOCUMENT_BLOB) as LENGTH - FROM OATS.OATS_DOCUMENTS - WHERE dbms_lob.getLength(DOCUMENT_BLOB) > 0 - AND DOCUMENT_ID > {starting_document_id} - AND ALR_APPLICATION_ID IS NOT NULL - ORDER BY DOCUMENT_ID ASC - """) - - # Track progress - documents_processed = 0 - last_document_id = 0 - - try: - with tqdm(total=application_count, unit="file", desc="Uploading application files to S3") as pbar: - while True: - # Fetch the next batch of BLOB data - data = cursor.fetchmany(batch) - if not data: - break - # Upload the batch to S3 with a progress bar - for document_id, application_id, filename, file, code, description, source, created, updated, revision, length in data: - tqdm.write(f"{application_id}/{document_id}_{filename}") - - with tqdm(total=length, unit="B", unit_scale=True, desc=filename) as pbar2: - s3.upload_fileobj(file, ecs_bucket, f"migrate/application/{application_id}/{document_id}_{filename}", - Callback=lambda bytes_transferred: pbar2.update(bytes_transferred),) - pbar.update(1) - last_document_id = document_id - documents_processed += 1 - - except Exception as e: - print("Something went wrong with application document upload:",e) - print("Processed", documents_processed, "application files") - - # Set resume status in case of interuption - with open('last-file.pickle', 'wb') as file: - pickle.dump(last_document_id, file) - - cursor.close() - conn.close() - exit() - - # Display results - print("Process complete: Successfully migrated", documents_processed, "out of", application_count, "application files.") - - with open('last-file.pickle', 'wb') as file: - pickle.dump(last_document_id, file) - - return - -def planning_docs(starting_planning_document_id,batch,cursor): - # Get total number of files - try: - cursor.execute ('SELECT COUNT(*) FROM OATS.OATS_DOCUMENTS WHERE dbms_lob.getLength(DOCUMENT_BLOB) > 0 AND PLANNING_REVIEW_ID IS NOT NULL') - except cx_Oracle.Error as e: - error, = e.args - print(error.message) - - planning_review_count = cursor.fetchone()[0] - print('Planning_review count =', planning_review_count) - - # # Execute the SQL query to retrieve the BLOB data and key column - cursor.execute(f""" - SELECT DOCUMENT_ID, PLANNING_REVIEW_ID, FILE_NAME, DOCUMENT_BLOB, DOCUMENT_CODE, DESCRIPTION, DOCUMENT_SOURCE_CODE, UPLOADED_DATE, WHEN_UPDATED, REVISION_COUNT, dbms_lob.getLength(DOCUMENT_BLOB) as LENGTH - FROM OATS.OATS_DOCUMENTS - WHERE dbms_lob.getLength(DOCUMENT_BLOB) > 0 - AND DOCUMENT_ID > {starting_planning_document_id} - AND PLANNING_REVIEW_ID IS NOT NULL - ORDER BY DOCUMENT_ID ASC - """) - - # Track progress - documents_processed = 0 - last_planning_document_id = 0 - - try: - with tqdm(total=planning_review_count, unit="file", desc="Uploading planning_review files to S3") as pbar: - while True: - # Fetch the next batch of BLOB data - data = cursor.fetchmany(batch) - if not data: - break - # Upload the batch to S3 with a progress bar - for document_id, planning_review_id, filename, file, code, description, source, created, updated, revision, length in data: - tqdm.write(f"{planning_review_id}/{document_id}_{filename}") - - with tqdm(total=length, unit="B", unit_scale=True, desc=filename) as pbar2: - s3.upload_fileobj(file, ecs_bucket, f"migrate/planning_review/{planning_review_id}/{document_id}_{filename}", - Callback=lambda bytes_transferred: pbar2.update(bytes_transferred),) - pbar.update(1) - last_planning_document_id = document_id - documents_processed += 1 - - except Exception as e: - print("Something went wrong with planning_review document upload:",e) - print("Processed", documents_processed, "planning_review files") - - # Set resume status in case of interuption - with open('last-planning-file.pickle', 'wb') as file: - pickle.dump(last_planning_document_id, file) - - cursor.close() - conn.close() - exit() - - # Display results - print("Process complete: Successfully migrated", documents_processed, "out of", planning_review_count, "planning_review files.") - - with open('last-planning-file.pickle', 'wb') as file: - pickle.dump(last_planning_document_id, file) - - return - -def issue_docs(starting_issue_document_id,batch,cursor): - # Get total number of files - try: - cursor.execute ('SELECT COUNT(*) FROM OATS.OATS_DOCUMENTS WHERE dbms_lob.getLength(DOCUMENT_BLOB) > 0 AND ISSUE_ID IS NOT NULL') - except cx_Oracle.Error as e: - error, = e.args - print(error.message) - - issue_count = cursor.fetchone()[0] - print('Issue count =', issue_count) - - # # Execute the SQL query to retrieve the BLOB data and key column - cursor.execute(f""" - SELECT DOCUMENT_ID, ISSUE_ID, FILE_NAME, DOCUMENT_BLOB, DOCUMENT_CODE, DESCRIPTION, DOCUMENT_SOURCE_CODE, UPLOADED_DATE, WHEN_UPDATED, REVISION_COUNT, dbms_lob.getLength(DOCUMENT_BLOB) as LENGTH - FROM OATS.OATS_DOCUMENTS - WHERE dbms_lob.getLength(DOCUMENT_BLOB) > 0 - AND DOCUMENT_ID > {starting_issue_document_id} - AND ISSUE_ID IS NOT NULL - ORDER BY DOCUMENT_ID ASC - """) - - # Track progress - documents_processed = 0 - last_issue_document_id = 0 - - try: - with tqdm(total=issue_count, unit="file", desc="Uploading issue files to S3") as pbar: - while True: - # Fetch the next batch of BLOB data - data = cursor.fetchmany(batch) - if not data: - break - # Upload the batch to S3 with a progress bar - for document_id, issue_id, filename, file, code, description, source, created, updated, revision, length in data: - tqdm.write(f"{issue_id}/{document_id}_{filename}") - - with tqdm(total=length, unit="B", unit_scale=True, desc=filename) as pbar2: - s3.upload_fileobj(file, ecs_bucket, f"migrate/issue/{issue_id}/{document_id}_{filename}", - Callback=lambda bytes_transferred: pbar2.update(bytes_transferred),) - pbar.update(1) - last_issue_document_id = document_id - documents_processed += 1 - - except Exception as e: - print("Something went wrong with issue document upload:",e) - print("Processed", documents_processed, "issue files") - - # Set resume status in case of interuption - with open('last-issue-file.pickle', 'wb') as file: - pickle.dump(last_issue_document_id, file) - - cursor.close() - conn.close() - exit() - - # Display results - print("Process complete: Successfully migrated", documents_processed, "out of", issue_count, "issue files.") - - with open('last-issue-file.pickle', 'wb') as file: - pickle.dump(last_issue_document_id, file) - - return - -starting_document_id = 0 -# Determine job resume status -if os.path.isfile('last-file.pickle'): - with open('last-file.pickle', 'rb') as file: - starting_document_id = pickle.load(file) - print('Starting applications from:', starting_document_id) - -starting_planning_document_id = 0 -# Determine job resume status -if os.path.isfile('last-planning-file.pickle'): - with open('last-planning-file.pickle', 'rb') as file: - starting_planning_document_id = pickle.load(file) - print('Starting planning_reviews from:', starting_planning_document_id) - -starting_issue_document_id = 0 -# Determine job resume status -if os.path.isfile('last-issue-file.pickle'): - with open('last-issue-file.pickle', 'rb') as file: - starting_issue_document_id = pickle.load(file) - print('Starting issues from:', starting_issue_document_id) - cursor = conn.cursor() # Set batch size -batch_size = 10 - -application_docs(starting_document_id,batch_size,cursor) -planning_docs(starting_planning_document_id,batch_size,cursor) -issue_docs(starting_issue_document_id,batch_size,cursor) - -print('File upload complete, closing connection') - -# Close the database cursor and connection -cursor.close() -conn.close() \ No newline at end of file +batch_size = 1000 + + +def main(args): + args = _parse_command_line_args(args) + + start_document_id = int(args.start_document_id) + end_document_id = int(args.end_document_id) + last_imported_document_id = int(args.last_imported_document_id) + + if args.document_type == "application": + import_application_docs( + batch_size, + cursor, + conn, + s3, + start_document_id, + end_document_id, + last_imported_document_id, + ) + elif args.document_type == "planning": + import_planning_review_docs(batch_size, cursor, conn, s3) + elif args.document_type == "issue": + import_issue_docs(batch_size, cursor, conn, s3) + + print("File upload complete, closing connection") + + # Close the database cursor and connection + cursor.close() + conn.close() + + +def _parse_command_line_args(args): + parser = argparse.ArgumentParser() + parser.add_argument( + "document_type", + choices=["application", "planning", "issue"], + help="Document type to be processed", + ) + parser.add_argument( + "--start_document_id", + default=0, + help="Integer DOCUMENT_ID from Oracle to start from (is not included into upload)", + ) + parser.add_argument( + "--end_document_id", + default=0, + help="Integer DOCUMENT_ID from Oracle to stop when reached (included into upload)", + ) + parser.add_argument( + "--last_imported_document_id", + default=0, + help="Integer DOCUMENT_ID from Oracle to stop when reached (included into upload)", + ) + args = parser.parse_args(args) + return args + + +if __name__ == "__main__": + main(sys.argv[1:]) diff --git a/bin/migrate-files/planning_docs/__init__.py b/bin/migrate-files/planning_docs/__init__.py new file mode 100644 index 0000000000..2925b09391 --- /dev/null +++ b/bin/migrate-files/planning_docs/__init__.py @@ -0,0 +1 @@ +from .planning_docs_import import import_planning_review_docs diff --git a/bin/migrate-files/planning_docs/planning_docs_import.py b/bin/migrate-files/planning_docs/planning_docs_import.py new file mode 100644 index 0000000000..f24767684d --- /dev/null +++ b/bin/migrate-files/planning_docs/planning_docs_import.py @@ -0,0 +1,160 @@ +from tqdm import tqdm +import cx_Oracle +from common import ( + LAST_IMPORTED_PLANNING_FILE, + DocumentUploadBasePath, + upload_file_to_s3, + get_starting_document_id, + get_max_file_size, + EntityType, + handle_document_processing_error, + fetch_data_from_oracle, + process_results, + get_last_successfully_uploaded_file_from_log, +) + + +def import_planning_review_docs(batch, cursor, conn, s3): + starting_document_id = get_last_successfully_uploaded_file_from_log( + LAST_IMPORTED_PLANNING_FILE, EntityType.PLANNING.value + ) + + # Get total number of files + documents_count = _get_total_number_of_files(cursor) + offset = _get_total_number_of_transferred_files(cursor, starting_document_id) + print(f"{EntityType.PLANNING.value} count = {documents_count} offset = {offset}") + + # Track progress + documents_processed = 0 + last_document_id = starting_document_id + + try: + with tqdm( + total=documents_count, + unit="file", + desc=f"Uploading {EntityType.PLANNING.value} files to S3", + ) as documents_upload_progress_bar: + while True: + starting_document_id = get_starting_document_id( + starting_document_id, last_document_id, EntityType.PLANNING.value + ) + max_file_size = get_max_file_size(cursor) + + params = { + "starting_document_id": starting_document_id, + "max_file_size": max_file_size, + "batch_size": batch, + } + data = fetch_data_from_oracle(_document_query, cursor, params) + + if not data: + break + # Upload the batch to S3 with a progress bar + for ( + file_size, + document_id, + planning_review_id, + filename, + file, + ) in data: + tqdm.write(f"{planning_review_id}/{document_id}_{filename}") + + upload_file_to_s3( + s3, + DocumentUploadBasePath.PLANNING.value, + file_size, + document_id, + planning_review_id, + filename, + file, + ) + + documents_upload_progress_bar.update(1) + last_document_id = document_id + documents_processed += 1 + + except Exception as error: + handle_document_processing_error( + cursor, + conn, + error, + EntityType.PLANNING.value, + documents_processed, + last_document_id, + LAST_IMPORTED_PLANNING_FILE, + ) + + # Display results + process_results( + EntityType.PLANNING.value, + documents_count, + documents_processed, + last_document_id, + LAST_IMPORTED_PLANNING_FILE + ) + + return + + +_document_query = """ + WITH documents_with_cumulative_file_size AS ( + SELECT + ROW_NUMBER() OVER( + ORDER BY DOCUMENT_ID ASC + ) row_num, + dbms_lob.getLength(DOCUMENT_BLOB) file_size, + SUM(dbms_lob.getLength(DOCUMENT_BLOB)) OVER (ORDER BY DOCUMENT_ID ASC ROWS UNBOUNDED PRECEDING) AS cumulative_file_size, + DOCUMENT_ID, + PLANNING_REVIEW_ID, + FILE_NAME, + DOCUMENT_BLOB, + DOCUMENT_CODE, + DESCRIPTION, + DOCUMENT_SOURCE_CODE, + UPLOADED_DATE, + WHEN_UPDATED, + REVISION_COUNT + FROM + OATS.OATS_DOCUMENTS + WHERE + dbms_lob.getLength(DOCUMENT_BLOB) > 0 + AND DOCUMENT_ID > :starting_document_id + AND PLANNING_REVIEW_ID IS NOT NULL + ORDER BY + DOCUMENT_ID ASC + ) + SELECT + file_size, + DOCUMENT_ID, + PLANNING_REVIEW_ID, + FILE_NAME, + DOCUMENT_BLOB + FROM + documents_with_cumulative_file_size + WHERE + cumulative_file_size < :max_file_size + AND row_num < :batch_size + ORDER BY + DOCUMENT_ID ASC + """ + + +def _get_total_number_of_files(cursor): + try: + cursor.execute( + "SELECT COUNT(*) FROM OATS.OATS_DOCUMENTS WHERE dbms_lob.getLength(DOCUMENT_BLOB) > 0 AND PLANNING_REVIEW_ID IS NOT NULL" + ) + return cursor.fetchone()[0] + except cx_Oracle.Error as e: + raise Exception("Oracle Error: {}".format(e)) + + +def _get_total_number_of_transferred_files(cursor, document_id): + try: + cursor.execute( + "SELECT COUNT(*) FROM OATS.OATS_DOCUMENTS WHERE dbms_lob.getLength(DOCUMENT_BLOB) > 0 AND PLANNING_REVIEW_ID IS NOT NULL AND DOCUMENT_ID < :document_id", + {"document_id": document_id}, + ) + return cursor.fetchone()[0] + except cx_Oracle.Error as e: + raise Exception("Oracle Error: {}".format(e)) From 210683b767f691184548f79f1854f7e916131085 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Fri, 15 Sep 2023 14:24:46 -0700 Subject: [PATCH 389/954] Add SRW Cards and SRW Board * Add notification card dialog * Add new board, with new statuses * Prevent allowing create for NOTIs on any board * Auto-create GIS Subtask and move card to NOTI board on Submission --- .../board-management-dialog.component.html | 6 +- .../board-management-dialog.component.ts | 5 + .../app/features/board/board.component.html | 48 ++++--- .../features/board/board.component.spec.ts | 28 ++++ .../src/app/features/board/board.component.ts | 34 ++++- .../src/app/features/board/board.module.ts | 2 + .../notification-dialog.component.html | 132 ++++++++++++++++++ .../notification-dialog.component.spec.ts | 118 ++++++++++++++++ .../notification-dialog.component.ts | 110 +++++++++++++++ .../src/app/services/board/board.dto.ts | 2 + .../services/notification/notification.dto.ts | 3 +- .../transferees/transferees.component.spec.ts | 7 + .../transferees/transferees.component.ts | 13 +- .../notification-details.component.html | 1 + .../board-management.controller.ts | 2 +- .../src/alcs/board/board.controller.spec.ts | 10 ++ .../alcs/src/alcs/board/board.controller.ts | 7 + .../apps/alcs/src/alcs/board/board.module.ts | 2 + .../notification/notification.service.spec.ts | 33 ++++- .../alcs/notification/notification.service.ts | 19 ++- .../migrations/1694803254582-add_srw_board.ts | 38 +++++ 21 files changed, 586 insertions(+), 34 deletions(-) create mode 100644 alcs-frontend/src/app/features/board/dialogs/notification/notification-dialog.component.html create mode 100644 alcs-frontend/src/app/features/board/dialogs/notification/notification-dialog.component.spec.ts create mode 100644 alcs-frontend/src/app/features/board/dialogs/notification/notification-dialog.component.ts create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1694803254582-add_srw_board.ts diff --git a/alcs-frontend/src/app/features/admin/board-management/board-management-dialog/board-management-dialog.component.html b/alcs-frontend/src/app/features/admin/board-management/board-management-dialog/board-management-dialog.component.html index 173ec575be..36cd4678e9 100644 --- a/alcs-frontend/src/app/features/admin/board-management/board-management-dialog/board-management-dialog.component.html +++ b/alcs-frontend/src/app/features/admin/board-management/board-management-dialog/board-management-dialog.component.html @@ -40,9 +40,7 @@

{{ isEdit ? 'Edit' : 'Create' }} Board

Click to add columns*
-
- Disabled columns have cards and cannot be removed from the board -
+
Disabled columns have cards and cannot be removed from the board
  • @@ -70,7 +68,7 @@

    {{ isEdit ? 'Edit' : 'Create' }} Board

    Create Card Types - + {{ cardTypeMap[cardType] }} diff --git a/alcs-frontend/src/app/features/admin/board-management/board-management-dialog/board-management-dialog.component.ts b/alcs-frontend/src/app/features/admin/board-management/board-management-dialog/board-management-dialog.component.ts index bed89d78fb..c899c75e6e 100644 --- a/alcs-frontend/src/app/features/admin/board-management/board-management-dialog/board-management-dialog.component.ts +++ b/alcs-frontend/src/app/features/admin/board-management/board-management-dialog/board-management-dialog.component.ts @@ -42,6 +42,7 @@ export class BoardManagementDialogComponent implements OnInit { selectedCardStatuses: CardStatusDto[] = []; cardTypeMap: Record = {}; cardCounts: Record = {}; + allowedCreateCardTypes: CardType[] = []; constructor( @Inject(MAT_DIALOG_DATA) @@ -95,6 +96,10 @@ export class BoardManagementDialogComponent implements OnInit { onNextStep() { this.step++; + //We don't support creating Notifications + this.allowedCreateCardTypes = (this.permittedCardTypes.value ?? []).filter( + (cardType) => cardType !== CardType.NOTIFICATION + ); } onPreviousStep() { diff --git a/alcs-frontend/src/app/features/board/board.component.html b/alcs-frontend/src/app/features/board/board.component.html index 185018f3da..d23f632647 100644 --- a/alcs-frontend/src/app/features/board/board.component.html +++ b/alcs-frontend/src/app/features/board/board.component.html @@ -7,24 +7,36 @@

- - - - - - - - - - + + + + + + + + + + + +
diff --git a/alcs-frontend/src/app/features/board/board.component.spec.ts b/alcs-frontend/src/app/features/board/board.component.spec.ts index 89e328f90b..e095242b07 100644 --- a/alcs-frontend/src/app/features/board/board.component.spec.ts +++ b/alcs-frontend/src/app/features/board/board.component.spec.ts @@ -21,6 +21,8 @@ import { CovenantDto } from '../../services/covenant/covenant.dto'; import { CovenantService } from '../../services/covenant/covenant.service'; import { NoticeOfIntentModificationService } from '../../services/notice-of-intent/notice-of-intent-modification/notice-of-intent-modification.service'; import { NoticeOfIntentService } from '../../services/notice-of-intent/notice-of-intent.service'; +import { NotificationDto } from '../../services/notification/notification.dto'; +import { NotificationService } from '../../services/notification/notification.service'; import { PlanningReviewDto } from '../../services/planning-review/planning-review.dto'; import { PlanningReviewService } from '../../services/planning-review/planning-review.service'; import { ToastService } from '../../services/toast/toast.service'; @@ -44,6 +46,7 @@ describe('BoardComponent', () => { let titleService: DeepMocked; let noticeOfIntentService: DeepMocked<NoticeOfIntentService>; let noticeOfIntentModificationService: DeepMocked<NoticeOfIntentModificationService>; + let notificationService: DeepMocked<NotificationService>; let boardEmitter = new BehaviorSubject<BoardWithFavourite[]>([]); @@ -97,6 +100,7 @@ describe('BoardComponent', () => { reconsiderations: [], noticeOfIntents: [], noiModifications: [], + notifications: [], }); dialog = createMock(); @@ -111,6 +115,7 @@ describe('BoardComponent', () => { titleService = createMock(); noticeOfIntentService = createMock(); noticeOfIntentModificationService = createMock(); + notificationService = createMock(); const params = { boardCode: 'boardCode', @@ -176,6 +181,10 @@ describe('BoardComponent', () => { provide: NoticeOfIntentModificationService, useValue: noticeOfIntentModificationService, }, + { + provide: NotificationService, + useValue: notificationService, + }, { provide: Title, useValue: titleService, @@ -218,6 +227,7 @@ describe('BoardComponent', () => { reconsiderations: [], noticeOfIntents: [], noiModifications: [], + notifications: [], }); boardEmitter.next([mockBoard]); @@ -238,6 +248,7 @@ describe('BoardComponent', () => { reconsiderations: [mockRecon], noticeOfIntents: [], noiModifications: [], + notifications: [], }); boardEmitter.next([mockBoard]); @@ -280,6 +291,7 @@ describe('BoardComponent', () => { reconsiderations: [], noticeOfIntents: [], noiModifications: [], + notifications: [], }); boardEmitter.next([mockBoard]); @@ -356,6 +368,22 @@ describe('BoardComponent', () => { expect(dialog.open).toHaveBeenCalledTimes(1); }); + it('should load notification and open dialog when url is set', async () => { + notificationService.fetchByCardUuid.mockResolvedValue({} as NotificationDto); + + queryParamMapEmitter.next( + new Map([ + ['card', 'app-id'], + ['type', CardType.NOTIFICATION], + ]) + ); + + await sleep(1); + + expect(notificationService.fetchByCardUuid).toHaveBeenCalledTimes(1); + expect(dialog.open).toHaveBeenCalledTimes(1); + }); + it('should show an error toast if fetching data fails', async () => { covenantService.fetchByCardUuid.mockRejectedValue({}); diff --git a/alcs-frontend/src/app/features/board/board.component.ts b/alcs-frontend/src/app/features/board/board.component.ts index 28e8d032f5..a6e392f090 100644 --- a/alcs-frontend/src/app/features/board/board.component.ts +++ b/alcs-frontend/src/app/features/board/board.component.ts @@ -21,6 +21,8 @@ import { NoticeOfIntentModificationDto } from '../../services/notice-of-intent/n import { NoticeOfIntentModificationService } from '../../services/notice-of-intent/notice-of-intent-modification/notice-of-intent-modification.service'; import { NoticeOfIntentDto } from '../../services/notice-of-intent/notice-of-intent.dto'; import { NoticeOfIntentService } from '../../services/notice-of-intent/notice-of-intent.service'; +import { NotificationDto } from '../../services/notification/notification.dto'; +import { NotificationService } from '../../services/notification/notification.service'; import { PlanningReviewDto } from '../../services/planning-review/planning-review.dto'; import { PlanningReviewService } from '../../services/planning-review/planning-review.service'; import { ToastService } from '../../services/toast/toast.service'; @@ -43,6 +45,7 @@ import { CreateNoiModificationDialogComponent } from './dialogs/noi-modification import { NoiModificationDialogComponent } from './dialogs/noi-modification/noi-modification-dialog.component'; import { CreateNoticeOfIntentDialogComponent } from './dialogs/notice-of-intent/create/create-notice-of-intent-dialog.component'; import { NoticeOfIntentDialogComponent } from './dialogs/notice-of-intent/notice-of-intent-dialog.component'; +import { NotificationDialogComponent } from './dialogs/notification/notification-dialog.component'; import { CreatePlanningReviewDialogComponent } from './dialogs/planning-review/create/create-planning-review-dialog.component'; import { PlanningReviewDialogComponent } from './dialogs/planning-review/planning-review-dialog.component'; import { CreateReconsiderationDialogComponent } from './dialogs/reconsiderations/create/create-reconsideration-dialog.component'; @@ -92,6 +95,7 @@ export class BoardComponent implements OnInit, OnDestroy { private covenantService: CovenantService, private noticeOfIntentService: NoticeOfIntentService, private noiModificationService: NoticeOfIntentModificationService, + private notificationService: NotificationService, private titleService: Title ) {} @@ -195,6 +199,7 @@ export class BoardComponent implements OnInit, OnDestroy { case CardType.COV: case CardType.NOI: case CardType.NOI_MODI: + case CardType.NOTIFICATION: this.cardService .updateCard({ uuid: $event.id, @@ -251,6 +256,7 @@ export class BoardComponent implements OnInit, OnDestroy { const mappedNoticeOfIntentModifications = response.noiModifications.map( this.mapNoticeOfIntentModificationToCard.bind(this) ); + const mappedNotifications = response.notifications.map(this.mapNotificationToCard.bind(this)); if (boardCode === BOARD_TYPE_CODES.VETT) { const vettingSort = (a: CardData, b: CardData) => { if (a.highPriority === b.highPriority) { @@ -262,6 +268,7 @@ export class BoardComponent implements OnInit, OnDestroy { ...[...mappedNoticeOfIntents, ...mappedNoticeOfIntentModifications].sort(vettingSort), ...[...mappedApps, ...mappedRecons, ...mappedModifications].sort(vettingSort), ...[...mappedReviewMeetings, ...mappedCovenants].sort(vettingSort), + ...mappedNotifications, ]; } else if (boardCode === BOARD_TYPE_CODES.NOI) { const noiSort = (a: CardData, b: CardData) => { @@ -286,6 +293,7 @@ export class BoardComponent implements OnInit, OnDestroy { ...mappedModifications, ...mappedReviewMeetings, ...mappedCovenants, + ...mappedNotifications, ].sort(noiSort); } else { const sorted = []; @@ -300,6 +308,7 @@ export class BoardComponent implements OnInit, OnDestroy { ...mappedRecons.filter((r) => r.highPriority).sort((a, b) => a.dateReceived - b.dateReceived), ...mappedReviewMeetings.filter((r) => r.highPriority).sort((a, b) => a.dateReceived - b.dateReceived), ...mappedCovenants.filter((r) => r.highPriority).sort((a, b) => a.dateReceived - b.dateReceived), + ...mappedNotifications.filter((r) => r.highPriority).sort((a, b) => a.dateReceived - b.dateReceived), // non-high priority ...mappedNoticeOfIntents .filter((a) => !a.highPriority) @@ -311,7 +320,8 @@ export class BoardComponent implements OnInit, OnDestroy { ...mappedModifications.filter((r) => !r.highPriority).sort((a, b) => a.dateReceived - b.dateReceived), ...mappedRecons.filter((r) => !r.highPriority).sort((a, b) => a.dateReceived - b.dateReceived), ...mappedReviewMeetings.filter((r) => !r.highPriority).sort((a, b) => a.dateReceived - b.dateReceived), - ...mappedCovenants.filter((r) => !r.highPriority).sort((a, b) => a.dateReceived - b.dateReceived) + ...mappedCovenants.filter((r) => !r.highPriority).sort((a, b) => a.dateReceived - b.dateReceived), + ...mappedNotifications.filter((r) => !r.highPriority).sort((a, b) => a.dateReceived - b.dateReceived) ); this.cards = sorted; } @@ -451,6 +461,24 @@ export class BoardComponent implements OnInit, OnDestroy { }; } + private mapNotificationToCard(notification: NotificationDto): CardData { + return { + status: notification.card.status.code, + typeLabel: 'Notification', + title: `${notification.fileNumber} (${notification.applicant})`, + titleTooltip: notification.applicant, + assignee: notification.card.assignee, + id: notification.card.uuid, + labels: [notification.type], + cardType: CardType.NOTIFICATION, + paused: false, + highPriority: notification.card.highPriority, + cardUuid: notification.card.uuid, + dateReceived: notification.card.createdAt, + cssClasses: ['notification'], + }; + } + private openDialog(component: ComponentType<any>, data: any) { const dialogRef = this.dialog.open(component, { minWidth: '600px', @@ -507,6 +535,10 @@ export class BoardComponent implements OnInit, OnDestroy { const noiModification = await this.noiModificationService.fetchByCardUuid(card.uuid); this.openDialog(NoiModificationDialogComponent, noiModification); break; + case CardType.NOTIFICATION: + const notification = await this.notificationService.fetchByCardUuid(card.uuid); + this.openDialog(NotificationDialogComponent, notification); + break; default: console.error('Card type is not configured for a dialog'); this.toastService.showErrorToast('Failed to open card'); diff --git a/alcs-frontend/src/app/features/board/board.module.ts b/alcs-frontend/src/app/features/board/board.module.ts index 67d5955ecf..514088bcb9 100644 --- a/alcs-frontend/src/app/features/board/board.module.ts +++ b/alcs-frontend/src/app/features/board/board.module.ts @@ -23,6 +23,7 @@ import { CreateNoiModificationDialogComponent } from './dialogs/noi-modification import { NoiModificationDialogComponent } from './dialogs/noi-modification/noi-modification-dialog.component'; import { CreateNoticeOfIntentDialogComponent } from './dialogs/notice-of-intent/create/create-notice-of-intent-dialog.component'; import { NoticeOfIntentDialogComponent } from './dialogs/notice-of-intent/notice-of-intent-dialog.component'; +import { NotificationDialogComponent } from './dialogs/notification/notification-dialog.component'; import { CreatePlanningReviewDialogComponent } from './dialogs/planning-review/create/create-planning-review-dialog.component'; import { PlanningReviewDialogComponent } from './dialogs/planning-review/planning-review-dialog.component'; import { CreateReconsiderationDialogComponent } from './dialogs/reconsiderations/create/create-reconsideration-dialog.component'; @@ -61,6 +62,7 @@ const routes: Routes = [ CreateNoticeOfIntentDialogComponent, CreateNoiModificationDialogComponent, NoiModificationDialogComponent, + NotificationDialogComponent, ], imports: [ CommonModule, diff --git a/alcs-frontend/src/app/features/board/dialogs/notification/notification-dialog.component.html b/alcs-frontend/src/app/features/board/dialogs/notification/notification-dialog.component.html new file mode 100644 index 0000000000..79cfda5d49 --- /dev/null +++ b/alcs-frontend/src/app/features/board/dialogs/notification/notification-dialog.component.html @@ -0,0 +1,132 @@ +<div mat-dialog-title> + <div class="close"> + <h6 class="card-type-label">Notification</h6> + <button mat-icon-button [mat-dialog-close]="isDirty"> + <mat-icon>close</mat-icon> + </button> + </div> + <div class="header-row"> + <div class="left"> + <h3 class="card-title"> + <span class="margin-right">{{ cardTitle }}</span> + <app-application-type-pill [type]="notification.type"></app-application-type-pill> + </h3> + </div> + <div class="center"> + <button + mat-flat-button + color="accent" + [mat-dialog-close]="isDirty" + [routerLink]="['notification', notification.fileNumber]" + > + View Detail + </button> + </div> + </div> + <div> + <span class="region">{{ notification.localGovernment.name }} - {{ notification.region.label }} Region</span> + </div> + <div class="header-row"> + <div class="left"> + <app-application-submission-status-type-pill + *ngIf="status" + [type]="status" + ></app-application-submission-status-type-pill> + </div> + <div class="right"> + <ng-container *ngIf="allowedBoards.length > 1"> + <button matTooltip="Move Board" [matMenuTriggerFor]="moveMenu" mat-icon-button> + <mat-icon>move_down</mat-icon> + </button> + <mat-menu class="move-board-menu" xPosition="before" #moveMenu="matMenu"> + <button (click)="onBoardSelected(board)" *ngFor="let board of allowedBoards" mat-menu-item> + <div class="board-menu-item"> + <span class="favourite-board-icon-container" + ><mat-icon *ngIf="board.isFavourite" class="favourite-board-icon">star</mat-icon> + </span> + <span>{{ board.title }}</span> + <span *ngIf="card && card!.boardCode === board.code" + ><mat-icon class="selected-board-icon">check</mat-icon></span + > + </div> + </button> + </mat-menu> + </ng-container> + <button + *ngIf="canArchive" + matTooltip="Archive Card" + class="toggle-priority" + (click)="onArchiveCard()" + mat-icon-button + > + <mat-icon>archive</mat-icon> + </button> + <button + *ngIf="card" + [matTooltip]="card.highPriority ? 'Remove Priority' : 'Add Priority'" + class="toggle-priority" + (click)="onTogglePriority()" + mat-icon-button + > + <div + class="priority" + [ngClass]="{ + 'filled-priority': card.highPriority, + 'empty-priority': !card.highPriority + }" + ></div> + </button> + </div> + </div> +</div> +<mat-dialog-content> + <div class="select-container"> + <ng-select + class="card-type" + [items]="boardStatuses" + appearance="outline" + placeholder="Workflow Stage" + bindLabel="label" + bindValue="statusCode" + [clearable]="false" + [(ngModel)]="selectedApplicationStatus" + (change)="onStatusSelected($event)" + > + <ng-template ng-option-tmp let-item="item"> + <span [innerHTML]="item.label"> </span> + </ng-template> + <ng-template ng-label-tmp let-item="item"> + <span [innerHTML]="item.label"> </span> + </ng-template> + </ng-select> + <ng-select + class="card-assignee" + appearance="outline" + [items]="$users | async" + placeholder="Assigned Planner" + bindLabel="prettyName" + bindValue="prettyName" + [(ngModel)]="selectedAssigneeName" + [searchFn]="filterAssigneeList" + (change)="onAssigneeSelected($event)" + > + <ng-template ng-option-tmp let-item="item" let-search="searchTerm"> + <div class="assignee-card-body"> + <p [ngOptionHighlight]="search" class="assignee-card-name">{{ item.prettyName }}</p> + <p class="assignee-card-email" [ngOptionHighlight]="search">{{ item.email }}</p> + </div> + </ng-template> + </ng-select> + </div> + <div class="subtasks-wrapper"> + <app-subtasks *ngIf="card" [cardUuid]="card.uuid"></app-subtasks> + </div> + <div class="card-comments-wrapper"> + <app-comments + *ngIf="card" + [cardUuid]="card.uuid" + [fileNumber]="notification.fileNumber" + [notificationTitle]="cardTitle" + ></app-comments> + </div> +</mat-dialog-content> diff --git a/alcs-frontend/src/app/features/board/dialogs/notification/notification-dialog.component.spec.ts b/alcs-frontend/src/app/features/board/dialogs/notification/notification-dialog.component.spec.ts new file mode 100644 index 0000000000..11df790940 --- /dev/null +++ b/alcs-frontend/src/app/features/board/dialogs/notification/notification-dialog.component.spec.ts @@ -0,0 +1,118 @@ +import { HttpClientTestingModule } from '@angular/common/http/testing'; +import { EventEmitter, NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; +import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; +import { RouterTestingModule } from '@angular/router/testing'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { ApplicationRegionDto, ApplicationTypeDto } from '../../../../services/application/application-code.dto'; +import { BoardService } from '../../../../services/board/board.service'; +import { CardDto } from '../../../../services/card/card.dto'; +import { NotificationDto } from '../../../../services/notification/notification.dto'; +import { AssigneeDto } from '../../../../services/user/user.dto'; +import { ConfirmationDialogService } from '../../../../shared/confirmation-dialog/confirmation-dialog.service'; +import { SharedModule } from '../../../../shared/shared.module'; +import { NotificationDialogComponent } from './notification-dialog.component'; + +describe('NotificationDialogComponent', () => { + let component: NotificationDialogComponent; + let fixture: ComponentFixture<NotificationDialogComponent>; + let mockBoardService: DeepMocked<BoardService>; + + const mockAssignee: AssigneeDto = { + uuid: '11111-11111-11111', + name: 'Dart', + initials: 'DP', + clientRoles: [], + email: 'email', + mentionLabel: 'mention-label', + prettyName: 'pretty-name', + }; + + const mockApplicationRegion: ApplicationRegionDto = { + label: 'test_st', + code: 'STATUS', + description: 'this is a test status', + }; + + const mockApplicationType: ApplicationTypeDto = { + label: 'test_ty', + code: 'TYPE', + description: 'this is a test type', + shortLabel: 'short_label', + textColor: '#000', + backgroundColor: '#fff', + }; + + const mockApplication: NotificationDto = { + uuid: '', + type: mockApplicationType, + region: mockApplicationRegion, + fileNumber: '1111', + applicant: 'I am an applicant', + localGovernment: { + uuid: 'fake', + name: 'Local Government', + preferredRegionCode: 'FAKE_CODE', + isFirstNation: false, + }, + summary: 'MOCK SUMMARY', + dateSubmittedToAlc: Date.now(), + card: { + boardCode: 'a', + assignee: mockAssignee, + highPriority: false, + status: { + code: 'card-status', + }, + } as CardDto, + }; + + beforeEach(async () => { + const mockDialogRef = { + close: jest.fn(), + afterClosed: jest.fn(), + backdropClick: () => new EventEmitter(), + subscribe: jest.fn(), + }; + + mockBoardService = createMock(); + mockBoardService.$boards = new EventEmitter(); + mockBoardService.fetchBoardDetail.mockResolvedValue({ + allowedCardTypes: [], + code: '', + createCardTypes: [], + showOnSchedule: false, + statuses: [], + title: '', + }); + + await TestBed.configureTestingModule({ + declarations: [NotificationDialogComponent], + imports: [HttpClientTestingModule, SharedModule, BrowserAnimationsModule, RouterTestingModule], + providers: [ + { provide: MAT_DIALOG_DATA, useValue: {} }, + { + provide: MatDialogRef, + useValue: mockDialogRef, + }, + { + provide: BoardService, + useValue: mockBoardService, + }, + { provide: ConfirmationDialogService, useValue: {} }, + ], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(NotificationDialogComponent); + component = fixture.componentInstance; + component.data = mockApplication; + component.boardStatuses = []; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/alcs-frontend/src/app/features/board/dialogs/notification/notification-dialog.component.ts b/alcs-frontend/src/app/features/board/dialogs/notification/notification-dialog.component.ts new file mode 100644 index 0000000000..2f423849b7 --- /dev/null +++ b/alcs-frontend/src/app/features/board/dialogs/notification/notification-dialog.component.ts @@ -0,0 +1,110 @@ +import { Component, Inject, OnInit } from '@angular/core'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; +import { Router } from '@angular/router'; +import { DEFAULT_NO_STATUS } from '../../../../services/application/application-submission-status/application-submission-status.dto'; +import { AuthenticationService } from '../../../../services/authentication/authentication.service'; +import { BoardService, BoardWithFavourite } from '../../../../services/board/board.service'; +import { CardService } from '../../../../services/card/card.service'; +import { NotificationSubmissionStatusService } from '../../../../services/notification/notification-submission-status/notification-submission-status.service'; +import { + NotificationDto, + NotificationSubmissionToSubmissionStatusDto, +} from '../../../../services/notification/notification.dto'; +import { NotificationService } from '../../../../services/notification/notification.service'; +import { ToastService } from '../../../../services/toast/toast.service'; +import { UserService } from '../../../../services/user/user.service'; +import { ApplicationSubmissionStatusPill } from '../../../../shared/application-submission-status-type-pill/application-submission-status-type-pill.component'; +import { ConfirmationDialogService } from '../../../../shared/confirmation-dialog/confirmation-dialog.service'; +import { CardDialogComponent } from '../card-dialog/card-dialog.component'; + +@Component({ + selector: 'app-detail-dialog', + templateUrl: './notification-dialog.component.html', + styleUrls: ['../card-dialog/card-dialog.component.scss'], +}) +export class NotificationDialogComponent extends CardDialogComponent implements OnInit { + selectedRegion?: string; + cardTitle = ''; + + notification: NotificationDto = this.data; + status?: ApplicationSubmissionStatusPill; + + constructor( + @Inject(MAT_DIALOG_DATA) public data: NotificationDto, + private dialogRef: MatDialogRef<NotificationDialogComponent>, + private notificationService: NotificationService, + private router: Router, + userService: UserService, + confirmationDialogService: ConfirmationDialogService, + boardService: BoardService, + toastService: ToastService, + cardService: CardService, + authService: AuthenticationService, + private notificationSubmissionStatusService: NotificationSubmissionStatusService + ) { + super(authService, dialogRef, cardService, confirmationDialogService, toastService, userService, boardService); + } + + override ngOnInit(): void { + super.ngOnInit(); + this.populateData(this.data); + } + + populateData(notification: NotificationDto) { + this.notification = notification; + this.populateCardData(notification.card!); + this.selectedRegion = notification.region?.code; + this.cardTitle = `${notification.fileNumber} (${notification.applicant})`; + this.populateSubmissionStatus(this.notification.fileNumber); + } + + async populateSubmissionStatus(fileNumber: string) { + let submissionStatus: NotificationSubmissionToSubmissionStatusDto | null = null; + + try { + submissionStatus = await this.notificationSubmissionStatusService.fetchCurrentStatusByFileNumber( + fileNumber, + false + ); + } catch (e) { + console.warn(`No statuses for ${fileNumber}. Is it a manually created submission?`); + } + + if (submissionStatus) { + this.status = { + backgroundColor: submissionStatus.status.alcsBackgroundColor, + textColor: submissionStatus.status.alcsColor, + label: submissionStatus.status.label, + }; + } else { + this.status = DEFAULT_NO_STATUS; + } + } + + async onBoardSelected(board: BoardWithFavourite) { + this.selectedBoard = board.code; + try { + await this.boardService.changeBoard(this.notification.card!.uuid, board.code); + const loadedBoard = await this.boardService.fetchBoardDetail(board.code); + if (loadedBoard) { + this.boardStatuses = loadedBoard.statuses; + } + + this.isDirty = true; + const toast = this.toastService.showSuccessToast(`Application moved to ${board.title}`, 'Go to Board'); + toast.onAction().subscribe(() => { + this.router.navigate(['/board', board.code]); + }); + await this.reloadNotification(); + } catch (e) { + this.toastService.showErrorToast('Failed to move to new board'); + } + } + + async reloadNotification() { + const notification = await this.notificationService.fetchByFileNumber(this.notification.fileNumber); + if (notification) { + this.populateData(notification); + } + } +} diff --git a/alcs-frontend/src/app/services/board/board.dto.ts b/alcs-frontend/src/app/services/board/board.dto.ts index 6832f731b8..082e631b4e 100644 --- a/alcs-frontend/src/app/services/board/board.dto.ts +++ b/alcs-frontend/src/app/services/board/board.dto.ts @@ -5,6 +5,7 @@ import { ApplicationDto } from '../application/application.dto'; import { CovenantDto } from '../covenant/covenant.dto'; import { NoticeOfIntentModificationDto } from '../notice-of-intent/notice-of-intent-modification/notice-of-intent-modification.dto'; import { NoticeOfIntentDto } from '../notice-of-intent/notice-of-intent.dto'; +import { NotificationDto } from '../notification/notification.dto'; import { PlanningReviewDto } from '../planning-review/planning-review.dto'; export interface MinimalBoardDto { @@ -34,4 +35,5 @@ export interface CardsDto { covenants: CovenantDto[]; noticeOfIntents: NoticeOfIntentDto[]; noiModifications: NoticeOfIntentModificationDto[]; + notifications: NotificationDto[]; } diff --git a/alcs-frontend/src/app/services/notification/notification.dto.ts b/alcs-frontend/src/app/services/notification/notification.dto.ts index 0c21da24e5..a85c2ba4aa 100644 --- a/alcs-frontend/src/app/services/notification/notification.dto.ts +++ b/alcs-frontend/src/app/services/notification/notification.dto.ts @@ -1,6 +1,7 @@ import { BaseCodeDto } from '../../shared/dto/base.dto'; import { LocalGovernmentDto } from '../admin-local-government/admin-local-government.dto'; import { ApplicationRegionDto } from '../application/application-code.dto'; +import { ApplicationLocalGovernmentDto } from '../application/application-local-government/application-local-government.dto'; import { CardDto } from '../card/card.dto'; export interface NotificationDto { @@ -9,7 +10,7 @@ export interface NotificationDto { applicant: string; card: CardDto; dateSubmittedToAlc?: number; - localGovernment: LocalGovernmentDto; + localGovernment: ApplicationLocalGovernmentDto; region: ApplicationRegionDto; summary?: string; type: NotificationTypeDto; diff --git a/portal-frontend/src/app/features/notifications/edit-submission/transferees/transferees.component.spec.ts b/portal-frontend/src/app/features/notifications/edit-submission/transferees/transferees.component.spec.ts index 4e99960555..3638a36f70 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/transferees/transferees.component.spec.ts +++ b/portal-frontend/src/app/features/notifications/edit-submission/transferees/transferees.component.spec.ts @@ -4,6 +4,7 @@ import { MatDialog } from '@angular/material/dialog'; import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { BehaviorSubject } from 'rxjs'; import { NotificationSubmissionDetailedDto } from '../../../../services/notification-submission/notification-submission.dto'; +import { NotificationSubmissionService } from '../../../../services/notification-submission/notification-submission.service'; import { NotificationTransfereeService } from '../../../../services/notification-transferee/notification-transferee.service'; import { TransfereesComponent } from './transferees.component'; @@ -12,9 +13,11 @@ describe('TransfereesComponent', () => { let component: TransfereesComponent; let fixture: ComponentFixture<TransfereesComponent>; let mockTransfereeService: DeepMocked<NotificationTransfereeService>; + let mockNotificationService: DeepMocked<NotificationSubmissionService>; beforeEach(async () => { mockTransfereeService = createMock(); + mockNotificationService = createMock(); await TestBed.configureTestingModule({ providers: [ @@ -22,6 +25,10 @@ describe('TransfereesComponent', () => { provide: NotificationTransfereeService, useValue: mockTransfereeService, }, + { + provide: NotificationSubmissionService, + useValue: mockNotificationService, + }, { provide: MatDialog, useValue: {}, diff --git a/portal-frontend/src/app/features/notifications/edit-submission/transferees/transferees.component.ts b/portal-frontend/src/app/features/notifications/edit-submission/transferees/transferees.component.ts index 7988c8735a..127efe6a11 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/transferees/transferees.component.ts +++ b/portal-frontend/src/app/features/notifications/edit-submission/transferees/transferees.component.ts @@ -2,6 +2,7 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; import { Router } from '@angular/router'; import { takeUntil } from 'rxjs'; +import { NotificationSubmissionService } from '../../../../services/notification-submission/notification-submission.service'; import { NotificationTransfereeDto } from '../../../../services/notification-transferee/notification-transferee.dto'; import { NotificationTransfereeService } from '../../../../services/notification-transferee/notification-transferee.service'; import { EditNotificationSteps } from '../edit-submission.component'; @@ -25,6 +26,7 @@ export class TransfereesComponent extends StepComponent implements OnInit, OnDes constructor( private router: Router, private notificationTransfereeService: NotificationTransfereeService, + private notificationSubmissionService: NotificationSubmissionService, private dialog: MatDialog ) { super(); @@ -34,7 +36,7 @@ export class TransfereesComponent extends StepComponent implements OnInit, OnDes this.$notificationSubmission.pipe(takeUntil(this.$destroy)).subscribe((submission) => { if (submission) { this.submissionUuid = submission.uuid; - this.loadTransferees(submission.uuid); + this.transferees = submission.transferees; } }); } @@ -44,9 +46,10 @@ export class TransfereesComponent extends StepComponent implements OnInit, OnDes } private async loadTransferees(submissionUuid: string, primaryContactOwnerUuid?: string | null) { - const transferees = await this.notificationTransfereeService.fetchBySubmissionId(submissionUuid); - if (transferees) { - this.transferees = transferees; + const submission = await this.notificationSubmissionService.getByUuid(submissionUuid); + if (submission) { + this.transferees = submission.transferees; + this.$notificationSubmission.next(submission); } } @@ -86,6 +89,4 @@ export class TransfereesComponent extends StepComponent implements OnInit, OnDes await this.notificationTransfereeService.delete(uuid); await this.loadTransferees(this.submissionUuid); } - - protected readonly undefined = undefined; } diff --git a/portal-frontend/src/app/features/notifications/notification-details/notification-details.component.html b/portal-frontend/src/app/features/notifications/notification-details/notification-details.component.html index b5626f2247..e6cb42fcfd 100644 --- a/portal-frontend/src/app/features/notifications/notification-details/notification-details.component.html +++ b/portal-frontend/src/app/features/notifications/notification-details/notification-details.component.html @@ -26,6 +26,7 @@ <h3>2. Identify Transferees</h3> <div>{{ transferee.displayName }}</div> </ng-container> </div> + <app-no-data [showRequired]="showErrors" *ngIf="notificationSubmission.transferees.length === 0"></app-no-data> <div *ngIf="showEdit" class="edit-button"> <button mat-flat-button (click)="onNavigateToStep(1)" color="accent">Edit Section</button> </div> diff --git a/services/apps/alcs/src/alcs/admin/board-management/board-management.controller.ts b/services/apps/alcs/src/alcs/admin/board-management/board-management.controller.ts index e41da3086e..3145afad6f 100644 --- a/services/apps/alcs/src/alcs/admin/board-management/board-management.controller.ts +++ b/services/apps/alcs/src/alcs/admin/board-management/board-management.controller.ts @@ -49,7 +49,7 @@ export class BoardManagementController { @UserRoles(AUTH_ROLE.ADMIN) async canDelete(@Param('code') code: string) { //If it's the vetting board - if (code === 'vett') { + if (code === 'vett' || code === 'noti') { return { canDelete: false, reason: diff --git a/services/apps/alcs/src/alcs/board/board.controller.spec.ts b/services/apps/alcs/src/alcs/board/board.controller.spec.ts index 978d3e7f42..4b820577ec 100644 --- a/services/apps/alcs/src/alcs/board/board.controller.spec.ts +++ b/services/apps/alcs/src/alcs/board/board.controller.spec.ts @@ -14,6 +14,7 @@ import { CardService } from '../card/card.service'; import { CovenantService } from '../covenant/covenant.service'; import { NoticeOfIntentModificationService } from '../notice-of-intent-decision/notice-of-intent-modification/notice-of-intent-modification.service'; import { NoticeOfIntentService } from '../notice-of-intent/notice-of-intent.service'; +import { NotificationService } from '../notification/notification.service'; import { PlanningReviewService } from '../planning-review/planning-review.service'; import { BoardController } from './board.controller'; import { BOARD_CODES } from './board.dto'; @@ -32,6 +33,7 @@ describe('BoardController', () => { let covenantService: DeepMocked<CovenantService>; let noticeOfIntentService: DeepMocked<NoticeOfIntentService>; let noiModificationService: DeepMocked<NoticeOfIntentModificationService>; + let notificationService: DeepMocked<NotificationService>; let mockBoard; beforeEach(async () => { @@ -44,6 +46,8 @@ describe('BoardController', () => { covenantService = createMock(); noticeOfIntentService = createMock(); noiModificationService = createMock(); + notificationService = createMock(); + mockBoard = new Board({ allowedCardTypes: [], statuses: [], @@ -66,6 +70,8 @@ describe('BoardController', () => { noticeOfIntentService.mapToDtos.mockResolvedValue([]); noiModificationService.getByBoard.mockResolvedValue([]); noiModificationService.mapToDtos.mockResolvedValue([]); + notificationService.getByBoard.mockResolvedValue([]); + notificationService.mapToDtos.mockResolvedValue([]); const module: TestingModule = await Test.createTestingModule({ imports: [ @@ -98,6 +104,10 @@ describe('BoardController', () => { provide: NoticeOfIntentModificationService, useValue: noiModificationService, }, + { + provide: NotificationService, + useValue: notificationService, + }, { provide: ClsService, useValue: {}, diff --git a/services/apps/alcs/src/alcs/board/board.controller.ts b/services/apps/alcs/src/alcs/board/board.controller.ts index 8fa661e398..3c06aa14aa 100644 --- a/services/apps/alcs/src/alcs/board/board.controller.ts +++ b/services/apps/alcs/src/alcs/board/board.controller.ts @@ -19,6 +19,7 @@ import { CardService } from '../card/card.service'; import { CovenantService } from '../covenant/covenant.service'; import { NoticeOfIntentModificationService } from '../notice-of-intent-decision/notice-of-intent-modification/notice-of-intent-modification.service'; import { NoticeOfIntentService } from '../notice-of-intent/notice-of-intent.service'; +import { NotificationService } from '../notification/notification.service'; import { PlanningReviewService } from '../planning-review/planning-review.service'; import { BoardDto, MinimalBoardDto } from './board.dto'; import { Board } from './board.entity'; @@ -38,6 +39,7 @@ export class BoardController { private noiModificationService: NoticeOfIntentModificationService, private covenantService: CovenantService, private noticeOfIntentService: NoticeOfIntentService, + private notificationService: NotificationService, @InjectMapper() private autoMapper: Mapper, ) {} @@ -95,6 +97,10 @@ export class BoardController { ? await this.noiModificationService.getByBoard(board.uuid) : []; + const notifications = allowedCodes.includes(CARD_TYPE.NOTIFICATION) + ? await this.notificationService.getByBoard(board.uuid) + : []; + return { board: await this.autoMapper.mapAsync(board, Board, BoardDto), applications: await this.applicationService.mapToDtos(applications), @@ -110,6 +116,7 @@ export class BoardController { noiModifications: await this.noiModificationService.mapToDtos( noiModifications, ), + notifications: await this.notificationService.mapToDtos(notifications), }; } diff --git a/services/apps/alcs/src/alcs/board/board.module.ts b/services/apps/alcs/src/alcs/board/board.module.ts index 7f5362b6f2..49928311f8 100644 --- a/services/apps/alcs/src/alcs/board/board.module.ts +++ b/services/apps/alcs/src/alcs/board/board.module.ts @@ -7,6 +7,7 @@ import { CovenantModule } from '../covenant/covenant.module'; import { ApplicationDecisionModule } from '../application-decision/application-decision.module'; import { NoticeOfIntentDecisionModule } from '../notice-of-intent-decision/notice-of-intent-decision.module'; import { NoticeOfIntentModule } from '../notice-of-intent/notice-of-intent.module'; +import { NotificationModule } from '../notification/notification.module'; import { PlanningReviewModule } from '../planning-review/planning-review.module'; import { BoardStatus } from './board-status.entity'; import { BoardController } from './board.controller'; @@ -23,6 +24,7 @@ import { BoardService } from './board.service'; forwardRef(() => CovenantModule), forwardRef(() => NoticeOfIntentModule), NoticeOfIntentDecisionModule, + NotificationModule, ], controllers: [BoardController], providers: [BoardService, BoardAutomapperProfile], diff --git a/services/apps/alcs/src/alcs/notification/notification.service.spec.ts b/services/apps/alcs/src/alcs/notification/notification.service.spec.ts index fce06155dc..dfe1e7a84d 100644 --- a/services/apps/alcs/src/alcs/notification/notification.service.spec.ts +++ b/services/apps/alcs/src/alcs/notification/notification.service.spec.ts @@ -9,6 +9,11 @@ import { NotificationProfile } from '../../common/automapper/notification.automa import { FileNumberService } from '../../file-number/file-number.service'; import { NotificationSubmissionService } from '../../portal/notification-submission/notification-submission.service'; import { Board } from '../board/board.entity'; +import { BoardService } from '../board/board.service'; +import { CARD_SUBTASK_TYPE } from '../card/card-subtask/card-subtask.dto'; +import { CardSubtask } from '../card/card-subtask/card-subtask.entity'; +import { CardSubtaskService } from '../card/card-subtask/card-subtask.service'; +import { CARD_TYPE } from '../card/card-type/card-type.entity'; import { Card } from '../card/card.entity'; import { CardService } from '../card/card.service'; import { ApplicationRegion } from '../code/application-code/application-region/application-region.entity'; @@ -27,6 +32,8 @@ describe('NotificationService', () => { let mockLocalGovernmentService: DeepMocked<LocalGovernmentService>; let mockCodeService: DeepMocked<CodeService>; let mockNotificationSubmissionService: DeepMocked<NotificationSubmissionService>; + let mockBoardService: DeepMocked<BoardService>; + let mockSubtaskService: DeepMocked<CardSubtaskService>; beforeEach(async () => { mockCardService = createMock(); @@ -36,6 +43,8 @@ describe('NotificationService', () => { mockLocalGovernmentService = createMock(); mockCodeService = createMock(); mockNotificationSubmissionService = createMock(); + mockBoardService = createMock(); + mockSubtaskService = createMock(); const module: TestingModule = await Test.createTestingModule({ imports: [ @@ -74,6 +83,14 @@ describe('NotificationService', () => { provide: NotificationSubmissionService, useValue: mockNotificationSubmissionService, }, + { + provide: BoardService, + useValue: mockBoardService, + }, + { + provide: CardSubtaskService, + useValue: mockSubtaskService, + }, ], }).compile(); @@ -238,12 +255,14 @@ describe('NotificationService', () => { expect(mockRepository.update).toHaveBeenCalledTimes(1); }); - it('should create a card and save it for submit', async () => { + it('should create a card, move it to Noti, created a subtask and then save it for submit', async () => { const mockNoi = new Notification(); mockRepository.findOne.mockResolvedValue(mockNoi); mockRepository.findOneOrFail.mockResolvedValue(mockNoi); mockCodeService.fetchRegion.mockResolvedValue(new ApplicationRegion()); mockRepository.save.mockResolvedValue({} as any); + mockBoardService.changeBoard.mockResolvedValue(new Card()); + mockSubtaskService.create.mockResolvedValue(new CardSubtask()); await service.submit({ applicant: 'Bruce Wayne', @@ -261,5 +280,17 @@ describe('NotificationService', () => { 0; expect(mockRepository.findOneOrFail).toHaveBeenCalledTimes(1); expect(mockRepository.save).toHaveBeenCalledTimes(1); + expect(mockBoardService.changeBoard).toHaveBeenCalledTimes(1); + expect(mockBoardService.changeBoard).toHaveBeenCalledWith( + undefined, + 'noti', + ); + expect(mockSubtaskService.create).toHaveBeenCalledTimes(1); + expect(mockSubtaskService.create).toHaveBeenCalledWith( + new Card({ + typeCode: CARD_TYPE.NOTIFICATION, + }), + CARD_SUBTASK_TYPE.GIS, + ); }); }); diff --git a/services/apps/alcs/src/alcs/notification/notification.service.ts b/services/apps/alcs/src/alcs/notification/notification.service.ts index c86239aa09..91200de919 100644 --- a/services/apps/alcs/src/alcs/notification/notification.service.ts +++ b/services/apps/alcs/src/alcs/notification/notification.service.ts @@ -17,6 +17,9 @@ import { import { FileNumberService } from '../../file-number/file-number.service'; import { filterUndefined } from '../../utils/undefined'; import { Board } from '../board/board.entity'; +import { BoardService } from '../board/board.service'; +import { CARD_SUBTASK_TYPE } from '../card/card-subtask/card-subtask.dto'; +import { CardSubtaskService } from '../card/card-subtask/card-subtask.service'; import { CARD_TYPE } from '../card/card-type/card-type.entity'; import { Card } from '../card/card.entity'; import { CardService } from '../card/card.service'; @@ -58,6 +61,8 @@ export class NotificationService { private fileNumberService: FileNumberService, private codeService: CodeService, private localGovernmentService: LocalGovernmentService, + private boardService: BoardService, + private subtaskService: CardSubtaskService, ) {} async create( @@ -303,8 +308,18 @@ export class NotificationService { existingNotification.card = new Card(); existingNotification.card.typeCode = CARD_TYPE.NOTIFICATION; - await this.repository.save(existingNotification); - return this.getByFileNumber(createDto.fileNumber); + const savedNotification = await this.repository.save(existingNotification); + + await this.boardService.changeBoard(savedNotification.cardUuid, 'noti'); + + const finalNotification = await this.getByFileNumber(createDto.fileNumber); + + await this.subtaskService.create( + finalNotification.card!, + CARD_SUBTASK_TYPE.GIS, + ); + + return finalNotification; } async updateApplicant(fileNumber: string, applicant: string) { diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1694803254582-add_srw_board.ts b/services/apps/alcs/src/providers/typeorm/migrations/1694803254582-add_srw_board.ts new file mode 100644 index 0000000000..fd1f1651ac --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1694803254582-add_srw_board.ts @@ -0,0 +1,38 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class addSrwBoard1694803254582 implements MigrationInterface { + public async up(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query(` + INSERT INTO "alcs"."board" + ("audit_deleted_date_at", "audit_created_at", "audit_updated_at", "audit_created_by", "audit_updated_by", "uuid", "code", "title", "show_on_schedule") VALUES + (NULL, NOW(), NULL, 'migration_seed', NULL, '0e880b15-4253-4968-bc0c-61239df1d0b8', 'noti', 'Notification of SRWs', 'f'); + `); + + await queryRunner.query(` + INSERT INTO "alcs"."board_allowed_card_types_card_type" ("board_uuid", "card_type_code") VALUES + ('0e880b15-4253-4968-bc0c-61239df1d0b8', 'NOTI'); + `); + + //Create New Statuses + await queryRunner.query(` + INSERT INTO "alcs"."card_status" + ("audit_deleted_date_at", "audit_created_at", "audit_updated_at", "audit_created_by", "audit_updated_by", "label", "code", "description") VALUES + (NULL, NOW(), NULL, 'migration_seed', NULL, 'Received', 'RECI', 'Submission has been receieved'), + (NULL, NOW(), NULL, 'migration_seed', NULL, 'Requires Audit', 'REQA', 'Submission requires an audit'), + (NULL, NOW(), NULL, 'migration_seed', NULL, 'Completed', 'COMP', 'All steps completed'); + `); + + await queryRunner.query(` + INSERT INTO "alcs"."board_status" + ("audit_deleted_date_at", "audit_created_at", "audit_updated_at", "audit_created_by", "audit_updated_by", "uuid", "order", "board_uuid", "status_code") VALUES + (NULL, NOW(), NULL, 'migration_seed', NULL, 'f4554c54-183b-46bc-8ba3-26705bd8e56c', 0, '0e880b15-4253-4968-bc0c-61239df1d0b8', 'RECI'), + (NULL, NOW(), NULL, 'migration_seed', NULL, 'bb82745c-d00b-4bc9-86dc-5824c86e23d5', 1, '0e880b15-4253-4968-bc0c-61239df1d0b8', 'REQA'), + (NULL, NOW(), NULL, 'migration_seed', NULL, '1aa8267b-3d75-4ac8-9505-044e28dff210', 2, '0e880b15-4253-4968-bc0c-61239df1d0b8', 'COMP'), + (NULL, NOW(), NULL, 'migration_seed', NULL, '6f234cb3-0022-4b92-96b6-3418ad27299e', 3, '0e880b15-4253-4968-bc0c-61239df1d0b8', 'CNCL'); + `); + } + + public async down(): Promise<void> { + //Nope + } +} From c022c21a87ff2a231878c070e092f83639666ad8 Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Fri, 15 Sep 2023 15:03:52 -0700 Subject: [PATCH 390/954] search change requests and fixes (#973) fix submitted date search fix region code search change no data change search on the first load open IMAP in separate tab rename search tab --- .../application-search-table.component.html | 139 +++++++++--------- .../application-search-table.component.ts | 49 ++++-- ...on-application-search-table.component.html | 115 ++++++++------- .../non-application-search-table.component.ts | 47 ++++-- ...tice-of-intent-search-table.component.html | 138 ++++++++--------- ...notice-of-intent-search-table.component.ts | 47 ++++-- .../app/features/search/search.component.html | 43 +++--- .../app/features/search/search.component.scss | 27 +++- .../app/features/search/search.component.ts | 51 +++++-- .../src/app/services/search/search.dto.ts | 2 +- .../services/search/search.service.spec.ts | 2 +- ...pplication-advanced-search.service.spec.ts | 2 +- .../application-advanced-search.service.ts | 35 +++-- .../non-applications-view.entity.ts | 10 +- .../non-applications.service.spec.ts | 1 + .../non-applications.service.ts | 6 + ...-of-intent-advanced-search.service.spec.ts | 2 +- ...otice-of-intent-advanced-search.service.ts | 28 ++-- .../src/alcs/search/search.controller.spec.ts | 54 ++++++- .../alcs/src/alcs/search/search.controller.ts | 65 +++++--- .../apps/alcs/src/alcs/search/search.dto.ts | 5 +- .../1694794266666-missing_region_code.ts | 134 +++++++++++++++++ .../utils/pacific-date-time-helper.spec.ts | 23 +++ .../src/utils/pacific-date-time-helper.ts | 17 +++ 24 files changed, 709 insertions(+), 333 deletions(-) create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1694794266666-missing_region_code.ts create mode 100644 services/apps/alcs/src/utils/pacific-date-time-helper.spec.ts create mode 100644 services/apps/alcs/src/utils/pacific-date-time-helper.ts diff --git a/alcs-frontend/src/app/features/search/application-search-table/application-search-table.component.html b/alcs-frontend/src/app/features/search/application-search-table/application-search-table.component.html index cefaa4aebd..03ad623a2f 100644 --- a/alcs-frontend/src/app/features/search/application-search-table/application-search-table.component.html +++ b/alcs-frontend/src/app/features/search/application-search-table/application-search-table.component.html @@ -1,73 +1,80 @@ -<table - mat-table - [dataSource]="dataSource" - class="mat-elevation-z2 table" - matSort - matSortActive="dateSubmitted" - matSortDirection="desc" - matSortDisableClear -> - <ng-container matColumnDef="fileId"> - <th mat-header-cell *matHeaderCellDef mat-sort-header>File ID</th> - <td mat-cell *matCellDef="let element"> - {{ element.fileNumber | emptyColumn }} - </td> - </ng-container> +<ng-container *ngIf="_totalCount > 0"> + <table + mat-table + [dataSource]="dataSource" + class="mat-elevation-z2 table" + matSort + matSortActive="dateSubmitted" + matSortDirection="desc" + matSortDisableClear + > + <ng-container matColumnDef="fileId"> + <th mat-header-cell *matHeaderCellDef mat-sort-header>File ID</th> + <td mat-cell *matCellDef="let element"> + {{ element.fileNumber | emptyColumn }} + </td> + </ng-container> - <ng-container matColumnDef="dateSubmitted"> - <th mat-header-cell *matHeaderCellDef mat-sort-header>Date Submitted</th> - <td mat-cell *matCellDef="let element"> - {{ element.dateSubmitted | date | emptyColumn }} - </td> - </ng-container> + <ng-container matColumnDef="dateSubmitted"> + <th mat-header-cell *matHeaderCellDef mat-sort-header>Date Submitted</th> + <td mat-cell *matCellDef="let element"> + {{ element.dateSubmitted | date | emptyColumn }} + </td> + </ng-container> - <ng-container matColumnDef="ownerName"> - <th mat-header-cell *matHeaderCellDef mat-sort-header>Owner Name</th> - <td mat-cell *matCellDef="let element"> - {{ element.ownerName | emptyColumn }} - </td> - </ng-container> + <ng-container matColumnDef="ownerName"> + <th mat-header-cell *matHeaderCellDef mat-sort-header>Owner Name</th> + <td mat-cell *matCellDef="let element"> + {{ element.ownerName | emptyColumn }} + </td> + </ng-container> - <ng-container matColumnDef="type"> - <th class="type-cell" mat-header-cell *matHeaderCellDef mat-sort-header>Type</th> - <td mat-cell class="type-cell" *matCellDef="let element"> - <app-application-type-pill *ngIf="element.type" [type]="element.type" [useShortLabel]="true"> - </app-application-type-pill> - <ng-container *ngIf="element.type === null || element.type === undefined">-</ng-container> - </td> - </ng-container> + <ng-container matColumnDef="type"> + <th class="type-cell" mat-header-cell *matHeaderCellDef mat-sort-header>Type</th> + <td mat-cell class="type-cell" *matCellDef="let element"> + <app-application-type-pill *ngIf="element.type" [type]="element.type" [useShortLabel]="true"> + </app-application-type-pill> + <ng-container *ngIf="element.type === null || element.type === undefined">-</ng-container> + </td> + </ng-container> - <ng-container matColumnDef="government"> - <th mat-header-cell *matHeaderCellDef mat-sort-header>Local/First Nation Government</th> - <td mat-cell *matCellDef="let element"> - {{ element.localGovernmentName | emptyColumn }} - </td> - </ng-container> + <ng-container matColumnDef="government"> + <th mat-header-cell *matHeaderCellDef mat-sort-header>Local/First Nation Government</th> + <td mat-cell *matCellDef="let element"> + {{ element.localGovernmentName | emptyColumn }} + </td> + </ng-container> - <ng-container matColumnDef="portalStatus"> - <th class="type-cell" mat-header-cell *matHeaderCellDef mat-sort-header>Portal Status</th> - <td mat-cell class="type-cell" *matCellDef="let element"> - <app-application-submission-status-type-pill - *ngIf="element.status" - [type]="element.status" - ></app-application-submission-status-type-pill> - </td> - </ng-container> + <ng-container matColumnDef="portalStatus"> + <th class="type-cell" mat-header-cell *matHeaderCellDef mat-sort-header>Portal Status</th> + <td mat-cell class="type-cell" *matCellDef="let element"> + <app-application-submission-status-type-pill + *ngIf="element.status" + [type]="element.status" + ></app-application-submission-status-type-pill> + </td> + </ng-container> - <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr> - <tr (click)="onSelectRecord(row)" mat-row *matRowDef="let row; columns: displayedColumns"></tr> + <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr> + <tr (click)="onSelectRecord(row)" mat-row *matRowDef="let row; columns: displayedColumns"></tr> - <tr class="mat-row no-data" *matNoDataRow> - <td class="text-center" colspan="6"> - <div><b>No applications found.</b></div> - <div>Please adjust criteria and try again.</div> - </td> - </tr> -</table> -<mat-paginator - [length]="totalCount" - [pageSize]="20" - [pageSizeOptions]="[20, 50, 100]" - (page)="onPageChange($event)" - aria-label="Select page" -></mat-paginator> + <tr class="mat-row no-data" *matNoDataRow> + <td class="text-center" colspan="6"> + <div><b>No applications found.</b></div> + <div>Please adjust criteria and try again.</div> + </td> + </tr> + </table> + <mat-paginator + [length]="_totalCount" + [pageSize]="20" + [pageSizeOptions]="[20, 50, 100]" + (page)="onPageChange($event)" + aria-label="Select page" + ></mat-paginator> +</ng-container> + +<div class="no-data" *ngIf="_totalCount === 0"> + <div><b>No applications found.</b></div> + <div>Please adjust criteria and try again.</div> +</div> diff --git a/alcs-frontend/src/app/features/search/application-search-table/application-search-table.component.ts b/alcs-frontend/src/app/features/search/application-search-table/application-search-table.component.ts index d02dbe34ab..f3f98d0ce3 100644 --- a/alcs-frontend/src/app/features/search/application-search-table/application-search-table.component.ts +++ b/alcs-frontend/src/app/features/search/application-search-table/application-search-table.component.ts @@ -1,4 +1,4 @@ -import { AfterViewInit, Component, EventEmitter, Input, OnDestroy, Output, ViewChild } from '@angular/core'; +import { Component, EventEmitter, Input, OnDestroy, Output, ViewChild } from '@angular/core'; import { MatPaginator, PageEvent } from '@angular/material/paginator'; import { MatSort } from '@angular/material/sort'; import { Router } from '@angular/router'; @@ -28,7 +28,7 @@ interface SearchResult { templateUrl: './application-search-table.component.html', styleUrls: ['./application-search-table.component.scss'], }) -export class ApplicationSearchTableComponent implements AfterViewInit, OnDestroy { +export class ApplicationSearchTableComponent implements OnDestroy { $destroy = new Subject<void>(); @ViewChild(MatPaginator) paginator!: MatPaginator; @@ -40,7 +40,14 @@ export class ApplicationSearchTableComponent implements AfterViewInit, OnDestroy this.dataSource = this.mapApplications(applications); } - @Input() totalCount = 0; + _totalCount = 0; + @Input() set totalCount(count: number) { + this._totalCount = count; + + // this will ensure the reset of subscriber once the table is hidden because of empty + this.initSorting(); + } + @Input() statuses: ApplicationStatusDto[] = []; @Input() regions: ApplicationRegionDto[] = []; @@ -54,20 +61,9 @@ export class ApplicationSearchTableComponent implements AfterViewInit, OnDestroy sortDirection = 'DESC'; sortField = 'dateSubmitted'; - constructor(private router: Router) {} + private subscribedToSort = false; - ngAfterViewInit() { - if (this.sort) { - this.sort.sortChange.pipe(takeUntil(this.$destroy)).subscribe(async (sortObj) => { - this.paginator.pageIndex = 0; - this.pageIndex = 0; - this.sortDirection = sortObj.direction.toUpperCase(); - this.sortField = sortObj.active; - - await this.onTableChange(); - }); - } - } + constructor(private router: Router) {} ngOnDestroy(): void { this.$destroy.next(); @@ -121,4 +117,25 @@ export class ApplicationSearchTableComponent implements AfterViewInit, OnDestroy }; }); } + + private initSorting() { + if (this._totalCount <= 0) { + this.subscribedToSort = false; + } + + // push subscription to next render cycle, after the table is rendered + setTimeout(() => { + if (this.sort && !this.subscribedToSort) { + this.subscribedToSort = true; + this.sort.sortChange.pipe(takeUntil(this.$destroy)).subscribe(async (sortObj) => { + this.paginator.pageIndex = 0; + this.pageIndex = 0; + this.sortDirection = sortObj.direction.toUpperCase(); + this.sortField = sortObj.active; + + await this.onTableChange(); + }); + } + }); + } } diff --git a/alcs-frontend/src/app/features/search/non-application-search-table/non-application-search-table.component.html b/alcs-frontend/src/app/features/search/non-application-search-table/non-application-search-table.component.html index 8e702f9959..d1fcff7d5c 100644 --- a/alcs-frontend/src/app/features/search/non-application-search-table/non-application-search-table.component.html +++ b/alcs-frontend/src/app/features/search/non-application-search-table/non-application-search-table.component.html @@ -1,56 +1,71 @@ -<table - mat-table - [dataSource]="dataSource" - class="mat-elevation-z2 table" - matSort - matSortActive="dateSubmitted" - matSortDirection="desc" - matSortDisableClear -> - <ng-container matColumnDef="fileId"> - <th mat-header-cell *matHeaderCellDef mat-sort-header>File ID</th> - <td mat-cell *matCellDef="let element"> - {{ element.fileNumber | emptyColumn }} - </td> - </ng-container> +<ng-container *ngIf="_totalCount > 0"> + <table + mat-table + [dataSource]="dataSource" + class="mat-elevation-z2 table" + matSort + matSortActive="dateSubmitted" + matSortDirection="desc" + matSortDisableClear + > + <ng-container matColumnDef="fileId"> + <th mat-header-cell *matHeaderCellDef mat-sort-header>File ID</th> + <td mat-cell *matCellDef="let element"> + {{ element.fileNumber | emptyColumn }} + </td> + </ng-container> - <ng-container matColumnDef="type"> - <th mat-header-cell *matHeaderCellDef mat-sort-header>Type</th> + <ng-container matColumnDef="type"> + <th mat-header-cell *matHeaderCellDef mat-sort-header>Type</th> - <td mat-cell *matCellDef="let element"> - <app-application-type-pill [useShortLabel]="true" *ngIf="element.class === 'PLAN'" [type]="PLANNING_TYPE_LABEL" /> - <app-application-type-pill [useShortLabel]="true" *ngIf="element.class === 'COV'" [type]="COVENANT_TYPE_LABEL" /> - </td> - </ng-container> + <td mat-cell *matCellDef="let element"> + <app-application-type-pill + [useShortLabel]="true" + *ngIf="element.class === 'PLAN'" + [type]="PLANNING_TYPE_LABEL" + /> + <app-application-type-pill + [useShortLabel]="true" + *ngIf="element.class === 'COV'" + [type]="COVENANT_TYPE_LABEL" + /> + </td> + </ng-container> - <ng-container matColumnDef="applicant"> - <th mat-header-cell *matHeaderCellDef mat-sort-header>Owner Name</th> - <td mat-cell *matCellDef="let element"> - {{ element.applicant | emptyColumn }} - </td> - </ng-container> + <ng-container matColumnDef="applicant"> + <th mat-header-cell *matHeaderCellDef mat-sort-header>Owner Name</th> + <td mat-cell *matCellDef="let element"> + {{ element.applicant | emptyColumn }} + </td> + </ng-container> - <ng-container matColumnDef="government"> - <th mat-header-cell *matHeaderCellDef mat-sort-header>Local/First Nation Government</th> - <td mat-cell *matCellDef="let element"> - {{ element.localGovernmentName | emptyColumn }} - </td> - </ng-container> + <ng-container matColumnDef="government"> + <th mat-header-cell *matHeaderCellDef mat-sort-header>Local/First Nation Government</th> + <td mat-cell *matCellDef="let element"> + {{ element.localGovernmentName | emptyColumn }} + </td> + </ng-container> - <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr> - <tr (click)="onSelectRecord(row)" mat-row *matRowDef="let row; columns: displayedColumns"></tr> + <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr> + <tr (click)="onSelectRecord(row)" mat-row *matRowDef="let row; columns: displayedColumns"></tr> - <tr class="mat-row no-data" *matNoDataRow> - <td class="text-center" colspan="4"> - <div><b>No non-applications found.</b></div> - <div>Please adjust criteria and try again.</div> - </td> - </tr> -</table> -<mat-paginator - [length]="totalCount" - [pageSize]="20" - [pageSizeOptions]="[20, 50, 100]" - (page)="onPageChange($event)" - aria-label="Select page" -></mat-paginator> + <tr class="mat-row no-data" *matNoDataRow> + <td class="text-center" colspan="4"> + <div><b>No non-applications found.</b></div> + <div>Please adjust criteria and try again.</div> + </td> + </tr> + </table> + <mat-paginator + [length]="_totalCount" + [pageSize]="20" + [pageSizeOptions]="[20, 50, 100]" + (page)="onPageChange($event)" + aria-label="Select page" + ></mat-paginator> +</ng-container> + +<div class="no-data" *ngIf="_totalCount === 0"> + <div><b>No non-applications found.</b></div> + <div>Please adjust criteria and try again.</div> +</div> diff --git a/alcs-frontend/src/app/features/search/non-application-search-table/non-application-search-table.component.ts b/alcs-frontend/src/app/features/search/non-application-search-table/non-application-search-table.component.ts index 7413db2792..fb2228b377 100644 --- a/alcs-frontend/src/app/features/search/non-application-search-table/non-application-search-table.component.ts +++ b/alcs-frontend/src/app/features/search/non-application-search-table/non-application-search-table.component.ts @@ -1,4 +1,4 @@ -import { AfterViewInit, Component, EventEmitter, Input, OnDestroy, Output, ViewChild } from '@angular/core'; +import { Component, EventEmitter, Input, OnDestroy, Output, ViewChild } from '@angular/core'; import { MatPaginator, PageEvent } from '@angular/material/paginator'; import { MatSort } from '@angular/material/sort'; import { Router } from '@angular/router'; @@ -24,7 +24,7 @@ interface SearchResult { templateUrl: './non-application-search-table.component.html', styleUrls: ['./non-application-search-table.component.scss'], }) -export class NonApplicationSearchTableComponent implements AfterViewInit, OnDestroy { +export class NonApplicationSearchTableComponent implements OnDestroy { $destroy = new Subject<void>(); @ViewChild(MatPaginator) paginator!: MatPaginator; @@ -36,7 +36,12 @@ export class NonApplicationSearchTableComponent implements AfterViewInit, OnDest this.dataSource = this.mapNonApplications(nonApplications); } - @Input() totalCount = 0; + _totalCount = 0; + @Input() set totalCount(count: number) { + this._totalCount = count; + this.initSorting(); + } + @Output() tableChange = new EventEmitter<TableChange>(); displayedColumns = ['fileId', 'type', 'applicant', 'government']; @@ -50,20 +55,9 @@ export class NonApplicationSearchTableComponent implements AfterViewInit, OnDest COVENANT_TYPE_LABEL = COVENANT_TYPE_LABEL; PLANNING_TYPE_LABEL = PLANNING_TYPE_LABEL; - constructor(private router: Router) {} - - ngAfterViewInit() { - if (this.sort) { - this.sort.sortChange.pipe(takeUntil(this.$destroy)).subscribe(async (sortObj) => { - this.paginator.pageIndex = 0; - this.pageIndex = 0; - this.sortDirection = sortObj.direction.toUpperCase(); - this.sortField = sortObj.active; + private subscribedToSort = false; - await this.onTableChange(); - }); - } - } + constructor(private router: Router) {} ngOnDestroy(): void { this.$destroy.next(); @@ -111,4 +105,25 @@ export class NonApplicationSearchTableComponent implements AfterViewInit, OnDest }; }); } + + private initSorting() { + if (this._totalCount <= 0) { + this.subscribedToSort = false; + } + + // push subscription to next render cycle, after the table is rendered + setTimeout(() => { + if (this.sort && !this.subscribedToSort) { + this.subscribedToSort = true; + this.sort.sortChange.pipe(takeUntil(this.$destroy)).subscribe(async (sortObj) => { + this.paginator.pageIndex = 0; + this.pageIndex = 0; + this.sortDirection = sortObj.direction.toUpperCase(); + this.sortField = sortObj.active; + + await this.onTableChange(); + }); + } + }); + } } diff --git a/alcs-frontend/src/app/features/search/notice-of-intent-search-table/notice-of-intent-search-table.component.html b/alcs-frontend/src/app/features/search/notice-of-intent-search-table/notice-of-intent-search-table.component.html index 18bb07fbd3..66d98ff2cb 100644 --- a/alcs-frontend/src/app/features/search/notice-of-intent-search-table/notice-of-intent-search-table.component.html +++ b/alcs-frontend/src/app/features/search/notice-of-intent-search-table/notice-of-intent-search-table.component.html @@ -1,73 +1,79 @@ -<table - mat-table - [dataSource]="dataSource" - class="mat-elevation-z2 table" - matSort - matSortActive="dateSubmitted" - matSortDirection="desc" - matSortDisableClear -> - <ng-container matColumnDef="fileId"> - <th mat-header-cell *matHeaderCellDef mat-sort-header>File ID</th> - <td mat-cell *matCellDef="let element"> - {{ element.fileNumber | emptyColumn }} - </td> - </ng-container> +<ng-container *ngIf="_totalCount > 0"> + <table + mat-table + [dataSource]="dataSource" + class="mat-elevation-z2 table" + matSort + matSortActive="dateSubmitted" + matSortDirection="desc" + matSortDisableClear + > + <ng-container matColumnDef="fileId"> + <th mat-header-cell *matHeaderCellDef mat-sort-header>File ID</th> + <td mat-cell *matCellDef="let element"> + {{ element.fileNumber | emptyColumn }} + </td> + </ng-container> - <ng-container matColumnDef="dateSubmitted"> - <th mat-header-cell *matHeaderCellDef mat-sort-header>Date Submitted</th> - <td mat-cell *matCellDef="let element"> - {{ element.dateSubmitted | date | emptyColumn }} - </td> - </ng-container> + <ng-container matColumnDef="dateSubmitted"> + <th mat-header-cell *matHeaderCellDef mat-sort-header>Date Submitted</th> + <td mat-cell *matCellDef="let element"> + {{ element.dateSubmitted | date | emptyColumn }} + </td> + </ng-container> - <ng-container matColumnDef="ownerName"> - <th mat-header-cell *matHeaderCellDef mat-sort-header>Owner Name</th> - <td mat-cell *matCellDef="let element"> - {{ element.ownerName | emptyColumn }} - </td> - </ng-container> + <ng-container matColumnDef="ownerName"> + <th mat-header-cell *matHeaderCellDef mat-sort-header>Owner Name</th> + <td mat-cell *matCellDef="let element"> + {{ element.ownerName | emptyColumn }} + </td> + </ng-container> - <ng-container matColumnDef="type"> - <th class="type-cell" mat-header-cell *matHeaderCellDef mat-sort-header>Type</th> - <td mat-cell class="type-cell" *matCellDef="let element"> - <app-application-type-pill *ngIf="element.type" [type]="element.type" [useShortLabel]="true"> - </app-application-type-pill> - <ng-container *ngIf="element.type === null || element.type === undefined">-</ng-container> - </td> - </ng-container> + <ng-container matColumnDef="type"> + <th class="type-cell" mat-header-cell *matHeaderCellDef mat-sort-header>Type</th> + <td mat-cell class="type-cell" *matCellDef="let element"> + <app-application-type-pill *ngIf="element.type" [type]="element.type" [useShortLabel]="true"> + </app-application-type-pill> + <ng-container *ngIf="element.type === null || element.type === undefined">-</ng-container> + </td> + </ng-container> - <ng-container matColumnDef="government"> - <th mat-header-cell *matHeaderCellDef mat-sort-header>Local/First Nation Government</th> - <td mat-cell *matCellDef="let element"> - {{ element.localGovernmentName | emptyColumn }} - </td> - </ng-container> + <ng-container matColumnDef="government"> + <th mat-header-cell *matHeaderCellDef mat-sort-header>Local/First Nation Government</th> + <td mat-cell *matCellDef="let element"> + {{ element.localGovernmentName | emptyColumn }} + </td> + </ng-container> - <ng-container matColumnDef="portalStatus"> - <th class="type-cell" mat-header-cell *matHeaderCellDef mat-sort-header>Portal Status</th> - <td mat-cell class="type-cell" *matCellDef="let element"> - <app-application-submission-status-type-pill - *ngIf="element.status" - [type]="element.status" - ></app-application-submission-status-type-pill> - </td> - </ng-container> + <ng-container matColumnDef="portalStatus"> + <th class="type-cell" mat-header-cell *matHeaderCellDef mat-sort-header>Portal Status</th> + <td mat-cell class="type-cell" *matCellDef="let element"> + <app-application-submission-status-type-pill + *ngIf="element.status" + [type]="element.status" + ></app-application-submission-status-type-pill> + </td> + </ng-container> - <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr> - <tr (click)="onSelectRecord(row)" mat-row *matRowDef="let row; columns: displayedColumns"></tr> + <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr> + <tr (click)="onSelectRecord(row)" mat-row *matRowDef="let row; columns: displayedColumns"></tr> - <tr class="mat-row no-data" *matNoDataRow> - <td class="text-center" colspan="6"> - <div><b>No notice of intent found.</b></div> - <div>Please adjust criteria and try again.</div> - </td> - </tr> -</table> -<mat-paginator - [length]="totalCount" - [pageSize]="20" - [pageSizeOptions]="[20, 50, 100]" - (page)="onPageChange($event)" - aria-label="Select page" -></mat-paginator> + <tr class="mat-row no-data" *matNoDataRow> + <td class="text-center" colspan="6"> + <div><b>No notice of intent found.</b></div> + <div>Please adjust criteria and try again.</div> + </td> + </tr> + </table> + <mat-paginator + [length]="_totalCount" + [pageSize]="20" + [pageSizeOptions]="[20, 50, 100]" + (page)="onPageChange($event)" + aria-label="Select page" + ></mat-paginator> +</ng-container> +<div class="no-data" *ngIf="_totalCount === 0"> + <div><b>No notice of intent found.</b></div> + <div>Please adjust criteria and try again.</div> +</div> diff --git a/alcs-frontend/src/app/features/search/notice-of-intent-search-table/notice-of-intent-search-table.component.ts b/alcs-frontend/src/app/features/search/notice-of-intent-search-table/notice-of-intent-search-table.component.ts index b3868dcdce..24a34b39bc 100644 --- a/alcs-frontend/src/app/features/search/notice-of-intent-search-table/notice-of-intent-search-table.component.ts +++ b/alcs-frontend/src/app/features/search/notice-of-intent-search-table/notice-of-intent-search-table.component.ts @@ -1,4 +1,4 @@ -import { AfterViewInit, Component, EventEmitter, Input, OnDestroy, Output, ViewChild } from '@angular/core'; +import { Component, EventEmitter, Input, OnDestroy, Output, ViewChild } from '@angular/core'; import { MatPaginator, PageEvent } from '@angular/material/paginator'; import { MatSort } from '@angular/material/sort'; import { Router } from '@angular/router'; @@ -28,7 +28,7 @@ interface SearchResult { templateUrl: './notice-of-intent-search-table.component.html', styleUrls: ['./notice-of-intent-search-table.component.scss'], }) -export class NoticeOfIntentSearchTableComponent implements AfterViewInit, OnDestroy { +export class NoticeOfIntentSearchTableComponent implements OnDestroy { $destroy = new Subject<void>(); @ViewChild(MatPaginator) paginator!: MatPaginator; @@ -40,7 +40,12 @@ export class NoticeOfIntentSearchTableComponent implements AfterViewInit, OnDest this.dataSource = this.mapNoticeOfIntent(noticeOfIntents); } - @Input() totalCount = 0; + _totalCount = 0; + @Input() set totalCount(count: number) { + this._totalCount = count; + this.initSorting(); + } + @Input() statuses: ApplicationStatusDto[] = []; @Input() regions: ApplicationRegionDto[] = []; @@ -54,20 +59,9 @@ export class NoticeOfIntentSearchTableComponent implements AfterViewInit, OnDest sortDirection = 'DESC'; sortField = 'dateSubmitted'; - constructor(private router: Router) {} - - ngAfterViewInit() { - if (this.sort) { - this.sort.sortChange.pipe(takeUntil(this.$destroy)).subscribe(async (sortObj) => { - this.paginator.pageIndex = 0; - this.pageIndex = 0; - this.sortDirection = sortObj.direction.toUpperCase(); - this.sortField = sortObj.active; + private subscribedToSort = false; - await this.onTableChange(); - }); - } - } + constructor(private router: Router) {} ngOnDestroy(): void { this.$destroy.next(); @@ -122,4 +116,25 @@ export class NoticeOfIntentSearchTableComponent implements AfterViewInit, OnDest }; }); } + + private initSorting() { + if (this._totalCount <= 0) { + this.subscribedToSort = false; + } + + // push subscription to next render cycle, after the table is rendered + setTimeout(() => { + if (this.sort && !this.subscribedToSort) { + this.subscribedToSort = true; + this.sort.sortChange.pipe(takeUntil(this.$destroy)).subscribe(async (sortObj) => { + this.paginator.pageIndex = 0; + this.pageIndex = 0; + this.sortDirection = sortObj.direction.toUpperCase(); + this.sortField = sortObj.active; + + await this.onTableChange(); + }); + } + }); + } } diff --git a/alcs-frontend/src/app/features/search/search.component.html b/alcs-frontend/src/app/features/search/search.component.html index f4078570f9..e6da9ba6f9 100644 --- a/alcs-frontend/src/app/features/search/search.component.html +++ b/alcs-frontend/src/app/features/search/search.component.html @@ -31,20 +31,25 @@ <h6 class="subheading">Provide one or more of the following criteria:</h6> <div class="address-search-fields-wrapper"> <div class="row"> - <mat-form-field appearance="outline" class="column"> - <mat-label>PID</mat-label> - <input id="pid" matInput formControlName="pid" minlength="9" maxlength="12" mask="000-000-000" /> - </mat-form-field> - - <mat-form-field class="column" appearance="outline"> - <mat-label>Civic Address</mat-label> - <input id="civicAddress" matInput placeholder="Civic Address" formControlName="civicAddress" /> - </mat-form-field> - </div> - <div class="row"> - <div *ngIf="pidControl.invalid && (pidControl.dirty || pidControl.touched)" class="field-error"> - <mat-icon>warning</mat-icon> - <div *ngIf="pidControl.errors?.['mask']">PID must be 9 digits including leading zeroes</div> + <div class="column"> + <mat-form-field class="address-field" appearance="outline"> + <mat-label>PID</mat-label> + <input id="pid" matInput formControlName="pid" minlength="9" maxlength="12" mask="000-000-000" /> + </mat-form-field> + <div *ngIf="pidInvalid" class="field-error"> + <mat-icon>warning</mat-icon> + <div *ngIf="pidControl.errors?.['mask']">PID must be 9 digits including leading zeroes</div> + </div> + </div> + <div class="column"> + <mat-form-field appearance="outline" class="address-field"> + <mat-label>Civic Address</mat-label> + <input id="civicAddress" matInput placeholder="Civic Address" formControlName="civicAddress" minlength="3" /> + </mat-form-field> + <div *ngIf="civicAddressInvalid" class="field-error column"> + <mat-icon>warning</mat-icon> + <div *ngIf="civicAddressControl.errors?.['minlength']">Enter 3 or more characters to search</div> + </div> </div> </div> @@ -53,8 +58,8 @@ <h6 class="subheading">Provide one or more of the following criteria:</h6> <mat-icon>info</mat-icon> </div> <div class="info-description"> - Property details change over time. Use both ALCS and <a href="https://arcmaps.gov.bc.ca/ess/hm/alc/">iMap</a> to - confirm ALC history on a property + Property details change over time. Use both ALCS and + <a href="https://arcmaps.gov.bc.ca/ess/hm/alc/" target="_blank">iMap</a> to confirm ALC history on a property </div> </div> @@ -233,20 +238,20 @@ <h6 class="subheading">Provide one or more of the following criteria:</h6> </div> </div> <div class="btn-controls"> - <button type="button" mat-stroked-button color="primary" (click)="onReset()">Reset</button> + <button class="reset-btn" type="button" mat-stroked-button color="primary" (click)="onReset()">Reset</button> <button class="search-btn" type="submit" mat-flat-button color="primary" - [disabled]="formEmpty" + [disabled]="formEmpty || !searchForm.valid" > Search </button> </div> </form> -<div class="search-fields-wrapper search-result-wrapper"> +<div class="search-fields-wrapper search-result-wrapper" *ngIf="!searchResultsHidden"> <h2 class="search-title">Search Results:</h2> <mat-tab-group mat-align-tabs="start" mat-stretch-tabs="false" #searchResultTabs> diff --git a/alcs-frontend/src/app/features/search/search.component.scss b/alcs-frontend/src/app/features/search/search.component.scss index bf1a900ba6..976f020fa7 100644 --- a/alcs-frontend/src/app/features/search/search.component.scss +++ b/alcs-frontend/src/app/features/search/search.component.scss @@ -83,15 +83,16 @@ } .address-search-fields-wrapper { - background-color: #fee9b580; + background-color: rgba(254, 233, 180, 0.502); padding: 12px 80px; + .address-field { + background-color: white; + } + .row { margin: 4px 0; } - .column { - background-color: white; - } } .expand-search { @@ -157,17 +158,29 @@ display: flex; align-items: center; margin-top: 4px; + flex-direction: row !important; + gap: 4px; div { color: colors.$error-color; } } - .btn-controls .search-btn span { - color: #fff !important; + .btn-controls { + .reset-btn span { + color: colors.$primary-color; + } + .search-btn span { + color: #fff !important; + } } - .mat-mdc-select-placeholder { color: rgba(0, 0, 0, 0.6); } + + .no-data { + overflow: hidden; + margin: 20px 0; + padding: 8px 12px; + } } diff --git a/alcs-frontend/src/app/features/search/search.component.ts b/alcs-frontend/src/app/features/search/search.component.ts index 0d904a694b..cdf1f4a145 100644 --- a/alcs-frontend/src/app/features/search/search.component.ts +++ b/alcs-frontend/src/app/features/search/search.component.ts @@ -4,6 +4,7 @@ import { MatAutocompleteSelectedEvent } from '@angular/material/autocomplete'; import { MatPaginator } from '@angular/material/paginator'; import { MatSort } from '@angular/material/sort'; import { MatTabGroup } from '@angular/material/tabs'; +import { Title } from '@angular/platform-browser'; import { ActivatedRoute } from '@angular/router'; import moment from 'moment'; import { combineLatestWith, map, Observable, startWith, Subject, takeUntil } from 'rxjs'; @@ -65,11 +66,12 @@ export class SearchComponent implements OnInit, OnDestroy { componentTypeControl = new FormControl<string[] | undefined>(undefined); pidControl = new FormControl<string | undefined>(undefined); nameControl = new FormControl<string | undefined>(undefined); + civicAddressControl = new FormControl<string | undefined>(undefined); searchForm = new FormGroup({ fileNumber: new FormControl<string | undefined>(undefined), name: this.nameControl, pid: this.pidControl, - civicAddress: new FormControl<string | undefined>(undefined), + civicAddress: this.civicAddressControl, isIncludeOtherParcels: new FormControl(false), resolutionNumber: new FormControl<string | undefined>(undefined), resolutionYear: new FormControl<number | undefined>(undefined), @@ -90,14 +92,20 @@ export class SearchComponent implements OnInit, OnDestroy { statuses: ApplicationStatusDto[] = []; formEmpty = true; + civicAddressInvalid = false; + pidInvalid = false; + searchResultsHidden = true; constructor( private searchService: SearchService, private activatedRoute: ActivatedRoute, private localGovernmentService: ApplicationLocalGovernmentService, private applicationService: ApplicationService, - private toastService: ToastService - ) {} + private toastService: ToastService, + private titleService: Title + ) { + this.titleService.setTitle('ALCS | Search'); + } ngOnInit(): void { this.setup(); @@ -122,13 +130,16 @@ export class SearchComponent implements OnInit, OnDestroy { page: this.pageIndex + 1, sortDirection: this.sortDirection, sortField: this.sortField, - applicationFileTypes: [], + fileTypes: [], }) - .then((result) => this.mapSearchResults(result)); + .then((result) => { + this.searchResultsHidden = false; + this.mapSearchResults(result); + }); } }); - this.searchForm.valueChanges.subscribe(() => { + this.searchForm.valueChanges.pipe(takeUntil(this.$destroy)).subscribe(() => { let isEmpty = true; for (let key in this.searchForm.controls) { let value = this.searchForm.controls[key as keyof typeof this.searchForm.controls].value; @@ -139,6 +150,15 @@ export class SearchComponent implements OnInit, OnDestroy { } this.formEmpty = isEmpty; }); + + this.civicAddressControl.valueChanges.pipe(takeUntil(this.$destroy)).subscribe(() => { + this.civicAddressInvalid = + this.civicAddressControl.invalid && (this.civicAddressControl.dirty || this.civicAddressControl.touched); + }); + + this.pidControl.valueChanges.pipe(takeUntil(this.$destroy)).subscribe(() => { + this.pidInvalid = this.pidControl.invalid && (this.pidControl.dirty || this.pidControl.touched); + }); } private setup() { @@ -166,9 +186,14 @@ export class SearchComponent implements OnInit, OnDestroy { async onSubmit() { const searchParams = this.getSearchParams(); const result = await this.searchService.advancedSearchFetch(searchParams); - this.mapSearchResults(result); + this.searchResultsHidden = false; - this.setActiveTab(); + // push tab activation to next render cycle, after the tabGroup is rendered + setTimeout(() => { + this.mapSearchResults(result); + + this.setActiveTab(); + }); } expandSearchClicked() { @@ -201,7 +226,10 @@ export class SearchComponent implements OnInit, OnDestroy { onReset() { this.searchForm.reset(); - this.fileTypeFilterDropDownComponent.reset(); + + if (this.fileTypeFilterDropDownComponent) { + this.fileTypeFilterDropDownComponent.reset(); + } } getSearchParams(): SearchRequestDto { @@ -237,9 +265,7 @@ export class SearchComponent implements OnInit, OnDestroy { dateDecidedTo: this.searchForm.controls.dateDecidedTo.value ? formatDateForApi(this.searchForm.controls.dateDecidedTo.value) : undefined, - applicationFileTypes: this.searchForm.controls.componentType.value - ? this.searchForm.controls.componentType.value - : [], + fileTypes: this.searchForm.controls.componentType.value ? this.searchForm.controls.componentType.value : [], }; } @@ -331,6 +357,7 @@ export class SearchComponent implements OnInit, OnDestroy { private setActiveTab() { let maxVal = Math.max(this.applicationTotal, this.noticeOfIntentTotal, this.nonApplicationsTotal); + this.tabGroup.selectedIndex = maxVal === this.applicationTotal ? APPLICATION_TAB_INDEX diff --git a/alcs-frontend/src/app/services/search/search.dto.ts b/alcs-frontend/src/app/services/search/search.dto.ts index a408638827..461080640e 100644 --- a/alcs-frontend/src/app/services/search/search.dto.ts +++ b/alcs-frontend/src/app/services/search/search.dto.ts @@ -63,7 +63,7 @@ export interface SearchRequestDto extends PagingRequestDto { dateSubmittedTo?: number; dateDecidedFrom?: number; dateDecidedTo?: number; - applicationFileTypes: string[]; + fileTypes: string[]; } export interface NonApplicationsSearchRequestDto extends PagingRequestDto { diff --git a/alcs-frontend/src/app/services/search/search.service.spec.ts b/alcs-frontend/src/app/services/search/search.service.spec.ts index 5af45138fc..aef1dfc0ae 100644 --- a/alcs-frontend/src/app/services/search/search.service.spec.ts +++ b/alcs-frontend/src/app/services/search/search.service.spec.ts @@ -56,7 +56,7 @@ describe('SearchService', () => { sortField: '1', sortDirection: 'ASC', isIncludeOtherParcels: false, - applicationFileTypes: [], + fileTypes: [], }; beforeEach(() => { diff --git a/services/apps/alcs/src/alcs/search/application/application-advanced-search.service.spec.ts b/services/apps/alcs/src/alcs/search/application/application-advanced-search.service.spec.ts index 5ff132c11d..ebe8a97986 100644 --- a/services/apps/alcs/src/alcs/search/application/application-advanced-search.service.spec.ts +++ b/services/apps/alcs/src/alcs/search/application/application-advanced-search.service.spec.ts @@ -30,7 +30,7 @@ describe('ApplicationAdvancedSearchService', () => { dateDecidedTo: new Date('2021-11-10').getTime(), resolutionNumber: 123, resolutionYear: 2021, - applicationFileTypes: ['type1', 'type2'], + fileTypes: ['type1', 'type2'], page: 1, pageSize: 10, sortField: 'ownerName', diff --git a/services/apps/alcs/src/alcs/search/application/application-advanced-search.service.ts b/services/apps/alcs/src/alcs/search/application/application-advanced-search.service.ts index 82d2199802..77269de13d 100644 --- a/services/apps/alcs/src/alcs/search/application/application-advanced-search.service.ts +++ b/services/apps/alcs/src/alcs/search/application/application-advanced-search.service.ts @@ -1,9 +1,13 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; + import { Brackets, Repository } from 'typeorm'; import { ApplicationOwner } from '../../../portal/application-submission/application-owner/application-owner.entity'; import { ApplicationParcel } from '../../../portal/application-submission/application-parcel/application-parcel.entity'; -import { formatIncomingDate } from '../../../utils/incoming-date.formatter'; +import { + getNextDayToPacific, + getStartOfDayToPacific, +} from '../../../utils/pacific-date-time-helper'; import { formatStringToPostgresSearchStringArrayWithWildCard } from '../../../utils/search-helper'; import { ApplicationDecisionComponent } from '../../application-decision/application-decision-v2/application-decision/component/application-decision-component.entity'; import { ApplicationDecision } from '../../application-decision/application-decision.entity'; @@ -169,42 +173,41 @@ export class ApplicationAdvancedSearchService { searchDto: SearchRequestDto, query, ) { - // TODO check dates toIsoString if (searchDto.dateSubmittedFrom) { query = query.andWhere( - 'appSearch.date_submitted_to_alc >= :date_submitted_to_alc', + 'appSearch.date_submitted_to_alc >= :date_submitted_from_alc', { - date_submitted_to_alc: formatIncomingDate( + date_submitted_from_alc: getStartOfDayToPacific( searchDto.dateSubmittedFrom, - )!.toISOString(), + ).toISOString(), }, ); } if (searchDto.dateSubmittedTo) { query = query.andWhere( - 'appSearch.date_submitted_to_alc <= :date_submitted_to_alc', + 'appSearch.date_submitted_to_alc < :date_submitted_to_alc', { - date_submitted_to_alc: formatIncomingDate( + date_submitted_to_alc: getNextDayToPacific( searchDto.dateSubmittedTo, - )!.toISOString(), + ).toISOString(), }, ); } if (searchDto.dateDecidedFrom) { query = query.andWhere('appSearch.decision_date >= :decision_date', { - decision_date: formatIncomingDate( + decision_date: getStartOfDayToPacific( searchDto.dateDecidedFrom, - )!.toISOString(), + ).toISOString(), }); } if (searchDto.dateDecidedTo) { - query = query.andWhere('appSearch.decision_date <= :decision_date_to', { - decision_date_to: formatIncomingDate( + query = query.andWhere('appSearch.decision_date < :decision_date_to', { + decision_date_to: getNextDayToPacific( searchDto.dateDecidedTo, - )!.toISOString(), + ).toISOString(), }); } return query; @@ -330,7 +333,7 @@ export class ApplicationAdvancedSearchService { ) { query = query; - if (searchDto.applicationFileTypes.length > 0) { + if (searchDto.fileTypes.length > 0) { // if decision is not joined yet -> join it. The join of decision happens in compileApplicationDecisionSearchQuery if ( searchDto.resolutionNumber === undefined && @@ -349,12 +352,12 @@ export class ApplicationAdvancedSearchService { new Brackets((qb) => qb .where('appSearch.application_type_code IN (:...typeCodes)', { - typeCodes: searchDto.applicationFileTypes, + typeCodes: searchDto.fileTypes, }) .orWhere( 'decisionComponent.application_decision_component_type_code IN (:...typeCodes)', { - typeCodes: searchDto.applicationFileTypes, + typeCodes: searchDto.fileTypes, }, ), ), diff --git a/services/apps/alcs/src/alcs/search/non-applications/non-applications-view.entity.ts b/services/apps/alcs/src/alcs/search/non-applications/non-applications-view.entity.ts index a27f5384a1..bd502a97d5 100644 --- a/services/apps/alcs/src/alcs/search/non-applications/non-applications-view.entity.ts +++ b/services/apps/alcs/src/alcs/search/non-applications/non-applications-view.entity.ts @@ -18,6 +18,7 @@ import { LocalGovernment } from '../../local-government/local-government.entity' ,non_applications."local_government_uuid" as "local_government_uuid" ,non_applications."card_uuid" ,non_applications."board_code" + ,non_applications."region_code" FROM ( SELECT @@ -28,7 +29,8 @@ import { LocalGovernment } from '../../local-government/local-government.entity' 'COV' AS "class", cov.local_government_uuid AS "local_government_uuid", card.uuid AS "card_uuid", - board.code AS "board_code" + board.code AS "board_code", + cov.region_code AS "region_code" FROM alcs.covenant cov LEFT JOIN alcs.card card ON @@ -45,7 +47,8 @@ import { LocalGovernment } from '../../local-government/local-government.entity' 'PLAN' AS "class", planning_review.local_government_uuid AS "local_government_uuid", card.uuid AS "card_uuid", - board.code AS "board_code" + board.code AS "board_code", + planning_review.region_code AS "region_code" FROM alcs.planning_review planning_review LEFT JOIN alcs.card card ON @@ -82,6 +85,9 @@ export class NonApplicationSearchView { @ViewColumn() boardCode: string | null; + @ViewColumn() + regionCode: string; + @ManyToOne(() => LocalGovernment, { nullable: true, }) diff --git a/services/apps/alcs/src/alcs/search/non-applications/non-applications.service.spec.ts b/services/apps/alcs/src/alcs/search/non-applications/non-applications.service.spec.ts index c09bf228f3..aed95b4034 100644 --- a/services/apps/alcs/src/alcs/search/non-applications/non-applications.service.spec.ts +++ b/services/apps/alcs/src/alcs/search/non-applications/non-applications.service.spec.ts @@ -23,6 +23,7 @@ describe('NonApplicationsService', () => { pageSize: 10, sortField: 'applicant', sortDirection: 'ASC', + fileTypes: [], }; beforeEach(async () => { diff --git a/services/apps/alcs/src/alcs/search/non-applications/non-applications.service.ts b/services/apps/alcs/src/alcs/search/non-applications/non-applications.service.ts index 70d0c9762a..19a5fedd8b 100644 --- a/services/apps/alcs/src/alcs/search/non-applications/non-applications.service.ts +++ b/services/apps/alcs/src/alcs/search/non-applications/non-applications.service.ts @@ -91,6 +91,12 @@ export class NonApplicationsAdvancedSearchService { }); } + if (searchDto.fileTypes.length > 0) { + query = query.andWhere('nonApp.class IN (:...typeCodes)', { + typeCodes: searchDto.fileTypes, + }); + } + return query; } } diff --git a/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-advanced-search.service.spec.ts b/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-advanced-search.service.spec.ts index 2ac66de0c5..34c89667eb 100644 --- a/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-advanced-search.service.spec.ts +++ b/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-advanced-search.service.spec.ts @@ -29,7 +29,7 @@ describe('NoticeOfIntentService', () => { dateDecidedTo: new Date('2021-11-10').getTime(), resolutionNumber: 123, resolutionYear: 2021, - applicationFileTypes: ['type1', 'type2'], + fileTypes: ['type1', 'type2'], page: 1, pageSize: 10, sortField: 'ownerName', diff --git a/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-advanced-search.service.ts b/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-advanced-search.service.ts index 312a0f8dbe..96e3be2e1f 100644 --- a/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-advanced-search.service.ts +++ b/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-advanced-search.service.ts @@ -3,10 +3,12 @@ import { InjectRepository } from '@nestjs/typeorm'; import { Brackets, Repository } from 'typeorm'; import { NoticeOfIntentOwner } from '../../../portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.entity'; import { NoticeOfIntentParcel } from '../../../portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.entity'; -import { formatIncomingDate } from '../../../utils/incoming-date.formatter'; +import { + getNextDayToPacific, + getStartOfDayToPacific, +} from '../../../utils/pacific-date-time-helper'; import { formatStringToPostgresSearchStringArrayWithWildCard } from '../../../utils/search-helper'; import { LocalGovernment } from '../../local-government/local-government.entity'; -import { NoticeOfIntentDecisionComponent } from '../../notice-of-intent-decision/notice-of-intent-decision-component/notice-of-intent-decision-component.entity'; import { NoticeOfIntentDecision } from '../../notice-of-intent-decision/notice-of-intent-decision.entity'; import { AdvancedSearchResultDto, SearchRequestDto } from '../search.dto'; import { NoticeOfIntentSubmissionSearchView } from './notice-of-intent-search-view.entity'; @@ -158,39 +160,39 @@ export class NoticeOfIntentAdvancedSearchService { // TODO check dates toIsoString if (searchDto.dateSubmittedFrom) { query = query.andWhere( - 'noiSearch.date_submitted_to_alc >= :date_submitted_to_alc', + 'noiSearch.date_submitted_to_alc >= :date_submitted_from_alc', { - date_submitted_to_alc: formatIncomingDate( + date_submitted_from_alc: getStartOfDayToPacific( searchDto.dateSubmittedFrom, - )!.toISOString(), + ).toISOString(), }, ); } if (searchDto.dateSubmittedTo) { query = query.andWhere( - 'noiSearch.date_submitted_to_alc <= :date_submitted_to_alc', + 'noiSearch.date_submitted_to_alc < :date_submitted_to_alc', { - date_submitted_to_alc: formatIncomingDate( + date_submitted_to_alc: getNextDayToPacific( searchDto.dateSubmittedTo, - )!.toISOString(), + ).toISOString(), }, ); } if (searchDto.dateDecidedFrom) { query = query.andWhere('noiSearch.decision_date >= :decision_date', { - decision_date: formatIncomingDate( + decision_date: getStartOfDayToPacific( searchDto.dateDecidedFrom, - )!.toISOString(), + ).toISOString(), }); } if (searchDto.dateDecidedTo) { - query = query.andWhere('noiSearch.decision_date <= :decision_date_to', { - decision_date_to: formatIncomingDate( + query = query.andWhere('noiSearch.decision_date < :decision_date_to', { + decision_date_to: getNextDayToPacific( searchDto.dateDecidedTo, - )!.toISOString(), + ).toISOString(), }); } return query; diff --git a/services/apps/alcs/src/alcs/search/search.controller.spec.ts b/services/apps/alcs/src/alcs/search/search.controller.spec.ts index f96080cb21..3353783645 100644 --- a/services/apps/alcs/src/alcs/search/search.controller.spec.ts +++ b/services/apps/alcs/src/alcs/search/search.controller.spec.ts @@ -151,7 +151,8 @@ describe('SearchController', () => { sortField: '1', sortDirection: 'ASC', isIncludeOtherParcels: false, - applicationFileTypes: [], + name: 'test', + fileTypes: [], }; const result = await controller.advancedSearch( @@ -193,7 +194,7 @@ describe('SearchController', () => { sortField: '1', sortDirection: 'ASC', isIncludeOtherParcels: false, - applicationFileTypes: [], + fileTypes: [], }; const result = await controller.advancedSearchApplications( @@ -217,7 +218,7 @@ describe('SearchController', () => { sortField: '1', sortDirection: 'ASC', isIncludeOtherParcels: false, - applicationFileTypes: [], + fileTypes: [], }; const result = await controller.advancedSearchNoticeOfIntents( @@ -240,6 +241,7 @@ describe('SearchController', () => { page: 1, sortField: '1', sortDirection: 'ASC', + fileTypes: [], }; const result = await controller.advancedSearchNonApplications( @@ -263,7 +265,7 @@ describe('SearchController', () => { sortField: '1', sortDirection: 'ASC', isIncludeOtherParcels: false, - applicationFileTypes: ['NFUP'], + fileTypes: ['NFUP'], }; const result = await controller.advancedSearch( @@ -287,7 +289,7 @@ describe('SearchController', () => { sortField: '1', sortDirection: 'ASC', isIncludeOtherParcels: false, - applicationFileTypes: ['NOI'], + fileTypes: ['NOI'], }; const result = await controller.advancedSearch( @@ -311,7 +313,7 @@ describe('SearchController', () => { sortField: '1', sortDirection: 'ASC', isIncludeOtherParcels: false, - applicationFileTypes: ['COV'], + fileTypes: ['COV'], }; const result = await controller.advancedSearch( @@ -329,4 +331,44 @@ describe('SearchController', () => { expect(result.nonApplications).toBeDefined(); expect(result.totalNonApplications).toBe(0); }); + + it('should NOT call NOI and Non-applications advanced search to retrieve NOIs and Non-applications if no NOI or non-application search fields specified', async () => { + const baseMockSearchRequestDto = { + pageSize: 1, + page: 1, + sortField: '1', + sortDirection: 'ASC', + fileTypes: [], + }; + const mockSearchRequestDto = { + ...baseMockSearchRequestDto, + isIncludeOtherParcels: false, + }; + + const result = await controller.advancedSearch({ + ...mockSearchRequestDto, + legacyId: 'test', + } as SearchRequestDto); + + expect( + mockApplicationAdvancedSearchService.searchApplications, + ).toBeCalledTimes(1); + expect( + mockApplicationAdvancedSearchService.searchApplications, + ).toBeCalledWith({ ...mockSearchRequestDto, legacyId: 'test' }); + expect(result.applications).toBeDefined(); + expect(result.totalApplications).toBe(0); + + expect( + mockNoticeOfIntentAdvancedSearchService.searchNoticeOfIntents, + ).toBeCalledTimes(0); + expect(result.noticeOfIntents).toBeDefined(); + expect(result.totalNoticeOfIntents).toBe(0); + + expect( + mockNonApplicationsAdvancedSearchService.searchNonApplications, + ).toBeCalledTimes(0); + expect(result.nonApplications).toBeDefined(); + expect(result.totalNonApplications).toBe(0); + }); }); diff --git a/services/apps/alcs/src/alcs/search/search.controller.ts b/services/apps/alcs/src/alcs/search/search.controller.ts index 00d9d74206..d895fef288 100644 --- a/services/apps/alcs/src/alcs/search/search.controller.ts +++ b/services/apps/alcs/src/alcs/search/search.controller.ts @@ -169,17 +169,8 @@ export class SearchController { @Post('/advanced') @UserRoles(...ROLES_ALLOWED_APPLICATIONS) async advancedSearch(@Body() searchDto: SearchRequestDto) { - let searchApplications = true; - let searchNoi = true; - let searchNonApplications = true; - - ({ searchApplications, searchNoi, searchNonApplications } = - this.getEntitiesTypeToSearch( - searchDto, - searchApplications, - searchNoi, - searchNonApplications, - )); + const { searchApplications, searchNoi, searchNonApplications } = + this.getEntitiesTypeToSearch(searchDto); let applicationSearchResult: AdvancedSearchResultDto< ApplicationSubmissionSearchView[] @@ -277,15 +268,16 @@ export class SearchController { }; } - private getEntitiesTypeToSearch( - searchDto: SearchRequestDto, - searchApplications: boolean, - searchNoi: boolean, - searchNonApplications: boolean, - ) { - if (searchDto.applicationFileTypes.length > 0) { + private getEntitiesTypeToSearch(searchDto: SearchRequestDto) { + let searchApplications = true; + let searchNoi = true; + let searchNonApplications = true; + + let nonApplicationTypeSpecified = false; + let noiTypeSpecified = false; + if (searchDto.fileTypes.length > 0) { searchApplications = - searchDto.applicationFileTypes.filter((searchType) => + searchDto.fileTypes.filter((searchType) => Object.values(APPLICATION_SUBMISSION_TYPES).includes( APPLICATION_SUBMISSION_TYPES[ searchType as keyof typeof APPLICATION_SUBMISSION_TYPES @@ -293,16 +285,19 @@ export class SearchController { ), ).length > 0; - searchNoi = searchDto.applicationFileTypes.includes('NOI'); + noiTypeSpecified = searchDto.fileTypes.includes('NOI'); - searchNonApplications = - searchDto.applicationFileTypes.filter((searchType) => + nonApplicationTypeSpecified = + searchDto.fileTypes.filter((searchType) => ['COV', 'PLAN', 'SRW'].includes(searchType), ).length > 0; } + searchNoi = + noiTypeSpecified || this.areAnyNoiSearchFieldsSpecified(searchDto); + searchNonApplications = - searchNonApplications || + nonApplicationTypeSpecified || isStringSetAndNotEmpty(searchDto.fileNumber) || isStringSetAndNotEmpty(searchDto.governmentName) || isStringSetAndNotEmpty(searchDto.regionCode) || @@ -311,6 +306,30 @@ export class SearchController { return { searchApplications, searchNoi, searchNonApplications }; } + public areAnyNoiSearchFieldsSpecified(searchDto: SearchRequestDto): boolean { + for (const key in searchDto) { + if ( + searchDto.hasOwnProperty(key) && + ![ + 'legacyId', + 'isIncludeOtherParcels', + 'fileTypes', + 'page', + 'pageSize', + 'sortField', + 'sortDirection', + ].includes(key) && + searchDto[key] !== undefined && + searchDto[key] !== '' && + searchDto[key] !== [] + ) { + return true; + } + } + + return false; + } + private mapAdvancedSearchResults( applications: AdvancedSearchResultDto< ApplicationSubmissionSearchView[] diff --git a/services/apps/alcs/src/alcs/search/search.dto.ts b/services/apps/alcs/src/alcs/search/search.dto.ts index dce8b16d4f..ff084814b4 100644 --- a/services/apps/alcs/src/alcs/search/search.dto.ts +++ b/services/apps/alcs/src/alcs/search/search.dto.ts @@ -149,7 +149,7 @@ export class SearchRequestDto extends PagingRequestDto { dateDecidedTo?: number; @IsArray() - applicationFileTypes: string[]; + fileTypes: string[]; } export class NonApplicationsSearchRequestDto extends PagingRequestDto { @@ -168,4 +168,7 @@ export class NonApplicationsSearchRequestDto extends PagingRequestDto { @IsString() @IsOptional() name?: string; + + @IsArray() + fileTypes: string[]; } diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1694794266666-missing_region_code.ts b/services/apps/alcs/src/providers/typeorm/migrations/1694794266666-missing_region_code.ts new file mode 100644 index 0000000000..ce501f510b --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1694794266666-missing_region_code.ts @@ -0,0 +1,134 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class missingRegionCode1694794266666 implements MigrationInterface { + name = 'missingRegionCode1694794266666'; + + public async up(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, + ['VIEW', 'non_application_search_view', 'alcs'], + ); + await queryRunner.query(`DROP VIEW "alcs"."non_application_search_view"`); + await queryRunner.query(`CREATE VIEW "alcs"."non_application_search_view" AS + SELECT + non_applications."uuid" + ,non_applications."file_number" + ,non_applications."applicant" + ,non_applications."type" + ,non_applications."class" + ,non_applications."local_government_uuid" as "local_government_uuid" + ,non_applications."card_uuid" + ,non_applications."board_code" + ,non_applications."region_code" + FROM + ( + SELECT + cov.uuid AS "uuid", + cov.file_number AS "file_number", + "applicant", + NULL AS "type", + 'COV' AS "class", + cov.local_government_uuid AS "local_government_uuid", + card.uuid AS "card_uuid", + board.code AS "board_code", + cov.region_code AS "region_code" + FROM + alcs.covenant cov + LEFT JOIN alcs.card card ON + cov.card_uuid = card.uuid AND card.audit_deleted_date_at IS NULL + LEFT JOIN alcs.board board ON + board.uuid = card.board_uuid AND board.audit_deleted_date_at IS NULL + WHERE cov.audit_deleted_date_at IS NULL + UNION + SELECT + planning_review.uuid AS "uuid", + planning_review.file_number AS "file_number", + NULL AS "applicant", + "type", + 'PLAN' AS "class", + planning_review.local_government_uuid AS "local_government_uuid", + card.uuid AS "card_uuid", + board.code AS "board_code", + planning_review.region_code AS "region_code" + FROM + alcs.planning_review planning_review + LEFT JOIN alcs.card card ON + planning_review.card_uuid = card.uuid AND card.audit_deleted_date_at IS NULL + LEFT JOIN alcs.board board ON + board.uuid = card.board_uuid AND board.audit_deleted_date_at IS NULL + WHERE planning_review.audit_deleted_date_at IS NULL + ) AS non_applications +`); + await queryRunner.query( + `INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, + [ + 'alcs', + 'VIEW', + 'non_application_search_view', + 'SELECT\n non_applications."uuid"\n ,non_applications."file_number"\n ,non_applications."applicant" \n ,non_applications."type"\n ,non_applications."class"\n ,non_applications."local_government_uuid" as "local_government_uuid"\n ,non_applications."card_uuid"\n ,non_applications."board_code"\n ,non_applications."region_code"\n FROM\n (\n SELECT\n cov.uuid AS "uuid",\n cov.file_number AS "file_number",\n "applicant",\n NULL AS "type",\n \'COV\' AS "class",\n cov.local_government_uuid AS "local_government_uuid",\n card.uuid AS "card_uuid",\n board.code AS "board_code",\n cov.region_code AS "region_code"\n FROM\n alcs.covenant cov\n LEFT JOIN alcs.card card ON\n cov.card_uuid = card.uuid AND card.audit_deleted_date_at IS NULL\n LEFT JOIN alcs.board board ON\n board.uuid = card.board_uuid AND board.audit_deleted_date_at IS NULL\n WHERE cov.audit_deleted_date_at IS NULL\n UNION\n SELECT\n planning_review.uuid AS "uuid",\n planning_review.file_number AS "file_number",\n NULL AS "applicant",\n "type",\n \'PLAN\' AS "class",\n planning_review.local_government_uuid AS "local_government_uuid",\n card.uuid AS "card_uuid",\n board.code AS "board_code",\n planning_review.region_code AS "region_code"\n FROM\n alcs.planning_review planning_review \n LEFT JOIN alcs.card card ON\n planning_review.card_uuid = card.uuid AND card.audit_deleted_date_at IS NULL\n LEFT JOIN alcs.board board ON\n board.uuid = card.board_uuid AND board.audit_deleted_date_at IS NULL\n WHERE planning_review.audit_deleted_date_at IS NULL\n ) AS non_applications', + ], + ); + } + + public async down(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, + ['VIEW', 'non_application_search_view', 'alcs'], + ); + await queryRunner.query(`DROP VIEW "alcs"."non_application_search_view"`); + await queryRunner.query(`CREATE VIEW "alcs"."non_application_search_view" AS SELECT + non_applications."uuid" + ,non_applications."file_number" + ,non_applications."applicant" + ,non_applications."type" + ,non_applications."class" + ,non_applications."local_government_uuid" as "local_government_uuid" + ,non_applications."card_uuid" + ,non_applications."board_code" + FROM + ( + SELECT + cov.uuid AS "uuid", + cov.file_number AS "file_number", + "applicant", + NULL AS "type", + 'COV' AS "class", + cov.local_government_uuid AS "local_government_uuid", + card.uuid AS "card_uuid", + board.code AS "board_code" + FROM + alcs.covenant cov + LEFT JOIN alcs.card card ON + cov.card_uuid = card.uuid AND card.audit_deleted_date_at IS NULL + LEFT JOIN alcs.board board ON + board.uuid = card.board_uuid AND board.audit_deleted_date_at IS NULL + WHERE cov.audit_deleted_date_at IS NULL + UNION + SELECT + planning_review.uuid AS "uuid", + planning_review.file_number AS "file_number", + NULL AS "applicant", + "type", + 'PLAN' AS "class", + planning_review.local_government_uuid AS "local_government_uuid", + card.uuid AS "card_uuid", + board.code AS "board_code" + FROM + alcs.planning_review planning_review + LEFT JOIN alcs.card card ON + planning_review.card_uuid = card.uuid AND card.audit_deleted_date_at IS NULL + LEFT JOIN alcs.board board ON + board.uuid = card.board_uuid AND board.audit_deleted_date_at IS NULL + WHERE planning_review.audit_deleted_date_at IS NULL + ) AS non_applications`); + await queryRunner.query( + `INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, + [ + 'alcs', + 'VIEW', + 'non_application_search_view', + 'SELECT\n non_applications."uuid"\n ,non_applications."file_number"\n ,non_applications."applicant" \n ,non_applications."type"\n ,non_applications."class"\n ,non_applications."local_government_uuid" as "local_government_uuid"\n ,non_applications."card_uuid"\n ,non_applications."board_code"\n FROM\n (\n SELECT\n cov.uuid AS "uuid",\n cov.file_number AS "file_number",\n "applicant",\n NULL AS "type",\n \'COV\' AS "class",\n cov.local_government_uuid AS "local_government_uuid",\n card.uuid AS "card_uuid",\n board.code AS "board_code"\n FROM\n alcs.covenant cov\n LEFT JOIN alcs.card card ON\n cov.card_uuid = card.uuid AND card.audit_deleted_date_at IS NULL\n LEFT JOIN alcs.board board ON\n board.uuid = card.board_uuid AND board.audit_deleted_date_at IS NULL\n WHERE cov.audit_deleted_date_at IS NULL\n UNION\n SELECT\n planning_review.uuid AS "uuid",\n planning_review.file_number AS "file_number",\n NULL AS "applicant",\n "type",\n \'PLAN\' AS "class",\n planning_review.local_government_uuid AS "local_government_uuid",\n card.uuid AS "card_uuid",\n board.code AS "board_code"\n FROM\n alcs.planning_review planning_review \n LEFT JOIN alcs.card card ON\n planning_review.card_uuid = card.uuid AND card.audit_deleted_date_at IS NULL\n LEFT JOIN alcs.board board ON\n board.uuid = card.board_uuid AND board.audit_deleted_date_at IS NULL\n WHERE planning_review.audit_deleted_date_at IS NULL\n ) AS non_applications', + ], + ); + } +} diff --git a/services/apps/alcs/src/utils/pacific-date-time-helper.spec.ts b/services/apps/alcs/src/utils/pacific-date-time-helper.spec.ts new file mode 100644 index 0000000000..9a514c6d4c --- /dev/null +++ b/services/apps/alcs/src/utils/pacific-date-time-helper.spec.ts @@ -0,0 +1,23 @@ +/* eslint-disable @typescript-eslint/ban-ts-comment */ +import { + getNextDayToPacific, + getStartOfDayToPacific, +} from './pacific-date-time-helper'; + +describe('Pacific date helpers', () => { + test('tests getNextDayToPacific function', () => { + const mockTimestamp = 1633024800000; + const expectedDate = new Date('2021-10-01T07:00:00.000Z'); + + const result = getNextDayToPacific(mockTimestamp); + expect(result).toEqual(expectedDate); + }); + + test('tests getStartOfDayToPacific function', () => { + const mockTimestamp = 1633024800000; + const expectedDate = new Date('2021-09-30T07:00:00.000Z'); + + const result = getStartOfDayToPacific(mockTimestamp); + expect(result).toEqual(expectedDate); + }); +}); diff --git a/services/apps/alcs/src/utils/pacific-date-time-helper.ts b/services/apps/alcs/src/utils/pacific-date-time-helper.ts new file mode 100644 index 0000000000..8200529426 --- /dev/null +++ b/services/apps/alcs/src/utils/pacific-date-time-helper.ts @@ -0,0 +1,17 @@ +import * as dayjs from 'dayjs'; +import * as timezone from 'dayjs/plugin/timezone'; +import * as utc from 'dayjs/plugin/utc'; +import { formatIncomingDate } from './incoming-date.formatter'; + +dayjs.extend(utc); +dayjs.extend(timezone); + +export const getNextDayToPacific = (timestamp: number) => { + const date = formatIncomingDate(timestamp); + return dayjs(date).tz('Canada/Pacific').add(1, 'day').startOf('day').toDate(); +}; + +export const getStartOfDayToPacific = (timestamp: number) => { + const date = formatIncomingDate(timestamp); + return dayjs(date).tz('Canada/Pacific').startOf('day').toDate(); +}; From 1b58d4532b2526079abba01ea091b56a5e8b2b2d Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Fri, 15 Sep 2023 15:25:55 -0700 Subject: [PATCH 391/954] Bug Fixes * Add status pill to NOI Card Dialogs * Fix bugs with TUR applications and using your own government --- .../notice-of-intent-dialog.component.html | 4 ++ .../notice-of-intent-dialog.component.spec.ts | 5 +++ .../notice-of-intent-dialog.component.ts | 37 ++++++++++++++++++- .../application-details.component.html | 7 +++- .../edit-submission.component.ts | 10 +++-- .../select-government.component.html | 2 +- .../select-government.component.ts | 2 + 7 files changed, 61 insertions(+), 6 deletions(-) diff --git a/alcs-frontend/src/app/features/board/dialogs/notice-of-intent/notice-of-intent-dialog.component.html b/alcs-frontend/src/app/features/board/dialogs/notice-of-intent/notice-of-intent-dialog.component.html index 29b4761b72..dd7c2cf48d 100644 --- a/alcs-frontend/src/app/features/board/dialogs/notice-of-intent/notice-of-intent-dialog.component.html +++ b/alcs-frontend/src/app/features/board/dialogs/notice-of-intent/notice-of-intent-dialog.component.html @@ -42,6 +42,10 @@ <h3 class="card-title"> <div class="header-row"> <div class="left"> <app-time-tracker [data]="noticeOfIntent" [maxActiveDays]="61"></app-time-tracker> + <app-application-submission-status-type-pill + *ngIf="status" + [type]="status" + ></app-application-submission-status-type-pill> </div> <div class="right"> <button matTooltip="Move Board" [matMenuTriggerFor]="moveMenu" mat-icon-button> diff --git a/alcs-frontend/src/app/features/board/dialogs/notice-of-intent/notice-of-intent-dialog.component.spec.ts b/alcs-frontend/src/app/features/board/dialogs/notice-of-intent/notice-of-intent-dialog.component.spec.ts index 329cbbc2d7..1ee6418877 100644 --- a/alcs-frontend/src/app/features/board/dialogs/notice-of-intent/notice-of-intent-dialog.component.spec.ts +++ b/alcs-frontend/src/app/features/board/dialogs/notice-of-intent/notice-of-intent-dialog.component.spec.ts @@ -12,6 +12,7 @@ import { AuthenticationService, ICurrentUser } from '../../../../services/authen import { BoardService, BoardWithFavourite } from '../../../../services/board/board.service'; import { CardDto } from '../../../../services/card/card.dto'; import { CardService } from '../../../../services/card/card.service'; +import { NoticeOfIntentSubmissionStatusService } from '../../../../services/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service'; import { NoticeOfIntentDto, NoticeOfIntentTypeDto } from '../../../../services/notice-of-intent/notice-of-intent.dto'; import { NoticeOfIntentService } from '../../../../services/notice-of-intent/notice-of-intent.service'; import { ToastService } from '../../../../services/toast/toast.service'; @@ -116,6 +117,10 @@ describe('NoticeOfIntentDialogComponent', () => { provide: AuthenticationService, useValue: authenticationService, }, + { + provide: NoticeOfIntentSubmissionStatusService, + useValue: {}, + }, { provide: MatDialogRef, useValue: mockDialogRef }, ], imports: [MatDialogModule, MatSnackBarModule, FormsModule, MatMenuModule, RouterTestingModule, NgSelectModule], diff --git a/alcs-frontend/src/app/features/board/dialogs/notice-of-intent/notice-of-intent-dialog.component.ts b/alcs-frontend/src/app/features/board/dialogs/notice-of-intent/notice-of-intent-dialog.component.ts index db731c1ea6..aeebef486f 100644 --- a/alcs-frontend/src/app/features/board/dialogs/notice-of-intent/notice-of-intent-dialog.component.ts +++ b/alcs-frontend/src/app/features/board/dialogs/notice-of-intent/notice-of-intent-dialog.component.ts @@ -1,13 +1,22 @@ import { Component, Inject, OnInit } from '@angular/core'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { Router } from '@angular/router'; +import { + ApplicationSubmissionToSubmissionStatusDto, + DEFAULT_NO_STATUS, +} from '../../../../services/application/application-submission-status/application-submission-status.dto'; import { AuthenticationService } from '../../../../services/authentication/authentication.service'; import { BoardService, BoardWithFavourite } from '../../../../services/board/board.service'; import { CardService } from '../../../../services/card/card.service'; -import { NoticeOfIntentDto } from '../../../../services/notice-of-intent/notice-of-intent.dto'; +import { NoticeOfIntentSubmissionStatusService } from '../../../../services/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service'; +import { + NoticeOfIntentDto, + NoticeOfIntentSubmissionToSubmissionStatusDto, +} from '../../../../services/notice-of-intent/notice-of-intent.dto'; import { NoticeOfIntentService } from '../../../../services/notice-of-intent/notice-of-intent.service'; import { ToastService } from '../../../../services/toast/toast.service'; import { UserService } from '../../../../services/user/user.service'; +import { ApplicationSubmissionStatusPill } from '../../../../shared/application-submission-status-type-pill/application-submission-status-type-pill.component'; import { RETROACTIVE_TYPE_LABEL } from '../../../../shared/application-type-pill/application-type-pill.constants'; import { ConfirmationDialogService } from '../../../../shared/confirmation-dialog/confirmation-dialog.service'; import { CardDialogComponent } from '../card-dialog/card-dialog.component'; @@ -21,6 +30,7 @@ export class NoticeOfIntentDialogComponent extends CardDialogComponent implement selectedRegion?: string; title?: string; cardTitle = ''; + status?: ApplicationSubmissionStatusPill; noticeOfIntent: NoticeOfIntentDto = this.data; RETROACTIVE_TYPE = RETROACTIVE_TYPE_LABEL; @@ -29,6 +39,7 @@ export class NoticeOfIntentDialogComponent extends CardDialogComponent implement @Inject(MAT_DIALOG_DATA) public data: NoticeOfIntentDto, private dialogRef: MatDialogRef<NoticeOfIntentDialogComponent>, private noticeOfIntentService: NoticeOfIntentService, + private noticeOfIntentSubmissionStatusService: NoticeOfIntentSubmissionStatusService, private router: Router, boardService: BoardService, userService: UserService, @@ -53,6 +64,7 @@ export class NoticeOfIntentDialogComponent extends CardDialogComponent implement this.selectedRegion = noticeOfIntent.region.code; this.userService.fetchAssignableUsers(); this.cardTitle = `${noticeOfIntent.fileNumber} (${noticeOfIntent.applicant})`; + this.populateSubmissionStatus(noticeOfIntent.fileNumber); } private async reload() { @@ -62,6 +74,29 @@ export class NoticeOfIntentDialogComponent extends CardDialogComponent implement } } + private async populateSubmissionStatus(fileNumber: string) { + let submissionStatus: NoticeOfIntentSubmissionToSubmissionStatusDto | null = null; + + try { + submissionStatus = await this.noticeOfIntentSubmissionStatusService.fetchCurrentStatusByFileNumber( + fileNumber, + false + ); + } catch (e) { + console.warn(`No statuses for ${fileNumber}. Is it a manually created submission?`); + } + + if (submissionStatus) { + this.status = { + backgroundColor: submissionStatus.status.alcsBackgroundColor, + textColor: submissionStatus.status.alcsColor, + label: submissionStatus.status.label, + }; + } else { + this.status = DEFAULT_NO_STATUS; + } + } + async onBoardSelected(board: BoardWithFavourite) { this.selectedBoard = board.code; try { diff --git a/portal-frontend/src/app/features/applications/application-details/application-details.component.html b/portal-frontend/src/app/features/applications/application-details/application-details.component.html index 20d8ac1cab..b727a4ff77 100644 --- a/portal-frontend/src/app/features/applications/application-details/application-details.component.html +++ b/portal-frontend/src/app/features/applications/application-details/application-details.component.html @@ -104,7 +104,12 @@ <h3>4. Government</h3> >ALC.Portal@gov.bc.ca</a > / <a href="tel:236-468-3342">236-468-3342</a> </app-warning-banner> - <app-warning-banner *ngIf="showErrors && localGovernment && localGovernment.matchesUserGuid" class="full-row"> + <app-warning-banner + *ngIf=" + showErrors && localGovernment && localGovernment.matchesUserGuid && applicationSubmission.typeCode !== 'TURP' + " + 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 application is submitted. diff --git a/portal-frontend/src/app/features/applications/edit-submission/edit-submission.component.ts b/portal-frontend/src/app/features/applications/edit-submission/edit-submission.component.ts index ee61cfcd8c..a02146e6b8 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/edit-submission.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/edit-submission.component.ts @@ -280,12 +280,15 @@ export class EditSubmissionComponent implements OnInit, OnDestroy, AfterViewInit async onSubmit() { if (this.applicationSubmission) { + const isTUR = this.applicationSubmission.typeCode === 'TURP'; const government = await this.loadGovernment(this.applicationSubmission.localGovernmentUuid); + const governmentName = government?.name ?? 'selected local / first nation government'; + this.dialog .open(SubmitConfirmationDialogComponent, { data: { - governmentName: government?.name ?? 'selected local / first nation government', - userIsGovernment: government?.matchesUserGuid ?? false, + governmentName: isTUR ? 'ALC' : governmentName, + userIsGovernment: (government?.matchesUserGuid && !isTUR) ?? false, }, }) .beforeClosed() @@ -307,7 +310,8 @@ export class EditSubmissionComponent implements OnInit, OnDestroy, AfterViewInit government = await this.loadGovernment(this.applicationSubmission?.localGovernmentUuid); } - if (government && government.matchesUserGuid) { + debugger; + if (government && government.matchesUserGuid && submission.typeCode !== 'TURP') { const review = await this.applicationReviewService.startReview(submission.fileNumber); if (review) { await this.router.navigateByUrl(`/application/${submission?.fileNumber}/review`); diff --git a/portal-frontend/src/app/features/applications/edit-submission/select-government/select-government.component.html b/portal-frontend/src/app/features/applications/edit-submission/select-government/select-government.component.html index 3ad9accac8..c6b2f40f23 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/select-government/select-government.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/select-government/select-government.component.html @@ -45,7 +45,7 @@ <h2>Government</h2> will need to 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> </app-warning-banner> -<app-warning-banner *ngIf="selectedOwnGovernment" class="full-row"> +<app-warning-banner *ngIf="selectedOwnGovernment && typeCode !== 'TURP'" 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 application is submitted. diff --git a/portal-frontend/src/app/features/applications/edit-submission/select-government/select-government.component.ts b/portal-frontend/src/app/features/applications/edit-submission/select-government/select-government.component.ts index b5b264eb7a..aac2bfb205 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/select-government/select-government.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/select-government/select-government.component.ts @@ -30,6 +30,7 @@ export class SelectGovernmentComponent extends StepComponent implements OnInit, form = new FormGroup({ localGovernment: this.localGovernment, }); + typeCode = ''; constructor(private codeService: CodeService, private applicationSubmissionService: ApplicationSubmissionService) { super(); @@ -43,6 +44,7 @@ export class SelectGovernmentComponent extends StepComponent implements OnInit, this.selectGovernmentUuid = applicationSubmission.localGovernmentUuid; this.fileId = applicationSubmission.fileNumber; this.submissionUuid = applicationSubmission.uuid; + this.typeCode = applicationSubmission.typeCode; this.populateLocalGovernment(applicationSubmission.localGovernmentUuid); } }); From f476c560ede1c1f7a135e0045e2260d8dc249cd2 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Fri, 15 Sep 2023 16:09:57 -0700 Subject: [PATCH 392/954] Code Review Feedback --- .../alcs/admin/board-management/board-management.controller.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/apps/alcs/src/alcs/admin/board-management/board-management.controller.ts b/services/apps/alcs/src/alcs/admin/board-management/board-management.controller.ts index 3145afad6f..a9bd8d259b 100644 --- a/services/apps/alcs/src/alcs/admin/board-management/board-management.controller.ts +++ b/services/apps/alcs/src/alcs/admin/board-management/board-management.controller.ts @@ -48,7 +48,7 @@ export class BoardManagementController { @Get('/:code') @UserRoles(AUTH_ROLE.ADMIN) async canDelete(@Param('code') code: string) { - //If it's the vetting board + //If it's the vetting or notification board if (code === 'vett' || code === 'noti') { return { canDelete: false, From 1fa9ba73fbcae8595295156bcfcc85dbbca7f5b5 Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Fri, 15 Sep 2023 17:34:05 -0700 Subject: [PATCH 393/954] adjust date to retrieve submission statuses for email consumers (#976) effective < tomorrow start of day - to make sure that statuses with 6 pm will be included and relationships for submission --- ...lication-submission-status.service.spec.ts | 19 ++++++++++++++----- .../application-submission-status.service.ts | 8 +++++--- ...f-intent-submission-status.service.spec.ts | 18 ++++++++++++++---- ...ice-of-intent-submission-status.service.ts | 4 ++-- .../status-emails/status-emails.consumer.ts | 7 ++++--- .../status-emails.consumer.ts | 7 ++++--- 6 files changed, 43 insertions(+), 20 deletions(-) diff --git a/services/apps/alcs/src/alcs/application/application-submission-status/application-submission-status.service.spec.ts b/services/apps/alcs/src/alcs/application/application-submission-status/application-submission-status.service.spec.ts index a8239a42d3..634d12a030 100644 --- a/services/apps/alcs/src/alcs/application/application-submission-status/application-submission-status.service.spec.ts +++ b/services/apps/alcs/src/alcs/application/application-submission-status/application-submission-status.service.spec.ts @@ -5,7 +5,7 @@ import { getRepositoryToken } from '@nestjs/typeorm'; import * as dayjs from 'dayjs'; import * as timezone from 'dayjs/plugin/timezone'; import * as utc from 'dayjs/plugin/utc'; -import { In, IsNull, LessThanOrEqual, Repository } from 'typeorm'; +import { And, In, IsNull, LessThan, Not, Repository } from 'typeorm'; import { ApplicationSubmission } from '../../../portal/application-submission/application-submission.entity'; import { ApplicationSubmissionStatusService } from './application-submission-status.service'; import { ApplicationSubmissionStatusType } from './submission-status-type.entity'; @@ -433,12 +433,18 @@ describe('ApplicationSubmissionStatusService', () => { }); it('should call find to retrieve ALCD and REVA statuses', async () => { + const mockStatuses = [ + new ApplicationSubmissionToSubmissionStatus({ + statusTypeCode: SUBMISSION_STATUS.ALC_DECISION, + }), + ]; mockApplicationSubmissionToSubmissionStatusRepository.find.mockResolvedValue( - [], + mockStatuses, ); const date = new Date(); - await service.getSubmissionToSubmissionStatusForSendingEmails(date); + const result = + await service.getSubmissionToSubmissionStatusForSendingEmails(date); expect( mockApplicationSubmissionToSubmissionStatusRepository.find, @@ -452,12 +458,15 @@ describe('ApplicationSubmissionStatusService', () => { SUBMISSION_STATUS.IN_REVIEW_BY_ALC, ]), emailSentDate: IsNull(), - effectiveDate: LessThanOrEqual(date), + effectiveDate: And(Not(IsNull()), LessThan(date)), }, relations: { - submission: true, + submission: { + submissionStatuses: true, + }, }, }); + expect(result).toEqual(mockStatuses); }); it('should call save to save SubmissionToSubmissionStatus', async () => { diff --git a/services/apps/alcs/src/alcs/application/application-submission-status/application-submission-status.service.ts b/services/apps/alcs/src/alcs/application/application-submission-status/application-submission-status.service.ts index 33c9f1b66e..22b9fc6e33 100644 --- a/services/apps/alcs/src/alcs/application/application-submission-status/application-submission-status.service.ts +++ b/services/apps/alcs/src/alcs/application/application-submission-status/application-submission-status.service.ts @@ -4,7 +4,7 @@ import { InjectRepository } from '@nestjs/typeorm'; import * as dayjs from 'dayjs'; import * as timezone from 'dayjs/plugin/timezone'; import * as utc from 'dayjs/plugin/utc'; -import { In, IsNull, LessThanOrEqual, Repository } from 'typeorm'; +import { And, In, IsNull, LessThan, Not, Repository } from 'typeorm'; import { ApplicationSubmission } from '../../../portal/application-submission/application-submission.entity'; import { ApplicationSubmissionStatusType } from './submission-status-type.entity'; import { SUBMISSION_STATUS } from './submission-status.dto'; @@ -152,10 +152,12 @@ export class ApplicationSubmissionStatusService { SUBMISSION_STATUS.IN_REVIEW_BY_ALC, ]), emailSentDate: IsNull(), - effectiveDate: LessThanOrEqual(date), // this will get only statuses <= today since the status service converts all days to .startOf('day') + effectiveDate: And(Not(IsNull()), LessThan(date)), // this will get only statuses < tomorrow start of day since the status service converts all days to .startOf('day') }, relations: { - submission: true, + submission: { + submissionStatuses: true, + }, }, }); } diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service.spec.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service.spec.ts index 44c5533dc9..0afdf05a13 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service.spec.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service.spec.ts @@ -5,7 +5,7 @@ import { getRepositoryToken } from '@nestjs/typeorm'; import * as dayjs from 'dayjs'; import * as timezone from 'dayjs/plugin/timezone'; import * as utc from 'dayjs/plugin/utc'; -import { In, IsNull, LessThanOrEqual, Repository } from 'typeorm'; +import { And, In, IsNull, LessThan, Not, Repository } from 'typeorm'; import { NoticeOfIntentSubmission } from '../../../portal/notice-of-intent-submission/notice-of-intent-submission.entity'; import { NoticeOfIntentSubmissionStatusType } from './notice-of-intent-status-type.entity'; import { NOI_SUBMISSION_STATUS } from './notice-of-intent-status.dto'; @@ -430,17 +430,26 @@ describe('NoticeOfIntentSubmissionStatusService', () => { }); it('should call find to retrieve ALCD statuses', async () => { - mockSubmissionToSubmissionStatusRepository.find.mockResolvedValue([]); + const mockStatuses = [ + new NoticeOfIntentSubmissionToSubmissionStatus({ + statusTypeCode: NOI_SUBMISSION_STATUS.ALC_DECISION, + }), + ]; + + mockSubmissionToSubmissionStatusRepository.find.mockResolvedValue( + mockStatuses, + ); const date = new Date(); - await service.getSubmissionToSubmissionStatusForSendingEmails(date); + const result = + await service.getSubmissionToSubmissionStatusForSendingEmails(date); expect(mockSubmissionToSubmissionStatusRepository.find).toBeCalledTimes(1); expect(mockSubmissionToSubmissionStatusRepository.find).toBeCalledWith({ where: { statusTypeCode: In([NOI_SUBMISSION_STATUS.ALC_DECISION]), emailSentDate: IsNull(), - effectiveDate: LessThanOrEqual(date), + effectiveDate: And(Not(IsNull()), LessThan(date)), }, relations: { submission: { @@ -449,6 +458,7 @@ describe('NoticeOfIntentSubmissionStatusService', () => { }, }, }); + expect(result).toEqual(mockStatuses); }); it('should call save to save SubmissionToSubmissionStatus', async () => { diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service.ts index 8e0c467a02..0b8a9ba654 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service.ts @@ -4,7 +4,7 @@ import { InjectRepository } from '@nestjs/typeorm'; import * as dayjs from 'dayjs'; import * as timezone from 'dayjs/plugin/timezone'; import * as utc from 'dayjs/plugin/utc'; -import { In, IsNull, LessThanOrEqual, Repository } from 'typeorm'; +import { And, In, IsNull, LessThan, Not, Repository } from 'typeorm'; import { NoticeOfIntentSubmission } from '../../../portal/notice-of-intent-submission/notice-of-intent-submission.entity'; import { NoticeOfIntentSubmissionStatusType } from './notice-of-intent-status-type.entity'; import { NOI_SUBMISSION_STATUS } from './notice-of-intent-status.dto'; @@ -151,7 +151,7 @@ export class NoticeOfIntentSubmissionStatusService { where: { statusTypeCode: In([NOI_SUBMISSION_STATUS.ALC_DECISION]), emailSentDate: IsNull(), - effectiveDate: LessThanOrEqual(date), // this will get only statuses <= today since the status service converts all days to .startOf('day'). + effectiveDate: And(Not(IsNull()), LessThan(date)), // this will get only statuses < tomorrow start of day since the status service converts all days to .startOf('day'). }, relations: { submission: { diff --git a/services/apps/alcs/src/queues/scheduler/application/status-emails/status-emails.consumer.ts b/services/apps/alcs/src/queues/scheduler/application/status-emails/status-emails.consumer.ts index 719fb1ff82..5854d14f30 100644 --- a/services/apps/alcs/src/queues/scheduler/application/status-emails/status-emails.consumer.ts +++ b/services/apps/alcs/src/queues/scheduler/application/status-emails/status-emails.consumer.ts @@ -30,14 +30,15 @@ export class ApplicationSubmissionStatusEmailConsumer { @Process() async processSubmissionStatusesAndSendEmails() { try { - const today = dayjs(new Date()) + const tomorrow = dayjs(new Date()) .tz('Canada/Pacific') .startOf('day') + .add(1, 'day') .toDate(); const submissionStatuses = await this.submissionStatusService.getSubmissionToSubmissionStatusForSendingEmails( - today, + tomorrow, ); for (const submissionStatus of submissionStatuses) { @@ -55,7 +56,7 @@ export class ApplicationSubmissionStatusEmailConsumer { submissionGovernment, primaryContact, submissionStatus, - today, + tomorrow, ); } catch (e) { this.logger.error(e); diff --git a/services/apps/alcs/src/queues/scheduler/notice-of-intent/status-emails.consumer.ts b/services/apps/alcs/src/queues/scheduler/notice-of-intent/status-emails.consumer.ts index 88ac1d32e3..20e198d3bf 100644 --- a/services/apps/alcs/src/queues/scheduler/notice-of-intent/status-emails.consumer.ts +++ b/services/apps/alcs/src/queues/scheduler/notice-of-intent/status-emails.consumer.ts @@ -26,14 +26,15 @@ export class NoticeOfIntentSubmissionStatusEmailConsumer { @Process() async processSubmissionStatusesAndSendEmails() { try { - const today = dayjs(new Date()) + const tomorrow = dayjs(new Date()) .tz('Canada/Pacific') .startOf('day') + .add(1, 'day') .toDate(); const submissionStatuses = await this.submissionStatusService.getSubmissionToSubmissionStatusForSendingEmails( - today, + tomorrow, ); for (const submissionStatus of submissionStatuses) { @@ -54,7 +55,7 @@ export class NoticeOfIntentSubmissionStatusEmailConsumer { ccGovernment: true, }); - await this.updateSubmissionStatus(submissionStatus, today); + await this.updateSubmissionStatus(submissionStatus, tomorrow); this.logger.debug( `Status email sent for NOI {submissionStatus.submissionUuid}`, ); From 2c2218aca24ee76e5aa40017aab41294ac994baa Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Mon, 18 Sep 2023 11:38:30 -0700 Subject: [PATCH 394/954] additional log messages (#977) --- services/apps/alcs/src/main.controller.ts | 7 +++++-- .../application/status-emails/status-emails.consumer.ts | 4 ++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/services/apps/alcs/src/main.controller.ts b/services/apps/alcs/src/main.controller.ts index ce8a6b3a3e..237263dac8 100644 --- a/services/apps/alcs/src/main.controller.ts +++ b/services/apps/alcs/src/main.controller.ts @@ -1,17 +1,20 @@ -import { Controller, Get, UseGuards } from '@nestjs/common'; +import { Controller, Get, Logger, UseGuards } from '@nestjs/common'; import { ApiOAuth2 } from '@nestjs/swagger'; import * as config from 'config'; import { Public, RoleGuard } from 'nest-keycloak-connect'; -import { MainService } from './main.service'; import { HealthCheckDto } from './healthcheck/healthcheck.dto'; +import { MainService } from './main.service'; @Controller() export class MainController { + private logger = new Logger(MainController.name); + constructor(private appService: MainService) {} @Get(['', 'health']) @Public() async getHealthStatus(): Promise<HealthCheckDto> { + this.logger.debug('Test of logger debug message'); return await this.appService.getHealthStatus(); } diff --git a/services/apps/alcs/src/queues/scheduler/application/status-emails/status-emails.consumer.ts b/services/apps/alcs/src/queues/scheduler/application/status-emails/status-emails.consumer.ts index 5854d14f30..400069811b 100644 --- a/services/apps/alcs/src/queues/scheduler/application/status-emails/status-emails.consumer.ts +++ b/services/apps/alcs/src/queues/scheduler/application/status-emails/status-emails.consumer.ts @@ -30,6 +30,10 @@ export class ApplicationSubmissionStatusEmailConsumer { @Process() async processSubmissionStatusesAndSendEmails() { try { + this.logger.debug( + 'Starting application submission status email consumer.', + ); + const tomorrow = dayjs(new Date()) .tz('Canada/Pacific') .startOf('day') From 89dbc10475fe014c74e63724d10a477eb9888f69 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Mon, 18 Sep 2023 13:07:53 -0700 Subject: [PATCH 395/954] Add Intake Page * Add ability to re-send email if it failed originally * Delete ALCS Noti Submission Service, use Portals instead --- .../notification/intake/intake.component.html | 49 ++++++ .../notification/intake/intake.component.scss | 40 +++++ .../intake/intake.component.spec.ts | 59 +++++++ .../notification/intake/intake.component.ts | 108 ++++++++++++ .../notification/notification.component.ts | 9 +- .../notification/notification.module.ts | 2 + .../overview/overview.component.ts | 1 - .../notification-detail.service.ts | 8 + .../notification/notification.service.spec.ts | 12 ++ .../notification/notification.service.ts | 16 +- .../inline-dropdown.component.html | 2 +- .../inline-dropdown.component.ts | 25 ++- .../local-government.service.spec.ts | 6 +- .../local-government.service.ts | 2 +- .../notice-of-intent.controller.ts | 7 +- .../notification-document.service.ts | 2 +- ...notification-submission.controller.spec.ts | 21 ++- .../notification-submission.controller.ts | 27 ++- .../notification-submission.service.spec.ts | 156 ------------------ .../notification-submission.service.ts | 71 -------- .../notification.controller.spec.ts | 22 ++- .../notification/notification.controller.ts | 62 ++++++- .../alcs/notification/notification.entity.ts | 2 +- .../alcs/notification/notification.module.ts | 5 +- .../alcs/notification/notification.service.ts | 10 +- .../alcs/src/document/document-code.entity.ts | 1 + .../alcs/src/document/document.service.ts | 6 +- ...notification-submission.controller.spec.ts | 41 +---- .../notification-submission.controller.ts | 25 +-- .../notification-submission.service.spec.ts | 14 ++ .../notification-submission.service.ts | 51 +++++- .../generate-review-document.service.spec.ts | 5 +- .../generate-srw-document.service.spec.ts | 5 +- ...nerate-submission-document.service.spec.ts | 9 +- .../email/status-email.service.spec.ts | 19 --- .../providers/email/status-email.service.ts | 5 +- 36 files changed, 547 insertions(+), 358 deletions(-) create mode 100644 alcs-frontend/src/app/features/notification/intake/intake.component.html create mode 100644 alcs-frontend/src/app/features/notification/intake/intake.component.scss create mode 100644 alcs-frontend/src/app/features/notification/intake/intake.component.spec.ts create mode 100644 alcs-frontend/src/app/features/notification/intake/intake.component.ts delete mode 100644 services/apps/alcs/src/alcs/notification/notification-submission/notification-submission.service.spec.ts delete mode 100644 services/apps/alcs/src/alcs/notification/notification-submission/notification-submission.service.ts diff --git a/alcs-frontend/src/app/features/notification/intake/intake.component.html b/alcs-frontend/src/app/features/notification/intake/intake.component.html new file mode 100644 index 0000000000..5e525ced6f --- /dev/null +++ b/alcs-frontend/src/app/features/notification/intake/intake.component.html @@ -0,0 +1,49 @@ +<h3>ALC Intake</h3> +<div class="intake"> + <div> + <div class="subheading2">Submitted to ALC</div> + <app-inline-datepicker + [value]="notification?.dateSubmittedToAlc" + (save)="updateNotificationDate('dateSubmittedToAlc', $event)" + [required]="true" + ></app-inline-datepicker> + </div> + <div> + <div class="subheading2 left"> + ALC Auto-email Response + <mat-icon + class="icon" + matTooltip='Portal status updated to "ALC Response Sent" when auto-email is successfully sent.' + >info_outline + </mat-icon> + </div> + <ng-container *ngIf="responseSent && responseDate"> + <div class="left"> + <mat-icon class="sent-text">check</mat-icon> + <span class="sent-text"> + <strong>Sent</strong> + </span> + <span class='response-date'>{{ responseDate | momentFormat }}</span> + </div> + </ng-container> + <ng-container *ngIf="!responseSent"> + <div class="failed-text"> + <mat-icon>warning</mat-icon>Failed + <button mat-flat-button color="primary" (click)="resendResponse()">Resend</button> + </div> + </ng-container> + </div> + <div *ngIf="notification"> + <div class="subheading2">Local / First Nation Government</div> + <app-inline-dropdown + [options]="localGovernments" + [value]="notification.localGovernment.uuid" + (save)="onSaveLocalGovernment($event)" + > + </app-inline-dropdown> + </div> + <div *ngIf="contactEmail"> + <div class="subheading2">Primary Contact Email</div> + <app-inline-text [value]="contactEmail" (save)="updateSubmissionEmail($event)"></app-inline-text> + </div> +</div> diff --git a/alcs-frontend/src/app/features/notification/intake/intake.component.scss b/alcs-frontend/src/app/features/notification/intake/intake.component.scss new file mode 100644 index 0000000000..cf5f409b13 --- /dev/null +++ b/alcs-frontend/src/app/features/notification/intake/intake.component.scss @@ -0,0 +1,40 @@ +@use '../../../../styles/colors' as colors; + +.intake { + display: grid; + grid-template-columns: 50% 50%; + grid-row-gap: 48px; + grid-column-gap: 48px; + width: 100%; + margin-top: 48px; +} + +.icon { + height: 20px; + width: 20px; + font-size: 20px; + margin-left: 4px; +} + +.failed-text { + color: colors.$error-color; + display: flex; + align-items: center; + margin-top: 4px; + + button { + margin-left: 16px !important; + } +} + +.sent-text { + color: colors.$success-color; +} + +.response-date { + margin-left: 12px; +} + +.left { + margin-top: 3px; +} diff --git a/alcs-frontend/src/app/features/notification/intake/intake.component.spec.ts b/alcs-frontend/src/app/features/notification/intake/intake.component.spec.ts new file mode 100644 index 0000000000..2d94713a8e --- /dev/null +++ b/alcs-frontend/src/app/features/notification/intake/intake.component.spec.ts @@ -0,0 +1,59 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { MatSnackBarModule } from '@angular/material/snack-bar'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { BehaviorSubject } from 'rxjs'; +import { ApplicationLocalGovernmentService } from '../../../services/application/application-local-government/application-local-government.service'; +import { NotificationDetailService } from '../../../services/notification/notification-detail.service'; +import { NotificationSubmissionService } from '../../../services/notification/notification-submission/notification-submission.service'; +import { NotificationDto } from '../../../services/notification/notification.dto'; +import { ConfirmationDialogService } from '../../../shared/confirmation-dialog/confirmation-dialog.service'; +import { IntakeComponent } from './intake.component'; + +describe('IntakeComponent', () => { + let component: IntakeComponent; + let fixture: ComponentFixture<IntakeComponent>; + let mockDetailService: DeepMocked<NotificationDetailService>; + let mockLgService: DeepMocked<ApplicationLocalGovernmentService>; + let mockSubmissionService: DeepMocked<NotificationSubmissionService>; + + beforeEach(async () => { + mockDetailService = createMock(); + mockLgService = createMock(); + mockSubmissionService = createMock(); + + mockDetailService.$notification = new BehaviorSubject<NotificationDto | undefined>(undefined); + + await TestBed.configureTestingModule({ + imports: [MatSnackBarModule], + providers: [ + { + provide: NotificationDetailService, + useValue: mockDetailService, + }, + { + provide: ApplicationLocalGovernmentService, + useValue: mockLgService, + }, + { + provide: NotificationSubmissionService, + useValue: mockSubmissionService, + }, + { + provide: ConfirmationDialogService, + useValue: {}, + }, + ], + declarations: [IntakeComponent], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(IntakeComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/alcs-frontend/src/app/features/notification/intake/intake.component.ts b/alcs-frontend/src/app/features/notification/intake/intake.component.ts new file mode 100644 index 0000000000..cb29df65db --- /dev/null +++ b/alcs-frontend/src/app/features/notification/intake/intake.component.ts @@ -0,0 +1,108 @@ +import { Component, OnInit } from '@angular/core'; +import moment from 'moment'; +import { environment } from '../../../../environments/environment'; +import { ApplicationLocalGovernmentService } from '../../../services/application/application-local-government/application-local-government.service'; +import { NotificationDetailService } from '../../../services/notification/notification-detail.service'; +import { NotificationSubmissionService } from '../../../services/notification/notification-submission/notification-submission.service'; +import { + NOTIFICATION_STATUS, + NotificationDto, + UpdateNotificationDto, +} from '../../../services/notification/notification.dto'; +import { ToastService } from '../../../services/toast/toast.service'; +import { ConfirmationDialogService } from '../../../shared/confirmation-dialog/confirmation-dialog.service'; + +@Component({ + selector: 'app-intake', + templateUrl: './intake.component.html', + styleUrls: ['./intake.component.scss'], +}) +export class IntakeComponent implements OnInit { + dateSubmittedToAlc?: string; + notification?: NotificationDto; + localGovernments: { label: string; value: string; disabled?: boolean | null }[] = []; + contactEmail: string | null = null; + responseSent = false; + responseDate: number | null = null; + + constructor( + private notificationDetailService: NotificationDetailService, + private notificationSubmissionService: NotificationSubmissionService, + private localGovernmentService: ApplicationLocalGovernmentService, + private confirmationDialogService: ConfirmationDialogService, + private toastService: ToastService + ) {} + + ngOnInit(): void { + this.notificationDetailService.$notification.subscribe((notification) => { + if (notification) { + this.dateSubmittedToAlc = moment(notification.dateSubmittedToAlc).format(environment.dateFormat); + this.notification = notification; + + this.loadSubmission(notification.fileNumber); + } + }); + + this.loadGovernments(); + } + + async updateNotificationDate(field: keyof UpdateNotificationDto, time: number) { + const notification = this.notification; + if (notification) { + const update = await this.notificationDetailService.update(notification.fileNumber, { + [field]: time, + }); + if (update) { + this.toastService.showSuccessToast('Notification updated'); + } + } + } + + async updateSubmissionEmail(email: string | null) { + //TODO: Implemented in ALCS-1074 + } + + private async loadGovernments() { + const localGovernment = await this.localGovernmentService.list(); + this.localGovernments = localGovernment.map((government) => ({ + label: government.name, + value: government.uuid, + })); + } + + async onSaveLocalGovernment($value: string | string[] | null) { + this.confirmationDialogService + .openDialog({ + title: 'Local/First Nation Government', + body: 'Any changes made here will also be reflected in the portal. Do you want to continue?', + }) + .subscribe(async (didConfirm) => { + if (didConfirm) { + const notification = this.notification; + if (notification && typeof $value === 'string') { + const update = await this.notificationDetailService.update(notification.fileNumber, { + localGovernmentUuid: $value, + }); + if (update) { + this.toastService.showSuccessToast('Notification updated'); + } + } + } + }); + } + + private async loadSubmission(fileNumber: string) { + const submission = await this.notificationSubmissionService.fetchSubmission(fileNumber); + this.contactEmail = submission.contactEmail; + + this.responseSent = submission.status.code === NOTIFICATION_STATUS.ALC_RESPONSE; + this.responseDate = submission.lastStatusUpdate; + } + + async resendResponse() { + if (this.notification) { + await this.notificationDetailService.resendResponse(this.notification.fileNumber); + this.toastService.showSuccessToast('Response Sent'); + } + } +} diff --git a/alcs-frontend/src/app/features/notification/notification.component.ts b/alcs-frontend/src/app/features/notification/notification.component.ts index 09ee6458d1..9fa76a2cef 100644 --- a/alcs-frontend/src/app/features/notification/notification.component.ts +++ b/alcs-frontend/src/app/features/notification/notification.component.ts @@ -8,6 +8,7 @@ import { NotificationSubmissionStatusService } from '../../services/notification import { NotificationDto } from '../../services/notification/notification.dto'; import { ApplicantInfoComponent } from './applicant-info/applicant-info.component'; import { NotificationDocumentsComponent } from './documents/documents.component'; +import { IntakeComponent } from './intake/intake.component'; import { OverviewComponent } from './overview/overview.component'; export const preSubmissionRoutes = [ @@ -22,7 +23,6 @@ export const preSubmissionRoutes = [ menuTitle: 'App Preview', icon: 'persons', component: ApplicantInfoComponent, - portalOnly: true, }, ]; @@ -38,7 +38,12 @@ export const postSubmissionRoutes = [ menuTitle: 'Applicant Info', icon: 'persons', component: ApplicantInfoComponent, - portalOnly: true, + }, + { + path: 'intake', + menuTitle: 'ALC Intake', + icon: 'content_paste', + component: IntakeComponent, }, { path: 'documents', diff --git a/alcs-frontend/src/app/features/notification/notification.module.ts b/alcs-frontend/src/app/features/notification/notification.module.ts index 6ff3c397ab..ad79308bbe 100644 --- a/alcs-frontend/src/app/features/notification/notification.module.ts +++ b/alcs-frontend/src/app/features/notification/notification.module.ts @@ -6,6 +6,7 @@ import { ApplicantInfoComponent } from './applicant-info/applicant-info.componen import { NotificationDetailsModule } from './applicant-info/notification-details/notification-details.module'; import { DocumentUploadDialogComponent } from './documents/document-upload-dialog/document-upload-dialog.component'; import { NotificationDocumentsComponent } from './documents/documents.component'; +import { IntakeComponent } from './intake/intake.component'; import { NotificationComponent, postSubmissionRoutes } from './notification.component'; import { OverviewComponent } from './overview/overview.component'; import { UncancelNotificationDialogComponent } from './overview/uncancel-notification-dialog/uncancel-notification-dialog.component'; @@ -27,6 +28,7 @@ const routes: Routes = [ DocumentUploadDialogComponent, ApplicantInfoComponent, UncancelNotificationDialogComponent, + IntakeComponent, ], imports: [SharedModule.forRoot(), RouterModule.forChild(routes), NotificationDetailsModule], }) diff --git a/alcs-frontend/src/app/features/notification/overview/overview.component.ts b/alcs-frontend/src/app/features/notification/overview/overview.component.ts index 3511807ce9..5cee244efc 100644 --- a/alcs-frontend/src/app/features/notification/overview/overview.component.ts +++ b/alcs-frontend/src/app/features/notification/overview/overview.component.ts @@ -7,7 +7,6 @@ import { NotificationSubmissionStatusService } from '../../../services/notificat import { NotificationTimelineService } from '../../../services/notification/notification-timeline/notification-timeline.service'; import { NOTIFICATION_STATUS, NotificationDto } from '../../../services/notification/notification.dto'; import { ConfirmationDialogService } from '../../../shared/confirmation-dialog/confirmation-dialog.service'; -import { UncancelApplicationDialogComponent } from '../../application/overview/uncancel-application-dialog/uncancel-application-dialog.component'; import { UncancelNotificationDialogComponent } from './uncancel-notification-dialog/uncancel-notification-dialog.component'; @Component({ diff --git a/alcs-frontend/src/app/services/notification/notification-detail.service.ts b/alcs-frontend/src/app/services/notification/notification-detail.service.ts index c034970e4f..c93aa3cc1e 100644 --- a/alcs-frontend/src/app/services/notification/notification-detail.service.ts +++ b/alcs-frontend/src/app/services/notification/notification-detail.service.ts @@ -36,4 +36,12 @@ export class NotificationDetailService { await this.notificationService.uncancel(fileNumber); await this.load(fileNumber); } + + async resendResponse(fileNumber: string) { + const updatedNotification = await this.notificationService.resendResponse(fileNumber); + if (updatedNotification) { + this.$notification.next(updatedNotification); + } + return updatedNotification; + } } diff --git a/alcs-frontend/src/app/services/notification/notification.service.spec.ts b/alcs-frontend/src/app/services/notification/notification.service.spec.ts index dc408e4d98..f38a0de771 100644 --- a/alcs-frontend/src/app/services/notification/notification.service.spec.ts +++ b/alcs-frontend/src/app/services/notification/notification.service.spec.ts @@ -84,4 +84,16 @@ describe('NotificationService', () => { expect(httpClient.post).toHaveBeenCalledTimes(1); }); + + it('should call post for resend', async () => { + httpClient.post.mockReturnValue( + of({ + fileNumber: '1', + }) + ); + + await service.resendResponse('file-number'); + + expect(httpClient.post).toHaveBeenCalledTimes(1); + }); }); diff --git a/alcs-frontend/src/app/services/notification/notification.service.ts b/alcs-frontend/src/app/services/notification/notification.service.ts index ecf5e27f9d..881e43babf 100644 --- a/alcs-frontend/src/app/services/notification/notification.service.ts +++ b/alcs-frontend/src/app/services/notification/notification.service.ts @@ -2,7 +2,6 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { firstValueFrom } from 'rxjs'; import { environment } from '../../../environments/environment'; -import { ApplicationDto } from '../application/application.dto'; import { ToastService } from '../toast/toast.service'; import { NotificationDto, UpdateNotificationDto } from './notification.dto'; @@ -39,7 +38,7 @@ export class NotificationService { return await firstValueFrom(this.http.post<NotificationDto>(`${this.url}/${fileNumber}`, updateDto)); } catch (e) { console.error(e); - this.toastService.showErrorToast('Failed to create Notification'); + this.toastService.showErrorToast('Failed to update Notification'); return undefined; } } @@ -56,7 +55,7 @@ export class NotificationService { async cancel(fileNumber: string) { try { - return await firstValueFrom(this.http.post<ApplicationDto>(`${this.url}/${fileNumber}/cancel`, {})); + return await firstValueFrom(this.http.post<NotificationDto>(`${this.url}/${fileNumber}/cancel`, {})); } catch (e) { this.toastService.showErrorToast('Failed to cancel Notification'); } @@ -65,10 +64,19 @@ export class NotificationService { async uncancel(fileNumber: string) { try { - return await firstValueFrom(this.http.post<ApplicationDto>(`${this.url}/${fileNumber}/uncancel`, {})); + return await firstValueFrom(this.http.post<NotificationDto>(`${this.url}/${fileNumber}/uncancel`, {})); } catch (e) { this.toastService.showErrorToast('Failed to uncancel Notification'); } return; } + + async resendResponse(fileNumber: string) { + try { + return await firstValueFrom(this.http.post<NotificationDto>(`${this.url}/${fileNumber}/resend`, {})); + } catch (e) { + this.toastService.showErrorToast('Failed to resend response for Notification'); + } + return; + } } diff --git a/alcs-frontend/src/app/shared/inline-editors/inline-dropdown/inline-dropdown.component.html b/alcs-frontend/src/app/shared/inline-editors/inline-dropdown/inline-dropdown.component.html index ce65699289..aaaa8ec1d6 100644 --- a/alcs-frontend/src/app/shared/inline-editors/inline-dropdown/inline-dropdown.component.html +++ b/alcs-frontend/src/app/shared/inline-editors/inline-dropdown/inline-dropdown.component.html @@ -3,7 +3,7 @@ <a (click)="startEdit()" class="add" *ngIf="!value"> Select an option </a> <a (click)="startEdit()" class="add" *ngIf="multiple && coerceArray(value)?.length === 0"> Select option(s) </a> <span *ngIf="!multiple"> - {{ value }} + {{ displayValue }} </span> <span *ngIf="multiple"> {{ coerceArray(value)?.join(', ') }} diff --git a/alcs-frontend/src/app/shared/inline-editors/inline-dropdown/inline-dropdown.component.ts b/alcs-frontend/src/app/shared/inline-editors/inline-dropdown/inline-dropdown.component.ts index 291badd90b..d447374ca0 100644 --- a/alcs-frontend/src/app/shared/inline-editors/inline-dropdown/inline-dropdown.component.ts +++ b/alcs-frontend/src/app/shared/inline-editors/inline-dropdown/inline-dropdown.component.ts @@ -1,11 +1,20 @@ -import { AfterContentChecked, Component, ElementRef, EventEmitter, Input, Output, ViewChild } from '@angular/core'; +import { + AfterContentChecked, + Component, + ElementRef, + EventEmitter, + Input, + OnChanges, + Output, + ViewChild, +} from '@angular/core'; @Component({ selector: 'app-inline-dropdown[options][value]', templateUrl: './inline-dropdown.component.html', styleUrls: ['./inline-dropdown.component.scss'], }) -export class InlineDropdownComponent implements AfterContentChecked { +export class InlineDropdownComponent implements AfterContentChecked, OnChanges { @Input() value?: string | string[] | undefined; @Input() placeholder: string = 'Enter a value'; @Input() options: { label: string; value: string; disabled?: boolean | null }[] = []; @@ -17,6 +26,7 @@ export class InlineDropdownComponent implements AfterContentChecked { isEditing = false; pendingValue: undefined | string | string[]; + displayValue: string = ''; constructor() {} @@ -51,4 +61,15 @@ export class InlineDropdownComponent implements AfterContentChecked { } return undefined; } + + ngOnChanges(): void { + const arrayValue = this.coerceArray(this.value); + if (arrayValue) { + const selectedOptions = arrayValue.map((value) => this.options.find((option) => option.value === this.value)); + this.displayValue = selectedOptions.map((option) => option?.label).join(', '); + } else { + const selectedOption = this.options.find((option) => option.value === this.value); + this.displayValue = selectedOption ? selectedOption.label : (this.value as string); + } + } } diff --git a/services/apps/alcs/src/alcs/local-government/local-government.service.spec.ts b/services/apps/alcs/src/alcs/local-government/local-government.service.spec.ts index 6ea3b6cc2e..054f9575da 100644 --- a/services/apps/alcs/src/alcs/local-government/local-government.service.spec.ts +++ b/services/apps/alcs/src/alcs/local-government/local-government.service.spec.ts @@ -48,12 +48,12 @@ describe('LocalGovernmentService', () => { it('should call repository on getByUuId', async () => { const uuid = 'fake'; - mockRepository.findOne.mockResolvedValue(new LocalGovernment()); + mockRepository.findOneOrFail.mockResolvedValue(new LocalGovernment()); await service.getByUuid(uuid); - expect(mockRepository.findOne).toHaveBeenCalledTimes(1); - expect(mockRepository.findOne).toHaveBeenCalledWith({ + expect(mockRepository.findOneOrFail).toHaveBeenCalledTimes(1); + expect(mockRepository.findOneOrFail).toHaveBeenCalledWith({ where: { uuid, }, diff --git a/services/apps/alcs/src/alcs/local-government/local-government.service.ts b/services/apps/alcs/src/alcs/local-government/local-government.service.ts index 7c85715163..42bac17934 100644 --- a/services/apps/alcs/src/alcs/local-government/local-government.service.ts +++ b/services/apps/alcs/src/alcs/local-government/local-government.service.ts @@ -51,7 +51,7 @@ export class LocalGovernmentService { } async getByUuid(uuid: string) { - return this.repository.findOne({ + return this.repository.findOneOrFail({ where: { uuid, }, diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.controller.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.controller.ts index be8af36657..116f223ec2 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.controller.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.controller.ts @@ -1,10 +1,13 @@ import { Mapper } from '@automapper/core'; import { InjectMapper } from '@automapper/nestjs'; -import { Body, Controller, Get, Param, Post } from '@nestjs/common'; +import { Body, Controller, Get, Param, Post, UseGuards } from '@nestjs/common'; +import { ApiOAuth2 } from '@nestjs/swagger'; +import * as config from 'config'; import { ROLES_ALLOWED_APPLICATIONS, ROLES_ALLOWED_BOARDS, } from '../../common/authorization/roles'; +import { RolesGuard } from '../../common/authorization/roles-guard.service'; import { UserRoles } from '../../common/authorization/roles.decorator'; import { formatIncomingDate } from '../../utils/incoming-date.formatter'; import { BoardService } from '../board/board.service'; @@ -18,7 +21,9 @@ import { } from './notice-of-intent.dto'; import { NoticeOfIntentService } from './notice-of-intent.service'; +@ApiOAuth2(config.get<string[]>('KEYCLOAK.SCOPES')) @Controller('notice-of-intent') +@UseGuards(RolesGuard) export class NoticeOfIntentController { constructor( private noticeOfIntentService: NoticeOfIntentService, diff --git a/services/apps/alcs/src/alcs/notification/notification-document/notification-document.service.ts b/services/apps/alcs/src/alcs/notification/notification-document/notification-document.service.ts index 8fe160e506..b3dbc7d5d4 100644 --- a/services/apps/alcs/src/alcs/notification/notification-document/notification-document.service.ts +++ b/services/apps/alcs/src/alcs/notification/notification-document/notification-document.service.ts @@ -127,7 +127,7 @@ export class NotificationDocumentService { visibilityFlags, }); - return this.notificationDocumentRepository.save(appDocument); + return await this.notificationDocumentRepository.save(appDocument); } async get(uuid: string) { diff --git a/services/apps/alcs/src/alcs/notification/notification-submission/notification-submission.controller.spec.ts b/services/apps/alcs/src/alcs/notification/notification-submission/notification-submission.controller.spec.ts index dd5a09e2de..60fe5763c2 100644 --- a/services/apps/alcs/src/alcs/notification/notification-submission/notification-submission.controller.spec.ts +++ b/services/apps/alcs/src/alcs/notification/notification-submission/notification-submission.controller.spec.ts @@ -6,8 +6,9 @@ import { Document } from '../../../document/document.entity'; import { DocumentService } from '../../../document/document.service'; import { NotificationSubmissionDetailedDto } from '../../../portal/notification-submission/notification-submission.dto'; import { NotificationSubmission } from '../../../portal/notification-submission/notification-submission.entity'; +import { NotificationSubmissionService } from '../../../portal/notification-submission/notification-submission.service'; +import { User } from '../../../user/user.entity'; import { NotificationSubmissionController } from './notification-submission.controller'; -import { NotificationSubmissionService } from './notification-submission.service'; describe('NotificationSubmissionController', () => { let controller: NotificationSubmissionController; @@ -50,19 +51,27 @@ describe('NotificationSubmissionController', () => { it('should call NotificationSubmissionService to get Notice of Intent Submission', async () => { const fakeFileNumber = 'fake'; - mockNotificationSubmissionService.get.mockResolvedValue( + mockNotificationSubmissionService.getByFileNumber.mockResolvedValue( new NotificationSubmission({ fileNumber: fakeFileNumber, }), ); - mockNotificationSubmissionService.mapToDto.mockResolvedValue( + mockNotificationSubmissionService.mapToDetailedDTO.mockResolvedValue( createMock<NotificationSubmissionDetailedDto>(), ); - const result = await controller.get(fakeFileNumber); + const result = await controller.get(fakeFileNumber, { + user: { + entity: new User(), + }, + }); - expect(mockNotificationSubmissionService.get).toBeCalledTimes(1); - expect(mockNotificationSubmissionService.mapToDto).toBeCalledTimes(1); + expect(mockNotificationSubmissionService.getByFileNumber).toBeCalledTimes( + 1, + ); + expect(mockNotificationSubmissionService.mapToDetailedDTO).toBeCalledTimes( + 1, + ); expect(result).toBeDefined(); }); diff --git a/services/apps/alcs/src/alcs/notification/notification-submission/notification-submission.controller.ts b/services/apps/alcs/src/alcs/notification/notification-submission/notification-submission.controller.ts index 00670490dd..668aa43308 100644 --- a/services/apps/alcs/src/alcs/notification/notification-submission/notification-submission.controller.ts +++ b/services/apps/alcs/src/alcs/notification/notification-submission/notification-submission.controller.ts @@ -1,4 +1,12 @@ -import { Body, Controller, Get, Param, Patch, UseGuards } from '@nestjs/common'; +import { + Body, + Controller, + Get, + Param, + Patch, + Req, + UseGuards, +} from '@nestjs/common'; import { ApiOAuth2 } from '@nestjs/swagger'; import * as config from 'config'; import { ServiceValidationException } from '../../../../../../libs/common/src/exceptions/base.exception'; @@ -6,8 +14,8 @@ import { ANY_AUTH_ROLE } from '../../../common/authorization/roles'; import { RolesGuard } from '../../../common/authorization/roles-guard.service'; import { UserRoles } from '../../../common/authorization/roles.decorator'; import { DocumentService } from '../../../document/document.service'; +import { NotificationSubmissionService } from '../../../portal/notification-submission/notification-submission.service'; import { NOTIFICATION_STATUS } from '../notification-submission-status/notification-status.dto'; -import { NotificationSubmissionService } from './notification-submission.service'; @ApiOAuth2(config.get<string[]>('KEYCLOAK.SCOPES')) @UseGuards(RolesGuard) @@ -20,10 +28,16 @@ export class NotificationSubmissionController { @UserRoles(...ANY_AUTH_ROLE) @Get('/:fileNumber') - async get(@Param('fileNumber') fileNumber: string) { - const submission = await this.notificationSubmissionService.get(fileNumber); + async get(@Param('fileNumber') fileNumber: string, @Req() req) { + const submission = await this.notificationSubmissionService.getByFileNumber( + fileNumber, + req.user.entity, + ); - return await this.notificationSubmissionService.mapToDto(submission); + return await this.notificationSubmissionService.mapToDetailedDTO( + submission, + req.user.entity, + ); } @UserRoles(...ANY_AUTH_ROLE) @@ -39,6 +53,7 @@ export class NotificationSubmissionController { async updateStatus( @Param('fileNumber') fileNumber: string, @Body('statusCode') status: string, + @Req() req, ) { if (!fileNumber) { throw new ServiceValidationException('File number is required'); @@ -47,6 +62,6 @@ export class NotificationSubmissionController { fileNumber, status as NOTIFICATION_STATUS, ); - return this.get(fileNumber); + return this.get(fileNumber, req); } } diff --git a/services/apps/alcs/src/alcs/notification/notification-submission/notification-submission.service.spec.ts b/services/apps/alcs/src/alcs/notification/notification-submission/notification-submission.service.spec.ts deleted file mode 100644 index 28be770350..0000000000 --- a/services/apps/alcs/src/alcs/notification/notification-submission/notification-submission.service.spec.ts +++ /dev/null @@ -1,156 +0,0 @@ -import { classes } from '@automapper/classes'; -import { AutomapperModule } from '@automapper/nestjs'; -import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; -import { Test, TestingModule } from '@nestjs/testing'; -import { getRepositoryToken } from '@nestjs/typeorm'; -import { Repository } from 'typeorm'; -import { NotificationSubmissionProfile } from '../../../common/automapper/notification-submission.automapper.profile'; -import { NotificationTransfereeProfile } from '../../../common/automapper/notification-transferee.automapper.profile'; -import { NotificationSubmission } from '../../../portal/notification-submission/notification-submission.entity'; -import { NotificationTransferee } from '../../../portal/notification-submission/notification-transferee/notification-transferee.entity'; -import { NotificationSubmissionStatusType } from '../notification-submission-status/notification-status-type.entity'; -import { NOTIFICATION_STATUS } from '../notification-submission-status/notification-status.dto'; -import { NotificationSubmissionStatusService } from '../notification-submission-status/notification-submission-status.service'; -import { NotificationSubmissionService } from './notification-submission.service'; - -describe('NotificationSubmissionService', () => { - let service: NotificationSubmissionService; - - let mockNotificationSubmissionRepo: DeepMocked< - Repository<NotificationSubmission> - >; - let mockNotificationSubmissionStatusRepo: DeepMocked< - Repository<NotificationSubmissionStatusType> - >; - let mockNotificationSubmissionStatusService: DeepMocked<NotificationSubmissionStatusService>; - - beforeEach(async () => { - mockNotificationSubmissionRepo = createMock(); - mockNotificationSubmissionStatusRepo = createMock(); - mockNotificationSubmissionStatusService = createMock(); - - const module: TestingModule = await Test.createTestingModule({ - imports: [ - AutomapperModule.forRoot({ - strategyInitializer: classes(), - }), - ], - providers: [ - NotificationSubmissionService, - NotificationSubmissionProfile, - NotificationTransfereeProfile, - { - provide: getRepositoryToken(NotificationSubmission), - useValue: mockNotificationSubmissionRepo, - }, - { - provide: getRepositoryToken(NotificationSubmissionStatusType), - useValue: mockNotificationSubmissionStatusRepo, - }, - { - provide: NotificationSubmissionStatusService, - useValue: mockNotificationSubmissionStatusService, - }, - ], - }).compile(); - - mockNotificationSubmissionStatusService.setStatusDate.mockResolvedValue( - {} as any, - ); - - service = module.get<NotificationSubmissionService>( - NotificationSubmissionService, - ); - }); - - it('should be defined', () => { - expect(service).toBeDefined(); - }); - - it('should successfully find NotificationSubmission', async () => { - const fakeFileNumber = 'fake'; - - mockNotificationSubmissionRepo.findOneOrFail.mockResolvedValue( - new NotificationSubmission(), - ); - - const result = await service.get(fakeFileNumber); - - expect(result).toBeDefined(); - expect(mockNotificationSubmissionRepo.findOneOrFail).toBeCalledTimes(1); - expect(mockNotificationSubmissionRepo.findOneOrFail).toBeCalledWith({ - where: { fileNumber: fakeFileNumber }, - relations: { - notification: { - documents: { - document: true, - }, - }, - transferees: { - type: true, - }, - }, - }); - }); - - it('should properly map to dto', async () => { - const fakeSubmission = createMock<NotificationSubmission>({ - auditCreatedAt: new Date(), - auditUpdatedAt: new Date(), - }); - fakeSubmission.transferees = [ - new NotificationTransferee({ - uuid: 'uuid', - }), - ]; - - const result = await service.mapToDto(fakeSubmission); - - expect(result).toBeDefined(); - expect(result.transferees.length).toEqual(1); - }); - - it('should successfully retrieve status from repo', async () => { - mockNotificationSubmissionStatusRepo.findOneOrFail.mockResolvedValue( - new NotificationSubmissionStatusType(), - ); - - const result = await service.getStatus( - NOTIFICATION_STATUS.ALC_RESPONSE_SENT, - ); - - expect(result).toBeDefined(); - expect(mockNotificationSubmissionStatusRepo.findOneOrFail).toBeCalledTimes( - 1, - ); - expect(mockNotificationSubmissionStatusRepo.findOneOrFail).toBeCalledWith({ - where: { code: NOTIFICATION_STATUS.ALC_RESPONSE_SENT }, - }); - }); - - it('should successfully update the status', async () => { - mockNotificationSubmissionStatusRepo.findOneOrFail.mockResolvedValue( - new NotificationSubmissionStatusType(), - ); - mockNotificationSubmissionRepo.findOneOrFail.mockResolvedValue( - new NotificationSubmission({ - uuid: 'fake', - }), - ); - - await service.updateStatus('fake', NOTIFICATION_STATUS.ALC_RESPONSE_SENT); - - expect(mockNotificationSubmissionRepo.findOneOrFail).toBeCalledTimes(1); - expect(mockNotificationSubmissionRepo.findOneOrFail).toBeCalledWith({ - where: { - fileNumber: 'fake', - }, - }); - expect( - mockNotificationSubmissionStatusService.setStatusDate, - ).toBeCalledTimes(1); - expect( - mockNotificationSubmissionStatusService.setStatusDate, - ).toBeCalledWith('fake', NOTIFICATION_STATUS.ALC_RESPONSE_SENT); - }); -}); diff --git a/services/apps/alcs/src/alcs/notification/notification-submission/notification-submission.service.ts b/services/apps/alcs/src/alcs/notification/notification-submission/notification-submission.service.ts deleted file mode 100644 index 0aeec8658c..0000000000 --- a/services/apps/alcs/src/alcs/notification/notification-submission/notification-submission.service.ts +++ /dev/null @@ -1,71 +0,0 @@ -import { Mapper } from '@automapper/core'; -import { InjectMapper } from '@automapper/nestjs'; -import { Injectable } from '@nestjs/common'; -import { InjectRepository } from '@nestjs/typeorm'; -import { Repository } from 'typeorm'; -import { NotificationSubmissionDetailedDto } from '../../../portal/notification-submission/notification-submission.dto'; -import { NotificationSubmission } from '../../../portal/notification-submission/notification-submission.entity'; -import { NotificationSubmissionStatusType } from '../notification-submission-status/notification-status-type.entity'; -import { NOTIFICATION_STATUS } from '../notification-submission-status/notification-status.dto'; -import { NotificationSubmissionStatusService } from '../notification-submission-status/notification-submission-status.service'; - -@Injectable() -export class NotificationSubmissionService { - constructor( - @InjectRepository(NotificationSubmission) - private notificationSubmissionRepo: Repository<NotificationSubmission>, - @InjectRepository(NotificationSubmissionStatusType) - private notificationSubmissionStatusTypeRepo: Repository<NotificationSubmissionStatusType>, - @InjectMapper() private mapper: Mapper, - private notificationSubmissionStatusService: NotificationSubmissionStatusService, - ) {} - - async get(fileNumber: string) { - return await this.notificationSubmissionRepo.findOneOrFail({ - where: { fileNumber }, - relations: { - notification: { - documents: { - document: true, - }, - }, - transferees: { - type: true, - }, - }, - }); - } - - async mapToDto(submission: NotificationSubmission) { - return await this.mapper.mapAsync( - submission, - NotificationSubmission, - NotificationSubmissionDetailedDto, - ); - } - - async getStatus(code: NOTIFICATION_STATUS) { - return await this.notificationSubmissionStatusTypeRepo.findOneOrFail({ - where: { - code, - }, - }); - } - - async updateStatus(fileNumber: string, statusCode: NOTIFICATION_STATUS) { - const submission = await this.loadBarebonesSubmission(fileNumber); - await this.notificationSubmissionStatusService.setStatusDate( - submission.uuid, - statusCode, - ); - } - - public loadBarebonesSubmission(fileNumber: string) { - //Load submission without relations to prevent save from crazy cascading - return this.notificationSubmissionRepo.findOneOrFail({ - where: { - fileNumber, - }, - }); - } -} diff --git a/services/apps/alcs/src/alcs/notification/notification.controller.spec.ts b/services/apps/alcs/src/alcs/notification/notification.controller.spec.ts index f2b5b4aa53..10ad63a5ab 100644 --- a/services/apps/alcs/src/alcs/notification/notification.controller.spec.ts +++ b/services/apps/alcs/src/alcs/notification/notification.controller.spec.ts @@ -4,7 +4,9 @@ import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { ClsService } from 'nestjs-cls'; import { mockKeyCloakProviders } from '../../../test/mocks/mockTypes'; -import { NOI_SUBMISSION_STATUS } from '../notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status.dto'; +import { NotificationSubmissionService } from '../../portal/notification-submission/notification-submission.service'; +import { User } from '../../user/user.entity'; +import { NotificationDocumentService } from './notification-document/notification-document.service'; import { NOTIFICATION_STATUS } from './notification-submission-status/notification-status.dto'; import { NotificationSubmissionStatusService } from './notification-submission-status/notification-submission-status.service'; import { NotificationController } from './notification.controller'; @@ -15,10 +17,14 @@ describe('NotificationController', () => { let controller: NotificationController; let mockService: DeepMocked<NotificationService>; let mockSubmissionStatusService: DeepMocked<NotificationSubmissionStatusService>; + let mockSubmissionService: DeepMocked<NotificationSubmissionService>; + let mockDocumentService: DeepMocked<NotificationDocumentService>; beforeEach(async () => { mockService = createMock(); mockSubmissionStatusService = createMock(); + mockSubmissionService = createMock(); + mockDocumentService = createMock(); const module: TestingModule = await Test.createTestingModule({ imports: [ @@ -36,6 +42,14 @@ describe('NotificationController', () => { provide: NotificationSubmissionStatusService, useValue: mockSubmissionStatusService, }, + { + provide: NotificationDocumentService, + useValue: mockDocumentService, + }, + { + provide: NotificationSubmissionService, + useValue: mockSubmissionService, + }, { provide: ClsService, useValue: {}, @@ -75,7 +89,11 @@ describe('NotificationController', () => { mockService.update.mockResolvedValue(new Notification()); mockService.mapToDtos.mockResolvedValue([]); - await controller.update({}, 'fileNumber'); + await controller.update({}, 'fileNumber', { + user: { + entity: new User(), + }, + }); expect(mockService.update).toHaveBeenCalledTimes(1); expect(mockService.mapToDtos).toHaveBeenCalledTimes(1); diff --git a/services/apps/alcs/src/alcs/notification/notification.controller.ts b/services/apps/alcs/src/alcs/notification/notification.controller.ts index ca85b61a92..d3843cf36c 100644 --- a/services/apps/alcs/src/alcs/notification/notification.controller.ts +++ b/services/apps/alcs/src/alcs/notification/notification.controller.ts @@ -1,21 +1,40 @@ +import { ServiceNotFoundException } from '@app/common/exceptions/base.exception'; import { Mapper } from '@automapper/core'; import { InjectMapper } from '@automapper/nestjs'; -import { Body, Controller, Get, Param, Post } from '@nestjs/common'; +import { + Body, + Controller, + Get, + Param, + Post, + Req, + UseGuards, +} from '@nestjs/common'; +import { ApiOAuth2 } from '@nestjs/swagger'; +import * as config from 'config'; import { ROLES_ALLOWED_APPLICATIONS, ROLES_ALLOWED_BOARDS, } from '../../common/authorization/roles'; +import { RolesGuard } from '../../common/authorization/roles-guard.service'; import { UserRoles } from '../../common/authorization/roles.decorator'; +import { DOCUMENT_TYPE } from '../../document/document-code.entity'; +import { NotificationSubmissionService } from '../../portal/notification-submission/notification-submission.service'; +import { NotificationDocumentService } from './notification-document/notification-document.service'; import { NOTIFICATION_STATUS } from './notification-submission-status/notification-status.dto'; import { NotificationSubmissionStatusService } from './notification-submission-status/notification-submission-status.service'; import { UpdateNotificationDto } from './notification.dto'; import { NotificationService } from './notification.service'; +@ApiOAuth2(config.get<string[]>('KEYCLOAK.SCOPES')) @Controller('notification') +@UseGuards(RolesGuard) export class NotificationController { constructor( private notificationService: NotificationService, private notificationSubmissionStatusService: NotificationSubmissionStatusService, + private notificationSubmissionService: NotificationSubmissionService, + private notificationDocumentService: NotificationDocumentService, @InjectMapper() private mapper: Mapper, ) {} @@ -42,6 +61,7 @@ export class NotificationController { async update( @Body() updateDto: UpdateNotificationDto, @Param('fileNumber') fileNumber: string, + @Req() req, ) { const updatedNotification = await this.notificationService.update( fileNumber, @@ -50,6 +70,17 @@ export class NotificationController { const mapped = await this.notificationService.mapToDtos([ updatedNotification, ]); + + if (updateDto.localGovernmentUuid) { + await this.notificationSubmissionService.update( + fileNumber, + { + localGovernmentUuid: updateDto.localGovernmentUuid, + }, + req.user.entity, + ); + } + return mapped[0]; } @@ -72,6 +103,35 @@ export class NotificationController { ); } + @Post('/:fileNumber/resend') + @UserRoles(...ROLES_ALLOWED_BOARDS) + async resendResponse(@Param('fileNumber') fileNumber: string, @Req() req) { + const user = req.user.entity; + const submission = await this.notificationSubmissionService.getByFileNumber( + fileNumber, + user, + ); + + const documents = await this.notificationDocumentService.list(fileNumber); + const document = documents.find( + (document) => document.type?.code === DOCUMENT_TYPE.LTSA_LETTER, + ); + + if (document) { + await this.notificationSubmissionService.sendAndRecordLTSAPackage( + submission, + document, + user, + ); + } else { + throw new ServiceNotFoundException( + `Failed to find LTSA Letter on File Number ${fileNumber}`, + ); + } + + return this.get(fileNumber); + } + @Get('/search/:fileNumber') @UserRoles(...ROLES_ALLOWED_APPLICATIONS) async search(@Param('fileNumber') fileNumber: string) { diff --git a/services/apps/alcs/src/alcs/notification/notification.entity.ts b/services/apps/alcs/src/alcs/notification/notification.entity.ts index f594854341..e18e856748 100644 --- a/services/apps/alcs/src/alcs/notification/notification.entity.ts +++ b/services/apps/alcs/src/alcs/notification/notification.entity.ts @@ -64,7 +64,7 @@ export class Notification extends Base { type: 'timestamptz', nullable: true, }) - dateSubmittedToAlc: Date | null; + dateSubmittedToAlc?: Date | null; @AutoMap(() => String) @Column({ diff --git a/services/apps/alcs/src/alcs/notification/notification.module.ts b/services/apps/alcs/src/alcs/notification/notification.module.ts index 6ad563aa5b..8379802e10 100644 --- a/services/apps/alcs/src/alcs/notification/notification.module.ts +++ b/services/apps/alcs/src/alcs/notification/notification.module.ts @@ -4,7 +4,6 @@ import { NotificationProfile } from '../../common/automapper/notification.automa import { DocumentCode } from '../../document/document-code.entity'; import { DocumentModule } from '../../document/document.module'; import { FileNumberModule } from '../../file-number/file-number.module'; -import { NotificationSubmission } from '../../portal/notification-submission/notification-submission.entity'; import { NotificationSubmissionModule } from '../../portal/notification-submission/notification-submission.module'; import { BoardModule } from '../board/board.module'; import { CardModule } from '../card/card.module'; @@ -17,7 +16,6 @@ import { NotificationParcelController } from './notification-parcel/notification import { NotificationSubmissionStatusType } from './notification-submission-status/notification-status-type.entity'; import { NotificationSubmissionStatusModule } from './notification-submission-status/notification-submission-status.module'; import { NotificationSubmissionController } from './notification-submission/notification-submission.controller'; -import { NotificationSubmissionService } from './notification-submission/notification-submission.service'; import { NotificationType } from './notification-type/notification-type.entity'; import { NotificationController } from './notification.controller'; import { NotificationService } from './notification.service'; @@ -29,7 +27,6 @@ import { Notification } from './notification.entity'; Notification, NotificationType, NotificationDocument, - NotificationSubmission, NotificationSubmissionStatusType, DocumentCode, ]), @@ -40,13 +37,13 @@ import { Notification } from './notification.entity'; CodeModule, LocalGovernmentModule, NotificationSubmissionStatusModule, + NotificationSubmissionModule, forwardRef(() => NotificationSubmissionModule), ], providers: [ NotificationService, NotificationProfile, NotificationDocumentService, - NotificationSubmissionService, ], controllers: [ NotificationController, diff --git a/services/apps/alcs/src/alcs/notification/notification.service.ts b/services/apps/alcs/src/alcs/notification/notification.service.ts index 91200de919..bbf746c425 100644 --- a/services/apps/alcs/src/alcs/notification/notification.service.ts +++ b/services/apps/alcs/src/alcs/notification/notification.service.ts @@ -15,6 +15,7 @@ import { Repository, } from 'typeorm'; import { FileNumberService } from '../../file-number/file-number.service'; +import { formatIncomingDate } from '../../utils/incoming-date.formatter'; import { filterUndefined } from '../../utils/undefined'; import { Board } from '../board/board.entity'; import { BoardService } from '../board/board.service'; @@ -210,7 +211,10 @@ export class NotificationService { notification.summary, ); if (updateDto.localGovernmentUuid) { - notification.localGovernmentUuid = updateDto.localGovernmentUuid; + notification.localGovernment = + await this.localGovernmentService.getByUuid( + updateDto.localGovernmentUuid, + ); } notification.staffObservations = filterUndefined( @@ -218,6 +222,10 @@ export class NotificationService { notification.staffObservations, ); + notification.dateSubmittedToAlc = formatIncomingDate( + updateDto.dateSubmittedToAlc, + ); + await this.repository.save(notification); return this.getByFileNumber(notification.fileNumber); diff --git a/services/apps/alcs/src/document/document-code.entity.ts b/services/apps/alcs/src/document/document-code.entity.ts index acbe31bad9..03e567fa82 100644 --- a/services/apps/alcs/src/document/document-code.entity.ts +++ b/services/apps/alcs/src/document/document-code.entity.ts @@ -32,6 +32,7 @@ export enum DOCUMENT_TYPE { //Notifications LTSA_LETTER = 'LTSA', + ACKNOWLEDGEMENT_LETTER = 'ACKL', ORIGINAL_SUBMISSION = 'SUBO', UPDATED_SUBMISSION = 'SUBU', diff --git a/services/apps/alcs/src/document/document.service.ts b/services/apps/alcs/src/document/document.service.ts index 3502af41a9..f324a7fd16 100644 --- a/services/apps/alcs/src/document/document.service.ts +++ b/services/apps/alcs/src/document/document.service.ts @@ -99,9 +99,9 @@ export class DocumentService { }); await this.dataStore.send(command); const document = await this.createDocumentRecord({ - fileKey: fileKey, - fileSize: fileSize, - mimeType: mimeType, + fileKey, + fileSize, + mimeType, uploadedBy: user, fileName, source, diff --git a/services/apps/alcs/src/portal/notification-submission/notification-submission.controller.spec.ts b/services/apps/alcs/src/portal/notification-submission/notification-submission.controller.spec.ts index 659dec9b13..085e989cad 100644 --- a/services/apps/alcs/src/portal/notification-submission/notification-submission.controller.spec.ts +++ b/services/apps/alcs/src/portal/notification-submission/notification-submission.controller.spec.ts @@ -13,7 +13,6 @@ import { NOTIFICATION_STATUS } from '../../alcs/notification/notification-submis import { NotificationSubmissionToSubmissionStatus } from '../../alcs/notification/notification-submission-status/notification-status.entity'; import { Notification } from '../../alcs/notification/notification.entity'; import { NotificationSubmissionProfile } from '../../common/automapper/notification-submission.automapper.profile'; -import { EmailService } from '../../providers/email/email.service'; import { User } from '../../user/user.entity'; import { GenerateSrwDocumentService } from '../pdf-generation/generate-srw-document.service'; import { @@ -33,9 +32,6 @@ describe('NotificationSubmissionController', () => { let controller: NotificationSubmissionController; let mockNotificationSubmissionService: DeepMocked<NotificationSubmissionService>; let mockNotificationValidationService: DeepMocked<NotificationSubmissionValidatorService>; - let mockDocumentService: DeepMocked<NoticeOfIntentDocumentService>; - let mockLgService: DeepMocked<LocalGovernmentService>; - let mockEmailService: DeepMocked<EmailService>; let mockSrwDocumentService: DeepMocked<GenerateSrwDocumentService>; const primaryContactOwnerUuid = 'primary-contact'; @@ -45,9 +41,6 @@ describe('NotificationSubmissionController', () => { beforeEach(async () => { mockNotificationSubmissionService = createMock(); - mockDocumentService = createMock(); - mockLgService = createMock(); - mockEmailService = createMock(); mockNotificationValidationService = createMock(); mockSrwDocumentService = createMock(); @@ -59,22 +52,10 @@ describe('NotificationSubmissionController', () => { provide: NotificationSubmissionService, useValue: mockNotificationSubmissionService, }, - { - provide: NoticeOfIntentDocumentService, - useValue: mockDocumentService, - }, { provide: NotificationSubmissionValidatorService, useValue: mockNotificationValidationService, }, - { - provide: LocalGovernmentService, - useValue: mockLgService, - }, - { - provide: EmailService, - useValue: mockEmailService, - }, { provide: GenerateSrwDocumentService, useValue: mockSrwDocumentService, @@ -112,14 +93,6 @@ describe('NotificationSubmissionController', () => { ); mockNotificationSubmissionService.mapToDTOs.mockResolvedValue([]); - mockLgService.list.mockResolvedValue([ - new LocalGovernment({ - uuid: localGovernmentUuid, - bceidBusinessGuid, - name: 'fake-name', - isFirstNation: false, - }), - ]); }); it('should be defined', () => { @@ -284,7 +257,7 @@ describe('NotificationSubmissionController', () => { localGovernmentUuid, }); - mockNotificationSubmissionService.generateSrwEmailData.mockResolvedValue( + mockNotificationSubmissionService.sendAndRecordLTSAPackage.mockResolvedValue( {} as any, ); mockNotificationSubmissionService.submitToAlcs.mockResolvedValue( @@ -304,8 +277,6 @@ describe('NotificationSubmissionController', () => { mockSrwDocumentService.generateAndAttach.mockResolvedValue( new NotificationDocument(), ); - mockNotificationSubmissionService.updateStatus.mockResolvedValue(); - mockEmailService.sendEmail.mockResolvedValue(); await controller.submitAsApplicant(mockFileId, { user: { @@ -324,15 +295,7 @@ describe('NotificationSubmissionController', () => { ).toHaveBeenCalledTimes(1); expect(mockSrwDocumentService.generateAndAttach).toHaveBeenCalledTimes(1); expect( - mockNotificationSubmissionService.updateStatus, - ).toHaveBeenCalledTimes(1); - expect(mockNotificationSubmissionService.updateStatus).toHaveBeenCalledWith( - undefined, - NOTIFICATION_STATUS.ALC_RESPONSE_SENT, - ); - expect( - mockNotificationSubmissionService.generateSrwEmailData, + mockNotificationSubmissionService.sendAndRecordLTSAPackage, ).toHaveBeenCalledTimes(1); - expect(mockEmailService.sendEmail).toHaveBeenCalledTimes(1); }); }); diff --git a/services/apps/alcs/src/portal/notification-submission/notification-submission.controller.ts b/services/apps/alcs/src/portal/notification-submission/notification-submission.controller.ts index 4d25427d83..5d236be7ed 100644 --- a/services/apps/alcs/src/portal/notification-submission/notification-submission.controller.ts +++ b/services/apps/alcs/src/portal/notification-submission/notification-submission.controller.ts @@ -10,7 +10,6 @@ import { Req, UseGuards, } from '@nestjs/common'; -import { PARENT_TYPE } from '../../alcs/card/card-subtask/card-subtask.dto'; import { NOTIFICATION_STATUS } from '../../alcs/notification/notification-submission-status/notification-status.dto'; import { PortalAuthGuard } from '../../common/authorization/portal-auth-guard.service'; import { EmailService } from '../../providers/email/email.service'; @@ -30,7 +29,6 @@ export class NotificationSubmissionController { private notificationSubmissionService: NotificationSubmissionService, private notificationValidationService: NotificationSubmissionValidatorService, private generateSrwDocumentService: GenerateSrwDocumentService, - private emailService: EmailService, ) {} @Get() @@ -177,25 +175,10 @@ export class NotificationSubmissionController { ); if (savedDocument) { - const templateData = - await this.notificationSubmissionService.generateSrwEmailData( - submission, - savedDocument, - ); - - await this.emailService.sendEmail({ - to: [templateData.to], - body: templateData.html, - subject: `Agricultural Land Commission SRW${submission.fileNumber} (${submission.applicant})`, - parentType: PARENT_TYPE.NOTIFICATION, - parentId: templateData.parentId, - cc: templateData.cc, - attachments: [savedDocument.document], - }); - - await this.notificationSubmissionService.updateStatus( - submission.uuid, - NOTIFICATION_STATUS.ALC_RESPONSE_SENT, + await this.notificationSubmissionService.sendAndRecordLTSAPackage( + submission, + savedDocument, + user, ); } } diff --git a/services/apps/alcs/src/portal/notification-submission/notification-submission.service.spec.ts b/services/apps/alcs/src/portal/notification-submission/notification-submission.service.spec.ts index e01a708832..affe4397ea 100644 --- a/services/apps/alcs/src/portal/notification-submission/notification-submission.service.spec.ts +++ b/services/apps/alcs/src/portal/notification-submission/notification-submission.service.spec.ts @@ -7,12 +7,14 @@ import { getRepositoryToken } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; import { NoticeOfIntentType } from '../../alcs/notice-of-intent/notice-of-intent-type/notice-of-intent-type.entity'; +import { NotificationDocumentService } from '../../alcs/notification/notification-document/notification-document.service'; import { NotificationSubmissionToSubmissionStatus } from '../../alcs/notification/notification-submission-status/notification-status.entity'; import { NotificationSubmissionStatusService } from '../../alcs/notification/notification-submission-status/notification-submission-status.service'; import { Notification } from '../../alcs/notification/notification.entity'; import { NotificationService } from '../../alcs/notification/notification.service'; import { NotificationSubmissionProfile } from '../../common/automapper/notification-submission.automapper.profile'; import { FileNumberService } from '../../file-number/file-number.service'; +import { EmailService } from '../../providers/email/email.service'; import { User } from '../../user/user.entity'; import { ValidatedNotificationSubmission } from './notification-submission-validator.service'; import { NotificationSubmission } from './notification-submission.entity'; @@ -25,6 +27,8 @@ describe('NotificationSubmissionService', () => { let mockLGService: DeepMocked<LocalGovernmentService>; let mockFileNumberService: DeepMocked<FileNumberService>; let mockStatusService: DeepMocked<NotificationSubmissionStatusService>; + let mockDocumentService: DeepMocked<NotificationDocumentService>; + let mockEmailService: DeepMocked<EmailService>; let mockSubmission; beforeEach(async () => { @@ -33,6 +37,8 @@ describe('NotificationSubmissionService', () => { mockLGService = createMock(); mockFileNumberService = createMock(); mockStatusService = createMock(); + mockEmailService = createMock(); + mockDocumentService = createMock(); const module: TestingModule = await Test.createTestingModule({ imports: [ @@ -63,6 +69,14 @@ describe('NotificationSubmissionService', () => { provide: NotificationSubmissionStatusService, useValue: mockStatusService, }, + { + provide: EmailService, + useValue: mockEmailService, + }, + { + provide: NotificationDocumentService, + useValue: mockDocumentService, + }, ], }).compile(); diff --git a/services/apps/alcs/src/portal/notification-submission/notification-submission.service.ts b/services/apps/alcs/src/portal/notification-submission/notification-submission.service.ts index 8134131ace..dfc304e878 100644 --- a/services/apps/alcs/src/portal/notification-submission/notification-submission.service.ts +++ b/services/apps/alcs/src/portal/notification-submission/notification-submission.service.ts @@ -13,13 +13,21 @@ import { } from 'typeorm'; import { generateSRWTemplate } from '../../../../../templates/emails/notifications/srw-notice.template'; import { SUBMISSION_STATUS } from '../../alcs/application/application-submission-status/submission-status.dto'; +import { PARENT_TYPE } from '../../alcs/card/card-subtask/card-subtask.dto'; import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; -import { NotificationDocument } from '../../alcs/notification/notification-document/notification-document.entity'; +import { + NotificationDocument, + VISIBILITY_FLAG, +} from '../../alcs/notification/notification-document/notification-document.entity'; +import { NotificationDocumentService } from '../../alcs/notification/notification-document/notification-document.service'; import { NOTIFICATION_STATUS } from '../../alcs/notification/notification-submission-status/notification-status.dto'; import { NotificationSubmissionStatusService } from '../../alcs/notification/notification-submission-status/notification-submission-status.service'; import { NotificationService } from '../../alcs/notification/notification.service'; import { ROLES_ALLOWED_APPLICATIONS } from '../../common/authorization/roles'; +import { DOCUMENT_TYPE } from '../../document/document-code.entity'; +import { DOCUMENT_SOURCE, DOCUMENT_SYSTEM } from '../../document/document.dto'; import { FileNumberService } from '../../file-number/file-number.service'; +import { EmailService } from '../../providers/email/email.service'; import { User } from '../../user/user.entity'; import { FALLBACK_APPLICANT_NAME } from '../../utils/owner.constants'; import { filterUndefined } from '../../utils/undefined'; @@ -50,6 +58,8 @@ export class NotificationSubmissionService { private localGovernmentService: LocalGovernmentService, private fileNumberService: FileNumberService, private notificationSubmissionStatusService: NotificationSubmissionStatusService, + private notificationDocumentService: NotificationDocumentService, + private emailService: EmailService, @InjectMapper() private mapper: Mapper, ) {} @@ -381,7 +391,44 @@ export class NotificationSubmissionService { }); } - async generateSrwEmailData( + async sendAndRecordLTSAPackage( + submission: NotificationSubmission, + document: NotificationDocument, + user: User, + ) { + const templateData = await this.generateSrwEmailData(submission, document); + + await this.emailService.sendEmail({ + to: [templateData.to], + body: templateData.html, + subject: `Agricultural Land Commission SRW${submission.fileNumber} (${submission.applicant})`, + parentType: PARENT_TYPE.NOTIFICATION, + parentId: templateData.parentId, + cc: templateData.cc, + attachments: [document.document], + }); + + const fileBuffer = Buffer.from(templateData.html); + await this.notificationDocumentService.attachDocumentAsBuffer({ + file: Buffer.from(templateData.html), + fileName: `SRW${submission.fileNumber}_ALC_Email_Response.html`, + source: DOCUMENT_SOURCE.ALC, + user, + system: DOCUMENT_SYSTEM.ALCS, + documentType: DOCUMENT_TYPE.ACKNOWLEDGEMENT_LETTER, + fileNumber: submission.fileNumber, + fileSize: fileBuffer.length, + mimeType: 'text/html', + visibilityFlags: [VISIBILITY_FLAG.APPLICANT, VISIBILITY_FLAG.GOVERNMENT], + }); + + await this.updateStatus( + submission.uuid, + NOTIFICATION_STATUS.ALC_RESPONSE_SENT, + ); + } + + private async generateSrwEmailData( submission: NotificationSubmission, pdfDocument: NotificationDocument, ) { diff --git a/services/apps/alcs/src/portal/pdf-generation/generate-review-document.service.spec.ts b/services/apps/alcs/src/portal/pdf-generation/generate-review-document.service.spec.ts index 1aedea1b9e..61f7cfb8ce 100644 --- a/services/apps/alcs/src/portal/pdf-generation/generate-review-document.service.spec.ts +++ b/services/apps/alcs/src/portal/pdf-generation/generate-review-document.service.spec.ts @@ -3,6 +3,7 @@ import { classes } from '@automapper/classes'; import { AutomapperModule } from '@automapper/nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; +import { LocalGovernment } from '../../alcs/local-government/local-government.entity'; import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; import { ApplicationDocumentService } from '../../alcs/application/application-document/application-document.service'; import { Application } from '../../alcs/application/application.entity'; @@ -96,7 +97,9 @@ describe('GenerateReviewDocumentService', () => { type: { portalLabel: 'fake-label' }, localGovernmentUuid: 'cats', } as Application); - mockApplicationLocalGovernmentService.getByUuid.mockResolvedValue(null); + mockApplicationLocalGovernmentService.getByUuid.mockResolvedValue( + new LocalGovernment(), + ); const userEntity = new User({ name: 'Bruce Wayne', }); diff --git a/services/apps/alcs/src/portal/pdf-generation/generate-srw-document.service.spec.ts b/services/apps/alcs/src/portal/pdf-generation/generate-srw-document.service.spec.ts index fc4d9d5c6d..7930f8fb7a 100644 --- a/services/apps/alcs/src/portal/pdf-generation/generate-srw-document.service.spec.ts +++ b/services/apps/alcs/src/portal/pdf-generation/generate-srw-document.service.spec.ts @@ -1,6 +1,7 @@ import { CdogsService } from '@app/common/cdogs/cdogs.service'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; +import { LocalGovernment } from '../../alcs/local-government/local-government.entity'; import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; import { NotificationDocument } from '../../alcs/notification/notification-document/notification-document.entity'; import { NotificationDocumentService } from '../../alcs/notification/notification-document/notification-document.service'; @@ -90,7 +91,9 @@ describe('GenerateSrwDocumentService', () => { mockNotificationService.getByFileNumber.mockResolvedValue( new Notification(), ); - mockLocalGovernmentService.getByUuid.mockResolvedValue(null); + mockLocalGovernmentService.getByUuid.mockResolvedValue( + new LocalGovernment(), + ); const userEntity = new User({ name: 'Bruce Wayne', }); diff --git a/services/apps/alcs/src/portal/pdf-generation/generate-submission-document.service.spec.ts b/services/apps/alcs/src/portal/pdf-generation/generate-submission-document.service.spec.ts index 7586996285..62a2d4b847 100644 --- a/services/apps/alcs/src/portal/pdf-generation/generate-submission-document.service.spec.ts +++ b/services/apps/alcs/src/portal/pdf-generation/generate-submission-document.service.spec.ts @@ -6,6 +6,7 @@ import { Test, TestingModule } from '@nestjs/testing'; import * as dayjs from 'dayjs'; import * as timezone from 'dayjs/plugin/timezone'; import * as utc from 'dayjs/plugin/utc'; +import { LocalGovernment } from '../../alcs/local-government/local-government.entity'; import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; import { DOCUMENT_TYPE } from '../../document/document-code.entity'; import { ApplicationDocument } from '../../alcs/application/application-document/application-document.entity'; @@ -47,6 +48,10 @@ describe('GenerateSubmissionDocumentService', () => { mockApplicationOwnerService = createMock(); mockApplicationDocumentService = createMock(); + mockApplicationLocalGovernmentService.getByUuid.mockResolvedValue( + new LocalGovernment(), + ); + const module: TestingModule = await Test.createTestingModule({ providers: [ GenerateSubmissionDocumentService, @@ -102,7 +107,6 @@ describe('GenerateSubmissionDocumentService', () => { mockApplicationService.getOrFail.mockResolvedValue({ type: { portalLabel: 'fake-label' }, } as Application); - mockApplicationLocalGovernmentService.getByUuid.mockResolvedValue(null); mockApplicationParcelService.fetchByApplicationFileId.mockResolvedValue([]); mockApplicationOwnerService.fetchByApplicationFileId.mockResolvedValue([]); const user = { user: { entity: 'Bruce' } }; @@ -130,7 +134,6 @@ describe('GenerateSubmissionDocumentService', () => { mockApplicationService.getOrFail.mockResolvedValue({ type: { portalLabel: 'fake-label' }, } as Application); - mockApplicationLocalGovernmentService.getByUuid.mockResolvedValue(null); mockApplicationParcelService.fetchByApplicationFileId.mockResolvedValue([]); mockApplicationOwnerService.fetchByApplicationFileId.mockResolvedValue([]); const user = { user: { entity: 'Bruce' } }; @@ -158,7 +161,6 @@ describe('GenerateSubmissionDocumentService', () => { mockApplicationService.getOrFail.mockResolvedValue({ type: { portalLabel: 'fake-label' }, } as Application); - mockApplicationLocalGovernmentService.getByUuid.mockResolvedValue(null); mockApplicationParcelService.fetchByApplicationFileId.mockResolvedValue([]); mockApplicationOwnerService.fetchByApplicationFileId.mockResolvedValue([]); const user = { user: { entity: 'Bruce' } }; @@ -197,7 +199,6 @@ describe('GenerateSubmissionDocumentService', () => { mockApplicationService.getOrFail.mockResolvedValue({ type: { portalLabel: 'fake-label' }, } as Application); - mockApplicationLocalGovernmentService.getByUuid.mockResolvedValue(null); mockApplicationParcelService.fetchByApplicationFileId.mockResolvedValue([]); mockApplicationOwnerService.fetchByApplicationFileId.mockResolvedValue([]); const user = { user: { entity: 'Bruce' } }; diff --git a/services/apps/alcs/src/providers/email/status-email.service.spec.ts b/services/apps/alcs/src/providers/email/status-email.service.spec.ts index f9083f3b36..3755095d46 100644 --- a/services/apps/alcs/src/providers/email/status-email.service.spec.ts +++ b/services/apps/alcs/src/providers/email/status-email.service.spec.ts @@ -1,6 +1,5 @@ import { ConfigModule } from '@app/common/config/config.module'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; -import { HttpService } from '@nestjs/axios'; import { Test, TestingModule } from '@nestjs/testing'; import { MJMLParseResults } from 'mjml-core'; import { ApplicationSubmissionStatusType } from '../../alcs/application/application-submission-status/submission-status-type.entity'; @@ -98,24 +97,6 @@ describe('StatusEmailService', () => { expect(res).toStrictEqual(mockGovernment); }); - it('should throw an exception if no submission government is found', async () => { - mockLocalGovernmentService.getByUuid.mockResolvedValue(null); - - const mockApplicationSubmission = new ApplicationSubmission({ - localGovernmentUuid: 'fake-uuid', - }); - const promise = service.getSubmissionGovernmentOrFail( - mockApplicationSubmission, - ); - expect(mockLocalGovernmentService.getByUuid).toHaveBeenCalledTimes(1); - expect(mockLocalGovernmentService.getByUuid).toHaveBeenCalledWith( - mockApplicationSubmission.localGovernmentUuid, - ); - await expect(promise).rejects.toMatchObject( - new Error('Submission local government not found'), - ); - }); - it('should call through services and return application data', async () => { const mockSubmission = new ApplicationSubmission(); mockApplicationSubmissionService.getOrFailByFileNumber.mockResolvedValue( diff --git a/services/apps/alcs/src/providers/email/status-email.service.ts b/services/apps/alcs/src/providers/email/status-email.service.ts index e45aaa2535..442a45721d 100644 --- a/services/apps/alcs/src/providers/email/status-email.service.ts +++ b/services/apps/alcs/src/providers/email/status-email.service.ts @@ -81,12 +81,9 @@ export class StatusEmailService { submission: ApplicationSubmission | NoticeOfIntentSubmission, ) { if (submission.localGovernmentUuid) { - const localGovernment = await this.localGovernmentService.getByUuid( + return await this.localGovernmentService.getByUuid( submission.localGovernmentUuid, ); - if (localGovernment) { - return localGovernment; - } } return undefined; } From a6b418f958a6695142839807d2361df4ffa09cd7 Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Mon, 18 Sep 2023 13:15:15 -0700 Subject: [PATCH 396/954] remove logging from health endpoint (#978) --- services/apps/alcs/src/main.controller.ts | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/services/apps/alcs/src/main.controller.ts b/services/apps/alcs/src/main.controller.ts index 237263dac8..b40f2e8aff 100644 --- a/services/apps/alcs/src/main.controller.ts +++ b/services/apps/alcs/src/main.controller.ts @@ -1,4 +1,4 @@ -import { Controller, Get, Logger, UseGuards } from '@nestjs/common'; +import { Controller, Get, UseGuards } from '@nestjs/common'; import { ApiOAuth2 } from '@nestjs/swagger'; import * as config from 'config'; import { Public, RoleGuard } from 'nest-keycloak-connect'; @@ -7,14 +7,11 @@ import { MainService } from './main.service'; @Controller() export class MainController { - private logger = new Logger(MainController.name); - constructor(private appService: MainService) {} @Get(['', 'health']) @Public() async getHealthStatus(): Promise<HealthCheckDto> { - this.logger.debug('Test of logger debug message'); return await this.appService.getHealthStatus(); } From 7e63747f2ee6aea9d4bc0925bf22af730a090721 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Mon, 18 Sep 2023 15:26:12 -0700 Subject: [PATCH 397/954] SRW Bug Fixes --- .../application-details.component.html | 13 +++++---- .../application-details.component.html | 15 +++++----- .../other-attachments.component.html | 8 ++--- .../other-attachments.component.scss | 2 +- .../other-attachments.component.ts | 2 +- .../create-submission-dialog.component.html | 4 ++- .../other-attachments.component.html | 8 ++--- .../other-attachments.component.scss | 2 +- .../other-attachments.component.ts | 2 +- .../notice-of-intent-details.component.html | 15 +++++----- .../other-attachments.component.html | 22 +++++++------- .../other-attachments.component.scss | 2 +- .../other-attachments.component.ts | 2 +- .../parcels/parcel-details.component.html | 10 ++++--- .../parcel-entry/parcel-entry.component.html | 4 +-- .../primary-contact.component.ts | 4 +++ .../proposal/proposal.component.html | 16 ++++++---- .../proposal/proposal.component.scss | 15 ++++++++++ .../transferee-dialog.component.html | 20 ++++++++----- .../transferee-dialog.component.ts | 3 ++ .../transferees/transferees.component.html | 2 +- .../notification-details.component.html | 29 +++++++++++-------- .../parcel/parcel.component.html | 2 +- .../submission-documents.component.html | 2 +- .../submission-documents.component.ts | 7 +++++ ...iew-notification-submission.component.html | 10 +++---- .../notification-document.service.ts | 10 +++++++ .../app/shared/no-data/no-data.component.html | 4 +-- .../app/shared/no-data/no-data.component.ts | 3 +- .../1695070454420-update_noti_description.ts | 13 +++++++++ 30 files changed, 163 insertions(+), 88 deletions(-) create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1695070454420-update_noti_description.ts diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.html b/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.html index 1777a072b9..d3040f8ce2 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.html +++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.html @@ -205,18 +205,19 @@ <h3>Proposal</h3> <h3>Optional Documents</h3> <div *ngIf="submission" class="review-table"> <div class="other-attachments full-width"> - <div class="grid-1 subheading2">Type</div> - <div class="grid-2 subheading2">Description</div> - <div class="grid-3 subheading2">File Name</div> + <div class="grid-1 subheading2">File Name</div> + <div class="grid-2 subheading2">Type</div> + <div class="grid-3 subheading2">Description</div> + <ng-container *ngFor="let file of otherFiles"> <div class="grid-1"> - {{ file.type?.label }} + <a (click)="openFile(file.uuid)">{{ file.fileName }}</a> </div> <div class="grid-2"> - {{ file.description }} + {{ file.type?.label }} </div> <div class="grid-3"> - <a (click)="openFile(file.uuid)">{{ file.fileName }}</a> + {{ file.description }} </div> </ng-container> <div *ngIf="otherFiles.length === 0" class="full-width">No optional attachments</div> diff --git a/portal-frontend/src/app/features/applications/application-details/application-details.component.html b/portal-frontend/src/app/features/applications/application-details/application-details.component.html index b727a4ff77..97920f9a04 100644 --- a/portal-frontend/src/app/features/applications/application-details/application-details.component.html +++ b/portal-frontend/src/app/features/applications/application-details/application-details.component.html @@ -324,21 +324,22 @@ <h3>6. Proposal</h3> <h3>7. Optional Documents</h3> <div *ngIf="applicationSubmission" class="review-table"> <div class="other-attachments full-width"> - <div class="grid-1 subheading2">Type</div> - <div class="grid-2 subheading2">Description</div> - <div class="grid-3 subheading2">File Name</div> + <div class="grid-1 subheading2">File Name</div> + <div class="grid-2 subheading2">Type</div> + <div class="grid-3 subheading2">Description</div> + <ng-container *ngFor="let file of otherFiles"> <div class="grid-1"> + <a (click)="openFile(file.uuid)">{{ file.fileName }}</a> + </div> + <div class="grid-2"> {{ file.type?.label }} <app-no-data [showRequired]="showErrors" *ngIf="!file.type"></app-no-data> </div> - <div class="grid-2"> + <div class="grid-3"> {{ file.description }} <app-no-data [showRequired]="showErrors" *ngIf="!file.description"></app-no-data> </div> - <div class="grid-3"> - <a (click)="openFile(file.uuid)">{{ file.fileName }}</a> - </div> </ng-container> <div class="full-width"> <app-no-data [showRequired]="false" *ngIf="otherFiles.length === 0"></app-no-data> diff --git a/portal-frontend/src/app/features/applications/edit-submission/other-attachments/other-attachments.component.html b/portal-frontend/src/app/features/applications/edit-submission/other-attachments/other-attachments.component.html index 7d22a021a6..c526b3d3b5 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/other-attachments/other-attachments.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/other-attachments/other-attachments.component.html @@ -8,7 +8,10 @@ <h2>Optional Attachments</h2> include confidential material within your application. </p> <section> - <h4>Optional Attachments (Max. 100 MB per attachment)</h4> + <div class='subheading2'>Optional Attachments (Max. 100 MB per attachment)</div> + <div class="uploader"> + <app-file-drag-drop (uploadFiles)="attachFile($event, null)"></app-file-drag-drop> + </div> <form [formGroup]="form"> <div class="scrollable"> <table mat-table [dataSource]="otherFiles"> @@ -89,9 +92,6 @@ <h4>Optional Attachments (Max. 100 MB per attachment)</h4> </table> </div> </form> - <div class="uploader"> - <app-file-drag-drop (uploadFiles)="attachFile($event, null)"></app-file-drag-drop> - </div> </section> <div class="button-container"> <button *ngIf="!draftMode" (click)="onSaveExit()" mat-stroked-button color="accent">Save and Exit</button> diff --git a/portal-frontend/src/app/features/applications/edit-submission/other-attachments/other-attachments.component.scss b/portal-frontend/src/app/features/applications/edit-submission/other-attachments/other-attachments.component.scss index 7a223440c8..2de86abf6e 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/other-attachments/other-attachments.component.scss +++ b/portal-frontend/src/app/features/applications/edit-submission/other-attachments/other-attachments.component.scss @@ -6,7 +6,7 @@ section { } .uploader { - margin-top: rem(24); + margin-top: rem(12); } h4 { diff --git a/portal-frontend/src/app/features/applications/edit-submission/other-attachments/other-attachments.component.ts b/portal-frontend/src/app/features/applications/edit-submission/other-attachments/other-attachments.component.ts index 8e26372636..b974232ea9 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/other-attachments/other-attachments.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/other-attachments/other-attachments.component.ts @@ -24,7 +24,7 @@ const USER_CONTROLLED_TYPES = [DOCUMENT_TYPE.PHOTOGRAPH, DOCUMENT_TYPE.PROFESSIO export class OtherAttachmentsComponent extends FilesStepComponent implements OnInit, OnDestroy { currentStep = EditApplicationSteps.Attachments; - displayedColumns = ['type', 'description', 'fileName', 'actions']; + displayedColumns = ['fileName', 'type', 'description', 'actions']; selectableTypes: DocumentTypeDto[] = []; otherFiles: ApplicationDocumentDto[] = []; diff --git a/portal-frontend/src/app/features/create-submission-dialog/create-submission-dialog.component.html b/portal-frontend/src/app/features/create-submission-dialog/create-submission-dialog.component.html index 6b82c5c50b..154a23a11b 100644 --- a/portal-frontend/src/app/features/create-submission-dialog/create-submission-dialog.component.html +++ b/portal-frontend/src/app/features/create-submission-dialog/create-submission-dialog.component.html @@ -110,7 +110,9 @@ <h4 *ngIf="currentStep === steps.prescribedBody"> <ng-container *ngIf="currentStep === steps.srwType"> <div class="step-description"> Submitting a notification of Statutory Right of Way (SRW) only applies to a SRW described in - <a href="https://www.bclaws.gov.bc.ca/civix/document/id/complete/statreg/96250_00_multi#section218" + <a + target="_blank" + href="https://www.bclaws.gov.bc.ca/civix/document/id/complete/statreg/96250_00_multi#section218" >s. 218 of the Land Title Act.</a > </div> diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/other-attachments/other-attachments.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/other-attachments/other-attachments.component.html index 744ad73277..5cc5c8e5a8 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/other-attachments/other-attachments.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/other-attachments/other-attachments.component.html @@ -8,7 +8,10 @@ <h2>Optional Attachments</h2> not include confidential material within your notice of intent. </p> <section> - <h4>Optional Attachments (Max. 100 MB per attachment)</h4> + <div class='subheading2'>Optional Attachments (Max. 100 MB per attachment)</div> + <div class="uploader"> + <app-file-drag-drop (uploadFiles)="attachFile($event, null)"></app-file-drag-drop> + </div> <form [formGroup]="form"> <div class="scrollable"> <table mat-table [dataSource]="otherFiles"> @@ -89,9 +92,6 @@ <h4>Optional Attachments (Max. 100 MB per attachment)</h4> </table> </div> </form> - <div class="uploader"> - <app-file-drag-drop (uploadFiles)="attachFile($event, null)"></app-file-drag-drop> - </div> </section> <div class="button-container"> <button *ngIf="!draftMode" (click)="onSaveExit()" mat-stroked-button color="accent">Save and Exit</button> diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/other-attachments/other-attachments.component.scss b/portal-frontend/src/app/features/notice-of-intents/edit-submission/other-attachments/other-attachments.component.scss index 7a223440c8..2de86abf6e 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/other-attachments/other-attachments.component.scss +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/other-attachments/other-attachments.component.scss @@ -6,7 +6,7 @@ section { } .uploader { - margin-top: rem(24); + margin-top: rem(12); } h4 { diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/other-attachments/other-attachments.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/other-attachments/other-attachments.component.ts index dd2d8c4c27..698097de37 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/other-attachments/other-attachments.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/other-attachments/other-attachments.component.ts @@ -24,7 +24,7 @@ const USER_CONTROLLED_TYPES = [DOCUMENT_TYPE.PHOTOGRAPH, DOCUMENT_TYPE.PROFESSIO export class OtherAttachmentsComponent extends FilesStepComponent implements OnInit, OnDestroy { currentStep = EditNoiSteps.Attachments; - displayedColumns = ['type', 'description', 'fileName', 'actions']; + displayedColumns = ['fileName', 'type', 'description', 'actions']; selectableTypes: DocumentTypeDto[] = []; otherFiles: NoticeOfIntentDocumentDto[] = []; diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.html b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.html index 386a254475..4d85505c21 100644 --- a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.html @@ -244,21 +244,22 @@ <h3>6. Additional Proposal Information</h3> <h3>7. Optional Documents</h3> <div *ngIf="noiSubmission" class="review-table"> <div class="other-attachments full-width"> - <div class="grid-1 subheading2">Type</div> - <div class="grid-2 subheading2">Description</div> - <div class="grid-3 subheading2">File Name</div> + <div class="grid-1 subheading2">File Name</div> + <div class="grid-2 subheading2">Type</div> + <div class="grid-3 subheading2">Description</div> + <ng-container *ngFor="let file of otherFiles"> <div class="grid-1"> + <a (click)="openFile(file.uuid)">{{ file.fileName }}</a> + </div> + <div class="grid-2"> {{ file.type?.label }} <app-no-data [showRequired]="showErrors" *ngIf="!file.type"></app-no-data> </div> - <div class="grid-2"> + <div class="grid-3"> {{ file.description }} <app-no-data [showRequired]="showErrors" *ngIf="!file.description"></app-no-data> </div> - <div class="grid-3"> - <a (click)="openFile(file.uuid)">{{ file.fileName }}</a> - </div> </ng-container> <div class="full-width"> <app-no-data [showRequired]="false" *ngIf="otherFiles.length === 0"></app-no-data> diff --git a/portal-frontend/src/app/features/notifications/edit-submission/other-attachments/other-attachments.component.html b/portal-frontend/src/app/features/notifications/edit-submission/other-attachments/other-attachments.component.html index ccd065dabd..d1bfc173b9 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/other-attachments/other-attachments.component.html +++ b/portal-frontend/src/app/features/notifications/edit-submission/other-attachments/other-attachments.component.html @@ -6,10 +6,20 @@ <h2>Optional Attachments</h2> </p> </div> <section> - <h4>Upload Optional Attachments (Max. 100 MB per attachment)</h4> + <span class='subheading2'>Upload Optional Attachments (Max. 100 MB per attachment)</span> + <div class="uploader"> + <app-file-drag-drop (uploadFiles)="attachFile($event, null)"></app-file-drag-drop> + </div> <form [formGroup]="form"> <div class="scrollable"> <table mat-table [dataSource]="otherFiles"> + <ng-container matColumnDef="fileName"> + <th mat-header-cell *matHeaderCellDef>File Name</th> + <td mat-cell *matCellDef="let element"> + <a (click)="openFile(element.uuid)">{{ element.fileName }}</a> + </td> + </ng-container> + <ng-container matColumnDef="type"> <th mat-header-cell *matHeaderCellDef>Type</th> <td mat-cell *matCellDef="let element"> @@ -64,13 +74,6 @@ <h4>Upload Optional Attachments (Max. 100 MB per attachment)</h4> </td> </ng-container> - <ng-container matColumnDef="fileName"> - <th mat-header-cell *matHeaderCellDef>File Name</th> - <td mat-cell *matCellDef="let element"> - <a (click)="openFile(element.uuid)">{{ element.fileName }}</a> - </td> - </ng-container> - <ng-container matColumnDef="actions"> <th mat-header-cell *matHeaderCellDef>Action</th> <td mat-cell class="actions" *matCellDef="let element"> @@ -87,9 +90,6 @@ <h4>Upload Optional Attachments (Max. 100 MB per attachment)</h4> </table> </div> </form> - <div class="uploader"> - <app-file-drag-drop (uploadFiles)="attachFile($event, null)"></app-file-drag-drop> - </div> </section> <div class="button-container"> <button (click)="onSaveExit()" mat-stroked-button color="accent">Save and Exit</button> diff --git a/portal-frontend/src/app/features/notifications/edit-submission/other-attachments/other-attachments.component.scss b/portal-frontend/src/app/features/notifications/edit-submission/other-attachments/other-attachments.component.scss index 7a223440c8..2de86abf6e 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/other-attachments/other-attachments.component.scss +++ b/portal-frontend/src/app/features/notifications/edit-submission/other-attachments/other-attachments.component.scss @@ -6,7 +6,7 @@ section { } .uploader { - margin-top: rem(24); + margin-top: rem(12); } h4 { diff --git a/portal-frontend/src/app/features/notifications/edit-submission/other-attachments/other-attachments.component.ts b/portal-frontend/src/app/features/notifications/edit-submission/other-attachments/other-attachments.component.ts index 920bc18586..e5819c1fa6 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/other-attachments/other-attachments.component.ts +++ b/portal-frontend/src/app/features/notifications/edit-submission/other-attachments/other-attachments.component.ts @@ -24,7 +24,7 @@ const USER_CONTROLLED_TYPES = [DOCUMENT_TYPE.PHOTOGRAPH, DOCUMENT_TYPE.PROFESSIO export class OtherAttachmentsComponent extends FilesStepComponent implements OnInit, OnDestroy { currentStep = EditNotificationSteps.Attachments; - displayedColumns = ['type', 'description', 'fileName', 'actions']; + displayedColumns = ['fileName', 'type', 'description', 'actions']; selectableTypes: DocumentTypeDto[] = []; otherFiles: NotificationDocumentDto[] = []; diff --git a/portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-details.component.html b/portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-details.component.html index 6ce7b7f4b2..f09f0d590e 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-details.component.html +++ b/portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-details.component.html @@ -1,7 +1,7 @@ <div> <div class="step-description"> - <h3>Identify Parcels Under SRW</h3> - <p>Provide parcel identification and registered ownership information for each parcel.</p> + <h3>Identify Parcel(s) Under the Statutory Right of Way</h3> + <p>Provide parcel identification information for each parcel under the SRW.</p> <p>*All fields are required unless stated optional.</p> </div> <mat-expansion-panel @@ -12,7 +12,9 @@ <h3>Identify Parcels Under SRW</h3> (opened)="openParcel(parcel.uuid)" > <mat-expansion-panel-header> - <mat-panel-title> Parcel #{{ parcelInd + 1 }} Details & Owner Information </mat-panel-title> + <mat-panel-title> + <span class='subheading1'>Parcel #{{ parcelInd + 1 }} Details</span> + </mat-panel-title> </mat-expansion-panel-header> <app-notification-parcel-entry @@ -26,7 +28,7 @@ <h3>Identify Parcels Under SRW</h3> <div> <div class="flex-evenly-wrap parcel-buttons-wrappers"> <button class="margin-top-1-half" mat-stroked-button color="primary" (click)="onSave()"> - Save Parcel #{{ parcelInd + 1 }} Details & Owner Information + Save Parcel #{{ parcelInd + 1 }} Details </button> <button class="margin-top-1-half" diff --git a/portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-entry/parcel-entry.component.html b/portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-entry/parcel-entry.component.html index a10babbf69..b6a443ab0c 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-entry/parcel-entry.component.html +++ b/portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-entry/parcel-entry.component.html @@ -1,7 +1,7 @@ <form [formGroup]="parcelForm" (keydown.enter)="$event.preventDefault()"> <div class="type"> <label>Select ownership type:</label> - <div class="warning"> + <div class="subtext"> The answer to the following question will change the rest of the notice of intent form. Do not change this answer once selected. </div> @@ -114,7 +114,7 @@ <h5>Parcel Lookup</h5> </div> </div> - <div *ngIf="isCrownLand"> + <div class="full-row" *ngIf="isCrownLand"> <label for="pin">PIN (optional)</label> <div class="subtext">Unique numeric identifier for Crown land parcels</div> <mat-form-field appearance="outline"> diff --git a/portal-frontend/src/app/features/notifications/edit-submission/primary-contact/primary-contact.component.ts b/portal-frontend/src/app/features/notifications/edit-submission/primary-contact/primary-contact.component.ts index 751d7250de..ae6b818c5a 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/primary-contact/primary-contact.component.ts +++ b/portal-frontend/src/app/features/notifications/edit-submission/primary-contact/primary-contact.component.ts @@ -50,6 +50,10 @@ export class PrimaryContactComponent extends StepComponent implements OnInit, On }); } }); + + if (this.showErrors) { + this.form.markAllAsTouched(); + } } async onSave() { diff --git a/portal-frontend/src/app/features/notifications/edit-submission/proposal/proposal.component.html b/portal-frontend/src/app/features/notifications/edit-submission/proposal/proposal.component.html index f4af76c4cf..31aff9ecde 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/proposal/proposal.component.html +++ b/portal-frontend/src/app/features/notifications/edit-submission/proposal/proposal.component.html @@ -1,6 +1,6 @@ <div class="step-description"> <h2>Purpose of SRW</h2> - <p>All fields are required unless stated optional.</p> + <p>* All fields are required unless stated optional.</p> </div> <app-warning-banner> The information entered below will be reflected in the automatically generated notification response and must match @@ -127,7 +127,7 @@ <h2>Purpose of SRW</h2> </form> <form [formGroup]="surveyForm"> <div class="scrollable"> - <table mat-table [dataSource]="surveyPlans"> + <table class='table' mat-table [dataSource]="surveyPlans"> <ng-container matColumnDef="fileName"> <th mat-header-cell *matHeaderCellDef>File Name</th> <td mat-cell *matCellDef="let element"> @@ -136,7 +136,10 @@ <h2>Purpose of SRW</h2> </ng-container> <ng-container matColumnDef="surveyPlan"> - <th mat-header-cell *matHeaderCellDef>Survey Plan Number</th> + <th mat-header-cell *matHeaderCellDef> + Survey Plan Number + <div class="subtext">As listed on the survey plan certification</div> + </th> <td mat-cell *matCellDef="let element"> <mat-form-field appearance="outline"> <input @@ -165,7 +168,10 @@ <h2>Purpose of SRW</h2> </ng-container> <ng-container matColumnDef="control"> - <th mat-header-cell *matHeaderCellDef>Control Number</th> + <th mat-header-cell *matHeaderCellDef> + Control Number + <div class="subtext">The version of the plan, as listed on the survey plan certification</div> + </th> <td mat-cell *matCellDef="let element"> <mat-form-field appearance="outline"> <input @@ -204,7 +210,7 @@ <h2>Purpose of SRW</h2> <tr mat-row *matRowDef="let row; columns: displayedColumns"></tr> <tr class="mat-row" *matNoDataRow> - <td class="no-data-text" colspan="6">No attachments</td> + <td class="no-data-text" colspan="4">No documents. Upload a survey plan above to add a row to the table.</td> </tr> </table> </div> diff --git a/portal-frontend/src/app/features/notifications/edit-submission/proposal/proposal.component.scss b/portal-frontend/src/app/features/notifications/edit-submission/proposal/proposal.component.scss index 8223c57759..cdabc6eb25 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/proposal/proposal.component.scss +++ b/portal-frontend/src/app/features/notifications/edit-submission/proposal/proposal.component.scss @@ -1,5 +1,20 @@ @use '../../../../../styles/functions' as *; +@use '../../../../../styles/colors'; section { margin-top: rem(36); } + +.no-data-text { + color: colors.$grey; + text-align: center; + padding-top: rem(16); +} + +.table { + margin-top: rem(24); +} + +.scrollable { + overflow-x: auto; +} diff --git a/portal-frontend/src/app/features/notifications/edit-submission/transferees/transferee-dialog/transferee-dialog.component.html b/portal-frontend/src/app/features/notifications/edit-submission/transferees/transferee-dialog/transferee-dialog.component.html index 74498dc2e2..a2e4d42e9b 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/transferees/transferee-dialog/transferee-dialog.component.html +++ b/portal-frontend/src/app/features/notifications/edit-submission/transferees/transferee-dialog/transferee-dialog.component.html @@ -1,6 +1,6 @@ <div mat-dialog-title> - <h2 *ngIf="!isEdit">Add New Transferee</h2> - <h2 *ngIf="isEdit">Edit Transferee</h2> + <h3 *ngIf="!isEdit">Add New Transferee</h3> + <h3 *ngIf="isEdit">Edit Transferee</h3> </div> <div mat-dialog-content> <form [formGroup]="form"> @@ -8,8 +8,8 @@ <h2 *ngIf="isEdit">Edit Transferee</h2> <div class="full-row"> <label for="type">Transferee Type</label> <mat-button-toggle-group (change)="onChangeType($event)" class="input" id="type" formControlName="type"> - <mat-button-toggle [value]="OWNER_TYPE.INDIVIDUAL">Individual</mat-button-toggle> - <mat-button-toggle [value]="OWNER_TYPE.ORGANIZATION">Organization</mat-button-toggle> + <mat-button-toggle color="primary" [value]="OWNER_TYPE.INDIVIDUAL">Individual</mat-button-toggle> + <mat-button-toggle color="primary" [value]="OWNER_TYPE.ORGANIZATION">Organization</mat-button-toggle> </mat-button-toggle-group> </div> <div class="full-row" *ngIf="type.getRawValue() === OWNER_TYPE.ORGANIZATION"> @@ -25,7 +25,7 @@ <h2 *ngIf="isEdit">Edit Transferee</h2> <div *ngIf="organizationName.errors?.['required']">This field is required</div> </div> </div> - <h4 class="full-row" *ngIf="type.getRawValue() === OWNER_TYPE.ORGANIZATION">Organization Contact Info</h4> + <h5 class="full-row" *ngIf="type.getRawValue() === OWNER_TYPE.ORGANIZATION">Organization Contact Info</h5> <div> <label for="firstName">First Name</label> <mat-form-field appearance="outline"> @@ -78,7 +78,11 @@ <h4 class="full-row" *ngIf="type.getRawValue() === OWNER_TYPE.ORGANIZATION">Orga </form> </div> <div mat-dialog-actions class="actions"> - <button mat-stroked-button (click)="onClose()">Cancel</button> - <button mat-flat-button color="primary" [disabled]="form.invalid" *ngIf="!isEdit" (click)="onCreate()">Add</button> - <button mat-flat-button color="primary" [disabled]="form.invalid" *ngIf="isEdit" (click)="onSave()">Save</button> + <button mat-stroked-button color="primary" (click)="onClose()">Cancel</button> + <button mat-flat-button color="primary" [disabled]="form.invalid || isLoading" *ngIf="!isEdit" (click)="onCreate()"> + Add + </button> + <button mat-flat-button color="primary" [disabled]="form.invalid || isLoading" *ngIf="isEdit" (click)="onSave()"> + Save + </button> </div> diff --git a/portal-frontend/src/app/features/notifications/edit-submission/transferees/transferee-dialog/transferee-dialog.component.ts b/portal-frontend/src/app/features/notifications/edit-submission/transferees/transferee-dialog/transferee-dialog.component.ts index 2b9dca88b8..a4a3aaec97 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/transferees/transferee-dialog/transferee-dialog.component.ts +++ b/portal-frontend/src/app/features/notifications/edit-submission/transferees/transferee-dialog/transferee-dialog.component.ts @@ -25,6 +25,7 @@ export class TransfereeDialogComponent { email = new FormControl<string | null>('', [Validators.required, Validators.email]); isEdit = false; + isLoading = false; existingUuid: string | undefined; form = new FormGroup({ @@ -74,6 +75,7 @@ export class TransfereeDialogComponent { console.error('TransfereeDialogComponent misconfigured, needs submissionUuid for create'); return; } + this.isLoading = true; const createDto: NotificationTransfereeCreateDto = { organizationName: this.organizationName.getRawValue() || undefined, @@ -103,6 +105,7 @@ export class TransfereeDialogComponent { typeCode: this.type.getRawValue()!, }; if (this.existingUuid) { + this.isLoading = true; await this.transfereeService.update(this.existingUuid, updateDto); this.dialogRef.close(true); } diff --git a/portal-frontend/src/app/features/notifications/edit-submission/transferees/transferees.component.html b/portal-frontend/src/app/features/notifications/edit-submission/transferees/transferees.component.html index 3b3bbd8596..7f3c754ec4 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/transferees/transferees.component.html +++ b/portal-frontend/src/app/features/notifications/edit-submission/transferees/transferees.component.html @@ -15,7 +15,7 @@ <h4>All Transferees</h4> }" (click)="onAdd()" > - Add Transferee + Add New Transferee </button> <app-validation-error *ngIf="transferees.length === 0 && showErrors"> At least one transferee is required diff --git a/portal-frontend/src/app/features/notifications/notification-details/notification-details.component.html b/portal-frontend/src/app/features/notifications/notification-details/notification-details.component.html index e6cb42fcfd..71919ab103 100644 --- a/portal-frontend/src/app/features/notifications/notification-details/notification-details.component.html +++ b/portal-frontend/src/app/features/notifications/notification-details/notification-details.component.html @@ -10,11 +10,11 @@ <h3>2. Identify Transferees</h3> <div class="full-width transferee-table"> <div class="subheading2">Type</div> <div class="subheading2">Full Name</div> - <div class="subheading2">Organization</div> + <div class="subheading2">Organization Name</div> <div class="subheading2">Phone</div> <div class="subheading2">Email</div> <ng-container *ngFor="let transferee of notificationSubmission.transferees"> - <div>{{ transferee.type.label }}</div> + <div>{{ transferee.type.code === 'INDV' ? 'Individual' : 'Organization' }}</div> <div>{{ transferee.displayName }}</div> <div> {{ transferee.organizationName }} @@ -23,7 +23,7 @@ <h3>2. Identify Transferees</h3> <div> <span *ngIf="transferee.phoneNumber">{{ transferee.phoneNumber | mask : '(000) 000-0000' }}</span> </div> - <div>{{ transferee.displayName }}</div> + <div>{{ transferee.email }}</div> </ng-container> </div> <app-no-data [showRequired]="showErrors" *ngIf="notificationSubmission.transferees.length === 0"></app-no-data> @@ -62,7 +62,11 @@ <h3>3. Primary Contact</h3> <div class="subheading2 grid-1">Email</div> <div class="grid-double"> {{ notificationSubmission.contactEmail }} - <app-no-data [showRequired]="showErrors" *ngIf="!notificationSubmission.contactEmail"></app-no-data> + <app-no-data + errorText="Required Field - Emails must match to be saved" + [showRequired]="showErrors" + *ngIf="!notificationSubmission.contactEmail" + ></app-no-data> <app-validation-error *ngIf="!(notificationSubmission.contactEmail || '' | emailValid)" >Invalid Format</app-validation-error > @@ -92,7 +96,7 @@ <h3>4. Government</h3> </div> </section> <section *ngIf="notificationSubmission"> - <h3>5. Proposal</h3> + <h3>5. Purpose of SRW</h3> <app-proposal-details [showErrors]="showErrors" [showEdit]="showEdit" @@ -104,21 +108,22 @@ <h3>5. Proposal</h3> <h3>6. Optional Attachments</h3> <div *ngIf="notificationSubmission" class="review-table"> <div class="other-attachments full-width"> - <div class="grid-1 subheading2">Type</div> - <div class="grid-2 subheading2">Description</div> - <div class="grid-3 subheading2">File Name</div> + <div class="grid-1 subheading2">File Name</div> + <div class="grid-2 subheading2">Type</div> + <div class="grid-3 subheading2">Description</div> + <ng-container *ngFor="let file of otherFiles"> <div class="grid-1"> + <a (click)="openFile(file.uuid)">{{ file.fileName }}</a> + </div> + <div class="grid-2"> {{ file.type?.label }} <app-no-data [showRequired]="showErrors" *ngIf="!file.type"></app-no-data> </div> - <div class="grid-2"> + <div class="grid-3"> {{ file.description }} <app-no-data [showRequired]="showErrors" *ngIf="!file.description"></app-no-data> </div> - <div class="grid-3"> - <a (click)="openFile(file.uuid)">{{ file.fileName }}</a> - </div> </ng-container> <div class="full-width"> <app-no-data [showRequired]="false" *ngIf="otherFiles.length === 0"></app-no-data> diff --git a/portal-frontend/src/app/features/notifications/notification-details/parcel/parcel.component.html b/portal-frontend/src/app/features/notifications/notification-details/parcel/parcel.component.html index 1c72c8af27..1b3e8922b1 100644 --- a/portal-frontend/src/app/features/notifications/notification-details/parcel/parcel.component.html +++ b/portal-frontend/src/app/features/notifications/notification-details/parcel/parcel.component.html @@ -25,7 +25,7 @@ <h4>Parcel {{ parcelInd + 1 }} Information</h4> {{ parcel.legalDescription }} <app-no-data [showRequired]="showErrors" *ngIf="!parcel.legalDescription"></app-no-data> </div> - <div class="subheading2 grid-1">Area (Hectares)</div> + <div class="subheading2 grid-1">Approx. Map Area (Hectares)</div> <div class="grid-double"> {{ parcel.mapAreaHectares }} <app-no-data [showRequired]="showErrors" *ngIf="!parcel.mapAreaHectares"></app-no-data> diff --git a/portal-frontend/src/app/features/notifications/view-submission/alc-review/submission-documents/submission-documents.component.html b/portal-frontend/src/app/features/notifications/view-submission/alc-review/submission-documents/submission-documents.component.html index e359f0710a..ff9838f439 100644 --- a/portal-frontend/src/app/features/notifications/view-submission/alc-review/submission-documents/submission-documents.component.html +++ b/portal-frontend/src/app/features/notifications/view-submission/alc-review/submission-documents/submission-documents.component.html @@ -28,7 +28,7 @@ <h4>SRW 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> diff --git a/portal-frontend/src/app/features/notifications/view-submission/alc-review/submission-documents/submission-documents.component.ts b/portal-frontend/src/app/features/notifications/view-submission/alc-review/submission-documents/submission-documents.component.ts index 2410063047..d4f6cd5c4f 100644 --- a/portal-frontend/src/app/features/notifications/view-submission/alc-review/submission-documents/submission-documents.component.ts +++ b/portal-frontend/src/app/features/notifications/view-submission/alc-review/submission-documents/submission-documents.component.ts @@ -36,6 +36,13 @@ export class SubmissionDocumentsComponent implements OnInit, OnDestroy { } } + async downloadFile(uuid: string) { + const res = await this.notificationDocumentService.downloadFile(uuid); + if (res) { + window.open(res.url, '_blank'); + } + } + ngOnDestroy(): void { this.$destroy.next(); this.$destroy.complete(); diff --git a/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.html b/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.html index 066ca7591b..f25ff5fb19 100644 --- a/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.html +++ b/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.html @@ -1,6 +1,6 @@ <div aria-hidden="true" class="banner absolute"> <div> - <h4 *ngIf="submission">SRW ID: {{ submission.fileNumber }}</h4> + <h4 *ngIf="submission">Notification ID: {{ submission.fileNumber }}</h4> </div> <div class="banner-status"> <div> @@ -8,14 +8,14 @@ <h4 *ngIf="submission">SRW ID: {{ submission.fileNumber }}</h4> <span *ngIf="submission">{{ submission.lastStatusUpdate | date }}</span> </div> <div> - <div class="subheading2">SRW Status</div> + <div class="subheading2">Notification Status</div> <span *ngIf="submission">{{ submission.status.label }}</span> </div> </div> </div> <div class="banner"> <div> - <h4 *ngIf="submission">SRW ID: {{ submission.fileNumber }}</h4> + <h4 *ngIf="submission">Notification ID: {{ submission.fileNumber }}</h4> </div> <div class="banner-status"> <div> @@ -23,7 +23,7 @@ <h4 *ngIf="submission">SRW ID: {{ submission.fileNumber }}</h4> <span *ngIf="submission">{{ submission.lastStatusUpdate | date }}</span> </div> <div> - <div class="subheading2">SRW Status</div> + <div class="subheading2">Notification Status</div> <span *ngIf="submission">{{ submission.status.label }}</span> </div> </div> @@ -82,7 +82,7 @@ <h3>Applicant Submission</h3> </div> </div> </mat-tab> - <mat-tab label="ALC Review and Decision"> + <mat-tab label="ALC Review and Response"> <div class="content"> <app-alc-review [$notificationDocuments]="$notificationDocuments" diff --git a/portal-frontend/src/app/services/notification-document/notification-document.service.ts b/portal-frontend/src/app/services/notification-document/notification-document.service.ts index 60eff39d81..a7185d54d7 100644 --- a/portal-frontend/src/app/services/notification-document/notification-document.service.ts +++ b/portal-frontend/src/app/services/notification-document/notification-document.service.ts @@ -54,6 +54,16 @@ export class NotificationDocumentService { 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(); diff --git a/portal-frontend/src/app/shared/no-data/no-data.component.html b/portal-frontend/src/app/shared/no-data/no-data.component.html index ad21442101..9df962eb1d 100644 --- a/portal-frontend/src/app/shared/no-data/no-data.component.html +++ b/portal-frontend/src/app/shared/no-data/no-data.component.html @@ -1,7 +1,7 @@ <div class="no-data"> - <div class="text">No Data</div> + <div class="text">{{ text }}</div> <div class="subtext error" *ngIf="showRequired"> <mat-icon>warning</mat-icon> - Required Field + {{ errorText }} </div> </div> diff --git a/portal-frontend/src/app/shared/no-data/no-data.component.ts b/portal-frontend/src/app/shared/no-data/no-data.component.ts index 459b1da730..9f1b2f345e 100644 --- a/portal-frontend/src/app/shared/no-data/no-data.component.ts +++ b/portal-frontend/src/app/shared/no-data/no-data.component.ts @@ -7,7 +7,8 @@ import { Component, Input } from '@angular/core'; }) export class NoDataComponent { @Input() showRequired = false; - @Input() text?: string | null; + @Input() text = 'No Data'; + @Input() errorText = 'Required Field'; constructor() {} } diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1695070454420-update_noti_description.ts b/services/apps/alcs/src/providers/typeorm/migrations/1695070454420-update_noti_description.ts new file mode 100644 index 0000000000..78b63c534c --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1695070454420-update_noti_description.ts @@ -0,0 +1,13 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class updateNotiDescription1695070454420 implements MigrationInterface { + public async up(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query(` + UPDATE "alcs"."card_type" SET "portal_html_description" = + 'Create a Notification of <a target="_blank" href="https://www.alc.gov.bc.ca/application-and-notice-process/statutory-right-of-way-notice/">Statutory Right of Way</a> if you plan to register a SRW under <a target="_blank" href="https://www.bclaws.gov.bc.ca/civix/document/id/complete/statreg/96250_00_multi#section218">s. 218 of the Land Title Act</a> in the ALR.' + WHERE "code" = 'NOTI'; + `); + } + + public async down(queryRunner: QueryRunner): Promise<void> {} +} From 7a02e7113ef842693efd98bcd57c1604e9311c8b Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Mon, 18 Sep 2023 16:16:38 -0700 Subject: [PATCH 398/954] Bug Fixes * Fix SUBD Calculations by setting size * Add Discussion Reviews to the App TImeline * Full Size the Add Transferee button --- .../subd-proposal.component.html | 2 +- .../subd-proposal/subd-proposal.component.ts | 4 ++- .../transferees/transferees.component.scss | 3 +- .../application-decision-v1.module.ts | 1 + .../application-timeline.module.ts | 2 ++ .../application-timeline.service.spec.ts | 30 +++++++++++++++++++ .../application-timeline.service.ts | 30 +++++++++++++++++-- 7 files changed, 66 insertions(+), 6 deletions(-) diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.html index a6f6417554..1e5f60cba1 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.html @@ -109,7 +109,7 @@ <h6>Documents needed for this step:</h6> required placeholder="Type size in hectares" [formControlName]="i + '-size'" - (change)="onChangeLotSize()" + (change)="onChangeLotSize(i, $event)" /> <span *ngIf="element.size" matTextSuffix>ha</span> </mat-form-field> diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.ts index 8266d7abe0..2b0330011d 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.ts @@ -168,7 +168,9 @@ export class SubdProposalComponent extends FilesStepComponent implements OnInit, this.calculateLotSize(); } - onChangeLotSize() { + onChangeLotSize(i: number, event: Event) { + const target = event.target as HTMLInputElement; + this.proposedLots[i].size = target.value; this.calculateLotSize(); } diff --git a/portal-frontend/src/app/features/notifications/edit-submission/transferees/transferees.component.scss b/portal-frontend/src/app/features/notifications/edit-submission/transferees/transferees.component.scss index b0180f9d5f..a72b0238a5 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/transferees/transferees.component.scss +++ b/portal-frontend/src/app/features/notifications/edit-submission/transferees/transferees.component.scss @@ -31,7 +31,8 @@ flex-direction: column; align-items: start; - button { + div, button { + margin-top: rem(4); width: 100%; } } diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v1/application-decision-v1.module.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v1/application-decision-v1.module.ts index 19088783fa..a45749dad1 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v1/application-decision-v1.module.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v1/application-decision-v1.module.ts @@ -75,6 +75,7 @@ import { ApplicationDecisionV1Service } from './application-decision/application exports: [ ApplicationModificationService, ApplicationDecisionV1Service, + ApplicationDecisionMeetingService, ApplicationReconsiderationService, ], }) diff --git a/services/apps/alcs/src/alcs/application/application-timeline/application-timeline.module.ts b/services/apps/alcs/src/alcs/application/application-timeline/application-timeline.module.ts index 4ed61a3a95..c81fddf79f 100644 --- a/services/apps/alcs/src/alcs/application/application-timeline/application-timeline.module.ts +++ b/services/apps/alcs/src/alcs/application/application-timeline/application-timeline.module.ts @@ -1,6 +1,7 @@ import { Module } from '@nestjs/common'; import { TypeOrmModule } from '@nestjs/typeorm'; import { ApplicationDecision } from '../../application-decision/application-decision.entity'; +import { ApplicationDecisionModule } from '../../application-decision/application-decision.module'; import { ApplicationModification } from '../../application-decision/application-modification/application-modification.entity'; import { ApplicationReconsideration } from '../../application-decision/application-reconsideration/application-reconsideration.entity'; import { ApplicationSubmissionStatusModule } from '../application-submission-status/application-submission-status.module'; @@ -19,6 +20,7 @@ import { ApplicationTimelineService } from './application-timeline.service'; ]), ApplicationModule, ApplicationSubmissionStatusModule, + ApplicationDecisionModule, ], providers: [ApplicationTimelineService], controllers: [ApplicationTimelineController], diff --git a/services/apps/alcs/src/alcs/application/application-timeline/application-timeline.service.spec.ts b/services/apps/alcs/src/alcs/application/application-timeline/application-timeline.service.spec.ts index cf7e7fec5c..dae7f9dad1 100644 --- a/services/apps/alcs/src/alcs/application/application-timeline/application-timeline.service.spec.ts +++ b/services/apps/alcs/src/alcs/application/application-timeline/application-timeline.service.spec.ts @@ -2,6 +2,8 @@ import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; +import { ApplicationDecisionMeeting } from '../../application-decision/application-decision-v1/application-decision-meeting/application-decision-meeting.entity'; +import { ApplicationDecisionMeetingService } from '../../application-decision/application-decision-v1/application-decision-meeting/application-decision-meeting.service'; import { ApplicationDecision } from '../../application-decision/application-decision.entity'; import { ApplicationModificationOutcomeType } from '../../application-decision/application-modification/application-modification-outcome-type/application-modification-outcome-type.entity'; import { ApplicationModification } from '../../application-decision/application-modification/application-modification.entity'; @@ -29,6 +31,7 @@ describe('ApplicationTimelineService', () => { let mockAppService: DeepMocked<ApplicationService>; let mockAppMeetingService: DeepMocked<ApplicationMeetingService>; let mockAppStatusService: DeepMocked<ApplicationSubmissionStatusService>; + let mockAppDecMeetingService: DeepMocked<ApplicationDecisionMeetingService>; const mockSameDate = new Date(); beforeEach(async () => { @@ -39,6 +42,7 @@ describe('ApplicationTimelineService', () => { mockAppService = createMock(); mockAppMeetingService = createMock(); mockAppStatusService = createMock(); + mockAppDecMeetingService = createMock(); const module: TestingModule = await Test.createTestingModule({ providers: [ @@ -70,6 +74,10 @@ describe('ApplicationTimelineService', () => { provide: ApplicationSubmissionStatusService, useValue: mockAppStatusService, }, + { + provide: ApplicationDecisionMeetingService, + useValue: mockAppDecMeetingService, + }, ApplicationTimelineService, ], }).compile(); @@ -86,6 +94,7 @@ describe('ApplicationTimelineService', () => { mockAppDecisionRepo.find.mockResolvedValue([]); mockAppMeetingService.getByAppFileNumber.mockResolvedValue([]); mockAppStatusService.getStatusesByFileNumber.mockResolvedValue([]); + mockAppDecMeetingService.getByAppFileNumber.mockResolvedValue([]); }); it('should be defined', () => { @@ -255,6 +264,27 @@ describe('ApplicationTimelineService', () => { expect(res[0].htmlText).toEqual('CATS #2 Report Sent to Applicant'); }); + it('should map Decision Meeting Events', async () => { + const sameDate = new Date(); + mockAppDecMeetingService.getByAppFileNumber.mockResolvedValue([ + new ApplicationDecisionMeeting({ + date: sameDate, + }), + new ApplicationDecisionMeeting({ + date: new Date(sameDate.getTime() + 5), + }), + ]); + + const res = await service.getTimelineEvents('file-number'); + + expect(res).toBeDefined(); + expect(res.length).toEqual(2); + expect(res[1].htmlText).toEqual( + 'Review Discussion #1 - <strong>Under Review by ALC</strong>', + ); + expect(res[0].htmlText).toEqual('Review Discussion #2'); + }); + it('should map Status Events', async () => { const sameDate = new Date(); mockAppStatusService.getStatusesByFileNumber.mockResolvedValue([ diff --git a/services/apps/alcs/src/alcs/application/application-timeline/application-timeline.service.ts b/services/apps/alcs/src/alcs/application/application-timeline/application-timeline.service.ts index 9e35e6f2d0..43cb1099c5 100644 --- a/services/apps/alcs/src/alcs/application/application-timeline/application-timeline.service.ts +++ b/services/apps/alcs/src/alcs/application/application-timeline/application-timeline.service.ts @@ -1,6 +1,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; +import { ApplicationDecisionMeetingService } from '../../application-decision/application-decision-v1/application-decision-meeting/application-decision-meeting.service'; import { ApplicationDecision } from '../../application-decision/application-decision.entity'; import { ApplicationModification } from '../../application-decision/application-modification/application-modification.entity'; import { ApplicationReconsideration } from '../../application-decision/application-reconsideration/application-reconsideration.entity'; @@ -56,6 +57,7 @@ export class ApplicationTimelineService { private applicationDecisionRepo: Repository<ApplicationDecision>, private applicationService: ApplicationService, private applicationMeetingService: ApplicationMeetingService, + private appDecMeetingService: ApplicationDecisionMeetingService, private applicationSubmissionStatusService: ApplicationSubmissionStatusService, ) {} @@ -326,11 +328,11 @@ export class ApplicationTimelineService { } private async addMeetingEvents( - noticeOfIntent: Application, + application: Application, events: TimelineEvent[], ) { const meetings = await this.applicationMeetingService.getByAppFileNumber( - noticeOfIntent.fileNumber, + application.fileNumber, ); meetings.sort( @@ -372,6 +374,28 @@ export class ApplicationTimelineService { typeCount.set(meeting.type.code, count + 1); }); + + const discussionMeetings = + await this.appDecMeetingService.getByAppFileNumber( + application.fileNumber, + ); + + discussionMeetings.sort((a, b) => a.date.getTime() - b.date.getTime()); + + discussionMeetings.forEach((meeting, index) => { + let htmlText = `Review Discussion #${index + 1}`; + + if (index === 0) { + htmlText += ' - <strong>Under Review by ALC</strong>'; + } + + events.push({ + htmlText, + startDate: meeting.date.getTime() + SORTING_ORDER.VISIT_REPORTS, + fulfilledDate: null, + isFulfilled: true, + }); + }); } private async addStatusEvents( @@ -388,7 +412,7 @@ export class ApplicationTimelineService { ![ SUBMISSION_STATUS.IN_REVIEW_BY_ALC, SUBMISSION_STATUS.ALC_DECISION, - ].includes(<SUBMISSION_STATUS.IN_REVIEW_BY_ALC>status.statusType.code), + ].includes(<SUBMISSION_STATUS>status.statusType.code), ); for (const status of statusesToInclude) { if (status.effectiveDate) { From d136f1741d2d5bb3538dbfdd8672ed70182970b7 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Mon, 18 Sep 2023 16:20:38 -0700 Subject: [PATCH 399/954] Code Review Feedback --- .../alcs/local-government/local-government.service.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/services/apps/alcs/src/alcs/local-government/local-government.service.ts b/services/apps/alcs/src/alcs/local-government/local-government.service.ts index 42bac17934..154e6d2378 100644 --- a/services/apps/alcs/src/alcs/local-government/local-government.service.ts +++ b/services/apps/alcs/src/alcs/local-government/local-government.service.ts @@ -18,7 +18,7 @@ export class LocalGovernmentService { ) {} async list() { - return this.repository.find({ + return await this.repository.find({ order: { name: 'ASC', }, @@ -29,7 +29,7 @@ export class LocalGovernmentService { } async listActive() { - return this.repository.find({ + return await this.repository.find({ where: { isActive: true, }, @@ -43,7 +43,7 @@ export class LocalGovernmentService { } async getByName(name: string) { - return this.repository.findOne({ + return await this.repository.findOne({ where: { name, }, @@ -51,7 +51,7 @@ export class LocalGovernmentService { } async getByUuid(uuid: string) { - return this.repository.findOneOrFail({ + return await this.repository.findOneOrFail({ where: { uuid, }, @@ -114,7 +114,7 @@ export class LocalGovernmentService { } async getByGuid(bceidBusinessGuid: string) { - return this.repository.findOne({ + return await this.repository.findOne({ where: { bceidBusinessGuid, }, From 565361d9e6a1425cfe4ee01afa16e099d01c917d Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Mon, 18 Sep 2023 16:33:48 -0700 Subject: [PATCH 400/954] Feature/alcs 1132 etl and search bonus (#980) set email_sent_dates submission to statuses table for all etl imported submissions remove length limitation for file number on advanced search --- .../applications/app_prep.py | 11 +++-- .../__init__.py | 1 + .../submission_status_email.py | 40 +++++++++++++++++++ bin/migrate-oats-data/common/__init__.py | 1 + bin/migrate-oats-data/common/constants.py | 1 + bin/migrate-oats-data/migrate.py | 25 +++++++++++- .../noi_submission_status_email/__init__.py | 1 + .../submission_status_email.py | 40 +++++++++++++++++++ .../apps/alcs/src/alcs/search/search.dto.ts | 1 - 9 files changed, 114 insertions(+), 7 deletions(-) create mode 100644 bin/migrate-oats-data/applications/application_submission_status_email/__init__.py create mode 100644 bin/migrate-oats-data/applications/application_submission_status_email/submission_status_email.py create mode 100644 bin/migrate-oats-data/common/constants.py create mode 100644 bin/migrate-oats-data/noi/noi_submission_status_email/__init__.py create mode 100644 bin/migrate-oats-data/noi/noi_submission_status_email/submission_status_email.py diff --git a/bin/migrate-oats-data/applications/app_prep.py b/bin/migrate-oats-data/applications/app_prep.py index 73840819f4..01d346eef9 100644 --- a/bin/migrate-oats-data/applications/app_prep.py +++ b/bin/migrate-oats-data/applications/app_prep.py @@ -1,9 +1,6 @@ from common import ( ALRChangeCode, AlcsNfuTypeCode, - AlcsNfuSubTypeCode, - OatsCapabilitySourceCode, - OatsAgriCapabilityCodes, OATS_NFU_SUBTYPES, AlcsAgCap, AlcsAgCapSource, @@ -47,12 +44,14 @@ class OatsToAlcsAgCap(Enum): S = AlcsAgCap.Secondary.value U = AlcsAgCap.Unclassified.value + class OatsLegislationCodes(Enum): SEC_30_1 = AlcsApplicantType.Land_owner.value SEC_29_1 = AlcsApplicantType.LFNG.value SEC_17_3 = AlcsApplicantType.Land_owner.value SEC_17_1 = AlcsApplicantType.LFNG.value + @inject_conn_pool def process_alcs_application_prep_fields(conn=None, batch_size=BATCH_UPLOAD_SIZE): """ @@ -242,8 +241,8 @@ def mapOatsToAlcsAppPrep(data): return data -def mapOatsToAlcsLegislationCode(data): +def mapOatsToAlcsLegislationCode(data): if data["legislation_code"]: data["legislation_code"] = str( OatsLegislationCodes[data["legislation_code"]].value @@ -251,6 +250,7 @@ def mapOatsToAlcsLegislationCode(data): return data + def get_update_query(unique_fields): # unique_fields takes input from called function and appends to query query = """ @@ -271,6 +271,7 @@ def get_update_query(unique_fields): """ return query.format(unique_fields=unique_fields) + def get_update_query_for_nfu(): unique_fields = """, nfu_use_type = %(nonfarm_use_type_code)s, @@ -278,6 +279,7 @@ def get_update_query_for_nfu(): proposal_end_date = %(nonfarm_use_end_date)s""" return get_update_query(unique_fields) + def get_update_query_for_nar(): # naruSubtype is a part of submission, import there unique_fields = """, @@ -305,6 +307,7 @@ def get_update_query_for_other(): unique_fields = """""" return get_update_query(unique_fields) + def map_oats_to_alcs_nfu_subtypes(nfu_type_code, nfu_subtype_code): for dict_obj in OATS_NFU_SUBTYPES: if str(dict_obj["type_key"]) == str(nfu_type_code) and str( diff --git a/bin/migrate-oats-data/applications/application_submission_status_email/__init__.py b/bin/migrate-oats-data/applications/application_submission_status_email/__init__.py new file mode 100644 index 0000000000..5d23579b3f --- /dev/null +++ b/bin/migrate-oats-data/applications/application_submission_status_email/__init__.py @@ -0,0 +1 @@ +from .submission_status_email import * diff --git a/bin/migrate-oats-data/applications/application_submission_status_email/submission_status_email.py b/bin/migrate-oats-data/applications/application_submission_status_email/submission_status_email.py new file mode 100644 index 0000000000..6955d24626 --- /dev/null +++ b/bin/migrate-oats-data/applications/application_submission_status_email/submission_status_email.py @@ -0,0 +1,40 @@ +from db import inject_conn_pool +import traceback +from common import OATS_ETL_USER + + +@inject_conn_pool +def process_application_submission_status_emails(conn=None): + update_query = f""" + UPDATE alcs.application_submission_to_submission_status status + SET email_sent_date = '0001-01-01 07:00:00.000 -0700' + FROM alcs.application_submission app_sub + WHERE status.submission_uuid = app_sub.uuid + AND app_sub.audit_created_by = '{OATS_ETL_USER}' + """ + + try: + with conn.cursor() as cursor: + cursor.execute(update_query) + except Exception as error: + print("".join(traceback.format_exception(None, error, error.__traceback__))) + cursor.close() + conn.close() + + +@inject_conn_pool +def clean_notice_of_intent_submission_status_emails(conn=None): + update_query = f""" + UPDATE alcs.application_submission_to_submission_status status + SET email_sent_date = NULL + FROM alcs.application_submission app_sub + WHERE status.submission_uuid = app_sub.uuid + AND app_sub.audit_created_by = '{OATS_ETL_USER}' + """ + try: + with conn.cursor() as cursor: + cursor.execute(update_query) + except Exception as error: + print("".join(traceback.format_exception(None, error, error.__traceback__))) + cursor.close() + conn.close() diff --git a/bin/migrate-oats-data/common/__init__.py b/bin/migrate-oats-data/common/__init__.py index 26c07e6d74..1ef347bddc 100644 --- a/bin/migrate-oats-data/common/__init__.py +++ b/bin/migrate-oats-data/common/__init__.py @@ -1,3 +1,4 @@ from .oats_application_code_values import * from .alcs_application_enum import * from .etl_logger import log_start, log_end +from .constants import * diff --git a/bin/migrate-oats-data/common/constants.py b/bin/migrate-oats-data/common/constants.py new file mode 100644 index 0000000000..46497ef9c6 --- /dev/null +++ b/bin/migrate-oats-data/common/constants.py @@ -0,0 +1 @@ +OATS_ETL_USER = "oats_etl" diff --git a/bin/migrate-oats-data/migrate.py b/bin/migrate-oats-data/migrate.py index 01501d78ad..12407d9042 100644 --- a/bin/migrate-oats-data/migrate.py +++ b/bin/migrate-oats-data/migrate.py @@ -20,12 +20,21 @@ process_nois, clean_nois, ) -from submissions import( +from submissions import ( process_alcs_app_submissions, clean_application_submission, ) from constants import BATCH_UPLOAD_SIZE +from applications.application_submission_status_email import ( + process_application_submission_status_emails, + clean_notice_of_intent_submission_status_emails, +) +from noi.noi_submission_status_email import ( + process_notice_of_intent_submission_status_emails, + clean_application_submission_status_emails, +) + import_batch_size = BATCH_UPLOAD_SIZE # TODO tidy import menu setup @@ -60,6 +69,7 @@ def document_import_command_parser(import_batch_size, subparsers): ) document_import_command.set_defaults(func=process_documents) + def document_noi_import_command_parser(import_batch_size, subparsers): document_noi_import_command = subparsers.add_parser( "document-noi-import", @@ -89,6 +99,7 @@ def application_document_import_command_parser(import_batch_size, subparsers): ) application_document_import_command.set_defaults(func=import_batch_size) + def noi_document_import_command_parser(import_batch_size, subparsers): noi_document_import_command = subparsers.add_parser( "noi-document-import", @@ -118,6 +129,7 @@ def app_prep_import_command_parser(import_batch_size, subparsers): ) app_prep_import_command.set_defaults(func=import_batch_size) + def noi_import_command_parser(import_batch_size, subparsers): noi_import_command = subparsers.add_parser( "noi-import", @@ -132,6 +144,7 @@ def noi_import_command_parser(import_batch_size, subparsers): ) noi_import_command.set_defaults(func=import_batch_size) + def import_command_parser(subparsers): import_command = subparsers.add_parser( "import", @@ -146,6 +159,7 @@ def import_command_parser(subparsers): ) import_command.set_defaults(func=import_batch_size) + def app_sub_import_command_parser(import_batch_size, subparsers): app_sub_import_command = subparsers.add_parser( "app-sub-import", @@ -218,7 +232,7 @@ def setup_menu_args_parser(import_batch_size): process_documents(batch_size=import_batch_size) console.log("Processing NOI specific documents:") - process_documents_noi(batch_size=import_batch_size) + process_documents_noi(batch_size=import_batch_size) console.log("Processing application documents:") process_application_documents(batch_size=import_batch_size) @@ -232,6 +246,11 @@ def setup_menu_args_parser(import_batch_size): console.log("Processing application submission:") process_alcs_app_submissions(batch_size=import_batch_size) + # NOTE: both process_application_submission_status_emails(), process_notice_of_intent_submission_status_emails() + # must be the last ones in the migrate etl + console.log("Processing submission status emails") + process_application_submission_status_emails() + process_notice_of_intent_submission_status_emails() console.log("Done") case "clean": with console.status("[bold green]Cleaning previous ETL...") as status: @@ -244,6 +263,8 @@ def setup_menu_args_parser(import_batch_size): clean_application_submission() clean_applications() clean_nois() + clean_notice_of_intent_submission_status_emails(), + clean_notice_of_intent_submission_status_emails(), console.log("Done") case "document-import": diff --git a/bin/migrate-oats-data/noi/noi_submission_status_email/__init__.py b/bin/migrate-oats-data/noi/noi_submission_status_email/__init__.py new file mode 100644 index 0000000000..5d23579b3f --- /dev/null +++ b/bin/migrate-oats-data/noi/noi_submission_status_email/__init__.py @@ -0,0 +1 @@ +from .submission_status_email import * diff --git a/bin/migrate-oats-data/noi/noi_submission_status_email/submission_status_email.py b/bin/migrate-oats-data/noi/noi_submission_status_email/submission_status_email.py new file mode 100644 index 0000000000..748f078943 --- /dev/null +++ b/bin/migrate-oats-data/noi/noi_submission_status_email/submission_status_email.py @@ -0,0 +1,40 @@ +from db import inject_conn_pool +import traceback +from common import OATS_ETL_USER + + +@inject_conn_pool +def process_notice_of_intent_submission_status_emails(conn=None): + update_query = f""" + UPDATE alcs.notice_of_intent_submission_to_submission_status status + SET email_sent_date = '0001-01-01 07:00:00.000 -0700' + FROM alcs.notice_of_intent_submission noi_sub + WHERE status.submission_uuid = noi_sub.uuid + AND noi_sub.audit_created_by = '{OATS_ETL_USER}' + """ + + try: + with conn.cursor() as cursor: + cursor.execute(update_query) + except Exception as error: + print("".join(traceback.format_exception(None, error, error.__traceback__))) + cursor.close() + conn.close() + + +@inject_conn_pool +def clean_application_submission_status_emails(conn=None): + update_query = f""" + UPDATE alcs.notice_of_intent_submission_to_submission_status status + SET email_sent_date = NULL + FROM alcs.notice_of_intent_submission noi_sub + WHERE status.submission_uuid = noi_sub.uuid + AND noi_sub.audit_created_by = '{OATS_ETL_USER}' + """ + try: + with conn.cursor() as cursor: + cursor.execute(update_query) + except Exception as error: + print("".join(traceback.format_exception(None, error, error.__traceback__))) + cursor.close() + conn.close() diff --git a/services/apps/alcs/src/alcs/search/search.dto.ts b/services/apps/alcs/src/alcs/search/search.dto.ts index ff084814b4..b617813718 100644 --- a/services/apps/alcs/src/alcs/search/search.dto.ts +++ b/services/apps/alcs/src/alcs/search/search.dto.ts @@ -85,7 +85,6 @@ export class PagingRequestDto { export class SearchRequestDto extends PagingRequestDto { @IsString() @IsOptional() - @MinLength(3) fileNumber?: string; @IsString() From 0eec9bb9bede31eb511104f03bcc4dab29d62f1e Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Mon, 18 Sep 2023 16:37:18 -0700 Subject: [PATCH 401/954] Add italics to email --- services/templates/emails/notifications/srw-notice.template.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/templates/emails/notifications/srw-notice.template.ts b/services/templates/emails/notifications/srw-notice.template.ts index faa57524b0..7b6790611f 100644 --- a/services/templates/emails/notifications/srw-notice.template.ts +++ b/services/templates/emails/notifications/srw-notice.template.ts @@ -50,7 +50,7 @@ const template = `<mjml> <mj-section background-color='white' padding='24px 0px 48px 0px'> <mj-column width='600px' css-class='line-height'> <mj-text font-size='16px'> - The ALC's attached PDF response is proof that the notification of statutory right of way has been provided for a s. 218 Statutory Right of Way of the Land Title Act as required by s.18.1(2) of the Agricultural Land Commission Act. + The ALC's attached PDF response is proof that the notification of statutory right of way has been provided for a s. 218 Statutory Right of Way of the <i>Land Title Act</i> as required by s.18.1(2) of the <i>Agricultural Land Commission Act</i>. </mj-text> <mj-text font-size='16px'> The ALC's attached PDF response must be appended as an additional document to the LTSA SRW application package. From e8a8f8068eba5e0307209264ad5f9cfb7a807266 Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Tue, 19 Sep 2023 11:38:39 -0700 Subject: [PATCH 402/954] migrate from bull to BullMQ (#984) migrate from bull -> BullMQ update all local jobs to support BullMQ update Redis configuration to work with new BullMQ --- .../alcs/src/queues/bullConfig.service.ts | 20 +- .../application-expiry.consumer.spec.ts | 4 +- .../application-expiry.consumer.ts | 16 +- .../status-emails.consumer.spec.ts | 6 +- .../status-emails/status-emails.consumer.ts | 18 +- .../cleanUpNotifications.consumer.spec.ts | 2 +- .../cleanUpNotifications.consumer.ts | 16 +- .../status-emails.consumer.spec.ts | 4 +- .../status-emails.consumer.ts | 18 +- .../src/queues/scheduler/scheduler.module.ts | 2 +- .../scheduler/scheduler.service.spec.ts | 30 +- .../src/queues/scheduler/scheduler.service.ts | 34 +- services/config/default.json | 4 +- services/config/test.json | 5 + .../libs/common/src/redis/redis.service.ts | 9 +- services/package-lock.json | 404 +++++++----------- services/package.json | 4 +- 17 files changed, 284 insertions(+), 312 deletions(-) diff --git a/services/apps/alcs/src/queues/bullConfig.service.ts b/services/apps/alcs/src/queues/bullConfig.service.ts index a729709bce..2a9f8ee66e 100644 --- a/services/apps/alcs/src/queues/bullConfig.service.ts +++ b/services/apps/alcs/src/queues/bullConfig.service.ts @@ -1,18 +1,22 @@ -import { CONFIG_TOKEN } from '@app/common/config/config.module'; -import { - BullModuleOptions, - SharedBullConfigurationFactory, -} from '@nestjs/bull'; +import { SharedBullConfigurationFactory } from '@nestjs/bullmq'; import { Inject, Injectable } from '@nestjs/common'; -import { IConfig } from 'config'; +import { QueueOptions } from 'bullmq'; +import { + CONFIG_TOKEN, + IConfig, +} from '../../../../libs/common/src/config/config.module'; @Injectable() export class BullConfigService implements SharedBullConfigurationFactory { constructor(@Inject(CONFIG_TOKEN) private config: IConfig) {} - createSharedConfiguration(): BullModuleOptions { + createSharedConfiguration(): QueueOptions { return { - url: this.config.get<string>('REDIS.URL'), + connection: { + host: this.config.get<string>('REDIS.HOST'), + port: this.config.get<number>('REDIS.PORT'), + password: this.config.get<string>('REDIS.PASSWORD'), + }, }; } } diff --git a/services/apps/alcs/src/queues/scheduler/application/application-expiry/application-expiry.consumer.spec.ts b/services/apps/alcs/src/queues/scheduler/application/application-expiry/application-expiry.consumer.spec.ts index 5c91339a98..2561f4bdaf 100644 --- a/services/apps/alcs/src/queues/scheduler/application/application-expiry/application-expiry.consumer.spec.ts +++ b/services/apps/alcs/src/queues/scheduler/application/application-expiry/application-expiry.consumer.spec.ts @@ -57,7 +57,7 @@ describe('SchedulerConsumerService', () => { subject: 'Applications near expiry', }; - await applicationExpiryConsumer.applicationExpiry(); + await applicationExpiryConsumer.process(); expect(mockApplicationService.getAllNearExpiryDates).toBeCalledTimes(1); expect(mockEmailService.sendEmail).toBeCalledTimes(1); @@ -69,7 +69,7 @@ describe('SchedulerConsumerService', () => { it('should not send email if no application near expiry', async () => { mockApplicationService.getAllNearExpiryDates.mockResolvedValue([]); - await applicationExpiryConsumer.applicationExpiry(); + await applicationExpiryConsumer.process(); expect(mockApplicationService.getAllNearExpiryDates).toBeCalledTimes(1); expect(mockEmailService.sendEmail).toBeCalledTimes(0); diff --git a/services/apps/alcs/src/queues/scheduler/application/application-expiry/application-expiry.consumer.ts b/services/apps/alcs/src/queues/scheduler/application/application-expiry/application-expiry.consumer.ts index 9e90de5bb5..5b85729026 100644 --- a/services/apps/alcs/src/queues/scheduler/application/application-expiry/application-expiry.consumer.ts +++ b/services/apps/alcs/src/queues/scheduler/application/application-expiry/application-expiry.consumer.ts @@ -1,5 +1,5 @@ import { CONFIG_TOKEN, IConfig } from '@app/common/config/config.module'; -import { Process, Processor } from '@nestjs/bull'; +import { OnWorkerEvent, Processor, WorkerHost } from '@nestjs/bullmq'; import { Inject, Logger } from '@nestjs/common'; import * as dayjs from 'dayjs'; import { @@ -10,17 +10,18 @@ import { EmailService } from '../../../../providers/email/email.service'; import { QUEUES } from '../../scheduler.service'; @Processor(QUEUES.APP_EXPIRY) -export class ApplicationExpiryConsumer { +export class ApplicationExpiryConsumer extends WorkerHost { private logger = new Logger(ApplicationExpiryConsumer.name); constructor( private applicationService: ApplicationService, private emailService: EmailService, @Inject(CONFIG_TOKEN) private config: IConfig, - ) {} + ) { + super(); + } - @Process() - async applicationExpiry() { + async process() { try { this.logger.debug('starting applicationExpiry'); @@ -50,6 +51,11 @@ export class ApplicationExpiryConsumer { } } + @OnWorkerEvent('completed') + onCompleted() { + this.logger.debug('Completed applicationExpiry job.'); + } + private getApplicationsNearExpiryDates() { const startDate = dayjs().add(-90, 'day'); const endDate = dayjs().add( diff --git a/services/apps/alcs/src/queues/scheduler/application/status-emails/status-emails.consumer.spec.ts b/services/apps/alcs/src/queues/scheduler/application/status-emails/status-emails.consumer.spec.ts index 962fe80a5a..7d74caf467 100644 --- a/services/apps/alcs/src/queues/scheduler/application/status-emails/status-emails.consumer.spec.ts +++ b/services/apps/alcs/src/queues/scheduler/application/status-emails/status-emails.consumer.spec.ts @@ -68,7 +68,7 @@ describe('ApplicationSubmissionStatusEmailConsumer', () => { }); mockStatusEmailService.sendApplicationStatusEmail.mockResolvedValue(); - await consumer.processSubmissionStatusesAndSendEmails(); + await consumer.process(); expect( mockApplicationSubmissionStatusService.getSubmissionToSubmissionStatusForSendingEmails, @@ -119,7 +119,7 @@ describe('ApplicationSubmissionStatusEmailConsumer', () => { }); mockStatusEmailService.sendApplicationStatusEmail.mockResolvedValue(); - await consumer.processSubmissionStatusesAndSendEmails(); + await consumer.process(); expect( mockApplicationSubmissionStatusService.getSubmissionToSubmissionStatusForSendingEmails, @@ -169,7 +169,7 @@ describe('ApplicationSubmissionStatusEmailConsumer', () => { }); mockStatusEmailService.sendApplicationStatusEmail.mockResolvedValue(); - await consumer.processSubmissionStatusesAndSendEmails(); + await consumer.process(); expect( mockApplicationSubmissionStatusService.getSubmissionToSubmissionStatusForSendingEmails, diff --git a/services/apps/alcs/src/queues/scheduler/application/status-emails/status-emails.consumer.ts b/services/apps/alcs/src/queues/scheduler/application/status-emails/status-emails.consumer.ts index 400069811b..0a7d8df797 100644 --- a/services/apps/alcs/src/queues/scheduler/application/status-emails/status-emails.consumer.ts +++ b/services/apps/alcs/src/queues/scheduler/application/status-emails/status-emails.consumer.ts @@ -1,4 +1,4 @@ -import { Process, Processor } from '@nestjs/bull'; +import { OnWorkerEvent, Processor, WorkerHost } from '@nestjs/bullmq'; import { Logger } from '@nestjs/common'; import * as dayjs from 'dayjs'; import * as timezone from 'dayjs/plugin/timezone'; @@ -19,16 +19,17 @@ dayjs.extend(utc); dayjs.extend(timezone); @Processor(QUEUES.APPLICATION_STATUS_EMAILS) -export class ApplicationSubmissionStatusEmailConsumer { +export class ApplicationSubmissionStatusEmailConsumer extends WorkerHost { private logger = new Logger(ApplicationSubmissionStatusEmailConsumer.name); constructor( private submissionStatusService: ApplicationSubmissionStatusService, private statusEmailService: StatusEmailService, - ) {} + ) { + super(); + } - @Process() - async processSubmissionStatusesAndSendEmails() { + async process() { try { this.logger.debug( 'Starting application submission status email consumer.', @@ -71,6 +72,13 @@ export class ApplicationSubmissionStatusEmailConsumer { } } + @OnWorkerEvent('completed') + onCompleted() { + this.logger.debug( + 'Completed ApplicationSubmissionStatusEmailConsumer job.', + ); + } + private async sendEmailAndUpdateStatus( applicationSubmission: ApplicationSubmission, submissionGovernment: LocalGovernment | null, diff --git a/services/apps/alcs/src/queues/scheduler/cleanUpNotifications.consumer.spec.ts b/services/apps/alcs/src/queues/scheduler/cleanUpNotifications.consumer.spec.ts index 1ff6aeb03b..206aea8c70 100644 --- a/services/apps/alcs/src/queues/scheduler/cleanUpNotifications.consumer.spec.ts +++ b/services/apps/alcs/src/queues/scheduler/cleanUpNotifications.consumer.spec.ts @@ -37,7 +37,7 @@ describe('SchedulerConsumerService', () => { affected: 1, } as DeleteResult); - await notificationCleanUpConsumer.cleanUpNotifications(); + await notificationCleanUpConsumer.process(); expect(mockNotificationService.cleanUp).toHaveBeenCalledTimes(2); diff --git a/services/apps/alcs/src/queues/scheduler/cleanUpNotifications.consumer.ts b/services/apps/alcs/src/queues/scheduler/cleanUpNotifications.consumer.ts index 0078c2234b..f16954cafc 100644 --- a/services/apps/alcs/src/queues/scheduler/cleanUpNotifications.consumer.ts +++ b/services/apps/alcs/src/queues/scheduler/cleanUpNotifications.consumer.ts @@ -1,4 +1,4 @@ -import { Process, Processor } from '@nestjs/bull'; +import { OnWorkerEvent, Processor, WorkerHost } from '@nestjs/bullmq'; import { Logger } from '@nestjs/common'; import * as dayjs from 'dayjs'; import { MessageService } from '../../alcs/message/message.service'; @@ -8,13 +8,14 @@ const DAYS_TO_RETAIN_READ = 30; const DAYS_TO_RETAIN_UNREAD = 365; @Processor(QUEUES.CLEANUP_NOTIFICATIONS) -export class CleanUpNotificationsConsumer { +export class CleanUpNotificationsConsumer extends WorkerHost { private logger = new Logger(CleanUpNotificationsConsumer.name); - constructor(private notificationService: MessageService) {} + constructor(private notificationService: MessageService) { + super(); + } - @Process() - async cleanUpNotifications() { + async process() { try { this.logger.debug('starting notification cleanup'); @@ -43,4 +44,9 @@ export class CleanUpNotificationsConsumer { } return; } + + @OnWorkerEvent('completed') + onCompleted() { + this.logger.debug('Completed CleanUpNotificationsConsumer job.'); + } } diff --git a/services/apps/alcs/src/queues/scheduler/notice-of-intent/status-emails.consumer.spec.ts b/services/apps/alcs/src/queues/scheduler/notice-of-intent/status-emails.consumer.spec.ts index 76a1c14940..53499d2771 100644 --- a/services/apps/alcs/src/queues/scheduler/notice-of-intent/status-emails.consumer.spec.ts +++ b/services/apps/alcs/src/queues/scheduler/notice-of-intent/status-emails.consumer.spec.ts @@ -66,7 +66,7 @@ describe('NoticeOfIntentSubmissionStatusEmailConsumer', () => { }); mockStatusEmailService.sendNoticeOfIntentStatusEmail.mockResolvedValue(); - await consumer.processSubmissionStatusesAndSendEmails(); + await consumer.process(); expect( mockNoticeOfIntentSubmissionStatusService.getSubmissionToSubmissionStatusForSendingEmails, @@ -119,7 +119,7 @@ describe('NoticeOfIntentSubmissionStatusEmailConsumer', () => { }); mockStatusEmailService.sendNoticeOfIntentStatusEmail.mockResolvedValue(); - await consumer.processSubmissionStatusesAndSendEmails(); + await consumer.process(); expect( mockNoticeOfIntentSubmissionStatusService.getSubmissionToSubmissionStatusForSendingEmails, diff --git a/services/apps/alcs/src/queues/scheduler/notice-of-intent/status-emails.consumer.ts b/services/apps/alcs/src/queues/scheduler/notice-of-intent/status-emails.consumer.ts index 20e198d3bf..e2842a2be1 100644 --- a/services/apps/alcs/src/queues/scheduler/notice-of-intent/status-emails.consumer.ts +++ b/services/apps/alcs/src/queues/scheduler/notice-of-intent/status-emails.consumer.ts @@ -1,4 +1,4 @@ -import { Process, Processor } from '@nestjs/bull'; +import { OnWorkerEvent, Processor, WorkerHost } from '@nestjs/bullmq'; import { Logger } from '@nestjs/common'; import * as dayjs from 'dayjs'; import * as timezone from 'dayjs/plugin/timezone'; @@ -15,16 +15,17 @@ dayjs.extend(utc); dayjs.extend(timezone); @Processor(QUEUES.NOTICE_OF_INTENTS_STATUS_EMAILS) -export class NoticeOfIntentSubmissionStatusEmailConsumer { +export class NoticeOfIntentSubmissionStatusEmailConsumer extends WorkerHost { private logger = new Logger(NoticeOfIntentSubmissionStatusEmailConsumer.name); constructor( private submissionStatusService: NoticeOfIntentSubmissionStatusService, private statusEmailService: StatusEmailService, - ) {} + ) { + super(); + } - @Process() - async processSubmissionStatusesAndSendEmails() { + async process() { try { const tomorrow = dayjs(new Date()) .tz('Canada/Pacific') @@ -69,6 +70,13 @@ export class NoticeOfIntentSubmissionStatusEmailConsumer { } } + @OnWorkerEvent('completed') + onCompleted() { + this.logger.debug( + 'Completed NoticeOfIntentSubmissionStatusEmailConsumer job.', + ); + } + private async updateSubmissionStatus( submissionStatus: NoticeOfIntentSubmissionToSubmissionStatus, today: Date, diff --git a/services/apps/alcs/src/queues/scheduler/scheduler.module.ts b/services/apps/alcs/src/queues/scheduler/scheduler.module.ts index 4f113b6778..4cd660e0bd 100644 --- a/services/apps/alcs/src/queues/scheduler/scheduler.module.ts +++ b/services/apps/alcs/src/queues/scheduler/scheduler.module.ts @@ -1,4 +1,4 @@ -import { BullModule } from '@nestjs/bull'; +import { BullModule } from '@nestjs/bullmq'; import { Module, OnApplicationBootstrap } from '@nestjs/common'; import { ApplicationSubmissionStatusModule } from '../../alcs/application/application-submission-status/application-submission-status.module'; import { ApplicationModule } from '../../alcs/application/application.module'; diff --git a/services/apps/alcs/src/queues/scheduler/scheduler.service.spec.ts b/services/apps/alcs/src/queues/scheduler/scheduler.service.spec.ts index c2ea9de4d8..2d6edada8c 100644 --- a/services/apps/alcs/src/queues/scheduler/scheduler.service.spec.ts +++ b/services/apps/alcs/src/queues/scheduler/scheduler.service.spec.ts @@ -1,5 +1,5 @@ import { ConfigModule } from '@app/common/config/config.module'; -import { BullModule, getQueueToken } from '@nestjs/bull'; +import { BullModule, getQueueToken } from '@nestjs/bullmq'; import { Test, TestingModule } from '@nestjs/testing'; import { BullConfigService } from '../bullConfig.service'; import { @@ -20,25 +20,25 @@ describe('SchedulerService', () => { mockAppExpiryQueue = { add: jest.fn(), process: jest.fn(), - empty: jest.fn(), + drain: jest.fn(), }; mockNotificationCleanUpQueue = { add: jest.fn(), process: jest.fn(), - empty: jest.fn(), + drain: jest.fn(), }; mockApplicationStatusEmailsQueue = { add: jest.fn(), process: jest.fn(), - empty: jest.fn(), + drain: jest.fn(), }; mockNoticeOfIntentStatusEmailsQueue = { add: jest.fn(), process: jest.fn(), - empty: jest.fn(), + drain: jest.fn(), }; const module: TestingModule = await Test.createTestingModule({ @@ -80,41 +80,45 @@ describe('SchedulerService', () => { //Job Disabled for now // it('should call add for scheduleApplicationExpiry', async () => { // await schedulerService.setup(); - // expect(mockAppExpiryQueue.empty).toBeCalledTimes(1); + // expect(mockAppExpiryQueue.drain).toBeCalledTimes(1); // expect(mockAppExpiryQueue.add).toBeCalledTimes(1); // expect(mockAppExpiryQueue.add).toBeCalledWith( + // 'applicationExpiry' // {}, - // { repeat: { cron: MONDAY_TO_FRIDAY_AT_2AM } }, + // { repeat: { pattern: MONDAY_TO_FRIDAY_AT_2AM } }, // ); // }); it('should call add for notification cleanup', async () => { await schedulerService.setup(); - expect(mockNotificationCleanUpQueue.empty).toBeCalledTimes(1); + expect(mockNotificationCleanUpQueue.drain).toBeCalledTimes(1); expect(mockNotificationCleanUpQueue.add).toBeCalledTimes(1); expect(mockNotificationCleanUpQueue.add).toBeCalledWith( + 'cleanupNotifications', {}, - { repeat: { cron: EVERYDAY_MIDNIGHT } }, + { repeat: { pattern: EVERYDAY_MIDNIGHT } }, ); }); it('should call add for application status email', async () => { await schedulerService.setup(); - expect(mockApplicationStatusEmailsQueue.empty).toBeCalledTimes(1); + expect(mockApplicationStatusEmailsQueue.drain).toBeCalledTimes(1); expect(mockApplicationStatusEmailsQueue.add).toBeCalledTimes(1); expect(mockApplicationStatusEmailsQueue.add).toBeCalledWith( + 'applicationSubmissionStatusEmails', {}, - { repeat: { cron: EVERY_15_MINUTES_STARTING_FROM_8AM } }, + { repeat: { pattern: EVERY_15_MINUTES_STARTING_FROM_8AM } }, ); }); it('should call add for notice of intent status email', async () => { await schedulerService.setup(); - expect(mockNoticeOfIntentStatusEmailsQueue.empty).toBeCalledTimes(1); + expect(mockNoticeOfIntentStatusEmailsQueue.drain).toBeCalledTimes(1); expect(mockNoticeOfIntentStatusEmailsQueue.add).toBeCalledTimes(1); expect(mockNoticeOfIntentStatusEmailsQueue.add).toBeCalledWith( + 'noticeOfIntentSubmissionStatusEmails', {}, - { repeat: { cron: EVERY_15_MINUTES_STARTING_FROM_8AM } }, + { repeat: { pattern: EVERY_15_MINUTES_STARTING_FROM_8AM } }, ); }); }); diff --git a/services/apps/alcs/src/queues/scheduler/scheduler.service.ts b/services/apps/alcs/src/queues/scheduler/scheduler.service.ts index 1fef60a1d7..856cdc258f 100644 --- a/services/apps/alcs/src/queues/scheduler/scheduler.service.ts +++ b/services/apps/alcs/src/queues/scheduler/scheduler.service.ts @@ -1,10 +1,10 @@ -import { InjectQueue } from '@nestjs/bull'; +import { InjectQueue } from '@nestjs/bullmq'; import { Injectable } from '@nestjs/common'; -import { Queue } from 'bull'; +import { Queue } from 'bullmq'; export const MONDAY_TO_FRIDAY_AT_2AM = '0 0 2 * * 1-5'; export const EVERYDAY_MIDNIGHT = '0 0 0 * * *'; -export const EVERY_15_MINUTES_STARTING_FROM_8AM = '0/15 8-23 * * *'; +export const EVERY_15_MINUTES_STARTING_FROM_8AM = '0/1 8-23 * * *'; export const QUEUES = { APP_EXPIRY: 'ApplicationExpiry', @@ -27,7 +27,7 @@ export class SchedulerService { async setup() { //Job Disabled, clean queue but don't schedule it - await this.applicationExpiryQueue.empty(); + await this.applicationExpiryQueue.drain(); // await this.scheduleApplicationExpiry(); await this.scheduleCleanupNotifications(); @@ -36,32 +36,42 @@ export class SchedulerService { } private async scheduleApplicationExpiry() { - await this.applicationExpiryQueue.empty(); + await this.applicationExpiryQueue.drain(); await this.applicationExpiryQueue.add( + 'applicationExpiry', {}, - { repeat: { cron: MONDAY_TO_FRIDAY_AT_2AM } }, + { + repeat: { pattern: MONDAY_TO_FRIDAY_AT_2AM }, + }, ); } private async scheduleCleanupNotifications() { - await this.cleanupNotificationsQueue.empty(); + await this.cleanupNotificationsQueue.drain(); await this.cleanupNotificationsQueue.add( + 'cleanupNotifications', {}, - { repeat: { cron: EVERYDAY_MIDNIGHT } }, + { + repeat: { pattern: EVERYDAY_MIDNIGHT }, + }, ); } private async scheduleSubmissionEmails() { - await this.applicationSubmissionStatusEmails.empty(); + await this.applicationSubmissionStatusEmails.drain(); await this.applicationSubmissionStatusEmails.add( + 'applicationSubmissionStatusEmails', {}, - { repeat: { cron: EVERY_15_MINUTES_STARTING_FROM_8AM } }, + { + repeat: { pattern: EVERY_15_MINUTES_STARTING_FROM_8AM }, + }, ); - await this.noticeOfIntentSubmissionStatusEmails.empty(); + await this.noticeOfIntentSubmissionStatusEmails.drain(); await this.noticeOfIntentSubmissionStatusEmails.add( + 'noticeOfIntentSubmissionStatusEmails', {}, - { repeat: { cron: EVERY_15_MINUTES_STARTING_FROM_8AM } }, + { repeat: { pattern: EVERY_15_MINUTES_STARTING_FROM_8AM } }, ); } } diff --git a/services/config/default.json b/services/config/default.json index baa256c5f0..9e5d48ec20 100644 --- a/services/config/default.json +++ b/services/config/default.json @@ -55,7 +55,9 @@ "MAX_FILE_SIZE": 104857600 }, "REDIS": { - "URL": "redis://:redis@redis:6379" + "HOST": "localhost", + "PORT": "6379", + "PASSWORD": "" }, "EMAIL": { "DEFAULT_ADMINS": [""] diff --git a/services/config/test.json b/services/config/test.json index 57219d2a5c..88035fd760 100644 --- a/services/config/test.json +++ b/services/config/test.json @@ -8,6 +8,11 @@ "USER": "postgres", "PASSWORD": "postgres" }, + "REDIS": { + "HOST": "localhost", + "PORT": "6379", + "PASSWORD": "redis" + }, "VERBOSE": "false", "KEYCLOAK": { "SCOPES": ["openid"] diff --git a/services/libs/common/src/redis/redis.service.ts b/services/libs/common/src/redis/redis.service.ts index 7e5ad639db..194f9c7311 100644 --- a/services/libs/common/src/redis/redis.service.ts +++ b/services/libs/common/src/redis/redis.service.ts @@ -8,9 +8,16 @@ export class RedisService { private client: ReturnType<typeof createClient>; constructor(@Inject(CONFIG_TOKEN) private config: IConfig) { + const url = `redis://:${this.config.get<string>( + 'REDIS.PASSWORD', + )}@${this.config.get<string>('REDIS.HOST')}:${this.config.get<number>( + 'REDIS.PORT', + )}`; + const client = createClient({ - url: this.config.get<string>('REDIS.URL'), + url, }); + client.on('error', (err) => this.logger.error('Redis Client Error', err)); client.connect().then(() => { this.client = client; diff --git a/services/package-lock.json b/services/package-lock.json index dc938a13d2..8f6167b8a9 100644 --- a/services/package-lock.json +++ b/services/package-lock.json @@ -21,7 +21,7 @@ "@grpc/grpc-js": "^1.8.7", "@grpc/proto-loader": "^0.7.4", "@nestjs/axios": "^0.1.1", - "@nestjs/bull": "^0.6.2", + "@nestjs/bullmq": "^10.0.1", "@nestjs/common": "^9.3.1", "@nestjs/config": "^2.3.0", "@nestjs/core": "^9.3.1", @@ -29,7 +29,6 @@ "@nestjs/platform-fastify": "^9.3.1", "@nestjs/swagger": "^6.1.4", "@nestjs/typeorm": "^9.0.1", - "bull": "^4.10.2", "class-transformer": "^0.5.1", "class-validator": "^0.14.0", "config": "^3.3.9", @@ -61,7 +60,6 @@ "@nestjs/cli": "^9.1.9", "@nestjs/schematics": "^9.0.4", "@nestjs/testing": "^9.3.1", - "@types/bull": "^3.15.9", "@types/config": "^0.0.41", "@types/express": "^4.17.16", "@types/jest": "28.1.4", @@ -2497,7 +2495,8 @@ "node_modules/@ioredis/commands": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/@ioredis/commands/-/commands-1.2.0.tgz", - "integrity": "sha512-Sx1pU8EM64o2BrqNpEO1CNLtKQwyhuXuqyfH7oGKCk+1a33d2r5saW8zNwm3j6BTExtjrv2BxTgzzkMwts6vGg==" + "integrity": "sha512-Sx1pU8EM64o2BrqNpEO1CNLtKQwyhuXuqyfH7oGKCk+1a33d2r5saW8zNwm3j6BTExtjrv2BxTgzzkMwts6vGg==", + "peer": true }, "node_modules/@istanbuljs/load-nyc-config": { "version": "1.1.0", @@ -3083,7 +3082,8 @@ "optional": true, "os": [ "darwin" - ] + ], + "peer": true }, "node_modules/@msgpackr-extract/msgpackr-extract-darwin-x64": { "version": "3.0.0", @@ -3095,7 +3095,8 @@ "optional": true, "os": [ "darwin" - ] + ], + "peer": true }, "node_modules/@msgpackr-extract/msgpackr-extract-linux-arm": { "version": "3.0.0", @@ -3107,7 +3108,8 @@ "optional": true, "os": [ "linux" - ] + ], + "peer": true }, "node_modules/@msgpackr-extract/msgpackr-extract-linux-arm64": { "version": "3.0.0", @@ -3119,7 +3121,8 @@ "optional": true, "os": [ "linux" - ] + ], + "peer": true }, "node_modules/@msgpackr-extract/msgpackr-extract-linux-x64": { "version": "3.0.0", @@ -3131,7 +3134,8 @@ "optional": true, "os": [ "linux" - ] + ], + "peer": true }, "node_modules/@msgpackr-extract/msgpackr-extract-win32-x64": { "version": "3.0.0", @@ -3143,7 +3147,8 @@ "optional": true, "os": [ "win32" - ] + ], + "peer": true }, "node_modules/@nestjs/axios": { "version": "0.1.1", @@ -3158,42 +3163,32 @@ "rxjs": "^6.0.0 || ^7.0.0" } }, - "node_modules/@nestjs/bull": { - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/@nestjs/bull/-/bull-0.6.2.tgz", - "integrity": "sha512-tx5wiIGgfYEj5RAJA1B23pn/63nsmMH0f981V1/v3NKyE07NsvOXCrwKNGQnIZZlXkXh7lgx2I80/tYwPGnVIg==", + "node_modules/@nestjs/bullmq": { + "version": "10.0.1", + "resolved": "https://registry.npmjs.org/@nestjs/bullmq/-/bullmq-10.0.1.tgz", + "integrity": "sha512-YJtfJXfnQinN7OvGx/Qd6jlQFu56zVnI1SppftSS7gkthB2CbJQAjkrfCEPDjp11wbPptBhUnatIL2N+nH/3kA==", "dependencies": { - "@nestjs/bull-shared": "^0.1.2", - "tslib": "2.4.1" + "@nestjs/bull-shared": "^10.0.1", + "tslib": "2.6.0" }, "peerDependencies": { - "@nestjs/common": "^6.10.11 || ^7.0.0 || ^8.0.0 || ^9.0.0", - "@nestjs/core": "^6.10.11 || ^7.0.0 || ^8.0.0 || ^9.0.0", - "bull": "^3.3 || ^4.0.0" + "@nestjs/common": "^8.0.0 || ^9.0.0 || ^10.0.0", + "@nestjs/core": "^8.0.0 || ^9.0.0 || ^10.0.0", + "bullmq": "^3.0.0 || ^4.0.0" } }, - "node_modules/@nestjs/bull-shared": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/@nestjs/bull-shared/-/bull-shared-0.1.2.tgz", - "integrity": "sha512-q1JqieWb2YjA6OIal5XjtbF28LgJxEflwJB9x3OnE2OUgI0kWvaMlYMaW3opFmgcWPjx4o5lVhcGnwXeIhZfgg==", + "node_modules/@nestjs/bullmq/node_modules/@nestjs/bull-shared": { + "version": "10.0.1", + "resolved": "https://registry.npmjs.org/@nestjs/bull-shared/-/bull-shared-10.0.1.tgz", + "integrity": "sha512-8Td36l2i5x9+iQWjPB5Bd5+6u5Eangb5DclNcwrdwKqvd28xE92MSW97P4JV52C2kxrTjZwx8ck/wObAwtpQPw==", "dependencies": { - "tslib": "2.4.1" + "tslib": "2.6.0" }, "peerDependencies": { - "@nestjs/common": "^6.10.11 || ^7.0.0 || ^8.0.0 || ^9.0.0", - "@nestjs/core": "^6.10.11 || ^7.0.0 || ^8.0.0 || ^9.0.0" + "@nestjs/common": "^8.0.0 || ^9.0.0 || ^10.0.0", + "@nestjs/core": "^8.0.0 || ^9.0.0 || ^10.0.0" } }, - "node_modules/@nestjs/bull-shared/node_modules/tslib": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz", - "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==" - }, - "node_modules/@nestjs/bull/node_modules/tslib": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz", - "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==" - }, "node_modules/@nestjs/cli": { "version": "9.1.9", "resolved": "https://registry.npmjs.org/@nestjs/cli/-/cli-9.1.9.tgz", @@ -3919,16 +3914,6 @@ "@types/node": "*" } }, - "node_modules/@types/bull": { - "version": "3.15.9", - "resolved": "https://registry.npmjs.org/@types/bull/-/bull-3.15.9.tgz", - "integrity": "sha512-MPUcyPPQauAmynoO3ezHAmCOhbB0pWmYyijr/5ctaCqhbKWsjW0YCod38ZcLzUBprosfZ9dPqfYIcfdKjk7RNQ==", - "dev": true, - "dependencies": { - "@types/ioredis": "*", - "@types/redis": "^2.8.0" - } - }, "node_modules/@types/config": { "version": "0.0.41", "resolved": "https://registry.npmjs.org/@types/config/-/config-0.0.41.tgz", @@ -4008,16 +3993,6 @@ "@types/node": "*" } }, - "node_modules/@types/ioredis": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/@types/ioredis/-/ioredis-5.0.0.tgz", - "integrity": "sha512-zJbJ3FVE17CNl5KXzdeSPtdltc4tMT3TzC6fxQS0sQngkbFZ6h+0uTafsRqu+eSLIugf6Yb0Ea0SUuRr42Nk9g==", - "deprecated": "This is a stub types definition. ioredis provides its own type definitions, so you do not need this installed.", - "dev": true, - "dependencies": { - "ioredis": "*" - } - }, "node_modules/@types/istanbul-lib-coverage": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz", @@ -4112,15 +4087,6 @@ "integrity": "sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==", "dev": true }, - "node_modules/@types/redis": { - "version": "2.8.32", - "resolved": "https://registry.npmjs.org/@types/redis/-/redis-2.8.32.tgz", - "integrity": "sha512-7jkMKxcGq9p242exlbsVzuJb57KqHRhNl4dHoQu2Y5v9bCAbtIXXH0R3HleSQW4CTOqpHIYUW3t6tpUj4BVQ+w==", - "dev": true, - "dependencies": { - "@types/node": "*" - } - }, "node_modules/@types/semver": { "version": "7.3.13", "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.3.13.tgz", @@ -5177,23 +5143,34 @@ "node": ">=4" } }, - "node_modules/bull": { - "version": "4.10.2", - "resolved": "https://registry.npmjs.org/bull/-/bull-4.10.2.tgz", - "integrity": "sha512-xa65xtWjQsLqYU/eNaXxq9VRG8xd6qNsQEjR7yjYuae05xKrzbVMVj2QgrYsTMmSs/vsqJjHqHSRRiW1+IkGXQ==", + "node_modules/bullmq": { + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/bullmq/-/bullmq-4.11.0.tgz", + "integrity": "sha512-e6/CtKHieEplmoP0NE/oty2xmuXGAoHWlpy//hYexljwM14Ff2Gqr4eLscYIdWm3W0OyxWwjjJUPXaOf5BYYvQ==", + "peer": true, "dependencies": { - "cron-parser": "^4.2.1", - "debuglog": "^1.0.0", - "get-port": "^5.1.1", - "ioredis": "^5.0.0", + "cron-parser": "^4.6.0", + "glob": "^8.0.3", + "ioredis": "^5.3.2", "lodash": "^4.17.21", - "msgpackr": "^1.5.2", - "p-timeout": "^3.2.0", - "semver": "^7.3.2", - "uuid": "^8.3.0" - }, - "engines": { - "node": ">=12" + "msgpackr": "^1.6.2", + "node-abort-controller": "^3.1.1", + "semver": "^7.5.4", + "tslib": "^2.0.0", + "uuid": "^9.0.0" + } + }, + "node_modules/bullmq/node_modules/uuid": { + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz", + "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==", + "funding": [ + "https://github.com/sponsors/broofa", + "https://github.com/sponsors/ctavan" + ], + "peer": true, + "bin": { + "uuid": "dist/bin/uuid" } }, "node_modules/call-bind": { @@ -5710,6 +5687,7 @@ "version": "4.7.1", "resolved": "https://registry.npmjs.org/cron-parser/-/cron-parser-4.7.1.tgz", "integrity": "sha512-WguFaoQ0hQ61SgsCZLHUcNbAvlK0lypKXu62ARguefYmjzaOXIVRNrAmyXzabTwUn4sQvQLkk6bjH+ipGfw8bA==", + "peer": true, "dependencies": { "luxon": "^3.2.1" }, @@ -5818,14 +5796,6 @@ } } }, - "node_modules/debuglog": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/debuglog/-/debuglog-1.0.1.tgz", - "integrity": "sha512-syBZ+rnAK3EgMsH2aYEOLUW7mZSY9Gb+0wUMCFsZvcmiz+HigA0LOcq/HoQqVuGG+EKykunc7QG2bzrponfaSw==", - "engines": { - "node": "*" - } - }, "node_modules/dedent": { "version": "0.7.0", "resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz", @@ -5871,6 +5841,7 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/denque/-/denque-2.1.0.tgz", "integrity": "sha512-HVQE3AAb/pxF8fQAoiqpvg9i3evqug3hoiwakOyZAwJm+6vZehbkYXZ0l4JxS+I3QxM97v5aaRNhj8v5oBhekw==", + "peer": true, "engines": { "node": ">=0.10" } @@ -7079,17 +7050,6 @@ "node": ">=8.0.0" } }, - "node_modules/get-port": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/get-port/-/get-port-5.1.1.tgz", - "integrity": "sha512-g/Q1aTSDOxFpchXC4i8ZWvxA1lnPqx/JHqcpIw0/LX9T8x/GBbi6YnlN5nhaKIFkT8oFsscUKgDJYxfwfS6QsQ==", - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/get-stream": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", @@ -7600,9 +7560,10 @@ } }, "node_modules/ioredis": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/ioredis/-/ioredis-5.3.0.tgz", - "integrity": "sha512-Id9jKHhsILuIZpHc61QkagfVdUj2Rag5GzG1TGEvRNeM7dtTOjICgjC+tvqYxi//PuX2wjQ+Xjva2ONBuf92Pw==", + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/ioredis/-/ioredis-5.3.2.tgz", + "integrity": "sha512-1DKMMzlIHM02eBBVOFQ1+AolGjs6+xEcM4PDL7NqOS6szq7H9jSaEkIUH6/a5Hl241LzW6JLSiAbNvTQjUupUA==", + "peer": true, "dependencies": { "@ioredis/commands": "^1.1.1", "cluster-key-slot": "^1.1.0", @@ -9007,7 +8968,8 @@ "node_modules/lodash.defaults": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz", - "integrity": "sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==" + "integrity": "sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==", + "peer": true }, "node_modules/lodash.get": { "version": "4.4.2", @@ -9018,7 +8980,8 @@ "node_modules/lodash.isarguments": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz", - "integrity": "sha512-chi4NHZlZqZD18a0imDHnZPrDeBbTtVN7GXMwuGdRH9qotxAjYs3aVLKc7zNOG9eddR5Ksd8rvFEBc9SsggPpg==" + "integrity": "sha512-chi4NHZlZqZD18a0imDHnZPrDeBbTtVN7GXMwuGdRH9qotxAjYs3aVLKc7zNOG9eddR5Ksd8rvFEBc9SsggPpg==", + "peer": true }, "node_modules/lodash.memoize": { "version": "4.1.2", @@ -9087,6 +9050,7 @@ "version": "3.2.1", "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.2.1.tgz", "integrity": "sha512-QrwPArQCNLAKGO/C+ZIilgIuDnEnKx5QYODdDtbFaxzsbZcc/a7WFq7MhsVYgRlwawLtvOUESTlfJ+hc/USqPg==", + "peer": true, "engines": { "node": ">=12" } @@ -9721,6 +9685,7 @@ "version": "1.8.3", "resolved": "https://registry.npmjs.org/msgpackr/-/msgpackr-1.8.3.tgz", "integrity": "sha512-m2JefwcKNzoHYXkH/5jzHRxAw7XLWsAdvu0FOJ+OLwwozwOV/J6UA62iLkfIMbg7G8+dIuRwgg6oz+QoQ4YkoA==", + "peer": true, "optionalDependencies": { "msgpackr-extract": "^3.0.0" } @@ -9731,6 +9696,7 @@ "integrity": "sha512-oy6KCk1+X4Bn5m6Ycq5N1EWl9npqG/cLrE8ga8NX7ZqfqYUUBS08beCQaGq80fjbKBySur0E6x//yZjzNJDt3A==", "hasInstallScript": true, "optional": true, + "peer": true, "dependencies": { "node-gyp-build-optional-packages": "5.0.7" }, @@ -9903,8 +9869,7 @@ "node_modules/node-abort-controller": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/node-abort-controller/-/node-abort-controller-3.1.1.tgz", - "integrity": "sha512-AGK2yQKIjRuqnc6VkX2Xj5d+QW8xZ87pa1UK6yA6ouUyuxfHuMP6umE5QK7UmTeOAymo+Zx1Fxiuw9rVx8taHQ==", - "dev": true + "integrity": "sha512-AGK2yQKIjRuqnc6VkX2Xj5d+QW8xZ87pa1UK6yA6ouUyuxfHuMP6umE5QK7UmTeOAymo+Zx1Fxiuw9rVx8taHQ==" }, "node_modules/node-emoji": { "version": "1.11.0", @@ -9947,6 +9912,7 @@ "resolved": "https://registry.npmjs.org/node-gyp-build-optional-packages/-/node-gyp-build-optional-packages-5.0.7.tgz", "integrity": "sha512-YlCCc6Wffkx0kHkmam79GKvDQ6x+QZkMjFGrIMxgFNILFvGSbCp2fCBC55pGTT9gVaz8Na5CLmxt/urtzRv36w==", "optional": true, + "peer": true, "bin": { "node-gyp-build-optional-packages": "bin.js", "node-gyp-build-optional-packages-optional": "optional.js", @@ -10170,14 +10136,6 @@ "node": ">=0.10.0" } }, - "node_modules/p-finally": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz", - "integrity": "sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==", - "engines": { - "node": ">=4" - } - }, "node_modules/p-limit": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", @@ -10207,17 +10165,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/p-timeout": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-3.2.0.tgz", - "integrity": "sha512-rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg==", - "dependencies": { - "p-finally": "^1.0.0" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/p-try": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", @@ -10910,6 +10857,7 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/redis-errors/-/redis-errors-1.2.0.tgz", "integrity": "sha512-1qny3OExCf0UvUV/5wpYKf2YwPcOqXzkwKKSmKHiE6ZMQs5heeE/c8eXK+PNllPvmjgAbfnsbpkGZWy8cBpn9w==", + "peer": true, "engines": { "node": ">=4" } @@ -10918,6 +10866,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/redis-parser/-/redis-parser-3.0.0.tgz", "integrity": "sha512-DJnGAeenTdpMEH6uAJRK/uiyEIH9WVsUmoLwzudwGJUwZPp80PDBWPHXSAGNPwNvIXAbe7MSUB1zQFugFml66A==", + "peer": true, "dependencies": { "redis-errors": "^1.0.0" }, @@ -11235,9 +11184,9 @@ "integrity": "sha512-6aU+Rwsezw7VR8/nyvKTx8QpWH9FrcYiXXlqC4z5d5XQBDRqtbfsRjnwGyqbi3gddNtWHuEk9OANUotL26qKUw==" }, "node_modules/semver": { - "version": "7.3.8", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", - "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "dependencies": { "lru-cache": "^6.0.0" }, @@ -11507,7 +11456,8 @@ "node_modules/standard-as-callback": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/standard-as-callback/-/standard-as-callback-2.1.0.tgz", - "integrity": "sha512-qoRRSyROncaz1z0mvYqIE4lCd9p2R90i6GxW3uZv5ucSu8tU7B5HXUP1gG8pVZsYNVaXjk8ClXHPttLyxAL48A==" + "integrity": "sha512-qoRRSyROncaz1z0mvYqIE4lCd9p2R90i6GxW3uZv5ucSu8tU7B5HXUP1gG8pVZsYNVaXjk8ClXHPttLyxAL48A==", + "peer": true }, "node_modules/statuses": { "version": "2.0.1", @@ -12272,9 +12222,9 @@ } }, "node_modules/tslib": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz", - "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==" + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.0.tgz", + "integrity": "sha512-7At1WUettjcSRHXCyYtTselblcHl9PJFFVKiCAy/bY97+BPZXSQ2wbq0P9s8tK2G7dFQfNnlJnPAiArVBVBsfA==" }, "node_modules/tsutils": { "version": "3.21.0", @@ -15019,7 +14969,8 @@ "@ioredis/commands": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/@ioredis/commands/-/commands-1.2.0.tgz", - "integrity": "sha512-Sx1pU8EM64o2BrqNpEO1CNLtKQwyhuXuqyfH7oGKCk+1a33d2r5saW8zNwm3j6BTExtjrv2BxTgzzkMwts6vGg==" + "integrity": "sha512-Sx1pU8EM64o2BrqNpEO1CNLtKQwyhuXuqyfH7oGKCk+1a33d2r5saW8zNwm3j6BTExtjrv2BxTgzzkMwts6vGg==", + "peer": true }, "@istanbuljs/load-nyc-config": { "version": "1.1.0", @@ -15474,37 +15425,43 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-arm64/-/msgpackr-extract-darwin-arm64-3.0.0.tgz", "integrity": "sha512-5qpnNHUyyEj9H3sm/4Um/bnx1lrQGhe8iqry/1d+cQYCRd/gzYA0YLeq0ezlk4hKx4vO+dsEsNyeowqRqslwQA==", - "optional": true + "optional": true, + "peer": true }, "@msgpackr-extract/msgpackr-extract-darwin-x64": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-x64/-/msgpackr-extract-darwin-x64-3.0.0.tgz", "integrity": "sha512-ZphTFFd6SFweNAMKD+QJCrWpgkjf4qBuHltiMkKkD6FFrB3NOTRVmetAGTkJ57pa+s6J0yCH06LujWB9rZe94g==", - "optional": true + "optional": true, + "peer": true }, "@msgpackr-extract/msgpackr-extract-linux-arm": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm/-/msgpackr-extract-linux-arm-3.0.0.tgz", "integrity": "sha512-ztKVV1dO/sSZyGse0PBCq3Pk1PkYjsA/dsEWE7lfrGoAK3i9HpS2o7XjGQ7V4va6nX+xPPOiuYpQwa4Bi6vlww==", - "optional": true + "optional": true, + "peer": true }, "@msgpackr-extract/msgpackr-extract-linux-arm64": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm64/-/msgpackr-extract-linux-arm64-3.0.0.tgz", "integrity": "sha512-NEX6hdSvP4BmVyegaIbrGxvHzHvTzzsPaxXCsUt0mbLbPpEftsvNwaEVKOowXnLoeuGeD4MaqSwL3BUK2elsUA==", - "optional": true + "optional": true, + "peer": true }, "@msgpackr-extract/msgpackr-extract-linux-x64": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-x64/-/msgpackr-extract-linux-x64-3.0.0.tgz", "integrity": "sha512-9uvdAkZMOPCY7SPRxZLW8XGqBOVNVEhqlgffenN8shA1XR9FWVsSM13nr/oHtNgXg6iVyML7RwWPyqUeThlwxg==", - "optional": true + "optional": true, + "peer": true }, "@msgpackr-extract/msgpackr-extract-win32-x64": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-win32-x64/-/msgpackr-extract-win32-x64-3.0.0.tgz", "integrity": "sha512-Wg0+9615kHKlr9iLVcG5I+/CHnf6w3x5UADRv8Ad16yA0Bu5l9eVOROjV7aHPG6uC8ZPFIVVaoSjDChD+Y0pzg==", - "optional": true + "optional": true, + "peer": true }, "@nestjs/axios": { "version": "0.1.1", @@ -15514,34 +15471,22 @@ "axios": "1.2.1" } }, - "@nestjs/bull": { - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/@nestjs/bull/-/bull-0.6.2.tgz", - "integrity": "sha512-tx5wiIGgfYEj5RAJA1B23pn/63nsmMH0f981V1/v3NKyE07NsvOXCrwKNGQnIZZlXkXh7lgx2I80/tYwPGnVIg==", - "requires": { - "@nestjs/bull-shared": "^0.1.2", - "tslib": "2.4.1" - }, - "dependencies": { - "tslib": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz", - "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==" - } - } - }, - "@nestjs/bull-shared": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/@nestjs/bull-shared/-/bull-shared-0.1.2.tgz", - "integrity": "sha512-q1JqieWb2YjA6OIal5XjtbF28LgJxEflwJB9x3OnE2OUgI0kWvaMlYMaW3opFmgcWPjx4o5lVhcGnwXeIhZfgg==", + "@nestjs/bullmq": { + "version": "10.0.1", + "resolved": "https://registry.npmjs.org/@nestjs/bullmq/-/bullmq-10.0.1.tgz", + "integrity": "sha512-YJtfJXfnQinN7OvGx/Qd6jlQFu56zVnI1SppftSS7gkthB2CbJQAjkrfCEPDjp11wbPptBhUnatIL2N+nH/3kA==", "requires": { - "tslib": "2.4.1" + "@nestjs/bull-shared": "^10.0.1", + "tslib": "2.6.0" }, "dependencies": { - "tslib": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz", - "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==" + "@nestjs/bull-shared": { + "version": "10.0.1", + "resolved": "https://registry.npmjs.org/@nestjs/bull-shared/-/bull-shared-10.0.1.tgz", + "integrity": "sha512-8Td36l2i5x9+iQWjPB5Bd5+6u5Eangb5DclNcwrdwKqvd28xE92MSW97P4JV52C2kxrTjZwx8ck/wObAwtpQPw==", + "requires": { + "tslib": "2.6.0" + } } } }, @@ -16055,16 +16000,6 @@ "@types/node": "*" } }, - "@types/bull": { - "version": "3.15.9", - "resolved": "https://registry.npmjs.org/@types/bull/-/bull-3.15.9.tgz", - "integrity": "sha512-MPUcyPPQauAmynoO3ezHAmCOhbB0pWmYyijr/5ctaCqhbKWsjW0YCod38ZcLzUBprosfZ9dPqfYIcfdKjk7RNQ==", - "dev": true, - "requires": { - "@types/ioredis": "*", - "@types/redis": "^2.8.0" - } - }, "@types/config": { "version": "0.0.41", "resolved": "https://registry.npmjs.org/@types/config/-/config-0.0.41.tgz", @@ -16144,15 +16079,6 @@ "@types/node": "*" } }, - "@types/ioredis": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/@types/ioredis/-/ioredis-5.0.0.tgz", - "integrity": "sha512-zJbJ3FVE17CNl5KXzdeSPtdltc4tMT3TzC6fxQS0sQngkbFZ6h+0uTafsRqu+eSLIugf6Yb0Ea0SUuRr42Nk9g==", - "dev": true, - "requires": { - "ioredis": "*" - } - }, "@types/istanbul-lib-coverage": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz", @@ -16247,15 +16173,6 @@ "integrity": "sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==", "dev": true }, - "@types/redis": { - "version": "2.8.32", - "resolved": "https://registry.npmjs.org/@types/redis/-/redis-2.8.32.tgz", - "integrity": "sha512-7jkMKxcGq9p242exlbsVzuJb57KqHRhNl4dHoQu2Y5v9bCAbtIXXH0R3HleSQW4CTOqpHIYUW3t6tpUj4BVQ+w==", - "dev": true, - "requires": { - "@types/node": "*" - } - }, "@types/semver": { "version": "7.3.13", "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.3.13.tgz", @@ -17055,20 +16972,29 @@ "resolved": "https://registry.npmjs.org/buffer-writer/-/buffer-writer-2.0.0.tgz", "integrity": "sha512-a7ZpuTZU1TRtnwyCNW3I5dc0wWNC3VR9S++Ewyk2HHZdrO3CQJqSpd+95Us590V6AL7JqUAH2IwZ/398PmNFgw==" }, - "bull": { - "version": "4.10.2", - "resolved": "https://registry.npmjs.org/bull/-/bull-4.10.2.tgz", - "integrity": "sha512-xa65xtWjQsLqYU/eNaXxq9VRG8xd6qNsQEjR7yjYuae05xKrzbVMVj2QgrYsTMmSs/vsqJjHqHSRRiW1+IkGXQ==", + "bullmq": { + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/bullmq/-/bullmq-4.11.0.tgz", + "integrity": "sha512-e6/CtKHieEplmoP0NE/oty2xmuXGAoHWlpy//hYexljwM14Ff2Gqr4eLscYIdWm3W0OyxWwjjJUPXaOf5BYYvQ==", + "peer": true, "requires": { - "cron-parser": "^4.2.1", - "debuglog": "^1.0.0", - "get-port": "^5.1.1", - "ioredis": "^5.0.0", + "cron-parser": "^4.6.0", + "glob": "^8.0.3", + "ioredis": "^5.3.2", "lodash": "^4.17.21", - "msgpackr": "^1.5.2", - "p-timeout": "^3.2.0", - "semver": "^7.3.2", - "uuid": "^8.3.0" + "msgpackr": "^1.6.2", + "node-abort-controller": "^3.1.1", + "semver": "^7.5.4", + "tslib": "^2.0.0", + "uuid": "^9.0.0" + }, + "dependencies": { + "uuid": { + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz", + "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==", + "peer": true + } } }, "call-bind": { @@ -17454,6 +17380,7 @@ "version": "4.7.1", "resolved": "https://registry.npmjs.org/cron-parser/-/cron-parser-4.7.1.tgz", "integrity": "sha512-WguFaoQ0hQ61SgsCZLHUcNbAvlK0lypKXu62ARguefYmjzaOXIVRNrAmyXzabTwUn4sQvQLkk6bjH+ipGfw8bA==", + "peer": true, "requires": { "luxon": "^3.2.1" } @@ -17523,11 +17450,6 @@ "ms": "2.1.2" } }, - "debuglog": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/debuglog/-/debuglog-1.0.1.tgz", - "integrity": "sha512-syBZ+rnAK3EgMsH2aYEOLUW7mZSY9Gb+0wUMCFsZvcmiz+HigA0LOcq/HoQqVuGG+EKykunc7QG2bzrponfaSw==" - }, "dedent": { "version": "0.7.0", "resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz", @@ -17563,7 +17485,8 @@ "denque": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/denque/-/denque-2.1.0.tgz", - "integrity": "sha512-HVQE3AAb/pxF8fQAoiqpvg9i3evqug3hoiwakOyZAwJm+6vZehbkYXZ0l4JxS+I3QxM97v5aaRNhj8v5oBhekw==" + "integrity": "sha512-HVQE3AAb/pxF8fQAoiqpvg9i3evqug3hoiwakOyZAwJm+6vZehbkYXZ0l4JxS+I3QxM97v5aaRNhj8v5oBhekw==", + "peer": true }, "depd": { "version": "2.0.0", @@ -18464,11 +18387,6 @@ "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==", "dev": true }, - "get-port": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/get-port/-/get-port-5.1.1.tgz", - "integrity": "sha512-g/Q1aTSDOxFpchXC4i8ZWvxA1lnPqx/JHqcpIw0/LX9T8x/GBbi6YnlN5nhaKIFkT8oFsscUKgDJYxfwfS6QsQ==" - }, "get-stream": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", @@ -18846,9 +18764,10 @@ "dev": true }, "ioredis": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/ioredis/-/ioredis-5.3.0.tgz", - "integrity": "sha512-Id9jKHhsILuIZpHc61QkagfVdUj2Rag5GzG1TGEvRNeM7dtTOjICgjC+tvqYxi//PuX2wjQ+Xjva2ONBuf92Pw==", + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/ioredis/-/ioredis-5.3.2.tgz", + "integrity": "sha512-1DKMMzlIHM02eBBVOFQ1+AolGjs6+xEcM4PDL7NqOS6szq7H9jSaEkIUH6/a5Hl241LzW6JLSiAbNvTQjUupUA==", + "peer": true, "requires": { "@ioredis/commands": "^1.1.1", "cluster-key-slot": "^1.1.0", @@ -19907,7 +19826,8 @@ "lodash.defaults": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz", - "integrity": "sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==" + "integrity": "sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==", + "peer": true }, "lodash.get": { "version": "4.4.2", @@ -19918,7 +19838,8 @@ "lodash.isarguments": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz", - "integrity": "sha512-chi4NHZlZqZD18a0imDHnZPrDeBbTtVN7GXMwuGdRH9qotxAjYs3aVLKc7zNOG9eddR5Ksd8rvFEBc9SsggPpg==" + "integrity": "sha512-chi4NHZlZqZD18a0imDHnZPrDeBbTtVN7GXMwuGdRH9qotxAjYs3aVLKc7zNOG9eddR5Ksd8rvFEBc9SsggPpg==", + "peer": true }, "lodash.memoize": { "version": "4.1.2", @@ -19976,7 +19897,8 @@ "luxon": { "version": "3.2.1", "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.2.1.tgz", - "integrity": "sha512-QrwPArQCNLAKGO/C+ZIilgIuDnEnKx5QYODdDtbFaxzsbZcc/a7WFq7MhsVYgRlwawLtvOUESTlfJ+hc/USqPg==" + "integrity": "sha512-QrwPArQCNLAKGO/C+ZIilgIuDnEnKx5QYODdDtbFaxzsbZcc/a7WFq7MhsVYgRlwawLtvOUESTlfJ+hc/USqPg==", + "peer": true }, "macos-release": { "version": "2.5.0", @@ -20536,6 +20458,7 @@ "version": "1.8.3", "resolved": "https://registry.npmjs.org/msgpackr/-/msgpackr-1.8.3.tgz", "integrity": "sha512-m2JefwcKNzoHYXkH/5jzHRxAw7XLWsAdvu0FOJ+OLwwozwOV/J6UA62iLkfIMbg7G8+dIuRwgg6oz+QoQ4YkoA==", + "peer": true, "requires": { "msgpackr-extract": "^3.0.0" } @@ -20545,6 +20468,7 @@ "resolved": "https://registry.npmjs.org/msgpackr-extract/-/msgpackr-extract-3.0.0.tgz", "integrity": "sha512-oy6KCk1+X4Bn5m6Ycq5N1EWl9npqG/cLrE8ga8NX7ZqfqYUUBS08beCQaGq80fjbKBySur0E6x//yZjzNJDt3A==", "optional": true, + "peer": true, "requires": { "@msgpackr-extract/msgpackr-extract-darwin-arm64": "3.0.0", "@msgpackr-extract/msgpackr-extract-darwin-x64": "3.0.0", @@ -20679,8 +20603,7 @@ "node-abort-controller": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/node-abort-controller/-/node-abort-controller-3.1.1.tgz", - "integrity": "sha512-AGK2yQKIjRuqnc6VkX2Xj5d+QW8xZ87pa1UK6yA6ouUyuxfHuMP6umE5QK7UmTeOAymo+Zx1Fxiuw9rVx8taHQ==", - "dev": true + "integrity": "sha512-AGK2yQKIjRuqnc6VkX2Xj5d+QW8xZ87pa1UK6yA6ouUyuxfHuMP6umE5QK7UmTeOAymo+Zx1Fxiuw9rVx8taHQ==" }, "node-emoji": { "version": "1.11.0", @@ -20708,7 +20631,8 @@ "version": "5.0.7", "resolved": "https://registry.npmjs.org/node-gyp-build-optional-packages/-/node-gyp-build-optional-packages-5.0.7.tgz", "integrity": "sha512-YlCCc6Wffkx0kHkmam79GKvDQ6x+QZkMjFGrIMxgFNILFvGSbCp2fCBC55pGTT9gVaz8Na5CLmxt/urtzRv36w==", - "optional": true + "optional": true, + "peer": true }, "node-int64": { "version": "0.4.0", @@ -20877,11 +20801,6 @@ "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==", "dev": true }, - "p-finally": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz", - "integrity": "sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==" - }, "p-limit": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", @@ -20899,14 +20818,6 @@ "p-limit": "^3.0.2" } }, - "p-timeout": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-3.2.0.tgz", - "integrity": "sha512-rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg==", - "requires": { - "p-finally": "^1.0.0" - } - }, "p-try": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", @@ -21445,12 +21356,14 @@ "redis-errors": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/redis-errors/-/redis-errors-1.2.0.tgz", - "integrity": "sha512-1qny3OExCf0UvUV/5wpYKf2YwPcOqXzkwKKSmKHiE6ZMQs5heeE/c8eXK+PNllPvmjgAbfnsbpkGZWy8cBpn9w==" + "integrity": "sha512-1qny3OExCf0UvUV/5wpYKf2YwPcOqXzkwKKSmKHiE6ZMQs5heeE/c8eXK+PNllPvmjgAbfnsbpkGZWy8cBpn9w==", + "peer": true }, "redis-parser": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/redis-parser/-/redis-parser-3.0.0.tgz", "integrity": "sha512-DJnGAeenTdpMEH6uAJRK/uiyEIH9WVsUmoLwzudwGJUwZPp80PDBWPHXSAGNPwNvIXAbe7MSUB1zQFugFml66A==", + "peer": true, "requires": { "redis-errors": "^1.0.0" } @@ -21669,9 +21582,9 @@ "integrity": "sha512-6aU+Rwsezw7VR8/nyvKTx8QpWH9FrcYiXXlqC4z5d5XQBDRqtbfsRjnwGyqbi3gddNtWHuEk9OANUotL26qKUw==" }, "semver": { - "version": "7.3.8", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", - "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "requires": { "lru-cache": "^6.0.0" }, @@ -21892,7 +21805,8 @@ "standard-as-callback": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/standard-as-callback/-/standard-as-callback-2.1.0.tgz", - "integrity": "sha512-qoRRSyROncaz1z0mvYqIE4lCd9p2R90i6GxW3uZv5ucSu8tU7B5HXUP1gG8pVZsYNVaXjk8ClXHPttLyxAL48A==" + "integrity": "sha512-qoRRSyROncaz1z0mvYqIE4lCd9p2R90i6GxW3uZv5ucSu8tU7B5HXUP1gG8pVZsYNVaXjk8ClXHPttLyxAL48A==", + "peer": true }, "statuses": { "version": "2.0.1", @@ -22450,9 +22364,9 @@ } }, "tslib": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz", - "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==" + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.0.tgz", + "integrity": "sha512-7At1WUettjcSRHXCyYtTselblcHl9PJFFVKiCAy/bY97+BPZXSQ2wbq0P9s8tK2G7dFQfNnlJnPAiArVBVBsfA==" }, "tsutils": { "version": "3.21.0", diff --git a/services/package.json b/services/package.json index c186dc98db..a1f28314f2 100644 --- a/services/package.json +++ b/services/package.json @@ -40,7 +40,7 @@ "@grpc/grpc-js": "^1.8.7", "@grpc/proto-loader": "^0.7.4", "@nestjs/axios": "^0.1.1", - "@nestjs/bull": "^0.6.2", + "@nestjs/bullmq": "^10.0.1", "@nestjs/common": "^9.3.1", "@nestjs/config": "^2.3.0", "@nestjs/core": "^9.3.1", @@ -48,7 +48,6 @@ "@nestjs/platform-fastify": "^9.3.1", "@nestjs/swagger": "^6.1.4", "@nestjs/typeorm": "^9.0.1", - "bull": "^4.10.2", "class-transformer": "^0.5.1", "class-validator": "^0.14.0", "config": "^3.3.9", @@ -80,7 +79,6 @@ "@nestjs/cli": "^9.1.9", "@nestjs/schematics": "^9.0.4", "@nestjs/testing": "^9.3.1", - "@types/bull": "^3.15.9", "@types/config": "^0.0.41", "@types/express": "^4.17.16", "@types/jest": "28.1.4", From 881ba12f583e2af4409afb768dae1327d50ab550 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Tue, 19 Sep 2023 11:49:46 -0700 Subject: [PATCH 403/954] Allow updating of Primary Contact Email for SRWs --- .../notification/intake/intake.component.html | 4 +-- .../notification/intake/intake.component.ts | 21 ++++++++++++++- .../notification-submission.service.spec.ts | 9 +++++++ .../notification-submission.service.ts | 13 ++++++++++ .../inline-text/inline-text.component.html | 2 +- .../inline-text/inline-text.component.ts | 1 + ...notification-submission.controller.spec.ts | 24 +++++++++++++++++ .../notification-submission.controller.ts | 25 ++++++++++++++++++ .../notification-submission.service.spec.ts | 26 +++++++++++++++++++ .../notification-submission.service.ts | 13 ++++++++++ 10 files changed, 134 insertions(+), 4 deletions(-) diff --git a/alcs-frontend/src/app/features/notification/intake/intake.component.html b/alcs-frontend/src/app/features/notification/intake/intake.component.html index 5e525ced6f..95f810c5e9 100644 --- a/alcs-frontend/src/app/features/notification/intake/intake.component.html +++ b/alcs-frontend/src/app/features/notification/intake/intake.component.html @@ -23,7 +23,7 @@ <h3>ALC Intake</h3> <span class="sent-text"> <strong>Sent</strong> </span> - <span class='response-date'>{{ responseDate | momentFormat }}</span> + <span class="response-date">{{ responseDate | momentFormat }}</span> </div> </ng-container> <ng-container *ngIf="!responseSent"> @@ -44,6 +44,6 @@ <h3>ALC Intake</h3> </div> <div *ngIf="contactEmail"> <div class="subheading2">Primary Contact Email</div> - <app-inline-text [value]="contactEmail" (save)="updateSubmissionEmail($event)"></app-inline-text> + <app-inline-text [value]="contactEmail" [required]="true" (save)="updateSubmissionEmail($event)"></app-inline-text> </div> </div> diff --git a/alcs-frontend/src/app/features/notification/intake/intake.component.ts b/alcs-frontend/src/app/features/notification/intake/intake.component.ts index cb29df65db..19f5046699 100644 --- a/alcs-frontend/src/app/features/notification/intake/intake.component.ts +++ b/alcs-frontend/src/app/features/notification/intake/intake.component.ts @@ -59,7 +59,26 @@ export class IntakeComponent implements OnInit { } async updateSubmissionEmail(email: string | null) { - //TODO: Implemented in ALCS-1074 + if (!email) { + return; + } + + this.confirmationDialogService + .openDialog({ + title: 'Change Primary Contact Email', + body: 'Any changes made here will also be reflected in the portal. Do you want to continue?', + }) + .subscribe(async (didConfirm) => { + if (didConfirm) { + const notification = this.notification; + if (notification) { + const update = await this.notificationSubmissionService.setContactEmail(email, notification.fileNumber); + if (update) { + this.toastService.showSuccessToast('Notification updated'); + } + } + } + }); } private async loadGovernments() { diff --git a/alcs-frontend/src/app/services/notification/notification-submission/notification-submission.service.spec.ts b/alcs-frontend/src/app/services/notification/notification-submission/notification-submission.service.spec.ts index 3f11c21bff..a04f2c9c6f 100644 --- a/alcs-frontend/src/app/services/notification/notification-submission/notification-submission.service.spec.ts +++ b/alcs-frontend/src/app/services/notification/notification-submission/notification-submission.service.spec.ts @@ -70,4 +70,13 @@ describe('NotificationSubmissionService', () => { expect(result).toEqual(mockSubmittedNOI); expect(mockHttpClient.get).toBeCalledTimes(1); }); + + it('should make a patch request for email', async () => { + mockHttpClient.patch.mockReturnValue(of(mockSubmittedNOI)); + + const result = await service.setContactEmail('1', '1'); + + expect(result).toEqual(mockSubmittedNOI); + expect(mockHttpClient.patch).toBeCalledTimes(1); + }); }); diff --git a/alcs-frontend/src/app/services/notification/notification-submission/notification-submission.service.ts b/alcs-frontend/src/app/services/notification/notification-submission/notification-submission.service.ts index fade1b19e7..e41fb04a10 100644 --- a/alcs-frontend/src/app/services/notification/notification-submission/notification-submission.service.ts +++ b/alcs-frontend/src/app/services/notification/notification-submission/notification-submission.service.ts @@ -22,6 +22,19 @@ export class NotificationSubmissionService { } } + async setContactEmail(email: string, fileNumber: string): Promise<NotificationSubmissionDetailedDto> { + try { + return firstValueFrom( + this.http.patch<NotificationSubmissionDetailedDto>(`${this.baseUrl}/${fileNumber}`, { + contactEmail: email, + }) + ); + } catch (e) { + this.toastService.showErrorToast('Failed to fetch Notification Submission'); + throw e; + } + } + async setSubmissionStatus(fileNumber: string, statusCode: string): Promise<NotificationSubmissionDto> { try { return firstValueFrom( diff --git a/alcs-frontend/src/app/shared/inline-editors/inline-text/inline-text.component.html b/alcs-frontend/src/app/shared/inline-editors/inline-text/inline-text.component.html index 459ba27e1e..142c0b9f0c 100644 --- a/alcs-frontend/src/app/shared/inline-editors/inline-text/inline-text.component.html +++ b/alcs-frontend/src/app/shared/inline-editors/inline-text/inline-text.component.html @@ -30,7 +30,7 @@ </form> <div class="button-container"> <button mat-button (click)="cancelEdit()">CANCEL</button> - <button mat-button class="save" (click)="confirmEdit()">SAVE</button> + <button mat-button class="save" [disabled]="required && !pendingValue" (click)="confirmEdit()">SAVE</button> </div> </div> </div> diff --git a/alcs-frontend/src/app/shared/inline-editors/inline-text/inline-text.component.ts b/alcs-frontend/src/app/shared/inline-editors/inline-text/inline-text.component.ts index 09aefe8b93..cf659714ba 100644 --- a/alcs-frontend/src/app/shared/inline-editors/inline-text/inline-text.component.ts +++ b/alcs-frontend/src/app/shared/inline-editors/inline-text/inline-text.component.ts @@ -8,6 +8,7 @@ import { AfterContentChecked, Component, ElementRef, EventEmitter, Input, Output export class InlineTextComponent implements AfterContentChecked { @Input() value?: string | undefined; @Input() placeholder: string = 'Enter a value'; + @Input() required = false; @Output() save = new EventEmitter<string | null>(); @ViewChild('editInput') textInput!: ElementRef; diff --git a/services/apps/alcs/src/alcs/notification/notification-submission/notification-submission.controller.spec.ts b/services/apps/alcs/src/alcs/notification/notification-submission/notification-submission.controller.spec.ts index 60fe5763c2..52745f1826 100644 --- a/services/apps/alcs/src/alcs/notification/notification-submission/notification-submission.controller.spec.ts +++ b/services/apps/alcs/src/alcs/notification/notification-submission/notification-submission.controller.spec.ts @@ -93,4 +93,28 @@ describe('NotificationSubmissionController', () => { ); expect(result).toEqual({ url: fakeDownloadUrl }); }); + + it('should call through to service for updating email', async () => { + mockNotificationSubmissionService.getUuid.mockResolvedValue('uuid'); + mockNotificationSubmissionService.update.mockResolvedValue( + new NotificationSubmission(), + ); + mockNotificationSubmissionService.getByFileNumber.mockResolvedValue( + new NotificationSubmission({ + fileNumber: 'fileNumber', + }), + ); + mockNotificationSubmissionService.mapToDetailedDTO.mockResolvedValue( + createMock<NotificationSubmissionDetailedDto>(), + ); + + await controller.update('fileNumber', 'email', { + user: { + entity: new User(), + }, + }); + + expect(mockNotificationSubmissionService.getUuid).toBeCalledTimes(1); + expect(mockNotificationSubmissionService.update).toBeCalledTimes(1); + }); }); diff --git a/services/apps/alcs/src/alcs/notification/notification-submission/notification-submission.controller.ts b/services/apps/alcs/src/alcs/notification/notification-submission/notification-submission.controller.ts index 668aa43308..95fa7a7e96 100644 --- a/services/apps/alcs/src/alcs/notification/notification-submission/notification-submission.controller.ts +++ b/services/apps/alcs/src/alcs/notification/notification-submission/notification-submission.controller.ts @@ -64,4 +64,29 @@ export class NotificationSubmissionController { ); return this.get(fileNumber, req); } + + @UserRoles(...ANY_AUTH_ROLE) + @Patch('/:fileNumber') + async update( + @Param('fileNumber') fileNumber: string, + @Body('contactEmail') contactEmail: string, + @Req() req, + ) { + if (!contactEmail.trim()) { + throw new ServiceValidationException('Email is required'); + } + + const uuid = await this.notificationSubmissionService.getUuid(fileNumber); + if (uuid) { + await this.notificationSubmissionService.update( + uuid, + { + contactEmail, + }, + req.user.entity, + ); + } + + return this.get(fileNumber, req); + } } diff --git a/services/apps/alcs/src/portal/notification-submission/notification-submission.service.spec.ts b/services/apps/alcs/src/portal/notification-submission/notification-submission.service.spec.ts index affe4397ea..3f103961ea 100644 --- a/services/apps/alcs/src/portal/notification-submission/notification-submission.service.spec.ts +++ b/services/apps/alcs/src/portal/notification-submission/notification-submission.service.spec.ts @@ -278,4 +278,30 @@ describe('NotificationSubmissionService', () => { expect(app).toBe(noiSubmission); }); + + it('should call through to the repo for getFileNumber', async () => { + const fileNumber = 'file-number'; + const noiSubmission = new NotificationSubmission({ + fileNumber, + }); + mockRepository.findOne.mockResolvedValue(noiSubmission); + + const res = await service.getFileNumber('uuid'); + + expect(res).toBe(fileNumber); + expect(mockRepository.findOne).toHaveBeenCalledTimes(1); + }); + + it('should call through to the repo for getUuid', async () => { + const uuid = 'uuid'; + const noiSubmission = new NotificationSubmission({ + uuid, + }); + mockRepository.findOne.mockResolvedValue(noiSubmission); + + const res = await service.getUuid('file-number'); + + expect(res).toBe(uuid); + expect(mockRepository.findOne).toHaveBeenCalledTimes(1); + }); }); diff --git a/services/apps/alcs/src/portal/notification-submission/notification-submission.service.ts b/services/apps/alcs/src/portal/notification-submission/notification-submission.service.ts index dfc304e878..ff550de8ab 100644 --- a/services/apps/alcs/src/portal/notification-submission/notification-submission.service.ts +++ b/services/apps/alcs/src/portal/notification-submission/notification-submission.service.ts @@ -169,6 +169,19 @@ export class NotificationSubmissionService { return submission?.fileNumber; } + async getUuid(fileNumber: string) { + const submission = await this.notificationSubmissionRepository.findOne({ + where: { + fileNumber, + }, + select: { + uuid: true, + fileNumber: true, + }, + }); + return submission?.uuid; + } + async getAllByUser(user: User) { const whereClauses = await this.generateWhereClauses({}, user); From 16e1252c9d571c12da40bd2a829a41db61e6c098 Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Tue, 19 Sep 2023 12:12:34 -0700 Subject: [PATCH 404/954] Switch scheduled time from 1 minute to 15 minutes for status email (#986) Switch scheduled time from 1 minute to 15 minutes for status email --- services/apps/alcs/src/queues/scheduler/scheduler.service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/apps/alcs/src/queues/scheduler/scheduler.service.ts b/services/apps/alcs/src/queues/scheduler/scheduler.service.ts index 856cdc258f..390f3c459d 100644 --- a/services/apps/alcs/src/queues/scheduler/scheduler.service.ts +++ b/services/apps/alcs/src/queues/scheduler/scheduler.service.ts @@ -4,7 +4,7 @@ import { Queue } from 'bullmq'; export const MONDAY_TO_FRIDAY_AT_2AM = '0 0 2 * * 1-5'; export const EVERYDAY_MIDNIGHT = '0 0 0 * * *'; -export const EVERY_15_MINUTES_STARTING_FROM_8AM = '0/1 8-23 * * *'; +export const EVERY_15_MINUTES_STARTING_FROM_8AM = '0/15 8-23 * * *'; export const QUEUES = { APP_EXPIRY: 'ApplicationExpiry', From 66927829fa58c651e1c0d382f8286ddd61092013 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Tue, 19 Sep 2023 13:16:07 -0700 Subject: [PATCH 405/954] More SRW Fixes --- .../parcel-entry/parcel-entry.component.html | 2 +- .../proposal/proposal.component.html | 7 +-- .../proposal/proposal.component.scss | 12 +++++ .../proposal/proposal.component.ts | 3 ++ .../notification-details.component.html | 6 +-- .../notification-details.component.scss | 4 ++ .../proposal-details.component.html | 44 +++++++++---------- .../proposal-details.component.scss | 2 + 8 files changed, 50 insertions(+), 30 deletions(-) diff --git a/portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-entry/parcel-entry.component.html b/portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-entry/parcel-entry.component.html index b6a443ab0c..b350bd7891 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-entry/parcel-entry.component.html +++ b/portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-entry/parcel-entry.component.html @@ -2,7 +2,7 @@ <div class="type"> <label>Select ownership type:</label> <div class="subtext"> - The answer to the following question will change the rest of the notice of intent form. Do not change this answer + The answer to the following question will change the rest of the form. Do not change this answer once selected. </div> <mat-button-toggle-group diff --git a/portal-frontend/src/app/features/notifications/edit-submission/proposal/proposal.component.html b/portal-frontend/src/app/features/notifications/edit-submission/proposal/proposal.component.html index 31aff9ecde..9bb9d1c509 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/proposal/proposal.component.html +++ b/portal-frontend/src/app/features/notifications/edit-submission/proposal/proposal.component.html @@ -127,7 +127,7 @@ <h2>Purpose of SRW</h2> </form> <form [formGroup]="surveyForm"> <div class="scrollable"> - <table class='table' mat-table [dataSource]="surveyPlans"> + <table class="table" mat-table [dataSource]="surveyPlans"> <ng-container matColumnDef="fileName"> <th mat-header-cell *matHeaderCellDef>File Name</th> <td mat-cell *matCellDef="let element"> @@ -141,7 +141,7 @@ <h2>Purpose of SRW</h2> <div class="subtext">As listed on the survey plan certification</div> </th> <td mat-cell *matCellDef="let element"> - <mat-form-field appearance="outline"> + <mat-form-field class="full-width" appearance="outline"> <input [formControlName]="element.uuid + '-surveyPlan'" (change)="onChangeSurveyPlan(element.uuid, $event)" @@ -173,8 +173,9 @@ <h2>Purpose of SRW</h2> <div class="subtext">The version of the plan, as listed on the survey plan certification</div> </th> <td mat-cell *matCellDef="let element"> - <mat-form-field appearance="outline"> + <mat-form-field class="full-width" appearance="outline"> <input + class="full-width" [formControlName]="element.uuid + '-control'" (change)="onChangeControlNumber(element.uuid, $event)" id="fileType" diff --git a/portal-frontend/src/app/features/notifications/edit-submission/proposal/proposal.component.scss b/portal-frontend/src/app/features/notifications/edit-submission/proposal/proposal.component.scss index cdabc6eb25..b2d7bdf81a 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/proposal/proposal.component.scss +++ b/portal-frontend/src/app/features/notifications/edit-submission/proposal/proposal.component.scss @@ -13,8 +13,20 @@ section { .table { margin-top: rem(24); + + .mat-mdc-header-cell { + vertical-align: text-top; + } + + td { + padding: rem(12) rem(10); + } } .scrollable { overflow-x: auto; } + +.full-width { + width: 100%; +} diff --git a/portal-frontend/src/app/features/notifications/edit-submission/proposal/proposal.component.ts b/portal-frontend/src/app/features/notifications/edit-submission/proposal/proposal.component.ts index 871b326e3a..a31f03a03b 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/proposal/proposal.component.ts +++ b/portal-frontend/src/app/features/notifications/edit-submission/proposal/proposal.component.ts @@ -87,6 +87,9 @@ export class ProposalComponent extends FilesStepComponent implements OnInit, OnD newForm.addControl(`${file.uuid}-control`, new FormControl(file.controlNumber, [Validators.required])); } this.surveyForm = newForm; + if (this.showErrors) { + this.surveyForm.markAllAsTouched(); + } }); } diff --git a/portal-frontend/src/app/features/notifications/notification-details/notification-details.component.html b/portal-frontend/src/app/features/notifications/notification-details/notification-details.component.html index 71919ab103..b559512d8f 100644 --- a/portal-frontend/src/app/features/notifications/notification-details/notification-details.component.html +++ b/portal-frontend/src/app/features/notifications/notification-details/notification-details.component.html @@ -5,7 +5,7 @@ [showEdit]="showEdit" ></app-parcel> </section> -<h3>2. Identify Transferees</h3> +<h3>2. Identify Transferee(s)</h3> <div *ngIf="notificationSubmission" class="review-table"> <div class="full-width transferee-table"> <div class="subheading2">Type</div> @@ -33,7 +33,7 @@ <h3>2. Identify Transferees</h3> </div> <section> <h3>3. Primary Contact</h3> - <div *ngIf="notificationSubmission" class="review-table"> + <div *ngIf="notificationSubmission" class="review-table other-layout"> <div class="subheading2 grid-1">First Name</div> <div class="grid-double"> {{ notificationSubmission.contactFirstName }} @@ -78,7 +78,7 @@ <h3>3. Primary Contact</h3> </section> <section> <h3>4. Government</h3> - <div *ngIf="notificationSubmission" class="review-table"> + <div *ngIf="notificationSubmission" class="review-table other-layout"> <div class="subheading2 grid-1">Local or First Nation Government</div> <div class="grid-double"> {{ localGovernment?.name }} diff --git a/portal-frontend/src/app/features/notifications/notification-details/notification-details.component.scss b/portal-frontend/src/app/features/notifications/notification-details/notification-details.component.scss index 1c22c1aca0..7ee46e5e9f 100644 --- a/portal-frontend/src/app/features/notifications/notification-details/notification-details.component.scss +++ b/portal-frontend/src/app/features/notifications/notification-details/notification-details.component.scss @@ -97,6 +97,10 @@ word-wrap: break-word; hyphens: auto; + &.other-layout { + grid-template-columns: 1fr 1fr; + } + .edit-button { display: flex; justify-content: center; diff --git a/portal-frontend/src/app/features/notifications/notification-details/proposal-details/proposal-details.component.html b/portal-frontend/src/app/features/notifications/notification-details/proposal-details/proposal-details.component.html index b0bc30d47a..a64742cb94 100644 --- a/portal-frontend/src/app/features/notifications/notification-details/proposal-details/proposal-details.component.html +++ b/portal-frontend/src/app/features/notifications/notification-details/proposal-details/proposal-details.component.html @@ -1,4 +1,4 @@ -<div *ngIf="_notificationSubmission" class="review-table"> +<div *ngIf="_notificationSubmission" class="review-table other-layout"> <div class="subheading2 grid-1">Submitter’s File Number</div> <div class="grid-double"> {{ _notificationSubmission.submittersFileNumber }} @@ -33,29 +33,27 @@ <app-no-data [showRequired]="showErrors" *ngIf="_notificationSubmission.hasSurveyPlan === null"></app-no-data> </div> - <ng-container *ngIf="_notificationSubmission.hasSurveyPlan"> - <div class="survey-table"> - <div><strong>File Name</strong></div> - <div><strong>Survey Plan Number</strong></div> - <div><strong>Control Number</strong></div> - <ng-container *ngFor="let file of surveyPlans"> - <div> - <a (click)="openFile(file.uuid)">{{ file.fileName }}</a> - </div> - <div> - {{ file.surveyPlanNumber }} - <app-no-data [showRequired]="showErrors" *ngIf="file.surveyPlanNumber === null"></app-no-data> - </div> - <div> - {{ file.controlNumber }} - <app-no-data [showRequired]="showErrors" *ngIf="file.controlNumber === null"></app-no-data> - </div> - </ng-container> - <app-no-data [showRequired]="showErrors" *ngIf="surveyPlans.length === 0"></app-no-data> - </div> - </ng-container> + <div *ngIf="_notificationSubmission.hasSurveyPlan" class="survey-table full-width"> + <div><strong>File Name</strong></div> + <div><strong>Survey Plan Number</strong></div> + <div><strong>Control Number</strong></div> + <ng-container *ngFor="let file of surveyPlans"> + <div> + <a (click)="openFile(file.uuid)">{{ file.fileName }}</a> + </div> + <div> + {{ file.surveyPlanNumber }} + <app-no-data [showRequired]="showErrors" *ngIf="file.surveyPlanNumber === null"></app-no-data> + </div> + <div> + {{ file.controlNumber }} + <app-no-data [showRequired]="showErrors" *ngIf="file.controlNumber === null"></app-no-data> + </div> + </ng-container> + <app-no-data [showRequired]="showErrors" *ngIf="surveyPlans.length === 0"></app-no-data> + </div> - <div *ngIf="showEdit" class="edit-button"> + <div *ngIf="showEdit" class="edit-button full-width"> <button mat-flat-button (click)="onEditSection(4)" color="accent">Edit Section</button> </div> </div> diff --git a/portal-frontend/src/app/features/notifications/notification-details/proposal-details/proposal-details.component.scss b/portal-frontend/src/app/features/notifications/notification-details/proposal-details/proposal-details.component.scss index 8ce457dba6..28a051e6eb 100644 --- a/portal-frontend/src/app/features/notifications/notification-details/proposal-details/proposal-details.component.scss +++ b/portal-frontend/src/app/features/notifications/notification-details/proposal-details/proposal-details.component.scss @@ -5,4 +5,6 @@ grid-column-gap: rem(16); grid-row-gap: rem(8); grid-template-columns: max-content max-content max-content; + overflow-x: auto; + grid-column: 1/3; } From 4a039f03a264db14489f9e3c67125bec7078e17d Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Tue, 19 Sep 2023 13:59:55 -0700 Subject: [PATCH 406/954] manually clear repeatable jobs (#988) introduce method to manually clear repeatable jobs --- .../scheduler/scheduler.service.spec.ts | 19 ++++++++----- .../src/queues/scheduler/scheduler.service.ts | 27 ++++++++++++------- 2 files changed, 30 insertions(+), 16 deletions(-) diff --git a/services/apps/alcs/src/queues/scheduler/scheduler.service.spec.ts b/services/apps/alcs/src/queues/scheduler/scheduler.service.spec.ts index 2d6edada8c..e1ceccb46a 100644 --- a/services/apps/alcs/src/queues/scheduler/scheduler.service.spec.ts +++ b/services/apps/alcs/src/queues/scheduler/scheduler.service.spec.ts @@ -20,25 +20,26 @@ describe('SchedulerService', () => { mockAppExpiryQueue = { add: jest.fn(), process: jest.fn(), - drain: jest.fn(), + getRepeatableJobs: jest.fn().mockResolvedValue([]), }; mockNotificationCleanUpQueue = { add: jest.fn(), process: jest.fn(), drain: jest.fn(), + getRepeatableJobs: jest.fn().mockResolvedValue([]), }; mockApplicationStatusEmailsQueue = { add: jest.fn(), process: jest.fn(), - drain: jest.fn(), + getRepeatableJobs: jest.fn().mockResolvedValue([]), }; mockNoticeOfIntentStatusEmailsQueue = { add: jest.fn(), process: jest.fn(), - drain: jest.fn(), + getRepeatableJobs: jest.fn().mockResolvedValue([]), }; const module: TestingModule = await Test.createTestingModule({ @@ -80,7 +81,7 @@ describe('SchedulerService', () => { //Job Disabled for now // it('should call add for scheduleApplicationExpiry', async () => { // await schedulerService.setup(); - // expect(mockAppExpiryQueue.drain).toBeCalledTimes(1); + // expect(mockAppExpiryQueue.getRepeatableJobs).toBeCalledTimes(1); // expect(mockAppExpiryQueue.add).toBeCalledTimes(1); // expect(mockAppExpiryQueue.add).toBeCalledWith( // 'applicationExpiry' @@ -91,7 +92,7 @@ describe('SchedulerService', () => { it('should call add for notification cleanup', async () => { await schedulerService.setup(); - expect(mockNotificationCleanUpQueue.drain).toBeCalledTimes(1); + expect(mockNotificationCleanUpQueue.getRepeatableJobs).toBeCalledTimes(1); expect(mockNotificationCleanUpQueue.add).toBeCalledTimes(1); expect(mockNotificationCleanUpQueue.add).toBeCalledWith( 'cleanupNotifications', @@ -102,7 +103,9 @@ describe('SchedulerService', () => { it('should call add for application status email', async () => { await schedulerService.setup(); - expect(mockApplicationStatusEmailsQueue.drain).toBeCalledTimes(1); + expect(mockApplicationStatusEmailsQueue.getRepeatableJobs).toBeCalledTimes( + 1, + ); expect(mockApplicationStatusEmailsQueue.add).toBeCalledTimes(1); expect(mockApplicationStatusEmailsQueue.add).toBeCalledWith( 'applicationSubmissionStatusEmails', @@ -113,7 +116,9 @@ describe('SchedulerService', () => { it('should call add for notice of intent status email', async () => { await schedulerService.setup(); - expect(mockNoticeOfIntentStatusEmailsQueue.drain).toBeCalledTimes(1); + expect( + mockNoticeOfIntentStatusEmailsQueue.getRepeatableJobs, + ).toBeCalledTimes(1); expect(mockNoticeOfIntentStatusEmailsQueue.add).toBeCalledTimes(1); expect(mockNoticeOfIntentStatusEmailsQueue.add).toBeCalledWith( 'noticeOfIntentSubmissionStatusEmails', diff --git a/services/apps/alcs/src/queues/scheduler/scheduler.service.ts b/services/apps/alcs/src/queues/scheduler/scheduler.service.ts index 390f3c459d..82a3400ddb 100644 --- a/services/apps/alcs/src/queues/scheduler/scheduler.service.ts +++ b/services/apps/alcs/src/queues/scheduler/scheduler.service.ts @@ -20,14 +20,15 @@ export class SchedulerService { @InjectQueue(QUEUES.CLEANUP_NOTIFICATIONS) private cleanupNotificationsQueue: Queue, @InjectQueue(QUEUES.APPLICATION_STATUS_EMAILS) - private applicationSubmissionStatusEmails: Queue, + private applicationSubmissionStatusEmailsQueue: Queue, @InjectQueue(QUEUES.NOTICE_OF_INTENTS_STATUS_EMAILS) - private noticeOfIntentSubmissionStatusEmails: Queue, + private noticeOfIntentSubmissionStatusEmailsQueue: Queue, ) {} async setup() { //Job Disabled, clean queue but don't schedule it - await this.applicationExpiryQueue.drain(); + // TODO remove this once job is enabled + await this.removeRepeatJobs(this.applicationExpiryQueue); // await this.scheduleApplicationExpiry(); await this.scheduleCleanupNotifications(); @@ -36,7 +37,7 @@ export class SchedulerService { } private async scheduleApplicationExpiry() { - await this.applicationExpiryQueue.drain(); + await this.removeRepeatJobs(this.applicationExpiryQueue); await this.applicationExpiryQueue.add( 'applicationExpiry', {}, @@ -47,7 +48,7 @@ export class SchedulerService { } private async scheduleCleanupNotifications() { - await this.cleanupNotificationsQueue.drain(); + await this.removeRepeatJobs(this.cleanupNotificationsQueue); await this.cleanupNotificationsQueue.add( 'cleanupNotifications', {}, @@ -58,8 +59,8 @@ export class SchedulerService { } private async scheduleSubmissionEmails() { - await this.applicationSubmissionStatusEmails.drain(); - await this.applicationSubmissionStatusEmails.add( + await this.removeRepeatJobs(this.applicationSubmissionStatusEmailsQueue); + await this.applicationSubmissionStatusEmailsQueue.add( 'applicationSubmissionStatusEmails', {}, { @@ -67,11 +68,19 @@ export class SchedulerService { }, ); - await this.noticeOfIntentSubmissionStatusEmails.drain(); - await this.noticeOfIntentSubmissionStatusEmails.add( + await this.removeRepeatJobs(this.noticeOfIntentSubmissionStatusEmailsQueue); + await this.noticeOfIntentSubmissionStatusEmailsQueue.add( 'noticeOfIntentSubmissionStatusEmails', {}, { repeat: { pattern: EVERY_15_MINUTES_STARTING_FROM_8AM } }, ); } + + private async removeRepeatJobs(queue: Queue) { + const repeatJobs = await queue.getRepeatableJobs(); + + repeatJobs.forEach(async (job) => { + await queue.removeRepeatableByKey(job.key); + }); + } } From 48b1e94111df3511ba00a0770b89570b458dd0bc Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Tue, 19 Sep 2023 14:44:14 -0700 Subject: [PATCH 407/954] Add nice confirmation modal for changing survey plans --- .../edit-submission/edit-submission.module.ts | 2 ++ ...ey-plan-confirmation-dialog.component.html | 13 ++++++++++ ...ey-plan-confirmation-dialog.component.scss | 24 +++++++++++++++++++ ...plan-confirmation-dialog.component.spec.ts | 24 +++++++++++++++++++ ...rvey-plan-confirmation-dialog.component.ts | 8 +++++++ .../proposal/proposal.component.ts | 9 ++++--- 6 files changed, 75 insertions(+), 5 deletions(-) create mode 100644 portal-frontend/src/app/features/notifications/edit-submission/proposal/change-survey-plan-confirmation-dialog/change-survey-plan-confirmation-dialog.component.html create mode 100644 portal-frontend/src/app/features/notifications/edit-submission/proposal/change-survey-plan-confirmation-dialog/change-survey-plan-confirmation-dialog.component.scss create mode 100644 portal-frontend/src/app/features/notifications/edit-submission/proposal/change-survey-plan-confirmation-dialog/change-survey-plan-confirmation-dialog.component.spec.ts create mode 100644 portal-frontend/src/app/features/notifications/edit-submission/proposal/change-survey-plan-confirmation-dialog/change-survey-plan-confirmation-dialog.component.ts diff --git a/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.module.ts b/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.module.ts index 392cc81f59..cc8724ab2c 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.module.ts +++ b/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.module.ts @@ -15,6 +15,7 @@ import { ParcelDetailsComponent } from './parcels/parcel-details.component'; import { ParcelEntryConfirmationDialogComponent } from './parcels/parcel-entry/parcel-entry-confirmation-dialog/parcel-entry-confirmation-dialog.component'; import { ParcelEntryComponent } from './parcels/parcel-entry/parcel-entry.component'; import { PrimaryContactComponent } from './primary-contact/primary-contact.component'; +import { ChangeSurveyPlanConfirmationDialogComponent } from './proposal/change-survey-plan-confirmation-dialog/change-survey-plan-confirmation-dialog.component'; import { ProposalComponent } from './proposal/proposal.component'; import { ReviewAndSubmitComponent } from './review-and-submit/review-and-submit.component'; import { SubmitConfirmationDialogComponent } from './review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component'; @@ -52,6 +53,7 @@ const routes: Routes = [ OtherAttachmentsComponent, ReviewAndSubmitComponent, SubmitConfirmationDialogComponent, + ChangeSurveyPlanConfirmationDialogComponent, ], imports: [ CommonModule, diff --git a/portal-frontend/src/app/features/notifications/edit-submission/proposal/change-survey-plan-confirmation-dialog/change-survey-plan-confirmation-dialog.component.html b/portal-frontend/src/app/features/notifications/edit-submission/proposal/change-survey-plan-confirmation-dialog/change-survey-plan-confirmation-dialog.component.html new file mode 100644 index 0000000000..a08e419468 --- /dev/null +++ b/portal-frontend/src/app/features/notifications/edit-submission/proposal/change-survey-plan-confirmation-dialog/change-survey-plan-confirmation-dialog.component.html @@ -0,0 +1,13 @@ +<div mat-dialog-title> + <h4>Is there a survey plan associated with the SRW?</h4> +</div> + +<div mat-dialog-content class="content"> + <app-warning-banner> + <b>Warning:</b> Changing this answer will remove the uploaded survey plans. <br /> + </app-warning-banner> + <div class="controls"> + <button mat-stroked-button color="primary" [mat-dialog-close]="false">cancel</button> + <button mat-flat-button color="primary" [mat-dialog-close]="true">continue</button> + </div> +</div> diff --git a/portal-frontend/src/app/features/notifications/edit-submission/proposal/change-survey-plan-confirmation-dialog/change-survey-plan-confirmation-dialog.component.scss b/portal-frontend/src/app/features/notifications/edit-submission/proposal/change-survey-plan-confirmation-dialog/change-survey-plan-confirmation-dialog.component.scss new file mode 100644 index 0000000000..3c8856955f --- /dev/null +++ b/portal-frontend/src/app/features/notifications/edit-submission/proposal/change-survey-plan-confirmation-dialog/change-survey-plan-confirmation-dialog.component.scss @@ -0,0 +1,24 @@ +@use '../../../../../../styles/functions' as *; + +.margin-bottom-1 { + margin-bottom: rem(16); +} + +.controls { + display: flex; + justify-content: space-between; +} + +.confirm-content { + margin: rem(24) 0; +} + +@media screen and (min-width: $desktopBreakpoint) { + .controls { + justify-content: flex-end; + + button { + margin-left: rem(25) !important; + } + } +} diff --git a/portal-frontend/src/app/features/notifications/edit-submission/proposal/change-survey-plan-confirmation-dialog/change-survey-plan-confirmation-dialog.component.spec.ts b/portal-frontend/src/app/features/notifications/edit-submission/proposal/change-survey-plan-confirmation-dialog/change-survey-plan-confirmation-dialog.component.spec.ts new file mode 100644 index 0000000000..eb9351819b --- /dev/null +++ b/portal-frontend/src/app/features/notifications/edit-submission/proposal/change-survey-plan-confirmation-dialog/change-survey-plan-confirmation-dialog.component.spec.ts @@ -0,0 +1,24 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { MatDialogRef } from '@angular/material/dialog'; + +import { ChangeSurveyPlanConfirmationDialogComponent } from './change-survey-plan-confirmation-dialog.component'; + +describe('ChangeSurveyPlanConfirmationDialogComponent', () => { + let component: ChangeSurveyPlanConfirmationDialogComponent; + let fixture: ComponentFixture<ChangeSurveyPlanConfirmationDialogComponent>; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ChangeSurveyPlanConfirmationDialogComponent], + providers: [{ provide: MatDialogRef, useValue: {} }], + }).compileComponents(); + + fixture = TestBed.createComponent(ChangeSurveyPlanConfirmationDialogComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/notifications/edit-submission/proposal/change-survey-plan-confirmation-dialog/change-survey-plan-confirmation-dialog.component.ts b/portal-frontend/src/app/features/notifications/edit-submission/proposal/change-survey-plan-confirmation-dialog/change-survey-plan-confirmation-dialog.component.ts new file mode 100644 index 0000000000..9e4b63dab1 --- /dev/null +++ b/portal-frontend/src/app/features/notifications/edit-submission/proposal/change-survey-plan-confirmation-dialog/change-survey-plan-confirmation-dialog.component.ts @@ -0,0 +1,8 @@ +import { Component } from '@angular/core'; + +@Component({ + selector: 'app-delete-structure-confirmation-dialog', + templateUrl: './change-survey-plan-confirmation-dialog.component.html', + styleUrls: ['./change-survey-plan-confirmation-dialog.component.scss'], +}) +export class ChangeSurveyPlanConfirmationDialogComponent {} diff --git a/portal-frontend/src/app/features/notifications/edit-submission/proposal/proposal.component.ts b/portal-frontend/src/app/features/notifications/edit-submission/proposal/proposal.component.ts index a31f03a03b..28971fe241 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/proposal/proposal.component.ts +++ b/portal-frontend/src/app/features/notifications/edit-submission/proposal/proposal.component.ts @@ -16,6 +16,7 @@ import { formatBooleanToString } from '../../../../shared/utils/boolean-helper'; import { parseStringToBoolean } from '../../../../shared/utils/string-helper'; import { EditNotificationSteps } from '../edit-submission.component'; import { FilesStepComponent } from '../files-step.partial'; +import { ChangeSurveyPlanConfirmationDialogComponent } from './change-survey-plan-confirmation-dialog/change-survey-plan-confirmation-dialog.component'; @Component({ selector: 'app-proposal', @@ -51,7 +52,6 @@ export class ProposalComponent extends FilesStepComponent implements OnInit, OnD private router: Router, private notificationSubmissionService: NotificationSubmissionService, notificationDocumentService: NotificationDocumentService, - private confirmationDialogService: ConfirmationDialogService, dialog: MatDialog ) { super(notificationDocumentService, dialog); @@ -127,10 +127,9 @@ export class ProposalComponent extends FilesStepComponent implements OnInit, OnD onChangeHasSurveyPlan(selectedValue: string) { if (selectedValue === 'false' && this.surveyPlans.length > 0) { - this.confirmationDialogService - .openDialog({ - body: 'Warning: Changing this answer will remove the uploaded survey plans.', - }) + this.dialog + .open(ChangeSurveyPlanConfirmationDialogComponent) + .beforeClosed() .subscribe(async (didConfirm) => { if (didConfirm) { for (const file of this.surveyPlans) { From bd83d1dd7ac464ef847ff74d554061424adb47cf Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Tue, 19 Sep 2023 16:01:50 -0700 Subject: [PATCH 408/954] Add Other Structures to NOI Step 6 and Subtypes --- .../additional-information.component.html | 8 ++ .../additional-information.component.ts | 45 ++++----- .../preparation/preparation.component.ts | 7 ++ .../notice-of-intent/notice-of-intent.dto.ts | 2 + .../notice-of-intent.service.ts | 2 +- .../additional-information.component.html | 39 ++++++-- .../additional-information.component.ts | 61 ++++++++---- .../additional-information.component.html | 13 +++ .../additional-information.component.ts | 44 ++++----- .../notice-of-intent-submission.dto.ts | 2 + .../notice-of-intent.service.spec.ts | 10 +- .../notice-of-intent.service.ts | 94 +++---------------- .../notice-of-intent-submission.dto.ts | 7 ++ .../notice-of-intent-submission.entity.ts | 34 +++---- ...otice-of-intent-submission.service.spec.ts | 22 ++--- .../notice-of-intent-submission.service.ts | 66 +++---------- .../1695160393900-add_soil_other_reason.ts | 23 +++++ 17 files changed, 231 insertions(+), 248 deletions(-) create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1695160393900-add_soil_other_reason.ts diff --git a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/additional-information/additional-information.component.html b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/additional-information/additional-information.component.html index c724236e7a..beb1db4deb 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/additional-information/additional-information.component.html +++ b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/additional-information/additional-information.component.html @@ -62,6 +62,14 @@ </div> </ng-container> + <ng-container *ngIf="isSoilOtherStructureUseReasonVisible"> + <div class="subheading2 grid-1">Describe the intended use of the 'Other' structure</div> + <div class="grid-double"> + {{ _noiSubmission.soilStructureOtherUseReason }} + <app-no-data *ngIf="!_noiSubmission.soilStructureOtherUseReason"></app-no-data> + </div> + </ng-container> + <div class="subheading2 grid-1">Detailed Building Plan(s)</div> <div class="grid-double multiple-documents"> <a *ngFor="let file of buildingPlans" (click)="openFile(file)"> diff --git a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/additional-information/additional-information.component.ts b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/additional-information/additional-information.component.ts index 36a3461148..26affab7bd 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/additional-information/additional-information.component.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/additional-information/additional-information.component.ts @@ -20,9 +20,20 @@ export class AdditionalInformationComponent { @Input() set noiSubmission(noiSubmission: NoticeOfIntentSubmissionDetailedDto | undefined) { if (noiSubmission) { this._noiSubmission = noiSubmission; - this.setVisibilityAndValidatorsForResidentialFields(); - this.setVisibilityAndValidatorsForAccessoryFields(); - this.setVisibilityAndValidatorsForFarmFields(); + + this.isSoilStructureResidentialUseReasonVisible = !!this._noiSubmission?.soilProposedStructures.some( + (structure) => structure.type && RESIDENTIAL_STRUCTURE_TYPES.includes(structure.type) + ); + + this.isSoilStructureResidentialAccessoryUseReasonVisible = !!this._noiSubmission?.soilProposedStructures.some( + (structure) => structure.type === STRUCTURE_TYPES.ACCESSORY_STRUCTURE + ); + + this.isSoilOtherStructureUseReasonVisible = !!this._noiSubmission?.soilProposedStructures.some( + (structure) => structure.type === STRUCTURE_TYPES.OTHER + ); + + this.setVisibilityForFarmFields(); this.setFirstQuestion(noiSubmission); } } @@ -38,34 +49,11 @@ export class AdditionalInformationComponent { isSoilStructureResidentialUseReasonVisible = false; isSoilAgriParcelActivityVisible = false; isSoilStructureResidentialAccessoryUseReasonVisible = false; + isSoilOtherStructureUseReasonVisible = false; constructor(private router: Router, private noticeOfIntentDocumentService: NoiDocumentService) {} - private setVisibilityAndValidatorsForResidentialFields() { - if ( - this._noiSubmission?.soilProposedStructures.some( - (structure) => structure.type && RESIDENTIAL_STRUCTURE_TYPES.includes(structure.type) - ) - ) { - this.isSoilStructureResidentialUseReasonVisible = true; - } else { - this.isSoilStructureResidentialUseReasonVisible = false; - } - } - - private setVisibilityAndValidatorsForAccessoryFields() { - if ( - this._noiSubmission?.soilProposedStructures.some( - (structure) => structure.type === STRUCTURE_TYPES.ACCESSORY_STRUCTURE - ) - ) { - this.isSoilStructureResidentialAccessoryUseReasonVisible = true; - } else { - this.isSoilStructureResidentialAccessoryUseReasonVisible = false; - } - } - - private setVisibilityAndValidatorsForFarmFields() { + private setVisibilityForFarmFields() { if ( this._noiSubmission?.soilProposedStructures.some((structure) => structure.type === STRUCTURE_TYPES.FARM_STRUCTURE) ) { @@ -76,6 +64,7 @@ export class AdditionalInformationComponent { this.isSoilStructureFarmUseReasonVisible = false; } } + async openFile(file: NoticeOfIntentDocumentDto) { await this.noticeOfIntentDocumentService.download(file.uuid, file.fileName); } diff --git a/alcs-frontend/src/app/features/notice-of-intent/proposal/preparation/preparation.component.ts b/alcs-frontend/src/app/features/notice-of-intent/proposal/preparation/preparation.component.ts index 6e1b8ea947..e07376217b 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/proposal/preparation/preparation.component.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/proposal/preparation/preparation.component.ts @@ -107,6 +107,13 @@ export class PreparationComponent implements OnInit { return true; } + const isOther = + submission.soilProposedStructures?.some((struct) => struct.type === STRUCTURE_TYPES.OTHER) && + subtype.code === 'OTHR'; + if (isOther) { + return true; + } + if (submission.soilIsAreaWideFilling && subtype.code === 'ARWF') { return true; } diff --git a/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent.dto.ts b/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent.dto.ts index a04374f568..36129c5d8d 100644 --- a/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent.dto.ts +++ b/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent.dto.ts @@ -210,6 +210,7 @@ export interface NoticeOfIntentSubmissionDetailedDto extends NoticeOfIntentSubmi soilStructureResidentialUseReason?: string | null; soilAgriParcelActivity?: string | null; soilStructureResidentialAccessoryUseReason?: string | null; + soilStructureOtherUseReason?: string | null; soilProposedStructures: ProposedStructure[]; } @@ -273,6 +274,7 @@ export enum STRUCTURE_TYPES { PRINCIPAL_RESIDENCE = 'Residential - Principal Residence', ADDITIONAL_RESIDENCE = 'Residential - Additional Residence', ACCESSORY_STRUCTURE = 'Residential - Accessory Structure', + OTHER = 'Other Structure', } export interface NoticeOfIntentOwnerDto { diff --git a/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent.service.ts b/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent.service.ts index 2a804c395b..0a28dde1b5 100644 --- a/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent.service.ts +++ b/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent.service.ts @@ -70,7 +70,7 @@ export class NoticeOfIntentService { return await firstValueFrom(this.http.post<NoticeOfIntentDto>(`${this.url}/${fileNumber}`, updateDto)); } catch (e) { console.error(e); - this.toastService.showErrorToast('Failed to create Notice of Intent'); + this.toastService.showErrorToast('Failed to update Notice of Intent'); return undefined; } } diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component.html index d7927cab2d..1672f5bdda 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component.html @@ -66,7 +66,7 @@ <h2>Additional Proposal Information</h2> <ng-container *ngIf="confirmRemovalOfSoil"> <div class="form-row"> <div class="full-row"> - <form [formGroup]="lotsForm"> + <form [formGroup]="structuresForm"> <label>Provide the total floor area (m<sup>2</sup>) of the proposed structure(s) </label> <table mat-table [dataSource]="structuresSource"> <ng-container matColumnDef="index"> @@ -91,13 +91,13 @@ <h2>Additional Proposal Information</h2> </mat-form-field> <div *ngIf=" - lotsForm.controls[i + '-type']!.invalid && - (lotsForm.controls[i + '-type']!.dirty || lotsForm.controls[i + '-type']!.touched) + structuresForm.controls[i + '-type']!.invalid && + (structuresForm.controls[i + '-type']!.dirty || structuresForm.controls[i + '-type']!.touched) " class="field-error" > <mat-icon>warning</mat-icon> - <div *ngIf="lotsForm.controls[i + '-type']!.errors?.['required']">This field is required</div> + <div *ngIf="structuresForm.controls[i + '-type']!.errors?.['required']">This field is required</div> </div> </td> </ng-container> @@ -120,13 +120,13 @@ <h2>Additional Proposal Information</h2> </mat-form-field> <div *ngIf=" - lotsForm.controls[i + '-area']!.invalid && - (lotsForm.controls[i + '-area']!.dirty || lotsForm.controls[i + '-area']!.touched) + structuresForm.controls[i + '-area']!.invalid && + (structuresForm.controls[i + '-area']!.dirty || structuresForm.controls[i + '-area']!.touched) " class="field-error" > <mat-icon>warning</mat-icon> - <div *ngIf="lotsForm.controls[i + '-area']!.errors?.['required']">This field is required</div> + <div *ngIf="structuresForm.controls[i + '-area']!.errors?.['required']">This field is required</div> </div> </td> </ng-container> @@ -275,6 +275,31 @@ <h2>Additional Proposal Information</h2> <div class="subtext">Characters left: {{ 4000 - structureResidentialAccessoryUseReasonText.textLength }}</div> </div> + <div class="full-row" *ngIf="isSoilOtherUseReasonVisible"> + <label for="soilStructureOtherUseReason"> Describe the intended use of the 'Other' structure </label> + <mat-form-field appearance="outline"> + <textarea + formControlName="soilStructureOtherUseReason" + #soilStructureOtherUseReasonText + maxlength="4000" + id="soilStructureOtherUseReason" + matInput + placeholder="Type comment" + ></textarea> + </mat-form-field> + <div + *ngIf=" + soilStructureOtherUseReason.invalid && + (soilStructureOtherUseReason.dirty || soilStructureOtherUseReason.touched) + " + class="field-error" + > + <mat-icon>warning</mat-icon> + <div *ngIf="soilStructureOtherUseReason.errors?.['required']">This field is required</div> + </div> + <div class="subtext">Characters left: {{ 4000 - soilStructureOtherUseReasonText.textLength }}</div> + </div> + <div class="full-row"> <label class="subheading2" for="detailed-building-plans">Detailed Building Plan(s)</label> <div class="subtext"> diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component.ts index af693624ed..7bf7be6e72 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component.ts @@ -24,6 +24,7 @@ export enum STRUCTURE_TYPES { PRINCIPAL_RESIDENCE = 'Residential - Principal Residence', ADDITIONAL_RESIDENCE = 'Residential - Additional Residence', ACCESSORY_STRUCTURE = 'Residential - Accessory Structure', + OTHER_STRUCTURE = 'Other Structure', } type FormProposedStructure = { type: STRUCTURE_TYPES | null; area: string | null }; @@ -48,6 +49,7 @@ export class AdditionalInformationComponent extends FilesStepComponent implement STRUCTURE_TYPES.PRINCIPAL_RESIDENCE, STRUCTURE_TYPES.ADDITIONAL_RESIDENCE, STRUCTURE_TYPES.ACCESSORY_STRUCTURE, + STRUCTURE_TYPES.OTHER_STRUCTURE, ]; private submissionUuid = ''; @@ -63,12 +65,14 @@ export class AdditionalInformationComponent extends FilesStepComponent implement isSoilStructureResidentialUseReasonVisible = false; isSoilAgriParcelActivityVisible = false; isSoilStructureResidentialAccessoryUseReasonVisible = false; + isSoilOtherUseReasonVisible = false; isRemovingSoilForNewStructure = new FormControl<string | null>(null, [Validators.required]); soilStructureFarmUseReason = new FormControl<string | null>(null); soilStructureResidentialUseReason = new FormControl<string | null>(null); soilAgriParcelActivity = new FormControl<string | null>(null); soilStructureResidentialAccessoryUseReason = new FormControl<string | null>(null); + soilStructureOtherUseReason = new FormControl<string | null>(null); form = new FormGroup({ isRemovingSoilForNewStructure: this.isRemovingSoilForNewStructure, @@ -76,9 +80,10 @@ export class AdditionalInformationComponent extends FilesStepComponent implement soilStructureResidentialUseReason: this.soilStructureResidentialUseReason, soilAgriParcelActivity: this.soilAgriParcelActivity, soilStructureResidentialAccessoryUseReason: this.soilStructureResidentialAccessoryUseReason, + soilStructureOtherUseReason: this.soilStructureOtherUseReason, }); - lotsForm = new FormGroup({} as any); + structuresForm = new FormGroup({} as any); firstQuestion: string = 'FIX THIS'; @@ -118,6 +123,7 @@ export class AdditionalInformationComponent extends FilesStepComponent implement soilStructureResidentialUseReason: noiSubmission.soilStructureResidentialUseReason, soilAgriParcelActivity: noiSubmission.soilAgriParcelActivity, soilStructureResidentialAccessoryUseReason: noiSubmission.soilStructureResidentialAccessoryUseReason, + soilStructureOtherUseReason: noiSubmission.soilStructureOtherUseReason, }); this.proposedStructures = noiSubmission.soilProposedStructures.map((structure) => ({ @@ -130,13 +136,13 @@ export class AdditionalInformationComponent extends FilesStepComponent implement newForm.addControl(`${index}-type`, new FormControl(lot.type, [Validators.required])); newForm.addControl(`${index}-area`, new FormControl(lot.area, [Validators.required])); } - this.lotsForm = newForm; + this.structuresForm = newForm; this.structuresSource = new MatTableDataSource(this.proposedStructures); this.prepareStructureSpecificTextInputs(); if (this.showErrors) { - this.lotsForm.markAllAsTouched(); + this.structuresForm.markAllAsTouched(); this.form.markAllAsTouched(); } } @@ -151,6 +157,7 @@ export class AdditionalInformationComponent extends FilesStepComponent implement this.setVisibilityAndValidatorsForFarmFields(); this.setVisibilityAndValidatorsForAccessoryFields(); this.setVisibilityAndValidatorsForResidentialFields(); + this.setVisibilityAndValidatorsForOtherFields(); } private setVisibilityAndValidatorsForResidentialFields() { @@ -168,6 +175,20 @@ export class AdditionalInformationComponent extends FilesStepComponent implement } } + private setVisibilityAndValidatorsForOtherFields() { + const hasOtherStructure = this.proposedStructures.some( + (structure) => structure.type && structure.type === STRUCTURE_TYPES.OTHER_STRUCTURE + ); + if (hasOtherStructure) { + this.isSoilOtherUseReasonVisible = true; + this.setRequired(this.soilStructureOtherUseReason); + } else { + this.isSoilOtherUseReasonVisible = false; + this.soilStructureOtherUseReason.removeValidators([Validators.required]); + this.soilStructureOtherUseReason.reset(); + } + } + private setVisibilityAndValidatorsForAccessoryFields() { if (this.proposedStructures.some((structure) => structure.type === STRUCTURE_TYPES.ACCESSORY_STRUCTURE)) { this.isSoilStructureResidentialAccessoryUseReasonVisible = true; @@ -200,17 +221,18 @@ export class AdditionalInformationComponent extends FilesStepComponent implement } protected async save(): Promise<void> { - if (this.fileId && (this.form.dirty || this.lotsForm.dirty)) { - const isRemovingSoilForNewStructure = this.isRemovingSoilForNewStructure.getRawValue(); - const soilStructureFarmUseReason = this.soilStructureFarmUseReason.getRawValue(); - const soilStructureResidentialUseReason = this.soilStructureResidentialUseReason.getRawValue(); - const soilAgriParcelActivity = this.soilAgriParcelActivity.getRawValue(); - const soilStructureResidentialAccessoryUseReason = this.soilStructureResidentialAccessoryUseReason.getRawValue(); + if (this.fileId && (this.form.dirty || this.structuresForm.dirty)) { + const isRemovingSoilForNewStructure = this.isRemovingSoilForNewStructure.value; + const soilStructureFarmUseReason = this.soilStructureFarmUseReason.value; + const soilStructureResidentialUseReason = this.soilStructureResidentialUseReason.value; + const soilAgriParcelActivity = this.soilAgriParcelActivity.value; + const soilStructureResidentialAccessoryUseReason = this.soilStructureResidentialAccessoryUseReason.value; + const soilStructureOtherUseReason = this.soilStructureOtherUseReason.value; const updatedStructures: ProposedStructure[] = []; for (const [index, lot] of this.proposedStructures.entries()) { - const lotType = this.lotsForm.controls[`${index}-type`].value; - const lotArea = this.lotsForm.controls[`${index}-area`].value; + const lotType = this.structuresForm.controls[`${index}-type`].value; + const lotArea = this.structuresForm.controls[`${index}-area`].value; updatedStructures.push({ type: lotType, area: lotArea ? parseFloat(lotArea) : null, @@ -223,6 +245,7 @@ export class AdditionalInformationComponent extends FilesStepComponent implement soilIsRemovingSoilForNewStructure: parseStringToBoolean(isRemovingSoilForNewStructure), soilAgriParcelActivity, soilStructureResidentialAccessoryUseReason, + soilStructureOtherUseReason, soilProposedStructures: updatedStructures, }; @@ -286,9 +309,9 @@ export class AdditionalInformationComponent extends FilesStepComponent implement private deleteStructure(index: number) { const deletedStructure: FormProposedStructure = this.proposedStructures.splice(index, 1)[0]; this.structuresSource = new MatTableDataSource(this.proposedStructures); - this.lotsForm.removeControl(`${index}-type`); - this.lotsForm.removeControl(`${index}-area`); - this.lotsForm.markAsDirty(); + this.structuresForm.removeControl(`${index}-type`); + this.structuresForm.removeControl(`${index}-area`); + this.structuresForm.markAsDirty(); if (deletedStructure.type === STRUCTURE_TYPES.FARM_STRUCTURE) { this.setVisibilityAndValidatorsForFarmFields(); @@ -301,6 +324,10 @@ export class AdditionalInformationComponent extends FilesStepComponent implement if (deletedStructure.type && RESIDENTIAL_STRUCTURE_TYPES.includes(deletedStructure.type)) { this.setVisibilityAndValidatorsForResidentialFields(); } + + if (deletedStructure.type === STRUCTURE_TYPES.OTHER_STRUCTURE) { + this.setVisibilityAndValidatorsForOtherFields(); + } } onStructureAdd() { @@ -308,9 +335,9 @@ export class AdditionalInformationComponent extends FilesStepComponent implement this.structuresSource = new MatTableDataSource(this.proposedStructures); const index = this.proposedStructures.length - 1; - this.lotsForm.addControl(`${index}-type`, new FormControl(null, [Validators.required])); - this.lotsForm.addControl(`${index}-area`, new FormControl(null, [Validators.required])); - this.lotsForm.markAsDirty(); + this.structuresForm.addControl(`${index}-type`, new FormControl(null, [Validators.required])); + this.structuresForm.addControl(`${index}-area`, new FormControl(null, [Validators.required])); + this.structuresForm.markAsDirty(); } private setRequired(formControl: FormControl<any>) { diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/additional-information/additional-information.component.html b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/additional-information/additional-information.component.html index 431948076b..456ff7dd3e 100644 --- a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/additional-information/additional-information.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/additional-information/additional-information.component.html @@ -92,6 +92,19 @@ </div> </ng-container> + <ng-container *ngIf="isSoilOtherStructureVisible"> + <div class="subheading2 grid-1"> + Describe the intended use of the 'Other' structure + <app-updated-banner + *ngIf="updatedFields.includes('soilStructureResidentialAccessoryUseReason')" + ></app-updated-banner> + </div> + <div class="grid-double"> + {{ _noiSubmission.soilStructureOtherUseReason }} + <app-no-data [showRequired]="showErrors" *ngIf="!_noiSubmission.soilStructureOtherUseReason"></app-no-data> + </div> + </ng-container> + <div class="subheading2 grid-1">Detailed Building Plan(s)</div> <div class="grid-double multiple-documents"> <a *ngFor="let file of buildingPlans" (click)="openFile(file.uuid)"> diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/additional-information/additional-information.component.ts b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/additional-information/additional-information.component.ts index faf1357816..c6c651ca37 100644 --- a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/additional-information/additional-information.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/additional-information/additional-information.component.ts @@ -27,9 +27,10 @@ export class AdditionalInformationComponent { @Input() set noiSubmission(noiSubmission: NoticeOfIntentSubmissionDetailedDto | undefined) { if (noiSubmission) { this._noiSubmission = noiSubmission; - this.setVisibilityAndValidatorsForResidentialFields(); - this.setVisibilityAndValidatorsForAccessoryFields(); - this.setVisibilityAndValidatorsForFarmFields(); + this.setVisibilityForResidentialFields(); + this.setValidatorsForAccessoryFields(); + this.setVisibilityForFarmFields(); + this.setVisibilityForOtherFields(); switch (noiSubmission.typeCode) { case 'ROSO': @@ -55,34 +56,23 @@ export class AdditionalInformationComponent { isSoilStructureResidentialUseReasonVisible = false; isSoilAgriParcelActivityVisible = false; isSoilStructureResidentialAccessoryUseReasonVisible = false; + isSoilOtherStructureVisible = false; constructor(private router: Router, private noticeOfIntentDocumentService: NoticeOfIntentDocumentService) {} - private setVisibilityAndValidatorsForResidentialFields() { - if ( - this._noiSubmission?.soilProposedStructures.some( - (structure) => structure.type && RESIDENTIAL_STRUCTURE_TYPES.includes(structure.type) - ) - ) { - this.isSoilStructureResidentialUseReasonVisible = true; - } else { - this.isSoilStructureResidentialUseReasonVisible = false; - } + private setVisibilityForResidentialFields() { + this.isSoilStructureResidentialUseReasonVisible = !!this._noiSubmission?.soilProposedStructures.some( + (structure) => structure.type && RESIDENTIAL_STRUCTURE_TYPES.includes(structure.type) + ); } - private setVisibilityAndValidatorsForAccessoryFields() { - if ( - this._noiSubmission?.soilProposedStructures.some( - (structure) => structure.type === STRUCTURE_TYPES.ACCESSORY_STRUCTURE - ) - ) { - this.isSoilStructureResidentialAccessoryUseReasonVisible = true; - } else { - this.isSoilStructureResidentialAccessoryUseReasonVisible = false; - } + private setValidatorsForAccessoryFields() { + this.isSoilStructureResidentialAccessoryUseReasonVisible = !!this._noiSubmission?.soilProposedStructures.some( + (structure) => structure.type === STRUCTURE_TYPES.ACCESSORY_STRUCTURE + ); } - private setVisibilityAndValidatorsForFarmFields() { + private setVisibilityForFarmFields() { if ( this._noiSubmission?.soilProposedStructures.some((structure) => structure.type === STRUCTURE_TYPES.FARM_STRUCTURE) ) { @@ -94,6 +84,12 @@ export class AdditionalInformationComponent { } } + private setVisibilityForOtherFields() { + this.isSoilOtherStructureVisible = !!this._noiSubmission?.soilProposedStructures.some( + (structure) => structure.type === STRUCTURE_TYPES.OTHER_STRUCTURE + ); + } + async onEditSection(step: number) { if (this.draftMode) { await this.router.navigateByUrl( diff --git a/portal-frontend/src/app/services/notice-of-intent-submission/notice-of-intent-submission.dto.ts b/portal-frontend/src/app/services/notice-of-intent-submission/notice-of-intent-submission.dto.ts index 8878d1c425..ea49d4c4cc 100644 --- a/portal-frontend/src/app/services/notice-of-intent-submission/notice-of-intent-submission.dto.ts +++ b/portal-frontend/src/app/services/notice-of-intent-submission/notice-of-intent-submission.dto.ts @@ -87,6 +87,7 @@ export interface NoticeOfIntentSubmissionDetailedDto extends NoticeOfIntentSubmi soilStructureResidentialUseReason: string | null; soilAgriParcelActivity: string | null; soilStructureResidentialAccessoryUseReason: string | null; + soilStructureOtherUseReason: string | null; soilProposedStructures: ProposedStructure[]; } @@ -138,6 +139,7 @@ export interface NoticeOfIntentSubmissionUpdateDto { soilStructureResidentialUseReason?: string | null; soilAgriParcelActivity?: string | null; soilStructureResidentialAccessoryUseReason?: string | null; + soilStructureOtherUseReason?: string | null; soilProposedStructures?: ProposedStructure[]; } diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.spec.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.spec.ts index 05edfe12dc..7618a9baf0 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.spec.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.spec.ts @@ -249,7 +249,7 @@ describe('NoticeOfIntentService', () => { }); const errors = [ - '"Residential - Accessory Structures" must be selected', + '"Residential - Accessory Structure" must be selected', '"Residential - Additional Residence" must be selected', '"Residential - Principal Residence" must be selected', '"Farm Structure" must be selected', @@ -262,16 +262,16 @@ describe('NoticeOfIntentService', () => { new NoticeOfIntentSubmission({ soilProposedStructures: [ { - type: 'Farm Structure', + type: 'Residential - Accessory Structure', }, { - type: 'Residential - Principal Residence', + type: 'Residential - Additional Residence', }, { - type: 'Residential - Additional Residence', + type: 'Residential - Principal Residence', }, { - type: 'Residential - Accessory Structure', + type: 'Farm Structure', }, ], soilIsAreaWideFilling: true, diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.ts index 2a48a521ce..faa3565956 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.ts @@ -15,10 +15,7 @@ import { Repository, } from 'typeorm'; import { FileNumberService } from '../../file-number/file-number.service'; -import { - NoticeOfIntentSubmission, - PORTAL_TO_ALCS_STRUCTURE_TYPES_MAPPING, -} from '../../portal/notice-of-intent-submission/notice-of-intent-submission.entity'; +import { PORTAL_TO_ALCS_STRUCTURE_MAP } from '../../portal/notice-of-intent-submission/notice-of-intent-submission.entity'; import { formatIncomingDate } from '../../utils/incoming-date.formatter'; import { filterUndefined } from '../../utils/undefined'; import { ApplicationTimeData } from '../application/application-time-tracking.service'; @@ -343,66 +340,19 @@ export class NoticeOfIntentService { noticeOfIntent.fileNumber, ); - const isResidentialAccessory = this.checkIfStructureExists( - noticeOfIntentSubmission, - PORTAL_TO_ALCS_STRUCTURE_TYPES_MAPPING.RESIDENTIAL_ACCESSORY_STRUCTURE - .portalValue, - ); - if ( - isResidentialAccessory && - !this.checkIfCodePresentInNoiSubtypes( - subtypes, - PORTAL_TO_ALCS_STRUCTURE_TYPES_MAPPING.RESIDENTIAL_ACCESSORY_STRUCTURE - .alcsValueCode, - ) - ) { - errors.push('"Residential - Accessory Structures" must be selected'); - } - - const isResidentialAdditionalResidence = this.checkIfStructureExists( - noticeOfIntentSubmission, - PORTAL_TO_ALCS_STRUCTURE_TYPES_MAPPING.RESIDENTIAL_ADDITIONAL_RESIDENCE - .portalValue, - ); - if ( - isResidentialAdditionalResidence && - !this.checkIfCodePresentInNoiSubtypes( - subtypes, - PORTAL_TO_ALCS_STRUCTURE_TYPES_MAPPING.RESIDENTIAL_ADDITIONAL_RESIDENCE - .alcsValueCode, - ) - ) { - errors.push('"Residential - Additional Residence" must be selected'); - } - - const isResidentialPrincipalResidence = this.checkIfStructureExists( - noticeOfIntentSubmission, - PORTAL_TO_ALCS_STRUCTURE_TYPES_MAPPING.RESIDENTIAL_PRINCIPAL_RESIDENCE - .portalValue, - ); - if ( - isResidentialPrincipalResidence && - !this.checkIfCodePresentInNoiSubtypes( - subtypes, - PORTAL_TO_ALCS_STRUCTURE_TYPES_MAPPING.RESIDENTIAL_PRINCIPAL_RESIDENCE - .alcsValueCode, - ) - ) { - errors.push('"Residential - Principal Residence" must be selected'); - } - - const isFarmStructure = this.checkIfStructureExists( - noticeOfIntentSubmission, - PORTAL_TO_ALCS_STRUCTURE_TYPES_MAPPING.FARM_STRUCTURE.portalValue, - ); - if ( - isFarmStructure && - !this.checkIfCodePresentInNoiSubtypes( - subtypes, - PORTAL_TO_ALCS_STRUCTURE_TYPES_MAPPING.FARM_STRUCTURE.alcsValueCode, - ) - ) { - errors.push('"Farm Structure" must be selected'); + const structureTypes = + noticeOfIntentSubmission.soilProposedStructures.reduce((map, value) => { + if (value.type) { + map.add(value.type); + } + return map; + }, new Set<string>()); + + for (const requiredSubtype of structureTypes.values()) { + const mappedCode = PORTAL_TO_ALCS_STRUCTURE_MAP[requiredSubtype]; + if (!subtypes.includes(mappedCode)) { + errors.push(`"${requiredSubtype}" must be selected`); + } } if ( @@ -424,22 +374,6 @@ export class NoticeOfIntentService { } } - private checkIfStructureExists( - noticeOfIntentSubmission: NoticeOfIntentSubmission, - searchType: string, - ) { - return noticeOfIntentSubmission.soilProposedStructures?.some( - (struct) => struct.type === searchType, - ); - } - - private checkIfCodePresentInNoiSubtypes( - subtypes: string[], - searchCode: string, - ) { - return subtypes.some((subtype) => subtype === searchCode); - } - private async updateStatus( updateDto: UpdateNoticeOfIntentDto, noticeOfIntent: NoticeOfIntent, diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.dto.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.dto.ts index 7fa6602b62..8c95d3b75e 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.dto.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.dto.ts @@ -167,6 +167,9 @@ export class NoticeOfIntentSubmissionDetailedDto extends NoticeOfIntentSubmissio @AutoMap(() => String) soilStructureResidentialAccessoryUseReason?: string | null; + @AutoMap(() => String) + soilStructureOtherUseReason?: string | null; + @AutoMap(() => [ProposedStructure]) soilProposedStructures: ProposedStructure[]; } @@ -369,6 +372,10 @@ export class NoticeOfIntentSubmissionUpdateDto { @IsOptional() soilStructureResidentialAccessoryUseReason?: string | null; + @IsString() + @IsOptional() + soilStructureOtherUseReason?: string | null; + @IsArray() @IsOptional() soilProposedStructures?: ProposedStructure[]; diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.entity.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.entity.ts index 81b8ba0276..ffea02aa4c 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.entity.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.entity.ts @@ -16,32 +16,16 @@ import { ColumnNumericTransformer } from '../../utils/column-numeric-transform'; import { NoticeOfIntentOwner } from './notice-of-intent-owner/notice-of-intent-owner.entity'; import { NoticeOfIntentParcel } from './notice-of-intent-parcel/notice-of-intent-parcel.entity'; -export const PORTAL_TO_ALCS_STRUCTURE_TYPES_MAPPING = { - RESIDENTIAL_PRINCIPAL_RESIDENCE: { - portalValue: 'Residential - Principal Residence', - alcsValueCode: 'RPRI', - }, - RESIDENTIAL_ADDITIONAL_RESIDENCE: { - portalValue: 'Residential - Additional Residence', - alcsValueCode: 'RADD', - }, - RESIDENTIAL_ACCESSORY_STRUCTURE: { - portalValue: 'Residential - Accessory Structure', - alcsValueCode: 'RACS', - }, - FARM_STRUCTURE: { - portalValue: 'Farm Structure', - alcsValueCode: 'FRST', - }, +export const PORTAL_TO_ALCS_STRUCTURE_MAP = { + 'Residential - Principal Residence': 'RPRI', + 'Residential - Additional Residence': 'RADD', + 'Residential - Accessory Structure': 'RACS', + 'Farm Structure': 'FRST', + 'Other Structure': 'OTHR', }; export class ProposedStructure { - type: - | 'Farm Structure' - | 'Residential - Principal Residence' - | 'Residential - Additional Residence' - | 'Residential - Accessory Structure' - | null; + type: keyof typeof PORTAL_TO_ALCS_STRUCTURE_MAP | null; area?: number | null; } @@ -434,6 +418,10 @@ export class NoticeOfIntentSubmission extends Base { @Column({ type: 'text', nullable: true }) soilStructureResidentialAccessoryUseReason: string | null; + @AutoMap(() => String) + @Column({ type: 'text', nullable: true }) + soilStructureOtherUseReason: string | null; + @AutoMap(() => ProposedStructure) @Column({ comment: 'JSONB Column containing the proposed structures', diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts index b09fc2a10a..c35472aa2c 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts @@ -18,7 +18,7 @@ import { User } from '../../user/user.entity'; import { ValidatedNoticeOfIntentSubmission } from './notice-of-intent-submission-validator.service'; import { NoticeOfIntentSubmission, - PORTAL_TO_ALCS_STRUCTURE_TYPES_MAPPING, + PORTAL_TO_ALCS_STRUCTURE_MAP, } from './notice-of-intent-submission.entity'; import { NoticeOfIntentSubmissionService } from './notice-of-intent-submission.service'; import { NoticeOfIntentSubmissionStatusType } from '../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status-type.entity'; @@ -93,6 +93,7 @@ describe('NoticeOfIntentSubmissionService', () => { fileNumber: 'file-number', applicant: 'incognito', typeCode: 'fake', + soilProposedStructures: [], localGovernmentUuid: 'uuid', createdBy: new User({ clientRoles: [], @@ -273,16 +274,16 @@ describe('NoticeOfIntentSubmissionService', () => { localGovernmentUuid, soilProposedStructures: [ { - type: 'Farm Structure', + type: 'Residential - Accessory Structure', }, { - type: 'Residential - Principal Residence', + type: 'Residential - Additional Residence', }, { - type: 'Residential - Additional Residence', + type: 'Residential - Principal Residence', }, { - type: 'Residential - Accessory Structure', + type: 'Farm Structure', }, ], soilIsAreaWideFilling: true, @@ -309,13 +310,10 @@ describe('NoticeOfIntentSubmissionService', () => { dateSubmittedToAlc: mockDate, typeCode, subtypes: [ - PORTAL_TO_ALCS_STRUCTURE_TYPES_MAPPING.RESIDENTIAL_ACCESSORY_STRUCTURE - .alcsValueCode, - PORTAL_TO_ALCS_STRUCTURE_TYPES_MAPPING.RESIDENTIAL_ADDITIONAL_RESIDENCE - .alcsValueCode, - PORTAL_TO_ALCS_STRUCTURE_TYPES_MAPPING.RESIDENTIAL_PRINCIPAL_RESIDENCE - .alcsValueCode, - PORTAL_TO_ALCS_STRUCTURE_TYPES_MAPPING.FARM_STRUCTURE.alcsValueCode, + PORTAL_TO_ALCS_STRUCTURE_MAP['Residential - Accessory Structure'], + PORTAL_TO_ALCS_STRUCTURE_MAP['Residential - Additional Residence'], + PORTAL_TO_ALCS_STRUCTURE_MAP['Residential - Principal Residence'], + PORTAL_TO_ALCS_STRUCTURE_MAP['Farm Structure'], 'ARWF', 'AEPM', ], diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts index a0b97f9cb2..9e695f0f46 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts @@ -28,8 +28,8 @@ import { NoticeOfIntentSubmissionUpdateDto, } from './notice-of-intent-submission.dto'; import { + PORTAL_TO_ALCS_STRUCTURE_MAP, NoticeOfIntentSubmission, - PORTAL_TO_ALCS_STRUCTURE_TYPES_MAPPING, } from './notice-of-intent-submission.entity'; import { NoticeOfIntentSubmissionStatusType } from '../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status-type.entity'; @@ -341,58 +341,17 @@ export class NoticeOfIntentSubmissionService { noticeOfIntentSubmission: ValidatedNoticeOfIntentSubmission, ) { const subtypes: string[] = []; - const isResidentialAccessory = - noticeOfIntentSubmission.soilProposedStructures?.some( - (struct) => - struct.type === - PORTAL_TO_ALCS_STRUCTURE_TYPES_MAPPING.RESIDENTIAL_ACCESSORY_STRUCTURE - .portalValue, - ); - if (isResidentialAccessory) { - subtypes.push( - PORTAL_TO_ALCS_STRUCTURE_TYPES_MAPPING.RESIDENTIAL_ACCESSORY_STRUCTURE - .alcsValueCode, - ); - } - - const isResidentialAdditionalResidence = - noticeOfIntentSubmission.soilProposedStructures?.some( - (struct) => - struct.type === - PORTAL_TO_ALCS_STRUCTURE_TYPES_MAPPING - .RESIDENTIAL_ADDITIONAL_RESIDENCE.portalValue, - ); - if (isResidentialAdditionalResidence) { - subtypes.push( - PORTAL_TO_ALCS_STRUCTURE_TYPES_MAPPING.RESIDENTIAL_ADDITIONAL_RESIDENCE - .alcsValueCode, - ); - } - const isResidentialPrincipalResidence = - noticeOfIntentSubmission.soilProposedStructures?.some( - (struct) => - struct.type === - PORTAL_TO_ALCS_STRUCTURE_TYPES_MAPPING.RESIDENTIAL_PRINCIPAL_RESIDENCE - .portalValue, - ); - if (isResidentialPrincipalResidence) { - subtypes.push( - PORTAL_TO_ALCS_STRUCTURE_TYPES_MAPPING.RESIDENTIAL_PRINCIPAL_RESIDENCE - .alcsValueCode, - ); - } + const structureTypes = + noticeOfIntentSubmission.soilProposedStructures.reduce((map, value) => { + if (value.type) { + map.add(value.type); + } + return map; + }, new Set<string>()); - const isFarmStructure = - noticeOfIntentSubmission.soilProposedStructures?.some( - (struct) => - struct.type === - PORTAL_TO_ALCS_STRUCTURE_TYPES_MAPPING.FARM_STRUCTURE.portalValue, - ); - if (isFarmStructure) { - subtypes.push( - PORTAL_TO_ALCS_STRUCTURE_TYPES_MAPPING.FARM_STRUCTURE.alcsValueCode, - ); + for (const type of structureTypes.values()) { + subtypes.push(PORTAL_TO_ALCS_STRUCTURE_MAP[type]); } if (noticeOfIntentSubmission.soilIsAreaWideFilling) { @@ -617,6 +576,11 @@ export class NoticeOfIntentSubmissionService { noticeOfIntentSubmission.soilStructureResidentialAccessoryUseReason, ); + noticeOfIntentSubmission.soilStructureOtherUseReason = filterUndefined( + updateDto.soilStructureOtherUseReason, + noticeOfIntentSubmission.soilStructureOtherUseReason, + ); + noticeOfIntentSubmission.soilProposedStructures = filterUndefined( updateDto.soilProposedStructures, noticeOfIntentSubmission.soilProposedStructures, diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1695160393900-add_soil_other_reason.ts b/services/apps/alcs/src/providers/typeorm/migrations/1695160393900-add_soil_other_reason.ts new file mode 100644 index 0000000000..67ff614ea2 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1695160393900-add_soil_other_reason.ts @@ -0,0 +1,23 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class addSoilOtherReason1695160393900 implements MigrationInterface { + name = 'addSoilOtherReason1695160393900'; + + public async up(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" ADD "soil_structure_other_use_reason" text`, + ); + + await queryRunner.query(` + INSERT INTO "alcs"."notice_of_intent_subtype" + ("audit_deleted_date_at", "audit_created_at", "audit_updated_at", "audit_created_by", "audit_updated_by", "label", "code", "description", "is_active") VALUES + (NULL, NOW(), NULL, 'migration_seed', NULL, 'Other Structure', 'OTHR', 'Other Structure', 't'); + `); + } + + public async down(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" DROP COLUMN "soil_structure_other_use_reason"`, + ); + } +} From 48883343d5f7ff56e6b3b8c2517833411efc54d3 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Tue, 19 Sep 2023 16:27:43 -0700 Subject: [PATCH 409/954] Change Public -> LG on Notification Documents * Fix visibility flags to not include public. --- .../portal/pdf-generation/generate-srw-document.service.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/services/apps/alcs/src/portal/pdf-generation/generate-srw-document.service.ts b/services/apps/alcs/src/portal/pdf-generation/generate-srw-document.service.ts index 3e1216b3c0..c9889da512 100644 --- a/services/apps/alcs/src/portal/pdf-generation/generate-srw-document.service.ts +++ b/services/apps/alcs/src/portal/pdf-generation/generate-srw-document.service.ts @@ -65,7 +65,10 @@ export class GenerateSrwDocumentService { documentType: DOCUMENT_TYPE.LTSA_LETTER, source: DOCUMENT_SOURCE.ALC, system: DOCUMENT_SYSTEM.PORTAL, - visibilityFlags: [VISIBILITY_FLAG.APPLICANT, VISIBILITY_FLAG.PUBLIC], + visibilityFlags: [ + VISIBILITY_FLAG.APPLICANT, + VISIBILITY_FLAG.GOVERNMENT, + ], }); } } From d1711be990eeb40489f12dc458f1f86cd5a4a810 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Wed, 20 Sep 2023 14:32:48 -0700 Subject: [PATCH 410/954] Allow timeline for non-admins --- .../application-timeline.controller.ts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/services/apps/alcs/src/alcs/application/application-timeline/application-timeline.controller.ts b/services/apps/alcs/src/alcs/application/application-timeline/application-timeline.controller.ts index 5661ed1358..af4fb4d926 100644 --- a/services/apps/alcs/src/alcs/application/application-timeline/application-timeline.controller.ts +++ b/services/apps/alcs/src/alcs/application/application-timeline/application-timeline.controller.ts @@ -1,7 +1,10 @@ import { Controller, Get, Param, UseGuards } from '@nestjs/common'; import { ApiOAuth2 } from '@nestjs/swagger'; import * as config from 'config'; -import { AUTH_ROLE } from '../../../common/authorization/roles'; +import { + AUTH_ROLE, + ROLES_ALLOWED_APPLICATIONS, +} from '../../../common/authorization/roles'; import { RolesGuard } from '../../../common/authorization/roles-guard.service'; import { UserRoles } from '../../../common/authorization/roles.decorator'; import { ApplicationTimelineService } from './application-timeline.service'; @@ -13,7 +16,7 @@ export class ApplicationTimelineController { constructor(private applicationTimelineService: ApplicationTimelineService) {} @Get('/:fileNumber') - @UserRoles(AUTH_ROLE.ADMIN) + @UserRoles(...ROLES_ALLOWED_APPLICATIONS) async fetchTimelineEvents(@Param('fileNumber') fileNumber: string) { return await this.applicationTimelineService.getTimelineEvents(fileNumber); } From cfc171e93f187173cb3929322797ce9ecaa53a48 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Thu, 21 Sep 2023 11:09:51 -0700 Subject: [PATCH 411/954] Add Notifications to Search --- ...notice-of-intent-search-table.component.ts | 16 +- .../notification-search-table.component.html | 79 ++++++ .../notification-search-table.component.scss | 0 ...otification-search-table.component.spec.ts | 33 +++ .../notification-search-table.component.ts | 140 ++++++++++ .../app/features/search/search.component.html | 19 +- .../features/search/search.component.spec.ts | 14 + .../app/features/search/search.component.ts | 79 ++++-- .../src/app/features/search/search.module.ts | 2 + .../notification-submission-status.service.ts | 11 +- .../notification-submission.service.spec.ts | 2 +- .../notification-submission.service.ts | 13 - .../file-type-data-source.service.ts | 10 +- .../src/app/services/search/search.dto.ts | 3 + .../src/app/services/search/search.service.ts | 16 ++ .../edit-submission.component.ts | 1 - .../application-timeline.controller.ts | 5 +- .../notice-of-intent-timeline.controller.ts | 7 +- ...tification-submission-status.controller.ts | 18 +- .../notification-submission-status.service.ts | 4 + .../notification-timeline.controller.ts | 7 +- ...tification-advanced-search.service.spec.ts | 112 ++++++++ .../notification-advanced-search.service.ts | 241 ++++++++++++++++++ .../notification-search-view.entity.ts | 96 +++++++ .../src/alcs/search/search.controller.spec.ts | 46 ++-- .../alcs/src/alcs/search/search.controller.ts | 204 ++++++++++----- .../apps/alcs/src/alcs/search/search.dto.ts | 18 +- .../alcs/src/alcs/search/search.module.ts | 4 + .../alcs/src/alcs/search/search.service.ts | 20 +- ...68-add_status_function_for_notification.ts | 43 ++++ ...1-add_notification_advanced_search_view.ts | 32 +++ 31 files changed, 1133 insertions(+), 162 deletions(-) create mode 100644 alcs-frontend/src/app/features/search/notification-search-table/notification-search-table.component.html create mode 100644 alcs-frontend/src/app/features/search/notification-search-table/notification-search-table.component.scss create mode 100644 alcs-frontend/src/app/features/search/notification-search-table/notification-search-table.component.spec.ts create mode 100644 alcs-frontend/src/app/features/search/notification-search-table/notification-search-table.component.ts create mode 100644 services/apps/alcs/src/alcs/search/notification/notification-advanced-search.service.spec.ts create mode 100644 services/apps/alcs/src/alcs/search/notification/notification-advanced-search.service.ts create mode 100644 services/apps/alcs/src/alcs/search/notification/notification-search-view.entity.ts create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1695230223368-add_status_function_for_notification.ts create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1695234110261-add_notification_advanced_search_view.ts diff --git a/alcs-frontend/src/app/features/search/notice-of-intent-search-table/notice-of-intent-search-table.component.ts b/alcs-frontend/src/app/features/search/notice-of-intent-search-table/notice-of-intent-search-table.component.ts index 24a34b39bc..9d2338c191 100644 --- a/alcs-frontend/src/app/features/search/notice-of-intent-search-table/notice-of-intent-search-table.component.ts +++ b/alcs-frontend/src/app/features/search/notice-of-intent-search-table/notice-of-intent-search-table.component.ts @@ -5,6 +5,7 @@ import { Router } from '@angular/router'; import { Subject, takeUntil } from 'rxjs'; import { ApplicationRegionDto } from '../../../services/application/application-code.dto'; import { ApplicationStatusDto } from '../../../services/application/application-submission-status/application-submission-status.dto'; +import { NoticeOfIntentStatusDto } from '../../../services/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.dto'; import { NoticeOfIntentTypeDto } from '../../../services/notice-of-intent/notice-of-intent.dto'; import { NoticeOfIntentSearchResultDto } from '../../../services/search/search.dto'; import { ApplicationSubmissionStatusPill } from '../../../shared/application-submission-status-type-pill/application-submission-status-type-pill.component'; @@ -46,7 +47,7 @@ export class NoticeOfIntentSearchTableComponent implements OnDestroy { this.initSorting(); } - @Input() statuses: ApplicationStatusDto[] = []; + @Input() statuses: NoticeOfIntentStatusDto[] = []; @Input() regions: ApplicationRegionDto[] = []; @Output() tableChange = new EventEmitter<TableChange>(); @@ -91,7 +92,7 @@ export class NoticeOfIntentSearchTableComponent implements OnDestroy { window.open(url, '_blank'); } - private mapNoticeOfIntent(applications: NoticeOfIntentSearchResultDto[]) { + private mapNoticeOfIntent(applications: NoticeOfIntentSearchResultDto[]): SearchResult[] { return applications.map((e) => { const status = this.statuses.find((st) => st.code === e.status); @@ -106,12 +107,11 @@ export class NoticeOfIntentSearchTableComponent implements OnDestroy { board: e.boardCode, class: e.class, status: { - // TODO there no pills for NOI status yet. This needs to be addressed once noi statuses are done - backgroundColor: '#fcba19', - textColor: '#002f17', - borderColor: '#fcba19', - label: status?.label, - shortLabel: status?.label, + backgroundColor: status!.alcsBackgroundColor, + textColor: status!.alcsColor, + borderColor: status!.alcsBackgroundColor, + label: status!.label, + shortLabel: status!.label, }, }; }); diff --git a/alcs-frontend/src/app/features/search/notification-search-table/notification-search-table.component.html b/alcs-frontend/src/app/features/search/notification-search-table/notification-search-table.component.html new file mode 100644 index 0000000000..447f8083ad --- /dev/null +++ b/alcs-frontend/src/app/features/search/notification-search-table/notification-search-table.component.html @@ -0,0 +1,79 @@ +<ng-container *ngIf="_totalCount > 0"> + <table + mat-table + [dataSource]="dataSource" + class="mat-elevation-z2 table" + matSort + matSortActive="dateSubmitted" + matSortDirection="desc" + matSortDisableClear + > + <ng-container matColumnDef="fileId"> + <th mat-header-cell *matHeaderCellDef mat-sort-header>File ID</th> + <td mat-cell *matCellDef="let element"> + {{ element.fileNumber | emptyColumn }} + </td> + </ng-container> + + <ng-container matColumnDef="dateSubmitted"> + <th mat-header-cell *matHeaderCellDef mat-sort-header>Date Submitted</th> + <td mat-cell *matCellDef="let element"> + {{ element.dateSubmitted | date | emptyColumn }} + </td> + </ng-container> + + <ng-container matColumnDef="ownerName"> + <th mat-header-cell *matHeaderCellDef mat-sort-header>Owner Name</th> + <td mat-cell *matCellDef="let element"> + {{ element.ownerName | emptyColumn }} + </td> + </ng-container> + + <ng-container matColumnDef="type"> + <th class="type-cell" mat-header-cell *matHeaderCellDef mat-sort-header>Type</th> + <td mat-cell class="type-cell" *matCellDef="let element"> + <app-application-type-pill *ngIf="element.type" [type]="element.type" [useShortLabel]="true"> + </app-application-type-pill> + <ng-container *ngIf="element.type === null || element.type === undefined">-</ng-container> + </td> + </ng-container> + + <ng-container matColumnDef="government"> + <th mat-header-cell *matHeaderCellDef mat-sort-header>Local/First Nation Government</th> + <td mat-cell *matCellDef="let element"> + {{ element.localGovernmentName | emptyColumn }} + </td> + </ng-container> + + <ng-container matColumnDef="portalStatus"> + <th class="type-cell" mat-header-cell *matHeaderCellDef mat-sort-header>Portal Status</th> + <td mat-cell class="type-cell" *matCellDef="let element"> + <app-application-submission-status-type-pill + *ngIf="element.status" + [type]="element.status" + ></app-application-submission-status-type-pill> + </td> + </ng-container> + + <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr> + <tr (click)="onSelectRecord(row)" mat-row *matRowDef="let row; columns: displayedColumns"></tr> + + <tr class="mat-row no-data" *matNoDataRow> + <td class="text-center" colspan="6"> + <div><b>No notice of intent found.</b></div> + <div>Please adjust criteria and try again.</div> + </td> + </tr> + </table> + <mat-paginator + [length]="_totalCount" + [pageSize]="20" + [pageSizeOptions]="[20, 50, 100]" + (page)="onPageChange($event)" + aria-label="Select page" + ></mat-paginator> +</ng-container> +<div class="no-data" *ngIf="_totalCount === 0"> + <div><b>No notifications found.</b></div> + <div>Please adjust criteria and try again.</div> +</div> diff --git a/alcs-frontend/src/app/features/search/notification-search-table/notification-search-table.component.scss b/alcs-frontend/src/app/features/search/notification-search-table/notification-search-table.component.scss new file mode 100644 index 0000000000..e69de29bb2 diff --git a/alcs-frontend/src/app/features/search/notification-search-table/notification-search-table.component.spec.ts b/alcs-frontend/src/app/features/search/notification-search-table/notification-search-table.component.spec.ts new file mode 100644 index 0000000000..61737af5b2 --- /dev/null +++ b/alcs-frontend/src/app/features/search/notification-search-table/notification-search-table.component.spec.ts @@ -0,0 +1,33 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { Router } from '@angular/router'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; + +import { NotificationSearchTableComponent } from './notification-search-table.component'; + +describe('NotificationSearchTableComponent', () => { + let component: NotificationSearchTableComponent; + let fixture: ComponentFixture<NotificationSearchTableComponent>; + let mockRouter: DeepMocked<Router>; + + beforeEach(async () => { + mockRouter = createMock(); + + await TestBed.configureTestingModule({ + declarations: [NotificationSearchTableComponent], + providers: [ + { + provide: Router, + useValue: mockRouter, + }, + ], + }).compileComponents(); + + fixture = TestBed.createComponent(NotificationSearchTableComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/alcs-frontend/src/app/features/search/notification-search-table/notification-search-table.component.ts b/alcs-frontend/src/app/features/search/notification-search-table/notification-search-table.component.ts new file mode 100644 index 0000000000..970b238b4e --- /dev/null +++ b/alcs-frontend/src/app/features/search/notification-search-table/notification-search-table.component.ts @@ -0,0 +1,140 @@ +import { Component, EventEmitter, Input, OnDestroy, OnInit, Output, ViewChild } from '@angular/core'; +import { MatPaginator, PageEvent } from '@angular/material/paginator'; +import { MatSort } from '@angular/material/sort'; +import { Router } from '@angular/router'; +import { Subject, takeUntil } from 'rxjs'; +import { ApplicationRegionDto } from '../../../services/application/application-code.dto'; +import { NotificationSubmissionStatusService } from '../../../services/notification/notification-submission-status/notification-submission-status.service'; +import { NotificationSubmissionStatusDto, NotificationTypeDto } from '../../../services/notification/notification.dto'; +import { NotificationSearchResultDto } from '../../../services/search/search.dto'; +import { ApplicationSubmissionStatusPill } from '../../../shared/application-submission-status-type-pill/application-submission-status-type-pill.component'; +import { TableChange } from '../search.interface'; + +interface SearchResult { + fileNumber: string; + dateSubmitted: number; + ownerName: string; + type?: NotificationTypeDto; + government?: string; + portalStatus?: string; + referenceId: string; + board?: string; + class: string; + status?: ApplicationSubmissionStatusPill; +} + +@Component({ + selector: 'app-notification-search-table', + templateUrl: './notification-search-table.component.html', + styleUrls: ['./notification-search-table.component.scss'], +}) +export class NotificationSearchTableComponent implements OnDestroy { + $destroy = new Subject<void>(); + + @ViewChild(MatPaginator) paginator!: MatPaginator; + @ViewChild(MatSort) sort?: MatSort; + + _notifications: NotificationSearchResultDto[] = []; + + @Input() statuses: NotificationSubmissionStatusDto[] = []; + + @Input() set notifications(notifications: NotificationSearchResultDto[]) { + this._notifications = notifications; + this.dataSource = this.mapNotifications(notifications); + } + + _totalCount = 0; + @Input() set totalCount(count: number) { + this._totalCount = count; + this.initSorting(); + } + + @Input() regions: ApplicationRegionDto[] = []; + @Output() tableChange = new EventEmitter<TableChange>(); + + displayedColumns = ['fileId', 'dateSubmitted', 'ownerName', 'type', 'government', 'portalStatus']; + dataSource: SearchResult[] = []; + pageIndex = 0; + itemsPerPage = 20; + total = 0; + sortDirection = 'DESC'; + sortField = 'dateSubmitted'; + + private subscribedToSort = false; + + constructor(private router: Router) {} + + ngOnDestroy(): void { + this.$destroy.next(); + this.$destroy.complete(); + } + + async onTableChange() { + this.tableChange.emit({ + pageIndex: this.pageIndex, + itemsPerPage: this.itemsPerPage, + sortDirection: this.sortDirection, + sortField: this.sortField, + tableType: 'APP', + }); + } + + async onPageChange($event: PageEvent) { + this.pageIndex = $event.pageIndex; + this.itemsPerPage = $event.pageSize; + + await this.onTableChange(); + } + + async onSelectRecord(record: SearchResult) { + const url = this.router.serializeUrl(this.router.createUrlTree([`/notification/${record.referenceId}`])); + + window.open(url, '_blank'); + } + + private mapNotifications(notifications: NotificationSearchResultDto[]): SearchResult[] { + return notifications.map((e) => { + const status = this.statuses.find((st) => st.code === e.status); + + return { + fileNumber: e.fileNumber, + dateSubmitted: e.dateSubmitted, + ownerName: e.ownerName, + type: e.type, + localGovernmentName: e.localGovernmentName, + portalStatus: e.portalStatus, + referenceId: e.referenceId, + board: e.boardCode, + class: e.class, + status: { + backgroundColor: status!.alcsBackgroundColor, + textColor: status!.alcsColor, + borderColor: status!.alcsBackgroundColor, + label: status!.label, + shortLabel: status!.label, + }, + }; + }); + } + + private initSorting() { + if (this._totalCount <= 0) { + this.subscribedToSort = false; + } + + // push subscription to next render cycle, after the table is rendered + setTimeout(() => { + if (this.sort && !this.subscribedToSort) { + this.subscribedToSort = true; + this.sort.sortChange.pipe(takeUntil(this.$destroy)).subscribe(async (sortObj) => { + this.paginator.pageIndex = 0; + this.pageIndex = 0; + this.sortDirection = sortObj.direction.toUpperCase(); + this.sortField = sortObj.active; + + await this.onTableChange(); + }); + } + }); + } +} diff --git a/alcs-frontend/src/app/features/search/search.component.html b/alcs-frontend/src/app/features/search/search.component.html index e6da9ba6f9..206ce086ad 100644 --- a/alcs-frontend/src/app/features/search/search.component.html +++ b/alcs-frontend/src/app/features/search/search.component.html @@ -20,7 +20,7 @@ <h6 class="subheading">Provide one or more of the following criteria:</h6> <mat-label>Name</mat-label> <input id="name" matInput formControlName="name" minlength="3" /> </mat-form-field> - <div class="subtext">Search by Primary Contact, Parcel Owner, Organization, Ministry or Department</div> + <div class="subtext">Search by Primary Contact, Parcel Owner, Organization, Transferee, Ministry or Department</div> <div *ngIf="nameControl.invalid && (nameControl.dirty || nameControl.touched)" class="field-error"> <mat-icon>warning</mat-icon> <div *ngIf="nameControl.errors?.['minlength']">Enter 3 or more characters to search by name</div> @@ -123,7 +123,7 @@ <h6 class="subheading">Provide one or more of the following criteria:</h6> <div class="column"> <mat-form-field appearance="outline"> <mat-select placeholder="Portal Status" [formControl]="portalStatusControl"> - <mat-option *ngFor="let status of statuses" [value]="status.code"> + <mat-option *ngFor="let status of allStatuses" [value]="status.code"> {{ status.label }} </mat-option> </mat-select> @@ -260,7 +260,7 @@ <h2 class="search-title">Search Results:</h2> <app-application-search-table [applications]="applications" [totalCount]="applicationTotal" - [statuses]="statuses" + [statuses]="applicationStatuses" [regions]="regions" (tableChange)="onTableChange($event)" ></app-application-search-table> @@ -271,7 +271,7 @@ <h2 class="search-title">Search Results:</h2> <app-notice-of-intent-search-table [noticeOfIntents]="noticeOfIntents" [totalCount]="noticeOfIntentTotal" - [statuses]="statuses" + [statuses]="noiStatuses" [regions]="regions" (tableChange)="onTableChange($event)" ></app-notice-of-intent-search-table> @@ -286,5 +286,16 @@ <h2 class="search-title">Search Results:</h2> > </app-non-application-search-table> </mat-tab> + + <mat-tab> + <ng-template mat-tab-label> Notifications: {{ notificationTotal }} </ng-template> + <app-notification-search-table + [statuses]="notificationStatuses" + [notifications]="notifications" + [totalCount]="notificationTotal" + (tableChange)="onTableChange($event)" + > + </app-notification-search-table> + </mat-tab> </mat-tab-group> </div> diff --git a/alcs-frontend/src/app/features/search/search.component.spec.ts b/alcs-frontend/src/app/features/search/search.component.spec.ts index 1e5903ebfe..9358360d59 100644 --- a/alcs-frontend/src/app/features/search/search.component.spec.ts +++ b/alcs-frontend/src/app/features/search/search.component.spec.ts @@ -7,6 +7,8 @@ import { BehaviorSubject, Observable } from 'rxjs'; import { ApplicationRegionDto } from '../../services/application/application-code.dto'; import { ApplicationLocalGovernmentService } from '../../services/application/application-local-government/application-local-government.service'; import { ApplicationService } from '../../services/application/application.service'; +import { NoticeOfIntentSubmissionStatusService } from '../../services/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service'; +import { NotificationSubmissionStatusService } from '../../services/notification/notification-submission-status/notification-submission-status.service'; import { SearchService } from '../../services/search/search.service'; import { ToastService } from '../../services/toast/toast.service'; @@ -19,12 +21,16 @@ describe('SearchComponent', () => { let mockToastService: DeepMocked<ToastService>; let mockLocalGovernmentService: DeepMocked<ApplicationLocalGovernmentService>; let mockApplicationService: DeepMocked<ApplicationService>; + let mockNotificationStatusService: DeepMocked<NotificationSubmissionStatusService>; + let mockNOIStatusService: DeepMocked<NotificationSubmissionStatusService>; beforeEach(async () => { mockSearchService = createMock(); mockToastService = createMock(); mockLocalGovernmentService = createMock(); mockApplicationService = createMock(); + mockNotificationStatusService = createMock(); + mockNOIStatusService = createMock(); mockApplicationService.$applicationRegions = new BehaviorSubject<ApplicationRegionDto[]>([]); @@ -52,6 +58,14 @@ describe('SearchComponent', () => { provide: ApplicationService, useValue: mockApplicationService, }, + { + provide: NotificationSubmissionStatusService, + useValue: mockNotificationStatusService, + }, + { + provide: NoticeOfIntentSubmissionStatusService, + useValue: mockNOIStatusService, + }, ], declarations: [SearchComponent], imports: [MatAutocompleteModule], diff --git a/alcs-frontend/src/app/features/search/search.component.ts b/alcs-frontend/src/app/features/search/search.component.ts index cdf1f4a145..d4fffc38ed 100644 --- a/alcs-frontend/src/app/features/search/search.component.ts +++ b/alcs-frontend/src/app/features/search/search.component.ts @@ -13,11 +13,16 @@ import { ApplicationLocalGovernmentDto } from '../../services/application/applic import { ApplicationLocalGovernmentService } from '../../services/application/application-local-government/application-local-government.service'; import { ApplicationStatusDto } from '../../services/application/application-submission-status/application-submission-status.dto'; import { ApplicationService } from '../../services/application/application.service'; +import { NoticeOfIntentStatusDto } from '../../services/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.dto'; +import { NoticeOfIntentSubmissionStatusService } from '../../services/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service'; +import { NotificationSubmissionStatusService } from '../../services/notification/notification-submission-status/notification-submission-status.service'; +import { NotificationSubmissionStatusDto } from '../../services/notification/notification.dto'; import { AdvancedSearchResponseDto, ApplicationSearchResultDto, NonApplicationSearchResultDto, NoticeOfIntentSearchResultDto, + NotificationSearchResultDto, SearchRequestDto, } from '../../services/search/search.dto'; import { SearchService } from '../../services/search/search.service'; @@ -29,10 +34,6 @@ import { TableChange } from './search.interface'; export const defaultStatusBackgroundColour = '#ffffff'; export const defaultStatusColour = '#313132'; -const APPLICATION_TAB_INDEX = 0; -const NOTICE_OF_INTENT_TAB_INDEX = 1; -const NON_APPLICATION_TAB_INDEX = 2; - @Component({ selector: 'app-search', templateUrl: './search.component.html', @@ -55,6 +56,9 @@ export class SearchComponent implements OnInit, OnDestroy { nonApplications: NonApplicationSearchResultDto[] = []; nonApplicationsTotal = 0; + notifications: NotificationSearchResultDto[] = []; + notificationTotal = 0; + isSearchExpanded = false; pageIndex = 0; itemsPerPage = 20; @@ -89,17 +93,22 @@ export class SearchComponent implements OnInit, OnDestroy { localGovernments: ApplicationLocalGovernmentDto[] = []; filteredLocalGovernments!: Observable<ApplicationLocalGovernmentDto[]>; regions: ApplicationRegionDto[] = []; - statuses: ApplicationStatusDto[] = []; + applicationStatuses: ApplicationStatusDto[] = []; + allStatuses: (ApplicationStatusDto | NoticeOfIntentStatusDto | NotificationSubmissionStatusDto)[] = []; formEmpty = true; civicAddressInvalid = false; pidInvalid = false; searchResultsHidden = true; + notificationStatuses: NotificationSubmissionStatusDto[] = []; + noiStatuses: NoticeOfIntentStatusDto[] = []; constructor( private searchService: SearchService, private activatedRoute: ActivatedRoute, private localGovernmentService: ApplicationLocalGovernmentService, + private notificationStatusService: NotificationSubmissionStatusService, + private noiStatusService: NoticeOfIntentSubmissionStatusService, private applicationService: ApplicationService, private toastService: ToastService, private titleService: Title @@ -115,7 +124,8 @@ export class SearchComponent implements OnInit, OnDestroy { .pipe(combineLatestWith(this.applicationService.$applicationStatuses, this.activatedRoute.queryParamMap)) .subscribe(([regions, statuses, queryParamMap]) => { this.regions = regions; - this.statuses = statuses; + this.applicationStatuses = statuses; + this.populateAllStatuses(); const searchText = queryParamMap.get('searchText'); @@ -171,6 +181,7 @@ export class SearchComponent implements OnInit, OnDestroy { this.resolutionYears.reverse(); this.loadGovernments(); this.applicationService.setup(); + this.loadStatuses(); this.filteredLocalGovernments = this.localGovernmentControl.valueChanges.pipe( startWith(''), @@ -293,6 +304,14 @@ export class SearchComponent implements OnInit, OnDestroy { this.nonApplicationsTotal = result?.total ?? 0; } + async onNotificationSearch() { + const searchParams = this.getSearchParams(); + const result = await this.searchService.advancedSearchNotificationsFetch(searchParams); + + this.notifications = result?.data ?? []; + this.notificationTotal = result?.total ?? 0; + } + async onTableChange(event: TableChange) { this.pageIndex = event.pageIndex; this.itemsPerPage = event.itemsPerPage; @@ -304,11 +323,14 @@ export class SearchComponent implements OnInit, OnDestroy { await this.onApplicationSearch(); break; case 'NOI': - await this.onApplicationSearch(); + await this.onNoticeOfIntentSearch(); break; case 'NONAPP': await this.onNonApplicationSearch(); break; + case 'NOTI': + await this.onNotificationSearch(); + break; default: this.toastService.showErrorToast('Not implemented'); } @@ -339,9 +361,11 @@ export class SearchComponent implements OnInit, OnDestroy { applications: [], noticeOfIntents: [], nonApplications: [], + notifications: [], totalApplications: 0, totalNoticeOfIntents: 0, totalNonApplications: 0, + totalNotifications: 0, }; } @@ -353,17 +377,21 @@ export class SearchComponent implements OnInit, OnDestroy { this.nonApplicationsTotal = searchResult.totalNonApplications; this.nonApplications = searchResult.nonApplications; + + this.notifications = searchResult.notifications; + this.notificationTotal = searchResult.totalNotifications; } private setActiveTab() { - let maxVal = Math.max(this.applicationTotal, this.noticeOfIntentTotal, this.nonApplicationsTotal); - - this.tabGroup.selectedIndex = - maxVal === this.applicationTotal - ? APPLICATION_TAB_INDEX - : maxVal === this.noticeOfIntentTotal - ? NOTICE_OF_INTENT_TAB_INDEX - : NON_APPLICATION_TAB_INDEX; + //Keep this in Tab Order + const searchCounts = [ + this.applicationTotal, + this.noticeOfIntentTotal, + this.nonApplicationsTotal, + this.notificationTotal, + ]; + + this.tabGroup.selectedIndex = searchCounts.indexOf(Math.max(...searchCounts)); } private formatStringSearchParam(value: string | undefined | null) { @@ -377,4 +405,25 @@ export class SearchComponent implements OnInit, OnDestroy { return value.trim(); } } + + private async loadStatuses() { + this.notificationStatuses = await this.notificationStatusService.list(); + this.noiStatuses = await this.noiStatusService.listStatuses(); + this.populateAllStatuses(); + } + + private populateAllStatuses() { + const statusCodes = new Set<string>(); + const result = []; + const allStatuses = [...this.applicationStatuses, ...this.noiStatuses, ...this.notificationStatuses]; + for (const status of allStatuses) { + if (!statusCodes.has(status.code)) { + result.push(status); + statusCodes.add(status.code); + } + } + + this.allStatuses = result; + this.allStatuses.sort((a, b) => (a.label > b.label ? 1 : -1)); + } } diff --git a/alcs-frontend/src/app/features/search/search.module.ts b/alcs-frontend/src/app/features/search/search.module.ts index 5923c66331..fce2699aa6 100644 --- a/alcs-frontend/src/app/features/search/search.module.ts +++ b/alcs-frontend/src/app/features/search/search.module.ts @@ -9,6 +9,7 @@ import { ApplicationSearchTableComponent } from './application-search-table/appl import { FileTypeFilterDropDownComponent } from './file-type-filter-drop-down/file-type-filter-drop-down.component'; import { NonApplicationSearchTableComponent } from './non-application-search-table/non-application-search-table.component'; import { NoticeOfIntentSearchTableComponent } from './notice-of-intent-search-table/notice-of-intent-search-table.component'; +import { NotificationSearchTableComponent } from './notification-search-table/notification-search-table.component'; import { SearchComponent } from './search.component'; const routes: Routes = [ @@ -24,6 +25,7 @@ const routes: Routes = [ ApplicationSearchTableComponent, NoticeOfIntentSearchTableComponent, NonApplicationSearchTableComponent, + NotificationSearchTableComponent, FileTypeFilterDropDownComponent, ], imports: [ diff --git a/alcs-frontend/src/app/services/notification/notification-submission-status/notification-submission-status.service.ts b/alcs-frontend/src/app/services/notification/notification-submission-status/notification-submission-status.service.ts index 73eaf438d1..a995fee74a 100644 --- a/alcs-frontend/src/app/services/notification/notification-submission-status/notification-submission-status.service.ts +++ b/alcs-frontend/src/app/services/notification/notification-submission-status/notification-submission-status.service.ts @@ -3,7 +3,7 @@ import { Injectable } from '@angular/core'; import { firstValueFrom } from 'rxjs'; import { environment } from '../../../../environments/environment'; import { ToastService } from '../../toast/toast.service'; -import { NotificationSubmissionToSubmissionStatusDto } from '../notification.dto'; +import { NotificationSubmissionStatusDto, NotificationSubmissionToSubmissionStatusDto } from '../notification.dto'; @Injectable({ providedIn: 'root', @@ -13,6 +13,15 @@ export class NotificationSubmissionStatusService { constructor(private http: HttpClient, private toastService: ToastService) {} + async list(): Promise<NotificationSubmissionStatusDto[]> { + try { + return await firstValueFrom(this.http.get<NotificationSubmissionStatusDto[]>(`${this.baseUrl}`)); + } catch (e) { + this.toastService.showErrorToast('Failed to fetch Notification Submission Statuses'); + return []; + } + } + async fetchSubmissionStatusesByFileNumber( fileNumber: string ): Promise<NotificationSubmissionToSubmissionStatusDto[]> { diff --git a/alcs-frontend/src/app/services/notification/notification-submission/notification-submission.service.spec.ts b/alcs-frontend/src/app/services/notification/notification-submission/notification-submission.service.spec.ts index a04f2c9c6f..d67fee8565 100644 --- a/alcs-frontend/src/app/services/notification/notification-submission/notification-submission.service.spec.ts +++ b/alcs-frontend/src/app/services/notification/notification-submission/notification-submission.service.spec.ts @@ -62,7 +62,7 @@ describe('NotificationSubmissionService', () => { expect(service).toBeTruthy(); }); - it('should successfully fetch noi submission', async () => { + it('should successfully fetch notification submission', async () => { mockHttpClient.get.mockReturnValue(of(mockSubmittedNOI)); const result = await service.fetchSubmission('1'); diff --git a/alcs-frontend/src/app/services/notification/notification-submission/notification-submission.service.ts b/alcs-frontend/src/app/services/notification/notification-submission/notification-submission.service.ts index e41fb04a10..da72dc0339 100644 --- a/alcs-frontend/src/app/services/notification/notification-submission/notification-submission.service.ts +++ b/alcs-frontend/src/app/services/notification/notification-submission/notification-submission.service.ts @@ -34,17 +34,4 @@ export class NotificationSubmissionService { throw e; } } - - async setSubmissionStatus(fileNumber: string, statusCode: string): Promise<NotificationSubmissionDto> { - try { - return firstValueFrom( - this.http.patch<NotificationSubmissionDto>(`${this.baseUrl}/${fileNumber}/update-status`, { - statusCode, - }) - ); - } catch (e) { - this.toastService.showErrorToast('Failed to update Notification Submission Status'); - throw e; - } - } } diff --git a/alcs-frontend/src/app/services/search/file-type/file-type-data-source.service.ts b/alcs-frontend/src/app/services/search/file-type/file-type-data-source.service.ts index 9332020e4f..b8fbe732f6 100644 --- a/alcs-frontend/src/app/services/search/file-type/file-type-data-source.service.ts +++ b/alcs-frontend/src/app/services/search/file-type/file-type-data-source.service.ts @@ -60,10 +60,16 @@ const TREE_DATA: TreeNode[] = [ item: { label: 'Covenants', value: 'COV' }, }, { - item: { label: 'Notification of SRW', value: 'SRW' }, + item: { label: 'Planning Review', value: 'PLAN' }, }, + ], + }, + { + item: { label: 'Notifications', value: null }, + + children: [ { - item: { label: 'Planning Review', value: 'PLAN' }, + item: { label: 'SRW', value: 'SRW' }, }, ], }, diff --git a/alcs-frontend/src/app/services/search/search.dto.ts b/alcs-frontend/src/app/services/search/search.dto.ts index 461080640e..2e2cdd7467 100644 --- a/alcs-frontend/src/app/services/search/search.dto.ts +++ b/alcs-frontend/src/app/services/search/search.dto.ts @@ -15,6 +15,7 @@ export interface ApplicationSearchResultDto { } export interface NoticeOfIntentSearchResultDto extends ApplicationSearchResultDto {} +export interface NotificationSearchResultDto extends ApplicationSearchResultDto {} export interface NonApplicationSearchResultDto { type: string | null; @@ -30,9 +31,11 @@ export interface AdvancedSearchResponseDto { applications: ApplicationSearchResultDto[]; noticeOfIntents: NoticeOfIntentSearchResultDto[]; nonApplications: NonApplicationSearchResultDto[]; + notifications: NotificationSearchResultDto[]; totalApplications: number; totalNoticeOfIntents: number; totalNonApplications: number; + totalNotifications: number; } export interface AdvancedSearchEntityResponseDto<T> { diff --git a/alcs-frontend/src/app/services/search/search.service.ts b/alcs-frontend/src/app/services/search/search.service.ts index f0eaa71c9f..9e269f60cb 100644 --- a/alcs-frontend/src/app/services/search/search.service.ts +++ b/alcs-frontend/src/app/services/search/search.service.ts @@ -10,6 +10,7 @@ import { NonApplicationSearchResultDto, NonApplicationsSearchRequestDto, NoticeOfIntentSearchResultDto, + NotificationSearchResultDto, SearchRequestDto, SearchResultDto, } from './search.dto'; @@ -86,4 +87,19 @@ export class SearchService { return undefined; } } + + async advancedSearchNotificationsFetch(searchDto: NonApplicationsSearchRequestDto) { + try { + return await firstValueFrom( + this.http.post<AdvancedSearchEntityResponseDto<NotificationSearchResultDto>>( + `${this.baseUrl}/advanced/notifications`, + searchDto + ) + ); + } catch (e) { + console.error(e); + this.toastService.showErrorToast(`Search failed. Please refresh the page and try again`); + return undefined; + } + } } diff --git a/portal-frontend/src/app/features/applications/edit-submission/edit-submission.component.ts b/portal-frontend/src/app/features/applications/edit-submission/edit-submission.component.ts index a02146e6b8..c987d0aae9 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/edit-submission.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/edit-submission.component.ts @@ -310,7 +310,6 @@ export class EditSubmissionComponent implements OnInit, OnDestroy, AfterViewInit government = await this.loadGovernment(this.applicationSubmission?.localGovernmentUuid); } - debugger; if (government && government.matchesUserGuid && submission.typeCode !== 'TURP') { const review = await this.applicationReviewService.startReview(submission.fileNumber); if (review) { diff --git a/services/apps/alcs/src/alcs/application/application-timeline/application-timeline.controller.ts b/services/apps/alcs/src/alcs/application/application-timeline/application-timeline.controller.ts index af4fb4d926..828d95457d 100644 --- a/services/apps/alcs/src/alcs/application/application-timeline/application-timeline.controller.ts +++ b/services/apps/alcs/src/alcs/application/application-timeline/application-timeline.controller.ts @@ -1,10 +1,7 @@ import { Controller, Get, Param, UseGuards } from '@nestjs/common'; import { ApiOAuth2 } from '@nestjs/swagger'; import * as config from 'config'; -import { - AUTH_ROLE, - ROLES_ALLOWED_APPLICATIONS, -} from '../../../common/authorization/roles'; +import { ROLES_ALLOWED_APPLICATIONS } from '../../../common/authorization/roles'; import { RolesGuard } from '../../../common/authorization/roles-guard.service'; import { UserRoles } from '../../../common/authorization/roles.decorator'; import { ApplicationTimelineService } from './application-timeline.service'; diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-timeline/notice-of-intent-timeline.controller.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-timeline/notice-of-intent-timeline.controller.ts index 12ecc93e33..8029517de0 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-timeline/notice-of-intent-timeline.controller.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-timeline/notice-of-intent-timeline.controller.ts @@ -1,7 +1,10 @@ import { Controller, Get, Param, UseGuards } from '@nestjs/common'; import { ApiOAuth2 } from '@nestjs/swagger'; import * as config from 'config'; -import { AUTH_ROLE } from '../../../common/authorization/roles'; +import { + AUTH_ROLE, + ROLES_ALLOWED_APPLICATIONS, +} from '../../../common/authorization/roles'; import { RolesGuard } from '../../../common/authorization/roles-guard.service'; import { UserRoles } from '../../../common/authorization/roles.decorator'; import { NoticeOfIntentTimelineService } from './notice-of-intent-timeline.service'; @@ -13,7 +16,7 @@ export class NoticeOfIntentTimelineController { constructor(private noiTimelineService: NoticeOfIntentTimelineService) {} @Get('/:fileNumber') - @UserRoles(AUTH_ROLE.ADMIN) + @UserRoles(...ROLES_ALLOWED_APPLICATIONS) async fetchTimelineEvents(@Param('fileNumber') fileNumber: string) { return await this.noiTimelineService.getTimelineEvents(fileNumber); } diff --git a/services/apps/alcs/src/alcs/notification/notification-submission-status/notification-submission-status.controller.ts b/services/apps/alcs/src/alcs/notification/notification-submission-status/notification-submission-status.controller.ts index 501c6d8246..c4377149a4 100644 --- a/services/apps/alcs/src/alcs/notification/notification-submission-status/notification-submission-status.controller.ts +++ b/services/apps/alcs/src/alcs/notification/notification-submission-status/notification-submission-status.controller.ts @@ -3,7 +3,11 @@ import { InjectMapper } from '@automapper/nestjs'; import { Controller, Get, Param } from '@nestjs/common'; import { ANY_AUTH_ROLE } from '../../../common/authorization/roles'; import { UserRoles } from '../../../common/authorization/roles.decorator'; -import { NotificationSubmissionToSubmissionStatusDto } from './notification-status.dto'; +import { NotificationSubmissionStatusType } from './notification-status-type.entity'; +import { + NotificationStatusDto, + NotificationSubmissionToSubmissionStatusDto, +} from './notification-status.dto'; import { NotificationSubmissionToSubmissionStatus } from './notification-status.entity'; import { NotificationSubmissionStatusService } from './notification-submission-status.service'; @@ -15,6 +19,18 @@ export class NotificationSubmissionStatusController { @InjectMapper() private mapper: Mapper, ) {} + @Get('') + async listStatuses() { + const statuses = + await this.notificationSubmissionStatusService.listStatuses(); + + return this.mapper.mapArrayAsync( + statuses, + NotificationSubmissionStatusType, + NotificationStatusDto, + ); + } + @Get('/:fileNumber') async getStatusesByFileNumber(@Param('fileNumber') fileNumber) { const statuses = diff --git a/services/apps/alcs/src/alcs/notification/notification-submission-status/notification-submission-status.service.ts b/services/apps/alcs/src/alcs/notification/notification-submission-status/notification-submission-status.service.ts index b650be65e8..deae697f92 100644 --- a/services/apps/alcs/src/alcs/notification/notification-submission-status/notification-submission-status.service.ts +++ b/services/apps/alcs/src/alcs/notification/notification-submission-status/notification-submission-status.service.ts @@ -123,4 +123,8 @@ export class NotificationSubmissionStatusService { return await this.statusesRepository.remove(statusesToRemove); } + + async listStatuses() { + return this.submissionStatusTypeRepository.find(); + } } diff --git a/services/apps/alcs/src/alcs/notification/notification-timeline/notification-timeline.controller.ts b/services/apps/alcs/src/alcs/notification/notification-timeline/notification-timeline.controller.ts index 0116e3a280..96810e700f 100644 --- a/services/apps/alcs/src/alcs/notification/notification-timeline/notification-timeline.controller.ts +++ b/services/apps/alcs/src/alcs/notification/notification-timeline/notification-timeline.controller.ts @@ -1,7 +1,10 @@ import { Controller, Get, Param, UseGuards } from '@nestjs/common'; import { ApiOAuth2 } from '@nestjs/swagger'; import * as config from 'config'; -import { AUTH_ROLE } from '../../../common/authorization/roles'; +import { + AUTH_ROLE, + ROLES_ALLOWED_APPLICATIONS, +} from '../../../common/authorization/roles'; import { RolesGuard } from '../../../common/authorization/roles-guard.service'; import { UserRoles } from '../../../common/authorization/roles.decorator'; import { NotificationTimelineService } from './notification-timeline.service'; @@ -13,7 +16,7 @@ export class NotificationTimelineController { constructor(private noiTimelineService: NotificationTimelineService) {} @Get('/:fileNumber') - @UserRoles(AUTH_ROLE.ADMIN) + @UserRoles(...ROLES_ALLOWED_APPLICATIONS) async fetchTimelineEvents(@Param('fileNumber') fileNumber: string) { return await this.noiTimelineService.getTimelineEvents(fileNumber); } diff --git a/services/apps/alcs/src/alcs/search/notification/notification-advanced-search.service.spec.ts b/services/apps/alcs/src/alcs/search/notification/notification-advanced-search.service.spec.ts new file mode 100644 index 0000000000..eb081abd81 --- /dev/null +++ b/services/apps/alcs/src/alcs/search/notification/notification-advanced-search.service.spec.ts @@ -0,0 +1,112 @@ +import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; +import { Test, TestingModule } from '@nestjs/testing'; +import { getRepositoryToken } from '@nestjs/typeorm'; +import { Repository } from 'typeorm'; +import { LocalGovernment } from '../../local-government/local-government.entity'; +import { SearchRequestDto } from '../search.dto'; +import { NotificationAdvancedSearchService } from './notification-advanced-search.service'; +import { NotificationSubmissionSearchView } from './notification-search-view.entity'; + +describe('NotificationAdvancedSearchService', () => { + let service: NotificationAdvancedSearchService; + let mockNotificationSubmissionSearchViewRepository: DeepMocked< + Repository<NotificationSubmissionSearchView> + >; + let mockLocalGovernmentRepository: DeepMocked<Repository<LocalGovernment>>; + + const mockSearchDto: SearchRequestDto = { + fileNumber: '123', + portalStatusCode: 'A', + governmentName: 'B', + regionCode: 'C', + name: 'D', + pid: 'E', + civicAddress: 'F', + isIncludeOtherParcels: false, + dateSubmittedFrom: new Date('2020-10-10').getTime(), + dateSubmittedTo: new Date('2021-10-10').getTime(), + dateDecidedFrom: new Date('2020-11-10').getTime(), + dateDecidedTo: new Date('2021-11-10').getTime(), + resolutionNumber: 123, + resolutionYear: 2021, + fileTypes: ['type1', 'type2'], + page: 1, + pageSize: 10, + sortField: 'ownerName', + sortDirection: 'ASC', + }; + + let mockQuery: any = {}; + + beforeEach(async () => { + mockNotificationSubmissionSearchViewRepository = createMock(); + mockLocalGovernmentRepository = createMock(); + + mockQuery = { + getManyAndCount: jest.fn().mockResolvedValue([[], 0]), + orderBy: jest.fn().mockReturnThis(), + offset: jest.fn().mockReturnThis(), + limit: jest.fn().mockReturnThis(), + innerJoinAndMapOne: jest.fn().mockReturnThis(), + groupBy: jest.fn().mockReturnThis(), + where: jest.fn().mockReturnThis(), + andWhere: jest.fn().mockReturnThis(), + setParameters: jest.fn().mockReturnThis(), + leftJoin: jest.fn().mockReturnThis(), + }; + + const module: TestingModule = await Test.createTestingModule({ + providers: [ + NotificationAdvancedSearchService, + { + provide: getRepositoryToken(NotificationSubmissionSearchView), + useValue: mockNotificationSubmissionSearchViewRepository, + }, + { + provide: getRepositoryToken(LocalGovernment), + useValue: mockLocalGovernmentRepository, + }, + ], + }).compile(); + + service = module.get<NotificationAdvancedSearchService>( + NotificationAdvancedSearchService, + ); + + mockLocalGovernmentRepository.findOneByOrFail.mockResolvedValue( + new LocalGovernment(), + ); + }); + + it('should be defined', () => { + expect(service).toBeDefined(); + }); + + it('should successfully build a query using all search parameters defined', async () => { + mockNotificationSubmissionSearchViewRepository.createQueryBuilder.mockReturnValue( + mockQuery as any, + ); + + const result = await service.search(mockSearchDto); + + expect(result).toEqual({ data: [], total: 0 }); + expect( + mockNotificationSubmissionSearchViewRepository.createQueryBuilder, + ).toBeCalledTimes(1); + expect(mockQuery.andWhere).toBeCalledTimes(9); + }); + + it('should call compileNotificationSearchQuery method correctly', async () => { + const compileSearchQuerySpy = jest + .spyOn(service as any, 'compileNotificationSearchQuery') + .mockResolvedValue(mockQuery); + + const result = await service.search(mockSearchDto); + + expect(result).toEqual({ data: [], total: 0 }); + expect(compileSearchQuerySpy).toBeCalledWith(mockSearchDto); + expect(mockQuery.orderBy).toHaveBeenCalledTimes(1); + expect(mockQuery.offset).toHaveBeenCalledTimes(1); + expect(mockQuery.limit).toHaveBeenCalledTimes(1); + }); +}); diff --git a/services/apps/alcs/src/alcs/search/notification/notification-advanced-search.service.ts b/services/apps/alcs/src/alcs/search/notification/notification-advanced-search.service.ts new file mode 100644 index 0000000000..deaf7175f4 --- /dev/null +++ b/services/apps/alcs/src/alcs/search/notification/notification-advanced-search.service.ts @@ -0,0 +1,241 @@ +import { Injectable } from '@nestjs/common'; +import { InjectRepository } from '@nestjs/typeorm'; +import { Brackets, Repository } from 'typeorm'; +import { NotificationParcel } from '../../../portal/notification-submission/notification-parcel/notification-parcel.entity'; +import { NotificationTransferee } from '../../../portal/notification-submission/notification-transferee/notification-transferee.entity'; +import { + getNextDayToPacific, + getStartOfDayToPacific, +} from '../../../utils/pacific-date-time-helper'; +import { formatStringToPostgresSearchStringArrayWithWildCard } from '../../../utils/search-helper'; +import { LocalGovernment } from '../../local-government/local-government.entity'; +import { AdvancedSearchResultDto, SearchRequestDto } from '../search.dto'; +import { NotificationSubmissionSearchView } from './notification-search-view.entity'; + +@Injectable() +export class NotificationAdvancedSearchService { + constructor( + @InjectRepository(NotificationSubmissionSearchView) + private notificationSearchViewRepo: Repository<NotificationSubmissionSearchView>, + @InjectRepository(LocalGovernment) + private governmentRepository: Repository<LocalGovernment>, + ) {} + + async search( + searchDto: SearchRequestDto, + ): Promise<AdvancedSearchResultDto<NotificationSubmissionSearchView[]>> { + let query = await this.compileNotificationSearchQuery(searchDto); + + query = this.compileGroupBySearchQuery(query); + + const sortQuery = this.compileSortQuery(searchDto); + + query = query + .orderBy(sortQuery, searchDto.sortDirection) + .offset((searchDto.page - 1) * searchDto.pageSize) + .limit(searchDto.pageSize); + + const result = await query.getManyAndCount(); + + return { + data: result[0], + total: result[1], + }; + } + + private compileSortQuery(searchDto: SearchRequestDto) { + switch (searchDto.sortField) { + case 'fileId': + return '"notificationSearch"."file_number"'; + + case 'ownerName': + return '"notificationSearch"."applicant"'; + + case 'type': + return '"notificationSearch"."notification_type_code"'; + + case 'government': + return '"notificationSearch"."local_government_name"'; + + case 'portalStatus': + return `"notificationSearch"."status" ->> 'label' `; + + default: + case 'dateSubmitted': + return '"notificationSearch"."date_submitted_to_alc"'; + } + } + + private compileGroupBySearchQuery(query) { + query = query + .innerJoinAndMapOne( + 'notificationSearch.notificationType', + 'notificationSearch.notificationType', + 'notificationType', + ) + .groupBy( + ` + "notificationSearch"."uuid" + , "notificationSearch"."notification_uuid" + , "notificationSearch"."notification_region_code" + , "notificationSearch"."file_number" + , "notificationSearch"."applicant" + , "notificationSearch"."local_government_uuid" + , "notificationSearch"."local_government_name" + , "notificationSearch"."notification_type_code" + , "notificationSearch"."status" + , "notificationSearch"."date_submitted_to_alc" + , "notificationType"."audit_deleted_date_at" + , "notificationType"."audit_created_at" + , "notificationType"."audit_updated_by" + , "notificationType"."audit_updated_at" + , "notificationType"."audit_created_by" + , "notificationType"."short_label" + , "notificationType"."label" + , "notificationType"."code" + , "notificationType"."html_description" + , "notificationType"."portal_label" + `, + ); + return query; + } + + private async compileNotificationSearchQuery(searchDto: SearchRequestDto) { + let query = + this.notificationSearchViewRepo.createQueryBuilder('notificationSearch'); + + if (searchDto.fileNumber) { + query = query + .andWhere('notificationSearch.file_number = :fileNumber') + .setParameters({ fileNumber: searchDto.fileNumber ?? null }); + } + + if (searchDto.portalStatusCode) { + query = query.andWhere( + "alcs.get_current_status_for_notification_submission_by_uuid(notificationSearch.uuid) ->> 'status_type_code' = :status", + { + status: searchDto.portalStatusCode, + }, + ); + } + + if (searchDto.governmentName) { + const government = await this.governmentRepository.findOneByOrFail({ + name: searchDto.governmentName, + }); + + query = query.andWhere( + 'notificationSearch.local_government_uuid = :local_government_uuid', + { + local_government_uuid: government.uuid, + }, + ); + } + + if (searchDto.regionCode) { + query = query.andWhere( + 'notificationSearch.notification_region_code = :region_code', + { + region_code: searchDto.regionCode, + }, + ); + } + + query = this.compileSearchByNameQuery(searchDto, query); + query = this.compileParcelSearchQuery(searchDto, query); + query = this.compileDateRangeSearchQuery(searchDto, query); + + return query; + } + + private compileDateRangeSearchQuery(searchDto: SearchRequestDto, query) { + if (searchDto.dateSubmittedFrom) { + query = query.andWhere( + 'notificationSearch.date_submitted_to_alc >= :date_submitted_from_alc', + { + date_submitted_from_alc: getStartOfDayToPacific( + searchDto.dateSubmittedFrom, + ).toISOString(), + }, + ); + } + + if (searchDto.dateSubmittedTo) { + query = query.andWhere( + 'notificationSearch.date_submitted_to_alc < :date_submitted_to_alc', + { + date_submitted_to_alc: getNextDayToPacific( + searchDto.dateSubmittedTo, + ).toISOString(), + }, + ); + } + + return query; + } + + private compileParcelSearchQuery(searchDto: SearchRequestDto, query) { + if (searchDto.pid || searchDto.civicAddress) { + query = query.leftJoin( + NotificationParcel, + 'parcel', + 'parcel.notification_submission_uuid = notificationSearch.uuid', + ); + } + + if (searchDto.pid) { + query = query.andWhere('parcel.pid = :pid', { pid: searchDto.pid }); + } + + if (searchDto.civicAddress) { + query = query.andWhere('parcel.civic_address like :civic_address', { + civic_address: `%${searchDto.civicAddress}%`, + }); + } + return query; + } + + private compileSearchByNameQuery(searchDto: SearchRequestDto, query) { + if (searchDto.name) { + const formattedSearchString = + formatStringToPostgresSearchStringArrayWithWildCard(searchDto.name!); + + query = query + .leftJoin( + NotificationTransferee, + 'notification_transferee', + 'notification_transferee.notification_submission_uuid = notificationSearch.uuid', + ) + .andWhere( + new Brackets((qb) => + qb + .where( + "LOWER(notification_transferee.first_name || ' ' || notification_transferee.last_name) LIKE ANY (:names)", + { + names: formattedSearchString, + }, + ) + .orWhere( + 'LOWER(notification_transferee.first_name) LIKE ANY (:names)', + { + names: formattedSearchString, + }, + ) + .orWhere( + 'LOWER(notification_transferee.last_name) LIKE ANY (:names)', + { + names: formattedSearchString, + }, + ) + .orWhere( + 'LOWER(notification_transferee.organization_name) LIKE ANY (:names)', + { + names: formattedSearchString, + }, + ), + ), + ); + } + return query; + } +} diff --git a/services/apps/alcs/src/alcs/search/notification/notification-search-view.entity.ts b/services/apps/alcs/src/alcs/search/notification/notification-search-view.entity.ts new file mode 100644 index 0000000000..f7b3046fa9 --- /dev/null +++ b/services/apps/alcs/src/alcs/search/notification/notification-search-view.entity.ts @@ -0,0 +1,96 @@ +import { + DataSource, + JoinColumn, + ManyToOne, + PrimaryColumn, + ViewColumn, + ViewEntity, +} from 'typeorm'; +import { NotificationSubmission } from '../../../portal/notification-submission/notification-submission.entity'; +import { LocalGovernment } from '../../local-government/local-government.entity'; +import { NotificationType } from '../../notification/notification-type/notification-type.entity'; +import { Notification } from '../../notification/notification.entity'; + +// typeorm does not transform property names for the status +export class SearchNotificationSubmissionStatusType { + submission_uuid: string; + + status_type_code: string; + + effective_date: Date; + + label: string; +} + +@ViewEntity({ + expression: (datasource: DataSource) => + datasource + .createQueryBuilder() + .select('noti_sub.uuid', 'uuid') + .addSelect('noti_sub.file_number', 'file_number') + .addSelect('noti_sub.applicant', 'applicant') + .addSelect('noti_sub.local_government_uuid', 'local_government_uuid') + .addSelect('localGovernment.name', 'local_government_name') + .addSelect('noti.type_code', 'notification_type_code') + .addSelect('noti.date_submitted_to_alc', 'date_submitted_to_alc') + .addSelect('noti.uuid', 'notification_uuid') + .addSelect('noti.region_code', 'notification_region_code') + .addSelect( + 'alcs.get_current_status_for_notification_submission_by_uuid(noti_sub.uuid)', + 'status', + ) + .from(NotificationSubmission, 'noti_sub') + .innerJoin( + Notification, + 'noti', + 'noti.file_number = noti_sub.file_number', + ) + .innerJoinAndSelect( + NotificationType, + 'notificationType', + 'noti_sub.type_code = notificationType.code', + ) + .leftJoin( + LocalGovernment, + 'localGovernment', + 'noti.local_government_uuid = localGovernment.uuid', + ), +}) +export class NotificationSubmissionSearchView { + @ViewColumn() + @PrimaryColumn() + uuid: string; + + @ViewColumn() + notificationUuid: string; + + @ViewColumn() + notificationRegionCode?: string; + + @ViewColumn() + fileNumber: string; + + @ViewColumn() + applicant?: string; + + @ViewColumn() + localGovernmentUuid?: string; + + @ViewColumn() + localGovernmentName?: string; + + @ViewColumn() + notificationTypeCode: string; + + @ViewColumn() + status: SearchNotificationSubmissionStatusType; + + @ViewColumn() + dateSubmittedToAlc: Date | null; + + @ManyToOne(() => NotificationType, { + nullable: false, + }) + @JoinColumn({ name: 'notification_type_code' }) + notificationType: NotificationType; +} diff --git a/services/apps/alcs/src/alcs/search/search.controller.spec.ts b/services/apps/alcs/src/alcs/search/search.controller.spec.ts index 3353783645..fe6cf6f789 100644 --- a/services/apps/alcs/src/alcs/search/search.controller.spec.ts +++ b/services/apps/alcs/src/alcs/search/search.controller.spec.ts @@ -17,6 +17,7 @@ import { NonApplicationSearchView } from './non-applications/non-applications-vi import { NonApplicationsAdvancedSearchService } from './non-applications/non-applications.service'; import { NoticeOfIntentAdvancedSearchService } from './notice-of-intent/notice-of-intent-advanced-search.service'; import { NoticeOfIntentSubmissionSearchView } from './notice-of-intent/notice-of-intent-search-view.entity'; +import { NotificationAdvancedSearchService } from './notification/notification-advanced-search.service'; import { SearchController } from './search.controller'; import { AdvancedSearchResultDto, @@ -31,12 +32,14 @@ describe('SearchController', () => { let mockNoticeOfIntentAdvancedSearchService: DeepMocked<NoticeOfIntentAdvancedSearchService>; let mockApplicationAdvancedSearchService: DeepMocked<ApplicationAdvancedSearchService>; let mockNonApplicationsAdvancedSearchService: DeepMocked<NonApplicationsAdvancedSearchService>; + let mockNotificationAdvancedSearchService: DeepMocked<NotificationAdvancedSearchService>; beforeEach(async () => { mockSearchService = createMock(); mockNoticeOfIntentAdvancedSearchService = createMock(); mockApplicationAdvancedSearchService = createMock(); mockNonApplicationsAdvancedSearchService = createMock(); + mockNotificationAdvancedSearchService = createMock(); const module: TestingModule = await Test.createTestingModule({ imports: [ @@ -61,6 +64,10 @@ describe('SearchController', () => { provide: NonApplicationsAdvancedSearchService, useValue: mockNonApplicationsAdvancedSearchService, }, + { + provide: NotificationAdvancedSearchService, + useValue: mockNotificationAdvancedSearchService, + }, { provide: ClsService, useValue: {}, @@ -94,32 +101,29 @@ describe('SearchController', () => { }), ); - const mockNoiResult = new AdvancedSearchResultDto< - NoticeOfIntentSubmissionSearchView[] - >(); - mockNoiResult.data = new Array<NoticeOfIntentSubmissionSearchView>(); - mockNoiResult.total = 0; mockNoticeOfIntentAdvancedSearchService.searchNoticeOfIntents.mockResolvedValue( - mockNoiResult, + { + data: [], + total: 0, + }, ); - const mockApplicationResult = new AdvancedSearchResultDto< - ApplicationSubmissionSearchView[] - >(); - mockApplicationResult.data = new Array<ApplicationSubmissionSearchView>(); - mockApplicationResult.total = 0; - mockApplicationAdvancedSearchService.searchApplications.mockResolvedValue( - mockApplicationResult, - ); + mockApplicationAdvancedSearchService.searchApplications.mockResolvedValue({ + data: [], + total: 0, + }); - const mockNonApplicationResult = new AdvancedSearchResultDto< - NonApplicationSearchView[] - >(); - mockNonApplicationResult.data = new Array<NonApplicationSearchView>(); - mockNonApplicationResult.total = 0; mockNonApplicationsAdvancedSearchService.searchNonApplications.mockResolvedValue( - mockNonApplicationResult, + { + data: [], + total: 0, + }, ); + + mockNotificationAdvancedSearchService.search.mockResolvedValue({ + data: [], + total: 0, + }); }); it('should be defined', () => { @@ -144,7 +148,7 @@ describe('SearchController', () => { expect(result.length).toBe(5); }); - it('should call advanced search to retrieve Applications, NOIs, PlanningReviews, Covenants', async () => { + it('should call advanced search to retrieve Applications, NOIs, PlanningReviews, Covenants, Notifications', async () => { const mockSearchRequestDto = { pageSize: 1, page: 1, diff --git a/services/apps/alcs/src/alcs/search/search.controller.ts b/services/apps/alcs/src/alcs/search/search.controller.ts index d895fef288..dbc1461bd4 100644 --- a/services/apps/alcs/src/alcs/search/search.controller.ts +++ b/services/apps/alcs/src/alcs/search/search.controller.ts @@ -22,6 +22,8 @@ import { NonApplicationSearchView } from './non-applications/non-applications-vi import { NonApplicationsAdvancedSearchService } from './non-applications/non-applications.service'; import { NoticeOfIntentAdvancedSearchService } from './notice-of-intent/notice-of-intent-advanced-search.service'; import { NoticeOfIntentSubmissionSearchView } from './notice-of-intent/notice-of-intent-search-view.entity'; +import { NotificationAdvancedSearchService } from './notification/notification-advanced-search.service'; +import { NotificationSubmissionSearchView } from './notification/notification-search-view.entity'; import { AdvancedSearchResponseDto, AdvancedSearchResultDto, @@ -29,6 +31,7 @@ import { NonApplicationSearchResultDto, NonApplicationsSearchRequestDto, NoticeOfIntentSearchResultDto, + NotificationSearchResultDto, SearchRequestDto, SearchResultDto, } from './search.dto'; @@ -44,6 +47,7 @@ export class SearchController { private noticeOfIntentSearchService: NoticeOfIntentAdvancedSearchService, private applicationSearchService: ApplicationAdvancedSearchService, private nonApplicationsSearchService: NonApplicationsAdvancedSearchService, + private notificationSearchService: NotificationAdvancedSearchService, ) {} @UserRoles(...ROLES_ALLOWED_APPLICATIONS) @@ -100,8 +104,10 @@ export class SearchController { } } - private mapApplicationToSearchResult(application: Application) { - const result = { + private mapApplicationToSearchResult( + application: Application, + ): SearchResultDto { + return { type: CARD_TYPE.APP, referenceId: application.fileNumber, localGovernmentName: application.localGovernment?.name, @@ -112,65 +118,65 @@ export class SearchController { ApplicationType, ApplicationTypeDto, ), - } as SearchResultDto; - - return result; + }; } - private mapNoticeOfIntentToSearchResult(noi: NoticeOfIntent) { - const result = { + private mapNoticeOfIntentToSearchResult( + noi: NoticeOfIntent, + ): SearchResultDto { + return { type: CARD_TYPE.NOI, referenceId: noi.fileNumber, localGovernmentName: noi.localGovernment?.name, applicant: noi.applicant, fileNumber: noi.fileNumber, - } as SearchResultDto; - - return result; + }; } - private mapPlanningReviewToSearchResult(planning: PlanningReview) { - const result = { + private mapPlanningReviewToSearchResult( + planning: PlanningReview, + ): SearchResultDto { + return { type: CARD_TYPE.PLAN, referenceId: planning.cardUuid, localGovernmentName: planning.localGovernment?.name, fileNumber: planning.fileNumber, boardCode: planning.card.board.code, - } as SearchResultDto; - - return result; + }; } - private mapCovenantToSearchResult(covenant: Covenant) { - const result = { + private mapCovenantToSearchResult(covenant: Covenant): SearchResultDto { + return { type: CARD_TYPE.COV, referenceId: covenant.cardUuid, localGovernmentName: covenant.localGovernment?.name, applicant: covenant.applicant, fileNumber: covenant.fileNumber, boardCode: covenant.card.board.code, - } as SearchResultDto; - - return result; + }; } - private mapNotificationToSearchResult(notification: Notification) { - const result = { + private mapNotificationToSearchResult( + notification: Notification, + ): SearchResultDto { + return { type: CARD_TYPE.NOTIFICATION, referenceId: notification.fileNumber, localGovernmentName: notification.localGovernment?.name, applicant: notification.applicant, fileNumber: notification.fileNumber, - } as SearchResultDto; - - return result; + }; } @Post('/advanced') @UserRoles(...ROLES_ALLOWED_APPLICATIONS) async advancedSearch(@Body() searchDto: SearchRequestDto) { - const { searchApplications, searchNoi, searchNonApplications } = - this.getEntitiesTypeToSearch(searchDto); + const { + searchApplications, + searchNoi, + searchNonApplications, + searchNotifications, + } = this.getEntitiesTypeToSearch(searchDto); let applicationSearchResult: AdvancedSearchResultDto< ApplicationSubmissionSearchView[] @@ -198,13 +204,19 @@ export class SearchController { ); } - const mappedSearchResult = this.mapAdvancedSearchResults( + let notifications: AdvancedSearchResultDto< + NotificationSubmissionSearchView[] + > | null = null; + if (searchNotifications) { + notifications = await this.notificationSearchService.search(searchDto); + } + + return this.mapAdvancedSearchResults( applicationSearchResult, noticeOfIntentSearchService, nonApplications, + notifications, ); - - return mappedSearchResult; } @Post('/advanced/application') @@ -220,6 +232,7 @@ export class SearchController { applications, null, null, + null, ); return { @@ -240,6 +253,7 @@ export class SearchController { null, noticeOfIntents, null, + null, ); return { @@ -260,6 +274,29 @@ export class SearchController { null, null, nonApplications, + null, + ); + + return { + total: mappedSearchResult.totalNonApplications, + data: mappedSearchResult.nonApplications, + }; + } + + @Post('/advanced/notifications') + @UserRoles(...ROLES_ALLOWED_APPLICATIONS) + async advancedSearchNotifications( + @Body() searchDto: SearchRequestDto, + ): Promise<AdvancedSearchResultDto<NonApplicationSearchResultDto[]>> { + const notifications = await this.notificationSearchService.search( + searchDto, + ); + + const mappedSearchResult = this.mapAdvancedSearchResults( + null, + null, + null, + notifications, ); return { @@ -270,11 +307,10 @@ export class SearchController { private getEntitiesTypeToSearch(searchDto: SearchRequestDto) { let searchApplications = true; - let searchNoi = true; - let searchNonApplications = true; let nonApplicationTypeSpecified = false; let noiTypeSpecified = false; + let notificationTypeSpecified = false; if (searchDto.fileTypes.length > 0) { searchApplications = searchDto.fileTypes.filter((searchType) => @@ -287,47 +323,42 @@ export class SearchController { noiTypeSpecified = searchDto.fileTypes.includes('NOI'); - nonApplicationTypeSpecified = - searchDto.fileTypes.filter((searchType) => - ['COV', 'PLAN', 'SRW'].includes(searchType), - ).length > 0; - } - - searchNoi = - noiTypeSpecified || this.areAnyNoiSearchFieldsSpecified(searchDto); - - searchNonApplications = - nonApplicationTypeSpecified || - isStringSetAndNotEmpty(searchDto.fileNumber) || - isStringSetAndNotEmpty(searchDto.governmentName) || - isStringSetAndNotEmpty(searchDto.regionCode) || - isStringSetAndNotEmpty(searchDto.name); + notificationTypeSpecified = searchDto.fileTypes.includes('SRW'); - return { searchApplications, searchNoi, searchNonApplications }; - } - - public areAnyNoiSearchFieldsSpecified(searchDto: SearchRequestDto): boolean { - for (const key in searchDto) { - if ( - searchDto.hasOwnProperty(key) && - ![ - 'legacyId', - 'isIncludeOtherParcels', - 'fileTypes', - 'page', - 'pageSize', - 'sortField', - 'sortDirection', - ].includes(key) && - searchDto[key] !== undefined && - searchDto[key] !== '' && - searchDto[key] !== [] - ) { - return true; - } + nonApplicationTypeSpecified = searchDto.fileTypes.some((searchType) => + ['COV', 'PLAN'].includes(searchType), + ); } - return false; + const searchNoi = + (searchDto.fileTypes.length > 0 ? noiTypeSpecified : true) && + !searchDto.isIncludeOtherParcels && + !isStringSetAndNotEmpty(searchDto.legacyId); + + const searchNonApplications = + (searchDto.fileTypes.length > 0 ? nonApplicationTypeSpecified : true) && + !searchDto.dateDecidedFrom && + !searchDto.dateDecidedTo && + !searchDto.resolutionNumber && + !searchDto.resolutionYear && + !searchDto.isIncludeOtherParcels && + !isStringSetAndNotEmpty(searchDto.legacyId); + + const searchNotifications = + (searchDto.fileTypes.length > 0 ? notificationTypeSpecified : true) && + !searchDto.dateDecidedFrom && + !searchDto.dateDecidedTo && + !searchDto.resolutionNumber && + !searchDto.resolutionYear && + !searchDto.isIncludeOtherParcels && + !isStringSetAndNotEmpty(searchDto.legacyId); + + return { + searchApplications, + searchNoi, + searchNonApplications, + searchNotifications, + }; } private mapAdvancedSearchResults( @@ -338,6 +369,9 @@ export class SearchController { NoticeOfIntentSubmissionSearchView[] > | null, nonApplications: AdvancedSearchResultDto<NonApplicationSearchView[]> | null, + notifications: AdvancedSearchResultDto< + NotificationSubmissionSearchView[] + > | null, ) { const response = new AdvancedSearchResponseDto(); @@ -368,12 +402,23 @@ export class SearchController { ); } + const mappedNotifications: NotificationSearchResultDto[] = []; + if (notifications && notifications.data && notifications.data.length > 0) { + mappedNotifications.push( + ...notifications.data.map((notification) => + this.mapNotificationToAdvancedSearchResult(notification), + ), + ); + } + response.applications = mappedApplications; response.totalApplications = applications?.total ?? 0; response.noticeOfIntents = mappedNoticeOfIntents; response.totalNoticeOfIntents = noticeOfIntents?.total ?? 0; response.nonApplications = mappedNonApplications; response.totalNonApplications = nonApplications?.total ?? 0; + response.notifications = mappedNotifications; + response.totalNotifications = notifications?.total ?? 0; return response; } @@ -429,4 +474,23 @@ export class SearchController { class: nonApplication.class, }; } + + private mapNotificationToAdvancedSearchResult( + notification: NotificationSubmissionSearchView, + ): NoticeOfIntentSearchResultDto { + return { + referenceId: notification.fileNumber, + fileNumber: notification.fileNumber, + dateSubmitted: notification.dateSubmittedToAlc?.getTime(), + type: this.mapper.map( + notification.notificationType, + ApplicationType, + ApplicationTypeDto, + ), + localGovernmentName: notification.localGovernmentName, + ownerName: notification.applicant, + class: 'NOTI', + status: notification.status.status_type_code, + }; + } } diff --git a/services/apps/alcs/src/alcs/search/search.dto.ts b/services/apps/alcs/src/alcs/search/search.dto.ts index b617813718..baa3ede680 100644 --- a/services/apps/alcs/src/alcs/search/search.dto.ts +++ b/services/apps/alcs/src/alcs/search/search.dto.ts @@ -12,13 +12,13 @@ export class SearchResultDto { type: string; referenceId: string; applicant?: string; - localGovernmentName: string; + localGovernmentName: string | undefined; fileNumber: string; boardCode?: string; label?: ApplicationTypeDto; } -export type SearchEntityClass = 'APP' | 'NOI' | 'PLAN' | 'COV'; +export type SearchEntityClass = 'APP' | 'NOI' | 'PLAN' | 'COV' | 'NOTI'; export class ApplicationSearchResultDto { type: ApplicationTypeDto; @@ -54,13 +54,27 @@ export class NonApplicationSearchResultDto { class: SearchEntityClass; } +export class NotificationSearchResultDto { + type: ApplicationTypeDto; + referenceId: string; + ownerName?: string; + localGovernmentName?: string; + fileNumber: string; + boardCode?: string; + status: string; + dateSubmitted?: number; + class: SearchEntityClass; +} + export class AdvancedSearchResponseDto { applications: ApplicationSearchResultDto[]; noticeOfIntents: NoticeOfIntentSearchResultDto[]; nonApplications: NonApplicationSearchResultDto[]; + notifications: NotificationSearchResultDto[]; totalApplications: number; totalNoticeOfIntents: number; totalNonApplications: number; + totalNotifications: number; } export class AdvancedSearchResultDto<T> { diff --git a/services/apps/alcs/src/alcs/search/search.module.ts b/services/apps/alcs/src/alcs/search/search.module.ts index 010916870b..a1a81244d1 100644 --- a/services/apps/alcs/src/alcs/search/search.module.ts +++ b/services/apps/alcs/src/alcs/search/search.module.ts @@ -13,6 +13,8 @@ import { NonApplicationSearchView } from './non-applications/non-applications-vi import { NonApplicationsAdvancedSearchService } from './non-applications/non-applications.service'; import { NoticeOfIntentAdvancedSearchService } from './notice-of-intent/notice-of-intent-advanced-search.service'; import { NoticeOfIntentSubmissionSearchView } from './notice-of-intent/notice-of-intent-search-view.entity'; +import { NotificationAdvancedSearchService } from './notification/notification-advanced-search.service'; +import { NotificationSubmissionSearchView } from './notification/notification-search-view.entity'; import { SearchController } from './search.controller'; import { SearchService } from './search.service'; @@ -28,6 +30,7 @@ import { SearchService } from './search.service'; ApplicationSubmissionSearchView, NoticeOfIntentSubmissionSearchView, NonApplicationSearchView, + NotificationSubmissionSearchView, ]), ], providers: [ @@ -36,6 +39,7 @@ import { SearchService } from './search.service'; ApplicationAdvancedSearchService, NoticeOfIntentAdvancedSearchService, NonApplicationsAdvancedSearchService, + NotificationAdvancedSearchService, ], controllers: [SearchController], }) diff --git a/services/apps/alcs/src/alcs/search/search.service.ts b/services/apps/alcs/src/alcs/search/search.service.ts index 99f366391b..c69dc2906b 100644 --- a/services/apps/alcs/src/alcs/search/search.service.ts +++ b/services/apps/alcs/src/alcs/search/search.service.ts @@ -30,7 +30,7 @@ export class SearchService { ) {} async getApplication(fileNumber: string) { - const application = await this.applicationRepository.findOne({ + return await this.applicationRepository.findOne({ where: { fileNumber, }, @@ -40,12 +40,10 @@ export class SearchService { type: true, }, }); - - return application; } async getNoi(fileNumber: string) { - const noi = await this.noiRepository.findOne({ + return await this.noiRepository.findOne({ where: { fileNumber, }, @@ -54,42 +52,34 @@ export class SearchService { localGovernment: true, }, }); - - return noi; } async getPlanningReview(fileNumber: string) { - const planningReview = await this.planningReviewRepository.findOne({ + return await this.planningReviewRepository.findOne({ where: { fileNumber, card: { archived: false }, }, relations: CARD_RELATIONSHIP, }); - - return planningReview; } async getCovenant(fileNumber: string) { - const covenant = await this.covenantRepository.findOne({ + return await this.covenantRepository.findOne({ where: { fileNumber, card: { archived: false }, }, relations: CARD_RELATIONSHIP, }); - - return covenant; } async getNotification(fileNumber: string) { - const notification = await this.notificationRepository.findOne({ + return await this.notificationRepository.findOne({ where: { fileNumber, }, relations: CARD_RELATIONSHIP, }); - - return notification; } } diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1695230223368-add_status_function_for_notification.ts b/services/apps/alcs/src/providers/typeorm/migrations/1695230223368-add_status_function_for_notification.ts new file mode 100644 index 0000000000..8954ade31d --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1695230223368-add_status_function_for_notification.ts @@ -0,0 +1,43 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class addStatusFunctionForNotification1695230223368 + implements MigrationInterface +{ + public async up(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `CREATE OR REPLACE FUNCTION alcs.get_current_status_for_notification_submission_by_uuid (application_submission_uuid uuid) + RETURNS jsonb + LANGUAGE plpgsql + AS $function$ + DECLARE + utc_timestamp_tomorrow timestamptz; + result RECORD; + BEGIN + -- TODO adjust the date according to api + utc_timestamp_tomorrow = timezone('utc', (now() - INTERVAL '-1 DAY')); + SELECT + notistss.submission_uuid, + notistss.status_type_code, + notistss.effective_date, + noti_status. "label" + FROM + alcs.notification_submission_status_type noti_status + JOIN alcs.notification_submission_to_submission_status notistss ON noti_status.code = notistss.status_type_code + AND notistss.submission_uuid = application_submission_uuid + AND notistss.effective_date IS NOT NULL + WHERE + notistss.effective_date < utc_timestamp_tomorrow + ORDER BY + notistss.effective_date DESC, + weight DESC + LIMIT 1 INTO result; + RETURN row_to_json(RESULT); + END; + $function$;`, + ); + } + + public async down(queryRunner: QueryRunner): Promise<void> { + //nope + } +} diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1695234110261-add_notification_advanced_search_view.ts b/services/apps/alcs/src/providers/typeorm/migrations/1695234110261-add_notification_advanced_search_view.ts new file mode 100644 index 0000000000..4302ba6ba8 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1695234110261-add_notification_advanced_search_view.ts @@ -0,0 +1,32 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class addNotificationAdvancedSearchView1695234110261 + implements MigrationInterface +{ + name = 'addNotificationAdvancedSearchView1695234110261'; + + public async up(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `CREATE VIEW "alcs"."notification_submission_search_view" AS SELECT "noti_sub"."uuid" AS "uuid", "noti_sub"."applicant" AS "applicant", "noti"."uuid" AS "notification_uuid", "notificationType"."audit_deleted_date_at" AS "notificationType_audit_deleted_date_at", "notificationType"."audit_created_at" AS "notificationType_audit_created_at", "notificationType"."audit_updated_at" AS "notificationType_audit_updated_at", "notificationType"."audit_created_by" AS "notificationType_audit_created_by", "notificationType"."audit_updated_by" AS "notificationType_audit_updated_by", "notificationType"."label" AS "notificationType_label", "notificationType"."code" AS "notificationType_code", "notificationType"."description" AS "notificationType_description", "notificationType"."short_label" AS "notificationType_short_label", "notificationType"."background_color" AS "notificationType_background_color", "notificationType"."text_color" AS "notificationType_text_color", "notificationType"."html_description" AS "notificationType_html_description", "notificationType"."portal_label" AS "notificationType_portal_label", "localGovernment"."name" AS "local_government_name", "noti_sub"."file_number" AS "file_number", "noti_sub"."local_government_uuid" AS "local_government_uuid", "noti"."type_code" AS "notification_type_code", "noti"."date_submitted_to_alc" AS "date_submitted_to_alc", "noti"."region_code" AS "notification_region_code", alcs.get_current_status_for_notification_submission_by_uuid("noti_sub"."uuid") AS "status" FROM "alcs"."notification_submission" "noti_sub" INNER JOIN "alcs"."notification" "noti" ON "noti"."file_number" = "noti_sub"."file_number" AND "noti"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."notification_type" "notificationType" ON "noti_sub"."type_code" = "notificationType"."code" AND "notificationType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "noti"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL WHERE "noti_sub"."audit_deleted_date_at" IS NULL`, + ); + await queryRunner.query( + `INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, + [ + 'alcs', + 'VIEW', + 'notification_submission_search_view', + 'SELECT "noti_sub"."uuid" AS "uuid", "noti_sub"."applicant" AS "applicant", "noti"."uuid" AS "notification_uuid", "notificationType"."audit_deleted_date_at" AS "notificationType_audit_deleted_date_at", "notificationType"."audit_created_at" AS "notificationType_audit_created_at", "notificationType"."audit_updated_at" AS "notificationType_audit_updated_at", "notificationType"."audit_created_by" AS "notificationType_audit_created_by", "notificationType"."audit_updated_by" AS "notificationType_audit_updated_by", "notificationType"."label" AS "notificationType_label", "notificationType"."code" AS "notificationType_code", "notificationType"."description" AS "notificationType_description", "notificationType"."short_label" AS "notificationType_short_label", "notificationType"."background_color" AS "notificationType_background_color", "notificationType"."text_color" AS "notificationType_text_color", "notificationType"."html_description" AS "notificationType_html_description", "notificationType"."portal_label" AS "notificationType_portal_label", "localGovernment"."name" AS "local_government_name", "noti_sub"."file_number" AS "file_number", "noti_sub"."local_government_uuid" AS "local_government_uuid", "noti"."type_code" AS "notification_type_code", "noti"."date_submitted_to_alc" AS "date_submitted_to_alc", "noti"."region_code" AS "notification_region_code", alcs.get_current_status_for_notification_submission_by_uuid("noti_sub"."uuid") AS "status" FROM "alcs"."notification_submission" "noti_sub" INNER JOIN "alcs"."notification" "noti" ON "noti"."file_number" = "noti_sub"."file_number" AND "noti"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."notification_type" "notificationType" ON "noti_sub"."type_code" = "notificationType"."code" AND "notificationType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "noti"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL WHERE "noti_sub"."audit_deleted_date_at" IS NULL', + ], + ); + } + + public async down(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, + ['VIEW', 'notification_submission_search_view', 'alcs'], + ); + await queryRunner.query( + `DROP VIEW "alcs"."notification_submission_search_view"`, + ); + } +} From 5acb655c1a2e1ade16bc02481197ac2568926bbf Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Thu, 21 Sep 2023 15:23:30 -0700 Subject: [PATCH 412/954] SRW Bug Fixes --- .../notification-details.component.html | 23 ++++++++++--------- .../notification/intake/intake.component.html | 2 +- .../notification/intake/intake.component.scss | 10 ++++++++ .../notification/notification.component.ts | 2 +- .../notification-document.service.ts | 2 +- .../confirmation-dialog.component.html | 4 ++-- .../confirmation-dialog.component.scss | 6 ----- .../notification/notification.controller.ts | 17 ++++++++------ .../notification-document.controller.ts | 6 +---- 9 files changed, 38 insertions(+), 34 deletions(-) diff --git a/alcs-frontend/src/app/features/notification/applicant-info/notification-details/notification-details.component.html b/alcs-frontend/src/app/features/notification/applicant-info/notification-details/notification-details.component.html index 3ef70a3acb..07e43a6738 100644 --- a/alcs-frontend/src/app/features/notification/applicant-info/notification-details/notification-details.component.html +++ b/alcs-frontend/src/app/features/notification/applicant-info/notification-details/notification-details.component.html @@ -2,16 +2,16 @@ <app-parcel *ngIf="files && submission" [notificationSubmission]="submission"></app-parcel> </section> <section> - <h3>Transferees</h3> + <h3>Transferee(s)</h3> <div *ngIf="submission" class="review-table"> <div class="transferee-table full-width"> <div class="subheading2">Type</div> <div class="subheading2">Full Name</div> - <div class="subheading2">Organization</div> + <div class="subheading2">Organization Name</div> <div class="subheading2">Phone</div> <div class="subheading2">Email</div> <ng-container *ngFor="let transferee of submission.transferees"> - <div>{{ transferee.type.label }}</div> + <div>{{ transferee.type.code === 'INDV' ? 'Individual' : 'Organization' }}</div> <div>{{ transferee.displayName }}</div> <div> {{ transferee.organizationName }} @@ -28,7 +28,7 @@ <h3>Transferees</h3> <section> <h3>Primary Contact Information</h3> <div *ngIf="submission" class="review-table"> - <div class="subheading2 grid-1">Type</div> + <div class="subheading2 grid-1">First Name</div> <div class="grid-double"> {{ submission.contactFirstName }} <app-no-data *ngIf="!submission.contactFirstName"></app-no-data> @@ -56,7 +56,7 @@ <h3>Primary Contact Information</h3> </div> </section> <section *ngIf="showFullApp"> - <h3>Proposal</h3> + <h3>Purpose of SRW</h3> <div *ngIf="submission" class="review-table"> <div class="subheading2 grid-1">Submitter’s File Number</div> <div class="grid-double"> @@ -109,18 +109,19 @@ <h3>Proposal</h3> <h3>Optional Documents</h3> <div *ngIf="submission" class="review-table"> <div class="other-attachments full-width"> - <div class="grid-1 subheading2">Type</div> - <div class="grid-2 subheading2">Description</div> - <div class="grid-3 subheading2">File Name</div> + <div class="grid-1 subheading2">File Name</div> + <div class="grid-2 subheading2">Type</div> + <div class="grid-3 subheading2">Description</div> + <ng-container *ngFor="let file of otherFiles"> <div class="grid-1"> - {{ file.type?.label }} + <a (click)="openFile(file.uuid)">{{ file.fileName }}</a> </div> <div class="grid-2"> - {{ file.description }} + {{ file.type?.label }} </div> <div class="grid-3"> - <a (click)="openFile(file.uuid)">{{ file.fileName }}</a> + {{ file.description }} </div> </ng-container> <div *ngIf="otherFiles.length === 0" class="full-width">No optional attachments</div> diff --git a/alcs-frontend/src/app/features/notification/intake/intake.component.html b/alcs-frontend/src/app/features/notification/intake/intake.component.html index 95f810c5e9..192bcc2d02 100644 --- a/alcs-frontend/src/app/features/notification/intake/intake.component.html +++ b/alcs-frontend/src/app/features/notification/intake/intake.component.html @@ -10,7 +10,7 @@ <h3>ALC Intake</h3> </div> <div> <div class="subheading2 left"> - ALC Auto-email Response + ALC Auto-Email Response <mat-icon class="icon" matTooltip='Portal status updated to "ALC Response Sent" when auto-email is successfully sent.' diff --git a/alcs-frontend/src/app/features/notification/intake/intake.component.scss b/alcs-frontend/src/app/features/notification/intake/intake.component.scss index cf5f409b13..56c3f6190b 100644 --- a/alcs-frontend/src/app/features/notification/intake/intake.component.scss +++ b/alcs-frontend/src/app/features/notification/intake/intake.component.scss @@ -38,3 +38,13 @@ .left { margin-top: 3px; } + +:host::ng-deep { + .editing { + width: 100%; + } + + .mat-mdc-form-field { + width: 100%; + } +} diff --git a/alcs-frontend/src/app/features/notification/notification.component.ts b/alcs-frontend/src/app/features/notification/notification.component.ts index 9fa76a2cef..2d4fa7da13 100644 --- a/alcs-frontend/src/app/features/notification/notification.component.ts +++ b/alcs-frontend/src/app/features/notification/notification.component.ts @@ -20,7 +20,7 @@ export const preSubmissionRoutes = [ }, { path: 'applicant-info', - menuTitle: 'App Preview', + menuTitle: 'SRW Preview', icon: 'persons', component: ApplicantInfoComponent, }, diff --git a/alcs-frontend/src/app/services/notification/notification-document/notification-document.service.ts b/alcs-frontend/src/app/services/notification/notification-document/notification-document.service.ts index a153d27d08..8bbb292a54 100644 --- a/alcs-frontend/src/app/services/notification/notification-document/notification-document.service.ts +++ b/alcs-frontend/src/app/services/notification/notification-document/notification-document.service.ts @@ -38,7 +38,7 @@ export class NotificationDocumentService { } let formData = this.convertDtoToFormData(createDto); - const res = await firstValueFrom(this.http.post(`${this.url}/noi/${fileNumber}`, formData)); + const res = await firstValueFrom(this.http.post(`${this.url}/notification/${fileNumber}`, formData)); this.toastService.showSuccessToast('Document uploaded'); return res; } diff --git a/alcs-frontend/src/app/shared/confirmation-dialog/confirmation-dialog.component.html b/alcs-frontend/src/app/shared/confirmation-dialog/confirmation-dialog.component.html index ffb274bff3..c03989f290 100644 --- a/alcs-frontend/src/app/shared/confirmation-dialog/confirmation-dialog.component.html +++ b/alcs-frontend/src/app/shared/confirmation-dialog/confirmation-dialog.component.html @@ -1,5 +1,5 @@ -<div class="card-title" *ngIf="data.title" mat-dialog-title> - <h2>{{ data.title }}</h2> +<div *ngIf="data.title" mat-dialog-title> + <span class="subheading2">{{ data.title }}</span> </div> <div mat-dialog-content> <p>{{ data.body }}</p> diff --git a/alcs-frontend/src/app/shared/confirmation-dialog/confirmation-dialog.component.scss b/alcs-frontend/src/app/shared/confirmation-dialog/confirmation-dialog.component.scss index a93c024a68..2261cbad7f 100644 --- a/alcs-frontend/src/app/shared/confirmation-dialog/confirmation-dialog.component.scss +++ b/alcs-frontend/src/app/shared/confirmation-dialog/confirmation-dialog.component.scss @@ -1,9 +1,3 @@ .mat-dialog-actions { justify-content: flex-end; } - -.card-title { - align-items: center; - margin-right: 2rem !important; - margin-bottom: 2rem; -} diff --git a/services/apps/alcs/src/alcs/notification/notification.controller.ts b/services/apps/alcs/src/alcs/notification/notification.controller.ts index d3843cf36c..a766965345 100644 --- a/services/apps/alcs/src/alcs/notification/notification.controller.ts +++ b/services/apps/alcs/src/alcs/notification/notification.controller.ts @@ -72,13 +72,16 @@ export class NotificationController { ]); if (updateDto.localGovernmentUuid) { - await this.notificationSubmissionService.update( - fileNumber, - { - localGovernmentUuid: updateDto.localGovernmentUuid, - }, - req.user.entity, - ); + const uuid = await this.notificationSubmissionService.getUuid(fileNumber); + if (uuid) { + await this.notificationSubmissionService.update( + uuid, + { + localGovernmentUuid: updateDto.localGovernmentUuid, + }, + req.user.entity, + ); + } } return mapped[0]; diff --git a/services/apps/alcs/src/portal/notification-document/notification-document.controller.ts b/services/apps/alcs/src/portal/notification-document/notification-document.controller.ts index cfe6e67121..33a238fa93 100644 --- a/services/apps/alcs/src/portal/notification-document/notification-document.controller.ts +++ b/services/apps/alcs/src/portal/notification-document/notification-document.controller.ts @@ -145,11 +145,7 @@ export class NotificationDocumentController { documentUuid: document.uuid, type: data.documentType, }, - [ - VISIBILITY_FLAG.APPLICANT, - VISIBILITY_FLAG.GOVERNMENT, - VISIBILITY_FLAG.COMMISSIONER, - ], + [VISIBILITY_FLAG.APPLICANT, VISIBILITY_FLAG.GOVERNMENT], ); const mappedDocs = this.mapPortalDocuments([savedDocument]); From f0a70606f185780d9c11510ccce99bb7e9127360 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Thu, 21 Sep 2023 16:24:48 -0700 Subject: [PATCH 413/954] More SRW Bug Fixes --- .../notification-details.component.html | 56 ++++++++++--------- .../notification-details.component.scss | 12 ++-- .../app/shared/no-data/no-data.component.scss | 1 + 3 files changed, 36 insertions(+), 33 deletions(-) diff --git a/portal-frontend/src/app/features/notifications/notification-details/notification-details.component.html b/portal-frontend/src/app/features/notifications/notification-details/notification-details.component.html index b559512d8f..3d3464e451 100644 --- a/portal-frontend/src/app/features/notifications/notification-details/notification-details.component.html +++ b/portal-frontend/src/app/features/notifications/notification-details/notification-details.component.html @@ -5,32 +5,38 @@ [showEdit]="showEdit" ></app-parcel> </section> -<h3>2. Identify Transferee(s)</h3> -<div *ngIf="notificationSubmission" class="review-table"> - <div class="full-width transferee-table"> - <div class="subheading2">Type</div> - <div class="subheading2">Full Name</div> - <div class="subheading2">Organization Name</div> - <div class="subheading2">Phone</div> - <div class="subheading2">Email</div> - <ng-container *ngFor="let transferee of notificationSubmission.transferees"> - <div>{{ transferee.type.code === 'INDV' ? 'Individual' : 'Organization' }}</div> - <div>{{ transferee.displayName }}</div> - <div> - {{ transferee.organizationName }} - <app-no-data [showRequired]="false" *ngIf="!transferee.organizationName"></app-no-data> - </div> - <div> - <span *ngIf="transferee.phoneNumber">{{ transferee.phoneNumber | mask : '(000) 000-0000' }}</span> - </div> - <div>{{ transferee.email }}</div> - </ng-container> - </div> - <app-no-data [showRequired]="showErrors" *ngIf="notificationSubmission.transferees.length === 0"></app-no-data> - <div *ngIf="showEdit" class="edit-button"> - <button mat-flat-button (click)="onNavigateToStep(1)" color="accent">Edit Section</button> +<section> + <h3>2. Identify Transferee(s)</h3> + <div *ngIf="notificationSubmission" class="review-table"> + <div class="full-width transferee-table"> + <div class="subheading2">Type</div> + <div class="subheading2">Full Name</div> + <div class="subheading2">Organization Name</div> + <div class="subheading2">Phone</div> + <div class="subheading2">Email</div> + <ng-container *ngFor="let transferee of notificationSubmission.transferees"> + <div>{{ transferee.type.code === 'INDV' ? 'Individual' : 'Organization' }}</div> + <div>{{ transferee.displayName }}</div> + <div> + {{ transferee.organizationName }} + <app-no-data [showRequired]="false" *ngIf="!transferee.organizationName"></app-no-data> + </div> + <div> + <span *ngIf="transferee.phoneNumber">{{ transferee.phoneNumber | mask : '(000) 000-0000' }}</span> + </div> + <div>{{ transferee.email }}</div> + </ng-container> + </div> + <app-no-data + class="full-width" + [showRequired]="showErrors" + *ngIf="notificationSubmission.transferees.length === 0" + ></app-no-data> + <div *ngIf="showEdit" class="edit-button"> + <button mat-flat-button (click)="onNavigateToStep(1)" color="accent">Edit Section</button> + </div> </div> -</div> +</section> <section> <h3>3. Primary Contact</h3> <div *ngIf="notificationSubmission" class="review-table other-layout"> diff --git a/portal-frontend/src/app/features/notifications/notification-details/notification-details.component.scss b/portal-frontend/src/app/features/notifications/notification-details/notification-details.component.scss index 7ee46e5e9f..4f97beff43 100644 --- a/portal-frontend/src/app/features/notifications/notification-details/notification-details.component.scss +++ b/portal-frontend/src/app/features/notifications/notification-details/notification-details.component.scss @@ -58,14 +58,6 @@ overflow-x: auto; } - .soil-table { - display: grid; - grid-template-columns: max-content max-content; - overflow-x: auto; - grid-column-gap: rem(36); - grid-row-gap: rem(12); - } - .other-attachments { display: grid; grid-template-columns: max-content max-content max-content; @@ -99,6 +91,10 @@ &.other-layout { grid-template-columns: 1fr 1fr; + + .edit-button { + grid-column: 1/3; + } } .edit-button { diff --git a/portal-frontend/src/app/shared/no-data/no-data.component.scss b/portal-frontend/src/app/shared/no-data/no-data.component.scss index 15c2153dfa..4ef7e84f08 100644 --- a/portal-frontend/src/app/shared/no-data/no-data.component.scss +++ b/portal-frontend/src/app/shared/no-data/no-data.component.scss @@ -15,6 +15,7 @@ margin-right: rem(4); font-size: rem(14); width: rem(14); + min-width: rem(14); height: rem(14); } } From 042084fbaa710529f13efd743603057330ca56fa Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Thu, 21 Sep 2023 16:51:01 -0700 Subject: [PATCH 414/954] Show PID error when Parcel type is not selected --- .../notification-details/parcel/parcel.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/portal-frontend/src/app/features/notifications/notification-details/parcel/parcel.component.html b/portal-frontend/src/app/features/notifications/notification-details/parcel/parcel.component.html index 1b3e8922b1..9d96f578e2 100644 --- a/portal-frontend/src/app/features/notifications/notification-details/parcel/parcel.component.html +++ b/portal-frontend/src/app/features/notifications/notification-details/parcel/parcel.component.html @@ -36,7 +36,7 @@ <h4>Parcel {{ parcelInd + 1 }} Information</h4> <div class="grid-double"> <span *ngIf="parcel.pid">{{ parcel.pid | mask : '000-000-000' }}</span> <app-no-data - [showRequired]="showErrors && parcel.ownershipType?.code === PARCEL_OWNERSHIP_TYPES.FEE_SIMPLE" + [showRequired]="showErrors && parcel.ownershipType?.code !== PARCEL_OWNERSHIP_TYPES.CROWN" *ngIf="!parcel.pid" ></app-no-data> <app-validation-error *ngIf="showErrors && parcel.pid && parcel.pid.length < 9"> From c59296254b6717d8ddc2497ce0f5acec54ee9d21 Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Fri, 22 Sep 2023 11:08:52 -0700 Subject: [PATCH 415/954] Feature/alcs 1129 - import data from OATS to ALCS -> notice_of_intent table part 1 (#994) import into the notice_of_intent table fix the import issue with the document bonus: open links in a new tab --- .../applications/app_prep.py | 4 +- .../submissions/__init__.py | 0 .../submissions/app_submissions.py | 55 ++++--- .../submissions/sql/app_submission.sql | 0 .../submissions/sql/app_submission_count.sql | 0 .../submissions/submap/__init__.py | 0 .../submissions/submap/direction_mapping.py | 0 .../submissions/submap/soil_elements.py | 0 .../submissions/submap/subdiv_plot.py | 0 bin/migrate-oats-data/common/constants.py | 1 + bin/migrate-oats-data/common/etl_logger.py | 5 +- bin/migrate-oats-data/constants.py | 1 - bin/migrate-oats-data/migrate.py | 28 +++- bin/migrate-oats-data/noi/__init__.py | 2 +- .../noi/{noi.py => notice_of_intent_init.py} | 0 .../__init__.py | 1 + ...oats_to_alcs_notice_of_intent_table_etl.py | 144 ++++++++++++++++++ bin/migrate-oats-data/noi/sql/insert_noi.sql | 10 +- .../notice_of_intent_base.count.sql | 12 ++ .../notice_of_intent_base.sql | 25 +++ .../notice_of_intent_base_validation.sql | 54 +++++++ .../parcel-entry/parcel-entry.component.html | 2 +- .../parcel-entry/parcel-entry.component.html | 4 +- 23 files changed, 308 insertions(+), 40 deletions(-) rename bin/migrate-oats-data/{ => applications}/submissions/__init__.py (100%) rename bin/migrate-oats-data/{ => applications}/submissions/app_submissions.py (88%) rename bin/migrate-oats-data/{ => applications}/submissions/sql/app_submission.sql (100%) rename bin/migrate-oats-data/{ => applications}/submissions/sql/app_submission_count.sql (100%) rename bin/migrate-oats-data/{ => applications}/submissions/submap/__init__.py (100%) rename bin/migrate-oats-data/{ => applications}/submissions/submap/direction_mapping.py (100%) rename bin/migrate-oats-data/{ => applications}/submissions/submap/soil_elements.py (100%) rename bin/migrate-oats-data/{ => applications}/submissions/submap/subdiv_plot.py (100%) delete mode 100644 bin/migrate-oats-data/constants.py rename bin/migrate-oats-data/noi/{noi.py => notice_of_intent_init.py} (100%) create mode 100644 bin/migrate-oats-data/noi/oats_to_alcs_notice_of_intent_table_etl/__init__.py create mode 100644 bin/migrate-oats-data/noi/oats_to_alcs_notice_of_intent_table_etl/oats_to_alcs_notice_of_intent_table_etl.py create mode 100644 bin/migrate-oats-data/noi/sql/notice_of_intent_base/notice_of_intent_base.count.sql create mode 100644 bin/migrate-oats-data/noi/sql/notice_of_intent_base/notice_of_intent_base.sql create mode 100644 bin/migrate-oats-data/noi/sql/notice_of_intent_base/notice_of_intent_base_validation.sql diff --git a/bin/migrate-oats-data/applications/app_prep.py b/bin/migrate-oats-data/applications/app_prep.py index 01d346eef9..39e216dbb0 100644 --- a/bin/migrate-oats-data/applications/app_prep.py +++ b/bin/migrate-oats-data/applications/app_prep.py @@ -10,7 +10,7 @@ AlcsApplicantType, ) from db import inject_conn_pool -from constants import BATCH_UPLOAD_SIZE +from common import BATCH_UPLOAD_SIZE from psycopg2.extras import execute_batch, RealDictCursor import traceback from enum import Enum @@ -288,7 +288,6 @@ def get_update_query_for_nar(): def get_update_query_for_exc(): - # TODO Will be finalized in ALCS-834. # exclsn_app_type_code is out of scope. It is a part of submission unique_fields = """, incl_excl_applicant_type = %(legislation_code)s""" @@ -296,7 +295,6 @@ def get_update_query_for_exc(): def get_update_query_for_inc(): - # TODO Will be finalized in ALCS-834. unique_fields = """, incl_excl_applicant_type = %(legislation_code)s""" return get_update_query(unique_fields) diff --git a/bin/migrate-oats-data/submissions/__init__.py b/bin/migrate-oats-data/applications/submissions/__init__.py similarity index 100% rename from bin/migrate-oats-data/submissions/__init__.py rename to bin/migrate-oats-data/applications/submissions/__init__.py diff --git a/bin/migrate-oats-data/submissions/app_submissions.py b/bin/migrate-oats-data/applications/submissions/app_submissions.py similarity index 88% rename from bin/migrate-oats-data/submissions/app_submissions.py rename to bin/migrate-oats-data/applications/submissions/app_submissions.py index 585206a424..e92f532281 100644 --- a/bin/migrate-oats-data/submissions/app_submissions.py +++ b/bin/migrate-oats-data/applications/submissions/app_submissions.py @@ -18,7 +18,7 @@ add_soil_field, ) from db import inject_conn_pool -from constants import BATCH_UPLOAD_SIZE +from common import BATCH_UPLOAD_SIZE from psycopg2.extras import execute_batch, RealDictCursor import traceback from enum import Enum @@ -26,6 +26,7 @@ etl_name = "alcs_app_sub" + @inject_conn_pool def process_alcs_app_submissions(conn=None, batch_size=BATCH_UPLOAD_SIZE): """ @@ -39,7 +40,7 @@ def process_alcs_app_submissions(conn=None, batch_size=BATCH_UPLOAD_SIZE): log_start(etl_name) with conn.cursor(cursor_factory=RealDictCursor) as cursor: with open( - "submissions/sql/app_submission_count.sql", + "applications/submissions/sql/app_submission_count.sql", "r", encoding="utf-8", ) as sql_file: @@ -53,7 +54,7 @@ def process_alcs_app_submissions(conn=None, batch_size=BATCH_UPLOAD_SIZE): last_submission_id = 0 with open( - "submissions/sql/app_submission.sql", + "applications/submissions/sql/app_submission.sql", "r", encoding="utf-8", ) as sql_file: @@ -68,14 +69,21 @@ def process_alcs_app_submissions(conn=None, batch_size=BATCH_UPLOAD_SIZE): if not rows: break try: - direction_data = get_direction_data(rows, cursor) subdiv_data = get_subdiv_data(rows, cursor) soil_data = get_soil_data(rows, cursor) submissions_to_be_inserted_count = len(rows) - insert_app_sub_records(conn, batch_size, cursor, rows, direction_data, subdiv_data, soil_data) + insert_app_sub_records( + conn, + batch_size, + cursor, + rows, + direction_data, + subdiv_data, + soil_data, + ) successful_inserts_count = ( successful_inserts_count + submissions_to_be_inserted_count @@ -99,7 +107,10 @@ def process_alcs_app_submissions(conn=None, batch_size=BATCH_UPLOAD_SIZE): print("Total failed inserts:", failed_inserts) log_end(etl_name) -def insert_app_sub_records(conn, batch_size, cursor, rows, direction_data, subdiv_data, soil_data): + +def insert_app_sub_records( + conn, batch_size, cursor, rows, direction_data, subdiv_data, soil_data +): """ Function to insert submission records in batches. @@ -110,7 +121,7 @@ def insert_app_sub_records(conn, batch_size, cursor, rows, direction_data, subdi rows (list): Rows of data to insert in the database. direction_data (dict): Dictionary of adjacent parcel data subdiv_data: dictionary of subdivision data lists - soil_data: dictonary of soil element data. + soil_data: dictionary of soil element data. Returns: None: Commits the changes to the database. @@ -140,13 +151,14 @@ def insert_app_sub_records(conn, batch_size, cursor, rows, direction_data, subdi if len(other_data_list) > 0: execute_batch( cursor, - get_insert_query("",""), + get_insert_query("", ""), other_data_list, page_size=batch_size, ) conn.commit() + def prepare_app_sub_data(app_sub_raw_data_list, direction_data, subdiv_data, soil_data): """ This function prepares different lists of data based on the 'alr_change_code' field of each data dict in 'app_sub_raw_data_list'. @@ -154,7 +166,7 @@ def prepare_app_sub_data(app_sub_raw_data_list, direction_data, subdiv_data, soi :param app_sub_raw_data_list: A list of raw data dictionaries. :param direction_data: A dictionary of adjacent parcel data. :param subdiv_data: dictionary of subdivision data lists. - :param soil_data: dictonary of soil element data. + :param soil_data: dictionary of soil element data. :return: Five lists, each containing dictionaries from 'app_sub_raw_data_list' and 'direction_data' grouped based on the 'alr_change_code' field Detailed Workflow: @@ -173,9 +185,9 @@ def prepare_app_sub_data(app_sub_raw_data_list, direction_data, subdiv_data, soi for row in app_sub_raw_data_list: data = dict(row) data = add_direction_field(data) - data = add_subdiv(data,json) + data = add_subdiv(data, json) data = add_soil_field(data) - if data['alr_appl_component_id'] in subdiv_data: + if data["alr_appl_component_id"] in subdiv_data: data = map_subdiv_lots(data, subdiv_data, json) if data["alr_application_id"] in direction_data: data = map_direction_values(data, direction_data) @@ -183,7 +195,10 @@ def prepare_app_sub_data(app_sub_raw_data_list, direction_data, subdiv_data, soi data = map_soil_data(data, soil_data) if data["alr_change_code"] == ALRChangeCode.NFU.value: nfu_data_list.append(data) - elif data["alr_change_code"] == ALRChangeCode.EXC.value or data["alr_change_code"] == ALRChangeCode.INC.value: + elif ( + data["alr_change_code"] == ALRChangeCode.EXC.value + or data["alr_change_code"] == ALRChangeCode.INC.value + ): inc_exc_data_list.append(data) else: other_data_list.append(data) @@ -191,7 +206,7 @@ def prepare_app_sub_data(app_sub_raw_data_list, direction_data, subdiv_data, soi return nfu_data_list, other_data_list, inc_exc_data_list -def get_insert_query(unique_fields,unique_values): +def get_insert_query(unique_fields, unique_values): # unique_fields takes input from called function and appends to query query = """ INSERT INTO alcs.application_submission ( @@ -233,6 +248,7 @@ def get_insert_query(unique_fields,unique_values): """ return query.format(unique_fields=unique_fields, unique_values=unique_values) + def get_insert_query_for_nfu(): unique_fields = """, nfu_hectares, nfu_will_import_fill, @@ -254,12 +270,14 @@ def get_insert_query_for_nfu(): %(fill_duration_unit)s, %(fill_area)s """ - return get_insert_query(unique_fields,unique_values) + return get_insert_query(unique_fields, unique_values) + def get_insert_query_for_inc_exc(): unique_fields = ", incl_excl_hectares" unique_values = ", %(alr_area)s" - return get_insert_query(unique_fields,unique_values) + return get_insert_query(unique_fields, unique_values) + def get_direction_data(rows, cursor): # runs query to get direction data and creates a dict based on alr_application_id @@ -267,17 +285,20 @@ def get_direction_data(rows, cursor): direction_data = create_direction_dict(adj_rows) return direction_data + def get_subdiv_data(rows, cursor): - # runs query to get subdivision data and creates a dictionaly based on alr_appl_component_id with a list of plots + # runs query to get subdivision data and creates a dictionary based on alr_appl_component_id with a list of plots subdiv_rows = get_subdiv_rows(rows, cursor) subdiv_data = create_subdiv_dict(subdiv_rows) return subdiv_data + def get_soil_data(rows, cursor): soil_rows = get_soil_rows(rows, cursor) soil_data = create_soil_dict(soil_rows) return soil_data + @inject_conn_pool def clean_application_submission(conn=None): print("Start application_submission cleaning") @@ -285,4 +306,4 @@ def clean_application_submission(conn=None): cursor.execute( "DELETE FROM alcs.application_submission a WHERE a.audit_created_by = 'oats_etl'" ) - print(f"Deleted items count = {cursor.rowcount}") \ No newline at end of file + print(f"Deleted items count = {cursor.rowcount}") diff --git a/bin/migrate-oats-data/submissions/sql/app_submission.sql b/bin/migrate-oats-data/applications/submissions/sql/app_submission.sql similarity index 100% rename from bin/migrate-oats-data/submissions/sql/app_submission.sql rename to bin/migrate-oats-data/applications/submissions/sql/app_submission.sql diff --git a/bin/migrate-oats-data/submissions/sql/app_submission_count.sql b/bin/migrate-oats-data/applications/submissions/sql/app_submission_count.sql similarity index 100% rename from bin/migrate-oats-data/submissions/sql/app_submission_count.sql rename to bin/migrate-oats-data/applications/submissions/sql/app_submission_count.sql diff --git a/bin/migrate-oats-data/submissions/submap/__init__.py b/bin/migrate-oats-data/applications/submissions/submap/__init__.py similarity index 100% rename from bin/migrate-oats-data/submissions/submap/__init__.py rename to bin/migrate-oats-data/applications/submissions/submap/__init__.py diff --git a/bin/migrate-oats-data/submissions/submap/direction_mapping.py b/bin/migrate-oats-data/applications/submissions/submap/direction_mapping.py similarity index 100% rename from bin/migrate-oats-data/submissions/submap/direction_mapping.py rename to bin/migrate-oats-data/applications/submissions/submap/direction_mapping.py diff --git a/bin/migrate-oats-data/submissions/submap/soil_elements.py b/bin/migrate-oats-data/applications/submissions/submap/soil_elements.py similarity index 100% rename from bin/migrate-oats-data/submissions/submap/soil_elements.py rename to bin/migrate-oats-data/applications/submissions/submap/soil_elements.py diff --git a/bin/migrate-oats-data/submissions/submap/subdiv_plot.py b/bin/migrate-oats-data/applications/submissions/submap/subdiv_plot.py similarity index 100% rename from bin/migrate-oats-data/submissions/submap/subdiv_plot.py rename to bin/migrate-oats-data/applications/submissions/submap/subdiv_plot.py diff --git a/bin/migrate-oats-data/common/constants.py b/bin/migrate-oats-data/common/constants.py index 46497ef9c6..f93f7b8a79 100644 --- a/bin/migrate-oats-data/common/constants.py +++ b/bin/migrate-oats-data/common/constants.py @@ -1 +1,2 @@ OATS_ETL_USER = "oats_etl" +BATCH_UPLOAD_SIZE = 1000 diff --git a/bin/migrate-oats-data/common/etl_logger.py b/bin/migrate-oats-data/common/etl_logger.py index cfcd8e596b..17a2d1f323 100644 --- a/bin/migrate-oats-data/common/etl_logger.py +++ b/bin/migrate-oats-data/common/etl_logger.py @@ -4,9 +4,7 @@ etl_log_file_name = "etl_log.txt" -def log_start( - etl_name="Not specified", -): +def log_start(etl_name="Not specified", etl_log_file_name=etl_log_file_name): data = { "etl_name": etl_name, "start_time": datetime.now().isoformat(), @@ -21,6 +19,7 @@ def log_end( etl_name="Not specified", error_msg=None, error_log=None, + etl_log_file_name=etl_log_file_name, ): data = { "etl_name": etl_name, diff --git a/bin/migrate-oats-data/constants.py b/bin/migrate-oats-data/constants.py deleted file mode 100644 index a1642a815d..0000000000 --- a/bin/migrate-oats-data/constants.py +++ /dev/null @@ -1 +0,0 @@ -BATCH_UPLOAD_SIZE = 1000 diff --git a/bin/migrate-oats-data/migrate.py b/bin/migrate-oats-data/migrate.py index 12407d9042..0a7b88ae44 100644 --- a/bin/migrate-oats-data/migrate.py +++ b/bin/migrate-oats-data/migrate.py @@ -16,15 +16,15 @@ clean_applications, process_alcs_application_prep_fields, ) -from noi import ( +from noi.notice_of_intent_init import ( process_nois, clean_nois, ) -from submissions import ( +from applications.submissions import ( process_alcs_app_submissions, clean_application_submission, ) -from constants import BATCH_UPLOAD_SIZE +from common import BATCH_UPLOAD_SIZE from applications.application_submission_status_email import ( process_application_submission_status_emails, @@ -34,6 +34,9 @@ process_notice_of_intent_submission_status_emails, clean_application_submission_status_emails, ) +from noi.oats_to_alcs_notice_of_intent_table_etl import ( + process_alcs_notice_of_intent_fee_fields, +) import_batch_size = BATCH_UPLOAD_SIZE @@ -228,11 +231,12 @@ def setup_menu_args_parser(import_batch_size): console.log("Processing NOIs:") process_nois(batch_size=import_batch_size) - console.log("Processing documents:") - process_documents(batch_size=import_batch_size) + # TODO Liam question which process_documents_noi or process_noi_documents is the correct one to keep? + # console.log("Processing NOI specific documents:") + # process_documents_noi(batch_size=import_batch_size) - console.log("Processing NOI specific documents:") - process_documents_noi(batch_size=import_batch_size) + # console.log("Processing documents:") + # process_documents(batch_size=import_batch_size) console.log("Processing application documents:") process_application_documents(batch_size=import_batch_size) @@ -246,6 +250,11 @@ def setup_menu_args_parser(import_batch_size): console.log("Processing application submission:") process_alcs_app_submissions(batch_size=import_batch_size) + console.log("Processing notice of intent fields") + process_alcs_notice_of_intent_fee_fields( + batch_size=import_batch_size + ) + # NOTE: both process_application_submission_status_emails(), process_notice_of_intent_submission_status_emails() # must be the last ones in the migrate etl console.log("Processing submission status emails") @@ -264,7 +273,7 @@ def setup_menu_args_parser(import_batch_size): clean_applications() clean_nois() clean_notice_of_intent_submission_status_emails(), - clean_notice_of_intent_submission_status_emails(), + clean_application_submission_status_emails(), console.log("Done") case "document-import": @@ -318,6 +327,9 @@ def setup_menu_args_parser(import_batch_size): ) process_nois(batch_size=import_batch_size) + process_alcs_notice_of_intent_fee_fields( + batch_size=import_batch_size + ) case "application-import": console.log("Beginning OATS -> ALCS application import process") with console.status( diff --git a/bin/migrate-oats-data/noi/__init__.py b/bin/migrate-oats-data/noi/__init__.py index 57d7c89a17..4b8338fdd6 100644 --- a/bin/migrate-oats-data/noi/__init__.py +++ b/bin/migrate-oats-data/noi/__init__.py @@ -1 +1 @@ -from .noi import * \ No newline at end of file +from .notice_of_intent_init import * \ No newline at end of file diff --git a/bin/migrate-oats-data/noi/noi.py b/bin/migrate-oats-data/noi/notice_of_intent_init.py similarity index 100% rename from bin/migrate-oats-data/noi/noi.py rename to bin/migrate-oats-data/noi/notice_of_intent_init.py diff --git a/bin/migrate-oats-data/noi/oats_to_alcs_notice_of_intent_table_etl/__init__.py b/bin/migrate-oats-data/noi/oats_to_alcs_notice_of_intent_table_etl/__init__.py new file mode 100644 index 0000000000..4b40e6e129 --- /dev/null +++ b/bin/migrate-oats-data/noi/oats_to_alcs_notice_of_intent_table_etl/__init__.py @@ -0,0 +1 @@ +from .oats_to_alcs_notice_of_intent_table_etl import process_alcs_notice_of_intent_fee_fields diff --git a/bin/migrate-oats-data/noi/oats_to_alcs_notice_of_intent_table_etl/oats_to_alcs_notice_of_intent_table_etl.py b/bin/migrate-oats-data/noi/oats_to_alcs_notice_of_intent_table_etl/oats_to_alcs_notice_of_intent_table_etl.py new file mode 100644 index 0000000000..3898d44659 --- /dev/null +++ b/bin/migrate-oats-data/noi/oats_to_alcs_notice_of_intent_table_etl/oats_to_alcs_notice_of_intent_table_etl.py @@ -0,0 +1,144 @@ +from db import inject_conn_pool +from common import BATCH_UPLOAD_SIZE, log_end, log_start +from psycopg2.extras import execute_batch, RealDictCursor +import traceback +from common import ( + AlcsAgCapSource, + log_end, + log_start, + AlcsAgCap, +) +from enum import Enum + + +class OatsToAlcsAgCapSource(Enum): + BCLI = AlcsAgCapSource.BCLI.value + CLI = AlcsAgCapSource.CLI.value + ONSI = AlcsAgCapSource.On_site.value + + +class OatsToAlcsAgCap(Enum): + P = AlcsAgCap.Prime.value + PD = AlcsAgCap.Prime_Dominant.value + MIX = AlcsAgCap.Mixed_Prime_Secondary.value + S = AlcsAgCap.Secondary.value + U = AlcsAgCap.Unclassified.value + + +@inject_conn_pool +def process_alcs_notice_of_intent_fee_fields(conn=None, batch_size=BATCH_UPLOAD_SIZE): + """ + decision_date is imported separately + """ + + etl_name = "process_alcs_notice_of_intent_base_fields" + log_start(etl_name, etl_name) + with conn.cursor(cursor_factory=RealDictCursor) as cursor: + with open( + "noi/sql/notice_of_intent_base/notice_of_intent_base.count.sql", + "r", + encoding="utf-8", + ) as sql_file: + count_query = sql_file.read() + cursor.execute(count_query) + count_total = dict(cursor.fetchone())["count"] + print("- Total Notice of Intents data to update: ", count_total) + + failed_inserts = 0 + successful_updates_count = 0 + last_application_id = 0 + + with open( + "noi/sql/notice_of_intent_base/notice_of_intent_base.sql", + "r", + encoding="utf-8", + ) as sql_file: + application_sql = sql_file.read() + while True: + cursor.execute( + f"{application_sql} WHERE oaa.alr_application_id > {last_application_id} ORDER BY oaa.alr_application_id;" + ) + + rows = cursor.fetchmany(batch_size) + + if not rows: + break + try: + records_to_be_updated_count = len(rows) + + _update_fee_fields_records(conn, batch_size, cursor, rows) + + successful_updates_count = ( + successful_updates_count + records_to_be_updated_count + ) + last_application_id = dict(rows[-1])["alr_application_id"] + + print( + f"retrieved/updated items count: {records_to_be_updated_count}; total successfully updated applications so far {successful_updates_count}; last updated application_id: {last_application_id}" + ) + except Exception as error: + # this is NOT going to be caused by actual data update failure. This code is only executed when the code error appears or connection to DB is lost + conn.rollback() + error_str = "".join( + traceback.format_exception(None, error, error.__traceback__) + ) + print(error_str) + log_end(etl_name, str(error), error_str) + failed_inserts = count_total - successful_updates_count + last_application_id = last_application_id + 1 + + print("Total amount of successful updates:", successful_updates_count) + print("Total failed updates:", failed_inserts) + log_end(etl_name, etl_name) + + +def _update_fee_fields_records(conn, batch_size, cursor, rows): + query = _get_update_query_from_oats_alr_applications_fields() + parsed_fee_data_list = _prepare_oats_alr_applications_data(rows) + + if len(parsed_fee_data_list) > 0: + execute_batch(cursor, query, parsed_fee_data_list, page_size=batch_size) + + conn.commit() + + +def _get_update_query_from_oats_alr_applications_fields(): + query = """ + UPDATE alcs.notice_of_intent + SET fee_paid_date = %(fee_received_date)s, + fee_waived = %(fee_waived_ind)s, + fee_amount = %(applied_fee_amt)s, + fee_split_with_lg = %(split_fee_with_local_gov_ind)s, + date_submitted_to_alc = %(submitted_to_alc_date)s, + staff_observations = %(staff_comment_observations)s, + alr_area = %(component_area)s, + ag_cap_source = %(capability_source_code)s, + ag_cap_map = %(agri_cap_map)s, + ag_cap_consultant = %(agri_cap_consultant)s, + ag_cap = %(agri_capability_code)s, + source = 'APPLICANT' + WHERE + alcs.notice_of_intent.file_number = %(alr_application_id)s::TEXT; + """ + return query + + +def _prepare_oats_alr_applications_data(row_data_list): + data_list = [] + for row in row_data_list: + data = dict(row) + data = map_basic_field(data) + data_list.append(data) + return data_list + + +def map_basic_field(data): + if data["capability_source_code"]: + data["capability_source_code"] = str( + OatsToAlcsAgCapSource[data["capability_source_code"]].value + ) + if data["agri_capability_code"]: + data["agri_capability_code"] = str( + OatsToAlcsAgCap[data["agri_capability_code"]].value + ) + return data diff --git a/bin/migrate-oats-data/noi/sql/insert_noi.sql b/bin/migrate-oats-data/noi/sql/insert_noi.sql index 48bba19aae..17cace2206 100644 --- a/bin/migrate-oats-data/noi/sql/insert_noi.sql +++ b/bin/migrate-oats-data/noi/sql/insert_noi.sql @@ -13,8 +13,8 @@ WITH HAVING count(oaac.alr_application_id) < 2 ), - -- Step 2: get applicant - applicant_lookup AS ( + -- Step 2: get noi + noi_lookup AS ( SELECT DISTINCT oaap.alr_application_id AS application_id, string_agg (DISTINCT oo.organization_name, ', ') FILTER ( @@ -145,8 +145,8 @@ WITH SELECT ng.noi_application_id :: text AS file_number, CASE - WHEN applicant_lookup.orgs IS NOT NULL THEN applicant_lookup.orgs - WHEN applicant_lookup.persons IS NOT NULL THEN applicant_lookup.persons + WHEN noi_lookup.orgs IS NOT NULL THEN noi_lookup.orgs + WHEN noi_lookup.persons IS NOT NULL THEN noi_lookup.persons ELSE 'Unknown' END AS applicant, ar.code AS region_code, @@ -163,7 +163,7 @@ SELECT END AS type_code FROM noi_grouped AS ng - LEFT JOIN applicant_lookup ON ng.noi_application_id = applicant_lookup.application_id + LEFT JOIN noi_lookup ON ng.noi_application_id = noi_lookup.application_id LEFT JOIN panel_lookup ON ng.noi_application_id = panel_lookup.application_id LEFT JOIN alcs.application_region ar ON panel_lookup.panel_region = ar."label" LEFT JOIN alcs_gov ON ng.noi_application_id = alcs_gov.application_id diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_base/notice_of_intent_base.count.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_base/notice_of_intent_base.count.sql new file mode 100644 index 0000000000..f294bef008 --- /dev/null +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_base/notice_of_intent_base.count.sql @@ -0,0 +1,12 @@ +WITH nois_with_one_or_zero_component_only AS ( + SELECT oaac.alr_application_id + FROM oats.oats_alr_appl_components oaac + GROUP BY oaac.alr_application_id + HAVING count(oaac.alr_application_id) < 2 +) +SELECT count(*) +FROM alcs.notice_of_intent noi + JOIN nois_with_one_or_zero_component_only oats_noi ON oats_noi.alr_application_id::TEXT = noi.file_number + JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oats_noi.alr_application_id + AND oaa.application_class_code = 'NOI' + JOIN oats.oats_alr_appl_components oaac ON oaac.alr_application_id = oats_noi.alr_application_id; \ No newline at end of file diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_base/notice_of_intent_base.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_base/notice_of_intent_base.sql new file mode 100644 index 0000000000..b1d10ad2f7 --- /dev/null +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_base/notice_of_intent_base.sql @@ -0,0 +1,25 @@ +WITH nois_with_one_or_zero_component_only AS ( + SELECT oaac.alr_application_id + FROM oats.oats_alr_appl_components oaac + GROUP BY oaac.alr_application_id + HAVING count(oaac.alr_application_id) < 2 +) +SELECT oaa.fee_waived_ind, + oaa.split_fee_with_local_gov_ind, + oaa.applied_fee_amt, + oaa.fee_received_date, + oaa.alr_application_id, + oaa.submitted_to_alc_date, + oaa.staff_comment_observations, + oaac.alr_change_code, + oaac.alr_appl_component_id, + oaac.component_area, + oaac.capability_source_code, + oaac.agri_cap_map, + oaac.agri_cap_consultant, + oaac.agri_capability_code +FROM alcs.notice_of_intent noi + JOIN nois_with_one_or_zero_component_only oats_noi ON oats_noi.alr_application_id::TEXT = noi.file_number + JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oats_noi.alr_application_id + AND oaa.application_class_code = 'NOI' + JOIN oats.oats_alr_appl_components oaac ON oaac.alr_application_id = oats_noi.alr_application_id \ No newline at end of file diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_base/notice_of_intent_base_validation.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_base/notice_of_intent_base_validation.sql new file mode 100644 index 0000000000..fe2e8b4887 --- /dev/null +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_base/notice_of_intent_base_validation.sql @@ -0,0 +1,54 @@ +-- this script selects difference between fields that do not require mapping +WITH nois_with_one_or_zero_component_only AS ( + SELECT oaac.alr_application_id + FROM oats.oats_alr_appl_components oaac + GROUP BY oaac.alr_application_id + HAVING count(oaac.alr_application_id) < 2 +), +oats_noi_data AS ( + SELECT oaa.alr_application_id, + oaac.agri_capability_code, + oaac.agri_cap_map, + oaac.agri_cap_consultant, + oaac.component_area, + oaac.capability_source_code, + oaa.staff_comment_observations, + oaac.alr_change_code, + split_fee_with_local_gov_ind AS fee_lg, + fee_received_date AS fee_date, + fee_waived_ind AS fee_waived, + applied_fee_amt AS fee_amount + FROM alcs.notice_of_intent noi + JOIN nois_with_one_or_zero_component_only oats_noi ON oats_noi.alr_application_id::TEXT = noi.file_number + JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oats_noi.alr_application_id + AND oaa.application_class_code = 'NOI' + JOIN oats.oats_alr_appl_components oaac ON oaac.alr_application_id = oats_noi.alr_application_id +) +SELECT oats_noi.alr_application_id, + noi.alr_area, + noi.ag_cap, + noi.ag_cap_source, + noi.ag_cap_map, + noi.ag_cap_consultant, + staff_observations, + oats_noi.component_area, + oats_noi.agri_capability_code, + oats_noi.capability_source_code, + oats_noi.agri_cap_map, + oats_noi.agri_cap_consultant, + oats_noi.staff_comment_observations, + oats_noi.fee_date, + oats_noi.fee_amount, + noi.fee_split_with_lg, + oats_noi.fee_lg, + oats_noi.fee_waived, + noi.fee_waived +FROM alcs.notice_of_intent noi + LEFT JOIN oats_noi_data AS oats_noi ON noi.file_number = oats_noi.alr_application_id::TEXT +WHERE noi.alr_area != oats_noi.component_area + OR noi.ag_cap_map != oats_noi.agri_cap_map + OR noi.ag_cap_consultant != oats_noi.agri_cap_consultant + OR noi.staff_observations != oats_noi.staff_comment_observations + OR noi.fee_amount != oats_noi.fee_amount + OR noi.fee_split_with_lg::bool != oats_noi.fee_lg::bool + OR noi.fee_waived::bool != oats_noi.fee_waived::bool \ No newline at end of file diff --git a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html index 4048cca05d..fa44c72e36 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html @@ -185,7 +185,7 @@ <h5>Parcel Lookup</h5> <div class="section" *ngIf="enableCertificateOfTitleUpload"> <label for="certificate-of-title-upload">Upload Certificate of Title</label> <div class="subtext"> - Visit <a href="https://ltsa.ca/property-owners/how-can-i/search-for-a-title/">BC Land Title & Survey</a> to obtain + Visit <a href="https://ltsa.ca/property-owners/how-can-i/search-for-a-title/" target="_blank">BC Land Title & Survey</a> to obtain a recent copy (not older than 1 year) of the Certificate of Title </div> <app-file-drag-drop diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.html index 2aea68e52c..c8b86c1367 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.html @@ -186,7 +186,9 @@ <h5>Parcel Lookup</h5> <label for="certificate-of-title-upload">Upload Certificate of Title</label> <div class="subtext"> Visit - <a class="subtext" href="https://ltsa.ca/property-owners/how-can-i/search-for-a-title/">BC Land Title & Survey</a> + <a class="subtext" href="https://ltsa.ca/property-owners/how-can-i/search-for-a-title/" target="_blank" + >BC Land Title & Survey</a + > to obtain a recent copy (not older than 1 year) of the Certificate of Title </div> <app-file-drag-drop From 80897e428c0bccb7fbd70cfab0601ac42c4d9c4c Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Fri, 22 Sep 2023 11:48:05 -0700 Subject: [PATCH 416/954] Text Updates * Update questions, sublabels, etc for NOIs and Applications --- .../application-details.component.html | 6 +-- .../naru-details/naru-details.component.html | 3 +- .../nfu-details/nfu-details.component.html | 8 ++-- .../subd-details/subd-details.component.html | 2 +- .../notice-of-intent-details.component.html | 6 +-- .../application-details.component.html | 6 +-- .../naru-details/naru-details.component.html | 3 +- .../nfu-details/nfu-details.component.html | 8 ++-- .../subd-details/subd-details.component.html | 2 +- .../land-use/land-use.component.html | 14 +++--- .../excl-proposal.component.html | 4 +- .../incl-proposal.component.html | 8 ++-- .../naru-proposal.component.html | 14 ++++-- .../nfu-proposal/nfu-proposal.component.html | 25 ++++++---- .../pfrs-proposal.component.html | 8 +++- .../pofo-proposal.component.html | 8 +++- .../roso-proposal.component.html | 4 +- .../subd-proposal.component.html | 9 ++-- .../tur-proposal/tur-proposal.component.html | 7 +++ .../land-use/land-use.component.html | 18 +++---- .../pfrs/pfrs-proposal.component.html | 8 ++-- .../pofo/pofo-proposal.component.html | 4 +- .../roso/roso-proposal.component.html | 4 +- .../notice-of-intent-details.component.html | 6 +-- .../NFU_submission_creation.spec.ts | 40 ++++------------ .../TUR_submission_creation.spec.ts | 20 ++------ .../application-submission.entity.ts | 7 ++- .../notice-of-intent-submission.entity.ts | 7 ++- .../1695408288984-update_column_text.ts | 47 +++++++++++++++++++ 29 files changed, 176 insertions(+), 130 deletions(-) create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1695408288984-update_column_text.ts diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.html b/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.html index d3040f8ce2..bcd74331c1 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.html +++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.html @@ -84,19 +84,19 @@ <h3>Land Use</h3> <h4>Land Use of Parcel(s) under Application</h4> </div> <div class="subheading2 grid-1"> - Quantify and describe in detail all agriculture that currently takes place on the parcel(s). + Describe all agriculture that currently takes place on the parcel(s). </div> <div class="grid-double"> {{ submission.parcelsAgricultureDescription }} </div> <div class="subheading2 grid-1"> - Quantify and describe in detail all agricultural improvements made to the parcel(s). + Describe all agricultural improvements made to the parcel(s). </div> <div class="grid-double"> {{ submission.parcelsAgricultureImprovementDescription }} </div> <div class="subheading2 grid-1"> - Quantify and describe all non-agricultural uses that currently take place on the parcel(s). + Describe all other uses that currently take place on the parcel(s). </div> <div class="grid-double"> {{ submission.parcelsNonAgricultureUseDescription }} diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/naru-details/naru-details.component.html b/alcs-frontend/src/app/features/application/applicant-info/application-details/naru-details/naru-details.component.html index a20b3237fd..184080ed88 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/application-details/naru-details/naru-details.component.html +++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/naru-details/naru-details.component.html @@ -110,8 +110,7 @@ </div> <div class="subheading2 grid-1"> - Do you need to import any fill to construct or conduct the proposed Non-farm use? Fill is any material brought onto - the property, including gravel for construction. + Do you need to import any fill to construct or conduct the proposed non-adhering residential use? </div> <div class="grid-double"> {{ _applicationSubmission.naruWillImportFill ? 'Yes' : 'No' }} diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/nfu-details/nfu-details.component.html b/alcs-frontend/src/app/features/application/applicant-info/application-details/nfu-details/nfu-details.component.html index ed166225e5..55227877b5 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/application-details/nfu-details/nfu-details.component.html +++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/nfu-details/nfu-details.component.html @@ -8,13 +8,12 @@ {{ applicationSubmission.purpose }} </div> <div class="subheading2 grid-1"> - Could this proposal be accommodated on lands outside of the ALR? Please justify why the proposal cannot be carried - out on lands outside the ALR. + Could this proposal be accommodated on lands outside of the ALR? </div> <div class="grid-double"> {{ applicationSubmission.nfuOutsideLands }} </div> - <div class="subheading2 grid-1">Does the proposal support agriculture in the short or long term? Please explain</div> + <div class="subheading2 grid-1">Does the proposal support agriculture in the short or long term?</div> <div class="grid-double"> {{ applicationSubmission.nfuAgricultureSupport }} </div> @@ -27,8 +26,7 @@ </div> </div> <div class="subheading2 grid-1"> - Do you need to import any fill to construct or conduct the proposed Non-farm use? Fill is any material brought onto - the property, including gravel for construction. + Do you need to import any fill to construct or conduct the proposed non-farm use? </div> <div class="grid-double"> <span *ngIf="applicationSubmission.nfuWillImportFill !== null">{{ diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/subd-details/subd-details.component.html b/alcs-frontend/src/app/features/application/applicant-info/application-details/subd-details/subd-details.component.html index c5a0d3c446..0582f92c8c 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/application-details/subd-details/subd-details.component.html +++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/subd-details/subd-details.component.html @@ -24,7 +24,7 @@ <div class="grid-double"> {{ _applicationSubmission.subdSuitability }} </div> - <div class="subheading2 grid-1">Does the proposal support agriculture in the short or long term? Please explain.</div> + <div class="subheading2 grid-1">Does the proposal support agriculture in the short or long term?</div> <div class="grid-double"> {{ _applicationSubmission.subdAgricultureSupport }} </div> diff --git a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/notice-of-intent-details.component.html b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/notice-of-intent-details.component.html index 8f7549b022..c0c255826b 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/notice-of-intent-details.component.html +++ b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/notice-of-intent-details.component.html @@ -69,19 +69,19 @@ <h3>Land Use</h3> <h4>Land Use of Parcel(s) under Notice of Intent</h4> </div> <div class="subheading2 grid-1"> - Quantify and describe in detail all agriculture that currently takes place on the parcel(s). + Describe all agriculture that currently takes place on the parcel(s). </div> <div class="grid-double"> {{ submission.parcelsAgricultureDescription }} </div> <div class="subheading2 grid-1"> - Quantify and describe in detail all agricultural improvements made to the parcel(s). + Describe all agricultural improvements made to the parcel(s). </div> <div class="grid-double"> {{ submission.parcelsAgricultureImprovementDescription }} </div> <div class="subheading2 grid-1"> - Quantify and describe all non-agricultural uses that currently take place on the parcel(s). + Describe all other uses that currently take place on the parcel(s). </div> <div class="grid-double"> {{ submission.parcelsNonAgricultureUseDescription }} diff --git a/portal-frontend/src/app/features/applications/application-details/application-details.component.html b/portal-frontend/src/app/features/applications/application-details/application-details.component.html index 97920f9a04..2f5be9b6fc 100644 --- a/portal-frontend/src/app/features/applications/application-details/application-details.component.html +++ b/portal-frontend/src/app/features/applications/application-details/application-details.component.html @@ -127,7 +127,7 @@ <h3>5. Land Use</h3> <h4>Land Use of Parcel(s) under Application</h4> </div> <div class="subheading2 grid-1"> - Quantify and describe in detail all agriculture that currently takes place on the parcel(s). + Describe all agriculture that currently takes place on the parcel(s). <app-updated-banner *ngIf="updatedFields.includes('parcelsAgricultureDescription')"></app-updated-banner> </div> <div class="grid-double"> @@ -138,7 +138,7 @@ <h4>Land Use of Parcel(s) under Application</h4> ></app-no-data> </div> <div class="subheading2 grid-1"> - Quantify and describe in detail all agricultural improvements made to the parcel(s). + Describe all agricultural improvements made to the parcel(s). <app-updated-banner *ngIf="updatedFields.includes('parcelsAgricultureImprovementDescription')" ></app-updated-banner> @@ -151,7 +151,7 @@ <h4>Land Use of Parcel(s) under Application</h4> ></app-no-data> </div> <div class="subheading2 grid-1"> - Quantify and describe all non-agricultural uses that currently take place on the parcel(s). + Describe all other uses that currently take place on the parcel(s). <app-updated-banner *ngIf="updatedFields.includes('parcelsNonAgricultureUseDescription')"></app-updated-banner> </div> <div class="grid-double"> diff --git a/portal-frontend/src/app/features/applications/application-details/naru-details/naru-details.component.html b/portal-frontend/src/app/features/applications/application-details/naru-details/naru-details.component.html index 92acfe1eec..25521b94b3 100644 --- a/portal-frontend/src/app/features/applications/application-details/naru-details/naru-details.component.html +++ b/portal-frontend/src/app/features/applications/application-details/naru-details/naru-details.component.html @@ -175,8 +175,7 @@ </div> <div class="subheading2 grid-1"> - Do you need to import any fill to construct or conduct the proposed Non-farm use? Fill is any material brought onto - the property, including gravel for construction. + Do you need to import any fill to construct or conduct the proposed non-adhering residential use? <app-updated-banner *ngIf="updatedFields.includes('naruWillImportFill')"></app-updated-banner> </div> <div class="grid-double"> diff --git a/portal-frontend/src/app/features/applications/application-details/nfu-details/nfu-details.component.html b/portal-frontend/src/app/features/applications/application-details/nfu-details/nfu-details.component.html index 0e4fbedb2d..0e56ee6ac8 100644 --- a/portal-frontend/src/app/features/applications/application-details/nfu-details/nfu-details.component.html +++ b/portal-frontend/src/app/features/applications/application-details/nfu-details/nfu-details.component.html @@ -16,8 +16,7 @@ <app-no-data [showRequired]="showErrors" *ngIf="!applicationSubmission.purpose"></app-no-data> </div> <div class="subheading2 grid-1"> - Could this proposal be accommodated on lands outside of the ALR? Please justify why the proposal cannot be carried - out on lands outside the ALR. + Could this proposal be accommodated on lands outside of the ALR? <app-updated-banner *ngIf="updatedFields.includes('nfuOutsideLands')"></app-updated-banner> </div> <div class="grid-double"> @@ -25,7 +24,7 @@ <app-no-data [showRequired]="showErrors" *ngIf="!applicationSubmission.nfuOutsideLands"></app-no-data> </div> <div class="subheading2 grid-1"> - Does the proposal support agriculture in the short or long term? Please explain + Does the proposal support agriculture in the short or long term? <app-updated-banner *ngIf="updatedFields.includes('nfuAgricultureSupport')"></app-updated-banner> </div> <div class="grid-double"> @@ -40,8 +39,7 @@ <app-no-data [showRequired]="showErrors" *ngIf="proposalMap.length === 0"></app-no-data> </div> <div class="subheading2 grid-1"> - Do you need to import any fill to construct or conduct the proposed Non-farm use? Fill is any material brought onto - the property, including gravel for construction. + Do you need to import any fill to construct or conduct the proposed non-farm use? <app-updated-banner *ngIf="updatedFields.includes('nfuWillImportFill')"></app-updated-banner> </div> <div class="grid-double"> diff --git a/portal-frontend/src/app/features/applications/application-details/subd-details/subd-details.component.html b/portal-frontend/src/app/features/applications/application-details/subd-details/subd-details.component.html index b3ee95d67a..4b28f26225 100644 --- a/portal-frontend/src/app/features/applications/application-details/subd-details/subd-details.component.html +++ b/portal-frontend/src/app/features/applications/application-details/subd-details/subd-details.component.html @@ -45,7 +45,7 @@ <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.subdSuitability"></app-no-data> </div> <div class="subheading2 grid-1"> - Does the proposal support agriculture in the short or long term? Please explain. + Does the proposal support agriculture in the short or long term? <app-updated-banner *ngIf="updatedFields.includes('subdAgricultureSupport')"></app-updated-banner> </div> <div class="grid-double"> diff --git a/portal-frontend/src/app/features/applications/edit-submission/land-use/land-use.component.html b/portal-frontend/src/app/features/applications/edit-submission/land-use/land-use.component.html index 72130d0cf4..d791300bf0 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/land-use/land-use.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/land-use/land-use.component.html @@ -18,7 +18,7 @@ <h5>Land Use of Parcel(s) under Application</h5> <div class="form-row"> <div class="full-row"> <label for="parcelsAgricultureDescription"> - Quantify and describe in detail all agriculture that currently takes place on the parcel(s). + Describe all agriculture that currently takes place on the parcel(s). </label> <div class="subtext">You may describe multiple parcels collectively or individually.</div> <mat-form-field class="display-block" appearance="outline"> @@ -51,7 +51,7 @@ <h5>Land Use of Parcel(s) under Application</h5> <div class="full-row"> <h6> <label for="parcelsAgricultureImprovementDescription"> - Quantify and describe in detail all agricultural improvements made to the parcel(s). + Describe all agricultural improvements made to the parcel(s). </label> </h6> <div class="subtext"> @@ -85,11 +85,10 @@ <h6> </div> <div class="full-row"> <label for="parcelsNonAgricultureUseDescription"> - Quantify and describe all non-agricultural uses that currently take place on the parcel(s). + Describe all other uses that currently take place on the parcel(s). </label> <div class="subtext"> - Describe any non-agricultural uses such as home-based businesses, commercial, recreational, institutional, - industrial, etc. If all activity is agricultural, please specify "No non-agricultural activity". + Describe other uses such as residential, home-based businesses, commercial, recreational, institutional, industrial, etc. </div> <mat-form-field class="display-block" appearance="outline"> <textarea @@ -116,10 +115,9 @@ <h6> <div class="subtext">Characters left: {{ 4000 - parcelsNonAgricultureUseDescriptionText.textLength }}</div> </div> </div> - <h5>Identify the land uses surrounding the parcel(s) under application.</h5> + <h5>Choose and describe neighbouring land uses.</h5> <div class="subtext"> - Choose the Primary Land Use Type from the drop-down list. If there is more than one land use type, choose the main - land use and describe all the uses under Specific Activity. + Choose the main land use type from the drop-down and describe the specific activities. </div> <div class="form-row"> <div class="full-row"> diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/excl-proposal/excl-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/excl-proposal/excl-proposal.component.html index 02917af9e0..05c0ee1279 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/excl-proposal/excl-proposal.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/excl-proposal/excl-proposal.component.html @@ -78,8 +78,8 @@ <h2>Proposal</h2> <div class="full-row"> <label for="purpose">What is the purpose of the proposal?</label> <div class="subtext"> - Be clear and concise in describing the proposal. Include why you are applying for exclusion and what the - proposal will achieve. + Include why you are applying for an exclusion, what the proposal will achieve, and any benefits to agriculture that + the proposal provides. </div> <mat-form-field appearance="outline"> <textarea diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/incl-proposal/incl-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/incl-proposal/incl-proposal.component.html index c3d52c3413..a9af25b5ed 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/incl-proposal/incl-proposal.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/incl-proposal/incl-proposal.component.html @@ -42,8 +42,7 @@ <h2>Proposal</h2> <div class="full-row"> <label for="purpose">What is the purpose of the proposal?</label> <div class="subtext"> - Be clear and concise in describing the proposal. Include why you are applying for inclusion and what the - proposal will achieve. + Include why you are applying for an inclusion, what the proposal will achieve, and any benefits to agriculture that the proposal provides. </div> <mat-form-field appearance="outline"> <textarea @@ -62,7 +61,10 @@ <h2>Proposal</h2> <div class="subtext">Characters left: {{ 4000 - purposeText.textLength }}</div> </div> <div class="full-row"> - <label for="agSupport">Does the proposal support agriculture in the short or long term? Please explain.</label> + <label for="agSupport">Does the proposal support agriculture in the short or long term?</label> + <div class="subtext"> + Please explain + </div> <mat-form-field appearance="outline"> <textarea formControlName="agSupport" diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.html index 52abf7c448..0f7217200e 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.html @@ -44,8 +44,8 @@ <h2>Proposal</h2> <div class="full-row"> <label for="purpose">What is the purpose of the proposal?</label> <div class="subtext"> - Include why you are applying for removal of soil, what the proposal will achieve, and any benefits to - agriculture that the proposal provides. + Include why you are applying for non-adhering residential use, what the proposal will achieve, and any benefits + to agriculture that the proposal provides. </div> <mat-form-field appearance="outline"> <textarea formControlName="purpose" #purposeText maxlength="4000" id="purpose" matInput></textarea> @@ -441,9 +441,9 @@ <h2>Proposal</h2> <div class="full-row"> <label for="will-import-fill"> - Do you need to import any fill to construct or conduct the proposed Non-farm use? Fill is any material brought - onto the property, including gravel for construction. + Do you need to import any fill to construct or conduct the proposed Non-farm use? </label> + <div class="subtext">Fill is any material brought onto the property, including gravel for construction.</div> <mat-button-toggle-group (change)="onChangeFill($event.value)" class="input" @@ -519,6 +519,7 @@ <h4>Project Duration</h4> <div class="form-row"> <div> <label for="projectDurationUnit">Duration</label> + <div class="subtext">Days, Months, or Years</div> <mat-form-field appearance="outline"> <mat-select placeholder="Select one" id="projectDurationUnit" formControlName="projectDurationUnit"> <mat-option value="days">Days</mat-option> @@ -536,6 +537,9 @@ <h4>Project Duration</h4> </div> <div> <label for="projectDurationAmount">Length</label> + <div class='subtext'> + Decimals can be used - e.g. 3.5 months or 1.5 years + </div> <mat-form-field appearance="outline"> <input id="projectDurationAmount" @@ -545,7 +549,7 @@ <h4>Project Duration</h4> min="0.01" matInput formControlName="projectDurationAmount" - placeholder="Type length as a decimal number" + placeholder="Type length" /> </mat-form-field> <div diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/nfu-proposal/nfu-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/nfu-proposal/nfu-proposal.component.html index 847855c9e9..27a24bcc3b 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/nfu-proposal/nfu-proposal.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/nfu-proposal/nfu-proposal.component.html @@ -40,6 +40,10 @@ <h2>Proposal</h2> </div> <div class="full-row"> <label for="purpose">What is the purpose of the proposal?</label> + <div class="subtext"> + Include why you are applying for non-farm use, what the proposal will achieve, and any benefits to agriculture + that the proposal provides. + </div> <mat-form-field appearance="outline"> <textarea formControlName="purpose" @@ -57,10 +61,8 @@ <h2>Proposal</h2> <div class="subtext">Characters left: {{ 4000 - purposeText.textLength }}</div> </div> <div class="full-row"> - <label for="outside-lands"> - Could this proposal be accommodated on lands outside of the ALR? Please justify why the proposal cannot be - carried out on lands outside the ALR. - </label> + <label for="outside-lands"> Could this proposal be accommodated on lands outside of the ALR? </label> + <div class="subtext">Please justify why the proposal cannot be carried out on lands outside the ALR.</div> <mat-form-field appearance="outline"> <textarea formControlName="outsideLands" @@ -78,9 +80,8 @@ <h2>Proposal</h2> <div class="subtext">Characters left: {{ 4000 - outsideLandsText.textLength }}</div> </div> <div class="full-row"> - <label for="agriculture-support"> - Does the proposal support agriculture in the short or long term? Please explain. - </label> + <label for="agriculture-support"> Does the proposal support agriculture in the short or long term? </label> + <div class="subtext">Please explain</div> <mat-form-field appearance="outline"> <textarea formControlName="agricultureSupport" @@ -115,9 +116,9 @@ <h2>Proposal</h2> </div> <div class="full-row"> <label for="will-import-fill"> - Do you need to import any fill to construct or conduct the proposed Non-farm use? Fill is any material brought - onto the property, including gravel for construction. + Do you need to import any fill to construct or conduct the proposed Non-farm use? </label> + <div class="subtext">Fill is any material brought onto the property, including gravel for construction.</div> <mat-button-toggle-group (change)="onChangeFill($event.value)" class="input" @@ -205,6 +206,7 @@ <h4>Project Duration</h4> <div class="form-row"> <div> <label for="projectDurationUnit">Duration</label> + <div class="subtext">Days, Months, or Years</div> <mat-form-field appearance="outline"> <mat-select placeholder="Select one" id="projectDurationUnit" formControlName="projectDurationUnit"> <mat-option value="days">Days</mat-option> @@ -222,6 +224,9 @@ <h4>Project Duration</h4> </div> <div> <label for="projectDurationAmount">Length</label> + <div class='subtext'> + Decimals can be used - e.g. 3.5 months or 1.5 years + </div> <mat-form-field appearance="outline"> <input id="projectDurationAmount" @@ -231,7 +236,7 @@ <h4>Project Duration</h4> min="0.01" matInput formControlName="projectDurationAmount" - placeholder="Type length as a decimal number" + placeholder="Type length" /> </mat-form-field> <div diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.html index a2ef832778..9b0aa7c445 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.html @@ -70,7 +70,7 @@ <h2>Proposal</h2> <div class="full-row"> <label for="purpose">What is the purpose of the proposal?</label> <div class="subtext"> - Include why you are applying for removal of soil, what the proposal will achieve, and any benefits to + Include why you are applying for placement of fill and removal of soil, what the proposal will achieve, and any benefits to agriculture that the proposal provides. </div> <mat-form-field appearance="outline"> @@ -154,6 +154,7 @@ <h4>Project Duration</h4> <div class="form-row"> <div> <label for="projectDurationUnit">Duration</label> + <div class="subtext">Days, Months, or Years</div> <mat-form-field appearance="outline"> <mat-select placeholder="Select one" id="projectDurationUnit" formControlName="projectDurationUnit"> <mat-option value="days">Days</mat-option> @@ -171,6 +172,9 @@ <h4>Project Duration</h4> </div> <div> <label for="projectDurationAmount">Length</label> + <div class='subtext'> + Decimals can be used - e.g. 3.5 months or 1.5 years + </div> <mat-form-field appearance="outline"> <input id="projectDurationAmount" @@ -180,7 +184,7 @@ <h4>Project Duration</h4> min="0.01" matInput formControlName="projectDurationAmount" - placeholder="Type length as a decimal number" + placeholder="Type length" /> </mat-form-field> <div diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.html index 4568248baf..315120a57b 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.html @@ -69,7 +69,7 @@ <h2>Proposal</h2> <div class="full-row"> <label for="purpose">What is the purpose of the proposal?</label> <div class="subtext"> - Include why you are applying for removal of soil, what the proposal will achieve, and any benefits to + Include why you are applying for placement of fill, what the proposal will achieve, and any benefits to agriculture that the proposal provides. </div> <mat-form-field appearance="outline"> @@ -120,6 +120,7 @@ <h4>Project Duration</h4> <div class="form-row"> <div> <label for="projectDurationUnit">Duration</label> + <div class="subtext">Days, Months, or Years</div> <mat-form-field appearance="outline"> <mat-select placeholder="Select one" id="projectDurationUnit" formControlName="projectDurationUnit"> <mat-option value="days">Days</mat-option> @@ -137,6 +138,9 @@ <h4>Project Duration</h4> </div> <div> <label for="projectDurationAmount">Length</label> + <div class='subtext'> + Decimals can be used - e.g. 3.5 months or 1.5 years + </div> <mat-form-field appearance="outline"> <input id="projectDurationAmount" @@ -146,7 +150,7 @@ <h4>Project Duration</h4> min="0.01" matInput formControlName="projectDurationAmount" - placeholder="Type length as a decimal number" + placeholder="Type length" /> </mat-form-field> <div diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.html index 7f4871db55..2ec16b2ce6 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.html @@ -122,6 +122,7 @@ <h4>Project Duration</h4> <div class="form-row"> <div> <label for="projectDurationUnit">Duration</label> + <div class="subtext">Days, Months, or Years</div> <mat-form-field appearance="outline"> <mat-select placeholder="Select one" id="projectDurationUnit" formControlName="projectDurationUnit"> <mat-option value="days">Days</mat-option> @@ -139,6 +140,7 @@ <h4>Project Duration</h4> </div> <div> <label for="projectDurationAmount">Length</label> + <div class="subtext">Decimals can be used - e.g. 3.5 months or 1.5 years</div> <mat-form-field appearance="outline"> <input id="projectDurationAmount" @@ -148,7 +150,7 @@ <h4>Project Duration</h4> min="0.01" matInput formControlName="projectDurationAmount" - placeholder="Type length as a decimal number" + placeholder="Type length" /> </mat-form-field> <div diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.html index 1e5f60cba1..1e1d11d939 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.html @@ -142,6 +142,10 @@ <h6>Documents needed for this step:</h6> </div> <div class="full-row"> <label for="purpose">What is the purpose of the proposal?</label> + <div class="subtext"> + Include why you are applying for a subdivision, what the proposal will achieve, and any benefits to agriculture + that the proposal provides. + </div> <mat-form-field appearance="outline"> <textarea formControlName="purpose" @@ -181,9 +185,8 @@ <h6>Documents needed for this step:</h6> <div class="subtext">Characters left: {{ 4000 - suitabilityText.textLength }}</div> </div> <div class="full-row"> - <label for="agricultural-support" - >Does the proposal support agriculture in the short or long term? Please explain.</label - > + <label for="agricultural-support">Does the proposal support agriculture in the short or long term?</label> + <div class="subtext">Please explain</div> <mat-form-field appearance="outline"> <textarea [formControl]="agriculturalSupport" diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/tur-proposal/tur-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/tur-proposal/tur-proposal.component.html index 0de9433b72..56cabe76f2 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/tur-proposal/tur-proposal.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/tur-proposal/tur-proposal.component.html @@ -33,6 +33,10 @@ <h6>Documents needed for this step:</h6> <div class="form-row"> <div class="full-row"> <label for="purpose">What is the purpose of the proposal?</label> + <div class="subtext"> + Include why you are applying for a Transportation, Utility and Recreational Trail, what the proposal will achieve, and any benefits to + agriculture that the proposal provides. + </div> <mat-form-field appearance="outline"> <textarea formControlName="purpose" @@ -98,6 +102,9 @@ <h6>Documents needed for this step:</h6> </div> <div class="full-row"> <label for="negative-impact">Could this proposal be accommodated on lands outside of the ALR?</label> + <div class="subtext"> + Please justify why the proposal cannot be carried out on lands outside the ALR. + </div> <mat-form-field appearance="outline"> <textarea [formControl]="outsideLands" diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/land-use/land-use.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/land-use/land-use.component.html index a1a532ff09..875544f0ef 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/land-use/land-use.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/land-use/land-use.component.html @@ -18,7 +18,7 @@ <h5>Land Use of Parcel(s) under Notice of Intent</h5> <div class="form-row"> <div class="full-row"> <label for="parcelsAgricultureDescription"> - Quantify and describe in detail all agriculture that currently takes place on the parcel(s). + Describe all agriculture that currently takes place on the parcel(s). </label> <div class="subtext">You may describe multiple parcels collectively or individually.</div> <mat-form-field class="display-block" appearance="outline"> @@ -43,15 +43,15 @@ <h5>Land Use of Parcel(s) under Notice of Intent</h5> <div *ngIf="parcelsAgricultureDescription.errors?.['required']">This field is required</div> </div> <mat-hint class="subtext" - >Example 1: PID 001-002-003: 60 ha hay crop, 40 ha grazing, 200 sheep. Example 2: Parcel 1: 10% - blueberry crop, 30% vegetables, 60% hay. Parcel 2: 100% hay. + >Example 1: PID 001-002-003: 60 ha hay crop, 40 ha grazing, 200 sheep. Example 2: Parcel 1: 10% blueberry + crop, 30% vegetables, 60% hay. Parcel 2: 100% hay. </mat-hint> <div class="subtext">Characters left: {{ 4000 - parcelsAgricultureDescriptionText.textLength }}</div> </div> <div class="full-row"> <h6> <label for="parcelsAgricultureImprovementDescription"> - Quantify and describe in detail all agricultural improvements made to the parcel(s). + Describe all agricultural improvements made to the parcel(s). </label> </h6> <div class="subtext"> @@ -85,11 +85,11 @@ <h6> </div> <div class="full-row"> <label for="parcelsNonAgricultureUseDescription"> - Quantify and describe all non-agricultural uses that currently take place on the parcel(s). + Describe all other uses that currently take place on the parcel(s). </label> <div class="subtext"> - Describe any non-agricultural uses such as home-based businesses, commercial, recreational, institutional, - industrial, etc. If all activity is agricultural, please specify "No non-agricultural activity". + Describe other uses such as residential, home-based businesses, commercial, recreational, institutional, + industrial, etc. </div> <mat-form-field class="display-block" appearance="outline"> <textarea @@ -112,7 +112,9 @@ <h6> <mat-icon>warning</mat-icon> <div *ngIf="parcelsNonAgricultureUseDescription.errors?.['required']">This field is required</div> </div> - <mat-hint class="subtext">Example: House and 100 square metre detached auto repair shop.</mat-hint> + <mat-hint class="subtext" + >Example: 100m<sup>2</sup> house and 50m<sup>2</sup> detached auto repair shop</mat-hint + > <div class="subtext">Characters left: {{ 4000 - parcelsNonAgricultureUseDescriptionText.textLength }}</div> </div> </div> diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pfrs/pfrs-proposal.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pfrs/pfrs-proposal.component.html index 602553c586..25919ce27a 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pfrs/pfrs-proposal.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pfrs/pfrs-proposal.component.html @@ -70,8 +70,8 @@ <h2>Proposal</h2> <div class="full-row"> <label for="purpose">What is the purpose of the proposal?</label> <div class="subtext"> - Include why you are applying for placement of fill, what the proposal will achieve, and any benefits to - agriculture that the proposal provides. + Include why you are applying for placement of fill and removal of soil, what the proposal will achieve, and any + benefits to agriculture that the proposal provides. </div> <mat-form-field appearance="outline"> <textarea @@ -211,6 +211,7 @@ <h4>Project Duration</h4> <div class="form-row"> <div> <label for="projectDurationUnit">Duration</label> + <div class="subtext">Days, Months, or Years</div> <mat-form-field appearance="outline"> <mat-select placeholder="Select one" id="projectDurationUnit" [formControl]="projectDurationUnit"> <mat-option value="days">Days</mat-option> @@ -228,6 +229,7 @@ <h4>Project Duration</h4> </div> <div> <label for="projectDurationAmount">Length</label> + <div class="subtext">Decimals can be used - e.g. 3.5 months or 1.5 years</div> <mat-form-field appearance="outline"> <input id="projectDurationAmount" @@ -237,7 +239,7 @@ <h4>Project Duration</h4> min="0.01" matInput [formControl]="projectDurationAmount" - placeholder="Type length as a decimal number" + placeholder="Type length" /> </mat-form-field> <div diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pofo/pofo-proposal.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pofo/pofo-proposal.component.html index f70fd5e041..1d79e65292 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pofo/pofo-proposal.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pofo/pofo-proposal.component.html @@ -155,6 +155,7 @@ <h4>Project Duration</h4> <div class="form-row"> <div> <label for="projectDurationUnit">Duration</label> + <div class="subtext">Days, Months, or Years</div> <mat-form-field appearance="outline"> <mat-select placeholder="Select one" id="projectDurationUnit" [formControl]="projectDurationUnit"> <mat-option value="days">Days</mat-option> @@ -172,6 +173,7 @@ <h4>Project Duration</h4> </div> <div> <label for="projectDurationAmount">Length</label> + <div class="subtext">Decimals can be used - e.g. 3.5 months or 1.5 years</div> <mat-form-field appearance="outline"> <input id="projectDurationAmount" @@ -181,7 +183,7 @@ <h4>Project Duration</h4> min="0.01" matInput [formControl]="projectDurationAmount" - placeholder="Type length as a decimal number" + placeholder="Type length" /> </mat-form-field> <div diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.html index eaa73a7444..3690ebb12f 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.html @@ -142,6 +142,7 @@ <h4>Project Duration</h4> <div class="form-row"> <div> <label for="projectDurationUnit">Duration</label> + <div class="subtext">Days, Months, or Years</div> <mat-form-field appearance="outline"> <mat-select placeholder="Select one" id="projectDurationUnit" formControlName="projectDurationUnit"> <mat-option value="days">Days</mat-option> @@ -159,6 +160,7 @@ <h4>Project Duration</h4> </div> <div> <label for="projectDurationAmount">Length</label> + <div class="subtext">Decimals can be used - e.g. 3.5 months or 1.5 years</div> <mat-form-field appearance="outline"> <input id="projectDurationAmount" @@ -168,7 +170,7 @@ <h4>Project Duration</h4> min="0.01" matInput formControlName="projectDurationAmount" - placeholder="Type length as a decimal number" + placeholder="Type length" /> </mat-form-field> <div diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.html b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.html index 4d85505c21..9d6c23ad29 100644 --- a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.html @@ -107,7 +107,7 @@ <h3>4. Land Use</h3> <h4>Land Use of Parcel(s) under Notice of Intent</h4> </div> <div class="subheading2 grid-1"> - Quantify and describe in detail all agriculture that currently takes place on the parcel(s). + Describe all agriculture that currently takes place on the parcel(s). <app-updated-banner *ngIf="updatedFields.includes('parcelsAgricultureDescription')"></app-updated-banner> </div> <div class="grid-double"> @@ -115,7 +115,7 @@ <h4>Land Use of Parcel(s) under Notice of Intent</h4> <app-no-data [showRequired]="showErrors" *ngIf="!noiSubmission.parcelsAgricultureDescription"></app-no-data> </div> <div class="subheading2 grid-1"> - Quantify and describe in detail all agricultural improvements made to the parcel(s). + Describe all agricultural improvements made to the parcel(s). <app-updated-banner *ngIf="updatedFields.includes('parcelsAgricultureImprovementDescription')" ></app-updated-banner> @@ -128,7 +128,7 @@ <h4>Land Use of Parcel(s) under Notice of Intent</h4> ></app-no-data> </div> <div class="subheading2 grid-1"> - Quantify and describe all non-agricultural uses that currently take place on the parcel(s). + Describe all other uses that currently take place on the parcel(s). <app-updated-banner *ngIf="updatedFields.includes('parcelsNonAgricultureUseDescription')"></app-updated-banner> </div> <div class="grid-double"> diff --git a/portal-frontend/test/tests/submissions/NFU_submission_creation.spec.ts b/portal-frontend/test/tests/submissions/NFU_submission_creation.spec.ts index ffa2b3b77e..70ed47fc46 100644 --- a/portal-frontend/test/tests/submissions/NFU_submission_creation.spec.ts +++ b/portal-frontend/test/tests/submissions/NFU_submission_creation.spec.ts @@ -103,22 +103,12 @@ test('test', async ({ page }) => { await page.getByPlaceholder('Type government').fill('Peace'); await page.getByText('Peace River Regional District').click(); await page.getByRole('button', { name: 'Next Step' }).click(); - await page - .getByLabel('Quantify and describe in detail all agriculture that currently takes place on the parcel(s).') - .click(); - await page - .getByLabel('Quantify and describe in detail all agriculture that currently takes place on the parcel(s).') - .fill('5'); - await page.getByLabel('Quantify and describe in detail all agricultural improvements made to the parcel(s).').click(); - await page - .getByLabel('Quantify and describe in detail all agricultural improvements made to the parcel(s).') - .fill('5'); - await page - .getByLabel('Quantify and describe all non-agricultural uses that currently take place on the parcel(s).') - .click(); - await page - .getByLabel('Quantify and describe all non-agricultural uses that currently take place on the parcel(s).') - .fill('5'); + await page.getByLabel('Describe all agriculture that currently takes place on the parcel(s).').click(); + await page.getByLabel('Describe all agriculture that currently takes place on the parcel(s).').fill('5'); + await page.getByLabel('Describe all agricultural improvements made to the parcel(s).').click(); + await page.getByLabel('Describe all agricultural improvements made to the parcel(s).').fill('5'); + await page.getByLabel('Describe all other uses that currently take place on the parcel(s).').click(); + await page.getByLabel('Describe all other uses that currently take place on the parcel(s).').fill('5'); await page.locator('#northLandUseType svg').click(); await page.getByText('Agricultural / Farm').click(); await page.locator('#northLandUseTypeDescription').click(); @@ -140,20 +130,10 @@ test('test', async ({ page }) => { await page.getByPlaceholder('Type size in hectares').fill('6'); await page.getByLabel('What is the purpose of the proposal?').click(); await page.getByLabel('What is the purpose of the proposal?').fill('no purpose'); - await page - .getByLabel( - 'Could this proposal be accommodated on lands outside of the ALR? Please justify why the proposal cannot be carried out on lands outside the ALR.' - ) - .click(); - await page - .getByLabel( - 'Could this proposal be accommodated on lands outside of the ALR? Please justify why the proposal cannot be carried out on lands outside the ALR.' - ) - .fill('nope'); - await page.getByLabel('Does the proposal support agriculture in the short or long term? Please explain.').click(); - await page - .getByLabel('Does the proposal support agriculture in the short or long term? Please explain.') - .fill('nope'); + await page.getByLabel('Could this proposal be accommodated on lands outside of the ALR?').click(); + await page.getByLabel('Could this proposal be accommodated on lands outside of the ALR?').fill('nope'); + await page.getByLabel('Does the proposal support agriculture in the short or long term?').click(); + await page.getByLabel('Does the proposal support agriculture in the short or long term?').fill('nope'); await page.getByRole('button', { name: 'Yes' }).click(); await page.getByLabel('Describe the type and amount of fill proposed to be placed.').click(); await page.getByLabel('Describe the type and amount of fill proposed to be placed.').fill('6'); diff --git a/portal-frontend/test/tests/submissions/TUR_submission_creation.spec.ts b/portal-frontend/test/tests/submissions/TUR_submission_creation.spec.ts index e1f15d4142..c64e7d1209 100644 --- a/portal-frontend/test/tests/submissions/TUR_submission_creation.spec.ts +++ b/portal-frontend/test/tests/submissions/TUR_submission_creation.spec.ts @@ -75,27 +75,17 @@ test('test', async ({ page }) => { await page.getByPlaceholder('Type government').fill('peace'); await page.getByText('Peace River Regional District').click(); await page.getByText('5').first().click(); - await page - .getByLabel('Quantify and describe in detail all agriculture that currently takes place on the parcel(s).') - .click(); - await page - .getByLabel('Quantify and describe in detail all agriculture that currently takes place on the parcel(s).') - .fill('1'); + await page.getByLabel('Describe all agriculture that currently takes place on the parcel(s).').click(); + await page.getByLabel('Describe all agriculture that currently takes place on the parcel(s).').fill('1'); await page .locator( 'div:nth-child(2) > .mat-mdc-form-field > .mat-mdc-text-field-wrapper > .mat-mdc-form-field-flex > .mat-mdc-form-field-infix' ) .first() .click(); - await page - .getByLabel('Quantify and describe in detail all agricultural improvements made to the parcel(s).') - .fill('2'); - await page - .getByLabel('Quantify and describe all non-agricultural uses that currently take place on the parcel(s).') - .click(); - await page - .getByLabel('Quantify and describe all non-agricultural uses that currently take place on the parcel(s).') - .fill('3'); + await page.getByLabel('Describe all agricultural improvements made to the parcel(s).').fill('2'); + await page.getByLabel('Describe all other uses that currently take place on the parcel(s).').click(); + await page.getByLabel('Describe all other uses that currently take place on the parcel(s).').fill('3'); await page .locator( '.land-use-type > .mat-mdc-form-field > .mat-mdc-text-field-wrapper > .mat-mdc-form-field-flex > .mat-mdc-form-field-infix' diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts b/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts index 1eda7691ca..81bc6ac891 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts @@ -79,7 +79,7 @@ export class ApplicationSubmission extends Base { @Column({ type: 'text', comment: - 'Quantify and describe in detail all agriculture that currently takes place on the parcel(s).', + 'Describe all agriculture that currently takes place on the parcel(s).', nullable: true, }) parcelsAgricultureDescription?: string | null; @@ -87,8 +87,7 @@ export class ApplicationSubmission extends Base { @AutoMap(() => String) @Column({ type: 'text', - comment: - 'Quantify and describe in detail all agricultural improvements made to the parcel(s).', + comment: 'Describe all agricultural improvements made to the parcel(s).', nullable: true, }) parcelsAgricultureImprovementDescription?: string | null; @@ -97,7 +96,7 @@ export class ApplicationSubmission extends Base { @Column({ type: 'text', comment: - 'Quantify and describe all non-agricultural uses that currently take place on the parcel(s).', + 'Describe all other uses that currently take place on the parcel(s).', nullable: true, }) parcelsNonAgricultureUseDescription?: string | null; diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.entity.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.entity.ts index ffea02aa4c..e214ae7b8d 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.entity.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.entity.ts @@ -83,7 +83,7 @@ export class NoticeOfIntentSubmission extends Base { @Column({ type: 'text', comment: - 'Quantify and describe in detail all agriculture that currently takes place on the parcel(s).', + 'Describe all agriculture that currently takes place on the parcel(s).', nullable: true, }) parcelsAgricultureDescription?: string | null; @@ -91,8 +91,7 @@ export class NoticeOfIntentSubmission extends Base { @AutoMap(() => String) @Column({ type: 'text', - comment: - 'Quantify and describe in detail all agricultural improvements made to the parcel(s).', + comment: 'Describe all agricultural improvements made to the parcel(s).', nullable: true, }) parcelsAgricultureImprovementDescription?: string | null; @@ -101,7 +100,7 @@ export class NoticeOfIntentSubmission extends Base { @Column({ type: 'text', comment: - 'Quantify and describe all non-agricultural uses that currently take place on the parcel(s).', + 'Describe all other uses that currently take place on the parcel(s).', nullable: true, }) parcelsNonAgricultureUseDescription?: string | null; diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1695408288984-update_column_text.ts b/services/apps/alcs/src/providers/typeorm/migrations/1695408288984-update_column_text.ts new file mode 100644 index 0000000000..40077c69ce --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1695408288984-update_column_text.ts @@ -0,0 +1,47 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class updateColumnText1695408288984 implements MigrationInterface { + name = 'updateColumnText1695408288984'; + + public async up(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."application_submission"."parcels_agriculture_description" IS 'Describe all agriculture that currently takes place on the parcel(s).'`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."application_submission"."parcels_agriculture_improvement_description" IS 'Describe all agricultural improvements made to the parcel(s).'`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."application_submission"."parcels_non_agriculture_use_description" IS 'Describe all other uses that currently take place on the parcel(s).'`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."notice_of_intent_submission"."parcels_agriculture_description" IS 'Describe all agriculture that currently takes place on the parcel(s).'`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."notice_of_intent_submission"."parcels_agriculture_improvement_description" IS 'Describe all agricultural improvements made to the parcel(s).'`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."notice_of_intent_submission"."parcels_non_agriculture_use_description" IS 'Describe all other uses that currently take place on the parcel(s).'`, + ); + } + + public async down(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."notice_of_intent_submission"."parcels_non_agriculture_use_description" IS 'Quantify and describe all non-agricultural uses that currently take place on the parcel(s).'`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."notice_of_intent_submission"."parcels_agriculture_improvement_description" IS 'Quantify and describe in detail all agricultural improvements made to the parcel(s).'`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."notice_of_intent_submission"."parcels_agriculture_description" IS 'Quantify and describe in detail all agriculture that currently takes place on the parcel(s).'`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."application_submission"."parcels_non_agriculture_use_description" IS 'Quantify and describe all non-agricultural uses that currently take place on the parcel(s).'`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."application_submission"."parcels_agriculture_improvement_description" IS 'Quantify and describe in detail all agricultural improvements made to the parcel(s).'`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."application_submission"."parcels_agriculture_description" IS 'Quantify and describe in detail all agriculture that currently takes place on the parcel(s).'`, + ); + } +} From 722ce38167881b664aa1126a131faa861b26797d Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Fri, 22 Sep 2023 13:21:11 -0700 Subject: [PATCH 417/954] Tidy ETL (#998) split etl: applications, nois, documents provide better menu building structure --- .../applications/__init__.py | 6 + .../submission_status_email.py | 2 +- bin/migrate-oats-data/menu/__init__.py | 2 + .../menu/command_parser/__init__.py | 3 + .../application_command_parser.py | 40 ++ .../command_parser/document_command_parser.py | 55 +++ .../notice_of_intent_command_parser.py | 12 + .../menu/commands/__init__.py | 5 + .../menu/commands/applications.py | 46 +++ .../menu/commands/clean_all.py | 32 ++ .../menu/commands/documents.py | 42 ++ .../menu/commands/import_all.py | 68 ++++ .../menu/commands/notice_of_intents.py | 18 + bin/migrate-oats-data/menu/menu.py | 58 +++ bin/migrate-oats-data/migrate.py | 365 ++---------------- bin/migrate-oats-data/noi/__init__.py | 3 +- .../noi/notice_of_intent_init.py | 32 +- .../noi/notice_of_intent_migration.py | 17 + .../__init__.py | 4 +- ...oats_to_alcs_notice_of_intent_table_etl.py | 2 +- 20 files changed, 447 insertions(+), 365 deletions(-) create mode 100644 bin/migrate-oats-data/menu/__init__.py create mode 100644 bin/migrate-oats-data/menu/command_parser/__init__.py create mode 100644 bin/migrate-oats-data/menu/command_parser/application_command_parser.py create mode 100644 bin/migrate-oats-data/menu/command_parser/document_command_parser.py create mode 100644 bin/migrate-oats-data/menu/command_parser/notice_of_intent_command_parser.py create mode 100644 bin/migrate-oats-data/menu/commands/__init__.py create mode 100644 bin/migrate-oats-data/menu/commands/applications.py create mode 100644 bin/migrate-oats-data/menu/commands/clean_all.py create mode 100644 bin/migrate-oats-data/menu/commands/documents.py create mode 100644 bin/migrate-oats-data/menu/commands/import_all.py create mode 100644 bin/migrate-oats-data/menu/commands/notice_of_intents.py create mode 100644 bin/migrate-oats-data/menu/menu.py create mode 100644 bin/migrate-oats-data/noi/notice_of_intent_migration.py diff --git a/bin/migrate-oats-data/applications/__init__.py b/bin/migrate-oats-data/applications/__init__.py index 958d38f1d4..8e0663d4c5 100644 --- a/bin/migrate-oats-data/applications/__init__.py +++ b/bin/migrate-oats-data/applications/__init__.py @@ -1,2 +1,8 @@ from .base_applications import * from .app_prep import process_alcs_application_prep_fields +from .submissions import process_alcs_app_submissions +from .application_submission_status_email import ( + process_application_submission_status_emails, + clean_application_submission_status_emails, +) +from .base_applications import process_applications diff --git a/bin/migrate-oats-data/applications/application_submission_status_email/submission_status_email.py b/bin/migrate-oats-data/applications/application_submission_status_email/submission_status_email.py index 6955d24626..52f35f5e81 100644 --- a/bin/migrate-oats-data/applications/application_submission_status_email/submission_status_email.py +++ b/bin/migrate-oats-data/applications/application_submission_status_email/submission_status_email.py @@ -23,7 +23,7 @@ def process_application_submission_status_emails(conn=None): @inject_conn_pool -def clean_notice_of_intent_submission_status_emails(conn=None): +def clean_application_submission_status_emails(conn=None): update_query = f""" UPDATE alcs.application_submission_to_submission_status status SET email_sent_date = NULL diff --git a/bin/migrate-oats-data/menu/__init__.py b/bin/migrate-oats-data/menu/__init__.py new file mode 100644 index 0000000000..29f9f954c8 --- /dev/null +++ b/bin/migrate-oats-data/menu/__init__.py @@ -0,0 +1,2 @@ +from .menu import setup_menu_args_parser +from .commands import * diff --git a/bin/migrate-oats-data/menu/command_parser/__init__.py b/bin/migrate-oats-data/menu/command_parser/__init__.py new file mode 100644 index 0000000000..a442dfeeef --- /dev/null +++ b/bin/migrate-oats-data/menu/command_parser/__init__.py @@ -0,0 +1,3 @@ +from .application_command_parser import * +from .notice_of_intent_command_parser import * +from .document_command_parser import * diff --git a/bin/migrate-oats-data/menu/command_parser/application_command_parser.py b/bin/migrate-oats-data/menu/command_parser/application_command_parser.py new file mode 100644 index 0000000000..91894fb298 --- /dev/null +++ b/bin/migrate-oats-data/menu/command_parser/application_command_parser.py @@ -0,0 +1,40 @@ +def application_import_command_parser(import_batch_size, subparsers): + application_import_command = subparsers.add_parser( + "application-import", + help=f"Import application with specified batch size: (default: {import_batch_size})", + ) + application_import_command.add_argument( + "--batch-size", + type=int, + default=import_batch_size, + metavar="", + help=f"batch size (default: {import_batch_size})", + ) + + +def app_prep_import_command_parser(import_batch_size, subparsers): + app_prep_import_command = subparsers.add_parser( + "app-prep-import", + help=f"Import App prep into ALCS (update applications table) in specified batch size: (default: {import_batch_size})", + ) + app_prep_import_command.add_argument( + "--batch-size", + type=int, + default=import_batch_size, + metavar="", + help=f"batch size (default: {import_batch_size})", + ) + + +def app_sub_import_command_parser(import_batch_size, subparsers): + app_sub_import_command = subparsers.add_parser( + "app-sub-import", + help=f"Import App submission into ALCS (update application_submission table) in specified batch size: (default: {import_batch_size})", + ) + app_sub_import_command.add_argument( + "--batch-size", + type=int, + default=import_batch_size, + metavar="", + help=f"batch size (default: {import_batch_size})", + ) diff --git a/bin/migrate-oats-data/menu/command_parser/document_command_parser.py b/bin/migrate-oats-data/menu/command_parser/document_command_parser.py new file mode 100644 index 0000000000..fc175314a9 --- /dev/null +++ b/bin/migrate-oats-data/menu/command_parser/document_command_parser.py @@ -0,0 +1,55 @@ +# Liam question which of the following document commands need to be deleted +def document_import_command_parser(import_batch_size, subparsers): + document_import_command = subparsers.add_parser( + "document-import", + help=f"Import documents with specified batch size: (default: {import_batch_size})", + ) + document_import_command.add_argument( + "--batch-size", + type=int, + default=import_batch_size, + metavar="", + help=f"batch size (default: {import_batch_size})", + ) + + +def document_noi_import_command_parser(import_batch_size, subparsers): + document_noi_import_command = subparsers.add_parser( + "document-noi-import", + help=f"Import documents_noi with specified batch size: (default: {import_batch_size})", + ) + document_noi_import_command.add_argument( + "--batch-size", + type=int, + default=import_batch_size, + metavar="", + help=f"batch size (default: {import_batch_size})", + ) + + +def application_document_import_command_parser(import_batch_size, subparsers): + application_document_import_command = subparsers.add_parser( + "app-document-import", + help=f"Links imported documents with application documents specified batch size: (default: {import_batch_size})", + ) + application_document_import_command.add_argument( + "--batch-size", + type=int, + default=import_batch_size, + metavar="", + help=f"batch size (default: {import_batch_size})", + ) + + +def noi_document_import_command_parser(import_batch_size, subparsers): + noi_document_import_command = subparsers.add_parser( + "noi-document-import", + help=f"Links imported documents with noi documents specified batch size: (default: {import_batch_size})", + ) + noi_document_import_command.add_argument( + "--batch-size", + type=int, + default=import_batch_size, + metavar="", + help=f"batch size (default: {import_batch_size})", + ) diff --git a/bin/migrate-oats-data/menu/command_parser/notice_of_intent_command_parser.py b/bin/migrate-oats-data/menu/command_parser/notice_of_intent_command_parser.py new file mode 100644 index 0000000000..617199d846 --- /dev/null +++ b/bin/migrate-oats-data/menu/command_parser/notice_of_intent_command_parser.py @@ -0,0 +1,12 @@ +def noi_import_command_parser(import_batch_size, subparsers): + noi_import_command = subparsers.add_parser( + "noi-import", + help=f"Import NOI with specified batch size: (default: {import_batch_size})", + ) + noi_import_command.add_argument( + "--batch-size", + type=int, + default=import_batch_size, + metavar="", + help=f"batch size (default: {import_batch_size})", + ) diff --git a/bin/migrate-oats-data/menu/commands/__init__.py b/bin/migrate-oats-data/menu/commands/__init__.py new file mode 100644 index 0000000000..e2a01516ad --- /dev/null +++ b/bin/migrate-oats-data/menu/commands/__init__.py @@ -0,0 +1,5 @@ +from .import_all import import_all +from .clean_all import clean_all +from .documents import * +from .applications import * +from .notice_of_intents import * \ No newline at end of file diff --git a/bin/migrate-oats-data/menu/commands/applications.py b/bin/migrate-oats-data/menu/commands/applications.py new file mode 100644 index 0000000000..3fc2bce7d5 --- /dev/null +++ b/bin/migrate-oats-data/menu/commands/applications.py @@ -0,0 +1,46 @@ +from applications import ( + process_applications, + process_alcs_application_prep_fields, + process_alcs_app_submissions, +) + + +def app_prep_import(console, args): + console.log("Beginning OATS -> ALCS app-prep import process") + with console.status( + "[bold green]App prep import (applications table update in ALCS)..." + ) as status: + if args.batch_size: + import_batch_size = args.batch_size + + console.log(f"Processing app-prep import in batch size = {import_batch_size}") + + process_alcs_application_prep_fields(batch_size=import_batch_size) + + +def application_import(console, args): + console.log("Beginning OATS -> ALCS application import process") + with console.status( + "[bold green]application import (application table update in ALCS)..." + ) as status: + if args.batch_size: + import_batch_size = args.batch_size + + console.log( + f"Processing applications import in batch size = {import_batch_size}" + ) + + process_applications(batch_size=import_batch_size) + + +def application_submission_import(console, args): + console.log("Beginning OATS -> ALCS app-sub import process") + with console.status( + "[bold green]App submission import (application_submission table update in ALCS)..." + ) as status: + if args.batch_size: + import_batch_size = args.batch_size + + console.log(f"Processing app-sub import in batch size = {import_batch_size}") + + process_alcs_app_submissions(batch_size=import_batch_size) diff --git a/bin/migrate-oats-data/menu/commands/clean_all.py b/bin/migrate-oats-data/menu/commands/clean_all.py new file mode 100644 index 0000000000..a3562d4d28 --- /dev/null +++ b/bin/migrate-oats-data/menu/commands/clean_all.py @@ -0,0 +1,32 @@ +from applications import clean_applications +from noi.notice_of_intent_migration import clean_notice_of_intent +from applications.submissions import clean_application_submission +from applications.application_submission_status_email import ( + clean_application_submission_status_emails, +) +from noi.noi_submission_status_email import ( + clean_application_submission_status_emails, +) +from noi import clean_notice_of_intents +from documents import ( + clean_application_documents, + clean_documents, + clean_noi_documents, +) + + +def clean_all(console, args): + with console.status("[bold green]Cleaning previous ETL...") as status: + console.log("Cleaning data:") + # this will be enabled once application import is ready + + clean_application_documents() + clean_noi_documents() + clean_documents() + clean_application_submission() + clean_applications() + clean_notice_of_intents() + clean_application_submission_status_emails(), + clean_application_submission_status_emails(), + + console.log("Done") diff --git a/bin/migrate-oats-data/menu/commands/documents.py b/bin/migrate-oats-data/menu/commands/documents.py new file mode 100644 index 0000000000..ab62657b75 --- /dev/null +++ b/bin/migrate-oats-data/menu/commands/documents.py @@ -0,0 +1,42 @@ +from documents import ( + process_documents, + process_documents_noi, + process_application_documents, + process_noi_documents, +) + + +def document_import(console, args): + console.log("Beginning OATS -> ALCS document-import process") + with console.status("[bold green]Import OATS into ALCS...") as status: + if args.batch_size: + import_batch_size = args.batch_size + + console.log(f"Processing documents in batch size = {import_batch_size}") + + process_documents(batch_size=import_batch_size) + process_documents_noi(batch_size=import_batch_size) + + +def app_document_import(console, args): + console.log("Beginning OATS -> ALCS app-document-import process") + with console.status("[bold green]Link application documents in ALCS...") as status: + if args.batch_size: + import_batch_size = args.batch_size + + console.log( + f"Processing application documents in batch size = {import_batch_size}" + ) + + process_application_documents(batch_size=import_batch_size) + + +def noi_document_import(console, args): + console.log("Beginning OATS -> ALCS noi-document-import process") + with console.status("[bold green]Link application documents in ALCS...") as status: + if args.batch_size: + import_batch_size = args.batch_size + + console.log(f"Processing NOI documents in batch size = {import_batch_size}") + + process_noi_documents(batch_size=import_batch_size) diff --git a/bin/migrate-oats-data/menu/commands/import_all.py b/bin/migrate-oats-data/menu/commands/import_all.py new file mode 100644 index 0000000000..6c6eea70df --- /dev/null +++ b/bin/migrate-oats-data/menu/commands/import_all.py @@ -0,0 +1,68 @@ +from applications import ( + process_applications, + process_alcs_application_prep_fields, +) +from noi.notice_of_intent_migration import ( + init_notice_of_intents, + process_notice_of_intent, +) +from applications.submissions import process_alcs_app_submissions +from applications.application_submission_status_email import ( + process_application_submission_status_emails, +) +from noi.noi_submission_status_email import ( + process_notice_of_intent_submission_status_emails, +) +from noi import ( + process_notice_of_intent, +) +from documents import ( + process_application_documents, + process_noi_documents, +) + + +def import_all(console, args): + console.log("Beginning OATS -> ALCS import process") + + with console.status("[bold green]Import OATS into ALCS...") as status: + console.log("Init applications:") + # this will be enabled once application import is ready + + if args and args.batch_size: + import_batch_size = args.batch_size + + console.log("Batching applications:") + process_applications(batch_size=import_batch_size) + + console.log("Init NOIs:") + init_notice_of_intents(batch_size=import_batch_size) + + # TODO Liam question: which process_documents_noi or process_noi_documents is the correct one to keep? + # console.log("Processing NOI specific documents:") + # process_documents_noi(batch_size=import_batch_size) + + # console.log("Processing documents:") + # process_documents(batch_size=import_batch_size) + + console.log("Processing application documents:") + process_application_documents(batch_size=import_batch_size) + + console.log("Processing NOI documents:") + process_noi_documents(batch_size=import_batch_size) + + console.log("Processing application prep:") + process_alcs_application_prep_fields(batch_size=import_batch_size) + + console.log("Processing application submission:") + process_alcs_app_submissions(batch_size=import_batch_size) + + console.log("Processing notice of intents") + process_notice_of_intent(batch_size=import_batch_size) + + # NOTE: both process_application_submission_status_emails(), process_notice_of_intent_submission_status_emails() + # must be the last ones in the migrate etl + console.log("Processing submission status emails") + process_application_submission_status_emails() + process_notice_of_intent_submission_status_emails() + console.log("Done") diff --git a/bin/migrate-oats-data/menu/commands/notice_of_intents.py b/bin/migrate-oats-data/menu/commands/notice_of_intents.py new file mode 100644 index 0000000000..3033686765 --- /dev/null +++ b/bin/migrate-oats-data/menu/commands/notice_of_intents.py @@ -0,0 +1,18 @@ +from noi.notice_of_intent_migration import ( + init_notice_of_intents, + process_notice_of_intent, +) + + +def notice_of_intent_import(console, args): + console.log("Beginning OATS -> ALCS NOI import process") + with console.status( + "[bold green]NOI import (notice_of_intent table update in ALCS)..." + ) as status: + if args.batch_size: + import_batch_size = args.batch_size + + console.log(f"Processing NOI import in batch size = {import_batch_size}") + + init_notice_of_intents(batch_size=import_batch_size) + process_notice_of_intent(batch_size=import_batch_size) diff --git a/bin/migrate-oats-data/menu/menu.py b/bin/migrate-oats-data/menu/menu.py new file mode 100644 index 0000000000..f26f446288 --- /dev/null +++ b/bin/migrate-oats-data/menu/menu.py @@ -0,0 +1,58 @@ +import sys, argparse +from .command_parser.application_command_parser import ( + application_import_command_parser, + app_prep_import_command_parser, + app_sub_import_command_parser, +) +from .command_parser.notice_of_intent_command_parser import noi_import_command_parser +from .command_parser.document_command_parser import ( + document_import_command_parser, + application_document_import_command_parser, + document_noi_import_command_parser, + noi_document_import_command_parser, +) +from common import BATCH_UPLOAD_SIZE + +import_batch_size = BATCH_UPLOAD_SIZE + + +def _import_command_parser(subparsers): + import_command = subparsers.add_parser( + "import", + help=f"Starts OATS -> ALCS import process with specified batch size: (default: {import_batch_size})", + ) + import_command.add_argument( + "--batch-size", + type=int, + default=import_batch_size, + metavar="", + help=f"batch size (default: {import_batch_size})", + ) + import_command.set_defaults(func=import_batch_size) + + +def setup_menu_args_parser(import_batch_size): + parser = argparse.ArgumentParser(description="OATS ETL utility") + + # Add subcommands to parser + subparsers = parser.add_subparsers(dest="command") + application_import_command_parser(import_batch_size, subparsers) + document_import_command_parser(import_batch_size, subparsers) + application_document_import_command_parser(import_batch_size, subparsers) + app_prep_import_command_parser(import_batch_size, subparsers) + noi_import_command_parser(import_batch_size, subparsers) + document_noi_import_command_parser(import_batch_size, subparsers) + noi_document_import_command_parser(import_batch_size, subparsers) + _import_command_parser(subparsers) + app_sub_import_command_parser(import_batch_size, subparsers) + + subparsers.add_parser("clean", help="Clean all imported data") + + # Print help message if user specifies --help or -h flag + if "-h" in sys.argv or "--help" in sys.argv: + parser.print_help() + sys.exit(0) + + # Parse arguments and call command function + args = parser.parse_args() + return args diff --git a/bin/migrate-oats-data/migrate.py b/bin/migrate-oats-data/migrate.py index 0a7b88ae44..aea6fd9cb4 100644 --- a/bin/migrate-oats-data/migrate.py +++ b/bin/migrate-oats-data/migrate.py @@ -1,210 +1,24 @@ -import sys, logging, argparse +import logging +from rich.console import Console -from documents import ( - process_documents, - process_application_documents, - clean_application_documents, - clean_documents, - process_documents_noi, - process_noi_documents, - clean_noi_documents, +from menu import setup_menu_args_parser +from menu.commands import ( + import_all, + clean_all, + document_import, + app_document_import, + app_prep_import, + application_import, + application_submission_import, + noi_document_import, + notice_of_intent_import, ) -from rich.console import Console from db import connection_pool -from applications import ( - process_applications, - clean_applications, - process_alcs_application_prep_fields, -) -from noi.notice_of_intent_init import ( - process_nois, - clean_nois, -) -from applications.submissions import ( - process_alcs_app_submissions, - clean_application_submission, -) from common import BATCH_UPLOAD_SIZE -from applications.application_submission_status_email import ( - process_application_submission_status_emails, - clean_notice_of_intent_submission_status_emails, -) -from noi.noi_submission_status_email import ( - process_notice_of_intent_submission_status_emails, - clean_application_submission_status_emails, -) -from noi.oats_to_alcs_notice_of_intent_table_etl import ( - process_alcs_notice_of_intent_fee_fields, -) import_batch_size = BATCH_UPLOAD_SIZE -# TODO tidy import menu setup - - -def application_import_command_parser(import_batch_size, subparsers): - application_import_command = subparsers.add_parser( - "application-import", - help=f"Import application with specified batch size: (default: {import_batch_size})", - ) - application_import_command.add_argument( - "--batch-size", - type=int, - default=import_batch_size, - metavar="", - help=f"batch size (default: {import_batch_size})", - ) - application_import_command.set_defaults(func=process_applications) - - -def document_import_command_parser(import_batch_size, subparsers): - document_import_command = subparsers.add_parser( - "document-import", - help=f"Import documents with specified batch size: (default: {import_batch_size})", - ) - document_import_command.add_argument( - "--batch-size", - type=int, - default=import_batch_size, - metavar="", - help=f"batch size (default: {import_batch_size})", - ) - document_import_command.set_defaults(func=process_documents) - - -def document_noi_import_command_parser(import_batch_size, subparsers): - document_noi_import_command = subparsers.add_parser( - "document-noi-import", - help=f"Import documents_noi with specified batch size: (default: {import_batch_size})", - ) - document_noi_import_command.add_argument( - "--batch-size", - type=int, - default=import_batch_size, - metavar="", - help=f"batch size (default: {import_batch_size})", - ) - document_noi_import_command.set_defaults(func=process_documents_noi) - - -def application_document_import_command_parser(import_batch_size, subparsers): - application_document_import_command = subparsers.add_parser( - "app-document-import", - help=f"Links imported documents with application documents specified batch size: (default: {import_batch_size})", - ) - application_document_import_command.add_argument( - "--batch-size", - type=int, - default=import_batch_size, - metavar="", - help=f"batch size (default: {import_batch_size})", - ) - application_document_import_command.set_defaults(func=import_batch_size) - - -def noi_document_import_command_parser(import_batch_size, subparsers): - noi_document_import_command = subparsers.add_parser( - "noi-document-import", - help=f"Links imported documents with noi documents specified batch size: (default: {import_batch_size})", - ) - noi_document_import_command.add_argument( - "--batch-size", - type=int, - default=import_batch_size, - metavar="", - help=f"batch size (default: {import_batch_size})", - ) - noi_document_import_command.set_defaults(func=import_batch_size) - - -def app_prep_import_command_parser(import_batch_size, subparsers): - app_prep_import_command = subparsers.add_parser( - "app-prep-import", - help=f"Import App prep into ALCS (update applications table) in specified batch size: (default: {import_batch_size})", - ) - app_prep_import_command.add_argument( - "--batch-size", - type=int, - default=import_batch_size, - metavar="", - help=f"batch size (default: {import_batch_size})", - ) - app_prep_import_command.set_defaults(func=import_batch_size) - - -def noi_import_command_parser(import_batch_size, subparsers): - noi_import_command = subparsers.add_parser( - "noi-import", - help=f"Import NOI with specified batch size: (default: {import_batch_size})", - ) - noi_import_command.add_argument( - "--batch-size", - type=int, - default=import_batch_size, - metavar="", - help=f"batch size (default: {import_batch_size})", - ) - noi_import_command.set_defaults(func=import_batch_size) - - -def import_command_parser(subparsers): - import_command = subparsers.add_parser( - "import", - help=f"Starts OATS -> ALCS import process with specified batch size: (default: {import_batch_size})", - ) - import_command.add_argument( - "--batch-size", - type=int, - default=import_batch_size, - metavar="", - help=f"batch size (default: {import_batch_size})", - ) - import_command.set_defaults(func=import_batch_size) - - -def app_sub_import_command_parser(import_batch_size, subparsers): - app_sub_import_command = subparsers.add_parser( - "app-sub-import", - help=f"Import App submission into ALCS (update application_submission table) in specified batch size: (default: {import_batch_size})", - ) - app_sub_import_command.add_argument( - "--batch-size", - type=int, - default=import_batch_size, - metavar="", - help=f"batch size (default: {import_batch_size})", - ) - app_sub_import_command.set_defaults(func=import_batch_size) - - -def setup_menu_args_parser(import_batch_size): - parser = argparse.ArgumentParser(description="OATS ETL utility") - - # Add subcommands to parser - subparsers = parser.add_subparsers(dest="command") - application_import_command_parser(import_batch_size, subparsers) - document_import_command_parser(import_batch_size, subparsers) - application_document_import_command_parser(import_batch_size, subparsers) - app_prep_import_command_parser(import_batch_size, subparsers) - noi_import_command_parser(import_batch_size, subparsers) - document_noi_import_command_parser(import_batch_size, subparsers) - noi_document_import_command_parser(import_batch_size, subparsers) - import_command_parser(subparsers) - app_sub_import_command_parser(import_batch_size, subparsers) - - subparsers.add_parser("clean", help="Clean all imported data") - - # Print help message if user specifies --help or -h flag - if "-h" in sys.argv or "--help" in sys.argv: - parser.print_help() - sys.exit(0) - - # Parse arguments and call command function - args = parser.parse_args() - return args - - if __name__ == "__main__": args = setup_menu_args_parser(import_batch_size) @@ -217,158 +31,23 @@ def setup_menu_args_parser(import_batch_size): # Call function corresponding to selected action using match statement match args.command: case "import": - console.log("Beginning OATS -> ALCS import process") - with console.status("[bold green]Import OATS into ALCS...") as status: - console.log("Processing applications:") - # this will be enabled once application import is ready - - if args and args.batch_size: - import_batch_size = args.batch_size - - console.log("Batching applications:") - process_applications(batch_size=import_batch_size) - - console.log("Processing NOIs:") - process_nois(batch_size=import_batch_size) - - # TODO Liam question which process_documents_noi or process_noi_documents is the correct one to keep? - # console.log("Processing NOI specific documents:") - # process_documents_noi(batch_size=import_batch_size) - - # console.log("Processing documents:") - # process_documents(batch_size=import_batch_size) - - console.log("Processing application documents:") - process_application_documents(batch_size=import_batch_size) - - console.log("Processing NOI documents:") - process_noi_documents(batch_size=import_batch_size) - - console.log("Processing application prep:") - process_alcs_application_prep_fields(batch_size=import_batch_size) - - console.log("Processing application submission:") - process_alcs_app_submissions(batch_size=import_batch_size) - - console.log("Processing notice of intent fields") - process_alcs_notice_of_intent_fee_fields( - batch_size=import_batch_size - ) - - # NOTE: both process_application_submission_status_emails(), process_notice_of_intent_submission_status_emails() - # must be the last ones in the migrate etl - console.log("Processing submission status emails") - process_application_submission_status_emails() - process_notice_of_intent_submission_status_emails() - console.log("Done") + import_all(console, args) case "clean": - with console.status("[bold green]Cleaning previous ETL...") as status: - console.log("Cleaning data:") - # this will be enabled once application import is ready - - clean_application_documents() - clean_noi_documents() - clean_documents() - clean_application_submission() - clean_applications() - clean_nois() - clean_notice_of_intent_submission_status_emails(), - clean_application_submission_status_emails(), - - console.log("Done") + clean_all(console, args) case "document-import": - console.log("Beginning OATS -> ALCS document-import process") - with console.status("[bold green]Import OATS into ALCS...") as status: - if args.batch_size: - import_batch_size = args.batch_size - - console.log( - f"Processing documents in batch size = {import_batch_size}" - ) - - process_documents(batch_size=import_batch_size) - process_documents_noi(batch_size=import_batch_size) + document_import(console, args) case "app-document-import": - console.log("Beginning OATS -> ALCS app-document-import process") - with console.status( - "[bold green]Link application documents in ALCS..." - ) as status: - if args.batch_size: - import_batch_size = args.batch_size - - console.log( - f"Processing application documents in batch size = {import_batch_size}" - ) - - process_application_documents(batch_size=import_batch_size) + app_document_import(console, args) case "app-prep-import": - console.log("Beginning OATS -> ALCS app-prep import process") - with console.status( - "[bold green]App prep import (applications table update in ALCS)..." - ) as status: - if args.batch_size: - import_batch_size = args.batch_size - - console.log( - f"Processing app-prep import in batch size = {import_batch_size}" - ) - - process_alcs_application_prep_fields(batch_size=import_batch_size) + app_prep_import(console, args) case "noi-import": - console.log("Beginning OATS -> ALCS NOI import process") - with console.status( - "[bold green]NOI import (notice_of_intent table update in ALCS)..." - ) as status: - if args.batch_size: - import_batch_size = args.batch_size - - console.log( - f"Processing NOI import in batch size = {import_batch_size}" - ) - - process_nois(batch_size=import_batch_size) - process_alcs_notice_of_intent_fee_fields( - batch_size=import_batch_size - ) + notice_of_intent_import(console, args) case "application-import": - console.log("Beginning OATS -> ALCS application import process") - with console.status( - "[bold green]application import (application table update in ALCS)..." - ) as status: - if args.batch_size: - import_batch_size = args.batch_size - - console.log( - f"Processing applications import in batch size = {import_batch_size}" - ) - - process_applications(batch_size=import_batch_size) + application_import(console, args) case "noi-document-import": - console.log("Beginning OATS -> ALCS noi-document-import process") - with console.status( - "[bold green]Link application documents in ALCS..." - ) as status: - if args.batch_size: - import_batch_size = args.batch_size - - console.log( - f"Processing NOI documents in batch size = {import_batch_size}" - ) - - process_noi_documents(batch_size=import_batch_size) + noi_document_import(console, args) case "app-sub-import": - console.log("Beginning OATS -> ALCS app-sub import process") - with console.status( - "[bold green]App submission import (application_submission table update in ALCS)..." - ) as status: - if args.batch_size: - import_batch_size = args.batch_size - - console.log( - f"Processing app-sub import in batch size = {import_batch_size}" - ) - - process_alcs_app_submissions(batch_size=import_batch_size) + application_submission_import(console, args) finally: if connection_pool: diff --git a/bin/migrate-oats-data/noi/__init__.py b/bin/migrate-oats-data/noi/__init__.py index 4b8338fdd6..9348bb9dcd 100644 --- a/bin/migrate-oats-data/noi/__init__.py +++ b/bin/migrate-oats-data/noi/__init__.py @@ -1 +1,2 @@ -from .notice_of_intent_init import * \ No newline at end of file +from .notice_of_intent_init import init_notice_of_intents, clean_notice_of_intents +from .notice_of_intent_migration import process_notice_of_intent diff --git a/bin/migrate-oats-data/noi/notice_of_intent_init.py b/bin/migrate-oats-data/noi/notice_of_intent_init.py index 82a6094c2f..4febbd3958 100644 --- a/bin/migrate-oats-data/noi/notice_of_intent_init.py +++ b/bin/migrate-oats-data/noi/notice_of_intent_init.py @@ -1,5 +1,6 @@ from db import inject_conn_pool + def noi_insert_query(number_of_rows_to_insert): nois_to_insert = ",".join(["%s"] * number_of_rows_to_insert) return f""" @@ -16,13 +17,11 @@ def noi_insert_query(number_of_rows_to_insert): type_code = EXCLUDED.type_code """ + @inject_conn_pool -def process_nois(conn=None, batch_size=10000): +def init_notice_of_intents(conn=None, batch_size=10000): with conn.cursor() as cursor: - - with open( - "noi/sql/insert_noi_count.sql", "r", encoding="utf-8" - ) as sql_file: + with open("noi/sql/insert_noi_count.sql", "r", encoding="utf-8") as sql_file: count_query = sql_file.read() cursor.execute(count_query) count_total = cursor.fetchone()[0] @@ -38,19 +37,17 @@ def process_nois(conn=None, batch_size=10000): cursor.execute( f"{application_sql} WHERE ng.noi_application_id > {last_application_id} ORDER by ng.noi_application_id;" ) - + rows = cursor.fetchmany(batch_size) if not rows: break - try: + try: applications_to_be_inserted_count = len(rows) - insert_query = noi_insert_query( - applications_to_be_inserted_count - ) + insert_query = noi_insert_query(applications_to_be_inserted_count) cursor.execute(insert_query, rows) conn.commit() - + last_application_id = rows[-1][0] successful_inserts_count = ( successful_inserts_count + applications_to_be_inserted_count @@ -58,23 +55,22 @@ def process_nois(conn=None, batch_size=10000): print( f"retrieved/inserted items count: {applications_to_be_inserted_count}; total successfully inserted/updated NOIs so far {successful_inserts_count}; last inserted noi_applidation_id: {last_application_id}" - ) except Exception as e: conn.rollback() print("Error", e) - failed_inserts = count_total - successful_inserts_count - last_application_id = last_application_id +1 - + failed_inserts = count_total - successful_inserts_count + last_application_id = last_application_id + 1 print("Total amount of successful inserts:", successful_inserts_count) - print("Total failed inserts:", failed_inserts) + print("Total failed inserts:", failed_inserts) + @inject_conn_pool -def clean_nois(conn=None): +def clean_notice_of_intents(conn=None): print("Start NOI cleaning") with conn.cursor() as cursor: cursor.execute( "DELETE FROM alcs.notice_of_intent a WHERE a.audit_created_by = 'oats_etl'" ) - print(f"Deleted items count = {cursor.rowcount}") \ No newline at end of file + print(f"Deleted items count = {cursor.rowcount}") diff --git a/bin/migrate-oats-data/noi/notice_of_intent_migration.py b/bin/migrate-oats-data/noi/notice_of_intent_migration.py new file mode 100644 index 0000000000..7f8e058562 --- /dev/null +++ b/bin/migrate-oats-data/noi/notice_of_intent_migration.py @@ -0,0 +1,17 @@ +from .oats_to_alcs_notice_of_intent_table_etl.oats_to_alcs_notice_of_intent_table_etl import ( + process_alcs_notice_of_intent_base_fields, +) +from .notice_of_intent_init import init_notice_of_intents, clean_notice_of_intents + + +def init_notice_of_intent(batch_size): + init_notice_of_intents(batch_size=batch_size) + + +def clean_notice_of_intent(): + clean_notice_of_intents() + + +def process_notice_of_intent(batch_size): + process_alcs_notice_of_intent_base_fields(batch_size=batch_size) + # place the rest notice of intent processing function here diff --git a/bin/migrate-oats-data/noi/oats_to_alcs_notice_of_intent_table_etl/__init__.py b/bin/migrate-oats-data/noi/oats_to_alcs_notice_of_intent_table_etl/__init__.py index 4b40e6e129..c47d9f3610 100644 --- a/bin/migrate-oats-data/noi/oats_to_alcs_notice_of_intent_table_etl/__init__.py +++ b/bin/migrate-oats-data/noi/oats_to_alcs_notice_of_intent_table_etl/__init__.py @@ -1 +1,3 @@ -from .oats_to_alcs_notice_of_intent_table_etl import process_alcs_notice_of_intent_fee_fields +from .oats_to_alcs_notice_of_intent_table_etl import ( + process_alcs_notice_of_intent_base_fields, +) diff --git a/bin/migrate-oats-data/noi/oats_to_alcs_notice_of_intent_table_etl/oats_to_alcs_notice_of_intent_table_etl.py b/bin/migrate-oats-data/noi/oats_to_alcs_notice_of_intent_table_etl/oats_to_alcs_notice_of_intent_table_etl.py index 3898d44659..e2d4a2f55d 100644 --- a/bin/migrate-oats-data/noi/oats_to_alcs_notice_of_intent_table_etl/oats_to_alcs_notice_of_intent_table_etl.py +++ b/bin/migrate-oats-data/noi/oats_to_alcs_notice_of_intent_table_etl/oats_to_alcs_notice_of_intent_table_etl.py @@ -26,7 +26,7 @@ class OatsToAlcsAgCap(Enum): @inject_conn_pool -def process_alcs_notice_of_intent_fee_fields(conn=None, batch_size=BATCH_UPLOAD_SIZE): +def process_alcs_notice_of_intent_base_fields(conn=None, batch_size=BATCH_UPLOAD_SIZE): """ decision_date is imported separately """ From e9e74ce55bea5f47329309c2ecf1569d4daab4d1 Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Fri, 22 Sep 2023 15:15:18 -0700 Subject: [PATCH 418/954] convert cron expression to utc to properly map to PST or PDT (#1000) introduce isDST function use utc corn expression to match desired PST or PDT time --- .../scheduler/scheduler.service.spec.ts | 41 ++++++++++++++--- .../src/queues/scheduler/scheduler.service.ts | 45 ++++++++++++++++--- .../utils/pacific-date-time-helper.spec.ts | 19 ++++++++ .../src/utils/pacific-date-time-helper.ts | 6 +++ 4 files changed, 97 insertions(+), 14 deletions(-) diff --git a/services/apps/alcs/src/queues/scheduler/scheduler.service.spec.ts b/services/apps/alcs/src/queues/scheduler/scheduler.service.spec.ts index e1ceccb46a..8cedfcf95f 100644 --- a/services/apps/alcs/src/queues/scheduler/scheduler.service.spec.ts +++ b/services/apps/alcs/src/queues/scheduler/scheduler.service.spec.ts @@ -1,10 +1,13 @@ import { ConfigModule } from '@app/common/config/config.module'; import { BullModule, getQueueToken } from '@nestjs/bullmq'; import { Test, TestingModule } from '@nestjs/testing'; +import { isDST } from '../../utils/pacific-date-time-helper'; import { BullConfigService } from '../bullConfig.service'; import { - EVERYDAY_MIDNIGHT, - EVERY_15_MINUTES_STARTING_FROM_8AM, + EVERYDAY_MIDNIGHT_PDT_IN_UTC, + EVERYDAY_MIDNIGHT_PST_IN_UTC, + EVERY_15_MINUTES_STARTING_FROM_8AM_PDT_IN_UTC, + EVERY_15_MINUTES_STARTING_FROM_8AM_PST_IN_UTC, QUEUES, SchedulerService, } from './scheduler.service'; @@ -84,9 +87,15 @@ describe('SchedulerService', () => { // expect(mockAppExpiryQueue.getRepeatableJobs).toBeCalledTimes(1); // expect(mockAppExpiryQueue.add).toBeCalledTimes(1); // expect(mockAppExpiryQueue.add).toBeCalledWith( - // 'applicationExpiry' + // 'applicationExpiry', // {}, - // { repeat: { pattern: MONDAY_TO_FRIDAY_AT_2AM } }, + // { + // repeat: { + // pattern: isDST() + // ? MONDAY_TO_FRIDAY_AT_2AM_PST_IN_UTC + // : MONDAY_TO_FRIDAY_AT_2AM_PDT_IN_UTC, + // }, + // }, // ); // }); @@ -97,7 +106,13 @@ describe('SchedulerService', () => { expect(mockNotificationCleanUpQueue.add).toBeCalledWith( 'cleanupNotifications', {}, - { repeat: { pattern: EVERYDAY_MIDNIGHT } }, + { + repeat: { + pattern: isDST() + ? EVERYDAY_MIDNIGHT_PST_IN_UTC + : EVERYDAY_MIDNIGHT_PDT_IN_UTC, + }, + }, ); }); @@ -110,7 +125,13 @@ describe('SchedulerService', () => { expect(mockApplicationStatusEmailsQueue.add).toBeCalledWith( 'applicationSubmissionStatusEmails', {}, - { repeat: { pattern: EVERY_15_MINUTES_STARTING_FROM_8AM } }, + { + repeat: { + pattern: isDST() + ? EVERY_15_MINUTES_STARTING_FROM_8AM_PST_IN_UTC + : EVERY_15_MINUTES_STARTING_FROM_8AM_PDT_IN_UTC, + }, + }, ); }); @@ -123,7 +144,13 @@ describe('SchedulerService', () => { expect(mockNoticeOfIntentStatusEmailsQueue.add).toBeCalledWith( 'noticeOfIntentSubmissionStatusEmails', {}, - { repeat: { pattern: EVERY_15_MINUTES_STARTING_FROM_8AM } }, + { + repeat: { + pattern: isDST() + ? EVERY_15_MINUTES_STARTING_FROM_8AM_PST_IN_UTC + : EVERY_15_MINUTES_STARTING_FROM_8AM_PDT_IN_UTC, + }, + }, ); }); }); diff --git a/services/apps/alcs/src/queues/scheduler/scheduler.service.ts b/services/apps/alcs/src/queues/scheduler/scheduler.service.ts index 82a3400ddb..c3192b12a3 100644 --- a/services/apps/alcs/src/queues/scheduler/scheduler.service.ts +++ b/services/apps/alcs/src/queues/scheduler/scheduler.service.ts @@ -1,10 +1,18 @@ import { InjectQueue } from '@nestjs/bullmq'; import { Injectable } from '@nestjs/common'; import { Queue } from 'bullmq'; +import { isDST } from '../../utils/pacific-date-time-helper'; -export const MONDAY_TO_FRIDAY_AT_2AM = '0 0 2 * * 1-5'; -export const EVERYDAY_MIDNIGHT = '0 0 0 * * *'; -export const EVERY_15_MINUTES_STARTING_FROM_8AM = '0/15 8-23 * * *'; +export const MONDAY_TO_FRIDAY_AT_2AM_PST_IN_UTC = '0 0 10 * * 1-5'; +export const MONDAY_TO_FRIDAY_AT_2AM_PDT_IN_UTC = '0 0 9 * * 1-5'; + +export const EVERYDAY_MIDNIGHT_PST_IN_UTC = '0 0 8 * * *'; +export const EVERYDAY_MIDNIGHT_PDT_IN_UTC = '0 0 7 * * *'; + +export const EVERY_15_MINUTES_STARTING_FROM_8AM_PST_IN_UTC = + '0/15 16-23,0-7 * * *'; +export const EVERY_15_MINUTES_STARTING_FROM_8AM_PDT_IN_UTC = + '0/15 15-23,0-6 * * *'; export const QUEUES = { APP_EXPIRY: 'ApplicationExpiry', @@ -42,7 +50,12 @@ export class SchedulerService { 'applicationExpiry', {}, { - repeat: { pattern: MONDAY_TO_FRIDAY_AT_2AM }, + repeat: { + pattern: this.getCronExpressionBasedOnDst( + MONDAY_TO_FRIDAY_AT_2AM_PST_IN_UTC, + MONDAY_TO_FRIDAY_AT_2AM_PDT_IN_UTC, + ), + }, }, ); } @@ -53,18 +66,29 @@ export class SchedulerService { 'cleanupNotifications', {}, { - repeat: { pattern: EVERYDAY_MIDNIGHT }, + repeat: { + pattern: this.getCronExpressionBasedOnDst( + EVERYDAY_MIDNIGHT_PST_IN_UTC, + EVERYDAY_MIDNIGHT_PDT_IN_UTC, + ), + }, }, ); } private async scheduleSubmissionEmails() { + const cronExpression = this.getCronExpressionBasedOnDst( + EVERY_15_MINUTES_STARTING_FROM_8AM_PST_IN_UTC, + EVERY_15_MINUTES_STARTING_FROM_8AM_PDT_IN_UTC, + ); await this.removeRepeatJobs(this.applicationSubmissionStatusEmailsQueue); await this.applicationSubmissionStatusEmailsQueue.add( 'applicationSubmissionStatusEmails', {}, { - repeat: { pattern: EVERY_15_MINUTES_STARTING_FROM_8AM }, + repeat: { + pattern: cronExpression, + }, }, ); @@ -72,7 +96,7 @@ export class SchedulerService { await this.noticeOfIntentSubmissionStatusEmailsQueue.add( 'noticeOfIntentSubmissionStatusEmails', {}, - { repeat: { pattern: EVERY_15_MINUTES_STARTING_FROM_8AM } }, + { repeat: { pattern: cronExpression } }, ); } @@ -83,4 +107,11 @@ export class SchedulerService { await queue.removeRepeatableByKey(job.key); }); } + + private getCronExpressionBasedOnDst( + pstCronExpression: string, + pdtCronExpression: string, + ) { + return isDST() ? pstCronExpression : pdtCronExpression; + } } diff --git a/services/apps/alcs/src/utils/pacific-date-time-helper.spec.ts b/services/apps/alcs/src/utils/pacific-date-time-helper.spec.ts index 9a514c6d4c..3995c0b997 100644 --- a/services/apps/alcs/src/utils/pacific-date-time-helper.spec.ts +++ b/services/apps/alcs/src/utils/pacific-date-time-helper.spec.ts @@ -2,6 +2,7 @@ import { getNextDayToPacific, getStartOfDayToPacific, + isDST, } from './pacific-date-time-helper'; describe('Pacific date helpers', () => { @@ -21,3 +22,21 @@ describe('Pacific date helpers', () => { expect(result).toEqual(expectedDate); }); }); + +describe('isDST function', () => { + // Test when it's daylight saving time + it("should return true when it's daylight saving time", () => { + jest.useFakeTimers().setSystemTime(new Date('2021-07-01')); + + expect(isDST()).toBe(true); + jest.useRealTimers(); + }); + + // Test when it's not daylight saving time + it("should return false when it's not daylight saving time", () => { + jest.useFakeTimers().setSystemTime(new Date('2021-01-01')); + + expect(isDST()).toBe(false); + jest.useRealTimers(); + }); +}); diff --git a/services/apps/alcs/src/utils/pacific-date-time-helper.ts b/services/apps/alcs/src/utils/pacific-date-time-helper.ts index 8200529426..07bd8adeea 100644 --- a/services/apps/alcs/src/utils/pacific-date-time-helper.ts +++ b/services/apps/alcs/src/utils/pacific-date-time-helper.ts @@ -15,3 +15,9 @@ export const getStartOfDayToPacific = (timestamp: number) => { const date = formatIncomingDate(timestamp); return dayjs(date).tz('Canada/Pacific').startOf('day').toDate(); }; + +export const isDST = () => { + const timezone = 'America/Vancouver'; + const jul = dayjs('2021-07-01').tz(timezone).utcOffset(); + return jul === dayjs().tz(timezone).utcOffset(); +}; From a43bb62f3adf88c747373482ffdd50bba596b97c Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Fri, 22 Sep 2023 14:38:57 -0700 Subject: [PATCH 419/954] Only set ALC Response Sent status if Noti Email Sends * Add tests for it * Update email service to return true/false * Minor UI fix to Inbox --- .../application-list.component.html | 2 +- .../src/app/features/home/home.component.scss | 8 ++ .../home/noi-list/noi-list.component.html | 2 +- .../notification-list.component.html | 2 +- .../notification-submission.service.spec.ts | 89 +++++++++++++++++++ .../notification-submission.service.ts | 50 +++++------ .../alcs/src/providers/email/email.service.ts | 5 +- .../email/status-email.service.spec.ts | 2 +- .../application-expiry.consumer.spec.ts | 2 +- .../apps/alcs/src/user/user.service.spec.ts | 2 +- 10 files changed, 132 insertions(+), 32 deletions(-) diff --git a/portal-frontend/src/app/features/home/application-list/application-list.component.html b/portal-frontend/src/app/features/home/application-list/application-list.component.html index 719877d75c..d169340042 100644 --- a/portal-frontend/src/app/features/home/application-list/application-list.component.html +++ b/portal-frontend/src/app/features/home/application-list/application-list.component.html @@ -6,7 +6,7 @@ <!-- Row shown when there is no matching data. --> <tr class="mat-row" *matNoDataRow> - <td class="mat-cell" colspan="7">No Applications Created</td> + <td class="no-data" colspan="7">No Applications Created</td> </tr> <ng-container matColumnDef="fileNumber"> diff --git a/portal-frontend/src/app/features/home/home.component.scss b/portal-frontend/src/app/features/home/home.component.scss index 6e3266e0d0..e7b75a145d 100644 --- a/portal-frontend/src/app/features/home/home.component.scss +++ b/portal-frontend/src/app/features/home/home.component.scss @@ -7,6 +7,14 @@ } } +:host::ng-deep { + .no-data { + color: colors.$grey; + text-align: center; + padding: rem(8); + } +} + .header-row { .learn-more-wrapper { margin-top: rem(24); diff --git a/portal-frontend/src/app/features/home/noi-list/noi-list.component.html b/portal-frontend/src/app/features/home/noi-list/noi-list.component.html index e9e9d22972..52b16f25e4 100644 --- a/portal-frontend/src/app/features/home/noi-list/noi-list.component.html +++ b/portal-frontend/src/app/features/home/noi-list/noi-list.component.html @@ -6,7 +6,7 @@ <!-- Row shown when there is no matching data. --> <tr class="mat-row" *matNoDataRow> - <td class="mat-cell" style='text-align: center' colspan="7">No NOIs Created</td> + <td class="no-data" colspan="7">No NOIs Created</td> </tr> <ng-container matColumnDef="fileNumber"> diff --git a/portal-frontend/src/app/features/home/notification-list/notification-list.component.html b/portal-frontend/src/app/features/home/notification-list/notification-list.component.html index a0f3cf3e36..0322d6b0ab 100644 --- a/portal-frontend/src/app/features/home/notification-list/notification-list.component.html +++ b/portal-frontend/src/app/features/home/notification-list/notification-list.component.html @@ -6,7 +6,7 @@ <!-- Row shown when there is no matching data. --> <tr class="mat-row" *matNoDataRow> - <td class="mat-cell" style="text-align: center" colspan="7">No Notifications Created</td> + <td class="no-data" colspan="7">No Notifications Created</td> </tr> <ng-container matColumnDef="fileNumber"> diff --git a/services/apps/alcs/src/portal/notification-submission/notification-submission.service.spec.ts b/services/apps/alcs/src/portal/notification-submission/notification-submission.service.spec.ts index 3f103961ea..cbb18ca66b 100644 --- a/services/apps/alcs/src/portal/notification-submission/notification-submission.service.spec.ts +++ b/services/apps/alcs/src/portal/notification-submission/notification-submission.service.spec.ts @@ -5,9 +5,12 @@ import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; +import { LocalGovernment } from '../../alcs/local-government/local-government.entity'; import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; import { NoticeOfIntentType } from '../../alcs/notice-of-intent/notice-of-intent-type/notice-of-intent-type.entity'; +import { NotificationDocument } from '../../alcs/notification/notification-document/notification-document.entity'; import { NotificationDocumentService } from '../../alcs/notification/notification-document/notification-document.service'; +import { NOTIFICATION_STATUS } from '../../alcs/notification/notification-submission-status/notification-status.dto'; import { NotificationSubmissionToSubmissionStatus } from '../../alcs/notification/notification-submission-status/notification-status.entity'; import { NotificationSubmissionStatusService } from '../../alcs/notification/notification-submission-status/notification-submission-status.service'; import { Notification } from '../../alcs/notification/notification.entity'; @@ -19,6 +22,7 @@ import { User } from '../../user/user.entity'; import { ValidatedNotificationSubmission } from './notification-submission-validator.service'; import { NotificationSubmission } from './notification-submission.entity'; import { NotificationSubmissionService } from './notification-submission.service'; +import { Document } from '../../document/document.entity'; describe('NotificationSubmissionService', () => { let service: NotificationSubmissionService; @@ -304,4 +308,89 @@ describe('NotificationSubmissionService', () => { expect(res).toBe(uuid); expect(mockRepository.findOne).toHaveBeenCalledTimes(1); }); + + it('should change the status when sending the email was successfull', async () => { + const uuid = 'uuid'; + const noiSubmission = new NotificationSubmission({ + uuid, + localGovernmentUuid: 'uuid', + contactEmail: 'contact@contact', + }); + const document = new NotificationDocument({ + document: new Document(), + }); + + mockLGService.getByUuid.mockResolvedValue( + new LocalGovernment({ + emails: ['gov@gov'], + }), + ); + mockNotificationService.getByFileNumber.mockResolvedValue( + new Notification(), + ); + mockEmailService.sendEmail.mockResolvedValue(true); + mockDocumentService.attachDocumentAsBuffer.mockResolvedValue( + new NotificationDocument(), + ); + mockStatusService.setStatusDate.mockResolvedValue( + new NotificationSubmissionToSubmissionStatus(), + ); + + await service.sendAndRecordLTSAPackage(noiSubmission, document, new User()); + + expect(mockLGService.getByUuid).toHaveBeenCalledTimes(1); + expect(mockNotificationService.getByFileNumber).toHaveBeenCalledTimes(1); + expect(mockEmailService.sendEmail).toHaveBeenCalledTimes(1); + expect(mockEmailService.sendEmail).toHaveBeenCalledWith( + expect.objectContaining({ + to: ['contact@contact'], + cc: ['gov@gov'], + }), + ); + + expect(mockDocumentService.attachDocumentAsBuffer).toHaveBeenCalledTimes(1); + expect(mockStatusService.setStatusDate).toHaveBeenCalledTimes(1); + expect(mockStatusService.setStatusDate).toHaveBeenCalledWith( + uuid, + NOTIFICATION_STATUS.ALC_RESPONSE_SENT, + undefined, + ); + }); + + it('should not change the status if the email fails', async () => { + const uuid = 'uuid'; + const noiSubmission = new NotificationSubmission({ + uuid, + localGovernmentUuid: 'uuid', + contactEmail: 'contact@contact', + }); + const document = new NotificationDocument({ + document: new Document(), + }); + + mockLGService.getByUuid.mockResolvedValue( + new LocalGovernment({ + emails: ['gov@gov'], + }), + ); + mockNotificationService.getByFileNumber.mockResolvedValue( + new Notification(), + ); + mockEmailService.sendEmail.mockResolvedValue(false); + + await service.sendAndRecordLTSAPackage(noiSubmission, document, new User()); + + expect(mockLGService.getByUuid).toHaveBeenCalledTimes(1); + expect(mockNotificationService.getByFileNumber).toHaveBeenCalledTimes(1); + expect(mockEmailService.sendEmail).toHaveBeenCalledTimes(1); + expect(mockEmailService.sendEmail).toHaveBeenCalledWith( + expect.objectContaining({ + to: ['contact@contact'], + cc: ['gov@gov'], + }), + ); + + expect(mockDocumentService.attachDocumentAsBuffer).toHaveBeenCalledTimes(0); + expect(mockStatusService.setStatusDate).toHaveBeenCalledTimes(0); + }); }); diff --git a/services/apps/alcs/src/portal/notification-submission/notification-submission.service.ts b/services/apps/alcs/src/portal/notification-submission/notification-submission.service.ts index ff550de8ab..68e9dd8571 100644 --- a/services/apps/alcs/src/portal/notification-submission/notification-submission.service.ts +++ b/services/apps/alcs/src/portal/notification-submission/notification-submission.service.ts @@ -380,9 +380,8 @@ export class NotificationSubmissionService { statusCode: NOTIFICATION_STATUS, effectiveDate?: Date | null, ) { - const submission = await this.loadBarebonesSubmission(uuid); await this.notificationSubmissionStatusService.setStatusDate( - submission.uuid, + uuid, statusCode, effectiveDate, ); @@ -411,7 +410,7 @@ export class NotificationSubmissionService { ) { const templateData = await this.generateSrwEmailData(submission, document); - await this.emailService.sendEmail({ + const didSend = await this.emailService.sendEmail({ to: [templateData.to], body: templateData.html, subject: `Agricultural Land Commission SRW${submission.fileNumber} (${submission.applicant})`, @@ -421,24 +420,29 @@ export class NotificationSubmissionService { attachments: [document.document], }); - const fileBuffer = Buffer.from(templateData.html); - await this.notificationDocumentService.attachDocumentAsBuffer({ - file: Buffer.from(templateData.html), - fileName: `SRW${submission.fileNumber}_ALC_Email_Response.html`, - source: DOCUMENT_SOURCE.ALC, - user, - system: DOCUMENT_SYSTEM.ALCS, - documentType: DOCUMENT_TYPE.ACKNOWLEDGEMENT_LETTER, - fileNumber: submission.fileNumber, - fileSize: fileBuffer.length, - mimeType: 'text/html', - visibilityFlags: [VISIBILITY_FLAG.APPLICANT, VISIBILITY_FLAG.GOVERNMENT], - }); + if (didSend) { + const fileBuffer = Buffer.from(templateData.html); + await this.notificationDocumentService.attachDocumentAsBuffer({ + file: Buffer.from(templateData.html), + fileName: `SRW${submission.fileNumber}_ALC_Email_Response.html`, + source: DOCUMENT_SOURCE.ALC, + user, + system: DOCUMENT_SYSTEM.ALCS, + documentType: DOCUMENT_TYPE.ACKNOWLEDGEMENT_LETTER, + fileNumber: submission.fileNumber, + fileSize: fileBuffer.length, + mimeType: 'text/html', + visibilityFlags: [ + VISIBILITY_FLAG.APPLICANT, + VISIBILITY_FLAG.GOVERNMENT, + ], + }); - await this.updateStatus( - submission.uuid, - NOTIFICATION_STATUS.ALC_RESPONSE_SENT, - ); + await this.updateStatus( + submission.uuid, + NOTIFICATION_STATUS.ALC_RESPONSE_SENT, + ); + } } private async generateSrwEmailData( @@ -471,15 +475,11 @@ export class NotificationSubmissionService { } } - const parentId = await this.notificationService.getUuid( - submission.fileNumber, - ); - return { html: emailTemplate.html, cc: ccEmails, to: submission.contactEmail!, - parentId, + parentId: notification.uuid, }; } } diff --git a/services/apps/alcs/src/providers/email/email.service.ts b/services/apps/alcs/src/providers/email/email.service.ts index 0b9af52c56..eccac508bd 100644 --- a/services/apps/alcs/src/providers/email/email.service.ts +++ b/services/apps/alcs/src/providers/email/email.service.ts @@ -164,7 +164,7 @@ export class EmailService { ), ); this.logger.debug({ to, from, subject }, `Email sent`); - this.repository.save( + await this.repository.save( new EmailStatus({ recipients: [...to, ...cc, ...bcc].join(', '), status: 'success', @@ -174,6 +174,7 @@ export class EmailService { triggerStatus, }), ); + return true; } catch (e) { this.logger.error(e, 'Failed to Send Email'); @@ -192,6 +193,8 @@ export class EmailService { triggerStatus, }), ); + + return false; } } } diff --git a/services/apps/alcs/src/providers/email/status-email.service.spec.ts b/services/apps/alcs/src/providers/email/status-email.service.spec.ts index 3755095d46..1e86e41e6e 100644 --- a/services/apps/alcs/src/providers/email/status-email.service.spec.ts +++ b/services/apps/alcs/src/providers/email/status-email.service.spec.ts @@ -70,7 +70,7 @@ describe('StatusEmailService', () => { service = module.get<StatusEmailService>(StatusEmailService); - mockEmailService.sendEmail.mockResolvedValue(); + mockEmailService.sendEmail.mockResolvedValue(true); }); it('should be defined', () => { diff --git a/services/apps/alcs/src/queues/scheduler/application/application-expiry/application-expiry.consumer.spec.ts b/services/apps/alcs/src/queues/scheduler/application/application-expiry/application-expiry.consumer.spec.ts index 2561f4bdaf..998d1e3a9a 100644 --- a/services/apps/alcs/src/queues/scheduler/application/application-expiry/application-expiry.consumer.spec.ts +++ b/services/apps/alcs/src/queues/scheduler/application/application-expiry/application-expiry.consumer.spec.ts @@ -37,7 +37,7 @@ describe('SchedulerConsumerService', () => { ApplicationExpiryConsumer, ); - mockEmailService.sendEmail.mockResolvedValue(); + mockEmailService.sendEmail.mockResolvedValue(true); }); it('should be defined', () => { diff --git a/services/apps/alcs/src/user/user.service.spec.ts b/services/apps/alcs/src/user/user.service.spec.ts index 7503389e71..f670312fc0 100644 --- a/services/apps/alcs/src/user/user.service.spec.ts +++ b/services/apps/alcs/src/user/user.service.spec.ts @@ -62,7 +62,7 @@ describe('UserService', () => { mockUserRepository.find.mockResolvedValue([mockUser]); mockUserRepository.softRemove.mockResolvedValue(mockUser); - emailServiceMock.sendEmail.mockResolvedValue(); + emailServiceMock.sendEmail.mockResolvedValue(true); }); it('should return the users from the repository', async () => { From 29713b44b28b7a0e0a600385ab6805a41338a0d2 Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Fri, 22 Sep 2023 15:41:32 -0700 Subject: [PATCH 420/954] noi decision_date etl (#1002) --- .../noi/notice_of_intent_init.py | 16 ++- .../noi/notice_of_intent_migration.py | 8 +- .../notice_of_intent_decision_date.py | 101 ++++++++++++++++++ ...oats_to_alcs_notice_of_intent_table_etl.py | 2 +- .../notice_of_intent_decision_date.sql | 19 ++++ ...ice_of_intent_decision_date_validation.sql | 22 ++++ 6 files changed, 164 insertions(+), 4 deletions(-) create mode 100644 bin/migrate-oats-data/noi/oats_to_alcs_notice_of_intent_table_etl/notice_of_intent_decision_date.py create mode 100644 bin/migrate-oats-data/noi/sql/notice_of_intent_base/notice_of_intent_decision_date/notice_of_intent_decision_date.sql create mode 100644 bin/migrate-oats-data/noi/sql/notice_of_intent_base/notice_of_intent_decision_date/notice_of_intent_decision_date_validation.sql diff --git a/bin/migrate-oats-data/noi/notice_of_intent_init.py b/bin/migrate-oats-data/noi/notice_of_intent_init.py index 4febbd3958..7720bf65aa 100644 --- a/bin/migrate-oats-data/noi/notice_of_intent_init.py +++ b/bin/migrate-oats-data/noi/notice_of_intent_init.py @@ -1,4 +1,6 @@ +import traceback from db import inject_conn_pool +from common import log_end, log_start def noi_insert_query(number_of_rows_to_insert): @@ -20,6 +22,8 @@ def noi_insert_query(number_of_rows_to_insert): @inject_conn_pool def init_notice_of_intents(conn=None, batch_size=10000): + etl_name = "init_notice_of_intents" + log_start(etl_name) with conn.cursor() as cursor: with open("noi/sql/insert_noi_count.sql", "r", encoding="utf-8") as sql_file: count_query = sql_file.read() @@ -56,9 +60,17 @@ def init_notice_of_intents(conn=None, batch_size=10000): print( f"retrieved/inserted items count: {applications_to_be_inserted_count}; total successfully inserted/updated NOIs so far {successful_inserts_count}; last inserted noi_applidation_id: {last_application_id}" ) - except Exception as e: + except Exception as error: conn.rollback() - print("Error", e) + error_trace = "".join( + traceback.format_exception(None, error, error.__traceback__) + ) + print("Error", error_trace) + log_end( + etl_name, + str(error), + error_trace, + ) failed_inserts = count_total - successful_inserts_count last_application_id = last_application_id + 1 diff --git a/bin/migrate-oats-data/noi/notice_of_intent_migration.py b/bin/migrate-oats-data/noi/notice_of_intent_migration.py index 7f8e058562..a1992a4aa7 100644 --- a/bin/migrate-oats-data/noi/notice_of_intent_migration.py +++ b/bin/migrate-oats-data/noi/notice_of_intent_migration.py @@ -1,10 +1,14 @@ from .oats_to_alcs_notice_of_intent_table_etl.oats_to_alcs_notice_of_intent_table_etl import ( process_alcs_notice_of_intent_base_fields, ) +from .oats_to_alcs_notice_of_intent_table_etl.notice_of_intent_decision_date import ( + process_alcs_notice_of_intent_decision_date, +) from .notice_of_intent_init import init_notice_of_intents, clean_notice_of_intents def init_notice_of_intent(batch_size): + init_notice_of_intents(batch_size=batch_size) @@ -13,5 +17,7 @@ def clean_notice_of_intent(): def process_notice_of_intent(batch_size): + # place the rest notice of intent processing functions here process_alcs_notice_of_intent_base_fields(batch_size=batch_size) - # place the rest notice of intent processing function here + + process_alcs_notice_of_intent_decision_date(batch_size=batch_size) diff --git a/bin/migrate-oats-data/noi/oats_to_alcs_notice_of_intent_table_etl/notice_of_intent_decision_date.py b/bin/migrate-oats-data/noi/oats_to_alcs_notice_of_intent_table_etl/notice_of_intent_decision_date.py new file mode 100644 index 0000000000..a8903781d7 --- /dev/null +++ b/bin/migrate-oats-data/noi/oats_to_alcs_notice_of_intent_table_etl/notice_of_intent_decision_date.py @@ -0,0 +1,101 @@ +from db import inject_conn_pool +from common import BATCH_UPLOAD_SIZE, log_end, log_start +from psycopg2.extras import execute_batch, RealDictCursor +import traceback + + +@inject_conn_pool +def process_alcs_notice_of_intent_decision_date( + conn=None, batch_size=BATCH_UPLOAD_SIZE +): + """ + Imports decision_date from oats to alcs.notice_of_intent.decision_date. alcs.notice_of_intent.decision_date is the date of the first decision + In OATS the first decision date is stored in oats.oats_alr_appl_decisions. All subsequent decisions in OATS are the linked to reconsiderations and not application directly. + """ + + etl_name = "process_alcs_notice_of_intent_decision_date" + log_start(etl_name, etl_name) + with conn.cursor(cursor_factory=RealDictCursor) as cursor: + with open( + "noi/sql/notice_of_intent_base/notice_of_intent_base.count.sql", + "r", + encoding="utf-8", + ) as sql_file: + count_query = sql_file.read() + cursor.execute(count_query) + count_total = dict(cursor.fetchone())["count"] + print("- Total Notice of Intents data to update: ", count_total) + + failed_inserts = 0 + successful_updates_count = 0 + last_application_id = 0 + + with open( + "noi/sql/notice_of_intent_base/notice_of_intent_decision_date/notice_of_intent_decision_date.sql", + "r", + encoding="utf-8", + ) as sql_file: + application_sql = sql_file.read() + while True: + cursor.execute( + f"{application_sql} WHERE decision_date_for_nois.alr_application_id > {last_application_id} ORDER BY decision_date_for_nois.alr_application_id;" + ) + + rows = cursor.fetchmany(batch_size) + + if not rows: + break + try: + records_to_be_updated_count = len(rows) + + _update_fee_fields_records(conn, batch_size, cursor, rows) + + successful_updates_count = ( + successful_updates_count + records_to_be_updated_count + ) + last_application_id = dict(rows[-1])["alr_application_id"] + + print( + f"retrieved/updated items count: {records_to_be_updated_count}; total successfully updated notice of intents so far {successful_updates_count}; last updated application_id: {last_application_id}" + ) + except Exception as error: + # this is NOT going to be caused by actual data update failure. This code is only executed when the code error appears or connection to DB is lost + conn.rollback() + error_str = "".join( + traceback.format_exception(None, error, error.__traceback__) + ) + print(error_str) + log_end(etl_name, str(error), error_str) + failed_inserts = count_total - successful_updates_count + last_application_id = last_application_id + 1 + + print("Total amount of successful updates:", successful_updates_count) + print("Total failed updates:", failed_inserts) + log_end(etl_name, etl_name) + + +def _update_fee_fields_records(conn, batch_size, cursor, rows): + query = _get_update_query_from_oats_alr_applications_fields() + parsed_fee_data_list = _prepare_oats_alr_applications_data(rows) + + if len(parsed_fee_data_list) > 0: + execute_batch(cursor, query, parsed_fee_data_list, page_size=batch_size) + + conn.commit() + + +def _get_update_query_from_oats_alr_applications_fields(): + query = """ + UPDATE alcs.notice_of_intent + SET decision_date = %(decision_date)s + WHERE + alcs.notice_of_intent.file_number = %(alr_application_id)s::TEXT; + """ + return query + + +def _prepare_oats_alr_applications_data(row_data_list): + data_list = [] + for row in row_data_list: + data_list.append(dict(row)) + return data_list diff --git a/bin/migrate-oats-data/noi/oats_to_alcs_notice_of_intent_table_etl/oats_to_alcs_notice_of_intent_table_etl.py b/bin/migrate-oats-data/noi/oats_to_alcs_notice_of_intent_table_etl/oats_to_alcs_notice_of_intent_table_etl.py index e2d4a2f55d..f2aa8398dd 100644 --- a/bin/migrate-oats-data/noi/oats_to_alcs_notice_of_intent_table_etl/oats_to_alcs_notice_of_intent_table_etl.py +++ b/bin/migrate-oats-data/noi/oats_to_alcs_notice_of_intent_table_etl/oats_to_alcs_notice_of_intent_table_etl.py @@ -28,7 +28,7 @@ class OatsToAlcsAgCap(Enum): @inject_conn_pool def process_alcs_notice_of_intent_base_fields(conn=None, batch_size=BATCH_UPLOAD_SIZE): """ - decision_date is imported separately + Import data into ALCS.notice_of_intent from OATS. ALCS.notice_of_intent.decision_date and ALCS.notice_of_intent.proposal_end_date imported separately """ etl_name = "process_alcs_notice_of_intent_base_fields" diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_base/notice_of_intent_decision_date/notice_of_intent_decision_date.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_base/notice_of_intent_decision_date/notice_of_intent_decision_date.sql new file mode 100644 index 0000000000..eb5995b3ed --- /dev/null +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_base/notice_of_intent_decision_date/notice_of_intent_decision_date.sql @@ -0,0 +1,19 @@ +WITH nois_with_one_or_zero_component_only AS ( + SELECT oaac.alr_application_id + FROM oats.oats_alr_appl_components oaac + GROUP BY oaac.alr_application_id + HAVING count(oaac.alr_application_id) < 2 +), +decision_date_for_nois AS ( + SELECT oaad.alr_appl_decision_id, + oaa.alr_application_id, + oaad.decision_date + FROM oats.oats_alr_appl_decisions oaad + JOIN oats.oats_alr_applications oaa ON oaad.alr_application_id = oaa.alr_application_id + WHERE oaa.application_class_code = 'NOI' + AND oaad.decision_date IS NOT NULL +) +SELECT alr_appl_decision_id, + alr_application_id, + decision_date +FROM decision_date_for_nois \ No newline at end of file diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_base/notice_of_intent_decision_date/notice_of_intent_decision_date_validation.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_base/notice_of_intent_decision_date/notice_of_intent_decision_date_validation.sql new file mode 100644 index 0000000000..2f4e7bf0e3 --- /dev/null +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_base/notice_of_intent_decision_date/notice_of_intent_decision_date_validation.sql @@ -0,0 +1,22 @@ +WITH nois_with_one_or_zero_component_only AS ( + SELECT oaac.alr_application_id + FROM oats.oats_alr_appl_components oaac + GROUP BY oaac.alr_application_id + HAVING count(oaac.alr_application_id) < 2 +), +oats_decision_date_for_nois AS ( + SELECT oaad.alr_appl_decision_id, + oaa.alr_application_id, + oaad.decision_date + FROM oats.oats_alr_appl_decisions oaad + JOIN oats.oats_alr_applications oaa ON oaad.alr_application_id = oaa.alr_application_id + WHERE oaa.application_class_code = 'NOI' + AND oaad.decision_date IS NOT NULL +) +select oats_decision_date.alr_appl_decision_id, + oats_decision_date.alr_application_id, + oats_decision_date.decision_date, + noi.decision_date +from oats_decision_date_for_nois AS oats_decision_date + JOIN alcs.notice_of_intent noi ON oats_decision_date.alr_application_id::text = noi.file_number +WHERE oats_decision_date.decision_date != noi.decision_date AT TIME ZONE 'UTC' \ No newline at end of file From 73b672809fd879d2c59b7fcf5eee17a7b9375b5c Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Fri, 22 Sep 2023 15:57:31 -0700 Subject: [PATCH 421/954] Search Fixes --- .../notification-search-table.component.html | 2 +- .../notification-search-table.component.ts | 1 - .../app/features/search/search.component.html | 4 +- .../non-applications.service.spec.ts | 5 +- .../non-applications.service.ts | 11 +- .../src/alcs/search/search.controller.spec.ts | 12 +- .../alcs/src/alcs/search/search.controller.ts | 134 +++++++++--------- .../apps/alcs/src/alcs/search/search.dto.ts | 21 --- 8 files changed, 82 insertions(+), 108 deletions(-) diff --git a/alcs-frontend/src/app/features/search/notification-search-table/notification-search-table.component.html b/alcs-frontend/src/app/features/search/notification-search-table/notification-search-table.component.html index 447f8083ad..1a2402e9b5 100644 --- a/alcs-frontend/src/app/features/search/notification-search-table/notification-search-table.component.html +++ b/alcs-frontend/src/app/features/search/notification-search-table/notification-search-table.component.html @@ -23,7 +23,7 @@ </ng-container> <ng-container matColumnDef="ownerName"> - <th mat-header-cell *matHeaderCellDef mat-sort-header>Owner Name</th> + <th mat-header-cell *matHeaderCellDef mat-sort-header>Transferee Name</th> <td mat-cell *matCellDef="let element"> {{ element.ownerName | emptyColumn }} </td> diff --git a/alcs-frontend/src/app/features/search/notification-search-table/notification-search-table.component.ts b/alcs-frontend/src/app/features/search/notification-search-table/notification-search-table.component.ts index 970b238b4e..1b342d33d5 100644 --- a/alcs-frontend/src/app/features/search/notification-search-table/notification-search-table.component.ts +++ b/alcs-frontend/src/app/features/search/notification-search-table/notification-search-table.component.ts @@ -4,7 +4,6 @@ import { MatSort } from '@angular/material/sort'; import { Router } from '@angular/router'; import { Subject, takeUntil } from 'rxjs'; import { ApplicationRegionDto } from '../../../services/application/application-code.dto'; -import { NotificationSubmissionStatusService } from '../../../services/notification/notification-submission-status/notification-submission-status.service'; import { NotificationSubmissionStatusDto, NotificationTypeDto } from '../../../services/notification/notification.dto'; import { NotificationSearchResultDto } from '../../../services/search/search.dto'; import { ApplicationSubmissionStatusPill } from '../../../shared/application-submission-status-type-pill/application-submission-status-type-pill.component'; diff --git a/alcs-frontend/src/app/features/search/search.component.html b/alcs-frontend/src/app/features/search/search.component.html index 206ce086ad..1c0bb37e10 100644 --- a/alcs-frontend/src/app/features/search/search.component.html +++ b/alcs-frontend/src/app/features/search/search.component.html @@ -20,7 +20,9 @@ <h6 class="subheading">Provide one or more of the following criteria:</h6> <mat-label>Name</mat-label> <input id="name" matInput formControlName="name" minlength="3" /> </mat-form-field> - <div class="subtext">Search by Primary Contact, Parcel Owner, Organization, Transferee, Ministry or Department</div> + <div class="subtext"> + Search by Primary Contact, Parcel Owner, Organization, SRW Transferee, Ministry or Department + </div> <div *ngIf="nameControl.invalid && (nameControl.dirty || nameControl.touched)" class="field-error"> <mat-icon>warning</mat-icon> <div *ngIf="nameControl.errors?.['minlength']">Enter 3 or more characters to search by name</div> diff --git a/services/apps/alcs/src/alcs/search/non-applications/non-applications.service.spec.ts b/services/apps/alcs/src/alcs/search/non-applications/non-applications.service.spec.ts index aed95b4034..6cac1332bc 100644 --- a/services/apps/alcs/src/alcs/search/non-applications/non-applications.service.spec.ts +++ b/services/apps/alcs/src/alcs/search/non-applications/non-applications.service.spec.ts @@ -2,7 +2,7 @@ import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { NonApplicationsSearchRequestDto } from '../search.dto'; +import { SearchRequestDto } from '../search.dto'; import { NonApplicationSearchView } from './non-applications-view.entity'; import { NonApplicationsAdvancedSearchService } from './non-applications.service'; @@ -14,7 +14,7 @@ describe('NonApplicationsService', () => { let mockQuery: any = {}; - const mockSearchRequestDto: NonApplicationsSearchRequestDto = { + const mockSearchRequestDto: SearchRequestDto = { fileNumber: '123', governmentName: 'B', regionCode: 'C', @@ -24,6 +24,7 @@ describe('NonApplicationsService', () => { sortField: 'applicant', sortDirection: 'ASC', fileTypes: [], + isIncludeOtherParcels: false, }; beforeEach(async () => { diff --git a/services/apps/alcs/src/alcs/search/non-applications/non-applications.service.ts b/services/apps/alcs/src/alcs/search/non-applications/non-applications.service.ts index 19a5fedd8b..c818407001 100644 --- a/services/apps/alcs/src/alcs/search/non-applications/non-applications.service.ts +++ b/services/apps/alcs/src/alcs/search/non-applications/non-applications.service.ts @@ -3,10 +3,7 @@ import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { formatStringToPostgresSearchStringArrayWithWildCard } from '../../../utils/search-helper'; import { LocalGovernment } from '../../local-government/local-government.entity'; -import { - AdvancedSearchResultDto, - NonApplicationsSearchRequestDto, -} from '../search.dto'; +import { AdvancedSearchResultDto, SearchRequestDto } from '../search.dto'; import { NonApplicationSearchView } from './non-applications-view.entity'; @Injectable() @@ -17,7 +14,7 @@ export class NonApplicationsAdvancedSearchService { ) {} async searchNonApplications( - searchDto: NonApplicationsSearchRequestDto, + searchDto: SearchRequestDto, ): Promise<AdvancedSearchResultDto<NonApplicationSearchView[]>> { let query = await this.compileSearchQuery(searchDto); @@ -36,7 +33,7 @@ export class NonApplicationsAdvancedSearchService { }; } - private compileSortQuery(searchDto: NonApplicationsSearchRequestDto) { + private compileSortQuery(searchDto: SearchRequestDto) { switch (searchDto.sortField) { case 'applicant': return '"nonApp"."applicant"'; @@ -53,7 +50,7 @@ export class NonApplicationsAdvancedSearchService { } } - private async compileSearchQuery(searchDto: NonApplicationsSearchRequestDto) { + private async compileSearchQuery(searchDto: SearchRequestDto) { let query = this.nonApplicationSearchRepository .createQueryBuilder('nonApp') .leftJoinAndMapOne( diff --git a/services/apps/alcs/src/alcs/search/search.controller.spec.ts b/services/apps/alcs/src/alcs/search/search.controller.spec.ts index fe6cf6f789..81a947c0d4 100644 --- a/services/apps/alcs/src/alcs/search/search.controller.spec.ts +++ b/services/apps/alcs/src/alcs/search/search.controller.spec.ts @@ -12,18 +12,11 @@ import { NoticeOfIntent } from '../notice-of-intent/notice-of-intent.entity'; import { Notification } from '../notification/notification.entity'; import { PlanningReview } from '../planning-review/planning-review.entity'; import { ApplicationAdvancedSearchService } from './application/application-advanced-search.service'; -import { ApplicationSubmissionSearchView } from './application/application-search-view.entity'; -import { NonApplicationSearchView } from './non-applications/non-applications-view.entity'; import { NonApplicationsAdvancedSearchService } from './non-applications/non-applications.service'; import { NoticeOfIntentAdvancedSearchService } from './notice-of-intent/notice-of-intent-advanced-search.service'; -import { NoticeOfIntentSubmissionSearchView } from './notice-of-intent/notice-of-intent-search-view.entity'; import { NotificationAdvancedSearchService } from './notification/notification-advanced-search.service'; import { SearchController } from './search.controller'; -import { - AdvancedSearchResultDto, - NonApplicationsSearchRequestDto, - SearchRequestDto, -} from './search.dto'; +import { SearchRequestDto } from './search.dto'; import { SearchService } from './search.service'; describe('SearchController', () => { @@ -240,7 +233,8 @@ describe('SearchController', () => { }); it('should call non-applications advanced search to retrieve Non-Applications', async () => { - const mockSearchRequestDto: NonApplicationsSearchRequestDto = { + const mockSearchRequestDto: SearchRequestDto = { + isIncludeOtherParcels: false, pageSize: 1, page: 1, sortField: '1', diff --git a/services/apps/alcs/src/alcs/search/search.controller.ts b/services/apps/alcs/src/alcs/search/search.controller.ts index dbc1461bd4..3ceaf19b39 100644 --- a/services/apps/alcs/src/alcs/search/search.controller.ts +++ b/services/apps/alcs/src/alcs/search/search.controller.ts @@ -29,7 +29,6 @@ import { AdvancedSearchResultDto, ApplicationSearchResultDto, NonApplicationSearchResultDto, - NonApplicationsSearchRequestDto, NoticeOfIntentSearchResultDto, NotificationSearchResultDto, SearchRequestDto, @@ -104,70 +103,6 @@ export class SearchController { } } - private mapApplicationToSearchResult( - application: Application, - ): SearchResultDto { - return { - type: CARD_TYPE.APP, - referenceId: application.fileNumber, - localGovernmentName: application.localGovernment?.name, - applicant: application.applicant, - fileNumber: application.fileNumber, - label: this.mapper.map( - application.type, - ApplicationType, - ApplicationTypeDto, - ), - }; - } - - private mapNoticeOfIntentToSearchResult( - noi: NoticeOfIntent, - ): SearchResultDto { - return { - type: CARD_TYPE.NOI, - referenceId: noi.fileNumber, - localGovernmentName: noi.localGovernment?.name, - applicant: noi.applicant, - fileNumber: noi.fileNumber, - }; - } - - private mapPlanningReviewToSearchResult( - planning: PlanningReview, - ): SearchResultDto { - return { - type: CARD_TYPE.PLAN, - referenceId: planning.cardUuid, - localGovernmentName: planning.localGovernment?.name, - fileNumber: planning.fileNumber, - boardCode: planning.card.board.code, - }; - } - - private mapCovenantToSearchResult(covenant: Covenant): SearchResultDto { - return { - type: CARD_TYPE.COV, - referenceId: covenant.cardUuid, - localGovernmentName: covenant.localGovernment?.name, - applicant: covenant.applicant, - fileNumber: covenant.fileNumber, - boardCode: covenant.card.board.code, - }; - } - - private mapNotificationToSearchResult( - notification: Notification, - ): SearchResultDto { - return { - type: CARD_TYPE.NOTIFICATION, - referenceId: notification.fileNumber, - localGovernmentName: notification.localGovernment?.name, - applicant: notification.applicant, - fileNumber: notification.fileNumber, - }; - } - @Post('/advanced') @UserRoles(...ROLES_ALLOWED_APPLICATIONS) async advancedSearch(@Body() searchDto: SearchRequestDto) { @@ -265,7 +200,7 @@ export class SearchController { @Post('/advanced/non-applications') @UserRoles(...ROLES_ALLOWED_APPLICATIONS) async advancedSearchNonApplications( - @Body() searchDto: NonApplicationsSearchRequestDto, + @Body() searchDto: SearchRequestDto, ): Promise<AdvancedSearchResultDto<NonApplicationSearchResultDto[]>> { const nonApplications = await this.nonApplicationsSearchService.searchNonApplications(searchDto); @@ -339,6 +274,8 @@ export class SearchController { (searchDto.fileTypes.length > 0 ? nonApplicationTypeSpecified : true) && !searchDto.dateDecidedFrom && !searchDto.dateDecidedTo && + !searchDto.dateSubmittedFrom && + !searchDto.dateDecidedTo && !searchDto.resolutionNumber && !searchDto.resolutionYear && !searchDto.isIncludeOtherParcels && @@ -351,6 +288,7 @@ export class SearchController { !searchDto.resolutionNumber && !searchDto.resolutionYear && !searchDto.isIncludeOtherParcels && + !isStringSetAndNotEmpty(searchDto.civicAddress) && !isStringSetAndNotEmpty(searchDto.legacyId); return { @@ -423,6 +361,70 @@ export class SearchController { return response; } + private mapApplicationToSearchResult( + application: Application, + ): SearchResultDto { + return { + type: CARD_TYPE.APP, + referenceId: application.fileNumber, + localGovernmentName: application.localGovernment?.name, + applicant: application.applicant, + fileNumber: application.fileNumber, + label: this.mapper.map( + application.type, + ApplicationType, + ApplicationTypeDto, + ), + }; + } + + private mapNoticeOfIntentToSearchResult( + noi: NoticeOfIntent, + ): SearchResultDto { + return { + type: CARD_TYPE.NOI, + referenceId: noi.fileNumber, + localGovernmentName: noi.localGovernment?.name, + applicant: noi.applicant, + fileNumber: noi.fileNumber, + }; + } + + private mapPlanningReviewToSearchResult( + planning: PlanningReview, + ): SearchResultDto { + return { + type: CARD_TYPE.PLAN, + referenceId: planning.cardUuid, + localGovernmentName: planning.localGovernment?.name, + fileNumber: planning.fileNumber, + boardCode: planning.card.board.code, + }; + } + + private mapCovenantToSearchResult(covenant: Covenant): SearchResultDto { + return { + type: CARD_TYPE.COV, + referenceId: covenant.cardUuid, + localGovernmentName: covenant.localGovernment?.name, + applicant: covenant.applicant, + fileNumber: covenant.fileNumber, + boardCode: covenant.card.board.code, + }; + } + + private mapNotificationToSearchResult( + notification: Notification, + ): SearchResultDto { + return { + type: CARD_TYPE.NOTIFICATION, + referenceId: notification.fileNumber, + localGovernmentName: notification.localGovernment?.name, + applicant: notification.applicant, + fileNumber: notification.fileNumber, + }; + } + private mapApplicationToAdvancedSearchResult( application: ApplicationSubmissionSearchView, ): ApplicationSearchResultDto { diff --git a/services/apps/alcs/src/alcs/search/search.dto.ts b/services/apps/alcs/src/alcs/search/search.dto.ts index baa3ede680..f952d5cb02 100644 --- a/services/apps/alcs/src/alcs/search/search.dto.ts +++ b/services/apps/alcs/src/alcs/search/search.dto.ts @@ -164,24 +164,3 @@ export class SearchRequestDto extends PagingRequestDto { @IsArray() fileTypes: string[]; } - -export class NonApplicationsSearchRequestDto extends PagingRequestDto { - @IsString() - @IsOptional() - fileNumber?: string; - - @IsString() - @IsOptional() - governmentName?: string; - - @IsString() - @IsOptional() - regionCode?: string; - - @IsString() - @IsOptional() - name?: string; - - @IsArray() - fileTypes: string[]; -} From 305934c1eb4fd808bb2b7fc0c085c0bcb45388d2 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Fri, 22 Sep 2023 16:29:12 -0700 Subject: [PATCH 422/954] Don't search Non-Apps when Portal Status Specified --- services/apps/alcs/src/alcs/search/search.controller.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/services/apps/alcs/src/alcs/search/search.controller.ts b/services/apps/alcs/src/alcs/search/search.controller.ts index 3ceaf19b39..227e525ca6 100644 --- a/services/apps/alcs/src/alcs/search/search.controller.ts +++ b/services/apps/alcs/src/alcs/search/search.controller.ts @@ -279,6 +279,7 @@ export class SearchController { !searchDto.resolutionNumber && !searchDto.resolutionYear && !searchDto.isIncludeOtherParcels && + !searchDto.portalStatusCode && !isStringSetAndNotEmpty(searchDto.legacyId); const searchNotifications = From f1891ad8abc876dec2e5dbe34252097e824f9f84 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Mon, 25 Sep 2023 10:17:33 -0700 Subject: [PATCH 423/954] Update Main Page and Header * Add new bar to header * Change landing page to match new design * Create Public Module and placeholder page --- portal-frontend/src/app/app-routing.module.ts | 5 +++ .../app/features/login/login.component.html | 20 +++++++-- .../app/features/login/login.component.scss | 24 ++++++++++ .../features/login/login.component.spec.ts | 2 + .../src/app/features/login/login.component.ts | 4 ++ .../app/features/public/public.component.html | 1 + .../app/features/public/public.component.scss | 0 .../features/public/public.component.spec.ts | 24 ++++++++++ .../app/features/public/public.component.ts | 10 +++++ .../src/app/features/public/public.module.ts | 18 ++++++++ .../app/shared/header/header.component.html | 13 ++++++ .../app/shared/header/header.component.scss | 44 +++++++++++++++++-- .../shared/header/header.component.spec.ts | 2 + .../src/app/shared/header/header.component.ts | 8 ++++ portal-frontend/src/styles.scss | 7 +++ 15 files changed, 174 insertions(+), 8 deletions(-) create mode 100644 portal-frontend/src/app/features/public/public.component.html create mode 100644 portal-frontend/src/app/features/public/public.component.scss create mode 100644 portal-frontend/src/app/features/public/public.component.spec.ts create mode 100644 portal-frontend/src/app/features/public/public.component.ts create mode 100644 portal-frontend/src/app/features/public/public.module.ts diff --git a/portal-frontend/src/app/app-routing.module.ts b/portal-frontend/src/app/app-routing.module.ts index 0a531eb326..c09b819fe6 100644 --- a/portal-frontend/src/app/app-routing.module.ts +++ b/portal-frontend/src/app/app-routing.module.ts @@ -104,6 +104,11 @@ const routes: Routes = [ loadChildren: () => import('./features/notifications/edit-submission/edit-submission.module').then((m) => m.EditSubmissionModule), }, + { + title: 'Public Search', + path: 'public', + loadChildren: () => import('./features/public/public.module').then((m) => m.PublicModule), + }, { path: '', redirectTo: '/login', pathMatch: 'full' }, ]; diff --git a/portal-frontend/src/app/features/login/login.component.html b/portal-frontend/src/app/features/login/login.component.html index 44f3fa80c2..56fc3095b2 100644 --- a/portal-frontend/src/app/features/login/login.component.html +++ b/portal-frontend/src/app/features/login/login.component.html @@ -1,5 +1,17 @@ <div class="login-wrapper"> - <h3>Welcome to the ALCS Application Portal</h3> - <br /> - <button (click)='onLogin()' mat-flat-button color='primary'>Login with BCeID</button> -</div> \ No newline at end of file + <h3>Welcome to the ALC Portal</h3> + <section> + <div class="subheading2">Log in with BCeID to create or view your ALC submissions</div> + <button (click)="onLogin()" class="login" mat-flat-button color="primary">Portal Login</button> + <div class="left"> + Don't have a BCeID?  + <a class="left" target="_blank" href="https://www.bceid.ca/register/basic/account_details.aspx?type=regular" + >Register <mat-icon class="icon">open_in_new</mat-icon></a + > + </div> + </section> + <section> + <div class="subheading2">Search publicly available information</div> + <button (click)="navigateToPublicSearch()" mat-flat-button color="accent">Public Search</button> + </section> +</div> diff --git a/portal-frontend/src/app/features/login/login.component.scss b/portal-frontend/src/app/features/login/login.component.scss index 894ff44862..0e53e14eb9 100644 --- a/portal-frontend/src/app/features/login/login.component.scss +++ b/portal-frontend/src/app/features/login/login.component.scss @@ -3,3 +3,27 @@ .login-wrapper { min-height: rem(250); } + +.icon { + margin-left: rem(2); +} + +section { + margin: rem(24) 0; +} + +.subheading2 { + margin-bottom: rem(8) !important; +} + +.login { + margin-bottom: rem(12) !important; +} + +button { + width: 100%; + + @media screen and (min-width: $tabletBreakpoint) { + width: unset; + } +} diff --git a/portal-frontend/src/app/features/login/login.component.spec.ts b/portal-frontend/src/app/features/login/login.component.spec.ts index 9963defca0..af69d0e5ba 100644 --- a/portal-frontend/src/app/features/login/login.component.spec.ts +++ b/portal-frontend/src/app/features/login/login.component.spec.ts @@ -1,3 +1,4 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { AuthenticationService } from '../../services/authentication/authentication.service'; @@ -16,6 +17,7 @@ describe('LoginComponent', () => { useValue: {}, }, ], + schemas: [NO_ERRORS_SCHEMA], }).compileComponents(); fixture = TestBed.createComponent(LoginComponent); diff --git a/portal-frontend/src/app/features/login/login.component.ts b/portal-frontend/src/app/features/login/login.component.ts index 47cf9c2460..a6b76dbf78 100644 --- a/portal-frontend/src/app/features/login/login.component.ts +++ b/portal-frontend/src/app/features/login/login.component.ts @@ -24,4 +24,8 @@ export class LoginComponent implements OnInit { window.location.href = `${res.loginUrl}${idpHint}`; } } + + async navigateToPublicSearch() { + await this.router.navigateByUrl('/public'); + } } diff --git a/portal-frontend/src/app/features/public/public.component.html b/portal-frontend/src/app/features/public/public.component.html new file mode 100644 index 0000000000..2e9e6a7a90 --- /dev/null +++ b/portal-frontend/src/app/features/public/public.component.html @@ -0,0 +1 @@ +<p>public works!</p> diff --git a/portal-frontend/src/app/features/public/public.component.scss b/portal-frontend/src/app/features/public/public.component.scss new file mode 100644 index 0000000000..e69de29bb2 diff --git a/portal-frontend/src/app/features/public/public.component.spec.ts b/portal-frontend/src/app/features/public/public.component.spec.ts new file mode 100644 index 0000000000..be443beaf6 --- /dev/null +++ b/portal-frontend/src/app/features/public/public.component.spec.ts @@ -0,0 +1,24 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { PublicComponent } from './public.component'; + +describe('PublicComponent', () => { + let component: PublicComponent; + let fixture: ComponentFixture<PublicComponent>; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [PublicComponent], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(PublicComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/public/public.component.ts b/portal-frontend/src/app/features/public/public.component.ts new file mode 100644 index 0000000000..9042661a5d --- /dev/null +++ b/portal-frontend/src/app/features/public/public.component.ts @@ -0,0 +1,10 @@ +import { Component } from '@angular/core'; + +@Component({ + selector: 'app-public', + templateUrl: './public.component.html', + styleUrls: ['./public.component.scss'] +}) +export class PublicComponent { + +} diff --git a/portal-frontend/src/app/features/public/public.module.ts b/portal-frontend/src/app/features/public/public.module.ts new file mode 100644 index 0000000000..427bec1623 --- /dev/null +++ b/portal-frontend/src/app/features/public/public.module.ts @@ -0,0 +1,18 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { RouterModule, Routes } from '@angular/router'; +import { SharedModule } from '../../shared/shared.module'; +import { PublicComponent } from './public.component'; + +const routes: Routes = [ + { + path: '', + component: PublicComponent, + }, +]; + +@NgModule({ + declarations: [PublicComponent], + imports: [CommonModule, SharedModule, RouterModule.forChild(routes)], +}) +export class PublicModule {} diff --git a/portal-frontend/src/app/shared/header/header.component.html b/portal-frontend/src/app/shared/header/header.component.html index acbc8394dc..fc861e0be0 100644 --- a/portal-frontend/src/app/shared/header/header.component.html +++ b/portal-frontend/src/app/shared/header/header.component.html @@ -1,4 +1,17 @@ <header> + <div class="top-nav"> + <ul> + <li> + <a href="https://www.alc.gov.bc.ca/">ALC Website</a> + </li> + <li *ngIf="showPublicSearchLink"> + <a routerLink="/public">Public Search</a> + </li> + <li *ngIf="showPortalLink"> + <a routerLink="/">Portal</a> + </li> + </ul> + </div> <div class="title-wrapper"> <div class="title"> <img class="logo" src="assets/alc_logo.svg" alt="ALC Portal" /> diff --git a/portal-frontend/src/app/shared/header/header.component.scss b/portal-frontend/src/app/shared/header/header.component.scss index 3f177e9f12..2012c729fc 100644 --- a/portal-frontend/src/app/shared/header/header.component.scss +++ b/portal-frontend/src/app/shared/header/header.component.scss @@ -1,8 +1,43 @@ @use '../../../styles/functions' as *; +@use '../../../styles/colors' as colors; + +.top-nav { + background-color: colors.$primary-color-dark; + padding: rem(8) rem(24); + + @media screen and (min-width: $tabletBreakpoint) { + padding: rem(8) rem(36); + } + + + @media screen and (min-width: $desktopBreakpoint) { + padding: rem(8) rem(80); + } + + a { + text-transform: uppercase; + color: #fff; + text-decoration: none; + line-height: rem(16); + } + + ul { + display: flex; + list-style: none; + margin: 0; + padding: 0; + } + + li { + margin-right: rem(20); + font-size: rem(14); + letter-spacing: rem(0.14); + } +} header { .title-wrapper { - margin: rem(8) rem(24); + margin: rem(16) rem(24); .title { .logo { @@ -38,7 +73,6 @@ header { } @media screen and (min-width: $tabletBreakpoint) { - margin: rem(12) rem(36) !important; justify-content: space-between; .burger-menu { @@ -46,8 +80,8 @@ header { } .title-wrapper { + margin: rem(12) rem(36) !important; display: flex; - margin: 0; justify-content: space-between; align-items: center; @@ -85,6 +119,8 @@ header { } @media screen and (min-width: $desktopBreakpoint) { - margin: rem(18) rem(80) !important; + .title-wrapper { + margin: rem(18) rem(80) !important; + } } } diff --git a/portal-frontend/src/app/shared/header/header.component.spec.ts b/portal-frontend/src/app/shared/header/header.component.spec.ts index cc8c34d530..ebfc183157 100644 --- a/portal-frontend/src/app/shared/header/header.component.spec.ts +++ b/portal-frontend/src/app/shared/header/header.component.spec.ts @@ -1,3 +1,4 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { BehaviorSubject } from 'rxjs'; @@ -22,6 +23,7 @@ describe('HeaderComponent', () => { useValue: mockAuthService, }, ], + schemas: [NO_ERRORS_SCHEMA], }).compileComponents(); fixture = TestBed.createComponent(HeaderComponent); diff --git a/portal-frontend/src/app/shared/header/header.component.ts b/portal-frontend/src/app/shared/header/header.component.ts index 8b86d4843d..bd308a069c 100644 --- a/portal-frontend/src/app/shared/header/header.component.ts +++ b/portal-frontend/src/app/shared/header/header.component.ts @@ -12,6 +12,8 @@ export class HeaderComponent implements OnInit, OnDestroy { private $destroy = new Subject<void>(); isAuthenticated = false; isMenuOpen = false; + showPublicSearchLink = true; + showPortalLink = false; constructor( private authenticationService: AuthenticationService, @@ -24,6 +26,12 @@ export class HeaderComponent implements OnInit, OnDestroy { this.isAuthenticated = !!user; this.changeDetectorRef.detectChanges(); }); + this.router.events.pipe(takeUntil(this.$destroy)).subscribe(() => { + const url = window.location.href; + const isPublic = url.includes('public'); + this.showPortalLink = isPublic; + this.showPublicSearchLink = !isPublic; + }); } async onLogout() { diff --git a/portal-frontend/src/styles.scss b/portal-frontend/src/styles.scss index 4dfc2c171f..3dd5969dd9 100644 --- a/portal-frontend/src/styles.scss +++ b/portal-frontend/src/styles.scss @@ -55,6 +55,13 @@ a { align-items: center; } +.left { + display: flex; + align-content: center; + justify-content: flex-start; + align-items: center; +} + .no-padding .mat-dialog-container { padding: 0; } From de87b01e519cc3915c2fbec3a027ad70fca8eb4b Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Mon, 25 Sep 2023 11:51:10 -0700 Subject: [PATCH 424/954] Feature/alcs 1130 Notice of intent submission base etl (#1006) notice of intent submission base import connection.commit fix for clean functions fix for exhausted connection pool --- .../submission_status_email.py | 2 + .../applications/base_applications.py | 2 + .../submissions/app_submissions.py | 11 +- bin/migrate-oats-data/db.py | 8 +- .../alcs_documents_to_app_documents.py | 10 +- .../alcs_documents_to_noi_documents.py | 10 +- .../oats_documents_to_alcs_documents_app.py | 12 +- .../menu/commands/clean_all.py | 7 +- .../submission_status_email.py | 4 +- .../noi/notice_of_intent_init.py | 8 +- .../noi/notice_of_intent_migration.py | 8 +- .../notice_of_intent_submissions/__init__.py | 1 + .../notice_of_intent_submission_init.py | 128 ++++++++++++++++++ ...oats_to_alcs_notice_of_intent_table_etl.py | 6 +- .../notice_of_intent_submission_init.sql | 19 +++ ...notice_of_intent_submission_init_count.sql | 10 ++ 16 files changed, 219 insertions(+), 27 deletions(-) create mode 100644 bin/migrate-oats-data/noi/notice_of_intent_submissions/__init__.py create mode 100644 bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_submission_init.py create mode 100644 bin/migrate-oats-data/noi/sql/notice_of_intent_submission/notice_of_intent_submission_init.sql create mode 100644 bin/migrate-oats-data/noi/sql/notice_of_intent_submission/notice_of_intent_submission_init_count.sql diff --git a/bin/migrate-oats-data/applications/application_submission_status_email/submission_status_email.py b/bin/migrate-oats-data/applications/application_submission_status_email/submission_status_email.py index 52f35f5e81..3314ef02df 100644 --- a/bin/migrate-oats-data/applications/application_submission_status_email/submission_status_email.py +++ b/bin/migrate-oats-data/applications/application_submission_status_email/submission_status_email.py @@ -38,3 +38,5 @@ def clean_application_submission_status_emails(conn=None): print("".join(traceback.format_exception(None, error, error.__traceback__))) cursor.close() conn.close() + + conn.commit() diff --git a/bin/migrate-oats-data/applications/base_applications.py b/bin/migrate-oats-data/applications/base_applications.py index 4d5be73c85..e7e167c0b6 100644 --- a/bin/migrate-oats-data/applications/base_applications.py +++ b/bin/migrate-oats-data/applications/base_applications.py @@ -127,3 +127,5 @@ def clean_applications(conn=None): cursor.execute("DROP TABLE IF EXISTS oats.alcs_etl_application_exclude") cursor.execute("DROP TABLE IF EXISTS oats.alcs_etl_application_duplicate") print(f"Tempory tables dropped") + + conn.commit() diff --git a/bin/migrate-oats-data/applications/submissions/app_submissions.py b/bin/migrate-oats-data/applications/submissions/app_submissions.py index e92f532281..703b03c21e 100644 --- a/bin/migrate-oats-data/applications/submissions/app_submissions.py +++ b/bin/migrate-oats-data/applications/submissions/app_submissions.py @@ -1,8 +1,4 @@ -from common import ( - ALRChangeCode, - log_end, - log_start, -) +from common import ALRChangeCode, log_end, log_start, OATS_ETL_USER from .submap import ( add_direction_field, map_direction_values, @@ -21,7 +17,6 @@ from common import BATCH_UPLOAD_SIZE from psycopg2.extras import execute_batch, RealDictCursor import traceback -from enum import Enum import json etl_name = "alcs_app_sub" @@ -304,6 +299,8 @@ def clean_application_submission(conn=None): print("Start application_submission cleaning") with conn.cursor() as cursor: cursor.execute( - "DELETE FROM alcs.application_submission a WHERE a.audit_created_by = 'oats_etl'" + f"DELETE FROM alcs.application_submission a WHERE a.audit_created_by = '{OATS_ETL_USER}'" ) print(f"Deleted items count = {cursor.rowcount}") + + conn.commit() diff --git a/bin/migrate-oats-data/db.py b/bin/migrate-oats-data/db.py index c80d6ed26a..29071cdd81 100644 --- a/bin/migrate-oats-data/db.py +++ b/bin/migrate-oats-data/db.py @@ -14,7 +14,11 @@ def inject_conn_pool(func): def wrapper(*args, **kwargs): - with connection_pool.getconn() as conn: - return func(conn, *args, **kwargs) + conn = connection_pool.getconn() + try: + result = func(conn, *args, **kwargs) + finally: + connection_pool.putconn(conn) + return result return wrapper diff --git a/bin/migrate-oats-data/documents/alcs_documents_to_app_documents.py b/bin/migrate-oats-data/documents/alcs_documents_to_app_documents.py index 1eeb7124f6..ead947e06b 100644 --- a/bin/migrate-oats-data/documents/alcs_documents_to_app_documents.py +++ b/bin/migrate-oats-data/documents/alcs_documents_to_app_documents.py @@ -38,7 +38,9 @@ def process_application_documents(conn=None, batch_size=10000): """ with conn.cursor() as cursor: with open( - "sql/documents_app/alcs_documents_to_app_documents_total_count.sql", "r", encoding="utf-8" + "sql/documents_app/alcs_documents_to_app_documents_total_count.sql", + "r", + encoding="utf-8", ) as sql_file: count_query = sql_file.read() cursor.execute(count_query) @@ -50,7 +52,9 @@ def process_application_documents(conn=None, batch_size=10000): last_document_id = 0 with open( - "sql/documents_app/alcs_documents_to_app_documents.sql", "r", encoding="utf-8" + "sql/documents_app/alcs_documents_to_app_documents.sql", + "r", + encoding="utf-8", ) as sql_file: documents_to_insert_sql = sql_file.read() while True: @@ -97,3 +101,5 @@ def clean_application_documents(conn=None): ) conn.commit() print(f"Deleted items count = {cursor.rowcount}") + + conn.commit() diff --git a/bin/migrate-oats-data/documents/alcs_documents_to_noi_documents.py b/bin/migrate-oats-data/documents/alcs_documents_to_noi_documents.py index 744b78a933..897402b58e 100644 --- a/bin/migrate-oats-data/documents/alcs_documents_to_noi_documents.py +++ b/bin/migrate-oats-data/documents/alcs_documents_to_noi_documents.py @@ -38,7 +38,9 @@ def process_noi_documents(conn=None, batch_size=10000): """ with conn.cursor() as cursor: with open( - "sql/documents_noi/alcs_documents_to_noi_documents_total_count.sql", "r", encoding="utf-8" + "sql/documents_noi/alcs_documents_to_noi_documents_total_count.sql", + "r", + encoding="utf-8", ) as sql_file: count_query = sql_file.read() cursor.execute(count_query) @@ -50,7 +52,9 @@ def process_noi_documents(conn=None, batch_size=10000): last_document_id = 0 with open( - "sql/documents_noi/alcs_documents_to_noi_documents.sql", "r", encoding="utf-8" + "sql/documents_noi/alcs_documents_to_noi_documents.sql", + "r", + encoding="utf-8", ) as sql_file: documents_to_insert_sql = sql_file.read() while True: @@ -97,3 +101,5 @@ def clean_noi_documents(conn=None): ) conn.commit() print(f"Deleted items count = {cursor.rowcount}") + + conn.commit() diff --git a/bin/migrate-oats-data/documents/oats_documents_to_alcs_documents_app.py b/bin/migrate-oats-data/documents/oats_documents_to_alcs_documents_app.py index ecc953969f..e953561823 100644 --- a/bin/migrate-oats-data/documents/oats_documents_to_alcs_documents_app.py +++ b/bin/migrate-oats-data/documents/oats_documents_to_alcs_documents_app.py @@ -37,7 +37,9 @@ def process_documents(conn=None, batch_size=10000): """ with conn.cursor() as cursor: with open( - "sql/documents_app/oats_documents_to_alcs_documents_app_total_count.sql", "r", encoding="utf-8" + "sql/documents_app/oats_documents_to_alcs_documents_app_total_count.sql", + "r", + encoding="utf-8", ) as sql_file: count_query = sql_file.read() cursor.execute(count_query) @@ -48,7 +50,11 @@ def process_documents(conn=None, batch_size=10000): successful_inserts_count = 0 last_document_id = 0 - with open("sql/documents_app/oats_documents_to_alcs_documents_app.sql", "r", encoding="utf-8") as sql_file: + with open( + "sql/documents_app/oats_documents_to_alcs_documents_app.sql", + "r", + encoding="utf-8", + ) as sql_file: documents_to_insert_sql = sql_file.read() while True: cursor.execute( @@ -91,3 +97,5 @@ def clean_documents(conn=None): cursor.execute("DELETE FROM alcs.document WHERE audit_created_by = 'oats_etl';") conn.commit() print(f"Deleted items count = {cursor.rowcount}") + + conn.commit() diff --git a/bin/migrate-oats-data/menu/commands/clean_all.py b/bin/migrate-oats-data/menu/commands/clean_all.py index a3562d4d28..1f8943b6ab 100644 --- a/bin/migrate-oats-data/menu/commands/clean_all.py +++ b/bin/migrate-oats-data/menu/commands/clean_all.py @@ -5,9 +5,8 @@ clean_application_submission_status_emails, ) from noi.noi_submission_status_email import ( - clean_application_submission_status_emails, + clean_notice_of_intent_submission_status_emails, ) -from noi import clean_notice_of_intents from documents import ( clean_application_documents, clean_documents, @@ -25,8 +24,8 @@ def clean_all(console, args): clean_documents() clean_application_submission() clean_applications() - clean_notice_of_intents() - clean_application_submission_status_emails(), + clean_notice_of_intent() clean_application_submission_status_emails(), + clean_notice_of_intent_submission_status_emails(), console.log("Done") diff --git a/bin/migrate-oats-data/noi/noi_submission_status_email/submission_status_email.py b/bin/migrate-oats-data/noi/noi_submission_status_email/submission_status_email.py index 748f078943..c09bf332a7 100644 --- a/bin/migrate-oats-data/noi/noi_submission_status_email/submission_status_email.py +++ b/bin/migrate-oats-data/noi/noi_submission_status_email/submission_status_email.py @@ -23,7 +23,7 @@ def process_notice_of_intent_submission_status_emails(conn=None): @inject_conn_pool -def clean_application_submission_status_emails(conn=None): +def clean_notice_of_intent_submission_status_emails(conn=None): update_query = f""" UPDATE alcs.notice_of_intent_submission_to_submission_status status SET email_sent_date = NULL @@ -38,3 +38,5 @@ def clean_application_submission_status_emails(conn=None): print("".join(traceback.format_exception(None, error, error.__traceback__))) cursor.close() conn.close() + + conn.commit() diff --git a/bin/migrate-oats-data/noi/notice_of_intent_init.py b/bin/migrate-oats-data/noi/notice_of_intent_init.py index 7720bf65aa..971759a65c 100644 --- a/bin/migrate-oats-data/noi/notice_of_intent_init.py +++ b/bin/migrate-oats-data/noi/notice_of_intent_init.py @@ -1,6 +1,6 @@ import traceback from db import inject_conn_pool -from common import log_end, log_start +from common import log_end, log_start, OATS_ETL_USER def noi_insert_query(number_of_rows_to_insert): @@ -58,7 +58,7 @@ def init_notice_of_intents(conn=None, batch_size=10000): ) print( - f"retrieved/inserted items count: {applications_to_be_inserted_count}; total successfully inserted/updated NOIs so far {successful_inserts_count}; last inserted noi_applidation_id: {last_application_id}" + f"retrieved/inserted items count: {applications_to_be_inserted_count}; total successfully inserted/updated NOIs so far {successful_inserts_count}; last inserted noi_id: {last_application_id}" ) except Exception as error: conn.rollback() @@ -83,6 +83,8 @@ def clean_notice_of_intents(conn=None): print("Start NOI cleaning") with conn.cursor() as cursor: cursor.execute( - "DELETE FROM alcs.notice_of_intent a WHERE a.audit_created_by = 'oats_etl'" + f"DELETE FROM alcs.notice_of_intent noi WHERE noi.audit_created_by = '{OATS_ETL_USER}'" ) print(f"Deleted items count = {cursor.rowcount}") + + conn.commit() diff --git a/bin/migrate-oats-data/noi/notice_of_intent_migration.py b/bin/migrate-oats-data/noi/notice_of_intent_migration.py index a1992a4aa7..ab3bfe4492 100644 --- a/bin/migrate-oats-data/noi/notice_of_intent_migration.py +++ b/bin/migrate-oats-data/noi/notice_of_intent_migration.py @@ -5,14 +5,18 @@ process_alcs_notice_of_intent_decision_date, ) from .notice_of_intent_init import init_notice_of_intents, clean_notice_of_intents +from .notice_of_intent_submissions import ( + clean_notice_of_intent_submissions, + init_notice_of_intent_submissions, +) def init_notice_of_intent(batch_size): - init_notice_of_intents(batch_size=batch_size) def clean_notice_of_intent(): + clean_notice_of_intent_submissions() clean_notice_of_intents() @@ -21,3 +25,5 @@ def process_notice_of_intent(batch_size): process_alcs_notice_of_intent_base_fields(batch_size=batch_size) process_alcs_notice_of_intent_decision_date(batch_size=batch_size) + + init_notice_of_intent_submissions(batch_size=batch_size) diff --git a/bin/migrate-oats-data/noi/notice_of_intent_submissions/__init__.py b/bin/migrate-oats-data/noi/notice_of_intent_submissions/__init__.py new file mode 100644 index 0000000000..c62d45edc2 --- /dev/null +++ b/bin/migrate-oats-data/noi/notice_of_intent_submissions/__init__.py @@ -0,0 +1 @@ +from .notice_of_intent_submission_init import init_notice_of_intent_submissions, clean_notice_of_intent_submissions diff --git a/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_submission_init.py b/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_submission_init.py new file mode 100644 index 0000000000..8783f28d0a --- /dev/null +++ b/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_submission_init.py @@ -0,0 +1,128 @@ +from common import log_end, log_start, OATS_ETL_USER +from db import inject_conn_pool +from common import BATCH_UPLOAD_SIZE +from psycopg2.extras import execute_batch, RealDictCursor +import traceback + +etl_name = "init_notice_of_intent_submissions" + + +@inject_conn_pool +def init_notice_of_intent_submissions(conn=None, batch_size=BATCH_UPLOAD_SIZE): + """ + This function is responsible for initializing the notice_of_intent_submission in ALCS. + + Args: + conn (psycopg2.extensions.connection): PostgreSQL database connection. Provided by the decorator. + batch_size (int): The number of items to process at once. Defaults to BATCH_UPLOAD_SIZE. + """ + + log_start(etl_name) + with conn.cursor(cursor_factory=RealDictCursor) as cursor: + with open( + "noi/sql/notice_of_intent_submission/notice_of_intent_submission_init_count.sql", + "r", + encoding="utf-8", + ) as sql_file: + count_query = sql_file.read() + cursor.execute(count_query) + count_total = dict(cursor.fetchone())["count"] + print("- Total Notice of Intent Submission data to insert: ", count_total) + + failed_inserts = 0 + successful_inserts_count = 0 + last_submission_id = 0 + + with open( + "noi/sql/notice_of_intent_submission/notice_of_intent_submission_init.sql", + "r", + encoding="utf-8", + ) as sql_file: + submission_sql = sql_file.read() + while True: + cursor.execute( + f"{submission_sql} WHERE noig.alr_application_id > {last_submission_id} ORDER BY noig.alr_application_id;" + ) + + rows = cursor.fetchmany(batch_size) + + if not rows: + break + try: + submissions_to_be_inserted_count = len(rows) + + _insert_notice_of_intent_submissions(conn, batch_size, cursor, rows) + + successful_inserts_count = ( + successful_inserts_count + submissions_to_be_inserted_count + ) + last_submission_id = dict(rows[-1])["alr_application_id"] + + print( + f"retrieved/inserted items count: {submissions_to_be_inserted_count}; total successfully inserted submissions so far {successful_inserts_count}; last inserted application_id: {last_submission_id}" + ) + except Exception as e: + conn.rollback() + str_err = str(e) + trace_err = traceback.format_exc() + print(str_err) + print(trace_err) + log_end(etl_name, str_err, trace_err) + failed_inserts = count_total - successful_inserts_count + last_submission_id = last_submission_id + 1 + + print("Total amount of successful inserts:", successful_inserts_count) + print("Total failed inserts:", failed_inserts) + log_end(etl_name) + + +def _insert_notice_of_intent_submissions(conn, batch_size, cursor, rows): + """ """ + query = _get_insert_query() + parsed_data_list = _prepare_oats_alr_applications_data(rows) + + if len(parsed_data_list) > 0: + execute_batch(cursor, query, parsed_data_list, page_size=batch_size) + + conn.commit() + + +def _get_insert_query(): + query = f""" + INSERT INTO alcs.notice_of_intent_submission ( + file_number, + local_government_uuid, + type_code, + applicant, + is_draft, + audit_created_by + ) + VALUES ( + %(file_number)s, + %(local_government_uuid)s, + %(type_code)s, + %(applicant)s, + false, + '{OATS_ETL_USER}' + ) + """ + return query + + +def _prepare_oats_alr_applications_data(row_data_list): + data_list = [] + for row in row_data_list: + data_list.append(dict(row)) + return data_list + + +@inject_conn_pool +def clean_notice_of_intent_submissions(conn=None): + print("Start notice_of_intent_submissions cleaning") + with conn.cursor() as cursor: + cursor.execute( + f"DELETE FROM alcs.notice_of_intent_submission nois WHERE nois.audit_created_by = '{OATS_ETL_USER}'" + ) + print(f"Deleted items count = {cursor.rowcount}") + + conn.commit() diff --git a/bin/migrate-oats-data/noi/oats_to_alcs_notice_of_intent_table_etl/oats_to_alcs_notice_of_intent_table_etl.py b/bin/migrate-oats-data/noi/oats_to_alcs_notice_of_intent_table_etl/oats_to_alcs_notice_of_intent_table_etl.py index f2aa8398dd..5863caaaec 100644 --- a/bin/migrate-oats-data/noi/oats_to_alcs_notice_of_intent_table_etl/oats_to_alcs_notice_of_intent_table_etl.py +++ b/bin/migrate-oats-data/noi/oats_to_alcs_notice_of_intent_table_etl/oats_to_alcs_notice_of_intent_table_etl.py @@ -94,10 +94,10 @@ def process_alcs_notice_of_intent_base_fields(conn=None, batch_size=BATCH_UPLOAD def _update_fee_fields_records(conn, batch_size, cursor, rows): query = _get_update_query_from_oats_alr_applications_fields() - parsed_fee_data_list = _prepare_oats_alr_applications_data(rows) + parsed_data_list = _prepare_oats_alr_applications_data(rows) - if len(parsed_fee_data_list) > 0: - execute_batch(cursor, query, parsed_fee_data_list, page_size=batch_size) + if len(parsed_data_list) > 0: + execute_batch(cursor, query, parsed_data_list, page_size=batch_size) conn.commit() diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/notice_of_intent_submission_init.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/notice_of_intent_submission_init.sql new file mode 100644 index 0000000000..5a42405a43 --- /dev/null +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/notice_of_intent_submission_init.sql @@ -0,0 +1,19 @@ +WITH noi_components_grouped AS ( + SELECT oaac.alr_application_id + FROM oats.oats_alr_appl_components oaac + JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id + WHERE oaa.application_class_code = 'NOI' + GROUP BY oaac.alr_application_id + HAVING count(oaac.alr_application_id) < 2 -- ignore notice of intents wit multiple components +) +SELECT noi.file_number, + noi.type_code, + noi.local_government_uuid, + oc.alr_change_code, + noig.alr_application_id, + noi.applicant, + noi.alr_area, + oc.alr_appl_component_id +FROM noi_components_grouped noig + LEFT JOIN alcs.notice_of_intent noi ON noi.file_number = noig.alr_application_id::TEXT + JOIN oats.oats_alr_appl_components oc ON noig.alr_application_id = oc.alr_application_id \ No newline at end of file diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/notice_of_intent_submission_init_count.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/notice_of_intent_submission_init_count.sql new file mode 100644 index 0000000000..185750ee23 --- /dev/null +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/notice_of_intent_submission_init_count.sql @@ -0,0 +1,10 @@ +WITH noi_components_grouped AS ( + SELECT oaac.alr_application_id + FROM oats.oats_alr_appl_components oaac + JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id + WHERE oaa.application_class_code = 'NOI' + GROUP BY oaac.alr_application_id + HAVING count(oaac.alr_application_id) < 2 -- ignore notice of intents wit multiple components +) +SELECT count(*) +FROM noi_components_grouped noig \ No newline at end of file From e91ef8d8cdf205545829b1fc350d60746df94e67 Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Mon, 25 Sep 2023 14:30:14 -0700 Subject: [PATCH 425/954] fix notification and noi table sorting (#1007) fix civic address search fix sorting on noi and notifications --- .../notice-of-intent-search-table.component.ts | 2 +- .../notification-search-table.component.ts | 4 ++-- .../apps/alcs/src/alcs/search/search.controller.ts | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/alcs-frontend/src/app/features/search/notice-of-intent-search-table/notice-of-intent-search-table.component.ts b/alcs-frontend/src/app/features/search/notice-of-intent-search-table/notice-of-intent-search-table.component.ts index 9d2338c191..1b031a983f 100644 --- a/alcs-frontend/src/app/features/search/notice-of-intent-search-table/notice-of-intent-search-table.component.ts +++ b/alcs-frontend/src/app/features/search/notice-of-intent-search-table/notice-of-intent-search-table.component.ts @@ -75,7 +75,7 @@ export class NoticeOfIntentSearchTableComponent implements OnDestroy { itemsPerPage: this.itemsPerPage, sortDirection: this.sortDirection, sortField: this.sortField, - tableType: 'APP', + tableType: 'NOI', }); } diff --git a/alcs-frontend/src/app/features/search/notification-search-table/notification-search-table.component.ts b/alcs-frontend/src/app/features/search/notification-search-table/notification-search-table.component.ts index 1b342d33d5..fbbed978b1 100644 --- a/alcs-frontend/src/app/features/search/notification-search-table/notification-search-table.component.ts +++ b/alcs-frontend/src/app/features/search/notification-search-table/notification-search-table.component.ts @@ -1,4 +1,4 @@ -import { Component, EventEmitter, Input, OnDestroy, OnInit, Output, ViewChild } from '@angular/core'; +import { Component, EventEmitter, Input, OnDestroy, Output, ViewChild } from '@angular/core'; import { MatPaginator, PageEvent } from '@angular/material/paginator'; import { MatSort } from '@angular/material/sort'; import { Router } from '@angular/router'; @@ -74,7 +74,7 @@ export class NotificationSearchTableComponent implements OnDestroy { itemsPerPage: this.itemsPerPage, sortDirection: this.sortDirection, sortField: this.sortField, - tableType: 'APP', + tableType: 'NOTI', }); } diff --git a/services/apps/alcs/src/alcs/search/search.controller.ts b/services/apps/alcs/src/alcs/search/search.controller.ts index 227e525ca6..54d331f845 100644 --- a/services/apps/alcs/src/alcs/search/search.controller.ts +++ b/services/apps/alcs/src/alcs/search/search.controller.ts @@ -222,7 +222,7 @@ export class SearchController { @UserRoles(...ROLES_ALLOWED_APPLICATIONS) async advancedSearchNotifications( @Body() searchDto: SearchRequestDto, - ): Promise<AdvancedSearchResultDto<NonApplicationSearchResultDto[]>> { + ): Promise<AdvancedSearchResultDto<NotificationSearchResultDto[]>> { const notifications = await this.notificationSearchService.search( searchDto, ); @@ -235,8 +235,8 @@ export class SearchController { ); return { - total: mappedSearchResult.totalNonApplications, - data: mappedSearchResult.nonApplications, + total: mappedSearchResult.totalNotifications, + data: mappedSearchResult.notifications, }; } @@ -280,7 +280,8 @@ export class SearchController { !searchDto.resolutionYear && !searchDto.isIncludeOtherParcels && !searchDto.portalStatusCode && - !isStringSetAndNotEmpty(searchDto.legacyId); + !isStringSetAndNotEmpty(searchDto.legacyId) && + !isStringSetAndNotEmpty(searchDto.civicAddress); const searchNotifications = (searchDto.fileTypes.length > 0 ? notificationTypeSpecified : true) && @@ -289,7 +290,6 @@ export class SearchController { !searchDto.resolutionNumber && !searchDto.resolutionYear && !searchDto.isIncludeOtherParcels && - !isStringSetAndNotEmpty(searchDto.civicAddress) && !isStringSetAndNotEmpty(searchDto.legacyId); return { From 94d5be5db2704ea8a03e6801073c928feeb1bbd2 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Mon, 25 Sep 2023 14:59:01 -0700 Subject: [PATCH 426/954] Base Views for Public Search * Add Public Module with Search * Add new views with public filters --- .../application-advanced-search.service.ts | 2 - .../apps/alcs/src/portal/portal.module.ts | 2 + .../alcs/src/portal/public/public.module.ts | 14 + .../public-application-search-view.entity.ts | 120 +++++++ .../public-application-search.service.spec.ts | 110 +++++++ .../public-application-search.service.ts | 305 ++++++++++++++++++ ...lic-notice-of-intent-search-view.entity.ts | 120 +++++++ ...ic-notice-of-intent-search.service.spec.ts | 108 +++++++ .../public-notice-of-intent-search.service.ts | 254 +++++++++++++++ .../public-notification-search-view.entity.ts | 89 +++++ ...public-notification-search.service.spec.ts | 107 ++++++ .../public-notification-search.service.ts | 215 ++++++++++++ .../search/public-search.controller.spec.ts | 243 ++++++++++++++ .../public/search/public-search.controller.ts | 271 ++++++++++++++++ .../portal/public/search/public-search.dto.ts | 129 ++++++++ .../public/search/public-search.module.ts | 38 +++ .../search/public-search.service.spec.ts | 115 +++++++ .../public/search/public-search.service.ts | 52 +++ .../1695677471273-public_search_views.ts | 68 ++++ 19 files changed, 2360 insertions(+), 2 deletions(-) create mode 100644 services/apps/alcs/src/portal/public/public.module.ts create mode 100644 services/apps/alcs/src/portal/public/search/application/public-application-search-view.entity.ts create mode 100644 services/apps/alcs/src/portal/public/search/application/public-application-search.service.spec.ts create mode 100644 services/apps/alcs/src/portal/public/search/application/public-application-search.service.ts create mode 100644 services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search-view.entity.ts create mode 100644 services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search.service.spec.ts create mode 100644 services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search.service.ts create mode 100644 services/apps/alcs/src/portal/public/search/notification/public-notification-search-view.entity.ts create mode 100644 services/apps/alcs/src/portal/public/search/notification/public-notification-search.service.spec.ts create mode 100644 services/apps/alcs/src/portal/public/search/notification/public-notification-search.service.ts create mode 100644 services/apps/alcs/src/portal/public/search/public-search.controller.spec.ts create mode 100644 services/apps/alcs/src/portal/public/search/public-search.controller.ts create mode 100644 services/apps/alcs/src/portal/public/search/public-search.dto.ts create mode 100644 services/apps/alcs/src/portal/public/search/public-search.module.ts create mode 100644 services/apps/alcs/src/portal/public/search/public-search.service.spec.ts create mode 100644 services/apps/alcs/src/portal/public/search/public-search.service.ts create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1695677471273-public_search_views.ts diff --git a/services/apps/alcs/src/alcs/search/application/application-advanced-search.service.ts b/services/apps/alcs/src/alcs/search/application/application-advanced-search.service.ts index 77269de13d..76a2040f26 100644 --- a/services/apps/alcs/src/alcs/search/application/application-advanced-search.service.ts +++ b/services/apps/alcs/src/alcs/search/application/application-advanced-search.service.ts @@ -331,8 +331,6 @@ export class ApplicationAdvancedSearchService { searchDto: SearchRequestDto, query, ) { - query = query; - if (searchDto.fileTypes.length > 0) { // if decision is not joined yet -> join it. The join of decision happens in compileApplicationDecisionSearchQuery if ( diff --git a/services/apps/alcs/src/portal/portal.module.ts b/services/apps/alcs/src/portal/portal.module.ts index f7b1ebb88a..15939b5f8b 100644 --- a/services/apps/alcs/src/portal/portal.module.ts +++ b/services/apps/alcs/src/portal/portal.module.ts @@ -20,6 +20,7 @@ import { PortalNotificationDocumentModule } from './notification-document/notifi import { ParcelModule } from './parcel/parcel.module'; import { PdfGenerationModule } from './pdf-generation/pdf-generation.module'; import { NotificationSubmissionModule } from './notification-submission/notification-submission.module'; +import { PublicModule } from './public/public.module'; @Module({ imports: [ @@ -42,6 +43,7 @@ import { NotificationSubmissionModule } from './notification-submission/notifica PortalNoticeOfIntentDecisionModule, NotificationSubmissionModule, PortalNotificationDocumentModule, + PublicModule, RouterModule.register([ { path: 'portal', module: ApplicationSubmissionModule }, { path: 'portal', module: NoticeOfIntentSubmissionModule }, diff --git a/services/apps/alcs/src/portal/public/public.module.ts b/services/apps/alcs/src/portal/public/public.module.ts new file mode 100644 index 0000000000..a08600dd31 --- /dev/null +++ b/services/apps/alcs/src/portal/public/public.module.ts @@ -0,0 +1,14 @@ +import { Module } from '@nestjs/common'; +import { RouterModule } from '@nestjs/core'; +import { PublicSearchModule } from './search/public-search.module'; + +@Module({ + imports: [ + PublicSearchModule, + RouterModule.register([{ path: 'public', module: PublicSearchModule }]), + ], + controllers: [], + providers: [], + exports: [], +}) +export class PublicModule {} diff --git a/services/apps/alcs/src/portal/public/search/application/public-application-search-view.entity.ts b/services/apps/alcs/src/portal/public/search/application/public-application-search-view.entity.ts new file mode 100644 index 0000000000..0c49669b0a --- /dev/null +++ b/services/apps/alcs/src/portal/public/search/application/public-application-search-view.entity.ts @@ -0,0 +1,120 @@ +import { + DataSource, + JoinColumn, + ManyToOne, + PrimaryColumn, + ViewColumn, + ViewEntity, +} from 'typeorm'; +import { ApplicationDecision } from '../../../../alcs/application-decision/application-decision.entity'; +import { ApplicationSubmissionToSubmissionStatus } from '../../../../alcs/application/application-submission-status/submission-status.entity'; +import { Application } from '../../../../alcs/application/application.entity'; +import { ApplicationType } from '../../../../alcs/code/application-code/application-type/application-type.entity'; +import { LocalGovernment } from '../../../../alcs/local-government/local-government.entity'; +import { ApplicationSubmission } from '../../../application-submission/application-submission.entity'; +import { LinkedStatusType } from '../public-search.dto'; + +@ViewEntity({ + expression: (datasource: DataSource) => + datasource + .createQueryBuilder() + .select('app_sub.uuid', 'uuid') + .addSelect('app_sub.file_number', 'file_number') + .addSelect('app_sub.applicant', 'applicant') + .addSelect('app_sub.local_government_uuid', 'local_government_uuid') + .addSelect('localGovernment.name', 'local_government_name') + .addSelect('app_sub.type_code', 'application_type_code') + .addSelect('app.date_submitted_to_alc', 'date_submitted_to_alc') + .addSelect('app.decision_date', 'decision_date') + .addSelect('app.uuid', 'application_uuid') + .addSelect('app.region_code', 'application_region_code') + .addSelect( + 'GREATEST(status_link.effective_date, decision_date.date)', + 'last_update', + ) + .addSelect( + 'alcs.get_current_status_for_application_submission_by_uuid(app_sub.uuid)', + 'status', + ) + .from(ApplicationSubmission, 'app_sub') + .innerJoin(Application, 'app', 'app.file_number = app_sub.file_number') + .innerJoinAndSelect( + ApplicationType, + 'applicationType', + 'app_sub.type_code = applicationType.code', + ) + .leftJoin( + LocalGovernment, + 'localGovernment', + 'app_sub.local_government_uuid = localGovernment.uuid', + ) + .leftJoin( + (qb) => + qb + .from(ApplicationSubmissionToSubmissionStatus, 'status_link') + .select('MAX("effective_date")', 'effective_date') + .addSelect('submission_uuid', 'submission_uuid') + .groupBy('submission_uuid'), + 'status_link', + 'status_link."submission_uuid" = app_sub.uuid', + ) + .leftJoin( + (qb) => + qb + .from(ApplicationDecision, 'decision_date') + .select('MAX("date")', 'date') + .addSelect('application_uuid', 'application_uuid') + .groupBy('application_uuid'), + 'decision_date', + 'decision_date."application_uuid" = app.uuid', + ) + .where('app_sub.is_draft = FALSE') + .andWhere('app.date_received_all_items IS NOT NULL') + .andWhere( + "alcs.get_current_status_for_application_submission_by_uuid(app_sub.uuid)->>'status_type_code' != 'CNCL'", + ), +}) +export class PublicApplicationSubmissionSearchView { + @ViewColumn() + @PrimaryColumn() + uuid: string; + + @ViewColumn() + applicationUuid: string; + + @ViewColumn() + lastUpdate: Date; + + @ViewColumn() + applicationRegionCode?: string; + + @ViewColumn() + fileNumber: string; + + @ViewColumn() + applicant?: string; + + @ViewColumn() + localGovernmentUuid?: string; + + @ViewColumn() + localGovernmentName?: string; + + @ViewColumn() + applicationTypeCode: string; + + @ViewColumn() + status: LinkedStatusType; + + @ViewColumn() + dateSubmittedToAlc: Date | null; + + @ViewColumn() + decisionDate: Date | null; + + @ManyToOne(() => ApplicationType, { + nullable: false, + }) + @JoinColumn({ name: 'application_type_code' }) + applicationType: ApplicationType; +} diff --git a/services/apps/alcs/src/portal/public/search/application/public-application-search.service.spec.ts b/services/apps/alcs/src/portal/public/search/application/public-application-search.service.spec.ts new file mode 100644 index 0000000000..308db43c78 --- /dev/null +++ b/services/apps/alcs/src/portal/public/search/application/public-application-search.service.spec.ts @@ -0,0 +1,110 @@ +import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; +import { Test, TestingModule } from '@nestjs/testing'; +import { getRepositoryToken } from '@nestjs/typeorm'; +import { Repository } from 'typeorm'; +import { LocalGovernment } from '../../../../alcs/local-government/local-government.entity'; +import { SearchRequestDto } from '../public-search.dto'; +import { PublicApplicationSearchService } from './public-application-search.service'; +import { PublicApplicationSubmissionSearchView } from './public-application-search-view.entity'; + +describe('PublicApplicationSearchService', () => { + let service: PublicApplicationSearchService; + let mockApplicationSubmissionSearchViewRepository: DeepMocked< + Repository<PublicApplicationSubmissionSearchView> + >; + let mockLocalGovernmentRepository: DeepMocked<Repository<LocalGovernment>>; + + const mockSearchRequestDto: SearchRequestDto = { + fileNumber: '123', + portalStatusCode: 'A', + governmentName: 'B', + regionCode: 'C', + name: 'D', + pid: 'E', + civicAddress: 'F', + dateDecidedFrom: new Date('2020-11-10').getTime(), + dateDecidedTo: new Date('2021-11-10').getTime(), + fileTypes: ['type1', 'type2'], + page: 1, + pageSize: 10, + sortField: 'ownerName', + sortDirection: 'ASC', + }; + + let mockQuery: any = {}; + + beforeEach(async () => { + mockApplicationSubmissionSearchViewRepository = createMock(); + mockLocalGovernmentRepository = createMock(); + + mockQuery = { + getManyAndCount: jest.fn().mockResolvedValue([[], 0]), + orderBy: jest.fn().mockReturnThis(), + offset: jest.fn().mockReturnThis(), + limit: jest.fn().mockReturnThis(), + innerJoinAndMapOne: jest.fn().mockReturnThis(), + groupBy: jest.fn().mockReturnThis(), + where: jest.fn().mockReturnThis(), + andWhere: jest.fn().mockReturnThis(), + setParameters: jest.fn().mockReturnThis(), + leftJoin: jest.fn().mockReturnThis(), + }; + + const module: TestingModule = await Test.createTestingModule({ + providers: [ + PublicApplicationSearchService, + { + provide: getRepositoryToken(PublicApplicationSubmissionSearchView), + useValue: mockApplicationSubmissionSearchViewRepository, + }, + { + provide: getRepositoryToken(LocalGovernment), + useValue: mockLocalGovernmentRepository, + }, + ], + }).compile(); + + service = module.get<PublicApplicationSearchService>( + PublicApplicationSearchService, + ); + + mockLocalGovernmentRepository.findOneByOrFail.mockResolvedValue( + new LocalGovernment(), + ); + }); + + it('should be defined', () => { + expect(service).toBeDefined(); + }); + + it('should successfully build a query using all search parameters defined', async () => { + mockApplicationSubmissionSearchViewRepository.createQueryBuilder.mockReturnValue( + mockQuery as any, + ); + + const result = await service.searchApplications(mockSearchRequestDto); + + expect(result).toEqual({ data: [], total: 0 }); + expect( + mockApplicationSubmissionSearchViewRepository.createQueryBuilder, + ).toBeCalledTimes(1); + expect(mockQuery.andWhere).toBeCalledTimes(8); + expect(mockQuery.where).toBeCalledTimes(1); + }); + + it('should call compileApplicationSearchQuery method correctly', async () => { + const compileApplicationSearchQuerySpy = jest + .spyOn(service as any, 'compileApplicationSearchQuery') + .mockResolvedValue(mockQuery); + + const result = await service.searchApplications(mockSearchRequestDto); + + expect(result).toEqual({ data: [], total: 0 }); + expect(compileApplicationSearchQuerySpy).toBeCalledWith( + mockSearchRequestDto, + ); + expect(mockQuery.orderBy).toHaveBeenCalledTimes(1); + expect(mockQuery.offset).toHaveBeenCalledTimes(1); + expect(mockQuery.limit).toHaveBeenCalledTimes(1); + }); +}); diff --git a/services/apps/alcs/src/portal/public/search/application/public-application-search.service.ts b/services/apps/alcs/src/portal/public/search/application/public-application-search.service.ts new file mode 100644 index 0000000000..9c6597ac31 --- /dev/null +++ b/services/apps/alcs/src/portal/public/search/application/public-application-search.service.ts @@ -0,0 +1,305 @@ +import { Injectable } from '@nestjs/common'; +import { InjectRepository } from '@nestjs/typeorm'; +import { Brackets, Repository } from 'typeorm'; +import { ApplicationDecisionComponent } from '../../../../alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.entity'; +import { ApplicationDecision } from '../../../../alcs/application-decision/application-decision.entity'; +import { LocalGovernment } from '../../../../alcs/local-government/local-government.entity'; +import { formatStringToPostgresSearchStringArrayWithWildCard } from '../../../../utils/search-helper'; +import { ApplicationOwner } from '../../../application-submission/application-owner/application-owner.entity'; +import { ApplicationParcel } from '../../../application-submission/application-parcel/application-parcel.entity'; +import { + AdvancedSearchResultDto, + SearchRequestDto, +} from '../public-search.dto'; +import { PublicApplicationSubmissionSearchView } from './public-application-search-view.entity'; + +@Injectable() +export class PublicApplicationSearchService { + constructor( + @InjectRepository(PublicApplicationSubmissionSearchView) + private applicationSearchRepository: Repository<PublicApplicationSubmissionSearchView>, + @InjectRepository(LocalGovernment) + private governmentRepository: Repository<LocalGovernment>, + ) {} + + async searchApplications( + searchDto: SearchRequestDto, + ): Promise<AdvancedSearchResultDto<PublicApplicationSubmissionSearchView[]>> { + let query = await this.compileApplicationSearchQuery(searchDto); + + query = this.compileApplicationGroupBySearchQuery(query); + + const sortQuery = this.compileSortQuery(searchDto); + + query = query + .orderBy(sortQuery, searchDto.sortDirection) + .offset((searchDto.page - 1) * searchDto.pageSize) + .limit(searchDto.pageSize); + + const result = await query.getManyAndCount(); + + return { + data: result[0], + total: result[1], + }; + } + + private compileSortQuery(searchDto: SearchRequestDto) { + switch (searchDto.sortField) { + case 'fileId': + return '"appSearch"."file_number"'; + + case 'ownerName': + return '"appSearch"."applicant"'; + + case 'type': + return '"appSearch"."application_type_code"'; + + case 'government': + return '"appSearch"."local_government_name"'; + + case 'portalStatus': + return `"appSearch"."status" ->> 'label' `; + + default: + case 'dateSubmitted': + return '"appSearch"."date_submitted_to_alc"'; + } + } + + private compileApplicationGroupBySearchQuery(query) { + query = query + .innerJoinAndMapOne( + 'appSearch.applicationType', + 'appSearch.applicationType', + 'applicationType', + ) + .groupBy( + ` + "appSearch"."uuid" + , "appSearch"."application_uuid" + , "appSearch"."application_region_code" + , "appSearch"."file_number" + , "appSearch"."applicant" + , "appSearch"."local_government_uuid" + , "appSearch"."local_government_name" + , "appSearch"."application_type_code" + , "appSearch"."status" + , "appSearch"."date_submitted_to_alc" + , "appSearch"."decision_date" + , "applicationType"."audit_deleted_date_at" + , "applicationType"."audit_created_at" + , "applicationType"."audit_updated_by" + , "applicationType"."audit_updated_at" + , "applicationType"."audit_created_by" + , "applicationType"."short_label" + , "applicationType"."label" + , "applicationType"."code" + , "applicationType"."background_color" + , "applicationType"."text_color" + , "applicationType"."html_description" + , "applicationType"."portal_label" + `, + ); + return query; + } + + private async compileApplicationSearchQuery(searchDto: SearchRequestDto) { + let query = this.applicationSearchRepository + .createQueryBuilder('appSearch') + .where('appSearch.is_draft = false'); + + if (searchDto.fileNumber) { + query = query + .andWhere('appSearch.file_number = :fileNumber') + .setParameters({ fileNumber: searchDto.fileNumber ?? null }); + } + + if (searchDto.portalStatusCode) { + query = query.andWhere( + "alcs.get_current_status_for_application_submission_by_uuid(appSearch.uuid) ->> 'status_type_code' = :status", + { + status: searchDto.portalStatusCode, + }, + ); + } + + if (searchDto.governmentName) { + const government = await this.governmentRepository.findOneByOrFail({ + name: searchDto.governmentName, + }); + + query = query.andWhere( + 'appSearch.local_government_uuid = :local_government_uuid', + { + local_government_uuid: government.uuid, + }, + ); + } + + if (searchDto.regionCode) { + query = query.andWhere( + 'appSearch.application_region_code = :application_region_code', + { + application_region_code: searchDto.regionCode, + }, + ); + } + + query = this.compileApplicationSearchByNameQuery(searchDto, query); + query = this.compileApplicationParcelSearchQuery(searchDto, query); + query = this.compileApplicationDecisionSearchQuery(searchDto, query); + query = this.compileApplicationFileTypeSearchQuery(searchDto, query); + + return query; + } + + private compileApplicationDecisionSearchQuery( + searchDto: SearchRequestDto, + query, + ) { + if ( + searchDto.dateDecidedTo !== undefined || + searchDto.dateDecidedFrom !== undefined + ) { + query = this.joinApplicationDecision(query); + // TODO + // if (searchDto.resolutionNumber !== undefined) { + // query = query.andWhere( + // 'decision.resolution_number = :resolution_number', + // { + // resolution_number: searchDto.resolutionNumber, + // }, + // ); + // } + // + // if (searchDto.resolutionYear !== undefined) { + // query = query.andWhere('decision.resolution_year = :resolution_year', { + // resolution_year: searchDto.resolutionYear, + // }); + // } + } + return query; + } + + private joinApplicationDecision(query: any) { + query = query.leftJoin( + ApplicationDecision, + 'decision', + 'decision.application_uuid = "appSearch"."application_uuid"', + ); + return query; + } + + private compileApplicationParcelSearchQuery( + searchDto: SearchRequestDto, + query, + ) { + if (searchDto.pid || searchDto.civicAddress) { + query = query.leftJoin( + ApplicationParcel, + 'parcel', + "parcel.application_submission_uuid = appSearch.uuid AND parcel.parcel_type IN ('application', 'other')", + ); + } else { + query = query.leftJoin( + ApplicationParcel, + 'parcel', + "parcel.application_submission_uuid = appSearch.uuid AND parcel.parcel_type = 'application'", + ); + } + + if (searchDto.pid) { + query = query.andWhere('parcel.pid = :pid', { pid: searchDto.pid }); + } + + if (searchDto.civicAddress) { + query = query.andWhere('parcel.civic_address like :civic_address', { + civic_address: `%${searchDto.civicAddress}%`, + }); + } + return query; + } + + private compileApplicationSearchByNameQuery( + searchDto: SearchRequestDto, + query, + ) { + if (searchDto.name) { + const formattedSearchString = + formatStringToPostgresSearchStringArrayWithWildCard(searchDto.name!); + + query = query + .leftJoin( + ApplicationOwner, + 'application_owner', + 'application_owner.application_submission_uuid = appSearch.uuid', + ) + .andWhere( + new Brackets((qb) => + qb + .where( + "LOWER(application_owner.first_name || ' ' || application_owner.last_name) LIKE ANY (:names)", + { + names: formattedSearchString, + }, + ) + .orWhere( + 'LOWER(application_owner.first_name) LIKE ANY (:names)', + { + names: formattedSearchString, + }, + ) + .orWhere('LOWER(application_owner.last_name) LIKE ANY (:names)', { + names: formattedSearchString, + }) + .orWhere( + 'LOWER(application_owner.organization_name) LIKE ANY (:names)', + { + names: formattedSearchString, + }, + ), + ), + ); + } + return query; + } + + private compileApplicationFileTypeSearchQuery( + searchDto: SearchRequestDto, + query, + ) { + if (searchDto.fileTypes.length > 0) { + // if decision is not joined yet -> join it. The join of decision happens in compileApplicationDecisionSearchQuery + if ( + searchDto.dateDecidedFrom === undefined && + searchDto.dateDecidedTo === undefined + ) { + query = this.joinApplicationDecision(query); + } + + query = query.leftJoin( + ApplicationDecisionComponent, + 'decisionComponent', + 'decisionComponent.application_decision_uuid = decision.uuid', + ); + + query = query.andWhere( + new Brackets((qb) => + qb + .where('appSearch.application_type_code IN (:...typeCodes)', { + typeCodes: searchDto.fileTypes, + }) + .orWhere( + 'decisionComponent.application_decision_component_type_code IN (:...typeCodes)', + { + typeCodes: searchDto.fileTypes, + }, + ), + ), + ); + } + + return query; + } +} diff --git a/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search-view.entity.ts b/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search-view.entity.ts new file mode 100644 index 0000000000..bac002d236 --- /dev/null +++ b/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search-view.entity.ts @@ -0,0 +1,120 @@ +import { + DataSource, + JoinColumn, + ManyToOne, + PrimaryColumn, + ViewColumn, + ViewEntity, +} from 'typeorm'; +import { LocalGovernment } from '../../../../alcs/local-government/local-government.entity'; +import { NoticeOfIntentDecision } from '../../../../alcs/notice-of-intent-decision/notice-of-intent-decision.entity'; +import { NoticeOfIntentSubmissionToSubmissionStatus } from '../../../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status.entity'; +import { NoticeOfIntentType } from '../../../../alcs/notice-of-intent/notice-of-intent-type/notice-of-intent-type.entity'; +import { NoticeOfIntent } from '../../../../alcs/notice-of-intent/notice-of-intent.entity'; +import { NoticeOfIntentSubmission } from '../../../notice-of-intent-submission/notice-of-intent-submission.entity'; +import { LinkedStatusType } from '../public-search.dto'; + +@ViewEntity({ + expression: (datasource: DataSource) => + datasource + .createQueryBuilder() + .select('noi_sub.uuid', 'uuid') + .addSelect('noi_sub.file_number', 'file_number') + .addSelect('noi_sub.applicant', 'applicant') + .addSelect('noi_sub.local_government_uuid', 'local_government_uuid') + .addSelect('localGovernment.name', 'local_government_name') + .addSelect('noi_sub.type_code', 'notice_of_intent_type_code') + .addSelect('noi.date_submitted_to_alc', 'date_submitted_to_alc') + .addSelect('noi.decision_date', 'decision_date') + .addSelect('noi.uuid', 'notice_of_intent_uuid') + .addSelect('noi.region_code', 'notice_of_intent_region_code') + .addSelect( + 'GREATEST(status_link.effective_date, decision_date.date)', + 'last_update', + ) + .addSelect( + 'alcs.get_current_status_for_notice_of_intent_submission_by_uuid(noi_sub.uuid)', + 'status', + ) + .from(NoticeOfIntentSubmission, 'noi_sub') + .innerJoin(NoticeOfIntent, 'noi', 'noi.file_number = noi_sub.file_number') + .innerJoinAndSelect( + NoticeOfIntentType, + 'noticeOfIntentType', + 'noi_sub.type_code = noticeOfIntentType.code', + ) + .leftJoin( + LocalGovernment, + 'localGovernment', + 'noi_sub.local_government_uuid = localGovernment.uuid', + ) + .leftJoin( + (qb) => + qb + .from(NoticeOfIntentSubmissionToSubmissionStatus, 'status_link') + .select('MAX("effective_date")', 'effective_date') + .addSelect('submission_uuid', 'submission_uuid') + .groupBy('submission_uuid'), + 'status_link', + 'status_link."submission_uuid" = noi_sub.uuid', + ) + .leftJoin( + (qb) => + qb + .from(NoticeOfIntentDecision, 'decision_date') + .select('MAX("date")', 'date') + .addSelect('notice_of_intent_uuid', 'notice_of_intent_uuid') + .groupBy('notice_of_intent_uuid'), + 'decision_date', + 'decision_date."notice_of_intent_uuid" = noi.uuid', + ) + .where('noi_sub.is_draft = FALSE') + .andWhere('noi.date_received_all_items IS NOT NULL') + .andWhere( + "alcs.get_current_status_for_notice_of_intent_submission_by_uuid(noi_sub.uuid)->>'status_type_code' != 'CNCL'", + ), +}) +export class PublicNoticeOfIntentSubmissionSearchView { + @ViewColumn() + @PrimaryColumn() + uuid: string; + + @ViewColumn() + noticeOfIntentUuid: string; + + @ViewColumn() + lastUpdate: Date; + + @ViewColumn() + noticeOfIntentRegionCode?: string; + + @ViewColumn() + fileNumber: string; + + @ViewColumn() + applicant?: string; + + @ViewColumn() + localGovernmentUuid?: string; + + @ViewColumn() + localGovernmentName?: string; + + @ViewColumn() + noticeOfIntentTypeCode: string; + + @ViewColumn() + status: LinkedStatusType; + + @ViewColumn() + dateSubmittedToAlc: Date | null; + + @ViewColumn() + decisionDate: Date | null; + + @ManyToOne(() => NoticeOfIntentType, { + nullable: false, + }) + @JoinColumn({ name: 'notice_of_intent_type_code' }) + noticeOfIntentType: NoticeOfIntentType; +} diff --git a/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search.service.spec.ts b/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search.service.spec.ts new file mode 100644 index 0000000000..565fb98c22 --- /dev/null +++ b/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search.service.spec.ts @@ -0,0 +1,108 @@ +import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; +import { Test, TestingModule } from '@nestjs/testing'; +import { getRepositoryToken } from '@nestjs/typeorm'; +import { Repository } from 'typeorm'; +import { LocalGovernment } from '../../../../alcs/local-government/local-government.entity'; +import { SearchRequestDto } from '../public-search.dto'; +import { PublicNoticeOfIntentSearchService } from './public-notice-of-intent-search.service'; +import { PublicNoticeOfIntentSubmissionSearchView } from './public-notice-of-intent-search-view.entity'; + +describe('PublicNoticeOfIntentSearchService', () => { + let service: PublicNoticeOfIntentSearchService; + let mockNoticeOfIntentSubmissionSearchViewRepository: DeepMocked< + Repository<PublicNoticeOfIntentSubmissionSearchView> + >; + let mockLocalGovernmentRepository: DeepMocked<Repository<LocalGovernment>>; + + const mockSearchDto: SearchRequestDto = { + fileNumber: '123', + portalStatusCode: 'A', + governmentName: 'B', + regionCode: 'C', + name: 'D', + pid: 'E', + civicAddress: 'F', + dateDecidedFrom: new Date('2020-11-10').getTime(), + dateDecidedTo: new Date('2021-11-10').getTime(), + fileTypes: ['type1', 'type2'], + page: 1, + pageSize: 10, + sortField: 'ownerName', + sortDirection: 'ASC', + }; + + let mockQuery: any = {}; + + beforeEach(async () => { + mockNoticeOfIntentSubmissionSearchViewRepository = createMock(); + mockLocalGovernmentRepository = createMock(); + + mockQuery = { + getManyAndCount: jest.fn().mockResolvedValue([[], 0]), + orderBy: jest.fn().mockReturnThis(), + offset: jest.fn().mockReturnThis(), + limit: jest.fn().mockReturnThis(), + innerJoinAndMapOne: jest.fn().mockReturnThis(), + groupBy: jest.fn().mockReturnThis(), + where: jest.fn().mockReturnThis(), + andWhere: jest.fn().mockReturnThis(), + setParameters: jest.fn().mockReturnThis(), + leftJoin: jest.fn().mockReturnThis(), + }; + + const module: TestingModule = await Test.createTestingModule({ + providers: [ + PublicNoticeOfIntentSearchService, + { + provide: getRepositoryToken(PublicNoticeOfIntentSubmissionSearchView), + useValue: mockNoticeOfIntentSubmissionSearchViewRepository, + }, + { + provide: getRepositoryToken(LocalGovernment), + useValue: mockLocalGovernmentRepository, + }, + ], + }).compile(); + + service = module.get<PublicNoticeOfIntentSearchService>( + PublicNoticeOfIntentSearchService, + ); + + mockLocalGovernmentRepository.findOneByOrFail.mockResolvedValue( + new LocalGovernment(), + ); + }); + + it('should be defined', () => { + expect(service).toBeDefined(); + }); + + it('should successfully build a query using all search parameters defined', async () => { + mockNoticeOfIntentSubmissionSearchViewRepository.createQueryBuilder.mockReturnValue( + mockQuery as any, + ); + + const result = await service.searchNoticeOfIntents(mockSearchDto); + + expect(result).toEqual({ data: [], total: 0 }); + expect( + mockNoticeOfIntentSubmissionSearchViewRepository.createQueryBuilder, + ).toBeCalledTimes(1); + expect(mockQuery.andWhere).toBeCalledTimes(7); + expect(mockQuery.where).toBeCalledTimes(1); + }); + + it('should call compileNoticeOfIntentSearchQuery method correctly', async () => { + const compileApplicationSearchQuerySpy = jest + .spyOn(service as any, 'compileNoticeOfIntentSearchQuery') + .mockResolvedValue(mockQuery); + + const result = await service.searchNoticeOfIntents(mockSearchDto); + + expect(result).toEqual({ data: [], total: 0 }); + expect(compileApplicationSearchQuerySpy).toBeCalledWith(mockSearchDto); + expect(mockQuery.orderBy).toHaveBeenCalledTimes(1); + expect(mockQuery.offset).toHaveBeenCalledTimes(1); + expect(mockQuery.limit).toHaveBeenCalledTimes(1); + }); +}); diff --git a/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search.service.ts b/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search.service.ts new file mode 100644 index 0000000000..c801595a5d --- /dev/null +++ b/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search.service.ts @@ -0,0 +1,254 @@ +import { Injectable } from '@nestjs/common'; +import { InjectRepository } from '@nestjs/typeorm'; +import { Brackets, Repository } from 'typeorm'; +import { LocalGovernment } from '../../../../alcs/local-government/local-government.entity'; +import { NoticeOfIntentDecision } from '../../../../alcs/notice-of-intent-decision/notice-of-intent-decision.entity'; +import { formatStringToPostgresSearchStringArrayWithWildCard } from '../../../../utils/search-helper'; +import { NoticeOfIntentOwner } from '../../../notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.entity'; +import { NoticeOfIntentParcel } from '../../../notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.entity'; +import { + AdvancedSearchResultDto, + SearchRequestDto, +} from '../public-search.dto'; +import { PublicNoticeOfIntentSubmissionSearchView } from './public-notice-of-intent-search-view.entity'; + +@Injectable() +export class PublicNoticeOfIntentSearchService { + constructor( + @InjectRepository(PublicNoticeOfIntentSubmissionSearchView) + private noiSearchRepository: Repository<PublicNoticeOfIntentSubmissionSearchView>, + @InjectRepository(LocalGovernment) + private governmentRepository: Repository<LocalGovernment>, + ) {} + + async searchNoticeOfIntents( + searchDto: SearchRequestDto, + ): Promise< + AdvancedSearchResultDto<PublicNoticeOfIntentSubmissionSearchView[]> + > { + let query = await this.compileNoticeOfIntentSearchQuery(searchDto); + + query = this.compileGroupBySearchQuery(query); + + const sortQuery = this.compileSortQuery(searchDto); + + query = query + .orderBy(sortQuery, searchDto.sortDirection) + .offset((searchDto.page - 1) * searchDto.pageSize) + .limit(searchDto.pageSize); + + const result = await query.getManyAndCount(); + + return { + data: result[0], + total: result[1], + }; + } + + private compileSortQuery(searchDto: SearchRequestDto) { + switch (searchDto.sortField) { + case 'fileId': + return '"noiSearch"."file_number"'; + + case 'ownerName': + return '"noiSearch"."applicant"'; + + case 'type': + return '"noiSearch"."notice_of_intent_type_code"'; + + case 'government': + return '"noiSearch"."local_government_name"'; + + case 'portalStatus': + return `"noiSearch"."status" ->> 'label' `; + + default: + case 'dateSubmitted': + return '"noiSearch"."date_submitted_to_alc"'; + } + } + + private compileGroupBySearchQuery(query) { + query = query + .innerJoinAndMapOne( + 'noiSearch.noticeOfIntentType', + 'noiSearch.noticeOfIntentType', + 'noticeOfIntentType', + ) + .groupBy( + ` + "noiSearch"."uuid" + , "noiSearch"."notice_of_intent_uuid" + , "noiSearch"."notice_of_intent_region_code" + , "noiSearch"."file_number" + , "noiSearch"."applicant" + , "noiSearch"."local_government_uuid" + , "noiSearch"."local_government_name" + , "noiSearch"."notice_of_intent_type_code" + , "noiSearch"."status" + , "noiSearch"."date_submitted_to_alc" + , "noiSearch"."decision_date" + , "noticeOfIntentType"."audit_deleted_date_at" + , "noticeOfIntentType"."audit_created_at" + , "noticeOfIntentType"."audit_updated_by" + , "noticeOfIntentType"."audit_updated_at" + , "noticeOfIntentType"."audit_created_by" + , "noticeOfIntentType"."short_label" + , "noticeOfIntentType"."label" + , "noticeOfIntentType"."code" + , "noticeOfIntentType"."html_description" + , "noticeOfIntentType"."portal_label" + , "noiSearch"."is_draft" + `, + ); + return query; + } + + private async compileNoticeOfIntentSearchQuery(searchDto: SearchRequestDto) { + let query = this.noiSearchRepository + .createQueryBuilder('noiSearch') + .where('noiSearch.is_draft = false'); + + if (searchDto.fileNumber) { + query = query + .andWhere('noiSearch.file_number = :fileNumber') + .setParameters({ fileNumber: searchDto.fileNumber ?? null }); + } + + if (searchDto.portalStatusCode) { + query = query.andWhere( + "alcs.get_current_status_for_notice_of_intent_submission_by_uuid(noiSearch.uuid) ->> 'status_type_code' = :status", + { + status: searchDto.portalStatusCode, + }, + ); + } + + if (searchDto.governmentName) { + const government = await this.governmentRepository.findOneByOrFail({ + name: searchDto.governmentName, + }); + + query = query.andWhere( + 'noiSearch.local_government_uuid = :local_government_uuid', + { + local_government_uuid: government.uuid, + }, + ); + } + + if (searchDto.regionCode) { + query = query.andWhere( + 'noiSearch.notice_of_intent_region_code = :noi_region_code', + { + noi_region_code: searchDto.regionCode, + }, + ); + } + + query = this.compileSearchByNameQuery(searchDto, query); + query = this.compileParcelSearchQuery(searchDto, query); + query = this.compileDecisionSearchQuery(searchDto, query); + + return query; + } + + private compileDecisionSearchQuery(searchDto: SearchRequestDto, query) { + if ( + searchDto.dateDecidedTo !== undefined || + searchDto.dateDecidedFrom !== undefined + ) { + query = this.joinDecision(query); + + // if (searchDto.resolutionNumber !== undefined) { + // query = query.andWhere( + // 'decision.resolution_number = :resolution_number', + // { + // resolution_number: searchDto.resolutionNumber, + // }, + // ); + // } + // + // if (searchDto.resolutionYear !== undefined) { + // query = query.andWhere('decision.resolution_year = :resolution_year', { + // resolution_year: searchDto.resolutionYear, + // }); + // } + } + return query; + } + + private joinDecision(query: any) { + query = query.leftJoin( + NoticeOfIntentDecision, + 'decision', + 'decision.notice_of_intent_uuid = "noiSearch"."notice_of_intent_uuid"', + ); + return query; + } + + private compileParcelSearchQuery(searchDto: SearchRequestDto, query) { + if (searchDto.pid || searchDto.civicAddress) { + query = query.leftJoin( + NoticeOfIntentParcel, + 'parcel', + 'parcel.notice_of_intent_submission_uuid = noiSearch.uuid', + ); + } + + if (searchDto.pid) { + query = query.andWhere('parcel.pid = :pid', { pid: searchDto.pid }); + } + + if (searchDto.civicAddress) { + query = query.andWhere('parcel.civic_address like :civic_address', { + civic_address: `%${searchDto.civicAddress}%`, + }); + } + return query; + } + + private compileSearchByNameQuery(searchDto: SearchRequestDto, query) { + if (searchDto.name) { + const formattedSearchString = + formatStringToPostgresSearchStringArrayWithWildCard(searchDto.name!); + + query = query + .leftJoin( + NoticeOfIntentOwner, + 'notice_of_intent_owner', + 'notice_of_intent_owner.notice_of_intent_submission_uuid = noiSearch.uuid', + ) + .andWhere( + new Brackets((qb) => + qb + .where( + "LOWER(notice_of_intent_owner.first_name || ' ' || notice_of_intent_owner.last_name) LIKE ANY (:names)", + { + names: formattedSearchString, + }, + ) + .orWhere( + 'LOWER(notice_of_intent_owner.first_name) LIKE ANY (:names)', + { + names: formattedSearchString, + }, + ) + .orWhere( + 'LOWER(notice_of_intent_owner.last_name) LIKE ANY (:names)', + { + names: formattedSearchString, + }, + ) + .orWhere( + 'LOWER(notice_of_intent_owner.organization_name) LIKE ANY (:names)', + { + names: formattedSearchString, + }, + ), + ), + ); + } + return query; + } +} diff --git a/services/apps/alcs/src/portal/public/search/notification/public-notification-search-view.entity.ts b/services/apps/alcs/src/portal/public/search/notification/public-notification-search-view.entity.ts new file mode 100644 index 0000000000..f553def390 --- /dev/null +++ b/services/apps/alcs/src/portal/public/search/notification/public-notification-search-view.entity.ts @@ -0,0 +1,89 @@ +import { + DataSource, + JoinColumn, + ManyToOne, + PrimaryColumn, + ViewColumn, + ViewEntity, +} from 'typeorm'; +import { LocalGovernment } from '../../../../alcs/local-government/local-government.entity'; +import { NotificationType } from '../../../../alcs/notification/notification-type/notification-type.entity'; +import { Notification } from '../../../../alcs/notification/notification.entity'; +import { NotificationSubmission } from '../../../notification-submission/notification-submission.entity'; +import { LinkedStatusType } from '../public-search.dto'; + +@ViewEntity({ + expression: (datasource: DataSource) => + datasource + .createQueryBuilder() + .select('noti_sub.uuid', 'uuid') + .addSelect('noti_sub.file_number', 'file_number') + .addSelect('noti_sub.applicant', 'applicant') + .addSelect('noti_sub.local_government_uuid', 'local_government_uuid') + .addSelect('localGovernment.name', 'local_government_name') + .addSelect('noti.type_code', 'notification_type_code') + .addSelect('noti.date_submitted_to_alc', 'date_submitted_to_alc') + .addSelect('noti.uuid', 'notification_uuid') + .addSelect('noti.region_code', 'notification_region_code') + .addSelect( + 'alcs.get_current_status_for_notification_submission_by_uuid(noti_sub.uuid)', + 'status', + ) + .from(NotificationSubmission, 'noti_sub') + .innerJoin( + Notification, + 'noti', + 'noti.file_number = noti_sub.file_number', + ) + .innerJoinAndSelect( + NotificationType, + 'notificationType', + 'noti_sub.type_code = notificationType.code', + ) + .leftJoin( + LocalGovernment, + 'localGovernment', + 'noti.local_government_uuid = localGovernment.uuid', + ) + .where( + "alcs.get_current_status_for_notification_submission_by_uuid(noti_sub.uuid)->>'status_type_code' = 'ALCR'", + ), +}) +export class PublicNotificationSubmissionSearchView { + @ViewColumn() + @PrimaryColumn() + uuid: string; + + @ViewColumn() + notificationUuid: string; + + @ViewColumn() + notificationRegionCode?: string; + + @ViewColumn() + fileNumber: string; + + @ViewColumn() + applicant?: string; + + @ViewColumn() + localGovernmentUuid?: string; + + @ViewColumn() + localGovernmentName?: string; + + @ViewColumn() + notificationTypeCode: string; + + @ViewColumn() + status: LinkedStatusType; + + @ViewColumn() + dateSubmittedToAlc: Date | null; + + @ManyToOne(() => NotificationType, { + nullable: false, + }) + @JoinColumn({ name: 'notification_type_code' }) + notificationType: NotificationType; +} diff --git a/services/apps/alcs/src/portal/public/search/notification/public-notification-search.service.spec.ts b/services/apps/alcs/src/portal/public/search/notification/public-notification-search.service.spec.ts new file mode 100644 index 0000000000..9b4787db8d --- /dev/null +++ b/services/apps/alcs/src/portal/public/search/notification/public-notification-search.service.spec.ts @@ -0,0 +1,107 @@ +import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; +import { Test, TestingModule } from '@nestjs/testing'; +import { getRepositoryToken } from '@nestjs/typeorm'; +import { Repository } from 'typeorm'; +import { LocalGovernment } from '../../../../alcs/local-government/local-government.entity'; +import { SearchRequestDto } from '../public-search.dto'; +import { PublicNotificationSearchService } from './public-notification-search.service'; +import { PublicNotificationSubmissionSearchView } from './public-notification-search-view.entity'; + +describe('PublicNotificationSearchService', () => { + let service: PublicNotificationSearchService; + let mockNotificationSubmissionSearchViewRepository: DeepMocked< + Repository<PublicNotificationSubmissionSearchView> + >; + let mockLocalGovernmentRepository: DeepMocked<Repository<LocalGovernment>>; + + const mockSearchDto: SearchRequestDto = { + fileNumber: '123', + portalStatusCode: 'A', + governmentName: 'B', + regionCode: 'C', + name: 'D', + pid: 'E', + civicAddress: 'F', + dateDecidedFrom: new Date('2020-11-10').getTime(), + dateDecidedTo: new Date('2021-11-10').getTime(), + fileTypes: ['type1', 'type2'], + page: 1, + pageSize: 10, + sortField: 'ownerName', + sortDirection: 'ASC', + }; + + let mockQuery: any = {}; + + beforeEach(async () => { + mockNotificationSubmissionSearchViewRepository = createMock(); + mockLocalGovernmentRepository = createMock(); + + mockQuery = { + getManyAndCount: jest.fn().mockResolvedValue([[], 0]), + orderBy: jest.fn().mockReturnThis(), + offset: jest.fn().mockReturnThis(), + limit: jest.fn().mockReturnThis(), + innerJoinAndMapOne: jest.fn().mockReturnThis(), + groupBy: jest.fn().mockReturnThis(), + where: jest.fn().mockReturnThis(), + andWhere: jest.fn().mockReturnThis(), + setParameters: jest.fn().mockReturnThis(), + leftJoin: jest.fn().mockReturnThis(), + }; + + const module: TestingModule = await Test.createTestingModule({ + providers: [ + PublicNotificationSearchService, + { + provide: getRepositoryToken(PublicNotificationSubmissionSearchView), + useValue: mockNotificationSubmissionSearchViewRepository, + }, + { + provide: getRepositoryToken(LocalGovernment), + useValue: mockLocalGovernmentRepository, + }, + ], + }).compile(); + + service = module.get<PublicNotificationSearchService>( + PublicNotificationSearchService, + ); + + mockLocalGovernmentRepository.findOneByOrFail.mockResolvedValue( + new LocalGovernment(), + ); + }); + + it('should be defined', () => { + expect(service).toBeDefined(); + }); + + it('should successfully build a query using all search parameters defined', async () => { + mockNotificationSubmissionSearchViewRepository.createQueryBuilder.mockReturnValue( + mockQuery as any, + ); + + const result = await service.search(mockSearchDto); + + expect(result).toEqual({ data: [], total: 0 }); + expect( + mockNotificationSubmissionSearchViewRepository.createQueryBuilder, + ).toBeCalledTimes(1); + expect(mockQuery.andWhere).toBeCalledTimes(7); + }); + + it('should call compileNotificationSearchQuery method correctly', async () => { + const compileSearchQuerySpy = jest + .spyOn(service as any, 'compileNotificationSearchQuery') + .mockResolvedValue(mockQuery); + + const result = await service.search(mockSearchDto); + + expect(result).toEqual({ data: [], total: 0 }); + expect(compileSearchQuerySpy).toBeCalledWith(mockSearchDto); + expect(mockQuery.orderBy).toHaveBeenCalledTimes(1); + expect(mockQuery.offset).toHaveBeenCalledTimes(1); + expect(mockQuery.limit).toHaveBeenCalledTimes(1); + }); +}); diff --git a/services/apps/alcs/src/portal/public/search/notification/public-notification-search.service.ts b/services/apps/alcs/src/portal/public/search/notification/public-notification-search.service.ts new file mode 100644 index 0000000000..c06df8e22d --- /dev/null +++ b/services/apps/alcs/src/portal/public/search/notification/public-notification-search.service.ts @@ -0,0 +1,215 @@ +import { Injectable } from '@nestjs/common'; +import { InjectRepository } from '@nestjs/typeorm'; +import { Brackets, Repository } from 'typeorm'; +import { LocalGovernment } from '../../../../alcs/local-government/local-government.entity'; +import { formatStringToPostgresSearchStringArrayWithWildCard } from '../../../../utils/search-helper'; +import { NotificationParcel } from '../../../notification-submission/notification-parcel/notification-parcel.entity'; +import { NotificationTransferee } from '../../../notification-submission/notification-transferee/notification-transferee.entity'; +import { + AdvancedSearchResultDto, + SearchRequestDto, +} from '../public-search.dto'; +import { PublicNotificationSubmissionSearchView } from './public-notification-search-view.entity'; + +@Injectable() +export class PublicNotificationSearchService { + constructor( + @InjectRepository(PublicNotificationSubmissionSearchView) + private notificationSearchViewRepo: Repository<PublicNotificationSubmissionSearchView>, + @InjectRepository(LocalGovernment) + private governmentRepository: Repository<LocalGovernment>, + ) {} + + async search( + searchDto: SearchRequestDto, + ): Promise< + AdvancedSearchResultDto<PublicNotificationSubmissionSearchView[]> + > { + let query = await this.compileNotificationSearchQuery(searchDto); + + query = this.compileGroupBySearchQuery(query); + + const sortQuery = this.compileSortQuery(searchDto); + + query = query + .orderBy(sortQuery, searchDto.sortDirection) + .offset((searchDto.page - 1) * searchDto.pageSize) + .limit(searchDto.pageSize); + + const result = await query.getManyAndCount(); + + return { + data: result[0], + total: result[1], + }; + } + + private compileSortQuery(searchDto: SearchRequestDto) { + switch (searchDto.sortField) { + case 'fileId': + return '"notificationSearch"."file_number"'; + + case 'ownerName': + return '"notificationSearch"."applicant"'; + + case 'type': + return '"notificationSearch"."notification_type_code"'; + + case 'government': + return '"notificationSearch"."local_government_name"'; + + case 'portalStatus': + return `"notificationSearch"."status" ->> 'label' `; + + default: + case 'dateSubmitted': + return '"notificationSearch"."date_submitted_to_alc"'; + } + } + + private compileGroupBySearchQuery(query) { + query = query + .innerJoinAndMapOne( + 'notificationSearch.notificationType', + 'notificationSearch.notificationType', + 'notificationType', + ) + .groupBy( + ` + "notificationSearch"."uuid" + , "notificationSearch"."notification_uuid" + , "notificationSearch"."notification_region_code" + , "notificationSearch"."file_number" + , "notificationSearch"."applicant" + , "notificationSearch"."local_government_uuid" + , "notificationSearch"."local_government_name" + , "notificationSearch"."notification_type_code" + , "notificationSearch"."status" + , "notificationSearch"."date_submitted_to_alc" + , "notificationType"."audit_deleted_date_at" + , "notificationType"."audit_created_at" + , "notificationType"."audit_updated_by" + , "notificationType"."audit_updated_at" + , "notificationType"."audit_created_by" + , "notificationType"."short_label" + , "notificationType"."label" + , "notificationType"."code" + , "notificationType"."html_description" + , "notificationType"."portal_label" + `, + ); + return query; + } + + private async compileNotificationSearchQuery(searchDto: SearchRequestDto) { + let query = + this.notificationSearchViewRepo.createQueryBuilder('notificationSearch'); + + if (searchDto.fileNumber) { + query = query + .andWhere('notificationSearch.file_number = :fileNumber') + .setParameters({ fileNumber: searchDto.fileNumber ?? null }); + } + + if (searchDto.portalStatusCode) { + query = query.andWhere( + "alcs.get_current_status_for_notification_submission_by_uuid(notificationSearch.uuid) ->> 'status_type_code' = :status", + { + status: searchDto.portalStatusCode, + }, + ); + } + + if (searchDto.governmentName) { + const government = await this.governmentRepository.findOneByOrFail({ + name: searchDto.governmentName, + }); + + query = query.andWhere( + 'notificationSearch.local_government_uuid = :local_government_uuid', + { + local_government_uuid: government.uuid, + }, + ); + } + + if (searchDto.regionCode) { + query = query.andWhere( + 'notificationSearch.notification_region_code = :region_code', + { + region_code: searchDto.regionCode, + }, + ); + } + + query = this.compileSearchByNameQuery(searchDto, query); + query = this.compileParcelSearchQuery(searchDto, query); + + return query; + } + + private compileParcelSearchQuery(searchDto: SearchRequestDto, query) { + if (searchDto.pid || searchDto.civicAddress) { + query = query.leftJoin( + NotificationParcel, + 'parcel', + 'parcel.notification_submission_uuid = notificationSearch.uuid', + ); + } + + if (searchDto.pid) { + query = query.andWhere('parcel.pid = :pid', { pid: searchDto.pid }); + } + + if (searchDto.civicAddress) { + query = query.andWhere('parcel.civic_address like :civic_address', { + civic_address: `%${searchDto.civicAddress}%`, + }); + } + return query; + } + + private compileSearchByNameQuery(searchDto: SearchRequestDto, query) { + if (searchDto.name) { + const formattedSearchString = + formatStringToPostgresSearchStringArrayWithWildCard(searchDto.name!); + + query = query + .leftJoin( + NotificationTransferee, + 'notification_transferee', + 'notification_transferee.notification_submission_uuid = notificationSearch.uuid', + ) + .andWhere( + new Brackets((qb) => + qb + .where( + "LOWER(notification_transferee.first_name || ' ' || notification_transferee.last_name) LIKE ANY (:names)", + { + names: formattedSearchString, + }, + ) + .orWhere( + 'LOWER(notification_transferee.first_name) LIKE ANY (:names)', + { + names: formattedSearchString, + }, + ) + .orWhere( + 'LOWER(notification_transferee.last_name) LIKE ANY (:names)', + { + names: formattedSearchString, + }, + ) + .orWhere( + 'LOWER(notification_transferee.organization_name) LIKE ANY (:names)', + { + names: formattedSearchString, + }, + ), + ), + ); + } + return query; + } +} diff --git a/services/apps/alcs/src/portal/public/search/public-search.controller.spec.ts b/services/apps/alcs/src/portal/public/search/public-search.controller.spec.ts new file mode 100644 index 0000000000..5c00d6a9d4 --- /dev/null +++ b/services/apps/alcs/src/portal/public/search/public-search.controller.spec.ts @@ -0,0 +1,243 @@ +import { classes } from '@automapper/classes'; +import { AutomapperModule } from '@automapper/nestjs'; +import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; +import { Test, TestingModule } from '@nestjs/testing'; +import { ClsService } from 'nestjs-cls'; +import { mockKeyCloakProviders } from '../../../../test/mocks/mockTypes'; +import { Application } from '../../../alcs/application/application.entity'; +import { NoticeOfIntent } from '../../../alcs/notice-of-intent/notice-of-intent.entity'; +import { Notification } from '../../../alcs/notification/notification.entity'; +import { PublicApplicationSearchService } from './application/public-application-search.service'; +import { PublicNoticeOfIntentSearchService } from './notice-of-intent/public-notice-of-intent-search.service'; +import { PublicNotificationSearchService } from './notification/public-notification-search.service'; +import { PublicSearchController } from './public-search.controller'; +import { SearchRequestDto } from './public-search.dto'; +import { PublicSearchService } from './public-search.service'; + +describe('PublicSearchController', () => { + let controller: PublicSearchController; + let mockSearchService: DeepMocked<PublicSearchService>; + let mockNoticeOfIntentAdvancedSearchService: DeepMocked<PublicNoticeOfIntentSearchService>; + let mockApplicationAdvancedSearchService: DeepMocked<PublicApplicationSearchService>; + let mockNotificationAdvancedSearchService: DeepMocked<PublicNotificationSearchService>; + + beforeEach(async () => { + mockSearchService = createMock(); + mockNoticeOfIntentAdvancedSearchService = createMock(); + mockApplicationAdvancedSearchService = createMock(); + mockNotificationAdvancedSearchService = createMock(); + + const module: TestingModule = await Test.createTestingModule({ + imports: [ + AutomapperModule.forRoot({ + strategyInitializer: classes(), + }), + ], + providers: [ + { + provide: PublicSearchService, + useValue: mockSearchService, + }, + { + provide: PublicNoticeOfIntentSearchService, + useValue: mockNoticeOfIntentAdvancedSearchService, + }, + { + provide: PublicApplicationSearchService, + useValue: mockApplicationAdvancedSearchService, + }, + { + provide: PublicNotificationSearchService, + useValue: mockNotificationAdvancedSearchService, + }, + { + provide: ClsService, + useValue: {}, + }, + ...mockKeyCloakProviders, + ], + controllers: [PublicSearchController], + }).compile(); + + controller = module.get<PublicSearchController>(PublicSearchController); + + mockSearchService.getApplication.mockResolvedValue(new Application()); + mockSearchService.getNoi.mockResolvedValue(new NoticeOfIntent()); + mockSearchService.getNotification.mockResolvedValue(new Notification()); + + mockNoticeOfIntentAdvancedSearchService.searchNoticeOfIntents.mockResolvedValue( + { + data: [], + total: 0, + }, + ); + + mockApplicationAdvancedSearchService.searchApplications.mockResolvedValue({ + data: [], + total: 0, + }); + + mockNotificationAdvancedSearchService.search.mockResolvedValue({ + data: [], + total: 0, + }); + }); + + it('should be defined', () => { + expect(controller).toBeDefined(); + }); + + it('should call search to retrieve Applications, NOIs, PlanningReviews, Covenants, Notifications', async () => { + const mockSearchRequestDto = { + pageSize: 1, + page: 1, + sortField: '1', + sortDirection: 'ASC', + isIncludeOtherParcels: false, + name: 'test', + fileTypes: [], + }; + + const result = await controller.search( + mockSearchRequestDto as SearchRequestDto, + ); + + expect( + mockApplicationAdvancedSearchService.searchApplications, + ).toBeCalledTimes(1); + expect( + mockApplicationAdvancedSearchService.searchApplications, + ).toBeCalledWith(mockSearchRequestDto); + expect(result.applications).toBeDefined(); + expect(result.totalApplications).toBe(0); + + expect( + mockNoticeOfIntentAdvancedSearchService.searchNoticeOfIntents, + ).toBeCalledTimes(1); + expect( + mockNoticeOfIntentAdvancedSearchService.searchNoticeOfIntents, + ).toBeCalledWith(mockSearchRequestDto); + expect(result.noticeOfIntents).toBeDefined(); + expect(result.totalNoticeOfIntents).toBe(0); + }); + + it('should call applications advanced search to retrieve Applications', async () => { + const mockSearchRequestDto = { + pageSize: 1, + page: 1, + sortField: '1', + sortDirection: 'ASC', + isIncludeOtherParcels: false, + fileTypes: [], + }; + + const result = await controller.advancedSearchApplications( + mockSearchRequestDto as SearchRequestDto, + ); + + expect( + mockApplicationAdvancedSearchService.searchApplications, + ).toBeCalledTimes(1); + expect( + mockApplicationAdvancedSearchService.searchApplications, + ).toBeCalledWith(mockSearchRequestDto); + expect(result.data).toBeDefined(); + expect(result.total).toBe(0); + }); + + it('should call NOI advanced search to retrieve NOIs', async () => { + const mockSearchRequestDto = { + pageSize: 1, + page: 1, + sortField: '1', + sortDirection: 'ASC', + fileTypes: [], + }; + + const result = await controller.advancedSearchNoticeOfIntents( + mockSearchRequestDto as SearchRequestDto, + ); + + expect( + mockNoticeOfIntentAdvancedSearchService.searchNoticeOfIntents, + ).toBeCalledTimes(1); + expect( + mockNoticeOfIntentAdvancedSearchService.searchNoticeOfIntents, + ).toBeCalledWith(mockSearchRequestDto); + expect(result.data).toBeDefined(); + expect(result.total).toBe(0); + }); + + it('should call search to retrieve Applications only when application file type selected', async () => { + const mockSearchRequestDto = { + pageSize: 1, + page: 1, + sortField: '1', + sortDirection: 'ASC', + fileTypes: ['NFUP'], + }; + + const result = await controller.search( + mockSearchRequestDto as SearchRequestDto, + ); + + expect( + mockApplicationAdvancedSearchService.searchApplications, + ).toBeCalledTimes(1); + expect( + mockApplicationAdvancedSearchService.searchApplications, + ).toBeCalledWith(mockSearchRequestDto); + expect(result.applications).toBeDefined(); + expect(result.totalApplications).toBe(0); + }); + + it('should call search to retrieve NOIs only when NOI file type selected', async () => { + const mockSearchRequestDto = { + pageSize: 1, + page: 1, + sortField: '1', + sortDirection: 'ASC', + fileTypes: ['NOI'], + }; + + const result = await controller.search( + mockSearchRequestDto as SearchRequestDto, + ); + + expect( + mockNoticeOfIntentAdvancedSearchService.searchNoticeOfIntents, + ).toBeCalledTimes(1); + expect( + mockNoticeOfIntentAdvancedSearchService.searchNoticeOfIntents, + ).toBeCalledWith(mockSearchRequestDto); + expect(result.noticeOfIntents).toBeDefined(); + expect(result.totalNoticeOfIntents).toBe(0); + }); + + it('should NOT call NOI search to retrieve if file type app specified', async () => { + const mockSearchRequestDto: SearchRequestDto = { + pageSize: 1, + page: 1, + sortField: '1', + sortDirection: 'ASC', + fileTypes: ['NFUP'], + }; + + const result = await controller.search(mockSearchRequestDto); + + expect( + mockApplicationAdvancedSearchService.searchApplications, + ).toBeCalledTimes(1); + expect( + mockApplicationAdvancedSearchService.searchApplications, + ).toBeCalledWith(mockSearchRequestDto); + expect(result.applications).toBeDefined(); + expect(result.totalApplications).toBe(0); + + expect( + mockNoticeOfIntentAdvancedSearchService.searchNoticeOfIntents, + ).toBeCalledTimes(0); + expect(result.noticeOfIntents).toBeDefined(); + expect(result.totalNoticeOfIntents).toBe(0); + }); +}); diff --git a/services/apps/alcs/src/portal/public/search/public-search.controller.ts b/services/apps/alcs/src/portal/public/search/public-search.controller.ts new file mode 100644 index 0000000000..f16d98dd5a --- /dev/null +++ b/services/apps/alcs/src/portal/public/search/public-search.controller.ts @@ -0,0 +1,271 @@ +import { Mapper } from '@automapper/core'; +import { InjectMapper } from '@automapper/nestjs'; +import { Body, Controller, Post } from '@nestjs/common'; +import { ApplicationType } from '../../../alcs/code/application-code/application-type/application-type.entity'; +import { isStringSetAndNotEmpty } from '../../../utils/string-helper'; +import { ApplicationTypeDto } from '../../code/code.dto'; +import { APPLICATION_SUBMISSION_TYPES } from '../../pdf-generation/generate-submission-document.service'; +import { PublicApplicationSearchService } from './application/public-application-search.service'; +import { PublicApplicationSubmissionSearchView } from './application/public-application-search-view.entity'; +import { PublicNoticeOfIntentSearchService } from './notice-of-intent/public-notice-of-intent-search.service'; +import { PublicNoticeOfIntentSubmissionSearchView } from './notice-of-intent/public-notice-of-intent-search-view.entity'; +import { PublicNotificationSearchService } from './notification/public-notification-search.service'; +import { PublicNotificationSubmissionSearchView } from './notification/public-notification-search-view.entity'; +import { + AdvancedSearchResponseDto, + AdvancedSearchResultDto, + ApplicationSearchResultDto, + NoticeOfIntentSearchResultDto, + NotificationSearchResultDto, + SearchRequestDto, +} from './public-search.dto'; +import { PublicSearchService } from './public-search.service'; + +@Controller('search') +export class PublicSearchController { + constructor( + private searchService: PublicSearchService, + @InjectMapper() private mapper: Mapper, + private noticeOfIntentSearchService: PublicNoticeOfIntentSearchService, + private applicationSearchService: PublicApplicationSearchService, + private notificationSearchService: PublicNotificationSearchService, + ) {} + + @Post('/') + async search(@Body() searchDto: SearchRequestDto) { + const { searchApplications, searchNoi, searchNotifications } = + this.getEntitiesTypeToSearch(searchDto); + + let applicationSearchResult: AdvancedSearchResultDto< + PublicApplicationSubmissionSearchView[] + > | null = null; + if (searchApplications) { + applicationSearchResult = + await this.applicationSearchService.searchApplications(searchDto); + } + + let noticeOfIntentResults: AdvancedSearchResultDto< + PublicNoticeOfIntentSubmissionSearchView[] + > | null = null; + if (searchNoi) { + noticeOfIntentResults = + await this.noticeOfIntentSearchService.searchNoticeOfIntents(searchDto); + } + + let notifications: AdvancedSearchResultDto< + PublicNotificationSubmissionSearchView[] + > | null = null; + if (searchNotifications) { + notifications = await this.notificationSearchService.search(searchDto); + } + + return this.mapAdvancedSearchResults( + applicationSearchResult, + noticeOfIntentResults, + notifications, + ); + } + + @Post('/application') + async advancedSearchApplications( + @Body() searchDto: SearchRequestDto, + ): Promise<AdvancedSearchResultDto<ApplicationSearchResultDto[]>> { + const applications = await this.applicationSearchService.searchApplications( + searchDto, + ); + + const mappedSearchResult = this.mapAdvancedSearchResults( + applications, + null, + null, + ); + + return { + total: mappedSearchResult.totalApplications, + data: mappedSearchResult.applications, + }; + } + + @Post('/notice-of-intent') + async advancedSearchNoticeOfIntents( + @Body() searchDto: SearchRequestDto, + ): Promise<AdvancedSearchResultDto<NoticeOfIntentSearchResultDto[]>> { + const noticeOfIntents = + await this.noticeOfIntentSearchService.searchNoticeOfIntents(searchDto); + + const mappedSearchResult = this.mapAdvancedSearchResults( + null, + noticeOfIntents, + null, + ); + + return { + total: mappedSearchResult.totalNoticeOfIntents, + data: mappedSearchResult.noticeOfIntents, + }; + } + + @Post('/notifications') + async advancedSearchNotifications( + @Body() searchDto: SearchRequestDto, + ): Promise<AdvancedSearchResultDto<NotificationSearchResultDto[]>> { + const notifications = await this.notificationSearchService.search( + searchDto, + ); + + const mappedSearchResult = this.mapAdvancedSearchResults( + null, + null, + notifications, + ); + + return { + total: mappedSearchResult.totalNotifications, + data: mappedSearchResult.notifications, + }; + } + + private getEntitiesTypeToSearch(searchDto: SearchRequestDto) { + let searchApplications = true; + let noiTypeSpecified = false; + let notificationTypeSpecified = false; + + if (searchDto.fileTypes.length > 0) { + searchApplications = + searchDto.fileTypes.filter((searchType) => + Object.values(APPLICATION_SUBMISSION_TYPES).includes( + APPLICATION_SUBMISSION_TYPES[ + searchType as keyof typeof APPLICATION_SUBMISSION_TYPES + ], + ), + ).length > 0; + + noiTypeSpecified = searchDto.fileTypes.includes('NOI'); + notificationTypeSpecified = searchDto.fileTypes.includes('SRW'); + } + + const searchNoi = searchDto.fileTypes.length > 0 ? noiTypeSpecified : true; + + const searchNotifications = + (searchDto.fileTypes.length > 0 ? notificationTypeSpecified : true) && + !searchDto.dateDecidedFrom && + !searchDto.dateDecidedTo && + !isStringSetAndNotEmpty(searchDto.civicAddress); + + return { + searchApplications, + searchNoi, + searchNotifications, + }; + } + + private mapAdvancedSearchResults( + applications: AdvancedSearchResultDto< + PublicApplicationSubmissionSearchView[] + > | null, + noticeOfIntents: AdvancedSearchResultDto< + PublicNoticeOfIntentSubmissionSearchView[] + > | null, + notifications: AdvancedSearchResultDto< + PublicNotificationSubmissionSearchView[] + > | null, + ) { + const response = new AdvancedSearchResponseDto(); + + const mappedApplications: ApplicationSearchResultDto[] = []; + if (applications && applications.data.length > 0) { + mappedApplications.push( + ...applications.data.map((app) => + this.mapApplicationToAdvancedSearchResult(app), + ), + ); + } + + const mappedNoticeOfIntents: NoticeOfIntentSearchResultDto[] = []; + if (noticeOfIntents && noticeOfIntents.data.length > 0) { + mappedNoticeOfIntents.push( + ...noticeOfIntents.data.map((noi) => + this.mapNoticeOfIntentToAdvancedSearchResult(noi), + ), + ); + } + + const mappedNotifications: NotificationSearchResultDto[] = []; + if (notifications && notifications.data && notifications.data.length > 0) { + mappedNotifications.push( + ...notifications.data.map((notification) => + this.mapNotificationToAdvancedSearchResult(notification), + ), + ); + } + + response.applications = mappedApplications; + response.totalApplications = applications?.total ?? 0; + response.noticeOfIntents = mappedNoticeOfIntents; + response.totalNoticeOfIntents = noticeOfIntents?.total ?? 0; + response.notifications = mappedNotifications; + response.totalNotifications = notifications?.total ?? 0; + + return response; + } + + private mapApplicationToAdvancedSearchResult( + application: PublicApplicationSubmissionSearchView, + ): ApplicationSearchResultDto { + return { + referenceId: application.fileNumber, + fileNumber: application.fileNumber, + dateSubmitted: application.dateSubmittedToAlc?.getTime(), + type: this.mapper.map( + application.applicationType, + ApplicationType, + ApplicationTypeDto, + ), + lastUpdate: application.lastUpdate?.getTime(), + localGovernmentName: application.localGovernmentName, + ownerName: application.applicant, + class: 'APP', + status: application.status.status_type_code, + }; + } + + private mapNoticeOfIntentToAdvancedSearchResult( + noi: PublicNoticeOfIntentSubmissionSearchView, + ): NoticeOfIntentSearchResultDto { + return { + referenceId: noi.fileNumber, + fileNumber: noi.fileNumber, + lastUpdate: noi.lastUpdate?.getTime(), + dateSubmitted: noi.dateSubmittedToAlc?.getTime(), + type: this.mapper.map( + noi.noticeOfIntentType, + ApplicationType, + ApplicationTypeDto, + ), + localGovernmentName: noi.localGovernmentName, + ownerName: noi.applicant, + class: 'NOI', + status: noi.status.status_type_code, + }; + } + + private mapNotificationToAdvancedSearchResult( + notification: PublicNotificationSubmissionSearchView, + ): NoticeOfIntentSearchResultDto { + return { + referenceId: notification.fileNumber, + fileNumber: notification.fileNumber, + lastUpdate: notification.status.effective_date.getTime(), + dateSubmitted: notification.dateSubmittedToAlc?.getTime(), + type: this.mapper.map( + notification.notificationType, + ApplicationType, + ApplicationTypeDto, + ), + localGovernmentName: notification.localGovernmentName, + ownerName: notification.applicant, + class: 'NOTI', + status: notification.status.status_type_code, + }; + } +} diff --git a/services/apps/alcs/src/portal/public/search/public-search.dto.ts b/services/apps/alcs/src/portal/public/search/public-search.dto.ts new file mode 100644 index 0000000000..3b8490385a --- /dev/null +++ b/services/apps/alcs/src/portal/public/search/public-search.dto.ts @@ -0,0 +1,129 @@ +import { + IsArray, + IsNumber, + IsOptional, + IsString, + MinLength, +} from 'class-validator'; +import { ApplicationTypeDto } from '../../code/code.dto'; + +export type SearchEntityClass = 'APP' | 'NOI' | 'NOTI'; + +export class ApplicationSearchResultDto { + type: ApplicationTypeDto; + referenceId: string; + ownerName?: string; + localGovernmentName?: string; + fileNumber: string; + boardCode?: string; + status: string; + dateSubmitted?: number; + lastUpdate?: number; + class: SearchEntityClass; +} + +export class NoticeOfIntentSearchResultDto { + type: ApplicationTypeDto; + referenceId: string; + ownerName?: string; + localGovernmentName?: string; + fileNumber: string; + boardCode?: string; + status: string; + dateSubmitted?: number; + lastUpdate?: number; + class: SearchEntityClass; +} + +export class NotificationSearchResultDto { + type: ApplicationTypeDto; + referenceId: string; + ownerName?: string; + localGovernmentName?: string; + fileNumber: string; + boardCode?: string; + status: string; + dateSubmitted?: number; + lastUpdate?: number; + class: SearchEntityClass; +} + +export class AdvancedSearchResponseDto { + applications: ApplicationSearchResultDto[]; + noticeOfIntents: NoticeOfIntentSearchResultDto[]; + notifications: NotificationSearchResultDto[]; + totalApplications: number; + totalNoticeOfIntents: number; + totalNotifications: number; +} + +export class AdvancedSearchResultDto<T> { + data: T; + total: number; +} + +export class PagingRequestDto { + @IsNumber() + page: number; + + @IsNumber() + pageSize: number; + + @IsString() + sortField: string; + + @IsString() + sortDirection: 'ASC' | 'DESC'; +} + +export class SearchRequestDto extends PagingRequestDto { + @IsString() + @IsOptional() + fileNumber?: string; + + @IsString() + @IsOptional() + @MinLength(3) + name?: string; + + @IsString() + @IsOptional() + @MinLength(9) + pid?: string; + + @IsString() + @IsOptional() + @MinLength(3) + civicAddress?: string; + + @IsString() + @IsOptional() + portalStatusCode?: string; + + @IsString() + @IsOptional() + governmentName?: string; + + @IsString() + @IsOptional() + regionCode?: string; + + @IsNumber() + @IsOptional() + dateDecidedFrom?: number; + + @IsNumber() + @IsOptional() + dateDecidedTo?: number; + + @IsArray() + fileTypes: string[]; +} + +// typeorm does not transform property names for the status +export class LinkedStatusType { + submission_uuid: string; + status_type_code: string; + effective_date: Date; + label: string; +} diff --git a/services/apps/alcs/src/portal/public/search/public-search.module.ts b/services/apps/alcs/src/portal/public/search/public-search.module.ts new file mode 100644 index 0000000000..25d05f80b2 --- /dev/null +++ b/services/apps/alcs/src/portal/public/search/public-search.module.ts @@ -0,0 +1,38 @@ +import { Module } from '@nestjs/common'; +import { TypeOrmModule } from '@nestjs/typeorm'; +import { Application } from '../../../alcs/application/application.entity'; +import { LocalGovernment } from '../../../alcs/local-government/local-government.entity'; +import { NoticeOfIntent } from '../../../alcs/notice-of-intent/notice-of-intent.entity'; +import { Notification } from '../../../alcs/notification/notification.entity'; +import { ApplicationProfile } from '../../../common/automapper/application.automapper.profile'; +import { PublicApplicationSearchService } from './application/public-application-search.service'; +import { PublicApplicationSubmissionSearchView } from './application/public-application-search-view.entity'; +import { PublicNoticeOfIntentSearchService } from './notice-of-intent/public-notice-of-intent-search.service'; +import { PublicNoticeOfIntentSubmissionSearchView } from './notice-of-intent/public-notice-of-intent-search-view.entity'; +import { PublicNotificationSearchService } from './notification/public-notification-search.service'; +import { PublicNotificationSubmissionSearchView } from './notification/public-notification-search-view.entity'; +import { PublicSearchController } from './public-search.controller'; +import { PublicSearchService } from './public-search.service'; + +@Module({ + imports: [ + TypeOrmModule.forFeature([ + Application, + NoticeOfIntent, + Notification, + LocalGovernment, + PublicApplicationSubmissionSearchView, + PublicNoticeOfIntentSubmissionSearchView, + PublicNotificationSubmissionSearchView, + ]), + ], + providers: [ + PublicSearchService, + ApplicationProfile, + PublicApplicationSearchService, + PublicNoticeOfIntentSearchService, + PublicNotificationSearchService, + ], + controllers: [PublicSearchController], +}) +export class PublicSearchModule {} diff --git a/services/apps/alcs/src/portal/public/search/public-search.service.spec.ts b/services/apps/alcs/src/portal/public/search/public-search.service.spec.ts new file mode 100644 index 0000000000..20e747ad8c --- /dev/null +++ b/services/apps/alcs/src/portal/public/search/public-search.service.spec.ts @@ -0,0 +1,115 @@ +import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; +import { Test, TestingModule } from '@nestjs/testing'; +import { getRepositoryToken } from '@nestjs/typeorm'; +import { Repository } from 'typeorm'; +import { Application } from '../../../alcs/application/application.entity'; +import { LocalGovernment } from '../../../alcs/local-government/local-government.entity'; +import { NoticeOfIntent } from '../../../alcs/notice-of-intent/notice-of-intent.entity'; +import { PublicApplicationSubmissionSearchView } from './application/public-application-search-view.entity'; +import { PublicSearchService } from './public-search.service'; +import { Notification } from '../../../alcs/notification/notification.entity'; + +describe('PublicSearchService', () => { + let service: PublicSearchService; + let mockApplicationRepository: DeepMocked<Repository<Application>>; + let mockNoiRepository: DeepMocked<Repository<NoticeOfIntent>>; + let mockApplicationSubmissionSearchView: DeepMocked< + Repository<PublicApplicationSubmissionSearchView> + >; + let mockLocalGovernment: DeepMocked<Repository<LocalGovernment>>; + let mockNotificationRepository: DeepMocked<Repository<Notification>>; + + const fakeFileNumber = 'fake'; + + beforeEach(async () => { + mockApplicationRepository = createMock(); + mockNoiRepository = createMock(); + mockApplicationSubmissionSearchView = createMock(); + mockLocalGovernment = createMock(); + mockNotificationRepository = createMock(); + + const module: TestingModule = await Test.createTestingModule({ + providers: [ + PublicSearchService, + { + provide: getRepositoryToken(Application), + useValue: mockApplicationRepository, + }, + { + provide: getRepositoryToken(NoticeOfIntent), + useValue: mockNoiRepository, + }, + { + provide: getRepositoryToken(Notification), + useValue: mockNotificationRepository, + }, + { + provide: getRepositoryToken(PublicApplicationSubmissionSearchView), + useValue: mockApplicationSubmissionSearchView, + }, + { + provide: getRepositoryToken(LocalGovernment), + useValue: mockLocalGovernment, + }, + ], + }).compile(); + + service = module.get<PublicSearchService>(PublicSearchService); + }); + + it('should be defined', () => { + expect(service).toBeDefined(); + }); + + it('should call repository to get notice of intent', async () => { + mockNoiRepository.findOne.mockResolvedValue(new NoticeOfIntent()); + + const result = await service.getNoi('fake'); + + expect(mockNoiRepository.findOne).toBeCalledTimes(1); + expect(mockNoiRepository.findOne).toBeCalledWith({ + where: { + fileNumber: fakeFileNumber, + }, + relations: { + localGovernment: true, + }, + }); + expect(result).toBeDefined(); + }); + + it('should call repository to get application', async () => { + mockApplicationRepository.findOne.mockResolvedValue(new Application()); + + const result = await service.getApplication('fake'); + + expect(mockApplicationRepository.findOne).toBeCalledTimes(1); + expect(mockApplicationRepository.findOne).toBeCalledWith({ + where: { + fileNumber: fakeFileNumber, + }, + relations: { + localGovernment: true, + type: true, + }, + }); + expect(result).toBeDefined(); + }); + + it('should call repository to get notification', async () => { + mockNotificationRepository.findOne.mockResolvedValue(new Notification()); + + const result = await service.getNotification('fake'); + + expect(mockNotificationRepository.findOne).toBeCalledTimes(1); + expect(mockNotificationRepository.findOne).toBeCalledWith({ + where: { + fileNumber: fakeFileNumber, + }, + relations: { + localGovernment: true, + }, + }); + expect(result).toBeDefined(); + }); +}); diff --git a/services/apps/alcs/src/portal/public/search/public-search.service.ts b/services/apps/alcs/src/portal/public/search/public-search.service.ts new file mode 100644 index 0000000000..0b9ae87c93 --- /dev/null +++ b/services/apps/alcs/src/portal/public/search/public-search.service.ts @@ -0,0 +1,52 @@ +import { Injectable } from '@nestjs/common'; +import { InjectRepository } from '@nestjs/typeorm'; +import { Repository } from 'typeorm'; +import { Application } from '../../../alcs/application/application.entity'; +import { NoticeOfIntent } from '../../../alcs/notice-of-intent/notice-of-intent.entity'; +import { Notification } from '../../../alcs/notification/notification.entity'; + +@Injectable() +export class PublicSearchService { + constructor( + @InjectRepository(Application) + private applicationRepository: Repository<Application>, + @InjectRepository(NoticeOfIntent) + private noiRepository: Repository<NoticeOfIntent>, + @InjectRepository(Notification) + private notificationRepository: Repository<Notification>, + ) {} + + async getApplication(fileNumber: string) { + return await this.applicationRepository.findOne({ + where: { + fileNumber, + }, + relations: { + localGovernment: true, + type: true, + }, + }); + } + + async getNoi(fileNumber: string) { + return await this.noiRepository.findOne({ + where: { + fileNumber, + }, + relations: { + localGovernment: true, + }, + }); + } + + async getNotification(fileNumber: string) { + return await this.notificationRepository.findOne({ + where: { + fileNumber, + }, + relations: { + localGovernment: true, + }, + }); + } +} diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1695677471273-public_search_views.ts b/services/apps/alcs/src/providers/typeorm/migrations/1695677471273-public_search_views.ts new file mode 100644 index 0000000000..86b274a80e --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1695677471273-public_search_views.ts @@ -0,0 +1,68 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class publicSearchViews1695677471273 implements MigrationInterface { + name = 'publicSearchViews1695677471273'; + + public async up(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `CREATE VIEW "alcs"."public_notice_of_intent_submission_search_view" AS SELECT "noi_sub"."uuid" AS "uuid", "noi_sub"."applicant" AS "applicant", "noi"."uuid" AS "notice_of_intent_uuid", "noticeOfIntentType"."audit_deleted_date_at" AS "noticeOfIntentType_audit_deleted_date_at", "noticeOfIntentType"."audit_created_at" AS "noticeOfIntentType_audit_created_at", "noticeOfIntentType"."audit_updated_at" AS "noticeOfIntentType_audit_updated_at", "noticeOfIntentType"."audit_created_by" AS "noticeOfIntentType_audit_created_by", "noticeOfIntentType"."audit_updated_by" AS "noticeOfIntentType_audit_updated_by", "noticeOfIntentType"."label" AS "noticeOfIntentType_label", "noticeOfIntentType"."code" AS "noticeOfIntentType_code", "noticeOfIntentType"."description" AS "noticeOfIntentType_description", "noticeOfIntentType"."short_label" AS "noticeOfIntentType_short_label", "noticeOfIntentType"."background_color" AS "noticeOfIntentType_background_color", "noticeOfIntentType"."text_color" AS "noticeOfIntentType_text_color", "noticeOfIntentType"."html_description" AS "noticeOfIntentType_html_description", "noticeOfIntentType"."portal_label" AS "noticeOfIntentType_portal_label", "localGovernment"."name" AS "local_government_name", "noi_sub"."file_number" AS "file_number", "noi_sub"."local_government_uuid" AS "local_government_uuid", "noi_sub"."type_code" AS "notice_of_intent_type_code", "noi"."date_submitted_to_alc" AS "date_submitted_to_alc", "noi"."decision_date" AS "decision_date", "noi"."region_code" AS "notice_of_intent_region_code", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid") AS "status" FROM "alcs"."notice_of_intent_submission" "noi_sub" INNER JOIN "alcs"."notice_of_intent" "noi" ON "noi"."file_number" = "noi_sub"."file_number" AND "noi"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."notice_of_intent_type" "noticeOfIntentType" ON "noi_sub"."type_code" = "noticeOfIntentType"."code" AND "noticeOfIntentType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "noi_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."notice_of_intent_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "noi_sub"."uuid" LEFT JOIN (SELECT MAX("date") AS "date", notice_of_intent_uuid AS "notice_of_intent_uuid" FROM "alcs"."notice_of_intent_decision" "decision_date" WHERE "decision_date"."audit_deleted_date_at" IS NULL GROUP BY notice_of_intent_uuid) "decision_date" ON decision_date."notice_of_intent_uuid" = "noi"."uuid" WHERE ( "noi_sub"."is_draft" = FALSE AND "noi"."date_received_all_items" IS NOT NULL AND alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid")->>'status_type_code' != 'CNCL' ) AND ( "noi_sub"."audit_deleted_date_at" IS NULL )`, + ); + await queryRunner.query( + `INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, + [ + 'alcs', + 'VIEW', + 'public_notice_of_intent_submission_search_view', + 'SELECT "noi_sub"."uuid" AS "uuid", "noi_sub"."applicant" AS "applicant", "noi"."uuid" AS "notice_of_intent_uuid", "noticeOfIntentType"."audit_deleted_date_at" AS "noticeOfIntentType_audit_deleted_date_at", "noticeOfIntentType"."audit_created_at" AS "noticeOfIntentType_audit_created_at", "noticeOfIntentType"."audit_updated_at" AS "noticeOfIntentType_audit_updated_at", "noticeOfIntentType"."audit_created_by" AS "noticeOfIntentType_audit_created_by", "noticeOfIntentType"."audit_updated_by" AS "noticeOfIntentType_audit_updated_by", "noticeOfIntentType"."label" AS "noticeOfIntentType_label", "noticeOfIntentType"."code" AS "noticeOfIntentType_code", "noticeOfIntentType"."description" AS "noticeOfIntentType_description", "noticeOfIntentType"."short_label" AS "noticeOfIntentType_short_label", "noticeOfIntentType"."background_color" AS "noticeOfIntentType_background_color", "noticeOfIntentType"."text_color" AS "noticeOfIntentType_text_color", "noticeOfIntentType"."html_description" AS "noticeOfIntentType_html_description", "noticeOfIntentType"."portal_label" AS "noticeOfIntentType_portal_label", "localGovernment"."name" AS "local_government_name", "noi_sub"."file_number" AS "file_number", "noi_sub"."local_government_uuid" AS "local_government_uuid", "noi_sub"."type_code" AS "notice_of_intent_type_code", "noi"."date_submitted_to_alc" AS "date_submitted_to_alc", "noi"."decision_date" AS "decision_date", "noi"."region_code" AS "notice_of_intent_region_code", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid") AS "status" FROM "alcs"."notice_of_intent_submission" "noi_sub" INNER JOIN "alcs"."notice_of_intent" "noi" ON "noi"."file_number" = "noi_sub"."file_number" AND "noi"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."notice_of_intent_type" "noticeOfIntentType" ON "noi_sub"."type_code" = "noticeOfIntentType"."code" AND "noticeOfIntentType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "noi_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."notice_of_intent_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "noi_sub"."uuid" LEFT JOIN (SELECT MAX("date") AS "date", notice_of_intent_uuid AS "notice_of_intent_uuid" FROM "alcs"."notice_of_intent_decision" "decision_date" WHERE "decision_date"."audit_deleted_date_at" IS NULL GROUP BY notice_of_intent_uuid) "decision_date" ON decision_date."notice_of_intent_uuid" = "noi"."uuid" WHERE ( "noi_sub"."is_draft" = FALSE AND "noi"."date_received_all_items" IS NOT NULL AND alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid")->>\'status_type_code\' != \'CNCL\' ) AND ( "noi_sub"."audit_deleted_date_at" IS NULL )', + ], + ); + await queryRunner.query( + `CREATE VIEW "alcs"."public_application_submission_search_view" AS SELECT "app_sub"."uuid" AS "uuid", "app_sub"."applicant" AS "applicant", "app"."uuid" AS "application_uuid", "applicationType"."audit_deleted_date_at" AS "applicationType_audit_deleted_date_at", "applicationType"."audit_created_at" AS "applicationType_audit_created_at", "applicationType"."audit_updated_at" AS "applicationType_audit_updated_at", "applicationType"."audit_created_by" AS "applicationType_audit_created_by", "applicationType"."audit_updated_by" AS "applicationType_audit_updated_by", "applicationType"."label" AS "applicationType_label", "applicationType"."code" AS "applicationType_code", "applicationType"."description" AS "applicationType_description", "applicationType"."short_label" AS "applicationType_short_label", "applicationType"."background_color" AS "applicationType_background_color", "applicationType"."text_color" AS "applicationType_text_color", "applicationType"."html_description" AS "applicationType_html_description", "applicationType"."portal_label" AS "applicationType_portal_label", "localGovernment"."name" AS "local_government_name", "app_sub"."file_number" AS "file_number", "app_sub"."local_government_uuid" AS "local_government_uuid", "app_sub"."type_code" AS "application_type_code", "app"."date_submitted_to_alc" AS "date_submitted_to_alc", "app"."decision_date" AS "decision_date", "app"."region_code" AS "application_region_code", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid") AS "status" FROM "alcs"."application_submission" "app_sub" INNER JOIN "alcs"."application" "app" ON "app"."file_number" = "app_sub"."file_number" AND "app"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."application_type" "applicationType" ON "app_sub"."type_code" = "applicationType"."code" AND "applicationType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "app_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."application_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "app_sub"."uuid" LEFT JOIN (SELECT MAX("date") AS "date", application_uuid AS "application_uuid" FROM "alcs"."application_decision" "decision_date" WHERE "decision_date"."audit_deleted_date_at" IS NULL GROUP BY application_uuid) "decision_date" ON decision_date."application_uuid" = "app"."uuid" WHERE ( "app_sub"."is_draft" = FALSE AND "app"."date_received_all_items" IS NOT NULL AND alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid")->>'status_type_code' != 'CNCL' ) AND ( "app_sub"."audit_deleted_date_at" IS NULL )`, + ); + await queryRunner.query( + `INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, + [ + 'alcs', + 'VIEW', + 'public_application_submission_search_view', + 'SELECT "app_sub"."uuid" AS "uuid", "app_sub"."applicant" AS "applicant", "app"."uuid" AS "application_uuid", "applicationType"."audit_deleted_date_at" AS "applicationType_audit_deleted_date_at", "applicationType"."audit_created_at" AS "applicationType_audit_created_at", "applicationType"."audit_updated_at" AS "applicationType_audit_updated_at", "applicationType"."audit_created_by" AS "applicationType_audit_created_by", "applicationType"."audit_updated_by" AS "applicationType_audit_updated_by", "applicationType"."label" AS "applicationType_label", "applicationType"."code" AS "applicationType_code", "applicationType"."description" AS "applicationType_description", "applicationType"."short_label" AS "applicationType_short_label", "applicationType"."background_color" AS "applicationType_background_color", "applicationType"."text_color" AS "applicationType_text_color", "applicationType"."html_description" AS "applicationType_html_description", "applicationType"."portal_label" AS "applicationType_portal_label", "localGovernment"."name" AS "local_government_name", "app_sub"."file_number" AS "file_number", "app_sub"."local_government_uuid" AS "local_government_uuid", "app_sub"."type_code" AS "application_type_code", "app"."date_submitted_to_alc" AS "date_submitted_to_alc", "app"."decision_date" AS "decision_date", "app"."region_code" AS "application_region_code", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid") AS "status" FROM "alcs"."application_submission" "app_sub" INNER JOIN "alcs"."application" "app" ON "app"."file_number" = "app_sub"."file_number" AND "app"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."application_type" "applicationType" ON "app_sub"."type_code" = "applicationType"."code" AND "applicationType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "app_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."application_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "app_sub"."uuid" LEFT JOIN (SELECT MAX("date") AS "date", application_uuid AS "application_uuid" FROM "alcs"."application_decision" "decision_date" WHERE "decision_date"."audit_deleted_date_at" IS NULL GROUP BY application_uuid) "decision_date" ON decision_date."application_uuid" = "app"."uuid" WHERE ( "app_sub"."is_draft" = FALSE AND "app"."date_received_all_items" IS NOT NULL AND alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid")->>\'status_type_code\' != \'CNCL\' ) AND ( "app_sub"."audit_deleted_date_at" IS NULL )', + ], + ); + await queryRunner.query( + `CREATE VIEW "alcs"."public_notification_submission_search_view" AS SELECT "noti_sub"."uuid" AS "uuid", "noti_sub"."applicant" AS "applicant", "noti"."uuid" AS "notification_uuid", "notificationType"."audit_deleted_date_at" AS "notificationType_audit_deleted_date_at", "notificationType"."audit_created_at" AS "notificationType_audit_created_at", "notificationType"."audit_updated_at" AS "notificationType_audit_updated_at", "notificationType"."audit_created_by" AS "notificationType_audit_created_by", "notificationType"."audit_updated_by" AS "notificationType_audit_updated_by", "notificationType"."label" AS "notificationType_label", "notificationType"."code" AS "notificationType_code", "notificationType"."description" AS "notificationType_description", "notificationType"."short_label" AS "notificationType_short_label", "notificationType"."background_color" AS "notificationType_background_color", "notificationType"."text_color" AS "notificationType_text_color", "notificationType"."html_description" AS "notificationType_html_description", "notificationType"."portal_label" AS "notificationType_portal_label", "localGovernment"."name" AS "local_government_name", "noti_sub"."file_number" AS "file_number", "noti_sub"."local_government_uuid" AS "local_government_uuid", "noti"."type_code" AS "notification_type_code", "noti"."date_submitted_to_alc" AS "date_submitted_to_alc", "noti"."region_code" AS "notification_region_code", alcs.get_current_status_for_notification_submission_by_uuid("noti_sub"."uuid") AS "status" FROM "alcs"."notification_submission" "noti_sub" INNER JOIN "alcs"."notification" "noti" ON "noti"."file_number" = "noti_sub"."file_number" AND "noti"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."notification_type" "notificationType" ON "noti_sub"."type_code" = "notificationType"."code" AND "notificationType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "noti"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL WHERE ( alcs.get_current_status_for_notification_submission_by_uuid("noti_sub"."uuid")->>'status_type_code' = 'ALCR' ) AND ( "noti_sub"."audit_deleted_date_at" IS NULL )`, + ); + await queryRunner.query( + `INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, + [ + 'alcs', + 'VIEW', + 'public_notification_submission_search_view', + 'SELECT "noti_sub"."uuid" AS "uuid", "noti_sub"."applicant" AS "applicant", "noti"."uuid" AS "notification_uuid", "notificationType"."audit_deleted_date_at" AS "notificationType_audit_deleted_date_at", "notificationType"."audit_created_at" AS "notificationType_audit_created_at", "notificationType"."audit_updated_at" AS "notificationType_audit_updated_at", "notificationType"."audit_created_by" AS "notificationType_audit_created_by", "notificationType"."audit_updated_by" AS "notificationType_audit_updated_by", "notificationType"."label" AS "notificationType_label", "notificationType"."code" AS "notificationType_code", "notificationType"."description" AS "notificationType_description", "notificationType"."short_label" AS "notificationType_short_label", "notificationType"."background_color" AS "notificationType_background_color", "notificationType"."text_color" AS "notificationType_text_color", "notificationType"."html_description" AS "notificationType_html_description", "notificationType"."portal_label" AS "notificationType_portal_label", "localGovernment"."name" AS "local_government_name", "noti_sub"."file_number" AS "file_number", "noti_sub"."local_government_uuid" AS "local_government_uuid", "noti"."type_code" AS "notification_type_code", "noti"."date_submitted_to_alc" AS "date_submitted_to_alc", "noti"."region_code" AS "notification_region_code", alcs.get_current_status_for_notification_submission_by_uuid("noti_sub"."uuid") AS "status" FROM "alcs"."notification_submission" "noti_sub" INNER JOIN "alcs"."notification" "noti" ON "noti"."file_number" = "noti_sub"."file_number" AND "noti"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."notification_type" "notificationType" ON "noti_sub"."type_code" = "notificationType"."code" AND "notificationType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "noti"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL WHERE ( alcs.get_current_status_for_notification_submission_by_uuid("noti_sub"."uuid")->>\'status_type_code\' = \'ALCR\' ) AND ( "noti_sub"."audit_deleted_date_at" IS NULL )', + ], + ); + } + + public async down(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, + ['VIEW', 'public_notification_submission_search_view', 'alcs'], + ); + await queryRunner.query( + `DROP VIEW "alcs"."public_notification_submission_search_view"`, + ); + await queryRunner.query( + `DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, + ['VIEW', 'public_application_submission_search_view', 'alcs'], + ); + await queryRunner.query( + `DROP VIEW "alcs"."public_application_submission_search_view"`, + ); + await queryRunner.query( + `DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, + ['VIEW', 'public_notice_of_intent_submission_search_view', 'alcs'], + ); + await queryRunner.query( + `DROP VIEW "alcs"."public_notice_of_intent_submission_search_view"`, + ); + } +} From efd3f9987ae215dcd9852124326f708313823c21 Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Tue, 26 Sep 2023 09:37:31 -0700 Subject: [PATCH 427/954] Bugfix/alcs 1038 home page for notifications (#1009) assigned to me notifications sorting notification subtasks on home page Bonus: exclude non-app from advanced search by pid --- .../home/assigned/assigned.component.html | 5 ++ .../home/assigned/assigned.component.ts | 29 +++++++++- .../subtask-table.component.html | 7 +++ .../subtask-table/subtask-table.component.ts | 2 + .../home/subtask/subtask.component.html | 4 ++ .../home/subtask/subtask.component.ts | 6 ++ .../card/card-subtask/card-subtask.dto.ts | 2 +- .../src/app/services/home/home.service.ts | 2 + .../application-type-pill.constants.ts | 8 +++ .../src/alcs/home/home.controller.spec.ts | 57 ++++++++++++++++++- .../alcs/src/alcs/home/home.controller.ts | 40 +++++++++++++ .../apps/alcs/src/alcs/home/home.module.ts | 4 +- .../alcs/src/alcs/search/search.controller.ts | 1 + 13 files changed, 163 insertions(+), 4 deletions(-) diff --git a/alcs-frontend/src/app/features/home/assigned/assigned.component.html b/alcs-frontend/src/app/features/home/assigned/assigned.component.html index 6b7079f7a3..1141dee85e 100644 --- a/alcs-frontend/src/app/features/home/assigned/assigned.component.html +++ b/alcs-frontend/src/app/features/home/assigned/assigned.component.html @@ -15,4 +15,9 @@ <h4>Cards Assigned to Me: {{ totalFiles }}</h4> <div class="subheading2">Non-Applications</div> <app-assigned-table [assignedFiles]="nonApplications"></app-assigned-table> </section> + + <section *ngIf="notifications.length"> + <div class="subheading2">Notifications</div> + <app-assigned-table [assignedFiles]="notifications"></app-assigned-table> + </section> </div> diff --git a/alcs-frontend/src/app/features/home/assigned/assigned.component.ts b/alcs-frontend/src/app/features/home/assigned/assigned.component.ts index 8b395588ff..d899e8b003 100644 --- a/alcs-frontend/src/app/features/home/assigned/assigned.component.ts +++ b/alcs-frontend/src/app/features/home/assigned/assigned.component.ts @@ -7,10 +7,12 @@ import { CovenantDto } from '../../../services/covenant/covenant.dto'; import { HomeService } from '../../../services/home/home.service'; import { NoticeOfIntentModificationDto } from '../../../services/notice-of-intent/notice-of-intent-modification/notice-of-intent-modification.dto'; import { NoticeOfIntentDto } from '../../../services/notice-of-intent/notice-of-intent.dto'; +import { NotificationDto } from '../../../services/notification/notification.dto'; import { PlanningReviewDto } from '../../../services/planning-review/planning-review.dto'; import { COVENANT_TYPE_LABEL, MODIFICATION_TYPE_LABEL, + NOTIFICATION_LABEL, PLANNING_TYPE_LABEL, RECON_TYPE_LABEL, RETROACTIVE_TYPE_LABEL, @@ -26,6 +28,7 @@ export class AssignedComponent implements OnInit { noticeOfIntents: AssignedToMeFile[] = []; applications: AssignedToMeFile[] = []; nonApplications: AssignedToMeFile[] = []; + notifications: AssignedToMeFile[] = []; totalFiles = 0; constructor(private homeService: HomeService, private applicationService: ApplicationService) {} @@ -44,6 +47,7 @@ export class AssignedComponent implements OnInit { covenants, noticeOfIntents, noticeOfIntentModifications, + notifications, } = await this.homeService.fetchAssignedToMe(); this.noticeOfIntents = [ @@ -110,7 +114,19 @@ export class AssignedComponent implements OnInit { .sort((a, b) => a.date! - b.date!), ]; - this.totalFiles = this.applications.length + this.nonApplications.length + this.noticeOfIntents.length; + this.notifications = [ + ...notifications + .filter((r) => r.card.highPriority) + .map((r) => this.mapNotifications(r)) + .sort((a, b) => a.date! - b.date!), + ...notifications + .filter((r) => !r.card.highPriority) + .map((r) => this.mapNotifications(r)) + .sort((a, b) => a.date! - b.date!), + ]; + + this.totalFiles = + this.applications.length + this.nonApplications.length + this.noticeOfIntents.length + this.notifications.length; } private mapCovenant(c: CovenantDto): AssignedToMeFile { @@ -193,4 +209,15 @@ export class AssignedComponent implements OnInit { : [MODIFICATION_TYPE_LABEL], }; } + + private mapNotifications(a: NotificationDto) { + return { + title: `${a.fileNumber} (${a.applicant})`, + type: a.card!.type, + card: a.card, + date: a.dateSubmittedToAlc, + highPriority: a.card!.highPriority, + labels: [NOTIFICATION_LABEL], + }; + } } diff --git a/alcs-frontend/src/app/features/home/subtask/subtask-table/subtask-table.component.html b/alcs-frontend/src/app/features/home/subtask/subtask-table/subtask-table.component.html index 127914aa7d..11beace450 100644 --- a/alcs-frontend/src/app/features/home/subtask/subtask-table/subtask-table.component.html +++ b/alcs-frontend/src/app/features/home/subtask/subtask-table/subtask-table.component.html @@ -42,6 +42,13 @@ [type]="PLANNING_TYPE_LABEL" > </app-application-type-pill> + <app-application-type-pill + [useShortLabel]="true" + *ngIf="element.parentType === 'notification'" + [type]="NOTIFICATION_LABEL" + > + </app-application-type-pill> + </td> </ng-container> diff --git a/alcs-frontend/src/app/features/home/subtask/subtask-table/subtask-table.component.ts b/alcs-frontend/src/app/features/home/subtask/subtask-table/subtask-table.component.ts index bca19a4e76..f01b8f5db4 100644 --- a/alcs-frontend/src/app/features/home/subtask/subtask-table/subtask-table.component.ts +++ b/alcs-frontend/src/app/features/home/subtask/subtask-table/subtask-table.component.ts @@ -6,6 +6,7 @@ import { AssigneeDto, UserDto } from '../../../../services/user/user.dto'; import { COVENANT_TYPE_LABEL, MODIFICATION_TYPE_LABEL, + NOTIFICATION_LABEL, PLANNING_TYPE_LABEL, RECON_TYPE_LABEL, } from '../../../../shared/application-type-pill/application-type-pill.constants'; @@ -25,6 +26,7 @@ export class SubtaskTableComponent { PLANNING_TYPE_LABEL = PLANNING_TYPE_LABEL; COVENANT_TYPE_LABEL = COVENANT_TYPE_LABEL; RECON_TYPE_LABEL = RECON_TYPE_LABEL; + NOTIFICATION_LABEL = NOTIFICATION_LABEL; constructor(private router: Router, private cardSubtaskService: CardSubtaskService) {} diff --git a/alcs-frontend/src/app/features/home/subtask/subtask.component.html b/alcs-frontend/src/app/features/home/subtask/subtask.component.html index 23a057d952..5d9519df0f 100644 --- a/alcs-frontend/src/app/features/home/subtask/subtask.component.html +++ b/alcs-frontend/src/app/features/home/subtask/subtask.component.html @@ -13,4 +13,8 @@ <h4>{{ subtaskLabel }} Subtasks: {{ totalSubtaskCount }}</h4> <div class="subheading2">Non-Applications</div> <app-subtask-table [subtasks]="nonApplicationSubtasks" [users]="users"></app-subtask-table> </section> + <section *ngIf="notificationSubtasks.length"> + <div class="subheading2">Notifications</div> + <app-subtask-table [subtasks]="notificationSubtasks" [users]="users"></app-subtask-table> + </section> </div> diff --git a/alcs-frontend/src/app/features/home/subtask/subtask.component.ts b/alcs-frontend/src/app/features/home/subtask/subtask.component.ts index 0fa27252ab..7421924820 100644 --- a/alcs-frontend/src/app/features/home/subtask/subtask.component.ts +++ b/alcs-frontend/src/app/features/home/subtask/subtask.component.ts @@ -24,6 +24,7 @@ export class SubtaskComponent implements OnInit, OnDestroy { applicationSubtasks: HomepageSubtaskDto[] = []; noticeOfIntentSubtasks: HomepageSubtaskDto[] = []; nonApplicationSubtasks: HomepageSubtaskDto[] = []; + notificationSubtasks: HomepageSubtaskDto[] = []; showNoi = true; showAppAndNonApp = true; @@ -59,6 +60,7 @@ export class SubtaskComponent implements OnInit, OnDestroy { const covenants = allSubtasks.filter((s) => s.card.type === CardType.COV); const nois = allSubtasks.filter((s) => s.card.type === CardType.NOI); const noiModifications = allSubtasks.filter((s) => s.card.type === CardType.NOI_MODI); + const notifications = allSubtasks.filter((s) => s.card.type === CardType.NOTIFICATION); this.applicationSubtasks = [ ...applications.filter((a) => a.card.highPriority).sort((a, b) => b.activeDays! - a.activeDays!), @@ -83,6 +85,10 @@ export class SubtaskComponent implements OnInit, OnDestroy { ...covenants.filter((r) => !r.card.highPriority).sort((a, b) => a.createdAt! - b.createdAt!), ]; + this.notificationSubtasks = [ + ...notifications.filter((r) => !r.card.highPriority).sort((a, b) => a.createdAt! - b.createdAt!), + ]; + if (this.showNoi) { this.totalSubtaskCount = this.noticeOfIntentSubtasks.length; } diff --git a/alcs-frontend/src/app/services/card/card-subtask/card-subtask.dto.ts b/alcs-frontend/src/app/services/card/card-subtask/card-subtask.dto.ts index 89cf2cf549..53ff23d830 100644 --- a/alcs-frontend/src/app/services/card/card-subtask/card-subtask.dto.ts +++ b/alcs-frontend/src/app/services/card/card-subtask/card-subtask.dto.ts @@ -28,7 +28,7 @@ export interface HomepageSubtaskDto extends CardSubtaskDto { activeDays?: number; paused: boolean; appType?: ApplicationTypeDto; - parentType: 'application' | 'reconsideration' | 'covenant' | 'modification' | 'planning-review'; + parentType: 'application' | 'reconsideration' | 'covenant' | 'modification' | 'planning-review' | 'notification'; } export enum CARD_SUBTASK_TYPE { diff --git a/alcs-frontend/src/app/services/home/home.service.ts b/alcs-frontend/src/app/services/home/home.service.ts index f32f766a17..4fb684b6f9 100644 --- a/alcs-frontend/src/app/services/home/home.service.ts +++ b/alcs-frontend/src/app/services/home/home.service.ts @@ -9,6 +9,7 @@ import { CARD_SUBTASK_TYPE, HomepageSubtaskDto } from '../card/card-subtask/card import { CovenantDto } from '../covenant/covenant.dto'; import { NoticeOfIntentModificationDto } from '../notice-of-intent/notice-of-intent-modification/notice-of-intent-modification.dto'; import { NoticeOfIntentDto } from '../notice-of-intent/notice-of-intent.dto'; +import { NotificationDto } from '../notification/notification.dto'; import { PlanningReviewDto } from '../planning-review/planning-review.dto'; @Injectable({ @@ -27,6 +28,7 @@ export class HomeService { covenants: CovenantDto[]; noticeOfIntents: NoticeOfIntentDto[]; noticeOfIntentModifications: NoticeOfIntentModificationDto[]; + notifications: NotificationDto[]; }>(`${environment.apiUrl}/home/assigned`) ); } diff --git a/alcs-frontend/src/app/shared/application-type-pill/application-type-pill.constants.ts b/alcs-frontend/src/app/shared/application-type-pill/application-type-pill.constants.ts index 9543a8ccfd..0644c4d584 100644 --- a/alcs-frontend/src/app/shared/application-type-pill/application-type-pill.constants.ts +++ b/alcs-frontend/src/app/shared/application-type-pill/application-type-pill.constants.ts @@ -89,3 +89,11 @@ export const DECISION_CONDITION_SUPERSEDED_LABEL = { borderColor: '#C08106', textColor: '#000', }; + +export const NOTIFICATION_LABEL = { + label: 'Statutory Right of Way', + shortLabel: 'SRW', + backgroundColor: '#fff', + borderColor: '#59ADFA', + textColor: '#313132', +}; diff --git a/services/apps/alcs/src/alcs/home/home.controller.spec.ts b/services/apps/alcs/src/alcs/home/home.controller.spec.ts index d1cbb58ae4..72670ba779 100644 --- a/services/apps/alcs/src/alcs/home/home.controller.spec.ts +++ b/services/apps/alcs/src/alcs/home/home.controller.spec.ts @@ -15,6 +15,7 @@ import { ApplicationSubtaskProfile } from '../../common/automapper/application-s import { ApplicationProfile } from '../../common/automapper/application.automapper.profile'; import { CardProfile } from '../../common/automapper/card.automapper.profile'; import { CovenantProfile } from '../../common/automapper/covenant.automapper.profile'; +import { NotificationProfile } from '../../common/automapper/notification.automapper.profile'; import { UserProfile } from '../../common/automapper/user.automapper.profile'; import { ApplicationModificationService } from '../application-decision/application-modification/application-modification.service'; import { ApplicationReconsiderationService } from '../application-decision/application-reconsideration/application-reconsideration.service'; @@ -30,6 +31,8 @@ import { NoticeOfIntentModification } from '../notice-of-intent-decision/notice- import { NoticeOfIntentModificationService } from '../notice-of-intent-decision/notice-of-intent-modification/notice-of-intent-modification.service'; import { NoticeOfIntent } from '../notice-of-intent/notice-of-intent.entity'; import { NoticeOfIntentService } from '../notice-of-intent/notice-of-intent.service'; +import { Notification } from '../notification/notification.entity'; +import { NotificationService } from '../notification/notification.service'; import { PlanningReview } from '../planning-review/planning-review.entity'; import { PlanningReviewService } from '../planning-review/planning-review.service'; import { HomeController } from './home.controller'; @@ -45,6 +48,7 @@ describe('HomeController', () => { let mockApplicationTimeTrackingService: DeepMocked<ApplicationTimeTrackingService>; let mockNoticeOfIntentService: DeepMocked<NoticeOfIntentService>; let mockNoticeOfIntentModificationService: DeepMocked<NoticeOfIntentModificationService>; + let mockNotificationService: DeepMocked<NotificationService>; beforeEach(async () => { mockApplicationService = createMock(); @@ -56,6 +60,7 @@ describe('HomeController', () => { mockCovenantService = createMock(); mockNoticeOfIntentService = createMock(); mockNoticeOfIntentModificationService = createMock(); + mockNotificationService = createMock(); const module: TestingModule = await Test.createTestingModule({ imports: [ @@ -109,11 +114,16 @@ describe('HomeController', () => { provide: NoticeOfIntentModificationService, useValue: mockNoticeOfIntentModificationService, }, + { + provide: NotificationService, + useValue: mockNotificationService, + }, ApplicationProfile, ApplicationSubtaskProfile, CovenantProfile, UserProfile, CardProfile, + NotificationProfile, ...mockKeyCloakProviders, ], }).compile(); @@ -134,6 +144,8 @@ describe('HomeController', () => { mockNoticeOfIntentService.mapToDtos.mockResolvedValue([]); mockNoticeOfIntentModificationService.getBy.mockResolvedValue([]); mockNoticeOfIntentModificationService.mapToDtos.mockResolvedValue([]); + mockNotificationService.getBy.mockResolvedValue([]); + mockNotificationService.mapToDtos.mockResolvedValue([]); mockApplicationTimeTrackingService.fetchActiveTimes.mockResolvedValue( new Map(), @@ -159,6 +171,9 @@ describe('HomeController', () => { mockNoticeOfIntentModificationService.getWithIncompleteSubtaskByType.mockResolvedValue( [], ); + mockNotificationService.getWithIncompleteSubtaskByType.mockResolvedValue( + [], + ); }); it('should be defined', () => { @@ -166,7 +181,7 @@ describe('HomeController', () => { }); describe('Assigned To Me', () => { - it('should call ApplicationService with the correct filter for assigned', async () => { + it('should call Application, NOI, Notification services with the correct filter for assigned', async () => { const userId = 'fake-user-id'; await controller.getAssignedToMe({ user: { @@ -201,6 +216,23 @@ describe('HomeController', () => { expect(mockPlanningReviewService.getBy.mock.calls[0][0]).toEqual( filterCondition, ); + + expect(mockNoticeOfIntentService.getBy).toHaveBeenCalledTimes(1); + expect(mockNoticeOfIntentService.getBy.mock.calls[0][0]).toEqual( + filterCondition, + ); + + expect(mockNoticeOfIntentModificationService.getBy).toHaveBeenCalledTimes( + 1, + ); + expect( + mockNoticeOfIntentModificationService.getBy.mock.calls[0][0], + ).toEqual(filterCondition); + + expect(mockNotificationService.getBy).toHaveBeenCalledTimes(1); + expect(mockNotificationService.getBy.mock.calls[0][0]).toEqual( + filterCondition, + ); }); }); @@ -382,5 +414,28 @@ describe('HomeController', () => { mockNoiModification.noticeOfIntent.applicant, ); }); + + it('should call Notification Service and map it', async () => { + const mockNotification = new Notification({ + applicant: 'fake-applicant', + fileNumber: 'fileNumber', + card: initCardMockEntity('222'), + }); + mockNotificationService.getWithIncompleteSubtaskByType.mockResolvedValue([ + mockNotification, + ]); + + const res = await controller.getIncompleteSubtasksByType( + CARD_SUBTASK_TYPE.PEER_REVIEW, + ); + + expect(res.length).toEqual(1); + expect( + mockNotificationService.getWithIncompleteSubtaskByType, + ).toHaveBeenCalledTimes(1); + + expect(res[0].title).toContain(mockNotification.fileNumber); + expect(res[0].title).toContain(mockNotification.applicant); + }); }); }); diff --git a/services/apps/alcs/src/alcs/home/home.controller.ts b/services/apps/alcs/src/alcs/home/home.controller.ts index d694c28427..234e8a9b5c 100644 --- a/services/apps/alcs/src/alcs/home/home.controller.ts +++ b/services/apps/alcs/src/alcs/home/home.controller.ts @@ -36,6 +36,8 @@ import { NoticeOfIntentModificationService } from '../notice-of-intent-decision/ import { NoticeOfIntentDto } from '../notice-of-intent/notice-of-intent.dto'; import { NoticeOfIntent } from '../notice-of-intent/notice-of-intent.entity'; import { NoticeOfIntentService } from '../notice-of-intent/notice-of-intent.service'; +import { Notification } from '../notification/notification.entity'; +import { NotificationService } from '../notification/notification.service'; import { PlanningReviewDto } from '../planning-review/planning-review.dto'; import { PlanningReview } from '../planning-review/planning-review.entity'; import { PlanningReviewService } from '../planning-review/planning-review.service'; @@ -59,6 +61,7 @@ export class HomeController { private covenantService: CovenantService, private noticeOfIntentService: NoticeOfIntentService, private noticeOfIntentModificationService: NoticeOfIntentModificationService, + private notificationService: NotificationService, ) {} @Get('/assigned') @@ -107,6 +110,10 @@ export class HomeController { const noticeOfIntentModifications = await this.noticeOfIntentModificationService.getBy(assignedFindOptions); + const notifications = await this.notificationService.getBy( + assignedFindOptions, + ); + const result = { noticeOfIntents: await this.noticeOfIntentService.mapToDtos( noticeOfIntents, @@ -124,6 +131,7 @@ export class HomeController { ), modifications: await this.modificationService.mapToDtos(modifications), covenants: await this.covenantService.mapToDtos(covenants), + notifications: await this.notificationService.mapToDtos(notifications), }; return result; @@ -191,6 +199,15 @@ export class HomeController { noiModificationsWithSubtasks, ); + const notificationsWithSubtasks = + await this.notificationService.getWithIncompleteSubtaskByType( + subtaskType, + ); + + const notificationSubtasks = this.mapNotificationsToDtos( + notificationsWithSubtasks, + ); + return [ ...noticeOfIntentSubtasks, ...applicationSubtasks, @@ -199,6 +216,7 @@ export class HomeController { ...planningReviewSubtasks, ...covenantReviewSubtasks, ...noiModificationsSubtasks, + ...notificationSubtasks, ]; } @@ -369,4 +387,26 @@ export class HomeController { } return result; } + + private mapNotificationsToDtos(notifications: Notification[]) { + const result: HomepageSubtaskDTO[] = []; + for (const notification of notifications) { + if (notification.card) { + for (const subtask of notification.card.subtasks) { + result.push({ + type: subtask.type, + createdAt: subtask.createdAt.getTime(), + assignee: this.mapper.map(subtask.assignee, User, AssigneeDto), + uuid: subtask.uuid, + card: this.mapper.map(notification.card, Card, CardDto), + completedAt: subtask.completedAt?.getTime(), + paused: false, + title: `${notification.fileNumber} (${notification.applicant})`, + parentType: PARENT_TYPE.NOTIFICATION, + }); + } + } + } + return result; + } } diff --git a/services/apps/alcs/src/alcs/home/home.module.ts b/services/apps/alcs/src/alcs/home/home.module.ts index 13ea97d183..fcdb0fe77a 100644 --- a/services/apps/alcs/src/alcs/home/home.module.ts +++ b/services/apps/alcs/src/alcs/home/home.module.ts @@ -1,11 +1,12 @@ import { Module } from '@nestjs/common'; import { ApplicationSubtaskProfile } from '../../common/automapper/application-subtask.automapper.profile'; import { UserModule } from '../../user/user.module'; +import { ApplicationDecisionModule } from '../application-decision/application-decision.module'; import { ApplicationModule } from '../application/application.module'; import { CovenantModule } from '../covenant/covenant.module'; -import { ApplicationDecisionModule } from '../application-decision/application-decision.module'; import { NoticeOfIntentDecisionModule } from '../notice-of-intent-decision/notice-of-intent-decision.module'; import { NoticeOfIntentModule } from '../notice-of-intent/notice-of-intent.module'; +import { NotificationModule } from '../notification/notification.module'; import { PlanningReviewModule } from '../planning-review/planning-review.module'; import { HomeController } from './home.controller'; @@ -18,6 +19,7 @@ import { HomeController } from './home.controller'; ApplicationDecisionModule, NoticeOfIntentModule, NoticeOfIntentDecisionModule, + NotificationModule, ], providers: [ApplicationSubtaskProfile], controllers: [HomeController], diff --git a/services/apps/alcs/src/alcs/search/search.controller.ts b/services/apps/alcs/src/alcs/search/search.controller.ts index 54d331f845..ea99569bda 100644 --- a/services/apps/alcs/src/alcs/search/search.controller.ts +++ b/services/apps/alcs/src/alcs/search/search.controller.ts @@ -280,6 +280,7 @@ export class SearchController { !searchDto.resolutionYear && !searchDto.isIncludeOtherParcels && !searchDto.portalStatusCode && + !searchDto.pid && !isStringSetAndNotEmpty(searchDto.legacyId) && !isStringSetAndNotEmpty(searchDto.civicAddress); From 4f2994da12c38f33288290c4f098c7f20633b704 Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Tue, 26 Sep 2023 10:37:23 -0700 Subject: [PATCH 428/954] run till 11pm instead of midnight (#1010) --- services/apps/alcs/src/queues/scheduler/scheduler.service.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/apps/alcs/src/queues/scheduler/scheduler.service.ts b/services/apps/alcs/src/queues/scheduler/scheduler.service.ts index c3192b12a3..e3779cef1f 100644 --- a/services/apps/alcs/src/queues/scheduler/scheduler.service.ts +++ b/services/apps/alcs/src/queues/scheduler/scheduler.service.ts @@ -10,9 +10,9 @@ export const EVERYDAY_MIDNIGHT_PST_IN_UTC = '0 0 8 * * *'; export const EVERYDAY_MIDNIGHT_PDT_IN_UTC = '0 0 7 * * *'; export const EVERY_15_MINUTES_STARTING_FROM_8AM_PST_IN_UTC = - '0/15 16-23,0-7 * * *'; + '0/15 16-23,0-6 * * *'; export const EVERY_15_MINUTES_STARTING_FROM_8AM_PDT_IN_UTC = - '0/15 15-23,0-6 * * *'; + '0/15 15-23,0-5 * * *'; export const QUEUES = { APP_EXPIRY: 'ApplicationExpiry', From ac4f89df6dd4f3b93aff0e3b5edaa4cc6fea474f Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Tue, 26 Sep 2023 12:27:45 -0700 Subject: [PATCH 429/954] Public Search Pt2 * Front end * Loading of statuses * Filtering by Decision Maker --- .../app/features/public/public.component.html | 1 - .../features/public/public.component.spec.ts | 24 -- .../app/features/public/public.component.ts | 10 - .../src/app/features/public/public.module.ts | 32 +- .../application-search-table.component.html | 82 +++++ .../application-search-table.component.scss} | 0 ...application-search-table.component.spec.ts | 33 ++ .../application-search-table.component.ts | 112 ++++++ .../file-type-filter-drop-down.component.html | 40 +++ .../file-type-filter-drop-down.component.scss | 7 + ...le-type-filter-drop-down.component.spec.ts | 26 ++ .../file-type-filter-drop-down.component.ts | 189 ++++++++++ ...tice-of-intent-search-table.component.html | 81 +++++ ...tice-of-intent-search-table.component.scss | 0 ...e-of-intent-search-table.component.spec.ts | 33 ++ ...notice-of-intent-search-table.component.ts | 111 ++++++ .../notification-search-table.component.html | 81 +++++ .../notification-search-table.component.scss | 0 ...otification-search-table.component.spec.ts | 33 ++ .../notification-search-table.component.ts | 110 ++++++ .../search/public-search.component.html | 155 ++++++++ .../search/public-search.component.scss | 86 +++++ .../search/public-search.component.spec.ts | 50 +++ .../public/search/public-search.component.ts | 333 ++++++++++++++++++ .../public/search/search.interface.ts | 24 ++ .../src/app/services/code/code.dto.ts | 3 + .../src/app/services/code/code.service.ts | 11 +- .../file-type-data-source.service.spec.ts | 33 ++ .../file-type-data-source.service.ts | 111 ++++++ .../src/app/services/search/search.dto.ts | 52 +++ .../services/search/search.service.spec.ts | 135 +++++++ .../src/app/services/search/search.service.ts | 74 ++++ .../services/status/status.service.spec.ts | 44 +++ .../src/app/services/status/status.service.ts | 25 ++ .../pipes/table-column-no-data.pipe.spec.ts | 8 + .../shared/pipes/table-column-no-data.pipe.ts | 10 + .../src/app/shared/shared.module.ts | 3 + .../application-submission-status.service.ts | 4 + .../apps/alcs/src/alcs/code/code.module.ts | 2 + .../alcs/src/alcs/code/code.service.spec.ts | 35 +- .../apps/alcs/src/alcs/code/code.service.ts | 5 + .../src/portal/code/code.controller.spec.ts | 16 + .../alcs/src/portal/code/code.controller.ts | 35 +- .../apps/alcs/src/portal/portal.module.ts | 2 + .../alcs/src/portal/public/public.module.ts | 7 +- .../public-application-search.service.spec.ts | 3 +- .../public-application-search.service.ts | 89 +++-- ...ic-notice-of-intent-search.service.spec.ts | 3 +- .../public-notice-of-intent-search.service.ts | 62 ++-- .../public-notification-search.service.ts | 4 +- .../search/public-search.controller.spec.ts | 140 +++----- .../public/search/public-search.controller.ts | 75 ++-- .../portal/public/search/public-search.dto.ts | 38 +- .../status/public-status.controller.spec.ts | 50 +++ .../public/status/public-status.controller.ts | 52 +++ 55 files changed, 2486 insertions(+), 298 deletions(-) delete mode 100644 portal-frontend/src/app/features/public/public.component.html delete mode 100644 portal-frontend/src/app/features/public/public.component.spec.ts delete mode 100644 portal-frontend/src/app/features/public/public.component.ts create mode 100644 portal-frontend/src/app/features/public/search/application-search-table/application-search-table.component.html rename portal-frontend/src/app/features/public/{public.component.scss => search/application-search-table/application-search-table.component.scss} (100%) create mode 100644 portal-frontend/src/app/features/public/search/application-search-table/application-search-table.component.spec.ts create mode 100644 portal-frontend/src/app/features/public/search/application-search-table/application-search-table.component.ts create mode 100644 portal-frontend/src/app/features/public/search/file-type-filter-drop-down/file-type-filter-drop-down.component.html create mode 100644 portal-frontend/src/app/features/public/search/file-type-filter-drop-down/file-type-filter-drop-down.component.scss create mode 100644 portal-frontend/src/app/features/public/search/file-type-filter-drop-down/file-type-filter-drop-down.component.spec.ts create mode 100644 portal-frontend/src/app/features/public/search/file-type-filter-drop-down/file-type-filter-drop-down.component.ts create mode 100644 portal-frontend/src/app/features/public/search/notice-of-intent-search-table/notice-of-intent-search-table.component.html create mode 100644 portal-frontend/src/app/features/public/search/notice-of-intent-search-table/notice-of-intent-search-table.component.scss create mode 100644 portal-frontend/src/app/features/public/search/notice-of-intent-search-table/notice-of-intent-search-table.component.spec.ts create mode 100644 portal-frontend/src/app/features/public/search/notice-of-intent-search-table/notice-of-intent-search-table.component.ts create mode 100644 portal-frontend/src/app/features/public/search/notification-search-table/notification-search-table.component.html create mode 100644 portal-frontend/src/app/features/public/search/notification-search-table/notification-search-table.component.scss create mode 100644 portal-frontend/src/app/features/public/search/notification-search-table/notification-search-table.component.spec.ts create mode 100644 portal-frontend/src/app/features/public/search/notification-search-table/notification-search-table.component.ts create mode 100644 portal-frontend/src/app/features/public/search/public-search.component.html create mode 100644 portal-frontend/src/app/features/public/search/public-search.component.scss create mode 100644 portal-frontend/src/app/features/public/search/public-search.component.spec.ts create mode 100644 portal-frontend/src/app/features/public/search/public-search.component.ts create mode 100644 portal-frontend/src/app/features/public/search/search.interface.ts create mode 100644 portal-frontend/src/app/services/search/file-type/file-type-data-source.service.spec.ts create mode 100644 portal-frontend/src/app/services/search/file-type/file-type-data-source.service.ts create mode 100644 portal-frontend/src/app/services/search/search.dto.ts create mode 100644 portal-frontend/src/app/services/search/search.service.spec.ts create mode 100644 portal-frontend/src/app/services/search/search.service.ts create mode 100644 portal-frontend/src/app/services/status/status.service.spec.ts create mode 100644 portal-frontend/src/app/services/status/status.service.ts create mode 100644 portal-frontend/src/app/shared/pipes/table-column-no-data.pipe.spec.ts create mode 100644 portal-frontend/src/app/shared/pipes/table-column-no-data.pipe.ts create mode 100644 services/apps/alcs/src/portal/public/status/public-status.controller.spec.ts create mode 100644 services/apps/alcs/src/portal/public/status/public-status.controller.ts diff --git a/portal-frontend/src/app/features/public/public.component.html b/portal-frontend/src/app/features/public/public.component.html deleted file mode 100644 index 2e9e6a7a90..0000000000 --- a/portal-frontend/src/app/features/public/public.component.html +++ /dev/null @@ -1 +0,0 @@ -<p>public works!</p> diff --git a/portal-frontend/src/app/features/public/public.component.spec.ts b/portal-frontend/src/app/features/public/public.component.spec.ts deleted file mode 100644 index be443beaf6..0000000000 --- a/portal-frontend/src/app/features/public/public.component.spec.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { NO_ERRORS_SCHEMA } from '@angular/core'; -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { PublicComponent } from './public.component'; - -describe('PublicComponent', () => { - let component: PublicComponent; - let fixture: ComponentFixture<PublicComponent>; - - beforeEach(async () => { - await TestBed.configureTestingModule({ - declarations: [PublicComponent], - schemas: [NO_ERRORS_SCHEMA], - }).compileComponents(); - - fixture = TestBed.createComponent(PublicComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/portal-frontend/src/app/features/public/public.component.ts b/portal-frontend/src/app/features/public/public.component.ts deleted file mode 100644 index 9042661a5d..0000000000 --- a/portal-frontend/src/app/features/public/public.component.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { Component } from '@angular/core'; - -@Component({ - selector: 'app-public', - templateUrl: './public.component.html', - styleUrls: ['./public.component.scss'] -}) -export class PublicComponent { - -} diff --git a/portal-frontend/src/app/features/public/public.module.ts b/portal-frontend/src/app/features/public/public.module.ts index 427bec1623..6773ef9621 100644 --- a/portal-frontend/src/app/features/public/public.module.ts +++ b/portal-frontend/src/app/features/public/public.module.ts @@ -1,18 +1,40 @@ -import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; +import { MatAutocompleteModule } from '@angular/material/autocomplete'; +import { MatPaginatorModule } from '@angular/material/paginator'; +import { MatSortModule } from '@angular/material/sort'; +import { MatTreeModule } from '@angular/material/tree'; import { RouterModule, Routes } from '@angular/router'; import { SharedModule } from '../../shared/shared.module'; -import { PublicComponent } from './public.component'; +import { ApplicationSearchTableComponent } from './search/application-search-table/application-search-table.component'; +import { FileTypeFilterDropDownComponent } from './search/file-type-filter-drop-down/file-type-filter-drop-down.component'; +import { NoticeOfIntentSearchTableComponent } from './search/notice-of-intent-search-table/notice-of-intent-search-table.component'; +import { NotificationSearchTableComponent } from './search/notification-search-table/notification-search-table.component'; +import { PublicSearchComponent } from './search/public-search.component'; const routes: Routes = [ { path: '', - component: PublicComponent, + component: PublicSearchComponent, }, ]; @NgModule({ - declarations: [PublicComponent], - imports: [CommonModule, SharedModule, RouterModule.forChild(routes)], + declarations: [ + PublicSearchComponent, + NotificationSearchTableComponent, + NoticeOfIntentSearchTableComponent, + ApplicationSearchTableComponent, + FileTypeFilterDropDownComponent, + ], + imports: [ + CommonModule, + SharedModule, + MatPaginatorModule, + MatSortModule, + RouterModule.forChild(routes), + MatAutocompleteModule, + MatTreeModule, + ], }) export class PublicModule {} diff --git a/portal-frontend/src/app/features/public/search/application-search-table/application-search-table.component.html b/portal-frontend/src/app/features/public/search/application-search-table/application-search-table.component.html new file mode 100644 index 0000000000..cbb938be84 --- /dev/null +++ b/portal-frontend/src/app/features/public/search/application-search-table/application-search-table.component.html @@ -0,0 +1,82 @@ +<ng-container *ngIf="_totalCount > 0"> + <table + mat-table + [dataSource]="dataSource" + class="mat-elevation-z2 table" + matSort + matSortActive="dateSubmitted" + matSortDirection="desc" + matSortDisableClear + > + <ng-container matColumnDef="fileId"> + <th mat-header-cell *matHeaderCellDef mat-sort-header>Application ID</th> + <td mat-cell *matCellDef="let element"> + <a (click)="onSelectRecord(element)">{{ element.fileNumber | emptyColumn }}</a> + </td> + </ng-container> + + <ng-container matColumnDef="ownerName"> + <th mat-header-cell *matHeaderCellDef mat-sort-header>Owner Name</th> + <td mat-cell *matCellDef="let element"> + {{ element.ownerName | emptyColumn }} + </td> + </ng-container> + + <ng-container matColumnDef="type"> + <th class="type-cell" mat-header-cell *matHeaderCellDef mat-sort-header>Type</th> + <td mat-cell class="type-cell" *matCellDef="let element"> + {{ element.type }} + <ng-container *ngIf="element.type === null || element.type === undefined">-</ng-container> + </td> + </ng-container> + + <ng-container matColumnDef="portalStatus"> + <th class="type-cell" mat-header-cell *matHeaderCellDef mat-sort-header>Status</th> + <td mat-cell class="type-cell" *matCellDef="let element"> + <div + *ngIf="element.status" + class="label" + [style]="{ 'background-color': element.status.portalBackgroundColor, color: element.status.portalColor }" + > + {{ element.status.label }} + </div> + </td> + </ng-container> + + <ng-container matColumnDef="lastUpdate"> + <th mat-header-cell *matHeaderCellDef mat-sort-header>Last Update</th> + <td mat-cell *matCellDef="let element"> + {{ element.lastUpdate | momentFormat | emptyColumn }} + </td> + </ng-container> + + <ng-container matColumnDef="government"> + <th mat-header-cell *matHeaderCellDef mat-sort-header>Local/First Nation Government</th> + <td mat-cell *matCellDef="let element"> + {{ element.localGovernmentName | emptyColumn }} + </td> + </ng-container> + + <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr> + <tr mat-row *matRowDef="let row; columns: displayedColumns"></tr> + + <tr class="mat-row no-data" *matNoDataRow> + <td class="text-center" colspan="6"> + <div><b>No applications found.</b></div> + <div>Please adjust criteria and try again.</div> + </td> + </tr> + </table> + <mat-paginator + [length]="_totalCount" + [pageSize]="20" + [pageSizeOptions]="[20, 50, 100]" + (page)="onPageChange($event)" + aria-label="Select page" + ></mat-paginator> +</ng-container> + +<div class="no-data" *ngIf="_totalCount === 0"> + <div><b>No applications found.</b></div> + <div>Please adjust criteria and try again.</div> +</div> diff --git a/portal-frontend/src/app/features/public/public.component.scss b/portal-frontend/src/app/features/public/search/application-search-table/application-search-table.component.scss similarity index 100% rename from portal-frontend/src/app/features/public/public.component.scss rename to portal-frontend/src/app/features/public/search/application-search-table/application-search-table.component.scss diff --git a/portal-frontend/src/app/features/public/search/application-search-table/application-search-table.component.spec.ts b/portal-frontend/src/app/features/public/search/application-search-table/application-search-table.component.spec.ts new file mode 100644 index 0000000000..4c320b829d --- /dev/null +++ b/portal-frontend/src/app/features/public/search/application-search-table/application-search-table.component.spec.ts @@ -0,0 +1,33 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { Router } from '@angular/router'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; + +import { ApplicationSearchTableComponent } from './application-search-table.component'; + +describe('ApplicationSearchTableComponent', () => { + let component: ApplicationSearchTableComponent; + let fixture: ComponentFixture<ApplicationSearchTableComponent>; + let mockRouter: DeepMocked<Router>; + + beforeEach(async () => { + mockRouter = createMock(); + + await TestBed.configureTestingModule({ + declarations: [ApplicationSearchTableComponent], + providers: [ + { + provide: Router, + useValue: mockRouter, + }, + ], + }).compileComponents(); + + fixture = TestBed.createComponent(ApplicationSearchTableComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/public/search/application-search-table/application-search-table.component.ts b/portal-frontend/src/app/features/public/search/application-search-table/application-search-table.component.ts new file mode 100644 index 0000000000..07b9ef5d25 --- /dev/null +++ b/portal-frontend/src/app/features/public/search/application-search-table/application-search-table.component.ts @@ -0,0 +1,112 @@ +import { Component, EventEmitter, Input, OnDestroy, Output, ViewChild } from '@angular/core'; +import { MatPaginator, PageEvent } from '@angular/material/paginator'; +import { MatSort } from '@angular/material/sort'; +import { Router } from '@angular/router'; +import { Subject, takeUntil } from 'rxjs'; +import { ApplicationStatusDto } from '../../../../services/application-submission/application-submission.dto'; +import { ApplicationRegionDto } from '../../../../services/code/code.dto'; +import { ApplicationSearchResultDto } from '../../../../services/search/search.dto'; +import { SearchResult, TableChange } from '../search.interface'; + +@Component({ + selector: 'app-application-search-table', + templateUrl: './application-search-table.component.html', + styleUrls: ['./application-search-table.component.scss'], +}) +export class ApplicationSearchTableComponent implements OnDestroy { + $destroy = new Subject<void>(); + + @ViewChild(MatPaginator) paginator!: MatPaginator; + @ViewChild(MatSort) sort?: MatSort; + + _applications: ApplicationSearchResultDto[] = []; + @Input() set applications(applications: ApplicationSearchResultDto[]) { + this._applications = applications; + this.dataSource = this.mapApplications(applications); + } + + _totalCount = 0; + @Input() set totalCount(count: number) { + this._totalCount = count; + + // this will ensure the reset of subscriber once the table is hidden because of empty + this.initSorting(); + } + + @Input() statuses: ApplicationStatusDto[] = []; + @Input() regions: ApplicationRegionDto[] = []; + + @Output() tableChange = new EventEmitter<TableChange>(); + + displayedColumns = ['fileId', 'ownerName', 'type', 'portalStatus', 'lastUpdate', 'government']; + dataSource: SearchResult[] = []; + pageIndex = 0; + itemsPerPage = 20; + total = 0; + sortDirection = 'DESC'; + sortField = 'lastUpdate'; + + private subscribedToSort = false; + + constructor(private router: Router) {} + + ngOnDestroy(): void { + this.$destroy.next(); + this.$destroy.complete(); + } + + async onTableChange() { + this.tableChange.emit({ + pageIndex: this.pageIndex, + itemsPerPage: this.itemsPerPage, + sortDirection: this.sortDirection, + sortField: this.sortField, + tableType: 'APP', + }); + } + + async onPageChange($event: PageEvent) { + this.pageIndex = $event.pageIndex; + this.itemsPerPage = $event.pageSize; + + await this.onTableChange(); + } + + async onSelectRecord(record: SearchResult) { + const url = this.router.serializeUrl(this.router.createUrlTree([`/application/${record.referenceId}`])); + + window.open(url, '_blank'); + } + + private mapApplications(applications: ApplicationSearchResultDto[]): SearchResult[] { + return applications.map((e) => { + const status = this.statuses.find((st) => st.code === e.status); + + return { + ...e, + status, + }; + }); + } + + private initSorting() { + if (this._totalCount <= 0) { + this.subscribedToSort = false; + } + + // push subscription to next render cycle, after the table is rendered + setTimeout(() => { + if (this.sort && !this.subscribedToSort) { + this.subscribedToSort = true; + this.sort.sortChange.pipe(takeUntil(this.$destroy)).subscribe(async (sortObj) => { + this.paginator.pageIndex = 0; + this.pageIndex = 0; + this.sortDirection = sortObj.direction.toUpperCase(); + this.sortField = sortObj.active; + + await this.onTableChange(); + }); + } + }); + } +} diff --git a/portal-frontend/src/app/features/public/search/file-type-filter-drop-down/file-type-filter-drop-down.component.html b/portal-frontend/src/app/features/public/search/file-type-filter-drop-down/file-type-filter-drop-down.component.html new file mode 100644 index 0000000000..02a22c2db4 --- /dev/null +++ b/portal-frontend/src/app/features/public/search/file-type-filter-drop-down/file-type-filter-drop-down.component.html @@ -0,0 +1,40 @@ +<mat-form-field appearance="outline" class="file-type-input"> + <input + value="{{ getSelectedItems() }}" + id="type" + type="text" + matInput + (input)="filterChanged($event)" + [matAutocomplete]="auto" + [formControl]="componentTypeControl" + /> + <mat-autocomplete autoActiveFirstOption #auto="matAutocomplete" class="tall-autocomplete"> + <mat-option disabled>Please select an item from below</mat-option> + <mat-tree [dataSource]="dataSource" [treeControl]="treeControl"> + <mat-tree-node *matTreeNodeDef="let node" matTreeNodeToggle matTreeNodePadding> + <button mat-icon-button disabled></button> + <mat-checkbox + class="checklist-leaf-node" + [checked]="checklistSelection.isSelected(node)" + (change)="todoLeafItemSelectionToggle(node)" + >{{ node.item?.label ?? node.item }}</mat-checkbox + > + </mat-tree-node> + + <mat-tree-node *matTreeNodeDef="let node; when: hasChild" matTreeNodePadding> + <button mat-icon-button matTreeNodeToggle [attr.aria-label]="'toggle ' + node.filename"> + <mat-icon class="mat-icon-rtl-mirror"> + {{ treeControl.isExpanded(node) ? 'expand_more' : 'chevron_right' }} + </mat-icon> + </button> + <mat-checkbox + [checked]="descendantsAllSelected(node)" + [indeterminate]="descendantsPartiallySelected(node)" + (change)="todoItemSelectionToggle(node)" + > + {{ node.item?.label ?? node.item }}</mat-checkbox + > + </mat-tree-node> + </mat-tree> + </mat-autocomplete> +</mat-form-field> diff --git a/portal-frontend/src/app/features/public/search/file-type-filter-drop-down/file-type-filter-drop-down.component.scss b/portal-frontend/src/app/features/public/search/file-type-filter-drop-down/file-type-filter-drop-down.component.scss new file mode 100644 index 0000000000..cd3259d384 --- /dev/null +++ b/portal-frontend/src/app/features/public/search/file-type-filter-drop-down/file-type-filter-drop-down.component.scss @@ -0,0 +1,7 @@ +.file-type-input { + width: 100%; +} + +.tall-autocomplete { + max-height: 600px !important; +} diff --git a/portal-frontend/src/app/features/public/search/file-type-filter-drop-down/file-type-filter-drop-down.component.spec.ts b/portal-frontend/src/app/features/public/search/file-type-filter-drop-down/file-type-filter-drop-down.component.spec.ts new file mode 100644 index 0000000000..98cd31ef11 --- /dev/null +++ b/portal-frontend/src/app/features/public/search/file-type-filter-drop-down/file-type-filter-drop-down.component.spec.ts @@ -0,0 +1,26 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { MatAutocompleteModule } from '@angular/material/autocomplete'; + +import { FileTypeFilterDropDownComponent } from './file-type-filter-drop-down.component'; + +describe('FileTypeFilterDropDownComponent', () => { + let component: FileTypeFilterDropDownComponent; + let fixture: ComponentFixture<FileTypeFilterDropDownComponent>; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [FileTypeFilterDropDownComponent], + schemas: [NO_ERRORS_SCHEMA], + imports: [MatAutocompleteModule], + }).compileComponents(); + + fixture = TestBed.createComponent(FileTypeFilterDropDownComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/public/search/file-type-filter-drop-down/file-type-filter-drop-down.component.ts b/portal-frontend/src/app/features/public/search/file-type-filter-drop-down/file-type-filter-drop-down.component.ts new file mode 100644 index 0000000000..875c648e96 --- /dev/null +++ b/portal-frontend/src/app/features/public/search/file-type-filter-drop-down/file-type-filter-drop-down.component.ts @@ -0,0 +1,189 @@ +import { SelectionModel } from '@angular/cdk/collections'; +import { FlatTreeControl } from '@angular/cdk/tree'; +import { AfterViewInit, Component, EventEmitter, Output } from '@angular/core'; +import { FormControl } from '@angular/forms'; +import { MatTreeFlatDataSource, MatTreeFlattener } from '@angular/material/tree'; +import { Observable } from 'rxjs'; +import { + FileTypeDataSourceService, + FlatTreeNode, + TreeNode, +} from '../../../../services/search/file-type/file-type-data-source.service'; + +@Component({ + selector: 'app-file-type-filter-drop-down', + templateUrl: './file-type-filter-drop-down.component.html', + styleUrls: ['./file-type-filter-drop-down.component.scss'], +}) +export class FileTypeFilterDropDownComponent implements AfterViewInit { + /** Map from flat node to nested node. This helps us finding the nested node to be modified */ + flatNodeMap = new Map<FlatTreeNode, TreeNode>(); + + /** Map from nested node to flattened node. This helps us to keep the same object for selection */ + nestedNodeMap = new Map<TreeNode, FlatTreeNode>(); + + treeControl: FlatTreeControl<FlatTreeNode>; + + treeFlattener: MatTreeFlattener<TreeNode, FlatTreeNode>; + + dataSource: MatTreeFlatDataSource<TreeNode, FlatTreeNode>; + + /** The selection for checklist */ + checklistSelection = new SelectionModel<FlatTreeNode>(true); + + filteredOptions = new Observable<string[]>(); + componentTypeControl = new FormControl<string[] | undefined>(undefined); + @Output() fileTypeChange = new EventEmitter<string[]>(); + + constructor(private fileTypeData: FileTypeDataSourceService) { + this.treeFlattener = new MatTreeFlattener(this.transformer, this.getLevel, this.isExpandable, this.getChildren); + this.treeControl = new FlatTreeControl<FlatTreeNode>(this.getLevel, this.isExpandable); + this.dataSource = new MatTreeFlatDataSource(this.treeControl, this.treeFlattener); + + fileTypeData.dataChange.subscribe((data) => { + this.dataSource.data = data; + }); + } + + getLevel = (node: FlatTreeNode) => node.level; + + isExpandable = (node: FlatTreeNode) => node.expandable; + + getChildren = (node: TreeNode): TreeNode[] | undefined => node.children; + + hasChild = (_: number, _nodeData: FlatTreeNode) => _nodeData.expandable; + + hasNoContent = (_: number, _nodeData: FlatTreeNode) => _nodeData.item.value === ''; + + /** + * Transformer to convert nested node to flat node. Record the nodes in maps for later use. + */ + transformer = (node: TreeNode, level: number) => { + const existingNode = this.nestedNodeMap.get(node); + const flatNode = existingNode && existingNode.item.value === node.item.value ? existingNode : ({} as FlatTreeNode); + flatNode.item = node.item; + flatNode.level = level; + flatNode.expandable = !!node.children; + + this.flatNodeMap.set(flatNode, node); + this.nestedNodeMap.set(node, flatNode); + + return flatNode; + }; + + /** Whether all the descendants of the node are selected. */ + descendantsAllSelected(node: FlatTreeNode): boolean { + const descendants = this.treeControl.getDescendants(node); + const descAllSelected = descendants.every((child) => this.checklistSelection.isSelected(child)); + return descAllSelected; + } + + /** Whether part of the descendants are selected */ + descendantsPartiallySelected(node: FlatTreeNode): boolean { + const descendants = this.treeControl.getDescendants(node); + const result = descendants.some((child) => this.checklistSelection.isSelected(child)); + return result && !this.descendantsAllSelected(node); + } + + /** Toggle the to-do item selection. Select/deselect all the descendants node */ + todoItemSelectionToggle(node: FlatTreeNode): void { + this.checklistSelection.toggle(node); + const descendants = this.treeControl.getDescendants(node); + this.checklistSelection.isSelected(node) + ? this.checklistSelection.select(...descendants) + : this.checklistSelection.deselect(...descendants); + + // Force update for the parent + descendants.every((child) => this.checklistSelection.isSelected(child)); + this.checkAllParentsSelection(node); + } + + /** Toggle a leaf to-do item selection. Check all the parents to see if they changed */ + todoLeafItemSelectionToggle(node: FlatTreeNode): void { + this.checklistSelection.toggle(node); + this.checkAllParentsSelection(node); + } + + /* Checks all the parents when a leaf node is selected/unselected */ + checkAllParentsSelection(node: FlatTreeNode): void { + let parent: FlatTreeNode | null = this.getParentNodeAndChange(node); + while (parent) { + this.checkRootNodeSelection(parent); + parent = this.getParentNodeAndChange(parent); + } + } + + /** Check root node checked state and change it accordingly */ + checkRootNodeSelection(node: FlatTreeNode): void { + const nodeSelected = this.checklistSelection.isSelected(node); + const descendants = this.treeControl.getDescendants(node); + const descAllSelected = descendants.every((child) => this.checklistSelection.isSelected(child)); + if (nodeSelected && !descAllSelected) { + this.checklistSelection.deselect(node); + } else if (!nodeSelected && descAllSelected) { + this.checklistSelection.select(node); + } + } + + /* Get the parent node of a node and emit onChange*/ + getParentNodeAndChange(node: FlatTreeNode): FlatTreeNode | null { + this.onChange(); + + const currentLevel = this.getLevel(node); + + if (currentLevel < 1) { + return null; + } + + const startIndex = this.treeControl.dataNodes.indexOf(node) - 1; + + for (let i = startIndex; i >= 0; i--) { + const currentNode = this.treeControl.dataNodes[i]; + + if (this.getLevel(currentNode) < currentLevel) { + return currentNode; + } + } + return null; + } + + getSelectedItems(): string { + if (!this.checklistSelection.selected.length) { + return ''; + } + + return this.checklistSelection.selected + .filter((selectedItem) => selectedItem.item.value !== null) + .map((selectedItem) => selectedItem.item?.label) + .join(', '); + } + + filterChanged($event: any) { + const filterText = $event.target.value; + // FileTypeTreeComponent.filter method which actually filters the tree and gives back a tree structure + + this.fileTypeData.filter(filterText); + if (filterText) { + this.treeControl.expandAll(); + } else { + this.treeControl.collapseAll(); + } + } + + onChange() { + this.fileTypeChange.emit( + this.checklistSelection.selected + .filter((selectedItem) => selectedItem.item.value) + .map((selectedItem) => selectedItem.item.value!) + ); + } + + reset() { + this.componentTypeControl.reset(); + this.checklistSelection.selected.forEach((selectedItem) => this.checklistSelection.deselect(selectedItem)); + } + + ngAfterViewInit(): void { + this.treeControl.expandAll(); + } +} diff --git a/portal-frontend/src/app/features/public/search/notice-of-intent-search-table/notice-of-intent-search-table.component.html b/portal-frontend/src/app/features/public/search/notice-of-intent-search-table/notice-of-intent-search-table.component.html new file mode 100644 index 0000000000..433b83c6fa --- /dev/null +++ b/portal-frontend/src/app/features/public/search/notice-of-intent-search-table/notice-of-intent-search-table.component.html @@ -0,0 +1,81 @@ +<ng-container *ngIf="_totalCount > 0"> + <table + mat-table + [dataSource]="dataSource" + class="mat-elevation-z2 table" + matSort + matSortActive="dateSubmitted" + matSortDirection="desc" + matSortDisableClear + > + <ng-container matColumnDef="fileId"> + <th mat-header-cell *matHeaderCellDef mat-sort-header>Application ID</th> + <td mat-cell *matCellDef="let element"> + <a (click)="onSelectRecord(element)">{{ element.fileNumber | emptyColumn }}</a> + </td> + </ng-container> + + <ng-container matColumnDef="ownerName"> + <th mat-header-cell *matHeaderCellDef mat-sort-header>Owner Name</th> + <td mat-cell *matCellDef="let element"> + {{ element.ownerName | emptyColumn }} + </td> + </ng-container> + + <ng-container matColumnDef="type"> + <th class="type-cell" mat-header-cell *matHeaderCellDef mat-sort-header>Type</th> + <td mat-cell class="type-cell" *matCellDef="let element"> + {{ element.type }} + <ng-container *ngIf="element.type === null || element.type === undefined">-</ng-container> + </td> + </ng-container> + + <ng-container matColumnDef="portalStatus"> + <th class="type-cell" mat-header-cell *matHeaderCellDef mat-sort-header>Status</th> + <td mat-cell class="type-cell" *matCellDef="let element"> + <div + *ngIf="element.status" + class="label" + [style]="{ 'background-color': element.status.portalBackgroundColor, color: element.status.portalColor }" + > + {{ element.status.label }} + </div> + </td> + </ng-container> + + <ng-container matColumnDef="lastUpdate"> + <th mat-header-cell *matHeaderCellDef mat-sort-header>Last Update</th> + <td mat-cell *matCellDef="let element"> + {{ element.lastUpdate | momentFormat | emptyColumn }} + </td> + </ng-container> + + <ng-container matColumnDef="government"> + <th mat-header-cell *matHeaderCellDef mat-sort-header>Local/First Nation Government</th> + <td mat-cell *matCellDef="let element"> + {{ element.localGovernmentName | emptyColumn }} + </td> + </ng-container> + + <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr> + <tr mat-row *matRowDef="let row; columns: displayedColumns"></tr> + + <tr class="mat-row no-data" *matNoDataRow> + <td class="text-center" colspan="6"> + <div><b>No notice of intent found.</b></div> + <div>Please adjust criteria and try again.</div> + </td> + </tr> + </table> + <mat-paginator + [length]="_totalCount" + [pageSize]="20" + [pageSizeOptions]="[20, 50, 100]" + (page)="onPageChange($event)" + aria-label="Select page" + ></mat-paginator> +</ng-container> +<div class="no-data" *ngIf="_totalCount === 0"> + <div><b>No notice of intent found.</b></div> + <div>Please adjust criteria and try again.</div> +</div> diff --git a/portal-frontend/src/app/features/public/search/notice-of-intent-search-table/notice-of-intent-search-table.component.scss b/portal-frontend/src/app/features/public/search/notice-of-intent-search-table/notice-of-intent-search-table.component.scss new file mode 100644 index 0000000000..e69de29bb2 diff --git a/portal-frontend/src/app/features/public/search/notice-of-intent-search-table/notice-of-intent-search-table.component.spec.ts b/portal-frontend/src/app/features/public/search/notice-of-intent-search-table/notice-of-intent-search-table.component.spec.ts new file mode 100644 index 0000000000..8f73bb0ba8 --- /dev/null +++ b/portal-frontend/src/app/features/public/search/notice-of-intent-search-table/notice-of-intent-search-table.component.spec.ts @@ -0,0 +1,33 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { Router } from '@angular/router'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; + +import { NoticeOfIntentSearchTableComponent } from './notice-of-intent-search-table.component'; + +describe('NoticeOfIntentSearchTableComponent', () => { + let component: NoticeOfIntentSearchTableComponent; + let fixture: ComponentFixture<NoticeOfIntentSearchTableComponent>; + let mockRouter: DeepMocked<Router>; + + beforeEach(async () => { + mockRouter = createMock(); + + await TestBed.configureTestingModule({ + declarations: [NoticeOfIntentSearchTableComponent], + providers: [ + { + provide: Router, + useValue: mockRouter, + }, + ], + }).compileComponents(); + + fixture = TestBed.createComponent(NoticeOfIntentSearchTableComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/public/search/notice-of-intent-search-table/notice-of-intent-search-table.component.ts b/portal-frontend/src/app/features/public/search/notice-of-intent-search-table/notice-of-intent-search-table.component.ts new file mode 100644 index 0000000000..c744a05f60 --- /dev/null +++ b/portal-frontend/src/app/features/public/search/notice-of-intent-search-table/notice-of-intent-search-table.component.ts @@ -0,0 +1,111 @@ +import { Component, EventEmitter, Input, OnDestroy, Output, ViewChild } from '@angular/core'; +import { MatPaginator, PageEvent } from '@angular/material/paginator'; +import { MatSort } from '@angular/material/sort'; +import { Router } from '@angular/router'; +import { Subject, takeUntil } from 'rxjs'; +import { ApplicationStatusDto } from '../../../../services/application-submission/application-submission.dto'; +import { ApplicationRegionDto, NoticeOfIntentTypeDto } from '../../../../services/code/code.dto'; +import { NoticeOfIntentSubmissionStatusDto } from '../../../../services/notice-of-intent-submission/notice-of-intent-submission.dto'; +import { NoticeOfIntentSearchResultDto } from '../../../../services/search/search.dto'; +import { SearchResult, TableChange } from '../search.interface'; + +@Component({ + selector: 'app-notice-of-intent-search-table', + templateUrl: './notice-of-intent-search-table.component.html', + styleUrls: ['./notice-of-intent-search-table.component.scss'], +}) +export class NoticeOfIntentSearchTableComponent implements OnDestroy { + $destroy = new Subject<void>(); + + @ViewChild(MatPaginator) paginator!: MatPaginator; + @ViewChild(MatSort) sort?: MatSort; + + _noticeOfIntents: NoticeOfIntentSearchResultDto[] = []; + @Input() set noticeOfIntents(noticeOfIntents: NoticeOfIntentSearchResultDto[]) { + this._noticeOfIntents = noticeOfIntents; + this.dataSource = this.mapNoticeOfIntent(noticeOfIntents); + } + + _totalCount = 0; + @Input() set totalCount(count: number) { + this._totalCount = count; + this.initSorting(); + } + + @Input() statuses: ApplicationStatusDto[] = []; + @Input() regions: ApplicationRegionDto[] = []; + + @Output() tableChange = new EventEmitter<TableChange>(); + + displayedColumns = ['fileId', 'ownerName', 'type', 'portalStatus', 'lastUpdate', 'government']; + dataSource: SearchResult[] = []; + pageIndex = 0; + itemsPerPage = 20; + total = 0; + sortDirection = 'DESC'; + sortField = 'lastUpdate'; + + private subscribedToSort = false; + + constructor(private router: Router) {} + + ngOnDestroy(): void { + this.$destroy.next(); + this.$destroy.complete(); + } + + async onTableChange() { + this.tableChange.emit({ + pageIndex: this.pageIndex, + itemsPerPage: this.itemsPerPage, + sortDirection: this.sortDirection, + sortField: this.sortField, + tableType: 'NOI', + }); + } + + async onPageChange($event: PageEvent) { + this.pageIndex = $event.pageIndex; + this.itemsPerPage = $event.pageSize; + + await this.onTableChange(); + } + + async onSelectRecord(record: SearchResult) { + const url = this.router.serializeUrl(this.router.createUrlTree([`/notice-of-intent/${record.referenceId}`])); + + window.open(url, '_blank'); + } + + private mapNoticeOfIntent(applications: NoticeOfIntentSearchResultDto[]): SearchResult[] { + return applications.map((e) => { + const status = this.statuses.find((st) => st.code === e.status); + + return { + ...e, + status, + }; + }); + } + + private initSorting() { + if (this._totalCount <= 0) { + this.subscribedToSort = false; + } + + // push subscription to next render cycle, after the table is rendered + setTimeout(() => { + if (this.sort && !this.subscribedToSort) { + this.subscribedToSort = true; + this.sort.sortChange.pipe(takeUntil(this.$destroy)).subscribe(async (sortObj) => { + this.paginator.pageIndex = 0; + this.pageIndex = 0; + this.sortDirection = sortObj.direction.toUpperCase(); + this.sortField = sortObj.active; + + await this.onTableChange(); + }); + } + }); + } +} diff --git a/portal-frontend/src/app/features/public/search/notification-search-table/notification-search-table.component.html b/portal-frontend/src/app/features/public/search/notification-search-table/notification-search-table.component.html new file mode 100644 index 0000000000..90a0b85cbe --- /dev/null +++ b/portal-frontend/src/app/features/public/search/notification-search-table/notification-search-table.component.html @@ -0,0 +1,81 @@ +<ng-container *ngIf="_totalCount > 0"> + <table + mat-table + [dataSource]="dataSource" + class="mat-elevation-z2 table" + matSort + matSortActive="dateSubmitted" + matSortDirection="desc" + matSortDisableClear + > + <ng-container matColumnDef="fileId"> + <th mat-header-cell *matHeaderCellDef mat-sort-header>Application ID</th> + <td mat-cell *matCellDef="let element"> + <a (click)="onSelectRecord(element)">{{ element.fileNumber | emptyColumn }}</a> + </td> + </ng-container> + + <ng-container matColumnDef="ownerName"> + <th mat-header-cell *matHeaderCellDef mat-sort-header>Owner Name</th> + <td mat-cell *matCellDef="let element"> + {{ element.ownerName | emptyColumn }} + </td> + </ng-container> + + <ng-container matColumnDef="type"> + <th class="type-cell" mat-header-cell *matHeaderCellDef mat-sort-header>Type</th> + <td mat-cell class="type-cell" *matCellDef="let element"> + {{ element.type }} + <ng-container *ngIf="element.type === null || element.type === undefined">-</ng-container> + </td> + </ng-container> + + <ng-container matColumnDef="portalStatus"> + <th class="type-cell" mat-header-cell *matHeaderCellDef mat-sort-header>Status</th> + <td mat-cell class="type-cell" *matCellDef="let element"> + <div + *ngIf="element.status" + class="label" + [style]="{ 'background-color': element.status.portalBackgroundColor, color: element.status.portalColor }" + > + {{ element.status.label }} + </div> + </td> + </ng-container> + + <ng-container matColumnDef="lastUpdate"> + <th mat-header-cell *matHeaderCellDef mat-sort-header>Last Update</th> + <td mat-cell *matCellDef="let element"> + {{ element.lastUpdate | momentFormat | emptyColumn }} + </td> + </ng-container> + + <ng-container matColumnDef="government"> + <th mat-header-cell *matHeaderCellDef mat-sort-header>Local/First Nation Government</th> + <td mat-cell *matCellDef="let element"> + {{ element.localGovernmentName | emptyColumn }} + </td> + </ng-container> + + <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr> + <tr mat-row *matRowDef="let row; columns: displayedColumns"></tr> + + <tr class="mat-row no-data" *matNoDataRow> + <td class="text-center" colspan="6"> + <div><b>No notice of intent found.</b></div> + <div>Please adjust criteria and try again.</div> + </td> + </tr> + </table> + <mat-paginator + [length]="_totalCount" + [pageSize]="20" + [pageSizeOptions]="[20, 50, 100]" + (page)="onPageChange($event)" + aria-label="Select page" + ></mat-paginator> +</ng-container> +<div class="no-data" *ngIf="_totalCount === 0"> + <div><b>No notifications found.</b></div> + <div>Please adjust criteria and try again.</div> +</div> diff --git a/portal-frontend/src/app/features/public/search/notification-search-table/notification-search-table.component.scss b/portal-frontend/src/app/features/public/search/notification-search-table/notification-search-table.component.scss new file mode 100644 index 0000000000..e69de29bb2 diff --git a/portal-frontend/src/app/features/public/search/notification-search-table/notification-search-table.component.spec.ts b/portal-frontend/src/app/features/public/search/notification-search-table/notification-search-table.component.spec.ts new file mode 100644 index 0000000000..61737af5b2 --- /dev/null +++ b/portal-frontend/src/app/features/public/search/notification-search-table/notification-search-table.component.spec.ts @@ -0,0 +1,33 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { Router } from '@angular/router'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; + +import { NotificationSearchTableComponent } from './notification-search-table.component'; + +describe('NotificationSearchTableComponent', () => { + let component: NotificationSearchTableComponent; + let fixture: ComponentFixture<NotificationSearchTableComponent>; + let mockRouter: DeepMocked<Router>; + + beforeEach(async () => { + mockRouter = createMock(); + + await TestBed.configureTestingModule({ + declarations: [NotificationSearchTableComponent], + providers: [ + { + provide: Router, + useValue: mockRouter, + }, + ], + }).compileComponents(); + + fixture = TestBed.createComponent(NotificationSearchTableComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/public/search/notification-search-table/notification-search-table.component.ts b/portal-frontend/src/app/features/public/search/notification-search-table/notification-search-table.component.ts new file mode 100644 index 0000000000..f4a8ba5512 --- /dev/null +++ b/portal-frontend/src/app/features/public/search/notification-search-table/notification-search-table.component.ts @@ -0,0 +1,110 @@ +import { Component, EventEmitter, Input, OnDestroy, Output, ViewChild } from '@angular/core'; +import { MatPaginator, PageEvent } from '@angular/material/paginator'; +import { MatSort } from '@angular/material/sort'; +import { Router } from '@angular/router'; +import { Subject, takeUntil } from 'rxjs'; +import { ApplicationStatusDto } from '../../../../services/application-submission/application-submission.dto'; +import { NotificationSearchResultDto } from '../../../../services/search/search.dto'; +import { SearchResult, TableChange } from '../search.interface'; + +@Component({ + selector: 'app-notification-search-table', + templateUrl: './notification-search-table.component.html', + styleUrls: ['./notification-search-table.component.scss'], +}) +export class NotificationSearchTableComponent implements OnDestroy { + $destroy = new Subject<void>(); + + @ViewChild(MatPaginator) paginator!: MatPaginator; + @ViewChild(MatSort) sort?: MatSort; + + _notifications: NotificationSearchResultDto[] = []; + + @Input() statuses: ApplicationStatusDto[] = []; + + @Input() set notifications(notifications: NotificationSearchResultDto[]) { + this._notifications = notifications; + this.dataSource = this.mapNotifications(notifications); + } + + _totalCount = 0; + @Input() set totalCount(count: number) { + this._totalCount = count; + this.initSorting(); + } + + @Input() regions: string[] = []; + @Output() tableChange = new EventEmitter<TableChange>(); + + displayedColumns = ['fileId', 'ownerName', 'type', 'portalStatus', 'lastUpdate', 'government']; + dataSource: SearchResult[] = []; + pageIndex = 0; + itemsPerPage = 20; + total = 0; + sortDirection = 'DESC'; + sortField = 'lastUpdate'; + + private subscribedToSort = false; + + constructor(private router: Router) {} + + ngOnDestroy(): void { + this.$destroy.next(); + this.$destroy.complete(); + } + + async onTableChange() { + this.tableChange.emit({ + pageIndex: this.pageIndex, + itemsPerPage: this.itemsPerPage, + sortDirection: this.sortDirection, + sortField: this.sortField, + tableType: 'NOTI', + }); + } + + async onPageChange($event: PageEvent) { + this.pageIndex = $event.pageIndex; + this.itemsPerPage = $event.pageSize; + + await this.onTableChange(); + } + + async onSelectRecord(record: SearchResult) { + const url = this.router.serializeUrl(this.router.createUrlTree([`/notification/${record.referenceId}`])); + + window.open(url, '_blank'); + } + + private mapNotifications(notifications: NotificationSearchResultDto[]): SearchResult[] { + return notifications.map((e) => { + const status = this.statuses.find((st) => st.code === e.status); + + return { + ...e, + status, + }; + }); + } + + private initSorting() { + if (this._totalCount <= 0) { + this.subscribedToSort = false; + } + + // push subscription to next render cycle, after the table is rendered + setTimeout(() => { + if (this.sort && !this.subscribedToSort) { + this.subscribedToSort = true; + this.sort.sortChange.pipe(takeUntil(this.$destroy)).subscribe(async (sortObj) => { + this.paginator.pageIndex = 0; + this.pageIndex = 0; + this.sortDirection = sortObj.direction.toUpperCase(); + this.sortField = sortObj.active; + + await this.onTableChange(); + }); + } + }); + } +} diff --git a/portal-frontend/src/app/features/public/search/public-search.component.html b/portal-frontend/src/app/features/public/search/public-search.component.html new file mode 100644 index 0000000000..0e76a3288a --- /dev/null +++ b/portal-frontend/src/app/features/public/search/public-search.component.html @@ -0,0 +1,155 @@ +<section> + <h1>Welcome to the ALC Public Search</h1> + <app-warning-banner> + This search returns only publicly available information. Applicants and local or First Nation governments should + <a routerLink="/login">log in</a> to view their detailed submissions. + </app-warning-banner> + + <h3>Search by one or more of the following fields:</h3> + + <form class="content" [formGroup]="searchForm" (ngSubmit)="onSubmit()"> + <div class="search-form"> + <div> + <label for="fileNumber">ALC ID</label> + <mat-form-field appearance="outline"> + <input id="fileNumber" matInput formControlName="fileNumber" /> + </mat-form-field> + </div> + <div> + <label for="pid">PID</label> + <mat-form-field appearance="outline"> + <input id="pid" matInput formControlName="pid" minlength="9" maxlength="12" mask="000-000-000" /> + </mat-form-field> + <div *ngIf="pidInvalid" class="field-error"> + <mat-icon>warning</mat-icon> + <div *ngIf="pidControl.errors?.['mask']">PID must be 9 digits including leading zeroes</div> + </div> + </div> + <div> + <label for="name">Name</label> + <mat-form-field appearance="outline"> + <input id="name" matInput formControlName="name" minlength="3" /> + </mat-form-field> + <div *ngIf="nameControl.invalid && (nameControl.dirty || nameControl.touched)" class="field-error"> + <mat-icon>warning</mat-icon> + <div *ngIf="nameControl.errors?.['minlength']">Enter 3 or more characters to search by name</div> + </div> + </div> + <div> + <label for="civicAddress">Civic Address</label> + <mat-form-field appearance="outline"> + <input id="civicAddress" matInput formControlName="civicAddress" minlength="3" /> + </mat-form-field> + <div *ngIf="civicAddressInvalid" class="field-error"> + <mat-icon>warning</mat-icon> + <div *ngIf="civicAddressControl.errors?.['minlength']">Enter 3 or more characters to search</div> + </div> + </div> + <div> + <label for="civicAddress">Local/First Nation Government</label> + <mat-form-field appearance="outline"> + <input + (blur)="onBlur()" + id="government" + type="text" + matInput + formControlName="government" + [matAutocomplete]="auto" + /> + <mat-autocomplete (optionSelected)="onGovernmentChange($event)" #auto="matAutocomplete"> + <mat-option *ngFor="let option of filteredLocalGovernments | async" [value]="option.name"> + {{ option.name }} + </mat-option> + </mat-autocomplete> + </mat-form-field> + </div> + <div> + <label for="status">Region</label> + <mat-form-field appearance="outline"> + <mat-select id="region" formControlName="region"> + <mat-option *ngFor="let region of regions" [value]="region.code">{{ region.label }}</mat-option> + </mat-select> + </mat-form-field> + </div> + <div><label for="status">Decision Outcome</label>//TODO: Decision Outcome</div> + <div> + <label for="status">Decision Maker</label> + <mat-form-field appearance="outline"> + <mat-select id="decisionMaker" formControlName="decisionMaker"> + <mat-option *ngFor="let decisionMaker of decisionMakers" [value]="decisionMaker.code">{{ + decisionMaker.label + }}</mat-option> + </mat-select> + </mat-form-field> + </div> + <div> + <label for="type">Type</label> + <app-file-type-filter-drop-down #fileTypeDropDown (fileTypeChange)="onFileTypeChange($event)" /> + </div> + <div> + <label for="status">Status</label> + <mat-form-field appearance="outline"> + <mat-select id="status" [formControl]="portalStatusControl"> + <mat-option *ngFor="let status of STATUS_MAP" [value]="status[1]"> + {{ status[0] }} + </mat-option> + </mat-select> + </mat-form-field> + </div> + <div class="full-width"> + <label for="status">Decision Dates</label> + <mat-form-field appearance="outline"> + <mat-date-range-input [rangePicker]="decisionDatePicker"> + <input matStartDate formControlName="dateDecidedFrom" /> + <input matEndDate formControlName="dateDecidedTo" /> + </mat-date-range-input> + <mat-datepicker-toggle matIconSuffix [for]="decisionDatePicker"></mat-datepicker-toggle> + <mat-date-range-picker #decisionDatePicker></mat-date-range-picker + ></mat-form-field> + </div> + </div> + + <div class="button-controls"> + <button type="button" mat-stroked-button color="accent" (click)="onReset()">Clear</button> + <button type="submit" mat-flat-button color="primary" [disabled]="formEmpty || !searchForm.valid">Search</button> + </div> + </form> + + <div class="search-fields-wrapper search-result-wrapper" *ngIf="!searchResultsHidden"> + <h2 class="search-title">Search Results</h2> + <mat-tab-group mat-align-tabs="start" mat-stretch-tabs="false" #searchResultTabs> + <mat-tab> + <ng-template mat-tab-label> Applications: {{ applicationTotal }} </ng-template> + <app-application-search-table + [applications]="applications" + [totalCount]="applicationTotal" + [statuses]="statuses" + [regions]="regions" + (tableChange)="onTableChange($event)" + ></app-application-search-table> + </mat-tab> + + <mat-tab> + <ng-template mat-tab-label> Notice of Intent: {{ noticeOfIntentTotal }} </ng-template> + <app-notice-of-intent-search-table + [noticeOfIntents]="noticeOfIntents" + [totalCount]="noticeOfIntentTotal" + [statuses]="statuses" + [regions]="regions" + (tableChange)="onTableChange($event)" + ></app-notice-of-intent-search-table> + </mat-tab> + + <mat-tab> + <ng-template mat-tab-label> Notifications: {{ notificationTotal }} </ng-template> + <app-notification-search-table + [statuses]="statuses" + [notifications]="notifications" + [totalCount]="notificationTotal" + (tableChange)="onTableChange($event)" + > + </app-notification-search-table> + </mat-tab> + </mat-tab-group> + </div> +</section> diff --git a/portal-frontend/src/app/features/public/search/public-search.component.scss b/portal-frontend/src/app/features/public/search/public-search.component.scss new file mode 100644 index 0000000000..cecf0bb129 --- /dev/null +++ b/portal-frontend/src/app/features/public/search/public-search.component.scss @@ -0,0 +1,86 @@ +@use '../../../../styles/colors'; +@use '../../../../styles/functions' as *; + +:host::ng-deep { + .label { + display: inline-block; + padding: rem(4) rem(16); + border-radius: rem(16); + font-weight: bold; + } +} + +.search-form { + display: grid; + grid-template-columns: 1fr; + grid-row-gap: rem(20); + margin-bottom: rem(16); + + @media screen and (min-width: $tabletBreakpoint) { + grid-template-columns: 1fr 1fr; + grid-column-gap: rem(28); + grid-row-gap: rem(24); + + .full-width { + grid-column: 1/3; + } + } + + label { + display: block; + margin-bottom: rem(2); + } + + .mat-mdc-form-field { + width: 100%; + } +} + +.button-controls { + display: flex; + flex-direction: column-reverse; + + button { + width: 100%; + margin-top: rem(12) !important; + } + + @media screen and (min-width: $tabletBreakpoint) { + flex-direction: row; + justify-content: space-between; + + button { + width: unset; + } + } +} + +.search-result-wrapper { + margin-top: rem(60); + margin-bottom: rem(60); +} + +.field-error { + color: colors.$error-color; + font-size: rem(15); + font-weight: 700; + display: flex; + align-items: center; + margin-top: rem(4); + flex-direction: row !important; + gap: rem(4); + + div { + color: colors.$error-color; + } +} + +.mat-mdc-select-placeholder { + color: rgba(0, 0, 0, 0.6); +} + +.no-data { + overflow: hidden; + margin: rem(20) 0; + padding: rem(8) rem(12); +} diff --git a/portal-frontend/src/app/features/public/search/public-search.component.spec.ts b/portal-frontend/src/app/features/public/search/public-search.component.spec.ts new file mode 100644 index 0000000000..d172155307 --- /dev/null +++ b/portal-frontend/src/app/features/public/search/public-search.component.spec.ts @@ -0,0 +1,50 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { MatAutocompleteModule } from '@angular/material/autocomplete'; +import { DeepMocked } from '@golevelup/ts-jest'; +import { CodeService } from '../../../services/code/code.service'; +import { SearchService } from '../../../services/search/search.service'; +import { StatusService } from '../../../services/status/status.service'; +import { ToastService } from '../../../services/toast/toast.service'; + +import { PublicSearchComponent } from './public-search.component'; + +describe('PublicSearchComponent', () => { + let component: PublicSearchComponent; + let fixture: ComponentFixture<PublicSearchComponent>; + let mockSearchService: DeepMocked<SearchService>; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [MatAutocompleteModule], + declarations: [PublicSearchComponent], + providers: [ + { + provide: SearchService, + useValue: mockSearchService, + }, + { + provide: CodeService, + useValue: {}, + }, + { + provide: StatusService, + useValue: {}, + }, + { + provide: ToastService, + useValue: {}, + }, + ], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(PublicSearchComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/public/search/public-search.component.ts b/portal-frontend/src/app/features/public/search/public-search.component.ts new file mode 100644 index 0000000000..98069c147d --- /dev/null +++ b/portal-frontend/src/app/features/public/search/public-search.component.ts @@ -0,0 +1,333 @@ +import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; +import { FormControl, FormGroup } from '@angular/forms'; +import { MatAutocompleteSelectedEvent } from '@angular/material/autocomplete'; +import { MatPaginator } from '@angular/material/paginator'; +import { MatSort } from '@angular/material/sort'; +import { MatTabGroup } from '@angular/material/tabs'; +import { Title } from '@angular/platform-browser'; +import { map, Observable, startWith, Subject, takeUntil } from 'rxjs'; +import { ApplicationStatusDto } from '../../../services/application-submission/application-submission.dto'; +import { ApplicationRegionDto, DecisionMakerDto, LocalGovernmentDto } from '../../../services/code/code.dto'; +import { CodeService } from '../../../services/code/code.service'; +import { + ApplicationSearchResultDto, + NoticeOfIntentSearchResultDto, + NotificationSearchResultDto, + SearchRequestDto, + SearchResponseDto, +} from '../../../services/search/search.dto'; +import { SearchService } from '../../../services/search/search.service'; +import { StatusService } from '../../../services/status/status.service'; +import { ToastService } from '../../../services/toast/toast.service'; +import { FileTypeFilterDropDownComponent } from './file-type-filter-drop-down/file-type-filter-drop-down.component'; +import { TableChange } from './search.interface'; + +const STATUS_MAP = { + 'Received by ALC': 'RECA', + 'Under Review by ALC': 'REVA', + 'Decision Released': 'ALCD', + 'ALC Response Sent (SRW only)': 'ALCR', +}; + +@Component({ + selector: 'app-public', + templateUrl: './public-search.component.html', + styleUrls: ['./public-search.component.scss'], +}) +export class PublicSearchComponent implements OnInit, OnDestroy { + $destroy = new Subject<void>(); + + @ViewChild(MatPaginator) paginator!: MatPaginator; + @ViewChild(MatSort) sort?: MatSort; + @ViewChild('searchResultTabs') tabGroup!: MatTabGroup; + @ViewChild('fileTypeDropDown') fileTypeFilterDropDownComponent!: FileTypeFilterDropDownComponent; + + applications: ApplicationSearchResultDto[] = []; + applicationTotal = 0; + + noticeOfIntents: NoticeOfIntentSearchResultDto[] = []; + noticeOfIntentTotal = 0; + + notifications: NotificationSearchResultDto[] = []; + notificationTotal = 0; + + pageIndex = 0; + itemsPerPage = 20; + sortDirection = 'DESC'; + sortField = 'dateSubmitted'; + + localGovernmentControl = new FormControl<string | undefined>(undefined); + portalStatusControl = new FormControl<string | undefined>(undefined); + componentTypeControl = new FormControl<string[] | undefined>(undefined); + pidControl = new FormControl<string | undefined>(undefined); + nameControl = new FormControl<string | undefined>(undefined); + civicAddressControl = new FormControl<string | undefined>(undefined); + searchForm = new FormGroup({ + fileNumber: new FormControl<string | undefined>(undefined), + name: this.nameControl, + pid: this.pidControl, + civicAddress: this.civicAddressControl, + portalStatus: this.portalStatusControl, + componentType: this.componentTypeControl, + government: this.localGovernmentControl, + decisionMaker: new FormControl<string | undefined>(undefined), + region: new FormControl<string | undefined>(undefined), + dateDecidedFrom: new FormControl(undefined), + dateDecidedTo: new FormControl(undefined), + }); + localGovernments: LocalGovernmentDto[] = []; + filteredLocalGovernments!: Observable<LocalGovernmentDto[]>; + regions: ApplicationRegionDto[] = []; + statuses: ApplicationStatusDto[] = []; + + formEmpty = true; + civicAddressInvalid = false; + pidInvalid = false; + searchResultsHidden = true; + decisionMakers: DecisionMakerDto[] = []; + STATUS_MAP = Object.entries(STATUS_MAP); + + constructor( + private searchService: SearchService, + private codeService: CodeService, + private statusService: StatusService, + private toastService: ToastService, + private titleService: Title + ) { + this.titleService.setTitle('ALC Portal | Public Search'); + } + + ngOnInit(): void { + this.setup(); + + this.searchForm.valueChanges.pipe(takeUntil(this.$destroy)).subscribe(() => { + let isEmpty = true; + for (let key in this.searchForm.controls) { + let value = this.searchForm.controls[key as keyof typeof this.searchForm.controls].value; + if (value && !(Array.isArray(value) && value.length === 0)) { + isEmpty = false; + break; + } + } + this.formEmpty = isEmpty; + }); + + this.civicAddressControl.valueChanges.pipe(takeUntil(this.$destroy)).subscribe(() => { + this.civicAddressInvalid = + this.civicAddressControl.invalid && (this.civicAddressControl.dirty || this.civicAddressControl.touched); + }); + + this.pidControl.valueChanges.pipe(takeUntil(this.$destroy)).subscribe(() => { + this.pidInvalid = this.pidControl.invalid && (this.pidControl.dirty || this.pidControl.touched); + }); + } + + private setup() { + this.loadCodes(); + this.loadStatuses(); + + this.filteredLocalGovernments = this.localGovernmentControl.valueChanges.pipe( + startWith(''), + map((value) => this.filterLocalGovernment(value || '')) + ); + } + + ngOnDestroy(): void { + this.$destroy.next(); + this.$destroy.complete(); + } + + async onSubmit() { + const searchParams = this.getSearchParams(); + const result = await this.searchService.search(searchParams); + this.searchResultsHidden = false; + + // push tab activation to next render cycle, after the tabGroup is rendered + setTimeout(() => { + this.mapSearchResults(result); + + this.setActiveTab(); + }); + } + + onGovernmentChange($event: MatAutocompleteSelectedEvent) { + const localGovernmentName = $event.option.value; + if (localGovernmentName) { + const localGovernment = this.localGovernments.find((lg) => lg.name == localGovernmentName); + if (localGovernment) { + this.localGovernmentControl.setValue(localGovernment.name); + } + } + } + + onBlur() { + //Blur will fire before onGovernmentChange above, so use setTimeout to delay it + setTimeout(() => { + const localGovernmentName = this.localGovernmentControl.getRawValue(); + if (localGovernmentName) { + const localGovernment = this.localGovernments.find((lg) => lg.name == localGovernmentName); + if (!localGovernment) { + this.localGovernmentControl.setValue(null); + console.log('Clearing Local Government field'); + } + } + }, 500); + } + + onReset() { + this.searchForm.reset(); + + if (this.fileTypeFilterDropDownComponent) { + this.fileTypeFilterDropDownComponent.reset(); + } + } + + getSearchParams(): SearchRequestDto { + const searchControls = this.searchForm.controls; + + return { + // pagination + pageSize: this.itemsPerPage, + page: this.pageIndex + 1, + // sorting + sortField: this.sortField, + sortDirection: this.sortDirection, + // search parameters + fileNumber: this.formatStringSearchParam(searchControls.fileNumber.value), + name: this.formatStringSearchParam(searchControls.name.value), + civicAddress: this.formatStringSearchParam(searchControls.civicAddress.value), + pid: this.formatStringSearchParam(searchControls.pid.value), + portalStatusCode: searchControls.portalStatus.value ?? undefined, + governmentName: this.formatStringSearchParam(searchControls.government.value), + regionCode: searchControls.region.value ?? undefined, + decisionMakerCode: searchControls.decisionMaker.value ?? undefined, + dateDecidedFrom: searchControls.dateDecidedFrom.value + ? new Date(searchControls.dateDecidedFrom.value).getTime() + : undefined, + dateDecidedTo: searchControls.dateDecidedTo.value + ? new Date(searchControls.dateDecidedTo.value).getTime() + : undefined, + fileTypes: searchControls.componentType.value ? searchControls.componentType.value : [], + }; + } + + async onApplicationSearch() { + const searchParams = this.getSearchParams(); + const result = await this.searchService.searchApplications(searchParams); + + this.applications = result?.data ?? []; + this.applicationTotal = result?.total ?? 0; + } + + async onNoticeOfIntentSearch() { + const searchParams = this.getSearchParams(); + const result = await this.searchService.searchNoticeOfIntents(searchParams); + + this.noticeOfIntents = result?.data ?? []; + this.noticeOfIntentTotal = result?.total ?? 0; + } + + async onNotificationSearch() { + const searchParams = this.getSearchParams(); + const result = await this.searchService.searchNotifications(searchParams); + + this.notifications = result?.data ?? []; + this.notificationTotal = result?.total ?? 0; + } + + async onTableChange(event: TableChange) { + this.pageIndex = event.pageIndex; + this.itemsPerPage = event.itemsPerPage; + this.sortDirection = event.sortDirection; + this.sortField = event.sortField; + + switch (event.tableType) { + case 'APP': + await this.onApplicationSearch(); + break; + case 'NOI': + await this.onNoticeOfIntentSearch(); + break; + case 'NOTI': + await this.onNotificationSearch(); + break; + default: + this.toastService.showErrorToast('Not implemented'); + } + } + + onFileTypeChange(fileTypes: string[]) { + this.componentTypeControl.setValue(fileTypes); + } + + private async loadCodes() { + const { localGovernments, regions, decisionMakers } = await this.codeService.loadCodes(); + this.localGovernments = localGovernments.sort((a, b) => (a.name > b.name ? 1 : -1)); + this.regions = regions.sort((a, b) => (a.label > b.label ? 1 : -1)); + this.decisionMakers = decisionMakers.sort((a, b) => (a.label > b.label ? 1 : -1)); + } + + private filterLocalGovernment(value: string): LocalGovernmentDto[] { + if (this.localGovernments) { + const filterValue = value.toLowerCase(); + return this.localGovernments.filter((localGovernment) => + localGovernment.name.toLowerCase().includes(filterValue) + ); + } + return []; + } + + private mapSearchResults(searchResult?: SearchResponseDto) { + if (!searchResult) { + searchResult = { + applications: [], + noticeOfIntents: [], + notifications: [], + totalApplications: 0, + totalNoticeOfIntents: 0, + totalNotifications: 0, + }; + } + + this.applicationTotal = searchResult.totalApplications; + this.applications = searchResult.applications; + + this.noticeOfIntentTotal = searchResult.totalNoticeOfIntents; + this.noticeOfIntents = searchResult.noticeOfIntents; + + this.notifications = searchResult.notifications; + this.notificationTotal = searchResult.totalNotifications; + } + + private setActiveTab() { + //Keep this in Tab Order + const searchCounts = [this.applicationTotal, this.noticeOfIntentTotal, this.notificationTotal]; + + this.tabGroup.selectedIndex = searchCounts.indexOf(Math.max(...searchCounts)); + } + + private formatStringSearchParam(value: string | undefined | null) { + if (value === undefined || value === null) { + return undefined; + } + + if (value.trim() === '') { + return undefined; + } else { + return value.trim(); + } + } + + private async loadStatuses() { + const statuses = await this.statusService.getStatuses(); + + if (statuses) { + this.populateAllStatuses(statuses); + } + } + + private populateAllStatuses(statuses: ApplicationStatusDto[]) { + this.statuses = statuses; + this.statuses.sort((a, b) => (a.label > b.label ? 1 : -1)); + } +} diff --git a/portal-frontend/src/app/features/public/search/search.interface.ts b/portal-frontend/src/app/features/public/search/search.interface.ts new file mode 100644 index 0000000000..c79a6e04aa --- /dev/null +++ b/portal-frontend/src/app/features/public/search/search.interface.ts @@ -0,0 +1,24 @@ +import { ApplicationStatusDto } from '../../../services/application-submission/application-submission.dto'; +import { NoticeOfIntentSubmissionStatusDto } from '../../../services/notice-of-intent-submission/notice-of-intent-submission.dto'; +import { NotificationSubmissionStatusDto } from '../../../services/notification-submission/notification-submission.dto'; + +export interface TableChange { + pageIndex: number; + itemsPerPage: number; + sortDirection: string; + sortField: string; + tableType: string; +} + +export interface SearchResult { + fileNumber: string; + dateSubmitted: number; + ownerName: string; + type: string; + localGovernmentName?: string; + lastUpdate: number; + portalStatus?: string; + referenceId: string; + class: string; + status?: ApplicationStatusDto | NoticeOfIntentSubmissionStatusDto | NotificationSubmissionStatusDto; +} diff --git a/portal-frontend/src/app/services/code/code.dto.ts b/portal-frontend/src/app/services/code/code.dto.ts index 561e1c56e6..e4389ea4f5 100644 --- a/portal-frontend/src/app/services/code/code.dto.ts +++ b/portal-frontend/src/app/services/code/code.dto.ts @@ -7,6 +7,9 @@ export interface LocalGovernmentDto { matchesUserGuid: boolean; } +export interface ApplicationRegionDto extends BaseCodeDto {} +export interface DecisionMakerDto extends BaseCodeDto {} + export interface SubmissionTypeDto extends BaseCodeDto { portalHtmlDescription: string; } diff --git a/portal-frontend/src/app/services/code/code.service.ts b/portal-frontend/src/app/services/code/code.service.ts index 8dc58f9d8c..1ad01cdb14 100644 --- a/portal-frontend/src/app/services/code/code.service.ts +++ b/portal-frontend/src/app/services/code/code.service.ts @@ -4,7 +4,14 @@ import { firstValueFrom } from 'rxjs'; import { environment } from '../../../environments/environment'; import { DocumentTypeDto } from '../../shared/dto/document.dto'; import { NaruSubtypeDto } from '../application-submission/application-submission.dto'; -import { ApplicationTypeDto, LocalGovernmentDto, NoticeOfIntentTypeDto, SubmissionTypeDto } from './code.dto'; +import { + ApplicationRegionDto, + ApplicationTypeDto, + DecisionMakerDto, + LocalGovernmentDto, + NoticeOfIntentTypeDto, + SubmissionTypeDto, +} from './code.dto'; @Injectable({ providedIn: 'root', @@ -23,6 +30,8 @@ export class CodeService { documentTypes: DocumentTypeDto[]; submissionTypes: SubmissionTypeDto[]; naruSubtypes: NaruSubtypeDto[]; + regions: ApplicationRegionDto[]; + decisionMakers: DecisionMakerDto[]; }>(`${this.baseUrl}`) ); } diff --git a/portal-frontend/src/app/services/search/file-type/file-type-data-source.service.spec.ts b/portal-frontend/src/app/services/search/file-type/file-type-data-source.service.spec.ts new file mode 100644 index 0000000000..3a0e437893 --- /dev/null +++ b/portal-frontend/src/app/services/search/file-type/file-type-data-source.service.spec.ts @@ -0,0 +1,33 @@ +import { TestBed } from '@angular/core/testing'; +import { FileTypeDataSourceService, TreeNode } from './file-type-data-source.service'; + +describe('FileTypeDataSourceService', () => { + let service: FileTypeDataSourceService; + + beforeEach(() => { + TestBed.configureTestingModule({}); + service = TestBed.inject(FileTypeDataSourceService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); + + it('should load initial data', () => { + expect(service.data).toBeTruthy(); + expect(service.data.length).toBeGreaterThan(0); + }); + + it('should filter data', () => { + service.filter('SRW'); + expect(service.data.length).toBe(1); + + const node: TreeNode = service.data[0]; + expect(node.item.label).toEqual('Notifications'); + }); + + it('should reset data when filtering with empty text', () => { + service.filter(''); + expect(service.data.length).toBeGreaterThan(0); + }); +}); diff --git a/portal-frontend/src/app/services/search/file-type/file-type-data-source.service.ts b/portal-frontend/src/app/services/search/file-type/file-type-data-source.service.ts new file mode 100644 index 0000000000..84c7decf15 --- /dev/null +++ b/portal-frontend/src/app/services/search/file-type/file-type-data-source.service.ts @@ -0,0 +1,111 @@ +import { Injectable } from '@angular/core'; +import { BehaviorSubject } from 'rxjs'; + +export interface TreeNodeItem { + label: string; + value: string | null; +} +/** + * Node for to-do item + */ +export interface TreeNode { + children?: TreeNode[]; + item: TreeNodeItem; +} + +/** Flat to-do item node with expandable and level information */ +export interface FlatTreeNode { + item: TreeNodeItem; + level: number; + expandable: boolean; +} + +const TREE_DATA: TreeNode[] = [ + { + item: { label: 'Application', value: null }, + children: [ + { item: { label: 'Exclusion', value: 'EXCL' } }, + { item: { label: 'Inclusion', value: 'INCL' } }, + { + item: { label: 'Non-Adhering Residential Use', value: 'NARU' }, + }, + { + item: { label: 'Non-Farm Use', value: 'NFUP' }, + }, + { + item: { label: 'Placement of Fill', value: 'POFO' }, + }, + { + item: { label: 'Removal of Soil and Placement of Fill', value: 'PFRS' }, + }, + { + item: { label: 'Removal of Soil Only', value: 'ROSO' }, + }, + { + item: { label: 'Subdivision', value: 'SUBD' }, + }, + { + item: { label: 'Transportation, Utility, Trail Permits', value: 'TURP' }, + }, + ], + }, + { + item: { label: 'Notice of Intent', value: 'NOI' }, + }, + { + item: { label: 'Notifications', value: null }, + + children: [ + { + item: { label: 'SRW', value: 'SRW' }, + }, + ], + }, +]; + +@Injectable({ providedIn: 'root' }) +export class FileTypeDataSourceService { + dataChange = new BehaviorSubject<TreeNode[]>([]); + treeData: TreeNode[] = []; + + get data(): TreeNode[] { + return this.dataChange.value; + } + + constructor() { + this.initialize(); + } + + initialize() { + this.treeData = TREE_DATA; + this.dataChange.next(TREE_DATA); + } + + public filter(filterText: string) { + let filteredTreeData; + if (filterText) { + // Filter the tree + const filter = (array: TreeNode[], text: string) => { + const getChildren = (result: any, object: any) => { + if (object.item.label.toLowerCase().includes(text.toLowerCase())) { + result.push(object); + return result; + } + if (Array.isArray(object.children)) { + const children = object.children.reduce(getChildren, []); + if (children.length) result.push({ ...object, children }); + } + return result; + }; + + return array.reduce(getChildren, []); + }; + + filteredTreeData = filter(this.treeData, filterText); + } else { + // Return the initial tree + filteredTreeData = this.treeData; + } + this.dataChange.next(filteredTreeData); + } +} diff --git a/portal-frontend/src/app/services/search/search.dto.ts b/portal-frontend/src/app/services/search/search.dto.ts new file mode 100644 index 0000000000..04eb64778a --- /dev/null +++ b/portal-frontend/src/app/services/search/search.dto.ts @@ -0,0 +1,52 @@ +export interface BaseSearchResultDto { + fileNumber: string; + type: string; + referenceId: string; + applicant?: string; + localGovernmentName: string; + boardCode?: string; + ownerName: string; + dateSubmitted: number; + lastUpdate: number; + status?: string; + class: string; +} + +export interface ApplicationSearchResultDto extends BaseSearchResultDto {} +export interface NoticeOfIntentSearchResultDto extends BaseSearchResultDto {} +export interface NotificationSearchResultDto extends BaseSearchResultDto {} + +export interface SearchResponseDto { + applications: ApplicationSearchResultDto[]; + noticeOfIntents: NoticeOfIntentSearchResultDto[]; + notifications: NotificationSearchResultDto[]; + totalApplications: number; + totalNoticeOfIntents: number; + totalNotifications: number; +} + +export interface AdvancedSearchEntityResponseDto<T> { + data: T[]; + total: number; +} + +export interface PagingRequestDto { + pageSize: number; + page: number; + sortField: string; + sortDirection: string; +} + +export interface SearchRequestDto extends PagingRequestDto { + fileNumber?: string; + name?: string; + pid?: string; + civicAddress?: string; + portalStatusCode?: string; + governmentName?: string; + regionCode?: string; + decisionMakerCode?: string; + dateDecidedFrom?: number; + dateDecidedTo?: number; + fileTypes: string[]; +} diff --git a/portal-frontend/src/app/services/search/search.service.spec.ts b/portal-frontend/src/app/services/search/search.service.spec.ts new file mode 100644 index 0000000000..f4f3827447 --- /dev/null +++ b/portal-frontend/src/app/services/search/search.service.spec.ts @@ -0,0 +1,135 @@ +import { HttpClient } from '@angular/common/http'; +import { TestBed } from '@angular/core/testing'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { of, throwError } from 'rxjs'; +import { ToastService } from '../toast/toast.service'; +import { SearchService } from './search.service'; + +describe('SearchService', () => { + let service: SearchService; + let mockHttpClient: DeepMocked<HttpClient>; + let mockToastService: DeepMocked<ToastService>; + + const mockSearchEntityResult = { + total: 0, + data: [], + }; + + const mockSearchResult = { + applications: [], + totalApplications: 0, + noticeOfIntents: [], + totalNoticeOfIntents: 0, + nonApplications: [], + totalNonApplications: 0, + }; + + const mockSearchRequestDto = { + pageSize: 1, + page: 1, + sortField: '1', + sortDirection: 'ASC', + isIncludeOtherParcels: false, + fileTypes: [], + }; + + beforeEach(() => { + mockHttpClient = createMock(); + mockToastService = createMock(); + + TestBed.configureTestingModule({ + providers: [ + { + provide: HttpClient, + useValue: mockHttpClient, + }, + { + provide: ToastService, + useValue: mockToastService, + }, + ], + }); + service = TestBed.inject(SearchService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); + + it('should fetch search results by AdvancedSearchRequestDto', async () => { + mockHttpClient.post.mockReturnValue(of(mockSearchResult)); + + const res = await service.search(mockSearchRequestDto); + + expect(mockHttpClient.post).toHaveBeenCalledTimes(1); + expect(res).toBeDefined(); + expect(res?.totalApplications).toEqual(0); + expect(res?.applications).toEqual([]); + expect(res?.totalNoticeOfIntents).toEqual(0); + expect(res?.noticeOfIntents).toEqual([]); + }); + + it('should show an error toast message if search fails', async () => { + mockHttpClient.post.mockReturnValue( + throwError(() => { + new Error(''); + }) + ); + + const res = await service.search(mockSearchRequestDto); + + expect(mockHttpClient.post).toHaveBeenCalledTimes(1); + expect(res).toBeUndefined(); + expect(mockToastService.showErrorToast).toHaveBeenCalledTimes(1); + }); + + it('should fetch application advanced search results by AdvancedSearchRequestDto', async () => { + mockHttpClient.post.mockReturnValue(of(mockSearchEntityResult)); + + const res = await service.searchApplications(mockSearchRequestDto); + + expect(mockHttpClient.post).toHaveBeenCalledTimes(1); + expect(res).toBeDefined(); + expect(res?.total).toEqual(0); + expect(res?.data).toEqual([]); + }); + + it('should show an error toast message if application advanced search fails', async () => { + mockHttpClient.post.mockReturnValue( + throwError(() => { + new Error(''); + }) + ); + + const res = await service.searchApplications(mockSearchRequestDto); + + expect(mockHttpClient.post).toHaveBeenCalledTimes(1); + expect(res).toBeUndefined(); + expect(mockToastService.showErrorToast).toHaveBeenCalledTimes(1); + }); + + it('should fetch NOI advanced search results by AdvancedSearchRequestDto', async () => { + mockHttpClient.post.mockReturnValue(of(mockSearchEntityResult)); + + const res = await service.searchNoticeOfIntents(mockSearchRequestDto); + + expect(mockHttpClient.post).toHaveBeenCalledTimes(1); + expect(res).toBeDefined(); + expect(res?.total).toEqual(0); + expect(res?.data).toEqual([]); + }); + + it('should show an error toast message if NOI advanced search fails', async () => { + mockHttpClient.post.mockReturnValue( + throwError(() => { + new Error(''); + }) + ); + + const res = await service.searchNoticeOfIntents(mockSearchRequestDto); + + expect(mockHttpClient.post).toHaveBeenCalledTimes(1); + expect(res).toBeUndefined(); + expect(mockToastService.showErrorToast).toHaveBeenCalledTimes(1); + }); +}); diff --git a/portal-frontend/src/app/services/search/search.service.ts b/portal-frontend/src/app/services/search/search.service.ts new file mode 100644 index 0000000000..64befbd2c3 --- /dev/null +++ b/portal-frontend/src/app/services/search/search.service.ts @@ -0,0 +1,74 @@ +import { HttpClient } from '@angular/common/http'; +import { Injectable } from '@angular/core'; +import { firstValueFrom } from 'rxjs'; +import { environment } from '../../../environments/environment'; +import { ToastService } from '../toast/toast.service'; +import { + AdvancedSearchEntityResponseDto, + SearchResponseDto, + BaseSearchResultDto, + NoticeOfIntentSearchResultDto, + NotificationSearchResultDto, + SearchRequestDto, +} from './search.dto'; + +@Injectable({ + providedIn: 'root', +}) +export class SearchService { + private baseUrl = `${environment.authUrl}/public/search`; + + constructor(private http: HttpClient, private toastService: ToastService) {} + + async search(searchDto: SearchRequestDto) { + try { + return await firstValueFrom(this.http.post<SearchResponseDto>(`${this.baseUrl}`, searchDto)); + } catch (e) { + console.error(e); + this.toastService.showErrorToast(`Search failed. Please refresh the page and try again`); + return undefined; + } + } + + async searchApplications(searchDto: SearchRequestDto) { + try { + return await firstValueFrom( + this.http.post<AdvancedSearchEntityResponseDto<BaseSearchResultDto>>(`${this.baseUrl}/application`, searchDto) + ); + } catch (e) { + console.error(e); + this.toastService.showErrorToast(`Search failed. Please refresh the page and try again`); + return undefined; + } + } + + async searchNoticeOfIntents(searchDto: SearchRequestDto) { + try { + return await firstValueFrom( + this.http.post<AdvancedSearchEntityResponseDto<NoticeOfIntentSearchResultDto>>( + `${this.baseUrl}/notice-of-intent`, + searchDto + ) + ); + } catch (e) { + console.error(e); + this.toastService.showErrorToast(`Search failed. Please refresh the page and try again`); + return undefined; + } + } + + async searchNotifications(searchDto: SearchRequestDto) { + try { + return await firstValueFrom( + this.http.post<AdvancedSearchEntityResponseDto<NotificationSearchResultDto>>( + `${this.baseUrl}/notifications`, + searchDto + ) + ); + } catch (e) { + console.error(e); + this.toastService.showErrorToast(`Search failed. Please refresh the page and try again`); + return undefined; + } + } +} diff --git a/portal-frontend/src/app/services/status/status.service.spec.ts b/portal-frontend/src/app/services/status/status.service.spec.ts new file mode 100644 index 0000000000..89ca8820bf --- /dev/null +++ b/portal-frontend/src/app/services/status/status.service.spec.ts @@ -0,0 +1,44 @@ +import { HttpClient } from '@angular/common/http'; +import { TestBed } from '@angular/core/testing'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { of, throwError } from 'rxjs'; +import { ToastService } from '../toast/toast.service'; +import { StatusService } from './status.service'; + +describe('StatusService', () => { + let service: StatusService; + let mockHttpClient: DeepMocked<HttpClient>; + let mockToastService: DeepMocked<ToastService>; + + beforeEach(() => { + mockHttpClient = createMock(); + mockToastService = createMock(); + + TestBed.configureTestingModule({ + providers: [ + { + provide: HttpClient, + useValue: mockHttpClient, + }, + { + provide: ToastService, + useValue: mockToastService, + }, + ], + }); + service = TestBed.inject(StatusService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); + + it('should call get to load statuses', async () => { + mockHttpClient.get.mockReturnValue(of([])); + + const res = await service.getStatuses(); + + expect(mockHttpClient.get).toHaveBeenCalledTimes(1); + expect(res).toBeDefined(); + }); +}); diff --git a/portal-frontend/src/app/services/status/status.service.ts b/portal-frontend/src/app/services/status/status.service.ts new file mode 100644 index 0000000000..9f3ddc5536 --- /dev/null +++ b/portal-frontend/src/app/services/status/status.service.ts @@ -0,0 +1,25 @@ +import { HttpClient } from '@angular/common/http'; +import { Injectable } from '@angular/core'; +import { firstValueFrom } from 'rxjs'; +import { environment } from '../../../environments/environment'; +import { ApplicationStatusDto } from '../application-submission/application-submission.dto'; +import { ToastService } from '../toast/toast.service'; + +@Injectable({ + providedIn: 'root', +}) +export class StatusService { + private baseUrl = `${environment.authUrl}/public/status`; + + constructor(private http: HttpClient, private toastService: ToastService) {} + + async getStatuses() { + try { + return await firstValueFrom(this.http.get<ApplicationStatusDto[]>(`${this.baseUrl}`)); + } catch (e) { + console.error(e); + this.toastService.showErrorToast(`Failed to load Statuses. Please refresh the page and try again`); + return undefined; + } + } +} diff --git a/portal-frontend/src/app/shared/pipes/table-column-no-data.pipe.spec.ts b/portal-frontend/src/app/shared/pipes/table-column-no-data.pipe.spec.ts new file mode 100644 index 0000000000..9af20ee335 --- /dev/null +++ b/portal-frontend/src/app/shared/pipes/table-column-no-data.pipe.spec.ts @@ -0,0 +1,8 @@ +import { TableColumnNoDataPipe } from './table-column-no-data.pipe'; + +describe('TableColumnNoDataPipe', () => { + it('create an instance', () => { + const pipe = new TableColumnNoDataPipe(); + expect(pipe).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/shared/pipes/table-column-no-data.pipe.ts b/portal-frontend/src/app/shared/pipes/table-column-no-data.pipe.ts new file mode 100644 index 0000000000..e6d078a8c8 --- /dev/null +++ b/portal-frontend/src/app/shared/pipes/table-column-no-data.pipe.ts @@ -0,0 +1,10 @@ +import { Pipe, PipeTransform } from '@angular/core'; + +@Pipe({ + name: 'emptyColumn' +}) +export class TableColumnNoDataPipe implements PipeTransform { + transform(value: any): any { + return value !== null && value !== undefined && value !== '' ? value : '-'; + } +} \ No newline at end of file diff --git a/portal-frontend/src/app/shared/shared.module.ts b/portal-frontend/src/app/shared/shared.module.ts index 14966fe720..13edc760b8 100644 --- a/portal-frontend/src/app/shared/shared.module.ts +++ b/portal-frontend/src/app/shared/shared.module.ts @@ -39,6 +39,7 @@ import { EmailValidPipe } from './pipes/emailValid.pipe'; import { FileSizePipe } from './pipes/fileSize.pipe'; import { MomentPipe } from './pipes/moment.pipe'; import { PhoneValidPipe } from './pipes/phoneValid.pipe'; +import { TableColumnNoDataPipe } from './pipes/table-column-no-data.pipe'; import { PresribedBodyComponent } from './presribed-body/presribed-body.component'; import { SoilTableComponent } from './soil-table/soil-table.component'; import { UpdatedBannerComponent } from './updated-banner/updated-banner.component'; @@ -93,6 +94,7 @@ import { WarningBannerComponent } from './warning-banner/warning-banner.componen AllOwnersDialogComponent, ParcelOwnersComponent, SoilTableComponent, + TableColumnNoDataPipe, ], exports: [ CommonModule, @@ -140,6 +142,7 @@ import { WarningBannerComponent } from './warning-banner/warning-banner.componen AllOwnersDialogComponent, ParcelOwnersComponent, SoilTableComponent, + TableColumnNoDataPipe, ], }) export class SharedModule { diff --git a/services/apps/alcs/src/alcs/application/application-submission-status/application-submission-status.service.ts b/services/apps/alcs/src/alcs/application/application-submission-status/application-submission-status.service.ts index 22b9fc6e33..15e472aa3a 100644 --- a/services/apps/alcs/src/alcs/application/application-submission-status/application-submission-status.service.ts +++ b/services/apps/alcs/src/alcs/application/application-submission-status/application-submission-status.service.ts @@ -24,6 +24,10 @@ export class ApplicationSubmissionStatusService { private applicationSubmissionRepository: Repository<ApplicationSubmission>, ) {} + listStatuses() { + return this.submissionStatusTypeRepository.find(); + } + async setInitialStatuses(submissionUuid: string, persist = true) { const statuses = await this.submissionStatusTypeRepository.find(); const newStatuses: ApplicationSubmissionToSubmissionStatus[] = []; diff --git a/services/apps/alcs/src/alcs/code/code.module.ts b/services/apps/alcs/src/alcs/code/code.module.ts index e500049787..c0c8ba4d74 100644 --- a/services/apps/alcs/src/alcs/code/code.module.ts +++ b/services/apps/alcs/src/alcs/code/code.module.ts @@ -1,5 +1,6 @@ import { Module } from '@nestjs/common'; import { TypeOrmModule } from '@nestjs/typeorm'; +import { ApplicationDecisionMakerCode } from '../application-decision/application-decision-maker/application-decision-maker.entity'; import { ApplicationSubmissionStatusType } from '../application/application-submission-status/submission-status-type.entity'; import { ReconsiderationProfile } from '../../common/automapper/reconsideration.automapper.profile'; import { ApplicationReconsiderationType } from '../application-decision/application-reconsideration/reconsideration-type/application-reconsideration-type.entity'; @@ -20,6 +21,7 @@ import { CodeService } from './code.service'; ApplicationMeetingType, ApplicationReconsiderationType, ApplicationSubmissionStatusType, + ApplicationDecisionMakerCode, ]), ], providers: [CodeService, ReconsiderationProfile], diff --git a/services/apps/alcs/src/alcs/code/code.service.spec.ts b/services/apps/alcs/src/alcs/code/code.service.spec.ts index b3fd0180e0..5c39ce9984 100644 --- a/services/apps/alcs/src/alcs/code/code.service.spec.ts +++ b/services/apps/alcs/src/alcs/code/code.service.spec.ts @@ -2,6 +2,7 @@ import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; +import { ApplicationDecisionMakerCode } from '../application-decision/application-decision-maker/application-decision-maker.entity'; import { ApplicationSubmissionStatusType } from '../application/application-submission-status/submission-status-type.entity'; import { ApplicationReconsiderationType } from '../application-decision/application-reconsideration/reconsideration-type/application-reconsideration-type.entity'; import { CardStatus } from '../card/card-status/card-status.entity'; @@ -21,18 +22,20 @@ describe('CodeService', () => { let mockApplicationStatusRepository: DeepMocked< Repository<ApplicationSubmissionStatusType> >; + let mockDecisionMakerCodeRepository: DeepMocked< + Repository<ApplicationDecisionMakerCode> + >; let service: CodeService; beforeEach(async () => { - mockTypeRepository = createMock<Repository<ApplicationType>>(); - mockStatusRepository = createMock<Repository<CardStatus>>(); - mockRegionRepository = createMock<Repository<ApplicationRegion>>(); - mockMeetingRepository = createMock<Repository<ApplicationMeetingType>>(); - mockReconsiderationTypeRepository = - createMock<Repository<ApplicationReconsiderationType>>(); - mockApplicationStatusRepository = - createMock<Repository<ApplicationSubmissionStatusType>>(); + mockTypeRepository = createMock(); + mockStatusRepository = createMock(); + mockRegionRepository = createMock(); + mockMeetingRepository = createMock(); + mockReconsiderationTypeRepository = createMock(); + mockApplicationStatusRepository = createMock(); + mockDecisionMakerCodeRepository = createMock(); const module: TestingModule = await Test.createTestingModule({ providers: [ @@ -61,6 +64,10 @@ describe('CodeService', () => { provide: getRepositoryToken(ApplicationSubmissionStatusType), useValue: mockApplicationStatusRepository, }, + { + provide: getRepositoryToken(ApplicationDecisionMakerCode), + useValue: mockDecisionMakerCodeRepository, + }, ], }).compile(); @@ -78,6 +85,7 @@ describe('CodeService', () => { mockMeetingRepository.find.mockResolvedValue([]); mockReconsiderationTypeRepository.find.mockResolvedValue([]); mockApplicationStatusRepository.find.mockResolvedValue([]); + mockDecisionMakerCodeRepository.find.mockResolvedValue([]); await service.getAll(); @@ -87,6 +95,7 @@ describe('CodeService', () => { expect(mockMeetingRepository.find).toHaveBeenCalledTimes(1); expect(mockReconsiderationTypeRepository.find).toHaveBeenCalledTimes(1); expect(mockApplicationStatusRepository.find).toHaveBeenCalledTimes(1); + expect(mockDecisionMakerCodeRepository.find).toHaveBeenCalledTimes(1); }); it('should map the repos to the right response keys', async () => { @@ -140,6 +149,15 @@ describe('CodeService', () => { mockApplicationStatusTypes as any[], ); + const mockDecisionMakers = [ + { + code: '7', + }, + ]; + mockDecisionMakerCodeRepository.find.mockResolvedValue( + mockDecisionMakers as any[], + ); + const res = await service.getAll(); expect(res.type).toEqual(mockTypes); @@ -148,6 +166,7 @@ describe('CodeService', () => { expect(res.meetingTypes).toEqual(mockMeetingTypes); expect(res.reconsiderationTypes).toEqual(mockReconsiderationTypes); expect(res.applicationStatusTypes).toEqual(mockApplicationStatusTypes); + expect(res.decisionMakers).toEqual(mockDecisionMakers); }); it('should call the type repo for types', async () => { diff --git a/services/apps/alcs/src/alcs/code/code.service.ts b/services/apps/alcs/src/alcs/code/code.service.ts index 12ef02eaa3..f3a9ae6655 100644 --- a/services/apps/alcs/src/alcs/code/code.service.ts +++ b/services/apps/alcs/src/alcs/code/code.service.ts @@ -1,6 +1,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { FindOptionsOrder, Repository } from 'typeorm'; +import { ApplicationDecisionMakerCode } from '../application-decision/application-decision-maker/application-decision-maker.entity'; import { ApplicationSubmissionStatusType } from '../application/application-submission-status/submission-status-type.entity'; import { BaseCodeEntity } from '../../common/entities/base.code.entity'; import { ApplicationReconsiderationType } from '../application-decision/application-reconsideration/reconsideration-type/application-reconsideration-type.entity'; @@ -24,6 +25,8 @@ export class CodeService { private reconsiderationTypesRepository: Repository<ApplicationReconsiderationType>, @InjectRepository(ApplicationSubmissionStatusType) private applicationStatusRepository: Repository<ApplicationSubmissionStatusType>, + @InjectRepository(ApplicationDecisionMakerCode) + private applicationDecisionMakerCodeRepository: Repository<ApplicationDecisionMakerCode>, ) {} async getAll() { @@ -40,6 +43,7 @@ export class CodeService { this.meetingTypesRepository.find(alphabeticalFindOptions), this.reconsiderationTypesRepository.find(alphabeticalFindOptions), this.applicationStatusRepository.find(alphabeticalFindOptions), + this.applicationDecisionMakerCodeRepository.find(alphabeticalFindOptions), ]); return { @@ -49,6 +53,7 @@ export class CodeService { meetingTypes: values[3], reconsiderationTypes: values[4], applicationStatusTypes: values[5], + decisionMakers: values[6], }; } diff --git a/services/apps/alcs/src/portal/code/code.controller.spec.ts b/services/apps/alcs/src/portal/code/code.controller.spec.ts index 6c3a07e168..7611cc9b70 100644 --- a/services/apps/alcs/src/portal/code/code.controller.spec.ts +++ b/services/apps/alcs/src/portal/code/code.controller.spec.ts @@ -4,6 +4,7 @@ import { DeepMocked, createMock } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { ClsService } from 'nestjs-cls'; import { mockKeyCloakProviders } from '../../../test/mocks/mockTypes'; +import { CodeService } from '../../alcs/code/code.service'; import { LocalGovernment } from '../../alcs/local-government/local-government.entity'; import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; import { ApplicationDocumentService } from '../../alcs/application/application-document/application-document.service'; @@ -23,6 +24,7 @@ describe('CodeController', () => { let mockAppDocService: DeepMocked<ApplicationDocumentService>; let mockAppSubmissionService: DeepMocked<ApplicationSubmissionService>; let mockNoiService: DeepMocked<NoticeOfIntentService>; + let mockCodeService: DeepMocked<CodeService>; beforeEach(async () => { mockLgService = createMock(); @@ -31,6 +33,7 @@ describe('CodeController', () => { mockAppDocService = createMock(); mockAppSubmissionService = createMock(); mockNoiService = createMock(); + mockCodeService = createMock(); const app: TestingModule = await Test.createTestingModule({ imports: [ @@ -65,6 +68,10 @@ describe('CodeController', () => { provide: NoticeOfIntentService, useValue: mockNoiService, }, + { + provide: CodeService, + useValue: mockCodeService, + }, { provide: ClsService, useValue: {}, @@ -95,6 +102,15 @@ describe('CodeController', () => { mockAppDocService.fetchTypes.mockResolvedValue([]); mockAppSubmissionService.listNaruSubtypes.mockResolvedValue([]); mockNoiService.listTypes.mockResolvedValue([]); + mockCodeService.getAll.mockResolvedValue({ + region: [], + decisionMakers: [], + applicationStatusTypes: [], + status: [], + meetingTypes: [], + type: [], + reconsiderationTypes: [], + }); }); it('should call out to local government service for fetching codes', async () => { diff --git a/services/apps/alcs/src/portal/code/code.controller.ts b/services/apps/alcs/src/portal/code/code.controller.ts index 8de46fd499..c9de8660c8 100644 --- a/services/apps/alcs/src/portal/code/code.controller.ts +++ b/services/apps/alcs/src/portal/code/code.controller.ts @@ -1,6 +1,13 @@ import { Mapper } from '@automapper/core'; import { InjectMapper } from '@automapper/nestjs'; import { Controller, Get, Req, UseGuards } from '@nestjs/common'; +import { Public } from 'nest-keycloak-connect'; +import { ApplicationDecisionMakerCode } from '../../alcs/application-decision/application-decision-maker/application-decision-maker.entity'; +import { ApplicationDecisionMakerCodeDto } from '../../alcs/application-decision/application-decision-maker/decision-maker.dto'; +import { ApplicationSubmissionStatusService } from '../../alcs/application/application-submission-status/application-submission-status.service'; +import { ApplicationRegionDto } from '../../alcs/code/application-code/application-region/application-region.dto'; +import { ApplicationRegion } from '../../alcs/code/application-code/application-region/application-region.entity'; +import { CodeService } from '../../alcs/code/code.service'; import { LocalGovernment } from '../../alcs/local-government/local-government.entity'; import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; import { NoticeOfIntentService } from '../../alcs/notice-of-intent/notice-of-intent.service'; @@ -8,21 +15,19 @@ import { DocumentCode } from '../../document/document-code.entity'; import { ApplicationDocumentService } from '../../alcs/application/application-document/application-document.service'; import { ApplicationService } from '../../alcs/application/application.service'; import { CardService } from '../../alcs/card/card.service'; -import { PortalAuthGuard } from '../../common/authorization/portal-auth-guard.service'; import { DocumentTypeDto } from '../../document/document.dto'; import { User } from '../../user/user.entity'; import { ApplicationSubmissionService } from '../application-submission/application-submission.service'; -import { NoticeOfIntentSubmissionService } from '../notice-of-intent-submission/notice-of-intent-submission.service'; export interface LocalGovernmentDto { uuid: string; name: string; hasGuid: boolean; - matchesUserGuid: boolean; + matchesUserGuid?: boolean; } +@Public() @Controller('/portal/code') -@UseGuards(PortalAuthGuard) export class CodeController { constructor( @InjectMapper() private mapper: Mapper, @@ -32,6 +37,7 @@ export class CodeController { private cardService: CardService, private applicationSubmissionService: ApplicationSubmissionService, private noticeOfIntentService: NoticeOfIntentService, + private codeService: CodeService, ) {} @Get() @@ -44,6 +50,7 @@ export class CodeController { const noticeOfIntentTypes = await this.noticeOfIntentService.listTypes(); const naruSubtypes = await this.applicationSubmissionService.listNaruSubtypes(); + const codes = await this.codeService.getAll(); const mappedDocTypes = documentTypes.map((docType) => { if (docType.portalLabel) { @@ -51,28 +58,44 @@ export class CodeController { } return this.mapper.map(docType, DocumentCode, DocumentTypeDto); }); + + const mappedRegions = this.mapper.mapArray( + codes.region, + ApplicationRegion, + ApplicationRegionDto, + ); + + const mappedDecisionMakers = this.mapper.mapArray( + codes.decisionMakers, + ApplicationDecisionMakerCode, + ApplicationDecisionMakerCodeDto, + ); + return { localGovernments: this.mapLocalGovernments( localGovernments, - req.user.entity, + req.user?.entity, ), applicationTypes, noticeOfIntentTypes, submissionTypes, documentTypes: mappedDocTypes, naruSubtypes, + regions: mappedRegions, + decisionMakers: mappedDecisionMakers, }; } private mapLocalGovernments( governments: LocalGovernment[], - user: User, + user?: User, ): LocalGovernmentDto[] { return governments.map((government) => ({ name: government.name, uuid: government.uuid, hasGuid: government.bceidBusinessGuid !== null, matchesUserGuid: + user && !!government.bceidBusinessGuid && government.bceidBusinessGuid === user.bceidBusinessGuid, })); diff --git a/services/apps/alcs/src/portal/portal.module.ts b/services/apps/alcs/src/portal/portal.module.ts index 15939b5f8b..710d3cbbc1 100644 --- a/services/apps/alcs/src/portal/portal.module.ts +++ b/services/apps/alcs/src/portal/portal.module.ts @@ -3,6 +3,7 @@ import { Module } from '@nestjs/common'; import { RouterModule } from '@nestjs/core'; import { ApplicationModule } from '../alcs/application/application.module'; import { CardModule } from '../alcs/card/card.module'; +import { CodeModule } from '../alcs/code/code.module'; import { NoticeOfIntentModule } from '../alcs/notice-of-intent/notice-of-intent.module'; import { DocumentModule } from '../document/document.module'; import { PortalApplicationDecisionModule } from './application-decision/application-decision.module'; @@ -44,6 +45,7 @@ import { PublicModule } from './public/public.module'; NotificationSubmissionModule, PortalNotificationDocumentModule, PublicModule, + CodeModule, RouterModule.register([ { path: 'portal', module: ApplicationSubmissionModule }, { path: 'portal', module: NoticeOfIntentSubmissionModule }, diff --git a/services/apps/alcs/src/portal/public/public.module.ts b/services/apps/alcs/src/portal/public/public.module.ts index a08600dd31..a63b142147 100644 --- a/services/apps/alcs/src/portal/public/public.module.ts +++ b/services/apps/alcs/src/portal/public/public.module.ts @@ -1,13 +1,18 @@ import { Module } from '@nestjs/common'; import { RouterModule } from '@nestjs/core'; +import { ApplicationSubmissionStatusModule } from '../../alcs/application/application-submission-status/application-submission-status.module'; +import { NotificationSubmissionStatusModule } from '../../alcs/notification/notification-submission-status/notification-submission-status.module'; import { PublicSearchModule } from './search/public-search.module'; +import { PublicStatusController } from './status/public-status.controller'; @Module({ imports: [ PublicSearchModule, + ApplicationSubmissionStatusModule, + NotificationSubmissionStatusModule, RouterModule.register([{ path: 'public', module: PublicSearchModule }]), ], - controllers: [], + controllers: [PublicStatusController], providers: [], exports: [], }) diff --git a/services/apps/alcs/src/portal/public/search/application/public-application-search.service.spec.ts b/services/apps/alcs/src/portal/public/search/application/public-application-search.service.spec.ts index 308db43c78..0dc21e27a9 100644 --- a/services/apps/alcs/src/portal/public/search/application/public-application-search.service.spec.ts +++ b/services/apps/alcs/src/portal/public/search/application/public-application-search.service.spec.ts @@ -88,8 +88,7 @@ describe('PublicApplicationSearchService', () => { expect( mockApplicationSubmissionSearchViewRepository.createQueryBuilder, ).toBeCalledTimes(1); - expect(mockQuery.andWhere).toBeCalledTimes(8); - expect(mockQuery.where).toBeCalledTimes(1); + expect(mockQuery.andWhere).toBeCalledTimes(10); }); it('should call compileApplicationSearchQuery method correctly', async () => { diff --git a/services/apps/alcs/src/portal/public/search/application/public-application-search.service.ts b/services/apps/alcs/src/portal/public/search/application/public-application-search.service.ts index 9c6597ac31..ff5281046d 100644 --- a/services/apps/alcs/src/portal/public/search/application/public-application-search.service.ts +++ b/services/apps/alcs/src/portal/public/search/application/public-application-search.service.ts @@ -26,7 +26,6 @@ export class PublicApplicationSearchService { searchDto: SearchRequestDto, ): Promise<AdvancedSearchResultDto<PublicApplicationSubmissionSearchView[]>> { let query = await this.compileApplicationSearchQuery(searchDto); - query = this.compileApplicationGroupBySearchQuery(query); const sortQuery = this.compileSortQuery(searchDto); @@ -62,8 +61,8 @@ export class PublicApplicationSearchService { return `"appSearch"."status" ->> 'label' `; default: - case 'dateSubmitted': - return '"appSearch"."date_submitted_to_alc"'; + case 'lastUpdate': + return '"appSearch"."last_update"'; } } @@ -87,6 +86,7 @@ export class PublicApplicationSearchService { , "appSearch"."status" , "appSearch"."date_submitted_to_alc" , "appSearch"."decision_date" + , "appSearch"."last_update" , "applicationType"."audit_deleted_date_at" , "applicationType"."audit_created_at" , "applicationType"."audit_updated_by" @@ -105,18 +105,17 @@ export class PublicApplicationSearchService { } private async compileApplicationSearchQuery(searchDto: SearchRequestDto) { - let query = this.applicationSearchRepository - .createQueryBuilder('appSearch') - .where('appSearch.is_draft = false'); + const query = + this.applicationSearchRepository.createQueryBuilder('appSearch'); if (searchDto.fileNumber) { - query = query + query .andWhere('appSearch.file_number = :fileNumber') .setParameters({ fileNumber: searchDto.fileNumber ?? null }); } if (searchDto.portalStatusCode) { - query = query.andWhere( + query.andWhere( "alcs.get_current_status_for_application_submission_by_uuid(appSearch.uuid) ->> 'status_type_code' = :status", { status: searchDto.portalStatusCode, @@ -129,7 +128,7 @@ export class PublicApplicationSearchService { name: searchDto.governmentName, }); - query = query.andWhere( + query.andWhere( 'appSearch.local_government_uuid = :local_government_uuid', { local_government_uuid: government.uuid, @@ -138,7 +137,7 @@ export class PublicApplicationSearchService { } if (searchDto.regionCode) { - query = query.andWhere( + query.andWhere( 'appSearch.application_region_code = :application_region_code', { application_region_code: searchDto.regionCode, @@ -146,38 +145,42 @@ export class PublicApplicationSearchService { ); } - query = this.compileApplicationSearchByNameQuery(searchDto, query); - query = this.compileApplicationParcelSearchQuery(searchDto, query); - query = this.compileApplicationDecisionSearchQuery(searchDto, query); - query = this.compileApplicationFileTypeSearchQuery(searchDto, query); + this.compileSearchByNameQuery(searchDto, query); + this.compileParcelSearchQuery(searchDto, query); + this.compileDecisionSearchQuery(searchDto, query); + this.compileFileTypeSearchQuery(searchDto, query); return query; } - private compileApplicationDecisionSearchQuery( - searchDto: SearchRequestDto, - query, - ) { + private compileDecisionSearchQuery(searchDto: SearchRequestDto, query) { if ( searchDto.dateDecidedTo !== undefined || - searchDto.dateDecidedFrom !== undefined + searchDto.dateDecidedFrom !== undefined || + searchDto.decisionMakerCode !== undefined ) { query = this.joinApplicationDecision(query); - // TODO - // if (searchDto.resolutionNumber !== undefined) { - // query = query.andWhere( - // 'decision.resolution_number = :resolution_number', - // { - // resolution_number: searchDto.resolutionNumber, - // }, - // ); - // } - // - // if (searchDto.resolutionYear !== undefined) { - // query = query.andWhere('decision.resolution_year = :resolution_year', { - // resolution_year: searchDto.resolutionYear, - // }); - // } + + if (searchDto.dateDecidedFrom !== undefined) { + query = query.andWhere('decision.date >= :dateDecidedFrom', { + dateDecidedFrom: new Date(searchDto.dateDecidedFrom), + }); + } + + if (searchDto.dateDecidedTo !== undefined) { + query = query.andWhere('decision.date <= :dateDecidedTo', { + dateDecidedTo: new Date(searchDto.dateDecidedTo), + }); + } + + if (searchDto.decisionMakerCode !== undefined) { + query = query.andWhere( + 'decision.decision_maker_code = :decisionMakerCode', + { + decisionMakerCode: searchDto.decisionMakerCode, + }, + ); + } } return query; } @@ -191,10 +194,7 @@ export class PublicApplicationSearchService { return query; } - private compileApplicationParcelSearchQuery( - searchDto: SearchRequestDto, - query, - ) { + private compileParcelSearchQuery(searchDto: SearchRequestDto, query) { if (searchDto.pid || searchDto.civicAddress) { query = query.leftJoin( ApplicationParcel, @@ -221,10 +221,7 @@ export class PublicApplicationSearchService { return query; } - private compileApplicationSearchByNameQuery( - searchDto: SearchRequestDto, - query, - ) { + private compileSearchByNameQuery(searchDto: SearchRequestDto, query) { if (searchDto.name) { const formattedSearchString = formatStringToPostgresSearchStringArrayWithWildCard(searchDto.name!); @@ -265,15 +262,13 @@ export class PublicApplicationSearchService { return query; } - private compileApplicationFileTypeSearchQuery( - searchDto: SearchRequestDto, - query, - ) { + private compileFileTypeSearchQuery(searchDto: SearchRequestDto, query) { if (searchDto.fileTypes.length > 0) { // if decision is not joined yet -> join it. The join of decision happens in compileApplicationDecisionSearchQuery if ( searchDto.dateDecidedFrom === undefined && - searchDto.dateDecidedTo === undefined + searchDto.dateDecidedTo === undefined && + searchDto.decisionMakerCode === undefined ) { query = this.joinApplicationDecision(query); } diff --git a/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search.service.spec.ts b/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search.service.spec.ts index 565fb98c22..6fe5429a73 100644 --- a/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search.service.spec.ts +++ b/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search.service.spec.ts @@ -88,8 +88,7 @@ describe('PublicNoticeOfIntentSearchService', () => { expect( mockNoticeOfIntentSubmissionSearchViewRepository.createQueryBuilder, ).toBeCalledTimes(1); - expect(mockQuery.andWhere).toBeCalledTimes(7); - expect(mockQuery.where).toBeCalledTimes(1); + expect(mockQuery.andWhere).toBeCalledTimes(9); }); it('should call compileNoticeOfIntentSearchQuery method correctly', async () => { diff --git a/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search.service.ts b/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search.service.ts index c801595a5d..f839b24e78 100644 --- a/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search.service.ts +++ b/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search.service.ts @@ -26,13 +26,13 @@ export class PublicNoticeOfIntentSearchService { ): Promise< AdvancedSearchResultDto<PublicNoticeOfIntentSubmissionSearchView[]> > { - let query = await this.compileNoticeOfIntentSearchQuery(searchDto); + const query = await this.compileNoticeOfIntentSearchQuery(searchDto); - query = this.compileGroupBySearchQuery(query); + this.compileGroupBySearchQuery(query); const sortQuery = this.compileSortQuery(searchDto); - query = query + query .orderBy(sortQuery, searchDto.sortDirection) .offset((searchDto.page - 1) * searchDto.pageSize) .limit(searchDto.pageSize); @@ -63,8 +63,8 @@ export class PublicNoticeOfIntentSearchService { return `"noiSearch"."status" ->> 'label' `; default: - case 'dateSubmitted': - return '"noiSearch"."date_submitted_to_alc"'; + case 'lastUpdate': + return '"noiSearch"."last_update"'; } } @@ -88,6 +88,7 @@ export class PublicNoticeOfIntentSearchService { , "noiSearch"."status" , "noiSearch"."date_submitted_to_alc" , "noiSearch"."decision_date" + , "noiSearch"."last_update" , "noticeOfIntentType"."audit_deleted_date_at" , "noticeOfIntentType"."audit_created_at" , "noticeOfIntentType"."audit_updated_by" @@ -98,25 +99,22 @@ export class PublicNoticeOfIntentSearchService { , "noticeOfIntentType"."code" , "noticeOfIntentType"."html_description" , "noticeOfIntentType"."portal_label" - , "noiSearch"."is_draft" `, ); return query; } private async compileNoticeOfIntentSearchQuery(searchDto: SearchRequestDto) { - let query = this.noiSearchRepository - .createQueryBuilder('noiSearch') - .where('noiSearch.is_draft = false'); + const query = this.noiSearchRepository.createQueryBuilder('noiSearch'); if (searchDto.fileNumber) { - query = query + query .andWhere('noiSearch.file_number = :fileNumber') .setParameters({ fileNumber: searchDto.fileNumber ?? null }); } if (searchDto.portalStatusCode) { - query = query.andWhere( + query.andWhere( "alcs.get_current_status_for_notice_of_intent_submission_by_uuid(noiSearch.uuid) ->> 'status_type_code' = :status", { status: searchDto.portalStatusCode, @@ -129,7 +127,7 @@ export class PublicNoticeOfIntentSearchService { name: searchDto.governmentName, }); - query = query.andWhere( + query.andWhere( 'noiSearch.local_government_uuid = :local_government_uuid', { local_government_uuid: government.uuid, @@ -138,7 +136,7 @@ export class PublicNoticeOfIntentSearchService { } if (searchDto.regionCode) { - query = query.andWhere( + query.andWhere( 'noiSearch.notice_of_intent_region_code = :noi_region_code', { noi_region_code: searchDto.regionCode, @@ -146,9 +144,9 @@ export class PublicNoticeOfIntentSearchService { ); } - query = this.compileSearchByNameQuery(searchDto, query); - query = this.compileParcelSearchQuery(searchDto, query); - query = this.compileDecisionSearchQuery(searchDto, query); + this.compileSearchByNameQuery(searchDto, query); + this.compileParcelSearchQuery(searchDto, query); + this.compileDecisionSearchQuery(searchDto, query); return query; } @@ -156,24 +154,26 @@ export class PublicNoticeOfIntentSearchService { private compileDecisionSearchQuery(searchDto: SearchRequestDto, query) { if ( searchDto.dateDecidedTo !== undefined || - searchDto.dateDecidedFrom !== undefined + searchDto.dateDecidedFrom !== undefined || + searchDto.decisionMakerCode !== undefined ) { query = this.joinDecision(query); - // if (searchDto.resolutionNumber !== undefined) { - // query = query.andWhere( - // 'decision.resolution_number = :resolution_number', - // { - // resolution_number: searchDto.resolutionNumber, - // }, - // ); - // } - // - // if (searchDto.resolutionYear !== undefined) { - // query = query.andWhere('decision.resolution_year = :resolution_year', { - // resolution_year: searchDto.resolutionYear, - // }); - // } + if (searchDto.dateDecidedFrom !== undefined) { + query = query.andWhere('decision.date >= :dateDecidedFrom', { + dateDecidedFrom: new Date(searchDto.dateDecidedFrom), + }); + } + + if (searchDto.dateDecidedTo !== undefined) { + query = query.andWhere('decision.date <= :dateDecidedTo', { + dateDecidedTo: new Date(searchDto.dateDecidedTo), + }); + } + + if (searchDto.decisionMakerCode !== undefined) { + query = query.andWhere('decision.decision_maker IS NOT NULL'); + } } return query; } diff --git a/services/apps/alcs/src/portal/public/search/notification/public-notification-search.service.ts b/services/apps/alcs/src/portal/public/search/notification/public-notification-search.service.ts index c06df8e22d..a996b2698f 100644 --- a/services/apps/alcs/src/portal/public/search/notification/public-notification-search.service.ts +++ b/services/apps/alcs/src/portal/public/search/notification/public-notification-search.service.ts @@ -62,8 +62,8 @@ export class PublicNotificationSearchService { return `"notificationSearch"."status" ->> 'label' `; default: - case 'dateSubmitted': - return '"notificationSearch"."date_submitted_to_alc"'; + case 'lastUpdate': + return `"notificationSearch"."status" ->> 'effectiveDate' `; } } diff --git a/services/apps/alcs/src/portal/public/search/public-search.controller.spec.ts b/services/apps/alcs/src/portal/public/search/public-search.controller.spec.ts index 5c00d6a9d4..f30269f820 100644 --- a/services/apps/alcs/src/portal/public/search/public-search.controller.spec.ts +++ b/services/apps/alcs/src/portal/public/search/public-search.controller.spec.ts @@ -17,15 +17,15 @@ import { PublicSearchService } from './public-search.service'; describe('PublicSearchController', () => { let controller: PublicSearchController; let mockSearchService: DeepMocked<PublicSearchService>; - let mockNoticeOfIntentAdvancedSearchService: DeepMocked<PublicNoticeOfIntentSearchService>; - let mockApplicationAdvancedSearchService: DeepMocked<PublicApplicationSearchService>; - let mockNotificationAdvancedSearchService: DeepMocked<PublicNotificationSearchService>; + let mockNOIPublicSearchService: DeepMocked<PublicNoticeOfIntentSearchService>; + let mockAppPublicSearchService: DeepMocked<PublicApplicationSearchService>; + let mockNotiPublicSearchService: DeepMocked<PublicNotificationSearchService>; beforeEach(async () => { mockSearchService = createMock(); - mockNoticeOfIntentAdvancedSearchService = createMock(); - mockApplicationAdvancedSearchService = createMock(); - mockNotificationAdvancedSearchService = createMock(); + mockNOIPublicSearchService = createMock(); + mockAppPublicSearchService = createMock(); + mockNotiPublicSearchService = createMock(); const module: TestingModule = await Test.createTestingModule({ imports: [ @@ -40,15 +40,15 @@ describe('PublicSearchController', () => { }, { provide: PublicNoticeOfIntentSearchService, - useValue: mockNoticeOfIntentAdvancedSearchService, + useValue: mockNOIPublicSearchService, }, { provide: PublicApplicationSearchService, - useValue: mockApplicationAdvancedSearchService, + useValue: mockAppPublicSearchService, }, { provide: PublicNotificationSearchService, - useValue: mockNotificationAdvancedSearchService, + useValue: mockNotiPublicSearchService, }, { provide: ClsService, @@ -65,19 +65,17 @@ describe('PublicSearchController', () => { mockSearchService.getNoi.mockResolvedValue(new NoticeOfIntent()); mockSearchService.getNotification.mockResolvedValue(new Notification()); - mockNoticeOfIntentAdvancedSearchService.searchNoticeOfIntents.mockResolvedValue( - { - data: [], - total: 0, - }, - ); + mockNOIPublicSearchService.searchNoticeOfIntents.mockResolvedValue({ + data: [], + total: 0, + }); - mockApplicationAdvancedSearchService.searchApplications.mockResolvedValue({ + mockAppPublicSearchService.searchApplications.mockResolvedValue({ data: [], total: 0, }); - mockNotificationAdvancedSearchService.search.mockResolvedValue({ + mockNotiPublicSearchService.search.mockResolvedValue({ data: [], total: 0, }); @@ -87,66 +85,54 @@ describe('PublicSearchController', () => { expect(controller).toBeDefined(); }); - it('should call search to retrieve Applications, NOIs, PlanningReviews, Covenants, Notifications', async () => { - const mockSearchRequestDto = { + it('should call search to retrieve Applications, NOIs, Notifications', async () => { + const mockSearchRequestDto: SearchRequestDto = { pageSize: 1, page: 1, sortField: '1', sortDirection: 'ASC', - isIncludeOtherParcels: false, name: 'test', fileTypes: [], }; - const result = await controller.search( - mockSearchRequestDto as SearchRequestDto, - ); + const result = await controller.search(mockSearchRequestDto); - expect( - mockApplicationAdvancedSearchService.searchApplications, - ).toBeCalledTimes(1); - expect( - mockApplicationAdvancedSearchService.searchApplications, - ).toBeCalledWith(mockSearchRequestDto); + expect(mockAppPublicSearchService.searchApplications).toBeCalledTimes(1); + expect(mockAppPublicSearchService.searchApplications).toBeCalledWith( + mockSearchRequestDto, + ); expect(result.applications).toBeDefined(); expect(result.totalApplications).toBe(0); - expect( - mockNoticeOfIntentAdvancedSearchService.searchNoticeOfIntents, - ).toBeCalledTimes(1); - expect( - mockNoticeOfIntentAdvancedSearchService.searchNoticeOfIntents, - ).toBeCalledWith(mockSearchRequestDto); + expect(mockNOIPublicSearchService.searchNoticeOfIntents).toBeCalledTimes(1); + expect(mockNOIPublicSearchService.searchNoticeOfIntents).toBeCalledWith( + mockSearchRequestDto, + ); expect(result.noticeOfIntents).toBeDefined(); expect(result.totalNoticeOfIntents).toBe(0); }); it('should call applications advanced search to retrieve Applications', async () => { - const mockSearchRequestDto = { + const mockSearchRequestDto: SearchRequestDto = { pageSize: 1, page: 1, sortField: '1', sortDirection: 'ASC', - isIncludeOtherParcels: false, fileTypes: [], }; - const result = await controller.advancedSearchApplications( - mockSearchRequestDto as SearchRequestDto, - ); + const result = await controller.searchApplications(mockSearchRequestDto); - expect( - mockApplicationAdvancedSearchService.searchApplications, - ).toBeCalledTimes(1); - expect( - mockApplicationAdvancedSearchService.searchApplications, - ).toBeCalledWith(mockSearchRequestDto); + expect(mockAppPublicSearchService.searchApplications).toBeCalledTimes(1); + expect(mockAppPublicSearchService.searchApplications).toBeCalledWith( + mockSearchRequestDto, + ); expect(result.data).toBeDefined(); expect(result.total).toBe(0); }); it('should call NOI advanced search to retrieve NOIs', async () => { - const mockSearchRequestDto = { + const mockSearchRequestDto: SearchRequestDto = { pageSize: 1, page: 1, sortField: '1', @@ -154,22 +140,18 @@ describe('PublicSearchController', () => { fileTypes: [], }; - const result = await controller.advancedSearchNoticeOfIntents( - mockSearchRequestDto as SearchRequestDto, - ); + const result = await controller.searchNoticeOfIntents(mockSearchRequestDto); - expect( - mockNoticeOfIntentAdvancedSearchService.searchNoticeOfIntents, - ).toBeCalledTimes(1); - expect( - mockNoticeOfIntentAdvancedSearchService.searchNoticeOfIntents, - ).toBeCalledWith(mockSearchRequestDto); + expect(mockNOIPublicSearchService.searchNoticeOfIntents).toBeCalledTimes(1); + expect(mockNOIPublicSearchService.searchNoticeOfIntents).toBeCalledWith( + mockSearchRequestDto, + ); expect(result.data).toBeDefined(); expect(result.total).toBe(0); }); it('should call search to retrieve Applications only when application file type selected', async () => { - const mockSearchRequestDto = { + const mockSearchRequestDto: SearchRequestDto = { pageSize: 1, page: 1, sortField: '1', @@ -177,22 +159,18 @@ describe('PublicSearchController', () => { fileTypes: ['NFUP'], }; - const result = await controller.search( - mockSearchRequestDto as SearchRequestDto, - ); + const result = await controller.search(mockSearchRequestDto); - expect( - mockApplicationAdvancedSearchService.searchApplications, - ).toBeCalledTimes(1); - expect( - mockApplicationAdvancedSearchService.searchApplications, - ).toBeCalledWith(mockSearchRequestDto); + expect(mockAppPublicSearchService.searchApplications).toBeCalledTimes(1); + expect(mockAppPublicSearchService.searchApplications).toBeCalledWith( + mockSearchRequestDto, + ); expect(result.applications).toBeDefined(); expect(result.totalApplications).toBe(0); }); it('should call search to retrieve NOIs only when NOI file type selected', async () => { - const mockSearchRequestDto = { + const mockSearchRequestDto: SearchRequestDto = { pageSize: 1, page: 1, sortField: '1', @@ -200,16 +178,12 @@ describe('PublicSearchController', () => { fileTypes: ['NOI'], }; - const result = await controller.search( - mockSearchRequestDto as SearchRequestDto, - ); + const result = await controller.search(mockSearchRequestDto); - expect( - mockNoticeOfIntentAdvancedSearchService.searchNoticeOfIntents, - ).toBeCalledTimes(1); - expect( - mockNoticeOfIntentAdvancedSearchService.searchNoticeOfIntents, - ).toBeCalledWith(mockSearchRequestDto); + expect(mockNOIPublicSearchService.searchNoticeOfIntents).toBeCalledTimes(1); + expect(mockNOIPublicSearchService.searchNoticeOfIntents).toBeCalledWith( + mockSearchRequestDto, + ); expect(result.noticeOfIntents).toBeDefined(); expect(result.totalNoticeOfIntents).toBe(0); }); @@ -225,18 +199,14 @@ describe('PublicSearchController', () => { const result = await controller.search(mockSearchRequestDto); - expect( - mockApplicationAdvancedSearchService.searchApplications, - ).toBeCalledTimes(1); - expect( - mockApplicationAdvancedSearchService.searchApplications, - ).toBeCalledWith(mockSearchRequestDto); + expect(mockAppPublicSearchService.searchApplications).toBeCalledTimes(1); + expect(mockAppPublicSearchService.searchApplications).toBeCalledWith( + mockSearchRequestDto, + ); expect(result.applications).toBeDefined(); expect(result.totalApplications).toBe(0); - expect( - mockNoticeOfIntentAdvancedSearchService.searchNoticeOfIntents, - ).toBeCalledTimes(0); + expect(mockNOIPublicSearchService.searchNoticeOfIntents).toBeCalledTimes(0); expect(result.noticeOfIntents).toBeDefined(); expect(result.totalNoticeOfIntents).toBe(0); }); diff --git a/services/apps/alcs/src/portal/public/search/public-search.controller.ts b/services/apps/alcs/src/portal/public/search/public-search.controller.ts index f16d98dd5a..5dfc401692 100644 --- a/services/apps/alcs/src/portal/public/search/public-search.controller.ts +++ b/services/apps/alcs/src/portal/public/search/public-search.controller.ts @@ -1,16 +1,15 @@ import { Mapper } from '@automapper/core'; import { InjectMapper } from '@automapper/nestjs'; import { Body, Controller, Post } from '@nestjs/common'; -import { ApplicationType } from '../../../alcs/code/application-code/application-type/application-type.entity'; +import { Public } from 'nest-keycloak-connect'; import { isStringSetAndNotEmpty } from '../../../utils/string-helper'; -import { ApplicationTypeDto } from '../../code/code.dto'; import { APPLICATION_SUBMISSION_TYPES } from '../../pdf-generation/generate-submission-document.service'; -import { PublicApplicationSearchService } from './application/public-application-search.service'; import { PublicApplicationSubmissionSearchView } from './application/public-application-search-view.entity'; -import { PublicNoticeOfIntentSearchService } from './notice-of-intent/public-notice-of-intent-search.service'; +import { PublicApplicationSearchService } from './application/public-application-search.service'; import { PublicNoticeOfIntentSubmissionSearchView } from './notice-of-intent/public-notice-of-intent-search-view.entity'; -import { PublicNotificationSearchService } from './notification/public-notification-search.service'; +import { PublicNoticeOfIntentSearchService } from './notice-of-intent/public-notice-of-intent-search.service'; import { PublicNotificationSubmissionSearchView } from './notification/public-notification-search-view.entity'; +import { PublicNotificationSearchService } from './notification/public-notification-search.service'; import { AdvancedSearchResponseDto, AdvancedSearchResultDto, @@ -21,6 +20,7 @@ import { } from './public-search.dto'; import { PublicSearchService } from './public-search.service'; +@Public() @Controller('search') export class PublicSearchController { constructor( @@ -59,7 +59,7 @@ export class PublicSearchController { notifications = await this.notificationSearchService.search(searchDto); } - return this.mapAdvancedSearchResults( + return this.mapSearchResults( applicationSearchResult, noticeOfIntentResults, notifications, @@ -67,18 +67,14 @@ export class PublicSearchController { } @Post('/application') - async advancedSearchApplications( + async searchApplications( @Body() searchDto: SearchRequestDto, ): Promise<AdvancedSearchResultDto<ApplicationSearchResultDto[]>> { const applications = await this.applicationSearchService.searchApplications( searchDto, ); - const mappedSearchResult = this.mapAdvancedSearchResults( - applications, - null, - null, - ); + const mappedSearchResult = this.mapSearchResults(applications, null, null); return { total: mappedSearchResult.totalApplications, @@ -87,13 +83,13 @@ export class PublicSearchController { } @Post('/notice-of-intent') - async advancedSearchNoticeOfIntents( + async searchNoticeOfIntents( @Body() searchDto: SearchRequestDto, ): Promise<AdvancedSearchResultDto<NoticeOfIntentSearchResultDto[]>> { const noticeOfIntents = await this.noticeOfIntentSearchService.searchNoticeOfIntents(searchDto); - const mappedSearchResult = this.mapAdvancedSearchResults( + const mappedSearchResult = this.mapSearchResults( null, noticeOfIntents, null, @@ -106,18 +102,14 @@ export class PublicSearchController { } @Post('/notifications') - async advancedSearchNotifications( + async searchNotifications( @Body() searchDto: SearchRequestDto, ): Promise<AdvancedSearchResultDto<NotificationSearchResultDto[]>> { const notifications = await this.notificationSearchService.search( searchDto, ); - const mappedSearchResult = this.mapAdvancedSearchResults( - null, - null, - notifications, - ); + const mappedSearchResult = this.mapSearchResults(null, null, notifications); return { total: mappedSearchResult.totalNotifications, @@ -144,12 +136,17 @@ export class PublicSearchController { notificationTypeSpecified = searchDto.fileTypes.includes('SRW'); } - const searchNoi = searchDto.fileTypes.length > 0 ? noiTypeSpecified : true; + const searchNoi = + (searchDto.fileTypes.length > 0 ? noiTypeSpecified : true) && + (searchDto.decisionMakerCode + ? searchDto.decisionMakerCode === 'CEOP' + : true); const searchNotifications = (searchDto.fileTypes.length > 0 ? notificationTypeSpecified : true) && !searchDto.dateDecidedFrom && !searchDto.dateDecidedTo && + !searchDto.decisionMakerCode && !isStringSetAndNotEmpty(searchDto.civicAddress); return { @@ -159,7 +156,7 @@ export class PublicSearchController { }; } - private mapAdvancedSearchResults( + private mapSearchResults( applications: AdvancedSearchResultDto< PublicApplicationSubmissionSearchView[] > | null, @@ -176,7 +173,7 @@ export class PublicSearchController { if (applications && applications.data.length > 0) { mappedApplications.push( ...applications.data.map((app) => - this.mapApplicationToAdvancedSearchResult(app), + this.mapApplicationToSearchResult(app), ), ); } @@ -185,7 +182,7 @@ export class PublicSearchController { if (noticeOfIntents && noticeOfIntents.data.length > 0) { mappedNoticeOfIntents.push( ...noticeOfIntents.data.map((noi) => - this.mapNoticeOfIntentToAdvancedSearchResult(noi), + this.mapNoticeOfIntentToSearchResult(noi), ), ); } @@ -194,7 +191,7 @@ export class PublicSearchController { if (notifications && notifications.data && notifications.data.length > 0) { mappedNotifications.push( ...notifications.data.map((notification) => - this.mapNotificationToAdvancedSearchResult(notification), + this.mapNotificationToSearchResult(notification), ), ); } @@ -209,18 +206,14 @@ export class PublicSearchController { return response; } - private mapApplicationToAdvancedSearchResult( + private mapApplicationToSearchResult( application: PublicApplicationSubmissionSearchView, ): ApplicationSearchResultDto { return { referenceId: application.fileNumber, fileNumber: application.fileNumber, dateSubmitted: application.dateSubmittedToAlc?.getTime(), - type: this.mapper.map( - application.applicationType, - ApplicationType, - ApplicationTypeDto, - ), + type: application.applicationType.label, lastUpdate: application.lastUpdate?.getTime(), localGovernmentName: application.localGovernmentName, ownerName: application.applicant, @@ -229,7 +222,7 @@ export class PublicSearchController { }; } - private mapNoticeOfIntentToAdvancedSearchResult( + private mapNoticeOfIntentToSearchResult( noi: PublicNoticeOfIntentSubmissionSearchView, ): NoticeOfIntentSearchResultDto { return { @@ -237,11 +230,7 @@ export class PublicSearchController { fileNumber: noi.fileNumber, lastUpdate: noi.lastUpdate?.getTime(), dateSubmitted: noi.dateSubmittedToAlc?.getTime(), - type: this.mapper.map( - noi.noticeOfIntentType, - ApplicationType, - ApplicationTypeDto, - ), + type: noi.noticeOfIntentType.label, localGovernmentName: noi.localGovernmentName, ownerName: noi.applicant, class: 'NOI', @@ -249,19 +238,15 @@ export class PublicSearchController { }; } - private mapNotificationToAdvancedSearchResult( + private mapNotificationToSearchResult( notification: PublicNotificationSubmissionSearchView, - ): NoticeOfIntentSearchResultDto { + ): NotificationSearchResultDto { return { referenceId: notification.fileNumber, fileNumber: notification.fileNumber, - lastUpdate: notification.status.effective_date.getTime(), + lastUpdate: notification.status.effective_date, dateSubmitted: notification.dateSubmittedToAlc?.getTime(), - type: this.mapper.map( - notification.notificationType, - ApplicationType, - ApplicationTypeDto, - ), + type: notification.notificationType.label, localGovernmentName: notification.localGovernmentName, ownerName: notification.applicant, class: 'NOTI', diff --git a/services/apps/alcs/src/portal/public/search/public-search.dto.ts b/services/apps/alcs/src/portal/public/search/public-search.dto.ts index 3b8490385a..2ad283bfd8 100644 --- a/services/apps/alcs/src/portal/public/search/public-search.dto.ts +++ b/services/apps/alcs/src/portal/public/search/public-search.dto.ts @@ -9,8 +9,8 @@ import { ApplicationTypeDto } from '../../code/code.dto'; export type SearchEntityClass = 'APP' | 'NOI' | 'NOTI'; -export class ApplicationSearchResultDto { - type: ApplicationTypeDto; +export class BaseSearchResultDto { + type: string; referenceId: string; ownerName?: string; localGovernmentName?: string; @@ -22,31 +22,9 @@ export class ApplicationSearchResultDto { class: SearchEntityClass; } -export class NoticeOfIntentSearchResultDto { - type: ApplicationTypeDto; - referenceId: string; - ownerName?: string; - localGovernmentName?: string; - fileNumber: string; - boardCode?: string; - status: string; - dateSubmitted?: number; - lastUpdate?: number; - class: SearchEntityClass; -} - -export class NotificationSearchResultDto { - type: ApplicationTypeDto; - referenceId: string; - ownerName?: string; - localGovernmentName?: string; - fileNumber: string; - boardCode?: string; - status: string; - dateSubmitted?: number; - lastUpdate?: number; - class: SearchEntityClass; -} +export class ApplicationSearchResultDto extends BaseSearchResultDto {} +export class NoticeOfIntentSearchResultDto extends BaseSearchResultDto {} +export class NotificationSearchResultDto extends BaseSearchResultDto {} export class AdvancedSearchResponseDto { applications: ApplicationSearchResultDto[]; @@ -108,6 +86,10 @@ export class SearchRequestDto extends PagingRequestDto { @IsOptional() regionCode?: string; + @IsString() + @IsOptional() + decisionMakerCode?: string; + @IsNumber() @IsOptional() dateDecidedFrom?: number; @@ -124,6 +106,6 @@ export class SearchRequestDto extends PagingRequestDto { export class LinkedStatusType { submission_uuid: string; status_type_code: string; - effective_date: Date; + effective_date: number; label: string; } diff --git a/services/apps/alcs/src/portal/public/status/public-status.controller.spec.ts b/services/apps/alcs/src/portal/public/status/public-status.controller.spec.ts new file mode 100644 index 0000000000..65727aa03f --- /dev/null +++ b/services/apps/alcs/src/portal/public/status/public-status.controller.spec.ts @@ -0,0 +1,50 @@ +import { classes } from '@automapper/classes'; +import { AutomapperModule } from '@automapper/nestjs'; +import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; +import { Test, TestingModule } from '@nestjs/testing'; +import { ClsService } from 'nestjs-cls'; +import { mockKeyCloakProviders } from '../../../../test/mocks/mockTypes'; +import { ApplicationSubmissionStatusService } from '../../../alcs/application/application-submission-status/application-submission-status.service'; +import { NotificationSubmissionStatusService } from '../../../alcs/notification/notification-submission-status/notification-submission-status.service'; +import { PublicStatusController } from './public-status.controller'; + +describe('PublicStatusController', () => { + let controller: PublicStatusController; + let mockAppStatusService: DeepMocked<ApplicationSubmissionStatusService>; + let mockNotiStatusService: DeepMocked<NotificationSubmissionStatusService>; + + beforeEach(async () => { + mockAppStatusService = createMock(); + mockNotiStatusService = createMock(); + + const module: TestingModule = await Test.createTestingModule({ + imports: [ + AutomapperModule.forRoot({ + strategyInitializer: classes(), + }), + ], + providers: [ + { + provide: ApplicationSubmissionStatusService, + useValue: mockAppStatusService, + }, + { + provide: NotificationSubmissionStatusService, + useValue: mockNotiStatusService, + }, + { + provide: ClsService, + useValue: {}, + }, + ...mockKeyCloakProviders, + ], + controllers: [PublicStatusController], + }).compile(); + + controller = module.get<PublicStatusController>(PublicStatusController); + }); + + it('should be defined', () => { + expect(controller).toBeDefined(); + }); +}); diff --git a/services/apps/alcs/src/portal/public/status/public-status.controller.ts b/services/apps/alcs/src/portal/public/status/public-status.controller.ts new file mode 100644 index 0000000000..a894333e62 --- /dev/null +++ b/services/apps/alcs/src/portal/public/status/public-status.controller.ts @@ -0,0 +1,52 @@ +import { Mapper } from '@automapper/core'; +import { InjectMapper } from '@automapper/nestjs'; +import { Controller, Get } from '@nestjs/common'; +import { Public } from 'nest-keycloak-connect'; +import { ApplicationSubmissionStatusService } from '../../../alcs/application/application-submission-status/application-submission-status.service'; +import { ApplicationSubmissionStatusType } from '../../../alcs/application/application-submission-status/submission-status-type.entity'; +import { ApplicationStatusDto } from '../../../alcs/application/application-submission-status/submission-status.dto'; +import { NotificationSubmissionStatusType } from '../../../alcs/notification/notification-submission-status/notification-status-type.entity'; +import { NotificationStatusDto } from '../../../alcs/notification/notification-submission-status/notification-status.dto'; +import { NotificationSubmissionStatusService } from '../../../alcs/notification/notification-submission-status/notification-submission-status.service'; + +const PUBLIC_APP_STATUSES = ['RECA', 'REVA', 'ALCD']; +const PUBLIC_SRW_STATUSES = ['ALCR']; + +@Public() +@Controller('/public/status') +export class PublicStatusController { + constructor( + @InjectMapper() private mapper: Mapper, + private applicationSubmissionStatusService: ApplicationSubmissionStatusService, + private notificationSubmissionStatusService: NotificationSubmissionStatusService, + ) {} + + @Get('/') + async getStatuses() { + const appStatuses = + await this.applicationSubmissionStatusService.listStatuses(); + const notiStatuses = + await this.notificationSubmissionStatusService.listStatuses(); + + const publicStatuses = appStatuses.filter((status) => + PUBLIC_APP_STATUSES.includes(status.code), + ); + + const mappedStatuses = this.mapper.mapArray( + publicStatuses, + ApplicationSubmissionStatusType, + ApplicationStatusDto, + ); + + const publicNotiStatus = notiStatuses.filter((status) => + PUBLIC_SRW_STATUSES.includes(status.code), + ); + const mappedNotiStatuses = this.mapper.mapArray( + publicNotiStatus, + NotificationSubmissionStatusType, + NotificationStatusDto, + ); + + return [...mappedStatuses, ...mappedNotiStatuses]; + } +} From 2872d73cf90660a899b946bb96abf2440b950b38 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Tue, 26 Sep 2023 13:54:24 -0700 Subject: [PATCH 430/954] Code Review Feedback --- .../file-type-filter-drop-down.component.scss | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/portal-frontend/src/app/features/public/search/file-type-filter-drop-down/file-type-filter-drop-down.component.scss b/portal-frontend/src/app/features/public/search/file-type-filter-drop-down/file-type-filter-drop-down.component.scss index cd3259d384..de86d4f003 100644 --- a/portal-frontend/src/app/features/public/search/file-type-filter-drop-down/file-type-filter-drop-down.component.scss +++ b/portal-frontend/src/app/features/public/search/file-type-filter-drop-down/file-type-filter-drop-down.component.scss @@ -1,7 +1,9 @@ +@use '../../../../../styles/functions' as *; + .file-type-input { width: 100%; } .tall-autocomplete { - max-height: 600px !important; + max-height: rem(600) !important; } From 8cbd34aab188da0c8703cba036865ab41e0101e8 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Tue, 26 Sep 2023 16:29:16 -0700 Subject: [PATCH 431/954] Text Updates --- .../naru-details/naru-details.component.html | 2 +- .../nfu-details/nfu-details.component.html | 2 +- .../pfrs-details/pfrs-details.component.html | 6 +++--- .../pofo-details/pofo-details.component.html | 4 ++-- .../decision-component/pfrs/pfrs.component.html | 5 ++--- .../pfrs-input/pfrs-input.component.html | 3 +-- .../application/proposal/soil/soil.component.html | 4 ++-- .../pfrs-details/pfrs-details.component.html | 8 ++++---- .../pofo-details/pofo-details.component.html | 4 ++-- .../decision-component/pfrs/pfrs.component.html | 5 ++--- .../pfrs-input/pfrs-input.component.html | 3 +-- .../proposal/soil/soil.component.html | 4 ++-- .../naru-details/naru-details.component.html | 2 +- .../nfu-details/nfu-details.component.html | 2 +- .../pfrs-details/pfrs-details.component.html | 8 ++++---- .../pofo-details/pofo-details.component.html | 4 ++-- .../land-use/land-use.component.html | 15 ++++++++------- .../naru-proposal/naru-proposal.component.html | 2 +- .../land-use/land-use.component.html | 7 ++----- .../pfrs-details/pfrs-details.component.html | 8 ++++---- .../pofo-details/pofo-details.component.html | 4 ++-- .../notice-of-intent-search-table.component.html | 2 +- .../notification-search-table.component.html | 2 +- .../shared/soil-table/soil-table.component.html | 5 ++--- 24 files changed, 52 insertions(+), 59 deletions(-) diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/naru-details/naru-details.component.html b/alcs-frontend/src/app/features/application/applicant-info/application-details/naru-details/naru-details.component.html index 184080ed88..da70e959f5 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/application-details/naru-details/naru-details.component.html +++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/naru-details/naru-details.component.html @@ -131,7 +131,7 @@ <div class="grid-1"><strong>Volume</strong></div> <div class="grid-2">{{ _applicationSubmission.naruToPlaceVolume }} m<sup>3</sup></div> <div class="grid-1"><strong>Area</strong></div> - <div class="grid-2">{{ _applicationSubmission.naruToPlaceArea }} ha</div> + <div class="grid-2">{{ _applicationSubmission.naruToPlaceArea }} m<sup>2</sup></div> <div class="grid-1"><strong>Maximum Depth</strong></div> <div class="grid-2">{{ _applicationSubmission.naruToPlaceMaximumDepth }} m</div> <div class="grid-1"><strong>Average Depth</strong></div> diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/nfu-details/nfu-details.component.html b/alcs-frontend/src/app/features/application/applicant-info/application-details/nfu-details/nfu-details.component.html index 55227877b5..7468db234f 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/application-details/nfu-details/nfu-details.component.html +++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/nfu-details/nfu-details.component.html @@ -54,7 +54,7 @@ <h4>Soil and Fill Components</h4> <div class="grid-1"><strong>Volume</strong></div> <div class="grid-2">{{ applicationSubmission.nfuFillVolume }} m<sup>3</sup></div> <div class="grid-1"><strong>Area</strong></div> - <div class="grid-2">{{ applicationSubmission.nfuTotalFillArea }} ha</div> + <div class="grid-2">{{ applicationSubmission.nfuTotalFillArea }} m<sup>2</sup></div> <div class="grid-1"><strong>Maximum Depth</strong></div> <div class="grid-2">{{ applicationSubmission.nfuMaxFillDepth }} m</div> <div class="grid-1"><strong>Average Depth</strong></div> diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/pfrs-details/pfrs-details.component.html b/alcs-frontend/src/app/features/application/applicant-info/application-details/pfrs-details/pfrs-details.component.html index b7d1530232..238f719925 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/application-details/pfrs-details/pfrs-details.component.html +++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/pfrs-details/pfrs-details.component.html @@ -32,7 +32,7 @@ <div><strong>Area</strong></div> <div> {{ _applicationSubmission.soilToRemoveArea }} - <span *ngIf="_applicationSubmission.soilToRemoveArea !== null">ha</span> + <span *ngIf="_applicationSubmission.soilToRemoveArea !== null">m<sup>2</sup></span> </div> <div> {{ _applicationSubmission.soilToPlaceArea }} @@ -78,11 +78,11 @@ <div><strong>Area</strong></div> <div> {{ _applicationSubmission.soilAlreadyRemovedArea }} - <span *ngIf="_applicationSubmission.soilAlreadyRemovedArea !== null">ha</span> + <span *ngIf="_applicationSubmission.soilAlreadyRemovedArea !== null">m<sup>2</sup></span> </div> <div> {{ _applicationSubmission.soilAlreadyPlacedArea }} - <span *ngIf="_applicationSubmission.soilAlreadyPlacedArea !== null">ha</span> + <span *ngIf="_applicationSubmission.soilAlreadyPlacedArea !== null">m<sup>2</sup></span> </div> <div><strong>Maximum Depth</strong></div> diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/pofo-details/pofo-details.component.html b/alcs-frontend/src/app/features/application/applicant-info/application-details/pofo-details/pofo-details.component.html index 55f1c61b19..8b093c8712 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/application-details/pofo-details/pofo-details.component.html +++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/pofo-details/pofo-details.component.html @@ -23,7 +23,7 @@ </div> <div class="grid-1"><strong>Area</strong></div> <div class="grid-2"> - {{ _applicationSubmission.soilToPlaceArea }} <span *ngIf="_applicationSubmission.soilToPlaceArea">ha</span> + {{ _applicationSubmission.soilToPlaceArea }} <span *ngIf="_applicationSubmission.soilToPlaceArea">m<sup>2</sup></span> </div> <div class="grid-1"><strong>Maximum Depth</strong></div> <div class="grid-2"> @@ -47,7 +47,7 @@ <div class="grid-1"><strong>Area</strong></div> <div class="grid-2"> {{ _applicationSubmission.soilAlreadyPlacedArea }} - <span *ngIf="_applicationSubmission.soilAlreadyPlacedArea">ha</span> + <span *ngIf="_applicationSubmission.soilAlreadyPlacedArea">m<sup>2</sup></span> </div> <div class="grid-1"><strong>Maximum Depth</strong></div> <div class="grid-2"> diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pfrs/pfrs.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pfrs/pfrs.component.html index 87b04a95bc..47ef06075b 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pfrs/pfrs.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pfrs/pfrs.component.html @@ -47,11 +47,10 @@ <tr> <td class="soil-table-label"> Area - <div class="subtext">Note: 0.01 ha is 100m2</div> </td> <td> <span *ngIf="component.soilToRemoveArea !== null && component.soilToRemoveArea !== undefined"> - {{ component.soilToRemoveArea }} ha</span + {{ component.soilToRemoveArea }} m<sup>2</sup></span > <app-no-data *ngIf="component.soilToRemoveArea === null || component.soilToRemoveArea === undefined" @@ -60,7 +59,7 @@ <td> <span *ngIf="component.soilToPlaceArea !== null && component.soilToPlaceArea !== undefined" - >{{ component.soilToPlaceArea }} ha</span + >{{ component.soilToPlaceArea }} m<sup>2</sup></span > <app-no-data *ngIf="component.soilToPlaceArea === null || component.soilToPlaceArea === undefined" diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/pfrs-input/pfrs-input.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/pfrs-input/pfrs-input.component.html index 0235ef5514..626c578605 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/pfrs-input/pfrs-input.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/pfrs-input/pfrs-input.component.html @@ -89,7 +89,6 @@ </div> <div class="label"> <label for="areaToRemove">Area*</label> - <div class="subtext">Note: 0.01 ha is 100m2</div> </div> <div> <mat-form-field appearance="outline" class="full-width"> @@ -101,7 +100,7 @@ matInput formControlName="areaToRemove" /> - <span matTextSuffix>ha</span> + <span matTextSuffix>m<sup>2</sup></span> </mat-form-field> </div> <div> diff --git a/alcs-frontend/src/app/features/application/proposal/soil/soil.component.html b/alcs-frontend/src/app/features/application/proposal/soil/soil.component.html index 5a4e40d718..53347cd2fe 100644 --- a/alcs-frontend/src/app/features/application/proposal/soil/soil.component.html +++ b/alcs-frontend/src/app/features/application/proposal/soil/soil.component.html @@ -31,8 +31,8 @@ </tr> <tr> <td class="soil-table-label">Area</td> - <td *ngIf="submission.soilToPlaceArea !== null">{{ submission.soilToPlaceArea }} ha</td> - <td *ngIf="submission.soilToRemoveArea !== null">{{ submission.soilToRemoveArea }} ha</td> + <td *ngIf="submission.soilToPlaceArea !== null">{{ submission.soilToPlaceArea }} m<sup>2</sup></td> + <td *ngIf="submission.soilToRemoveArea !== null">{{ submission.soilToRemoveArea }} m<sup>2</sup></td> </tr> <tr> <td class="soil-table-label">Maximum Depth</td> diff --git a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/pfrs-details/pfrs-details.component.html b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/pfrs-details/pfrs-details.component.html index e7815c1315..9ed94ebb1a 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/pfrs-details/pfrs-details.component.html +++ b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/pfrs-details/pfrs-details.component.html @@ -32,11 +32,11 @@ <div><strong>Area</strong></div> <div> {{ _noiSubmission.soilToRemoveArea }} - <span *ngIf="_noiSubmission.soilToRemoveArea !== null">ha</span> + <span *ngIf="_noiSubmission.soilToRemoveArea !== null">m<sup>2</sup></span> </div> <div> {{ _noiSubmission.soilToPlaceArea }} - <span *ngIf="_noiSubmission.soilToPlaceArea !== null">ha</span> + <span *ngIf="_noiSubmission.soilToPlaceArea !== null">m<sup>2</sup></span> </div> <div><strong>Maximum Depth</strong></div> @@ -78,11 +78,11 @@ <div><strong>Area</strong></div> <div> {{ _noiSubmission.soilAlreadyRemovedArea }} - <span *ngIf="_noiSubmission.soilAlreadyRemovedArea !== null">ha</span> + <span *ngIf="_noiSubmission.soilAlreadyRemovedArea !== null">m<sup>2</sup></span> </div> <div> {{ _noiSubmission.soilAlreadyPlacedArea }} - <span *ngIf="_noiSubmission.soilAlreadyPlacedArea !== null">ha</span> + <span *ngIf="_noiSubmission.soilAlreadyPlacedArea !== null">m<sup>2</sup></span> </div> <div><strong>Maximum Depth</strong></div> diff --git a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/pofo-details/pofo-details.component.html b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/pofo-details/pofo-details.component.html index 9519ecc0e9..c23c8d82cd 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/pofo-details/pofo-details.component.html +++ b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/pofo-details/pofo-details.component.html @@ -23,7 +23,7 @@ </div> <div class="grid-1"><strong>Area</strong></div> <div class="grid-2"> - {{ _noiSubmission.soilToPlaceArea }} <span *ngIf="_noiSubmission.soilToPlaceArea">ha</span> + {{ _noiSubmission.soilToPlaceArea }} <span *ngIf="_noiSubmission.soilToPlaceArea">m<sup>2</sup></span> </div> <div class="grid-1"><strong>Maximum Depth</strong></div> <div class="grid-2"> @@ -47,7 +47,7 @@ <div class="grid-1"><strong>Area</strong></div> <div class="grid-2"> {{ _noiSubmission.soilAlreadyPlacedArea }} - <span *ngIf="_noiSubmission.soilAlreadyPlacedArea">ha</span> + <span *ngIf="_noiSubmission.soilAlreadyPlacedArea">m<sup>2</sup></span> </div> <div class="grid-1"><strong>Maximum Depth</strong></div> <div class="grid-2"> diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/pfrs/pfrs.component.html b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/pfrs/pfrs.component.html index 87b04a95bc..47ef06075b 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/pfrs/pfrs.component.html +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/pfrs/pfrs.component.html @@ -47,11 +47,10 @@ <tr> <td class="soil-table-label"> Area - <div class="subtext">Note: 0.01 ha is 100m2</div> </td> <td> <span *ngIf="component.soilToRemoveArea !== null && component.soilToRemoveArea !== undefined"> - {{ component.soilToRemoveArea }} ha</span + {{ component.soilToRemoveArea }} m<sup>2</sup></span > <app-no-data *ngIf="component.soilToRemoveArea === null || component.soilToRemoveArea === undefined" @@ -60,7 +59,7 @@ <td> <span *ngIf="component.soilToPlaceArea !== null && component.soilToPlaceArea !== undefined" - >{{ component.soilToPlaceArea }} ha</span + >{{ component.soilToPlaceArea }} m<sup>2</sup></span > <app-no-data *ngIf="component.soilToPlaceArea === null || component.soilToPlaceArea === undefined" diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/pfrs-input/pfrs-input.component.html b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/pfrs-input/pfrs-input.component.html index fa2213b901..678de0ed3e 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/pfrs-input/pfrs-input.component.html +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/pfrs-input/pfrs-input.component.html @@ -88,7 +88,6 @@ </div> <div class="label"> <label for="areaToRemove">Area*</label> - <div class="subtext">Note: 0.01 ha is 100m2</div> </div> <div> <mat-form-field appearance="outline" class="full-width"> @@ -100,7 +99,7 @@ matInput formControlName="areaToRemove" /> - <span matTextSuffix>ha</span> + <span matTextSuffix>m<sup>2</sup></span> </mat-form-field> </div> <div> diff --git a/alcs-frontend/src/app/features/notice-of-intent/proposal/soil/soil.component.html b/alcs-frontend/src/app/features/notice-of-intent/proposal/soil/soil.component.html index 59611d05d0..af596da7f0 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/proposal/soil/soil.component.html +++ b/alcs-frontend/src/app/features/notice-of-intent/proposal/soil/soil.component.html @@ -31,8 +31,8 @@ </tr> <tr> <td class="soil-table-label">Area</td> - <td *ngIf="submission.soilToPlaceArea !== null">{{ submission.soilToPlaceArea }} ha</td> - <td *ngIf="submission.soilToRemoveArea !== null">{{ submission.soilToRemoveArea }} ha</td> + <td *ngIf="submission.soilToPlaceArea !== null">{{ submission.soilToPlaceArea }} m<sup>2</sup></td> + <td *ngIf="submission.soilToRemoveArea !== null">{{ submission.soilToRemoveArea }} m<sup>2</sup></td> </tr> <tr> <td class="soil-table-label">Maximum Depth</td> diff --git a/portal-frontend/src/app/features/applications/application-details/naru-details/naru-details.component.html b/portal-frontend/src/app/features/applications/application-details/naru-details/naru-details.component.html index 25521b94b3..6839f37024 100644 --- a/portal-frontend/src/app/features/applications/application-details/naru-details/naru-details.component.html +++ b/portal-frontend/src/app/features/applications/application-details/naru-details/naru-details.component.html @@ -220,7 +220,7 @@ <div class="grid-1"><strong>Area</strong></div> <div class="grid-2"> {{ _applicationSubmission.naruToPlaceArea }} - <span *ngIf="_applicationSubmission.naruToPlaceArea !== null">ha</span> + <span *ngIf="_applicationSubmission.naruToPlaceArea !== null">m<sup>2</sup></span> <app-no-data [showRequired]="showErrors" *ngIf="_applicationSubmission.naruToPlaceArea === null"></app-no-data> </div> <div class="grid-1"><strong>Maximum Depth</strong></div> diff --git a/portal-frontend/src/app/features/applications/application-details/nfu-details/nfu-details.component.html b/portal-frontend/src/app/features/applications/application-details/nfu-details/nfu-details.component.html index 0e56ee6ac8..c2a2af1d48 100644 --- a/portal-frontend/src/app/features/applications/application-details/nfu-details/nfu-details.component.html +++ b/portal-frontend/src/app/features/applications/application-details/nfu-details/nfu-details.component.html @@ -84,7 +84,7 @@ <h4>Soil and Fill Components</h4> <div class="grid-1"><strong>Area</strong></div> <div class="grid-2"> {{ applicationSubmission.nfuTotalFillArea }} - <span *ngIf="applicationSubmission.nfuTotalFillArea !== null">ha</span> + <span *ngIf="applicationSubmission.nfuTotalFillArea !== null">m<sup>2</sup></span> <app-no-data [showRequired]="showErrors" *ngIf="applicationSubmission.nfuTotalFillArea === null" diff --git a/portal-frontend/src/app/features/applications/application-details/pfrs-details/pfrs-details.component.html b/portal-frontend/src/app/features/applications/application-details/pfrs-details/pfrs-details.component.html index df8b8ed049..07e799d934 100644 --- a/portal-frontend/src/app/features/applications/application-details/pfrs-details/pfrs-details.component.html +++ b/portal-frontend/src/app/features/applications/application-details/pfrs-details/pfrs-details.component.html @@ -48,12 +48,12 @@ <div><strong>Area</strong></div> <div> {{ _applicationSubmission.soilToRemoveArea }} - <span *ngIf="_applicationSubmission.soilToRemoveArea !== null">ha</span> + <span *ngIf="_applicationSubmission.soilToRemoveArea !== null">m<sup>2</sup></span> <app-no-data [showRequired]="showErrors" *ngIf="_applicationSubmission.soilToRemoveArea === null"></app-no-data> </div> <div> {{ _applicationSubmission.soilToPlaceArea }} - <span *ngIf="_applicationSubmission.soilToPlaceArea !== null">ha</span> + <span *ngIf="_applicationSubmission.soilToPlaceArea !== null">m<sup>2</sup></span> <app-no-data [showRequired]="showErrors" *ngIf="_applicationSubmission.soilToPlaceArea === null"></app-no-data> </div> @@ -120,7 +120,7 @@ <div><strong>Area</strong></div> <div> {{ _applicationSubmission.soilAlreadyRemovedArea }} - <span *ngIf="_applicationSubmission.soilAlreadyRemovedArea !== null">ha</span> + <span *ngIf="_applicationSubmission.soilAlreadyRemovedArea !== null">m<sup>2</sup></span> <app-no-data [showRequired]="showErrors" *ngIf="_applicationSubmission.soilAlreadyRemovedArea === null" @@ -128,7 +128,7 @@ </div> <div> {{ _applicationSubmission.soilAlreadyPlacedArea }} - <span *ngIf="_applicationSubmission.soilAlreadyPlacedArea !== null">ha</span> + <span *ngIf="_applicationSubmission.soilAlreadyPlacedArea !== null">m<sup>2</sup></span> <app-no-data [showRequired]="showErrors" *ngIf="_applicationSubmission.soilAlreadyPlacedArea === null" diff --git a/portal-frontend/src/app/features/applications/application-details/pofo-details/pofo-details.component.html b/portal-frontend/src/app/features/applications/application-details/pofo-details/pofo-details.component.html index 9a5baee9f3..af82d2b5ce 100644 --- a/portal-frontend/src/app/features/applications/application-details/pofo-details/pofo-details.component.html +++ b/portal-frontend/src/app/features/applications/application-details/pofo-details/pofo-details.component.html @@ -41,7 +41,7 @@ </div> <div class="grid-1"><strong>Area</strong></div> <div class="grid-2"> - {{ _applicationSubmission.soilToPlaceArea }} <span *ngIf="_applicationSubmission.soilToPlaceArea">ha</span> + {{ _applicationSubmission.soilToPlaceArea }} <span *ngIf="_applicationSubmission.soilToPlaceArea">m<sup>2</sup></span> <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.soilToPlaceArea"></app-no-data> </div> <div class="grid-1"><strong>Maximum Depth</strong></div> @@ -75,7 +75,7 @@ <div class="grid-1"><strong>Area</strong></div> <div class="grid-2"> {{ _applicationSubmission.soilAlreadyPlacedArea }} - <span *ngIf="_applicationSubmission.soilAlreadyPlacedArea !== null">ha</span> + <span *ngIf="_applicationSubmission.soilAlreadyPlacedArea !== null">m<sup>2</sup></span> <app-no-data [showRequired]="showErrors" *ngIf="_applicationSubmission.soilAlreadyPlacedArea === null" diff --git a/portal-frontend/src/app/features/applications/edit-submission/land-use/land-use.component.html b/portal-frontend/src/app/features/applications/edit-submission/land-use/land-use.component.html index d791300bf0..238a51bf8c 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/land-use/land-use.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/land-use/land-use.component.html @@ -43,8 +43,8 @@ <h5>Land Use of Parcel(s) under Application</h5> <div *ngIf="parcelsAgricultureDescription.errors?.['required']">This field is required</div> </div> <mat-hint class="subtext" - >Example 1: PID 001-002-003: 60 ha hay crop, 40 ha grazing, 200 sheep. Example 2: Parcel 1: 10% - blueberry crop, 30% vegetables, 60% hay. Parcel 2: 100% hay. + >Example 1: PID 001-002-003: 60 ha hay crop, 40 ha grazing, 200 sheep. Example 2: Parcel 1: 10% blueberry + crop, 30% vegetables, 60% hay. Parcel 2: 100% hay. </mat-hint> <div class="subtext">Characters left: {{ 4000 - parcelsAgricultureDescriptionText.textLength }}</div> </div> @@ -88,7 +88,8 @@ <h6> Describe all other uses that currently take place on the parcel(s). </label> <div class="subtext"> - Describe other uses such as residential, home-based businesses, commercial, recreational, institutional, industrial, etc. + Describe other uses such as residential, home-based businesses, commercial, recreational, institutional, + industrial, etc. </div> <mat-form-field class="display-block" appearance="outline"> <textarea @@ -111,14 +112,14 @@ <h6> <mat-icon>warning</mat-icon> <div *ngIf="parcelsNonAgricultureUseDescription.errors?.['required']">This field is required</div> </div> - <mat-hint class="subtext">Example: House and 100 square metre detached auto repair shop.</mat-hint> + <mat-hint class="subtext" + >Example: 100m<sup>2</sup> house and 50m<sup>2</sup> detached auto repair shop</mat-hint + > <div class="subtext">Characters left: {{ 4000 - parcelsNonAgricultureUseDescriptionText.textLength }}</div> </div> </div> <h5>Choose and describe neighbouring land uses.</h5> - <div class="subtext"> - Choose the main land use type from the drop-down and describe the specific activities. - </div> + <div class="subtext">Choose the main land use type from the drop-down and describe the specific activities.</div> <div class="form-row"> <div class="full-row"> <label for="northLandUseType">North</label> diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.html index 0f7217200e..029e424f04 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.html @@ -441,7 +441,7 @@ <h2>Proposal</h2> <div class="full-row"> <label for="will-import-fill"> - Do you need to import any fill to construct or conduct the proposed Non-farm use? + Do you need to import any fill to construct or conduct the proposed non-adhering residential use? </label> <div class="subtext">Fill is any material brought onto the property, including gravel for construction.</div> <mat-button-toggle-group diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/land-use/land-use.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/land-use/land-use.component.html index 875544f0ef..e47b1f85f3 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/land-use/land-use.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/land-use/land-use.component.html @@ -118,11 +118,8 @@ <h6> <div class="subtext">Characters left: {{ 4000 - parcelsNonAgricultureUseDescriptionText.textLength }}</div> </div> </div> - <h5>Identify the land uses surrounding the parcel(s) under notice of intent.</h5> - <div class="subtext"> - Choose the Primary Land Use Type from the drop-down list. If there is more than one land use type, choose the main - land use and describe all the uses under Specific Activity. - </div> + <h5>Choose and describe neighbouring land uses.</h5> + <div class="subtext">Choose the main land use type from the drop-down and describe the specific activities.</div> <div class="form-row"> <div class="full-row"> <label for="northLandUseType">North</label> diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pfrs-details/pfrs-details.component.html b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pfrs-details/pfrs-details.component.html index b7fbfecedb..8eb5a68445 100644 --- a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pfrs-details/pfrs-details.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pfrs-details/pfrs-details.component.html @@ -90,12 +90,12 @@ <div><strong>Area</strong></div> <div> {{ _noiSubmission.soilToRemoveArea }} - <span *ngIf="_noiSubmission.soilToRemoveArea !== null">ha</span> + <span *ngIf="_noiSubmission.soilToRemoveArea !== null">m<sup>2</sup></span> <app-no-data [showRequired]="showErrors" *ngIf="_noiSubmission.soilToRemoveArea === null"></app-no-data> </div> <div> {{ _noiSubmission.soilToPlaceArea }} - <span *ngIf="_noiSubmission.soilToPlaceArea !== null">ha</span> + <span *ngIf="_noiSubmission.soilToPlaceArea !== null">m<sup>2</sup></span> <app-no-data [showRequired]="showErrors" *ngIf="_noiSubmission.soilToPlaceArea === null"></app-no-data> </div> @@ -168,12 +168,12 @@ <div><strong>Area</strong></div> <div> {{ _noiSubmission.soilAlreadyRemovedArea }} - <span *ngIf="_noiSubmission.soilAlreadyRemovedArea !== null">ha</span> + <span *ngIf="_noiSubmission.soilAlreadyRemovedArea !== null">m<sup>2</sup></span> <app-no-data [showRequired]="showErrors" *ngIf="_noiSubmission.soilAlreadyRemovedArea === null"></app-no-data> </div> <div> {{ _noiSubmission.soilAlreadyPlacedArea }} - <span *ngIf="_noiSubmission.soilAlreadyPlacedArea !== null">ha</span> + <span *ngIf="_noiSubmission.soilAlreadyPlacedArea !== null">m<sup>2</sup></span> <app-no-data [showRequired]="showErrors" *ngIf="_noiSubmission.soilAlreadyPlacedArea === null"></app-no-data> </div> diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pofo-details/pofo-details.component.html b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pofo-details/pofo-details.component.html index 23c93046d2..0c2b15c43e 100644 --- a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pofo-details/pofo-details.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pofo-details/pofo-details.component.html @@ -58,7 +58,7 @@ </div> <div class="grid-1"><strong>Area</strong></div> <div class="grid-2"> - {{ _noiSubmission.soilToPlaceArea }} <span *ngIf="_noiSubmission.soilToPlaceArea">ha</span> + {{ _noiSubmission.soilToPlaceArea }} <span *ngIf="_noiSubmission.soilToPlaceArea">m<sup>2</sup></span> <app-no-data [showRequired]="showErrors" *ngIf="!_noiSubmission.soilToPlaceArea"></app-no-data> </div> <div class="grid-1"><strong>Maximum Depth</strong></div> @@ -97,7 +97,7 @@ <div class="grid-1"><strong>Area</strong></div> <div class="grid-2"> {{ _noiSubmission.soilAlreadyPlacedArea }} - <span *ngIf="_noiSubmission.soilAlreadyPlacedArea !== null">ha</span> + <span *ngIf="_noiSubmission.soilAlreadyPlacedArea !== null">m<sup>2</sup></span> <app-no-data [showRequired]="showErrors" *ngIf="_noiSubmission.soilAlreadyPlacedArea === null"></app-no-data> </div> <div class="grid-1"><strong>Maximum Depth</strong></div> diff --git a/portal-frontend/src/app/features/public/search/notice-of-intent-search-table/notice-of-intent-search-table.component.html b/portal-frontend/src/app/features/public/search/notice-of-intent-search-table/notice-of-intent-search-table.component.html index 433b83c6fa..3b77b2f611 100644 --- a/portal-frontend/src/app/features/public/search/notice-of-intent-search-table/notice-of-intent-search-table.component.html +++ b/portal-frontend/src/app/features/public/search/notice-of-intent-search-table/notice-of-intent-search-table.component.html @@ -9,7 +9,7 @@ matSortDisableClear > <ng-container matColumnDef="fileId"> - <th mat-header-cell *matHeaderCellDef mat-sort-header>Application ID</th> + <th mat-header-cell *matHeaderCellDef mat-sort-header>Notice of Intent ID</th> <td mat-cell *matCellDef="let element"> <a (click)="onSelectRecord(element)">{{ element.fileNumber | emptyColumn }}</a> </td> diff --git a/portal-frontend/src/app/features/public/search/notification-search-table/notification-search-table.component.html b/portal-frontend/src/app/features/public/search/notification-search-table/notification-search-table.component.html index 90a0b85cbe..c76ae6c02f 100644 --- a/portal-frontend/src/app/features/public/search/notification-search-table/notification-search-table.component.html +++ b/portal-frontend/src/app/features/public/search/notification-search-table/notification-search-table.component.html @@ -9,7 +9,7 @@ matSortDisableClear > <ng-container matColumnDef="fileId"> - <th mat-header-cell *matHeaderCellDef mat-sort-header>Application ID</th> + <th mat-header-cell *matHeaderCellDef mat-sort-header>Notification ID</th> <td mat-cell *matCellDef="let element"> <a (click)="onSelectRecord(element)">{{ element.fileNumber | emptyColumn }}</a> </td> diff --git a/portal-frontend/src/app/shared/soil-table/soil-table.component.html b/portal-frontend/src/app/shared/soil-table/soil-table.component.html index 229597270f..d261e01da8 100644 --- a/portal-frontend/src/app/shared/soil-table/soil-table.component.html +++ b/portal-frontend/src/app/shared/soil-table/soil-table.component.html @@ -61,7 +61,6 @@ <div class="label"> <label for="area">Area</label> - <div class="subtext">Note: 0.01 ha is 100m2</div> </div> <div> <mat-form-field appearance="outline"> @@ -74,7 +73,7 @@ matInput formControlName="area" /> - <span matTextSuffix>ha</span> + <span matTextSuffix>m<sup>2</sup></span> </mat-form-field> <div *ngIf="area.invalid && (area.dirty || area.touched)" class="field-error"> <mat-icon>warning</mat-icon> @@ -92,7 +91,7 @@ matInput formControlName="area2" /> - <span matTextSuffix>ha</span> + <span matTextSuffix>m<sup>2</sup></span> </mat-form-field> <div *ngIf="area2.invalid && (area2.dirty || area2.touched)" class="field-error"> <mat-icon>warning</mat-icon> From 70135d0e981fec29bb8a6d733787ff4ee3ae90af Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Wed, 27 Sep 2023 10:31:36 -0700 Subject: [PATCH 432/954] update CDOGS configuration (#1013) --- services/config/default.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/config/default.json b/services/config/default.json index 9e5d48ec20..02b7617ec0 100644 --- a/services/config/default.json +++ b/services/config/default.json @@ -41,8 +41,8 @@ "PASSWORD": "" }, "CDOGS": { - "URL": "https://cdogs-dev.api.gov.bc.ca", - "TOKEN_URL": "https://dev.loginproxy.gov.bc.ca", + "URL": "https://cdogs-test.api.gov.bc.ca", + "TOKEN_URL": "https://test.loginproxy.gov.bc.ca", "SERVICE_CLIENT": "", "SERVICE_CLIENT_SECRET": "", "TEMPLATE_FOLDER": "" From f668f1bee003b12bfc6b53c063839983176eaf7c Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Wed, 27 Sep 2023 11:57:38 -0700 Subject: [PATCH 433/954] add missing high piority to the list (#1014) --- alcs-frontend/src/app/features/home/subtask/subtask.component.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/alcs-frontend/src/app/features/home/subtask/subtask.component.ts b/alcs-frontend/src/app/features/home/subtask/subtask.component.ts index 7421924820..9c0ce84656 100644 --- a/alcs-frontend/src/app/features/home/subtask/subtask.component.ts +++ b/alcs-frontend/src/app/features/home/subtask/subtask.component.ts @@ -86,6 +86,7 @@ export class SubtaskComponent implements OnInit, OnDestroy { ]; this.notificationSubtasks = [ + ...notifications.filter((r) => r.card.highPriority).sort((a, b) => a.createdAt! - b.createdAt!), ...notifications.filter((r) => !r.card.highPriority).sort((a, b) => a.createdAt! - b.createdAt!), ]; From 55203f22894a866bcd7e91a1b4a96833ad8f6ebf Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Wed, 27 Sep 2023 15:45:48 -0700 Subject: [PATCH 434/954] Search Pt3 * Add mobile layout * Change region and status to multi-select * Change results to open in same tab / window * Change header to update based on current page and make clickable --- .../src/app/features/public/public.module.ts | 2 + .../application-search-table.component.html | 4 +- .../application-search-table.component.ts | 4 +- ...tice-of-intent-search-table.component.html | 4 +- ...notice-of-intent-search-table.component.ts | 4 +- .../notification-search-table.component.html | 6 +- .../notification-search-table.component.ts | 4 +- .../search/public-search.component.html | 46 ++++++++++-- .../search/public-search.component.scss | 4 + .../public/search/public-search.component.ts | 75 +++++++++++++++++-- .../search-list/search-list.component.html | 26 +++++++ .../search-list/search-list.component.scss | 26 +++++++ .../search-list/search-list.component.spec.ts | 33 ++++++++ .../search-list/search-list.component.ts | 62 +++++++++++++++ .../src/app/services/search/search.dto.ts | 4 +- .../app/shared/header/header.component.html | 11 ++- .../app/shared/header/header.component.scss | 1 + .../src/app/shared/header/header.component.ts | 28 +++++-- .../public-application-search.service.spec.ts | 4 +- .../public-application-search.service.ts | 17 ++--- ...ic-notice-of-intent-search.service.spec.ts | 4 +- .../public-notice-of-intent-search.service.ts | 17 ++--- ...public-notification-search.service.spec.ts | 4 +- .../public-notification-search.service.ts | 12 +-- .../portal/public/search/public-search.dto.ts | 8 +- 25 files changed, 335 insertions(+), 75 deletions(-) create mode 100644 portal-frontend/src/app/features/public/search/search-list/search-list.component.html create mode 100644 portal-frontend/src/app/features/public/search/search-list/search-list.component.scss create mode 100644 portal-frontend/src/app/features/public/search/search-list/search-list.component.spec.ts create mode 100644 portal-frontend/src/app/features/public/search/search-list/search-list.component.ts diff --git a/portal-frontend/src/app/features/public/public.module.ts b/portal-frontend/src/app/features/public/public.module.ts index 6773ef9621..90ef0d4953 100644 --- a/portal-frontend/src/app/features/public/public.module.ts +++ b/portal-frontend/src/app/features/public/public.module.ts @@ -11,6 +11,7 @@ import { FileTypeFilterDropDownComponent } from './search/file-type-filter-drop- import { NoticeOfIntentSearchTableComponent } from './search/notice-of-intent-search-table/notice-of-intent-search-table.component'; import { NotificationSearchTableComponent } from './search/notification-search-table/notification-search-table.component'; import { PublicSearchComponent } from './search/public-search.component'; +import { SearchListComponent } from './search/search-list/search-list.component'; const routes: Routes = [ { @@ -26,6 +27,7 @@ const routes: Routes = [ NoticeOfIntentSearchTableComponent, ApplicationSearchTableComponent, FileTypeFilterDropDownComponent, + SearchListComponent, ], imports: [ CommonModule, diff --git a/portal-frontend/src/app/features/public/search/application-search-table/application-search-table.component.html b/portal-frontend/src/app/features/public/search/application-search-table/application-search-table.component.html index cbb938be84..0dab4c158a 100644 --- a/portal-frontend/src/app/features/public/search/application-search-table/application-search-table.component.html +++ b/portal-frontend/src/app/features/public/search/application-search-table/application-search-table.component.html @@ -63,7 +63,7 @@ <tr class="mat-row no-data" *matNoDataRow> <td class="text-center" colspan="6"> <div><b>No applications found.</b></div> - <div>Please adjust criteria and try again.</div> + <div>Please adjust search criteria and try again.</div> </td> </tr> </table> @@ -78,5 +78,5 @@ <div class="no-data" *ngIf="_totalCount === 0"> <div><b>No applications found.</b></div> - <div>Please adjust criteria and try again.</div> + <div>Please adjust search criteria and try again.</div> </div> diff --git a/portal-frontend/src/app/features/public/search/application-search-table/application-search-table.component.ts b/portal-frontend/src/app/features/public/search/application-search-table/application-search-table.component.ts index 07b9ef5d25..112d5367c7 100644 --- a/portal-frontend/src/app/features/public/search/application-search-table/application-search-table.component.ts +++ b/portal-frontend/src/app/features/public/search/application-search-table/application-search-table.component.ts @@ -73,9 +73,7 @@ export class ApplicationSearchTableComponent implements OnDestroy { } async onSelectRecord(record: SearchResult) { - const url = this.router.serializeUrl(this.router.createUrlTree([`/application/${record.referenceId}`])); - - window.open(url, '_blank'); + await this.router.navigateByUrl(`/public/application/${record.referenceId}`); } private mapApplications(applications: ApplicationSearchResultDto[]): SearchResult[] { diff --git a/portal-frontend/src/app/features/public/search/notice-of-intent-search-table/notice-of-intent-search-table.component.html b/portal-frontend/src/app/features/public/search/notice-of-intent-search-table/notice-of-intent-search-table.component.html index 433b83c6fa..6aab49d008 100644 --- a/portal-frontend/src/app/features/public/search/notice-of-intent-search-table/notice-of-intent-search-table.component.html +++ b/portal-frontend/src/app/features/public/search/notice-of-intent-search-table/notice-of-intent-search-table.component.html @@ -63,7 +63,7 @@ <tr class="mat-row no-data" *matNoDataRow> <td class="text-center" colspan="6"> <div><b>No notice of intent found.</b></div> - <div>Please adjust criteria and try again.</div> + <div>Please adjust search criteria and try again.</div> </td> </tr> </table> @@ -77,5 +77,5 @@ </ng-container> <div class="no-data" *ngIf="_totalCount === 0"> <div><b>No notice of intent found.</b></div> - <div>Please adjust criteria and try again.</div> + <div>Please adjust search criteria and try again.</div> </div> diff --git a/portal-frontend/src/app/features/public/search/notice-of-intent-search-table/notice-of-intent-search-table.component.ts b/portal-frontend/src/app/features/public/search/notice-of-intent-search-table/notice-of-intent-search-table.component.ts index c744a05f60..eb3c83ceaa 100644 --- a/portal-frontend/src/app/features/public/search/notice-of-intent-search-table/notice-of-intent-search-table.component.ts +++ b/portal-frontend/src/app/features/public/search/notice-of-intent-search-table/notice-of-intent-search-table.component.ts @@ -72,9 +72,7 @@ export class NoticeOfIntentSearchTableComponent implements OnDestroy { } async onSelectRecord(record: SearchResult) { - const url = this.router.serializeUrl(this.router.createUrlTree([`/notice-of-intent/${record.referenceId}`])); - - window.open(url, '_blank'); + await this.router.navigateByUrl(`/public/notice-of-intent/${record.referenceId}`); } private mapNoticeOfIntent(applications: NoticeOfIntentSearchResultDto[]): SearchResult[] { diff --git a/portal-frontend/src/app/features/public/search/notification-search-table/notification-search-table.component.html b/portal-frontend/src/app/features/public/search/notification-search-table/notification-search-table.component.html index 90a0b85cbe..91cb84a6ff 100644 --- a/portal-frontend/src/app/features/public/search/notification-search-table/notification-search-table.component.html +++ b/portal-frontend/src/app/features/public/search/notification-search-table/notification-search-table.component.html @@ -16,7 +16,7 @@ </ng-container> <ng-container matColumnDef="ownerName"> - <th mat-header-cell *matHeaderCellDef mat-sort-header>Owner Name</th> + <th mat-header-cell *matHeaderCellDef mat-sort-header>Transferee</th> <td mat-cell *matCellDef="let element"> {{ element.ownerName | emptyColumn }} </td> @@ -63,7 +63,7 @@ <tr class="mat-row no-data" *matNoDataRow> <td class="text-center" colspan="6"> <div><b>No notice of intent found.</b></div> - <div>Please adjust criteria and try again.</div> + <div>Please adjust search criteria and try again.</div> </td> </tr> </table> @@ -77,5 +77,5 @@ </ng-container> <div class="no-data" *ngIf="_totalCount === 0"> <div><b>No notifications found.</b></div> - <div>Please adjust criteria and try again.</div> + <div>Please adjust search criteria and try again.</div> </div> diff --git a/portal-frontend/src/app/features/public/search/notification-search-table/notification-search-table.component.ts b/portal-frontend/src/app/features/public/search/notification-search-table/notification-search-table.component.ts index f4a8ba5512..9724112575 100644 --- a/portal-frontend/src/app/features/public/search/notification-search-table/notification-search-table.component.ts +++ b/portal-frontend/src/app/features/public/search/notification-search-table/notification-search-table.component.ts @@ -71,9 +71,7 @@ export class NotificationSearchTableComponent implements OnDestroy { } async onSelectRecord(record: SearchResult) { - const url = this.router.serializeUrl(this.router.createUrlTree([`/notification/${record.referenceId}`])); - - window.open(url, '_blank'); + await this.router.navigateByUrl(`/public/notification/${record.referenceId}`); } private mapNotifications(notifications: NotificationSearchResultDto[]): SearchResult[] { diff --git a/portal-frontend/src/app/features/public/search/public-search.component.html b/portal-frontend/src/app/features/public/search/public-search.component.html index 0e76a3288a..57f73e2a05 100644 --- a/portal-frontend/src/app/features/public/search/public-search.component.html +++ b/portal-frontend/src/app/features/public/search/public-search.component.html @@ -12,7 +12,7 @@ <h3>Search by one or more of the following fields:</h3> <div> <label for="fileNumber">ALC ID</label> <mat-form-field appearance="outline"> - <input id="fileNumber" matInput formControlName="fileNumber" /> + <input mask="0*" id="fileNumber" matInput formControlName="fileNumber" /> </mat-form-field> </div> <div> @@ -66,7 +66,7 @@ <h3>Search by one or more of the following fields:</h3> <div> <label for="status">Region</label> <mat-form-field appearance="outline"> - <mat-select id="region" formControlName="region"> + <mat-select multiple="true" id="region" formControlName="region"> <mat-option *ngFor="let region of regions" [value]="region.code">{{ region.label }}</mat-option> </mat-select> </mat-form-field> @@ -89,7 +89,7 @@ <h3>Search by one or more of the following fields:</h3> <div> <label for="status">Status</label> <mat-form-field appearance="outline"> - <mat-select id="status" [formControl]="portalStatusControl"> + <mat-select multiple="true" id="status" [formControl]="portalStatusControl"> <mat-option *ngFor="let status of STATUS_MAP" [value]="status[1]"> {{ status[0] }} </mat-option> @@ -99,7 +99,7 @@ <h3>Search by one or more of the following fields:</h3> <div class="full-width"> <label for="status">Decision Dates</label> <mat-form-field appearance="outline"> - <mat-date-range-input [rangePicker]="decisionDatePicker"> + <mat-date-range-input [max]="today" [rangePicker]="decisionDatePicker"> <input matStartDate formControlName="dateDecidedFrom" /> <input matEndDate formControlName="dateDecidedTo" /> </mat-date-range-input> @@ -115,12 +115,28 @@ <h3>Search by one or more of the following fields:</h3> </div> </form> + <div *ngIf="isLoading && searchResultsHidden" class="center"> + <mat-spinner></mat-spinner> + </div> <div class="search-fields-wrapper search-result-wrapper" *ngIf="!searchResultsHidden"> <h2 class="search-title">Search Results</h2> - <mat-tab-group mat-align-tabs="start" mat-stretch-tabs="false" #searchResultTabs> + <div *ngIf="isLoading && !searchResultsHidden" class="center"> + <mat-spinner></mat-spinner> + </div> + <mat-tab-group *ngIf="!isLoading" mat-align-tabs="start" mat-stretch-tabs #searchResultTabs> <mat-tab> <ng-template mat-tab-label> Applications: {{ applicationTotal }} </ng-template> + <app-search-list + *ngIf="isMobile" + [results]="applications" + [totalCount]="applicationTotal" + [statuses]="statuses" + [regions]="regions" + (loadMore)="onLoadMore('APP')" + > + </app-search-list> <app-application-search-table + *ngIf="!isMobile" [applications]="applications" [totalCount]="applicationTotal" [statuses]="statuses" @@ -131,7 +147,17 @@ <h2 class="search-title">Search Results</h2> <mat-tab> <ng-template mat-tab-label> Notice of Intent: {{ noticeOfIntentTotal }} </ng-template> + <app-search-list + *ngIf="isMobile" + [results]="noticeOfIntents" + [totalCount]="noticeOfIntentTotal" + [statuses]="statuses" + [regions]="regions" + (loadMore)="onLoadMore('NOI')" + > + </app-search-list> <app-notice-of-intent-search-table + *ngIf="!isMobile" [noticeOfIntents]="noticeOfIntents" [totalCount]="noticeOfIntentTotal" [statuses]="statuses" @@ -142,7 +168,17 @@ <h2 class="search-title">Search Results</h2> <mat-tab> <ng-template mat-tab-label> Notifications: {{ notificationTotal }} </ng-template> + <app-search-list + *ngIf="isMobile" + [results]="notifications" + [totalCount]="notificationTotal" + [statuses]="statuses" + [regions]="regions" + (loadMore)="onLoadMore('NOTI')" + > + </app-search-list> <app-notification-search-table + *ngIf="!isMobile" [statuses]="statuses" [notifications]="notifications" [totalCount]="notificationTotal" diff --git a/portal-frontend/src/app/features/public/search/public-search.component.scss b/portal-frontend/src/app/features/public/search/public-search.component.scss index cecf0bb129..16cf75d6b4 100644 --- a/portal-frontend/src/app/features/public/search/public-search.component.scss +++ b/portal-frontend/src/app/features/public/search/public-search.component.scss @@ -8,6 +8,10 @@ border-radius: rem(16); font-weight: bold; } + + .no-data { + margin-top: rem(16); + } } .search-form { diff --git a/portal-frontend/src/app/features/public/search/public-search.component.ts b/portal-frontend/src/app/features/public/search/public-search.component.ts index 98069c147d..552e4cdf3b 100644 --- a/portal-frontend/src/app/features/public/search/public-search.component.ts +++ b/portal-frontend/src/app/features/public/search/public-search.component.ts @@ -1,4 +1,4 @@ -import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; +import { Component, HostListener, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { FormControl, FormGroup } from '@angular/forms'; import { MatAutocompleteSelectedEvent } from '@angular/material/autocomplete'; import { MatPaginator } from '@angular/material/paginator'; @@ -19,6 +19,7 @@ import { import { SearchService } from '../../../services/search/search.service'; import { StatusService } from '../../../services/status/status.service'; import { ToastService } from '../../../services/toast/toast.service'; +import { MOBILE_BREAKPOINT } from '../../../shared/utils/breakpoints'; import { FileTypeFilterDropDownComponent } from './file-type-filter-drop-down/file-type-filter-drop-down.component'; import { TableChange } from './search.interface'; @@ -57,7 +58,7 @@ export class PublicSearchComponent implements OnInit, OnDestroy { sortField = 'dateSubmitted'; localGovernmentControl = new FormControl<string | undefined>(undefined); - portalStatusControl = new FormControl<string | undefined>(undefined); + portalStatusControl = new FormControl<string[]>([]); componentTypeControl = new FormControl<string[] | undefined>(undefined); pidControl = new FormControl<string | undefined>(undefined); nameControl = new FormControl<string | undefined>(undefined); @@ -71,7 +72,7 @@ export class PublicSearchComponent implements OnInit, OnDestroy { componentType: this.componentTypeControl, government: this.localGovernmentControl, decisionMaker: new FormControl<string | undefined>(undefined), - region: new FormControl<string | undefined>(undefined), + region: new FormControl<string[]>([]), dateDecidedFrom: new FormControl(undefined), dateDecidedTo: new FormControl(undefined), }); @@ -86,6 +87,29 @@ export class PublicSearchComponent implements OnInit, OnDestroy { searchResultsHidden = true; decisionMakers: DecisionMakerDto[] = []; STATUS_MAP = Object.entries(STATUS_MAP); + isMobile = false; + isLoading = false; + today = new Date(); + + @HostListener('window:resize', ['$event']) + onWindowResize() { + const isMobile = window.innerWidth <= MOBILE_BREAKPOINT; + + if (this.isMobile !== isMobile) { + if (isMobile) { + this.itemsPerPage = 5; + this.pageIndex = 0; + } else { + this.itemsPerPage = 20; + this.pageIndex = 0; + } + if (!this.searchResultsHidden) { + this.onSubmit(); + } + } + + this.isMobile = isMobile; + } constructor( private searchService: SearchService, @@ -98,6 +122,11 @@ export class PublicSearchComponent implements OnInit, OnDestroy { } ngOnInit(): void { + this.isMobile = window.innerWidth <= MOBILE_BREAKPOINT; + if (this.isMobile) { + this.itemsPerPage = 5; + } + this.setup(); this.searchForm.valueChanges.pipe(takeUntil(this.$destroy)).subscribe(() => { @@ -139,8 +168,10 @@ export class PublicSearchComponent implements OnInit, OnDestroy { async onSubmit() { const searchParams = this.getSearchParams(); + this.isLoading = true; const result = await this.searchService.search(searchParams); this.searchResultsHidden = false; + this.isLoading = false; // push tab activation to next render cycle, after the tabGroup is rendered setTimeout(() => { @@ -176,6 +207,8 @@ export class PublicSearchComponent implements OnInit, OnDestroy { onReset() { this.searchForm.reset(); + this.isLoading = false; + this.searchResultsHidden = true; if (this.fileTypeFilterDropDownComponent) { this.fileTypeFilterDropDownComponent.reset(); @@ -197,9 +230,9 @@ export class PublicSearchComponent implements OnInit, OnDestroy { name: this.formatStringSearchParam(searchControls.name.value), civicAddress: this.formatStringSearchParam(searchControls.civicAddress.value), pid: this.formatStringSearchParam(searchControls.pid.value), - portalStatusCode: searchControls.portalStatus.value ?? undefined, + portalStatusCodes: searchControls.portalStatus.value ?? undefined, governmentName: this.formatStringSearchParam(searchControls.government.value), - regionCode: searchControls.region.value ?? undefined, + regionCodes: searchControls.region.value ?? undefined, decisionMakerCode: searchControls.decisionMaker.value ?? undefined, dateDecidedFrom: searchControls.dateDecidedFrom.value ? new Date(searchControls.dateDecidedFrom.value).getTime() @@ -235,6 +268,38 @@ export class PublicSearchComponent implements OnInit, OnDestroy { this.notificationTotal = result?.total ?? 0; } + async onLoadMore(table: string) { + this.pageIndex += 1; + const searchParams = this.getSearchParams(); + + let result; + switch (table) { + case 'APP': + result = await this.searchService.searchApplications(searchParams); + if (result) { + this.applications = [...this.applications, ...result?.data]; + this.applicationTotal = result?.total ?? 0; + } + break; + case 'NOI': + result = await this.searchService.searchNoticeOfIntents(searchParams); + if (result) { + this.noticeOfIntents = [...this.noticeOfIntents, ...result?.data]; + this.noticeOfIntentTotal = result?.total ?? 0; + } + break; + case 'NOTI': + result = await this.searchService.searchNotifications(searchParams); + if (result) { + this.notifications = [...this.notifications, ...result?.data]; + this.notificationTotal = result?.total ?? 0; + } + break; + default: + this.toastService.showErrorToast('Not implemented'); + } + } + async onTableChange(event: TableChange) { this.pageIndex = event.pageIndex; this.itemsPerPage = event.itemsPerPage; diff --git a/portal-frontend/src/app/features/public/search/search-list/search-list.component.html b/portal-frontend/src/app/features/public/search/search-list/search-list.component.html new file mode 100644 index 0000000000..c05af23c85 --- /dev/null +++ b/portal-frontend/src/app/features/public/search/search-list/search-list.component.html @@ -0,0 +1,26 @@ +<div class="result-list" *ngIf="totalCount > 0"> + <div *ngFor="let result of _results" (click)="onSelectRecord(result)" class="result"> + <div class="subheading2">{{ result.fileNumber }} - {{ result.ownerName }}</div> + <div [title]="result.type">{{ result.type }}</div> + <div [title]="result.localGovernmentName">{{ result.localGovernmentName }}</div> + <div>Last Updated: {{ result.lastUpdate | momentFormat }}</div> + <div + *ngIf="result.status" + class="label" + [style]="{ 'background-color': result.status.portalBackgroundColor, color: result.status.portalColor }" + > + {{ result.status.label }} + </div> + </div> +</div> +<div *ngIf="totalCount !== 0"> + <div class="center">Showing results 1-{{ visibleCount }} of {{ totalCount }}</div> + <div class="center"> + <a *ngIf="visibleCount < totalCount" (click)="onLoadMore()"> View more results </a> + </div> +</div> + +<div class="no-data" *ngIf="totalCount === 0"> + <div><b>No applications found.</b></div> + <div>Please adjust search criteria and try again.</div> +</div> diff --git a/portal-frontend/src/app/features/public/search/search-list/search-list.component.scss b/portal-frontend/src/app/features/public/search/search-list/search-list.component.scss new file mode 100644 index 0000000000..76ff50816f --- /dev/null +++ b/portal-frontend/src/app/features/public/search/search-list/search-list.component.scss @@ -0,0 +1,26 @@ +@use '../../../../../styles/functions' as *; +@use '../../../../../styles/colors'; + +.result-list { + margin-top: rem(16); +} + +.result { + border-radius: rem(4); + box-shadow: 0 rem(2) rem(6) 0 rgba(0, 0, 0, 0.2); + margin: rem(4) rem(4) rem(20); //BOX SHADOWS + padding: rem(12) rem(8); + font-size: 14px !important; + + div { + margin: rem(4); + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + } + + &:hover { + cursor: pointer; + background-color: colors.$grey-light; + } +} diff --git a/portal-frontend/src/app/features/public/search/search-list/search-list.component.spec.ts b/portal-frontend/src/app/features/public/search/search-list/search-list.component.spec.ts new file mode 100644 index 0000000000..6d9446ef73 --- /dev/null +++ b/portal-frontend/src/app/features/public/search/search-list/search-list.component.spec.ts @@ -0,0 +1,33 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { Router } from '@angular/router'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; + +import { SearchListComponent } from './search-list.component'; + +describe('SearchListComponent', () => { + let component: SearchListComponent; + let fixture: ComponentFixture<SearchListComponent>; + let mockRouter: DeepMocked<Router>; + + beforeEach(async () => { + mockRouter = createMock(); + + await TestBed.configureTestingModule({ + declarations: [SearchListComponent], + providers: [ + { + provide: Router, + useValue: mockRouter, + }, + ], + }).compileComponents(); + + fixture = TestBed.createComponent(SearchListComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/public/search/search-list/search-list.component.ts b/portal-frontend/src/app/features/public/search/search-list/search-list.component.ts new file mode 100644 index 0000000000..7fc5be48ea --- /dev/null +++ b/portal-frontend/src/app/features/public/search/search-list/search-list.component.ts @@ -0,0 +1,62 @@ +import { Component, EventEmitter, Input, OnDestroy, Output } from '@angular/core'; +import { Router } from '@angular/router'; +import { Subject } from 'rxjs'; +import { ApplicationStatusDto } from '../../../../services/application-submission/application-submission.dto'; +import { ApplicationRegionDto } from '../../../../services/code/code.dto'; +import { ApplicationSearchResultDto, BaseSearchResultDto } from '../../../../services/search/search.dto'; +import { SearchResult } from '../search.interface'; + +const CLASS_TO_URL_MAP: Record<string, string> = { + APP: 'application', + NOI: 'notice-of-intent', + NOTI: 'notification', +}; + +@Component({ + selector: 'app-search-list', + templateUrl: './search-list.component.html', + styleUrls: ['./search-list.component.scss'], +}) +export class SearchListComponent implements OnDestroy { + $destroy = new Subject<void>(); + + @Input() totalCount = 0; + @Input() statuses: ApplicationStatusDto[] = []; + @Input() regions: ApplicationRegionDto[] = []; + + _results: SearchResult[] = []; + @Input() set results(results: BaseSearchResultDto[]) { + this._results = this.mapResults(results); + this.visibleCount = this._results.length; + } + + @Output() loadMore = new EventEmitter<void>(); + visibleCount = 0; + + constructor(private router: Router) {} + + ngOnDestroy(): void { + this.$destroy.next(); + this.$destroy.complete(); + } + + async onSelectRecord(record: SearchResult) { + const targetUrl = CLASS_TO_URL_MAP[record.class]; + await this.router.navigateByUrl(`/${targetUrl}/${record.referenceId}`); + } + + private mapResults(applications: ApplicationSearchResultDto[]): SearchResult[] { + return applications.map((e) => { + const status = this.statuses.find((st) => st.code === e.status); + + return { + ...e, + status, + }; + }); + } + + onLoadMore() { + this.loadMore.emit(); + } +} diff --git a/portal-frontend/src/app/services/search/search.dto.ts b/portal-frontend/src/app/services/search/search.dto.ts index 04eb64778a..3c4638d7b1 100644 --- a/portal-frontend/src/app/services/search/search.dto.ts +++ b/portal-frontend/src/app/services/search/search.dto.ts @@ -42,9 +42,9 @@ export interface SearchRequestDto extends PagingRequestDto { name?: string; pid?: string; civicAddress?: string; - portalStatusCode?: string; + portalStatusCodes?: string[]; governmentName?: string; - regionCode?: string; + regionCodes?: string[]; decisionMakerCode?: string; dateDecidedFrom?: number; dateDecidedTo?: number; diff --git a/portal-frontend/src/app/shared/header/header.component.html b/portal-frontend/src/app/shared/header/header.component.html index fc861e0be0..62a0a86f02 100644 --- a/portal-frontend/src/app/shared/header/header.component.html +++ b/portal-frontend/src/app/shared/header/header.component.html @@ -4,18 +4,21 @@ <li> <a href="https://www.alc.gov.bc.ca/">ALC Website</a> </li> - <li *ngIf="showPublicSearchLink"> + <li *ngIf="!isOnSearch"> <a routerLink="/public">Public Search</a> </li> - <li *ngIf="showPortalLink"> + <li *ngIf="isOnSearch"> <a routerLink="/">Portal</a> </li> </ul> </div> <div class="title-wrapper"> <div class="title"> - <img class="logo" src="assets/alc_logo.svg" alt="ALC Portal" /> - <h5 class="center">Provincial Agricultural Land Commission Portal</h5> + <img class="logo" (click)="onClickLogo()" src="assets/alc_logo.svg" alt="ALC Portal" /> + <h5 class="center"> + <span *ngIf="isOnSearch">Provincial Agricultural Land Commission Public Search</span> + <span *ngIf="!isOnSearch">Provincial Agricultural Land Commission Portal</span> + </h5> <div *ngIf="isAuthenticated" class="burger-menu"> <mat-icon (click)="onMenuToggle()">{{ isMenuOpen ? 'close' : 'menu' }}</mat-icon> </div> diff --git a/portal-frontend/src/app/shared/header/header.component.scss b/portal-frontend/src/app/shared/header/header.component.scss index 2012c729fc..f2c606ad5e 100644 --- a/portal-frontend/src/app/shared/header/header.component.scss +++ b/portal-frontend/src/app/shared/header/header.component.scss @@ -43,6 +43,7 @@ header { .logo { width: rem(49); height: rem(32); + cursor: pointer; } h5 { display: none; diff --git a/portal-frontend/src/app/shared/header/header.component.ts b/portal-frontend/src/app/shared/header/header.component.ts index bd308a069c..60bf06bab5 100644 --- a/portal-frontend/src/app/shared/header/header.component.ts +++ b/portal-frontend/src/app/shared/header/header.component.ts @@ -12,8 +12,9 @@ export class HeaderComponent implements OnInit, OnDestroy { private $destroy = new Subject<void>(); isAuthenticated = false; isMenuOpen = false; - showPublicSearchLink = true; - showPortalLink = false; + isOnSearch = false; + + title = 'Provincial Agricultural Land Commission Portal'; constructor( private authenticationService: AuthenticationService, @@ -26,11 +27,10 @@ export class HeaderComponent implements OnInit, OnDestroy { this.isAuthenticated = !!user; this.changeDetectorRef.detectChanges(); }); + this.router.events.pipe(takeUntil(this.$destroy)).subscribe(() => { const url = window.location.href; - const isPublic = url.includes('public'); - this.showPortalLink = isPublic; - this.showPublicSearchLink = !isPublic; + this.isOnSearch = url.includes('public'); }); } @@ -56,9 +56,23 @@ export class HeaderComponent implements OnInit, OnDestroy { footer?.classList.toggle(hidden); } - onMenuClicked(url: string) { + async onMenuClicked(url: string) { this.isMenuOpen = false; - this.router.navigate([url]); + await this.router.navigate([url]); this.toggleContent(); } + + async onClickLogo() { + let targetUrl = '/home'; + + const isOnLogin = window.location.href.endsWith('/login'); + if (isOnLogin) { + targetUrl = '/login'; + } + if (this.isOnSearch) { + targetUrl = '/public'; + } + + await this.router.navigateByUrl(targetUrl); + } } diff --git a/services/apps/alcs/src/portal/public/search/application/public-application-search.service.spec.ts b/services/apps/alcs/src/portal/public/search/application/public-application-search.service.spec.ts index 0dc21e27a9..f4b862a4ef 100644 --- a/services/apps/alcs/src/portal/public/search/application/public-application-search.service.spec.ts +++ b/services/apps/alcs/src/portal/public/search/application/public-application-search.service.spec.ts @@ -16,9 +16,9 @@ describe('PublicApplicationSearchService', () => { const mockSearchRequestDto: SearchRequestDto = { fileNumber: '123', - portalStatusCode: 'A', + portalStatusCodes: ['A'], governmentName: 'B', - regionCode: 'C', + regionCodes: ['C'], name: 'D', pid: 'E', civicAddress: 'F', diff --git a/services/apps/alcs/src/portal/public/search/application/public-application-search.service.ts b/services/apps/alcs/src/portal/public/search/application/public-application-search.service.ts index ff5281046d..1b209796ff 100644 --- a/services/apps/alcs/src/portal/public/search/application/public-application-search.service.ts +++ b/services/apps/alcs/src/portal/public/search/application/public-application-search.service.ts @@ -114,11 +114,11 @@ export class PublicApplicationSearchService { .setParameters({ fileNumber: searchDto.fileNumber ?? null }); } - if (searchDto.portalStatusCode) { + if (searchDto.portalStatusCodes && searchDto.portalStatusCodes.length > 0) { query.andWhere( - "alcs.get_current_status_for_application_submission_by_uuid(appSearch.uuid) ->> 'status_type_code' = :status", + "alcs.get_current_status_for_application_submission_by_uuid(appSearch.uuid) ->> 'status_type_code' IN(:...statuses)", { - status: searchDto.portalStatusCode, + statuses: searchDto.portalStatusCodes, }, ); } @@ -136,13 +136,10 @@ export class PublicApplicationSearchService { ); } - if (searchDto.regionCode) { - query.andWhere( - 'appSearch.application_region_code = :application_region_code', - { - application_region_code: searchDto.regionCode, - }, - ); + if (searchDto.regionCodes && searchDto.regionCodes.length > 0) { + query.andWhere('appSearch.application_region_code IN(:...regions)', { + regions: searchDto.regionCodes, + }); } this.compileSearchByNameQuery(searchDto, query); diff --git a/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search.service.spec.ts b/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search.service.spec.ts index 6fe5429a73..4904fae0b9 100644 --- a/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search.service.spec.ts +++ b/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search.service.spec.ts @@ -16,9 +16,9 @@ describe('PublicNoticeOfIntentSearchService', () => { const mockSearchDto: SearchRequestDto = { fileNumber: '123', - portalStatusCode: 'A', + portalStatusCodes: ['A'], governmentName: 'B', - regionCode: 'C', + regionCodes: ['C'], name: 'D', pid: 'E', civicAddress: 'F', diff --git a/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search.service.ts b/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search.service.ts index f839b24e78..fc4b37569c 100644 --- a/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search.service.ts +++ b/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search.service.ts @@ -113,11 +113,11 @@ export class PublicNoticeOfIntentSearchService { .setParameters({ fileNumber: searchDto.fileNumber ?? null }); } - if (searchDto.portalStatusCode) { + if (searchDto.portalStatusCodes && searchDto.portalStatusCodes.length > 0) { query.andWhere( - "alcs.get_current_status_for_notice_of_intent_submission_by_uuid(noiSearch.uuid) ->> 'status_type_code' = :status", + "alcs.get_current_status_for_notice_of_intent_submission_by_uuid(noiSearch.uuid) ->> 'status_type_code' IN(:...statuses)", { - status: searchDto.portalStatusCode, + statuses: searchDto.portalStatusCodes, }, ); } @@ -135,13 +135,10 @@ export class PublicNoticeOfIntentSearchService { ); } - if (searchDto.regionCode) { - query.andWhere( - 'noiSearch.notice_of_intent_region_code = :noi_region_code', - { - noi_region_code: searchDto.regionCode, - }, - ); + if (searchDto.regionCodes && searchDto.regionCodes.length > 0) { + query.andWhere('noiSearch.notice_of_intent_region_code IN(:...regions)', { + regions: searchDto.regionCodes, + }); } this.compileSearchByNameQuery(searchDto, query); diff --git a/services/apps/alcs/src/portal/public/search/notification/public-notification-search.service.spec.ts b/services/apps/alcs/src/portal/public/search/notification/public-notification-search.service.spec.ts index 9b4787db8d..8708fda587 100644 --- a/services/apps/alcs/src/portal/public/search/notification/public-notification-search.service.spec.ts +++ b/services/apps/alcs/src/portal/public/search/notification/public-notification-search.service.spec.ts @@ -16,9 +16,9 @@ describe('PublicNotificationSearchService', () => { const mockSearchDto: SearchRequestDto = { fileNumber: '123', - portalStatusCode: 'A', + portalStatusCodes: ['A'], governmentName: 'B', - regionCode: 'C', + regionCodes: ['C'], name: 'D', pid: 'E', civicAddress: 'F', diff --git a/services/apps/alcs/src/portal/public/search/notification/public-notification-search.service.ts b/services/apps/alcs/src/portal/public/search/notification/public-notification-search.service.ts index a996b2698f..904aa27469 100644 --- a/services/apps/alcs/src/portal/public/search/notification/public-notification-search.service.ts +++ b/services/apps/alcs/src/portal/public/search/notification/public-notification-search.service.ts @@ -111,11 +111,11 @@ export class PublicNotificationSearchService { .setParameters({ fileNumber: searchDto.fileNumber ?? null }); } - if (searchDto.portalStatusCode) { + if (searchDto.portalStatusCodes && searchDto.portalStatusCodes.length > 0) { query = query.andWhere( - "alcs.get_current_status_for_notification_submission_by_uuid(notificationSearch.uuid) ->> 'status_type_code' = :status", + "alcs.get_current_status_for_notification_submission_by_uuid(notificationSearch.uuid) ->> 'status_type_code' IN(:...statuses)", { - status: searchDto.portalStatusCode, + statuses: searchDto.portalStatusCodes, }, ); } @@ -133,11 +133,11 @@ export class PublicNotificationSearchService { ); } - if (searchDto.regionCode) { + if (searchDto.regionCodes && searchDto.regionCodes.length > 0) { query = query.andWhere( - 'notificationSearch.notification_region_code = :region_code', + 'notificationSearch.notification_region_code IN(:...regions)', { - region_code: searchDto.regionCode, + regions: searchDto.regionCodes, }, ); } diff --git a/services/apps/alcs/src/portal/public/search/public-search.dto.ts b/services/apps/alcs/src/portal/public/search/public-search.dto.ts index 2ad283bfd8..34473e6b89 100644 --- a/services/apps/alcs/src/portal/public/search/public-search.dto.ts +++ b/services/apps/alcs/src/portal/public/search/public-search.dto.ts @@ -74,17 +74,17 @@ export class SearchRequestDto extends PagingRequestDto { @MinLength(3) civicAddress?: string; - @IsString() + @IsArray() @IsOptional() - portalStatusCode?: string; + portalStatusCodes?: string[]; @IsString() @IsOptional() governmentName?: string; - @IsString() + @IsArray() @IsOptional() - regionCode?: string; + regionCodes?: string[]; @IsString() @IsOptional() From fff7a8f847b8e14eff2c34d2200ed14c1c732036 Mon Sep 17 00:00:00 2001 From: "to. sandra" <76515860+sandratoh@users.noreply.github.com> Date: Wed, 27 Sep 2023 15:56:14 -0700 Subject: [PATCH 435/954] Improve searchbar interaction and copy file ID to advanced search (#1015) * Focus or select ngIf input field on toggle and search * Copy File ID to advanced search when navigating with text --- .../search-bar/search-bar.component.html | 4 +- .../search-bar/search-bar.component.scss | 14 ----- .../header/search-bar/search-bar.component.ts | 51 +++++++++++++++---- 3 files changed, 43 insertions(+), 26 deletions(-) diff --git a/alcs-frontend/src/app/shared/header/search-bar/search-bar.component.html b/alcs-frontend/src/app/shared/header/search-bar/search-bar.component.html index 16290e8d95..e12c12f8e1 100644 --- a/alcs-frontend/src/app/shared/header/search-bar/search-bar.component.html +++ b/alcs-frontend/src/app/shared/header/search-bar/search-bar.component.html @@ -24,8 +24,6 @@ </button> </div> <div class="advanced-search"> - <a href="/search"> - <button mat-stroked-button color="primary">Advanced Search</button> - </a> + <button mat-stroked-button color="primary" (click)="navigateToAdvancedSearch()">Advanced Search</button> </div> </div> diff --git a/alcs-frontend/src/app/shared/header/search-bar/search-bar.component.scss b/alcs-frontend/src/app/shared/header/search-bar/search-bar.component.scss index d388448423..5b85750526 100644 --- a/alcs-frontend/src/app/shared/header/search-bar/search-bar.component.scss +++ b/alcs-frontend/src/app/shared/header/search-bar/search-bar.component.scss @@ -24,12 +24,6 @@ border-radius: 0 0 4px 4px; z-index: 9999; - a { - display: flex; - height: fit-content; - text-decoration: none; - } - button { width: 100%; background: colors.$white; @@ -82,14 +76,6 @@ } } -input { - color: colors.$primary-color; -} - -.mat-mdc-input-element { - color: colors.$primary-color !important; -} - :host ::ng-deep .mat-form-field-wrapper { margin: 0 !important; padding: 0; diff --git a/alcs-frontend/src/app/shared/header/search-bar/search-bar.component.ts b/alcs-frontend/src/app/shared/header/search-bar/search-bar.component.ts index ea3922c9d7..eede68d038 100644 --- a/alcs-frontend/src/app/shared/header/search-bar/search-bar.component.ts +++ b/alcs-frontend/src/app/shared/header/search-bar/search-bar.component.ts @@ -1,5 +1,5 @@ import { HttpErrorResponse } from '@angular/common/http'; -import { Component, ElementRef, HostListener, ViewChild } from '@angular/core'; +import { AfterViewInit, Component, ElementRef, HostListener, QueryList, ViewChildren } from '@angular/core'; import { Router } from '@angular/router'; import { SearchService } from '../../../services/search/search.service'; import { ToastService } from '../../../services/toast/toast.service'; @@ -13,11 +13,11 @@ import { animate, style, transition, trigger } from '@angular/animations'; trigger('inAnimation', [transition(':enter', [style({ height: 0, opacity: 0 }), animate('100ms ease-out')])]), ], }) -export class SearchBarComponent { +export class SearchBarComponent implements AfterViewInit { searchText = ''; showInput = false; wasInside = false; - @ViewChild('searchInput') input!: ElementRef; + @ViewChildren('searchInput') input!: QueryList<ElementRef>; constructor(private toastService: ToastService, private router: Router, private searchService: SearchService) {} @@ -34,13 +34,37 @@ export class SearchBarComponent { this.wasInside = false; } - async toggleInput() { + ngAfterViewInit(): void { + this.input.changes.subscribe(() => { + this.focusInput(); + }); + } + + focusInput() { + if (this.input.length > 0) { + this.input.first.nativeElement.focus(); + } + } + + selectInput() { + if (this.input.length > 0) { + this.input.first.nativeElement.select(); + } + } + + toggleInput() { this.showInput = !this.showInput; } + resetInput() { + this.toggleInput(); + this.searchText = ''; + } + async onSearch() { if (!this.searchText) { this.toastService.showErrorToast(`File not found, try again`); + this.focusInput(); return; } @@ -48,6 +72,7 @@ export class SearchBarComponent { const searchResult = await this.searchService.fetch(this.searchText); if (!searchResult || searchResult.length < 1) { this.toastService.showWarningToast(`File ID ${this.searchText} not found, try again`); + this.selectInput(); return; } @@ -72,21 +97,29 @@ export class SearchBarComponent { default: this.toastService.showErrorToast(`Unable to navigate to ${result.referenceId}`); } - this.toggleInput(); } if (searchResult?.length > 1) { await this.router.navigateByUrl(`/search?searchText=${this.searchText}`); - this.toggleInput(); } - this.searchText = ''; + this.resetInput(); } catch (e) { if (e instanceof HttpErrorResponse && e.status === 404) { this.toastService.showWarningToast(`File ID ${this.searchText} not found, try again`); - const inputElem = <HTMLInputElement>this.input.nativeElement; - inputElem.select(); + this.selectInput(); } } } + + async navigateToAdvancedSearch() { + let url = '/search'; + + if (this.searchText) { + url += `?searchText=${this.searchText}`; + } + + await this.router.navigateByUrl(url); + this.resetInput(); + } } From a8bf3b6c7fba480df4721635f90c52861d36fe18 Mon Sep 17 00:00:00 2001 From: "to. sandra" <76515860+sandratoh@users.noreply.github.com> Date: Wed, 27 Sep 2023 15:56:48 -0700 Subject: [PATCH 436/954] Fix Applicant Info parcel section to view and open files (#1016) --- .../application-details/parcel/parcel.component.html | 4 ++-- .../application-details/parcel/parcel.component.ts | 7 ++----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/parcel/parcel.component.html b/alcs-frontend/src/app/features/application/applicant-info/application-details/parcel/parcel.component.html index 2847f9dcd6..b5f7fc2641 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/application-details/parcel/parcel.component.html +++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/parcel/parcel.component.html @@ -71,7 +71,7 @@ <h4 [id]="parcel.uuid">Parcel {{ parcelInd + 1 }}: Parcel and Owner Information< <div *ngIf="showCertificateOfTitle" class="subheading2 grid-1">Certificate Of Title</div> <div *ngIf="showCertificateOfTitle" class="grid-double"> <div *ngIf="parcel.certificateOfTitle"> - <a (click)="onOpenFile(parcel.certificateOfTitle.documentUuid)">{{ parcel.certificateOfTitle.fileName }}</a> + <a (click)="openFile(parcel.certificateOfTitle)">{{ parcel.certificateOfTitle.fileName }}</a> </div> </div> <div class="full-width subheading1">Owner Information</div> @@ -92,7 +92,7 @@ <h4 [id]="parcel.uuid">Parcel {{ parcelInd + 1 }}: Parcel and Owner Information< <div>{{ owner.phoneNumber }}</div> <div>{{ owner.email }}</div> <div> - <a *ngIf="owner.corporateSummary" (click)="onOpenFile(owner.corporateSummary.uuid)">{{ + <a *ngIf="owner.corporateSummary" (click)="openFile(owner.corporateSummary)">{{ owner.corporateSummary.fileName }}</a> </div> diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/parcel/parcel.component.ts b/alcs-frontend/src/app/features/application/applicant-info/application-details/parcel/parcel.component.ts index c003aab01b..d8567b3ce0 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/application-details/parcel/parcel.component.ts +++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/parcel/parcel.component.ts @@ -47,11 +47,8 @@ export class ParcelComponent implements OnInit, OnChanges, OnDestroy, AfterConte }); } - async onOpenFile(uuid: string) { - const file = this.files.find((file) => file.uuid === uuid); - if (file) { - await this.applicationDocumentService.download(file.uuid, file.fileName); - } + async openFile(file: ApplicationDocumentDto) { + await this.applicationDocumentService.download(file.uuid, file.fileName); } async loadParcels(fileNumber: string) { From dcd867ff3578ac6f10115409efd677c8269ac53b Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Wed, 27 Sep 2023 16:08:59 -0700 Subject: [PATCH 437/954] Set Proposal Summary --- .../src/app/features/application/overview/overview.component.ts | 1 + .../app/features/notice-of-intent/overview/overview.component.ts | 1 + .../src/app/features/notification/overview/overview.component.ts | 1 + 3 files changed, 3 insertions(+) diff --git a/alcs-frontend/src/app/features/application/overview/overview.component.ts b/alcs-frontend/src/app/features/application/overview/overview.component.ts index 435265d389..b9919ed795 100644 --- a/alcs-frontend/src/app/features/application/overview/overview.component.ts +++ b/alcs-frontend/src/app/features/application/overview/overview.component.ts @@ -34,6 +34,7 @@ export class OverviewComponent implements OnInit, OnDestroy { this.applicationDetailService.$application.pipe(takeUntil(this.$destroy)).subscribe(async (application) => { if (application) { this.application = application; + this.summary = application.summary ?? ''; this.events = await this.applicationTimelineService.fetchByFileNumber(application.fileNumber); this.loadStatusHistory(this.application.fileNumber); } diff --git a/alcs-frontend/src/app/features/notice-of-intent/overview/overview.component.ts b/alcs-frontend/src/app/features/notice-of-intent/overview/overview.component.ts index ec012866c2..6fde98c3aa 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/overview/overview.component.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/overview/overview.component.ts @@ -39,6 +39,7 @@ export class OverviewComponent implements OnInit, OnDestroy { .subscribe(async (noticeOfIntent) => { if (noticeOfIntent) { this.noticeOfIntent = noticeOfIntent; + this.summary = noticeOfIntent.summary ?? ''; this.events = await this.noticeOfIntentTimelineService.fetchByFileNumber(noticeOfIntent.fileNumber); this.loadStatusHistory(this.noticeOfIntent.fileNumber); } diff --git a/alcs-frontend/src/app/features/notification/overview/overview.component.ts b/alcs-frontend/src/app/features/notification/overview/overview.component.ts index 5cee244efc..d27e7e0f86 100644 --- a/alcs-frontend/src/app/features/notification/overview/overview.component.ts +++ b/alcs-frontend/src/app/features/notification/overview/overview.component.ts @@ -33,6 +33,7 @@ export class OverviewComponent implements OnInit, OnDestroy { this.notificationDetailService.$notification.pipe(takeUntil(this.$destroy)).subscribe(async (notification) => { if (notification) { this.notification = notification; + this.summary = notification.summary ?? ''; this.events = await this.notificationTimelineService.fetchByFileNumber(notification.fileNumber); this.loadStatusHistory(this.notification.fileNumber); } From 006d3200e1b1172c311a6c1b55b09070f8976f1f Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Wed, 27 Sep 2023 16:38:37 -0700 Subject: [PATCH 438/954] Feautre/alcs 1131 (#1019) adjacent_land_use mapping from OATS to ALCS - does not include processing of non-existing land use oats records logger cleanup custom JSON Encoder clean NOI only command --- bin/.gitignore | 3 +- .../applications/app_prep.py | 9 +- .../submissions/app_submissions.py | 8 +- bin/migrate-oats-data/common/__init__.py | 4 +- bin/migrate-oats-data/common/constants.py | 1 + bin/migrate-oats-data/common/etl_logger.py | 18 +- bin/migrate-oats-data/common/json_encoder.py | 14 ++ ...ats_to_alcs_adjacent_land_use_type_enum.py | 20 ++ .../notice_of_intent_command_parser.py | 7 + .../menu/commands/notice_of_intents.py | 7 + bin/migrate-oats-data/menu/menu.py | 7 +- bin/migrate-oats-data/migrate.py | 3 + .../noi/notice_of_intent_init.py | 4 +- .../noi/notice_of_intent_migration.py | 3 + .../notice_of_intent_submissions/__init__.py | 1 + ..._of_intent_submission_adjacent_land_use.py | 195 ++++++++++++++++++ .../notice_of_intent_submission_init.py | 8 +- .../notice_of_intent_decision_date.py | 8 +- ...oats_to_alcs_notice_of_intent_table_etl.py | 10 +- .../notice_of_intent_adjacent_land_use.sql | 12 ++ ...tice_of_intent_adjacent_land_use_count.sql | 17 ++ 21 files changed, 319 insertions(+), 40 deletions(-) create mode 100644 bin/migrate-oats-data/common/json_encoder.py create mode 100644 bin/migrate-oats-data/common/oats_to_alcs_adjacent_land_use_type_enum.py create mode 100644 bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_submission_adjacent_land_use.py create mode 100644 bin/migrate-oats-data/noi/sql/notice_of_intent_submission/adjacent_land_use/notice_of_intent_adjacent_land_use.sql create mode 100644 bin/migrate-oats-data/noi/sql/notice_of_intent_submission/adjacent_land_use/notice_of_intent_adjacent_land_use_count.sql diff --git a/bin/.gitignore b/bin/.gitignore index 735edc3f3f..158cf1227e 100644 --- a/bin/.gitignore +++ b/bin/.gitignore @@ -1,8 +1,7 @@ .env out tmp -*.pickle -*etl_log.txt +*.log.txt __pycache__ *last_imported_application_file.txt last_imported_planning_file.txt diff --git a/bin/migrate-oats-data/applications/app_prep.py b/bin/migrate-oats-data/applications/app_prep.py index 39e216dbb0..8b69a6be12 100644 --- a/bin/migrate-oats-data/applications/app_prep.py +++ b/bin/migrate-oats-data/applications/app_prep.py @@ -4,7 +4,7 @@ OATS_NFU_SUBTYPES, AlcsAgCap, AlcsAgCapSource, - log_end, + log, log_start, OatsLegislationCodes, AlcsApplicantType, @@ -61,8 +61,9 @@ def process_alcs_application_prep_fields(conn=None, batch_size=BATCH_UPLOAD_SIZE conn (psycopg2.extensions.connection): PostgreSQL database connection. Provided by the decorator. batch_size (int): The number of items to process at once. Defaults to BATCH_UPLOAD_SIZE. """ - + etl_name = "process_alcs_application_prep_fields" log_start(etl_name) + with conn.cursor(cursor_factory=RealDictCursor) as cursor: with open( "applications/sql/application-prep/application_prep.count.sql", @@ -113,13 +114,13 @@ def process_alcs_application_prep_fields(conn=None, batch_size=BATCH_UPLOAD_SIZE trace_err = traceback.format_exc() print(str_err) print(trace_err) - log_end(etl_name, str_err, trace_err) + log(etl_name, str_err, trace_err) failed_inserts = count_total - successful_updates_count last_application_id = last_application_id + 1 print("Total amount of successful updates:", successful_updates_count) print("Total failed updates:", failed_inserts) - log_end(etl_name) + log(etl_name) def update_app_prep_records(conn, batch_size, cursor, rows): diff --git a/bin/migrate-oats-data/applications/submissions/app_submissions.py b/bin/migrate-oats-data/applications/submissions/app_submissions.py index 703b03c21e..b04e2ee629 100644 --- a/bin/migrate-oats-data/applications/submissions/app_submissions.py +++ b/bin/migrate-oats-data/applications/submissions/app_submissions.py @@ -1,4 +1,4 @@ -from common import ALRChangeCode, log_end, log_start, OATS_ETL_USER +from common import ALRChangeCode, log, log_start, OATS_ETL_USER from .submap import ( add_direction_field, map_direction_values, @@ -31,7 +31,7 @@ def process_alcs_app_submissions(conn=None, batch_size=BATCH_UPLOAD_SIZE): conn (psycopg2.extensions.connection): PostgreSQL database connection. Provided by the decorator. batch_size (int): The number of items to process at once. Defaults to BATCH_UPLOAD_SIZE. """ - + etl_name = "process_alcs_app_submissions" log_start(etl_name) with conn.cursor(cursor_factory=RealDictCursor) as cursor: with open( @@ -94,13 +94,13 @@ def process_alcs_app_submissions(conn=None, batch_size=BATCH_UPLOAD_SIZE): trace_err = traceback.format_exc() print(str_err) print(trace_err) - log_end(etl_name, str_err, trace_err) + log(etl_name, str_err, trace_err) failed_inserts = count_total - successful_inserts_count last_submission_id = last_submission_id + 1 print("Total amount of successful inserts:", successful_inserts_count) print("Total failed inserts:", failed_inserts) - log_end(etl_name) + log(etl_name) def insert_app_sub_records( diff --git a/bin/migrate-oats-data/common/__init__.py b/bin/migrate-oats-data/common/__init__.py index 1ef347bddc..6c43d3d7d4 100644 --- a/bin/migrate-oats-data/common/__init__.py +++ b/bin/migrate-oats-data/common/__init__.py @@ -1,4 +1,6 @@ from .oats_application_code_values import * from .alcs_application_enum import * -from .etl_logger import log_start, log_end +from .etl_logger import log_start, log from .constants import * +from .oats_to_alcs_adjacent_land_use_type_enum import * +from .json_encoder import * diff --git a/bin/migrate-oats-data/common/constants.py b/bin/migrate-oats-data/common/constants.py index f93f7b8a79..b49556d29e 100644 --- a/bin/migrate-oats-data/common/constants.py +++ b/bin/migrate-oats-data/common/constants.py @@ -1,2 +1,3 @@ OATS_ETL_USER = "oats_etl" BATCH_UPLOAD_SIZE = 1000 +NO_DATA_IN_OATS = 'No data found in OATS' \ No newline at end of file diff --git a/bin/migrate-oats-data/common/etl_logger.py b/bin/migrate-oats-data/common/etl_logger.py index 17a2d1f323..774e490de2 100644 --- a/bin/migrate-oats-data/common/etl_logger.py +++ b/bin/migrate-oats-data/common/etl_logger.py @@ -1,33 +1,27 @@ import json from datetime import datetime -etl_log_file_name = "etl_log.txt" - -def log_start(etl_name="Not specified", etl_log_file_name=etl_log_file_name): +def log_start(etl_name): data = { "etl_name": etl_name, "start_time": datetime.now().isoformat(), } - with open(etl_log_file_name, "a") as f: + with open(f"{etl_name}.log.txt", "a") as f: json.dump(data, f) f.write("\n") -def log_end( - etl_name="Not specified", - error_msg=None, - error_log=None, - etl_log_file_name=etl_log_file_name, -): +def log(etl_name, error_msg=None, error_log=None, extra_data=None): data = { "etl_name": etl_name, - "end_time": datetime.now().isoformat(), + "time": datetime.now().isoformat(), "error_msg": error_msg, "error_log": error_log, + "extra_data": extra_data, } - with open(etl_log_file_name, "a") as f: + with open(f"{etl_name}.log.txt", "a") as f: json.dump(data, f) f.write("\n") diff --git a/bin/migrate-oats-data/common/json_encoder.py b/bin/migrate-oats-data/common/json_encoder.py new file mode 100644 index 0000000000..1585fab4d0 --- /dev/null +++ b/bin/migrate-oats-data/common/json_encoder.py @@ -0,0 +1,14 @@ +import json +import datetime + + +class DateTimeEncoder(json.JSONEncoder): + def default(self, obj): + if isinstance(obj, datetime.datetime): + return obj.isoformat() + elif isinstance(obj, set): + return list(obj) + try: + return super().default(obj) + except TypeError: + return str(obj) diff --git a/bin/migrate-oats-data/common/oats_to_alcs_adjacent_land_use_type_enum.py b/bin/migrate-oats-data/common/oats_to_alcs_adjacent_land_use_type_enum.py new file mode 100644 index 0000000000..4ad0a83dbf --- /dev/null +++ b/bin/migrate-oats-data/common/oats_to_alcs_adjacent_land_use_type_enum.py @@ -0,0 +1,20 @@ +from enum import Enum + + +class AlcsAdjacentLandUseType(Enum): + AGR = "Agricultural / Farm" + CIV = "Civic / Institutional" + COM = "Commercial / Retail" + IND = "Industrial" + OTH = "Other" + REC = "Recreational" + RES = "Residential" + TRA = "Transportation / Utilities" + UNU = "Unused" + + +class AdjacentLandUseDirections(Enum): + NORTH = "NORTH" + SOUTH = "SOUTH" + WEST = "WEST" + EAST = "EAST" diff --git a/bin/migrate-oats-data/menu/command_parser/notice_of_intent_command_parser.py b/bin/migrate-oats-data/menu/command_parser/notice_of_intent_command_parser.py index 617199d846..b1bf685331 100644 --- a/bin/migrate-oats-data/menu/command_parser/notice_of_intent_command_parser.py +++ b/bin/migrate-oats-data/menu/command_parser/notice_of_intent_command_parser.py @@ -10,3 +10,10 @@ def noi_import_command_parser(import_batch_size, subparsers): metavar="", help=f"batch size (default: {import_batch_size})", ) + + +def noi_clean_command_parser(subparsers): + subparsers.add_parser( + "noi-clean", + help="Clean NOI imported data:", + ) diff --git a/bin/migrate-oats-data/menu/commands/notice_of_intents.py b/bin/migrate-oats-data/menu/commands/notice_of_intents.py index 3033686765..2bc6365d13 100644 --- a/bin/migrate-oats-data/menu/commands/notice_of_intents.py +++ b/bin/migrate-oats-data/menu/commands/notice_of_intents.py @@ -1,6 +1,7 @@ from noi.notice_of_intent_migration import ( init_notice_of_intents, process_notice_of_intent, + clean_notice_of_intent, ) @@ -16,3 +17,9 @@ def notice_of_intent_import(console, args): init_notice_of_intents(batch_size=import_batch_size) process_notice_of_intent(batch_size=import_batch_size) + + +def notice_of_intent_clean(console): + console.log("Beginning OATS -> ALCS NOI import clean process") + with console.status("[bold green]NOI clean import...") as status: + clean_notice_of_intent() diff --git a/bin/migrate-oats-data/menu/menu.py b/bin/migrate-oats-data/menu/menu.py index f26f446288..69130392c8 100644 --- a/bin/migrate-oats-data/menu/menu.py +++ b/bin/migrate-oats-data/menu/menu.py @@ -4,7 +4,10 @@ app_prep_import_command_parser, app_sub_import_command_parser, ) -from .command_parser.notice_of_intent_command_parser import noi_import_command_parser +from .command_parser.notice_of_intent_command_parser import ( + noi_import_command_parser, + noi_clean_command_parser, +) from .command_parser.document_command_parser import ( document_import_command_parser, application_document_import_command_parser, @@ -28,7 +31,6 @@ def _import_command_parser(subparsers): metavar="", help=f"batch size (default: {import_batch_size})", ) - import_command.set_defaults(func=import_batch_size) def setup_menu_args_parser(import_batch_size): @@ -41,6 +43,7 @@ def setup_menu_args_parser(import_batch_size): application_document_import_command_parser(import_batch_size, subparsers) app_prep_import_command_parser(import_batch_size, subparsers) noi_import_command_parser(import_batch_size, subparsers) + noi_clean_command_parser(subparsers) document_noi_import_command_parser(import_batch_size, subparsers) noi_document_import_command_parser(import_batch_size, subparsers) _import_command_parser(subparsers) diff --git a/bin/migrate-oats-data/migrate.py b/bin/migrate-oats-data/migrate.py index aea6fd9cb4..a0c8ee3edb 100644 --- a/bin/migrate-oats-data/migrate.py +++ b/bin/migrate-oats-data/migrate.py @@ -12,6 +12,7 @@ application_submission_import, noi_document_import, notice_of_intent_import, + notice_of_intent_clean, ) from db import connection_pool from common import BATCH_UPLOAD_SIZE @@ -42,6 +43,8 @@ app_prep_import(console, args) case "noi-import": notice_of_intent_import(console, args) + case "noi-clean": + notice_of_intent_clean(console) case "application-import": application_import(console, args) case "noi-document-import": diff --git a/bin/migrate-oats-data/noi/notice_of_intent_init.py b/bin/migrate-oats-data/noi/notice_of_intent_init.py index 971759a65c..e3ca53020c 100644 --- a/bin/migrate-oats-data/noi/notice_of_intent_init.py +++ b/bin/migrate-oats-data/noi/notice_of_intent_init.py @@ -1,6 +1,6 @@ import traceback from db import inject_conn_pool -from common import log_end, log_start, OATS_ETL_USER +from common import log, log_start, OATS_ETL_USER def noi_insert_query(number_of_rows_to_insert): @@ -66,7 +66,7 @@ def init_notice_of_intents(conn=None, batch_size=10000): traceback.format_exception(None, error, error.__traceback__) ) print("Error", error_trace) - log_end( + log( etl_name, str(error), error_trace, diff --git a/bin/migrate-oats-data/noi/notice_of_intent_migration.py b/bin/migrate-oats-data/noi/notice_of_intent_migration.py index ab3bfe4492..2a85da0672 100644 --- a/bin/migrate-oats-data/noi/notice_of_intent_migration.py +++ b/bin/migrate-oats-data/noi/notice_of_intent_migration.py @@ -8,6 +8,7 @@ from .notice_of_intent_submissions import ( clean_notice_of_intent_submissions, init_notice_of_intent_submissions, + process_notice_of_intent_adjacent_land_use, ) @@ -27,3 +28,5 @@ def process_notice_of_intent(batch_size): process_alcs_notice_of_intent_decision_date(batch_size=batch_size) init_notice_of_intent_submissions(batch_size=batch_size) + + process_notice_of_intent_adjacent_land_use(batch_size=batch_size) diff --git a/bin/migrate-oats-data/noi/notice_of_intent_submissions/__init__.py b/bin/migrate-oats-data/noi/notice_of_intent_submissions/__init__.py index c62d45edc2..477432f020 100644 --- a/bin/migrate-oats-data/noi/notice_of_intent_submissions/__init__.py +++ b/bin/migrate-oats-data/noi/notice_of_intent_submissions/__init__.py @@ -1 +1,2 @@ from .notice_of_intent_submission_init import init_notice_of_intent_submissions, clean_notice_of_intent_submissions +from .notice_of_intent_submission_adjacent_land_use import process_notice_of_intent_adjacent_land_use \ No newline at end of file diff --git a/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_submission_adjacent_land_use.py b/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_submission_adjacent_land_use.py new file mode 100644 index 0000000000..c04d6a349c --- /dev/null +++ b/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_submission_adjacent_land_use.py @@ -0,0 +1,195 @@ +from common import log, log_start, AlcsAdjacentLandUseType +from db import inject_conn_pool +from common import ( + BATCH_UPLOAD_SIZE, + NO_DATA_IN_OATS, + DateTimeEncoder, + AdjacentLandUseDirections, +) +from psycopg2.extras import execute_batch, RealDictCursor +import traceback +import json + +etl_name = "process_notice_of_intent_adjacent_land_use" + + +@inject_conn_pool +def process_notice_of_intent_adjacent_land_use(conn=None, batch_size=BATCH_UPLOAD_SIZE): + """ + This function is responsible for populating adjacent_land_use from OATS to ALCS in notice_of_intent_submission table. + + Args: + conn (psycopg2.extensions.connection): PostgreSQL database connection. Provided by the decorator. + batch_size (int): The number of items to process at once. Defaults to BATCH_UPLOAD_SIZE. + """ + + log_start(etl_name) + with conn.cursor(cursor_factory=RealDictCursor) as cursor: + with open( + "noi/sql/notice_of_intent_submission/adjacent_land_use/notice_of_intent_adjacent_land_use_count.sql", + "r", + encoding="utf-8", + ) as sql_file: + count_query = sql_file.read() + cursor.execute(count_query) + count_total = dict(cursor.fetchone())["count"] + print( + "- Total Notice of Intent Submission Adjacent Land use data to update: ", + count_total, + ) + + failed_updates = 0 + successful_updates_count = 0 + last_submission_id = 0 + + with open( + "noi/sql/notice_of_intent_submission/adjacent_land_use/notice_of_intent_adjacent_land_use.sql", + "r", + encoding="utf-8", + ) as sql_file: + submission_sql = sql_file.read() + while True: + cursor.execute( + f"{submission_sql} WHERE oalu.alr_application_id > {last_submission_id} ORDER BY oalu.alr_application_id;" + ) + + rows = cursor.fetchmany(batch_size) + + if not rows: + break + try: + submissions_to_be_updated_count = len(rows) + + (parsed_data, raw_data) = _update_notice_of_intent_submissions( + conn, batch_size, cursor, rows + ) + + successful_updates_count = ( + successful_updates_count + submissions_to_be_updated_count + ) + last_submission_id = dict(rows[-1])["alr_application_id"] + + print( + f"retrieved/updated items count: {submissions_to_be_updated_count}; total successfully processed submissions so far {successful_updates_count}; last update alr_application_id: {last_submission_id}" + ) + except Exception as e: + conn.rollback() + str_err = str(e) + trace_err = traceback.format_exc() + print(str_err) + print(trace_err) + failed_updates = count_total - successful_updates_count + last_submission_id = last_submission_id + 1 + log( + etl_name, + str_err, + trace_err, + { + "parsed_data": json.dumps(parsed_data, cls=DateTimeEncoder), + "raw_data": json.dumps(raw_data, cls=DateTimeEncoder), + "last_submission_id": last_submission_id, + }, + ) + + print( + "Total amount of successfully processed adjacent land uses:", + successful_updates_count, + ) + print("Total failed updates:", failed_updates) + log(etl_name) + + +def _update_notice_of_intent_submissions(conn, batch_size, cursor, rows): + land_use_data = _prepare_oats_alr_land_use_data(rows) + directions = [ + AdjacentLandUseDirections.NORTH.value, + AdjacentLandUseDirections.SOUTH.value, + AdjacentLandUseDirections.EAST.value, + AdjacentLandUseDirections.WEST.value, + ] + + for direction in directions: + if len(land_use_data[direction]) > 0: + execute_batch( + cursor, + _land_use_update_queries[direction], + land_use_data[direction], + page_size=batch_size, + ) + conn.commit() + + return land_use_data, rows + + +_land_use_update_queries = { + AdjacentLandUseDirections.NORTH.value: """ + UPDATE alcs.notice_of_intent_submission + SET + north_land_use_type = %(north_type)s, + north_land_use_type_description = %(north_type_description)s + WHERE + alcs.notice_of_intent_submission.file_number = %(alr_application_id)s::TEXT; + """, + AdjacentLandUseDirections.SOUTH.value: """ + UPDATE alcs.notice_of_intent_submission + SET + south_land_use_type = %(south_type)s, + south_land_use_type_description = %(south_type_description)s + WHERE + alcs.notice_of_intent_submission.file_number = %(alr_application_id)s::TEXT; + """, + AdjacentLandUseDirections.EAST.value: """ + UPDATE alcs.notice_of_intent_submission + SET + east_land_use_type = %(east_type)s, + east_land_use_type_description = %(east_type_description)s + WHERE + alcs.notice_of_intent_submission.file_number = %(alr_application_id)s::TEXT; + """, + AdjacentLandUseDirections.WEST.value: """ + UPDATE alcs.notice_of_intent_submission + SET + west_land_use_type = %(west_type)s, + west_land_use_type_description = %(west_type_description)s + WHERE + alcs.notice_of_intent_submission.file_number = %(alr_application_id)s::TEXT; + """, +} + + +def _prepare_oats_alr_land_use_data(row_data_list): + land_use_data = { + AdjacentLandUseDirections.NORTH.value: [], + AdjacentLandUseDirections.SOUTH.value: [], + AdjacentLandUseDirections.EAST.value: [], + AdjacentLandUseDirections.WEST.value: [], + } + compass_key = "cardinal_direction" + + for row in row_data_list: + land_use_data[row[compass_key]].append(_map_adjacent_land_use_data(dict(row))) + + return land_use_data + + +def _map_adjacent_land_use_data(oats_row): + """ + creates data input compatible with ALCS notice_of_intent_submission + """ + compass_key = "cardinal_direction" + description_key = "description" + type_code_key = "nonfarm_use_type_code" + alr_id_key = "alr_application_id" + default_type = "OTH" + + direction = oats_row[compass_key].lower() + direction_type_key = f"{direction}_type" + direction_type_desc_key = f"{direction}_type_description" + + return { + "alr_application_id": oats_row[alr_id_key], + direction_type_key: AlcsAdjacentLandUseType[ + oats_row[type_code_key] or default_type + ].value, + direction_type_desc_key: oats_row[description_key] or NO_DATA_IN_OATS, + } diff --git a/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_submission_init.py b/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_submission_init.py index 8783f28d0a..9579a1fe49 100644 --- a/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_submission_init.py +++ b/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_submission_init.py @@ -1,4 +1,4 @@ -from common import log_end, log_start, OATS_ETL_USER +from common import log, log_start, OATS_ETL_USER from db import inject_conn_pool from common import BATCH_UPLOAD_SIZE from psycopg2.extras import execute_batch, RealDictCursor @@ -59,7 +59,7 @@ def init_notice_of_intent_submissions(conn=None, batch_size=BATCH_UPLOAD_SIZE): last_submission_id = dict(rows[-1])["alr_application_id"] print( - f"retrieved/inserted items count: {submissions_to_be_inserted_count}; total successfully inserted submissions so far {successful_inserts_count}; last inserted application_id: {last_submission_id}" + f"retrieved/inserted items count: {submissions_to_be_inserted_count}; total successfully inserted submissions so far {successful_inserts_count}; last inserted alr_application_id: {last_submission_id}" ) except Exception as e: conn.rollback() @@ -67,13 +67,13 @@ def init_notice_of_intent_submissions(conn=None, batch_size=BATCH_UPLOAD_SIZE): trace_err = traceback.format_exc() print(str_err) print(trace_err) - log_end(etl_name, str_err, trace_err) + log(etl_name, str_err, trace_err) failed_inserts = count_total - successful_inserts_count last_submission_id = last_submission_id + 1 print("Total amount of successful inserts:", successful_inserts_count) print("Total failed inserts:", failed_inserts) - log_end(etl_name) + log(etl_name) def _insert_notice_of_intent_submissions(conn, batch_size, cursor, rows): diff --git a/bin/migrate-oats-data/noi/oats_to_alcs_notice_of_intent_table_etl/notice_of_intent_decision_date.py b/bin/migrate-oats-data/noi/oats_to_alcs_notice_of_intent_table_etl/notice_of_intent_decision_date.py index a8903781d7..3573e6bdfa 100644 --- a/bin/migrate-oats-data/noi/oats_to_alcs_notice_of_intent_table_etl/notice_of_intent_decision_date.py +++ b/bin/migrate-oats-data/noi/oats_to_alcs_notice_of_intent_table_etl/notice_of_intent_decision_date.py @@ -1,5 +1,5 @@ from db import inject_conn_pool -from common import BATCH_UPLOAD_SIZE, log_end, log_start +from common import BATCH_UPLOAD_SIZE, log, log_start from psycopg2.extras import execute_batch, RealDictCursor import traceback @@ -14,7 +14,7 @@ def process_alcs_notice_of_intent_decision_date( """ etl_name = "process_alcs_notice_of_intent_decision_date" - log_start(etl_name, etl_name) + log_start(etl_name) with conn.cursor(cursor_factory=RealDictCursor) as cursor: with open( "noi/sql/notice_of_intent_base/notice_of_intent_base.count.sql", @@ -65,13 +65,13 @@ def process_alcs_notice_of_intent_decision_date( traceback.format_exception(None, error, error.__traceback__) ) print(error_str) - log_end(etl_name, str(error), error_str) + log(etl_name, str(error), error_str) failed_inserts = count_total - successful_updates_count last_application_id = last_application_id + 1 print("Total amount of successful updates:", successful_updates_count) print("Total failed updates:", failed_inserts) - log_end(etl_name, etl_name) + log(etl_name) def _update_fee_fields_records(conn, batch_size, cursor, rows): diff --git a/bin/migrate-oats-data/noi/oats_to_alcs_notice_of_intent_table_etl/oats_to_alcs_notice_of_intent_table_etl.py b/bin/migrate-oats-data/noi/oats_to_alcs_notice_of_intent_table_etl/oats_to_alcs_notice_of_intent_table_etl.py index 5863caaaec..fb02b97539 100644 --- a/bin/migrate-oats-data/noi/oats_to_alcs_notice_of_intent_table_etl/oats_to_alcs_notice_of_intent_table_etl.py +++ b/bin/migrate-oats-data/noi/oats_to_alcs_notice_of_intent_table_etl/oats_to_alcs_notice_of_intent_table_etl.py @@ -1,10 +1,10 @@ from db import inject_conn_pool -from common import BATCH_UPLOAD_SIZE, log_end, log_start +from common import BATCH_UPLOAD_SIZE, log, log_start from psycopg2.extras import execute_batch, RealDictCursor import traceback from common import ( AlcsAgCapSource, - log_end, + log, log_start, AlcsAgCap, ) @@ -32,7 +32,7 @@ def process_alcs_notice_of_intent_base_fields(conn=None, batch_size=BATCH_UPLOAD """ etl_name = "process_alcs_notice_of_intent_base_fields" - log_start(etl_name, etl_name) + log_start(etl_name) with conn.cursor(cursor_factory=RealDictCursor) as cursor: with open( "noi/sql/notice_of_intent_base/notice_of_intent_base.count.sql", @@ -83,13 +83,13 @@ def process_alcs_notice_of_intent_base_fields(conn=None, batch_size=BATCH_UPLOAD traceback.format_exception(None, error, error.__traceback__) ) print(error_str) - log_end(etl_name, str(error), error_str) + log(etl_name, str(error), error_str) failed_inserts = count_total - successful_updates_count last_application_id = last_application_id + 1 print("Total amount of successful updates:", successful_updates_count) print("Total failed updates:", failed_inserts) - log_end(etl_name, etl_name) + log(etl_name) def _update_fee_fields_records(conn, batch_size, cursor, rows): diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/adjacent_land_use/notice_of_intent_adjacent_land_use.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/adjacent_land_use/notice_of_intent_adjacent_land_use.sql new file mode 100644 index 0000000000..b60851ae89 --- /dev/null +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/adjacent_land_use/notice_of_intent_adjacent_land_use.sql @@ -0,0 +1,12 @@ +WITH nois_with_one_or_zero_component_only AS ( + SELECT oaac.alr_application_id, + max(oaac.alr_appl_component_id) AS alr_appl_component_id -- this IS NOT going TO effect the query since count < 2 + FROM oats.oats_alr_appl_components oaac + JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id + AND oaa.application_class_code = 'NOI' + GROUP BY oaac.alr_application_id + HAVING count(oaac.alr_application_id) < 2 +) +SELECT * +FROM oats.oats_adjacent_land_uses oalu + JOIN nois_with_one_or_zero_component_only ON oalu.alr_application_id = nois_with_one_or_zero_component_only.alr_application_id \ No newline at end of file diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/adjacent_land_use/notice_of_intent_adjacent_land_use_count.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/adjacent_land_use/notice_of_intent_adjacent_land_use_count.sql new file mode 100644 index 0000000000..a54ae9f557 --- /dev/null +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/adjacent_land_use/notice_of_intent_adjacent_land_use_count.sql @@ -0,0 +1,17 @@ +WITH nois_with_one_or_zero_component_only AS ( + SELECT oaac.alr_application_id, + max(oaac.alr_appl_component_id) AS alr_appl_component_id -- this IS NOT going TO effect the query since count < 2 + FROM oats.oats_alr_appl_components oaac + JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id + AND oaa.application_class_code = 'NOI' + GROUP BY oaac.alr_application_id + HAVING count(oaac.alr_application_id) < 2 +), +grouped_adjacent_land_uses_by_application_id AS ( + SELECT count(oalu.alr_application_id) + FROM oats.oats_adjacent_land_uses oalu + JOIN nois_with_one_or_zero_component_only ON oalu.alr_application_id = nois_with_one_or_zero_component_only.alr_application_id + GROUP BY oalu.alr_application_id +) +SELECT count(*) +FROM grouped_adjacent_land_uses_by_application_id; \ No newline at end of file From 1a9b0cd786b9e9f32e434449d728cd35738889ce Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Thu, 28 Sep 2023 11:00:02 -0700 Subject: [PATCH 439/954] Set today in email sent (#1021) * set email_sent_date to today * switch pst and pdt --- .../status-emails/status-emails.consumer.ts | 10 ++++++---- .../notice-of-intent/status-emails.consumer.ts | 8 ++++++-- .../queues/scheduler/scheduler.service.spec.ts | 16 ++++++++-------- .../src/queues/scheduler/scheduler.service.ts | 2 +- 4 files changed, 21 insertions(+), 15 deletions(-) diff --git a/services/apps/alcs/src/queues/scheduler/application/status-emails/status-emails.consumer.ts b/services/apps/alcs/src/queues/scheduler/application/status-emails/status-emails.consumer.ts index 0a7d8df797..0d6b734878 100644 --- a/services/apps/alcs/src/queues/scheduler/application/status-emails/status-emails.consumer.ts +++ b/services/apps/alcs/src/queues/scheduler/application/status-emails/status-emails.consumer.ts @@ -61,7 +61,6 @@ export class ApplicationSubmissionStatusEmailConsumer extends WorkerHost { submissionGovernment, primaryContact, submissionStatus, - tomorrow, ); } catch (e) { this.logger.error(e); @@ -84,7 +83,6 @@ export class ApplicationSubmissionStatusEmailConsumer extends WorkerHost { submissionGovernment: LocalGovernment | null, primaryContact: ApplicationOwner | undefined, submissionStatus: ApplicationSubmissionToSubmissionStatus, - today: Date, ) { if ( primaryContact && @@ -108,7 +106,7 @@ export class ApplicationSubmissionStatusEmailConsumer extends WorkerHost { status: <SUBMISSION_STATUS>submissionStatus.statusTypeCode, }); - await this.updateSubmissionStatus(submissionStatus, today); + await this.updateSubmissionStatus(submissionStatus); this.logger.debug( `Status email sent for Application {submissionStatus.submissionUuid} status code: {submissionStatus.statusTypeCode}`, ); @@ -117,8 +115,12 @@ export class ApplicationSubmissionStatusEmailConsumer extends WorkerHost { private async updateSubmissionStatus( submissionStatus: ApplicationSubmissionToSubmissionStatus, - today: Date, ) { + const today = dayjs(new Date()) + .tz('Canada/Pacific') + .startOf('day') + .toDate(); + submissionStatus.emailSentDate = today; await this.submissionStatusService.saveSubmissionToSubmissionStatus( submissionStatus, diff --git a/services/apps/alcs/src/queues/scheduler/notice-of-intent/status-emails.consumer.ts b/services/apps/alcs/src/queues/scheduler/notice-of-intent/status-emails.consumer.ts index e2842a2be1..a8bab0bc6a 100644 --- a/services/apps/alcs/src/queues/scheduler/notice-of-intent/status-emails.consumer.ts +++ b/services/apps/alcs/src/queues/scheduler/notice-of-intent/status-emails.consumer.ts @@ -56,7 +56,7 @@ export class NoticeOfIntentSubmissionStatusEmailConsumer extends WorkerHost { ccGovernment: true, }); - await this.updateSubmissionStatus(submissionStatus, tomorrow); + await this.updateSubmissionStatus(submissionStatus); this.logger.debug( `Status email sent for NOI {submissionStatus.submissionUuid}`, ); @@ -79,8 +79,12 @@ export class NoticeOfIntentSubmissionStatusEmailConsumer extends WorkerHost { private async updateSubmissionStatus( submissionStatus: NoticeOfIntentSubmissionToSubmissionStatus, - today: Date, ) { + const today = dayjs(new Date()) + .tz('Canada/Pacific') + .startOf('day') + .toDate(); + submissionStatus.emailSentDate = today; await this.submissionStatusService.saveSubmissionToSubmissionStatus( submissionStatus, diff --git a/services/apps/alcs/src/queues/scheduler/scheduler.service.spec.ts b/services/apps/alcs/src/queues/scheduler/scheduler.service.spec.ts index 8cedfcf95f..ae5b7ab8b1 100644 --- a/services/apps/alcs/src/queues/scheduler/scheduler.service.spec.ts +++ b/services/apps/alcs/src/queues/scheduler/scheduler.service.spec.ts @@ -92,8 +92,8 @@ describe('SchedulerService', () => { // { // repeat: { // pattern: isDST() - // ? MONDAY_TO_FRIDAY_AT_2AM_PST_IN_UTC - // : MONDAY_TO_FRIDAY_AT_2AM_PDT_IN_UTC, + // ? MONDAY_TO_FRIDAY_AT_2AM_PDT_IN_UTC + // : MONDAY_TO_FRIDAY_AT_2AM_PST_IN_UTC, // }, // }, // ); @@ -109,8 +109,8 @@ describe('SchedulerService', () => { { repeat: { pattern: isDST() - ? EVERYDAY_MIDNIGHT_PST_IN_UTC - : EVERYDAY_MIDNIGHT_PDT_IN_UTC, + ? EVERYDAY_MIDNIGHT_PDT_IN_UTC + : EVERYDAY_MIDNIGHT_PST_IN_UTC, }, }, ); @@ -128,8 +128,8 @@ describe('SchedulerService', () => { { repeat: { pattern: isDST() - ? EVERY_15_MINUTES_STARTING_FROM_8AM_PST_IN_UTC - : EVERY_15_MINUTES_STARTING_FROM_8AM_PDT_IN_UTC, + ? EVERY_15_MINUTES_STARTING_FROM_8AM_PDT_IN_UTC + : EVERY_15_MINUTES_STARTING_FROM_8AM_PST_IN_UTC, }, }, ); @@ -147,8 +147,8 @@ describe('SchedulerService', () => { { repeat: { pattern: isDST() - ? EVERY_15_MINUTES_STARTING_FROM_8AM_PST_IN_UTC - : EVERY_15_MINUTES_STARTING_FROM_8AM_PDT_IN_UTC, + ? EVERY_15_MINUTES_STARTING_FROM_8AM_PDT_IN_UTC + : EVERY_15_MINUTES_STARTING_FROM_8AM_PST_IN_UTC, }, }, ); diff --git a/services/apps/alcs/src/queues/scheduler/scheduler.service.ts b/services/apps/alcs/src/queues/scheduler/scheduler.service.ts index e3779cef1f..47bfd16050 100644 --- a/services/apps/alcs/src/queues/scheduler/scheduler.service.ts +++ b/services/apps/alcs/src/queues/scheduler/scheduler.service.ts @@ -112,6 +112,6 @@ export class SchedulerService { pstCronExpression: string, pdtCronExpression: string, ) { - return isDST() ? pstCronExpression : pdtCronExpression; + return isDST() ? pdtCronExpression : pstCronExpression; } } From 27bca5847fe0ba546d98c6b58e06b96b4b24f3c1 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <dhaselhan@gmail.com> Date: Thu, 28 Sep 2023 11:49:43 -0700 Subject: [PATCH 440/954] Accept emails with capital letters (#1020) * Update email regex to accept capital letters Co-authored-by: Daniel Haselhan <daniel@bit3.ca> --- portal-frontend/src/app/shared/pipes/emailValid.pipe.ts | 2 +- services/apps/alcs/src/utils/email.helper.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/portal-frontend/src/app/shared/pipes/emailValid.pipe.ts b/portal-frontend/src/app/shared/pipes/emailValid.pipe.ts index 5d83757e07..520ddbd143 100644 --- a/portal-frontend/src/app/shared/pipes/emailValid.pipe.ts +++ b/portal-frontend/src/app/shared/pipes/emailValid.pipe.ts @@ -1,6 +1,6 @@ import { Pipe, PipeTransform } from '@angular/core'; -export const emailRegex = /^[a-z0-9._%+-]+@[a-z0-9.-]+$/; +export const emailRegex = /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+$/; @Pipe({ name: 'emailValid', diff --git a/services/apps/alcs/src/utils/email.helper.ts b/services/apps/alcs/src/utils/email.helper.ts index 8e92e594c0..e41693ecda 100644 --- a/services/apps/alcs/src/utils/email.helper.ts +++ b/services/apps/alcs/src/utils/email.helper.ts @@ -1 +1 @@ -export const emailRegex = /^[a-z0-9._%+-]+@[a-z0-9.-]+$/; +export const emailRegex = /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+$/; From 0ad81afbe4e811461ba4d95871f95cd20651c334 Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Thu, 28 Sep 2023 15:45:44 -0700 Subject: [PATCH 441/954] Populate empty adjacent land use imported from oats with default values (#1022) * populate empty adjacent land use imported from oats with default values --- .../noi/notice_of_intent_migration.py | 17 +-- .../notice_of_intent_submissions/__init__.py | 12 ++- ...otice_of_intent_empty_adjacent_land_use.py | 100 ++++++++++++++++++ ..._of_intent_submission_adjacent_land_use.py | 17 ++- ...tice_of_intent_adjacent_land_use_count.sql | 13 +++ 5 files changed, 140 insertions(+), 19 deletions(-) create mode 100644 bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_adjacent_land_use/notice_of_intent_empty_adjacent_land_use.py rename bin/migrate-oats-data/noi/notice_of_intent_submissions/{ => notice_of_intent_adjacent_land_use}/notice_of_intent_submission_adjacent_land_use.py (96%) create mode 100644 bin/migrate-oats-data/noi/sql/notice_of_intent_submission/adjacent_land_use/empty_notice_of_intent_adjacent_land_use_count.sql diff --git a/bin/migrate-oats-data/noi/notice_of_intent_migration.py b/bin/migrate-oats-data/noi/notice_of_intent_migration.py index 2a85da0672..83a9f973cc 100644 --- a/bin/migrate-oats-data/noi/notice_of_intent_migration.py +++ b/bin/migrate-oats-data/noi/notice_of_intent_migration.py @@ -1,14 +1,15 @@ -from .oats_to_alcs_notice_of_intent_table_etl.oats_to_alcs_notice_of_intent_table_etl import ( - process_alcs_notice_of_intent_base_fields, -) -from .oats_to_alcs_notice_of_intent_table_etl.notice_of_intent_decision_date import ( - process_alcs_notice_of_intent_decision_date, -) -from .notice_of_intent_init import init_notice_of_intents, clean_notice_of_intents +from .notice_of_intent_init import clean_notice_of_intents, init_notice_of_intents from .notice_of_intent_submissions import ( clean_notice_of_intent_submissions, init_notice_of_intent_submissions, process_notice_of_intent_adjacent_land_use, + process_notice_of_intent_empty_adjacent_land_use, +) +from .oats_to_alcs_notice_of_intent_table_etl.notice_of_intent_decision_date import ( + process_alcs_notice_of_intent_decision_date, +) +from .oats_to_alcs_notice_of_intent_table_etl.oats_to_alcs_notice_of_intent_table_etl import ( + process_alcs_notice_of_intent_base_fields, ) @@ -30,3 +31,5 @@ def process_notice_of_intent(batch_size): init_notice_of_intent_submissions(batch_size=batch_size) process_notice_of_intent_adjacent_land_use(batch_size=batch_size) + + process_notice_of_intent_empty_adjacent_land_use() diff --git a/bin/migrate-oats-data/noi/notice_of_intent_submissions/__init__.py b/bin/migrate-oats-data/noi/notice_of_intent_submissions/__init__.py index 477432f020..71ff06b4a0 100644 --- a/bin/migrate-oats-data/noi/notice_of_intent_submissions/__init__.py +++ b/bin/migrate-oats-data/noi/notice_of_intent_submissions/__init__.py @@ -1,2 +1,10 @@ -from .notice_of_intent_submission_init import init_notice_of_intent_submissions, clean_notice_of_intent_submissions -from .notice_of_intent_submission_adjacent_land_use import process_notice_of_intent_adjacent_land_use \ No newline at end of file +from .notice_of_intent_submission_init import ( + init_notice_of_intent_submissions, + clean_notice_of_intent_submissions, +) +from .notice_of_intent_adjacent_land_use.notice_of_intent_submission_adjacent_land_use import ( + process_notice_of_intent_adjacent_land_use, +) +from .notice_of_intent_adjacent_land_use.notice_of_intent_empty_adjacent_land_use import ( + process_notice_of_intent_empty_adjacent_land_use, +) diff --git a/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_adjacent_land_use/notice_of_intent_empty_adjacent_land_use.py b/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_adjacent_land_use/notice_of_intent_empty_adjacent_land_use.py new file mode 100644 index 0000000000..897556ad4e --- /dev/null +++ b/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_adjacent_land_use/notice_of_intent_empty_adjacent_land_use.py @@ -0,0 +1,100 @@ +import traceback +from common import ( + OATS_ETL_USER, + NO_DATA_IN_OATS, + log, + log_start, + AlcsAdjacentLandUseType, +) +from db import inject_conn_pool +from psycopg2.extras import RealDictCursor + +etl_name = "process_notice_of_intent_empty_adjacent_land_use" + + +@inject_conn_pool +def process_notice_of_intent_empty_adjacent_land_use(conn=None): + """ + This function is responsible for populating empty adjacent land use data imported from OATS to ALCS in notice_of_intent_submission table. + It uses default values for north, south, west, east related columns. + + Args: + conn (psycopg2.extensions.connection): PostgreSQL database connection. Provided by the decorator. + """ + + log_start(etl_name) + with conn.cursor(cursor_factory=RealDictCursor) as cursor: + with open( + "noi/sql/notice_of_intent_submission/adjacent_land_use/empty_notice_of_intent_adjacent_land_use_count.sql", + "r", + encoding="utf-8", + ) as sql_file: + count_query = sql_file.read() + cursor.execute(count_query) + count_total = dict(cursor.fetchone())["count"] + print( + "- Total Notice of Intent Submission Empty Adjacent Land use data to update: ", + count_total, + ) + + successful_updates_count = 0 + last_submission_id = 0 + + try: + cursor.execute( + _update_query, + { + "description": NO_DATA_IN_OATS, + "etl_user": OATS_ETL_USER, + "default_type": AlcsAdjacentLandUseType.OTH.value, + }, + ) + + updated_row_count = cursor.rowcount + + print(f"updated items count: {updated_row_count}") + except Exception as e: + conn.rollback() + str_err = str(e) + trace_err = traceback.format_exc() + print(str_err) + print(trace_err) + failed_updates = count_total - successful_updates_count + last_submission_id = last_submission_id + 1 + log( + etl_name, + str_err, + trace_err, + ) + + log(etl_name) + + +_update_query = """ + UPDATE alcs.notice_of_intent_submission + SET north_land_use_type = COALESCE(north_land_use_type, %(default_type)s), + south_land_use_type = COALESCE(south_land_use_type, %(default_type)s), + east_land_use_type = COALESCE(east_land_use_type, %(default_type)s), + west_land_use_type = COALESCE(west_land_use_type, %(default_type)s), + north_land_use_type_description = COALESCE( + north_land_use_type_description, + %(description)s + ), + south_land_use_type_description = COALESCE( + south_land_use_type_description, + %(description)s + ), + east_land_use_type_description = COALESCE(east_land_use_type_description, %(description)s), + west_land_use_type_description = COALESCE(west_land_use_type_description, %(description)s) + WHERE audit_created_by = %(etl_user)s + AND( + north_land_use_type IS NULL + OR south_land_use_type IS NULL + OR east_land_use_type IS NULL + OR west_land_use_type IS NULL + OR north_land_use_type_description IS NULL + OR south_land_use_type_description IS NULL + OR east_land_use_type_description IS NULL + OR west_land_use_type_description IS NULL + ) + """ diff --git a/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_submission_adjacent_land_use.py b/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_adjacent_land_use/notice_of_intent_submission_adjacent_land_use.py similarity index 96% rename from bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_submission_adjacent_land_use.py rename to bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_adjacent_land_use/notice_of_intent_submission_adjacent_land_use.py index c04d6a349c..023c449184 100644 --- a/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_submission_adjacent_land_use.py +++ b/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_adjacent_land_use/notice_of_intent_submission_adjacent_land_use.py @@ -1,14 +1,10 @@ -from common import log, log_start, AlcsAdjacentLandUseType -from db import inject_conn_pool -from common import ( - BATCH_UPLOAD_SIZE, - NO_DATA_IN_OATS, - DateTimeEncoder, - AdjacentLandUseDirections, -) -from psycopg2.extras import execute_batch, RealDictCursor -import traceback import json +import traceback +from common import (BATCH_UPLOAD_SIZE, NO_DATA_IN_OATS, + AdjacentLandUseDirections, AlcsAdjacentLandUseType, + DateTimeEncoder, log, log_start) +from db import inject_conn_pool +from psycopg2.extras import RealDictCursor, execute_batch etl_name = "process_notice_of_intent_adjacent_land_use" @@ -193,3 +189,4 @@ def _map_adjacent_land_use_data(oats_row): ].value, direction_type_desc_key: oats_row[description_key] or NO_DATA_IN_OATS, } + diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/adjacent_land_use/empty_notice_of_intent_adjacent_land_use_count.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/adjacent_land_use/empty_notice_of_intent_adjacent_land_use_count.sql new file mode 100644 index 0000000000..5cbe50882c --- /dev/null +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/adjacent_land_use/empty_notice_of_intent_adjacent_land_use_count.sql @@ -0,0 +1,13 @@ +SELECT count(*) +FROM alcs.notice_of_intent_submission nois +WHERE audit_created_by = 'oats_etl' + AND ( + north_land_use_type IS NULL + OR north_land_use_type_description IS NULL + OR south_land_use_type IS NULL + OR south_land_use_type_description IS NULL + OR east_land_use_type IS NULL + OR east_land_use_type_description IS NULL + OR west_land_use_type IS NULL + OR west_land_use_type_description IS NULL + ) \ No newline at end of file From 7ddb6805cc3e4cb2f6fcaf069c69976f44004a50 Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Thu, 28 Sep 2023 16:26:30 -0700 Subject: [PATCH 442/954] Feature/alcs 1184 (#1023) map ALCS soil fields to notice of intent submission validation script --- bin/migrate-oats-data/common/__init__.py | 1 + .../oats_to_alcs_soil_change_code_enum.py | 6 + .../noi/notice_of_intent_migration.py | 3 + .../notice_of_intent_submissions/__init__.py | 1 + .../notice_of_intent_soil_fields.py | 157 ++++++++++++++++++ .../notice_of_intent_soil_fields.sql | 16 ++ .../notice_of_intent_soil_fields_count.sql | 4 + .../soil_fields/validation.sql | 75 +++++++++ 8 files changed, 263 insertions(+) create mode 100644 bin/migrate-oats-data/common/oats_to_alcs_soil_change_code_enum.py create mode 100644 bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_soil_fields.py create mode 100644 bin/migrate-oats-data/noi/sql/notice_of_intent_submission/soil_fields/notice_of_intent_soil_fields.sql create mode 100644 bin/migrate-oats-data/noi/sql/notice_of_intent_submission/soil_fields/notice_of_intent_soil_fields_count.sql create mode 100644 bin/migrate-oats-data/noi/sql/notice_of_intent_submission/soil_fields/validation.sql diff --git a/bin/migrate-oats-data/common/__init__.py b/bin/migrate-oats-data/common/__init__.py index 6c43d3d7d4..fbd46bb656 100644 --- a/bin/migrate-oats-data/common/__init__.py +++ b/bin/migrate-oats-data/common/__init__.py @@ -4,3 +4,4 @@ from .constants import * from .oats_to_alcs_adjacent_land_use_type_enum import * from .json_encoder import * +from .oats_to_alcs_soil_change_code_enum import * diff --git a/bin/migrate-oats-data/common/oats_to_alcs_soil_change_code_enum.py b/bin/migrate-oats-data/common/oats_to_alcs_soil_change_code_enum.py new file mode 100644 index 0000000000..8ea1c00497 --- /dev/null +++ b/bin/migrate-oats-data/common/oats_to_alcs_soil_change_code_enum.py @@ -0,0 +1,6 @@ +from enum import Enum + + +class SoilChangeCode(Enum): + ADD = "ADD" + REMOVE = "REMOVE" \ No newline at end of file diff --git a/bin/migrate-oats-data/noi/notice_of_intent_migration.py b/bin/migrate-oats-data/noi/notice_of_intent_migration.py index 83a9f973cc..effe600e40 100644 --- a/bin/migrate-oats-data/noi/notice_of_intent_migration.py +++ b/bin/migrate-oats-data/noi/notice_of_intent_migration.py @@ -4,6 +4,7 @@ init_notice_of_intent_submissions, process_notice_of_intent_adjacent_land_use, process_notice_of_intent_empty_adjacent_land_use, + process_alcs_notice_of_intent_soil_fields ) from .oats_to_alcs_notice_of_intent_table_etl.notice_of_intent_decision_date import ( process_alcs_notice_of_intent_decision_date, @@ -33,3 +34,5 @@ def process_notice_of_intent(batch_size): process_notice_of_intent_adjacent_land_use(batch_size=batch_size) process_notice_of_intent_empty_adjacent_land_use() + + process_alcs_notice_of_intent_soil_fields(batch_size=batch_size) diff --git a/bin/migrate-oats-data/noi/notice_of_intent_submissions/__init__.py b/bin/migrate-oats-data/noi/notice_of_intent_submissions/__init__.py index 71ff06b4a0..46264ba69c 100644 --- a/bin/migrate-oats-data/noi/notice_of_intent_submissions/__init__.py +++ b/bin/migrate-oats-data/noi/notice_of_intent_submissions/__init__.py @@ -8,3 +8,4 @@ from .notice_of_intent_adjacent_land_use.notice_of_intent_empty_adjacent_land_use import ( process_notice_of_intent_empty_adjacent_land_use, ) +from .notice_of_intent_soil_fields import process_alcs_notice_of_intent_soil_fields diff --git a/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_soil_fields.py b/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_soil_fields.py new file mode 100644 index 0000000000..d2467106bd --- /dev/null +++ b/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_soil_fields.py @@ -0,0 +1,157 @@ +import traceback +from common import BATCH_UPLOAD_SIZE, NO_DATA_IN_OATS, SoilChangeCode, log, log_start +from db import inject_conn_pool +from psycopg2.extras import RealDictCursor, execute_batch + +etl_name = "process_alcs_notice_of_intent_soil_fields" + + +@inject_conn_pool +def process_alcs_notice_of_intent_soil_fields(conn=None, batch_size=BATCH_UPLOAD_SIZE): + """ + This function is responsible for setting soil fields of the notice_of_intent_submission in ALCS. + + Args: + conn (psycopg2.extensions.connection): PostgreSQL database connection. Provided by the decorator. + batch_size (int): The number of items to process at once. Defaults to BATCH_UPLOAD_SIZE. + """ + + log_start(etl_name) + with conn.cursor(cursor_factory=RealDictCursor) as cursor: + with open( + "noi/sql/notice_of_intent_submission/soil_fields/notice_of_intent_soil_fields_count.sql", + "r", + encoding="utf-8", + ) as sql_file: + count_query = sql_file.read() + cursor.execute(count_query) + count_total = dict(cursor.fetchone())["count"] + print("- Total Notice of Intents data to update: ", count_total) + + failed_inserts = 0 + successful_updates_count = 0 + last_application_id = 0 + + with open( + "noi/sql/notice_of_intent_submission/soil_fields/notice_of_intent_soil_fields.sql", + "r", + encoding="utf-8", + ) as sql_file: + application_sql = sql_file.read() + while True: + cursor.execute( + f"{application_sql} WHERE oaac.alr_application_id > {last_application_id} ORDER BY oaac.alr_application_id;" + ) + + rows = cursor.fetchmany(batch_size) + + if not rows: + break + try: + records_to_be_updated_count = len(rows) + + _update_fee_fields_records(conn, batch_size, cursor, rows) + + successful_updates_count = ( + successful_updates_count + records_to_be_updated_count + ) + last_application_id = dict(rows[-1])["alr_application_id"] + + print( + f"retrieved/updated items count: {records_to_be_updated_count}; total successfully updated notice of intents so far {successful_updates_count}; last updated alr_application_id: {last_application_id}" + ) + except Exception as error: + # this is NOT going to be caused by actual data update failure. This code is only executed when the code error appears or connection to DB is lost + conn.rollback() + error_str = "".join( + traceback.format_exception(None, error, error.__traceback__) + ) + print(error_str) + log(etl_name, str(error), error_str) + failed_inserts = count_total - successful_updates_count + last_application_id = last_application_id + 1 + + print("Total amount of successful updates:", successful_updates_count) + print("Total failed updates:", failed_inserts) + log(etl_name) + + +def _update_fee_fields_records(conn, batch_size, cursor, rows): + parsed_data_list = _prepare_oats_alr_applications_data(rows) + + if len(parsed_data_list[SoilChangeCode.REMOVE.value]) > 0: + execute_batch( + cursor, + _soil_remove_query, + parsed_data_list[SoilChangeCode.REMOVE.value], + page_size=batch_size, + ) + + if len(parsed_data_list[SoilChangeCode.ADD.value]) > 0: + execute_batch( + cursor, + _soil_fill_query, + parsed_data_list[SoilChangeCode.ADD.value], + page_size=batch_size, + ) + + conn.commit() + + +_soil_fill_query = """ + UPDATE alcs.notice_of_intent_submission + SET soil_to_place_volume = %(volume)s + , soil_to_place_area = %(project_area)s + , soil_to_place_maximum_depth = %(depth)s + , soil_to_place_average_depth = %(depth)s + , soil_fill_type_to_place = %(type)s + , soil_already_placed_volume = 0 + , soil_already_placed_area = 0 + , soil_already_placed_maximum_depth = 0 + , soil_already_placed_average_depth = 0 + WHERE alcs.notice_of_intent_submission.file_number = %(alr_application_id)s::text +""" + +_soil_remove_query = """ + UPDATE alcs.notice_of_intent_submission + SET soil_to_remove_volume = %(volume)s + , soil_to_remove_area = %(project_area)s + , soil_to_remove_maximum_depth = %(depth)s + , soil_to_remove_average_depth = %(depth)s + , soil_type_removed = %(type)s + , soil_already_removed_volume = 0 + , soil_already_removed_area = 0 + , soil_already_removed_maximum_depth = 0 + , soil_already_removed_average_depth = 0 + WHERE alcs.notice_of_intent_submission.file_number = %(alr_application_id)s::text +""" + + +def _prepare_oats_alr_applications_data(row_data_list): + data_list = {SoilChangeCode.REMOVE.value: [], SoilChangeCode.ADD.value: []} + for row in row_data_list: + data = dict(row) + data = map_soil_fields(data) + + if data["soil_change_code"] == SoilChangeCode.ADD.value: + data_list[SoilChangeCode.ADD.value].append(data) + elif data["soil_change_code"] == SoilChangeCode.REMOVE.value: + data_list[SoilChangeCode.REMOVE.value].append(data) + + return data_list + + +def map_soil_fields(data): + soil_type = data.get("material_description", "") + soil_origin = data.get("material_origin_desc", "") + + if not soil_type and not soil_origin: + data["type"] = NO_DATA_IN_OATS + else: + data["type"] = f"{soil_type} {soil_origin}" + + data["volume"] = data.get("volume", 0) + data["project_area"] = data.get("project_area", 0) + data["depth"] = data.get("depth", 0) + + return data diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/soil_fields/notice_of_intent_soil_fields.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/soil_fields/notice_of_intent_soil_fields.sql new file mode 100644 index 0000000000..f4af4f7945 --- /dev/null +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/soil_fields/notice_of_intent_soil_fields.sql @@ -0,0 +1,16 @@ + + +SELECT +oaac.alr_application_id, +osce.soil_change_code, +osce.material_desc, +osce.material_origin_desc, +osce.volume, +osce.project_area , +osce."depth" +FROM + oats.oats_soil_change_elements osce +JOIN oats.oats_alr_appl_components oaac ON oaac.alr_appl_component_id = osce.alr_appl_component_id +JOIN alcs.notice_of_intent_submission nois ON nois.file_number = oaac.alr_application_id::text + + \ No newline at end of file diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/soil_fields/notice_of_intent_soil_fields_count.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/soil_fields/notice_of_intent_soil_fields_count.sql new file mode 100644 index 0000000000..3d35342a95 --- /dev/null +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/soil_fields/notice_of_intent_soil_fields_count.sql @@ -0,0 +1,4 @@ +SELECT count(*) +FROM oats.oats_soil_change_elements osce + JOIN oats.oats_alr_appl_components oaac ON oaac.alr_appl_component_id = osce.alr_appl_component_id + JOIN alcs.notice_of_intent_submission nois ON nois.file_number = oaac.alr_application_id::text \ No newline at end of file diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/soil_fields/validation.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/soil_fields/validation.sql new file mode 100644 index 0000000000..86340de02f --- /dev/null +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/soil_fields/validation.sql @@ -0,0 +1,75 @@ +--- Use this query to manually validate that data mapped properly. Execute in DB IDE of your choice +-- validate that remove columns mapped properly +WITH soil_to_remove AS ( + SELECT oaac.alr_application_id, + osce.soil_change_code, + osce.material_desc, + osce.material_origin_desc, + osce.volume, + osce.project_area, + osce."depth" + FROM oats.oats_soil_change_elements osce + JOIN oats.oats_alr_appl_components oaac ON oaac.alr_appl_component_id = osce.alr_appl_component_id + JOIN alcs.notice_of_intent_submission nois ON nois.file_number = oaac.alr_application_id::TEXT + WHERE osce.soil_change_code = 'REMOVE' +) +SELECT * +FROM soil_to_remove AS soil_to_r + JOIN alcs.notice_of_intent_submission nois ON nois.file_number = soil_to_r.alr_application_id::TEXT +WHERE ( + soil_to_remove_volume != soil_to_r.volume + AND soil_to_r.volume != NULL + ) + OR ( + soil_to_remove_area != soil_to_r.project_area + AND soil_to_r.project_area != NULL + ) + OR ( + soil_to_remove_maximum_depth != soil_to_r."depth" + AND soil_to_r."depth" != NULL + ) + OR ( + soil_to_remove_average_depth != soil_to_r."depth" + AND soil_to_r."depth" != NULL + ) + OR soil_already_removed_volume != 0 + OR soil_already_removed_area != 0 + OR soil_already_removed_maximum_depth != 0 + OR soil_already_removed_average_depth != 0; +-- validate that place columns mapped properly +WITH soil_to_remove AS ( + SELECT oaac.alr_application_id, + osce.soil_change_code, + osce.material_desc, + osce.material_origin_desc, + osce.volume, + osce.project_area, + osce."depth" + FROM oats.oats_soil_change_elements osce + JOIN oats.oats_alr_appl_components oaac ON oaac.alr_appl_component_id = osce.alr_appl_component_id + JOIN alcs.notice_of_intent_submission nois ON nois.file_number = oaac.alr_application_id::TEXT + WHERE osce.soil_change_code = 'ADD' +) +SELECT * +FROM soil_to_remove AS soil_to_r + JOIN alcs.notice_of_intent_submission nois ON nois.file_number = soil_to_r.alr_application_id::TEXT +WHERE ( + soil_to_place_area != soil_to_r.volume + AND soil_to_r.volume != NULL + ) + OR ( + soil_to_place_area != soil_to_r.project_area + AND soil_to_r.project_area != NULL + ) + OR ( + soil_to_place_maximum_depth != soil_to_r."depth" + AND soil_to_r."depth" != NULL + ) + OR ( + soil_to_place_average_depth != soil_to_r."depth" + AND soil_to_r."depth" != NULL + ) + OR soil_already_placed_volume != 0 + OR soil_already_placed_area != 0 + OR soil_already_placed_maximum_depth != 0 + OR soil_already_placed_average_depth != 0 \ No newline at end of file From fd4c54354a7d926e1a69ad6d6be0e8a8c367fadc Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Fri, 29 Sep 2023 15:17:37 -0700 Subject: [PATCH 443/954] add project duration and duration unit in scope of soil fields (#1024) --- .../notice_of_intent_soil_fields.py | 6 ++- .../notice_of_intent_soil_fields.sql | 3 +- .../soil_fields/validation.sql | 48 ++++++++++++------- 3 files changed, 39 insertions(+), 18 deletions(-) diff --git a/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_soil_fields.py b/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_soil_fields.py index d2467106bd..41ef699f99 100644 --- a/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_soil_fields.py +++ b/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_soil_fields.py @@ -9,7 +9,7 @@ @inject_conn_pool def process_alcs_notice_of_intent_soil_fields(conn=None, batch_size=BATCH_UPLOAD_SIZE): """ - This function is responsible for setting soil fields of the notice_of_intent_submission in ALCS. + This function is responsible for populating soil fields of the notice_of_intent_submission in ALCS. Args: conn (psycopg2.extensions.connection): PostgreSQL database connection. Provided by the decorator. @@ -105,6 +105,8 @@ def _update_fee_fields_records(conn, batch_size, cursor, rows): , soil_to_place_maximum_depth = %(depth)s , soil_to_place_average_depth = %(depth)s , soil_fill_type_to_place = %(type)s + , soil_project_duration_amount = %(project_duration)s + , soil_project_duration_unit = CASE WHEN %(project_duration)s is NOT NULL THEN 'months' ELSE NULL END , soil_already_placed_volume = 0 , soil_already_placed_area = 0 , soil_already_placed_maximum_depth = 0 @@ -119,6 +121,8 @@ def _update_fee_fields_records(conn, batch_size, cursor, rows): , soil_to_remove_maximum_depth = %(depth)s , soil_to_remove_average_depth = %(depth)s , soil_type_removed = %(type)s + , soil_project_duration_amount = %(project_duration)s + , soil_project_duration_unit = CASE WHEN %(project_duration)s is NOT NULL THEN 'months' ELSE NULL END , soil_already_removed_volume = 0 , soil_already_removed_area = 0 , soil_already_removed_maximum_depth = 0 diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/soil_fields/notice_of_intent_soil_fields.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/soil_fields/notice_of_intent_soil_fields.sql index f4af4f7945..c2eb9bd52b 100644 --- a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/soil_fields/notice_of_intent_soil_fields.sql +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/soil_fields/notice_of_intent_soil_fields.sql @@ -7,7 +7,8 @@ osce.material_desc, osce.material_origin_desc, osce.volume, osce.project_area , -osce."depth" +osce."depth", +osce.project_duration FROM oats.oats_soil_change_elements osce JOIN oats.oats_alr_appl_components oaac ON oaac.alr_appl_component_id = osce.alr_appl_component_id diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/soil_fields/validation.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/soil_fields/validation.sql index 86340de02f..51b33b0d06 100644 --- a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/soil_fields/validation.sql +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/soil_fields/validation.sql @@ -1,5 +1,3 @@ ---- Use this query to manually validate that data mapped properly. Execute in DB IDE of your choice --- validate that remove columns mapped properly WITH soil_to_remove AS ( SELECT oaac.alr_application_id, osce.soil_change_code, @@ -7,7 +5,8 @@ WITH soil_to_remove AS ( osce.material_origin_desc, osce.volume, osce.project_area, - osce."depth" + osce."depth", + osce.project_duration FROM oats.oats_soil_change_elements osce JOIN oats.oats_alr_appl_components oaac ON oaac.alr_appl_component_id = osce.alr_appl_component_id JOIN alcs.notice_of_intent_submission nois ON nois.file_number = oaac.alr_application_id::TEXT @@ -32,44 +31,61 @@ WHERE ( soil_to_remove_average_depth != soil_to_r."depth" AND soil_to_r."depth" != NULL ) + OR ( + soil_project_duration_amount != soil_to_r.project_duration + AND soil_to_r.project_duration != NULL + ) + OR ( + soil_project_duration_unit != 'month' + AND soil_to_r.project_duration != NULL + ) OR soil_already_removed_volume != 0 OR soil_already_removed_area != 0 OR soil_already_removed_maximum_depth != 0 OR soil_already_removed_average_depth != 0; -- validate that place columns mapped properly -WITH soil_to_remove AS ( +WITH soil_to_place AS ( SELECT oaac.alr_application_id, osce.soil_change_code, osce.material_desc, osce.material_origin_desc, osce.volume, osce.project_area, - osce."depth" + osce."depth", + osce.project_duration FROM oats.oats_soil_change_elements osce JOIN oats.oats_alr_appl_components oaac ON oaac.alr_appl_component_id = osce.alr_appl_component_id JOIN alcs.notice_of_intent_submission nois ON nois.file_number = oaac.alr_application_id::TEXT WHERE osce.soil_change_code = 'ADD' ) SELECT * -FROM soil_to_remove AS soil_to_r - JOIN alcs.notice_of_intent_submission nois ON nois.file_number = soil_to_r.alr_application_id::TEXT +FROM soil_to_place AS soil_to_p + JOIN alcs.notice_of_intent_submission nois ON nois.file_number = soil_to_p.alr_application_id::TEXT WHERE ( - soil_to_place_area != soil_to_r.volume - AND soil_to_r.volume != NULL + soil_to_place_area != soil_to_p.volume + AND soil_to_p.volume != NULL ) OR ( - soil_to_place_area != soil_to_r.project_area - AND soil_to_r.project_area != NULL + soil_to_place_area != soil_to_p.project_area + AND soil_to_p.project_area != NULL ) OR ( - soil_to_place_maximum_depth != soil_to_r."depth" - AND soil_to_r."depth" != NULL + soil_to_place_maximum_depth != soil_to_p."depth" + AND soil_to_p."depth" != NULL ) OR ( - soil_to_place_average_depth != soil_to_r."depth" - AND soil_to_r."depth" != NULL + soil_to_place_average_depth != soil_to_p."depth" + AND soil_to_p."depth" != NULL + ) + OR ( + soil_project_duration_amount != soil_to_p.project_duration + AND soil_to_p.project_duration != NULL + ) + OR ( + soil_project_duration_unit != 'month' + AND soil_to_p.project_duration != NULL ) OR soil_already_placed_volume != 0 OR soil_already_placed_area != 0 OR soil_already_placed_maximum_depth != 0 - OR soil_already_placed_average_depth != 0 \ No newline at end of file + OR soil_already_placed_average_depth != 0; \ No newline at end of file From 4e1e04d78fb68c10e46f9d6a5563c4111b99493d Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Fri, 29 Sep 2023 15:18:36 -0700 Subject: [PATCH 444/954] notice of intent submission proposal and soil default fields (#1026) NOIS proposal fields and soil fields with default values validation script --- .../submission_status_email.py | 1 + .../submission_status_email.py | 1 + .../noi/notice_of_intent_migration.py | 21 ++- .../notice_of_intent_submissions/__init__.py | 2 + .../notice_of_intent_proposal_fields.py | 133 ++++++++++++++++++ .../notice_of_intent_proposal_fields.sql | 10 ++ ...notice_of_intent_proposal_fields_count.sql | 3 + .../proposal_fields/validation.sql | 56 ++++++++ 8 files changed, 221 insertions(+), 6 deletions(-) create mode 100644 bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_proposal_fields.py create mode 100644 bin/migrate-oats-data/noi/sql/notice_of_intent_submission/proposal_fields/notice_of_intent_proposal_fields.sql create mode 100644 bin/migrate-oats-data/noi/sql/notice_of_intent_submission/proposal_fields/notice_of_intent_proposal_fields_count.sql create mode 100644 bin/migrate-oats-data/noi/sql/notice_of_intent_submission/proposal_fields/validation.sql diff --git a/bin/migrate-oats-data/applications/application_submission_status_email/submission_status_email.py b/bin/migrate-oats-data/applications/application_submission_status_email/submission_status_email.py index 3314ef02df..dd0de087d5 100644 --- a/bin/migrate-oats-data/applications/application_submission_status_email/submission_status_email.py +++ b/bin/migrate-oats-data/applications/application_submission_status_email/submission_status_email.py @@ -16,6 +16,7 @@ def process_application_submission_status_emails(conn=None): try: with conn.cursor() as cursor: cursor.execute(update_query) + conn.commit() except Exception as error: print("".join(traceback.format_exception(None, error, error.__traceback__))) cursor.close() diff --git a/bin/migrate-oats-data/noi/noi_submission_status_email/submission_status_email.py b/bin/migrate-oats-data/noi/noi_submission_status_email/submission_status_email.py index c09bf332a7..ae22485c36 100644 --- a/bin/migrate-oats-data/noi/noi_submission_status_email/submission_status_email.py +++ b/bin/migrate-oats-data/noi/noi_submission_status_email/submission_status_email.py @@ -16,6 +16,7 @@ def process_notice_of_intent_submission_status_emails(conn=None): try: with conn.cursor() as cursor: cursor.execute(update_query) + conn.commit() except Exception as error: print("".join(traceback.format_exception(None, error, error.__traceback__))) cursor.close() diff --git a/bin/migrate-oats-data/noi/notice_of_intent_migration.py b/bin/migrate-oats-data/noi/notice_of_intent_migration.py index effe600e40..8fd989221c 100644 --- a/bin/migrate-oats-data/noi/notice_of_intent_migration.py +++ b/bin/migrate-oats-data/noi/notice_of_intent_migration.py @@ -4,7 +4,8 @@ init_notice_of_intent_submissions, process_notice_of_intent_adjacent_land_use, process_notice_of_intent_empty_adjacent_land_use, - process_alcs_notice_of_intent_soil_fields + process_alcs_notice_of_intent_soil_fields, + process_alcs_notice_of_intent_proposal_fields, ) from .oats_to_alcs_notice_of_intent_table_etl.notice_of_intent_decision_date import ( process_alcs_notice_of_intent_decision_date, @@ -13,6 +14,10 @@ process_alcs_notice_of_intent_base_fields, ) +from .noi_submission_status_email.submission_status_email import ( + process_notice_of_intent_submission_status_emails, +) + def init_notice_of_intent(batch_size): init_notice_of_intents(batch_size=batch_size) @@ -25,14 +30,18 @@ def clean_notice_of_intent(): def process_notice_of_intent(batch_size): # place the rest notice of intent processing functions here - process_alcs_notice_of_intent_base_fields(batch_size=batch_size) + process_alcs_notice_of_intent_base_fields(batch_size) - process_alcs_notice_of_intent_decision_date(batch_size=batch_size) + process_alcs_notice_of_intent_decision_date(batch_size) - init_notice_of_intent_submissions(batch_size=batch_size) + init_notice_of_intent_submissions(batch_size) - process_notice_of_intent_adjacent_land_use(batch_size=batch_size) + process_notice_of_intent_adjacent_land_use(batch_size) process_notice_of_intent_empty_adjacent_land_use() - process_alcs_notice_of_intent_soil_fields(batch_size=batch_size) + process_alcs_notice_of_intent_soil_fields(batch_size) + + process_alcs_notice_of_intent_proposal_fields(batch_size) + + process_notice_of_intent_submission_status_emails() diff --git a/bin/migrate-oats-data/noi/notice_of_intent_submissions/__init__.py b/bin/migrate-oats-data/noi/notice_of_intent_submissions/__init__.py index 46264ba69c..d6591c20bc 100644 --- a/bin/migrate-oats-data/noi/notice_of_intent_submissions/__init__.py +++ b/bin/migrate-oats-data/noi/notice_of_intent_submissions/__init__.py @@ -9,3 +9,5 @@ process_notice_of_intent_empty_adjacent_land_use, ) from .notice_of_intent_soil_fields import process_alcs_notice_of_intent_soil_fields + +from .notice_of_intent_proposal_fields import process_alcs_notice_of_intent_proposal_fields diff --git a/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_proposal_fields.py b/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_proposal_fields.py new file mode 100644 index 0000000000..373626ce59 --- /dev/null +++ b/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_proposal_fields.py @@ -0,0 +1,133 @@ +import traceback +from common import BATCH_UPLOAD_SIZE, NO_DATA_IN_OATS, log, log_start +from db import inject_conn_pool +from psycopg2.extras import RealDictCursor, execute_batch + +etl_name = "process_alcs_notice_of_intent_proposal_fields" + + +@inject_conn_pool +def process_alcs_notice_of_intent_proposal_fields( + conn=None, batch_size=BATCH_UPLOAD_SIZE +): + """ + This function is responsible for populating of the notice_of_intent_submission in ALCS: proposal fields and soil fields populated with default values. + + Args: + conn (psycopg2.extensions.connection): PostgreSQL database connection. Provided by the decorator. + batch_size (int): The number of items to process at once. Defaults to BATCH_UPLOAD_SIZE. + """ + + log_start(etl_name) + with conn.cursor(cursor_factory=RealDictCursor) as cursor: + with open( + "noi/sql/notice_of_intent_submission/proposal_fields/notice_of_intent_proposal_fields_count.sql", + "r", + encoding="utf-8", + ) as sql_file: + count_query = sql_file.read() + cursor.execute(count_query) + count_total = dict(cursor.fetchone())["count"] + print("- Total Notice of Intents data to update: ", count_total) + + failed_inserts = 0 + successful_updates_count = 0 + last_application_id = 0 + + with open( + "noi/sql/notice_of_intent_submission/proposal_fields/notice_of_intent_proposal_fields.sql", + "r", + encoding="utf-8", + ) as sql_file: + application_sql = sql_file.read() + while True: + cursor.execute( + f"{application_sql} WHERE oaa.alr_application_id > {last_application_id} ORDER BY oaa.alr_application_id;" + ) + + rows = cursor.fetchmany(batch_size) + + if not rows: + break + try: + records_to_be_updated_count = len(rows) + + _update_records(conn, batch_size, cursor, rows) + + successful_updates_count = ( + successful_updates_count + records_to_be_updated_count + ) + last_application_id = dict(rows[-1])["alr_application_id"] + + print( + f"retrieved/updated items count: {records_to_be_updated_count}; total successfully updated notice of intents so far {successful_updates_count}; last updated alr_application_id: {last_application_id}" + ) + except Exception as error: + # this is NOT going to be caused by actual data update failure. This code is only executed when the code error appears or connection to DB is lost + conn.rollback() + error_str = "".join( + traceback.format_exception(None, error, error.__traceback__) + ) + print(error_str) + log(etl_name, str(error), error_str) + failed_inserts = count_total - successful_updates_count + last_application_id = last_application_id + 1 + + print("Total amount of successful updates:", successful_updates_count) + print("Total failed updates:", failed_inserts) + log(etl_name) + + +def _update_records(conn, batch_size, cursor, rows): + parsed_data_list = _prepare_oats_data(rows) + + if len(parsed_data_list) > 0: + execute_batch( + cursor, + _update_query, + parsed_data_list, + page_size=batch_size, + ) + + conn.commit() + + +_update_query = """ + UPDATE + alcs.notice_of_intent_submission + SET + purpose = %(purpose)s, + parcels_agriculture_description = %(current_land_use_desc)s, + parcels_agriculture_improvement_description= %(agricultural_improvement_desc)s, + parcels_non_agriculture_use_description = %(non_agricultural_uses_desc)s, + soil_is_follow_up = %(soil_is_follow_up)s, + soil_follow_up_ids = %(followup_noi_number)s, + soil_has_submitted_notice= %(soil_has_submitted_notice)s, + soil_is_extraction_or_mining = FALSE, + soil_is_removing_soil_for_new_structure = FALSE, + soil_is_area_wide_filling = FALSE + WHERE + alcs.notice_of_intent_submission.file_number = %(alr_application_id)s::TEXT +""" + + +def _prepare_oats_data(row_data_list): + data_list = [] + for row in row_data_list: + data_list.append(map_fields(dict(row))) + return data_list + + +def map_fields(data): + summery = data.get("proposal_summary_desc", "") + background_description = data.get("proposal_background_desc", "") + + if not summery and not background_description: + data["purpose"] = NO_DATA_IN_OATS + else: + data["purpose"] = f"{summery} {background_description}" + + data["soil_is_follow_up"] = data["ministry_notice_ref_no"] != None + data["soil_has_submitted_notice"] = data["followup_noi_number"] != None + + return data diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/proposal_fields/notice_of_intent_proposal_fields.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/proposal_fields/notice_of_intent_proposal_fields.sql new file mode 100644 index 0000000000..4b45145401 --- /dev/null +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/proposal_fields/notice_of_intent_proposal_fields.sql @@ -0,0 +1,10 @@ +SELECT oaa.alr_application_id, + oaa.proposal_summary_desc, + oaa.proposal_background_desc, + oaa.current_land_use_desc, + oaa.agricultural_improvement_desc, + oaa.non_agricultural_uses_desc, + oaa.followup_noi_number, + oaa.ministry_notice_ref_no +FROM oats.oats_alr_applications oaa + JOIN alcs.notice_of_intent_submission nois ON nois.file_number = oaa.alr_application_id::TEXT \ No newline at end of file diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/proposal_fields/notice_of_intent_proposal_fields_count.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/proposal_fields/notice_of_intent_proposal_fields_count.sql new file mode 100644 index 0000000000..8f1339f16e --- /dev/null +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/proposal_fields/notice_of_intent_proposal_fields_count.sql @@ -0,0 +1,3 @@ +SELECT count(*) +FROM oats.oats_alr_applications oaa + JOIN alcs.notice_of_intent_submission nois ON nois.file_number = oaa.alr_application_id::TEXT; \ No newline at end of file diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/proposal_fields/validation.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/proposal_fields/validation.sql new file mode 100644 index 0000000000..0abab9110a --- /dev/null +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/proposal_fields/validation.sql @@ -0,0 +1,56 @@ +------ validation queries +--- Use this query to manually validate that data mapped properly. Execute in DB IDE of your choice +-- validate applicant +SELECT * +FROM alcs.notice_of_intent noi + JOIN alcs.notice_of_intent_submission nois ON noi.file_number = nois.file_number +WHERE noi.applicant != nois.applicant; +-- validate local_government +SELECT * +FROM alcs.notice_of_intent noi + JOIN alcs.notice_of_intent_submission nois ON noi.file_number = nois.file_number +WHERE noi.local_government_uuid != nois.local_government_uuid; +-- validate type_code +SELECT * +FROM alcs.notice_of_intent noi + JOIN alcs.notice_of_intent_submission nois ON noi.file_number = nois.file_number +WHERE noi.type_code != nois.type_code; +-- validate proposal and default soil fields +SELECT nois.soil_has_submitted_notice, + oaa.followup_noi_number +FROM oats.oats_alr_applications oaa + JOIN alcs.notice_of_intent_submission nois ON nois.file_number = oaa.alr_application_id::TEXT +WHERE ( + nois.purpose IS NULL + AND ( + oaa.proposal_summary_desc IS NOT NULL + OR proposal_background_desc IS NOT NULL + ) + ) + OR ( + nois.parcels_agriculture_description != oaa.current_land_use_desc + ) + OR ( + nois.parcels_agriculture_improvement_description != oaa.agricultural_improvement_desc + ) + OR ( + nois.parcels_non_agriculture_use_description != oaa.non_agricultural_uses_desc + ) + OR ( + nois.soil_is_follow_up != CASE + WHEN oaa.ministry_notice_ref_no IS NOT NULL THEN TRUE + ELSE FALSE + END + ) + OR ( + nois.soil_follow_up_ids != oaa.followup_noi_number::TEXT + ) + OR ( + nois.soil_has_submitted_notice != CASE + WHEN oaa.followup_noi_number IS NOT NULL THEN TRUE + ELSE FALSE + END + ) + OR soil_is_extraction_or_mining != FALSE + OR soil_is_removing_soil_for_new_structure != FALSE + OR soil_is_area_wide_filling != FALSE; \ No newline at end of file From bf6da4c2514d3358ea97bb55317e0d2119285432 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Tue, 3 Oct 2023 10:27:30 -0700 Subject: [PATCH 445/954] Remember Search Fields * When a user searches store what they searched on and re-load if they come back --- .../file-type-filter-drop-down.component.html | 5 +- .../file-type-filter-drop-down.component.ts | 35 +++++++----- .../search/public-search.component.html | 4 +- .../public/search/public-search.component.ts | 56 ++++++++++++++++++- 4 files changed, 77 insertions(+), 23 deletions(-) diff --git a/portal-frontend/src/app/features/public/search/file-type-filter-drop-down/file-type-filter-drop-down.component.html b/portal-frontend/src/app/features/public/search/file-type-filter-drop-down/file-type-filter-drop-down.component.html index 02a22c2db4..ecb3ec7330 100644 --- a/portal-frontend/src/app/features/public/search/file-type-filter-drop-down/file-type-filter-drop-down.component.html +++ b/portal-frontend/src/app/features/public/search/file-type-filter-drop-down/file-type-filter-drop-down.component.html @@ -1,6 +1,5 @@ <mat-form-field appearance="outline" class="file-type-input"> <input - value="{{ getSelectedItems() }}" id="type" type="text" matInput @@ -16,7 +15,7 @@ <mat-checkbox class="checklist-leaf-node" [checked]="checklistSelection.isSelected(node)" - (change)="todoLeafItemSelectionToggle(node)" + (change)="leafItemSelectionToggle(node)" >{{ node.item?.label ?? node.item }}</mat-checkbox > </mat-tree-node> @@ -30,7 +29,7 @@ <mat-checkbox [checked]="descendantsAllSelected(node)" [indeterminate]="descendantsPartiallySelected(node)" - (change)="todoItemSelectionToggle(node)" + (change)="itemSelectionToggle(node)" > {{ node.item?.label ?? node.item }}</mat-checkbox > diff --git a/portal-frontend/src/app/features/public/search/file-type-filter-drop-down/file-type-filter-drop-down.component.ts b/portal-frontend/src/app/features/public/search/file-type-filter-drop-down/file-type-filter-drop-down.component.ts index 875c648e96..fcdf3dd3da 100644 --- a/portal-frontend/src/app/features/public/search/file-type-filter-drop-down/file-type-filter-drop-down.component.ts +++ b/portal-frontend/src/app/features/public/search/file-type-filter-drop-down/file-type-filter-drop-down.component.ts @@ -1,6 +1,6 @@ import { SelectionModel } from '@angular/cdk/collections'; import { FlatTreeControl } from '@angular/cdk/tree'; -import { AfterViewInit, Component, EventEmitter, Output } from '@angular/core'; +import { AfterViewInit, Component, EventEmitter, Input, Output } from '@angular/core'; import { FormControl } from '@angular/forms'; import { MatTreeFlatDataSource, MatTreeFlattener } from '@angular/material/tree'; import { Observable } from 'rxjs'; @@ -21,20 +21,26 @@ export class FileTypeFilterDropDownComponent implements AfterViewInit { /** Map from nested node to flattened node. This helps us to keep the same object for selection */ nestedNodeMap = new Map<TreeNode, FlatTreeNode>(); - treeControl: FlatTreeControl<FlatTreeNode>; - treeFlattener: MatTreeFlattener<TreeNode, FlatTreeNode>; - dataSource: MatTreeFlatDataSource<TreeNode, FlatTreeNode>; /** The selection for checklist */ checklistSelection = new SelectionModel<FlatTreeNode>(true); filteredOptions = new Observable<string[]>(); - componentTypeControl = new FormControl<string[] | undefined>(undefined); + componentTypeControl = new FormControl<string | undefined>(undefined); @Output() fileTypeChange = new EventEmitter<string[]>(); + @Input() set setFileTypes(fileTypes: string[]) { + this.treeControl.dataNodes.forEach((node) => { + if (fileTypes.includes(node.item.value!)) { + this.itemSelectionToggle(node); + } + }); + this.populateSelectedItems(); + } + constructor(private fileTypeData: FileTypeDataSourceService) { this.treeFlattener = new MatTreeFlattener(this.transformer, this.getLevel, this.isExpandable, this.getChildren); this.treeControl = new FlatTreeControl<FlatTreeNode>(this.getLevel, this.isExpandable); @@ -85,8 +91,8 @@ export class FileTypeFilterDropDownComponent implements AfterViewInit { return result && !this.descendantsAllSelected(node); } - /** Toggle the to-do item selection. Select/deselect all the descendants node */ - todoItemSelectionToggle(node: FlatTreeNode): void { + /** Toggle the item selection. Select/deselect all the descendants node */ + itemSelectionToggle(node: FlatTreeNode): void { this.checklistSelection.toggle(node); const descendants = this.treeControl.getDescendants(node); this.checklistSelection.isSelected(node) @@ -98,8 +104,8 @@ export class FileTypeFilterDropDownComponent implements AfterViewInit { this.checkAllParentsSelection(node); } - /** Toggle a leaf to-do item selection. Check all the parents to see if they changed */ - todoLeafItemSelectionToggle(node: FlatTreeNode): void { + /** Toggle a leaf item selection. Check all the parents to see if they changed */ + leafItemSelectionToggle(node: FlatTreeNode): void { this.checklistSelection.toggle(node); this.checkAllParentsSelection(node); } @@ -111,6 +117,7 @@ export class FileTypeFilterDropDownComponent implements AfterViewInit { this.checkRootNodeSelection(parent); parent = this.getParentNodeAndChange(parent); } + this.populateSelectedItems(); } /** Check root node checked state and change it accordingly */ @@ -147,15 +154,13 @@ export class FileTypeFilterDropDownComponent implements AfterViewInit { return null; } - getSelectedItems(): string { - if (!this.checklistSelection.selected.length) { - return ''; - } - - return this.checklistSelection.selected + populateSelectedItems() { + const selectedItems = this.checklistSelection.selected .filter((selectedItem) => selectedItem.item.value !== null) .map((selectedItem) => selectedItem.item?.label) .join(', '); + + this.componentTypeControl.setValue(selectedItems); } filterChanged($event: any) { diff --git a/portal-frontend/src/app/features/public/search/public-search.component.html b/portal-frontend/src/app/features/public/search/public-search.component.html index 57f73e2a05..24747e1bc9 100644 --- a/portal-frontend/src/app/features/public/search/public-search.component.html +++ b/portal-frontend/src/app/features/public/search/public-search.component.html @@ -84,7 +84,7 @@ <h3>Search by one or more of the following fields:</h3> </div> <div> <label for="type">Type</label> - <app-file-type-filter-drop-down #fileTypeDropDown (fileTypeChange)="onFileTypeChange($event)" /> + <app-file-type-filter-drop-down #fileTypeDropDown [setFileTypes]='previousFileTypes' (fileTypeChange)="onFileTypeChange($event)" /> </div> <div> <label for="status">Status</label> @@ -110,7 +110,7 @@ <h3>Search by one or more of the following fields:</h3> </div> <div class="button-controls"> - <button type="button" mat-stroked-button color="accent" (click)="onReset()">Clear</button> + <button type="button" mat-stroked-button color="accent" (click)="onClear()">Clear</button> <button type="submit" mat-flat-button color="primary" [disabled]="formEmpty || !searchForm.valid">Search</button> </div> </form> diff --git a/portal-frontend/src/app/features/public/search/public-search.component.ts b/portal-frontend/src/app/features/public/search/public-search.component.ts index 552e4cdf3b..2bda1e44cf 100644 --- a/portal-frontend/src/app/features/public/search/public-search.component.ts +++ b/portal-frontend/src/app/features/public/search/public-search.component.ts @@ -30,6 +30,8 @@ const STATUS_MAP = { 'ALC Response Sent (SRW only)': 'ALCR', }; +const SEARCH_SESSION_STORAGE_KEY = 'search'; + @Component({ selector: 'app-public', templateUrl: './public-search.component.html', @@ -73,13 +75,14 @@ export class PublicSearchComponent implements OnInit, OnDestroy { government: this.localGovernmentControl, decisionMaker: new FormControl<string | undefined>(undefined), region: new FormControl<string[]>([]), - dateDecidedFrom: new FormControl(undefined), - dateDecidedTo: new FormControl(undefined), + dateDecidedFrom: new FormControl(), + dateDecidedTo: new FormControl(), }); localGovernments: LocalGovernmentDto[] = []; filteredLocalGovernments!: Observable<LocalGovernmentDto[]>; regions: ApplicationRegionDto[] = []; statuses: ApplicationStatusDto[] = []; + previousFileTypes: string[] = []; formEmpty = true; civicAddressInvalid = false; @@ -159,6 +162,13 @@ export class PublicSearchComponent implements OnInit, OnDestroy { startWith(''), map((value) => this.filterLocalGovernment(value || '')) ); + + const storedSearch = sessionStorage.getItem(SEARCH_SESSION_STORAGE_KEY); + if (storedSearch) { + const searchRequest: SearchRequestDto = JSON.parse(storedSearch); + this.populateForm(searchRequest); + this.onSubmit(); + } } ngOnDestroy(): void { @@ -168,6 +178,10 @@ export class PublicSearchComponent implements OnInit, OnDestroy { async onSubmit() { const searchParams = this.getSearchParams(); + + const searchDto = JSON.stringify(searchParams); + sessionStorage.setItem(SEARCH_SESSION_STORAGE_KEY, searchDto); + this.isLoading = true; const result = await this.searchService.search(searchParams); this.searchResultsHidden = false; @@ -205,8 +219,9 @@ export class PublicSearchComponent implements OnInit, OnDestroy { }, 500); } - onReset() { + onClear() { this.searchForm.reset(); + sessionStorage.removeItem(SEARCH_SESSION_STORAGE_KEY); this.isLoading = false; this.searchResultsHidden = true; @@ -395,4 +410,39 @@ export class PublicSearchComponent implements OnInit, OnDestroy { this.statuses = statuses; this.statuses.sort((a, b) => (a.label > b.label ? 1 : -1)); } + + private populateForm(storedSearch: SearchRequestDto) { + const { + componentType, + decisionMaker, + dateDecidedFrom, + pid, + fileNumber, + name, + dateDecidedTo, + region, + civicAddress, + government, + portalStatus, + } = this.searchForm.controls; + + decisionMaker.setValue(storedSearch.decisionMakerCode); + pid.setValue(storedSearch.pid); + fileNumber.setValue(storedSearch.fileNumber); + name.setValue(storedSearch.name); + region.setValue(storedSearch.regionCodes ?? null); + civicAddress.setValue(storedSearch.civicAddress); + government.setValue(storedSearch.governmentName); + portalStatus.setValue(storedSearch.portalStatusCodes ?? null); + + if (storedSearch.dateDecidedTo) { + dateDecidedTo.setValue(new Date(storedSearch.dateDecidedTo)); + } + if (storedSearch.dateDecidedFrom) { + dateDecidedFrom.setValue(new Date(storedSearch.dateDecidedFrom)); + } + this.previousFileTypes = storedSearch.fileTypes; + this.componentTypeControl.setValue(storedSearch.fileTypes); + this.formEmpty = false; + } } From 49df43ee20b0e0562156108e22250ba6f9f1be20 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Tue, 3 Oct 2023 10:53:45 -0700 Subject: [PATCH 446/954] Remove Updated Flags * Remove Flags * Remove Diff Calculations * Remove Library for Diff Calculations --- portal-frontend/package-lock.json | 11 ---- portal-frontend/package.json | 1 - .../alcs-edit-submission.component.html | 1 - .../alcs-edit-submission.component.ts | 13 ----- .../application-details.component.html | 50 ++----------------- .../application-details.component.ts | 2 - .../excl-details/excl-details.component.html | 5 -- .../excl-details/excl-details.component.ts | 1 - .../incl-details/incl-details.component.html | 5 -- .../incl-details/incl-details.component.ts | 1 - .../naru-details/naru-details.component.html | 26 ++-------- .../naru-details/naru-details.component.ts | 1 - .../nfu-details/nfu-details.component.html | 13 ++--- .../nfu-details/nfu-details.component.ts | 1 - .../parcel/parcel.component.html | 12 +---- .../parcel/parcel.component.ts | 34 ------------- .../pfrs-details/pfrs-details.component.html | 13 +---- .../pfrs-details/pfrs-details.component.ts | 1 - .../pofo-details/pofo-details.component.html | 12 +---- .../pofo-details/pofo-details.component.ts | 1 - .../roso-details/roso-details.component.html | 11 +--- .../roso-details/roso-details.component.ts | 1 - .../subd-details/subd-details.component.html | 5 -- .../subd-details/subd-details.component.ts | 1 - .../tur-details/tur-details.component.html | 4 -- .../tur-details/tur-details.component.ts | 1 - .../review-and-submit.component.html | 2 - .../review-and-submit.component.ts | 1 - .../alcs-edit-submission.component.html | 3 -- .../alcs-edit-submission.component.ts | 26 ---------- .../review-and-submit.component.html | 2 - .../review-and-submit.component.ts | 2 - .../additional-information.component.html | 11 ---- .../additional-information.component.ts | 1 - .../notice-of-intent-details.component.html | 27 ---------- .../notice-of-intent-details.component.ts | 2 - .../parcel/parcel.component.html | 12 +---- .../parcel/parcel.component.ts | 33 ------------ .../pfrs-details/pfrs-details.component.html | 42 ---------------- .../pfrs-details/pfrs-details.component.ts | 1 - .../pofo-details/pofo-details.component.html | 23 --------- .../pofo-details/pofo-details.component.ts | 1 - .../roso-details/roso-details.component.html | 41 +++------------ .../roso-details/roso-details.component.ts | 1 - .../parcel/parcel.component.ts | 1 - .../src/app/shared/shared.module.ts | 3 -- .../updated-banner.component.html | 3 -- .../updated-banner.component.scss | 11 ---- .../updated-banner.component.spec.ts | 24 --------- .../updated-banner.component.ts | 10 ---- 50 files changed, 27 insertions(+), 483 deletions(-) delete mode 100644 portal-frontend/src/app/shared/updated-banner/updated-banner.component.html delete mode 100644 portal-frontend/src/app/shared/updated-banner/updated-banner.component.scss delete mode 100644 portal-frontend/src/app/shared/updated-banner/updated-banner.component.spec.ts delete mode 100644 portal-frontend/src/app/shared/updated-banner/updated-banner.component.ts diff --git a/portal-frontend/package-lock.json b/portal-frontend/package-lock.json index 35abca53d6..e33fe2459b 100644 --- a/portal-frontend/package-lock.json +++ b/portal-frontend/package-lock.json @@ -21,7 +21,6 @@ "@bcgov/bc-sans": "^1.0.1", "jwt-decode": "^3.1.2", "ngx-mask": "^15.0.2", - "recursive-diff": "^1.0.9", "rxjs": "~7.5.0", "source-map-support": "^0.5.21", "tslib": "^2.4.1", @@ -13802,11 +13801,6 @@ "node": ">=8.10.0" } }, - "node_modules/recursive-diff": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/recursive-diff/-/recursive-diff-1.0.9.tgz", - "integrity": "sha512-5mqpskzvXDo5Vy29Vj8tH30a0+XBmY11aqWGoN/uB94UHRwndX2EuPvH+WtbqOYkrwAF718/lDo6U4CB1qSSqQ==" - }, "node_modules/reflect-metadata": { "version": "0.1.13", "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.13.tgz", @@ -26567,11 +26561,6 @@ "picomatch": "^2.2.1" } }, - "recursive-diff": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/recursive-diff/-/recursive-diff-1.0.9.tgz", - "integrity": "sha512-5mqpskzvXDo5Vy29Vj8tH30a0+XBmY11aqWGoN/uB94UHRwndX2EuPvH+WtbqOYkrwAF718/lDo6U4CB1qSSqQ==" - }, "reflect-metadata": { "version": "0.1.13", "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.13.tgz", diff --git a/portal-frontend/package.json b/portal-frontend/package.json index 0174516ac6..d206446381 100644 --- a/portal-frontend/package.json +++ b/portal-frontend/package.json @@ -26,7 +26,6 @@ "@bcgov/bc-sans": "^1.0.1", "jwt-decode": "^3.1.2", "ngx-mask": "^15.0.2", - "recursive-diff": "^1.0.9", "rxjs": "~7.5.0", "source-map-support": "^0.5.21", "tslib": "^2.4.1", diff --git a/portal-frontend/src/app/features/applications/alcs-edit-submission/alcs-edit-submission.component.html b/portal-frontend/src/app/features/applications/alcs-edit-submission/alcs-edit-submission.component.html index 08239e44da..00eae59b51 100644 --- a/portal-frontend/src/app/features/applications/alcs-edit-submission/alcs-edit-submission.component.html +++ b/portal-frontend/src/app/features/applications/alcs-edit-submission/alcs-edit-submission.component.html @@ -175,7 +175,6 @@ <h6 *ngIf="applicationSubmission"> <app-review-and-submit [$applicationSubmission]="$applicationSubmission" [$applicationDocuments]="$applicationDocuments" - [updatedFields]="updatedFields" [originalSubmissionUuid]="originalSubmissionUuid" [draftMode]="true" (exit)="onExit()" diff --git a/portal-frontend/src/app/features/applications/alcs-edit-submission/alcs-edit-submission.component.ts b/portal-frontend/src/app/features/applications/alcs-edit-submission/alcs-edit-submission.component.ts index 4ba097f60f..8ab2f8ffc6 100644 --- a/portal-frontend/src/app/features/applications/alcs-edit-submission/alcs-edit-submission.component.ts +++ b/portal-frontend/src/app/features/applications/alcs-edit-submission/alcs-edit-submission.component.ts @@ -2,7 +2,6 @@ import { StepperSelectionEvent } from '@angular/cdk/stepper'; import { AfterViewInit, Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; import { ActivatedRoute, Router } from '@angular/router'; -import { getDiff } from 'recursive-diff'; import { BehaviorSubject, combineLatest, Observable, of, Subject, takeUntil } from 'rxjs'; import { environment } from '../../../../environments/environment'; import { ApplicationDocumentDto } from '../../../services/application-document/application-document.dto'; @@ -51,7 +50,6 @@ export class AlcsEditSubmissionComponent implements OnInit, OnDestroy, AfterView expandedParcelUuid?: string; showValidationErrors = false; - updatedFields: string[] = []; @ViewChild('cdkStepper') public customStepper!: CustomStepperComponent; @@ -124,17 +122,6 @@ export class AlcsEditSubmissionComponent implements OnInit, OnDestroy, AfterView const originalSubmission = await this.applicationSubmissionService.getByFileId(fileId); if (originalSubmission) { this.originalSubmissionUuid = originalSubmission?.uuid; - - const diffResult = getDiff(originalSubmission, this.applicationSubmission); - const changedFields = new Set<string>(); - for (const diff of diffResult) { - const fullPath = diff.path.join('.'); - if (!fullPath.toLowerCase().includes('uuid') || fullPath === 'localGovernmentUuid') { - changedFields.add(diff.path.join('.')); - changedFields.add(diff.path[0].toString()); - } - } - this.updatedFields = [...changedFields.keys()]; } } diff --git a/portal-frontend/src/app/features/applications/application-details/application-details.component.html b/portal-frontend/src/app/features/applications/application-details/application-details.component.html index 2f5be9b6fc..31226669e8 100644 --- a/portal-frontend/src/app/features/applications/application-details/application-details.component.html +++ b/portal-frontend/src/app/features/applications/application-details/application-details.component.html @@ -4,7 +4,6 @@ [$applicationSubmission]="$application" [showErrors]="showErrors" [showEdit]="showEdit" - [originalSubmissionUuid]="originalSubmissionUuid" ></app-parcel> </section> <section> @@ -14,14 +13,12 @@ [showEdit]="showEdit" [parcelType]="parcelType.OTHER" [draftMode]="draftMode" - [originalSubmissionUuid]="originalSubmissionUuid" ></app-parcel> </section> <section> <h3>3. Primary Contact</h3> <app-warning-banner *ngIf="draftMode" class="full-row"> Changes made to this section will not be flagged as - <app-updated-banner></app-updated-banner> - ensure accuracy before saving. </app-warning-banner> <div *ngIf="applicationSubmission" class="review-table"> <div class="subheading2 grid-1">Type</div> @@ -91,10 +88,7 @@ <h3>3. Primary Contact</h3> <section> <h3>4. Government</h3> <div *ngIf="applicationSubmission" class="review-table"> - <div class="subheading2 grid-1"> - Local or First Nation Government - <app-updated-banner *ngIf="updatedFields.includes('localGovernmentUuid')"></app-updated-banner> - </div> + <div class="subheading2 grid-1">Local or First Nation Government</div> <div class="grid-double"> {{ localGovernment?.name }} <app-no-data [showRequired]="showErrors" *ngIf="!localGovernment"></app-no-data> @@ -126,10 +120,7 @@ <h3>5. Land Use</h3> <div class="full-width"> <h4>Land Use of Parcel(s) under Application</h4> </div> - <div class="subheading2 grid-1"> - Describe all agriculture that currently takes place on the parcel(s). - <app-updated-banner *ngIf="updatedFields.includes('parcelsAgricultureDescription')"></app-updated-banner> - </div> + <div class="subheading2 grid-1">Describe all agriculture that currently takes place on the parcel(s).</div> <div class="grid-double"> {{ applicationSubmission.parcelsAgricultureDescription }} <app-no-data @@ -137,12 +128,7 @@ <h4>Land Use of Parcel(s) under Application</h4> *ngIf="!applicationSubmission.parcelsAgricultureDescription" ></app-no-data> </div> - <div class="subheading2 grid-1"> - Describe all agricultural improvements made to the parcel(s). - <app-updated-banner - *ngIf="updatedFields.includes('parcelsAgricultureImprovementDescription')" - ></app-updated-banner> - </div> + <div class="subheading2 grid-1">Describe all agricultural improvements made to the parcel(s).</div> <div class="grid-double"> {{ applicationSubmission.parcelsAgricultureImprovementDescription }} <app-no-data @@ -150,10 +136,7 @@ <h4>Land Use of Parcel(s) under Application</h4> *ngIf="!applicationSubmission.parcelsAgricultureImprovementDescription" ></app-no-data> </div> - <div class="subheading2 grid-1"> - Describe all other uses that currently take place on the parcel(s). - <app-updated-banner *ngIf="updatedFields.includes('parcelsNonAgricultureUseDescription')"></app-updated-banner> - </div> + <div class="subheading2 grid-1">Describe all other uses that currently take place on the parcel(s).</div> <div class="grid-double"> {{ applicationSubmission.parcelsNonAgricultureUseDescription }} <app-no-data @@ -162,21 +145,7 @@ <h4>Land Use of Parcel(s) under Application</h4> ></app-no-data> </div> <div class="full-width"> - <h4> - Land Use of Adjacent Parcels - <app-updated-banner - *ngIf=" - updatedFields.includes('northLandUseType') || - updatedFields.includes('northLandUseTypeDescription') || - updatedFields.includes('eastLandUseType') || - updatedFields.includes('eastLandUseTypeDescription') || - updatedFields.includes('southLandUseType') || - updatedFields.includes('southLandUseTypeDescription') || - updatedFields.includes('westLandUseType') || - updatedFields.includes('westLandUseTypeDescription') - " - ></app-updated-banner> - </h4> + <h4>Land Use of Adjacent Parcels</h4> </div> <div class="adjacent-parcels full-width"> <div class="grid-1 subheading2"></div> @@ -245,7 +214,6 @@ <h3>6. Proposal</h3> [draftMode]="draftMode" [applicationSubmission]="applicationSubmission" [applicationDocuments]="appDocuments" - [updatedFields]="updatedFields" ></app-nfu-details> <app-tur-details *ngIf="applicationSubmission.typeCode === 'TURP'" @@ -254,7 +222,6 @@ <h3>6. Proposal</h3> [draftMode]="draftMode" [applicationSubmission]="applicationSubmission" [applicationDocuments]="appDocuments" - [updatedFields]="updatedFields" ></app-tur-details> <app-subd-details *ngIf="applicationSubmission.typeCode === 'SUBD'" @@ -263,7 +230,6 @@ <h3>6. Proposal</h3> [draftMode]="draftMode" [applicationSubmission]="applicationSubmission" [applicationDocuments]="appDocuments" - [updatedFields]="updatedFields" ></app-subd-details> <app-roso-details *ngIf="applicationSubmission.typeCode === 'ROSO'" @@ -272,7 +238,6 @@ <h3>6. Proposal</h3> [draftMode]="draftMode" [applicationSubmission]="applicationSubmission" [applicationDocuments]="appDocuments" - [updatedFields]="updatedFields" ></app-roso-details> <app-pofo-details *ngIf="applicationSubmission.typeCode === 'POFO'" @@ -281,7 +246,6 @@ <h3>6. Proposal</h3> [draftMode]="draftMode" [applicationSubmission]="applicationSubmission" [applicationDocuments]="appDocuments" - [updatedFields]="updatedFields" ></app-pofo-details> <app-pfrs-details *ngIf="applicationSubmission.typeCode === 'PFRS'" @@ -290,7 +254,6 @@ <h3>6. Proposal</h3> [draftMode]="draftMode" [applicationSubmission]="applicationSubmission" [applicationDocuments]="appDocuments" - [updatedFields]="updatedFields" ></app-pfrs-details> <app-naru-details *ngIf="applicationSubmission.typeCode === 'NARU'" @@ -299,7 +262,6 @@ <h3>6. Proposal</h3> [draftMode]="draftMode" [applicationSubmission]="applicationSubmission" [applicationDocuments]="appDocuments" - [updatedFields]="updatedFields" ></app-naru-details> <app-excl-details *ngIf="applicationSubmission.typeCode === 'EXCL'" @@ -308,7 +270,6 @@ <h3>6. Proposal</h3> [draftMode]="draftMode" [applicationSubmission]="applicationSubmission" [applicationDocuments]="appDocuments" - [updatedFields]="updatedFields" ></app-excl-details> <app-incl-details *ngIf="applicationSubmission.typeCode === 'INCL'" @@ -317,7 +278,6 @@ <h3>6. Proposal</h3> [draftMode]="draftMode" [applicationSubmission]="applicationSubmission" [applicationDocuments]="appDocuments" - [updatedFields]="updatedFields" ></app-incl-details> </section> <section> diff --git a/portal-frontend/src/app/features/applications/application-details/application-details.component.ts b/portal-frontend/src/app/features/applications/application-details/application-details.component.ts index da184ade67..caee7943f2 100644 --- a/portal-frontend/src/app/features/applications/application-details/application-details.component.ts +++ b/portal-frontend/src/app/features/applications/application-details/application-details.component.ts @@ -24,8 +24,6 @@ export class ApplicationDetailsComponent implements OnInit, OnDestroy { @Input() showErrors = true; @Input() showEdit = true; @Input() draftMode = false; - @Input() originalSubmissionUuid = ''; - @Input() updatedFields: string[] = []; parcelType = PARCEL_TYPE; applicationSubmission: ApplicationSubmissionDetailedDto | undefined; diff --git a/portal-frontend/src/app/features/applications/application-details/excl-details/excl-details.component.html b/portal-frontend/src/app/features/applications/application-details/excl-details/excl-details.component.html index e18b40cc8a..93239ba778 100644 --- a/portal-frontend/src/app/features/applications/application-details/excl-details/excl-details.component.html +++ b/portal-frontend/src/app/features/applications/application-details/excl-details/excl-details.component.html @@ -1,7 +1,6 @@ <div *ngIf="_applicationSubmission" class="review-table"> <div class="subheading2 grid-1"> The governmental or prescribed public body that is applying to exclude land - <app-updated-banner *ngIf="updatedFields.includes('inclExclHectares')"></app-updated-banner> </div> <div class="grid-double"> {{ _applicationSubmission.prescribedBody }} @@ -9,7 +8,6 @@ <div class="subheading2 grid-1"> How many hectares are you proposing to exclude? (hectares) - <app-updated-banner *ngIf="updatedFields.includes('inclExclHectares')"></app-updated-banner> </div> <div class="grid-double"> {{ _applicationSubmission.inclExclHectares }} @@ -18,7 +16,6 @@ <div class="subheading2 grid-1"> Does any land under application share a common property line with land in another Local or First Nation Government? - <app-updated-banner *ngIf="updatedFields.includes('exclShareGovernmentBorders')"></app-updated-banner> </div> <div class="grid-double"> <span *ngIf="_applicationSubmission.exclShareGovernmentBorders !== null"> @@ -32,7 +29,6 @@ <div class="subheading2 grid-1"> What is the purpose of the proposal? - <app-updated-banner *ngIf="updatedFields.includes('purpose')"></app-updated-banner> </div> <div class="grid-double"> {{ _applicationSubmission.purpose }} @@ -41,7 +37,6 @@ <div class="subheading2 grid-1"> Explain why you believe that the parcel(s) should be excluded from the ALR - <app-updated-banner *ngIf="updatedFields.includes('exclWhyLand')"></app-updated-banner> </div> <div class="grid-double"> {{ _applicationSubmission.exclWhyLand }} diff --git a/portal-frontend/src/app/features/applications/application-details/excl-details/excl-details.component.ts b/portal-frontend/src/app/features/applications/application-details/excl-details/excl-details.component.ts index cb7cd34589..3ca125515e 100644 --- a/portal-frontend/src/app/features/applications/application-details/excl-details/excl-details.component.ts +++ b/portal-frontend/src/app/features/applications/application-details/excl-details/excl-details.component.ts @@ -14,7 +14,6 @@ export class ExclDetailsComponent { @Input() showErrors = true; @Input() showEdit = true; @Input() draftMode = false; - @Input() updatedFields: string[] = []; _applicationSubmission: ApplicationSubmissionDetailedDto | undefined; diff --git a/portal-frontend/src/app/features/applications/application-details/incl-details/incl-details.component.html b/portal-frontend/src/app/features/applications/application-details/incl-details/incl-details.component.html index 3798981d3e..c09495adf7 100644 --- a/portal-frontend/src/app/features/applications/application-details/incl-details/incl-details.component.html +++ b/portal-frontend/src/app/features/applications/application-details/incl-details/incl-details.component.html @@ -1,7 +1,6 @@ <div *ngIf="_applicationSubmission" class="review-table"> <div class="subheading2 grid-1"> How many hectares are you proposing to include? (hectares) - <app-updated-banner *ngIf="updatedFields.includes('inclExclHectares')"></app-updated-banner> </div> <div class="grid-double"> {{ _applicationSubmission.inclExclHectares }} @@ -10,7 +9,6 @@ <div class="subheading2 grid-1"> What is the purpose of the proposal? - <app-updated-banner *ngIf="updatedFields.includes('purpose')"></app-updated-banner> </div> <div class="grid-double"> {{ _applicationSubmission.purpose }} @@ -19,7 +17,6 @@ <div class="subheading2 grid-1"> Does the proposal support agriculture in the short or long term? - <app-updated-banner *ngIf="updatedFields.includes('inclAgricultureSupport')"></app-updated-banner> </div> <div class="grid-double"> {{ _applicationSubmission.inclAgricultureSupport }} @@ -28,7 +25,6 @@ <div class="subheading2 grid-1"> Describe any improvements that have been made to, or are planned for the parcel proposed for inclusion. - <app-updated-banner *ngIf="updatedFields.includes('inclImprovements')"></app-updated-banner> </div> <div class="grid-double"> {{ _applicationSubmission.inclImprovements }} @@ -46,7 +42,6 @@ <ng-container *ngIf="_applicationSubmission.inclGovernmentOwnsAllParcels !== null || isGovernmentCreator"> <div class="subheading2 grid-1"> Is the {{ governmentName }} the registered land owner of all parcels under this inclusion application? - <app-updated-banner *ngIf="updatedFields.includes('inclGovernmentOwnsAllParcels')"></app-updated-banner> </div> <div class="grid-double"> <span *ngIf="_applicationSubmission.inclGovernmentOwnsAllParcels !== null"> diff --git a/portal-frontend/src/app/features/applications/application-details/incl-details/incl-details.component.ts b/portal-frontend/src/app/features/applications/application-details/incl-details/incl-details.component.ts index 758c5d32fd..b303ec6af8 100644 --- a/portal-frontend/src/app/features/applications/application-details/incl-details/incl-details.component.ts +++ b/portal-frontend/src/app/features/applications/application-details/incl-details/incl-details.component.ts @@ -18,7 +18,6 @@ export class InclDetailsComponent implements OnInit, OnDestroy { @Input() showErrors = true; @Input() showEdit = true; @Input() draftMode = false; - @Input() updatedFields: string[] = []; governmentName = 'applying government'; diff --git a/portal-frontend/src/app/features/applications/application-details/naru-details/naru-details.component.html b/portal-frontend/src/app/features/applications/application-details/naru-details/naru-details.component.html index 6839f37024..b8f0898e71 100644 --- a/portal-frontend/src/app/features/applications/application-details/naru-details/naru-details.component.html +++ b/portal-frontend/src/app/features/applications/application-details/naru-details/naru-details.component.html @@ -1,7 +1,6 @@ <div *ngIf="_applicationSubmission" class="review-table"> <div class="subheading2 grid-1"> Selected Subtype: - <app-updated-banner *ngIf="updatedFields.includes('naruSubtype')"></app-updated-banner> </div> <div class="grid-double"> <span *ngIf="_applicationSubmission.naruSubtype !== null"> @@ -12,7 +11,6 @@ <div class="subheading2 grid-1"> What is the purpose of the proposal? - <app-updated-banner *ngIf="updatedFields.includes('purpose')"></app-updated-banner> </div> <div class="grid-double"> {{ _applicationSubmission.purpose }} @@ -22,7 +20,6 @@ <ng-container *ngIf="_applicationSubmission.naruSubtype?.code === 'ARFU'"> <div class="subheading2 grid-1"> What is the total floor area (m<sup>2</sup>) of the proposed additional residence? - <app-updated-banner *ngIf="updatedFields.includes('naruFloorArea')"></app-updated-banner> </div> <div class="grid-double"> {{ _applicationSubmission.naruFloorArea }} @@ -32,7 +29,6 @@ <div class="subheading2 grid-1"> Describe the necessity for an additional residence for farm use and how it will support agriculture in the short or long term. - <app-updated-banner *ngIf="updatedFields.includes('naruResidenceNecessity')"></app-updated-banner> </div> <div class="grid-double"> {{ _applicationSubmission.naruResidenceNecessity }} @@ -41,7 +37,6 @@ <div class="subheading2 grid-1"> Describe the rationale for the proposed location of the additional residence. - <app-updated-banner *ngIf="updatedFields.includes('naruLocationRationale')"></app-updated-banner> </div> <div class="grid-double"> {{ _applicationSubmission.naruLocationRationale }} @@ -51,7 +46,6 @@ <div class="subheading2 grid-1"> Provide the total area (m<sup>2</sup>) and a description of infrastructure necessary to support the additional residence. - <app-updated-banner *ngIf="updatedFields.includes('naruInfrastructure')"></app-updated-banner> </div> <div class="grid-double"> {{ _applicationSubmission.naruInfrastructure }} @@ -62,7 +56,6 @@ <ng-container *ngIf="_applicationSubmission.naruSubtype?.code === 'PRIN'"> <div class="subheading2 grid-1"> What is the total floor area (m<sup>2</sup>) of the proposed principal residence? - <app-updated-banner *ngIf="updatedFields.includes('naruFloorArea')"></app-updated-banner> </div> <div class="grid-double"> {{ _applicationSubmission.naruFloorArea }} @@ -72,7 +65,6 @@ <div class="subheading2 grid-1"> Describe how the proposal for a principal residence more than 500 m<sup>2</sup> will support agriculture in the short or long term. - <app-updated-banner *ngIf="updatedFields.includes('naruResidenceNecessity')"></app-updated-banner> </div> <div class="grid-double"> {{ _applicationSubmission.naruResidenceNecessity }} @@ -81,7 +73,6 @@ <div class="subheading2 grid-1"> Describe the rationale for the proposed location of the principal residence. - <app-updated-banner *ngIf="updatedFields.includes('naruLocationRationale')"></app-updated-banner> </div> <div class="grid-double"> {{ _applicationSubmission.naruLocationRationale }} @@ -91,7 +82,6 @@ <div class="subheading2 grid-1"> Provide the total area (m<sup>2</sup>) and a description of infrastructure necessary to support the additional residence. - <app-updated-banner *ngIf="updatedFields.includes('naruInfrastructure')"></app-updated-banner> </div> <div class="grid-double"> {{ _applicationSubmission.naruInfrastructure }} @@ -102,7 +92,6 @@ <ng-container *ngIf="_applicationSubmission.naruSubtype?.code === 'TOUR'"> <div class="subheading2 grid-1"> What is the total floor area (m<sup>2</sup>) of the proposed accommodation? - <app-updated-banner *ngIf="updatedFields.includes('naruFloorArea')"></app-updated-banner> </div> <div class="grid-double"> {{ _applicationSubmission.naruFloorArea }} @@ -111,7 +100,6 @@ <div class="subheading2 grid-1"> How many "sleeping units" in total are proposed? - <app-updated-banner *ngIf="updatedFields.includes('naruSleepingUnits')"></app-updated-banner> </div> <div class="grid-double"> {{ _applicationSubmission.naruSleepingUnits }} @@ -120,7 +108,6 @@ <div class="subheading2 grid-1"> Describe how the proposal for tourism accommodation will support agriculture in the short or long term. - <app-updated-banner *ngIf="updatedFields.includes('naruResidenceNecessity')"></app-updated-banner> </div> <div class="grid-double"> {{ _applicationSubmission.naruResidenceNecessity }} @@ -129,7 +116,6 @@ <div class="subheading2 grid-1"> Describe the rationale for the proposed location of the tourism accommodation. - <app-updated-banner *ngIf="updatedFields.includes('naruLocationRationale')"></app-updated-banner> </div> <div class="grid-double"> {{ _applicationSubmission.naruLocationRationale }} @@ -139,7 +125,6 @@ <div class="subheading2 grid-1"> Provide the total area (m<sup>2</sup>) and a description of infrastructure necessary to support the tourism accommodation. - <app-updated-banner *ngIf="updatedFields.includes('naruInfrastructure')"></app-updated-banner> </div> <div class="grid-double"> {{ _applicationSubmission.naruInfrastructure }} @@ -148,7 +133,6 @@ <div class="subheading2 grid-1"> Describe any agri-tourism that is currently taking place on the property. - <app-updated-banner *ngIf="updatedFields.includes('naruAgriTourism')"></app-updated-banner> </div> <div class="grid-double"> {{ _applicationSubmission.naruAgriTourism }} @@ -159,7 +143,6 @@ <div class="subheading2 grid-1"> Describe the total floor area (m<sup>2</sup>), type, number, and occupancy of all residential structures currently located on the property. - <app-updated-banner *ngIf="updatedFields.includes('naruExistingStructures')"></app-updated-banner> </div> <div class="grid-double"> {{ _applicationSubmission.naruExistingStructures }} @@ -176,7 +159,6 @@ <div class="subheading2 grid-1"> Do you need to import any fill to construct or conduct the proposed non-adhering residential use? - <app-updated-banner *ngIf="updatedFields.includes('naruWillImportFill')"></app-updated-banner> </div> <div class="grid-double"> <span *ngIf="_applicationSubmission.naruWillImportFill !== null">{{ @@ -188,7 +170,6 @@ <ng-container *ngIf="_applicationSubmission.naruWillImportFill"> <div class="subheading2 grid-1"> Describe the type and amount of fill proposed to be placed. - <app-updated-banner *ngIf="updatedFields.includes('naruFillType')"></app-updated-banner> </div> <div class="grid-double"> {{ _applicationSubmission.naruFillType }} @@ -197,7 +178,6 @@ <div class="subheading2 grid-1"> Briefly describe the origin and quality of fill. - <app-updated-banner *ngIf="updatedFields.includes('naruFillOrigin')"></app-updated-banner> </div> <div class="grid-double"> {{ _applicationSubmission.naruFillOrigin }} @@ -205,7 +185,7 @@ </div> <div class="subheading1 full-width"> - Fill to be Placed <app-updated-banner *ngIf="updatedFields.includes('naruToPlaceVolume')"></app-updated-banner> + Fill to be Placed </div> <div class="full-width soil-table"> <div class="grid-1"><strong>Volume</strong></div> @@ -247,14 +227,14 @@ <span class="subheading1">Project Duration</span> </div> <div class="subheading2 grid-1"> - Duration <app-updated-banner *ngIf="updatedFields.includes('naruProjectDurationUnit')"></app-updated-banner> + Duration </div> <div class="grid-double"> {{ _applicationSubmission.naruProjectDurationUnit }} <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.naruProjectDurationUnit"></app-no-data> </div> <div class="subheading2 grid-1"> - Length <app-updated-banner *ngIf="updatedFields.includes('naruProjectDurationAmount')"></app-updated-banner> + Length </div> <div class="grid-double"> {{ _applicationSubmission.naruProjectDurationAmount }} diff --git a/portal-frontend/src/app/features/applications/application-details/naru-details/naru-details.component.ts b/portal-frontend/src/app/features/applications/application-details/naru-details/naru-details.component.ts index 50b6c278e4..104949081f 100644 --- a/portal-frontend/src/app/features/applications/application-details/naru-details/naru-details.component.ts +++ b/portal-frontend/src/app/features/applications/application-details/naru-details/naru-details.component.ts @@ -14,7 +14,6 @@ export class NaruDetailsComponent { @Input() showErrors = true; @Input() showEdit = true; @Input() draftMode = false; - @Input() updatedFields: string[] = []; _applicationSubmission: ApplicationSubmissionDetailedDto | undefined; diff --git a/portal-frontend/src/app/features/applications/application-details/nfu-details/nfu-details.component.html b/portal-frontend/src/app/features/applications/application-details/nfu-details/nfu-details.component.html index c2a2af1d48..6ddf25eab0 100644 --- a/portal-frontend/src/app/features/applications/application-details/nfu-details/nfu-details.component.html +++ b/portal-frontend/src/app/features/applications/application-details/nfu-details/nfu-details.component.html @@ -1,14 +1,12 @@ <div *ngIf="applicationSubmission" class="review-table"> <div class="subheading2 grid-1"> How many hectares are proposed for non-farm use? (hectares) - <app-updated-banner *ngIf="updatedFields.includes('nfuHectares')"></app-updated-banner> </div> <div class="grid-double"> {{ applicationSubmission.nfuHectares }} </div> <div class="subheading2 grid-1"> What is the purpose of the proposal? - <app-updated-banner *ngIf="updatedFields.includes('purpose')"></app-updated-banner> </div> <div class="grid-double"> {{ applicationSubmission.purpose }} @@ -17,7 +15,6 @@ </div> <div class="subheading2 grid-1"> Could this proposal be accommodated on lands outside of the ALR? - <app-updated-banner *ngIf="updatedFields.includes('nfuOutsideLands')"></app-updated-banner> </div> <div class="grid-double"> {{ applicationSubmission.nfuOutsideLands }} @@ -25,7 +22,6 @@ </div> <div class="subheading2 grid-1"> Does the proposal support agriculture in the short or long term? - <app-updated-banner *ngIf="updatedFields.includes('nfuAgricultureSupport')"></app-updated-banner> </div> <div class="grid-double"> {{ applicationSubmission.nfuAgricultureSupport }} @@ -40,7 +36,6 @@ </div> <div class="subheading2 grid-1"> Do you need to import any fill to construct or conduct the proposed non-farm use? - <app-updated-banner *ngIf="updatedFields.includes('nfuWillImportFill')"></app-updated-banner> </div> <div class="grid-double"> <span *ngIf="applicationSubmission.nfuWillImportFill !== null">{{ @@ -57,7 +52,6 @@ <h4>Soil and Fill Components</h4> </div> <div class="subheading2 grid-1"> Describe the type and amount of fill proposed to be placed. - <app-updated-banner *ngIf="updatedFields.includes('nfuFillTypeDescription')"></app-updated-banner> </div> <div class="grid-double"> {{ applicationSubmission.nfuFillTypeDescription }} @@ -65,14 +59,13 @@ <h4>Soil and Fill Components</h4> </div> <div class="subheading2 grid-1"> Briefly describe the origin and quality of fill. - <app-updated-banner *ngIf="updatedFields.includes('nfuFillOriginDescription')"></app-updated-banner> </div> <div class="grid-double"> {{ applicationSubmission.nfuFillOriginDescription }} <app-no-data [showRequired]="showErrors" *ngIf="!applicationSubmission.nfuFillOriginDescription"></app-no-data> </div> <div class="subheading1 full-width"> - Fill to be Placed <app-updated-banner *ngIf="updatedFields.includes('nfuToPlaceVolume')"></app-updated-banner> + Fill to be Placed </div> <div class="full-width soil-table"> <div class="grid-1"><strong>Volume</strong></div> @@ -110,14 +103,14 @@ <h4>Soil and Fill Components</h4> <span class="subheading1">Project Duration</span> </div> <div class="subheading2 grid-1"> - Duration <app-updated-banner *ngIf="updatedFields.includes('nfuProjectDurationUnit')"></app-updated-banner> + Duration </div> <div class="grid-double"> {{ applicationSubmission.nfuProjectDurationUnit }} <app-no-data [showRequired]="showErrors" *ngIf="!applicationSubmission.nfuProjectDurationUnit"></app-no-data> </div> <div class="subheading2 grid-1"> - Length <app-updated-banner *ngIf="updatedFields.includes('nfuProjectDurationAmount')"></app-updated-banner> + Length </div> <div class="grid-double"> {{ applicationSubmission.nfuProjectDurationAmount }} diff --git a/portal-frontend/src/app/features/applications/application-details/nfu-details/nfu-details.component.ts b/portal-frontend/src/app/features/applications/application-details/nfu-details/nfu-details.component.ts index 2479a231f3..8284bf74e9 100644 --- a/portal-frontend/src/app/features/applications/application-details/nfu-details/nfu-details.component.ts +++ b/portal-frontend/src/app/features/applications/application-details/nfu-details/nfu-details.component.ts @@ -15,7 +15,6 @@ export class NfuDetailsComponent { @Input() showErrors = true; @Input() showEdit = true; @Input() draftMode = false; - @Input() updatedFields: string[] = []; proposalMap: ApplicationDocumentDto[] = []; @Input() set applicationDocuments(documents: ApplicationDocumentDto[]) { diff --git a/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.html b/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.html index 78fb8e448f..d71b6b362b 100644 --- a/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.html +++ b/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.html @@ -34,7 +34,6 @@ <h4> <div class="full-width subheading1">Parcel Information</div> <div class="subheading2 grid-1"> Ownership Type - <app-updated-banner *ngIf="updatedFields.includes(parcelInd + '.ownershipTypeCode')"></app-updated-banner> </div> <div class="grid-double"> {{ parcel.ownershipType?.label }} @@ -42,7 +41,6 @@ <h4> </div> <div class="subheading2 grid-1"> Legal Description - <app-updated-banner *ngIf="updatedFields.includes(parcelInd + '.legalDescription')"></app-updated-banner> </div> <div class="grid-double"> {{ parcel.legalDescription }} @@ -53,7 +51,6 @@ <h4> </div> <div class="subheading2 grid-1"> Area (Hectares) - <app-updated-banner *ngIf="updatedFields.includes(parcelInd + '.mapAreaHectares')"></app-updated-banner> </div> <div class="grid-double"> {{ parcel.mapAreaHectares }} @@ -64,7 +61,6 @@ <h4> </div> <div class="subheading2 grid-1"> PID {{ parcel.ownershipType?.code === PARCEL_OWNERSHIP_TYPES.CROWN ? '(optional)' : '' }} - <app-updated-banner *ngIf="updatedFields.includes(parcelInd + '.pid')"></app-updated-banner> </div> <div class="grid-double"> <span *ngIf="parcel.pid">{{ parcel.pid | mask : '000-000-000' }}</span> @@ -75,7 +71,7 @@ <h4> </div> <ng-container *ngIf="parcel.ownershipType?.code === PARCEL_OWNERSHIP_TYPES.CROWN"> <div class="subheading2 grid-1"> - PIN (optional)<app-updated-banner *ngIf="updatedFields.includes(parcelInd + '.pin')"></app-updated-banner> + PIN (optional) </div> <div class="grid-double"> {{ parcel.pin }} @@ -88,7 +84,6 @@ <h4> <ng-container *ngIf="parcel.ownershipType?.code === PARCEL_OWNERSHIP_TYPES.FEE_SIMPLE"> <div class="subheading2 grid-1"> Purchase Date - <app-updated-banner *ngIf="updatedFields.includes(parcelInd + '.purchasedDate')"></app-updated-banner> </div> <div class="grid-double"> {{ parcel.purchasedDate | date }} @@ -101,7 +96,6 @@ <h4> </ng-container> <div class="subheading2 grid-1"> Farm Classification - <app-updated-banner *ngIf="updatedFields.includes(parcelInd + '.isFarm')"></app-updated-banner> </div> <div class="grid-double"> <span *ngIf="parcel.isFarm !== null">{{ parcel.isFarm ? 'Yes' : 'No' }}</span> @@ -109,7 +103,6 @@ <h4> </div> <div class="subheading2 grid-1"> Civic Address - <app-updated-banner *ngIf="updatedFields.includes(parcelInd + '.civicAddress')"></app-updated-banner> </div> <div class="grid-double"> {{ parcel.civicAddress }} @@ -124,7 +117,6 @@ <h4> </ng-container> <div *ngIf="showCertificateOfTitle" class="subheading2 grid-1"> Certificate Of Title - <app-updated-banner *ngIf="updatedFields.includes(parcelInd + '.certificateOfTitle.uuid')"></app-updated-banner> </div> <div *ngIf="showCertificateOfTitle" class="grid-double"> <div *ngIf="parcel.certificateOfTitle"> @@ -136,7 +128,7 @@ <h4> ></app-no-data> </div> <div class="full-width subheading1"> - Owner Information <app-updated-banner *ngIf="updatedFields.includes(parcelInd + '.owners')"></app-updated-banner> + Owner Information </div> <div class="full-width owner-information"> <div class="subheading2">Type</div> diff --git a/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.ts b/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.ts index e06e3389d8..d7eb413003 100644 --- a/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.ts +++ b/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.ts @@ -1,6 +1,5 @@ import { Component, Input } from '@angular/core'; import { Router } from '@angular/router'; -import { getDiff } from 'recursive-diff'; import { BehaviorSubject, Subject, takeUntil } from 'rxjs'; import { ApplicationDocumentDto } from '../../../../services/application-document/application-document.dto'; import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; @@ -53,7 +52,6 @@ export class ParcelComponent { $destroy = new Subject<void>(); @Input() $applicationSubmission!: BehaviorSubject<ApplicationSubmissionDetailedDto | undefined>; - @Input() originalSubmissionUuid: string | undefined; @Input() showErrors = true; @Input() showEdit = true; @Input() draftMode = false; @@ -70,7 +68,6 @@ export class ParcelComponent { submissionUuid = ''; parcels: ApplicationParcelExtended[] = []; application!: ApplicationSubmissionDetailedDto; - updatedFields: string[] = []; constructor( private applicationParcelService: ApplicationParcelService, @@ -106,37 +103,6 @@ export class ParcelComponent { this.parcels = parcels .filter((p) => p.parcelType === this.parcelType) .map((p) => ({ ...p, isFarmText: formatBooleanToYesNoString(p.isFarm) })); - - if (this.originalSubmissionUuid) { - await this.calculateParcelDiffs(this.originalSubmissionUuid); - } - } - - private async calculateParcelDiffs(originalSubmissionUuid: string) { - const oldParcels = await this.applicationParcelService.fetchBySubmissionUuid(originalSubmissionUuid); - if (oldParcels) { - const oldTypedParcels = oldParcels.filter((p) => p.parcelType === this.parcelType); - const diffResult = getDiff(oldTypedParcels, this.parcels); - const changedFields = new Set<string>(); - for (const diff of diffResult) { - const partialPath = []; - const fullPath = diff.path.join('.'); - if (!fullPath.toLowerCase().includes('uuid')) { - for (const path of diff.path) { - if (typeof path !== 'string' || !path.includes('Uuid')) { - partialPath.push(path); - changedFields.add(partialPath.join('.')); - } - } - if ((diff.op = 'add') && typeof diff.val === 'object') { - for (const key of Object.keys(diff.val)) { - changedFields.add(`${diff.path.join('.')}.${key}`); - } - } - } - } - this.updatedFields = [...changedFields.keys()]; - } } private async validateParcelDetails() { diff --git a/portal-frontend/src/app/features/applications/application-details/pfrs-details/pfrs-details.component.html b/portal-frontend/src/app/features/applications/application-details/pfrs-details/pfrs-details.component.html index 07e799d934..0dd9d91175 100644 --- a/portal-frontend/src/app/features/applications/application-details/pfrs-details/pfrs-details.component.html +++ b/portal-frontend/src/app/features/applications/application-details/pfrs-details/pfrs-details.component.html @@ -1,7 +1,6 @@ <div *ngIf="_applicationSubmission" class="review-table"> <div class="subheading2 grid-1"> Has the ALC previously received an application or Notice of Intent for this proposal? - <app-updated-banner *ngIf="updatedFields.includes('soilIsFollowUp')"></app-updated-banner> </div> <div class="grid-double"> <span *ngIf="_applicationSubmission.soilIsFollowUp !== null"> @@ -12,7 +11,6 @@ <div *ngIf="_applicationSubmission.soilIsFollowUp" class="subheading2 grid-1"> Application or NOI ID - <app-updated-banner *ngIf="updatedFields.includes('soilFollowUpIDs')"></app-updated-banner> </div> <div *ngIf="_applicationSubmission.soilIsFollowUp" class="grid-double"> {{ _applicationSubmission.soilFollowUpIDs }} @@ -21,7 +19,6 @@ <div class="subheading2 grid-1"> What is the purpose of the proposal? - <app-updated-banner *ngIf="updatedFields.includes('purpose')"></app-updated-banner> </div> <div class="grid-double"> {{ _applicationSubmission.purpose }} @@ -176,14 +173,14 @@ <span class="subheading1">Project Duration</span> </div> <div class="subheading2 grid-1"> - Duration <app-updated-banner *ngIf="updatedFields.includes('soilProjectDurationUnit')"></app-updated-banner> + Duration </div> <div class="grid-double"> {{ _applicationSubmission.soilProjectDurationUnit }} <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.soilProjectDurationUnit"></app-no-data> </div> <div class="subheading2 grid-1"> - Length <app-updated-banner *ngIf="updatedFields.includes('soilProjectDurationAmount')"></app-updated-banner> + Length </div> <div class="grid-double"> {{ _applicationSubmission.soilProjectDurationAmount }} @@ -192,7 +189,6 @@ <div class="subheading2 grid-1"> Describe the type, origin and quality of fill proposed to be placed. - <app-updated-banner *ngIf="updatedFields.includes('soilFillTypeToPlace')"></app-updated-banner> </div> <div class="grid-double"> {{ _applicationSubmission.soilFillTypeToPlace }} @@ -201,7 +197,6 @@ <div class="subheading2 grid-1"> Describe the type of soil proposed to be removed. - <app-updated-banner *ngIf="updatedFields.includes('soilTypeRemoved')"></app-updated-banner> </div> <div class="grid-double"> {{ _applicationSubmission.soilTypeRemoved }} @@ -210,7 +205,6 @@ <div class="subheading2 grid-1"> What alternative measures have you considered or attempted before proposing to place fill? - <app-updated-banner *ngIf="updatedFields.includes('soilAlternativeMeasures')"></app-updated-banner> </div> <div class="grid-double"> {{ _applicationSubmission.soilAlternativeMeasures }} @@ -219,7 +213,6 @@ <div class="subheading2 grid-1"> What steps will be taken to reduce impacts to surrounding agricultural land? - <app-updated-banner *ngIf="updatedFields.includes('soilReduceNegativeImpacts')"></app-updated-banner> </div> <div class="grid-double"> {{ _applicationSubmission.soilReduceNegativeImpacts }} @@ -252,7 +245,6 @@ <div class="subheading2 grid-1"> Is your proposal for aggregate extraction or placer mining? - <app-updated-banner *ngIf="updatedFields.includes('soilIsExtractionOrMining')"></app-updated-banner> </div> <div class="grid-double"> <span *ngIf="_applicationSubmission.soilIsExtractionOrMining !== null"> @@ -266,7 +258,6 @@ <div *ngIf="_applicationSubmission.soilIsExtractionOrMining" class="subheading2 grid-1"> Have you submitted a Notice of Work to the Ministry of Energy, Mines and Low Carbon Innovation (EMLI)? - <app-updated-banner *ngIf="updatedFields.includes('soilHasSubmittedNotice')"></app-updated-banner> </div> <div *ngIf="_applicationSubmission.soilIsExtractionOrMining" class="grid-double"> <span *ngIf="_applicationSubmission.soilHasSubmittedNotice !== null"> diff --git a/portal-frontend/src/app/features/applications/application-details/pfrs-details/pfrs-details.component.ts b/portal-frontend/src/app/features/applications/application-details/pfrs-details/pfrs-details.component.ts index 934048d407..f60af81230 100644 --- a/portal-frontend/src/app/features/applications/application-details/pfrs-details/pfrs-details.component.ts +++ b/portal-frontend/src/app/features/applications/application-details/pfrs-details/pfrs-details.component.ts @@ -14,7 +14,6 @@ export class PfrsDetailsComponent { @Input() showErrors = true; @Input() showEdit = true; @Input() draftMode = false; - @Input() updatedFields: string[] = []; _applicationSubmission: ApplicationSubmissionDetailedDto | undefined; diff --git a/portal-frontend/src/app/features/applications/application-details/pofo-details/pofo-details.component.html b/portal-frontend/src/app/features/applications/application-details/pofo-details/pofo-details.component.html index af82d2b5ce..af4fd4d90d 100644 --- a/portal-frontend/src/app/features/applications/application-details/pofo-details/pofo-details.component.html +++ b/portal-frontend/src/app/features/applications/application-details/pofo-details/pofo-details.component.html @@ -1,7 +1,6 @@ <div *ngIf="_applicationSubmission" class="review-table"> <div class="subheading2 grid-1"> Has the ALC previously received an application or Notice of Intent for this proposal? - <app-updated-banner *ngIf="updatedFields.includes('soilIsFollowUp')"></app-updated-banner> </div> <div class="grid-double"> <span *ngIf="_applicationSubmission.soilIsFollowUp !== null"> @@ -12,7 +11,6 @@ <div *ngIf="_applicationSubmission.soilIsFollowUp" class="subheading2 grid-1"> Application or NOI ID - <app-updated-banner *ngIf="updatedFields.includes('soilFollowUpIDs')"></app-updated-banner> </div> <div *ngIf="_applicationSubmission.soilIsFollowUp" class="grid-double"> {{ _applicationSubmission.soilFollowUpIDs }} @@ -21,7 +19,6 @@ <div class="subheading2 grid-1"> What is the purpose of the proposal? - <app-updated-banner *ngIf="updatedFields.includes('purpose')"></app-updated-banner> </div> <div class="grid-double"> {{ _applicationSubmission.purpose }} @@ -30,7 +27,6 @@ <div class="subheading1 full-width"> Fill to be Placed - <app-updated-banner *ngIf="updatedFields.includes('soilToPlaceVolume')"></app-updated-banner> </div> <div class="full-width soil-table"> <div class="grid-1"><strong>Volume</strong></div> @@ -60,7 +56,6 @@ <div class="subheading1 full-width"> Fill already Placed - <app-updated-banner *ngIf="updatedFields.includes('subdProposedLots')"></app-updated-banner> </div> <div class="full-width soil-table"> <div class="grid-1"><strong>Volume</strong></div> @@ -105,14 +100,14 @@ <span class="subheading1">Project Duration</span> </div> <div class="subheading2 grid-1"> - Duration <app-updated-banner *ngIf="updatedFields.includes('soilProjectDurationUnit')"></app-updated-banner> + Duration </div> <div class="grid-double"> {{ _applicationSubmission.soilProjectDurationUnit }} <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.soilProjectDurationUnit"></app-no-data> </div> <div class="subheading2 grid-1"> - Length <app-updated-banner *ngIf="updatedFields.includes('soilProjectDurationAmount')"></app-updated-banner> + Length </div> <div class="grid-double"> {{ _applicationSubmission.soilProjectDurationAmount }} @@ -121,7 +116,6 @@ <div class="subheading2 grid-1"> What alternative measures have you considered or attempted before proposing to place fill? - <app-updated-banner *ngIf="updatedFields.includes('soilAlternativeMeasures')"></app-updated-banner> </div> <div class="grid-double"> {{ _applicationSubmission.soilAlternativeMeasures }} @@ -130,7 +124,6 @@ <div class="subheading2 grid-1"> Describe the type, origin and quality of fill proposed to be placed. - <app-updated-banner *ngIf="updatedFields.includes('soilFillTypeToPlace')"></app-updated-banner> </div> <div class="grid-double"> {{ _applicationSubmission.soilFillTypeToPlace }} @@ -139,7 +132,6 @@ <div class="subheading2 grid-1"> What steps will be taken to reduce impacts to surrounding agricultural land? - <app-updated-banner *ngIf="updatedFields.includes('soilReduceNegativeImpacts')"></app-updated-banner> </div> <div class="grid-double"> {{ _applicationSubmission.soilReduceNegativeImpacts }} diff --git a/portal-frontend/src/app/features/applications/application-details/pofo-details/pofo-details.component.ts b/portal-frontend/src/app/features/applications/application-details/pofo-details/pofo-details.component.ts index f2f1576b33..9e2c20112c 100644 --- a/portal-frontend/src/app/features/applications/application-details/pofo-details/pofo-details.component.ts +++ b/portal-frontend/src/app/features/applications/application-details/pofo-details/pofo-details.component.ts @@ -14,7 +14,6 @@ export class PofoDetailsComponent { @Input() showErrors = true; @Input() showEdit = true; @Input() draftMode = false; - @Input() updatedFields: string[] = []; _applicationSubmission: ApplicationSubmissionDetailedDto | undefined; diff --git a/portal-frontend/src/app/features/applications/application-details/roso-details/roso-details.component.html b/portal-frontend/src/app/features/applications/application-details/roso-details/roso-details.component.html index 7ffd5577ab..28cc11706e 100644 --- a/portal-frontend/src/app/features/applications/application-details/roso-details/roso-details.component.html +++ b/portal-frontend/src/app/features/applications/application-details/roso-details/roso-details.component.html @@ -1,7 +1,6 @@ <div *ngIf="_applicationSubmission" class="review-table"> <div class="subheading2 grid-1"> Has the ALC previously received an application or Notice of Intent for this proposal? - <app-updated-banner *ngIf="updatedFields.includes('soilIsFollowUp')"></app-updated-banner> </div> <div class="grid-double"> <span *ngIf="_applicationSubmission.soilIsFollowUp !== null"> @@ -12,7 +11,6 @@ <div *ngIf="_applicationSubmission.soilIsFollowUp" class="subheading2 grid-1"> Application or NOI ID - <app-updated-banner *ngIf="updatedFields.includes('soilFollowUpIDs')"></app-updated-banner> </div> <div *ngIf="_applicationSubmission.soilIsFollowUp" class="grid-double"> {{ _applicationSubmission.soilFollowUpIDs }} @@ -21,7 +19,6 @@ <div class="subheading2 grid-1"> What is the purpose of the proposal? - <app-updated-banner *ngIf="updatedFields.includes('purpose')"></app-updated-banner> </div> <div class="grid-double"> {{ _applicationSubmission.purpose }} @@ -30,7 +27,6 @@ <div class="subheading1 full-width"> Soil to be Removed - <app-updated-banner *ngIf="updatedFields.includes('subdProposedLots')"></app-updated-banner> </div> <div class="full-width soil-table"> <div class="grid-1"><strong>Volume</strong></div> @@ -60,7 +56,6 @@ <div class="subheading1 full-width"> Soil already Removed - <app-updated-banner *ngIf="updatedFields.includes('subdProposedLots')"></app-updated-banner> </div> <div class="full-width soil-table"> <div class="grid-1"><strong>Volume</strong></div> @@ -105,14 +100,14 @@ <span class="subheading1">Project Duration</span> </div> <div class="subheading2 grid-1"> - Duration <app-updated-banner *ngIf="updatedFields.includes('soilProjectDurationUnit')"></app-updated-banner> + Duration </div> <div class="grid-double"> {{ _applicationSubmission.soilProjectDurationUnit }} <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.soilProjectDurationUnit"></app-no-data> </div> <div class="subheading2 grid-1"> - Length <app-updated-banner *ngIf="updatedFields.includes('soilProjectDurationAmount')"></app-updated-banner> + Length </div> <div class="grid-double"> {{ _applicationSubmission.soilProjectDurationAmount }} @@ -121,7 +116,6 @@ <div class="subheading2 grid-1"> Describe the type of soil proposed to be removed. - <app-updated-banner *ngIf="updatedFields.includes('soilTypeRemoved')"></app-updated-banner> </div> <div class="grid-double"> {{ _applicationSubmission.soilTypeRemoved }} @@ -130,7 +124,6 @@ <div class="subheading2 grid-1"> What steps will be taken to reduce impacts to surrounding agricultural land? - <app-updated-banner *ngIf="updatedFields.includes('soilReduceNegativeImpacts')"></app-updated-banner> </div> <div class="grid-double"> {{ _applicationSubmission.soilReduceNegativeImpacts }} diff --git a/portal-frontend/src/app/features/applications/application-details/roso-details/roso-details.component.ts b/portal-frontend/src/app/features/applications/application-details/roso-details/roso-details.component.ts index 1d7f7db422..f543cfddf2 100644 --- a/portal-frontend/src/app/features/applications/application-details/roso-details/roso-details.component.ts +++ b/portal-frontend/src/app/features/applications/application-details/roso-details/roso-details.component.ts @@ -14,7 +14,6 @@ export class RosoDetailsComponent { @Input() showErrors = true; @Input() showEdit = true; @Input() draftMode = false; - @Input() updatedFields: string[] = []; _applicationSubmission: ApplicationSubmissionDetailedDto | undefined; diff --git a/portal-frontend/src/app/features/applications/application-details/subd-details/subd-details.component.html b/portal-frontend/src/app/features/applications/application-details/subd-details/subd-details.component.html index 4b28f26225..c4e3f8625f 100644 --- a/portal-frontend/src/app/features/applications/application-details/subd-details/subd-details.component.html +++ b/portal-frontend/src/app/features/applications/application-details/subd-details/subd-details.component.html @@ -1,7 +1,6 @@ <div *ngIf="_applicationSubmission" class="review-table"> <div class="subheading2 full-width"> Proposed Lot Areas - <app-updated-banner *ngIf="updatedFields.includes('subdProposedLots')"></app-updated-banner> </div> <div class="full-width parcel-table"> <div class="grid-1 subheading2">#</div> @@ -30,7 +29,6 @@ </div> <div class="subheading2 grid-1"> What is the purpose of the proposal? - <app-updated-banner *ngIf="updatedFields.includes('purpose')"></app-updated-banner> </div> <div class="grid-double"> {{ _applicationSubmission.purpose }} @@ -38,7 +36,6 @@ </div> <div class="subheading2 grid-1"> Why do you believe this parcel is suitable for subdivision? - <app-updated-banner *ngIf="updatedFields.includes('subdSuitability')"></app-updated-banner> </div> <div class="grid-double"> {{ _applicationSubmission.subdSuitability }} @@ -46,7 +43,6 @@ </div> <div class="subheading2 grid-1"> Does the proposal support agriculture in the short or long term? - <app-updated-banner *ngIf="updatedFields.includes('subdAgricultureSupport')"></app-updated-banner> </div> <div class="grid-double"> {{ _applicationSubmission.subdAgricultureSupport }} @@ -61,7 +57,6 @@ </div> <div class="subheading2 grid-1"> Are you applying for subdivision pursuant to the ALC Homesite Severance Policy? - <app-updated-banner *ngIf="updatedFields.includes('subdIsHomeSiteSeverance')"></app-updated-banner> </div> <div class="grid-double"> <span *ngIf="_applicationSubmission.subdIsHomeSiteSeverance !== null"> diff --git a/portal-frontend/src/app/features/applications/application-details/subd-details/subd-details.component.ts b/portal-frontend/src/app/features/applications/application-details/subd-details/subd-details.component.ts index 295e9ab999..915e07f996 100644 --- a/portal-frontend/src/app/features/applications/application-details/subd-details/subd-details.component.ts +++ b/portal-frontend/src/app/features/applications/application-details/subd-details/subd-details.component.ts @@ -16,7 +16,6 @@ export class SubdDetailsComponent { @Input() showErrors = true; @Input() showEdit = true; @Input() draftMode = false; - @Input() updatedFields: string[] = []; _applicationSubmission: ApplicationSubmissionDetailedDto | undefined; totalTargetAcres: string | undefined; diff --git a/portal-frontend/src/app/features/applications/application-details/tur-details/tur-details.component.html b/portal-frontend/src/app/features/applications/application-details/tur-details/tur-details.component.html index 0a52be4e13..0a08355179 100644 --- a/portal-frontend/src/app/features/applications/application-details/tur-details/tur-details.component.html +++ b/portal-frontend/src/app/features/applications/application-details/tur-details/tur-details.component.html @@ -1,7 +1,6 @@ <div *ngIf="_applicationSubmission" class="review-table"> <div class="subheading2 grid-1"> What is the purpose of the proposal? - <app-updated-banner *ngIf="updatedFields.includes('purpose')"></app-updated-banner> </div> <div class="grid-double"> {{ _applicationSubmission.purpose }} @@ -10,7 +9,6 @@ <div class="subheading2 grid-1"> Specify any agricultural activities such as livestock operations, greenhouses or horticultural activities in proximity to the proposal. - <app-updated-banner *ngIf="updatedFields.includes('turAgriculturalActivities')"></app-updated-banner> </div> <div class="grid-double"> {{ _applicationSubmission.turAgriculturalActivities }} @@ -18,7 +16,6 @@ </div> <div class="subheading2 grid-1"> What steps will you take to reduce potential negative impacts on surrounding agricultural lands? - <app-updated-banner *ngIf="updatedFields.includes('turReduceNegativeImpacts')"></app-updated-banner> </div> <div class="grid-double"> {{ _applicationSubmission.turReduceNegativeImpacts }} @@ -26,7 +23,6 @@ </div> <div class="subheading2 grid-1"> Could this proposal be accommodated on lands outside of the ALR? - <app-updated-banner *ngIf="updatedFields.includes('turOutsideLands')"></app-updated-banner> </div> <div class="grid-double"> {{ _applicationSubmission.turOutsideLands }} diff --git a/portal-frontend/src/app/features/applications/application-details/tur-details/tur-details.component.ts b/portal-frontend/src/app/features/applications/application-details/tur-details/tur-details.component.ts index 6444c3b03d..229dab9f16 100644 --- a/portal-frontend/src/app/features/applications/application-details/tur-details/tur-details.component.ts +++ b/portal-frontend/src/app/features/applications/application-details/tur-details/tur-details.component.ts @@ -14,7 +14,6 @@ export class TurDetailsComponent { @Input() showErrors = true; @Input() showEdit = true; @Input() draftMode = false; - @Input() updatedFields: string[] = []; _applicationSubmission: ApplicationSubmissionDetailedDto | undefined; @Input() set applicationSubmission(application: ApplicationSubmissionDetailedDto | undefined) { diff --git a/portal-frontend/src/app/features/applications/edit-submission/review-and-submit/review-and-submit.component.html b/portal-frontend/src/app/features/applications/edit-submission/review-and-submit/review-and-submit.component.html index 86e157f7c6..3df159d353 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/review-and-submit/review-and-submit.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/review-and-submit/review-and-submit.component.html @@ -3,8 +3,6 @@ [$application]="$applicationSubmission" [$applicationDocuments]="$applicationDocuments" [draftMode]="draftMode" - [updatedFields]="updatedFields" - [originalSubmissionUuid]="originalSubmissionUuid" ></app-application-details> <div class="button-container"> <button diff --git a/portal-frontend/src/app/features/applications/edit-submission/review-and-submit/review-and-submit.component.ts b/portal-frontend/src/app/features/applications/edit-submission/review-and-submit/review-and-submit.component.ts index fc122f5c0b..f197ac6b73 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/review-and-submit/review-and-submit.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/review-and-submit/review-and-submit.component.ts @@ -18,7 +18,6 @@ import { SubmitConfirmationDialogComponent } from './submit-confirmation-dialog/ }) export class ReviewAndSubmitComponent extends StepComponent implements OnInit, OnDestroy { @Input() $applicationDocuments!: BehaviorSubject<ApplicationDocumentDto[]>; - @Input() updatedFields: string[] = []; @Input() originalSubmissionUuid = ''; @Output() submit = new EventEmitter<void>(); diff --git a/portal-frontend/src/app/features/notice-of-intents/alcs-edit-submission/alcs-edit-submission.component.html b/portal-frontend/src/app/features/notice-of-intents/alcs-edit-submission/alcs-edit-submission.component.html index 16a75b21e2..3d0e5969d0 100644 --- a/portal-frontend/src/app/features/notice-of-intents/alcs-edit-submission/alcs-edit-submission.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/alcs-edit-submission/alcs-edit-submission.component.html @@ -135,12 +135,9 @@ <h6 *ngIf="noiSubmission">Notice of Intent ID: {{ noiSubmission.fileNumber }} | <ng-container *ngTemplateOutlet="header"></ng-container> <div *ngIf="cdkStepper.selectedIndex === steps.ReviewAndSubmit"> <app-review-and-submit - *ngIf="originalSubmission" [$noiSubmission]="$noiSubmission" [$noiDocuments]="$noiDocuments" [draftMode]="true" - [updatedFields]="updatedFields" - [originalSubmissionUuid]="originalSubmission.uuid" (exit)="onExit()" (submit)="onSubmit()" ></app-review-and-submit> diff --git a/portal-frontend/src/app/features/notice-of-intents/alcs-edit-submission/alcs-edit-submission.component.ts b/portal-frontend/src/app/features/notice-of-intents/alcs-edit-submission/alcs-edit-submission.component.ts index f9ab4ae5c9..134caab960 100644 --- a/portal-frontend/src/app/features/notice-of-intents/alcs-edit-submission/alcs-edit-submission.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/alcs-edit-submission/alcs-edit-submission.component.ts @@ -2,7 +2,6 @@ import { StepperSelectionEvent } from '@angular/cdk/stepper'; import { AfterViewInit, Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; import { ActivatedRoute, Router } from '@angular/router'; -import { getDiff } from 'recursive-diff'; import { BehaviorSubject, combineLatest, Observable, of, Subject, takeUntil } from 'rxjs'; import { environment } from '../../../../environments/environment'; import { NoticeOfIntentDocumentDto } from '../../../services/notice-of-intent-document/notice-of-intent-document.dto'; @@ -39,13 +38,11 @@ export class AlcsEditSubmissionComponent implements OnInit, OnDestroy, AfterView $noiSubmission = new BehaviorSubject<NoticeOfIntentSubmissionDetailedDto | undefined>(undefined); $noiDocuments = new BehaviorSubject<NoticeOfIntentDocumentDto[]>([]); noiSubmission: NoticeOfIntentSubmissionDetailedDto | undefined; - originalSubmission: NoticeOfIntentSubmissionDetailedDto | undefined; steps = EditNoiSteps; expandedParcelUuid?: string; showValidationErrors = false; - updatedFields: string[] = []; @ViewChild('cdkStepper') public customStepper!: CustomStepperComponent; @@ -76,7 +73,6 @@ export class AlcsEditSubmissionComponent implements OnInit, OnDestroy, AfterView this.$noiSubmission.pipe(takeUntil(this.$destroy)).subscribe((submission) => { if (submission) { this.noiSubmission = submission; - this.calculateUpdatedFields(); } }); } @@ -115,19 +111,10 @@ export class AlcsEditSubmissionComponent implements OnInit, OnDestroy, AfterView this.$destroy.complete(); } - private async loadOriginalSubmission(fileId: string) { - const originalSubmission = await this.noticeOfIntentSubmissionService.getByFileId(fileId); - if (originalSubmission) { - this.originalSubmission = originalSubmission; - this.calculateUpdatedFields(); - } - } - private async loadDraftSubmission(fileId: string) { if (!this.noiSubmission) { this.overlayService.showSpinner(); this.noiSubmission = await this.noticeOfIntentSubmissionDraftService.getByFileId(fileId); - await this.loadOriginalSubmission(fileId); const documents = await this.noticeOfIntentDocumentService.getByFileId(fileId); if (documents) { this.$noiDocuments.next(documents); @@ -224,17 +211,4 @@ export class AlcsEditSubmissionComponent implements OnInit, OnDestroy, AfterView } }); } - - private calculateUpdatedFields() { - const diffResult = getDiff(this.originalSubmission, this.noiSubmission); - const changedFields = new Set<string>(); - for (const diff of diffResult) { - const fullPath = diff.path.join('.'); - if (!fullPath.toLowerCase().includes('uuid') || fullPath === 'localGovernmentUuid') { - changedFields.add(diff.path.join('.')); - changedFields.add(diff.path[0].toString()); - } - } - this.updatedFields = [...changedFields.keys()]; - } } diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/review-and-submit/review-and-submit.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/review-and-submit/review-and-submit.component.html index 9e095b9717..f7223a290b 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/review-and-submit/review-and-submit.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/review-and-submit/review-and-submit.component.html @@ -3,8 +3,6 @@ [$noticeOfIntentSubmission]="$noiSubmission" [$noiDocuments]="$noiDocuments" [draftMode]="draftMode" - [updatedFields]="updatedFields" - [originalSubmissionUuid]="originalSubmissionUuid" ></app-noi-details> <div class="button-container"> <button diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/review-and-submit/review-and-submit.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/review-and-submit/review-and-submit.component.ts index e6e62f3181..2c4b8a1528 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/review-and-submit/review-and-submit.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/review-and-submit/review-and-submit.component.ts @@ -14,8 +14,6 @@ import { StepComponent } from '../step.partial'; }) export class ReviewAndSubmitComponent extends StepComponent implements OnInit, OnDestroy { @Input() $noiDocuments!: BehaviorSubject<NoticeOfIntentDocumentDto[]>; - @Input() updatedFields: string[] = []; - @Input() originalSubmissionUuid = ''; @Output() submit = new EventEmitter<void>(); noiSubmission: NoticeOfIntentSubmissionDetailedDto | undefined; diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/additional-information/additional-information.component.html b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/additional-information/additional-information.component.html index 456ff7dd3e..0c90be791c 100644 --- a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/additional-information/additional-information.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/additional-information/additional-information.component.html @@ -1,7 +1,6 @@ <div *ngIf="_noiSubmission" class="review-table"> <div class="subheading2 grid-1"> {{ firstQuestion }} - <app-updated-banner *ngIf="updatedFields.includes('soilIsRemovingSoilForNewStructure')"></app-updated-banner> </div> <div class="grid-double"> <span *ngIf="_noiSubmission.soilIsRemovingSoilForNewStructure !== null"> @@ -16,7 +15,6 @@ <ng-container *ngIf="_noiSubmission.soilIsRemovingSoilForNewStructure"> <div class="full-width subheading2"> The total floor area (m<sup>2</sup>) of the proposed structure(s) - <app-updated-banner *ngIf="updatedFields.includes('soilProposedStructures')"></app-updated-banner> </div> <div class="full-width soil-table"> <div class="grid-1 subheading2">#</div> @@ -43,7 +41,6 @@ <ng-container *ngIf="isSoilStructureFarmUseReasonVisible"> <div class="subheading2 grid-1"> Describe how the structure is necessary for farm use - <app-updated-banner *ngIf="updatedFields.includes('soilStructureFarmUseReason')"></app-updated-banner> </div> <div class="grid-double"> {{ _noiSubmission.soilStructureFarmUseReason }} @@ -54,7 +51,6 @@ <ng-container *ngIf="isSoilStructureResidentialUseReasonVisible"> <div class="subheading2 grid-1"> Describe how the structure is necessary for residential use - <app-updated-banner *ngIf="updatedFields.includes('soilStructureResidentialUseReason')"></app-updated-banner> </div> <div class="grid-double"> {{ _noiSubmission.soilStructureResidentialUseReason }} @@ -68,7 +64,6 @@ <ng-container *ngIf="isSoilAgriParcelActivityVisible"> <div class="subheading2 grid-1"> Describe the current agricultural activity on the parcel(s) - <app-updated-banner *ngIf="updatedFields.includes('soilAgriParcelActivity')"></app-updated-banner> </div> <div class="grid-double"> {{ _noiSubmission.soilAgriParcelActivity }} @@ -79,9 +74,6 @@ <ng-container *ngIf="isSoilStructureResidentialAccessoryUseReasonVisible"> <div class="subheading2 grid-1"> Describe the intended use of the residential accessory structure - <app-updated-banner - *ngIf="updatedFields.includes('soilStructureResidentialAccessoryUseReason')" - ></app-updated-banner> </div> <div class="grid-double"> {{ _noiSubmission.soilStructureResidentialAccessoryUseReason }} @@ -95,9 +87,6 @@ <ng-container *ngIf="isSoilOtherStructureVisible"> <div class="subheading2 grid-1"> Describe the intended use of the 'Other' structure - <app-updated-banner - *ngIf="updatedFields.includes('soilStructureResidentialAccessoryUseReason')" - ></app-updated-banner> </div> <div class="grid-double"> {{ _noiSubmission.soilStructureOtherUseReason }} diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/additional-information/additional-information.component.ts b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/additional-information/additional-information.component.ts index c6c651ca37..680cd87210 100644 --- a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/additional-information/additional-information.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/additional-information/additional-information.component.ts @@ -18,7 +18,6 @@ export class AdditionalInformationComponent { @Input() showErrors = true; @Input() showEdit = true; @Input() draftMode = false; - @Input() updatedFields: string[] = []; firstQuestion = 'FIX THIS'; diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.html b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.html index 9d6c23ad29..8b3ca6786e 100644 --- a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.html @@ -4,15 +4,10 @@ [$noticeOfIntentSubmission]="$noticeOfIntentSubmission" [showErrors]="showErrors" [showEdit]="showEdit" - [originalSubmissionUuid]="originalSubmissionUuid" ></app-parcel> </section> <section> <h3>2. Primary Contact</h3> - <app-warning-banner *ngIf="draftMode" class="full-row"> - Changes made to this section will not be flagged as - <app-updated-banner></app-updated-banner> - ensure accuracy before saving. - </app-warning-banner> <div *ngIf="noiSubmission" class="review-table"> <div class="subheading2 grid-1">Type</div> <div class="grid-double"> @@ -83,7 +78,6 @@ <h3>3. Government</h3> <div *ngIf="noiSubmission" class="review-table"> <div class="subheading2 grid-1"> Local or First Nation Government - <app-updated-banner *ngIf="updatedFields.includes('localGovernmentUuid')"></app-updated-banner> </div> <div class="grid-double"> {{ localGovernment?.name }} @@ -108,7 +102,6 @@ <h4>Land Use of Parcel(s) under Notice of Intent</h4> </div> <div class="subheading2 grid-1"> Describe all agriculture that currently takes place on the parcel(s). - <app-updated-banner *ngIf="updatedFields.includes('parcelsAgricultureDescription')"></app-updated-banner> </div> <div class="grid-double"> {{ noiSubmission.parcelsAgricultureDescription }} @@ -116,9 +109,6 @@ <h4>Land Use of Parcel(s) under Notice of Intent</h4> </div> <div class="subheading2 grid-1"> Describe all agricultural improvements made to the parcel(s). - <app-updated-banner - *ngIf="updatedFields.includes('parcelsAgricultureImprovementDescription')" - ></app-updated-banner> </div> <div class="grid-double"> {{ noiSubmission.parcelsAgricultureImprovementDescription }} @@ -129,7 +119,6 @@ <h4>Land Use of Parcel(s) under Notice of Intent</h4> </div> <div class="subheading2 grid-1"> Describe all other uses that currently take place on the parcel(s). - <app-updated-banner *ngIf="updatedFields.includes('parcelsNonAgricultureUseDescription')"></app-updated-banner> </div> <div class="grid-double"> {{ noiSubmission.parcelsNonAgricultureUseDescription }} @@ -138,18 +127,6 @@ <h4>Land Use of Parcel(s) under Notice of Intent</h4> <div class="full-width"> <h4> Land Use of Adjacent Parcels - <app-updated-banner - *ngIf=" - updatedFields.includes('northLandUseType') || - updatedFields.includes('northLandUseTypeDescription') || - updatedFields.includes('eastLandUseType') || - updatedFields.includes('eastLandUseTypeDescription') || - updatedFields.includes('southLandUseType') || - updatedFields.includes('southLandUseTypeDescription') || - updatedFields.includes('westLandUseType') || - updatedFields.includes('westLandUseTypeDescription') - " - ></app-updated-banner> </h4> </div> <div class="adjacent-parcels full-width"> @@ -207,7 +184,6 @@ <h3>5. Proposal</h3> [draftMode]="draftMode" [noiSubmission]="noiSubmission" [noiDocuments]="appDocuments" - [updatedFields]="updatedFields" ></app-roso-details> <app-pofo-details *ngIf="noiSubmission.typeCode === 'POFO'" @@ -216,7 +192,6 @@ <h3>5. Proposal</h3> [draftMode]="draftMode" [noiSubmission]="noiSubmission" [noiDocuments]="appDocuments" - [updatedFields]="updatedFields" ></app-pofo-details> <app-pfrs-details *ngIf="noiSubmission.typeCode === 'PFRS'" @@ -225,7 +200,6 @@ <h3>5. Proposal</h3> [draftMode]="draftMode" [noiSubmission]="noiSubmission" [noiDocuments]="appDocuments" - [updatedFields]="updatedFields" ></app-pfrs-details> </section> <section *ngIf="noiSubmission"> @@ -236,7 +210,6 @@ <h3>6. Additional Proposal Information</h3> [draftMode]="draftMode" [noiSubmission]="noiSubmission" [noiDocuments]="appDocuments" - [updatedFields]="updatedFields" > </app-additional-information> </section> diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.ts b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.ts index 71df72edbb..e4105b04ac 100644 --- a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.ts @@ -24,8 +24,6 @@ export class NoticeOfIntentDetailsComponent implements OnInit, OnDestroy { @Input() showErrors = true; @Input() showEdit = true; @Input() draftMode = false; - @Input() originalSubmissionUuid = ''; - @Input() updatedFields: string[] = []; parcelType = PARCEL_TYPE; noiSubmission: NoticeOfIntentSubmissionDetailedDto | undefined; diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/parcel/parcel.component.html b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/parcel/parcel.component.html index 41191e9061..fd4ede09fb 100644 --- a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/parcel/parcel.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/parcel/parcel.component.html @@ -18,7 +18,6 @@ <h4>Parcel {{ parcelInd + 1 }}: Parcel and Owner Information</h4> <div class="full-width subheading1">Parcel Information</div> <div class="subheading2 grid-1"> Ownership Type - <app-updated-banner *ngIf="updatedFields.includes(parcelInd + '.ownershipTypeCode')"></app-updated-banner> </div> <div class="grid-double"> {{ parcel.ownershipType?.label }} @@ -26,7 +25,6 @@ <h4>Parcel {{ parcelInd + 1 }}: Parcel and Owner Information</h4> </div> <div class="subheading2 grid-1"> Legal Description - <app-updated-banner *ngIf="updatedFields.includes(parcelInd + '.legalDescription')"></app-updated-banner> </div> <div class="grid-double"> {{ parcel.legalDescription }} @@ -37,7 +35,6 @@ <h4>Parcel {{ parcelInd + 1 }}: Parcel and Owner Information</h4> </div> <div class="subheading2 grid-1"> Area (Hectares) - <app-updated-banner *ngIf="updatedFields.includes(parcelInd + '.mapAreaHectares')"></app-updated-banner> </div> <div class="grid-double"> {{ parcel.mapAreaHectares }} @@ -48,7 +45,6 @@ <h4>Parcel {{ parcelInd + 1 }}: Parcel and Owner Information</h4> </div> <div class="subheading2 grid-1"> PID {{ parcel.ownershipType?.code === PARCEL_OWNERSHIP_TYPES.CROWN ? '(optional)' : '' }} - <app-updated-banner *ngIf="updatedFields.includes(parcelInd + '.pid')"></app-updated-banner> </div> <div class="grid-double"> <span *ngIf="parcel.pid">{{ parcel.pid | mask : '000-000-000' }}</span> @@ -59,7 +55,7 @@ <h4>Parcel {{ parcelInd + 1 }}: Parcel and Owner Information</h4> </div> <ng-container *ngIf="parcel.ownershipType?.code === PARCEL_OWNERSHIP_TYPES.CROWN"> <div class="subheading2 grid-1"> - PIN (optional)<app-updated-banner *ngIf="updatedFields.includes(parcelInd + '.pin')"></app-updated-banner> + PIN (optional) </div> <div class="grid-double"> {{ parcel.pin }} @@ -72,7 +68,6 @@ <h4>Parcel {{ parcelInd + 1 }}: Parcel and Owner Information</h4> <ng-container *ngIf="parcel.ownershipType?.code === PARCEL_OWNERSHIP_TYPES.FEE_SIMPLE"> <div class="subheading2 grid-1"> Purchase Date - <app-updated-banner *ngIf="updatedFields.includes(parcelInd + '.purchasedDate')"></app-updated-banner> </div> <div class="grid-double"> {{ parcel.purchasedDate | date }} @@ -85,7 +80,6 @@ <h4>Parcel {{ parcelInd + 1 }}: Parcel and Owner Information</h4> </ng-container> <div class="subheading2 grid-1"> Farm Classification - <app-updated-banner *ngIf="updatedFields.includes(parcelInd + '.isFarm')"></app-updated-banner> </div> <div class="grid-double"> <span *ngIf="parcel.isFarm !== null">{{ parcel.isFarm ? 'Yes' : 'No' }}</span> @@ -93,7 +87,6 @@ <h4>Parcel {{ parcelInd + 1 }}: Parcel and Owner Information</h4> </div> <div class="subheading2 grid-1"> Civic Address - <app-updated-banner *ngIf="updatedFields.includes(parcelInd + '.civicAddress')"></app-updated-banner> </div> <div class="grid-double"> {{ parcel.civicAddress }} @@ -108,7 +101,6 @@ <h4>Parcel {{ parcelInd + 1 }}: Parcel and Owner Information</h4> </ng-container> <div class="subheading2 grid-1"> Certificate Of Title - <app-updated-banner *ngIf="updatedFields.includes(parcelInd + '.certificateOfTitle.uuid')"></app-updated-banner> </div> <div class="grid-double"> <div *ngIf="parcel.certificateOfTitle"> @@ -120,7 +112,7 @@ <h4>Parcel {{ parcelInd + 1 }}: Parcel and Owner Information</h4> ></app-no-data> </div> <div class="full-width subheading1"> - Owner Information <app-updated-banner *ngIf="updatedFields.includes(parcelInd + '.owners')"></app-updated-banner> + Owner Information </div> <div class="full-width owner-information"> <div class="subheading2">Type</div> diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/parcel/parcel.component.ts b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/parcel/parcel.component.ts index 240116e40c..c4d761e41e 100644 --- a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/parcel/parcel.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/parcel/parcel.component.ts @@ -1,6 +1,5 @@ import { Component, Input } from '@angular/core'; import { Router } from '@angular/router'; -import { getDiff } from 'recursive-diff'; import { BehaviorSubject, Subject, takeUntil } from 'rxjs'; import { PARCEL_OWNERSHIP_TYPE } from '../../../../services/application-parcel/application-parcel.dto'; import { NoticeOfIntentDocumentDto } from '../../../../services/notice-of-intent-document/notice-of-intent-document.dto'; @@ -51,7 +50,6 @@ export class ParcelComponent { $destroy = new Subject<void>(); @Input() $noticeOfIntentSubmission!: BehaviorSubject<NoticeOfIntentSubmissionDetailedDto | undefined>; - @Input() originalSubmissionUuid: string | undefined; @Input() showErrors = true; @Input() showEdit = true; @Input() draftMode = false; @@ -62,7 +60,6 @@ export class ParcelComponent { submissionUuid = ''; parcels: NoticeOfIntentParcelExtended[] = []; noticeOfIntentSubmission!: NoticeOfIntentSubmissionDetailedDto; - updatedFields: string[] = []; constructor( private noticeOfIntentParcelService: NoticeOfIntentParcelService, @@ -90,36 +87,6 @@ export class ParcelComponent { async loadParcels() { const parcels = (await this.noticeOfIntentParcelService.fetchBySubmissionUuid(this.submissionUuid)) || []; this.parcels = parcels.map((p) => ({ ...p, isFarmText: formatBooleanToYesNoString(p.isFarm) })); - - if (this.originalSubmissionUuid) { - await this.calculateParcelDiffs(this.originalSubmissionUuid); - } - } - - private async calculateParcelDiffs(originalSubmissionUuid: string) { - const oldParcels = await this.noticeOfIntentParcelService.fetchBySubmissionUuid(originalSubmissionUuid); - if (oldParcels) { - const diffResult = getDiff(oldParcels, this.parcels); - const changedFields = new Set<string>(); - for (const diff of diffResult) { - const partialPath = []; - const fullPath = diff.path.join('.'); - if (!fullPath.toLowerCase().includes('uuid')) { - for (const path of diff.path) { - if (typeof path !== 'string' || !path.includes('Uuid')) { - partialPath.push(path); - changedFields.add(partialPath.join('.')); - } - } - if ((diff.op = 'add') && typeof diff.val === 'object') { - for (const key of Object.keys(diff.val)) { - changedFields.add(`${diff.path.join('.')}.${key}`); - } - } - } - } - this.updatedFields = [...changedFields.keys()]; - } } private async validateParcelDetails() { diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pfrs-details/pfrs-details.component.html b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pfrs-details/pfrs-details.component.html index 8eb5a68445..c4d8a0af07 100644 --- a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pfrs-details/pfrs-details.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pfrs-details/pfrs-details.component.html @@ -1,7 +1,6 @@ <div *ngIf="_noiSubmission" class="review-table"> <div class="subheading2 grid-1"> Has the ALC previously received an application or Notice of Intent for this proposal? - <app-updated-banner *ngIf="updatedFields.includes('soilIsFollowUp')"></app-updated-banner> </div> <div class="grid-double"> <span *ngIf="_noiSubmission.soilIsFollowUp !== null"> @@ -12,7 +11,6 @@ <div *ngIf="_noiSubmission.soilIsFollowUp" class="subheading2 grid-1"> Application or NOI ID - <app-updated-banner *ngIf="updatedFields.includes('soilFollowUpIDs')"></app-updated-banner> </div> <div *ngIf="_noiSubmission.soilIsFollowUp" class="grid-double"> {{ _noiSubmission.soilFollowUpIDs }} @@ -21,7 +19,6 @@ <div class="subheading2 grid-1"> What is the purpose of the proposal? - <app-updated-banner *ngIf="updatedFields.includes('purpose')"></app-updated-banner> </div> <div class="grid-double"> {{ _noiSubmission.purpose }} @@ -30,7 +27,6 @@ <div class="subheading2 grid-1"> Describe the type of soil proposed to be removed. - <app-updated-banner *ngIf="updatedFields.includes('soilTypeRemoved')"></app-updated-banner> </div> <div class="grid-double"> {{ _noiSubmission.soilTypeRemoved }} @@ -39,7 +35,6 @@ <div class="subheading2 grid-1"> Describe the type, origin and quality of fill proposed to be placed. - <app-updated-banner *ngIf="updatedFields.includes('soilFillTypeToPlace')"></app-updated-banner> </div> <div class="grid-double"> {{ _noiSubmission.soilFillTypeToPlace }} @@ -51,27 +46,11 @@ <div> <strong >Soil to be Removed - <app-updated-banner - *ngIf=" - updatedFields.includes('soilToRemoveVolume') || - updatedFields.includes('soilToRemoveArea') || - updatedFields.includes('soilToRemoveMaximumDepth') || - updatedFields.includes('soilToRemoveAverageDepth') - " - ></app-updated-banner> </strong> </div> <div> <strong >Fill to be Placed - <app-updated-banner - *ngIf=" - updatedFields.includes('soilToPlaceVolume') || - updatedFields.includes('soilToPlaceArea') || - updatedFields.includes('soilToPlaceMaximumDepth') || - updatedFields.includes('soilToPlaceAverageDepth') - " - ></app-updated-banner> </strong> </div> @@ -129,27 +108,11 @@ <div> <strong >Soil already Removed - <app-updated-banner - *ngIf=" - updatedFields.includes('soilAlreadyRemovedVolume') || - updatedFields.includes('soilAlreadyRemovedArea') || - updatedFields.includes('soilAlreadyRemovedMaximumDepth') || - updatedFields.includes('soilAlreadyPlacedAverageDepth') - " - ></app-updated-banner> </strong> </div> <div> <strong >Fill already Placed - <app-updated-banner - *ngIf=" - updatedFields.includes('soilAlreadyPlacedVolume') || - updatedFields.includes('soilAlreadyPlacedArea') || - updatedFields.includes('soilAlreadyPlacedMaximumDepth') || - updatedFields.includes('soilAlreadyPlacedAverageDepth') - " - ></app-updated-banner> </strong> </div> @@ -219,7 +182,6 @@ <h4>Project Duration</h4> </div> <div class="subheading2 grid-1"> Duration - <app-updated-banner *ngIf="updatedFields.includes('soilProjectDurationUnit')"></app-updated-banner> </div> <div class="grid-double"> {{ _noiSubmission.soilProjectDurationUnit }} @@ -227,7 +189,6 @@ <h4>Project Duration</h4> </div> <div class="subheading2 grid-1"> Length - <app-updated-banner *ngIf="updatedFields.includes('soilProjectDurationAmount')"></app-updated-banner> </div> <div class="grid-double"> {{ _noiSubmission.soilProjectDurationAmount }} @@ -244,7 +205,6 @@ <h4>Project Duration</h4> <div class="subheading2 grid-1"> Is your proposal for area-wide filling? - <app-updated-banner *ngIf="updatedFields.includes('soilIsAreaWideFilling')"></app-updated-banner> </div> <div class="grid-double"> <span *ngIf="_noiSubmission.soilIsAreaWideFilling !== null"> @@ -255,7 +215,6 @@ <h4>Project Duration</h4> <div class="subheading2 grid-1"> Is your proposal for aggregate extraction or placer mining? - <app-updated-banner *ngIf="updatedFields.includes('soilIsExtractionOrMining')"></app-updated-banner> </div> <div class="grid-double"> <span *ngIf="_noiSubmission.soilIsExtractionOrMining !== null"> @@ -284,7 +243,6 @@ <h4>Project Duration</h4> <ng-container *ngIf="_noiSubmission.soilIsExtractionOrMining"> <div class="subheading2 grid-1"> Have you submitted a Notice of Work to the Ministry of Energy, Mines and Low Carbon Innovation (EMLI)? - <app-updated-banner *ngIf="updatedFields.includes('soilHasSubmittedNotice')"></app-updated-banner> </div> <div class="grid-double"> <span *ngIf="_noiSubmission.soilHasSubmittedNotice !== null"> diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pfrs-details/pfrs-details.component.ts b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pfrs-details/pfrs-details.component.ts index 7362317011..d4bf554748 100644 --- a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pfrs-details/pfrs-details.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pfrs-details/pfrs-details.component.ts @@ -14,7 +14,6 @@ export class PfrsDetailsComponent { @Input() showErrors = true; @Input() showEdit = true; @Input() draftMode = false; - @Input() updatedFields: string[] = []; _noiSubmission: NoticeOfIntentSubmissionDetailedDto | undefined; diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pofo-details/pofo-details.component.html b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pofo-details/pofo-details.component.html index 0c2b15c43e..f1ba6c069b 100644 --- a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pofo-details/pofo-details.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pofo-details/pofo-details.component.html @@ -1,7 +1,6 @@ <div *ngIf="_noiSubmission" class="review-table"> <div class="subheading2 grid-1"> Has the ALC previously received an application or Notice of Intent for this proposal? - <app-updated-banner *ngIf="updatedFields.includes('soilIsFollowUp')"></app-updated-banner> </div> <div class="grid-double"> <span *ngIf="_noiSubmission.soilIsFollowUp !== null"> @@ -12,7 +11,6 @@ <div *ngIf="_noiSubmission.soilIsFollowUp" class="subheading2 grid-1"> Application or NOI ID - <app-updated-banner *ngIf="updatedFields.includes('soilFollowUpIDs')"></app-updated-banner> </div> <div *ngIf="_noiSubmission.soilIsFollowUp" class="grid-double"> {{ _noiSubmission.soilFollowUpIDs }} @@ -21,7 +19,6 @@ <div class="subheading2 grid-1"> What is the purpose of the proposal? - <app-updated-banner *ngIf="updatedFields.includes('purpose')"></app-updated-banner> </div> <div class="grid-double"> {{ _noiSubmission.purpose }} @@ -30,7 +27,6 @@ <div class="subheading2 grid-1"> Describe the type, origin and quality of fill proposed to be placed. - <app-updated-banner *ngIf="updatedFields.includes('soilFillTypeToPlace')"></app-updated-banner> </div> <div class="grid-double"> {{ _noiSubmission.soilFillTypeToPlace }} @@ -41,14 +37,6 @@ <div class="grid-1"></div> <div class="grid-2"> <strong> Fill to be Placed</strong> - <app-updated-banner - *ngIf=" - updatedFields.includes('soilToPlaceVolume') || - updatedFields.includes('soilToPlaceArea') || - updatedFields.includes('soilToPlaceMaximumDepth') || - updatedFields.includes('soilToPlaceAverageDepth') - " - ></app-updated-banner> </div> <div class="grid-1"><strong>Volume</strong></div> <div class="grid-2"> @@ -79,14 +67,6 @@ <div class="grid-1"></div> <div class="grid-2"> <strong> Fill already Placed</strong> - <app-updated-banner - *ngIf=" - updatedFields.includes('soilAlreadyPlacedVolume') || - updatedFields.includes('soilAlreadyPlacedArea') || - updatedFields.includes('soilAlreadyPlacedMaximumDepth') || - updatedFields.includes('soilAlreadyPlacedAverageDepth') - " - ></app-updated-banner> </div> <div class="grid-1"><strong>Volume</strong></div> <div class="grid-2"> @@ -125,7 +105,6 @@ <h4>Project Duration</h4> </div> <div class="subheading2 grid-1"> Duration - <app-updated-banner *ngIf="updatedFields.includes('soilProjectDurationUnit')"></app-updated-banner> </div> <div class="grid-double"> {{ _noiSubmission.soilProjectDurationUnit }} @@ -133,7 +112,6 @@ <h4>Project Duration</h4> </div> <div class="subheading2 grid-1"> Length - <app-updated-banner *ngIf="updatedFields.includes('soilProjectDurationAmount')"></app-updated-banner> </div> <div class="grid-double"> {{ _noiSubmission.soilProjectDurationAmount }} @@ -150,7 +128,6 @@ <h4>Project Duration</h4> <div class="subheading2 grid-1"> Is your proposal for area-wide filling? - <app-updated-banner *ngIf="updatedFields.includes('soilIsAreaWideFilling')"></app-updated-banner> </div> <div class="grid-double"> <span *ngIf="_noiSubmission.soilIsAreaWideFilling !== null"> diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pofo-details/pofo-details.component.ts b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pofo-details/pofo-details.component.ts index ca7f7ed72c..115a9bcaeb 100644 --- a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pofo-details/pofo-details.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pofo-details/pofo-details.component.ts @@ -14,7 +14,6 @@ export class PofoDetailsComponent { @Input() showErrors = true; @Input() showEdit = true; @Input() draftMode = false; - @Input() updatedFields: string[] = []; _noiSubmission: NoticeOfIntentSubmissionDetailedDto | undefined; diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/roso-details/roso-details.component.html b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/roso-details/roso-details.component.html index 68f97c3f2b..a8938add2a 100644 --- a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/roso-details/roso-details.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/roso-details/roso-details.component.html @@ -1,7 +1,6 @@ <div *ngIf="_noiSubmission" class="review-table"> <div class="subheading2 grid-1"> Has the ALC previously received an application or Notice of Intent for this proposal? - <app-updated-banner *ngIf="updatedFields.includes('soilIsFollowUp')"></app-updated-banner> </div> <div class="grid-double"> <span *ngIf="_noiSubmission.soilIsFollowUp !== null"> @@ -10,28 +9,19 @@ <app-no-data [showRequired]="showErrors" *ngIf="_noiSubmission.soilIsFollowUp === null"></app-no-data> </div> - <div *ngIf="_noiSubmission.soilIsFollowUp" class="subheading2 grid-1"> - Application or NOI ID - <app-updated-banner *ngIf="updatedFields.includes('soilFollowUpIDs')"></app-updated-banner> - </div> + <div *ngIf="_noiSubmission.soilIsFollowUp" class="subheading2 grid-1">Application or NOI ID</div> <div *ngIf="_noiSubmission.soilIsFollowUp" class="grid-double"> {{ _noiSubmission.soilFollowUpIDs }} <app-no-data [showRequired]="showErrors" *ngIf="!_noiSubmission.soilFollowUpIDs"></app-no-data> </div> - <div class="subheading2 grid-1"> - What is the purpose of the proposal? - <app-updated-banner *ngIf="updatedFields.includes('purpose')"></app-updated-banner> - </div> + <div class="subheading2 grid-1">What is the purpose of the proposal?</div> <div class="grid-double"> {{ _noiSubmission.purpose }} <app-no-data [showRequired]="showErrors" *ngIf="!_noiSubmission.purpose"></app-no-data> </div> - <div class="subheading2 grid-1"> - Describe the type of soil proposed to be removed. - <app-updated-banner *ngIf="updatedFields.includes('soilTypeRemoved')"></app-updated-banner> - </div> + <div class="subheading2 grid-1">Describe the type of soil proposed to be removed.</div> <div class="grid-double"> {{ _noiSubmission.soilTypeRemoved }} <app-no-data [showRequired]="showErrors" *ngIf="!_noiSubmission.soilTypeRemoved"></app-no-data> @@ -42,7 +32,6 @@ <div class="grid-1"></div> <div class="grid-2"> <strong>Soil to be Removed</strong> - <app-updated-banner *ngIf="updatedFields.includes('soilToRemoveVolume')"></app-updated-banner> </div> <div class="grid-1"><strong>Volume</strong></div> <div class="grid-2"> @@ -74,14 +63,6 @@ <div class="grid-1"></div> <div class="grid-2"> <strong>Soil already Removed</strong> - <app-updated-banner - *ngIf=" - updatedFields.includes('soilAlreadyRemovedVolume') || - updatedFields.includes('soilAlreadyRemovedArea') || - updatedFields.includes('soilAlreadyRemovedMaximumDepth') || - updatedFields.includes('soilAlreadyRemovedAverageDepth') - " - ></app-updated-banner> </div> <div class="grid-1"><strong>Volume</strong></div> <div class="grid-2"> @@ -118,18 +99,12 @@ <div class="full-width"> <h4>Project Duration</h4> </div> - <div class="subheading2 grid-1"> - Duration - <app-updated-banner *ngIf="updatedFields.includes('soilProjectDurationUnit')"></app-updated-banner> - </div> + <div class="subheading2 grid-1">Duration</div> <div class="grid-double"> {{ _noiSubmission.soilProjectDurationUnit }} <app-no-data [showRequired]="showErrors" *ngIf="!_noiSubmission.soilProjectDurationUnit"></app-no-data> </div> - <div class="subheading2 grid-1"> - Length - <app-updated-banner *ngIf="updatedFields.includes('soilProjectDurationAmount')"></app-updated-banner> - </div> + <div class="subheading2 grid-1">Length</div> <div class="grid-double"> {{ _noiSubmission.soilProjectDurationAmount }} <app-no-data [showRequired]="showErrors" *ngIf="!_noiSubmission.soilProjectDurationAmount"></app-no-data> @@ -143,10 +118,7 @@ <h4>Project Duration</h4> <app-no-data [showRequired]="showErrors" *ngIf="proposalMap.length === 0"></app-no-data> </div> - <div class="subheading2 grid-1"> - Is your proposal for aggregate extraction or placer mining? - <app-updated-banner *ngIf="updatedFields.includes('soilIsExtractionOrMining')"></app-updated-banner> - </div> + <div class="subheading2 grid-1">Is your proposal for aggregate extraction or placer mining?</div> <div class="grid-double"> <span *ngIf="_noiSubmission.soilIsExtractionOrMining !== null"> {{ _noiSubmission.soilIsExtractionOrMining ? 'Yes' : 'No' }} @@ -173,7 +145,6 @@ <h4>Project Duration</h4> <div class="subheading2 grid-1"> Have you submitted a Notice of Work to the Ministry of Energy, Mines and Low Carbon Innovation (EMLI)? - <app-updated-banner *ngIf="updatedFields.includes('soilHasSubmittedNotice')"></app-updated-banner> </div> <div class="grid-double"> <span *ngIf="_noiSubmission.soilHasSubmittedNotice !== null"> diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/roso-details/roso-details.component.ts b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/roso-details/roso-details.component.ts index cceb8fc61a..4b352feab2 100644 --- a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/roso-details/roso-details.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/roso-details/roso-details.component.ts @@ -14,7 +14,6 @@ export class RosoDetailsComponent { @Input() showErrors = true; @Input() showEdit = true; @Input() draftMode = false; - @Input() updatedFields: string[] = []; _noiSubmission: NoticeOfIntentSubmissionDetailedDto | undefined; diff --git a/portal-frontend/src/app/features/notifications/notification-details/parcel/parcel.component.ts b/portal-frontend/src/app/features/notifications/notification-details/parcel/parcel.component.ts index c7430df8dd..a84c744d04 100644 --- a/portal-frontend/src/app/features/notifications/notification-details/parcel/parcel.component.ts +++ b/portal-frontend/src/app/features/notifications/notification-details/parcel/parcel.component.ts @@ -24,7 +24,6 @@ export class ParcelComponent { submissionUuid = ''; parcels: NotificationParcelDto[] = []; noticeOfIntentSubmission!: NotificationSubmissionDetailedDto; - updatedFields: string[] = []; constructor(private noticeOfIntentParcelService: NotificationParcelService, private router: Router) {} diff --git a/portal-frontend/src/app/shared/shared.module.ts b/portal-frontend/src/app/shared/shared.module.ts index 13edc760b8..d8185f9212 100644 --- a/portal-frontend/src/app/shared/shared.module.ts +++ b/portal-frontend/src/app/shared/shared.module.ts @@ -42,7 +42,6 @@ import { PhoneValidPipe } from './pipes/phoneValid.pipe'; import { TableColumnNoDataPipe } from './pipes/table-column-no-data.pipe'; import { PresribedBodyComponent } from './presribed-body/presribed-body.component'; import { SoilTableComponent } from './soil-table/soil-table.component'; -import { UpdatedBannerComponent } from './updated-banner/updated-banner.component'; import { DATE_FORMATS } from './utils/date-format'; import { ValidationErrorComponent } from './validation-error/validation-error.component'; import { WarningBannerComponent } from './warning-banner/warning-banner.component'; @@ -84,7 +83,6 @@ import { WarningBannerComponent } from './warning-banner/warning-banner.componen WarningBannerComponent, InfoBannerComponent, NoDataComponent, - UpdatedBannerComponent, ValidationErrorComponent, CustomStepperComponent, MomentPipe, @@ -123,7 +121,6 @@ import { WarningBannerComponent } from './warning-banner/warning-banner.componen PhoneValidPipe, WarningBannerComponent, InfoBannerComponent, - UpdatedBannerComponent, MatDatepickerModule, MatNativeDateModule, MatAutocompleteModule, diff --git a/portal-frontend/src/app/shared/updated-banner/updated-banner.component.html b/portal-frontend/src/app/shared/updated-banner/updated-banner.component.html deleted file mode 100644 index 8c3471d43e..0000000000 --- a/portal-frontend/src/app/shared/updated-banner/updated-banner.component.html +++ /dev/null @@ -1,3 +0,0 @@ -<div class="updated-banner subheading2"> - updated -</div> diff --git a/portal-frontend/src/app/shared/updated-banner/updated-banner.component.scss b/portal-frontend/src/app/shared/updated-banner/updated-banner.component.scss deleted file mode 100644 index bde4e19dc1..0000000000 --- a/portal-frontend/src/app/shared/updated-banner/updated-banner.component.scss +++ /dev/null @@ -1,11 +0,0 @@ -@use '../../../styles/functions' as *; -@use '../../../styles/colors'; - -.updated-banner { - display: inline-block; - color: colors.$white; - background-color: #c08106; - padding: rem(4); - font-style: italic; - font-weight: bold; -} diff --git a/portal-frontend/src/app/shared/updated-banner/updated-banner.component.spec.ts b/portal-frontend/src/app/shared/updated-banner/updated-banner.component.spec.ts deleted file mode 100644 index a3a1b3feed..0000000000 --- a/portal-frontend/src/app/shared/updated-banner/updated-banner.component.spec.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { NO_ERRORS_SCHEMA } from '@angular/core'; -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { UpdatedBannerComponent } from './updated-banner.component'; - -describe('UpdatedBannerComponent', () => { - let component: UpdatedBannerComponent; - let fixture: ComponentFixture<UpdatedBannerComponent>; - - beforeEach(async () => { - await TestBed.configureTestingModule({ - declarations: [UpdatedBannerComponent], - schemas: [NO_ERRORS_SCHEMA], - }).compileComponents(); - - fixture = TestBed.createComponent(UpdatedBannerComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/portal-frontend/src/app/shared/updated-banner/updated-banner.component.ts b/portal-frontend/src/app/shared/updated-banner/updated-banner.component.ts deleted file mode 100644 index 6f7317836b..0000000000 --- a/portal-frontend/src/app/shared/updated-banner/updated-banner.component.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { Component } from '@angular/core'; - -@Component({ - selector: 'app-updated-banner', - templateUrl: './updated-banner.component.html', - styleUrls: ['./updated-banner.component.scss'], -}) -export class UpdatedBannerComponent { - constructor() {} -} From dd5ab9747ddc81e889b538073299f2215a9e5bf2 Mon Sep 17 00:00:00 2001 From: "to. sandra" <76515860+sandratoh@users.noreply.github.com> Date: Tue, 3 Oct 2023 11:02:59 -0700 Subject: [PATCH 447/954] Portal table entry bug fixes (#1025) * Save naru soil and fill table data on change * Update soil table to prevent user error from number input mask * Revert already removed/filled table to default 0 --- .../naru-proposal/naru-proposal.component.html | 5 ++--- .../proposal/naru-proposal/naru-proposal.component.ts | 4 ++++ .../app/shared/soil-table/soil-table.component.html | 10 +++++++++- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.html index 029e424f04..1e37f1bd57 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.html @@ -510,6 +510,7 @@ <h3>Soil & Fill Components</h3> [disabled]="willImportFill.value === 'false'" tableHeader="Fill to be Placed" [(data)]="fillTableData" + (dataChange)="markDirty()" ></app-soil-table> </section> @@ -537,9 +538,7 @@ <h4>Project Duration</h4> </div> <div> <label for="projectDurationAmount">Length</label> - <div class='subtext'> - Decimals can be used - e.g. 3.5 months or 1.5 years - </div> + <div class="subtext">Decimals can be used - e.g. 3.5 months or 1.5 years</div> <mat-form-field appearance="outline"> <input id="projectDurationAmount" diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.ts index a24d2e6eb1..125f7092c1 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.ts @@ -220,4 +220,8 @@ export class NaruProposalComponent extends FilesStepComponent implements OnInit, const subtypes = await this.codeService.loadCodes(); this.naruSubtypes = subtypes.naruSubtypes; } + + markDirty() { + this.form.markAsDirty(); + } } diff --git a/portal-frontend/src/app/shared/soil-table/soil-table.component.html b/portal-frontend/src/app/shared/soil-table/soil-table.component.html index d261e01da8..2a2bb1d1b3 100644 --- a/portal-frontend/src/app/shared/soil-table/soil-table.component.html +++ b/portal-frontend/src/app/shared/soil-table/soil-table.component.html @@ -32,6 +32,7 @@ separatorLimit="9999999999" matInput formControlName="volume" + onfocus="this.select()" /> <span matTextSuffix>m<sup>3</sup></span> </mat-form-field> @@ -50,6 +51,7 @@ separatorLimit="9999999999" matInput formControlName="volume2" + onfocus="this.select()" /> <span matTextSuffix>m<sup>3</sup></span> </mat-form-field> @@ -72,6 +74,7 @@ separatorLimit="9999999999" matInput formControlName="area" + onfocus="this.select()" /> <span matTextSuffix>m<sup>2</sup></span> </mat-form-field> @@ -90,6 +93,7 @@ separatorLimit="9999999999" matInput formControlName="area2" + onfocus="this.select()" /> <span matTextSuffix>m<sup>2</sup></span> </mat-form-field> @@ -112,6 +116,7 @@ separatorLimit="9999999999" matInput formControlName="maximumDepth" + onfocus="this.select()" /> <span matTextSuffix>m</span> </mat-form-field> @@ -130,6 +135,7 @@ separatorLimit="9999999999" matInput formControlName="maximumDepth2" + onfocus="this.select()" /> <span matTextSuffix>m</span> </mat-form-field> @@ -152,6 +158,7 @@ separatorLimit="9999999999" matInput formControlName="averageDepth" + onfocus="this.select()" /> <span matTextSuffix>m</span> </mat-form-field> @@ -160,7 +167,7 @@ <div *ngIf="averageDepth.errors?.['required']">This field is required</div> </div> </div> - <div *ngIf='!!data2'> + <div *ngIf="!!data2"> <mat-form-field appearance="outline"> <input min="0.01" @@ -170,6 +177,7 @@ separatorLimit="9999999999" matInput formControlName="averageDepth2" + onfocus="this.select()" /> <span matTextSuffix>m</span> </mat-form-field> From 1be5ab97512c8f95f2c9fb4088180c113c4cafed Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Tue, 3 Oct 2023 12:07:13 -0700 Subject: [PATCH 448/954] Add user dropdown to Portal * Store and map business name from bceid * Send to front end and display in new dropdown menu --- .../authentication/authentication.dto.ts | 1 + .../src/app/shared/header/header.component.html | 14 ++++++++++++++ .../src/app/shared/header/header.component.scss | 11 +++++++++++ .../app/shared/header/header.component.spec.ts | 3 ++- .../src/app/shared/header/header.component.ts | 7 +++++-- .../authorization/authorization.service.ts | 2 ++ .../1696358673288-add_user_business.ts | 17 +++++++++++++++++ services/apps/alcs/src/user/user.dto.ts | 4 ++++ services/apps/alcs/src/user/user.entity.ts | 4 ++++ 9 files changed, 60 insertions(+), 3 deletions(-) create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1696358673288-add_user_business.ts diff --git a/portal-frontend/src/app/services/authentication/authentication.dto.ts b/portal-frontend/src/app/services/authentication/authentication.dto.ts index 0ca335f035..b5dd877157 100644 --- a/portal-frontend/src/app/services/authentication/authentication.dto.ts +++ b/portal-frontend/src/app/services/authentication/authentication.dto.ts @@ -9,4 +9,5 @@ export interface UserDto { government?: string; isLocalGovernment: boolean; isFirstNationGovernment: boolean; + businessName?: string | null; } diff --git a/portal-frontend/src/app/shared/header/header.component.html b/portal-frontend/src/app/shared/header/header.component.html index 62a0a86f02..e6a1a81016 100644 --- a/portal-frontend/src/app/shared/header/header.component.html +++ b/portal-frontend/src/app/shared/header/header.component.html @@ -25,6 +25,20 @@ <h5 class="center"> </div> <div *ngIf="isAuthenticated" class="controls"> + <button + mat-button + color="primary" + [class.open]="menuTrigger.menuOpen" + #menuTrigger="matMenuTrigger" + [matMenuTriggerFor]="userMenu" + > + <div class="center">{{ user?.name }} <mat-icon> arrow_drop_down </mat-icon></div> + </button> + <mat-menu class="user-menu" #userMenu="matMenu"> + <div class="item">User ID: {{ user?.bceidUserName }}</div> + <div class="item">Business: {{ user?.businessName }}</div> + <div class="item">Type: {{ user?.businessName ? 'BCeID Business' : 'BCeID Basic' }}</div> + </mat-menu> <button class="inbox-btn" routerLink="/home" mat-flat-button color="primary">Portal Inbox</button> <button class="logout-btn" (click)="onLogout()" mat-stroked-button color="primary">Log Out</button> </div> diff --git a/portal-frontend/src/app/shared/header/header.component.scss b/portal-frontend/src/app/shared/header/header.component.scss index f2c606ad5e..ea846103bf 100644 --- a/portal-frontend/src/app/shared/header/header.component.scss +++ b/portal-frontend/src/app/shared/header/header.component.scss @@ -1,6 +1,12 @@ @use '../../../styles/functions' as *; @use '../../../styles/colors' as colors; +::ng-deep { + .user-menu { + max-width: unset !important; + } +} + .top-nav { background-color: colors.$primary-color-dark; padding: rem(8) rem(24); @@ -125,3 +131,8 @@ header { } } } + +.item { + padding: rem(12) rem(16); + min-width: rem(212); +} diff --git a/portal-frontend/src/app/shared/header/header.component.spec.ts b/portal-frontend/src/app/shared/header/header.component.spec.ts index ebfc183157..e3f99ff09f 100644 --- a/portal-frontend/src/app/shared/header/header.component.spec.ts +++ b/portal-frontend/src/app/shared/header/header.component.spec.ts @@ -2,6 +2,7 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { BehaviorSubject } from 'rxjs'; +import { UserDto } from '../../services/authentication/authentication.dto'; import { AuthenticationService, ICurrentUser } from '../../services/authentication/authentication.service'; import { HeaderComponent } from './header.component'; @@ -13,7 +14,7 @@ describe('HeaderComponent', () => { beforeEach(async () => { mockAuthService = createMock(); - mockAuthService.$currentTokenUser = new BehaviorSubject<ICurrentUser | undefined>(undefined); + mockAuthService.$currentProfile = new BehaviorSubject<UserDto | undefined>(undefined); await TestBed.configureTestingModule({ declarations: [HeaderComponent], diff --git a/portal-frontend/src/app/shared/header/header.component.ts b/portal-frontend/src/app/shared/header/header.component.ts index 60bf06bab5..f0a47b29be 100644 --- a/portal-frontend/src/app/shared/header/header.component.ts +++ b/portal-frontend/src/app/shared/header/header.component.ts @@ -1,7 +1,8 @@ import { ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core'; import { Router } from '@angular/router'; import { Subject, takeUntil } from 'rxjs'; -import { AuthenticationService } from '../../services/authentication/authentication.service'; +import { UserDto } from '../../services/authentication/authentication.dto'; +import { AuthenticationService, ICurrentUser } from '../../services/authentication/authentication.service'; @Component({ selector: 'app-header', @@ -15,6 +16,7 @@ export class HeaderComponent implements OnInit, OnDestroy { isOnSearch = false; title = 'Provincial Agricultural Land Commission Portal'; + user: UserDto | undefined; constructor( private authenticationService: AuthenticationService, @@ -23,8 +25,9 @@ export class HeaderComponent implements OnInit, OnDestroy { ) {} ngOnInit(): void { - this.authenticationService.$currentTokenUser.pipe(takeUntil(this.$destroy)).subscribe((user) => { + this.authenticationService.$currentProfile.pipe(takeUntil(this.$destroy)).subscribe((user) => { this.isAuthenticated = !!user; + this.user = user; this.changeDetectorRef.detectChanges(); }); diff --git a/services/apps/alcs/src/common/authorization/authorization.service.ts b/services/apps/alcs/src/common/authorization/authorization.service.ts index 57b2a9bf2f..c0691fbaeb 100644 --- a/services/apps/alcs/src/common/authorization/authorization.service.ts +++ b/services/apps/alcs/src/common/authorization/authorization.service.ts @@ -46,6 +46,7 @@ export type BCeIDBasicToken = BaseToken & { bceid_user_guid: string; bceid_username: string; bceid_business_guid?: string; + bceid_business_name?: string; }; @Injectable() @@ -161,6 +162,7 @@ export class AuthorizationService { bceidBusinessGuid: bceidToken.bceid_business_guid, bceidUserName: bceidToken.bceid_username, clientRoles: bceidToken.client_roles || [], + businessName: bceidToken.bceid_business_name, }; } throw new Error( diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1696358673288-add_user_business.ts b/services/apps/alcs/src/providers/typeorm/migrations/1696358673288-add_user_business.ts new file mode 100644 index 0000000000..e71296cba4 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1696358673288-add_user_business.ts @@ -0,0 +1,17 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class addUserBusiness1696358673288 implements MigrationInterface { + name = 'addUserBusiness1696358673288'; + + public async up(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `ALTER TABLE "alcs"."user" ADD "business_name" character varying`, + ); + } + + public async down(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `ALTER TABLE "alcs"."user" DROP COLUMN "business_name"`, + ); + } +} diff --git a/services/apps/alcs/src/user/user.dto.ts b/services/apps/alcs/src/user/user.dto.ts index 6efee456af..4330013a01 100644 --- a/services/apps/alcs/src/user/user.dto.ts +++ b/services/apps/alcs/src/user/user.dto.ts @@ -39,6 +39,9 @@ export class UserDto extends UpdateUserDto { @AutoMap() prettyName?: string | null; + @AutoMap(() => String) + businessName?: string | null; + government?: string; isLocalGovernment: boolean; isFirstNationGovernment: boolean; @@ -58,6 +61,7 @@ export class CreateUserDto { idirUserGuid?: string; bceidGuid?: string; bceidBusinessGuid?: string | null; + businessName?: string | null; } export class AssigneeDto { diff --git a/services/apps/alcs/src/user/user.entity.ts b/services/apps/alcs/src/user/user.entity.ts index 1016ef31d2..e19f40b92a 100644 --- a/services/apps/alcs/src/user/user.entity.ts +++ b/services/apps/alcs/src/user/user.entity.ts @@ -46,6 +46,10 @@ export class User extends Base { @Column({ nullable: true }) familyName: string; + @AutoMap(() => String) + @Column({ type: 'varchar', nullable: true }) + businessName: string | null; + @AutoMap() @Index({ unique: true }) @Column({ nullable: true }) From a7d5740081321efdcee290f3e2551aab1aa69d8f Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Tue, 3 Oct 2023 12:50:34 -0700 Subject: [PATCH 449/954] Feature/alcs 1185 improvements (#1027) introduce new logger for etl replace all 'print' and 'old logger' with new logger functionality --- bin/.gitignore | 1 + .../applications/app_prep.py | 89 ++++++++--------- .../submission_status_email.py | 13 ++- .../applications/base_applications.py | 97 ++++++++++--------- .../submissions/app_submissions.py | 58 +++++------ bin/migrate-oats-data/common/__init__.py | 2 +- bin/migrate-oats-data/common/etl_logger.py | 54 +++++++---- bin/migrate-oats-data/common/json_encoder.py | 11 +++ bin/migrate-oats-data/db.py | 1 + .../menu/commands/applications.py | 6 +- .../menu/commands/clean_all.py | 2 +- .../menu/commands/documents.py | 6 +- .../menu/commands/import_all.py | 2 +- .../menu/commands/notice_of_intents.py | 13 ++- bin/migrate-oats-data/migrate.py | 10 +- .../submission_status_email.py | 17 ++-- .../noi/notice_of_intent_init.py | 68 ++++++------- .../noi/notice_of_intent_migration.py | 11 +-- ...otice_of_intent_empty_adjacent_land_use.py | 34 ++----- ..._of_intent_submission_adjacent_land_use.py | 53 ++++------ .../notice_of_intent_proposal_fields.py | 24 ++--- .../notice_of_intent_soil_fields.py | 31 +++--- .../notice_of_intent_submission_init.py | 31 +++--- .../notice_of_intent_decision_date.py | 30 +++--- ...oats_to_alcs_notice_of_intent_table_etl.py | 41 ++++---- 25 files changed, 345 insertions(+), 360 deletions(-) diff --git a/bin/.gitignore b/bin/.gitignore index 158cf1227e..c1cc8cb3e0 100644 --- a/bin/.gitignore +++ b/bin/.gitignore @@ -1,6 +1,7 @@ .env out tmp +logs *.log.txt __pycache__ *last_imported_application_file.txt diff --git a/bin/migrate-oats-data/applications/app_prep.py b/bin/migrate-oats-data/applications/app_prep.py index 8b69a6be12..9f5cd66365 100644 --- a/bin/migrate-oats-data/applications/app_prep.py +++ b/bin/migrate-oats-data/applications/app_prep.py @@ -4,21 +4,16 @@ OATS_NFU_SUBTYPES, AlcsAgCap, AlcsAgCapSource, - log, - log_start, OatsLegislationCodes, AlcsApplicantType, + setup_and_get_logger, + BATCH_UPLOAD_SIZE, ) from db import inject_conn_pool -from common import BATCH_UPLOAD_SIZE from psycopg2.extras import execute_batch, RealDictCursor -import traceback from enum import Enum -etl_name = "alcs_app_prep" - - class OatsToAlcsNfuTypes(Enum): AGR = AlcsNfuTypeCode.Agricultural_Farm.value CIV = AlcsNfuTypeCode.Civic_Institutional.value @@ -52,6 +47,10 @@ class OatsLegislationCodes(Enum): SEC_17_1 = AlcsApplicantType.LFNG.value +etl_name = "process_alcs_application_prep_fields" +logger = setup_and_get_logger(etl_name) + + @inject_conn_pool def process_alcs_application_prep_fields(conn=None, batch_size=BATCH_UPLOAD_SIZE): """ @@ -61,8 +60,7 @@ def process_alcs_application_prep_fields(conn=None, batch_size=BATCH_UPLOAD_SIZE conn (psycopg2.extensions.connection): PostgreSQL database connection. Provided by the decorator. batch_size (int): The number of items to process at once. Defaults to BATCH_UPLOAD_SIZE. """ - etl_name = "process_alcs_application_prep_fields" - log_start(etl_name) + logger.info(f"Start {etl_name}") with conn.cursor(cursor_factory=RealDictCursor) as cursor: with open( @@ -73,7 +71,7 @@ def process_alcs_application_prep_fields(conn=None, batch_size=BATCH_UPLOAD_SIZE count_query = sql_file.read() cursor.execute(count_query) count_total = dict(cursor.fetchone())["count"] - print("- Total Application Prep data to insert: ", count_total) + logger.info(f"Total Application Prep data to insert: {count_total}") failed_inserts = 0 successful_updates_count = 0 @@ -97,33 +95,28 @@ def process_alcs_application_prep_fields(conn=None, batch_size=BATCH_UPLOAD_SIZE try: applications_to_be_updated_count = len(rows) - update_app_prep_records(conn, batch_size, cursor, rows) + _update_app_prep_records(conn, batch_size, cursor, rows) successful_updates_count = ( successful_updates_count + applications_to_be_updated_count ) last_application_id = dict(rows[-1])["alr_application_id"] - print( + logger.debug( f"retrieved/updated items count: {applications_to_be_updated_count}; total successfully updated applications so far {successful_updates_count}; last updated application_id: {last_application_id}" ) except Exception as e: # this is NOT going to be caused by actual data update failure. This code is only executed when the code error appears or connection to DB is lost + logger.exception() conn.rollback() - str_err = str(e) - trace_err = traceback.format_exc() - print(str_err) - print(trace_err) - log(etl_name, str_err, trace_err) failed_inserts = count_total - successful_updates_count last_application_id = last_application_id + 1 - print("Total amount of successful updates:", successful_updates_count) - print("Total failed updates:", failed_inserts) - log(etl_name) + logger.info(f"Total amount of successful updates: {successful_updates_count}") + logger.info(f"Total failed updates: {failed_inserts}") -def update_app_prep_records(conn, batch_size, cursor, rows): +def _update_app_prep_records(conn, batch_size, cursor, rows): """ Function to update application records in batches. @@ -142,12 +135,12 @@ def update_app_prep_records(conn, batch_size, cursor, rows): other_data_list, exc_data_list, inc_data_list, - ) = prepare_app_prep_data(rows) + ) = _prepare_app_prep_data(rows) if len(nfu_data_list) > 0: execute_batch( cursor, - get_update_query_for_nfu(), + _get_update_query_for_nfu(), nfu_data_list, page_size=batch_size, ) @@ -155,7 +148,7 @@ def update_app_prep_records(conn, batch_size, cursor, rows): if len(nar_data_list) > 0: execute_batch( cursor, - get_update_query_for_nar(), + _get_update_query_for_nar(), nar_data_list, page_size=batch_size, ) @@ -163,7 +156,7 @@ def update_app_prep_records(conn, batch_size, cursor, rows): if len(exc_data_list) > 0: execute_batch( cursor, - get_update_query_for_exc(), + _get_update_query_for_exc(), exc_data_list, page_size=batch_size, ) @@ -171,7 +164,7 @@ def update_app_prep_records(conn, batch_size, cursor, rows): if len(inc_data_list) > 0: execute_batch( cursor, - get_update_query_for_inc(), + _get_update_query_for_inc(), inc_data_list, page_size=batch_size, ) @@ -179,7 +172,7 @@ def update_app_prep_records(conn, batch_size, cursor, rows): if len(other_data_list) > 0: execute_batch( cursor, - get_update_query_for_other(), + _get_update_query_for_other(), other_data_list, page_size=batch_size, ) @@ -187,7 +180,7 @@ def update_app_prep_records(conn, batch_size, cursor, rows): conn.commit() -def prepare_app_prep_data(app_prep_raw_data_list): +def _prepare_app_prep_data(app_prep_raw_data_list): """ This function prepares different lists of data based on the 'alr_change_code' field of each data dict in 'app_prep_raw_data_list'. @@ -208,18 +201,18 @@ def prepare_app_prep_data(app_prep_raw_data_list): for row in app_prep_raw_data_list: data = dict(row) - data = map_basic_field(data) + data = _map_basic_field(data) if data["alr_change_code"] == ALRChangeCode.NFU.value: - data = mapOatsToAlcsAppPrep(data) + data = _mapOatsToAlcsAppPrep(data) nfu_data_list.append(data) elif data["alr_change_code"] == ALRChangeCode.NAR.value: nar_data_list.append(data) elif data["alr_change_code"] == ALRChangeCode.EXC.value: - data = mapOatsToAlcsLegislationCode(data) + data = _mapOatsToAlcsLegislationCode(data) exc_data_list.append(data) elif data["alr_change_code"] == ALRChangeCode.INC.value: - data = mapOatsToAlcsLegislationCode(data) + data = _mapOatsToAlcsLegislationCode(data) inc_data_list.append(data) else: other_data_list.append(data) @@ -227,7 +220,7 @@ def prepare_app_prep_data(app_prep_raw_data_list): return nfu_data_list, nar_data_list, other_data_list, exc_data_list, inc_data_list -def mapOatsToAlcsAppPrep(data): +def _mapOatsToAlcsAppPrep(data): oats_type_code = data["nonfarm_use_type_code"] oats_subtype_code = data["nonfarm_use_subtype_code"] @@ -236,14 +229,14 @@ def mapOatsToAlcsAppPrep(data): OatsToAlcsNfuTypes[data["nonfarm_use_type_code"]].value ) if data["nonfarm_use_subtype_code"]: - data["nonfarm_use_subtype_code"] = map_oats_to_alcs_nfu_subtypes( + data["nonfarm_use_subtype_code"] = _map_oats_to_alcs_nfu_subtypes( oats_type_code, oats_subtype_code ) return data -def mapOatsToAlcsLegislationCode(data): +def _mapOatsToAlcsLegislationCode(data): if data["legislation_code"]: data["legislation_code"] = str( OatsLegislationCodes[data["legislation_code"]].value @@ -252,7 +245,7 @@ def mapOatsToAlcsLegislationCode(data): return data -def get_update_query(unique_fields): +def _get_update_query(unique_fields): # unique_fields takes input from called function and appends to query query = """ UPDATE alcs.application @@ -273,41 +266,41 @@ def get_update_query(unique_fields): return query.format(unique_fields=unique_fields) -def get_update_query_for_nfu(): +def _get_update_query_for_nfu(): unique_fields = """, nfu_use_type = %(nonfarm_use_type_code)s, nfu_use_sub_type = %(nonfarm_use_subtype_code)s, proposal_end_date = %(nonfarm_use_end_date)s""" - return get_update_query(unique_fields) + return _get_update_query(unique_fields) -def get_update_query_for_nar(): +def _get_update_query_for_nar(): # naruSubtype is a part of submission, import there unique_fields = """, proposal_end_date = %(rsdntl_use_end_date)s""" - return get_update_query(unique_fields) + return _get_update_query(unique_fields) -def get_update_query_for_exc(): +def _get_update_query_for_exc(): # exclsn_app_type_code is out of scope. It is a part of submission unique_fields = """, incl_excl_applicant_type = %(legislation_code)s""" - return get_update_query(unique_fields) + return _get_update_query(unique_fields) -def get_update_query_for_inc(): +def _get_update_query_for_inc(): unique_fields = """, incl_excl_applicant_type = %(legislation_code)s""" - return get_update_query(unique_fields) + return _get_update_query(unique_fields) -def get_update_query_for_other(): +def _get_update_query_for_other(): # leaving blank insert for now unique_fields = """""" - return get_update_query(unique_fields) + return _get_update_query(unique_fields) -def map_oats_to_alcs_nfu_subtypes(nfu_type_code, nfu_subtype_code): +def _map_oats_to_alcs_nfu_subtypes(nfu_type_code, nfu_subtype_code): for dict_obj in OATS_NFU_SUBTYPES: if str(dict_obj["type_key"]) == str(nfu_type_code) and str( dict_obj["subtype_key"] @@ -318,7 +311,7 @@ def map_oats_to_alcs_nfu_subtypes(nfu_type_code, nfu_subtype_code): return None -def map_basic_field(data): +def _map_basic_field(data): if data["capability_source_code"]: data["capability_source_code"] = str( OatsToAlcsAgCapSource[data["capability_source_code"]].value diff --git a/bin/migrate-oats-data/applications/application_submission_status_email/submission_status_email.py b/bin/migrate-oats-data/applications/application_submission_status_email/submission_status_email.py index dd0de087d5..599b3c835e 100644 --- a/bin/migrate-oats-data/applications/application_submission_status_email/submission_status_email.py +++ b/bin/migrate-oats-data/applications/application_submission_status_email/submission_status_email.py @@ -1,10 +1,13 @@ +from common import OATS_ETL_USER, setup_and_get_logger from db import inject_conn_pool -import traceback -from common import OATS_ETL_USER + +etl_name = "process_application_submission_status_emails" +logger = setup_and_get_logger(etl_name) @inject_conn_pool def process_application_submission_status_emails(conn=None): + logger.info(f"Start {etl_name}") update_query = f""" UPDATE alcs.application_submission_to_submission_status status SET email_sent_date = '0001-01-01 07:00:00.000 -0700' @@ -17,8 +20,8 @@ def process_application_submission_status_emails(conn=None): with conn.cursor() as cursor: cursor.execute(update_query) conn.commit() - except Exception as error: - print("".join(traceback.format_exception(None, error, error.__traceback__))) + except Exception as err: + logger.exception() cursor.close() conn.close() @@ -36,7 +39,7 @@ def clean_application_submission_status_emails(conn=None): with conn.cursor() as cursor: cursor.execute(update_query) except Exception as error: - print("".join(traceback.format_exception(None, error, error.__traceback__))) + logger.exception() cursor.close() conn.close() diff --git a/bin/migrate-oats-data/applications/base_applications.py b/bin/migrate-oats-data/applications/base_applications.py index e7e167c0b6..2df5a6cf7f 100644 --- a/bin/migrate-oats-data/applications/base_applications.py +++ b/bin/migrate-oats-data/applications/base_applications.py @@ -1,36 +1,8 @@ from db import inject_conn_pool +from common import setup_and_get_logger - -def compile_application_insert_query(number_of_rows_to_insert): - """ - function takes the number of rows to insert and generates an SQL insert statement with upserts using the ON CONFLICT clause - """ - - applications_to_insert = ",".join(["%s"] * number_of_rows_to_insert) - return f""" - INSERT INTO alcs.application (file_number, type_code, - applicant, region_code, local_government_uuid, audit_created_by) - - VALUES{applications_to_insert} - ON CONFLICT (file_number) DO UPDATE SET - file_number = EXCLUDED.file_number, - type_code = EXCLUDED.type_code, - applicant = EXCLUDED.applicant, - region_code = EXCLUDED.region_code, - local_government_uuid = EXCLUDED.local_government_uuid, - audit_created_by = EXCLUDED.audit_created_by - """ - - -# ON CONFLICT needs confirmation of what value is kept -def drop_etl_temp_table(): - """ - remove the table - """ - return f""" - - DROP TABLE IF EXISTS oats.alcs_etl_application_duplicate; - """ +etl_name = "process_applications" +logger = setup_and_get_logger(etl_name) @inject_conn_pool @@ -38,6 +10,7 @@ def process_applications(conn=None, batch_size=10000): """ function uses a decorator pattern @inject_conn_pool to inject a database connection pool to the function. It fetches the total count of non duplicate applications and prints it to the console. Then, it fetches the applications to insert in batches using application IDs / file_number, constructs an insert query, and processes them. """ + logger.info(f"Start {etl_name}") with conn.cursor() as cursor: with open( "applications/sql/application-etl-table-create.sql", "r", encoding="utf-8" @@ -52,7 +25,7 @@ def process_applications(conn=None, batch_size=10000): count_query = sql_file.read() cursor.execute(count_query) count_total = cursor.fetchone()[0] - print("- Applications to insert: ", count_total) + logger.info(f"Applications to insert: {count_total}") with open( "applications/sql/application_exclude_count.sql", "r", encoding="utf-8" @@ -60,8 +33,8 @@ def process_applications(conn=None, batch_size=10000): count_exclude = sql_file.read() cursor.execute(count_exclude) count_total_exclude = cursor.fetchone()[0] - print("- Applications with excluded components: ", count_total_exclude) - print("Component ids stored in oats.alcs_etl_application_exclude") + logger.info(f"Applications with excluded components: {count_total_exclude}") + logger.debug("Component ids stored in oats.alcs_etl_application_exclude") failed_inserts = 0 successful_inserts_count = 0 @@ -82,7 +55,7 @@ def process_applications(conn=None, batch_size=10000): try: applications_to_be_inserted_count = len(rows) - insert_query = compile_application_insert_query( + insert_query = _compile_application_insert_query( applications_to_be_inserted_count ) cursor.execute(insert_query, rows) @@ -93,39 +66,71 @@ def process_applications(conn=None, batch_size=10000): successful_inserts_count + applications_to_be_inserted_count ) - print( + logger.debug( f"retrieved/inserted items count: {applications_to_be_inserted_count}; total successfully inserted/updated applications so far {successful_inserts_count}; last inserted applidation_id: {last_application_id}" ) - except Exception as e: + except Exception as err: + logger.exception(err) conn.rollback() - print("Error", e) failed_inserts = count_total - successful_inserts_count last_application_id = last_application_id + 1 - print("Total amount of successful inserts:", successful_inserts_count) - print("Total failed inserts:", failed_inserts) + logger.info(f"Total amount of successful inserts: {successful_inserts_count}") + logger.info(f"Total failed inserts: {failed_inserts}") if failed_inserts == 0: with conn.cursor() as cursor: - cursor.execute(drop_etl_temp_table()) - print("etl temp table removed") + cursor.execute(_drop_etl_temp_table()) + logger.info("etl temp table removed") else: - print("Table not deleted, inserts failed") + logger.error("Table not deleted, inserts failed") # keep only the failed rows @inject_conn_pool def clean_applications(conn=None): - print("Start applications cleaning") + logger.info("Start applications cleaning") with conn.cursor() as cursor: cursor.execute( "DELETE FROM alcs.application a WHERE a.audit_created_by = 'oats_etl'" ) - print(f"Deleted items count = {cursor.rowcount}") + logger.info(f"Deleted items count = {cursor.rowcount}") cursor.execute("DROP TABLE IF EXISTS oats.alcs_etl_application_exclude") cursor.execute("DROP TABLE IF EXISTS oats.alcs_etl_application_duplicate") - print(f"Tempory tables dropped") + logger.info(f"Temporary tables dropped") conn.commit() + + +def _compile_application_insert_query(number_of_rows_to_insert): + """ + function takes the number of rows to insert and generates an SQL insert statement with upserts using the ON CONFLICT clause + """ + + applications_to_insert = ",".join(["%s"] * number_of_rows_to_insert) + return f""" + INSERT INTO alcs.application (file_number, type_code, + applicant, region_code, local_government_uuid, audit_created_by) + + VALUES{applications_to_insert} + ON CONFLICT (file_number) DO UPDATE SET + file_number = EXCLUDED.file_number, + type_code = EXCLUDED.type_code, + applicant = EXCLUDED.applicant, + region_code = EXCLUDED.region_code, + local_government_uuid = EXCLUDED.local_government_uuid, + audit_created_by = EXCLUDED.audit_created_by + """ + + +# ON CONFLICT needs confirmation of what value is kept +def _drop_etl_temp_table(): + """ + remove the table + """ + return f""" + + DROP TABLE IF EXISTS oats.alcs_etl_application_duplicate; + """ diff --git a/bin/migrate-oats-data/applications/submissions/app_submissions.py b/bin/migrate-oats-data/applications/submissions/app_submissions.py index b04e2ee629..b9911bfa50 100644 --- a/bin/migrate-oats-data/applications/submissions/app_submissions.py +++ b/bin/migrate-oats-data/applications/submissions/app_submissions.py @@ -1,25 +1,31 @@ -from common import ALRChangeCode, log, log_start, OATS_ETL_USER +import json + +from common import ( + BATCH_UPLOAD_SIZE, + OATS_ETL_USER, + ALRChangeCode, + setup_and_get_logger, +) +from db import inject_conn_pool +from psycopg2.extras import RealDictCursor, execute_batch + from .submap import ( add_direction_field, - map_direction_values, + add_soil_field, + add_subdiv, create_direction_dict, - get_directions_rows, - get_subdiv_rows, + create_soil_dict, create_subdiv_dict, - add_subdiv, - map_subdiv_lots, + get_directions_rows, get_soil_rows, - create_soil_dict, + get_subdiv_rows, + map_direction_values, map_soil_data, - add_soil_field, + map_subdiv_lots, ) -from db import inject_conn_pool -from common import BATCH_UPLOAD_SIZE -from psycopg2.extras import execute_batch, RealDictCursor -import traceback -import json -etl_name = "alcs_app_sub" +etl_name = "process_alcs_app_submissions" +logger = setup_and_get_logger(etl_name) @inject_conn_pool @@ -31,8 +37,7 @@ def process_alcs_app_submissions(conn=None, batch_size=BATCH_UPLOAD_SIZE): conn (psycopg2.extensions.connection): PostgreSQL database connection. Provided by the decorator. batch_size (int): The number of items to process at once. Defaults to BATCH_UPLOAD_SIZE. """ - etl_name = "process_alcs_app_submissions" - log_start(etl_name) + logger.info(f"Start {etl_name}") with conn.cursor(cursor_factory=RealDictCursor) as cursor: with open( "applications/submissions/sql/app_submission_count.sql", @@ -42,7 +47,7 @@ def process_alcs_app_submissions(conn=None, batch_size=BATCH_UPLOAD_SIZE): count_query = sql_file.read() cursor.execute(count_query) count_total = dict(cursor.fetchone())["count"] - print("- Total Application Submission data to insert: ", count_total) + logger.info(f"Total Application Submission data to insert: {count_total}") failed_inserts = 0 successful_inserts_count = 0 @@ -85,22 +90,17 @@ def process_alcs_app_submissions(conn=None, batch_size=BATCH_UPLOAD_SIZE): ) last_submission_id = dict(rows[-1])["alr_application_id"] - print( + logger.debug( f"retrieved/inserted items count: {submissions_to_be_inserted_count}; total successfully inserted submissions so far {successful_inserts_count}; last inserted application_id: {last_submission_id}" ) - except Exception as e: + except Exception as err: + logger.exception() conn.rollback() - str_err = str(e) - trace_err = traceback.format_exc() - print(str_err) - print(trace_err) - log(etl_name, str_err, trace_err) failed_inserts = count_total - successful_inserts_count last_submission_id = last_submission_id + 1 - print("Total amount of successful inserts:", successful_inserts_count) - print("Total failed inserts:", failed_inserts) - log(etl_name) + logger.info(f"Total amount of successful inserts: {successful_inserts_count}") + logger.info(f"Total failed inserts: {failed_inserts}") def insert_app_sub_records( @@ -296,11 +296,11 @@ def get_soil_data(rows, cursor): @inject_conn_pool def clean_application_submission(conn=None): - print("Start application_submission cleaning") + logger.info("Start application_submission cleaning") with conn.cursor() as cursor: cursor.execute( f"DELETE FROM alcs.application_submission a WHERE a.audit_created_by = '{OATS_ETL_USER}'" ) - print(f"Deleted items count = {cursor.rowcount}") + logger.info(f"Deleted items count = {cursor.rowcount}") conn.commit() diff --git a/bin/migrate-oats-data/common/__init__.py b/bin/migrate-oats-data/common/__init__.py index fbd46bb656..298b60e25c 100644 --- a/bin/migrate-oats-data/common/__init__.py +++ b/bin/migrate-oats-data/common/__init__.py @@ -1,6 +1,6 @@ from .oats_application_code_values import * from .alcs_application_enum import * -from .etl_logger import log_start, log +from .etl_logger import setup_and_get_logger from .constants import * from .oats_to_alcs_adjacent_land_use_type_enum import * from .json_encoder import * diff --git a/bin/migrate-oats-data/common/etl_logger.py b/bin/migrate-oats-data/common/etl_logger.py index 774e490de2..ea597e296d 100644 --- a/bin/migrate-oats-data/common/etl_logger.py +++ b/bin/migrate-oats-data/common/etl_logger.py @@ -1,27 +1,39 @@ -import json -from datetime import datetime +import logging +import os +from logging.handlers import RotatingFileHandler +from rich.logging import RichHandler -def log_start(etl_name): - data = { - "etl_name": etl_name, - "start_time": datetime.now().isoformat(), - } +def _create_logs_folder(): + curr_dir = os.getcwd() + logs_folder = os.path.join(curr_dir, "logs") + os.makedirs(logs_folder, exist_ok=True) + return logs_folder - with open(f"{etl_name}.log.txt", "a") as f: - json.dump(data, f) - f.write("\n") +def setup_and_get_logger(logger_name): + logger = logging.getLogger(logger_name) + logger.setLevel(logging.DEBUG) # Lowest level to control overall -def log(etl_name, error_msg=None, error_log=None, extra_data=None): - data = { - "etl_name": etl_name, - "time": datetime.now().isoformat(), - "error_msg": error_msg, - "error_log": error_log, - "extra_data": extra_data, - } + # Handler for console which accepts DEBUG level and above + console_handler = RichHandler() + console_handler.setLevel(logging.DEBUG) - with open(f"{etl_name}.log.txt", "a") as f: - json.dump(data, f) - f.write("\n") + # Define Log file path - current working directory + filename + logs_folder = _create_logs_folder() + log_file = os.path.join(logs_folder, f"{logger_name}.log.txt") + + file_handler = RotatingFileHandler(log_file, maxBytes=20000, backupCount=5) + file_formatter = logging.Formatter( + "%(asctime)s - %(levelname)s - [%(name)s] - %(message)s" + ) + file_handler.setFormatter(file_formatter) + # Handler for the file which accepts INFO level and above + + file_handler.setLevel(logging.INFO) + + # Add handlers to the logger + logger.addHandler(console_handler) + logger.addHandler(file_handler) + + return logging.getLogger(logger_name) diff --git a/bin/migrate-oats-data/common/json_encoder.py b/bin/migrate-oats-data/common/json_encoder.py index 1585fab4d0..37bbb05d69 100644 --- a/bin/migrate-oats-data/common/json_encoder.py +++ b/bin/migrate-oats-data/common/json_encoder.py @@ -12,3 +12,14 @@ def default(self, obj): return super().default(obj) except TypeError: return str(obj) + + +def to_json(obj): + try: + obj = json.dumps(obj) + except TypeError: + try: + obj = str(obj) + except Exception: + obj = repr(obj) + return obj diff --git a/bin/migrate-oats-data/db.py b/bin/migrate-oats-data/db.py index 29071cdd81..ea8129d1c6 100644 --- a/bin/migrate-oats-data/db.py +++ b/bin/migrate-oats-data/db.py @@ -18,6 +18,7 @@ def wrapper(*args, **kwargs): try: result = func(conn, *args, **kwargs) finally: + conn.close() connection_pool.putconn(conn) return result diff --git a/bin/migrate-oats-data/menu/commands/applications.py b/bin/migrate-oats-data/menu/commands/applications.py index 3fc2bce7d5..7dee6710f6 100644 --- a/bin/migrate-oats-data/menu/commands/applications.py +++ b/bin/migrate-oats-data/menu/commands/applications.py @@ -8,7 +8,7 @@ def app_prep_import(console, args): console.log("Beginning OATS -> ALCS app-prep import process") with console.status( - "[bold green]App prep import (applications table update in ALCS)..." + "[bold green]App prep import (applications table update in ALCS)...\n" ) as status: if args.batch_size: import_batch_size = args.batch_size @@ -21,7 +21,7 @@ def app_prep_import(console, args): def application_import(console, args): console.log("Beginning OATS -> ALCS application import process") with console.status( - "[bold green]application import (application table update in ALCS)..." + "[bold green]application import (application table update in ALCS)...\n" ) as status: if args.batch_size: import_batch_size = args.batch_size @@ -36,7 +36,7 @@ def application_import(console, args): def application_submission_import(console, args): console.log("Beginning OATS -> ALCS app-sub import process") with console.status( - "[bold green]App submission import (application_submission table update in ALCS)..." + "[bold green]App submission import (application_submission table update in ALCS)...\n" ) as status: if args.batch_size: import_batch_size = args.batch_size diff --git a/bin/migrate-oats-data/menu/commands/clean_all.py b/bin/migrate-oats-data/menu/commands/clean_all.py index 1f8943b6ab..d9326584ee 100644 --- a/bin/migrate-oats-data/menu/commands/clean_all.py +++ b/bin/migrate-oats-data/menu/commands/clean_all.py @@ -15,7 +15,7 @@ def clean_all(console, args): - with console.status("[bold green]Cleaning previous ETL...") as status: + with console.status("[bold green]Cleaning previous ETL...\n") as status: console.log("Cleaning data:") # this will be enabled once application import is ready diff --git a/bin/migrate-oats-data/menu/commands/documents.py b/bin/migrate-oats-data/menu/commands/documents.py index ab62657b75..0a79afffd2 100644 --- a/bin/migrate-oats-data/menu/commands/documents.py +++ b/bin/migrate-oats-data/menu/commands/documents.py @@ -8,7 +8,7 @@ def document_import(console, args): console.log("Beginning OATS -> ALCS document-import process") - with console.status("[bold green]Import OATS into ALCS...") as status: + with console.status("[bold green]Import OATS into ALCS...\n") as status: if args.batch_size: import_batch_size = args.batch_size @@ -20,7 +20,7 @@ def document_import(console, args): def app_document_import(console, args): console.log("Beginning OATS -> ALCS app-document-import process") - with console.status("[bold green]Link application documents in ALCS...") as status: + with console.status("[bold green]Link application documents in ALCS...\n") as status: if args.batch_size: import_batch_size = args.batch_size @@ -33,7 +33,7 @@ def app_document_import(console, args): def noi_document_import(console, args): console.log("Beginning OATS -> ALCS noi-document-import process") - with console.status("[bold green]Link application documents in ALCS...") as status: + with console.status("[bold green]Link application documents in ALCS...\n") as status: if args.batch_size: import_batch_size = args.batch_size diff --git a/bin/migrate-oats-data/menu/commands/import_all.py b/bin/migrate-oats-data/menu/commands/import_all.py index 6c6eea70df..09898f918e 100644 --- a/bin/migrate-oats-data/menu/commands/import_all.py +++ b/bin/migrate-oats-data/menu/commands/import_all.py @@ -25,7 +25,7 @@ def import_all(console, args): console.log("Beginning OATS -> ALCS import process") - with console.status("[bold green]Import OATS into ALCS...") as status: + with console.status("[bold green]Import OATS into ALCS...\n") as status: console.log("Init applications:") # this will be enabled once application import is ready diff --git a/bin/migrate-oats-data/menu/commands/notice_of_intents.py b/bin/migrate-oats-data/menu/commands/notice_of_intents.py index 2bc6365d13..7cd3bb7dc5 100644 --- a/bin/migrate-oats-data/menu/commands/notice_of_intents.py +++ b/bin/migrate-oats-data/menu/commands/notice_of_intents.py @@ -3,23 +3,26 @@ process_notice_of_intent, clean_notice_of_intent, ) +from common import setup_and_get_logger + +logger = setup_and_get_logger("noi_import") def notice_of_intent_import(console, args): - console.log("Beginning OATS -> ALCS NOI import process") + logger.debug("Beginning OATS -> ALCS NOI import process") with console.status( - "[bold green]NOI import (notice_of_intent table update in ALCS)..." + "[bold green]NOI import (notice_of_intent table update in ALCS)...\n" ) as status: if args.batch_size: import_batch_size = args.batch_size - console.log(f"Processing NOI import in batch size = {import_batch_size}") + logger.debug(f"Processing NOI import in batch size = {import_batch_size}") init_notice_of_intents(batch_size=import_batch_size) process_notice_of_intent(batch_size=import_batch_size) def notice_of_intent_clean(console): - console.log("Beginning OATS -> ALCS NOI import clean process") - with console.status("[bold green]NOI clean import...") as status: + logger.debug("Beginning OATS -> ALCS NOI import clean process") + with console.status("[bold green]NOI clean import...\n") as status: clean_notice_of_intent() diff --git a/bin/migrate-oats-data/migrate.py b/bin/migrate-oats-data/migrate.py index a0c8ee3edb..4efffde327 100644 --- a/bin/migrate-oats-data/migrate.py +++ b/bin/migrate-oats-data/migrate.py @@ -1,5 +1,8 @@ import logging +from rich.logging import RichHandler +from rich.traceback import install from rich.console import Console +from logging.handlers import RotatingFileHandler from menu import setup_menu_args_parser from menu.commands import ( @@ -15,17 +18,16 @@ notice_of_intent_clean, ) from db import connection_pool -from common import BATCH_UPLOAD_SIZE +from common import BATCH_UPLOAD_SIZE, setup_and_get_logger import_batch_size = BATCH_UPLOAD_SIZE + if __name__ == "__main__": args = setup_menu_args_parser(import_batch_size) - # Setup - logging.basicConfig(level=logging.INFO) - # Console for UI + logger = setup_and_get_logger("migrate") console = Console() try: diff --git a/bin/migrate-oats-data/noi/noi_submission_status_email/submission_status_email.py b/bin/migrate-oats-data/noi/noi_submission_status_email/submission_status_email.py index ae22485c36..bc6f397187 100644 --- a/bin/migrate-oats-data/noi/noi_submission_status_email/submission_status_email.py +++ b/bin/migrate-oats-data/noi/noi_submission_status_email/submission_status_email.py @@ -1,10 +1,13 @@ +from common import OATS_ETL_USER, setup_and_get_logger from db import inject_conn_pool -import traceback -from common import OATS_ETL_USER + +etl_name = "process_notice_of_intent_submission_status_emails" +logger = setup_and_get_logger(etl_name) @inject_conn_pool def process_notice_of_intent_submission_status_emails(conn=None): + logger.info(f"Start {etl_name}") update_query = f""" UPDATE alcs.notice_of_intent_submission_to_submission_status status SET email_sent_date = '0001-01-01 07:00:00.000 -0700' @@ -17,11 +20,13 @@ def process_notice_of_intent_submission_status_emails(conn=None): with conn.cursor() as cursor: cursor.execute(update_query) conn.commit() - except Exception as error: - print("".join(traceback.format_exception(None, error, error.__traceback__))) + except Exception as err: + logger.exception() cursor.close() conn.close() + logger.info(f"Finished {etl_name}") + @inject_conn_pool def clean_notice_of_intent_submission_status_emails(conn=None): @@ -35,8 +40,8 @@ def clean_notice_of_intent_submission_status_emails(conn=None): try: with conn.cursor() as cursor: cursor.execute(update_query) - except Exception as error: - print("".join(traceback.format_exception(None, error, error.__traceback__))) + except Exception as err: + logger.exception() cursor.close() conn.close() diff --git a/bin/migrate-oats-data/noi/notice_of_intent_init.py b/bin/migrate-oats-data/noi/notice_of_intent_init.py index e3ca53020c..94fb9366e8 100644 --- a/bin/migrate-oats-data/noi/notice_of_intent_init.py +++ b/bin/migrate-oats-data/noi/notice_of_intent_init.py @@ -1,35 +1,19 @@ -import traceback +from common import OATS_ETL_USER, setup_and_get_logger from db import inject_conn_pool -from common import log, log_start, OATS_ETL_USER - -def noi_insert_query(number_of_rows_to_insert): - nois_to_insert = ",".join(["%s"] * number_of_rows_to_insert) - return f""" - INSERT INTO alcs.notice_of_intent (file_number, - applicant, region_code, local_government_uuid, audit_created_by, type_code) - - VALUES{nois_to_insert} - ON CONFLICT (file_number) DO UPDATE SET - file_number = EXCLUDED.file_number, - applicant = EXCLUDED.applicant, - region_code = EXCLUDED.region_code, - local_government_uuid = EXCLUDED.local_government_uuid, - audit_created_by = EXCLUDED.audit_created_by, - type_code = EXCLUDED.type_code - """ +etl_name = "init_notice_of_intents" +logger = setup_and_get_logger(etl_name) @inject_conn_pool def init_notice_of_intents(conn=None, batch_size=10000): - etl_name = "init_notice_of_intents" - log_start(etl_name) + logger.info(f"Start {etl_name}") with conn.cursor() as cursor: with open("noi/sql/insert_noi_count.sql", "r", encoding="utf-8") as sql_file: count_query = sql_file.read() cursor.execute(count_query) count_total = cursor.fetchone()[0] - print("- NOIs to insert: ", count_total) + logger.info(f"NOIs to insert: {count_total}") failed_inserts = 0 successful_inserts_count = 0 @@ -48,7 +32,7 @@ def init_notice_of_intents(conn=None, batch_size=10000): try: applications_to_be_inserted_count = len(rows) - insert_query = noi_insert_query(applications_to_be_inserted_count) + insert_query = _noi_insert_query(applications_to_be_inserted_count) cursor.execute(insert_query, rows) conn.commit() @@ -57,34 +41,44 @@ def init_notice_of_intents(conn=None, batch_size=10000): successful_inserts_count + applications_to_be_inserted_count ) - print( + logger.debug( f"retrieved/inserted items count: {applications_to_be_inserted_count}; total successfully inserted/updated NOIs so far {successful_inserts_count}; last inserted noi_id: {last_application_id}" ) - except Exception as error: + except Exception as err: + logger.exception() conn.rollback() - error_trace = "".join( - traceback.format_exception(None, error, error.__traceback__) - ) - print("Error", error_trace) - log( - etl_name, - str(error), - error_trace, - ) failed_inserts = count_total - successful_inserts_count last_application_id = last_application_id + 1 - print("Total amount of successful inserts:", successful_inserts_count) - print("Total failed inserts:", failed_inserts) + logger.info( + f"Finished {etl_name}: total amount of successful inserts: {successful_inserts_count}, total failed inserts {failed_inserts}" + ) @inject_conn_pool def clean_notice_of_intents(conn=None): - print("Start NOI cleaning") + logger.info("Start NOI cleaning") with conn.cursor() as cursor: cursor.execute( f"DELETE FROM alcs.notice_of_intent noi WHERE noi.audit_created_by = '{OATS_ETL_USER}'" ) - print(f"Deleted items count = {cursor.rowcount}") + logger.info(f"Deleted items count = {cursor.rowcount}") conn.commit() + + +def _noi_insert_query(number_of_rows_to_insert): + nois_to_insert = ",".join(["%s"] * number_of_rows_to_insert) + return f""" + INSERT INTO alcs.notice_of_intent (file_number, + applicant, region_code, local_government_uuid, audit_created_by, type_code) + + VALUES{nois_to_insert} + ON CONFLICT (file_number) DO UPDATE SET + file_number = EXCLUDED.file_number, + applicant = EXCLUDED.applicant, + region_code = EXCLUDED.region_code, + local_government_uuid = EXCLUDED.local_government_uuid, + audit_created_by = EXCLUDED.audit_created_by, + type_code = EXCLUDED.type_code + """ diff --git a/bin/migrate-oats-data/noi/notice_of_intent_migration.py b/bin/migrate-oats-data/noi/notice_of_intent_migration.py index 8fd989221c..49ec3d712c 100644 --- a/bin/migrate-oats-data/noi/notice_of_intent_migration.py +++ b/bin/migrate-oats-data/noi/notice_of_intent_migration.py @@ -1,11 +1,14 @@ +from .noi_submission_status_email.submission_status_email import ( + process_notice_of_intent_submission_status_emails, +) from .notice_of_intent_init import clean_notice_of_intents, init_notice_of_intents from .notice_of_intent_submissions import ( clean_notice_of_intent_submissions, init_notice_of_intent_submissions, + process_alcs_notice_of_intent_proposal_fields, + process_alcs_notice_of_intent_soil_fields, process_notice_of_intent_adjacent_land_use, process_notice_of_intent_empty_adjacent_land_use, - process_alcs_notice_of_intent_soil_fields, - process_alcs_notice_of_intent_proposal_fields, ) from .oats_to_alcs_notice_of_intent_table_etl.notice_of_intent_decision_date import ( process_alcs_notice_of_intent_decision_date, @@ -14,10 +17,6 @@ process_alcs_notice_of_intent_base_fields, ) -from .noi_submission_status_email.submission_status_email import ( - process_notice_of_intent_submission_status_emails, -) - def init_notice_of_intent(batch_size): init_notice_of_intents(batch_size=batch_size) diff --git a/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_adjacent_land_use/notice_of_intent_empty_adjacent_land_use.py b/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_adjacent_land_use/notice_of_intent_empty_adjacent_land_use.py index 897556ad4e..9f45068ac0 100644 --- a/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_adjacent_land_use/notice_of_intent_empty_adjacent_land_use.py +++ b/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_adjacent_land_use/notice_of_intent_empty_adjacent_land_use.py @@ -1,15 +1,14 @@ -import traceback from common import ( OATS_ETL_USER, NO_DATA_IN_OATS, - log, - log_start, AlcsAdjacentLandUseType, + setup_and_get_logger, ) from db import inject_conn_pool from psycopg2.extras import RealDictCursor etl_name = "process_notice_of_intent_empty_adjacent_land_use" +logger = setup_and_get_logger(etl_name) @inject_conn_pool @@ -22,7 +21,7 @@ def process_notice_of_intent_empty_adjacent_land_use(conn=None): conn (psycopg2.extensions.connection): PostgreSQL database connection. Provided by the decorator. """ - log_start(etl_name) + logger.info(f"Start {etl_name}") with conn.cursor(cursor_factory=RealDictCursor) as cursor: with open( "noi/sql/notice_of_intent_submission/adjacent_land_use/empty_notice_of_intent_adjacent_land_use_count.sql", @@ -32,13 +31,10 @@ def process_notice_of_intent_empty_adjacent_land_use(conn=None): count_query = sql_file.read() cursor.execute(count_query) count_total = dict(cursor.fetchone())["count"] - print( - "- Total Notice of Intent Submission Empty Adjacent Land use data to update: ", - count_total, - ) - successful_updates_count = 0 - last_submission_id = 0 + logger.info( + f"Total Notice of Intent Submission Empty Adjacent Land use data to update: {count_total}" + ) try: cursor.execute( @@ -51,23 +47,11 @@ def process_notice_of_intent_empty_adjacent_land_use(conn=None): ) updated_row_count = cursor.rowcount + logger.info(f"Finished {etl_name}: total updated items {updated_row_count}") - print(f"updated items count: {updated_row_count}") - except Exception as e: + except Exception as err: + logger.exception() conn.rollback() - str_err = str(e) - trace_err = traceback.format_exc() - print(str_err) - print(trace_err) - failed_updates = count_total - successful_updates_count - last_submission_id = last_submission_id + 1 - log( - etl_name, - str_err, - trace_err, - ) - - log(etl_name) _update_query = """ diff --git a/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_adjacent_land_use/notice_of_intent_submission_adjacent_land_use.py b/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_adjacent_land_use/notice_of_intent_submission_adjacent_land_use.py index 023c449184..b84aef1b22 100644 --- a/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_adjacent_land_use/notice_of_intent_submission_adjacent_land_use.py +++ b/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_adjacent_land_use/notice_of_intent_submission_adjacent_land_use.py @@ -1,12 +1,15 @@ -import json -import traceback -from common import (BATCH_UPLOAD_SIZE, NO_DATA_IN_OATS, - AdjacentLandUseDirections, AlcsAdjacentLandUseType, - DateTimeEncoder, log, log_start) +from common import ( + BATCH_UPLOAD_SIZE, + NO_DATA_IN_OATS, + AdjacentLandUseDirections, + AlcsAdjacentLandUseType, + setup_and_get_logger, +) from db import inject_conn_pool from psycopg2.extras import RealDictCursor, execute_batch etl_name = "process_notice_of_intent_adjacent_land_use" +logger = setup_and_get_logger(etl_name) @inject_conn_pool @@ -18,8 +21,7 @@ def process_notice_of_intent_adjacent_land_use(conn=None, batch_size=BATCH_UPLOA conn (psycopg2.extensions.connection): PostgreSQL database connection. Provided by the decorator. batch_size (int): The number of items to process at once. Defaults to BATCH_UPLOAD_SIZE. """ - - log_start(etl_name) + logger.info(f"Start {etl_name}") with conn.cursor(cursor_factory=RealDictCursor) as cursor: with open( "noi/sql/notice_of_intent_submission/adjacent_land_use/notice_of_intent_adjacent_land_use_count.sql", @@ -29,9 +31,9 @@ def process_notice_of_intent_adjacent_land_use(conn=None, batch_size=BATCH_UPLOA count_query = sql_file.read() cursor.execute(count_query) count_total = dict(cursor.fetchone())["count"] - print( - "- Total Notice of Intent Submission Adjacent Land use data to update: ", - count_total, + + logger.info( + f"Total Notice of Intent Submission Adjacent Land use data to update: {count_total}" ) failed_updates = 0 @@ -60,39 +62,23 @@ def process_notice_of_intent_adjacent_land_use(conn=None, batch_size=BATCH_UPLOA conn, batch_size, cursor, rows ) - successful_updates_count = ( - successful_updates_count + submissions_to_be_updated_count + successful_updates_count = successful_updates_count + len( + parsed_data ) last_submission_id = dict(rows[-1])["alr_application_id"] - print( + logger.debug( f"retrieved/updated items count: {submissions_to_be_updated_count}; total successfully processed submissions so far {successful_updates_count}; last update alr_application_id: {last_submission_id}" ) - except Exception as e: + except Exception as err: + logger.exception() conn.rollback() - str_err = str(e) - trace_err = traceback.format_exc() - print(str_err) - print(trace_err) failed_updates = count_total - successful_updates_count last_submission_id = last_submission_id + 1 - log( - etl_name, - str_err, - trace_err, - { - "parsed_data": json.dumps(parsed_data, cls=DateTimeEncoder), - "raw_data": json.dumps(raw_data, cls=DateTimeEncoder), - "last_submission_id": last_submission_id, - }, - ) - print( - "Total amount of successfully processed adjacent land uses:", - successful_updates_count, + logger.info( + f"Finished {etl_name}: total amount of successfully processed adjacent land uses {successful_updates_count}, total failed updates {failed_updates}" ) - print("Total failed updates:", failed_updates) - log(etl_name) def _update_notice_of_intent_submissions(conn, batch_size, cursor, rows): @@ -189,4 +175,3 @@ def _map_adjacent_land_use_data(oats_row): ].value, direction_type_desc_key: oats_row[description_key] or NO_DATA_IN_OATS, } - diff --git a/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_proposal_fields.py b/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_proposal_fields.py index 373626ce59..2dabfe02b7 100644 --- a/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_proposal_fields.py +++ b/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_proposal_fields.py @@ -1,9 +1,9 @@ -import traceback -from common import BATCH_UPLOAD_SIZE, NO_DATA_IN_OATS, log, log_start +from common import BATCH_UPLOAD_SIZE, NO_DATA_IN_OATS, setup_and_get_logger from db import inject_conn_pool from psycopg2.extras import RealDictCursor, execute_batch etl_name = "process_alcs_notice_of_intent_proposal_fields" +logger = setup_and_get_logger(etl_name) @inject_conn_pool @@ -18,7 +18,7 @@ def process_alcs_notice_of_intent_proposal_fields( batch_size (int): The number of items to process at once. Defaults to BATCH_UPLOAD_SIZE. """ - log_start(etl_name) + logger.info(f"Start {etl_name}") with conn.cursor(cursor_factory=RealDictCursor) as cursor: with open( "noi/sql/notice_of_intent_submission/proposal_fields/notice_of_intent_proposal_fields_count.sql", @@ -28,7 +28,7 @@ def process_alcs_notice_of_intent_proposal_fields( count_query = sql_file.read() cursor.execute(count_query) count_total = dict(cursor.fetchone())["count"] - print("- Total Notice of Intents data to update: ", count_total) + logger.info(f"Total Notice of Intents data to update: {count_total}") failed_inserts = 0 successful_updates_count = 0 @@ -59,23 +59,19 @@ def process_alcs_notice_of_intent_proposal_fields( ) last_application_id = dict(rows[-1])["alr_application_id"] - print( + logger.debug( f"retrieved/updated items count: {records_to_be_updated_count}; total successfully updated notice of intents so far {successful_updates_count}; last updated alr_application_id: {last_application_id}" ) - except Exception as error: + except Exception as err: # this is NOT going to be caused by actual data update failure. This code is only executed when the code error appears or connection to DB is lost + logger.exception() conn.rollback() - error_str = "".join( - traceback.format_exception(None, error, error.__traceback__) - ) - print(error_str) - log(etl_name, str(error), error_str) failed_inserts = count_total - successful_updates_count last_application_id = last_application_id + 1 - print("Total amount of successful updates:", successful_updates_count) - print("Total failed updates:", failed_inserts) - log(etl_name) + logger.info( + f"Finished {etl_name}: total amount of successful updates {successful_updates_count}, total failed updates {failed_inserts}" + ) def _update_records(conn, batch_size, cursor, rows): diff --git a/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_soil_fields.py b/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_soil_fields.py index 41ef699f99..994d0573b2 100644 --- a/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_soil_fields.py +++ b/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_soil_fields.py @@ -1,9 +1,14 @@ -import traceback -from common import BATCH_UPLOAD_SIZE, NO_DATA_IN_OATS, SoilChangeCode, log, log_start +from common import ( + BATCH_UPLOAD_SIZE, + NO_DATA_IN_OATS, + SoilChangeCode, + setup_and_get_logger, +) from db import inject_conn_pool from psycopg2.extras import RealDictCursor, execute_batch etl_name = "process_alcs_notice_of_intent_soil_fields" +logger = setup_and_get_logger(etl_name) @inject_conn_pool @@ -16,7 +21,7 @@ def process_alcs_notice_of_intent_soil_fields(conn=None, batch_size=BATCH_UPLOAD batch_size (int): The number of items to process at once. Defaults to BATCH_UPLOAD_SIZE. """ - log_start(etl_name) + logger.info("Start process_alcs_notice_of_intent_soil_fields") with conn.cursor(cursor_factory=RealDictCursor) as cursor: with open( "noi/sql/notice_of_intent_submission/soil_fields/notice_of_intent_soil_fields_count.sql", @@ -26,7 +31,7 @@ def process_alcs_notice_of_intent_soil_fields(conn=None, batch_size=BATCH_UPLOAD count_query = sql_file.read() cursor.execute(count_query) count_total = dict(cursor.fetchone())["count"] - print("- Total Notice of Intents data to update: ", count_total) + logger.info(f"Total Notice of Intents data to update: {count_total}") failed_inserts = 0 successful_updates_count = 0 @@ -57,23 +62,19 @@ def process_alcs_notice_of_intent_soil_fields(conn=None, batch_size=BATCH_UPLOAD ) last_application_id = dict(rows[-1])["alr_application_id"] - print( - f"retrieved/updated items count: {records_to_be_updated_count}; total successfully updated notice of intents so far {successful_updates_count}; last updated alr_application_id: {last_application_id}" + logger.debug( + f"Retrieved/updated items count: {records_to_be_updated_count}; total successfully updated notice of intents so far {successful_updates_count}; last updated alr_application_id: {last_application_id}" ) - except Exception as error: + except Exception as err: # this is NOT going to be caused by actual data update failure. This code is only executed when the code error appears or connection to DB is lost + logger.exception() conn.rollback() - error_str = "".join( - traceback.format_exception(None, error, error.__traceback__) - ) - print(error_str) - log(etl_name, str(error), error_str) failed_inserts = count_total - successful_updates_count last_application_id = last_application_id + 1 - print("Total amount of successful updates:", successful_updates_count) - print("Total failed updates:", failed_inserts) - log(etl_name) + logger.info( + f"Finished {etl_name}: total amount of successful updates {successful_updates_count}, total failed updates {failed_inserts}" + ) def _update_fee_fields_records(conn, batch_size, cursor, rows): diff --git a/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_submission_init.py b/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_submission_init.py index 9579a1fe49..96e59aa47f 100644 --- a/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_submission_init.py +++ b/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_submission_init.py @@ -1,10 +1,9 @@ -from common import log, log_start, OATS_ETL_USER +from common import BATCH_UPLOAD_SIZE, OATS_ETL_USER, setup_and_get_logger from db import inject_conn_pool -from common import BATCH_UPLOAD_SIZE -from psycopg2.extras import execute_batch, RealDictCursor -import traceback +from psycopg2.extras import RealDictCursor, execute_batch etl_name = "init_notice_of_intent_submissions" +logger = setup_and_get_logger(etl_name) @inject_conn_pool @@ -17,7 +16,7 @@ def init_notice_of_intent_submissions(conn=None, batch_size=BATCH_UPLOAD_SIZE): batch_size (int): The number of items to process at once. Defaults to BATCH_UPLOAD_SIZE. """ - log_start(etl_name) + logger.info(f"Start {etl_name}") with conn.cursor(cursor_factory=RealDictCursor) as cursor: with open( "noi/sql/notice_of_intent_submission/notice_of_intent_submission_init_count.sql", @@ -27,7 +26,7 @@ def init_notice_of_intent_submissions(conn=None, batch_size=BATCH_UPLOAD_SIZE): count_query = sql_file.read() cursor.execute(count_query) count_total = dict(cursor.fetchone())["count"] - print("- Total Notice of Intent Submission data to insert: ", count_total) + logger.info(f"Total Notice of Intent Submission data to insert: {count_total}") failed_inserts = 0 successful_inserts_count = 0 @@ -58,22 +57,18 @@ def init_notice_of_intent_submissions(conn=None, batch_size=BATCH_UPLOAD_SIZE): ) last_submission_id = dict(rows[-1])["alr_application_id"] - print( + logger.debug( f"retrieved/inserted items count: {submissions_to_be_inserted_count}; total successfully inserted submissions so far {successful_inserts_count}; last inserted alr_application_id: {last_submission_id}" ) - except Exception as e: + except Exception as err: + logger.exception() conn.rollback() - str_err = str(e) - trace_err = traceback.format_exc() - print(str_err) - print(trace_err) - log(etl_name, str_err, trace_err) failed_inserts = count_total - successful_inserts_count last_submission_id = last_submission_id + 1 - print("Total amount of successful inserts:", successful_inserts_count) - print("Total failed inserts:", failed_inserts) - log(etl_name) + logger.info( + f"Finished {etl_name}: total amount of successful inserts {successful_inserts_count}, total failed inserts {failed_inserts}" + ) def _insert_notice_of_intent_submissions(conn, batch_size, cursor, rows): @@ -118,11 +113,11 @@ def _prepare_oats_alr_applications_data(row_data_list): @inject_conn_pool def clean_notice_of_intent_submissions(conn=None): - print("Start notice_of_intent_submissions cleaning") + logger.info("Start notice_of_intent_submissions cleaning") with conn.cursor() as cursor: cursor.execute( f"DELETE FROM alcs.notice_of_intent_submission nois WHERE nois.audit_created_by = '{OATS_ETL_USER}'" ) - print(f"Deleted items count = {cursor.rowcount}") + logger.info(f"Deleted items count = {cursor.rowcount}") conn.commit() diff --git a/bin/migrate-oats-data/noi/oats_to_alcs_notice_of_intent_table_etl/notice_of_intent_decision_date.py b/bin/migrate-oats-data/noi/oats_to_alcs_notice_of_intent_table_etl/notice_of_intent_decision_date.py index 3573e6bdfa..8feb91922f 100644 --- a/bin/migrate-oats-data/noi/oats_to_alcs_notice_of_intent_table_etl/notice_of_intent_decision_date.py +++ b/bin/migrate-oats-data/noi/oats_to_alcs_notice_of_intent_table_etl/notice_of_intent_decision_date.py @@ -1,7 +1,9 @@ +from common import BATCH_UPLOAD_SIZE, setup_and_get_logger from db import inject_conn_pool -from common import BATCH_UPLOAD_SIZE, log, log_start -from psycopg2.extras import execute_batch, RealDictCursor -import traceback +from psycopg2.extras import RealDictCursor, execute_batch + +etl_name = "process_alcs_notice_of_intent_decision_date" +logger = setup_and_get_logger(etl_name) @inject_conn_pool @@ -13,8 +15,7 @@ def process_alcs_notice_of_intent_decision_date( In OATS the first decision date is stored in oats.oats_alr_appl_decisions. All subsequent decisions in OATS are the linked to reconsiderations and not application directly. """ - etl_name = "process_alcs_notice_of_intent_decision_date" - log_start(etl_name) + logger.info(f"Start {etl_name}") with conn.cursor(cursor_factory=RealDictCursor) as cursor: with open( "noi/sql/notice_of_intent_base/notice_of_intent_base.count.sql", @@ -24,7 +25,8 @@ def process_alcs_notice_of_intent_decision_date( count_query = sql_file.read() cursor.execute(count_query) count_total = dict(cursor.fetchone())["count"] - print("- Total Notice of Intents data to update: ", count_total) + + logger.info(f" Total Notice of Intents data to update: {count_total}") failed_inserts = 0 successful_updates_count = 0 @@ -55,23 +57,19 @@ def process_alcs_notice_of_intent_decision_date( ) last_application_id = dict(rows[-1])["alr_application_id"] - print( + logger.debug( f"retrieved/updated items count: {records_to_be_updated_count}; total successfully updated notice of intents so far {successful_updates_count}; last updated application_id: {last_application_id}" ) - except Exception as error: + except Exception as err: # this is NOT going to be caused by actual data update failure. This code is only executed when the code error appears or connection to DB is lost + logger.exception() conn.rollback() - error_str = "".join( - traceback.format_exception(None, error, error.__traceback__) - ) - print(error_str) - log(etl_name, str(error), error_str) failed_inserts = count_total - successful_updates_count last_application_id = last_application_id + 1 - print("Total amount of successful updates:", successful_updates_count) - print("Total failed updates:", failed_inserts) - log(etl_name) + logger.info( + f"Finished {etl_name}: total amount of successful updates {successful_updates_count}, total failed updates {failed_inserts}" + ) def _update_fee_fields_records(conn, batch_size, cursor, rows): diff --git a/bin/migrate-oats-data/noi/oats_to_alcs_notice_of_intent_table_etl/oats_to_alcs_notice_of_intent_table_etl.py b/bin/migrate-oats-data/noi/oats_to_alcs_notice_of_intent_table_etl/oats_to_alcs_notice_of_intent_table_etl.py index fb02b97539..4f8b76c861 100644 --- a/bin/migrate-oats-data/noi/oats_to_alcs_notice_of_intent_table_etl/oats_to_alcs_notice_of_intent_table_etl.py +++ b/bin/migrate-oats-data/noi/oats_to_alcs_notice_of_intent_table_etl/oats_to_alcs_notice_of_intent_table_etl.py @@ -1,14 +1,16 @@ -from db import inject_conn_pool -from common import BATCH_UPLOAD_SIZE, log, log_start -from psycopg2.extras import execute_batch, RealDictCursor -import traceback +from enum import Enum + from common import ( - AlcsAgCapSource, - log, - log_start, + BATCH_UPLOAD_SIZE, AlcsAgCap, + AlcsAgCapSource, + setup_and_get_logger, ) -from enum import Enum +from db import inject_conn_pool +from psycopg2.extras import RealDictCursor, execute_batch + +etl_name = "process_alcs_notice_of_intent_base_fields" +logger = setup_and_get_logger(etl_name) class OatsToAlcsAgCapSource(Enum): @@ -30,9 +32,7 @@ def process_alcs_notice_of_intent_base_fields(conn=None, batch_size=BATCH_UPLOAD """ Import data into ALCS.notice_of_intent from OATS. ALCS.notice_of_intent.decision_date and ALCS.notice_of_intent.proposal_end_date imported separately """ - - etl_name = "process_alcs_notice_of_intent_base_fields" - log_start(etl_name) + logger.info(f"Start {etl_name}") with conn.cursor(cursor_factory=RealDictCursor) as cursor: with open( "noi/sql/notice_of_intent_base/notice_of_intent_base.count.sql", @@ -42,7 +42,8 @@ def process_alcs_notice_of_intent_base_fields(conn=None, batch_size=BATCH_UPLOAD count_query = sql_file.read() cursor.execute(count_query) count_total = dict(cursor.fetchone())["count"] - print("- Total Notice of Intents data to update: ", count_total) + + logger.info(f"Total Notice of Intents data to update: {count_total}") failed_inserts = 0 successful_updates_count = 0 @@ -73,23 +74,19 @@ def process_alcs_notice_of_intent_base_fields(conn=None, batch_size=BATCH_UPLOAD ) last_application_id = dict(rows[-1])["alr_application_id"] - print( + logger.debug( f"retrieved/updated items count: {records_to_be_updated_count}; total successfully updated applications so far {successful_updates_count}; last updated application_id: {last_application_id}" ) - except Exception as error: + except Exception as err: # this is NOT going to be caused by actual data update failure. This code is only executed when the code error appears or connection to DB is lost + logger.exception() conn.rollback() - error_str = "".join( - traceback.format_exception(None, error, error.__traceback__) - ) - print(error_str) - log(etl_name, str(error), error_str) failed_inserts = count_total - successful_updates_count last_application_id = last_application_id + 1 - print("Total amount of successful updates:", successful_updates_count) - print("Total failed updates:", failed_inserts) - log(etl_name) + logger.info( + f"Finished {etl_name}: total amount of successful updates {successful_updates_count}, total failed updates {failed_inserts}" + ) def _update_fee_fields_records(conn, batch_size, cursor, rows): From e61c75e85622ac47a20add78d0a7c52c62b04add Mon Sep 17 00:00:00 2001 From: Liam Stoddard <lstodd@protonmail.com> Date: Tue, 3 Oct 2023 13:18:25 -0700 Subject: [PATCH 450/954] commit before updated logging --- .../applications/submissions/app_submissions.py | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/migrate-oats-data/applications/submissions/app_submissions.py b/bin/migrate-oats-data/applications/submissions/app_submissions.py index b9911bfa50..0d7feb3b9e 100644 --- a/bin/migrate-oats-data/applications/submissions/app_submissions.py +++ b/bin/migrate-oats-data/applications/submissions/app_submissions.py @@ -175,6 +175,7 @@ def prepare_app_sub_data(app_sub_raw_data_list, direction_data, subdiv_data, soi """ nfu_data_list = [] inc_exc_data_list = [] + naru_data_list = [] other_data_list = [] for row in app_sub_raw_data_list: From 865e185c1dfacc5eb87bc11f0ffcaacaa20a5589 Mon Sep 17 00:00:00 2001 From: "to. sandra" <76515860+sandratoh@users.noreply.github.com> Date: Tue, 3 Oct 2023 13:32:18 -0700 Subject: [PATCH 451/954] Use correct notice of work condition to validate app submission (#1031) --- .../application-submission-validator.service.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.ts b/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.ts index e7864c88b2..71f2e658c7 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.ts @@ -667,7 +667,10 @@ export class ApplicationSubmissionValidatorService { const noticeOfWork = applicationDocuments.filter( (document) => document.typeCode === DOCUMENT_TYPE.NOTICE_OF_WORK, ); - if (applicationSubmission.soilIsFollowUp && noticeOfWork.length === 0) { + if ( + applicationSubmission.soilHasSubmittedNotice && + noticeOfWork.length === 0 + ) { errors.push( new ServiceValidationException( `${applicationSubmission.typeCode} proposal has yes to notice of work but is not attached`, From 126f0ace062b724a002379dd22501c699f246580 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Tue, 3 Oct 2023 14:48:43 -0700 Subject: [PATCH 452/954] Add business name to inbox * Show government name over business name --- .../src/app/features/home/home.component.html | 3 ++ .../app/features/home/home.component.spec.ts | 9 +++++- .../src/app/features/home/home.component.ts | 28 ++++++++++--------- .../app/shared/header/header.component.html | 2 +- 4 files changed, 27 insertions(+), 15 deletions(-) diff --git a/portal-frontend/src/app/features/home/home.component.html b/portal-frontend/src/app/features/home/home.component.html index 9830090366..b7829d1d5c 100644 --- a/portal-frontend/src/app/features/home/home.component.html +++ b/portal-frontend/src/app/features/home/home.component.html @@ -1,5 +1,8 @@ <div> <div class="header-row"> + <div *ngIf="profile && (profile.government || profile.businessName)"> + <h6>{{ profile.government || profile.businessName }}</h6> + </div> <diV class="title"> <h3>Portal Inbox</h3> <div> diff --git a/portal-frontend/src/app/features/home/home.component.spec.ts b/portal-frontend/src/app/features/home/home.component.spec.ts index f559c86a8c..274b36e9a1 100644 --- a/portal-frontend/src/app/features/home/home.component.spec.ts +++ b/portal-frontend/src/app/features/home/home.component.spec.ts @@ -2,7 +2,10 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MatDialogModule } from '@angular/material/dialog'; import { RouterTestingModule } from '@angular/router/testing'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { BehaviorSubject } from 'rxjs'; import { ApplicationSubmissionService } from '../../services/application-submission/application-submission.service'; +import { UserDto } from '../../services/authentication/authentication.dto'; import { AuthenticationService } from '../../services/authentication/authentication.service'; import { HomeComponent } from './home.component'; @@ -10,15 +13,19 @@ import { HomeComponent } from './home.component'; describe('HomeComponent', () => { let component: HomeComponent; let fixture: ComponentFixture<HomeComponent>; + let mockAuthService: DeepMocked<AuthenticationService>; beforeEach(async () => { + mockAuthService = createMock(); + mockAuthService.$currentProfile = new BehaviorSubject<UserDto | undefined>(undefined); + await TestBed.configureTestingModule({ imports: [RouterTestingModule, MatDialogModule], declarations: [HomeComponent], providers: [ { provide: AuthenticationService, - useValue: {}, + useValue: mockAuthService, }, { provide: ApplicationSubmissionService, diff --git a/portal-frontend/src/app/features/home/home.component.ts b/portal-frontend/src/app/features/home/home.component.ts index e9b2412b41..a95100b191 100644 --- a/portal-frontend/src/app/features/home/home.component.ts +++ b/portal-frontend/src/app/features/home/home.component.ts @@ -1,7 +1,8 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, OnDestroy, OnInit } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; +import { Subject, takeUntil } from 'rxjs'; +import { UserDto } from '../../services/authentication/authentication.dto'; import { AuthenticationService } from '../../services/authentication/authentication.service'; -import { OverlaySpinnerService } from '../../shared/overlay-spinner/overlay-spinner.service'; import { CreateSubmissionDialogComponent } from '../create-submission-dialog/create-submission-dialog.component'; @Component({ @@ -9,21 +10,22 @@ import { CreateSubmissionDialogComponent } from '../create-submission-dialog/cre templateUrl: './home.component.html', styleUrls: ['./home.component.scss'], }) -export class HomeComponent implements OnInit { - public name = ''; +export class HomeComponent implements OnInit, OnDestroy { + $destroy = new Subject<void>(); public isLearnMoreOpen = false; + profile: UserDto | undefined; - constructor( - private authenticationService: AuthenticationService, - private dialog: MatDialog, - private spinnerService: OverlaySpinnerService - ) {} + constructor(private authenticationService: AuthenticationService, private dialog: MatDialog) {} ngOnInit(): void { - const user = this.authenticationService.currentUser; - if (user) { - this.name = user.name; - } + this.authenticationService.$currentProfile.pipe(takeUntil(this.$destroy)).subscribe((profile) => { + this.profile = profile; + }); + } + + ngOnDestroy(): void { + this.$destroy.next(); + this.$destroy.complete(); } async onCreateApplication() { diff --git a/portal-frontend/src/app/shared/header/header.component.html b/portal-frontend/src/app/shared/header/header.component.html index e6a1a81016..ba6d59f015 100644 --- a/portal-frontend/src/app/shared/header/header.component.html +++ b/portal-frontend/src/app/shared/header/header.component.html @@ -36,7 +36,7 @@ <h5 class="center"> </button> <mat-menu class="user-menu" #userMenu="matMenu"> <div class="item">User ID: {{ user?.bceidUserName }}</div> - <div class="item">Business: {{ user?.businessName }}</div> + <div class="item">Business: {{ user?.government || user?.businessName }}</div> <div class="item">Type: {{ user?.businessName ? 'BCeID Business' : 'BCeID Basic' }}</div> </mat-menu> <button class="inbox-btn" routerLink="/home" mat-flat-button color="primary">Portal Inbox</button> From ed99ea9d01dbad520680a62377d956f747cdeda4 Mon Sep 17 00:00:00 2001 From: Liam Stoddard <lstodd@protonmail.com> Date: Tue, 3 Oct 2023 16:53:03 -0700 Subject: [PATCH 453/954] naru subtypes --- .../submissions/app_submissions.py | 39 +- .../common/alcs_application_enum.py | 9 +- .../common/oats_application_code_values.py | 448 +++++++++--------- 3 files changed, 274 insertions(+), 222 deletions(-) diff --git a/bin/migrate-oats-data/applications/submissions/app_submissions.py b/bin/migrate-oats-data/applications/submissions/app_submissions.py index 0d7feb3b9e..95b5eff3a9 100644 --- a/bin/migrate-oats-data/applications/submissions/app_submissions.py +++ b/bin/migrate-oats-data/applications/submissions/app_submissions.py @@ -5,6 +5,8 @@ OATS_ETL_USER, ALRChangeCode, setup_and_get_logger, + AlcsNaruTypeCode, + OatsNarCode, ) from db import inject_conn_pool from psycopg2.extras import RealDictCursor, execute_batch @@ -125,6 +127,7 @@ def insert_app_sub_records( nfu_data_list, other_data_list, inc_exc_data_list, + naru_data_list, ) = prepare_app_sub_data(rows, direction_data, subdiv_data, soil_data) if len(nfu_data_list) > 0: @@ -143,6 +146,14 @@ def insert_app_sub_records( page_size=batch_size, ) + if len(naru_data_list) > 0: + execute_batch( + cursor, + get_insert_query_for_naru(), + inc_exc_data_list, + page_size=batch_size, + ) + if len(other_data_list) > 0: execute_batch( cursor, @@ -196,10 +207,12 @@ def prepare_app_sub_data(app_sub_raw_data_list, direction_data, subdiv_data, soi or data["alr_change_code"] == ALRChangeCode.INC.value ): inc_exc_data_list.append(data) + elif data["alr_change_code"] == ALRChangeCode.NAR.value: + naru_data_list.append(data) else: other_data_list.append(data) - return nfu_data_list, other_data_list, inc_exc_data_list + return nfu_data_list, other_data_list, inc_exc_data_list, naru_data_list def get_insert_query(unique_fields, unique_values): @@ -269,6 +282,30 @@ def get_insert_query_for_nfu(): return get_insert_query(unique_fields, unique_values) +def get_insert_query_for_naru(): + unique_fields = """, nfu_hectares, + nfu_will_import_fill, + nfu_fill_volume, + nfu_max_fill_depth, + nfu_project_duration_amount, + nfu_fill_type_description, + nfu_fill_origin_description, + nfu_project_duration_unit, + nfu_total_fill_area + """ + unique_values = """, %(alr_area)s, + %(import_fill)s, + %(total_fill)s, + %(max_fill_depth)s, + %(fill_duration)s, + %(fill_type)s, + %(fill_origin)s, + %(fill_duration_unit)s, + %(fill_area)s + """ + return get_insert_query(unique_fields, unique_values) + + def get_insert_query_for_inc_exc(): unique_fields = ", incl_excl_hectares" unique_values = ", %(alr_area)s" diff --git a/bin/migrate-oats-data/common/alcs_application_enum.py b/bin/migrate-oats-data/common/alcs_application_enum.py index 298f64712c..18319073c0 100644 --- a/bin/migrate-oats-data/common/alcs_application_enum.py +++ b/bin/migrate-oats-data/common/alcs_application_enum.py @@ -49,6 +49,13 @@ class AlcsAgCapSource(Enum): CLI = "CLI" On_site = "On-site" + class AlcsApplicantType(Enum): Land_owner = "Land Owner" - LFNG = "L/FNG Initiated" \ No newline at end of file + LFNG = "L/FNG Initiated" + + +class AlcsNaruTypeCode(Enum): + Principal_Residence = "PRIN" # Principal Residence More Than 500m² + Additional_Residence = "ARFU" # Additional Residence for Farm Use + Tourism_Accomodation = "TOUR" # Non-Adhering Tourism Accommodation diff --git a/bin/migrate-oats-data/common/oats_application_code_values.py b/bin/migrate-oats-data/common/oats_application_code_values.py index 5dd8e7ca1a..a08a6aff18 100644 --- a/bin/migrate-oats-data/common/oats_application_code_values.py +++ b/bin/migrate-oats-data/common/oats_application_code_values.py @@ -28,230 +28,238 @@ class OatsAgriCapabilityCodes(Enum): S = "S" U = "U" + class OatsLegislationCodes(Enum): SEC_30_1 = "SEC_30_1" SEC_29_1 = "SEC_29_1" SEC_17_3 = "SEC_17_3" SEC_17_1 = "SEC_17_1" + +class OatsNarCode(Enum): + PRL = "PRL" # Private Residence >500m2 + ADF = "ADF" # Additional Farm Use Residence + ATA = "ATA" # Non-Adhering Tourisim Accomodation + + OATS_NFU_SUBTYPES = [ - {"type_key": "AGR", "subtype_key": "1", "value": "Accessory Buildings"}, - {"type_key": "RES", "subtype_key": "2", "value": "Additional Dwelling(s)"}, - { - "type_key": "AGR", - "subtype_key": "3", - "value": "Additional Structures for Farm Help", - }, - { - "type_key": "AGR", - "subtype_key": "4", - "value": "Agricultural Land Use Remnant", - }, - {"type_key": "AGR", "subtype_key": "5", "value": "Agricultural Lease"}, - { - "type_key": "AGR", - "subtype_key": "6", - "value": "Agricultural Subdivision Remnant", - }, - { - "type_key": "TRA", - "subtype_key": "7", - "value": "Airports and Aviation related", - }, - {"type_key": "IND", "subtype_key": "8", "value": "Alcohol Processing"}, - { - "type_key": "COM", - "subtype_key": "9", - "value": "Animal Boarding and Services", - }, - {"type_key": "COM", "subtype_key": "11", "value": "Auto Services"}, - {"type_key": "AGR", "subtype_key": "12", "value": "Beef"}, - { - "type_key": "COM", - "subtype_key": "13", - "value": "Campground (Private) & RV Park", - }, - {"type_key": "COM", "subtype_key": "14", "value": "Care Facilities"}, - { - "type_key": "IND", - "subtype_key": "15", - "value": "Cement/ Asphalt/Concrete Plants", - }, - {"type_key": "CIV", "subtype_key": "16", "value": "Cemeteries"}, - {"type_key": "CIV", "subtype_key": "17", "value": "Churches & Bible Schools"}, - {"type_key": "CIV", "subtype_key": "18", "value": "Civic - other"}, - { - "type_key": "CIV", - "subtype_key": "19", - "value": "Civic Facilities and Buildings", - }, - {"type_key": "COM", "subtype_key": "20", "value": "Commercial - other"}, - {"type_key": "IND", "subtype_key": "21", "value": "Composting"}, - {"type_key": "AGR", "subtype_key": "22", "value": "Dairy"}, - { - "type_key": "IND", - "subtype_key": "23", - "value": "Deposition/Fill (All Types)", - }, - {"type_key": "COM", "subtype_key": "24", "value": "Golf Course"}, - {"type_key": "AGR", "subtype_key": "25", "value": "Grain & Forage"}, - { - "type_key": "TRA", - "subtype_key": "25", - "value": "Electrical Power Distribution Systems", - }, - {"type_key": "AGR", "subtype_key": "26", "value": "Greenhouses"}, - { - "type_key": "TRA", - "subtype_key": "26", - "value": "Electrical Power Facilities", - }, - {"type_key": "COM", "subtype_key": "28", "value": "Exhibitions and Festivals"}, - { - "type_key": "RES", - "subtype_key": "29", - "value": "Subdivision Special Categories", - }, - {"type_key": "COM", "subtype_key": "30", "value": "Food and Beverage Services"}, - { - "type_key": "RES", - "subtype_key": "30", - "value": "Subdivision Special Categories (Lease)", - }, - {"type_key": "IND", "subtype_key": "31", "value": "Food Processing (non-meat)"}, - {"type_key": "IND", "subtype_key": "32", "value": "Industrial - other"}, - {"type_key": "AGR", "subtype_key": "33", "value": "Land Use Remnant"}, - {"type_key": "AGR", "subtype_key": "34", "value": "Livestock-Unspecified"}, - {"type_key": "IND", "subtype_key": "35", "value": "Logging Operations"}, - { - "type_key": "IND", - "subtype_key": "36", - "value": "Lumber Manufacturing and Re-manufacturing", - }, - { - "type_key": "IND", - "subtype_key": "37", - "value": "Meat and Fish Processing (+abattoir)", - }, - {"type_key": "IND", "subtype_key": "38", "value": "Mining"}, - {"type_key": "AGR", "subtype_key": "39", "value": "Misc. Agricultural Use"}, - {"type_key": "AGR", "subtype_key": "40", "value": "Mixed Ag Uses"}, - {"type_key": "OTH", "subtype_key": "41", "value": "Mixed Uses"}, - {"type_key": "RES", "subtype_key": "42", "value": "Mobile Home Park"}, - { - "type_key": "RES", - "subtype_key": "43", - "value": "Multi Family-Apartments/Condominiums", - }, - { - "type_key": "COM", - "subtype_key": "44", - "value": "Office Building (Primary Use)", - }, - {"type_key": "IND", "subtype_key": "45", "value": "Oil and Gas Activities"}, - {"type_key": "OTH", "subtype_key": "46", "value": "Other Uses"}, - {"type_key": "AGR", "subtype_key": "47", "value": "Other-Undefined"}, - {"type_key": "REC", "subtype_key": "48", "value": "Parks & Playing Fields"}, - { - "type_key": "CIV", - "subtype_key": "49", - "value": "Parks-All Types operated by Local Gov't", - }, - {"type_key": "AGR", "subtype_key": "50", "value": "Pigs/Hogs"}, - {"type_key": "AGR", "subtype_key": "51", "value": "Poultry"}, - { - "type_key": "TRA", - "subtype_key": "52", - "value": "Public Transportation Facilities", - }, - {"type_key": "TRA", "subtype_key": "53", "value": "Railway"}, - {"type_key": "REC", "subtype_key": "54", "value": "Recreational - other"}, - {"type_key": "CIV", "subtype_key": "55", "value": "Research Facilities"}, - {"type_key": "RES", "subtype_key": "56", "value": "Residential - other"}, - {"type_key": "TRA", "subtype_key": "57", "value": "Roads"}, - {"type_key": "IND", "subtype_key": "58", "value": "Sand & Gravel"}, - {"type_key": "CIV", "subtype_key": "59", "value": "Sanitary Land Fills"}, - {"type_key": "CIV", "subtype_key": "60", "value": "Schools & Universities"}, - { - "type_key": "TRA", - "subtype_key": "61", - "value": "Sewage Treatment Facilities", - }, - {"type_key": "TRA", "subtype_key": "62", "value": "Sewer Distribution Systems"}, - {"type_key": "COM", "subtype_key": "63", "value": "Shopping Centre"}, - {"type_key": "AGR", "subtype_key": "64", "value": "Small Fruits-Berries"}, - { - "type_key": "COM", - "subtype_key": "65", - "value": "Sports Facilities - commercial", - }, - { - "type_key": "REC", - "subtype_key": "66", - "value": "Sports Facilities - municipal", - }, - {"type_key": "COM", "subtype_key": "67", "value": "Storage & Warehouse"}, - {"type_key": "COM", "subtype_key": "68", "value": "Store (Retail - All Types)"}, - { - "type_key": "TRA", - "subtype_key": "69", - "value": "Telephone and Telecommunications", - }, - {"type_key": "COM", "subtype_key": "70", "value": "Tourist Accommodations"}, - {"type_key": "REC", "subtype_key": "71", "value": "Trails"}, - {"type_key": "TRA", "subtype_key": "72", "value": "Transportation - other"}, - {"type_key": "AGR", "subtype_key": "73", "value": "Tree Fruits"}, - {"type_key": "AGR", "subtype_key": "74", "value": "Turf Farm"}, - {"type_key": "AGR", "subtype_key": "75", "value": "Vegetable & Truck"}, - { - "type_key": "AGR", - "subtype_key": "76", - "value": "Vineyard and Associated Uses", - }, - {"type_key": "TRA", "subtype_key": "77", "value": "Water Distribution Systems"}, - { - "type_key": "TRA", - "subtype_key": "78", - "value": "Water or Sewer Distribution Systems (inactive)", - }, - {"type_key": "TRA", "subtype_key": "79", "value": "Water Treatment Facilities"}, - {"type_key": "COM", "subtype_key": "80", "value": "Hall/Lodge (private)_"}, - { - "type_key": "CIV", - "subtype_key": "81", - "value": "Hospitals, Health Centres (Incl Private)", - }, - {"type_key": "RES", "subtype_key": "82", "value": "Farm Help Accommodation"}, - { - "type_key": "TRA", - "subtype_key": "27", - "value": "Gas and Other Distribution Pipelines", - }, - {"type_key": "AGR", "subtype_key": "23", "value": "Energy Production"}, - {"type_key": "IND", "subtype_key": "25", "value": "Energy Production"}, - {"type_key": "RES", "subtype_key": "83", "value": "Lease"}, - { - "type_key": "IND", - "subtype_key": "86", - "value": "Storage and Warehouse Facilities (Indoor/Outdoor- Large Scale Structures)", - }, - { - "type_key": "IND", - "subtype_key": "84", - "value": "Work Camps or Associated Use", - }, - {"type_key": "IND", "subtype_key": "85", "value": "Miscellaneous Processing"}, - {"type_key": "COM", "subtype_key": "87", "value": "Events"}, - {"type_key": "IND", "subtype_key": "88", "value": "Sawmill"}, - { - "type_key": "CIV", - "subtype_key": "89", - "value": "Fire Hall and associated uses", - }, - { - "type_key": "AGR", - "subtype_key": "90", - "value": "Alcohol Production Associated Uses", - }, - {"type_key": "AGR", "subtype_key": "91", "value": "Cannabis Related Uses"}, - ] \ No newline at end of file + {"type_key": "AGR", "subtype_key": "1", "value": "Accessory Buildings"}, + {"type_key": "RES", "subtype_key": "2", "value": "Additional Dwelling(s)"}, + { + "type_key": "AGR", + "subtype_key": "3", + "value": "Additional Structures for Farm Help", + }, + { + "type_key": "AGR", + "subtype_key": "4", + "value": "Agricultural Land Use Remnant", + }, + {"type_key": "AGR", "subtype_key": "5", "value": "Agricultural Lease"}, + { + "type_key": "AGR", + "subtype_key": "6", + "value": "Agricultural Subdivision Remnant", + }, + { + "type_key": "TRA", + "subtype_key": "7", + "value": "Airports and Aviation related", + }, + {"type_key": "IND", "subtype_key": "8", "value": "Alcohol Processing"}, + { + "type_key": "COM", + "subtype_key": "9", + "value": "Animal Boarding and Services", + }, + {"type_key": "COM", "subtype_key": "11", "value": "Auto Services"}, + {"type_key": "AGR", "subtype_key": "12", "value": "Beef"}, + { + "type_key": "COM", + "subtype_key": "13", + "value": "Campground (Private) & RV Park", + }, + {"type_key": "COM", "subtype_key": "14", "value": "Care Facilities"}, + { + "type_key": "IND", + "subtype_key": "15", + "value": "Cement/ Asphalt/Concrete Plants", + }, + {"type_key": "CIV", "subtype_key": "16", "value": "Cemeteries"}, + {"type_key": "CIV", "subtype_key": "17", "value": "Churches & Bible Schools"}, + {"type_key": "CIV", "subtype_key": "18", "value": "Civic - other"}, + { + "type_key": "CIV", + "subtype_key": "19", + "value": "Civic Facilities and Buildings", + }, + {"type_key": "COM", "subtype_key": "20", "value": "Commercial - other"}, + {"type_key": "IND", "subtype_key": "21", "value": "Composting"}, + {"type_key": "AGR", "subtype_key": "22", "value": "Dairy"}, + { + "type_key": "IND", + "subtype_key": "23", + "value": "Deposition/Fill (All Types)", + }, + {"type_key": "COM", "subtype_key": "24", "value": "Golf Course"}, + {"type_key": "AGR", "subtype_key": "25", "value": "Grain & Forage"}, + { + "type_key": "TRA", + "subtype_key": "25", + "value": "Electrical Power Distribution Systems", + }, + {"type_key": "AGR", "subtype_key": "26", "value": "Greenhouses"}, + { + "type_key": "TRA", + "subtype_key": "26", + "value": "Electrical Power Facilities", + }, + {"type_key": "COM", "subtype_key": "28", "value": "Exhibitions and Festivals"}, + { + "type_key": "RES", + "subtype_key": "29", + "value": "Subdivision Special Categories", + }, + {"type_key": "COM", "subtype_key": "30", "value": "Food and Beverage Services"}, + { + "type_key": "RES", + "subtype_key": "30", + "value": "Subdivision Special Categories (Lease)", + }, + {"type_key": "IND", "subtype_key": "31", "value": "Food Processing (non-meat)"}, + {"type_key": "IND", "subtype_key": "32", "value": "Industrial - other"}, + {"type_key": "AGR", "subtype_key": "33", "value": "Land Use Remnant"}, + {"type_key": "AGR", "subtype_key": "34", "value": "Livestock-Unspecified"}, + {"type_key": "IND", "subtype_key": "35", "value": "Logging Operations"}, + { + "type_key": "IND", + "subtype_key": "36", + "value": "Lumber Manufacturing and Re-manufacturing", + }, + { + "type_key": "IND", + "subtype_key": "37", + "value": "Meat and Fish Processing (+abattoir)", + }, + {"type_key": "IND", "subtype_key": "38", "value": "Mining"}, + {"type_key": "AGR", "subtype_key": "39", "value": "Misc. Agricultural Use"}, + {"type_key": "AGR", "subtype_key": "40", "value": "Mixed Ag Uses"}, + {"type_key": "OTH", "subtype_key": "41", "value": "Mixed Uses"}, + {"type_key": "RES", "subtype_key": "42", "value": "Mobile Home Park"}, + { + "type_key": "RES", + "subtype_key": "43", + "value": "Multi Family-Apartments/Condominiums", + }, + { + "type_key": "COM", + "subtype_key": "44", + "value": "Office Building (Primary Use)", + }, + {"type_key": "IND", "subtype_key": "45", "value": "Oil and Gas Activities"}, + {"type_key": "OTH", "subtype_key": "46", "value": "Other Uses"}, + {"type_key": "AGR", "subtype_key": "47", "value": "Other-Undefined"}, + {"type_key": "REC", "subtype_key": "48", "value": "Parks & Playing Fields"}, + { + "type_key": "CIV", + "subtype_key": "49", + "value": "Parks-All Types operated by Local Gov't", + }, + {"type_key": "AGR", "subtype_key": "50", "value": "Pigs/Hogs"}, + {"type_key": "AGR", "subtype_key": "51", "value": "Poultry"}, + { + "type_key": "TRA", + "subtype_key": "52", + "value": "Public Transportation Facilities", + }, + {"type_key": "TRA", "subtype_key": "53", "value": "Railway"}, + {"type_key": "REC", "subtype_key": "54", "value": "Recreational - other"}, + {"type_key": "CIV", "subtype_key": "55", "value": "Research Facilities"}, + {"type_key": "RES", "subtype_key": "56", "value": "Residential - other"}, + {"type_key": "TRA", "subtype_key": "57", "value": "Roads"}, + {"type_key": "IND", "subtype_key": "58", "value": "Sand & Gravel"}, + {"type_key": "CIV", "subtype_key": "59", "value": "Sanitary Land Fills"}, + {"type_key": "CIV", "subtype_key": "60", "value": "Schools & Universities"}, + { + "type_key": "TRA", + "subtype_key": "61", + "value": "Sewage Treatment Facilities", + }, + {"type_key": "TRA", "subtype_key": "62", "value": "Sewer Distribution Systems"}, + {"type_key": "COM", "subtype_key": "63", "value": "Shopping Centre"}, + {"type_key": "AGR", "subtype_key": "64", "value": "Small Fruits-Berries"}, + { + "type_key": "COM", + "subtype_key": "65", + "value": "Sports Facilities - commercial", + }, + { + "type_key": "REC", + "subtype_key": "66", + "value": "Sports Facilities - municipal", + }, + {"type_key": "COM", "subtype_key": "67", "value": "Storage & Warehouse"}, + {"type_key": "COM", "subtype_key": "68", "value": "Store (Retail - All Types)"}, + { + "type_key": "TRA", + "subtype_key": "69", + "value": "Telephone and Telecommunications", + }, + {"type_key": "COM", "subtype_key": "70", "value": "Tourist Accommodations"}, + {"type_key": "REC", "subtype_key": "71", "value": "Trails"}, + {"type_key": "TRA", "subtype_key": "72", "value": "Transportation - other"}, + {"type_key": "AGR", "subtype_key": "73", "value": "Tree Fruits"}, + {"type_key": "AGR", "subtype_key": "74", "value": "Turf Farm"}, + {"type_key": "AGR", "subtype_key": "75", "value": "Vegetable & Truck"}, + { + "type_key": "AGR", + "subtype_key": "76", + "value": "Vineyard and Associated Uses", + }, + {"type_key": "TRA", "subtype_key": "77", "value": "Water Distribution Systems"}, + { + "type_key": "TRA", + "subtype_key": "78", + "value": "Water or Sewer Distribution Systems (inactive)", + }, + {"type_key": "TRA", "subtype_key": "79", "value": "Water Treatment Facilities"}, + {"type_key": "COM", "subtype_key": "80", "value": "Hall/Lodge (private)_"}, + { + "type_key": "CIV", + "subtype_key": "81", + "value": "Hospitals, Health Centres (Incl Private)", + }, + {"type_key": "RES", "subtype_key": "82", "value": "Farm Help Accommodation"}, + { + "type_key": "TRA", + "subtype_key": "27", + "value": "Gas and Other Distribution Pipelines", + }, + {"type_key": "AGR", "subtype_key": "23", "value": "Energy Production"}, + {"type_key": "IND", "subtype_key": "25", "value": "Energy Production"}, + {"type_key": "RES", "subtype_key": "83", "value": "Lease"}, + { + "type_key": "IND", + "subtype_key": "86", + "value": "Storage and Warehouse Facilities (Indoor/Outdoor- Large Scale Structures)", + }, + { + "type_key": "IND", + "subtype_key": "84", + "value": "Work Camps or Associated Use", + }, + {"type_key": "IND", "subtype_key": "85", "value": "Miscellaneous Processing"}, + {"type_key": "COM", "subtype_key": "87", "value": "Events"}, + {"type_key": "IND", "subtype_key": "88", "value": "Sawmill"}, + { + "type_key": "CIV", + "subtype_key": "89", + "value": "Fire Hall and associated uses", + }, + { + "type_key": "AGR", + "subtype_key": "90", + "value": "Alcohol Production Associated Uses", + }, + {"type_key": "AGR", "subtype_key": "91", "value": "Cannabis Related Uses"}, +] From 60402c0c1293062a607a0ba4848c8cff728043c9 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Wed, 4 Oct 2023 09:58:44 -0700 Subject: [PATCH 454/954] Add Mobile Inbox List * Add new mobile layout for inbox * Clean up CSS --- portal-frontend/src/app/app.module.ts | 2 + .../application-list.component.html | 3 +- .../application-list.component.scss | 31 ----------- .../application-list.component.ts | 16 +++++- .../src/app/features/home/home.component.html | 6 +-- .../src/app/features/home/home.component.scss | 29 ++++++++++ .../app/features/home/home.component.spec.ts | 4 -- .../src/app/features/home/home.component.ts | 12 ++++- .../home/inbox-list/inbox-list.component.html | 33 ++++++++++++ .../home/inbox-list/inbox-list.component.scss | 35 ++++++++++++ .../inbox-list/inbox-list.component.spec.ts | 33 ++++++++++++ .../home/inbox-list/inbox-list.component.ts | 54 +++++++++++++++++++ .../home/noi-list/noi-list.component.html | 4 +- .../home/noi-list/noi-list.component.scss | 31 ----------- .../home/noi-list/noi-list.component.ts | 18 ++++++- .../notification-list.component.html | 3 +- .../notification-list.component.scss | 31 ----------- .../notification-list.component.ts | 20 ++++++- .../application-search-table.component.ts | 3 -- ...notice-of-intent-search-table.component.ts | 2 - .../notification-search-table.component.ts | 2 - .../search/public-search.component.html | 11 ++-- .../search-list/search-list.component.ts | 2 - .../application-submission.dto.ts | 4 +- 24 files changed, 261 insertions(+), 128 deletions(-) create mode 100644 portal-frontend/src/app/features/home/inbox-list/inbox-list.component.html create mode 100644 portal-frontend/src/app/features/home/inbox-list/inbox-list.component.scss create mode 100644 portal-frontend/src/app/features/home/inbox-list/inbox-list.component.spec.ts create mode 100644 portal-frontend/src/app/features/home/inbox-list/inbox-list.component.ts diff --git a/portal-frontend/src/app/app.module.ts b/portal-frontend/src/app/app.module.ts index ad4805b936..a8304cbf27 100644 --- a/portal-frontend/src/app/app.module.ts +++ b/portal-frontend/src/app/app.module.ts @@ -12,6 +12,7 @@ import { AuthorizationComponent } from './features/authorization/authorization.c import { CreateSubmissionDialogComponent } from './features/create-submission-dialog/create-submission-dialog.component'; import { ApplicationListComponent } from './features/home/application-list/application-list.component'; import { HomeComponent } from './features/home/home.component'; +import { InboxListComponent } from './features/home/inbox-list/inbox-list.component'; import { NoiListComponent } from './features/home/noi-list/noi-list.component'; import { NotificationListComponent } from './features/home/notification-list/notification-list.component'; import { LandingPageComponent } from './features/landing-page/landing-page.component'; @@ -38,6 +39,7 @@ import { SharedModule } from './shared/shared.module'; CreateSubmissionDialogComponent, LandingPageComponent, ConfirmationDialogComponent, + InboxListComponent, ], imports: [ BrowserModule, diff --git a/portal-frontend/src/app/features/home/application-list/application-list.component.html b/portal-frontend/src/app/features/home/application-list/application-list.component.html index d169340042..433b94c8ee 100644 --- a/portal-frontend/src/app/features/home/application-list/application-list.component.html +++ b/portal-frontend/src/app/features/home/application-list/application-list.component.html @@ -1,4 +1,4 @@ -<div class="table-wrapper"> +<div *ngIf="!isMobile" class="table-wrapper"> <div class="table-container"> <table mat-table [dataSource]="dataSource"> <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr> @@ -59,3 +59,4 @@ <mat-paginator [pageSizeOptions]="[5, 10, 25, 100]" aria-label="Select page of applications"></mat-paginator> </div> </div> +<app-inbox-list *ngIf="isMobile" [items]="listItems"></app-inbox-list> diff --git a/portal-frontend/src/app/features/home/application-list/application-list.component.scss b/portal-frontend/src/app/features/home/application-list/application-list.component.scss index 5eb8d7a15e..e69de29bb2 100644 --- a/portal-frontend/src/app/features/home/application-list/application-list.component.scss +++ b/portal-frontend/src/app/features/home/application-list/application-list.component.scss @@ -1,31 +0,0 @@ -@use '../../../../styles/functions' as *; -@use '../../../../styles/colors'; - -.label { - display: inline-block; - padding: rem(4) rem(16); - border-radius: rem(16); - font-weight: bold; -} - -.table-wrapper { - overflow-x: auto; - - .table-container { - display: table; - width: 100%; - - table { - width: 100%; - } - - ::ng-deep .mat-table { - ::ng-deep .mat-cell, - ::ng-deep .mat-header-cell, - ::ng-deep .mat-row, - ::ng-deep .mat-header-row { - min-width: rem(150); - } - } - } -} diff --git a/portal-frontend/src/app/features/home/application-list/application-list.component.ts b/portal-frontend/src/app/features/home/application-list/application-list.component.ts index 59cac7943c..2cc636f889 100644 --- a/portal-frontend/src/app/features/home/application-list/application-list.component.ts +++ b/portal-frontend/src/app/features/home/application-list/application-list.component.ts @@ -1,8 +1,12 @@ -import { Component, OnInit, ViewChild } from '@angular/core'; +import { Component, Input, OnInit, ViewChild } from '@angular/core'; import { MatPaginator } from '@angular/material/paginator'; import { MatTableDataSource } from '@angular/material/table'; -import { ApplicationSubmissionDto } from '../../../services/application-submission/application-submission.dto'; +import { + ApplicationSubmissionDto, + SUBMISSION_STATUS, +} from '../../../services/application-submission/application-submission.dto'; import { ApplicationSubmissionService } from '../../../services/application-submission/application-submission.service'; +import { InboxListItem } from '../inbox-list/inbox-list.component'; @Component({ selector: 'app-application-list', @@ -21,7 +25,10 @@ export class ApplicationListComponent implements OnInit { 'actions', ]; + listItems: InboxListItem[] = []; + @ViewChild(MatPaginator) paginator!: MatPaginator; + @Input() isMobile = false; constructor(private applicationService: ApplicationSubmissionService) {} @@ -33,5 +40,10 @@ export class ApplicationListComponent implements OnInit { const applications = await this.applicationService.getApplications(); this.dataSource = new MatTableDataSource(applications); this.dataSource.paginator = this.paginator; + + this.listItems = applications.map((app) => ({ + ...app, + routerLink: app.status.code !== SUBMISSION_STATUS.CANCELLED ? `/application/${app.fileNumber}` : undefined, + })); } } diff --git a/portal-frontend/src/app/features/home/home.component.html b/portal-frontend/src/app/features/home/home.component.html index b7829d1d5c..a77b112d11 100644 --- a/portal-frontend/src/app/features/home/home.component.html +++ b/portal-frontend/src/app/features/home/home.component.html @@ -32,7 +32,7 @@ <h3>Portal Inbox</h3> fee of $1,500 fee, except for inclusion of land (no fee). Application fees are split equally between the local government and the ALC. </app-warning-banner> - <app-application-list></app-application-list> + <app-application-list [isMobile]="isMobile"></app-application-list> </mat-tab> <mat-tab label="Notice of Intent"> <app-warning-banner> @@ -40,7 +40,7 @@ <h3>Portal Inbox</h3> exemption under Section 35 of the Agricultural Land Reserve Use Regulation. All notices are subject to a $150 fee. </app-warning-banner> - <app-noi-list></app-noi-list> + <app-noi-list [isMobile]="isMobile"></app-noi-list> </mat-tab> <mat-tab label="Notification of SRW"> <app-warning-banner> @@ -50,7 +50,7 @@ <h3>Portal Inbox</h3> > in the ALR. </app-warning-banner> - <app-notification-list></app-notification-list> + <app-notification-list [isMobile]="isMobile"></app-notification-list> </mat-tab> </mat-tab-group> </div> diff --git a/portal-frontend/src/app/features/home/home.component.scss b/portal-frontend/src/app/features/home/home.component.scss index e7b75a145d..ace9e2f42c 100644 --- a/portal-frontend/src/app/features/home/home.component.scss +++ b/portal-frontend/src/app/features/home/home.component.scss @@ -13,6 +13,35 @@ text-align: center; padding: rem(8); } + + .label { + display: inline-block; + padding: rem(4) rem(16); + border-radius: rem(16); + font-weight: bold; + } + + .table-wrapper { + overflow-x: auto; + + .table-container { + display: table; + width: 100%; + + table { + width: 100%; + } + + ::ng-deep .mat-table { + ::ng-deep .mat-cell, + ::ng-deep .mat-header-cell, + ::ng-deep .mat-row, + ::ng-deep .mat-header-row { + min-width: rem(150); + } + } + } + } } .header-row { diff --git a/portal-frontend/src/app/features/home/home.component.spec.ts b/portal-frontend/src/app/features/home/home.component.spec.ts index 274b36e9a1..3abe0ff4eb 100644 --- a/portal-frontend/src/app/features/home/home.component.spec.ts +++ b/portal-frontend/src/app/features/home/home.component.spec.ts @@ -27,10 +27,6 @@ describe('HomeComponent', () => { provide: AuthenticationService, useValue: mockAuthService, }, - { - provide: ApplicationSubmissionService, - useValue: {}, - }, ], schemas: [NO_ERRORS_SCHEMA], }).compileComponents(); diff --git a/portal-frontend/src/app/features/home/home.component.ts b/portal-frontend/src/app/features/home/home.component.ts index a95100b191..4eac06e875 100644 --- a/portal-frontend/src/app/features/home/home.component.ts +++ b/portal-frontend/src/app/features/home/home.component.ts @@ -1,8 +1,9 @@ -import { Component, OnDestroy, OnInit } from '@angular/core'; +import { Component, HostListener, OnDestroy, OnInit } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; import { Subject, takeUntil } from 'rxjs'; import { UserDto } from '../../services/authentication/authentication.dto'; import { AuthenticationService } from '../../services/authentication/authentication.service'; +import { MOBILE_BREAKPOINT } from '../../shared/utils/breakpoints'; import { CreateSubmissionDialogComponent } from '../create-submission-dialog/create-submission-dialog.component'; @Component({ @@ -11,8 +12,14 @@ import { CreateSubmissionDialogComponent } from '../create-submission-dialog/cre styleUrls: ['./home.component.scss'], }) export class HomeComponent implements OnInit, OnDestroy { + @HostListener('window:resize', ['$event']) + onWindowResize() { + this.isMobile = window.innerWidth <= MOBILE_BREAKPOINT; + } + $destroy = new Subject<void>(); - public isLearnMoreOpen = false; + isLearnMoreOpen = false; + isMobile = false; profile: UserDto | undefined; constructor(private authenticationService: AuthenticationService, private dialog: MatDialog) {} @@ -21,6 +28,7 @@ export class HomeComponent implements OnInit, OnDestroy { this.authenticationService.$currentProfile.pipe(takeUntil(this.$destroy)).subscribe((profile) => { this.profile = profile; }); + this.isMobile = window.innerWidth <= MOBILE_BREAKPOINT; } ngOnDestroy(): void { diff --git a/portal-frontend/src/app/features/home/inbox-list/inbox-list.component.html b/portal-frontend/src/app/features/home/inbox-list/inbox-list.component.html new file mode 100644 index 0000000000..f378bd3af5 --- /dev/null +++ b/portal-frontend/src/app/features/home/inbox-list/inbox-list.component.html @@ -0,0 +1,33 @@ +<div class="result-list" *ngIf="totalCount > 0"> + <div + *ngFor="let result of _items" + [routerLink]="result.routerLink" + class="result" + [ngClass]="{ + hoverable: result.routerLink + }" + > + <div class="subheading2">{{ result.fileNumber }} - {{ result.applicant ?? '(Unknown)' }}</div> + <div>Created: {{ result.createdAt | momentFormat }}</div> + <div [title]="result.type">{{ result.type }}</div> + <div + *ngIf="result.status" + class="label" + [style]="{ 'background-color': result.status.portalBackgroundColor, color: result.status.portalColor }" + > + {{ result.status.label }} + </div> + <div>Last Updated: {{ result.lastStatusUpdate | momentFormat }}</div> + </div> +</div> +<div *ngIf="totalCount !== 0"> + <div class="center">Showing results 1-{{ visibleCount }} of {{ totalCount }}</div> + <div class="center"> + <a *ngIf="visibleCount < totalCount" (click)="onLoadMore()"> View more results </a> + </div> +</div> + +<div class="no-data" *ngIf="totalCount === 0"> + <div><b>No applications found.</b></div> + <div>Please adjust search criteria and try again.</div> +</div> diff --git a/portal-frontend/src/app/features/home/inbox-list/inbox-list.component.scss b/portal-frontend/src/app/features/home/inbox-list/inbox-list.component.scss new file mode 100644 index 0000000000..3bb278dcf0 --- /dev/null +++ b/portal-frontend/src/app/features/home/inbox-list/inbox-list.component.scss @@ -0,0 +1,35 @@ +@use '../../../../styles/functions' as *; +@use '../../../../styles/colors'; + +.result-list { + margin-top: rem(16); +} + +.result { + border-radius: rem(4); + border: 2px solid var(--portal-grey-light, #efefef); + margin: rem(4) rem(4) rem(20); //BOX SHADOWS + padding: rem(12) rem(8); + font-size: rem(14) !important; + + div { + margin: rem(4); + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + } + + .subheading2 { + margin-bottom: rem(8) !important; + } + + &.hoverable { + border-color: transparent; + box-shadow: 0 rem(2) rem(6) 0 rgba(0, 0, 0, 0.2); + } + + &.hoverable:hover { + cursor: pointer; + background-color: colors.$grey-light; + } +} diff --git a/portal-frontend/src/app/features/home/inbox-list/inbox-list.component.spec.ts b/portal-frontend/src/app/features/home/inbox-list/inbox-list.component.spec.ts new file mode 100644 index 0000000000..a16be2afe6 --- /dev/null +++ b/portal-frontend/src/app/features/home/inbox-list/inbox-list.component.spec.ts @@ -0,0 +1,33 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { Router } from '@angular/router'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; + +import { InboxListComponent } from './inbox-list.component'; + +describe('InboxListComponent', () => { + let component: InboxListComponent; + let fixture: ComponentFixture<InboxListComponent>; + let mockRouter: DeepMocked<Router>; + + beforeEach(async () => { + mockRouter = createMock(); + + await TestBed.configureTestingModule({ + declarations: [InboxListComponent], + providers: [ + { + provide: Router, + useValue: mockRouter, + }, + ], + }).compileComponents(); + + fixture = TestBed.createComponent(InboxListComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/home/inbox-list/inbox-list.component.ts b/portal-frontend/src/app/features/home/inbox-list/inbox-list.component.ts new file mode 100644 index 0000000000..a77a749722 --- /dev/null +++ b/portal-frontend/src/app/features/home/inbox-list/inbox-list.component.ts @@ -0,0 +1,54 @@ +import { Component, EventEmitter, Input, OnDestroy, Output } from '@angular/core'; +import { Router } from '@angular/router'; +import { Subject } from 'rxjs'; +import { BaseCodeDto } from '../../../shared/dto/base.dto'; + +export interface InboxListItem { + applicant?: string; + fileNumber: string; + lastStatusUpdate: number; + createdAt: number; + status?: BaseCodeDto & { + portalBackgroundColor: string; + portalColor: string; + }; + type: string; + routerLink?: string; +} + +@Component({ + selector: 'app-inbox-list', + templateUrl: './inbox-list.component.html', + styleUrls: ['./inbox-list.component.scss'], +}) +export class InboxListComponent implements OnDestroy { + $destroy = new Subject<void>(); + + @Input() totalCount = 0; + + _items: InboxListItem[] = []; + @Input() set items(items: InboxListItem[]) { + this._items = items; + this.visibleCount = items.length; + this.totalCount = items.length; + } + + @Output() loadMore = new EventEmitter<void>(); + @Output() selectRecord = new EventEmitter<string>(); + visibleCount = 0; + + constructor(private router: Router) {} + + ngOnDestroy(): void { + this.$destroy.next(); + this.$destroy.complete(); + } + + async onSelectRecord(record: InboxListItem) { + this.selectRecord.emit(record.fileNumber); + } + + onLoadMore() { + this.loadMore.emit(); + } +} diff --git a/portal-frontend/src/app/features/home/noi-list/noi-list.component.html b/portal-frontend/src/app/features/home/noi-list/noi-list.component.html index 52b16f25e4..5959b72cfe 100644 --- a/portal-frontend/src/app/features/home/noi-list/noi-list.component.html +++ b/portal-frontend/src/app/features/home/noi-list/noi-list.component.html @@ -1,4 +1,4 @@ -<div class="table-wrapper"> +<div *ngIf="!isMobile" class="table-wrapper"> <div class="table-container"> <table mat-table [dataSource]="dataSource"> <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr> @@ -64,3 +64,5 @@ <mat-paginator [pageSizeOptions]="[5, 10, 25, 100]" aria-label="Select page of notice of intents"></mat-paginator> </div> </div> + +<app-inbox-list *ngIf="isMobile" [items]="listItems"></app-inbox-list> diff --git a/portal-frontend/src/app/features/home/noi-list/noi-list.component.scss b/portal-frontend/src/app/features/home/noi-list/noi-list.component.scss index 5eb8d7a15e..e69de29bb2 100644 --- a/portal-frontend/src/app/features/home/noi-list/noi-list.component.scss +++ b/portal-frontend/src/app/features/home/noi-list/noi-list.component.scss @@ -1,31 +0,0 @@ -@use '../../../../styles/functions' as *; -@use '../../../../styles/colors'; - -.label { - display: inline-block; - padding: rem(4) rem(16); - border-radius: rem(16); - font-weight: bold; -} - -.table-wrapper { - overflow-x: auto; - - .table-container { - display: table; - width: 100%; - - table { - width: 100%; - } - - ::ng-deep .mat-table { - ::ng-deep .mat-cell, - ::ng-deep .mat-header-cell, - ::ng-deep .mat-row, - ::ng-deep .mat-header-row { - min-width: rem(150); - } - } - } -} diff --git a/portal-frontend/src/app/features/home/noi-list/noi-list.component.ts b/portal-frontend/src/app/features/home/noi-list/noi-list.component.ts index 06f252fe20..f528740e11 100644 --- a/portal-frontend/src/app/features/home/noi-list/noi-list.component.ts +++ b/portal-frontend/src/app/features/home/noi-list/noi-list.component.ts @@ -1,8 +1,13 @@ -import { Component, OnInit, ViewChild } from '@angular/core'; +import { Component, Input, OnInit, ViewChild } from '@angular/core'; import { MatPaginator } from '@angular/material/paginator'; import { MatTableDataSource } from '@angular/material/table'; -import { NoticeOfIntentSubmissionDto } from '../../../services/notice-of-intent-submission/notice-of-intent-submission.dto'; +import { SUBMISSION_STATUS } from '../../../services/application-submission/application-submission.dto'; +import { + NOI_SUBMISSION_STATUS, + NoticeOfIntentSubmissionDto, +} from '../../../services/notice-of-intent-submission/notice-of-intent-submission.dto'; import { NoticeOfIntentSubmissionService } from '../../../services/notice-of-intent-submission/notice-of-intent-submission.service'; +import { InboxListItem } from '../inbox-list/inbox-list.component'; @Component({ selector: 'app-noi-list', @@ -21,7 +26,10 @@ export class NoiListComponent implements OnInit { 'actions', ]; + listItems: InboxListItem[] = []; + @ViewChild(MatPaginator) paginator!: MatPaginator; + @Input() isMobile = false; constructor(private noiSubmissionService: NoticeOfIntentSubmissionService) {} @@ -33,5 +41,11 @@ export class NoiListComponent implements OnInit { const nois = await this.noiSubmissionService.getNoticeOfIntents(); this.dataSource = new MatTableDataSource(nois); this.dataSource.paginator = this.paginator; + + this.listItems = nois.map((noi) => ({ + ...noi, + routerLink: + noi.status.code !== NOI_SUBMISSION_STATUS.CANCELLED ? `/notice-of-intent/${noi.fileNumber}` : undefined, + })); } } diff --git a/portal-frontend/src/app/features/home/notification-list/notification-list.component.html b/portal-frontend/src/app/features/home/notification-list/notification-list.component.html index 0322d6b0ab..3abcf1944f 100644 --- a/portal-frontend/src/app/features/home/notification-list/notification-list.component.html +++ b/portal-frontend/src/app/features/home/notification-list/notification-list.component.html @@ -1,4 +1,4 @@ -<div class="table-wrapper"> +<div *ngIf='!isMobile' class="table-wrapper"> <div class="table-container"> <table mat-table [dataSource]="dataSource"> <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr> @@ -59,3 +59,4 @@ <mat-paginator [pageSizeOptions]="[5, 10, 25, 100]" aria-label="Select page of SRWs"></mat-paginator> </div> </div> +<app-inbox-list *ngIf="isMobile" [items]="listItems"></app-inbox-list> diff --git a/portal-frontend/src/app/features/home/notification-list/notification-list.component.scss b/portal-frontend/src/app/features/home/notification-list/notification-list.component.scss index 5eb8d7a15e..e69de29bb2 100644 --- a/portal-frontend/src/app/features/home/notification-list/notification-list.component.scss +++ b/portal-frontend/src/app/features/home/notification-list/notification-list.component.scss @@ -1,31 +0,0 @@ -@use '../../../../styles/functions' as *; -@use '../../../../styles/colors'; - -.label { - display: inline-block; - padding: rem(4) rem(16); - border-radius: rem(16); - font-weight: bold; -} - -.table-wrapper { - overflow-x: auto; - - .table-container { - display: table; - width: 100%; - - table { - width: 100%; - } - - ::ng-deep .mat-table { - ::ng-deep .mat-cell, - ::ng-deep .mat-header-cell, - ::ng-deep .mat-row, - ::ng-deep .mat-header-row { - min-width: rem(150); - } - } - } -} diff --git a/portal-frontend/src/app/features/home/notification-list/notification-list.component.ts b/portal-frontend/src/app/features/home/notification-list/notification-list.component.ts index ca930f1122..4e63f44801 100644 --- a/portal-frontend/src/app/features/home/notification-list/notification-list.component.ts +++ b/portal-frontend/src/app/features/home/notification-list/notification-list.component.ts @@ -1,8 +1,13 @@ -import { Component, OnInit, ViewChild } from '@angular/core'; +import { Component, Input, OnInit, ViewChild } from '@angular/core'; import { MatPaginator } from '@angular/material/paginator'; import { MatTableDataSource } from '@angular/material/table'; -import { NotificationSubmissionDto } from '../../../services/notification-submission/notification-submission.dto'; +import { NOI_SUBMISSION_STATUS } from '../../../services/notice-of-intent-submission/notice-of-intent-submission.dto'; +import { + NOTIFICATION_STATUS, + NotificationSubmissionDto, +} from '../../../services/notification-submission/notification-submission.dto'; import { NotificationSubmissionService } from '../../../services/notification-submission/notification-submission.service'; +import { InboxListItem } from '../inbox-list/inbox-list.component'; @Component({ selector: 'app-notification-list', @@ -21,7 +26,10 @@ export class NotificationListComponent implements OnInit { 'actions', ]; + listItems: InboxListItem[] = []; + @ViewChild(MatPaginator) paginator!: MatPaginator; + @Input() isMobile = false; constructor(private notificationSubmissionService: NotificationSubmissionService) {} @@ -33,5 +41,13 @@ export class NotificationListComponent implements OnInit { const notifications = await this.notificationSubmissionService.getNotifications(); this.dataSource = new MatTableDataSource(notifications); this.dataSource.paginator = this.paginator; + + this.listItems = notifications.map((notification) => ({ + ...notification, + routerLink: + notification.status.code !== NOTIFICATION_STATUS.CANCELLED + ? `/notification/${notification.fileNumber}` + : undefined, + })); } } diff --git a/portal-frontend/src/app/features/public/search/application-search-table/application-search-table.component.ts b/portal-frontend/src/app/features/public/search/application-search-table/application-search-table.component.ts index 112d5367c7..a6096dd2eb 100644 --- a/portal-frontend/src/app/features/public/search/application-search-table/application-search-table.component.ts +++ b/portal-frontend/src/app/features/public/search/application-search-table/application-search-table.component.ts @@ -4,7 +4,6 @@ import { MatSort } from '@angular/material/sort'; import { Router } from '@angular/router'; import { Subject, takeUntil } from 'rxjs'; import { ApplicationStatusDto } from '../../../../services/application-submission/application-submission.dto'; -import { ApplicationRegionDto } from '../../../../services/code/code.dto'; import { ApplicationSearchResultDto } from '../../../../services/search/search.dto'; import { SearchResult, TableChange } from '../search.interface'; @@ -34,8 +33,6 @@ export class ApplicationSearchTableComponent implements OnDestroy { } @Input() statuses: ApplicationStatusDto[] = []; - @Input() regions: ApplicationRegionDto[] = []; - @Output() tableChange = new EventEmitter<TableChange>(); displayedColumns = ['fileId', 'ownerName', 'type', 'portalStatus', 'lastUpdate', 'government']; diff --git a/portal-frontend/src/app/features/public/search/notice-of-intent-search-table/notice-of-intent-search-table.component.ts b/portal-frontend/src/app/features/public/search/notice-of-intent-search-table/notice-of-intent-search-table.component.ts index eb3c83ceaa..b4ae375be1 100644 --- a/portal-frontend/src/app/features/public/search/notice-of-intent-search-table/notice-of-intent-search-table.component.ts +++ b/portal-frontend/src/app/features/public/search/notice-of-intent-search-table/notice-of-intent-search-table.component.ts @@ -33,8 +33,6 @@ export class NoticeOfIntentSearchTableComponent implements OnDestroy { } @Input() statuses: ApplicationStatusDto[] = []; - @Input() regions: ApplicationRegionDto[] = []; - @Output() tableChange = new EventEmitter<TableChange>(); displayedColumns = ['fileId', 'ownerName', 'type', 'portalStatus', 'lastUpdate', 'government']; diff --git a/portal-frontend/src/app/features/public/search/notification-search-table/notification-search-table.component.ts b/portal-frontend/src/app/features/public/search/notification-search-table/notification-search-table.component.ts index 9724112575..18c8e67acd 100644 --- a/portal-frontend/src/app/features/public/search/notification-search-table/notification-search-table.component.ts +++ b/portal-frontend/src/app/features/public/search/notification-search-table/notification-search-table.component.ts @@ -32,8 +32,6 @@ export class NotificationSearchTableComponent implements OnDestroy { this._totalCount = count; this.initSorting(); } - - @Input() regions: string[] = []; @Output() tableChange = new EventEmitter<TableChange>(); displayedColumns = ['fileId', 'ownerName', 'type', 'portalStatus', 'lastUpdate', 'government']; diff --git a/portal-frontend/src/app/features/public/search/public-search.component.html b/portal-frontend/src/app/features/public/search/public-search.component.html index 24747e1bc9..20fad36175 100644 --- a/portal-frontend/src/app/features/public/search/public-search.component.html +++ b/portal-frontend/src/app/features/public/search/public-search.component.html @@ -84,7 +84,11 @@ <h3>Search by one or more of the following fields:</h3> </div> <div> <label for="type">Type</label> - <app-file-type-filter-drop-down #fileTypeDropDown [setFileTypes]='previousFileTypes' (fileTypeChange)="onFileTypeChange($event)" /> + <app-file-type-filter-drop-down + #fileTypeDropDown + [setFileTypes]="previousFileTypes" + (fileTypeChange)="onFileTypeChange($event)" + /> </div> <div> <label for="status">Status</label> @@ -131,7 +135,6 @@ <h2 class="search-title">Search Results</h2> [results]="applications" [totalCount]="applicationTotal" [statuses]="statuses" - [regions]="regions" (loadMore)="onLoadMore('APP')" > </app-search-list> @@ -140,7 +143,6 @@ <h2 class="search-title">Search Results</h2> [applications]="applications" [totalCount]="applicationTotal" [statuses]="statuses" - [regions]="regions" (tableChange)="onTableChange($event)" ></app-application-search-table> </mat-tab> @@ -152,7 +154,6 @@ <h2 class="search-title">Search Results</h2> [results]="noticeOfIntents" [totalCount]="noticeOfIntentTotal" [statuses]="statuses" - [regions]="regions" (loadMore)="onLoadMore('NOI')" > </app-search-list> @@ -161,7 +162,6 @@ <h2 class="search-title">Search Results</h2> [noticeOfIntents]="noticeOfIntents" [totalCount]="noticeOfIntentTotal" [statuses]="statuses" - [regions]="regions" (tableChange)="onTableChange($event)" ></app-notice-of-intent-search-table> </mat-tab> @@ -173,7 +173,6 @@ <h2 class="search-title">Search Results</h2> [results]="notifications" [totalCount]="notificationTotal" [statuses]="statuses" - [regions]="regions" (loadMore)="onLoadMore('NOTI')" > </app-search-list> diff --git a/portal-frontend/src/app/features/public/search/search-list/search-list.component.ts b/portal-frontend/src/app/features/public/search/search-list/search-list.component.ts index 7fc5be48ea..5f3dc1879a 100644 --- a/portal-frontend/src/app/features/public/search/search-list/search-list.component.ts +++ b/portal-frontend/src/app/features/public/search/search-list/search-list.component.ts @@ -2,7 +2,6 @@ import { Component, EventEmitter, Input, OnDestroy, Output } from '@angular/core import { Router } from '@angular/router'; import { Subject } from 'rxjs'; import { ApplicationStatusDto } from '../../../../services/application-submission/application-submission.dto'; -import { ApplicationRegionDto } from '../../../../services/code/code.dto'; import { ApplicationSearchResultDto, BaseSearchResultDto } from '../../../../services/search/search.dto'; import { SearchResult } from '../search.interface'; @@ -22,7 +21,6 @@ export class SearchListComponent implements OnDestroy { @Input() totalCount = 0; @Input() statuses: ApplicationStatusDto[] = []; - @Input() regions: ApplicationRegionDto[] = []; _results: SearchResult[] = []; @Input() set results(results: BaseSearchResultDto[]) { diff --git a/portal-frontend/src/app/services/application-submission/application-submission.dto.ts b/portal-frontend/src/app/services/application-submission/application-submission.dto.ts index ca710bbd4f..fc31603aa5 100644 --- a/portal-frontend/src/app/services/application-submission/application-submission.dto.ts +++ b/portal-frontend/src/app/services/application-submission/application-submission.dto.ts @@ -39,8 +39,8 @@ export interface ProposedLot { export interface ApplicationSubmissionDto { uuid: string; fileNumber: string; - createdAt: string; - updatedAt: string; + createdAt: number; + updatedAt: number; lastStatusUpdate: number; applicant: string; purpose: string | null; From 905890ed451362ef451ae59e2ef0cb742e44efc3 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Wed, 4 Oct 2023 15:18:35 -0700 Subject: [PATCH 455/954] View Public App Submissions * Viewing of Public App Submissions and Documents * New Module and Pages Created --- .../application-details.component.html | 3 - .../naru-details.component.spec.ts | 2 +- .../tur-details/tur-details.component.spec.ts | 2 +- .../alc-review/alc-review.component.html | 45 +++ .../alc-review/alc-review.component.scss | 8 + .../alc-review/alc-review.component.spec.ts | 33 ++ .../alc-review/alc-review.component.ts | 47 +++ .../decisions/decisions.component.html | 26 ++ .../decisions/decisions.component.scss | 20 ++ .../decisions/decisions.component.spec.ts | 33 ++ .../decisions/decisions.component.ts | 39 +++ .../submission-documents.component.html | 43 +++ .../submission-documents.component.scss | 25 ++ .../submission-documents.component.spec.ts | 35 ++ .../submission-documents.component.ts | 60 ++++ .../lfng-review/lfng-review.component.html | 285 ++++++++++++++++ .../lfng-review/lfng-review.component.scss | 74 ++++ .../lfng-review/lfng-review.component.spec.ts | 57 ++++ .../lfng-review/lfng-review.component.ts | 131 ++++++++ .../public-application.component.html | 60 ++++ .../public-application.component.scss | 105 ++++++ .../public-application.component.spec.ts | 49 +++ .../public-application.component.ts | 50 +++ .../excl-details/excl-details.component.html | 52 +++ .../excl-details/excl-details.component.scss | 0 .../excl-details.component.spec.ts | 30 ++ .../excl-details/excl-details.component.ts | 35 ++ .../incl-details/incl-details.component.html | 58 ++++ .../incl-details/incl-details.component.scss | 0 .../incl-details.component.spec.ts | 30 ++ .../incl-details/incl-details.component.ts | 35 ++ .../naru-details/naru-details.component.html | 209 ++++++++++++ .../naru-details/naru-details.component.scss | 9 + .../naru-details.component.spec.ts | 33 ++ .../naru-details/naru-details.component.ts | 30 ++ .../nfu-details/nfu-details.component.html | 96 ++++++ .../nfu-details/nfu-details.component.scss | 7 + .../nfu-details/nfu-details.component.spec.ts | 33 ++ .../nfu-details/nfu-details.component.ts | 31 ++ .../submission/parcel/parcel.component.html | 79 +++++ .../submission/parcel/parcel.component.scss | 39 +++ .../parcel/parcel.component.spec.ts | 40 +++ .../submission/parcel/parcel.component.ts | 37 ++ .../pfrs-details/pfrs-details.component.html | 213 ++++++++++++ .../pfrs-details/pfrs-details.component.scss | 14 + .../pfrs-details.component.spec.ts | 33 ++ .../pfrs-details/pfrs-details.component.ts | 34 ++ .../pofo-details/pofo-details.component.html | 129 +++++++ .../pofo-details/pofo-details.component.scss | 9 + .../pofo-details.component.spec.ts | 31 ++ .../pofo-details/pofo-details.component.ts | 33 ++ .../roso-details/roso-details.component.html | 120 +++++++ .../roso-details/roso-details.component.scss | 9 + .../roso-details.component.spec.ts | 33 ++ .../roso-details/roso-details.component.ts | 33 ++ .../subd-details/subd-details.component.html | 53 +++ .../subd-details/subd-details.component.scss | 9 + .../subd-details.component.spec.ts | 33 ++ .../subd-details/subd-details.component.ts | 31 ++ .../submission-details.component.html | 160 +++++++++ .../submission-details.component.scss | 143 ++++++++ .../submission-details.component.spec.ts | 42 +++ .../submission-details.component.ts | 66 ++++ .../submission/submission-details.module.ts | 34 ++ .../tur-details/tur-details.component.html | 41 +++ .../tur-details/tur-details.component.scss | 0 .../tur-details/tur-details.component.spec.ts | 31 ++ .../tur-details/tur-details.component.ts | 29 ++ .../src/app/features/public/public.module.ts | 8 + .../search-list/search-list.component.ts | 2 +- .../src/app/services/public/public.dto.ts | 133 ++++++++ .../services/public/public.service.spec.ts | 53 +++ .../src/app/services/public/public.service.ts | 39 +++ .../automapper/public.automapper.profile.ts | 39 +++ .../application-submission.entity.ts | 1 + .../portal/public/public.controller.spec.ts | 138 ++++++++ .../src/portal/public/public.controller.ts | 110 ++++++ .../apps/alcs/src/portal/public/public.dto.ts | 317 ++++++++++++++++++ .../alcs/src/portal/public/public.module.ts | 11 +- 79 files changed, 4321 insertions(+), 8 deletions(-) create mode 100644 portal-frontend/src/app/features/public/application/alc-review/alc-review.component.html create mode 100644 portal-frontend/src/app/features/public/application/alc-review/alc-review.component.scss create mode 100644 portal-frontend/src/app/features/public/application/alc-review/alc-review.component.spec.ts create mode 100644 portal-frontend/src/app/features/public/application/alc-review/alc-review.component.ts create mode 100644 portal-frontend/src/app/features/public/application/alc-review/decisions/decisions.component.html create mode 100644 portal-frontend/src/app/features/public/application/alc-review/decisions/decisions.component.scss create mode 100644 portal-frontend/src/app/features/public/application/alc-review/decisions/decisions.component.spec.ts create mode 100644 portal-frontend/src/app/features/public/application/alc-review/decisions/decisions.component.ts create mode 100644 portal-frontend/src/app/features/public/application/alc-review/submission-documents/submission-documents.component.html create mode 100644 portal-frontend/src/app/features/public/application/alc-review/submission-documents/submission-documents.component.scss create mode 100644 portal-frontend/src/app/features/public/application/alc-review/submission-documents/submission-documents.component.spec.ts create mode 100644 portal-frontend/src/app/features/public/application/alc-review/submission-documents/submission-documents.component.ts create mode 100644 portal-frontend/src/app/features/public/application/lfng-review/lfng-review.component.html create mode 100644 portal-frontend/src/app/features/public/application/lfng-review/lfng-review.component.scss create mode 100644 portal-frontend/src/app/features/public/application/lfng-review/lfng-review.component.spec.ts create mode 100644 portal-frontend/src/app/features/public/application/lfng-review/lfng-review.component.ts create mode 100644 portal-frontend/src/app/features/public/application/public-application.component.html create mode 100644 portal-frontend/src/app/features/public/application/public-application.component.scss create mode 100644 portal-frontend/src/app/features/public/application/public-application.component.spec.ts create mode 100644 portal-frontend/src/app/features/public/application/public-application.component.ts create mode 100644 portal-frontend/src/app/features/public/application/submission/excl-details/excl-details.component.html create mode 100644 portal-frontend/src/app/features/public/application/submission/excl-details/excl-details.component.scss create mode 100644 portal-frontend/src/app/features/public/application/submission/excl-details/excl-details.component.spec.ts create mode 100644 portal-frontend/src/app/features/public/application/submission/excl-details/excl-details.component.ts create mode 100644 portal-frontend/src/app/features/public/application/submission/incl-details/incl-details.component.html create mode 100644 portal-frontend/src/app/features/public/application/submission/incl-details/incl-details.component.scss create mode 100644 portal-frontend/src/app/features/public/application/submission/incl-details/incl-details.component.spec.ts create mode 100644 portal-frontend/src/app/features/public/application/submission/incl-details/incl-details.component.ts create mode 100644 portal-frontend/src/app/features/public/application/submission/naru-details/naru-details.component.html create mode 100644 portal-frontend/src/app/features/public/application/submission/naru-details/naru-details.component.scss create mode 100644 portal-frontend/src/app/features/public/application/submission/naru-details/naru-details.component.spec.ts create mode 100644 portal-frontend/src/app/features/public/application/submission/naru-details/naru-details.component.ts create mode 100644 portal-frontend/src/app/features/public/application/submission/nfu-details/nfu-details.component.html create mode 100644 portal-frontend/src/app/features/public/application/submission/nfu-details/nfu-details.component.scss create mode 100644 portal-frontend/src/app/features/public/application/submission/nfu-details/nfu-details.component.spec.ts create mode 100644 portal-frontend/src/app/features/public/application/submission/nfu-details/nfu-details.component.ts create mode 100644 portal-frontend/src/app/features/public/application/submission/parcel/parcel.component.html create mode 100644 portal-frontend/src/app/features/public/application/submission/parcel/parcel.component.scss create mode 100644 portal-frontend/src/app/features/public/application/submission/parcel/parcel.component.spec.ts create mode 100644 portal-frontend/src/app/features/public/application/submission/parcel/parcel.component.ts create mode 100644 portal-frontend/src/app/features/public/application/submission/pfrs-details/pfrs-details.component.html create mode 100644 portal-frontend/src/app/features/public/application/submission/pfrs-details/pfrs-details.component.scss create mode 100644 portal-frontend/src/app/features/public/application/submission/pfrs-details/pfrs-details.component.spec.ts create mode 100644 portal-frontend/src/app/features/public/application/submission/pfrs-details/pfrs-details.component.ts create mode 100644 portal-frontend/src/app/features/public/application/submission/pofo-details/pofo-details.component.html create mode 100644 portal-frontend/src/app/features/public/application/submission/pofo-details/pofo-details.component.scss create mode 100644 portal-frontend/src/app/features/public/application/submission/pofo-details/pofo-details.component.spec.ts create mode 100644 portal-frontend/src/app/features/public/application/submission/pofo-details/pofo-details.component.ts create mode 100644 portal-frontend/src/app/features/public/application/submission/roso-details/roso-details.component.html create mode 100644 portal-frontend/src/app/features/public/application/submission/roso-details/roso-details.component.scss create mode 100644 portal-frontend/src/app/features/public/application/submission/roso-details/roso-details.component.spec.ts create mode 100644 portal-frontend/src/app/features/public/application/submission/roso-details/roso-details.component.ts create mode 100644 portal-frontend/src/app/features/public/application/submission/subd-details/subd-details.component.html create mode 100644 portal-frontend/src/app/features/public/application/submission/subd-details/subd-details.component.scss create mode 100644 portal-frontend/src/app/features/public/application/submission/subd-details/subd-details.component.spec.ts create mode 100644 portal-frontend/src/app/features/public/application/submission/subd-details/subd-details.component.ts create mode 100644 portal-frontend/src/app/features/public/application/submission/submission-details.component.html create mode 100644 portal-frontend/src/app/features/public/application/submission/submission-details.component.scss create mode 100644 portal-frontend/src/app/features/public/application/submission/submission-details.component.spec.ts create mode 100644 portal-frontend/src/app/features/public/application/submission/submission-details.component.ts create mode 100644 portal-frontend/src/app/features/public/application/submission/submission-details.module.ts create mode 100644 portal-frontend/src/app/features/public/application/submission/tur-details/tur-details.component.html create mode 100644 portal-frontend/src/app/features/public/application/submission/tur-details/tur-details.component.scss create mode 100644 portal-frontend/src/app/features/public/application/submission/tur-details/tur-details.component.spec.ts create mode 100644 portal-frontend/src/app/features/public/application/submission/tur-details/tur-details.component.ts create mode 100644 portal-frontend/src/app/services/public/public.dto.ts create mode 100644 portal-frontend/src/app/services/public/public.service.spec.ts create mode 100644 portal-frontend/src/app/services/public/public.service.ts create mode 100644 services/apps/alcs/src/common/automapper/public.automapper.profile.ts create mode 100644 services/apps/alcs/src/portal/public/public.controller.spec.ts create mode 100644 services/apps/alcs/src/portal/public/public.controller.ts create mode 100644 services/apps/alcs/src/portal/public/public.dto.ts diff --git a/portal-frontend/src/app/features/applications/application-details/application-details.component.html b/portal-frontend/src/app/features/applications/application-details/application-details.component.html index 31226669e8..b4c631960b 100644 --- a/portal-frontend/src/app/features/applications/application-details/application-details.component.html +++ b/portal-frontend/src/app/features/applications/application-details/application-details.component.html @@ -17,9 +17,6 @@ </section> <section> <h3>3. Primary Contact</h3> - <app-warning-banner *ngIf="draftMode" class="full-row"> - Changes made to this section will not be flagged as - </app-warning-banner> <div *ngIf="applicationSubmission" class="review-table"> <div class="subheading2 grid-1">Type</div> <div class="grid-double"> diff --git a/portal-frontend/src/app/features/applications/application-details/naru-details/naru-details.component.spec.ts b/portal-frontend/src/app/features/applications/application-details/naru-details/naru-details.component.spec.ts index b954864e63..d42ffa1ad7 100644 --- a/portal-frontend/src/app/features/applications/application-details/naru-details/naru-details.component.spec.ts +++ b/portal-frontend/src/app/features/applications/application-details/naru-details/naru-details.component.spec.ts @@ -4,7 +4,7 @@ import { ApplicationDocumentService } from '../../../../services/application-doc import { NaruDetailsComponent } from './naru-details.component'; -describe('PofoDetailsComponent', () => { +describe('NaruDetailsComponent', () => { let component: NaruDetailsComponent; let fixture: ComponentFixture<NaruDetailsComponent>; let mockAppDocumentService: DeepMocked<ApplicationDocumentService>; diff --git a/portal-frontend/src/app/features/applications/application-details/tur-details/tur-details.component.spec.ts b/portal-frontend/src/app/features/applications/application-details/tur-details/tur-details.component.spec.ts index f3125dd612..26d6c4cf71 100644 --- a/portal-frontend/src/app/features/applications/application-details/tur-details/tur-details.component.spec.ts +++ b/portal-frontend/src/app/features/applications/application-details/tur-details/tur-details.component.spec.ts @@ -4,7 +4,7 @@ import { ApplicationDocumentService } from '../../../../services/application-doc import { TurDetailsComponent } from './tur-details.component'; -describe('NfuDetailsComponent', () => { +describe('TurDetailsComponent', () => { let component: TurDetailsComponent; let fixture: ComponentFixture<TurDetailsComponent>; let mockAppDocumentService: DeepMocked<ApplicationDocumentService>; diff --git a/portal-frontend/src/app/features/public/application/alc-review/alc-review.component.html b/portal-frontend/src/app/features/public/application/alc-review/alc-review.component.html new file mode 100644 index 0000000000..4ea1d813f6 --- /dev/null +++ b/portal-frontend/src/app/features/public/application/alc-review/alc-review.component.html @@ -0,0 +1,45 @@ +<div *ngIf="application"> + <div class="header"> + <h3>ALC Review and Decision</h3> + <div> + <button + [routerLink]="'/application/' + application.fileNumber + '/edit'" + *ngIf="application.canEdit" + mat-flat-button + color="primary" + > + Edit Application + </button> + <button *ngIf="application.canReview" (click)="onReview(application.fileNumber)" mat-flat-button color="primary"> + Review Application + </button> + </div> + </div> + <div + *ngIf=" + application.status.code === SUBMISSION_STATUS.IN_PROGRESS || + application.status.code === SUBMISSION_STATUS.IN_REVIEW_BY_LG || + application.status.code === SUBMISSION_STATUS.INCOMPLETE || + application.status.code === SUBMISSION_STATUS.WRONG_GOV || + application.status.code === SUBMISSION_STATUS.SUBMITTED_TO_LG + " + class="warning" + > + This section will update after the application is submitted to the ALC. + </div> + <div *ngIf="application.status.code === SUBMISSION_STATUS.REFUSED_TO_FORWARD_LG" class="warning"> + Application not subject to Agricultural Land Commission review. + </div> + <div + *ngIf=" + application.status.code === SUBMISSION_STATUS.SUBMITTED_TO_ALC || + application.status.code === SUBMISSION_STATUS.SUBMITTED_TO_ALC_INCOMPLETE || + application.status.code === SUBMISSION_STATUS.RECEIVED_BY_ALC || + application.status.code === SUBMISSION_STATUS.IN_REVIEW_BY_ALC || + application.status.code === SUBMISSION_STATUS.ALC_DECISION + " + > + <app-decisions [fileNumber]="application.fileNumber"></app-decisions> + <app-submission-documents [$applicationDocuments]="$applicationDocuments"></app-submission-documents> + </div> +</div> diff --git a/portal-frontend/src/app/features/public/application/alc-review/alc-review.component.scss b/portal-frontend/src/app/features/public/application/alc-review/alc-review.component.scss new file mode 100644 index 0000000000..7ca8d1c637 --- /dev/null +++ b/portal-frontend/src/app/features/public/application/alc-review/alc-review.component.scss @@ -0,0 +1,8 @@ +@use '../../../../../styles/functions' as *; +@use '../../../../../styles/colors'; + +.warning { + background-color: rgba(colors.$accent-color-light, 0.5); + padding: rem(16); + margin-bottom: rem(24); +} diff --git a/portal-frontend/src/app/features/public/application/alc-review/alc-review.component.spec.ts b/portal-frontend/src/app/features/public/application/alc-review/alc-review.component.spec.ts new file mode 100644 index 0000000000..62a72d72d0 --- /dev/null +++ b/portal-frontend/src/app/features/public/application/alc-review/alc-review.component.spec.ts @@ -0,0 +1,33 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { ApplicationSubmissionReviewService } from '../../../../services/application-submission-review/application-submission-review.service'; + +import { AlcReviewComponent } from './alc-review.component'; + +describe('AlcsReviewComponent', () => { + let component: AlcReviewComponent; + let fixture: ComponentFixture<AlcReviewComponent>; + let mockAppReviewService: DeepMocked<ApplicationSubmissionReviewService>; + + beforeEach(async () => { + mockAppReviewService = createMock(); + + await TestBed.configureTestingModule({ + providers: [ + { + provide: ApplicationSubmissionReviewService, + useValue: mockAppReviewService, + }, + ], + declarations: [AlcReviewComponent], + }).compileComponents(); + + fixture = TestBed.createComponent(AlcReviewComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/public/application/alc-review/alc-review.component.ts b/portal-frontend/src/app/features/public/application/alc-review/alc-review.component.ts new file mode 100644 index 0000000000..ced2da29b9 --- /dev/null +++ b/portal-frontend/src/app/features/public/application/alc-review/alc-review.component.ts @@ -0,0 +1,47 @@ +import { Component, Input, OnDestroy, OnInit } from '@angular/core'; +import { Router } from '@angular/router'; +import { BehaviorSubject, Subject, takeUntil } from 'rxjs'; +import { ApplicationDocumentDto } from '../../../../services/application-document/application-document.dto'; +import { ApplicationSubmissionReviewService } from '../../../../services/application-submission-review/application-submission-review.service'; +import { + SUBMISSION_STATUS, + ApplicationSubmissionDetailedDto, +} from '../../../../services/application-submission/application-submission.dto'; + +@Component({ + selector: 'app-alc-review', + templateUrl: './alc-review.component.html', + styleUrls: ['./alc-review.component.scss'], +}) +export class AlcReviewComponent implements OnInit, OnDestroy { + private $destroy = new Subject<void>(); + + @Input() $application = new BehaviorSubject<ApplicationSubmissionDetailedDto | undefined>(undefined); + @Input() $applicationDocuments = new BehaviorSubject<ApplicationDocumentDto[]>([]); + + application: ApplicationSubmissionDetailedDto | undefined; + SUBMISSION_STATUS = SUBMISSION_STATUS; + + constructor(private applicationReviewService: ApplicationSubmissionReviewService, private router: Router) {} + + ngOnInit(): void { + this.$application.pipe(takeUntil(this.$destroy)).subscribe((application) => { + this.application = application; + }); + } + + ngOnDestroy(): void { + this.$destroy.next(); + this.$destroy.complete(); + } + + async onReview(fileId: string) { + if (this.application?.status.code === SUBMISSION_STATUS.SUBMITTED_TO_LG) { + const review = await this.applicationReviewService.startReview(fileId); + if (!review) { + return; + } + } + await this.router.navigateByUrl(`application/${fileId}/review`); + } +} diff --git a/portal-frontend/src/app/features/public/application/alc-review/decisions/decisions.component.html b/portal-frontend/src/app/features/public/application/alc-review/decisions/decisions.component.html new file mode 100644 index 0000000000..ee4d949dba --- /dev/null +++ b/portal-frontend/src/app/features/public/application/alc-review/decisions/decisions.component.html @@ -0,0 +1,26 @@ +<div *ngFor="let decision of decisions; let index = index"> + <h4>Decision #{{ decisions.length - index }}</h4> + <div class="decision-table"> + <div> + <div class="subheading2">Decision Date</div> + {{ decision.date | momentFormat }} + </div> + + <div> + <div class="subheading2">Resolution Number</div> + #{{ decision.resolutionNumber }}/{{ decision.resolutionYear }} + </div> + + <div> + <div class="subheading2">Decision Outcome</div> + {{ decision.outcome.label }} {{ decision.isSubjectToConditions ? '- Subject to Conditions' : '' }} + </div> + + <div> + <div class="subheading2">Decision Document</div> + <div *ngFor="let document of decision.documents"> + <a (click)="openFile(document.uuid)">{{ document.fileName }}</a> + </div> + </div> + </div> +</div> diff --git a/portal-frontend/src/app/features/public/application/alc-review/decisions/decisions.component.scss b/portal-frontend/src/app/features/public/application/alc-review/decisions/decisions.component.scss new file mode 100644 index 0000000000..c92c6fb6a8 --- /dev/null +++ b/portal-frontend/src/app/features/public/application/alc-review/decisions/decisions.component.scss @@ -0,0 +1,20 @@ +@use '../../../../../../styles/functions' as *; +@use '../../../../../../styles/colors'; + +.decision-table { + padding: rem(8); + margin: rem(12) 0 rem(20) 0; + background-color: colors.$grey-light; + display: grid; + grid-row-gap: rem(24); + grid-column-gap: rem(16); + grid-template-columns: 100%; + word-wrap: break-word; + hyphens: auto; + + @media screen and (min-width: $tabletBreakpoint) { + padding: rem(16); + margin: rem(24) 0 rem(40) 0; + grid-template-columns: 50% 50%; + } +} diff --git a/portal-frontend/src/app/features/public/application/alc-review/decisions/decisions.component.spec.ts b/portal-frontend/src/app/features/public/application/alc-review/decisions/decisions.component.spec.ts new file mode 100644 index 0000000000..f56a7194b9 --- /dev/null +++ b/portal-frontend/src/app/features/public/application/alc-review/decisions/decisions.component.spec.ts @@ -0,0 +1,33 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { createMock } from '@golevelup/ts-jest'; +import { ApplicationDecisionService } from '../../../../../services/application-decision/application-decision.service'; + +import { DecisionsComponent } from './decisions.component'; + +describe('DecisionsComponent', () => { + let component: DecisionsComponent; + let fixture: ComponentFixture<DecisionsComponent>; + let mockDecisionService: ApplicationDecisionService; + + beforeEach(async () => { + mockDecisionService = createMock(); + + await TestBed.configureTestingModule({ + declarations: [DecisionsComponent], + providers: [ + { + provide: ApplicationDecisionService, + useValue: mockDecisionService, + }, + ], + }).compileComponents(); + + fixture = TestBed.createComponent(DecisionsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/public/application/alc-review/decisions/decisions.component.ts b/portal-frontend/src/app/features/public/application/alc-review/decisions/decisions.component.ts new file mode 100644 index 0000000000..1280cc0118 --- /dev/null +++ b/portal-frontend/src/app/features/public/application/alc-review/decisions/decisions.component.ts @@ -0,0 +1,39 @@ +import { Component, Input, OnChanges, OnInit, SimpleChanges } from '@angular/core'; +import { ApplicationPortalDecisionDto } from '../../../../../services/application-decision/application-decision.dto'; +import { ApplicationDecisionService } from '../../../../../services/application-decision/application-decision.service'; + +@Component({ + selector: 'app-decisions[fileNumber]', + templateUrl: './decisions.component.html', + styleUrls: ['./decisions.component.scss'], +}) +export class DecisionsComponent implements OnInit, OnChanges { + @Input() fileNumber = ''; + decisions: ApplicationPortalDecisionDto[] = []; + + constructor(private decisionService: ApplicationDecisionService) {} + + ngOnInit(): void { + this.loadDecisions(); + } + + ngOnChanges(changes: SimpleChanges): void { + this.loadDecisions(); + } + + async openFile(uuid: string) { + const res = await this.decisionService.openFile(uuid); + if (res) { + window.open(res.url, '_blank'); + } + } + + private async loadDecisions() { + if (this.fileNumber) { + const decisions = await this.decisionService.getByFileId(this.fileNumber); + if (decisions) { + this.decisions = decisions; + } + } + } +} diff --git a/portal-frontend/src/app/features/public/application/alc-review/submission-documents/submission-documents.component.html b/portal-frontend/src/app/features/public/application/alc-review/submission-documents/submission-documents.component.html new file mode 100644 index 0000000000..8dc409f48a --- /dev/null +++ b/portal-frontend/src/app/features/public/application/alc-review/submission-documents/submission-documents.component.html @@ -0,0 +1,43 @@ +<h4>Application Documents</h4> +<div class='table-container'> + <table mat-table [dataSource]='dataSource' matSort class='mat-elevation-z3 documents'> + <ng-container matColumnDef='type'> + <th mat-header-cell *matHeaderCellDef mat-sort-header sortActionDescription='Sort by type'>Type</th> + <td mat-cell *matCellDef='let element'> + {{ element.type?.label }} + </td> + </ng-container> + + <ng-container matColumnDef='fileName'> + <th mat-header-cell *matHeaderCellDef mat-sort-header sortActionDescription='Sort by name'>Document Name</th> + <td mat-cell *matCellDef='let element'> + <a (click)='openFile(element.uuid)'>{{ element.fileName }}</a> + </td> + </ng-container> + + <ng-container matColumnDef='source'> + <th mat-header-cell *matHeaderCellDef mat-sort-header sortActionDescription='Sort by source'>Source</th> + <td mat-cell *matCellDef='let element'>{{ element.source }}</td> + </ng-container> + + <ng-container matColumnDef='uploadedAt'> + <th mat-header-cell *matHeaderCellDef mat-sort-header sortActionDescription='Sort by date'>Upload Date</th> + <td mat-cell *matCellDef='let element'>{{ element.uploadedAt | date }}</td> + </ng-container> + + <ng-container matColumnDef='actions'> + <th mat-header-cell *matHeaderCellDef>Actions</th> + <td mat-cell *matCellDef='let element'> + <button mat-icon-button (click)='downloadFile(element.uuid)'> + <mat-icon>file_download</mat-icon> + </button> + </td> + </ng-container> + + <tr mat-header-row *matHeaderRowDef='displayedColumns'></tr> + <tr mat-row *matRowDef='let row; columns: displayedColumns'></tr> + <tr class='mat-row' *matNoDataRow> + <td class='text-center' colspan='6'>Documents will be visible here once provided by ALC</td> + </tr> + </table> +</div> diff --git a/portal-frontend/src/app/features/public/application/alc-review/submission-documents/submission-documents.component.scss b/portal-frontend/src/app/features/public/application/alc-review/submission-documents/submission-documents.component.scss new file mode 100644 index 0000000000..0027146765 --- /dev/null +++ b/portal-frontend/src/app/features/public/application/alc-review/submission-documents/submission-documents.component.scss @@ -0,0 +1,25 @@ +@use '../../../../../../styles/colors'; +@use '../../../../../../styles/functions' as *; + +.header { + display: flex; + justify-content: space-between; +} + +.table-container { + margin: rem(4); + overflow-x: auto; +} + +.documents { + margin-top: rem(12); +} + +.mat-mdc-no-data-row { + height: rem(56); + color: colors.$grey-dark; +} + +a { + word-break: break-all; +} diff --git a/portal-frontend/src/app/features/public/application/alc-review/submission-documents/submission-documents.component.spec.ts b/portal-frontend/src/app/features/public/application/alc-review/submission-documents/submission-documents.component.spec.ts new file mode 100644 index 0000000000..09eb1292d3 --- /dev/null +++ b/portal-frontend/src/app/features/public/application/alc-review/submission-documents/submission-documents.component.spec.ts @@ -0,0 +1,35 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { ApplicationDocumentService } from '../../../../../services/application-document/application-document.service'; + +import { SubmissionDocumentsComponent } from './submission-documents.component'; + +describe('SubmissionDocumentsComponent', () => { + let component: SubmissionDocumentsComponent; + let fixture: ComponentFixture<SubmissionDocumentsComponent>; + let mockAppDocService: DeepMocked<ApplicationDocumentService>; + + beforeEach(async () => { + mockAppDocService = createMock(); + + await TestBed.configureTestingModule({ + declarations: [SubmissionDocumentsComponent], + providers: [ + { + provide: ApplicationDocumentService, + useValue: mockAppDocService, + }, + ], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(SubmissionDocumentsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/public/application/alc-review/submission-documents/submission-documents.component.ts b/portal-frontend/src/app/features/public/application/alc-review/submission-documents/submission-documents.component.ts new file mode 100644 index 0000000000..027fbdbfea --- /dev/null +++ b/portal-frontend/src/app/features/public/application/alc-review/submission-documents/submission-documents.component.ts @@ -0,0 +1,60 @@ +import { Component, Input, OnDestroy, OnInit, ViewChild } from '@angular/core'; +import { MatSort } from '@angular/material/sort'; +import { MatTableDataSource } from '@angular/material/table'; +import { BehaviorSubject, Subject, takeUntil } from 'rxjs'; +import { ApplicationDocumentDto } from '../../../../../services/application-document/application-document.dto'; +import { ApplicationDocumentService } from '../../../../../services/application-document/application-document.service'; + +@Component({ + selector: 'app-submission-documents', + templateUrl: './submission-documents.component.html', + styleUrls: ['./submission-documents.component.scss'], +}) +export class SubmissionDocumentsComponent implements OnInit, OnDestroy { + private $destroy = new Subject<void>(); + + displayedColumns: string[] = ['type', 'fileName', 'source', 'uploadedAt', 'actions']; + documents: ApplicationDocumentDto[] = []; + + @Input() $applicationDocuments = new BehaviorSubject<ApplicationDocumentDto[]>([]); + + @ViewChild(MatSort) sort!: MatSort; + dataSource: MatTableDataSource<ApplicationDocumentDto> = new MatTableDataSource<ApplicationDocumentDto>(); + + constructor(private applicationDocumentService: ApplicationDocumentService) {} + + ngOnInit(): void { + this.$applicationDocuments.pipe(takeUntil(this.$destroy)).subscribe((documents) => { + this.dataSource = new MatTableDataSource(documents); + }); + } + + async openFile(uuid: string) { + const res = await this.applicationDocumentService.openFile(uuid); + if (res) { + window.open(res.url, '_blank'); + } + } + + 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(); + } + + protected readonly open = open; +} diff --git a/portal-frontend/src/app/features/public/application/lfng-review/lfng-review.component.html b/portal-frontend/src/app/features/public/application/lfng-review/lfng-review.component.html new file mode 100644 index 0000000000..2ae5a57c31 --- /dev/null +++ b/portal-frontend/src/app/features/public/application/lfng-review/lfng-review.component.html @@ -0,0 +1,285 @@ +<div *ngIf="application"> + <div class="header"> + <h3>Local/First Nation Gov Review</h3> + <div class="btns-wrapper"> + <button + *ngIf="application.canEdit || application.canReview" + mat-stroked-button + color="warn" + (click)="onCancelClicked(application.uuid)" + > + Cancel Application + </button> + <button + [routerLink]="'/application/' + application.fileNumber + '/edit'" + *ngIf="application.canEdit" + mat-flat-button + color="primary" + > + Edit Application + </button> + <button *ngIf="application.canReview" (click)="onReview(application.fileNumber)" mat-flat-button color="primary"> + Review Application + </button> + <button + [disabled]=" + !applicationReview || + (!application.canReview && application.status.code === SUBMISSION_STATUS.IN_REVIEW_BY_LG) + " + (click)="onDownloadReviewPdf(application.fileNumber)" + mat-flat-button + color="accent" + > + Download PDF + </button> + </div> + </div> + <div *ngIf="application.status.code === SUBMISSION_STATUS.IN_PROGRESS" class="warning"> + <mat-icon>info</mat-icon>This section will update after the application is submitted. + </div> + <div *ngIf="!applicationReview && submittedToAlcStatus" class="warning"> + <mat-icon>info</mat-icon>Application not subject to Local/First Nation Government review. + </div> + <div + *ngIf=" + application.status.code === SUBMISSION_STATUS.SUBMITTED_TO_LG || + (application.status.code === SUBMISSION_STATUS.IN_REVIEW_BY_LG && (!applicationReview || !application.canReview)) + " + class="warning" + > + <mat-icon>info</mat-icon>Pending Local/First Nation Government review. + </div> + <div + *ngIf=" + application.status.code === SUBMISSION_STATUS.WRONG_GOV || + application.status.code === SUBMISSION_STATUS.INCOMPLETE + " + class="comment-container" + > + <div><strong>Comment for Applicant</strong></div> + {{ application.returnedComment }} + <span class="no-comment" *ngIf="!application.returnedComment">No comment added</span> + </div> + <div + *ngIf=" + applicationReview && (application.canReview || application.status.code !== SUBMISSION_STATUS.IN_REVIEW_BY_LG) + " + > + <section> + <h4>Contact Information</h4> + <div class="review-table"> + <div> + <div class="subheading2">Local Government File Number</div> + <div> + {{ applicationReview.localGovernmentFileNumber }} + <app-no-data *ngIf="!applicationReview.localGovernmentFileNumber"></app-no-data> + </div> + </div> + <div> + <div class="subheading2">First Name</div> + <div> + {{ applicationReview.firstName }} + <app-no-data *ngIf="!applicationReview.firstName"></app-no-data> + </div> + </div> + <div> + <div class="subheading2">Last Name</div> + <div> + {{ applicationReview.lastName }} + <app-no-data *ngIf="!applicationReview.lastName"></app-no-data> + </div> + </div> + <div> + <div class="subheading2">Position</div> + <div> + {{ applicationReview.position }} + <app-no-data *ngIf="!applicationReview.position"></app-no-data> + </div> + </div> + <div> + <div class="subheading2">Department</div> + <div> + {{ applicationReview.department }} + <app-no-data *ngIf="!applicationReview.department"></app-no-data> + </div> + </div> + <div> + <div class="subheading2">Phone Number</div> + <div> + {{ applicationReview.phoneNumber }} + <app-no-data *ngIf="!applicationReview.phoneNumber"></app-no-data> + </div> + </div> + <div> + <div class="subheading2">Email</div> + <div> + {{ applicationReview.email }} + <app-no-data *ngIf="!applicationReview.email"></app-no-data> + </div> + </div> + </div> + </section> + <section *ngIf="!applicationReview.isFirstNationGovernment"> + <h4>Plans & Bylaws: OCP</h4> + <div class="review-table"> + <div class="full-width"> + <div class="subheading2">Is the application parcel(s) subject to a Local Government OCP designation?</div> + <div> + <span *ngIf="applicationReview.isOCPDesignation !== null">{{ + applicationReview.isOCPDesignation ? 'Yes' : 'No' + }}</span> + <app-no-data *ngIf="applicationReview.isOCPDesignation === null"></app-no-data> + </div> + </div> + <div *ngIf="applicationReview.isOCPDesignation"> + <div class="subheading2">OCP Bylaw Name</div> + <div> + {{ applicationReview.OCPBylawName }} + <app-no-data *ngIf="!applicationReview.OCPBylawName"></app-no-data> + </div> + </div> + <div *ngIf="applicationReview.isOCPDesignation"> + <div class="subheading2">OCP Designation</div> + <div> + {{ applicationReview.OCPDesignation }} + <app-no-data *ngIf="!applicationReview.OCPDesignation"></app-no-data> + </div> + </div> + <div *ngIf="applicationReview.isOCPDesignation"> + <div class="subheading2">Is this proposal consistent with the current OCP designation?</div> + <div> + <span *ngIf="applicationReview.OCPConsistent !== null">{{ + applicationReview.OCPConsistent ? 'Yes' : 'No' + }}</span> + <app-no-data *ngIf="applicationReview.OCPConsistent === null"></app-no-data> + </div> + </div> + </div> + </section> + <section *ngIf="!applicationReview.isFirstNationGovernment"> + <h4>Plans & Bylaws: Zoning</h4> + <div class="review-table"> + <div class="full-width"> + <div class="subheading2">Is the application parcel(s) subject to a Local Government zoning designation?</div> + <div> + <span *ngIf="applicationReview.isSubjectToZoning !== null">{{ + applicationReview.isSubjectToZoning ? 'Yes' : 'No' + }}</span> + <app-no-data *ngIf="applicationReview.isSubjectToZoning === null"></app-no-data> + </div> + </div> + <div *ngIf="applicationReview.isSubjectToZoning"> + <div class="subheading2">Zoning Bylaw Name</div> + <div> + {{ applicationReview.zoningBylawName }} + <app-no-data *ngIf="!applicationReview.zoningBylawName"></app-no-data> + </div> + </div> + <div *ngIf="applicationReview.isSubjectToZoning"> + <div class="subheading2">Zoning Designation</div> + <div> + {{ applicationReview.zoningDesignation }} + <app-no-data *ngIf="!applicationReview.zoningDesignation"></app-no-data> + </div> + </div> + <div *ngIf="applicationReview.isSubjectToZoning"> + <div class="subheading2">Minimum Lot Size (hectares)</div> + <div> + {{ applicationReview.zoningMinimumLotSize }} + <app-no-data *ngIf="!applicationReview.zoningMinimumLotSize"></app-no-data> + </div> + </div> + <div *ngIf="applicationReview.isSubjectToZoning"> + <div class="subheading2">Is this proposal consistent with the current zoning designation?</div> + <div> + <span *ngIf="applicationReview.isZoningConsistent !== null">{{ + applicationReview.isZoningConsistent ? 'Yes' : 'No' + }}</span> + <app-no-data *ngIf="applicationReview.isZoningConsistent === null"></app-no-data> + </div> + </div> + </div> + </section> + <section> + <h4>Resolution</h4> + <div class="review-table"> + <div + class="full-width" + *ngIf=" + !applicationReview.isFirstNationGovernment && + (applicationReview.isOCPDesignation === null || applicationReview.isSubjectToZoning === null) + " + > + Please complete both Step 2 Plans & Bylaws: OCP and Step 3 Plans & Bylaws: Zoning to continue with this step. + </div> + <div + class="full-width" + *ngIf=" + !applicationReview.isFirstNationGovernment && + applicationReview.isOCPDesignation === false && + applicationReview.isSubjectToZoning === false + " + > + By indicating that the parcel(s) is not subject to Local Government OCP or Zoning, + <strong>no authorizing resolution is required</strong> as per S. 25 (3) or S. 29 (4) of the <em>ALC Act</em>. + The only option available is to forward this application on to the ALC. + </div> + <div *ngIf="hasCompletedStepsBeforeResolution" class="full-width"> + <div class="subheading2">Resolution for Application to Proceed to the ALC</div> + <div> + <span *ngIf="applicationReview.isAuthorized !== null">{{ + applicationReview.isAuthorized ? 'Authorized' : 'Refuse to Authorize' + }}</span> + <app-no-data *ngIf="applicationReview.isAuthorized === null"></app-no-data> + </div> + </div> + </div> + </section> + <section> + <h4>Attachments</h4> + <div *ngIf="!hasCompletedStepsBeforeDocuments" class="review-table"> + <div class="full-width"> + Please complete Step 2 Plans & Bylaws: OCP, Step 3 Plans & Bylaws: Zoning and Step 4 Resolution to continue + with this step. + </div> + </div> + <div *ngIf="hasCompletedStepsBeforeDocuments" class="review-table"> + <div + *ngIf=" + applicationReview.isFirstNationGovernment || + applicationReview.isOCPDesignation || + applicationReview.isSubjectToZoning + " + > + <div class="subheading2">Resolution Document</div> + <div> + <a class="link" (click)="openFile(document.uuid)" *ngFor="let document of resolutionDocument">{{ + document.fileName + }}</a> + </div> + <app-no-data *ngIf="resolutionDocument.length === 0"></app-no-data> + </div> + <div *ngIf="applicationReview.isOCPDesignation || applicationReview.isSubjectToZoning"> + <div class="subheading2"> + Staff Report <span *ngIf="applicationReview.isAuthorized === false">(optional)</span> + </div> + <div> + <a class="link" (click)="openFile(document.uuid)" *ngFor="let document of staffReport">{{ + document.fileName + }}</a> + </div> + <app-no-data *ngIf="staffReport.length === 0"></app-no-data> + </div> + <div class="full-width"> + <div class="subheading2">Other Attachments (optional):</div> + <div> + <div class="document" *ngFor="let document of governmentOtherAttachments"> + <a class="link" (click)="openFile(document.uuid)">{{ document.fileName }}</a> + </div> + <app-no-data *ngIf="governmentOtherAttachments.length === 0"></app-no-data> + </div> + </div> + </div> + </section> + </div> +</div> diff --git a/portal-frontend/src/app/features/public/application/lfng-review/lfng-review.component.scss b/portal-frontend/src/app/features/public/application/lfng-review/lfng-review.component.scss new file mode 100644 index 0000000000..8af4733989 --- /dev/null +++ b/portal-frontend/src/app/features/public/application/lfng-review/lfng-review.component.scss @@ -0,0 +1,74 @@ +@use '../../../../../styles/functions' as *; +@use '../../../../../styles/colors'; + +.warning { + align-items: center; + background-color: rgba(colors.$accent-color-light, 0.5); + border-radius: rem(4); + display: flex; + padding: rem(16); + margin-bottom: rem(24); + + mat-icon { + margin-right: 12px; + } +} + +.comment-container { + align-items: flex-start; + background-color: rgba(colors.$accent-color-light, 0.5); + border-radius: rem(4); + display: flex; + flex-direction: column; + margin-bottom: rem(24); + padding: rem(16); + + div { + margin-bottom: rem(4); + } +} + +.no-comment { + color: colors.$grey-dark; + font-style: italic; +} + +.link { + color: colors.$link-color; + cursor: pointer; +} + +.review-table { + padding: rem(8); + margin: rem(12) 0 rem(20) 0; + background-color: colors.$grey-light; + display: grid; + grid-row-gap: rem(24); + grid-column-gap: rem(16); + grid-template-columns: 1fr; + word-wrap: break-word; + hyphens: auto; + + .edit-button { + display: flex; + justify-content: center; + } + + .subheading2 { + margin-bottom: rem(4) !important; + } + + @media screen and (min-width: $tabletBreakpoint) { + padding: rem(16); + margin: rem(24) 0 rem(40) 0; + grid-template-columns: 1fr 1fr; + + .full-width { + grid-column: 1/3; + } + + .edit-button { + grid-column: 1/3; + } + } +} diff --git a/portal-frontend/src/app/features/public/application/lfng-review/lfng-review.component.spec.ts b/portal-frontend/src/app/features/public/application/lfng-review/lfng-review.component.spec.ts new file mode 100644 index 0000000000..d1556cc200 --- /dev/null +++ b/portal-frontend/src/app/features/public/application/lfng-review/lfng-review.component.spec.ts @@ -0,0 +1,57 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { BehaviorSubject } from 'rxjs'; +import { ApplicationDocumentDto } from '../../../../services/application-document/application-document.dto'; +import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; +import { ApplicationSubmissionReviewDto } from '../../../../services/application-submission-review/application-submission-review.dto'; +import { ApplicationSubmissionReviewService } from '../../../../services/application-submission-review/application-submission-review.service'; +import { ApplicationSubmissionDetailedDto } from '../../../../services/application-submission/application-submission.dto'; +import { PdfGenerationService } from '../../../../services/pdf-generation/pdf-generation.service'; + +import { LfngReviewComponent } from './lfng-review.component'; + +describe('LfngReviewComponent', () => { + let component: LfngReviewComponent; + let fixture: ComponentFixture<LfngReviewComponent>; + + let mockAppSubReviewService: DeepMocked<ApplicationSubmissionReviewService>; + let mockPdfGenerationService: DeepMocked<PdfGenerationService>; + let mockAppDocumentService: DeepMocked<ApplicationDocumentService>; + + beforeEach(async () => { + mockAppSubReviewService = createMock(); + mockPdfGenerationService = createMock(); + mockAppDocumentService = createMock(); + + mockAppSubReviewService.$applicationReview = new BehaviorSubject<ApplicationSubmissionReviewDto | undefined>( + undefined + ); + + await TestBed.configureTestingModule({ + providers: [ + { + provide: ApplicationSubmissionReviewService, + useValue: mockAppSubReviewService, + }, + { + provide: PdfGenerationService, + useValue: mockPdfGenerationService, + }, + { + provide: ApplicationDocumentService, + useValue: mockAppDocumentService, + }, + ], + declarations: [LfngReviewComponent], + }).compileComponents(); + + fixture = TestBed.createComponent(LfngReviewComponent); + component = fixture.componentInstance; + + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/public/application/lfng-review/lfng-review.component.ts b/portal-frontend/src/app/features/public/application/lfng-review/lfng-review.component.ts new file mode 100644 index 0000000000..e80935380e --- /dev/null +++ b/portal-frontend/src/app/features/public/application/lfng-review/lfng-review.component.ts @@ -0,0 +1,131 @@ +import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core'; +import { Router } from '@angular/router'; +import { BehaviorSubject, Subject, takeUntil } from 'rxjs'; +import { ApplicationDocumentDto } from '../../../../services/application-document/application-document.dto'; +import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; +import { ApplicationSubmissionReviewDto } from '../../../../services/application-submission-review/application-submission-review.dto'; +import { ApplicationSubmissionReviewService } from '../../../../services/application-submission-review/application-submission-review.service'; +import { + ApplicationSubmissionDetailedDto, + SUBMISSION_STATUS, +} from '../../../../services/application-submission/application-submission.dto'; +import { PdfGenerationService } from '../../../../services/pdf-generation/pdf-generation.service'; +import { DOCUMENT_SOURCE, DOCUMENT_TYPE } from '../../../../shared/dto/document.dto'; + +@Component({ + selector: 'app-lfng-review', + templateUrl: './lfng-review.component.html', + styleUrls: ['./lfng-review.component.scss'], +}) +export class LfngReviewComponent implements OnInit, OnDestroy { + private $destroy = new Subject<void>(); + + @Input() $application = new BehaviorSubject<ApplicationSubmissionDetailedDto | undefined>(undefined); + @Input() $applicationDocuments = new BehaviorSubject<ApplicationDocumentDto[]>([]); + + @Output() onCancel = new EventEmitter<string>(); + + application: ApplicationSubmissionDetailedDto | undefined; + applicationReview: ApplicationSubmissionReviewDto | undefined; + SUBMISSION_STATUS = SUBMISSION_STATUS; + staffReport: ApplicationDocumentDto[] = []; + resolutionDocument: ApplicationDocumentDto[] = []; + governmentOtherAttachments: ApplicationDocumentDto[] = []; + hasCompletedStepsBeforeResolution = false; + hasCompletedStepsBeforeDocuments = false; + submittedToAlcStatus = false; + + constructor( + private applicationReviewService: ApplicationSubmissionReviewService, + private pdfGenerationService: PdfGenerationService, + private applicationDocumentService: ApplicationDocumentService, + private router: Router + ) {} + + ngOnInit(): void { + this.applicationReviewService.$applicationReview.pipe(takeUntil(this.$destroy)).subscribe((appReview) => { + if (appReview) { + this.applicationReview = appReview; + + this.hasCompletedStepsBeforeResolution = + appReview.isFirstNationGovernment || + (!appReview.isFirstNationGovernment && + appReview.isOCPDesignation !== null && + appReview.isSubjectToZoning !== null && + (appReview.isOCPDesignation === true || appReview.isSubjectToZoning === true)); + + this.hasCompletedStepsBeforeDocuments = + appReview.isFirstNationGovernment || + (appReview.isAuthorized !== null && + appReview.isOCPDesignation !== null && + appReview.isSubjectToZoning !== null) || + (appReview.isAuthorized === null && + appReview.isOCPDesignation === false && + appReview.isSubjectToZoning === false); + } + }); + + this.$application.pipe(takeUntil(this.$destroy)).subscribe((application) => { + this.application = application; + this.submittedToAlcStatus = !!this.application?.submissionStatuses.find( + (s) => s.statusTypeCode === SUBMISSION_STATUS.SUBMITTED_TO_ALC && !!s.effectiveDate + ); + this.loadReview(); + }); + + this.$applicationDocuments.subscribe((documents) => { + this.staffReport = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.STAFF_REPORT); + this.resolutionDocument = documents.filter( + (document) => document.type?.code === DOCUMENT_TYPE.RESOLUTION_DOCUMENT + ); + this.governmentOtherAttachments = documents.filter( + (document) => document.type?.code === DOCUMENT_TYPE.OTHER && document.source === DOCUMENT_SOURCE.LFNG + ); + }); + } + + async onDownloadReviewPdf(fileNumber: string | undefined) { + if (fileNumber) { + await this.pdfGenerationService.generateReview(fileNumber); + } + } + + async loadReview() { + if ( + this.application && + this.application.typeCode !== 'TURP' && + (this.submittedToAlcStatus || + (this.application.status.code === SUBMISSION_STATUS.IN_REVIEW_BY_LG && this.application.canReview)) + ) { + await this.applicationReviewService.getByFileId(this.application.fileNumber); + } else { + this.applicationReview = undefined; + } + } + + async openFile(uuid: string) { + const res = await this.applicationDocumentService.openFile(uuid); + if (res) { + window.open(res.url, '_blank'); + } + } + + async onReview(fileId: string) { + if (this.application?.status.code === SUBMISSION_STATUS.SUBMITTED_TO_LG) { + const review = await this.applicationReviewService.startReview(fileId); + if (!review) { + return; + } + } + await this.router.navigateByUrl(`application/${fileId}/review`); + } + + onCancelClicked(fileNumber: string) { + this.onCancel.emit(fileNumber); + } + + ngOnDestroy(): void { + this.$destroy.next(); + this.$destroy.complete(); + } +} diff --git a/portal-frontend/src/app/features/public/application/public-application.component.html b/portal-frontend/src/app/features/public/application/public-application.component.html new file mode 100644 index 0000000000..8bf92b73ce --- /dev/null +++ b/portal-frontend/src/app/features/public/application/public-application.component.html @@ -0,0 +1,60 @@ +<div aria-hidden="true" class="banner absolute"> + <div> + <h4 *ngIf="submission">Application ID: {{ submission.fileNumber }} | {{ submission.type }}</h4> + </div> + <div class="banner-status"> + <div> + <div class="subheading2">Status Date</div> + <span *ngIf="submission">{{ submission.lastStatusUpdate | date }}</span> + </div> + <div> + <div class="subheading2">Application Status</div> + <span *ngIf="submission">{{ submission.status.label }}</span> + </div> + </div> +</div> +<div class="banner"> + <div> + <h4 *ngIf="submission">Application ID: {{ submission.fileNumber }}</h4> + </div> + <div class="banner-status"> + <div> + <div class="subheading2">Status Date</div> + <span *ngIf="submission">{{ submission.lastStatusUpdate | date }}</span> + </div> + <div> + <div class="subheading2">Application Status</div> + <span *ngIf="submission">{{ submission.status.label }}</span> + </div> + </div> +</div> +<button routerLink="/search" mat-button color="accent"> + <mat-icon>chevron_left</mat-icon>Return to Search Results +</button> +<div> + <div class="navigation"> + <mat-tab-group> + <mat-tab label="Applicant Submission"> + <div *ngIf="submission" class="content"> + <section> + <div class="header"> + <h3>Applicant Submission</h3> + </div> + <app-public-app-submission-details + [applicationDocuments]="documents" + [applicationSubmission]="submission" + [applicationParcels]="parcels" + > + </app-public-app-submission-details> + </section> + </div> + </mat-tab> + <mat-tab label="Local/First Nation Gov Review"> + <div class="content">//TODO</div> + </mat-tab> + <mat-tab label="ALC Review and Decision"> + <div class="content">//TODO</div> + </mat-tab> + </mat-tab-group> + </div> +</div> diff --git a/portal-frontend/src/app/features/public/application/public-application.component.scss b/portal-frontend/src/app/features/public/application/public-application.component.scss new file mode 100644 index 0000000000..0e74e9ca5b --- /dev/null +++ b/portal-frontend/src/app/features/public/application/public-application.component.scss @@ -0,0 +1,105 @@ +@use '../../../../styles/functions' as *; +@use '../../../../styles/colors'; + +.navigation { + ::ng-deep .mdc-tab__text-label { + font-weight: bold; + } +} + +.content { + margin: rem(24) 0; +} + +:host::ng-deep { + .header { + display: flex; + justify-content: space-between; + align-items: center; + margin-bottom: rem(24); + flex-direction: column; + + @media screen and (min-width: $tabletBreakpoint) { + flex-direction: row; + } + + h3 { + margin-top: rem(8) !important; + } + + .btns-wrapper { + display: flex; + flex-direction: column-reverse; + width: 100%; + + button { + margin-top: rem(16) !important; + } + + @media screen and (min-width: $tabletBreakpoint) { + display: inline-block; + width: unset; + + button { + margin-right: rem(16) !important; + margin-top: rem(8) !important; + } + + button:last-child { + margin-right: 0 !important; + } + } + } + } +} + +.absolute { + position: absolute; + left: 0; + right: 0; +} + +.banner { + background-color: colors.$secondary-color; + width: 100%; + color: #fff; + padding: rem(16) rem(24); + margin-bottom: rem(32); + + @media screen and (min-width: $tabletBreakpoint) { + padding: rem(12) rem(36) !important; + } + + // TODO: this is just a placeholder and will be addressed later + @media screen and (min-width: $desktopBreakpoint) { + padding: rem(18) rem(80) !important; + } + + .banner-status { + margin: rem(16) 0; + display: grid; + grid-template-columns: 1fr; + + div { + margin-top: rem(16); + } + + @media screen and (min-width: $tabletBreakpoint) { + grid-template-columns: 1fr 1fr; + margin-bottom: 0; + } + } +} + +.no-comment { + color: colors.$grey-dark; + font-style: italic; +} + +section { + margin-bottom: rem(24); +} + +.document { + margin-bottom: rem(8); +} diff --git a/portal-frontend/src/app/features/public/application/public-application.component.spec.ts b/portal-frontend/src/app/features/public/application/public-application.component.spec.ts new file mode 100644 index 0000000000..1c02e7c4dd --- /dev/null +++ b/portal-frontend/src/app/features/public/application/public-application.component.spec.ts @@ -0,0 +1,49 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { ActivatedRoute } from '@angular/router'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { BehaviorSubject } from 'rxjs'; +import { PublicService } from '../../../services/public/public.service'; + +import { PublicApplicationComponent } from './public-application.component'; + +describe('PublicApplicationComponent', () => { + let component: PublicApplicationComponent; + let fixture: ComponentFixture<PublicApplicationComponent>; + + let mockRoute; + let mockPublicService: DeepMocked<PublicService>; + + let routeParamMap: BehaviorSubject<Map<string, any>>; + + beforeEach(async () => { + mockRoute = createMock(); + mockPublicService = createMock(); + + routeParamMap = new BehaviorSubject(new Map()); + mockRoute.paramMap = routeParamMap; + + await TestBed.configureTestingModule({ + providers: [ + { + provide: ActivatedRoute, + useValue: mockRoute, + }, + { + provide: PublicService, + useValue: mockPublicService, + }, + ], + declarations: [PublicApplicationComponent], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(PublicApplicationComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/public/application/public-application.component.ts b/portal-frontend/src/app/features/public/application/public-application.component.ts new file mode 100644 index 0000000000..f3700a1941 --- /dev/null +++ b/portal-frontend/src/app/features/public/application/public-application.component.ts @@ -0,0 +1,50 @@ +import { Component, OnDestroy, OnInit } from '@angular/core'; +import { ActivatedRoute } from '@angular/router'; +import { Subject, takeUntil } from 'rxjs'; +import { ApplicationDocumentDto } from '../../../services/application-document/application-document.dto'; +import { ApplicationParcelDto } from '../../../services/application-parcel/application-parcel.dto'; +import { SUBMISSION_STATUS } from '../../../services/application-submission/application-submission.dto'; +import { PublicApplicationSubmissionDto } from '../../../services/public/public.dto'; +import { PublicService } from '../../../services/public/public.service'; + +@Component({ + selector: 'app-public-application', + templateUrl: './public-application.component.html', + styleUrls: ['./public-application.component.scss'], +}) +export class PublicApplicationComponent implements OnInit, OnDestroy { + $destroy = new Subject<void>(); + + SUBMISSION_STATUS = SUBMISSION_STATUS; + + submission: PublicApplicationSubmissionDto | undefined; + documents: ApplicationDocumentDto[] = []; + parcels: ApplicationParcelDto[] = []; + + constructor(private publicService: PublicService, private route: ActivatedRoute) {} + + ngOnInit(): void { + this.route.paramMap.pipe(takeUntil(this.$destroy)).subscribe((routeParams) => { + const fileId = routeParams.get('fileId'); + if (fileId) { + this.loadApplication(fileId); + } + }); + } + + private async loadApplication(fileId: string) { + const res = await this.publicService.getApplication(fileId); + if (res) { + const { submission, documents, parcels } = res; + + this.submission = submission; + this.documents = documents; + this.parcels = parcels; + } + } + + ngOnDestroy(): void { + this.$destroy.next(); + this.$destroy.complete(); + } +} diff --git a/portal-frontend/src/app/features/public/application/submission/excl-details/excl-details.component.html b/portal-frontend/src/app/features/public/application/submission/excl-details/excl-details.component.html new file mode 100644 index 0000000000..f05b0ed16f --- /dev/null +++ b/portal-frontend/src/app/features/public/application/submission/excl-details/excl-details.component.html @@ -0,0 +1,52 @@ +<div *ngIf="applicationSubmission" class="review-table"> + <div class="subheading2 grid-1">The governmental or prescribed public body that is applying to exclude land</div> + <div class="grid-double"> + {{ applicationSubmission.prescribedBody }} + </div> + + <div class="subheading2 grid-1">How many hectares are you proposing to exclude? (hectares)</div> + <div class="grid-double"> + {{ applicationSubmission.inclExclHectares }} + <app-no-data *ngIf="!applicationSubmission.inclExclHectares"></app-no-data> + </div> + + <div class="subheading2 grid-1"> + Does any land under application share a common property line with land in another Local or First Nation Government? + </div> + <div class="grid-double"> + <span *ngIf="applicationSubmission.exclShareGovernmentBorders !== null"> + {{ applicationSubmission.exclShareGovernmentBorders ? 'Yes' : 'No' }} + </span> + <app-no-data *ngIf="applicationSubmission.exclShareGovernmentBorders === null"></app-no-data> + </div> + + <div class="subheading2 grid-1">What is the purpose of the proposal?</div> + <div class="grid-double"> + {{ applicationSubmission.purpose }} + <app-no-data *ngIf="!applicationSubmission.purpose"></app-no-data> + </div> + + <div class="subheading2 grid-1">Explain why you believe that the parcel(s) should be excluded from the ALR</div> + <div class="grid-double"> + {{ applicationSubmission.exclWhyLand }} + <app-no-data *ngIf="!applicationSubmission.exclWhyLand"></app-no-data> + </div> + + <div class="subheading2 grid-1">Proposal Map / Site Plan</div> + <div class="grid-double"> + <a *ngFor="let map of proposalMap" (click)="openFile(map.uuid)"> + {{ map.fileName }} + </a> + <app-no-data *ngIf="proposalMap.length === 0"></app-no-data> + </div> + + <div class="subheading2 grid-1">Report of Public Hearing</div> + <div class="grid-double"> + <div *ngFor="let file of reportOfPublicHearing"> + <a (click)="openFile(file.uuid)"> + {{ file.fileName }} + </a> + </div> + <app-no-data *ngIf="reportOfPublicHearing.length === 0"></app-no-data> + </div> +</div> diff --git a/portal-frontend/src/app/features/public/application/submission/excl-details/excl-details.component.scss b/portal-frontend/src/app/features/public/application/submission/excl-details/excl-details.component.scss new file mode 100644 index 0000000000..e69de29bb2 diff --git a/portal-frontend/src/app/features/public/application/submission/excl-details/excl-details.component.spec.ts b/portal-frontend/src/app/features/public/application/submission/excl-details/excl-details.component.spec.ts new file mode 100644 index 0000000000..dce18eaba5 --- /dev/null +++ b/portal-frontend/src/app/features/public/application/submission/excl-details/excl-details.component.spec.ts @@ -0,0 +1,30 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { DeepMocked } from '@golevelup/ts-jest'; +import { PublicService } from '../../../../../services/public/public.service'; +import { ExclDetailsComponent } from './excl-details.component'; + +describe('ExclDetailsComponent', () => { + let component: ExclDetailsComponent; + let fixture: ComponentFixture<ExclDetailsComponent>; + let mockPublicService: DeepMocked<PublicService>; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ExclDetailsComponent], + providers: [ + { + provide: PublicService, + useValue: mockPublicService, + }, + ], + }).compileComponents(); + + fixture = TestBed.createComponent(ExclDetailsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/public/application/submission/excl-details/excl-details.component.ts b/portal-frontend/src/app/features/public/application/submission/excl-details/excl-details.component.ts new file mode 100644 index 0000000000..cc7b23fc89 --- /dev/null +++ b/portal-frontend/src/app/features/public/application/submission/excl-details/excl-details.component.ts @@ -0,0 +1,35 @@ +import { Component, Input } from '@angular/core'; +import { Router } from '@angular/router'; +import { ApplicationDocumentDto } from '../../../../../services/application-document/application-document.dto'; +import { ApplicationDocumentService } from '../../../../../services/application-document/application-document.service'; +import { PublicApplicationSubmissionDto } from '../../../../../services/public/public.dto'; +import { PublicService } from '../../../../../services/public/public.service'; +import { DOCUMENT_TYPE } from '../../../../../shared/dto/document.dto'; + +@Component({ + selector: 'app-excl-details', + templateUrl: './excl-details.component.html', + styleUrls: ['./excl-details.component.scss'], +}) +export class ExclDetailsComponent { + @Input() applicationSubmission!: PublicApplicationSubmissionDto; + + @Input() set applicationDocuments(documents: ApplicationDocumentDto[]) { + this.proposalMap = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.PROPOSAL_MAP); + this.reportOfPublicHearing = documents.filter( + (document) => document.type?.code === DOCUMENT_TYPE.REPORT_OF_PUBLIC_HEARING + ); + } + + proposalMap: ApplicationDocumentDto[] = []; + reportOfPublicHearing: ApplicationDocumentDto[] = []; + + constructor(private router: Router, private publicService: PublicService) {} + + async openFile(uuid: string) { + const res = await this.publicService.getApplicationFileUrl(this.applicationSubmission.fileNumber, uuid); + if (res) { + window.open(res?.url, '_blank'); + } + } +} diff --git a/portal-frontend/src/app/features/public/application/submission/incl-details/incl-details.component.html b/portal-frontend/src/app/features/public/application/submission/incl-details/incl-details.component.html new file mode 100644 index 0000000000..557efad2b4 --- /dev/null +++ b/portal-frontend/src/app/features/public/application/submission/incl-details/incl-details.component.html @@ -0,0 +1,58 @@ +<div *ngIf="applicationSubmission" class="review-table"> + <div class="subheading2 grid-1">How many hectares are you proposing to include? (hectares)</div> + <div class="grid-double"> + {{ applicationSubmission.inclExclHectares }} + <app-no-data *ngIf="!applicationSubmission.inclExclHectares"></app-no-data> + </div> + + <div class="subheading2 grid-1">What is the purpose of the proposal?</div> + <div class="grid-double"> + {{ applicationSubmission.purpose }} + <app-no-data *ngIf="!applicationSubmission.purpose"></app-no-data> + </div> + + <div class="subheading2 grid-1">Does the proposal support agriculture in the short or long term?</div> + <div class="grid-double"> + {{ applicationSubmission.inclAgricultureSupport }} + <app-no-data *ngIf="!applicationSubmission.inclAgricultureSupport"></app-no-data> + </div> + + <div class="subheading2 grid-1"> + Describe any improvements that have been made to, or are planned for the parcel proposed for inclusion. + </div> + <div class="grid-double"> + {{ applicationSubmission.inclImprovements }} + <app-no-data *ngIf="!applicationSubmission.inclImprovements"></app-no-data> + </div> + + <div class="subheading2 grid-1">Proposal Map / Site Plan</div> + <div class="grid-double"> + <a *ngFor="let map of proposalMap" (click)="openFile(map.uuid)"> + {{ map.fileName }} + </a> + <app-no-data *ngIf="proposalMap.length === 0"></app-no-data> + </div> + + <ng-container *ngIf="applicationSubmission.inclGovernmentOwnsAllParcels !== null"> + <div class="subheading2 grid-1"> + Is the applying government the registered land owner of all parcels under this inclusion application? + </div> + <div class="grid-double"> + <span> + {{ applicationSubmission.inclGovernmentOwnsAllParcels ? 'Yes' : 'No' }} + </span> + </div> + </ng-container> + + <ng-container *ngIf="applicationSubmission.inclGovernmentOwnsAllParcels === false"> + <div class="subheading2 grid-1">Report of Public Hearing</div> + <div class="grid-double"> + <div *ngFor="let file of reportOfPublicHearing"> + <a (click)="openFile(file.uuid)"> + {{ file.fileName }} + </a> + <app-no-data *ngIf="reportOfPublicHearing.length === 0"></app-no-data> + </div> + </div> + </ng-container> +</div> diff --git a/portal-frontend/src/app/features/public/application/submission/incl-details/incl-details.component.scss b/portal-frontend/src/app/features/public/application/submission/incl-details/incl-details.component.scss new file mode 100644 index 0000000000..e69de29bb2 diff --git a/portal-frontend/src/app/features/public/application/submission/incl-details/incl-details.component.spec.ts b/portal-frontend/src/app/features/public/application/submission/incl-details/incl-details.component.spec.ts new file mode 100644 index 0000000000..339ae1b64a --- /dev/null +++ b/portal-frontend/src/app/features/public/application/submission/incl-details/incl-details.component.spec.ts @@ -0,0 +1,30 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { DeepMocked } from '@golevelup/ts-jest'; +import { PublicService } from '../../../../../services/public/public.service'; +import { InclDetailsComponent } from './incl-details.component'; + +describe('InclDetailsComponent', () => { + let component: InclDetailsComponent; + let fixture: ComponentFixture<InclDetailsComponent>; + let mockPublicService: DeepMocked<PublicService>; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [InclDetailsComponent], + providers: [ + { + provide: PublicService, + useValue: mockPublicService, + }, + ], + }).compileComponents(); + + fixture = TestBed.createComponent(InclDetailsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/public/application/submission/incl-details/incl-details.component.ts b/portal-frontend/src/app/features/public/application/submission/incl-details/incl-details.component.ts new file mode 100644 index 0000000000..53e325f10f --- /dev/null +++ b/portal-frontend/src/app/features/public/application/submission/incl-details/incl-details.component.ts @@ -0,0 +1,35 @@ +import { Component, Input } from '@angular/core'; +import { Router } from '@angular/router'; +import { ApplicationDocumentDto } from '../../../../../services/application-document/application-document.dto'; +import { ApplicationDocumentService } from '../../../../../services/application-document/application-document.service'; +import { PublicApplicationSubmissionDto } from '../../../../../services/public/public.dto'; +import { PublicService } from '../../../../../services/public/public.service'; +import { DOCUMENT_TYPE } from '../../../../../shared/dto/document.dto'; + +@Component({ + selector: 'app-incl-details', + templateUrl: './incl-details.component.html', + styleUrls: ['./incl-details.component.scss'], +}) +export class InclDetailsComponent { + proposalMap: ApplicationDocumentDto[] = []; + reportOfPublicHearing: ApplicationDocumentDto[] = []; + + @Input() applicationSubmission!: PublicApplicationSubmissionDto; + + @Input() set applicationDocuments(documents: ApplicationDocumentDto[]) { + this.proposalMap = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.PROPOSAL_MAP); + this.reportOfPublicHearing = documents.filter( + (document) => document.type?.code === DOCUMENT_TYPE.REPORT_OF_PUBLIC_HEARING + ); + } + + constructor(private router: Router, private publicService: PublicService) {} + + async openFile(uuid: string) { + const res = await this.publicService.getApplicationFileUrl(this.applicationSubmission.fileNumber, uuid); + if (res) { + window.open(res?.url, '_blank'); + } + } +} diff --git a/portal-frontend/src/app/features/public/application/submission/naru-details/naru-details.component.html b/portal-frontend/src/app/features/public/application/submission/naru-details/naru-details.component.html new file mode 100644 index 0000000000..552d817696 --- /dev/null +++ b/portal-frontend/src/app/features/public/application/submission/naru-details/naru-details.component.html @@ -0,0 +1,209 @@ +<div *ngIf="applicationSubmission" class="review-table"> + <div class="subheading2 grid-1">Selected Subtype:</div> + <div class="grid-double"> + <span *ngIf="applicationSubmission.naruSubtype !== null"> + {{ applicationSubmission.naruSubtype.label }} + </span> + <app-no-data *ngIf="applicationSubmission.naruSubtype === null"></app-no-data> + </div> + + <div class="subheading2 grid-1">What is the purpose of the proposal?</div> + <div class="grid-double"> + {{ applicationSubmission.purpose }} + <app-no-data *ngIf="!applicationSubmission.purpose"></app-no-data> + </div> + + <ng-container *ngIf="applicationSubmission.naruSubtype?.code === 'ARFU'"> + <div class="subheading2 grid-1"> + What is the total floor area (m<sup>2</sup>) of the proposed additional residence? + </div> + <div class="grid-double"> + {{ applicationSubmission.naruFloorArea }} + <app-no-data *ngIf="!applicationSubmission.naruFloorArea"></app-no-data> + </div> + + <div class="subheading2 grid-1"> + Describe the necessity for an additional residence for farm use and how it will support agriculture in the short + or long term. + </div> + <div class="grid-double"> + {{ applicationSubmission.naruResidenceNecessity }} + <app-no-data *ngIf="!applicationSubmission.naruResidenceNecessity"></app-no-data> + </div> + + <div class="subheading2 grid-1">Describe the rationale for the proposed location of the additional residence.</div> + <div class="grid-double"> + {{ applicationSubmission.naruLocationRationale }} + <app-no-data *ngIf="!applicationSubmission.naruLocationRationale"></app-no-data> + </div> + + <div class="subheading2 grid-1"> + Provide the total area (m<sup>2</sup>) and a description of infrastructure necessary to support the additional + residence. + </div> + <div class="grid-double"> + {{ applicationSubmission.naruInfrastructure }} + <app-no-data *ngIf="!applicationSubmission.naruInfrastructure"></app-no-data> + </div> + </ng-container> + + <ng-container *ngIf="applicationSubmission.naruSubtype?.code === 'PRIN'"> + <div class="subheading2 grid-1"> + What is the total floor area (m<sup>2</sup>) of the proposed principal residence? + </div> + <div class="grid-double"> + {{ applicationSubmission.naruFloorArea }} + <app-no-data *ngIf="!applicationSubmission.naruFloorArea"></app-no-data> + </div> + + <div class="subheading2 grid-1"> + Describe how the proposal for a principal residence more than 500 m<sup>2</sup> will support agriculture in the + short or long term. + </div> + <div class="grid-double"> + {{ applicationSubmission.naruResidenceNecessity }} + <app-no-data *ngIf="!applicationSubmission.naruResidenceNecessity"></app-no-data> + </div> + + <div class="subheading2 grid-1">Describe the rationale for the proposed location of the principal residence.</div> + <div class="grid-double"> + {{ applicationSubmission.naruLocationRationale }} + <app-no-data *ngIf="!applicationSubmission.naruLocationRationale"></app-no-data> + </div> + + <div class="subheading2 grid-1"> + Provide the total area (m<sup>2</sup>) and a description of infrastructure necessary to support the additional + residence. + </div> + <div class="grid-double"> + {{ applicationSubmission.naruInfrastructure }} + <app-no-data *ngIf="!applicationSubmission.naruInfrastructure"></app-no-data> + </div> + </ng-container> + + <ng-container *ngIf="applicationSubmission.naruSubtype?.code === 'TOUR'"> + <div class="subheading2 grid-1">What is the total floor area (m<sup>2</sup>) of the proposed accommodation?</div> + <div class="grid-double"> + {{ applicationSubmission.naruFloorArea }} + <app-no-data *ngIf="!applicationSubmission.naruFloorArea"></app-no-data> + </div> + + <div class="subheading2 grid-1">How many "sleeping units" in total are proposed?</div> + <div class="grid-double"> + {{ applicationSubmission.naruSleepingUnits }} + <app-no-data *ngIf="!applicationSubmission.naruSleepingUnits"></app-no-data> + </div> + + <div class="subheading2 grid-1"> + Describe how the proposal for tourism accommodation will support agriculture in the short or long term. + </div> + <div class="grid-double"> + {{ applicationSubmission.naruResidenceNecessity }} + <app-no-data *ngIf="!applicationSubmission.naruResidenceNecessity"></app-no-data> + </div> + + <div class="subheading2 grid-1">Describe the rationale for the proposed location of the tourism accommodation.</div> + <div class="grid-double"> + {{ applicationSubmission.naruLocationRationale }} + <app-no-data *ngIf="!applicationSubmission.naruLocationRationale"></app-no-data> + </div> + + <div class="subheading2 grid-1"> + Provide the total area (m<sup>2</sup>) and a description of infrastructure necessary to support the tourism + accommodation. + </div> + <div class="grid-double"> + {{ applicationSubmission.naruInfrastructure }} + <app-no-data *ngIf="!applicationSubmission.naruInfrastructure"></app-no-data> + </div> + + <div class="subheading2 grid-1">Describe any agri-tourism that is currently taking place on the property.</div> + <div class="grid-double"> + {{ applicationSubmission.naruAgriTourism }} + <app-no-data *ngIf="!applicationSubmission.naruAgriTourism"></app-no-data> + </div> + </ng-container> + + <div class="subheading2 grid-1"> + Describe the total floor area (m<sup>2</sup>), type, number, and occupancy of all residential structures currently + located on the property. + </div> + <div class="grid-double"> + {{ applicationSubmission.naruExistingStructures }} + <app-no-data *ngIf="!applicationSubmission.naruExistingStructures"></app-no-data> + </div> + + <div class="subheading2 grid-1">Proposal Map / Site Plan</div> + <div class="grid-double"> + <a *ngFor="let map of proposalMap" (click)="openFile(map.uuid)"> + {{ map.fileName }} + </a> + <app-no-data *ngIf="proposalMap.length === 0"></app-no-data> + </div> + + <div class="subheading2 grid-1"> + Do you need to import any fill to construct or conduct the proposed non-adhering residential use? + </div> + <div class="grid-double"> + <span *ngIf="applicationSubmission.naruWillImportFill !== null">{{ + applicationSubmission.naruWillImportFill ? 'Yes' : 'No' + }}</span> + <app-no-data *ngIf="applicationSubmission.naruWillImportFill === null"></app-no-data> + </div> + + <ng-container *ngIf="applicationSubmission.naruWillImportFill"> + <div class="subheading2 grid-1">Describe the type and amount of fill proposed to be placed.</div> + <div class="grid-double"> + {{ applicationSubmission.naruFillType }} + <app-no-data *ngIf="!applicationSubmission.naruFillType"></app-no-data> + </div> + + <div class="subheading2 grid-1">Briefly describe the origin and quality of fill.</div> + <div class="grid-double"> + {{ applicationSubmission.naruFillOrigin }} + <app-no-data *ngIf="!applicationSubmission.naruFillOrigin"></app-no-data> + </div> + + <div class="subheading1 full-width">Fill to be Placed</div> + <div class="full-width soil-table"> + <div class="grid-1"><strong>Volume</strong></div> + <div class="grid-2"> + {{ applicationSubmission.naruToPlaceVolume }} + <span *ngIf="applicationSubmission.naruToPlaceVolume !== null">m<sup>3</sup></span> + <app-no-data *ngIf="applicationSubmission.naruToPlaceVolume === null"></app-no-data> + </div> + <div class="grid-1"><strong>Area</strong></div> + <div class="grid-2"> + {{ applicationSubmission.naruToPlaceArea }} + <span *ngIf="applicationSubmission.naruToPlaceArea !== null">m<sup>2</sup></span> + <app-no-data *ngIf="applicationSubmission.naruToPlaceArea === null"></app-no-data> + </div> + <div class="grid-1"><strong>Maximum Depth</strong></div> + <div class="grid-2"> + {{ applicationSubmission.naruToPlaceMaximumDepth }} + <span *ngIf="applicationSubmission.naruToPlaceMaximumDepth !== null">m</span> + <app-no-data *ngIf="applicationSubmission.naruToPlaceMaximumDepth === null"></app-no-data> + </div> + <div class="grid-1"><strong>Average Depth</strong></div> + <div class="grid-2"> + {{ applicationSubmission.naruToPlaceAverageDepth }} + <span *ngIf="applicationSubmission.naruToPlaceAverageDepth !== null">m</span> + <app-no-data *ngIf="applicationSubmission.naruToPlaceAverageDepth === null"></app-no-data> + </div> + </div> + + <div class="full-width"> + <span class="subheading1">Project Duration</span> + </div> + <div class="subheading2 grid-1">Duration</div> + <div class="grid-double"> + {{ applicationSubmission.naruProjectDurationUnit }} + <app-no-data *ngIf="!applicationSubmission.naruProjectDurationUnit"></app-no-data> + </div> + <div class="subheading2 grid-1">Length</div> + <div class="grid-double"> + {{ applicationSubmission.naruProjectDurationAmount }} + <app-no-data *ngIf="!applicationSubmission.naruProjectDurationAmount"></app-no-data> + </div> + </ng-container> +</div> diff --git a/portal-frontend/src/app/features/public/application/submission/naru-details/naru-details.component.scss b/portal-frontend/src/app/features/public/application/submission/naru-details/naru-details.component.scss new file mode 100644 index 0000000000..75917bf09c --- /dev/null +++ b/portal-frontend/src/app/features/public/application/submission/naru-details/naru-details.component.scss @@ -0,0 +1,9 @@ +@use '../../../../../../styles/functions' as *; + +.soil-table { + display: grid; + grid-template-columns: max-content max-content; + overflow-x: auto; + grid-column-gap: rem(36); + grid-row-gap: rem(12); +} diff --git a/portal-frontend/src/app/features/public/application/submission/naru-details/naru-details.component.spec.ts b/portal-frontend/src/app/features/public/application/submission/naru-details/naru-details.component.spec.ts new file mode 100644 index 0000000000..3fa010cfa6 --- /dev/null +++ b/portal-frontend/src/app/features/public/application/submission/naru-details/naru-details.component.spec.ts @@ -0,0 +1,33 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { PublicService } from '../../../../../services/public/public.service'; + +import { NaruDetailsComponent } from './naru-details.component'; + +describe('NaruDetailsComponent', () => { + let component: NaruDetailsComponent; + let fixture: ComponentFixture<NaruDetailsComponent>; + let mockPublicService: DeepMocked<PublicService>; + + beforeEach(async () => { + mockPublicService = createMock(); + + await TestBed.configureTestingModule({ + declarations: [NaruDetailsComponent], + providers: [ + { + provide: PublicService, + useValue: mockPublicService, + }, + ], + }).compileComponents(); + + fixture = TestBed.createComponent(NaruDetailsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/public/application/submission/naru-details/naru-details.component.ts b/portal-frontend/src/app/features/public/application/submission/naru-details/naru-details.component.ts new file mode 100644 index 0000000000..e593aff636 --- /dev/null +++ b/portal-frontend/src/app/features/public/application/submission/naru-details/naru-details.component.ts @@ -0,0 +1,30 @@ +import { Component, Input } from '@angular/core'; +import { Router } from '@angular/router'; +import { ApplicationDocumentDto } from '../../../../../services/application-document/application-document.dto'; +import { ApplicationDocumentService } from '../../../../../services/application-document/application-document.service'; +import { PublicApplicationSubmissionDto } from '../../../../../services/public/public.dto'; +import { PublicService } from '../../../../../services/public/public.service'; +import { DOCUMENT_TYPE } from '../../../../../shared/dto/document.dto'; + +@Component({ + selector: 'app-naru-details[applicationSubmission]', + templateUrl: './naru-details.component.html', + styleUrls: ['./naru-details.component.scss'], +}) +export class NaruDetailsComponent { + proposalMap: ApplicationDocumentDto[] = []; + + @Input() applicationSubmission!: PublicApplicationSubmissionDto; + @Input() set applicationDocuments(documents: ApplicationDocumentDto[]) { + this.proposalMap = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.PROPOSAL_MAP); + } + + constructor(private router: Router, private publicService: PublicService) {} + + async openFile(uuid: string) { + const res = await this.publicService.getApplicationFileUrl(this.applicationSubmission.fileNumber, uuid); + if (res) { + window.open(res?.url, '_blank'); + } + } +} diff --git a/portal-frontend/src/app/features/public/application/submission/nfu-details/nfu-details.component.html b/portal-frontend/src/app/features/public/application/submission/nfu-details/nfu-details.component.html new file mode 100644 index 0000000000..504b5a76c5 --- /dev/null +++ b/portal-frontend/src/app/features/public/application/submission/nfu-details/nfu-details.component.html @@ -0,0 +1,96 @@ +<div *ngIf="applicationSubmission" class="review-table"> + <div class="subheading2 grid-1">How many hectares are proposed for non-farm use? (hectares)</div> + <div class="grid-double"> + {{ applicationSubmission.nfuHectares }} + </div> + <div class="subheading2 grid-1">What is the purpose of the proposal?</div> + <div class="grid-double"> + {{ applicationSubmission.purpose }} + + <app-no-data *ngIf="!applicationSubmission.purpose"></app-no-data> + </div> + <div class="subheading2 grid-1">Could this proposal be accommodated on lands outside of the ALR?</div> + <div class="grid-double"> + {{ applicationSubmission.nfuOutsideLands }} + <app-no-data *ngIf="!applicationSubmission.nfuOutsideLands"></app-no-data> + </div> + <div class="subheading2 grid-1">Does the proposal support agriculture in the short or long term?</div> + <div class="grid-double"> + {{ applicationSubmission.nfuAgricultureSupport }} + <app-no-data *ngIf="!applicationSubmission.nfuAgricultureSupport"></app-no-data> + </div> + <div class="subheading2 grid-1">Proposal Map / Site Plan</div> + <div class="grid-double"> + <a *ngFor="let map of proposalMap" (click)="openFile(map.uuid)"> + {{ map.fileName }} + </a> + <app-no-data *ngIf="proposalMap.length === 0"></app-no-data> + </div> + <div class="subheading2 grid-1"> + Do you need to import any fill to construct or conduct the proposed non-farm use? + </div> + <div class="grid-double"> + <span *ngIf="applicationSubmission.nfuWillImportFill !== null">{{ + applicationSubmission.nfuWillImportFill ? 'Yes' : 'No' + }}</span> + <app-no-data *ngIf="applicationSubmission.nfuWillImportFill === null"></app-no-data> + </div> + <ng-container *ngIf="applicationSubmission.nfuWillImportFill === true"> + <div class="full-width"> + <hr /> + </div> + <div class="full-width"> + <h4>Soil and Fill Components</h4> + </div> + <div class="subheading2 grid-1">Describe the type and amount of fill proposed to be placed.</div> + <div class="grid-double"> + {{ applicationSubmission.nfuFillTypeDescription }} + <app-no-data *ngIf="!applicationSubmission.nfuFillTypeDescription"></app-no-data> + </div> + <div class="subheading2 grid-1">Briefly describe the origin and quality of fill.</div> + <div class="grid-double"> + {{ applicationSubmission.nfuFillOriginDescription }} + <app-no-data *ngIf="!applicationSubmission.nfuFillOriginDescription"></app-no-data> + </div> + <div class="subheading1 full-width">Fill to be Placed</div> + <div class="full-width soil-table"> + <div class="grid-1"><strong>Volume</strong></div> + <div class="grid-2"> + {{ applicationSubmission.nfuFillVolume }} + <span *ngIf="applicationSubmission.nfuFillVolume !== null">m<sup>3</sup></span> + <app-no-data *ngIf="applicationSubmission.nfuFillVolume === null"></app-no-data> + </div> + <div class="grid-1"><strong>Area</strong></div> + <div class="grid-2"> + {{ applicationSubmission.nfuTotalFillArea }} + <span *ngIf="applicationSubmission.nfuTotalFillArea !== null">m<sup>2</sup></span> + <app-no-data *ngIf="applicationSubmission.nfuTotalFillArea === null"></app-no-data> + </div> + <div class="grid-1"><strong>Maximum Depth</strong></div> + <div class="grid-2"> + {{ applicationSubmission.nfuMaxFillDepth }} + <span *ngIf="applicationSubmission.nfuMaxFillDepth !== null">m</span> + <app-no-data *ngIf="applicationSubmission.nfuMaxFillDepth === null"></app-no-data> + </div> + <div class="grid-1"><strong>Average Depth</strong></div> + <div class="grid-2"> + {{ applicationSubmission.nfuAverageFillDepth }} + <span *ngIf="applicationSubmission.nfuAverageFillDepth !== null">m</span> + <app-no-data *ngIf="applicationSubmission.nfuAverageFillDepth === null"></app-no-data> + </div> + </div> + <div class="full-width"> + <span class="subheading1">Project Duration</span> + </div> + <div class="subheading2 grid-1">Duration</div> + <div class="grid-double"> + {{ applicationSubmission.nfuProjectDurationUnit }} + <app-no-data *ngIf="!applicationSubmission.nfuProjectDurationUnit"></app-no-data> + </div> + <div class="subheading2 grid-1">Length</div> + <div class="grid-double"> + {{ applicationSubmission.nfuProjectDurationAmount }} + <app-no-data *ngIf="!applicationSubmission.nfuProjectDurationAmount"></app-no-data> + </div> + </ng-container> +</div> diff --git a/portal-frontend/src/app/features/public/application/submission/nfu-details/nfu-details.component.scss b/portal-frontend/src/app/features/public/application/submission/nfu-details/nfu-details.component.scss new file mode 100644 index 0000000000..b2b6b90127 --- /dev/null +++ b/portal-frontend/src/app/features/public/application/submission/nfu-details/nfu-details.component.scss @@ -0,0 +1,7 @@ +.soil-table { + display: grid; + grid-template-columns: max-content max-content; + overflow-x: auto; + grid-column-gap: 36px; + grid-row-gap: 12px; +} diff --git a/portal-frontend/src/app/features/public/application/submission/nfu-details/nfu-details.component.spec.ts b/portal-frontend/src/app/features/public/application/submission/nfu-details/nfu-details.component.spec.ts new file mode 100644 index 0000000000..0dcc20a8ae --- /dev/null +++ b/portal-frontend/src/app/features/public/application/submission/nfu-details/nfu-details.component.spec.ts @@ -0,0 +1,33 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { PublicService } from '../../../../../services/public/public.service'; + +import { NfuDetailsComponent } from './nfu-details.component'; + +describe('NfuDetailsComponent', () => { + let component: NfuDetailsComponent; + let fixture: ComponentFixture<NfuDetailsComponent>; + let mockPublicService: DeepMocked<PublicService>; + + beforeEach(async () => { + mockPublicService = createMock(); + + await TestBed.configureTestingModule({ + declarations: [NfuDetailsComponent], + providers: [ + { + provide: PublicService, + useValue: mockPublicService, + }, + ], + }).compileComponents(); + + fixture = TestBed.createComponent(NfuDetailsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/public/application/submission/nfu-details/nfu-details.component.ts b/portal-frontend/src/app/features/public/application/submission/nfu-details/nfu-details.component.ts new file mode 100644 index 0000000000..d0642d7090 --- /dev/null +++ b/portal-frontend/src/app/features/public/application/submission/nfu-details/nfu-details.component.ts @@ -0,0 +1,31 @@ +import { Component, Input } from '@angular/core'; +import { Router } from '@angular/router'; +import { ApplicationDocumentDto } from '../../../../../services/application-document/application-document.dto'; +import { ApplicationDocumentService } from '../../../../../services/application-document/application-document.service'; +import { PublicApplicationSubmissionDto } from '../../../../../services/public/public.dto'; +import { PublicService } from '../../../../../services/public/public.service'; +import { DOCUMENT_TYPE } from '../../../../../shared/dto/document.dto'; + +@Component({ + selector: 'app-nfu-details[applicationSubmission]', + templateUrl: './nfu-details.component.html', + styleUrls: ['./nfu-details.component.scss'], +}) +export class NfuDetailsComponent { + @Input() applicationSubmission!: PublicApplicationSubmissionDto; + + @Input() set applicationDocuments(documents: ApplicationDocumentDto[]) { + this.proposalMap = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.PROPOSAL_MAP); + } + + proposalMap: ApplicationDocumentDto[] = []; + + constructor(private router: Router, private publicService: PublicService) {} + + async openFile(uuid: string) { + const res = await this.publicService.getApplicationFileUrl(this.applicationSubmission.fileNumber, uuid); + if (res) { + window.open(res?.url, '_blank'); + } + } +} diff --git a/portal-frontend/src/app/features/public/application/submission/parcel/parcel.component.html b/portal-frontend/src/app/features/public/application/submission/parcel/parcel.component.html new file mode 100644 index 0000000000..782f41bf2a --- /dev/null +++ b/portal-frontend/src/app/features/public/application/submission/parcel/parcel.component.html @@ -0,0 +1,79 @@ +<h3 class="flex-item"> + {{ pageTitle }} +</h3> +<div class="review-table"> + <ng-container *ngFor="let parcel of parcels; let parcelInd = index"> + <div class="full-width flex-space-between-wrap"> + <h4>Parcel {{ parcelInd + 1 }}: Parcel and Owner Information</h4> + </div> + <div class="full-width subheading1">Parcel Information</div> + <div class="subheading2 grid-1">Ownership Type</div> + <div class="grid-double"> + {{ parcel.ownershipType?.label }} + <app-no-data *ngIf="!parcel.ownershipType"></app-no-data> + </div> + <div class="subheading2 grid-1">Legal Description</div> + <div class="grid-double"> + {{ parcel.legalDescription }} + </div> + <div class="subheading2 grid-1">Area (Hectares)</div> + <div class="grid-double"> + {{ parcel.mapAreaHectares }} + </div> + <div class="subheading2 grid-1"> + PID {{ parcel.ownershipType?.code === PARCEL_OWNERSHIP_TYPES.CROWN ? '(optional)' : '' }} + </div> + <div class="grid-double"> + <span *ngIf="parcel.pid">{{ parcel.pid | mask : '000-000-000' }}</span> + <app-no-data *ngIf="!parcel.pid"></app-no-data> + </div> + <ng-container *ngIf="parcel.ownershipType?.code === PARCEL_OWNERSHIP_TYPES.CROWN"> + <div class="subheading2 grid-1">PIN (optional)</div> + <div class="grid-double"> + {{ parcel.pin }} + <app-no-data *ngIf="!parcel.pin"></app-no-data> + </div> + </ng-container> + <ng-container *ngIf="parcel.ownershipType?.code === PARCEL_OWNERSHIP_TYPES.FEE_SIMPLE"> + <div class="subheading2 grid-1">Purchase Date</div> + <div class="grid-double"> + {{ parcel.purchasedDate | date }} + <app-no-data *ngIf="!parcel.purchasedDate"> </app-no-data> + </div> + </ng-container> + <div class="subheading2 grid-1">Farm Classification</div> + <div class="grid-double"> + <span *ngIf="parcel.isFarm !== null">{{ parcel.isFarm ? 'Yes' : 'No' }}</span> + <app-no-data *ngIf="parcel.isFarm === null"></app-no-data> + </div> + <div class="subheading2 grid-1">Civic Address</div> + <div class="grid-double"> + {{ parcel.civicAddress }} + <app-no-data *ngIf="!parcel.civicAddress"></app-no-data> + </div> + <ng-container *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN"> + <div class="subheading2 grid-1">Crown Selection</div> + <div class="grid-double"> + <span class="crown-land" *ngIf="parcel.crownLandOwnerType !== null">{{ parcel.crownLandOwnerType }}</span> + <app-no-data *ngIf="parcel.crownLandOwnerType === null"></app-no-data> + </div> + </ng-container> + <div class="full-width owner-information"> + <div class="subheading2">Land Owner(s)</div> + <div class="subheading2" *ngIf="parcel.ownershipTypeCode !== PARCEL_OWNERSHIP_TYPES.CROWN">Organization</div> + <div class="subheading2" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN"> + Ministry/ Department + </div> + <ng-container *ngFor="let owner of parcel.owners"> + <div>{{ owner.displayName }}</div> + <div> + <span *ngIf="owner.organizationName"></span>{{ owner.organizationName }} + <app-no-data [showRequired]="false" *ngIf="!owner.organizationName"></app-no-data> + </div> + </ng-container> + <div class="full-width"> + <app-no-data *ngIf="parcel.owners.length === 0"></app-no-data> + </div> + </div> + </ng-container> +</div> diff --git a/portal-frontend/src/app/features/public/application/submission/parcel/parcel.component.scss b/portal-frontend/src/app/features/public/application/submission/parcel/parcel.component.scss new file mode 100644 index 0000000000..a706f903ba --- /dev/null +++ b/portal-frontend/src/app/features/public/application/submission/parcel/parcel.component.scss @@ -0,0 +1,39 @@ +@use '../../../../../../styles/functions' as *; + +.owner-information { + display: grid; + grid-template-columns: max-content max-content; + overflow-x: auto; + grid-column-gap: rem(36); + grid-row-gap: rem(12); + + .full-width { + grid-column: 1/3; + } +} + +.review-table { + grid-template-columns: 1fr 1fr !important; + + .full-width { + grid-column: 1/3; + } + + .edit-button { + grid-column: 1/3; + } + + @media screen and (min-width: $tabletBreakpoint) { + .full-width { + grid-column: 1/5; + } + + .edit-button { + grid-column: 1/5; + } + } +} + +.crown-land { + text-transform: capitalize; +} diff --git a/portal-frontend/src/app/features/public/application/submission/parcel/parcel.component.spec.ts b/portal-frontend/src/app/features/public/application/submission/parcel/parcel.component.spec.ts new file mode 100644 index 0000000000..16768f44d8 --- /dev/null +++ b/portal-frontend/src/app/features/public/application/submission/parcel/parcel.component.spec.ts @@ -0,0 +1,40 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { Router } from '@angular/router'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { PublicService } from '../../../../../services/public/public.service'; +import { ParcelComponent } from './parcel.component'; + +describe('ParcelComponent', () => { + let component: ParcelComponent; + let fixture: ComponentFixture<ParcelComponent>; + + let mockPublicService: DeepMocked<PublicService>; + + beforeEach(async () => { + mockPublicService = createMock(); + await TestBed.configureTestingModule({ + declarations: [ParcelComponent], + providers: [ + { + provide: PublicService, + useValue: mockPublicService, + }, + { + provides: Router, + useValue: {}, + }, + ], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(ParcelComponent); + component = fixture.componentInstance; + component.applicationSubmission = {} as any; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/public/application/submission/parcel/parcel.component.ts b/portal-frontend/src/app/features/public/application/submission/parcel/parcel.component.ts new file mode 100644 index 0000000000..0a4a1d2da5 --- /dev/null +++ b/portal-frontend/src/app/features/public/application/submission/parcel/parcel.component.ts @@ -0,0 +1,37 @@ +import { Component, Input } from '@angular/core'; +import { Subject } from 'rxjs'; +import { + ApplicationParcelDto, + PARCEL_OWNERSHIP_TYPE, +} from '../../../../../services/application-parcel/application-parcel.dto'; +import { PublicApplicationSubmissionDto } from '../../../../../services/public/public.dto'; + +@Component({ + selector: 'app-parcel', + templateUrl: './parcel.component.html', + styleUrls: ['./parcel.component.scss'], +}) +export class ParcelComponent { + $destroy = new Subject<void>(); + + @Input() applicationSubmission!: PublicApplicationSubmissionDto; + @Input() parcels: ApplicationParcelDto[] = []; + + PARCEL_OWNERSHIP_TYPES = PARCEL_OWNERSHIP_TYPE; + pageTitle: string = 'Identify Parcel(s) Under Application'; + + fileId = ''; + submissionUuid = ''; + + constructor() {} + + ngOnInit(): void { + this.fileId = this.applicationSubmission.fileNumber; + this.submissionUuid = this.applicationSubmission.uuid; + } + + ngOnDestroy(): void { + this.$destroy.next(); + this.$destroy.complete(); + } +} diff --git a/portal-frontend/src/app/features/public/application/submission/pfrs-details/pfrs-details.component.html b/portal-frontend/src/app/features/public/application/submission/pfrs-details/pfrs-details.component.html new file mode 100644 index 0000000000..71c70b13b9 --- /dev/null +++ b/portal-frontend/src/app/features/public/application/submission/pfrs-details/pfrs-details.component.html @@ -0,0 +1,213 @@ +<div *ngIf="applicationSubmission" class="review-table"> + <div class="subheading2 grid-1"> + Has the ALC previously received an application or Notice of Intent for this proposal? + </div> + <div class="grid-double"> + <span *ngIf="applicationSubmission.soilIsFollowUp !== null"> + {{ applicationSubmission.soilIsFollowUp ? 'Yes' : 'No' }} + </span> + <app-no-data *ngIf="applicationSubmission.soilIsFollowUp === null"></app-no-data> + </div> + + <div *ngIf="applicationSubmission.soilIsFollowUp" class="subheading2 grid-1">Application or NOI ID</div> + <div *ngIf="applicationSubmission.soilIsFollowUp" class="grid-double"> + {{ applicationSubmission.soilFollowUpIDs }} + <app-no-data *ngIf="!applicationSubmission.soilFollowUpIDs"></app-no-data> + </div> + + <div class="subheading2 grid-1">What is the purpose of the proposal?</div> + <div class="grid-double"> + {{ applicationSubmission.purpose }} + <app-no-data *ngIf="!applicationSubmission.purpose"></app-no-data> + </div> + + <div class="full-width soil-table"> + <div></div> + <div><strong>Soil to be Removed</strong></div> + <div><strong>Fill to be Placed</strong></div> + + <div><strong>Volume</strong></div> + <div> + {{ applicationSubmission.soilToRemoveVolume }} + <span *ngIf="applicationSubmission.soilToRemoveVolume !== null">m<sup>3</sup></span> + <app-no-data *ngIf="applicationSubmission.soilToRemoveVolume === null"></app-no-data> + </div> + <div> + {{ applicationSubmission.soilToPlaceVolume }} + <span *ngIf="applicationSubmission.soilToPlaceVolume !== null">m<sup>3</sup></span> + <app-no-data *ngIf="applicationSubmission.soilToPlaceVolume === null"></app-no-data> + </div> + + <div><strong>Area</strong></div> + <div> + {{ applicationSubmission.soilToRemoveArea }} + <span *ngIf="applicationSubmission.soilToRemoveArea !== null">m<sup>2</sup></span> + <app-no-data *ngIf="applicationSubmission.soilToRemoveArea === null"></app-no-data> + </div> + <div> + {{ applicationSubmission.soilToPlaceArea }} + <span *ngIf="applicationSubmission.soilToPlaceArea !== null">m<sup>2</sup></span> + <app-no-data *ngIf="applicationSubmission.soilToPlaceArea === null"></app-no-data> + </div> + + <div><strong>Maximum Depth</strong></div> + <div> + {{ applicationSubmission.soilToRemoveMaximumDepth }} + <span *ngIf="applicationSubmission.soilToRemoveMaximumDepth !== null">m</span> + <app-no-data *ngIf="applicationSubmission.soilToRemoveMaximumDepth === null"></app-no-data> + </div> + <div> + {{ applicationSubmission.soilToPlaceMaximumDepth }} + <span *ngIf="applicationSubmission.soilToPlaceMaximumDepth !== null">m</span> + <app-no-data *ngIf="applicationSubmission.soilToPlaceMaximumDepth === null"></app-no-data> + </div> + + <div><strong>Average Depth</strong></div> + <div> + {{ applicationSubmission.soilToRemoveAverageDepth }} + <span *ngIf="applicationSubmission.soilToRemoveAverageDepth !== null">m</span> + <app-no-data *ngIf="applicationSubmission.soilToRemoveAverageDepth === null"></app-no-data> + </div> + <div> + {{ applicationSubmission.soilToPlaceAverageDepth }} + <span *ngIf="applicationSubmission.soilToPlaceAverageDepth !== null">m</span> + <app-no-data *ngIf="applicationSubmission.soilToPlaceAverageDepth === null"></app-no-data> + </div> + + <div class="spacer-row"></div> + + <div></div> + <div><strong>Soil already Removed</strong></div> + <div><strong>Fill already Placed</strong></div> + + <div><strong>Volume</strong></div> + <div> + {{ applicationSubmission.soilAlreadyRemovedVolume }} + <span *ngIf="applicationSubmission.soilAlreadyRemovedVolume !== null">m<sup>3</sup></span> + <app-no-data *ngIf="applicationSubmission.soilAlreadyRemovedVolume === null"></app-no-data> + </div> + <div> + {{ applicationSubmission.soilAlreadyPlacedVolume }} + <span *ngIf="applicationSubmission.soilAlreadyPlacedVolume !== null">m<sup>3</sup></span> + <app-no-data *ngIf="applicationSubmission.soilAlreadyPlacedVolume === null"></app-no-data> + </div> + + <div><strong>Area</strong></div> + <div> + {{ applicationSubmission.soilAlreadyRemovedArea }} + <span *ngIf="applicationSubmission.soilAlreadyRemovedArea !== null">m<sup>2</sup></span> + <app-no-data *ngIf="applicationSubmission.soilAlreadyRemovedArea === null"></app-no-data> + </div> + <div> + {{ applicationSubmission.soilAlreadyPlacedArea }} + <span *ngIf="applicationSubmission.soilAlreadyPlacedArea !== null">m<sup>2</sup></span> + <app-no-data *ngIf="applicationSubmission.soilAlreadyPlacedArea === null"></app-no-data> + </div> + + <div><strong>Maximum Depth</strong></div> + <div> + {{ applicationSubmission.soilAlreadyRemovedMaximumDepth }} + <span *ngIf="applicationSubmission.soilAlreadyRemovedMaximumDepth !== null">m</span> + <app-no-data *ngIf="applicationSubmission.soilAlreadyRemovedMaximumDepth === null"></app-no-data> + </div> + <div> + {{ applicationSubmission.soilAlreadyPlacedMaximumDepth }} + <span *ngIf="applicationSubmission.soilAlreadyPlacedMaximumDepth !== null">m</span> + <app-no-data *ngIf="applicationSubmission.soilAlreadyPlacedMaximumDepth === null"></app-no-data> + </div> + + <div><strong>Average Depth</strong></div> + <div> + {{ applicationSubmission.soilAlreadyRemovedAverageDepth }} + <span *ngIf="applicationSubmission.soilAlreadyRemovedAverageDepth !== null">m</span> + <app-no-data *ngIf="applicationSubmission.soilAlreadyRemovedAverageDepth === null"></app-no-data> + </div> + <div> + {{ applicationSubmission.soilAlreadyPlacedAverageDepth }} + <span *ngIf="applicationSubmission.soilAlreadyPlacedAverageDepth !== null">m</span> + <app-no-data *ngIf="applicationSubmission.soilAlreadyPlacedAverageDepth === null"></app-no-data> + </div> + </div> + + <div class="full-width"> + <span class="subheading1">Project Duration</span> + </div> + <div class="subheading2 grid-1">Duration</div> + <div class="grid-double"> + {{ applicationSubmission.soilProjectDurationUnit }} + <app-no-data *ngIf="!applicationSubmission.soilProjectDurationUnit"></app-no-data> + </div> + <div class="subheading2 grid-1">Length</div> + <div class="grid-double"> + {{ applicationSubmission.soilProjectDurationAmount }} + <app-no-data *ngIf="!applicationSubmission.soilProjectDurationAmount"></app-no-data> + </div> + + <div class="subheading2 grid-1">Describe the type, origin and quality of fill proposed to be placed.</div> + <div class="grid-double"> + {{ applicationSubmission.soilFillTypeToPlace }} + <app-no-data *ngIf="!applicationSubmission.soilFillTypeToPlace"></app-no-data> + </div> + + <div class="subheading2 grid-1">Describe the type of soil proposed to be removed.</div> + <div class="grid-double"> + {{ applicationSubmission.soilTypeRemoved }} + <app-no-data *ngIf="!applicationSubmission.soilTypeRemoved"></app-no-data> + </div> + + <div class="subheading2 grid-1"> + What alternative measures have you considered or attempted before proposing to place fill? + </div> + <div class="grid-double"> + {{ applicationSubmission.soilAlternativeMeasures }} + <app-no-data *ngIf="!applicationSubmission.soilAlternativeMeasures"></app-no-data> + </div> + + <div class="subheading2 grid-1">What steps will be taken to reduce impacts to surrounding agricultural land?</div> + <div class="grid-double"> + {{ applicationSubmission.soilReduceNegativeImpacts }} + <app-no-data *ngIf="!applicationSubmission.soilReduceNegativeImpacts"></app-no-data> + </div> + + <div class="subheading2 grid-1">Proposal Map / Site Plan</div> + <div class="grid-double"> + <a *ngFor="let map of proposalMap" (click)="openFile(map.uuid)"> + {{ map.fileName }} + </a> + <app-no-data *ngIf="proposalMap.length === 0"></app-no-data> + </div> + + <div class="subheading2 grid-1">Cross Sections</div> + <div class="grid-double"> + <a *ngFor="let file of crossSections" (click)="openFile(file.uuid)"> + {{ file.fileName }} + </a> + <app-no-data *ngIf="crossSections.length === 0"></app-no-data> + </div> + + <div class="subheading2 grid-1">Reclamation Plan</div> + <div class="grid-double"> + <a *ngFor="let file of crossSections" (click)="openFile(file.uuid)"> + {{ file.fileName }} + </a> + <app-no-data *ngIf="crossSections.length === 0"></app-no-data> + </div> + + <div class="subheading2 grid-1">Is your proposal for aggregate extraction or placer mining?</div> + <div class="grid-double"> + <span *ngIf="applicationSubmission.soilIsExtractionOrMining !== null"> + {{ applicationSubmission.soilIsExtractionOrMining ? 'Yes' : 'No' }} + </span> + <app-no-data *ngIf="applicationSubmission.soilIsExtractionOrMining === null"></app-no-data> + </div> + + <div *ngIf="applicationSubmission.soilIsExtractionOrMining" class="subheading2 grid-1"> + Have you submitted a Notice of Work to the Ministry of Energy, Mines and Low Carbon Innovation (EMLI)? + </div> + <div *ngIf="applicationSubmission.soilIsExtractionOrMining" class="grid-double"> + <span *ngIf="applicationSubmission.soilHasSubmittedNotice !== null"> + {{ applicationSubmission.soilHasSubmittedNotice ? 'Yes' : 'No' }} + </span> + <app-no-data *ngIf="applicationSubmission.soilHasSubmittedNotice === null"></app-no-data> + </div> +</div> diff --git a/portal-frontend/src/app/features/public/application/submission/pfrs-details/pfrs-details.component.scss b/portal-frontend/src/app/features/public/application/submission/pfrs-details/pfrs-details.component.scss new file mode 100644 index 0000000000..7fa4e7417f --- /dev/null +++ b/portal-frontend/src/app/features/public/application/submission/pfrs-details/pfrs-details.component.scss @@ -0,0 +1,14 @@ +@use '../../../../../../styles/functions' as *; + +.soil-table { + display: grid; + grid-template-columns: max-content max-content max-content; + overflow-x: auto; + grid-column-gap: rem(36); + grid-row-gap: rem(12); + + .spacer-row { + grid-column: 1/4; + height: rem(16); + } +} diff --git a/portal-frontend/src/app/features/public/application/submission/pfrs-details/pfrs-details.component.spec.ts b/portal-frontend/src/app/features/public/application/submission/pfrs-details/pfrs-details.component.spec.ts new file mode 100644 index 0000000000..a4aebe95c0 --- /dev/null +++ b/portal-frontend/src/app/features/public/application/submission/pfrs-details/pfrs-details.component.spec.ts @@ -0,0 +1,33 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { PublicService } from '../../../../../services/public/public.service'; + +import { PfrsDetailsComponent } from './pfrs-details.component'; + +describe('PfrsDetailsComponent', () => { + let component: PfrsDetailsComponent; + let fixture: ComponentFixture<PfrsDetailsComponent>; + let mockPublicService: DeepMocked<PublicService>; + + beforeEach(async () => { + mockPublicService = createMock(); + + await TestBed.configureTestingModule({ + declarations: [PfrsDetailsComponent], + providers: [ + { + provide: PublicService, + useValue: mockPublicService, + }, + ], + }).compileComponents(); + + fixture = TestBed.createComponent(PfrsDetailsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/public/application/submission/pfrs-details/pfrs-details.component.ts b/portal-frontend/src/app/features/public/application/submission/pfrs-details/pfrs-details.component.ts new file mode 100644 index 0000000000..da1bd6a17b --- /dev/null +++ b/portal-frontend/src/app/features/public/application/submission/pfrs-details/pfrs-details.component.ts @@ -0,0 +1,34 @@ +import { Component, Input } from '@angular/core'; +import { Router } from '@angular/router'; +import { ApplicationDocumentDto } from '../../../../../services/application-document/application-document.dto'; +import { ApplicationDocumentService } from '../../../../../services/application-document/application-document.service'; +import { PublicApplicationSubmissionDto } from '../../../../../services/public/public.dto'; +import { PublicService } from '../../../../../services/public/public.service'; +import { DOCUMENT_TYPE } from '../../../../../shared/dto/document.dto'; +import { PublicApplicationComponent } from '../../public-application.component'; + +@Component({ + selector: 'app-pfrs-details[applicationSubmission]', + templateUrl: './pfrs-details.component.html', + styleUrls: ['./pfrs-details.component.scss'], +}) +export class PfrsDetailsComponent { + @Input() applicationSubmission!: PublicApplicationSubmissionDto; + + @Input() set applicationDocuments(documents: ApplicationDocumentDto[]) { + this.crossSections = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.CROSS_SECTIONS); + this.proposalMap = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.PROPOSAL_MAP); + } + + crossSections: ApplicationDocumentDto[] = []; + proposalMap: ApplicationDocumentDto[] = []; + + constructor(private router: Router, private publicService: PublicService) {} + + async openFile(uuid: string) { + const res = await this.publicService.getApplicationFileUrl(this.applicationSubmission.fileNumber, uuid); + if (res) { + window.open(res?.url, '_blank'); + } + } +} diff --git a/portal-frontend/src/app/features/public/application/submission/pofo-details/pofo-details.component.html b/portal-frontend/src/app/features/public/application/submission/pofo-details/pofo-details.component.html new file mode 100644 index 0000000000..37b284d75b --- /dev/null +++ b/portal-frontend/src/app/features/public/application/submission/pofo-details/pofo-details.component.html @@ -0,0 +1,129 @@ +<div *ngIf="applicationSubmission" class="review-table"> + <div class="subheading2 grid-1"> + Has the ALC previously received an application or Notice of Intent for this proposal? + </div> + <div class="grid-double"> + <span *ngIf="applicationSubmission.soilIsFollowUp !== null"> + {{ applicationSubmission.soilIsFollowUp ? 'Yes' : 'No' }} + </span> + <app-no-data *ngIf="applicationSubmission.soilIsFollowUp === null"></app-no-data> + </div> + + <div *ngIf="applicationSubmission.soilIsFollowUp" class="subheading2 grid-1">Application or NOI ID</div> + <div *ngIf="applicationSubmission.soilIsFollowUp" class="grid-double"> + {{ applicationSubmission.soilFollowUpIDs }} + <app-no-data *ngIf="!applicationSubmission.soilFollowUpIDs"></app-no-data> + </div> + + <div class="subheading2 grid-1">What is the purpose of the proposal?</div> + <div class="grid-double"> + {{ applicationSubmission.purpose }} + <app-no-data *ngIf="!applicationSubmission.purpose"></app-no-data> + </div> + + <div class="subheading1 full-width">Fill to be Placed</div> + <div class="full-width soil-table"> + <div class="grid-1"><strong>Volume</strong></div> + <div class="grid-2"> + {{ applicationSubmission.soilToPlaceVolume }} + <span *ngIf="applicationSubmission.soilToPlaceVolume">m<sup>3</sup></span> + <app-no-data *ngIf="!applicationSubmission.soilToPlaceVolume"></app-no-data> + </div> + <div class="grid-1"><strong>Area</strong></div> + <div class="grid-2"> + {{ applicationSubmission.soilToPlaceArea }} + <span *ngIf="applicationSubmission.soilToPlaceArea">m<sup>2</sup></span> + <app-no-data *ngIf="!applicationSubmission.soilToPlaceArea"></app-no-data> + </div> + <div class="grid-1"><strong>Maximum Depth</strong></div> + <div class="grid-2"> + {{ applicationSubmission.soilToPlaceMaximumDepth }} + <span *ngIf="applicationSubmission.soilToPlaceMaximumDepth">m</span> + <app-no-data *ngIf="!applicationSubmission.soilToPlaceMaximumDepth"></app-no-data> + </div> + <div class="grid-1"><strong>Average Depth</strong></div> + <div class="grid-2"> + {{ applicationSubmission.soilToPlaceAverageDepth }} + <span *ngIf="applicationSubmission.soilToPlaceAverageDepth">m</span> + <app-no-data *ngIf="!applicationSubmission.soilToPlaceAverageDepth"></app-no-data> + </div> + </div> + + <div class="subheading1 full-width">Fill already Placed</div> + <div class="full-width soil-table"> + <div class="grid-1"><strong>Volume</strong></div> + <div class="grid-2"> + {{ applicationSubmission.soilAlreadyPlacedVolume }} + <span *ngIf="applicationSubmission.soilAlreadyPlacedVolume !== null">m<sup>3</sup></span> + <app-no-data *ngIf="applicationSubmission.soilAlreadyPlacedVolume === null"></app-no-data> + </div> + <div class="grid-1"><strong>Area</strong></div> + <div class="grid-2"> + {{ applicationSubmission.soilAlreadyPlacedArea }} + <span *ngIf="applicationSubmission.soilAlreadyPlacedArea !== null">m<sup>2</sup></span> + <app-no-data *ngIf="applicationSubmission.soilAlreadyPlacedArea === null"></app-no-data> + </div> + <div class="grid-1"><strong>Maximum Depth</strong></div> + <div class="grid-2"> + {{ applicationSubmission.soilAlreadyPlacedMaximumDepth }} + <span *ngIf="applicationSubmission.soilAlreadyPlacedMaximumDepth !== null">m</span> + <app-no-data *ngIf="applicationSubmission.soilAlreadyPlacedMaximumDepth === null"></app-no-data> + </div> + <div class="grid-1"><strong>Average Depth</strong></div> + <div class="grid-2"> + {{ applicationSubmission.soilAlreadyPlacedAverageDepth }} + <span *ngIf="applicationSubmission.soilAlreadyPlacedAverageDepth !== null">m</span> + <app-no-data *ngIf="applicationSubmission.soilAlreadyPlacedAverageDepth === null"></app-no-data> + </div> + </div> + + <div class="full-width"> + <span class="subheading1">Project Duration</span> + </div> + <div class="subheading2 grid-1">Duration</div> + <div class="grid-double"> + {{ applicationSubmission.soilProjectDurationUnit }} + <app-no-data *ngIf="!applicationSubmission.soilProjectDurationUnit"></app-no-data> + </div> + <div class="subheading2 grid-1">Length</div> + <div class="grid-double"> + {{ applicationSubmission.soilProjectDurationAmount }} + <app-no-data *ngIf="!applicationSubmission.soilProjectDurationAmount"></app-no-data> + </div> + + <div class="subheading2 grid-1"> + What alternative measures have you considered or attempted before proposing to place fill? + </div> + <div class="grid-double"> + {{ applicationSubmission.soilAlternativeMeasures }} + <app-no-data *ngIf="!applicationSubmission.soilAlternativeMeasures"></app-no-data> + </div> + + <div class="subheading2 grid-1">Describe the type, origin and quality of fill proposed to be placed.</div> + <div class="grid-double"> + {{ applicationSubmission.soilFillTypeToPlace }} + <app-no-data *ngIf="!applicationSubmission.soilFillTypeToPlace"></app-no-data> + </div> + + <div class="subheading2 grid-1">What steps will be taken to reduce impacts to surrounding agricultural land?</div> + <div class="grid-double"> + {{ applicationSubmission.soilReduceNegativeImpacts }} + <app-no-data *ngIf="!applicationSubmission.soilReduceNegativeImpacts"></app-no-data> + </div> + + <div class="subheading2 grid-1">Proposal Map / Site Plan</div> + <div class="grid-double"> + <a *ngFor="let map of proposalMap" (click)="openFile(map.uuid)"> + {{ map.fileName }} + </a> + <app-no-data *ngIf="proposalMap.length === 0"></app-no-data> + </div> + + <div class="subheading2 grid-1">Cross Sections</div> + <div class="grid-double"> + <a *ngFor="let file of crossSections" (click)="openFile(file.uuid)"> + {{ file.fileName }} + </a> + <app-no-data *ngIf="crossSections.length === 0"></app-no-data> + </div> +</div> diff --git a/portal-frontend/src/app/features/public/application/submission/pofo-details/pofo-details.component.scss b/portal-frontend/src/app/features/public/application/submission/pofo-details/pofo-details.component.scss new file mode 100644 index 0000000000..75917bf09c --- /dev/null +++ b/portal-frontend/src/app/features/public/application/submission/pofo-details/pofo-details.component.scss @@ -0,0 +1,9 @@ +@use '../../../../../../styles/functions' as *; + +.soil-table { + display: grid; + grid-template-columns: max-content max-content; + overflow-x: auto; + grid-column-gap: rem(36); + grid-row-gap: rem(12); +} diff --git a/portal-frontend/src/app/features/public/application/submission/pofo-details/pofo-details.component.spec.ts b/portal-frontend/src/app/features/public/application/submission/pofo-details/pofo-details.component.spec.ts new file mode 100644 index 0000000000..853fa7eaa4 --- /dev/null +++ b/portal-frontend/src/app/features/public/application/submission/pofo-details/pofo-details.component.spec.ts @@ -0,0 +1,31 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { DeepMocked } from '@golevelup/ts-jest'; +import { PublicService } from '../../../../../services/public/public.service'; + +import { PofoDetailsComponent } from './pofo-details.component'; + +describe('PofoDetailsComponent', () => { + let component: PofoDetailsComponent; + let fixture: ComponentFixture<PofoDetailsComponent>; + let mockPublicService: DeepMocked<PublicService>; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [PofoDetailsComponent], + providers: [ + { + provide: PublicService, + useValue: mockPublicService, + }, + ], + }).compileComponents(); + + fixture = TestBed.createComponent(PofoDetailsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/public/application/submission/pofo-details/pofo-details.component.ts b/portal-frontend/src/app/features/public/application/submission/pofo-details/pofo-details.component.ts new file mode 100644 index 0000000000..11c3f8cef4 --- /dev/null +++ b/portal-frontend/src/app/features/public/application/submission/pofo-details/pofo-details.component.ts @@ -0,0 +1,33 @@ +import { Component, Input } from '@angular/core'; +import { Router } from '@angular/router'; +import { ApplicationDocumentDto } from '../../../../../services/application-document/application-document.dto'; +import { ApplicationDocumentService } from '../../../../../services/application-document/application-document.service'; +import { PublicApplicationSubmissionDto } from '../../../../../services/public/public.dto'; +import { PublicService } from '../../../../../services/public/public.service'; +import { DOCUMENT_TYPE } from '../../../../../shared/dto/document.dto'; + +@Component({ + selector: 'app-pofo-details[applicationSubmission]', + templateUrl: './pofo-details.component.html', + styleUrls: ['./pofo-details.component.scss'], +}) +export class PofoDetailsComponent { + @Input() applicationSubmission!: PublicApplicationSubmissionDto; + + @Input() set applicationDocuments(documents: ApplicationDocumentDto[]) { + this.crossSections = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.CROSS_SECTIONS); + this.proposalMap = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.PROPOSAL_MAP); + } + + crossSections: ApplicationDocumentDto[] = []; + proposalMap: ApplicationDocumentDto[] = []; + + constructor(private router: Router, private publicService: PublicService) {} + + async openFile(uuid: string) { + const res = await this.publicService.getApplicationFileUrl(this.applicationSubmission.fileNumber, uuid); + if (res) { + window.open(res?.url, '_blank'); + } + } +} diff --git a/portal-frontend/src/app/features/public/application/submission/roso-details/roso-details.component.html b/portal-frontend/src/app/features/public/application/submission/roso-details/roso-details.component.html new file mode 100644 index 0000000000..2856ebcfb2 --- /dev/null +++ b/portal-frontend/src/app/features/public/application/submission/roso-details/roso-details.component.html @@ -0,0 +1,120 @@ +<div *ngIf="applicationSubmission" class="review-table"> + <div class="subheading2 grid-1"> + Has the ALC previously received an application or Notice of Intent for this proposal? + </div> + <div class="grid-double"> + <span *ngIf="applicationSubmission.soilIsFollowUp !== null"> + {{ applicationSubmission.soilIsFollowUp ? 'Yes' : 'No' }} + </span> + <app-no-data *ngIf="applicationSubmission.soilIsFollowUp === null"></app-no-data> + </div> + + <div *ngIf="applicationSubmission.soilIsFollowUp" class="subheading2 grid-1">Application or NOI ID</div> + <div *ngIf="applicationSubmission.soilIsFollowUp" class="grid-double"> + {{ applicationSubmission.soilFollowUpIDs }} + <app-no-data *ngIf="!applicationSubmission.soilFollowUpIDs"></app-no-data> + </div> + + <div class="subheading2 grid-1">What is the purpose of the proposal?</div> + <div class="grid-double"> + {{ applicationSubmission.purpose }} + <app-no-data *ngIf="!applicationSubmission.purpose"></app-no-data> + </div> + + <div class="subheading1 full-width">Soil to be Removed</div> + <div class="full-width soil-table"> + <div class="grid-1"><strong>Volume</strong></div> + <div class="grid-2"> + {{ applicationSubmission.soilToRemoveVolume }} + <span *ngIf="applicationSubmission.soilToRemoveVolume">m<sup>3</sup></span> + <app-no-data *ngIf="!applicationSubmission.soilToRemoveVolume"></app-no-data> + </div> + <div class="grid-1"><strong>Area</strong></div> + <div class="grid-2"> + {{ applicationSubmission.soilToRemoveArea }} <span *ngIf="applicationSubmission.soilToRemoveArea">ha</span> + <app-no-data *ngIf="!applicationSubmission.soilToRemoveArea"></app-no-data> + </div> + <div class="grid-1"><strong>Maximum Depth</strong></div> + <div class="grid-2"> + {{ applicationSubmission.soilToRemoveMaximumDepth }} + <span *ngIf="applicationSubmission.soilToRemoveMaximumDepth">m</span> + <app-no-data *ngIf="!applicationSubmission.soilToRemoveMaximumDepth"></app-no-data> + </div> + <div class="grid-1"><strong>Average Depth</strong></div> + <div class="grid-2"> + {{ applicationSubmission.soilToRemoveAverageDepth }} + <span *ngIf="applicationSubmission.soilToRemoveAverageDepth">m</span> + <app-no-data *ngIf="!applicationSubmission.soilToRemoveAverageDepth"></app-no-data> + </div> + </div> + + <div class="subheading1 full-width">Soil already Removed</div> + <div class="full-width soil-table"> + <div class="grid-1"><strong>Volume</strong></div> + <div class="grid-2"> + {{ applicationSubmission.soilAlreadyRemovedVolume }} + <span *ngIf="applicationSubmission.soilAlreadyRemovedVolume !== null">m<sup>3</sup></span> + <app-no-data *ngIf="applicationSubmission.soilAlreadyRemovedVolume === null"></app-no-data> + </div> + <div class="grid-1"><strong>Area</strong></div> + <div class="grid-2"> + {{ applicationSubmission.soilAlreadyRemovedArea }} + <span *ngIf="applicationSubmission.soilAlreadyRemovedArea !== null">ha</span> + <app-no-data *ngIf="applicationSubmission.soilAlreadyRemovedArea === null"></app-no-data> + </div> + <div class="grid-1"><strong>Maximum Depth</strong></div> + <div class="grid-2"> + {{ applicationSubmission.soilAlreadyRemovedMaximumDepth }} + <span *ngIf="applicationSubmission.soilAlreadyRemovedMaximumDepth !== null">m</span> + <app-no-data *ngIf="applicationSubmission.soilAlreadyRemovedMaximumDepth === null"></app-no-data> + </div> + <div class="grid-1"><strong>Average Depth</strong></div> + <div class="grid-2"> + {{ applicationSubmission.soilAlreadyRemovedAverageDepth }} + <span *ngIf="applicationSubmission.soilAlreadyRemovedAverageDepth !== null">m</span> + <app-no-data *ngIf="applicationSubmission.soilAlreadyRemovedAverageDepth === null"></app-no-data> + </div> + </div> + + <div class="full-width"> + <span class="subheading1">Project Duration</span> + </div> + <div class="subheading2 grid-1">Duration</div> + <div class="grid-double"> + {{ applicationSubmission.soilProjectDurationUnit }} + <app-no-data *ngIf="!applicationSubmission.soilProjectDurationUnit"></app-no-data> + </div> + <div class="subheading2 grid-1">Length</div> + <div class="grid-double"> + {{ applicationSubmission.soilProjectDurationAmount }} + <app-no-data *ngIf="!applicationSubmission.soilProjectDurationAmount"></app-no-data> + </div> + + <div class="subheading2 grid-1">Describe the type of soil proposed to be removed.</div> + <div class="grid-double"> + {{ applicationSubmission.soilTypeRemoved }} + <app-no-data *ngIf="!applicationSubmission.soilTypeRemoved"></app-no-data> + </div> + + <div class="subheading2 grid-1">What steps will be taken to reduce impacts to surrounding agricultural land?</div> + <div class="grid-double"> + {{ applicationSubmission.soilReduceNegativeImpacts }} + <app-no-data *ngIf="!applicationSubmission.soilReduceNegativeImpacts"></app-no-data> + </div> + + <div class="subheading2 grid-1">Proposal Map / Site Plan</div> + <div class="grid-double"> + <a *ngFor="let map of proposalMap" (click)="openFile(map.uuid)"> + {{ map.fileName }} + </a> + <app-no-data *ngIf="proposalMap.length === 0"></app-no-data> + </div> + + <div class="subheading2 grid-1">Cross Sections</div> + <div class="grid-double"> + <a *ngFor="let file of crossSections" (click)="openFile(file.uuid)"> + {{ file.fileName }} + </a> + <app-no-data *ngIf="crossSections.length === 0"></app-no-data> + </div> +</div> diff --git a/portal-frontend/src/app/features/public/application/submission/roso-details/roso-details.component.scss b/portal-frontend/src/app/features/public/application/submission/roso-details/roso-details.component.scss new file mode 100644 index 0000000000..75917bf09c --- /dev/null +++ b/portal-frontend/src/app/features/public/application/submission/roso-details/roso-details.component.scss @@ -0,0 +1,9 @@ +@use '../../../../../../styles/functions' as *; + +.soil-table { + display: grid; + grid-template-columns: max-content max-content; + overflow-x: auto; + grid-column-gap: rem(36); + grid-row-gap: rem(12); +} diff --git a/portal-frontend/src/app/features/public/application/submission/roso-details/roso-details.component.spec.ts b/portal-frontend/src/app/features/public/application/submission/roso-details/roso-details.component.spec.ts new file mode 100644 index 0000000000..1a78d7acee --- /dev/null +++ b/portal-frontend/src/app/features/public/application/submission/roso-details/roso-details.component.spec.ts @@ -0,0 +1,33 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { PublicService } from '../../../../../services/public/public.service'; + +import { RosoDetailsComponent } from './roso-details.component'; + +describe('RosoDetailsComponent', () => { + let component: RosoDetailsComponent; + let fixture: ComponentFixture<RosoDetailsComponent>; + let mockPublicService: DeepMocked<PublicService>; + + beforeEach(async () => { + mockPublicService = createMock(); + + await TestBed.configureTestingModule({ + declarations: [RosoDetailsComponent], + providers: [ + { + provide: PublicService, + useValue: mockPublicService, + }, + ], + }).compileComponents(); + + fixture = TestBed.createComponent(RosoDetailsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/public/application/submission/roso-details/roso-details.component.ts b/portal-frontend/src/app/features/public/application/submission/roso-details/roso-details.component.ts new file mode 100644 index 0000000000..9ab2fc15d9 --- /dev/null +++ b/portal-frontend/src/app/features/public/application/submission/roso-details/roso-details.component.ts @@ -0,0 +1,33 @@ +import { Component, Input } from '@angular/core'; +import { Router } from '@angular/router'; +import { ApplicationDocumentDto } from '../../../../../services/application-document/application-document.dto'; +import { ApplicationDocumentService } from '../../../../../services/application-document/application-document.service'; +import { PublicApplicationSubmissionDto } from '../../../../../services/public/public.dto'; +import { PublicService } from '../../../../../services/public/public.service'; +import { DOCUMENT_TYPE } from '../../../../../shared/dto/document.dto'; + +@Component({ + selector: 'app-roso-details[applicationSubmission]', + templateUrl: './roso-details.component.html', + styleUrls: ['./roso-details.component.scss'], +}) +export class RosoDetailsComponent { + @Input() applicationSubmission!: PublicApplicationSubmissionDto; + + @Input() set applicationDocuments(documents: ApplicationDocumentDto[]) { + this.crossSections = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.CROSS_SECTIONS); + this.proposalMap = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.PROPOSAL_MAP); + } + + crossSections: ApplicationDocumentDto[] = []; + proposalMap: ApplicationDocumentDto[] = []; + + constructor(private router: Router, private publicService: PublicService) {} + + async openFile(uuid: string) { + const res = await this.publicService.getApplicationFileUrl(this.applicationSubmission.fileNumber, uuid); + if (res) { + window.open(res?.url, '_blank'); + } + } +} diff --git a/portal-frontend/src/app/features/public/application/submission/subd-details/subd-details.component.html b/portal-frontend/src/app/features/public/application/submission/subd-details/subd-details.component.html new file mode 100644 index 0000000000..2bcdcaaf9f --- /dev/null +++ b/portal-frontend/src/app/features/public/application/submission/subd-details/subd-details.component.html @@ -0,0 +1,53 @@ +<div *ngIf="applicationSubmission" class="review-table"> + <div class="subheading2 full-width">Proposed Lot Areas</div> + <div class="full-width parcel-table"> + <div class="grid-1 subheading2">#</div> + <div class="grid-2 subheading2">Type</div> + <div class="grid-3 subheading2">Size</div> + <ng-container *ngFor="let lot of applicationSubmission.subdProposedLots; let i = index"> + <div class="grid-1"> + {{ i + 1 }} + </div> + <div class="grid-2"> + {{ lot.type }} + <app-no-data *ngIf="!lot.type"></app-no-data> + </div> + <div class="grid-3"> + {{ lot.size }} + <app-no-data *ngIf="!lot.size"></app-no-data> + </div> + </ng-container> + <div *ngIf="applicationSubmission.subdProposedLots.length === 0" class="full-width"> + <app-no-data></app-no-data> + </div> + </div> + <div class="subheading2 grid-1">What is the purpose of the proposal?</div> + <div class="grid-double"> + {{ applicationSubmission.purpose }} + <app-no-data *ngIf="!applicationSubmission.purpose"></app-no-data> + </div> + <div class="subheading2 grid-1">Why do you believe this parcel is suitable for subdivision?</div> + <div class="grid-double"> + {{ applicationSubmission.subdSuitability }} + <app-no-data *ngIf="!applicationSubmission.subdSuitability"></app-no-data> + </div> + <div class="subheading2 grid-1">Does the proposal support agriculture in the short or long term?</div> + <div class="grid-double"> + {{ applicationSubmission.subdAgricultureSupport }} + <app-no-data *ngIf="!applicationSubmission.subdAgricultureSupport"></app-no-data> + </div> + <div class="subheading2 grid-1">Proposal Map / Site Plan</div> + <div class="grid-double"> + <a *ngFor="let map of proposalMap" (click)="openFile(map.uuid)"> + {{ map.fileName }} + </a> + <app-no-data *ngIf="proposalMap.length === 0"></app-no-data> + </div> + <div class="subheading2 grid-1">Are you applying for subdivision pursuant to the ALC Homesite Severance Policy?</div> + <div class="grid-double"> + <span *ngIf="applicationSubmission.subdIsHomeSiteSeverance !== null"> + {{ applicationSubmission.subdIsHomeSiteSeverance ? 'Yes' : 'No' }} + </span> + <app-no-data *ngIf="applicationSubmission.subdIsHomeSiteSeverance === null"></app-no-data> + </div> +</div> diff --git a/portal-frontend/src/app/features/public/application/submission/subd-details/subd-details.component.scss b/portal-frontend/src/app/features/public/application/submission/subd-details/subd-details.component.scss new file mode 100644 index 0000000000..e50cc03d80 --- /dev/null +++ b/portal-frontend/src/app/features/public/application/submission/subd-details/subd-details.component.scss @@ -0,0 +1,9 @@ +@use '../../../../../../styles/functions' as *; + +.parcel-table { + display: grid; + grid-template-columns: max-content max-content max-content; + overflow-x: auto; + grid-column-gap: rem(36); + grid-row-gap: rem(12); +} diff --git a/portal-frontend/src/app/features/public/application/submission/subd-details/subd-details.component.spec.ts b/portal-frontend/src/app/features/public/application/submission/subd-details/subd-details.component.spec.ts new file mode 100644 index 0000000000..030389b2d3 --- /dev/null +++ b/portal-frontend/src/app/features/public/application/submission/subd-details/subd-details.component.spec.ts @@ -0,0 +1,33 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { PublicService } from '../../../../../services/public/public.service'; + +import { SubdDetailsComponent } from './subd-details.component'; + +describe('SubdDetailsComponent', () => { + let component: SubdDetailsComponent; + let fixture: ComponentFixture<SubdDetailsComponent>; + let mockPublicService: DeepMocked<PublicService>; + + beforeEach(async () => { + mockPublicService = createMock(); + + await TestBed.configureTestingModule({ + declarations: [SubdDetailsComponent], + providers: [ + { + provide: PublicService, + useValue: mockPublicService, + }, + ], + }).compileComponents(); + + fixture = TestBed.createComponent(SubdDetailsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/public/application/submission/subd-details/subd-details.component.ts b/portal-frontend/src/app/features/public/application/submission/subd-details/subd-details.component.ts new file mode 100644 index 0000000000..a2f5720ac4 --- /dev/null +++ b/portal-frontend/src/app/features/public/application/submission/subd-details/subd-details.component.ts @@ -0,0 +1,31 @@ +import { Component, Input } from '@angular/core'; +import { Router } from '@angular/router'; +import { ApplicationDocumentDto } from '../../../../../services/application-document/application-document.dto'; +import { ApplicationDocumentService } from '../../../../../services/application-document/application-document.service'; +import { PublicApplicationSubmissionDto } from '../../../../../services/public/public.dto'; +import { PublicService } from '../../../../../services/public/public.service'; +import { DOCUMENT_TYPE } from '../../../../../shared/dto/document.dto'; + +@Component({ + selector: 'app-subd-details[applicationSubmission]', + templateUrl: './subd-details.component.html', + styleUrls: ['./subd-details.component.scss'], +}) +export class SubdDetailsComponent { + @Input() applicationSubmission!: PublicApplicationSubmissionDto; + + @Input() set applicationDocuments(documents: ApplicationDocumentDto[]) { + this.proposalMap = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.PROPOSAL_MAP); + } + + proposalMap: ApplicationDocumentDto[] = []; + + constructor(private router: Router, private publicService: PublicService) {} + + async openFile(uuid: string) { + const res = await this.publicService.getApplicationFileUrl(this.applicationSubmission.fileNumber, uuid); + if (res) { + window.open(res?.url, '_blank'); + } + } +} diff --git a/portal-frontend/src/app/features/public/application/submission/submission-details.component.html b/portal-frontend/src/app/features/public/application/submission/submission-details.component.html new file mode 100644 index 0000000000..979dd4889e --- /dev/null +++ b/portal-frontend/src/app/features/public/application/submission/submission-details.component.html @@ -0,0 +1,160 @@ +<section> + <app-parcel [applicationSubmission]="applicationSubmission" [parcels]="applicationParcels"></app-parcel> +</section> +<section> + <h3>Primary Contact</h3> + <div *ngIf="applicationSubmission" class="review-table"> + <div class="subheading2 grid-1">Type</div> + <div class="grid-double"> + {{ primaryContact?.type?.label }} + <app-no-data *ngIf="!primaryContact?.type?.label"></app-no-data> + </div> + <div class="subheading2 grid-1">First Name</div> + <div class="grid-double"> + {{ primaryContact?.firstName }} + <app-no-data *ngIf="!primaryContact?.firstName"></app-no-data> + </div> + <div class="subheading2 grid-1">Last Name</div> + <div class="grid-double"> + {{ primaryContact?.lastName }} + <app-no-data *ngIf="!primaryContact?.lastName"></app-no-data> + </div> + <div class="subheading2 grid-1"> + <span + *ngIf="primaryContact?.type?.code !== OWNER_TYPE.CROWN && primaryContact?.type?.code !== OWNER_TYPE.GOVERNMENT" + >Organization (optional)</span + > + <span *ngIf="primaryContact?.type?.code === OWNER_TYPE.CROWN">Ministry/Department Responsible</span> + <span *ngIf="primaryContact?.type?.code === OWNER_TYPE.GOVERNMENT">Department</span> + </div> + <div class="grid-double"> + {{ primaryContact?.organizationName }} + <app-no-data *ngIf="!primaryContact?.organizationName"></app-no-data> + </div> + </div> +</section> +<section> + <h3>Government</h3> + <div *ngIf="applicationSubmission" class="review-table"> + <div class="subheading2 grid-1">Local or First Nation Government</div> + <div class="grid-double"> + {{ localGovernment?.name }} + <app-no-data *ngIf="!localGovernment"></app-no-data> + </div> + </div> +</section> +<section> + <h3>Land Use</h3> + <div *ngIf="applicationSubmission" class="review-table"> + <div class="full-width"> + <h4>Land Use of Parcel(s) under Application</h4> + </div> + <div class="subheading2 grid-1">Describe all agriculture that currently takes place on the parcel(s).</div> + <div class="grid-double"> + {{ applicationSubmission.parcelsAgricultureDescription }} + <app-no-data *ngIf="!applicationSubmission.parcelsAgricultureDescription"></app-no-data> + </div> + <div class="subheading2 grid-1">Describe all agricultural improvements made to the parcel(s).</div> + <div class="grid-double"> + {{ applicationSubmission.parcelsAgricultureImprovementDescription }} + <app-no-data *ngIf="!applicationSubmission.parcelsAgricultureImprovementDescription"></app-no-data> + </div> + <div class="subheading2 grid-1">Describe all other uses that currently take place on the parcel(s).</div> + <div class="grid-double"> + {{ applicationSubmission.parcelsNonAgricultureUseDescription }} + <app-no-data *ngIf="!applicationSubmission.parcelsNonAgricultureUseDescription"></app-no-data> + </div> + <div class="full-width"> + <h4>Land Use of Adjacent Parcels</h4> + </div> + <div class="adjacent-parcels full-width"> + <div class="grid-1 subheading2"></div> + <div class="grid-2 subheading2">Main Land Use Type</div> + <div class="grid-3 subheading2">Specific Activity</div> + <div class="grid-1 subheading2">North</div> + <div class="grid-2"> + {{ applicationSubmission.northLandUseType }} + <app-no-data *ngIf="!applicationSubmission.northLandUseType"></app-no-data> + </div> + <div class="grid-3"> + {{ applicationSubmission.northLandUseTypeDescription }} + <app-no-data *ngIf="!applicationSubmission.northLandUseTypeDescription"></app-no-data> + </div> + <div class="grid-1 subheading2">East</div> + <div class="grid-2"> + {{ applicationSubmission.eastLandUseType }} + <app-no-data *ngIf="!applicationSubmission.eastLandUseType"></app-no-data> + </div> + <div class="grid-3"> + {{ applicationSubmission.eastLandUseTypeDescription }} + <app-no-data *ngIf="!applicationSubmission.eastLandUseTypeDescription"></app-no-data> + </div> + <div class="grid-1 subheading2">South</div> + <div class="grid-2"> + {{ applicationSubmission.southLandUseType }} + <app-no-data *ngIf="!applicationSubmission.southLandUseType"></app-no-data> + </div> + <div class="grid-3"> + {{ applicationSubmission.southLandUseTypeDescription }} + <app-no-data *ngIf="!applicationSubmission.southLandUseTypeDescription"></app-no-data> + </div> + <div class="grid-1 subheading2">West</div> + <div class="grid-2"> + {{ applicationSubmission.westLandUseType }} + <app-no-data *ngIf="!applicationSubmission.westLandUseType"></app-no-data> + </div> + <div class="grid-3"> + {{ applicationSubmission.westLandUseTypeDescription }} + <app-no-data *ngIf="!applicationSubmission.westLandUseTypeDescription"></app-no-data> + </div> + </div> + </div> +</section> +<section *ngIf="applicationSubmission"> + <h3>Proposal</h3> + <app-nfu-details + *ngIf="applicationSubmission.typeCode === 'NFUP'" + [applicationSubmission]="applicationSubmission" + [applicationDocuments]="applicationDocuments" + ></app-nfu-details> + <app-tur-details + *ngIf="applicationSubmission.typeCode === 'TURP'" + [applicationSubmission]="applicationSubmission" + [applicationDocuments]="applicationDocuments" + ></app-tur-details> + <app-subd-details + *ngIf="applicationSubmission.typeCode === 'SUBD'" + [applicationSubmission]="applicationSubmission" + [applicationDocuments]="applicationDocuments" + ></app-subd-details> + <app-roso-details + *ngIf="applicationSubmission.typeCode === 'ROSO'" + [applicationSubmission]="applicationSubmission" + [applicationDocuments]="applicationDocuments" + ></app-roso-details> + <app-pofo-details + *ngIf="applicationSubmission.typeCode === 'POFO'" + [applicationSubmission]="applicationSubmission" + [applicationDocuments]="applicationDocuments" + ></app-pofo-details> + <app-pfrs-details + *ngIf="applicationSubmission.typeCode === 'PFRS'" + [applicationSubmission]="applicationSubmission" + [applicationDocuments]="applicationDocuments" + ></app-pfrs-details> + <app-naru-details + *ngIf="applicationSubmission.typeCode === 'NARU'" + [applicationSubmission]="applicationSubmission" + [applicationDocuments]="applicationDocuments" + ></app-naru-details> + <app-excl-details + *ngIf="applicationSubmission.typeCode === 'EXCL'" + [applicationSubmission]="applicationSubmission" + [applicationDocuments]="applicationDocuments" + ></app-excl-details> + <app-incl-details + *ngIf="applicationSubmission.typeCode === 'INCL'" + [applicationSubmission]="applicationSubmission" + [applicationDocuments]="applicationDocuments" + ></app-incl-details> +</section> diff --git a/portal-frontend/src/app/features/public/application/submission/submission-details.component.scss b/portal-frontend/src/app/features/public/application/submission/submission-details.component.scss new file mode 100644 index 0000000000..8aae88078a --- /dev/null +++ b/portal-frontend/src/app/features/public/application/submission/submission-details.component.scss @@ -0,0 +1,143 @@ +@use '../../../../../styles/functions' as *; +@use '../../../../../styles/colors'; + +:host::ng-deep { + .view-grid-item { + display: grid; + grid-template-columns: minmax(rem(100), 0.5fr) 1fr; + column-gap: rem(16); + margin-bottom: rem(12); + } + + .details-wrapper { + margin-top: rem(24); + margin-bottom: rem(24); + + .title { + margin-bottom: rem(16) !important; + } + } + + h3 .subtext { + margin: 0.5rem 0 !important; + } + + label { + font-weight: 600; + } + + .no-data-text { + text-align: center; + color: colors.$grey; + padding-top: rem(12); + + .error { + justify-content: center; + } + } + + .custom-mat-expansion-panel-header { + height: fit-content; + } + + .table-wrapper { + overflow-x: auto; + width: 100%; + } + + @media screen and (min-width: $tabletBreakpoint) { + .flex-item { + display: flex; + gap: rem(16); + } + } +} + +:host::ng-deep { + .scrollable { + overflow-x: auto; + } + + .other-attachments { + display: grid; + grid-template-columns: max-content max-content max-content; + overflow-x: auto; + grid-column-gap: rem(36); + grid-row-gap: rem(12); + + .full-width { + grid-column: 1/3; + } + } + + .adjacent-parcels { + display: grid; + grid-template-columns: max-content max-content max-content; + overflow-x: auto; + grid-column-gap: rem(36); + grid-row-gap: rem(12); + + .full-width { + grid-column: 1/4; + } + } + + .review-table { + padding: rem(8); + margin: rem(12) 0 rem(20) 0; + background-color: colors.$grey-light; + display: grid; + grid-row-gap: rem(24); + grid-column-gap: rem(16); + grid-template-columns: 1fr; + word-wrap: break-word; + hyphens: auto; + + .edit-button { + display: flex; + justify-content: center; + + button { + width: 100%; + + @media screen and (min-width: $tabletBreakpoint) { + width: unset; + } + } + } + + .subheading2 { + margin-bottom: rem(4) !important; + } + + @media screen and (min-width: $tabletBreakpoint) { + padding: rem(16); + margin: rem(24) 0 rem(40) 0; + grid-template-columns: minmax(rem(60), 1fr) minmax(rem(60), 1fr) minmax(rem(60), 1fr) minmax(rem(60), 1fr); + + .full-width { + grid-column: 1/5; + } + + .grid-double { + grid-column: 2/5; + } + + .grid-1 { + grid-column: 1/2; + } + + .grid-2 { + grid-column: 2/3; + } + + .grid-3 { + grid-column: 3/5; + } + + .edit-button { + grid-column: 1/5; + } + } + } +} diff --git a/portal-frontend/src/app/features/public/application/submission/submission-details.component.spec.ts b/portal-frontend/src/app/features/public/application/submission/submission-details.component.spec.ts new file mode 100644 index 0000000000..a06f7a8d15 --- /dev/null +++ b/portal-frontend/src/app/features/public/application/submission/submission-details.component.spec.ts @@ -0,0 +1,42 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; +import { CodeService } from '../../../../services/code/code.service'; + +import { SubmissionDetailsComponent } from './submission-details.component'; + +describe('SubmissionDetailsComponent', () => { + let component: SubmissionDetailsComponent; + let fixture: ComponentFixture<SubmissionDetailsComponent>; + let mockCodeService: DeepMocked<CodeService>; + let mockAppDocumentService: DeepMocked<ApplicationDocumentService>; + + beforeEach(async () => { + mockCodeService = createMock(); + mockAppDocumentService = createMock(); + + await TestBed.configureTestingModule({ + providers: [ + { + provide: CodeService, + useValue: mockCodeService, + }, + { + provide: ApplicationDocumentService, + useValue: mockAppDocumentService, + }, + ], + declarations: [SubmissionDetailsComponent], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(SubmissionDetailsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/public/application/submission/submission-details.component.ts b/portal-frontend/src/app/features/public/application/submission/submission-details.component.ts new file mode 100644 index 0000000000..c98f76888a --- /dev/null +++ b/portal-frontend/src/app/features/public/application/submission/submission-details.component.ts @@ -0,0 +1,66 @@ +import { Component, Input, OnDestroy, OnInit } from '@angular/core'; +import { Subject } from 'rxjs'; +import { ApplicationDocumentDto } from '../../../../services/application-document/application-document.dto'; +import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; +import { ApplicationParcelDto, PARCEL_TYPE } from '../../../../services/application-parcel/application-parcel.dto'; +import { LocalGovernmentDto } from '../../../../services/code/code.dto'; +import { CodeService } from '../../../../services/code/code.service'; +import { PublicApplicationSubmissionDto, PublicOwnerDto } from '../../../../services/public/public.dto'; +import { OWNER_TYPE } from '../../../../shared/dto/owner.dto'; + +@Component({ + selector: 'app-public-app-submission-details', + templateUrl: './submission-details.component.html', + styleUrls: ['./submission-details.component.scss'], +}) +export class SubmissionDetailsComponent implements OnInit, OnDestroy { + $destroy = new Subject<void>(); + + @Input() applicationSubmission!: PublicApplicationSubmissionDto; + @Input() applicationDocuments: ApplicationDocumentDto[] = []; + @Input() applicationParcels: ApplicationParcelDto[] = []; + + parcelType = PARCEL_TYPE; + primaryContact: PublicOwnerDto | undefined; + localGovernment: LocalGovernmentDto | undefined; + OWNER_TYPE = OWNER_TYPE; + + private localGovernments: LocalGovernmentDto[] = []; + + constructor(private codeService: CodeService, private applicationDocumentService: ApplicationDocumentService) {} + + ngOnInit(): void { + this.loadGovernments(); + if (this.applicationSubmission) { + this.primaryContact = this.applicationSubmission.owners.find( + (owner) => owner.uuid === this.applicationSubmission.primaryContactOwnerUuid + ); + this.populateLocalGovernment(this.applicationSubmission.localGovernmentUuid); + } + } + + ngOnDestroy(): void { + this.$destroy.next(); + this.$destroy.complete(); + } + + async openFile(uuid: string) { + const res = await this.applicationDocumentService.openFile(uuid); + window.open(res?.url, '_blank'); + } + + private async loadGovernments() { + const codes = await this.codeService.loadCodes(); + this.localGovernments = codes.localGovernments.sort((a, b) => (a.name > b.name ? 1 : -1)); + if (this.applicationSubmission?.localGovernmentUuid) { + this.populateLocalGovernment(this.applicationSubmission?.localGovernmentUuid); + } + } + + private populateLocalGovernment(governmentUuid: string) { + const lg = this.localGovernments.find((lg) => lg.uuid === governmentUuid); + if (lg) { + this.localGovernment = lg; + } + } +} diff --git a/portal-frontend/src/app/features/public/application/submission/submission-details.module.ts b/portal-frontend/src/app/features/public/application/submission/submission-details.module.ts new file mode 100644 index 0000000000..e02adcc592 --- /dev/null +++ b/portal-frontend/src/app/features/public/application/submission/submission-details.module.ts @@ -0,0 +1,34 @@ +import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; +import { NgxMaskPipe } from 'ngx-mask'; +import { SharedModule } from '../../../../shared/shared.module'; +import { SubmissionDetailsComponent } from './submission-details.component'; +import { InclDetailsComponent } from './incl-details/incl-details.component'; +import { NaruDetailsComponent } from './naru-details/naru-details.component'; +import { NfuDetailsComponent } from './nfu-details/nfu-details.component'; +import { ParcelComponent } from './parcel/parcel.component'; +import { PfrsDetailsComponent } from './pfrs-details/pfrs-details.component'; +import { PofoDetailsComponent } from './pofo-details/pofo-details.component'; +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'; + +@NgModule({ + declarations: [ + ParcelComponent, + SubmissionDetailsComponent, + NfuDetailsComponent, + TurDetailsComponent, + SubdDetailsComponent, + RosoDetailsComponent, + PofoDetailsComponent, + PfrsDetailsComponent, + NaruDetailsComponent, + ExclDetailsComponent, + InclDetailsComponent, + ], + imports: [CommonModule, SharedModule, NgxMaskPipe], + exports: [SubmissionDetailsComponent], +}) +export class SubmissionDetailsModule {} diff --git a/portal-frontend/src/app/features/public/application/submission/tur-details/tur-details.component.html b/portal-frontend/src/app/features/public/application/submission/tur-details/tur-details.component.html new file mode 100644 index 0000000000..5eb61b005b --- /dev/null +++ b/portal-frontend/src/app/features/public/application/submission/tur-details/tur-details.component.html @@ -0,0 +1,41 @@ +<div *ngIf="applicationSubmission" class="review-table"> + <div class="subheading2 grid-1">What is the purpose of the proposal?</div> + <div class="grid-double"> + {{ applicationSubmission.purpose }} + <app-no-data *ngIf="!applicationSubmission.purpose"></app-no-data> + </div> + <div class="subheading2 grid-1"> + Specify any agricultural activities such as livestock operations, greenhouses or horticultural activities in + proximity to the proposal. + </div> + <div class="grid-double"> + {{ applicationSubmission.turAgriculturalActivities }} + <app-no-data *ngIf="!applicationSubmission.turAgriculturalActivities"></app-no-data> + </div> + <div class="subheading2 grid-1"> + What steps will you take to reduce potential negative impacts on surrounding agricultural lands? + </div> + <div class="grid-double"> + {{ applicationSubmission.turReduceNegativeImpacts }} + <app-no-data *ngIf="!applicationSubmission.turReduceNegativeImpacts"></app-no-data> + </div> + <div class="subheading2 grid-1">Could this proposal be accommodated on lands outside of the ALR?</div> + <div class="grid-double"> + {{ applicationSubmission.turOutsideLands }} + <app-no-data *ngIf="!applicationSubmission.turOutsideLands"></app-no-data> + </div> + <div class="subheading2 grid-1">Total area of corridor</div> + <div class="grid-double"> + <span *ngIf="applicationSubmission.turTotalCorridorArea !== null">{{ + applicationSubmission.turTotalCorridorArea + }}</span> + <app-no-data *ngIf="applicationSubmission.turTotalCorridorArea === null"></app-no-data> + </div> + <div class="subheading2 grid-1">Proposal Map / Sketch Plan</div> + <div class="grid-double"> + <a *ngFor="let file of proposalMap" (click)="openFile(file.uuid)"> + {{ file.fileName }} + </a> + <app-no-data *ngIf="proposalMap.length === 0"></app-no-data> + </div> +</div> diff --git a/portal-frontend/src/app/features/public/application/submission/tur-details/tur-details.component.scss b/portal-frontend/src/app/features/public/application/submission/tur-details/tur-details.component.scss new file mode 100644 index 0000000000..e69de29bb2 diff --git a/portal-frontend/src/app/features/public/application/submission/tur-details/tur-details.component.spec.ts b/portal-frontend/src/app/features/public/application/submission/tur-details/tur-details.component.spec.ts new file mode 100644 index 0000000000..2886c9d962 --- /dev/null +++ b/portal-frontend/src/app/features/public/application/submission/tur-details/tur-details.component.spec.ts @@ -0,0 +1,31 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { DeepMocked } from '@golevelup/ts-jest'; +import { PublicService } from '../../../../../services/public/public.service'; + +import { TurDetailsComponent } from './tur-details.component'; + +describe('TurDetailsComponent', () => { + let component: TurDetailsComponent; + let fixture: ComponentFixture<TurDetailsComponent>; + let mockPublicService: DeepMocked<PublicService>; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [TurDetailsComponent], + providers: [ + { + provide: PublicService, + useValue: mockPublicService, + }, + ], + }).compileComponents(); + + fixture = TestBed.createComponent(TurDetailsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/public/application/submission/tur-details/tur-details.component.ts b/portal-frontend/src/app/features/public/application/submission/tur-details/tur-details.component.ts new file mode 100644 index 0000000000..a448a06fae --- /dev/null +++ b/portal-frontend/src/app/features/public/application/submission/tur-details/tur-details.component.ts @@ -0,0 +1,29 @@ +import { Component, Input } from '@angular/core'; +import { Router } from '@angular/router'; +import { ApplicationDocumentDto } from '../../../../../services/application-document/application-document.dto'; +import { PublicApplicationSubmissionDto } from '../../../../../services/public/public.dto'; +import { PublicService } from '../../../../../services/public/public.service'; +import { DOCUMENT_TYPE } from '../../../../../shared/dto/document.dto'; + +@Component({ + selector: 'app-tur-details[applicationSubmission]', + templateUrl: './tur-details.component.html', + styleUrls: ['./tur-details.component.scss'], +}) +export class TurDetailsComponent { + @Input() applicationSubmission!: PublicApplicationSubmissionDto; + @Input() set applicationDocuments(documents: ApplicationDocumentDto[]) { + this.proposalMap = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.PROPOSAL_MAP); + } + + proposalMap: ApplicationDocumentDto[] = []; + + constructor(private router: Router, private publicService: PublicService) {} + + async openFile(uuid: string) { + const res = await this.publicService.getApplicationFileUrl(this.applicationSubmission.fileNumber, uuid); + if (res) { + window.open(res?.url, '_blank'); + } + } +} diff --git a/portal-frontend/src/app/features/public/public.module.ts b/portal-frontend/src/app/features/public/public.module.ts index 90ef0d4953..57b0fa785e 100644 --- a/portal-frontend/src/app/features/public/public.module.ts +++ b/portal-frontend/src/app/features/public/public.module.ts @@ -6,6 +6,8 @@ import { MatSortModule } from '@angular/material/sort'; import { MatTreeModule } from '@angular/material/tree'; import { RouterModule, Routes } from '@angular/router'; import { SharedModule } from '../../shared/shared.module'; +import { PublicApplicationComponent } from './application/public-application.component'; +import { SubmissionDetailsModule } from './application/submission/submission-details.module'; import { ApplicationSearchTableComponent } from './search/application-search-table/application-search-table.component'; import { FileTypeFilterDropDownComponent } from './search/file-type-filter-drop-down/file-type-filter-drop-down.component'; import { NoticeOfIntentSearchTableComponent } from './search/notice-of-intent-search-table/notice-of-intent-search-table.component'; @@ -18,6 +20,10 @@ const routes: Routes = [ path: '', component: PublicSearchComponent, }, + { + path: 'application/:fileId', + component: PublicApplicationComponent, + }, ]; @NgModule({ @@ -28,6 +34,7 @@ const routes: Routes = [ ApplicationSearchTableComponent, FileTypeFilterDropDownComponent, SearchListComponent, + PublicApplicationComponent, ], imports: [ CommonModule, @@ -37,6 +44,7 @@ const routes: Routes = [ RouterModule.forChild(routes), MatAutocompleteModule, MatTreeModule, + SubmissionDetailsModule, ], }) export class PublicModule {} diff --git a/portal-frontend/src/app/features/public/search/search-list/search-list.component.ts b/portal-frontend/src/app/features/public/search/search-list/search-list.component.ts index 5f3dc1879a..2271f9fc92 100644 --- a/portal-frontend/src/app/features/public/search/search-list/search-list.component.ts +++ b/portal-frontend/src/app/features/public/search/search-list/search-list.component.ts @@ -40,7 +40,7 @@ export class SearchListComponent implements OnDestroy { async onSelectRecord(record: SearchResult) { const targetUrl = CLASS_TO_URL_MAP[record.class]; - await this.router.navigateByUrl(`/${targetUrl}/${record.referenceId}`); + await this.router.navigateByUrl(`/public/${targetUrl}/${record.referenceId}`); } private mapResults(applications: ApplicationSearchResultDto[]): SearchResult[] { diff --git a/portal-frontend/src/app/services/public/public.dto.ts b/portal-frontend/src/app/services/public/public.dto.ts new file mode 100644 index 0000000000..5c49d34add --- /dev/null +++ b/portal-frontend/src/app/services/public/public.dto.ts @@ -0,0 +1,133 @@ +import { OwnerTypeDto } from '../../shared/dto/owner.dto'; +import { ApplicationDocumentDto } from '../application-document/application-document.dto'; +import { ApplicationParcelDto } from '../application-parcel/application-parcel.dto'; +import { + ApplicationStatusDto, + NaruSubtypeDto, + ProposedLot, +} from '../application-submission/application-submission.dto'; + +export interface GetPublicApplicationResponseDto { + submission: PublicApplicationSubmissionDto; + parcels: ApplicationParcelDto[]; + documents: ApplicationDocumentDto[]; +} + +export interface PublicOwnerDto { + uuid: string; + displayName: string; + firstName?: string | null; + lastName?: string | null; + organizationName?: string | null; + type: OwnerTypeDto; +} + +export interface PublicApplicationSubmissionDto { + fileNumber: string; + uuid: string; + createdAt: number; + updatedAt: number; + applicant: string; + localGovernmentUuid: string; + lastStatusUpdate: number; + status: ApplicationStatusDto; + owners: PublicOwnerDto[]; + type: string; + typeCode: string; + purpose: string | null; + parcelsAgricultureDescription: string; + parcelsAgricultureImprovementDescription: string; + parcelsNonAgricultureUseDescription: string; + northLandUseType: string; + northLandUseTypeDescription: string; + eastLandUseType: string; + eastLandUseTypeDescription: string; + southLandUseType: string; + southLandUseTypeDescription: string; + westLandUseType: string; + westLandUseTypeDescription: string; + primaryContactOwnerUuid?: string | null; + + //NFU Specific Fields + nfuHectares?: number | null; + nfuOutsideLands?: string | null; + nfuAgricultureSupport?: string | null; + nfuWillImportFill?: boolean | null; + nfuTotalFillArea?: number | null; + nfuMaxFillDepth?: number | null; + nfuAverageFillDepth?: number | null; + nfuFillVolume?: number | null; + nfuProjectDurationAmount?: number | null; + nfuProjectDurationUnit?: string | null; + nfuFillTypeDescription?: string | null; + nfuFillOriginDescription?: string | null; + + //TUR Fields + turAgriculturalActivities?: string | null; + turReduceNegativeImpacts?: string | null; + turOutsideLands?: string | null; + turTotalCorridorArea?: number | null; + turAllOwnersNotified?: boolean | null; + + //Subdivision Fields + subdSuitability?: string | null; + subdAgricultureSupport?: string | null; + subdIsHomeSiteSeverance?: boolean | null; + subdProposedLots: ProposedLot[]; + + //Soil Fields + soilIsFollowUp: boolean | null; + soilFollowUpIDs: string | null; + soilTypeRemoved: string | null; + soilReduceNegativeImpacts: string | null; + soilToRemoveVolume: number | null; + soilToRemoveArea: number | null; + soilToRemoveMaximumDepth: number | null; + soilToRemoveAverageDepth: number | null; + soilAlreadyRemovedVolume: number | null; + soilAlreadyRemovedArea: number | null; + soilAlreadyRemovedMaximumDepth: number | null; + soilAlreadyRemovedAverageDepth: number | null; + soilToPlaceVolume: number | null; + soilToPlaceArea: number | null; + soilToPlaceMaximumDepth: number | null; + soilToPlaceAverageDepth: number | null; + soilAlreadyPlacedVolume: number | null; + soilAlreadyPlacedArea: number | null; + soilAlreadyPlacedMaximumDepth: number | null; + soilAlreadyPlacedAverageDepth: number | null; + soilProjectDurationAmount: number | null; + soilProjectDurationUnit?: string | null; + soilFillTypeToPlace?: string | null; + soilAlternativeMeasures?: string | null; + soilIsExtractionOrMining?: boolean; + soilHasSubmittedNotice?: boolean; + + //NARU Fields + naruSubtype: NaruSubtypeDto | null; + naruFloorArea: number | null; + naruResidenceNecessity: string | null; + naruLocationRationale: string | null; + naruInfrastructure: string | null; + naruExistingStructures: string | null; + naruWillImportFill: boolean | null; + naruFillType: string | null; + naruFillOrigin: string | null; + naruProjectDurationAmount: number | null; + naruProjectDurationUnit: string | null; + naruToPlaceVolume: number | null; + naruToPlaceArea: number | null; + naruToPlaceMaximumDepth: number | null; + naruToPlaceAverageDepth: number | null; + naruSleepingUnits: number | null; + naruAgriTourism: string | null; + + //Inclusion / Exclusion Fields + prescribedBody: string | null; + inclExclHectares: number | null; + exclWhyLand: string | null; + inclAgricultureSupport: string | null; + inclImprovements: string | null; + exclShareGovernmentBorders: boolean | null; + inclGovernmentOwnsAllParcels?: boolean | null; +} diff --git a/portal-frontend/src/app/services/public/public.service.spec.ts b/portal-frontend/src/app/services/public/public.service.spec.ts new file mode 100644 index 0000000000..3ecc7eed9c --- /dev/null +++ b/portal-frontend/src/app/services/public/public.service.spec.ts @@ -0,0 +1,53 @@ +import { HttpClient } from '@angular/common/http'; +import { TestBed } from '@angular/core/testing'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { of } from 'rxjs'; +import { ToastService } from '../toast/toast.service'; +import { PublicService } from './public.service'; + +describe('PublicService', () => { + let service: PublicService; + let mockHttpClient: DeepMocked<HttpClient>; + let mockToastService: DeepMocked<ToastService>; + + beforeEach(() => { + mockHttpClient = createMock(); + mockToastService = createMock(); + + TestBed.configureTestingModule({ + providers: [ + { + provide: HttpClient, + useValue: mockHttpClient, + }, + { + provide: ToastService, + useValue: mockToastService, + }, + ], + }); + service = TestBed.inject(PublicService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); + + it('should call get for loading applications', async () => { + mockHttpClient.get.mockReturnValue(of({})); + + const res = await service.getApplication('fileId'); + + expect(mockHttpClient.get).toHaveBeenCalledTimes(1); + expect(res).toBeDefined(); + }); + + it('should call get for loading application files', async () => { + mockHttpClient.get.mockReturnValue(of({})); + + const res = await service.getApplicationFileUrl('fileId', 'documentUuid'); + + expect(mockHttpClient.get).toHaveBeenCalledTimes(1); + expect(res).toBeDefined(); + }); +}); diff --git a/portal-frontend/src/app/services/public/public.service.ts b/portal-frontend/src/app/services/public/public.service.ts new file mode 100644 index 0000000000..b7021b2c5e --- /dev/null +++ b/portal-frontend/src/app/services/public/public.service.ts @@ -0,0 +1,39 @@ +import { HttpClient } from '@angular/common/http'; +import { Injectable } from '@angular/core'; +import { firstValueFrom } from 'rxjs'; +import { environment } from '../../../environments/environment'; +import { ToastService } from '../toast/toast.service'; +import { GetPublicApplicationResponseDto } from './public.dto'; + +@Injectable({ + providedIn: 'root', +}) +export class PublicService { + private serviceUrl = `${environment.authUrl}/public`; + + constructor(private httpClient: HttpClient, private toastService: ToastService) {} + + async getApplication(fileId: string) { + try { + return await firstValueFrom( + this.httpClient.get<GetPublicApplicationResponseDto>(`${this.serviceUrl}/application/${fileId}`) + ); + } catch (e) { + console.error(e); + this.toastService.showErrorToast('Failed to load Application, please try again later'); + return undefined; + } + } + + async getApplicationFileUrl(fileId: string, uuid: string) { + try { + return await firstValueFrom( + this.httpClient.get<{ url: string }>(`${this.serviceUrl}/application/${fileId}/${uuid}/open`) + ); + } catch (e) { + console.error(e); + this.toastService.showErrorToast('Failed to load Application File, please try again later'); + return undefined; + } + } +} diff --git a/services/apps/alcs/src/common/automapper/public.automapper.profile.ts b/services/apps/alcs/src/common/automapper/public.automapper.profile.ts new file mode 100644 index 0000000000..c463e68068 --- /dev/null +++ b/services/apps/alcs/src/common/automapper/public.automapper.profile.ts @@ -0,0 +1,39 @@ +import { createMap, forMember, mapFrom, Mapper } from '@automapper/core'; +import { AutomapperProfile, InjectMapper } from '@automapper/nestjs'; +import { Injectable } from '@nestjs/common'; +import { ApplicationOwner } from '../../portal/application-submission/application-owner/application-owner.entity'; +import { ApplicationSubmission } from '../../portal/application-submission/application-submission.entity'; +import { + PublicApplicationSubmissionDto, + PublicOwnerDto, +} from '../../portal/public/public.dto'; + +@Injectable() +export class PublicAutomapperProfile extends AutomapperProfile { + constructor(@InjectMapper() mapper: Mapper) { + super(mapper); + } + + override get profile() { + return (mapper) => { + createMap( + mapper, + ApplicationSubmission, + PublicApplicationSubmissionDto, + forMember( + (a) => a.lastStatusUpdate, + mapFrom((ad) => { + return ad.status.effectiveDate?.getTime(); + }), + ), + forMember( + (a) => a.status, + mapFrom((ad) => { + return ad.status.statusType; + }), + ), + ); + createMap(mapper, ApplicationOwner, PublicOwnerDto); + }; + } +} diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts b/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts index 81bc6ac891..e53d765a9a 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts @@ -190,6 +190,7 @@ export class ApplicationSubmission extends Base { }) typeCode: string; + @AutoMap(() => [ApplicationOwner]) @OneToMany(() => ApplicationOwner, (owner) => owner.applicationSubmission) owners: ApplicationOwner[]; diff --git a/services/apps/alcs/src/portal/public/public.controller.spec.ts b/services/apps/alcs/src/portal/public/public.controller.spec.ts new file mode 100644 index 0000000000..734f96eae1 --- /dev/null +++ b/services/apps/alcs/src/portal/public/public.controller.spec.ts @@ -0,0 +1,138 @@ +import { ServiceNotFoundException } from '@app/common/exceptions/base.exception'; +import { classes } from '@automapper/classes'; +import { AutomapperModule } from '@automapper/nestjs'; +import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; +import { Test, TestingModule } from '@nestjs/testing'; +import { ClsService } from 'nestjs-cls'; +import { mockKeyCloakProviders } from '../../../test/mocks/mockTypes'; +import { + ApplicationDocument, + VISIBILITY_FLAG, +} from '../../alcs/application/application-document/application-document.entity'; +import { ApplicationDocumentService } from '../../alcs/application/application-document/application-document.service'; +import { ApplicationSubmissionToSubmissionStatus } from '../../alcs/application/application-submission-status/submission-status.entity'; +import { Application } from '../../alcs/application/application.entity'; +import { ApplicationService } from '../../alcs/application/application.service'; +import { PublicAutomapperProfile } from '../../common/automapper/public.automapper.profile'; +import { ApplicationParcelService } from '../application-submission/application-parcel/application-parcel.service'; +import { ApplicationSubmission } from '../application-submission/application-submission.entity'; +import { ApplicationSubmissionService } from '../application-submission/application-submission.service'; +import { PublicController } from './public.controller'; + +describe('PublicSearchController', () => { + let controller: PublicController; + let mockAppService: DeepMocked<ApplicationService>; + let mockAppSubService: DeepMocked<ApplicationSubmissionService>; + let mockAppParcelService: DeepMocked<ApplicationParcelService>; + let mockAppDocService: DeepMocked<ApplicationDocumentService>; + + beforeEach(async () => { + mockAppService = createMock(); + mockAppSubService = createMock(); + mockAppParcelService = createMock(); + mockAppDocService = createMock(); + + const module: TestingModule = await Test.createTestingModule({ + imports: [ + AutomapperModule.forRoot({ + strategyInitializer: classes(), + }), + ], + providers: [ + PublicAutomapperProfile, + { + provide: ApplicationService, + useValue: mockAppService, + }, + { + provide: ApplicationSubmissionService, + useValue: mockAppSubService, + }, + { + provide: ApplicationParcelService, + useValue: mockAppParcelService, + }, + { + provide: ApplicationDocumentService, + useValue: mockAppDocService, + }, + { + provide: ClsService, + useValue: {}, + }, + ...mockKeyCloakProviders, + ], + controllers: [PublicController], + }).compile(); + + controller = module.get<PublicController>(PublicController); + }); + + it('should be defined', () => { + expect(controller).toBeDefined(); + }); + + it('load an Application and its related data for get application', async () => { + mockAppService.get.mockResolvedValue( + new Application({ + dateReceivedAllItems: new Date(), + }), + ); + mockAppSubService.getOrFailByFileNumber.mockResolvedValue( + new ApplicationSubmission({ + get status(): ApplicationSubmissionToSubmissionStatus { + return new ApplicationSubmissionToSubmissionStatus(); + }, + }), + ); + mockAppParcelService.fetchByApplicationFileId.mockResolvedValue([]); + mockAppDocService.list.mockResolvedValue([]); + + const fileId = 'file-id'; + await controller.getApplication(fileId); + + expect(mockAppService.get).toHaveBeenCalledTimes(1); + expect(mockAppSubService.getOrFailByFileNumber).toHaveBeenCalledTimes(1); + expect(mockAppParcelService.fetchByApplicationFileId).toHaveBeenCalledTimes( + 1, + ); + expect(mockAppDocService.list).toHaveBeenCalledTimes(1); + expect(mockAppDocService.list).toHaveBeenCalledWith(fileId, [ + VISIBILITY_FLAG.PUBLIC, + ]); + }); + + it('should call through to document service for getting files', async () => { + const mockDoc = new ApplicationDocument({ + visibilityFlags: [VISIBILITY_FLAG.PUBLIC], + }); + mockAppDocService.get.mockResolvedValue(mockDoc); + mockAppDocService.getInlineUrl.mockResolvedValue(''); + + const fileId = 'file-id'; + const documentUuid = 'document-uuid'; + await controller.getApplicationDocumentOpen(fileId, documentUuid); + + expect(mockAppDocService.get).toHaveBeenCalledTimes(1); + expect(mockAppDocService.getInlineUrl).toHaveBeenCalledTimes(1); + expect(mockAppDocService.getInlineUrl).toHaveBeenCalledWith(mockDoc); + }); + + it('should throw an exception when the document is not public', async () => { + const mockDoc = new ApplicationDocument({ + visibilityFlags: [VISIBILITY_FLAG.APPLICANT], + }); + mockAppDocService.get.mockResolvedValue(mockDoc); + + const fileId = 'file-id'; + const documentUuid = 'document-uuid'; + const promise = controller.getApplicationDocumentOpen(fileId, documentUuid); + + await expect(promise).rejects.toMatchObject( + new ServiceNotFoundException('Failed to find document'), + ); + + expect(mockAppDocService.get).toHaveBeenCalledTimes(1); + expect(mockAppDocService.getInlineUrl).toHaveBeenCalledTimes(0); + }); +}); diff --git a/services/apps/alcs/src/portal/public/public.controller.ts b/services/apps/alcs/src/portal/public/public.controller.ts new file mode 100644 index 0000000000..264d0393b5 --- /dev/null +++ b/services/apps/alcs/src/portal/public/public.controller.ts @@ -0,0 +1,110 @@ +import { ServiceNotFoundException } from '@app/common/exceptions/base.exception'; +import { Mapper } from '@automapper/core'; +import { InjectMapper } from '@automapper/nestjs'; +import { Controller, Get, Param } from '@nestjs/common'; +import { Public } from 'nest-keycloak-connect'; +import { ApplicationDocumentDto } from '../../alcs/application/application-document/application-document.dto'; +import { + ApplicationDocument, + VISIBILITY_FLAG, +} from '../../alcs/application/application-document/application-document.entity'; +import { ApplicationDocumentService } from '../../alcs/application/application-document/application-document.service'; +import { ApplicationService } from '../../alcs/application/application.service'; +import { ApplicationParcelDto } from '../application-submission/application-parcel/application-parcel.dto'; +import { ApplicationParcel } from '../application-submission/application-parcel/application-parcel.entity'; +import { ApplicationParcelService } from '../application-submission/application-parcel/application-parcel.service'; +import { ApplicationSubmission } from '../application-submission/application-submission.entity'; +import { ApplicationSubmissionService } from '../application-submission/application-submission.service'; +import { PublicApplicationSubmissionDto } from './public.dto'; + +@Public() +@Controller('/public') +export class PublicController { + constructor( + @InjectMapper() private mapper: Mapper, + private applicationService: ApplicationService, + private applicationSubmissionService: ApplicationSubmissionService, + private applicationParcelService: ApplicationParcelService, + private applicationDocumentService: ApplicationDocumentService, + ) {} + + @Get('/application/:fileId') + async getApplication(@Param('fileId') fileId: string) { + const application = await this.applicationService.get(fileId); + if (!application?.dateReceivedAllItems) { + throw new ServiceNotFoundException( + `Failed to find application with File ID ${fileId}`, + ); + } + + const submission = + await this.applicationSubmissionService.getOrFailByFileNumber(fileId); + + const parcels = + await this.applicationParcelService.fetchByApplicationFileId(fileId); + + const mappedParcels = this.mapper.mapArray( + parcels, + ApplicationParcel, + ApplicationParcelDto, + ); + + const mappedSubmission = this.mapper.map( + submission, + ApplicationSubmission, + PublicApplicationSubmissionDto, + ); + + const documents = await this.applicationDocumentService.list(fileId, [ + VISIBILITY_FLAG.PUBLIC, + ]); + + const mappedDocuments = this.mapper.mapArray( + documents, + ApplicationDocument, + ApplicationDocumentDto, + ); + + return { + submission: mappedSubmission, + parcels: mappedParcels, + documents: mappedDocuments, + }; + } + + @Get('/application/:fileId/:uuid/download') + async getApplicationDocumentDownload( + @Param('fileId') fileId: string, + @Param('uuid') documentUuid: string, + ) { + const document = await this.applicationDocumentService.get(documentUuid); + + if (!document.visibilityFlags.includes(VISIBILITY_FLAG.PUBLIC)) { + throw new ServiceNotFoundException('Failed to find document'); + } + + const url = await this.applicationDocumentService.getDownloadUrl(document); + + return { + url, + }; + } + + @Get('/application/:fileId/:uuid/open') + async getApplicationDocumentOpen( + @Param('fileId') fileId: string, + @Param('uuid') documentUuid: string, + ) { + const document = await this.applicationDocumentService.get(documentUuid); + + if (!document.visibilityFlags.includes(VISIBILITY_FLAG.PUBLIC)) { + throw new ServiceNotFoundException('Failed to find document'); + } + + const url = await this.applicationDocumentService.getInlineUrl(document); + + return { + url, + }; + } +} diff --git a/services/apps/alcs/src/portal/public/public.dto.ts b/services/apps/alcs/src/portal/public/public.dto.ts new file mode 100644 index 0000000000..e502cf8720 --- /dev/null +++ b/services/apps/alcs/src/portal/public/public.dto.ts @@ -0,0 +1,317 @@ +import { AutoMap } from '@automapper/classes'; +import { ApplicationStatusDto } from '../../alcs/application/application-submission-status/submission-status.dto'; +import { OwnerTypeDto } from '../../common/owner-type/owner-type.entity'; +import { NaruSubtypeDto } from '../application-submission/application-submission.dto'; +import { ProposedLot } from '../application-submission/application-submission.entity'; + +export class PublicOwnerDto { + @AutoMap() + uuid: string; + + displayName: string; + + @AutoMap(() => String) + firstName?: string | null; + + @AutoMap(() => String) + lastName?: string | null; + + @AutoMap(() => String) + organizationName?: string | null; + + @AutoMap() + type: OwnerTypeDto; +} + +export class PublicApplicationSubmissionDto { + @AutoMap() + fileNumber: string; + + @AutoMap() + uuid: string; + + @AutoMap() + createdAt: number; + + @AutoMap() + updatedAt: number; + + @AutoMap() + applicant: string; + + @AutoMap() + localGovernmentUuid: string; + + @AutoMap(() => Boolean) + hasOtherParcelsInCommunity?: boolean | null; + + lastStatusUpdate: number; + + status: ApplicationStatusDto; + + @AutoMap(() => [PublicOwnerDto]) + owners: PublicOwnerDto[]; + + type: string; + + @AutoMap() + typeCode: string; + + @AutoMap(() => String) + purpose: string | null; + + @AutoMap() + parcelsAgricultureDescription: string; + + @AutoMap() + parcelsAgricultureImprovementDescription: string; + + @AutoMap() + parcelsNonAgricultureUseDescription: string; + + @AutoMap() + northLandUseType: string; + + @AutoMap() + northLandUseTypeDescription: string; + + @AutoMap() + eastLandUseType: string; + + @AutoMap() + eastLandUseTypeDescription: string; + + @AutoMap() + southLandUseType: string; + + @AutoMap() + southLandUseTypeDescription: string; + + @AutoMap() + westLandUseType: string; + + @AutoMap() + westLandUseTypeDescription: string; + + @AutoMap(() => String) + primaryContactOwnerUuid?: string | null; + + //NFU Specific Fields + @AutoMap(() => Number) + nfuHectares?: number | null; + + @AutoMap(() => String) + nfuOutsideLands?: string | null; + + @AutoMap(() => String) + nfuAgricultureSupport?: string | null; + + @AutoMap(() => String) + nfuWillImportFill?: boolean | null; + + @AutoMap(() => Number) + nfuTotalFillArea?: number | null; + + @AutoMap(() => Number) + nfuMaxFillDepth?: number | null; + + @AutoMap(() => Number) + nfuAverageFillDepth?: number | null; + + @AutoMap(() => Number) + nfuFillVolume?: number | null; + + @AutoMap(() => Number) + nfuProjectDurationAmount?: number | null; + + @AutoMap(() => String) + nfuProjectDurationUnit?: string | null; + + @AutoMap(() => String) + nfuFillTypeDescription?: string | null; + + @AutoMap(() => String) + nfuFillOriginDescription?: string | null; + + //TUR Fields + @AutoMap(() => String) + turAgriculturalActivities?: string | null; + + @AutoMap(() => String) + turReduceNegativeImpacts?: string | null; + + @AutoMap(() => String) + turOutsideLands?: string | null; + + @AutoMap(() => Number) + turTotalCorridorArea?: number | null; + + @AutoMap(() => Boolean) + turAllOwnersNotified?: boolean | null; + + //Subdivision Fields + @AutoMap(() => String) + subdSuitability?: string | null; + + @AutoMap(() => String) + subdAgricultureSupport?: string | null; + + @AutoMap(() => Boolean) + subdIsHomeSiteSeverance?: boolean | null; + + @AutoMap(() => [ProposedLot]) + subdProposedLots?: ProposedLot[]; + + //Soil Fields + @AutoMap(() => Boolean) + soilIsFollowUp: boolean | null; + + @AutoMap(() => String) + soilFollowUpIDs: string | null; + + @AutoMap(() => String) + soilTypeRemoved: string | null; + + @AutoMap(() => String) + soilReduceNegativeImpacts: string | null; + + @AutoMap(() => Number) + soilToRemoveVolume: number | null; + + @AutoMap(() => Number) + soilToRemoveArea: number | null; + + @AutoMap(() => Number) + soilToRemoveMaximumDepth: number | null; + + @AutoMap(() => Number) + soilToRemoveAverageDepth: number | null; + + @AutoMap(() => Number) + soilAlreadyRemovedVolume: number | null; + + @AutoMap(() => Number) + soilAlreadyRemovedArea: number | null; + + @AutoMap(() => Number) + soilAlreadyRemovedMaximumDepth: number | null; + + @AutoMap(() => Number) + soilAlreadyRemovedAverageDepth: number | null; + + @AutoMap(() => Number) + soilToPlaceVolume: number | null; + + @AutoMap(() => Number) + soilToPlaceArea: number | null; + + @AutoMap(() => Number) + soilToPlaceMaximumDepth: number | null; + + @AutoMap(() => Number) + soilToPlaceAverageDepth: number | null; + + @AutoMap(() => Number) + soilAlreadyPlacedVolume: number | null; + + @AutoMap(() => Number) + soilAlreadyPlacedArea: number | null; + + @AutoMap(() => Number) + soilAlreadyPlacedMaximumDepth: number | null; + + @AutoMap(() => Number) + soilAlreadyPlacedAverageDepth: number | null; + + @AutoMap(() => Number) + soilProjectDurationAmount: number | null; + + @AutoMap(() => String) + soilProjectDurationUnit?: string | null; + + @AutoMap(() => String) + soilFillTypeToPlace?: string | null; + + @AutoMap(() => String) + soilAlternativeMeasures?: string | null; + + @AutoMap(() => Boolean) + soilIsExtractionOrMining?: boolean; + + @AutoMap(() => Boolean) + soilHasSubmittedNotice?: boolean; + + //NARU Fields + @AutoMap(() => [NaruSubtypeDto]) + naruSubtype: NaruSubtypeDto | null; + + @AutoMap(() => Number) + naruFloorArea: number | null; + + @AutoMap(() => String) + naruResidenceNecessity: string | null; + + @AutoMap(() => String) + naruLocationRationale: string | null; + + @AutoMap(() => String) + naruInfrastructure: string | null; + + @AutoMap(() => String) + naruExistingStructures: string | null; + + @AutoMap(() => Boolean) + naruWillImportFill: boolean | null; + + @AutoMap(() => String) + naruFillType: string | null; + + @AutoMap(() => String) + naruFillOrigin: string | null; + + @AutoMap(() => Number) + naruProjectDurationAmount: number | null; + + @AutoMap(() => String) + naruProjectDurationUnit: string | null; + + @AutoMap(() => Number) + naruToPlaceVolume: number | null; + + @AutoMap(() => Number) + naruToPlaceArea: number | null; + + @AutoMap(() => Number) + naruToPlaceMaximumDepth: number | null; + + @AutoMap(() => Number) + naruToPlaceAverageDepth: number | null; + + @AutoMap(() => Number) + naruSleepingUnits: number | null; + + @AutoMap(() => String) + naruAgriTourism: string | null; + + //Inclusion / Exclusion Fields + @AutoMap(() => String) + prescribedBody: string | null; + + @AutoMap(() => Number) + inclExclHectares: number | null; + + @AutoMap(() => String) + exclWhyLand: string | null; + + @AutoMap(() => String) + inclAgricultureSupport: string | null; + + @AutoMap(() => String) + inclImprovements: string | null; + + @AutoMap(() => Boolean) + exclShareGovernmentBorders: boolean | null; + + @AutoMap(() => Boolean) + inclGovernmentOwnsAllParcels?: boolean | null; +} diff --git a/services/apps/alcs/src/portal/public/public.module.ts b/services/apps/alcs/src/portal/public/public.module.ts index a63b142147..c0e86ea8d4 100644 --- a/services/apps/alcs/src/portal/public/public.module.ts +++ b/services/apps/alcs/src/portal/public/public.module.ts @@ -1,7 +1,12 @@ import { Module } from '@nestjs/common'; import { RouterModule } from '@nestjs/core'; import { ApplicationSubmissionStatusModule } from '../../alcs/application/application-submission-status/application-submission-status.module'; +import { ApplicationModule } from '../../alcs/application/application.module'; import { NotificationSubmissionStatusModule } from '../../alcs/notification/notification-submission-status/notification-submission-status.module'; +import { ApplicationSubmissionProfile } from '../../common/automapper/application-submission.automapper.profile'; +import { PublicAutomapperProfile } from '../../common/automapper/public.automapper.profile'; +import { ApplicationSubmissionModule } from '../application-submission/application-submission.module'; +import { PublicController } from './public.controller'; import { PublicSearchModule } from './search/public-search.module'; import { PublicStatusController } from './status/public-status.controller'; @@ -10,10 +15,12 @@ import { PublicStatusController } from './status/public-status.controller'; PublicSearchModule, ApplicationSubmissionStatusModule, NotificationSubmissionStatusModule, + ApplicationModule, + ApplicationSubmissionModule, RouterModule.register([{ path: 'public', module: PublicSearchModule }]), ], - controllers: [PublicStatusController], - providers: [], + controllers: [PublicStatusController, PublicController], + providers: [PublicAutomapperProfile], exports: [], }) export class PublicModule {} From 827cd00db213437d6c864f242c424661b20fe4e7 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Thu, 5 Oct 2023 16:27:30 -0700 Subject: [PATCH 456/954] Finish Public App View * Add ALC Tab and L/FNG Tab * Add DTOs for Parcel and Document to minimize exposed data --- .../alc-review/alc-review.component.html | 44 +---- .../alc-review/alc-review.component.spec.ts | 24 +-- .../alc-review/alc-review.component.ts | 48 ++--- .../decisions/decisions.component.html | 5 +- .../decisions/decisions.component.spec.ts | 12 +- .../decisions/decisions.component.ts | 24 +-- .../submission-documents.component.spec.ts | 22 +-- .../submission-documents.component.ts | 25 ++- .../lfng-review/lfng-review.component.html | 169 +++--------------- .../lfng-review/lfng-review.component.spec.ts | 45 ++--- .../lfng-review/lfng-review.component.ts | 131 ++------------ .../public-application.component.html | 22 ++- .../public-application.component.ts | 20 ++- .../excl-details/excl-details.component.ts | 10 +- .../incl-details/incl-details.component.ts | 10 +- .../naru-details/naru-details.component.ts | 8 +- .../nfu-details/nfu-details.component.ts | 8 +- .../submission/parcel/parcel.component.scss | 14 -- .../submission/parcel/parcel.component.ts | 9 +- .../pfrs-details/pfrs-details.component.ts | 11 +- .../pofo-details/pofo-details.component.ts | 10 +- .../roso-details/roso-details.component.ts | 10 +- .../subd-details/subd-details.component.ts | 8 +- .../submission-details.component.ts | 14 +- .../tur-details/tur-details.component.ts | 7 +- .../src/app/features/public/public.module.ts | 8 + .../src/app/services/public/public.dto.ts | 58 +++++- .../automapper/public.automapper.profile.ts | 98 +++++++++- .../application-submission-review.service.ts | 8 + .../application-parcel.dto.ts | 1 - .../portal/public/public.controller.spec.ts | 21 +++ .../src/portal/public/public.controller.ts | 56 +++++- .../apps/alcs/src/portal/public/public.dto.ts | 112 ++++++++++++ .../alcs/src/portal/public/public.module.ts | 5 +- 34 files changed, 533 insertions(+), 544 deletions(-) diff --git a/portal-frontend/src/app/features/public/application/alc-review/alc-review.component.html b/portal-frontend/src/app/features/public/application/alc-review/alc-review.component.html index 4ea1d813f6..936712c82c 100644 --- a/portal-frontend/src/app/features/public/application/alc-review/alc-review.component.html +++ b/portal-frontend/src/app/features/public/application/alc-review/alc-review.component.html @@ -1,45 +1,9 @@ -<div *ngIf="application"> +<div *ngIf="applicationSubmission"> <div class="header"> <h3>ALC Review and Decision</h3> - <div> - <button - [routerLink]="'/application/' + application.fileNumber + '/edit'" - *ngIf="application.canEdit" - mat-flat-button - color="primary" - > - Edit Application - </button> - <button *ngIf="application.canReview" (click)="onReview(application.fileNumber)" mat-flat-button color="primary"> - Review Application - </button> - </div> </div> - <div - *ngIf=" - application.status.code === SUBMISSION_STATUS.IN_PROGRESS || - application.status.code === SUBMISSION_STATUS.IN_REVIEW_BY_LG || - application.status.code === SUBMISSION_STATUS.INCOMPLETE || - application.status.code === SUBMISSION_STATUS.WRONG_GOV || - application.status.code === SUBMISSION_STATUS.SUBMITTED_TO_LG - " - class="warning" - > - This section will update after the application is submitted to the ALC. - </div> - <div *ngIf="application.status.code === SUBMISSION_STATUS.REFUSED_TO_FORWARD_LG" class="warning"> - Application not subject to Agricultural Land Commission review. - </div> - <div - *ngIf=" - application.status.code === SUBMISSION_STATUS.SUBMITTED_TO_ALC || - application.status.code === SUBMISSION_STATUS.SUBMITTED_TO_ALC_INCOMPLETE || - application.status.code === SUBMISSION_STATUS.RECEIVED_BY_ALC || - application.status.code === SUBMISSION_STATUS.IN_REVIEW_BY_ALC || - application.status.code === SUBMISSION_STATUS.ALC_DECISION - " - > - <app-decisions [fileNumber]="application.fileNumber"></app-decisions> - <app-submission-documents [$applicationDocuments]="$applicationDocuments"></app-submission-documents> + <div> + <app-public-decisions [applicationDecisions]="applicationDecisions"></app-public-decisions> + <app-submission-documents [applicationDocuments]="applicationDocuments"></app-submission-documents> </div> </div> diff --git a/portal-frontend/src/app/features/public/application/alc-review/alc-review.component.spec.ts b/portal-frontend/src/app/features/public/application/alc-review/alc-review.component.spec.ts index 62a72d72d0..3a515a8c48 100644 --- a/portal-frontend/src/app/features/public/application/alc-review/alc-review.component.spec.ts +++ b/portal-frontend/src/app/features/public/application/alc-review/alc-review.component.spec.ts @@ -1,28 +1,18 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { createMock, DeepMocked } from '@golevelup/ts-jest'; -import { ApplicationSubmissionReviewService } from '../../../../services/application-submission-review/application-submission-review.service'; -import { AlcReviewComponent } from './alc-review.component'; +import { PublicAlcReviewComponent } from './alc-review.component'; -describe('AlcsReviewComponent', () => { - let component: AlcReviewComponent; - let fixture: ComponentFixture<AlcReviewComponent>; - let mockAppReviewService: DeepMocked<ApplicationSubmissionReviewService>; +describe('PublicAlcReviewComponent', () => { + let component: PublicAlcReviewComponent; + let fixture: ComponentFixture<PublicAlcReviewComponent>; beforeEach(async () => { - mockAppReviewService = createMock(); - await TestBed.configureTestingModule({ - providers: [ - { - provide: ApplicationSubmissionReviewService, - useValue: mockAppReviewService, - }, - ], - declarations: [AlcReviewComponent], + providers: [], + declarations: [PublicAlcReviewComponent], }).compileComponents(); - fixture = TestBed.createComponent(AlcReviewComponent); + fixture = TestBed.createComponent(PublicAlcReviewComponent); component = fixture.componentInstance; fixture.detectChanges(); }); diff --git a/portal-frontend/src/app/features/public/application/alc-review/alc-review.component.ts b/portal-frontend/src/app/features/public/application/alc-review/alc-review.component.ts index ced2da29b9..e1c8c5b643 100644 --- a/portal-frontend/src/app/features/public/application/alc-review/alc-review.component.ts +++ b/portal-frontend/src/app/features/public/application/alc-review/alc-review.component.ts @@ -1,47 +1,19 @@ -import { Component, Input, OnDestroy, OnInit } from '@angular/core'; -import { Router } from '@angular/router'; -import { BehaviorSubject, Subject, takeUntil } from 'rxjs'; -import { ApplicationDocumentDto } from '../../../../services/application-document/application-document.dto'; -import { ApplicationSubmissionReviewService } from '../../../../services/application-submission-review/application-submission-review.service'; -import { - SUBMISSION_STATUS, - ApplicationSubmissionDetailedDto, -} from '../../../../services/application-submission/application-submission.dto'; +import { Component, Input } from '@angular/core'; +import { ApplicationPortalDecisionDto } from '../../../../services/application-decision/application-decision.dto'; +import { SUBMISSION_STATUS } from '../../../../services/application-submission/application-submission.dto'; +import { PublicApplicationSubmissionDto, PublicDocumentDto } from '../../../../services/public/public.dto'; @Component({ - selector: 'app-alc-review', + selector: 'app-public-alc-review', templateUrl: './alc-review.component.html', styleUrls: ['./alc-review.component.scss'], }) -export class AlcReviewComponent implements OnInit, OnDestroy { - private $destroy = new Subject<void>(); +export class PublicAlcReviewComponent { + @Input() applicationSubmission!: PublicApplicationSubmissionDto; + @Input() applicationDocuments!: PublicDocumentDto[]; + @Input() applicationDecisions!: ApplicationPortalDecisionDto[]; - @Input() $application = new BehaviorSubject<ApplicationSubmissionDetailedDto | undefined>(undefined); - @Input() $applicationDocuments = new BehaviorSubject<ApplicationDocumentDto[]>([]); - - application: ApplicationSubmissionDetailedDto | undefined; SUBMISSION_STATUS = SUBMISSION_STATUS; - constructor(private applicationReviewService: ApplicationSubmissionReviewService, private router: Router) {} - - ngOnInit(): void { - this.$application.pipe(takeUntil(this.$destroy)).subscribe((application) => { - this.application = application; - }); - } - - ngOnDestroy(): void { - this.$destroy.next(); - this.$destroy.complete(); - } - - async onReview(fileId: string) { - if (this.application?.status.code === SUBMISSION_STATUS.SUBMITTED_TO_LG) { - const review = await this.applicationReviewService.startReview(fileId); - if (!review) { - return; - } - } - await this.router.navigateByUrl(`application/${fileId}/review`); - } + constructor() {} } diff --git a/portal-frontend/src/app/features/public/application/alc-review/decisions/decisions.component.html b/portal-frontend/src/app/features/public/application/alc-review/decisions/decisions.component.html index ee4d949dba..7657271cf1 100644 --- a/portal-frontend/src/app/features/public/application/alc-review/decisions/decisions.component.html +++ b/portal-frontend/src/app/features/public/application/alc-review/decisions/decisions.component.html @@ -1,5 +1,5 @@ -<div *ngFor="let decision of decisions; let index = index"> - <h4>Decision #{{ decisions.length - index }}</h4> +<div *ngFor="let decision of applicationDecisions; let index = index"> + <h4>Decision #{{ applicationDecisions.length - index }}</h4> <div class="decision-table"> <div> <div class="subheading2">Decision Date</div> @@ -15,7 +15,6 @@ <h4>Decision #{{ decisions.length - index }}</h4> <div class="subheading2">Decision Outcome</div> {{ decision.outcome.label }} {{ decision.isSubjectToConditions ? '- Subject to Conditions' : '' }} </div> - <div> <div class="subheading2">Decision Document</div> <div *ngFor="let document of decision.documents"> diff --git a/portal-frontend/src/app/features/public/application/alc-review/decisions/decisions.component.spec.ts b/portal-frontend/src/app/features/public/application/alc-review/decisions/decisions.component.spec.ts index f56a7194b9..ce78e37c19 100644 --- a/portal-frontend/src/app/features/public/application/alc-review/decisions/decisions.component.spec.ts +++ b/portal-frontend/src/app/features/public/application/alc-review/decisions/decisions.component.spec.ts @@ -2,18 +2,18 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { createMock } from '@golevelup/ts-jest'; import { ApplicationDecisionService } from '../../../../../services/application-decision/application-decision.service'; -import { DecisionsComponent } from './decisions.component'; +import { PublicDecisionsComponent } from './decisions.component'; -describe('DecisionsComponent', () => { - let component: DecisionsComponent; - let fixture: ComponentFixture<DecisionsComponent>; +describe('PublicDecisionsComponent', () => { + let component: PublicDecisionsComponent; + let fixture: ComponentFixture<PublicDecisionsComponent>; let mockDecisionService: ApplicationDecisionService; beforeEach(async () => { mockDecisionService = createMock(); await TestBed.configureTestingModule({ - declarations: [DecisionsComponent], + declarations: [PublicDecisionsComponent], providers: [ { provide: ApplicationDecisionService, @@ -22,7 +22,7 @@ describe('DecisionsComponent', () => { ], }).compileComponents(); - fixture = TestBed.createComponent(DecisionsComponent); + fixture = TestBed.createComponent(PublicDecisionsComponent); component = fixture.componentInstance; fixture.detectChanges(); }); diff --git a/portal-frontend/src/app/features/public/application/alc-review/decisions/decisions.component.ts b/portal-frontend/src/app/features/public/application/alc-review/decisions/decisions.component.ts index 1280cc0118..ebf506417a 100644 --- a/portal-frontend/src/app/features/public/application/alc-review/decisions/decisions.component.ts +++ b/portal-frontend/src/app/features/public/application/alc-review/decisions/decisions.component.ts @@ -3,37 +3,19 @@ import { ApplicationPortalDecisionDto } from '../../../../../services/applicatio import { ApplicationDecisionService } from '../../../../../services/application-decision/application-decision.service'; @Component({ - selector: 'app-decisions[fileNumber]', + selector: 'app-public-decisions', templateUrl: './decisions.component.html', styleUrls: ['./decisions.component.scss'], }) -export class DecisionsComponent implements OnInit, OnChanges { - @Input() fileNumber = ''; - decisions: ApplicationPortalDecisionDto[] = []; +export class PublicDecisionsComponent { + @Input() applicationDecisions: ApplicationPortalDecisionDto[] = []; constructor(private decisionService: ApplicationDecisionService) {} - ngOnInit(): void { - this.loadDecisions(); - } - - ngOnChanges(changes: SimpleChanges): void { - this.loadDecisions(); - } - async openFile(uuid: string) { const res = await this.decisionService.openFile(uuid); if (res) { window.open(res.url, '_blank'); } } - - private async loadDecisions() { - if (this.fileNumber) { - const decisions = await this.decisionService.getByFileId(this.fileNumber); - if (decisions) { - this.decisions = decisions; - } - } - } } diff --git a/portal-frontend/src/app/features/public/application/alc-review/submission-documents/submission-documents.component.spec.ts b/portal-frontend/src/app/features/public/application/alc-review/submission-documents/submission-documents.component.spec.ts index 09eb1292d3..a2f54298d3 100644 --- a/portal-frontend/src/app/features/public/application/alc-review/submission-documents/submission-documents.component.spec.ts +++ b/portal-frontend/src/app/features/public/application/alc-review/submission-documents/submission-documents.component.spec.ts @@ -1,30 +1,30 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { createMock, DeepMocked } from '@golevelup/ts-jest'; -import { ApplicationDocumentService } from '../../../../../services/application-document/application-document.service'; +import { PublicService } from '../../../../../services/public/public.service'; -import { SubmissionDocumentsComponent } from './submission-documents.component'; +import { PublicSubmissionDocumentsComponent } from './submission-documents.component'; -describe('SubmissionDocumentsComponent', () => { - let component: SubmissionDocumentsComponent; - let fixture: ComponentFixture<SubmissionDocumentsComponent>; - let mockAppDocService: DeepMocked<ApplicationDocumentService>; +describe('PublicSubmissionDocumentsComponent', () => { + let component: PublicSubmissionDocumentsComponent; + let fixture: ComponentFixture<PublicSubmissionDocumentsComponent>; + let mockPublicService: DeepMocked<PublicService>; beforeEach(async () => { - mockAppDocService = createMock(); + mockPublicService = createMock(); await TestBed.configureTestingModule({ - declarations: [SubmissionDocumentsComponent], + declarations: [PublicSubmissionDocumentsComponent], providers: [ { - provide: ApplicationDocumentService, - useValue: mockAppDocService, + provide: PublicService, + useValue: mockPublicService, }, ], schemas: [NO_ERRORS_SCHEMA], }).compileComponents(); - fixture = TestBed.createComponent(SubmissionDocumentsComponent); + fixture = TestBed.createComponent(PublicSubmissionDocumentsComponent); component = fixture.componentInstance; fixture.detectChanges(); }); diff --git a/portal-frontend/src/app/features/public/application/alc-review/submission-documents/submission-documents.component.ts b/portal-frontend/src/app/features/public/application/alc-review/submission-documents/submission-documents.component.ts index 027fbdbfea..0dc940477e 100644 --- a/portal-frontend/src/app/features/public/application/alc-review/submission-documents/submission-documents.component.ts +++ b/portal-frontend/src/app/features/public/application/alc-review/submission-documents/submission-documents.component.ts @@ -1,43 +1,42 @@ import { Component, Input, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { MatSort } from '@angular/material/sort'; import { MatTableDataSource } from '@angular/material/table'; -import { BehaviorSubject, Subject, takeUntil } from 'rxjs'; -import { ApplicationDocumentDto } from '../../../../../services/application-document/application-document.dto'; -import { ApplicationDocumentService } from '../../../../../services/application-document/application-document.service'; +import { Subject } from 'rxjs'; +import { PublicApplicationSubmissionDto, PublicDocumentDto } from '../../../../../services/public/public.dto'; +import { PublicService } from '../../../../../services/public/public.service'; @Component({ selector: 'app-submission-documents', templateUrl: './submission-documents.component.html', styleUrls: ['./submission-documents.component.scss'], }) -export class SubmissionDocumentsComponent implements OnInit, OnDestroy { +export class PublicSubmissionDocumentsComponent implements OnInit, OnDestroy { private $destroy = new Subject<void>(); displayedColumns: string[] = ['type', 'fileName', 'source', 'uploadedAt', 'actions']; - documents: ApplicationDocumentDto[] = []; + documents: PublicDocumentDto[] = []; - @Input() $applicationDocuments = new BehaviorSubject<ApplicationDocumentDto[]>([]); + @Input() applicationDocuments!: PublicDocumentDto[]; + @Input() applicationSubmission!: PublicApplicationSubmissionDto; @ViewChild(MatSort) sort!: MatSort; - dataSource: MatTableDataSource<ApplicationDocumentDto> = new MatTableDataSource<ApplicationDocumentDto>(); + dataSource: MatTableDataSource<PublicDocumentDto> = new MatTableDataSource<PublicDocumentDto>(); - constructor(private applicationDocumentService: ApplicationDocumentService) {} + constructor(private publicService: PublicService) {} ngOnInit(): void { - this.$applicationDocuments.pipe(takeUntil(this.$destroy)).subscribe((documents) => { - this.dataSource = new MatTableDataSource(documents); - }); + this.dataSource = new MatTableDataSource(this.applicationDocuments); } async openFile(uuid: string) { - const res = await this.applicationDocumentService.openFile(uuid); + const res = await this.publicService.getApplicationFileUrl(this.applicationSubmission.fileNumber, uuid); if (res) { window.open(res.url, '_blank'); } } async downloadFile(uuid: string) { - const res = await this.applicationDocumentService.downloadFile(uuid); + const res = await this.publicService.getApplicationFileUrl(this.applicationSubmission.fileNumber, uuid); if (res) { const downloadLink = document.createElement('a'); downloadLink.href = res.url; diff --git a/portal-frontend/src/app/features/public/application/lfng-review/lfng-review.component.html b/portal-frontend/src/app/features/public/application/lfng-review/lfng-review.component.html index 2ae5a57c31..e3cd36db5a 100644 --- a/portal-frontend/src/app/features/public/application/lfng-review/lfng-review.component.html +++ b/portal-frontend/src/app/features/public/application/lfng-review/lfng-review.component.html @@ -1,70 +1,11 @@ -<div *ngIf="application"> +<div *ngIf="applicationSubmission"> <div class="header"> <h3>Local/First Nation Gov Review</h3> - <div class="btns-wrapper"> - <button - *ngIf="application.canEdit || application.canReview" - mat-stroked-button - color="warn" - (click)="onCancelClicked(application.uuid)" - > - Cancel Application - </button> - <button - [routerLink]="'/application/' + application.fileNumber + '/edit'" - *ngIf="application.canEdit" - mat-flat-button - color="primary" - > - Edit Application - </button> - <button *ngIf="application.canReview" (click)="onReview(application.fileNumber)" mat-flat-button color="primary"> - Review Application - </button> - <button - [disabled]=" - !applicationReview || - (!application.canReview && application.status.code === SUBMISSION_STATUS.IN_REVIEW_BY_LG) - " - (click)="onDownloadReviewPdf(application.fileNumber)" - mat-flat-button - color="accent" - > - Download PDF - </button> - </div> </div> - <div *ngIf="application.status.code === SUBMISSION_STATUS.IN_PROGRESS" class="warning"> - <mat-icon>info</mat-icon>This section will update after the application is submitted. - </div> - <div *ngIf="!applicationReview && submittedToAlcStatus" class="warning"> + <div *ngIf="!applicationReview" class="warning"> <mat-icon>info</mat-icon>Application not subject to Local/First Nation Government review. </div> - <div - *ngIf=" - application.status.code === SUBMISSION_STATUS.SUBMITTED_TO_LG || - (application.status.code === SUBMISSION_STATUS.IN_REVIEW_BY_LG && (!applicationReview || !application.canReview)) - " - class="warning" - > - <mat-icon>info</mat-icon>Pending Local/First Nation Government review. - </div> - <div - *ngIf=" - application.status.code === SUBMISSION_STATUS.WRONG_GOV || - application.status.code === SUBMISSION_STATUS.INCOMPLETE - " - class="comment-container" - > - <div><strong>Comment for Applicant</strong></div> - {{ application.returnedComment }} - <span class="no-comment" *ngIf="!application.returnedComment">No comment added</span> - </div> - <div - *ngIf=" - applicationReview && (application.canReview || application.status.code !== SUBMISSION_STATUS.IN_REVIEW_BY_LG) - " - > + <div *ngIf="applicationReview"> <section> <h4>Contact Information</h4> <div class="review-table"> @@ -103,32 +44,17 @@ <h4>Contact Information</h4> <app-no-data *ngIf="!applicationReview.department"></app-no-data> </div> </div> - <div> - <div class="subheading2">Phone Number</div> - <div> - {{ applicationReview.phoneNumber }} - <app-no-data *ngIf="!applicationReview.phoneNumber"></app-no-data> - </div> - </div> - <div> - <div class="subheading2">Email</div> - <div> - {{ applicationReview.email }} - <app-no-data *ngIf="!applicationReview.email"></app-no-data> - </div> - </div> </div> </section> - <section *ngIf="!applicationReview.isFirstNationGovernment"> + <section *ngIf="applicationReview.isOCPDesignation !== null"> <h4>Plans & Bylaws: OCP</h4> <div class="review-table"> <div class="full-width"> - <div class="subheading2">Is the application parcel(s) subject to a Local Government OCP designation?</div> + <div class="subheading2"> + Is the applicationSubmission parcel(s) subject to a Local Government OCP designation? + </div> <div> - <span *ngIf="applicationReview.isOCPDesignation !== null">{{ - applicationReview.isOCPDesignation ? 'Yes' : 'No' - }}</span> - <app-no-data *ngIf="applicationReview.isOCPDesignation === null"></app-no-data> + {{ applicationReview.isOCPDesignation ? 'Yes' : 'No' }} </div> </div> <div *ngIf="applicationReview.isOCPDesignation"> @@ -156,16 +82,15 @@ <h4>Plans & Bylaws: OCP</h4> </div> </div> </section> - <section *ngIf="!applicationReview.isFirstNationGovernment"> + <section *ngIf="applicationReview.isSubjectToZoning !== null"> <h4>Plans & Bylaws: Zoning</h4> <div class="review-table"> <div class="full-width"> - <div class="subheading2">Is the application parcel(s) subject to a Local Government zoning designation?</div> + <div class="subheading2"> + Is the applicationSubmission parcel(s) subject to a Local Government zoning designation? + </div> <div> - <span *ngIf="applicationReview.isSubjectToZoning !== null">{{ - applicationReview.isSubjectToZoning ? 'Yes' : 'No' - }}</span> - <app-no-data *ngIf="applicationReview.isSubjectToZoning === null"></app-no-data> + {{ applicationReview.isSubjectToZoning ? 'Yes' : 'No' }} </div> </div> <div *ngIf="applicationReview.isSubjectToZoning"> @@ -203,81 +128,27 @@ <h4>Plans & Bylaws: Zoning</h4> <section> <h4>Resolution</h4> <div class="review-table"> - <div - class="full-width" - *ngIf=" - !applicationReview.isFirstNationGovernment && - (applicationReview.isOCPDesignation === null || applicationReview.isSubjectToZoning === null) - " - > - Please complete both Step 2 Plans & Bylaws: OCP and Step 3 Plans & Bylaws: Zoning to continue with this step. - </div> - <div - class="full-width" - *ngIf=" - !applicationReview.isFirstNationGovernment && - applicationReview.isOCPDesignation === false && - applicationReview.isSubjectToZoning === false - " - > - By indicating that the parcel(s) is not subject to Local Government OCP or Zoning, - <strong>no authorizing resolution is required</strong> as per S. 25 (3) or S. 29 (4) of the <em>ALC Act</em>. - The only option available is to forward this application on to the ALC. + <div class="full-width" *ngIf="applicationReview.isAuthorized === null"> + Parcels not subject to OCP or Zoning do not require local government authorization </div> - <div *ngIf="hasCompletedStepsBeforeResolution" class="full-width"> + <div *ngIf="applicationReview.isAuthorized !== null" class="full-width"> <div class="subheading2">Resolution for Application to Proceed to the ALC</div> <div> - <span *ngIf="applicationReview.isAuthorized !== null">{{ - applicationReview.isAuthorized ? 'Authorized' : 'Refuse to Authorize' - }}</span> - <app-no-data *ngIf="applicationReview.isAuthorized === null"></app-no-data> + <span>{{ applicationReview.isAuthorized ? 'Authorized' : 'Refuse to Authorize' }}</span> </div> </div> </div> </section> - <section> + <section *ngIf="resolutionDocument.length > 0"> <h4>Attachments</h4> - <div *ngIf="!hasCompletedStepsBeforeDocuments" class="review-table"> - <div class="full-width"> - Please complete Step 2 Plans & Bylaws: OCP, Step 3 Plans & Bylaws: Zoning and Step 4 Resolution to continue - with this step. - </div> - </div> - <div *ngIf="hasCompletedStepsBeforeDocuments" class="review-table"> - <div - *ngIf=" - applicationReview.isFirstNationGovernment || - applicationReview.isOCPDesignation || - applicationReview.isSubjectToZoning - " - > + <div class="review-table"> + <div> <div class="subheading2">Resolution Document</div> <div> <a class="link" (click)="openFile(document.uuid)" *ngFor="let document of resolutionDocument">{{ document.fileName }}</a> </div> - <app-no-data *ngIf="resolutionDocument.length === 0"></app-no-data> - </div> - <div *ngIf="applicationReview.isOCPDesignation || applicationReview.isSubjectToZoning"> - <div class="subheading2"> - Staff Report <span *ngIf="applicationReview.isAuthorized === false">(optional)</span> - </div> - <div> - <a class="link" (click)="openFile(document.uuid)" *ngFor="let document of staffReport">{{ - document.fileName - }}</a> - </div> - <app-no-data *ngIf="staffReport.length === 0"></app-no-data> - </div> - <div class="full-width"> - <div class="subheading2">Other Attachments (optional):</div> - <div> - <div class="document" *ngFor="let document of governmentOtherAttachments"> - <a class="link" (click)="openFile(document.uuid)">{{ document.fileName }}</a> - </div> - <app-no-data *ngIf="governmentOtherAttachments.length === 0"></app-no-data> - </div> </div> </div> </section> diff --git a/portal-frontend/src/app/features/public/application/lfng-review/lfng-review.component.spec.ts b/portal-frontend/src/app/features/public/application/lfng-review/lfng-review.component.spec.ts index d1556cc200..a14d258152 100644 --- a/portal-frontend/src/app/features/public/application/lfng-review/lfng-review.component.spec.ts +++ b/portal-frontend/src/app/features/public/application/lfng-review/lfng-review.component.spec.ts @@ -1,52 +1,31 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { createMock, DeepMocked } from '@golevelup/ts-jest'; -import { BehaviorSubject } from 'rxjs'; -import { ApplicationDocumentDto } from '../../../../services/application-document/application-document.dto'; -import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; -import { ApplicationSubmissionReviewDto } from '../../../../services/application-submission-review/application-submission-review.dto'; -import { ApplicationSubmissionReviewService } from '../../../../services/application-submission-review/application-submission-review.service'; -import { ApplicationSubmissionDetailedDto } from '../../../../services/application-submission/application-submission.dto'; -import { PdfGenerationService } from '../../../../services/pdf-generation/pdf-generation.service'; +import { PublicService } from '../../../../services/public/public.service'; -import { LfngReviewComponent } from './lfng-review.component'; +import { PublicLfngReviewComponent } from './lfng-review.component'; -describe('LfngReviewComponent', () => { - let component: LfngReviewComponent; - let fixture: ComponentFixture<LfngReviewComponent>; +describe('PublicLfngReviewComponent', () => { + let component: PublicLfngReviewComponent; + let fixture: ComponentFixture<PublicLfngReviewComponent>; - let mockAppSubReviewService: DeepMocked<ApplicationSubmissionReviewService>; - let mockPdfGenerationService: DeepMocked<PdfGenerationService>; - let mockAppDocumentService: DeepMocked<ApplicationDocumentService>; + let mockPublicService: DeepMocked<PublicService>; beforeEach(async () => { - mockAppSubReviewService = createMock(); - mockPdfGenerationService = createMock(); - mockAppDocumentService = createMock(); - - mockAppSubReviewService.$applicationReview = new BehaviorSubject<ApplicationSubmissionReviewDto | undefined>( - undefined - ); + mockPublicService = createMock(); await TestBed.configureTestingModule({ providers: [ { - provide: ApplicationSubmissionReviewService, - useValue: mockAppSubReviewService, - }, - { - provide: PdfGenerationService, - useValue: mockPdfGenerationService, - }, - { - provide: ApplicationDocumentService, - useValue: mockAppDocumentService, + provide: PublicService, + useValue: mockPublicService, }, ], - declarations: [LfngReviewComponent], + declarations: [PublicLfngReviewComponent], }).compileComponents(); - fixture = TestBed.createComponent(LfngReviewComponent); + fixture = TestBed.createComponent(PublicLfngReviewComponent); component = fixture.componentInstance; + component.applicationDocuments = []; fixture.detectChanges(); }); diff --git a/portal-frontend/src/app/features/public/application/lfng-review/lfng-review.component.ts b/portal-frontend/src/app/features/public/application/lfng-review/lfng-review.component.ts index e80935380e..e21492882c 100644 --- a/portal-frontend/src/app/features/public/application/lfng-review/lfng-review.component.ts +++ b/portal-frontend/src/app/features/public/application/lfng-review/lfng-review.component.ts @@ -1,131 +1,38 @@ -import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core'; -import { Router } from '@angular/router'; -import { BehaviorSubject, Subject, takeUntil } from 'rxjs'; -import { ApplicationDocumentDto } from '../../../../services/application-document/application-document.dto'; -import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; -import { ApplicationSubmissionReviewDto } from '../../../../services/application-submission-review/application-submission-review.dto'; -import { ApplicationSubmissionReviewService } from '../../../../services/application-submission-review/application-submission-review.service'; +import { Component, Input, OnInit } from '@angular/core'; +import { SUBMISSION_STATUS } from '../../../../services/application-submission/application-submission.dto'; import { - ApplicationSubmissionDetailedDto, - SUBMISSION_STATUS, -} from '../../../../services/application-submission/application-submission.dto'; -import { PdfGenerationService } from '../../../../services/pdf-generation/pdf-generation.service'; -import { DOCUMENT_SOURCE, DOCUMENT_TYPE } from '../../../../shared/dto/document.dto'; + PublicApplicationSubmissionDto, + PublicApplicationSubmissionReviewDto, + PublicDocumentDto, +} from '../../../../services/public/public.dto'; +import { PublicService } from '../../../../services/public/public.service'; +import { DOCUMENT_TYPE } from '../../../../shared/dto/document.dto'; @Component({ - selector: 'app-lfng-review', + selector: 'app-public-lfng-review', templateUrl: './lfng-review.component.html', styleUrls: ['./lfng-review.component.scss'], }) -export class LfngReviewComponent implements OnInit, OnDestroy { - private $destroy = new Subject<void>(); +export class PublicLfngReviewComponent implements OnInit { + @Input() applicationSubmission!: PublicApplicationSubmissionDto; + @Input() applicationDocuments!: PublicDocumentDto[]; + @Input() applicationReview: PublicApplicationSubmissionReviewDto | undefined; - @Input() $application = new BehaviorSubject<ApplicationSubmissionDetailedDto | undefined>(undefined); - @Input() $applicationDocuments = new BehaviorSubject<ApplicationDocumentDto[]>([]); - - @Output() onCancel = new EventEmitter<string>(); - - application: ApplicationSubmissionDetailedDto | undefined; - applicationReview: ApplicationSubmissionReviewDto | undefined; SUBMISSION_STATUS = SUBMISSION_STATUS; - staffReport: ApplicationDocumentDto[] = []; - resolutionDocument: ApplicationDocumentDto[] = []; - governmentOtherAttachments: ApplicationDocumentDto[] = []; - hasCompletedStepsBeforeResolution = false; - hasCompletedStepsBeforeDocuments = false; - submittedToAlcStatus = false; + resolutionDocument: PublicDocumentDto[] = []; - constructor( - private applicationReviewService: ApplicationSubmissionReviewService, - private pdfGenerationService: PdfGenerationService, - private applicationDocumentService: ApplicationDocumentService, - private router: Router - ) {} + constructor(private publicService: PublicService) {} ngOnInit(): void { - this.applicationReviewService.$applicationReview.pipe(takeUntil(this.$destroy)).subscribe((appReview) => { - if (appReview) { - this.applicationReview = appReview; - - this.hasCompletedStepsBeforeResolution = - appReview.isFirstNationGovernment || - (!appReview.isFirstNationGovernment && - appReview.isOCPDesignation !== null && - appReview.isSubjectToZoning !== null && - (appReview.isOCPDesignation === true || appReview.isSubjectToZoning === true)); - - this.hasCompletedStepsBeforeDocuments = - appReview.isFirstNationGovernment || - (appReview.isAuthorized !== null && - appReview.isOCPDesignation !== null && - appReview.isSubjectToZoning !== null) || - (appReview.isAuthorized === null && - appReview.isOCPDesignation === false && - appReview.isSubjectToZoning === false); - } - }); - - this.$application.pipe(takeUntil(this.$destroy)).subscribe((application) => { - this.application = application; - this.submittedToAlcStatus = !!this.application?.submissionStatuses.find( - (s) => s.statusTypeCode === SUBMISSION_STATUS.SUBMITTED_TO_ALC && !!s.effectiveDate - ); - this.loadReview(); - }); - - this.$applicationDocuments.subscribe((documents) => { - this.staffReport = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.STAFF_REPORT); - this.resolutionDocument = documents.filter( - (document) => document.type?.code === DOCUMENT_TYPE.RESOLUTION_DOCUMENT - ); - this.governmentOtherAttachments = documents.filter( - (document) => document.type?.code === DOCUMENT_TYPE.OTHER && document.source === DOCUMENT_SOURCE.LFNG - ); - }); - } - - async onDownloadReviewPdf(fileNumber: string | undefined) { - if (fileNumber) { - await this.pdfGenerationService.generateReview(fileNumber); - } - } - - async loadReview() { - if ( - this.application && - this.application.typeCode !== 'TURP' && - (this.submittedToAlcStatus || - (this.application.status.code === SUBMISSION_STATUS.IN_REVIEW_BY_LG && this.application.canReview)) - ) { - await this.applicationReviewService.getByFileId(this.application.fileNumber); - } else { - this.applicationReview = undefined; - } + this.resolutionDocument = this.applicationDocuments.filter( + (document) => document.type?.code === DOCUMENT_TYPE.RESOLUTION_DOCUMENT + ); } async openFile(uuid: string) { - const res = await this.applicationDocumentService.openFile(uuid); + const res = await this.publicService.getApplicationFileUrl(this.applicationSubmission.fileNumber, uuid); if (res) { window.open(res.url, '_blank'); } } - - async onReview(fileId: string) { - if (this.application?.status.code === SUBMISSION_STATUS.SUBMITTED_TO_LG) { - const review = await this.applicationReviewService.startReview(fileId); - if (!review) { - return; - } - } - await this.router.navigateByUrl(`application/${fileId}/review`); - } - - onCancelClicked(fileNumber: string) { - this.onCancel.emit(fileNumber); - } - - ngOnDestroy(): void { - this.$destroy.next(); - this.$destroy.complete(); - } } diff --git a/portal-frontend/src/app/features/public/application/public-application.component.html b/portal-frontend/src/app/features/public/application/public-application.component.html index 8bf92b73ce..addc35e61c 100644 --- a/portal-frontend/src/app/features/public/application/public-application.component.html +++ b/portal-frontend/src/app/features/public/application/public-application.component.html @@ -28,8 +28,9 @@ <h4 *ngIf="submission">Application ID: {{ submission.fileNumber }}</h4> </div> </div> </div> -<button routerLink="/search" mat-button color="accent"> - <mat-icon>chevron_left</mat-icon>Return to Search Results +<button routerLink="/public" mat-button color="accent"> + <mat-icon>chevron_left</mat-icon> + Return to Search Results </button> <div> <div class="navigation"> @@ -50,10 +51,23 @@ <h3>Applicant Submission</h3> </div> </mat-tab> <mat-tab label="Local/First Nation Gov Review"> - <div class="content">//TODO</div> + <div *ngIf="submission" class="content"> + <app-public-lfng-review + [applicationSubmission]="submission" + [applicationDocuments]="documents" + [applicationReview]="review" + > + </app-public-lfng-review> + </div> </mat-tab> <mat-tab label="ALC Review and Decision"> - <div class="content">//TODO</div> + <div *ngIf="submission" class="content"> + <app-public-alc-review + [applicationDocuments]="documents" + [applicationSubmission]="submission" + [applicationDecisions]="decisions" + ></app-public-alc-review> + </div> </mat-tab> </mat-tab-group> </div> diff --git a/portal-frontend/src/app/features/public/application/public-application.component.ts b/portal-frontend/src/app/features/public/application/public-application.component.ts index f3700a1941..84cba66c20 100644 --- a/portal-frontend/src/app/features/public/application/public-application.component.ts +++ b/portal-frontend/src/app/features/public/application/public-application.component.ts @@ -1,10 +1,14 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { Subject, takeUntil } from 'rxjs'; -import { ApplicationDocumentDto } from '../../../services/application-document/application-document.dto'; -import { ApplicationParcelDto } from '../../../services/application-parcel/application-parcel.dto'; +import { ApplicationPortalDecisionDto } from '../../../services/application-decision/application-decision.dto'; import { SUBMISSION_STATUS } from '../../../services/application-submission/application-submission.dto'; -import { PublicApplicationSubmissionDto } from '../../../services/public/public.dto'; +import { + PublicApplicationParcelDto, + PublicApplicationSubmissionDto, + PublicApplicationSubmissionReviewDto, + PublicDocumentDto, +} from '../../../services/public/public.dto'; import { PublicService } from '../../../services/public/public.service'; @Component({ @@ -18,8 +22,10 @@ export class PublicApplicationComponent implements OnInit, OnDestroy { SUBMISSION_STATUS = SUBMISSION_STATUS; submission: PublicApplicationSubmissionDto | undefined; - documents: ApplicationDocumentDto[] = []; - parcels: ApplicationParcelDto[] = []; + review: PublicApplicationSubmissionReviewDto | undefined; + documents: PublicDocumentDto[] = []; + parcels: PublicApplicationParcelDto[] = []; + decisions: ApplicationPortalDecisionDto[] = []; constructor(private publicService: PublicService, private route: ActivatedRoute) {} @@ -35,11 +41,13 @@ export class PublicApplicationComponent implements OnInit, OnDestroy { private async loadApplication(fileId: string) { const res = await this.publicService.getApplication(fileId); if (res) { - const { submission, documents, parcels } = res; + const { submission, documents, parcels, review, decisions } = res; this.submission = submission; this.documents = documents; this.parcels = parcels; + this.review = review; + this.decisions = decisions; } } diff --git a/portal-frontend/src/app/features/public/application/submission/excl-details/excl-details.component.ts b/portal-frontend/src/app/features/public/application/submission/excl-details/excl-details.component.ts index cc7b23fc89..43a3f4c95e 100644 --- a/portal-frontend/src/app/features/public/application/submission/excl-details/excl-details.component.ts +++ b/portal-frontend/src/app/features/public/application/submission/excl-details/excl-details.component.ts @@ -1,8 +1,6 @@ import { Component, Input } from '@angular/core'; import { Router } from '@angular/router'; -import { ApplicationDocumentDto } from '../../../../../services/application-document/application-document.dto'; -import { ApplicationDocumentService } from '../../../../../services/application-document/application-document.service'; -import { PublicApplicationSubmissionDto } from '../../../../../services/public/public.dto'; +import { PublicApplicationSubmissionDto, PublicDocumentDto } from '../../../../../services/public/public.dto'; import { PublicService } from '../../../../../services/public/public.service'; import { DOCUMENT_TYPE } from '../../../../../shared/dto/document.dto'; @@ -14,15 +12,15 @@ import { DOCUMENT_TYPE } from '../../../../../shared/dto/document.dto'; export class ExclDetailsComponent { @Input() applicationSubmission!: PublicApplicationSubmissionDto; - @Input() set applicationDocuments(documents: ApplicationDocumentDto[]) { + @Input() set applicationDocuments(documents: PublicDocumentDto[]) { this.proposalMap = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.PROPOSAL_MAP); this.reportOfPublicHearing = documents.filter( (document) => document.type?.code === DOCUMENT_TYPE.REPORT_OF_PUBLIC_HEARING ); } - proposalMap: ApplicationDocumentDto[] = []; - reportOfPublicHearing: ApplicationDocumentDto[] = []; + proposalMap: PublicDocumentDto[] = []; + reportOfPublicHearing: PublicDocumentDto[] = []; constructor(private router: Router, private publicService: PublicService) {} diff --git a/portal-frontend/src/app/features/public/application/submission/incl-details/incl-details.component.ts b/portal-frontend/src/app/features/public/application/submission/incl-details/incl-details.component.ts index 53e325f10f..e08695999c 100644 --- a/portal-frontend/src/app/features/public/application/submission/incl-details/incl-details.component.ts +++ b/portal-frontend/src/app/features/public/application/submission/incl-details/incl-details.component.ts @@ -1,8 +1,6 @@ import { Component, Input } from '@angular/core'; import { Router } from '@angular/router'; -import { ApplicationDocumentDto } from '../../../../../services/application-document/application-document.dto'; -import { ApplicationDocumentService } from '../../../../../services/application-document/application-document.service'; -import { PublicApplicationSubmissionDto } from '../../../../../services/public/public.dto'; +import { PublicApplicationSubmissionDto, PublicDocumentDto } from '../../../../../services/public/public.dto'; import { PublicService } from '../../../../../services/public/public.service'; import { DOCUMENT_TYPE } from '../../../../../shared/dto/document.dto'; @@ -12,12 +10,12 @@ import { DOCUMENT_TYPE } from '../../../../../shared/dto/document.dto'; styleUrls: ['./incl-details.component.scss'], }) export class InclDetailsComponent { - proposalMap: ApplicationDocumentDto[] = []; - reportOfPublicHearing: ApplicationDocumentDto[] = []; + proposalMap: PublicDocumentDto[] = []; + reportOfPublicHearing: PublicDocumentDto[] = []; @Input() applicationSubmission!: PublicApplicationSubmissionDto; - @Input() set applicationDocuments(documents: ApplicationDocumentDto[]) { + @Input() set applicationDocuments(documents: PublicDocumentDto[]) { this.proposalMap = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.PROPOSAL_MAP); this.reportOfPublicHearing = documents.filter( (document) => document.type?.code === DOCUMENT_TYPE.REPORT_OF_PUBLIC_HEARING diff --git a/portal-frontend/src/app/features/public/application/submission/naru-details/naru-details.component.ts b/portal-frontend/src/app/features/public/application/submission/naru-details/naru-details.component.ts index e593aff636..f4f702d73c 100644 --- a/portal-frontend/src/app/features/public/application/submission/naru-details/naru-details.component.ts +++ b/portal-frontend/src/app/features/public/application/submission/naru-details/naru-details.component.ts @@ -1,8 +1,6 @@ import { Component, Input } from '@angular/core'; import { Router } from '@angular/router'; -import { ApplicationDocumentDto } from '../../../../../services/application-document/application-document.dto'; -import { ApplicationDocumentService } from '../../../../../services/application-document/application-document.service'; -import { PublicApplicationSubmissionDto } from '../../../../../services/public/public.dto'; +import { PublicApplicationSubmissionDto, PublicDocumentDto } from '../../../../../services/public/public.dto'; import { PublicService } from '../../../../../services/public/public.service'; import { DOCUMENT_TYPE } from '../../../../../shared/dto/document.dto'; @@ -12,10 +10,10 @@ import { DOCUMENT_TYPE } from '../../../../../shared/dto/document.dto'; styleUrls: ['./naru-details.component.scss'], }) export class NaruDetailsComponent { - proposalMap: ApplicationDocumentDto[] = []; + proposalMap: PublicDocumentDto[] = []; @Input() applicationSubmission!: PublicApplicationSubmissionDto; - @Input() set applicationDocuments(documents: ApplicationDocumentDto[]) { + @Input() set applicationDocuments(documents: PublicDocumentDto[]) { this.proposalMap = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.PROPOSAL_MAP); } diff --git a/portal-frontend/src/app/features/public/application/submission/nfu-details/nfu-details.component.ts b/portal-frontend/src/app/features/public/application/submission/nfu-details/nfu-details.component.ts index d0642d7090..27ff3c3d23 100644 --- a/portal-frontend/src/app/features/public/application/submission/nfu-details/nfu-details.component.ts +++ b/portal-frontend/src/app/features/public/application/submission/nfu-details/nfu-details.component.ts @@ -1,8 +1,6 @@ import { Component, Input } from '@angular/core'; import { Router } from '@angular/router'; -import { ApplicationDocumentDto } from '../../../../../services/application-document/application-document.dto'; -import { ApplicationDocumentService } from '../../../../../services/application-document/application-document.service'; -import { PublicApplicationSubmissionDto } from '../../../../../services/public/public.dto'; +import { PublicApplicationSubmissionDto, PublicDocumentDto } from '../../../../../services/public/public.dto'; import { PublicService } from '../../../../../services/public/public.service'; import { DOCUMENT_TYPE } from '../../../../../shared/dto/document.dto'; @@ -14,11 +12,11 @@ import { DOCUMENT_TYPE } from '../../../../../shared/dto/document.dto'; export class NfuDetailsComponent { @Input() applicationSubmission!: PublicApplicationSubmissionDto; - @Input() set applicationDocuments(documents: ApplicationDocumentDto[]) { + @Input() set applicationDocuments(documents: PublicDocumentDto[]) { this.proposalMap = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.PROPOSAL_MAP); } - proposalMap: ApplicationDocumentDto[] = []; + proposalMap: PublicDocumentDto[] = []; constructor(private router: Router, private publicService: PublicService) {} diff --git a/portal-frontend/src/app/features/public/application/submission/parcel/parcel.component.scss b/portal-frontend/src/app/features/public/application/submission/parcel/parcel.component.scss index a706f903ba..81d88321d1 100644 --- a/portal-frontend/src/app/features/public/application/submission/parcel/parcel.component.scss +++ b/portal-frontend/src/app/features/public/application/submission/parcel/parcel.component.scss @@ -18,20 +18,6 @@ .full-width { grid-column: 1/3; } - - .edit-button { - grid-column: 1/3; - } - - @media screen and (min-width: $tabletBreakpoint) { - .full-width { - grid-column: 1/5; - } - - .edit-button { - grid-column: 1/5; - } - } } .crown-land { diff --git a/portal-frontend/src/app/features/public/application/submission/parcel/parcel.component.ts b/portal-frontend/src/app/features/public/application/submission/parcel/parcel.component.ts index 0a4a1d2da5..9e17cad331 100644 --- a/portal-frontend/src/app/features/public/application/submission/parcel/parcel.component.ts +++ b/portal-frontend/src/app/features/public/application/submission/parcel/parcel.component.ts @@ -1,10 +1,7 @@ import { Component, Input } from '@angular/core'; import { Subject } from 'rxjs'; -import { - ApplicationParcelDto, - PARCEL_OWNERSHIP_TYPE, -} from '../../../../../services/application-parcel/application-parcel.dto'; -import { PublicApplicationSubmissionDto } from '../../../../../services/public/public.dto'; +import { PARCEL_OWNERSHIP_TYPE } from '../../../../../services/application-parcel/application-parcel.dto'; +import { PublicApplicationParcelDto, PublicApplicationSubmissionDto } from '../../../../../services/public/public.dto'; @Component({ selector: 'app-parcel', @@ -15,7 +12,7 @@ export class ParcelComponent { $destroy = new Subject<void>(); @Input() applicationSubmission!: PublicApplicationSubmissionDto; - @Input() parcels: ApplicationParcelDto[] = []; + @Input() parcels: PublicApplicationParcelDto[] = []; PARCEL_OWNERSHIP_TYPES = PARCEL_OWNERSHIP_TYPE; pageTitle: string = 'Identify Parcel(s) Under Application'; diff --git a/portal-frontend/src/app/features/public/application/submission/pfrs-details/pfrs-details.component.ts b/portal-frontend/src/app/features/public/application/submission/pfrs-details/pfrs-details.component.ts index da1bd6a17b..f529357962 100644 --- a/portal-frontend/src/app/features/public/application/submission/pfrs-details/pfrs-details.component.ts +++ b/portal-frontend/src/app/features/public/application/submission/pfrs-details/pfrs-details.component.ts @@ -1,11 +1,8 @@ import { Component, Input } from '@angular/core'; import { Router } from '@angular/router'; -import { ApplicationDocumentDto } from '../../../../../services/application-document/application-document.dto'; -import { ApplicationDocumentService } from '../../../../../services/application-document/application-document.service'; -import { PublicApplicationSubmissionDto } from '../../../../../services/public/public.dto'; +import { PublicApplicationSubmissionDto, PublicDocumentDto } from '../../../../../services/public/public.dto'; import { PublicService } from '../../../../../services/public/public.service'; import { DOCUMENT_TYPE } from '../../../../../shared/dto/document.dto'; -import { PublicApplicationComponent } from '../../public-application.component'; @Component({ selector: 'app-pfrs-details[applicationSubmission]', @@ -15,13 +12,13 @@ import { PublicApplicationComponent } from '../../public-application.component'; export class PfrsDetailsComponent { @Input() applicationSubmission!: PublicApplicationSubmissionDto; - @Input() set applicationDocuments(documents: ApplicationDocumentDto[]) { + @Input() set applicationDocuments(documents: PublicDocumentDto[]) { this.crossSections = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.CROSS_SECTIONS); this.proposalMap = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.PROPOSAL_MAP); } - crossSections: ApplicationDocumentDto[] = []; - proposalMap: ApplicationDocumentDto[] = []; + crossSections: PublicDocumentDto[] = []; + proposalMap: PublicDocumentDto[] = []; constructor(private router: Router, private publicService: PublicService) {} diff --git a/portal-frontend/src/app/features/public/application/submission/pofo-details/pofo-details.component.ts b/portal-frontend/src/app/features/public/application/submission/pofo-details/pofo-details.component.ts index 11c3f8cef4..9b48d576c5 100644 --- a/portal-frontend/src/app/features/public/application/submission/pofo-details/pofo-details.component.ts +++ b/portal-frontend/src/app/features/public/application/submission/pofo-details/pofo-details.component.ts @@ -1,8 +1,6 @@ import { Component, Input } from '@angular/core'; import { Router } from '@angular/router'; -import { ApplicationDocumentDto } from '../../../../../services/application-document/application-document.dto'; -import { ApplicationDocumentService } from '../../../../../services/application-document/application-document.service'; -import { PublicApplicationSubmissionDto } from '../../../../../services/public/public.dto'; +import { PublicApplicationSubmissionDto, PublicDocumentDto } from '../../../../../services/public/public.dto'; import { PublicService } from '../../../../../services/public/public.service'; import { DOCUMENT_TYPE } from '../../../../../shared/dto/document.dto'; @@ -14,13 +12,13 @@ import { DOCUMENT_TYPE } from '../../../../../shared/dto/document.dto'; export class PofoDetailsComponent { @Input() applicationSubmission!: PublicApplicationSubmissionDto; - @Input() set applicationDocuments(documents: ApplicationDocumentDto[]) { + @Input() set applicationDocuments(documents: PublicDocumentDto[]) { this.crossSections = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.CROSS_SECTIONS); this.proposalMap = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.PROPOSAL_MAP); } - crossSections: ApplicationDocumentDto[] = []; - proposalMap: ApplicationDocumentDto[] = []; + crossSections: PublicDocumentDto[] = []; + proposalMap: PublicDocumentDto[] = []; constructor(private router: Router, private publicService: PublicService) {} diff --git a/portal-frontend/src/app/features/public/application/submission/roso-details/roso-details.component.ts b/portal-frontend/src/app/features/public/application/submission/roso-details/roso-details.component.ts index 9ab2fc15d9..44bb4f91d5 100644 --- a/portal-frontend/src/app/features/public/application/submission/roso-details/roso-details.component.ts +++ b/portal-frontend/src/app/features/public/application/submission/roso-details/roso-details.component.ts @@ -1,8 +1,6 @@ import { Component, Input } from '@angular/core'; import { Router } from '@angular/router'; -import { ApplicationDocumentDto } from '../../../../../services/application-document/application-document.dto'; -import { ApplicationDocumentService } from '../../../../../services/application-document/application-document.service'; -import { PublicApplicationSubmissionDto } from '../../../../../services/public/public.dto'; +import { PublicApplicationSubmissionDto, PublicDocumentDto } from '../../../../../services/public/public.dto'; import { PublicService } from '../../../../../services/public/public.service'; import { DOCUMENT_TYPE } from '../../../../../shared/dto/document.dto'; @@ -14,13 +12,13 @@ import { DOCUMENT_TYPE } from '../../../../../shared/dto/document.dto'; export class RosoDetailsComponent { @Input() applicationSubmission!: PublicApplicationSubmissionDto; - @Input() set applicationDocuments(documents: ApplicationDocumentDto[]) { + @Input() set applicationDocuments(documents: PublicDocumentDto[]) { this.crossSections = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.CROSS_SECTIONS); this.proposalMap = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.PROPOSAL_MAP); } - crossSections: ApplicationDocumentDto[] = []; - proposalMap: ApplicationDocumentDto[] = []; + crossSections: PublicDocumentDto[] = []; + proposalMap: PublicDocumentDto[] = []; constructor(private router: Router, private publicService: PublicService) {} diff --git a/portal-frontend/src/app/features/public/application/submission/subd-details/subd-details.component.ts b/portal-frontend/src/app/features/public/application/submission/subd-details/subd-details.component.ts index a2f5720ac4..e9bf08d879 100644 --- a/portal-frontend/src/app/features/public/application/submission/subd-details/subd-details.component.ts +++ b/portal-frontend/src/app/features/public/application/submission/subd-details/subd-details.component.ts @@ -1,8 +1,6 @@ import { Component, Input } from '@angular/core'; import { Router } from '@angular/router'; -import { ApplicationDocumentDto } from '../../../../../services/application-document/application-document.dto'; -import { ApplicationDocumentService } from '../../../../../services/application-document/application-document.service'; -import { PublicApplicationSubmissionDto } from '../../../../../services/public/public.dto'; +import { PublicApplicationSubmissionDto, PublicDocumentDto } from '../../../../../services/public/public.dto'; import { PublicService } from '../../../../../services/public/public.service'; import { DOCUMENT_TYPE } from '../../../../../shared/dto/document.dto'; @@ -14,11 +12,11 @@ import { DOCUMENT_TYPE } from '../../../../../shared/dto/document.dto'; export class SubdDetailsComponent { @Input() applicationSubmission!: PublicApplicationSubmissionDto; - @Input() set applicationDocuments(documents: ApplicationDocumentDto[]) { + @Input() set applicationDocuments(documents: PublicDocumentDto[]) { this.proposalMap = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.PROPOSAL_MAP); } - proposalMap: ApplicationDocumentDto[] = []; + proposalMap: PublicDocumentDto[] = []; constructor(private router: Router, private publicService: PublicService) {} diff --git a/portal-frontend/src/app/features/public/application/submission/submission-details.component.ts b/portal-frontend/src/app/features/public/application/submission/submission-details.component.ts index c98f76888a..5849b23130 100644 --- a/portal-frontend/src/app/features/public/application/submission/submission-details.component.ts +++ b/portal-frontend/src/app/features/public/application/submission/submission-details.component.ts @@ -1,11 +1,15 @@ import { Component, Input, OnDestroy, OnInit } from '@angular/core'; import { Subject } from 'rxjs'; -import { ApplicationDocumentDto } from '../../../../services/application-document/application-document.dto'; import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; -import { ApplicationParcelDto, PARCEL_TYPE } from '../../../../services/application-parcel/application-parcel.dto'; +import { PARCEL_TYPE } from '../../../../services/application-parcel/application-parcel.dto'; import { LocalGovernmentDto } from '../../../../services/code/code.dto'; import { CodeService } from '../../../../services/code/code.service'; -import { PublicApplicationSubmissionDto, PublicOwnerDto } from '../../../../services/public/public.dto'; +import { + PublicApplicationParcelDto, + PublicApplicationSubmissionDto, + PublicDocumentDto, + PublicOwnerDto, +} from '../../../../services/public/public.dto'; import { OWNER_TYPE } from '../../../../shared/dto/owner.dto'; @Component({ @@ -17,8 +21,8 @@ export class SubmissionDetailsComponent implements OnInit, OnDestroy { $destroy = new Subject<void>(); @Input() applicationSubmission!: PublicApplicationSubmissionDto; - @Input() applicationDocuments: ApplicationDocumentDto[] = []; - @Input() applicationParcels: ApplicationParcelDto[] = []; + @Input() applicationDocuments: PublicDocumentDto[] = []; + @Input() applicationParcels: PublicApplicationParcelDto[] = []; parcelType = PARCEL_TYPE; primaryContact: PublicOwnerDto | undefined; diff --git a/portal-frontend/src/app/features/public/application/submission/tur-details/tur-details.component.ts b/portal-frontend/src/app/features/public/application/submission/tur-details/tur-details.component.ts index a448a06fae..11ff6e4162 100644 --- a/portal-frontend/src/app/features/public/application/submission/tur-details/tur-details.component.ts +++ b/portal-frontend/src/app/features/public/application/submission/tur-details/tur-details.component.ts @@ -1,7 +1,6 @@ import { Component, Input } from '@angular/core'; import { Router } from '@angular/router'; -import { ApplicationDocumentDto } from '../../../../../services/application-document/application-document.dto'; -import { PublicApplicationSubmissionDto } from '../../../../../services/public/public.dto'; +import { PublicApplicationSubmissionDto, PublicDocumentDto } from '../../../../../services/public/public.dto'; import { PublicService } from '../../../../../services/public/public.service'; import { DOCUMENT_TYPE } from '../../../../../shared/dto/document.dto'; @@ -12,11 +11,11 @@ import { DOCUMENT_TYPE } from '../../../../../shared/dto/document.dto'; }) export class TurDetailsComponent { @Input() applicationSubmission!: PublicApplicationSubmissionDto; - @Input() set applicationDocuments(documents: ApplicationDocumentDto[]) { + @Input() set applicationDocuments(documents: PublicDocumentDto[]) { this.proposalMap = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.PROPOSAL_MAP); } - proposalMap: ApplicationDocumentDto[] = []; + proposalMap: PublicDocumentDto[] = []; constructor(private router: Router, private publicService: PublicService) {} diff --git a/portal-frontend/src/app/features/public/public.module.ts b/portal-frontend/src/app/features/public/public.module.ts index 57b0fa785e..d4df75e0df 100644 --- a/portal-frontend/src/app/features/public/public.module.ts +++ b/portal-frontend/src/app/features/public/public.module.ts @@ -6,6 +6,10 @@ import { MatSortModule } from '@angular/material/sort'; import { MatTreeModule } from '@angular/material/tree'; import { RouterModule, Routes } from '@angular/router'; import { SharedModule } from '../../shared/shared.module'; +import { PublicAlcReviewComponent } from './application/alc-review/alc-review.component'; +import { PublicDecisionsComponent } from './application/alc-review/decisions/decisions.component'; +import { PublicSubmissionDocumentsComponent } from './application/alc-review/submission-documents/submission-documents.component'; +import { PublicLfngReviewComponent } from './application/lfng-review/lfng-review.component'; import { PublicApplicationComponent } from './application/public-application.component'; import { SubmissionDetailsModule } from './application/submission/submission-details.module'; import { ApplicationSearchTableComponent } from './search/application-search-table/application-search-table.component'; @@ -35,6 +39,10 @@ const routes: Routes = [ FileTypeFilterDropDownComponent, SearchListComponent, PublicApplicationComponent, + PublicLfngReviewComponent, + PublicAlcReviewComponent, + PublicSubmissionDocumentsComponent, + PublicDecisionsComponent, ], imports: [ CommonModule, diff --git a/portal-frontend/src/app/services/public/public.dto.ts b/portal-frontend/src/app/services/public/public.dto.ts index 5c49d34add..ba6f3031d3 100644 --- a/portal-frontend/src/app/services/public/public.dto.ts +++ b/portal-frontend/src/app/services/public/public.dto.ts @@ -1,6 +1,7 @@ +import { BaseCodeDto } from '../../shared/dto/base.dto'; +import { DocumentTypeDto } from '../../shared/dto/document.dto'; import { OwnerTypeDto } from '../../shared/dto/owner.dto'; -import { ApplicationDocumentDto } from '../application-document/application-document.dto'; -import { ApplicationParcelDto } from '../application-parcel/application-parcel.dto'; +import { ApplicationPortalDecisionDto } from '../application-decision/application-decision.dto'; import { ApplicationStatusDto, NaruSubtypeDto, @@ -9,8 +10,10 @@ import { export interface GetPublicApplicationResponseDto { submission: PublicApplicationSubmissionDto; - parcels: ApplicationParcelDto[]; - documents: ApplicationDocumentDto[]; + parcels: PublicApplicationParcelDto[]; + documents: PublicDocumentDto[]; + review?: PublicApplicationSubmissionReviewDto; + decisions: ApplicationPortalDecisionDto[]; } export interface PublicOwnerDto { @@ -131,3 +134,50 @@ export interface PublicApplicationSubmissionDto { exclShareGovernmentBorders: boolean | null; inclGovernmentOwnsAllParcels?: boolean | null; } + +export interface PublicApplicationSubmissionReviewDto { + applicationFileNumber: string; + localGovernmentFileNumber: string | null; + firstName: string | null; + lastName: string | null; + position: string | null; + department: string | null; + isOCPDesignation: boolean | null; + OCPBylawName: string | null; + OCPDesignation: string | null; + OCPConsistent: boolean | null; + isSubjectToZoning: boolean | null; + zoningBylawName: string | null; + zoningDesignation: string | null; + zoningMinimumLotSize: string | null; + isZoningConsistent: boolean | null; + isAuthorized: boolean | null; +} + +export interface PublicApplicationParcelDto { + uuid: string; + pid?: string | null; + pin?: string | null; + legalDescription?: string | null; + civicAddress?: string | null; + mapAreaHectares?: number | null; + purchasedDate?: number | null; + isFarm?: boolean | null; + ownershipTypeCode?: string | null; + crownLandOwnerType?: string | null; + ownershipType?: BaseCodeDto; + parcelType: string; + alrArea: number | null; + owners: PublicOwnerDto[]; +} + +export interface PublicDocumentDto { + description?: string; + uuid: string; + type?: DocumentTypeDto; + documentUuid: string; + fileName: string; + fileSize?: number; + mimeType: string; + uploadedAt: number; +} diff --git a/services/apps/alcs/src/common/automapper/public.automapper.profile.ts b/services/apps/alcs/src/common/automapper/public.automapper.profile.ts index c463e68068..d1b49b784b 100644 --- a/services/apps/alcs/src/common/automapper/public.automapper.profile.ts +++ b/services/apps/alcs/src/common/automapper/public.automapper.profile.ts @@ -1,12 +1,25 @@ import { createMap, forMember, mapFrom, Mapper } from '@automapper/core'; import { AutomapperProfile, InjectMapper } from '@automapper/nestjs'; import { Injectable } from '@nestjs/common'; +import { ApplicationDocumentDto } from '../../alcs/application/application-document/application-document.dto'; +import { ApplicationDocument } from '../../alcs/application/application-document/application-document.entity'; +import { ApplicationSubmissionReview } from '../../portal/application-submission-review/application-submission-review.entity'; +import { ApplicationOwnerDto } from '../../portal/application-submission/application-owner/application-owner.dto'; import { ApplicationOwner } from '../../portal/application-submission/application-owner/application-owner.entity'; +import { ApplicationParcelDto } from '../../portal/application-submission/application-parcel/application-parcel.dto'; +import { ApplicationParcel } from '../../portal/application-submission/application-parcel/application-parcel.entity'; import { ApplicationSubmission } from '../../portal/application-submission/application-submission.entity'; import { + PublicApplicationParcelDto, PublicApplicationSubmissionDto, + PublicApplicationSubmissionReviewDto, + PublicDocumentDto, PublicOwnerDto, } from '../../portal/public/public.dto'; +import { + ParcelOwnershipType, + ParcelOwnershipTypeDto, +} from '../entities/parcel-ownership-type/parcel-ownership-type.entity'; @Injectable() export class PublicAutomapperProfile extends AutomapperProfile { @@ -33,7 +46,90 @@ export class PublicAutomapperProfile extends AutomapperProfile { }), ), ); - createMap(mapper, ApplicationOwner, PublicOwnerDto); + + createMap( + mapper, + ApplicationOwner, + PublicOwnerDto, + forMember( + (pd) => pd.displayName, + mapFrom((p) => `${p.firstName} ${p.lastName}`), + ), + ); + + createMap( + mapper, + ApplicationParcel, + PublicApplicationParcelDto, + forMember( + (pd) => pd.ownershipTypeCode, + mapFrom((p) => p.ownershipTypeCode), + ), + forMember( + (pd) => pd.purchasedDate, + mapFrom((p) => p.purchasedDate?.getTime()), + ), + forMember( + (p) => p.owners, + mapFrom((pd) => { + if (pd.owners) { + return this.mapper.mapArray( + pd.owners, + ApplicationOwner, + PublicOwnerDto, + ); + } else { + return []; + } + }), + ), + forMember( + (p) => p.ownershipType, + mapFrom((pd) => { + if (pd.ownershipType) { + return this.mapper.map( + pd.ownershipType, + ParcelOwnershipType, + ParcelOwnershipTypeDto, + ); + } else { + return undefined; + } + }), + ), + ); + + createMap( + mapper, + ApplicationSubmissionReview, + PublicApplicationSubmissionReviewDto, + ); + + createMap( + mapper, + ApplicationDocument, + PublicDocumentDto, + forMember( + (a) => a.mimeType, + mapFrom((ad) => ad.document.mimeType), + ), + forMember( + (a) => a.fileName, + mapFrom((ad) => ad.document.fileName), + ), + forMember( + (a) => a.fileSize, + mapFrom((ad) => ad.document.fileSize), + ), + forMember( + (a) => a.uploadedAt, + mapFrom((ad) => ad.document.uploadedAt.getTime()), + ), + forMember( + (a) => a.documentUuid, + mapFrom((ad) => ad.document.uuid), + ), + ); }; } } diff --git a/services/apps/alcs/src/portal/application-submission-review/application-submission-review.service.ts b/services/apps/alcs/src/portal/application-submission-review/application-submission-review.service.ts index 93c25f7da2..512fa2d345 100644 --- a/services/apps/alcs/src/portal/application-submission-review/application-submission-review.service.ts +++ b/services/apps/alcs/src/portal/application-submission-review/application-submission-review.service.ts @@ -256,6 +256,14 @@ export class ApplicationSubmissionReviewService { }; } + getForPublicReview(fileNumber: string) { + return this.applicationSubmissionReviewRepository.findOne({ + where: { + applicationFileNumber: fileNumber, + }, + }); + } + async delete(applicationReview: ApplicationSubmissionReview) { await this.applicationSubmissionReviewRepository.remove(applicationReview); } diff --git a/services/apps/alcs/src/portal/application-submission/application-parcel/application-parcel.dto.ts b/services/apps/alcs/src/portal/application-submission/application-parcel/application-parcel.dto.ts index b00a1195fb..f52e51f788 100644 --- a/services/apps/alcs/src/portal/application-submission/application-parcel/application-parcel.dto.ts +++ b/services/apps/alcs/src/portal/application-submission/application-parcel/application-parcel.dto.ts @@ -7,7 +7,6 @@ import { IsOptional, IsString, } from 'class-validator'; -import { Column } from 'typeorm'; import { ApplicationDocumentDto } from '../../../alcs/application/application-document/application-document.dto'; import { BaseCodeDto } from '../../../common/dtos/base.dto'; import { ApplicationOwnerDetailedDto } from '../application-owner/application-owner.dto'; diff --git a/services/apps/alcs/src/portal/public/public.controller.spec.ts b/services/apps/alcs/src/portal/public/public.controller.spec.ts index 734f96eae1..81dfde3181 100644 --- a/services/apps/alcs/src/portal/public/public.controller.spec.ts +++ b/services/apps/alcs/src/portal/public/public.controller.spec.ts @@ -5,6 +5,7 @@ import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { ClsService } from 'nestjs-cls'; import { mockKeyCloakProviders } from '../../../test/mocks/mockTypes'; +import { ApplicationDecisionV2Service } from '../../alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service'; import { ApplicationDocument, VISIBILITY_FLAG, @@ -14,6 +15,8 @@ import { ApplicationSubmissionToSubmissionStatus } from '../../alcs/application/ import { Application } from '../../alcs/application/application.entity'; import { ApplicationService } from '../../alcs/application/application.service'; import { PublicAutomapperProfile } from '../../common/automapper/public.automapper.profile'; +import { ApplicationSubmissionReview } from '../application-submission-review/application-submission-review.entity'; +import { ApplicationSubmissionReviewService } from '../application-submission-review/application-submission-review.service'; import { ApplicationParcelService } from '../application-submission/application-parcel/application-parcel.service'; import { ApplicationSubmission } from '../application-submission/application-submission.entity'; import { ApplicationSubmissionService } from '../application-submission/application-submission.service'; @@ -25,12 +28,16 @@ describe('PublicSearchController', () => { let mockAppSubService: DeepMocked<ApplicationSubmissionService>; let mockAppParcelService: DeepMocked<ApplicationParcelService>; let mockAppDocService: DeepMocked<ApplicationDocumentService>; + let mockAppReviewService: DeepMocked<ApplicationSubmissionReviewService>; + let mockAppDecService: DeepMocked<ApplicationDecisionV2Service>; beforeEach(async () => { mockAppService = createMock(); mockAppSubService = createMock(); mockAppParcelService = createMock(); mockAppDocService = createMock(); + mockAppReviewService = createMock(); + mockAppDecService = createMock(); const module: TestingModule = await Test.createTestingModule({ imports: [ @@ -56,6 +63,14 @@ describe('PublicSearchController', () => { provide: ApplicationDocumentService, useValue: mockAppDocService, }, + { + provide: ApplicationSubmissionReviewService, + useValue: mockAppReviewService, + }, + { + provide: ApplicationDecisionV2Service, + useValue: mockAppDecService, + }, { provide: ClsService, useValue: {}, @@ -87,6 +102,10 @@ describe('PublicSearchController', () => { ); mockAppParcelService.fetchByApplicationFileId.mockResolvedValue([]); mockAppDocService.list.mockResolvedValue([]); + mockAppReviewService.getForPublicReview.mockResolvedValue( + new ApplicationSubmissionReview(), + ); + mockAppDecService.getByAppFileNumber.mockResolvedValue([]); const fileId = 'file-id'; await controller.getApplication(fileId); @@ -100,6 +119,8 @@ describe('PublicSearchController', () => { expect(mockAppDocService.list).toHaveBeenCalledWith(fileId, [ VISIBILITY_FLAG.PUBLIC, ]); + expect(mockAppReviewService.getForPublicReview).toHaveBeenCalledTimes(1); + expect(mockAppDecService.getByAppFileNumber).toHaveBeenCalledTimes(1); }); it('should call through to document service for getting files', async () => { diff --git a/services/apps/alcs/src/portal/public/public.controller.ts b/services/apps/alcs/src/portal/public/public.controller.ts index 264d0393b5..87b74408ec 100644 --- a/services/apps/alcs/src/portal/public/public.controller.ts +++ b/services/apps/alcs/src/portal/public/public.controller.ts @@ -3,6 +3,8 @@ import { Mapper } from '@automapper/core'; import { InjectMapper } from '@automapper/nestjs'; import { Controller, Get, Param } from '@nestjs/common'; import { Public } from 'nest-keycloak-connect'; +import { ApplicationDecisionV2Service } from '../../alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service'; +import { ApplicationDecision } from '../../alcs/application-decision/application-decision.entity'; import { ApplicationDocumentDto } from '../../alcs/application/application-document/application-document.dto'; import { ApplicationDocument, @@ -10,12 +12,21 @@ import { } from '../../alcs/application/application-document/application-document.entity'; import { ApplicationDocumentService } from '../../alcs/application/application-document/application-document.service'; import { ApplicationService } from '../../alcs/application/application.service'; +import { ApplicationPortalDecisionDto } from '../application-decision/application-decision.dto'; +import { ApplicationSubmissionReviewDto } from '../application-submission-review/application-submission-review.dto'; +import { ApplicationSubmissionReview } from '../application-submission-review/application-submission-review.entity'; +import { ApplicationSubmissionReviewService } from '../application-submission-review/application-submission-review.service'; import { ApplicationParcelDto } from '../application-submission/application-parcel/application-parcel.dto'; import { ApplicationParcel } from '../application-submission/application-parcel/application-parcel.entity'; import { ApplicationParcelService } from '../application-submission/application-parcel/application-parcel.service'; import { ApplicationSubmission } from '../application-submission/application-submission.entity'; import { ApplicationSubmissionService } from '../application-submission/application-submission.service'; -import { PublicApplicationSubmissionDto } from './public.dto'; +import { + PublicApplicationParcelDto, + PublicApplicationSubmissionDto, + PublicApplicationSubmissionReviewDto, + PublicDocumentDto, +} from './public.dto'; @Public() @Controller('/public') @@ -26,27 +37,29 @@ export class PublicController { private applicationSubmissionService: ApplicationSubmissionService, private applicationParcelService: ApplicationParcelService, private applicationDocumentService: ApplicationDocumentService, + private applicationSubmissionReviewService: ApplicationSubmissionReviewService, + private applicationDecisionService: ApplicationDecisionV2Service, ) {} @Get('/application/:fileId') - async getApplication(@Param('fileId') fileId: string) { - const application = await this.applicationService.get(fileId); + async getApplication(@Param('fileId') fileNumber: string) { + const application = await this.applicationService.get(fileNumber); if (!application?.dateReceivedAllItems) { throw new ServiceNotFoundException( - `Failed to find application with File ID ${fileId}`, + `Failed to find application with File ID ${fileNumber}`, ); } const submission = - await this.applicationSubmissionService.getOrFailByFileNumber(fileId); + await this.applicationSubmissionService.getOrFailByFileNumber(fileNumber); const parcels = - await this.applicationParcelService.fetchByApplicationFileId(fileId); + await this.applicationParcelService.fetchByApplicationFileId(fileNumber); const mappedParcels = this.mapper.mapArray( parcels, ApplicationParcel, - ApplicationParcelDto, + PublicApplicationParcelDto, ); const mappedSubmission = this.mapper.map( @@ -55,20 +68,45 @@ export class PublicController { PublicApplicationSubmissionDto, ); - const documents = await this.applicationDocumentService.list(fileId, [ + const documents = await this.applicationDocumentService.list(fileNumber, [ VISIBILITY_FLAG.PUBLIC, ]); const mappedDocuments = this.mapper.mapArray( documents, ApplicationDocument, - ApplicationDocumentDto, + PublicDocumentDto, + ); + + const review = + await this.applicationSubmissionReviewService.getForPublicReview( + fileNumber, + ); + + let mappedReview; + if (review) { + mappedReview = this.mapper.map( + review, + ApplicationSubmissionReview, + PublicApplicationSubmissionReviewDto, + ); + } + + const decisions = await this.applicationDecisionService.getByAppFileNumber( + fileNumber, + ); + const mappedDecisions = this.mapper.mapArray( + decisions, + ApplicationDecision, + ApplicationPortalDecisionDto, ); return { submission: mappedSubmission, parcels: mappedParcels, documents: mappedDocuments, + review: mappedReview, + decisions: mappedDecisions, }; } diff --git a/services/apps/alcs/src/portal/public/public.dto.ts b/services/apps/alcs/src/portal/public/public.dto.ts index e502cf8720..69968c4dae 100644 --- a/services/apps/alcs/src/portal/public/public.dto.ts +++ b/services/apps/alcs/src/portal/public/public.dto.ts @@ -1,6 +1,8 @@ import { AutoMap } from '@automapper/classes'; import { ApplicationStatusDto } from '../../alcs/application/application-submission-status/submission-status.dto'; import { OwnerTypeDto } from '../../common/owner-type/owner-type.entity'; +import { DocumentTypeDto } from '../../document/document.dto'; +import { ApplicationParcelOwnershipTypeDto } from '../application-submission/application-parcel/application-parcel.dto'; import { NaruSubtypeDto } from '../application-submission/application-submission.dto'; import { ProposedLot } from '../application-submission/application-submission.entity'; @@ -315,3 +317,113 @@ export class PublicApplicationSubmissionDto { @AutoMap(() => Boolean) inclGovernmentOwnsAllParcels?: boolean | null; } + +export class PublicApplicationSubmissionReviewDto { + @AutoMap() + applicationFileNumber: string; + + @AutoMap(() => String) + localGovernmentFileNumber: string | null; + + @AutoMap(() => String) + firstName: string | null; + + @AutoMap(() => String) + lastName: string | null; + + @AutoMap(() => String) + position: string | null; + + @AutoMap(() => String) + department: string | null; + + @AutoMap(() => Boolean) + isOCPDesignation: boolean | null; + + @AutoMap(() => String) + OCPBylawName: string | null; + + @AutoMap(() => String) + OCPDesignation: string | null; + + @AutoMap(() => Boolean) + OCPConsistent: boolean | null; + + @AutoMap(() => Boolean) + isSubjectToZoning: boolean | null; + + @AutoMap(() => String) + zoningBylawName: string | null; + + @AutoMap(() => String) + zoningDesignation: string | null; + + @AutoMap(() => String) + zoningMinimumLotSize: string | null; + + @AutoMap(() => Boolean) + isZoningConsistent: boolean | null; + + @AutoMap(() => Boolean) + isAuthorized: boolean | null; +} + +export class PublicApplicationParcelDto { + @AutoMap() + uuid: string; + + @AutoMap(() => String) + pid?: string | null; + + @AutoMap(() => String) + pin?: string | null; + + @AutoMap(() => String) + legalDescription?: string | null; + + @AutoMap(() => String) + civicAddress?: string | null; + + @AutoMap(() => Number) + mapAreaHectares?: number | null; + + @AutoMap(() => Number) + purchasedDate?: number | null; + + @AutoMap(() => Boolean) + isFarm?: boolean | null; + + @AutoMap(() => String) + ownershipTypeCode?: string | null; + + @AutoMap(() => String) + crownLandOwnerType?: string | null; + + ownershipType?: ApplicationParcelOwnershipTypeDto; + + @AutoMap(() => String) + parcelType: string; + + @AutoMap(() => Number) + alrArea: number | null; + + owners: PublicOwnerDto[]; +} + +export class PublicDocumentDto { + @AutoMap(() => String) + description?: string; + + @AutoMap() + uuid: string; + + @AutoMap(() => DocumentTypeDto) + type?: DocumentTypeDto; + + //Document Fields + documentUuid: string; + fileName: string; + fileSize?: number; + mimeType: string; + uploadedAt: number; +} diff --git a/services/apps/alcs/src/portal/public/public.module.ts b/services/apps/alcs/src/portal/public/public.module.ts index c0e86ea8d4..9bf1e39878 100644 --- a/services/apps/alcs/src/portal/public/public.module.ts +++ b/services/apps/alcs/src/portal/public/public.module.ts @@ -1,10 +1,11 @@ import { Module } from '@nestjs/common'; import { RouterModule } from '@nestjs/core'; +import { ApplicationDecisionV2Module } from '../../alcs/application-decision/application-decision-v2/application-decision-v2.module'; import { ApplicationSubmissionStatusModule } from '../../alcs/application/application-submission-status/application-submission-status.module'; import { ApplicationModule } from '../../alcs/application/application.module'; import { NotificationSubmissionStatusModule } from '../../alcs/notification/notification-submission-status/notification-submission-status.module'; -import { ApplicationSubmissionProfile } from '../../common/automapper/application-submission.automapper.profile'; import { PublicAutomapperProfile } from '../../common/automapper/public.automapper.profile'; +import { ApplicationSubmissionReviewModule } from '../application-submission-review/application-submission-review.module'; import { ApplicationSubmissionModule } from '../application-submission/application-submission.module'; import { PublicController } from './public.controller'; import { PublicSearchModule } from './search/public-search.module'; @@ -17,6 +18,8 @@ import { PublicStatusController } from './status/public-status.controller'; NotificationSubmissionStatusModule, ApplicationModule, ApplicationSubmissionModule, + ApplicationSubmissionReviewModule, + ApplicationDecisionV2Module, RouterModule.register([{ path: 'public', module: PublicSearchModule }]), ], controllers: [PublicStatusController, PublicController], From 739d4cd779362c83d226bfa88b5e1c03e153f715 Mon Sep 17 00:00:00 2001 From: Liam Stoddard <lstodd@protonmail.com> Date: Fri, 6 Oct 2023 10:01:57 -0700 Subject: [PATCH 457/954] commit functional code before adding other cols that may break --- .../submissions/app_submissions.py | 46 ++++++++++++++----- .../submissions/sql/app_submission.sql | 8 +++- 2 files changed, 41 insertions(+), 13 deletions(-) diff --git a/bin/migrate-oats-data/applications/submissions/app_submissions.py b/bin/migrate-oats-data/applications/submissions/app_submissions.py index 95b5eff3a9..b84ae1e53b 100644 --- a/bin/migrate-oats-data/applications/submissions/app_submissions.py +++ b/bin/migrate-oats-data/applications/submissions/app_submissions.py @@ -10,6 +10,7 @@ ) from db import inject_conn_pool from psycopg2.extras import RealDictCursor, execute_batch +from enum import Enum from .submap import ( add_direction_field, @@ -150,7 +151,7 @@ def insert_app_sub_records( execute_batch( cursor, get_insert_query_for_naru(), - inc_exc_data_list, + naru_data_list, page_size=batch_size, ) @@ -208,6 +209,9 @@ def prepare_app_sub_data(app_sub_raw_data_list, direction_data, subdiv_data, soi ): inc_exc_data_list.append(data) elif data["alr_change_code"] == ALRChangeCode.NAR.value: + data["rsdntl_use_type_code"] = str( + OatsToAlcsNaruType[data["rsdntl_use_type_code"]].value + ) naru_data_list.append(data) else: other_data_list.append(data) @@ -283,17 +287,23 @@ def get_insert_query_for_nfu(): def get_insert_query_for_naru(): - unique_fields = """, nfu_hectares, - nfu_will_import_fill, - nfu_fill_volume, - nfu_max_fill_depth, - nfu_project_duration_amount, - nfu_fill_type_description, - nfu_fill_origin_description, - nfu_project_duration_unit, - nfu_total_fill_area + unique_fields = """, + naru_will_import_fill, + naru_to_place_volume, + naru_to_place_maximum_depth, + naru_project_duration_amount, + naru_fill_type, + naru_fill_origin, + naru_project_duration_unit, + naru_to_place_area, + naru_subtype_code, + naru_infrastructure, + naru_existing_structures, + naru_sleeping_units, + naru_residence_necessity, + naru_agri_tourism """ - unique_values = """, %(alr_area)s, + unique_values = """, %(import_fill)s, %(total_fill)s, %(max_fill_depth)s, @@ -301,7 +311,13 @@ def get_insert_query_for_naru(): %(fill_type)s, %(fill_origin)s, %(fill_duration_unit)s, - %(fill_area)s + %(fill_area)s, + %(rsdntl_use_type_code)s, + %(infra_desc)s, + %(cur_struc_desc)s, + %(sleeping_units)s, + %(support_desc)s, + %(tour_env_desc)s """ return get_insert_query(unique_fields, unique_values) @@ -342,3 +358,9 @@ def clean_application_submission(conn=None): logger.info(f"Deleted items count = {cursor.rowcount}") conn.commit() + + +class OatsToAlcsNaruType(Enum): + PRL = AlcsNaruTypeCode.Principal_Residence.value + ADF = AlcsNaruTypeCode.Additional_Residence.value + ATA = AlcsNaruTypeCode.Tourism_Accomodation.value diff --git a/bin/migrate-oats-data/applications/submissions/sql/app_submission.sql b/bin/migrate-oats-data/applications/submissions/sql/app_submission.sql index d4c0b36d64..c9e060024d 100644 --- a/bin/migrate-oats-data/applications/submissions/sql/app_submission.sql +++ b/bin/migrate-oats-data/applications/submissions/sql/app_submission.sql @@ -20,7 +20,13 @@ SELECT acg.alr_application_id, aa.applicant, aa.alr_area, - oc.alr_appl_component_id + oc.alr_appl_component_id, + oc.rsdntl_use_type_code, + oc.infra_desc, + oc.cur_struc_desc, + oc.support_desc, + oc.tour_env_desc, + oc.sleeping_units FROM appl_components_grouped acg LEFT JOIN alcs.application aa ON aa.file_number = acg.alr_application_id::TEXT From 8092b16a8f3f47cf86a92804342d42407d8f5d70 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Fri, 6 Oct 2023 10:18:39 -0700 Subject: [PATCH 458/954] Clean up Public Controller * Move app specific stuff to new public app service * Create breathing room for NOIs and SRWs --- .../public/public-application.service.spec.ts | 150 ++++++++++++++++++ .../public/public-application.service.ts | 136 ++++++++++++++++ .../portal/public/public.controller.spec.ts | 123 +------------- .../src/portal/public/public.controller.ts | 120 +------------- .../alcs/src/portal/public/public.module.ts | 3 +- 5 files changed, 299 insertions(+), 233 deletions(-) create mode 100644 services/apps/alcs/src/portal/public/public-application.service.spec.ts create mode 100644 services/apps/alcs/src/portal/public/public-application.service.ts diff --git a/services/apps/alcs/src/portal/public/public-application.service.spec.ts b/services/apps/alcs/src/portal/public/public-application.service.spec.ts new file mode 100644 index 0000000000..d82e030817 --- /dev/null +++ b/services/apps/alcs/src/portal/public/public-application.service.spec.ts @@ -0,0 +1,150 @@ +import { ServiceNotFoundException } from '@app/common/exceptions/base.exception'; +import { classes } from '@automapper/classes'; +import { AutomapperModule } from '@automapper/nestjs'; +import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; +import { Test, TestingModule } from '@nestjs/testing'; +import { ApplicationDecisionV2Service } from '../../alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service'; +import { + ApplicationDocument, + VISIBILITY_FLAG, +} from '../../alcs/application/application-document/application-document.entity'; +import { ApplicationDocumentService } from '../../alcs/application/application-document/application-document.service'; +import { ApplicationSubmissionToSubmissionStatus } from '../../alcs/application/application-submission-status/submission-status.entity'; +import { Application } from '../../alcs/application/application.entity'; +import { ApplicationService } from '../../alcs/application/application.service'; +import { PublicAutomapperProfile } from '../../common/automapper/public.automapper.profile'; +import { ApplicationSubmissionReview } from '../application-submission-review/application-submission-review.entity'; +import { ApplicationSubmissionReviewService } from '../application-submission-review/application-submission-review.service'; +import { ApplicationParcelService } from '../application-submission/application-parcel/application-parcel.service'; +import { ApplicationSubmission } from '../application-submission/application-submission.entity'; +import { ApplicationSubmissionService } from '../application-submission/application-submission.service'; +import { PublicApplicationService } from './public-application.service'; + +describe('PublicApplicationService', () => { + let service: PublicApplicationService; + let mockAppService: DeepMocked<ApplicationService>; + let mockAppSubService: DeepMocked<ApplicationSubmissionService>; + let mockAppParcelService: DeepMocked<ApplicationParcelService>; + let mockAppDocService: DeepMocked<ApplicationDocumentService>; + let mockAppReviewService: DeepMocked<ApplicationSubmissionReviewService>; + let mockAppDecService: DeepMocked<ApplicationDecisionV2Service>; + + beforeEach(async () => { + mockAppService = createMock(); + mockAppSubService = createMock(); + mockAppParcelService = createMock(); + mockAppDocService = createMock(); + mockAppReviewService = createMock(); + mockAppDecService = createMock(); + + const module: TestingModule = await Test.createTestingModule({ + imports: [ + AutomapperModule.forRoot({ + strategyInitializer: classes(), + }), + ], + providers: [ + PublicApplicationService, + PublicAutomapperProfile, + { + provide: ApplicationService, + useValue: mockAppService, + }, + { + provide: ApplicationSubmissionService, + useValue: mockAppSubService, + }, + { + provide: ApplicationParcelService, + useValue: mockAppParcelService, + }, + { + provide: ApplicationDocumentService, + useValue: mockAppDocService, + }, + { + provide: ApplicationSubmissionReviewService, + useValue: mockAppReviewService, + }, + { + provide: ApplicationDecisionV2Service, + useValue: mockAppDecService, + }, + ], + }).compile(); + + service = module.get<PublicApplicationService>(PublicApplicationService); + }); + + it('should be defined', () => { + expect(service).toBeDefined(); + }); + + it('load an Application and its related data for get application', async () => { + mockAppService.get.mockResolvedValue( + new Application({ + dateReceivedAllItems: new Date(), + }), + ); + mockAppSubService.getOrFailByFileNumber.mockResolvedValue( + new ApplicationSubmission({ + get status(): ApplicationSubmissionToSubmissionStatus { + return new ApplicationSubmissionToSubmissionStatus(); + }, + }), + ); + mockAppParcelService.fetchByApplicationFileId.mockResolvedValue([]); + mockAppDocService.list.mockResolvedValue([]); + mockAppReviewService.getForPublicReview.mockResolvedValue( + new ApplicationSubmissionReview(), + ); + mockAppDecService.getByAppFileNumber.mockResolvedValue([]); + + const fileId = 'file-id'; + await service.getPublicApplicationData(fileId); + + expect(mockAppService.get).toHaveBeenCalledTimes(1); + expect(mockAppSubService.getOrFailByFileNumber).toHaveBeenCalledTimes(1); + expect(mockAppParcelService.fetchByApplicationFileId).toHaveBeenCalledTimes( + 1, + ); + expect(mockAppDocService.list).toHaveBeenCalledTimes(1); + expect(mockAppDocService.list).toHaveBeenCalledWith(fileId, [ + VISIBILITY_FLAG.PUBLIC, + ]); + expect(mockAppReviewService.getForPublicReview).toHaveBeenCalledTimes(1); + expect(mockAppDecService.getByAppFileNumber).toHaveBeenCalledTimes(1); + }); + + it('should call through to document service for getting files', async () => { + const mockDoc = new ApplicationDocument({ + visibilityFlags: [VISIBILITY_FLAG.PUBLIC], + }); + mockAppDocService.get.mockResolvedValue(mockDoc); + mockAppDocService.getInlineUrl.mockResolvedValue(''); + + const documentUuid = 'document-uuid'; + await service.getInlineUrl(documentUuid); + + expect(mockAppDocService.get).toHaveBeenCalledTimes(1); + expect(mockAppDocService.getInlineUrl).toHaveBeenCalledTimes(1); + expect(mockAppDocService.getInlineUrl).toHaveBeenCalledWith(mockDoc); + }); + + it('should throw an exception when the document is not public', async () => { + const mockDoc = new ApplicationDocument({ + visibilityFlags: [VISIBILITY_FLAG.APPLICANT], + }); + mockAppDocService.get.mockResolvedValue(mockDoc); + + const documentUuid = 'document-uuid'; + const promise = service.getInlineUrl(documentUuid); + + await expect(promise).rejects.toMatchObject( + new ServiceNotFoundException('Failed to find document'), + ); + + expect(mockAppDocService.get).toHaveBeenCalledTimes(1); + expect(mockAppDocService.getInlineUrl).toHaveBeenCalledTimes(0); + }); +}); diff --git a/services/apps/alcs/src/portal/public/public-application.service.ts b/services/apps/alcs/src/portal/public/public-application.service.ts new file mode 100644 index 0000000000..eaa9d3feb8 --- /dev/null +++ b/services/apps/alcs/src/portal/public/public-application.service.ts @@ -0,0 +1,136 @@ +import { ServiceNotFoundException } from '@app/common/exceptions/base.exception'; +import { Mapper } from '@automapper/core'; +import { InjectMapper } from '@automapper/nestjs'; +import { Injectable } from '@nestjs/common'; +import { ApplicationDecisionV2Service } from '../../alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service'; +import { ApplicationDecision } from '../../alcs/application-decision/application-decision.entity'; +import { + ApplicationDocument, + VISIBILITY_FLAG, +} from '../../alcs/application/application-document/application-document.entity'; +import { ApplicationDocumentService } from '../../alcs/application/application-document/application-document.service'; +import { ApplicationService } from '../../alcs/application/application.service'; +import { ApplicationPortalDecisionDto } from '../application-decision/application-decision.dto'; +import { ApplicationSubmissionReview } from '../application-submission-review/application-submission-review.entity'; +import { ApplicationSubmissionReviewService } from '../application-submission-review/application-submission-review.service'; +import { ApplicationParcel } from '../application-submission/application-parcel/application-parcel.entity'; +import { ApplicationParcelService } from '../application-submission/application-parcel/application-parcel.service'; +import { ApplicationSubmission } from '../application-submission/application-submission.entity'; +import { ApplicationSubmissionService } from '../application-submission/application-submission.service'; +import { + PublicApplicationParcelDto, + PublicApplicationSubmissionDto, + PublicApplicationSubmissionReviewDto, + PublicDocumentDto, +} from './public.dto'; + +@Injectable() +export class PublicApplicationService { + constructor( + private applicationService: ApplicationService, + private applicationSubmissionService: ApplicationSubmissionService, + private applicationParcelService: ApplicationParcelService, + private applicationDocumentService: ApplicationDocumentService, + private applicationSubmissionReviewService: ApplicationSubmissionReviewService, + private applicationDecisionService: ApplicationDecisionV2Service, + @InjectMapper() private mapper: Mapper, + ) {} + + async getPublicApplicationData(fileNumber: string) { + const application = await this.applicationService.get(fileNumber); + + //Easy way to check if its public + if (!application?.dateReceivedAllItems) { + throw new ServiceNotFoundException( + `Failed to find application with File ID ${fileNumber}`, + ); + } + + const submission = + await this.applicationSubmissionService.getOrFailByFileNumber(fileNumber); + + const parcels = + await this.applicationParcelService.fetchByApplicationFileId(fileNumber); + + const mappedParcels = this.mapper.mapArray( + parcels, + ApplicationParcel, + PublicApplicationParcelDto, + ); + + const mappedSubmission = this.mapper.map( + submission, + ApplicationSubmission, + PublicApplicationSubmissionDto, + ); + + const documents = await this.applicationDocumentService.list(fileNumber, [ + VISIBILITY_FLAG.PUBLIC, + ]); + + const mappedDocuments = this.mapper.mapArray( + documents, + ApplicationDocument, + PublicDocumentDto, + ); + + const review = + await this.applicationSubmissionReviewService.getForPublicReview( + fileNumber, + ); + + let mappedReview; + if (review) { + mappedReview = this.mapper.map( + review, + ApplicationSubmissionReview, + PublicApplicationSubmissionReviewDto, + ); + } + + const decisions = await this.applicationDecisionService.getByAppFileNumber( + fileNumber, + ); + const mappedDecisions = this.mapper.mapArray( + decisions, + ApplicationDecision, + ApplicationPortalDecisionDto, + ); + + return { + submission: mappedSubmission, + parcels: mappedParcels, + documents: mappedDocuments, + review: mappedReview, + decisions: mappedDecisions, + }; + } + + async getDownloadUrl(documentUuid: string) { + const document = await this.applicationDocumentService.get(documentUuid); + + if (!document.visibilityFlags.includes(VISIBILITY_FLAG.PUBLIC)) { + throw new ServiceNotFoundException('Failed to find document'); + } + + const url = await this.applicationDocumentService.getDownloadUrl(document); + + return { + url, + }; + } + + async getInlineUrl(documentUuid: string) { + const document = await this.applicationDocumentService.get(documentUuid); + + if (!document.visibilityFlags.includes(VISIBILITY_FLAG.PUBLIC)) { + throw new ServiceNotFoundException('Failed to find document'); + } + + const url = await this.applicationDocumentService.getInlineUrl(document); + + return { + url, + }; + } +} diff --git a/services/apps/alcs/src/portal/public/public.controller.spec.ts b/services/apps/alcs/src/portal/public/public.controller.spec.ts index 81dfde3181..bd2ead3c39 100644 --- a/services/apps/alcs/src/portal/public/public.controller.spec.ts +++ b/services/apps/alcs/src/portal/public/public.controller.spec.ts @@ -1,76 +1,26 @@ -import { ServiceNotFoundException } from '@app/common/exceptions/base.exception'; import { classes } from '@automapper/classes'; import { AutomapperModule } from '@automapper/nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { ClsService } from 'nestjs-cls'; import { mockKeyCloakProviders } from '../../../test/mocks/mockTypes'; -import { ApplicationDecisionV2Service } from '../../alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service'; -import { - ApplicationDocument, - VISIBILITY_FLAG, -} from '../../alcs/application/application-document/application-document.entity'; -import { ApplicationDocumentService } from '../../alcs/application/application-document/application-document.service'; -import { ApplicationSubmissionToSubmissionStatus } from '../../alcs/application/application-submission-status/submission-status.entity'; -import { Application } from '../../alcs/application/application.entity'; -import { ApplicationService } from '../../alcs/application/application.service'; import { PublicAutomapperProfile } from '../../common/automapper/public.automapper.profile'; -import { ApplicationSubmissionReview } from '../application-submission-review/application-submission-review.entity'; -import { ApplicationSubmissionReviewService } from '../application-submission-review/application-submission-review.service'; -import { ApplicationParcelService } from '../application-submission/application-parcel/application-parcel.service'; -import { ApplicationSubmission } from '../application-submission/application-submission.entity'; -import { ApplicationSubmissionService } from '../application-submission/application-submission.service'; +import { PublicApplicationService } from './public-application.service'; import { PublicController } from './public.controller'; describe('PublicSearchController', () => { let controller: PublicController; - let mockAppService: DeepMocked<ApplicationService>; - let mockAppSubService: DeepMocked<ApplicationSubmissionService>; - let mockAppParcelService: DeepMocked<ApplicationParcelService>; - let mockAppDocService: DeepMocked<ApplicationDocumentService>; - let mockAppReviewService: DeepMocked<ApplicationSubmissionReviewService>; - let mockAppDecService: DeepMocked<ApplicationDecisionV2Service>; + let mockAppService: DeepMocked<PublicApplicationService>; beforeEach(async () => { mockAppService = createMock(); - mockAppSubService = createMock(); - mockAppParcelService = createMock(); - mockAppDocService = createMock(); - mockAppReviewService = createMock(); - mockAppDecService = createMock(); const module: TestingModule = await Test.createTestingModule({ - imports: [ - AutomapperModule.forRoot({ - strategyInitializer: classes(), - }), - ], providers: [ - PublicAutomapperProfile, { - provide: ApplicationService, + provide: PublicApplicationService, useValue: mockAppService, }, - { - provide: ApplicationSubmissionService, - useValue: mockAppSubService, - }, - { - provide: ApplicationParcelService, - useValue: mockAppParcelService, - }, - { - provide: ApplicationDocumentService, - useValue: mockAppDocService, - }, - { - provide: ApplicationSubmissionReviewService, - useValue: mockAppReviewService, - }, - { - provide: ApplicationDecisionV2Service, - useValue: mockAppDecService, - }, { provide: ClsService, useValue: {}, @@ -87,73 +37,12 @@ describe('PublicSearchController', () => { expect(controller).toBeDefined(); }); - it('load an Application and its related data for get application', async () => { - mockAppService.get.mockResolvedValue( - new Application({ - dateReceivedAllItems: new Date(), - }), - ); - mockAppSubService.getOrFailByFileNumber.mockResolvedValue( - new ApplicationSubmission({ - get status(): ApplicationSubmissionToSubmissionStatus { - return new ApplicationSubmissionToSubmissionStatus(); - }, - }), - ); - mockAppParcelService.fetchByApplicationFileId.mockResolvedValue([]); - mockAppDocService.list.mockResolvedValue([]); - mockAppReviewService.getForPublicReview.mockResolvedValue( - new ApplicationSubmissionReview(), - ); - mockAppDecService.getByAppFileNumber.mockResolvedValue([]); + it('should call through to service for loading an application', async () => { + mockAppService.getPublicApplicationData.mockResolvedValue({} as any); const fileId = 'file-id'; await controller.getApplication(fileId); - expect(mockAppService.get).toHaveBeenCalledTimes(1); - expect(mockAppSubService.getOrFailByFileNumber).toHaveBeenCalledTimes(1); - expect(mockAppParcelService.fetchByApplicationFileId).toHaveBeenCalledTimes( - 1, - ); - expect(mockAppDocService.list).toHaveBeenCalledTimes(1); - expect(mockAppDocService.list).toHaveBeenCalledWith(fileId, [ - VISIBILITY_FLAG.PUBLIC, - ]); - expect(mockAppReviewService.getForPublicReview).toHaveBeenCalledTimes(1); - expect(mockAppDecService.getByAppFileNumber).toHaveBeenCalledTimes(1); - }); - - it('should call through to document service for getting files', async () => { - const mockDoc = new ApplicationDocument({ - visibilityFlags: [VISIBILITY_FLAG.PUBLIC], - }); - mockAppDocService.get.mockResolvedValue(mockDoc); - mockAppDocService.getInlineUrl.mockResolvedValue(''); - - const fileId = 'file-id'; - const documentUuid = 'document-uuid'; - await controller.getApplicationDocumentOpen(fileId, documentUuid); - - expect(mockAppDocService.get).toHaveBeenCalledTimes(1); - expect(mockAppDocService.getInlineUrl).toHaveBeenCalledTimes(1); - expect(mockAppDocService.getInlineUrl).toHaveBeenCalledWith(mockDoc); - }); - - it('should throw an exception when the document is not public', async () => { - const mockDoc = new ApplicationDocument({ - visibilityFlags: [VISIBILITY_FLAG.APPLICANT], - }); - mockAppDocService.get.mockResolvedValue(mockDoc); - - const fileId = 'file-id'; - const documentUuid = 'document-uuid'; - const promise = controller.getApplicationDocumentOpen(fileId, documentUuid); - - await expect(promise).rejects.toMatchObject( - new ServiceNotFoundException('Failed to find document'), - ); - - expect(mockAppDocService.get).toHaveBeenCalledTimes(1); - expect(mockAppDocService.getInlineUrl).toHaveBeenCalledTimes(0); + expect(mockAppService.getPublicApplicationData).toHaveBeenCalledTimes(1); }); }); diff --git a/services/apps/alcs/src/portal/public/public.controller.ts b/services/apps/alcs/src/portal/public/public.controller.ts index 87b74408ec..4ba18be531 100644 --- a/services/apps/alcs/src/portal/public/public.controller.ts +++ b/services/apps/alcs/src/portal/public/public.controller.ts @@ -1,113 +1,15 @@ -import { ServiceNotFoundException } from '@app/common/exceptions/base.exception'; -import { Mapper } from '@automapper/core'; -import { InjectMapper } from '@automapper/nestjs'; import { Controller, Get, Param } from '@nestjs/common'; import { Public } from 'nest-keycloak-connect'; -import { ApplicationDecisionV2Service } from '../../alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service'; -import { ApplicationDecision } from '../../alcs/application-decision/application-decision.entity'; -import { ApplicationDocumentDto } from '../../alcs/application/application-document/application-document.dto'; -import { - ApplicationDocument, - VISIBILITY_FLAG, -} from '../../alcs/application/application-document/application-document.entity'; -import { ApplicationDocumentService } from '../../alcs/application/application-document/application-document.service'; -import { ApplicationService } from '../../alcs/application/application.service'; -import { ApplicationPortalDecisionDto } from '../application-decision/application-decision.dto'; -import { ApplicationSubmissionReviewDto } from '../application-submission-review/application-submission-review.dto'; -import { ApplicationSubmissionReview } from '../application-submission-review/application-submission-review.entity'; -import { ApplicationSubmissionReviewService } from '../application-submission-review/application-submission-review.service'; -import { ApplicationParcelDto } from '../application-submission/application-parcel/application-parcel.dto'; -import { ApplicationParcel } from '../application-submission/application-parcel/application-parcel.entity'; -import { ApplicationParcelService } from '../application-submission/application-parcel/application-parcel.service'; -import { ApplicationSubmission } from '../application-submission/application-submission.entity'; -import { ApplicationSubmissionService } from '../application-submission/application-submission.service'; -import { - PublicApplicationParcelDto, - PublicApplicationSubmissionDto, - PublicApplicationSubmissionReviewDto, - PublicDocumentDto, -} from './public.dto'; +import { PublicApplicationService } from './public-application.service'; @Public() @Controller('/public') export class PublicController { - constructor( - @InjectMapper() private mapper: Mapper, - private applicationService: ApplicationService, - private applicationSubmissionService: ApplicationSubmissionService, - private applicationParcelService: ApplicationParcelService, - private applicationDocumentService: ApplicationDocumentService, - private applicationSubmissionReviewService: ApplicationSubmissionReviewService, - private applicationDecisionService: ApplicationDecisionV2Service, - ) {} + constructor(private publicAppService: PublicApplicationService) {} @Get('/application/:fileId') async getApplication(@Param('fileId') fileNumber: string) { - const application = await this.applicationService.get(fileNumber); - if (!application?.dateReceivedAllItems) { - throw new ServiceNotFoundException( - `Failed to find application with File ID ${fileNumber}`, - ); - } - - const submission = - await this.applicationSubmissionService.getOrFailByFileNumber(fileNumber); - - const parcels = - await this.applicationParcelService.fetchByApplicationFileId(fileNumber); - - const mappedParcels = this.mapper.mapArray( - parcels, - ApplicationParcel, - PublicApplicationParcelDto, - ); - - const mappedSubmission = this.mapper.map( - submission, - ApplicationSubmission, - PublicApplicationSubmissionDto, - ); - - const documents = await this.applicationDocumentService.list(fileNumber, [ - VISIBILITY_FLAG.PUBLIC, - ]); - - const mappedDocuments = this.mapper.mapArray( - documents, - ApplicationDocument, - PublicDocumentDto, - ); - - const review = - await this.applicationSubmissionReviewService.getForPublicReview( - fileNumber, - ); - - let mappedReview; - if (review) { - mappedReview = this.mapper.map( - review, - ApplicationSubmissionReview, - PublicApplicationSubmissionReviewDto, - ); - } - - const decisions = await this.applicationDecisionService.getByAppFileNumber( - fileNumber, - ); - const mappedDecisions = this.mapper.mapArray( - decisions, - ApplicationDecision, - ApplicationPortalDecisionDto, - ); - - return { - submission: mappedSubmission, - parcels: mappedParcels, - documents: mappedDocuments, - review: mappedReview, - decisions: mappedDecisions, - }; + return await this.publicAppService.getPublicApplicationData(fileNumber); } @Get('/application/:fileId/:uuid/download') @@ -115,13 +17,7 @@ export class PublicController { @Param('fileId') fileId: string, @Param('uuid') documentUuid: string, ) { - const document = await this.applicationDocumentService.get(documentUuid); - - if (!document.visibilityFlags.includes(VISIBILITY_FLAG.PUBLIC)) { - throw new ServiceNotFoundException('Failed to find document'); - } - - const url = await this.applicationDocumentService.getDownloadUrl(document); + const url = await this.publicAppService.getDownloadUrl(documentUuid); return { url, @@ -133,13 +29,7 @@ export class PublicController { @Param('fileId') fileId: string, @Param('uuid') documentUuid: string, ) { - const document = await this.applicationDocumentService.get(documentUuid); - - if (!document.visibilityFlags.includes(VISIBILITY_FLAG.PUBLIC)) { - throw new ServiceNotFoundException('Failed to find document'); - } - - const url = await this.applicationDocumentService.getInlineUrl(document); + const url = await this.publicAppService.getInlineUrl(documentUuid); return { url, diff --git a/services/apps/alcs/src/portal/public/public.module.ts b/services/apps/alcs/src/portal/public/public.module.ts index 9bf1e39878..e0e1f1806a 100644 --- a/services/apps/alcs/src/portal/public/public.module.ts +++ b/services/apps/alcs/src/portal/public/public.module.ts @@ -7,6 +7,7 @@ import { NotificationSubmissionStatusModule } from '../../alcs/notification/noti import { PublicAutomapperProfile } from '../../common/automapper/public.automapper.profile'; import { ApplicationSubmissionReviewModule } from '../application-submission-review/application-submission-review.module'; import { ApplicationSubmissionModule } from '../application-submission/application-submission.module'; +import { PublicApplicationService } from './public-application.service'; import { PublicController } from './public.controller'; import { PublicSearchModule } from './search/public-search.module'; import { PublicStatusController } from './status/public-status.controller'; @@ -23,7 +24,7 @@ import { PublicStatusController } from './status/public-status.controller'; RouterModule.register([{ path: 'public', module: PublicSearchModule }]), ], controllers: [PublicStatusController, PublicController], - providers: [PublicAutomapperProfile], + providers: [PublicAutomapperProfile, PublicApplicationService], exports: [], }) export class PublicModule {} From 3b5c19dd166c5afc3bd4566720c2aed5cf517fa1 Mon Sep 17 00:00:00 2001 From: Liam Stoddard <lstodd@protonmail.com> Date: Fri, 6 Oct 2023 10:38:18 -0700 Subject: [PATCH 459/954] everything still working --- .../applications/submissions/app_submissions.py | 6 ++++-- .../applications/submissions/sql/app_submission.sql | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/bin/migrate-oats-data/applications/submissions/app_submissions.py b/bin/migrate-oats-data/applications/submissions/app_submissions.py index b84ae1e53b..2b72f74c54 100644 --- a/bin/migrate-oats-data/applications/submissions/app_submissions.py +++ b/bin/migrate-oats-data/applications/submissions/app_submissions.py @@ -301,7 +301,8 @@ def get_insert_query_for_naru(): naru_existing_structures, naru_sleeping_units, naru_residence_necessity, - naru_agri_tourism + naru_agri_tourism, + naru_floor_area """ unique_values = """, %(import_fill)s, @@ -317,7 +318,8 @@ def get_insert_query_for_naru(): %(cur_struc_desc)s, %(sleeping_units)s, %(support_desc)s, - %(tour_env_desc)s + %(tour_env_desc)s, + %(component_area)s """ return get_insert_query(unique_fields, unique_values) diff --git a/bin/migrate-oats-data/applications/submissions/sql/app_submission.sql b/bin/migrate-oats-data/applications/submissions/sql/app_submission.sql index c9e060024d..ed158c4274 100644 --- a/bin/migrate-oats-data/applications/submissions/sql/app_submission.sql +++ b/bin/migrate-oats-data/applications/submissions/sql/app_submission.sql @@ -26,8 +26,10 @@ SELECT oc.cur_struc_desc, oc.support_desc, oc.tour_env_desc, - oc.sleeping_units + oc.sleeping_units, + oc.component_area FROM appl_components_grouped acg LEFT JOIN alcs.application aa ON aa.file_number = acg.alr_application_id::TEXT - JOIN oats.oats_alr_appl_components oc ON acg.alr_application_id = oc.alr_application_id \ No newline at end of file + JOIN oats.oats_alr_appl_components oc ON acg.alr_application_id = oc.alr_application_id + JOIN oats.oats_alr_applications oa ON acg.alr_application_id = oa.alr_application_id \ No newline at end of file From 6f9bd4398aa845f792eddddd2d800b83a9364983 Mon Sep 17 00:00:00 2001 From: Liam Stoddard <lstodd@protonmail.com> Date: Fri, 6 Oct 2023 11:33:08 -0700 Subject: [PATCH 460/954] commit before cleanup --- .../applications/base_applications.py | 1 + .../applications/submissions/app_submissions.py | 13 +++++++++---- .../applications/submissions/sql/app_submission.sql | 4 +++- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/bin/migrate-oats-data/applications/base_applications.py b/bin/migrate-oats-data/applications/base_applications.py index 2df5a6cf7f..88455d8a88 100644 --- a/bin/migrate-oats-data/applications/base_applications.py +++ b/bin/migrate-oats-data/applications/base_applications.py @@ -92,6 +92,7 @@ def process_applications(conn=None, batch_size=10000): def clean_applications(conn=None): logger.info("Start applications cleaning") with conn.cursor() as cursor: + logger.debug("Start applications cleaning") cursor.execute( "DELETE FROM alcs.application a WHERE a.audit_created_by = 'oats_etl'" ) diff --git a/bin/migrate-oats-data/applications/submissions/app_submissions.py b/bin/migrate-oats-data/applications/submissions/app_submissions.py index 2b72f74c54..3419ac4dae 100644 --- a/bin/migrate-oats-data/applications/submissions/app_submissions.py +++ b/bin/migrate-oats-data/applications/submissions/app_submissions.py @@ -237,7 +237,8 @@ def get_insert_query(unique_fields, unique_values): west_land_use_type, north_land_use_type, south_land_use_type, - subd_proposed_lots + subd_proposed_lots, + purpose {unique_fields} ) VALUES ( @@ -255,7 +256,8 @@ def get_insert_query(unique_fields, unique_values): %(west_land_use_type)s, %(north_land_use_type)s, %(south_land_use_type)s, - %(subd_proposed_lots)s + %(subd_proposed_lots)s, + %(proposal_summary_desc)s {unique_values} ) """ @@ -302,7 +304,8 @@ def get_insert_query_for_naru(): naru_sleeping_units, naru_residence_necessity, naru_agri_tourism, - naru_floor_area + naru_floor_area, + naru_location_rationale """ unique_values = """, %(import_fill)s, @@ -319,7 +322,8 @@ def get_insert_query_for_naru(): %(sleeping_units)s, %(support_desc)s, %(tour_env_desc)s, - %(component_area)s + %(component_area)s, + %(proposal_background_desc)s """ return get_insert_query(unique_fields, unique_values) @@ -354,6 +358,7 @@ def get_soil_data(rows, cursor): def clean_application_submission(conn=None): logger.info("Start application_submission cleaning") with conn.cursor() as cursor: + logger.debug("Start application_submission cleaning") cursor.execute( f"DELETE FROM alcs.application_submission a WHERE a.audit_created_by = '{OATS_ETL_USER}'" ) diff --git a/bin/migrate-oats-data/applications/submissions/sql/app_submission.sql b/bin/migrate-oats-data/applications/submissions/sql/app_submission.sql index ed158c4274..c7c0c01b6f 100644 --- a/bin/migrate-oats-data/applications/submissions/sql/app_submission.sql +++ b/bin/migrate-oats-data/applications/submissions/sql/app_submission.sql @@ -27,7 +27,9 @@ SELECT oc.support_desc, oc.tour_env_desc, oc.sleeping_units, - oc.component_area + oc.component_area, + oa.proposal_summary_desc, + oa.proposal_background_desc FROM appl_components_grouped acg LEFT JOIN alcs.application aa ON aa.file_number = acg.alr_application_id::TEXT From 01a654fca5e4bffa94a56f207c849d49d770fb32 Mon Sep 17 00:00:00 2001 From: Liam Stoddard <lstodd@protonmail.com> Date: Fri, 6 Oct 2023 13:25:33 -0700 Subject: [PATCH 461/954] commit before removing funcs --- .../submissions/app_submissions.py | 12 +- .../submissions/submap/direction_mapping.py | 120 +++++++++++------- bin/migrate-oats-data/common/__init__.py | 1 + .../common/oats_to_alcs_naru_code_enum.py | 8 ++ 4 files changed, 84 insertions(+), 57 deletions(-) create mode 100644 bin/migrate-oats-data/common/oats_to_alcs_naru_code_enum.py diff --git a/bin/migrate-oats-data/applications/submissions/app_submissions.py b/bin/migrate-oats-data/applications/submissions/app_submissions.py index 3419ac4dae..89bbdb952e 100644 --- a/bin/migrate-oats-data/applications/submissions/app_submissions.py +++ b/bin/migrate-oats-data/applications/submissions/app_submissions.py @@ -5,12 +5,10 @@ OATS_ETL_USER, ALRChangeCode, setup_and_get_logger, - AlcsNaruTypeCode, - OatsNarCode, + OatsToAlcsNaruType, ) from db import inject_conn_pool from psycopg2.extras import RealDictCursor, execute_batch -from enum import Enum from .submap import ( add_direction_field, @@ -293,6 +291,7 @@ def get_insert_query_for_naru(): naru_will_import_fill, naru_to_place_volume, naru_to_place_maximum_depth, + naru_to_place_average_depth, naru_project_duration_amount, naru_fill_type, naru_fill_origin, @@ -311,6 +310,7 @@ def get_insert_query_for_naru(): %(import_fill)s, %(total_fill)s, %(max_fill_depth)s, + %(max_fill_depth)s, %(fill_duration)s, %(fill_type)s, %(fill_origin)s, @@ -365,9 +365,3 @@ def clean_application_submission(conn=None): logger.info(f"Deleted items count = {cursor.rowcount}") conn.commit() - - -class OatsToAlcsNaruType(Enum): - PRL = AlcsNaruTypeCode.Principal_Residence.value - ADF = AlcsNaruTypeCode.Additional_Residence.value - ATA = AlcsNaruTypeCode.Tourism_Accomodation.value diff --git a/bin/migrate-oats-data/applications/submissions/submap/direction_mapping.py b/bin/migrate-oats-data/applications/submissions/submap/direction_mapping.py index b61c27c721..48dfab23d3 100644 --- a/bin/migrate-oats-data/applications/submissions/submap/direction_mapping.py +++ b/bin/migrate-oats-data/applications/submissions/submap/direction_mapping.py @@ -1,20 +1,23 @@ +from common import AlcsAdjacentLandUseType + def add_direction_field(data): - # populates columns to be inserted - data['east_land_use_type_description'] = None - data['east_land_use_type'] = None - data['west_land_use_type_description'] = None - data['west_land_use_type'] = None - data['north_land_use_type_description'] = None - data['north_land_use_type'] = None - data['south_land_use_type_description'] = None - data['south_land_use_type'] = None + # populates columns to be inserted + data["east_land_use_type_description"] = None + data["east_land_use_type"] = None + data["west_land_use_type_description"] = None + data["west_land_use_type"] = None + data["north_land_use_type_description"] = None + data["north_land_use_type"] = None + data["south_land_use_type_description"] = None + data["south_land_use_type"] = None return data + def get_directions_rows(rows, cursor): # fetches adjacent land use data, specifically direction, description and type code application_ids = [dict(item)["alr_application_id"] for item in rows] - application_ids_string = ', '.join(str(item) for item in application_ids) + application_ids_string = ", ".join(str(item) for item in application_ids) adj_rows_query = f"""SELECT * from oats.oats_adjacent_land_uses oalu WHERE oalu.alr_application_id in ({application_ids_string}) @@ -23,58 +26,79 @@ def get_directions_rows(rows, cursor): adj_rows = cursor.fetchall() return adj_rows + def map_direction_values(data, direction_data): # adds direction field values into data row - no_data = 'No data found in OATS' + no_data = "No data found in OATS" app_id = "alr_application_id" - data['east_land_use_type_description'] = direction_data.get(data[app_id], {}).get('east_description', no_data) - data['east_land_use_type'] = direction_data.get(data[app_id], {}).get('east_type_code', None) - data['west_land_use_type_description'] = direction_data.get(data[app_id], {}).get('west_description', no_data) - data['west_land_use_type'] = direction_data.get(data[app_id], {}).get('west_type_code', None) - data['north_land_use_type_description'] = direction_data.get(data[app_id], {}).get('north_description', no_data) - data['north_land_use_type'] = direction_data.get(data[app_id], {}).get('north_type_code', None) - data['south_land_use_type_description'] = direction_data.get(data[app_id], {}).get('south_description', no_data) - data['south_land_use_type'] = direction_data.get(data[app_id], {}).get('south_type_code', None) + data["east_land_use_type_description"] = direction_data.get(data[app_id], {}).get( + "east_description", no_data + ) + data["east_land_use_type"] = direction_data.get(data[app_id], {}).get( + "east_type_code", None + ) + data["west_land_use_type_description"] = direction_data.get(data[app_id], {}).get( + "west_description", no_data + ) + data["west_land_use_type"] = direction_data.get(data[app_id], {}).get( + "west_type_code", None + ) + data["north_land_use_type_description"] = direction_data.get(data[app_id], {}).get( + "north_description", no_data + ) + data["north_land_use_type"] = direction_data.get(data[app_id], {}).get( + "north_type_code", None + ) + data["south_land_use_type_description"] = direction_data.get(data[app_id], {}).get( + "south_description", no_data + ) + data["south_land_use_type"] = direction_data.get(data[app_id], {}).get( + "south_type_code", None + ) return data + def create_direction_dict(adj_rows): # creates dictionary of adjacent land use data with all directions attributed to one application id - compass = 'cardinal_direction' - description = 'description' - type_code = 'nonfarm_use_type_code' - alr_id = 'alr_application_id' + compass = "cardinal_direction" + description = "description" + type_code = "nonfarm_use_type_code" + alr_id = "alr_application_id" direction_dict = {} for row in adj_rows: application_id = row[alr_id] + updated_type_code = row[type_code] + if updated_type_code: + updated_type_code = AlcsAdjacentLandUseType[updated_type_code].value if application_id in direction_dict: - if row[compass] == 'EAST': - direction_dict[application_id]['east_description'] = row[description] - direction_dict[application_id]['east_type_code'] = row[type_code] - if row[compass] == 'WEST': - direction_dict[application_id]['west_description'] = row[description] - direction_dict[application_id]['west_type_code'] = row[type_code] - if row[compass] == 'NORTH': - direction_dict[application_id]['north_description'] = row[description] - direction_dict[application_id]['north_type_code'] = row[type_code] - if row[compass] == 'SOUTH': - direction_dict[application_id]['south_description'] = row[description] - direction_dict[application_id]['south_type_code'] = row[type_code] + if row[compass] == "EAST": + direction_dict[application_id]["east_description"] = row[description] + direction_dict[application_id]["east_type_code"] = updated_type_code + if row[compass] == "WEST": + direction_dict[application_id]["west_description"] = row[description] + direction_dict[application_id]["west_type_code"] = updated_type_code + if row[compass] == "NORTH": + direction_dict[application_id]["north_description"] = row[description] + direction_dict[application_id]["north_type_code"] = updated_type_code + if row[compass] == "SOUTH": + direction_dict[application_id]["south_description"] = row[description] + direction_dict[application_id]["south_type_code"] = updated_type_code else: direction_dict[application_id] = {} direction_dict[application_id][alr_id] = row[alr_id] - if row[compass] == 'EAST': - direction_dict[application_id]['east_description'] = row[description] - direction_dict[application_id]['east_type_code'] = row[type_code] - if row[compass] == 'WEST': - direction_dict[application_id]['west_description'] = row[description] - direction_dict[application_id]['west_type_code'] = row[type_code] - if row[compass] == 'NORTH': - direction_dict[application_id]['north_description'] = row[description] - direction_dict[application_id]['north_type_code'] = row[type_code] - if row[compass] == 'SOUTH': - direction_dict[application_id]['south_description'] = row[description] - direction_dict[application_id]['south_type_code'] = row[type_code] + if row[compass] == "EAST": + direction_dict[application_id]["east_description"] = row[description] + direction_dict[application_id]["east_type_code"] = updated_type_code + if row[compass] == "WEST": + direction_dict[application_id]["west_description"] = row[description] + direction_dict[application_id]["west_type_code"] = updated_type_code + if row[compass] == "NORTH": + direction_dict[application_id]["north_description"] = row[description] + direction_dict[application_id]["north_type_code"] = updated_type_code + if row[compass] == "SOUTH": + direction_dict[application_id]["south_description"] = row[description] + direction_dict[application_id]["south_type_code"] = updated_type_code - return direction_dict \ No newline at end of file + return direction_dict diff --git a/bin/migrate-oats-data/common/__init__.py b/bin/migrate-oats-data/common/__init__.py index 298b60e25c..5ecfec974a 100644 --- a/bin/migrate-oats-data/common/__init__.py +++ b/bin/migrate-oats-data/common/__init__.py @@ -5,3 +5,4 @@ from .oats_to_alcs_adjacent_land_use_type_enum import * from .json_encoder import * from .oats_to_alcs_soil_change_code_enum import * +from .oats_to_alcs_naru_code_enum import * diff --git a/bin/migrate-oats-data/common/oats_to_alcs_naru_code_enum.py b/bin/migrate-oats-data/common/oats_to_alcs_naru_code_enum.py new file mode 100644 index 0000000000..9e45079d1d --- /dev/null +++ b/bin/migrate-oats-data/common/oats_to_alcs_naru_code_enum.py @@ -0,0 +1,8 @@ +from enum import Enum +from common import AlcsNaruTypeCode + + +class OatsToAlcsNaruType(Enum): + PRL = AlcsNaruTypeCode.Principal_Residence.value + ADF = AlcsNaruTypeCode.Additional_Residence.value + ATA = AlcsNaruTypeCode.Tourism_Accomodation.value From 899d615e18f3d40b89121bf0e78062cdd4962afa Mon Sep 17 00:00:00 2001 From: "to. sandra" <76515860+sandratoh@users.noreply.github.com> Date: Fri, 6 Oct 2023 13:39:50 -0700 Subject: [PATCH 462/954] Update app, noi and srw review layout (#1036) * Update app, noi and srw detail header and table layout * Change soil table layout * Update project duration * Update noi project duration and application update banner * Update noi soil tables * Update parcel and land use layout * Update srw layout to match app and noi --- .../application-details.component.scss | 4 +- .../naru-details/naru-details.component.html | 130 ++++++-------- .../naru-details/naru-details.component.scss | 9 - .../nfu-details/nfu-details.component.html | 107 +++++------ .../nfu-details/nfu-details.component.scss | 7 - .../parcel/parcel.component.html | 53 ++---- .../parcel/parcel.component.scss | 8 +- .../pfrs-details/pfrs-details.component.html | 85 ++++----- .../pfrs-details/pfrs-details.component.scss | 3 +- .../pofo-details/pofo-details.component.html | 170 +++++++++--------- .../pofo-details/pofo-details.component.scss | 9 - .../roso-details/roso-details.component.html | 167 +++++++++-------- .../roso-details/roso-details.component.scss | 9 - ...view-application-submission.component.html | 14 +- .../notice-of-intent-details.component.scss | 4 +- .../parcel/parcel.component.html | 53 ++---- .../parcel/parcel.component.scss | 8 +- .../pfrs-details/pfrs-details.component.html | 101 ++++------- .../pfrs-details/pfrs-details.component.scss | 2 +- .../pofo-details/pofo-details.component.html | 161 ++++++++--------- .../pofo-details/pofo-details.component.scss | 8 - .../roso-details/roso-details.component.html | 149 +++++++-------- ...notice-of-intent-submission.component.html | 10 +- .../notification-details.component.html | 4 +- .../notification-details.component.scss | 12 +- .../parcel/parcel.component.scss | 14 -- ...iew-notification-submission.component.html | 10 +- 27 files changed, 564 insertions(+), 747 deletions(-) diff --git a/portal-frontend/src/app/features/applications/application-details/application-details.component.scss b/portal-frontend/src/app/features/applications/application-details/application-details.component.scss index 8df832ca0f..555f204d9e 100644 --- a/portal-frontend/src/app/features/applications/application-details/application-details.component.scss +++ b/portal-frontend/src/app/features/applications/application-details/application-details.component.scss @@ -60,7 +60,7 @@ .other-attachments { display: grid; - grid-template-columns: max-content max-content max-content; + grid-template-columns: 1fr 1fr 1fr; overflow-x: auto; grid-column-gap: rem(36); grid-row-gap: rem(12); @@ -72,7 +72,7 @@ .adjacent-parcels { display: grid; - grid-template-columns: max-content max-content max-content; + grid-template-columns: 0.65fr 1fr 1fr; overflow-x: auto; grid-column-gap: rem(36); grid-row-gap: rem(12); diff --git a/portal-frontend/src/app/features/applications/application-details/naru-details/naru-details.component.html b/portal-frontend/src/app/features/applications/application-details/naru-details/naru-details.component.html index b8f0898e71..91988d357e 100644 --- a/portal-frontend/src/app/features/applications/application-details/naru-details/naru-details.component.html +++ b/portal-frontend/src/app/features/applications/application-details/naru-details/naru-details.component.html @@ -1,7 +1,5 @@ <div *ngIf="_applicationSubmission" class="review-table"> - <div class="subheading2 grid-1"> - Selected Subtype: - </div> + <div class="subheading2 grid-1">Selected Subtype:</div> <div class="grid-double"> <span *ngIf="_applicationSubmission.naruSubtype !== null"> {{ _applicationSubmission.naruSubtype.label }} @@ -9,9 +7,7 @@ <app-no-data [showRequired]="showErrors" *ngIf="_applicationSubmission.naruSubtype === null"></app-no-data> </div> - <div class="subheading2 grid-1"> - What is the purpose of the proposal? - </div> + <div class="subheading2 grid-1">What is the purpose of the proposal?</div> <div class="grid-double"> {{ _applicationSubmission.purpose }} <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.purpose"></app-no-data> @@ -35,9 +31,7 @@ <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.naruResidenceNecessity"></app-no-data> </div> - <div class="subheading2 grid-1"> - Describe the rationale for the proposed location of the additional residence. - </div> + <div class="subheading2 grid-1">Describe the rationale for the proposed location of the additional residence.</div> <div class="grid-double"> {{ _applicationSubmission.naruLocationRationale }} <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.naruLocationRationale"></app-no-data> @@ -71,9 +65,7 @@ <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.naruResidenceNecessity"></app-no-data> </div> - <div class="subheading2 grid-1"> - Describe the rationale for the proposed location of the principal residence. - </div> + <div class="subheading2 grid-1">Describe the rationale for the proposed location of the principal residence.</div> <div class="grid-double"> {{ _applicationSubmission.naruLocationRationale }} <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.naruLocationRationale"></app-no-data> @@ -90,17 +82,13 @@ </ng-container> <ng-container *ngIf="_applicationSubmission.naruSubtype?.code === 'TOUR'"> - <div class="subheading2 grid-1"> - What is the total floor area (m<sup>2</sup>) of the proposed accommodation? - </div> + <div class="subheading2 grid-1">What is the total floor area (m<sup>2</sup>) of the proposed accommodation?</div> <div class="grid-double"> {{ _applicationSubmission.naruFloorArea }} <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.naruFloorArea"></app-no-data> </div> - <div class="subheading2 grid-1"> - How many "sleeping units" in total are proposed? - </div> + <div class="subheading2 grid-1">How many "sleeping units" in total are proposed?</div> <div class="grid-double"> {{ _applicationSubmission.naruSleepingUnits }} <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.naruSleepingUnits"></app-no-data> @@ -114,9 +102,7 @@ <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.naruResidenceNecessity"></app-no-data> </div> - <div class="subheading2 grid-1"> - Describe the rationale for the proposed location of the tourism accommodation. - </div> + <div class="subheading2 grid-1">Describe the rationale for the proposed location of the tourism accommodation.</div> <div class="grid-double"> {{ _applicationSubmission.naruLocationRationale }} <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.naruLocationRationale"></app-no-data> @@ -131,9 +117,7 @@ <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.naruInfrastructure"></app-no-data> </div> - <div class="subheading2 grid-1"> - Describe any agri-tourism that is currently taking place on the property. - </div> + <div class="subheading2 grid-1">Describe any agri-tourism that is currently taking place on the property.</div> <div class="grid-double"> {{ _applicationSubmission.naruAgriTourism }} <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.naruAgriTourism"></app-no-data> @@ -168,77 +152,69 @@ </div> <ng-container *ngIf="_applicationSubmission.naruWillImportFill"> - <div class="subheading2 grid-1"> - Describe the type and amount of fill proposed to be placed. - </div> + <div class="subheading2 grid-1">Describe the type and amount of fill proposed to be placed.</div> <div class="grid-double"> {{ _applicationSubmission.naruFillType }} <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.naruFillType"></app-no-data> </div> - <div class="subheading2 grid-1"> - Briefly describe the origin and quality of fill. - </div> + <div class="subheading2 grid-1">Briefly describe the origin and quality of fill.</div> <div class="grid-double"> {{ _applicationSubmission.naruFillOrigin }} <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.naruFillOrigin"></app-no-data> </div> - <div class="subheading1 full-width"> - Fill to be Placed - </div> - <div class="full-width soil-table"> - <div class="grid-1"><strong>Volume</strong></div> - <div class="grid-2"> - {{ _applicationSubmission.naruToPlaceVolume }} - <span *ngIf="_applicationSubmission.naruToPlaceVolume !== null">m<sup>3</sup></span> - <app-no-data - [showRequired]="showErrors" - *ngIf="_applicationSubmission.naruToPlaceVolume === null" - ></app-no-data> - </div> - <div class="grid-1"><strong>Area</strong></div> - <div class="grid-2"> - {{ _applicationSubmission.naruToPlaceArea }} - <span *ngIf="_applicationSubmission.naruToPlaceArea !== null">m<sup>2</sup></span> - <app-no-data [showRequired]="showErrors" *ngIf="_applicationSubmission.naruToPlaceArea === null"></app-no-data> - </div> - <div class="grid-1"><strong>Maximum Depth</strong></div> - <div class="grid-2"> - {{ _applicationSubmission.naruToPlaceMaximumDepth }} - <span *ngIf="_applicationSubmission.naruToPlaceMaximumDepth !== null">m</span> - <app-no-data - [showRequired]="showErrors" - *ngIf="_applicationSubmission.naruToPlaceMaximumDepth === null" - ></app-no-data> - </div> - <div class="grid-1"><strong>Average Depth</strong></div> - <div class="grid-2"> - {{ _applicationSubmission.naruToPlaceAverageDepth }} - <span *ngIf="_applicationSubmission.naruToPlaceAverageDepth !== null">m</span> - <app-no-data - [showRequired]="showErrors" - *ngIf="_applicationSubmission.naruToPlaceAverageDepth === null" - ></app-no-data> + <div class="subheading2 grid-1">Fill Project Duration</div> + <div class="grid-double"> + <div *ngIf="_applicationSubmission.naruProjectDurationAmount && _applicationSubmission.naruProjectDurationUnit"> + {{ _applicationSubmission.naruProjectDurationAmount }} + <ng-container [ngPlural]="_applicationSubmission.naruProjectDurationAmount"> + <ng-template ngPluralCase="=1"> + {{ _applicationSubmission.naruProjectDurationUnit.slice(0, -1) | titlecase }} + </ng-template> + <ng-template ngPluralCase="other"> + {{ _applicationSubmission.naruProjectDurationUnit | titlecase }} + </ng-template> + </ng-container> </div> + <app-no-data + [showRequired]="showErrors" + *ngIf="!_applicationSubmission.naruProjectDurationAmount || !_applicationSubmission.naruProjectDurationUnit" + ></app-no-data> </div> - <div class="full-width"> - <span class="subheading1">Project Duration</span> - </div> - <div class="subheading2 grid-1"> - Duration + <div class="grid-1"></div> + <div class="subheading2 grid-double">Fill to be Placed</div> + + <div class="subheading2 grid-1">Volume</div> + <div class="grid-double"> + {{ _applicationSubmission.naruToPlaceVolume }} + <span *ngIf="_applicationSubmission.naruToPlaceVolume !== null">m<sup>3</sup></span> + <app-no-data [showRequired]="showErrors" *ngIf="_applicationSubmission.naruToPlaceVolume === null"></app-no-data> </div> + <div class="subheading2 grid-1">Area</div> <div class="grid-double"> - {{ _applicationSubmission.naruProjectDurationUnit }} - <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.naruProjectDurationUnit"></app-no-data> + {{ _applicationSubmission.naruToPlaceArea }} + <span *ngIf="_applicationSubmission.naruToPlaceArea !== null">m<sup>2</sup></span> + <app-no-data [showRequired]="showErrors" *ngIf="_applicationSubmission.naruToPlaceArea === null"></app-no-data> </div> - <div class="subheading2 grid-1"> - Length + <div class="subheading2 grid-1">Maximum Depth</div> + <div class="grid-double"> + {{ _applicationSubmission.naruToPlaceMaximumDepth }} + <span *ngIf="_applicationSubmission.naruToPlaceMaximumDepth !== null">m</span> + <app-no-data + [showRequired]="showErrors" + *ngIf="_applicationSubmission.naruToPlaceMaximumDepth === null" + ></app-no-data> </div> + <div class="subheading2 grid-1">Average Depth</div> <div class="grid-double"> - {{ _applicationSubmission.naruProjectDurationAmount }} - <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.naruProjectDurationAmount"></app-no-data> + {{ _applicationSubmission.naruToPlaceAverageDepth }} + <span *ngIf="_applicationSubmission.naruToPlaceAverageDepth !== null">m</span> + <app-no-data + [showRequired]="showErrors" + *ngIf="_applicationSubmission.naruToPlaceAverageDepth === null" + ></app-no-data> </div> </ng-container> diff --git a/portal-frontend/src/app/features/applications/application-details/naru-details/naru-details.component.scss b/portal-frontend/src/app/features/applications/application-details/naru-details/naru-details.component.scss index 0c540ce5fb..e69de29bb2 100644 --- a/portal-frontend/src/app/features/applications/application-details/naru-details/naru-details.component.scss +++ b/portal-frontend/src/app/features/applications/application-details/naru-details/naru-details.component.scss @@ -1,9 +0,0 @@ -@use '../../../../../styles/functions' as *; - -.soil-table { - display: grid; - grid-template-columns: max-content max-content; - overflow-x: auto; - grid-column-gap: rem(36); - grid-row-gap: rem(12); -} diff --git a/portal-frontend/src/app/features/applications/application-details/nfu-details/nfu-details.component.html b/portal-frontend/src/app/features/applications/application-details/nfu-details/nfu-details.component.html index 6ddf25eab0..a1994a03c5 100644 --- a/portal-frontend/src/app/features/applications/application-details/nfu-details/nfu-details.component.html +++ b/portal-frontend/src/app/features/applications/application-details/nfu-details/nfu-details.component.html @@ -1,28 +1,20 @@ <div *ngIf="applicationSubmission" class="review-table"> - <div class="subheading2 grid-1"> - How many hectares are proposed for non-farm use? (hectares) - </div> + <div class="subheading2 grid-1">How many hectares are proposed for non-farm use? (hectares)</div> <div class="grid-double"> {{ applicationSubmission.nfuHectares }} </div> - <div class="subheading2 grid-1"> - What is the purpose of the proposal? - </div> + <div class="subheading2 grid-1">What is the purpose of the proposal?</div> <div class="grid-double"> {{ applicationSubmission.purpose }} <app-no-data [showRequired]="showErrors" *ngIf="!applicationSubmission.purpose"></app-no-data> </div> - <div class="subheading2 grid-1"> - Could this proposal be accommodated on lands outside of the ALR? - </div> + <div class="subheading2 grid-1">Could this proposal be accommodated on lands outside of the ALR?</div> <div class="grid-double"> {{ applicationSubmission.nfuOutsideLands }} <app-no-data [showRequired]="showErrors" *ngIf="!applicationSubmission.nfuOutsideLands"></app-no-data> </div> - <div class="subheading2 grid-1"> - Does the proposal support agriculture in the short or long term? - </div> + <div class="subheading2 grid-1">Does the proposal support agriculture in the short or long term?</div> <div class="grid-double"> {{ applicationSubmission.nfuAgricultureSupport }} <app-no-data [showRequired]="showErrors" *ngIf="!applicationSubmission.nfuAgricultureSupport"></app-no-data> @@ -50,71 +42,62 @@ <div class="full-width"> <h4>Soil and Fill Components</h4> </div> - <div class="subheading2 grid-1"> - Describe the type and amount of fill proposed to be placed. - </div> + <div class="subheading2 grid-1">Describe the type and amount of fill proposed to be placed.</div> <div class="grid-double"> {{ applicationSubmission.nfuFillTypeDescription }} <app-no-data [showRequired]="showErrors" *ngIf="!applicationSubmission.nfuFillTypeDescription"></app-no-data> </div> - <div class="subheading2 grid-1"> - Briefly describe the origin and quality of fill. - </div> + <div class="subheading2 grid-1">Briefly describe the origin and quality of fill.</div> <div class="grid-double"> {{ applicationSubmission.nfuFillOriginDescription }} <app-no-data [showRequired]="showErrors" *ngIf="!applicationSubmission.nfuFillOriginDescription"></app-no-data> </div> - <div class="subheading1 full-width"> - Fill to be Placed - </div> - <div class="full-width soil-table"> - <div class="grid-1"><strong>Volume</strong></div> - <div class="grid-2"> - {{ applicationSubmission.nfuFillVolume }} - <span *ngIf="applicationSubmission.nfuFillVolume !== null">m<sup>3</sup></span> - <app-no-data [showRequired]="showErrors" *ngIf="applicationSubmission.nfuFillVolume === null"></app-no-data> - </div> - <div class="grid-1"><strong>Area</strong></div> - <div class="grid-2"> - {{ applicationSubmission.nfuTotalFillArea }} - <span *ngIf="applicationSubmission.nfuTotalFillArea !== null">m<sup>2</sup></span> - <app-no-data - [showRequired]="showErrors" - *ngIf="applicationSubmission.nfuTotalFillArea === null" - ></app-no-data> - </div> - <div class="grid-1"><strong>Maximum Depth</strong></div> - <div class="grid-2"> - {{ applicationSubmission.nfuMaxFillDepth }} - <span *ngIf="applicationSubmission.nfuMaxFillDepth !== null">m</span> - <app-no-data [showRequired]="showErrors" *ngIf="applicationSubmission.nfuMaxFillDepth === null"></app-no-data> - </div> - <div class="grid-1"><strong>Average Depth</strong></div> - <div class="grid-2"> - {{ applicationSubmission.nfuAverageFillDepth }} - <span *ngIf="applicationSubmission.nfuAverageFillDepth !== null">m</span> - <app-no-data - [showRequired]="showErrors" - *ngIf="applicationSubmission.nfuAverageFillDepth === null" - ></app-no-data> + + <div class="subheading2 grid-1">Fill Project Duration</div> + <div class="grid-double"> + <div *ngIf="applicationSubmission.nfuProjectDurationAmount && applicationSubmission.nfuProjectDurationUnit"> + {{ applicationSubmission.nfuProjectDurationAmount }} + <ng-container [ngPlural]="applicationSubmission.nfuProjectDurationAmount"> + <ng-template ngPluralCase="=1"> + {{ applicationSubmission.nfuProjectDurationUnit.slice(0, -1) | titlecase }} + </ng-template> + <ng-template ngPluralCase="other"> + {{ applicationSubmission.nfuProjectDurationUnit | titlecase }} + </ng-template> + </ng-container> </div> + <app-no-data + [showRequired]="showErrors" + *ngIf="!applicationSubmission.nfuProjectDurationAmount || !applicationSubmission.nfuProjectDurationUnit" + ></app-no-data> </div> - <div class="full-width"> - <span class="subheading1">Project Duration</span> - </div> - <div class="subheading2 grid-1"> - Duration + + <div class="grid-1"></div> + <div class="subheading2 grid-double">Fill to be Placed</div> + + <div class="subheading2 grid-1">Volume</div> + <div class="grid-double"> + {{ applicationSubmission.nfuFillVolume }} + <span *ngIf="applicationSubmission.nfuFillVolume !== null">m<sup>3</sup></span> + <app-no-data [showRequired]="showErrors" *ngIf="applicationSubmission.nfuFillVolume === null"></app-no-data> </div> + <div class="subheading2 grid-1">Area=</div> <div class="grid-double"> - {{ applicationSubmission.nfuProjectDurationUnit }} - <app-no-data [showRequired]="showErrors" *ngIf="!applicationSubmission.nfuProjectDurationUnit"></app-no-data> + {{ applicationSubmission.nfuTotalFillArea }} + <span *ngIf="applicationSubmission.nfuTotalFillArea !== null">m<sup>2</sup></span> + <app-no-data [showRequired]="showErrors" *ngIf="applicationSubmission.nfuTotalFillArea === null"></app-no-data> </div> - <div class="subheading2 grid-1"> - Length + <div class="subheading2 grid-1">Maximum Depth</div> + <div class="grid-double"> + {{ applicationSubmission.nfuMaxFillDepth }} + <span *ngIf="applicationSubmission.nfuMaxFillDepth !== null">m</span> + <app-no-data [showRequired]="showErrors" *ngIf="applicationSubmission.nfuMaxFillDepth === null"></app-no-data> </div> + <div class="subheading2 grid-1">Average Depth</div> <div class="grid-double"> - {{ applicationSubmission.nfuProjectDurationAmount }} - <app-no-data [showRequired]="showErrors" *ngIf="!applicationSubmission.nfuProjectDurationAmount"></app-no-data> + {{ applicationSubmission.nfuAverageFillDepth }} + <span *ngIf="applicationSubmission.nfuAverageFillDepth !== null">m</span> + <app-no-data [showRequired]="showErrors" *ngIf="applicationSubmission.nfuAverageFillDepth === null"></app-no-data> </div> </ng-container> <div *ngIf="showEdit" class="edit-button"> diff --git a/portal-frontend/src/app/features/applications/application-details/nfu-details/nfu-details.component.scss b/portal-frontend/src/app/features/applications/application-details/nfu-details/nfu-details.component.scss index b2b6b90127..e69de29bb2 100644 --- a/portal-frontend/src/app/features/applications/application-details/nfu-details/nfu-details.component.scss +++ b/portal-frontend/src/app/features/applications/application-details/nfu-details/nfu-details.component.scss @@ -1,7 +0,0 @@ -.soil-table { - display: grid; - grid-template-columns: max-content max-content; - overflow-x: auto; - grid-column-gap: 36px; - grid-row-gap: 12px; -} diff --git a/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.html b/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.html index d71b6b362b..2ccb28a8b8 100644 --- a/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.html +++ b/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.html @@ -31,17 +31,12 @@ <h4> </button> </div> </div> - <div class="full-width subheading1">Parcel Information</div> - <div class="subheading2 grid-1"> - Ownership Type - </div> + <div class="subheading2 grid-1">Ownership Type</div> <div class="grid-double"> {{ parcel.ownershipType?.label }} <app-no-data [showRequired]="showErrors" *ngIf="!parcel.ownershipType"></app-no-data> </div> - <div class="subheading2 grid-1"> - Legal Description - </div> + <div class="subheading2 grid-1">Legal Description</div> <div class="grid-double"> {{ parcel.legalDescription }} <app-no-data @@ -49,9 +44,7 @@ <h4> *ngIf="parcel.validation?.isLegalDescriptionRequired || false" ></app-no-data> </div> - <div class="subheading2 grid-1"> - Area (Hectares) - </div> + <div class="subheading2 grid-1">Area (Hectares)</div> <div class="grid-double"> {{ parcel.mapAreaHectares }} <app-no-data @@ -70,9 +63,7 @@ <h4> </app-validation-error> </div> <ng-container *ngIf="parcel.ownershipType?.code === PARCEL_OWNERSHIP_TYPES.CROWN"> - <div class="subheading2 grid-1"> - PIN (optional) - </div> + <div class="subheading2 grid-1">PIN (optional)</div> <div class="grid-double"> {{ parcel.pin }} <app-no-data @@ -82,9 +73,7 @@ <h4> </div> </ng-container> <ng-container *ngIf="parcel.ownershipType?.code === PARCEL_OWNERSHIP_TYPES.FEE_SIMPLE"> - <div class="subheading2 grid-1"> - Purchase Date - </div> + <div class="subheading2 grid-1">Purchase Date</div> <div class="grid-double"> {{ parcel.purchasedDate | date }} <app-no-data @@ -94,16 +83,12 @@ <h4> </app-no-data> </div> </ng-container> - <div class="subheading2 grid-1"> - Farm Classification - </div> + <div class="subheading2 grid-1">Farm Classification</div> <div class="grid-double"> <span *ngIf="parcel.isFarm !== null">{{ parcel.isFarm ? 'Yes' : 'No' }}</span> <app-no-data [showRequired]="showErrors" *ngIf="parcel.isFarm === null"></app-no-data> </div> - <div class="subheading2 grid-1"> - Civic Address - </div> + <div class="subheading2 grid-1">Civic Address</div> <div class="grid-double"> {{ parcel.civicAddress }} <app-no-data [showRequired]="showErrors" *ngIf="!parcel.civicAddress"></app-no-data> @@ -115,9 +100,7 @@ <h4> <app-no-data [showRequired]="showErrors" *ngIf="parcel.crownLandOwnerType === null"></app-no-data> </div> </ng-container> - <div *ngIf="showCertificateOfTitle" class="subheading2 grid-1"> - Certificate Of Title - </div> + <div *ngIf="showCertificateOfTitle" class="subheading2 grid-1">Certificate Of Title</div> <div *ngIf="showCertificateOfTitle" class="grid-double"> <div *ngIf="parcel.certificateOfTitle"> <a (click)="onOpenFile(parcel.certificateOfTitle.uuid)">{{ parcel.certificateOfTitle.fileName }}</a> @@ -127,21 +110,21 @@ <h4> *ngIf="!parcel.validation?.isCertificateUploaded" ></app-no-data> </div> - <div class="full-width subheading1"> - Owner Information - </div> - <div class="full-width owner-information"> - <div class="subheading2">Type</div> - <div class="subheading2">Full Name</div> + + <div + class="full-width owner-information" + [ngClass]="{ 'crown-owner-information': parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN }" + > + <div class="subheading2" *ngIf="parcel.ownershipTypeCode !== PARCEL_OWNERSHIP_TYPES.CROWN">Land Owner(s)</div> + <div class="subheading2" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">Crown Contact(s)</div> <div class="subheading2" *ngIf="parcel.ownershipTypeCode !== PARCEL_OWNERSHIP_TYPES.CROWN">Organization</div> <div class="subheading2" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN"> - Ministry/ Department + Ministry/Department </div> <div class="subheading2">Phone</div> <div class="subheading2">Email</div> - <div class="subheading2">Corporate Summary</div> + <div class="subheading2" *ngIf="parcel.ownershipTypeCode !== PARCEL_OWNERSHIP_TYPES.CROWN">Corporate Summary</div> <ng-container *ngFor="let owner of parcel.owners"> - <div>{{ owner.type.label }}</div> <div>{{ owner.displayName }}</div> <div> <span *ngIf="owner.organizationName"></span>{{ owner.organizationName }} @@ -149,7 +132,7 @@ <h4> </div> <div>{{ owner.phoneNumber }}</div> <div>{{ owner.email }}</div> - <div> + <div *ngIf="parcel.ownershipTypeCode !== PARCEL_OWNERSHIP_TYPES.CROWN"> <a *ngIf="owner.corporateSummary" (click)="onOpenFile(owner.corporateSummary.uuid)">{{ owner.corporateSummary.fileName }}</a> diff --git a/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.scss b/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.scss index ecf9d4a24c..c1eab86cc9 100644 --- a/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.scss +++ b/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.scss @@ -2,7 +2,7 @@ .owner-information { display: grid; - grid-template-columns: max-content max-content max-content max-content max-content max-content; + grid-template-columns: 1fr 1fr 1fr 1fr 1fr; overflow-x: auto; grid-column-gap: rem(36); grid-row-gap: rem(12); @@ -12,9 +12,11 @@ } } -.review-table { - grid-template-columns: 1fr 1fr !important; +.crown-owner-information { + grid-template-columns: 1fr 1fr 1fr 1fr; +} +.review-table { .full-width { grid-column: 1/3; } diff --git a/portal-frontend/src/app/features/applications/application-details/pfrs-details/pfrs-details.component.html b/portal-frontend/src/app/features/applications/application-details/pfrs-details/pfrs-details.component.html index 0dd9d91175..2c37cd65af 100644 --- a/portal-frontend/src/app/features/applications/application-details/pfrs-details/pfrs-details.component.html +++ b/portal-frontend/src/app/features/applications/application-details/pfrs-details/pfrs-details.component.html @@ -9,28 +9,43 @@ <app-no-data [showRequired]="showErrors" *ngIf="_applicationSubmission.soilIsFollowUp === null"></app-no-data> </div> - <div *ngIf="_applicationSubmission.soilIsFollowUp" class="subheading2 grid-1"> - Application or NOI ID - </div> + <div *ngIf="_applicationSubmission.soilIsFollowUp" class="subheading2 grid-1">Application or NOI ID</div> <div *ngIf="_applicationSubmission.soilIsFollowUp" class="grid-double"> {{ _applicationSubmission.soilFollowUpIDs }} <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.soilFollowUpIDs"></app-no-data> </div> - <div class="subheading2 grid-1"> - What is the purpose of the proposal? - </div> + <div class="subheading2 grid-1">What is the purpose of the proposal?</div> <div class="grid-double"> {{ _applicationSubmission.purpose }} <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.purpose"></app-no-data> </div> + <div class="subheading2 grid-1">Project Duration</div> + <div class="grid-double"> + <div *ngIf="_applicationSubmission.soilProjectDurationAmount && _applicationSubmission.soilProjectDurationUnit"> + {{ _applicationSubmission.soilProjectDurationAmount }} + <ng-container [ngPlural]="_applicationSubmission.soilProjectDurationAmount"> + <ng-template ngPluralCase="=1"> + {{ _applicationSubmission.soilProjectDurationUnit.slice(0, -1) | titlecase }} + </ng-template> + <ng-template ngPluralCase="other"> + {{ _applicationSubmission.soilProjectDurationUnit | titlecase }} + </ng-template> + </ng-container> + </div> + <app-no-data + [showRequired]="showErrors" + *ngIf="!_applicationSubmission.soilProjectDurationAmount || !_applicationSubmission.soilProjectDurationUnit" + ></app-no-data> + </div> + <div class="full-width soil-table"> <div></div> - <div><strong>Soil to be Removed</strong></div> - <div><strong>Fill to be Placed</strong></div> + <div class="subheading2">Soil to be Removed</div> + <div class="subheading2">Fill to be Placed</div> - <div><strong>Volume</strong></div> + <div class="subheading2">Volume</div> <div> {{ _applicationSubmission.soilToRemoveVolume }} <span *ngIf="_applicationSubmission.soilToRemoveVolume !== null">m<sup>3</sup></span> @@ -42,7 +57,7 @@ <app-no-data [showRequired]="showErrors" *ngIf="_applicationSubmission.soilToPlaceVolume === null"></app-no-data> </div> - <div><strong>Area</strong></div> + <div class="subheading2">Area</div> <div> {{ _applicationSubmission.soilToRemoveArea }} <span *ngIf="_applicationSubmission.soilToRemoveArea !== null">m<sup>2</sup></span> @@ -54,7 +69,7 @@ <app-no-data [showRequired]="showErrors" *ngIf="_applicationSubmission.soilToPlaceArea === null"></app-no-data> </div> - <div><strong>Maximum Depth</strong></div> + <div class="subheading2">Maximum Depth</div> <div> {{ _applicationSubmission.soilToRemoveMaximumDepth }} <span *ngIf="_applicationSubmission.soilToRemoveMaximumDepth !== null">m</span> @@ -72,7 +87,7 @@ ></app-no-data> </div> - <div><strong>Average Depth</strong></div> + <div class="subheading2">Average Depth</div> <div> {{ _applicationSubmission.soilToRemoveAverageDepth }} <span *ngIf="_applicationSubmission.soilToRemoveAverageDepth !== null">m</span> @@ -93,10 +108,10 @@ <div class="spacer-row"></div> <div></div> - <div><strong>Soil already Removed</strong></div> - <div><strong>Fill already Placed</strong></div> + <div class="subheading2">Soil already Removed</div> + <div class="subheading2">Fill already Placed</div> - <div><strong>Volume</strong></div> + <div class="subheading2">Volume</div> <div> {{ _applicationSubmission.soilAlreadyRemovedVolume }} <span *ngIf="_applicationSubmission.soilAlreadyRemovedVolume !== null">m<sup>3</sup></span> @@ -114,7 +129,7 @@ ></app-no-data> </div> - <div><strong>Area</strong></div> + <div class="subheading2">Area</div> <div> {{ _applicationSubmission.soilAlreadyRemovedArea }} <span *ngIf="_applicationSubmission.soilAlreadyRemovedArea !== null">m<sup>2</sup></span> @@ -132,7 +147,7 @@ ></app-no-data> </div> - <div><strong>Maximum Depth</strong></div> + <div class="subheading2">Maximum Depth</div> <div> {{ _applicationSubmission.soilAlreadyRemovedMaximumDepth }} <span *ngIf="_applicationSubmission.soilAlreadyRemovedMaximumDepth !== null">m</span> @@ -150,7 +165,7 @@ ></app-no-data> </div> - <div><strong>Average Depth</strong></div> + <div class="subheading2">Average Depth</div> <div> {{ _applicationSubmission.soilAlreadyRemovedAverageDepth }} <span *ngIf="_applicationSubmission.soilAlreadyRemovedAverageDepth !== null">m</span> @@ -169,35 +184,13 @@ </div> </div> - <div class="full-width"> - <span class="subheading1">Project Duration</span> - </div> - <div class="subheading2 grid-1"> - Duration - </div> - <div class="grid-double"> - {{ _applicationSubmission.soilProjectDurationUnit }} - <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.soilProjectDurationUnit"></app-no-data> - </div> - <div class="subheading2 grid-1"> - Length - </div> - <div class="grid-double"> - {{ _applicationSubmission.soilProjectDurationAmount }} - <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.soilProjectDurationAmount"></app-no-data> - </div> - - <div class="subheading2 grid-1"> - Describe the type, origin and quality of fill proposed to be placed. - </div> + <div class="subheading2 grid-1">Describe the type, origin and quality of fill proposed to be placed.</div> <div class="grid-double"> {{ _applicationSubmission.soilFillTypeToPlace }} <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.soilFillTypeToPlace"></app-no-data> </div> - <div class="subheading2 grid-1"> - Describe the type of soil proposed to be removed. - </div> + <div class="subheading2 grid-1">Describe the type of soil proposed to be removed.</div> <div class="grid-double"> {{ _applicationSubmission.soilTypeRemoved }} <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.soilTypeRemoved"></app-no-data> @@ -211,9 +204,7 @@ <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.soilAlternativeMeasures"></app-no-data> </div> - <div class="subheading2 grid-1"> - What steps will be taken to reduce impacts to surrounding agricultural land? - </div> + <div class="subheading2 grid-1">What steps will be taken to reduce impacts to surrounding agricultural land?</div> <div class="grid-double"> {{ _applicationSubmission.soilReduceNegativeImpacts }} <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.soilReduceNegativeImpacts"></app-no-data> @@ -243,9 +234,7 @@ <app-no-data [showRequired]="showErrors" *ngIf="crossSections.length === 0"></app-no-data> </div> - <div class="subheading2 grid-1"> - Is your proposal for aggregate extraction or placer mining? - </div> + <div class="subheading2 grid-1">Is your proposal for aggregate extraction or placer mining?</div> <div class="grid-double"> <span *ngIf="_applicationSubmission.soilIsExtractionOrMining !== null"> {{ _applicationSubmission.soilIsExtractionOrMining ? 'Yes' : 'No' }} diff --git a/portal-frontend/src/app/features/applications/application-details/pfrs-details/pfrs-details.component.scss b/portal-frontend/src/app/features/applications/application-details/pfrs-details/pfrs-details.component.scss index f81fc4394b..e69c993c03 100644 --- a/portal-frontend/src/app/features/applications/application-details/pfrs-details/pfrs-details.component.scss +++ b/portal-frontend/src/app/features/applications/application-details/pfrs-details/pfrs-details.component.scss @@ -2,7 +2,8 @@ .soil-table { display: grid; - grid-template-columns: max-content max-content max-content; + grid-template-columns: 0.625fr 1fr 1fr; + overflow-x: auto; grid-column-gap: rem(36); grid-row-gap: rem(12); diff --git a/portal-frontend/src/app/features/applications/application-details/pofo-details/pofo-details.component.html b/portal-frontend/src/app/features/applications/application-details/pofo-details/pofo-details.component.html index af4fd4d90d..d1f6cfc3e0 100644 --- a/portal-frontend/src/app/features/applications/application-details/pofo-details/pofo-details.component.html +++ b/portal-frontend/src/app/features/applications/application-details/pofo-details/pofo-details.component.html @@ -9,109 +9,109 @@ <app-no-data [showRequired]="showErrors" *ngIf="_applicationSubmission.soilIsFollowUp === null"></app-no-data> </div> - <div *ngIf="_applicationSubmission.soilIsFollowUp" class="subheading2 grid-1"> - Application or NOI ID - </div> + <div *ngIf="_applicationSubmission.soilIsFollowUp" class="subheading2 grid-1">Application or NOI ID</div> <div *ngIf="_applicationSubmission.soilIsFollowUp" class="grid-double"> {{ _applicationSubmission.soilFollowUpIDs }} <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.soilFollowUpIDs"></app-no-data> </div> - <div class="subheading2 grid-1"> - What is the purpose of the proposal? - </div> + <div class="subheading2 grid-1">What is the purpose of the proposal?</div> <div class="grid-double"> {{ _applicationSubmission.purpose }} <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.purpose"></app-no-data> </div> - <div class="subheading1 full-width"> - Fill to be Placed - </div> - <div class="full-width soil-table"> - <div class="grid-1"><strong>Volume</strong></div> - <div class="grid-2"> - {{ _applicationSubmission.soilToPlaceVolume }} - <span *ngIf="_applicationSubmission.soilToPlaceVolume">m<sup>3</sup></span> - <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.soilToPlaceVolume"></app-no-data> - </div> - <div class="grid-1"><strong>Area</strong></div> - <div class="grid-2"> - {{ _applicationSubmission.soilToPlaceArea }} <span *ngIf="_applicationSubmission.soilToPlaceArea">m<sup>2</sup></span> - <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.soilToPlaceArea"></app-no-data> - </div> - <div class="grid-1"><strong>Maximum Depth</strong></div> - <div class="grid-2"> - {{ _applicationSubmission.soilToPlaceMaximumDepth }} - <span *ngIf="_applicationSubmission.soilToPlaceMaximumDepth">m</span> - <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.soilToPlaceMaximumDepth"></app-no-data> - </div> - <div class="grid-1"><strong>Average Depth</strong></div> - <div class="grid-2"> - {{ _applicationSubmission.soilToPlaceAverageDepth }} - <span *ngIf="_applicationSubmission.soilToPlaceAverageDepth">m</span> - <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.soilToPlaceAverageDepth"></app-no-data> + <div class="subheading2 grid-1">Project Duration</div> + <div class="grid-double"> + <div *ngIf="_applicationSubmission.soilProjectDurationAmount && _applicationSubmission.soilProjectDurationUnit"> + {{ _applicationSubmission.soilProjectDurationAmount }} + <ng-container [ngPlural]="_applicationSubmission.soilProjectDurationAmount"> + <ng-template ngPluralCase="=1"> + {{ _applicationSubmission.soilProjectDurationUnit.slice(0, -1) | titlecase }} + </ng-template> + <ng-template ngPluralCase="other"> + {{ _applicationSubmission.soilProjectDurationUnit | titlecase }} + </ng-template> + </ng-container> </div> + <app-no-data + [showRequired]="showErrors" + *ngIf="!_applicationSubmission.soilProjectDurationAmount || !_applicationSubmission.soilProjectDurationUnit" + ></app-no-data> </div> - <div class="subheading1 full-width"> - Fill already Placed + <div class="grid-1"></div> + <div class="subheading2 grid-double">Fill to be Placed</div> + + <div class="subheading2 grid-1">Volume</div> + <div class="grid-double"> + {{ _applicationSubmission.soilToPlaceVolume }} + <span *ngIf="_applicationSubmission.soilToPlaceVolume">m<sup>3</sup></span> + <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.soilToPlaceVolume"></app-no-data> </div> - <div class="full-width soil-table"> - <div class="grid-1"><strong>Volume</strong></div> - <div class="grid-2"> - {{ _applicationSubmission.soilAlreadyPlacedVolume }} - <span *ngIf="_applicationSubmission.soilAlreadyPlacedVolume !== null">m<sup>3</sup></span> - <app-no-data - [showRequired]="showErrors" - *ngIf="_applicationSubmission.soilAlreadyPlacedVolume === null" - ></app-no-data> - </div> - <div class="grid-1"><strong>Area</strong></div> - <div class="grid-2"> - {{ _applicationSubmission.soilAlreadyPlacedArea }} - <span *ngIf="_applicationSubmission.soilAlreadyPlacedArea !== null">m<sup>2</sup></span> - <app-no-data - [showRequired]="showErrors" - *ngIf="_applicationSubmission.soilAlreadyPlacedArea === null" - ></app-no-data> - </div> - <div class="grid-1"><strong>Maximum Depth</strong></div> - <div class="grid-2"> - {{ _applicationSubmission.soilAlreadyPlacedMaximumDepth }} - <span *ngIf="_applicationSubmission.soilAlreadyPlacedMaximumDepth !== null">m</span> - <app-no-data - [showRequired]="showErrors" - *ngIf="_applicationSubmission.soilAlreadyPlacedMaximumDepth === null" - ></app-no-data> - </div> - <div class="grid-1"><strong>Average Depth</strong></div> - <div class="grid-2"> - {{ _applicationSubmission.soilAlreadyPlacedAverageDepth }} - <span *ngIf="_applicationSubmission.soilAlreadyPlacedAverageDepth !== null">m</span> - <app-no-data - [showRequired]="showErrors" - *ngIf="_applicationSubmission.soilAlreadyPlacedAverageDepth === null" - ></app-no-data> - </div> + + <div class="subheading2 grid-1">Area</div> + <div class="grid-double"> + {{ _applicationSubmission.soilToPlaceArea }} + <span *ngIf="_applicationSubmission.soilToPlaceArea">m<sup>2</sup></span> + <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.soilToPlaceArea"></app-no-data> </div> - <div class="full-width"> - <span class="subheading1">Project Duration</span> + <div class="subheading2 grid-1">Maximum Depth</div> + <div class="grid-double"> + {{ _applicationSubmission.soilToPlaceMaximumDepth }} + <span *ngIf="_applicationSubmission.soilToPlaceMaximumDepth">m</span> + <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.soilToPlaceMaximumDepth"></app-no-data> </div> - <div class="subheading2 grid-1"> - Duration + + <div class="subheading2 grid-1">Average Depth</div> + <div class="grid-double"> + {{ _applicationSubmission.soilToPlaceAverageDepth }} + <span *ngIf="_applicationSubmission.soilToPlaceAverageDepth">m</span> + <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.soilToPlaceAverageDepth"></app-no-data> </div> + + <div class="grid-1"></div> + <div class="subheading2 grid-double">Fill already Placed</div> + + <div class="subheading2 grid-1">Volume</div> <div class="grid-double"> - {{ _applicationSubmission.soilProjectDurationUnit }} - <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.soilProjectDurationUnit"></app-no-data> + {{ _applicationSubmission.soilAlreadyPlacedVolume }} + <span *ngIf="_applicationSubmission.soilAlreadyPlacedVolume !== null">m<sup>3</sup></span> + <app-no-data + [showRequired]="showErrors" + *ngIf="_applicationSubmission.soilAlreadyPlacedVolume === null" + ></app-no-data> </div> - <div class="subheading2 grid-1"> - Length + + <div class="subheading2 grid-1">Area</div> + <div class="grid-double"> + {{ _applicationSubmission.soilAlreadyPlacedArea }} + <span *ngIf="_applicationSubmission.soilAlreadyPlacedArea !== null">m<sup>2</sup></span> + <app-no-data + [showRequired]="showErrors" + *ngIf="_applicationSubmission.soilAlreadyPlacedArea === null" + ></app-no-data> </div> + + <div class="subheading2 grid-1">Maximum Depth</div> + <div class="grid-double"> + {{ _applicationSubmission.soilAlreadyPlacedMaximumDepth }} + <span *ngIf="_applicationSubmission.soilAlreadyPlacedMaximumDepth !== null">m</span> + <app-no-data + [showRequired]="showErrors" + *ngIf="_applicationSubmission.soilAlreadyPlacedMaximumDepth === null" + ></app-no-data> + </div> + + <div class="subheading2 grid-1">Average Depth</div> <div class="grid-double"> - {{ _applicationSubmission.soilProjectDurationAmount }} - <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.soilProjectDurationAmount"></app-no-data> + {{ _applicationSubmission.soilAlreadyPlacedAverageDepth }} + <span *ngIf="_applicationSubmission.soilAlreadyPlacedAverageDepth !== null">m</span> + <app-no-data + [showRequired]="showErrors" + *ngIf="_applicationSubmission.soilAlreadyPlacedAverageDepth === null" + ></app-no-data> </div> <div class="subheading2 grid-1"> @@ -122,17 +122,13 @@ <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.soilAlternativeMeasures"></app-no-data> </div> - <div class="subheading2 grid-1"> - Describe the type, origin and quality of fill proposed to be placed. - </div> + <div class="subheading2 grid-1">Describe the type, origin and quality of fill proposed to be placed.</div> <div class="grid-double"> {{ _applicationSubmission.soilFillTypeToPlace }} <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.soilFillTypeToPlace"></app-no-data> </div> - <div class="subheading2 grid-1"> - What steps will be taken to reduce impacts to surrounding agricultural land? - </div> + <div class="subheading2 grid-1">What steps will be taken to reduce impacts to surrounding agricultural land?</div> <div class="grid-double"> {{ _applicationSubmission.soilReduceNegativeImpacts }} <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.soilReduceNegativeImpacts"></app-no-data> diff --git a/portal-frontend/src/app/features/applications/application-details/pofo-details/pofo-details.component.scss b/portal-frontend/src/app/features/applications/application-details/pofo-details/pofo-details.component.scss index 0c540ce5fb..e69de29bb2 100644 --- a/portal-frontend/src/app/features/applications/application-details/pofo-details/pofo-details.component.scss +++ b/portal-frontend/src/app/features/applications/application-details/pofo-details/pofo-details.component.scss @@ -1,9 +0,0 @@ -@use '../../../../../styles/functions' as *; - -.soil-table { - display: grid; - grid-template-columns: max-content max-content; - overflow-x: auto; - grid-column-gap: rem(36); - grid-row-gap: rem(12); -} diff --git a/portal-frontend/src/app/features/applications/application-details/roso-details/roso-details.component.html b/portal-frontend/src/app/features/applications/application-details/roso-details/roso-details.component.html index 28cc11706e..b3a81ee86b 100644 --- a/portal-frontend/src/app/features/applications/application-details/roso-details/roso-details.component.html +++ b/portal-frontend/src/app/features/applications/application-details/roso-details/roso-details.component.html @@ -9,122 +9,117 @@ <app-no-data [showRequired]="showErrors" *ngIf="_applicationSubmission.soilIsFollowUp === null"></app-no-data> </div> - <div *ngIf="_applicationSubmission.soilIsFollowUp" class="subheading2 grid-1"> - Application or NOI ID - </div> + <div *ngIf="_applicationSubmission.soilIsFollowUp" class="subheading2 grid-1">Application or NOI ID</div> <div *ngIf="_applicationSubmission.soilIsFollowUp" class="grid-double"> {{ _applicationSubmission.soilFollowUpIDs }} <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.soilFollowUpIDs"></app-no-data> </div> - <div class="subheading2 grid-1"> - What is the purpose of the proposal? - </div> + <div class="subheading2 grid-1">What is the purpose of the proposal?</div> <div class="grid-double"> {{ _applicationSubmission.purpose }} <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.purpose"></app-no-data> </div> - <div class="subheading1 full-width"> - Soil to be Removed - </div> - <div class="full-width soil-table"> - <div class="grid-1"><strong>Volume</strong></div> - <div class="grid-2"> - {{ _applicationSubmission.soilToRemoveVolume }} - <span *ngIf="_applicationSubmission.soilToRemoveVolume">m<sup>3</sup></span> - <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.soilToRemoveVolume"></app-no-data> - </div> - <div class="grid-1"><strong>Area</strong></div> - <div class="grid-2"> - {{ _applicationSubmission.soilToRemoveArea }} <span *ngIf="_applicationSubmission.soilToRemoveArea">ha</span> - <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.soilToRemoveArea"></app-no-data> - </div> - <div class="grid-1"><strong>Maximum Depth</strong></div> - <div class="grid-2"> - {{ _applicationSubmission.soilToRemoveMaximumDepth }} - <span *ngIf="_applicationSubmission.soilToRemoveMaximumDepth">m</span> - <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.soilToRemoveMaximumDepth"></app-no-data> - </div> - <div class="grid-1"><strong>Average Depth</strong></div> - <div class="grid-2"> - {{ _applicationSubmission.soilToRemoveAverageDepth }} - <span *ngIf="_applicationSubmission.soilToRemoveAverageDepth">m</span> - <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.soilToRemoveAverageDepth"></app-no-data> + <div class="subheading2 grid-1">Project Duration</div> + <div class="grid-double"> + <div *ngIf="_applicationSubmission.soilProjectDurationAmount && _applicationSubmission.soilProjectDurationUnit"> + {{ _applicationSubmission.soilProjectDurationAmount }} + <ng-container [ngPlural]="_applicationSubmission.soilProjectDurationAmount"> + <ng-template ngPluralCase="=1"> + {{ _applicationSubmission.soilProjectDurationUnit.slice(0, -1) | titlecase }} + </ng-template> + <ng-template ngPluralCase="other"> + {{ _applicationSubmission.soilProjectDurationUnit | titlecase }} + </ng-template> + </ng-container> </div> + <app-no-data + [showRequired]="showErrors" + *ngIf="!_applicationSubmission.soilProjectDurationAmount || !_applicationSubmission.soilProjectDurationUnit" + ></app-no-data> </div> - <div class="subheading1 full-width"> - Soil already Removed + <div class="grid-1"></div> + <div class="subheading2 grid-double">Soil to be Removed</div> + + <div class="subheading2 grid-1">Volume</div> + <div class="grid-double"> + {{ _applicationSubmission.soilToRemoveVolume }} + <span *ngIf="_applicationSubmission.soilToRemoveVolume">m<sup>3</sup></span> + <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.soilToRemoveVolume"></app-no-data> </div> - <div class="full-width soil-table"> - <div class="grid-1"><strong>Volume</strong></div> - <div class="grid-2"> - {{ _applicationSubmission.soilAlreadyRemovedVolume }} - <span *ngIf="_applicationSubmission.soilAlreadyRemovedVolume !== null">m<sup>3</sup></span> - <app-no-data - [showRequired]="showErrors" - *ngIf="_applicationSubmission.soilAlreadyRemovedVolume === null" - ></app-no-data> - </div> - <div class="grid-1"><strong>Area</strong></div> - <div class="grid-2"> - {{ _applicationSubmission.soilAlreadyRemovedArea }} - <span *ngIf="_applicationSubmission.soilAlreadyRemovedArea !== null">ha</span> - <app-no-data - [showRequired]="showErrors" - *ngIf="_applicationSubmission.soilAlreadyRemovedArea === null" - ></app-no-data> - </div> - <div class="grid-1"><strong>Maximum Depth</strong></div> - <div class="grid-2"> - {{ _applicationSubmission.soilAlreadyRemovedMaximumDepth }} - <span *ngIf="_applicationSubmission.soilAlreadyRemovedMaximumDepth !== null">m</span> - <app-no-data - [showRequired]="showErrors" - *ngIf="_applicationSubmission.soilAlreadyRemovedMaximumDepth === null" - ></app-no-data> - </div> - <div class="grid-1"><strong>Average Depth</strong></div> - <div class="grid-2"> - {{ _applicationSubmission.soilAlreadyRemovedAverageDepth }} - <span *ngIf="_applicationSubmission.soilAlreadyRemovedAverageDepth !== null">m</span> - <app-no-data - [showRequired]="showErrors" - *ngIf="_applicationSubmission.soilAlreadyRemovedAverageDepth === null" - ></app-no-data> - </div> + + <div class="subheading2 grid-1">Area</div> + <div class="grid-double"> + {{ _applicationSubmission.soilToRemoveArea }} <span *ngIf="_applicationSubmission.soilToRemoveArea">ha</span> + <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.soilToRemoveArea"></app-no-data> </div> - <div class="full-width"> - <span class="subheading1">Project Duration</span> + <div class="subheading2 grid-1">Maximum Depth</div> + <div class="grid-double"> + {{ _applicationSubmission.soilToRemoveMaximumDepth }} + <span *ngIf="_applicationSubmission.soilToRemoveMaximumDepth">m</span> + <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.soilToRemoveMaximumDepth"></app-no-data> </div> - <div class="subheading2 grid-1"> - Duration + + <div class="subheading2 grid-1">Average Depth</div> + <div class="grid-double"> + {{ _applicationSubmission.soilToRemoveAverageDepth }} + <span *ngIf="_applicationSubmission.soilToRemoveAverageDepth">m</span> + <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.soilToRemoveAverageDepth"></app-no-data> </div> + + <div class="grid-1"></div> + <div class="subheading2 grid-double">Soil already Removed</div> + + <div class="subheading2 grid-1">Volume</div> <div class="grid-double"> - {{ _applicationSubmission.soilProjectDurationUnit }} - <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.soilProjectDurationUnit"></app-no-data> + {{ _applicationSubmission.soilAlreadyRemovedVolume }} + <span *ngIf="_applicationSubmission.soilAlreadyRemovedVolume !== null">m<sup>3</sup></span> + <app-no-data + [showRequired]="showErrors" + *ngIf="_applicationSubmission.soilAlreadyRemovedVolume === null" + ></app-no-data> </div> - <div class="subheading2 grid-1"> - Length + + <div class="subheading2 grid-1">Area</div> + <div class="grid-double"> + {{ _applicationSubmission.soilAlreadyRemovedArea }} + <span *ngIf="_applicationSubmission.soilAlreadyRemovedArea !== null">ha</span> + <app-no-data + [showRequired]="showErrors" + *ngIf="_applicationSubmission.soilAlreadyRemovedArea === null" + ></app-no-data> </div> + + <div class="subheading2 grid-1">Maximum Depth</div> <div class="grid-double"> - {{ _applicationSubmission.soilProjectDurationAmount }} - <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.soilProjectDurationAmount"></app-no-data> + {{ _applicationSubmission.soilAlreadyRemovedMaximumDepth }} + <span *ngIf="_applicationSubmission.soilAlreadyRemovedMaximumDepth !== null">m</span> + <app-no-data + [showRequired]="showErrors" + *ngIf="_applicationSubmission.soilAlreadyRemovedMaximumDepth === null" + ></app-no-data> </div> - <div class="subheading2 grid-1"> - Describe the type of soil proposed to be removed. + <div class="subheading2 grid-1">Average Depth</div> + <div class="grid-double"> + {{ _applicationSubmission.soilAlreadyRemovedAverageDepth }} + <span *ngIf="_applicationSubmission.soilAlreadyRemovedAverageDepth !== null">m</span> + <app-no-data + [showRequired]="showErrors" + *ngIf="_applicationSubmission.soilAlreadyRemovedAverageDepth === null" + ></app-no-data> </div> + + <div class="subheading2 grid-1">Describe the type of soil proposed to be removed.</div> <div class="grid-double"> {{ _applicationSubmission.soilTypeRemoved }} <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.soilTypeRemoved"></app-no-data> </div> - <div class="subheading2 grid-1"> - What steps will be taken to reduce impacts to surrounding agricultural land? - </div> + <div class="subheading2 grid-1">What steps will be taken to reduce impacts to surrounding agricultural land?</div> <div class="grid-double"> {{ _applicationSubmission.soilReduceNegativeImpacts }} <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.soilReduceNegativeImpacts"></app-no-data> diff --git a/portal-frontend/src/app/features/applications/application-details/roso-details/roso-details.component.scss b/portal-frontend/src/app/features/applications/application-details/roso-details/roso-details.component.scss index 0c540ce5fb..e69de29bb2 100644 --- a/portal-frontend/src/app/features/applications/application-details/roso-details/roso-details.component.scss +++ b/portal-frontend/src/app/features/applications/application-details/roso-details/roso-details.component.scss @@ -1,9 +0,0 @@ -@use '../../../../../styles/functions' as *; - -.soil-table { - display: grid; - grid-template-columns: max-content max-content; - overflow-x: auto; - grid-column-gap: rem(36); - grid-row-gap: rem(12); -} diff --git a/portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.html b/portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.html index 6bb880d9d5..2295469417 100644 --- a/portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.html +++ b/portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.html @@ -1,16 +1,16 @@ <div aria-hidden="true" class="banner absolute"> <div> - <h4 *ngIf="application">Application ID: {{ application.fileNumber }}</h4> + <h4 *ngIf="application">Application ID: {{ application.fileNumber }} | {{ application.type }}</h4> </div> <div class="banner-status"> - <div> - <div class="subheading2">Status Date</div> - <span *ngIf="application">{{ application.lastStatusUpdate | date }}</span> - </div> <div> <div class="subheading2">Application Status</div> <span *ngIf="application">{{ application.status.label }}</span> </div> + <div> + <div class="subheading2">Status Date</div> + <span *ngIf="application">{{ application.lastStatusUpdate | date }}</span> + </div> </div> </div> <div class="banner"> @@ -28,9 +28,7 @@ <h4 *ngIf="application">Application ID: {{ application.fileNumber }}</h4> </div> </div> </div> -<button (click)="onNavigateHome()" mat-button color="accent"> - <mat-icon>chevron_left</mat-icon>Return to Inbox -</button> +<button (click)="onNavigateHome()" mat-button color="accent"><mat-icon>chevron_left</mat-icon>Return to Inbox</button> <div> <div class="navigation"> <mat-tab-group> diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.scss b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.scss index 7ef4dbb6b8..338b5ec64e 100644 --- a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.scss +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.scss @@ -68,7 +68,7 @@ .other-attachments { display: grid; - grid-template-columns: max-content max-content max-content; + grid-template-columns: 1fr 1fr 1fr; overflow-x: auto; grid-column-gap: rem(36); grid-row-gap: rem(12); @@ -80,7 +80,7 @@ .adjacent-parcels { display: grid; - grid-template-columns: max-content max-content max-content; + grid-template-columns: 0.65fr 1fr 1fr; overflow-x: auto; grid-column-gap: rem(36); grid-row-gap: rem(12); diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/parcel/parcel.component.html b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/parcel/parcel.component.html index fd4ede09fb..70a911d59d 100644 --- a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/parcel/parcel.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/parcel/parcel.component.html @@ -15,17 +15,12 @@ <h4>Parcel {{ parcelInd + 1 }}: Parcel and Owner Information</h4> </button> </div> </div> - <div class="full-width subheading1">Parcel Information</div> - <div class="subheading2 grid-1"> - Ownership Type - </div> + <div class="subheading2 grid-1">Ownership Type</div> <div class="grid-double"> {{ parcel.ownershipType?.label }} <app-no-data [showRequired]="showErrors" *ngIf="!parcel.ownershipType"></app-no-data> </div> - <div class="subheading2 grid-1"> - Legal Description - </div> + <div class="subheading2 grid-1">Legal Description</div> <div class="grid-double"> {{ parcel.legalDescription }} <app-no-data @@ -33,9 +28,7 @@ <h4>Parcel {{ parcelInd + 1 }}: Parcel and Owner Information</h4> *ngIf="parcel.validation?.isLegalDescriptionRequired || false" ></app-no-data> </div> - <div class="subheading2 grid-1"> - Area (Hectares) - </div> + <div class="subheading2 grid-1">Area (Hectares)</div> <div class="grid-double"> {{ parcel.mapAreaHectares }} <app-no-data @@ -54,9 +47,7 @@ <h4>Parcel {{ parcelInd + 1 }}: Parcel and Owner Information</h4> </app-validation-error> </div> <ng-container *ngIf="parcel.ownershipType?.code === PARCEL_OWNERSHIP_TYPES.CROWN"> - <div class="subheading2 grid-1"> - PIN (optional) - </div> + <div class="subheading2 grid-1">PIN (optional)</div> <div class="grid-double"> {{ parcel.pin }} <app-no-data @@ -66,9 +57,7 @@ <h4>Parcel {{ parcelInd + 1 }}: Parcel and Owner Information</h4> </div> </ng-container> <ng-container *ngIf="parcel.ownershipType?.code === PARCEL_OWNERSHIP_TYPES.FEE_SIMPLE"> - <div class="subheading2 grid-1"> - Purchase Date - </div> + <div class="subheading2 grid-1">Purchase Date</div> <div class="grid-double"> {{ parcel.purchasedDate | date }} <app-no-data @@ -78,16 +67,12 @@ <h4>Parcel {{ parcelInd + 1 }}: Parcel and Owner Information</h4> </app-no-data> </div> </ng-container> - <div class="subheading2 grid-1"> - Farm Classification - </div> + <div class="subheading2 grid-1">Farm Classification</div> <div class="grid-double"> <span *ngIf="parcel.isFarm !== null">{{ parcel.isFarm ? 'Yes' : 'No' }}</span> <app-no-data [showRequired]="showErrors" *ngIf="parcel.isFarm === null"></app-no-data> </div> - <div class="subheading2 grid-1"> - Civic Address - </div> + <div class="subheading2 grid-1">Civic Address</div> <div class="grid-double"> {{ parcel.civicAddress }} <app-no-data [showRequired]="showErrors" *ngIf="!parcel.civicAddress"></app-no-data> @@ -99,9 +84,7 @@ <h4>Parcel {{ parcelInd + 1 }}: Parcel and Owner Information</h4> <app-no-data [showRequired]="showErrors" *ngIf="parcel.crownLandOwnerType === null"></app-no-data> </div> </ng-container> - <div class="subheading2 grid-1"> - Certificate Of Title - </div> + <div class="subheading2 grid-1">Certificate Of Title</div> <div class="grid-double"> <div *ngIf="parcel.certificateOfTitle"> <a (click)="onOpenFile(parcel.certificateOfTitle.uuid)">{{ parcel.certificateOfTitle.fileName }}</a> @@ -111,21 +94,21 @@ <h4>Parcel {{ parcelInd + 1 }}: Parcel and Owner Information</h4> *ngIf="!parcel.validation?.isCertificateUploaded" ></app-no-data> </div> - <div class="full-width subheading1"> - Owner Information - </div> - <div class="full-width owner-information"> - <div class="subheading2">Type</div> - <div class="subheading2">Full Name</div> + + <div + class="full-width owner-information" + [ngClass]="{ 'crown-owner-information': parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN }" + > + <div class="subheading2" *ngIf="parcel.ownershipTypeCode !== PARCEL_OWNERSHIP_TYPES.CROWN">Land Owner(s)</div> + <div class="subheading2" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">Crown Contact(s)</div> <div class="subheading2" *ngIf="parcel.ownershipTypeCode !== PARCEL_OWNERSHIP_TYPES.CROWN">Organization</div> <div class="subheading2" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN"> - Ministry/ Department + Ministry/Department </div> <div class="subheading2">Phone</div> <div class="subheading2">Email</div> - <div class="subheading2">Corporate Summary</div> + <div class="subheading2" *ngIf="parcel.ownershipTypeCode !== PARCEL_OWNERSHIP_TYPES.CROWN">Corporate Summary</div> <ng-container *ngFor="let owner of parcel.owners"> - <div>{{ owner.type.label }}</div> <div>{{ owner.displayName }}</div> <div> <span *ngIf="owner.organizationName"></span>{{ owner.organizationName }} @@ -133,7 +116,7 @@ <h4>Parcel {{ parcelInd + 1 }}: Parcel and Owner Information</h4> </div> <div>{{ owner.phoneNumber }}</div> <div>{{ owner.email }}</div> - <div> + <div *ngIf="parcel.ownershipTypeCode !== PARCEL_OWNERSHIP_TYPES.CROWN"> <a *ngIf="owner.corporateSummary" (click)="onOpenFile(owner.corporateSummary.uuid)">{{ owner.corporateSummary.fileName }}</a> diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/parcel/parcel.component.scss b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/parcel/parcel.component.scss index ecf9d4a24c..c1eab86cc9 100644 --- a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/parcel/parcel.component.scss +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/parcel/parcel.component.scss @@ -2,7 +2,7 @@ .owner-information { display: grid; - grid-template-columns: max-content max-content max-content max-content max-content max-content; + grid-template-columns: 1fr 1fr 1fr 1fr 1fr; overflow-x: auto; grid-column-gap: rem(36); grid-row-gap: rem(12); @@ -12,9 +12,11 @@ } } -.review-table { - grid-template-columns: 1fr 1fr !important; +.crown-owner-information { + grid-template-columns: 1fr 1fr 1fr 1fr; +} +.review-table { .full-width { grid-column: 1/3; } diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pfrs-details/pfrs-details.component.html b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pfrs-details/pfrs-details.component.html index c4d8a0af07..c90bb8d786 100644 --- a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pfrs-details/pfrs-details.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pfrs-details/pfrs-details.component.html @@ -9,52 +9,55 @@ <app-no-data [showRequired]="showErrors" *ngIf="_noiSubmission.soilIsFollowUp === null"></app-no-data> </div> - <div *ngIf="_noiSubmission.soilIsFollowUp" class="subheading2 grid-1"> - Application or NOI ID - </div> + <div *ngIf="_noiSubmission.soilIsFollowUp" class="subheading2 grid-1">Application or NOI ID</div> <div *ngIf="_noiSubmission.soilIsFollowUp" class="grid-double"> {{ _noiSubmission.soilFollowUpIDs }} <app-no-data [showRequired]="showErrors" *ngIf="!_noiSubmission.soilFollowUpIDs"></app-no-data> </div> - <div class="subheading2 grid-1"> - What is the purpose of the proposal? - </div> + <div class="subheading2 grid-1">What is the purpose of the proposal?</div> <div class="grid-double"> {{ _noiSubmission.purpose }} <app-no-data [showRequired]="showErrors" *ngIf="!_noiSubmission.purpose"></app-no-data> </div> - <div class="subheading2 grid-1"> - Describe the type of soil proposed to be removed. - </div> + <div class="subheading2 grid-1">Describe the type of soil proposed to be removed.</div> <div class="grid-double"> {{ _noiSubmission.soilTypeRemoved }} <app-no-data [showRequired]="showErrors" *ngIf="!_noiSubmission.soilTypeRemoved"></app-no-data> </div> - <div class="subheading2 grid-1"> - Describe the type, origin and quality of fill proposed to be placed. - </div> + <div class="subheading2 grid-1">Describe the type, origin and quality of fill proposed to be placed.</div> <div class="grid-double"> {{ _noiSubmission.soilFillTypeToPlace }} <app-no-data [showRequired]="showErrors" *ngIf="!_noiSubmission.soilFillTypeToPlace"></app-no-data> </div> + <div class="subheading2 grid-1">Project Duration</div> + <div class="grid-double"> + <div *ngIf="_noiSubmission.soilProjectDurationAmount && _noiSubmission.soilProjectDurationUnit"> + {{ _noiSubmission.soilProjectDurationAmount }} + <ng-container [ngPlural]="_noiSubmission.soilProjectDurationAmount"> + <ng-template ngPluralCase="=1"> + {{ _noiSubmission.soilProjectDurationUnit.slice(0, -1) | titlecase }} + </ng-template> + <ng-template ngPluralCase="other"> + {{ _noiSubmission.soilProjectDurationUnit | titlecase }} + </ng-template> + </ng-container> + </div> + <app-no-data + [showRequired]="showErrors" + *ngIf="!_noiSubmission.soilProjectDurationAmount || !_noiSubmission.soilProjectDurationUnit" + ></app-no-data> + </div> + <div *ngIf="_noiSubmission" class="full-width soil-table"> <div></div> - <div> - <strong - >Soil to be Removed - </strong> - </div> - <div> - <strong - >Fill to be Placed - </strong> - </div> + <div class="subheading2">Soil to be Removed</div> + <div class="subheading2">Fill to be Placed</div> - <div><strong>Volume</strong></div> + <div class="subheading2">Volume</div> <div> {{ _noiSubmission.soilToRemoveVolume }} <span *ngIf="_noiSubmission.soilToRemoveVolume !== null">m<sup>3</sup></span> @@ -66,7 +69,7 @@ <app-no-data [showRequired]="showErrors" *ngIf="_noiSubmission.soilToPlaceVolume === null"></app-no-data> </div> - <div><strong>Area</strong></div> + <div class="subheading2">Area</div> <div> {{ _noiSubmission.soilToRemoveArea }} <span *ngIf="_noiSubmission.soilToRemoveArea !== null">m<sup>2</sup></span> @@ -78,7 +81,7 @@ <app-no-data [showRequired]="showErrors" *ngIf="_noiSubmission.soilToPlaceArea === null"></app-no-data> </div> - <div><strong>Maximum Depth</strong></div> + <div class="subheading2">Maximum Depth</div> <div> {{ _noiSubmission.soilToRemoveMaximumDepth }} <span *ngIf="_noiSubmission.soilToRemoveMaximumDepth !== null">m</span> @@ -90,7 +93,7 @@ <app-no-data [showRequired]="showErrors" *ngIf="_noiSubmission.soilToPlaceMaximumDepth === null"></app-no-data> </div> - <div><strong>Average Depth</strong></div> + <div class="subheading2">Average Depth</div> <div> {{ _noiSubmission.soilToRemoveAverageDepth }} <span *ngIf="_noiSubmission.soilToRemoveAverageDepth !== null">m</span> @@ -105,18 +108,10 @@ <div class="spacer-row"></div> <div></div> - <div> - <strong - >Soil already Removed - </strong> - </div> - <div> - <strong - >Fill already Placed - </strong> - </div> + <div class="subheading2">Soil already Removed</div> + <div class="subheading2">Fill already Placed</div> - <div><strong>Volume</strong></div> + <div class="subheading2">Volume</div> <div> {{ _noiSubmission.soilAlreadyRemovedVolume }} <span *ngIf="_noiSubmission.soilAlreadyRemovedVolume !== null">m<sup>3</sup></span> @@ -128,7 +123,7 @@ <app-no-data [showRequired]="showErrors" *ngIf="_noiSubmission.soilAlreadyPlacedVolume === null"></app-no-data> </div> - <div><strong>Area</strong></div> + <div class="subheading2">Area</div> <div> {{ _noiSubmission.soilAlreadyRemovedArea }} <span *ngIf="_noiSubmission.soilAlreadyRemovedArea !== null">m<sup>2</sup></span> @@ -140,7 +135,7 @@ <app-no-data [showRequired]="showErrors" *ngIf="_noiSubmission.soilAlreadyPlacedArea === null"></app-no-data> </div> - <div><strong>Maximum Depth</strong></div> + <div class="subheading2">Maximum Depth</div> <div> {{ _noiSubmission.soilAlreadyRemovedMaximumDepth }} <span *ngIf="_noiSubmission.soilAlreadyRemovedMaximumDepth !== null">m</span> @@ -158,7 +153,7 @@ ></app-no-data> </div> - <div><strong>Average Depth</strong></div> + <div class="subheading2">Average Depth</div> <div> {{ _noiSubmission.soilAlreadyRemovedAverageDepth }} <span *ngIf="_noiSubmission.soilAlreadyRemovedAverageDepth !== null">m</span> @@ -177,24 +172,6 @@ </div> </div> - <div class="full-width"> - <h4>Project Duration</h4> - </div> - <div class="subheading2 grid-1"> - Duration - </div> - <div class="grid-double"> - {{ _noiSubmission.soilProjectDurationUnit }} - <app-no-data [showRequired]="showErrors" *ngIf="!_noiSubmission.soilProjectDurationUnit"></app-no-data> - </div> - <div class="subheading2 grid-1"> - Length - </div> - <div class="grid-double"> - {{ _noiSubmission.soilProjectDurationAmount }} - <app-no-data [showRequired]="showErrors" *ngIf="!_noiSubmission.soilProjectDurationAmount"></app-no-data> - </div> - <div class="subheading2 grid-1">Proposal Map / Site Plan</div> <div class="grid-double"> <a *ngFor="let map of proposalMap" (click)="openFile(map.uuid)"> @@ -203,9 +180,7 @@ <h4>Project Duration</h4> <app-no-data [showRequired]="showErrors" *ngIf="proposalMap.length === 0"></app-no-data> </div> - <div class="subheading2 grid-1"> - Is your proposal for area-wide filling? - </div> + <div class="subheading2 grid-1">Is your proposal for area-wide filling?</div> <div class="grid-double"> <span *ngIf="_noiSubmission.soilIsAreaWideFilling !== null"> {{ _noiSubmission.soilIsAreaWideFilling ? 'Yes' : 'No' }} @@ -213,9 +188,7 @@ <h4>Project Duration</h4> <app-no-data [showRequired]="showErrors" *ngIf="_noiSubmission.soilIsAreaWideFilling === null"></app-no-data> </div> - <div class="subheading2 grid-1"> - Is your proposal for aggregate extraction or placer mining? - </div> + <div class="subheading2 grid-1">Is your proposal for aggregate extraction or placer mining?</div> <div class="grid-double"> <span *ngIf="_noiSubmission.soilIsExtractionOrMining !== null"> {{ _noiSubmission.soilIsExtractionOrMining ? 'Yes' : 'No' }} diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pfrs-details/pfrs-details.component.scss b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pfrs-details/pfrs-details.component.scss index 9cda769473..474bd9aed7 100644 --- a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pfrs-details/pfrs-details.component.scss +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pfrs-details/pfrs-details.component.scss @@ -1,7 +1,7 @@ @use '../../../../../styles/functions' as *; .soil-table { - grid-template-columns: max-content max-content max-content; + grid-template-columns: 0.625fr 1fr 1fr; .spacer-row { grid-column: 1/4; diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pofo-details/pofo-details.component.html b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pofo-details/pofo-details.component.html index f1ba6c069b..8310b41e94 100644 --- a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pofo-details/pofo-details.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pofo-details/pofo-details.component.html @@ -9,113 +9,108 @@ <app-no-data [showRequired]="showErrors" *ngIf="_noiSubmission.soilIsFollowUp === null"></app-no-data> </div> - <div *ngIf="_noiSubmission.soilIsFollowUp" class="subheading2 grid-1"> - Application or NOI ID - </div> + <div *ngIf="_noiSubmission.soilIsFollowUp" class="subheading2 grid-1">Application or NOI ID</div> <div *ngIf="_noiSubmission.soilIsFollowUp" class="grid-double"> {{ _noiSubmission.soilFollowUpIDs }} <app-no-data [showRequired]="showErrors" *ngIf="!_noiSubmission.soilFollowUpIDs"></app-no-data> </div> - <div class="subheading2 grid-1"> - What is the purpose of the proposal? - </div> + <div class="subheading2 grid-1">What is the purpose of the proposal?</div> <div class="grid-double"> {{ _noiSubmission.purpose }} <app-no-data [showRequired]="showErrors" *ngIf="!_noiSubmission.purpose"></app-no-data> </div> - <div class="subheading2 grid-1"> - Describe the type, origin and quality of fill proposed to be placed. - </div> + <div class="subheading2 grid-1">Describe the type, origin and quality of fill proposed to be placed.</div> <div class="grid-double"> {{ _noiSubmission.soilFillTypeToPlace }} <app-no-data [showRequired]="showErrors" *ngIf="!_noiSubmission.soilFillTypeToPlace"></app-no-data> </div> - <div class="full-width soil-table"> - <div class="grid-1"></div> - <div class="grid-2"> - <strong> Fill to be Placed</strong> - </div> - <div class="grid-1"><strong>Volume</strong></div> - <div class="grid-2"> - {{ _noiSubmission.soilToPlaceVolume }} - <span *ngIf="_noiSubmission.soilToPlaceVolume">m<sup>3</sup></span> - <app-no-data [showRequired]="showErrors" *ngIf="!_noiSubmission.soilToPlaceVolume"></app-no-data> - </div> - <div class="grid-1"><strong>Area</strong></div> - <div class="grid-2"> - {{ _noiSubmission.soilToPlaceArea }} <span *ngIf="_noiSubmission.soilToPlaceArea">m<sup>2</sup></span> - <app-no-data [showRequired]="showErrors" *ngIf="!_noiSubmission.soilToPlaceArea"></app-no-data> - </div> - <div class="grid-1"><strong>Maximum Depth</strong></div> - <div class="grid-2"> - {{ _noiSubmission.soilToPlaceMaximumDepth }} - <span *ngIf="_noiSubmission.soilToPlaceMaximumDepth">m</span> - <app-no-data [showRequired]="showErrors" *ngIf="!_noiSubmission.soilToPlaceMaximumDepth"></app-no-data> - </div> - <div class="grid-1"><strong>Average Depth</strong></div> - <div class="grid-2"> - {{ _noiSubmission.soilToPlaceAverageDepth }} - <span *ngIf="_noiSubmission.soilToPlaceAverageDepth">m</span> - <app-no-data [showRequired]="showErrors" *ngIf="!_noiSubmission.soilToPlaceAverageDepth"></app-no-data> + <div class="subheading2 grid-1">Project Duration</div> + <div class="grid-double"> + <div *ngIf="_noiSubmission.soilProjectDurationAmount && _noiSubmission.soilProjectDurationUnit"> + {{ _noiSubmission.soilProjectDurationAmount }} + <ng-container [ngPlural]="_noiSubmission.soilProjectDurationAmount"> + <ng-template ngPluralCase="=1"> + {{ _noiSubmission.soilProjectDurationUnit.slice(0, -1) | titlecase }} + </ng-template> + <ng-template ngPluralCase="other"> + {{ _noiSubmission.soilProjectDurationUnit | titlecase }} + </ng-template> + </ng-container> </div> + <app-no-data + [showRequired]="showErrors" + *ngIf="!_noiSubmission.soilProjectDurationAmount || !_noiSubmission.soilProjectDurationUnit" + ></app-no-data> </div> - <div class="full-width soil-table"> - <div class="grid-1"></div> - <div class="grid-2"> - <strong> Fill already Placed</strong> - </div> - <div class="grid-1"><strong>Volume</strong></div> - <div class="grid-2"> - {{ _noiSubmission.soilAlreadyPlacedVolume }} - <span *ngIf="_noiSubmission.soilAlreadyPlacedVolume !== null">m<sup>3</sup></span> - <app-no-data [showRequired]="showErrors" *ngIf="_noiSubmission.soilAlreadyPlacedVolume === null"></app-no-data> - </div> - <div class="grid-1"><strong>Area</strong></div> - <div class="grid-2"> - {{ _noiSubmission.soilAlreadyPlacedArea }} - <span *ngIf="_noiSubmission.soilAlreadyPlacedArea !== null">m<sup>2</sup></span> - <app-no-data [showRequired]="showErrors" *ngIf="_noiSubmission.soilAlreadyPlacedArea === null"></app-no-data> - </div> - <div class="grid-1"><strong>Maximum Depth</strong></div> - <div class="grid-2"> - {{ _noiSubmission.soilAlreadyPlacedMaximumDepth }} - <span *ngIf="_noiSubmission.soilAlreadyPlacedMaximumDepth !== null">m</span> - <app-no-data - [showRequired]="showErrors" - *ngIf="_noiSubmission.soilAlreadyPlacedMaximumDepth === null" - ></app-no-data> - </div> - <div class="grid-1"><strong>Average Depth</strong></div> - <div class="grid-2"> - {{ _noiSubmission.soilAlreadyPlacedAverageDepth }} - <span *ngIf="_noiSubmission.soilAlreadyPlacedAverageDepth !== null">m</span> - <app-no-data - [showRequired]="showErrors" - *ngIf="_noiSubmission.soilAlreadyPlacedAverageDepth === null" - ></app-no-data> - </div> + <div class="grid-1"></div> + <div class="subheading2 grid-double">Fill to be Placed</div> + + <div class="subheading2 grid-1">Volume</div> + <div class="grid-double"> + {{ _noiSubmission.soilToPlaceVolume }} + <span *ngIf="_noiSubmission.soilToPlaceVolume">m<sup>3</sup></span> + <app-no-data [showRequired]="showErrors" *ngIf="!_noiSubmission.soilToPlaceVolume"></app-no-data> </div> - <div class="full-width"> - <h4>Project Duration</h4> + <div class="subheading2 grid-1">Area</div> + <div class="grid-double"> + {{ _noiSubmission.soilToPlaceArea }} <span *ngIf="_noiSubmission.soilToPlaceArea">m<sup>2</sup></span> + <app-no-data [showRequired]="showErrors" *ngIf="!_noiSubmission.soilToPlaceArea"></app-no-data> </div> - <div class="subheading2 grid-1"> - Duration + + <div class="subheading2 grid-1">Maximum Depth</div> + <div class="grid-double"> + {{ _noiSubmission.soilToPlaceMaximumDepth }} + <span *ngIf="_noiSubmission.soilToPlaceMaximumDepth">m</span> + <app-no-data [showRequired]="showErrors" *ngIf="!_noiSubmission.soilToPlaceMaximumDepth"></app-no-data> </div> + + <div class="subheading2 grid-1">Average Depth</div> <div class="grid-double"> - {{ _noiSubmission.soilProjectDurationUnit }} - <app-no-data [showRequired]="showErrors" *ngIf="!_noiSubmission.soilProjectDurationUnit"></app-no-data> + {{ _noiSubmission.soilToPlaceAverageDepth }} + <span *ngIf="_noiSubmission.soilToPlaceAverageDepth">m</span> + <app-no-data [showRequired]="showErrors" *ngIf="!_noiSubmission.soilToPlaceAverageDepth"></app-no-data> </div> - <div class="subheading2 grid-1"> - Length + + <div class="grid-1"></div> + <div class="subheading2 grid-double">Fill already Placed</div> + + <div class="subheading2 grid-1">Volume</div> + <div class="grid-double"> + {{ _noiSubmission.soilAlreadyPlacedVolume }} + <span *ngIf="_noiSubmission.soilAlreadyPlacedVolume !== null">m<sup>3</sup></span> + <app-no-data [showRequired]="showErrors" *ngIf="_noiSubmission.soilAlreadyPlacedVolume === null"></app-no-data> </div> + + <div class="subheading2 grid-1">Area</div> <div class="grid-double"> - {{ _noiSubmission.soilProjectDurationAmount }} - <app-no-data [showRequired]="showErrors" *ngIf="!_noiSubmission.soilProjectDurationAmount"></app-no-data> + {{ _noiSubmission.soilAlreadyPlacedArea }} + <span *ngIf="_noiSubmission.soilAlreadyPlacedArea !== null">m<sup>2</sup></span> + <app-no-data [showRequired]="showErrors" *ngIf="_noiSubmission.soilAlreadyPlacedArea === null"></app-no-data> + </div> + + <div class="subheading2 grid-1">Maximum Depth</div> + <div class="grid-double"> + {{ _noiSubmission.soilAlreadyPlacedMaximumDepth }} + <span *ngIf="_noiSubmission.soilAlreadyPlacedMaximumDepth !== null">m</span> + <app-no-data + [showRequired]="showErrors" + *ngIf="_noiSubmission.soilAlreadyPlacedMaximumDepth === null" + ></app-no-data> + </div> + + <div class="subheading2 grid-1">Average Depth</div> + <div class="grid-double"> + {{ _noiSubmission.soilAlreadyPlacedAverageDepth }} + <span *ngIf="_noiSubmission.soilAlreadyPlacedAverageDepth !== null">m</span> + <app-no-data + [showRequired]="showErrors" + *ngIf="_noiSubmission.soilAlreadyPlacedAverageDepth === null" + ></app-no-data> </div> <div class="subheading2 grid-1">Proposal Map / Site Plan</div> @@ -126,9 +121,7 @@ <h4>Project Duration</h4> <app-no-data [showRequired]="showErrors" *ngIf="proposalMap.length === 0"></app-no-data> </div> - <div class="subheading2 grid-1"> - Is your proposal for area-wide filling? - </div> + <div class="subheading2 grid-1">Is your proposal for area-wide filling?</div> <div class="grid-double"> <span *ngIf="_noiSubmission.soilIsAreaWideFilling !== null"> {{ _noiSubmission.soilIsAreaWideFilling ? 'Yes' : 'No' }} diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pofo-details/pofo-details.component.scss b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pofo-details/pofo-details.component.scss index 76605b2b82..e69de29bb2 100644 --- a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pofo-details/pofo-details.component.scss +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pofo-details/pofo-details.component.scss @@ -1,8 +0,0 @@ -@use '../../../../../styles/functions' as *; - -.soil-table { - .spacer-row { - grid-column: 1/4; - height: rem(16); - } -} diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/roso-details/roso-details.component.html b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/roso-details/roso-details.component.html index a8938add2a..b70f3b4c09 100644 --- a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/roso-details/roso-details.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/roso-details/roso-details.component.html @@ -27,87 +27,94 @@ <app-no-data [showRequired]="showErrors" *ngIf="!_noiSubmission.soilTypeRemoved"></app-no-data> </div> - <div class="subheading1 full-width"></div> - <div class="full-width soil-table"> - <div class="grid-1"></div> - <div class="grid-2"> - <strong>Soil to be Removed</strong> - </div> - <div class="grid-1"><strong>Volume</strong></div> - <div class="grid-2"> - {{ _noiSubmission.soilToRemoveVolume }} - <span *ngIf="_noiSubmission.soilToRemoveVolume">m<sup>3</sup></span> - <app-no-data [showRequired]="showErrors" *ngIf="!_noiSubmission.soilToRemoveVolume"></app-no-data> - </div> - <div class="grid-1"><strong>Area</strong></div> - <div class="grid-2"> - {{ _noiSubmission.soilToRemoveArea }} <span *ngIf="_noiSubmission.soilToRemoveArea">ha</span> - <app-no-data [showRequired]="showErrors" *ngIf="!_noiSubmission.soilToRemoveArea"></app-no-data> - </div> - <div class="grid-1"><strong>Maximum Depth</strong></div> - <div class="grid-2"> - {{ _noiSubmission.soilToRemoveMaximumDepth }} - <span *ngIf="_noiSubmission.soilToRemoveMaximumDepth">m</span> - <app-no-data [showRequired]="showErrors" *ngIf="!_noiSubmission.soilToRemoveMaximumDepth"></app-no-data> - </div> - <div class="grid-1"><strong>Average Depth</strong></div> - <div class="grid-2"> - {{ _noiSubmission.soilToRemoveAverageDepth }} - <span *ngIf="_noiSubmission.soilToRemoveAverageDepth">m</span> - <app-no-data [showRequired]="showErrors" *ngIf="!_noiSubmission.soilToRemoveAverageDepth"></app-no-data> + <div class="subheading2 grid-1">Project Duration</div> + <div class="grid-double"> + <div *ngIf="_noiSubmission.soilProjectDurationAmount && _noiSubmission.soilProjectDurationUnit"> + {{ _noiSubmission.soilProjectDurationAmount }} + <ng-container [ngPlural]="_noiSubmission.soilProjectDurationAmount"> + <ng-template ngPluralCase="=1"> + {{ _noiSubmission.soilProjectDurationUnit.slice(0, -1) | titlecase }} + </ng-template> + <ng-template ngPluralCase="other"> + {{ _noiSubmission.soilProjectDurationUnit | titlecase }} + </ng-template> + </ng-container> </div> + <app-no-data + [showRequired]="showErrors" + *ngIf="!_noiSubmission.soilProjectDurationAmount || !_noiSubmission.soilProjectDurationUnit" + ></app-no-data> </div> <div class="subheading1 full-width"></div> - <div class="full-width soil-table"> - <div class="grid-1"></div> - <div class="grid-2"> - <strong>Soil already Removed</strong> - </div> - <div class="grid-1"><strong>Volume</strong></div> - <div class="grid-2"> - {{ _noiSubmission.soilAlreadyRemovedVolume }} - <span *ngIf="_noiSubmission.soilAlreadyRemovedVolume !== null">m<sup>3</sup></span> - <app-no-data [showRequired]="showErrors" *ngIf="_noiSubmission.soilAlreadyRemovedVolume === null"></app-no-data> - </div> - <div class="grid-1"><strong>Area</strong></div> - <div class="grid-2"> - {{ _noiSubmission.soilAlreadyRemovedArea }} - <span *ngIf="_noiSubmission.soilAlreadyRemovedArea !== null">ha</span> - <app-no-data [showRequired]="showErrors" *ngIf="_noiSubmission.soilAlreadyRemovedArea === null"></app-no-data> - </div> - <div class="grid-1"><strong>Maximum Depth</strong></div> - <div class="grid-2"> - {{ _noiSubmission.soilAlreadyRemovedMaximumDepth }} - <span *ngIf="_noiSubmission.soilAlreadyRemovedMaximumDepth !== null">m</span> - <app-no-data - [showRequired]="showErrors" - *ngIf="_noiSubmission.soilAlreadyRemovedMaximumDepth === null" - ></app-no-data> - </div> - <div class="grid-1"><strong>Average Depth</strong></div> - <div class="grid-2"> - {{ _noiSubmission.soilAlreadyRemovedAverageDepth }} - <span *ngIf="_noiSubmission.soilAlreadyRemovedAverageDepth !== null">m</span> - <app-no-data - [showRequired]="showErrors" - *ngIf="_noiSubmission.soilAlreadyRemovedAverageDepth === null" - ></app-no-data> - </div> + + <div class="grid-1"></div> + <div class="subheading2 grid-double">Soil to be Removed</div> + + <div class="subheading2 grid-1">Volume</div> + <div class="grid-double"> + {{ _noiSubmission.soilToRemoveVolume }} + <span *ngIf="_noiSubmission.soilToRemoveVolume">m<sup>3</sup></span> + <app-no-data [showRequired]="showErrors" *ngIf="!_noiSubmission.soilToRemoveVolume"></app-no-data> + </div> + + <div class="subheading2 grid-1">Area</div> + <div class="grid-double"> + {{ _noiSubmission.soilToRemoveArea }} <span *ngIf="_noiSubmission.soilToRemoveArea">ha</span> + <app-no-data [showRequired]="showErrors" *ngIf="!_noiSubmission.soilToRemoveArea"></app-no-data> + </div> + + <div class="subheading2 grid-1">Maximum Depth</div> + <div class="grid-double"> + {{ _noiSubmission.soilToRemoveMaximumDepth }} + <span *ngIf="_noiSubmission.soilToRemoveMaximumDepth">m</span> + <app-no-data [showRequired]="showErrors" *ngIf="!_noiSubmission.soilToRemoveMaximumDepth"></app-no-data> + </div> + + <div class="subheading2 grid-1">Average Depth</div> + <div class="grid-double"> + {{ _noiSubmission.soilToRemoveAverageDepth }} + <span *ngIf="_noiSubmission.soilToRemoveAverageDepth">m</span> + <app-no-data [showRequired]="showErrors" *ngIf="!_noiSubmission.soilToRemoveAverageDepth"></app-no-data> + </div> + + <div class="subheading1 full-width"></div> + + <div class="grid-1"></div> + <div class="subheading2 grid-double">Soil already Removed</div> + + <div class="subheading2 grid-1">Volume</div> + <div class="grid-double"> + {{ _noiSubmission.soilAlreadyRemovedVolume }} + <span *ngIf="_noiSubmission.soilAlreadyRemovedVolume !== null">m<sup>3</sup></span> + <app-no-data [showRequired]="showErrors" *ngIf="_noiSubmission.soilAlreadyRemovedVolume === null"></app-no-data> </div> - <div class="full-width"> - <h4>Project Duration</h4> + <div class="subheading2 grid-1">Area</div> + <div class="grid-double"> + {{ _noiSubmission.soilAlreadyRemovedArea }} + <span *ngIf="_noiSubmission.soilAlreadyRemovedArea !== null">ha</span> + <app-no-data [showRequired]="showErrors" *ngIf="_noiSubmission.soilAlreadyRemovedArea === null"></app-no-data> </div> - <div class="subheading2 grid-1">Duration</div> + + <div class="subheading2 grid-1">Maximum Depth</div> <div class="grid-double"> - {{ _noiSubmission.soilProjectDurationUnit }} - <app-no-data [showRequired]="showErrors" *ngIf="!_noiSubmission.soilProjectDurationUnit"></app-no-data> + {{ _noiSubmission.soilAlreadyRemovedMaximumDepth }} + <span *ngIf="_noiSubmission.soilAlreadyRemovedMaximumDepth !== null">m</span> + <app-no-data + [showRequired]="showErrors" + *ngIf="_noiSubmission.soilAlreadyRemovedMaximumDepth === null" + ></app-no-data> </div> - <div class="subheading2 grid-1">Length</div> + + <div class="subheading2 grid-1">Average Depth</div> <div class="grid-double"> - {{ _noiSubmission.soilProjectDurationAmount }} - <app-no-data [showRequired]="showErrors" *ngIf="!_noiSubmission.soilProjectDurationAmount"></app-no-data> + {{ _noiSubmission.soilAlreadyRemovedAverageDepth }} + <span *ngIf="_noiSubmission.soilAlreadyRemovedAverageDepth !== null">m</span> + <app-no-data + [showRequired]="showErrors" + *ngIf="_noiSubmission.soilAlreadyRemovedAverageDepth === null" + ></app-no-data> </div> <div class="subheading2 grid-1">Proposal Map / Site Plan</div> diff --git a/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.html b/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.html index 318bfe8d9f..cb3c251b59 100644 --- a/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.html @@ -1,16 +1,16 @@ <div aria-hidden="true" class="banner absolute"> <div> - <h4 *ngIf="submission">NOI ID: {{ submission.fileNumber }}</h4> + <h4 *ngIf="submission">NOI ID: {{ submission.fileNumber }} | {{ submission.type }}</h4> </div> <div class="banner-status"> - <div> - <div class="subheading2">Status Date</div> - <span *ngIf="submission">{{ submission.lastStatusUpdate | date }}</span> - </div> <div> <div class="subheading2">NOI Status</div> <span *ngIf="submission">{{ submission.status.label }}</span> </div> + <div> + <div class="subheading2">Status Date</div> + <span *ngIf="submission">{{ submission.lastStatusUpdate | date }}</span> + </div> </div> </div> <div class="banner"> diff --git a/portal-frontend/src/app/features/notifications/notification-details/notification-details.component.html b/portal-frontend/src/app/features/notifications/notification-details/notification-details.component.html index 3d3464e451..5eea27252e 100644 --- a/portal-frontend/src/app/features/notifications/notification-details/notification-details.component.html +++ b/portal-frontend/src/app/features/notifications/notification-details/notification-details.component.html @@ -39,7 +39,7 @@ <h3>2. Identify Transferee(s)</h3> </section> <section> <h3>3. Primary Contact</h3> - <div *ngIf="notificationSubmission" class="review-table other-layout"> + <div *ngIf="notificationSubmission" class="review-table"> <div class="subheading2 grid-1">First Name</div> <div class="grid-double"> {{ notificationSubmission.contactFirstName }} @@ -84,7 +84,7 @@ <h3>3. Primary Contact</h3> </section> <section> <h3>4. Government</h3> - <div *ngIf="notificationSubmission" class="review-table other-layout"> + <div *ngIf="notificationSubmission" class="review-table"> <div class="subheading2 grid-1">Local or First Nation Government</div> <div class="grid-double"> {{ localGovernment?.name }} diff --git a/portal-frontend/src/app/features/notifications/notification-details/notification-details.component.scss b/portal-frontend/src/app/features/notifications/notification-details/notification-details.component.scss index 4f97beff43..dfcc37805f 100644 --- a/portal-frontend/src/app/features/notifications/notification-details/notification-details.component.scss +++ b/portal-frontend/src/app/features/notifications/notification-details/notification-details.component.scss @@ -60,7 +60,7 @@ .other-attachments { display: grid; - grid-template-columns: max-content max-content max-content; + grid-template-columns: 1fr 1fr 1fr; overflow-x: auto; grid-column-gap: rem(36); grid-row-gap: rem(12); @@ -72,7 +72,7 @@ .transferee-table { display: grid; - grid-template-columns: max-content max-content max-content max-content max-content; + grid-template-columns: 1fr 1fr 1fr 1fr 1fr; overflow-x: auto; grid-column-gap: rem(36); grid-row-gap: rem(12); @@ -89,14 +89,6 @@ word-wrap: break-word; hyphens: auto; - &.other-layout { - grid-template-columns: 1fr 1fr; - - .edit-button { - grid-column: 1/3; - } - } - .edit-button { display: flex; justify-content: center; diff --git a/portal-frontend/src/app/features/notifications/notification-details/parcel/parcel.component.scss b/portal-frontend/src/app/features/notifications/notification-details/parcel/parcel.component.scss index ecf9d4a24c..f7868b43b7 100644 --- a/portal-frontend/src/app/features/notifications/notification-details/parcel/parcel.component.scss +++ b/portal-frontend/src/app/features/notifications/notification-details/parcel/parcel.component.scss @@ -1,20 +1,6 @@ @use '../../../../../styles/functions' as *; -.owner-information { - display: grid; - grid-template-columns: max-content max-content max-content max-content max-content max-content; - overflow-x: auto; - grid-column-gap: rem(36); - grid-row-gap: rem(12); - - .full-width { - grid-column: 1/3; - } -} - .review-table { - grid-template-columns: 1fr 1fr !important; - .full-width { grid-column: 1/3; } diff --git a/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.html b/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.html index f25ff5fb19..30e826702d 100644 --- a/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.html +++ b/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.html @@ -1,16 +1,16 @@ <div aria-hidden="true" class="banner absolute"> <div> - <h4 *ngIf="submission">Notification ID: {{ submission.fileNumber }}</h4> + <h4 *ngIf="submission">Notification ID: {{ submission.fileNumber }} | {{ submission.type }}</h4> </div> <div class="banner-status"> - <div> - <div class="subheading2">Status Date</div> - <span *ngIf="submission">{{ submission.lastStatusUpdate | date }}</span> - </div> <div> <div class="subheading2">Notification Status</div> <span *ngIf="submission">{{ submission.status.label }}</span> </div> + <div> + <div class="subheading2">Status Date</div> + <span *ngIf="submission">{{ submission.lastStatusUpdate | date }}</span> + </div> </div> </div> <div class="banner"> From c680a2bcf25c56a3001ef41d81e6e9213a6cc810 Mon Sep 17 00:00:00 2001 From: Liam Stoddard <lstodd@protonmail.com> Date: Fri, 6 Oct 2023 13:48:17 -0700 Subject: [PATCH 463/954] moved insert queries --- .../submissions/app_submissions.py | 121 +----------------- .../submissions/submap/__init__.py | 3 +- .../submissions/submap/insert_query.py | 115 +++++++++++++++++ 3 files changed, 121 insertions(+), 118 deletions(-) create mode 100644 bin/migrate-oats-data/applications/submissions/submap/insert_query.py diff --git a/bin/migrate-oats-data/applications/submissions/app_submissions.py b/bin/migrate-oats-data/applications/submissions/app_submissions.py index 89bbdb952e..4fe13a5e6d 100644 --- a/bin/migrate-oats-data/applications/submissions/app_submissions.py +++ b/bin/migrate-oats-data/applications/submissions/app_submissions.py @@ -23,6 +23,10 @@ map_direction_values, map_soil_data, map_subdiv_lots, + get_insert_query_for_naru, + get_insert_query_for_nfu, + get_insert_query, + get_insert_query_for_inc_exc, ) etl_name = "process_alcs_app_submissions" @@ -217,123 +221,6 @@ def prepare_app_sub_data(app_sub_raw_data_list, direction_data, subdiv_data, soi return nfu_data_list, other_data_list, inc_exc_data_list, naru_data_list -def get_insert_query(unique_fields, unique_values): - # unique_fields takes input from called function and appends to query - query = """ - INSERT INTO alcs.application_submission ( - file_number, - local_government_uuid, - type_code, - is_draft, - audit_created_by, - applicant, - east_land_use_type_description, - west_land_use_type_description, - north_land_use_type_description, - south_land_use_type_description, - east_land_use_type, - west_land_use_type, - north_land_use_type, - south_land_use_type, - subd_proposed_lots, - purpose - {unique_fields} - ) - VALUES ( - %(file_number)s, - %(local_government_uuid)s, - %(type_code)s, - false, - 'oats_etl', - %(applicant)s, - %(east_land_use_type_description)s, - %(west_land_use_type_description)s, - %(north_land_use_type_description)s, - %(south_land_use_type_description)s, - %(east_land_use_type)s, - %(west_land_use_type)s, - %(north_land_use_type)s, - %(south_land_use_type)s, - %(subd_proposed_lots)s, - %(proposal_summary_desc)s - {unique_values} - ) - """ - return query.format(unique_fields=unique_fields, unique_values=unique_values) - - -def get_insert_query_for_nfu(): - unique_fields = """, nfu_hectares, - nfu_will_import_fill, - nfu_fill_volume, - nfu_max_fill_depth, - nfu_project_duration_amount, - nfu_fill_type_description, - nfu_fill_origin_description, - nfu_project_duration_unit, - nfu_total_fill_area - """ - unique_values = """, %(alr_area)s, - %(import_fill)s, - %(total_fill)s, - %(max_fill_depth)s, - %(fill_duration)s, - %(fill_type)s, - %(fill_origin)s, - %(fill_duration_unit)s, - %(fill_area)s - """ - return get_insert_query(unique_fields, unique_values) - - -def get_insert_query_for_naru(): - unique_fields = """, - naru_will_import_fill, - naru_to_place_volume, - naru_to_place_maximum_depth, - naru_to_place_average_depth, - naru_project_duration_amount, - naru_fill_type, - naru_fill_origin, - naru_project_duration_unit, - naru_to_place_area, - naru_subtype_code, - naru_infrastructure, - naru_existing_structures, - naru_sleeping_units, - naru_residence_necessity, - naru_agri_tourism, - naru_floor_area, - naru_location_rationale - """ - unique_values = """, - %(import_fill)s, - %(total_fill)s, - %(max_fill_depth)s, - %(max_fill_depth)s, - %(fill_duration)s, - %(fill_type)s, - %(fill_origin)s, - %(fill_duration_unit)s, - %(fill_area)s, - %(rsdntl_use_type_code)s, - %(infra_desc)s, - %(cur_struc_desc)s, - %(sleeping_units)s, - %(support_desc)s, - %(tour_env_desc)s, - %(component_area)s, - %(proposal_background_desc)s - """ - return get_insert_query(unique_fields, unique_values) - - -def get_insert_query_for_inc_exc(): - unique_fields = ", incl_excl_hectares" - unique_values = ", %(alr_area)s" - return get_insert_query(unique_fields, unique_values) - - def get_direction_data(rows, cursor): # runs query to get direction data and creates a dict based on alr_application_id adj_rows = get_directions_rows(rows, cursor) diff --git a/bin/migrate-oats-data/applications/submissions/submap/__init__.py b/bin/migrate-oats-data/applications/submissions/submap/__init__.py index 369c5be915..e2bf954831 100644 --- a/bin/migrate-oats-data/applications/submissions/submap/__init__.py +++ b/bin/migrate-oats-data/applications/submissions/submap/__init__.py @@ -1,3 +1,4 @@ from .direction_mapping import * from .subdiv_plot import * -from .soil_elements import * \ No newline at end of file +from .soil_elements import * +from .insert_query import * diff --git a/bin/migrate-oats-data/applications/submissions/submap/insert_query.py b/bin/migrate-oats-data/applications/submissions/submap/insert_query.py new file mode 100644 index 0000000000..69fd15a3b5 --- /dev/null +++ b/bin/migrate-oats-data/applications/submissions/submap/insert_query.py @@ -0,0 +1,115 @@ +def get_insert_query(unique_fields, unique_values): + # unique_fields takes input from called function and appends to query + query = """ + INSERT INTO alcs.application_submission ( + file_number, + local_government_uuid, + type_code, + is_draft, + audit_created_by, + applicant, + east_land_use_type_description, + west_land_use_type_description, + north_land_use_type_description, + south_land_use_type_description, + east_land_use_type, + west_land_use_type, + north_land_use_type, + south_land_use_type, + subd_proposed_lots, + purpose + {unique_fields} + ) + VALUES ( + %(file_number)s, + %(local_government_uuid)s, + %(type_code)s, + false, + 'oats_etl', + %(applicant)s, + %(east_land_use_type_description)s, + %(west_land_use_type_description)s, + %(north_land_use_type_description)s, + %(south_land_use_type_description)s, + %(east_land_use_type)s, + %(west_land_use_type)s, + %(north_land_use_type)s, + %(south_land_use_type)s, + %(subd_proposed_lots)s, + %(proposal_summary_desc)s + {unique_values} + ) + """ + return query.format(unique_fields=unique_fields, unique_values=unique_values) + + +def get_insert_query_for_nfu(): + unique_fields = """, nfu_hectares, + nfu_will_import_fill, + nfu_fill_volume, + nfu_max_fill_depth, + nfu_project_duration_amount, + nfu_fill_type_description, + nfu_fill_origin_description, + nfu_project_duration_unit, + nfu_total_fill_area + """ + unique_values = """, %(alr_area)s, + %(import_fill)s, + %(total_fill)s, + %(max_fill_depth)s, + %(fill_duration)s, + %(fill_type)s, + %(fill_origin)s, + %(fill_duration_unit)s, + %(fill_area)s + """ + return get_insert_query(unique_fields, unique_values) + + +def get_insert_query_for_naru(): + unique_fields = """, + naru_will_import_fill, + naru_to_place_volume, + naru_to_place_maximum_depth, + naru_to_place_average_depth, + naru_project_duration_amount, + naru_fill_type, + naru_fill_origin, + naru_project_duration_unit, + naru_to_place_area, + naru_subtype_code, + naru_infrastructure, + naru_existing_structures, + naru_sleeping_units, + naru_residence_necessity, + naru_agri_tourism, + naru_floor_area, + naru_location_rationale + """ + unique_values = """, + %(import_fill)s, + %(total_fill)s, + %(max_fill_depth)s, + %(max_fill_depth)s, + %(fill_duration)s, + %(fill_type)s, + %(fill_origin)s, + %(fill_duration_unit)s, + %(fill_area)s, + %(rsdntl_use_type_code)s, + %(infra_desc)s, + %(cur_struc_desc)s, + %(sleeping_units)s, + %(support_desc)s, + %(tour_env_desc)s, + %(component_area)s, + %(proposal_background_desc)s + """ + return get_insert_query(unique_fields, unique_values) + + +def get_insert_query_for_inc_exc(): + unique_fields = ", incl_excl_hectares" + unique_values = ", %(alr_area)s" + return get_insert_query(unique_fields, unique_values) From 2fd44641d75713ddcf4d28d5392d5b4d91e09fa9 Mon Sep 17 00:00:00 2001 From: Liam Stoddard <lstodd@protonmail.com> Date: Fri, 6 Oct 2023 14:50:56 -0700 Subject: [PATCH 464/954] cleaned and restuructured --- .../submissions/app_submissions.py | 163 +----------------- .../submissions/data_insert/__init__.py | 2 + .../submissions/data_insert/data_prep.py | 93 ++++++++++ .../{submap => data_insert}/insert_query.py | 64 +++++++ .../{ => data_insert}/submap/__init__.py | 1 - .../submap/direction_mapping.py | 0 .../{ => data_insert}/submap/soil_elements.py | 0 .../{ => data_insert}/submap/subdiv_plot.py | 0 8 files changed, 166 insertions(+), 157 deletions(-) create mode 100644 bin/migrate-oats-data/applications/submissions/data_insert/__init__.py create mode 100644 bin/migrate-oats-data/applications/submissions/data_insert/data_prep.py rename bin/migrate-oats-data/applications/submissions/{submap => data_insert}/insert_query.py (73%) rename bin/migrate-oats-data/applications/submissions/{ => data_insert}/submap/__init__.py (76%) rename bin/migrate-oats-data/applications/submissions/{ => data_insert}/submap/direction_mapping.py (100%) rename bin/migrate-oats-data/applications/submissions/{ => data_insert}/submap/soil_elements.py (100%) rename bin/migrate-oats-data/applications/submissions/{ => data_insert}/submap/subdiv_plot.py (100%) diff --git a/bin/migrate-oats-data/applications/submissions/app_submissions.py b/bin/migrate-oats-data/applications/submissions/app_submissions.py index 4fe13a5e6d..8c6291ac6c 100644 --- a/bin/migrate-oats-data/applications/submissions/app_submissions.py +++ b/bin/migrate-oats-data/applications/submissions/app_submissions.py @@ -1,32 +1,16 @@ -import json - from common import ( BATCH_UPLOAD_SIZE, OATS_ETL_USER, - ALRChangeCode, setup_and_get_logger, - OatsToAlcsNaruType, ) from db import inject_conn_pool -from psycopg2.extras import RealDictCursor, execute_batch - -from .submap import ( - add_direction_field, - add_soil_field, - add_subdiv, - create_direction_dict, - create_soil_dict, - create_subdiv_dict, - get_directions_rows, - get_soil_rows, - get_subdiv_rows, - map_direction_values, - map_soil_data, - map_subdiv_lots, - get_insert_query_for_naru, - get_insert_query_for_nfu, - get_insert_query, - get_insert_query_for_inc_exc, +from psycopg2.extras import RealDictCursor + +from .data_insert import ( + get_direction_data, + get_soil_data, + get_subdiv_data, + insert_app_sub_records, ) etl_name = "process_alcs_app_submissions" @@ -108,139 +92,6 @@ def process_alcs_app_submissions(conn=None, batch_size=BATCH_UPLOAD_SIZE): logger.info(f"Total failed inserts: {failed_inserts}") -def insert_app_sub_records( - conn, batch_size, cursor, rows, direction_data, subdiv_data, soil_data -): - """ - Function to insert submission records in batches. - - Args: - conn (obj): Connection to the database. - batch_size (int): Number of rows to execute at one time. - cursor (obj): Cursor object to execute queries. - rows (list): Rows of data to insert in the database. - direction_data (dict): Dictionary of adjacent parcel data - subdiv_data: dictionary of subdivision data lists - soil_data: dictionary of soil element data. - - Returns: - None: Commits the changes to the database. - """ - ( - nfu_data_list, - other_data_list, - inc_exc_data_list, - naru_data_list, - ) = prepare_app_sub_data(rows, direction_data, subdiv_data, soil_data) - - if len(nfu_data_list) > 0: - execute_batch( - cursor, - get_insert_query_for_nfu(), - nfu_data_list, - page_size=batch_size, - ) - - if len(inc_exc_data_list) > 0: - execute_batch( - cursor, - get_insert_query_for_inc_exc(), - inc_exc_data_list, - page_size=batch_size, - ) - - if len(naru_data_list) > 0: - execute_batch( - cursor, - get_insert_query_for_naru(), - naru_data_list, - page_size=batch_size, - ) - - if len(other_data_list) > 0: - execute_batch( - cursor, - get_insert_query("", ""), - other_data_list, - page_size=batch_size, - ) - - conn.commit() - - -def prepare_app_sub_data(app_sub_raw_data_list, direction_data, subdiv_data, soil_data): - """ - This function prepares different lists of data based on the 'alr_change_code' field of each data dict in 'app_sub_raw_data_list'. - - :param app_sub_raw_data_list: A list of raw data dictionaries. - :param direction_data: A dictionary of adjacent parcel data. - :param subdiv_data: dictionary of subdivision data lists. - :param soil_data: dictionary of soil element data. - :return: Five lists, each containing dictionaries from 'app_sub_raw_data_list' and 'direction_data' grouped based on the 'alr_change_code' field - - Detailed Workflow: - - Initializes empty lists - - Iterates over 'app_sub_raw_data_list' - - Maps adjacent parcel data based on alr_application_id - - Maps subdivision data on appl_component_id - _ Maps soil data based on appl_component_id - - Maps the basic fields of the data dictionary based on the alr_change_code - - Returns the mapped lists - """ - nfu_data_list = [] - inc_exc_data_list = [] - naru_data_list = [] - other_data_list = [] - - for row in app_sub_raw_data_list: - data = dict(row) - data = add_direction_field(data) - data = add_subdiv(data, json) - data = add_soil_field(data) - if data["alr_appl_component_id"] in subdiv_data: - data = map_subdiv_lots(data, subdiv_data, json) - if data["alr_application_id"] in direction_data: - data = map_direction_values(data, direction_data) - if data["alr_appl_component_id"] in soil_data: - data = map_soil_data(data, soil_data) - if data["alr_change_code"] == ALRChangeCode.NFU.value: - nfu_data_list.append(data) - elif ( - data["alr_change_code"] == ALRChangeCode.EXC.value - or data["alr_change_code"] == ALRChangeCode.INC.value - ): - inc_exc_data_list.append(data) - elif data["alr_change_code"] == ALRChangeCode.NAR.value: - data["rsdntl_use_type_code"] = str( - OatsToAlcsNaruType[data["rsdntl_use_type_code"]].value - ) - naru_data_list.append(data) - else: - other_data_list.append(data) - - return nfu_data_list, other_data_list, inc_exc_data_list, naru_data_list - - -def get_direction_data(rows, cursor): - # runs query to get direction data and creates a dict based on alr_application_id - adj_rows = get_directions_rows(rows, cursor) - direction_data = create_direction_dict(adj_rows) - return direction_data - - -def get_subdiv_data(rows, cursor): - # runs query to get subdivision data and creates a dictionary based on alr_appl_component_id with a list of plots - subdiv_rows = get_subdiv_rows(rows, cursor) - subdiv_data = create_subdiv_dict(subdiv_rows) - return subdiv_data - - -def get_soil_data(rows, cursor): - soil_rows = get_soil_rows(rows, cursor) - soil_data = create_soil_dict(soil_rows) - return soil_data - - @inject_conn_pool def clean_application_submission(conn=None): logger.info("Start application_submission cleaning") diff --git a/bin/migrate-oats-data/applications/submissions/data_insert/__init__.py b/bin/migrate-oats-data/applications/submissions/data_insert/__init__.py new file mode 100644 index 0000000000..30b9cdd3cf --- /dev/null +++ b/bin/migrate-oats-data/applications/submissions/data_insert/__init__.py @@ -0,0 +1,2 @@ +from .insert_query import * +from .data_prep import * diff --git a/bin/migrate-oats-data/applications/submissions/data_insert/data_prep.py b/bin/migrate-oats-data/applications/submissions/data_insert/data_prep.py new file mode 100644 index 0000000000..c944494ad5 --- /dev/null +++ b/bin/migrate-oats-data/applications/submissions/data_insert/data_prep.py @@ -0,0 +1,93 @@ +import json + +from common import ( + ALRChangeCode, + OatsToAlcsNaruType, +) +from .submap import ( + add_direction_field, + add_soil_field, + add_subdiv, + create_direction_dict, + create_soil_dict, + create_subdiv_dict, + get_directions_rows, + get_soil_rows, + get_subdiv_rows, + map_direction_values, + map_soil_data, + map_subdiv_lots, +) + + +def prepare_app_sub_data(app_sub_raw_data_list, direction_data, subdiv_data, soil_data): + """ + This function prepares different lists of data based on the 'alr_change_code' field of each data dict in 'app_sub_raw_data_list'. + + :param app_sub_raw_data_list: A list of raw data dictionaries. + :param direction_data: A dictionary of adjacent parcel data. + :param subdiv_data: dictionary of subdivision data lists. + :param soil_data: dictionary of soil element data. + :return: Five lists, each containing dictionaries from 'app_sub_raw_data_list' and 'direction_data' grouped based on the 'alr_change_code' field + + Detailed Workflow: + - Initializes empty lists + - Iterates over 'app_sub_raw_data_list' + - Maps adjacent parcel data based on alr_application_id + - Maps subdivision data on appl_component_id + _ Maps soil data based on appl_component_id + - Maps the basic fields of the data dictionary based on the alr_change_code + - Returns the mapped lists + """ + nfu_data_list = [] + inc_exc_data_list = [] + naru_data_list = [] + other_data_list = [] + + for row in app_sub_raw_data_list: + data = dict(row) + data = add_direction_field(data) + data = add_subdiv(data, json) + data = add_soil_field(data) + if data["alr_appl_component_id"] in subdiv_data: + data = map_subdiv_lots(data, subdiv_data, json) + if data["alr_application_id"] in direction_data: + data = map_direction_values(data, direction_data) + if data["alr_appl_component_id"] in soil_data: + data = map_soil_data(data, soil_data) + if data["alr_change_code"] == ALRChangeCode.NFU.value: + nfu_data_list.append(data) + elif ( + data["alr_change_code"] == ALRChangeCode.EXC.value + or data["alr_change_code"] == ALRChangeCode.INC.value + ): + inc_exc_data_list.append(data) + elif data["alr_change_code"] == ALRChangeCode.NAR.value: + data["rsdntl_use_type_code"] = str( + OatsToAlcsNaruType[data["rsdntl_use_type_code"]].value + ) + naru_data_list.append(data) + else: + other_data_list.append(data) + + return nfu_data_list, other_data_list, inc_exc_data_list, naru_data_list + + +def get_direction_data(rows, cursor): + # runs query to get direction data and creates a dict based on alr_application_id + adj_rows = get_directions_rows(rows, cursor) + direction_data = create_direction_dict(adj_rows) + return direction_data + + +def get_subdiv_data(rows, cursor): + # runs query to get subdivision data and creates a dictionary based on alr_appl_component_id with a list of plots + subdiv_rows = get_subdiv_rows(rows, cursor) + subdiv_data = create_subdiv_dict(subdiv_rows) + return subdiv_data + + +def get_soil_data(rows, cursor): + soil_rows = get_soil_rows(rows, cursor) + soil_data = create_soil_dict(soil_rows) + return soil_data diff --git a/bin/migrate-oats-data/applications/submissions/submap/insert_query.py b/bin/migrate-oats-data/applications/submissions/data_insert/insert_query.py similarity index 73% rename from bin/migrate-oats-data/applications/submissions/submap/insert_query.py rename to bin/migrate-oats-data/applications/submissions/data_insert/insert_query.py index 69fd15a3b5..1254f62b4c 100644 --- a/bin/migrate-oats-data/applications/submissions/submap/insert_query.py +++ b/bin/migrate-oats-data/applications/submissions/data_insert/insert_query.py @@ -1,3 +1,67 @@ +from psycopg2.extras import execute_batch +from .data_prep import prepare_app_sub_data + + +def insert_app_sub_records( + conn, batch_size, cursor, rows, direction_data, subdiv_data, soil_data +): + """ + Function to insert submission records in batches. + + Args: + conn (obj): Connection to the database. + batch_size (int): Number of rows to execute at one time. + cursor (obj): Cursor object to execute queries. + rows (list): Rows of data to insert in the database. + direction_data (dict): Dictionary of adjacent parcel data + subdiv_data: dictionary of subdivision data lists + soil_data: dictionary of soil element data. + + Returns: + None: Commits the changes to the database. + """ + ( + nfu_data_list, + other_data_list, + inc_exc_data_list, + naru_data_list, + ) = prepare_app_sub_data(rows, direction_data, subdiv_data, soil_data) + + if len(nfu_data_list) > 0: + execute_batch( + cursor, + get_insert_query_for_nfu(), + nfu_data_list, + page_size=batch_size, + ) + + if len(inc_exc_data_list) > 0: + execute_batch( + cursor, + get_insert_query_for_inc_exc(), + inc_exc_data_list, + page_size=batch_size, + ) + + if len(naru_data_list) > 0: + execute_batch( + cursor, + get_insert_query_for_naru(), + naru_data_list, + page_size=batch_size, + ) + + if len(other_data_list) > 0: + execute_batch( + cursor, + get_insert_query("", ""), + other_data_list, + page_size=batch_size, + ) + + conn.commit() + + def get_insert_query(unique_fields, unique_values): # unique_fields takes input from called function and appends to query query = """ diff --git a/bin/migrate-oats-data/applications/submissions/submap/__init__.py b/bin/migrate-oats-data/applications/submissions/data_insert/submap/__init__.py similarity index 76% rename from bin/migrate-oats-data/applications/submissions/submap/__init__.py rename to bin/migrate-oats-data/applications/submissions/data_insert/submap/__init__.py index e2bf954831..95d3814deb 100644 --- a/bin/migrate-oats-data/applications/submissions/submap/__init__.py +++ b/bin/migrate-oats-data/applications/submissions/data_insert/submap/__init__.py @@ -1,4 +1,3 @@ from .direction_mapping import * from .subdiv_plot import * from .soil_elements import * -from .insert_query import * diff --git a/bin/migrate-oats-data/applications/submissions/submap/direction_mapping.py b/bin/migrate-oats-data/applications/submissions/data_insert/submap/direction_mapping.py similarity index 100% rename from bin/migrate-oats-data/applications/submissions/submap/direction_mapping.py rename to bin/migrate-oats-data/applications/submissions/data_insert/submap/direction_mapping.py diff --git a/bin/migrate-oats-data/applications/submissions/submap/soil_elements.py b/bin/migrate-oats-data/applications/submissions/data_insert/submap/soil_elements.py similarity index 100% rename from bin/migrate-oats-data/applications/submissions/submap/soil_elements.py rename to bin/migrate-oats-data/applications/submissions/data_insert/submap/soil_elements.py diff --git a/bin/migrate-oats-data/applications/submissions/submap/subdiv_plot.py b/bin/migrate-oats-data/applications/submissions/data_insert/submap/subdiv_plot.py similarity index 100% rename from bin/migrate-oats-data/applications/submissions/submap/subdiv_plot.py rename to bin/migrate-oats-data/applications/submissions/data_insert/submap/subdiv_plot.py From b8af2cde3f3bda8667b27b5e569203eac7c4b9c0 Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Fri, 6 Oct 2023 15:42:40 -0700 Subject: [PATCH 465/954] ALCS-1163 on parcel owner creation dialog --- .../owner-dialog/owner-dialog.component.html | 4 +- .../owner-dialog/owner-dialog.component.ts | 46 +++++++++++-------- 2 files changed, 30 insertions(+), 20 deletions(-) diff --git a/portal-frontend/src/app/shared/owner-dialogs/owner-dialog/owner-dialog.component.html b/portal-frontend/src/app/shared/owner-dialogs/owner-dialog/owner-dialog.component.html index a14ec16cce..2c6347780e 100644 --- a/portal-frontend/src/app/shared/owner-dialogs/owner-dialog/owner-dialog.component.html +++ b/portal-frontend/src/app/shared/owner-dialogs/owner-dialog/owner-dialog.component.html @@ -102,6 +102,6 @@ <h4 class="full-row" *ngIf="type.getRawValue() === OWNER_TYPE.ORGANIZATION">Orga </div> <div mat-dialog-actions class="actions"> <button mat-stroked-button (click)="onClose()">Cancel</button> - <button mat-flat-button color="primary" [disabled]="form.invalid" *ngIf="!isEdit" (click)="onCreate()">Add</button> - <button mat-flat-button color="primary" [disabled]="form.invalid" *ngIf="isEdit" (click)="onSave()">Save</button> + <button mat-flat-button color="primary" *ngIf="!isEdit" (click)="onCreate()">Add</button> + <button mat-flat-button color="primary" *ngIf="isEdit" (click)="onSave()">Save</button> </div> diff --git a/portal-frontend/src/app/shared/owner-dialogs/owner-dialog/owner-dialog.component.ts b/portal-frontend/src/app/shared/owner-dialogs/owner-dialog/owner-dialog.component.ts index cfd2303c8e..8a2ec1c184 100644 --- a/portal-frontend/src/app/shared/owner-dialogs/owner-dialog/owner-dialog.component.ts +++ b/portal-frontend/src/app/shared/owner-dialogs/owner-dialog/owner-dialog.component.ts @@ -98,26 +98,36 @@ export class OwnerDialogComponent { } async onCreate() { - if (!this.data.submissionUuid) { - console.error('ApplicationOwnerDialogComponent misconfigured, needs fileId for create'); - return; + if (this.form.valid) { + if (!this.data.submissionUuid) { + console.error('ApplicationOwnerDialogComponent misconfigured, needs fileId for create'); + return; + } + + const documentUuid = await this.uploadPendingFile(this.pendingFile); + const createDto: ApplicationOwnerCreateDto & NoticeOfIntentOwnerCreateDto = { + organizationName: this.organizationName.getRawValue() || undefined, + firstName: this.firstName.getRawValue() || undefined, + lastName: this.lastName.getRawValue() || undefined, + corporateSummaryUuid: documentUuid?.uuid, + email: this.email.getRawValue()!, + phoneNumber: this.phoneNumber.getRawValue()!, + typeCode: this.type.getRawValue()!, + applicationSubmissionUuid: this.data.submissionUuid, + noticeOfIntentSubmissionUuid: this.data.submissionUuid, + }; + + const res = await this.data.ownerService.create(createDto); + this.dialogRef.close(res); + } else { + this.markFormGroupTouched(this.form) } + } - const documentUuid = await this.uploadPendingFile(this.pendingFile); - const createDto: ApplicationOwnerCreateDto & NoticeOfIntentOwnerCreateDto = { - organizationName: this.organizationName.getRawValue() || undefined, - firstName: this.firstName.getRawValue() || undefined, - lastName: this.lastName.getRawValue() || undefined, - corporateSummaryUuid: documentUuid?.uuid, - email: this.email.getRawValue()!, - phoneNumber: this.phoneNumber.getRawValue()!, - typeCode: this.type.getRawValue()!, - applicationSubmissionUuid: this.data.submissionUuid, - noticeOfIntentSubmissionUuid: this.data.submissionUuid, - }; - - const res = await this.data.ownerService.create(createDto); - this.dialogRef.close(res); + private markFormGroupTouched(formGroup: FormGroup) { + Object.values(formGroup.controls).forEach(control => { + control.markAsTouched() + }) } async onClose() { From 63cbf9dd1bb7427508d68466e5233b9f4e54c58d Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Fri, 6 Oct 2023 15:51:17 -0700 Subject: [PATCH 466/954] alcs-1163 fix --- .../owner-dialog/owner-dialog.component.ts | 38 +++++++++---------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/portal-frontend/src/app/shared/owner-dialogs/owner-dialog/owner-dialog.component.ts b/portal-frontend/src/app/shared/owner-dialogs/owner-dialog/owner-dialog.component.ts index 8a2ec1c184..ceaec693ba 100644 --- a/portal-frontend/src/app/shared/owner-dialogs/owner-dialog/owner-dialog.component.ts +++ b/portal-frontend/src/app/shared/owner-dialogs/owner-dialog/owner-dialog.component.ts @@ -120,34 +120,32 @@ export class OwnerDialogComponent { const res = await this.data.ownerService.create(createDto); this.dialogRef.close(res); } else { - this.markFormGroupTouched(this.form) + this.form.markAllAsTouched() } } - private markFormGroupTouched(formGroup: FormGroup) { - Object.values(formGroup.controls).forEach(control => { - control.markAsTouched() - }) - } - async onClose() { this.dialogRef.close(); } async onSave() { - const document = await this.uploadPendingFile(this.pendingFile); - const updateDto: ApplicationOwnerUpdateDto = { - organizationName: this.organizationName.getRawValue(), - firstName: this.firstName.getRawValue(), - lastName: this.lastName.getRawValue(), - corporateSummaryUuid: document?.uuid, - email: this.email.getRawValue()!, - phoneNumber: this.phoneNumber.getRawValue()!, - typeCode: this.type.getRawValue()!, - }; - if (this.existingUuid) { - const res = await this.data.ownerService.update(this.existingUuid, updateDto); - this.dialogRef.close(res); + if (this.form.valid) { + const document = await this.uploadPendingFile(this.pendingFile); + const updateDto: ApplicationOwnerUpdateDto = { + organizationName: this.organizationName.getRawValue(), + firstName: this.firstName.getRawValue(), + lastName: this.lastName.getRawValue(), + corporateSummaryUuid: document?.uuid, + email: this.email.getRawValue()!, + phoneNumber: this.phoneNumber.getRawValue()!, + typeCode: this.type.getRawValue()!, + }; + if (this.existingUuid) { + const res = await this.data.ownerService.update(this.existingUuid, updateDto); + this.dialogRef.close(res); + } + } else { + this.form.markAllAsTouched() } } From 2618acaced1174be6a21d794e2961164a903865e Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Fri, 6 Oct 2023 16:20:56 -0700 Subject: [PATCH 467/954] Add Public NOI View * Refactor front end to separate modules * Move Decision Controllers to Public --- .../pfrs-details/pfrs-details.component.html | 5 +- .../pfrs-details.component.spec.ts | 2 +- .../pofo-details.component.spec.ts | 2 +- .../alc-review/alc-review.component.ts | 3 +- .../submission-documents.component.ts | 7 +- .../lfng-review/lfng-review.component.ts | 6 +- .../public-application.component.ts | 7 +- .../application/public-application.module.ts | 62 +++++ .../excl-details/excl-details.component.ts | 5 +- .../incl-details/incl-details.component.ts | 5 +- .../naru-details/naru-details.component.ts | 5 +- .../nfu-details/nfu-details.component.ts | 5 +- .../submission/parcel/parcel.component.ts | 5 +- .../pfrs-details/pfrs-details.component.ts | 5 +- .../pofo-details/pofo-details.component.ts | 5 +- .../roso-details/roso-details.component.ts | 5 +- .../subd-details/subd-details.component.ts | 5 +- .../submission-details.component.ts | 10 +- .../submission/submission-details.module.ts | 34 --- .../tur-details/tur-details.component.ts | 5 +- .../alc-review/alc-review.component.html | 9 + .../alc-review/alc-review.component.scss | 8 + .../alc-review/alc-review.component.spec.ts | 23 ++ .../alc-review/alc-review.component.ts | 17 ++ .../decisions/decisions.component.html | 25 +++ .../decisions/decisions.component.scss | 20 ++ .../decisions/decisions.component.spec.ts | 33 +++ .../decisions/decisions.component.ts | 23 ++ .../submission-documents.component.html | 43 ++++ .../submission-documents.component.scss | 25 +++ .../submission-documents.component.spec.ts | 35 +++ .../submission-documents.component.ts | 58 +++++ .../public-notice-of-intent.component.html | 60 +++++ .../public-notice-of-intent.component.scss | 105 +++++++++ .../public-notice-of-intent.component.spec.ts | 49 ++++ .../public-notice-of-intent.component.ts | 52 +++++ .../public-notice-of-intent.module.ts | 50 +++++ .../additional-information.component.html | 76 +++++++ .../additional-information.component.scss | 5 + .../additional-information.component.spec.ts | 31 +++ .../additional-information.component.ts | 77 +++++++ .../submission/parcel/parcel.component.html | 79 +++++++ .../submission/parcel/parcel.component.scss | 25 +++ .../parcel/parcel.component.spec.ts | 40 ++++ .../submission/parcel/parcel.component.ts | 35 +++ .../pfrs-details/pfrs-details.component.html | 211 ++++++++++++++++++ .../pfrs-details/pfrs-details.component.scss | 10 + .../pfrs-details.component.spec.ts | 33 +++ .../pfrs-details/pfrs-details.component.ts | 30 +++ .../pofo-details/pofo-details.component.html | 130 +++++++++++ .../pofo-details/pofo-details.component.scss | 8 + .../pofo-details.component.spec.ts | 33 +++ .../pofo-details/pofo-details.component.ts | 30 +++ .../roso-details/roso-details.component.html | 142 ++++++++++++ .../roso-details/roso-details.component.scss | 0 .../roso-details.component.spec.ts | 33 +++ .../roso-details/roso-details.component.ts | 30 +++ .../submission-details.component.html | 130 +++++++++++ .../submission-details.component.scss | 143 ++++++++++++ .../submission-details.component.spec.ts | 42 ++++ .../submission-details.component.ts | 66 ++++++ .../src/app/features/public/public.module.ts | 21 +- .../application-decision.service.ts | 4 +- .../notice-of-intent-decision.service.ts | 4 +- .../services/public/public-application.dto.ts | 144 ++++++++++++ .../public/public-notice-of-intent.dto.ts | 73 ++++++ .../src/app/services/public/public.dto.ts | 161 +------------ .../services/public/public.service.spec.ts | 2 +- .../src/app/services/public/public.service.ts | 29 ++- .../application-decision-v2.service.ts | 6 - ...tice-of-intent-decision-v2.service.spec.ts | 2 + .../notice-of-intent-decision-v2.service.ts | 17 +- ...lication-decision-v2.automapper.profile.ts | 2 +- ...e-of-intent-decision.automapper.profile.ts | 2 +- .../automapper/public.automapper.profile.ts | 110 ++++++++- .../application-decision.module.ts | 12 - .../notice-of-intent-decision.module.ts | 12 - .../apps/alcs/src/portal/portal.module.ts | 6 - .../application-decision.controller.spec.ts | 24 +- .../application-decision.controller.ts | 22 +- .../application}/application-decision.dto.ts | 4 +- .../public-application.dto.ts} | 14 +- .../public-application.service.spec.ts | 28 +-- .../public-application.service.ts | 33 +-- ...tice-of-intent-decision.controller.spec.ts | 17 +- .../notice-of-intent-decision.controller.ts | 24 +- .../notice-of-intent-decision.dto.ts | 6 +- .../public-notice-of-intent.dto.ts | 174 +++++++++++++++ .../public-notice-of-intent.service.spec.ts | 138 ++++++++++++ .../public-notice-of-intent.service.ts | 124 ++++++++++ .../portal/public/public.controller.spec.ts | 18 +- .../src/portal/public/public.controller.ts | 43 +++- .../alcs/src/portal/public/public.module.ts | 24 +- 93 files changed, 3145 insertions(+), 417 deletions(-) create mode 100644 portal-frontend/src/app/features/public/application/public-application.module.ts delete mode 100644 portal-frontend/src/app/features/public/application/submission/submission-details.module.ts create mode 100644 portal-frontend/src/app/features/public/notice-of-intent/alc-review/alc-review.component.html create mode 100644 portal-frontend/src/app/features/public/notice-of-intent/alc-review/alc-review.component.scss create mode 100644 portal-frontend/src/app/features/public/notice-of-intent/alc-review/alc-review.component.spec.ts create mode 100644 portal-frontend/src/app/features/public/notice-of-intent/alc-review/alc-review.component.ts create mode 100644 portal-frontend/src/app/features/public/notice-of-intent/alc-review/decisions/decisions.component.html create mode 100644 portal-frontend/src/app/features/public/notice-of-intent/alc-review/decisions/decisions.component.scss create mode 100644 portal-frontend/src/app/features/public/notice-of-intent/alc-review/decisions/decisions.component.spec.ts create mode 100644 portal-frontend/src/app/features/public/notice-of-intent/alc-review/decisions/decisions.component.ts create mode 100644 portal-frontend/src/app/features/public/notice-of-intent/alc-review/submission-documents/submission-documents.component.html create mode 100644 portal-frontend/src/app/features/public/notice-of-intent/alc-review/submission-documents/submission-documents.component.scss create mode 100644 portal-frontend/src/app/features/public/notice-of-intent/alc-review/submission-documents/submission-documents.component.spec.ts create mode 100644 portal-frontend/src/app/features/public/notice-of-intent/alc-review/submission-documents/submission-documents.component.ts create mode 100644 portal-frontend/src/app/features/public/notice-of-intent/public-notice-of-intent.component.html create mode 100644 portal-frontend/src/app/features/public/notice-of-intent/public-notice-of-intent.component.scss create mode 100644 portal-frontend/src/app/features/public/notice-of-intent/public-notice-of-intent.component.spec.ts create mode 100644 portal-frontend/src/app/features/public/notice-of-intent/public-notice-of-intent.component.ts create mode 100644 portal-frontend/src/app/features/public/notice-of-intent/public-notice-of-intent.module.ts create mode 100644 portal-frontend/src/app/features/public/notice-of-intent/submission/additional-information/additional-information.component.html create mode 100644 portal-frontend/src/app/features/public/notice-of-intent/submission/additional-information/additional-information.component.scss create mode 100644 portal-frontend/src/app/features/public/notice-of-intent/submission/additional-information/additional-information.component.spec.ts create mode 100644 portal-frontend/src/app/features/public/notice-of-intent/submission/additional-information/additional-information.component.ts create mode 100644 portal-frontend/src/app/features/public/notice-of-intent/submission/parcel/parcel.component.html create mode 100644 portal-frontend/src/app/features/public/notice-of-intent/submission/parcel/parcel.component.scss create mode 100644 portal-frontend/src/app/features/public/notice-of-intent/submission/parcel/parcel.component.spec.ts create mode 100644 portal-frontend/src/app/features/public/notice-of-intent/submission/parcel/parcel.component.ts create mode 100644 portal-frontend/src/app/features/public/notice-of-intent/submission/pfrs-details/pfrs-details.component.html create mode 100644 portal-frontend/src/app/features/public/notice-of-intent/submission/pfrs-details/pfrs-details.component.scss create mode 100644 portal-frontend/src/app/features/public/notice-of-intent/submission/pfrs-details/pfrs-details.component.spec.ts create mode 100644 portal-frontend/src/app/features/public/notice-of-intent/submission/pfrs-details/pfrs-details.component.ts create mode 100644 portal-frontend/src/app/features/public/notice-of-intent/submission/pofo-details/pofo-details.component.html create mode 100644 portal-frontend/src/app/features/public/notice-of-intent/submission/pofo-details/pofo-details.component.scss create mode 100644 portal-frontend/src/app/features/public/notice-of-intent/submission/pofo-details/pofo-details.component.spec.ts create mode 100644 portal-frontend/src/app/features/public/notice-of-intent/submission/pofo-details/pofo-details.component.ts create mode 100644 portal-frontend/src/app/features/public/notice-of-intent/submission/roso-details/roso-details.component.html create mode 100644 portal-frontend/src/app/features/public/notice-of-intent/submission/roso-details/roso-details.component.scss create mode 100644 portal-frontend/src/app/features/public/notice-of-intent/submission/roso-details/roso-details.component.spec.ts create mode 100644 portal-frontend/src/app/features/public/notice-of-intent/submission/roso-details/roso-details.component.ts create mode 100644 portal-frontend/src/app/features/public/notice-of-intent/submission/submission-details.component.html create mode 100644 portal-frontend/src/app/features/public/notice-of-intent/submission/submission-details.component.scss create mode 100644 portal-frontend/src/app/features/public/notice-of-intent/submission/submission-details.component.spec.ts create mode 100644 portal-frontend/src/app/features/public/notice-of-intent/submission/submission-details.component.ts create mode 100644 portal-frontend/src/app/services/public/public-application.dto.ts create mode 100644 portal-frontend/src/app/services/public/public-notice-of-intent.dto.ts delete mode 100644 services/apps/alcs/src/portal/application-decision/application-decision.module.ts delete mode 100644 services/apps/alcs/src/portal/notice-of-intent-decision/notice-of-intent-decision.module.ts rename services/apps/alcs/src/portal/{application-decision => public/application}/application-decision.controller.spec.ts (65%) rename services/apps/alcs/src/portal/{application-decision => public/application}/application-decision.controller.ts (55%) rename services/apps/alcs/src/portal/{application-decision => public/application}/application-decision.dto.ts (69%) rename services/apps/alcs/src/portal/public/{public.dto.ts => application/public-application.dto.ts} (93%) rename services/apps/alcs/src/portal/public/{ => application}/public-application.service.spec.ts (75%) rename services/apps/alcs/src/portal/public/{ => application}/public-application.service.ts (69%) rename services/apps/alcs/src/portal/{notice-of-intent-decision => public/notice-of-intent}/notice-of-intent-decision.controller.spec.ts (72%) rename services/apps/alcs/src/portal/{notice-of-intent-decision => public/notice-of-intent}/notice-of-intent-decision.controller.ts (53%) rename services/apps/alcs/src/portal/{notice-of-intent-decision => public/notice-of-intent}/notice-of-intent-decision.dto.ts (64%) create mode 100644 services/apps/alcs/src/portal/public/notice-of-intent/public-notice-of-intent.dto.ts create mode 100644 services/apps/alcs/src/portal/public/notice-of-intent/public-notice-of-intent.service.spec.ts create mode 100644 services/apps/alcs/src/portal/public/notice-of-intent/public-notice-of-intent.service.ts diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pfrs-details/pfrs-details.component.html b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pfrs-details/pfrs-details.component.html index c90bb8d786..d7c8a58daf 100644 --- a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pfrs-details/pfrs-details.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pfrs-details/pfrs-details.component.html @@ -171,7 +171,6 @@ ></app-no-data> </div> </div> - <div class="subheading2 grid-1">Proposal Map / Site Plan</div> <div class="grid-double"> <a *ngFor="let map of proposalMap" (click)="openFile(map.uuid)"> @@ -207,10 +206,10 @@ <div class="subheading2 grid-1">Reclamation Plan</div> <div class="grid-double"> - <a *ngFor="let file of crossSections" (click)="openFile(file.uuid)"> + <a *ngFor="let file of reclamationPlans" (click)="openFile(file.uuid)"> {{ file.fileName }} </a> - <app-no-data [showRequired]="showErrors" *ngIf="crossSections.length === 0"></app-no-data> + <app-no-data [showRequired]="showErrors" *ngIf="reclamationPlans.length === 0"></app-no-data> </div> <ng-container *ngIf="_noiSubmission.soilIsExtractionOrMining"> diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pfrs-details/pfrs-details.component.spec.ts b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pfrs-details/pfrs-details.component.spec.ts index 36f0806422..32795de0e8 100644 --- a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pfrs-details/pfrs-details.component.spec.ts +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pfrs-details/pfrs-details.component.spec.ts @@ -5,7 +5,7 @@ import { NoticeOfIntentParcelService } from '../../../../services/notice-of-inte import { PfrsDetailsComponent } from './pfrs-details.component'; -describe('RosoDetailsComponent', () => { +describe('PfrsDetailsComponent', () => { let component: PfrsDetailsComponent; let fixture: ComponentFixture<PfrsDetailsComponent>; let mockNoiDocumentService: DeepMocked<NoticeOfIntentDocumentService>; diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pofo-details/pofo-details.component.spec.ts b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pofo-details/pofo-details.component.spec.ts index 6bdcc5a467..53b71ee7ee 100644 --- a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pofo-details/pofo-details.component.spec.ts +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pofo-details/pofo-details.component.spec.ts @@ -5,7 +5,7 @@ import { NoticeOfIntentParcelService } from '../../../../services/notice-of-inte import { PofoDetailsComponent } from './pofo-details.component'; -describe('RosoDetailsComponent', () => { +describe('PofoDetailsComponent', () => { let component: PofoDetailsComponent; let fixture: ComponentFixture<PofoDetailsComponent>; let mockNoiDocumentService: DeepMocked<NoticeOfIntentDocumentService>; diff --git a/portal-frontend/src/app/features/public/application/alc-review/alc-review.component.ts b/portal-frontend/src/app/features/public/application/alc-review/alc-review.component.ts index e1c8c5b643..02c49d8446 100644 --- a/portal-frontend/src/app/features/public/application/alc-review/alc-review.component.ts +++ b/portal-frontend/src/app/features/public/application/alc-review/alc-review.component.ts @@ -1,7 +1,8 @@ import { Component, Input } from '@angular/core'; import { ApplicationPortalDecisionDto } from '../../../../services/application-decision/application-decision.dto'; import { SUBMISSION_STATUS } from '../../../../services/application-submission/application-submission.dto'; -import { PublicApplicationSubmissionDto, PublicDocumentDto } from '../../../../services/public/public.dto'; +import { PublicApplicationSubmissionDto } from '../../../../services/public/public-application.dto'; +import { PublicDocumentDto } from '../../../../services/public/public.dto'; @Component({ selector: 'app-public-alc-review', diff --git a/portal-frontend/src/app/features/public/application/alc-review/submission-documents/submission-documents.component.ts b/portal-frontend/src/app/features/public/application/alc-review/submission-documents/submission-documents.component.ts index 0dc940477e..c41e77ec95 100644 --- a/portal-frontend/src/app/features/public/application/alc-review/submission-documents/submission-documents.component.ts +++ b/portal-frontend/src/app/features/public/application/alc-review/submission-documents/submission-documents.component.ts @@ -2,7 +2,8 @@ import { Component, Input, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { MatSort } from '@angular/material/sort'; import { MatTableDataSource } from '@angular/material/table'; import { Subject } from 'rxjs'; -import { PublicApplicationSubmissionDto, PublicDocumentDto } from '../../../../../services/public/public.dto'; +import { PublicApplicationSubmissionDto } from '../../../../../services/public/public-application.dto'; +import { PublicDocumentDto } from '../../../../../services/public/public.dto'; import { PublicService } from '../../../../../services/public/public.service'; @Component({ @@ -29,14 +30,14 @@ export class PublicSubmissionDocumentsComponent implements OnInit, OnDestroy { } async openFile(uuid: string) { - const res = await this.publicService.getApplicationFileUrl(this.applicationSubmission.fileNumber, uuid); + const res = await this.publicService.getApplicationOpenFileUrl(this.applicationSubmission.fileNumber, uuid); if (res) { window.open(res.url, '_blank'); } } async downloadFile(uuid: string) { - const res = await this.publicService.getApplicationFileUrl(this.applicationSubmission.fileNumber, uuid); + const res = await this.publicService.getApplicationOpenFileUrl(this.applicationSubmission.fileNumber, uuid); if (res) { const downloadLink = document.createElement('a'); downloadLink.href = res.url; diff --git a/portal-frontend/src/app/features/public/application/lfng-review/lfng-review.component.ts b/portal-frontend/src/app/features/public/application/lfng-review/lfng-review.component.ts index e21492882c..c2a3ea1617 100644 --- a/portal-frontend/src/app/features/public/application/lfng-review/lfng-review.component.ts +++ b/portal-frontend/src/app/features/public/application/lfng-review/lfng-review.component.ts @@ -3,8 +3,8 @@ import { SUBMISSION_STATUS } from '../../../../services/application-submission/a import { PublicApplicationSubmissionDto, PublicApplicationSubmissionReviewDto, - PublicDocumentDto, -} from '../../../../services/public/public.dto'; +} from '../../../../services/public/public-application.dto'; +import { PublicDocumentDto } from '../../../../services/public/public.dto'; import { PublicService } from '../../../../services/public/public.service'; import { DOCUMENT_TYPE } from '../../../../shared/dto/document.dto'; @@ -30,7 +30,7 @@ export class PublicLfngReviewComponent implements OnInit { } async openFile(uuid: string) { - const res = await this.publicService.getApplicationFileUrl(this.applicationSubmission.fileNumber, uuid); + const res = await this.publicService.getApplicationOpenFileUrl(this.applicationSubmission.fileNumber, uuid); if (res) { window.open(res.url, '_blank'); } diff --git a/portal-frontend/src/app/features/public/application/public-application.component.ts b/portal-frontend/src/app/features/public/application/public-application.component.ts index 84cba66c20..87b7720e97 100644 --- a/portal-frontend/src/app/features/public/application/public-application.component.ts +++ b/portal-frontend/src/app/features/public/application/public-application.component.ts @@ -4,11 +4,10 @@ import { Subject, takeUntil } from 'rxjs'; import { ApplicationPortalDecisionDto } from '../../../services/application-decision/application-decision.dto'; import { SUBMISSION_STATUS } from '../../../services/application-submission/application-submission.dto'; import { - PublicApplicationParcelDto, PublicApplicationSubmissionDto, PublicApplicationSubmissionReviewDto, - PublicDocumentDto, -} from '../../../services/public/public.dto'; +} from '../../../services/public/public-application.dto'; +import { PublicDocumentDto, PublicParcelDto } from '../../../services/public/public.dto'; import { PublicService } from '../../../services/public/public.service'; @Component({ @@ -24,7 +23,7 @@ export class PublicApplicationComponent implements OnInit, OnDestroy { submission: PublicApplicationSubmissionDto | undefined; review: PublicApplicationSubmissionReviewDto | undefined; documents: PublicDocumentDto[] = []; - parcels: PublicApplicationParcelDto[] = []; + parcels: PublicParcelDto[] = []; decisions: ApplicationPortalDecisionDto[] = []; constructor(private publicService: PublicService, private route: ActivatedRoute) {} diff --git a/portal-frontend/src/app/features/public/application/public-application.module.ts b/portal-frontend/src/app/features/public/application/public-application.module.ts new file mode 100644 index 0000000000..eff5aefe9d --- /dev/null +++ b/portal-frontend/src/app/features/public/application/public-application.module.ts @@ -0,0 +1,62 @@ +import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; +import { MatAutocompleteModule } from '@angular/material/autocomplete'; +import { MatPaginatorModule } from '@angular/material/paginator'; +import { MatSortModule } from '@angular/material/sort'; +import { MatTreeModule } from '@angular/material/tree'; +import { RouterModule, Routes } from '@angular/router'; +import { SharedModule } from '../../../shared/shared.module'; +import { PublicAlcReviewComponent } from './alc-review/alc-review.component'; +import { PublicDecisionsComponent } from './alc-review/decisions/decisions.component'; +import { PublicSubmissionDocumentsComponent } from './alc-review/submission-documents/submission-documents.component'; +import { PublicLfngReviewComponent } from './lfng-review/lfng-review.component'; +import { PublicApplicationComponent } from './public-application.component'; +import { ExclDetailsComponent } from './submission/excl-details/excl-details.component'; +import { InclDetailsComponent } from './submission/incl-details/incl-details.component'; +import { NaruDetailsComponent } from './submission/naru-details/naru-details.component'; +import { NfuDetailsComponent } from './submission/nfu-details/nfu-details.component'; +import { ParcelComponent } from './submission/parcel/parcel.component'; +import { PfrsDetailsComponent } from './submission/pfrs-details/pfrs-details.component'; +import { PofoDetailsComponent } from './submission/pofo-details/pofo-details.component'; +import { RosoDetailsComponent } from './submission/roso-details/roso-details.component'; +import { SubdDetailsComponent } from './submission/subd-details/subd-details.component'; +import { SubmissionDetailsComponent } from './submission/submission-details.component'; +import { TurDetailsComponent } from './submission/tur-details/tur-details.component'; + +const routes: Routes = [ + { + path: ':fileId', + component: PublicApplicationComponent, + }, +]; + +@NgModule({ + declarations: [ + PublicApplicationComponent, + PublicLfngReviewComponent, + PublicAlcReviewComponent, + PublicSubmissionDocumentsComponent, + PublicDecisionsComponent, + ParcelComponent, + SubmissionDetailsComponent, + NfuDetailsComponent, + TurDetailsComponent, + SubdDetailsComponent, + RosoDetailsComponent, + PofoDetailsComponent, + PfrsDetailsComponent, + NaruDetailsComponent, + ExclDetailsComponent, + InclDetailsComponent, + ], + imports: [ + CommonModule, + SharedModule, + MatPaginatorModule, + MatSortModule, + RouterModule.forChild(routes), + MatAutocompleteModule, + MatTreeModule, + ], +}) +export class PublicApplicationModule {} diff --git a/portal-frontend/src/app/features/public/application/submission/excl-details/excl-details.component.ts b/portal-frontend/src/app/features/public/application/submission/excl-details/excl-details.component.ts index 43a3f4c95e..5261bfbde8 100644 --- a/portal-frontend/src/app/features/public/application/submission/excl-details/excl-details.component.ts +++ b/portal-frontend/src/app/features/public/application/submission/excl-details/excl-details.component.ts @@ -1,6 +1,7 @@ import { Component, Input } from '@angular/core'; import { Router } from '@angular/router'; -import { PublicApplicationSubmissionDto, PublicDocumentDto } from '../../../../../services/public/public.dto'; +import { PublicApplicationSubmissionDto } from '../../../../../services/public/public-application.dto'; +import { PublicDocumentDto } from '../../../../../services/public/public.dto'; import { PublicService } from '../../../../../services/public/public.service'; import { DOCUMENT_TYPE } from '../../../../../shared/dto/document.dto'; @@ -25,7 +26,7 @@ export class ExclDetailsComponent { constructor(private router: Router, private publicService: PublicService) {} async openFile(uuid: string) { - const res = await this.publicService.getApplicationFileUrl(this.applicationSubmission.fileNumber, uuid); + const res = await this.publicService.getApplicationOpenFileUrl(this.applicationSubmission.fileNumber, uuid); if (res) { window.open(res?.url, '_blank'); } diff --git a/portal-frontend/src/app/features/public/application/submission/incl-details/incl-details.component.ts b/portal-frontend/src/app/features/public/application/submission/incl-details/incl-details.component.ts index e08695999c..bbfc25ed99 100644 --- a/portal-frontend/src/app/features/public/application/submission/incl-details/incl-details.component.ts +++ b/portal-frontend/src/app/features/public/application/submission/incl-details/incl-details.component.ts @@ -1,6 +1,7 @@ import { Component, Input } from '@angular/core'; import { Router } from '@angular/router'; -import { PublicApplicationSubmissionDto, PublicDocumentDto } from '../../../../../services/public/public.dto'; +import { PublicApplicationSubmissionDto } from '../../../../../services/public/public-application.dto'; +import { PublicDocumentDto } from '../../../../../services/public/public.dto'; import { PublicService } from '../../../../../services/public/public.service'; import { DOCUMENT_TYPE } from '../../../../../shared/dto/document.dto'; @@ -25,7 +26,7 @@ export class InclDetailsComponent { constructor(private router: Router, private publicService: PublicService) {} async openFile(uuid: string) { - const res = await this.publicService.getApplicationFileUrl(this.applicationSubmission.fileNumber, uuid); + const res = await this.publicService.getApplicationOpenFileUrl(this.applicationSubmission.fileNumber, uuid); if (res) { window.open(res?.url, '_blank'); } diff --git a/portal-frontend/src/app/features/public/application/submission/naru-details/naru-details.component.ts b/portal-frontend/src/app/features/public/application/submission/naru-details/naru-details.component.ts index f4f702d73c..1ad7be3a22 100644 --- a/portal-frontend/src/app/features/public/application/submission/naru-details/naru-details.component.ts +++ b/portal-frontend/src/app/features/public/application/submission/naru-details/naru-details.component.ts @@ -1,6 +1,7 @@ import { Component, Input } from '@angular/core'; import { Router } from '@angular/router'; -import { PublicApplicationSubmissionDto, PublicDocumentDto } from '../../../../../services/public/public.dto'; +import { PublicApplicationSubmissionDto } from '../../../../../services/public/public-application.dto'; +import { PublicDocumentDto } from '../../../../../services/public/public.dto'; import { PublicService } from '../../../../../services/public/public.service'; import { DOCUMENT_TYPE } from '../../../../../shared/dto/document.dto'; @@ -20,7 +21,7 @@ export class NaruDetailsComponent { constructor(private router: Router, private publicService: PublicService) {} async openFile(uuid: string) { - const res = await this.publicService.getApplicationFileUrl(this.applicationSubmission.fileNumber, uuid); + const res = await this.publicService.getApplicationOpenFileUrl(this.applicationSubmission.fileNumber, uuid); if (res) { window.open(res?.url, '_blank'); } diff --git a/portal-frontend/src/app/features/public/application/submission/nfu-details/nfu-details.component.ts b/portal-frontend/src/app/features/public/application/submission/nfu-details/nfu-details.component.ts index 27ff3c3d23..6fb3aaa0c8 100644 --- a/portal-frontend/src/app/features/public/application/submission/nfu-details/nfu-details.component.ts +++ b/portal-frontend/src/app/features/public/application/submission/nfu-details/nfu-details.component.ts @@ -1,6 +1,7 @@ import { Component, Input } from '@angular/core'; import { Router } from '@angular/router'; -import { PublicApplicationSubmissionDto, PublicDocumentDto } from '../../../../../services/public/public.dto'; +import { PublicApplicationSubmissionDto } from '../../../../../services/public/public-application.dto'; +import { PublicDocumentDto } from '../../../../../services/public/public.dto'; import { PublicService } from '../../../../../services/public/public.service'; import { DOCUMENT_TYPE } from '../../../../../shared/dto/document.dto'; @@ -21,7 +22,7 @@ export class NfuDetailsComponent { constructor(private router: Router, private publicService: PublicService) {} async openFile(uuid: string) { - const res = await this.publicService.getApplicationFileUrl(this.applicationSubmission.fileNumber, uuid); + const res = await this.publicService.getApplicationOpenFileUrl(this.applicationSubmission.fileNumber, uuid); if (res) { window.open(res?.url, '_blank'); } diff --git a/portal-frontend/src/app/features/public/application/submission/parcel/parcel.component.ts b/portal-frontend/src/app/features/public/application/submission/parcel/parcel.component.ts index 9e17cad331..4bf4393eea 100644 --- a/portal-frontend/src/app/features/public/application/submission/parcel/parcel.component.ts +++ b/portal-frontend/src/app/features/public/application/submission/parcel/parcel.component.ts @@ -1,7 +1,8 @@ import { Component, Input } from '@angular/core'; import { Subject } from 'rxjs'; import { PARCEL_OWNERSHIP_TYPE } from '../../../../../services/application-parcel/application-parcel.dto'; -import { PublicApplicationParcelDto, PublicApplicationSubmissionDto } from '../../../../../services/public/public.dto'; +import { PublicApplicationSubmissionDto } from '../../../../../services/public/public-application.dto'; +import { PublicParcelDto } from '../../../../../services/public/public.dto'; @Component({ selector: 'app-parcel', @@ -12,7 +13,7 @@ export class ParcelComponent { $destroy = new Subject<void>(); @Input() applicationSubmission!: PublicApplicationSubmissionDto; - @Input() parcels: PublicApplicationParcelDto[] = []; + @Input() parcels: PublicParcelDto[] = []; PARCEL_OWNERSHIP_TYPES = PARCEL_OWNERSHIP_TYPE; pageTitle: string = 'Identify Parcel(s) Under Application'; diff --git a/portal-frontend/src/app/features/public/application/submission/pfrs-details/pfrs-details.component.ts b/portal-frontend/src/app/features/public/application/submission/pfrs-details/pfrs-details.component.ts index f529357962..ebe8f634d8 100644 --- a/portal-frontend/src/app/features/public/application/submission/pfrs-details/pfrs-details.component.ts +++ b/portal-frontend/src/app/features/public/application/submission/pfrs-details/pfrs-details.component.ts @@ -1,6 +1,7 @@ import { Component, Input } from '@angular/core'; import { Router } from '@angular/router'; -import { PublicApplicationSubmissionDto, PublicDocumentDto } from '../../../../../services/public/public.dto'; +import { PublicApplicationSubmissionDto } from '../../../../../services/public/public-application.dto'; +import { PublicDocumentDto } from '../../../../../services/public/public.dto'; import { PublicService } from '../../../../../services/public/public.service'; import { DOCUMENT_TYPE } from '../../../../../shared/dto/document.dto'; @@ -23,7 +24,7 @@ export class PfrsDetailsComponent { constructor(private router: Router, private publicService: PublicService) {} async openFile(uuid: string) { - const res = await this.publicService.getApplicationFileUrl(this.applicationSubmission.fileNumber, uuid); + const res = await this.publicService.getApplicationOpenFileUrl(this.applicationSubmission.fileNumber, uuid); if (res) { window.open(res?.url, '_blank'); } diff --git a/portal-frontend/src/app/features/public/application/submission/pofo-details/pofo-details.component.ts b/portal-frontend/src/app/features/public/application/submission/pofo-details/pofo-details.component.ts index 9b48d576c5..f08f625509 100644 --- a/portal-frontend/src/app/features/public/application/submission/pofo-details/pofo-details.component.ts +++ b/portal-frontend/src/app/features/public/application/submission/pofo-details/pofo-details.component.ts @@ -1,6 +1,7 @@ import { Component, Input } from '@angular/core'; import { Router } from '@angular/router'; -import { PublicApplicationSubmissionDto, PublicDocumentDto } from '../../../../../services/public/public.dto'; +import { PublicApplicationSubmissionDto } from '../../../../../services/public/public-application.dto'; +import { PublicDocumentDto } from '../../../../../services/public/public.dto'; import { PublicService } from '../../../../../services/public/public.service'; import { DOCUMENT_TYPE } from '../../../../../shared/dto/document.dto'; @@ -23,7 +24,7 @@ export class PofoDetailsComponent { constructor(private router: Router, private publicService: PublicService) {} async openFile(uuid: string) { - const res = await this.publicService.getApplicationFileUrl(this.applicationSubmission.fileNumber, uuid); + const res = await this.publicService.getApplicationOpenFileUrl(this.applicationSubmission.fileNumber, uuid); if (res) { window.open(res?.url, '_blank'); } diff --git a/portal-frontend/src/app/features/public/application/submission/roso-details/roso-details.component.ts b/portal-frontend/src/app/features/public/application/submission/roso-details/roso-details.component.ts index 44bb4f91d5..44f33dea4a 100644 --- a/portal-frontend/src/app/features/public/application/submission/roso-details/roso-details.component.ts +++ b/portal-frontend/src/app/features/public/application/submission/roso-details/roso-details.component.ts @@ -1,6 +1,7 @@ import { Component, Input } from '@angular/core'; import { Router } from '@angular/router'; -import { PublicApplicationSubmissionDto, PublicDocumentDto } from '../../../../../services/public/public.dto'; +import { PublicApplicationSubmissionDto } from '../../../../../services/public/public-application.dto'; +import { PublicDocumentDto } from '../../../../../services/public/public.dto'; import { PublicService } from '../../../../../services/public/public.service'; import { DOCUMENT_TYPE } from '../../../../../shared/dto/document.dto'; @@ -23,7 +24,7 @@ export class RosoDetailsComponent { constructor(private router: Router, private publicService: PublicService) {} async openFile(uuid: string) { - const res = await this.publicService.getApplicationFileUrl(this.applicationSubmission.fileNumber, uuid); + const res = await this.publicService.getApplicationOpenFileUrl(this.applicationSubmission.fileNumber, uuid); if (res) { window.open(res?.url, '_blank'); } diff --git a/portal-frontend/src/app/features/public/application/submission/subd-details/subd-details.component.ts b/portal-frontend/src/app/features/public/application/submission/subd-details/subd-details.component.ts index e9bf08d879..82d9e4e921 100644 --- a/portal-frontend/src/app/features/public/application/submission/subd-details/subd-details.component.ts +++ b/portal-frontend/src/app/features/public/application/submission/subd-details/subd-details.component.ts @@ -1,6 +1,7 @@ import { Component, Input } from '@angular/core'; import { Router } from '@angular/router'; -import { PublicApplicationSubmissionDto, PublicDocumentDto } from '../../../../../services/public/public.dto'; +import { PublicApplicationSubmissionDto } from '../../../../../services/public/public-application.dto'; +import { PublicDocumentDto } from '../../../../../services/public/public.dto'; import { PublicService } from '../../../../../services/public/public.service'; import { DOCUMENT_TYPE } from '../../../../../shared/dto/document.dto'; @@ -21,7 +22,7 @@ export class SubdDetailsComponent { constructor(private router: Router, private publicService: PublicService) {} async openFile(uuid: string) { - const res = await this.publicService.getApplicationFileUrl(this.applicationSubmission.fileNumber, uuid); + const res = await this.publicService.getApplicationOpenFileUrl(this.applicationSubmission.fileNumber, uuid); if (res) { window.open(res?.url, '_blank'); } diff --git a/portal-frontend/src/app/features/public/application/submission/submission-details.component.ts b/portal-frontend/src/app/features/public/application/submission/submission-details.component.ts index 5849b23130..ff55884b0b 100644 --- a/portal-frontend/src/app/features/public/application/submission/submission-details.component.ts +++ b/portal-frontend/src/app/features/public/application/submission/submission-details.component.ts @@ -4,12 +4,8 @@ import { ApplicationDocumentService } from '../../../../services/application-doc import { PARCEL_TYPE } from '../../../../services/application-parcel/application-parcel.dto'; import { LocalGovernmentDto } from '../../../../services/code/code.dto'; import { CodeService } from '../../../../services/code/code.service'; -import { - PublicApplicationParcelDto, - PublicApplicationSubmissionDto, - PublicDocumentDto, - PublicOwnerDto, -} from '../../../../services/public/public.dto'; +import { PublicApplicationSubmissionDto } from '../../../../services/public/public-application.dto'; +import { PublicDocumentDto, PublicOwnerDto, PublicParcelDto } from '../../../../services/public/public.dto'; import { OWNER_TYPE } from '../../../../shared/dto/owner.dto'; @Component({ @@ -22,7 +18,7 @@ export class SubmissionDetailsComponent implements OnInit, OnDestroy { @Input() applicationSubmission!: PublicApplicationSubmissionDto; @Input() applicationDocuments: PublicDocumentDto[] = []; - @Input() applicationParcels: PublicApplicationParcelDto[] = []; + @Input() applicationParcels: PublicParcelDto[] = []; parcelType = PARCEL_TYPE; primaryContact: PublicOwnerDto | undefined; diff --git a/portal-frontend/src/app/features/public/application/submission/submission-details.module.ts b/portal-frontend/src/app/features/public/application/submission/submission-details.module.ts deleted file mode 100644 index e02adcc592..0000000000 --- a/portal-frontend/src/app/features/public/application/submission/submission-details.module.ts +++ /dev/null @@ -1,34 +0,0 @@ -import { CommonModule } from '@angular/common'; -import { NgModule } from '@angular/core'; -import { NgxMaskPipe } from 'ngx-mask'; -import { SharedModule } from '../../../../shared/shared.module'; -import { SubmissionDetailsComponent } from './submission-details.component'; -import { InclDetailsComponent } from './incl-details/incl-details.component'; -import { NaruDetailsComponent } from './naru-details/naru-details.component'; -import { NfuDetailsComponent } from './nfu-details/nfu-details.component'; -import { ParcelComponent } from './parcel/parcel.component'; -import { PfrsDetailsComponent } from './pfrs-details/pfrs-details.component'; -import { PofoDetailsComponent } from './pofo-details/pofo-details.component'; -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'; - -@NgModule({ - declarations: [ - ParcelComponent, - SubmissionDetailsComponent, - NfuDetailsComponent, - TurDetailsComponent, - SubdDetailsComponent, - RosoDetailsComponent, - PofoDetailsComponent, - PfrsDetailsComponent, - NaruDetailsComponent, - ExclDetailsComponent, - InclDetailsComponent, - ], - imports: [CommonModule, SharedModule, NgxMaskPipe], - exports: [SubmissionDetailsComponent], -}) -export class SubmissionDetailsModule {} diff --git a/portal-frontend/src/app/features/public/application/submission/tur-details/tur-details.component.ts b/portal-frontend/src/app/features/public/application/submission/tur-details/tur-details.component.ts index 11ff6e4162..fcc8e94615 100644 --- a/portal-frontend/src/app/features/public/application/submission/tur-details/tur-details.component.ts +++ b/portal-frontend/src/app/features/public/application/submission/tur-details/tur-details.component.ts @@ -1,6 +1,7 @@ import { Component, Input } from '@angular/core'; import { Router } from '@angular/router'; -import { PublicApplicationSubmissionDto, PublicDocumentDto } from '../../../../../services/public/public.dto'; +import { PublicApplicationSubmissionDto } from '../../../../../services/public/public-application.dto'; +import { PublicDocumentDto } from '../../../../../services/public/public.dto'; import { PublicService } from '../../../../../services/public/public.service'; import { DOCUMENT_TYPE } from '../../../../../shared/dto/document.dto'; @@ -20,7 +21,7 @@ export class TurDetailsComponent { constructor(private router: Router, private publicService: PublicService) {} async openFile(uuid: string) { - const res = await this.publicService.getApplicationFileUrl(this.applicationSubmission.fileNumber, uuid); + const res = await this.publicService.getApplicationOpenFileUrl(this.applicationSubmission.fileNumber, uuid); if (res) { window.open(res?.url, '_blank'); } diff --git a/portal-frontend/src/app/features/public/notice-of-intent/alc-review/alc-review.component.html b/portal-frontend/src/app/features/public/notice-of-intent/alc-review/alc-review.component.html new file mode 100644 index 0000000000..d9568d4860 --- /dev/null +++ b/portal-frontend/src/app/features/public/notice-of-intent/alc-review/alc-review.component.html @@ -0,0 +1,9 @@ +<div *ngIf="submission"> + <div class="header"> + <h3>ALC Review and Decision</h3> + </div> + <div> + <app-public-decisions [decisions]="decisions"></app-public-decisions> + <app-submission-documents [documents]="documents"></app-submission-documents> + </div> +</div> diff --git a/portal-frontend/src/app/features/public/notice-of-intent/alc-review/alc-review.component.scss b/portal-frontend/src/app/features/public/notice-of-intent/alc-review/alc-review.component.scss new file mode 100644 index 0000000000..7ca8d1c637 --- /dev/null +++ b/portal-frontend/src/app/features/public/notice-of-intent/alc-review/alc-review.component.scss @@ -0,0 +1,8 @@ +@use '../../../../../styles/functions' as *; +@use '../../../../../styles/colors'; + +.warning { + background-color: rgba(colors.$accent-color-light, 0.5); + padding: rem(16); + margin-bottom: rem(24); +} diff --git a/portal-frontend/src/app/features/public/notice-of-intent/alc-review/alc-review.component.spec.ts b/portal-frontend/src/app/features/public/notice-of-intent/alc-review/alc-review.component.spec.ts new file mode 100644 index 0000000000..3a515a8c48 --- /dev/null +++ b/portal-frontend/src/app/features/public/notice-of-intent/alc-review/alc-review.component.spec.ts @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { PublicAlcReviewComponent } from './alc-review.component'; + +describe('PublicAlcReviewComponent', () => { + let component: PublicAlcReviewComponent; + let fixture: ComponentFixture<PublicAlcReviewComponent>; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + providers: [], + declarations: [PublicAlcReviewComponent], + }).compileComponents(); + + fixture = TestBed.createComponent(PublicAlcReviewComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/public/notice-of-intent/alc-review/alc-review.component.ts b/portal-frontend/src/app/features/public/notice-of-intent/alc-review/alc-review.component.ts new file mode 100644 index 0000000000..fa3dbd59bb --- /dev/null +++ b/portal-frontend/src/app/features/public/notice-of-intent/alc-review/alc-review.component.ts @@ -0,0 +1,17 @@ +import { Component, Input } from '@angular/core'; +import { ApplicationPortalDecisionDto } from '../../../../services/application-decision/application-decision.dto'; +import { PublicNoticeOfIntentSubmissionDto } from '../../../../services/public/public-notice-of-intent.dto'; +import { PublicDocumentDto } from '../../../../services/public/public.dto'; + +@Component({ + selector: 'app-public-alc-review', + templateUrl: './alc-review.component.html', + styleUrls: ['./alc-review.component.scss'], +}) +export class PublicAlcReviewComponent { + @Input() submission!: PublicNoticeOfIntentSubmissionDto; + @Input() documents!: PublicDocumentDto[]; + @Input() decisions!: ApplicationPortalDecisionDto[]; + + constructor() {} +} diff --git a/portal-frontend/src/app/features/public/notice-of-intent/alc-review/decisions/decisions.component.html b/portal-frontend/src/app/features/public/notice-of-intent/alc-review/decisions/decisions.component.html new file mode 100644 index 0000000000..5f78f69636 --- /dev/null +++ b/portal-frontend/src/app/features/public/notice-of-intent/alc-review/decisions/decisions.component.html @@ -0,0 +1,25 @@ +<div *ngFor="let decision of decisions; let index = index"> + <h4>Decision #{{ decisions.length - index }}</h4> + <div class="decision-table"> + <div> + <div class="subheading2">Decision Date</div> + {{ decision.date | momentFormat }} + </div> + + <div> + <div class="subheading2">Resolution Number</div> + #{{ decision.resolutionNumber }}/{{ decision.resolutionYear }} + </div> + + <div> + <div class="subheading2">Decision Outcome</div> + {{ decision.outcome.label }} {{ decision.isSubjectToConditions ? '- Subject to Conditions' : '' }} + </div> + <div> + <div class="subheading2">Decision Document</div> + <div *ngFor="let document of decision.documents"> + <a (click)="openFile(document.uuid)">{{ document.fileName }}</a> + </div> + </div> + </div> +</div> diff --git a/portal-frontend/src/app/features/public/notice-of-intent/alc-review/decisions/decisions.component.scss b/portal-frontend/src/app/features/public/notice-of-intent/alc-review/decisions/decisions.component.scss new file mode 100644 index 0000000000..c92c6fb6a8 --- /dev/null +++ b/portal-frontend/src/app/features/public/notice-of-intent/alc-review/decisions/decisions.component.scss @@ -0,0 +1,20 @@ +@use '../../../../../../styles/functions' as *; +@use '../../../../../../styles/colors'; + +.decision-table { + padding: rem(8); + margin: rem(12) 0 rem(20) 0; + background-color: colors.$grey-light; + display: grid; + grid-row-gap: rem(24); + grid-column-gap: rem(16); + grid-template-columns: 100%; + word-wrap: break-word; + hyphens: auto; + + @media screen and (min-width: $tabletBreakpoint) { + padding: rem(16); + margin: rem(24) 0 rem(40) 0; + grid-template-columns: 50% 50%; + } +} diff --git a/portal-frontend/src/app/features/public/notice-of-intent/alc-review/decisions/decisions.component.spec.ts b/portal-frontend/src/app/features/public/notice-of-intent/alc-review/decisions/decisions.component.spec.ts new file mode 100644 index 0000000000..3f5ab7e361 --- /dev/null +++ b/portal-frontend/src/app/features/public/notice-of-intent/alc-review/decisions/decisions.component.spec.ts @@ -0,0 +1,33 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { createMock } from '@golevelup/ts-jest'; +import { NoticeOfIntentDecisionService } from '../../../../../services/notice-of-intent-decision/notice-of-intent-decision.service'; + +import { PublicDecisionsComponent } from './decisions.component'; + +describe('PublicDecisionsComponent', () => { + let component: PublicDecisionsComponent; + let fixture: ComponentFixture<PublicDecisionsComponent>; + let mockDecisionService: NoticeOfIntentDecisionService; + + beforeEach(async () => { + mockDecisionService = createMock(); + + await TestBed.configureTestingModule({ + declarations: [PublicDecisionsComponent], + providers: [ + { + provide: NoticeOfIntentDecisionService, + useValue: mockDecisionService, + }, + ], + }).compileComponents(); + + fixture = TestBed.createComponent(PublicDecisionsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/public/notice-of-intent/alc-review/decisions/decisions.component.ts b/portal-frontend/src/app/features/public/notice-of-intent/alc-review/decisions/decisions.component.ts new file mode 100644 index 0000000000..a8b190adcd --- /dev/null +++ b/portal-frontend/src/app/features/public/notice-of-intent/alc-review/decisions/decisions.component.ts @@ -0,0 +1,23 @@ +import { Component, Input, OnChanges, OnInit, SimpleChanges } from '@angular/core'; +import { ApplicationPortalDecisionDto } from '../../../../../services/application-decision/application-decision.dto'; +import { ApplicationDecisionService } from '../../../../../services/application-decision/application-decision.service'; +import { NoticeOfIntentPortalDecisionDto } from '../../../../../services/notice-of-intent-decision/notice-of-intent-decision.dto'; +import { NoticeOfIntentDecisionService } from '../../../../../services/notice-of-intent-decision/notice-of-intent-decision.service'; + +@Component({ + selector: 'app-public-decisions', + templateUrl: './decisions.component.html', + styleUrls: ['./decisions.component.scss'], +}) +export class PublicDecisionsComponent { + @Input() decisions: NoticeOfIntentPortalDecisionDto[] = []; + + constructor(private decisionService: NoticeOfIntentDecisionService) {} + + async openFile(uuid: string) { + const res = await this.decisionService.openFile(uuid); + if (res) { + window.open(res.url, '_blank'); + } + } +} diff --git a/portal-frontend/src/app/features/public/notice-of-intent/alc-review/submission-documents/submission-documents.component.html b/portal-frontend/src/app/features/public/notice-of-intent/alc-review/submission-documents/submission-documents.component.html new file mode 100644 index 0000000000..45f473c3d5 --- /dev/null +++ b/portal-frontend/src/app/features/public/notice-of-intent/alc-review/submission-documents/submission-documents.component.html @@ -0,0 +1,43 @@ +<h4>Application Documents</h4> +<div class="table-container"> + <table mat-table [dataSource]="dataSource" matSort class="mat-elevation-z3 documents"> + <ng-container matColumnDef="type"> + <th mat-header-cell *matHeaderCellDef mat-sort-header sortActionDescription="Sort by type">Type</th> + <td mat-cell *matCellDef="let element"> + {{ element.type?.label }} + </td> + </ng-container> + + <ng-container matColumnDef="fileName"> + <th mat-header-cell *matHeaderCellDef mat-sort-header sortActionDescription="Sort by name">Document Name</th> + <td mat-cell *matCellDef="let element"> + <a (click)="openFile(element.uuid)">{{ element.fileName }}</a> + </td> + </ng-container> + + <ng-container matColumnDef="source"> + <th mat-header-cell *matHeaderCellDef mat-sort-header sortActionDescription="Sort by source">Source</th> + <td mat-cell *matCellDef="let element">{{ element.source }}</td> + </ng-container> + + <ng-container matColumnDef="uploadedAt"> + <th mat-header-cell *matHeaderCellDef mat-sort-header sortActionDescription="Sort by date">Upload Date</th> + <td mat-cell *matCellDef="let element">{{ element.uploadedAt | date }}</td> + </ng-container> + + <ng-container matColumnDef="actions"> + <th mat-header-cell *matHeaderCellDef>Actions</th> + <td mat-cell *matCellDef="let element"> + <button mat-icon-button (click)="downloadFile(element.uuid)"> + <mat-icon>file_download</mat-icon> + </button> + </td> + </ng-container> + + <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr> + <tr mat-row *matRowDef="let row; columns: displayedColumns"></tr> + <tr class="mat-row" *matNoDataRow> + <td class="text-center" colspan="6">Documents will be visible here once provided by ALC</td> + </tr> + </table> +</div> diff --git a/portal-frontend/src/app/features/public/notice-of-intent/alc-review/submission-documents/submission-documents.component.scss b/portal-frontend/src/app/features/public/notice-of-intent/alc-review/submission-documents/submission-documents.component.scss new file mode 100644 index 0000000000..0027146765 --- /dev/null +++ b/portal-frontend/src/app/features/public/notice-of-intent/alc-review/submission-documents/submission-documents.component.scss @@ -0,0 +1,25 @@ +@use '../../../../../../styles/colors'; +@use '../../../../../../styles/functions' as *; + +.header { + display: flex; + justify-content: space-between; +} + +.table-container { + margin: rem(4); + overflow-x: auto; +} + +.documents { + margin-top: rem(12); +} + +.mat-mdc-no-data-row { + height: rem(56); + color: colors.$grey-dark; +} + +a { + word-break: break-all; +} diff --git a/portal-frontend/src/app/features/public/notice-of-intent/alc-review/submission-documents/submission-documents.component.spec.ts b/portal-frontend/src/app/features/public/notice-of-intent/alc-review/submission-documents/submission-documents.component.spec.ts new file mode 100644 index 0000000000..a2f54298d3 --- /dev/null +++ b/portal-frontend/src/app/features/public/notice-of-intent/alc-review/submission-documents/submission-documents.component.spec.ts @@ -0,0 +1,35 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { PublicService } from '../../../../../services/public/public.service'; + +import { PublicSubmissionDocumentsComponent } from './submission-documents.component'; + +describe('PublicSubmissionDocumentsComponent', () => { + let component: PublicSubmissionDocumentsComponent; + let fixture: ComponentFixture<PublicSubmissionDocumentsComponent>; + let mockPublicService: DeepMocked<PublicService>; + + beforeEach(async () => { + mockPublicService = createMock(); + + await TestBed.configureTestingModule({ + declarations: [PublicSubmissionDocumentsComponent], + providers: [ + { + provide: PublicService, + useValue: mockPublicService, + }, + ], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(PublicSubmissionDocumentsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/public/notice-of-intent/alc-review/submission-documents/submission-documents.component.ts b/portal-frontend/src/app/features/public/notice-of-intent/alc-review/submission-documents/submission-documents.component.ts new file mode 100644 index 0000000000..ba33cf53ce --- /dev/null +++ b/portal-frontend/src/app/features/public/notice-of-intent/alc-review/submission-documents/submission-documents.component.ts @@ -0,0 +1,58 @@ +import { Component, Input, OnDestroy, OnInit, ViewChild } from '@angular/core'; +import { MatSort } from '@angular/material/sort'; +import { MatTableDataSource } from '@angular/material/table'; +import { Subject } from 'rxjs'; +import { PublicNoticeOfIntentSubmissionDto } from '../../../../../services/public/public-notice-of-intent.dto'; +import { PublicDocumentDto } from '../../../../../services/public/public.dto'; +import { PublicService } from '../../../../../services/public/public.service'; + +@Component({ + selector: 'app-submission-documents', + templateUrl: './submission-documents.component.html', + styleUrls: ['./submission-documents.component.scss'], +}) +export class PublicSubmissionDocumentsComponent implements OnInit, OnDestroy { + private $destroy = new Subject<void>(); + + displayedColumns: string[] = ['type', 'fileName', 'source', 'uploadedAt', 'actions']; + @Input() documents!: PublicDocumentDto[]; + @Input() submission!: PublicNoticeOfIntentSubmissionDto; + + @ViewChild(MatSort) sort!: MatSort; + dataSource: MatTableDataSource<PublicDocumentDto> = new MatTableDataSource<PublicDocumentDto>(); + + constructor(private publicService: PublicService) {} + + ngOnInit(): void { + this.dataSource = new MatTableDataSource(this.documents); + } + + async openFile(uuid: string) { + const res = await this.publicService.getNoticeOfIntentOpenFileUrl(this.submission.fileNumber, uuid); + if (res) { + window.open(res.url, '_blank'); + } + } + + async downloadFile(uuid: string) { + const res = await this.publicService.getNoticeOfIntentOpenFileUrl(this.submission.fileNumber, 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(); + } + + protected readonly open = open; +} diff --git a/portal-frontend/src/app/features/public/notice-of-intent/public-notice-of-intent.component.html b/portal-frontend/src/app/features/public/notice-of-intent/public-notice-of-intent.component.html new file mode 100644 index 0000000000..dd7dedf518 --- /dev/null +++ b/portal-frontend/src/app/features/public/notice-of-intent/public-notice-of-intent.component.html @@ -0,0 +1,60 @@ +<div aria-hidden="true" class="banner absolute"> + <div> + <h4 *ngIf="submission">Notice of Intent ID: {{ submission.fileNumber }} | {{ submission.type }}</h4> + </div> + <div class="banner-status"> + <div> + <div class="subheading2">Status Date</div> + <span *ngIf="submission">{{ submission.lastStatusUpdate | date }}</span> + </div> + <div> + <div class="subheading2">Status</div> + <span *ngIf="submission">{{ submission.status.label }}</span> + </div> + </div> +</div> +<div class="banner"> + <div> + <h4 *ngIf="submission">Notice of Intent ID: {{ submission.fileNumber }}</h4> + </div> + <div class="banner-status"> + <div> + <div class="subheading2">Status Date</div> + <span *ngIf="submission">{{ submission.lastStatusUpdate | date }}</span> + </div> + <div> + <div class="subheading2">Status</div> + <span *ngIf="submission">{{ submission.status.label }}</span> + </div> + </div> +</div> +<button routerLink="/public" mat-button color="accent"> + <mat-icon>chevron_left</mat-icon> + Return to Search Results +</button> +<div> + <div class="navigation"> + <mat-tab-group> + <mat-tab label="Applicant Submission"> + <div *ngIf="submission" class="content"> + <section> + <div class="header"> + <h3>Applicant Submission</h3> + </div> + <app-public-app-submission-details [documents]="documents" [submission]="submission" [parcels]="parcels"> + </app-public-app-submission-details> + </section> + </div> + </mat-tab> + <mat-tab label="ALC Review and Decision"> + <div *ngIf="submission" class="content"> + <app-public-alc-review + [documents]="documents" + [submission]="submission" + [decisions]="decisions" + ></app-public-alc-review> + </div> + </mat-tab> + </mat-tab-group> + </div> +</div> diff --git a/portal-frontend/src/app/features/public/notice-of-intent/public-notice-of-intent.component.scss b/portal-frontend/src/app/features/public/notice-of-intent/public-notice-of-intent.component.scss new file mode 100644 index 0000000000..0e74e9ca5b --- /dev/null +++ b/portal-frontend/src/app/features/public/notice-of-intent/public-notice-of-intent.component.scss @@ -0,0 +1,105 @@ +@use '../../../../styles/functions' as *; +@use '../../../../styles/colors'; + +.navigation { + ::ng-deep .mdc-tab__text-label { + font-weight: bold; + } +} + +.content { + margin: rem(24) 0; +} + +:host::ng-deep { + .header { + display: flex; + justify-content: space-between; + align-items: center; + margin-bottom: rem(24); + flex-direction: column; + + @media screen and (min-width: $tabletBreakpoint) { + flex-direction: row; + } + + h3 { + margin-top: rem(8) !important; + } + + .btns-wrapper { + display: flex; + flex-direction: column-reverse; + width: 100%; + + button { + margin-top: rem(16) !important; + } + + @media screen and (min-width: $tabletBreakpoint) { + display: inline-block; + width: unset; + + button { + margin-right: rem(16) !important; + margin-top: rem(8) !important; + } + + button:last-child { + margin-right: 0 !important; + } + } + } + } +} + +.absolute { + position: absolute; + left: 0; + right: 0; +} + +.banner { + background-color: colors.$secondary-color; + width: 100%; + color: #fff; + padding: rem(16) rem(24); + margin-bottom: rem(32); + + @media screen and (min-width: $tabletBreakpoint) { + padding: rem(12) rem(36) !important; + } + + // TODO: this is just a placeholder and will be addressed later + @media screen and (min-width: $desktopBreakpoint) { + padding: rem(18) rem(80) !important; + } + + .banner-status { + margin: rem(16) 0; + display: grid; + grid-template-columns: 1fr; + + div { + margin-top: rem(16); + } + + @media screen and (min-width: $tabletBreakpoint) { + grid-template-columns: 1fr 1fr; + margin-bottom: 0; + } + } +} + +.no-comment { + color: colors.$grey-dark; + font-style: italic; +} + +section { + margin-bottom: rem(24); +} + +.document { + margin-bottom: rem(8); +} diff --git a/portal-frontend/src/app/features/public/notice-of-intent/public-notice-of-intent.component.spec.ts b/portal-frontend/src/app/features/public/notice-of-intent/public-notice-of-intent.component.spec.ts new file mode 100644 index 0000000000..a019ac4090 --- /dev/null +++ b/portal-frontend/src/app/features/public/notice-of-intent/public-notice-of-intent.component.spec.ts @@ -0,0 +1,49 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { ActivatedRoute } from '@angular/router'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { BehaviorSubject } from 'rxjs'; +import { PublicService } from '../../../services/public/public.service'; + +import { PublicNoticeOfIntentComponent } from './public-notice-of-intent.component'; + +describe('PublicApplicationComponent', () => { + let component: PublicNoticeOfIntentComponent; + let fixture: ComponentFixture<PublicNoticeOfIntentComponent>; + + let mockRoute; + let mockPublicService: DeepMocked<PublicService>; + + let routeParamMap: BehaviorSubject<Map<string, any>>; + + beforeEach(async () => { + mockRoute = createMock(); + mockPublicService = createMock(); + + routeParamMap = new BehaviorSubject(new Map()); + mockRoute.paramMap = routeParamMap; + + await TestBed.configureTestingModule({ + providers: [ + { + provide: ActivatedRoute, + useValue: mockRoute, + }, + { + provide: PublicService, + useValue: mockPublicService, + }, + ], + declarations: [PublicNoticeOfIntentComponent], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(PublicNoticeOfIntentComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/public/notice-of-intent/public-notice-of-intent.component.ts b/portal-frontend/src/app/features/public/notice-of-intent/public-notice-of-intent.component.ts new file mode 100644 index 0000000000..80d17b1400 --- /dev/null +++ b/portal-frontend/src/app/features/public/notice-of-intent/public-notice-of-intent.component.ts @@ -0,0 +1,52 @@ +import { Component, OnDestroy, OnInit } from '@angular/core'; +import { ActivatedRoute } from '@angular/router'; +import { Subject, takeUntil } from 'rxjs'; +import { ApplicationPortalDecisionDto } from '../../../services/application-decision/application-decision.dto'; +import { SUBMISSION_STATUS } from '../../../services/application-submission/application-submission.dto'; +import { PublicNoticeOfIntentSubmissionDto } from '../../../services/public/public-notice-of-intent.dto'; +import { PublicDocumentDto, PublicParcelDto } from '../../../services/public/public.dto'; +import { PublicService } from '../../../services/public/public.service'; + +@Component({ + selector: 'app-public-notice-of-intent', + templateUrl: './public-notice-of-intent.component.html', + styleUrls: ['./public-notice-of-intent.component.scss'], +}) +export class PublicNoticeOfIntentComponent implements OnInit, OnDestroy { + $destroy = new Subject<void>(); + + SUBMISSION_STATUS = SUBMISSION_STATUS; + + submission: PublicNoticeOfIntentSubmissionDto | undefined; + documents: PublicDocumentDto[] = []; + parcels: PublicParcelDto[] = []; + decisions: ApplicationPortalDecisionDto[] = []; + + constructor(private publicService: PublicService, private route: ActivatedRoute) {} + + ngOnInit(): void { + this.route.paramMap.pipe(takeUntil(this.$destroy)).subscribe((routeParams) => { + const fileId = routeParams.get('fileId'); + if (fileId) { + this.loadApplication(fileId); + } + }); + } + + private async loadApplication(fileId: string) { + const res = await this.publicService.getNoticeOfIntent(fileId); + if (res) { + const { submission, documents, parcels, decisions } = res; + + this.submission = submission; + this.documents = documents; + this.parcels = parcels; + this.decisions = decisions; + } + } + + ngOnDestroy(): void { + this.$destroy.next(); + this.$destroy.complete(); + } +} diff --git a/portal-frontend/src/app/features/public/notice-of-intent/public-notice-of-intent.module.ts b/portal-frontend/src/app/features/public/notice-of-intent/public-notice-of-intent.module.ts new file mode 100644 index 0000000000..52e7ba7867 --- /dev/null +++ b/portal-frontend/src/app/features/public/notice-of-intent/public-notice-of-intent.module.ts @@ -0,0 +1,50 @@ +import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; +import { MatAutocompleteModule } from '@angular/material/autocomplete'; +import { MatPaginatorModule } from '@angular/material/paginator'; +import { MatSortModule } from '@angular/material/sort'; +import { MatTreeModule } from '@angular/material/tree'; +import { RouterModule, Routes } from '@angular/router'; +import { SharedModule } from '../../../shared/shared.module'; +import { PublicAlcReviewComponent } from './alc-review/alc-review.component'; +import { PublicDecisionsComponent } from './alc-review/decisions/decisions.component'; +import { PublicSubmissionDocumentsComponent } from './alc-review/submission-documents/submission-documents.component'; +import { PublicNoticeOfIntentComponent } from './public-notice-of-intent.component'; +import { AdditionalInformationComponent } from './submission/additional-information/additional-information.component'; +import { ParcelComponent } from './submission/parcel/parcel.component'; +import { PfrsDetailsComponent } from './submission/pfrs-details/pfrs-details.component'; +import { PofoDetailsComponent } from './submission/pofo-details/pofo-details.component'; +import { RosoDetailsComponent } from './submission/roso-details/roso-details.component'; +import { SubmissionDetailsComponent } from './submission/submission-details.component'; + +const routes: Routes = [ + { + path: ':fileId', + component: PublicNoticeOfIntentComponent, + }, +]; + +@NgModule({ + declarations: [ + PublicNoticeOfIntentComponent, + PublicAlcReviewComponent, + PublicSubmissionDocumentsComponent, + PublicDecisionsComponent, + ParcelComponent, + SubmissionDetailsComponent, + RosoDetailsComponent, + PofoDetailsComponent, + PfrsDetailsComponent, + AdditionalInformationComponent, + ], + imports: [ + CommonModule, + SharedModule, + MatPaginatorModule, + MatSortModule, + RouterModule.forChild(routes), + MatAutocompleteModule, + MatTreeModule, + ], +}) +export class PublicNoticeOfIntentModule {} diff --git a/portal-frontend/src/app/features/public/notice-of-intent/submission/additional-information/additional-information.component.html b/portal-frontend/src/app/features/public/notice-of-intent/submission/additional-information/additional-information.component.html new file mode 100644 index 0000000000..dcc15e93fa --- /dev/null +++ b/portal-frontend/src/app/features/public/notice-of-intent/submission/additional-information/additional-information.component.html @@ -0,0 +1,76 @@ +<div *ngIf="noiSubmission" class="review-table"> + <div class="subheading2 grid-1"> + {{ firstQuestion }} + </div> + <div class="grid-double"> + <span *ngIf="noiSubmission.soilIsRemovingSoilForNewStructure !== null"> + {{ noiSubmission.soilIsRemovingSoilForNewStructure ? 'Yes' : 'No' }} + </span> + <app-no-data *ngIf="noiSubmission.soilIsRemovingSoilForNewStructure === null"></app-no-data> + </div> + + <ng-container *ngIf="noiSubmission.soilIsRemovingSoilForNewStructure"> + <div class="full-width subheading2">The total floor area (m<sup>2</sup>) of the proposed structure(s)</div> + <div class="full-width soil-table"> + <div class="grid-1 subheading2">#</div> + <div class="grid-2 subheading2">Type</div> + <div class="grid-3 subheading2">Area</div> + <ng-container *ngFor="let structure of noiSubmission.soilProposedStructures; let i = index"> + <div class="grid-1"> + {{ i + 1 }} + </div> + <div class="grid-2"> + {{ structure.type }} + <app-no-data *ngIf="!structure.type"></app-no-data> + </div> + <div class="grid-3"> + {{ structure.area }} + <app-no-data *ngIf="!structure.area"></app-no-data> + </div> + </ng-container> + <div *ngIf="noiSubmission.soilProposedStructures.length === 0" class="full-width"> + <app-no-data></app-no-data> + </div> + </div> + + <ng-container *ngIf="isSoilStructureFarmUseReasonVisible"> + <div class="subheading2 grid-1">Describe how the structure is necessary for farm use</div> + <div class="grid-double"> + {{ noiSubmission.soilStructureFarmUseReason }} + <app-no-data *ngIf="!noiSubmission.soilStructureFarmUseReason"></app-no-data> + </div> + </ng-container> + + <ng-container *ngIf="isSoilStructureResidentialUseReasonVisible"> + <div class="subheading2 grid-1">Describe how the structure is necessary for residential use</div> + <div class="grid-double"> + {{ noiSubmission.soilStructureResidentialUseReason }} + <app-no-data *ngIf="!noiSubmission.soilStructureResidentialUseReason"></app-no-data> + </div> + </ng-container> + + <ng-container *ngIf="isSoilAgriParcelActivityVisible"> + <div class="subheading2 grid-1">Describe the current agricultural activity on the parcel(s)</div> + <div class="grid-double"> + {{ noiSubmission.soilAgriParcelActivity }} + <app-no-data *ngIf="!noiSubmission.soilAgriParcelActivity"></app-no-data> + </div> + </ng-container> + + <ng-container *ngIf="isSoilStructureResidentialAccessoryUseReasonVisible"> + <div class="subheading2 grid-1">Describe the intended use of the residential accessory structure</div> + <div class="grid-double"> + {{ noiSubmission.soilStructureResidentialAccessoryUseReason }} + <app-no-data *ngIf="!noiSubmission.soilStructureResidentialAccessoryUseReason"></app-no-data> + </div> + </ng-container> + + <ng-container *ngIf="isSoilOtherStructureVisible"> + <div class="subheading2 grid-1">Describe the intended use of the 'Other' structure</div> + <div class="grid-double"> + {{ noiSubmission.soilStructureOtherUseReason }} + <app-no-data *ngIf="!noiSubmission.soilStructureOtherUseReason"></app-no-data> + </div> + </ng-container> + </ng-container> +</div> diff --git a/portal-frontend/src/app/features/public/notice-of-intent/submission/additional-information/additional-information.component.scss b/portal-frontend/src/app/features/public/notice-of-intent/submission/additional-information/additional-information.component.scss new file mode 100644 index 0000000000..bfe0899632 --- /dev/null +++ b/portal-frontend/src/app/features/public/notice-of-intent/submission/additional-information/additional-information.component.scss @@ -0,0 +1,5 @@ +.multiple-documents { + a { + display: block; + } +} diff --git a/portal-frontend/src/app/features/public/notice-of-intent/submission/additional-information/additional-information.component.spec.ts b/portal-frontend/src/app/features/public/notice-of-intent/submission/additional-information/additional-information.component.spec.ts new file mode 100644 index 0000000000..417628f883 --- /dev/null +++ b/portal-frontend/src/app/features/public/notice-of-intent/submission/additional-information/additional-information.component.spec.ts @@ -0,0 +1,31 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { DeepMocked } from '@golevelup/ts-jest'; +import { PublicService } from '../../../../../services/public/public.service'; + +import { AdditionalInformationComponent } from './additional-information.component'; + +describe('AdditionalInformationComponent', () => { + let component: AdditionalInformationComponent; + let fixture: ComponentFixture<AdditionalInformationComponent>; + let mockPublicService: DeepMocked<PublicService>; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [AdditionalInformationComponent], + providers: [ + { + provide: PublicService, + useValue: mockPublicService, + }, + ], + }).compileComponents(); + + fixture = TestBed.createComponent(AdditionalInformationComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/public/notice-of-intent/submission/additional-information/additional-information.component.ts b/portal-frontend/src/app/features/public/notice-of-intent/submission/additional-information/additional-information.component.ts new file mode 100644 index 0000000000..a21f812bd0 --- /dev/null +++ b/portal-frontend/src/app/features/public/notice-of-intent/submission/additional-information/additional-information.component.ts @@ -0,0 +1,77 @@ +import { Component, Input, OnInit } from '@angular/core'; +import { Router } from '@angular/router'; +import { PublicNoticeOfIntentSubmissionDto } from '../../../../../services/public/public-notice-of-intent.dto'; +import { PublicDocumentDto } from '../../../../../services/public/public.dto'; +import { PublicService } from '../../../../../services/public/public.service'; +import { DOCUMENT_TYPE } from '../../../../../shared/dto/document.dto'; +import { + RESIDENTIAL_STRUCTURE_TYPES, + STRUCTURE_TYPES, +} from '../../../../notice-of-intents/edit-submission/additional-information/additional-information.component'; + +@Component({ + selector: 'app-additional-information', + templateUrl: './additional-information.component.html', + styleUrls: ['./additional-information.component.scss'], +}) +export class AdditionalInformationComponent implements OnInit { + firstQuestion = 'FIX THIS'; + + @Input() noiSubmission!: PublicNoticeOfIntentSubmissionDto; + + @Input() set noiDocuments(documents: PublicDocumentDto[]) { + this.buildingPlans = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.BUILDING_PLAN); + } + + buildingPlans: PublicDocumentDto[] = []; + + isSoilStructureFarmUseReasonVisible = false; + isSoilStructureResidentialUseReasonVisible = false; + isSoilAgriParcelActivityVisible = false; + isSoilStructureResidentialAccessoryUseReasonVisible = false; + isSoilOtherStructureVisible = false; + + constructor(private router: Router, private publicService: PublicService) {} + + ngOnInit(): void { + this.setVisibilityForResidentialFields(); + this.setValidatorsForAccessoryFields(); + this.setVisibilityForFarmFields(); + this.setVisibilityForOtherFields(); + } + + private setVisibilityForResidentialFields() { + this.isSoilStructureResidentialUseReasonVisible = !!this.noiSubmission?.soilProposedStructures.some( + (structure) => structure.type && RESIDENTIAL_STRUCTURE_TYPES.includes(structure.type) + ); + } + + private setValidatorsForAccessoryFields() { + this.isSoilStructureResidentialAccessoryUseReasonVisible = !!this.noiSubmission?.soilProposedStructures.some( + (structure) => structure.type === STRUCTURE_TYPES.ACCESSORY_STRUCTURE + ); + } + + private setVisibilityForFarmFields() { + if ( + this.noiSubmission?.soilProposedStructures.some((structure) => structure.type === STRUCTURE_TYPES.FARM_STRUCTURE) + ) { + this.isSoilAgriParcelActivityVisible = true; + this.isSoilStructureFarmUseReasonVisible = true; + } else { + this.isSoilAgriParcelActivityVisible = false; + this.isSoilStructureFarmUseReasonVisible = false; + } + } + + private setVisibilityForOtherFields() { + this.isSoilOtherStructureVisible = !!this.noiSubmission?.soilProposedStructures.some( + (structure) => structure.type === STRUCTURE_TYPES.OTHER_STRUCTURE + ); + } + + async openFile(uuid: string) { + const res = await this.publicService.getNoticeOfIntentOpenFileUrl(this.noiSubmission.fileNumber, uuid); + window.open(res?.url, '_blank'); + } +} diff --git a/portal-frontend/src/app/features/public/notice-of-intent/submission/parcel/parcel.component.html b/portal-frontend/src/app/features/public/notice-of-intent/submission/parcel/parcel.component.html new file mode 100644 index 0000000000..782f41bf2a --- /dev/null +++ b/portal-frontend/src/app/features/public/notice-of-intent/submission/parcel/parcel.component.html @@ -0,0 +1,79 @@ +<h3 class="flex-item"> + {{ pageTitle }} +</h3> +<div class="review-table"> + <ng-container *ngFor="let parcel of parcels; let parcelInd = index"> + <div class="full-width flex-space-between-wrap"> + <h4>Parcel {{ parcelInd + 1 }}: Parcel and Owner Information</h4> + </div> + <div class="full-width subheading1">Parcel Information</div> + <div class="subheading2 grid-1">Ownership Type</div> + <div class="grid-double"> + {{ parcel.ownershipType?.label }} + <app-no-data *ngIf="!parcel.ownershipType"></app-no-data> + </div> + <div class="subheading2 grid-1">Legal Description</div> + <div class="grid-double"> + {{ parcel.legalDescription }} + </div> + <div class="subheading2 grid-1">Area (Hectares)</div> + <div class="grid-double"> + {{ parcel.mapAreaHectares }} + </div> + <div class="subheading2 grid-1"> + PID {{ parcel.ownershipType?.code === PARCEL_OWNERSHIP_TYPES.CROWN ? '(optional)' : '' }} + </div> + <div class="grid-double"> + <span *ngIf="parcel.pid">{{ parcel.pid | mask : '000-000-000' }}</span> + <app-no-data *ngIf="!parcel.pid"></app-no-data> + </div> + <ng-container *ngIf="parcel.ownershipType?.code === PARCEL_OWNERSHIP_TYPES.CROWN"> + <div class="subheading2 grid-1">PIN (optional)</div> + <div class="grid-double"> + {{ parcel.pin }} + <app-no-data *ngIf="!parcel.pin"></app-no-data> + </div> + </ng-container> + <ng-container *ngIf="parcel.ownershipType?.code === PARCEL_OWNERSHIP_TYPES.FEE_SIMPLE"> + <div class="subheading2 grid-1">Purchase Date</div> + <div class="grid-double"> + {{ parcel.purchasedDate | date }} + <app-no-data *ngIf="!parcel.purchasedDate"> </app-no-data> + </div> + </ng-container> + <div class="subheading2 grid-1">Farm Classification</div> + <div class="grid-double"> + <span *ngIf="parcel.isFarm !== null">{{ parcel.isFarm ? 'Yes' : 'No' }}</span> + <app-no-data *ngIf="parcel.isFarm === null"></app-no-data> + </div> + <div class="subheading2 grid-1">Civic Address</div> + <div class="grid-double"> + {{ parcel.civicAddress }} + <app-no-data *ngIf="!parcel.civicAddress"></app-no-data> + </div> + <ng-container *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN"> + <div class="subheading2 grid-1">Crown Selection</div> + <div class="grid-double"> + <span class="crown-land" *ngIf="parcel.crownLandOwnerType !== null">{{ parcel.crownLandOwnerType }}</span> + <app-no-data *ngIf="parcel.crownLandOwnerType === null"></app-no-data> + </div> + </ng-container> + <div class="full-width owner-information"> + <div class="subheading2">Land Owner(s)</div> + <div class="subheading2" *ngIf="parcel.ownershipTypeCode !== PARCEL_OWNERSHIP_TYPES.CROWN">Organization</div> + <div class="subheading2" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN"> + Ministry/ Department + </div> + <ng-container *ngFor="let owner of parcel.owners"> + <div>{{ owner.displayName }}</div> + <div> + <span *ngIf="owner.organizationName"></span>{{ owner.organizationName }} + <app-no-data [showRequired]="false" *ngIf="!owner.organizationName"></app-no-data> + </div> + </ng-container> + <div class="full-width"> + <app-no-data *ngIf="parcel.owners.length === 0"></app-no-data> + </div> + </div> + </ng-container> +</div> diff --git a/portal-frontend/src/app/features/public/notice-of-intent/submission/parcel/parcel.component.scss b/portal-frontend/src/app/features/public/notice-of-intent/submission/parcel/parcel.component.scss new file mode 100644 index 0000000000..81d88321d1 --- /dev/null +++ b/portal-frontend/src/app/features/public/notice-of-intent/submission/parcel/parcel.component.scss @@ -0,0 +1,25 @@ +@use '../../../../../../styles/functions' as *; + +.owner-information { + display: grid; + grid-template-columns: max-content max-content; + overflow-x: auto; + grid-column-gap: rem(36); + grid-row-gap: rem(12); + + .full-width { + grid-column: 1/3; + } +} + +.review-table { + grid-template-columns: 1fr 1fr !important; + + .full-width { + grid-column: 1/3; + } +} + +.crown-land { + text-transform: capitalize; +} diff --git a/portal-frontend/src/app/features/public/notice-of-intent/submission/parcel/parcel.component.spec.ts b/portal-frontend/src/app/features/public/notice-of-intent/submission/parcel/parcel.component.spec.ts new file mode 100644 index 0000000000..ab7cf978f1 --- /dev/null +++ b/portal-frontend/src/app/features/public/notice-of-intent/submission/parcel/parcel.component.spec.ts @@ -0,0 +1,40 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { Router } from '@angular/router'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { PublicService } from '../../../../../services/public/public.service'; +import { ParcelComponent } from './parcel.component'; + +describe('ParcelComponent', () => { + let component: ParcelComponent; + let fixture: ComponentFixture<ParcelComponent>; + + let mockPublicService: DeepMocked<PublicService>; + + beforeEach(async () => { + mockPublicService = createMock(); + await TestBed.configureTestingModule({ + declarations: [ParcelComponent], + providers: [ + { + provide: PublicService, + useValue: mockPublicService, + }, + { + provides: Router, + useValue: {}, + }, + ], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(ParcelComponent); + component = fixture.componentInstance; + component.submission = {} as any; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/public/notice-of-intent/submission/parcel/parcel.component.ts b/portal-frontend/src/app/features/public/notice-of-intent/submission/parcel/parcel.component.ts new file mode 100644 index 0000000000..1003ec555c --- /dev/null +++ b/portal-frontend/src/app/features/public/notice-of-intent/submission/parcel/parcel.component.ts @@ -0,0 +1,35 @@ +import { Component, Input } from '@angular/core'; +import { Subject } from 'rxjs'; +import { PARCEL_OWNERSHIP_TYPE } from '../../../../../services/application-parcel/application-parcel.dto'; +import { PublicNoticeOfIntentSubmissionDto } from '../../../../../services/public/public-notice-of-intent.dto'; +import { PublicParcelDto } from '../../../../../services/public/public.dto'; + +@Component({ + selector: 'app-parcel', + templateUrl: './parcel.component.html', + styleUrls: ['./parcel.component.scss'], +}) +export class ParcelComponent { + $destroy = new Subject<void>(); + + @Input() submission!: PublicNoticeOfIntentSubmissionDto; + @Input() parcels: PublicParcelDto[] = []; + + PARCEL_OWNERSHIP_TYPES = PARCEL_OWNERSHIP_TYPE; + pageTitle: string = 'Identify Parcel(s) Under Application'; + + fileId = ''; + submissionUuid = ''; + + constructor() {} + + ngOnInit(): void { + this.fileId = this.submission.fileNumber; + this.submissionUuid = this.submission.uuid; + } + + ngOnDestroy(): void { + this.$destroy.next(); + this.$destroy.complete(); + } +} diff --git a/portal-frontend/src/app/features/public/notice-of-intent/submission/pfrs-details/pfrs-details.component.html b/portal-frontend/src/app/features/public/notice-of-intent/submission/pfrs-details/pfrs-details.component.html new file mode 100644 index 0000000000..6694941059 --- /dev/null +++ b/portal-frontend/src/app/features/public/notice-of-intent/submission/pfrs-details/pfrs-details.component.html @@ -0,0 +1,211 @@ +<div *ngIf="noiSubmission" class="review-table"> + <div class="subheading2 grid-1"> + Has the ALC previously received an application or Notice of Intent for this proposal? + </div> + <div class="grid-double"> + <span *ngIf="noiSubmission.soilIsFollowUp !== null"> + {{ noiSubmission.soilIsFollowUp ? 'Yes' : 'No' }} + </span> + <app-no-data *ngIf="noiSubmission.soilIsFollowUp === null"></app-no-data> + </div> + + <div *ngIf="noiSubmission.soilIsFollowUp" class="subheading2 grid-1">Application or NOI ID</div> + <div *ngIf="noiSubmission.soilIsFollowUp" class="grid-double"> + {{ noiSubmission.soilFollowUpIDs }} + <app-no-data *ngIf="!noiSubmission.soilFollowUpIDs"></app-no-data> + </div> + + <div class="subheading2 grid-1">What is the purpose of the proposal?</div> + <div class="grid-double"> + {{ noiSubmission.purpose }} + <app-no-data *ngIf="!noiSubmission.purpose"></app-no-data> + </div> + + <div class="subheading2 grid-1">Describe the type of soil proposed to be removed.</div> + <div class="grid-double"> + {{ noiSubmission.soilTypeRemoved }} + <app-no-data *ngIf="!noiSubmission.soilTypeRemoved"></app-no-data> + </div> + + <div class="subheading2 grid-1">Describe the type, origin and quality of fill proposed to be placed.</div> + <div class="grid-double"> + {{ noiSubmission.soilFillTypeToPlace }} + <app-no-data *ngIf="!noiSubmission.soilFillTypeToPlace"></app-no-data> + </div> + + <div *ngIf="noiSubmission" class="full-width soil-table"> + <div></div> + <div> + <strong>Soil to be Removed </strong> + </div> + <div> + <strong>Fill to be Placed </strong> + </div> + + <div><strong>Volume</strong></div> + <div> + {{ noiSubmission.soilToRemoveVolume }} + <span *ngIf="noiSubmission.soilToRemoveVolume !== null">m<sup>3</sup></span> + <app-no-data *ngIf="noiSubmission.soilToRemoveVolume === null"></app-no-data> + </div> + <div> + {{ noiSubmission.soilToPlaceVolume }} + <span *ngIf="noiSubmission.soilToPlaceVolume !== null">m<sup>3</sup></span> + <app-no-data *ngIf="noiSubmission.soilToPlaceVolume === null"></app-no-data> + </div> + + <div><strong>Area</strong></div> + <div> + {{ noiSubmission.soilToRemoveArea }} + <span *ngIf="noiSubmission.soilToRemoveArea !== null">m<sup>2</sup></span> + <app-no-data *ngIf="noiSubmission.soilToRemoveArea === null"></app-no-data> + </div> + <div> + {{ noiSubmission.soilToPlaceArea }} + <span *ngIf="noiSubmission.soilToPlaceArea !== null">m<sup>2</sup></span> + <app-no-data *ngIf="noiSubmission.soilToPlaceArea === null"></app-no-data> + </div> + + <div><strong>Maximum Depth</strong></div> + <div> + {{ noiSubmission.soilToRemoveMaximumDepth }} + <span *ngIf="noiSubmission.soilToRemoveMaximumDepth !== null">m</span> + <app-no-data *ngIf="noiSubmission.soilToRemoveMaximumDepth === null"></app-no-data> + </div> + <div> + {{ noiSubmission.soilToPlaceMaximumDepth }} + <span *ngIf="noiSubmission.soilToPlaceMaximumDepth !== null">m</span> + <app-no-data *ngIf="noiSubmission.soilToPlaceMaximumDepth === null"></app-no-data> + </div> + + <div><strong>Average Depth</strong></div> + <div> + {{ noiSubmission.soilToRemoveAverageDepth }} + <span *ngIf="noiSubmission.soilToRemoveAverageDepth !== null">m</span> + <app-no-data *ngIf="noiSubmission.soilToRemoveAverageDepth === null"></app-no-data> + </div> + <div> + {{ noiSubmission.soilToPlaceAverageDepth }} + <span *ngIf="noiSubmission.soilToPlaceAverageDepth !== null">m</span> + <app-no-data *ngIf="noiSubmission.soilToPlaceAverageDepth === null"></app-no-data> + </div> + + <div class="spacer-row"></div> + + <div></div> + <div> + <strong>Soil already Removed </strong> + </div> + <div> + <strong>Fill already Placed </strong> + </div> + + <div><strong>Volume</strong></div> + <div> + {{ noiSubmission.soilAlreadyRemovedVolume }} + <span *ngIf="noiSubmission.soilAlreadyRemovedVolume !== null">m<sup>3</sup></span> + <app-no-data *ngIf="noiSubmission.soilAlreadyRemovedVolume === null"></app-no-data> + </div> + <div> + {{ noiSubmission.soilAlreadyPlacedVolume }} + <span *ngIf="noiSubmission.soilAlreadyPlacedVolume !== null">m<sup>3</sup></span> + <app-no-data *ngIf="noiSubmission.soilAlreadyPlacedVolume === null"></app-no-data> + </div> + + <div><strong>Area</strong></div> + <div> + {{ noiSubmission.soilAlreadyRemovedArea }} + <span *ngIf="noiSubmission.soilAlreadyRemovedArea !== null">m<sup>2</sup></span> + <app-no-data *ngIf="noiSubmission.soilAlreadyRemovedArea === null"></app-no-data> + </div> + <div> + {{ noiSubmission.soilAlreadyPlacedArea }} + <span *ngIf="noiSubmission.soilAlreadyPlacedArea !== null">m<sup>2</sup></span> + <app-no-data *ngIf="noiSubmission.soilAlreadyPlacedArea === null"></app-no-data> + </div> + + <div><strong>Maximum Depth</strong></div> + <div> + {{ noiSubmission.soilAlreadyRemovedMaximumDepth }} + <span *ngIf="noiSubmission.soilAlreadyRemovedMaximumDepth !== null">m</span> + <app-no-data *ngIf="noiSubmission.soilAlreadyRemovedMaximumDepth === null"></app-no-data> + </div> + <div> + {{ noiSubmission.soilAlreadyPlacedMaximumDepth }} + <span *ngIf="noiSubmission.soilAlreadyPlacedMaximumDepth !== null">m</span> + <app-no-data *ngIf="noiSubmission.soilAlreadyPlacedMaximumDepth === null"></app-no-data> + </div> + + <div><strong>Average Depth</strong></div> + <div> + {{ noiSubmission.soilAlreadyRemovedAverageDepth }} + <span *ngIf="noiSubmission.soilAlreadyRemovedAverageDepth !== null">m</span> + <app-no-data *ngIf="noiSubmission.soilAlreadyRemovedAverageDepth === null"></app-no-data> + </div> + <div> + {{ noiSubmission.soilAlreadyPlacedAverageDepth }} + <span *ngIf="noiSubmission.soilAlreadyPlacedAverageDepth !== null">m</span> + <app-no-data *ngIf="noiSubmission.soilAlreadyPlacedAverageDepth === null"></app-no-data> + </div> + </div> + + <div class="full-width"> + <h4>Project Duration</h4> + </div> + <div class="subheading2 grid-1">Duration</div> + <div class="grid-double"> + {{ noiSubmission.soilProjectDurationUnit }} + <app-no-data *ngIf="!noiSubmission.soilProjectDurationUnit"></app-no-data> + </div> + <div class="subheading2 grid-1">Length</div> + <div class="grid-double"> + {{ noiSubmission.soilProjectDurationAmount }} + <app-no-data *ngIf="!noiSubmission.soilProjectDurationAmount"></app-no-data> + </div> + + <div class="subheading2 grid-1">Proposal Map / Site Plan</div> + <div class="grid-double"> + <a *ngFor="let map of proposalMap" (click)="openFile(map.uuid)"> + {{ map.fileName }} + </a> + <app-no-data *ngIf="proposalMap.length === 0"></app-no-data> + </div> + + <div class="subheading2 grid-1">Is your proposal for area-wide filling?</div> + <div class="grid-double"> + <span *ngIf="noiSubmission.soilIsAreaWideFilling !== null"> + {{ noiSubmission.soilIsAreaWideFilling ? 'Yes' : 'No' }} + </span> + <app-no-data *ngIf="noiSubmission.soilIsAreaWideFilling === null"></app-no-data> + </div> + + <div class="subheading2 grid-1">Is your proposal for aggregate extraction or placer mining?</div> + <div class="grid-double"> + <span *ngIf="noiSubmission.soilIsExtractionOrMining !== null"> + {{ noiSubmission.soilIsExtractionOrMining ? 'Yes' : 'No' }} + </span> + <app-no-data *ngIf="noiSubmission.soilIsExtractionOrMining === null"></app-no-data> + </div> + + <ng-container *ngIf="noiSubmission.soilIsExtractionOrMining || noiSubmission.soilIsAreaWideFilling"> + <div class="subheading2 grid-1">Cross Sections</div> + <div class="grid-double"> + <a *ngFor="let file of crossSections" (click)="openFile(file.uuid)"> + {{ file.fileName }} + </a> + <app-no-data *ngIf="crossSections.length === 0"></app-no-data> + </div> + + <ng-container *ngIf="noiSubmission.soilIsExtractionOrMining"> + <div class="subheading2 grid-1"> + Have you submitted a Notice of Work to the Ministry of Energy, Mines and Low Carbon Innovation (EMLI)? + </div> + <div class="grid-double"> + <span *ngIf="noiSubmission.soilHasSubmittedNotice !== null"> + {{ noiSubmission.soilHasSubmittedNotice ? 'Yes' : 'No' }} + </span> + <app-no-data *ngIf="noiSubmission.soilHasSubmittedNotice === null"></app-no-data> + </div> + </ng-container> + </ng-container> +</div> diff --git a/portal-frontend/src/app/features/public/notice-of-intent/submission/pfrs-details/pfrs-details.component.scss b/portal-frontend/src/app/features/public/notice-of-intent/submission/pfrs-details/pfrs-details.component.scss new file mode 100644 index 0000000000..2206bf14b5 --- /dev/null +++ b/portal-frontend/src/app/features/public/notice-of-intent/submission/pfrs-details/pfrs-details.component.scss @@ -0,0 +1,10 @@ +@use '../../../../../../styles/functions' as *; + +.soil-table { + grid-template-columns: max-content max-content max-content; + + .spacer-row { + grid-column: 1/4; + height: rem(16); + } +} diff --git a/portal-frontend/src/app/features/public/notice-of-intent/submission/pfrs-details/pfrs-details.component.spec.ts b/portal-frontend/src/app/features/public/notice-of-intent/submission/pfrs-details/pfrs-details.component.spec.ts new file mode 100644 index 0000000000..a4aebe95c0 --- /dev/null +++ b/portal-frontend/src/app/features/public/notice-of-intent/submission/pfrs-details/pfrs-details.component.spec.ts @@ -0,0 +1,33 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { PublicService } from '../../../../../services/public/public.service'; + +import { PfrsDetailsComponent } from './pfrs-details.component'; + +describe('PfrsDetailsComponent', () => { + let component: PfrsDetailsComponent; + let fixture: ComponentFixture<PfrsDetailsComponent>; + let mockPublicService: DeepMocked<PublicService>; + + beforeEach(async () => { + mockPublicService = createMock(); + + await TestBed.configureTestingModule({ + declarations: [PfrsDetailsComponent], + providers: [ + { + provide: PublicService, + useValue: mockPublicService, + }, + ], + }).compileComponents(); + + fixture = TestBed.createComponent(PfrsDetailsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/public/notice-of-intent/submission/pfrs-details/pfrs-details.component.ts b/portal-frontend/src/app/features/public/notice-of-intent/submission/pfrs-details/pfrs-details.component.ts new file mode 100644 index 0000000000..36e47a3c9c --- /dev/null +++ b/portal-frontend/src/app/features/public/notice-of-intent/submission/pfrs-details/pfrs-details.component.ts @@ -0,0 +1,30 @@ +import { Component, Input } from '@angular/core'; +import { Router } from '@angular/router'; +import { PublicNoticeOfIntentSubmissionDto } from '../../../../../services/public/public-notice-of-intent.dto'; +import { PublicDocumentDto } from '../../../../../services/public/public.dto'; +import { PublicService } from '../../../../../services/public/public.service'; +import { DOCUMENT_TYPE } from '../../../../../shared/dto/document.dto'; + +@Component({ + selector: 'app-pfrs-details[noiSubmission]', + templateUrl: './pfrs-details.component.html', + styleUrls: ['./pfrs-details.component.scss'], +}) +export class PfrsDetailsComponent { + @Input() noiSubmission!: PublicNoticeOfIntentSubmissionDto; + + @Input() set noiDocuments(documents: PublicDocumentDto[]) { + this.crossSections = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.CROSS_SECTIONS); + this.proposalMap = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.PROPOSAL_MAP); + } + + crossSections: PublicDocumentDto[] = []; + proposalMap: PublicDocumentDto[] = []; + + constructor(private router: Router, private publicService: PublicService) {} + + async openFile(uuid: string) { + const res = await this.publicService.getNoticeOfIntentOpenFileUrl(this.noiSubmission.fileNumber, uuid); + window.open(res?.url, '_blank'); + } +} diff --git a/portal-frontend/src/app/features/public/notice-of-intent/submission/pofo-details/pofo-details.component.html b/portal-frontend/src/app/features/public/notice-of-intent/submission/pofo-details/pofo-details.component.html new file mode 100644 index 0000000000..41880152e9 --- /dev/null +++ b/portal-frontend/src/app/features/public/notice-of-intent/submission/pofo-details/pofo-details.component.html @@ -0,0 +1,130 @@ +<div *ngIf="noiSubmission" class="review-table"> + <div class="subheading2 grid-1"> + Has the ALC previously received an application or Notice of Intent for this proposal? + </div> + <div class="grid-double"> + <span *ngIf="noiSubmission.soilIsFollowUp !== null"> + {{ noiSubmission.soilIsFollowUp ? 'Yes' : 'No' }} + </span> + <app-no-data *ngIf="noiSubmission.soilIsFollowUp === null"></app-no-data> + </div> + + <div *ngIf="noiSubmission.soilIsFollowUp" class="subheading2 grid-1">Application or NOI ID</div> + <div *ngIf="noiSubmission.soilIsFollowUp" class="grid-double"> + {{ noiSubmission.soilFollowUpIDs }} + <app-no-data *ngIf="!noiSubmission.soilFollowUpIDs"></app-no-data> + </div> + + <div class="subheading2 grid-1">What is the purpose of the proposal?</div> + <div class="grid-double"> + {{ noiSubmission.purpose }} + <app-no-data *ngIf="!noiSubmission.purpose"></app-no-data> + </div> + + <div class="subheading2 grid-1">Describe the type, origin and quality of fill proposed to be placed.</div> + <div class="grid-double"> + {{ noiSubmission.soilFillTypeToPlace }} + <app-no-data *ngIf="!noiSubmission.soilFillTypeToPlace"></app-no-data> + </div> + + <div class="full-width soil-table"> + <div class="grid-1"></div> + <div class="grid-2"> + <strong> Fill to be Placed</strong> + </div> + <div class="grid-1"><strong>Volume</strong></div> + <div class="grid-2"> + {{ noiSubmission.soilToPlaceVolume }} + <span *ngIf="noiSubmission.soilToPlaceVolume">m<sup>3</sup></span> + <app-no-data *ngIf="!noiSubmission.soilToPlaceVolume"></app-no-data> + </div> + <div class="grid-1"><strong>Area</strong></div> + <div class="grid-2"> + {{ noiSubmission.soilToPlaceArea }} <span *ngIf="noiSubmission.soilToPlaceArea">m<sup>2</sup></span> + <app-no-data *ngIf="!noiSubmission.soilToPlaceArea"></app-no-data> + </div> + <div class="grid-1"><strong>Maximum Depth</strong></div> + <div class="grid-2"> + {{ noiSubmission.soilToPlaceMaximumDepth }} + <span *ngIf="noiSubmission.soilToPlaceMaximumDepth">m</span> + <app-no-data *ngIf="!noiSubmission.soilToPlaceMaximumDepth"></app-no-data> + </div> + <div class="grid-1"><strong>Average Depth</strong></div> + <div class="grid-2"> + {{ noiSubmission.soilToPlaceAverageDepth }} + <span *ngIf="noiSubmission.soilToPlaceAverageDepth">m</span> + <app-no-data *ngIf="!noiSubmission.soilToPlaceAverageDepth"></app-no-data> + </div> + </div> + + <div class="full-width soil-table"> + <div class="grid-1"></div> + <div class="grid-2"> + <strong> Fill already Placed</strong> + </div> + <div class="grid-1"><strong>Volume</strong></div> + <div class="grid-2"> + {{ noiSubmission.soilAlreadyPlacedVolume }} + <span *ngIf="noiSubmission.soilAlreadyPlacedVolume !== null">m<sup>3</sup></span> + <app-no-data *ngIf="noiSubmission.soilAlreadyPlacedVolume === null"></app-no-data> + </div> + <div class="grid-1"><strong>Area</strong></div> + <div class="grid-2"> + {{ noiSubmission.soilAlreadyPlacedArea }} + <span *ngIf="noiSubmission.soilAlreadyPlacedArea !== null">m<sup>2</sup></span> + <app-no-data *ngIf="noiSubmission.soilAlreadyPlacedArea === null"></app-no-data> + </div> + <div class="grid-1"><strong>Maximum Depth</strong></div> + <div class="grid-2"> + {{ noiSubmission.soilAlreadyPlacedMaximumDepth }} + <span *ngIf="noiSubmission.soilAlreadyPlacedMaximumDepth !== null">m</span> + <app-no-data *ngIf="noiSubmission.soilAlreadyPlacedMaximumDepth === null"></app-no-data> + </div> + <div class="grid-1"><strong>Average Depth</strong></div> + <div class="grid-2"> + {{ noiSubmission.soilAlreadyPlacedAverageDepth }} + <span *ngIf="noiSubmission.soilAlreadyPlacedAverageDepth !== null">m</span> + <app-no-data *ngIf="noiSubmission.soilAlreadyPlacedAverageDepth === null"></app-no-data> + </div> + </div> + + <div class="full-width"> + <h4>Project Duration</h4> + </div> + <div class="subheading2 grid-1">Duration</div> + <div class="grid-double"> + {{ noiSubmission.soilProjectDurationUnit }} + <app-no-data *ngIf="!noiSubmission.soilProjectDurationUnit"></app-no-data> + </div> + <div class="subheading2 grid-1">Length</div> + <div class="grid-double"> + {{ noiSubmission.soilProjectDurationAmount }} + <app-no-data *ngIf="!noiSubmission.soilProjectDurationAmount"></app-no-data> + </div> + + <div class="subheading2 grid-1">Proposal Map / Site Plan</div> + <div class="grid-double"> + <a *ngFor="let map of proposalMap" (click)="openFile(map.uuid)"> + {{ map.fileName }} + </a> + <app-no-data *ngIf="proposalMap.length === 0"></app-no-data> + </div> + + <div class="subheading2 grid-1">Is your proposal for area-wide filling?</div> + <div class="grid-double"> + <span *ngIf="noiSubmission.soilIsAreaWideFilling !== null"> + {{ noiSubmission.soilIsAreaWideFilling ? 'Yes' : 'No' }} + </span> + <app-no-data *ngIf="noiSubmission.soilIsAreaWideFilling === null"></app-no-data> + </div> + + <ng-container *ngIf="noiSubmission.soilIsAreaWideFilling"> + <div class="subheading2 grid-1">Cross Sections</div> + <div class="grid-double"> + <a *ngFor="let file of crossSections" (click)="openFile(file.uuid)"> + {{ file.fileName }} + </a> + <app-no-data *ngIf="crossSections.length === 0"></app-no-data> + </div> + </ng-container> +</div> diff --git a/portal-frontend/src/app/features/public/notice-of-intent/submission/pofo-details/pofo-details.component.scss b/portal-frontend/src/app/features/public/notice-of-intent/submission/pofo-details/pofo-details.component.scss new file mode 100644 index 0000000000..3f88d5363f --- /dev/null +++ b/portal-frontend/src/app/features/public/notice-of-intent/submission/pofo-details/pofo-details.component.scss @@ -0,0 +1,8 @@ +@use '../../../../../../styles/functions' as *; + +.soil-table { + .spacer-row { + grid-column: 1/4; + height: rem(16); + } +} diff --git a/portal-frontend/src/app/features/public/notice-of-intent/submission/pofo-details/pofo-details.component.spec.ts b/portal-frontend/src/app/features/public/notice-of-intent/submission/pofo-details/pofo-details.component.spec.ts new file mode 100644 index 0000000000..9013b9331a --- /dev/null +++ b/portal-frontend/src/app/features/public/notice-of-intent/submission/pofo-details/pofo-details.component.spec.ts @@ -0,0 +1,33 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { PublicService } from '../../../../../services/public/public.service'; + +import { PofoDetailsComponent } from './pofo-details.component'; + +describe('PofoDetailsComponent', () => { + let component: PofoDetailsComponent; + let fixture: ComponentFixture<PofoDetailsComponent>; + let mockPublicService: DeepMocked<PublicService>; + + beforeEach(async () => { + mockPublicService = createMock(); + + await TestBed.configureTestingModule({ + declarations: [PofoDetailsComponent], + providers: [ + { + provide: PublicService, + useValue: mockPublicService, + }, + ], + }).compileComponents(); + + fixture = TestBed.createComponent(PofoDetailsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/public/notice-of-intent/submission/pofo-details/pofo-details.component.ts b/portal-frontend/src/app/features/public/notice-of-intent/submission/pofo-details/pofo-details.component.ts new file mode 100644 index 0000000000..04a3e7a5cf --- /dev/null +++ b/portal-frontend/src/app/features/public/notice-of-intent/submission/pofo-details/pofo-details.component.ts @@ -0,0 +1,30 @@ +import { Component, Input } from '@angular/core'; +import { Router } from '@angular/router'; +import { PublicNoticeOfIntentSubmissionDto } from '../../../../../services/public/public-notice-of-intent.dto'; +import { PublicDocumentDto } from '../../../../../services/public/public.dto'; +import { PublicService } from '../../../../../services/public/public.service'; +import { DOCUMENT_TYPE } from '../../../../../shared/dto/document.dto'; + +@Component({ + selector: 'app-pofo-details[noiSubmission]', + templateUrl: './pofo-details.component.html', + styleUrls: ['./pofo-details.component.scss'], +}) +export class PofoDetailsComponent { + @Input() noiSubmission!: PublicNoticeOfIntentSubmissionDto; + + @Input() set noiDocuments(documents: PublicDocumentDto[]) { + this.crossSections = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.CROSS_SECTIONS); + this.proposalMap = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.PROPOSAL_MAP); + } + + crossSections: PublicDocumentDto[] = []; + proposalMap: PublicDocumentDto[] = []; + + constructor(private router: Router, private publicService: PublicService) {} + + async openFile(uuid: string) { + const res = await this.publicService.getNoticeOfIntentOpenFileUrl(this.noiSubmission.fileNumber, uuid); + window.open(res?.url, '_blank'); + } +} diff --git a/portal-frontend/src/app/features/public/notice-of-intent/submission/roso-details/roso-details.component.html b/portal-frontend/src/app/features/public/notice-of-intent/submission/roso-details/roso-details.component.html new file mode 100644 index 0000000000..e2b3f255b6 --- /dev/null +++ b/portal-frontend/src/app/features/public/notice-of-intent/submission/roso-details/roso-details.component.html @@ -0,0 +1,142 @@ +<div *ngIf="noiSubmission" class="review-table"> + <div class="subheading2 grid-1"> + Has the ALC previously received an application or Notice of Intent for this proposal? + </div> + <div class="grid-double"> + <span *ngIf="noiSubmission.soilIsFollowUp !== null"> + {{ noiSubmission.soilIsFollowUp ? 'Yes' : 'No' }} + </span> + <app-no-data *ngIf="noiSubmission.soilIsFollowUp === null"></app-no-data> + </div> + + <div *ngIf="noiSubmission.soilIsFollowUp" class="subheading2 grid-1">Application or NOI ID</div> + <div *ngIf="noiSubmission.soilIsFollowUp" class="grid-double"> + {{ noiSubmission.soilFollowUpIDs }} + <app-no-data *ngIf="!noiSubmission.soilFollowUpIDs"></app-no-data> + </div> + + <div class="subheading2 grid-1">What is the purpose of the proposal?</div> + <div class="grid-double"> + {{ noiSubmission.purpose }} + <app-no-data *ngIf="!noiSubmission.purpose"></app-no-data> + </div> + + <div class="subheading2 grid-1">Describe the type of soil proposed to be removed.</div> + <div class="grid-double"> + {{ noiSubmission.soilTypeRemoved }} + <app-no-data *ngIf="!noiSubmission.soilTypeRemoved"></app-no-data> + </div> + + <div class="subheading1 full-width"></div> + <div class="full-width soil-table"> + <div class="grid-1"></div> + <div class="grid-2"> + <strong>Soil to be Removed</strong> + </div> + <div class="grid-1"><strong>Volume</strong></div> + <div class="grid-2"> + {{ noiSubmission.soilToRemoveVolume }} + <span *ngIf="noiSubmission.soilToRemoveVolume">m<sup>3</sup></span> + <app-no-data *ngIf="!noiSubmission.soilToRemoveVolume"></app-no-data> + </div> + <div class="grid-1"><strong>Area</strong></div> + <div class="grid-2"> + {{ noiSubmission.soilToRemoveArea }} <span *ngIf="noiSubmission.soilToRemoveArea">ha</span> + <app-no-data *ngIf="!noiSubmission.soilToRemoveArea"></app-no-data> + </div> + <div class="grid-1"><strong>Maximum Depth</strong></div> + <div class="grid-2"> + {{ noiSubmission.soilToRemoveMaximumDepth }} + <span *ngIf="noiSubmission.soilToRemoveMaximumDepth">m</span> + <app-no-data *ngIf="!noiSubmission.soilToRemoveMaximumDepth"></app-no-data> + </div> + <div class="grid-1"><strong>Average Depth</strong></div> + <div class="grid-2"> + {{ noiSubmission.soilToRemoveAverageDepth }} + <span *ngIf="noiSubmission.soilToRemoveAverageDepth">m</span> + <app-no-data *ngIf="!noiSubmission.soilToRemoveAverageDepth"></app-no-data> + </div> + </div> + + <div class="subheading1 full-width"></div> + <div class="full-width soil-table"> + <div class="grid-1"></div> + <div class="grid-2"> + <strong>Soil already Removed</strong> + </div> + <div class="grid-1"><strong>Volume</strong></div> + <div class="grid-2"> + {{ noiSubmission.soilAlreadyRemovedVolume }} + <span *ngIf="noiSubmission.soilAlreadyRemovedVolume !== null">m<sup>3</sup></span> + <app-no-data *ngIf="noiSubmission.soilAlreadyRemovedVolume === null"></app-no-data> + </div> + <div class="grid-1"><strong>Area</strong></div> + <div class="grid-2"> + {{ noiSubmission.soilAlreadyRemovedArea }} + <span *ngIf="noiSubmission.soilAlreadyRemovedArea !== null">ha</span> + <app-no-data *ngIf="noiSubmission.soilAlreadyRemovedArea === null"></app-no-data> + </div> + <div class="grid-1"><strong>Maximum Depth</strong></div> + <div class="grid-2"> + {{ noiSubmission.soilAlreadyRemovedMaximumDepth }} + <span *ngIf="noiSubmission.soilAlreadyRemovedMaximumDepth !== null">m</span> + <app-no-data *ngIf="noiSubmission.soilAlreadyRemovedMaximumDepth === null"></app-no-data> + </div> + <div class="grid-1"><strong>Average Depth</strong></div> + <div class="grid-2"> + {{ noiSubmission.soilAlreadyRemovedAverageDepth }} + <span *ngIf="noiSubmission.soilAlreadyRemovedAverageDepth !== null">m</span> + <app-no-data *ngIf="noiSubmission.soilAlreadyRemovedAverageDepth === null"></app-no-data> + </div> + </div> + + <div class="full-width"> + <h4>Project Duration</h4> + </div> + <div class="subheading2 grid-1">Duration</div> + <div class="grid-double"> + {{ noiSubmission.soilProjectDurationUnit }} + <app-no-data *ngIf="!noiSubmission.soilProjectDurationUnit"></app-no-data> + </div> + <div class="subheading2 grid-1">Length</div> + <div class="grid-double"> + {{ noiSubmission.soilProjectDurationAmount }} + <app-no-data *ngIf="!noiSubmission.soilProjectDurationAmount"></app-no-data> + </div> + + <div class="subheading2 grid-1">Proposal Map / Site Plan</div> + <div class="grid-double"> + <a *ngFor="let map of proposalMap" (click)="openFile(map.uuid)"> + {{ map.fileName }} + </a> + <app-no-data *ngIf="proposalMap.length === 0"></app-no-data> + </div> + + <div class="subheading2 grid-1">Is your proposal for aggregate extraction or placer mining?</div> + <div class="grid-double"> + <span *ngIf="noiSubmission.soilIsExtractionOrMining !== null"> + {{ noiSubmission.soilIsExtractionOrMining ? 'Yes' : 'No' }} + </span> + <app-no-data *ngIf="noiSubmission.soilIsExtractionOrMining === null"></app-no-data> + </div> + + <ng-container *ngIf="noiSubmission?.soilIsExtractionOrMining"> + <div class="subheading2 grid-1">Cross Sections</div> + <div class="grid-double"> + <a *ngFor="let file of crossSections" (click)="openFile(file.uuid)"> + {{ file.fileName }} + </a> + <app-no-data *ngIf="crossSections.length === 0"></app-no-data> + </div> + + <div class="subheading2 grid-1"> + Have you submitted a Notice of Work to the Ministry of Energy, Mines and Low Carbon Innovation (EMLI)? + </div> + <div class="grid-double"> + <span *ngIf="noiSubmission.soilHasSubmittedNotice !== null"> + {{ noiSubmission.soilHasSubmittedNotice ? 'Yes' : 'No' }} + </span> + <app-no-data *ngIf="noiSubmission.soilHasSubmittedNotice === null"></app-no-data> + </div> + </ng-container> +</div> diff --git a/portal-frontend/src/app/features/public/notice-of-intent/submission/roso-details/roso-details.component.scss b/portal-frontend/src/app/features/public/notice-of-intent/submission/roso-details/roso-details.component.scss new file mode 100644 index 0000000000..e69de29bb2 diff --git a/portal-frontend/src/app/features/public/notice-of-intent/submission/roso-details/roso-details.component.spec.ts b/portal-frontend/src/app/features/public/notice-of-intent/submission/roso-details/roso-details.component.spec.ts new file mode 100644 index 0000000000..1a78d7acee --- /dev/null +++ b/portal-frontend/src/app/features/public/notice-of-intent/submission/roso-details/roso-details.component.spec.ts @@ -0,0 +1,33 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { PublicService } from '../../../../../services/public/public.service'; + +import { RosoDetailsComponent } from './roso-details.component'; + +describe('RosoDetailsComponent', () => { + let component: RosoDetailsComponent; + let fixture: ComponentFixture<RosoDetailsComponent>; + let mockPublicService: DeepMocked<PublicService>; + + beforeEach(async () => { + mockPublicService = createMock(); + + await TestBed.configureTestingModule({ + declarations: [RosoDetailsComponent], + providers: [ + { + provide: PublicService, + useValue: mockPublicService, + }, + ], + }).compileComponents(); + + fixture = TestBed.createComponent(RosoDetailsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/public/notice-of-intent/submission/roso-details/roso-details.component.ts b/portal-frontend/src/app/features/public/notice-of-intent/submission/roso-details/roso-details.component.ts new file mode 100644 index 0000000000..dbfba33f0b --- /dev/null +++ b/portal-frontend/src/app/features/public/notice-of-intent/submission/roso-details/roso-details.component.ts @@ -0,0 +1,30 @@ +import { Component, Input } from '@angular/core'; +import { Router } from '@angular/router'; +import { PublicNoticeOfIntentSubmissionDto } from '../../../../../services/public/public-notice-of-intent.dto'; +import { PublicDocumentDto } from '../../../../../services/public/public.dto'; +import { PublicService } from '../../../../../services/public/public.service'; +import { DOCUMENT_TYPE } from '../../../../../shared/dto/document.dto'; + +@Component({ + selector: 'app-roso-details[noiSubmission]', + templateUrl: './roso-details.component.html', + styleUrls: ['./roso-details.component.scss'], +}) +export class RosoDetailsComponent { + @Input() noiSubmission!: PublicNoticeOfIntentSubmissionDto; + + @Input() set noiDocuments(documents: PublicDocumentDto[]) { + this.crossSections = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.CROSS_SECTIONS); + this.proposalMap = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.PROPOSAL_MAP); + } + + crossSections: PublicDocumentDto[] = []; + proposalMap: PublicDocumentDto[] = []; + + constructor(private router: Router, private publicService: PublicService) {} + + async openFile(uuid: string) { + const res = await this.publicService.getNoticeOfIntentOpenFileUrl(this.noiSubmission.fileNumber, uuid); + window.open(res?.url, '_blank'); + } +} diff --git a/portal-frontend/src/app/features/public/notice-of-intent/submission/submission-details.component.html b/portal-frontend/src/app/features/public/notice-of-intent/submission/submission-details.component.html new file mode 100644 index 0000000000..bb1808e87c --- /dev/null +++ b/portal-frontend/src/app/features/public/notice-of-intent/submission/submission-details.component.html @@ -0,0 +1,130 @@ +<section> + <app-parcel [submission]="submission" [parcels]="parcels"></app-parcel> +</section> +<section> + <h3>Primary Contact</h3> + <div *ngIf="submission" class="review-table"> + <div class="subheading2 grid-1">Type</div> + <div class="grid-double"> + {{ primaryContact?.type?.label }} + <app-no-data *ngIf="!primaryContact?.type?.label"></app-no-data> + </div> + <div class="subheading2 grid-1">First Name</div> + <div class="grid-double"> + {{ primaryContact?.firstName }} + <app-no-data *ngIf="!primaryContact?.firstName"></app-no-data> + </div> + <div class="subheading2 grid-1">Last Name</div> + <div class="grid-double"> + {{ primaryContact?.lastName }} + <app-no-data *ngIf="!primaryContact?.lastName"></app-no-data> + </div> + <div class="subheading2 grid-1"> + <span + *ngIf="primaryContact?.type?.code !== OWNER_TYPE.CROWN && primaryContact?.type?.code !== OWNER_TYPE.GOVERNMENT" + >Organization (optional)</span + > + <span *ngIf="primaryContact?.type?.code === OWNER_TYPE.CROWN">Ministry/Department Responsible</span> + <span *ngIf="primaryContact?.type?.code === OWNER_TYPE.GOVERNMENT">Department</span> + </div> + <div class="grid-double"> + {{ primaryContact?.organizationName }} + <app-no-data *ngIf="!primaryContact?.organizationName"></app-no-data> + </div> + </div> +</section> +<section> + <h3>Government</h3> + <div *ngIf="submission" class="review-table"> + <div class="subheading2 grid-1">Local or First Nation Government</div> + <div class="grid-double"> + {{ localGovernment?.name }} + <app-no-data *ngIf="!localGovernment"></app-no-data> + </div> + </div> +</section> +<section> + <h3>Land Use</h3> + <div *ngIf="submission" class="review-table"> + <div class="full-width"> + <h4>Land Use of Parcel(s) under Application</h4> + </div> + <div class="subheading2 grid-1">Describe all agriculture that currently takes place on the parcel(s).</div> + <div class="grid-double"> + {{ submission.parcelsAgricultureDescription }} + <app-no-data *ngIf="!submission.parcelsAgricultureDescription"></app-no-data> + </div> + <div class="subheading2 grid-1">Describe all agricultural improvements made to the parcel(s).</div> + <div class="grid-double"> + {{ submission.parcelsAgricultureImprovementDescription }} + <app-no-data *ngIf="!submission.parcelsAgricultureImprovementDescription"></app-no-data> + </div> + <div class="subheading2 grid-1">Describe all other uses that currently take place on the parcel(s).</div> + <div class="grid-double"> + {{ submission.parcelsNonAgricultureUseDescription }} + <app-no-data *ngIf="!submission.parcelsNonAgricultureUseDescription"></app-no-data> + </div> + <div class="full-width"> + <h4>Land Use of Adjacent Parcels</h4> + </div> + <div class="adjacent-parcels full-width"> + <div class="grid-1 subheading2"></div> + <div class="grid-2 subheading2">Main Land Use Type</div> + <div class="grid-3 subheading2">Specific Activity</div> + <div class="grid-1 subheading2">North</div> + <div class="grid-2"> + {{ submission.northLandUseType }} + <app-no-data *ngIf="!submission.northLandUseType"></app-no-data> + </div> + <div class="grid-3"> + {{ submission.northLandUseTypeDescription }} + <app-no-data *ngIf="!submission.northLandUseTypeDescription"></app-no-data> + </div> + <div class="grid-1 subheading2">East</div> + <div class="grid-2"> + {{ submission.eastLandUseType }} + <app-no-data *ngIf="!submission.eastLandUseType"></app-no-data> + </div> + <div class="grid-3"> + {{ submission.eastLandUseTypeDescription }} + <app-no-data *ngIf="!submission.eastLandUseTypeDescription"></app-no-data> + </div> + <div class="grid-1 subheading2">South</div> + <div class="grid-2"> + {{ submission.southLandUseType }} + <app-no-data *ngIf="!submission.southLandUseType"></app-no-data> + </div> + <div class="grid-3"> + {{ submission.southLandUseTypeDescription }} + <app-no-data *ngIf="!submission.southLandUseTypeDescription"></app-no-data> + </div> + <div class="grid-1 subheading2">West</div> + <div class="grid-2"> + {{ submission.westLandUseType }} + <app-no-data *ngIf="!submission.westLandUseType"></app-no-data> + </div> + <div class="grid-3"> + {{ submission.westLandUseTypeDescription }} + <app-no-data *ngIf="!submission.westLandUseTypeDescription"></app-no-data> + </div> + </div> + </div> +</section> +<section *ngIf="submission"> + <h3>Proposal</h3> + <app-roso-details + *ngIf="submission.typeCode === 'ROSO'" + [noiSubmission]="submission" + [noiDocuments]="documents" + ></app-roso-details> + <app-pofo-details + *ngIf="submission.typeCode === 'POFO'" + [noiSubmission]="submission" + [noiDocuments]="documents" + ></app-pofo-details> + <app-pfrs-details + *ngIf="submission.typeCode === 'PFRS'" + [noiSubmission]="submission" + [noiDocuments]="documents" + ></app-pfrs-details> +</section> diff --git a/portal-frontend/src/app/features/public/notice-of-intent/submission/submission-details.component.scss b/portal-frontend/src/app/features/public/notice-of-intent/submission/submission-details.component.scss new file mode 100644 index 0000000000..8aae88078a --- /dev/null +++ b/portal-frontend/src/app/features/public/notice-of-intent/submission/submission-details.component.scss @@ -0,0 +1,143 @@ +@use '../../../../../styles/functions' as *; +@use '../../../../../styles/colors'; + +:host::ng-deep { + .view-grid-item { + display: grid; + grid-template-columns: minmax(rem(100), 0.5fr) 1fr; + column-gap: rem(16); + margin-bottom: rem(12); + } + + .details-wrapper { + margin-top: rem(24); + margin-bottom: rem(24); + + .title { + margin-bottom: rem(16) !important; + } + } + + h3 .subtext { + margin: 0.5rem 0 !important; + } + + label { + font-weight: 600; + } + + .no-data-text { + text-align: center; + color: colors.$grey; + padding-top: rem(12); + + .error { + justify-content: center; + } + } + + .custom-mat-expansion-panel-header { + height: fit-content; + } + + .table-wrapper { + overflow-x: auto; + width: 100%; + } + + @media screen and (min-width: $tabletBreakpoint) { + .flex-item { + display: flex; + gap: rem(16); + } + } +} + +:host::ng-deep { + .scrollable { + overflow-x: auto; + } + + .other-attachments { + display: grid; + grid-template-columns: max-content max-content max-content; + overflow-x: auto; + grid-column-gap: rem(36); + grid-row-gap: rem(12); + + .full-width { + grid-column: 1/3; + } + } + + .adjacent-parcels { + display: grid; + grid-template-columns: max-content max-content max-content; + overflow-x: auto; + grid-column-gap: rem(36); + grid-row-gap: rem(12); + + .full-width { + grid-column: 1/4; + } + } + + .review-table { + padding: rem(8); + margin: rem(12) 0 rem(20) 0; + background-color: colors.$grey-light; + display: grid; + grid-row-gap: rem(24); + grid-column-gap: rem(16); + grid-template-columns: 1fr; + word-wrap: break-word; + hyphens: auto; + + .edit-button { + display: flex; + justify-content: center; + + button { + width: 100%; + + @media screen and (min-width: $tabletBreakpoint) { + width: unset; + } + } + } + + .subheading2 { + margin-bottom: rem(4) !important; + } + + @media screen and (min-width: $tabletBreakpoint) { + padding: rem(16); + margin: rem(24) 0 rem(40) 0; + grid-template-columns: minmax(rem(60), 1fr) minmax(rem(60), 1fr) minmax(rem(60), 1fr) minmax(rem(60), 1fr); + + .full-width { + grid-column: 1/5; + } + + .grid-double { + grid-column: 2/5; + } + + .grid-1 { + grid-column: 1/2; + } + + .grid-2 { + grid-column: 2/3; + } + + .grid-3 { + grid-column: 3/5; + } + + .edit-button { + grid-column: 1/5; + } + } + } +} diff --git a/portal-frontend/src/app/features/public/notice-of-intent/submission/submission-details.component.spec.ts b/portal-frontend/src/app/features/public/notice-of-intent/submission/submission-details.component.spec.ts new file mode 100644 index 0000000000..a06f7a8d15 --- /dev/null +++ b/portal-frontend/src/app/features/public/notice-of-intent/submission/submission-details.component.spec.ts @@ -0,0 +1,42 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; +import { CodeService } from '../../../../services/code/code.service'; + +import { SubmissionDetailsComponent } from './submission-details.component'; + +describe('SubmissionDetailsComponent', () => { + let component: SubmissionDetailsComponent; + let fixture: ComponentFixture<SubmissionDetailsComponent>; + let mockCodeService: DeepMocked<CodeService>; + let mockAppDocumentService: DeepMocked<ApplicationDocumentService>; + + beforeEach(async () => { + mockCodeService = createMock(); + mockAppDocumentService = createMock(); + + await TestBed.configureTestingModule({ + providers: [ + { + provide: CodeService, + useValue: mockCodeService, + }, + { + provide: ApplicationDocumentService, + useValue: mockAppDocumentService, + }, + ], + declarations: [SubmissionDetailsComponent], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(SubmissionDetailsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/public/notice-of-intent/submission/submission-details.component.ts b/portal-frontend/src/app/features/public/notice-of-intent/submission/submission-details.component.ts new file mode 100644 index 0000000000..92def23ca1 --- /dev/null +++ b/portal-frontend/src/app/features/public/notice-of-intent/submission/submission-details.component.ts @@ -0,0 +1,66 @@ +import { Component, Input, OnDestroy, OnInit } from '@angular/core'; +import { Subject } from 'rxjs'; +import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; +import { PARCEL_TYPE } from '../../../../services/application-parcel/application-parcel.dto'; +import { LocalGovernmentDto } from '../../../../services/code/code.dto'; +import { CodeService } from '../../../../services/code/code.service'; +import { PublicNoticeOfIntentSubmissionDto } from '../../../../services/public/public-notice-of-intent.dto'; +import { PublicDocumentDto, PublicOwnerDto, PublicParcelDto } from '../../../../services/public/public.dto'; +import { OWNER_TYPE } from '../../../../shared/dto/owner.dto'; + +@Component({ + selector: 'app-public-app-submission-details', + templateUrl: './submission-details.component.html', + styleUrls: ['./submission-details.component.scss'], +}) +export class SubmissionDetailsComponent implements OnInit, OnDestroy { + $destroy = new Subject<void>(); + + @Input() submission!: PublicNoticeOfIntentSubmissionDto; + @Input() documents: PublicDocumentDto[] = []; + @Input() parcels: PublicParcelDto[] = []; + + parcelType = PARCEL_TYPE; + primaryContact: PublicOwnerDto | undefined; + localGovernment: LocalGovernmentDto | undefined; + OWNER_TYPE = OWNER_TYPE; + + private localGovernments: LocalGovernmentDto[] = []; + + constructor(private codeService: CodeService, private applicationDocumentService: ApplicationDocumentService) {} + + ngOnInit(): void { + this.loadGovernments(); + if (this.submission) { + this.primaryContact = this.submission.owners.find( + (owner) => owner.uuid === this.submission.primaryContactOwnerUuid + ); + this.populateLocalGovernment(this.submission.localGovernmentUuid); + } + } + + ngOnDestroy(): void { + this.$destroy.next(); + this.$destroy.complete(); + } + + async openFile(uuid: string) { + const res = await this.applicationDocumentService.openFile(uuid); + window.open(res?.url, '_blank'); + } + + private async loadGovernments() { + const codes = await this.codeService.loadCodes(); + this.localGovernments = codes.localGovernments.sort((a, b) => (a.name > b.name ? 1 : -1)); + if (this.submission?.localGovernmentUuid) { + this.populateLocalGovernment(this.submission?.localGovernmentUuid); + } + } + + private populateLocalGovernment(governmentUuid: string) { + const lg = this.localGovernments.find((lg) => lg.uuid === governmentUuid); + if (lg) { + this.localGovernment = lg; + } + } +} diff --git a/portal-frontend/src/app/features/public/public.module.ts b/portal-frontend/src/app/features/public/public.module.ts index d4df75e0df..7ed11a0b8e 100644 --- a/portal-frontend/src/app/features/public/public.module.ts +++ b/portal-frontend/src/app/features/public/public.module.ts @@ -6,12 +6,6 @@ import { MatSortModule } from '@angular/material/sort'; import { MatTreeModule } from '@angular/material/tree'; import { RouterModule, Routes } from '@angular/router'; import { SharedModule } from '../../shared/shared.module'; -import { PublicAlcReviewComponent } from './application/alc-review/alc-review.component'; -import { PublicDecisionsComponent } from './application/alc-review/decisions/decisions.component'; -import { PublicSubmissionDocumentsComponent } from './application/alc-review/submission-documents/submission-documents.component'; -import { PublicLfngReviewComponent } from './application/lfng-review/lfng-review.component'; -import { PublicApplicationComponent } from './application/public-application.component'; -import { SubmissionDetailsModule } from './application/submission/submission-details.module'; import { ApplicationSearchTableComponent } from './search/application-search-table/application-search-table.component'; import { FileTypeFilterDropDownComponent } from './search/file-type-filter-drop-down/file-type-filter-drop-down.component'; import { NoticeOfIntentSearchTableComponent } from './search/notice-of-intent-search-table/notice-of-intent-search-table.component'; @@ -25,8 +19,13 @@ const routes: Routes = [ component: PublicSearchComponent, }, { - path: 'application/:fileId', - component: PublicApplicationComponent, + path: 'application', + loadChildren: () => import('./application/public-application.module').then((m) => m.PublicApplicationModule), + }, + { + path: 'notice-of-intent', + loadChildren: () => + import('./notice-of-intent/public-notice-of-intent.module').then((m) => m.PublicNoticeOfIntentModule), }, ]; @@ -38,11 +37,6 @@ const routes: Routes = [ ApplicationSearchTableComponent, FileTypeFilterDropDownComponent, SearchListComponent, - PublicApplicationComponent, - PublicLfngReviewComponent, - PublicAlcReviewComponent, - PublicSubmissionDocumentsComponent, - PublicDecisionsComponent, ], imports: [ CommonModule, @@ -52,7 +46,6 @@ const routes: Routes = [ RouterModule.forChild(routes), MatAutocompleteModule, MatTreeModule, - SubmissionDetailsModule, ], }) export class PublicModule {} diff --git a/portal-frontend/src/app/services/application-decision/application-decision.service.ts b/portal-frontend/src/app/services/application-decision/application-decision.service.ts index 0f6df323ec..2e0806934f 100644 --- a/portal-frontend/src/app/services/application-decision/application-decision.service.ts +++ b/portal-frontend/src/app/services/application-decision/application-decision.service.ts @@ -9,14 +9,14 @@ import { ApplicationPortalDecisionDto } from './application-decision.dto'; providedIn: 'root', }) export class ApplicationDecisionService { - private serviceUrl = `${environment.apiUrl}/application-decision`; + private serviceUrl = `${environment.apiUrl}/public/application/decision`; constructor(private httpClient: HttpClient, private toastService: ToastService) {} async getByFileId(fileNumber: string) { try { return await firstValueFrom( - this.httpClient.get<ApplicationPortalDecisionDto[]>(`${this.serviceUrl}/application/${fileNumber}`) + this.httpClient.get<ApplicationPortalDecisionDto[]>(`${this.serviceUrl}/${fileNumber}`) ); } catch (e) { console.error(e); diff --git a/portal-frontend/src/app/services/notice-of-intent-decision/notice-of-intent-decision.service.ts b/portal-frontend/src/app/services/notice-of-intent-decision/notice-of-intent-decision.service.ts index 4268cc31d3..c145a744ba 100644 --- a/portal-frontend/src/app/services/notice-of-intent-decision/notice-of-intent-decision.service.ts +++ b/portal-frontend/src/app/services/notice-of-intent-decision/notice-of-intent-decision.service.ts @@ -9,14 +9,14 @@ import { NoticeOfIntentPortalDecisionDto } from './notice-of-intent-decision.dto providedIn: 'root', }) export class NoticeOfIntentDecisionService { - private serviceUrl = `${environment.apiUrl}/notice-of-intent-decision`; + private serviceUrl = `${environment.apiUrl}/public/notice-of-intent/decision`; constructor(private httpClient: HttpClient, private toastService: ToastService) {} async getByFileId(fileNumber: string) { try { return await firstValueFrom( - this.httpClient.get<NoticeOfIntentPortalDecisionDto[]>(`${this.serviceUrl}/notice-of-intent/${fileNumber}`) + this.httpClient.get<NoticeOfIntentPortalDecisionDto[]>(`${this.serviceUrl}/${fileNumber}`) ); } catch (e) { console.error(e); diff --git a/portal-frontend/src/app/services/public/public-application.dto.ts b/portal-frontend/src/app/services/public/public-application.dto.ts new file mode 100644 index 0000000000..35264573ff --- /dev/null +++ b/portal-frontend/src/app/services/public/public-application.dto.ts @@ -0,0 +1,144 @@ +import { ApplicationPortalDecisionDto } from '../application-decision/application-decision.dto'; +import { + ApplicationStatusDto, + NaruSubtypeDto, + ProposedLot, +} from '../application-submission/application-submission.dto'; +import { PublicParcelDto, PublicDocumentDto, PublicOwnerDto } from './public.dto'; + +export interface GetPublicApplicationResponseDto { + submission: PublicApplicationSubmissionDto; + parcels: PublicParcelDto[]; + documents: PublicDocumentDto[]; + review?: PublicApplicationSubmissionReviewDto; + decisions: ApplicationPortalDecisionDto[]; +} + +export interface PublicApplicationSubmissionDto { + fileNumber: string; + uuid: string; + createdAt: number; + updatedAt: number; + applicant: string; + localGovernmentUuid: string; + lastStatusUpdate: number; + status: ApplicationStatusDto; + owners: PublicOwnerDto[]; + type: string; + typeCode: string; + purpose: string | null; + parcelsAgricultureDescription: string; + parcelsAgricultureImprovementDescription: string; + parcelsNonAgricultureUseDescription: string; + northLandUseType: string; + northLandUseTypeDescription: string; + eastLandUseType: string; + eastLandUseTypeDescription: string; + southLandUseType: string; + southLandUseTypeDescription: string; + westLandUseType: string; + westLandUseTypeDescription: string; + primaryContactOwnerUuid?: string | null; + + //NFU Specific Fields + nfuHectares?: number | null; + nfuOutsideLands?: string | null; + nfuAgricultureSupport?: string | null; + nfuWillImportFill?: boolean | null; + nfuTotalFillArea?: number | null; + nfuMaxFillDepth?: number | null; + nfuAverageFillDepth?: number | null; + nfuFillVolume?: number | null; + nfuProjectDurationAmount?: number | null; + nfuProjectDurationUnit?: string | null; + nfuFillTypeDescription?: string | null; + nfuFillOriginDescription?: string | null; + + //TUR Fields + turAgriculturalActivities?: string | null; + turReduceNegativeImpacts?: string | null; + turOutsideLands?: string | null; + turTotalCorridorArea?: number | null; + turAllOwnersNotified?: boolean | null; + + //Subdivision Fields + subdSuitability?: string | null; + subdAgricultureSupport?: string | null; + subdIsHomeSiteSeverance?: boolean | null; + subdProposedLots: ProposedLot[]; + + //Soil Fields + soilIsFollowUp: boolean | null; + soilFollowUpIDs: string | null; + soilTypeRemoved: string | null; + soilReduceNegativeImpacts: string | null; + soilToRemoveVolume: number | null; + soilToRemoveArea: number | null; + soilToRemoveMaximumDepth: number | null; + soilToRemoveAverageDepth: number | null; + soilAlreadyRemovedVolume: number | null; + soilAlreadyRemovedArea: number | null; + soilAlreadyRemovedMaximumDepth: number | null; + soilAlreadyRemovedAverageDepth: number | null; + soilToPlaceVolume: number | null; + soilToPlaceArea: number | null; + soilToPlaceMaximumDepth: number | null; + soilToPlaceAverageDepth: number | null; + soilAlreadyPlacedVolume: number | null; + soilAlreadyPlacedArea: number | null; + soilAlreadyPlacedMaximumDepth: number | null; + soilAlreadyPlacedAverageDepth: number | null; + soilProjectDurationAmount: number | null; + soilProjectDurationUnit?: string | null; + soilFillTypeToPlace?: string | null; + soilAlternativeMeasures?: string | null; + soilIsExtractionOrMining?: boolean; + soilHasSubmittedNotice?: boolean; + + //NARU Fields + naruSubtype: NaruSubtypeDto | null; + naruFloorArea: number | null; + naruResidenceNecessity: string | null; + naruLocationRationale: string | null; + naruInfrastructure: string | null; + naruExistingStructures: string | null; + naruWillImportFill: boolean | null; + naruFillType: string | null; + naruFillOrigin: string | null; + naruProjectDurationAmount: number | null; + naruProjectDurationUnit: string | null; + naruToPlaceVolume: number | null; + naruToPlaceArea: number | null; + naruToPlaceMaximumDepth: number | null; + naruToPlaceAverageDepth: number | null; + naruSleepingUnits: number | null; + naruAgriTourism: string | null; + + //Inclusion / Exclusion Fields + prescribedBody: string | null; + inclExclHectares: number | null; + exclWhyLand: string | null; + inclAgricultureSupport: string | null; + inclImprovements: string | null; + exclShareGovernmentBorders: boolean | null; + inclGovernmentOwnsAllParcels?: boolean | null; +} + +export interface PublicApplicationSubmissionReviewDto { + applicationFileNumber: string; + localGovernmentFileNumber: string | null; + firstName: string | null; + lastName: string | null; + position: string | null; + department: string | null; + isOCPDesignation: boolean | null; + OCPBylawName: string | null; + OCPDesignation: string | null; + OCPConsistent: boolean | null; + isSubjectToZoning: boolean | null; + zoningBylawName: string | null; + zoningDesignation: string | null; + zoningMinimumLotSize: string | null; + isZoningConsistent: boolean | null; + isAuthorized: boolean | null; +} diff --git a/portal-frontend/src/app/services/public/public-notice-of-intent.dto.ts b/portal-frontend/src/app/services/public/public-notice-of-intent.dto.ts new file mode 100644 index 0000000000..aa608c0699 --- /dev/null +++ b/portal-frontend/src/app/services/public/public-notice-of-intent.dto.ts @@ -0,0 +1,73 @@ +import { ApplicationStatusDto } from '../application-submission/application-submission.dto'; +import { NoticeOfIntentPortalDecisionDto } from '../notice-of-intent-decision/notice-of-intent-decision.dto'; +import { ProposedStructure } from '../notice-of-intent-submission/notice-of-intent-submission.dto'; +import { PublicDocumentDto, PublicOwnerDto, PublicParcelDto } from './public.dto'; + +export interface GetPublicNoticeOfIntentResponseDto { + submission: PublicNoticeOfIntentSubmissionDto; + parcels: PublicParcelDto[]; + documents: PublicDocumentDto[]; + decisions: NoticeOfIntentPortalDecisionDto[]; +} + +export interface PublicNoticeOfIntentSubmissionDto { + fileNumber: string; + uuid: string; + createdAt: number; + updatedAt: number; + applicant: string; + localGovernmentUuid: string; + hasOtherParcelsInCommunity?: boolean | null; + lastStatusUpdate: number; + status: ApplicationStatusDto; + owners: PublicOwnerDto[]; + type: string; + typeCode: string; + purpose: string | null; + parcelsAgricultureDescription: string; + parcelsAgricultureImprovementDescription: string; + parcelsNonAgricultureUseDescription: string; + northLandUseType: string; + northLandUseTypeDescription: string; + eastLandUseType: string; + eastLandUseTypeDescription: string; + southLandUseType: string; + southLandUseTypeDescription: string; + westLandUseType: string; + westLandUseTypeDescription: string; + primaryContactOwnerUuid?: string | null; + + //Soil Fields + soilIsFollowUp: boolean | null; + soilFollowUpIDs: string | null; + soilTypeRemoved: string | null; + soilToRemoveVolume: number | null; + soilToRemoveArea: number | null; + soilToRemoveMaximumDepth: number | null; + soilToRemoveAverageDepth: number | null; + soilAlreadyRemovedVolume: number | null; + soilAlreadyRemovedArea: number | null; + soilAlreadyRemovedMaximumDepth: number | null; + soilAlreadyRemovedAverageDepth: number | null; + soilToPlaceVolume: number | null; + soilToPlaceArea: number | null; + soilToPlaceMaximumDepth: number | null; + soilToPlaceAverageDepth: number | null; + soilAlreadyPlacedVolume: number | null; + soilAlreadyPlacedArea: number | null; + soilAlreadyPlacedMaximumDepth: number | null; + soilAlreadyPlacedAverageDepth: number | null; + soilProjectDurationAmount: number | null; + soilProjectDurationUnit?: string | null; + soilFillTypeToPlace?: string | null; + soilIsExtractionOrMining?: boolean; + soilIsAreaWideFilling?: boolean; + soilHasSubmittedNotice?: boolean; + soilIsRemovingSoilForNewStructure?: boolean; + soilStructureFarmUseReason?: string | null; + soilStructureResidentialUseReason?: string | null; + soilAgriParcelActivity?: string | null; + soilStructureResidentialAccessoryUseReason?: string | null; + soilStructureOtherUseReason?: string | null; + soilProposedStructures: ProposedStructure[]; +} diff --git a/portal-frontend/src/app/services/public/public.dto.ts b/portal-frontend/src/app/services/public/public.dto.ts index ba6f3031d3..ead6fd8dbf 100644 --- a/portal-frontend/src/app/services/public/public.dto.ts +++ b/portal-frontend/src/app/services/public/public.dto.ts @@ -1,20 +1,6 @@ import { BaseCodeDto } from '../../shared/dto/base.dto'; import { DocumentTypeDto } from '../../shared/dto/document.dto'; import { OwnerTypeDto } from '../../shared/dto/owner.dto'; -import { ApplicationPortalDecisionDto } from '../application-decision/application-decision.dto'; -import { - ApplicationStatusDto, - NaruSubtypeDto, - ProposedLot, -} from '../application-submission/application-submission.dto'; - -export interface GetPublicApplicationResponseDto { - submission: PublicApplicationSubmissionDto; - parcels: PublicApplicationParcelDto[]; - documents: PublicDocumentDto[]; - review?: PublicApplicationSubmissionReviewDto; - decisions: ApplicationPortalDecisionDto[]; -} export interface PublicOwnerDto { uuid: string; @@ -25,136 +11,18 @@ export interface PublicOwnerDto { type: OwnerTypeDto; } -export interface PublicApplicationSubmissionDto { - fileNumber: string; +export interface PublicDocumentDto { + description?: string; uuid: string; - createdAt: number; - updatedAt: number; - applicant: string; - localGovernmentUuid: string; - lastStatusUpdate: number; - status: ApplicationStatusDto; - owners: PublicOwnerDto[]; - type: string; - typeCode: string; - purpose: string | null; - parcelsAgricultureDescription: string; - parcelsAgricultureImprovementDescription: string; - parcelsNonAgricultureUseDescription: string; - northLandUseType: string; - northLandUseTypeDescription: string; - eastLandUseType: string; - eastLandUseTypeDescription: string; - southLandUseType: string; - southLandUseTypeDescription: string; - westLandUseType: string; - westLandUseTypeDescription: string; - primaryContactOwnerUuid?: string | null; - - //NFU Specific Fields - nfuHectares?: number | null; - nfuOutsideLands?: string | null; - nfuAgricultureSupport?: string | null; - nfuWillImportFill?: boolean | null; - nfuTotalFillArea?: number | null; - nfuMaxFillDepth?: number | null; - nfuAverageFillDepth?: number | null; - nfuFillVolume?: number | null; - nfuProjectDurationAmount?: number | null; - nfuProjectDurationUnit?: string | null; - nfuFillTypeDescription?: string | null; - nfuFillOriginDescription?: string | null; - - //TUR Fields - turAgriculturalActivities?: string | null; - turReduceNegativeImpacts?: string | null; - turOutsideLands?: string | null; - turTotalCorridorArea?: number | null; - turAllOwnersNotified?: boolean | null; - - //Subdivision Fields - subdSuitability?: string | null; - subdAgricultureSupport?: string | null; - subdIsHomeSiteSeverance?: boolean | null; - subdProposedLots: ProposedLot[]; - - //Soil Fields - soilIsFollowUp: boolean | null; - soilFollowUpIDs: string | null; - soilTypeRemoved: string | null; - soilReduceNegativeImpacts: string | null; - soilToRemoveVolume: number | null; - soilToRemoveArea: number | null; - soilToRemoveMaximumDepth: number | null; - soilToRemoveAverageDepth: number | null; - soilAlreadyRemovedVolume: number | null; - soilAlreadyRemovedArea: number | null; - soilAlreadyRemovedMaximumDepth: number | null; - soilAlreadyRemovedAverageDepth: number | null; - soilToPlaceVolume: number | null; - soilToPlaceArea: number | null; - soilToPlaceMaximumDepth: number | null; - soilToPlaceAverageDepth: number | null; - soilAlreadyPlacedVolume: number | null; - soilAlreadyPlacedArea: number | null; - soilAlreadyPlacedMaximumDepth: number | null; - soilAlreadyPlacedAverageDepth: number | null; - soilProjectDurationAmount: number | null; - soilProjectDurationUnit?: string | null; - soilFillTypeToPlace?: string | null; - soilAlternativeMeasures?: string | null; - soilIsExtractionOrMining?: boolean; - soilHasSubmittedNotice?: boolean; - - //NARU Fields - naruSubtype: NaruSubtypeDto | null; - naruFloorArea: number | null; - naruResidenceNecessity: string | null; - naruLocationRationale: string | null; - naruInfrastructure: string | null; - naruExistingStructures: string | null; - naruWillImportFill: boolean | null; - naruFillType: string | null; - naruFillOrigin: string | null; - naruProjectDurationAmount: number | null; - naruProjectDurationUnit: string | null; - naruToPlaceVolume: number | null; - naruToPlaceArea: number | null; - naruToPlaceMaximumDepth: number | null; - naruToPlaceAverageDepth: number | null; - naruSleepingUnits: number | null; - naruAgriTourism: string | null; - - //Inclusion / Exclusion Fields - prescribedBody: string | null; - inclExclHectares: number | null; - exclWhyLand: string | null; - inclAgricultureSupport: string | null; - inclImprovements: string | null; - exclShareGovernmentBorders: boolean | null; - inclGovernmentOwnsAllParcels?: boolean | null; -} - -export interface PublicApplicationSubmissionReviewDto { - applicationFileNumber: string; - localGovernmentFileNumber: string | null; - firstName: string | null; - lastName: string | null; - position: string | null; - department: string | null; - isOCPDesignation: boolean | null; - OCPBylawName: string | null; - OCPDesignation: string | null; - OCPConsistent: boolean | null; - isSubjectToZoning: boolean | null; - zoningBylawName: string | null; - zoningDesignation: string | null; - zoningMinimumLotSize: string | null; - isZoningConsistent: boolean | null; - isAuthorized: boolean | null; + type?: DocumentTypeDto; + documentUuid: string; + fileName: string; + fileSize?: number; + mimeType: string; + uploadedAt: number; } -export interface PublicApplicationParcelDto { +export interface PublicParcelDto { uuid: string; pid?: string | null; pin?: string | null; @@ -170,14 +38,3 @@ export interface PublicApplicationParcelDto { alrArea: number | null; owners: PublicOwnerDto[]; } - -export interface PublicDocumentDto { - description?: string; - uuid: string; - type?: DocumentTypeDto; - documentUuid: string; - fileName: string; - fileSize?: number; - mimeType: string; - uploadedAt: number; -} diff --git a/portal-frontend/src/app/services/public/public.service.spec.ts b/portal-frontend/src/app/services/public/public.service.spec.ts index 3ecc7eed9c..f005ebfa28 100644 --- a/portal-frontend/src/app/services/public/public.service.spec.ts +++ b/portal-frontend/src/app/services/public/public.service.spec.ts @@ -45,7 +45,7 @@ describe('PublicService', () => { it('should call get for loading application files', async () => { mockHttpClient.get.mockReturnValue(of({})); - const res = await service.getApplicationFileUrl('fileId', 'documentUuid'); + const res = await service.getApplicationOpenFileUrl('fileId', 'documentUuid'); expect(mockHttpClient.get).toHaveBeenCalledTimes(1); expect(res).toBeDefined(); diff --git a/portal-frontend/src/app/services/public/public.service.ts b/portal-frontend/src/app/services/public/public.service.ts index b7021b2c5e..2b8ffef848 100644 --- a/portal-frontend/src/app/services/public/public.service.ts +++ b/portal-frontend/src/app/services/public/public.service.ts @@ -3,7 +3,8 @@ import { Injectable } from '@angular/core'; import { firstValueFrom } from 'rxjs'; import { environment } from '../../../environments/environment'; import { ToastService } from '../toast/toast.service'; -import { GetPublicApplicationResponseDto } from './public.dto'; +import { GetPublicApplicationResponseDto } from './public-application.dto'; +import { GetPublicNoticeOfIntentResponseDto } from './public-notice-of-intent.dto'; @Injectable({ providedIn: 'root', @@ -25,7 +26,7 @@ export class PublicService { } } - async getApplicationFileUrl(fileId: string, uuid: string) { + async getApplicationOpenFileUrl(fileId: string, uuid: string) { try { return await firstValueFrom( this.httpClient.get<{ url: string }>(`${this.serviceUrl}/application/${fileId}/${uuid}/open`) @@ -36,4 +37,28 @@ export class PublicService { return undefined; } } + + async getNoticeOfIntent(fileId: string) { + try { + return await firstValueFrom( + this.httpClient.get<GetPublicNoticeOfIntentResponseDto>(`${this.serviceUrl}/notice-of-intent/${fileId}`) + ); + } catch (e) { + console.error(e); + this.toastService.showErrorToast('Failed to load Notice of Intent, please try again later'); + return undefined; + } + } + + async getNoticeOfIntentOpenFileUrl(fileId: string, uuid: string) { + try { + return await firstValueFrom( + this.httpClient.get<{ url: string }>(`${this.serviceUrl}/notice-of-intent/${fileId}/${uuid}/open`) + ); + } catch (e) { + console.error(e); + this.toastService.showErrorToast('Failed to load Notice of Intent File, please try again later'); + return undefined; + } + } } diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service.ts index f5cdfadbc1..ca47f4e725 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service.ts @@ -77,12 +77,6 @@ export class ApplicationDecisionV2Service { documents: { document: true, }, - modifies: { - modifiesDecisions: true, - }, - reconsiders: { - reconsidersDecisions: true, - }, }, order: { auditCreatedAt: 'DESC', diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.service.spec.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.service.spec.ts index 078c77f30d..41497f3afe 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.service.spec.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.service.spec.ts @@ -135,6 +135,7 @@ describe('NoticeOfIntentDecisionV2Service', () => { ); mockNoticeOfIntentService.update.mockResolvedValue({} as any); mockNoticeOfIntentService.updateByUuid.mockResolvedValue({} as any); + mockNoticeOfIntentService.getUuid.mockResolvedValue('uuid'); mockDecisionOutcomeRepository.find.mockResolvedValue([]); mockDecisionOutcomeRepository.findOneOrFail.mockResolvedValue({} as any); @@ -436,6 +437,7 @@ describe('NoticeOfIntentDecisionV2Service', () => { it('should call through for get for applicant', async () => { await service.getForPortal(''); expect(mockDecisionRepository.find).toHaveBeenCalledTimes(1); + expect(mockNoticeOfIntentService.getUuid).toHaveBeenCalledTimes(1); }); }); diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.service.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.service.ts index ed7a81cec8..bbd22bafd3 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.service.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.service.ts @@ -52,13 +52,11 @@ export class NoticeOfIntentDecisionV2Service { ) {} async getForPortal(fileNumber: string) { - const noticeOfIntent = await this.noticeOfIntentService.getByFileNumber( - fileNumber, - ); + const uuid = await this.noticeOfIntentService.getUuid(fileNumber); return await this.noticeOfIntentDecisionRepository.find({ where: { - noticeOfIntentUuid: noticeOfIntent.uuid, + noticeOfIntentUuid: uuid, isDraft: false, }, relations: { @@ -66,9 +64,6 @@ export class NoticeOfIntentDecisionV2Service { documents: { document: true, }, - modifies: { - modifiesDecisions: true, - }, }, order: { auditCreatedAt: 'DESC', @@ -77,13 +72,11 @@ export class NoticeOfIntentDecisionV2Service { } async getByFileNumber(number: string) { - const noticeOfIntent = await this.noticeOfIntentService.getByFileNumber( - number, - ); + const noticeOfIntentUuid = await this.noticeOfIntentService.getUuid(number); const decisions = await this.noticeOfIntentDecisionRepository.find({ where: { - noticeOfIntentUuid: noticeOfIntent.uuid, + noticeOfIntentUuid, }, order: { createdAt: 'DESC', @@ -107,7 +100,7 @@ export class NoticeOfIntentDecisionV2Service { const decisionsWithModifiedBy = await this.noticeOfIntentDecisionRepository.find({ where: { - noticeOfIntentUuid: noticeOfIntent.uuid, + noticeOfIntentUuid, modifiedBy: { resultingDecision: { isDraft: false, diff --git a/services/apps/alcs/src/common/automapper/application-decision-v2.automapper.profile.ts b/services/apps/alcs/src/common/automapper/application-decision-v2.automapper.profile.ts index a13110717f..c716fa6a7e 100644 --- a/services/apps/alcs/src/common/automapper/application-decision-v2.automapper.profile.ts +++ b/services/apps/alcs/src/common/automapper/application-decision-v2.automapper.profile.ts @@ -33,7 +33,7 @@ import { import { ApplicationDecisionComponent } from '../../alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.entity'; import { LinkedResolutionOutcomeType } from '../../alcs/application-decision/application-decision-v2/application-decision/linked-resolution-outcome-type.entity'; import { ApplicationDecision } from '../../alcs/application-decision/application-decision.entity'; -import { ApplicationPortalDecisionDto } from '../../portal/application-decision/application-decision.dto'; +import { ApplicationPortalDecisionDto } from '../../portal/public/application/application-decision.dto'; import { NaruSubtypeDto } from '../../portal/application-submission/application-submission.dto'; import { NaruSubtype } from '../../portal/application-submission/naru-subtype/naru-subtype.entity'; import { ApplicationDecisionConditionToComponentLotDto } from '../../alcs/application-decision/application-condition-to-component-lot/application-condition-to-component-lot.controller.dto'; diff --git a/services/apps/alcs/src/common/automapper/notice-of-intent-decision.automapper.profile.ts b/services/apps/alcs/src/common/automapper/notice-of-intent-decision.automapper.profile.ts index 4ffa68ff3a..65b0555402 100644 --- a/services/apps/alcs/src/common/automapper/notice-of-intent-decision.automapper.profile.ts +++ b/services/apps/alcs/src/common/automapper/notice-of-intent-decision.automapper.profile.ts @@ -35,7 +35,7 @@ import { NoticeOfIntentModification } from '../../alcs/notice-of-intent-decision import { NoticeOfIntentSubmissionStatusType } from '../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status-type.entity'; import { NoticeOfIntentStatusDto } from '../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status.dto'; import { NoticeOfIntent } from '../../alcs/notice-of-intent/notice-of-intent.entity'; -import { NoticeOfIntentPortalDecisionDto } from '../../portal/notice-of-intent-decision/notice-of-intent-decision.dto'; +import { NoticeOfIntentPortalDecisionDto } from '../../portal/public/notice-of-intent/notice-of-intent-decision.dto'; @Injectable() export class NoticeOfIntentDecisionProfile extends AutomapperProfile { diff --git a/services/apps/alcs/src/common/automapper/public.automapper.profile.ts b/services/apps/alcs/src/common/automapper/public.automapper.profile.ts index d1b49b784b..a6a7c62da6 100644 --- a/services/apps/alcs/src/common/automapper/public.automapper.profile.ts +++ b/services/apps/alcs/src/common/automapper/public.automapper.profile.ts @@ -1,21 +1,23 @@ import { createMap, forMember, mapFrom, Mapper } from '@automapper/core'; import { AutomapperProfile, InjectMapper } from '@automapper/nestjs'; import { Injectable } from '@nestjs/common'; -import { ApplicationDocumentDto } from '../../alcs/application/application-document/application-document.dto'; import { ApplicationDocument } from '../../alcs/application/application-document/application-document.entity'; +import { NoticeOfIntentDocument } from '../../alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.entity'; import { ApplicationSubmissionReview } from '../../portal/application-submission-review/application-submission-review.entity'; -import { ApplicationOwnerDto } from '../../portal/application-submission/application-owner/application-owner.dto'; import { ApplicationOwner } from '../../portal/application-submission/application-owner/application-owner.entity'; -import { ApplicationParcelDto } from '../../portal/application-submission/application-parcel/application-parcel.dto'; import { ApplicationParcel } from '../../portal/application-submission/application-parcel/application-parcel.entity'; import { ApplicationSubmission } from '../../portal/application-submission/application-submission.entity'; +import { NoticeOfIntentOwner } from '../../portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.entity'; +import { NoticeOfIntentParcel } from '../../portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.entity'; +import { NoticeOfIntentSubmission } from '../../portal/notice-of-intent-submission/notice-of-intent-submission.entity'; import { - PublicApplicationParcelDto, PublicApplicationSubmissionDto, PublicApplicationSubmissionReviewDto, PublicDocumentDto, PublicOwnerDto, -} from '../../portal/public/public.dto'; + PublicParcelDto, +} from '../../portal/public/application/public-application.dto'; +import { PublicNoticeOfIntentSubmissionDto } from '../../portal/public/notice-of-intent/public-notice-of-intent.dto'; import { ParcelOwnershipType, ParcelOwnershipTypeDto, @@ -47,6 +49,24 @@ export class PublicAutomapperProfile extends AutomapperProfile { ), ); + createMap( + mapper, + NoticeOfIntentSubmission, + PublicNoticeOfIntentSubmissionDto, + forMember( + (a) => a.lastStatusUpdate, + mapFrom((ad) => { + return ad.status.effectiveDate?.getTime(); + }), + ), + forMember( + (a) => a.status, + mapFrom((ad) => { + return ad.status.statusType; + }), + ), + ); + createMap( mapper, ApplicationOwner, @@ -57,10 +77,20 @@ export class PublicAutomapperProfile extends AutomapperProfile { ), ); + createMap( + mapper, + NoticeOfIntentOwner, + PublicOwnerDto, + forMember( + (pd) => pd.displayName, + mapFrom((p) => `${p.firstName} ${p.lastName}`), + ), + ); + createMap( mapper, ApplicationParcel, - PublicApplicationParcelDto, + PublicParcelDto, forMember( (pd) => pd.ownershipTypeCode, mapFrom((p) => p.ownershipTypeCode), @@ -99,6 +129,48 @@ export class PublicAutomapperProfile extends AutomapperProfile { ), ); + createMap( + mapper, + NoticeOfIntentParcel, + PublicParcelDto, + forMember( + (pd) => pd.ownershipTypeCode, + mapFrom((p) => p.ownershipTypeCode), + ), + forMember( + (pd) => pd.purchasedDate, + mapFrom((p) => p.purchasedDate?.getTime()), + ), + forMember( + (p) => p.owners, + mapFrom((pd) => { + if (pd.owners) { + return this.mapper.mapArray( + pd.owners, + NoticeOfIntentOwner, + PublicOwnerDto, + ); + } else { + return []; + } + }), + ), + forMember( + (p) => p.ownershipType, + mapFrom((pd) => { + if (pd.ownershipType) { + return this.mapper.map( + pd.ownershipType, + ParcelOwnershipType, + ParcelOwnershipTypeDto, + ); + } else { + return undefined; + } + }), + ), + ); + createMap( mapper, ApplicationSubmissionReview, @@ -130,6 +202,32 @@ export class PublicAutomapperProfile extends AutomapperProfile { mapFrom((ad) => ad.document.uuid), ), ); + + createMap( + mapper, + NoticeOfIntentDocument, + PublicDocumentDto, + forMember( + (a) => a.mimeType, + mapFrom((ad) => ad.document.mimeType), + ), + forMember( + (a) => a.fileName, + mapFrom((ad) => ad.document.fileName), + ), + forMember( + (a) => a.fileSize, + mapFrom((ad) => ad.document.fileSize), + ), + forMember( + (a) => a.uploadedAt, + mapFrom((ad) => ad.document.uploadedAt.getTime()), + ), + forMember( + (a) => a.documentUuid, + mapFrom((ad) => ad.document.uuid), + ), + ); }; } } diff --git a/services/apps/alcs/src/portal/application-decision/application-decision.module.ts b/services/apps/alcs/src/portal/application-decision/application-decision.module.ts deleted file mode 100644 index 26d5beae08..0000000000 --- a/services/apps/alcs/src/portal/application-decision/application-decision.module.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { Module } from '@nestjs/common'; -import { ApplicationDecisionV2Module } from '../../alcs/application-decision/application-decision-v2/application-decision-v2.module'; -import { ApplicationSubmissionModule } from '../application-submission/application-submission.module'; -import { ApplicationDecisionController } from './application-decision.controller'; - -@Module({ - imports: [ApplicationDecisionV2Module, ApplicationSubmissionModule], - controllers: [ApplicationDecisionController], - providers: [], - exports: [], -}) -export class PortalApplicationDecisionModule {} diff --git a/services/apps/alcs/src/portal/notice-of-intent-decision/notice-of-intent-decision.module.ts b/services/apps/alcs/src/portal/notice-of-intent-decision/notice-of-intent-decision.module.ts deleted file mode 100644 index 7912000bee..0000000000 --- a/services/apps/alcs/src/portal/notice-of-intent-decision/notice-of-intent-decision.module.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { Module } from '@nestjs/common'; -import { NoticeOfIntentDecisionModule } from '../../alcs/notice-of-intent-decision/notice-of-intent-decision.module'; -import { NoticeOfIntentSubmissionModule } from '../notice-of-intent-submission/notice-of-intent-submission.module'; -import { NoticeOfIntentDecisionController } from './notice-of-intent-decision.controller'; - -@Module({ - imports: [NoticeOfIntentDecisionModule, NoticeOfIntentSubmissionModule], - controllers: [NoticeOfIntentDecisionController], - providers: [], - exports: [], -}) -export class PortalNoticeOfIntentDecisionModule {} diff --git a/services/apps/alcs/src/portal/portal.module.ts b/services/apps/alcs/src/portal/portal.module.ts index 710d3cbbc1..069a0523d0 100644 --- a/services/apps/alcs/src/portal/portal.module.ts +++ b/services/apps/alcs/src/portal/portal.module.ts @@ -6,14 +6,12 @@ import { CardModule } from '../alcs/card/card.module'; import { CodeModule } from '../alcs/code/code.module'; import { NoticeOfIntentModule } from '../alcs/notice-of-intent/notice-of-intent.module'; import { DocumentModule } from '../document/document.module'; -import { PortalApplicationDecisionModule } from './application-decision/application-decision.module'; import { PortalApplicationDocumentModule } from './application-document/application-document.module'; import { ApplicationSubmissionDraftModule } from './application-submission-draft/application-submission-draft.module'; import { ApplicationSubmissionReviewModule } from './application-submission-review/application-submission-review.module'; import { ApplicationSubmissionModule } from './application-submission/application-submission.module'; import { CodeController } from './code/code.controller'; import { PortalDocumentModule } from './document/document.module'; -import { PortalNoticeOfIntentDecisionModule } from './notice-of-intent-decision/notice-of-intent-decision.module'; import { PortalNoticeOfIntentDocumentModule } from './notice-of-intent-document/notice-of-intent-document.module'; import { NoticeOfIntentSubmissionDraftModule } from './notice-of-intent-submission-draft/notice-of-intent-submission-draft.module'; import { NoticeOfIntentSubmissionModule } from './notice-of-intent-submission/notice-of-intent-submission.module'; @@ -36,12 +34,10 @@ import { PublicModule } from './public/public.module'; PortalApplicationDocumentModule, ApplicationSubmissionDraftModule, PdfGenerationModule, - PortalApplicationDecisionModule, NoticeOfIntentModule, NoticeOfIntentSubmissionModule, PortalNoticeOfIntentDocumentModule, NoticeOfIntentSubmissionDraftModule, - PortalNoticeOfIntentDecisionModule, NotificationSubmissionModule, PortalNotificationDocumentModule, PublicModule, @@ -55,10 +51,8 @@ import { PublicModule } from './public/public.module'; { path: 'portal', module: PortalApplicationDocumentModule }, { path: 'portal', module: ApplicationSubmissionDraftModule }, { path: 'portal', module: PdfGenerationModule }, - { path: 'portal', module: PortalApplicationDecisionModule }, { path: 'portal', module: PortalNoticeOfIntentDocumentModule }, { path: 'portal', module: NoticeOfIntentSubmissionDraftModule }, - { path: 'portal', module: PortalNoticeOfIntentDecisionModule }, { path: 'portal', module: NotificationSubmissionModule }, { path: 'portal', module: PortalNotificationDocumentModule }, ]), diff --git a/services/apps/alcs/src/portal/application-decision/application-decision.controller.spec.ts b/services/apps/alcs/src/portal/public/application/application-decision.controller.spec.ts similarity index 65% rename from services/apps/alcs/src/portal/application-decision/application-decision.controller.spec.ts rename to services/apps/alcs/src/portal/public/application/application-decision.controller.spec.ts index fb0790bd5c..b7745058dc 100644 --- a/services/apps/alcs/src/portal/application-decision/application-decision.controller.spec.ts +++ b/services/apps/alcs/src/portal/public/application/application-decision.controller.spec.ts @@ -3,15 +3,12 @@ import { AutomapperModule } from '@automapper/nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { ClsService } from 'nestjs-cls'; -import { mockKeyCloakProviders } from '../../../test/mocks/mockTypes'; -import { ApplicationService } from '../../alcs/application/application.service'; -import { ApplicationDecision } from '../../alcs/application-decision/application-decision.entity'; -import { ApplicationDecisionV2Service } from '../../alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service'; -import { ApplicationDecisionProfile } from '../../common/automapper/application-decision-v2.automapper.profile'; -import { ApplicationProfile } from '../../common/automapper/application.automapper.profile'; -import { User } from '../../user/user.entity'; -import { ApplicationSubmission } from '../application-submission/application-submission.entity'; -import { ApplicationSubmissionService } from '../application-submission/application-submission.service'; +import { mockKeyCloakProviders } from '../../../../test/mocks/mockTypes'; +import { ApplicationDecisionV2Service } from '../../../alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service'; +import { ApplicationDecision } from '../../../alcs/application-decision/application-decision.entity'; +import { ApplicationDecisionProfile } from '../../../common/automapper/application-decision-v2.automapper.profile'; +import { User } from '../../../user/user.entity'; +import { ApplicationSubmissionService } from '../../application-submission/application-submission.service'; import { ApplicationDecisionController } from './application-decision.controller'; describe('ApplicationDecisionController', () => { @@ -50,17 +47,13 @@ describe('ApplicationDecisionController', () => { controller = module.get<ApplicationDecisionController>( ApplicationDecisionController, ); - - mockApplicationSubmissionService.verifyAccessByFileId.mockResolvedValue( - new ApplicationSubmission(), - ); }); it('should be defined', () => { expect(controller).toBeDefined(); }); - it('should verify access and call through for loading decisions', async () => { + it('should call through for loading decisions', async () => { mockDecisionService.getForPortal.mockResolvedValue([ new ApplicationDecision(), ]); @@ -72,9 +65,6 @@ describe('ApplicationDecisionController', () => { }); expect(res.length).toEqual(1); - expect( - mockApplicationSubmissionService.verifyAccessByFileId, - ).toHaveBeenCalledTimes(1); expect(mockDecisionService.getForPortal).toHaveBeenCalledTimes(1); }); diff --git a/services/apps/alcs/src/portal/application-decision/application-decision.controller.ts b/services/apps/alcs/src/portal/public/application/application-decision.controller.ts similarity index 55% rename from services/apps/alcs/src/portal/application-decision/application-decision.controller.ts rename to services/apps/alcs/src/portal/public/application/application-decision.controller.ts index 545d694111..73d23dc4b4 100644 --- a/services/apps/alcs/src/portal/application-decision/application-decision.controller.ts +++ b/services/apps/alcs/src/portal/public/application/application-decision.controller.ts @@ -1,17 +1,14 @@ import { Mapper } from '@automapper/core'; import { InjectMapper } from '@automapper/nestjs'; -import { Controller, Get, Param, Req, UseGuards } from '@nestjs/common'; -import { ApiOAuth2 } from '@nestjs/swagger'; -import * as config from 'config'; -import { ApplicationDecision } from '../../alcs/application-decision/application-decision.entity'; -import { ApplicationDecisionV2Service } from '../../alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service'; -import { PortalAuthGuard } from '../../common/authorization/portal-auth-guard.service'; -import { ApplicationSubmissionService } from '../application-submission/application-submission.service'; +import { Controller, Get, Param, Req } from '@nestjs/common'; +import { Public } from 'nest-keycloak-connect'; +import { ApplicationDecisionV2Service } from '../../../alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service'; +import { ApplicationDecision } from '../../../alcs/application-decision/application-decision.entity'; +import { ApplicationSubmissionService } from '../../application-submission/application-submission.service'; import { ApplicationPortalDecisionDto } from './application-decision.dto'; -@ApiOAuth2(config.get<string[]>('KEYCLOAK.SCOPES')) -@UseGuards(PortalAuthGuard) -@Controller('application-decision') +@Public() +@Controller('application/decision') export class ApplicationDecisionController { constructor( private applicationSubmissionService: ApplicationSubmissionService, @@ -24,11 +21,6 @@ export class ApplicationDecisionController { @Param('fileNumber') fileNumber: string, @Req() req, ): Promise<ApplicationPortalDecisionDto[]> { - await this.applicationSubmissionService.verifyAccessByFileId( - fileNumber, - req.user.entity, - ); - const decisions = await this.decisionService.getForPortal(fileNumber); return this.mapper.mapArray( diff --git a/services/apps/alcs/src/portal/application-decision/application-decision.dto.ts b/services/apps/alcs/src/portal/public/application/application-decision.dto.ts similarity index 69% rename from services/apps/alcs/src/portal/application-decision/application-decision.dto.ts rename to services/apps/alcs/src/portal/public/application/application-decision.dto.ts index 2c1a9f6014..9ed5be978d 100644 --- a/services/apps/alcs/src/portal/application-decision/application-decision.dto.ts +++ b/services/apps/alcs/src/portal/public/application/application-decision.dto.ts @@ -2,8 +2,8 @@ import { AutoMap } from '@automapper/classes'; import { DecisionDocumentDto, LinkedResolutionDto, -} from '../../alcs/application-decision/application-decision-v1/application-decision/application-decision.dto'; -import { ApplicationDecisionOutcomeCodeDto } from '../../alcs/application-decision/application-decision-v2/application-decision/application-decision.dto'; +} from '../../../alcs/application-decision/application-decision-v1/application-decision/application-decision.dto'; +import { ApplicationDecisionOutcomeCodeDto } from '../../../alcs/application-decision/application-decision-v2/application-decision/application-decision.dto'; export class ApplicationPortalDecisionDto { @AutoMap() diff --git a/services/apps/alcs/src/portal/public/public.dto.ts b/services/apps/alcs/src/portal/public/application/public-application.dto.ts similarity index 93% rename from services/apps/alcs/src/portal/public/public.dto.ts rename to services/apps/alcs/src/portal/public/application/public-application.dto.ts index 69968c4dae..8badf0476e 100644 --- a/services/apps/alcs/src/portal/public/public.dto.ts +++ b/services/apps/alcs/src/portal/public/application/public-application.dto.ts @@ -1,10 +1,10 @@ import { AutoMap } from '@automapper/classes'; -import { ApplicationStatusDto } from '../../alcs/application/application-submission-status/submission-status.dto'; -import { OwnerTypeDto } from '../../common/owner-type/owner-type.entity'; -import { DocumentTypeDto } from '../../document/document.dto'; -import { ApplicationParcelOwnershipTypeDto } from '../application-submission/application-parcel/application-parcel.dto'; -import { NaruSubtypeDto } from '../application-submission/application-submission.dto'; -import { ProposedLot } from '../application-submission/application-submission.entity'; +import { ApplicationStatusDto } from '../../../alcs/application/application-submission-status/submission-status.dto'; +import { OwnerTypeDto } from '../../../common/owner-type/owner-type.entity'; +import { DocumentTypeDto } from '../../../document/document.dto'; +import { ApplicationParcelOwnershipTypeDto } from '../../application-submission/application-parcel/application-parcel.dto'; +import { NaruSubtypeDto } from '../../application-submission/application-submission.dto'; +import { ProposedLot } from '../../application-submission/application-submission.entity'; export class PublicOwnerDto { @AutoMap() @@ -368,7 +368,7 @@ export class PublicApplicationSubmissionReviewDto { isAuthorized: boolean | null; } -export class PublicApplicationParcelDto { +export class PublicParcelDto { @AutoMap() uuid: string; diff --git a/services/apps/alcs/src/portal/public/public-application.service.spec.ts b/services/apps/alcs/src/portal/public/application/public-application.service.spec.ts similarity index 75% rename from services/apps/alcs/src/portal/public/public-application.service.spec.ts rename to services/apps/alcs/src/portal/public/application/public-application.service.spec.ts index d82e030817..358913fd51 100644 --- a/services/apps/alcs/src/portal/public/public-application.service.spec.ts +++ b/services/apps/alcs/src/portal/public/application/public-application.service.spec.ts @@ -3,21 +3,22 @@ import { classes } from '@automapper/classes'; import { AutomapperModule } from '@automapper/nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; -import { ApplicationDecisionV2Service } from '../../alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service'; +import { ApplicationDecisionV2Service } from '../../../alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service'; import { ApplicationDocument, VISIBILITY_FLAG, -} from '../../alcs/application/application-document/application-document.entity'; -import { ApplicationDocumentService } from '../../alcs/application/application-document/application-document.service'; -import { ApplicationSubmissionToSubmissionStatus } from '../../alcs/application/application-submission-status/submission-status.entity'; -import { Application } from '../../alcs/application/application.entity'; -import { ApplicationService } from '../../alcs/application/application.service'; -import { PublicAutomapperProfile } from '../../common/automapper/public.automapper.profile'; -import { ApplicationSubmissionReview } from '../application-submission-review/application-submission-review.entity'; -import { ApplicationSubmissionReviewService } from '../application-submission-review/application-submission-review.service'; -import { ApplicationParcelService } from '../application-submission/application-parcel/application-parcel.service'; -import { ApplicationSubmission } from '../application-submission/application-submission.entity'; -import { ApplicationSubmissionService } from '../application-submission/application-submission.service'; +} from '../../../alcs/application/application-document/application-document.entity'; +import { ApplicationDocumentService } from '../../../alcs/application/application-document/application-document.service'; +import { ApplicationSubmissionToSubmissionStatus } from '../../../alcs/application/application-submission-status/submission-status.entity'; +import { Application } from '../../../alcs/application/application.entity'; +import { ApplicationService } from '../../../alcs/application/application.service'; +import { ApplicationType } from '../../../alcs/code/application-code/application-type/application-type.entity'; +import { PublicAutomapperProfile } from '../../../common/automapper/public.automapper.profile'; +import { ApplicationSubmissionReview } from '../../application-submission-review/application-submission-review.entity'; +import { ApplicationSubmissionReviewService } from '../../application-submission-review/application-submission-review.service'; +import { ApplicationParcelService } from '../../application-submission/application-parcel/application-parcel.service'; +import { ApplicationSubmission } from '../../application-submission/application-submission.entity'; +import { ApplicationSubmissionService } from '../../application-submission/application-submission.service'; import { PublicApplicationService } from './public-application.service'; describe('PublicApplicationService', () => { @@ -84,6 +85,7 @@ describe('PublicApplicationService', () => { mockAppService.get.mockResolvedValue( new Application({ dateReceivedAllItems: new Date(), + type: new ApplicationType(), }), ); mockAppSubService.getOrFailByFileNumber.mockResolvedValue( @@ -101,7 +103,7 @@ describe('PublicApplicationService', () => { mockAppDecService.getByAppFileNumber.mockResolvedValue([]); const fileId = 'file-id'; - await service.getPublicApplicationData(fileId); + await service.getPublicData(fileId); expect(mockAppService.get).toHaveBeenCalledTimes(1); expect(mockAppSubService.getOrFailByFileNumber).toHaveBeenCalledTimes(1); diff --git a/services/apps/alcs/src/portal/public/public-application.service.ts b/services/apps/alcs/src/portal/public/application/public-application.service.ts similarity index 69% rename from services/apps/alcs/src/portal/public/public-application.service.ts rename to services/apps/alcs/src/portal/public/application/public-application.service.ts index eaa9d3feb8..049c98a940 100644 --- a/services/apps/alcs/src/portal/public/public-application.service.ts +++ b/services/apps/alcs/src/portal/public/application/public-application.service.ts @@ -2,27 +2,27 @@ import { ServiceNotFoundException } from '@app/common/exceptions/base.exception' import { Mapper } from '@automapper/core'; import { InjectMapper } from '@automapper/nestjs'; import { Injectable } from '@nestjs/common'; -import { ApplicationDecisionV2Service } from '../../alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service'; -import { ApplicationDecision } from '../../alcs/application-decision/application-decision.entity'; +import { ApplicationDecisionV2Service } from '../../../alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service'; +import { ApplicationDecision } from '../../../alcs/application-decision/application-decision.entity'; import { ApplicationDocument, VISIBILITY_FLAG, -} from '../../alcs/application/application-document/application-document.entity'; -import { ApplicationDocumentService } from '../../alcs/application/application-document/application-document.service'; -import { ApplicationService } from '../../alcs/application/application.service'; -import { ApplicationPortalDecisionDto } from '../application-decision/application-decision.dto'; -import { ApplicationSubmissionReview } from '../application-submission-review/application-submission-review.entity'; -import { ApplicationSubmissionReviewService } from '../application-submission-review/application-submission-review.service'; -import { ApplicationParcel } from '../application-submission/application-parcel/application-parcel.entity'; -import { ApplicationParcelService } from '../application-submission/application-parcel/application-parcel.service'; -import { ApplicationSubmission } from '../application-submission/application-submission.entity'; -import { ApplicationSubmissionService } from '../application-submission/application-submission.service'; +} from '../../../alcs/application/application-document/application-document.entity'; +import { ApplicationDocumentService } from '../../../alcs/application/application-document/application-document.service'; +import { ApplicationService } from '../../../alcs/application/application.service'; +import { ApplicationPortalDecisionDto } from './application-decision.dto'; +import { ApplicationSubmissionReview } from '../../application-submission-review/application-submission-review.entity'; +import { ApplicationSubmissionReviewService } from '../../application-submission-review/application-submission-review.service'; +import { ApplicationParcel } from '../../application-submission/application-parcel/application-parcel.entity'; +import { ApplicationParcelService } from '../../application-submission/application-parcel/application-parcel.service'; +import { ApplicationSubmission } from '../../application-submission/application-submission.entity'; +import { ApplicationSubmissionService } from '../../application-submission/application-submission.service'; import { - PublicApplicationParcelDto, + PublicParcelDto, PublicApplicationSubmissionDto, PublicApplicationSubmissionReviewDto, PublicDocumentDto, -} from './public.dto'; +} from './public-application.dto'; @Injectable() export class PublicApplicationService { @@ -36,7 +36,7 @@ export class PublicApplicationService { @InjectMapper() private mapper: Mapper, ) {} - async getPublicApplicationData(fileNumber: string) { + async getPublicData(fileNumber: string) { const application = await this.applicationService.get(fileNumber); //Easy way to check if its public @@ -55,7 +55,7 @@ export class PublicApplicationService { const mappedParcels = this.mapper.mapArray( parcels, ApplicationParcel, - PublicApplicationParcelDto, + PublicParcelDto, ); const mappedSubmission = this.mapper.map( @@ -63,6 +63,7 @@ export class PublicApplicationService { ApplicationSubmission, PublicApplicationSubmissionDto, ); + mappedSubmission.type = application.type.label; const documents = await this.applicationDocumentService.list(fileNumber, [ VISIBILITY_FLAG.PUBLIC, diff --git a/services/apps/alcs/src/portal/notice-of-intent-decision/notice-of-intent-decision.controller.spec.ts b/services/apps/alcs/src/portal/public/notice-of-intent/notice-of-intent-decision.controller.spec.ts similarity index 72% rename from services/apps/alcs/src/portal/notice-of-intent-decision/notice-of-intent-decision.controller.spec.ts rename to services/apps/alcs/src/portal/public/notice-of-intent/notice-of-intent-decision.controller.spec.ts index ca88b19658..15925bf226 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-decision/notice-of-intent-decision.controller.spec.ts +++ b/services/apps/alcs/src/portal/public/notice-of-intent/notice-of-intent-decision.controller.spec.ts @@ -3,13 +3,13 @@ import { AutomapperModule } from '@automapper/nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { ClsService } from 'nestjs-cls'; -import { mockKeyCloakProviders } from '../../../test/mocks/mockTypes'; -import { NoticeOfIntentDecisionV2Service } from '../../alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.service'; -import { NoticeOfIntentDecision } from '../../alcs/notice-of-intent-decision/notice-of-intent-decision.entity'; -import { NoticeOfIntentDecisionProfile } from '../../common/automapper/notice-of-intent-decision.automapper.profile'; -import { User } from '../../user/user.entity'; -import { NoticeOfIntentSubmission } from '../notice-of-intent-submission/notice-of-intent-submission.entity'; -import { NoticeOfIntentSubmissionService } from '../notice-of-intent-submission/notice-of-intent-submission.service'; +import { mockKeyCloakProviders } from '../../../../test/mocks/mockTypes'; +import { NoticeOfIntentDecisionV2Service } from '../../../alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.service'; +import { NoticeOfIntentDecision } from '../../../alcs/notice-of-intent-decision/notice-of-intent-decision.entity'; +import { NoticeOfIntentDecisionProfile } from '../../../common/automapper/notice-of-intent-decision.automapper.profile'; +import { User } from '../../../user/user.entity'; +import { NoticeOfIntentSubmission } from '../../notice-of-intent-submission/notice-of-intent-submission.entity'; +import { NoticeOfIntentSubmissionService } from '../../notice-of-intent-submission/notice-of-intent-submission.service'; import { NoticeOfIntentDecisionController } from './notice-of-intent-decision.controller'; describe('NoticeOfIntentDecisionController', () => { @@ -58,7 +58,7 @@ describe('NoticeOfIntentDecisionController', () => { expect(controller).toBeDefined(); }); - it('should verify access and call through for loading decisions', async () => { + it('should call through for loading decisions', async () => { mockDecisionService.getForPortal.mockResolvedValue([ new NoticeOfIntentDecision(), ]); @@ -70,7 +70,6 @@ describe('NoticeOfIntentDecisionController', () => { }); expect(res.length).toEqual(1); - expect(mockNOISubmissionService.getByFileNumber).toHaveBeenCalledTimes(1); expect(mockDecisionService.getForPortal).toHaveBeenCalledTimes(1); }); diff --git a/services/apps/alcs/src/portal/notice-of-intent-decision/notice-of-intent-decision.controller.ts b/services/apps/alcs/src/portal/public/notice-of-intent/notice-of-intent-decision.controller.ts similarity index 53% rename from services/apps/alcs/src/portal/notice-of-intent-decision/notice-of-intent-decision.controller.ts rename to services/apps/alcs/src/portal/public/notice-of-intent/notice-of-intent-decision.controller.ts index 3ea5857a99..d10b67fe08 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-decision/notice-of-intent-decision.controller.ts +++ b/services/apps/alcs/src/portal/public/notice-of-intent/notice-of-intent-decision.controller.ts @@ -1,17 +1,14 @@ import { Mapper } from '@automapper/core'; import { InjectMapper } from '@automapper/nestjs'; -import { Controller, Get, Param, Req, UseGuards } from '@nestjs/common'; -import { ApiOAuth2 } from '@nestjs/swagger'; -import * as config from 'config'; -import { NoticeOfIntentDecisionV2Service } from '../../alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.service'; -import { NoticeOfIntentDecision } from '../../alcs/notice-of-intent-decision/notice-of-intent-decision.entity'; -import { PortalAuthGuard } from '../../common/authorization/portal-auth-guard.service'; -import { NoticeOfIntentSubmissionService } from '../notice-of-intent-submission/notice-of-intent-submission.service'; +import { Controller, Get, Param, Req } from '@nestjs/common'; +import { Public } from 'nest-keycloak-connect'; +import { NoticeOfIntentDecisionV2Service } from '../../../alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.service'; +import { NoticeOfIntentDecision } from '../../../alcs/notice-of-intent-decision/notice-of-intent-decision.entity'; +import { NoticeOfIntentSubmissionService } from '../../notice-of-intent-submission/notice-of-intent-submission.service'; import { NoticeOfIntentPortalDecisionDto } from './notice-of-intent-decision.dto'; -@ApiOAuth2(config.get<string[]>('KEYCLOAK.SCOPES')) -@UseGuards(PortalAuthGuard) -@Controller('notice-of-intent-decision') +@Public() +@Controller('notice-of-intent/decision') export class NoticeOfIntentDecisionController { constructor( private noticeOfIntentSubmissionService: NoticeOfIntentSubmissionService, @@ -19,16 +16,11 @@ export class NoticeOfIntentDecisionController { @InjectMapper() private mapper: Mapper, ) {} - @Get('/notice-of-intent/:fileNumber') + @Get('/:fileNumber') async listDecisions( @Param('fileNumber') fileNumber: string, @Req() req, ): Promise<NoticeOfIntentPortalDecisionDto[]> { - await this.noticeOfIntentSubmissionService.getByFileNumber( - fileNumber, - req.user.entity, - ); - const decisions = await this.decisionService.getForPortal(fileNumber); return this.mapper.mapArray( diff --git a/services/apps/alcs/src/portal/notice-of-intent-decision/notice-of-intent-decision.dto.ts b/services/apps/alcs/src/portal/public/notice-of-intent/notice-of-intent-decision.dto.ts similarity index 64% rename from services/apps/alcs/src/portal/notice-of-intent-decision/notice-of-intent-decision.dto.ts rename to services/apps/alcs/src/portal/public/notice-of-intent/notice-of-intent-decision.dto.ts index 0a44cc1d24..9684bb7a4e 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-decision/notice-of-intent-decision.dto.ts +++ b/services/apps/alcs/src/portal/public/notice-of-intent/notice-of-intent-decision.dto.ts @@ -1,10 +1,10 @@ import { AutoMap } from '@automapper/classes'; -import { LinkedResolutionDto } from '../../alcs/application-decision/application-decision-v1/application-decision/application-decision.dto'; +import { LinkedResolutionDto } from '../../../alcs/application-decision/application-decision-v1/application-decision/application-decision.dto'; import { NoticeOfIntentDecisionDocumentDto, NoticeOfIntentDecisionOutcomeCodeDto, -} from '../../alcs/notice-of-intent-decision/notice-of-intent-decision.dto'; -import { NoticeOfIntentDocumentDto } from '../../alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.dto'; +} from '../../../alcs/notice-of-intent-decision/notice-of-intent-decision.dto'; +import { NoticeOfIntentDocumentDto } from '../../../alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.dto'; export class NoticeOfIntentPortalDecisionDto { @AutoMap() diff --git a/services/apps/alcs/src/portal/public/notice-of-intent/public-notice-of-intent.dto.ts b/services/apps/alcs/src/portal/public/notice-of-intent/public-notice-of-intent.dto.ts new file mode 100644 index 0000000000..a266fb7694 --- /dev/null +++ b/services/apps/alcs/src/portal/public/notice-of-intent/public-notice-of-intent.dto.ts @@ -0,0 +1,174 @@ +import { AutoMap } from '@automapper/classes'; +import { NoticeOfIntentStatusDto } from '../../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status.dto'; +import { ProposedStructure } from '../../notice-of-intent-submission/notice-of-intent-submission.entity'; +import { PublicOwnerDto } from '../application/public-application.dto'; + +export class PublicNoticeOfIntentSubmissionDto { + @AutoMap() + fileNumber: string; + + @AutoMap() + uuid: string; + + @AutoMap() + createdAt: number; + + @AutoMap() + updatedAt: number; + + @AutoMap() + applicant: string; + + @AutoMap() + localGovernmentUuid: string; + + @AutoMap(() => Boolean) + hasOtherParcelsInCommunity?: boolean | null; + + lastStatusUpdate: number; + + status: NoticeOfIntentStatusDto; + + @AutoMap(() => [PublicOwnerDto]) + owners: PublicOwnerDto[]; + + type: string; + + @AutoMap() + typeCode: string; + + @AutoMap(() => String) + purpose: string | null; + + @AutoMap() + parcelsAgricultureDescription: string; + + @AutoMap() + parcelsAgricultureImprovementDescription: string; + + @AutoMap() + parcelsNonAgricultureUseDescription: string; + + @AutoMap() + northLandUseType: string; + + @AutoMap() + northLandUseTypeDescription: string; + + @AutoMap() + eastLandUseType: string; + @AutoMap() + eastLandUseTypeDescription: string; + + @AutoMap() + southLandUseType: string; + + @AutoMap() + southLandUseTypeDescription: string; + + @AutoMap() + westLandUseType: string; + + @AutoMap() + westLandUseTypeDescription: string; + + @AutoMap(() => String) + primaryContactOwnerUuid?: string | null; + + //Soil Fields + @AutoMap(() => Boolean) + soilIsFollowUp: boolean | null; + + @AutoMap(() => String) + soilFollowUpIDs: string | null; + + @AutoMap(() => String) + soilTypeRemoved: string | null; + + @AutoMap(() => Number) + soilToRemoveVolume: number | null; + + @AutoMap(() => Number) + soilToRemoveArea: number | null; + + @AutoMap(() => Number) + soilToRemoveMaximumDepth: number | null; + + @AutoMap(() => Number) + soilToRemoveAverageDepth: number | null; + + @AutoMap(() => Number) + soilAlreadyRemovedVolume: number | null; + + @AutoMap(() => Number) + soilAlreadyRemovedArea: number | null; + + @AutoMap(() => Number) + soilAlreadyRemovedMaximumDepth: number | null; + + @AutoMap(() => Number) + soilAlreadyRemovedAverageDepth: number | null; + + @AutoMap(() => Number) + soilToPlaceVolume: number | null; + + @AutoMap(() => Number) + soilToPlaceArea: number | null; + + @AutoMap(() => Number) + soilToPlaceMaximumDepth: number | null; + + @AutoMap(() => Number) + soilToPlaceAverageDepth: number | null; + + @AutoMap(() => Number) + soilAlreadyPlacedVolume: number | null; + + @AutoMap(() => Number) + soilAlreadyPlacedArea: number | null; + + @AutoMap(() => Number) + soilAlreadyPlacedMaximumDepth: number | null; + + @AutoMap(() => Number) + soilAlreadyPlacedAverageDepth: number | null; + + @AutoMap(() => Number) + soilProjectDurationAmount: number | null; + + @AutoMap(() => String) + soilProjectDurationUnit?: string | null; + + @AutoMap(() => String) + soilFillTypeToPlace?: string | null; + + @AutoMap(() => Boolean) + soilIsExtractionOrMining?: boolean; + + @AutoMap(() => Boolean) + soilIsAreaWideFilling?: boolean; + + @AutoMap(() => Boolean) + soilHasSubmittedNotice?: boolean; + + @AutoMap(() => Boolean) + soilIsRemovingSoilForNewStructure?: boolean; + + @AutoMap(() => String) + soilStructureFarmUseReason?: string | null; + + @AutoMap(() => String) + soilStructureResidentialUseReason?: string | null; + + @AutoMap(() => String) + soilAgriParcelActivity?: string | null; + + @AutoMap(() => String) + soilStructureResidentialAccessoryUseReason?: string | null; + + @AutoMap(() => String) + soilStructureOtherUseReason?: string | null; + + @AutoMap(() => [ProposedStructure]) + soilProposedStructures: ProposedStructure[]; +} diff --git a/services/apps/alcs/src/portal/public/notice-of-intent/public-notice-of-intent.service.spec.ts b/services/apps/alcs/src/portal/public/notice-of-intent/public-notice-of-intent.service.spec.ts new file mode 100644 index 0000000000..5929249f5f --- /dev/null +++ b/services/apps/alcs/src/portal/public/notice-of-intent/public-notice-of-intent.service.spec.ts @@ -0,0 +1,138 @@ +import { ServiceNotFoundException } from '@app/common/exceptions/base.exception'; +import { classes } from '@automapper/classes'; +import { AutomapperModule } from '@automapper/nestjs'; +import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; +import { Test, TestingModule } from '@nestjs/testing'; +import { VISIBILITY_FLAG } from '../../../alcs/application/application-document/application-document.entity'; +import { NoticeOfIntentDecisionV2Service } from '../../../alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.service'; +import { NoticeOfIntentDocument } from '../../../alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.entity'; +import { NoticeOfIntentDocumentService } from '../../../alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.service'; +import { NoticeOfIntentSubmissionToSubmissionStatus } from '../../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status.entity'; +import { NoticeOfIntentType } from '../../../alcs/notice-of-intent/notice-of-intent-type/notice-of-intent-type.entity'; +import { NoticeOfIntent } from '../../../alcs/notice-of-intent/notice-of-intent.entity'; +import { NoticeOfIntentService } from '../../../alcs/notice-of-intent/notice-of-intent.service'; +import { PublicAutomapperProfile } from '../../../common/automapper/public.automapper.profile'; +import { NoticeOfIntentParcelService } from '../../notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.service'; +import { NoticeOfIntentSubmission } from '../../notice-of-intent-submission/notice-of-intent-submission.entity'; +import { NoticeOfIntentSubmissionService } from '../../notice-of-intent-submission/notice-of-intent-submission.service'; +import { PublicNoticeOfIntentService } from './public-notice-of-intent.service'; + +describe('PublicNoticeOfIntentService', () => { + let service: PublicNoticeOfIntentService; + let mockNOIService: DeepMocked<NoticeOfIntentService>; + let mockNOISubService: DeepMocked<NoticeOfIntentSubmissionService>; + let mockNOIParcelService: DeepMocked<NoticeOfIntentParcelService>; + let mockNOIDocService: DeepMocked<NoticeOfIntentDocumentService>; + let mockNOIDecService: DeepMocked<NoticeOfIntentDecisionV2Service>; + + beforeEach(async () => { + mockNOIService = createMock(); + mockNOISubService = createMock(); + mockNOIParcelService = createMock(); + mockNOIDocService = createMock(); + mockNOIDecService = createMock(); + + const module: TestingModule = await Test.createTestingModule({ + imports: [ + AutomapperModule.forRoot({ + strategyInitializer: classes(), + }), + ], + providers: [ + PublicNoticeOfIntentService, + PublicAutomapperProfile, + { + provide: NoticeOfIntentService, + useValue: mockNOIService, + }, + { + provide: NoticeOfIntentSubmissionService, + useValue: mockNOISubService, + }, + { + provide: NoticeOfIntentParcelService, + useValue: mockNOIParcelService, + }, + { + provide: NoticeOfIntentDocumentService, + useValue: mockNOIDocService, + }, + { + provide: NoticeOfIntentDecisionV2Service, + useValue: mockNOIDecService, + }, + ], + }).compile(); + + service = module.get<PublicNoticeOfIntentService>( + PublicNoticeOfIntentService, + ); + }); + + it('should be defined', () => { + expect(service).toBeDefined(); + }); + + it('load a Notice of Intent and its related data for get NOI', async () => { + mockNOIService.getByFileNumber.mockResolvedValue( + new NoticeOfIntent({ + dateReceivedAllItems: new Date(), + type: new NoticeOfIntentType(), + }), + ); + mockNOISubService.getOrFailByFileNumber.mockResolvedValue( + new NoticeOfIntentSubmission({ + get status() { + return new NoticeOfIntentSubmissionToSubmissionStatus(); + }, + }), + ); + mockNOIParcelService.fetchByFileId.mockResolvedValue([]); + mockNOIDocService.list.mockResolvedValue([]); + mockNOIDecService.getForPortal.mockResolvedValue([]); + + const fileId = 'file-id'; + await service.getPublicData(fileId); + + expect(mockNOIService.getByFileNumber).toHaveBeenCalledTimes(1); + expect(mockNOISubService.getOrFailByFileNumber).toHaveBeenCalledTimes(1); + expect(mockNOIParcelService.fetchByFileId).toHaveBeenCalledTimes(1); + expect(mockNOIDocService.list).toHaveBeenCalledTimes(1); + expect(mockNOIDocService.list).toHaveBeenCalledWith(fileId, [ + VISIBILITY_FLAG.PUBLIC, + ]); + expect(mockNOIDecService.getForPortal).toHaveBeenCalledTimes(1); + }); + + it('should call through to document service for getting files', async () => { + const mockDoc = new NoticeOfIntentDocument({ + visibilityFlags: [VISIBILITY_FLAG.PUBLIC], + }); + mockNOIDocService.get.mockResolvedValue(mockDoc); + mockNOIDocService.getInlineUrl.mockResolvedValue(''); + + const documentUuid = 'document-uuid'; + await service.getInlineUrl(documentUuid); + + expect(mockNOIDocService.get).toHaveBeenCalledTimes(1); + expect(mockNOIDocService.getInlineUrl).toHaveBeenCalledTimes(1); + expect(mockNOIDocService.getInlineUrl).toHaveBeenCalledWith(mockDoc); + }); + + it('should throw an exception when the document is not public', async () => { + const mockDoc = new NoticeOfIntentDocument({ + visibilityFlags: [VISIBILITY_FLAG.APPLICANT], + }); + mockNOIDocService.get.mockResolvedValue(mockDoc); + + const documentUuid = 'document-uuid'; + const promise = service.getInlineUrl(documentUuid); + + await expect(promise).rejects.toMatchObject( + new ServiceNotFoundException('Failed to find document'), + ); + + expect(mockNOIDocService.get).toHaveBeenCalledTimes(1); + expect(mockNOIDocService.getInlineUrl).toHaveBeenCalledTimes(0); + }); +}); diff --git a/services/apps/alcs/src/portal/public/notice-of-intent/public-notice-of-intent.service.ts b/services/apps/alcs/src/portal/public/notice-of-intent/public-notice-of-intent.service.ts new file mode 100644 index 0000000000..ee28cfb968 --- /dev/null +++ b/services/apps/alcs/src/portal/public/notice-of-intent/public-notice-of-intent.service.ts @@ -0,0 +1,124 @@ +import { ServiceNotFoundException } from '@app/common/exceptions/base.exception'; +import { Mapper } from '@automapper/core'; +import { InjectMapper } from '@automapper/nestjs'; +import { Injectable } from '@nestjs/common'; +import { VISIBILITY_FLAG } from '../../../alcs/application/application-document/application-document.entity'; +import { NoticeOfIntentDecisionV2Service } from '../../../alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.service'; +import { NoticeOfIntentDecision } from '../../../alcs/notice-of-intent-decision/notice-of-intent-decision.entity'; +import { NoticeOfIntentDocument } from '../../../alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.entity'; +import { NoticeOfIntentDocumentService } from '../../../alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.service'; +import { NoticeOfIntentService } from '../../../alcs/notice-of-intent/notice-of-intent.service'; +import { NoticeOfIntentPortalDecisionDto } from './notice-of-intent-decision.dto'; +import { NoticeOfIntentParcel } from '../../notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.entity'; +import { NoticeOfIntentParcelService } from '../../notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.service'; +import { NoticeOfIntentSubmission } from '../../notice-of-intent-submission/notice-of-intent-submission.entity'; +import { NoticeOfIntentSubmissionService } from '../../notice-of-intent-submission/notice-of-intent-submission.service'; +import { + PublicDocumentDto, + PublicParcelDto, +} from '../application/public-application.dto'; +import { PublicNoticeOfIntentSubmissionDto } from './public-notice-of-intent.dto'; + +@Injectable() +export class PublicNoticeOfIntentService { + constructor( + private noticeOfIntentService: NoticeOfIntentService, + private noticeOfIntentSubmissionService: NoticeOfIntentSubmissionService, + private noticeOfIntentParcelService: NoticeOfIntentParcelService, + private noticeOfIntentDocumentService: NoticeOfIntentDocumentService, + private noticeOfIntentDecisionV2Service: NoticeOfIntentDecisionV2Service, + @InjectMapper() private mapper: Mapper, + ) {} + + async getPublicData(fileNumber: string) { + const noticeOfIntent = await this.noticeOfIntentService.getByFileNumber( + fileNumber, + ); + + //Easy way to check if its public + if (!noticeOfIntent?.dateReceivedAllItems) { + throw new ServiceNotFoundException( + `Failed to find application with File ID ${fileNumber}`, + ); + } + + const submission = + await this.noticeOfIntentSubmissionService.getOrFailByFileNumber( + fileNumber, + ); + + const parcels = await this.noticeOfIntentParcelService.fetchByFileId( + fileNumber, + ); + + const mappedParcels = this.mapper.mapArray( + parcels, + NoticeOfIntentParcel, + PublicParcelDto, + ); + + const mappedSubmission = this.mapper.map( + submission, + NoticeOfIntentSubmission, + PublicNoticeOfIntentSubmissionDto, + ); + mappedSubmission.type = noticeOfIntent.type.label; + + const documents = await this.noticeOfIntentDocumentService.list( + fileNumber, + [VISIBILITY_FLAG.PUBLIC], + ); + + const mappedDocuments = this.mapper.mapArray( + documents, + NoticeOfIntentDocument, + PublicDocumentDto, + ); + + const decisions = await this.noticeOfIntentDecisionV2Service.getForPortal( + fileNumber, + ); + const mappedDecisions = this.mapper.mapArray( + decisions, + NoticeOfIntentDecision, + NoticeOfIntentPortalDecisionDto, + ); + + return { + submission: mappedSubmission, + parcels: mappedParcels, + documents: mappedDocuments, + decisions: mappedDecisions, + }; + } + + async getDownloadUrl(documentUuid: string) { + const document = await this.noticeOfIntentDocumentService.get(documentUuid); + + if (!document.visibilityFlags.includes(VISIBILITY_FLAG.PUBLIC)) { + throw new ServiceNotFoundException('Failed to find document'); + } + + const url = await this.noticeOfIntentDocumentService.getDownloadUrl( + document, + ); + + return { + url, + }; + } + + async getInlineUrl(documentUuid: string) { + const document = await this.noticeOfIntentDocumentService.get(documentUuid); + + if (!document.visibilityFlags.includes(VISIBILITY_FLAG.PUBLIC)) { + throw new ServiceNotFoundException('Failed to find document'); + } + + const url = await this.noticeOfIntentDocumentService.getInlineUrl(document); + + return { + url, + }; + } +} diff --git a/services/apps/alcs/src/portal/public/public.controller.spec.ts b/services/apps/alcs/src/portal/public/public.controller.spec.ts index bd2ead3c39..c087759ed6 100644 --- a/services/apps/alcs/src/portal/public/public.controller.spec.ts +++ b/services/apps/alcs/src/portal/public/public.controller.spec.ts @@ -1,19 +1,19 @@ -import { classes } from '@automapper/classes'; -import { AutomapperModule } from '@automapper/nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { ClsService } from 'nestjs-cls'; import { mockKeyCloakProviders } from '../../../test/mocks/mockTypes'; -import { PublicAutomapperProfile } from '../../common/automapper/public.automapper.profile'; -import { PublicApplicationService } from './public-application.service'; +import { PublicApplicationService } from './application/public-application.service'; +import { PublicNoticeOfIntentService } from './notice-of-intent/public-notice-of-intent.service'; import { PublicController } from './public.controller'; -describe('PublicSearchController', () => { +describe('PublicController', () => { let controller: PublicController; let mockAppService: DeepMocked<PublicApplicationService>; + let mockNOIService: DeepMocked<PublicNoticeOfIntentService>; beforeEach(async () => { mockAppService = createMock(); + mockNOIService = createMock(); const module: TestingModule = await Test.createTestingModule({ providers: [ @@ -21,6 +21,10 @@ describe('PublicSearchController', () => { provide: PublicApplicationService, useValue: mockAppService, }, + { + provide: PublicNoticeOfIntentService, + useValue: mockNOIService, + }, { provide: ClsService, useValue: {}, @@ -38,11 +42,11 @@ describe('PublicSearchController', () => { }); it('should call through to service for loading an application', async () => { - mockAppService.getPublicApplicationData.mockResolvedValue({} as any); + mockAppService.getPublicData.mockResolvedValue({} as any); const fileId = 'file-id'; await controller.getApplication(fileId); - expect(mockAppService.getPublicApplicationData).toHaveBeenCalledTimes(1); + expect(mockAppService.getPublicData).toHaveBeenCalledTimes(1); }); }); diff --git a/services/apps/alcs/src/portal/public/public.controller.ts b/services/apps/alcs/src/portal/public/public.controller.ts index 4ba18be531..3d53cf077e 100644 --- a/services/apps/alcs/src/portal/public/public.controller.ts +++ b/services/apps/alcs/src/portal/public/public.controller.ts @@ -1,15 +1,19 @@ import { Controller, Get, Param } from '@nestjs/common'; import { Public } from 'nest-keycloak-connect'; -import { PublicApplicationService } from './public-application.service'; +import { PublicApplicationService } from './application/public-application.service'; +import { PublicNoticeOfIntentService } from './notice-of-intent/public-notice-of-intent.service'; @Public() @Controller('/public') export class PublicController { - constructor(private publicAppService: PublicApplicationService) {} + constructor( + private publicAppService: PublicApplicationService, + private publicNoticeOfIntentService: PublicNoticeOfIntentService, + ) {} @Get('/application/:fileId') async getApplication(@Param('fileId') fileNumber: string) { - return await this.publicAppService.getPublicApplicationData(fileNumber); + return await this.publicAppService.getPublicData(fileNumber); } @Get('/application/:fileId/:uuid/download') @@ -35,4 +39,37 @@ export class PublicController { url, }; } + + @Get('/notice-of-intent/:fileId') + async getNoticeOfIntent(@Param('fileId') fileNumber: string) { + return await this.publicNoticeOfIntentService.getPublicData(fileNumber); + } + + @Get('/notice-of-intent/:fileId/:uuid/download') + async getNoticeOfIntentDocumentDownload( + @Param('fileId') fileId: string, + @Param('uuid') documentUuid: string, + ) { + const url = await this.publicNoticeOfIntentService.getDownloadUrl( + documentUuid, + ); + + return { + url, + }; + } + + @Get('/notice-of-intent/:fileId/:uuid/open') + async getNoticeOfIntentDocumentOpen( + @Param('fileId') fileId: string, + @Param('uuid') documentUuid: string, + ) { + const url = await this.publicNoticeOfIntentService.getInlineUrl( + documentUuid, + ); + + return { + url, + }; + } } diff --git a/services/apps/alcs/src/portal/public/public.module.ts b/services/apps/alcs/src/portal/public/public.module.ts index e0e1f1806a..5a3d31e493 100644 --- a/services/apps/alcs/src/portal/public/public.module.ts +++ b/services/apps/alcs/src/portal/public/public.module.ts @@ -3,11 +3,17 @@ import { RouterModule } from '@nestjs/core'; import { ApplicationDecisionV2Module } from '../../alcs/application-decision/application-decision-v2/application-decision-v2.module'; import { ApplicationSubmissionStatusModule } from '../../alcs/application/application-submission-status/application-submission-status.module'; import { ApplicationModule } from '../../alcs/application/application.module'; +import { NoticeOfIntentDecisionModule } from '../../alcs/notice-of-intent-decision/notice-of-intent-decision.module'; +import { NoticeOfIntentModule } from '../../alcs/notice-of-intent/notice-of-intent.module'; import { NotificationSubmissionStatusModule } from '../../alcs/notification/notification-submission-status/notification-submission-status.module'; import { PublicAutomapperProfile } from '../../common/automapper/public.automapper.profile'; import { ApplicationSubmissionReviewModule } from '../application-submission-review/application-submission-review.module'; import { ApplicationSubmissionModule } from '../application-submission/application-submission.module'; -import { PublicApplicationService } from './public-application.service'; +import { NoticeOfIntentSubmissionModule } from '../notice-of-intent-submission/notice-of-intent-submission.module'; +import { ApplicationDecisionController } from './application/application-decision.controller'; +import { PublicApplicationService } from './application/public-application.service'; +import { NoticeOfIntentDecisionController } from './notice-of-intent/notice-of-intent-decision.controller'; +import { PublicNoticeOfIntentService } from './notice-of-intent/public-notice-of-intent.service'; import { PublicController } from './public.controller'; import { PublicSearchModule } from './search/public-search.module'; import { PublicStatusController } from './status/public-status.controller'; @@ -21,10 +27,22 @@ import { PublicStatusController } from './status/public-status.controller'; ApplicationSubmissionModule, ApplicationSubmissionReviewModule, ApplicationDecisionV2Module, + NoticeOfIntentModule, + NoticeOfIntentSubmissionModule, + NoticeOfIntentDecisionModule, RouterModule.register([{ path: 'public', module: PublicSearchModule }]), ], - controllers: [PublicStatusController, PublicController], - providers: [PublicAutomapperProfile, PublicApplicationService], + controllers: [ + PublicStatusController, + PublicController, + ApplicationDecisionController, + NoticeOfIntentDecisionController, + ], + providers: [ + PublicAutomapperProfile, + PublicApplicationService, + PublicNoticeOfIntentService, + ], exports: [], }) export class PublicModule {} From ec8f1bfbca7a11e7da8ff85739e32c915db0497c Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Fri, 6 Oct 2023 16:26:07 -0700 Subject: [PATCH 468/954] Fix typos and cleanup --- .../change-application-type-dialog.component.html | 2 +- .../submission-documents.component.ts | 2 -- .../create-submission-dialog.component.html | 2 +- ...structure-confirmation-dialog.component.spec.ts | 7 ++++--- ...l-removal-confirmation-dialog.component.spec.ts | 2 ++ .../submission-documents.component.ts | 2 -- ...rvey-plan-confirmation-dialog.component.spec.ts | 2 ++ .../submission-documents.component.ts | 2 -- .../submission-documents.component.ts | 2 -- .../alc-review/alc-review.component.spec.ts | 2 ++ .../submission-documents.component.ts | 2 -- .../prescribed-body.component.html} | 0 .../prescribed-body.component.scss} | 0 .../prescribed-body.component.spec.ts} | 14 ++++++++------ .../prescribed-body.component.ts} | 8 ++++---- portal-frontend/src/app/shared/shared.module.ts | 6 +++--- 16 files changed, 27 insertions(+), 28 deletions(-) rename portal-frontend/src/app/shared/{presribed-body/presribed-body.component.html => prescribed-body/prescribed-body.component.html} (100%) rename portal-frontend/src/app/shared/{presribed-body/presribed-body.component.scss => prescribed-body/prescribed-body.component.scss} (100%) rename portal-frontend/src/app/shared/{presribed-body/presribed-body.component.spec.ts => prescribed-body/prescribed-body.component.spec.ts} (68%) rename portal-frontend/src/app/shared/{presribed-body/presribed-body.component.ts => prescribed-body/prescribed-body.component.ts} (92%) diff --git a/portal-frontend/src/app/features/applications/edit-submission/change-application-type-dialog/change-application-type-dialog.component.html b/portal-frontend/src/app/features/applications/edit-submission/change-application-type-dialog/change-application-type-dialog.component.html index 285b52766b..c97802e305 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/change-application-type-dialog/change-application-type-dialog.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/change-application-type-dialog/change-application-type-dialog.component.html @@ -55,7 +55,7 @@ <h5>Are you sure you want to change your application type?</h5> </div> <ng-container *ngIf="stepIdx === prescribedBodyStep"> - <app-presribed-body [value]="prescribedBody" (select)="onSelectPrescribedBody($event)"></app-presribed-body> + <app-prescribed-body [value]="prescribedBody" (select)="onSelectPrescribedBody($event)"></app-prescribed-body> </ng-container> </div> </div> diff --git a/portal-frontend/src/app/features/applications/view-submission/alc-review/submission-documents/submission-documents.component.ts b/portal-frontend/src/app/features/applications/view-submission/alc-review/submission-documents/submission-documents.component.ts index 027fbdbfea..787f560c25 100644 --- a/portal-frontend/src/app/features/applications/view-submission/alc-review/submission-documents/submission-documents.component.ts +++ b/portal-frontend/src/app/features/applications/view-submission/alc-review/submission-documents/submission-documents.component.ts @@ -55,6 +55,4 @@ export class SubmissionDocumentsComponent implements OnInit, OnDestroy { this.$destroy.next(); this.$destroy.complete(); } - - protected readonly open = open; } diff --git a/portal-frontend/src/app/features/create-submission-dialog/create-submission-dialog.component.html b/portal-frontend/src/app/features/create-submission-dialog/create-submission-dialog.component.html index 154a23a11b..2c1e2058cf 100644 --- a/portal-frontend/src/app/features/create-submission-dialog/create-submission-dialog.component.html +++ b/portal-frontend/src/app/features/create-submission-dialog/create-submission-dialog.component.html @@ -105,7 +105,7 @@ <h4 *ngIf="currentStep === steps.prescribedBody"> </div> </ng-container> <ng-container *ngIf="currentStep === steps.prescribedBody"> - <app-presribed-body (select)="onSelectPrescribedBody($event)"></app-presribed-body> + <app-prescribed-body (select)="onSelectPrescribedBody($event)"></app-prescribed-body> </ng-container> <ng-container *ngIf="currentStep === steps.srwType"> <div class="step-description"> diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/delete-structure-confirmation-dialog/delete-structure-confirmation-dialog.component.spec.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/delete-structure-confirmation-dialog/delete-structure-confirmation-dialog.component.spec.ts index e99c9e81b6..32557ab156 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/delete-structure-confirmation-dialog/delete-structure-confirmation-dialog.component.spec.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/delete-structure-confirmation-dialog/delete-structure-confirmation-dialog.component.spec.ts @@ -1,3 +1,4 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MatDialogRef } from '@angular/material/dialog'; @@ -9,10 +10,10 @@ describe('DeleteStructureConfirmationDialogComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [ DeleteStructureConfirmationDialogComponent ], + declarations: [DeleteStructureConfirmationDialogComponent], providers: [{ provide: MatDialogRef, useValue: {} }], - }) - .compileComponents(); + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); fixture = TestBed.createComponent(DeleteStructureConfirmationDialogComponent); component = fixture.componentInstance; diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/soil-removal-confirmation-dialog/soil-removal-confirmation-dialog.component.spec.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/soil-removal-confirmation-dialog/soil-removal-confirmation-dialog.component.spec.ts index b726b84ca4..1501c368a2 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/soil-removal-confirmation-dialog/soil-removal-confirmation-dialog.component.spec.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/soil-removal-confirmation-dialog/soil-removal-confirmation-dialog.component.spec.ts @@ -1,3 +1,4 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MatDialogRef } from '@angular/material/dialog'; @@ -11,6 +12,7 @@ describe('SoilRemovalConfirmationDialogComponent', () => { await TestBed.configureTestingModule({ declarations: [SoilRemovalConfirmationDialogComponent], providers: [{ provide: MatDialogRef, useValue: {} }], + schemas: [NO_ERRORS_SCHEMA], }).compileComponents(); fixture = TestBed.createComponent(SoilRemovalConfirmationDialogComponent); diff --git a/portal-frontend/src/app/features/notice-of-intents/view-submission/alc-review/submission-documents/submission-documents.component.ts b/portal-frontend/src/app/features/notice-of-intents/view-submission/alc-review/submission-documents/submission-documents.component.ts index 86d6683606..8119568d44 100644 --- a/portal-frontend/src/app/features/notice-of-intents/view-submission/alc-review/submission-documents/submission-documents.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/view-submission/alc-review/submission-documents/submission-documents.component.ts @@ -40,6 +40,4 @@ export class SubmissionDocumentsComponent implements OnInit, OnDestroy { this.$destroy.next(); this.$destroy.complete(); } - - protected readonly open = open; } diff --git a/portal-frontend/src/app/features/notifications/edit-submission/proposal/change-survey-plan-confirmation-dialog/change-survey-plan-confirmation-dialog.component.spec.ts b/portal-frontend/src/app/features/notifications/edit-submission/proposal/change-survey-plan-confirmation-dialog/change-survey-plan-confirmation-dialog.component.spec.ts index eb9351819b..916e77bc36 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/proposal/change-survey-plan-confirmation-dialog/change-survey-plan-confirmation-dialog.component.spec.ts +++ b/portal-frontend/src/app/features/notifications/edit-submission/proposal/change-survey-plan-confirmation-dialog/change-survey-plan-confirmation-dialog.component.spec.ts @@ -1,3 +1,4 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MatDialogRef } from '@angular/material/dialog'; @@ -11,6 +12,7 @@ describe('ChangeSurveyPlanConfirmationDialogComponent', () => { await TestBed.configureTestingModule({ declarations: [ChangeSurveyPlanConfirmationDialogComponent], providers: [{ provide: MatDialogRef, useValue: {} }], + schemas: [NO_ERRORS_SCHEMA], }).compileComponents(); fixture = TestBed.createComponent(ChangeSurveyPlanConfirmationDialogComponent); diff --git a/portal-frontend/src/app/features/notifications/view-submission/alc-review/submission-documents/submission-documents.component.ts b/portal-frontend/src/app/features/notifications/view-submission/alc-review/submission-documents/submission-documents.component.ts index d4f6cd5c4f..2088483b40 100644 --- a/portal-frontend/src/app/features/notifications/view-submission/alc-review/submission-documents/submission-documents.component.ts +++ b/portal-frontend/src/app/features/notifications/view-submission/alc-review/submission-documents/submission-documents.component.ts @@ -47,6 +47,4 @@ export class SubmissionDocumentsComponent implements OnInit, OnDestroy { this.$destroy.next(); this.$destroy.complete(); } - - protected readonly open = open; } diff --git a/portal-frontend/src/app/features/public/application/alc-review/submission-documents/submission-documents.component.ts b/portal-frontend/src/app/features/public/application/alc-review/submission-documents/submission-documents.component.ts index c41e77ec95..40166c6600 100644 --- a/portal-frontend/src/app/features/public/application/alc-review/submission-documents/submission-documents.component.ts +++ b/portal-frontend/src/app/features/public/application/alc-review/submission-documents/submission-documents.component.ts @@ -55,6 +55,4 @@ export class PublicSubmissionDocumentsComponent implements OnInit, OnDestroy { this.$destroy.next(); this.$destroy.complete(); } - - protected readonly open = open; } diff --git a/portal-frontend/src/app/features/public/notice-of-intent/alc-review/alc-review.component.spec.ts b/portal-frontend/src/app/features/public/notice-of-intent/alc-review/alc-review.component.spec.ts index 3a515a8c48..23284b9844 100644 --- a/portal-frontend/src/app/features/public/notice-of-intent/alc-review/alc-review.component.spec.ts +++ b/portal-frontend/src/app/features/public/notice-of-intent/alc-review/alc-review.component.spec.ts @@ -1,3 +1,4 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { PublicAlcReviewComponent } from './alc-review.component'; @@ -10,6 +11,7 @@ describe('PublicAlcReviewComponent', () => { await TestBed.configureTestingModule({ providers: [], declarations: [PublicAlcReviewComponent], + schemas: [NO_ERRORS_SCHEMA], }).compileComponents(); fixture = TestBed.createComponent(PublicAlcReviewComponent); diff --git a/portal-frontend/src/app/features/public/notice-of-intent/alc-review/submission-documents/submission-documents.component.ts b/portal-frontend/src/app/features/public/notice-of-intent/alc-review/submission-documents/submission-documents.component.ts index ba33cf53ce..1fe9103978 100644 --- a/portal-frontend/src/app/features/public/notice-of-intent/alc-review/submission-documents/submission-documents.component.ts +++ b/portal-frontend/src/app/features/public/notice-of-intent/alc-review/submission-documents/submission-documents.component.ts @@ -53,6 +53,4 @@ export class PublicSubmissionDocumentsComponent implements OnInit, OnDestroy { this.$destroy.next(); this.$destroy.complete(); } - - protected readonly open = open; } diff --git a/portal-frontend/src/app/shared/presribed-body/presribed-body.component.html b/portal-frontend/src/app/shared/prescribed-body/prescribed-body.component.html similarity index 100% rename from portal-frontend/src/app/shared/presribed-body/presribed-body.component.html rename to portal-frontend/src/app/shared/prescribed-body/prescribed-body.component.html diff --git a/portal-frontend/src/app/shared/presribed-body/presribed-body.component.scss b/portal-frontend/src/app/shared/prescribed-body/prescribed-body.component.scss similarity index 100% rename from portal-frontend/src/app/shared/presribed-body/presribed-body.component.scss rename to portal-frontend/src/app/shared/prescribed-body/prescribed-body.component.scss diff --git a/portal-frontend/src/app/shared/presribed-body/presribed-body.component.spec.ts b/portal-frontend/src/app/shared/prescribed-body/prescribed-body.component.spec.ts similarity index 68% rename from portal-frontend/src/app/shared/presribed-body/presribed-body.component.spec.ts rename to portal-frontend/src/app/shared/prescribed-body/prescribed-body.component.spec.ts index 3c301dfc04..a4dd4f6129 100644 --- a/portal-frontend/src/app/shared/presribed-body/presribed-body.component.spec.ts +++ b/portal-frontend/src/app/shared/prescribed-body/prescribed-body.component.spec.ts @@ -1,14 +1,15 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { BehaviorSubject } from 'rxjs'; import { UserDto } from '../../services/authentication/authentication.dto'; import { AuthenticationService } from '../../services/authentication/authentication.service'; -import { PresribedBodyComponent } from './presribed-body.component'; +import { PrescribedBodyComponent } from './prescribed-body.component'; -describe('PresribedBodyComponent', () => { - let component: PresribedBodyComponent; - let fixture: ComponentFixture<PresribedBodyComponent>; +describe('PrescribedBodyComponent', () => { + let component: PrescribedBodyComponent; + let fixture: ComponentFixture<PrescribedBodyComponent>; let mockAuthService: DeepMocked<AuthenticationService>; beforeEach(async () => { @@ -16,16 +17,17 @@ describe('PresribedBodyComponent', () => { mockAuthService.$currentProfile = new BehaviorSubject<UserDto | undefined>(undefined); await TestBed.configureTestingModule({ - declarations: [PresribedBodyComponent], + declarations: [PrescribedBodyComponent], providers: [ { provide: AuthenticationService, useValue: mockAuthService, }, ], + schemas: [NO_ERRORS_SCHEMA], }).compileComponents(); - fixture = TestBed.createComponent(PresribedBodyComponent); + fixture = TestBed.createComponent(PrescribedBodyComponent); component = fixture.componentInstance; fixture.detectChanges(); }); diff --git a/portal-frontend/src/app/shared/presribed-body/presribed-body.component.ts b/portal-frontend/src/app/shared/prescribed-body/prescribed-body.component.ts similarity index 92% rename from portal-frontend/src/app/shared/presribed-body/presribed-body.component.ts rename to portal-frontend/src/app/shared/prescribed-body/prescribed-body.component.ts index e19f79eb7e..2f07b40fdc 100644 --- a/portal-frontend/src/app/shared/presribed-body/presribed-body.component.ts +++ b/portal-frontend/src/app/shared/prescribed-body/prescribed-body.component.ts @@ -5,11 +5,11 @@ const FIRST_NATION = 'First Nation Government'; const LOCAL = 'Local Government'; @Component({ - selector: 'app-presribed-body', - templateUrl: './presribed-body.component.html', - styleUrls: ['./presribed-body.component.scss'], + selector: 'app-prescribed-body', + templateUrl: './prescribed-body.component.html', + styleUrls: ['./prescribed-body.component.scss'], }) -export class PresribedBodyComponent implements OnInit { +export class PrescribedBodyComponent implements OnInit { @Input() value: string | undefined; @Output() select = new EventEmitter<string>(); diff --git a/portal-frontend/src/app/shared/shared.module.ts b/portal-frontend/src/app/shared/shared.module.ts index d8185f9212..b089040e44 100644 --- a/portal-frontend/src/app/shared/shared.module.ts +++ b/portal-frontend/src/app/shared/shared.module.ts @@ -40,7 +40,7 @@ import { FileSizePipe } from './pipes/fileSize.pipe'; import { MomentPipe } from './pipes/moment.pipe'; import { PhoneValidPipe } from './pipes/phoneValid.pipe'; import { TableColumnNoDataPipe } from './pipes/table-column-no-data.pipe'; -import { PresribedBodyComponent } from './presribed-body/presribed-body.component'; +import { PrescribedBodyComponent } from './prescribed-body/prescribed-body.component'; import { SoilTableComponent } from './soil-table/soil-table.component'; import { DATE_FORMATS } from './utils/date-format'; import { ValidationErrorComponent } from './validation-error/validation-error.component'; @@ -86,7 +86,7 @@ import { WarningBannerComponent } from './warning-banner/warning-banner.componen ValidationErrorComponent, CustomStepperComponent, MomentPipe, - PresribedBodyComponent, + PrescribedBodyComponent, OwnerDialogComponent, CrownOwnerDialogComponent, AllOwnersDialogComponent, @@ -133,7 +133,7 @@ import { WarningBannerComponent } from './warning-banner/warning-banner.componen NgxMaskDirective, NgxMaskPipe, MomentPipe, - PresribedBodyComponent, + PrescribedBodyComponent, OwnerDialogComponent, CrownOwnerDialogComponent, AllOwnersDialogComponent, From e592a2885e5eb08773655168f8b032b331649278 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Tue, 10 Oct 2023 09:17:10 -0700 Subject: [PATCH 469/954] Code Review Feedback --- .../submission/roso-details/roso-details.component.spec.ts | 2 ++ .../notice-of-intent/public-notice-of-intent.component.spec.ts | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/portal-frontend/src/app/features/public/application/submission/roso-details/roso-details.component.spec.ts b/portal-frontend/src/app/features/public/application/submission/roso-details/roso-details.component.spec.ts index 1a78d7acee..ba875fdcb2 100644 --- a/portal-frontend/src/app/features/public/application/submission/roso-details/roso-details.component.spec.ts +++ b/portal-frontend/src/app/features/public/application/submission/roso-details/roso-details.component.spec.ts @@ -1,3 +1,4 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { PublicService } from '../../../../../services/public/public.service'; @@ -20,6 +21,7 @@ describe('RosoDetailsComponent', () => { useValue: mockPublicService, }, ], + schemas: [NO_ERRORS_SCHEMA], }).compileComponents(); fixture = TestBed.createComponent(RosoDetailsComponent); diff --git a/portal-frontend/src/app/features/public/notice-of-intent/public-notice-of-intent.component.spec.ts b/portal-frontend/src/app/features/public/notice-of-intent/public-notice-of-intent.component.spec.ts index a019ac4090..2b385264bc 100644 --- a/portal-frontend/src/app/features/public/notice-of-intent/public-notice-of-intent.component.spec.ts +++ b/portal-frontend/src/app/features/public/notice-of-intent/public-notice-of-intent.component.spec.ts @@ -7,7 +7,7 @@ import { PublicService } from '../../../services/public/public.service'; import { PublicNoticeOfIntentComponent } from './public-notice-of-intent.component'; -describe('PublicApplicationComponent', () => { +describe('PublicNoticeOfIntentComponent', () => { let component: PublicNoticeOfIntentComponent; let fixture: ComponentFixture<PublicNoticeOfIntentComponent>; From d2a7309a372f62983767f2fa4f89c30360afcea7 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Tue, 10 Oct 2023 11:08:57 -0700 Subject: [PATCH 470/954] Add Public Notification View * Add public.dto to backend to better match front end structure * Small cleanups --- .../submission-details.component.spec.ts | 7 - .../submission-details.component.ts | 9 +- .../submission-details.component.spec.ts | 7 - .../submission-details.component.ts | 8 +- .../alc-review/alc-review.component.html | 8 ++ .../alc-review/alc-review.component.scss | 8 ++ .../alc-review/alc-review.component.spec.ts | 25 ++++ .../alc-review/alc-review.component.ts | 16 +++ .../submission-documents.component.html | 43 ++++++ .../submission-documents.component.scss | 25 ++++ .../submission-documents.component.spec.ts | 35 +++++ .../submission-documents.component.ts | 56 ++++++++ .../public-notification.component.html | 56 ++++++++ .../public-notification.component.scss | 105 ++++++++++++++ .../public-notification.component.spec.ts | 49 +++++++ .../public-notification.component.ts | 48 +++++++ .../public-notification.module.ts | 44 ++++++ .../additional-information.component.html | 76 ++++++++++ .../additional-information.component.scss | 5 + .../additional-information.component.spec.ts | 31 ++++ .../additional-information.component.ts | 77 ++++++++++ .../submission/parcel/parcel.component.html | 42 ++++++ .../submission/parcel/parcel.component.scss | 13 ++ .../parcel/parcel.component.spec.ts | 40 ++++++ .../submission/parcel/parcel.component.ts | 36 +++++ .../proposal-details.component.html | 27 ++++ .../proposal-details.component.scss | 0 .../proposal-details.component.spec.ts | 23 +++ .../proposal-details.component.ts | 14 ++ .../submission-details.component.html | 52 +++++++ .../submission-details.component.scss | 117 ++++++++++++++++ .../submission-details.component.spec.ts | 36 +++++ .../submission-details.component.ts | 59 ++++++++ .../src/app/features/public/public.module.ts | 4 + .../public/public-notification.dto.ts | 30 ++++ .../src/app/services/public/public.dto.ts | 1 + .../src/app/services/public/public.service.ts | 25 ++++ .../automapper/public.automapper.profile.ts | 101 +++++++++++++- .../application/public-application.dto.ts | 83 +---------- .../application/public-application.service.ts | 3 +- .../public-notice-of-intent.dto.ts | 2 +- .../public-notice-of-intent.service.ts | 5 +- .../notification/public-notification.dto.ts | 55 ++++++++ .../public-notification.service.spec.ts | 132 ++++++++++++++++++ .../public-notification.service.ts | 108 ++++++++++++++ .../portal/public/public.controller.spec.ts | 25 ++++ .../src/portal/public/public.controller.ts | 33 +++++ .../apps/alcs/src/portal/public/public.dto.ts | 86 ++++++++++++ .../alcs/src/portal/public/public.module.ts | 6 + 49 files changed, 1777 insertions(+), 119 deletions(-) create mode 100644 portal-frontend/src/app/features/public/notification/alc-review/alc-review.component.html create mode 100644 portal-frontend/src/app/features/public/notification/alc-review/alc-review.component.scss create mode 100644 portal-frontend/src/app/features/public/notification/alc-review/alc-review.component.spec.ts create mode 100644 portal-frontend/src/app/features/public/notification/alc-review/alc-review.component.ts create mode 100644 portal-frontend/src/app/features/public/notification/alc-review/submission-documents/submission-documents.component.html create mode 100644 portal-frontend/src/app/features/public/notification/alc-review/submission-documents/submission-documents.component.scss create mode 100644 portal-frontend/src/app/features/public/notification/alc-review/submission-documents/submission-documents.component.spec.ts create mode 100644 portal-frontend/src/app/features/public/notification/alc-review/submission-documents/submission-documents.component.ts create mode 100644 portal-frontend/src/app/features/public/notification/public-notification.component.html create mode 100644 portal-frontend/src/app/features/public/notification/public-notification.component.scss create mode 100644 portal-frontend/src/app/features/public/notification/public-notification.component.spec.ts create mode 100644 portal-frontend/src/app/features/public/notification/public-notification.component.ts create mode 100644 portal-frontend/src/app/features/public/notification/public-notification.module.ts create mode 100644 portal-frontend/src/app/features/public/notification/submission/additional-information/additional-information.component.html create mode 100644 portal-frontend/src/app/features/public/notification/submission/additional-information/additional-information.component.scss create mode 100644 portal-frontend/src/app/features/public/notification/submission/additional-information/additional-information.component.spec.ts create mode 100644 portal-frontend/src/app/features/public/notification/submission/additional-information/additional-information.component.ts create mode 100644 portal-frontend/src/app/features/public/notification/submission/parcel/parcel.component.html create mode 100644 portal-frontend/src/app/features/public/notification/submission/parcel/parcel.component.scss create mode 100644 portal-frontend/src/app/features/public/notification/submission/parcel/parcel.component.spec.ts create mode 100644 portal-frontend/src/app/features/public/notification/submission/parcel/parcel.component.ts create mode 100644 portal-frontend/src/app/features/public/notification/submission/proposal-details/proposal-details.component.html create mode 100644 portal-frontend/src/app/features/public/notification/submission/proposal-details/proposal-details.component.scss create mode 100644 portal-frontend/src/app/features/public/notification/submission/proposal-details/proposal-details.component.spec.ts create mode 100644 portal-frontend/src/app/features/public/notification/submission/proposal-details/proposal-details.component.ts create mode 100644 portal-frontend/src/app/features/public/notification/submission/submission-details.component.html create mode 100644 portal-frontend/src/app/features/public/notification/submission/submission-details.component.scss create mode 100644 portal-frontend/src/app/features/public/notification/submission/submission-details.component.spec.ts create mode 100644 portal-frontend/src/app/features/public/notification/submission/submission-details.component.ts create mode 100644 portal-frontend/src/app/services/public/public-notification.dto.ts create mode 100644 services/apps/alcs/src/portal/public/notification/public-notification.dto.ts create mode 100644 services/apps/alcs/src/portal/public/notification/public-notification.service.spec.ts create mode 100644 services/apps/alcs/src/portal/public/notification/public-notification.service.ts create mode 100644 services/apps/alcs/src/portal/public/public.dto.ts diff --git a/portal-frontend/src/app/features/public/application/submission/submission-details.component.spec.ts b/portal-frontend/src/app/features/public/application/submission/submission-details.component.spec.ts index a06f7a8d15..4f407dd4e4 100644 --- a/portal-frontend/src/app/features/public/application/submission/submission-details.component.spec.ts +++ b/portal-frontend/src/app/features/public/application/submission/submission-details.component.spec.ts @@ -1,7 +1,6 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { createMock, DeepMocked } from '@golevelup/ts-jest'; -import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; import { CodeService } from '../../../../services/code/code.service'; import { SubmissionDetailsComponent } from './submission-details.component'; @@ -10,11 +9,9 @@ describe('SubmissionDetailsComponent', () => { let component: SubmissionDetailsComponent; let fixture: ComponentFixture<SubmissionDetailsComponent>; let mockCodeService: DeepMocked<CodeService>; - let mockAppDocumentService: DeepMocked<ApplicationDocumentService>; beforeEach(async () => { mockCodeService = createMock(); - mockAppDocumentService = createMock(); await TestBed.configureTestingModule({ providers: [ @@ -22,10 +19,6 @@ describe('SubmissionDetailsComponent', () => { provide: CodeService, useValue: mockCodeService, }, - { - provide: ApplicationDocumentService, - useValue: mockAppDocumentService, - }, ], declarations: [SubmissionDetailsComponent], schemas: [NO_ERRORS_SCHEMA], diff --git a/portal-frontend/src/app/features/public/application/submission/submission-details.component.ts b/portal-frontend/src/app/features/public/application/submission/submission-details.component.ts index ff55884b0b..bde5ff49fd 100644 --- a/portal-frontend/src/app/features/public/application/submission/submission-details.component.ts +++ b/portal-frontend/src/app/features/public/application/submission/submission-details.component.ts @@ -1,11 +1,11 @@ import { Component, Input, OnDestroy, OnInit } from '@angular/core'; import { Subject } from 'rxjs'; -import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; import { PARCEL_TYPE } from '../../../../services/application-parcel/application-parcel.dto'; import { LocalGovernmentDto } from '../../../../services/code/code.dto'; import { CodeService } from '../../../../services/code/code.service'; import { PublicApplicationSubmissionDto } from '../../../../services/public/public-application.dto'; import { PublicDocumentDto, PublicOwnerDto, PublicParcelDto } from '../../../../services/public/public.dto'; +import { PublicService } from '../../../../services/public/public.service'; import { OWNER_TYPE } from '../../../../shared/dto/owner.dto'; @Component({ @@ -27,7 +27,7 @@ export class SubmissionDetailsComponent implements OnInit, OnDestroy { private localGovernments: LocalGovernmentDto[] = []; - constructor(private codeService: CodeService, private applicationDocumentService: ApplicationDocumentService) {} + constructor(private codeService: CodeService) {} ngOnInit(): void { this.loadGovernments(); @@ -44,11 +44,6 @@ export class SubmissionDetailsComponent implements OnInit, OnDestroy { this.$destroy.complete(); } - async openFile(uuid: string) { - const res = await this.applicationDocumentService.openFile(uuid); - window.open(res?.url, '_blank'); - } - private async loadGovernments() { const codes = await this.codeService.loadCodes(); this.localGovernments = codes.localGovernments.sort((a, b) => (a.name > b.name ? 1 : -1)); diff --git a/portal-frontend/src/app/features/public/notice-of-intent/submission/submission-details.component.spec.ts b/portal-frontend/src/app/features/public/notice-of-intent/submission/submission-details.component.spec.ts index a06f7a8d15..4f407dd4e4 100644 --- a/portal-frontend/src/app/features/public/notice-of-intent/submission/submission-details.component.spec.ts +++ b/portal-frontend/src/app/features/public/notice-of-intent/submission/submission-details.component.spec.ts @@ -1,7 +1,6 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { createMock, DeepMocked } from '@golevelup/ts-jest'; -import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; import { CodeService } from '../../../../services/code/code.service'; import { SubmissionDetailsComponent } from './submission-details.component'; @@ -10,11 +9,9 @@ describe('SubmissionDetailsComponent', () => { let component: SubmissionDetailsComponent; let fixture: ComponentFixture<SubmissionDetailsComponent>; let mockCodeService: DeepMocked<CodeService>; - let mockAppDocumentService: DeepMocked<ApplicationDocumentService>; beforeEach(async () => { mockCodeService = createMock(); - mockAppDocumentService = createMock(); await TestBed.configureTestingModule({ providers: [ @@ -22,10 +19,6 @@ describe('SubmissionDetailsComponent', () => { provide: CodeService, useValue: mockCodeService, }, - { - provide: ApplicationDocumentService, - useValue: mockAppDocumentService, - }, ], declarations: [SubmissionDetailsComponent], schemas: [NO_ERRORS_SCHEMA], diff --git a/portal-frontend/src/app/features/public/notice-of-intent/submission/submission-details.component.ts b/portal-frontend/src/app/features/public/notice-of-intent/submission/submission-details.component.ts index 92def23ca1..1d21cf83fc 100644 --- a/portal-frontend/src/app/features/public/notice-of-intent/submission/submission-details.component.ts +++ b/portal-frontend/src/app/features/public/notice-of-intent/submission/submission-details.component.ts @@ -1,6 +1,5 @@ import { Component, Input, OnDestroy, OnInit } from '@angular/core'; import { Subject } from 'rxjs'; -import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; import { PARCEL_TYPE } from '../../../../services/application-parcel/application-parcel.dto'; import { LocalGovernmentDto } from '../../../../services/code/code.dto'; import { CodeService } from '../../../../services/code/code.service'; @@ -27,7 +26,7 @@ export class SubmissionDetailsComponent implements OnInit, OnDestroy { private localGovernments: LocalGovernmentDto[] = []; - constructor(private codeService: CodeService, private applicationDocumentService: ApplicationDocumentService) {} + constructor(private codeService: CodeService) {} ngOnInit(): void { this.loadGovernments(); @@ -44,11 +43,6 @@ export class SubmissionDetailsComponent implements OnInit, OnDestroy { this.$destroy.complete(); } - async openFile(uuid: string) { - const res = await this.applicationDocumentService.openFile(uuid); - window.open(res?.url, '_blank'); - } - private async loadGovernments() { const codes = await this.codeService.loadCodes(); this.localGovernments = codes.localGovernments.sort((a, b) => (a.name > b.name ? 1 : -1)); diff --git a/portal-frontend/src/app/features/public/notification/alc-review/alc-review.component.html b/portal-frontend/src/app/features/public/notification/alc-review/alc-review.component.html new file mode 100644 index 0000000000..6e81d7ef34 --- /dev/null +++ b/portal-frontend/src/app/features/public/notification/alc-review/alc-review.component.html @@ -0,0 +1,8 @@ +<div> + <div class="header"> + <h3>ALC Review and Decision</h3> + </div> + <div> + <app-submission-documents [documents]="documents"></app-submission-documents> + </div> +</div> diff --git a/portal-frontend/src/app/features/public/notification/alc-review/alc-review.component.scss b/portal-frontend/src/app/features/public/notification/alc-review/alc-review.component.scss new file mode 100644 index 0000000000..7ca8d1c637 --- /dev/null +++ b/portal-frontend/src/app/features/public/notification/alc-review/alc-review.component.scss @@ -0,0 +1,8 @@ +@use '../../../../../styles/functions' as *; +@use '../../../../../styles/colors'; + +.warning { + background-color: rgba(colors.$accent-color-light, 0.5); + padding: rem(16); + margin-bottom: rem(24); +} diff --git a/portal-frontend/src/app/features/public/notification/alc-review/alc-review.component.spec.ts b/portal-frontend/src/app/features/public/notification/alc-review/alc-review.component.spec.ts new file mode 100644 index 0000000000..23284b9844 --- /dev/null +++ b/portal-frontend/src/app/features/public/notification/alc-review/alc-review.component.spec.ts @@ -0,0 +1,25 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { PublicAlcReviewComponent } from './alc-review.component'; + +describe('PublicAlcReviewComponent', () => { + let component: PublicAlcReviewComponent; + let fixture: ComponentFixture<PublicAlcReviewComponent>; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + providers: [], + declarations: [PublicAlcReviewComponent], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(PublicAlcReviewComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/public/notification/alc-review/alc-review.component.ts b/portal-frontend/src/app/features/public/notification/alc-review/alc-review.component.ts new file mode 100644 index 0000000000..d822d4b3ed --- /dev/null +++ b/portal-frontend/src/app/features/public/notification/alc-review/alc-review.component.ts @@ -0,0 +1,16 @@ +import { Component, Input } from '@angular/core'; +import { ApplicationPortalDecisionDto } from '../../../../services/application-decision/application-decision.dto'; +import { PublicNoticeOfIntentSubmissionDto } from '../../../../services/public/public-notice-of-intent.dto'; +import { PublicNotificationSubmissionDto } from '../../../../services/public/public-notification.dto'; +import { PublicDocumentDto } from '../../../../services/public/public.dto'; + +@Component({ + selector: 'app-public-alc-review', + templateUrl: './alc-review.component.html', + styleUrls: ['./alc-review.component.scss'], +}) +export class PublicAlcReviewComponent { + @Input() documents!: PublicDocumentDto[]; + + constructor() {} +} diff --git a/portal-frontend/src/app/features/public/notification/alc-review/submission-documents/submission-documents.component.html b/portal-frontend/src/app/features/public/notification/alc-review/submission-documents/submission-documents.component.html new file mode 100644 index 0000000000..45f473c3d5 --- /dev/null +++ b/portal-frontend/src/app/features/public/notification/alc-review/submission-documents/submission-documents.component.html @@ -0,0 +1,43 @@ +<h4>Application Documents</h4> +<div class="table-container"> + <table mat-table [dataSource]="dataSource" matSort class="mat-elevation-z3 documents"> + <ng-container matColumnDef="type"> + <th mat-header-cell *matHeaderCellDef mat-sort-header sortActionDescription="Sort by type">Type</th> + <td mat-cell *matCellDef="let element"> + {{ element.type?.label }} + </td> + </ng-container> + + <ng-container matColumnDef="fileName"> + <th mat-header-cell *matHeaderCellDef mat-sort-header sortActionDescription="Sort by name">Document Name</th> + <td mat-cell *matCellDef="let element"> + <a (click)="openFile(element.uuid)">{{ element.fileName }}</a> + </td> + </ng-container> + + <ng-container matColumnDef="source"> + <th mat-header-cell *matHeaderCellDef mat-sort-header sortActionDescription="Sort by source">Source</th> + <td mat-cell *matCellDef="let element">{{ element.source }}</td> + </ng-container> + + <ng-container matColumnDef="uploadedAt"> + <th mat-header-cell *matHeaderCellDef mat-sort-header sortActionDescription="Sort by date">Upload Date</th> + <td mat-cell *matCellDef="let element">{{ element.uploadedAt | date }}</td> + </ng-container> + + <ng-container matColumnDef="actions"> + <th mat-header-cell *matHeaderCellDef>Actions</th> + <td mat-cell *matCellDef="let element"> + <button mat-icon-button (click)="downloadFile(element.uuid)"> + <mat-icon>file_download</mat-icon> + </button> + </td> + </ng-container> + + <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr> + <tr mat-row *matRowDef="let row; columns: displayedColumns"></tr> + <tr class="mat-row" *matNoDataRow> + <td class="text-center" colspan="6">Documents will be visible here once provided by ALC</td> + </tr> + </table> +</div> diff --git a/portal-frontend/src/app/features/public/notification/alc-review/submission-documents/submission-documents.component.scss b/portal-frontend/src/app/features/public/notification/alc-review/submission-documents/submission-documents.component.scss new file mode 100644 index 0000000000..0027146765 --- /dev/null +++ b/portal-frontend/src/app/features/public/notification/alc-review/submission-documents/submission-documents.component.scss @@ -0,0 +1,25 @@ +@use '../../../../../../styles/colors'; +@use '../../../../../../styles/functions' as *; + +.header { + display: flex; + justify-content: space-between; +} + +.table-container { + margin: rem(4); + overflow-x: auto; +} + +.documents { + margin-top: rem(12); +} + +.mat-mdc-no-data-row { + height: rem(56); + color: colors.$grey-dark; +} + +a { + word-break: break-all; +} diff --git a/portal-frontend/src/app/features/public/notification/alc-review/submission-documents/submission-documents.component.spec.ts b/portal-frontend/src/app/features/public/notification/alc-review/submission-documents/submission-documents.component.spec.ts new file mode 100644 index 0000000000..a2f54298d3 --- /dev/null +++ b/portal-frontend/src/app/features/public/notification/alc-review/submission-documents/submission-documents.component.spec.ts @@ -0,0 +1,35 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { PublicService } from '../../../../../services/public/public.service'; + +import { PublicSubmissionDocumentsComponent } from './submission-documents.component'; + +describe('PublicSubmissionDocumentsComponent', () => { + let component: PublicSubmissionDocumentsComponent; + let fixture: ComponentFixture<PublicSubmissionDocumentsComponent>; + let mockPublicService: DeepMocked<PublicService>; + + beforeEach(async () => { + mockPublicService = createMock(); + + await TestBed.configureTestingModule({ + declarations: [PublicSubmissionDocumentsComponent], + providers: [ + { + provide: PublicService, + useValue: mockPublicService, + }, + ], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(PublicSubmissionDocumentsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/public/notification/alc-review/submission-documents/submission-documents.component.ts b/portal-frontend/src/app/features/public/notification/alc-review/submission-documents/submission-documents.component.ts new file mode 100644 index 0000000000..1fe9103978 --- /dev/null +++ b/portal-frontend/src/app/features/public/notification/alc-review/submission-documents/submission-documents.component.ts @@ -0,0 +1,56 @@ +import { Component, Input, OnDestroy, OnInit, ViewChild } from '@angular/core'; +import { MatSort } from '@angular/material/sort'; +import { MatTableDataSource } from '@angular/material/table'; +import { Subject } from 'rxjs'; +import { PublicNoticeOfIntentSubmissionDto } from '../../../../../services/public/public-notice-of-intent.dto'; +import { PublicDocumentDto } from '../../../../../services/public/public.dto'; +import { PublicService } from '../../../../../services/public/public.service'; + +@Component({ + selector: 'app-submission-documents', + templateUrl: './submission-documents.component.html', + styleUrls: ['./submission-documents.component.scss'], +}) +export class PublicSubmissionDocumentsComponent implements OnInit, OnDestroy { + private $destroy = new Subject<void>(); + + displayedColumns: string[] = ['type', 'fileName', 'source', 'uploadedAt', 'actions']; + @Input() documents!: PublicDocumentDto[]; + @Input() submission!: PublicNoticeOfIntentSubmissionDto; + + @ViewChild(MatSort) sort!: MatSort; + dataSource: MatTableDataSource<PublicDocumentDto> = new MatTableDataSource<PublicDocumentDto>(); + + constructor(private publicService: PublicService) {} + + ngOnInit(): void { + this.dataSource = new MatTableDataSource(this.documents); + } + + async openFile(uuid: string) { + const res = await this.publicService.getNoticeOfIntentOpenFileUrl(this.submission.fileNumber, uuid); + if (res) { + window.open(res.url, '_blank'); + } + } + + async downloadFile(uuid: string) { + const res = await this.publicService.getNoticeOfIntentOpenFileUrl(this.submission.fileNumber, 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(); + } +} diff --git a/portal-frontend/src/app/features/public/notification/public-notification.component.html b/portal-frontend/src/app/features/public/notification/public-notification.component.html new file mode 100644 index 0000000000..bd6c7ab639 --- /dev/null +++ b/portal-frontend/src/app/features/public/notification/public-notification.component.html @@ -0,0 +1,56 @@ +<div aria-hidden="true" class="banner absolute"> + <div> + <h4 *ngIf="submission">Notification ID: {{ submission.fileNumber }} | {{ submission.type }}</h4> + </div> + <div class="banner-status"> + <div> + <div class="subheading2">Status Date</div> + <span *ngIf="submission">{{ submission.lastStatusUpdate | date }}</span> + </div> + <div> + <div class="subheading2">Status</div> + <span *ngIf="submission">{{ submission.status.label }}</span> + </div> + </div> +</div> +<div class="banner"> + <div> + <h4 *ngIf="submission">Notification ID: {{ submission.fileNumber }}</h4> + </div> + <div class="banner-status"> + <div> + <div class="subheading2">Status Date</div> + <span *ngIf="submission">{{ submission.lastStatusUpdate | date }}</span> + </div> + <div> + <div class="subheading2">Status</div> + <span *ngIf="submission">{{ submission.status.label }}</span> + </div> + </div> +</div> +<button routerLink="/public" mat-button color="accent"> + <mat-icon>chevron_left</mat-icon> + Return to Search Results +</button> +<div> + <div class="navigation"> + <mat-tab-group> + <mat-tab label="Applicant Submission"> + <div *ngIf="submission" class="content"> + <section> + <div class="header"> + <h3>Applicant Submission</h3> + </div> + <app-public-app-submission-details [documents]="documents" [submission]="submission" [parcels]="parcels"> + </app-public-app-submission-details> + </section> + </div> + </mat-tab> + <mat-tab label="ALC Review and Decision"> + <div *ngIf="submission" class="content"> + <app-public-alc-review [documents]="documents"></app-public-alc-review> + </div> + </mat-tab> + </mat-tab-group> + </div> +</div> diff --git a/portal-frontend/src/app/features/public/notification/public-notification.component.scss b/portal-frontend/src/app/features/public/notification/public-notification.component.scss new file mode 100644 index 0000000000..0e74e9ca5b --- /dev/null +++ b/portal-frontend/src/app/features/public/notification/public-notification.component.scss @@ -0,0 +1,105 @@ +@use '../../../../styles/functions' as *; +@use '../../../../styles/colors'; + +.navigation { + ::ng-deep .mdc-tab__text-label { + font-weight: bold; + } +} + +.content { + margin: rem(24) 0; +} + +:host::ng-deep { + .header { + display: flex; + justify-content: space-between; + align-items: center; + margin-bottom: rem(24); + flex-direction: column; + + @media screen and (min-width: $tabletBreakpoint) { + flex-direction: row; + } + + h3 { + margin-top: rem(8) !important; + } + + .btns-wrapper { + display: flex; + flex-direction: column-reverse; + width: 100%; + + button { + margin-top: rem(16) !important; + } + + @media screen and (min-width: $tabletBreakpoint) { + display: inline-block; + width: unset; + + button { + margin-right: rem(16) !important; + margin-top: rem(8) !important; + } + + button:last-child { + margin-right: 0 !important; + } + } + } + } +} + +.absolute { + position: absolute; + left: 0; + right: 0; +} + +.banner { + background-color: colors.$secondary-color; + width: 100%; + color: #fff; + padding: rem(16) rem(24); + margin-bottom: rem(32); + + @media screen and (min-width: $tabletBreakpoint) { + padding: rem(12) rem(36) !important; + } + + // TODO: this is just a placeholder and will be addressed later + @media screen and (min-width: $desktopBreakpoint) { + padding: rem(18) rem(80) !important; + } + + .banner-status { + margin: rem(16) 0; + display: grid; + grid-template-columns: 1fr; + + div { + margin-top: rem(16); + } + + @media screen and (min-width: $tabletBreakpoint) { + grid-template-columns: 1fr 1fr; + margin-bottom: 0; + } + } +} + +.no-comment { + color: colors.$grey-dark; + font-style: italic; +} + +section { + margin-bottom: rem(24); +} + +.document { + margin-bottom: rem(8); +} diff --git a/portal-frontend/src/app/features/public/notification/public-notification.component.spec.ts b/portal-frontend/src/app/features/public/notification/public-notification.component.spec.ts new file mode 100644 index 0000000000..075df84c1b --- /dev/null +++ b/portal-frontend/src/app/features/public/notification/public-notification.component.spec.ts @@ -0,0 +1,49 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { ActivatedRoute } from '@angular/router'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { BehaviorSubject } from 'rxjs'; +import { PublicService } from '../../../services/public/public.service'; + +import { PublicNotificationComponent } from './public-notification.component'; + +describe('PublicNoticeOfIntentComponent', () => { + let component: PublicNotificationComponent; + let fixture: ComponentFixture<PublicNotificationComponent>; + + let mockRoute; + let mockPublicService: DeepMocked<PublicService>; + + let routeParamMap: BehaviorSubject<Map<string, any>>; + + beforeEach(async () => { + mockRoute = createMock(); + mockPublicService = createMock(); + + routeParamMap = new BehaviorSubject(new Map()); + mockRoute.paramMap = routeParamMap; + + await TestBed.configureTestingModule({ + providers: [ + { + provide: ActivatedRoute, + useValue: mockRoute, + }, + { + provide: PublicService, + useValue: mockPublicService, + }, + ], + declarations: [PublicNotificationComponent], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(PublicNotificationComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/public/notification/public-notification.component.ts b/portal-frontend/src/app/features/public/notification/public-notification.component.ts new file mode 100644 index 0000000000..7d51fc676e --- /dev/null +++ b/portal-frontend/src/app/features/public/notification/public-notification.component.ts @@ -0,0 +1,48 @@ +import { Component, OnDestroy, OnInit } from '@angular/core'; +import { ActivatedRoute } from '@angular/router'; +import { Subject, takeUntil } from 'rxjs'; +import { ApplicationPortalDecisionDto } from '../../../services/application-decision/application-decision.dto'; +import { PublicNotificationSubmissionDto } from '../../../services/public/public-notification.dto'; +import { PublicDocumentDto, PublicParcelDto } from '../../../services/public/public.dto'; +import { PublicService } from '../../../services/public/public.service'; + +@Component({ + selector: 'app-public-notification', + templateUrl: './public-notification.component.html', + styleUrls: ['./public-notification.component.scss'], +}) +export class PublicNotificationComponent implements OnInit, OnDestroy { + $destroy = new Subject<void>(); + + submission: PublicNotificationSubmissionDto | undefined; + documents: PublicDocumentDto[] = []; + parcels: PublicParcelDto[] = []; + decisions: ApplicationPortalDecisionDto[] = []; + + constructor(private publicService: PublicService, private route: ActivatedRoute) {} + + ngOnInit(): void { + this.route.paramMap.pipe(takeUntil(this.$destroy)).subscribe((routeParams) => { + const fileId = routeParams.get('fileId'); + if (fileId) { + this.loadApplication(fileId); + } + }); + } + + private async loadApplication(fileId: string) { + const res = await this.publicService.getNotification(fileId); + if (res) { + const { submission, documents, parcels } = res; + + this.submission = submission; + this.documents = documents; + this.parcels = parcels; + } + } + + ngOnDestroy(): void { + this.$destroy.next(); + this.$destroy.complete(); + } +} diff --git a/portal-frontend/src/app/features/public/notification/public-notification.module.ts b/portal-frontend/src/app/features/public/notification/public-notification.module.ts new file mode 100644 index 0000000000..712957f4d1 --- /dev/null +++ b/portal-frontend/src/app/features/public/notification/public-notification.module.ts @@ -0,0 +1,44 @@ +import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; +import { MatAutocompleteModule } from '@angular/material/autocomplete'; +import { MatPaginatorModule } from '@angular/material/paginator'; +import { MatSortModule } from '@angular/material/sort'; +import { MatTreeModule } from '@angular/material/tree'; +import { RouterModule, Routes } from '@angular/router'; +import { SharedModule } from '../../../shared/shared.module'; +import { PublicAlcReviewComponent } from './alc-review/alc-review.component'; +import { PublicSubmissionDocumentsComponent } from './alc-review/submission-documents/submission-documents.component'; +import { PublicNotificationComponent } from './public-notification.component'; +import { AdditionalInformationComponent } from './submission/additional-information/additional-information.component'; +import { ParcelComponent } from './submission/parcel/parcel.component'; +import { ProposalDetailsComponent } from './submission/proposal-details/proposal-details.component'; +import { SubmissionDetailsComponent } from './submission/submission-details.component'; + +const routes: Routes = [ + { + path: ':fileId', + component: PublicNotificationComponent, + }, +]; + +@NgModule({ + declarations: [ + PublicNotificationComponent, + PublicAlcReviewComponent, + PublicSubmissionDocumentsComponent, + ParcelComponent, + SubmissionDetailsComponent, + ProposalDetailsComponent, + AdditionalInformationComponent, + ], + imports: [ + CommonModule, + SharedModule, + MatPaginatorModule, + MatSortModule, + RouterModule.forChild(routes), + MatAutocompleteModule, + MatTreeModule, + ], +}) +export class PublicNotificationModule {} diff --git a/portal-frontend/src/app/features/public/notification/submission/additional-information/additional-information.component.html b/portal-frontend/src/app/features/public/notification/submission/additional-information/additional-information.component.html new file mode 100644 index 0000000000..dcc15e93fa --- /dev/null +++ b/portal-frontend/src/app/features/public/notification/submission/additional-information/additional-information.component.html @@ -0,0 +1,76 @@ +<div *ngIf="noiSubmission" class="review-table"> + <div class="subheading2 grid-1"> + {{ firstQuestion }} + </div> + <div class="grid-double"> + <span *ngIf="noiSubmission.soilIsRemovingSoilForNewStructure !== null"> + {{ noiSubmission.soilIsRemovingSoilForNewStructure ? 'Yes' : 'No' }} + </span> + <app-no-data *ngIf="noiSubmission.soilIsRemovingSoilForNewStructure === null"></app-no-data> + </div> + + <ng-container *ngIf="noiSubmission.soilIsRemovingSoilForNewStructure"> + <div class="full-width subheading2">The total floor area (m<sup>2</sup>) of the proposed structure(s)</div> + <div class="full-width soil-table"> + <div class="grid-1 subheading2">#</div> + <div class="grid-2 subheading2">Type</div> + <div class="grid-3 subheading2">Area</div> + <ng-container *ngFor="let structure of noiSubmission.soilProposedStructures; let i = index"> + <div class="grid-1"> + {{ i + 1 }} + </div> + <div class="grid-2"> + {{ structure.type }} + <app-no-data *ngIf="!structure.type"></app-no-data> + </div> + <div class="grid-3"> + {{ structure.area }} + <app-no-data *ngIf="!structure.area"></app-no-data> + </div> + </ng-container> + <div *ngIf="noiSubmission.soilProposedStructures.length === 0" class="full-width"> + <app-no-data></app-no-data> + </div> + </div> + + <ng-container *ngIf="isSoilStructureFarmUseReasonVisible"> + <div class="subheading2 grid-1">Describe how the structure is necessary for farm use</div> + <div class="grid-double"> + {{ noiSubmission.soilStructureFarmUseReason }} + <app-no-data *ngIf="!noiSubmission.soilStructureFarmUseReason"></app-no-data> + </div> + </ng-container> + + <ng-container *ngIf="isSoilStructureResidentialUseReasonVisible"> + <div class="subheading2 grid-1">Describe how the structure is necessary for residential use</div> + <div class="grid-double"> + {{ noiSubmission.soilStructureResidentialUseReason }} + <app-no-data *ngIf="!noiSubmission.soilStructureResidentialUseReason"></app-no-data> + </div> + </ng-container> + + <ng-container *ngIf="isSoilAgriParcelActivityVisible"> + <div class="subheading2 grid-1">Describe the current agricultural activity on the parcel(s)</div> + <div class="grid-double"> + {{ noiSubmission.soilAgriParcelActivity }} + <app-no-data *ngIf="!noiSubmission.soilAgriParcelActivity"></app-no-data> + </div> + </ng-container> + + <ng-container *ngIf="isSoilStructureResidentialAccessoryUseReasonVisible"> + <div class="subheading2 grid-1">Describe the intended use of the residential accessory structure</div> + <div class="grid-double"> + {{ noiSubmission.soilStructureResidentialAccessoryUseReason }} + <app-no-data *ngIf="!noiSubmission.soilStructureResidentialAccessoryUseReason"></app-no-data> + </div> + </ng-container> + + <ng-container *ngIf="isSoilOtherStructureVisible"> + <div class="subheading2 grid-1">Describe the intended use of the 'Other' structure</div> + <div class="grid-double"> + {{ noiSubmission.soilStructureOtherUseReason }} + <app-no-data *ngIf="!noiSubmission.soilStructureOtherUseReason"></app-no-data> + </div> + </ng-container> + </ng-container> +</div> diff --git a/portal-frontend/src/app/features/public/notification/submission/additional-information/additional-information.component.scss b/portal-frontend/src/app/features/public/notification/submission/additional-information/additional-information.component.scss new file mode 100644 index 0000000000..bfe0899632 --- /dev/null +++ b/portal-frontend/src/app/features/public/notification/submission/additional-information/additional-information.component.scss @@ -0,0 +1,5 @@ +.multiple-documents { + a { + display: block; + } +} diff --git a/portal-frontend/src/app/features/public/notification/submission/additional-information/additional-information.component.spec.ts b/portal-frontend/src/app/features/public/notification/submission/additional-information/additional-information.component.spec.ts new file mode 100644 index 0000000000..417628f883 --- /dev/null +++ b/portal-frontend/src/app/features/public/notification/submission/additional-information/additional-information.component.spec.ts @@ -0,0 +1,31 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { DeepMocked } from '@golevelup/ts-jest'; +import { PublicService } from '../../../../../services/public/public.service'; + +import { AdditionalInformationComponent } from './additional-information.component'; + +describe('AdditionalInformationComponent', () => { + let component: AdditionalInformationComponent; + let fixture: ComponentFixture<AdditionalInformationComponent>; + let mockPublicService: DeepMocked<PublicService>; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [AdditionalInformationComponent], + providers: [ + { + provide: PublicService, + useValue: mockPublicService, + }, + ], + }).compileComponents(); + + fixture = TestBed.createComponent(AdditionalInformationComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/public/notification/submission/additional-information/additional-information.component.ts b/portal-frontend/src/app/features/public/notification/submission/additional-information/additional-information.component.ts new file mode 100644 index 0000000000..a21f812bd0 --- /dev/null +++ b/portal-frontend/src/app/features/public/notification/submission/additional-information/additional-information.component.ts @@ -0,0 +1,77 @@ +import { Component, Input, OnInit } from '@angular/core'; +import { Router } from '@angular/router'; +import { PublicNoticeOfIntentSubmissionDto } from '../../../../../services/public/public-notice-of-intent.dto'; +import { PublicDocumentDto } from '../../../../../services/public/public.dto'; +import { PublicService } from '../../../../../services/public/public.service'; +import { DOCUMENT_TYPE } from '../../../../../shared/dto/document.dto'; +import { + RESIDENTIAL_STRUCTURE_TYPES, + STRUCTURE_TYPES, +} from '../../../../notice-of-intents/edit-submission/additional-information/additional-information.component'; + +@Component({ + selector: 'app-additional-information', + templateUrl: './additional-information.component.html', + styleUrls: ['./additional-information.component.scss'], +}) +export class AdditionalInformationComponent implements OnInit { + firstQuestion = 'FIX THIS'; + + @Input() noiSubmission!: PublicNoticeOfIntentSubmissionDto; + + @Input() set noiDocuments(documents: PublicDocumentDto[]) { + this.buildingPlans = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.BUILDING_PLAN); + } + + buildingPlans: PublicDocumentDto[] = []; + + isSoilStructureFarmUseReasonVisible = false; + isSoilStructureResidentialUseReasonVisible = false; + isSoilAgriParcelActivityVisible = false; + isSoilStructureResidentialAccessoryUseReasonVisible = false; + isSoilOtherStructureVisible = false; + + constructor(private router: Router, private publicService: PublicService) {} + + ngOnInit(): void { + this.setVisibilityForResidentialFields(); + this.setValidatorsForAccessoryFields(); + this.setVisibilityForFarmFields(); + this.setVisibilityForOtherFields(); + } + + private setVisibilityForResidentialFields() { + this.isSoilStructureResidentialUseReasonVisible = !!this.noiSubmission?.soilProposedStructures.some( + (structure) => structure.type && RESIDENTIAL_STRUCTURE_TYPES.includes(structure.type) + ); + } + + private setValidatorsForAccessoryFields() { + this.isSoilStructureResidentialAccessoryUseReasonVisible = !!this.noiSubmission?.soilProposedStructures.some( + (structure) => structure.type === STRUCTURE_TYPES.ACCESSORY_STRUCTURE + ); + } + + private setVisibilityForFarmFields() { + if ( + this.noiSubmission?.soilProposedStructures.some((structure) => structure.type === STRUCTURE_TYPES.FARM_STRUCTURE) + ) { + this.isSoilAgriParcelActivityVisible = true; + this.isSoilStructureFarmUseReasonVisible = true; + } else { + this.isSoilAgriParcelActivityVisible = false; + this.isSoilStructureFarmUseReasonVisible = false; + } + } + + private setVisibilityForOtherFields() { + this.isSoilOtherStructureVisible = !!this.noiSubmission?.soilProposedStructures.some( + (structure) => structure.type === STRUCTURE_TYPES.OTHER_STRUCTURE + ); + } + + async openFile(uuid: string) { + const res = await this.publicService.getNoticeOfIntentOpenFileUrl(this.noiSubmission.fileNumber, uuid); + window.open(res?.url, '_blank'); + } +} diff --git a/portal-frontend/src/app/features/public/notification/submission/parcel/parcel.component.html b/portal-frontend/src/app/features/public/notification/submission/parcel/parcel.component.html new file mode 100644 index 0000000000..26c2dd4dd4 --- /dev/null +++ b/portal-frontend/src/app/features/public/notification/submission/parcel/parcel.component.html @@ -0,0 +1,42 @@ +<h3 class="flex-item"> + {{ pageTitle }} +</h3> +<div class="review-table"> + <ng-container *ngFor="let parcel of parcels; let parcelInd = index"> + <div class="full-width flex-space-between-wrap"> + <h4>Parcel {{ parcelInd + 1 }}: Parcel and Owner Information</h4> + </div> + <div class="subheading2 grid-1">Ownership Type</div> + <div class="grid-double"> + {{ parcel.ownershipType?.label }} + <app-no-data *ngIf="!parcel.ownershipType"></app-no-data> + </div> + <div class="subheading2 grid-1">Legal Description</div> + <div class="grid-double"> + {{ parcel.legalDescription }} + </div> + <div class="subheading2 grid-1">Area (Hectares)</div> + <div class="grid-double"> + {{ parcel.mapAreaHectares }} + </div> + <div class="subheading2 grid-1"> + PID {{ parcel.ownershipType?.code === PARCEL_OWNERSHIP_TYPES.CROWN ? '(optional)' : '' }} + </div> + <div class="grid-double"> + <span *ngIf="parcel.pid">{{ parcel.pid | mask : '000-000-000' }}</span> + <app-no-data *ngIf="!parcel.pid"></app-no-data> + </div> + <ng-container *ngIf="parcel.ownershipType?.code === PARCEL_OWNERSHIP_TYPES.CROWN"> + <div class="subheading2 grid-1">PIN (optional)</div> + <div class="grid-double"> + {{ parcel.pin }} + <app-no-data *ngIf="!parcel.pin"></app-no-data> + </div> + </ng-container> + <div class="subheading2 grid-1">Civic Address</div> + <div class="grid-double"> + {{ parcel.civicAddress }} + <app-no-data *ngIf="!parcel.civicAddress"></app-no-data> + </div> + </ng-container> +</div> diff --git a/portal-frontend/src/app/features/public/notification/submission/parcel/parcel.component.scss b/portal-frontend/src/app/features/public/notification/submission/parcel/parcel.component.scss new file mode 100644 index 0000000000..70c42d9449 --- /dev/null +++ b/portal-frontend/src/app/features/public/notification/submission/parcel/parcel.component.scss @@ -0,0 +1,13 @@ +@use '../../../../../../styles/functions' as *; + +.review-table { + grid-template-columns: 1fr 1fr !important; + + .full-width { + grid-column: 1/3; + } +} + +.crown-land { + text-transform: capitalize; +} diff --git a/portal-frontend/src/app/features/public/notification/submission/parcel/parcel.component.spec.ts b/portal-frontend/src/app/features/public/notification/submission/parcel/parcel.component.spec.ts new file mode 100644 index 0000000000..ab7cf978f1 --- /dev/null +++ b/portal-frontend/src/app/features/public/notification/submission/parcel/parcel.component.spec.ts @@ -0,0 +1,40 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { Router } from '@angular/router'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { PublicService } from '../../../../../services/public/public.service'; +import { ParcelComponent } from './parcel.component'; + +describe('ParcelComponent', () => { + let component: ParcelComponent; + let fixture: ComponentFixture<ParcelComponent>; + + let mockPublicService: DeepMocked<PublicService>; + + beforeEach(async () => { + mockPublicService = createMock(); + await TestBed.configureTestingModule({ + declarations: [ParcelComponent], + providers: [ + { + provide: PublicService, + useValue: mockPublicService, + }, + { + provides: Router, + useValue: {}, + }, + ], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(ParcelComponent); + component = fixture.componentInstance; + component.submission = {} as any; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/public/notification/submission/parcel/parcel.component.ts b/portal-frontend/src/app/features/public/notification/submission/parcel/parcel.component.ts new file mode 100644 index 0000000000..acaab1ad3e --- /dev/null +++ b/portal-frontend/src/app/features/public/notification/submission/parcel/parcel.component.ts @@ -0,0 +1,36 @@ +import { Component, Input } from '@angular/core'; +import { Subject } from 'rxjs'; +import { PARCEL_OWNERSHIP_TYPE } from '../../../../../services/application-parcel/application-parcel.dto'; +import { PublicNoticeOfIntentSubmissionDto } from '../../../../../services/public/public-notice-of-intent.dto'; +import { PublicNotificationSubmissionDto } from '../../../../../services/public/public-notification.dto'; +import { PublicParcelDto } from '../../../../../services/public/public.dto'; + +@Component({ + selector: 'app-parcel', + templateUrl: './parcel.component.html', + styleUrls: ['./parcel.component.scss'], +}) +export class ParcelComponent { + $destroy = new Subject<void>(); + + @Input() submission!: PublicNotificationSubmissionDto; + @Input() parcels: PublicParcelDto[] = []; + + PARCEL_OWNERSHIP_TYPES = PARCEL_OWNERSHIP_TYPE; + pageTitle: string = 'Identify Parcel(s) Under Application'; + + fileId = ''; + submissionUuid = ''; + + constructor() {} + + ngOnInit(): void { + this.fileId = this.submission.fileNumber; + this.submissionUuid = this.submission.uuid; + } + + ngOnDestroy(): void { + this.$destroy.next(); + this.$destroy.complete(); + } +} diff --git a/portal-frontend/src/app/features/public/notification/submission/proposal-details/proposal-details.component.html b/portal-frontend/src/app/features/public/notification/submission/proposal-details/proposal-details.component.html new file mode 100644 index 0000000000..ddaca2a3e9 --- /dev/null +++ b/portal-frontend/src/app/features/public/notification/submission/proposal-details/proposal-details.component.html @@ -0,0 +1,27 @@ +<div *ngIf="submission" class="review-table other-layout"> + <div class="subheading2 grid-1">Submitter’s File Number</div> + <div class="grid-double"> + {{ submission.submittersFileNumber }} + <app-no-data [showRequired]="showErrors" *ngIf="!submission.submittersFileNumber"></app-no-data> + </div> + + <div class="subheading2 grid-1">What is the purpose of the SRW?</div> + <div class="grid-double"> + {{ submission.purpose }} + <app-no-data [showRequired]="showErrors" *ngIf="!submission.purpose"></app-no-data> + </div> + + <div class="subheading2 grid-1">Total area of the SRW</div> + <div class="grid-double"> + {{ submission.totalArea }} + <app-no-data [showRequired]="showErrors" *ngIf="!submission.totalArea"></app-no-data> + </div> + + <div class="subheading2 grid-1">Is there a survey plan associated with the SRW?</div> + <div class="grid-double"> + <span *ngIf="submission.hasSurveyPlan !== null"> + {{ submission.hasSurveyPlan ? 'Yes' : 'No' }} + </span> + <app-no-data [showRequired]="showErrors" *ngIf="submission.hasSurveyPlan === null"></app-no-data> + </div> +</div> diff --git a/portal-frontend/src/app/features/public/notification/submission/proposal-details/proposal-details.component.scss b/portal-frontend/src/app/features/public/notification/submission/proposal-details/proposal-details.component.scss new file mode 100644 index 0000000000..e69de29bb2 diff --git a/portal-frontend/src/app/features/public/notification/submission/proposal-details/proposal-details.component.spec.ts b/portal-frontend/src/app/features/public/notification/submission/proposal-details/proposal-details.component.spec.ts new file mode 100644 index 0000000000..7183a90aa9 --- /dev/null +++ b/portal-frontend/src/app/features/public/notification/submission/proposal-details/proposal-details.component.spec.ts @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { ProposalDetailsComponent } from './proposal-details.component'; + +describe('ProposalDetailsComponent', () => { + let component: ProposalDetailsComponent; + let fixture: ComponentFixture<ProposalDetailsComponent>; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ProposalDetailsComponent], + providers: [], + }).compileComponents(); + + fixture = TestBed.createComponent(ProposalDetailsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/public/notification/submission/proposal-details/proposal-details.component.ts b/portal-frontend/src/app/features/public/notification/submission/proposal-details/proposal-details.component.ts new file mode 100644 index 0000000000..aa2aa7eb5b --- /dev/null +++ b/portal-frontend/src/app/features/public/notification/submission/proposal-details/proposal-details.component.ts @@ -0,0 +1,14 @@ +import { Component, Input } from '@angular/core'; +import { PublicNotificationSubmissionDto } from '../../../../../services/public/public-notification.dto'; + +@Component({ + selector: 'app-proposal-details[submission]', + templateUrl: './proposal-details.component.html', + styleUrls: ['./proposal-details.component.scss'], +}) +export class ProposalDetailsComponent { + @Input() showErrors = true; + @Input() showEdit = true; + + @Input() submission: PublicNotificationSubmissionDto | undefined; +} diff --git a/portal-frontend/src/app/features/public/notification/submission/submission-details.component.html b/portal-frontend/src/app/features/public/notification/submission/submission-details.component.html new file mode 100644 index 0000000000..e4e90ec4d5 --- /dev/null +++ b/portal-frontend/src/app/features/public/notification/submission/submission-details.component.html @@ -0,0 +1,52 @@ +<section> + <app-parcel [submission]="submission" [parcels]="parcels"></app-parcel> +</section> +<section> + <h3>Identify Transferee(s)</h3> + <div *ngIf="submission" class="review-table"> + <div class="full-width transferee-table"> + <div class="subheading2">Name</div> + <div class="subheading2">Organization Name</div> + <ng-container *ngFor="let transferee of submission.transferees"> + <div>{{ transferee.displayName }}</div> + <div> + {{ transferee.organizationName }} + <app-no-data *ngIf="!transferee.organizationName"></app-no-data> + </div> + </ng-container> + </div> + </div> +</section> +<section> + <h3>Primary Contact</h3> + <div *ngIf="submission" class="review-table"> + <div class="subheading2 grid-1">First Name</div> + <div class="grid-double"> + {{ submission.contactFirstName }} + </div> + <div class="subheading2 grid-1">Last Name</div> + <div class="grid-double"> + {{ submission.contactLastName }} + </div> + <div class="subheading2 grid-1"> + <span>Organization (optional)</span> + </div> + <div class="grid-double"> + {{ submission.contactOrganization }} + <app-no-data *ngIf="!submission.contactOrganization"></app-no-data> + </div> + </div> +</section> +<section> + <h3>Government</h3> + <div *ngIf="submission" class="review-table"> + <div class="subheading2 grid-1">Local or First Nation Government</div> + <div class="grid-double"> + {{ localGovernment?.name }} + </div> + </div> +</section> +<section *ngIf="submission"> + <h3>5. Purpose of SRW</h3> + <app-proposal-details [submission]="submission"></app-proposal-details> +</section> diff --git a/portal-frontend/src/app/features/public/notification/submission/submission-details.component.scss b/portal-frontend/src/app/features/public/notification/submission/submission-details.component.scss new file mode 100644 index 0000000000..821554db72 --- /dev/null +++ b/portal-frontend/src/app/features/public/notification/submission/submission-details.component.scss @@ -0,0 +1,117 @@ +@use '../../../../../styles/functions' as *; +@use '../../../../../styles/colors'; + +.transferee-table { + padding: rem(8); + margin: rem(12) 0 rem(20) 0; + background-color: colors.$grey-light; + display: grid; + grid-row-gap: rem(24); + grid-column-gap: rem(16); + grid-template-columns: minmax(3.75rem, 1fr) minmax(3.75rem, 1fr); + word-wrap: break-word; + hyphens: auto; +} + +:host::ng-deep { + .view-grid-item { + display: grid; + grid-template-columns: minmax(rem(100), 0.5fr) 1fr; + column-gap: rem(16); + margin-bottom: rem(12); + } + + .details-wrapper { + margin-top: rem(24); + margin-bottom: rem(24); + + .title { + margin-bottom: rem(16) !important; + } + } + + h3 .subtext { + margin: 0.5rem 0 !important; + } + + label { + font-weight: 600; + } + + .custom-mat-expansion-panel-header { + height: fit-content; + } + + .table-wrapper { + overflow-x: auto; + width: 100%; + } + + @media screen and (min-width: $tabletBreakpoint) { + .flex-item { + display: flex; + gap: rem(16); + } + } +} + +:host::ng-deep { + .scrollable { + overflow-x: auto; + } + + .review-table { + padding: rem(8); + margin: rem(12) 0 rem(20) 0; + background-color: colors.$grey-light; + display: grid; + grid-row-gap: rem(24); + grid-column-gap: rem(16); + grid-template-columns: 1fr; + word-wrap: break-word; + hyphens: auto; + + .edit-button { + display: flex; + justify-content: center; + + button { + width: 100%; + + @media screen and (min-width: $tabletBreakpoint) { + width: unset; + } + } + } + + .subheading2 { + margin-bottom: rem(4) !important; + } + + @media screen and (min-width: $tabletBreakpoint) { + padding: rem(16); + margin: rem(24) 0 rem(40) 0; + grid-template-columns: minmax(rem(60), 1fr) minmax(rem(60), 1fr) minmax(rem(60), 1fr) minmax(rem(60), 1fr); + + .full-width { + grid-column: 1/5; + } + + .grid-double { + grid-column: 2/5; + } + + .grid-1 { + grid-column: 1/2; + } + + .grid-2 { + grid-column: 2/3; + } + + .grid-3 { + grid-column: 3/5; + } + } + } +} diff --git a/portal-frontend/src/app/features/public/notification/submission/submission-details.component.spec.ts b/portal-frontend/src/app/features/public/notification/submission/submission-details.component.spec.ts new file mode 100644 index 0000000000..1043a2cfcf --- /dev/null +++ b/portal-frontend/src/app/features/public/notification/submission/submission-details.component.spec.ts @@ -0,0 +1,36 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; +import { CodeService } from '../../../../services/code/code.service'; + +import { SubmissionDetailsComponent } from './submission-details.component'; + +describe('SubmissionDetailsComponent', () => { + let component: SubmissionDetailsComponent; + let fixture: ComponentFixture<SubmissionDetailsComponent>; + let mockCodeService: DeepMocked<CodeService>; + + beforeEach(async () => { + mockCodeService = createMock(); + + await TestBed.configureTestingModule({ + providers: [ + { + provide: CodeService, + useValue: mockCodeService, + }, + ], + declarations: [SubmissionDetailsComponent], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(SubmissionDetailsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/public/notification/submission/submission-details.component.ts b/portal-frontend/src/app/features/public/notification/submission/submission-details.component.ts new file mode 100644 index 0000000000..d678595191 --- /dev/null +++ b/portal-frontend/src/app/features/public/notification/submission/submission-details.component.ts @@ -0,0 +1,59 @@ +import { Component, Input, OnDestroy, OnInit } from '@angular/core'; +import { Subject } from 'rxjs'; +import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; +import { PARCEL_TYPE } from '../../../../services/application-parcel/application-parcel.dto'; +import { LocalGovernmentDto } from '../../../../services/code/code.dto'; +import { CodeService } from '../../../../services/code/code.service'; +import { PublicNotificationSubmissionDto } from '../../../../services/public/public-notification.dto'; +import { PublicDocumentDto, PublicOwnerDto, PublicParcelDto } from '../../../../services/public/public.dto'; +import { PublicService } from '../../../../services/public/public.service'; +import { OWNER_TYPE } from '../../../../shared/dto/owner.dto'; + +@Component({ + selector: 'app-public-app-submission-details', + templateUrl: './submission-details.component.html', + styleUrls: ['./submission-details.component.scss'], +}) +export class SubmissionDetailsComponent implements OnInit, OnDestroy { + $destroy = new Subject<void>(); + + @Input() submission!: PublicNotificationSubmissionDto; + @Input() documents: PublicDocumentDto[] = []; + @Input() parcels: PublicParcelDto[] = []; + + parcelType = PARCEL_TYPE; + primaryContact: PublicOwnerDto | undefined; + localGovernment: LocalGovernmentDto | undefined; + OWNER_TYPE = OWNER_TYPE; + + private localGovernments: LocalGovernmentDto[] = []; + + constructor(private codeService: CodeService) {} + + ngOnInit(): void { + this.loadGovernments(); + if (this.submission) { + this.populateLocalGovernment(this.submission.localGovernmentUuid); + } + } + + ngOnDestroy(): void { + this.$destroy.next(); + this.$destroy.complete(); + } + + private async loadGovernments() { + const codes = await this.codeService.loadCodes(); + this.localGovernments = codes.localGovernments.sort((a, b) => (a.name > b.name ? 1 : -1)); + if (this.submission?.localGovernmentUuid) { + this.populateLocalGovernment(this.submission?.localGovernmentUuid); + } + } + + private populateLocalGovernment(governmentUuid: string) { + const lg = this.localGovernments.find((lg) => lg.uuid === governmentUuid); + if (lg) { + this.localGovernment = lg; + } + } +} diff --git a/portal-frontend/src/app/features/public/public.module.ts b/portal-frontend/src/app/features/public/public.module.ts index 7ed11a0b8e..c3e266a0db 100644 --- a/portal-frontend/src/app/features/public/public.module.ts +++ b/portal-frontend/src/app/features/public/public.module.ts @@ -27,6 +27,10 @@ const routes: Routes = [ loadChildren: () => import('./notice-of-intent/public-notice-of-intent.module').then((m) => m.PublicNoticeOfIntentModule), }, + { + path: 'notification', + loadChildren: () => import('./notification/public-notification.module').then((m) => m.PublicNotificationModule), + }, ]; @NgModule({ diff --git a/portal-frontend/src/app/services/public/public-notification.dto.ts b/portal-frontend/src/app/services/public/public-notification.dto.ts new file mode 100644 index 0000000000..0e94f58f6e --- /dev/null +++ b/portal-frontend/src/app/services/public/public-notification.dto.ts @@ -0,0 +1,30 @@ +import { ApplicationStatusDto } from '../application-submission/application-submission.dto'; +import { NoticeOfIntentPortalDecisionDto } from '../notice-of-intent-decision/notice-of-intent-decision.dto'; +import { ProposedStructure } from '../notice-of-intent-submission/notice-of-intent-submission.dto'; +import { PublicDocumentDto, PublicOwnerDto, PublicParcelDto } from './public.dto'; + +export interface GetPublicNotificationResponseDto { + submission: PublicNotificationSubmissionDto; + parcels: PublicParcelDto[]; + documents: PublicDocumentDto[]; +} +export interface PublicNotificationSubmissionDto { + fileNumber: string; + uuid: string; + createdAt: number; + updatedAt: number; + applicant: string; + contactFirstName: string | null; + contactLastName: string | null; + contactOrganization: string | null; + localGovernmentUuid: string; + type: string; + typeCode: string; + status: ApplicationStatusDto; + lastStatusUpdate: number; + transferees: PublicOwnerDto[]; + submittersFileNumber: string | null; + purpose: string | null; + totalArea: number | null; + hasSurveyPlan: boolean | null; +} diff --git a/portal-frontend/src/app/services/public/public.dto.ts b/portal-frontend/src/app/services/public/public.dto.ts index ead6fd8dbf..25f4aa3f8d 100644 --- a/portal-frontend/src/app/services/public/public.dto.ts +++ b/portal-frontend/src/app/services/public/public.dto.ts @@ -19,6 +19,7 @@ export interface PublicDocumentDto { fileName: string; fileSize?: number; mimeType: string; + source: string; uploadedAt: number; } diff --git a/portal-frontend/src/app/services/public/public.service.ts b/portal-frontend/src/app/services/public/public.service.ts index 2b8ffef848..c8de0e6cbc 100644 --- a/portal-frontend/src/app/services/public/public.service.ts +++ b/portal-frontend/src/app/services/public/public.service.ts @@ -5,6 +5,7 @@ import { environment } from '../../../environments/environment'; import { ToastService } from '../toast/toast.service'; import { GetPublicApplicationResponseDto } from './public-application.dto'; import { GetPublicNoticeOfIntentResponseDto } from './public-notice-of-intent.dto'; +import { GetPublicNotificationResponseDto } from './public-notification.dto'; @Injectable({ providedIn: 'root', @@ -61,4 +62,28 @@ export class PublicService { return undefined; } } + + async getNotification(fileId: string) { + try { + return await firstValueFrom( + this.httpClient.get<GetPublicNotificationResponseDto>(`${this.serviceUrl}/notification/${fileId}`) + ); + } catch (e) { + console.error(e); + this.toastService.showErrorToast('Failed to load Notification, please try again later'); + return undefined; + } + } + + async getNotificationOpenFileUrl(fileId: string, uuid: string) { + try { + return await firstValueFrom( + this.httpClient.get<{ url: string }>(`${this.serviceUrl}/notification/${fileId}/${uuid}/open`) + ); + } catch (e) { + console.error(e); + this.toastService.showErrorToast('Failed to load Notification, please try again later'); + return undefined; + } + } } diff --git a/services/apps/alcs/src/common/automapper/public.automapper.profile.ts b/services/apps/alcs/src/common/automapper/public.automapper.profile.ts index a6a7c62da6..0f38be46c2 100644 --- a/services/apps/alcs/src/common/automapper/public.automapper.profile.ts +++ b/services/apps/alcs/src/common/automapper/public.automapper.profile.ts @@ -3,6 +3,7 @@ import { AutomapperProfile, InjectMapper } from '@automapper/nestjs'; import { Injectable } from '@nestjs/common'; import { ApplicationDocument } from '../../alcs/application/application-document/application-document.entity'; import { NoticeOfIntentDocument } from '../../alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.entity'; +import { NotificationDocument } from '../../alcs/notification/notification-document/notification-document.entity'; import { ApplicationSubmissionReview } from '../../portal/application-submission-review/application-submission-review.entity'; import { ApplicationOwner } from '../../portal/application-submission/application-owner/application-owner.entity'; import { ApplicationParcel } from '../../portal/application-submission/application-parcel/application-parcel.entity'; @@ -10,14 +11,20 @@ import { ApplicationSubmission } from '../../portal/application-submission/appli import { NoticeOfIntentOwner } from '../../portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.entity'; import { NoticeOfIntentParcel } from '../../portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.entity'; import { NoticeOfIntentSubmission } from '../../portal/notice-of-intent-submission/notice-of-intent-submission.entity'; +import { NotificationParcel } from '../../portal/notification-submission/notification-parcel/notification-parcel.entity'; +import { NotificationSubmission } from '../../portal/notification-submission/notification-submission.entity'; +import { NotificationTransferee } from '../../portal/notification-submission/notification-transferee/notification-transferee.entity'; import { PublicApplicationSubmissionDto, PublicApplicationSubmissionReviewDto, +} from '../../portal/public/application/public-application.dto'; +import { PublicNoticeOfIntentSubmissionDto } from '../../portal/public/notice-of-intent/public-notice-of-intent.dto'; +import { PublicNotificationSubmissionDto } from '../../portal/public/notification/public-notification.dto'; +import { PublicDocumentDto, PublicOwnerDto, PublicParcelDto, -} from '../../portal/public/application/public-application.dto'; -import { PublicNoticeOfIntentSubmissionDto } from '../../portal/public/notice-of-intent/public-notice-of-intent.dto'; +} from '../../portal/public/public.dto'; import { ParcelOwnershipType, ParcelOwnershipTypeDto, @@ -67,6 +74,24 @@ export class PublicAutomapperProfile extends AutomapperProfile { ), ); + createMap( + mapper, + NotificationSubmission, + PublicNotificationSubmissionDto, + forMember( + (a) => a.lastStatusUpdate, + mapFrom((ad) => { + return ad.status.effectiveDate?.getTime(); + }), + ), + forMember( + (a) => a.status, + mapFrom((ad) => { + return ad.status.statusType; + }), + ), + ); + createMap( mapper, ApplicationOwner, @@ -87,6 +112,16 @@ export class PublicAutomapperProfile extends AutomapperProfile { ), ); + createMap( + mapper, + NotificationTransferee, + PublicOwnerDto, + forMember( + (pd) => pd.displayName, + mapFrom((p) => `${p.firstName} ${p.lastName}`), + ), + ); + createMap( mapper, ApplicationParcel, @@ -171,6 +206,30 @@ export class PublicAutomapperProfile extends AutomapperProfile { ), ); + createMap( + mapper, + NotificationParcel, + PublicParcelDto, + forMember( + (pd) => pd.ownershipTypeCode, + mapFrom((p) => p.ownershipTypeCode), + ), + forMember( + (p) => p.ownershipType, + mapFrom((pd) => { + if (pd.ownershipType) { + return this.mapper.map( + pd.ownershipType, + ParcelOwnershipType, + ParcelOwnershipTypeDto, + ); + } else { + return undefined; + } + }), + ), + ); + createMap( mapper, ApplicationSubmissionReview, @@ -201,6 +260,10 @@ export class PublicAutomapperProfile extends AutomapperProfile { (a) => a.documentUuid, mapFrom((ad) => ad.document.uuid), ), + forMember( + (a) => a.source, + mapFrom((ad) => ad.document.source), + ), ); createMap( @@ -227,6 +290,40 @@ export class PublicAutomapperProfile extends AutomapperProfile { (a) => a.documentUuid, mapFrom((ad) => ad.document.uuid), ), + forMember( + (a) => a.source, + mapFrom((ad) => ad.document.source), + ), + ); + + createMap( + mapper, + NotificationDocument, + PublicDocumentDto, + forMember( + (a) => a.mimeType, + mapFrom((ad) => ad.document.mimeType), + ), + forMember( + (a) => a.fileName, + mapFrom((ad) => ad.document.fileName), + ), + forMember( + (a) => a.fileSize, + mapFrom((ad) => ad.document.fileSize), + ), + forMember( + (a) => a.uploadedAt, + mapFrom((ad) => ad.document.uploadedAt.getTime()), + ), + forMember( + (a) => a.documentUuid, + mapFrom((ad) => ad.document.uuid), + ), + forMember( + (a) => a.source, + mapFrom((ad) => ad.document.source), + ), ); }; } diff --git a/services/apps/alcs/src/portal/public/application/public-application.dto.ts b/services/apps/alcs/src/portal/public/application/public-application.dto.ts index 8badf0476e..f936453adb 100644 --- a/services/apps/alcs/src/portal/public/application/public-application.dto.ts +++ b/services/apps/alcs/src/portal/public/application/public-application.dto.ts @@ -1,29 +1,8 @@ import { AutoMap } from '@automapper/classes'; import { ApplicationStatusDto } from '../../../alcs/application/application-submission-status/submission-status.dto'; -import { OwnerTypeDto } from '../../../common/owner-type/owner-type.entity'; -import { DocumentTypeDto } from '../../../document/document.dto'; -import { ApplicationParcelOwnershipTypeDto } from '../../application-submission/application-parcel/application-parcel.dto'; import { NaruSubtypeDto } from '../../application-submission/application-submission.dto'; import { ProposedLot } from '../../application-submission/application-submission.entity'; - -export class PublicOwnerDto { - @AutoMap() - uuid: string; - - displayName: string; - - @AutoMap(() => String) - firstName?: string | null; - - @AutoMap(() => String) - lastName?: string | null; - - @AutoMap(() => String) - organizationName?: string | null; - - @AutoMap() - type: OwnerTypeDto; -} +import { PublicOwnerDto } from '../public.dto'; export class PublicApplicationSubmissionDto { @AutoMap() @@ -367,63 +346,3 @@ export class PublicApplicationSubmissionReviewDto { @AutoMap(() => Boolean) isAuthorized: boolean | null; } - -export class PublicParcelDto { - @AutoMap() - uuid: string; - - @AutoMap(() => String) - pid?: string | null; - - @AutoMap(() => String) - pin?: string | null; - - @AutoMap(() => String) - legalDescription?: string | null; - - @AutoMap(() => String) - civicAddress?: string | null; - - @AutoMap(() => Number) - mapAreaHectares?: number | null; - - @AutoMap(() => Number) - purchasedDate?: number | null; - - @AutoMap(() => Boolean) - isFarm?: boolean | null; - - @AutoMap(() => String) - ownershipTypeCode?: string | null; - - @AutoMap(() => String) - crownLandOwnerType?: string | null; - - ownershipType?: ApplicationParcelOwnershipTypeDto; - - @AutoMap(() => String) - parcelType: string; - - @AutoMap(() => Number) - alrArea: number | null; - - owners: PublicOwnerDto[]; -} - -export class PublicDocumentDto { - @AutoMap(() => String) - description?: string; - - @AutoMap() - uuid: string; - - @AutoMap(() => DocumentTypeDto) - type?: DocumentTypeDto; - - //Document Fields - documentUuid: string; - fileName: string; - fileSize?: number; - mimeType: string; - uploadedAt: number; -} diff --git a/services/apps/alcs/src/portal/public/application/public-application.service.ts b/services/apps/alcs/src/portal/public/application/public-application.service.ts index 049c98a940..115a572d49 100644 --- a/services/apps/alcs/src/portal/public/application/public-application.service.ts +++ b/services/apps/alcs/src/portal/public/application/public-application.service.ts @@ -10,6 +10,7 @@ import { } from '../../../alcs/application/application-document/application-document.entity'; import { ApplicationDocumentService } from '../../../alcs/application/application-document/application-document.service'; import { ApplicationService } from '../../../alcs/application/application.service'; +import { PublicDocumentDto, PublicParcelDto } from '../public.dto'; import { ApplicationPortalDecisionDto } from './application-decision.dto'; import { ApplicationSubmissionReview } from '../../application-submission-review/application-submission-review.entity'; import { ApplicationSubmissionReviewService } from '../../application-submission-review/application-submission-review.service'; @@ -18,10 +19,8 @@ import { ApplicationParcelService } from '../../application-submission/applicati import { ApplicationSubmission } from '../../application-submission/application-submission.entity'; import { ApplicationSubmissionService } from '../../application-submission/application-submission.service'; import { - PublicParcelDto, PublicApplicationSubmissionDto, PublicApplicationSubmissionReviewDto, - PublicDocumentDto, } from './public-application.dto'; @Injectable() diff --git a/services/apps/alcs/src/portal/public/notice-of-intent/public-notice-of-intent.dto.ts b/services/apps/alcs/src/portal/public/notice-of-intent/public-notice-of-intent.dto.ts index a266fb7694..abf7d29d13 100644 --- a/services/apps/alcs/src/portal/public/notice-of-intent/public-notice-of-intent.dto.ts +++ b/services/apps/alcs/src/portal/public/notice-of-intent/public-notice-of-intent.dto.ts @@ -1,7 +1,7 @@ import { AutoMap } from '@automapper/classes'; import { NoticeOfIntentStatusDto } from '../../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status.dto'; import { ProposedStructure } from '../../notice-of-intent-submission/notice-of-intent-submission.entity'; -import { PublicOwnerDto } from '../application/public-application.dto'; +import { PublicOwnerDto } from '../public.dto'; export class PublicNoticeOfIntentSubmissionDto { @AutoMap() diff --git a/services/apps/alcs/src/portal/public/notice-of-intent/public-notice-of-intent.service.ts b/services/apps/alcs/src/portal/public/notice-of-intent/public-notice-of-intent.service.ts index ee28cfb968..da7617a8f3 100644 --- a/services/apps/alcs/src/portal/public/notice-of-intent/public-notice-of-intent.service.ts +++ b/services/apps/alcs/src/portal/public/notice-of-intent/public-notice-of-intent.service.ts @@ -8,15 +8,12 @@ import { NoticeOfIntentDecision } from '../../../alcs/notice-of-intent-decision/ import { NoticeOfIntentDocument } from '../../../alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.entity'; import { NoticeOfIntentDocumentService } from '../../../alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.service'; import { NoticeOfIntentService } from '../../../alcs/notice-of-intent/notice-of-intent.service'; +import { PublicDocumentDto, PublicParcelDto } from '../public.dto'; import { NoticeOfIntentPortalDecisionDto } from './notice-of-intent-decision.dto'; import { NoticeOfIntentParcel } from '../../notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.entity'; import { NoticeOfIntentParcelService } from '../../notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.service'; import { NoticeOfIntentSubmission } from '../../notice-of-intent-submission/notice-of-intent-submission.entity'; import { NoticeOfIntentSubmissionService } from '../../notice-of-intent-submission/notice-of-intent-submission.service'; -import { - PublicDocumentDto, - PublicParcelDto, -} from '../application/public-application.dto'; import { PublicNoticeOfIntentSubmissionDto } from './public-notice-of-intent.dto'; @Injectable() diff --git a/services/apps/alcs/src/portal/public/notification/public-notification.dto.ts b/services/apps/alcs/src/portal/public/notification/public-notification.dto.ts new file mode 100644 index 0000000000..f6d4508126 --- /dev/null +++ b/services/apps/alcs/src/portal/public/notification/public-notification.dto.ts @@ -0,0 +1,55 @@ +import { AutoMap } from '@automapper/classes'; +import { NotificationStatusDto } from '../../../alcs/notification/notification-submission-status/notification-status.dto'; +import { PublicOwnerDto } from '../public.dto'; + +export class PublicNotificationSubmissionDto { + @AutoMap() + fileNumber: string; + + @AutoMap() + uuid: string; + + @AutoMap() + createdAt: number; + + updatedAt: number; + + @AutoMap() + applicant: string; + + @AutoMap(() => String) + contactFirstName: string | null; + + @AutoMap(() => String) + contactLastName: string | null; + + @AutoMap(() => String) + contactOrganization: string | null; + + @AutoMap() + localGovernmentUuid: string; + + @AutoMap() + type: string; + + @AutoMap() + typeCode: string; + + status: NotificationStatusDto; + lastStatusUpdate: number; + + @AutoMap(() => [PublicOwnerDto]) + transferees: PublicOwnerDto[]; + + @AutoMap(() => String) + submittersFileNumber: string | null; + + @AutoMap(() => String) + purpose: string | null; + + @AutoMap(() => Number) + totalArea: number | null; + + @AutoMap(() => Boolean) + hasSurveyPlan: boolean | null; +} diff --git a/services/apps/alcs/src/portal/public/notification/public-notification.service.spec.ts b/services/apps/alcs/src/portal/public/notification/public-notification.service.spec.ts new file mode 100644 index 0000000000..2b02b76380 --- /dev/null +++ b/services/apps/alcs/src/portal/public/notification/public-notification.service.spec.ts @@ -0,0 +1,132 @@ +import { ServiceNotFoundException } from '@app/common/exceptions/base.exception'; +import { classes } from '@automapper/classes'; +import { AutomapperModule } from '@automapper/nestjs'; +import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; +import { Test, TestingModule } from '@nestjs/testing'; +import { VISIBILITY_FLAG } from '../../../alcs/application/application-document/application-document.entity'; +import { NotificationDocument } from '../../../alcs/notification/notification-document/notification-document.entity'; +import { NotificationDocumentService } from '../../../alcs/notification/notification-document/notification-document.service'; +import { NotificationSubmissionStatusType } from '../../../alcs/notification/notification-submission-status/notification-status-type.entity'; +import { NOTIFICATION_STATUS } from '../../../alcs/notification/notification-submission-status/notification-status.dto'; +import { NotificationSubmissionToSubmissionStatus } from '../../../alcs/notification/notification-submission-status/notification-status.entity'; +import { NotificationType } from '../../../alcs/notification/notification-type/notification-type.entity'; +import { Notification } from '../../../alcs/notification/notification.entity'; +import { NotificationService } from '../../../alcs/notification/notification.service'; +import { PublicAutomapperProfile } from '../../../common/automapper/public.automapper.profile'; +import { NotificationParcelService } from '../../notification-submission/notification-parcel/notification-parcel.service'; +import { NotificationSubmission } from '../../notification-submission/notification-submission.entity'; +import { NotificationSubmissionService } from '../../notification-submission/notification-submission.service'; +import { PublicNotificationService } from './public-notification.service'; + +describe('PublicNotificationService', () => { + let service: PublicNotificationService; + let mockNOIService: DeepMocked<NotificationService>; + let mockNOISubService: DeepMocked<NotificationSubmissionService>; + let mockNOIParcelService: DeepMocked<NotificationParcelService>; + let mockNOIDocService: DeepMocked<NotificationDocumentService>; + + beforeEach(async () => { + mockNOIService = createMock(); + mockNOISubService = createMock(); + mockNOIParcelService = createMock(); + mockNOIDocService = createMock(); + + const module: TestingModule = await Test.createTestingModule({ + imports: [ + AutomapperModule.forRoot({ + strategyInitializer: classes(), + }), + ], + providers: [ + PublicNotificationService, + PublicAutomapperProfile, + { + provide: NotificationService, + useValue: mockNOIService, + }, + { + provide: NotificationSubmissionService, + useValue: mockNOISubService, + }, + { + provide: NotificationParcelService, + useValue: mockNOIParcelService, + }, + { + provide: NotificationDocumentService, + useValue: mockNOIDocService, + }, + ], + }).compile(); + + service = module.get<PublicNotificationService>(PublicNotificationService); + }); + + it('should be defined', () => { + expect(service).toBeDefined(); + }); + + it('load a Notice of Intent and its related data for get NOI', async () => { + mockNOIService.getByFileNumber.mockResolvedValue( + new Notification({ + type: new NotificationType(), + }), + ); + mockNOISubService.getOrFailByFileNumber.mockResolvedValue( + new NotificationSubmission({ + get status() { + return new NotificationSubmissionToSubmissionStatus({ + statusType: new NotificationSubmissionStatusType({ + code: NOTIFICATION_STATUS.ALC_RESPONSE_SENT, + }), + }); + }, + }), + ); + mockNOIParcelService.fetchByFileId.mockResolvedValue([]); + mockNOIDocService.list.mockResolvedValue([]); + + const fileId = 'file-id'; + await service.getPublicData(fileId); + + expect(mockNOIService.getByFileNumber).toHaveBeenCalledTimes(1); + expect(mockNOISubService.getOrFailByFileNumber).toHaveBeenCalledTimes(1); + expect(mockNOIParcelService.fetchByFileId).toHaveBeenCalledTimes(1); + expect(mockNOIDocService.list).toHaveBeenCalledTimes(1); + expect(mockNOIDocService.list).toHaveBeenCalledWith(fileId, [ + VISIBILITY_FLAG.PUBLIC, + ]); + }); + + it('should call through to document service for getting files', async () => { + const mockDoc = new NotificationDocument({ + visibilityFlags: [VISIBILITY_FLAG.PUBLIC], + }); + mockNOIDocService.get.mockResolvedValue(mockDoc); + mockNOIDocService.getInlineUrl.mockResolvedValue(''); + + const documentUuid = 'document-uuid'; + await service.getInlineUrl(documentUuid); + + expect(mockNOIDocService.get).toHaveBeenCalledTimes(1); + expect(mockNOIDocService.getInlineUrl).toHaveBeenCalledTimes(1); + expect(mockNOIDocService.getInlineUrl).toHaveBeenCalledWith(mockDoc); + }); + + it('should throw an exception when the document is not public', async () => { + const mockDoc = new NotificationDocument({ + visibilityFlags: [VISIBILITY_FLAG.APPLICANT], + }); + mockNOIDocService.get.mockResolvedValue(mockDoc); + + const documentUuid = 'document-uuid'; + const promise = service.getInlineUrl(documentUuid); + + await expect(promise).rejects.toMatchObject( + new ServiceNotFoundException('Failed to find document'), + ); + + expect(mockNOIDocService.get).toHaveBeenCalledTimes(1); + expect(mockNOIDocService.getInlineUrl).toHaveBeenCalledTimes(0); + }); +}); diff --git a/services/apps/alcs/src/portal/public/notification/public-notification.service.ts b/services/apps/alcs/src/portal/public/notification/public-notification.service.ts new file mode 100644 index 0000000000..e261ca83a4 --- /dev/null +++ b/services/apps/alcs/src/portal/public/notification/public-notification.service.ts @@ -0,0 +1,108 @@ +import { ServiceNotFoundException } from '@app/common/exceptions/base.exception'; +import { Mapper } from '@automapper/core'; +import { InjectMapper } from '@automapper/nestjs'; +import { Injectable } from '@nestjs/common'; +import { VISIBILITY_FLAG } from '../../../alcs/application/application-document/application-document.entity'; +import { NotificationDocument } from '../../../alcs/notification/notification-document/notification-document.entity'; +import { NotificationDocumentService } from '../../../alcs/notification/notification-document/notification-document.service'; +import { NOTIFICATION_STATUS } from '../../../alcs/notification/notification-submission-status/notification-status.dto'; +import { NotificationService } from '../../../alcs/notification/notification.service'; +import { NotificationParcel } from '../../notification-submission/notification-parcel/notification-parcel.entity'; +import { NotificationParcelService } from '../../notification-submission/notification-parcel/notification-parcel.service'; +import { NotificationSubmission } from '../../notification-submission/notification-submission.entity'; +import { NotificationSubmissionService } from '../../notification-submission/notification-submission.service'; +import { PublicDocumentDto, PublicParcelDto } from '../public.dto'; +import { PublicNotificationSubmissionDto } from './public-notification.dto'; + +@Injectable() +export class PublicNotificationService { + constructor( + private notificationService: NotificationService, + private notificationSubmissionService: NotificationSubmissionService, + private notificationParcelService: NotificationParcelService, + private notificationDocumentService: NotificationDocumentService, + @InjectMapper() private mapper: Mapper, + ) {} + + async getPublicData(fileNumber: string) { + const notification = await this.notificationService.getByFileNumber( + fileNumber, + ); + + const submission = + await this.notificationSubmissionService.getOrFailByFileNumber( + fileNumber, + ); + + //Check if Response Sent Status + if ( + (submission.status.statusType.code as NOTIFICATION_STATUS) !== + NOTIFICATION_STATUS.ALC_RESPONSE_SENT + ) { + throw new ServiceNotFoundException( + `Failed to find notification with File ID ${fileNumber}`, + ); + } + + const parcels = await this.notificationParcelService.fetchByFileId( + fileNumber, + ); + + const mappedParcels = this.mapper.mapArray( + parcels, + NotificationParcel, + PublicParcelDto, + ); + + const mappedSubmission = this.mapper.map( + submission, + NotificationSubmission, + PublicNotificationSubmissionDto, + ); + mappedSubmission.type = notification.type.label; + + const documents = await this.notificationDocumentService.list(fileNumber, [ + VISIBILITY_FLAG.PUBLIC, + ]); + + const mappedDocuments = this.mapper.mapArray( + documents, + NotificationDocument, + PublicDocumentDto, + ); + + return { + submission: mappedSubmission, + parcels: mappedParcels, + documents: mappedDocuments, + }; + } + + async getDownloadUrl(documentUuid: string) { + const document = await this.notificationDocumentService.get(documentUuid); + + if (!document.visibilityFlags.includes(VISIBILITY_FLAG.PUBLIC)) { + throw new ServiceNotFoundException('Failed to find document'); + } + + const url = await this.notificationDocumentService.getDownloadUrl(document); + + return { + url, + }; + } + + async getInlineUrl(documentUuid: string) { + const document = await this.notificationDocumentService.get(documentUuid); + + if (!document.visibilityFlags.includes(VISIBILITY_FLAG.PUBLIC)) { + throw new ServiceNotFoundException('Failed to find document'); + } + + const url = await this.notificationDocumentService.getInlineUrl(document); + + return { + url, + }; + } +} diff --git a/services/apps/alcs/src/portal/public/public.controller.spec.ts b/services/apps/alcs/src/portal/public/public.controller.spec.ts index c087759ed6..15213deeb5 100644 --- a/services/apps/alcs/src/portal/public/public.controller.spec.ts +++ b/services/apps/alcs/src/portal/public/public.controller.spec.ts @@ -4,16 +4,19 @@ import { ClsService } from 'nestjs-cls'; import { mockKeyCloakProviders } from '../../../test/mocks/mockTypes'; import { PublicApplicationService } from './application/public-application.service'; import { PublicNoticeOfIntentService } from './notice-of-intent/public-notice-of-intent.service'; +import { PublicNotificationService } from './notification/public-notification.service'; import { PublicController } from './public.controller'; describe('PublicController', () => { let controller: PublicController; let mockAppService: DeepMocked<PublicApplicationService>; let mockNOIService: DeepMocked<PublicNoticeOfIntentService>; + let mockNotificationService: DeepMocked<PublicNotificationService>; beforeEach(async () => { mockAppService = createMock(); mockNOIService = createMock(); + mockNotificationService = createMock(); const module: TestingModule = await Test.createTestingModule({ providers: [ @@ -25,6 +28,10 @@ describe('PublicController', () => { provide: PublicNoticeOfIntentService, useValue: mockNOIService, }, + { + provide: PublicNotificationService, + useValue: mockNotificationService, + }, { provide: ClsService, useValue: {}, @@ -49,4 +56,22 @@ describe('PublicController', () => { expect(mockAppService.getPublicData).toHaveBeenCalledTimes(1); }); + + it('should call through to service for loading a notice of intent', async () => { + mockNOIService.getPublicData.mockResolvedValue({} as any); + + const fileId = 'file-id'; + await controller.getNoticeOfIntent(fileId); + + expect(mockNOIService.getPublicData).toHaveBeenCalledTimes(1); + }); + + it('should call through to service for loading a notification', async () => { + mockNotificationService.getPublicData.mockResolvedValue({} as any); + + const fileId = 'file-id'; + await controller.getNotification(fileId); + + expect(mockNotificationService.getPublicData).toHaveBeenCalledTimes(1); + }); }); diff --git a/services/apps/alcs/src/portal/public/public.controller.ts b/services/apps/alcs/src/portal/public/public.controller.ts index 3d53cf077e..22d31c91d4 100644 --- a/services/apps/alcs/src/portal/public/public.controller.ts +++ b/services/apps/alcs/src/portal/public/public.controller.ts @@ -2,6 +2,7 @@ import { Controller, Get, Param } from '@nestjs/common'; import { Public } from 'nest-keycloak-connect'; import { PublicApplicationService } from './application/public-application.service'; import { PublicNoticeOfIntentService } from './notice-of-intent/public-notice-of-intent.service'; +import { PublicNotificationService } from './notification/public-notification.service'; @Public() @Controller('/public') @@ -9,6 +10,7 @@ export class PublicController { constructor( private publicAppService: PublicApplicationService, private publicNoticeOfIntentService: PublicNoticeOfIntentService, + private publicNotificationService: PublicNotificationService, ) {} @Get('/application/:fileId') @@ -72,4 +74,35 @@ export class PublicController { url, }; } + + @Get('/notification/:fileId') + async getNotification(@Param('fileId') fileNumber: string) { + return await this.publicNotificationService.getPublicData(fileNumber); + } + + @Get('/notification/:fileId/:uuid/download') + async getNotificationDocumentDownload( + @Param('fileId') fileId: string, + @Param('uuid') documentUuid: string, + ) { + const url = await this.publicNotificationService.getDownloadUrl( + documentUuid, + ); + + return { + url, + }; + } + + @Get('/notification/:fileId/:uuid/open') + async getNotificationDocumentOpen( + @Param('fileId') fileId: string, + @Param('uuid') documentUuid: string, + ) { + const url = await this.publicNotificationService.getInlineUrl(documentUuid); + + return { + url, + }; + } } diff --git a/services/apps/alcs/src/portal/public/public.dto.ts b/services/apps/alcs/src/portal/public/public.dto.ts new file mode 100644 index 0000000000..2ebe64d785 --- /dev/null +++ b/services/apps/alcs/src/portal/public/public.dto.ts @@ -0,0 +1,86 @@ +import { AutoMap } from '@automapper/classes'; +import { OwnerTypeDto } from '../../common/owner-type/owner-type.entity'; +import { DocumentTypeDto } from '../../document/document.dto'; +import { ApplicationParcelOwnershipTypeDto } from '../application-submission/application-parcel/application-parcel.dto'; + +export class PublicParcelDto { + @AutoMap() + uuid: string; + + @AutoMap(() => String) + pid?: string | null; + + @AutoMap(() => String) + pin?: string | null; + + @AutoMap(() => String) + legalDescription?: string | null; + + @AutoMap(() => String) + civicAddress?: string | null; + + @AutoMap(() => Number) + mapAreaHectares?: number | null; + + @AutoMap(() => Number) + purchasedDate?: number | null; + + @AutoMap(() => Boolean) + isFarm?: boolean | null; + + @AutoMap(() => String) + ownershipTypeCode?: string | null; + + @AutoMap(() => String) + crownLandOwnerType?: string | null; + + ownershipType?: ApplicationParcelOwnershipTypeDto; + + @AutoMap(() => String) + parcelType: string; + + @AutoMap(() => Number) + alrArea: number | null; + + owners: PublicOwnerDto[]; +} + +export class PublicDocumentDto { + @AutoMap(() => String) + description?: string; + + @AutoMap() + uuid: string; + + @AutoMap(() => DocumentTypeDto) + type?: DocumentTypeDto; + + @AutoMap() + source: string; + + //Document Fields + documentUuid: string; + fileName: string; + fileSize?: number; + mimeType: string; + uploadedAt: number; +} + +export class PublicOwnerDto { + @AutoMap() + uuid: string; + + displayName: string; + + @AutoMap(() => String) + firstName?: string | null; + + @AutoMap(() => String) + lastName?: string | null; + + @AutoMap(() => String) + organizationName?: string | null; + + @AutoMap() + type: OwnerTypeDto; +} diff --git a/services/apps/alcs/src/portal/public/public.module.ts b/services/apps/alcs/src/portal/public/public.module.ts index 5a3d31e493..8bb4e3fbce 100644 --- a/services/apps/alcs/src/portal/public/public.module.ts +++ b/services/apps/alcs/src/portal/public/public.module.ts @@ -6,14 +6,17 @@ import { ApplicationModule } from '../../alcs/application/application.module'; import { NoticeOfIntentDecisionModule } from '../../alcs/notice-of-intent-decision/notice-of-intent-decision.module'; import { NoticeOfIntentModule } from '../../alcs/notice-of-intent/notice-of-intent.module'; import { NotificationSubmissionStatusModule } from '../../alcs/notification/notification-submission-status/notification-submission-status.module'; +import { NotificationModule } from '../../alcs/notification/notification.module'; import { PublicAutomapperProfile } from '../../common/automapper/public.automapper.profile'; import { ApplicationSubmissionReviewModule } from '../application-submission-review/application-submission-review.module'; import { ApplicationSubmissionModule } from '../application-submission/application-submission.module'; import { NoticeOfIntentSubmissionModule } from '../notice-of-intent-submission/notice-of-intent-submission.module'; +import { NotificationSubmissionModule } from '../notification-submission/notification-submission.module'; import { ApplicationDecisionController } from './application/application-decision.controller'; import { PublicApplicationService } from './application/public-application.service'; import { NoticeOfIntentDecisionController } from './notice-of-intent/notice-of-intent-decision.controller'; import { PublicNoticeOfIntentService } from './notice-of-intent/public-notice-of-intent.service'; +import { PublicNotificationService } from './notification/public-notification.service'; import { PublicController } from './public.controller'; import { PublicSearchModule } from './search/public-search.module'; import { PublicStatusController } from './status/public-status.controller'; @@ -30,6 +33,8 @@ import { PublicStatusController } from './status/public-status.controller'; NoticeOfIntentModule, NoticeOfIntentSubmissionModule, NoticeOfIntentDecisionModule, + NotificationModule, + NotificationSubmissionModule, RouterModule.register([{ path: 'public', module: PublicSearchModule }]), ], controllers: [ @@ -42,6 +47,7 @@ import { PublicStatusController } from './status/public-status.controller'; PublicAutomapperProfile, PublicApplicationService, PublicNoticeOfIntentService, + PublicNotificationService, ], exports: [], }) From 6347270f123f849d283438bc9cfeb99d8a385e47 Mon Sep 17 00:00:00 2001 From: Liam Stoddard <lstodd@protonmail.com> Date: Tue, 10 Oct 2023 12:14:58 -0700 Subject: [PATCH 471/954] populate TURP submissions --- .../submissions/data_insert/data_prep.py | 11 +++++++- .../submissions/data_insert/insert_query.py | 27 +++++++++++++++++++ .../submissions/sql/app_submission.sql | 6 ++++- 3 files changed, 42 insertions(+), 2 deletions(-) diff --git a/bin/migrate-oats-data/applications/submissions/data_insert/data_prep.py b/bin/migrate-oats-data/applications/submissions/data_insert/data_prep.py index c944494ad5..431c9a2b6b 100644 --- a/bin/migrate-oats-data/applications/submissions/data_insert/data_prep.py +++ b/bin/migrate-oats-data/applications/submissions/data_insert/data_prep.py @@ -42,6 +42,7 @@ def prepare_app_sub_data(app_sub_raw_data_list, direction_data, subdiv_data, soi nfu_data_list = [] inc_exc_data_list = [] naru_data_list = [] + tur_data_list = [] other_data_list = [] for row in app_sub_raw_data_list: @@ -67,10 +68,18 @@ def prepare_app_sub_data(app_sub_raw_data_list, direction_data, subdiv_data, soi OatsToAlcsNaruType[data["rsdntl_use_type_code"]].value ) naru_data_list.append(data) + elif data["alr_change_code"] == ALRChangeCode.TUR.value: + tur_data_list.append(data) else: other_data_list.append(data) - return nfu_data_list, other_data_list, inc_exc_data_list, naru_data_list + return ( + nfu_data_list, + other_data_list, + inc_exc_data_list, + naru_data_list, + tur_data_list, + ) def get_direction_data(rows, cursor): diff --git a/bin/migrate-oats-data/applications/submissions/data_insert/insert_query.py b/bin/migrate-oats-data/applications/submissions/data_insert/insert_query.py index 1254f62b4c..e60cea1190 100644 --- a/bin/migrate-oats-data/applications/submissions/data_insert/insert_query.py +++ b/bin/migrate-oats-data/applications/submissions/data_insert/insert_query.py @@ -25,6 +25,7 @@ def insert_app_sub_records( other_data_list, inc_exc_data_list, naru_data_list, + tur_data_list, ) = prepare_app_sub_data(rows, direction_data, subdiv_data, soil_data) if len(nfu_data_list) > 0: @@ -51,6 +52,14 @@ def insert_app_sub_records( page_size=batch_size, ) + if len(tur_data_list) > 0: + execute_batch( + cursor, + get_insert_query_for_tur(), + tur_data_list, + page_size=batch_size, + ) + if len(other_data_list) > 0: execute_batch( cursor, @@ -177,3 +186,21 @@ def get_insert_query_for_inc_exc(): unique_fields = ", incl_excl_hectares" unique_values = ", %(alr_area)s" return get_insert_query(unique_fields, unique_values) + + +def get_insert_query_for_tur(): + unique_fields = """, + tur_agricultural_activities, + tur_reduce_negative_impacts, + tur_outside_lands, + tur_total_corridor_area, + tur_all_owners_notified + """ + unique_values = """, + %(agricultural_activities_desc)s, + %(impact_reduction_desc)s, + %(proposal_background_desc)s, + %(component_area)s, + %(owners_notified_ind)s + """ + return get_insert_query(unique_fields, unique_values) diff --git a/bin/migrate-oats-data/applications/submissions/sql/app_submission.sql b/bin/migrate-oats-data/applications/submissions/sql/app_submission.sql index c7c0c01b6f..985d0b49cb 100644 --- a/bin/migrate-oats-data/applications/submissions/sql/app_submission.sql +++ b/bin/migrate-oats-data/applications/submissions/sql/app_submission.sql @@ -29,7 +29,11 @@ SELECT oc.sleeping_units, oc.component_area, oa.proposal_summary_desc, - oa.proposal_background_desc + oa.proposal_background_desc, + oc.agricultural_activities_desc, + oc.impact_reduction_desc, + oc.owners_notified_ind + FROM appl_components_grouped acg LEFT JOIN alcs.application aa ON aa.file_number = acg.alr_application_id::TEXT From dc0c229e12039321839dd9b4d9f38c485226febc Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Tue, 10 Oct 2023 12:33:48 -0700 Subject: [PATCH 472/954] Code Review Feedback --- .../additional-information.component.spec.ts | 2 ++ .../public/notification/public-notification.service.spec.ts | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/portal-frontend/src/app/features/public/notice-of-intent/submission/additional-information/additional-information.component.spec.ts b/portal-frontend/src/app/features/public/notice-of-intent/submission/additional-information/additional-information.component.spec.ts index 417628f883..f747f2270f 100644 --- a/portal-frontend/src/app/features/public/notice-of-intent/submission/additional-information/additional-information.component.spec.ts +++ b/portal-frontend/src/app/features/public/notice-of-intent/submission/additional-information/additional-information.component.spec.ts @@ -1,3 +1,4 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { DeepMocked } from '@golevelup/ts-jest'; import { PublicService } from '../../../../../services/public/public.service'; @@ -18,6 +19,7 @@ describe('AdditionalInformationComponent', () => { useValue: mockPublicService, }, ], + schemas: [NO_ERRORS_SCHEMA], }).compileComponents(); fixture = TestBed.createComponent(AdditionalInformationComponent); diff --git a/services/apps/alcs/src/portal/public/notification/public-notification.service.spec.ts b/services/apps/alcs/src/portal/public/notification/public-notification.service.spec.ts index 2b02b76380..95c226977b 100644 --- a/services/apps/alcs/src/portal/public/notification/public-notification.service.spec.ts +++ b/services/apps/alcs/src/portal/public/notification/public-notification.service.spec.ts @@ -66,7 +66,7 @@ describe('PublicNotificationService', () => { expect(service).toBeDefined(); }); - it('load a Notice of Intent and its related data for get NOI', async () => { + it('load a Notification and its related data for get notification', async () => { mockNOIService.getByFileNumber.mockResolvedValue( new Notification({ type: new NotificationType(), From 6006127557ed8d00b8e892a99c562856327d68d2 Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Tue, 10 Oct 2023 13:17:26 -0700 Subject: [PATCH 473/954] alcs-1166 next button scroll fix --- portal-frontend/src/app/app.component.html | 2 +- .../applications/edit-submission/edit-submission.component.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/portal-frontend/src/app/app.component.html b/portal-frontend/src/app/app.component.html index 9a7de7d82c..56f7733445 100644 --- a/portal-frontend/src/app/app.component.html +++ b/portal-frontend/src/app/app.component.html @@ -1,4 +1,4 @@ -<div class="site-layout"> +<div class="site-layout" id="siteLayout"> <app-header *ngIf="showHeaderFooter"></app-header> <div id="appBody" class="main-content"> <router-outlet></router-outlet> diff --git a/portal-frontend/src/app/features/applications/edit-submission/edit-submission.component.ts b/portal-frontend/src/app/features/applications/edit-submission/edit-submission.component.ts index c987d0aae9..b2667077fc 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/edit-submission.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/edit-submission.component.ts @@ -195,7 +195,7 @@ export class EditSubmissionComponent implements OnInit, OnDestroy, AfterViewInit async onStepChange($event: StepperSelectionEvent) { // scrolls to step if step selected programmatically - scrollToElement({ id: `stepWrapper_${$event.selectedIndex}`, center: false }); + scrollToElement({ id: `siteLayout`, center: false }); } async saveApplication(step: number) { From 22f81010a8a46960598075e9beeef52e1b9bc508 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Tue, 10 Oct 2023 13:18:48 -0700 Subject: [PATCH 474/954] Fix File Downloads * Fix file downloads for all public documents --- .../alc-review/alc-review.component.html | 5 +- .../submission-documents.component.ts | 6 +- .../alc-review/alc-review.component.html | 2 +- .../submission-documents.component.ts | 2 +- .../public-notice-of-intent.module.ts | 1 + .../alc-review/alc-review.component.html | 2 +- .../alc-review/alc-review.component.ts | 1 + .../submission-documents.component.ts | 8 +-- .../public-notification.component.html | 2 +- .../services/public/public.service.spec.ts | 65 ++++++++++++++++++- .../src/app/services/public/public.service.ts | 36 ++++++++++ .../src/portal/public/public.controller.ts | 42 ++---------- 12 files changed, 123 insertions(+), 49 deletions(-) diff --git a/portal-frontend/src/app/features/public/application/alc-review/alc-review.component.html b/portal-frontend/src/app/features/public/application/alc-review/alc-review.component.html index 936712c82c..58b4bc539e 100644 --- a/portal-frontend/src/app/features/public/application/alc-review/alc-review.component.html +++ b/portal-frontend/src/app/features/public/application/alc-review/alc-review.component.html @@ -4,6 +4,9 @@ <h3>ALC Review and Decision</h3> </div> <div> <app-public-decisions [applicationDecisions]="applicationDecisions"></app-public-decisions> - <app-submission-documents [applicationDocuments]="applicationDocuments"></app-submission-documents> + <app-submission-documents + [applicationSubmission]="applicationSubmission" + [applicationDocuments]="applicationDocuments" + ></app-submission-documents> </div> </div> diff --git a/portal-frontend/src/app/features/public/application/alc-review/submission-documents/submission-documents.component.ts b/portal-frontend/src/app/features/public/application/alc-review/submission-documents/submission-documents.component.ts index 40166c6600..5364c65182 100644 --- a/portal-frontend/src/app/features/public/application/alc-review/submission-documents/submission-documents.component.ts +++ b/portal-frontend/src/app/features/public/application/alc-review/submission-documents/submission-documents.component.ts @@ -7,7 +7,7 @@ import { PublicDocumentDto } from '../../../../../services/public/public.dto'; import { PublicService } from '../../../../../services/public/public.service'; @Component({ - selector: 'app-submission-documents', + selector: 'app-submission-documents[applicationSubmission]', templateUrl: './submission-documents.component.html', styleUrls: ['./submission-documents.component.scss'], }) @@ -30,14 +30,14 @@ export class PublicSubmissionDocumentsComponent implements OnInit, OnDestroy { } async openFile(uuid: string) { - const res = await this.publicService.getApplicationOpenFileUrl(this.applicationSubmission.fileNumber, uuid); + const res = await this.publicService.getApplicationDownloadFileUrl(this.applicationSubmission.fileNumber, uuid); if (res) { window.open(res.url, '_blank'); } } async downloadFile(uuid: string) { - const res = await this.publicService.getApplicationOpenFileUrl(this.applicationSubmission.fileNumber, uuid); + const res = await this.publicService.getApplicationDownloadFileUrl(this.applicationSubmission.fileNumber, uuid); if (res) { const downloadLink = document.createElement('a'); downloadLink.href = res.url; diff --git a/portal-frontend/src/app/features/public/notice-of-intent/alc-review/alc-review.component.html b/portal-frontend/src/app/features/public/notice-of-intent/alc-review/alc-review.component.html index d9568d4860..56c175af02 100644 --- a/portal-frontend/src/app/features/public/notice-of-intent/alc-review/alc-review.component.html +++ b/portal-frontend/src/app/features/public/notice-of-intent/alc-review/alc-review.component.html @@ -4,6 +4,6 @@ <h3>ALC Review and Decision</h3> </div> <div> <app-public-decisions [decisions]="decisions"></app-public-decisions> - <app-submission-documents [documents]="documents"></app-submission-documents> + <app-submission-documents [submission]="submission" [documents]="documents"></app-submission-documents> </div> </div> diff --git a/portal-frontend/src/app/features/public/notice-of-intent/alc-review/submission-documents/submission-documents.component.ts b/portal-frontend/src/app/features/public/notice-of-intent/alc-review/submission-documents/submission-documents.component.ts index 1fe9103978..321c2ab75b 100644 --- a/portal-frontend/src/app/features/public/notice-of-intent/alc-review/submission-documents/submission-documents.component.ts +++ b/portal-frontend/src/app/features/public/notice-of-intent/alc-review/submission-documents/submission-documents.component.ts @@ -35,7 +35,7 @@ export class PublicSubmissionDocumentsComponent implements OnInit, OnDestroy { } async downloadFile(uuid: string) { - const res = await this.publicService.getNoticeOfIntentOpenFileUrl(this.submission.fileNumber, uuid); + const res = await this.publicService.getNoticeOfIntentDownloadFileUrl(this.submission.fileNumber, uuid); if (res) { const downloadLink = document.createElement('a'); downloadLink.href = res.url; diff --git a/portal-frontend/src/app/features/public/notice-of-intent/public-notice-of-intent.module.ts b/portal-frontend/src/app/features/public/notice-of-intent/public-notice-of-intent.module.ts index 52e7ba7867..70db66eecc 100644 --- a/portal-frontend/src/app/features/public/notice-of-intent/public-notice-of-intent.module.ts +++ b/portal-frontend/src/app/features/public/notice-of-intent/public-notice-of-intent.module.ts @@ -46,5 +46,6 @@ const routes: Routes = [ MatAutocompleteModule, MatTreeModule, ], + exports: [PublicAlcReviewComponent], }) export class PublicNoticeOfIntentModule {} diff --git a/portal-frontend/src/app/features/public/notification/alc-review/alc-review.component.html b/portal-frontend/src/app/features/public/notification/alc-review/alc-review.component.html index 6e81d7ef34..3abb9f0a93 100644 --- a/portal-frontend/src/app/features/public/notification/alc-review/alc-review.component.html +++ b/portal-frontend/src/app/features/public/notification/alc-review/alc-review.component.html @@ -3,6 +3,6 @@ <h3>ALC Review and Decision</h3> </div> <div> - <app-submission-documents [documents]="documents"></app-submission-documents> + <app-submission-documents [submission]="submission" [documents]="documents"></app-submission-documents> </div> </div> diff --git a/portal-frontend/src/app/features/public/notification/alc-review/alc-review.component.ts b/portal-frontend/src/app/features/public/notification/alc-review/alc-review.component.ts index d822d4b3ed..143cc9d00d 100644 --- a/portal-frontend/src/app/features/public/notification/alc-review/alc-review.component.ts +++ b/portal-frontend/src/app/features/public/notification/alc-review/alc-review.component.ts @@ -10,6 +10,7 @@ import { PublicDocumentDto } from '../../../../services/public/public.dto'; styleUrls: ['./alc-review.component.scss'], }) export class PublicAlcReviewComponent { + @Input() submission!: PublicNotificationSubmissionDto; @Input() documents!: PublicDocumentDto[]; constructor() {} diff --git a/portal-frontend/src/app/features/public/notification/alc-review/submission-documents/submission-documents.component.ts b/portal-frontend/src/app/features/public/notification/alc-review/submission-documents/submission-documents.component.ts index 1fe9103978..0770fff841 100644 --- a/portal-frontend/src/app/features/public/notification/alc-review/submission-documents/submission-documents.component.ts +++ b/portal-frontend/src/app/features/public/notification/alc-review/submission-documents/submission-documents.component.ts @@ -2,7 +2,7 @@ import { Component, Input, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { MatSort } from '@angular/material/sort'; import { MatTableDataSource } from '@angular/material/table'; import { Subject } from 'rxjs'; -import { PublicNoticeOfIntentSubmissionDto } from '../../../../../services/public/public-notice-of-intent.dto'; +import { PublicNotificationSubmissionDto } from '../../../../../services/public/public-notification.dto'; import { PublicDocumentDto } from '../../../../../services/public/public.dto'; import { PublicService } from '../../../../../services/public/public.service'; @@ -16,7 +16,7 @@ export class PublicSubmissionDocumentsComponent implements OnInit, OnDestroy { displayedColumns: string[] = ['type', 'fileName', 'source', 'uploadedAt', 'actions']; @Input() documents!: PublicDocumentDto[]; - @Input() submission!: PublicNoticeOfIntentSubmissionDto; + @Input() submission!: PublicNotificationSubmissionDto; @ViewChild(MatSort) sort!: MatSort; dataSource: MatTableDataSource<PublicDocumentDto> = new MatTableDataSource<PublicDocumentDto>(); @@ -28,14 +28,14 @@ export class PublicSubmissionDocumentsComponent implements OnInit, OnDestroy { } async openFile(uuid: string) { - const res = await this.publicService.getNoticeOfIntentOpenFileUrl(this.submission.fileNumber, uuid); + const res = await this.publicService.getNotificationOpenFileUrl(this.submission.fileNumber, uuid); if (res) { window.open(res.url, '_blank'); } } async downloadFile(uuid: string) { - const res = await this.publicService.getNoticeOfIntentOpenFileUrl(this.submission.fileNumber, uuid); + const res = await this.publicService.getNotificationDownloadFileUrl(this.submission.fileNumber, uuid); if (res) { const downloadLink = document.createElement('a'); downloadLink.href = res.url; diff --git a/portal-frontend/src/app/features/public/notification/public-notification.component.html b/portal-frontend/src/app/features/public/notification/public-notification.component.html index bd6c7ab639..48125cd3a2 100644 --- a/portal-frontend/src/app/features/public/notification/public-notification.component.html +++ b/portal-frontend/src/app/features/public/notification/public-notification.component.html @@ -48,7 +48,7 @@ <h3>Applicant Submission</h3> </mat-tab> <mat-tab label="ALC Review and Decision"> <div *ngIf="submission" class="content"> - <app-public-alc-review [documents]="documents"></app-public-alc-review> + <app-public-alc-review [submission]="submission" [documents]="documents"></app-public-alc-review> </div> </mat-tab> </mat-tab-group> diff --git a/portal-frontend/src/app/services/public/public.service.spec.ts b/portal-frontend/src/app/services/public/public.service.spec.ts index f005ebfa28..574b4060d6 100644 --- a/portal-frontend/src/app/services/public/public.service.spec.ts +++ b/portal-frontend/src/app/services/public/public.service.spec.ts @@ -42,7 +42,7 @@ describe('PublicService', () => { expect(res).toBeDefined(); }); - it('should call get for loading application files', async () => { + it('should call get for opening application files', async () => { mockHttpClient.get.mockReturnValue(of({})); const res = await service.getApplicationOpenFileUrl('fileId', 'documentUuid'); @@ -50,4 +50,67 @@ describe('PublicService', () => { expect(mockHttpClient.get).toHaveBeenCalledTimes(1); expect(res).toBeDefined(); }); + + it('should call get for download application files', async () => { + mockHttpClient.get.mockReturnValue(of({})); + + const res = await service.getApplicationDownloadFileUrl('fileId', 'documentUuid'); + + expect(mockHttpClient.get).toHaveBeenCalledTimes(1); + expect(res).toBeDefined(); + }); + + it('should call get for loading Notice of Intent', async () => { + mockHttpClient.get.mockReturnValue(of({})); + + const res = await service.getNoticeOfIntent('fileId'); + + expect(mockHttpClient.get).toHaveBeenCalledTimes(1); + expect(res).toBeDefined(); + }); + + it('should call get for opening Notice of Intent files', async () => { + mockHttpClient.get.mockReturnValue(of({})); + + const res = await service.getNoticeOfIntentOpenFileUrl('fileId', 'documentUuid'); + + expect(mockHttpClient.get).toHaveBeenCalledTimes(1); + expect(res).toBeDefined(); + }); + + it('should call get for download Notice of Intent files', async () => { + mockHttpClient.get.mockReturnValue(of({})); + + const res = await service.getNoticeOfIntentDownloadFileUrl('fileId', 'documentUuid'); + + expect(mockHttpClient.get).toHaveBeenCalledTimes(1); + expect(res).toBeDefined(); + }); + + it('should call get for loading Notification', async () => { + mockHttpClient.get.mockReturnValue(of({})); + + const res = await service.getNotification('fileId'); + + expect(mockHttpClient.get).toHaveBeenCalledTimes(1); + expect(res).toBeDefined(); + }); + + it('should call get for opening Notification files', async () => { + mockHttpClient.get.mockReturnValue(of({})); + + const res = await service.getNotificationOpenFileUrl('fileId', 'documentUuid'); + + expect(mockHttpClient.get).toHaveBeenCalledTimes(1); + expect(res).toBeDefined(); + }); + + it('should call get for download Notification files', async () => { + mockHttpClient.get.mockReturnValue(of({})); + + const res = await service.getNotificationDownloadFileUrl('fileId', 'documentUuid'); + + expect(mockHttpClient.get).toHaveBeenCalledTimes(1); + expect(res).toBeDefined(); + }); }); diff --git a/portal-frontend/src/app/services/public/public.service.ts b/portal-frontend/src/app/services/public/public.service.ts index c8de0e6cbc..db6c7da137 100644 --- a/portal-frontend/src/app/services/public/public.service.ts +++ b/portal-frontend/src/app/services/public/public.service.ts @@ -39,6 +39,18 @@ export class PublicService { } } + async getApplicationDownloadFileUrl(fileId: string, uuid: string) { + try { + return await firstValueFrom( + this.httpClient.get<{ url: string }>(`${this.serviceUrl}/application/${fileId}/${uuid}/download`) + ); + } catch (e) { + console.error(e); + this.toastService.showErrorToast('Failed to load Application File, please try again later'); + return undefined; + } + } + async getNoticeOfIntent(fileId: string) { try { return await firstValueFrom( @@ -63,6 +75,18 @@ export class PublicService { } } + async getNoticeOfIntentDownloadFileUrl(fileId: string, uuid: string) { + try { + return await firstValueFrom( + this.httpClient.get<{ url: string }>(`${this.serviceUrl}/notice-of-intent/${fileId}/${uuid}/download`) + ); + } catch (e) { + console.error(e); + this.toastService.showErrorToast('Failed to load Notice of Intent File, please try again later'); + return undefined; + } + } + async getNotification(fileId: string) { try { return await firstValueFrom( @@ -86,4 +110,16 @@ export class PublicService { return undefined; } } + + async getNotificationDownloadFileUrl(fileId: string, uuid: string) { + try { + return await firstValueFrom( + this.httpClient.get<{ url: string }>(`${this.serviceUrl}/notification/${fileId}/${uuid}/download`) + ); + } catch (e) { + console.error(e); + this.toastService.showErrorToast('Failed to load Notification, please try again later'); + return undefined; + } + } } diff --git a/services/apps/alcs/src/portal/public/public.controller.ts b/services/apps/alcs/src/portal/public/public.controller.ts index 22d31c91d4..935b027760 100644 --- a/services/apps/alcs/src/portal/public/public.controller.ts +++ b/services/apps/alcs/src/portal/public/public.controller.ts @@ -23,11 +23,7 @@ export class PublicController { @Param('fileId') fileId: string, @Param('uuid') documentUuid: string, ) { - const url = await this.publicAppService.getDownloadUrl(documentUuid); - - return { - url, - }; + return await this.publicAppService.getDownloadUrl(documentUuid); } @Get('/application/:fileId/:uuid/open') @@ -35,11 +31,7 @@ export class PublicController { @Param('fileId') fileId: string, @Param('uuid') documentUuid: string, ) { - const url = await this.publicAppService.getInlineUrl(documentUuid); - - return { - url, - }; + return await this.publicAppService.getInlineUrl(documentUuid); } @Get('/notice-of-intent/:fileId') @@ -52,13 +44,7 @@ export class PublicController { @Param('fileId') fileId: string, @Param('uuid') documentUuid: string, ) { - const url = await this.publicNoticeOfIntentService.getDownloadUrl( - documentUuid, - ); - - return { - url, - }; + return await this.publicNoticeOfIntentService.getDownloadUrl(documentUuid); } @Get('/notice-of-intent/:fileId/:uuid/open') @@ -66,13 +52,7 @@ export class PublicController { @Param('fileId') fileId: string, @Param('uuid') documentUuid: string, ) { - const url = await this.publicNoticeOfIntentService.getInlineUrl( - documentUuid, - ); - - return { - url, - }; + return await this.publicNoticeOfIntentService.getInlineUrl(documentUuid); } @Get('/notification/:fileId') @@ -85,13 +65,7 @@ export class PublicController { @Param('fileId') fileId: string, @Param('uuid') documentUuid: string, ) { - const url = await this.publicNotificationService.getDownloadUrl( - documentUuid, - ); - - return { - url, - }; + return await this.publicNotificationService.getDownloadUrl(documentUuid); } @Get('/notification/:fileId/:uuid/open') @@ -99,10 +73,6 @@ export class PublicController { @Param('fileId') fileId: string, @Param('uuid') documentUuid: string, ) { - const url = await this.publicNotificationService.getInlineUrl(documentUuid); - - return { - url, - }; + return await this.publicNotificationService.getInlineUrl(documentUuid); } } From 94ea6d449b0db34009fcf712f8e24acf7088cc77 Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Tue, 10 Oct 2023 13:33:03 -0700 Subject: [PATCH 475/954] NOI "In progress" status from OATS to ALCS (#1042) introduce date_time helper base status import for NOI import NOI "In progress" status from OATS to ALCS --- bin/migrate-oats-data/common/__init__.py | 1 + .../common/date_time_helper.py | 31 +++++ .../noi/notice_of_intent_migration.py | 9 ++ .../notice_of_intent_submissions/__init__.py | 13 +- .../notice_of_intent_status_in_progress.py | 121 ++++++++++++++++++ .../notice_of_intent_statuses_base_insert.py | 69 ++++++++++ .../notice_of_intent_status_in_progress.sql | 33 +++++ ...ice_of_intent_status_in_progress_count.sql | 30 +++++ ...t_notice_of_intent_submission_statuses.sql | 30 +++++ ...ce_of_intent_submission_statuses_count.sql | 27 ++++ bin/migrate-oats-data/requirements.txt | 3 +- 11 files changed, 365 insertions(+), 2 deletions(-) create mode 100644 bin/migrate-oats-data/common/date_time_helper.py create mode 100644 bin/migrate-oats-data/noi/notice_of_intent_submissions/statuses/notice_of_intent_status_in_progress.py create mode 100644 bin/migrate-oats-data/noi/notice_of_intent_submissions/statuses/notice_of_intent_statuses_base_insert.py create mode 100644 bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/in_progress/notice_of_intent_status_in_progress.sql create mode 100644 bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/in_progress/notice_of_intent_status_in_progress_count.sql create mode 100644 bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/init_notice_of_intent_submission_statuses.sql create mode 100644 bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/init_notice_of_intent_submission_statuses_count.sql diff --git a/bin/migrate-oats-data/common/__init__.py b/bin/migrate-oats-data/common/__init__.py index 5ecfec974a..12452975fe 100644 --- a/bin/migrate-oats-data/common/__init__.py +++ b/bin/migrate-oats-data/common/__init__.py @@ -5,4 +5,5 @@ from .oats_to_alcs_adjacent_land_use_type_enum import * from .json_encoder import * from .oats_to_alcs_soil_change_code_enum import * +from .date_time_helper import * from .oats_to_alcs_naru_code_enum import * diff --git a/bin/migrate-oats-data/common/date_time_helper.py b/bin/migrate-oats-data/common/date_time_helper.py new file mode 100644 index 0000000000..b7106444e3 --- /dev/null +++ b/bin/migrate-oats-data/common/date_time_helper.py @@ -0,0 +1,31 @@ +from datetime import datetime +import pytz + + +def convert_timezone(date_str, timezone_str="America/Vancouver"): + # Convert the string to a datetime object + if isinstance(date_str, str): + dt = datetime.strptime(date_str, "%Y-%m-%d %H:%M:%S") + else: # assuming date_str is a datetime object + dt = date_str + + # Adjust timezone + timezone = pytz.timezone(timezone_str) + dt = dt.replace(tzinfo=pytz.UTC) + dt_aware = dt.astimezone(timezone) + + # Format the string with the desired output + formatted = dt_aware.strftime("%Y-%m-%d %H:%M:%S.%f %z") + + return formatted + + +def set_time(date_str, hour=0, minute=0, second=0): + # Replace the time of the given date + if isinstance(date_str, str): + dt = datetime.strptime(date_str, "%Y-%m-%d %H:%M:%S.%f %z") + else: # assuming date_str is a datetime object + dt = date_str + + dt = dt.replace(hour=hour, minute=minute, second=second, microsecond=0) + return dt.strftime("%Y-%m-%d %H:%M:%S.%f %z") diff --git a/bin/migrate-oats-data/noi/notice_of_intent_migration.py b/bin/migrate-oats-data/noi/notice_of_intent_migration.py index 49ec3d712c..baa07aa05c 100644 --- a/bin/migrate-oats-data/noi/notice_of_intent_migration.py +++ b/bin/migrate-oats-data/noi/notice_of_intent_migration.py @@ -9,6 +9,9 @@ process_alcs_notice_of_intent_soil_fields, process_notice_of_intent_adjacent_land_use, process_notice_of_intent_empty_adjacent_land_use, + init_notice_of_intent_statuses, + process_alcs_notice_of_intent_in_progress_status, + clean_notice_of_intent_submission_statuses, ) from .oats_to_alcs_notice_of_intent_table_etl.notice_of_intent_decision_date import ( process_alcs_notice_of_intent_decision_date, @@ -23,6 +26,7 @@ def init_notice_of_intent(batch_size): def clean_notice_of_intent(): + clean_notice_of_intent_submission_statuses() clean_notice_of_intent_submissions() clean_notice_of_intents() @@ -43,4 +47,9 @@ def process_notice_of_intent(batch_size): process_alcs_notice_of_intent_proposal_fields(batch_size) + init_notice_of_intent_statuses() + + process_alcs_notice_of_intent_in_progress_status(batch_size) + + # this script must be the last one process_notice_of_intent_submission_status_emails() diff --git a/bin/migrate-oats-data/noi/notice_of_intent_submissions/__init__.py b/bin/migrate-oats-data/noi/notice_of_intent_submissions/__init__.py index d6591c20bc..e0fa1aca89 100644 --- a/bin/migrate-oats-data/noi/notice_of_intent_submissions/__init__.py +++ b/bin/migrate-oats-data/noi/notice_of_intent_submissions/__init__.py @@ -10,4 +10,15 @@ ) from .notice_of_intent_soil_fields import process_alcs_notice_of_intent_soil_fields -from .notice_of_intent_proposal_fields import process_alcs_notice_of_intent_proposal_fields +from .notice_of_intent_proposal_fields import ( + process_alcs_notice_of_intent_proposal_fields, +) + +from .statuses.notice_of_intent_statuses_base_insert import ( + init_notice_of_intent_statuses, + clean_notice_of_intent_submission_statuses, +) + +from .statuses.notice_of_intent_status_in_progress import ( + process_alcs_notice_of_intent_in_progress_status, +) diff --git a/bin/migrate-oats-data/noi/notice_of_intent_submissions/statuses/notice_of_intent_status_in_progress.py b/bin/migrate-oats-data/noi/notice_of_intent_submissions/statuses/notice_of_intent_status_in_progress.py new file mode 100644 index 0000000000..12c8dff273 --- /dev/null +++ b/bin/migrate-oats-data/noi/notice_of_intent_submissions/statuses/notice_of_intent_status_in_progress.py @@ -0,0 +1,121 @@ +from common import BATCH_UPLOAD_SIZE, setup_and_get_logger, convert_timezone, set_time +from db import inject_conn_pool +from psycopg2.extras import RealDictCursor, execute_batch + +etl_name = "process_alcs_notice_of_intent_in_progress_status" +logger = setup_and_get_logger(etl_name) + + +@inject_conn_pool +def process_alcs_notice_of_intent_in_progress_status( + conn=None, batch_size=BATCH_UPLOAD_SIZE +): + """ + This function is responsible for populating In Progress status of Notice of Intent in ALCS. + + Args: + conn (psycopg2.extensions.connection): PostgreSQL database connection. Provided by the decorator. + batch_size (int): The number of items to process at once. Defaults to BATCH_UPLOAD_SIZE. + """ + + logger.info(f"Start {etl_name}") + with conn.cursor(cursor_factory=RealDictCursor) as cursor: + with open( + "noi/sql/notice_of_intent_submission/statuses/in_progress/notice_of_intent_status_in_progress_count.sql", + "r", + encoding="utf-8", + ) as sql_file: + count_query = sql_file.read() + cursor.execute(count_query) + count_total = dict(cursor.fetchone())["count"] + logger.info(f"Total Notice of Intents data to update: {count_total}") + + failed_inserts = 0 + successful_updates_count = 0 + last_application_id = 0 + + with open( + "noi/sql/notice_of_intent_submission/statuses/in_progress/notice_of_intent_status_in_progress.sql", + "r", + encoding="utf-8", + ) as sql_file: + application_sql = sql_file.read() + while True: + cursor.execute( + f"{application_sql} WHERE oats_in_prog.alr_application_id > {last_application_id} ORDER BY oats_in_prog.alr_application_id;" + ) + + rows = cursor.fetchmany(batch_size) + + if not rows: + break + try: + records_to_be_updated_count = len(rows) + + _update_records(conn, batch_size, cursor, rows) + + successful_updates_count = ( + successful_updates_count + records_to_be_updated_count + ) + last_application_id = dict(rows[-1])["alr_application_id"] + + logger.debug( + f"retrieved/updated items count: {records_to_be_updated_count}; total successfully updated notice of intents so far {successful_updates_count}; last updated alr_application_id: {last_application_id}" + ) + except Exception as err: + # this is NOT going to be caused by actual data update failure. This code is only executed when the code error appears or connection to DB is lost + logger.exception() + conn.rollback() + failed_inserts = count_total - successful_updates_count + last_application_id = last_application_id + 1 + + logger.info( + f"Finished {etl_name}: total amount of successful updates {successful_updates_count}, total failed updates {failed_inserts}" + ) + + +def _update_records(conn, batch_size, cursor, rows): + parsed_data_list = _prepare_oats_data(rows) + + if len(parsed_data_list) > 0: + execute_batch( + cursor, + _update_query, + parsed_data_list, + page_size=batch_size, + ) + + conn.commit() + + +_update_query = """ + UPDATE alcs.notice_of_intent_submission_to_submission_status + SET effective_date = %(date)s + WHERE submission_uuid = %(uuid)s and status_type_code = 'PROG' +""" + + +def _prepare_oats_data(row_data_list): + data_list = [] + for row in row_data_list: + data = map_fields(dict(row)) + data_list.append(data) + return data_list + + +def map_fields(data): + status_effective_date = None + + if data: + if data["completion_date"]: + status_effective_date = data["completion_date"] + elif data["created_date"]: + status_effective_date = data["created_date"] + elif data["submitted_to_alc_date"]: + status_effective_date = data["submitted_to_alc_date"] + + if status_effective_date: + date = convert_timezone(status_effective_date, "US/Pacific") + data["date"] = set_time(date) + + return data diff --git a/bin/migrate-oats-data/noi/notice_of_intent_submissions/statuses/notice_of_intent_statuses_base_insert.py b/bin/migrate-oats-data/noi/notice_of_intent_submissions/statuses/notice_of_intent_statuses_base_insert.py new file mode 100644 index 0000000000..489d97d994 --- /dev/null +++ b/bin/migrate-oats-data/noi/notice_of_intent_submissions/statuses/notice_of_intent_statuses_base_insert.py @@ -0,0 +1,69 @@ +from common import OATS_ETL_USER, setup_and_get_logger +from db import inject_conn_pool +from psycopg2.extras import RealDictCursor + +etl_name = "init_notice_of_intent_statuses" +logger = setup_and_get_logger(etl_name) + + +@inject_conn_pool +def init_notice_of_intent_statuses(conn=None): + """ + This function is responsible for initializing notice of intent statuses. + Initializing means inserting status_to_submission record without the effective_date. + + Args: + conn (psycopg2.extensions.connection): PostgreSQL database connection. Provided by the decorator. + batch_size (int): The number of items to process at once. Defaults to BATCH_UPLOAD_SIZE. + """ + + logger.info(f"Start {etl_name}") + with conn.cursor(cursor_factory=RealDictCursor) as cursor: + with open( + "noi/sql/notice_of_intent_submission/statuses/init_notice_of_intent_submission_statuses_count.sql", + "r", + encoding="utf-8", + ) as sql_file: + count_query = sql_file.read() + cursor.execute(count_query) + count_total = dict(cursor.fetchone())["count"] + logger.info(f"Total Notice of Intents data to insert: {count_total}") + + failed_inserts = 0 + successful_inserts_count = 0 + last_application_id = 0 + + with open( + "noi/sql/notice_of_intent_submission/statuses/init_notice_of_intent_submission_statuses.sql", + "r", + encoding="utf-8", + ) as sql_file: + query = sql_file.read() + + try: + cursor.execute(query) + conn.commit() + successful_inserts_count = cursor.rowcount + except Exception as err: + logger.exception() + conn.rollback() + failed_inserts = count_total - successful_inserts_count + last_application_id = last_application_id + 1 + + logger.info( + f"Finished {etl_name}: total amount of successful inserts {successful_inserts_count}, total failed updates {failed_inserts}" + ) + + +@inject_conn_pool +def clean_notice_of_intent_submission_statuses(conn=None): + logger.info("Start init_notice_of_intent_statuses cleaning") + with conn.cursor() as cursor: + cursor.execute( + f"""DELETE FROM alcs.notice_of_intent_submission_to_submission_status noi_st + USING alcs.notice_of_intent_submission nois + WHERE noi_st.submission_uuid = nois.uuid AND nois.audit_created_by = '{OATS_ETL_USER}';""" + ) + logger.info(f"Deleted items count = {cursor.rowcount}") + + conn.commit() diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/in_progress/notice_of_intent_status_in_progress.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/in_progress/notice_of_intent_status_in_progress.sql new file mode 100644 index 0000000000..53581a480e --- /dev/null +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/in_progress/notice_of_intent_status_in_progress.sql @@ -0,0 +1,33 @@ +WITH latest_in_progress_accomplishment_per_file_number AS ( + SELECT DISTINCT ON (alr_application_id, accomplishment_code) * + FROM oats.oats_accomplishments oa + WHERE accomplishment_code = 'INP' + ORDER BY alr_application_id, + accomplishment_code, + completion_date DESC +), +latest_in_progress_accomplishments_for_noi_only AS ( + SELECT DISTINCT ON ( + latest_in_prog.accomplishment_code, + latest_in_prog.completion_date, + oaa.alr_application_id, + oaa.created_date, + oaa.submitted_to_alc_date + ) latest_in_prog.accomplishment_code, + latest_in_prog.completion_date, + oaa.alr_application_id, + oaa.created_date, + oaa.submitted_to_alc_date + FROM oats.oats_alr_applications oaa + LEFT JOIN latest_in_progress_accomplishment_per_file_number AS latest_in_prog ON latest_in_prog.alr_application_id = oaa.alr_application_id + WHERE oaa.application_class_code = 'NOI' +) +SELECT DISTINCT ON (oats_in_prog.alr_application_id) oats_in_prog.alr_application_id, + oats_in_prog.accomplishment_code, + oats_in_prog.completion_date, + oats_in_prog.created_date, + oats_in_prog.submitted_to_alc_date, + nois.uuid +FROM alcs.notice_of_intent_submission_to_submission_status noistss + JOIN alcs.notice_of_intent_submission nois ON nois.uuid = noistss.submission_uuid + JOIN latest_in_progress_accomplishments_for_noi_only AS oats_in_prog ON oats_in_prog.alr_application_id::TEXT = nois.file_number \ No newline at end of file diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/in_progress/notice_of_intent_status_in_progress_count.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/in_progress/notice_of_intent_status_in_progress_count.sql new file mode 100644 index 0000000000..dd3aea55a2 --- /dev/null +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/in_progress/notice_of_intent_status_in_progress_count.sql @@ -0,0 +1,30 @@ +WITH latest_in_progress_accomplishment_per_file_number AS ( + SELECT DISTINCT ON (alr_application_id, accomplishment_code) * + FROM oats.oats_accomplishments oa + WHERE accomplishment_code = 'INP' +), +latest_in_progress_accomplishments_for_noi_only AS ( + SELECT DISTINCT ON ( + latest_in_prog.accomplishment_code, + latest_in_prog.completion_date, + oaa.alr_application_id, + oaa.created_date, + oaa.submitted_to_alc_date + ) latest_in_prog.accomplishment_code, + latest_in_prog.completion_date, + oaa.alr_application_id, + oaa.created_date, + oaa.submitted_to_alc_date + FROM oats.oats_alr_applications oaa + LEFT JOIN latest_in_progress_accomplishment_per_file_number AS latest_in_prog ON latest_in_prog.alr_application_id = oaa.alr_application_id + WHERE oaa.application_class_code = 'NOI' +), +submission_statuses_to_update AS ( + SELECT count(*) + FROM alcs.notice_of_intent_submission_to_submission_status noistss + JOIN alcs.notice_of_intent_submission nois ON nois.uuid = noistss.submission_uuid + JOIN latest_in_progress_accomplishments_for_noi_only AS oats_in_prog ON oats_in_prog.alr_application_id::TEXT = nois.file_number + GROUP BY noistss.submission_uuid +) +SELECT count(*) +FROM submission_statuses_to_update \ No newline at end of file diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/init_notice_of_intent_submission_statuses.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/init_notice_of_intent_submission_statuses.sql new file mode 100644 index 0000000000..6eebc25f2a --- /dev/null +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/init_notice_of_intent_submission_statuses.sql @@ -0,0 +1,30 @@ +INSERT INTO alcs.notice_of_intent_submission_to_submission_status(submission_uuid, status_type_code) -- retrieve Notice of Intents from OATS that have only 1 proposal component + WITH noi_components_grouped AS ( + SELECT oaac.alr_application_id + FROM oats.oats_alr_appl_components oaac + JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id + WHERE oaa.application_class_code = 'NOI' + GROUP BY oaac.alr_application_id + HAVING count(oaac.alr_application_id) < 2 -- ignore notice of intents with multiple components + ), + -- alcs_submissions_with_statuses is required for development environment only. Production environment does not have submissions. + alcs_submissions_with_statuses AS ( + SELECT nois.file_number + FROM alcs.notice_of_intent_submission nois + JOIN alcs.notice_of_intent_submission_to_submission_status noistss ON nois.uuid = noistss.submission_uuid + GROUP BY nois.file_number + ), + -- retrieve submission_uuid from ALCS that were imported with ETL + alcs_submission_uuids_to_populate AS ( + SELECT oaa.alr_application_id, + nois.uuid + FROM noi_components_grouped + JOIN oats.oats_alr_applications oaa ON noi_components_grouped.alr_application_id = oaa.alr_application_id + JOIN alcs.notice_of_intent_submission nois ON oaa.alr_application_id::TEXT = nois.file_number -- make sure TO WORK ONLY with the ones that were imported TO ALCS + LEFT JOIN alcs_submissions_with_statuses ON alcs_submissions_with_statuses.file_number = nois.file_number + WHERE alcs_submissions_with_statuses.file_number IS NULL -- filter out all submissions that have statuses populated before the ETL; + ) +SELECT uuid, + noisst.code +FROM alcs_submission_uuids_to_populate + CROSS JOIN alcs.notice_of_intent_submission_status_type noisst \ No newline at end of file diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/init_notice_of_intent_submission_statuses_count.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/init_notice_of_intent_submission_statuses_count.sql new file mode 100644 index 0000000000..7536ae4157 --- /dev/null +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/init_notice_of_intent_submission_statuses_count.sql @@ -0,0 +1,27 @@ +WITH noi_components_grouped AS ( + SELECT oaac.alr_application_id + FROM oats.oats_alr_appl_components oaac + JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id + WHERE oaa.application_class_code = 'NOI' + GROUP BY oaac.alr_application_id + HAVING count(oaac.alr_application_id) < 2 -- ignore notice of intents with multiple components +), +alcs_submissions_with_statuses AS ( + SELECT nois.file_number + FROM alcs.notice_of_intent_submission nois + JOIN alcs.notice_of_intent_submission_to_submission_status noistss ON nois.uuid = noistss.submission_uuid + GROUP BY nois.file_number +), +-- alcs_submissions_with_statuses is required for developement environment only. Production environment does not have submissions. +alcs_submission_uuids_to_populate AS ( + SELECT oaa.alr_application_id, + nois.uuid + FROM noi_components_grouped + JOIN oats.oats_alr_applications oaa ON noi_components_grouped.alr_application_id = oaa.alr_application_id + JOIN alcs.notice_of_intent_submission nois ON oaa.alr_application_id::TEXT = nois.file_number -- make sure TO WORK ONLY with the ones that were imported TO ALCS + LEFT JOIN alcs_submissions_with_statuses ON alcs_submissions_with_statuses.file_number = nois.file_number + WHERE alcs_submissions_with_statuses.file_number IS NULL -- filter out all submissons that have statuses populated before the ETL; +) +SELECT count(*) +FROM alcs_submission_uuids_to_populate + CROSS JOIN alcs.notice_of_intent_submission_status_type noisst \ No newline at end of file diff --git a/bin/migrate-oats-data/requirements.txt b/bin/migrate-oats-data/requirements.txt index 8ccb3d4a10..6749ce4202 100644 --- a/bin/migrate-oats-data/requirements.txt +++ b/bin/migrate-oats-data/requirements.txt @@ -2,4 +2,5 @@ psycopg2==2.9.5 tqdm==4.64.1 python-dotenv==0.21.0 pyyaml==6.0 -rich==13.3.1 \ No newline at end of file +rich==13.3.1 +pytz==2023.3 \ No newline at end of file From 6457bc62c8006ca7a7db8a2822a6a13e41d97b0f Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Tue, 10 Oct 2023 14:28:48 -0700 Subject: [PATCH 476/954] Public Fixes * Fix Sorting for Notifications on the backend * Set default sorting to all tables * Fix routing for decisions for signed in users --- .../application-search-table.component.html | 2 +- .../application-search-table.component.ts | 5 +++-- .../notice-of-intent-search-table.component.html | 2 +- .../notice-of-intent-search-table.component.ts | 7 +++---- .../notification-search-table.component.html | 2 +- .../notification-search-table.component.ts | 5 +++-- .../application-decision.service.ts | 2 +- .../notice-of-intent-decision.service.ts | 2 +- .../application-decision.controller.spec.ts | 13 ++----------- .../application/application-decision.controller.ts | 9 +++------ .../notice-of-intent-decision.controller.spec.ts | 13 ++----------- .../notice-of-intent-decision.controller.ts | 9 +++------ .../public-notification-search.service.ts | 2 +- 13 files changed, 25 insertions(+), 48 deletions(-) diff --git a/portal-frontend/src/app/features/public/search/application-search-table/application-search-table.component.html b/portal-frontend/src/app/features/public/search/application-search-table/application-search-table.component.html index 0dab4c158a..251efa1ad2 100644 --- a/portal-frontend/src/app/features/public/search/application-search-table/application-search-table.component.html +++ b/portal-frontend/src/app/features/public/search/application-search-table/application-search-table.component.html @@ -4,7 +4,7 @@ [dataSource]="dataSource" class="mat-elevation-z2 table" matSort - matSortActive="dateSubmitted" + matSortActive="lastUpdate" matSortDirection="desc" matSortDisableClear > diff --git a/portal-frontend/src/app/features/public/search/application-search-table/application-search-table.component.ts b/portal-frontend/src/app/features/public/search/application-search-table/application-search-table.component.ts index a6096dd2eb..f27ff2e611 100644 --- a/portal-frontend/src/app/features/public/search/application-search-table/application-search-table.component.ts +++ b/portal-frontend/src/app/features/public/search/application-search-table/application-search-table.component.ts @@ -1,6 +1,7 @@ import { Component, EventEmitter, Input, OnDestroy, Output, ViewChild } from '@angular/core'; import { MatPaginator, PageEvent } from '@angular/material/paginator'; import { MatSort } from '@angular/material/sort'; +import { MatTableDataSource } from '@angular/material/table'; import { Router } from '@angular/router'; import { Subject, takeUntil } from 'rxjs'; import { ApplicationStatusDto } from '../../../../services/application-submission/application-submission.dto'; @@ -21,7 +22,7 @@ export class ApplicationSearchTableComponent implements OnDestroy { _applications: ApplicationSearchResultDto[] = []; @Input() set applications(applications: ApplicationSearchResultDto[]) { this._applications = applications; - this.dataSource = this.mapApplications(applications); + this.dataSource = new MatTableDataSource<SearchResult>(this.mapApplications(applications)); } _totalCount = 0; @@ -36,7 +37,7 @@ export class ApplicationSearchTableComponent implements OnDestroy { @Output() tableChange = new EventEmitter<TableChange>(); displayedColumns = ['fileId', 'ownerName', 'type', 'portalStatus', 'lastUpdate', 'government']; - dataSource: SearchResult[] = []; + dataSource = new MatTableDataSource<SearchResult>(); pageIndex = 0; itemsPerPage = 20; total = 0; diff --git a/portal-frontend/src/app/features/public/search/notice-of-intent-search-table/notice-of-intent-search-table.component.html b/portal-frontend/src/app/features/public/search/notice-of-intent-search-table/notice-of-intent-search-table.component.html index f55336deb9..ff1d44f83a 100644 --- a/portal-frontend/src/app/features/public/search/notice-of-intent-search-table/notice-of-intent-search-table.component.html +++ b/portal-frontend/src/app/features/public/search/notice-of-intent-search-table/notice-of-intent-search-table.component.html @@ -4,7 +4,7 @@ [dataSource]="dataSource" class="mat-elevation-z2 table" matSort - matSortActive="dateSubmitted" + matSortActive="lastUpdate" matSortDirection="desc" matSortDisableClear > diff --git a/portal-frontend/src/app/features/public/search/notice-of-intent-search-table/notice-of-intent-search-table.component.ts b/portal-frontend/src/app/features/public/search/notice-of-intent-search-table/notice-of-intent-search-table.component.ts index b4ae375be1..6c79df48fd 100644 --- a/portal-frontend/src/app/features/public/search/notice-of-intent-search-table/notice-of-intent-search-table.component.ts +++ b/portal-frontend/src/app/features/public/search/notice-of-intent-search-table/notice-of-intent-search-table.component.ts @@ -1,11 +1,10 @@ import { Component, EventEmitter, Input, OnDestroy, Output, ViewChild } from '@angular/core'; import { MatPaginator, PageEvent } from '@angular/material/paginator'; import { MatSort } from '@angular/material/sort'; +import { MatTableDataSource } from '@angular/material/table'; import { Router } from '@angular/router'; import { Subject, takeUntil } from 'rxjs'; import { ApplicationStatusDto } from '../../../../services/application-submission/application-submission.dto'; -import { ApplicationRegionDto, NoticeOfIntentTypeDto } from '../../../../services/code/code.dto'; -import { NoticeOfIntentSubmissionStatusDto } from '../../../../services/notice-of-intent-submission/notice-of-intent-submission.dto'; import { NoticeOfIntentSearchResultDto } from '../../../../services/search/search.dto'; import { SearchResult, TableChange } from '../search.interface'; @@ -23,7 +22,7 @@ export class NoticeOfIntentSearchTableComponent implements OnDestroy { _noticeOfIntents: NoticeOfIntentSearchResultDto[] = []; @Input() set noticeOfIntents(noticeOfIntents: NoticeOfIntentSearchResultDto[]) { this._noticeOfIntents = noticeOfIntents; - this.dataSource = this.mapNoticeOfIntent(noticeOfIntents); + this.dataSource = new MatTableDataSource<SearchResult>(this.mapNoticeOfIntent(noticeOfIntents)); } _totalCount = 0; @@ -36,7 +35,7 @@ export class NoticeOfIntentSearchTableComponent implements OnDestroy { @Output() tableChange = new EventEmitter<TableChange>(); displayedColumns = ['fileId', 'ownerName', 'type', 'portalStatus', 'lastUpdate', 'government']; - dataSource: SearchResult[] = []; + dataSource = new MatTableDataSource<SearchResult>(); pageIndex = 0; itemsPerPage = 20; total = 0; diff --git a/portal-frontend/src/app/features/public/search/notification-search-table/notification-search-table.component.html b/portal-frontend/src/app/features/public/search/notification-search-table/notification-search-table.component.html index 58b5b5053f..09f24b0881 100644 --- a/portal-frontend/src/app/features/public/search/notification-search-table/notification-search-table.component.html +++ b/portal-frontend/src/app/features/public/search/notification-search-table/notification-search-table.component.html @@ -4,7 +4,7 @@ [dataSource]="dataSource" class="mat-elevation-z2 table" matSort - matSortActive="dateSubmitted" + matSortActive="lastUpdate" matSortDirection="desc" matSortDisableClear > diff --git a/portal-frontend/src/app/features/public/search/notification-search-table/notification-search-table.component.ts b/portal-frontend/src/app/features/public/search/notification-search-table/notification-search-table.component.ts index 18c8e67acd..8682840657 100644 --- a/portal-frontend/src/app/features/public/search/notification-search-table/notification-search-table.component.ts +++ b/portal-frontend/src/app/features/public/search/notification-search-table/notification-search-table.component.ts @@ -1,6 +1,7 @@ import { Component, EventEmitter, Input, OnDestroy, Output, ViewChild } from '@angular/core'; import { MatPaginator, PageEvent } from '@angular/material/paginator'; import { MatSort } from '@angular/material/sort'; +import { MatTableDataSource } from '@angular/material/table'; import { Router } from '@angular/router'; import { Subject, takeUntil } from 'rxjs'; import { ApplicationStatusDto } from '../../../../services/application-submission/application-submission.dto'; @@ -24,7 +25,7 @@ export class NotificationSearchTableComponent implements OnDestroy { @Input() set notifications(notifications: NotificationSearchResultDto[]) { this._notifications = notifications; - this.dataSource = this.mapNotifications(notifications); + this.dataSource = new MatTableDataSource<SearchResult>(this.mapNotifications(notifications)); } _totalCount = 0; @@ -35,7 +36,7 @@ export class NotificationSearchTableComponent implements OnDestroy { @Output() tableChange = new EventEmitter<TableChange>(); displayedColumns = ['fileId', 'ownerName', 'type', 'portalStatus', 'lastUpdate', 'government']; - dataSource: SearchResult[] = []; + dataSource = new MatTableDataSource<SearchResult>(); pageIndex = 0; itemsPerPage = 20; total = 0; diff --git a/portal-frontend/src/app/services/application-decision/application-decision.service.ts b/portal-frontend/src/app/services/application-decision/application-decision.service.ts index 2e0806934f..5fdf82ca1f 100644 --- a/portal-frontend/src/app/services/application-decision/application-decision.service.ts +++ b/portal-frontend/src/app/services/application-decision/application-decision.service.ts @@ -9,7 +9,7 @@ import { ApplicationPortalDecisionDto } from './application-decision.dto'; providedIn: 'root', }) export class ApplicationDecisionService { - private serviceUrl = `${environment.apiUrl}/public/application/decision`; + private serviceUrl = `${environment.authUrl}/public/application/decision`; constructor(private httpClient: HttpClient, private toastService: ToastService) {} diff --git a/portal-frontend/src/app/services/notice-of-intent-decision/notice-of-intent-decision.service.ts b/portal-frontend/src/app/services/notice-of-intent-decision/notice-of-intent-decision.service.ts index c145a744ba..477914a2b3 100644 --- a/portal-frontend/src/app/services/notice-of-intent-decision/notice-of-intent-decision.service.ts +++ b/portal-frontend/src/app/services/notice-of-intent-decision/notice-of-intent-decision.service.ts @@ -9,7 +9,7 @@ import { NoticeOfIntentPortalDecisionDto } from './notice-of-intent-decision.dto providedIn: 'root', }) export class NoticeOfIntentDecisionService { - private serviceUrl = `${environment.apiUrl}/public/notice-of-intent/decision`; + private serviceUrl = `${environment.authUrl}/public/notice-of-intent/decision`; constructor(private httpClient: HttpClient, private toastService: ToastService) {} diff --git a/services/apps/alcs/src/portal/public/application/application-decision.controller.spec.ts b/services/apps/alcs/src/portal/public/application/application-decision.controller.spec.ts index b7745058dc..24623cbed8 100644 --- a/services/apps/alcs/src/portal/public/application/application-decision.controller.spec.ts +++ b/services/apps/alcs/src/portal/public/application/application-decision.controller.spec.ts @@ -7,7 +7,6 @@ import { mockKeyCloakProviders } from '../../../../test/mocks/mockTypes'; import { ApplicationDecisionV2Service } from '../../../alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service'; import { ApplicationDecision } from '../../../alcs/application-decision/application-decision.entity'; import { ApplicationDecisionProfile } from '../../../common/automapper/application-decision-v2.automapper.profile'; -import { User } from '../../../user/user.entity'; import { ApplicationSubmissionService } from '../../application-submission/application-submission.service'; import { ApplicationDecisionController } from './application-decision.controller'; @@ -58,11 +57,7 @@ describe('ApplicationDecisionController', () => { new ApplicationDecision(), ]); - const res = await controller.listDecisions('', { - user: { - entity: new User(), - }, - }); + const res = await controller.listDecisions(''); expect(res.length).toEqual(1); expect(mockDecisionService.getForPortal).toHaveBeenCalledTimes(1); @@ -71,11 +66,7 @@ describe('ApplicationDecisionController', () => { it('should call through for loading files', async () => { mockDecisionService.getDownloadUrl.mockResolvedValue('Mock Url'); - const res = await controller.openFile('', { - user: { - entity: new User(), - }, - }); + const res = await controller.openFile(''); expect(res.url).toBeTruthy(); expect(mockDecisionService.getDownloadUrl).toHaveBeenCalledTimes(1); diff --git a/services/apps/alcs/src/portal/public/application/application-decision.controller.ts b/services/apps/alcs/src/portal/public/application/application-decision.controller.ts index 73d23dc4b4..fc7df0afde 100644 --- a/services/apps/alcs/src/portal/public/application/application-decision.controller.ts +++ b/services/apps/alcs/src/portal/public/application/application-decision.controller.ts @@ -8,7 +8,7 @@ import { ApplicationSubmissionService } from '../../application-submission/appli import { ApplicationPortalDecisionDto } from './application-decision.dto'; @Public() -@Controller('application/decision') +@Controller('public/application/decision') export class ApplicationDecisionController { constructor( private applicationSubmissionService: ApplicationSubmissionService, @@ -16,10 +16,9 @@ export class ApplicationDecisionController { @InjectMapper() private mapper: Mapper, ) {} - @Get('/application/:fileNumber') + @Get('/:fileNumber') async listDecisions( @Param('fileNumber') fileNumber: string, - @Req() req, ): Promise<ApplicationPortalDecisionDto[]> { const decisions = await this.decisionService.getForPortal(fileNumber); @@ -31,11 +30,9 @@ export class ApplicationDecisionController { } @Get('/:uuid/open') - async openFile(@Param('uuid') fileUuid: string, @Req() req) { + async openFile(@Param('uuid') fileUuid: string) { const url = await this.decisionService.getDownloadUrl(fileUuid); - //TODO: How do we know which documents applicant can access? - return { url }; } } diff --git a/services/apps/alcs/src/portal/public/notice-of-intent/notice-of-intent-decision.controller.spec.ts b/services/apps/alcs/src/portal/public/notice-of-intent/notice-of-intent-decision.controller.spec.ts index 15925bf226..530fcdd3bf 100644 --- a/services/apps/alcs/src/portal/public/notice-of-intent/notice-of-intent-decision.controller.spec.ts +++ b/services/apps/alcs/src/portal/public/notice-of-intent/notice-of-intent-decision.controller.spec.ts @@ -7,7 +7,6 @@ import { mockKeyCloakProviders } from '../../../../test/mocks/mockTypes'; import { NoticeOfIntentDecisionV2Service } from '../../../alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.service'; import { NoticeOfIntentDecision } from '../../../alcs/notice-of-intent-decision/notice-of-intent-decision.entity'; import { NoticeOfIntentDecisionProfile } from '../../../common/automapper/notice-of-intent-decision.automapper.profile'; -import { User } from '../../../user/user.entity'; import { NoticeOfIntentSubmission } from '../../notice-of-intent-submission/notice-of-intent-submission.entity'; import { NoticeOfIntentSubmissionService } from '../../notice-of-intent-submission/notice-of-intent-submission.service'; import { NoticeOfIntentDecisionController } from './notice-of-intent-decision.controller'; @@ -63,11 +62,7 @@ describe('NoticeOfIntentDecisionController', () => { new NoticeOfIntentDecision(), ]); - const res = await controller.listDecisions('', { - user: { - entity: new User(), - }, - }); + const res = await controller.listDecisions(''); expect(res.length).toEqual(1); expect(mockDecisionService.getForPortal).toHaveBeenCalledTimes(1); @@ -76,11 +71,7 @@ describe('NoticeOfIntentDecisionController', () => { it('should call through for loading files', async () => { mockDecisionService.getDownloadUrl.mockResolvedValue('Mock Url'); - const res = await controller.openFile('', { - user: { - entity: new User(), - }, - }); + const res = await controller.openFile(''); expect(res.url).toBeTruthy(); expect(mockDecisionService.getDownloadUrl).toHaveBeenCalledTimes(1); diff --git a/services/apps/alcs/src/portal/public/notice-of-intent/notice-of-intent-decision.controller.ts b/services/apps/alcs/src/portal/public/notice-of-intent/notice-of-intent-decision.controller.ts index d10b67fe08..37e669c45b 100644 --- a/services/apps/alcs/src/portal/public/notice-of-intent/notice-of-intent-decision.controller.ts +++ b/services/apps/alcs/src/portal/public/notice-of-intent/notice-of-intent-decision.controller.ts @@ -1,6 +1,6 @@ import { Mapper } from '@automapper/core'; import { InjectMapper } from '@automapper/nestjs'; -import { Controller, Get, Param, Req } from '@nestjs/common'; +import { Controller, Get, Param } from '@nestjs/common'; import { Public } from 'nest-keycloak-connect'; import { NoticeOfIntentDecisionV2Service } from '../../../alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.service'; import { NoticeOfIntentDecision } from '../../../alcs/notice-of-intent-decision/notice-of-intent-decision.entity'; @@ -8,7 +8,7 @@ import { NoticeOfIntentSubmissionService } from '../../notice-of-intent-submissi import { NoticeOfIntentPortalDecisionDto } from './notice-of-intent-decision.dto'; @Public() -@Controller('notice-of-intent/decision') +@Controller('public/notice-of-intent/decision') export class NoticeOfIntentDecisionController { constructor( private noticeOfIntentSubmissionService: NoticeOfIntentSubmissionService, @@ -19,7 +19,6 @@ export class NoticeOfIntentDecisionController { @Get('/:fileNumber') async listDecisions( @Param('fileNumber') fileNumber: string, - @Req() req, ): Promise<NoticeOfIntentPortalDecisionDto[]> { const decisions = await this.decisionService.getForPortal(fileNumber); @@ -31,11 +30,9 @@ export class NoticeOfIntentDecisionController { } @Get('/:uuid/open') - async openFile(@Param('uuid') fileUuid: string, @Req() req) { + async openFile(@Param('uuid') fileUuid: string) { const url = await this.decisionService.getDownloadUrl(fileUuid); - //TODO: How do we know which documents applicant can access? - return { url }; } } diff --git a/services/apps/alcs/src/portal/public/search/notification/public-notification-search.service.ts b/services/apps/alcs/src/portal/public/search/notification/public-notification-search.service.ts index 904aa27469..e3140ed66c 100644 --- a/services/apps/alcs/src/portal/public/search/notification/public-notification-search.service.ts +++ b/services/apps/alcs/src/portal/public/search/notification/public-notification-search.service.ts @@ -63,7 +63,7 @@ export class PublicNotificationSearchService { default: case 'lastUpdate': - return `"notificationSearch"."status" ->> 'effectiveDate' `; + return `"notificationSearch"."status" ->> 'effective_date' `; } } From b26b9258bfbbdb36508a971281b1b28ecda7da01 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Tue, 10 Oct 2023 16:22:53 -0700 Subject: [PATCH 477/954] Add default visibility flags to portal documents * If document is certain type add public visibility --- .../alcs/src/document/document-code.entity.ts | 7 ++ .../application-document.controller.spec.ts | 81 ++++++++++++++++++- .../application-document.controller.ts | 21 +++-- .../notice-of-intent-document.controller.ts | 21 +++-- .../notification-document.controller.ts | 16 +++- 5 files changed, 130 insertions(+), 16 deletions(-) diff --git a/services/apps/alcs/src/document/document-code.entity.ts b/services/apps/alcs/src/document/document-code.entity.ts index 03e567fa82..37765ecba3 100644 --- a/services/apps/alcs/src/document/document-code.entity.ts +++ b/services/apps/alcs/src/document/document-code.entity.ts @@ -40,6 +40,13 @@ export enum DOCUMENT_TYPE { export const DOCUMENT_TYPES = Object.values(DOCUMENT_TYPE); +export const DEFAULT_PUBLIC_TYPES = [ + DOCUMENT_TYPE.PROPOSAL_MAP, + DOCUMENT_TYPE.RESOLUTION_DOCUMENT, + DOCUMENT_TYPE.REPORT_OF_PUBLIC_HEARING, + DOCUMENT_TYPE.CROSS_SECTIONS, +]; + @Entity() export class DocumentCode extends BaseCodeEntity { constructor(data?: Partial<DocumentCode>) { diff --git a/services/apps/alcs/src/portal/application-document/application-document.controller.spec.ts b/services/apps/alcs/src/portal/application-document/application-document.controller.spec.ts index 27622efa17..b4f168d871 100644 --- a/services/apps/alcs/src/portal/application-document/application-document.controller.spec.ts +++ b/services/apps/alcs/src/portal/application-document/application-document.controller.spec.ts @@ -4,11 +4,17 @@ import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { ClsService } from 'nestjs-cls'; import { mockKeyCloakProviders } from '../../../test/mocks/mockTypes'; -import { DocumentCode } from '../../document/document-code.entity'; -import { ApplicationDocument } from '../../alcs/application/application-document/application-document.entity'; +import { + ApplicationDocument, + VISIBILITY_FLAG, +} from '../../alcs/application/application-document/application-document.entity'; import { ApplicationDocumentService } from '../../alcs/application/application-document/application-document.service'; import { ApplicationService } from '../../alcs/application/application.service'; import { ApplicationProfile } from '../../common/automapper/application.automapper.profile'; +import { + DOCUMENT_TYPE, + DocumentCode, +} from '../../document/document-code.entity'; import { DOCUMENT_SOURCE, DOCUMENT_SYSTEM } from '../../document/document.dto'; import { Document } from '../../document/document.entity'; import { DocumentService } from '../../document/document.service'; @@ -183,6 +189,77 @@ describe('ApplicationDocumentController', () => { expect(mockDocumentService.createDocumentRecord).toBeCalledTimes(1); expect(appDocumentService.attachExternalDocument).toBeCalledTimes(1); + expect(appDocumentService.attachExternalDocument).toBeCalledWith( + undefined, + { + documentUuid: 'fake-uuid', + }, + [ + VISIBILITY_FLAG.APPLICANT, + VISIBILITY_FLAG.GOVERNMENT, + VISIBILITY_FLAG.COMMISSIONER, + ], + ); + expect(mockDocumentService.createDocumentRecord).toBeCalledWith({ + ...docDto, + system: DOCUMENT_SYSTEM.PORTAL, + }); + expect(res.uploadedBy).toEqual(user.user.entity); + expect(res.uuid).toEqual(fakeUuid); + }); + + it('should should add the public flag when document is a proposal map', async () => { + const user = { user: { entity: 'Bruce' } }; + const fakeUuid = 'fakeUuid'; + const docObj = new Document({ uuid: 'fake-uuid' }); + const userEntity = new User({ + name: user.user.entity, + }); + + const docDto: AttachExternalDocumentDto = { + fileSize: 0, + mimeType: 'mimeType', + fileName: 'fileName', + fileKey: 'fileKey', + source: DOCUMENT_SOURCE.APPLICANT, + documentType: DOCUMENT_TYPE.PROPOSAL_MAP, + }; + + mockDocumentService.createDocumentRecord.mockResolvedValue(docObj); + + appDocumentService.attachExternalDocument.mockResolvedValue( + new ApplicationDocument({ + application: undefined, + type: new DocumentCode(), + uuid: fakeUuid, + document: new Document({ + uploadedAt: new Date(), + uploadedBy: userEntity, + }), + }), + ); + + const res = await controller.attachExternalDocument( + 'fake-number', + docDto, + user, + ); + + expect(mockDocumentService.createDocumentRecord).toBeCalledTimes(1); + expect(appDocumentService.attachExternalDocument).toBeCalledTimes(1); + expect(appDocumentService.attachExternalDocument).toBeCalledWith( + undefined, + { + documentUuid: 'fake-uuid', + type: DOCUMENT_TYPE.PROPOSAL_MAP, + }, + [ + VISIBILITY_FLAG.APPLICANT, + VISIBILITY_FLAG.GOVERNMENT, + VISIBILITY_FLAG.COMMISSIONER, + VISIBILITY_FLAG.PUBLIC, + ], + ); expect(mockDocumentService.createDocumentRecord).toBeCalledWith({ ...docDto, system: DOCUMENT_SYSTEM.PORTAL, diff --git a/services/apps/alcs/src/portal/application-document/application-document.controller.ts b/services/apps/alcs/src/portal/application-document/application-document.controller.ts index 23fd7567fe..f68b2d9088 100644 --- a/services/apps/alcs/src/portal/application-document/application-document.controller.ts +++ b/services/apps/alcs/src/portal/application-document/application-document.controller.ts @@ -13,7 +13,6 @@ import { } from '@nestjs/common'; import { ApiOAuth2 } from '@nestjs/swagger'; import * as config from 'config'; -import { DOCUMENT_TYPE } from '../../document/document-code.entity'; import { ApplicationDocumentDto } from '../../alcs/application/application-document/application-document.dto'; import { ApplicationDocument, @@ -22,6 +21,10 @@ import { import { ApplicationDocumentService } from '../../alcs/application/application-document/application-document.service'; import { ApplicationService } from '../../alcs/application/application.service'; import { PortalAuthGuard } from '../../common/authorization/portal-auth-guard.service'; +import { + DEFAULT_PUBLIC_TYPES, + DOCUMENT_TYPE, +} from '../../document/document-code.entity'; import { DOCUMENT_SYSTEM } from '../../document/document.dto'; import { DocumentService } from '../../document/document.service'; import { ApplicationSubmissionService } from '../application-submission/application-submission.service'; @@ -139,6 +142,16 @@ export class ApplicationDocumentController { system: DOCUMENT_SYSTEM.PORTAL, }); + const visibilityFlags = [ + VISIBILITY_FLAG.APPLICANT, + VISIBILITY_FLAG.GOVERNMENT, + VISIBILITY_FLAG.COMMISSIONER, + ]; + + if (data.documentType && DEFAULT_PUBLIC_TYPES.includes(data.documentType)) { + visibilityFlags.push(VISIBILITY_FLAG.PUBLIC); + } + const savedDocument = await this.applicationDocumentService.attachExternalDocument( submission.fileNumber, @@ -146,11 +159,7 @@ export class ApplicationDocumentController { documentUuid: document.uuid, type: data.documentType, }, - [ - VISIBILITY_FLAG.APPLICANT, - VISIBILITY_FLAG.GOVERNMENT, - VISIBILITY_FLAG.COMMISSIONER, - ], + visibilityFlags, ); const mappedDocs = this.mapPortalDocuments([savedDocument]); diff --git a/services/apps/alcs/src/portal/notice-of-intent-document/notice-of-intent-document.controller.ts b/services/apps/alcs/src/portal/notice-of-intent-document/notice-of-intent-document.controller.ts index 05dfd9a58d..bd17843c82 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-document/notice-of-intent-document.controller.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-document/notice-of-intent-document.controller.ts @@ -20,7 +20,10 @@ import { NoticeOfIntentDocument } from '../../alcs/notice-of-intent/notice-of-in import { NoticeOfIntentDocumentService } from '../../alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.service'; import { NoticeOfIntentService } from '../../alcs/notice-of-intent/notice-of-intent.service'; import { PortalAuthGuard } from '../../common/authorization/portal-auth-guard.service'; -import { DOCUMENT_TYPE } from '../../document/document-code.entity'; +import { + DEFAULT_PUBLIC_TYPES, + DOCUMENT_TYPE, +} from '../../document/document-code.entity'; import { DOCUMENT_SYSTEM } from '../../document/document.dto'; import { DocumentService } from '../../document/document.service'; import { NoticeOfIntentSubmissionService } from '../notice-of-intent-submission/notice-of-intent-submission.service'; @@ -139,6 +142,16 @@ export class NoticeOfIntentDocumentController { system: DOCUMENT_SYSTEM.PORTAL, }); + const visibilityFlags = [ + VISIBILITY_FLAG.APPLICANT, + VISIBILITY_FLAG.GOVERNMENT, + VISIBILITY_FLAG.COMMISSIONER, + ]; + + if (data.documentType && DEFAULT_PUBLIC_TYPES.includes(data.documentType)) { + visibilityFlags.push(VISIBILITY_FLAG.PUBLIC); + } + const savedDocument = await this.noticeOfIntentDocumentService.attachExternalDocument( submission.fileNumber, @@ -146,11 +159,7 @@ export class NoticeOfIntentDocumentController { documentUuid: document.uuid, type: data.documentType, }, - [ - VISIBILITY_FLAG.APPLICANT, - VISIBILITY_FLAG.GOVERNMENT, - VISIBILITY_FLAG.COMMISSIONER, - ], + visibilityFlags, ); const mappedDocs = this.mapPortalDocuments([savedDocument]); diff --git a/services/apps/alcs/src/portal/notification-document/notification-document.controller.ts b/services/apps/alcs/src/portal/notification-document/notification-document.controller.ts index 33a238fa93..b80d4ded50 100644 --- a/services/apps/alcs/src/portal/notification-document/notification-document.controller.ts +++ b/services/apps/alcs/src/portal/notification-document/notification-document.controller.ts @@ -21,7 +21,10 @@ import { import { NotificationDocumentService } from '../../alcs/notification/notification-document/notification-document.service'; import { NotificationService } from '../../alcs/notification/notification.service'; import { PortalAuthGuard } from '../../common/authorization/portal-auth-guard.service'; -import { DOCUMENT_TYPE } from '../../document/document-code.entity'; +import { + DEFAULT_PUBLIC_TYPES, + DOCUMENT_TYPE, +} from '../../document/document-code.entity'; import { DOCUMENT_SYSTEM } from '../../document/document.dto'; import { DocumentService } from '../../document/document.service'; import { NotificationSubmissionService } from '../notification-submission/notification-submission.service'; @@ -138,6 +141,15 @@ export class NotificationDocumentController { system: DOCUMENT_SYSTEM.PORTAL, }); + const visibilityFlags = [ + VISIBILITY_FLAG.APPLICANT, + VISIBILITY_FLAG.COMMISSIONER, + ]; + + if (data.documentType && DEFAULT_PUBLIC_TYPES.includes(data.documentType)) { + visibilityFlags.push(VISIBILITY_FLAG.PUBLIC); + } + const savedDocument = await this.notificationDocumentService.attachExternalDocument( submission.fileNumber, @@ -145,7 +157,7 @@ export class NotificationDocumentController { documentUuid: document.uuid, type: data.documentType, }, - [VISIBILITY_FLAG.APPLICANT, VISIBILITY_FLAG.GOVERNMENT], + visibilityFlags, ); const mappedDocs = this.mapPortalDocuments([savedDocument]); From d58eaa336f6e27cf91d175ab66a503d5897eeb8a Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Wed, 11 Oct 2023 10:50:25 -0700 Subject: [PATCH 478/954] Add Notifications to Unarchive Card Service --- .../apps/alcs/src/alcs/admin/admin.module.ts | 2 ++ .../unarchive-card.service.spec.ts | 9 +++++++ .../unarchive-card/unarchive-card.service.ts | 25 +++++++++++++++++++ 3 files changed, 36 insertions(+) diff --git a/services/apps/alcs/src/alcs/admin/admin.module.ts b/services/apps/alcs/src/alcs/admin/admin.module.ts index f94c8665a5..c0942a8d9a 100644 --- a/services/apps/alcs/src/alcs/admin/admin.module.ts +++ b/services/apps/alcs/src/alcs/admin/admin.module.ts @@ -11,6 +11,7 @@ import { ApplicationDecisionModule } from '../application-decision/application-d import { NoticeOfIntentDecisionModule } from '../notice-of-intent-decision/notice-of-intent-decision.module'; import { NoticeOfIntentSubtype } from '../notice-of-intent/notice-of-intent-subtype.entity'; import { NoticeOfIntentModule } from '../notice-of-intent/notice-of-intent.module'; +import { NotificationModule } from '../notification/notification.module'; import { PlanningReviewModule } from '../planning-review/planning-review.module'; import { ApplicationCeoCriterionController } from './application-ceo-criterion/application-ceo-criterion.controller'; import { ApplicationCeoCriterionService } from './application-ceo-criterion/application-ceo-criterion.service'; @@ -48,6 +49,7 @@ import { UnarchiveCardService } from './unarchive-card/unarchive-card.service'; NoticeOfIntentDecisionModule, CardModule, BoardModule, + NotificationModule, ], controllers: [ HolidayController, diff --git a/services/apps/alcs/src/alcs/admin/unarchive-card/unarchive-card.service.spec.ts b/services/apps/alcs/src/alcs/admin/unarchive-card/unarchive-card.service.spec.ts index 3c5b08a335..8f786c06ef 100644 --- a/services/apps/alcs/src/alcs/admin/unarchive-card/unarchive-card.service.spec.ts +++ b/services/apps/alcs/src/alcs/admin/unarchive-card/unarchive-card.service.spec.ts @@ -8,6 +8,7 @@ import { ApplicationModificationService } from '../../application-decision/appli import { ApplicationReconsiderationService } from '../../application-decision/application-reconsideration/application-reconsideration.service'; import { NoticeOfIntentModificationService } from '../../notice-of-intent-decision/notice-of-intent-modification/notice-of-intent-modification.service'; import { NoticeOfIntentService } from '../../notice-of-intent/notice-of-intent.service'; +import { NotificationService } from '../../notification/notification.service'; import { PlanningReviewService } from '../../planning-review/planning-review.service'; import { UnarchiveCardService } from './unarchive-card.service'; @@ -21,6 +22,7 @@ describe('UnarchiveCardService', () => { let mockCovenantService: DeepMocked<CovenantService>; let mockNOIService: DeepMocked<NoticeOfIntentService>; let mockNOIModificationService: DeepMocked<NoticeOfIntentModificationService>; + let mockNotificationService: DeepMocked<NoticeOfIntentService>; beforeEach(async () => { mockApplicationService = createMock(); @@ -30,6 +32,7 @@ describe('UnarchiveCardService', () => { mockCovenantService = createMock(); mockNOIService = createMock(); mockNOIModificationService = createMock(); + mockNotificationService = createMock(); const module: TestingModule = await Test.createTestingModule({ imports: [ @@ -67,6 +70,10 @@ describe('UnarchiveCardService', () => { provide: NoticeOfIntentModificationService, useValue: mockNOIModificationService, }, + { + provide: NotificationService, + useValue: mockNotificationService, + }, ], }).compile(); @@ -85,6 +92,7 @@ describe('UnarchiveCardService', () => { mockCovenantService.getDeletedCards.mockResolvedValue([]); mockNOIService.getDeletedCards.mockResolvedValue([]); mockNOIModificationService.getDeletedCards.mockResolvedValue([]); + mockNotificationService.getDeletedCards.mockResolvedValue([]); const res = await service.fetchByFileId('uuid'); @@ -95,5 +103,6 @@ describe('UnarchiveCardService', () => { expect(mockCovenantService.getDeletedCards).toHaveBeenCalledTimes(1); expect(mockNOIService.getDeletedCards).toHaveBeenCalledTimes(1); expect(mockNOIModificationService.getDeletedCards).toHaveBeenCalledTimes(1); + expect(mockNotificationService.getDeletedCards).toHaveBeenCalledTimes(1); }); }); diff --git a/services/apps/alcs/src/alcs/admin/unarchive-card/unarchive-card.service.ts b/services/apps/alcs/src/alcs/admin/unarchive-card/unarchive-card.service.ts index 1a4163b1f9..b5ff9d52b7 100644 --- a/services/apps/alcs/src/alcs/admin/unarchive-card/unarchive-card.service.ts +++ b/services/apps/alcs/src/alcs/admin/unarchive-card/unarchive-card.service.ts @@ -5,6 +5,7 @@ import { ApplicationService } from '../../application/application.service'; import { CovenantService } from '../../covenant/covenant.service'; import { NoticeOfIntentModificationService } from '../../notice-of-intent-decision/notice-of-intent-modification/notice-of-intent-modification.service'; import { NoticeOfIntentService } from '../../notice-of-intent/notice-of-intent.service'; +import { NotificationService } from '../../notification/notification.service'; import { PlanningReviewService } from '../../planning-review/planning-review.service'; @Injectable() @@ -17,6 +18,7 @@ export class UnarchiveCardService { private covenantService: CovenantService, private noticeOfIntentService: NoticeOfIntentService, private noticeOfIntentModificationService: NoticeOfIntentModificationService, + private notificationService: NotificationService, ) {} async fetchByFileId(fileId: string) { @@ -41,6 +43,7 @@ export class UnarchiveCardService { await this.fetchAndMapModifications(fileId, result); await this.fetchAndMapCovenants(fileId, result); await this.fetchAndMapNOIs(fileId, result); + await this.fetchAndMapNotifications(fileId, result); return result; } @@ -164,4 +167,26 @@ export class UnarchiveCardService { }); } } + + private async fetchAndMapNotifications( + fileId: string, + result: { + cardUuid: string; + type: string; + status: string; + createdAt: number; + }[], + ) { + const notifications = await this.notificationService.getDeletedCards( + fileId, + ); + for (const notification of notifications) { + result.push({ + cardUuid: notification.cardUuid, + createdAt: notification.auditCreatedAt.getTime(), + type: 'NOTI', + status: notification.card!.status.label, + }); + } + } } From cb54ae4324a2da92da27f9affd78f19104f2f7f9 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Wed, 11 Oct 2023 10:52:19 -0700 Subject: [PATCH 479/954] Remove size from legacyId on DTO * Front end has no length requirement --- services/apps/alcs/src/alcs/search/search.dto.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/services/apps/alcs/src/alcs/search/search.dto.ts b/services/apps/alcs/src/alcs/search/search.dto.ts index f952d5cb02..28d9e3ac3b 100644 --- a/services/apps/alcs/src/alcs/search/search.dto.ts +++ b/services/apps/alcs/src/alcs/search/search.dto.ts @@ -103,7 +103,6 @@ export class SearchRequestDto extends PagingRequestDto { @IsString() @IsOptional() - @MinLength(3) legacyId?: string; @IsString() From fc82c90c804075bb3c635a1b536521a626586554 Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Wed, 11 Oct 2023 11:06:37 -0700 Subject: [PATCH 480/954] bugfix alcs-1191 confirm email autocomplete fix --- .../primary-contact/primary-contact.component.html | 1 + 1 file changed, 1 insertion(+) diff --git a/portal-frontend/src/app/features/notifications/edit-submission/primary-contact/primary-contact.component.html b/portal-frontend/src/app/features/notifications/edit-submission/primary-contact/primary-contact.component.html index c91737b379..91bf70a022 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/primary-contact/primary-contact.component.html +++ b/portal-frontend/src/app/features/notifications/edit-submission/primary-contact/primary-contact.component.html @@ -82,6 +82,7 @@ <h4>Primary Contact Information</h4> matInput placeholder="Enter Email" formControlName="confirmEmail" + autocomplete="off" /> </mat-form-field> <div *ngIf="confirmEmail.invalid && (confirmEmail.dirty || confirmEmail.touched)" class="field-error"> From 21ed050d3a95dc45fa85a4a4dfde37a2c6c00582 Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Wed, 11 Oct 2023 12:02:24 -0700 Subject: [PATCH 481/954] rename private functions in NOI ETL (#1047) --- .../notice_of_intent_proposal_fields.py | 4 ++-- .../statuses/notice_of_intent_status_in_progress.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_proposal_fields.py b/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_proposal_fields.py index 2dabfe02b7..0703736f9e 100644 --- a/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_proposal_fields.py +++ b/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_proposal_fields.py @@ -110,11 +110,11 @@ def _update_records(conn, batch_size, cursor, rows): def _prepare_oats_data(row_data_list): data_list = [] for row in row_data_list: - data_list.append(map_fields(dict(row))) + data_list.append(_map_fields(dict(row))) return data_list -def map_fields(data): +def _map_fields(data): summery = data.get("proposal_summary_desc", "") background_description = data.get("proposal_background_desc", "") diff --git a/bin/migrate-oats-data/noi/notice_of_intent_submissions/statuses/notice_of_intent_status_in_progress.py b/bin/migrate-oats-data/noi/notice_of_intent_submissions/statuses/notice_of_intent_status_in_progress.py index 12c8dff273..6cfa9014b5 100644 --- a/bin/migrate-oats-data/noi/notice_of_intent_submissions/statuses/notice_of_intent_status_in_progress.py +++ b/bin/migrate-oats-data/noi/notice_of_intent_submissions/statuses/notice_of_intent_status_in_progress.py @@ -98,12 +98,12 @@ def _update_records(conn, batch_size, cursor, rows): def _prepare_oats_data(row_data_list): data_list = [] for row in row_data_list: - data = map_fields(dict(row)) + data = _map_fields(dict(row)) data_list.append(data) return data_list -def map_fields(data): +def _map_fields(data): status_effective_date = None if data: From 8d5c239ccb70b9ab866b0a680bdce378b3579031 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Wed, 11 Oct 2023 13:09:53 -0700 Subject: [PATCH 482/954] Search Fixes * Fix function to prefer weight over date * Only look at statuses for non-draft submissions --- ...lication-submission-status.service.spec.ts | 3 + .../application-submission-status.service.ts | 1 + ...f-intent-submission-status.service.spec.ts | 3 + ...ice-of-intent-submission-status.service.ts | 1 + .../application-advanced-search.service.ts | 23 +++-- ...otice-of-intent-advanced-search.service.ts | 28 ++++-- .../notification-advanced-search.service.ts | 16 ++- .../application-submission.entity.ts | 6 +- .../notice-of-intent-submission.entity.ts | 6 +- .../notification-submission.entity.ts | 6 +- ...2692-fix_search_function_status_weights.ts | 97 +++++++++++++++++++ 11 files changed, 156 insertions(+), 34 deletions(-) create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1697048162692-fix_search_function_status_weights.ts diff --git a/services/apps/alcs/src/alcs/application/application-submission-status/application-submission-status.service.spec.ts b/services/apps/alcs/src/alcs/application/application-submission-status/application-submission-status.service.spec.ts index 634d12a030..2389132797 100644 --- a/services/apps/alcs/src/alcs/application/application-submission-status/application-submission-status.service.spec.ts +++ b/services/apps/alcs/src/alcs/application/application-submission-status/application-submission-status.service.spec.ts @@ -166,6 +166,7 @@ describe('ApplicationSubmissionStatusService', () => { ); expect(mockApplicationSubmissionRepository.findOneBy).toHaveBeenCalledWith({ fileNumber: fakeFileNumber, + isDraft: false, }); }); @@ -321,6 +322,7 @@ describe('ApplicationSubmissionStatusService', () => { ); expect(mockApplicationSubmissionRepository.findOneBy).toHaveBeenCalledWith({ fileNumber: fakeFileNumber, + isDraft: false, }); }); @@ -349,6 +351,7 @@ describe('ApplicationSubmissionStatusService', () => { ); expect(mockApplicationSubmissionRepository.findOneBy).toHaveBeenCalledWith({ fileNumber: fakeFileNumber, + isDraft: false, }); }); diff --git a/services/apps/alcs/src/alcs/application/application-submission-status/application-submission-status.service.ts b/services/apps/alcs/src/alcs/application/application-submission-status/application-submission-status.service.ts index 15e472aa3a..7ba1eceadf 100644 --- a/services/apps/alcs/src/alcs/application/application-submission-status/application-submission-status.service.ts +++ b/services/apps/alcs/src/alcs/application/application-submission-status/application-submission-status.service.ts @@ -111,6 +111,7 @@ export class ApplicationSubmissionStatusService { private async getSubmission(fileNumber: string) { const submission = await this.applicationSubmissionRepository.findOneBy({ fileNumber, + isDraft: false, }); if (!submission) { diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service.spec.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service.spec.ts index 0afdf05a13..bf584c2b92 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service.spec.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service.spec.ts @@ -173,6 +173,7 @@ describe('NoticeOfIntentSubmissionStatusService', () => { expect(mockNoiSubmissionRepository.findOneBy).toHaveBeenCalledTimes(1); expect(mockNoiSubmissionRepository.findOneBy).toHaveBeenCalledWith({ fileNumber: fakeFileNumber, + isDraft: false, }); }); @@ -324,6 +325,7 @@ describe('NoticeOfIntentSubmissionStatusService', () => { expect(mockNoiSubmissionRepository.findOneBy).toHaveBeenCalledTimes(1); expect(mockNoiSubmissionRepository.findOneBy).toHaveBeenCalledWith({ fileNumber: fakeFileNumber, + isDraft: false, }); }); @@ -350,6 +352,7 @@ describe('NoticeOfIntentSubmissionStatusService', () => { expect(mockNoiSubmissionRepository.findOneBy).toHaveBeenCalledTimes(1); expect(mockNoiSubmissionRepository.findOneBy).toHaveBeenCalledWith({ fileNumber: fakeFileNumber, + isDraft: false, }); }); diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service.ts index 0b8a9ba654..87e7c14355 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service.ts @@ -109,6 +109,7 @@ export class NoticeOfIntentSubmissionStatusService { private async getSubmission(fileNumber: string) { const submission = await this.noticeOfIntentSubmissionRepository.findOneBy({ fileNumber, + isDraft: false, }); if (!submission) { diff --git a/services/apps/alcs/src/alcs/search/application/application-advanced-search.service.ts b/services/apps/alcs/src/alcs/search/application/application-advanced-search.service.ts index 76a2040f26..af58647e42 100644 --- a/services/apps/alcs/src/alcs/search/application/application-advanced-search.service.ts +++ b/services/apps/alcs/src/alcs/search/application/application-advanced-search.service.ts @@ -1,7 +1,12 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; -import { Brackets, Repository } from 'typeorm'; +import { + Brackets, + QueryBuilder, + Repository, + SelectQueryBuilder, +} from 'typeorm'; import { ApplicationOwner } from '../../../portal/application-submission/application-owner/application-owner.entity'; import { ApplicationParcel } from '../../../portal/application-submission/application-parcel/application-parcel.entity'; import { @@ -171,7 +176,7 @@ export class ApplicationAdvancedSearchService { private compileApplicationDateRangeSearchQuery( searchDto: SearchRequestDto, - query, + query: SelectQueryBuilder<ApplicationSubmissionSearchView>, ) { if (searchDto.dateSubmittedFrom) { query = query.andWhere( @@ -215,7 +220,7 @@ export class ApplicationAdvancedSearchService { private compileApplicationDecisionSearchQuery( searchDto: SearchRequestDto, - query, + query: SelectQueryBuilder<ApplicationSubmissionSearchView>, ) { if ( searchDto.resolutionNumber !== undefined || @@ -241,18 +246,20 @@ export class ApplicationAdvancedSearchService { return query; } - private joinApplicationDecision(query: any) { + private joinApplicationDecision( + query: SelectQueryBuilder<ApplicationSubmissionSearchView>, + ) { query = query.leftJoin( ApplicationDecision, 'decision', - 'decision.application_uuid = "appSearch"."application_uuid"', + 'decision.application_uuid = "appSearch"."application_uuid" AND decision.is_draft = false', ); return query; } private compileApplicationParcelSearchQuery( searchDto: SearchRequestDto, - query, + query: SelectQueryBuilder<ApplicationSubmissionSearchView>, ) { if ( (searchDto.pid || searchDto.civicAddress) && @@ -285,7 +292,7 @@ export class ApplicationAdvancedSearchService { private compileApplicationSearchByNameQuery( searchDto: SearchRequestDto, - query, + query: SelectQueryBuilder<ApplicationSubmissionSearchView>, ) { if (searchDto.name) { const formattedSearchString = @@ -329,7 +336,7 @@ export class ApplicationAdvancedSearchService { private compileApplicationFileTypeSearchQuery( searchDto: SearchRequestDto, - query, + query: SelectQueryBuilder<ApplicationSubmissionSearchView>, ) { if (searchDto.fileTypes.length > 0) { // if decision is not joined yet -> join it. The join of decision happens in compileApplicationDecisionSearchQuery diff --git a/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-advanced-search.service.ts b/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-advanced-search.service.ts index 96e3be2e1f..ce620cdf8b 100644 --- a/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-advanced-search.service.ts +++ b/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-advanced-search.service.ts @@ -1,6 +1,6 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; -import { Brackets, Repository } from 'typeorm'; +import { Brackets, Repository, SelectQueryBuilder } from 'typeorm'; import { NoticeOfIntentOwner } from '../../../portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.entity'; import { NoticeOfIntentParcel } from '../../../portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.entity'; import { @@ -67,7 +67,9 @@ export class NoticeOfIntentAdvancedSearchService { } } - private compileGroupBySearchQuery(query) { + private compileGroupBySearchQuery( + query: SelectQueryBuilder<NoticeOfIntentSubmissionSearchView>, + ) { query = query .innerJoinAndMapOne( 'noiSearch.noticeOfIntentType', @@ -156,7 +158,10 @@ export class NoticeOfIntentAdvancedSearchService { return query; } - private compileDateRangeSearchQuery(searchDto: SearchRequestDto, query) { + private compileDateRangeSearchQuery( + searchDto: SearchRequestDto, + query: SelectQueryBuilder<NoticeOfIntentSubmissionSearchView>, + ) { // TODO check dates toIsoString if (searchDto.dateSubmittedFrom) { query = query.andWhere( @@ -198,7 +203,10 @@ export class NoticeOfIntentAdvancedSearchService { return query; } - private compileDecisionSearchQuery(searchDto: SearchRequestDto, query) { + private compileDecisionSearchQuery( + searchDto: SearchRequestDto, + query: SelectQueryBuilder<NoticeOfIntentSubmissionSearchView>, + ) { if ( searchDto.resolutionNumber !== undefined || searchDto.resolutionYear !== undefined @@ -207,7 +215,7 @@ export class NoticeOfIntentAdvancedSearchService { if (searchDto.resolutionNumber !== undefined) { query = query.andWhere( - 'decision.resolution_number = :resolution_number', + 'decision.resolution_number = :resolution_number AND decision.is_draft = false', { resolution_number: searchDto.resolutionNumber, }, @@ -232,7 +240,10 @@ export class NoticeOfIntentAdvancedSearchService { return query; } - private compileParcelSearchQuery(searchDto: SearchRequestDto, query) { + private compileParcelSearchQuery( + searchDto: SearchRequestDto, + query: SelectQueryBuilder<NoticeOfIntentSubmissionSearchView>, + ) { if (searchDto.pid || searchDto.civicAddress) { query = query.leftJoin( NoticeOfIntentParcel, @@ -253,7 +264,10 @@ export class NoticeOfIntentAdvancedSearchService { return query; } - private compileSearchByNameQuery(searchDto: SearchRequestDto, query) { + private compileSearchByNameQuery( + searchDto: SearchRequestDto, + query: SelectQueryBuilder<NoticeOfIntentSubmissionSearchView>, + ) { if (searchDto.name) { const formattedSearchString = formatStringToPostgresSearchStringArrayWithWildCard(searchDto.name!); diff --git a/services/apps/alcs/src/alcs/search/notification/notification-advanced-search.service.ts b/services/apps/alcs/src/alcs/search/notification/notification-advanced-search.service.ts index deaf7175f4..480ce4ba0b 100644 --- a/services/apps/alcs/src/alcs/search/notification/notification-advanced-search.service.ts +++ b/services/apps/alcs/src/alcs/search/notification/notification-advanced-search.service.ts @@ -1,6 +1,6 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; -import { Brackets, Repository } from 'typeorm'; +import { Brackets, Repository, SelectQueryBuilder } from 'typeorm'; import { NotificationParcel } from '../../../portal/notification-submission/notification-parcel/notification-parcel.entity'; import { NotificationTransferee } from '../../../portal/notification-submission/notification-transferee/notification-transferee.entity'; import { @@ -66,7 +66,9 @@ export class NotificationAdvancedSearchService { } } - private compileGroupBySearchQuery(query) { + private compileGroupBySearchQuery( + query: SelectQueryBuilder<NotificationSubmissionSearchView>, + ) { query = query .innerJoinAndMapOne( 'notificationSearch.notificationType', @@ -174,7 +176,10 @@ export class NotificationAdvancedSearchService { return query; } - private compileParcelSearchQuery(searchDto: SearchRequestDto, query) { + private compileParcelSearchQuery( + searchDto: SearchRequestDto, + query: SelectQueryBuilder<NotificationSubmissionSearchView>, + ) { if (searchDto.pid || searchDto.civicAddress) { query = query.leftJoin( NotificationParcel, @@ -195,7 +200,10 @@ export class NotificationAdvancedSearchService { return query; } - private compileSearchByNameQuery(searchDto: SearchRequestDto, query) { + private compileSearchByNameQuery( + searchDto: SearchRequestDto, + query: SelectQueryBuilder<NotificationSubmissionSearchView>, + ) { if (searchDto.name) { const formattedSearchString = formatStringToPostgresSearchStringArrayWithWildCard(searchDto.name!); diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts b/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts index e53d765a9a..d4918c7bce 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts @@ -746,15 +746,11 @@ export class ApplicationSubmission extends Base { for (const status of this.submissionStatuses) { const effectiveDate = status.effectiveDate?.getTime(); - const currentEffectiveDate = this.status?.effectiveDate?.getTime(); if ( effectiveDate && effectiveDate <= now && - (!currentEffectiveDate || - effectiveDate > currentEffectiveDate || - (effectiveDate === currentEffectiveDate && - status.statusType.weight > this.status.statusType.weight)) + status.statusType.weight > this.status.statusType.weight ) { this.status = status; } diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.entity.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.entity.ts index e214ae7b8d..c873344113 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.entity.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.entity.ts @@ -477,15 +477,11 @@ export class NoticeOfIntentSubmission extends Base { for (const status of this.submissionStatuses) { const effectiveDate = status.effectiveDate?.getTime(); - const currentEffectiveDate = this.status?.effectiveDate?.getTime(); if ( effectiveDate && effectiveDate <= now && - (!currentEffectiveDate || - effectiveDate > currentEffectiveDate || - (effectiveDate === currentEffectiveDate && - status.statusType.weight > this.status.statusType.weight)) + status.statusType.weight > this.status.statusType.weight ) { this.status = status; } diff --git a/services/apps/alcs/src/portal/notification-submission/notification-submission.entity.ts b/services/apps/alcs/src/portal/notification-submission/notification-submission.entity.ts index f9f47e658a..3a916b121a 100644 --- a/services/apps/alcs/src/portal/notification-submission/notification-submission.entity.ts +++ b/services/apps/alcs/src/portal/notification-submission/notification-submission.entity.ts @@ -181,15 +181,11 @@ export class NotificationSubmission extends Base { for (const status of this.submissionStatuses) { const effectiveDate = status.effectiveDate?.getTime(); - const currentEffectiveDate = this.status?.effectiveDate?.getTime(); if ( effectiveDate && effectiveDate <= now && - (!currentEffectiveDate || - effectiveDate > currentEffectiveDate || - (effectiveDate === currentEffectiveDate && - status.statusType.weight > this.status.statusType.weight)) + status.statusType.weight > this.status.statusType.weight ) { this.status = status; } diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1697048162692-fix_search_function_status_weights.ts b/services/apps/alcs/src/providers/typeorm/migrations/1697048162692-fix_search_function_status_weights.ts new file mode 100644 index 0000000000..64b6a2de74 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1697048162692-fix_search_function_status_weights.ts @@ -0,0 +1,97 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class fixSearchFunctionStatusWeights1697048162692 + implements MigrationInterface +{ + public async up(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query(`CREATE OR REPLACE FUNCTION alcs.get_current_status_for_application_submission_by_uuid(application_submission_uuid uuid) + RETURNS jsonb + LANGUAGE plpgsql + AS $function$ + DECLARE + utc_timestamp_tomorrow timestamptz; + result RECORD; + BEGIN + -- TODO adjust the date according to api + utc_timestamp_tomorrow = timezone('utc', (now() - INTERVAL '-1 DAY')); + + SELECT + astss.submission_uuid , astss.status_type_code ,astss.effective_date, asst."label" + FROM alcs.application_submission_status_type asst + JOIN alcs.application_submission_to_submission_status astss + ON asst.code = astss.status_type_code + AND astss.submission_uuid = application_submission_uuid + AND astss.effective_date IS NOT NULL + WHERE + astss.effective_date < utc_timestamp_tomorrow + ORDER BY weight desc, astss.effective_date desc + LIMIT 1 INTO result; + + RETURN row_to_json(RESULT); + + END;$function$ + ;`); + + await queryRunner.query(`CREATE OR REPLACE FUNCTION alcs.get_current_status_for_notice_of_intent_submission_by_uuid(application_submission_uuid uuid) + RETURNS jsonb + LANGUAGE plpgsql + AS $function$ + DECLARE + utc_timestamp_tomorrow timestamptz; + result RECORD; + BEGIN + -- TODO adjust the date according to api + utc_timestamp_tomorrow = timezone('utc', (now() - INTERVAL '-1 DAY')); + + SELECT + noistss.submission_uuid , noistss.status_type_code ,noistss.effective_date, noisst."label" + FROM alcs.notice_of_intent_submission_status_type noisst + JOIN alcs.notice_of_intent_submission_to_submission_status noistss + ON noisst.code = noistss.status_type_code + AND noistss.submission_uuid = application_submission_uuid + AND noistss.effective_date IS NOT NULL + WHERE + noistss.effective_date < utc_timestamp_tomorrow + ORDER BY weight desc, noistss.effective_date desc + LIMIT 1 INTO result; + + RETURN row_to_json(RESULT); + END; + $function$ + ;`); + + await queryRunner.query( + `CREATE OR REPLACE FUNCTION alcs.get_current_status_for_notification_submission_by_uuid (application_submission_uuid uuid) + RETURNS jsonb + LANGUAGE plpgsql + AS $function$ + DECLARE + utc_timestamp_tomorrow timestamptz; + result RECORD; + BEGIN + -- TODO adjust the date according to api + utc_timestamp_tomorrow = timezone('utc', (now() - INTERVAL '-1 DAY')); + SELECT + notistss.submission_uuid, + notistss.status_type_code, + notistss.effective_date, + noti_status. "label" + FROM + alcs.notification_submission_status_type noti_status + JOIN alcs.notification_submission_to_submission_status notistss ON noti_status.code = notistss.status_type_code + AND notistss.submission_uuid = application_submission_uuid + AND notistss.effective_date IS NOT NULL + WHERE + notistss.effective_date < utc_timestamp_tomorrow + ORDER BY + weight DESC, + notistss.effective_date DESC + LIMIT 1 INTO result; + RETURN row_to_json(RESULT); + END; + $function$;`, + ); + } + + public async down(queryRunner: QueryRunner): Promise<void> {} +} From c14038291096bd86ea4b4cbfbb3152718bc82f98 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Wed, 11 Oct 2023 15:07:40 -0700 Subject: [PATCH 483/954] Code Review Feedback --- .../application-submission/application-submission.entity.ts | 3 ++- .../notice-of-intent-submission.entity.ts | 3 ++- .../notification-submission/notification-submission.entity.ts | 3 ++- .../1697048162692-fix_search_function_status_weights.ts | 3 --- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts b/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts index d4918c7bce..6fce49dc5d 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts @@ -750,7 +750,8 @@ export class ApplicationSubmission extends Base { if ( effectiveDate && effectiveDate <= now && - status.statusType.weight > this.status.statusType.weight + (!this.status || + status.statusType.weight > this.status.statusType.weight) ) { this.status = status; } diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.entity.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.entity.ts index c873344113..5d3f4e4926 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.entity.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.entity.ts @@ -481,7 +481,8 @@ export class NoticeOfIntentSubmission extends Base { if ( effectiveDate && effectiveDate <= now && - status.statusType.weight > this.status.statusType.weight + (!this.status || + status.statusType.weight > this.status.statusType.weight) ) { this.status = status; } diff --git a/services/apps/alcs/src/portal/notification-submission/notification-submission.entity.ts b/services/apps/alcs/src/portal/notification-submission/notification-submission.entity.ts index 3a916b121a..c5f7215656 100644 --- a/services/apps/alcs/src/portal/notification-submission/notification-submission.entity.ts +++ b/services/apps/alcs/src/portal/notification-submission/notification-submission.entity.ts @@ -185,7 +185,8 @@ export class NotificationSubmission extends Base { if ( effectiveDate && effectiveDate <= now && - status.statusType.weight > this.status.statusType.weight + (!this.status || + status.statusType.weight > this.status.statusType.weight) ) { this.status = status; } diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1697048162692-fix_search_function_status_weights.ts b/services/apps/alcs/src/providers/typeorm/migrations/1697048162692-fix_search_function_status_weights.ts index 64b6a2de74..93b5dd7a3b 100644 --- a/services/apps/alcs/src/providers/typeorm/migrations/1697048162692-fix_search_function_status_weights.ts +++ b/services/apps/alcs/src/providers/typeorm/migrations/1697048162692-fix_search_function_status_weights.ts @@ -12,7 +12,6 @@ export class fixSearchFunctionStatusWeights1697048162692 utc_timestamp_tomorrow timestamptz; result RECORD; BEGIN - -- TODO adjust the date according to api utc_timestamp_tomorrow = timezone('utc', (now() - INTERVAL '-1 DAY')); SELECT @@ -40,7 +39,6 @@ export class fixSearchFunctionStatusWeights1697048162692 utc_timestamp_tomorrow timestamptz; result RECORD; BEGIN - -- TODO adjust the date according to api utc_timestamp_tomorrow = timezone('utc', (now() - INTERVAL '-1 DAY')); SELECT @@ -69,7 +67,6 @@ export class fixSearchFunctionStatusWeights1697048162692 utc_timestamp_tomorrow timestamptz; result RECORD; BEGIN - -- TODO adjust the date according to api utc_timestamp_tomorrow = timezone('utc', (now() - INTERVAL '-1 DAY')); SELECT notistss.submission_uuid, From 53b8657604e6b269f11617a0aaf938b2fd6ac618 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Wed, 11 Oct 2023 15:16:27 -0700 Subject: [PATCH 484/954] Code Review Feedback * Add more tests --- ...tice-of-intent-document.controller.spec.ts | 66 ++++++++++++++++- .../notification-document.controller.spec.ts | 70 ++++++++++++++++++- 2 files changed, 134 insertions(+), 2 deletions(-) diff --git a/services/apps/alcs/src/portal/notice-of-intent-document/notice-of-intent-document.controller.spec.ts b/services/apps/alcs/src/portal/notice-of-intent-document/notice-of-intent-document.controller.spec.ts index a606009d2f..ac02e8eac5 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-document/notice-of-intent-document.controller.spec.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-document/notice-of-intent-document.controller.spec.ts @@ -4,11 +4,15 @@ import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { ClsService } from 'nestjs-cls'; import { mockKeyCloakProviders } from '../../../test/mocks/mockTypes'; +import { VISIBILITY_FLAG } from '../../alcs/application/application-document/application-document.entity'; import { NoticeOfIntentDocument } from '../../alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.entity'; import { NoticeOfIntentDocumentService } from '../../alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.service'; import { NoticeOfIntentService } from '../../alcs/notice-of-intent/notice-of-intent.service'; import { NoticeOfIntentProfile } from '../../common/automapper/notice-of-intent.automapper.profile'; -import { DocumentCode } from '../../document/document-code.entity'; +import { + DOCUMENT_TYPE, + DocumentCode, +} from '../../document/document-code.entity'; import { DOCUMENT_SOURCE, DOCUMENT_SYSTEM } from '../../document/document.dto'; import { Document } from '../../document/document.entity'; import { DocumentService } from '../../document/document.service'; @@ -177,6 +181,66 @@ describe('NoticeOfIntentDocumentController', () => { expect(res.uuid).toEqual(fakeUuid); }); + it('should should add the public flag when document is a proposal map', async () => { + const user = { user: { entity: 'Bruce' } }; + const fakeUuid = 'fakeUuid'; + const docObj = new Document({ uuid: 'fake-uuid' }); + const userEntity = new User({ + name: user.user.entity, + }); + + const docDto: AttachExternalDocumentDto = { + fileSize: 0, + mimeType: 'mimeType', + fileName: 'fileName', + fileKey: 'fileKey', + source: DOCUMENT_SOURCE.APPLICANT, + documentType: DOCUMENT_TYPE.PROPOSAL_MAP, + }; + + mockDocumentService.createDocumentRecord.mockResolvedValue(docObj); + + noiDocumentService.attachExternalDocument.mockResolvedValue( + new NoticeOfIntentDocument({ + noticeOfIntent: undefined, + type: new DocumentCode(), + uuid: fakeUuid, + document: new Document({ + uploadedAt: new Date(), + uploadedBy: userEntity, + }), + }), + ); + + const res = await controller.attachExternalDocument( + 'fake-number', + docDto, + user, + ); + + expect(mockDocumentService.createDocumentRecord).toBeCalledTimes(1); + expect(noiDocumentService.attachExternalDocument).toBeCalledTimes(1); + expect(noiDocumentService.attachExternalDocument).toBeCalledWith( + undefined, + { + documentUuid: 'fake-uuid', + type: DOCUMENT_TYPE.PROPOSAL_MAP, + }, + [ + VISIBILITY_FLAG.APPLICANT, + VISIBILITY_FLAG.GOVERNMENT, + VISIBILITY_FLAG.COMMISSIONER, + VISIBILITY_FLAG.PUBLIC, + ], + ); + expect(mockDocumentService.createDocumentRecord).toBeCalledWith({ + ...docDto, + system: DOCUMENT_SYSTEM.PORTAL, + }); + expect(res.uploadedBy).toEqual(user.user.entity); + expect(res.uuid).toEqual(fakeUuid); + }); + it('should call through to delete multiple documents', async () => { noiDocumentService.deleteMany.mockResolvedValue(); diff --git a/services/apps/alcs/src/portal/notification-document/notification-document.controller.spec.ts b/services/apps/alcs/src/portal/notification-document/notification-document.controller.spec.ts index 6073fc54db..9879567d05 100644 --- a/services/apps/alcs/src/portal/notification-document/notification-document.controller.spec.ts +++ b/services/apps/alcs/src/portal/notification-document/notification-document.controller.spec.ts @@ -4,11 +4,16 @@ import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { ClsService } from 'nestjs-cls'; import { mockKeyCloakProviders } from '../../../test/mocks/mockTypes'; +import { VISIBILITY_FLAG } from '../../alcs/application/application-document/application-document.entity'; +import { NoticeOfIntentDocument } from '../../alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.entity'; import { NotificationDocument } from '../../alcs/notification/notification-document/notification-document.entity'; import { NotificationDocumentService } from '../../alcs/notification/notification-document/notification-document.service'; import { NotificationService } from '../../alcs/notification/notification.service'; import { NotificationProfile } from '../../common/automapper/notification.automapper.profile'; -import { DocumentCode } from '../../document/document-code.entity'; +import { + DOCUMENT_TYPE, + DocumentCode, +} from '../../document/document-code.entity'; import { DOCUMENT_SOURCE, DOCUMENT_SYSTEM } from '../../document/document.dto'; import { Document } from '../../document/document.entity'; import { DocumentService } from '../../document/document.service'; @@ -194,4 +199,67 @@ describe('NotificationDocumentController', () => { expect(res.uploadedBy).toEqual(user.user.entity); expect(res.uuid).toEqual(fakeUuid); }); + + it('should should add the public flag when document is a proposal map', async () => { + const user = { user: { entity: 'Bruce' } }; + const fakeUuid = 'fakeUuid'; + const docObj = new Document({ uuid: 'fake-uuid' }); + const userEntity = new User({ + name: user.user.entity, + }); + + const docDto: AttachExternalDocumentDto = { + fileSize: 0, + mimeType: 'mimeType', + fileName: 'fileName', + fileKey: 'fileKey', + source: DOCUMENT_SOURCE.APPLICANT, + documentType: DOCUMENT_TYPE.PROPOSAL_MAP, + }; + + mockDocumentService.createDocumentRecord.mockResolvedValue(docObj); + + mockNotificationDocumentService.attachExternalDocument.mockResolvedValue( + new NotificationDocument({ + notification: undefined, + type: new DocumentCode(), + uuid: fakeUuid, + document: new Document({ + uploadedAt: new Date(), + uploadedBy: userEntity, + }), + }), + ); + + const res = await controller.attachExternalDocument( + 'fake-number', + docDto, + user, + ); + + expect(mockDocumentService.createDocumentRecord).toBeCalledTimes(1); + expect( + mockNotificationDocumentService.attachExternalDocument, + ).toBeCalledTimes(1); + expect( + mockNotificationDocumentService.attachExternalDocument, + ).toBeCalledWith( + undefined, + { + documentUuid: 'fake-uuid', + type: DOCUMENT_TYPE.PROPOSAL_MAP, + }, + [ + VISIBILITY_FLAG.APPLICANT, + VISIBILITY_FLAG.COMMISSIONER, + VISIBILITY_FLAG.PUBLIC, + ], + ); + expect(mockDocumentService.createDocumentRecord).toBeCalledWith({ + ...docDto, + system: DOCUMENT_SYSTEM.PORTAL, + }); + expect(res.uploadedBy).toEqual(user.user.entity); + expect(res.uuid).toEqual(fakeUuid); + }); }); From 34f315b378081f15b0545d8943f8160f98f45bb5 Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Thu, 12 Oct 2023 10:21:18 -0700 Subject: [PATCH 485/954] use min date for in progress status in noi (#1051) --- .../notice_of_intent_status_in_progress.py | 2 ++ .../notice_of_intent_decision_date.py | 2 +- .../notice_of_intent_status_in_progress.sql | 16 +++++++++------- ...notice_of_intent_status_in_progress_count.sql | 12 +++++++++--- 4 files changed, 21 insertions(+), 11 deletions(-) diff --git a/bin/migrate-oats-data/noi/notice_of_intent_submissions/statuses/notice_of_intent_status_in_progress.py b/bin/migrate-oats-data/noi/notice_of_intent_submissions/statuses/notice_of_intent_status_in_progress.py index 6cfa9014b5..c9b0ae5ccf 100644 --- a/bin/migrate-oats-data/noi/notice_of_intent_submissions/statuses/notice_of_intent_status_in_progress.py +++ b/bin/migrate-oats-data/noi/notice_of_intent_submissions/statuses/notice_of_intent_status_in_progress.py @@ -113,6 +113,8 @@ def _map_fields(data): status_effective_date = data["created_date"] elif data["submitted_to_alc_date"]: status_effective_date = data["submitted_to_alc_date"] + else: + status_effective_date = data["when_created"] if status_effective_date: date = convert_timezone(status_effective_date, "US/Pacific") diff --git a/bin/migrate-oats-data/noi/oats_to_alcs_notice_of_intent_table_etl/notice_of_intent_decision_date.py b/bin/migrate-oats-data/noi/oats_to_alcs_notice_of_intent_table_etl/notice_of_intent_decision_date.py index 8feb91922f..b87ebc945e 100644 --- a/bin/migrate-oats-data/noi/oats_to_alcs_notice_of_intent_table_etl/notice_of_intent_decision_date.py +++ b/bin/migrate-oats-data/noi/oats_to_alcs_notice_of_intent_table_etl/notice_of_intent_decision_date.py @@ -85,7 +85,7 @@ def _update_fee_fields_records(conn, batch_size, cursor, rows): def _get_update_query_from_oats_alr_applications_fields(): query = """ UPDATE alcs.notice_of_intent - SET decision_date = %(decision_date)s + SET decision_date = COALESCE(%(decision_date)s, decision_date) WHERE alcs.notice_of_intent.file_number = %(alr_application_id)s::TEXT; """ diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/in_progress/notice_of_intent_status_in_progress.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/in_progress/notice_of_intent_status_in_progress.sql index 53581a480e..7ed6ac1961 100644 --- a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/in_progress/notice_of_intent_status_in_progress.sql +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/in_progress/notice_of_intent_status_in_progress.sql @@ -1,10 +1,8 @@ WITH latest_in_progress_accomplishment_per_file_number AS ( - SELECT DISTINCT ON (alr_application_id, accomplishment_code) * + SELECT alr_application_id, accomplishment_code, min(oa.completion_date) AS completion_date FROM oats.oats_accomplishments oa WHERE accomplishment_code = 'INP' - ORDER BY alr_application_id, - accomplishment_code, - completion_date DESC + GROUP BY alr_application_id, accomplishment_code ), latest_in_progress_accomplishments_for_noi_only AS ( SELECT DISTINCT ON ( @@ -12,12 +10,14 @@ latest_in_progress_accomplishments_for_noi_only AS ( latest_in_prog.completion_date, oaa.alr_application_id, oaa.created_date, - oaa.submitted_to_alc_date + oaa.submitted_to_alc_date, + oaa.when_created ) latest_in_prog.accomplishment_code, latest_in_prog.completion_date, oaa.alr_application_id, oaa.created_date, - oaa.submitted_to_alc_date + oaa.submitted_to_alc_date, + oaa.when_created FROM oats.oats_alr_applications oaa LEFT JOIN latest_in_progress_accomplishment_per_file_number AS latest_in_prog ON latest_in_prog.alr_application_id = oaa.alr_application_id WHERE oaa.application_class_code = 'NOI' @@ -27,7 +27,9 @@ SELECT DISTINCT ON (oats_in_prog.alr_application_id) oats_in_prog.alr_applicatio oats_in_prog.completion_date, oats_in_prog.created_date, oats_in_prog.submitted_to_alc_date, + oats_in_prog.when_created, nois.uuid FROM alcs.notice_of_intent_submission_to_submission_status noistss JOIN alcs.notice_of_intent_submission nois ON nois.uuid = noistss.submission_uuid - JOIN latest_in_progress_accomplishments_for_noi_only AS oats_in_prog ON oats_in_prog.alr_application_id::TEXT = nois.file_number \ No newline at end of file + JOIN latest_in_progress_accomplishments_for_noi_only AS oats_in_prog ON oats_in_prog.alr_application_id::TEXT = nois.file_number + \ No newline at end of file diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/in_progress/notice_of_intent_status_in_progress_count.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/in_progress/notice_of_intent_status_in_progress_count.sql index dd3aea55a2..150e152c3a 100644 --- a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/in_progress/notice_of_intent_status_in_progress_count.sql +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/in_progress/notice_of_intent_status_in_progress_count.sql @@ -1,7 +1,11 @@ WITH latest_in_progress_accomplishment_per_file_number AS ( - SELECT DISTINCT ON (alr_application_id, accomplishment_code) * + SELECT alr_application_id, + accomplishment_code, + min(oa.completion_date) AS completion_date FROM oats.oats_accomplishments oa WHERE accomplishment_code = 'INP' + GROUP BY alr_application_id, + accomplishment_code ), latest_in_progress_accomplishments_for_noi_only AS ( SELECT DISTINCT ON ( @@ -9,12 +13,14 @@ latest_in_progress_accomplishments_for_noi_only AS ( latest_in_prog.completion_date, oaa.alr_application_id, oaa.created_date, - oaa.submitted_to_alc_date + oaa.submitted_to_alc_date, + oaa.when_created ) latest_in_prog.accomplishment_code, latest_in_prog.completion_date, oaa.alr_application_id, oaa.created_date, - oaa.submitted_to_alc_date + oaa.submitted_to_alc_date, + oaa.when_created FROM oats.oats_alr_applications oaa LEFT JOIN latest_in_progress_accomplishment_per_file_number AS latest_in_prog ON latest_in_prog.alr_application_id = oaa.alr_application_id WHERE oaa.application_class_code = 'NOI' From 58d261293ffbded854a07ab83994afb8dcdade49 Mon Sep 17 00:00:00 2001 From: Liam Stoddard <lstodd@protonmail.com> Date: Thu, 12 Oct 2023 11:28:44 -0700 Subject: [PATCH 486/954] temp table creation now also happens at noi, allowing for noi only import --- .../applications/base_applications.py | 22 ++++++------------- bin/migrate-oats-data/common/__init__.py | 1 + .../common/oats_temp_tables.py | 18 +++++++++++++++ .../noi/notice_of_intent_init.py | 9 +++++++- 4 files changed, 34 insertions(+), 16 deletions(-) create mode 100644 bin/migrate-oats-data/common/oats_temp_tables.py diff --git a/bin/migrate-oats-data/applications/base_applications.py b/bin/migrate-oats-data/applications/base_applications.py index 88455d8a88..f0f59416e0 100644 --- a/bin/migrate-oats-data/applications/base_applications.py +++ b/bin/migrate-oats-data/applications/base_applications.py @@ -1,5 +1,9 @@ from db import inject_conn_pool -from common import setup_and_get_logger +from common import ( + setup_and_get_logger, + exclusion_table_create, + exclusion_table_count, +) etl_name = "process_applications" logger = setup_and_get_logger(etl_name) @@ -12,12 +16,7 @@ def process_applications(conn=None, batch_size=10000): """ logger.info(f"Start {etl_name}") with conn.cursor() as cursor: - with open( - "applications/sql/application-etl-table-create.sql", "r", encoding="utf-8" - ) as sql_file: - create_tables = sql_file.read() - cursor.execute(create_tables) - conn.commit() + exclusion_table_create(cursor, conn) with open( "applications/sql/insert_batch_application_count.sql", "r", encoding="utf-8" @@ -27,14 +26,7 @@ def process_applications(conn=None, batch_size=10000): count_total = cursor.fetchone()[0] logger.info(f"Applications to insert: {count_total}") - with open( - "applications/sql/application_exclude_count.sql", "r", encoding="utf-8" - ) as sql_file: - count_exclude = sql_file.read() - cursor.execute(count_exclude) - count_total_exclude = cursor.fetchone()[0] - logger.info(f"Applications with excluded components: {count_total_exclude}") - logger.debug("Component ids stored in oats.alcs_etl_application_exclude") + exclusion_table_count(cursor, logger) failed_inserts = 0 successful_inserts_count = 0 diff --git a/bin/migrate-oats-data/common/__init__.py b/bin/migrate-oats-data/common/__init__.py index 12452975fe..6cfcc67f1b 100644 --- a/bin/migrate-oats-data/common/__init__.py +++ b/bin/migrate-oats-data/common/__init__.py @@ -7,3 +7,4 @@ from .oats_to_alcs_soil_change_code_enum import * from .date_time_helper import * from .oats_to_alcs_naru_code_enum import * +from .oats_temp_tables import * diff --git a/bin/migrate-oats-data/common/oats_temp_tables.py b/bin/migrate-oats-data/common/oats_temp_tables.py new file mode 100644 index 0000000000..d066d4c178 --- /dev/null +++ b/bin/migrate-oats-data/common/oats_temp_tables.py @@ -0,0 +1,18 @@ +def exclusion_table_create(cursor, conn): + with open( + "applications/sql/application-etl-table-create.sql", "r", encoding="utf-8" + ) as sql_file: + create_tables = sql_file.read() + cursor.execute(create_tables) + conn.commit() + + +def exclusion_table_count(cursor, logger): + with open( + "applications/sql/application_exclude_count.sql", "r", encoding="utf-8" + ) as sql_file: + count_exclude = sql_file.read() + cursor.execute(count_exclude) + count_total_exclude = cursor.fetchone()[0] + logger.info(f"Oats applications with excluded components: {count_total_exclude}") + logger.debug("Component ids stored in oats.alcs_etl_application_exclude") diff --git a/bin/migrate-oats-data/noi/notice_of_intent_init.py b/bin/migrate-oats-data/noi/notice_of_intent_init.py index 94fb9366e8..733e142208 100644 --- a/bin/migrate-oats-data/noi/notice_of_intent_init.py +++ b/bin/migrate-oats-data/noi/notice_of_intent_init.py @@ -1,4 +1,9 @@ -from common import OATS_ETL_USER, setup_and_get_logger +from common import ( + OATS_ETL_USER, + setup_and_get_logger, + exclusion_table_create, + exclusion_table_count, +) from db import inject_conn_pool etl_name = "init_notice_of_intents" @@ -9,6 +14,8 @@ def init_notice_of_intents(conn=None, batch_size=10000): logger.info(f"Start {etl_name}") with conn.cursor() as cursor: + exclusion_table_create(cursor, conn) + exclusion_table_count(cursor, logger) with open("noi/sql/insert_noi_count.sql", "r", encoding="utf-8") as sql_file: count_query = sql_file.read() cursor.execute(count_query) From 3549bf0280fea82b784513d481757467a9741a3f Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Thu, 12 Oct 2023 15:10:42 -0700 Subject: [PATCH 487/954] bugfix 1192 migration script --- .../1697133278413-fix_status_weights.ts | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1697133278413-fix_status_weights.ts diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1697133278413-fix_status_weights.ts b/services/apps/alcs/src/providers/typeorm/migrations/1697133278413-fix_status_weights.ts new file mode 100644 index 0000000000..dedb4665b7 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1697133278413-fix_status_weights.ts @@ -0,0 +1,21 @@ +import { MigrationInterface, QueryRunner } from "typeorm" + +export class fixStatusWeights1697133278413 implements MigrationInterface { + + public async up(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `UPDATE "alcs"."notification_submission_status_type" + SET "weight" = '2' + WHERE "code" = 'ALCR'`, + ); + await queryRunner.query( + `UPDATE "alcs"."notification_submission_status_type" + SET "weight" = '3' + WHERE "code" = 'CANC'`, + ); + } + + public async down(queryRunner: QueryRunner): Promise<void> { + } + +} From 3fe6c5aeb6a078b4e862dd2058bda3e9bb02f8a3 Mon Sep 17 00:00:00 2001 From: "to. sandra" <76515860+sandratoh@users.noreply.github.com> Date: Fri, 13 Oct 2023 13:23:37 -0700 Subject: [PATCH 488/954] Update review pages to responsive layouts (#1054) * Update all parcels review responsive layout * Update table review responsive views --- .../application-details.component.scss | 20 ++++++++-- .../parcel/parcel.component.html | 20 +++++----- .../parcel/parcel.component.scss | 40 ++++++++++--------- .../notice-of-intent-details.component.scss | 20 ++++++++-- .../parcel/parcel.component.html | 16 +++++--- .../parcel/parcel.component.scss | 40 ++++++++++--------- .../notification-details.component.scss | 20 ++++++++-- .../parcel/parcel.component.html | 16 +++++--- .../parcel/parcel.component.scss | 24 +++++------ 9 files changed, 133 insertions(+), 83 deletions(-) diff --git a/portal-frontend/src/app/features/applications/application-details/application-details.component.scss b/portal-frontend/src/app/features/applications/application-details/application-details.component.scss index 555f204d9e..1da0dd8da9 100644 --- a/portal-frontend/src/app/features/applications/application-details/application-details.component.scss +++ b/portal-frontend/src/app/features/applications/application-details/application-details.component.scss @@ -60,11 +60,15 @@ .other-attachments { display: grid; - grid-template-columns: 1fr 1fr 1fr; + grid-template-columns: max-content max-content max-content; overflow-x: auto; grid-column-gap: rem(36); grid-row-gap: rem(12); + @media screen and (min-width: $tabletBreakpoint) { + grid-template-columns: 1fr 1fr 1fr; + } + .full-width { grid-column: 1/3; } @@ -72,11 +76,15 @@ .adjacent-parcels { display: grid; - grid-template-columns: 0.65fr 1fr 1fr; + grid-template-columns: max-content max-content max-content; overflow-x: auto; grid-column-gap: rem(36); grid-row-gap: rem(12); + @media screen and (min-width: $tabletBreakpoint) { + grid-template-columns: 0.65fr 1fr 1fr; + } + .full-width { grid-column: 1/4; } @@ -87,7 +95,7 @@ margin: rem(12) 0 rem(20) 0; background-color: colors.$grey-light; display: grid; - grid-row-gap: rem(24); + grid-row-gap: rem(4); grid-column-gap: rem(16); grid-template-columns: 1fr; word-wrap: break-word; @@ -106,6 +114,10 @@ } } + .grid-double { + margin-bottom: rem(16); + } + .subheading2 { margin-bottom: rem(4) !important; } @@ -114,6 +126,7 @@ padding: rem(16); margin: rem(24) 0 rem(40) 0; grid-template-columns: minmax(rem(60), 1fr) minmax(rem(60), 1fr) minmax(rem(60), 1fr) minmax(rem(60), 1fr); + grid-row-gap: rem(24); .full-width { grid-column: 1/5; @@ -121,6 +134,7 @@ .grid-double { grid-column: 2/5; + margin-bottom: unset; } .grid-1 { diff --git a/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.html b/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.html index 2ccb28a8b8..a2effb6487 100644 --- a/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.html +++ b/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.html @@ -1,6 +1,4 @@ -<h3 class="flex-item"> - {{ pageTitle }} -</h3> +<h3 class="flex-item">{{ pageTitle }}</h3> <div class="review-table"> <div class="subheading2 grid-1" *ngIf="parcelType === PARCEL_TYPES.OTHER"> Does any of the parcel owners hold an interest (ownership or lease) in any other land (ALR or non-ALR) within the @@ -14,7 +12,7 @@ <h3 class="flex-item"> </div> <ng-container *ngFor="let parcel of parcels; let parcelInd = index"> - <div class="full-width flex-space-between-wrap"> + <div class="full-width parcel-header"> <h4> Parcel {{ parcelType === PARCEL_TYPES.OTHER ? getLetterIndex(parcelInd) : parcelInd + 1 }}: Parcel and Owner Information @@ -29,6 +27,15 @@ <h4> > Edit Parcel {{ parcelType === PARCEL_TYPES.OTHER ? getLetterIndex(parcelInd) : parcelInd + 1 }} </button> + <button + *ngIf="showEdit" + class="tablet-hidden" + mat-icon-button + color="accent" + (click)="onEditParcelClick(parcel.uuid)" + > + <mat-icon>edit</mat-icon> + </button> </div> </div> <div class="subheading2 grid-1">Ownership Type</div> @@ -150,11 +157,6 @@ <h4> <span *ngIf="parcel.isConfirmedByApplicant">Yes</span> <app-no-data [showRequired]="showErrors" *ngIf="!parcel.isConfirmedByApplicant"></app-no-data> </div> - <div *ngIf="showEdit" class="edit-button tablet-hidden"> - <button mat-flat-button color="accent" (click)="onEditParcelClick(parcel.uuid)"> - Edit Parcel {{ parcelInd + 1 }} - </button> - </div> </ng-container> <div *ngIf="showEdit" class="edit-button"> <button mat-flat-button (click)="onEditParcelsClick($event)" color="accent">Edit Section</button> diff --git a/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.scss b/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.scss index c1eab86cc9..ffe631e662 100644 --- a/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.scss +++ b/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.scss @@ -1,38 +1,40 @@ @use '../../../../../styles/functions' as *; +.parcel-header { + display: flex; + align-items: center; + justify-content: space-between; + margin-bottom: rem(12); + + @media screen and (min-width: $tabletBreakpoint) { + flex-wrap: wrap; + column-gap: rem(12); + row-gap: rem(12); + margin-bottom: unset; + } +} + .owner-information { display: grid; - grid-template-columns: 1fr 1fr 1fr 1fr 1fr; + grid-template-columns: max-content max-content max-content max-content max-content; overflow-x: auto; grid-column-gap: rem(36); grid-row-gap: rem(12); - .full-width { - grid-column: 1/3; + @media screen and (min-width: $tabletBreakpoint) { + grid-template-columns: 1fr 1fr 1fr 1fr 1fr; } -} -.crown-owner-information { - grid-template-columns: 1fr 1fr 1fr 1fr; -} - -.review-table { .full-width { grid-column: 1/3; } +} - .edit-button { - grid-column: 1/3; - } +.crown-owner-information { + grid-template-columns: max-content max-content max-content max-content; @media screen and (min-width: $tabletBreakpoint) { - .full-width { - grid-column: 1/5; - } - - .edit-button { - grid-column: 1/5; - } + grid-template-columns: 1fr 1fr 1fr 1fr; } } diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.scss b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.scss index 338b5ec64e..bfcdcd87f5 100644 --- a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.scss +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.scss @@ -68,11 +68,15 @@ .other-attachments { display: grid; - grid-template-columns: 1fr 1fr 1fr; + grid-template-columns: max-content max-content max-content; overflow-x: auto; grid-column-gap: rem(36); grid-row-gap: rem(12); + @media screen and (min-width: $tabletBreakpoint) { + grid-template-columns: 1fr 1fr 1fr; + } + .full-width { grid-column: 1/3; } @@ -80,11 +84,15 @@ .adjacent-parcels { display: grid; - grid-template-columns: 0.65fr 1fr 1fr; + grid-template-columns: max-content max-content max-content; overflow-x: auto; grid-column-gap: rem(36); grid-row-gap: rem(12); + @media screen and (min-width: $tabletBreakpoint) { + grid-template-columns: 0.65fr 1fr 1fr; + } + .full-width { grid-column: 1/4; } @@ -95,7 +103,7 @@ margin: rem(12) 0 rem(20) 0; background-color: colors.$grey-light; display: grid; - grid-row-gap: rem(24); + grid-row-gap: rem(4); grid-column-gap: rem(16); grid-template-columns: 1fr; word-wrap: break-word; @@ -114,6 +122,10 @@ } } + .grid-double { + margin-bottom: rem(16); + } + .subheading2 { margin-bottom: rem(4) !important; } @@ -122,6 +134,7 @@ padding: rem(16); margin: rem(24) 0 rem(40) 0; grid-template-columns: minmax(rem(60), 1fr) minmax(rem(60), 1fr) minmax(rem(60), 1fr) minmax(rem(60), 1fr); + grid-row-gap: rem(24); .full-width { grid-column: 1/5; @@ -129,6 +142,7 @@ .grid-double { grid-column: 2/5; + margin-bottom: unset; } .grid-1 { diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/parcel/parcel.component.html b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/parcel/parcel.component.html index 70a911d59d..23105b5ded 100644 --- a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/parcel/parcel.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/parcel/parcel.component.html @@ -1,7 +1,7 @@ <h3 class="flex-item">1. Identify Parcel(s) Under Application</h3> <div class="review-table"> <ng-container *ngFor="let parcel of parcels; let parcelInd = index"> - <div class="full-width flex-space-between-wrap"> + <div class="full-width parcel-header"> <h4>Parcel {{ parcelInd + 1 }}: Parcel and Owner Information</h4> <div> <button @@ -13,6 +13,15 @@ <h4>Parcel {{ parcelInd + 1 }}: Parcel and Owner Information</h4> > Edit Parcel {{ parcelInd + 1 }} </button> + <button + *ngIf="showEdit" + class="tablet-hidden" + mat-icon-button + color="accent" + (click)="onEditParcelClick(parcel.uuid)" + > + <mat-icon>edit</mat-icon> + </button> </div> </div> <div class="subheading2 grid-1">Ownership Type</div> @@ -134,11 +143,6 @@ <h4>Parcel {{ parcelInd + 1 }}: Parcel and Owner Information</h4> <span *ngIf="parcel.isConfirmedByApplicant">Yes</span> <app-no-data [showRequired]="showErrors" *ngIf="!parcel.isConfirmedByApplicant"></app-no-data> </div> - <div *ngIf="showEdit" class="edit-button tablet-hidden"> - <button mat-flat-button color="accent" (click)="onEditParcelClick(parcel.uuid)"> - Edit Parcel {{ parcelInd + 1 }} - </button> - </div> </ng-container> <div *ngIf="showEdit" class="edit-button"> <button mat-flat-button (click)="onEditParcelsClick($event)" color="accent">Edit Section</button> diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/parcel/parcel.component.scss b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/parcel/parcel.component.scss index c1eab86cc9..ffe631e662 100644 --- a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/parcel/parcel.component.scss +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/parcel/parcel.component.scss @@ -1,38 +1,40 @@ @use '../../../../../styles/functions' as *; +.parcel-header { + display: flex; + align-items: center; + justify-content: space-between; + margin-bottom: rem(12); + + @media screen and (min-width: $tabletBreakpoint) { + flex-wrap: wrap; + column-gap: rem(12); + row-gap: rem(12); + margin-bottom: unset; + } +} + .owner-information { display: grid; - grid-template-columns: 1fr 1fr 1fr 1fr 1fr; + grid-template-columns: max-content max-content max-content max-content max-content; overflow-x: auto; grid-column-gap: rem(36); grid-row-gap: rem(12); - .full-width { - grid-column: 1/3; + @media screen and (min-width: $tabletBreakpoint) { + grid-template-columns: 1fr 1fr 1fr 1fr 1fr; } -} -.crown-owner-information { - grid-template-columns: 1fr 1fr 1fr 1fr; -} - -.review-table { .full-width { grid-column: 1/3; } +} - .edit-button { - grid-column: 1/3; - } +.crown-owner-information { + grid-template-columns: max-content max-content max-content max-content; @media screen and (min-width: $tabletBreakpoint) { - .full-width { - grid-column: 1/5; - } - - .edit-button { - grid-column: 1/5; - } + grid-template-columns: 1fr 1fr 1fr 1fr; } } diff --git a/portal-frontend/src/app/features/notifications/notification-details/notification-details.component.scss b/portal-frontend/src/app/features/notifications/notification-details/notification-details.component.scss index dfcc37805f..db504a7779 100644 --- a/portal-frontend/src/app/features/notifications/notification-details/notification-details.component.scss +++ b/portal-frontend/src/app/features/notifications/notification-details/notification-details.component.scss @@ -60,11 +60,15 @@ .other-attachments { display: grid; - grid-template-columns: 1fr 1fr 1fr; + grid-template-columns: max-content max-content max-content; overflow-x: auto; grid-column-gap: rem(36); grid-row-gap: rem(12); + @media screen and (min-width: $tabletBreakpoint) { + grid-template-columns: 1fr 1fr 1fr; + } + .full-width { grid-column: 1/3; } @@ -72,10 +76,14 @@ .transferee-table { display: grid; - grid-template-columns: 1fr 1fr 1fr 1fr 1fr; + grid-template-columns: max-content max-content max-content max-content max-content; overflow-x: auto; grid-column-gap: rem(36); grid-row-gap: rem(12); + + @media screen and (min-width: $tabletBreakpoint) { + grid-template-columns: 1fr 1fr 1fr 1fr 1fr; + } } .review-table { @@ -83,7 +91,7 @@ margin: rem(12) 0 rem(20) 0; background-color: colors.$grey-light; display: grid; - grid-row-gap: rem(24); + grid-row-gap: rem(4); grid-column-gap: rem(16); grid-template-columns: 1fr; word-wrap: break-word; @@ -102,6 +110,10 @@ } } + .grid-double { + margin-bottom: rem(16); + } + .subheading2 { margin-bottom: rem(4) !important; } @@ -110,6 +122,7 @@ padding: rem(16); margin: rem(24) 0 rem(40) 0; grid-template-columns: minmax(rem(60), 1fr) minmax(rem(60), 1fr) minmax(rem(60), 1fr) minmax(rem(60), 1fr); + grid-row-gap: rem(24); .full-width { grid-column: 1/5; @@ -117,6 +130,7 @@ .grid-double { grid-column: 2/5; + margin-bottom: unset; } .grid-1 { diff --git a/portal-frontend/src/app/features/notifications/notification-details/parcel/parcel.component.html b/portal-frontend/src/app/features/notifications/notification-details/parcel/parcel.component.html index 9d96f578e2..f171479412 100644 --- a/portal-frontend/src/app/features/notifications/notification-details/parcel/parcel.component.html +++ b/portal-frontend/src/app/features/notifications/notification-details/parcel/parcel.component.html @@ -1,7 +1,7 @@ <h3 class="flex-item">1. Identify Parcel(s) Under The Statutory Right of Way</h3> <div class="review-table"> <ng-container *ngFor="let parcel of parcels; let parcelInd = index"> - <div class="full-width flex-space-between-wrap"> + <div class="full-width parcel-header"> <h4>Parcel {{ parcelInd + 1 }} Information</h4> <div> <button @@ -13,6 +13,15 @@ <h4>Parcel {{ parcelInd + 1 }} Information</h4> > Edit Parcel {{ parcelInd + 1 }} </button> + <button + *ngIf="showEdit" + class="tablet-hidden" + mat-icon-button + color="accent" + (click)="onEditParcelClick(parcel.uuid)" + > + <mat-icon>edit</mat-icon> + </button> </div> </div> <div class="subheading2 grid-1">Ownership Type</div> @@ -55,11 +64,6 @@ <h4>Parcel {{ parcelInd + 1 }} Information</h4> {{ parcel.civicAddress }} <app-no-data [showRequired]="showErrors" *ngIf="!parcel.civicAddress"></app-no-data> </div> - <div *ngIf="showEdit" class="edit-button tablet-hidden"> - <button mat-flat-button color="accent" (click)="onEditParcelClick(parcel.uuid)"> - Edit Parcel {{ parcelInd + 1 }} - </button> - </div> </ng-container> <div *ngIf="showEdit" class="edit-button"> <button mat-flat-button (click)="onEditParcelsClick($event)" color="accent">Edit Section</button> diff --git a/portal-frontend/src/app/features/notifications/notification-details/parcel/parcel.component.scss b/portal-frontend/src/app/features/notifications/notification-details/parcel/parcel.component.scss index f7868b43b7..7016d489ca 100644 --- a/portal-frontend/src/app/features/notifications/notification-details/parcel/parcel.component.scss +++ b/portal-frontend/src/app/features/notifications/notification-details/parcel/parcel.component.scss @@ -1,22 +1,16 @@ @use '../../../../../styles/functions' as *; -.review-table { - .full-width { - grid-column: 1/3; - } - - .edit-button { - grid-column: 1/3; - } +.parcel-header { + display: flex; + align-items: center; + justify-content: space-between; + margin-bottom: rem(12); @media screen and (min-width: $tabletBreakpoint) { - .full-width { - grid-column: 1/5; - } - - .edit-button { - grid-column: 1/5; - } + flex-wrap: wrap; + column-gap: rem(12); + row-gap: rem(12); + margin-bottom: unset; } } From 9bc9385942aa174a31d52784ab8d6712ba1c31ae Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Fri, 13 Oct 2023 13:25:37 -0700 Subject: [PATCH 489/954] Add Inbox Search * Add new views with columns * Update UI * Magic --- portal-frontend/src/app/app-routing.module.ts | 2 +- portal-frontend/src/app/app.module.ts | 12 - .../application-list.component.ts | 49 --- .../src/app/features/home/home.component.html | 44 +-- .../src/app/features/home/home.component.ts | 7 +- .../src/app/features/home/home.module.ts | 29 ++ .../inbox-list/inbox-list.component.html | 6 +- .../inbox-list/inbox-list.component.scss | 4 +- .../inbox-list/inbox-list.component.spec.ts | 0 .../inbox-list/inbox-list.component.ts | 26 +- .../inbox-table/inbox-table.component.html} | 26 +- .../inbox-table/inbox-table.component.scss} | 0 .../inbox-table.component.spec.ts} | 14 +- .../inbox-table/inbox-table.component.ts | 99 +++++ .../features/home/inbox/inbox.component.html | 144 +++++++ .../features/home/inbox/inbox.component.scss | 110 ++++++ .../home/inbox/inbox.component.spec.ts | 50 +++ .../features/home/inbox/inbox.component.ts | 358 ++++++++++++++++++ .../home/noi-list/noi-list.component.html | 68 ---- .../home/noi-list/noi-list.component.scss | 0 .../home/noi-list/noi-list.component.spec.ts | 36 -- .../home/noi-list/noi-list.component.ts | 51 --- .../notification-list.component.html | 62 --- .../notification-list.component.scss | 0 .../notification-list.component.spec.ts | 36 -- .../notification-list.component.ts | 53 --- .../src/app/features/public/public.module.ts | 11 +- .../src/app/services/inbox/inbox.dto.ts | 46 +++ .../app/services/inbox/inbox.service.spec.ts | 135 +++++++ .../src/app/services/inbox/inbox.service.ts | 85 +++++ .../src/app/shared/shared.module.ts | 7 + portal-frontend/src/styles.scss | 7 + .../document/document.controller.spec.ts | 7 + .../portal/document/document.controller.ts | 10 +- .../inbox-application-view.entity.ts | 126 ++++++ .../inbox-application.service.spec.ts | 105 +++++ .../application/inbox-application.service.ts | 263 +++++++++++++ .../src/portal/inbox/inbox.controller.spec.ts | 269 +++++++++++++ .../alcs/src/portal/inbox/inbox.controller.ts | 337 +++++++++++++++++ .../apps/alcs/src/portal/inbox/inbox.dto.ts | 82 ++++ .../alcs/src/portal/inbox/inbox.module.ts | 34 ++ .../inbox-notice-of-intent-view.entity.ts | 112 ++++++ .../inbox-notice-of-intent.service.spec.ts | 108 ++++++ .../inbox-notice-of-intent.service.ts | 218 +++++++++++ .../inbox-notification-view.entity.ts | 87 +++++ .../inbox-notification.service.spec.ts | 91 +++++ .../inbox-notification.service.ts | 208 ++++++++++ .../apps/alcs/src/portal/portal.module.ts | 3 + .../search/public-search.controller.spec.ts | 4 - .../public/search/public-search.controller.ts | 2 - .../1697131320873-add_inbox_views.ts | 125 ++++++ .../apps/alcs/src/user/user.service.spec.ts | 2 +- services/apps/alcs/src/user/user.service.ts | 2 + 53 files changed, 3295 insertions(+), 477 deletions(-) delete mode 100644 portal-frontend/src/app/features/home/application-list/application-list.component.ts create mode 100644 portal-frontend/src/app/features/home/home.module.ts rename portal-frontend/src/app/features/home/{ => inbox}/inbox-list/inbox-list.component.html (80%) rename portal-frontend/src/app/features/home/{ => inbox}/inbox-list/inbox-list.component.scss (88%) rename portal-frontend/src/app/features/home/{ => inbox}/inbox-list/inbox-list.component.spec.ts (100%) rename portal-frontend/src/app/features/home/{ => inbox}/inbox-list/inbox-list.component.ts (62%) rename portal-frontend/src/app/features/home/{application-list/application-list.component.html => inbox/inbox-table/inbox-table.component.html} (68%) rename portal-frontend/src/app/features/home/{application-list/application-list.component.scss => inbox/inbox-table/inbox-table.component.scss} (100%) rename portal-frontend/src/app/features/home/{application-list/application-list.component.spec.ts => inbox/inbox-table/inbox-table.component.spec.ts} (56%) create mode 100644 portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.ts create mode 100644 portal-frontend/src/app/features/home/inbox/inbox.component.html create mode 100644 portal-frontend/src/app/features/home/inbox/inbox.component.scss create mode 100644 portal-frontend/src/app/features/home/inbox/inbox.component.spec.ts create mode 100644 portal-frontend/src/app/features/home/inbox/inbox.component.ts delete mode 100644 portal-frontend/src/app/features/home/noi-list/noi-list.component.html delete mode 100644 portal-frontend/src/app/features/home/noi-list/noi-list.component.scss delete mode 100644 portal-frontend/src/app/features/home/noi-list/noi-list.component.spec.ts delete mode 100644 portal-frontend/src/app/features/home/noi-list/noi-list.component.ts delete mode 100644 portal-frontend/src/app/features/home/notification-list/notification-list.component.html delete mode 100644 portal-frontend/src/app/features/home/notification-list/notification-list.component.scss delete mode 100644 portal-frontend/src/app/features/home/notification-list/notification-list.component.spec.ts delete mode 100644 portal-frontend/src/app/features/home/notification-list/notification-list.component.ts create mode 100644 portal-frontend/src/app/services/inbox/inbox.dto.ts create mode 100644 portal-frontend/src/app/services/inbox/inbox.service.spec.ts create mode 100644 portal-frontend/src/app/services/inbox/inbox.service.ts create mode 100644 services/apps/alcs/src/portal/inbox/application/inbox-application-view.entity.ts create mode 100644 services/apps/alcs/src/portal/inbox/application/inbox-application.service.spec.ts create mode 100644 services/apps/alcs/src/portal/inbox/application/inbox-application.service.ts create mode 100644 services/apps/alcs/src/portal/inbox/inbox.controller.spec.ts create mode 100644 services/apps/alcs/src/portal/inbox/inbox.controller.ts create mode 100644 services/apps/alcs/src/portal/inbox/inbox.dto.ts create mode 100644 services/apps/alcs/src/portal/inbox/inbox.module.ts create mode 100644 services/apps/alcs/src/portal/inbox/notice-of-intent/inbox-notice-of-intent-view.entity.ts create mode 100644 services/apps/alcs/src/portal/inbox/notice-of-intent/inbox-notice-of-intent.service.spec.ts create mode 100644 services/apps/alcs/src/portal/inbox/notice-of-intent/inbox-notice-of-intent.service.ts create mode 100644 services/apps/alcs/src/portal/inbox/notification/inbox-notification-view.entity.ts create mode 100644 services/apps/alcs/src/portal/inbox/notification/inbox-notification.service.spec.ts create mode 100644 services/apps/alcs/src/portal/inbox/notification/inbox-notification.service.ts create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1697131320873-add_inbox_views.ts diff --git a/portal-frontend/src/app/app-routing.module.ts b/portal-frontend/src/app/app-routing.module.ts index c09b819fe6..cecf0d9e65 100644 --- a/portal-frontend/src/app/app-routing.module.ts +++ b/portal-frontend/src/app/app-routing.module.ts @@ -20,8 +20,8 @@ const routes: Routes = [ { title: 'Home', path: 'home', - component: HomeComponent, canActivate: [AuthGuard], + loadChildren: () => import('./features/home/home.module').then((m) => m.HomeModule), }, { title: 'Landing page', diff --git a/portal-frontend/src/app/app.module.ts b/portal-frontend/src/app/app.module.ts index a8304cbf27..d760d67031 100644 --- a/portal-frontend/src/app/app.module.ts +++ b/portal-frontend/src/app/app.module.ts @@ -9,12 +9,6 @@ import { provideNgxMask } from 'ngx-mask'; import { AppRoutingModule } from './app-routing.module'; import { AppComponent } from './app.component'; import { AuthorizationComponent } from './features/authorization/authorization.component'; -import { CreateSubmissionDialogComponent } from './features/create-submission-dialog/create-submission-dialog.component'; -import { ApplicationListComponent } from './features/home/application-list/application-list.component'; -import { HomeComponent } from './features/home/home.component'; -import { InboxListComponent } from './features/home/inbox-list/inbox-list.component'; -import { NoiListComponent } from './features/home/noi-list/noi-list.component'; -import { NotificationListComponent } from './features/home/notification-list/notification-list.component'; import { LandingPageComponent } from './features/landing-page/landing-page.component'; import { LoginComponent } from './features/login/login.component'; import { AuthInterceptorService } from './services/authentication/auth-interceptor.service'; @@ -31,15 +25,9 @@ import { SharedModule } from './shared/shared.module'; HeaderComponent, FooterComponent, LoginComponent, - HomeComponent, AuthorizationComponent, - ApplicationListComponent, - NoiListComponent, - NotificationListComponent, - CreateSubmissionDialogComponent, LandingPageComponent, ConfirmationDialogComponent, - InboxListComponent, ], imports: [ BrowserModule, diff --git a/portal-frontend/src/app/features/home/application-list/application-list.component.ts b/portal-frontend/src/app/features/home/application-list/application-list.component.ts deleted file mode 100644 index 2cc636f889..0000000000 --- a/portal-frontend/src/app/features/home/application-list/application-list.component.ts +++ /dev/null @@ -1,49 +0,0 @@ -import { Component, Input, OnInit, ViewChild } from '@angular/core'; -import { MatPaginator } from '@angular/material/paginator'; -import { MatTableDataSource } from '@angular/material/table'; -import { - ApplicationSubmissionDto, - SUBMISSION_STATUS, -} from '../../../services/application-submission/application-submission.dto'; -import { ApplicationSubmissionService } from '../../../services/application-submission/application-submission.service'; -import { InboxListItem } from '../inbox-list/inbox-list.component'; - -@Component({ - selector: 'app-application-list', - templateUrl: './application-list.component.html', - styleUrls: ['./application-list.component.scss'], -}) -export class ApplicationListComponent implements OnInit { - dataSource: MatTableDataSource<ApplicationSubmissionDto> = new MatTableDataSource<ApplicationSubmissionDto>(); - displayedColumns: string[] = [ - 'fileNumber', - 'dateCreated', - 'applicant', - 'applicationType', - 'status', - 'lastUpdated', - 'actions', - ]; - - listItems: InboxListItem[] = []; - - @ViewChild(MatPaginator) paginator!: MatPaginator; - @Input() isMobile = false; - - constructor(private applicationService: ApplicationSubmissionService) {} - - ngOnInit(): void { - this.loadApplications(); - } - - async loadApplications() { - const applications = await this.applicationService.getApplications(); - this.dataSource = new MatTableDataSource(applications); - this.dataSource.paginator = this.paginator; - - this.listItems = applications.map((app) => ({ - ...app, - routerLink: app.status.code !== SUBMISSION_STATUS.CANCELLED ? `/application/${app.fileNumber}` : undefined, - })); - } -} diff --git a/portal-frontend/src/app/features/home/home.component.html b/portal-frontend/src/app/features/home/home.component.html index a77b112d11..cf97b93b89 100644 --- a/portal-frontend/src/app/features/home/home.component.html +++ b/portal-frontend/src/app/features/home/home.component.html @@ -6,52 +6,14 @@ <h6>{{ profile.government || profile.businessName }}</h6> <diV class="title"> <h3>Portal Inbox</h3> <div> - <button mat-flat-button class="btn" (click)="onCreateApplication()" color="accent">+ Create New</button> + <button mat-flat-button class="btn" (click)="onCreateSubmission()" color="accent">+ Create New</button> </div> </diV> - <p>Create and manage your Applications, Notice of Intent, and Notification of SRW.</p> - <div class="learn-more-wrapper"> - <div class="learn-more-ctr button-text" color="accent" (click)="onLearnMoreClick()"> - Learn more<mat-icon>{{ isLearnMoreOpen ? 'expand_less' : 'expand_more' }}</mat-icon> - </div> - <div *ngIf="isLearnMoreOpen"> - <app-landing-page [isControlsVisible]="false"></app-landing-page> - </div> - </div> <div> - <button class="mobile-btn" (click)="onCreateApplication()" color="accent" mat-flat-button>+ Create New</button> + <button class="mobile-btn" (click)="onCreateSubmission()" color="accent" mat-flat-button>+ Create New</button> </div> </div> <div class="navigation"> - <mat-tab-group> - <mat-tab label="Application"> - <app-warning-banner> - Create an Application if you are proposing to exclude, include, subdivide, conduct a non-farm use activity, - conduct a non-adhering residential use, conduct a transportation/utility/recreational trail use, or conduct a - soil or fill use. Non-adhering residential use applications have a fee of $750. All other applications have a - fee of $1,500 fee, except for inclusion of land (no fee). Application fees are split equally between the local - government and the ALC. - </app-warning-banner> - <app-application-list [isMobile]="isMobile"></app-application-list> - </mat-tab> - <mat-tab label="Notice of Intent"> - <app-warning-banner> - Create a Notice of Intent if you are proposing to remove soil and/or place fill that does not qualify for - exemption under Section 35 of the Agricultural Land Reserve Use Regulation. All notices are subject to a $150 - fee. - </app-warning-banner> - <app-noi-list [isMobile]="isMobile"></app-noi-list> - </mat-tab> - <mat-tab label="Notification of SRW"> - <app-warning-banner> - Create a Notification of Statutory Right of Way to the ALC if you plan to register a SRW under - <a href="https://www.bclaws.gov.bc.ca/civix/document/id/complete/statreg/96250_00_multi#section218" - >s. 218 of the Land Title Act</a - > - in the ALR. - </app-warning-banner> - <app-notification-list [isMobile]="isMobile"></app-notification-list> - </mat-tab> - </mat-tab-group> + <app-inbox></app-inbox> </div> </div> diff --git a/portal-frontend/src/app/features/home/home.component.ts b/portal-frontend/src/app/features/home/home.component.ts index 4eac06e875..82c85cad12 100644 --- a/portal-frontend/src/app/features/home/home.component.ts +++ b/portal-frontend/src/app/features/home/home.component.ts @@ -18,7 +18,6 @@ export class HomeComponent implements OnInit, OnDestroy { } $destroy = new Subject<void>(); - isLearnMoreOpen = false; isMobile = false; profile: UserDto | undefined; @@ -36,15 +35,11 @@ export class HomeComponent implements OnInit, OnDestroy { this.$destroy.complete(); } - async onCreateApplication() { + async onCreateSubmission() { this.dialog.open(CreateSubmissionDialogComponent, { panelClass: 'no-padding', disableClose: true, autoFocus: false, }); } - - onLearnMoreClick() { - this.isLearnMoreOpen = !this.isLearnMoreOpen; - } } diff --git a/portal-frontend/src/app/features/home/home.module.ts b/portal-frontend/src/app/features/home/home.module.ts new file mode 100644 index 0000000000..c079612eca --- /dev/null +++ b/portal-frontend/src/app/features/home/home.module.ts @@ -0,0 +1,29 @@ +import { NgModule } from '@angular/core'; +import { MatPaginatorModule } from '@angular/material/paginator'; +import { RouterModule, Routes } from '@angular/router'; +import { SharedModule } from '../../shared/shared.module'; +import { CreateSubmissionDialogComponent } from '../create-submission-dialog/create-submission-dialog.component'; +import { InboxTableComponent } from './inbox/inbox-table/inbox-table.component'; +import { HomeComponent } from './home.component'; +import { InboxListComponent } from './inbox/inbox-list/inbox-list.component'; +import { InboxComponent } from './inbox/inbox.component'; + +const routes: Routes = [ + { + path: '', + component: HomeComponent, + }, +]; + +@NgModule({ + declarations: [ + HomeComponent, + InboxTableComponent, + CreateSubmissionDialogComponent, + InboxListComponent, + InboxComponent, + ], + imports: [SharedModule, RouterModule.forChild(routes), MatPaginatorModule], + providers: [], +}) +export class HomeModule {} diff --git a/portal-frontend/src/app/features/home/inbox-list/inbox-list.component.html b/portal-frontend/src/app/features/home/inbox/inbox-list/inbox-list.component.html similarity index 80% rename from portal-frontend/src/app/features/home/inbox-list/inbox-list.component.html rename to portal-frontend/src/app/features/home/inbox/inbox-list/inbox-list.component.html index f378bd3af5..c2fbaee312 100644 --- a/portal-frontend/src/app/features/home/inbox-list/inbox-list.component.html +++ b/portal-frontend/src/app/features/home/inbox/inbox-list/inbox-list.component.html @@ -13,11 +13,11 @@ <div *ngIf="result.status" class="label" - [style]="{ 'background-color': result.status.portalBackgroundColor, color: result.status.portalColor }" + [style]="{ 'background-color': result.statusType.portalBackgroundColor, color: result.statusType.portalColor }" > - {{ result.status.label }} + {{ result.statusType.label }} </div> - <div>Last Updated: {{ result.lastStatusUpdate | momentFormat }}</div> + <div>Last Updated: {{ result.lastUpdate | momentFormat }}</div> </div> </div> <div *ngIf="totalCount !== 0"> diff --git a/portal-frontend/src/app/features/home/inbox-list/inbox-list.component.scss b/portal-frontend/src/app/features/home/inbox/inbox-list/inbox-list.component.scss similarity index 88% rename from portal-frontend/src/app/features/home/inbox-list/inbox-list.component.scss rename to portal-frontend/src/app/features/home/inbox/inbox-list/inbox-list.component.scss index 3bb278dcf0..bfacdbf409 100644 --- a/portal-frontend/src/app/features/home/inbox-list/inbox-list.component.scss +++ b/portal-frontend/src/app/features/home/inbox/inbox-list/inbox-list.component.scss @@ -1,5 +1,5 @@ -@use '../../../../styles/functions' as *; -@use '../../../../styles/colors'; +@use '../../../../../styles/functions' as *; +@use '../../../../../styles/colors'; .result-list { margin-top: rem(16); diff --git a/portal-frontend/src/app/features/home/inbox-list/inbox-list.component.spec.ts b/portal-frontend/src/app/features/home/inbox/inbox-list/inbox-list.component.spec.ts similarity index 100% rename from portal-frontend/src/app/features/home/inbox-list/inbox-list.component.spec.ts rename to portal-frontend/src/app/features/home/inbox/inbox-list/inbox-list.component.spec.ts diff --git a/portal-frontend/src/app/features/home/inbox-list/inbox-list.component.ts b/portal-frontend/src/app/features/home/inbox/inbox-list/inbox-list.component.ts similarity index 62% rename from portal-frontend/src/app/features/home/inbox-list/inbox-list.component.ts rename to portal-frontend/src/app/features/home/inbox/inbox-list/inbox-list.component.ts index a77a749722..82ed517f44 100644 --- a/portal-frontend/src/app/features/home/inbox-list/inbox-list.component.ts +++ b/portal-frontend/src/app/features/home/inbox/inbox-list/inbox-list.component.ts @@ -1,20 +1,10 @@ import { Component, EventEmitter, Input, OnDestroy, Output } from '@angular/core'; import { Router } from '@angular/router'; import { Subject } from 'rxjs'; -import { BaseCodeDto } from '../../../shared/dto/base.dto'; - -export interface InboxListItem { - applicant?: string; - fileNumber: string; - lastStatusUpdate: number; - createdAt: number; - status?: BaseCodeDto & { - portalBackgroundColor: string; - portalColor: string; - }; - type: string; - routerLink?: string; -} +import { BaseInboxResultDto } from '../../../../services/inbox/inbox.dto'; +import { BaseCodeDto } from '../../../../shared/dto/base.dto'; +import { SearchResult } from '../../../public/search/search.interface'; +import { InboxResultDto } from '../inbox.component'; @Component({ selector: 'app-inbox-list', @@ -26,8 +16,8 @@ export class InboxListComponent implements OnDestroy { @Input() totalCount = 0; - _items: InboxListItem[] = []; - @Input() set items(items: InboxListItem[]) { + _items: InboxResultDto[] = []; + @Input() set items(items: InboxResultDto[]) { this._items = items; this.visibleCount = items.length; this.totalCount = items.length; @@ -44,10 +34,6 @@ export class InboxListComponent implements OnDestroy { this.$destroy.complete(); } - async onSelectRecord(record: InboxListItem) { - this.selectRecord.emit(record.fileNumber); - } - onLoadMore() { this.loadMore.emit(); } diff --git a/portal-frontend/src/app/features/home/application-list/application-list.component.html b/portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.html similarity index 68% rename from portal-frontend/src/app/features/home/application-list/application-list.component.html rename to portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.html index 433b94c8ee..e2931775f6 100644 --- a/portal-frontend/src/app/features/home/application-list/application-list.component.html +++ b/portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.html @@ -1,4 +1,4 @@ -<div *ngIf="!isMobile" class="table-wrapper"> +<div class="table-wrapper"> <div class="table-container"> <table mat-table [dataSource]="dataSource"> <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr> @@ -6,7 +6,7 @@ <!-- Row shown when there is no matching data. --> <tr class="mat-row" *matNoDataRow> - <td class="no-data" colspan="7">No Applications Created</td> + <td class="no-data" colspan="7">No {{ type }} Created</td> </tr> <ng-container matColumnDef="fileNumber"> @@ -21,7 +21,7 @@ <ng-container matColumnDef="applicant"> <th mat-header-cell *matHeaderCellDef>Owner Name</th> - <td mat-cell *matCellDef="let row">{{ row.applicant || '(Unknown)' }}</td> + <td mat-cell *matCellDef="let row">{{ row.ownerName || '(Unknown)' }}</td> </ng-container> <ng-container matColumnDef="applicationType"> @@ -33,30 +33,32 @@ <th mat-header-cell *matHeaderCellDef>Status</th> <td mat-cell *matCellDef="let row"> <div - *ngIf="row.status" class="label" - [style]="{ 'background-color': row.status.portalBackgroundColor, color: row.status.portalColor }" + [style]="{ 'background-color': row.statusType.portalBackgroundColor, color: row.statusType.portalColor }" > - {{ row.status.label }} + {{ row.statusType.label }} </div> </td> </ng-container> <ng-container matColumnDef="lastUpdated"> <th mat-header-cell *matHeaderCellDef>Last Updated</th> - <td mat-cell *matCellDef="let row">{{ row.updatedAt | date }}</td> + <td mat-cell *matCellDef="let row">{{ row.lastUpdate | date }}</td> </ng-container> <ng-container matColumnDef="actions"> <th mat-header-cell *matHeaderCellDef>Actions</th> <td mat-cell *matCellDef="let row"> - <button [routerLink]="'/application/' + row.fileNumber" *ngIf="row.canView" mat-flat-button color="primary"> - View - </button> + <button [routerLink]="row.routerLink" *ngIf="row.routerLink" mat-flat-button color="primary">View</button> </td> </ng-container> </table> - <mat-paginator [pageSizeOptions]="[5, 10, 25, 100]" aria-label="Select page of applications"></mat-paginator> + <mat-paginator + [length]="_totalCount" + [pageSize]='10' + [pageSizeOptions]="[5, 10, 25, 100]" + (page)="onPageChange($event)" + aria-label="Select page of applications" + ></mat-paginator> </div> </div> -<app-inbox-list *ngIf="isMobile" [items]="listItems"></app-inbox-list> diff --git a/portal-frontend/src/app/features/home/application-list/application-list.component.scss b/portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.scss similarity index 100% rename from portal-frontend/src/app/features/home/application-list/application-list.component.scss rename to portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.scss diff --git a/portal-frontend/src/app/features/home/application-list/application-list.component.spec.ts b/portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.spec.ts similarity index 56% rename from portal-frontend/src/app/features/home/application-list/application-list.component.spec.ts rename to portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.spec.ts index 44cdd7b4d1..e39cf63aaf 100644 --- a/portal-frontend/src/app/features/home/application-list/application-list.component.spec.ts +++ b/portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.spec.ts @@ -1,17 +1,17 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { ApplicationSubmissionService } from '../../../services/application-submission/application-submission.service'; -import { ConfirmationDialogService } from '../../../shared/confirmation-dialog/confirmation-dialog.service'; +import { ApplicationSubmissionService } from '../../../../services/application-submission/application-submission.service'; +import { ConfirmationDialogService } from '../../../../shared/confirmation-dialog/confirmation-dialog.service'; -import { ApplicationListComponent } from './application-list.component'; +import { InboxTableComponent } from './inbox-table.component'; describe('ApplicationListComponent', () => { - let component: ApplicationListComponent; - let fixture: ComponentFixture<ApplicationListComponent>; + let component: InboxTableComponent; + let fixture: ComponentFixture<InboxTableComponent>; beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [ApplicationListComponent], + declarations: [InboxTableComponent], providers: [ { provide: ApplicationSubmissionService, @@ -25,7 +25,7 @@ describe('ApplicationListComponent', () => { schemas: [NO_ERRORS_SCHEMA], }).compileComponents(); - fixture = TestBed.createComponent(ApplicationListComponent); + fixture = TestBed.createComponent(InboxTableComponent); component = fixture.componentInstance; fixture.detectChanges(); }); diff --git a/portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.ts b/portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.ts new file mode 100644 index 0000000000..0f25c2ccc1 --- /dev/null +++ b/portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.ts @@ -0,0 +1,99 @@ +import { Component, EventEmitter, Input, OnDestroy, Output, ViewChild } from '@angular/core'; +import { MatPaginator, PageEvent } from '@angular/material/paginator'; +import { MatSort } from '@angular/material/sort'; +import { MatTableDataSource } from '@angular/material/table'; +import { Subject, takeUntil } from 'rxjs'; +import { TableChange } from '../../../public/search/search.interface'; +import { InboxResultDto } from '../inbox.component'; + +@Component({ + selector: 'app-inbox-table', + templateUrl: './inbox-table.component.html', + styleUrls: ['./inbox-table.component.scss'], +}) +export class InboxTableComponent implements OnDestroy { + $destroy = new Subject<void>(); + + @ViewChild(MatPaginator) paginator!: MatPaginator; + @ViewChild(MatSort) sort?: MatSort; + + _items: InboxResultDto[] = []; + @Input() set items(applications: InboxResultDto[]) { + this._items = applications; + this.dataSource = new MatTableDataSource<InboxResultDto>(applications); + } + + _totalCount = 0; + @Input() set totalCount(count: number) { + this._totalCount = count; + + // this will ensure the reset of subscriber once the table is hidden because of empty + this.initSorting(); + } + + @Input() type = 'Applications'; + @Output() tableChange = new EventEmitter<TableChange>(); + + displayedColumns: string[] = [ + 'fileNumber', + 'dateCreated', + 'applicant', + 'applicationType', + 'status', + 'lastUpdated', + 'actions', + ]; + dataSource = new MatTableDataSource<InboxResultDto>(); + pageIndex = 0; + itemsPerPage = 20; + total = 0; + sortDirection = 'DESC'; + sortField = 'lastUpdate'; + + private subscribedToSort = false; + + constructor() {} + + async onTableChange() { + this.tableChange.emit({ + pageIndex: this.pageIndex, + itemsPerPage: this.itemsPerPage, + sortDirection: this.sortDirection, + sortField: this.sortField, + tableType: 'APP', + }); + } + + async onPageChange($event: PageEvent) { + this.pageIndex = $event.pageIndex; + this.itemsPerPage = $event.pageSize; + + await this.onTableChange(); + } + + ngOnDestroy(): void { + this.$destroy.next(); + this.$destroy.complete(); + } + + private initSorting() { + if (this._totalCount <= 0) { + this.subscribedToSort = false; + } + + // push subscription to next render cycle, after the table is rendered + setTimeout(() => { + if (this.sort && !this.subscribedToSort) { + this.subscribedToSort = true; + this.sort.sortChange.pipe(takeUntil(this.$destroy)).subscribe(async (sortObj) => { + this.paginator.pageIndex = 0; + this.pageIndex = 0; + this.sortDirection = sortObj.direction.toUpperCase(); + this.sortField = sortObj.active; + + await this.onTableChange(); + }); + } + }); + } +} diff --git a/portal-frontend/src/app/features/home/inbox/inbox.component.html b/portal-frontend/src/app/features/home/inbox/inbox.component.html new file mode 100644 index 0000000000..739112b407 --- /dev/null +++ b/portal-frontend/src/app/features/home/inbox/inbox.component.html @@ -0,0 +1,144 @@ +<section> + <form class="content" [formGroup]="searchForm" (ngSubmit)="onSubmit()"> + <mat-form-field class="full-width" appearance="outline"> + <input placeholder="Search Inbox by File ID" mask="0*" id="fileNumber" matInput formControlName="fileNumber" /> + </mat-form-field> + + <div class="right search-toggle"> + <a *ngIf="!panel.expanded" class="right" (click)="panel.toggle()" + >More search options<mat-icon>expand_more</mat-icon></a + > + <a *ngIf="panel.expanded" class="right" (click)="panel.toggle()" + >Less search options<mat-icon>expand_less</mat-icon></a + > + </div> + + <mat-expansion-panel #panel> + <div class="search-form"> + <div> + <label for="name">Name</label> + <mat-form-field appearance="outline"> + <input id="name" matInput formControlName="name" minlength="3" /> + </mat-form-field> + <div *ngIf="nameControl.invalid && (nameControl.dirty || nameControl.touched)" class="field-error"> + <mat-icon>warning</mat-icon> + <div *ngIf="nameControl.errors?.['minlength']">Enter 3 or more characters to search by name</div> + </div> + </div> + <div> + <label for="pid">PID</label> + <mat-form-field appearance="outline"> + <input id="pid" matInput formControlName="pid" minlength="9" maxlength="12" mask="000-000-000" /> + </mat-form-field> + <div *ngIf="pidInvalid" class="field-error"> + <mat-icon>warning</mat-icon> + <div *ngIf="pidControl.errors?.['mask']">PID must be 9 digits including leading zeroes</div> + </div> + </div> + <div> + <label for="civicAddress">Civic Address</label> + <mat-form-field appearance="outline"> + <input id="civicAddress" matInput formControlName="civicAddress" minlength="3" /> + </mat-form-field> + <div *ngIf="civicAddressInvalid" class="field-error"> + <mat-icon>warning</mat-icon> + <div *ngIf="civicAddressControl.errors?.['minlength']">Enter 3 or more characters to search</div> + </div> + </div> + <div> + <label for="type">Type</label> + <app-file-type-filter-drop-down + #fileTypeDropDown + [setFileTypes]="previousFileTypes" + (fileTypeChange)="onFileTypeChange($event)" + /> + </div> + <div> + <label for="status">Status</label> + <mat-form-field appearance="outline"> + <mat-select multiple="true" id="status" [formControl]="portalStatusControl"> + <mat-option *ngFor="let status of allStatuses" [value]="status.code"> + {{ status.label }} + </mat-option> + </mat-select> + </mat-form-field> + </div> + <div> + <label for="governmentFileNumber">Local/First Nation Gov File Number</label> + <mat-form-field appearance="outline"> + <input id="governmentFileNumber" matInput formControlName="governmentFileNumber" /> + </mat-form-field> + </div> + </div> + </mat-expansion-panel> + + <div class="button-controls"> + <button type="button" mat-stroked-button color="primary" (click)="onClear()">Clear</button> + <button type="submit" mat-flat-button color="primary" [disabled]="!searchForm.valid">Search</button> + </div> + </form> + + <div *ngIf="isLoading" class="center"> + <mat-spinner></mat-spinner> + </div> + <div class="search-fields-wrapper search-result-wrapper"> + <div *ngIf="isLoading" class="center"> + <mat-spinner></mat-spinner> + </div> + <mat-tab-group mat-align-tabs="start" mat-stretch-tabs #searchResultTabs> + <mat-tab> + <ng-template mat-tab-label> Applications: {{ applicationTotal }} </ng-template> + <app-inbox-list + *ngIf="isMobile" + [items]="applications" + [totalCount]="applicationTotal" + (loadMore)="onLoadMore('APP')" + > + </app-inbox-list> + <app-inbox-table + *ngIf="!isMobile" + [items]="applications" + [totalCount]="applicationTotal" + (tableChange)="onTableChange($event)" + ></app-inbox-table> + </mat-tab> + + <mat-tab> + <ng-template mat-tab-label> Notice of Intent: {{ noticeOfIntentTotal }} </ng-template> + <app-inbox-list + *ngIf="isMobile" + [items]="noticeOfIntents" + [totalCount]="noticeOfIntentTotal" + (loadMore)="onLoadMore('NOI')" + > + </app-inbox-list> + <app-inbox-table + *ngIf="!isMobile" + [items]="noticeOfIntents" + type="Notices of Intent" + [totalCount]="noticeOfIntentTotal" + (tableChange)="onTableChange($event)" + ></app-inbox-table> + </mat-tab> + + <mat-tab> + <ng-template mat-tab-label> Notification of SRW: {{ notificationTotal }} </ng-template> + <app-inbox-list + *ngIf="isMobile" + [items]="notifications" + [totalCount]="notificationTotal" + (loadMore)="onLoadMore('NOTI')" + > + </app-inbox-list> + <app-inbox-table + *ngIf="!isMobile" + [items]="notifications" + type="Notifications" + [totalCount]="notificationTotal" + (tableChange)="onTableChange($event)" + > + </app-inbox-table> + </mat-tab> + </mat-tab-group> + </div> +</section> diff --git a/portal-frontend/src/app/features/home/inbox/inbox.component.scss b/portal-frontend/src/app/features/home/inbox/inbox.component.scss new file mode 100644 index 0000000000..d87773c8fc --- /dev/null +++ b/portal-frontend/src/app/features/home/inbox/inbox.component.scss @@ -0,0 +1,110 @@ +@use '../../../../styles/colors'; +@use '../../../../styles/functions' as *; + +.full-width { + width: 100%; +} + +a { + text-decoration: none; +} + +.search-toggle { + margin: rem(16) 0 rem(18) 0; +} + +:host::ng-deep { + .label { + display: inline-block; + padding: rem(4) rem(16); + border-radius: rem(16); + font-weight: bold; + } + + .no-data { + margin-top: rem(16); + } + + .mat-expansion-panel-body { + padding: 2px; + } + + .mat-expansion-panel { + box-shadow: none; + } +} + +.search-form { + display: grid; + grid-template-columns: 1fr; + grid-row-gap: rem(20); + margin-bottom: rem(16); + + @media screen and (min-width: $tabletBreakpoint) { + grid-template-columns: 1fr 1fr; + grid-column-gap: rem(28); + grid-row-gap: rem(24); + + .full-width { + grid-column: 1/3; + } + } + + label { + display: block; + margin-bottom: rem(2); + } + + .mat-mdc-form-field { + width: 100%; + } +} + +.button-controls { + display: flex; + flex-direction: column-reverse; + + button { + width: 100%; + margin-top: rem(12) !important; + } + + @media screen and (min-width: $tabletBreakpoint) { + flex-direction: row; + justify-content: space-between; + + button { + width: unset; + } + } +} + +.search-result-wrapper { + margin-top: rem(60); + margin-bottom: rem(60); +} + +.field-error { + color: colors.$error-color; + font-size: rem(15); + font-weight: 700; + display: flex; + align-items: center; + margin-top: rem(4); + flex-direction: row !important; + gap: rem(4); + + div { + color: colors.$error-color; + } +} + +.mat-mdc-select-placeholder { + color: rgba(0, 0, 0, 0.6); +} + +.no-data { + overflow: hidden; + margin: rem(20) 0; + padding: rem(8) rem(12); +} diff --git a/portal-frontend/src/app/features/home/inbox/inbox.component.spec.ts b/portal-frontend/src/app/features/home/inbox/inbox.component.spec.ts new file mode 100644 index 0000000000..f1103ff778 --- /dev/null +++ b/portal-frontend/src/app/features/home/inbox/inbox.component.spec.ts @@ -0,0 +1,50 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { MatAutocompleteModule } from '@angular/material/autocomplete'; +import { DeepMocked } from '@golevelup/ts-jest'; +import { CodeService } from '../../../services/code/code.service'; +import { InboxService } from '../../../services/inbox/inbox.service'; +import { StatusService } from '../../../services/status/status.service'; +import { ToastService } from '../../../services/toast/toast.service'; + +import { InboxComponent } from './inbox.component'; + +describe('InboxComponent', () => { + let component: InboxComponent; + let fixture: ComponentFixture<InboxComponent>; + let mockInboxService: DeepMocked<InboxService>; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [MatAutocompleteModule], + declarations: [InboxComponent], + providers: [ + { + provide: InboxService, + useValue: mockInboxService, + }, + { + provide: CodeService, + useValue: {}, + }, + { + provide: StatusService, + useValue: {}, + }, + { + provide: ToastService, + useValue: {}, + }, + ], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(InboxComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/home/inbox/inbox.component.ts b/portal-frontend/src/app/features/home/inbox/inbox.component.ts new file mode 100644 index 0000000000..27ce9c165e --- /dev/null +++ b/portal-frontend/src/app/features/home/inbox/inbox.component.ts @@ -0,0 +1,358 @@ +import { Component, HostListener, OnDestroy, OnInit, ViewChild } from '@angular/core'; +import { FormControl, FormGroup } from '@angular/forms'; +import { MatPaginator } from '@angular/material/paginator'; +import { MatSort } from '@angular/material/sort'; +import { MatTabGroup } from '@angular/material/tabs'; +import { Title } from '@angular/platform-browser'; +import { Subject, takeUntil } from 'rxjs'; +import { + ApplicationStatusDto, + SUBMISSION_STATUS, +} from '../../../services/application-submission/application-submission.dto'; +import { CodeService } from '../../../services/code/code.service'; +import { BaseInboxResultDto, InboxRequestDto, InboxSearchResponseDto } from '../../../services/inbox/inbox.dto'; +import { InboxService } from '../../../services/inbox/inbox.service'; +import { ToastService } from '../../../services/toast/toast.service'; +import { MOBILE_BREAKPOINT } from '../../../shared/utils/breakpoints'; +import { FileTypeFilterDropDownComponent } from '../../public/search/file-type-filter-drop-down/file-type-filter-drop-down.component'; +import { TableChange } from '../../public/search/search.interface'; + +export interface InboxResultDto extends BaseInboxResultDto { + statusType: ApplicationStatusDto; + routerLink?: string; +} + +const CLASS_TO_URL_MAP: Record<string, string> = { + APP: 'application', + NOI: 'notice-of-intent', + NOTI: 'notification', +}; + +@Component({ + selector: 'app-inbox', + templateUrl: './inbox.component.html', + styleUrls: ['./inbox.component.scss'], +}) +export class InboxComponent implements OnInit, OnDestroy { + $destroy = new Subject<void>(); + + @ViewChild(MatPaginator) paginator!: MatPaginator; + @ViewChild(MatSort) sort?: MatSort; + @ViewChild('searchResultTabs') tabGroup!: MatTabGroup; + @ViewChild('fileTypeDropDown') fileTypeFilterDropDownComponent!: FileTypeFilterDropDownComponent; + + applications: InboxResultDto[] = []; + applicationTotal = 0; + + noticeOfIntents: InboxResultDto[] = []; + noticeOfIntentTotal = 0; + + notifications: InboxResultDto[] = []; + notificationTotal = 0; + + pageIndex = 0; + itemsPerPage = 20; + sortDirection = 'DESC'; + sortField = 'dateSubmitted'; + + governmentFileNumber = new FormControl<string | undefined>(undefined); + portalStatusControl = new FormControl<string[]>([]); + componentTypeControl = new FormControl<string[] | undefined>(undefined); + pidControl = new FormControl<string | undefined>(undefined); + nameControl = new FormControl<string | undefined>(undefined); + civicAddressControl = new FormControl<string | undefined>(undefined); + searchForm = new FormGroup({ + fileNumber: new FormControl<string | undefined>(undefined), + name: this.nameControl, + pid: this.pidControl, + civicAddress: this.civicAddressControl, + portalStatus: this.portalStatusControl, + componentType: this.componentTypeControl, + governmentFileNumber: this.governmentFileNumber, + }); + previousFileTypes: string[] = []; + + civicAddressInvalid = false; + pidInvalid = false; + isMobile = false; + isLoading = false; + + applicationStatuses: ApplicationStatusDto[] = []; + noticeOfIntentStatuses: ApplicationStatusDto[] = []; + notificationStatuses: ApplicationStatusDto[] = []; + allStatuses: ApplicationStatusDto[] = []; + + @HostListener('window:resize', ['$event']) + onWindowResize() { + const isMobile = window.innerWidth <= MOBILE_BREAKPOINT; + + if (this.isMobile !== isMobile) { + if (isMobile) { + this.itemsPerPage = 5; + this.pageIndex = 0; + } else { + this.itemsPerPage = 20; + this.pageIndex = 0; + } + this.onSubmit(); + } + + this.isMobile = isMobile; + } + + constructor( + private inboxService: InboxService, + private codeService: CodeService, + private toastService: ToastService, + private titleService: Title + ) { + this.titleService.setTitle('ALC Portal | Inbox'); + } + + ngOnInit(): void { + this.isMobile = window.innerWidth <= MOBILE_BREAKPOINT; + if (this.isMobile) { + this.itemsPerPage = 5; + } + + this.setup(); + + this.civicAddressControl.valueChanges.pipe(takeUntil(this.$destroy)).subscribe(() => { + this.civicAddressInvalid = + this.civicAddressControl.invalid && (this.civicAddressControl.dirty || this.civicAddressControl.touched); + }); + + this.pidControl.valueChanges.pipe(takeUntil(this.$destroy)).subscribe(() => { + this.pidInvalid = this.pidControl.invalid && (this.pidControl.dirty || this.pidControl.touched); + }); + } + + private async setup() { + await this.loadStatuses(); + await this.onSubmit(); + } + + ngOnDestroy(): void { + this.$destroy.next(); + this.$destroy.complete(); + } + + async onSubmit() { + const searchParams = this.getSearchParams(); + + this.isLoading = true; + const result = await this.inboxService.search(searchParams); + this.isLoading = false; + + // push tab activation to next render cycle, after the tabGroup is rendered + setTimeout(() => { + this.mapSearchResults(result); + + this.setActiveTab(); + }); + } + + onClear() { + this.searchForm.reset(); + this.onSubmit(); + + if (this.fileTypeFilterDropDownComponent) { + this.fileTypeFilterDropDownComponent.reset(); + } + } + + getSearchParams(): InboxRequestDto { + const searchControls = this.searchForm.controls; + + return { + // pagination + pageSize: this.itemsPerPage, + page: this.pageIndex + 1, + // sorting + sortField: this.sortField, + sortDirection: this.sortDirection, + // search parameters + fileNumber: this.formatStringSearchParam(searchControls.fileNumber.value), + name: this.formatStringSearchParam(searchControls.name.value), + civicAddress: this.formatStringSearchParam(searchControls.civicAddress.value), + pid: this.formatStringSearchParam(searchControls.pid.value), + portalStatusCodes: searchControls.portalStatus.value ?? undefined, + governmentFileNumber: this.formatStringSearchParam(searchControls.governmentFileNumber.value), + fileTypes: searchControls.componentType.value ? searchControls.componentType.value : [], + }; + } + + async onApplicationSearch() { + const searchParams = this.getSearchParams(); + const result = await this.inboxService.searchApplications(searchParams); + + this.applications = this.hydrateResult(result?.data ?? []); + this.applicationTotal = result?.total ?? 0; + } + + async onNoticeOfIntentSearch() { + const searchParams = this.getSearchParams(); + const result = await this.inboxService.searchNoticeOfIntents(searchParams); + + this.noticeOfIntents = this.hydrateResult(result?.data ?? []); + this.noticeOfIntentTotal = result?.total ?? 0; + } + + async onNotificationSearch() { + const searchParams = this.getSearchParams(); + const result = await this.inboxService.searchNotifications(searchParams); + + this.notifications = this.hydrateResult(result?.data ?? []); + this.notificationTotal = result?.total ?? 0; + } + + hydrateResult(result: BaseInboxResultDto[]): InboxResultDto[] { + return result.map((result) => { + const statuses = this.getStatuses(result.class); + const status = statuses.find((status) => status.code === result.status); + const url = CLASS_TO_URL_MAP[result.class]; + + return { + ...result, + routerLink: status?.code !== SUBMISSION_STATUS.CANCELLED ? `/${url}/${result.referenceId}` : undefined, + statusType: status!, + }; + }); + } + + getStatuses(myClass: string) { + switch (myClass) { + case 'APP': + return this.applicationStatuses; + case 'NOI': + return this.noticeOfIntentStatuses; + case 'NOTI': + default: + return this.notificationStatuses; + } + } + + async onLoadMore(table: string) { + this.pageIndex += 1; + const searchParams = this.getSearchParams(); + + let result; + switch (table) { + case 'APP': + result = await this.inboxService.searchApplications(searchParams); + if (result) { + this.applications = this.hydrateResult([...this.applications, ...result?.data]); + this.applicationTotal = result?.total ?? 0; + } + break; + case 'NOI': + result = await this.inboxService.searchNoticeOfIntents(searchParams); + if (result) { + this.noticeOfIntents = this.hydrateResult([...this.noticeOfIntents, ...result?.data]); + this.noticeOfIntentTotal = result?.total ?? 0; + } + break; + case 'NOTI': + result = await this.inboxService.searchNotifications(searchParams); + if (result) { + this.notifications = this.hydrateResult([...this.notifications, ...result?.data]); + this.notificationTotal = result?.total ?? 0; + } + break; + default: + this.toastService.showErrorToast('Not implemented'); + } + } + + async onTableChange(event: TableChange) { + this.pageIndex = event.pageIndex; + this.itemsPerPage = event.itemsPerPage; + this.sortDirection = event.sortDirection; + this.sortField = event.sortField; + + switch (event.tableType) { + case 'APP': + await this.onApplicationSearch(); + break; + case 'NOI': + await this.onNoticeOfIntentSearch(); + break; + case 'NOTI': + await this.onNotificationSearch(); + break; + default: + this.toastService.showErrorToast('Not implemented'); + } + } + + onFileTypeChange(fileTypes: string[]) { + this.componentTypeControl.setValue(fileTypes); + } + + private mapSearchResults(searchResult?: InboxSearchResponseDto) { + if (!searchResult) { + searchResult = { + applications: [], + noticeOfIntents: [], + notifications: [], + totalApplications: 0, + totalNoticeOfIntents: 0, + totalNotifications: 0, + }; + } + + this.applicationTotal = searchResult.totalApplications; + this.applications = this.hydrateResult(searchResult.applications); + + this.noticeOfIntentTotal = searchResult.totalNoticeOfIntents; + this.noticeOfIntents = this.hydrateResult(searchResult.noticeOfIntents); + + this.notificationTotal = searchResult.totalNotifications; + this.notifications = this.hydrateResult(searchResult.notifications); + } + + private setActiveTab() { + //Keep this in Tab Order + const searchCounts = [this.applicationTotal, this.noticeOfIntentTotal, this.notificationTotal]; + + this.tabGroup.selectedIndex = searchCounts.indexOf(Math.max(...searchCounts)); + } + + private formatStringSearchParam(value: string | undefined | null) { + if (value === undefined || value === null) { + return undefined; + } + + if (value.trim() === '') { + return undefined; + } else { + return value.trim(); + } + } + + private async loadStatuses() { + const res = await this.inboxService.listStatuses(); + + if (res) { + this.applicationStatuses = res.application; + this.noticeOfIntentStatuses = res.noticeOfIntent; + this.notificationStatuses = res.notification; + this.populateAllStatuses(); + } + } + + private populateAllStatuses() { + const statusCodes = new Set<string>(); + const result = []; + const allStatuses = [...this.applicationStatuses, ...this.noticeOfIntentStatuses, ...this.notificationStatuses]; + for (const status of allStatuses) { + if (!statusCodes.has(status.code)) { + result.push(status); + statusCodes.add(status.code); + } + } + + this.allStatuses = result; + this.allStatuses.sort((a, b) => (a.label > b.label ? 1 : -1)); + } +} diff --git a/portal-frontend/src/app/features/home/noi-list/noi-list.component.html b/portal-frontend/src/app/features/home/noi-list/noi-list.component.html deleted file mode 100644 index 5959b72cfe..0000000000 --- a/portal-frontend/src/app/features/home/noi-list/noi-list.component.html +++ /dev/null @@ -1,68 +0,0 @@ -<div *ngIf="!isMobile" class="table-wrapper"> - <div class="table-container"> - <table mat-table [dataSource]="dataSource"> - <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr> - <tr mat-row *matRowDef="let row; columns: displayedColumns"></tr> - - <!-- Row shown when there is no matching data. --> - <tr class="mat-row" *matNoDataRow> - <td class="no-data" colspan="7">No NOIs Created</td> - </tr> - - <ng-container matColumnDef="fileNumber"> - <th mat-header-cell *matHeaderCellDef>NOI ID</th> - <td mat-cell *matCellDef="let row">{{ row.fileNumber }}</td> - </ng-container> - - <ng-container matColumnDef="dateCreated"> - <th mat-header-cell *matHeaderCellDef>Date Created</th> - <td mat-cell *matCellDef="let row">{{ row.createdAt | date }}</td> - </ng-container> - - <ng-container matColumnDef="applicant"> - <th mat-header-cell *matHeaderCellDef>Owner Name</th> - <td mat-cell *matCellDef="let row">{{ row.applicant || '(Unknown)' }}</td> - </ng-container> - - <ng-container matColumnDef="applicationType"> - <th mat-header-cell *matHeaderCellDef>NOI Type</th> - <td mat-cell *matCellDef="let row">{{ row.type }}</td> - </ng-container> - - <ng-container matColumnDef="status"> - <th mat-header-cell *matHeaderCellDef>Status</th> - <td mat-cell *matCellDef="let row"> - <div - *ngIf="row.status" - class="label" - [style]="{ 'background-color': row.status.portalBackgroundColor, color: row.status.portalColor }" - > - {{ row.status.label }} - </div> - </td> - </ng-container> - - <ng-container matColumnDef="lastUpdated"> - <th mat-header-cell *matHeaderCellDef>Last Updated</th> - <td mat-cell *matCellDef="let row">{{ row.updatedAt | date }}</td> - </ng-container> - - <ng-container matColumnDef="actions"> - <th mat-header-cell *matHeaderCellDef>Actions</th> - <td mat-cell *matCellDef="let row"> - <button - [routerLink]="'/notice-of-intent/' + row.fileNumber" - *ngIf="row.canView" - mat-flat-button - color="primary" - > - View - </button> - </td> - </ng-container> - </table> - <mat-paginator [pageSizeOptions]="[5, 10, 25, 100]" aria-label="Select page of notice of intents"></mat-paginator> - </div> -</div> - -<app-inbox-list *ngIf="isMobile" [items]="listItems"></app-inbox-list> diff --git a/portal-frontend/src/app/features/home/noi-list/noi-list.component.scss b/portal-frontend/src/app/features/home/noi-list/noi-list.component.scss deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/portal-frontend/src/app/features/home/noi-list/noi-list.component.spec.ts b/portal-frontend/src/app/features/home/noi-list/noi-list.component.spec.ts deleted file mode 100644 index 05ba133ac5..0000000000 --- a/portal-frontend/src/app/features/home/noi-list/noi-list.component.spec.ts +++ /dev/null @@ -1,36 +0,0 @@ -import { NO_ERRORS_SCHEMA } from '@angular/core'; -import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { NoticeOfIntentSubmissionService } from '../../../services/notice-of-intent-submission/notice-of-intent-submission.service'; -import { ConfirmationDialogService } from '../../../shared/confirmation-dialog/confirmation-dialog.service'; - -import { NoiListComponent } from './noi-list.component'; - -describe('NoiListComponent', () => { - let component: NoiListComponent; - let fixture: ComponentFixture<NoiListComponent>; - - beforeEach(async () => { - await TestBed.configureTestingModule({ - declarations: [NoiListComponent], - providers: [ - { - provide: NoticeOfIntentSubmissionService, - useValue: {}, - }, - { - provide: ConfirmationDialogService, - useValue: {}, - }, - ], - schemas: [NO_ERRORS_SCHEMA], - }).compileComponents(); - - fixture = TestBed.createComponent(NoiListComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/portal-frontend/src/app/features/home/noi-list/noi-list.component.ts b/portal-frontend/src/app/features/home/noi-list/noi-list.component.ts deleted file mode 100644 index f528740e11..0000000000 --- a/portal-frontend/src/app/features/home/noi-list/noi-list.component.ts +++ /dev/null @@ -1,51 +0,0 @@ -import { Component, Input, OnInit, ViewChild } from '@angular/core'; -import { MatPaginator } from '@angular/material/paginator'; -import { MatTableDataSource } from '@angular/material/table'; -import { SUBMISSION_STATUS } from '../../../services/application-submission/application-submission.dto'; -import { - NOI_SUBMISSION_STATUS, - NoticeOfIntentSubmissionDto, -} from '../../../services/notice-of-intent-submission/notice-of-intent-submission.dto'; -import { NoticeOfIntentSubmissionService } from '../../../services/notice-of-intent-submission/notice-of-intent-submission.service'; -import { InboxListItem } from '../inbox-list/inbox-list.component'; - -@Component({ - selector: 'app-noi-list', - templateUrl: './noi-list.component.html', - styleUrls: ['./noi-list.component.scss'], -}) -export class NoiListComponent implements OnInit { - dataSource: MatTableDataSource<NoticeOfIntentSubmissionDto> = new MatTableDataSource<NoticeOfIntentSubmissionDto>(); - displayedColumns: string[] = [ - 'fileNumber', - 'dateCreated', - 'applicant', - 'applicationType', - 'status', - 'lastUpdated', - 'actions', - ]; - - listItems: InboxListItem[] = []; - - @ViewChild(MatPaginator) paginator!: MatPaginator; - @Input() isMobile = false; - - constructor(private noiSubmissionService: NoticeOfIntentSubmissionService) {} - - ngOnInit(): void { - this.loadNOIs(); - } - - async loadNOIs() { - const nois = await this.noiSubmissionService.getNoticeOfIntents(); - this.dataSource = new MatTableDataSource(nois); - this.dataSource.paginator = this.paginator; - - this.listItems = nois.map((noi) => ({ - ...noi, - routerLink: - noi.status.code !== NOI_SUBMISSION_STATUS.CANCELLED ? `/notice-of-intent/${noi.fileNumber}` : undefined, - })); - } -} diff --git a/portal-frontend/src/app/features/home/notification-list/notification-list.component.html b/portal-frontend/src/app/features/home/notification-list/notification-list.component.html deleted file mode 100644 index 3abcf1944f..0000000000 --- a/portal-frontend/src/app/features/home/notification-list/notification-list.component.html +++ /dev/null @@ -1,62 +0,0 @@ -<div *ngIf='!isMobile' class="table-wrapper"> - <div class="table-container"> - <table mat-table [dataSource]="dataSource"> - <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr> - <tr mat-row *matRowDef="let row; columns: displayedColumns"></tr> - - <!-- Row shown when there is no matching data. --> - <tr class="mat-row" *matNoDataRow> - <td class="no-data" colspan="7">No Notifications Created</td> - </tr> - - <ng-container matColumnDef="fileNumber"> - <th mat-header-cell *matHeaderCellDef>Notification ID</th> - <td mat-cell *matCellDef="let row">{{ row.fileNumber }}</td> - </ng-container> - - <ng-container matColumnDef="dateCreated"> - <th mat-header-cell *matHeaderCellDef>Date Created</th> - <td mat-cell *matCellDef="let row">{{ row.createdAt | date }}</td> - </ng-container> - - <ng-container matColumnDef="applicant"> - <th mat-header-cell *matHeaderCellDef>Name</th> - <td mat-cell *matCellDef="let row">{{ row.applicant || '(Unknown)' }}</td> - </ng-container> - - <ng-container matColumnDef="applicationType"> - <th mat-header-cell *matHeaderCellDef>Type</th> - <td mat-cell *matCellDef="let row">{{ row.type }}</td> - </ng-container> - - <ng-container matColumnDef="status"> - <th mat-header-cell *matHeaderCellDef>Status</th> - <td mat-cell *matCellDef="let row"> - <div - *ngIf="row.status" - class="label" - [style]="{ 'background-color': row.status.portalBackgroundColor, color: row.status.portalColor }" - > - {{ row.status.label }} - </div> - </td> - </ng-container> - - <ng-container matColumnDef="lastUpdated"> - <th mat-header-cell *matHeaderCellDef>Last Updated</th> - <td mat-cell *matCellDef="let row">{{ row.updatedAt | date }}</td> - </ng-container> - - <ng-container matColumnDef="actions"> - <th mat-header-cell *matHeaderCellDef>Actions</th> - <td mat-cell *matCellDef="let row"> - <button [routerLink]="'/notification/' + row.fileNumber" *ngIf="row.canView" mat-flat-button color="primary"> - View - </button> - </td> - </ng-container> - </table> - <mat-paginator [pageSizeOptions]="[5, 10, 25, 100]" aria-label="Select page of SRWs"></mat-paginator> - </div> -</div> -<app-inbox-list *ngIf="isMobile" [items]="listItems"></app-inbox-list> diff --git a/portal-frontend/src/app/features/home/notification-list/notification-list.component.scss b/portal-frontend/src/app/features/home/notification-list/notification-list.component.scss deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/portal-frontend/src/app/features/home/notification-list/notification-list.component.spec.ts b/portal-frontend/src/app/features/home/notification-list/notification-list.component.spec.ts deleted file mode 100644 index a5b90d4182..0000000000 --- a/portal-frontend/src/app/features/home/notification-list/notification-list.component.spec.ts +++ /dev/null @@ -1,36 +0,0 @@ -import { NO_ERRORS_SCHEMA } from '@angular/core'; -import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { NotificationSubmissionService } from '../../../services/notification-submission/notification-submission.service'; -import { ConfirmationDialogService } from '../../../shared/confirmation-dialog/confirmation-dialog.service'; - -import { NotificationListComponent } from './notification-list.component'; - -describe('NotificationListComponent', () => { - let component: NotificationListComponent; - let fixture: ComponentFixture<NotificationListComponent>; - - beforeEach(async () => { - await TestBed.configureTestingModule({ - declarations: [NotificationListComponent], - providers: [ - { - provide: NotificationSubmissionService, - useValue: {}, - }, - { - provide: ConfirmationDialogService, - useValue: {}, - }, - ], - schemas: [NO_ERRORS_SCHEMA], - }).compileComponents(); - - fixture = TestBed.createComponent(NotificationListComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/portal-frontend/src/app/features/home/notification-list/notification-list.component.ts b/portal-frontend/src/app/features/home/notification-list/notification-list.component.ts deleted file mode 100644 index 4e63f44801..0000000000 --- a/portal-frontend/src/app/features/home/notification-list/notification-list.component.ts +++ /dev/null @@ -1,53 +0,0 @@ -import { Component, Input, OnInit, ViewChild } from '@angular/core'; -import { MatPaginator } from '@angular/material/paginator'; -import { MatTableDataSource } from '@angular/material/table'; -import { NOI_SUBMISSION_STATUS } from '../../../services/notice-of-intent-submission/notice-of-intent-submission.dto'; -import { - NOTIFICATION_STATUS, - NotificationSubmissionDto, -} from '../../../services/notification-submission/notification-submission.dto'; -import { NotificationSubmissionService } from '../../../services/notification-submission/notification-submission.service'; -import { InboxListItem } from '../inbox-list/inbox-list.component'; - -@Component({ - selector: 'app-notification-list', - templateUrl: './notification-list.component.html', - styleUrls: ['./notification-list.component.scss'], -}) -export class NotificationListComponent implements OnInit { - dataSource: MatTableDataSource<NotificationSubmissionDto> = new MatTableDataSource<NotificationSubmissionDto>(); - displayedColumns: string[] = [ - 'fileNumber', - 'dateCreated', - 'applicant', - 'applicationType', - 'status', - 'lastUpdated', - 'actions', - ]; - - listItems: InboxListItem[] = []; - - @ViewChild(MatPaginator) paginator!: MatPaginator; - @Input() isMobile = false; - - constructor(private notificationSubmissionService: NotificationSubmissionService) {} - - ngOnInit(): void { - this.loadNotifications(); - } - - async loadNotifications() { - const notifications = await this.notificationSubmissionService.getNotifications(); - this.dataSource = new MatTableDataSource(notifications); - this.dataSource.paginator = this.paginator; - - this.listItems = notifications.map((notification) => ({ - ...notification, - routerLink: - notification.status.code !== NOTIFICATION_STATUS.CANCELLED - ? `/notification/${notification.fileNumber}` - : undefined, - })); - } -} diff --git a/portal-frontend/src/app/features/public/public.module.ts b/portal-frontend/src/app/features/public/public.module.ts index c3e266a0db..a76edfc760 100644 --- a/portal-frontend/src/app/features/public/public.module.ts +++ b/portal-frontend/src/app/features/public/public.module.ts @@ -39,17 +39,8 @@ const routes: Routes = [ NotificationSearchTableComponent, NoticeOfIntentSearchTableComponent, ApplicationSearchTableComponent, - FileTypeFilterDropDownComponent, SearchListComponent, ], - imports: [ - CommonModule, - SharedModule, - MatPaginatorModule, - MatSortModule, - RouterModule.forChild(routes), - MatAutocompleteModule, - MatTreeModule, - ], + imports: [CommonModule, SharedModule, MatPaginatorModule, MatSortModule, RouterModule.forChild(routes)], }) export class PublicModule {} diff --git a/portal-frontend/src/app/services/inbox/inbox.dto.ts b/portal-frontend/src/app/services/inbox/inbox.dto.ts new file mode 100644 index 0000000000..c4a73f90b4 --- /dev/null +++ b/portal-frontend/src/app/services/inbox/inbox.dto.ts @@ -0,0 +1,46 @@ +export interface BaseInboxResultDto { + fileNumber: string; + type: string; + referenceId: string; + applicant?: string; + ownerName: string; + createdAt: number; + lastUpdate: number; + status: string; + class: string; +} + +export interface ApplicationInboxResultDto extends BaseInboxResultDto {} +export interface NoticeOfIntentInboxResultDto extends BaseInboxResultDto {} +export interface NotificationInboxResultDto extends BaseInboxResultDto {} + +export interface InboxSearchResponseDto { + applications: ApplicationInboxResultDto[]; + noticeOfIntents: NoticeOfIntentInboxResultDto[]; + notifications: NotificationInboxResultDto[]; + totalApplications: number; + totalNoticeOfIntents: number; + totalNotifications: number; +} + +export interface InboxResponseDto<T> { + data: T[]; + total: number; +} + +export interface PagingRequestDto { + pageSize: number; + page: number; + sortField: string; + sortDirection: string; +} + +export interface InboxRequestDto extends PagingRequestDto { + fileNumber?: string; + name?: string; + pid?: string; + civicAddress?: string; + portalStatusCodes?: string[]; + governmentFileNumber?: string; + fileTypes: string[]; +} diff --git a/portal-frontend/src/app/services/inbox/inbox.service.spec.ts b/portal-frontend/src/app/services/inbox/inbox.service.spec.ts new file mode 100644 index 0000000000..97c1f41556 --- /dev/null +++ b/portal-frontend/src/app/services/inbox/inbox.service.spec.ts @@ -0,0 +1,135 @@ +import { HttpClient } from '@angular/common/http'; +import { TestBed } from '@angular/core/testing'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { of, throwError } from 'rxjs'; +import { ToastService } from '../toast/toast.service'; +import { InboxService } from './inbox.service'; + +describe('InboxService', () => { + let service: InboxService; + let mockHttpClient: DeepMocked<HttpClient>; + let mockToastService: DeepMocked<ToastService>; + + const mockSearchEntityResult = { + total: 0, + data: [], + }; + + const mockSearchResult = { + applications: [], + totalApplications: 0, + noticeOfIntents: [], + totalNoticeOfIntents: 0, + nonApplications: [], + totalNonApplications: 0, + }; + + const mockSearchRequestDto = { + pageSize: 1, + page: 1, + sortField: '1', + sortDirection: 'ASC', + isIncludeOtherParcels: false, + fileTypes: [], + }; + + beforeEach(() => { + mockHttpClient = createMock(); + mockToastService = createMock(); + + TestBed.configureTestingModule({ + providers: [ + { + provide: HttpClient, + useValue: mockHttpClient, + }, + { + provide: ToastService, + useValue: mockToastService, + }, + ], + }); + service = TestBed.inject(InboxService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); + + it('should fetch search results by AdvancedSearchRequestDto', async () => { + mockHttpClient.post.mockReturnValue(of(mockSearchResult)); + + const res = await service.search(mockSearchRequestDto); + + expect(mockHttpClient.post).toHaveBeenCalledTimes(1); + expect(res).toBeDefined(); + expect(res?.totalApplications).toEqual(0); + expect(res?.applications).toEqual([]); + expect(res?.totalNoticeOfIntents).toEqual(0); + expect(res?.noticeOfIntents).toEqual([]); + }); + + it('should show an error toast message if search fails', async () => { + mockHttpClient.post.mockReturnValue( + throwError(() => { + new Error(''); + }) + ); + + const res = await service.search(mockSearchRequestDto); + + expect(mockHttpClient.post).toHaveBeenCalledTimes(1); + expect(res).toBeUndefined(); + expect(mockToastService.showErrorToast).toHaveBeenCalledTimes(1); + }); + + it('should fetch application advanced search results by AdvancedSearchRequestDto', async () => { + mockHttpClient.post.mockReturnValue(of(mockSearchEntityResult)); + + const res = await service.searchApplications(mockSearchRequestDto); + + expect(mockHttpClient.post).toHaveBeenCalledTimes(1); + expect(res).toBeDefined(); + expect(res?.total).toEqual(0); + expect(res?.data).toEqual([]); + }); + + it('should show an error toast message if application advanced search fails', async () => { + mockHttpClient.post.mockReturnValue( + throwError(() => { + new Error(''); + }) + ); + + const res = await service.searchApplications(mockSearchRequestDto); + + expect(mockHttpClient.post).toHaveBeenCalledTimes(1); + expect(res).toBeUndefined(); + expect(mockToastService.showErrorToast).toHaveBeenCalledTimes(1); + }); + + it('should fetch NOI advanced search results by AdvancedSearchRequestDto', async () => { + mockHttpClient.post.mockReturnValue(of(mockSearchEntityResult)); + + const res = await service.searchNoticeOfIntents(mockSearchRequestDto); + + expect(mockHttpClient.post).toHaveBeenCalledTimes(1); + expect(res).toBeDefined(); + expect(res?.total).toEqual(0); + expect(res?.data).toEqual([]); + }); + + it('should show an error toast message if NOI advanced search fails', async () => { + mockHttpClient.post.mockReturnValue( + throwError(() => { + new Error(''); + }) + ); + + const res = await service.searchNoticeOfIntents(mockSearchRequestDto); + + expect(mockHttpClient.post).toHaveBeenCalledTimes(1); + expect(res).toBeUndefined(); + expect(mockToastService.showErrorToast).toHaveBeenCalledTimes(1); + }); +}); diff --git a/portal-frontend/src/app/services/inbox/inbox.service.ts b/portal-frontend/src/app/services/inbox/inbox.service.ts new file mode 100644 index 0000000000..7c7e187e23 --- /dev/null +++ b/portal-frontend/src/app/services/inbox/inbox.service.ts @@ -0,0 +1,85 @@ +import { HttpClient } from '@angular/common/http'; +import { Injectable } from '@angular/core'; +import { firstValueFrom } from 'rxjs'; +import { environment } from '../../../environments/environment'; +import { ApplicationStatusDto } from '../application-submission/application-submission.dto'; +import { ToastService } from '../toast/toast.service'; +import { + InboxResponseDto, + BaseInboxResultDto, + NoticeOfIntentInboxResultDto, + NotificationInboxResultDto, + InboxRequestDto, + InboxSearchResponseDto, +} from './inbox.dto'; + +@Injectable({ + providedIn: 'root', +}) +export class InboxService { + private baseUrl = `${environment.apiUrl}/inbox`; + + constructor(private http: HttpClient, private toastService: ToastService) {} + + async search(searchDto: InboxRequestDto) { + try { + return await firstValueFrom(this.http.post<InboxSearchResponseDto>(`${this.baseUrl}`, searchDto)); + } catch (e) { + console.error(e); + this.toastService.showErrorToast(`Failed to load inbox. Please refresh the page and try again`); + return undefined; + } + } + + async searchApplications(searchDto: InboxRequestDto) { + try { + return await firstValueFrom( + this.http.post<InboxResponseDto<BaseInboxResultDto>>(`${this.baseUrl}/application`, searchDto) + ); + } catch (e) { + console.error(e); + this.toastService.showErrorToast(`Failed to load Applications. Please refresh the page and try again`); + return undefined; + } + } + + async searchNoticeOfIntents(searchDto: InboxRequestDto) { + try { + return await firstValueFrom( + this.http.post<InboxResponseDto<NoticeOfIntentInboxResultDto>>(`${this.baseUrl}/notice-of-intent`, searchDto) + ); + } catch (e) { + console.error(e); + this.toastService.showErrorToast(`Failed to load Notices of Intent. Please refresh the page and try again`); + return undefined; + } + } + + async searchNotifications(searchDto: InboxRequestDto) { + try { + return await firstValueFrom( + this.http.post<InboxResponseDto<NotificationInboxResultDto>>(`${this.baseUrl}/notifications`, searchDto) + ); + } catch (e) { + console.error(e); + this.toastService.showErrorToast(`Failed to load Notifications. Please refresh the page and try again`); + return undefined; + } + } + + async listStatuses() { + try { + return await firstValueFrom( + this.http.get<{ + application: ApplicationStatusDto[]; + noticeOfIntent: ApplicationStatusDto[]; + notification: ApplicationStatusDto[]; + }>(`${this.baseUrl}`) + ); + } catch (e) { + console.error(e); + this.toastService.showErrorToast(`Failed to load Statuses. Please refresh the page and try again`); + return undefined; + } + } +} diff --git a/portal-frontend/src/app/shared/shared.module.ts b/portal-frontend/src/app/shared/shared.module.ts index b089040e44..01c4331611 100644 --- a/portal-frontend/src/app/shared/shared.module.ts +++ b/portal-frontend/src/app/shared/shared.module.ts @@ -21,11 +21,14 @@ import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; import { MatRadioModule } from '@angular/material/radio'; import { MatSelectModule } from '@angular/material/select'; import { MatSnackBarModule } from '@angular/material/snack-bar'; +import { MatSortModule } from '@angular/material/sort'; import { MatStepperModule } from '@angular/material/stepper'; import { MatTableModule } from '@angular/material/table'; import { MatTabsModule } from '@angular/material/tabs'; import { MatTooltipModule } from '@angular/material/tooltip'; +import { MatTreeModule } from '@angular/material/tree'; import { NgxMaskDirective, NgxMaskPipe } from 'ngx-mask'; +import { FileTypeFilterDropDownComponent } from '../features/public/search/file-type-filter-drop-down/file-type-filter-drop-down.component'; import { CustomStepperComponent } from './custom-stepper/custom-stepper.component'; import { DragDropDirective } from './file-drag-drop/drag-drop.directive'; import { FileDragDropComponent } from './file-drag-drop/file-drag-drop.component'; @@ -73,6 +76,8 @@ import { WarningBannerComponent } from './warning-banner/warning-banner.componen MatButtonToggleModule, MatCheckboxModule, MatIconModule, + MatAutocompleteModule, + MatTreeModule, ], declarations: [ FileDragDropComponent, @@ -93,6 +98,7 @@ import { WarningBannerComponent } from './warning-banner/warning-banner.componen ParcelOwnersComponent, SoilTableComponent, TableColumnNoDataPipe, + FileTypeFilterDropDownComponent, ], exports: [ CommonModule, @@ -140,6 +146,7 @@ import { WarningBannerComponent } from './warning-banner/warning-banner.componen ParcelOwnersComponent, SoilTableComponent, TableColumnNoDataPipe, + FileTypeFilterDropDownComponent, ], }) export class SharedModule { diff --git a/portal-frontend/src/styles.scss b/portal-frontend/src/styles.scss index 3dd5969dd9..39f30dd8e9 100644 --- a/portal-frontend/src/styles.scss +++ b/portal-frontend/src/styles.scss @@ -62,6 +62,13 @@ a { align-items: center; } +.right { + display: flex; + align-content: center; + justify-content: flex-end; + align-items: center; +} + .no-padding .mat-dialog-container { padding: 0; } diff --git a/services/apps/alcs/src/portal/document/document.controller.spec.ts b/services/apps/alcs/src/portal/document/document.controller.spec.ts index 5884b557ea..2153fa9fd0 100644 --- a/services/apps/alcs/src/portal/document/document.controller.spec.ts +++ b/services/apps/alcs/src/portal/document/document.controller.spec.ts @@ -1,5 +1,7 @@ import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; +import { ClsService } from 'nestjs-cls'; +import { mockKeyCloakProviders } from '../../../test/mocks/mockTypes'; import { DOCUMENT_TYPE } from '../../document/document-code.entity'; import { DocumentService } from '../../document/document.service'; import { DocumentController } from './document.controller'; @@ -18,6 +20,11 @@ describe('DocumentController', () => { provide: DocumentService, useValue: mockDocumentService, }, + { + provide: ClsService, + useValue: {}, + }, + ...mockKeyCloakProviders, ], }).compile(); diff --git a/services/apps/alcs/src/portal/document/document.controller.ts b/services/apps/alcs/src/portal/document/document.controller.ts index 63f32d2d9b..91fd04cf5f 100644 --- a/services/apps/alcs/src/portal/document/document.controller.ts +++ b/services/apps/alcs/src/portal/document/document.controller.ts @@ -1,4 +1,11 @@ -import { BadRequestException, Controller, Get, Param } from '@nestjs/common'; +import { + BadRequestException, + Controller, + Get, + Param, + UseGuards, +} from '@nestjs/common'; +import { PortalAuthGuard } from '../../common/authorization/portal-auth-guard.service'; import { DOCUMENT_TYPE, DOCUMENT_TYPES, @@ -6,6 +13,7 @@ import { import { DocumentService } from '../../document/document.service'; @Controller('document') +@UseGuards(PortalAuthGuard) export class DocumentController { constructor(private documentService: DocumentService) {} diff --git a/services/apps/alcs/src/portal/inbox/application/inbox-application-view.entity.ts b/services/apps/alcs/src/portal/inbox/application/inbox-application-view.entity.ts new file mode 100644 index 0000000000..2fde1cb8b3 --- /dev/null +++ b/services/apps/alcs/src/portal/inbox/application/inbox-application-view.entity.ts @@ -0,0 +1,126 @@ +import { + DataSource, + JoinColumn, + ManyToOne, + PrimaryColumn, + ViewColumn, + ViewEntity, +} from 'typeorm'; +import { ApplicationDecision } from '../../../alcs/application-decision/application-decision.entity'; +import { ApplicationSubmissionToSubmissionStatus } from '../../../alcs/application/application-submission-status/submission-status.entity'; +import { Application } from '../../../alcs/application/application.entity'; +import { ApplicationType } from '../../../alcs/code/application-code/application-type/application-type.entity'; +import { LocalGovernment } from '../../../alcs/local-government/local-government.entity'; +import { ApplicationSubmissionReview } from '../../application-submission-review/application-submission-review.entity'; +import { ApplicationSubmission } from '../../application-submission/application-submission.entity'; +import { LinkedStatusType } from '../inbox.dto'; + +@ViewEntity({ + expression: (datasource: DataSource) => + datasource + .createQueryBuilder() + .select('app_sub.uuid', 'uuid') + .addSelect('app_sub.file_number', 'file_number') + .addSelect('app_sub.applicant', 'applicant') + .addSelect('app_sub.created_by_uuid', 'created_by_uuid') + .addSelect('app_sub.local_government_uuid', 'local_government_uuid') + .addSelect('app_sub.audit_created_at', 'created_at') + .addSelect('localGovernment.name', 'local_government_name') + .addSelect('localGovernment.bceid_business_guid', 'bceid_business_guid') + .addSelect('app_sub.type_code', 'application_type_code') + .addSelect('app.uuid', 'application_uuid') + .addSelect( + 'app_rev.local_government_file_number', + 'local_government_file_number', + ) + .addSelect( + 'GREATEST(status_link.effective_date, decision_date.date)', + 'last_update', + ) + .addSelect( + 'alcs.get_current_status_for_application_submission_by_uuid(app_sub.uuid)', + 'status', + ) + .from(ApplicationSubmission, 'app_sub') + .innerJoin(Application, 'app', 'app.file_number = app_sub.file_number') + .leftJoin( + ApplicationSubmissionReview, + 'app_rev', + 'app.file_number = app_rev.application_file_number', + ) + .innerJoinAndSelect( + ApplicationType, + 'applicationType', + 'app_sub.type_code = applicationType.code', + ) + .leftJoin( + LocalGovernment, + 'localGovernment', + 'app_sub.local_government_uuid = localGovernment.uuid', + ) + .leftJoin( + (qb) => + qb + .from(ApplicationSubmissionToSubmissionStatus, 'status_link') + .select('MAX("effective_date")', 'effective_date') + .addSelect('submission_uuid', 'submission_uuid') + .groupBy('submission_uuid'), + 'status_link', + 'status_link."submission_uuid" = app_sub.uuid', + ) + .leftJoin( + (qb) => + qb + .from(ApplicationDecision, 'decision_date') + .select('MAX("date")', 'date') + .addSelect('application_uuid', 'application_uuid') + .groupBy('application_uuid'), + 'decision_date', + 'decision_date."application_uuid" = app.uuid', + ) + .where('app_sub.is_draft = FALSE'), +}) +export class InboxApplicationSubmissionView { + @ViewColumn() + @PrimaryColumn() + uuid: string; + + @ViewColumn() + applicationUuid: string; + + @ViewColumn() + lastUpdate: Date; + + @ViewColumn() + createdAt: Date; + + @ViewColumn() + fileNumber: string; + + @ViewColumn() + applicant?: string; + + @ViewColumn() + createdByUuid: string; + + @ViewColumn() + bceidBusinessGuid?: string; + + @ViewColumn() + localGovernmentUuid?: string; + + @ViewColumn() + localGovernmentFileNumber?: string; + + @ViewColumn() + applicationTypeCode: string; + + @ViewColumn() + status: LinkedStatusType; + + @ManyToOne(() => ApplicationType, { + nullable: false, + }) + @JoinColumn({ name: 'application_type_code' }) + applicationType: ApplicationType; +} diff --git a/services/apps/alcs/src/portal/inbox/application/inbox-application.service.spec.ts b/services/apps/alcs/src/portal/inbox/application/inbox-application.service.spec.ts new file mode 100644 index 0000000000..5489d70b3d --- /dev/null +++ b/services/apps/alcs/src/portal/inbox/application/inbox-application.service.spec.ts @@ -0,0 +1,105 @@ +import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; +import { Test, TestingModule } from '@nestjs/testing'; +import { getRepositoryToken } from '@nestjs/typeorm'; +import { Repository } from 'typeorm'; +import { InboxRequestDto } from '../inbox.dto'; +import { InboxApplicationSubmissionView } from './inbox-application-view.entity'; +import { InboxApplicationService } from './inbox-application.service'; + +describe('InboxApplicationService', () => { + let service: InboxApplicationService; + let mockApplicationSubmissionSearchViewRepository: DeepMocked< + Repository<InboxApplicationSubmissionView> + >; + + const mockSearchRequestDto: InboxRequestDto = { + fileNumber: '123', + portalStatusCodes: ['A'], + name: 'D', + pid: 'E', + civicAddress: 'F', + fileTypes: ['type1', 'type2'], + page: 1, + pageSize: 10, + sortField: 'ownerName', + sortDirection: 'ASC', + }; + + let mockQuery: any = {}; + + beforeEach(async () => { + mockApplicationSubmissionSearchViewRepository = createMock(); + + mockQuery = { + getManyAndCount: jest.fn().mockResolvedValue([[], 0]), + orderBy: jest.fn().mockReturnThis(), + offset: jest.fn().mockReturnThis(), + limit: jest.fn().mockReturnThis(), + innerJoinAndMapOne: jest.fn().mockReturnThis(), + groupBy: jest.fn().mockReturnThis(), + where: jest.fn().mockReturnThis(), + andWhere: jest.fn().mockReturnThis(), + setParameters: jest.fn().mockReturnThis(), + leftJoin: jest.fn().mockReturnThis(), + }; + + const module: TestingModule = await Test.createTestingModule({ + providers: [ + InboxApplicationService, + { + provide: getRepositoryToken(InboxApplicationSubmissionView), + useValue: mockApplicationSubmissionSearchViewRepository, + }, + ], + }).compile(); + + service = module.get<InboxApplicationService>(InboxApplicationService); + }); + + it('should be defined', () => { + expect(service).toBeDefined(); + }); + + it('should successfully build a query using all search parameters defined', async () => { + mockApplicationSubmissionSearchViewRepository.createQueryBuilder.mockReturnValue( + mockQuery as any, + ); + + const result = await service.searchApplications( + mockSearchRequestDto, + '', + '', + '', + ); + + expect(result).toEqual({ data: [], total: 0 }); + expect( + mockApplicationSubmissionSearchViewRepository.createQueryBuilder, + ).toBeCalledTimes(1); + expect(mockQuery.andWhere).toBeCalledTimes(8); + }); + + it('should call compileApplicationSearchQuery method correctly', async () => { + const compileApplicationSearchQuerySpy = jest + .spyOn(service as any, 'compileApplicationSearchQuery') + .mockResolvedValue(mockQuery); + + const result = await service.searchApplications( + mockSearchRequestDto, + '', + '', + '', + ); + + expect(result).toEqual({ data: [], total: 0 }); + expect(compileApplicationSearchQuerySpy).toBeCalledWith( + mockSearchRequestDto, + '', + '', + '', + ); + expect(mockQuery.orderBy).toHaveBeenCalledTimes(1); + expect(mockQuery.offset).toHaveBeenCalledTimes(1); + expect(mockQuery.limit).toHaveBeenCalledTimes(1); + }); +}); diff --git a/services/apps/alcs/src/portal/inbox/application/inbox-application.service.ts b/services/apps/alcs/src/portal/inbox/application/inbox-application.service.ts new file mode 100644 index 0000000000..06d88e04da --- /dev/null +++ b/services/apps/alcs/src/portal/inbox/application/inbox-application.service.ts @@ -0,0 +1,263 @@ +import { Injectable } from '@nestjs/common'; +import { InjectRepository } from '@nestjs/typeorm'; +import { Brackets, Repository } from 'typeorm'; +import { ApplicationDecisionComponent } from '../../../alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.entity'; +import { ApplicationDecision } from '../../../alcs/application-decision/application-decision.entity'; +import { formatStringToPostgresSearchStringArrayWithWildCard } from '../../../utils/search-helper'; +import { ApplicationOwner } from '../../application-submission/application-owner/application-owner.entity'; +import { ApplicationParcel } from '../../application-submission/application-parcel/application-parcel.entity'; +import { AdvancedSearchResultDto, InboxRequestDto } from '../inbox.dto'; +import { InboxApplicationSubmissionView } from './inbox-application-view.entity'; + +@Injectable() +export class InboxApplicationService { + constructor( + @InjectRepository(InboxApplicationSubmissionView) + private applicationInboxRepository: Repository<InboxApplicationSubmissionView>, + ) {} + + async searchApplications( + searchDto: InboxRequestDto, + userUuid: string, + bceidBusinessGuid: string | null, + governmentUuid: string | null, + ): Promise<AdvancedSearchResultDto<InboxApplicationSubmissionView[]>> { + let query = await this.compileApplicationSearchQuery( + searchDto, + userUuid, + bceidBusinessGuid, + governmentUuid, + ); + query = this.compileApplicationGroupBySearchQuery(query); + + const sortQuery = this.compileSortQuery(searchDto); + + query = query + .orderBy(sortQuery, searchDto.sortDirection) + .offset((searchDto.page - 1) * searchDto.pageSize) + .limit(searchDto.pageSize); + + const result = await query.getManyAndCount(); + + return { + data: result[0], + total: result[1], + }; + } + + private compileSortQuery(searchDto: InboxRequestDto) { + switch (searchDto.sortField) { + case 'fileId': + return '"appSearch"."file_number"'; + + case 'ownerName': + return '"appSearch"."applicant"'; + + case 'type': + return '"appSearch"."application_type_code"'; + + case 'portalStatus': + return `"appSearch"."status" ->> 'label' `; + + default: + case 'lastUpdate': + return '"appSearch"."last_update"'; + } + } + + private compileApplicationGroupBySearchQuery(query) { + query = query + .innerJoinAndMapOne( + 'appSearch.applicationType', + 'appSearch.applicationType', + 'applicationType', + ) + .groupBy( + ` + "appSearch"."uuid" + , "appSearch"."application_uuid" + , "appSearch"."file_number" + , "appSearch"."applicant" + , "appSearch"."local_government_uuid" + , "appSearch"."application_type_code" + , "appSearch"."local_government_file_number" + , "appSearch"."status" + , "appSearch"."created_at" + , "appSearch"."last_update" + , "appSearch"."created_by_uuid" + , "appSearch"."bceid_business_guid" + , "applicationType"."audit_deleted_date_at" + , "applicationType"."audit_created_at" + , "applicationType"."audit_updated_by" + , "applicationType"."audit_updated_at" + , "applicationType"."audit_created_by" + , "applicationType"."short_label" + , "applicationType"."label" + , "applicationType"."code" + , "applicationType"."background_color" + , "applicationType"."text_color" + , "applicationType"."html_description" + , "applicationType"."portal_label" + `, + ); + return query; + } + + private async compileApplicationSearchQuery( + searchDto: InboxRequestDto, + userUuid: string, + bceidBusinessGuid: string | null, + governmentUuid: string | null, + ) { + const query = + this.applicationInboxRepository.createQueryBuilder('appSearch'); + + //User Permissions + query.andWhere( + '(appSearch.created_by_uuid = :userUuid OR appSearch.bceid_business_guid = :bceidBusinessGuid OR appSearch.local_government_uuid = :governmentUuid)', + { + userUuid, + bceidBusinessGuid: bceidBusinessGuid ?? 'NEVER', + governmentUuid: governmentUuid ?? 'NEVER', + }, + ); + + if (searchDto.fileNumber) { + query + .andWhere('appSearch.file_number = :fileNumber') + .andWhere('appSearch.created_by_uuid = :userUuid') + .setParameters({ fileNumber: searchDto.fileNumber ?? null, userUuid }); + } + + if (searchDto.portalStatusCodes && searchDto.portalStatusCodes.length > 0) { + query.andWhere( + "alcs.get_current_status_for_application_submission_by_uuid(appSearch.uuid) ->> 'status_type_code' IN(:...statuses)", + { + statuses: searchDto.portalStatusCodes, + }, + ); + } + + if (searchDto.governmentFileNumber) { + query + .andWhere( + 'appSearch.local_government_file_number = :governmentFileNumber', + ) + .setParameters({ + governmentFileNumber: searchDto.governmentFileNumber, + }); + } + + this.compileSearchByNameQuery(searchDto, query); + this.compileParcelSearchQuery(searchDto, query); + this.compileFileTypeSearchQuery(searchDto, query); + + return query; + } + + private joinApplicationDecision(query: any) { + query = query.leftJoin( + ApplicationDecision, + 'decision', + 'decision.application_uuid = "appSearch"."application_uuid"', + ); + return query; + } + + private compileParcelSearchQuery(searchDto: InboxRequestDto, query) { + if (searchDto.pid || searchDto.civicAddress) { + query = query.leftJoin( + ApplicationParcel, + 'parcel', + "parcel.application_submission_uuid = appSearch.uuid AND parcel.parcel_type IN ('application', 'other')", + ); + } else { + query = query.leftJoin( + ApplicationParcel, + 'parcel', + "parcel.application_submission_uuid = appSearch.uuid AND parcel.parcel_type = 'application'", + ); + } + + if (searchDto.pid) { + query = query.andWhere('parcel.pid = :pid', { pid: searchDto.pid }); + } + + if (searchDto.civicAddress) { + query = query.andWhere('parcel.civic_address like :civic_address', { + civic_address: `%${searchDto.civicAddress}%`, + }); + } + return query; + } + + private compileSearchByNameQuery(searchDto: InboxRequestDto, query) { + if (searchDto.name) { + const formattedSearchString = + formatStringToPostgresSearchStringArrayWithWildCard(searchDto.name!); + + query = query + .leftJoin( + ApplicationOwner, + 'application_owner', + 'application_owner.application_submission_uuid = appSearch.uuid', + ) + .andWhere( + new Brackets((qb) => + qb + .where( + "LOWER(application_owner.first_name || ' ' || application_owner.last_name) LIKE ANY (:names)", + { + names: formattedSearchString, + }, + ) + .orWhere( + 'LOWER(application_owner.first_name) LIKE ANY (:names)', + { + names: formattedSearchString, + }, + ) + .orWhere('LOWER(application_owner.last_name) LIKE ANY (:names)', { + names: formattedSearchString, + }) + .orWhere( + 'LOWER(application_owner.organization_name) LIKE ANY (:names)', + { + names: formattedSearchString, + }, + ), + ), + ); + } + return query; + } + + private compileFileTypeSearchQuery(searchDto: InboxRequestDto, query) { + if (searchDto.fileTypes.length > 0) { + query = this.joinApplicationDecision(query); + + query = query.leftJoin( + ApplicationDecisionComponent, + 'decisionComponent', + 'decisionComponent.application_decision_uuid = decision.uuid', + ); + + query = query.andWhere( + new Brackets((qb) => + qb + .where('appSearch.application_type_code IN (:...typeCodes)', { + typeCodes: searchDto.fileTypes, + }) + .orWhere( + 'decisionComponent.application_decision_component_type_code IN (:...typeCodes)', + { + typeCodes: searchDto.fileTypes, + }, + ), + ), + ); + } + + return query; + } +} diff --git a/services/apps/alcs/src/portal/inbox/inbox.controller.spec.ts b/services/apps/alcs/src/portal/inbox/inbox.controller.spec.ts new file mode 100644 index 0000000000..9673c38697 --- /dev/null +++ b/services/apps/alcs/src/portal/inbox/inbox.controller.spec.ts @@ -0,0 +1,269 @@ +import { classes } from '@automapper/classes'; +import { AutomapperModule } from '@automapper/nestjs'; +import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; +import { Test, TestingModule } from '@nestjs/testing'; +import { ClsService } from 'nestjs-cls'; +import { mockKeyCloakProviders } from '../../../test/mocks/mockTypes'; +import { ApplicationSubmissionStatusService } from '../../alcs/application/application-submission-status/application-submission-status.service'; +import { NoticeOfIntentSubmissionStatusService } from '../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service'; +import { NotificationSubmissionStatusService } from '../../alcs/notification/notification-submission-status/notification-submission-status.service'; +import { User } from '../../user/user.entity'; +import { UserService } from '../../user/user.service'; +import { InboxApplicationService } from './application/inbox-application.service'; +import { InboxNoticeOfIntentService } from './notice-of-intent/inbox-notice-of-intent.service'; +import { InboxNotificationService } from './notification/inbox-notification.service'; +import { InboxController } from './inbox.controller'; +import { InboxRequestDto } from './inbox.dto'; + +describe('InboxController', () => { + let controller: InboxController; + let mockNOIPublicSearchService: DeepMocked<InboxNoticeOfIntentService>; + let mockAppPublicSearchService: DeepMocked<InboxApplicationService>; + let mockNotiPublicSearchService: DeepMocked<InboxNotificationService>; + let mockAppSubStatusService: DeepMocked<ApplicationSubmissionStatusService>; + let mockNoiSubStatusService: DeepMocked<NoticeOfIntentSubmissionStatusService>; + let mockNotiSubStatusService: DeepMocked<NotificationSubmissionStatusService>; + let mockUserService: DeepMocked<UserService>; + + let mockRequest; + const mockUserId = 'fake-user-uuid'; + + beforeEach(async () => { + mockNOIPublicSearchService = createMock(); + mockAppPublicSearchService = createMock(); + mockNotiPublicSearchService = createMock(); + mockAppSubStatusService = createMock(); + mockNoiSubStatusService = createMock(); + mockNotiSubStatusService = createMock(); + mockUserService = createMock(); + + const module: TestingModule = await Test.createTestingModule({ + imports: [ + AutomapperModule.forRoot({ + strategyInitializer: classes(), + }), + ], + providers: [ + { + provide: InboxNoticeOfIntentService, + useValue: mockNOIPublicSearchService, + }, + { + provide: InboxApplicationService, + useValue: mockAppPublicSearchService, + }, + { + provide: InboxNotificationService, + useValue: mockNotiPublicSearchService, + }, + { + provide: ApplicationSubmissionStatusService, + useValue: mockAppSubStatusService, + }, + { + provide: NoticeOfIntentSubmissionStatusService, + useValue: mockNoiSubStatusService, + }, + { + provide: NotificationSubmissionStatusService, + useValue: mockNotiSubStatusService, + }, + { + provide: ClsService, + useValue: {}, + }, + ...mockKeyCloakProviders, + { + provide: UserService, + useValue: mockUserService, + }, + ], + controllers: [InboxController], + }).compile(); + + controller = module.get<InboxController>(InboxController); + + mockUserService.getUserLocalGovernment.mockResolvedValue(null); + + mockNOIPublicSearchService.searchNoticeOfIntents.mockResolvedValue({ + data: [], + total: 0, + }); + + mockAppPublicSearchService.searchApplications.mockResolvedValue({ + data: [], + total: 0, + }); + + mockNotiPublicSearchService.search.mockResolvedValue({ + data: [], + total: 0, + }); + + mockRequest = { + user: { + entity: new User({ + uuid: mockUserId, + bceidBusinessGuid: null, + }), + }, + }; + }); + + it('should be defined', () => { + expect(controller).toBeDefined(); + }); + + it('should call search to retrieve Applications, NOIs, Notifications', async () => { + const mockSearchRequestDto: InboxRequestDto = { + pageSize: 1, + page: 1, + sortField: '1', + sortDirection: 'ASC', + name: 'test', + fileTypes: [], + }; + + const result = await controller.search(mockSearchRequestDto, mockRequest); + + expect(mockAppPublicSearchService.searchApplications).toBeCalledTimes(1); + expect(mockAppPublicSearchService.searchApplications).toBeCalledWith( + mockSearchRequestDto, + mockUserId, + null, + null, + ); + expect(result.applications).toBeDefined(); + expect(result.totalApplications).toBe(0); + + expect(mockNOIPublicSearchService.searchNoticeOfIntents).toBeCalledTimes(1); + expect(mockNOIPublicSearchService.searchNoticeOfIntents).toBeCalledWith( + mockSearchRequestDto, + mockUserId, + null, + null, + ); + expect(result.noticeOfIntents).toBeDefined(); + expect(result.totalNoticeOfIntents).toBe(0); + }); + + it('should call applications advanced search to retrieve Applications', async () => { + const mockSearchRequestDto: InboxRequestDto = { + pageSize: 1, + page: 1, + sortField: '1', + sortDirection: 'ASC', + fileTypes: [], + }; + + const result = await controller.searchApplications( + mockSearchRequestDto, + mockRequest, + ); + + expect(mockAppPublicSearchService.searchApplications).toBeCalledTimes(1); + expect(mockAppPublicSearchService.searchApplications).toBeCalledWith( + mockSearchRequestDto, + mockUserId, + null, + null, + ); + expect(result.data).toBeDefined(); + expect(result.total).toBe(0); + }); + + it('should call NOI advanced search to retrieve NOIs', async () => { + const mockSearchRequestDto: InboxRequestDto = { + pageSize: 1, + page: 1, + sortField: '1', + sortDirection: 'ASC', + fileTypes: [], + }; + + const result = await controller.searchNoticeOfIntents( + mockSearchRequestDto, + mockRequest, + ); + + expect(mockNOIPublicSearchService.searchNoticeOfIntents).toBeCalledTimes(1); + expect(mockNOIPublicSearchService.searchNoticeOfIntents).toBeCalledWith( + mockSearchRequestDto, + mockUserId, + null, + null, + ); + expect(result.data).toBeDefined(); + expect(result.total).toBe(0); + }); + + it('should call search to retrieve Applications only when application file type selected', async () => { + const mockSearchRequestDto: InboxRequestDto = { + pageSize: 1, + page: 1, + sortField: '1', + sortDirection: 'ASC', + fileTypes: ['NFUP'], + }; + + const result = await controller.search(mockSearchRequestDto, mockRequest); + + expect(mockAppPublicSearchService.searchApplications).toBeCalledTimes(1); + expect(mockAppPublicSearchService.searchApplications).toBeCalledWith( + mockSearchRequestDto, + mockUserId, + null, + null, + ); + expect(result.applications).toBeDefined(); + expect(result.totalApplications).toBe(0); + }); + + it('should call search to retrieve NOIs only when NOI file type selected', async () => { + const mockSearchRequestDto: InboxRequestDto = { + pageSize: 1, + page: 1, + sortField: '1', + sortDirection: 'ASC', + fileTypes: ['NOI'], + }; + + const result = await controller.search(mockSearchRequestDto, mockRequest); + + expect(mockNOIPublicSearchService.searchNoticeOfIntents).toBeCalledTimes(1); + expect(mockNOIPublicSearchService.searchNoticeOfIntents).toBeCalledWith( + mockSearchRequestDto, + mockUserId, + null, + null, + ); + expect(result.noticeOfIntents).toBeDefined(); + expect(result.totalNoticeOfIntents).toBe(0); + }); + + it('should NOT call NOI search to retrieve if file type app specified', async () => { + const mockSearchRequestDto: InboxRequestDto = { + pageSize: 1, + page: 1, + sortField: '1', + sortDirection: 'ASC', + fileTypes: ['NFUP'], + }; + + const result = await controller.search(mockSearchRequestDto, mockRequest); + + expect(mockAppPublicSearchService.searchApplications).toBeCalledTimes(1); + expect(mockAppPublicSearchService.searchApplications).toBeCalledWith( + mockSearchRequestDto, + mockUserId, + null, + null, + ); + expect(result.applications).toBeDefined(); + expect(result.totalApplications).toBe(0); + + expect(mockNOIPublicSearchService.searchNoticeOfIntents).toBeCalledTimes(0); + expect(result.noticeOfIntents).toBeDefined(); + expect(result.totalNoticeOfIntents).toBe(0); + }); +}); diff --git a/services/apps/alcs/src/portal/inbox/inbox.controller.ts b/services/apps/alcs/src/portal/inbox/inbox.controller.ts new file mode 100644 index 0000000000..ff5c55b4a0 --- /dev/null +++ b/services/apps/alcs/src/portal/inbox/inbox.controller.ts @@ -0,0 +1,337 @@ +import { Mapper } from '@automapper/core'; +import { InjectMapper } from '@automapper/nestjs'; +import { Body, Controller, Get, Post, Req, UseGuards } from '@nestjs/common'; +import { ApplicationSubmissionStatusService } from '../../alcs/application/application-submission-status/application-submission-status.service'; +import { ApplicationSubmissionStatusType } from '../../alcs/application/application-submission-status/submission-status-type.entity'; +import { ApplicationStatusDto } from '../../alcs/application/application-submission-status/submission-status.dto'; +import { NoticeOfIntentSubmissionStatusType } from '../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status-type.entity'; +import { NoticeOfIntentStatusDto } from '../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status.dto'; +import { NoticeOfIntentSubmissionStatusService } from '../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service'; +import { NotificationSubmissionStatusType } from '../../alcs/notification/notification-submission-status/notification-status-type.entity'; +import { NotificationStatusDto } from '../../alcs/notification/notification-submission-status/notification-status.dto'; +import { NotificationSubmissionStatusService } from '../../alcs/notification/notification-submission-status/notification-submission-status.service'; +import { PortalAuthGuard } from '../../common/authorization/portal-auth-guard.service'; +import { User } from '../../user/user.entity'; +import { UserService } from '../../user/user.service'; +import { isStringSetAndNotEmpty } from '../../utils/string-helper'; +import { APPLICATION_SUBMISSION_TYPES } from '../pdf-generation/generate-submission-document.service'; +import { InboxApplicationSubmissionView } from './application/inbox-application-view.entity'; +import { InboxApplicationService } from './application/inbox-application.service'; +import { + AdvancedSearchResultDto, + ApplicationInboxResultDto, + InboxRequestDto, + InboxResponseDto, + NoticeOfIntentInboxResultDto, + NotificationInboxResultDto, +} from './inbox.dto'; +import { InboxNoticeOfIntentSubmissionView } from './notice-of-intent/inbox-notice-of-intent-view.entity'; +import { InboxNoticeOfIntentService } from './notice-of-intent/inbox-notice-of-intent.service'; +import { InboxNotificationSubmissionView } from './notification/inbox-notification-view.entity'; +import { InboxNotificationService } from './notification/inbox-notification.service'; + +@Controller('inbox') +@UseGuards(PortalAuthGuard) +export class InboxController { + constructor( + @InjectMapper() private mapper: Mapper, + private noticeOfIntentSearchService: InboxNoticeOfIntentService, + private applicationSearchService: InboxApplicationService, + private notificationSearchService: InboxNotificationService, + private applicationSubmissionStatusService: ApplicationSubmissionStatusService, + private noiSubStatusService: NoticeOfIntentSubmissionStatusService, + private notiSubStatusService: NotificationSubmissionStatusService, + private userService: UserService, + ) {} + + @Get('/') + async getStatuses() { + const appStatuses = + await this.applicationSubmissionStatusService.listStatuses(); + const noiStatuses = await this.noiSubStatusService.listStatuses(); + const notificationStatuses = await this.notiSubStatusService.listStatuses(); + + return { + application: this.mapper.mapArray( + appStatuses, + ApplicationSubmissionStatusType, + ApplicationStatusDto, + ), + noticeOfIntent: this.mapper.mapArray( + noiStatuses, + NoticeOfIntentSubmissionStatusType, + NoticeOfIntentStatusDto, + ), + notification: this.mapper.mapArray( + notificationStatuses, + NotificationSubmissionStatusType, + NotificationStatusDto, + ), + }; + } + + @Post('/') + async search(@Body() searchDto: InboxRequestDto, @Req() req) { + const user = req.user.entity as User; + const userId = user.uuid; + const businessGuid = user.bceidBusinessGuid; + const government = await this.userService.getUserLocalGovernment(user); + + const { searchApplications, searchNoi, searchNotifications } = + this.getEntitiesTypeToSearch(searchDto); + + let applicationSearchResult: AdvancedSearchResultDto< + InboxApplicationSubmissionView[] + > | null = null; + if (searchApplications) { + applicationSearchResult = + await this.applicationSearchService.searchApplications( + searchDto, + userId, + businessGuid, + government?.uuid ?? null, + ); + } + + let noticeOfIntentResults: AdvancedSearchResultDto< + InboxNoticeOfIntentSubmissionView[] + > | null = null; + if (searchNoi) { + noticeOfIntentResults = + await this.noticeOfIntentSearchService.searchNoticeOfIntents( + searchDto, + userId, + businessGuid, + government?.uuid ?? null, + ); + } + + let notifications: AdvancedSearchResultDto< + InboxNotificationSubmissionView[] + > | null = null; + if (searchNotifications) { + notifications = await this.notificationSearchService.search( + searchDto, + userId, + businessGuid, + government?.uuid ?? null, + ); + } + + return this.mapSearchResults( + applicationSearchResult, + noticeOfIntentResults, + notifications, + ); + } + + @Post('/application') + async searchApplications( + @Body() searchDto: InboxRequestDto, + @Req() req, + ): Promise<AdvancedSearchResultDto<ApplicationInboxResultDto[]>> { + const user = req.user.entity as User; + const userId = user.uuid; + const businessGuid = user.bceidBusinessGuid; + const government = await this.userService.getUserLocalGovernment(user); + + const applications = await this.applicationSearchService.searchApplications( + searchDto, + userId, + businessGuid, + government?.uuid ?? null, + ); + + const mappedSearchResult = this.mapSearchResults(applications, null, null); + + return { + total: mappedSearchResult.totalApplications, + data: mappedSearchResult.applications, + }; + } + + @Post('/notice-of-intent') + async searchNoticeOfIntents( + @Body() searchDto: InboxRequestDto, + @Req() req, + ): Promise<AdvancedSearchResultDto<NoticeOfIntentInboxResultDto[]>> { + const user = req.user.entity as User; + const userId = user.uuid; + const businessGuid = user.bceidBusinessGuid; + const government = await this.userService.getUserLocalGovernment(user); + + const noticeOfIntents = + await this.noticeOfIntentSearchService.searchNoticeOfIntents( + searchDto, + userId, + businessGuid, + government?.uuid ?? null, + ); + + const mappedSearchResult = this.mapSearchResults( + null, + noticeOfIntents, + null, + ); + + return { + total: mappedSearchResult.totalNoticeOfIntents, + data: mappedSearchResult.noticeOfIntents, + }; + } + + @Post('/notifications') + async searchNotifications( + @Body() searchDto: InboxRequestDto, + @Req() req, + ): Promise<AdvancedSearchResultDto<NotificationInboxResultDto[]>> { + const user = req.user.entity as User; + const userId = user.uuid; + const businessGuid = user.bceidBusinessGuid; + const government = await this.userService.getUserLocalGovernment(user); + + const notifications = await this.notificationSearchService.search( + searchDto, + userId, + businessGuid, + government?.uuid ?? null, + ); + + const mappedSearchResult = this.mapSearchResults(null, null, notifications); + + return { + total: mappedSearchResult.totalNotifications, + data: mappedSearchResult.notifications, + }; + } + + private getEntitiesTypeToSearch(searchDto: InboxRequestDto) { + let searchApplications = true; + let noiTypeSpecified = false; + let notificationTypeSpecified = false; + + if (searchDto.fileTypes.length > 0) { + searchApplications = + searchDto.fileTypes.filter((searchType) => + Object.values(APPLICATION_SUBMISSION_TYPES).includes( + APPLICATION_SUBMISSION_TYPES[ + searchType as keyof typeof APPLICATION_SUBMISSION_TYPES + ], + ), + ).length > 0; + + noiTypeSpecified = searchDto.fileTypes.includes('NOI'); + notificationTypeSpecified = searchDto.fileTypes.includes('SRW'); + } + + const searchNoi = + (searchDto.fileTypes.length > 0 ? noiTypeSpecified : true) && + !isStringSetAndNotEmpty(searchDto.governmentFileNumber); + + const searchNotifications = + (searchDto.fileTypes.length > 0 ? notificationTypeSpecified : true) && + !isStringSetAndNotEmpty(searchDto.civicAddress) && + !isStringSetAndNotEmpty(searchDto.governmentFileNumber); + + return { + searchApplications, + searchNoi, + searchNotifications, + }; + } + + private mapSearchResults( + applications: AdvancedSearchResultDto< + InboxApplicationSubmissionView[] + > | null, + noticeOfIntents: AdvancedSearchResultDto< + InboxNoticeOfIntentSubmissionView[] + > | null, + notifications: AdvancedSearchResultDto< + InboxNotificationSubmissionView[] + > | null, + ) { + const response = new InboxResponseDto(); + + const mappedApplications: ApplicationInboxResultDto[] = []; + if (applications && applications.data.length > 0) { + mappedApplications.push( + ...applications.data.map((app) => + this.mapApplicationToSearchResult(app), + ), + ); + } + + const mappedNoticeOfIntents: NoticeOfIntentInboxResultDto[] = []; + if (noticeOfIntents && noticeOfIntents.data.length > 0) { + mappedNoticeOfIntents.push( + ...noticeOfIntents.data.map((noi) => + this.mapNoticeOfIntentToSearchResult(noi), + ), + ); + } + + const mappedNotifications: NotificationInboxResultDto[] = []; + if (notifications && notifications.data && notifications.data.length > 0) { + mappedNotifications.push( + ...notifications.data.map((notification) => + this.mapNotificationToSearchResult(notification), + ), + ); + } + + response.applications = mappedApplications; + response.totalApplications = applications?.total ?? 0; + response.noticeOfIntents = mappedNoticeOfIntents; + response.totalNoticeOfIntents = noticeOfIntents?.total ?? 0; + response.notifications = mappedNotifications; + response.totalNotifications = notifications?.total ?? 0; + + return response; + } + + private mapApplicationToSearchResult( + application: InboxApplicationSubmissionView, + ): ApplicationInboxResultDto { + return { + referenceId: application.fileNumber, + fileNumber: application.fileNumber, + type: application.applicationType.label, + createdAt: application.createdAt.getTime(), + lastUpdate: application.lastUpdate?.getTime(), + ownerName: application.applicant, + class: 'APP', + status: application.status.status_type_code, + }; + } + + private mapNoticeOfIntentToSearchResult( + noi: InboxNoticeOfIntentSubmissionView, + ): NoticeOfIntentInboxResultDto { + return { + referenceId: noi.fileNumber, + fileNumber: noi.fileNumber, + createdAt: noi.createdAt.getTime(), + lastUpdate: noi.lastUpdate?.getTime(), + type: noi.noticeOfIntentType.label, + ownerName: noi.applicant, + class: 'NOI', + status: noi.status.status_type_code, + }; + } + + private mapNotificationToSearchResult( + notification: InboxNotificationSubmissionView, + ): NotificationInboxResultDto { + return { + referenceId: notification.fileNumber, + fileNumber: notification.fileNumber, + createdAt: notification.createdAt.getTime(), + lastUpdate: notification.status.effective_date, + type: notification.notificationType.label, + ownerName: notification.applicant, + class: 'NOTI', + status: notification.status.status_type_code, + }; + } +} diff --git a/services/apps/alcs/src/portal/inbox/inbox.dto.ts b/services/apps/alcs/src/portal/inbox/inbox.dto.ts new file mode 100644 index 0000000000..b654017011 --- /dev/null +++ b/services/apps/alcs/src/portal/inbox/inbox.dto.ts @@ -0,0 +1,82 @@ +import { IsArray, IsOptional, IsString, MinLength } from 'class-validator'; +import { PagingRequestDto } from '../public/search/public-search.dto'; + +export type SearchEntityClass = 'APP' | 'NOI' | 'NOTI'; + +export class BaseInboxResultDto { + type: string; + referenceId: string; + ownerName?: string; + localGovernmentName?: string; + fileNumber: string; + status: string; + createdAt?: number; + lastUpdate?: number; + class: SearchEntityClass; +} + +export class ApplicationInboxResultDto extends BaseInboxResultDto {} +export class NoticeOfIntentInboxResultDto extends BaseInboxResultDto {} +export class NotificationInboxResultDto extends BaseInboxResultDto {} + +export class InboxResponseDto { + applications: ApplicationInboxResultDto[]; + noticeOfIntents: NoticeOfIntentInboxResultDto[]; + notifications: NotificationInboxResultDto[]; + totalApplications: number; + totalNoticeOfIntents: number; + totalNotifications: number; +} + +export class AdvancedSearchResultDto<T> { + data: T; + total: number; +} + +export class InboxRequestDto extends PagingRequestDto { + @IsString() + @IsOptional() + fileNumber?: string; + + @IsString() + @IsOptional() + createdByGovernment?: boolean; + + @IsString() + @IsOptional() + submittedToGovernment?: boolean; + + @IsString() + @IsOptional() + governmentFileNumber?: string; + + @IsString() + @IsOptional() + @MinLength(3) + name?: string; + + @IsString() + @IsOptional() + @MinLength(9) + pid?: string; + + @IsString() + @IsOptional() + @MinLength(3) + civicAddress?: string; + + @IsArray() + @IsOptional() + portalStatusCodes?: string[]; + + @IsArray() + fileTypes: string[]; +} + +// typeorm does not transform property names for the status +export class LinkedStatusType { + submission_uuid: string; + status_type_code: string; + effective_date: number; + label: string; +} diff --git a/services/apps/alcs/src/portal/inbox/inbox.module.ts b/services/apps/alcs/src/portal/inbox/inbox.module.ts new file mode 100644 index 0000000000..d65cff0304 --- /dev/null +++ b/services/apps/alcs/src/portal/inbox/inbox.module.ts @@ -0,0 +1,34 @@ +import { Module } from '@nestjs/common'; +import { TypeOrmModule } from '@nestjs/typeorm'; +import { ApplicationSubmissionStatusModule } from '../../alcs/application/application-submission-status/application-submission-status.module'; +import { LocalGovernment } from '../../alcs/local-government/local-government.entity'; +import { NoticeOfIntentSubmissionStatusModule } from '../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.module'; +import { NotificationSubmissionStatusModule } from '../../alcs/notification/notification-submission-status/notification-submission-status.module'; +import { InboxApplicationSubmissionView } from './application/inbox-application-view.entity'; +import { InboxApplicationService } from './application/inbox-application.service'; +import { InboxController } from './inbox.controller'; +import { InboxNoticeOfIntentSubmissionView } from './notice-of-intent/inbox-notice-of-intent-view.entity'; +import { InboxNoticeOfIntentService } from './notice-of-intent/inbox-notice-of-intent.service'; +import { InboxNotificationSubmissionView } from './notification/inbox-notification-view.entity'; +import { InboxNotificationService } from './notification/inbox-notification.service'; + +@Module({ + imports: [ + TypeOrmModule.forFeature([ + InboxApplicationSubmissionView, + InboxNoticeOfIntentSubmissionView, + InboxNotificationSubmissionView, + LocalGovernment, + ]), + ApplicationSubmissionStatusModule, + NoticeOfIntentSubmissionStatusModule, + NotificationSubmissionStatusModule, + ], + providers: [ + InboxApplicationService, + InboxNoticeOfIntentService, + InboxNotificationService, + ], + controllers: [InboxController], +}) +export class InboxModule {} diff --git a/services/apps/alcs/src/portal/inbox/notice-of-intent/inbox-notice-of-intent-view.entity.ts b/services/apps/alcs/src/portal/inbox/notice-of-intent/inbox-notice-of-intent-view.entity.ts new file mode 100644 index 0000000000..b1c828b46f --- /dev/null +++ b/services/apps/alcs/src/portal/inbox/notice-of-intent/inbox-notice-of-intent-view.entity.ts @@ -0,0 +1,112 @@ +import { + DataSource, + JoinColumn, + ManyToOne, + PrimaryColumn, + ViewColumn, + ViewEntity, +} from 'typeorm'; +import { LocalGovernment } from '../../../alcs/local-government/local-government.entity'; +import { NoticeOfIntentDecision } from '../../../alcs/notice-of-intent-decision/notice-of-intent-decision.entity'; +import { NoticeOfIntentSubmissionToSubmissionStatus } from '../../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status.entity'; +import { NoticeOfIntentType } from '../../../alcs/notice-of-intent/notice-of-intent-type/notice-of-intent-type.entity'; +import { NoticeOfIntent } from '../../../alcs/notice-of-intent/notice-of-intent.entity'; +import { NoticeOfIntentSubmission } from '../../notice-of-intent-submission/notice-of-intent-submission.entity'; +import { LinkedStatusType } from '../inbox.dto'; + +@ViewEntity({ + expression: (datasource: DataSource) => + datasource + .createQueryBuilder() + .select('noi_sub.uuid', 'uuid') + .addSelect('noi_sub.file_number', 'file_number') + .addSelect('noi_sub.applicant', 'applicant') + .addSelect('noi_sub.audit_created_at', 'created_at') + .addSelect('noi_sub.created_by_uuid', 'created_by_uuid') + .addSelect('noi_sub.local_government_uuid', 'local_government_uuid') + .addSelect('localGovernment.bceid_business_guid', 'bceid_business_guid') + .addSelect('noi_sub.type_code', 'notice_of_intent_type_code') + .addSelect('noi.uuid', 'notice_of_intent_uuid') + .addSelect( + 'GREATEST(status_link.effective_date, decision_date.date)', + 'last_update', + ) + .addSelect( + 'alcs.get_current_status_for_notice_of_intent_submission_by_uuid(noi_sub.uuid)', + 'status', + ) + .from(NoticeOfIntentSubmission, 'noi_sub') + .innerJoin(NoticeOfIntent, 'noi', 'noi.file_number = noi_sub.file_number') + .innerJoinAndSelect( + NoticeOfIntentType, + 'noticeOfIntentType', + 'noi_sub.type_code = noticeOfIntentType.code', + ) + .leftJoin( + LocalGovernment, + 'localGovernment', + 'noi_sub.local_government_uuid = localGovernment.uuid', + ) + .leftJoin( + (qb) => + qb + .from(NoticeOfIntentSubmissionToSubmissionStatus, 'status_link') + .select('MAX("effective_date")', 'effective_date') + .addSelect('submission_uuid', 'submission_uuid') + .groupBy('submission_uuid'), + 'status_link', + 'status_link."submission_uuid" = noi_sub.uuid', + ) + .leftJoin( + (qb) => + qb + .from(NoticeOfIntentDecision, 'decision_date') + .select('MAX("date")', 'date') + .addSelect('notice_of_intent_uuid', 'notice_of_intent_uuid') + .groupBy('notice_of_intent_uuid'), + 'decision_date', + 'decision_date."notice_of_intent_uuid" = noi.uuid', + ) + .where('noi_sub.is_draft = FALSE'), +}) +export class InboxNoticeOfIntentSubmissionView { + @ViewColumn() + @PrimaryColumn() + uuid: string; + + @ViewColumn() + noticeOfIntentUuid: string; + + @ViewColumn() + createdAt: Date; + + @ViewColumn() + lastUpdate: Date; + + @ViewColumn() + fileNumber: string; + + @ViewColumn() + applicant?: string; + + @ViewColumn() + createdByUuid: string; + + @ViewColumn() + bceidBusinessGuid?: string; + + @ViewColumn() + localGovernmentUuid?: string; + + @ViewColumn() + noticeOfIntentTypeCode: string; + + @ViewColumn() + status: LinkedStatusType; + + @ManyToOne(() => NoticeOfIntentType, { + nullable: false, + }) + @JoinColumn({ name: 'notice_of_intent_type_code' }) + noticeOfIntentType: NoticeOfIntentType; +} diff --git a/services/apps/alcs/src/portal/inbox/notice-of-intent/inbox-notice-of-intent.service.spec.ts b/services/apps/alcs/src/portal/inbox/notice-of-intent/inbox-notice-of-intent.service.spec.ts new file mode 100644 index 0000000000..3fdcafddd5 --- /dev/null +++ b/services/apps/alcs/src/portal/inbox/notice-of-intent/inbox-notice-of-intent.service.spec.ts @@ -0,0 +1,108 @@ +import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; +import { Test, TestingModule } from '@nestjs/testing'; +import { getRepositoryToken } from '@nestjs/typeorm'; +import { Repository } from 'typeorm'; +import { InboxRequestDto } from '../inbox.dto'; +import { InboxNoticeOfIntentSubmissionView } from './inbox-notice-of-intent-view.entity'; +import { InboxNoticeOfIntentService } from './inbox-notice-of-intent.service'; + +describe('InboxNoticeOfIntentService', () => { + let service: InboxNoticeOfIntentService; + let mockNoticeOfIntentSubmissionSearchViewRepository: DeepMocked< + Repository<InboxNoticeOfIntentSubmissionView> + >; + + const mockSearchDto: InboxRequestDto = { + fileNumber: '123', + portalStatusCodes: ['A'], + governmentFileNumber: 'B', + name: 'D', + pid: 'E', + civicAddress: 'F', + fileTypes: ['type1', 'type2'], + page: 1, + pageSize: 10, + sortField: 'ownerName', + sortDirection: 'ASC', + }; + + let mockQuery: any = {}; + + beforeEach(async () => { + mockNoticeOfIntentSubmissionSearchViewRepository = createMock(); + + mockQuery = { + getManyAndCount: jest.fn().mockResolvedValue([[], 0]), + orderBy: jest.fn().mockReturnThis(), + offset: jest.fn().mockReturnThis(), + limit: jest.fn().mockReturnThis(), + innerJoinAndMapOne: jest.fn().mockReturnThis(), + groupBy: jest.fn().mockReturnThis(), + where: jest.fn().mockReturnThis(), + andWhere: jest.fn().mockReturnThis(), + setParameters: jest.fn().mockReturnThis(), + leftJoin: jest.fn().mockReturnThis(), + }; + + const module: TestingModule = await Test.createTestingModule({ + providers: [ + InboxNoticeOfIntentService, + { + provide: getRepositoryToken(InboxNoticeOfIntentSubmissionView), + useValue: mockNoticeOfIntentSubmissionSearchViewRepository, + }, + ], + }).compile(); + + service = module.get<InboxNoticeOfIntentService>( + InboxNoticeOfIntentService, + ); + }); + + it('should be defined', () => { + expect(service).toBeDefined(); + }); + + it('should successfully build a query using all search parameters defined', async () => { + mockNoticeOfIntentSubmissionSearchViewRepository.createQueryBuilder.mockReturnValue( + mockQuery as any, + ); + + const result = await service.searchNoticeOfIntents( + mockSearchDto, + '', + '', + '', + ); + + expect(result).toEqual({ data: [], total: 0 }); + expect( + mockNoticeOfIntentSubmissionSearchViewRepository.createQueryBuilder, + ).toBeCalledTimes(1); + expect(mockQuery.andWhere).toBeCalledTimes(6); + }); + + it('should call compileNoticeOfIntentSearchQuery method correctly', async () => { + const compileApplicationSearchQuerySpy = jest + .spyOn(service as any, 'compileNoticeOfIntentSearchQuery') + .mockResolvedValue(mockQuery); + + const result = await service.searchNoticeOfIntents( + mockSearchDto, + '', + '', + '', + ); + + expect(result).toEqual({ data: [], total: 0 }); + expect(compileApplicationSearchQuerySpy).toBeCalledWith( + mockSearchDto, + '', + '', + '', + ); + expect(mockQuery.orderBy).toHaveBeenCalledTimes(1); + expect(mockQuery.offset).toHaveBeenCalledTimes(1); + expect(mockQuery.limit).toHaveBeenCalledTimes(1); + }); +}); diff --git a/services/apps/alcs/src/portal/inbox/notice-of-intent/inbox-notice-of-intent.service.ts b/services/apps/alcs/src/portal/inbox/notice-of-intent/inbox-notice-of-intent.service.ts new file mode 100644 index 0000000000..196f39b395 --- /dev/null +++ b/services/apps/alcs/src/portal/inbox/notice-of-intent/inbox-notice-of-intent.service.ts @@ -0,0 +1,218 @@ +import { Injectable } from '@nestjs/common'; +import { InjectRepository } from '@nestjs/typeorm'; +import { Brackets, Repository } from 'typeorm'; +import { NoticeOfIntentDecision } from '../../../alcs/notice-of-intent-decision/notice-of-intent-decision.entity'; +import { formatStringToPostgresSearchStringArrayWithWildCard } from '../../../utils/search-helper'; +import { NoticeOfIntentOwner } from '../../notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.entity'; +import { NoticeOfIntentParcel } from '../../notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.entity'; +import { AdvancedSearchResultDto, InboxRequestDto } from '../inbox.dto'; +import { InboxNoticeOfIntentSubmissionView } from './inbox-notice-of-intent-view.entity'; + +@Injectable() +export class InboxNoticeOfIntentService { + constructor( + @InjectRepository(InboxNoticeOfIntentSubmissionView) + private noiSearchRepository: Repository<InboxNoticeOfIntentSubmissionView>, + ) {} + + async searchNoticeOfIntents( + searchDto: InboxRequestDto, + userUuid: string, + bceidBusinessGuid: string | null, + governmentUuid: string | null, + ): Promise<AdvancedSearchResultDto<InboxNoticeOfIntentSubmissionView[]>> { + const query = await this.compileNoticeOfIntentSearchQuery( + searchDto, + userUuid, + bceidBusinessGuid, + governmentUuid, + ); + + this.compileGroupBySearchQuery(query); + + const sortQuery = this.compileSortQuery(searchDto); + + query + .orderBy(sortQuery, searchDto.sortDirection) + .offset((searchDto.page - 1) * searchDto.pageSize) + .limit(searchDto.pageSize); + + const result = await query.getManyAndCount(); + + return { + data: result[0], + total: result[1], + }; + } + + private compileSortQuery(searchDto: InboxRequestDto) { + switch (searchDto.sortField) { + case 'fileId': + return '"noiSearch"."file_number"'; + + case 'ownerName': + return '"noiSearch"."applicant"'; + + case 'type': + return '"noiSearch"."notice_of_intent_type_code"'; + + case 'government': + return '"noiSearch"."local_government_name"'; + + case 'portalStatus': + return `"noiSearch"."status" ->> 'label' `; + + default: + case 'lastUpdate': + return '"noiSearch"."last_update"'; + } + } + + private compileGroupBySearchQuery(query) { + query = query + .innerJoinAndMapOne( + 'noiSearch.noticeOfIntentType', + 'noiSearch.noticeOfIntentType', + 'noticeOfIntentType', + ) + .groupBy( + ` + "noiSearch"."uuid" + , "noiSearch"."notice_of_intent_uuid" + , "noiSearch"."file_number" + , "noiSearch"."applicant" + , "noiSearch"."local_government_uuid" + , "noiSearch"."notice_of_intent_type_code" + , "noiSearch"."status" + , "noiSearch"."created_at" + , "noiSearch"."last_update" + , "noiSearch"."created_by_uuid" + , "noiSearch"."bceid_business_guid" + , "noticeOfIntentType"."audit_deleted_date_at" + , "noticeOfIntentType"."audit_created_at" + , "noticeOfIntentType"."audit_updated_by" + , "noticeOfIntentType"."audit_updated_at" + , "noticeOfIntentType"."audit_created_by" + , "noticeOfIntentType"."short_label" + , "noticeOfIntentType"."label" + , "noticeOfIntentType"."code" + , "noticeOfIntentType"."html_description" + , "noticeOfIntentType"."portal_label" + `, + ); + return query; + } + + private async compileNoticeOfIntentSearchQuery( + searchDto: InboxRequestDto, + userUuid: string, + bceidBusinessGuid: string | null, + governmentUuid: string | null, + ) { + const query = this.noiSearchRepository.createQueryBuilder('noiSearch'); + + //User Permissions + query.andWhere( + '(noiSearch.created_by_uuid = :userUuid OR noiSearch.bceid_business_guid = :bceidBusinessGuid OR noiSearch.local_government_uuid = :governmentUuid)', + { + userUuid, + bceidBusinessGuid: bceidBusinessGuid ?? 'NEVER', + governmentUuid: governmentUuid ?? 'NEVER', + }, + ); + + if (searchDto.fileNumber) { + query + .andWhere('noiSearch.file_number = :fileNumber') + .setParameters({ fileNumber: searchDto.fileNumber ?? null }); + } + + if (searchDto.portalStatusCodes && searchDto.portalStatusCodes.length > 0) { + query.andWhere( + "alcs.get_current_status_for_notice_of_intent_submission_by_uuid(noiSearch.uuid) ->> 'status_type_code' IN(:...statuses)", + { + statuses: searchDto.portalStatusCodes, + }, + ); + } + + this.compileSearchByNameQuery(searchDto, query); + this.compileParcelSearchQuery(searchDto, query); + + return query; + } + + private joinDecision(query: any) { + query = query.leftJoin( + NoticeOfIntentDecision, + 'decision', + 'decision.notice_of_intent_uuid = "noiSearch"."notice_of_intent_uuid"', + ); + return query; + } + + private compileParcelSearchQuery(searchDto: InboxRequestDto, query) { + if (searchDto.pid || searchDto.civicAddress) { + query = query.leftJoin( + NoticeOfIntentParcel, + 'parcel', + 'parcel.notice_of_intent_submission_uuid = noiSearch.uuid', + ); + } + + if (searchDto.pid) { + query = query.andWhere('parcel.pid = :pid', { pid: searchDto.pid }); + } + + if (searchDto.civicAddress) { + query = query.andWhere('parcel.civic_address like :civic_address', { + civic_address: `%${searchDto.civicAddress}%`, + }); + } + return query; + } + + private compileSearchByNameQuery(searchDto: InboxRequestDto, query) { + if (searchDto.name) { + const formattedSearchString = + formatStringToPostgresSearchStringArrayWithWildCard(searchDto.name!); + + query = query + .leftJoin( + NoticeOfIntentOwner, + 'notice_of_intent_owner', + 'notice_of_intent_owner.notice_of_intent_submission_uuid = noiSearch.uuid', + ) + .andWhere( + new Brackets((qb) => + qb + .where( + "LOWER(notice_of_intent_owner.first_name || ' ' || notice_of_intent_owner.last_name) LIKE ANY (:names)", + { + names: formattedSearchString, + }, + ) + .orWhere( + 'LOWER(notice_of_intent_owner.first_name) LIKE ANY (:names)', + { + names: formattedSearchString, + }, + ) + .orWhere( + 'LOWER(notice_of_intent_owner.last_name) LIKE ANY (:names)', + { + names: formattedSearchString, + }, + ) + .orWhere( + 'LOWER(notice_of_intent_owner.organization_name) LIKE ANY (:names)', + { + names: formattedSearchString, + }, + ), + ), + ); + } + return query; + } +} diff --git a/services/apps/alcs/src/portal/inbox/notification/inbox-notification-view.entity.ts b/services/apps/alcs/src/portal/inbox/notification/inbox-notification-view.entity.ts new file mode 100644 index 0000000000..be539981bf --- /dev/null +++ b/services/apps/alcs/src/portal/inbox/notification/inbox-notification-view.entity.ts @@ -0,0 +1,87 @@ +import { + DataSource, + JoinColumn, + ManyToOne, + PrimaryColumn, + ViewColumn, + ViewEntity, +} from 'typeorm'; +import { LocalGovernment } from '../../../alcs/local-government/local-government.entity'; +import { NotificationType } from '../../../alcs/notification/notification-type/notification-type.entity'; +import { Notification } from '../../../alcs/notification/notification.entity'; +import { NotificationSubmission } from '../../notification-submission/notification-submission.entity'; +import { LinkedStatusType } from '../inbox.dto'; + +@ViewEntity({ + expression: (datasource: DataSource) => + datasource + .createQueryBuilder() + .select('noti_sub.uuid', 'uuid') + .addSelect('noti_sub.file_number', 'file_number') + .addSelect('noti_sub.applicant', 'applicant') + .addSelect('noti_sub.audit_created_at', 'created_at') + .addSelect('noti_sub.created_by_uuid', 'created_by_uuid') + .addSelect('noti_sub.local_government_uuid', 'local_government_uuid') + .addSelect('localGovernment.bceid_business_guid', 'bceid_business_guid') + .addSelect('noti.type_code', 'notification_type_code') + .addSelect('noti.date_submitted_to_alc', 'date_submitted_to_alc') + .addSelect('noti.uuid', 'notification_uuid') + .addSelect( + 'alcs.get_current_status_for_notification_submission_by_uuid(noti_sub.uuid)', + 'status', + ) + .from(NotificationSubmission, 'noti_sub') + .innerJoin( + Notification, + 'noti', + 'noti.file_number = noti_sub.file_number', + ) + .innerJoinAndSelect( + NotificationType, + 'notificationType', + 'noti_sub.type_code = notificationType.code', + ) + .leftJoin( + LocalGovernment, + 'localGovernment', + 'noti.local_government_uuid = localGovernment.uuid', + ), +}) +export class InboxNotificationSubmissionView { + @ViewColumn() + @PrimaryColumn() + uuid: string; + + @ViewColumn() + notificationUuid: string; + + @ViewColumn() + fileNumber: string; + + @ViewColumn() + applicant?: string; + + @ViewColumn() + createdAt: Date; + + @ViewColumn() + createdByUuid: string; + + @ViewColumn() + bceidBusinessGuid?: string; + + @ViewColumn() + localGovernmentUuid?: string; + + @ViewColumn() + notificationTypeCode: string; + + @ViewColumn() + status: LinkedStatusType; + + @ManyToOne(() => NotificationType, { + nullable: false, + }) + @JoinColumn({ name: 'notification_type_code' }) + notificationType: NotificationType; +} diff --git a/services/apps/alcs/src/portal/inbox/notification/inbox-notification.service.spec.ts b/services/apps/alcs/src/portal/inbox/notification/inbox-notification.service.spec.ts new file mode 100644 index 0000000000..d1dfc887eb --- /dev/null +++ b/services/apps/alcs/src/portal/inbox/notification/inbox-notification.service.spec.ts @@ -0,0 +1,91 @@ +import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; +import { Test, TestingModule } from '@nestjs/testing'; +import { getRepositoryToken } from '@nestjs/typeorm'; +import { Repository } from 'typeorm'; +import { InboxRequestDto } from '../inbox.dto'; +import { InboxNotificationService } from './inbox-notification.service'; +import { InboxNotificationSubmissionView } from './inbox-notification-view.entity'; + +describe('InboxNotificationService', () => { + let service: InboxNotificationService; + let mockNotificationSubmissionSearchViewRepository: DeepMocked< + Repository<InboxNotificationSubmissionView> + >; + + const mockSearchDto: InboxRequestDto = { + fileNumber: '123', + portalStatusCodes: ['A'], + governmentFileNumber: 'B', + name: 'D', + pid: 'E', + civicAddress: 'F', + fileTypes: ['type1', 'type2'], + page: 1, + pageSize: 10, + sortField: 'ownerName', + sortDirection: 'ASC', + }; + + let mockQuery: any = {}; + + beforeEach(async () => { + mockNotificationSubmissionSearchViewRepository = createMock(); + + mockQuery = { + getManyAndCount: jest.fn().mockResolvedValue([[], 0]), + orderBy: jest.fn().mockReturnThis(), + offset: jest.fn().mockReturnThis(), + limit: jest.fn().mockReturnThis(), + innerJoinAndMapOne: jest.fn().mockReturnThis(), + groupBy: jest.fn().mockReturnThis(), + where: jest.fn().mockReturnThis(), + andWhere: jest.fn().mockReturnThis(), + setParameters: jest.fn().mockReturnThis(), + leftJoin: jest.fn().mockReturnThis(), + }; + + const module: TestingModule = await Test.createTestingModule({ + providers: [ + InboxNotificationService, + { + provide: getRepositoryToken(InboxNotificationSubmissionView), + useValue: mockNotificationSubmissionSearchViewRepository, + }, + ], + }).compile(); + + service = module.get<InboxNotificationService>(InboxNotificationService); + }); + + it('should be defined', () => { + expect(service).toBeDefined(); + }); + + it('should successfully build a query using all search parameters defined', async () => { + mockNotificationSubmissionSearchViewRepository.createQueryBuilder.mockReturnValue( + mockQuery as any, + ); + + const result = await service.search(mockSearchDto, '', '', ''); + + expect(result).toEqual({ data: [], total: 0 }); + expect( + mockNotificationSubmissionSearchViewRepository.createQueryBuilder, + ).toBeCalledTimes(1); + expect(mockQuery.andWhere).toBeCalledTimes(6); + }); + + it('should call compileNotificationSearchQuery method correctly', async () => { + const compileSearchQuerySpy = jest + .spyOn(service as any, 'compileNotificationSearchQuery') + .mockResolvedValue(mockQuery); + + const result = await service.search(mockSearchDto, '', '', ''); + + expect(result).toEqual({ data: [], total: 0 }); + expect(compileSearchQuerySpy).toBeCalledWith(mockSearchDto, '', '', ''); + expect(mockQuery.orderBy).toHaveBeenCalledTimes(1); + expect(mockQuery.offset).toHaveBeenCalledTimes(1); + expect(mockQuery.limit).toHaveBeenCalledTimes(1); + }); +}); diff --git a/services/apps/alcs/src/portal/inbox/notification/inbox-notification.service.ts b/services/apps/alcs/src/portal/inbox/notification/inbox-notification.service.ts new file mode 100644 index 0000000000..00457cb6ea --- /dev/null +++ b/services/apps/alcs/src/portal/inbox/notification/inbox-notification.service.ts @@ -0,0 +1,208 @@ +import { Injectable } from '@nestjs/common'; +import { InjectRepository } from '@nestjs/typeorm'; +import { Brackets, Repository } from 'typeorm'; +import { formatStringToPostgresSearchStringArrayWithWildCard } from '../../../utils/search-helper'; +import { NotificationParcel } from '../../notification-submission/notification-parcel/notification-parcel.entity'; +import { NotificationTransferee } from '../../notification-submission/notification-transferee/notification-transferee.entity'; +import { AdvancedSearchResultDto, InboxRequestDto } from '../inbox.dto'; +import { InboxNotificationSubmissionView } from './inbox-notification-view.entity'; + +@Injectable() +export class InboxNotificationService { + constructor( + @InjectRepository(InboxNotificationSubmissionView) + private notificationSearchViewRepo: Repository<InboxNotificationSubmissionView>, + ) {} + + async search( + searchDto: InboxRequestDto, + userUuid: string, + bceidBusinessGuid: string | null, + governmentUuid: string | null, + ): Promise<AdvancedSearchResultDto<InboxNotificationSubmissionView[]>> { + let query = await this.compileNotificationSearchQuery( + searchDto, + userUuid, + bceidBusinessGuid, + governmentUuid, + ); + + query = this.compileGroupBySearchQuery(query); + + const sortQuery = this.compileSortQuery(searchDto); + + query = query + .orderBy(sortQuery, searchDto.sortDirection) + .offset((searchDto.page - 1) * searchDto.pageSize) + .limit(searchDto.pageSize); + + const result = await query.getManyAndCount(); + + return { + data: result[0], + total: result[1], + }; + } + + private compileSortQuery(searchDto: InboxRequestDto) { + switch (searchDto.sortField) { + case 'fileId': + return '"notificationSearch"."file_number"'; + + case 'ownerName': + return '"notificationSearch"."applicant"'; + + case 'type': + return '"notificationSearch"."notification_type_code"'; + + case 'government': + return '"notificationSearch"."local_government_name"'; + + case 'portalStatus': + return `"notificationSearch"."status" ->> 'label' `; + + default: + case 'lastUpdate': + return `"notificationSearch"."status" ->> 'effectiveDate' `; + } + } + + private compileGroupBySearchQuery(query) { + query = query + .innerJoinAndMapOne( + 'notificationSearch.notificationType', + 'notificationSearch.notificationType', + 'notificationType', + ) + .groupBy( + ` + "notificationSearch"."uuid" + , "notificationSearch"."notification_uuid" + , "notificationSearch"."file_number" + , "notificationSearch"."applicant" + , "notificationSearch"."created_at" + , "notificationSearch"."local_government_uuid" + , "notificationSearch"."notification_type_code" + , "notificationSearch"."status" + , "notificationSearch"."created_by_uuid" + , "notificationSearch"."bceid_business_guid" + , "notificationType"."audit_deleted_date_at" + , "notificationType"."audit_created_at" + , "notificationType"."audit_updated_by" + , "notificationType"."audit_updated_at" + , "notificationType"."audit_created_by" + , "notificationType"."short_label" + , "notificationType"."label" + , "notificationType"."code" + , "notificationType"."html_description" + , "notificationType"."portal_label" + `, + ); + return query; + } + + private async compileNotificationSearchQuery( + searchDto: InboxRequestDto, + userUuid: string, + bceidBusinessGuid: string | null, + governmentUuid: string | null, + ) { + let query = + this.notificationSearchViewRepo.createQueryBuilder('notificationSearch'); + + //User Permissions + query.andWhere( + '(notificationSearch.created_by_uuid = :userUuid OR notificationSearch.bceid_business_guid = :bceidBusinessGuid OR notificationSearch.local_government_uuid = :governmentUuid)', + { + userUuid, + bceidBusinessGuid: bceidBusinessGuid ?? false, + governmentUuid: governmentUuid ?? false, + }, + ); + + if (searchDto.fileNumber) { + query = query + .andWhere('notificationSearch.file_number = :fileNumber') + .setParameters({ fileNumber: searchDto.fileNumber ?? null }); + } + + if (searchDto.portalStatusCodes && searchDto.portalStatusCodes.length > 0) { + query = query.andWhere( + "alcs.get_current_status_for_notification_submission_by_uuid(notificationSearch.uuid) ->> 'status_type_code' IN(:...statuses)", + { + statuses: searchDto.portalStatusCodes, + }, + ); + } + + query = this.compileSearchByNameQuery(searchDto, query); + query = this.compileParcelSearchQuery(searchDto, query); + + return query; + } + + private compileParcelSearchQuery(searchDto: InboxRequestDto, query) { + if (searchDto.pid || searchDto.civicAddress) { + query = query.leftJoin( + NotificationParcel, + 'parcel', + 'parcel.notification_submission_uuid = notificationSearch.uuid', + ); + } + + if (searchDto.pid) { + query = query.andWhere('parcel.pid = :pid', { pid: searchDto.pid }); + } + + if (searchDto.civicAddress) { + query = query.andWhere('parcel.civic_address like :civic_address', { + civic_address: `%${searchDto.civicAddress}%`, + }); + } + return query; + } + + private compileSearchByNameQuery(searchDto: InboxRequestDto, query) { + if (searchDto.name) { + const formattedSearchString = + formatStringToPostgresSearchStringArrayWithWildCard(searchDto.name!); + + query = query + .leftJoin( + NotificationTransferee, + 'notification_transferee', + 'notification_transferee.notification_submission_uuid = notificationSearch.uuid', + ) + .andWhere( + new Brackets((qb) => + qb + .where( + "LOWER(notification_transferee.first_name || ' ' || notification_transferee.last_name) LIKE ANY (:names)", + { + names: formattedSearchString, + }, + ) + .orWhere( + 'LOWER(notification_transferee.first_name) LIKE ANY (:names)', + { + names: formattedSearchString, + }, + ) + .orWhere( + 'LOWER(notification_transferee.last_name) LIKE ANY (:names)', + { + names: formattedSearchString, + }, + ) + .orWhere( + 'LOWER(notification_transferee.organization_name) LIKE ANY (:names)', + { + names: formattedSearchString, + }, + ), + ), + ); + } + return query; + } +} diff --git a/services/apps/alcs/src/portal/portal.module.ts b/services/apps/alcs/src/portal/portal.module.ts index 069a0523d0..58a3691a92 100644 --- a/services/apps/alcs/src/portal/portal.module.ts +++ b/services/apps/alcs/src/portal/portal.module.ts @@ -12,6 +12,7 @@ import { ApplicationSubmissionReviewModule } from './application-submission-revi import { ApplicationSubmissionModule } from './application-submission/application-submission.module'; import { CodeController } from './code/code.controller'; import { PortalDocumentModule } from './document/document.module'; +import { InboxModule } from './inbox/inbox.module'; import { PortalNoticeOfIntentDocumentModule } from './notice-of-intent-document/notice-of-intent-document.module'; import { NoticeOfIntentSubmissionDraftModule } from './notice-of-intent-submission-draft/notice-of-intent-submission-draft.module'; import { NoticeOfIntentSubmissionModule } from './notice-of-intent-submission/notice-of-intent-submission.module'; @@ -42,6 +43,7 @@ import { PublicModule } from './public/public.module'; PortalNotificationDocumentModule, PublicModule, CodeModule, + InboxModule, RouterModule.register([ { path: 'portal', module: ApplicationSubmissionModule }, { path: 'portal', module: NoticeOfIntentSubmissionModule }, @@ -55,6 +57,7 @@ import { PublicModule } from './public/public.module'; { path: 'portal', module: NoticeOfIntentSubmissionDraftModule }, { path: 'portal', module: NotificationSubmissionModule }, { path: 'portal', module: PortalNotificationDocumentModule }, + { path: 'portal', module: InboxModule }, ]), ], controllers: [CodeController], diff --git a/services/apps/alcs/src/portal/public/search/public-search.controller.spec.ts b/services/apps/alcs/src/portal/public/search/public-search.controller.spec.ts index f30269f820..5b7cb0fb23 100644 --- a/services/apps/alcs/src/portal/public/search/public-search.controller.spec.ts +++ b/services/apps/alcs/src/portal/public/search/public-search.controller.spec.ts @@ -34,10 +34,6 @@ describe('PublicSearchController', () => { }), ], providers: [ - { - provide: PublicSearchService, - useValue: mockSearchService, - }, { provide: PublicNoticeOfIntentSearchService, useValue: mockNOIPublicSearchService, diff --git a/services/apps/alcs/src/portal/public/search/public-search.controller.ts b/services/apps/alcs/src/portal/public/search/public-search.controller.ts index 5dfc401692..d62a78e739 100644 --- a/services/apps/alcs/src/portal/public/search/public-search.controller.ts +++ b/services/apps/alcs/src/portal/public/search/public-search.controller.ts @@ -18,13 +18,11 @@ import { NotificationSearchResultDto, SearchRequestDto, } from './public-search.dto'; -import { PublicSearchService } from './public-search.service'; @Public() @Controller('search') export class PublicSearchController { constructor( - private searchService: PublicSearchService, @InjectMapper() private mapper: Mapper, private noticeOfIntentSearchService: PublicNoticeOfIntentSearchService, private applicationSearchService: PublicApplicationSearchService, diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1697131320873-add_inbox_views.ts b/services/apps/alcs/src/providers/typeorm/migrations/1697131320873-add_inbox_views.ts new file mode 100644 index 0000000000..c1e55fcc19 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1697131320873-add_inbox_views.ts @@ -0,0 +1,125 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class addInboxViews1697131320873 implements MigrationInterface { + name = 'addInboxViews1697131320873'; + + public async up(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, + ['VIEW', 'inbox_notification_submission_view', 'alcs'], + ); + await queryRunner.query( + `DROP VIEW "alcs"."inbox_notification_submission_view"`, + ); + await queryRunner.query( + `DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, + ['VIEW', 'inbox_notice_of_intent_submission_view', 'alcs'], + ); + await queryRunner.query( + `DROP VIEW "alcs"."inbox_notice_of_intent_submission_view"`, + ); + await queryRunner.query( + `DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, + ['VIEW', 'inbox_application_submission_view', 'alcs'], + ); + await queryRunner.query( + `DROP VIEW "alcs"."inbox_application_submission_view"`, + ); + await queryRunner.query( + `CREATE VIEW "alcs"."inbox_notice_of_intent_submission_view" AS SELECT "noi_sub"."uuid" AS "uuid", "noi_sub"."applicant" AS "applicant", "noi"."uuid" AS "notice_of_intent_uuid", "noticeOfIntentType"."audit_deleted_date_at" AS "noticeOfIntentType_audit_deleted_date_at", "noticeOfIntentType"."audit_created_at" AS "noticeOfIntentType_audit_created_at", "noticeOfIntentType"."audit_updated_at" AS "noticeOfIntentType_audit_updated_at", "noticeOfIntentType"."audit_created_by" AS "noticeOfIntentType_audit_created_by", "noticeOfIntentType"."audit_updated_by" AS "noticeOfIntentType_audit_updated_by", "noticeOfIntentType"."label" AS "noticeOfIntentType_label", "noticeOfIntentType"."code" AS "noticeOfIntentType_code", "noticeOfIntentType"."description" AS "noticeOfIntentType_description", "noticeOfIntentType"."short_label" AS "noticeOfIntentType_short_label", "noticeOfIntentType"."background_color" AS "noticeOfIntentType_background_color", "noticeOfIntentType"."text_color" AS "noticeOfIntentType_text_color", "noticeOfIntentType"."html_description" AS "noticeOfIntentType_html_description", "noticeOfIntentType"."portal_label" AS "noticeOfIntentType_portal_label", "noi_sub"."file_number" AS "file_number", "noi_sub"."audit_created_at" AS "created_at", "noi_sub"."created_by_uuid" AS "created_by_uuid", "noi_sub"."local_government_uuid" AS "local_government_uuid", "localGovernment"."bceid_business_guid" AS "bceid_business_guid", "noi_sub"."type_code" AS "notice_of_intent_type_code", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid") AS "status" FROM "alcs"."notice_of_intent_submission" "noi_sub" INNER JOIN "alcs"."notice_of_intent" "noi" ON "noi"."file_number" = "noi_sub"."file_number" AND "noi"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."notice_of_intent_type" "noticeOfIntentType" ON "noi_sub"."type_code" = "noticeOfIntentType"."code" AND "noticeOfIntentType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "noi_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."notice_of_intent_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "noi_sub"."uuid" LEFT JOIN (SELECT MAX("date") AS "date", notice_of_intent_uuid AS "notice_of_intent_uuid" FROM "alcs"."notice_of_intent_decision" "decision_date" WHERE "decision_date"."audit_deleted_date_at" IS NULL GROUP BY notice_of_intent_uuid) "decision_date" ON decision_date."notice_of_intent_uuid" = "noi"."uuid" WHERE ( "noi_sub"."is_draft" = FALSE ) AND ( "noi_sub"."audit_deleted_date_at" IS NULL )`, + ); + await queryRunner.query( + `INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, + [ + 'alcs', + 'VIEW', + 'inbox_notice_of_intent_submission_view', + 'SELECT "noi_sub"."uuid" AS "uuid", "noi_sub"."applicant" AS "applicant", "noi"."uuid" AS "notice_of_intent_uuid", "noticeOfIntentType"."audit_deleted_date_at" AS "noticeOfIntentType_audit_deleted_date_at", "noticeOfIntentType"."audit_created_at" AS "noticeOfIntentType_audit_created_at", "noticeOfIntentType"."audit_updated_at" AS "noticeOfIntentType_audit_updated_at", "noticeOfIntentType"."audit_created_by" AS "noticeOfIntentType_audit_created_by", "noticeOfIntentType"."audit_updated_by" AS "noticeOfIntentType_audit_updated_by", "noticeOfIntentType"."label" AS "noticeOfIntentType_label", "noticeOfIntentType"."code" AS "noticeOfIntentType_code", "noticeOfIntentType"."description" AS "noticeOfIntentType_description", "noticeOfIntentType"."short_label" AS "noticeOfIntentType_short_label", "noticeOfIntentType"."background_color" AS "noticeOfIntentType_background_color", "noticeOfIntentType"."text_color" AS "noticeOfIntentType_text_color", "noticeOfIntentType"."html_description" AS "noticeOfIntentType_html_description", "noticeOfIntentType"."portal_label" AS "noticeOfIntentType_portal_label", "noi_sub"."file_number" AS "file_number", "noi_sub"."audit_created_at" AS "created_at", "noi_sub"."created_by_uuid" AS "created_by_uuid", "noi_sub"."local_government_uuid" AS "local_government_uuid", "localGovernment"."bceid_business_guid" AS "bceid_business_guid", "noi_sub"."type_code" AS "notice_of_intent_type_code", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid") AS "status" FROM "alcs"."notice_of_intent_submission" "noi_sub" INNER JOIN "alcs"."notice_of_intent" "noi" ON "noi"."file_number" = "noi_sub"."file_number" AND "noi"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."notice_of_intent_type" "noticeOfIntentType" ON "noi_sub"."type_code" = "noticeOfIntentType"."code" AND "noticeOfIntentType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "noi_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."notice_of_intent_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "noi_sub"."uuid" LEFT JOIN (SELECT MAX("date") AS "date", notice_of_intent_uuid AS "notice_of_intent_uuid" FROM "alcs"."notice_of_intent_decision" "decision_date" WHERE "decision_date"."audit_deleted_date_at" IS NULL GROUP BY notice_of_intent_uuid) "decision_date" ON decision_date."notice_of_intent_uuid" = "noi"."uuid" WHERE ( "noi_sub"."is_draft" = FALSE ) AND ( "noi_sub"."audit_deleted_date_at" IS NULL )', + ], + ); + await queryRunner.query( + `CREATE VIEW "alcs"."inbox_notification_submission_view" AS SELECT "noti_sub"."uuid" AS "uuid", "noti_sub"."applicant" AS "applicant", "noti"."uuid" AS "notification_uuid", "notificationType"."audit_deleted_date_at" AS "notificationType_audit_deleted_date_at", "notificationType"."audit_created_at" AS "notificationType_audit_created_at", "notificationType"."audit_updated_at" AS "notificationType_audit_updated_at", "notificationType"."audit_created_by" AS "notificationType_audit_created_by", "notificationType"."audit_updated_by" AS "notificationType_audit_updated_by", "notificationType"."label" AS "notificationType_label", "notificationType"."code" AS "notificationType_code", "notificationType"."description" AS "notificationType_description", "notificationType"."short_label" AS "notificationType_short_label", "notificationType"."background_color" AS "notificationType_background_color", "notificationType"."text_color" AS "notificationType_text_color", "notificationType"."html_description" AS "notificationType_html_description", "notificationType"."portal_label" AS "notificationType_portal_label", "noti_sub"."file_number" AS "file_number", "noti_sub"."audit_created_at" AS "created_at", "noti_sub"."created_by_uuid" AS "created_by_uuid", "noti_sub"."local_government_uuid" AS "local_government_uuid", "localGovernment"."bceid_business_guid" AS "bceid_business_guid", "noti"."type_code" AS "notification_type_code", "noti"."date_submitted_to_alc" AS "date_submitted_to_alc", alcs.get_current_status_for_notification_submission_by_uuid("noti_sub"."uuid") AS "status" FROM "alcs"."notification_submission" "noti_sub" INNER JOIN "alcs"."notification" "noti" ON "noti"."file_number" = "noti_sub"."file_number" AND "noti"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."notification_type" "notificationType" ON "noti_sub"."type_code" = "notificationType"."code" AND "notificationType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "noti"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL WHERE "noti_sub"."audit_deleted_date_at" IS NULL`, + ); + await queryRunner.query( + `INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, + [ + 'alcs', + 'VIEW', + 'inbox_notification_submission_view', + 'SELECT "noti_sub"."uuid" AS "uuid", "noti_sub"."applicant" AS "applicant", "noti"."uuid" AS "notification_uuid", "notificationType"."audit_deleted_date_at" AS "notificationType_audit_deleted_date_at", "notificationType"."audit_created_at" AS "notificationType_audit_created_at", "notificationType"."audit_updated_at" AS "notificationType_audit_updated_at", "notificationType"."audit_created_by" AS "notificationType_audit_created_by", "notificationType"."audit_updated_by" AS "notificationType_audit_updated_by", "notificationType"."label" AS "notificationType_label", "notificationType"."code" AS "notificationType_code", "notificationType"."description" AS "notificationType_description", "notificationType"."short_label" AS "notificationType_short_label", "notificationType"."background_color" AS "notificationType_background_color", "notificationType"."text_color" AS "notificationType_text_color", "notificationType"."html_description" AS "notificationType_html_description", "notificationType"."portal_label" AS "notificationType_portal_label", "noti_sub"."file_number" AS "file_number", "noti_sub"."audit_created_at" AS "created_at", "noti_sub"."created_by_uuid" AS "created_by_uuid", "noti_sub"."local_government_uuid" AS "local_government_uuid", "localGovernment"."bceid_business_guid" AS "bceid_business_guid", "noti"."type_code" AS "notification_type_code", "noti"."date_submitted_to_alc" AS "date_submitted_to_alc", alcs.get_current_status_for_notification_submission_by_uuid("noti_sub"."uuid") AS "status" FROM "alcs"."notification_submission" "noti_sub" INNER JOIN "alcs"."notification" "noti" ON "noti"."file_number" = "noti_sub"."file_number" AND "noti"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."notification_type" "notificationType" ON "noti_sub"."type_code" = "notificationType"."code" AND "notificationType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "noti"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL WHERE "noti_sub"."audit_deleted_date_at" IS NULL', + ], + ); + await queryRunner.query( + `CREATE VIEW "alcs"."inbox_application_submission_view" AS SELECT "app_sub"."uuid" AS "uuid", "app_sub"."applicant" AS "applicant", "app"."uuid" AS "application_uuid", "applicationType"."audit_deleted_date_at" AS "applicationType_audit_deleted_date_at", "applicationType"."audit_created_at" AS "applicationType_audit_created_at", "applicationType"."audit_updated_at" AS "applicationType_audit_updated_at", "applicationType"."audit_created_by" AS "applicationType_audit_created_by", "applicationType"."audit_updated_by" AS "applicationType_audit_updated_by", "applicationType"."label" AS "applicationType_label", "applicationType"."code" AS "applicationType_code", "applicationType"."description" AS "applicationType_description", "applicationType"."short_label" AS "applicationType_short_label", "applicationType"."background_color" AS "applicationType_background_color", "applicationType"."text_color" AS "applicationType_text_color", "applicationType"."html_description" AS "applicationType_html_description", "applicationType"."portal_label" AS "applicationType_portal_label", "localGovernment"."name" AS "local_government_name", "app_sub"."file_number" AS "file_number", "app_sub"."created_by_uuid" AS "created_by_uuid", "app_sub"."local_government_uuid" AS "local_government_uuid", "app_sub"."audit_created_at" AS "created_at", "localGovernment"."bceid_business_guid" AS "bceid_business_guid", "app_sub"."type_code" AS "application_type_code", "app_rev"."local_government_file_number" AS "local_government_file_number", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid") AS "status" FROM "alcs"."application_submission" "app_sub" INNER JOIN "alcs"."application" "app" ON "app"."file_number" = "app_sub"."file_number" AND "app"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."application_submission_review" "app_rev" ON "app"."file_number" = "app_rev"."application_file_number" AND "app_rev"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."application_type" "applicationType" ON "app_sub"."type_code" = "applicationType"."code" AND "applicationType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "app_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."application_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "app_sub"."uuid" LEFT JOIN (SELECT MAX("date") AS "date", application_uuid AS "application_uuid" FROM "alcs"."application_decision" "decision_date" WHERE "decision_date"."audit_deleted_date_at" IS NULL GROUP BY application_uuid) "decision_date" ON decision_date."application_uuid" = "app"."uuid" WHERE ( "app_sub"."is_draft" = FALSE ) AND ( "app_sub"."audit_deleted_date_at" IS NULL )`, + ); + await queryRunner.query( + `INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, + [ + 'alcs', + 'VIEW', + 'inbox_application_submission_view', + 'SELECT "app_sub"."uuid" AS "uuid", "app_sub"."applicant" AS "applicant", "app"."uuid" AS "application_uuid", "applicationType"."audit_deleted_date_at" AS "applicationType_audit_deleted_date_at", "applicationType"."audit_created_at" AS "applicationType_audit_created_at", "applicationType"."audit_updated_at" AS "applicationType_audit_updated_at", "applicationType"."audit_created_by" AS "applicationType_audit_created_by", "applicationType"."audit_updated_by" AS "applicationType_audit_updated_by", "applicationType"."label" AS "applicationType_label", "applicationType"."code" AS "applicationType_code", "applicationType"."description" AS "applicationType_description", "applicationType"."short_label" AS "applicationType_short_label", "applicationType"."background_color" AS "applicationType_background_color", "applicationType"."text_color" AS "applicationType_text_color", "applicationType"."html_description" AS "applicationType_html_description", "applicationType"."portal_label" AS "applicationType_portal_label", "localGovernment"."name" AS "local_government_name", "app_sub"."file_number" AS "file_number", "app_sub"."created_by_uuid" AS "created_by_uuid", "app_sub"."local_government_uuid" AS "local_government_uuid", "app_sub"."audit_created_at" AS "created_at", "localGovernment"."bceid_business_guid" AS "bceid_business_guid", "app_sub"."type_code" AS "application_type_code", "app_rev"."local_government_file_number" AS "local_government_file_number", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid") AS "status" FROM "alcs"."application_submission" "app_sub" INNER JOIN "alcs"."application" "app" ON "app"."file_number" = "app_sub"."file_number" AND "app"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."application_submission_review" "app_rev" ON "app"."file_number" = "app_rev"."application_file_number" AND "app_rev"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."application_type" "applicationType" ON "app_sub"."type_code" = "applicationType"."code" AND "applicationType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "app_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."application_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "app_sub"."uuid" LEFT JOIN (SELECT MAX("date") AS "date", application_uuid AS "application_uuid" FROM "alcs"."application_decision" "decision_date" WHERE "decision_date"."audit_deleted_date_at" IS NULL GROUP BY application_uuid) "decision_date" ON decision_date."application_uuid" = "app"."uuid" WHERE ( "app_sub"."is_draft" = FALSE ) AND ( "app_sub"."audit_deleted_date_at" IS NULL )', + ], + ); + } + + public async down(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, + ['VIEW', 'inbox_application_submission_view', 'alcs'], + ); + await queryRunner.query( + `DROP VIEW "alcs"."inbox_application_submission_view"`, + ); + await queryRunner.query( + `DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, + ['VIEW', 'inbox_notification_submission_view', 'alcs'], + ); + await queryRunner.query( + `DROP VIEW "alcs"."inbox_notification_submission_view"`, + ); + await queryRunner.query( + `DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, + ['VIEW', 'inbox_notice_of_intent_submission_view', 'alcs'], + ); + await queryRunner.query( + `DROP VIEW "alcs"."inbox_notice_of_intent_submission_view"`, + ); + await queryRunner.query( + `CREATE VIEW "alcs"."inbox_application_submission_view" AS SELECT "app_sub"."uuid" AS "uuid", "app_sub"."applicant" AS "applicant", "app"."uuid" AS "application_uuid", "applicationType"."audit_deleted_date_at" AS "applicationType_audit_deleted_date_at", "applicationType"."audit_created_at" AS "applicationType_audit_created_at", "applicationType"."audit_updated_at" AS "applicationType_audit_updated_at", "applicationType"."audit_created_by" AS "applicationType_audit_created_by", "applicationType"."audit_updated_by" AS "applicationType_audit_updated_by", "applicationType"."label" AS "applicationType_label", "applicationType"."code" AS "applicationType_code", "applicationType"."description" AS "applicationType_description", "applicationType"."short_label" AS "applicationType_short_label", "applicationType"."background_color" AS "applicationType_background_color", "applicationType"."text_color" AS "applicationType_text_color", "applicationType"."html_description" AS "applicationType_html_description", "applicationType"."portal_label" AS "applicationType_portal_label", "localGovernment"."name" AS "local_government_name", "app_sub"."file_number" AS "file_number", "app_sub"."created_by_uuid" AS "created_by_uuid", "app_sub"."local_government_uuid" AS "local_government_uuid", "localGovernment"."bceid_business_guid" AS "bceid_business_guid", "app_sub"."type_code" AS "application_type_code", "app_rev"."local_government_file_number" AS "local_government_file_number", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid") AS "status" FROM "alcs"."application_submission" "app_sub" INNER JOIN "alcs"."application" "app" ON "app"."file_number" = "app_sub"."file_number" AND "app"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."application_submission_review" "app_rev" ON "app"."file_number" = "app_rev"."application_file_number" AND "app_rev"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."application_type" "applicationType" ON "app_sub"."type_code" = "applicationType"."code" AND "applicationType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "app_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."application_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "app_sub"."uuid" LEFT JOIN (SELECT MAX("date") AS "date", application_uuid AS "application_uuid" FROM "alcs"."application_decision" "decision_date" WHERE "decision_date"."audit_deleted_date_at" IS NULL GROUP BY application_uuid) "decision_date" ON decision_date."application_uuid" = "app"."uuid" WHERE ( "app_sub"."is_draft" = FALSE ) AND ( "app_sub"."audit_deleted_date_at" IS NULL )`, + ); + await queryRunner.query( + `INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, + [ + 'alcs', + 'VIEW', + 'inbox_application_submission_view', + 'SELECT "app_sub"."uuid" AS "uuid", "app_sub"."applicant" AS "applicant", "app"."uuid" AS "application_uuid", "applicationType"."audit_deleted_date_at" AS "applicationType_audit_deleted_date_at", "applicationType"."audit_created_at" AS "applicationType_audit_created_at", "applicationType"."audit_updated_at" AS "applicationType_audit_updated_at", "applicationType"."audit_created_by" AS "applicationType_audit_created_by", "applicationType"."audit_updated_by" AS "applicationType_audit_updated_by", "applicationType"."label" AS "applicationType_label", "applicationType"."code" AS "applicationType_code", "applicationType"."description" AS "applicationType_description", "applicationType"."short_label" AS "applicationType_short_label", "applicationType"."background_color" AS "applicationType_background_color", "applicationType"."text_color" AS "applicationType_text_color", "applicationType"."html_description" AS "applicationType_html_description", "applicationType"."portal_label" AS "applicationType_portal_label", "localGovernment"."name" AS "local_government_name", "app_sub"."file_number" AS "file_number", "app_sub"."created_by_uuid" AS "created_by_uuid", "app_sub"."local_government_uuid" AS "local_government_uuid", "localGovernment"."bceid_business_guid" AS "bceid_business_guid", "app_sub"."type_code" AS "application_type_code", "app_rev"."local_government_file_number" AS "local_government_file_number", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid") AS "status" FROM "alcs"."application_submission" "app_sub" INNER JOIN "alcs"."application" "app" ON "app"."file_number" = "app_sub"."file_number" AND "app"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."application_submission_review" "app_rev" ON "app"."file_number" = "app_rev"."application_file_number" AND "app_rev"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."application_type" "applicationType" ON "app_sub"."type_code" = "applicationType"."code" AND "applicationType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "app_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."application_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "app_sub"."uuid" LEFT JOIN (SELECT MAX("date") AS "date", application_uuid AS "application_uuid" FROM "alcs"."application_decision" "decision_date" WHERE "decision_date"."audit_deleted_date_at" IS NULL GROUP BY application_uuid) "decision_date" ON decision_date."application_uuid" = "app"."uuid" WHERE ( "app_sub"."is_draft" = FALSE ) AND ( "app_sub"."audit_deleted_date_at" IS NULL )', + ], + ); + await queryRunner.query( + `CREATE VIEW "alcs"."inbox_notice_of_intent_submission_view" AS SELECT "noi_sub"."uuid" AS "uuid", "noi_sub"."applicant" AS "applicant", "noi"."uuid" AS "notice_of_intent_uuid", "noticeOfIntentType"."audit_deleted_date_at" AS "noticeOfIntentType_audit_deleted_date_at", "noticeOfIntentType"."audit_created_at" AS "noticeOfIntentType_audit_created_at", "noticeOfIntentType"."audit_updated_at" AS "noticeOfIntentType_audit_updated_at", "noticeOfIntentType"."audit_created_by" AS "noticeOfIntentType_audit_created_by", "noticeOfIntentType"."audit_updated_by" AS "noticeOfIntentType_audit_updated_by", "noticeOfIntentType"."label" AS "noticeOfIntentType_label", "noticeOfIntentType"."code" AS "noticeOfIntentType_code", "noticeOfIntentType"."description" AS "noticeOfIntentType_description", "noticeOfIntentType"."short_label" AS "noticeOfIntentType_short_label", "noticeOfIntentType"."background_color" AS "noticeOfIntentType_background_color", "noticeOfIntentType"."text_color" AS "noticeOfIntentType_text_color", "noticeOfIntentType"."html_description" AS "noticeOfIntentType_html_description", "noticeOfIntentType"."portal_label" AS "noticeOfIntentType_portal_label", "noi_sub"."file_number" AS "file_number", "noi_sub"."created_by_uuid" AS "created_by_uuid", "noi_sub"."local_government_uuid" AS "local_government_uuid", "localGovernment"."bceid_business_guid" AS "bceid_business_guid", "noi_sub"."type_code" AS "notice_of_intent_type_code", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid") AS "status" FROM "alcs"."notice_of_intent_submission" "noi_sub" INNER JOIN "alcs"."notice_of_intent" "noi" ON "noi"."file_number" = "noi_sub"."file_number" AND "noi"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."notice_of_intent_type" "noticeOfIntentType" ON "noi_sub"."type_code" = "noticeOfIntentType"."code" AND "noticeOfIntentType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "noi_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."notice_of_intent_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "noi_sub"."uuid" LEFT JOIN (SELECT MAX("date") AS "date", notice_of_intent_uuid AS "notice_of_intent_uuid" FROM "alcs"."notice_of_intent_decision" "decision_date" WHERE "decision_date"."audit_deleted_date_at" IS NULL GROUP BY notice_of_intent_uuid) "decision_date" ON decision_date."notice_of_intent_uuid" = "noi"."uuid" WHERE ( "noi_sub"."is_draft" = FALSE ) AND ( "noi_sub"."audit_deleted_date_at" IS NULL )`, + ); + await queryRunner.query( + `INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, + [ + 'alcs', + 'VIEW', + 'inbox_notice_of_intent_submission_view', + 'SELECT "noi_sub"."uuid" AS "uuid", "noi_sub"."applicant" AS "applicant", "noi"."uuid" AS "notice_of_intent_uuid", "noticeOfIntentType"."audit_deleted_date_at" AS "noticeOfIntentType_audit_deleted_date_at", "noticeOfIntentType"."audit_created_at" AS "noticeOfIntentType_audit_created_at", "noticeOfIntentType"."audit_updated_at" AS "noticeOfIntentType_audit_updated_at", "noticeOfIntentType"."audit_created_by" AS "noticeOfIntentType_audit_created_by", "noticeOfIntentType"."audit_updated_by" AS "noticeOfIntentType_audit_updated_by", "noticeOfIntentType"."label" AS "noticeOfIntentType_label", "noticeOfIntentType"."code" AS "noticeOfIntentType_code", "noticeOfIntentType"."description" AS "noticeOfIntentType_description", "noticeOfIntentType"."short_label" AS "noticeOfIntentType_short_label", "noticeOfIntentType"."background_color" AS "noticeOfIntentType_background_color", "noticeOfIntentType"."text_color" AS "noticeOfIntentType_text_color", "noticeOfIntentType"."html_description" AS "noticeOfIntentType_html_description", "noticeOfIntentType"."portal_label" AS "noticeOfIntentType_portal_label", "noi_sub"."file_number" AS "file_number", "noi_sub"."created_by_uuid" AS "created_by_uuid", "noi_sub"."local_government_uuid" AS "local_government_uuid", "localGovernment"."bceid_business_guid" AS "bceid_business_guid", "noi_sub"."type_code" AS "notice_of_intent_type_code", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid") AS "status" FROM "alcs"."notice_of_intent_submission" "noi_sub" INNER JOIN "alcs"."notice_of_intent" "noi" ON "noi"."file_number" = "noi_sub"."file_number" AND "noi"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."notice_of_intent_type" "noticeOfIntentType" ON "noi_sub"."type_code" = "noticeOfIntentType"."code" AND "noticeOfIntentType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "noi_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."notice_of_intent_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "noi_sub"."uuid" LEFT JOIN (SELECT MAX("date") AS "date", notice_of_intent_uuid AS "notice_of_intent_uuid" FROM "alcs"."notice_of_intent_decision" "decision_date" WHERE "decision_date"."audit_deleted_date_at" IS NULL GROUP BY notice_of_intent_uuid) "decision_date" ON decision_date."notice_of_intent_uuid" = "noi"."uuid" WHERE ( "noi_sub"."is_draft" = FALSE ) AND ( "noi_sub"."audit_deleted_date_at" IS NULL )', + ], + ); + await queryRunner.query( + `CREATE VIEW "alcs"."inbox_notification_submission_view" AS SELECT "noti_sub"."uuid" AS "uuid", "noti_sub"."applicant" AS "applicant", "noti"."uuid" AS "notification_uuid", "notificationType"."audit_deleted_date_at" AS "notificationType_audit_deleted_date_at", "notificationType"."audit_created_at" AS "notificationType_audit_created_at", "notificationType"."audit_updated_at" AS "notificationType_audit_updated_at", "notificationType"."audit_created_by" AS "notificationType_audit_created_by", "notificationType"."audit_updated_by" AS "notificationType_audit_updated_by", "notificationType"."label" AS "notificationType_label", "notificationType"."code" AS "notificationType_code", "notificationType"."description" AS "notificationType_description", "notificationType"."short_label" AS "notificationType_short_label", "notificationType"."background_color" AS "notificationType_background_color", "notificationType"."text_color" AS "notificationType_text_color", "notificationType"."html_description" AS "notificationType_html_description", "notificationType"."portal_label" AS "notificationType_portal_label", "noti_sub"."file_number" AS "file_number", "noti_sub"."created_by_uuid" AS "created_by_uuid", "noti_sub"."local_government_uuid" AS "local_government_uuid", "localGovernment"."bceid_business_guid" AS "bceid_business_guid", "noti"."type_code" AS "notification_type_code", "noti"."date_submitted_to_alc" AS "date_submitted_to_alc", alcs.get_current_status_for_notification_submission_by_uuid("noti_sub"."uuid") AS "status" FROM "alcs"."notification_submission" "noti_sub" INNER JOIN "alcs"."notification" "noti" ON "noti"."file_number" = "noti_sub"."file_number" AND "noti"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."notification_type" "notificationType" ON "noti_sub"."type_code" = "notificationType"."code" AND "notificationType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "noti"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL WHERE "noti_sub"."audit_deleted_date_at" IS NULL`, + ); + await queryRunner.query( + `INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, + [ + 'alcs', + 'VIEW', + 'inbox_notification_submission_view', + 'SELECT "noti_sub"."uuid" AS "uuid", "noti_sub"."applicant" AS "applicant", "noti"."uuid" AS "notification_uuid", "notificationType"."audit_deleted_date_at" AS "notificationType_audit_deleted_date_at", "notificationType"."audit_created_at" AS "notificationType_audit_created_at", "notificationType"."audit_updated_at" AS "notificationType_audit_updated_at", "notificationType"."audit_created_by" AS "notificationType_audit_created_by", "notificationType"."audit_updated_by" AS "notificationType_audit_updated_by", "notificationType"."label" AS "notificationType_label", "notificationType"."code" AS "notificationType_code", "notificationType"."description" AS "notificationType_description", "notificationType"."short_label" AS "notificationType_short_label", "notificationType"."background_color" AS "notificationType_background_color", "notificationType"."text_color" AS "notificationType_text_color", "notificationType"."html_description" AS "notificationType_html_description", "notificationType"."portal_label" AS "notificationType_portal_label", "noti_sub"."file_number" AS "file_number", "noti_sub"."created_by_uuid" AS "created_by_uuid", "noti_sub"."local_government_uuid" AS "local_government_uuid", "localGovernment"."bceid_business_guid" AS "bceid_business_guid", "noti"."type_code" AS "notification_type_code", "noti"."date_submitted_to_alc" AS "date_submitted_to_alc", alcs.get_current_status_for_notification_submission_by_uuid("noti_sub"."uuid") AS "status" FROM "alcs"."notification_submission" "noti_sub" INNER JOIN "alcs"."notification" "noti" ON "noti"."file_number" = "noti_sub"."file_number" AND "noti"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."notification_type" "notificationType" ON "noti_sub"."type_code" = "notificationType"."code" AND "notificationType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "noti"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL WHERE "noti_sub"."audit_deleted_date_at" IS NULL', + ], + ); + } +} diff --git a/services/apps/alcs/src/user/user.service.spec.ts b/services/apps/alcs/src/user/user.service.spec.ts index f670312fc0..1ed6ce1dcb 100644 --- a/services/apps/alcs/src/user/user.service.spec.ts +++ b/services/apps/alcs/src/user/user.service.spec.ts @@ -154,7 +154,7 @@ describe('UserService', () => { const res = await service.getUserLocalGovernment(new User()); - expect(res).toBeUndefined(); + expect(res).toBeNull(); expect(mockGovernmentRepository.findOne).toHaveBeenCalledTimes(0); }); diff --git a/services/apps/alcs/src/user/user.service.ts b/services/apps/alcs/src/user/user.service.ts index 2679f3c729..3b3c58a364 100644 --- a/services/apps/alcs/src/user/user.service.ts +++ b/services/apps/alcs/src/user/user.service.ts @@ -96,11 +96,13 @@ export class UserService { return await this.localGovernmentRepository.findOne({ where: { bceidBusinessGuid: user.bceidBusinessGuid }, select: { + uuid: true, name: true, isFirstNation: true, }, }); } + return null; } async sendNewUserRequestEmail(email: string, userIdentifier: string) { From f709daa69c37ae25dc66c9bedcf9c17ec9efb7a0 Mon Sep 17 00:00:00 2001 From: Liam Stoddard <lstodd@protonmail.com> Date: Fri, 13 Oct 2023 16:27:33 -0700 Subject: [PATCH 490/954] incl_excl --- .../submissions/data_insert/insert_query.py | 16 ++++++++++++++-- .../submissions/sql/app_submission.sql | 4 +++- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/bin/migrate-oats-data/applications/submissions/data_insert/insert_query.py b/bin/migrate-oats-data/applications/submissions/data_insert/insert_query.py index e60cea1190..e05f1832bc 100644 --- a/bin/migrate-oats-data/applications/submissions/data_insert/insert_query.py +++ b/bin/migrate-oats-data/applications/submissions/data_insert/insert_query.py @@ -183,8 +183,20 @@ def get_insert_query_for_naru(): def get_insert_query_for_inc_exc(): - unique_fields = ", incl_excl_hectares" - unique_values = ", %(alr_area)s" + unique_fields = """, + incl_excl_hectares, + excl_why_land, + incl_agriculture_support, + incl_improvements, + excl_share_government_borders + """ + unique_values = """, + %(component_area)s, + %(proposal_background_desc)s, + %(support_desc)s, + %(improvements_desc)s, + %(applicationshare_ind)s + """ return get_insert_query(unique_fields, unique_values) diff --git a/bin/migrate-oats-data/applications/submissions/sql/app_submission.sql b/bin/migrate-oats-data/applications/submissions/sql/app_submission.sql index 985d0b49cb..4a200a5edb 100644 --- a/bin/migrate-oats-data/applications/submissions/sql/app_submission.sql +++ b/bin/migrate-oats-data/applications/submissions/sql/app_submission.sql @@ -32,7 +32,9 @@ SELECT oa.proposal_background_desc, oc.agricultural_activities_desc, oc.impact_reduction_desc, - oc.owners_notified_ind + oc.owners_notified_ind, + oc.applicationshare_ind, + oc.improvements_desc FROM appl_components_grouped acg From 01c4c6a78e272a173260e9011b45ffd854504c0b Mon Sep 17 00:00:00 2001 From: Liam Stoddard <lstodd@protonmail.com> Date: Fri, 13 Oct 2023 18:25:04 -0700 Subject: [PATCH 491/954] adl fields --- .../submissions/data_insert/data_prep.py | 4 +++ .../submissions/data_insert/insert_query.py | 33 +++++++++++++++++-- .../submissions/sql/app_submission.sql | 6 +++- 3 files changed, 40 insertions(+), 3 deletions(-) diff --git a/bin/migrate-oats-data/applications/submissions/data_insert/data_prep.py b/bin/migrate-oats-data/applications/submissions/data_insert/data_prep.py index 431c9a2b6b..5de7430ade 100644 --- a/bin/migrate-oats-data/applications/submissions/data_insert/data_prep.py +++ b/bin/migrate-oats-data/applications/submissions/data_insert/data_prep.py @@ -43,6 +43,7 @@ def prepare_app_sub_data(app_sub_raw_data_list, direction_data, subdiv_data, soi inc_exc_data_list = [] naru_data_list = [] tur_data_list = [] + subd_data_list = [] other_data_list = [] for row in app_sub_raw_data_list: @@ -70,6 +71,8 @@ def prepare_app_sub_data(app_sub_raw_data_list, direction_data, subdiv_data, soi naru_data_list.append(data) elif data["alr_change_code"] == ALRChangeCode.TUR.value: tur_data_list.append(data) + elif data["alr_change_code"] == ALRChangeCode.SDV.value: + subd_data_list.append(data) else: other_data_list.append(data) @@ -79,6 +82,7 @@ def prepare_app_sub_data(app_sub_raw_data_list, direction_data, subdiv_data, soi inc_exc_data_list, naru_data_list, tur_data_list, + subd_data_list, ) diff --git a/bin/migrate-oats-data/applications/submissions/data_insert/insert_query.py b/bin/migrate-oats-data/applications/submissions/data_insert/insert_query.py index e05f1832bc..f23e381581 100644 --- a/bin/migrate-oats-data/applications/submissions/data_insert/insert_query.py +++ b/bin/migrate-oats-data/applications/submissions/data_insert/insert_query.py @@ -26,6 +26,7 @@ def insert_app_sub_records( inc_exc_data_list, naru_data_list, tur_data_list, + subd_data_list, ) = prepare_app_sub_data(rows, direction_data, subdiv_data, soil_data) if len(nfu_data_list) > 0: @@ -60,6 +61,14 @@ def insert_app_sub_records( page_size=batch_size, ) + if len(subd_data_list) > 0: + execute_batch( + cursor, + get_insert_query_for_subd(), + subd_data_list, + page_size=batch_size, + ) + if len(other_data_list) > 0: execute_batch( cursor, @@ -90,7 +99,10 @@ def get_insert_query(unique_fields, unique_values): north_land_use_type, south_land_use_type, subd_proposed_lots, - purpose + purpose, + parcels_agriculture_improvement_description, + parcels_agriculture_description, + parcels_non_agriculture_use_description {unique_fields} ) VALUES ( @@ -109,7 +121,10 @@ def get_insert_query(unique_fields, unique_values): %(north_land_use_type)s, %(south_land_use_type)s, %(subd_proposed_lots)s, - %(proposal_summary_desc)s + %(proposal_summary_desc)s, + %(agricultural_improvement_desc)s, + %(current_land_use_desc)s, + %(non_agricultural_uses_desc)s {unique_values} ) """ @@ -216,3 +231,17 @@ def get_insert_query_for_tur(): %(owners_notified_ind)s """ return get_insert_query(unique_fields, unique_values) + + +def get_insert_query_for_subd(): + unique_fields = """, + subd_suitability, + subd_agriculture_support, + subd_is_home_site_severance + """ + unique_values = """, + %(proposal_background_desc)s, + %(support_desc)s, + %(homesite_severance_ind)s + """ + return get_insert_query(unique_fields, unique_values) diff --git a/bin/migrate-oats-data/applications/submissions/sql/app_submission.sql b/bin/migrate-oats-data/applications/submissions/sql/app_submission.sql index 4a200a5edb..4ad971bc94 100644 --- a/bin/migrate-oats-data/applications/submissions/sql/app_submission.sql +++ b/bin/migrate-oats-data/applications/submissions/sql/app_submission.sql @@ -34,7 +34,11 @@ SELECT oc.impact_reduction_desc, oc.owners_notified_ind, oc.applicationshare_ind, - oc.improvements_desc + oc.improvements_desc, + oc.homesite_severance_ind, + oa.current_land_use_desc, + oa.non_agricultural_uses_desc, + oa.agricultural_improvement_desc FROM appl_components_grouped acg From 9799e101363ca7406f054786e2870ee7339ca28f Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Mon, 16 Oct 2023 09:03:46 -0700 Subject: [PATCH 492/954] Code Review Feedback --- .../features/home/inbox/inbox-table/inbox-table.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.html b/portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.html index e2931775f6..e055cc552b 100644 --- a/portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.html +++ b/portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.html @@ -58,7 +58,7 @@ [pageSize]='10' [pageSizeOptions]="[5, 10, 25, 100]" (page)="onPageChange($event)" - aria-label="Select page of applications" + aria-label="Select page" ></mat-paginator> </div> </div> From e576242d8d5ed339b57efbdb7c4d8a7870635edf Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Mon, 16 Oct 2023 09:53:09 -0700 Subject: [PATCH 493/954] Add government filter to inbox search * Remove Landing Page --- portal-frontend/src/app/app-routing.module.ts | 8 ----- portal-frontend/src/app/app.module.ts | 2 -- .../authorization/authorization.component.ts | 2 +- .../src/app/features/home/home.module.ts | 12 ++++++- .../features/home/inbox/inbox.component.html | 23 ++++++++++++-- .../home/inbox/inbox.component.spec.ts | 15 ++++++++- .../features/home/inbox/inbox.component.ts | 13 +++++++- .../landing-page/landing-page.component.html | 9 ------ .../landing-page/landing-page.component.scss | 29 ----------------- .../landing-page.component.spec.ts | 29 ----------------- .../landing-page/landing-page.component.ts | 24 -------------- .../src/app/services/inbox/inbox.dto.ts | 1 + .../application/inbox-application.service.ts | 29 ++++++++++++----- .../apps/alcs/src/portal/inbox/inbox.dto.ts | 6 +--- .../inbox-notice-of-intent.service.ts | 29 ++++++++++++----- .../inbox-notification.service.ts | 31 ++++++++++++++----- 16 files changed, 126 insertions(+), 136 deletions(-) delete mode 100644 portal-frontend/src/app/features/landing-page/landing-page.component.html delete mode 100644 portal-frontend/src/app/features/landing-page/landing-page.component.scss delete mode 100644 portal-frontend/src/app/features/landing-page/landing-page.component.spec.ts delete mode 100644 portal-frontend/src/app/features/landing-page/landing-page.component.ts diff --git a/portal-frontend/src/app/app-routing.module.ts b/portal-frontend/src/app/app-routing.module.ts index cecf0d9e65..1f14a65f5d 100644 --- a/portal-frontend/src/app/app-routing.module.ts +++ b/portal-frontend/src/app/app-routing.module.ts @@ -1,8 +1,6 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; import { AuthorizationComponent } from './features/authorization/authorization.component'; -import { HomeComponent } from './features/home/home.component'; -import { LandingPageComponent } from './features/landing-page/landing-page.component'; import { LoginComponent } from './features/login/login.component'; import { AlcsAuthGuard } from './services/authentication/alcs-auth.guard'; import { AuthGuard } from './services/authentication/auth.guard'; @@ -23,12 +21,6 @@ const routes: Routes = [ canActivate: [AuthGuard], loadChildren: () => import('./features/home/home.module').then((m) => m.HomeModule), }, - { - title: 'Landing page', - path: 'landing', - component: LandingPageComponent, - canActivate: [AuthGuard], - }, { title: 'View Application', path: 'application/:fileId', diff --git a/portal-frontend/src/app/app.module.ts b/portal-frontend/src/app/app.module.ts index d760d67031..fd8c6cff4d 100644 --- a/portal-frontend/src/app/app.module.ts +++ b/portal-frontend/src/app/app.module.ts @@ -9,7 +9,6 @@ import { provideNgxMask } from 'ngx-mask'; import { AppRoutingModule } from './app-routing.module'; import { AppComponent } from './app.component'; import { AuthorizationComponent } from './features/authorization/authorization.component'; -import { LandingPageComponent } from './features/landing-page/landing-page.component'; import { LoginComponent } from './features/login/login.component'; import { AuthInterceptorService } from './services/authentication/auth-interceptor.service'; import { TokenRefreshService } from './services/authentication/token-refresh.service'; @@ -26,7 +25,6 @@ import { SharedModule } from './shared/shared.module'; FooterComponent, LoginComponent, AuthorizationComponent, - LandingPageComponent, ConfirmationDialogComponent, ], imports: [ diff --git a/portal-frontend/src/app/features/authorization/authorization.component.ts b/portal-frontend/src/app/features/authorization/authorization.component.ts index 4f82ae4781..d77b22aa50 100644 --- a/portal-frontend/src/app/features/authorization/authorization.component.ts +++ b/portal-frontend/src/app/features/authorization/authorization.component.ts @@ -19,7 +19,7 @@ export class AuthorizationComponent implements OnInit { if (targetUrl) { window.location.href = targetUrl; } else { - await this.router.navigateByUrl('/landing'); + await this.router.navigateByUrl('/home'); } } else { console.error('Failed to receive tokens from redirect'); diff --git a/portal-frontend/src/app/features/home/home.module.ts b/portal-frontend/src/app/features/home/home.module.ts index c079612eca..dc6df59417 100644 --- a/portal-frontend/src/app/features/home/home.module.ts +++ b/portal-frontend/src/app/features/home/home.module.ts @@ -1,5 +1,8 @@ import { NgModule } from '@angular/core'; +import { ReactiveFormsModule } from '@angular/forms'; +import { MatOptionModule } from '@angular/material/core'; import { MatPaginatorModule } from '@angular/material/paginator'; +import { MatSelectModule } from '@angular/material/select'; import { RouterModule, Routes } from '@angular/router'; import { SharedModule } from '../../shared/shared.module'; import { CreateSubmissionDialogComponent } from '../create-submission-dialog/create-submission-dialog.component'; @@ -23,7 +26,14 @@ const routes: Routes = [ InboxListComponent, InboxComponent, ], - imports: [SharedModule, RouterModule.forChild(routes), MatPaginatorModule], + imports: [ + SharedModule, + RouterModule.forChild(routes), + MatPaginatorModule, + MatOptionModule, + MatSelectModule, + ReactiveFormsModule, + ], providers: [], }) export class HomeModule {} diff --git a/portal-frontend/src/app/features/home/inbox/inbox.component.html b/portal-frontend/src/app/features/home/inbox/inbox.component.html index 739112b407..1b28815810 100644 --- a/portal-frontend/src/app/features/home/inbox/inbox.component.html +++ b/portal-frontend/src/app/features/home/inbox/inbox.component.html @@ -15,6 +15,21 @@ <mat-expansion-panel #panel> <div class="search-form"> + <div *ngIf="profile && (profile.isFirstNationGovernment || profile.isLocalGovernment)"> + <label for="filterBy">Filter By</label> + <mat-form-field appearance="outline"> + <mat-select id="filterBy" formControlName="filterBy"> + <mat-option value="created">Created By {{ profile.government }}</mat-option> + <mat-option value="submitted">Submitted To {{ profile.government }}</mat-option> + </mat-select> + </mat-form-field> + </div> + <div *ngIf="profile && (profile.isFirstNationGovernment || profile.isLocalGovernment)"> + <label for="governmentFileNumber">Local/First Nation Gov File Number</label> + <mat-form-field appearance="outline"> + <input id="governmentFileNumber" matInput formControlName="governmentFileNumber" /> + </mat-form-field> + </div> <div> <label for="name">Name</label> <mat-form-field appearance="outline"> @@ -35,7 +50,11 @@ <div *ngIf="pidControl.errors?.['mask']">PID must be 9 digits including leading zeroes</div> </div> </div> - <div> + <div + [ngClass]="{ + 'full-width': profile && (profile.isLocalGovernment || profile.isFirstNationGovernment) + }" + > <label for="civicAddress">Civic Address</label> <mat-form-field appearance="outline"> <input id="civicAddress" matInput formControlName="civicAddress" minlength="3" /> @@ -63,7 +82,7 @@ </mat-select> </mat-form-field> </div> - <div> + <div *ngIf="profile && !profile.isFirstNationGovernment && !profile.isLocalGovernment"> <label for="governmentFileNumber">Local/First Nation Gov File Number</label> <mat-form-field appearance="outline"> <input id="governmentFileNumber" matInput formControlName="governmentFileNumber" /> diff --git a/portal-frontend/src/app/features/home/inbox/inbox.component.spec.ts b/portal-frontend/src/app/features/home/inbox/inbox.component.spec.ts index f1103ff778..113b8544da 100644 --- a/portal-frontend/src/app/features/home/inbox/inbox.component.spec.ts +++ b/portal-frontend/src/app/features/home/inbox/inbox.component.spec.ts @@ -1,7 +1,10 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MatAutocompleteModule } from '@angular/material/autocomplete'; -import { DeepMocked } from '@golevelup/ts-jest'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { BehaviorSubject } from 'rxjs'; +import { UserDto } from '../../../services/authentication/authentication.dto'; +import { AuthenticationService } from '../../../services/authentication/authentication.service'; import { CodeService } from '../../../services/code/code.service'; import { InboxService } from '../../../services/inbox/inbox.service'; import { StatusService } from '../../../services/status/status.service'; @@ -13,8 +16,14 @@ describe('InboxComponent', () => { let component: InboxComponent; let fixture: ComponentFixture<InboxComponent>; let mockInboxService: DeepMocked<InboxService>; + let mockAuthService: DeepMocked<AuthenticationService>; beforeEach(async () => { + mockInboxService = createMock(); + mockAuthService = createMock(); + + mockAuthService.$currentProfile = new BehaviorSubject<UserDto | undefined>(undefined); + await TestBed.configureTestingModule({ imports: [MatAutocompleteModule], declarations: [InboxComponent], @@ -35,6 +44,10 @@ describe('InboxComponent', () => { provide: ToastService, useValue: {}, }, + { + provide: AuthenticationService, + useValue: mockAuthService, + }, ], schemas: [NO_ERRORS_SCHEMA], }).compileComponents(); diff --git a/portal-frontend/src/app/features/home/inbox/inbox.component.ts b/portal-frontend/src/app/features/home/inbox/inbox.component.ts index 27ce9c165e..31e70d55ef 100644 --- a/portal-frontend/src/app/features/home/inbox/inbox.component.ts +++ b/portal-frontend/src/app/features/home/inbox/inbox.component.ts @@ -9,6 +9,8 @@ import { ApplicationStatusDto, SUBMISSION_STATUS, } from '../../../services/application-submission/application-submission.dto'; +import { UserDto } from '../../../services/authentication/authentication.dto'; +import { AuthenticationService } from '../../../services/authentication/authentication.service'; import { CodeService } from '../../../services/code/code.service'; import { BaseInboxResultDto, InboxRequestDto, InboxSearchResponseDto } from '../../../services/inbox/inbox.dto'; import { InboxService } from '../../../services/inbox/inbox.service'; @@ -61,6 +63,7 @@ export class InboxComponent implements OnInit, OnDestroy { pidControl = new FormControl<string | undefined>(undefined); nameControl = new FormControl<string | undefined>(undefined); civicAddressControl = new FormControl<string | undefined>(undefined); + filterBy = new FormControl<string | undefined>(undefined); searchForm = new FormGroup({ fileNumber: new FormControl<string | undefined>(undefined), name: this.nameControl, @@ -69,6 +72,7 @@ export class InboxComponent implements OnInit, OnDestroy { portalStatus: this.portalStatusControl, componentType: this.componentTypeControl, governmentFileNumber: this.governmentFileNumber, + filterBy: this.filterBy, }); previousFileTypes: string[] = []; @@ -81,6 +85,7 @@ export class InboxComponent implements OnInit, OnDestroy { noticeOfIntentStatuses: ApplicationStatusDto[] = []; notificationStatuses: ApplicationStatusDto[] = []; allStatuses: ApplicationStatusDto[] = []; + profile: UserDto | undefined; @HostListener('window:resize', ['$event']) onWindowResize() { @@ -104,7 +109,8 @@ export class InboxComponent implements OnInit, OnDestroy { private inboxService: InboxService, private codeService: CodeService, private toastService: ToastService, - private titleService: Title + private titleService: Title, + private authenticationService: AuthenticationService ) { this.titleService.setTitle('ALC Portal | Inbox'); } @@ -117,6 +123,10 @@ export class InboxComponent implements OnInit, OnDestroy { this.setup(); + this.authenticationService.$currentProfile.pipe(takeUntil(this.$destroy)).subscribe((profile) => { + this.profile = profile; + }); + this.civicAddressControl.valueChanges.pipe(takeUntil(this.$destroy)).subscribe(() => { this.civicAddressInvalid = this.civicAddressControl.invalid && (this.civicAddressControl.dirty || this.civicAddressControl.touched); @@ -179,6 +189,7 @@ export class InboxComponent implements OnInit, OnDestroy { portalStatusCodes: searchControls.portalStatus.value ?? undefined, governmentFileNumber: this.formatStringSearchParam(searchControls.governmentFileNumber.value), fileTypes: searchControls.componentType.value ? searchControls.componentType.value : [], + filterBy: searchControls.filterBy.value ?? undefined, }; } diff --git a/portal-frontend/src/app/features/landing-page/landing-page.component.html b/portal-frontend/src/app/features/landing-page/landing-page.component.html deleted file mode 100644 index 2e8aea798e..0000000000 --- a/portal-frontend/src/app/features/landing-page/landing-page.component.html +++ /dev/null @@ -1,9 +0,0 @@ -<p class="color-accent-dark">Create and manage your Applications, Notice of Intent, and Notification of SRW.</p> - -<ul> - <li *ngFor="let item of submissionTypes" innerHtml="{{ item.label + ': ' + item.portalHtmlDescription }}"></li> -</ul> - -<div *ngIf="isControlsVisible" class="center inbox-btn-wrapper"> - <button routerLink="/home" mat-flat-button color="primary">Continue to inbox</button> -</div> diff --git a/portal-frontend/src/app/features/landing-page/landing-page.component.scss b/portal-frontend/src/app/features/landing-page/landing-page.component.scss deleted file mode 100644 index 530d995784..0000000000 --- a/portal-frontend/src/app/features/landing-page/landing-page.component.scss +++ /dev/null @@ -1,29 +0,0 @@ -@use '../../../styles/functions' as *; -@use '../../../styles/colors'; - -.color-accent-dark { - color: colors.$accent-color-dark; -} - -ul { - list-style-position: outside; - - li { - position: relative; - list-style-type: none; - } - - li:before { - content: 'arrow_right_alt'; - font-size: rem(24); - font-family: 'Material Icons'; - position: absolute; - left: rem(-36); - color: colors.$accent-color; - } -} - -.inbox-btn-wrapper { - margin-top: rem(40); - margin-bottom: rem(40); -} diff --git a/portal-frontend/src/app/features/landing-page/landing-page.component.spec.ts b/portal-frontend/src/app/features/landing-page/landing-page.component.spec.ts deleted file mode 100644 index 4a71ee238c..0000000000 --- a/portal-frontend/src/app/features/landing-page/landing-page.component.spec.ts +++ /dev/null @@ -1,29 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { LandingPageComponent } from './landing-page.component'; -import { CodeService } from '../../services/code/code.service'; - -describe('LandingPageComponent', () => { - let component: LandingPageComponent; - let fixture: ComponentFixture<LandingPageComponent>; - - beforeEach(async () => { - await TestBed.configureTestingModule({ - declarations: [LandingPageComponent], - providers: [ - { - provide: CodeService, - useValue: {}, - }, - ], - }).compileComponents(); - - fixture = TestBed.createComponent(LandingPageComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/portal-frontend/src/app/features/landing-page/landing-page.component.ts b/portal-frontend/src/app/features/landing-page/landing-page.component.ts deleted file mode 100644 index bad0265489..0000000000 --- a/portal-frontend/src/app/features/landing-page/landing-page.component.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { Component, Input, OnInit } from '@angular/core'; -import { CodeService } from '../../services/code/code.service'; -import { SubmissionTypeDto } from '../../services/code/code.dto'; - -@Component({ - selector: 'app-landing-page', - templateUrl: './landing-page.component.html', - styleUrls: ['./landing-page.component.scss'], -}) -export class LandingPageComponent implements OnInit { - @Input() isControlsVisible = true; - submissionTypes: SubmissionTypeDto[] = []; - - constructor(private codeService: CodeService) {} - - ngOnInit(): void { - this.loadCodes(); - } - - private async loadCodes() { - const codes = await this.codeService.loadCodes(); - this.submissionTypes = codes.submissionTypes.sort((a, b) => (a.code > b.code ? 1 : -1)); - } -} diff --git a/portal-frontend/src/app/services/inbox/inbox.dto.ts b/portal-frontend/src/app/services/inbox/inbox.dto.ts index c4a73f90b4..3b9f52f241 100644 --- a/portal-frontend/src/app/services/inbox/inbox.dto.ts +++ b/portal-frontend/src/app/services/inbox/inbox.dto.ts @@ -43,4 +43,5 @@ export interface InboxRequestDto extends PagingRequestDto { portalStatusCodes?: string[]; governmentFileNumber?: string; fileTypes: string[]; + filterBy?: string; } diff --git a/services/apps/alcs/src/portal/inbox/application/inbox-application.service.ts b/services/apps/alcs/src/portal/inbox/application/inbox-application.service.ts index 06d88e04da..cdbe0392a9 100644 --- a/services/apps/alcs/src/portal/inbox/application/inbox-application.service.ts +++ b/services/apps/alcs/src/portal/inbox/application/inbox-application.service.ts @@ -113,14 +113,27 @@ export class InboxApplicationService { this.applicationInboxRepository.createQueryBuilder('appSearch'); //User Permissions - query.andWhere( - '(appSearch.created_by_uuid = :userUuid OR appSearch.bceid_business_guid = :bceidBusinessGuid OR appSearch.local_government_uuid = :governmentUuid)', - { - userUuid, - bceidBusinessGuid: bceidBusinessGuid ?? 'NEVER', - governmentUuid: governmentUuid ?? 'NEVER', - }, - ); + let where = 'appSearch.created_by_uuid = :userUuid'; + if (!searchDto.filterBy) { + if (bceidBusinessGuid) { + where += ' OR appSearch.bceid_business_guid = :bceidBusinessGuid'; + } + if (governmentUuid) { + where += ' OR appSearch.local_government_uuid = :governmentUuid'; + } + } else { + if (searchDto.filterBy === 'submitted') { + where = 'appSearch.local_government_uuid = :governmentUuid'; + } else { + where = + '(appSearch.created_by_uuid = :userUuid OR appSearch.bceid_business_guid = :bceidBusinessGuid)'; + } + } + query.andWhere(`(${where})`, { + userUuid, + bceidBusinessGuid, + governmentUuid, + }); if (searchDto.fileNumber) { query diff --git a/services/apps/alcs/src/portal/inbox/inbox.dto.ts b/services/apps/alcs/src/portal/inbox/inbox.dto.ts index b654017011..ac94378583 100644 --- a/services/apps/alcs/src/portal/inbox/inbox.dto.ts +++ b/services/apps/alcs/src/portal/inbox/inbox.dto.ts @@ -40,11 +40,7 @@ export class InboxRequestDto extends PagingRequestDto { @IsString() @IsOptional() - createdByGovernment?: boolean; - - @IsString() - @IsOptional() - submittedToGovernment?: boolean; + filterBy?: string; @IsString() @IsOptional() diff --git a/services/apps/alcs/src/portal/inbox/notice-of-intent/inbox-notice-of-intent.service.ts b/services/apps/alcs/src/portal/inbox/notice-of-intent/inbox-notice-of-intent.service.ts index 196f39b395..71ed58bf06 100644 --- a/services/apps/alcs/src/portal/inbox/notice-of-intent/inbox-notice-of-intent.service.ts +++ b/services/apps/alcs/src/portal/inbox/notice-of-intent/inbox-notice-of-intent.service.ts @@ -112,14 +112,27 @@ export class InboxNoticeOfIntentService { const query = this.noiSearchRepository.createQueryBuilder('noiSearch'); //User Permissions - query.andWhere( - '(noiSearch.created_by_uuid = :userUuid OR noiSearch.bceid_business_guid = :bceidBusinessGuid OR noiSearch.local_government_uuid = :governmentUuid)', - { - userUuid, - bceidBusinessGuid: bceidBusinessGuid ?? 'NEVER', - governmentUuid: governmentUuid ?? 'NEVER', - }, - ); + let where = 'noiSearch.created_by_uuid = :userUuid'; + if (!searchDto.filterBy) { + if (bceidBusinessGuid) { + where += ' OR noiSearch.bceid_business_guid = :bceidBusinessGuid'; + } + if (governmentUuid) { + where += ' OR noiSearch.local_government_uuid = :governmentUuid'; + } + } else { + if (searchDto.filterBy === 'submitted') { + where = 'noiSearch.local_government_uuid = :governmentUuid'; + } else { + where = + '(noiSearch.created_by_uuid = :userUuid OR noiSearch.bceid_business_guid = :bceidBusinessGuid)'; + } + } + query.andWhere(`(${where})`, { + userUuid, + bceidBusinessGuid, + governmentUuid, + }); if (searchDto.fileNumber) { query diff --git a/services/apps/alcs/src/portal/inbox/notification/inbox-notification.service.ts b/services/apps/alcs/src/portal/inbox/notification/inbox-notification.service.ts index 00457cb6ea..051b6bc242 100644 --- a/services/apps/alcs/src/portal/inbox/notification/inbox-notification.service.ts +++ b/services/apps/alcs/src/portal/inbox/notification/inbox-notification.service.ts @@ -111,14 +111,29 @@ export class InboxNotificationService { this.notificationSearchViewRepo.createQueryBuilder('notificationSearch'); //User Permissions - query.andWhere( - '(notificationSearch.created_by_uuid = :userUuid OR notificationSearch.bceid_business_guid = :bceidBusinessGuid OR notificationSearch.local_government_uuid = :governmentUuid)', - { - userUuid, - bceidBusinessGuid: bceidBusinessGuid ?? false, - governmentUuid: governmentUuid ?? false, - }, - ); + let where = 'notificationSearch.created_by_uuid = :userUuid'; + if (!searchDto.filterBy) { + if (bceidBusinessGuid) { + where += + ' OR notificationSearch.bceid_business_guid = :bceidBusinessGuid'; + } + if (governmentUuid) { + where += + ' OR notificationSearch.local_government_uuid = :governmentUuid'; + } + } else { + if (searchDto.filterBy === 'submitted') { + where = 'notificationSearch.local_government_uuid = :governmentUuid'; + } else { + where = + '(notificationSearch.created_by_uuid = :userUuid OR notificationSearch.bceid_business_guid = :bceidBusinessGuid)'; + } + } + query.andWhere(`(${where})`, { + userUuid, + bceidBusinessGuid, + governmentUuid, + }); if (searchDto.fileNumber) { query = query From ed11ae5f0afce2cf4ba018a94f2f9317b029e57c Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Mon, 16 Oct 2023 10:35:17 -0700 Subject: [PATCH 494/954] Fix Sorting --- .../src/app/features/home/home.module.ts | 10 ++----- .../inbox-table/inbox-table.component.html | 4 +-- .../features/home/inbox/inbox.component.ts | 7 ----- .../src/app/services/inbox/inbox.dto.ts | 2 -- .../src/app/shared/shared.module.ts | 1 - .../inbox-application.service.spec.ts | 2 -- .../application/inbox-application.service.ts | 24 +---------------- .../src/portal/inbox/inbox.controller.spec.ts | 12 --------- .../apps/alcs/src/portal/inbox/inbox.dto.ts | 16 +++++++++-- .../inbox-notice-of-intent.service.spec.ts | 2 -- .../inbox-notice-of-intent.service.ts | 27 +------------------ .../inbox-notification.service.spec.ts | 2 -- .../inbox-notification.service.ts | 27 +------------------ 13 files changed, 21 insertions(+), 115 deletions(-) diff --git a/portal-frontend/src/app/features/home/home.module.ts b/portal-frontend/src/app/features/home/home.module.ts index dc6df59417..e60c93f57e 100644 --- a/portal-frontend/src/app/features/home/home.module.ts +++ b/portal-frontend/src/app/features/home/home.module.ts @@ -3,6 +3,7 @@ import { ReactiveFormsModule } from '@angular/forms'; import { MatOptionModule } from '@angular/material/core'; import { MatPaginatorModule } from '@angular/material/paginator'; import { MatSelectModule } from '@angular/material/select'; +import { MatSortModule } from '@angular/material/sort'; import { RouterModule, Routes } from '@angular/router'; import { SharedModule } from '../../shared/shared.module'; import { CreateSubmissionDialogComponent } from '../create-submission-dialog/create-submission-dialog.component'; @@ -26,14 +27,7 @@ const routes: Routes = [ InboxListComponent, InboxComponent, ], - imports: [ - SharedModule, - RouterModule.forChild(routes), - MatPaginatorModule, - MatOptionModule, - MatSelectModule, - ReactiveFormsModule, - ], + imports: [SharedModule, RouterModule.forChild(routes), MatPaginatorModule, MatOptionModule], providers: [], }) export class HomeModule {} diff --git a/portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.html b/portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.html index e055cc552b..d90dbb76a4 100644 --- a/portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.html +++ b/portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.html @@ -10,7 +10,7 @@ </tr> <ng-container matColumnDef="fileNumber"> - <th mat-header-cell *matHeaderCellDef>Application ID</th> + <th mat-header-cell *matHeaderCellDef>{{ type }} ID</th> <td mat-cell *matCellDef="let row">{{ row.fileNumber }}</td> </ng-container> @@ -55,7 +55,7 @@ </table> <mat-paginator [length]="_totalCount" - [pageSize]='10' + [pageSize]="10" [pageSizeOptions]="[5, 10, 25, 100]" (page)="onPageChange($event)" aria-label="Select page" diff --git a/portal-frontend/src/app/features/home/inbox/inbox.component.ts b/portal-frontend/src/app/features/home/inbox/inbox.component.ts index 31e70d55ef..b985860311 100644 --- a/portal-frontend/src/app/features/home/inbox/inbox.component.ts +++ b/portal-frontend/src/app/features/home/inbox/inbox.component.ts @@ -54,8 +54,6 @@ export class InboxComponent implements OnInit, OnDestroy { pageIndex = 0; itemsPerPage = 20; - sortDirection = 'DESC'; - sortField = 'dateSubmitted'; governmentFileNumber = new FormControl<string | undefined>(undefined); portalStatusControl = new FormControl<string[]>([]); @@ -178,9 +176,6 @@ export class InboxComponent implements OnInit, OnDestroy { // pagination pageSize: this.itemsPerPage, page: this.pageIndex + 1, - // sorting - sortField: this.sortField, - sortDirection: this.sortDirection, // search parameters fileNumber: this.formatStringSearchParam(searchControls.fileNumber.value), name: this.formatStringSearchParam(searchControls.name.value), @@ -278,8 +273,6 @@ export class InboxComponent implements OnInit, OnDestroy { async onTableChange(event: TableChange) { this.pageIndex = event.pageIndex; this.itemsPerPage = event.itemsPerPage; - this.sortDirection = event.sortDirection; - this.sortField = event.sortField; switch (event.tableType) { case 'APP': diff --git a/portal-frontend/src/app/services/inbox/inbox.dto.ts b/portal-frontend/src/app/services/inbox/inbox.dto.ts index 3b9f52f241..3e8a0a4ffa 100644 --- a/portal-frontend/src/app/services/inbox/inbox.dto.ts +++ b/portal-frontend/src/app/services/inbox/inbox.dto.ts @@ -31,8 +31,6 @@ export interface InboxResponseDto<T> { export interface PagingRequestDto { pageSize: number; page: number; - sortField: string; - sortDirection: string; } export interface InboxRequestDto extends PagingRequestDto { diff --git a/portal-frontend/src/app/shared/shared.module.ts b/portal-frontend/src/app/shared/shared.module.ts index 01c4331611..550ab98561 100644 --- a/portal-frontend/src/app/shared/shared.module.ts +++ b/portal-frontend/src/app/shared/shared.module.ts @@ -21,7 +21,6 @@ import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; import { MatRadioModule } from '@angular/material/radio'; import { MatSelectModule } from '@angular/material/select'; import { MatSnackBarModule } from '@angular/material/snack-bar'; -import { MatSortModule } from '@angular/material/sort'; import { MatStepperModule } from '@angular/material/stepper'; import { MatTableModule } from '@angular/material/table'; import { MatTabsModule } from '@angular/material/tabs'; diff --git a/services/apps/alcs/src/portal/inbox/application/inbox-application.service.spec.ts b/services/apps/alcs/src/portal/inbox/application/inbox-application.service.spec.ts index 5489d70b3d..fcc9e9c9cd 100644 --- a/services/apps/alcs/src/portal/inbox/application/inbox-application.service.spec.ts +++ b/services/apps/alcs/src/portal/inbox/application/inbox-application.service.spec.ts @@ -21,8 +21,6 @@ describe('InboxApplicationService', () => { fileTypes: ['type1', 'type2'], page: 1, pageSize: 10, - sortField: 'ownerName', - sortDirection: 'ASC', }; let mockQuery: any = {}; diff --git a/services/apps/alcs/src/portal/inbox/application/inbox-application.service.ts b/services/apps/alcs/src/portal/inbox/application/inbox-application.service.ts index cdbe0392a9..0024bf5887 100644 --- a/services/apps/alcs/src/portal/inbox/application/inbox-application.service.ts +++ b/services/apps/alcs/src/portal/inbox/application/inbox-application.service.ts @@ -30,10 +30,8 @@ export class InboxApplicationService { ); query = this.compileApplicationGroupBySearchQuery(query); - const sortQuery = this.compileSortQuery(searchDto); - query = query - .orderBy(sortQuery, searchDto.sortDirection) + .orderBy('"appSearch"."last_update"', 'DESC') .offset((searchDto.page - 1) * searchDto.pageSize) .limit(searchDto.pageSize); @@ -45,26 +43,6 @@ export class InboxApplicationService { }; } - private compileSortQuery(searchDto: InboxRequestDto) { - switch (searchDto.sortField) { - case 'fileId': - return '"appSearch"."file_number"'; - - case 'ownerName': - return '"appSearch"."applicant"'; - - case 'type': - return '"appSearch"."application_type_code"'; - - case 'portalStatus': - return `"appSearch"."status" ->> 'label' `; - - default: - case 'lastUpdate': - return '"appSearch"."last_update"'; - } - } - private compileApplicationGroupBySearchQuery(query) { query = query .innerJoinAndMapOne( diff --git a/services/apps/alcs/src/portal/inbox/inbox.controller.spec.ts b/services/apps/alcs/src/portal/inbox/inbox.controller.spec.ts index 9673c38697..ad0e7b5ce1 100644 --- a/services/apps/alcs/src/portal/inbox/inbox.controller.spec.ts +++ b/services/apps/alcs/src/portal/inbox/inbox.controller.spec.ts @@ -118,8 +118,6 @@ describe('InboxController', () => { const mockSearchRequestDto: InboxRequestDto = { pageSize: 1, page: 1, - sortField: '1', - sortDirection: 'ASC', name: 'test', fileTypes: [], }; @@ -151,8 +149,6 @@ describe('InboxController', () => { const mockSearchRequestDto: InboxRequestDto = { pageSize: 1, page: 1, - sortField: '1', - sortDirection: 'ASC', fileTypes: [], }; @@ -176,8 +172,6 @@ describe('InboxController', () => { const mockSearchRequestDto: InboxRequestDto = { pageSize: 1, page: 1, - sortField: '1', - sortDirection: 'ASC', fileTypes: [], }; @@ -201,8 +195,6 @@ describe('InboxController', () => { const mockSearchRequestDto: InboxRequestDto = { pageSize: 1, page: 1, - sortField: '1', - sortDirection: 'ASC', fileTypes: ['NFUP'], }; @@ -223,8 +215,6 @@ describe('InboxController', () => { const mockSearchRequestDto: InboxRequestDto = { pageSize: 1, page: 1, - sortField: '1', - sortDirection: 'ASC', fileTypes: ['NOI'], }; @@ -245,8 +235,6 @@ describe('InboxController', () => { const mockSearchRequestDto: InboxRequestDto = { pageSize: 1, page: 1, - sortField: '1', - sortDirection: 'ASC', fileTypes: ['NFUP'], }; diff --git a/services/apps/alcs/src/portal/inbox/inbox.dto.ts b/services/apps/alcs/src/portal/inbox/inbox.dto.ts index ac94378583..78c8ac6b95 100644 --- a/services/apps/alcs/src/portal/inbox/inbox.dto.ts +++ b/services/apps/alcs/src/portal/inbox/inbox.dto.ts @@ -1,4 +1,10 @@ -import { IsArray, IsOptional, IsString, MinLength } from 'class-validator'; +import { + IsArray, + IsNumber, + IsOptional, + IsString, + MinLength, +} from 'class-validator'; import { PagingRequestDto } from '../public/search/public-search.dto'; export type SearchEntityClass = 'APP' | 'NOI' | 'NOTI'; @@ -33,7 +39,13 @@ export class AdvancedSearchResultDto<T> { total: number; } -export class InboxRequestDto extends PagingRequestDto { +export class InboxRequestDto { + @IsNumber() + page: number; + + @IsNumber() + pageSize: number; + @IsString() @IsOptional() fileNumber?: string; diff --git a/services/apps/alcs/src/portal/inbox/notice-of-intent/inbox-notice-of-intent.service.spec.ts b/services/apps/alcs/src/portal/inbox/notice-of-intent/inbox-notice-of-intent.service.spec.ts index 3fdcafddd5..572e168f0e 100644 --- a/services/apps/alcs/src/portal/inbox/notice-of-intent/inbox-notice-of-intent.service.spec.ts +++ b/services/apps/alcs/src/portal/inbox/notice-of-intent/inbox-notice-of-intent.service.spec.ts @@ -22,8 +22,6 @@ describe('InboxNoticeOfIntentService', () => { fileTypes: ['type1', 'type2'], page: 1, pageSize: 10, - sortField: 'ownerName', - sortDirection: 'ASC', }; let mockQuery: any = {}; diff --git a/services/apps/alcs/src/portal/inbox/notice-of-intent/inbox-notice-of-intent.service.ts b/services/apps/alcs/src/portal/inbox/notice-of-intent/inbox-notice-of-intent.service.ts index 71ed58bf06..dc2174ec8d 100644 --- a/services/apps/alcs/src/portal/inbox/notice-of-intent/inbox-notice-of-intent.service.ts +++ b/services/apps/alcs/src/portal/inbox/notice-of-intent/inbox-notice-of-intent.service.ts @@ -30,10 +30,8 @@ export class InboxNoticeOfIntentService { this.compileGroupBySearchQuery(query); - const sortQuery = this.compileSortQuery(searchDto); - query - .orderBy(sortQuery, searchDto.sortDirection) + .orderBy('"noiSearch"."last_update"', 'DESC') .offset((searchDto.page - 1) * searchDto.pageSize) .limit(searchDto.pageSize); @@ -45,29 +43,6 @@ export class InboxNoticeOfIntentService { }; } - private compileSortQuery(searchDto: InboxRequestDto) { - switch (searchDto.sortField) { - case 'fileId': - return '"noiSearch"."file_number"'; - - case 'ownerName': - return '"noiSearch"."applicant"'; - - case 'type': - return '"noiSearch"."notice_of_intent_type_code"'; - - case 'government': - return '"noiSearch"."local_government_name"'; - - case 'portalStatus': - return `"noiSearch"."status" ->> 'label' `; - - default: - case 'lastUpdate': - return '"noiSearch"."last_update"'; - } - } - private compileGroupBySearchQuery(query) { query = query .innerJoinAndMapOne( diff --git a/services/apps/alcs/src/portal/inbox/notification/inbox-notification.service.spec.ts b/services/apps/alcs/src/portal/inbox/notification/inbox-notification.service.spec.ts index d1dfc887eb..aa95485fce 100644 --- a/services/apps/alcs/src/portal/inbox/notification/inbox-notification.service.spec.ts +++ b/services/apps/alcs/src/portal/inbox/notification/inbox-notification.service.spec.ts @@ -22,8 +22,6 @@ describe('InboxNotificationService', () => { fileTypes: ['type1', 'type2'], page: 1, pageSize: 10, - sortField: 'ownerName', - sortDirection: 'ASC', }; let mockQuery: any = {}; diff --git a/services/apps/alcs/src/portal/inbox/notification/inbox-notification.service.ts b/services/apps/alcs/src/portal/inbox/notification/inbox-notification.service.ts index 051b6bc242..0518b097e2 100644 --- a/services/apps/alcs/src/portal/inbox/notification/inbox-notification.service.ts +++ b/services/apps/alcs/src/portal/inbox/notification/inbox-notification.service.ts @@ -29,10 +29,8 @@ export class InboxNotificationService { query = this.compileGroupBySearchQuery(query); - const sortQuery = this.compileSortQuery(searchDto); - query = query - .orderBy(sortQuery, searchDto.sortDirection) + .orderBy(`("notificationSearch"."status" ->> 'effective_date')`, 'DESC') .offset((searchDto.page - 1) * searchDto.pageSize) .limit(searchDto.pageSize); @@ -44,29 +42,6 @@ export class InboxNotificationService { }; } - private compileSortQuery(searchDto: InboxRequestDto) { - switch (searchDto.sortField) { - case 'fileId': - return '"notificationSearch"."file_number"'; - - case 'ownerName': - return '"notificationSearch"."applicant"'; - - case 'type': - return '"notificationSearch"."notification_type_code"'; - - case 'government': - return '"notificationSearch"."local_government_name"'; - - case 'portalStatus': - return `"notificationSearch"."status" ->> 'label' `; - - default: - case 'lastUpdate': - return `"notificationSearch"."status" ->> 'effectiveDate' `; - } - } - private compileGroupBySearchQuery(query) { query = query .innerJoinAndMapOne( From e398b6909212e6ba4a009c9d36881de43b1bd190 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Mon, 16 Oct 2023 11:22:06 -0700 Subject: [PATCH 495/954] Fix Migration --- .../1697131320873-add_inbox_views.ts | 57 ------------------- 1 file changed, 57 deletions(-) diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1697131320873-add_inbox_views.ts b/services/apps/alcs/src/providers/typeorm/migrations/1697131320873-add_inbox_views.ts index c1e55fcc19..fd37330d40 100644 --- a/services/apps/alcs/src/providers/typeorm/migrations/1697131320873-add_inbox_views.ts +++ b/services/apps/alcs/src/providers/typeorm/migrations/1697131320873-add_inbox_views.ts @@ -4,27 +4,6 @@ export class addInboxViews1697131320873 implements MigrationInterface { name = 'addInboxViews1697131320873'; public async up(queryRunner: QueryRunner): Promise<void> { - await queryRunner.query( - `DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, - ['VIEW', 'inbox_notification_submission_view', 'alcs'], - ); - await queryRunner.query( - `DROP VIEW "alcs"."inbox_notification_submission_view"`, - ); - await queryRunner.query( - `DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, - ['VIEW', 'inbox_notice_of_intent_submission_view', 'alcs'], - ); - await queryRunner.query( - `DROP VIEW "alcs"."inbox_notice_of_intent_submission_view"`, - ); - await queryRunner.query( - `DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, - ['VIEW', 'inbox_application_submission_view', 'alcs'], - ); - await queryRunner.query( - `DROP VIEW "alcs"."inbox_application_submission_view"`, - ); await queryRunner.query( `CREATE VIEW "alcs"."inbox_notice_of_intent_submission_view" AS SELECT "noi_sub"."uuid" AS "uuid", "noi_sub"."applicant" AS "applicant", "noi"."uuid" AS "notice_of_intent_uuid", "noticeOfIntentType"."audit_deleted_date_at" AS "noticeOfIntentType_audit_deleted_date_at", "noticeOfIntentType"."audit_created_at" AS "noticeOfIntentType_audit_created_at", "noticeOfIntentType"."audit_updated_at" AS "noticeOfIntentType_audit_updated_at", "noticeOfIntentType"."audit_created_by" AS "noticeOfIntentType_audit_created_by", "noticeOfIntentType"."audit_updated_by" AS "noticeOfIntentType_audit_updated_by", "noticeOfIntentType"."label" AS "noticeOfIntentType_label", "noticeOfIntentType"."code" AS "noticeOfIntentType_code", "noticeOfIntentType"."description" AS "noticeOfIntentType_description", "noticeOfIntentType"."short_label" AS "noticeOfIntentType_short_label", "noticeOfIntentType"."background_color" AS "noticeOfIntentType_background_color", "noticeOfIntentType"."text_color" AS "noticeOfIntentType_text_color", "noticeOfIntentType"."html_description" AS "noticeOfIntentType_html_description", "noticeOfIntentType"."portal_label" AS "noticeOfIntentType_portal_label", "noi_sub"."file_number" AS "file_number", "noi_sub"."audit_created_at" AS "created_at", "noi_sub"."created_by_uuid" AS "created_by_uuid", "noi_sub"."local_government_uuid" AS "local_government_uuid", "localGovernment"."bceid_business_guid" AS "bceid_business_guid", "noi_sub"."type_code" AS "notice_of_intent_type_code", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid") AS "status" FROM "alcs"."notice_of_intent_submission" "noi_sub" INNER JOIN "alcs"."notice_of_intent" "noi" ON "noi"."file_number" = "noi_sub"."file_number" AND "noi"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."notice_of_intent_type" "noticeOfIntentType" ON "noi_sub"."type_code" = "noticeOfIntentType"."code" AND "noticeOfIntentType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "noi_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."notice_of_intent_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "noi_sub"."uuid" LEFT JOIN (SELECT MAX("date") AS "date", notice_of_intent_uuid AS "notice_of_intent_uuid" FROM "alcs"."notice_of_intent_decision" "decision_date" WHERE "decision_date"."audit_deleted_date_at" IS NULL GROUP BY notice_of_intent_uuid) "decision_date" ON decision_date."notice_of_intent_uuid" = "noi"."uuid" WHERE ( "noi_sub"."is_draft" = FALSE ) AND ( "noi_sub"."audit_deleted_date_at" IS NULL )`, ); @@ -85,41 +64,5 @@ export class addInboxViews1697131320873 implements MigrationInterface { await queryRunner.query( `DROP VIEW "alcs"."inbox_notice_of_intent_submission_view"`, ); - await queryRunner.query( - `CREATE VIEW "alcs"."inbox_application_submission_view" AS SELECT "app_sub"."uuid" AS "uuid", "app_sub"."applicant" AS "applicant", "app"."uuid" AS "application_uuid", "applicationType"."audit_deleted_date_at" AS "applicationType_audit_deleted_date_at", "applicationType"."audit_created_at" AS "applicationType_audit_created_at", "applicationType"."audit_updated_at" AS "applicationType_audit_updated_at", "applicationType"."audit_created_by" AS "applicationType_audit_created_by", "applicationType"."audit_updated_by" AS "applicationType_audit_updated_by", "applicationType"."label" AS "applicationType_label", "applicationType"."code" AS "applicationType_code", "applicationType"."description" AS "applicationType_description", "applicationType"."short_label" AS "applicationType_short_label", "applicationType"."background_color" AS "applicationType_background_color", "applicationType"."text_color" AS "applicationType_text_color", "applicationType"."html_description" AS "applicationType_html_description", "applicationType"."portal_label" AS "applicationType_portal_label", "localGovernment"."name" AS "local_government_name", "app_sub"."file_number" AS "file_number", "app_sub"."created_by_uuid" AS "created_by_uuid", "app_sub"."local_government_uuid" AS "local_government_uuid", "localGovernment"."bceid_business_guid" AS "bceid_business_guid", "app_sub"."type_code" AS "application_type_code", "app_rev"."local_government_file_number" AS "local_government_file_number", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid") AS "status" FROM "alcs"."application_submission" "app_sub" INNER JOIN "alcs"."application" "app" ON "app"."file_number" = "app_sub"."file_number" AND "app"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."application_submission_review" "app_rev" ON "app"."file_number" = "app_rev"."application_file_number" AND "app_rev"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."application_type" "applicationType" ON "app_sub"."type_code" = "applicationType"."code" AND "applicationType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "app_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."application_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "app_sub"."uuid" LEFT JOIN (SELECT MAX("date") AS "date", application_uuid AS "application_uuid" FROM "alcs"."application_decision" "decision_date" WHERE "decision_date"."audit_deleted_date_at" IS NULL GROUP BY application_uuid) "decision_date" ON decision_date."application_uuid" = "app"."uuid" WHERE ( "app_sub"."is_draft" = FALSE ) AND ( "app_sub"."audit_deleted_date_at" IS NULL )`, - ); - await queryRunner.query( - `INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, - [ - 'alcs', - 'VIEW', - 'inbox_application_submission_view', - 'SELECT "app_sub"."uuid" AS "uuid", "app_sub"."applicant" AS "applicant", "app"."uuid" AS "application_uuid", "applicationType"."audit_deleted_date_at" AS "applicationType_audit_deleted_date_at", "applicationType"."audit_created_at" AS "applicationType_audit_created_at", "applicationType"."audit_updated_at" AS "applicationType_audit_updated_at", "applicationType"."audit_created_by" AS "applicationType_audit_created_by", "applicationType"."audit_updated_by" AS "applicationType_audit_updated_by", "applicationType"."label" AS "applicationType_label", "applicationType"."code" AS "applicationType_code", "applicationType"."description" AS "applicationType_description", "applicationType"."short_label" AS "applicationType_short_label", "applicationType"."background_color" AS "applicationType_background_color", "applicationType"."text_color" AS "applicationType_text_color", "applicationType"."html_description" AS "applicationType_html_description", "applicationType"."portal_label" AS "applicationType_portal_label", "localGovernment"."name" AS "local_government_name", "app_sub"."file_number" AS "file_number", "app_sub"."created_by_uuid" AS "created_by_uuid", "app_sub"."local_government_uuid" AS "local_government_uuid", "localGovernment"."bceid_business_guid" AS "bceid_business_guid", "app_sub"."type_code" AS "application_type_code", "app_rev"."local_government_file_number" AS "local_government_file_number", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid") AS "status" FROM "alcs"."application_submission" "app_sub" INNER JOIN "alcs"."application" "app" ON "app"."file_number" = "app_sub"."file_number" AND "app"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."application_submission_review" "app_rev" ON "app"."file_number" = "app_rev"."application_file_number" AND "app_rev"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."application_type" "applicationType" ON "app_sub"."type_code" = "applicationType"."code" AND "applicationType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "app_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."application_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "app_sub"."uuid" LEFT JOIN (SELECT MAX("date") AS "date", application_uuid AS "application_uuid" FROM "alcs"."application_decision" "decision_date" WHERE "decision_date"."audit_deleted_date_at" IS NULL GROUP BY application_uuid) "decision_date" ON decision_date."application_uuid" = "app"."uuid" WHERE ( "app_sub"."is_draft" = FALSE ) AND ( "app_sub"."audit_deleted_date_at" IS NULL )', - ], - ); - await queryRunner.query( - `CREATE VIEW "alcs"."inbox_notice_of_intent_submission_view" AS SELECT "noi_sub"."uuid" AS "uuid", "noi_sub"."applicant" AS "applicant", "noi"."uuid" AS "notice_of_intent_uuid", "noticeOfIntentType"."audit_deleted_date_at" AS "noticeOfIntentType_audit_deleted_date_at", "noticeOfIntentType"."audit_created_at" AS "noticeOfIntentType_audit_created_at", "noticeOfIntentType"."audit_updated_at" AS "noticeOfIntentType_audit_updated_at", "noticeOfIntentType"."audit_created_by" AS "noticeOfIntentType_audit_created_by", "noticeOfIntentType"."audit_updated_by" AS "noticeOfIntentType_audit_updated_by", "noticeOfIntentType"."label" AS "noticeOfIntentType_label", "noticeOfIntentType"."code" AS "noticeOfIntentType_code", "noticeOfIntentType"."description" AS "noticeOfIntentType_description", "noticeOfIntentType"."short_label" AS "noticeOfIntentType_short_label", "noticeOfIntentType"."background_color" AS "noticeOfIntentType_background_color", "noticeOfIntentType"."text_color" AS "noticeOfIntentType_text_color", "noticeOfIntentType"."html_description" AS "noticeOfIntentType_html_description", "noticeOfIntentType"."portal_label" AS "noticeOfIntentType_portal_label", "noi_sub"."file_number" AS "file_number", "noi_sub"."created_by_uuid" AS "created_by_uuid", "noi_sub"."local_government_uuid" AS "local_government_uuid", "localGovernment"."bceid_business_guid" AS "bceid_business_guid", "noi_sub"."type_code" AS "notice_of_intent_type_code", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid") AS "status" FROM "alcs"."notice_of_intent_submission" "noi_sub" INNER JOIN "alcs"."notice_of_intent" "noi" ON "noi"."file_number" = "noi_sub"."file_number" AND "noi"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."notice_of_intent_type" "noticeOfIntentType" ON "noi_sub"."type_code" = "noticeOfIntentType"."code" AND "noticeOfIntentType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "noi_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."notice_of_intent_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "noi_sub"."uuid" LEFT JOIN (SELECT MAX("date") AS "date", notice_of_intent_uuid AS "notice_of_intent_uuid" FROM "alcs"."notice_of_intent_decision" "decision_date" WHERE "decision_date"."audit_deleted_date_at" IS NULL GROUP BY notice_of_intent_uuid) "decision_date" ON decision_date."notice_of_intent_uuid" = "noi"."uuid" WHERE ( "noi_sub"."is_draft" = FALSE ) AND ( "noi_sub"."audit_deleted_date_at" IS NULL )`, - ); - await queryRunner.query( - `INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, - [ - 'alcs', - 'VIEW', - 'inbox_notice_of_intent_submission_view', - 'SELECT "noi_sub"."uuid" AS "uuid", "noi_sub"."applicant" AS "applicant", "noi"."uuid" AS "notice_of_intent_uuid", "noticeOfIntentType"."audit_deleted_date_at" AS "noticeOfIntentType_audit_deleted_date_at", "noticeOfIntentType"."audit_created_at" AS "noticeOfIntentType_audit_created_at", "noticeOfIntentType"."audit_updated_at" AS "noticeOfIntentType_audit_updated_at", "noticeOfIntentType"."audit_created_by" AS "noticeOfIntentType_audit_created_by", "noticeOfIntentType"."audit_updated_by" AS "noticeOfIntentType_audit_updated_by", "noticeOfIntentType"."label" AS "noticeOfIntentType_label", "noticeOfIntentType"."code" AS "noticeOfIntentType_code", "noticeOfIntentType"."description" AS "noticeOfIntentType_description", "noticeOfIntentType"."short_label" AS "noticeOfIntentType_short_label", "noticeOfIntentType"."background_color" AS "noticeOfIntentType_background_color", "noticeOfIntentType"."text_color" AS "noticeOfIntentType_text_color", "noticeOfIntentType"."html_description" AS "noticeOfIntentType_html_description", "noticeOfIntentType"."portal_label" AS "noticeOfIntentType_portal_label", "noi_sub"."file_number" AS "file_number", "noi_sub"."created_by_uuid" AS "created_by_uuid", "noi_sub"."local_government_uuid" AS "local_government_uuid", "localGovernment"."bceid_business_guid" AS "bceid_business_guid", "noi_sub"."type_code" AS "notice_of_intent_type_code", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid") AS "status" FROM "alcs"."notice_of_intent_submission" "noi_sub" INNER JOIN "alcs"."notice_of_intent" "noi" ON "noi"."file_number" = "noi_sub"."file_number" AND "noi"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."notice_of_intent_type" "noticeOfIntentType" ON "noi_sub"."type_code" = "noticeOfIntentType"."code" AND "noticeOfIntentType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "noi_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."notice_of_intent_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "noi_sub"."uuid" LEFT JOIN (SELECT MAX("date") AS "date", notice_of_intent_uuid AS "notice_of_intent_uuid" FROM "alcs"."notice_of_intent_decision" "decision_date" WHERE "decision_date"."audit_deleted_date_at" IS NULL GROUP BY notice_of_intent_uuid) "decision_date" ON decision_date."notice_of_intent_uuid" = "noi"."uuid" WHERE ( "noi_sub"."is_draft" = FALSE ) AND ( "noi_sub"."audit_deleted_date_at" IS NULL )', - ], - ); - await queryRunner.query( - `CREATE VIEW "alcs"."inbox_notification_submission_view" AS SELECT "noti_sub"."uuid" AS "uuid", "noti_sub"."applicant" AS "applicant", "noti"."uuid" AS "notification_uuid", "notificationType"."audit_deleted_date_at" AS "notificationType_audit_deleted_date_at", "notificationType"."audit_created_at" AS "notificationType_audit_created_at", "notificationType"."audit_updated_at" AS "notificationType_audit_updated_at", "notificationType"."audit_created_by" AS "notificationType_audit_created_by", "notificationType"."audit_updated_by" AS "notificationType_audit_updated_by", "notificationType"."label" AS "notificationType_label", "notificationType"."code" AS "notificationType_code", "notificationType"."description" AS "notificationType_description", "notificationType"."short_label" AS "notificationType_short_label", "notificationType"."background_color" AS "notificationType_background_color", "notificationType"."text_color" AS "notificationType_text_color", "notificationType"."html_description" AS "notificationType_html_description", "notificationType"."portal_label" AS "notificationType_portal_label", "noti_sub"."file_number" AS "file_number", "noti_sub"."created_by_uuid" AS "created_by_uuid", "noti_sub"."local_government_uuid" AS "local_government_uuid", "localGovernment"."bceid_business_guid" AS "bceid_business_guid", "noti"."type_code" AS "notification_type_code", "noti"."date_submitted_to_alc" AS "date_submitted_to_alc", alcs.get_current_status_for_notification_submission_by_uuid("noti_sub"."uuid") AS "status" FROM "alcs"."notification_submission" "noti_sub" INNER JOIN "alcs"."notification" "noti" ON "noti"."file_number" = "noti_sub"."file_number" AND "noti"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."notification_type" "notificationType" ON "noti_sub"."type_code" = "notificationType"."code" AND "notificationType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "noti"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL WHERE "noti_sub"."audit_deleted_date_at" IS NULL`, - ); - await queryRunner.query( - `INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, - [ - 'alcs', - 'VIEW', - 'inbox_notification_submission_view', - 'SELECT "noti_sub"."uuid" AS "uuid", "noti_sub"."applicant" AS "applicant", "noti"."uuid" AS "notification_uuid", "notificationType"."audit_deleted_date_at" AS "notificationType_audit_deleted_date_at", "notificationType"."audit_created_at" AS "notificationType_audit_created_at", "notificationType"."audit_updated_at" AS "notificationType_audit_updated_at", "notificationType"."audit_created_by" AS "notificationType_audit_created_by", "notificationType"."audit_updated_by" AS "notificationType_audit_updated_by", "notificationType"."label" AS "notificationType_label", "notificationType"."code" AS "notificationType_code", "notificationType"."description" AS "notificationType_description", "notificationType"."short_label" AS "notificationType_short_label", "notificationType"."background_color" AS "notificationType_background_color", "notificationType"."text_color" AS "notificationType_text_color", "notificationType"."html_description" AS "notificationType_html_description", "notificationType"."portal_label" AS "notificationType_portal_label", "noti_sub"."file_number" AS "file_number", "noti_sub"."created_by_uuid" AS "created_by_uuid", "noti_sub"."local_government_uuid" AS "local_government_uuid", "localGovernment"."bceid_business_guid" AS "bceid_business_guid", "noti"."type_code" AS "notification_type_code", "noti"."date_submitted_to_alc" AS "date_submitted_to_alc", alcs.get_current_status_for_notification_submission_by_uuid("noti_sub"."uuid") AS "status" FROM "alcs"."notification_submission" "noti_sub" INNER JOIN "alcs"."notification" "noti" ON "noti"."file_number" = "noti_sub"."file_number" AND "noti"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."notification_type" "notificationType" ON "noti_sub"."type_code" = "notificationType"."code" AND "notificationType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "noti"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL WHERE "noti_sub"."audit_deleted_date_at" IS NULL', - ], - ); } } From 8d8e02d812559c3675e4c9d1d4c1d4ff1311a9bc Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Mon, 16 Oct 2023 13:37:18 -0700 Subject: [PATCH 496/954] Public View Fixes * Fix spacing of soil table * Remove "Parcel Information" heading * Remove Parcel SCSS so it spaces the same as other tables --- .../parcel/parcel.component.html | 1 - .../parcel/parcel.component.html | 1 - .../notification-details.component.ts | 3 - .../notice-of-intent-details.component.scss | 8 -- .../pfrs-details/pfrs-details.component.html | 1 + .../roso-details/roso-details.component.html | 2 - .../proposal-details.component.html | 2 +- .../submission/parcel/parcel.component.html | 1 - .../submission/parcel/parcel.component.scss | 8 -- .../submission/parcel/parcel.component.html | 1 - .../submission/parcel/parcel.component.scss | 8 -- .../pfrs-details/pfrs-details.component.scss | 7 +- .../pofo-details/pofo-details.component.html | 54 ++++----- .../pofo-details/pofo-details.component.scss | 8 -- .../roso-details/roso-details.component.html | 112 +++++++++--------- .../submission-details.component.scss | 2 - .../proposal-details.component.html | 2 +- 17 files changed, 87 insertions(+), 134 deletions(-) diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/parcel/parcel.component.html b/alcs-frontend/src/app/features/application/applicant-info/application-details/parcel/parcel.component.html index b5f7fc2641..5c8c151124 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/application-details/parcel/parcel.component.html +++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/parcel/parcel.component.html @@ -15,7 +15,6 @@ <h3 class="flex-item"> <div class="full-width flex-space-between-wrap"> <h4 [id]="parcel.uuid">Parcel {{ parcelInd + 1 }}: Parcel and Owner Information</h4> </div> - <div class="full-width subheading1">Parcel Information</div> <div class="subheading2 grid-1">Ownership Type</div> <div class="grid-double"> {{ parcel.ownershipType?.label }} diff --git a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/parcel/parcel.component.html b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/parcel/parcel.component.html index 7ad420667a..761a1bfc18 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/parcel/parcel.component.html +++ b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/parcel/parcel.component.html @@ -5,7 +5,6 @@ <h3 class="flex-item">Notice of Intent Parcels</h3> <div class="full-width flex-space-between-wrap"> <h4 [id]="parcel.uuid">Parcel {{ parcelInd + 1 }}: Parcel and Owner Information</h4> </div> - <div class="full-width subheading1">Parcel Information</div> <div class="subheading2 grid-1">Ownership Type</div> <div class="grid-double"> {{ parcel.ownershipType?.label }} diff --git a/alcs-frontend/src/app/features/notification/applicant-info/notification-details/notification-details.component.ts b/alcs-frontend/src/app/features/notification/applicant-info/notification-details/notification-details.component.ts index bd937eebba..81289ff544 100644 --- a/alcs-frontend/src/app/features/notification/applicant-info/notification-details/notification-details.component.ts +++ b/alcs-frontend/src/app/features/notification/applicant-info/notification-details/notification-details.component.ts @@ -1,5 +1,4 @@ import { Component, Input, OnChanges, OnDestroy, OnInit, SimpleChanges } from '@angular/core'; -import { doc } from 'prettier'; import { Subject } from 'rxjs'; import { NotificationDocumentDto } from '../../../../services/notification/notification-document/notification-document.dto'; import { NotificationDocumentService } from '../../../../services/notification/notification-document/notification-document.service'; @@ -58,6 +57,4 @@ export class NotificationDetailsComponent implements OnInit, OnChanges, OnDestro ); this.files = documents; } - - protected readonly doc = doc; } diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.scss b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.scss index bfcdcd87f5..1da0dd8da9 100644 --- a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.scss +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.scss @@ -58,14 +58,6 @@ overflow-x: auto; } - .soil-table { - display: grid; - grid-template-columns: max-content max-content; - overflow-x: auto; - grid-column-gap: rem(36); - grid-row-gap: rem(12); - } - .other-attachments { display: grid; grid-template-columns: max-content max-content max-content; diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pfrs-details/pfrs-details.component.html b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pfrs-details/pfrs-details.component.html index d7c8a58daf..61d142213d 100644 --- a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pfrs-details/pfrs-details.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pfrs-details/pfrs-details.component.html @@ -171,6 +171,7 @@ ></app-no-data> </div> </div> + <div class="subheading2 grid-1">Proposal Map / Site Plan</div> <div class="grid-double"> <a *ngFor="let map of proposalMap" (click)="openFile(map.uuid)"> diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/roso-details/roso-details.component.html b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/roso-details/roso-details.component.html index b70f3b4c09..dcbf7ea084 100644 --- a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/roso-details/roso-details.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/roso-details/roso-details.component.html @@ -46,8 +46,6 @@ ></app-no-data> </div> - <div class="subheading1 full-width"></div> - <div class="grid-1"></div> <div class="subheading2 grid-double">Soil to be Removed</div> diff --git a/portal-frontend/src/app/features/notifications/notification-details/proposal-details/proposal-details.component.html b/portal-frontend/src/app/features/notifications/notification-details/proposal-details/proposal-details.component.html index a64742cb94..7ad45f9784 100644 --- a/portal-frontend/src/app/features/notifications/notification-details/proposal-details/proposal-details.component.html +++ b/portal-frontend/src/app/features/notifications/notification-details/proposal-details/proposal-details.component.html @@ -1,4 +1,4 @@ -<div *ngIf="_notificationSubmission" class="review-table other-layout"> +<div *ngIf="_notificationSubmission" class="review-table"> <div class="subheading2 grid-1">Submitter’s File Number</div> <div class="grid-double"> {{ _notificationSubmission.submittersFileNumber }} diff --git a/portal-frontend/src/app/features/public/application/submission/parcel/parcel.component.html b/portal-frontend/src/app/features/public/application/submission/parcel/parcel.component.html index 782f41bf2a..1dfb696075 100644 --- a/portal-frontend/src/app/features/public/application/submission/parcel/parcel.component.html +++ b/portal-frontend/src/app/features/public/application/submission/parcel/parcel.component.html @@ -6,7 +6,6 @@ <h3 class="flex-item"> <div class="full-width flex-space-between-wrap"> <h4>Parcel {{ parcelInd + 1 }}: Parcel and Owner Information</h4> </div> - <div class="full-width subheading1">Parcel Information</div> <div class="subheading2 grid-1">Ownership Type</div> <div class="grid-double"> {{ parcel.ownershipType?.label }} diff --git a/portal-frontend/src/app/features/public/application/submission/parcel/parcel.component.scss b/portal-frontend/src/app/features/public/application/submission/parcel/parcel.component.scss index 81d88321d1..53eff8613e 100644 --- a/portal-frontend/src/app/features/public/application/submission/parcel/parcel.component.scss +++ b/portal-frontend/src/app/features/public/application/submission/parcel/parcel.component.scss @@ -12,14 +12,6 @@ } } -.review-table { - grid-template-columns: 1fr 1fr !important; - - .full-width { - grid-column: 1/3; - } -} - .crown-land { text-transform: capitalize; } diff --git a/portal-frontend/src/app/features/public/notice-of-intent/submission/parcel/parcel.component.html b/portal-frontend/src/app/features/public/notice-of-intent/submission/parcel/parcel.component.html index 782f41bf2a..1dfb696075 100644 --- a/portal-frontend/src/app/features/public/notice-of-intent/submission/parcel/parcel.component.html +++ b/portal-frontend/src/app/features/public/notice-of-intent/submission/parcel/parcel.component.html @@ -6,7 +6,6 @@ <h3 class="flex-item"> <div class="full-width flex-space-between-wrap"> <h4>Parcel {{ parcelInd + 1 }}: Parcel and Owner Information</h4> </div> - <div class="full-width subheading1">Parcel Information</div> <div class="subheading2 grid-1">Ownership Type</div> <div class="grid-double"> {{ parcel.ownershipType?.label }} diff --git a/portal-frontend/src/app/features/public/notice-of-intent/submission/parcel/parcel.component.scss b/portal-frontend/src/app/features/public/notice-of-intent/submission/parcel/parcel.component.scss index 81d88321d1..53eff8613e 100644 --- a/portal-frontend/src/app/features/public/notice-of-intent/submission/parcel/parcel.component.scss +++ b/portal-frontend/src/app/features/public/notice-of-intent/submission/parcel/parcel.component.scss @@ -12,14 +12,6 @@ } } -.review-table { - grid-template-columns: 1fr 1fr !important; - - .full-width { - grid-column: 1/3; - } -} - .crown-land { text-transform: capitalize; } diff --git a/portal-frontend/src/app/features/public/notice-of-intent/submission/pfrs-details/pfrs-details.component.scss b/portal-frontend/src/app/features/public/notice-of-intent/submission/pfrs-details/pfrs-details.component.scss index 2206bf14b5..5458025bf8 100644 --- a/portal-frontend/src/app/features/public/notice-of-intent/submission/pfrs-details/pfrs-details.component.scss +++ b/portal-frontend/src/app/features/public/notice-of-intent/submission/pfrs-details/pfrs-details.component.scss @@ -1,7 +1,10 @@ -@use '../../../../../../styles/functions' as *; - .soil-table { + display: grid; grid-template-columns: max-content max-content max-content; + overflow-x: auto; + overflow-y: hidden; + grid-column-gap: rem(36); + grid-row-gap: rem(12); .spacer-row { grid-column: 1/4; diff --git a/portal-frontend/src/app/features/public/notice-of-intent/submission/pofo-details/pofo-details.component.html b/portal-frontend/src/app/features/public/notice-of-intent/submission/pofo-details/pofo-details.component.html index 41880152e9..5304c27347 100644 --- a/portal-frontend/src/app/features/public/notice-of-intent/submission/pofo-details/pofo-details.component.html +++ b/portal-frontend/src/app/features/public/notice-of-intent/submission/pofo-details/pofo-details.component.html @@ -27,34 +27,32 @@ <app-no-data *ngIf="!noiSubmission.soilFillTypeToPlace"></app-no-data> </div> - <div class="full-width soil-table"> - <div class="grid-1"></div> - <div class="grid-2"> - <strong> Fill to be Placed</strong> - </div> - <div class="grid-1"><strong>Volume</strong></div> - <div class="grid-2"> - {{ noiSubmission.soilToPlaceVolume }} - <span *ngIf="noiSubmission.soilToPlaceVolume">m<sup>3</sup></span> - <app-no-data *ngIf="!noiSubmission.soilToPlaceVolume"></app-no-data> - </div> - <div class="grid-1"><strong>Area</strong></div> - <div class="grid-2"> - {{ noiSubmission.soilToPlaceArea }} <span *ngIf="noiSubmission.soilToPlaceArea">m<sup>2</sup></span> - <app-no-data *ngIf="!noiSubmission.soilToPlaceArea"></app-no-data> - </div> - <div class="grid-1"><strong>Maximum Depth</strong></div> - <div class="grid-2"> - {{ noiSubmission.soilToPlaceMaximumDepth }} - <span *ngIf="noiSubmission.soilToPlaceMaximumDepth">m</span> - <app-no-data *ngIf="!noiSubmission.soilToPlaceMaximumDepth"></app-no-data> - </div> - <div class="grid-1"><strong>Average Depth</strong></div> - <div class="grid-2"> - {{ noiSubmission.soilToPlaceAverageDepth }} - <span *ngIf="noiSubmission.soilToPlaceAverageDepth">m</span> - <app-no-data *ngIf="!noiSubmission.soilToPlaceAverageDepth"></app-no-data> - </div> + <div class="grid-1"></div> + <div class="grid-2"> + <strong> Fill to be Placed</strong> + </div> + <div class="grid-1"><strong>Volume</strong></div> + <div class="grid-2"> + {{ noiSubmission.soilToPlaceVolume }} + <span *ngIf="noiSubmission.soilToPlaceVolume">m<sup>3</sup></span> + <app-no-data *ngIf="!noiSubmission.soilToPlaceVolume"></app-no-data> + </div> + <div class="grid-1"><strong>Area</strong></div> + <div class="grid-2"> + {{ noiSubmission.soilToPlaceArea }} <span *ngIf="noiSubmission.soilToPlaceArea">m<sup>2</sup></span> + <app-no-data *ngIf="!noiSubmission.soilToPlaceArea"></app-no-data> + </div> + <div class="grid-1"><strong>Maximum Depth</strong></div> + <div class="grid-2"> + {{ noiSubmission.soilToPlaceMaximumDepth }} + <span *ngIf="noiSubmission.soilToPlaceMaximumDepth">m</span> + <app-no-data *ngIf="!noiSubmission.soilToPlaceMaximumDepth"></app-no-data> + </div> + <div class="grid-1"><strong>Average Depth</strong></div> + <div class="grid-2"> + {{ noiSubmission.soilToPlaceAverageDepth }} + <span *ngIf="noiSubmission.soilToPlaceAverageDepth">m</span> + <app-no-data *ngIf="!noiSubmission.soilToPlaceAverageDepth"></app-no-data> </div> <div class="full-width soil-table"> diff --git a/portal-frontend/src/app/features/public/notice-of-intent/submission/pofo-details/pofo-details.component.scss b/portal-frontend/src/app/features/public/notice-of-intent/submission/pofo-details/pofo-details.component.scss index 3f88d5363f..e69de29bb2 100644 --- a/portal-frontend/src/app/features/public/notice-of-intent/submission/pofo-details/pofo-details.component.scss +++ b/portal-frontend/src/app/features/public/notice-of-intent/submission/pofo-details/pofo-details.component.scss @@ -1,8 +0,0 @@ -@use '../../../../../../styles/functions' as *; - -.soil-table { - .spacer-row { - grid-column: 1/4; - height: rem(16); - } -} diff --git a/portal-frontend/src/app/features/public/notice-of-intent/submission/roso-details/roso-details.component.html b/portal-frontend/src/app/features/public/notice-of-intent/submission/roso-details/roso-details.component.html index e2b3f255b6..19527d6a22 100644 --- a/portal-frontend/src/app/features/public/notice-of-intent/submission/roso-details/roso-details.component.html +++ b/portal-frontend/src/app/features/public/notice-of-intent/submission/roso-details/roso-details.component.html @@ -27,67 +27,61 @@ <app-no-data *ngIf="!noiSubmission.soilTypeRemoved"></app-no-data> </div> - <div class="subheading1 full-width"></div> - <div class="full-width soil-table"> - <div class="grid-1"></div> - <div class="grid-2"> - <strong>Soil to be Removed</strong> - </div> - <div class="grid-1"><strong>Volume</strong></div> - <div class="grid-2"> - {{ noiSubmission.soilToRemoveVolume }} - <span *ngIf="noiSubmission.soilToRemoveVolume">m<sup>3</sup></span> - <app-no-data *ngIf="!noiSubmission.soilToRemoveVolume"></app-no-data> - </div> - <div class="grid-1"><strong>Area</strong></div> - <div class="grid-2"> - {{ noiSubmission.soilToRemoveArea }} <span *ngIf="noiSubmission.soilToRemoveArea">ha</span> - <app-no-data *ngIf="!noiSubmission.soilToRemoveArea"></app-no-data> - </div> - <div class="grid-1"><strong>Maximum Depth</strong></div> - <div class="grid-2"> - {{ noiSubmission.soilToRemoveMaximumDepth }} - <span *ngIf="noiSubmission.soilToRemoveMaximumDepth">m</span> - <app-no-data *ngIf="!noiSubmission.soilToRemoveMaximumDepth"></app-no-data> - </div> - <div class="grid-1"><strong>Average Depth</strong></div> - <div class="grid-2"> - {{ noiSubmission.soilToRemoveAverageDepth }} - <span *ngIf="noiSubmission.soilToRemoveAverageDepth">m</span> - <app-no-data *ngIf="!noiSubmission.soilToRemoveAverageDepth"></app-no-data> - </div> + <div class="grid-1"></div> + <div class="grid-2"> + <strong>Soil to be Removed</strong> + </div> + <div class="grid-1"><strong>Volume</strong></div> + <div class="grid-2"> + {{ noiSubmission.soilToRemoveVolume }} + <span *ngIf="noiSubmission.soilToRemoveVolume">m<sup>3</sup></span> + <app-no-data *ngIf="!noiSubmission.soilToRemoveVolume"></app-no-data> + </div> + <div class="grid-1"><strong>Area</strong></div> + <div class="grid-2"> + {{ noiSubmission.soilToRemoveArea }} <span *ngIf="noiSubmission.soilToRemoveArea">ha</span> + <app-no-data *ngIf="!noiSubmission.soilToRemoveArea"></app-no-data> + </div> + <div class="grid-1"><strong>Maximum Depth</strong></div> + <div class="grid-2"> + {{ noiSubmission.soilToRemoveMaximumDepth }} + <span *ngIf="noiSubmission.soilToRemoveMaximumDepth">m</span> + <app-no-data *ngIf="!noiSubmission.soilToRemoveMaximumDepth"></app-no-data> + </div> + <div class="grid-1"><strong>Average Depth</strong></div> + <div class="grid-2"> + {{ noiSubmission.soilToRemoveAverageDepth }} + <span *ngIf="noiSubmission.soilToRemoveAverageDepth">m</span> + <app-no-data *ngIf="!noiSubmission.soilToRemoveAverageDepth"></app-no-data> </div> - <div class="subheading1 full-width"></div> - <div class="full-width soil-table"> - <div class="grid-1"></div> - <div class="grid-2"> - <strong>Soil already Removed</strong> - </div> - <div class="grid-1"><strong>Volume</strong></div> - <div class="grid-2"> - {{ noiSubmission.soilAlreadyRemovedVolume }} - <span *ngIf="noiSubmission.soilAlreadyRemovedVolume !== null">m<sup>3</sup></span> - <app-no-data *ngIf="noiSubmission.soilAlreadyRemovedVolume === null"></app-no-data> - </div> - <div class="grid-1"><strong>Area</strong></div> - <div class="grid-2"> - {{ noiSubmission.soilAlreadyRemovedArea }} - <span *ngIf="noiSubmission.soilAlreadyRemovedArea !== null">ha</span> - <app-no-data *ngIf="noiSubmission.soilAlreadyRemovedArea === null"></app-no-data> - </div> - <div class="grid-1"><strong>Maximum Depth</strong></div> - <div class="grid-2"> - {{ noiSubmission.soilAlreadyRemovedMaximumDepth }} - <span *ngIf="noiSubmission.soilAlreadyRemovedMaximumDepth !== null">m</span> - <app-no-data *ngIf="noiSubmission.soilAlreadyRemovedMaximumDepth === null"></app-no-data> - </div> - <div class="grid-1"><strong>Average Depth</strong></div> - <div class="grid-2"> - {{ noiSubmission.soilAlreadyRemovedAverageDepth }} - <span *ngIf="noiSubmission.soilAlreadyRemovedAverageDepth !== null">m</span> - <app-no-data *ngIf="noiSubmission.soilAlreadyRemovedAverageDepth === null"></app-no-data> - </div> + <div class="grid-1"></div> + <div class="grid-2"> + <strong>Soil already Removed</strong> + </div> + <div class="grid-1"><strong>Volume</strong></div> + <div class="grid-2"> + {{ noiSubmission.soilAlreadyRemovedVolume }} + <span *ngIf="noiSubmission.soilAlreadyRemovedVolume !== null">m<sup>3</sup></span> + <app-no-data *ngIf="noiSubmission.soilAlreadyRemovedVolume === null"></app-no-data> + </div> + <div class="grid-1"><strong>Area</strong></div> + <div class="grid-2"> + {{ noiSubmission.soilAlreadyRemovedArea }} + <span *ngIf="noiSubmission.soilAlreadyRemovedArea !== null">ha</span> + <app-no-data *ngIf="noiSubmission.soilAlreadyRemovedArea === null"></app-no-data> + </div> + <div class="grid-1"><strong>Maximum Depth</strong></div> + <div class="grid-2"> + {{ noiSubmission.soilAlreadyRemovedMaximumDepth }} + <span *ngIf="noiSubmission.soilAlreadyRemovedMaximumDepth !== null">m</span> + <app-no-data *ngIf="noiSubmission.soilAlreadyRemovedMaximumDepth === null"></app-no-data> + </div> + <div class="grid-1"><strong>Average Depth</strong></div> + <div class="grid-2"> + {{ noiSubmission.soilAlreadyRemovedAverageDepth }} + <span *ngIf="noiSubmission.soilAlreadyRemovedAverageDepth !== null">m</span> + <app-no-data *ngIf="noiSubmission.soilAlreadyRemovedAverageDepth === null"></app-no-data> </div> <div class="full-width"> diff --git a/portal-frontend/src/app/features/public/notice-of-intent/submission/submission-details.component.scss b/portal-frontend/src/app/features/public/notice-of-intent/submission/submission-details.component.scss index 8aae88078a..397ba4f7bc 100644 --- a/portal-frontend/src/app/features/public/notice-of-intent/submission/submission-details.component.scss +++ b/portal-frontend/src/app/features/public/notice-of-intent/submission/submission-details.component.scss @@ -51,9 +51,7 @@ gap: rem(16); } } -} -:host::ng-deep { .scrollable { overflow-x: auto; } diff --git a/portal-frontend/src/app/features/public/notification/submission/proposal-details/proposal-details.component.html b/portal-frontend/src/app/features/public/notification/submission/proposal-details/proposal-details.component.html index ddaca2a3e9..1fd4d10c11 100644 --- a/portal-frontend/src/app/features/public/notification/submission/proposal-details/proposal-details.component.html +++ b/portal-frontend/src/app/features/public/notification/submission/proposal-details/proposal-details.component.html @@ -1,4 +1,4 @@ -<div *ngIf="submission" class="review-table other-layout"> +<div *ngIf="submission" class="review-table"> <div class="subheading2 grid-1">Submitter’s File Number</div> <div class="grid-double"> {{ submission.submittersFileNumber }} From 3b221bdebd68ee9dc65fc155bab736f62eda4dd3 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Mon, 16 Oct 2023 14:23:19 -0700 Subject: [PATCH 497/954] Only join non draft decisions for NOIs * Already applied to applications but missed here --- .../notice-of-intent-advanced-search.service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-advanced-search.service.ts b/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-advanced-search.service.ts index ce620cdf8b..4cd2d1ab5b 100644 --- a/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-advanced-search.service.ts +++ b/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-advanced-search.service.ts @@ -235,7 +235,7 @@ export class NoticeOfIntentAdvancedSearchService { query = query.leftJoin( NoticeOfIntentDecision, 'decision', - 'decision.notice_of_intent_uuid = "noiSearch"."notice_of_intent_uuid"', + 'decision.notice_of_intent_uuid = "noiSearch"."notice_of_intent_uuid" AND decision.is_draft = false', ); return query; } From 75d1cfbb3b47d1926ccfe7f80b2e599bf27a7b22 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Mon, 16 Oct 2023 14:25:52 -0700 Subject: [PATCH 498/954] Fix other Parcel Components * Use default review-table spacing. --- .../submission/parcel/parcel.component.scss | 8 -------- .../notification/submission/parcel/parcel.component.scss | 8 -------- 2 files changed, 16 deletions(-) diff --git a/portal-frontend/src/app/features/public/notice-of-intent/submission/parcel/parcel.component.scss b/portal-frontend/src/app/features/public/notice-of-intent/submission/parcel/parcel.component.scss index 81d88321d1..53eff8613e 100644 --- a/portal-frontend/src/app/features/public/notice-of-intent/submission/parcel/parcel.component.scss +++ b/portal-frontend/src/app/features/public/notice-of-intent/submission/parcel/parcel.component.scss @@ -12,14 +12,6 @@ } } -.review-table { - grid-template-columns: 1fr 1fr !important; - - .full-width { - grid-column: 1/3; - } -} - .crown-land { text-transform: capitalize; } diff --git a/portal-frontend/src/app/features/public/notification/submission/parcel/parcel.component.scss b/portal-frontend/src/app/features/public/notification/submission/parcel/parcel.component.scss index 70c42d9449..4fd74088e2 100644 --- a/portal-frontend/src/app/features/public/notification/submission/parcel/parcel.component.scss +++ b/portal-frontend/src/app/features/public/notification/submission/parcel/parcel.component.scss @@ -1,13 +1,5 @@ @use '../../../../../../styles/functions' as *; -.review-table { - grid-template-columns: 1fr 1fr !important; - - .full-width { - grid-column: 1/3; - } -} - .crown-land { text-transform: capitalize; } From 1c2fedc108d549391714f2da6acc53eb97aa0e50 Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Mon, 16 Oct 2023 14:42:02 -0700 Subject: [PATCH 499/954] search civic address case insensitive --- .../search/application/application-advanced-search.service.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/apps/alcs/src/alcs/search/application/application-advanced-search.service.ts b/services/apps/alcs/src/alcs/search/application/application-advanced-search.service.ts index 76a2040f26..8ec1f6a032 100644 --- a/services/apps/alcs/src/alcs/search/application/application-advanced-search.service.ts +++ b/services/apps/alcs/src/alcs/search/application/application-advanced-search.service.ts @@ -276,8 +276,8 @@ export class ApplicationAdvancedSearchService { } if (searchDto.civicAddress) { - query = query.andWhere('parcel.civic_address like :civic_address', { - civic_address: `%${searchDto.civicAddress}%`, + query = query.andWhere('LOWER(parcel.civic_address) like LOWER(:civic_address)', { + civic_address: `%${searchDto.civicAddress}%`.toLowerCase(), }); } return query; From aa6494178a75cddb841dc95f9926b9c1aa7c1054 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Mon, 16 Oct 2023 15:00:39 -0700 Subject: [PATCH 500/954] Add validation for SRW Survey Plan Numbers --- ...ation-submission-validator.service.spec.ts | 27 +++++++++++++++++++ ...tification-submission-validator.service.ts | 14 ++++++++-- 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/services/apps/alcs/src/portal/notification-submission/notification-submission-validator.service.spec.ts b/services/apps/alcs/src/portal/notification-submission/notification-submission-validator.service.spec.ts index 611feac0c9..5d00756996 100644 --- a/services/apps/alcs/src/portal/notification-submission/notification-submission-validator.service.spec.ts +++ b/services/apps/alcs/src/portal/notification-submission/notification-submission-validator.service.spec.ts @@ -255,4 +255,31 @@ describe('NotificationSubmissionValidatorService', () => { ), ).toBe(true); }); + + it('should report an error when survey plan is missing numbers', async () => { + const incompleteDocument = new NotificationDocument({ + type: new DocumentCode({ + code: DOCUMENT_TYPE.SURVEY_PLAN, + }), + }); + const noticeOfIntentSubmission = new NotificationSubmission({ + hasSurveyPlan: true, + }); + + const documents = [incompleteDocument]; + mockNotificationDocumentService.getApplicantDocuments.mockResolvedValue( + documents, + ); + + const res = await service.validateSubmission(noticeOfIntentSubmission); + + expect( + includesError( + res.errors, + new Error( + `${incompleteDocument.uuid} proposal has survey plans missing survey/control plan numbers`, + ), + ), + ).toBe(true); + }); }); diff --git a/services/apps/alcs/src/portal/notification-submission/notification-submission-validator.service.ts b/services/apps/alcs/src/portal/notification-submission/notification-submission-validator.service.ts index bb93adff0e..ebc407605a 100644 --- a/services/apps/alcs/src/portal/notification-submission/notification-submission-validator.service.ts +++ b/services/apps/alcs/src/portal/notification-submission/notification-submission-validator.service.ts @@ -207,7 +207,7 @@ export class NotificationSubmissionValidatorService { } const srwTerms = applicantDocuments.filter( - (document) => document.typeCode === DOCUMENT_TYPE.SRW_TERMS, + (document) => document.type?.code === DOCUMENT_TYPE.SRW_TERMS, ); if (srwTerms.length === 0) { errors.push( @@ -219,7 +219,7 @@ export class NotificationSubmissionValidatorService { if (notificationSubmission.hasSurveyPlan) { const surveyPlans = applicantDocuments.filter( - (document) => document.typeCode === DOCUMENT_TYPE.SURVEY_PLAN, + (document) => document.type?.code === DOCUMENT_TYPE.SURVEY_PLAN, ); if (surveyPlans.length === 0) { errors.push( @@ -228,6 +228,16 @@ export class NotificationSubmissionValidatorService { ), ); } + + for (const plan of surveyPlans) { + if (!plan.surveyPlanNumber || !plan.controlNumber) { + errors.push( + new ServiceValidationException( + `${notificationSubmission.typeCode} proposal has survey plans missing survey/control plan numbers`, + ), + ); + } + } } } } From f214220cbe731bd90fc4db8d96efd169206f47a8 Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Mon, 16 Oct 2023 16:56:11 -0700 Subject: [PATCH 501/954] check case insensitive in all places --- .../notice-of-intent-advanced-search.service.ts | 4 ++-- .../notification/notification-advanced-search.service.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-advanced-search.service.ts b/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-advanced-search.service.ts index 96e3be2e1f..bcf83ca7d7 100644 --- a/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-advanced-search.service.ts +++ b/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-advanced-search.service.ts @@ -246,8 +246,8 @@ export class NoticeOfIntentAdvancedSearchService { } if (searchDto.civicAddress) { - query = query.andWhere('parcel.civic_address like :civic_address', { - civic_address: `%${searchDto.civicAddress}%`, + query = query.andWhere('LOWER(parcel.civic_address) like LOWER(:civic_address)', { + civic_address: `%${searchDto.civicAddress}%`.toLowerCase(), }); } return query; diff --git a/services/apps/alcs/src/alcs/search/notification/notification-advanced-search.service.ts b/services/apps/alcs/src/alcs/search/notification/notification-advanced-search.service.ts index deaf7175f4..ac3217d14a 100644 --- a/services/apps/alcs/src/alcs/search/notification/notification-advanced-search.service.ts +++ b/services/apps/alcs/src/alcs/search/notification/notification-advanced-search.service.ts @@ -188,8 +188,8 @@ export class NotificationAdvancedSearchService { } if (searchDto.civicAddress) { - query = query.andWhere('parcel.civic_address like :civic_address', { - civic_address: `%${searchDto.civicAddress}%`, + query = query.andWhere('LOWER(parcel.civic_address) like LOWER(:civic_address)', { + civic_address: `%${searchDto.civicAddress}%`.toLowerCase(), }); } return query; From 949c39c750dd23fbef2817a59b6c6dec884b3586 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Wed, 13 Sep 2023 13:16:49 -0700 Subject: [PATCH 502/954] Add Virus Scanning to ALCS --- ...sion-document-upload-dialog.component.html | 8 +- ...sion-document-upload-dialog.component.scss | 6 + ...n-document-upload-dialog.component.spec.ts | 2 + ...cision-document-upload-dialog.component.ts | 20 ++- .../document-upload-dialog.component.html | 14 ++- .../document-upload-dialog.component.scss | 4 + .../document-upload-dialog.component.spec.ts | 2 + .../document-upload-dialog.component.ts | 27 +++- ...sion-document-upload-dialog.component.html | 8 +- ...sion-document-upload-dialog.component.scss | 6 + ...n-document-upload-dialog.component.spec.ts | 2 + ...cision-document-upload-dialog.component.ts | 19 ++- .../document-upload-dialog.component.html | 8 +- .../document-upload-dialog.component.scss | 4 + .../document-upload-dialog.component.spec.ts | 2 + .../document-upload-dialog.component.ts | 24 +++- .../document-upload-dialog.component.html | 8 +- .../document-upload-dialog.component.scss | 4 + .../document-upload-dialog.component.spec.ts | 2 + .../document-upload-dialog.component.ts | 24 +++- docker-compose.yaml | 116 +++++++----------- .../application-document.service.ts | 10 +- .../alcs/src/clamav/clam-antivirus.module.ts | 10 ++ .../alcs/src/clamav/clamav.service.spec.ts | 39 ++++++ .../apps/alcs/src/clamav/clamav.service.ts | 54 ++++++++ .../apps/alcs/src/document/document.module.ts | 6 +- .../src/document/document.service.spec.ts | 41 ++++++- .../alcs/src/document/document.service.ts | 32 +++++ .../application-document.module.ts | 8 +- services/config/default.json | 5 + services/docker-compose.yml | 14 +++ services/package-lock.json | 51 ++++++++ services/package.json | 2 + 33 files changed, 483 insertions(+), 99 deletions(-) create mode 100644 services/apps/alcs/src/clamav/clam-antivirus.module.ts create mode 100644 services/apps/alcs/src/clamav/clamav.service.spec.ts create mode 100644 services/apps/alcs/src/clamav/clamav.service.ts diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-file-upload-dialog/decision-document-upload-dialog.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-file-upload-dialog/decision-document-upload-dialog.component.html index 517e5c27f5..c800316e76 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-file-upload-dialog/decision-document-upload-dialog.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-file-upload-dialog/decision-document-upload-dialog.component.html @@ -9,10 +9,13 @@ <h4>{{ title }} Document</h4> </div> <input hidden type="file" #fileInput (change)="uploadFile($event)" placeholder="Upload file" /> <button + *ngIf="!pendingFile && !existingFile" class="full-width upload-button" mat-flat-button color="accent" - *ngIf="!pendingFile && !existingFile" + [ngClass]="{ + error: showVirusError + }" (click)="fileInput.click()" > Upload @@ -34,6 +37,9 @@ <h4>{{ title }} Document</h4> <mat-icon>close</mat-icon>Remove </button> </div> + <mat-error class="left" style="display: flex" *ngIf="showVirusError"> + <mat-icon>warning</mat-icon> A virus was detected in the file. Choose another file and try again. + </mat-error> </div> <div class="double"> diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-file-upload-dialog/decision-document-upload-dialog.component.scss b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-file-upload-dialog/decision-document-upload-dialog.component.scss index 99825bd974..ceadfa76d1 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-file-upload-dialog/decision-document-upload-dialog.component.scss +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-file-upload-dialog/decision-document-upload-dialog.component.scss @@ -1,3 +1,5 @@ +@use '../../../../../../../styles/colors'; + .form { display: grid; grid-template-columns: 1fr 1fr; @@ -28,6 +30,10 @@ a { .upload-button { margin-top: 6px !important; + + &.error { + border: 2px solid colors.$error-color; + } } .spinner { diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-file-upload-dialog/decision-document-upload-dialog.component.spec.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-file-upload-dialog/decision-document-upload-dialog.component.spec.ts index 7281d67340..759e0e8534 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-file-upload-dialog/decision-document-upload-dialog.component.spec.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-file-upload-dialog/decision-document-upload-dialog.component.spec.ts @@ -3,6 +3,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MAT_DIALOG_DATA, MatDialogModule, MatDialogRef } from '@angular/material/dialog'; import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { ApplicationDecisionV2Service } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.service'; +import { ToastService } from '../../../../../../services/toast/toast.service'; import { DecisionDocumentUploadDialogComponent } from './decision-document-upload-dialog.component'; @@ -31,6 +32,7 @@ describe('DecisionDocumentUploadDialogComponent', () => { }, { provide: MatDialogRef, useValue: mockDialogRef }, { provide: MAT_DIALOG_DATA, useValue: {} }, + { provide: ToastService, useValue: {} }, ], imports: [MatDialogModule], schemas: [NO_ERRORS_SCHEMA], diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-file-upload-dialog/decision-document-upload-dialog.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-file-upload-dialog/decision-document-upload-dialog.component.ts index 127d31347b..cf73a10386 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-file-upload-dialog/decision-document-upload-dialog.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-file-upload-dialog/decision-document-upload-dialog.component.ts @@ -1,8 +1,10 @@ +import { HttpErrorResponse } from '@angular/common/http'; import { Component, Inject, OnInit } from '@angular/core'; import { FormControl, FormGroup, Validators } from '@angular/forms'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { ApplicationDecisionDocumentDto } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; import { ApplicationDecisionV2Service } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.service'; +import { ToastService } from '../../../../../../services/toast/toast.service'; import { DOCUMENT_SOURCE } from '../../../../../../shared/document/document.dto'; @Component({ @@ -36,12 +38,14 @@ export class DecisionDocumentUploadDialogComponent implements OnInit { pendingFile: File | undefined; existingFile: string | undefined; + showVirusError = false; constructor( @Inject(MAT_DIALOG_DATA) public data: { fileId: string; decisionUuid: string; existingDocument?: ApplicationDecisionDocumentDto }, protected dialog: MatDialogRef<any>, - private decisionService: ApplicationDecisionV2Service + private decisionService: ApplicationDecisionV2Service, + private toastService: ToastService ) {} ngOnInit(): void { @@ -63,7 +67,18 @@ export class DecisionDocumentUploadDialogComponent implements OnInit { if (this.data.existingDocument) { await this.decisionService.deleteFile(this.data.decisionUuid, this.data.existingDocument.uuid); } - await this.decisionService.uploadFile(this.data.decisionUuid, renamedFile); + + try { + await this.decisionService.uploadFile(this.data.decisionUuid, renamedFile); + } catch (err) { + this.toastService.showErrorToast('Document upload failed'); + if (err instanceof HttpErrorResponse && err.status === 403) { + this.showVirusError = true; + this.isSaving = false; + this.pendingFile = undefined; + return; + } + } this.dialog.close(true); this.isSaving = false; @@ -82,6 +97,7 @@ export class DecisionDocumentUploadDialogComponent implements OnInit { if (selectedFiles && selectedFiles[0]) { this.pendingFile = selectedFiles[0]; this.name.setValue(selectedFiles[0].name); + this.showVirusError = false; } } diff --git a/alcs-frontend/src/app/features/application/documents/document-upload-dialog/document-upload-dialog.component.html b/alcs-frontend/src/app/features/application/documents/document-upload-dialog/document-upload-dialog.component.html index 2ba3ec7b06..25b4adc33f 100644 --- a/alcs-frontend/src/app/features/application/documents/document-upload-dialog/document-upload-dialog.component.html +++ b/alcs-frontend/src/app/features/application/documents/document-upload-dialog/document-upload-dialog.component.html @@ -12,10 +12,13 @@ <h4>{{ title }} Document</h4> </div> <input hidden type="file" #fileInput (change)="uploadFile($event)" placeholder="Upload file" /> <button + *ngIf="!pendingFile && !existingFile" class="full-width upload-button" mat-flat-button color="accent" - *ngIf="!pendingFile && !existingFile" + [ngClass]="{ + error: showVirusError + }" (click)="fileInput.click()" > Upload @@ -26,7 +29,8 @@ <h4>{{ title }} Document</h4>  ({{ pendingFile.size | filesize }}) </div> <button [disabled]="!allowsFileEdit" (click)="onRemoveFile()" mat-button> - <mat-icon>close</mat-icon>Remove + <mat-icon>close</mat-icon> + Remove </button> </div> <div class="file" *ngIf="existingFile"> @@ -35,9 +39,13 @@ <h4>{{ title }} Document</h4>  ({{ existingFile.size | filesize }}) </div> <button [disabled]="!allowsFileEdit" (click)="onRemoveFile()" mat-button> - <mat-icon>close</mat-icon>Remove + <mat-icon>close</mat-icon> + Remove </button> </div> + <mat-error class="left" style="display: flex" *ngIf="showVirusError"> + <mat-icon>warning</mat-icon> A virus was detected in the file. Choose another file and try again. + </mat-error> </div> <div class="double"> diff --git a/alcs-frontend/src/app/features/application/documents/document-upload-dialog/document-upload-dialog.component.scss b/alcs-frontend/src/app/features/application/documents/document-upload-dialog/document-upload-dialog.component.scss index de0c2bac88..e4fa72a650 100644 --- a/alcs-frontend/src/app/features/application/documents/document-upload-dialog/document-upload-dialog.component.scss +++ b/alcs-frontend/src/app/features/application/documents/document-upload-dialog/document-upload-dialog.component.scss @@ -30,6 +30,10 @@ a { .upload-button { margin-top: 6px !important; + + &.error { + border: 2px solid colors.$error-color; + } } .spinner { diff --git a/alcs-frontend/src/app/features/application/documents/document-upload-dialog/document-upload-dialog.component.spec.ts b/alcs-frontend/src/app/features/application/documents/document-upload-dialog/document-upload-dialog.component.spec.ts index ed346dab5c..88572c1418 100644 --- a/alcs-frontend/src/app/features/application/documents/document-upload-dialog/document-upload-dialog.component.spec.ts +++ b/alcs-frontend/src/app/features/application/documents/document-upload-dialog/document-upload-dialog.component.spec.ts @@ -5,6 +5,7 @@ import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { ApplicationDocumentService } from '../../../../services/application/application-document/application-document.service'; import { ApplicationParcelService } from '../../../../services/application/application-parcel/application-parcel.service'; import { ApplicationSubmissionService } from '../../../../services/application/application-submission/application-submission.service'; +import { ToastService } from '../../../../services/toast/toast.service'; import { DocumentUploadDialogComponent } from './document-upload-dialog.component'; @@ -45,6 +46,7 @@ describe('DocumentUploadDialogComponent', () => { }, { provide: MatDialogRef, useValue: mockDialogRef }, { provide: MAT_DIALOG_DATA, useValue: {} }, + { provide: ToastService, useValue: {} }, ], imports: [MatDialogModule], schemas: [NO_ERRORS_SCHEMA], diff --git a/alcs-frontend/src/app/features/application/documents/document-upload-dialog/document-upload-dialog.component.ts b/alcs-frontend/src/app/features/application/documents/document-upload-dialog/document-upload-dialog.component.ts index 5b88dd2263..b7f8e78d6f 100644 --- a/alcs-frontend/src/app/features/application/documents/document-upload-dialog/document-upload-dialog.component.ts +++ b/alcs-frontend/src/app/features/application/documents/document-upload-dialog/document-upload-dialog.component.ts @@ -1,3 +1,4 @@ +import { HttpErrorResponse } from '@angular/common/http'; import { Component, Inject, OnDestroy, OnInit } from '@angular/core'; import { FormControl, FormGroup, Validators } from '@angular/forms'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; @@ -9,6 +10,7 @@ import { import { ApplicationDocumentService } from '../../../../services/application/application-document/application-document.service'; import { ApplicationParcelService } from '../../../../services/application/application-parcel/application-parcel.service'; import { ApplicationSubmissionService } from '../../../../services/application/application-submission/application-submission.service'; +import { ToastService } from '../../../../services/toast/toast.service'; import { DOCUMENT_SOURCE, DOCUMENT_SYSTEM, @@ -59,6 +61,7 @@ export class DocumentUploadDialogComponent implements OnInit, OnDestroy { pendingFile: File | undefined; existingFile: { name: string; size: number } | undefined; showSupersededWarning = false; + showVirusError = false; constructor( @Inject(MAT_DIALOG_DATA) @@ -66,7 +69,8 @@ export class DocumentUploadDialogComponent implements OnInit, OnDestroy { protected dialog: MatDialogRef<any>, private applicationDocumentService: ApplicationDocumentService, private parcelService: ApplicationParcelService, - private submissionService: ApplicationSubmissionService + private submissionService: ApplicationSubmissionService, + private toastService: ToastService ) {} ngOnInit(): void { @@ -126,11 +130,23 @@ export class DocumentUploadDialogComponent implements OnInit, OnDestroy { if (this.data.existingDocument) { await this.applicationDocumentService.update(this.data.existingDocument.uuid, dto); } else if (file !== undefined) { - await this.applicationDocumentService.upload(this.data.fileId, { - ...dto, - file, - }); + try { + await this.applicationDocumentService.upload(this.data.fileId, { + ...dto, + file, + }); + } catch (err) { + this.toastService.showErrorToast('Document upload failed'); + if (err instanceof HttpErrorResponse && err.status === 403) { + this.showVirusError = true; + this.isSaving = false; + this.pendingFile = undefined; + return; + } + } + this.showVirusError = false; } + this.dialog.close(true); this.isSaving = false; } @@ -228,6 +244,7 @@ export class DocumentUploadDialogComponent implements OnInit, OnDestroy { if (selectedFiles && selectedFiles[0]) { this.pendingFile = selectedFiles[0]; this.name.setValue(selectedFiles[0].name); + this.showVirusError = false; } } diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-file-upload-dialog/decision-document-upload-dialog.component.html b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-file-upload-dialog/decision-document-upload-dialog.component.html index 517e5c27f5..c800316e76 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-file-upload-dialog/decision-document-upload-dialog.component.html +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-file-upload-dialog/decision-document-upload-dialog.component.html @@ -9,10 +9,13 @@ <h4>{{ title }} Document</h4> </div> <input hidden type="file" #fileInput (change)="uploadFile($event)" placeholder="Upload file" /> <button + *ngIf="!pendingFile && !existingFile" class="full-width upload-button" mat-flat-button color="accent" - *ngIf="!pendingFile && !existingFile" + [ngClass]="{ + error: showVirusError + }" (click)="fileInput.click()" > Upload @@ -34,6 +37,9 @@ <h4>{{ title }} Document</h4> <mat-icon>close</mat-icon>Remove </button> </div> + <mat-error class="left" style="display: flex" *ngIf="showVirusError"> + <mat-icon>warning</mat-icon> A virus was detected in the file. Choose another file and try again. + </mat-error> </div> <div class="double"> diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-file-upload-dialog/decision-document-upload-dialog.component.scss b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-file-upload-dialog/decision-document-upload-dialog.component.scss index 99825bd974..ceadfa76d1 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-file-upload-dialog/decision-document-upload-dialog.component.scss +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-file-upload-dialog/decision-document-upload-dialog.component.scss @@ -1,3 +1,5 @@ +@use '../../../../../../../styles/colors'; + .form { display: grid; grid-template-columns: 1fr 1fr; @@ -28,6 +30,10 @@ a { .upload-button { margin-top: 6px !important; + + &.error { + border: 2px solid colors.$error-color; + } } .spinner { diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-file-upload-dialog/decision-document-upload-dialog.component.spec.ts b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-file-upload-dialog/decision-document-upload-dialog.component.spec.ts index 2c662b6be9..10697accdf 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-file-upload-dialog/decision-document-upload-dialog.component.spec.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-file-upload-dialog/decision-document-upload-dialog.component.spec.ts @@ -3,6 +3,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MAT_DIALOG_DATA, MatDialogModule, MatDialogRef } from '@angular/material/dialog'; import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { NoticeOfIntentDecisionV2Service } from '../../../../../../services/notice-of-intent/decision-v2/notice-of-intent-decision-v2.service'; +import { ToastService } from '../../../../../../services/toast/toast.service'; import { DecisionDocumentUploadDialogComponent } from './decision-document-upload-dialog.component'; @@ -31,6 +32,7 @@ describe('DecisionDocumentUploadDialogComponent', () => { }, { provide: MatDialogRef, useValue: mockDialogRef }, { provide: MAT_DIALOG_DATA, useValue: {} }, + { provide: ToastService, useValue: {} }, ], imports: [MatDialogModule], schemas: [NO_ERRORS_SCHEMA], diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-file-upload-dialog/decision-document-upload-dialog.component.ts b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-file-upload-dialog/decision-document-upload-dialog.component.ts index 8a104ea557..50fa2bedd6 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-file-upload-dialog/decision-document-upload-dialog.component.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-file-upload-dialog/decision-document-upload-dialog.component.ts @@ -1,8 +1,10 @@ +import { HttpErrorResponse } from '@angular/common/http'; import { Component, Inject, OnInit } from '@angular/core'; import { FormControl, FormGroup, Validators } from '@angular/forms'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { NoticeOfIntentDecisionV2Service } from '../../../../../../services/notice-of-intent/decision-v2/notice-of-intent-decision-v2.service'; import { NoticeOfIntentDecisionDocumentDto } from '../../../../../../services/notice-of-intent/decision/notice-of-intent-decision.dto'; +import { ToastService } from '../../../../../../services/toast/toast.service'; import { DOCUMENT_SOURCE } from '../../../../../../shared/document/document.dto'; @Component({ @@ -36,12 +38,14 @@ export class DecisionDocumentUploadDialogComponent implements OnInit { pendingFile: File | undefined; existingFile: string | undefined; + showVirusError = false; constructor( @Inject(MAT_DIALOG_DATA) public data: { fileId: string; decisionUuid: string; existingDocument?: NoticeOfIntentDecisionDocumentDto }, protected dialog: MatDialogRef<any>, - private decisionService: NoticeOfIntentDecisionV2Service + private decisionService: NoticeOfIntentDecisionV2Service, + private toastService: ToastService ) {} ngOnInit(): void { @@ -65,6 +69,18 @@ export class DecisionDocumentUploadDialogComponent implements OnInit { } await this.decisionService.uploadFile(this.data.decisionUuid, renamedFile); + try { + await this.decisionService.uploadFile(this.data.decisionUuid, renamedFile); + } catch (err) { + this.toastService.showErrorToast('Document upload failed'); + if (err instanceof HttpErrorResponse && err.status === 403) { + this.showVirusError = true; + this.isSaving = false; + this.pendingFile = undefined; + return; + } + } + this.dialog.close(true); this.isSaving = false; } else if (this.data.existingDocument) { @@ -82,6 +98,7 @@ export class DecisionDocumentUploadDialogComponent implements OnInit { if (selectedFiles && selectedFiles[0]) { this.pendingFile = selectedFiles[0]; this.name.setValue(selectedFiles[0].name); + this.showVirusError = false; } } diff --git a/alcs-frontend/src/app/features/notice-of-intent/documents/document-upload-dialog/document-upload-dialog.component.html b/alcs-frontend/src/app/features/notice-of-intent/documents/document-upload-dialog/document-upload-dialog.component.html index aa5d4dbe60..2bbe634011 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/documents/document-upload-dialog/document-upload-dialog.component.html +++ b/alcs-frontend/src/app/features/notice-of-intent/documents/document-upload-dialog/document-upload-dialog.component.html @@ -12,10 +12,13 @@ <h4>{{ title }} Document</h4> </div> <input hidden type="file" #fileInput (change)="uploadFile($event)" placeholder="Upload file" /> <button + *ngIf="!pendingFile && !existingFile" class="full-width upload-button" mat-flat-button color="accent" - *ngIf="!pendingFile && !existingFile" + [ngClass]="{ + error: showVirusError + }" (click)="fileInput.click()" > Upload @@ -38,6 +41,9 @@ <h4>{{ title }} Document</h4> <mat-icon>close</mat-icon>Remove </button> </div> + <mat-error class="left" style="display: flex" *ngIf="showVirusError"> + <mat-icon>warning</mat-icon> A virus was detected in the file. Choose another file and try again. + </mat-error> </div> <div class="double"> diff --git a/alcs-frontend/src/app/features/notice-of-intent/documents/document-upload-dialog/document-upload-dialog.component.scss b/alcs-frontend/src/app/features/notice-of-intent/documents/document-upload-dialog/document-upload-dialog.component.scss index de0c2bac88..e4fa72a650 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/documents/document-upload-dialog/document-upload-dialog.component.scss +++ b/alcs-frontend/src/app/features/notice-of-intent/documents/document-upload-dialog/document-upload-dialog.component.scss @@ -30,6 +30,10 @@ a { .upload-button { margin-top: 6px !important; + + &.error { + border: 2px solid colors.$error-color; + } } .spinner { diff --git a/alcs-frontend/src/app/features/notice-of-intent/documents/document-upload-dialog/document-upload-dialog.component.spec.ts b/alcs-frontend/src/app/features/notice-of-intent/documents/document-upload-dialog/document-upload-dialog.component.spec.ts index 8ae40d3a2b..113f491adb 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/documents/document-upload-dialog/document-upload-dialog.component.spec.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/documents/document-upload-dialog/document-upload-dialog.component.spec.ts @@ -5,6 +5,7 @@ import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { NoiDocumentService } from '../../../../services/notice-of-intent/noi-document/noi-document.service'; import { NoticeOfIntentParcelService } from '../../../../services/notice-of-intent/notice-of-intent-parcel/notice-of-intent-parcel.service'; import { NoticeOfIntentSubmissionService } from '../../../../services/notice-of-intent/notice-of-intent-submission/notice-of-intent-submission.service'; +import { ToastService } from '../../../../services/toast/toast.service'; import { DocumentUploadDialogComponent } from './document-upload-dialog.component'; @@ -43,6 +44,7 @@ describe('DocumentUploadDialogComponent', () => { }, { provide: MatDialogRef, useValue: mockDialogRef }, { provide: MAT_DIALOG_DATA, useValue: {} }, + { provide: ToastService, useValue: {} }, ], imports: [MatDialogModule], schemas: [NO_ERRORS_SCHEMA], diff --git a/alcs-frontend/src/app/features/notice-of-intent/documents/document-upload-dialog/document-upload-dialog.component.ts b/alcs-frontend/src/app/features/notice-of-intent/documents/document-upload-dialog/document-upload-dialog.component.ts index f1daabbe0f..47f28fa407 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/documents/document-upload-dialog/document-upload-dialog.component.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/documents/document-upload-dialog/document-upload-dialog.component.ts @@ -1,9 +1,11 @@ +import { HttpErrorResponse } from '@angular/common/http'; import { Component, Inject, OnDestroy, OnInit } from '@angular/core'; import { FormControl, FormGroup, Validators } from '@angular/forms'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { Subject } from 'rxjs'; import { NoticeOfIntentParcelService } from '../../../../services/notice-of-intent/notice-of-intent-parcel/notice-of-intent-parcel.service'; import { NoticeOfIntentSubmissionService } from '../../../../services/notice-of-intent/notice-of-intent-submission/notice-of-intent-submission.service'; +import { ToastService } from '../../../../services/toast/toast.service'; import { DOCUMENT_SOURCE, DOCUMENT_SYSTEM, @@ -59,6 +61,7 @@ export class DocumentUploadDialogComponent implements OnInit, OnDestroy { pendingFile: File | undefined; existingFile: { name: string; size: number } | undefined; showSupersededWarning = false; + showVirusError = false; constructor( @Inject(MAT_DIALOG_DATA) @@ -66,7 +69,8 @@ export class DocumentUploadDialogComponent implements OnInit, OnDestroy { protected dialog: MatDialogRef<any>, private noiDocumentService: NoiDocumentService, private noiSubmissionService: NoticeOfIntentSubmissionService, - private noiParcelService: NoticeOfIntentParcelService + private noiParcelService: NoticeOfIntentParcelService, + private toastService: ToastService ) {} ngOnInit(): void { @@ -127,10 +131,20 @@ export class DocumentUploadDialogComponent implements OnInit, OnDestroy { if (this.data.existingDocument) { await this.noiDocumentService.update(this.data.existingDocument.uuid, dto); } else if (file !== undefined) { - await this.noiDocumentService.upload(this.data.fileId, { - ...dto, - file, - }); + try { + await this.noiDocumentService.upload(this.data.fileId, { + ...dto, + file, + }); + } catch (err) { + this.toastService.showErrorToast('Document upload failed'); + if (err instanceof HttpErrorResponse && err.status === 403) { + this.showVirusError = true; + this.isSaving = false; + this.pendingFile = undefined; + return; + } + } } this.dialog.close(true); this.isSaving = false; diff --git a/alcs-frontend/src/app/features/notification/documents/document-upload-dialog/document-upload-dialog.component.html b/alcs-frontend/src/app/features/notification/documents/document-upload-dialog/document-upload-dialog.component.html index d12bb4f309..2ac5d3f661 100644 --- a/alcs-frontend/src/app/features/notification/documents/document-upload-dialog/document-upload-dialog.component.html +++ b/alcs-frontend/src/app/features/notification/documents/document-upload-dialog/document-upload-dialog.component.html @@ -9,10 +9,13 @@ <h4>{{ title }} Document</h4> </div> <input hidden type="file" #fileInput (change)="uploadFile($event)" placeholder="Upload file" /> <button + *ngIf="!pendingFile && !existingFile" class="full-width upload-button" mat-flat-button color="accent" - *ngIf="!pendingFile && !existingFile" + [ngClass]="{ + error: showVirusError + }" (click)="fileInput.click()" > Upload @@ -35,6 +38,9 @@ <h4>{{ title }} Document</h4> <mat-icon>close</mat-icon>Remove </button> </div> + <mat-error class="left" style="display: flex" *ngIf="showVirusError"> + <mat-icon>warning</mat-icon> A virus was detected in the file. Choose another file and try again. + </mat-error> </div> <div class="double"> diff --git a/alcs-frontend/src/app/features/notification/documents/document-upload-dialog/document-upload-dialog.component.scss b/alcs-frontend/src/app/features/notification/documents/document-upload-dialog/document-upload-dialog.component.scss index de0c2bac88..e4fa72a650 100644 --- a/alcs-frontend/src/app/features/notification/documents/document-upload-dialog/document-upload-dialog.component.scss +++ b/alcs-frontend/src/app/features/notification/documents/document-upload-dialog/document-upload-dialog.component.scss @@ -30,6 +30,10 @@ a { .upload-button { margin-top: 6px !important; + + &.error { + border: 2px solid colors.$error-color; + } } .spinner { diff --git a/alcs-frontend/src/app/features/notification/documents/document-upload-dialog/document-upload-dialog.component.spec.ts b/alcs-frontend/src/app/features/notification/documents/document-upload-dialog/document-upload-dialog.component.spec.ts index dcacacc593..1ccefa2049 100644 --- a/alcs-frontend/src/app/features/notification/documents/document-upload-dialog/document-upload-dialog.component.spec.ts +++ b/alcs-frontend/src/app/features/notification/documents/document-upload-dialog/document-upload-dialog.component.spec.ts @@ -6,6 +6,7 @@ import { NoiDocumentService } from '../../../../services/notice-of-intent/noi-do import { NoticeOfIntentParcelService } from '../../../../services/notice-of-intent/notice-of-intent-parcel/notice-of-intent-parcel.service'; import { NoticeOfIntentSubmissionService } from '../../../../services/notice-of-intent/notice-of-intent-submission/notice-of-intent-submission.service'; import { NotificationDocumentService } from '../../../../services/notification/notification-document/notification-document.service'; +import { ToastService } from '../../../../services/toast/toast.service'; import { DocumentUploadDialogComponent } from './document-upload-dialog.component'; @@ -34,6 +35,7 @@ describe('DocumentUploadDialogComponent', () => { }, { provide: MatDialogRef, useValue: mockDialogRef }, { provide: MAT_DIALOG_DATA, useValue: {} }, + { provide: ToastService, useValue: {} }, ], imports: [MatDialogModule], schemas: [NO_ERRORS_SCHEMA], diff --git a/alcs-frontend/src/app/features/notification/documents/document-upload-dialog/document-upload-dialog.component.ts b/alcs-frontend/src/app/features/notification/documents/document-upload-dialog/document-upload-dialog.component.ts index 270c409890..58a010c3a6 100644 --- a/alcs-frontend/src/app/features/notification/documents/document-upload-dialog/document-upload-dialog.component.ts +++ b/alcs-frontend/src/app/features/notification/documents/document-upload-dialog/document-upload-dialog.component.ts @@ -1,3 +1,4 @@ +import { HttpErrorResponse } from '@angular/common/http'; import { Component, Inject, OnDestroy, OnInit } from '@angular/core'; import { FormControl, FormGroup, Validators } from '@angular/forms'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; @@ -5,6 +6,7 @@ import { Subject } from 'rxjs'; import { UpdateNoticeOfIntentDocumentDto } from '../../../../services/notice-of-intent/noi-document/noi-document.dto'; import { NotificationDocumentDto } from '../../../../services/notification/notification-document/notification-document.dto'; import { NotificationDocumentService } from '../../../../services/notification/notification-document/notification-document.service'; +import { ToastService } from '../../../../services/toast/toast.service'; import { DOCUMENT_SOURCE, DOCUMENT_SYSTEM, @@ -47,12 +49,14 @@ export class DocumentUploadDialogComponent implements OnInit, OnDestroy { pendingFile: File | undefined; existingFile: { name: string; size: number } | undefined; + showVirusError = false; constructor( @Inject(MAT_DIALOG_DATA) public data: { fileId: string; existingDocument?: NotificationDocumentDto }, protected dialog: MatDialogRef<any>, - private notificationDocumentService: NotificationDocumentService + private notificationDocumentService: NotificationDocumentService, + private toastService: ToastService ) {} ngOnInit(): void { @@ -102,10 +106,20 @@ export class DocumentUploadDialogComponent implements OnInit, OnDestroy { if (this.data.existingDocument) { await this.notificationDocumentService.update(this.data.existingDocument.uuid, dto); } else if (file !== undefined) { - await this.notificationDocumentService.upload(this.data.fileId, { - ...dto, - file, - }); + try { + await this.notificationDocumentService.upload(this.data.fileId, { + ...dto, + file, + }); + } catch (err) { + this.toastService.showErrorToast('Document upload failed'); + if (err instanceof HttpErrorResponse && err.status === 403) { + this.showVirusError = true; + this.isSaving = false; + this.pendingFile = undefined; + return; + } + } } this.dialog.close(true); this.isSaving = false; diff --git a/docker-compose.yaml b/docker-compose.yaml index 5d4279c261..42bfaa9d36 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,4 +1,4 @@ -version: '3.6' +version: "3.6" services: ####################### API ####################### api: @@ -10,16 +10,22 @@ services: ports: - 8080:8080 depends_on: - - db - - redis - - migrate + clamav: + condition: service_healthy + db: + condition: service_healthy + redis: + condition: service_started + migrate: + condition: service_started + healthcheck: - test: [ "CMD", "curl", "localhost:8080/" ] + test: ["CMD", "curl", "localhost:8080/"] interval: 5s timeout: 5s retries: 5 - ##################### Frontend #################### + ##################### ALCS Frontend #################### frontend: container_name: alcs_frontend restart: always @@ -30,7 +36,26 @@ services: depends_on: - api healthcheck: - test: [ "CMD", "curl", "localhost:8081/" ] + test: ["CMD", "curl", "localhost:8081/"] + interval: 15s + timeout: 5s + retries: 5 + start_period: 30s + environment: + - API_URL=http://localhost:8080 + + ##################### Portal Frontend #################### + portal-frontend: + container_name: alcs_portal_frontend + restart: always + build: + context: portal-frontend + ports: + - 8083:8081 + depends_on: + - api + healthcheck: + test: ["CMD", "curl", "localhost:8083/"] interval: 15s timeout: 5s retries: 5 @@ -47,7 +72,7 @@ services: - POSTGRES_PASSWORD=postgres - POSTGRES_DB=postgres ports: - - '5432:5432' + - "5432:5432" healthcheck: test: ["CMD-SHELL", "pg_isready -U postgres"] interval: 10s @@ -57,9 +82,6 @@ services: - postgres:/var/lib/postgres - ./docker/postgres-schemas.sql:/docker-entrypoint-initdb.d/postgres-schemas.sql - - - ###################### Redis ###################### redis: image: "redis:alpine" @@ -69,6 +91,16 @@ services: environment: - REDIS_REPLICATION_MODE=master + ###################### Clam AV ###################### + clamav: + image: clamav/clamav:stable_base + volumes: + # Socket + - clamsocket:/var/run/clamav/ + - clamav:/var/lib/clamav + ports: + - "3310:3310" + ################ Database Migrations ############## migrate: container_name: alcs_migration @@ -98,62 +130,6 @@ services: - "80:80" - "9001:9001" - - ################ Portal ############################ - portal-api: - restart: always - container_name: alcs_portal_api - build: - context: services - dockerfile: Dockerfile - args: - - NEST_APP=portal - ports: - - 8082:8081 - depends_on: - - db - - redis - - migrate - healthcheck: - test: [ "CMD", "curl", "localhost:8080/" ] - interval: 5s - timeout: 5s - retries: 5 - - ##################### Frontend #################### - portal-frontend: - container_name: alcs_portal_frontend - restart: always - build: - context: portal-frontend - ports: - - 8083:8081 - depends_on: - - api - healthcheck: - test: [ "CMD", "curl", "localhost:8081/" ] - interval: 15s - timeout: 5s - retries: 5 - start_period: 30s - environment: - - API_URL=http://localhost:8082 - - - ################ Portal Migrations ############## - portal-migrate: - container_name: alcs_portal_migration - restart: on-failure - build: - context: services - dockerfile: Dockerfile.migrate - args: - - NEST_APP=portal - depends_on: - db: - condition: service_healthy - links: - - db ##################### PGTAP ##################### pgtap: image: hbpmip/pgtap:1.0.0-2 @@ -170,7 +146,9 @@ volumes: postgres: redis: s3: + clamav: + clamsocket: -networks: +networks: default: - driver: bridge \ No newline at end of file + driver: bridge diff --git a/portal-frontend/src/app/services/application-document/application-document.service.ts b/portal-frontend/src/app/services/application-document/application-document.service.ts index 0a2b78c846..63f8e09025 100644 --- a/portal-frontend/src/app/services/application-document/application-document.service.ts +++ b/portal-frontend/src/app/services/application-document/application-document.service.ts @@ -1,4 +1,4 @@ -import { HttpClient } from '@angular/common/http'; +import { HttpClient, HttpErrorResponse } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { firstValueFrom } from 'rxjs'; import { environment } from '../../../environments/environment'; @@ -39,7 +39,13 @@ export class ApplicationDocumentService { return res; } catch (e) { console.error(e); - this.toastService.showErrorToast('Failed to attach document to Application, please try again'); + // @ts-ignore + if (e!.status === 403) { + this.toastService.showErrorToast('Malicious file detected, upload blocked'); + debugger; + } else { + this.toastService.showErrorToast('Failed to attach document to Application, please try again'); + } } return undefined; } diff --git a/services/apps/alcs/src/clamav/clam-antivirus.module.ts b/services/apps/alcs/src/clamav/clam-antivirus.module.ts new file mode 100644 index 0000000000..6d221f6617 --- /dev/null +++ b/services/apps/alcs/src/clamav/clam-antivirus.module.ts @@ -0,0 +1,10 @@ +import { HttpModule } from '@nestjs/axios'; +import { Module } from '@nestjs/common'; +import { ClamAVService } from './clamav.service'; + +@Module({ + imports: [HttpModule], + providers: [ClamAVService], + exports: [ClamAVService], +}) +export class ClamAntivirusModule {} diff --git a/services/apps/alcs/src/clamav/clamav.service.spec.ts b/services/apps/alcs/src/clamav/clamav.service.spec.ts new file mode 100644 index 0000000000..d4c8cfe3ce --- /dev/null +++ b/services/apps/alcs/src/clamav/clamav.service.spec.ts @@ -0,0 +1,39 @@ +import { CONFIG_TOKEN } from '@app/common/config/config.module'; +import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; +import { HttpService } from '@nestjs/axios'; +import { Test, TestingModule } from '@nestjs/testing'; +import * as NodeClam from 'clamscan'; +import * as config from 'config'; +import { ClamAVService } from './clamav.service'; + +jest.mock('clamscan'); + +describe('ClamAVService', () => { + let service: ClamAVService; + let mockHttpClient: DeepMocked<HttpService>; + + beforeEach(async () => { + mockHttpClient = createMock(); + + const module: TestingModule = await Test.createTestingModule({ + providers: [ + ClamAVService, + { + provide: CONFIG_TOKEN, + useValue: config, + }, + { + provide: HttpService, + useValue: mockHttpClient, + }, + ], + }).compile(); + + service = module.get<ClamAVService>(ClamAVService); + }); + + it('should be defined', () => { + expect(service).toBeDefined(); + expect(NodeClam).toHaveBeenCalledTimes(1); + }); +}); diff --git a/services/apps/alcs/src/clamav/clamav.service.ts b/services/apps/alcs/src/clamav/clamav.service.ts new file mode 100644 index 0000000000..80f68a7662 --- /dev/null +++ b/services/apps/alcs/src/clamav/clamav.service.ts @@ -0,0 +1,54 @@ +import { CONFIG_TOKEN, IConfig } from '@app/common/config/config.module'; +import { HttpService } from '@nestjs/axios'; +import { Inject, Injectable, Logger } from '@nestjs/common'; +import * as NodeClam from 'clamscan'; +import { firstValueFrom } from 'rxjs'; + +@Injectable() +export class ClamAVService { + private logger = new Logger(ClamAVService.name); + private scanner: NodeClam; + private readonly isEnabled = false; + + constructor( + @Inject(CONFIG_TOKEN) private config: IConfig, + private httpService: HttpService, + ) { + this.isEnabled = this.config.get('CLAMAV.ENABLED'); + if (this.isEnabled) { + this.initClam(); + } + } + + private async initClam() { + this.scanner = await new NodeClam().init({ + clamdscan: { + host: this.config.get('CLAMAV.HOST'), + port: this.config.get('CLAMAV.PORT'), + }, + }); + } + + async scanFile(fileUrl: string) { + if (!this.isEnabled) { + return true; + } + + const response = await this.downloadFileAsStream(fileUrl); + + try { + const { isInfected } = await this.scanner.scanStream(response.data); + return isInfected; + } catch (err) { + //TODO: What do we do if ClamAV is down? + this.logger.error(err); + } + } + + private async downloadFileAsStream(url) { + const response = await this.httpService.get(url, { + responseType: 'stream', + }); + return firstValueFrom(response); + } +} diff --git a/services/apps/alcs/src/document/document.module.ts b/services/apps/alcs/src/document/document.module.ts index d069dc65aa..32232d2186 100644 --- a/services/apps/alcs/src/document/document.module.ts +++ b/services/apps/alcs/src/document/document.module.ts @@ -1,11 +1,15 @@ import { Module } from '@nestjs/common'; import { TypeOrmModule } from '@nestjs/typeorm'; +import { ClamAntivirusModule } from '../clamav/clam-antivirus.module'; import { DocumentCode } from './document-code.entity'; import { Document } from './document.entity'; import { DocumentService } from './document.service'; @Module({ - imports: [TypeOrmModule.forFeature([Document, DocumentCode])], + imports: [ + TypeOrmModule.forFeature([Document, DocumentCode]), + ClamAntivirusModule, + ], providers: [DocumentService], exports: [DocumentService], }) diff --git a/services/apps/alcs/src/document/document.service.spec.ts b/services/apps/alcs/src/document/document.service.spec.ts index 6d17fb7a65..91beabfed4 100644 --- a/services/apps/alcs/src/document/document.service.spec.ts +++ b/services/apps/alcs/src/document/document.service.spec.ts @@ -1,4 +1,8 @@ import { CONFIG_TOKEN } from '@app/common/config/config.module'; +import { + BaseServiceException, + ServiceValidationException, +} from '@app/common/exceptions/base.exception'; import { PutObjectCommand, S3Client } from '@aws-sdk/client-s3'; import { MultipartFile } from '@fastify/multipart'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; @@ -7,6 +11,7 @@ import { getRepositoryToken } from '@nestjs/typeorm'; import { mockClient } from 'aws-sdk-client-mock'; import * as config from 'config'; import { Repository } from 'typeorm'; +import { ClamAVService } from '../clamav/clamav.service'; import { User } from '../user/user.entity'; import { CreateDocumentDto, @@ -16,14 +21,21 @@ import { import { Document } from './document.entity'; import { DocumentService } from './document.service'; +// The mock factory returns the function () => false +jest.mock('@aws-sdk/s3-request-presigner', () => ({ + getSignedUrl: jest.fn(() => 'fake-url'), +})); + describe('DocumentService', () => { let service: DocumentService; const mockS3Client = mockClient(S3Client); let mockRepository: DeepMocked<Repository<Document>>; + let mockClamAVService: DeepMocked<ClamAVService>; beforeEach(async () => { mockS3Client.reset(); - mockRepository = createMock<Repository<Document>>(); + mockRepository = createMock(); + mockClamAVService = createMock(); const module: TestingModule = await Test.createTestingModule({ providers: [ @@ -36,6 +48,10 @@ describe('DocumentService', () => { provide: getRepositoryToken(Document), useValue: mockRepository, }, + { + provide: ClamAVService, + useValue: mockClamAVService, + }, ], }).compile(); @@ -49,6 +65,7 @@ describe('DocumentService', () => { it('should send a put command and save to repo on create', async () => { const stub = mockS3Client.on(PutObjectCommand).resolves({}); mockRepository.save.mockResolvedValue({} as Document); + mockClamAVService.scanFile.mockResolvedValue(false); const res = await service.create( 'dummy/path', @@ -105,11 +122,33 @@ describe('DocumentService', () => { source: DOCUMENT_SOURCE.APPLICANT, }; mockRepository.save.mockResolvedValue(mockDoc as Document); + mockClamAVService.scanFile.mockResolvedValue(false); const res = await service.createDocumentRecord({} as CreateDocumentDto); expect(mockRepository.save).toHaveBeenCalledTimes(1); expect(res).toEqual(mockDoc); }); + it('should throw an exception when the uploaded document fails the virus scan', async () => { + const mockDoc = { + mimeType: 'mimeType', + fileKey: 'fileKey', + fileName: 'fileName', + uploadedBy: null, + source: DOCUMENT_SOURCE.APPLICANT, + }; + mockRepository.save.mockResolvedValue(mockDoc as Document); + mockClamAVService.scanFile.mockResolvedValue(true); + const promise = service.createDocumentRecord({} as CreateDocumentDto); + + await expect(promise).rejects.toMatchObject( + new BaseServiceException( + 'File may contain malicious data, upload blocked', + 403, + ), + ); + expect(mockRepository.save).toHaveBeenCalledTimes(0); + }); + it('should call repository save on update Document', async () => { const mockDoc = new Document({ mimeType: 'mimeType', diff --git a/services/apps/alcs/src/document/document.service.ts b/services/apps/alcs/src/document/document.service.ts index f324a7fd16..27cd5c9ed7 100644 --- a/services/apps/alcs/src/document/document.service.ts +++ b/services/apps/alcs/src/document/document.service.ts @@ -1,5 +1,7 @@ import { CONFIG_TOKEN, IConfig } from '@app/common/config/config.module'; +import { BaseServiceException } from '@app/common/exceptions/base.exception'; import { + DeleteObjectCommand, GetObjectCommand, PutObjectCommand, S3Client, @@ -10,6 +12,7 @@ import { Inject, Injectable, Logger } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { v4 } from 'uuid'; +import { ClamAVService } from '../clamav/clamav.service'; import { User } from '../user/user.entity'; import { CreateDocumentDto, @@ -32,6 +35,7 @@ export class DocumentService { @Inject(CONFIG_TOKEN) private config: IConfig, @InjectRepository(Document) private documentRepository: Repository<Document>, + private clamAvService: ClamAVService, ) { this.dataStore = new S3Client({ region: 'us-east-1', @@ -151,6 +155,26 @@ export class DocumentService { } async createDocumentRecord(data: CreateDocumentDto) { + const command = new GetObjectCommand({ + Bucket: this.config.get('STORAGE.BUCKET'), + Key: data.fileKey, + ResponseContentDisposition: `attachment; filename="${data.fileName}"`, + }); + + const fileUrl = await getSignedUrl(this.dataStore, command, { + expiresIn: this.documentTimeout, + }); + + const isInfected = await this.clamAvService.scanFile(fileUrl); + if (isInfected) { + await this.deleteDocument(data.fileKey); + this.logger.warn(`Deleted malicious file ${data.fileKey}`); + throw new BaseServiceException( + 'File may contain malicious data, upload blocked', + 403, + ); + } + return this.documentRepository.save( new Document({ mimeType: data.mimeType, @@ -173,6 +197,14 @@ export class DocumentService { }); } + private async deleteDocument(fileKey: string) { + const command = new DeleteObjectCommand({ + Bucket: this.config.get('STORAGE.BUCKET'), + Key: fileKey, + }); + await this.dataStore.send(command); + } + async update( document: Document, updates: { fileName: string; source: DOCUMENT_SOURCE }, diff --git a/services/apps/alcs/src/portal/application-document/application-document.module.ts b/services/apps/alcs/src/portal/application-document/application-document.module.ts index 37f0082f93..a5b0885a41 100644 --- a/services/apps/alcs/src/portal/application-document/application-document.module.ts +++ b/services/apps/alcs/src/portal/application-document/application-document.module.ts @@ -1,11 +1,17 @@ import { Module } from '@nestjs/common'; import { ApplicationModule } from '../../alcs/application/application.module'; +import { ClamAntivirusModule } from '../../clamav/clam-antivirus.module'; import { DocumentModule } from '../../document/document.module'; import { ApplicationDocumentController } from '../application-document/application-document.controller'; import { ApplicationSubmissionModule } from '../application-submission/application-submission.module'; @Module({ - imports: [DocumentModule, ApplicationModule, ApplicationSubmissionModule], + imports: [ + DocumentModule, + ApplicationModule, + ApplicationSubmissionModule, + ClamAntivirusModule, + ], controllers: [ApplicationDocumentController], providers: [], exports: [], diff --git a/services/config/default.json b/services/config/default.json index 02b7617ec0..3db36499f4 100644 --- a/services/config/default.json +++ b/services/config/default.json @@ -12,6 +12,11 @@ "FRONTEND_ROOT": "http://localhost:4201", "ALCS_GRPC_URL": "localhost:50057" }, + "CLAMAV": { + "ENABLED": true, + "HOST": "clamav", + "PORT": 3310 + }, "DATABASE": { "HOST": "db", "PORT": 5432, diff --git a/services/docker-compose.yml b/services/docker-compose.yml index d0530e8323..227aa496d8 100644 --- a/services/docker-compose.yml +++ b/services/docker-compose.yml @@ -52,6 +52,18 @@ services: networks: - alcs + clamav: + image: clamav/clamav:stable_base + volumes: + # Socket + - clamsocket:/var/run/clamav/ + - clamav:/var/lib/clamav + ports: + - "3310:3310" + networks: + - alcs + + # metabase: # image: metabase/metabase:latest # environment: @@ -69,6 +81,8 @@ services: volumes: postgres: s3: + clamav: + clamsocket: networks: alcs: diff --git a/services/package-lock.json b/services/package-lock.json index 8f6167b8a9..297ed722a6 100644 --- a/services/package-lock.json +++ b/services/package-lock.json @@ -29,6 +29,8 @@ "@nestjs/platform-fastify": "^9.3.1", "@nestjs/swagger": "^6.1.4", "@nestjs/typeorm": "^9.0.1", + "@types/clamscan": "^2.0.5", + "clamscan": "^2.1.2", "class-transformer": "^0.5.1", "class-validator": "^0.14.0", "config": "^3.3.9", @@ -3914,6 +3916,23 @@ "@types/node": "*" } }, + "node_modules/@types/clamscan": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@types/clamscan/-/clamscan-2.0.5.tgz", + "integrity": "sha512-bFqdscswqBia3yKEJZVVWELOVvWKHUR1dCmH4xshYwu0T9YSfZd35Q8Z9jYW0ygxqGlHjLXMb2/7C6CJITbDgg==", + "dependencies": { + "@types/node": "*", + "axios": "^0.24.0" + } + }, + "node_modules/@types/clamscan/node_modules/axios": { + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.24.0.tgz", + "integrity": "sha512-Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA==", + "dependencies": { + "follow-redirects": "^1.14.4" + } + }, "node_modules/@types/config": { "version": "0.0.41", "resolved": "https://registry.npmjs.org/@types/config/-/config-0.0.41.tgz", @@ -5386,6 +5405,14 @@ "integrity": "sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA==", "dev": true }, + "node_modules/clamscan": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/clamscan/-/clamscan-2.1.2.tgz", + "integrity": "sha512-pcovgLHcrg3l/mI51Kuk0kN++07pSZdBTskISw0UFvsm8UXda8oNCm0eLeODxFg85Mz+k+TtSS9+XPlriJ8/Fg==", + "engines": { + "node": ">=12.0.0" + } + }, "node_modules/class-transformer": { "version": "0.5.1", "resolved": "https://registry.npmjs.org/class-transformer/-/class-transformer-0.5.1.tgz", @@ -16000,6 +16027,25 @@ "@types/node": "*" } }, + "@types/clamscan": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@types/clamscan/-/clamscan-2.0.5.tgz", + "integrity": "sha512-bFqdscswqBia3yKEJZVVWELOVvWKHUR1dCmH4xshYwu0T9YSfZd35Q8Z9jYW0ygxqGlHjLXMb2/7C6CJITbDgg==", + "requires": { + "@types/node": "*", + "axios": "^0.24.0" + }, + "dependencies": { + "axios": { + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.24.0.tgz", + "integrity": "sha512-Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA==", + "requires": { + "follow-redirects": "^1.14.4" + } + } + } + }, "@types/config": { "version": "0.0.41", "resolved": "https://registry.npmjs.org/@types/config/-/config-0.0.41.tgz", @@ -17142,6 +17188,11 @@ "integrity": "sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA==", "dev": true }, + "clamscan": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/clamscan/-/clamscan-2.1.2.tgz", + "integrity": "sha512-pcovgLHcrg3l/mI51Kuk0kN++07pSZdBTskISw0UFvsm8UXda8oNCm0eLeODxFg85Mz+k+TtSS9+XPlriJ8/Fg==" + }, "class-transformer": { "version": "0.5.1", "resolved": "https://registry.npmjs.org/class-transformer/-/class-transformer-0.5.1.tgz", diff --git a/services/package.json b/services/package.json index a1f28314f2..2ca98fea5e 100644 --- a/services/package.json +++ b/services/package.json @@ -48,6 +48,8 @@ "@nestjs/platform-fastify": "^9.3.1", "@nestjs/swagger": "^6.1.4", "@nestjs/typeorm": "^9.0.1", + "@types/clamscan": "^2.0.5", + "clamscan": "^2.1.2", "class-transformer": "^0.5.1", "class-validator": "^0.14.0", "config": "^3.3.9", From 752b7e2f13229b3c0eb7e2288d14e9b58264641d Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Tue, 17 Oct 2023 11:36:46 -0700 Subject: [PATCH 503/954] Oats db obfuscation tool part 1 (#1063) OATS DB obfuscation update docs for ora2pg --- .../menu/commands/__init__.py | 3 +- .../menu/commands/obfuscation.py | 7 + bin/migrate-oats-data/menu/menu.py | 2 + bin/migrate-oats-data/migrate.py | 3 + .../prod_db_obfuscation/__init__.py | 1 + .../prod_db_obfuscation/lorem_ipsum.py | 1 + .../prod_db_obfuscation/oats/__init__.py | 1 + .../prod_db_obfuscation/oats/obfuscate.py | 583 ++++ ora2pg/README.MD | 10 +- ora2pg/data/ddl_18_2_oats_prod.sql | 2705 +++++++++++++++++ 10 files changed, 3310 insertions(+), 6 deletions(-) create mode 100644 bin/migrate-oats-data/menu/commands/obfuscation.py create mode 100644 bin/migrate-oats-data/prod_db_obfuscation/__init__.py create mode 100644 bin/migrate-oats-data/prod_db_obfuscation/lorem_ipsum.py create mode 100644 bin/migrate-oats-data/prod_db_obfuscation/oats/__init__.py create mode 100644 bin/migrate-oats-data/prod_db_obfuscation/oats/obfuscate.py create mode 100644 ora2pg/data/ddl_18_2_oats_prod.sql diff --git a/bin/migrate-oats-data/menu/commands/__init__.py b/bin/migrate-oats-data/menu/commands/__init__.py index e2a01516ad..f5e9bfc920 100644 --- a/bin/migrate-oats-data/menu/commands/__init__.py +++ b/bin/migrate-oats-data/menu/commands/__init__.py @@ -2,4 +2,5 @@ from .clean_all import clean_all from .documents import * from .applications import * -from .notice_of_intents import * \ No newline at end of file +from .notice_of_intents import * +from .obfuscation import * diff --git a/bin/migrate-oats-data/menu/commands/obfuscation.py b/bin/migrate-oats-data/menu/commands/obfuscation.py new file mode 100644 index 0000000000..777f8466bc --- /dev/null +++ b/bin/migrate-oats-data/menu/commands/obfuscation.py @@ -0,0 +1,7 @@ +from prod_db_obfuscation import process_oats_data + + +def start_obfuscation(console): + console.log("Beginning PROD data obfuscation") + with console.status("PROD data obfuscation\n") as status: + process_oats_data() diff --git a/bin/migrate-oats-data/menu/menu.py b/bin/migrate-oats-data/menu/menu.py index 69130392c8..30edaf4de7 100644 --- a/bin/migrate-oats-data/menu/menu.py +++ b/bin/migrate-oats-data/menu/menu.py @@ -51,6 +51,8 @@ def setup_menu_args_parser(import_batch_size): subparsers.add_parser("clean", help="Clean all imported data") + subparsers.add_parser("obfuscate", help="Obfuscate PROD data") + # Print help message if user specifies --help or -h flag if "-h" in sys.argv or "--help" in sys.argv: parser.print_help() diff --git a/bin/migrate-oats-data/migrate.py b/bin/migrate-oats-data/migrate.py index 4efffde327..ad4d8f0ec1 100644 --- a/bin/migrate-oats-data/migrate.py +++ b/bin/migrate-oats-data/migrate.py @@ -16,6 +16,7 @@ noi_document_import, notice_of_intent_import, notice_of_intent_clean, + start_obfuscation, ) from db import connection_pool from common import BATCH_UPLOAD_SIZE, setup_and_get_logger @@ -53,6 +54,8 @@ noi_document_import(console, args) case "app-sub-import": application_submission_import(console, args) + case "obfuscate": + start_obfuscation(console) finally: if connection_pool: diff --git a/bin/migrate-oats-data/prod_db_obfuscation/__init__.py b/bin/migrate-oats-data/prod_db_obfuscation/__init__.py new file mode 100644 index 0000000000..847680508c --- /dev/null +++ b/bin/migrate-oats-data/prod_db_obfuscation/__init__.py @@ -0,0 +1 @@ +from .oats import process_oats_data \ No newline at end of file diff --git a/bin/migrate-oats-data/prod_db_obfuscation/lorem_ipsum.py b/bin/migrate-oats-data/prod_db_obfuscation/lorem_ipsum.py new file mode 100644 index 0000000000..1c97187508 --- /dev/null +++ b/bin/migrate-oats-data/prod_db_obfuscation/lorem_ipsum.py @@ -0,0 +1 @@ +lorem_ipsum_string = """Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo. Nemo enim ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit, sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt. Neque porro quisquam est, qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit, sed quia non numquam eius modi tempora incidunt ut labore et dolore magnam aliquam quaerat voluptatem. Ut enim ad minima veniam, quis nostrum exercitationem ullam corporis suscipit laboriosam, nisi ut aliquid ex ea commodi consequatur? Quis autem vel eum iure reprehenderit qui in ea voluptate velit esse quam nihil molestiae consequatur, vel illum qui dolorem eum fugiat quo voluptas nulla pariatur? At vero eos et accusamus et iusto odio dignissimos ducimus qui blanditiis praesentium voluptatum deleniti atque corrupti quos dolores et quas molestias excepturi sint occaecati cupiditate non provident, similique sunt in culpa qui officia deserunt mollitia animi, id est laborum et dolorum fuga. Et harum quidem rerum facilis est et expedita distinctio. Nam libero tempore, cum soluta nobis est eligendi optio cumque nihil impedit quo minus id quod maxime placeat facere possimus, omnis voluptas assumenda est, omnis dolor repellendus. Temporibus autem quibusdam et aut officiis debitis aut rerum necessitatibus saepe eveniet ut et voluptates repudiandae sint et molestiae non recusandae. Itaque earum rerum hic tenetur a sapiente delectus, ut aut reiciendis voluptatibus maiores alias consequatur aut perferendis doloribus asperiores repellat.""" diff --git a/bin/migrate-oats-data/prod_db_obfuscation/oats/__init__.py b/bin/migrate-oats-data/prod_db_obfuscation/oats/__init__.py new file mode 100644 index 0000000000..2794e68f17 --- /dev/null +++ b/bin/migrate-oats-data/prod_db_obfuscation/oats/__init__.py @@ -0,0 +1 @@ +from .obfuscate import process_oats_data diff --git a/bin/migrate-oats-data/prod_db_obfuscation/oats/obfuscate.py b/bin/migrate-oats-data/prod_db_obfuscation/oats/obfuscate.py new file mode 100644 index 0000000000..632c34a5ce --- /dev/null +++ b/bin/migrate-oats-data/prod_db_obfuscation/oats/obfuscate.py @@ -0,0 +1,583 @@ +from common import setup_and_get_logger +from db import inject_conn_pool +from ..lorem_ipsum import lorem_ipsum_string +from faker import Faker +import functools + +logger = setup_and_get_logger("prod_data_obfuscation") + + +def process_oats_data(): + logger.info("Start oats obfuscation.") + _update_person_identification_info() + _delete_data_from_tables() + _update_note_columns() + _update_with_random_names_oats_persons() + _update_with_random_names_oats_alcs_staff() + _update_with_random_names_oats_compliance_inspector() + _update_description_columns() + _update_desc_columns() + _update_with_random_names_oats_agri_cap_consultant() + _update_term_columns() + _update_with_random_oats_issues() + _update_with_random_oats_documents() + _update_with_random_oats_organization() + _update_with_random_oats_planning_review() + _update_comment_columns() + _update_with_random_oats_alr_application() + _replace_audit_columns() + + +def log_process(proc_name): + def decorator_log_process(func): + @functools.wraps(func) + def wrapper_log_process(*args, **kwargs): + logger.info(f"Start '{proc_name}'") + result = func(*args, **kwargs) + logger.info(f"Finished '{proc_name}'") + return result + + return wrapper_log_process + + return decorator_log_process + + +@log_process("replace_audit_columns") +@inject_conn_pool +def _replace_audit_columns(conn=None): + generate_update_query = """ + SELECT 'UPDATE ' || table_schema || '.' || table_name || ' SET who_created = ''obfuscated'', who_updated = ''obfuscated'';' + FROM information_schema.columns + WHERE column_name IN ('who_created', 'who_updated') AND table_schema = 'oats'; + """ + try: + with conn.cursor() as cursor: + cursor.execute(generate_update_query) + update_queries = cursor.fetchall() + + for query in update_queries: + cursor.execute(query[0]) + + conn.commit() + except Exception as err: + conn.rollback() + logger.exception(err) + + +@log_process("update_person_identification_info") +@inject_conn_pool +def _update_person_identification_info(conn=None): + create_proc_sql = """ + CREATE OR REPLACE FUNCTION update_info_oats_schema() RETURNS VOID AS $$ + DECLARE r RECORD; + firstnames TEXT[] := ARRAY['John', 'Jane', 'Adam', 'Sara', 'Mike', 'Emma']; + lastnames TEXT[] := ARRAY['Doe', 'Smith', 'Johnson', 'Brown', 'Williams', 'Miller']; + midnames TEXT[] := ARRAY['A', 'B', 'C', 'D','E', 'F']; + random_index int; + BEGIN + FOR r IN (SELECT * FROM information_schema.columns + WHERE (column_name IN ('phone_number', 'cell_phone_number', 'email', 'email_address', 'website_url', 'fax_number' , 'title')) + AND table_schema = 'oats') LOOP + CASE + WHEN r.column_name = 'phone_number' THEN EXECUTE format('UPDATE oats.%s SET phone_number = ''(111) 111-1111'' WHERE phone_number IS NOT NULL', r.table_name); + WHEN r.column_name = 'cell_phone_number' THEN EXECUTE format('UPDATE oats.%s SET cell_phone_number = ''(222) 222-2222'' WHERE cell_phone_number IS NOT NULL', r.table_name); + WHEN r.column_name = 'fax_number' THEN EXECUTE format('UPDATE oats.%s SET fax_number = ''(333) 333-3333'' WHERE fax_number IS NOT NULL', r.table_name); + WHEN r.column_name = 'website_url' THEN EXECUTE format('UPDATE oats.%s SET website_url = ''random-web-site'' WHERE website_url IS NOT NULL', r.table_name); + WHEN r.column_name = 'title' THEN EXECUTE format('UPDATE oats.%s SET title = ''random-title'' WHERE title IS NOT NULL', r.table_name); + WHEN r.column_name LIKE '%email%' THEN EXECUTE format('UPDATE oats.%s SET %s = ''11@11'' WHERE %s IS NOT NULL', r.table_name, r.column_name, r.column_name); + END CASE; + END LOOP; + END; + $$ LANGUAGE plpgsql; + """ + + execute_proc_sql = "SELECT update_info_oats_schema();" + drop_proc_sql = "DROP FUNCTION update_info_oats_schema();" + + try: + with conn.cursor() as cursor: + cursor.execute(create_proc_sql) + cursor.execute(execute_proc_sql) + cursor.execute(drop_proc_sql) + conn.commit() + except Exception as err: + conn.rollback() + logger.exception(err) + + +@log_process("delete_data_from_tables") +@inject_conn_pool +def _delete_data_from_tables(conn=None): + # List of tables from which you want to delete data + table_names = [ + "oats.oats_alr_unvalidated_app_data", + "oats.oats_email_notifications", + "oats.oats_email_type_codes", + "oats.oats_email_status_codes", + "oats.oats_financial_instruments", + "oats.oats_financial_instrument_cds", + "oats.oats_stop_work_order_rcpnts", + "oats.oats_system_setting_codes", + ] + + try: + with conn.cursor() as cursor: + for table_name in table_names: + # Check if such a table exists before attempting to delete + check_table_exists_qry = f"SELECT to_regclass('{table_name}');" + del_query = f"DELETE FROM {table_name};" + + cursor.execute(check_table_exists_qry) + if cursor.fetchone()[0] is not None: + cursor.execute(del_query) + else: + logger.info(f"'{table_name}' does not exist.") + + conn.commit() + + except Exception as err: + logger.exception(err) + + +@log_process("update_note_columns") +@inject_conn_pool +def _update_note_columns(conn=None): + create_proc_sql = f""" + {_lorem_ipsum_function_query} + + CREATE OR REPLACE FUNCTION update_note_schema() RETURNS VOID AS $$ + DECLARE + r RECORD; + BEGIN + FOR r IN (SELECT * FROM information_schema.columns WHERE column_name LIKE '%text%' and (data_type='text' or data_type like 'character varying') AND table_schema = 'oats') LOOP + EXECUTE format('UPDATE oats.%s SET %s = random_lorem_ipsum() WHERE %s IS NOT NULL', r.table_name, r.column_name, r.column_name); + END LOOP; + END; + $$ LANGUAGE plpgsql; + """ + + execute_proc_sql = "SELECT update_note_schema();" + + try: + with conn.cursor() as cursor: + cursor.execute(create_proc_sql) + cursor.execute(execute_proc_sql) + conn.commit() + except Exception as err: + conn.rollback() + logger.exception(err) + + +@log_process("update_with_random_names_oats_persons") +@inject_conn_pool +def _update_with_random_names_oats_persons(conn=None): + # Set Faker for generating random names + fake = Faker() + + try: + with conn.cursor() as cursor: + cursor.execute("SELECT person_id FROM oats.oats_persons") + record_ids = cursor.fetchall() + + for r_id in record_ids: + sql_query = """ + UPDATE oats.oats_persons + SET first_name = %s, last_name = %s, middle_name = %s + WHERE person_id = %s; + """ + cursor.execute( + sql_query, + (fake.first_name(), fake.last_name(), fake.first_name(), r_id[0]), + ) + + conn.commit() + except Exception as err: + conn.rollback() + logger.exception(err) + + +@log_process("update_with_random_names_oats_alcs_staff") +@inject_conn_pool +def _update_with_random_names_oats_alcs_staff(conn=None): + # Set Faker for generating random names + fake = Faker() + + try: + with conn.cursor() as cursor: + cursor.execute("SELECT alc_staff_id FROM oats.oats_alc_staffs") + record_ids = cursor.fetchall() + + for r_id in record_ids: + sql_query = """ + UPDATE oats.oats_alc_staffs + SET login = %s, first_name = %s, last_name = %s + WHERE alc_staff_id = %s; + """ + cursor.execute( + sql_query, + (fake.user_name(), fake.first_name(), fake.last_name(), r_id[0]), + ) + + conn.commit() + except Exception as err: + conn.rollback() + logger.exception(err) + + +@log_process("update_with_random_names_oats_compliance_inspector") +@inject_conn_pool +def _update_with_random_names_oats_compliance_inspector(conn=None): + fake = Faker() + + try: + with conn.cursor() as cursor: + cursor.execute( + "SELECT compliance_inspection_id FROM oats.oats_compliance_inspections" + ) + record_ids = cursor.fetchall() + + for r_id in record_ids: + sql_query = """ + UPDATE oats.oats_compliance_inspections + SET inspector = %s + WHERE compliance_inspection_id = %s; + """ + cursor.execute( + sql_query, + (fake.first_name(), r_id[0]), + ) + + conn.commit() + except Exception as err: + conn.rollback() + logger.exception(err) + + +@log_process("update_description_columns") +@inject_conn_pool +def _update_description_columns(conn=None): + create_proc_sql = f""" + CREATE OR REPLACE FUNCTION random_lorem_ipsum() RETURNS text AS $$ + DECLARE + lorem_ipsum_str text = '{lorem_ipsum_string}'; + + words text[]; + i INT; + output text = ''; + + BEGIN + + words := string_to_array(lorem_ipsum_str, ' '); + + FOR i IN 1..5 LOOP + output := output || ' ' || words[1 + floor(random() * array_length(words, 1))]; + END LOOP; + + RETURN output; + + END; + $$ LANGUAGE plpgsql; + + CREATE OR REPLACE FUNCTION update_description_schema() RETURNS VOID AS $$ + DECLARE + r RECORD; + BEGIN + FOR r IN (SELECT * FROM information_schema.columns WHERE column_name LIKE '%description%' and (data_type='text' or data_type like 'character varying') AND table_schema = 'oats' AND table_name NOT LIKE '%code%' AND table_name NOT LIKE '%cdc%' AND table_name NOT LIKE '%type%') LOOP + EXECUTE format('UPDATE oats.%s SET %s = random_lorem_ipsum() WHERE %s IS NOT NULL', r.table_name, r.column_name, r.column_name); + END LOOP; + END; + $$ LANGUAGE plpgsql; + """ + + execute_proc_sql = "SELECT update_description_schema();" + + try: + with conn.cursor() as cursor: + cursor.execute(create_proc_sql) + cursor.execute(execute_proc_sql) + conn.commit() + except Exception as err: + conn.rollback() + logger.exception(err) + + +@log_process("update_desc_columns") +@inject_conn_pool +def _update_desc_columns(conn=None): + create_proc_sql = f""" + {_lorem_ipsum_function_query} + + CREATE OR REPLACE FUNCTION update_desc_schema() RETURNS VOID AS $$ + DECLARE + r RECORD; + BEGIN + FOR r IN (SELECT * FROM information_schema.columns WHERE column_name LIKE '%_desc' and (data_type='text' or data_type like 'character varying') AND table_schema = 'oats') LOOP + EXECUTE format('UPDATE oats.%s SET %s = random_lorem_ipsum() WHERE %s IS NOT NULL', r.table_name, r.column_name, r.column_name); + END LOOP; + END; + $$ LANGUAGE plpgsql; + """ + + execute_proc_sql = "SELECT update_desc_schema();" + + try: + with conn.cursor() as cursor: + cursor.execute(create_proc_sql) + cursor.execute(execute_proc_sql) + conn.commit() + except Exception as err: + conn.rollback() + logger.exception(err) + + +@log_process("update_with_random_names_oats_agri_cap_consultant") +@inject_conn_pool +def _update_with_random_names_oats_agri_cap_consultant(conn=None): + fake = Faker() + + try: + with conn.cursor() as cursor: + cursor.execute( + "SELECT alr_appl_component_id FROM oats.oats_alr_appl_components" + ) + record_ids = cursor.fetchall() + + for r_id in record_ids: + sql_query = """ + UPDATE oats.oats_alr_appl_components + SET agri_cap_consultant = %s + WHERE alr_appl_component_id = %s; + """ + cursor.execute( + sql_query, + (fake.first_name(), r_id[0]), + ) + + conn.commit() + except Exception as err: + conn.rollback() + logger.exception(err) + + +@log_process("update_term_columns") +@inject_conn_pool +def _update_term_columns(conn=None): + create_proc_sql = f""" + {_lorem_ipsum_function_query} + + CREATE OR REPLACE FUNCTION update_term_schema() RETURNS VOID AS $$ + DECLARE + r RECORD; + BEGIN + FOR r IN (SELECT * FROM information_schema.columns WHERE column_name LIKE '%term%' and (data_type='text' or data_type like 'character varying') AND table_schema = 'oats') LOOP + EXECUTE format('UPDATE oats.%s SET %s = random_lorem_ipsum() WHERE %s IS NOT NULL', r.table_name, r.column_name, r.column_name); + END LOOP; + END; + $$ LANGUAGE plpgsql; + """ + + execute_proc_sql = "SELECT update_term_schema();" + + try: + with conn.cursor() as cursor: + cursor.execute(create_proc_sql) + cursor.execute(execute_proc_sql) + conn.commit() + except Exception as err: + conn.rollback() + logger.exception(err) + + +@log_process("update_with_random_oats_issues") +@inject_conn_pool +def _update_with_random_oats_issues(conn=None): + fake = Faker() + fake_latin = Faker("la") + + try: + with conn.cursor() as cursor: + cursor.execute("SELECT issue_id FROM oats.oats_issues") + record_ids = cursor.fetchall() + + for r_id in record_ids: + sql_query = """ + UPDATE oats.oats_issues + SET swo_issued_by = CASE WHEN swo_issued_by IS NOT NULL THEN %s ELSE swo_issued_by END, + swo_ceo_review_result = CASE WHEN swo_ceo_review_result IS NOT NULL THEN %s ELSE swo_ceo_review_result END + WHERE issue_id = %s; + """ + cursor.execute( + sql_query, + (fake.first_name(), fake_latin.sentence(nb_words=10), r_id[0]), + ) + + conn.commit() + except Exception as err: + conn.rollback() + logger.exception(err) + + +@log_process("update_with_random_oats_documents") +@inject_conn_pool +def _update_with_random_oats_documents(conn=None): + fake = Faker() + + try: + with conn.cursor() as cursor: + cursor.execute("SELECT document_id FROM oats.oats_documents") + record_ids = cursor.fetchall() + + for r_id in record_ids: + sql_query = """ + UPDATE oats.oats_documents + SET file_name = %s + WHERE document_id = %s; + """ + cursor.execute( + sql_query, + (fake.company(), r_id[0]), + ) + + conn.commit() + except Exception as err: + conn.rollback() + logger.exception(err) + + +@log_process("update_with_random_oats_organization") +@inject_conn_pool +def _update_with_random_oats_organization(conn=None): + fake = Faker() + + try: + with conn.cursor() as cursor: + cursor.execute("SELECT organization_id FROM oats.oats_organizations") + record_ids = cursor.fetchall() + + for r_id in record_ids: + sql_query = """ + UPDATE oats.oats_organizations + SET organization_name = %s, + alias_name = %s + WHERE organization_id = %s; + """ + cursor.execute( + sql_query, + (fake.company(), fake.company(), r_id[0]), + ) + + conn.commit() + except Exception as err: + conn.rollback() + logger.exception(err) + + +@log_process("update_with_random_oats_planning_review") +@inject_conn_pool +def _update_with_random_oats_planning_review(conn=None): + fake = Faker() + + try: + with conn.cursor() as cursor: + cursor.execute("SELECT planning_review_id FROM oats.oats_planning_reviews") + record_ids = cursor.fetchall() + + for r_id in record_ids: + sql_query = """ + UPDATE oats.oats_planning_reviews + SET local_gov_document_name = %s + WHERE planning_review_id = %s; + """ + cursor.execute( + sql_query, + (fake.company(), r_id[0]), + ) + + conn.commit() + except Exception as err: + conn.rollback() + logger.exception(err) + + +@log_process("update_comment_columns") +@inject_conn_pool +def _update_comment_columns(conn=None): + create_proc_sql = f""" + {_lorem_ipsum_function_query} + + CREATE OR REPLACE FUNCTION update_comment_columns() RETURNS VOID AS $$ + DECLARE + r RECORD; + BEGIN + FOR r IN (SELECT * FROM information_schema.columns WHERE column_name LIKE '%comment%' and (data_type='text' or data_type like 'character varying') AND table_schema = 'oats') LOOP + EXECUTE format('UPDATE oats.%s SET %s = random_lorem_ipsum() WHERE %s IS NOT NULL', r.table_name, r.column_name, r.column_name); + END LOOP; + END; + $$ LANGUAGE plpgsql; + """ + + execute_proc_sql = "SELECT update_comment_columns();" + + try: + with conn.cursor() as cursor: + cursor.execute(create_proc_sql) + cursor.execute(execute_proc_sql) + conn.commit() + except Exception as err: + conn.rollback() + logger.exception(err) + + +@log_process("update_with_random_oats_alr_application") +@inject_conn_pool +def _update_with_random_oats_alr_application(conn=None): + fake = Faker() + + try: + with conn.cursor() as cursor: + cursor.execute("SELECT alr_application_id FROM oats.oats_alr_applications") + record_ids = cursor.fetchall() + + for r_id in record_ids: + sql_query = """ + UPDATE oats.oats_alr_applications + SET applicant_file_no = CASE WHEN applicant_file_no IS NOT NULL THEN %s ELSE applicant_file_no END, + ministry_notice_ref_no = CASE WHEN ministry_notice_ref_no IS NOT NULL THEN %s ELSE ministry_notice_ref_no END + WHERE alr_application_id = %s; + """ + cursor.execute( + sql_query, + ( + str(fake.random_int(min=0, max=9999)), + str(fake.random_int(min=0, max=9999)), + r_id[0], + ), + ) + + conn.commit() + except Exception as err: + conn.rollback() + logger.exception(err) + + +_lorem_ipsum_function_query = f""" +CREATE OR REPLACE FUNCTION random_lorem_ipsum() RETURNS text AS $$ + DECLARE + lorem_ipsum_str text = '{lorem_ipsum_string}';-- put your full string here + + words text[]; + i INT; + output text = ''; + + BEGIN + + words := string_to_array(lorem_ipsum_str, ' '); + + FOR i IN 1..50 LOOP + output := output || ' ' || words[1 + floor(random() * array_length(words, 1))]; + END LOOP; + + RETURN output; + +END; +$$ LANGUAGE plpgsql;""" diff --git a/ora2pg/README.MD b/ora2pg/README.MD index a989f24af3..86dc333177 100644 --- a/ora2pg/README.MD +++ b/ora2pg/README.MD @@ -201,7 +201,7 @@ NOTE: at the time of writing this documentation the only version of ora2pg that Dockerized version of ora2pg tool will be used for migration from Oracle to Postgres. Follow this link for more details: https://github.com/Guy-Incognito/ora2pg -- (only if you are running local Oracle in docker) make sure that the steps above regarding the Oracle data import is completed successfully, and your Oracle instance is running. Use docker ps to check running containers +- (only if you are running local Oracle in docker) make sure that the steps above regarding the Oracle data import are completed successfully, and your Oracle instance is running. Use docker ps to check running containers ```sh docker ps @@ -233,7 +233,7 @@ docker ps georgmoser/ora2pg:18.2 ``` - - once the container finishes, you will notice 'output.sql' in the data folder that you specified above. That file contains DDL for schema migration. However, it requires some manual adjustment. + - once the container finishes, you will notice 'output.sql' in the data folder that you specified above. That file contains DDL for schema migration. However, it requires some manual adjustment. Note!You could follow steps bellow or fix the fix errors one by one from psql output files after running schema and data import commands. - at the top of the file, remove following line '\set ON_ERROR_STOP ON' - locate table 'oats_alr_appl_components' and navigate to the constraint creation section and search for these lines that you need to comment, otherwise the DDL script will fail on Postgres side ```SQL @@ -298,9 +298,9 @@ docker ps - apply the schema migration file that was generated previously. This can be done using UI or CLI tool. Example using the psql: -`psql -h $HOSTe -p $PORT -U $USER -d $DBNAME -a -f path-to-ddl-file/ddl.sql` -`psql -h localhost -p 5432 -U postgres -d postgres -f ../data/ddl_18_2_test.sql` -`psql -h localhost -p 5432 -U postgres -d postgres -f ../data/data_18_2_test.sql` +`psql -h $HOSTe -p $PORT -U $USER -d $DBNAME -a -f path-to-ddl-file/ddl.sql` +`psql -h localhost -p 5432 -U postgres -d postgres -f ../data/ddl_18_2_test.sql | tee schema_output.txt` +`psql -h localhost -p 5432 -U postgres -d postgres -f ../data/data_18_2_test.sql | tee data_output.txt` - once schema migration applied check that all the tables are in place - in the sources locate 'import.sql' diff --git a/ora2pg/data/ddl_18_2_oats_prod.sql b/ora2pg/data/ddl_18_2_oats_prod.sql new file mode 100644 index 0000000000..4f6f5a96d8 --- /dev/null +++ b/ora2pg/data/ddl_18_2_oats_prod.sql @@ -0,0 +1,2705 @@ +-- Generated by Ora2Pg, the Oracle database Schema converter, version 18.2 +-- Copyright 2000-2017 Gilles DAROLD. All rights reserved. +-- DATASOURCE: dbi:Oracle:host=NRKDB02.BCGOV;service_name=malprod1.nrs.bcgov;port=1521 + +SET client_encoding TO 'UTF8'; + +CREATE SCHEMA oats; +ALTER SCHEMA oats OWNER TO oats; + +SET search_path = oats; + +CREATE TABLE oats_planning_decisions ( + planning_decision_id bigint NOT NULL, + planning_review_id bigint NOT NULL, + planning_acceptance_code varchar(10) NOT NULL, + decision_source varchar(4) NOT NULL, + resolution_number integer, + decision_date timestamp NOT NULL, + description varchar(4000) NOT NULL, + who_created varchar(32) NOT NULL, + when_created timestamp NOT NULL, + who_updated varchar(32), + when_updated timestamp, + revision_count bigint NOT NULL DEFAULT 0 +) ; +COMMENT ON TABLE oats_planning_decisions IS E'A PLANNING DECISION is a conclusion drawn by the ALC as to how a PLANNING REVIEW conforms to the ALR''s mandate.'; +COMMENT ON COLUMN oats_planning_decisions.when_created IS E'WHEN CREATED is the date/time that the record was created.'; +COMMENT ON COLUMN oats_planning_decisions.decision_date IS E'Date the decision was rendered by the commission'; +COMMENT ON COLUMN oats_planning_decisions.planning_decision_id IS E'System generated sequence number to uniquely identify a PLANNING DECISION'; +COMMENT ON COLUMN oats_planning_decisions.resolution_number IS E'A system generated sequence number that is suffixed with the year of the decision date and is the public identifier for the decision resolution. For example 1234-2007'; +COMMENT ON COLUMN oats_planning_decisions.revision_count IS E'REVISION COUNT is used by Hibernate to control optimistic locking'; +COMMENT ON COLUMN oats_planning_decisions.who_updated IS E'WHO UPDATED is the IDIR or Oracle userid of the person who last updated the record.'; +COMMENT ON COLUMN oats_planning_decisions.description IS E'Further description of the PLANNING DECISION'; +COMMENT ON COLUMN oats_planning_decisions.planning_acceptance_code IS E'User supplied value to uniquely identify a PLANNING ACCEPTANCE CODE'; +COMMENT ON COLUMN oats_planning_decisions.planning_review_id IS E'System generated sequence number to uniquely identify a PLANNING REVIEW'; +COMMENT ON COLUMN oats_planning_decisions.when_updated IS E'WHEN UPDATED is the date/time that the record was last updated.'; +COMMENT ON COLUMN oats_planning_decisions.decision_source IS E'The source of the PLANNING DECISION (ALC Staff or ALC Commission)'; +COMMENT ON COLUMN oats_planning_decisions.who_created IS E'WHO CREATED is the IDIR or Oracle userid of the person who created the record.'; +CREATE INDEX oats_pldc_plac_fk_i ON oats_planning_decisions (planning_acceptance_code); +CREATE INDEX oats_pldc_plrv_fk_i ON oats_planning_decisions (planning_review_id); +ALTER TABLE oats_planning_decisions ADD PRIMARY KEY (planning_decision_id); +ALTER TABLE oats_planning_decisions ADD CONSTRAINT avcon_1238100890_decis_000 CHECK (DECISION_SOURCE IN ('STAF', 'COMM')); + +CREATE TABLE oats_persons ( + person_id bigint NOT NULL, + per_type varchar(10) NOT NULL, + first_name varchar(40), + middle_name varchar(40), + last_name varchar(40) NOT NULL, + title varchar(40), + employee_id bigint, + who_created varchar(32) NOT NULL, + when_created timestamp NOT NULL, + who_updated varchar(32), + when_updated timestamp, + revision_count bigint NOT NULL DEFAULT 0 +) ; +COMMENT ON TABLE oats_persons IS E'A BUSINESS PARTNER is a PERSON which is not a Ministry employee, or a Ministry employee who is acting as a business partner outside of employment function. A business partner includes contractors, clients and external organizations associated or partnered with the Ministry. An EMPLOYEE is a PERSON which is employed by the Ministry and not acting outside of that function. (An EMPLOYEE of the Ministry could also be considered as a BUSINESS PARTNER if involved with Ministry business activities outside the scope of normal job function.) A PERSON plays some role in resource inventory management for the BC Government and may belong to an ORGANIZATION.'; +COMMENT ON COLUMN oats_persons.revision_count IS E'REVISION COUNT is used by Hibernate to control optimistic locking'; +COMMENT ON COLUMN oats_persons.middle_name IS E'The MIDDLE NAME is the middle name of a person.'; +COMMENT ON COLUMN oats_persons.first_name IS E'The FIRST NAME is the first name of a person.'; +COMMENT ON COLUMN oats_persons.person_id IS E'PERSON ID is the system generated unique identifier for PERSON'; +COMMENT ON COLUMN oats_persons.employee_id IS E'The EMPLOYEE ID is the employee number assigned to the person'; +COMMENT ON COLUMN oats_persons.title IS E'The TITLE is the formal appellation attached to the PERSON''s name by virtue of office, rank, or attainment.'; +COMMENT ON COLUMN oats_persons.when_created IS E'WHEN CREATED is the date/time that the record was created.'; +COMMENT ON COLUMN oats_persons.who_updated IS E'WHO UPDATED is the IDIR or Oracle userid of the person who updated the record.'; +COMMENT ON COLUMN oats_persons.when_updated IS E'WHEN UPDATED is the date/time that the record was updated.'; +COMMENT ON COLUMN oats_persons.who_created IS E'WHO CREATED is the IDIR or Oracle userid of the person who created the record.'; +COMMENT ON COLUMN oats_persons.last_name IS E'The LAST NAME is the last name of a person.'; +ALTER TABLE oats_persons ADD PRIMARY KEY (person_id); +ALTER TABLE oats_persons ADD CONSTRAINT avcon_1238100890_per_t_000 CHECK (PER_TYPE IN ('EMP', 'BPA')); +ALTER TABLE oats_persons ADD CONSTRAINT oats_per_chk CHECK ((per_type = 'BPA' AND + employee_id IS NULL) +OR (per_type = 'EMP' AND (employee_id IS NULL OR employee_id IS NOT NULL))); + +CREATE TABLE oats_alr_appl_role_codes ( + alr_appl_role_code varchar(10) NOT NULL, + description varchar(100) NOT NULL, + system_required_ind varchar(1) NOT NULL, + who_created varchar(32) NOT NULL, + when_created timestamp NOT NULL, + who_updated varchar(32), + when_updated timestamp, + revision_count bigint NOT NULL DEFAULT 0 +) ; +COMMENT ON TABLE oats_alr_appl_role_codes IS E'An ALR APPL ROLE CODE is the function or reason a PERSON ORGANIZATION can be included as an ALR APPLICATION PARTY For example: - Applicant - Agent - Local Government'; +COMMENT ON COLUMN oats_alr_appl_role_codes.alr_appl_role_code IS E'User supplied value to uniquely identify an ALR APPL ROLE CODE'; +COMMENT ON COLUMN oats_alr_appl_role_codes.when_created IS E'WHEN CREATED is the date/time that the record was created.'; +COMMENT ON COLUMN oats_alr_appl_role_codes.who_created IS E'WHO CREATED is the IDIR or Oracle userid of the person who created the record.'; +COMMENT ON COLUMN oats_alr_appl_role_codes.when_updated IS E'WHEN UPDATED is the date/time that the record was last updated.'; +COMMENT ON COLUMN oats_alr_appl_role_codes.system_required_ind IS E'Indicates whether or not the code is required by the system. If yes, the users would be prevented from updating or deleting the code value.'; +COMMENT ON COLUMN oats_alr_appl_role_codes.description IS E'Description of the ALR APPL ROLE CODE'; +COMMENT ON COLUMN oats_alr_appl_role_codes.who_updated IS E'WHO UPDATED is the IDIR or Oracle userid of the person who last updated the record.'; +COMMENT ON COLUMN oats_alr_appl_role_codes.revision_count IS E'REVISION COUNT is used by Hibernate to control optimistic locking'; +ALTER TABLE oats_alr_appl_role_codes ADD PRIMARY KEY (alr_appl_role_code); +ALTER TABLE oats_alr_appl_role_codes ADD CONSTRAINT avcon_1238100890_syste_003 CHECK (SYSTEM_REQUIRED_IND IN ('Y', 'N')); + +CREATE TABLE oats_person_organizations ( + person_organization_id bigint NOT NULL, + person_id bigint, + organization_id bigint, + phone_number varchar(20), + cell_phone_number varchar(20), + fax_number varchar(20), + email_address varchar(50), + website_url varchar(2000), + effective_date timestamp, + expiry_date timestamp, + email_verified_ind varchar(1) DEFAULT 'N', + who_created varchar(32) NOT NULL, + when_created timestamp NOT NULL, + who_updated varchar(32), + when_updated timestamp, + revision_count bigint NOT NULL DEFAULT 0 +) ; +COMMENT ON TABLE oats_person_organizations IS E'A PERSON ORGANIZATION is a PERSON or ORGANIZATION or a PERSON OF AN ORGANIZATION which does business with, is a client of, or is otherwise of interest to the Ministry.'; +COMMENT ON COLUMN oats_person_organizations.cell_phone_number IS E'The CELL PHONE NUMBER is the Cell phone number of the person, organization or person of the organization. Includes area code.'; +COMMENT ON COLUMN oats_person_organizations.email_address IS E'The EMAIL ADDRESS is the Email address of the person, organization or person of the organization.'; +COMMENT ON COLUMN oats_person_organizations.when_updated IS E'WHEN UPDATED is the date/time that the record was updated.'; +COMMENT ON COLUMN oats_person_organizations.who_created IS E'WHO CREATED is the IDIR or Oracle userid of the person who created the record.'; +COMMENT ON COLUMN oats_person_organizations.organization_id IS E'ORGANIZATION ID is the system generated unique identifier for ORGANIZATION'; +COMMENT ON COLUMN oats_person_organizations.person_organization_id IS E'PERSON ORGANIZATION ID is the system generated unique identifier for PERSON ORGANIZATION.'; +COMMENT ON COLUMN oats_person_organizations.phone_number IS E'The PHONE NUMBER is the Phone number of the person, organization or person of the organization. Includes area code.'; +COMMENT ON COLUMN oats_person_organizations.who_updated IS E'WHO UPDATED is the IDIR or Oracle userid of the person who updated the record.'; +COMMENT ON COLUMN oats_person_organizations.when_created IS E'WHEN CREATED is the date/time that the record was created.'; +COMMENT ON COLUMN oats_person_organizations.effective_date IS E'The EFFECTIVE DATE is the date a person organization becomes effective as a representative of the organization and person.'; +COMMENT ON COLUMN oats_person_organizations.website_url IS E'The WEBSITE URL is the Website address of the person, organization or person of the organization.'; +COMMENT ON COLUMN oats_person_organizations.expiry_date IS E'The EXPIRY DATE is the date a person organization becomes effective as a representative of the organization and person.'; +COMMENT ON COLUMN oats_person_organizations.person_id IS E'PERSON ID is the system generated unique identifier for PERSON'; +COMMENT ON COLUMN oats_person_organizations.email_verified_ind IS E'Indicates if the email has been validated.'; +COMMENT ON COLUMN oats_person_organizations.revision_count IS E'REVISION COUNT is used by Hibernate to control optimistic locking'; +COMMENT ON COLUMN oats_person_organizations.fax_number IS E'The FAX NUMBER is the Facsimile number of the person, organization or person of the organization. Includes area code.'; +ALTER TABLE oats_person_organizations ADD PRIMARY KEY (person_organization_id); + +CREATE TABLE oats_alr_application_fees ( + alr_application_fee_id bigint NOT NULL, + fee_amount double precision NOT NULL, + submit_to_lg_ind varchar(1) NOT NULL, + alr_change_code varchar(10) NOT NULL, + application_class_code varchar(10) NOT NULL, + who_created varchar(32) NOT NULL, + when_created timestamp NOT NULL, + who_updated varchar(32), + when_updated timestamp, + revision_count bigint NOT NULL DEFAULT 0 +) ; +COMMENT ON COLUMN oats_alr_application_fees.alr_application_fee_id IS E'System generated sequence number to uniquely identify a ALR APPLICATION FEE'; +COMMENT ON COLUMN oats_alr_application_fees.when_created IS E'WHEN CREATED is the date/time that the record was created.'; +COMMENT ON COLUMN oats_alr_application_fees.application_class_code IS E'System developer supplied value to uniquely identify an APPLICATION CLASS CODE'; +COMMENT ON COLUMN oats_alr_application_fees.who_updated IS E'WHO UPDATED is the IDIR or Oracle userid of the person who last updated the record.'; +COMMENT ON COLUMN oats_alr_application_fees.revision_count IS E'REVISION COUNT is used by Hibernate to control optimistic locking'; +COMMENT ON COLUMN oats_alr_application_fees.alr_change_code IS E'System developer supplied value to uniquely identify an ALR CHANGE CODE'; +COMMENT ON COLUMN oats_alr_application_fees.who_created IS E'WHO CREATED is the IDIR or Oracle userid of the person who created the record.'; +COMMENT ON COLUMN oats_alr_application_fees.fee_amount IS E'FEE AMOUNT is the amount in dollars the applicant must pay to have his application processed.'; +COMMENT ON COLUMN oats_alr_application_fees.submit_to_lg_ind IS E'SUBMIT TO LG IND indicates whether an applcation of a certain type needs to be submitted to the local government for review.'; +COMMENT ON COLUMN oats_alr_application_fees.when_updated IS E'WHEN UPDATED is the date/time that the record was last updated.'; +CREATE UNIQUE INDEX oats_aafs_uk ON oats_alr_application_fees (application_class_code, alr_change_code); +CREATE INDEX aafs_alcc_fk_i ON oats_alr_application_fees (alr_change_code); +CREATE INDEX aafs_apcc_fk_i ON oats_alr_application_fees (application_class_code); +ALTER TABLE oats_alr_application_fees ADD PRIMARY KEY (alr_application_fee_id); +ALTER TABLE oats_alr_application_fees ADD UNIQUE (application_class_code,alr_change_code); +ALTER TABLE oats_alr_application_fees ADD CONSTRAINT avcon_1362772157_submi_000 CHECK (SUBMIT_TO_LG_IND IN ('Y', 'N')); + +CREATE TABLE oats_issue_notes ( + issue_note_id bigint NOT NULL, + issue_id bigint NOT NULL, + note_date timestamp NOT NULL, + note_text varchar(4000) NOT NULL, + who_created varchar(32) NOT NULL, + when_created timestamp NOT NULL, + who_updated varchar(32), + when_updated timestamp, + revision_count bigint NOT NULL DEFAULT 0 +) ; +COMMENT ON TABLE oats_issue_notes IS E'An ISSUE NOTE is the noting of an event that has occurred during processing an ISSUE.'; +COMMENT ON COLUMN oats_issue_notes.revision_count IS E'REVISION COUNT is used by Hibernate to control optimistic locking'; +COMMENT ON COLUMN oats_issue_notes.who_updated IS E'WHO UPDATED is the IDIR or Oracle userid of the person who last updated the record.'; +COMMENT ON COLUMN oats_issue_notes.when_updated IS E'WHEN UPDATED is the date/time that the record was last updated.'; +COMMENT ON COLUMN oats_issue_notes.who_created IS E'WHO CREATED is the IDIR or Oracle userid of the person who created the record.'; +COMMENT ON COLUMN oats_issue_notes.note_date IS E'Date the note was made'; +COMMENT ON COLUMN oats_issue_notes.note_text IS E'Text of the note'; +COMMENT ON COLUMN oats_issue_notes.when_created IS E'WHEN CREATED is the date/time that the record was created.'; +COMMENT ON COLUMN oats_issue_notes.issue_id IS E'System generated sequence number to uniquely identify an ISSUE'; +COMMENT ON COLUMN oats_issue_notes.issue_note_id IS E'System generated sequence number to uniquely identify an ISSUE NOTE'; +CREATE INDEX oats_isnt_issu_fk_i ON oats_issue_notes (issue_id); +ALTER TABLE oats_issue_notes ADD PRIMARY KEY (issue_note_id); + +CREATE TABLE oats_alr_appl_meeting_codes ( + alr_appl_meeting_code varchar(10) NOT NULL, + description varchar(100) NOT NULL, + system_required_ind varchar(1) NOT NULL, + who_created varchar(32) NOT NULL, + when_created timestamp NOT NULL, + who_updated varchar(32), + when_updated timestamp, + revision_count bigint NOT NULL DEFAULT 0 +) ; +COMMENT ON TABLE oats_alr_appl_meeting_codes IS E'An ALR APPL MEETING CODE is a type of meeting that can be conducted when during the evaluation of an ALR APPLICATION. For Example: - Exclusion Meeting - Site Visit - Public Information - Public Hearing'; +COMMENT ON COLUMN oats_alr_appl_meeting_codes.when_created IS E'WHEN CREATED is the date/time that the record was created.'; +COMMENT ON COLUMN oats_alr_appl_meeting_codes.alr_appl_meeting_code IS E'User supplied value to uniquely identify an ALR APPL MEETING CODE'; +COMMENT ON COLUMN oats_alr_appl_meeting_codes.who_updated IS E'WHO UPDATED is the IDIR or Oracle userid of the person who last updated the record.'; +COMMENT ON COLUMN oats_alr_appl_meeting_codes.revision_count IS E'REVISION COUNT is used by Hibernate to control optimistic locking'; +COMMENT ON COLUMN oats_alr_appl_meeting_codes.description IS E'Description of the ALR APPL MEETING CODE'; +COMMENT ON COLUMN oats_alr_appl_meeting_codes.system_required_ind IS E'Indicates whether or not the code is required by the system. If yes, the users would be prevented from updating or deleting the code value.'; +COMMENT ON COLUMN oats_alr_appl_meeting_codes.who_created IS E'WHO CREATED is the IDIR or Oracle userid of the person who created the record.'; +COMMENT ON COLUMN oats_alr_appl_meeting_codes.when_updated IS E'WHEN UPDATED is the date/time that the record was last updated.'; +ALTER TABLE oats_alr_appl_meeting_codes ADD PRIMARY KEY (alr_appl_meeting_code); +ALTER TABLE oats_alr_appl_meeting_codes ADD CONSTRAINT avcon_1238100890_syste_024 CHECK (SYSTEM_REQUIRED_IND IN ('Y', 'N')); + +CREATE TABLE oats_permit_type_codes ( + permit_type_code varchar(10) NOT NULL, + description varchar(100) NOT NULL, + system_required_ind varchar(1) NOT NULL, + who_created varchar(32) NOT NULL, + when_created timestamp NOT NULL, + who_updated varchar(32), + when_updated timestamp, + revision_count bigint NOT NULL DEFAULT 0 +) ; +COMMENT ON TABLE oats_permit_type_codes IS E'A PERMIT TYPE CODE is a classification of permission that a local government a provincial government ministry may grant a land owner to make changes on property, or allow activities to be conducted. For example: - Permit - Licence - Approval'; +COMMENT ON COLUMN oats_permit_type_codes.when_created IS E'WHEN CREATED is the date/time that the record was created.'; +COMMENT ON COLUMN oats_permit_type_codes.permit_type_code IS E'User supplied value to uniquely identify a PERMIT TYPE CODE'; +COMMENT ON COLUMN oats_permit_type_codes.description IS E'Description of the PERMIT TYPE CODE'; +COMMENT ON COLUMN oats_permit_type_codes.system_required_ind IS E'Indicates whether or not the code is required by the system. If yes, the users would be prevented from updating or deleting the code value.'; +COMMENT ON COLUMN oats_permit_type_codes.when_updated IS E'WHEN UPDATED is the date/time that the record was last updated.'; +COMMENT ON COLUMN oats_permit_type_codes.who_created IS E'WHO CREATED is the IDIR or Oracle userid of the person who created the record.'; +COMMENT ON COLUMN oats_permit_type_codes.revision_count IS E'REVISION COUNT is used by Hibernate to control optimistic locking'; +COMMENT ON COLUMN oats_permit_type_codes.who_updated IS E'WHO UPDATED is the IDIR or Oracle userid of the person who last updated the record.'; +ALTER TABLE oats_permit_type_codes ADD PRIMARY KEY (permit_type_code); +ALTER TABLE oats_permit_type_codes ADD CONSTRAINT avcon_1238100890_syste_002 CHECK (SYSTEM_REQUIRED_IND IN ('Y', 'N')); + +CREATE TABLE oats_staff_journal_entries ( + staff_journal_entry_id bigint NOT NULL, + alr_application_id bigint NOT NULL, + journal_date timestamp NOT NULL, + journal_text varchar(4000) NOT NULL, + who_created varchar(32) NOT NULL, + when_created timestamp NOT NULL, + who_updated varchar(32), + when_updated timestamp, + revision_count bigint NOT NULL DEFAULT 0 +) ; +COMMENT ON TABLE oats_staff_journal_entries IS E'A STAFF JOURNAL ENTRY is the noting of an event that has occurred during processing an ALR APPLICATION. For Example: - 2007-08-20: Contacted application to clarify location of the property - 2007-08-21: Received more detailed property description'; +COMMENT ON COLUMN oats_staff_journal_entries.journal_date IS E'Date the journal entry was made'; +COMMENT ON COLUMN oats_staff_journal_entries.when_created IS E'WHEN CREATED is the date/time that the record was created.'; +COMMENT ON COLUMN oats_staff_journal_entries.staff_journal_entry_id IS E'System generated sequence number to uniquely identify a STAFF JOURNAL ENTRY'; +COMMENT ON COLUMN oats_staff_journal_entries.revision_count IS E'REVISION COUNT is used by Hibernate to control optimistic locking'; +COMMENT ON COLUMN oats_staff_journal_entries.who_updated IS E'WHO UPDATED is the IDIR or Oracle userid of the person who last updated the record.'; +COMMENT ON COLUMN oats_staff_journal_entries.alr_application_id IS E'System generated sequence number to uniquely identify an ALR APPLICATION. This is also used as the ALR APPLICATION''S external reference number.'; +COMMENT ON COLUMN oats_staff_journal_entries.journal_text IS E'Text of the journal entry'; +COMMENT ON COLUMN oats_staff_journal_entries.when_updated IS E'WHEN UPDATED is the date/time that the record was last updated.'; +COMMENT ON COLUMN oats_staff_journal_entries.who_created IS E'WHO CREATED is the IDIR or Oracle userid of the person who created the record.'; +CREATE INDEX oats_sjou_appl_fk_i ON oats_staff_journal_entries (alr_application_id); +ALTER TABLE oats_staff_journal_entries ADD PRIMARY KEY (staff_journal_entry_id); + +CREATE TABLE oats_condition_compliance_rpts ( + condition_compliance_rpt_id bigint NOT NULL, + condition_id bigint NOT NULL, + expected_date timestamp NOT NULL, + received_date timestamp, + who_created varchar(32) NOT NULL, + when_created timestamp NOT NULL, + who_updated varchar(32), + when_updated timestamp, + revision_count bigint NOT NULL DEFAULT 0 +) ; +COMMENT ON TABLE oats_condition_compliance_rpts IS E'A CONDITION COMPLIANCE RPT is a request by the Commission to have the applicant submit a report on a specified date to detail the compliance is a CONDITION.'; +COMMENT ON COLUMN oats_condition_compliance_rpts.when_created IS E'WHEN CREATED is the date/time that the record was created.'; +COMMENT ON COLUMN oats_condition_compliance_rpts.received_date IS E'Date the report was received by the Commission.'; +COMMENT ON COLUMN oats_condition_compliance_rpts.condition_id IS E'System generated sequence number to uniquely identify a CONDITION'; +COMMENT ON COLUMN oats_condition_compliance_rpts.who_updated IS E'WHO UPDATED is the IDIR or Oracle userid of the person who last updated the record.'; +COMMENT ON COLUMN oats_condition_compliance_rpts.revision_count IS E'REVISION COUNT is used by Hibernate to control optimistic locking'; +COMMENT ON COLUMN oats_condition_compliance_rpts.expected_date IS E'Date the report is expected to be submitted to the Commission.'; +COMMENT ON COLUMN oats_condition_compliance_rpts.who_created IS E'WHO CREATED is the IDIR or Oracle userid of the person who created the record.'; +COMMENT ON COLUMN oats_condition_compliance_rpts.when_updated IS E'WHEN UPDATED is the date/time that the record was last updated.'; +COMMENT ON COLUMN oats_condition_compliance_rpts.condition_compliance_rpt_id IS E'System generated sequence number to uniquely identify a CONDITION COMPLIANCE RPT'; +CREATE INDEX oats_ccrp_cond_fk_i ON oats_condition_compliance_rpts (condition_id); +ALTER TABLE oats_condition_compliance_rpts ADD PRIMARY KEY (condition_compliance_rpt_id); + +CREATE TABLE oats_complaint_codes ( + complaint_code varchar(10) NOT NULL, + description varchar(100) NOT NULL, + system_required_ind varchar(1) NOT NULL, + who_created varchar(32) NOT NULL, + when_created timestamp NOT NULL, + who_updated varchar(32), + when_updated timestamp, + revision_count bigint NOT NULL DEFAULT 0 +) ; +COMMENT ON TABLE oats_complaint_codes IS E'A COMPLAINT CODE is a category under which COMPLAINTS can be classified. For example: - Filling - Extraction - Buildings - Commercial Activity'; +COMMENT ON COLUMN oats_complaint_codes.system_required_ind IS E'Indicates whether or not the code is required by the system. If yes, the users would be prevented from updating or deleting the code value.'; +COMMENT ON COLUMN oats_complaint_codes.when_created IS E'WHEN CREATED is the date/time that the record was created.'; +COMMENT ON COLUMN oats_complaint_codes.description IS E'Description of the COMPLAINT CODE'; +COMMENT ON COLUMN oats_complaint_codes.when_updated IS E'WHEN UPDATED is the date/time that the record was last updated.'; +COMMENT ON COLUMN oats_complaint_codes.who_created IS E'WHO CREATED is the IDIR or Oracle userid of the person who created the record.'; +COMMENT ON COLUMN oats_complaint_codes.complaint_code IS E'User supplied value to uniquely identify an COMPLAINT CODE'; +COMMENT ON COLUMN oats_complaint_codes.revision_count IS E'REVISION COUNT is used by Hibernate to control optimistic locking'; +COMMENT ON COLUMN oats_complaint_codes.who_updated IS E'WHO UPDATED is the IDIR or Oracle userid of the person who last updated the record.'; +ALTER TABLE oats_complaint_codes ADD PRIMARY KEY (complaint_code); +ALTER TABLE oats_complaint_codes ADD CONSTRAINT avcon_1238100890_syste_020 CHECK (SYSTEM_REQUIRED_IND IN ('Y', 'N')); + +CREATE TABLE oats_payment_type_codes ( + payment_type_code varchar(10) NOT NULL, + description varchar(100) NOT NULL, + system_required_ind varchar(1) NOT NULL, + who_created varchar(32) NOT NULL, + when_created timestamp NOT NULL, + who_updated varchar(32), + when_updated timestamp, + revision_count bigint NOT NULL DEFAULT 0 +) ; +COMMENT ON TABLE oats_payment_type_codes IS E'A PAYMENT TYPE CODE identifies the type of payment in a financial instrument. For example: - CREDIT, CHEQUE, JOURNAL VOUCHER.'; +COMMENT ON COLUMN oats_payment_type_codes.who_updated IS E'WHO UPDATED is the IDIR or Oracle userid of the person who last updated the record.'; +COMMENT ON COLUMN oats_payment_type_codes.revision_count IS E'REVISION COUNT is used by Hibernate to control optimistic locking'; +COMMENT ON COLUMN oats_payment_type_codes.description IS E'Description of the PAYMENT TYPE CODE'; +COMMENT ON COLUMN oats_payment_type_codes.system_required_ind IS E'Indicates whether or not the code is required by the system. If yes, the users would be prevented from updating or deleting the code value.'; +COMMENT ON COLUMN oats_payment_type_codes.who_created IS E'WHO CREATED is the IDIR or Oracle userid of the person who created the record.'; +COMMENT ON COLUMN oats_payment_type_codes.when_updated IS E'WHEN UPDATED is the date/time that the record was last updated.'; +COMMENT ON COLUMN oats_payment_type_codes.payment_type_code IS E'User supplied value to uniquely identify a PAYMENT TYPE CODE'; +COMMENT ON COLUMN oats_payment_type_codes.when_created IS E'WHEN CREATED is the date/time that the record was created.'; +ALTER TABLE oats_payment_type_codes ADD PRIMARY KEY (payment_type_code); +ALTER TABLE oats_payment_type_codes ADD CONSTRAINT avcon_1238100900_syste_013 CHECK (SYSTEM_REQUIRED_IND IN ('Y', 'N')) NOT VALID; + +CREATE TABLE oats_addresses ( + address_id bigint NOT NULL, + address_line_1 varchar(80), + address_line_2 varchar(80), + address_line_3 varchar(80), + city varchar(40), + province_state varchar(40), + country varchar(40), + postal_code varchar(10), + who_created varchar(32) NOT NULL, + when_created timestamp NOT NULL, + who_updated varchar(32), + when_updated timestamp, + revision_count bigint NOT NULL DEFAULT 0 +) ; +COMMENT ON TABLE oats_addresses IS E'An ADDRESS is a postal address for a PERSON_ORGANIZATION. A PERSON_ORGANIZATION may have one or more addresses.'; +COMMENT ON COLUMN oats_addresses.who_updated IS E'WHO UPDATED is the IDIR or Oracle userid of the person who updated the record.'; +COMMENT ON COLUMN oats_addresses.address_line_2 IS E'The ADDRESS LINE 2 is the second line of three possible lines of a street address for a person or organization.'; +COMMENT ON COLUMN oats_addresses.who_created IS E'WHO CREATED is the IDIR or Oracle userid of the person who created the record.'; +COMMENT ON COLUMN oats_addresses.when_updated IS E'WHEN UPDATED is the date/time that the record was updated.'; +COMMENT ON COLUMN oats_addresses.address_line_1 IS E'The ADDRESS LINE 1 is the first line of three possible lines of a street address for a person or organization.'; +COMMENT ON COLUMN oats_addresses.city IS E'The CITY is the city / town / village in which the mailing address exists.'; +COMMENT ON COLUMN oats_addresses.address_id IS E'ADDRESS ID is the system generated unique identifier for ADDRESS'; +COMMENT ON COLUMN oats_addresses.postal_code IS E'The postal or zip code for a street address.'; +COMMENT ON COLUMN oats_addresses.country IS E'The country in which the mailing address exists.'; +COMMENT ON COLUMN oats_addresses.address_line_3 IS E'The ADDRESS LINE 3 is the third line of three possible lines of a street address for a person or organization.'; +COMMENT ON COLUMN oats_addresses.revision_count IS E'REVISION COUNT is used by Hibernate to control optimistic locking'; +COMMENT ON COLUMN oats_addresses.province_state IS E'The PROVINCE STATE is the province or state in which the mailing address exists.'; +COMMENT ON COLUMN oats_addresses.when_created IS E'WHEN CREATED is the date/time that the record was created.'; +ALTER TABLE oats_addresses ADD PRIMARY KEY (address_id); + +CREATE TABLE oats_local_government_reports ( + alr_application_id bigint NOT NULL, + local_gov_file_number varchar(50), + community_pln_bylaw_name varchar(200), + community_pln_designation varchar(50), + community_pln_compliance_ind varchar(1), + zoning_bylaw_name varchar(200), + zoning_designation varchar(50), + zoning_compliance_ind varchar(1), + minimum_lot_hectares double precision, + contact_department varchar(100), + authorization_required_ind varchar(1), + amendment_rationale varchar(4000), + person_organization_id bigint, + who_created varchar(32) NOT NULL, + when_created timestamp NOT NULL, + who_updated varchar(32), + when_updated timestamp, + revision_count bigint NOT NULL DEFAULT 0 +) ; +COMMENT ON COLUMN oats_local_government_reports.zoning_bylaw_name IS E'The name of the local government''s zoning bylaw which the SUBJECT PROPERTIES are affected by'; +COMMENT ON COLUMN oats_local_government_reports.zoning_designation IS E'The designation of the local government''s zoning, light industrial, heavy industrial as provided by the local government'; +COMMENT ON COLUMN oats_local_government_reports.zoning_compliance_ind IS E'Indicates whether or not this ALR APPLICATION is in compliance with the local government''s zoning.'; +COMMENT ON COLUMN oats_local_government_reports.minimum_lot_hectares IS E'The minimum size of a lot measured in hectares as allowed by the local government'; +COMMENT ON COLUMN oats_local_government_reports.community_pln_bylaw_name IS E'The name of the local government''s Official Community Plan bylaw which the SUBJECT PROPERTIES are affected by'; +COMMENT ON COLUMN oats_local_government_reports.community_pln_compliance_ind IS E'Indicates whether or not this ALR APPLICATION is in compliance with the local government''s Official Community Plan'; +COMMENT ON COLUMN oats_local_government_reports.authorization_required_ind IS E'AUTHORIZATION REQUIRED IND indicates whether or not authorization under section 25(2) or section 30 (4) of the ALC Act is required.'; +COMMENT ON COLUMN oats_local_government_reports.person_organization_id IS E'PERSON ORGANIZATION ID is the system generated unique identifier for PERSON ORGANIZATION.'; +COMMENT ON COLUMN oats_local_government_reports.who_updated IS E'WHO UPDATED is the IDIR or Oracle userid of the person who last updated the record.'; +COMMENT ON COLUMN oats_local_government_reports.when_updated IS E'WHEN UPDATED is the date/time that the record was last updated.'; +COMMENT ON COLUMN oats_local_government_reports.who_created IS E'WHO CREATED is the IDIR or Oracle userid of the person who created the record.'; +COMMENT ON COLUMN oats_local_government_reports.local_gov_file_number IS E'The local government''s file number used by the local government to track the ALR APPLICATION.'; +COMMENT ON COLUMN oats_local_government_reports.when_created IS E'WHEN CREATED is the date/time that the record was created.'; +COMMENT ON COLUMN oats_local_government_reports.community_pln_designation IS E'The designation of the local government''s Official Community Plan, industrial, residential, agricultural as provided by the local government.'; +COMMENT ON COLUMN oats_local_government_reports.amendment_rationale IS E'AMENDMENT RATIONALE is the rationale for forwarding the application to the ALC if ammendments to plans or bylaws are required.'; +COMMENT ON COLUMN oats_local_government_reports.revision_count IS E'REVISION COUNT is used by Hibernate to control optimistic locking'; +COMMENT ON COLUMN oats_local_government_reports.contact_department IS E'CONTACT DEPARTMENT is the department in which the local government contact works.'; +COMMENT ON COLUMN oats_local_government_reports.alr_application_id IS E'System generated sequence number to uniquely identify an ALR APPLICATION. This is also used as the ALR APPLICATION''S external reference number.'; +CREATE INDEX oats_lgr_pog_fk_i ON oats_local_government_reports (person_organization_id); +ALTER TABLE oats_local_government_reports ADD PRIMARY KEY (alr_application_id); +ALTER TABLE oats_local_government_reports ADD CONSTRAINT avcon_1362772157_autho_000 CHECK (AUTHORIZATION_REQUIRED_IND IN ('Y', 'N')); +ALTER TABLE oats_local_government_reports ADD CONSTRAINT avcon_1362772157_commu_000 CHECK (COMMUNITY_PLN_COMPLIANCE_IND IN ('Y', 'N', 'X')); +ALTER TABLE oats_local_government_reports ADD CONSTRAINT avcon_1362772157_zonin_000 CHECK (ZONING_COMPLIANCE_IND IN ('Y', 'N', 'X')); + +CREATE TABLE oats_alr_appl_state_codes ( + alr_appl_state_code varchar(10) NOT NULL, + description varchar(100), + replicate_ind varchar(1), + who_created varchar(32) NOT NULL, + when_created timestamp NOT NULL, + who_updated varchar(32), + when_updated timestamp, + revision_count bigint NOT NULL DEFAULT 0 +) ; +COMMENT ON COLUMN oats_alr_appl_state_codes.alr_appl_state_code IS E'System value to uniquely identify an ALR APPL STATE CODE'; +COMMENT ON COLUMN oats_alr_appl_state_codes.when_created IS E'WHEN CREATED is the date/time that the record was created.'; +COMMENT ON COLUMN oats_alr_appl_state_codes.replicate_ind IS E'Indicates if the code should be replicated to the data warehouse.'; +COMMENT ON COLUMN oats_alr_appl_state_codes.description IS E'Description of the ALR APPLICATION STATE CODE'; +COMMENT ON COLUMN oats_alr_appl_state_codes.who_created IS E'WHO CREATED is the IDIR or Oracle userid of the person who created the record.'; +COMMENT ON COLUMN oats_alr_appl_state_codes.when_updated IS E'WHEN UPDATED is the date/time that the record was last updated.'; +COMMENT ON COLUMN oats_alr_appl_state_codes.who_updated IS E'WHO UPDATED is the IDIR or Oracle userid of the person who last updated the record.'; +COMMENT ON COLUMN oats_alr_appl_state_codes.revision_count IS E'REVISION COUNT is used by Hibernate to control optimistic locking'; +CREATE INDEX aasc_sc_r_i ON oats_alr_appl_state_codes (alr_appl_state_code, replicate_ind); +ALTER TABLE oats_alr_appl_state_codes ADD PRIMARY KEY (alr_appl_state_code); + +CREATE TABLE oats_property_interests ( + property_interest_id bigint NOT NULL, + prin_type varchar(10) NOT NULL, + subject_property_id bigint NOT NULL, + person_organization_id bigint, + property_owner_type_code varchar(10), + active_ind varchar(1), + land_title_charge_code varchar(10), + charge_nbr varchar(11), + charge_desc varchar(4000), + property_interest_code varchar(10), + nonfarm_use_type_code varchar(10), + who_created varchar(32) NOT NULL, + when_created timestamp NOT NULL, + who_updated varchar(32), + when_updated timestamp, + revision_count bigint NOT NULL DEFAULT 0 +) ; +COMMENT ON TABLE oats_property_interests IS E'A PROPERTY OWNER is the assertion that a PERSON ORGANIZATION is in possession of a PROPERTY at the time an ALR APPLICATION was submitted to the Commission or when an ISSUE was logged. For the purposes of the ALC, the owner of Crown Land will be the ministry that has governance over the land. For example: - Integrated Land Management Bureau (ILMB) - Ministry of Forest and Range (MoFR) A LAND TITLE CHARGE is an interest in land (as identified by a LAND TITLE CHARGE CODE) that is registerable against the title to land of a SUBJECT PROPERTY that may impact one or more of the title holders (for example, a mortgage) or the usage of the land (for example, statutory right of way, mineral rights). Only land title charges that are germane to the ALR APPLICATION will be included.A PROPERTY INTEREST is the generalization of PROPERTY OWNERSHIP and LAND TITLE CHARGE applied against a SUBJECT PROPERTY that is germane to the ALR APPLICATION.'; +COMMENT ON COLUMN oats_property_interests.when_updated IS E'WHEN UPDATED is the date/time that the record was last updated.'; +COMMENT ON COLUMN oats_property_interests.who_created IS E'WHO CREATED is the IDIR or Oracle userid of the person who created the record.'; +COMMENT ON COLUMN oats_property_interests.charge_nbr IS E'The CHARGE NBR is the number assigned by the Land Titles Office to identify the LAND TITLE CHARGE. This is potentially sourced from the ALTOS system''s CHARG . CHARGE_NMBR table . colum.'; +COMMENT ON COLUMN oats_property_interests.person_organization_id IS E'PERSON ORGANIZATION ID is the system generated unique identifier for PERSON ORGANIZATION.'; +COMMENT ON COLUMN oats_property_interests.who_updated IS E'WHO UPDATED is the IDIR or Oracle userid of the person who last updated the record.'; +COMMENT ON COLUMN oats_property_interests.nonfarm_use_type_code IS E'Indicates the type of non-farm use employed by the interest.'; +COMMENT ON COLUMN oats_property_interests.subject_property_id IS E'System generated sequence number to uniquely identify a SUBJECT PROPERTY'; +COMMENT ON COLUMN oats_property_interests.charge_desc IS E'Further description of the charge on the land'; +COMMENT ON COLUMN oats_property_interests.property_interest_code IS E'Indicates the nature of the person/orgs interest in the property'; +COMMENT ON COLUMN oats_property_interests.active_ind IS E'Indicates whether or not the PROPERTY OWNERSHIP is active or not; no indicates retention of historical information.'; +COMMENT ON COLUMN oats_property_interests.land_title_charge_code IS E'User supplied value to uniquely identify a LAND TITLE CHARGE CODE. This is identical to the ALTOS VTRCDE.TRNSCTN_TYP_CD column.'; +COMMENT ON COLUMN oats_property_interests.revision_count IS E'REVISION COUNT is used by Hibernate to control optimistic locking'; +COMMENT ON COLUMN oats_property_interests.when_created IS E'WHEN CREATED is the date/time that the record was created.'; +COMMENT ON COLUMN oats_property_interests.property_interest_id IS E'System generated sequence number to uniquely identify a PROPERTY INTEREST'; +COMMENT ON COLUMN oats_property_interests.property_owner_type_code IS E'User supplied value to uniquely identify an PROPERTY OWNER TYPE CODE'; +ALTER TABLE oats_property_interests ADD PRIMARY KEY (property_interest_id); +ALTER TABLE oats_property_interests ADD CONSTRAINT oats_prin_chk CHECK ((PRIN_TYPE = 'CHG' AND + + PROPERTY_OWNER_TYPE_CODE IS NULL AND + + LAND_TITLE_CHARGE_CODE IS NOT NULL AND + + ACTIVE_IND IS NULL AND + + CHARGE_NBR IS NOT NULL AND + + CHARGE_DESC IS NOT NULL) + +OR (PRIN_TYPE = 'OWN' AND + + PERSON_ORGANIZATION_ID IS NOT NULL AND + + PROPERTY_OWNER_TYPE_CODE IS NOT NULL AND + + LAND_TITLE_CHARGE_CODE IS NULL AND + + ACTIVE_IND IS NOT NULL AND + + CHARGE_NBR IS NULL AND + + CHARGE_DESC IS NULL) + + OR (PRIN_TYPE = 'NOOWN' AND + + PERSON_ORGANIZATION_ID IS NULL AND + + PROPERTY_OWNER_TYPE_CODE IS NOT NULL AND + + ACTIVE_IND IS NOT NULL + + )); +ALTER TABLE oats_property_interests ADD CONSTRAINT oats_prin_ai_chk CHECK (ACTIVE_IND IN ('Y', 'N')); +ALTER TABLE oats_property_interests ADD CONSTRAINT oats_prin_pt_chk CHECK (PRIN_TYPE IN ('OWN', 'CHG', 'NOOWN')); + +CREATE TABLE oats_subdivision_designs ( + subdivision_design_id bigint NOT NULL, + alr_appl_component_id bigint NOT NULL, + received_date timestamp NOT NULL, + road_dedication_area double precision NOT NULL, + survey_plan_nbr varchar(12), + who_created varchar(32) NOT NULL, + when_created timestamp NOT NULL, + who_updated varchar(32), + when_updated timestamp, + revision_count bigint NOT NULL DEFAULT 0 +) ; +COMMENT ON TABLE oats_subdivision_designs IS E'A SUBDIVISION DESIGN is a document prepared by a surveyor to illustrate how a parcel of land will be subdivided into smaller parcels. This would typically be an unregisterd survey. The ALC is only interested in these designs for the purpose of accounting for what subdivisions where actually created as a result of a decision from the Commission.'; +COMMENT ON COLUMN oats_subdivision_designs.when_created IS E'WHEN CREATED is the date/time that the record was created.'; +COMMENT ON COLUMN oats_subdivision_designs.received_date IS E'Date the SUBDIVISION DESIGN was received by the ALC'; +COMMENT ON COLUMN oats_subdivision_designs.alr_appl_component_id IS E'System generated sequence number to uniquely identify an ALR APPL COMPONENT'; +COMMENT ON COLUMN oats_subdivision_designs.road_dedication_area IS E'The total area that is dedicated to the creation of roads'; +COMMENT ON COLUMN oats_subdivision_designs.subdivision_design_id IS E'System generated sequence number to uniquely identify a SUBDIVISION DESIGN'; +COMMENT ON COLUMN oats_subdivision_designs.survey_plan_nbr IS E'Reference domain for Survey Plan Nbr'; +COMMENT ON COLUMN oats_subdivision_designs.when_updated IS E'WHEN UPDATED is the date/time that the record was last updated.'; +COMMENT ON COLUMN oats_subdivision_designs.who_created IS E'WHO CREATED is the IDIR or Oracle userid of the person who created the record.'; +COMMENT ON COLUMN oats_subdivision_designs.revision_count IS E'REVISION COUNT is used by Hibernate to control optimistic locking'; +COMMENT ON COLUMN oats_subdivision_designs.who_updated IS E'WHO UPDATED is the IDIR or Oracle userid of the person who last updated the record.'; +CREATE INDEX oats_subd_apcp_fk_i ON oats_subdivision_designs (alr_appl_component_id); +ALTER TABLE oats_subdivision_designs ADD PRIMARY KEY (subdivision_design_id); + +CREATE TABLE oats_alr_appl_decisions ( + alr_appl_decision_id bigint NOT NULL, + alr_application_id bigint, + reconsideration_request_id bigint, + decision_date timestamp, + applicant_notification_date timestamp, + resolution_number bigint, + decision_desc varchar(4000), + outright_refusal_ind varchar(1), + security_amt double precision, + no_statistics_required_ind varchar(1) DEFAULT 'N', + rescinded_date timestamp, + rescinded_comments varchar(500), + ready_for_decision_date timestamp, + who_created varchar(32) NOT NULL, + when_created timestamp NOT NULL, + who_updated varchar(32), + when_updated timestamp, + revision_count bigint NOT NULL DEFAULT 0 +) ; +COMMENT ON TABLE oats_alr_appl_decisions IS E'An ALR APPL DECISION is a resolution passed by the Commissioner''s of the Agricultural Land Commission pertaining to the inclusion or exclusion of land or permitted land uses within the Agricultural Land Reserve. The Agricultural Land Commission staff makes recommendations to the Commissioners. Only Commissioners are able to pass resolutions.'; +COMMENT ON COLUMN oats_alr_appl_decisions.no_statistics_required_ind IS E'NO STATISTICS REQUIRED IND indicates whether the decision should be included in reports.'; +COMMENT ON COLUMN oats_alr_appl_decisions.outright_refusal_ind IS E'Indicates whether or not the decision is to outright refuse the ALR APPLICATION or not. If it is an outright refusal, then no decision ALR APPL COMPONENT can be created.'; +COMMENT ON COLUMN oats_alr_appl_decisions.ready_for_decision_date IS E'The date when the application became ready for a decision to be made.'; +COMMENT ON COLUMN oats_alr_appl_decisions.security_amt IS E'The amount of money (in the form of a bond, letter of credit or cash) that must be provided as a guarantee the CONDITIONS of a decision will be met. This will be applied as a blanket amount for all CONDITIONS that have SECURITY REQUIRED IND set to Y.'; +COMMENT ON COLUMN oats_alr_appl_decisions.when_updated IS E'WHEN UPDATED is the date/time that the record was last updated.'; +COMMENT ON COLUMN oats_alr_appl_decisions.reconsideration_request_id IS E'System generated sequence number to uniquely identify a RECONSIDERATION REQUEST'; +COMMENT ON COLUMN oats_alr_appl_decisions.who_created IS E'WHO CREATED is the IDIR or Oracle userid of the person who created the record.'; +COMMENT ON COLUMN oats_alr_appl_decisions.alr_appl_decision_id IS E'System generated sequence number to uniquely identify a ALR APPL DECISION'; +COMMENT ON COLUMN oats_alr_appl_decisions.who_updated IS E'WHO UPDATED is the IDIR or Oracle userid of the person who last updated the record.'; +COMMENT ON COLUMN oats_alr_appl_decisions.rescinded_date IS E'RESCINDED DATE is the date the decision was rescinded'; +COMMENT ON COLUMN oats_alr_appl_decisions.decision_desc IS E'Narrative that describes the ALR APPL DECISION'; +COMMENT ON COLUMN oats_alr_appl_decisions.when_created IS E'WHEN CREATED is the date/time that the record was created.'; +COMMENT ON COLUMN oats_alr_appl_decisions.decision_date IS E'Date the decision was rendered by the Commission.'; +COMMENT ON COLUMN oats_alr_appl_decisions.alr_application_id IS E'System generated sequence number to uniquely identify an ALR APPLICATION. This is also used as the ALR APPLICATION''S external reference number.'; +COMMENT ON COLUMN oats_alr_appl_decisions.applicant_notification_date IS E'Date the details of the decision was sent to the applicants'; +COMMENT ON COLUMN oats_alr_appl_decisions.resolution_number IS E'A system generated sequence number that is suffixed with the year of the decision date and is the public identifier for the decision resolution. For example 1234-2007.'; +COMMENT ON COLUMN oats_alr_appl_decisions.rescinded_comments IS E'RESCINDED COMMENTS are comments about why the decision was rescinded'; +COMMENT ON COLUMN oats_alr_appl_decisions.revision_count IS E'REVISION COUNT is used by Hibernate to control optimistic locking'; +ALTER TABLE oats_alr_appl_decisions ADD UNIQUE (alr_application_id); +ALTER TABLE oats_alr_appl_decisions ADD PRIMARY KEY (alr_appl_decision_id); +ALTER TABLE oats_alr_appl_decisions ADD UNIQUE (reconsideration_request_id); +ALTER TABLE oats_alr_appl_decisions ADD CONSTRAINT oats_aadc_nsri_chk CHECK (no_statistics_required_ind in ('Y', 'N')); +ALTER TABLE oats_alr_appl_decisions ADD CONSTRAINT oats_aadc_chk CHECK ((alr_application_id is not null and reconsideration_request_id is null) +or (alr_application_id is null and reconsideration_request_id is not null)); +ALTER TABLE oats_alr_appl_decisions ADD CONSTRAINT oats_aadc_ori_chk CHECK (outright_refusal_ind in ('Y', 'N')); + +CREATE TABLE oats_inquiry_codes ( + inquiry_code varchar(10) NOT NULL, + description varchar(100) NOT NULL, + system_required_ind varchar(1) NOT NULL, + who_created varchar(32) NOT NULL, + when_created timestamp NOT NULL, + who_updated varchar(32), + when_updated timestamp, + revision_count bigint NOT NULL DEFAULT 0 +) ; +COMMENT ON TABLE oats_inquiry_codes IS E'An INQUIRY CODE is a category under which INQUIRIES can be classified. For example: - Inquiry for investigation - General correspondence - Area of Interest - Community Plan'; +COMMENT ON COLUMN oats_inquiry_codes.when_updated IS E'WHEN UPDATED is the date/time that the record was last updated.'; +COMMENT ON COLUMN oats_inquiry_codes.who_created IS E'WHO CREATED is the IDIR or Oracle userid of the person who created the record.'; +COMMENT ON COLUMN oats_inquiry_codes.system_required_ind IS E'Indicates whether or not the code is required by the system. If yes, the users would be prevented from updating or deleting the code value.'; +COMMENT ON COLUMN oats_inquiry_codes.when_created IS E'WHEN CREATED is the date/time that the record was created.'; +COMMENT ON COLUMN oats_inquiry_codes.description IS E'Description of the ISSUE CODE'; +COMMENT ON COLUMN oats_inquiry_codes.inquiry_code IS E'User supplied value to uniquely identify an ISSUE CODE'; +COMMENT ON COLUMN oats_inquiry_codes.revision_count IS E'REVISION COUNT is used by Hibernate to control optimistic locking'; +COMMENT ON COLUMN oats_inquiry_codes.who_updated IS E'WHO UPDATED is the IDIR or Oracle userid of the person who last updated the record.'; +ALTER TABLE oats_inquiry_codes ADD PRIMARY KEY (inquiry_code); +ALTER TABLE oats_inquiry_codes ADD CONSTRAINT avcon_1238100890_syste_008 CHECK (SYSTEM_REQUIRED_IND IN ('Y', 'N')); + +CREATE TABLE oats_organization_types ( + organization_type_cd varchar(10) NOT NULL, + description varchar(100) NOT NULL, + effective_date timestamp, + expiry_date timestamp, + who_created varchar(32) NOT NULL, + when_created timestamp NOT NULL, + who_updated varchar(32), + when_updated timestamp, + revision_count bigint NOT NULL DEFAULT 0 +) ; +COMMENT ON TABLE oats_organization_types IS E'The ORGANIZATION TYPE is the type of the non BC government organization. Examples include: Corporation, First Nations Band. This system requires an ORGANIZATION TYPE of ''Region'''; +COMMENT ON COLUMN oats_organization_types.effective_date IS E'The EFFECTIVE DATE is the date the this became effective.'; +COMMENT ON COLUMN oats_organization_types.when_created IS E'WHEN CREATED is the date/time that the record was created.'; +COMMENT ON COLUMN oats_organization_types.organization_type_cd IS E'ORGANIZATION TYPE CD is the unique identifier for ORGANIZATION TYPE CD. Example: CORP - Corporation.'; +COMMENT ON COLUMN oats_organization_types.expiry_date IS E'The EXPIRY DATE is the date this became obsoleted and is no longer active or valid. Used for historical record keeping.'; +COMMENT ON COLUMN oats_organization_types.description IS E'The DESCRIPTION is the full description of an organization type code.'; +COMMENT ON COLUMN oats_organization_types.when_updated IS E'WHEN UPDATED is the date/time that the record was updated.'; +COMMENT ON COLUMN oats_organization_types.who_created IS E'WHO CREATED is the IDIR or Oracle userid of the person who created the record.'; +COMMENT ON COLUMN oats_organization_types.revision_count IS E'REVISION COUNT is used by Hibernate to control optimistic locking'; +COMMENT ON COLUMN oats_organization_types.who_updated IS E'WHO UPDATED is the IDIR or Oracle userid of the person who updated the record.'; +ALTER TABLE oats_organization_types ADD PRIMARY KEY (organization_type_cd); + +CREATE TABLE oats_stop_work_order_rcpnts ( + stop_work_order_rcpnt_id bigint NOT NULL, + person_organization_id bigint NOT NULL, + issue_id bigint NOT NULL, + who_created varchar(32) NOT NULL, + when_created timestamp NOT NULL, + who_updated varchar(32), + when_updated timestamp, + revision_count bigint NOT NULL DEFAULT 0 +) ; +COMMENT ON TABLE oats_stop_work_order_rcpnts IS E'A STOP WORK ORDER RCPNT (Recipient) is the inclusion of a PERSON ORGANIZATION identifying them as party that needs to comply with a Stop Work Order.'; +COMMENT ON COLUMN oats_stop_work_order_rcpnts.issue_id IS E'System generated sequence number to uniquely identify an ISSUE'; +COMMENT ON COLUMN oats_stop_work_order_rcpnts.when_created IS E'WHEN CREATED is the date/time that the record was created.'; +COMMENT ON COLUMN oats_stop_work_order_rcpnts.who_created IS E'WHO CREATED is the IDIR or Oracle userid of the person who created the record.'; +COMMENT ON COLUMN oats_stop_work_order_rcpnts.when_updated IS E'WHEN UPDATED is the date/time that the record was last updated.'; +COMMENT ON COLUMN oats_stop_work_order_rcpnts.stop_work_order_rcpnt_id IS E'System generated sequence number to uniquely identify a STOP WORK ORDER RCPNT'; +COMMENT ON COLUMN oats_stop_work_order_rcpnts.person_organization_id IS E'PERSON ORGANIZATION ID is the system generated unique identifier for PERSON ORGANIZATION.'; +COMMENT ON COLUMN oats_stop_work_order_rcpnts.who_updated IS E'WHO UPDATED is the IDIR or Oracle userid of the person who last updated the record.'; +COMMENT ON COLUMN oats_stop_work_order_rcpnts.revision_count IS E'REVISION COUNT is used by Hibernate to control optimistic locking'; +CREATE INDEX oats_swor_pog_fk_i ON oats_stop_work_order_rcpnts (person_organization_id); +CREATE UNIQUE INDEX oats_swor_uk ON oats_stop_work_order_rcpnts (issue_id, person_organization_id); +CREATE INDEX oats_swor_issu_fk_i ON oats_stop_work_order_rcpnts (issue_id); +ALTER TABLE oats_stop_work_order_rcpnts ADD UNIQUE (issue_id,person_organization_id); +ALTER TABLE oats_stop_work_order_rcpnts ADD PRIMARY KEY (stop_work_order_rcpnt_id); + +CREATE TABLE oats_financial_instrument_cds ( + financial_instrument_cd varchar(10) NOT NULL, + description varchar(100) NOT NULL, + externally_managed_ind varchar(1) NOT NULL, + system_required_ind varchar(1) NOT NULL, + who_created varchar(32) NOT NULL, + when_created timestamp NOT NULL, + who_updated varchar(32), + when_updated timestamp, + revision_count bigint NOT NULL DEFAULT 0 +) ; +COMMENT ON TABLE oats_financial_instrument_cds IS E'A FINANCIAL INSTRUMENT CD is a type of funding medium the Commission can receive to insure the completion of a CONDITION. For example: - Bond - Letter of Credit - Cash'; +COMMENT ON COLUMN oats_financial_instrument_cds.who_updated IS E'WHO UPDATED is the IDIR or Oracle userid of the person who last updated the record.'; +COMMENT ON COLUMN oats_financial_instrument_cds.revision_count IS E'REVISION COUNT is used by Hibernate to control optimistic locking'; +COMMENT ON COLUMN oats_financial_instrument_cds.who_created IS E'WHO CREATED is the IDIR or Oracle userid of the person who created the record.'; +COMMENT ON COLUMN oats_financial_instrument_cds.when_updated IS E'WHEN UPDATED is the date/time that the record was last updated.'; +COMMENT ON COLUMN oats_financial_instrument_cds.description IS E'Description of the FINANCIAL INSTRUMENT CD'; +COMMENT ON COLUMN oats_financial_instrument_cds.system_required_ind IS E'Indicates whether or not the code is required by the system. If yes, the users would be prevented from updating or deleting the code value.'; +COMMENT ON COLUMN oats_financial_instrument_cds.financial_instrument_cd IS E'User supplied value to uniquely identify a FINANCIAL INSTRUMENT CD'; +COMMENT ON COLUMN oats_financial_instrument_cds.when_created IS E'WHEN CREATED is the date/time that the record was created.'; +COMMENT ON COLUMN oats_financial_instrument_cds.externally_managed_ind IS E'Indicates whether or not the financial instrument is controlled by an external ministry (currently the Ministry of Finance). For example: Cash and certified cheques.'; +ALTER TABLE oats_financial_instrument_cds ADD PRIMARY KEY (financial_instrument_cd); +ALTER TABLE oats_financial_instrument_cds ADD CONSTRAINT avcon_1238100890_exter_000 CHECK (EXTERNALLY_MANAGED_IND IN ('Y', 'N')); +ALTER TABLE oats_financial_instrument_cds ADD CONSTRAINT avcon_1238100890_syste_006 CHECK (SYSTEM_REQUIRED_IND IN ('Y', 'N')); + +CREATE TABLE oats_alr_change_codes ( + alr_change_code varchar(10) NOT NULL, + description varchar(100) NOT NULL, + system_required_ind varchar(1) NOT NULL, + who_created varchar(32) NOT NULL, + when_created timestamp NOT NULL, + who_updated varchar(32), + when_updated timestamp, + revision_count bigint NOT NULL DEFAULT 0 +) ; +COMMENT ON TABLE oats_alr_change_codes IS E'An ALR CHANGE CODE is a type of change an applicant can request the Commission to consider. For example: - Inclusion - Exclusion - Subdivision - Non Farm Use - Soil Change'; +COMMENT ON COLUMN oats_alr_change_codes.revision_count IS E'REVISION COUNT is used by Hibernate to control optimistic locking'; +COMMENT ON COLUMN oats_alr_change_codes.alr_change_code IS E'System developer supplied value to uniquely identify an ALR CHANGE CODE'; +COMMENT ON COLUMN oats_alr_change_codes.who_updated IS E'WHO UPDATED is the IDIR or Oracle userid of the person who last updated the record.'; +COMMENT ON COLUMN oats_alr_change_codes.when_updated IS E'WHEN UPDATED is the date/time that the record was last updated.'; +COMMENT ON COLUMN oats_alr_change_codes.who_created IS E'WHO CREATED is the IDIR or Oracle userid of the person who created the record.'; +COMMENT ON COLUMN oats_alr_change_codes.description IS E'Description of the ALR CHANGE CODE'; +COMMENT ON COLUMN oats_alr_change_codes.system_required_ind IS E'Indicates whether or not the code is required by the system. If yes, the users would be prevented from updating or deleting the code value.'; +COMMENT ON COLUMN oats_alr_change_codes.when_created IS E'WHEN CREATED is the date/time that the record was created.'; +ALTER TABLE oats_alr_change_codes ADD PRIMARY KEY (alr_change_code); +ALTER TABLE oats_alr_change_codes ADD CONSTRAINT oats_alcc_sri_chk CHECK (SYSTEM_REQUIRED_IND IN ('Y', 'N')); + +CREATE TABLE oats_financial_instruments ( + financial_instrument_id bigint NOT NULL, + alr_appl_decision_id bigint NOT NULL, + financial_instrument_cd varchar(10) NOT NULL, + financial_institute_code varchar(10), + person_organization_id bigint, + bank_file_nbr varchar(50), + received_date timestamp, + amount double precision NOT NULL, + expiry_date timestamp, + auto_renew_ind varchar(1), + renewal_notification_date timestamp, + release_date timestamp, + redeemed_date timestamp, + payment_type_code varchar(10), + comments varchar(4000), + who_created varchar(32) NOT NULL, + when_created timestamp NOT NULL, + who_updated varchar(32), + when_updated timestamp, + revision_count bigint NOT NULL DEFAULT 0 +) ; +COMMENT ON TABLE oats_financial_instruments IS E'A FINANCIAL INSTRUMENT is the receipt of a letter of credit, bond, or cash (as identified by a FINANCIAL INSTRUMENT CODE) that will meet the request of an ALR APPL DECISION . SECURITY AMT. The total SECURITY AMT may be met by multiple FINANCIAL INSTRUMENTS provided by different PERSON ORGANIZATIONS. Once all the CONDITIONS that are bound by a FINANCIAL INSTRUMENT (CONDITION . SECURITY REQUIRED IND = ''Y'') have been met, the ALC will release the instrument. If a CONDITION bound by a FINANCIAL INSTRUMENT has not been met, the ALC may redeem the FINANCIAL INSTRUMENT, and use the money to fund the completion of the CONDITION.'; +COMMENT ON COLUMN oats_financial_instruments.who_created IS E'WHO CREATED is the IDIR or Oracle userid of the person who created the record.'; +COMMENT ON COLUMN oats_financial_instruments.when_updated IS E'WHEN UPDATED is the date/time that the record was last updated.'; +COMMENT ON COLUMN oats_financial_instruments.financial_institute_code IS E'User supplied value to uniquely identify a FINANCIAL INSTITUTE CODE'; +COMMENT ON COLUMN oats_financial_instruments.alr_appl_decision_id IS E'System generated sequence number to uniquely identify a ALR APPL DECISION'; +COMMENT ON COLUMN oats_financial_instruments.who_updated IS E'WHO UPDATED is the IDIR or Oracle userid of the person who last updated the record.'; +COMMENT ON COLUMN oats_financial_instruments.person_organization_id IS E'PERSON ORGANIZATION ID is the system generated unique identifier for PERSON ORGANIZATION.'; +COMMENT ON COLUMN oats_financial_instruments.received_date IS E'Date the ALC received the FINANCIAL INSTRUMENT'; +COMMENT ON COLUMN oats_financial_instruments.financial_instrument_cd IS E'User supplied value to uniquely identify a FINANCIAL INSTRUMENT CD'; +COMMENT ON COLUMN oats_financial_instruments.payment_type_code IS E'User supplied value to uniquely identify a PAYMENT TYPE CODE'; +COMMENT ON COLUMN oats_financial_instruments.release_date IS E'Date the FINANCIAL INSTRUMENT was released by the ALC. This is mutually exclusive with REDEEMED DATE.'; +COMMENT ON COLUMN oats_financial_instruments.auto_renew_ind IS E'Indicates whether or not the financial institute has set the FINANCIAL INSTRUMENT to automatically renew'; +COMMENT ON COLUMN oats_financial_instruments.revision_count IS E'REVISION COUNT is used by Hibernate to control optimistic locking'; +COMMENT ON COLUMN oats_financial_instruments.when_created IS E'WHEN CREATED is the date/time that the record was created.'; +COMMENT ON COLUMN oats_financial_instruments.bank_file_nbr IS E'The reference number created by the financial institute used to track the FINANCIAL INSTRUMENT'; +COMMENT ON COLUMN oats_financial_instruments.redeemed_date IS E'Date the FINANCIAL INSTRUMENT was redeemed by the ALC. This is mutually exclusive with RELEASE DATE.'; +COMMENT ON COLUMN oats_financial_instruments.expiry_date IS E'Date the financial institute sets the FINANCIAL INSTRUMENT to expire'; +COMMENT ON COLUMN oats_financial_instruments.financial_instrument_id IS E'System generated sequence number to uniquely identify a FINANCIAL INSTRUMENT'; +COMMENT ON COLUMN oats_financial_instruments.renewal_notification_date IS E'If a FINANCIAL INSTRUMENT is not set to automatically renew, this is date the ALC sent a notification to the financial institute stating the FINANCIAL INSTRUMENT needs to be renewed.'; +COMMENT ON COLUMN oats_financial_instruments.amount IS E'The amount of the FINANCIAL INSTRUMENT'; +COMMENT ON COLUMN oats_financial_instruments.comments IS E'General comments regarding the FINANCIAL INSTRUMENT as authored by ALC staff'; +CREATE INDEX oats_fiin_ficd_fk_i ON oats_financial_instruments (financial_instrument_cd); +CREATE INDEX oats_fiin_pog_fk_i ON oats_financial_instruments (person_organization_id); +CREATE INDEX oats_fiin_aadc_fk_i ON oats_financial_instruments (alr_appl_decision_id); +CREATE INDEX oats_fiin_finc_fk_i ON oats_financial_instruments (financial_institute_code); +CREATE INDEX oats_fiin_payc_fk_i ON oats_financial_instruments (payment_type_code); +ALTER TABLE oats_financial_instruments ADD PRIMARY KEY (financial_instrument_id); +ALTER TABLE oats_financial_instruments ADD CONSTRAINT avcon_1238100890_auto__000 CHECK (AUTO_RENEW_IND IN ('Y', 'N', NULL)) NOT VALID; + +CREATE TABLE oats_alr_application_meetings ( + alr_application_meeting_id bigint NOT NULL, + alr_application_id bigint NOT NULL, + alr_appl_meeting_code varchar(10) NOT NULL, + meeting_date timestamp NOT NULL, + location_desc varchar(4000) NOT NULL, + participant_desc varchar(4000) NOT NULL, + description varchar(4000) NOT NULL, + who_created varchar(32) NOT NULL, + when_created timestamp NOT NULL, + who_updated varchar(32), + when_updated timestamp, + revision_count bigint NOT NULL DEFAULT 0 +) ; +COMMENT ON TABLE oats_alr_application_meetings IS E'An ALR APPLICATION MEETING is an assembly of ALR APPLICATION stakeholders to address the Application.'; +COMMENT ON COLUMN oats_alr_application_meetings.location_desc IS E'Description of where the meeting was held'; +COMMENT ON COLUMN oats_alr_application_meetings.alr_application_meeting_id IS E'System generated sequence number to uniquely identify an ALR APPLICATION MEETING'; +COMMENT ON COLUMN oats_alr_application_meetings.who_updated IS E'WHO UPDATED is the IDIR or Oracle userid of the person who last updated the record.'; +COMMENT ON COLUMN oats_alr_application_meetings.when_updated IS E'WHEN UPDATED is the date/time that the record was last updated.'; +COMMENT ON COLUMN oats_alr_application_meetings.who_created IS E'WHO CREATED is the IDIR or Oracle userid of the person who created the record.'; +COMMENT ON COLUMN oats_alr_application_meetings.description IS E'Description of the APPLICATION MEETING'; +COMMENT ON COLUMN oats_alr_application_meetings.meeting_date IS E'Date the meeting was held.'; +COMMENT ON COLUMN oats_alr_application_meetings.participant_desc IS E'Description of who participated in the meeting'; +COMMENT ON COLUMN oats_alr_application_meetings.when_created IS E'WHEN CREATED is the date/time that the record was created.'; +COMMENT ON COLUMN oats_alr_application_meetings.revision_count IS E'REVISION COUNT is used by Hibernate to control optimistic locking'; +COMMENT ON COLUMN oats_alr_application_meetings.alr_appl_meeting_code IS E'User supplied value to uniquely identify an ALR APPL MEETING CODE'; +COMMENT ON COLUMN oats_alr_application_meetings.alr_application_id IS E'System generated sequence number to uniquely identify an ALR APPLICATION. This is also used as the ALR APPLICATION''S external reference number.'; +CREATE INDEX oats_apmt_apmc_fk_i ON oats_alr_application_meetings (alr_appl_meeting_code); +CREATE INDEX oats_apmt_appl_fk_i ON oats_alr_application_meetings (alr_application_id); +ALTER TABLE oats_alr_application_meetings ADD PRIMARY KEY (alr_application_meeting_id); + +CREATE TABLE oats_soil_change_elements ( + soil_change_element_id bigint NOT NULL, + alr_appl_component_id bigint NOT NULL, + soil_change_code varchar(10) NOT NULL, + volume double precision NOT NULL, + depth double precision NOT NULL, + material_desc varchar(4000), + material_origin_desc varchar(4000), + alternative_measures_desc varchar(4000), + project_duration smallint, + project_area double precision, + who_created varchar(32) NOT NULL, + when_created timestamp NOT NULL, + who_updated varchar(32), + when_updated timestamp, + revision_count bigint NOT NULL DEFAULT 0 +) ; +COMMENT ON TABLE oats_soil_change_elements IS E'A SOIL CHANGE ELEMENT is the details of a specific soil change (remove soil, add fill) proposal or decision.'; +COMMENT ON COLUMN oats_soil_change_elements.alternative_measures_desc IS E'Description of any alternative measure that have been considored.'; +COMMENT ON COLUMN oats_soil_change_elements.depth IS E'The depth in meters to which fill will be placed or soil removed'; +COMMENT ON COLUMN oats_soil_change_elements.alr_appl_component_id IS E'System generated sequence number to uniquely identify an ALR APPL COMPONENT'; +COMMENT ON COLUMN oats_soil_change_elements.material_desc IS E'Description of the soil being removed, or the fill being placed'; +COMMENT ON COLUMN oats_soil_change_elements.who_updated IS E'WHO UPDATED is the IDIR or Oracle userid of the person who last updated the record.'; +COMMENT ON COLUMN oats_soil_change_elements.soil_change_code IS E'User supplied value to uniquely identify a SOIL CHANGE CODE'; +COMMENT ON COLUMN oats_soil_change_elements.who_created IS E'WHO CREATED is the IDIR or Oracle userid of the person who created the record.'; +COMMENT ON COLUMN oats_soil_change_elements.when_updated IS E'WHEN UPDATED is the date/time that the record was last updated.'; +COMMENT ON COLUMN oats_soil_change_elements.volume IS E'The volume in cubic meters of soil removed, or fill added'; +COMMENT ON COLUMN oats_soil_change_elements.when_created IS E'WHEN CREATED is the date/time that the record was created.'; +COMMENT ON COLUMN oats_soil_change_elements.material_origin_desc IS E'Description of the origin ofthe fill being placed'; +COMMENT ON COLUMN oats_soil_change_elements.soil_change_element_id IS E'System generated sequence number to uniquely identify a SOIL CHANGE PARTICULAR'; +COMMENT ON COLUMN oats_soil_change_elements.revision_count IS E'REVISION COUNT is used by Hibernate to control optimistic locking'; +COMMENT ON COLUMN oats_soil_change_elements.project_area IS E'The area effected by the project.'; +COMMENT ON COLUMN oats_soil_change_elements.project_duration IS E'The duration of the project.'; +ALTER TABLE oats_soil_change_elements ADD PRIMARY KEY (soil_change_element_id); + +CREATE TABLE oats_nonfarm_use_subtype_codes ( + nonfarm_use_type_code varchar(10) NOT NULL, + nonfarm_use_subtype_code varchar(10) NOT NULL, + description varchar(100) NOT NULL, + system_required_ind varchar(1) NOT NULL, + who_created varchar(32) NOT NULL, + when_created timestamp NOT NULL, + who_updated varchar(32), + when_updated timestamp, + revision_count bigint NOT NULL DEFAULT 0 +) ; +COMMENT ON TABLE oats_nonfarm_use_subtype_codes IS E'A NONFARM USE SUBTYPE CODE is a more specific non-agricultural use of land under the classification of a NONFARM USE TYPE CODE. For example: Under the NONFARM USE TYPE CODE: Industrial - Sawmill - Workshop Under the NONFARM USE TYPE CODE: Civic - Religious edifice - Playground'; +COMMENT ON COLUMN oats_nonfarm_use_subtype_codes.when_updated IS E'WHEN UPDATED is the date/time that the record was last updated.'; +COMMENT ON COLUMN oats_nonfarm_use_subtype_codes.who_created IS E'WHO CREATED is the IDIR or Oracle userid of the person who created the record.'; +COMMENT ON COLUMN oats_nonfarm_use_subtype_codes.system_required_ind IS E'Indicates whether or not the code is required by the system. If yes, the users would be prevented from updating or deleting the code value.'; +COMMENT ON COLUMN oats_nonfarm_use_subtype_codes.description IS E'Description of the NONFARM USE SUBTYPE CODE'; +COMMENT ON COLUMN oats_nonfarm_use_subtype_codes.revision_count IS E'REVISION COUNT is used by Hibernate to control optimistic locking'; +COMMENT ON COLUMN oats_nonfarm_use_subtype_codes.who_updated IS E'WHO UPDATED is the IDIR or Oracle userid of the person who last updated the record.'; +COMMENT ON COLUMN oats_nonfarm_use_subtype_codes.nonfarm_use_subtype_code IS E'User supplied value to uniquely identify a NONFARM USE SUBTYPE CODE'; +COMMENT ON COLUMN oats_nonfarm_use_subtype_codes.nonfarm_use_type_code IS E'User supplied value to uniquely identify a NONFARM USE TYPE CODE'; +COMMENT ON COLUMN oats_nonfarm_use_subtype_codes.when_created IS E'WHEN CREATED is the date/time that the record was created.'; +CREATE INDEX oats_nfst_nftc_fk_i ON oats_nonfarm_use_subtype_codes (nonfarm_use_type_code); +ALTER TABLE oats_nonfarm_use_subtype_codes ADD PRIMARY KEY (nonfarm_use_type_code,nonfarm_use_subtype_code); +ALTER TABLE oats_nonfarm_use_subtype_codes ADD CONSTRAINT avcon_1238100890_syste_015 CHECK (SYSTEM_REQUIRED_IND IN ('Y', 'N')); + +CREATE TABLE oats_capability_source_codes ( + capability_source_code varchar(10) NOT NULL, + description varchar(100) NOT NULL, + system_required_ind varchar(1) NOT NULL, + who_created varchar(32) NOT NULL, + when_created timestamp NOT NULL, + who_updated varchar(32), + when_updated timestamp, + revision_count bigint NOT NULL DEFAULT 0 +) ; +COMMENT ON TABLE oats_capability_source_codes IS E'A CAPABILITY SOURCE CODE is a provider of what the agricultural capability of land is. For example: - British Columbia Land Inventory - Canadian Land Inventory - Consultant'; +COMMENT ON COLUMN oats_capability_source_codes.system_required_ind IS E'Indicates whether or not the code is required by the system. If yes, the users would be prevented from updating or deleting the code value.'; +COMMENT ON COLUMN oats_capability_source_codes.description IS E'Description of the CAPABILITY SOURCE CODE'; +COMMENT ON COLUMN oats_capability_source_codes.when_updated IS E'WHEN UPDATED is the date/time that the record was last updated.'; +COMMENT ON COLUMN oats_capability_source_codes.who_created IS E'WHO CREATED is the IDIR or Oracle userid of the person who created the record.'; +COMMENT ON COLUMN oats_capability_source_codes.revision_count IS E'REVISION COUNT is used by Hibernate to control optimistic locking'; +COMMENT ON COLUMN oats_capability_source_codes.who_updated IS E'WHO UPDATED is the IDIR or Oracle userid of the person who last updated the record.'; +COMMENT ON COLUMN oats_capability_source_codes.when_created IS E'WHEN CREATED is the date/time that the record was created.'; +COMMENT ON COLUMN oats_capability_source_codes.capability_source_code IS E'User supplied value to uniquely identify a CAPABILITY SOURCE CODE'; +ALTER TABLE oats_capability_source_codes ADD PRIMARY KEY (capability_source_code); +ALTER TABLE oats_capability_source_codes ADD CONSTRAINT avcon_1238100890_syste_019 CHECK (SYSTEM_REQUIRED_IND IN ('Y', 'N')); + +CREATE TABLE oats_address_types ( + address_type_cd varchar(10) NOT NULL, + description varchar(100) NOT NULL, + effective_date timestamp, + expiry_date timestamp, + who_created varchar(32) NOT NULL, + when_created timestamp NOT NULL, + who_updated varchar(32), + when_updated timestamp, + revision_count bigint NOT NULL DEFAULT 0 +) ; +COMMENT ON TABLE oats_address_types IS E'An ADDRESS TYPE gives context to an address. Some examples include: "Home", "Shipping", "Head Office".'; +COMMENT ON COLUMN oats_address_types.expiry_date IS E'The EXPIRY DATE is a date that became obsolete and is no longer active or valid. Used for historical record keeping.'; +COMMENT ON COLUMN oats_address_types.address_type_cd IS E'ADDRESS TYPE CD is the unique identifier for ADDRESS TYPE'; +COMMENT ON COLUMN oats_address_types.who_updated IS E'WHO UPDATED is the IDIR or Oracle userid of the person who updated the record.'; +COMMENT ON COLUMN oats_address_types.revision_count IS E'REVISION COUNT is used by Hibernate to control optimistic locking'; +COMMENT ON COLUMN oats_address_types.description IS E'The DESCRIPTION is the description of the address type.'; +COMMENT ON COLUMN oats_address_types.effective_date IS E'The EFFECTIVE DATE is the date that this became effective.'; +COMMENT ON COLUMN oats_address_types.when_created IS E'WHEN CREATED is the date/time that the record was created.'; +COMMENT ON COLUMN oats_address_types.who_created IS E'WHO CREATED is the IDIR or Oracle userid of the person who created the record.'; +COMMENT ON COLUMN oats_address_types.when_updated IS E'WHEN UPDATED is the date/time that the record was updated.'; +ALTER TABLE oats_address_types ADD PRIMARY KEY (address_type_cd); + +CREATE TABLE oats_property_interest_codes ( + property_interest_code varchar(10) NOT NULL, + description varchar(100) NOT NULL, + who_created varchar(32) NOT NULL, + when_created timestamp NOT NULL, + who_updated varchar(32), + when_updated timestamp, + revision_count bigint NOT NULL DEFAULT 0 +) ; +COMMENT ON COLUMN oats_property_interest_codes.property_interest_code IS E'PROPERTY INTEREST CODE is a unique code used to identify the interest a person has in a property. Examples of codes are: FO - Full Ownership, PO - Partial Ownership, RL - Registered Lease.'; +COMMENT ON COLUMN oats_property_interest_codes.when_created IS E'WHEN CREATED is the date/time that the record was created.'; +COMMENT ON COLUMN oats_property_interest_codes.revision_count IS E'REVISION COUNT is used by Hibernate to control optimistic locking'; +COMMENT ON COLUMN oats_property_interest_codes.who_updated IS E'WHO UPDATED is the IDIR or Oracle userid of the person who last updated the record.'; +COMMENT ON COLUMN oats_property_interest_codes.description IS E'DESCRIPTION is a textual description of the code value.'; +COMMENT ON COLUMN oats_property_interest_codes.when_updated IS E'WHEN UPDATED is the date/time that the record was last updated.'; +COMMENT ON COLUMN oats_property_interest_codes.who_created IS E'WHO CREATED is the IDIR or Oracle userid of the person who created the record.'; +ALTER TABLE oats_property_interest_codes ADD PRIMARY KEY (property_interest_code); + +CREATE TABLE oats_land_title_charge_codes ( + land_title_charge_code varchar(10) NOT NULL, + description varchar(100) NOT NULL, + system_required_ind varchar(1) NOT NULL, + who_created varchar(32) NOT NULL, + when_created timestamp NOT NULL, + who_updated varchar(32), + when_updated timestamp, + revision_count bigint NOT NULL DEFAULT 0 +) ; +COMMENT ON TABLE oats_land_title_charge_codes IS E'A LAND TITLE CHARGE CODE is an interest in land that is registerable against the title to land. For Example: - Liens - Covenant - Judgements - Easements - Certificate of Pending Litigation (previously known as Lis Pendens) This code table represents a subtype (filtered subset) of the ALTOS system''s VTRCDE table.'; +COMMENT ON COLUMN oats_land_title_charge_codes.when_created IS E'WHEN CREATED is the date/time that the record was created.'; +COMMENT ON COLUMN oats_land_title_charge_codes.who_updated IS E'WHO UPDATED is the IDIR or Oracle userid of the person who last updated the record.'; +COMMENT ON COLUMN oats_land_title_charge_codes.revision_count IS E'REVISION COUNT is used by Hibernate to control optimistic locking'; +COMMENT ON COLUMN oats_land_title_charge_codes.land_title_charge_code IS E'User supplied value to uniquely identify a LAND TITLE CHARGE CODE. This is identical to the ALTOS VTRCDE.TRNSCTN_TYP_CD column.'; +COMMENT ON COLUMN oats_land_title_charge_codes.who_created IS E'WHO CREATED is the IDIR or Oracle userid of the person who created the record.'; +COMMENT ON COLUMN oats_land_title_charge_codes.when_updated IS E'WHEN UPDATED is the date/time that the record was last updated.'; +COMMENT ON COLUMN oats_land_title_charge_codes.system_required_ind IS E'Indicates whether or not the code is required by the system. If yes, the users would be prevented from updating or deleting the code value.'; +COMMENT ON COLUMN oats_land_title_charge_codes.description IS E'Description of the LAND TITLE CHARGE CODE. This is identical to the ALTOS VTRCDE.TRNSCTN_DESC column.'; +ALTER TABLE oats_land_title_charge_codes ADD PRIMARY KEY (land_title_charge_code); +ALTER TABLE oats_land_title_charge_codes ADD CONSTRAINT avcon_1238100890_syste_011 CHECK (SYSTEM_REQUIRED_IND IN ('Y', 'N')); + +CREATE TABLE oats_organizations ( + organization_id bigint NOT NULL, + parent_organization_id bigint, + org_type varchar(10) NOT NULL, + organization_type_cd varchar(10) NOT NULL, + organization_name varchar(100) NOT NULL, + effective_date timestamp, + expiry_date timestamp, + ministry_cd varchar(10), + organization_unit_cd varchar(10), + alias_name varchar(240), + organization_guid varchar(32), + organization_contact varchar(120), + who_created varchar(32) NOT NULL, + when_created timestamp NOT NULL, + who_updated varchar(32), + when_updated timestamp, + revision_count bigint NOT NULL DEFAULT 0, + zone_1 varchar(1), + zone_2 varchar(1) +) ; +COMMENT ON TABLE oats_organizations IS E'A NON BC GOVERNMENT ORGANIZATION is an organization that does not belong to the BC Government. A BC GOVERNMENT ORGANIZATION is an organization that belongs to the BC Government. An ORGANIZATION is an organized and named grouping of people that interacts in some way with the Ministry. Definition from old ORGANIZATION CODE (plural AIR ORGANIZATION CDS):An ORGANIZATION is a named organization or group. There are two types of ORGANIZATIONS in AIR, AGENCY or EXTERNAL AGENCY. An AGENCY is a group that is in some way responsible for the ownership, or operation of a station. An EXTERNAL AGENCY is an agency who shares station data with AIR.An example is National Air Pollution Surveillance Network (NAPS). Note an optional display order was in ORGANIZATION CODE number(4).'; +COMMENT ON COLUMN oats_organizations.who_updated IS E'WHO UPDATED is the IDIR or Oracle userid of the person who updated the record.'; +COMMENT ON COLUMN oats_organizations.alias_name IS E'The ALIAS NAME is an alias for this type of organization.'; +COMMENT ON COLUMN oats_organizations.organization_id IS E'ORGANIZATION ID is the system generated unique identifier for ORGANIZATION'; +COMMENT ON COLUMN oats_organizations.organization_unit_cd IS E'The ORGANIZATION UNIT CD is an acronym used for Government Organization. For MSRM Information Management Branch it would be IMB. MoF has specific organizational unit codes which identify the org unit as Executive, Branch, Region or District with the code. E.g HIS in forests is Information Management Group. The H identifies it as Headquarters.'; +COMMENT ON COLUMN oats_organizations.when_updated IS E'WHEN UPDATED is the date/time that the record was updated.'; +COMMENT ON COLUMN oats_organizations.organization_name IS E'The ORGANIZATION NAME is the name of an organization.'; +COMMENT ON COLUMN oats_organizations.zone_2 IS E'Indicates whether or not the organization is in zone 2.'; +COMMENT ON COLUMN oats_organizations.who_created IS E'WHO CREATED is the IDIR or Oracle userid of the person who created the record.'; +COMMENT ON COLUMN oats_organizations.zone_1 IS E'Indicates whether or not the organization is in zone 1.'; +COMMENT ON COLUMN oats_organizations.organization_type_cd IS E'ORGANIZATION TYPE CD is the unique identifier for ORGANIZATION TYPE CD. Example: CORP - Corporation.'; +COMMENT ON COLUMN oats_organizations.revision_count IS E'REVISION COUNT is used by Hibernate to control optimistic locking'; +COMMENT ON COLUMN oats_organizations.ministry_cd IS E'The MINISTRY CD is a number assigned to define a BC Government Ministry'; +COMMENT ON COLUMN oats_organizations.organization_contact IS E'The name of the contact at the organization.'; +COMMENT ON COLUMN oats_organizations.organization_guid IS E'The GUID of the organization as provided by WebADE'; +COMMENT ON COLUMN oats_organizations.parent_organization_id IS E'ORGANIZATION ID is the system generated unique identifier for ORGANIZATION'; +COMMENT ON COLUMN oats_organizations.expiry_date IS E'The EXPIRY DATE is the date the Organization is obsoleted and is no longer an active or valid. May be used to keep a historical record of organization.'; +COMMENT ON COLUMN oats_organizations.effective_date IS E'The EFFECTIVE DATE is the date the Organization becomes effective as a valid Org Unit within the Ministry organizational structure.'; +COMMENT ON COLUMN oats_organizations.when_created IS E'WHEN CREATED is the date/time that the record was created.'; +ALTER TABLE oats_organizations ADD UNIQUE (organization_guid); +ALTER TABLE oats_organizations ADD PRIMARY KEY (organization_id); +ALTER TABLE oats_organizations ADD CONSTRAINT oats_org_ot_chk CHECK (ORG_TYPE IN ('BGO', 'NBC')); +ALTER TABLE oats_organizations ADD CONSTRAINT oats_org_chk CHECK ((org_type = 'BGO' AND + ministry_cd IS NOT NULL AND + organization_unit_cd IS NOT NULL AND + alias_name IS NULL) +OR (org_type = 'NBC' AND + ministry_cd IS NULL AND + organization_unit_cd IS NULL)); + +CREATE TABLE oats_relationship_codes ( + relationship_code varchar(10) NOT NULL, + description varchar(100) NOT NULL, + system_required_ind varchar(1) NOT NULL, + who_created varchar(32) NOT NULL, + when_created timestamp NOT NULL, + who_updated varchar(32), + when_updated timestamp, + revision_count bigint NOT NULL DEFAULT 0 +) ; +COMMENT ON TABLE oats_relationship_codes IS E'A RELATIONSHIP CODE is the nature of a relationship between one ALR APPLICATION and another. For example: - Notice of Intent (Link the application that arose from an NOI) - Related application (Link created after conducting research) - Inclusion Pending (Link created to insure an Inclusion is done prior to another application being approved)'; +COMMENT ON COLUMN oats_relationship_codes.relationship_code IS E'User supplied value to uniquely identify a RELATIONSHIP CODE'; +COMMENT ON COLUMN oats_relationship_codes.when_created IS E'WHEN CREATED is the date/time that the record was created.'; +COMMENT ON COLUMN oats_relationship_codes.who_updated IS E'WHO UPDATED is the IDIR or Oracle userid of the person who last updated the record.'; +COMMENT ON COLUMN oats_relationship_codes.revision_count IS E'REVISION COUNT is used by Hibernate to control optimistic locking'; +COMMENT ON COLUMN oats_relationship_codes.system_required_ind IS E'Indicates whether or not the code is required by the system. If yes, the users would be prevented from updating or deleting the code value.'; +COMMENT ON COLUMN oats_relationship_codes.description IS E'Description of the RELATIONSHIP CODE'; +COMMENT ON COLUMN oats_relationship_codes.who_created IS E'WHO CREATED is the IDIR or Oracle userid of the person who created the record.'; +COMMENT ON COLUMN oats_relationship_codes.when_updated IS E'WHEN UPDATED is the date/time that the record was last updated.'; +ALTER TABLE oats_relationship_codes ADD PRIMARY KEY (relationship_code); +ALTER TABLE oats_relationship_codes ADD CONSTRAINT avcon_1238100890_syste_017 CHECK (SYSTEM_REQUIRED_IND IN ('Y', 'N')); + +CREATE TABLE oats_document_source_codes ( + document_source_code varchar(10) NOT NULL, + description varchar(100) NOT NULL, + who_created varchar(32) NOT NULL, + when_created timestamp NOT NULL, + who_updated varchar(32), + when_updated timestamp, + revision_count bigint NOT NULL DEFAULT 0 +) ; +COMMENT ON COLUMN oats_document_source_codes.who_created IS E'WHO CREATED is the IDIR or Oracle userid of the person who created the record.'; +COMMENT ON COLUMN oats_document_source_codes.when_updated IS E'WHEN UPDATED is the date/time that the record was last updated.'; +COMMENT ON COLUMN oats_document_source_codes.description IS E'DESCRIPTION is a textual description of the code value.'; +COMMENT ON COLUMN oats_document_source_codes.document_source_code IS E'DOCUMENT SOURCE CODE is a unique code used to identify the source of a document. Examples of codes are: APP - Applicant and LG - Local Government.'; +COMMENT ON COLUMN oats_document_source_codes.when_created IS E'WHEN CREATED is the date/time that the record was created.'; +COMMENT ON COLUMN oats_document_source_codes.who_updated IS E'WHO UPDATED is the IDIR or Oracle userid of the person who last updated the record.'; +COMMENT ON COLUMN oats_document_source_codes.revision_count IS E'REVISION COUNT is used by Hibernate to control optimistic locking'; +ALTER TABLE oats_document_source_codes ADD PRIMARY KEY (document_source_code); + +CREATE TABLE oats_conditions ( + condition_id bigint NOT NULL, + alr_appl_component_id bigint NOT NULL, + condition_code varchar(10) NOT NULL, + approval_dependant_ind varchar(1) NOT NULL, + description varchar(4000), + completion_date timestamp, + security_required_ind varchar(1) NOT NULL, + admin_fee double precision, + who_created varchar(32) NOT NULL, + when_created timestamp NOT NULL, + who_updated varchar(32), + when_updated timestamp, + revision_count bigint NOT NULL DEFAULT 0 +) ; +COMMENT ON TABLE oats_conditions IS E'A CONDITION is a stipulation the applicant must meet prior to a decision being allowed be executed.'; +COMMENT ON COLUMN oats_conditions.condition_id IS E'System generated sequence number to uniquely identify a CONDITION'; +COMMENT ON COLUMN oats_conditions.condition_code IS E'User supplied value to uniquely identify a CONDITION CODE'; +COMMENT ON COLUMN oats_conditions.who_updated IS E'WHO UPDATED is the IDIR or Oracle userid of the person who last updated the record.'; +COMMENT ON COLUMN oats_conditions.description IS E'Description of the CONDITION'; +COMMENT ON COLUMN oats_conditions.who_created IS E'WHO CREATED is the IDIR or Oracle userid of the person who created the record.'; +COMMENT ON COLUMN oats_conditions.when_updated IS E'WHEN UPDATED is the date/time that the record was last updated.'; +COMMENT ON COLUMN oats_conditions.alr_appl_component_id IS E'System generated sequence number to uniquely identify an ALR APPL COMPONENT'; +COMMENT ON COLUMN oats_conditions.approval_dependant_ind IS E'Indicates whether or not the approval of the decision component is contingent on the condition being completed. For example: A survey plan may be required prior to the decision component being approved, or survey plans may be provided on an ongoing basis.'; +COMMENT ON COLUMN oats_conditions.admin_fee IS E'ADMIN FEE is the amount in dollars which can be edited by staff. The number will be saved as part of each condition.'; +COMMENT ON COLUMN oats_conditions.security_required_ind IS E'Indicates whether or not the CONDITION is bound by the ALR APPL DECISION . SECURITY AMT. All CONDITIONS that are bound by a security must be fulfilled before the security can be released.'; +COMMENT ON COLUMN oats_conditions.revision_count IS E'REVISION COUNT is used by Hibernate to control optimistic locking'; +COMMENT ON COLUMN oats_conditions.completion_date IS E'Date the Commission considers the condition completed.'; +COMMENT ON COLUMN oats_conditions.when_created IS E'WHEN CREATED is the date/time that the record was created.'; +CREATE INDEX oats_cond_cdcd_fk_i ON oats_conditions (condition_code); +CREATE INDEX oats_cond_apcp_fk_i ON oats_conditions (alr_appl_component_id); +ALTER TABLE oats_conditions ADD PRIMARY KEY (condition_id); +ALTER TABLE oats_conditions ADD CONSTRAINT avcon_1238100890_appro_001 CHECK (APPROVAL_DEPENDANT_IND IN ('Y', 'N')) NOT VALID; +ALTER TABLE oats_conditions ADD CONSTRAINT avcon_1238100890_secur_000 CHECK (SECURITY_REQUIRED_IND IN ('Y', 'N')) NOT VALID; + +CREATE TABLE oats_reconsideration_requests ( + reconsideration_request_id bigint NOT NULL, + alr_application_id bigint NOT NULL, + received_date timestamp NOT NULL, + new_information_ind varchar(1) NOT NULL, + error_information_ind varchar(1) NOT NULL, + new_proposal_ind varchar(1) NOT NULL, + staff_recommendation varchar(3), + "description" varchar(4000), + approved_date timestamp, + who_created varchar(32) NOT NULL, + when_created timestamp NOT NULL, + who_updated varchar(32), + when_updated timestamp, + revision_count bigint NOT NULL DEFAULT 0 +) ; +COMMENT ON TABLE oats_reconsideration_requests IS E'A RECONSIDERATION REQUEST is a request to the Commission to re-evaluate their decision made on an ALR APPLICATION. A RECONSIDERATION REQUEST can only be made when the applicant can provide more information the Commission did not have when their last decision was made, or the applicant can demonstrate there was error in the information the Commission had; it is not an opportunity for the applicant to alter the ALR APPLICATION.'; +COMMENT ON COLUMN oats_reconsideration_requests.received_date IS E'Date the requested was received by the ALC'; +COMMENT ON COLUMN oats_reconsideration_requests.who_updated IS E'WHO UPDATED is the IDIR or Oracle userid of the person who last updated the record.'; +COMMENT ON COLUMN oats_reconsideration_requests.when_updated IS E'WHEN UPDATED is the date/time that the record was last updated.'; +COMMENT ON COLUMN oats_reconsideration_requests.new_information_ind IS E'Indicates whether or not new information is being provided for the Commission to consider.'; +COMMENT ON COLUMN oats_reconsideration_requests.reconsideration_request_id IS E'System generated sequence number to uniquely identify a RECONSIDERATION REQUEST'; +COMMENT ON COLUMN oats_reconsideration_requests.who_created IS E'WHO CREATED is the IDIR or Oracle userid of the person who created the record.'; +COMMENT ON COLUMN oats_reconsideration_requests.description IS E'Further description of the RECONSIDERATION REQUEST'; +COMMENT ON COLUMN oats_reconsideration_requests.error_information_ind IS E'Indicates whether or not the applicant has demonstrated there was error in the information the Commission had when the decision was rendered'; +COMMENT ON COLUMN oats_reconsideration_requests.new_proposal_ind IS E'Indicates whether or not the applicant is submitting a different proposal than the original application'; +COMMENT ON COLUMN oats_reconsideration_requests.staff_recommendation IS E'The recommendation ALC staff made to the Commission (yes, no, or no recommendation)'; +COMMENT ON COLUMN oats_reconsideration_requests.when_created IS E'WHEN CREATED is the date/time that the record was created.'; +COMMENT ON COLUMN oats_reconsideration_requests.revision_count IS E'REVISION COUNT is used by Hibernate to control optimistic locking'; +COMMENT ON COLUMN oats_reconsideration_requests.approved_date IS E'The date the request was approved.'; +COMMENT ON COLUMN oats_reconsideration_requests.alr_application_id IS E'System generated sequence number to uniquely identify an ALR APPLICATION. This is also used as the ALR APPLICATION''S external reference number.'; +ALTER TABLE oats_reconsideration_requests ADD PRIMARY KEY (reconsideration_request_id); +ALTER TABLE oats_reconsideration_requests ADD CONSTRAINT oats_rreq_npi_chk CHECK (NEW_PROPOSAL_IND IN ('Y', 'N')); +ALTER TABLE oats_reconsideration_requests ADD CONSTRAINT oats_rreq_sr_chk CHECK (STAFF_RECOMMENDATION IN ('Y', 'N', 'NR')); +ALTER TABLE oats_reconsideration_requests ADD CONSTRAINT oats_rreq_nii_chk CHECK (NEW_INFORMATION_IND IN ('Y', 'N')); +ALTER TABLE oats_reconsideration_requests ADD CONSTRAINT oats_rreq_eii_chk CHECK (ERROR_INFORMATION_IND IN ('Y', 'N')); + +CREATE TABLE oats_documents ( + document_id bigint NOT NULL, + document_code varchar(10) NOT NULL, + alr_application_id bigint, + issue_id bigint, + planning_review_id bigint, + file_name varchar(128) NOT NULL, + description varchar(100), + referenced_in_staff_rpt_ind varchar(1) NOT NULL, + document_source_code varchar(10) NOT NULL, + subject_property_id bigint, + publicly_viewable_ind varchar(1) NOT NULL DEFAULT 'Y', + app_lg_viewable_ind varchar(1) NOT NULL DEFAULT 'Y', + uploaded_date timestamp NOT NULL, + who_created varchar(32) NOT NULL, + when_created timestamp NOT NULL, + who_updated varchar(32), + when_updated timestamp, + revision_count bigint NOT NULL DEFAULT 0 +) ; +COMMENT ON TABLE oats_documents IS E'A DOCUMENT is a human readable (opened with the appropriate software) electronic file .DOCUMENTS are typically: PDF (Portable Document Format) files JPEG (Joint Photographic Experts Group) photographs'; +COMMENT ON COLUMN oats_documents.uploaded_date IS E'The date the document was uploaded.'; +COMMENT ON COLUMN oats_documents.when_created IS E'WHEN CREATED is the date/time that the record was created.'; +COMMENT ON COLUMN oats_documents.document_id IS E'System generated sequence number to uniquely identify a DOCUMENT.'; +COMMENT ON COLUMN oats_documents.alr_application_id IS E'System generated sequence number to uniquely identify an ALR APPLICATION. This is also used as the ALR APPLICATION''S external reference number.'; +COMMENT ON COLUMN oats_documents.revision_count IS E'REVISION COUNT is used by Hibernate to control optimistic locking'; +COMMENT ON COLUMN oats_documents.publicly_viewable_ind IS E'Indicates if the document can be viewed by the public.'; +COMMENT ON COLUMN oats_documents.document_code IS E'User supplied value to uniquely identify a DOCUMENT CODE'; +COMMENT ON COLUMN oats_documents.file_name IS E'Filename, including the extension, excluding the directory path, of the source document. This will be used for the initial ''save as...'' file name when the document is downloaded from the application. The file name must include one period so the file extension can be derived.'; +COMMENT ON COLUMN oats_documents.subject_property_id IS E'The property associated with the document'; +COMMENT ON COLUMN oats_documents.issue_id IS E'System generated sequence number to uniquely identify an ISSUE'; +COMMENT ON COLUMN oats_documents.when_updated IS E'WHEN UPDATED is the date/time that the record was last updated.'; +COMMENT ON COLUMN oats_documents.referenced_in_staff_rpt_ind IS E'Indicates whether or not this DOCUMENT will be referenced as an attachment in the Staff Report. This option is only applicable for ALR APPLICATION related DOCUMENTS, therefore this may be Yes or No if the relationship from ALR APPLICATION is supplied, but must always be No if the relationship from ISSUE or PLANNING REVIEW is supplied.'; +COMMENT ON COLUMN oats_documents.who_created IS E'WHO CREATED is the IDIR or Oracle userid of the person who created the record.'; +COMMENT ON COLUMN oats_documents.document_source_code IS E'The source of the document.'; +COMMENT ON COLUMN oats_documents.description IS E'Description of the DOCUMENT'; +COMMENT ON COLUMN oats_documents.planning_review_id IS E'System generated sequence number to uniquely identify a PLANNING REVIEW'; +COMMENT ON COLUMN oats_documents.app_lg_viewable_ind IS E'Indicates if the document can be viewed by the applicant and local government.'; +COMMENT ON COLUMN oats_documents.who_updated IS E'WHO UPDATED is the IDIR or Oracle userid of the person who last updated the record.'; +CREATE INDEX oats_docu_plrv_fk_i ON oats_documents (planning_review_id); +CREATE INDEX oats_docu_issu_fk_i ON oats_documents (issue_id); +CREATE INDEX oats_docu_docd_fk_i ON oats_documents (document_code); +CREATE INDEX oats_docu_appl_fk_i ON oats_documents (alr_application_id); +ALTER TABLE oats_documents ADD PRIMARY KEY (document_id); +ALTER TABLE oats_documents ADD CONSTRAINT oats_docu_chk CHECK ((alr_application_id IS NOT NULL +AND issue_id IS NULL AND planning_review_id IS NULL) +OR (alr_application_id IS NULL +AND issue_id IS NOT NULL AND planning_review_id IS NULL) +OR (alr_application_id IS NULL +AND issue_id IS NULL AND planning_review_id IS NOT NULL)); +ALTER TABLE oats_documents ADD CONSTRAINT oats_od_risri_chk CHECK (REFERENCED_IN_STAFF_RPT_IND IN ('Y', 'N')); +ALTER TABLE oats_documents ADD CONSTRAINT oats_od_alvi_chk CHECK (app_lg_viewable_ind in ('Y', 'N')); +ALTER TABLE oats_documents ADD CONSTRAINT oats_od_pvi_chk CHECK (publicly_viewable_ind in ('Y', 'N')); + +CREATE TABLE oats_notice_intent_info_rqst ( + notice_intent_info_rqst_id bigint NOT NULL, + alr_application_id bigint NOT NULL, + description varchar(4000) NOT NULL, + request_date timestamp NOT NULL, + received_date timestamp, + who_created varchar(32) NOT NULL, + when_created timestamp NOT NULL, + who_updated varchar(32), + when_updated timestamp, + revision_count bigint NOT NULL DEFAULT 0 +) ; +COMMENT ON TABLE oats_notice_intent_info_rqst IS E'A NOTICE INTENT INFO RQST (Notice of Intent Information Request) is a request made by the Commission to obtain further information from the applicant regarding their Notice of Intent. If so the applicant has 30 days to respond to the request. Once the Commission receives the information they have 45 days to either ask for more information or render a decision. If the Commission does not respond within the timeframe, the applicant by default may proceed with their NOI.'; +COMMENT ON COLUMN oats_notice_intent_info_rqst.notice_intent_info_rqst_id IS E'System generated sequence number to uniquely identify an NOTICE INTENT INFO RQST'; +COMMENT ON COLUMN oats_notice_intent_info_rqst.alr_application_id IS E'System generated sequence number to uniquely identify an ALR APPLICATION. This is also used as the ALR APPLICATION''S external reference number.'; +COMMENT ON COLUMN oats_notice_intent_info_rqst.description IS E'Description of the Notice of Intent Information Request'; +COMMENT ON COLUMN oats_notice_intent_info_rqst.who_created IS E'WHO CREATED is the IDIR or Oracle userid of the person who created the record.'; +COMMENT ON COLUMN oats_notice_intent_info_rqst.when_updated IS E'WHEN UPDATED is the date/time that the record was last updated.'; +COMMENT ON COLUMN oats_notice_intent_info_rqst.who_updated IS E'WHO UPDATED is the IDIR or Oracle userid of the person who last updated the record.'; +COMMENT ON COLUMN oats_notice_intent_info_rqst.revision_count IS E'REVISION COUNT is used by Hibernate to control optimistic locking'; +COMMENT ON COLUMN oats_notice_intent_info_rqst.when_created IS E'WHEN CREATED is the date/time that the record was created.'; +COMMENT ON COLUMN oats_notice_intent_info_rqst.received_date IS E'Date the Commission received the requested information from the applicant'; +COMMENT ON COLUMN oats_notice_intent_info_rqst.request_date IS E'Date the Commission made the request for further information'; +CREATE INDEX oats_noir_appl_fk_i ON oats_notice_intent_info_rqst (alr_application_id); +ALTER TABLE oats_notice_intent_info_rqst ADD PRIMARY KEY (notice_intent_info_rqst_id); + +CREATE TABLE oats_committee_decision_codes ( + committee_decision_code varchar(10) NOT NULL, + description varchar(100) NOT NULL, + system_required_ind varchar(1) NOT NULL, + who_created varchar(32) NOT NULL, + when_created timestamp NOT NULL, + who_updated varchar(32), + when_updated timestamp, + revision_count bigint NOT NULL DEFAULT 0 +) ; +COMMENT ON TABLE oats_committee_decision_codes IS E'A COMMITTEE DECISION CODE is the decision a committee may render when reviewing an application. For example: - Approve - Refuse - Partial - No Comment'; +COMMENT ON COLUMN oats_committee_decision_codes.committee_decision_code IS E'User supplied value to uniquely identify a COMMITTEE DECISION CODE'; +COMMENT ON COLUMN oats_committee_decision_codes.who_updated IS E'WHO UPDATED is the IDIR or Oracle userid of the person who last updated the record.'; +COMMENT ON COLUMN oats_committee_decision_codes.revision_count IS E'REVISION COUNT is used by Hibernate to control optimistic locking'; +COMMENT ON COLUMN oats_committee_decision_codes.system_required_ind IS E'Indicates whether or not the code is required by the system. If yes, the users would be prevented from updating or deleting the code value.'; +COMMENT ON COLUMN oats_committee_decision_codes.description IS E'Description of the COMMITTEE DECISION CODE'; +COMMENT ON COLUMN oats_committee_decision_codes.when_created IS E'WHEN CREATED is the date/time that the record was created.'; +COMMENT ON COLUMN oats_committee_decision_codes.who_created IS E'WHO CREATED is the IDIR or Oracle userid of the person who created the record.'; +COMMENT ON COLUMN oats_committee_decision_codes.when_updated IS E'WHEN UPDATED is the date/time that the record was last updated.'; +ALTER TABLE oats_committee_decision_codes ADD PRIMARY KEY (committee_decision_code); +ALTER TABLE oats_committee_decision_codes ADD CONSTRAINT avcon_1238100890_syste_005 CHECK (SYSTEM_REQUIRED_IND IN ('Y', 'N')); + +CREATE TABLE oats_application_class_codes ( + application_class_code varchar(10) NOT NULL, + description varchar(100) NOT NULL, + system_required_ind varchar(1) NOT NULL, + who_created varchar(32) NOT NULL, + when_created timestamp NOT NULL, + who_updated varchar(32), + when_updated timestamp, + revision_count bigint NOT NULL DEFAULT 0 +) ; +COMMENT ON TABLE oats_application_class_codes IS E'An APPLICATION CLASS CODE is a classification category under which an APPLICATION can be applied. This will establish the default fee amount collected for the application. For example: - Land Owner Application - Block Application - Soil Change - Notice of Intent'; +COMMENT ON COLUMN oats_application_class_codes.who_updated IS E'WHO UPDATED is the IDIR or Oracle userid of the person who last updated the record.'; +COMMENT ON COLUMN oats_application_class_codes.application_class_code IS E'System developer supplied value to uniquely identify an APPLICATION CLASS CODE'; +COMMENT ON COLUMN oats_application_class_codes.revision_count IS E'REVISION COUNT is used by Hibernate to control optimistic locking'; +COMMENT ON COLUMN oats_application_class_codes.system_required_ind IS E'Indicates whether or not the code is required by the system. If yes, the users would be prevented from updating or deleting the code value.'; +COMMENT ON COLUMN oats_application_class_codes.description IS E'Description of the APPLICATION CLASS CODE'; +COMMENT ON COLUMN oats_application_class_codes.who_created IS E'WHO CREATED is the IDIR or Oracle userid of the person who created the record.'; +COMMENT ON COLUMN oats_application_class_codes.when_updated IS E'WHEN UPDATED is the date/time that the record was last updated.'; +COMMENT ON COLUMN oats_application_class_codes.when_created IS E'WHEN CREATED is the date/time that the record was created.'; +ALTER TABLE oats_application_class_codes ADD PRIMARY KEY (application_class_code); +ALTER TABLE oats_application_class_codes ADD CONSTRAINT avcon_1238100890_appli_001 CHECK (APPLICATION_CLASS_CODE IN ('LOA', 'BLK', 'SCH', 'NOI', 'NAN')); +ALTER TABLE oats_application_class_codes ADD CONSTRAINT avcon_1238100890_syste_025 CHECK (SYSTEM_REQUIRED_IND IN ('Y', 'N')); + +CREATE TABLE oats_nonfarm_use_type_codes ( + nonfarm_use_type_code varchar(10) NOT NULL, + description varchar(100) NOT NULL, + system_required_ind varchar(1) NOT NULL, + who_created varchar(32) NOT NULL, + when_created timestamp NOT NULL, + who_updated varchar(32), + when_updated timestamp, + revision_count bigint NOT NULL DEFAULT 0 +) ; +COMMENT ON TABLE oats_nonfarm_use_type_codes IS E'A NONFARM USE TYPE CODE is a broad categorization of non-agricultural uses of land. For example: - Industrial - Civic'; +COMMENT ON COLUMN oats_nonfarm_use_type_codes.when_created IS E'WHEN CREATED is the date/time that the record was created.'; +COMMENT ON COLUMN oats_nonfarm_use_type_codes.system_required_ind IS E'Indicates whether or not the code is required by the system. If yes, the users would be prevented from updating or deleting the code value.'; +COMMENT ON COLUMN oats_nonfarm_use_type_codes.description IS E'Description of the NONFARM USE TYPE CODE'; +COMMENT ON COLUMN oats_nonfarm_use_type_codes.who_created IS E'WHO CREATED is the IDIR or Oracle userid of the person who created the record.'; +COMMENT ON COLUMN oats_nonfarm_use_type_codes.when_updated IS E'WHEN UPDATED is the date/time that the record was last updated.'; +COMMENT ON COLUMN oats_nonfarm_use_type_codes.nonfarm_use_type_code IS E'User supplied value to uniquely identify a NONFARM USE TYPE CODE'; +COMMENT ON COLUMN oats_nonfarm_use_type_codes.who_updated IS E'WHO UPDATED is the IDIR or Oracle userid of the person who last updated the record.'; +COMMENT ON COLUMN oats_nonfarm_use_type_codes.revision_count IS E'REVISION COUNT is used by Hibernate to control optimistic locking'; +ALTER TABLE oats_nonfarm_use_type_codes ADD PRIMARY KEY (nonfarm_use_type_code); +ALTER TABLE oats_nonfarm_use_type_codes ADD CONSTRAINT avcon_1238100890_syste_004 CHECK (SYSTEM_REQUIRED_IND IN ('Y', 'N')); + +CREATE TABLE oats_condition_codes ( + condition_code varchar(10) NOT NULL, + description varchar(100) NOT NULL, + system_required_ind varchar(1) NOT NULL, + who_created varchar(32) NOT NULL, + when_created timestamp NOT NULL, + who_updated varchar(32), + when_updated timestamp, + revision_count bigint NOT NULL DEFAULT 0 +) ; +COMMENT ON TABLE oats_condition_codes IS E'A CONDITION CODE is a type of prerequisite the Commission can impose as contingent to a decision. For example: - Fencing - Vegetative buffering - Irrigation - Agriculture Reports - Reclamation - Monitoring'; +COMMENT ON COLUMN oats_condition_codes.condition_code IS E'User supplied value to uniquely identify a CONDITION CODE'; +COMMENT ON COLUMN oats_condition_codes.revision_count IS E'REVISION COUNT is used by Hibernate to control optimistic locking'; +COMMENT ON COLUMN oats_condition_codes.who_updated IS E'WHO UPDATED is the IDIR or Oracle userid of the person who last updated the record.'; +COMMENT ON COLUMN oats_condition_codes.description IS E'Description of the CONDITION CODE'; +COMMENT ON COLUMN oats_condition_codes.system_required_ind IS E'Indicates whether or not the code is required by the system. If yes, the users would be prevented from updating or deleting the code value.'; +COMMENT ON COLUMN oats_condition_codes.when_created IS E'WHEN CREATED is the date/time that the record was created.'; +COMMENT ON COLUMN oats_condition_codes.when_updated IS E'WHEN UPDATED is the date/time that the record was last updated.'; +COMMENT ON COLUMN oats_condition_codes.who_created IS E'WHO CREATED is the IDIR or Oracle userid of the person who created the record.'; +ALTER TABLE oats_condition_codes ADD PRIMARY KEY (condition_code); +ALTER TABLE oats_condition_codes ADD CONSTRAINT avcon_1238100890_syste_009 CHECK (SYSTEM_REQUIRED_IND IN ('Y', 'N')); + +CREATE TABLE oats_person_org_addresses ( + person_organization_id bigint NOT NULL, + address_id bigint NOT NULL, + address_type_cd varchar(10) NOT NULL, + who_created varchar(32) NOT NULL, + when_created timestamp NOT NULL, + who_updated varchar(32), + when_updated timestamp, + revision_count bigint NOT NULL DEFAULT 0 +) ; +COMMENT ON TABLE oats_person_org_addresses IS E'A PERSON ORGANIZATION ADDRESS is the intersection of a PERSON_ORGANIZATION and an ADDRESS.'; +COMMENT ON COLUMN oats_person_org_addresses.person_organization_id IS E'PERSON ORGANIZATION ID is the system generated unique identifier for PERSON ORGANIZATION.'; +COMMENT ON COLUMN oats_person_org_addresses.who_updated IS E'WHO UPDATED is the IDIR or Oracle userid of the person who updated the record.'; +COMMENT ON COLUMN oats_person_org_addresses.revision_count IS E'REVISION COUNT is used by Hibernate to control optimistic locking'; +COMMENT ON COLUMN oats_person_org_addresses.address_type_cd IS E'ADDRESS TYPE CD is the unique identifier for ADDRESS TYPE'; +COMMENT ON COLUMN oats_person_org_addresses.who_created IS E'WHO CREATED is the IDIR or Oracle userid of the person who created the record.'; +COMMENT ON COLUMN oats_person_org_addresses.when_updated IS E'WHEN UPDATED is the date/time that the record was updated.'; +COMMENT ON COLUMN oats_person_org_addresses.address_id IS E'ADDRESS ID is the system generated unique identifier for ADDRESS'; +COMMENT ON COLUMN oats_person_org_addresses.when_created IS E'WHEN CREATED is the date/time that the record was created.'; +CREATE INDEX oats_pad_sk1_i ON oats_person_org_addresses (person_organization_id, address_type_cd); +CREATE INDEX oats_pad_atp_fk_i ON oats_person_org_addresses (address_type_cd); +CREATE INDEX oats_pad_pog_fk_i ON oats_person_org_addresses (person_organization_id); +CREATE INDEX oats_pad_adr_fk_i ON oats_person_org_addresses (address_id); +ALTER TABLE oats_person_org_addresses ADD PRIMARY KEY (person_organization_id,address_id); + +CREATE TABLE oats_issues ( + issue_id bigint NOT NULL, + issu_type varchar(10) NOT NULL, + legacy_issue_nbr varchar(10), + filed_by_pog_id bigint NOT NULL, + local_gov_pog_id bigint NOT NULL, + received_date timestamp NOT NULL, + description varchar(4000) NOT NULL, + inquiry_code varchar(10), + complaint_code varchar(10), + swo_issued_by varchar(50), + swo_issued_date timestamp, + swo_terms varchar(4000), + swo_review_requested_date timestamp, + swo_ceo_review_date timestamp, + swo_ceo_review_description varchar(4000), + swo_ceo_review_result varchar(4000), + swo_complied_ind varchar(1), + recommend_fine_amt double precision, + recommend_land_remediation_ind varchar(1), + ceo_hearing_date timestamp, + ceo_decision_date timestamp, + fine_amt double precision, + fine_due_date timestamp, + fine_received_date timestamp, + remediation_required_ind varchar(1), + remediation_due_date timestamp, + remediation_completion_date timestamp, + who_created varchar(32) NOT NULL, + when_created timestamp NOT NULL, + who_updated varchar(32), + when_updated timestamp, + revision_count bigint NOT NULL DEFAULT 0 +) ; +COMMENT ON TABLE oats_issues IS E'An INQUIRY is a specific type of ISSUE, where someone poses a question to the Commission in regards to land use and the ALR. The Commission will reference this information if there is an ALR APPLICATION or COMPLAINT within the vicinity. A COMPLAINT is a specific type of ISSUE that warrants further investigation and may lead to an enforcement action. If further enforcement action is warranted, the typical course is: 1. Issue a Stop Work Order (SWO). The property owner may request this order be reviewed with the Chief Executive Officer (CEO). 2. The ALC staff will make recommendations to the CEO as to whether further enforcement action should be applied, in the form of fines and/or land remediation. 3. The CEO may then impose a fine and/or land remediation. An ISSUE is either an INQUIRY or COMPLAINT regarding land use within the jurisdiction of the ALR.'; +COMMENT ON COLUMN oats_issues.swo_complied_ind IS E'Indicates whether or not the property owner has complied with the stop work order or not.'; +COMMENT ON COLUMN oats_issues.recommend_land_remediation_ind IS E'Indicates whether or on the ALC staff recommends remediation to be completed on the land.'; +COMMENT ON COLUMN oats_issues.when_updated IS E'WHEN UPDATED is the date/time that the record was last updated.'; +COMMENT ON COLUMN oats_issues.fine_amt IS E'The fine amount the property owner must pay.'; +COMMENT ON COLUMN oats_issues.who_created IS E'WHO CREATED is the IDIR or Oracle userid of the person who created the record.'; +COMMENT ON COLUMN oats_issues.legacy_issue_nbr IS E'LEGACY ISSUE NBR is the characters used to identify an ISSUE in the legacy ATS application system, where NBR is an abbreviation for number. For example: 10011-1 or 20200'; +COMMENT ON COLUMN oats_issues.remediation_due_date IS E'Date the remediation must be completed. Must be supplied if REMEDIATION REQUIRED IND is ''Y'', otherwise must be null.'; +COMMENT ON COLUMN oats_issues.revision_count IS E'REVISION COUNT is used by Hibernate to control optimistic locking'; +COMMENT ON COLUMN oats_issues.local_gov_pog_id IS E'PERSON ORGANIZATION ID is the system generated unique identifier for PERSON ORGANIZATION.'; +COMMENT ON COLUMN oats_issues.swo_terms IS E'The provisions of the stop work order'; +COMMENT ON COLUMN oats_issues.swo_ceo_review_result IS E'Description of the Chief Executive Officer (CEO) results from the review. This can only be supplied if a SWO REVIEW REQUESTED DATE exists.'; +COMMENT ON COLUMN oats_issues.swo_ceo_review_description IS E'Description of the review conducted by the Chief Executive Officer (CEO). This can only be supplied if a SWO REVIEW REQUESTED DATE exists.'; +COMMENT ON COLUMN oats_issues.when_created IS E'WHEN CREATED is the date/time that the record was created.'; +COMMENT ON COLUMN oats_issues.swo_issued_date IS E'Date the stop work order was issued.'; +COMMENT ON COLUMN oats_issues.who_updated IS E'WHO UPDATED is the IDIR or Oracle userid of the person who last updated the record.'; +COMMENT ON COLUMN oats_issues.recommend_fine_amt IS E'The amount of a fine the ALC staff recommended to be imposed on the property owner.'; +COMMENT ON COLUMN oats_issues.remediation_completion_date IS E'Date the remediation is considered complete. Can only be supplied if REMEDIATION REQUIRED IND is ''Y'', otherwise must always be null.'; +COMMENT ON COLUMN oats_issues.complaint_code IS E'User supplied value to uniquely identify an COMPLAINT CODE'; +COMMENT ON COLUMN oats_issues.swo_ceo_review_date IS E'Date the Chief Executive Officer (CEO) completed the review of the stop work order. This can only be supplied if a SWO REVIEW REQUESTED DATE exists.'; +COMMENT ON COLUMN oats_issues.description IS E'DESCRIPTION isan attribute further extending the definition of the ISSUE.'; +COMMENT ON COLUMN oats_issues.fine_received_date IS E'Date the fine was received by the ALC. This can only be provided if a FINE AMT is imposed.'; +COMMENT ON COLUMN oats_issues.filed_by_pog_id IS E'PERSON ORGANIZATION ID is the system generated unique identifier for PERSON ORGANIZATION.'; +COMMENT ON COLUMN oats_issues.fine_due_date IS E'Date the fine is due by. This must be provided if a FINE AMT is imposed, or null if not.'; +COMMENT ON COLUMN oats_issues.received_date IS E'RECEIVED DATE is a time the ISSUE was received by the Commission.'; +COMMENT ON COLUMN oats_issues.inquiry_code IS E'User supplied value to uniquely identify an ISSUE CODE'; +COMMENT ON COLUMN oats_issues.issue_id IS E'System generated sequence number to uniquely identify an ISSUE'; +COMMENT ON COLUMN oats_issues.swo_review_requested_date IS E'Date the property owner requested a stop work order review with the Chief Executive Officer (CEO)'; +COMMENT ON COLUMN oats_issues.swo_issued_by IS E'Description of who issued the stop work order'; +COMMENT ON COLUMN oats_issues.ceo_decision_date IS E'Date the Chief Executive Officer rendered a decision if further enforcement action (fines and/or land remediation) will be taken.'; +COMMENT ON COLUMN oats_issues.ceo_hearing_date IS E'Date the Chief Executive Officer conducted a hearing to determine if further enforcement action (fines and/or land remediation) should be taken.'; +COMMENT ON COLUMN oats_issues.remediation_required_ind IS E'Indicates whether or not the property owner must remediate the property or not'; +CREATE INDEX oats_issu_cmpc_fk_i ON oats_issues (complaint_code); +CREATE INDEX oats_issu_inqc_fk_i ON oats_issues (inquiry_code); +CREATE INDEX oats_issu_pog_fk_i ON oats_issues (local_gov_pog_id); +CREATE INDEX oats_issu_pog_fk2_i ON oats_issues (filed_by_pog_id); +ALTER TABLE oats_issues ADD PRIMARY KEY (issue_id); +ALTER TABLE oats_issues ADD CONSTRAINT oats_issu_chk CHECK ((issu_type = 'CMP' AND + inquiry_code IS NULL AND + complaint_code IS NOT NULL +) +OR (issu_type = 'INQ' AND + inquiry_code IS NOT NULL AND + complaint_code IS NULL AND + swo_issued_by IS NULL AND + swo_issued_by IS NULL AND + swo_issued_date IS NULL AND + swo_terms IS NULL AND + swo_review_requested_date IS NULL AND + swo_ceo_review_date IS NULL AND + swo_ceo_review_description IS NULL AND + swo_ceo_review_result IS NULL AND + swo_complied_ind IS NULL AND + recommend_fine_amt IS NULL AND + recommend_land_remediation_ind IS NULL AND + ceo_hearing_date IS NULL AND + ceo_decision_date IS NULL AND + fine_amt IS NULL AND + fine_due_date IS NULL AND + fine_received_date IS NULL AND + remediation_required_ind IS NULL AND + remediation_due_date IS NULL AND + remediation_completion_date IS NULL +)); +ALTER TABLE oats_issues ADD CONSTRAINT avcon_1238100890_recom_000 CHECK (RECOMMEND_LAND_REMEDIATION_IND IN ('Y', 'N')); +ALTER TABLE oats_issues ADD CONSTRAINT avcon_1238100890_swo_c_000 CHECK (SWO_COMPLIED_IND IN ('Y', 'N')); +ALTER TABLE oats_issues ADD CONSTRAINT avcon_1238100890_issu__000 CHECK (ISSU_TYPE IN ('INQ', 'CMP')); +ALTER TABLE oats_issues ADD CONSTRAINT avcon_1238100890_remed_000 CHECK (REMEDIATION_REQUIRED_IND IN ('Y', 'N')); + +CREATE TABLE oats_subdiv_design_parcels ( + subdiv_design_parcel_id bigint NOT NULL, + subdivision_design_id bigint NOT NULL, + parcel_area double precision NOT NULL, + fully_in_alr_ind varchar(1) NOT NULL, + remainder_ind varchar(1) NOT NULL, + who_created varchar(32) NOT NULL, + when_created timestamp NOT NULL, + who_updated varchar(32), + when_updated timestamp, + revision_count bigint NOT NULL DEFAULT 0 +) ; +COMMENT ON TABLE oats_subdiv_design_parcels IS E'A SUBDIV DESIGN PARCEL is a parcel of land that is being proposed to be created as part of a SUBDIVISION DESIGN.'; +COMMENT ON COLUMN oats_subdiv_design_parcels.when_updated IS E'WHEN UPDATED is the date/time that the record was last updated.'; +COMMENT ON COLUMN oats_subdiv_design_parcels.who_created IS E'WHO CREATED is the IDIR or Oracle userid of the person who created the record.'; +COMMENT ON COLUMN oats_subdiv_design_parcels.subdiv_design_parcel_id IS E'System generated sequence number to uniquely identify a SUBDIV DESIGN PARCEL'; +COMMENT ON COLUMN oats_subdiv_design_parcels.revision_count IS E'REVISION COUNT is used by Hibernate to control optimistic locking'; +COMMENT ON COLUMN oats_subdiv_design_parcels.who_updated IS E'WHO UPDATED is the IDIR or Oracle userid of the person who last updated the record.'; +COMMENT ON COLUMN oats_subdiv_design_parcels.when_created IS E'WHEN CREATED is the date/time that the record was created.'; +COMMENT ON COLUMN oats_subdiv_design_parcels.remainder_ind IS E'Indicates whether or not the parcel was created as a result of not explicitly being included in a survey plan and is referenced in the survey plan as the remainder of the original parcel'; +COMMENT ON COLUMN oats_subdiv_design_parcels.fully_in_alr_ind IS E'Indicates whether or not the parcel is completely in the ALR or not'; +COMMENT ON COLUMN oats_subdiv_design_parcels.subdivision_design_id IS E'System generated sequence number to uniquely identify a SUBDIVISION DESIGN'; +COMMENT ON COLUMN oats_subdiv_design_parcels.parcel_area IS E'The surface area of the parcel'; +CREATE INDEX oats_sddp_subd_fk_i ON oats_subdiv_design_parcels (subdivision_design_id); +ALTER TABLE oats_subdiv_design_parcels ADD PRIMARY KEY (subdiv_design_parcel_id); +ALTER TABLE oats_subdiv_design_parcels ADD CONSTRAINT avcon_1238100890_remai_000 CHECK (REMAINDER_IND IN ('Y', 'N')); +ALTER TABLE oats_subdiv_design_parcels ADD CONSTRAINT avcon_1238100890_fully_000 CHECK (FULLY_IN_ALR_IND IN ('Y', 'N')); + +CREATE TABLE oats_committee_recommendations ( + committee_recommendation_id bigint NOT NULL, + alr_application_id bigint NOT NULL, + committee_type_code varchar(10) NOT NULL, + committee_decision_code varchar(10) NOT NULL, + description varchar(4000) NOT NULL, + who_created varchar(32) NOT NULL, + when_created timestamp NOT NULL, + who_updated varchar(32), + when_updated timestamp, + revision_count bigint NOT NULL DEFAULT 0 +) ; +COMMENT ON TABLE oats_committee_recommendations IS E'A COMMITTEE RECOMMENDATION is the decision a committee has rendered regarding the ALR APPLICATION. These committees are held prior to the ALR APPLICATION being submitted to the ALC.'; +COMMENT ON COLUMN oats_committee_recommendations.committee_type_code IS E'User supplied value to uniquely identify a COMMITTEE TYPE CODE'; +COMMENT ON COLUMN oats_committee_recommendations.who_updated IS E'WHO UPDATED is the IDIR or Oracle userid of the person who last updated the record.'; +COMMENT ON COLUMN oats_committee_recommendations.revision_count IS E'REVISION COUNT is used by Hibernate to control optimistic locking'; +COMMENT ON COLUMN oats_committee_recommendations.description IS E'Further description of the COMMITTEE RECOMMENDATION'; +COMMENT ON COLUMN oats_committee_recommendations.alr_application_id IS E'System generated sequence number to uniquely identify an ALR APPLICATION. This is also used as the ALR APPLICATION''S external reference number.'; +COMMENT ON COLUMN oats_committee_recommendations.who_created IS E'WHO CREATED is the IDIR or Oracle userid of the person who created the record.'; +COMMENT ON COLUMN oats_committee_recommendations.committee_recommendation_id IS E'System generated sequence number to uniquely identify a COMMITTEE RECOMMENDATION'; +COMMENT ON COLUMN oats_committee_recommendations.when_updated IS E'WHEN UPDATED is the date/time that the record was last updated.'; +COMMENT ON COLUMN oats_committee_recommendations.committee_decision_code IS E'User supplied value to uniquely identify a COMMITTEE DECISION CODE'; +COMMENT ON COLUMN oats_committee_recommendations.when_created IS E'WHEN CREATED is the date/time that the record was created.'; +CREATE INDEX oats_cmrc_cmdc_fk_i ON oats_committee_recommendations (committee_decision_code); +CREATE INDEX oats_cmrc_appl_fk_i ON oats_committee_recommendations (alr_application_id); +CREATE INDEX oats_cmrc_cmtc_fk_i ON oats_committee_recommendations (committee_type_code); +ALTER TABLE oats_committee_recommendations ADD PRIMARY KEY (committee_recommendation_id); + +CREATE TABLE oats_agri_capability_codes ( + agri_capability_code varchar(10) NOT NULL, + description varchar(100) NOT NULL, + system_required_ind varchar(1) NOT NULL, + who_created varchar(32) NOT NULL, + when_created timestamp NOT NULL, + who_updated varchar(32), + when_updated timestamp, + revision_count bigint NOT NULL DEFAULT 0 +) ; +COMMENT ON TABLE oats_agri_capability_codes IS E'An AGRI (AGRICULTURAL) CAPABILITY CODE is a measurement of a land''s ability to support agricultural endeavours. For example: - Prime Dominant - Secondary - Unclassified - Mixed'; +COMMENT ON COLUMN oats_agri_capability_codes.agri_capability_code IS E'User supplied value to uniquely identify an AGRI CAPABILITY CODE'; +COMMENT ON COLUMN oats_agri_capability_codes.when_created IS E'WHEN CREATED is the date/time that the record was created.'; +COMMENT ON COLUMN oats_agri_capability_codes.who_updated IS E'WHO UPDATED is the IDIR or Oracle userid of the person who last updated the record.'; +COMMENT ON COLUMN oats_agri_capability_codes.revision_count IS E'REVISION COUNT is used by Hibernate to control optimistic locking'; +COMMENT ON COLUMN oats_agri_capability_codes.who_created IS E'WHO CREATED is the IDIR or Oracle userid of the person who created the record.'; +COMMENT ON COLUMN oats_agri_capability_codes.when_updated IS E'WHEN UPDATED is the date/time that the record was last updated.'; +COMMENT ON COLUMN oats_agri_capability_codes.system_required_ind IS E'Indicates whether or not the code is required by the system. If yes, the users would be prevented from updating or deleting the code value.'; +COMMENT ON COLUMN oats_agri_capability_codes.description IS E'Description of the AGRI CAPABILITY CODE'; +ALTER TABLE oats_agri_capability_codes ADD PRIMARY KEY (agri_capability_code); +ALTER TABLE oats_agri_capability_codes ADD CONSTRAINT avcon_1238100890_syste_010 CHECK (SYSTEM_REQUIRED_IND IN ('Y', 'N')); + +CREATE TABLE oats_complaint_appeals ( + complaint_appeal_id bigint NOT NULL, + issue_id bigint NOT NULL, + appeal_date timestamp NOT NULL, + description varchar(4000) NOT NULL, + hearing_date timestamp, + upheld_ind varchar(1) NOT NULL, + who_created varchar(32) NOT NULL, + when_created timestamp NOT NULL, + who_updated varchar(32), + when_updated timestamp, + revision_count bigint NOT NULL DEFAULT 0 +) ; +COMMENT ON TABLE oats_complaint_appeals IS E'A COMPLAINT APPEAL is a request by the property owner to have the enforcement action reconsidered.'; +COMMENT ON COLUMN oats_complaint_appeals.when_created IS E'WHEN CREATED is the date/time that the record was created.'; +COMMENT ON COLUMN oats_complaint_appeals.issue_id IS E'System generated sequence number to uniquely identify an ISSUE'; +COMMENT ON COLUMN oats_complaint_appeals.upheld_ind IS E'Indicates whether or not the original enforcement action is upheld by the appeal'; +COMMENT ON COLUMN oats_complaint_appeals.hearing_date IS E'Date the hearing was held to consider the appeal'; +COMMENT ON COLUMN oats_complaint_appeals.when_updated IS E'WHEN UPDATED is the date/time that the record was last updated.'; +COMMENT ON COLUMN oats_complaint_appeals.who_created IS E'WHO CREATED is the IDIR or Oracle userid of the person who created the record.'; +COMMENT ON COLUMN oats_complaint_appeals.appeal_date IS E'Date the appeal was submitted by the property owner.'; +COMMENT ON COLUMN oats_complaint_appeals.description IS E'Description of the COMPLAINT APPEAL'; +COMMENT ON COLUMN oats_complaint_appeals.complaint_appeal_id IS E'System generated sequence number to uniquely identify a COMPLAINT APPEAL'; +COMMENT ON COLUMN oats_complaint_appeals.revision_count IS E'REVISION COUNT is used by Hibernate to control optimistic locking'; +COMMENT ON COLUMN oats_complaint_appeals.who_updated IS E'WHO UPDATED is the IDIR or Oracle userid of the person who last updated the record.'; +CREATE INDEX oats_cmap_issu_fk_i ON oats_complaint_appeals (issue_id); +ALTER TABLE oats_complaint_appeals ADD PRIMARY KEY (complaint_appeal_id); +ALTER TABLE oats_complaint_appeals ADD CONSTRAINT avcon_1238100890_uphel_000 CHECK (UPHELD_IND IN ('Y', 'N')); + +CREATE TABLE oats_alr_appl_components ( + alr_appl_component_id bigint NOT NULL, + alr_change_code varchar(10) NOT NULL, + alr_application_id bigint, + alr_appl_decision_id bigint, + component_area double precision NOT NULL, + agri_capability_code varchar(10), + capability_source_code varchar(10), + legislation_code varchar(10), + agri_cap_map varchar(50), + agri_cap_consultant varchar(100), + decision_expiry_date timestamp, + amendment_year smallint, + amendment_period smallint, + nonfarm_use_type_code varchar(10), + nonfarm_use_subtype_code varchar(10), + nonfarm_use_end_date timestamp, + alr_impact_ind varchar(1), + homesite_severance_ind varchar(1), + support_desc varchar(4000), + improvements_desc varchar(4000), + impact_reduction_desc varchar(4000), + agricultural_activities_ind varchar(1), + agricultural_activities_desc varchar(4000), + corridor_length real, + corridor_width integer, + owners_notified_ind varchar(1), + rsdntl_use_type_code varchar(10), + rsdntl_use_end_date timestamp, + material_need_ind varchar(1), + cur_struc_desc varchar(4000), + infra_desc varchar(4000), + sleeping_units integer, + tour_env_desc varchar(4000), + exclsn_app_type_code varchar(10), + applicationshare_ind varchar(1), + who_created varchar(32) NOT NULL, + when_created timestamp NOT NULL, + who_updated varchar(32), + when_updated timestamp, + revision_count bigint NOT NULL DEFAULT 0 +) ; +COMMENT ON TABLE oats_alr_appl_components IS E'An ALR APPL COMPONENT is a constituent part of an ALR APPLICATION distinguished by the type of change (as defined by ALR CHANGE CODE).An ALR APPL COMPONENT is either describing:a) a proposal component (if the relationship [identified as a proposal component for one and only one ALR APPLICATION] is provided)b) a decision component (if the relationship [identified as a decision component for one and only one ALR APPL DECISION] is provided.)A BOUNDARY CHANGE is an ALR APPL COMPONENT that will affect the boundary of the ALR. A decision ALR APPL COMPONENT-BOUNDARY CHANGE will be mapped in a digital mapping system.An INCLUSION is a specific type of ALR APPL COMPONENT that will bring land into the Agricultural Land Reserve. An EXCLUSION is a specific type of ALR APPL COMPONENT that will take land out of the Agricultural Land Reserve. A NON BOUNDARY CHANGE is an ALR APPL COMPONENT that does not affect the boundary of the ALR. A decision ALR APPL COMPONENT-NON BOUNDARY CHANGE will not be mapped in a digital mapping system.NON FARM PURPOSE is a specific type of NON BOUNDARY CHANGE-ALR APPL COMPONENT that will allow an activity other than agriculture to be conducted on the land, either as a general NONFARM USE, or as a SOIL CHANGE COMPONENT.A SUBDIVISION is a specific type of ALR APPL COMPONENT that will allow a parcel of land to be separated into multiple smaller parcels.A NON FARM USE is a specific type of NONFARM PURPOSE-NON BOUNDARY CHANGE-ALR APPL COMPONENT that will allow an activity other than agriculture to be conducted on the land, but not specifically subdivisions.A SOIL CHANGE COMPONENT is a further specific NON FARM PURPOSE that will allow either soil to be removed from the land or fill added to the land.'; +COMMENT ON COLUMN oats_alr_appl_components.when_updated IS E'WHEN UPDATED is the date/time that the record was last updated.'; +COMMENT ON COLUMN oats_alr_appl_components.who_created IS E'WHO CREATED is the IDIR or Oracle userid of the person who created the record.'; +COMMENT ON COLUMN oats_alr_appl_components.owners_notified_ind IS E'Indicates if the owners of the adjacent lands have been notified of this component.'; +COMMENT ON COLUMN oats_alr_appl_components.support_desc IS E'Describes the component support.'; +COMMENT ON COLUMN oats_alr_appl_components.infra_desc IS E'Describes any infrastructure required to this component'; +COMMENT ON COLUMN oats_alr_appl_components.corridor_length IS E'The length of the corridor resuting from this component.'; +COMMENT ON COLUMN oats_alr_appl_components.impact_reduction_desc IS E'Describes the efforst taken to reduce the impact of this component.'; +COMMENT ON COLUMN oats_alr_appl_components.amendment_period IS E'The period of the MAP AMENDMENT PERIOD'; +COMMENT ON COLUMN oats_alr_appl_components.nonfarm_use_end_date IS E'Date the Commission set in its decision the non farm use activity should stop. This must be null for a proposal component, and must be supplied for a decision ALR APPL COMPONENT.'; +COMMENT ON COLUMN oats_alr_appl_components.revision_count IS E'REVISION COUNT is used by Hibernate to control optimistic locking'; +COMMENT ON COLUMN oats_alr_appl_components.alr_change_code IS E'System developer supplied value to uniquely identify an ALR CHANGE CODE'; +COMMENT ON COLUMN oats_alr_appl_components.alr_impact_ind IS E'Indicates if the component will have an impact on the ALR'; +COMMENT ON COLUMN oats_alr_appl_components.amendment_year IS E'The year of the MAP AMENDMENT PERIOD'; +COMMENT ON COLUMN oats_alr_appl_components.applicationshare_ind IS E'Indicates whether or not any land under application shares a common property line with land in another Local or First Nation Government'; +COMMENT ON COLUMN oats_alr_appl_components.agri_capability_code IS E'User supplied value to uniquely identify an AGRI CAPABILITY CODE'; +COMMENT ON COLUMN oats_alr_appl_components.when_created IS E'WHEN CREATED is the date/time that the record was created.'; +COMMENT ON COLUMN oats_alr_appl_components.agri_cap_consultant IS E'Description of the agricultural consultant that provided agricultural capability'; +COMMENT ON COLUMN oats_alr_appl_components.agricultural_activities_ind IS E'Indicates if agricultural activity will result from this component.'; +COMMENT ON COLUMN oats_alr_appl_components.rsdntl_use_type_code IS E'User supplied value to uniquely identify a RSDNTL USE TYPE CODE'; +COMMENT ON COLUMN oats_alr_appl_components.homesite_severance_ind IS E'Indicates if the componement will result in a homesite severence'; +COMMENT ON COLUMN oats_alr_appl_components.tour_env_desc IS E'Describes any agri-tourism accommodation or tourist accommodation currently located on this component'; +COMMENT ON COLUMN oats_alr_appl_components.sleeping_units IS E'Describes how many sleeping units in total are proposed such as bedroom or a vehicle, trailer, tent or other structure, located on a campsite, field or other area'; +COMMENT ON COLUMN oats_alr_appl_components.corridor_width IS E'The width of the corridor resuting from this component.'; +COMMENT ON COLUMN oats_alr_appl_components.agri_cap_map IS E'Description of the source map that provided agricultural capability'; +COMMENT ON COLUMN oats_alr_appl_components.who_updated IS E'WHO UPDATED is the IDIR or Oracle userid of the person who last updated the record.'; +COMMENT ON COLUMN oats_alr_appl_components.nonfarm_use_subtype_code IS E'User supplied value to uniquely identify a NONFARM USE SUBTYPE CODE'; +COMMENT ON COLUMN oats_alr_appl_components.alr_appl_decision_id IS E'System generated sequence number to uniquely identify a ALR APPL DECISION'; +COMMENT ON COLUMN oats_alr_appl_components.nonfarm_use_type_code IS E'User supplied value to uniquely identify a NONFARM USE TYPE CODE'; +COMMENT ON COLUMN oats_alr_appl_components.rsdntl_use_end_date IS E'Date the Commission set in its decision the Non-Adhering Residential use activity should stop. This must be null for a proposal component, and must be supplied for a decision ALR APPL COMPONENT.'; +COMMENT ON COLUMN oats_alr_appl_components.exclsn_app_type_code IS E'User supplied value to uniquely identify a EXCLSN APP TYPE CODE'; +COMMENT ON COLUMN oats_alr_appl_components.improvements_desc IS E'Describes the improvements resulting from this component.'; +COMMENT ON COLUMN oats_alr_appl_components.legislation_code IS E'LEGISLATION CODE is a unique code used to identify a section of the Agricultural Land Commission Act'; +COMMENT ON COLUMN oats_alr_appl_components.component_area IS E'Total land area covered by this ALR APPL COMPONENT'; +COMMENT ON COLUMN oats_alr_appl_components.capability_source_code IS E'User supplied value to uniquely identify a CAPABILITY SOURCE CODE'; +COMMENT ON COLUMN oats_alr_appl_components.material_need_ind IS E'Indicates whether or not the applicant needs the soil being removed, or the fill being placed'; +COMMENT ON COLUMN oats_alr_appl_components.cur_struc_desc IS E'Describes all existing structures on this component'; +COMMENT ON COLUMN oats_alr_appl_components.alr_appl_component_id IS E'System generated sequence number to uniquely identify an ALR APPL COMPONENT'; +COMMENT ON COLUMN oats_alr_appl_components.alr_application_id IS E'System generated sequence number to uniquely identify an ALR APPLICATION. This is also used as the ALR APPLICATION''S external reference number.'; +COMMENT ON COLUMN oats_alr_appl_components.decision_expiry_date IS E'Date the decision ALR APPL COMPONENTcan no longer be implemented. This must be null for a proposal ALR APPL COMPONENT, and must be supplied for all decision ALR APPL COMPONENT, except INCLUSIONS. An INCLUSION decision component will never have an expiry date.'; +COMMENT ON COLUMN oats_alr_appl_components.agricultural_activities_desc IS E'Description of the agricultural activities resulting from this component.'; +ALTER TABLE oats_alr_appl_components ADD PRIMARY KEY (alr_appl_component_id); +ALTER TABLE oats_alr_appl_components ADD CONSTRAINT oats_apcp_chk1 CHECK ( +-- +-- Enforces the exclusive relationships coming in +-- from ALR APPLICATION and ALR APPL DECISION. +(alr_application_id IS NOT NULL AND alr_appl_decision_id IS NULL) +OR (alr_application_id IS NULL AND alr_appl_decision_id IS NOT NULL)); +ALTER TABLE oats_alr_appl_components ADD CONSTRAINT oats_apcp_chk5 CHECK ( +-- +-- Ensures only a decision expiry date is +-- supplied for a decision component. +(alr_appl_decision_id IS NOT NULL AND (decision_expiry_date IS NULL or decision_expiry_date IS NOT NULL) +) +OR (alr_appl_decision_id IS NULL AND decision_expiry_date IS NULL)); +ALTER TABLE oats_alr_appl_components ADD CONSTRAINT oats_apcp_oni_ck CHECK (owners_notified_ind in ('Y', 'N')); +ALTER TABLE oats_alr_appl_components ADD CONSTRAINT oats_apcp_mni_ck CHECK (MATERIAL_NEED_IND IN ('Y', 'N')); +ALTER TABLE oats_alr_appl_components ADD CONSTRAINT oats_apcp_chk3 CHECK ( +-- +-- Ensures only NON FARM USE has an optional +-- relationship from NONFARM USE SUBTYPE CODE +((alr_change_code = 'NFU') AND ( nonfarm_use_type_code IS NOT NULL AND + nonfarm_use_subtype_code IS NOT NULL) +OR ( nonfarm_use_type_code IS NULL AND + nonfarm_use_subtype_code IS NULL) +) +OR (alr_change_code IN ('INC', 'EXC', 'SDV', 'SCH') AND + nonfarm_use_type_code IS NULL AND + nonfarm_use_subtype_code IS NULL)); +ALTER TABLE oats_alr_appl_components ADD CONSTRAINT oats_apcp_aii_ck CHECK (alr_impact_ind in ('Y', 'N')); +ALTER TABLE oats_alr_appl_components ADD CONSTRAINT oats_apcp_hsi_ck CHECK (homesite_severance_ind in ('Y', 'N')); +ALTER TABLE oats_alr_appl_components ADD CONSTRAINT oats_apcp_asi_ck CHECK (applicationshare_ind IN ('Y', 'N')); +ALTER TABLE oats_alr_appl_components ADD CONSTRAINT oats_apcp_aai_ck CHECK (agricultural_activities_ind in ('Y', 'N')); + +CREATE TABLE oats_planning_review_codes ( + planning_review_code varchar(10) NOT NULL, + description varchar(100) NOT NULL, + system_required_ind varchar(1) NOT NULL, + who_created varchar(32) NOT NULL, + when_created timestamp NOT NULL, + who_updated varchar(32), + when_updated timestamp, + revision_count bigint NOT NULL DEFAULT 0 +) ; +COMMENT ON TABLE oats_planning_review_codes IS E'A PLANNING REVIEW CODE is category under which a PLANNING REVIEW may be classified. For example: - Official Community Plan Review - Zoning Review - Local Government Boundary Adjustment - Transportation Review - Parks Planning - Regional Plans - Crown Lands - ALR Boundary Review - Other'; +COMMENT ON COLUMN oats_planning_review_codes.description IS E'Description of the PLANNING REVIEW CODE'; +COMMENT ON COLUMN oats_planning_review_codes.system_required_ind IS E'Indicates whether or not the code is required by the system. If yes, the users would be prevented from updating or deleting the code value.'; +COMMENT ON COLUMN oats_planning_review_codes.who_created IS E'WHO CREATED is the IDIR or Oracle userid of the person who created the record.'; +COMMENT ON COLUMN oats_planning_review_codes.planning_review_code IS E'User supplied value to uniquely identify a PLANNING REVIEW CODE'; +COMMENT ON COLUMN oats_planning_review_codes.when_updated IS E'WHEN UPDATED is the date/time that the record was last updated.'; +COMMENT ON COLUMN oats_planning_review_codes.who_updated IS E'WHO UPDATED is the IDIR or Oracle userid of the person who last updated the record.'; +COMMENT ON COLUMN oats_planning_review_codes.revision_count IS E'REVISION COUNT is used by Hibernate to control optimistic locking'; +COMMENT ON COLUMN oats_planning_review_codes.when_created IS E'WHEN CREATED is the date/time that the record was created.'; +ALTER TABLE oats_planning_review_codes ADD PRIMARY KEY (planning_review_code); +ALTER TABLE oats_planning_review_codes ADD CONSTRAINT avcon_1238100890_syste_021 CHECK (SYSTEM_REQUIRED_IND IN ('Y', 'N')); + +CREATE TABLE oats_alr_unvalidated_app_data ( + alr_unvalidated_app_data_id bigint NOT NULL, + alr_application_id bigint NOT NULL, + property_name varchar(1000) NOT NULL, + property_value varchar(4000) NOT NULL, + who_created varchar(32) NOT NULL, + when_created timestamp NOT NULL, + who_updated varchar(32), + when_updated timestamp, + revision_count bigint NOT NULL DEFAULT 0 +) ; +COMMENT ON TABLE oats_alr_unvalidated_app_data IS E'Holds unvalidated data for an application currently IN PROGRESS. It is saved here until the application is validated and complete, then saved into the actual tables.'; +COMMENT ON COLUMN oats_alr_unvalidated_app_data.revision_count IS E'REVISION COUNT is used by Hibernate to control optimistic locking'; +COMMENT ON COLUMN oats_alr_unvalidated_app_data.who_updated IS E'WHO UPDATED is the BCEID, IDIR or Oracle userid of the person who last updated the record.'; +COMMENT ON COLUMN oats_alr_unvalidated_app_data.alr_application_id IS E'System generated sequence number to uniquely identify an ALR APPLICATION. This is also used as the ALR APPLICATION''S external reference number.'; +COMMENT ON COLUMN oats_alr_unvalidated_app_data.property_name IS E'PROPERTY NAME is a path that identifies a field in the OATS Portal data model.'; +COMMENT ON COLUMN oats_alr_unvalidated_app_data.when_updated IS E'WHEN UPDATED is the date/time that the record was last updated.'; +COMMENT ON COLUMN oats_alr_unvalidated_app_data.who_created IS E'WHO CREATED is the BCEID, IDIR or Oracle userid of the person who created the record.'; +COMMENT ON COLUMN oats_alr_unvalidated_app_data.property_value IS E'PROPERTY VALUE is the user-specified value corresponding to PROPERY NAME.'; +COMMENT ON COLUMN oats_alr_unvalidated_app_data.when_created IS E'WHEN CREATED is the date/time that the record was created.'; +COMMENT ON COLUMN oats_alr_unvalidated_app_data.alr_unvalidated_app_data_id IS E'System generated sequence number to uniquely identify an UNVALIDATED APP DATA.'; +CREATE UNIQUE INDEX oats_auad_uk ON oats_alr_unvalidated_app_data (alr_application_id, property_name); +CREATE INDEX oats_auad_appl_fk_i ON oats_alr_unvalidated_app_data (alr_application_id); +ALTER TABLE oats_alr_unvalidated_app_data ADD UNIQUE (alr_application_id,property_name); +ALTER TABLE oats_alr_unvalidated_app_data ADD PRIMARY KEY (alr_unvalidated_app_data_id); + +CREATE TABLE oats_document_codes ( + document_code varchar(10) NOT NULL, + description varchar(100) NOT NULL, + sort_order integer NOT NULL, + system_required_ind varchar(1) NOT NULL, + publicly_viewable_ind varchar(1) DEFAULT 'Y', + who_created varchar(32) NOT NULL, + when_created timestamp NOT NULL, + who_updated varchar(32), + when_updated timestamp, + revision_count bigint NOT NULL DEFAULT 0 +) ; +COMMENT ON TABLE oats_document_codes IS E'A DOCUMENT CODE is the categorization of a DOCUMENT. For example: - Acceptance Letter - Staff Report - Decision Meeting Minutes - Correspondence from Public'; +COMMENT ON COLUMN oats_document_codes.when_updated IS E'WHEN UPDATED is the date/time that the record was last updated.'; +COMMENT ON COLUMN oats_document_codes.who_created IS E'WHO CREATED is the IDIR or Oracle userid of the person who created the record.'; +COMMENT ON COLUMN oats_document_codes.description IS E'Description of the DOCUMENT CODE'; +COMMENT ON COLUMN oats_document_codes.system_required_ind IS E'Indicates whether or not the code is required by the system. If yes, the users would be prevented from updating or deleting the code value.'; +COMMENT ON COLUMN oats_document_codes.revision_count IS E'REVISION COUNT is used by Hibernate to control optimistic locking'; +COMMENT ON COLUMN oats_document_codes.publicly_viewable_ind IS E'Indicates if documents of this type can by default be viewed publicly'; +COMMENT ON COLUMN oats_document_codes.who_updated IS E'WHO UPDATED is the IDIR or Oracle userid of the person who last updated the record.'; +COMMENT ON COLUMN oats_document_codes.document_code IS E'User supplied value to uniquely identify a DOCUMENT CODE'; +COMMENT ON COLUMN oats_document_codes.sort_order IS E'The relative order in which the DOCUMENT CODE is displayed to the user'; +COMMENT ON COLUMN oats_document_codes.when_created IS E'WHEN CREATED is the date/time that the record was created.'; +ALTER TABLE oats_document_codes ADD UNIQUE (sort_order); +ALTER TABLE oats_document_codes ADD PRIMARY KEY (document_code); +ALTER TABLE oats_document_codes ADD CONSTRAINT oats_docd_pvi_chk CHECK (publicly_viewable_ind in ('Y', 'N')); +ALTER TABLE oats_document_codes ADD CONSTRAINT oats_docd_sri_chk CHECK (SYSTEM_REQUIRED_IND IN ('Y', 'N')); + +CREATE TABLE oats_email_notifications ( + email_notification_id bigint NOT NULL, + to_addresses varchar(1000) NOT NULL, + cc_addresses varchar(1000), + bcc_addresses varchar(1000), + from_address varchar(50) NOT NULL, + reply_to_address varchar(50), + email_subject varchar(255) NOT NULL, + email_text varchar(4000) NOT NULL, + sent_date timestamp, + status_message varchar(2000), + email_type_code varchar(10) NOT NULL, + email_status_code varchar(10) NOT NULL, + alr_application_id bigint NOT NULL, + who_created varchar(32) NOT NULL, + when_created timestamp NOT NULL, + who_updated varchar(32), + when_updated timestamp, + revision_count bigint NOT NULL DEFAULT 0, + send_count bigint NOT NULL DEFAULT 0 +) ; +COMMENT ON COLUMN oats_email_notifications.from_address IS E'FROM ADDRESS is the email address of the user that sent the email.'; +COMMENT ON COLUMN oats_email_notifications.send_count IS E'SEND COUNT is used to track the number of attempts to send the email.'; +COMMENT ON COLUMN oats_email_notifications.email_notification_id IS E'System generated sequence number to uniquely identify an EMAIL NOTIFICATION'; +COMMENT ON COLUMN oats_email_notifications.status_message IS E'STATUS MESSAGE is a message which could be used to debug why an email could not be sent.'; +COMMENT ON COLUMN oats_email_notifications.bcc_addresses IS E'BCC ADDRESSES is a semicolon separated list of email addresses to BCC the email to.'; +COMMENT ON COLUMN oats_email_notifications.email_status_code IS E'EMAIL STATUS CODE is a unique code used to identify the status of an email notification.'; +COMMENT ON COLUMN oats_email_notifications.email_type_code IS E'EMAIL TYPE CODE is a unique code used to identify the type of email notification.'; +COMMENT ON COLUMN oats_email_notifications.sent_date IS E'SENT DATE is the date the email was sent.'; +COMMENT ON COLUMN oats_email_notifications.when_updated IS E'WHEN UPDATED is the date/time that the record was last updated.'; +COMMENT ON COLUMN oats_email_notifications.who_created IS E'WHO CREATED is the IDIR or Oracle userid of the person who created the record.'; +COMMENT ON COLUMN oats_email_notifications.to_addresses IS E'TO ADDRESSES is a semicolon separated list of email addresses to send the email to.'; +COMMENT ON COLUMN oats_email_notifications.who_updated IS E'WHO UPDATED is the IDIR or Oracle userid of the person who last updated the record.'; +COMMENT ON COLUMN oats_email_notifications.when_created IS E'WHEN CREATED is the date/time that the record was created.'; +COMMENT ON COLUMN oats_email_notifications.cc_addresses IS E'CC ADDRESSES is a semicolon separated list of email addresses to CC the email to.'; +COMMENT ON COLUMN oats_email_notifications.reply_to_address IS E'REPLY TO ADDRESS is an email address to send a reply to.'; +COMMENT ON COLUMN oats_email_notifications.alr_application_id IS E'System generated sequence number to uniquely identify an ALR APPLICATION. This is also used as the ALR APPLICATION''S external reference number.'; +COMMENT ON COLUMN oats_email_notifications.email_subject IS E'EMAIL SUBJECT is the subject of the email'; +COMMENT ON COLUMN oats_email_notifications.email_text IS E'EMAIL TEXT is the body of the email'; +COMMENT ON COLUMN oats_email_notifications.revision_count IS E'REVISION COUNT is used by Hibernate to control optimistic locking'; +CREATE INDEX oats_en_appl_fk_i ON oats_email_notifications (alr_application_id); +CREATE INDEX oats_en_etc_fk_i ON oats_email_notifications (email_type_code); +CREATE INDEX oats_en_esc_fk_i ON oats_email_notifications (email_status_code); +ALTER TABLE oats_email_notifications ADD PRIMARY KEY (email_notification_id); + +CREATE TABLE oats_alr_applications ( + alr_application_id bigint NOT NULL, + application_class_code varchar(10) NOT NULL, + legacy_application_nbr varchar(10), + submitted_to_alc_date timestamp, + proposal_summary_desc varchar(4000), + proposal_background_desc varchar(4000) NOT NULL, + current_land_use_desc varchar(4000) NOT NULL, + applied_fee_amt double precision NOT NULL, + fee_waived_ind varchar(1) NOT NULL, + fee_received_date timestamp, + split_fee_with_local_gov_ind varchar(1) NOT NULL, + staff_comment_observations varchar(4000), + reclamation_measure_desc varchar(4000), + equipment_desc varchar(4000), + on_site_processing_ind varchar(1), + agrologist_plan_ind varchar(1), + project_end_date timestamp, + agricultural_improvement_desc varchar(4000), + non_agricultural_uses_desc varchar(4000), + buildings_desc varchar(4000), + created_date timestamp, + created_guid varchar(32), + submitted_to_lg_date timestamp, + submitted_to_lg_guid varchar(32), + accepted_by_lg_date timestamp, + accepted_by_lg_guid varchar(32), + submitted_to_alc_guid varchar(32), + cancelled_date timestamp, + cancelled_guid varchar(32), + rejected_by_lg_date timestamp, + rejected_by_lg_guid varchar(32), + validated_date timestamp, + validated_guid varchar(32), + zone smallint NOT NULL DEFAULT 1, + economic_values_desc varchar(4000), + cultural_values_desc varchar(4000), + social_values_desc varchar(4000), + regional_planning_desc varchar(4000), + alc_staff_id bigint, + mask_period smallint NOT NULL DEFAULT 2, + followup_noi_ind varchar(1), + followup_noi_number integer, + ministry_notice_ind varchar(1), + ministry_notice_ref_no varchar(100), + audited_ind varchar(1), + applicant_file_no varchar(30), + terms varchar(4000), + plan_no varchar(500), + control_no varchar(500), + email_response_date timestamp, + srw_ind varchar(1), + who_created varchar(32) NOT NULL, + when_created timestamp NOT NULL, + who_updated varchar(32), + when_updated timestamp, + revision_count bigint NOT NULL DEFAULT 0 +) ; +COMMENT ON TABLE oats_alr_applications IS E'The Agricultural Land Reserve regulation allows a land owner to submit a NOTICE OF INTENT as opposed to a full SOIL CHANGE APPLICATION, if the specific criteria of the regulation are met, to remove soil or place fill, or both. The Commission may allow the change to be made as is, impose CONDITIONS, or request a full SOIL CHANGE APPLICATION to be submitted. A SOIL CHANGE is a specific type of ALR APPLICATION where the applicant is requesting to remove soil, add fill, or any combination there of.An ALR APPLICATION is the procedural instrument by which people, organizations, local governments (Regional Districts or Municipalities), the Agricultural Land Commission, and the Provincial Government of B.C. make requests to affect changes to the Agricultural Land Reserve (ALR). The following component changes can be requested either individually or together under a single ALR APPLICATION: - Include land in the ALR - Exclude land from the ALR - Subdivide land in the ALR - Non-farm use (which includes removing soil and adding fill)'; +COMMENT ON COLUMN oats_alr_applications.regional_planning_desc IS E'Describes the regional and community planning objectives relating to the application.'; +COMMENT ON COLUMN oats_alr_applications.fee_received_date IS E'Date the fee was received by the ALC.'; +COMMENT ON COLUMN oats_alr_applications.staff_comment_observations IS E'Comments supplied by staff that will appear on the Staff Report'; +COMMENT ON COLUMN oats_alr_applications.social_values_desc IS E'Describes the social values relating to the application.'; +COMMENT ON COLUMN oats_alr_applications.plan_no IS E'The plan numbers were provided by applicant for SRW.'; +COMMENT ON COLUMN oats_alr_applications.zone IS E'The zone of the local government relating to the application.'; +COMMENT ON COLUMN oats_alr_applications.control_no IS E'The control numbers were provided by applicant for SRW.'; +COMMENT ON COLUMN oats_alr_applications.alr_application_id IS E'System generated sequence number to uniquely identify an ALR APPLICATION. This is also used as the ALR APPLICATION''S external reference number.'; +COMMENT ON COLUMN oats_alr_applications.cancelled_date IS E'The date the application was cancelled'; +COMMENT ON COLUMN oats_alr_applications.proposal_background_desc IS E'A detailed description of the application''s proposed objectives, motivations, and any other supporting information.'; +COMMENT ON COLUMN oats_alr_applications.srw_ind IS E'Indicates whether or not the application is notification of SRW.'; +COMMENT ON COLUMN oats_alr_applications.non_agricultural_uses_desc IS E'Describes the non agricultural use relating to the application.'; +COMMENT ON COLUMN oats_alr_applications.ministry_notice_ind IS E'Indicates whether or not the applicant have submitted a notice of work to the Ministry of Energy and Mines.'; +COMMENT ON COLUMN oats_alr_applications.cancelled_guid IS E'The GUID of the agent who cancelled the applicaiton'; +COMMENT ON COLUMN oats_alr_applications.current_land_use_desc IS E'A description of all uses currently conducted on the land as authored by the applicant.'; +COMMENT ON COLUMN oats_alr_applications.project_end_date IS E'Date the applicant plans to cease the soil removal or land fill'; +COMMENT ON COLUMN oats_alr_applications.application_class_code IS E'System developer supplied value to uniquely identify an APPLICATION CLASS CODE'; +COMMENT ON COLUMN oats_alr_applications.created_guid IS E'The GUID of the applicant'; +COMMENT ON COLUMN oats_alr_applications.when_created IS E'WHEN CREATED is the date/time that the record was created.'; +COMMENT ON COLUMN oats_alr_applications.fee_waived_ind IS E'Indicates whether or not the application fee was waived. If yes than any monies collected for the application is returned.'; +COMMENT ON COLUMN oats_alr_applications.ministry_notice_ref_no IS E'Tracking or reference number that the applicant have submitted a notice of work to the Ministry of Energy and Mines.'; +COMMENT ON COLUMN oats_alr_applications.accepted_by_lg_guid IS E'The GUID of the agent who accepted the applicaiton on behalf of the Local Government'; +COMMENT ON COLUMN oats_alr_applications.validated_guid IS E'The GUID of the applicant'; +COMMENT ON COLUMN oats_alr_applications.rejected_by_lg_date IS E'The date the application was rejected by the ALC'; +COMMENT ON COLUMN oats_alr_applications.split_fee_with_local_gov_ind IS E'Indicates whether or not the application fee should be split with the local government. If this is yes, half the fee amount is given to the local government.'; +COMMENT ON COLUMN oats_alr_applications.cultural_values_desc IS E'Describes the cultural values relating to the application.'; +COMMENT ON COLUMN oats_alr_applications.economic_values_desc IS E'Describes the economic values relating to the application.'; +COMMENT ON COLUMN oats_alr_applications.validated_date IS E'The date the application was validated by the applicant'; +COMMENT ON COLUMN oats_alr_applications.submitted_to_lg_date IS E'The date the application was submitted to the Local Government'; +COMMENT ON COLUMN oats_alr_applications.who_created IS E'WHO CREATED is the IDIR or Oracle userid of the person who created the record.'; +COMMENT ON COLUMN oats_alr_applications.when_updated IS E'WHEN UPDATED is the date/time that the record was last updated.'; +COMMENT ON COLUMN oats_alr_applications.accepted_by_lg_date IS E'The date the application was accepted by the Local Government'; +COMMENT ON COLUMN oats_alr_applications.rejected_by_lg_guid IS E'The GUID of the agent who rejected the applicaiton on behalf of the ALC'; +COMMENT ON COLUMN oats_alr_applications.on_site_processing_ind IS E'Indicates whether or not equipment will be on site processing the soil'; +COMMENT ON COLUMN oats_alr_applications.legacy_application_nbr IS E'The application number of an older application that does not match the format of APPLICATION ID.'; +COMMENT ON COLUMN oats_alr_applications.applied_fee_amt IS E'The amount of money collected as the application fee for this ALR APPLICATION. This may differ from APPLICATION CLASS CODE . FEE AMT, if the standard default amount changes.'; +COMMENT ON COLUMN oats_alr_applications.reclamation_measure_desc IS E'Description of how the applicant proposes to reclaim the soil for agricultural purposes'; +COMMENT ON COLUMN oats_alr_applications.agricultural_improvement_desc IS E'Describes the agricultural improvements relating to the application.'; +COMMENT ON COLUMN oats_alr_applications.submitted_to_alc_date IS E'Date the application was received by the ALC office'; +COMMENT ON COLUMN oats_alr_applications.terms IS E'The terms were provided by applicant for SRW.'; +COMMENT ON COLUMN oats_alr_applications.agrologist_plan_ind IS E'Indicates whether or not an agrologist developed a plan for the soil change'; +COMMENT ON COLUMN oats_alr_applications.created_date IS E'The date the applicaiton was created by the applicant'; +COMMENT ON COLUMN oats_alr_applications.applicant_file_no IS E'The file number was provided by applicant.'; +COMMENT ON COLUMN oats_alr_applications.who_updated IS E'WHO UPDATED is the IDIR or Oracle userid of the person who last updated the record.'; +COMMENT ON COLUMN oats_alr_applications.audited_ind IS E'Indicates whether or not the application have been audited/reviewed by an ALC staff.'; +COMMENT ON COLUMN oats_alr_applications.email_response_date IS E'The date the email was responded by the ALC office.'; +COMMENT ON COLUMN oats_alr_applications.buildings_desc IS E'Describes the buildings relating to the application.'; +COMMENT ON COLUMN oats_alr_applications.alc_staff_id IS E'System generated sequence number to uniquely identify an ALC staff.'; +COMMENT ON COLUMN oats_alr_applications.followup_noi_ind IS E'Indicates whether or not the application as a follow-up to a Notice of Intent (NOI).'; +COMMENT ON COLUMN oats_alr_applications.followup_noi_number IS E'Notice of Intent (NOI) number relating to the application.'; +COMMENT ON COLUMN oats_alr_applications.mask_period IS E'The number of days the application is masked after a decision is made.'; +COMMENT ON COLUMN oats_alr_applications.equipment_desc IS E'Description of the proposed equipment that will be used to make affect the soil change'; +COMMENT ON COLUMN oats_alr_applications.revision_count IS E'REVISION COUNT is used by Hibernate to control optimistic locking'; +COMMENT ON COLUMN oats_alr_applications.proposal_summary_desc IS E'A detailed description of the application''s proposed objectives, as authored by the applicant.'; +COMMENT ON COLUMN oats_alr_applications.submitted_to_alc_guid IS E'The date the application was accepted by the ALC'; +COMMENT ON COLUMN oats_alr_applications.submitted_to_lg_guid IS E'The GUID of the applicant who submitted to the Local Government'; +CREATE INDEX oats_appl_salcd_i ON oats_alr_applications (submitted_to_alc_date); +CREATE INDEX oats_appl_algd_i ON oats_alr_applications (accepted_by_lg_date); +CREATE INDEX oats_appl_crguid_i ON oats_alr_applications (created_guid); +CREATE INDEX oats_appl_rlgd_i ON oats_alr_applications (rejected_by_lg_date); +CREATE INDEX oats_appl_crd_i ON oats_alr_applications (created_date); +CREATE INDEX oats_appl_slgd_i ON oats_alr_applications (submitted_to_lg_date); +ALTER TABLE oats_alr_applications ADD PRIMARY KEY (alr_application_id); +ALTER TABLE oats_alr_applications ADD CONSTRAINT oats_appl_fwi_ck CHECK (FEE_WAIVED_IND IN ('Y', 'N')); +ALTER TABLE oats_alr_applications ADD CONSTRAINT oats_appl_sfwlgi_ck CHECK (SPLIT_FEE_WITH_LOCAL_GOV_IND IN ('Y', 'N')); +ALTER TABLE oats_alr_applications ADD CONSTRAINT oats_appl_fni_ck CHECK (followup_noi_ind IN ('Y', 'N')); +ALTER TABLE oats_alr_applications ADD CONSTRAINT oats_appl_api_ck CHECK (AGROLOGIST_PLAN_IND IN ('Y', 'N')); +ALTER TABLE oats_alr_applications ADD CONSTRAINT oats_appl_mni_ck CHECK (ministry_notice_ind IN ('Y', 'N')); +ALTER TABLE oats_alr_applications ADD CONSTRAINT oats_appl_acc_ck CHECK (APPLICATION_CLASS_CODE IN ('LOA', 'BLK', 'SCH', 'NOI','NAN')); +ALTER TABLE oats_alr_applications ADD CONSTRAINT oats_appl_ospi_ck CHECK (ON_SITE_PROCESSING_IND IN ('Y', 'N')); +ALTER TABLE oats_alr_applications ADD CONSTRAINT oats_appl_srw_ck CHECK (srw_ind IN ('Y')); + +CREATE TABLE oats_related_alr_applications ( + related_alr_application_id bigint NOT NULL, + primary_alr_application_id bigint NOT NULL, + secondary_alr_application_id bigint NOT NULL, + relationship_code varchar(10) NOT NULL, + include_in_staff_report_ind varchar(1) NOT NULL, + note varchar(4000), + who_created varchar(32) NOT NULL, + when_created timestamp NOT NULL, + who_updated varchar(32), + when_updated timestamp, + revision_count bigint NOT NULL DEFAULT 0 +) ; +COMMENT ON TABLE oats_related_alr_applications IS E'A RELATED APPLICATION is the association of one ALR APPLICATION to another.'; +COMMENT ON COLUMN oats_related_alr_applications.primary_alr_application_id IS E'System generated sequence number to uniquely identify an ALR APPLICATION. This is also used as the ALR APPLICATION''S external reference number.'; +COMMENT ON COLUMN oats_related_alr_applications.revision_count IS E'REVISION COUNT is used by Hibernate to control optimistic locking'; +COMMENT ON COLUMN oats_related_alr_applications.when_created IS E'WHEN CREATED is the date/time that the record was created.'; +COMMENT ON COLUMN oats_related_alr_applications.note IS E'Further elaboration of the nature of the relationship between ALR APPLICATIONS.'; +COMMENT ON COLUMN oats_related_alr_applications.related_alr_application_id IS E'System generated sequence number to uniquely identify a RELATED ALR APPLICATION'; +COMMENT ON COLUMN oats_related_alr_applications.include_in_staff_report_ind IS E'Indicates whether or not the related application is included in the ALR APPLICATION''s staff report.If so, the following information will be included in the staff report: Application Number, Applicant name, Decision Date, Proposal Description, and Decision Description'; +COMMENT ON COLUMN oats_related_alr_applications.when_updated IS E'WHEN UPDATED is the date/time that the record was last updated.'; +COMMENT ON COLUMN oats_related_alr_applications.who_created IS E'WHO CREATED is the IDIR or Oracle userid of the person who created the record.'; +COMMENT ON COLUMN oats_related_alr_applications.who_updated IS E'WHO UPDATED is the IDIR or Oracle userid of the person who last updated the record.'; +COMMENT ON COLUMN oats_related_alr_applications.secondary_alr_application_id IS E'System generated sequence number to uniquely identify an ALR APPLICATION. This is also used as the ALR APPLICATION''S external reference number.'; +COMMENT ON COLUMN oats_related_alr_applications.relationship_code IS E'User supplied value to uniquely identify a RELATIONSHIP CODE'; +CREATE INDEX oats_rlap_appl_fk_i ON oats_related_alr_applications (primary_alr_application_id); +CREATE INDEX oats_rlap_relc_fk_i ON oats_related_alr_applications (relationship_code); +CREATE INDEX oats_rlap_appl_fk2_i ON oats_related_alr_applications (secondary_alr_application_id); +CREATE UNIQUE INDEX oats_rlap_uk ON oats_related_alr_applications (primary_alr_application_id, secondary_alr_application_id); +ALTER TABLE oats_related_alr_applications ADD PRIMARY KEY (related_alr_application_id); +ALTER TABLE oats_related_alr_applications ADD UNIQUE (primary_alr_application_id,secondary_alr_application_id); +ALTER TABLE oats_related_alr_applications ADD CONSTRAINT avcon_1238100890_inclu_000 CHECK (INCLUDE_IN_STAFF_REPORT_IND IN ('Y', 'N')); + +CREATE TABLE oats_alc_staffs ( + alc_staff_id bigint NOT NULL, + login varchar(32) NOT NULL, + first_name varchar(40) NOT NULL, + last_name varchar(40) NOT NULL, + email varchar(1000) NOT NULL, + department varchar(100) NOT NULL, + who_created varchar(32) NOT NULL, + when_created timestamp NOT NULL, + who_updated varchar(32), + when_updated timestamp, + revision_count bigint NOT NULL DEFAULT 0 +) ; +COMMENT ON TABLE oats_alc_staffs IS E'Stores the list of ALC staffs that can be assigned to an application.'; +COMMENT ON COLUMN oats_alc_staffs.last_name IS E'The LAST NAME is the last name of an ALC staff.'; +COMMENT ON COLUMN oats_alc_staffs.when_created IS E'WHEN CREATED is the date/time that the record was created.'; +COMMENT ON COLUMN oats_alc_staffs.department IS E'The DEPARTMENT is the department which the ALC staff belongs to.'; +COMMENT ON COLUMN oats_alc_staffs.alc_staff_id IS E'System generated sequence number to uniquely identify an ALC staff.'; +COMMENT ON COLUMN oats_alc_staffs.revision_count IS E'REVISION COUNT is used by Hibernate to control optimistic locking'; +COMMENT ON COLUMN oats_alc_staffs.who_updated IS E'WHO UPDATED is the BCEID, IDIR or Oracle userid of the person who last updated the record.'; +COMMENT ON COLUMN oats_alc_staffs.first_name IS E'The FIRST NAME is the first name of an ALC staff.'; +COMMENT ON COLUMN oats_alc_staffs.email IS E'The EMAIL is the email of an ALC staff.'; +COMMENT ON COLUMN oats_alc_staffs.login IS E'The LOGIN is the login of an ALC staff.'; +COMMENT ON COLUMN oats_alc_staffs.when_updated IS E'WHEN UPDATED is the date/time that the record was last updated.'; +COMMENT ON COLUMN oats_alc_staffs.who_created IS E'WHO CREATED is the BCEID, IDIR or Oracle userid of the person who created the record.'; +ALTER TABLE oats_alc_staffs ADD PRIMARY KEY (alc_staff_id); + +CREATE TABLE oats_email_type_codes ( + email_type_code varchar(10) NOT NULL, + description varchar(100) NOT NULL, + who_created varchar(32) NOT NULL, + when_created timestamp NOT NULL, + who_updated varchar(32), + when_updated timestamp, + revision_count bigint NOT NULL DEFAULT 0 +) ; +COMMENT ON COLUMN oats_email_type_codes.who_created IS E'WHO CREATED is the IDIR or Oracle userid of the person who created the record.'; +COMMENT ON COLUMN oats_email_type_codes.when_updated IS E'WHEN UPDATED is the date/time that the record was last updated.'; +COMMENT ON COLUMN oats_email_type_codes.email_type_code IS E'EMAIL TYPE CODE is a unique code used to identify the type of email notification.'; +COMMENT ON COLUMN oats_email_type_codes.description IS E'DESCRIPTION is a textual description of the code value.'; +COMMENT ON COLUMN oats_email_type_codes.when_created IS E'WHEN CREATED is the date/time that the record was created.'; +COMMENT ON COLUMN oats_email_type_codes.who_updated IS E'WHO UPDATED is the IDIR or Oracle userid of the person who last updated the record.'; +COMMENT ON COLUMN oats_email_type_codes.revision_count IS E'REVISION COUNT is used by Hibernate to control optimistic locking'; +ALTER TABLE oats_email_type_codes ADD PRIMARY KEY (email_type_code); + +CREATE TABLE oats_local_gov_actions ( + local_gov_action_id bigint NOT NULL, + alr_application_id bigint NOT NULL, + local_gov_action_code varchar(10) NOT NULL, + completion_date timestamp NOT NULL, + who_created varchar(32) NOT NULL, + when_created timestamp NOT NULL, + who_updated varchar(32), + when_updated timestamp, + revision_count bigint NOT NULL DEFAULT 0 +) ; +COMMENT ON TABLE oats_local_gov_actions IS E'A LOCAL GOV ACTION is the assertion that a specific LOCAL GOV ACTION CODE item has been completed for the ALR APPLICATION.'; +COMMENT ON COLUMN oats_local_gov_actions.revision_count IS E'REVISION COUNT is used by Hibernate to control optimistic locking'; +COMMENT ON COLUMN oats_local_gov_actions.who_updated IS E'WHO UPDATED is the IDIR or Oracle userid of the person who last updated the record.'; +COMMENT ON COLUMN oats_local_gov_actions.alr_application_id IS E'System generated sequence number to uniquely identify an ALR APPLICATION. This is also used as the ALR APPLICATION''S external reference number.'; +COMMENT ON COLUMN oats_local_gov_actions.local_gov_action_code IS E'User supplied value to uniquely identify a LOCAL GOV ACTION CODE'; +COMMENT ON COLUMN oats_local_gov_actions.when_updated IS E'WHEN UPDATED is the date/time that the record was last updated.'; +COMMENT ON COLUMN oats_local_gov_actions.who_created IS E'WHO CREATED is the IDIR or Oracle userid of the person who created the record.'; +COMMENT ON COLUMN oats_local_gov_actions.local_gov_action_id IS E'System generated sequence number to uniquely identify a LOCAL GOV ACTION'; +COMMENT ON COLUMN oats_local_gov_actions.when_created IS E'WHEN CREATED is the date/time that the record was created.'; +COMMENT ON COLUMN oats_local_gov_actions.completion_date IS E'The date the Local government completed the action.'; +CREATE INDEX oats_lact_lgac_fk_i ON oats_local_gov_actions (local_gov_action_code); +CREATE INDEX oats_lact_appl_fk_i ON oats_local_gov_actions (alr_application_id); +CREATE UNIQUE INDEX oats_lact_uk ON oats_local_gov_actions (alr_application_id, local_gov_action_code); +ALTER TABLE oats_local_gov_actions ADD PRIMARY KEY (local_gov_action_id); +ALTER TABLE oats_local_gov_actions ADD UNIQUE (alr_application_id,local_gov_action_code); + +CREATE TABLE oats_email_status_codes ( + email_status_code varchar(10) NOT NULL, + description varchar(100) NOT NULL, + who_created varchar(32) NOT NULL, + when_created timestamp NOT NULL, + who_updated varchar(32), + when_updated timestamp, + revision_count bigint NOT NULL DEFAULT 0 +) ; +COMMENT ON COLUMN oats_email_status_codes.when_created IS E'WHEN CREATED is the date/time that the record was created.'; +COMMENT ON COLUMN oats_email_status_codes.description IS E'DESCRIPTION is a textual description of the code value.'; +COMMENT ON COLUMN oats_email_status_codes.email_status_code IS E'EMAIL STATUS CODE is a unique code used to identify the status of an email notification.'; +COMMENT ON COLUMN oats_email_status_codes.when_updated IS E'WHEN UPDATED is the date/time that the record was last updated.'; +COMMENT ON COLUMN oats_email_status_codes.who_created IS E'WHO CREATED is the IDIR or Oracle userid of the person who created the record.'; +COMMENT ON COLUMN oats_email_status_codes.revision_count IS E'REVISION COUNT is used by Hibernate to control optimistic locking'; +COMMENT ON COLUMN oats_email_status_codes.who_updated IS E'WHO UPDATED is the IDIR or Oracle userid of the person who last updated the record.'; +ALTER TABLE oats_email_status_codes ADD PRIMARY KEY (email_status_code); + +CREATE TABLE oats_planning_review_notes ( + planning_review_note_id bigint NOT NULL, + planning_review_id bigint NOT NULL, + note_date timestamp NOT NULL, + note_text varchar(4000) NOT NULL, + who_created varchar(32) NOT NULL, + when_created timestamp NOT NULL, + who_updated varchar(32), + when_updated timestamp, + revision_count bigint NOT NULL DEFAULT 0 +) ; +COMMENT ON TABLE oats_planning_review_notes IS E'A PLANNING REVIEW NOTE is the noting of an event that has occurred during examination of a PLANNING REVIEW.'; +COMMENT ON COLUMN oats_planning_review_notes.when_created IS E'WHEN CREATED is the date/time that the record was created.'; +COMMENT ON COLUMN oats_planning_review_notes.note_text IS E'Text of the note'; +COMMENT ON COLUMN oats_planning_review_notes.note_date IS E'Date the note was made.'; +COMMENT ON COLUMN oats_planning_review_notes.planning_review_id IS E'System generated sequence number to uniquely identify a PLANNING REVIEW'; +COMMENT ON COLUMN oats_planning_review_notes.planning_review_note_id IS E'System generated sequence number to uniquely identify a PLANNING REVIEW NOTE'; +COMMENT ON COLUMN oats_planning_review_notes.who_created IS E'WHO CREATED is the IDIR or Oracle userid of the person who created the record.'; +COMMENT ON COLUMN oats_planning_review_notes.when_updated IS E'WHEN UPDATED is the date/time that the record was last updated.'; +COMMENT ON COLUMN oats_planning_review_notes.who_updated IS E'WHO UPDATED is the IDIR or Oracle userid of the person who last updated the record.'; +COMMENT ON COLUMN oats_planning_review_notes.revision_count IS E'REVISION COUNT is used by Hibernate to control optimistic locking'; +CREATE INDEX oats_plrn_plrv_fk_i ON oats_planning_review_notes (planning_review_id); +ALTER TABLE oats_planning_review_notes ADD PRIMARY KEY (planning_review_note_id); + +CREATE TABLE oats_accomplishments ( + accomplishment_id bigint NOT NULL, + alr_application_id bigint NOT NULL, + accomplishment_code varchar(10) NOT NULL, + completion_date timestamp NOT NULL, + who_created varchar(32) NOT NULL, + when_created timestamp NOT NULL, + who_updated varchar(32), + when_updated timestamp, + revision_count bigint NOT NULL DEFAULT 0 +) ; +COMMENT ON TABLE oats_accomplishments IS E'An ALR ACCOMPLISHMENT is the declaration a specific ACCOMPLISHMENT CODE has been completed for an ALR APPLICATION.'; +COMMENT ON COLUMN oats_accomplishments.revision_count IS E'REVISION COUNT is used by Hibernate to control optimistic locking'; +COMMENT ON COLUMN oats_accomplishments.who_updated IS E'WHO UPDATED is the IDIR or Oracle userid of the person who last updated the record.'; +COMMENT ON COLUMN oats_accomplishments.alr_application_id IS E'System generated sequence number to uniquely identify an ALR APPLICATION. This is also used as the ALR APPLICATION''S external reference number.'; +COMMENT ON COLUMN oats_accomplishments.when_updated IS E'WHEN UPDATED is the date/time that the record was last updated.'; +COMMENT ON COLUMN oats_accomplishments.who_created IS E'WHO CREATED is the IDIR or Oracle userid of the person who created the record.'; +COMMENT ON COLUMN oats_accomplishments.accomplishment_id IS E'System generated sequence number to uniquely identify an ACCOMPLISHMENT'; +COMMENT ON COLUMN oats_accomplishments.accomplishment_code IS E'User supplied value to uniquely identify an ACCOMPLISHMENT CODE'; +COMMENT ON COLUMN oats_accomplishments.when_created IS E'WHEN CREATED is the date/time that the record was created.'; +COMMENT ON COLUMN oats_accomplishments.completion_date IS E'Date the ACCOMPLISHMENT was completed for an ALR APPLICATION'; +CREATE INDEX oats_acmp_appl_fk_i ON oats_accomplishments (alr_application_id); +CREATE INDEX oats_acmp_accd_fk_i ON oats_accomplishments (accomplishment_code); +CREATE UNIQUE INDEX oats_acmp_uk ON oats_accomplishments (alr_application_id, accomplishment_code); +ALTER TABLE oats_accomplishments ADD UNIQUE (alr_application_id,accomplishment_code); +ALTER TABLE oats_accomplishments ADD PRIMARY KEY (accomplishment_id); + +CREATE TABLE oats_subject_properties ( + subject_property_id bigint NOT NULL, + property_id bigint NOT NULL, + alr_application_id bigint, + issue_id bigint, + alr_application_land_ind varchar(1) NOT NULL, + purchase_date timestamp, + alr_area double precision, + farm_land_ind varchar(1), + who_created varchar(32) NOT NULL, + when_created timestamp NOT NULL, + who_updated varchar(32), + when_updated timestamp, + revision_count bigint NOT NULL DEFAULT 0 +) ; +COMMENT ON TABLE oats_subject_properties IS E'A SUBJECT PROPERTY is the inclusion of a specific PROPERTY indicating it is the subject of an ALR APPLICATION or an ISSUE.'; +COMMENT ON COLUMN oats_subject_properties.when_created IS E'WHEN CREATED is the date/time that the record was created.'; +COMMENT ON COLUMN oats_subject_properties.alr_area IS E'Amount of area the PROPERTY that is in the ALR'; +COMMENT ON COLUMN oats_subject_properties.alr_application_id IS E'System generated sequence number to uniquely identify an ALR APPLICATION. This is also used as the ALR APPLICATION''S external reference number.'; +COMMENT ON COLUMN oats_subject_properties.revision_count IS E'REVISION COUNT is used by Hibernate to control optimistic locking'; +COMMENT ON COLUMN oats_subject_properties.subject_property_id IS E'System generated sequence number to uniquely identify a SUBJECT PROPERTY'; +COMMENT ON COLUMN oats_subject_properties.farm_land_ind IS E'Indicates if the property is farm land.'; +COMMENT ON COLUMN oats_subject_properties.issue_id IS E'System generated sequence number to uniquely identify an ISSUE'; +COMMENT ON COLUMN oats_subject_properties.purchase_date IS E'Date the land was purchased by the land owner. Only the month and year are recorded, the day is truncated to 1'; +COMMENT ON COLUMN oats_subject_properties.who_created IS E'WHO CREATED is the IDIR or Oracle userid of the person who created the record.'; +COMMENT ON COLUMN oats_subject_properties.alr_application_land_ind IS E'Indicates whether or not this is land under ALR APPLICATION or at ISSUE. No indicates the land is other land owned by the applicant within the local government which may be of interest.'; +COMMENT ON COLUMN oats_subject_properties.when_updated IS E'WHEN UPDATED is the date/time that the record was last updated.'; +COMMENT ON COLUMN oats_subject_properties.property_id IS E'System generated sequence number to uniquely identify a PROPERTY'; +COMMENT ON COLUMN oats_subject_properties.who_updated IS E'WHO UPDATED is the IDIR or Oracle userid of the person who last updated the record.'; +ALTER TABLE oats_subject_properties ADD PRIMARY KEY (subject_property_id); +ALTER TABLE oats_subject_properties ADD CONSTRAINT oats_sbjp_aali_chk CHECK (ALR_APPLICATION_LAND_IND IN ('Y', 'N')); +ALTER TABLE oats_subject_properties ADD CONSTRAINT oats_sbjp_chk CHECK ((alr_application_id IS NOT NULL AND issue_id IS NULL) +OR (alr_application_id IS NULL AND issue_id IS NOT NULL)); +ALTER TABLE oats_subject_properties ADD CONSTRAINT oats_sp_isfi_000 CHECK (farm_land_ind in ('Y', 'N')); + +CREATE TABLE oats_map_amendment_periods ( + amendment_year smallint NOT NULL, + amendment_period smallint NOT NULL, + start_date timestamp NOT NULL, + end_date timestamp NOT NULL, + who_created varchar(32) NOT NULL, + when_created timestamp NOT NULL, + who_updated varchar(32), + when_updated timestamp, + revision_count bigint NOT NULL DEFAULT 0 +) ; +COMMENT ON TABLE oats_map_amendment_periods IS E'The Commission updates the official Agricultural Land Maps applying all inclusion and exclusion changes on a prescribed schedule. A MAP AMENDMENT PERIOD is a timeframe in which all inclusion and exclusion decisions that were approved outright or all CONDITIONS have been met where applied to the ALR map. There are 4 periods per year, each covering 3 months starting on January.'; +COMMENT ON COLUMN oats_map_amendment_periods.end_date IS E'The calendar end date of the MAP AMENDMENT PERIOD'; +COMMENT ON COLUMN oats_map_amendment_periods.who_created IS E'WHO CREATED is the IDIR or Oracle userid of the person who created the record.'; +COMMENT ON COLUMN oats_map_amendment_periods.amendment_period IS E'The period of the MAP AMENDMENT PERIOD'; +COMMENT ON COLUMN oats_map_amendment_periods.when_updated IS E'WHEN UPDATED is the date/time that the record was last updated.'; +COMMENT ON COLUMN oats_map_amendment_periods.start_date IS E'The calendar start date of the MAP AMENDMENT PERIOD'; +COMMENT ON COLUMN oats_map_amendment_periods.who_updated IS E'WHO UPDATED is the IDIR or Oracle userid of the person who last updated the record.'; +COMMENT ON COLUMN oats_map_amendment_periods.amendment_year IS E'The year of the MAP AMENDMENT PERIOD'; +COMMENT ON COLUMN oats_map_amendment_periods.revision_count IS E'REVISION COUNT is used by Hibernate to control optimistic locking'; +COMMENT ON COLUMN oats_map_amendment_periods.when_created IS E'WHEN CREATED is the date/time that the record was created.'; +ALTER TABLE oats_map_amendment_periods ADD PRIMARY KEY (amendment_year,amendment_period); + +CREATE TABLE oats_committee_type_codes ( + committee_type_code varchar(10) NOT NULL, + description varchar(100) NOT NULL, + sort_order integer NOT NULL, + system_required_ind varchar(1) NOT NULL, + who_created varchar(32) NOT NULL, + when_created timestamp NOT NULL, + who_updated varchar(32), + when_updated timestamp, + revision_count bigint NOT NULL DEFAULT 0 +) ; +COMMENT ON TABLE oats_committee_type_codes IS E'A COMMITTEE TYPE CODE is the type of committee that can convene to review an ALR APPLICATION. For example: - Electoral Area Director - Board/Council - Agriculture Planning - Other'; +COMMENT ON COLUMN oats_committee_type_codes.revision_count IS E'REVISION COUNT is used by Hibernate to control optimistic locking'; +COMMENT ON COLUMN oats_committee_type_codes.who_updated IS E'WHO UPDATED is the IDIR or Oracle userid of the person who last updated the record.'; +COMMENT ON COLUMN oats_committee_type_codes.committee_type_code IS E'User supplied value to uniquely identify a COMMITTEE TYPE CODE'; +COMMENT ON COLUMN oats_committee_type_codes.when_updated IS E'WHEN UPDATED is the date/time that the record was last updated.'; +COMMENT ON COLUMN oats_committee_type_codes.who_created IS E'WHO CREATED is the IDIR or Oracle userid of the person who created the record.'; +COMMENT ON COLUMN oats_committee_type_codes.description IS E'Description of the COMMITTEE TYPE CODE'; +COMMENT ON COLUMN oats_committee_type_codes.system_required_ind IS E'Indicates whether or not the code is required by the system. If yes, the users would be prevented from updating or deleting the code value.'; +COMMENT ON COLUMN oats_committee_type_codes.sort_order IS E'The relative order in which the COMMITTEE TYPE CODE is displayed to the user.'; +COMMENT ON COLUMN oats_committee_type_codes.when_created IS E'WHEN CREATED is the date/time that the record was created.'; +ALTER TABLE oats_committee_type_codes ADD PRIMARY KEY (committee_type_code); +ALTER TABLE oats_committee_type_codes ADD UNIQUE (sort_order); +ALTER TABLE oats_committee_type_codes ADD CONSTRAINT avcon_1238100890_syste_022 CHECK (SYSTEM_REQUIRED_IND IN ('Y', 'N')); + +CREATE TABLE oats_planning_acceptance_codes ( + planning_acceptance_code varchar(10) NOT NULL, + description varchar(100) NOT NULL, + system_required_ind varchar(1) NOT NULL, + who_created varchar(32) NOT NULL, + when_created timestamp NOT NULL, + who_updated varchar(32), + when_updated timestamp, + revision_count bigint NOT NULL DEFAULT 0 +) ; +COMMENT ON TABLE oats_planning_acceptance_codes IS E'A PLANNING ACCEPTANCE CODE is quantification of a PLANNING DECISION. For example: - Endorsed - Not Endorsed - Partial Endorsement'; +COMMENT ON COLUMN oats_planning_acceptance_codes.when_created IS E'WHEN CREATED is the date/time that the record was created.'; +COMMENT ON COLUMN oats_planning_acceptance_codes.system_required_ind IS E'Indicates whether or not the code is required by the system. If yes, the users would be prevented from updating or deleting the code value.'; +COMMENT ON COLUMN oats_planning_acceptance_codes.description IS E'Description of the PLANNING ACCEPTANCE CODE'; +COMMENT ON COLUMN oats_planning_acceptance_codes.planning_acceptance_code IS E'User supplied value to uniquely identify a PLANNING ACCEPTANCE CODE'; +COMMENT ON COLUMN oats_planning_acceptance_codes.when_updated IS E'WHEN UPDATED is the date/time that the record was last updated.'; +COMMENT ON COLUMN oats_planning_acceptance_codes.who_created IS E'WHO CREATED is the IDIR or Oracle userid of the person who created the record.'; +COMMENT ON COLUMN oats_planning_acceptance_codes.revision_count IS E'REVISION COUNT is used by Hibernate to control optimistic locking'; +COMMENT ON COLUMN oats_planning_acceptance_codes.who_updated IS E'WHO UPDATED is the IDIR or Oracle userid of the person who last updated the record.'; +ALTER TABLE oats_planning_acceptance_codes ADD PRIMARY KEY (planning_acceptance_code); +ALTER TABLE oats_planning_acceptance_codes ADD CONSTRAINT avcon_1238100890_syste_000 CHECK (SYSTEM_REQUIRED_IND IN ('Y', 'N')); + +CREATE TABLE oats_subdiv_parcel_intents ( + subdiv_parcel_intent_id bigint NOT NULL, + alr_appl_component_id bigint NOT NULL, + parcel_area double precision NOT NULL, + subdiv_design_parcel_id bigint, + who_created varchar(32) NOT NULL, + when_created timestamp NOT NULL, + who_updated varchar(32), + when_updated timestamp, + revision_count bigint NOT NULL DEFAULT 0 +) ; +COMMENT ON TABLE oats_subdiv_parcel_intents IS E'A SUBDIV PARCEL INTENT is either a parcel an applicant wishes to create as part of an ALR APPL COMPONENT-NON BOUNDARY CHANGE-SUBDIVISION, or a parcel the Commission has decided could be created. This depends on whether ALR APPL COMPONENT is a proposal component (the relationship from ALR APPLICATION is supplied) or a decision component (the relationship from ALR APPL DECISION is supplied). For each ALR APPL COMPONENT-NON BOUNDARY CHANGE-SUBDIVISION there must be at least two or more SUBDIV PARCEL INTENTS. I.E. the creation of one new parcel always results in two parcels being created, the new parcel and the remainder of the original.The total of SUBDIV PARCEL INTENT . PARCEL SIZE should be the same as the parent ALR APPL COMPONENT''s AREA. A decision SUBDIV PARCEL INTENT is considered to be actualized when a relationship from a SUBDIV DESIGN PARCEL has been established. Note: Two or more SUBDIV PARCEL INTENTS may be actualized by a single SUBDIV DESIGN PARCEL. For example: The decision allows the creation of 4 x 10ha parcels. The applicant submits a survey plan that only creates 2x20ha parcels. The actualization of two of the 10ha parcels will be from one of the 20ha parcels, and the actualization of the other two 10ha parcels will be from the other 20ha parcel. Another example: The decision allows the creation of 2 x 20ha parcels on the northern half of the property and 4 x 10ha lots on the southern half of the property. The applicant submits a survey plan that creates the 2 northern 20ha parcels, but does not explicitly include the southern half of the property. The actualization of the two 20ha parcels will be from the survey plan''s two 20ha parcels. If the applicant does not submit another survey plan before the decision expires, the southern four 10ha lots will be actualized by a by 40ha remainder SUBDIV DESIGN PARCEL (REMAINDER IND = ''Y'').'; +COMMENT ON COLUMN oats_subdiv_parcel_intents.who_created IS E'WHO CREATED is the IDIR or Oracle userid of the person who created the record.'; +COMMENT ON COLUMN oats_subdiv_parcel_intents.when_updated IS E'WHEN UPDATED is the date/time that the record was last updated.'; +COMMENT ON COLUMN oats_subdiv_parcel_intents.who_updated IS E'WHO UPDATED is the IDIR or Oracle userid of the person who last updated the record.'; +COMMENT ON COLUMN oats_subdiv_parcel_intents.subdiv_design_parcel_id IS E'System generated sequence number to uniquely identify a SUBDIV DESIGN PARCEL'; +COMMENT ON COLUMN oats_subdiv_parcel_intents.revision_count IS E'REVISION COUNT is used by Hibernate to control optimistic locking'; +COMMENT ON COLUMN oats_subdiv_parcel_intents.when_created IS E'WHEN CREATED is the date/time that the record was created.'; +COMMENT ON COLUMN oats_subdiv_parcel_intents.alr_appl_component_id IS E'System generated sequence number to uniquely identify an ALR APPL COMPONENT'; +COMMENT ON COLUMN oats_subdiv_parcel_intents.parcel_area IS E'The surface area of the parcel to be created as the result of a subdivision proposed by the applicant or decided by the Commission'; +COMMENT ON COLUMN oats_subdiv_parcel_intents.subdiv_parcel_intent_id IS E'System generated sequence number to uniquely identify a SUBDIV PARCEL INTENT'; +CREATE INDEX oats_sdpi_sddp_fk_i ON oats_subdiv_parcel_intents (subdiv_design_parcel_id); +CREATE INDEX oats_sdpi_apcp_fk_i ON oats_subdiv_parcel_intents (alr_appl_component_id); +ALTER TABLE oats_subdiv_parcel_intents ADD PRIMARY KEY (subdiv_parcel_intent_id); + +CREATE TABLE oats_soil_change_codes ( + soil_change_code varchar(10) NOT NULL, + description varchar(100) NOT NULL, + system_required_ind varchar(1) NOT NULL, + who_created varchar(32) NOT NULL, + when_created timestamp NOT NULL, + who_updated varchar(32), + when_updated timestamp, + revision_count bigint NOT NULL DEFAULT 0 +) ; +COMMENT ON TABLE oats_soil_change_codes IS E'A SOIL CHANGE CODE is a type of change to the soil the Commission can permit within the ALR. For example: - remove soil - add fill'; +COMMENT ON COLUMN oats_soil_change_codes.when_created IS E'WHEN CREATED is the date/time that the record was created.'; +COMMENT ON COLUMN oats_soil_change_codes.description IS E'Description of the SOIL CHANGE CODE'; +COMMENT ON COLUMN oats_soil_change_codes.system_required_ind IS E'Indicates whether or not the code is required by the system. If yes, the users would be prevented from updating or deleting the code value.'; +COMMENT ON COLUMN oats_soil_change_codes.who_created IS E'WHO CREATED is the IDIR or Oracle userid of the person who created the record.'; +COMMENT ON COLUMN oats_soil_change_codes.when_updated IS E'WHEN UPDATED is the date/time that the record was last updated.'; +COMMENT ON COLUMN oats_soil_change_codes.soil_change_code IS E'User supplied value to uniquely identify a SOIL CHANGE CODE'; +COMMENT ON COLUMN oats_soil_change_codes.who_updated IS E'WHO UPDATED is the IDIR or Oracle userid of the person who last updated the record.'; +COMMENT ON COLUMN oats_soil_change_codes.revision_count IS E'REVISION COUNT is used by Hibernate to control optimistic locking'; +ALTER TABLE oats_soil_change_codes ADD PRIMARY KEY (soil_change_code); +ALTER TABLE oats_soil_change_codes ADD CONSTRAINT avcon_1238100890_syste_012 CHECK (SYSTEM_REQUIRED_IND IN ('Y', 'N')); + +CREATE TABLE oats_land_use_permits ( + land_use_permit_id bigint NOT NULL, + alr_application_id bigint NOT NULL, + permit_type_code varchar(10) NOT NULL, + permit_number varchar(50), + issue_date timestamp NOT NULL, + expiry_date timestamp, + description varchar(4000) NOT NULL, + who_created varchar(32) NOT NULL, + when_created timestamp NOT NULL, + who_updated varchar(32), + when_updated timestamp, + revision_count bigint NOT NULL DEFAULT 0 +) ; +COMMENT ON TABLE oats_land_use_permits IS E'A LAND USE PERMIT is the granting of a specific permission by a local government or a provincial government ministry to make changes on property, or allow activities to be conducted. A LAND USE PERMIT may be covering one or more SUBJECT PROPERTIES under the ALR APPLICATION. The ALC only needs to know these permits at the aggregate level of the application, and not against the individual properties.A LAND USE PERMIT may have been issued by contravenes the Act. For example: - A ''Permit'' from a Local Government to allow the construction of a house - A ''Licence'' from a Local Government to allow the operation of a word working shop. - A ''Permit'' from the Ministry of Mines to allow gravel extraction - A ''Permit'' from the Ministry of Environment for waste management'; +COMMENT ON COLUMN oats_land_use_permits.when_updated IS E'WHEN UPDATED is the date/time that the record was last updated.'; +COMMENT ON COLUMN oats_land_use_permits.who_created IS E'WHO CREATED is the IDIR or Oracle userid of the person who created the record.'; +COMMENT ON COLUMN oats_land_use_permits.description IS E'Further description of the LAND USE PERMIT'; +COMMENT ON COLUMN oats_land_use_permits.alr_application_id IS E'System generated sequence number to uniquely identify an ALR APPLICATION. This is also used as the ALR APPLICATION''S external reference number.'; +COMMENT ON COLUMN oats_land_use_permits.permit_number IS E'The reference number assigned to the LAND USE PERMIT by the issuer.'; +COMMENT ON COLUMN oats_land_use_permits.revision_count IS E'REVISION COUNT is used by Hibernate to control optimistic locking'; +COMMENT ON COLUMN oats_land_use_permits.who_updated IS E'WHO UPDATED is the IDIR or Oracle userid of the person who last updated the record.'; +COMMENT ON COLUMN oats_land_use_permits.issue_date IS E'Date the LAND USE PERMIT was issued by the issuer.'; +COMMENT ON COLUMN oats_land_use_permits.permit_type_code IS E'User supplied value to uniquely identify a PERMIT TYPE CODE'; +COMMENT ON COLUMN oats_land_use_permits.when_created IS E'WHEN CREATED is the date/time that the record was created.'; +COMMENT ON COLUMN oats_land_use_permits.land_use_permit_id IS E'System generated sequence number to uniquely identify a LAND USE PERMIT'; +COMMENT ON COLUMN oats_land_use_permits.expiry_date IS E'Date the LAND USE PERMIT expires.'; +CREATE INDEX oats_lupt_appl_fk_i ON oats_land_use_permits (alr_application_id); +CREATE INDEX oats_lupt_pttc_fk_i ON oats_land_use_permits (permit_type_code); +ALTER TABLE oats_land_use_permits ADD PRIMARY KEY (land_use_permit_id); + +CREATE TABLE oats_properties ( + property_id bigint NOT NULL, + pid integer, + pin integer, + legal_description varchar(4000), + civic_address varchar(100), + title_number varchar(15), + area_size double precision NOT NULL, + who_created varchar(32) NOT NULL, + when_created timestamp NOT NULL, + who_updated varchar(32), + when_updated timestamp, + revision_count bigint NOT NULL DEFAULT 0 +) ; +COMMENT ON TABLE oats_properties IS E'A PROPERTY is a delineated piece of land that can be identified by the Land Titles Office by its P.I.D. (Property Identifier), or is Crown land that can be identified by its P.I.N. (Parcel Identification Number), or other land the can be identified by a legal description.'; +COMMENT ON COLUMN oats_properties.title_number IS E'The Land Titles assigned title number associated with a PID'; +COMMENT ON COLUMN oats_properties.revision_count IS E'REVISION COUNT is used by Hibernate to control optimistic locking'; +COMMENT ON COLUMN oats_properties.legal_description IS E'The LEGAL DESCRIPTION uniquely defines a parcel of land typically based on its system of survey, but may include other references or even a metes and bounds narrative. The most common system of survey description consists of a hierarchy of parcel names and values (e.g. lot number, block number), primary land act parcel (e.g. District Lot), land district, registered survey plan, and possibly exceptions.'; +COMMENT ON COLUMN oats_properties.pin IS E'The unique Parcel Identification Number for surveyed Crown parcels.'; +COMMENT ON COLUMN oats_properties.civic_address IS E'The free form civic address for the property where and when available'; +COMMENT ON COLUMN oats_properties.area_size IS E'The area of the PROPERTY'; +COMMENT ON COLUMN oats_properties.when_created IS E'WHEN CREATED is the date/time that the record was created.'; +COMMENT ON COLUMN oats_properties.who_updated IS E'WHO UPDATED is the IDIR or Oracle userid of the person who last updated the record.'; +COMMENT ON COLUMN oats_properties.when_updated IS E'WHEN UPDATED is the date/time that the record was last updated.'; +COMMENT ON COLUMN oats_properties.who_created IS E'WHO CREATED is the IDIR or Oracle userid of the person who created the record.'; +COMMENT ON COLUMN oats_properties.property_id IS E'System generated sequence number to uniquely identify a PROPERTY'; +COMMENT ON COLUMN oats_properties.pid IS E'Land Title Parcel identifier, displayed in the format 999-999-999'; +ALTER TABLE oats_properties ADD PRIMARY KEY (property_id); + +CREATE TABLE oats_rsdntl_use_type_codes ( + rsdntl_use_type_code varchar(10) NOT NULL, + description varchar(100) NOT NULL, + system_required_ind varchar(1) NOT NULL, + who_created varchar(32) NOT NULL, + when_created timestamp NOT NULL, + who_updated varchar(32), + when_updated timestamp, + revision_count bigint NOT NULL DEFAULT 0 +) ; +COMMENT ON TABLE oats_rsdntl_use_type_codes IS E'A RSDNTL USE TYPE CODE is a broad categorization of Non-Adhering Residential Use of land.'; +COMMENT ON COLUMN oats_rsdntl_use_type_codes.rsdntl_use_type_code IS E'User supplied value to uniquely identify a RSDNTL USE TYPE CODE'; +COMMENT ON COLUMN oats_rsdntl_use_type_codes.when_created IS E'WHEN CREATED is the date/time that the record was created.'; +COMMENT ON COLUMN oats_rsdntl_use_type_codes.revision_count IS E'REVISION COUNT is used by Hibernate to control optimistic locking'; +COMMENT ON COLUMN oats_rsdntl_use_type_codes.who_updated IS E'WHO UPDATED is the BCEID, IDIR or Oracle userid of the person who last updated the record.'; +COMMENT ON COLUMN oats_rsdntl_use_type_codes.when_updated IS E'WHEN UPDATED is the date/time that the record was last updated.'; +COMMENT ON COLUMN oats_rsdntl_use_type_codes.who_created IS E'WHO CREATED is the BCEID, IDIR or Oracle userid of the person who created the record.'; +COMMENT ON COLUMN oats_rsdntl_use_type_codes.description IS E'Description of the RSDNTL USE TYPE CODE'; +COMMENT ON COLUMN oats_rsdntl_use_type_codes.system_required_ind IS E'Indicates whether or not the code is required by the system. If yes, the users would be prevented from updating or deleting the code value.'; +ALTER TABLE oats_rsdntl_use_type_codes ADD PRIMARY KEY (rsdntl_use_type_code); + +CREATE TABLE oats_exclsn_app_type_codes ( + exclsn_app_type_code varchar(10) NOT NULL, + description varchar(100) NOT NULL, + system_required_ind varchar(1) NOT NULL, + who_created varchar(32) NOT NULL, + when_created timestamp NOT NULL, + who_updated varchar(32), + when_updated timestamp, + revision_count bigint NOT NULL DEFAULT 0 +) ; +COMMENT ON TABLE oats_exclsn_app_type_codes IS E'A EXCLSN APP TYPE CODE is a broad categorization of Exclusion Applicant Type.'; +COMMENT ON COLUMN oats_exclsn_app_type_codes.system_required_ind IS E'Indicates whether or not the code is required by the system. If yes, the users would be prevented from updating or deleting the code value.'; +COMMENT ON COLUMN oats_exclsn_app_type_codes.description IS E'Description of the EXCLSN APP TYPE CODE'; +COMMENT ON COLUMN oats_exclsn_app_type_codes.when_updated IS E'WHEN UPDATED is the date/time that the record was last updated.'; +COMMENT ON COLUMN oats_exclsn_app_type_codes.who_created IS E'WHO CREATED is the BCEID, IDIR or Oracle userid of the person who created the record.'; +COMMENT ON COLUMN oats_exclsn_app_type_codes.revision_count IS E'REVISION COUNT is used by Hibernate to control optimistic locking'; +COMMENT ON COLUMN oats_exclsn_app_type_codes.who_updated IS E'WHO UPDATED is the BCEID, IDIR or Oracle userid of the person who last updated the record.'; +COMMENT ON COLUMN oats_exclsn_app_type_codes.when_created IS E'WHEN CREATED is the date/time that the record was created.'; +COMMENT ON COLUMN oats_exclsn_app_type_codes.exclsn_app_type_code IS E'User supplied value to uniquely identify a EXCLSN APP TYPE CODE'; +ALTER TABLE oats_exclsn_app_type_codes ADD PRIMARY KEY (exclsn_app_type_code); + +CREATE TABLE oats_system_setting_codes ( + system_setting_code varchar(10) NOT NULL, + description varchar(100) NOT NULL, + system_setting_value varchar(4000) NOT NULL, + who_created varchar(32) NOT NULL, + when_created timestamp NOT NULL, + who_updated varchar(32), + when_updated timestamp, + revision_count bigint NOT NULL DEFAULT 0 +) ; +COMMENT ON TABLE oats_system_setting_codes IS E'A SYSTEM SETTING CODE is a system wide global variable value. For example:- OATS Application Version'; +COMMENT ON COLUMN oats_system_setting_codes.system_setting_code IS E'System Developer supplied value to uniquely identify a SYSTEM SETTING CODE.'; +COMMENT ON COLUMN oats_system_setting_codes.when_created IS E'WHEN CREATED is the date/time that the record was created.'; +COMMENT ON COLUMN oats_system_setting_codes.system_setting_value IS E'The value of the system setting. The application will perform any necessary conversions todifferent formats.'; +COMMENT ON COLUMN oats_system_setting_codes.who_updated IS E'WHO UPDATED is the IDIR or Oracle userid of the person who last updated the record.'; +COMMENT ON COLUMN oats_system_setting_codes.revision_count IS E'REVISION COUNT is used by Hibernate to control optimistic locking'; +COMMENT ON COLUMN oats_system_setting_codes.description IS E'Description of the SYSTEM SETTING CODE'; +COMMENT ON COLUMN oats_system_setting_codes.who_created IS E'WHO CREATED is the IDIR or Oracle userid of the person who created the record.'; +COMMENT ON COLUMN oats_system_setting_codes.when_updated IS E'WHEN UPDATED is the date/time that the record was last updated.'; +ALTER TABLE oats_system_setting_codes ADD PRIMARY KEY (system_setting_code); + +CREATE TABLE oats_planning_reviews ( + planning_review_id bigint NOT NULL, + planning_review_code varchar(10) NOT NULL, + legacy_planning_review_nbr varchar(10), + person_organization_id bigint NOT NULL, + received_date timestamp NOT NULL, + description varchar(4000) NOT NULL, + local_gov_document_name varchar(100) NOT NULL, + open_ind varchar(1) NOT NULL, + gis_created_ind varchar(1) NOT NULL, + who_created varchar(32) NOT NULL, + when_created timestamp NOT NULL, + who_updated varchar(32), + when_updated timestamp, + revision_count bigint NOT NULL DEFAULT 0 +) ; +COMMENT ON TABLE oats_planning_reviews IS E'A PLANNING REVIEW is an undertaking by a Local Government or a Ministry of the Provincial Government to establish a course of action or direction on future land use that is of interest to the ALC. For example: - The Golden Ears Bridge - Ministry of Highway''s Gateway Program'; +COMMENT ON COLUMN oats_planning_reviews.received_date IS E'RECEIVED DATE is a time the ISSUE was received by the Commission.'; +COMMENT ON COLUMN oats_planning_reviews.local_gov_document_name IS E'The name of the Local Government assigned the PLANNING REVIEW'; +COMMENT ON COLUMN oats_planning_reviews.legacy_planning_review_nbr IS E'LEGACY PLANNING REVIEW NBR is the characters used to identify a PLANNING REVIEW in the legacy ATS application system, where NBR is an abbreviation for number. For example: 10110-1 or 20002'; +COMMENT ON COLUMN oats_planning_reviews.planning_review_id IS E'System generated sequence number to uniquely identify a PLANNING REVIEW'; +COMMENT ON COLUMN oats_planning_reviews.description IS E'DESCRIPTION isan attribute further extending the definition of the PLANNING REVIEW.'; +COMMENT ON COLUMN oats_planning_reviews.who_created IS E'WHO CREATED is the IDIR or Oracle userid of the person who created the record.'; +COMMENT ON COLUMN oats_planning_reviews.planning_review_code IS E'User supplied value to uniquely identify a PLANNING REVIEW CODE'; +COMMENT ON COLUMN oats_planning_reviews.when_updated IS E'WHEN UPDATED is the date/time that the record was last updated.'; +COMMENT ON COLUMN oats_planning_reviews.who_updated IS E'WHO UPDATED is the IDIR or Oracle userid of the person who last updated the record.'; +COMMENT ON COLUMN oats_planning_reviews.person_organization_id IS E'PERSON ORGANIZATION ID is the system generated unique identifier for PERSON ORGANIZATION.'; +COMMENT ON COLUMN oats_planning_reviews.when_created IS E'WHEN CREATED is the date/time that the record was created.'; +COMMENT ON COLUMN oats_planning_reviews.gis_created_ind IS E'GIS_CREATED_IND ia a attribute where Y(Yes) indicates whether or not the PLANNING REVIEW is currently open and active, N(no) indicates it is closed and retained for historical reference.'; +COMMENT ON COLUMN oats_planning_reviews.open_ind IS E'The OPEN IND attribute Y(Yes) indicates whether or not the PLANNING REVIEW is currently open and active, N(No) indicates it is closed and retained for historical reference.'; +COMMENT ON COLUMN oats_planning_reviews.revision_count IS E'REVISION COUNT is used by Hibernate to control optimistic locking'; +CREATE INDEX oats_plrv_plrc_fk_i ON oats_planning_reviews (planning_review_code); +CREATE INDEX oats_plrv_pog_fk_i ON oats_planning_reviews (person_organization_id); +ALTER TABLE oats_planning_reviews ADD PRIMARY KEY (planning_review_id); +ALTER TABLE oats_planning_reviews ADD CONSTRAINT avcon_1238100890_gis_c_000 CHECK (GIS_CREATED_IND IN ('Y', 'N')); +ALTER TABLE oats_planning_reviews ADD CONSTRAINT avcon_1238100890_open__000 CHECK (OPEN_IND IN ('Y', 'N')); + +CREATE TABLE oats_adjacent_land_uses ( + adjacent_land_use_id bigint NOT NULL, + alr_application_id bigint NOT NULL, + cardinal_direction varchar(5) NOT NULL, + description varchar(4000) NOT NULL, + nonfarm_use_type_code varchar(10), + who_created varchar(32) NOT NULL, + when_created timestamp NOT NULL, + who_updated varchar(32), + when_updated timestamp, + revision_count bigint NOT NULL DEFAULT 0 +) ; +COMMENT ON TABLE oats_adjacent_land_uses IS E'ADJACENT LAND USE is a description of how the land is utilized that borders the SUBJECT PROPERTY.'; +COMMENT ON COLUMN oats_adjacent_land_uses.when_created IS E'WHEN CREATED is the date/time that the record was created.'; +COMMENT ON COLUMN oats_adjacent_land_uses.when_updated IS E'WHEN UPDATED is the date/time that the record was last updated.'; +COMMENT ON COLUMN oats_adjacent_land_uses.who_created IS E'WHO CREATED is the IDIR or Oracle userid of the person who created the record.'; +COMMENT ON COLUMN oats_adjacent_land_uses.alr_application_id IS E'System generated sequence number to uniquely identify an ALR APPLICATION. This is also used as the ALR APPLICATION''S external reference number.'; +COMMENT ON COLUMN oats_adjacent_land_uses.description IS E'Non-farm use type of the adjacent land.'; +COMMENT ON COLUMN oats_adjacent_land_uses.revision_count IS E'REVISION COUNT is used by Hibernate to control optimistic locking'; +COMMENT ON COLUMN oats_adjacent_land_uses.who_updated IS E'WHO UPDATED is the IDIR or Oracle userid of the person who last updated the record.'; +COMMENT ON COLUMN oats_adjacent_land_uses.cardinal_direction IS E'One of the 4 principal directional indicators as found on a traditional magnetic compass rose.'; +COMMENT ON COLUMN oats_adjacent_land_uses.adjacent_land_use_id IS E'System generated sequence number to uniquely identify an ADJACENT LAND USE'; +CREATE UNIQUE INDEX oats_ause_uk ON oats_adjacent_land_uses (alr_application_id, cardinal_direction); +ALTER TABLE oats_adjacent_land_uses ADD UNIQUE (alr_application_id,cardinal_direction); +ALTER TABLE oats_adjacent_land_uses ADD PRIMARY KEY (adjacent_land_use_id); +ALTER TABLE oats_adjacent_land_uses ADD CONSTRAINT oats_ause_cd_ck CHECK (CARDINAL_DIRECTION IN ('NORTH', 'EAST', 'SOUTH', 'WEST')); + +CREATE TABLE oats_local_gov_services ( + local_gov_service_id bigint NOT NULL, + alr_application_id bigint NOT NULL, + local_gov_service_code varchar(10) NOT NULL, + who_created varchar(32) NOT NULL, + when_created timestamp NOT NULL, + who_updated varchar(32), + when_updated timestamp, + revision_count bigint NOT NULL DEFAULT 0 +) ; +COMMENT ON TABLE oats_local_gov_services IS E'A LOCAL GOV SERVICE is the inclusion of a specific type of infrastructure service (as identified by LOCAL GOV SERVICE CODE) that can be provided by a local government asserting that service is provided to the SUBJECT PROPERTIES under the ALR APPLICATION.'; +COMMENT ON COLUMN oats_local_gov_services.when_created IS E'WHEN CREATED is the date/time that the record was created.'; +COMMENT ON COLUMN oats_local_gov_services.who_created IS E'WHO CREATED is the IDIR or Oracle userid of the person who created the record.'; +COMMENT ON COLUMN oats_local_gov_services.when_updated IS E'WHEN UPDATED is the date/time that the record was last updated.'; +COMMENT ON COLUMN oats_local_gov_services.local_gov_service_code IS E'User supplied value to uniquely identify a LOCAL GOV SERVICE CODE'; +COMMENT ON COLUMN oats_local_gov_services.local_gov_service_id IS E'System generated sequence number to uniquely identify a LOCAL GOV SERVICE'; +COMMENT ON COLUMN oats_local_gov_services.alr_application_id IS E'System generated sequence number to uniquely identify an ALR APPLICATION. This is also used as the ALR APPLICATION''S external reference number.'; +COMMENT ON COLUMN oats_local_gov_services.who_updated IS E'WHO UPDATED is the IDIR or Oracle userid of the person who last updated the record.'; +COMMENT ON COLUMN oats_local_gov_services.revision_count IS E'REVISION COUNT is used by Hibernate to control optimistic locking'; +CREATE INDEX oats_lgsv_lgsc_fk_i ON oats_local_gov_services (local_gov_service_code); +CREATE UNIQUE INDEX oats_lgsv_uk ON oats_local_gov_services (alr_application_id, local_gov_service_code); +CREATE INDEX oats_lgsv_appl_fk_i ON oats_local_gov_services (alr_application_id); +ALTER TABLE oats_local_gov_services ADD PRIMARY KEY (local_gov_service_id); +ALTER TABLE oats_local_gov_services ADD UNIQUE (alr_application_id,local_gov_service_code); + +CREATE TABLE oats_financial_institute_codes ( + financial_institute_code varchar(10) NOT NULL, + description varchar(100) NOT NULL, + system_required_ind varchar(1) NOT NULL, + who_created varchar(32) NOT NULL, + when_created timestamp NOT NULL, + who_updated varchar(32), + when_updated timestamp, + revision_count bigint NOT NULL DEFAULT 0 +) ; +COMMENT ON TABLE oats_financial_institute_codes IS E'A FINANCIAL INSTITUTE CODE identifies the major banks, credit unions, or other financial institutes at the corporate level. The details of any specific bank branch will be held on the actual financial instrument. For example: - CIBC: Canadian Imperial Bank of Commerce - RBC: Royal Bank of Canada - Scotiabank'; +COMMENT ON COLUMN oats_financial_institute_codes.when_created IS E'WHEN CREATED is the date/time that the record was created.'; +COMMENT ON COLUMN oats_financial_institute_codes.who_created IS E'WHO CREATED is the IDIR or Oracle userid of the person who created the record.'; +COMMENT ON COLUMN oats_financial_institute_codes.when_updated IS E'WHEN UPDATED is the date/time that the record was last updated.'; +COMMENT ON COLUMN oats_financial_institute_codes.description IS E'Description of the FINANCIAL INSTITUTE CODE'; +COMMENT ON COLUMN oats_financial_institute_codes.system_required_ind IS E'Indicates whether or not the code is required by the system. If yes, the users would be prevented from updating or deleting the code value.'; +COMMENT ON COLUMN oats_financial_institute_codes.who_updated IS E'WHO UPDATED is the IDIR or Oracle userid of the person who last updated the record.'; +COMMENT ON COLUMN oats_financial_institute_codes.revision_count IS E'REVISION COUNT is used by Hibernate to control optimistic locking'; +COMMENT ON COLUMN oats_financial_institute_codes.financial_institute_code IS E'User supplied value to uniquely identify a FINANCIAL INSTITUTE CODE'; +ALTER TABLE oats_financial_institute_codes ADD PRIMARY KEY (financial_institute_code); +ALTER TABLE oats_financial_institute_codes ADD CONSTRAINT avcon_1238100890_syste_013 CHECK (SYSTEM_REQUIRED_IND IN ('Y', 'N')); + +CREATE TABLE oats_property_owner_type_codes ( + property_owner_type_code varchar(10) NOT NULL, + description varchar(100) NOT NULL, + system_required_ind varchar(1) NOT NULL, + who_created varchar(32) NOT NULL, + when_created timestamp NOT NULL, + who_updated varchar(32), + when_updated timestamp, + revision_count bigint NOT NULL DEFAULT 0 +) ; +COMMENT ON TABLE oats_property_owner_type_codes IS E'A PROPERTY OWNER TYPE CODE defines the nature to which a person or organization can claim possession over land. For example: - Fee Simple - Crown Land - First Nations'; +COMMENT ON COLUMN oats_property_owner_type_codes.description IS E'Description of the PROPERTY OWNER TYPE CODE'; +COMMENT ON COLUMN oats_property_owner_type_codes.when_created IS E'WHEN CREATED is the date/time that the record was created.'; +COMMENT ON COLUMN oats_property_owner_type_codes.system_required_ind IS E'Indicates whether or not the code is required by the system. If yes, the users would be prevented from updating or deleting the code value.'; +COMMENT ON COLUMN oats_property_owner_type_codes.who_created IS E'WHO CREATED is the IDIR or Oracle userid of the person who created the record.'; +COMMENT ON COLUMN oats_property_owner_type_codes.when_updated IS E'WHEN UPDATED is the date/time that the record was last updated.'; +COMMENT ON COLUMN oats_property_owner_type_codes.property_owner_type_code IS E'User supplied value to uniquely identify an PROPERTY OWNER TYPE CODE'; +COMMENT ON COLUMN oats_property_owner_type_codes.who_updated IS E'WHO UPDATED is the IDIR or Oracle userid of the person who last updated the record.'; +COMMENT ON COLUMN oats_property_owner_type_codes.revision_count IS E'REVISION COUNT is used by Hibernate to control optimistic locking'; +ALTER TABLE oats_property_owner_type_codes ADD PRIMARY KEY (property_owner_type_code); +ALTER TABLE oats_property_owner_type_codes ADD CONSTRAINT avcon_1238100890_syste_014 CHECK (SYSTEM_REQUIRED_IND IN ('Y', 'N')); + +CREATE TABLE oats_local_gov_service_codes ( + local_gov_service_code varchar(10) NOT NULL, + description varchar(100) NOT NULL, + system_required_ind varchar(1) NOT NULL, + who_created varchar(32) NOT NULL, + when_created timestamp NOT NULL, + who_updated varchar(32), + when_updated timestamp, + revision_count bigint NOT NULL DEFAULT 0 +) ; +COMMENT ON TABLE oats_local_gov_service_codes IS E'A LOCAL GOVNT SERVICE CODE is a type of infrastructure service that can be provided by a local government. For example: - Road - Water - Sewage Constrained list of local government services of interest to the ALC.'; +COMMENT ON COLUMN oats_local_gov_service_codes.who_updated IS E'WHO UPDATED is the IDIR or Oracle userid of the person who last updated the record.'; +COMMENT ON COLUMN oats_local_gov_service_codes.revision_count IS E'REVISION COUNT is used by Hibernate to control optimistic locking'; +COMMENT ON COLUMN oats_local_gov_service_codes.who_created IS E'WHO CREATED is the IDIR or Oracle userid of the person who created the record.'; +COMMENT ON COLUMN oats_local_gov_service_codes.when_updated IS E'WHEN UPDATED is the date/time that the record was last updated.'; +COMMENT ON COLUMN oats_local_gov_service_codes.local_gov_service_code IS E'User supplied value to uniquely identify a LOCAL GOV SERVICE CODE'; +COMMENT ON COLUMN oats_local_gov_service_codes.system_required_ind IS E'Indicates whether or not the code is required by the system. If yes, the users would be prevented from updating or deleting the code value.'; +COMMENT ON COLUMN oats_local_gov_service_codes.description IS E'Description of the LOCAL GOV SERVICE CODE'; +COMMENT ON COLUMN oats_local_gov_service_codes.when_created IS E'WHEN CREATED is the date/time that the record was created.'; +ALTER TABLE oats_local_gov_service_codes ADD PRIMARY KEY (local_gov_service_code); +ALTER TABLE oats_local_gov_service_codes ADD CONSTRAINT avcon_1238100890_syste_001 CHECK (SYSTEM_REQUIRED_IND IN ('Y', 'N')); + +CREATE TABLE oats_alr_application_parties ( + alr_application_party_id bigint NOT NULL, + alr_appl_role_code varchar(10) NOT NULL, + alr_application_id bigint NOT NULL, + person_organization_id bigint NOT NULL, + effective_date timestamp NOT NULL, + expiry_date timestamp, + who_created varchar(32) NOT NULL, + when_created timestamp NOT NULL, + who_updated varchar(32), + when_updated timestamp, + revision_count bigint NOT NULL DEFAULT 0 +) ; +COMMENT ON TABLE oats_alr_application_parties IS E'An ALR APPLICATION PARTY is the inclusion of a PERSON ORGANIZATION as a party to an ALR APPLICATION, taking on a role as defined by APPLICATION ROLE CODE. The parties to an application may change over time, but are retained for historical purposes.'; +COMMENT ON COLUMN oats_alr_application_parties.alr_appl_role_code IS E'User supplied value to uniquely identify an ALR APPL ROLE CODE'; +COMMENT ON COLUMN oats_alr_application_parties.when_updated IS E'WHEN UPDATED is the date/time that the record was last updated.'; +COMMENT ON COLUMN oats_alr_application_parties.who_created IS E'WHO CREATED is the IDIR or Oracle userid of the person who created the record.'; +COMMENT ON COLUMN oats_alr_application_parties.alr_application_party_id IS E'System generated sequence number to uniquely identify an ALR APPLICATION PARTY'; +COMMENT ON COLUMN oats_alr_application_parties.person_organization_id IS E'PERSON ORGANIZATION ID is the system generated unique identifier for PERSON ORGANIZATION.'; +COMMENT ON COLUMN oats_alr_application_parties.who_updated IS E'WHO UPDATED is the IDIR or Oracle userid of the person who last updated the record.'; +COMMENT ON COLUMN oats_alr_application_parties.effective_date IS E'Date the party became an active on the ALR APPLICATION'; +COMMENT ON COLUMN oats_alr_application_parties.when_created IS E'WHEN CREATED is the date/time that the record was created.'; +COMMENT ON COLUMN oats_alr_application_parties.expiry_date IS E'Date the party is no longer effective on the ALR APPLICATION, but is retained for historical purposes.'; +COMMENT ON COLUMN oats_alr_application_parties.alr_application_id IS E'System generated sequence number to uniquely identify an ALR APPLICATION. This is also used as the ALR APPLICATION''S external reference number.'; +COMMENT ON COLUMN oats_alr_application_parties.revision_count IS E'REVISION COUNT is used by Hibernate to control optimistic locking'; +CREATE INDEX oats_appy_sk1_i ON oats_alr_application_parties (alr_application_id, alr_appl_role_code, person_organization_id); +CREATE UNIQUE INDEX oats_appy_uk1_i ON oats_alr_application_parties ((case alr_appl_role_code when 'lg' then alr_application_id else null end)); +CREATE INDEX oats_appy_aprc_fk_i ON oats_alr_application_parties (alr_appl_role_code); +CREATE INDEX oats_appy_pog_fk_i ON oats_alr_application_parties (person_organization_id); +CREATE INDEX oats_appy_appl_fk_i ON oats_alr_application_parties (alr_application_id); +ALTER TABLE oats_alr_application_parties ADD PRIMARY KEY (alr_application_party_id); + +CREATE TABLE oats_accomplishment_codes ( + accomplishment_code varchar(10) NOT NULL, + description varchar(100) NOT NULL, + sort_order integer NOT NULL, + published_ind varchar(1) NOT NULL, + system_required_ind varchar(1) NOT NULL, + who_created varchar(32) NOT NULL, + when_created timestamp NOT NULL, + who_updated varchar(32), + when_updated timestamp, + revision_count bigint NOT NULL DEFAULT 0 +) ; +COMMENT ON TABLE oats_accomplishment_codes IS E'An ACCOMPLISHMENT CODE is a specific business function that must be completed for an ALR APPLICATION as it is processed by the ALC.For example: - Application Received - Site Map / Geometry - Acknowledgment - Staff Report Completed - Decision Rendered - Decision Geometry - Map Amendment'; +COMMENT ON COLUMN oats_accomplishment_codes.revision_count IS E'REVISION COUNT is used by Hibernate to control optimistic locking'; +COMMENT ON COLUMN oats_accomplishment_codes.who_updated IS E'WHO UPDATED is the IDIR or Oracle userid of the person who last updated the record.'; +COMMENT ON COLUMN oats_accomplishment_codes.description IS E'Description of the ACCOMPLISHMENT CODE'; +COMMENT ON COLUMN oats_accomplishment_codes.system_required_ind IS E'Indicates whether or not the code is required by the system. If yes, the users would be prevented from updating or deleting the code value.'; +COMMENT ON COLUMN oats_accomplishment_codes.when_updated IS E'WHEN UPDATED is the date/time that the record was last updated.'; +COMMENT ON COLUMN oats_accomplishment_codes.who_created IS E'WHO CREATED is the IDIR or Oracle userid of the person who created the record.'; +COMMENT ON COLUMN oats_accomplishment_codes.published_ind IS E'Indicates whether or not the ACCOMPLISHMENT CODE is displayed as the status of an ALR APPLICATION to the general public'; +COMMENT ON COLUMN oats_accomplishment_codes.accomplishment_code IS E'User supplied value to uniquely identify an ACCOMPLISHMENT CODE'; +COMMENT ON COLUMN oats_accomplishment_codes.when_created IS E'WHEN CREATED is the date/time that the record was created.'; +COMMENT ON COLUMN oats_accomplishment_codes.sort_order IS E'A number indicating the relative completion order of an ACCOMPLISHMENT CODE.'; +ALTER TABLE oats_accomplishment_codes ADD PRIMARY KEY (accomplishment_code); +ALTER TABLE oats_accomplishment_codes ADD CONSTRAINT avcon_1238100890_publi_000 CHECK (PUBLISHED_IND IN ('Y', 'N')); +ALTER TABLE oats_accomplishment_codes ADD CONSTRAINT avcon_1238100890_syste_023 CHECK (SYSTEM_REQUIRED_IND IN ('Y', 'N')); + +CREATE TABLE oats_compliance_inspections ( + compliance_inspection_id bigint NOT NULL, + alr_appl_decision_id bigint NOT NULL, + inspection_date timestamp NOT NULL, + inspector varchar(50) NOT NULL, + description varchar(4000) NOT NULL, + who_created varchar(32) NOT NULL, + when_created timestamp NOT NULL, + who_updated varchar(32), + when_updated timestamp, + revision_count bigint NOT NULL DEFAULT 0 +) ; +COMMENT ON TABLE oats_compliance_inspections IS E'A COMPLIANCE INSPECTION is follow-up review to ensure the CONDITIONS of an ALR APPL DECISION are being adhered to.'; +COMMENT ON COLUMN oats_compliance_inspections.when_created IS E'WHEN CREATED is the date/time that the record was created.'; +COMMENT ON COLUMN oats_compliance_inspections.inspection_date IS E'Date the COMPLIANCE INSPECTION occurred.'; +COMMENT ON COLUMN oats_compliance_inspections.inspector IS E'Description of the person(s) who conducted the inspection.'; +COMMENT ON COLUMN oats_compliance_inspections.description IS E'Description of the COMPLIANCE INSPECTION'; +COMMENT ON COLUMN oats_compliance_inspections.who_created IS E'WHO CREATED is the IDIR or Oracle userid of the person who created the record.'; +COMMENT ON COLUMN oats_compliance_inspections.when_updated IS E'WHEN UPDATED is the date/time that the record was last updated.'; +COMMENT ON COLUMN oats_compliance_inspections.compliance_inspection_id IS E'System generated sequence number to uniquely identify a COMPLIANCE INSPECTION'; +COMMENT ON COLUMN oats_compliance_inspections.alr_appl_decision_id IS E'System generated sequence number to uniquely identify a ALR APPL DECISION'; +COMMENT ON COLUMN oats_compliance_inspections.who_updated IS E'WHO UPDATED is the IDIR or Oracle userid of the person who last updated the record.'; +COMMENT ON COLUMN oats_compliance_inspections.revision_count IS E'REVISION COUNT is used by Hibernate to control optimistic locking'; +CREATE INDEX oats_cpin_aadc_fk_i ON oats_compliance_inspections (alr_appl_decision_id); +ALTER TABLE oats_compliance_inspections ADD PRIMARY KEY (compliance_inspection_id); + +CREATE TABLE oats_local_gov_action_codes ( + local_gov_action_code varchar(10) NOT NULL, + description varchar(100) NOT NULL, + system_required_ind varchar(1) NOT NULL, + who_created varchar(32) NOT NULL, + when_created timestamp NOT NULL, + who_updated varchar(32), + when_updated timestamp, + revision_count bigint NOT NULL DEFAULT 0 +) ; +COMMENT ON TABLE oats_local_gov_action_codes IS E'A LOCAL GOV ACTION CODE is an action the local government must complete prior to the submission of an ALR APPLICATION to the ALC. For Example: - Notify Neighbours - Local Paper Ad'; +COMMENT ON COLUMN oats_local_gov_action_codes.who_updated IS E'WHO UPDATED is the IDIR or Oracle userid of the person who last updated the record.'; +COMMENT ON COLUMN oats_local_gov_action_codes.revision_count IS E'REVISION COUNT is used by Hibernate to control optimistic locking'; +COMMENT ON COLUMN oats_local_gov_action_codes.who_created IS E'WHO CREATED is the IDIR or Oracle userid of the person who created the record.'; +COMMENT ON COLUMN oats_local_gov_action_codes.when_updated IS E'WHEN UPDATED is the date/time that the record was last updated.'; +COMMENT ON COLUMN oats_local_gov_action_codes.local_gov_action_code IS E'User supplied value to uniquely identify a LOCAL GOV ACTION CODE'; +COMMENT ON COLUMN oats_local_gov_action_codes.when_created IS E'WHEN CREATED is the date/time that the record was created.'; +COMMENT ON COLUMN oats_local_gov_action_codes.system_required_ind IS E'Indicates whether or not the code is required by the system. If yes, the users would be prevented from updating or deleting the code value.'; +COMMENT ON COLUMN oats_local_gov_action_codes.description IS E'Description of the LOCAL GOV ACTION CODE'; +ALTER TABLE oats_local_gov_action_codes ADD PRIMARY KEY (local_gov_action_code); +ALTER TABLE oats_local_gov_action_codes ADD CONSTRAINT avcon_1238100890_syste_016 CHECK (SYSTEM_REQUIRED_IND IN ('Y', 'N')); +ALTER TABLE oats_planning_decisions ADD CONSTRAINT oats_pldc_plac_fk FOREIGN KEY (planning_acceptance_code) REFERENCES oats_planning_acceptance_codes(planning_acceptance_code) ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED; + +ALTER TABLE oats_planning_decisions ADD CONSTRAINT oats_pldc_plrv_fk FOREIGN KEY (planning_review_id) REFERENCES oats_planning_reviews(planning_review_id) ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED; +ALTER TABLE oats_person_organizations ADD CONSTRAINT oats_pog_org_fk FOREIGN KEY (organization_id) REFERENCES oats_organizations(organization_id) ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED; + +ALTER TABLE oats_person_organizations ADD CONSTRAINT oats_pog_per_fk FOREIGN KEY (person_id) REFERENCES oats_persons(person_id) ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED; +ALTER TABLE oats_alr_application_fees ADD CONSTRAINT oats_aafs_apcc_fk FOREIGN KEY (application_class_code) REFERENCES oats_application_class_codes(application_class_code) ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED; + +ALTER TABLE oats_alr_application_fees ADD CONSTRAINT oats_aafs_alcc_fk FOREIGN KEY (alr_change_code) REFERENCES oats_alr_change_codes(alr_change_code) ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED; +ALTER TABLE oats_issue_notes ADD CONSTRAINT oats_isnt_issu_fk FOREIGN KEY (issue_id) REFERENCES oats_issues(issue_id) ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED; +ALTER TABLE oats_staff_journal_entries ADD CONSTRAINT oats_sjou_appl_fk FOREIGN KEY (alr_application_id) REFERENCES oats_alr_applications(alr_application_id) ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED; +ALTER TABLE oats_condition_compliance_rpts ADD CONSTRAINT oats_ccrp_cond_fk FOREIGN KEY (condition_id) REFERENCES oats_conditions(condition_id) ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED NOT VALID; +ALTER TABLE oats_local_government_reports ADD CONSTRAINT oats_lgr_pog_fk FOREIGN KEY (person_organization_id) REFERENCES oats_person_organizations(person_organization_id) ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED; + +ALTER TABLE oats_local_government_reports ADD CONSTRAINT oats_lgr_appl_fk FOREIGN KEY (alr_application_id) REFERENCES oats_alr_applications(alr_application_id) ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED; +ALTER TABLE oats_property_interests ADD CONSTRAINT oats_prin_sbjp_fk FOREIGN KEY (subject_property_id) REFERENCES oats_subject_properties(subject_property_id) ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED; + +ALTER TABLE oats_property_interests ADD CONSTRAINT oats_prin_nfuc_fk FOREIGN KEY (nonfarm_use_type_code) REFERENCES oats_nonfarm_use_type_codes(nonfarm_use_type_code) ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED; + +ALTER TABLE oats_property_interests ADD CONSTRAINT oats_prin_pog_fk FOREIGN KEY (person_organization_id) REFERENCES oats_person_organizations(person_organization_id) ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED; + +ALTER TABLE oats_property_interests ADD CONSTRAINT oats_prin_ltcc_fk FOREIGN KEY (land_title_charge_code) REFERENCES oats_land_title_charge_codes(land_title_charge_code) ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED; + +ALTER TABLE oats_property_interests ADD CONSTRAINT oats_prin_powc_fk FOREIGN KEY (property_owner_type_code) REFERENCES oats_property_owner_type_codes(property_owner_type_code) ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED; + +ALTER TABLE oats_property_interests ADD CONSTRAINT oats_prin_pic_fk FOREIGN KEY (property_interest_code) REFERENCES oats_property_interest_codes(property_interest_code) ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED; +ALTER TABLE oats_subdivision_designs ADD CONSTRAINT oats_subd_apcp_fk FOREIGN KEY (alr_appl_component_id) REFERENCES oats_alr_appl_components(alr_appl_component_id) ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED; +ALTER TABLE oats_alr_appl_decisions ADD CONSTRAINT oats_aadc_appl_fk FOREIGN KEY (alr_application_id) REFERENCES oats_alr_applications(alr_application_id) ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED; + +ALTER TABLE oats_alr_appl_decisions ADD CONSTRAINT oats_aadc_rreq_fk FOREIGN KEY (reconsideration_request_id) REFERENCES oats_reconsideration_requests(reconsideration_request_id) ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED; +ALTER TABLE oats_stop_work_order_rcpnts ADD CONSTRAINT oats_swor_issu_fk FOREIGN KEY (issue_id) REFERENCES oats_issues(issue_id) ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED; + +ALTER TABLE oats_stop_work_order_rcpnts ADD CONSTRAINT oats_swor_pog_fk FOREIGN KEY (person_organization_id) REFERENCES oats_person_organizations(person_organization_id) ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED; +ALTER TABLE oats_financial_instruments ADD CONSTRAINT oats_fiin_payc_fk FOREIGN KEY (payment_type_code) REFERENCES oats_payment_type_codes(payment_type_code) ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED NOT VALID; + +ALTER TABLE oats_financial_instruments ADD CONSTRAINT oats_fiin_finc_fk FOREIGN KEY (financial_institute_code) REFERENCES oats_financial_institute_codes(financial_institute_code) ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED NOT VALID; + +ALTER TABLE oats_financial_instruments ADD CONSTRAINT oats_fiin_pog_fk FOREIGN KEY (person_organization_id) REFERENCES oats_person_organizations(person_organization_id) ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED NOT VALID; + +ALTER TABLE oats_financial_instruments ADD CONSTRAINT oats_fiin_ficd_fk FOREIGN KEY (financial_instrument_cd) REFERENCES oats_financial_instrument_cds(financial_instrument_cd) ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED NOT VALID; + +ALTER TABLE oats_financial_instruments ADD CONSTRAINT oats_fiin_aadc_fk FOREIGN KEY (alr_appl_decision_id) REFERENCES oats_alr_appl_decisions(alr_appl_decision_id) ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED NOT VALID; +ALTER TABLE oats_alr_application_meetings ADD CONSTRAINT oats_apmt_appl_fk FOREIGN KEY (alr_application_id) REFERENCES oats_alr_applications(alr_application_id) ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED; + +ALTER TABLE oats_alr_application_meetings ADD CONSTRAINT oats_apmt_apmc_fk FOREIGN KEY (alr_appl_meeting_code) REFERENCES oats_alr_appl_meeting_codes(alr_appl_meeting_code) ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED; +ALTER TABLE oats_soil_change_elements ADD CONSTRAINT oats_scel_sccd_fk FOREIGN KEY (soil_change_code) REFERENCES oats_soil_change_codes(soil_change_code) ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED; + +ALTER TABLE oats_soil_change_elements ADD CONSTRAINT oats_scel_apcp_fk FOREIGN KEY (alr_appl_component_id) REFERENCES oats_alr_appl_components(alr_appl_component_id) ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED; +ALTER TABLE oats_nonfarm_use_subtype_codes ADD CONSTRAINT oats_nfst_nftc_fk FOREIGN KEY (nonfarm_use_type_code) REFERENCES oats_nonfarm_use_type_codes(nonfarm_use_type_code) ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED; +ALTER TABLE oats_organizations ADD CONSTRAINT oats_org_otp_fk FOREIGN KEY (organization_type_cd) REFERENCES oats_organization_types(organization_type_cd) ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED; + +ALTER TABLE oats_organizations ADD CONSTRAINT oats_org_org_fk FOREIGN KEY (parent_organization_id) REFERENCES oats_organizations(organization_id) ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED; +ALTER TABLE oats_conditions ADD CONSTRAINT oats_cond_cdcd_fk FOREIGN KEY (condition_code) REFERENCES oats_condition_codes(condition_code) ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED NOT VALID; + +ALTER TABLE oats_conditions ADD CONSTRAINT oats_cond_apcp_fk FOREIGN KEY (alr_appl_component_id) REFERENCES oats_alr_appl_components(alr_appl_component_id) ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED; +ALTER TABLE oats_reconsideration_requests ADD CONSTRAINT oats_rreq_appl_fk FOREIGN KEY (alr_application_id) REFERENCES oats_alr_applications(alr_application_id) ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED; +ALTER TABLE oats_documents ADD CONSTRAINT oats_docu_issu_fk FOREIGN KEY (issue_id) REFERENCES oats_issues(issue_id) ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED; + +ALTER TABLE oats_documents ADD CONSTRAINT oats_docu_docd_fk FOREIGN KEY (document_code) REFERENCES oats_document_codes(document_code) ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED; + +ALTER TABLE oats_documents ADD CONSTRAINT oats_docu_plrv_fk FOREIGN KEY (planning_review_id) REFERENCES oats_planning_reviews(planning_review_id) ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED; + +ALTER TABLE oats_documents ADD CONSTRAINT oats_od_dsc_fk FOREIGN KEY (document_source_code) REFERENCES oats_document_source_codes(document_source_code) ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED; + +ALTER TABLE oats_documents ADD CONSTRAINT oats_od_sp_fk FOREIGN KEY (subject_property_id) REFERENCES oats_subject_properties(subject_property_id) ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED; + +ALTER TABLE oats_documents ADD CONSTRAINT oats_docu_appl_fk FOREIGN KEY (alr_application_id) REFERENCES oats_alr_applications(alr_application_id) ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED; +ALTER TABLE oats_notice_intent_info_rqst ADD CONSTRAINT oats_noir_appl_fk FOREIGN KEY (alr_application_id) REFERENCES oats_alr_applications(alr_application_id) ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED; +ALTER TABLE oats_person_org_addresses ADD CONSTRAINT oats_pad_adr_fk FOREIGN KEY (address_id) REFERENCES oats_addresses(address_id) ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED; + +ALTER TABLE oats_person_org_addresses ADD CONSTRAINT oats_pad_pog_fk FOREIGN KEY (person_organization_id) REFERENCES oats_person_organizations(person_organization_id) ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED; + +ALTER TABLE oats_person_org_addresses ADD CONSTRAINT oats_pad_atp_fk FOREIGN KEY (address_type_cd) REFERENCES oats_address_types(address_type_cd) ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED; +ALTER TABLE oats_issues ADD CONSTRAINT oats_issu_pog_fk FOREIGN KEY (local_gov_pog_id) REFERENCES oats_person_organizations(person_organization_id) ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED; + +ALTER TABLE oats_issues ADD CONSTRAINT oats_issu_pog_fk2 FOREIGN KEY (filed_by_pog_id) REFERENCES oats_person_organizations(person_organization_id) ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED; + +ALTER TABLE oats_issues ADD CONSTRAINT oats_issu_inqc_fk FOREIGN KEY (inquiry_code) REFERENCES oats_inquiry_codes(inquiry_code) ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED; + +ALTER TABLE oats_issues ADD CONSTRAINT oats_issu_cmpc_fk FOREIGN KEY (complaint_code) REFERENCES oats_complaint_codes(complaint_code) ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED; +ALTER TABLE oats_subdiv_design_parcels ADD CONSTRAINT oats_sddp_subd_fk FOREIGN KEY (subdivision_design_id) REFERENCES oats_subdivision_designs(subdivision_design_id) ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED; +ALTER TABLE oats_committee_recommendations ADD CONSTRAINT oats_cmrc_cmtc_fk FOREIGN KEY (committee_type_code) REFERENCES oats_committee_type_codes(committee_type_code) ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED; + +ALTER TABLE oats_committee_recommendations ADD CONSTRAINT oats_cmrc_cmdc_fk FOREIGN KEY (committee_decision_code) REFERENCES oats_committee_decision_codes(committee_decision_code) ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED; + +ALTER TABLE oats_committee_recommendations ADD CONSTRAINT oats_cmrc_appl_fk FOREIGN KEY (alr_application_id) REFERENCES oats_alr_applications(alr_application_id) ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED; +ALTER TABLE oats_complaint_appeals ADD CONSTRAINT oats_cmap_issu_fk FOREIGN KEY (issue_id) REFERENCES oats_issues(issue_id) ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED; +ALTER TABLE oats_alr_appl_components ADD CONSTRAINT oats_apcp_cpsc_fk FOREIGN KEY (capability_source_code) REFERENCES oats_capability_source_codes(capability_source_code) ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED; + +ALTER TABLE oats_alr_appl_components ADD CONSTRAINT oats_apcp_mapp_fk FOREIGN KEY (amendment_year,amendment_period) REFERENCES oats_map_amendment_periods(amendment_year,amendment_period) ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED; + +ALTER TABLE oats_alr_appl_components ADD CONSTRAINT oats_apcp_alcc_fk FOREIGN KEY (alr_change_code) REFERENCES oats_alr_change_codes(alr_change_code) ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED; + +ALTER TABLE oats_alr_appl_components ADD CONSTRAINT oats_apcp_exat_fk FOREIGN KEY (exclsn_app_type_code) REFERENCES oats_exclsn_app_type_codes(exclsn_app_type_code) ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED; + +ALTER TABLE oats_alr_appl_components ADD CONSTRAINT oats_apcp_nfst_fk FOREIGN KEY (nonfarm_use_type_code,nonfarm_use_subtype_code) REFERENCES oats_nonfarm_use_subtype_codes(nonfarm_use_type_code,nonfarm_use_subtype_code) ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED; + +ALTER TABLE oats_alr_appl_components ADD CONSTRAINT oats_apcp_appl_fk FOREIGN KEY (alr_application_id) REFERENCES oats_alr_applications(alr_application_id) ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED; + +ALTER TABLE oats_alr_appl_components ADD CONSTRAINT oats_apcp_aadc_fk FOREIGN KEY (alr_appl_decision_id) REFERENCES oats_alr_appl_decisions(alr_appl_decision_id) ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED; + +ALTER TABLE oats_alr_appl_components ADD CONSTRAINT oats_apcp_agcc_fk FOREIGN KEY (agri_capability_code) REFERENCES oats_agri_capability_codes(agri_capability_code) ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED; + +ALTER TABLE oats_alr_appl_components ADD CONSTRAINT oats_apcp_rsut_fk FOREIGN KEY (rsdntl_use_type_code) REFERENCES oats_rsdntl_use_type_codes(rsdntl_use_type_code) ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED; +ALTER TABLE oats_alr_unvalidated_app_data ADD CONSTRAINT oats_auad_appl_fk FOREIGN KEY (alr_application_id) REFERENCES oats_alr_applications(alr_application_id) ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED; +ALTER TABLE oats_email_notifications ADD CONSTRAINT oats_en_esc_fk FOREIGN KEY (email_status_code) REFERENCES oats_email_status_codes(email_status_code) ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED; + +ALTER TABLE oats_email_notifications ADD CONSTRAINT oats_en_etc_fk FOREIGN KEY (email_type_code) REFERENCES oats_email_type_codes(email_type_code) ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED; + +ALTER TABLE oats_email_notifications ADD CONSTRAINT oats_en_appl_fk FOREIGN KEY (alr_application_id) REFERENCES oats_alr_applications(alr_application_id) ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED; +ALTER TABLE oats_alr_applications ADD CONSTRAINT oats_appl_as_fk FOREIGN KEY (alc_staff_id) REFERENCES oats_alc_staffs(alc_staff_id) ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED; + +ALTER TABLE oats_alr_applications ADD CONSTRAINT oats_appl_apcc_fk FOREIGN KEY (application_class_code) REFERENCES oats_application_class_codes(application_class_code) ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED; +ALTER TABLE oats_related_alr_applications ADD CONSTRAINT oats_rlap_relc_fk FOREIGN KEY (relationship_code) REFERENCES oats_relationship_codes(relationship_code) ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED; + +ALTER TABLE oats_related_alr_applications ADD CONSTRAINT oats_rlap_appl_fk2 FOREIGN KEY (secondary_alr_application_id) REFERENCES oats_alr_applications(alr_application_id) ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED; + +ALTER TABLE oats_related_alr_applications ADD CONSTRAINT oats_rlap_appl_fk FOREIGN KEY (primary_alr_application_id) REFERENCES oats_alr_applications(alr_application_id) ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED; +ALTER TABLE oats_local_gov_actions ADD CONSTRAINT oats_lact_appl_fk FOREIGN KEY (alr_application_id) REFERENCES oats_alr_applications(alr_application_id) ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED; + +ALTER TABLE oats_local_gov_actions ADD CONSTRAINT oats_lact_lgac_fk FOREIGN KEY (local_gov_action_code) REFERENCES oats_local_gov_action_codes(local_gov_action_code) ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED; +ALTER TABLE oats_planning_review_notes ADD CONSTRAINT oats_plrn_plrv_fk FOREIGN KEY (planning_review_id) REFERENCES oats_planning_reviews(planning_review_id) ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED; +ALTER TABLE oats_accomplishments ADD CONSTRAINT oats_acmp_accd_fk FOREIGN KEY (accomplishment_code) REFERENCES oats_accomplishment_codes(accomplishment_code) ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED; + +ALTER TABLE oats_accomplishments ADD CONSTRAINT oats_acmp_appl_fk FOREIGN KEY (alr_application_id) REFERENCES oats_alr_applications(alr_application_id) ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED; +ALTER TABLE oats_subject_properties ADD CONSTRAINT oats_sbjp_appl_fk FOREIGN KEY (alr_application_id) REFERENCES oats_alr_applications(alr_application_id) ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED; + +ALTER TABLE oats_subject_properties ADD CONSTRAINT oats_sbjp_prty_fk FOREIGN KEY (property_id) REFERENCES oats_properties(property_id) ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED; + +ALTER TABLE oats_subject_properties ADD CONSTRAINT oats_sbjp_issu_fk FOREIGN KEY (issue_id) REFERENCES oats_issues(issue_id) ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED; +ALTER TABLE oats_subdiv_parcel_intents ADD CONSTRAINT oats_sdpi_sddp_fk FOREIGN KEY (subdiv_design_parcel_id) REFERENCES oats_subdiv_design_parcels(subdiv_design_parcel_id) ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED; + +ALTER TABLE oats_subdiv_parcel_intents ADD CONSTRAINT oats_sdpi_apcp_fk FOREIGN KEY (alr_appl_component_id) REFERENCES oats_alr_appl_components(alr_appl_component_id) ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED; +ALTER TABLE oats_land_use_permits ADD CONSTRAINT oats_lupt_pttc_fk FOREIGN KEY (permit_type_code) REFERENCES oats_permit_type_codes(permit_type_code) ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED; + +ALTER TABLE oats_land_use_permits ADD CONSTRAINT oats_lupt_appl_fk FOREIGN KEY (alr_application_id) REFERENCES oats_alr_applications(alr_application_id) ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED; +ALTER TABLE oats_planning_reviews ADD CONSTRAINT oats_plrv_plrc_fk FOREIGN KEY (planning_review_code) REFERENCES oats_planning_review_codes(planning_review_code) ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED; + +ALTER TABLE oats_planning_reviews ADD CONSTRAINT oats_plrv_pog_fk FOREIGN KEY (person_organization_id) REFERENCES oats_person_organizations(person_organization_id) ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED; +ALTER TABLE oats_adjacent_land_uses ADD CONSTRAINT oats_ause_nftc_fk FOREIGN KEY (nonfarm_use_type_code) REFERENCES oats_nonfarm_use_type_codes(nonfarm_use_type_code) ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED; + +ALTER TABLE oats_adjacent_land_uses ADD CONSTRAINT oats_ause_appl_fk FOREIGN KEY (alr_application_id) REFERENCES oats_alr_applications(alr_application_id) ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED; +ALTER TABLE oats_local_gov_services ADD CONSTRAINT oats_lgsv_lgsc_fk FOREIGN KEY (local_gov_service_code) REFERENCES oats_local_gov_service_codes(local_gov_service_code) ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED; + +ALTER TABLE oats_local_gov_services ADD CONSTRAINT oats_lgsv_appl_fk FOREIGN KEY (alr_application_id) REFERENCES oats_alr_applications(alr_application_id) ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED; +ALTER TABLE oats_alr_application_parties ADD CONSTRAINT oats_appy_appl_fk FOREIGN KEY (alr_application_id) REFERENCES oats_alr_applications(alr_application_id) ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED; + +ALTER TABLE oats_alr_application_parties ADD CONSTRAINT oats_appy_pog_fk FOREIGN KEY (person_organization_id) REFERENCES oats_person_organizations(person_organization_id) ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED; + +ALTER TABLE oats_alr_application_parties ADD CONSTRAINT oats_appy_aprc_fk FOREIGN KEY (alr_appl_role_code) REFERENCES oats_alr_appl_role_codes(alr_appl_role_code) ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED; +ALTER TABLE oats_compliance_inspections ADD CONSTRAINT oats_cpin_aadc_fk FOREIGN KEY (alr_appl_decision_id) REFERENCES oats_alr_appl_decisions(alr_appl_decision_id) ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED; From 2ca34f606c79e35ccb86398ea2a784ebf1326a23 Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Tue, 17 Oct 2023 11:47:28 -0700 Subject: [PATCH 504/954] bugfix error on corporate summary file upload --- .../owner-dialogs/owner-dialog/owner-dialog.component.html | 2 +- .../shared/owner-dialogs/owner-dialog/owner-dialog.component.ts | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/portal-frontend/src/app/shared/owner-dialogs/owner-dialog/owner-dialog.component.html b/portal-frontend/src/app/shared/owner-dialogs/owner-dialog/owner-dialog.component.html index 2c6347780e..869df35c06 100644 --- a/portal-frontend/src/app/shared/owner-dialogs/owner-dialog/owner-dialog.component.html +++ b/portal-frontend/src/app/shared/owner-dialogs/owner-dialog/owner-dialog.component.html @@ -41,7 +41,7 @@ <h6></h6> (deleteFile)="removeCorporateSummary()" (openFile)="openCorporateSummary()" id="fileUpload" - [showErrors]="false" + [showErrors]="showFileErrors" [isRequired]="true" ></app-file-drag-drop> <mat-form-field style="display: none"> diff --git a/portal-frontend/src/app/shared/owner-dialogs/owner-dialog/owner-dialog.component.ts b/portal-frontend/src/app/shared/owner-dialogs/owner-dialog/owner-dialog.component.ts index ceaec693ba..91d9a7074f 100644 --- a/portal-frontend/src/app/shared/owner-dialogs/owner-dialog/owner-dialog.component.ts +++ b/portal-frontend/src/app/shared/owner-dialogs/owner-dialog/owner-dialog.component.ts @@ -37,6 +37,7 @@ export class OwnerDialogComponent { isEdit = false; existingUuid: string | undefined; files: ApplicationDocumentDto[] = []; + showFileErrors = false form = new FormGroup({ type: this.type, @@ -121,6 +122,7 @@ export class OwnerDialogComponent { this.dialogRef.close(res); } else { this.form.markAllAsTouched() + this.showFileErrors = true } } From 95e016c4c0ce51f46d92222d2ecabe77fd018567 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Tue, 17 Oct 2023 14:34:15 -0700 Subject: [PATCH 505/954] Add Virus Scan Error Handling to Portal * Also remove dead file upload functions from alcs decisions. --- .../decision-v2/decision-v2.component.ts | 18 --------- .../decision-v2/decision-v2.component.ts | 18 --------- .../edit-submission/files-step.partial.ts | 20 +++++++++- .../other-attachments.component.html | 4 +- .../other-attachments.component.spec.ts | 5 +++ .../other-attachments.component.ts | 13 ++++++- .../parcel-entry/parcel-entry.component.html | 6 ++- .../parcel-entry/parcel-entry.component.ts | 18 ++++++--- .../primary-contact.component.html | 3 +- .../primary-contact.component.spec.ts | 5 +++ .../primary-contact.component.ts | 15 ++++++-- .../excl-proposal.component.html | 16 +++++--- .../excl-proposal.component.spec.ts | 5 +++ .../excl-proposal/excl-proposal.component.ts | 32 +++++++++++++++- .../incl-proposal.component.html | 19 ++++++---- .../incl-proposal.component.spec.ts | 5 +++ .../incl-proposal/incl-proposal.component.ts | 32 +++++++++++++++- .../naru-proposal.component.html | 3 +- .../naru-proposal.component.spec.ts | 5 +++ .../naru-proposal/naru-proposal.component.ts | 14 ++++++- .../nfu-proposal/nfu-proposal.component.html | 7 ++-- .../nfu-proposal.component.spec.ts | 5 +++ .../nfu-proposal/nfu-proposal.component.ts | 13 ++++++- .../pfrs-proposal.component.html | 20 +++++----- .../pfrs-proposal.component.spec.ts | 5 +++ .../pfrs-proposal/pfrs-proposal.component.ts | 32 +++++++++++++++- .../pofo-proposal.component.html | 13 ++++--- .../pofo-proposal.component.spec.ts | 5 +++ .../pofo-proposal/pofo-proposal.component.ts | 26 ++++++++++++- .../roso-proposal.component.html | 9 +++-- .../roso-proposal.component.spec.ts | 5 +++ .../roso-proposal/roso-proposal.component.ts | 26 ++++++++++++- .../subd-proposal.component.html | 6 ++- .../subd-proposal.component.spec.ts | 5 +++ .../subd-proposal/subd-proposal.component.ts | 20 +++++++++- .../tur-proposal/tur-proposal.component.html | 14 +++---- .../tur-proposal.component.spec.ts | 5 +++ .../tur-proposal/tur-proposal.component.ts | 20 +++++++++- .../review-attachments.component.html | 11 ++++-- .../review-attachments.component.ts | 37 +++++++++++++++---- .../additional-information.component.html | 3 +- .../additional-information.component.spec.ts | 5 +++ .../additional-information.component.ts | 13 ++++++- .../edit-submission/files-step.partial.ts | 17 ++++++++- .../other-attachments.component.html | 4 +- .../other-attachments.component.spec.ts | 5 +++ .../other-attachments.component.ts | 13 ++++++- .../parcel-entry/parcel-entry.component.html | 1 + .../parcel-entry/parcel-entry.component.ts | 18 ++++++--- .../primary-contact.component.html | 8 ++-- .../primary-contact.component.spec.ts | 5 +++ .../primary-contact.component.ts | 13 ++++++- .../pfrs/pfrs-proposal.component.html | 12 ++++-- .../pfrs/pfrs-proposal.component.spec.ts | 5 +++ .../proposal/pfrs/pfrs-proposal.component.ts | 31 +++++++++++++++- .../pofo/pofo-proposal.component.html | 9 +++-- .../pofo/pofo-proposal.component.spec.ts | 5 +++ .../proposal/pofo/pofo-proposal.component.ts | 25 ++++++++++++- .../roso/roso-proposal.component.html | 12 ++++-- .../roso/roso-proposal.component.spec.ts | 5 +++ .../proposal/roso/roso-proposal.component.ts | 31 +++++++++++++++- .../edit-submission/files-step.partial.ts | 15 +++++++- .../other-attachments.component.html | 4 +- .../other-attachments.component.spec.ts | 5 +++ .../other-attachments.component.ts | 11 +++++- .../proposal/proposal.component.html | 6 ++- .../proposal/proposal.component.spec.ts | 5 +++ .../proposal/proposal.component.ts | 20 ++++++++-- .../application-document.service.ts | 11 ++---- .../application-owner.service.ts | 5 ++- .../application-parcel.service.ts | 5 ++- .../notice-of-intent-document.service.ts | 5 ++- .../notice-of-intent-owner.service.ts | 5 ++- .../notice-of-intent-parcel.service.ts | 5 ++- .../notification-document.service.ts | 5 ++- .../file-drag-drop.component.html | 11 ++++-- .../file-drag-drop.component.ts | 1 + .../owner-dialog/owner-dialog.component.html | 1 + .../owner-dialog/owner-dialog.component.ts | 25 ++++++++++--- 79 files changed, 728 insertions(+), 197 deletions(-) diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.ts index 32a3904d71..720818d085 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.ts @@ -177,24 +177,6 @@ export class DecisionV2Component implements OnInit, OnDestroy { }); } - async attachFile(decisionUuid: string, event: Event) { - this.decisions = this.decisions.map((decision) => { - return { - ...decision, - loading: decision.uuid === decisionUuid, - }; - }); - const element = event.target as HTMLInputElement; - const fileList = element.files; - if (fileList && fileList.length > 0) { - const file: File = fileList[0]; - const uploadedFile = await this.decisionService.uploadFile(decisionUuid, file); - if (uploadedFile) { - await this.loadDecisions(this.fileNumber); - } - } - } - async onSaveChairReviewDate(decisionUuid: string, chairReviewDate: number) { await this.decisionService.update(decisionUuid, { chairReviewDate: formatDateForApi(chairReviewDate), diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-v2.component.ts b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-v2.component.ts index 190c48fbd0..5e702b77d9 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-v2.component.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-v2.component.ts @@ -169,24 +169,6 @@ export class DecisionV2Component implements OnInit, OnDestroy { }); } - async attachFile(decisionUuid: string, event: Event) { - this.decisions = this.decisions.map((decision) => { - return { - ...decision, - loading: decision.uuid === decisionUuid, - }; - }); - const element = event.target as HTMLInputElement; - const fileList = element.files; - if (fileList && fileList.length > 0) { - const file: File = fileList[0]; - const uploadedFile = await this.decisionService.uploadFile(decisionUuid, file); - if (uploadedFile) { - await this.loadDecisions(this.fileNumber); - } - } - } - async onSaveAuditDate(decisionUuid: string, auditReviewDate: number) { await this.decisionService.update(decisionUuid, { auditDate: formatDateForApi(auditReviewDate), diff --git a/portal-frontend/src/app/features/applications/edit-submission/files-step.partial.ts b/portal-frontend/src/app/features/applications/edit-submission/files-step.partial.ts index c583e6b74d..f937f7d1fd 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/files-step.partial.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/files-step.partial.ts @@ -1,8 +1,10 @@ +import { HttpErrorResponse } from '@angular/common/http'; import { Component, Input } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; import { BehaviorSubject } from 'rxjs'; import { ApplicationDocumentDto } from '../../../services/application-document/application-document.dto'; import { ApplicationDocumentService } from '../../../services/application-document/application-document.service'; +import { ToastService } from '../../../services/toast/toast.service'; import { DOCUMENT_TYPE } from '../../../shared/dto/document.dto'; import { FileHandle } from '../../../shared/file-drag-drop/drag-drop.directive'; import { RemoveFileConfirmationDialogComponent } from '../alcs-edit-submission/remove-file-confirmation-dialog/remove-file-confirmation-dialog.component'; @@ -22,7 +24,11 @@ export abstract class FilesStepComponent extends StepComponent { protected abstract save(): Promise<void>; - protected constructor(protected applicationDocumentService: ApplicationDocumentService, protected dialog: MatDialog) { + protected constructor( + protected applicationDocumentService: ApplicationDocumentService, + protected dialog: MatDialog, + protected toastService: ToastService + ) { super(); } @@ -30,12 +36,22 @@ export abstract class FilesStepComponent extends StepComponent { if (this.fileId) { await this.save(); const mappedFiles = file.file; - await this.applicationDocumentService.attachExternalFile(this.fileId, mappedFiles, documentType); + + try { + await this.applicationDocumentService.attachExternalFile(this.fileId, mappedFiles, documentType); + } catch (err) { + this.toastService.showErrorToast('Document upload failed'); + if (err instanceof HttpErrorResponse && err.status === 403) { + return false; + } + } + const documents = await this.applicationDocumentService.getByFileId(this.fileId); if (documents) { this.$applicationDocuments.next(documents); } } + return true; } async onDeleteFile($event: ApplicationDocumentDto) { diff --git a/portal-frontend/src/app/features/applications/edit-submission/other-attachments/other-attachments.component.html b/portal-frontend/src/app/features/applications/edit-submission/other-attachments/other-attachments.component.html index c526b3d3b5..d35d151771 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/other-attachments/other-attachments.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/other-attachments/other-attachments.component.html @@ -8,9 +8,9 @@ <h2>Optional Attachments</h2> include confidential material within your application. </p> <section> - <div class='subheading2'>Optional Attachments (Max. 100 MB per attachment)</div> + <div class="subheading2">Optional Attachments (Max. 100 MB per attachment)</div> <div class="uploader"> - <app-file-drag-drop (uploadFiles)="attachFile($event, null)"></app-file-drag-drop> + <app-file-drag-drop (uploadFiles)="attachDocument($event)" [showVirusError]="showVirusError"></app-file-drag-drop> </div> <form [formGroup]="form"> <div class="scrollable"> diff --git a/portal-frontend/src/app/features/applications/edit-submission/other-attachments/other-attachments.component.spec.ts b/portal-frontend/src/app/features/applications/edit-submission/other-attachments/other-attachments.component.spec.ts index 3ff3b56c7d..dd7da0cbab 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/other-attachments/other-attachments.component.spec.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/other-attachments/other-attachments.component.spec.ts @@ -9,6 +9,7 @@ import { ApplicationDocumentService } from '../../../../services/application-doc import { ApplicationSubmissionDetailedDto } from '../../../../services/application-submission/application-submission.dto'; import { ApplicationSubmissionService } from '../../../../services/application-submission/application-submission.service'; import { CodeService } from '../../../../services/code/code.service'; +import { ToastService } from '../../../../services/toast/toast.service'; import { OtherAttachmentsComponent } from './other-attachments.component'; @@ -50,6 +51,10 @@ describe('OtherAttachmentsComponent', () => { provide: MatDialog, useValue: {}, }, + { + provide: ToastService, + useValue: {}, + }, ], declarations: [OtherAttachmentsComponent], schemas: [NO_ERRORS_SCHEMA], diff --git a/portal-frontend/src/app/features/applications/edit-submission/other-attachments/other-attachments.component.ts b/portal-frontend/src/app/features/applications/edit-submission/other-attachments/other-attachments.component.ts index b974232ea9..2bf9de75f6 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/other-attachments/other-attachments.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/other-attachments/other-attachments.component.ts @@ -10,7 +10,9 @@ import { import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; import { ApplicationSubmissionService } from '../../../../services/application-submission/application-submission.service'; import { CodeService } from '../../../../services/code/code.service'; +import { ToastService } from '../../../../services/toast/toast.service'; import { DOCUMENT_SOURCE, DOCUMENT_TYPE, DocumentTypeDto } from '../../../../shared/dto/document.dto'; +import { FileHandle } from '../../../../shared/file-drag-drop/drag-drop.directive'; import { EditApplicationSteps } from '../edit-submission.component'; import { FilesStepComponent } from '../files-step.partial'; @@ -29,6 +31,7 @@ export class OtherAttachmentsComponent extends FilesStepComponent implements OnI otherFiles: ApplicationDocumentDto[] = []; private isDirty = false; + showVirusError = false; form = new FormGroup({} as any); private documentCodes: DocumentTypeDto[] = []; @@ -38,9 +41,10 @@ export class OtherAttachmentsComponent extends FilesStepComponent implements OnI private applicationService: ApplicationSubmissionService, private codeService: CodeService, applicationDocumentService: ApplicationDocumentService, - dialog: MatDialog + dialog: MatDialog, + toastService: ToastService ) { - super(applicationDocumentService, dialog); + super(applicationDocumentService, dialog, toastService); } ngOnInit(): void { @@ -75,6 +79,11 @@ export class OtherAttachmentsComponent extends FilesStepComponent implements OnI await this.save(); } + async attachDocument(file: FileHandle) { + const res = await this.attachFile(file, null); + this.showVirusError = !res; + } + protected async save() { if (this.isDirty) { const updateDtos: ApplicationDocumentUpdateDto[] = this.otherFiles.map((file) => ({ diff --git a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html index fa44c72e36..a0336bc05a 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html @@ -185,8 +185,9 @@ <h5>Parcel Lookup</h5> <div class="section" *ngIf="enableCertificateOfTitleUpload"> <label for="certificate-of-title-upload">Upload Certificate of Title</label> <div class="subtext"> - Visit <a href="https://ltsa.ca/property-owners/how-can-i/search-for-a-title/" target="_blank">BC Land Title & Survey</a> to obtain - a recent copy (not older than 1 year) of the Certificate of Title + Visit + <a href="https://ltsa.ca/property-owners/how-can-i/search-for-a-title/" target="_blank">BC Land Title & Survey</a> + to obtain a recent copy (not older than 1 year) of the Certificate of Title </div> <app-file-drag-drop id="certificate-of-title-upload" @@ -197,6 +198,7 @@ <h5>Parcel Lookup</h5> (beforeFileUploadOpened)="beforeFileUploadOpened()" [showErrors]="showErrors" [isRequired]="isCertificateOfTitleRequired" + [showVirusError]="showVirusError" ></app-file-drag-drop> </div> diff --git a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts index 1aef5b9bbe..8d34f6c3b3 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts @@ -57,6 +57,8 @@ export class ParcelEntryComponent implements OnInit { @Input() _disabled = false; @Input() isDraft = false; + showVirusError = false; + @Input() public set disabled(disabled: boolean) { this._disabled = disabled; @@ -247,11 +249,17 @@ export class ParcelEntryComponent implements OnInit { async attachFile(file: FileHandle, parcelUuid: string) { if (parcelUuid) { const mappedFiles = file.file; - this.parcel.certificateOfTitle = await this.applicationParcelService.attachCertificateOfTitle( - this.fileId, - parcelUuid, - mappedFiles - ); + try { + this.parcel.certificateOfTitle = await this.applicationParcelService.attachCertificateOfTitle( + this.fileId, + parcelUuid, + mappedFiles + ); + } catch (e) { + this.showVirusError = true; + return; + } + this.showVirusError = false; } } diff --git a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html index b8eb77b7ee..f385dd329a 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html @@ -157,11 +157,12 @@ <h6>Authorization Letters (if applicable)</h6> <app-file-drag-drop [allowMultiple]="true" [uploadedFiles]="files" - (uploadFiles)="attachFile($event, DOCUMENT_TYPE.AUTHORIZATION_LETTER)" + (uploadFiles)="attachAuthorizationLetter($event)" (deleteFile)="onDeleteFile($event)" (openFile)="openFile($event)" [showErrors]="showErrors" [isRequired]="needsAuthorizationLetter" + [showVirusError]="showVirusError" ></app-file-drag-drop> </div> </section> diff --git a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.spec.ts b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.spec.ts index 1bc4cce935..7e23d17e75 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.spec.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.spec.ts @@ -10,6 +10,7 @@ import { ApplicationSubmissionDetailedDto } from '../../../../services/applicati import { ApplicationSubmissionService } from '../../../../services/application-submission/application-submission.service'; import { UserDto } from '../../../../services/authentication/authentication.dto'; import { AuthenticationService } from '../../../../services/authentication/authentication.service'; +import { ToastService } from '../../../../services/toast/toast.service'; import { PrimaryContactComponent } from './primary-contact.component'; @@ -53,6 +54,10 @@ describe('PrimaryContactComponent', () => { provide: AuthenticationService, useValue: mockAuthService, }, + { + provide: ToastService, + useValue: {}, + }, ], declarations: [PrimaryContactComponent], schemas: [NO_ERRORS_SCHEMA], diff --git a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts index e42b200f13..d64cde9953 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts @@ -9,8 +9,10 @@ import { ApplicationOwnerDto } from '../../../../services/application-owner/appl import { ApplicationOwnerService } from '../../../../services/application-owner/application-owner.service'; import { ApplicationSubmissionService } from '../../../../services/application-submission/application-submission.service'; import { AuthenticationService } from '../../../../services/authentication/authentication.service'; +import { ToastService } from '../../../../services/toast/toast.service'; import { DOCUMENT_TYPE } from '../../../../shared/dto/document.dto'; import { OWNER_TYPE } from '../../../../shared/dto/owner.dto'; +import { FileHandle } from '../../../../shared/file-drag-drop/drag-drop.directive'; import { EditApplicationSteps } from '../edit-submission.component'; import { FilesStepComponent } from '../files-step.partial'; @@ -34,6 +36,7 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni isGovernmentUser = false; governmentName: string | undefined; isDirty = false; + showVirusError = false; firstName = new FormControl<string | null>('', [Validators.required]); lastName = new FormControl<string | null>('', [Validators.required]); @@ -54,12 +57,13 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni constructor( private router: Router, private applicationService: ApplicationSubmissionService, - applicationDocumentService: ApplicationDocumentService, private applicationOwnerService: ApplicationOwnerService, private authenticationService: AuthenticationService, - dialog: MatDialog + applicationDocumentService: ApplicationDocumentService, + dialog: MatDialog, + toastService: ToastService ) { - super(applicationDocumentService, dialog); + super(applicationDocumentService, dialog, toastService); } ngOnInit(): void { @@ -88,6 +92,11 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni await this.save(); } + async attachAuthorizationLetter(file: FileHandle) { + const res = await this.attachFile(file, DOCUMENT_TYPE.AUTHORIZATION_LETTER); + this.showVirusError = !res; + } + onSelectAgent() { this.onSelectOwner('agent'); } diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/excl-proposal/excl-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/excl-proposal/excl-proposal.component.html index 05c0ee1279..2e7f9aa9ef 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/excl-proposal/excl-proposal.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/excl-proposal/excl-proposal.component.html @@ -78,8 +78,8 @@ <h2>Proposal</h2> <div class="full-row"> <label for="purpose">What is the purpose of the proposal?</label> <div class="subtext"> - Include why you are applying for an exclusion, what the proposal will achieve, and any benefits to agriculture that - the proposal provides. + Include why you are applying for an exclusion, what the proposal will achieve, and any benefits to agriculture + that the proposal provides. </div> <mat-form-field appearance="outline"> <textarea @@ -121,11 +121,12 @@ <h2>Proposal</h2> <app-file-drag-drop id="proposal-map" [uploadedFiles]="proposalMap" - (uploadFiles)="attachFile($event, DOCUMENT.PROPOSAL_MAP)" + (uploadFiles)="attachProposalMap($event)" (deleteFile)="onDeleteFile($event)" (openFile)="openFile($event)" [showErrors]="showErrors" [isRequired]="true" + [showVirusError]="showProposalMapVirus" ></app-file-drag-drop> </div> </div> @@ -155,12 +156,13 @@ <h3>Notification and Public Hearing Requirements</h3> <app-file-drag-drop id="advertising" [uploadedFiles]="noticeOfPublicHearing" - (uploadFiles)="attachFile($event, DOCUMENT.PROOF_OF_ADVERTISING)" + (uploadFiles)="attachProofOfAdvertising($event)" (deleteFile)="onDeleteFile($event)" (openFile)="openFile($event)" [showErrors]="showErrors" [allowMultiple]="true" [isRequired]="true" + [showVirusError]="showProofOfAdvertisingVirus" ></app-file-drag-drop> </div> <div class="full-row"> @@ -172,12 +174,13 @@ <h3>Notification and Public Hearing Requirements</h3> <app-file-drag-drop id="signage" [uploadedFiles]="proofOfSignage" - (uploadFiles)="attachFile($event, DOCUMENT.PROOF_OF_SIGNAGE)" + (uploadFiles)="attachProofOfSignage($event)" (deleteFile)="onDeleteFile($event)" (openFile)="openFile($event)" [showErrors]="showErrors" [isRequired]="true" [allowMultiple]="true" + [showVirusError]="showProofOfSignageVirus" ></app-file-drag-drop> </div> <div class="full-row"> @@ -186,12 +189,13 @@ <h3>Notification and Public Hearing Requirements</h3> <app-file-drag-drop id="report" [uploadedFiles]="reportOfPublicHearing" - (uploadFiles)="attachFile($event, DOCUMENT.REPORT_OF_PUBLIC_HEARING)" + (uploadFiles)="attachReportOfPublicHearing($event)" (deleteFile)="onDeleteFile($event)" (openFile)="openFile($event)" [showErrors]="showErrors" [isRequired]="true" [allowMultiple]="true" + [showVirusError]="showReportOfPublicHearingVirus" ></app-file-drag-drop> </div> </div> diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/excl-proposal/excl-proposal.component.spec.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/excl-proposal/excl-proposal.component.spec.ts index 4cc2056ebb..bb2130f9d7 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/excl-proposal/excl-proposal.component.spec.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/excl-proposal/excl-proposal.component.spec.ts @@ -8,6 +8,7 @@ import { ApplicationDocumentDto } from '../../../../../services/application-docu import { ApplicationDocumentService } from '../../../../../services/application-document/application-document.service'; import { ApplicationSubmissionDetailedDto } from '../../../../../services/application-submission/application-submission.dto'; import { ApplicationSubmissionService } from '../../../../../services/application-submission/application-submission.service'; +import { ToastService } from '../../../../../services/toast/toast.service'; import { ExclProposalComponent } from './excl-proposal.component'; @@ -41,6 +42,10 @@ describe('ExclProposalComponent', () => { provide: MatDialog, useValue: {}, }, + { + provide: ToastService, + useValue: {}, + }, ], declarations: [ExclProposalComponent], schemas: [NO_ERRORS_SCHEMA], diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/excl-proposal/excl-proposal.component.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/excl-proposal/excl-proposal.component.ts index 6f50c7aa0b..c8f4463d28 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/excl-proposal/excl-proposal.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/excl-proposal/excl-proposal.component.ts @@ -7,7 +7,9 @@ import { ApplicationDocumentDto } from '../../../../../services/application-docu import { ApplicationDocumentService } from '../../../../../services/application-document/application-document.service'; import { ApplicationSubmissionUpdateDto } from '../../../../../services/application-submission/application-submission.dto'; import { ApplicationSubmissionService } from '../../../../../services/application-submission/application-submission.service'; +import { ToastService } from '../../../../../services/toast/toast.service'; import { DOCUMENT_TYPE } from '../../../../../shared/dto/document.dto'; +import { FileHandle } from '../../../../../shared/file-drag-drop/drag-drop.directive'; import { parseStringToBoolean } from '../../../../../shared/utils/string-helper'; import { EditApplicationSteps } from '../../edit-submission.component'; import { FilesStepComponent } from '../../files-step.partial'; @@ -23,6 +25,11 @@ export class ExclProposalComponent extends FilesStepComponent implements OnInit, currentStep = EditApplicationSteps.Proposal; prescribedBody: string | null = null; + showProposalMapVirus = false; + showProofOfAdvertisingVirus = false; + showProofOfSignageVirus = false; + showReportOfPublicHearingVirus = false; + hectares = new FormControl<string | null>(null, [Validators.required]); shareProperty = new FormControl<string | null>(null, [Validators.required]); purpose = new FormControl<string | null>(null, [Validators.required]); @@ -44,9 +51,10 @@ export class ExclProposalComponent extends FilesStepComponent implements OnInit, private router: Router, private applicationSubmissionService: ApplicationSubmissionService, applicationDocumentService: ApplicationDocumentService, - dialog: MatDialog + dialog: MatDialog, + toastService: ToastService ) { - super(applicationDocumentService, dialog); + super(applicationDocumentService, dialog, toastService); } ngOnInit(): void { @@ -88,6 +96,26 @@ export class ExclProposalComponent extends FilesStepComponent implements OnInit, await this.save(); } + async attachProposalMap(file: FileHandle) { + const res = await this.attachFile(file, DOCUMENT_TYPE.PROPOSAL_MAP); + this.showProposalMapVirus = !res; + } + + async attachProofOfAdvertising(file: FileHandle) { + const res = await this.attachFile(file, DOCUMENT_TYPE.PROOF_OF_ADVERTISING); + this.showProofOfAdvertisingVirus = !res; + } + + async attachProofOfSignage(file: FileHandle) { + const res = await this.attachFile(file, DOCUMENT_TYPE.PROOF_OF_SIGNAGE); + this.showProofOfSignageVirus = !res; + } + + async attachReportOfPublicHearing(file: FileHandle) { + const res = await this.attachFile(file, DOCUMENT_TYPE.REPORT_OF_PUBLIC_HEARING); + this.showReportOfPublicHearingVirus = !res; + } + protected async save() { if (this.fileId && this.form.dirty) { const inclExclHectares = this.hectares.value; diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/incl-proposal/incl-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/incl-proposal/incl-proposal.component.html index a9af25b5ed..49c9476059 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/incl-proposal/incl-proposal.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/incl-proposal/incl-proposal.component.html @@ -42,7 +42,8 @@ <h2>Proposal</h2> <div class="full-row"> <label for="purpose">What is the purpose of the proposal?</label> <div class="subtext"> - Include why you are applying for an inclusion, what the proposal will achieve, and any benefits to agriculture that the proposal provides. + Include why you are applying for an inclusion, what the proposal will achieve, and any benefits to agriculture + that the proposal provides. </div> <mat-form-field appearance="outline"> <textarea @@ -62,9 +63,7 @@ <h2>Proposal</h2> </div> <div class="full-row"> <label for="agSupport">Does the proposal support agriculture in the short or long term?</label> - <div class="subtext"> - Please explain - </div> + <div class="subtext">Please explain</div> <mat-form-field appearance="outline"> <textarea formControlName="agSupport" @@ -113,11 +112,12 @@ <h2>Proposal</h2> <app-file-drag-drop id="proposal-map" [uploadedFiles]="proposalMap" - (uploadFiles)="attachFile($event, DOCUMENT.PROPOSAL_MAP)" + (uploadFiles)="attachProposalMap($event)" (deleteFile)="onDeleteFile($event)" (openFile)="openFile($event)" [showErrors]="showErrors" [isRequired]="true" + [showVirusError]="showProposalMapVirus" ></app-file-drag-drop> </div> <div class="full-row" *ngIf="showGovernmentQuestions"> @@ -192,13 +192,14 @@ <h3>Notification and Public Hearing Requirements</h3> <app-file-drag-drop id="advertising" [uploadedFiles]="noticeOfPublicHearing" - (uploadFiles)="attachFile($event, DOCUMENT.PROOF_OF_ADVERTISING)" + (uploadFiles)="attachProofOfAdvertising($event)" (deleteFile)="onDeleteFile($event)" (openFile)="openFile($event)" [showErrors]="showErrors" [isRequired]="!disableNotificationFileUploads" [disabled]="disableNotificationFileUploads" [allowMultiple]="true" + [showVirusError]="showProofOfAdvertisingVirus" ></app-file-drag-drop> </div> <div class="full-row"> @@ -210,13 +211,14 @@ <h3>Notification and Public Hearing Requirements</h3> <app-file-drag-drop id="signage" [uploadedFiles]="proofOfSignage" - (uploadFiles)="attachFile($event, DOCUMENT.PROOF_OF_SIGNAGE)" + (uploadFiles)="attachProofOfSignage($event)" (deleteFile)="onDeleteFile($event)" (openFile)="openFile($event)" [showErrors]="showErrors" [isRequired]="!disableNotificationFileUploads" [disabled]="disableNotificationFileUploads" [allowMultiple]="true" + [showVirusError]="showProofOfSignageVirus" ></app-file-drag-drop> </div> <div class="full-row"> @@ -225,12 +227,13 @@ <h3>Notification and Public Hearing Requirements</h3> <app-file-drag-drop id="report" [uploadedFiles]="reportOfPublicHearing" - (uploadFiles)="attachFile($event, DOCUMENT.REPORT_OF_PUBLIC_HEARING)" + (uploadFiles)="attachReportOfPublicHearing($event)" (deleteFile)="onDeleteFile($event)" (openFile)="openFile($event)" [showErrors]="showErrors" [isRequired]="!disableNotificationFileUploads" [disabled]="disableNotificationFileUploads" + [showVirusError]="showReportOfPublicHearingVirus" [allowMultiple]="true" ></app-file-drag-drop> </div> diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/incl-proposal/incl-proposal.component.spec.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/incl-proposal/incl-proposal.component.spec.ts index a6d0e67ae7..27ed1cea14 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/incl-proposal/incl-proposal.component.spec.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/incl-proposal/incl-proposal.component.spec.ts @@ -5,6 +5,7 @@ import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { BehaviorSubject } from 'rxjs'; import { UserDto } from '../../../../../services/authentication/authentication.dto'; import { AuthenticationService } from '../../../../../services/authentication/authentication.service'; +import { ToastService } from '../../../../../services/toast/toast.service'; import { InclProposalComponent } from './incl-proposal.component'; import { ApplicationSubmissionService } from '../../../../../services/application-submission/application-submission.service'; import { ApplicationDocumentService } from '../../../../../services/application-document/application-document.service'; @@ -42,6 +43,10 @@ describe('InclProposalComponent', () => { provide: MatDialog, useValue: {}, }, + { + provide: ToastService, + useValue: {}, + }, ], declarations: [InclProposalComponent], schemas: [NO_ERRORS_SCHEMA], diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/incl-proposal/incl-proposal.component.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/incl-proposal/incl-proposal.component.ts index c4b34405ef..46e930e67d 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/incl-proposal/incl-proposal.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/incl-proposal/incl-proposal.component.ts @@ -1,7 +1,9 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; import { MatButtonToggleChange } from '@angular/material/button-toggle'; import { AuthenticationService } from '../../../../../services/authentication/authentication.service'; +import { ToastService } from '../../../../../services/toast/toast.service'; import { DOCUMENT_TYPE } from '../../../../../shared/dto/document.dto'; +import { FileHandle } from '../../../../../shared/file-drag-drop/drag-drop.directive'; import { formatBooleanToString } from '../../../../../shared/utils/boolean-helper'; import { parseStringToBoolean } from '../../../../../shared/utils/string-helper'; import { FilesStepComponent } from '../../files-step.partial'; @@ -35,6 +37,11 @@ export class InclProposalComponent extends FilesStepComponent implements OnInit, governmentName? = ''; disableNotificationFileUploads = false; + showProposalMapVirus = false; + showProofOfAdvertisingVirus = false; + showProofOfSignageVirus = false; + showReportOfPublicHearingVirus = false; + hectares = new FormControl<string | null>(null, [Validators.required]); purpose = new FormControl<string | null>(null, [Validators.required]); agSupport = new FormControl<string | null>(null, [Validators.required]); @@ -57,9 +64,10 @@ export class InclProposalComponent extends FilesStepComponent implements OnInit, private applicationSubmissionService: ApplicationSubmissionService, private authenticationService: AuthenticationService, applicationDocumentService: ApplicationDocumentService, - dialog: MatDialog + dialog: MatDialog, + toastService: ToastService ) { - super(applicationDocumentService, dialog); + super(applicationDocumentService, dialog, toastService); } ngOnInit(): void { @@ -120,6 +128,26 @@ export class InclProposalComponent extends FilesStepComponent implements OnInit, await this.save(); } + async attachProposalMap(file: FileHandle) { + const res = await this.attachFile(file, DOCUMENT_TYPE.PROPOSAL_MAP); + this.showProposalMapVirus = !res; + } + + async attachProofOfAdvertising(file: FileHandle) { + const res = await this.attachFile(file, DOCUMENT_TYPE.PROOF_OF_ADVERTISING); + this.showProofOfAdvertisingVirus = !res; + } + + async attachProofOfSignage(file: FileHandle) { + const res = await this.attachFile(file, DOCUMENT_TYPE.PROOF_OF_SIGNAGE); + this.showProofOfSignageVirus = !res; + } + + async attachReportOfPublicHearing(file: FileHandle) { + const res = await this.attachFile(file, DOCUMENT_TYPE.REPORT_OF_PUBLIC_HEARING); + this.showReportOfPublicHearingVirus = !res; + } + protected async save() { if (this.fileId) { const inclExclHectares = this.hectares.value; diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.html index 1e37f1bd57..d6a2e26ac1 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.html @@ -431,11 +431,12 @@ <h2>Proposal</h2> <app-file-drag-drop id="proposal-map" [uploadedFiles]="proposalMap" - (uploadFiles)="attachFile($event, DOCUMENT_TYPE.PROPOSAL_MAP)" + (uploadFiles)="attachProposalMap($event)" (deleteFile)="onDeleteFile($event)" (openFile)="openFile($event)" [showErrors]="showErrors" [isRequired]="true" + [showVirusError]='showProposalMapVirus' ></app-file-drag-drop> </div> diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.spec.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.spec.ts index 8436de1c4e..c151850c2a 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.spec.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.spec.ts @@ -9,6 +9,7 @@ import { ApplicationDocumentService } from '../../../../../services/application- import { ApplicationSubmissionDetailedDto } from '../../../../../services/application-submission/application-submission.dto'; import { ApplicationSubmissionService } from '../../../../../services/application-submission/application-submission.service'; import { CodeService } from '../../../../../services/code/code.service'; +import { ToastService } from '../../../../../services/toast/toast.service'; import { NaruProposalComponent } from './naru-proposal.component'; @@ -44,6 +45,10 @@ describe('NaruProposalComponent', () => { provide: CodeService, useValue: {}, }, + { + provide: ToastService, + useValue: {}, + }, ], declarations: [NaruProposalComponent], schemas: [NO_ERRORS_SCHEMA], diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.ts index 125f7092c1..d408796b80 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.ts @@ -12,7 +12,9 @@ import { } from '../../../../../services/application-submission/application-submission.dto'; import { ApplicationSubmissionService } from '../../../../../services/application-submission/application-submission.service'; import { CodeService } from '../../../../../services/code/code.service'; +import { ToastService } from '../../../../../services/toast/toast.service'; import { DOCUMENT_TYPE } from '../../../../../shared/dto/document.dto'; +import { FileHandle } from '../../../../../shared/file-drag-drop/drag-drop.directive'; import { formatBooleanToYesNoString } from '../../../../../shared/utils/boolean-helper'; import { EditApplicationSteps } from '../../edit-submission.component'; import { FilesStepComponent } from '../../files-step.partial'; @@ -27,6 +29,8 @@ import { ChangeSubtypeConfirmationDialogComponent } from './change-subtype-confi export class NaruProposalComponent extends FilesStepComponent implements OnInit, OnDestroy { currentStep = EditApplicationSteps.Proposal; + showProposalMapVirus = false; + previousSubtype: string | null = null; subtype = new FormControl<string | null>(null, [Validators.required]); purpose = new FormControl<string | null>(null, [Validators.required]); @@ -71,9 +75,10 @@ export class NaruProposalComponent extends FilesStepComponent implements OnInit, private applicationSubmissionService: ApplicationSubmissionService, private codeService: CodeService, applicationDocumentService: ApplicationDocumentService, - dialog: MatDialog + dialog: MatDialog, + toastService: ToastService ) { - super(applicationDocumentService, dialog); + super(applicationDocumentService, dialog, toastService); } ngOnInit(): void { @@ -135,6 +140,11 @@ export class NaruProposalComponent extends FilesStepComponent implements OnInit, await this.save(); } + async attachProposalMap(file: FileHandle) { + const res = await this.attachFile(file, DOCUMENT_TYPE.PROPOSAL_MAP); + this.showProposalMapVirus = !res; + } + onChangeSubtype($event: MatRadioChange) { if (this.previousSubtype) { this.dialog diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/nfu-proposal/nfu-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/nfu-proposal/nfu-proposal.component.html index 27a24bcc3b..ec76b0445f 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/nfu-proposal/nfu-proposal.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/nfu-proposal/nfu-proposal.component.html @@ -107,11 +107,12 @@ <h2>Proposal</h2> <app-file-drag-drop id="proposal-map" [uploadedFiles]="proposalMap" - (uploadFiles)="attachFile($event, DOCUMENT_TYPE.PROPOSAL_MAP)" + (uploadFiles)="attachProposalMap($event)" (deleteFile)="onDeleteFile($event)" (openFile)="openFile($event)" [showErrors]="showErrors" [isRequired]="true" + [showVirusError]="showProposalMapVirus" ></app-file-drag-drop> </div> <div class="full-row"> @@ -224,9 +225,7 @@ <h4>Project Duration</h4> </div> <div> <label for="projectDurationAmount">Length</label> - <div class='subtext'> - Decimals can be used - e.g. 3.5 months or 1.5 years - </div> + <div class="subtext">Decimals can be used - e.g. 3.5 months or 1.5 years</div> <mat-form-field appearance="outline"> <input id="projectDurationAmount" diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/nfu-proposal/nfu-proposal.component.spec.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/nfu-proposal/nfu-proposal.component.spec.ts index cacddb9aed..0d6b933159 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/nfu-proposal/nfu-proposal.component.spec.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/nfu-proposal/nfu-proposal.component.spec.ts @@ -8,6 +8,7 @@ import { ApplicationDocumentDto } from '../../../../../services/application-docu import { ApplicationDocumentService } from '../../../../../services/application-document/application-document.service'; import { ApplicationSubmissionDetailedDto } from '../../../../../services/application-submission/application-submission.dto'; import { ApplicationSubmissionService } from '../../../../../services/application-submission/application-submission.service'; +import { ToastService } from '../../../../../services/toast/toast.service'; import { NfuProposalComponent } from './nfu-proposal.component'; @@ -39,6 +40,10 @@ describe('NfuProposalComponent', () => { provide: Router, useValue: mockRouter, }, + { + provide: ToastService, + useValue: {}, + }, ], declarations: [NfuProposalComponent], schemas: [NO_ERRORS_SCHEMA], diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/nfu-proposal/nfu-proposal.component.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/nfu-proposal/nfu-proposal.component.ts index dbc27c67ab..8c6902a55b 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/nfu-proposal/nfu-proposal.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/nfu-proposal/nfu-proposal.component.ts @@ -7,7 +7,9 @@ import { ApplicationDocumentDto } from '../../../../../services/application-docu import { ApplicationDocumentService } from '../../../../../services/application-document/application-document.service'; import { ApplicationSubmissionUpdateDto } from '../../../../../services/application-submission/application-submission.dto'; import { ApplicationSubmissionService } from '../../../../../services/application-submission/application-submission.service'; +import { ToastService } from '../../../../../services/toast/toast.service'; import { DOCUMENT_TYPE } from '../../../../../shared/dto/document.dto'; +import { FileHandle } from '../../../../../shared/file-drag-drop/drag-drop.directive'; import { SoilTableData } from '../../../../../shared/soil-table/soil-table.component'; import { parseStringToBoolean } from '../../../../../shared/utils/string-helper'; import { EditApplicationSteps } from '../../edit-submission.component'; @@ -22,6 +24,7 @@ export class NfuProposalComponent extends FilesStepComponent implements OnInit, currentStep = EditApplicationSteps.Proposal; fillTableData: SoilTableData = {}; + showProposalMapVirus = false; hectares = new FormControl<string | null>(null, [Validators.required]); purpose = new FormControl<string | null>(null, [Validators.required]); @@ -51,9 +54,10 @@ export class NfuProposalComponent extends FilesStepComponent implements OnInit, private router: Router, private applicationSubmissionService: ApplicationSubmissionService, applicationDocumentService: ApplicationDocumentService, - dialog: MatDialog + dialog: MatDialog, + toastService: ToastService ) { - super(applicationDocumentService, dialog); + super(applicationDocumentService, dialog, toastService); } ngOnInit(): void { @@ -100,6 +104,11 @@ export class NfuProposalComponent extends FilesStepComponent implements OnInit, await this.save(); } + async attachProposalMap(file: FileHandle) { + const res = await this.attachFile(file, DOCUMENT_TYPE.PROPOSAL_MAP); + this.showProposalMapVirus = !res; + } + protected async save() { if (this.fileId && this.form.dirty) { const nfuHectares = this.hectares.getRawValue(); diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.html index 9b0aa7c445..84636584c6 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.html @@ -70,8 +70,8 @@ <h2>Proposal</h2> <div class="full-row"> <label for="purpose">What is the purpose of the proposal?</label> <div class="subtext"> - Include why you are applying for placement of fill and removal of soil, what the proposal will achieve, and any benefits to - agriculture that the proposal provides. + Include why you are applying for placement of fill and removal of soil, what the proposal will achieve, and any + benefits to agriculture that the proposal provides. </div> <mat-form-field appearance="outline"> <textarea @@ -172,9 +172,7 @@ <h4>Project Duration</h4> </div> <div> <label for="projectDurationAmount">Length</label> - <div class='subtext'> - Decimals can be used - e.g. 3.5 months or 1.5 years - </div> + <div class="subtext">Decimals can be used - e.g. 3.5 months or 1.5 years</div> <mat-form-field appearance="outline"> <input id="projectDurationAmount" @@ -305,11 +303,12 @@ <h4>Project Duration</h4> <app-file-drag-drop id="proposal-map" [uploadedFiles]="proposalMap" - (uploadFiles)="attachFile($event, DOCUMENT.PROPOSAL_MAP)" + (uploadFiles)="attachProposalMap($event)" (deleteFile)="onDeleteFile($event)" (openFile)="openFile($event)" [showErrors]="showErrors" [isRequired]="true" + [showVirusError]="showProposalMapVirus" ></app-file-drag-drop> </div> <div class="full-row"> @@ -321,12 +320,13 @@ <h4>Project Duration</h4> <app-file-drag-drop id="cross-section" [uploadedFiles]="crossSections" - (uploadFiles)="attachFile($event, DOCUMENT.CROSS_SECTIONS)" + (uploadFiles)="attachCrossSection($event)" (deleteFile)="onDeleteFile($event)" (openFile)="openFile($event)" [showErrors]="showErrors" [isRequired]="true" [allowMultiple]="true" + [showVirusError]="showCrossSectionVirus" ></app-file-drag-drop> </div> <div class="full-row"> @@ -341,12 +341,13 @@ <h4>Project Duration</h4> <app-file-drag-drop id="reclamation-plan" [uploadedFiles]="reclamationPlan" - (uploadFiles)="attachFile($event, DOCUMENT.RECLAMATION_PLAN)" + (uploadFiles)="attachReclamationPlan($event)" (deleteFile)="onDeleteFile($event)" (openFile)="openFile($event)" [showErrors]="showErrors" [isRequired]="true" [allowMultiple]="true" + [showVirusError]="showReclamationPlanVirus" ></app-file-drag-drop> </div> @@ -421,13 +422,14 @@ <h4>Project Duration</h4> <app-file-drag-drop id="noticeOfWork" [uploadedFiles]="noticeOfWork" - (uploadFiles)="attachFile($event, DOCUMENT.NOTICE_OF_WORK)" + (uploadFiles)="attachNoticeOfWork($event)" (deleteFile)="onDeleteFile($event)" (openFile)="openFile($event)" [showErrors]="showErrors" [isRequired]="true" [disabled]="!requiresNoticeOfWork" [allowMultiple]="true" + [showVirusError]="showNoticeOfWorkVirus" ></app-file-drag-drop> </div> </div> diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.spec.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.spec.ts index 72ff08d305..3195a84b6c 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.spec.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.spec.ts @@ -9,6 +9,7 @@ import { ApplicationDocumentService } from '../../../../../services/application- import { ApplicationParcelService } from '../../../../../services/application-parcel/application-parcel.service'; import { ApplicationSubmissionDetailedDto } from '../../../../../services/application-submission/application-submission.dto'; import { ApplicationSubmissionService } from '../../../../../services/application-submission/application-submission.service'; +import { ToastService } from '../../../../../services/toast/toast.service'; import { PfrsProposalComponent } from './pfrs-proposal.component'; @@ -50,6 +51,10 @@ describe('RosoProposalComponent', () => { provide: MatDialog, useValue: {}, }, + { + provide: ToastService, + useValue: {}, + }, ], declarations: [PfrsProposalComponent], schemas: [NO_ERRORS_SCHEMA], diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.ts index 2b0e865f2c..7eaba95cc3 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.ts @@ -7,7 +7,9 @@ import { ApplicationDocumentDto } from '../../../../../services/application-docu import { ApplicationDocumentService } from '../../../../../services/application-document/application-document.service'; import { ApplicationSubmissionUpdateDto } from '../../../../../services/application-submission/application-submission.dto'; import { ApplicationSubmissionService } from '../../../../../services/application-submission/application-submission.service'; +import { ToastService } from '../../../../../services/toast/toast.service'; import { DOCUMENT_TYPE } from '../../../../../shared/dto/document.dto'; +import { FileHandle } from '../../../../../shared/file-drag-drop/drag-drop.directive'; import { formatBooleanToString } from '../../../../../shared/utils/boolean-helper'; import { MOBILE_BREAKPOINT } from '../../../../../shared/utils/breakpoints'; import { parseStringToBoolean } from '../../../../../shared/utils/string-helper'; @@ -36,6 +38,11 @@ export class PfrsProposalComponent extends FilesStepComponent implements OnInit, noticeOfWork: ApplicationDocumentDto[] = []; areComponentsDirty = false; + showProposalMapVirus = false; + showCrossSectionVirus = false; + showReclamationPlanVirus = false; + showNoticeOfWorkVirus = false; + isFollowUp = new FormControl<string | null>(null, [Validators.required]); followUpIDs = new FormControl<string | null>({ value: null, disabled: true }, [Validators.required]); purpose = new FormControl<string | null>(null, [Validators.required]); @@ -74,9 +81,10 @@ export class PfrsProposalComponent extends FilesStepComponent implements OnInit, private router: Router, private applicationService: ApplicationSubmissionService, applicationDocumentService: ApplicationDocumentService, - dialog: MatDialog + dialog: MatDialog, + toastService: ToastService ) { - super(applicationDocumentService, dialog); + super(applicationDocumentService, dialog, toastService); } ngOnInit(): void { @@ -158,6 +166,26 @@ export class PfrsProposalComponent extends FilesStepComponent implements OnInit, await this.save(); } + async attachProposalMap(file: FileHandle) { + const res = await this.attachFile(file, DOCUMENT_TYPE.PROPOSAL_MAP); + this.showProposalMapVirus = !res; + } + + async attachCrossSection(file: FileHandle) { + const res = await this.attachFile(file, DOCUMENT_TYPE.CROSS_SECTIONS); + this.showCrossSectionVirus = !res; + } + + async attachReclamationPlan(file: FileHandle) { + const res = await this.attachFile(file, DOCUMENT_TYPE.RECLAMATION_PLAN); + this.showReclamationPlanVirus = !res; + } + + async attachNoticeOfWork(file: FileHandle) { + const res = await this.attachFile(file, DOCUMENT_TYPE.NOTICE_OF_WORK); + this.showNoticeOfWorkVirus = !res; + } + protected async save() { if (this.fileId && (this.form.dirty || this.areComponentsDirty)) { const isFollowUp = this.isFollowUp.getRawValue(); diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.html index 315120a57b..d42b16e59a 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.html @@ -138,9 +138,7 @@ <h4>Project Duration</h4> </div> <div> <label for="projectDurationAmount">Length</label> - <div class='subtext'> - Decimals can be used - e.g. 3.5 months or 1.5 years - </div> + <div class="subtext">Decimals can be used - e.g. 3.5 months or 1.5 years</div> <mat-form-field appearance="outline"> <input id="projectDurationAmount" @@ -251,11 +249,12 @@ <h4>Project Duration</h4> <app-file-drag-drop id="proposal-map" [uploadedFiles]="proposalMap" - (uploadFiles)="attachFile($event, DOCUMENT.PROPOSAL_MAP)" + (uploadFiles)="attachProposalMap($event)" (deleteFile)="onDeleteFile($event)" (openFile)="openFile($event)" [showErrors]="showErrors" [isRequired]="true" + [showVirusError]="showProposalMapVirus" ></app-file-drag-drop> </div> <div class="full-row"> @@ -267,12 +266,13 @@ <h4>Project Duration</h4> <app-file-drag-drop id="cross-section" [uploadedFiles]="crossSections" - (uploadFiles)="attachFile($event, DOCUMENT.CROSS_SECTIONS)" + (uploadFiles)="attachCrossSection($event)" (deleteFile)="onDeleteFile($event)" (openFile)="openFile($event)" [showErrors]="showErrors" [isRequired]="true" [allowMultiple]="true" + [showVirusError]="showCrossSectionVirus" ></app-file-drag-drop> </div> <div class="full-row"> @@ -287,12 +287,13 @@ <h4>Project Duration</h4> <app-file-drag-drop id="reclamation-plan" [uploadedFiles]="reclamationPlan" - (uploadFiles)="attachFile($event, DOCUMENT.RECLAMATION_PLAN)" + (uploadFiles)="attachReclamationPlan($event)" (deleteFile)="onDeleteFile($event)" (openFile)="openFile($event)" [showErrors]="showErrors" [isRequired]="true" [allowMultiple]="true" + [showVirusError]="showReclamationPlanVirus" ></app-file-drag-drop> </div> </div> diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.spec.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.spec.ts index 8c73afeec4..03f72c3062 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.spec.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.spec.ts @@ -9,6 +9,7 @@ import { ApplicationDocumentService } from '../../../../../services/application- import { ApplicationParcelService } from '../../../../../services/application-parcel/application-parcel.service'; import { ApplicationSubmissionDetailedDto } from '../../../../../services/application-submission/application-submission.dto'; import { ApplicationSubmissionService } from '../../../../../services/application-submission/application-submission.service'; +import { ToastService } from '../../../../../services/toast/toast.service'; import { PofoProposalComponent } from './pofo-proposal.component'; @@ -50,6 +51,10 @@ describe('PofoProposalComponent', () => { provide: MatDialog, useValue: {}, }, + { + provide: ToastService, + useValue: {}, + }, ], declarations: [PofoProposalComponent], schemas: [NO_ERRORS_SCHEMA], diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.ts index 986baff612..924961c07b 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.ts @@ -7,7 +7,9 @@ import { ApplicationDocumentDto } from '../../../../../services/application-docu import { ApplicationDocumentService } from '../../../../../services/application-document/application-document.service'; import { ApplicationSubmissionUpdateDto } from '../../../../../services/application-submission/application-submission.dto'; import { ApplicationSubmissionService } from '../../../../../services/application-submission/application-submission.service'; +import { ToastService } from '../../../../../services/toast/toast.service'; import { DOCUMENT_TYPE } from '../../../../../shared/dto/document.dto'; +import { FileHandle } from '../../../../../shared/file-drag-drop/drag-drop.directive'; import { formatBooleanToString } from '../../../../../shared/utils/boolean-helper'; import { parseStringToBoolean } from '../../../../../shared/utils/string-helper'; import { EditApplicationSteps } from '../../edit-submission.component'; @@ -27,6 +29,10 @@ export class PofoProposalComponent extends FilesStepComponent implements OnInit, crossSections: ApplicationDocumentDto[] = []; reclamationPlan: ApplicationDocumentDto[] = []; + showProposalMapVirus = false; + showCrossSectionVirus = false; + showReclamationPlanVirus = false; + isFollowUp = new FormControl<string | null>(null, [Validators.required]); followUpIDs = new FormControl<string | null>({ value: null, disabled: true }, [Validators.required]); purpose = new FormControl<string | null>(null, [Validators.required]); @@ -56,9 +62,10 @@ export class PofoProposalComponent extends FilesStepComponent implements OnInit, private router: Router, private applicationService: ApplicationSubmissionService, applicationDocumentService: ApplicationDocumentService, - dialog: MatDialog + dialog: MatDialog, + toastService: ToastService ) { - super(applicationDocumentService, dialog); + super(applicationDocumentService, dialog, toastService); } ngOnInit(): void { @@ -112,6 +119,21 @@ export class PofoProposalComponent extends FilesStepComponent implements OnInit, await this.save(); } + async attachProposalMap(file: FileHandle) { + const res = await this.attachFile(file, DOCUMENT_TYPE.PROPOSAL_MAP); + this.showProposalMapVirus = !res; + } + + async attachCrossSection(file: FileHandle) { + const res = await this.attachFile(file, DOCUMENT_TYPE.CROSS_SECTIONS); + this.showCrossSectionVirus = !res; + } + + async attachReclamationPlan(file: FileHandle) { + const res = await this.attachFile(file, DOCUMENT_TYPE.RECLAMATION_PLAN); + this.showReclamationPlanVirus = !res; + } + protected async save() { if (this.fileId && (this.form.dirty || this.areComponentsDirty)) { const isFollowUp = this.isFollowUp.getRawValue(); diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.html index 2ec16b2ce6..07d09701f6 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.html @@ -220,11 +220,12 @@ <h4>Project Duration</h4> <app-file-drag-drop id="proposal-map" [uploadedFiles]="proposalMap" - (uploadFiles)="attachFile($event, DOCUMENT.PROPOSAL_MAP)" + (uploadFiles)="attachProposalMap($event)" (deleteFile)="onDeleteFile($event)" (openFile)="openFile($event)" [showErrors]="showErrors" [isRequired]="true" + [showVirusError]="showProposalMapVirus" ></app-file-drag-drop> </div> <div class="full-row"> @@ -236,12 +237,13 @@ <h4>Project Duration</h4> <app-file-drag-drop id="cross-section" [uploadedFiles]="crossSections" - (uploadFiles)="attachFile($event, DOCUMENT.CROSS_SECTIONS)" + (uploadFiles)="attachCrossSection($event)" (deleteFile)="onDeleteFile($event)" (openFile)="openFile($event)" [showErrors]="showErrors" [isRequired]="true" [allowMultiple]="true" + [showVirusError]="showCrossSectionVirus" ></app-file-drag-drop> </div> <div class="full-row"> @@ -256,12 +258,13 @@ <h4>Project Duration</h4> <app-file-drag-drop id="reclamation-plan" [uploadedFiles]="reclamationPlan" - (uploadFiles)="attachFile($event, DOCUMENT.RECLAMATION_PLAN)" + (uploadFiles)="attachReclamationPlan($event)" (deleteFile)="onDeleteFile($event)" (openFile)="openFile($event)" [showErrors]="showErrors" [isRequired]="true" [allowMultiple]="true" + [showVirusError]="showReclamationPlanVirus" ></app-file-drag-drop> </div> </div> diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.spec.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.spec.ts index 6c17a24fe7..d5248ba1f2 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.spec.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.spec.ts @@ -9,6 +9,7 @@ import { ApplicationDocumentService } from '../../../../../services/application- import { ApplicationParcelService } from '../../../../../services/application-parcel/application-parcel.service'; import { ApplicationSubmissionDetailedDto } from '../../../../../services/application-submission/application-submission.dto'; import { ApplicationSubmissionService } from '../../../../../services/application-submission/application-submission.service'; +import { ToastService } from '../../../../../services/toast/toast.service'; import { RosoProposalComponent } from './roso-proposal.component'; @@ -50,6 +51,10 @@ describe('RosoProposalComponent', () => { provide: MatDialog, useValue: {}, }, + { + provide: ToastService, + useValue: {}, + }, ], declarations: [RosoProposalComponent], schemas: [NO_ERRORS_SCHEMA], diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.ts index cd4a416290..0ab956b170 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.ts @@ -7,7 +7,9 @@ import { ApplicationDocumentDto } from '../../../../../services/application-docu import { ApplicationDocumentService } from '../../../../../services/application-document/application-document.service'; import { ApplicationSubmissionUpdateDto } from '../../../../../services/application-submission/application-submission.dto'; import { ApplicationSubmissionService } from '../../../../../services/application-submission/application-submission.service'; +import { ToastService } from '../../../../../services/toast/toast.service'; import { DOCUMENT_TYPE } from '../../../../../shared/dto/document.dto'; +import { FileHandle } from '../../../../../shared/file-drag-drop/drag-drop.directive'; import { formatBooleanToString } from '../../../../../shared/utils/boolean-helper'; import { parseStringToBoolean } from '../../../../../shared/utils/string-helper'; import { EditApplicationSteps } from '../../edit-submission.component'; @@ -28,6 +30,10 @@ export class RosoProposalComponent extends FilesStepComponent implements OnInit, crossSections: ApplicationDocumentDto[] = []; reclamationPlan: ApplicationDocumentDto[] = []; + showProposalMapVirus = false; + showCrossSectionVirus = false; + showReclamationPlanVirus = false; + isFollowUp = new FormControl<string | null>(null, [Validators.required]); followUpIds = new FormControl<string | null>({ value: null, disabled: true }, [Validators.required]); purpose = new FormControl<string | null>(null, [Validators.required]); @@ -55,9 +61,10 @@ export class RosoProposalComponent extends FilesStepComponent implements OnInit, private router: Router, private applicationService: ApplicationSubmissionService, applicationDocumentService: ApplicationDocumentService, - dialog: MatDialog + dialog: MatDialog, + toastService: ToastService ) { - super(applicationDocumentService, dialog); + super(applicationDocumentService, dialog, toastService); } ngOnInit(): void { @@ -110,6 +117,21 @@ export class RosoProposalComponent extends FilesStepComponent implements OnInit, await this.save(); } + async attachProposalMap(file: FileHandle) { + const res = await this.attachFile(file, DOCUMENT_TYPE.PROPOSAL_MAP); + this.showProposalMapVirus = !res; + } + + async attachCrossSection(file: FileHandle) { + const res = await this.attachFile(file, DOCUMENT_TYPE.CROSS_SECTIONS); + this.showCrossSectionVirus = !res; + } + + async attachReclamationPlan(file: FileHandle) { + const res = await this.attachFile(file, DOCUMENT_TYPE.RECLAMATION_PLAN); + this.showReclamationPlanVirus = !res; + } + protected async save() { if (this.fileId && (this.form.dirty || this.areComponentsDirty)) { const isNOIFollowUp = this.isFollowUp.getRawValue(); diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.html index 1e1d11d939..a254403170 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.html @@ -212,11 +212,12 @@ <h6>Documents needed for this step:</h6> <app-file-drag-drop id="proposal-map" [uploadedFiles]="proposalMap" - (uploadFiles)="attachFile($event, DOCUMENT_TYPE.PROPOSAL_MAP)" + (uploadFiles)="attachProposalMap($event)" (deleteFile)="onDeleteFile($event)" (openFile)="openFile($event)" [showErrors]="showErrors" [isRequired]="true" + [showVirusError]="showProposalMapVirus" ></app-file-drag-drop> </div> <div class="full-row"> @@ -258,13 +259,14 @@ <h6>Documents needed for this step:</h6> <app-file-drag-drop id="ownership" [uploadedFiles]="homesiteSeverance" - (uploadFiles)="attachFile($event, DOCUMENT_TYPE.HOMESITE_SEVERANCE)" + (uploadFiles)="attachHomesiteSeverance($event)" (deleteFile)="onDeleteFile($event)" (openFile)="openFile($event)" [showErrors]="showErrors" [isRequired]="isHomeSiteSeverance.getRawValue() !== 'false'" [allowMultiple]="true" [disabled]="isHomeSiteSeverance.getRawValue() === 'false'" + [showVirusError]="showHomesiteSeveranceVirus" ></app-file-drag-drop> </div> </div> diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.spec.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.spec.ts index 688c0570db..6c57284007 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.spec.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.spec.ts @@ -9,6 +9,7 @@ import { ApplicationDocumentService } from '../../../../../services/application- import { ApplicationParcelService } from '../../../../../services/application-parcel/application-parcel.service'; import { ApplicationSubmissionDetailedDto } from '../../../../../services/application-submission/application-submission.dto'; import { ApplicationSubmissionService } from '../../../../../services/application-submission/application-submission.service'; +import { ToastService } from '../../../../../services/toast/toast.service'; import { SubdProposalComponent } from './subd-proposal.component'; @@ -50,6 +51,10 @@ describe('SubdProposalComponent', () => { provide: MatDialog, useValue: {}, }, + { + provide: ToastService, + useValue: {}, + }, ], declarations: [SubdProposalComponent], schemas: [NO_ERRORS_SCHEMA], diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.ts index 2b0330011d..a37c35acea 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.ts @@ -13,7 +13,9 @@ import { ProposedLot, } from '../../../../../services/application-submission/application-submission.dto'; import { ApplicationSubmissionService } from '../../../../../services/application-submission/application-submission.service'; +import { ToastService } from '../../../../../services/toast/toast.service'; import { DOCUMENT_TYPE } from '../../../../../shared/dto/document.dto'; +import { FileHandle } from '../../../../../shared/file-drag-drop/drag-drop.directive'; import { EditApplicationSteps } from '../../edit-submission.component'; import { FilesStepComponent } from '../../files-step.partial'; @@ -30,6 +32,9 @@ export class SubdProposalComponent extends FilesStepComponent implements OnInit, homesiteSeverance: ApplicationDocumentDto[] = []; proposalMap: ApplicationDocumentDto[] = []; + showHomesiteSeveranceVirus = false; + showProposalMapVirus = false; + lotsProposed = new FormControl<string | null>(null, [Validators.required]); purpose = new FormControl<string | null>(null, [Validators.required]); suitability = new FormControl<string | null>(null, [Validators.required]); @@ -57,9 +62,10 @@ export class SubdProposalComponent extends FilesStepComponent implements OnInit, private applicationService: ApplicationSubmissionService, private parcelService: ApplicationParcelService, applicationDocumentService: ApplicationDocumentService, - dialog: MatDialog + dialog: MatDialog, + toastService: ToastService ) { - super(applicationDocumentService, dialog); + super(applicationDocumentService, dialog, toastService); } ngOnInit(): void { @@ -114,6 +120,16 @@ export class SubdProposalComponent extends FilesStepComponent implements OnInit, await this.save(); } + async attachProposalMap(file: FileHandle) { + const res = await this.attachFile(file, DOCUMENT_TYPE.PROPOSAL_MAP); + this.showProposalMapVirus = !res; + } + + async attachHomesiteSeverance(file: FileHandle) { + const res = await this.attachFile(file, DOCUMENT_TYPE.HOMESITE_SEVERANCE); + this.showHomesiteSeveranceVirus = !res; + } + protected async save() { if (this.fileId && (this.form.dirty || this.lotsForm.dirty)) { const purpose = this.purpose.getRawValue(); diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/tur-proposal/tur-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/tur-proposal/tur-proposal.component.html index 56cabe76f2..d8ba820098 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/tur-proposal/tur-proposal.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/tur-proposal/tur-proposal.component.html @@ -34,8 +34,8 @@ <h6>Documents needed for this step:</h6> <div class="full-row"> <label for="purpose">What is the purpose of the proposal?</label> <div class="subtext"> - Include why you are applying for a Transportation, Utility and Recreational Trail, what the proposal will achieve, and any benefits to - agriculture that the proposal provides. + Include why you are applying for a Transportation, Utility and Recreational Trail, what the proposal will + achieve, and any benefits to agriculture that the proposal provides. </div> <mat-form-field appearance="outline"> <textarea @@ -102,9 +102,7 @@ <h6>Documents needed for this step:</h6> </div> <div class="full-row"> <label for="negative-impact">Could this proposal be accommodated on lands outside of the ALR?</label> - <div class="subtext"> - Please justify why the proposal cannot be carried out on lands outside the ALR. - </div> + <div class="subtext">Please justify why the proposal cannot be carried out on lands outside the ALR.</div> <mat-form-field appearance="outline"> <textarea [formControl]="outsideLands" @@ -170,11 +168,12 @@ <h6>Documents needed for this step:</h6> <app-file-drag-drop id="proof-of-serving" [uploadedFiles]="servingNotice" - (uploadFiles)="attachFile($event, DOCUMENT.SERVING_NOTICE)" + (uploadFiles)="attachServinceNotice($event)" (deleteFile)="onDeleteFile($event)" (openFile)="openFile($event)" [showErrors]="showErrors" [isRequired]="true" + [showVirusError]="showServingNoticeVirus" ></app-file-drag-drop> </div> <div class="section"> @@ -182,11 +181,12 @@ <h6>Documents needed for this step:</h6> <app-file-drag-drop id="proposal-map" [uploadedFiles]="proposalMap" - (uploadFiles)="attachFile($event, DOCUMENT.PROPOSAL_MAP)" + (uploadFiles)="attachProposalMap($event)" (deleteFile)="onDeleteFile($event)" (openFile)="openFile($event)" [showErrors]="showErrors" [isRequired]="true" + [showVirusError]="showProposalMapVirus" ></app-file-drag-drop> </div> </div> diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/tur-proposal/tur-proposal.component.spec.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/tur-proposal/tur-proposal.component.spec.ts index c501f29ee4..9a93166fe5 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/tur-proposal/tur-proposal.component.spec.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/tur-proposal/tur-proposal.component.spec.ts @@ -8,6 +8,7 @@ import { ApplicationDocumentDto } from '../../../../../services/application-docu import { ApplicationDocumentService } from '../../../../../services/application-document/application-document.service'; import { ApplicationSubmissionDetailedDto } from '../../../../../services/application-submission/application-submission.dto'; import { ApplicationSubmissionService } from '../../../../../services/application-submission/application-submission.service'; +import { ToastService } from '../../../../../services/toast/toast.service'; import { TurProposalComponent } from './tur-proposal.component'; @@ -43,6 +44,10 @@ describe('TurProposalComponent', () => { provide: MatDialog, useValue: {}, }, + { + provide: ToastService, + useValue: {}, + }, ], declarations: [TurProposalComponent], schemas: [NO_ERRORS_SCHEMA], diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/tur-proposal/tur-proposal.component.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/tur-proposal/tur-proposal.component.ts index 4a845b4dc0..adab6177fe 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/tur-proposal/tur-proposal.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/tur-proposal/tur-proposal.component.ts @@ -7,7 +7,9 @@ import { ApplicationDocumentDto } from '../../../../../services/application-docu import { ApplicationDocumentService } from '../../../../../services/application-document/application-document.service'; import { ApplicationSubmissionUpdateDto } from '../../../../../services/application-submission/application-submission.dto'; import { ApplicationSubmissionService } from '../../../../../services/application-submission/application-submission.service'; +import { ToastService } from '../../../../../services/toast/toast.service'; import { DOCUMENT_TYPE } from '../../../../../shared/dto/document.dto'; +import { FileHandle } from '../../../../../shared/file-drag-drop/drag-drop.directive'; import { EditApplicationSteps } from '../../edit-submission.component'; import { FilesStepComponent } from '../../files-step.partial'; @@ -24,6 +26,9 @@ export class TurProposalComponent extends FilesStepComponent implements OnInit, servingNotice: ApplicationDocumentDto[] = []; proposalMap: ApplicationDocumentDto[] = []; + showServingNoticeVirus = false; + showProposalMapVirus = false; + purpose = new FormControl<string | null>(null, [Validators.required]); outsideLands = new FormControl<string | null>(null, [Validators.required]); agriculturalActivities = new FormControl<string | null>(null, [Validators.required]); @@ -45,9 +50,10 @@ export class TurProposalComponent extends FilesStepComponent implements OnInit, private router: Router, private applicationService: ApplicationSubmissionService, applicationDocumentService: ApplicationDocumentService, - dialog: MatDialog + dialog: MatDialog, + toastService: ToastService ) { - super(applicationDocumentService, dialog); + super(applicationDocumentService, dialog, toastService); } ngOnInit(): void { @@ -77,6 +83,16 @@ export class TurProposalComponent extends FilesStepComponent implements OnInit, }); } + async attachProposalMap(file: FileHandle) { + const res = await this.attachFile(file, DOCUMENT_TYPE.PROPOSAL_MAP); + this.showProposalMapVirus = !res; + } + + async attachServinceNotice(file: FileHandle) { + const res = await this.attachFile(file, DOCUMENT_TYPE.SERVING_NOTICE); + this.showServingNoticeVirus = !res; + } + async onSave() { await this.save(); } diff --git a/portal-frontend/src/app/features/applications/review-submission/review-attachments/review-attachments.component.html b/portal-frontend/src/app/features/applications/review-submission/review-attachments/review-attachments.component.html index e643fd6cb8..5b58c4d46b 100644 --- a/portal-frontend/src/app/features/applications/review-submission/review-attachments/review-attachments.component.html +++ b/portal-frontend/src/app/features/applications/review-submission/review-attachments/review-attachments.component.html @@ -16,23 +16,25 @@ <h2>Attachments</h2> <app-file-drag-drop id="resolution-document" [uploadedFiles]="resolutionDocument" - (uploadFiles)="attachFile($event, documentTypes.RESOLUTION_DOCUMENT)" + (uploadFiles)="attachResolutionDocument($event)" (deleteFile)="deleteFile($event)" (openFile)="openFile($event)" [isRequired]="true" [showErrors]="showErrors" + [showVirusError]="showResolutionVirusError" ></app-file-drag-drop> </section> <section *ngIf="!isFirstNationGovernment && showMandatoryUploads"> - <label for="staff-report">Staff Report <span *ngIf="isAuthorized === false">(optional)</span></label> + <label for="staff-report">Staff Report <span *ngIf="!isAuthorized">(optional)</span></label> <app-file-drag-drop id="staff-report" [uploadedFiles]="staffReport" - (uploadFiles)="attachFile($event, documentTypes.STAFF_REPORT)" + (uploadFiles)="attachStaffReport($event)" (deleteFile)="deleteFile($event)" (openFile)="openFile($event)" [isRequired]="true" [showErrors]="showErrors" + [showVirusError]="showStaffReportVirusError" ></app-file-drag-drop> </section> <section> @@ -40,10 +42,11 @@ <h2>Attachments</h2> <app-file-drag-drop id="other-document" [uploadedFiles]="otherAttachments" - (uploadFiles)="attachFile($event, documentTypes.OTHER)" + (uploadFiles)="attachOtherDocument($event)" (deleteFile)="deleteFile($event)" (openFile)="openFile($event)" [allowMultiple]="true" + [showVirusError]="showOtherVirusError" ></app-file-drag-drop> </section> </div> diff --git a/portal-frontend/src/app/features/applications/review-submission/review-attachments/review-attachments.component.ts b/portal-frontend/src/app/features/applications/review-submission/review-attachments/review-attachments.component.ts index 2ab11d4d1d..6c9c05e4ac 100644 --- a/portal-frontend/src/app/features/applications/review-submission/review-attachments/review-attachments.component.ts +++ b/portal-frontend/src/app/features/applications/review-submission/review-attachments/review-attachments.component.ts @@ -31,6 +31,9 @@ export class ReviewAttachmentsComponent implements OnInit, OnDestroy { isAuthorized = false; showMandatoryUploads = false; hasCompletedPreviousSteps = false; + showResolutionVirusError = false; + showStaffReportVirusError = false; + showOtherVirusError = false; constructor( private router: Router, @@ -87,16 +90,36 @@ export class ReviewAttachmentsComponent implements OnInit, OnDestroy { } } - async attachFile(fileHandle: FileHandle, documentType: DOCUMENT_TYPE) { + async attachStaffReport(fileHandle: FileHandle) { + const res = await this.attachFile(fileHandle, DOCUMENT_TYPE.STAFF_REPORT); + this.showStaffReportVirusError = !res; + } + + async attachResolutionDocument(fileHandle: FileHandle) { + const res = await this.attachFile(fileHandle, DOCUMENT_TYPE.RESOLUTION_DOCUMENT); + this.showResolutionVirusError = !res; + } + + async attachOtherDocument(fileHandle: FileHandle) { + const res = await this.attachFile(fileHandle, DOCUMENT_TYPE.OTHER); + this.showOtherVirusError = !res; + } + + private async attachFile(fileHandle: FileHandle, documentType: DOCUMENT_TYPE) { if (this.fileId) { - await this.applicationDocumentService.attachExternalFile( - this.fileId, - fileHandle.file, - documentType, - DOCUMENT_SOURCE.LFNG - ); + try { + await this.applicationDocumentService.attachExternalFile( + this.fileId, + fileHandle.file, + documentType, + DOCUMENT_SOURCE.LFNG + ); + } catch (e) { + return false; + } await this.loadApplicationDocuments(this.fileId); } + return true; } async deleteFile($event: ApplicationDocumentDto) { diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component.html index 1672f5bdda..28f99416c2 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component.html @@ -309,10 +309,11 @@ <h2>Additional Proposal Information</h2> <app-file-drag-drop id="detailed-building-plans" [uploadedFiles]="buildingPlans" - (uploadFiles)="attachFile($event, DOCUMENT.BUILDING_PLAN)" + (uploadFiles)="attachBuildingPlan($event)" (deleteFile)="onDeleteFile($event)" (openFile)="openFile($event)" [showErrors]="showErrors" + [showVirusError]="showBuildingPlanVirus" [isRequired]="confirmRemovalOfSoil" [allowMultiple]="true" [disabled]="!confirmRemovalOfSoil" diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component.spec.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component.spec.ts index ca6945e18f..db33d06446 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component.spec.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component.spec.ts @@ -7,6 +7,7 @@ import { NoticeOfIntentDocumentDto } from '../../../../services/notice-of-intent import { NoticeOfIntentDocumentService } from '../../../../services/notice-of-intent-document/notice-of-intent-document.service'; import { NoticeOfIntentSubmissionDetailedDto } from '../../../../services/notice-of-intent-submission/notice-of-intent-submission.dto'; import { NoticeOfIntentSubmissionService } from '../../../../services/notice-of-intent-submission/notice-of-intent-submission.service'; +import { ToastService } from '../../../../services/toast/toast.service'; import { AdditionalInformationComponent } from './additional-information.component'; @@ -28,6 +29,10 @@ describe('RosoAdditionalInformationComponent', () => { useValue: mockNoticeOfIntentSubmissionService, }, { provide: NoticeOfIntentDocumentService, useValue: mockNoticeOfIntentDocumentService }, + { + provide: ToastService, + useValue: {}, + }, ], schemas: [NO_ERRORS_SCHEMA], }).compileComponents(); diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component.ts index 7bf7be6e72..41a3e53619 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component.ts @@ -11,7 +11,9 @@ import { ProposedStructure, } from '../../../../services/notice-of-intent-submission/notice-of-intent-submission.dto'; import { NoticeOfIntentSubmissionService } from '../../../../services/notice-of-intent-submission/notice-of-intent-submission.service'; +import { ToastService } from '../../../../services/toast/toast.service'; import { DOCUMENT_TYPE } from '../../../../shared/dto/document.dto'; +import { FileHandle } from '../../../../shared/file-drag-drop/drag-drop.directive'; import { formatBooleanToString } from '../../../../shared/utils/boolean-helper'; import { parseStringToBoolean } from '../../../../shared/utils/string-helper'; import { EditNoiSteps } from '../edit-submission.component'; @@ -55,6 +57,7 @@ export class AdditionalInformationComponent extends FilesStepComponent implement private submissionUuid = ''; confirmRemovalOfSoil = false; + showBuildingPlanVirus = false; buildingPlans: NoticeOfIntentDocumentDto[] = []; proposedStructures: FormProposedStructure[] = []; @@ -90,9 +93,10 @@ export class AdditionalInformationComponent extends FilesStepComponent implement constructor( private noticeOfIntentSubmissionService: NoticeOfIntentSubmissionService, noticeOfIntentDocumentService: NoticeOfIntentDocumentService, - dialog: MatDialog + dialog: MatDialog, + toastService: ToastService ) { - super(noticeOfIntentDocumentService, dialog); + super(noticeOfIntentDocumentService, dialog, toastService); } ngOnInit(): void { @@ -153,6 +157,11 @@ export class AdditionalInformationComponent extends FilesStepComponent implement }); } + async attachBuildingPlan(file: FileHandle) { + const res = await this.attachFile(file, DOCUMENT_TYPE.BUILDING_PLAN); + this.showBuildingPlanVirus = !res; + } + prepareStructureSpecificTextInputs() { this.setVisibilityAndValidatorsForFarmFields(); this.setVisibilityAndValidatorsForAccessoryFields(); diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/files-step.partial.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/files-step.partial.ts index 5c5cdcf681..279b58c06b 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/files-step.partial.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/files-step.partial.ts @@ -1,8 +1,10 @@ +import { HttpErrorResponse } from '@angular/common/http'; import { Component, Input } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; import { BehaviorSubject } from 'rxjs'; import { NoticeOfIntentDocumentDto } from '../../../services/notice-of-intent-document/notice-of-intent-document.dto'; import { NoticeOfIntentDocumentService } from '../../../services/notice-of-intent-document/notice-of-intent-document.service'; +import { ToastService } from '../../../services/toast/toast.service'; import { DOCUMENT_TYPE } from '../../../shared/dto/document.dto'; import { FileHandle } from '../../../shared/file-drag-drop/drag-drop.directive'; import { RemoveFileConfirmationDialogComponent } from '../../applications/alcs-edit-submission/remove-file-confirmation-dialog/remove-file-confirmation-dialog.component'; @@ -24,7 +26,8 @@ export abstract class FilesStepComponent extends StepComponent { protected constructor( protected noticeOfIntentDocumentService: NoticeOfIntentDocumentService, - protected dialog: MatDialog + protected dialog: MatDialog, + private toastService: ToastService ) { super(); } @@ -33,12 +36,22 @@ export abstract class FilesStepComponent extends StepComponent { if (this.fileId) { await this.save(); const mappedFiles = file.file; - await this.noticeOfIntentDocumentService.attachExternalFile(this.fileId, mappedFiles, documentType); + + try { + await this.noticeOfIntentDocumentService.attachExternalFile(this.fileId, mappedFiles, documentType); + } catch (err) { + this.toastService.showErrorToast('Document upload failed'); + if (err instanceof HttpErrorResponse && err.status === 403) { + return false; + } + } + const documents = await this.noticeOfIntentDocumentService.getByFileId(this.fileId); if (documents) { this.$noiDocuments.next(documents); } } + return true; } async onDeleteFile($event: NoticeOfIntentDocumentDto) { diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/other-attachments/other-attachments.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/other-attachments/other-attachments.component.html index 5cc5c8e5a8..cf83c25320 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/other-attachments/other-attachments.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/other-attachments/other-attachments.component.html @@ -8,9 +8,9 @@ <h2>Optional Attachments</h2> not include confidential material within your notice of intent. </p> <section> - <div class='subheading2'>Optional Attachments (Max. 100 MB per attachment)</div> + <div class="subheading2">Optional Attachments (Max. 100 MB per attachment)</div> <div class="uploader"> - <app-file-drag-drop (uploadFiles)="attachFile($event, null)"></app-file-drag-drop> + <app-file-drag-drop (uploadFiles)="attachDocument($event)" [showVirusError]="showVirusError"></app-file-drag-drop> </div> <form [formGroup]="form"> <div class="scrollable"> diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/other-attachments/other-attachments.component.spec.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/other-attachments/other-attachments.component.spec.ts index 6bca59e7d2..151551bcfa 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/other-attachments/other-attachments.component.spec.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/other-attachments/other-attachments.component.spec.ts @@ -9,6 +9,7 @@ import { NoticeOfIntentDocumentDto } from '../../../../services/notice-of-intent import { NoticeOfIntentDocumentService } from '../../../../services/notice-of-intent-document/notice-of-intent-document.service'; import { NoticeOfIntentSubmissionDetailedDto } from '../../../../services/notice-of-intent-submission/notice-of-intent-submission.dto'; import { NoticeOfIntentSubmissionService } from '../../../../services/notice-of-intent-submission/notice-of-intent-submission.service'; +import { ToastService } from '../../../../services/toast/toast.service'; import { OtherAttachmentsComponent } from './other-attachments.component'; @@ -50,6 +51,10 @@ describe('OtherAttachmentsComponent', () => { provide: MatDialog, useValue: {}, }, + { + provide: ToastService, + useValue: {}, + }, ], declarations: [OtherAttachmentsComponent], schemas: [NO_ERRORS_SCHEMA], diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/other-attachments/other-attachments.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/other-attachments/other-attachments.component.ts index 698097de37..6b5c1f18eb 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/other-attachments/other-attachments.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/other-attachments/other-attachments.component.ts @@ -10,7 +10,9 @@ import { } from '../../../../services/notice-of-intent-document/notice-of-intent-document.dto'; import { NoticeOfIntentDocumentService } from '../../../../services/notice-of-intent-document/notice-of-intent-document.service'; import { NoticeOfIntentSubmissionService } from '../../../../services/notice-of-intent-submission/notice-of-intent-submission.service'; +import { ToastService } from '../../../../services/toast/toast.service'; import { DOCUMENT_SOURCE, DOCUMENT_TYPE, DocumentTypeDto } from '../../../../shared/dto/document.dto'; +import { FileHandle } from '../../../../shared/file-drag-drop/drag-drop.directive'; import { EditNoiSteps } from '../edit-submission.component'; import { FilesStepComponent } from '../files-step.partial'; @@ -32,15 +34,17 @@ export class OtherAttachmentsComponent extends FilesStepComponent implements OnI form = new FormGroup({} as any); private documentCodes: DocumentTypeDto[] = []; + showVirusError = false; constructor( private router: Router, private noticeOfIntentSubmissionService: NoticeOfIntentSubmissionService, private codeService: CodeService, noticeOfIntentDocumentService: NoticeOfIntentDocumentService, - dialog: MatDialog + dialog: MatDialog, + toastService: ToastService ) { - super(noticeOfIntentDocumentService, dialog); + super(noticeOfIntentDocumentService, dialog, toastService); } ngOnInit(): void { @@ -75,6 +79,11 @@ export class OtherAttachmentsComponent extends FilesStepComponent implements OnI await this.save(); } + async attachDocument(file: FileHandle) { + const res = await this.attachFile(file, null); + this.showVirusError = !res; + } + protected async save() { if (this.isDirty) { const updateDtos: NoticeOfIntentDocumentUpdateDto[] = this.otherFiles.map((file) => ({ diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.html index c8b86c1367..b9b1b626c8 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.html @@ -200,6 +200,7 @@ <h5>Parcel Lookup</h5> (beforeFileUploadOpened)="beforeFileUploadOpened()" [showErrors]="showErrors" [isRequired]="isCertificateOfTitleRequired" + [showVirusError]="showVirusError" ></app-file-drag-drop> </div> diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.ts index 8d7c068727..7c41c18c85 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.ts @@ -70,6 +70,7 @@ export class ParcelEntryComponent implements OnInit { searchBy = new FormControl<string | null>(null); isCrownLand: boolean | null = null; isCertificateOfTitleRequired = true; + showVirusError = false; pidPin = new FormControl<string>(''); legalDescription = new FormControl<string | null>(null, [Validators.required]); @@ -243,11 +244,18 @@ export class ParcelEntryComponent implements OnInit { async attachFile(file: FileHandle, parcelUuid: string) { if (parcelUuid) { const mappedFiles = file.file; - this.parcel.certificateOfTitle = await this.noticeOfIntentParcelService.attachCertificateOfTitle( - this.fileId, - parcelUuid, - mappedFiles - ); + + try { + this.parcel.certificateOfTitle = await this.noticeOfIntentParcelService.attachCertificateOfTitle( + this.fileId, + parcelUuid, + mappedFiles + ); + } catch (e) { + this.showVirusError = true; + return; + } + this.showVirusError = false; } } diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html index 66bd3b7777..cc970fde84 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html @@ -148,8 +148,9 @@ <h4>Primary Contact Authorization Letters</h4> </p> </ng-container> <ng-container *ngIf="isGovernmentUser"> - An authorization letter must be provided only if the notice of intent is being submitted by a third-party agent. Please - consult the Supporting Documentation page of the <a>TODO: FIX THIS: ALC website</a> for further instruction. + An authorization letter must be provided only if the notice of intent is being submitted by a third-party agent. + Please consult the Supporting Documentation page of the <a>TODO: FIX THIS: ALC website</a> for further + instruction. </ng-container> </div> <h6>Authorization Letters (if applicable)</h6> @@ -157,11 +158,12 @@ <h6>Authorization Letters (if applicable)</h6> <app-file-drag-drop [allowMultiple]="true" [uploadedFiles]="files" - (uploadFiles)="attachFile($event, DOCUMENT_TYPE.AUTHORIZATION_LETTER)" + (uploadFiles)="attachAuthorizationLetter($event)" (deleteFile)="onDeleteFile($event)" (openFile)="openFile($event)" [showErrors]="showErrors" [isRequired]="needsAuthorizationLetter" + [showVirusError]="showVirusError" ></app-file-drag-drop> </div> </section> diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.spec.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.spec.ts index e55c98fd20..3eae1438a6 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.spec.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.spec.ts @@ -10,6 +10,7 @@ import { NoticeOfIntentDocumentService } from '../../../../services/notice-of-in import { NoticeOfIntentOwnerService } from '../../../../services/notice-of-intent-owner/notice-of-intent-owner.service'; import { NoticeOfIntentSubmissionDetailedDto } from '../../../../services/notice-of-intent-submission/notice-of-intent-submission.dto'; import { NoticeOfIntentSubmissionService } from '../../../../services/notice-of-intent-submission/notice-of-intent-submission.service'; +import { ToastService } from '../../../../services/toast/toast.service'; import { PrimaryContactComponent } from './primary-contact.component'; @@ -53,6 +54,10 @@ describe('PrimaryContactComponent', () => { provide: AuthenticationService, useValue: mockAuthService, }, + { + provide: ToastService, + useValue: {}, + }, ], declarations: [PrimaryContactComponent], schemas: [NO_ERRORS_SCHEMA], diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts index b3afb5274e..b22c0f27ec 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts @@ -9,8 +9,10 @@ import { NoticeOfIntentDocumentService } from '../../../../services/notice-of-in import { NoticeOfIntentOwnerDto } from '../../../../services/notice-of-intent-owner/notice-of-intent-owner.dto'; import { NoticeOfIntentOwnerService } from '../../../../services/notice-of-intent-owner/notice-of-intent-owner.service'; import { NoticeOfIntentSubmissionService } from '../../../../services/notice-of-intent-submission/notice-of-intent-submission.service'; +import { ToastService } from '../../../../services/toast/toast.service'; import { DOCUMENT_TYPE } from '../../../../shared/dto/document.dto'; import { OWNER_TYPE } from '../../../../shared/dto/owner.dto'; +import { FileHandle } from '../../../../shared/file-drag-drop/drag-drop.directive'; import { EditNoiSteps } from '../edit-submission.component'; import { FilesStepComponent } from '../files-step.partial'; @@ -27,6 +29,7 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni files: (NoticeOfIntentDocumentDto & { errorMessage?: string })[] = []; needsAuthorizationLetter = false; + showVirusError = false; selectedThirdPartyAgent = false; selectedLocalGovernment = false; selectedOwnerUuid: string | undefined = undefined; @@ -57,9 +60,10 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni noticeOfIntentDocumentService: NoticeOfIntentDocumentService, private noticeOfIntentOwnerService: NoticeOfIntentOwnerService, private authenticationService: AuthenticationService, - dialog: MatDialog + dialog: MatDialog, + toastService: ToastService ) { - super(noticeOfIntentDocumentService, dialog); + super(noticeOfIntentDocumentService, dialog, toastService); } ngOnInit(): void { @@ -88,6 +92,11 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni await this.save(); } + async attachAuthorizationLetter(file: FileHandle) { + const res = await this.attachFile(file, DOCUMENT_TYPE.AUTHORIZATION_LETTER); + this.showVirusError = !res; + } + onSelectAgent() { this.onSelectOwner('agent'); } diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pfrs/pfrs-proposal.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pfrs/pfrs-proposal.component.html index 25919ce27a..87933696aa 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pfrs/pfrs-proposal.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pfrs/pfrs-proposal.component.html @@ -259,11 +259,12 @@ <h4>Project Duration</h4> <app-file-drag-drop id="proposal-map" [uploadedFiles]="proposalMap" - (uploadFiles)="attachFile($event, DOCUMENT.PROPOSAL_MAP)" + (uploadFiles)="attachProposalMap($event)" (deleteFile)="onDeleteFile($event)" (openFile)="openFile($event)" [showErrors]="showErrors" [isRequired]="true" + [showVirusError]="showProposalMapVirus" ></app-file-drag-drop> </div> @@ -336,13 +337,14 @@ <h4>Project Duration</h4> <app-file-drag-drop id="cross-section" [uploadedFiles]="crossSections" - (uploadFiles)="attachFile($event, DOCUMENT.CROSS_SECTIONS)" + (uploadFiles)="attachCrossSection($event)" (deleteFile)="onDeleteFile($event)" (openFile)="openFile($event)" [showErrors]="showErrors" [isRequired]="true" [allowMultiple]="true" [disabled]="!allowMiningUploads" + [showVirusError]="showCrossSectionVirus" ></app-file-drag-drop> </div> <div class="full-row"> @@ -357,13 +359,14 @@ <h4>Project Duration</h4> <app-file-drag-drop id="reclamation-plan" [uploadedFiles]="reclamationPlan" - (uploadFiles)="attachFile($event, DOCUMENT.RECLAMATION_PLAN)" + (uploadFiles)="attachReclamationPlan($event)" (deleteFile)="onDeleteFile($event)" (openFile)="openFile($event)" [showErrors]="showErrors" [isRequired]="true" [allowMultiple]="true" [disabled]="!allowMiningUploads" + [showVirusError]="showReclamationPlanVirus" ></app-file-drag-drop> </div> @@ -407,13 +410,14 @@ <h4>Project Duration</h4> <app-file-drag-drop id="noticeOfWork" [uploadedFiles]="noticeOfWork" - (uploadFiles)="attachFile($event, DOCUMENT.NOTICE_OF_WORK)" + (uploadFiles)="attachNoticeOfWork($event)" (deleteFile)="onDeleteFile($event)" (openFile)="openFile($event)" [showErrors]="showErrors" [isRequired]="true" [disabled]="!requiresNoticeOfWork" [allowMultiple]="true" + [showVirusError]="showNoticeOfWorkVirus" ></app-file-drag-drop> </div> </div> diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pfrs/pfrs-proposal.component.spec.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pfrs/pfrs-proposal.component.spec.ts index 570106cf5e..b951c4059c 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pfrs/pfrs-proposal.component.spec.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pfrs/pfrs-proposal.component.spec.ts @@ -8,6 +8,7 @@ import { NoticeOfIntentDocumentDto } from '../../../../../services/notice-of-int import { NoticeOfIntentDocumentService } from '../../../../../services/notice-of-intent-document/notice-of-intent-document.service'; import { NoticeOfIntentSubmissionDetailedDto } from '../../../../../services/notice-of-intent-submission/notice-of-intent-submission.dto'; import { NoticeOfIntentSubmissionService } from '../../../../../services/notice-of-intent-submission/notice-of-intent-submission.service'; +import { ToastService } from '../../../../../services/toast/toast.service'; import { PfrsProposalComponent } from './pfrs-proposal.component'; @@ -43,6 +44,10 @@ describe('RosoProposalComponent', () => { provide: MatDialog, useValue: {}, }, + { + provide: ToastService, + useValue: {}, + }, ], declarations: [PfrsProposalComponent], schemas: [NO_ERRORS_SCHEMA], diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pfrs/pfrs-proposal.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pfrs/pfrs-proposal.component.ts index 21e8d6b802..17e43e12a8 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pfrs/pfrs-proposal.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pfrs/pfrs-proposal.component.ts @@ -7,7 +7,9 @@ import { NoticeOfIntentDocumentDto } from '../../../../../services/notice-of-int import { NoticeOfIntentDocumentService } from '../../../../../services/notice-of-intent-document/notice-of-intent-document.service'; import { NoticeOfIntentSubmissionUpdateDto } from '../../../../../services/notice-of-intent-submission/notice-of-intent-submission.dto'; import { NoticeOfIntentSubmissionService } from '../../../../../services/notice-of-intent-submission/notice-of-intent-submission.service'; +import { ToastService } from '../../../../../services/toast/toast.service'; import { DOCUMENT_TYPE } from '../../../../../shared/dto/document.dto'; +import { FileHandle } from '../../../../../shared/file-drag-drop/drag-drop.directive'; import { formatBooleanToString } from '../../../../../shared/utils/boolean-helper'; import { MOBILE_BREAKPOINT } from '../../../../../shared/utils/breakpoints'; import { parseStringToBoolean } from '../../../../../shared/utils/string-helper'; @@ -32,6 +34,10 @@ export class PfrsProposalComponent extends FilesStepComponent implements OnInit, allowMiningUploads = false; requiresNoticeOfWork = false; + showProposalMapVirus = false; + showCrossSectionVirus = false; + showReclamationPlanVirus = false; + showNoticeOfWorkVirus = false; proposalMap: NoticeOfIntentDocumentDto[] = []; crossSections: NoticeOfIntentDocumentDto[] = []; @@ -74,9 +80,10 @@ export class PfrsProposalComponent extends FilesStepComponent implements OnInit, private router: Router, private noticeOfIntentSubmissionService: NoticeOfIntentSubmissionService, noticeOfIntentDocumentService: NoticeOfIntentDocumentService, - dialog: MatDialog + dialog: MatDialog, + toastService: ToastService ) { - super(noticeOfIntentDocumentService, dialog); + super(noticeOfIntentDocumentService, dialog, toastService); } ngOnInit(): void { @@ -150,6 +157,26 @@ export class PfrsProposalComponent extends FilesStepComponent implements OnInit, await this.save(); } + async attachProposalMap(file: FileHandle) { + const res = await this.attachFile(file, DOCUMENT_TYPE.PROPOSAL_MAP); + this.showProposalMapVirus = !res; + } + + async attachCrossSection(file: FileHandle) { + const res = await this.attachFile(file, DOCUMENT_TYPE.CROSS_SECTIONS); + this.showCrossSectionVirus = !res; + } + + async attachReclamationPlan(file: FileHandle) { + const res = await this.attachFile(file, DOCUMENT_TYPE.RECLAMATION_PLAN); + this.showReclamationPlanVirus = !res; + } + + async attachNoticeOfWork(file: FileHandle) { + const res = await this.attachFile(file, DOCUMENT_TYPE.NOTICE_OF_WORK); + this.showNoticeOfWorkVirus = !res; + } + protected async save() { if (this.fileId && (this.form.dirty || this.areComponentsDirty)) { const isNOIFollowUp = this.isFollowUp.value; diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pofo/pofo-proposal.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pofo/pofo-proposal.component.html index 1d79e65292..1cdeaeee88 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pofo/pofo-proposal.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pofo/pofo-proposal.component.html @@ -203,11 +203,12 @@ <h4>Project Duration</h4> <app-file-drag-drop id="proposal-map" [uploadedFiles]="proposalMap" - (uploadFiles)="attachFile($event, DOCUMENT.PROPOSAL_MAP)" + (uploadFiles)="attachProposalMap($event)" (deleteFile)="onDeleteFile($event)" (openFile)="openFile($event)" [showErrors]="showErrors" [isRequired]="true" + [showVirusError]="showProposalMapVirus" ></app-file-drag-drop> </div> @@ -249,13 +250,14 @@ <h4>Project Duration</h4> <app-file-drag-drop id="cross-section" [uploadedFiles]="crossSections" - (uploadFiles)="attachFile($event, DOCUMENT.CROSS_SECTIONS)" + (uploadFiles)="attachCrossSection($event)" (deleteFile)="onDeleteFile($event)" (openFile)="openFile($event)" [showErrors]="showErrors" [isRequired]="true" [allowMultiple]="true" [disabled]="!allowMiningUploads" + [showVirusError]="showCrossSectionVirus" ></app-file-drag-drop> </div> <div class="full-row"> @@ -270,13 +272,14 @@ <h4>Project Duration</h4> <app-file-drag-drop id="reclamation-plan" [uploadedFiles]="reclamationPlan" - (uploadFiles)="attachFile($event, DOCUMENT.RECLAMATION_PLAN)" + (uploadFiles)="attachReclamationPlan($event)" (deleteFile)="onDeleteFile($event)" (openFile)="openFile($event)" [showErrors]="showErrors" [isRequired]="true" [allowMultiple]="true" [disabled]="!allowMiningUploads" + [showVirusError]="showReclamationPlanVirus" ></app-file-drag-drop> </div> </div> diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pofo/pofo-proposal.component.spec.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pofo/pofo-proposal.component.spec.ts index 09ebc281ff..c3efcd09f8 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pofo/pofo-proposal.component.spec.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pofo/pofo-proposal.component.spec.ts @@ -8,6 +8,7 @@ import { NoticeOfIntentDocumentDto } from '../../../../../services/notice-of-int import { NoticeOfIntentDocumentService } from '../../../../../services/notice-of-intent-document/notice-of-intent-document.service'; import { NoticeOfIntentSubmissionDetailedDto } from '../../../../../services/notice-of-intent-submission/notice-of-intent-submission.dto'; import { NoticeOfIntentSubmissionService } from '../../../../../services/notice-of-intent-submission/notice-of-intent-submission.service'; +import { ToastService } from '../../../../../services/toast/toast.service'; import { PofoProposalComponent } from './pofo-proposal.component'; @@ -43,6 +44,10 @@ describe('RosoProposalComponent', () => { provide: MatDialog, useValue: {}, }, + { + provide: ToastService, + useValue: {}, + }, ], declarations: [PofoProposalComponent], schemas: [NO_ERRORS_SCHEMA], diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pofo/pofo-proposal.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pofo/pofo-proposal.component.ts index 5d21f87b6c..2f4bdf42d9 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pofo/pofo-proposal.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pofo/pofo-proposal.component.ts @@ -7,7 +7,9 @@ import { NoticeOfIntentDocumentDto } from '../../../../../services/notice-of-int import { NoticeOfIntentDocumentService } from '../../../../../services/notice-of-intent-document/notice-of-intent-document.service'; import { NoticeOfIntentSubmissionUpdateDto } from '../../../../../services/notice-of-intent-submission/notice-of-intent-submission.dto'; import { NoticeOfIntentSubmissionService } from '../../../../../services/notice-of-intent-submission/notice-of-intent-submission.service'; +import { ToastService } from '../../../../../services/toast/toast.service'; import { DOCUMENT_TYPE } from '../../../../../shared/dto/document.dto'; +import { FileHandle } from '../../../../../shared/file-drag-drop/drag-drop.directive'; import { formatBooleanToString } from '../../../../../shared/utils/boolean-helper'; import { parseStringToBoolean } from '../../../../../shared/utils/string-helper'; import { SoilTableData } from '../../../../../shared/soil-table/soil-table.component'; @@ -25,6 +27,9 @@ export class PofoProposalComponent extends FilesStepComponent implements OnInit, DOCUMENT = DOCUMENT_TYPE; allowMiningUploads = false; + showProposalMapVirus = false; + showCrossSectionVirus = false; + showReclamationPlanVirus = false; proposalMap: NoticeOfIntentDocumentDto[] = []; crossSections: NoticeOfIntentDocumentDto[] = []; @@ -57,9 +62,10 @@ export class PofoProposalComponent extends FilesStepComponent implements OnInit, private router: Router, private noticeOfIntentSubmissionService: NoticeOfIntentSubmissionService, noticeOfIntentDocumentService: NoticeOfIntentDocumentService, - dialog: MatDialog + dialog: MatDialog, + toastService: ToastService ) { - super(noticeOfIntentDocumentService, dialog); + super(noticeOfIntentDocumentService, dialog, toastService); } ngOnInit(): void { @@ -113,6 +119,21 @@ export class PofoProposalComponent extends FilesStepComponent implements OnInit, await this.save(); } + async attachProposalMap(file: FileHandle) { + const res = await this.attachFile(file, DOCUMENT_TYPE.PROPOSAL_MAP); + this.showProposalMapVirus = !res; + } + + async attachCrossSection(file: FileHandle) { + const res = await this.attachFile(file, DOCUMENT_TYPE.CROSS_SECTIONS); + this.showCrossSectionVirus = !res; + } + + async attachReclamationPlan(file: FileHandle) { + const res = await this.attachFile(file, DOCUMENT_TYPE.RECLAMATION_PLAN); + this.showReclamationPlanVirus = !res; + } + protected async save() { if (this.fileId && (this.form.dirty || this.areComponentsDirty)) { const isNOIFollowUp = this.isFollowUp.getRawValue(); diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.html index 3690ebb12f..ed881b037a 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.html @@ -190,11 +190,12 @@ <h4>Project Duration</h4> <app-file-drag-drop id="proposal-map" [uploadedFiles]="proposalMap" - (uploadFiles)="attachFile($event, DOCUMENT.PROPOSAL_MAP)" + (uploadFiles)="attachProposalMap($event)" (deleteFile)="onDeleteFile($event)" (openFile)="openFile($event)" [showErrors]="showErrors" [isRequired]="true" + [showVirusError]="showProposalMapVirus" ></app-file-drag-drop> </div> @@ -238,13 +239,14 @@ <h4>Project Duration</h4> <app-file-drag-drop id="cross-section" [uploadedFiles]="crossSections" - (uploadFiles)="attachFile($event, DOCUMENT.CROSS_SECTIONS)" + (uploadFiles)="attachCrossSection($event)" (deleteFile)="onDeleteFile($event)" (openFile)="openFile($event)" [showErrors]="showErrors" [isRequired]="true" [allowMultiple]="true" [disabled]="!allowMiningUploads" + [showVirusError]="showCrossSectionVirus" ></app-file-drag-drop> </div> <div class="full-row"> @@ -259,13 +261,14 @@ <h4>Project Duration</h4> <app-file-drag-drop id="reclamation-plan" [uploadedFiles]="reclamationPlan" - (uploadFiles)="attachFile($event, DOCUMENT.RECLAMATION_PLAN)" + (uploadFiles)="attachReclamationPlan($event)" (deleteFile)="onDeleteFile($event)" (openFile)="openFile($event)" [showErrors]="showErrors" [isRequired]="true" [allowMultiple]="true" [disabled]="!allowMiningUploads" + [showVirusError]="showReclamationPlanVirus" ></app-file-drag-drop> </div> @@ -309,13 +312,14 @@ <h4>Project Duration</h4> <app-file-drag-drop id="noticeOfWork" [uploadedFiles]="noticeOfWork" - (uploadFiles)="attachFile($event, DOCUMENT.NOTICE_OF_WORK)" + (uploadFiles)="attachNoticeOfWork($event)" (deleteFile)="onDeleteFile($event)" (openFile)="openFile($event)" [showErrors]="showErrors" [isRequired]="true" [disabled]="!requiresNoticeOfWork" [allowMultiple]="true" + [showVirusError]="showNoticeOfWorkVirus" ></app-file-drag-drop> </div> </div> diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.spec.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.spec.ts index 26d01c861e..e8895216f7 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.spec.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.spec.ts @@ -8,6 +8,7 @@ import { NoticeOfIntentDocumentDto } from '../../../../../services/notice-of-int import { NoticeOfIntentDocumentService } from '../../../../../services/notice-of-intent-document/notice-of-intent-document.service'; import { NoticeOfIntentSubmissionDetailedDto } from '../../../../../services/notice-of-intent-submission/notice-of-intent-submission.dto'; import { NoticeOfIntentSubmissionService } from '../../../../../services/notice-of-intent-submission/notice-of-intent-submission.service'; +import { ToastService } from '../../../../../services/toast/toast.service'; import { RosoProposalComponent } from './roso-proposal.component'; @@ -43,6 +44,10 @@ describe('RosoProposalComponent', () => { provide: MatDialog, useValue: {}, }, + { + provide: ToastService, + useValue: {}, + }, ], declarations: [RosoProposalComponent], schemas: [NO_ERRORS_SCHEMA], diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.ts index 73661d6631..9158b805d4 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.ts @@ -7,7 +7,9 @@ import { NoticeOfIntentDocumentDto } from '../../../../../services/notice-of-int import { NoticeOfIntentDocumentService } from '../../../../../services/notice-of-intent-document/notice-of-intent-document.service'; import { NoticeOfIntentSubmissionUpdateDto } from '../../../../../services/notice-of-intent-submission/notice-of-intent-submission.dto'; import { NoticeOfIntentSubmissionService } from '../../../../../services/notice-of-intent-submission/notice-of-intent-submission.service'; +import { ToastService } from '../../../../../services/toast/toast.service'; import { DOCUMENT_TYPE } from '../../../../../shared/dto/document.dto'; +import { FileHandle } from '../../../../../shared/file-drag-drop/drag-drop.directive'; import { formatBooleanToString } from '../../../../../shared/utils/boolean-helper'; import { parseStringToBoolean } from '../../../../../shared/utils/string-helper'; import { SoilTableData } from '../../../../../shared/soil-table/soil-table.component'; @@ -26,6 +28,10 @@ export class RosoProposalComponent extends FilesStepComponent implements OnInit, allowMiningUploads = false; requiresNoticeOfWork = false; + showProposalMapVirus = false; + showCrossSectionVirus = false; + showReclamationPlanVirus = false; + showNoticeOfWorkVirus = false; proposalMap: NoticeOfIntentDocumentDto[] = []; crossSections: NoticeOfIntentDocumentDto[] = []; @@ -61,9 +67,10 @@ export class RosoProposalComponent extends FilesStepComponent implements OnInit, private router: Router, private noticeOfIntentSubmissionService: NoticeOfIntentSubmissionService, noticeOfIntentDocumentService: NoticeOfIntentDocumentService, - dialog: MatDialog + dialog: MatDialog, + toastService: ToastService ) { - super(noticeOfIntentDocumentService, dialog); + super(noticeOfIntentDocumentService, dialog, toastService); } ngOnInit(): void { @@ -127,6 +134,26 @@ export class RosoProposalComponent extends FilesStepComponent implements OnInit, await this.save(); } + async attachProposalMap(file: FileHandle) { + const res = await this.attachFile(file, DOCUMENT_TYPE.PROPOSAL_MAP); + this.showProposalMapVirus = !res; + } + + async attachCrossSection(file: FileHandle) { + const res = await this.attachFile(file, DOCUMENT_TYPE.CROSS_SECTIONS); + this.showCrossSectionVirus = !res; + } + + async attachReclamationPlan(file: FileHandle) { + const res = await this.attachFile(file, DOCUMENT_TYPE.RECLAMATION_PLAN); + this.showReclamationPlanVirus = !res; + } + + async attachNoticeOfWork(file: FileHandle) { + const res = await this.attachFile(file, DOCUMENT_TYPE.NOTICE_OF_WORK); + this.showNoticeOfWorkVirus = !res; + } + protected async save() { if (this.fileId && (this.form.dirty || this.areComponentsDirty)) { const isNOIFollowUp = this.isFollowUp.getRawValue(); diff --git a/portal-frontend/src/app/features/notifications/edit-submission/files-step.partial.ts b/portal-frontend/src/app/features/notifications/edit-submission/files-step.partial.ts index 94ec045c94..1276756a42 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/files-step.partial.ts +++ b/portal-frontend/src/app/features/notifications/edit-submission/files-step.partial.ts @@ -1,9 +1,11 @@ +import { HttpErrorResponse } from '@angular/common/http'; import { Component, Input } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; import { BehaviorSubject } from 'rxjs'; import { ApplicationDocumentDto } from '../../../services/application-document/application-document.dto'; import { NotificationDocumentDto } from '../../../services/notification-document/notification-document.dto'; import { NotificationDocumentService } from '../../../services/notification-document/notification-document.service'; +import { ToastService } from '../../../services/toast/toast.service'; import { DOCUMENT_TYPE } from '../../../shared/dto/document.dto'; import { FileHandle } from '../../../shared/file-drag-drop/drag-drop.directive'; import { StepComponent } from './step.partial'; @@ -24,7 +26,8 @@ export abstract class FilesStepComponent extends StepComponent { protected constructor( protected notificationDocumentService: NotificationDocumentService, - protected dialog: MatDialog + protected dialog: MatDialog, + protected toastService: ToastService ) { super(); } @@ -33,12 +36,20 @@ export abstract class FilesStepComponent extends StepComponent { if (this.fileId) { await this.save(); const mappedFiles = file.file; - await this.notificationDocumentService.attachExternalFile(this.fileId, mappedFiles, documentType); + try { + await this.notificationDocumentService.attachExternalFile(this.fileId, mappedFiles, documentType); + } catch (err) { + this.toastService.showErrorToast('Document upload failed'); + if (err instanceof HttpErrorResponse && err.status === 403) { + return false; + } + } const documents = await this.notificationDocumentService.getByFileId(this.fileId); if (documents) { this.$notificationDocuments.next(documents); } } + return true; } //Using ApplicationDocumentDto is "correct" here, quack quack diff --git a/portal-frontend/src/app/features/notifications/edit-submission/other-attachments/other-attachments.component.html b/portal-frontend/src/app/features/notifications/edit-submission/other-attachments/other-attachments.component.html index d1bfc173b9..2d7a89ee1b 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/other-attachments/other-attachments.component.html +++ b/portal-frontend/src/app/features/notifications/edit-submission/other-attachments/other-attachments.component.html @@ -6,9 +6,9 @@ <h2>Optional Attachments</h2> </p> </div> <section> - <span class='subheading2'>Upload Optional Attachments (Max. 100 MB per attachment)</span> + <span class="subheading2">Upload Optional Attachments (Max. 100 MB per attachment)</span> <div class="uploader"> - <app-file-drag-drop (uploadFiles)="attachFile($event, null)"></app-file-drag-drop> + <app-file-drag-drop (uploadFiles)="attachDocument($event)" [showVirusError]="showVirusError"></app-file-drag-drop> </div> <form [formGroup]="form"> <div class="scrollable"> diff --git a/portal-frontend/src/app/features/notifications/edit-submission/other-attachments/other-attachments.component.spec.ts b/portal-frontend/src/app/features/notifications/edit-submission/other-attachments/other-attachments.component.spec.ts index 333944d2cc..a5ff6f3bb7 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/other-attachments/other-attachments.component.spec.ts +++ b/portal-frontend/src/app/features/notifications/edit-submission/other-attachments/other-attachments.component.spec.ts @@ -9,6 +9,7 @@ import { NotificationDocumentDto } from '../../../../services/notification-docum import { NotificationDocumentService } from '../../../../services/notification-document/notification-document.service'; import { NotificationSubmissionDetailedDto } from '../../../../services/notification-submission/notification-submission.dto'; import { NotificationSubmissionService } from '../../../../services/notification-submission/notification-submission.service'; +import { ToastService } from '../../../../services/toast/toast.service'; import { OtherAttachmentsComponent } from './other-attachments.component'; @@ -50,6 +51,10 @@ describe('OtherAttachmentsComponent', () => { provide: MatDialog, useValue: {}, }, + { + provide: ToastService, + useValue: {}, + }, ], declarations: [OtherAttachmentsComponent], schemas: [NO_ERRORS_SCHEMA], diff --git a/portal-frontend/src/app/features/notifications/edit-submission/other-attachments/other-attachments.component.ts b/portal-frontend/src/app/features/notifications/edit-submission/other-attachments/other-attachments.component.ts index e5819c1fa6..d3e9b85b96 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/other-attachments/other-attachments.component.ts +++ b/portal-frontend/src/app/features/notifications/edit-submission/other-attachments/other-attachments.component.ts @@ -10,7 +10,9 @@ import { } from '../../../../services/notification-document/notification-document.dto'; import { NotificationDocumentService } from '../../../../services/notification-document/notification-document.service'; import { NotificationSubmissionService } from '../../../../services/notification-submission/notification-submission.service'; +import { ToastService } from '../../../../services/toast/toast.service'; import { DOCUMENT_SOURCE, DOCUMENT_TYPE, DocumentTypeDto } from '../../../../shared/dto/document.dto'; +import { FileHandle } from '../../../../shared/file-drag-drop/drag-drop.directive'; import { EditNotificationSteps } from '../edit-submission.component'; import { FilesStepComponent } from '../files-step.partial'; @@ -29,6 +31,7 @@ export class OtherAttachmentsComponent extends FilesStepComponent implements OnI otherFiles: NotificationDocumentDto[] = []; private isDirty = false; + showVirusError = false; form = new FormGroup({} as any); private documentCodes: DocumentTypeDto[] = []; @@ -37,10 +40,11 @@ export class OtherAttachmentsComponent extends FilesStepComponent implements OnI private router: Router, private applicationService: NotificationSubmissionService, private codeService: CodeService, + toastService: ToastService, notificationDocumentService: NotificationDocumentService, dialog: MatDialog ) { - super(notificationDocumentService, dialog); + super(notificationDocumentService, dialog, toastService); } ngOnInit(): void { @@ -75,6 +79,11 @@ export class OtherAttachmentsComponent extends FilesStepComponent implements OnI await this.save(); } + async attachDocument(file: FileHandle) { + const res = await this.attachFile(file, null); + this.showVirusError = !res; + } + protected async save() { if (this.isDirty) { const updateDtos: NotificationDocumentUpdateDto[] = this.otherFiles.map((file) => ({ diff --git a/portal-frontend/src/app/features/notifications/edit-submission/proposal/proposal.component.html b/portal-frontend/src/app/features/notifications/edit-submission/proposal/proposal.component.html index 9bb9d1c509..484ac37cd0 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/proposal/proposal.component.html +++ b/portal-frontend/src/app/features/notifications/edit-submission/proposal/proposal.component.html @@ -72,11 +72,12 @@ <h2>Purpose of SRW</h2> <app-file-drag-drop id="proposal-map" [uploadedFiles]="terms" - (uploadFiles)="attachFile($event, DOCUMENT.SRW_TERMS)" + (uploadFiles)="attachSRWTerms($event)" (deleteFile)="onDeleteFile($event)" (openFile)="openFile($event)" [showErrors]="showErrors" [isRequired]="true" + [showVirusError]="showSRWTermsVirus" ></app-file-drag-drop> </div> @@ -114,13 +115,14 @@ <h2>Purpose of SRW</h2> <app-file-drag-drop id="surveyPlans" [uploadedFiles]="[]" - (uploadFiles)="attachFile($event, DOCUMENT.SURVEY_PLAN)" + (uploadFiles)="attachSurveyPlan($event)" (deleteFile)="onDeleteFile($event)" (openFile)="openFile($event)" [showErrors]="showErrors" [isRequired]="surveyPlans.length === 0" [disabled]="!allowSurveyPlanUploads" [allowMultiple]="true" + [showVirusError]="showSurveyPlanVirus" ></app-file-drag-drop> </div> </div> diff --git a/portal-frontend/src/app/features/notifications/edit-submission/proposal/proposal.component.spec.ts b/portal-frontend/src/app/features/notifications/edit-submission/proposal/proposal.component.spec.ts index 21276e7013..48b9b96112 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/proposal/proposal.component.spec.ts +++ b/portal-frontend/src/app/features/notifications/edit-submission/proposal/proposal.component.spec.ts @@ -8,6 +8,7 @@ import { NotificationDocumentDto } from '../../../../services/notification-docum import { NotificationDocumentService } from '../../../../services/notification-document/notification-document.service'; import { NotificationSubmissionDetailedDto } from '../../../../services/notification-submission/notification-submission.dto'; import { NotificationSubmissionService } from '../../../../services/notification-submission/notification-submission.service'; +import { ToastService } from '../../../../services/toast/toast.service'; import { ProposalComponent } from './proposal.component'; @@ -43,6 +44,10 @@ describe('ProposalComponent', () => { provide: MatDialog, useValue: {}, }, + { + provide: ToastService, + useValue: {}, + }, ], declarations: [ProposalComponent], schemas: [NO_ERRORS_SCHEMA], diff --git a/portal-frontend/src/app/features/notifications/edit-submission/proposal/proposal.component.ts b/portal-frontend/src/app/features/notifications/edit-submission/proposal/proposal.component.ts index 28971fe241..b8c9c21672 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/proposal/proposal.component.ts +++ b/portal-frontend/src/app/features/notifications/edit-submission/proposal/proposal.component.ts @@ -10,8 +10,9 @@ import { import { NotificationDocumentService } from '../../../../services/notification-document/notification-document.service'; import { NotificationSubmissionUpdateDto } from '../../../../services/notification-submission/notification-submission.dto'; import { NotificationSubmissionService } from '../../../../services/notification-submission/notification-submission.service'; -import { ConfirmationDialogService } from '../../../../shared/confirmation-dialog/confirmation-dialog.service'; +import { ToastService } from '../../../../services/toast/toast.service'; import { DOCUMENT_TYPE } from '../../../../shared/dto/document.dto'; +import { FileHandle } from '../../../../shared/file-drag-drop/drag-drop.directive'; import { formatBooleanToString } from '../../../../shared/utils/boolean-helper'; import { parseStringToBoolean } from '../../../../shared/utils/string-helper'; import { EditNotificationSteps } from '../edit-submission.component'; @@ -47,14 +48,17 @@ export class ProposalComponent extends FilesStepComponent implements OnInit, OnD private submissionUuid = ''; private isDirty = false; surveyForm = new FormGroup({} as any); + showSRWTermsVirus = false; + showSurveyPlanVirus = false; constructor( private router: Router, private notificationSubmissionService: NotificationSubmissionService, notificationDocumentService: NotificationDocumentService, - dialog: MatDialog + dialog: MatDialog, + toastService: ToastService ) { - super(notificationDocumentService, dialog); + super(notificationDocumentService, dialog, toastService); } ngOnInit(): void { @@ -93,6 +97,16 @@ export class ProposalComponent extends FilesStepComponent implements OnInit, OnD }); } + async attachSRWTerms(file: FileHandle) { + const res = await this.attachFile(file, DOCUMENT_TYPE.SRW_TERMS); + this.showSRWTermsVirus = !res; + } + + async attachSurveyPlan(file: FileHandle) { + const res = await this.attachFile(file, DOCUMENT_TYPE.SURVEY_PLAN); + this.showSurveyPlanVirus = !res; + } + async onSave() { await this.save(); } diff --git a/portal-frontend/src/app/services/application-document/application-document.service.ts b/portal-frontend/src/app/services/application-document/application-document.service.ts index 63f8e09025..dc2056901d 100644 --- a/portal-frontend/src/app/services/application-document/application-document.service.ts +++ b/portal-frontend/src/app/services/application-document/application-document.service.ts @@ -38,14 +38,11 @@ export class ApplicationDocumentService { this.toastService.showSuccessToast('Document uploaded'); return res; } catch (e) { - console.error(e); - // @ts-ignore - if (e!.status === 403) { - this.toastService.showErrorToast('Malicious file detected, upload blocked'); - debugger; - } else { - this.toastService.showErrorToast('Failed to attach document to Application, please try again'); + if (e instanceof HttpErrorResponse && e.status === 403) { + throw e; } + console.error(e); + this.toastService.showErrorToast('Failed to attach document to Application, please try again'); } return undefined; } diff --git a/portal-frontend/src/app/services/application-owner/application-owner.service.ts b/portal-frontend/src/app/services/application-owner/application-owner.service.ts index ba3684a4eb..9124cb404f 100644 --- a/portal-frontend/src/app/services/application-owner/application-owner.service.ts +++ b/portal-frontend/src/app/services/application-owner/application-owner.service.ts @@ -1,4 +1,4 @@ -import { HttpClient } from '@angular/common/http'; +import { HttpClient, HttpErrorResponse } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { firstValueFrom } from 'rxjs'; import { environment } from '../../../environments/environment'; @@ -126,6 +126,9 @@ export class ApplicationOwnerService { `${this.serviceUrl}/attachCorporateSummary` ); } catch (e) { + if (e instanceof HttpErrorResponse && e.status === 403) { + throw e; + } console.error(e); this.toastService.showErrorToast('Failed to attach document to Owner, please try again'); } diff --git a/portal-frontend/src/app/services/application-parcel/application-parcel.service.ts b/portal-frontend/src/app/services/application-parcel/application-parcel.service.ts index 061f34564a..1f11350c22 100644 --- a/portal-frontend/src/app/services/application-parcel/application-parcel.service.ts +++ b/portal-frontend/src/app/services/application-parcel/application-parcel.service.ts @@ -1,4 +1,4 @@ -import { HttpClient } from '@angular/common/http'; +import { HttpClient, HttpErrorResponse } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { firstValueFrom } from 'rxjs'; import { environment } from '../../../environments/environment'; @@ -85,6 +85,9 @@ export class ApplicationParcelService { this.toastService.showSuccessToast('Document uploaded'); return document; } catch (e) { + if (e instanceof HttpErrorResponse && e.status === 403) { + throw e; + } console.error(e); this.toastService.showErrorToast('Failed to attach document to Parcel, please try again'); } diff --git a/portal-frontend/src/app/services/notice-of-intent-document/notice-of-intent-document.service.ts b/portal-frontend/src/app/services/notice-of-intent-document/notice-of-intent-document.service.ts index c336e011b3..f2bb77eed0 100644 --- a/portal-frontend/src/app/services/notice-of-intent-document/notice-of-intent-document.service.ts +++ b/portal-frontend/src/app/services/notice-of-intent-document/notice-of-intent-document.service.ts @@ -1,4 +1,4 @@ -import { HttpClient } from '@angular/common/http'; +import { HttpClient, HttpErrorResponse } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { firstValueFrom } from 'rxjs'; import { environment } from '../../../environments/environment'; @@ -38,6 +38,9 @@ export class NoticeOfIntentDocumentService { this.toastService.showSuccessToast('Document uploaded'); return res; } catch (e) { + if (e instanceof HttpErrorResponse && e.status === 403) { + throw e; + } console.error(e); this.toastService.showErrorToast('Failed to attach document, please try again'); } diff --git a/portal-frontend/src/app/services/notice-of-intent-owner/notice-of-intent-owner.service.ts b/portal-frontend/src/app/services/notice-of-intent-owner/notice-of-intent-owner.service.ts index 66a48b3aab..eee2f7b09c 100644 --- a/portal-frontend/src/app/services/notice-of-intent-owner/notice-of-intent-owner.service.ts +++ b/portal-frontend/src/app/services/notice-of-intent-owner/notice-of-intent-owner.service.ts @@ -1,4 +1,4 @@ -import { HttpClient } from '@angular/common/http'; +import { HttpClient, HttpErrorResponse } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { firstValueFrom } from 'rxjs'; import { environment } from '../../../environments/environment'; @@ -136,6 +136,9 @@ export class NoticeOfIntentOwnerService { `${this.serviceUrl}/attachCorporateSummary` ); } catch (e) { + if (e instanceof HttpErrorResponse && e.status === 403) { + throw e; + } console.error(e); this.toastService.showErrorToast('Failed to attach document to Owner, please try again'); } diff --git a/portal-frontend/src/app/services/notice-of-intent-parcel/notice-of-intent-parcel.service.ts b/portal-frontend/src/app/services/notice-of-intent-parcel/notice-of-intent-parcel.service.ts index b468fd8cf7..68ac0c3b88 100644 --- a/portal-frontend/src/app/services/notice-of-intent-parcel/notice-of-intent-parcel.service.ts +++ b/portal-frontend/src/app/services/notice-of-intent-parcel/notice-of-intent-parcel.service.ts @@ -1,4 +1,4 @@ -import { HttpClient } from '@angular/common/http'; +import { HttpClient, HttpErrorResponse } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { firstValueFrom } from 'rxjs'; import { environment } from '../../../environments/environment'; @@ -84,6 +84,9 @@ export class NoticeOfIntentParcelService { this.toastService.showSuccessToast('Document uploaded'); return document; } catch (e) { + if (e instanceof HttpErrorResponse && e.status === 403) { + throw e; + } console.error(e); this.toastService.showErrorToast('Failed to attach document to Parcel, please try again'); } diff --git a/portal-frontend/src/app/services/notification-document/notification-document.service.ts b/portal-frontend/src/app/services/notification-document/notification-document.service.ts index a7185d54d7..4adc0d9c9b 100644 --- a/portal-frontend/src/app/services/notification-document/notification-document.service.ts +++ b/portal-frontend/src/app/services/notification-document/notification-document.service.ts @@ -1,4 +1,4 @@ -import { HttpClient } from '@angular/common/http'; +import { HttpClient, HttpErrorResponse } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { firstValueFrom } from 'rxjs'; import { environment } from '../../../environments/environment'; @@ -38,6 +38,9 @@ export class NotificationDocumentService { this.toastService.showSuccessToast('Document uploaded'); return res; } catch (e) { + if (e instanceof HttpErrorResponse && e.status === 403) { + throw e; + } console.error(e); this.toastService.showErrorToast('Failed to attach document, please try again'); } diff --git a/portal-frontend/src/app/shared/file-drag-drop/file-drag-drop.component.html b/portal-frontend/src/app/shared/file-drag-drop/file-drag-drop.component.html index d5915e5dbf..547574361f 100644 --- a/portal-frontend/src/app/shared/file-drag-drop/file-drag-drop.component.html +++ b/portal-frontend/src/app/shared/file-drag-drop/file-drag-drop.component.html @@ -27,7 +27,7 @@ *ngIf="!uploadedFiles.length || allowMultiple" [ngClass]="{ 'desktop-file-drag-drop': true, - 'error-outline': isRequired && !disabled && showErrors && !uploadedFiles.length, + 'error-outline': !disabled && ((isRequired && showErrors && !uploadedFiles.length) || showVirusError), disabled: disabled }" dragDropFile @@ -52,6 +52,9 @@ > Upload File </button> -<app-validation-error *ngIf="isRequired && !disabled && showErrors && !uploadedFiles.length" errorClass="field-error" - >This file upload is required</app-validation-error -> +<app-validation-error *ngIf="isRequired && !disabled && showErrors && !uploadedFiles.length" errorClass="field-error"> + This file upload is required +</app-validation-error> +<app-validation-error *ngIf="!disabled && showVirusError" errorClass="field-error"> + A virus was detected in the file. Choose another file and try again. +</app-validation-error> diff --git a/portal-frontend/src/app/shared/file-drag-drop/file-drag-drop.component.ts b/portal-frontend/src/app/shared/file-drag-drop/file-drag-drop.component.ts index f8dab6514b..c22ef3395c 100644 --- a/portal-frontend/src/app/shared/file-drag-drop/file-drag-drop.component.ts +++ b/portal-frontend/src/app/shared/file-drag-drop/file-drag-drop.component.ts @@ -19,6 +19,7 @@ export class FileDragDropComponent implements OnInit { @Input() uploadedFiles: (ApplicationDocumentDto & { errorMessage?: string })[] = []; @Input() isRequired = false; @Input() showErrors = false; + @Input() showVirusError = false; @ViewChild('fileUpload') fileUpload!: ElementRef<HTMLInputElement>; diff --git a/portal-frontend/src/app/shared/owner-dialogs/owner-dialog/owner-dialog.component.html b/portal-frontend/src/app/shared/owner-dialogs/owner-dialog/owner-dialog.component.html index 869df35c06..c15fd4ed47 100644 --- a/portal-frontend/src/app/shared/owner-dialogs/owner-dialog/owner-dialog.component.html +++ b/portal-frontend/src/app/shared/owner-dialogs/owner-dialog/owner-dialog.component.html @@ -43,6 +43,7 @@ <h6></h6> id="fileUpload" [showErrors]="showFileErrors" [isRequired]="true" + [showVirusError]="showVirusError" ></app-file-drag-drop> <mat-form-field style="display: none"> <input id="corporateSummary" matInput formControlName="corporateSummary" /> diff --git a/portal-frontend/src/app/shared/owner-dialogs/owner-dialog/owner-dialog.component.ts b/portal-frontend/src/app/shared/owner-dialogs/owner-dialog/owner-dialog.component.ts index 91d9a7074f..e41b95fa02 100644 --- a/portal-frontend/src/app/shared/owner-dialogs/owner-dialog/owner-dialog.component.ts +++ b/portal-frontend/src/app/shared/owner-dialogs/owner-dialog/owner-dialog.component.ts @@ -35,6 +35,7 @@ export class OwnerDialogComponent { corporateSummary = new FormControl<string | null>(null); isEdit = false; + showVirusError = false; existingUuid: string | undefined; files: ApplicationDocumentDto[] = []; showFileErrors = false @@ -104,8 +105,14 @@ export class OwnerDialogComponent { console.error('ApplicationOwnerDialogComponent misconfigured, needs fileId for create'); return; } - - const documentUuid = await this.uploadPendingFile(this.pendingFile); + + let documentUuid; + if (this.pendingFile) { + documentUuid = await this.uploadPendingFile(this.pendingFile); + if (!documentUuid) { + return; + } + } const createDto: ApplicationOwnerCreateDto & NoticeOfIntentOwnerCreateDto = { organizationName: this.organizationName.getRawValue() || undefined, firstName: this.firstName.getRawValue() || undefined, @@ -117,7 +124,7 @@ export class OwnerDialogComponent { applicationSubmissionUuid: this.data.submissionUuid, noticeOfIntentSubmissionUuid: this.data.submissionUuid, }; - + const res = await this.data.ownerService.create(createDto); this.dialogRef.close(res); } else { @@ -147,7 +154,7 @@ export class OwnerDialogComponent { this.dialogRef.close(res); } } else { - this.form.markAllAsTouched() + this.form.markAllAsTouched(); } } @@ -156,6 +163,7 @@ export class OwnerDialogComponent { this.corporateSummary.setValue('pending'); const corporateSummaryType = this.documentCodes.find((code) => code.code === DOCUMENT_TYPE.CORPORATE_SUMMARY); if (corporateSummaryType) { + this.showVirusError = false; this.files = [ { type: corporateSummaryType, @@ -210,8 +218,13 @@ export class OwnerDialogComponent { private async uploadPendingFile(file?: File) { let documentUuid; if (file) { - documentUuid = await this.data.ownerService.uploadCorporateSummary(this.data.fileId, file); - if (!documentUuid) { + try { + documentUuid = await this.data.ownerService.uploadCorporateSummary(this.data.fileId, file); + } catch (e) { + this.showVirusError = true; + this.pendingFile = undefined; + this.corporateSummary.setValue(null); + this.files = []; return; } } From c99accb126dad2de555d1805fe6fef24bdd9068f Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Tue, 17 Oct 2023 15:13:43 -0700 Subject: [PATCH 506/954] Remove Stats Required * Remove from both NOI and App Decisions * Remove from UI and DB --- .../decision-input-v2.component.html | 16 ------------- .../decision-input-v2.component.ts | 4 ---- .../decision-v2/decision-v2.component.html | 8 ------- .../decision-v2/decision-v2.component.ts | 8 ------- .../decision-input-v2.component.html | 16 ------------- .../decision-input-v2.component.ts | 4 ---- .../decision-v2/decision-v2.component.html | 8 ------- .../decision-v2/decision-v2.component.ts | 8 ------- .../application-decision-v2.dto.ts | 2 -- .../decision/notice-of-intent-decision.dto.ts | 2 -- .../application-decision-v2.service.ts | 2 -- .../application-decision.dto.ts | 7 ------ .../application-decision.entity.ts | 8 ------- .../notice-of-intent-decision-v2.service.ts | 2 -- .../notice-of-intent-decision.dto.ts | 7 ------ .../notice-of-intent-decision.entity.ts | 8 ------- .../1697580176148-remove_stats_required.ts | 23 +++++++++++++++++++ 17 files changed, 23 insertions(+), 110 deletions(-) create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1697580176148-remove_stats_required.ts diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.html index e6be6ba00f..a21979a446 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.html @@ -170,22 +170,6 @@ <h3>Resolution</h3> </mat-form-field> </div> - <div> - <mat-label class="toggle-label">Stats required*</mat-label> - <mat-button-toggle-group - id="isStatsRequired" - formControlName="isStatsRequired" - name="isStatsRequired" - [ngClass]="{ - 'error-field-outlined ng-invalid': - !form.controls.isStatsRequired.valid && form.controls.isStatsRequired.touched - }" - > - <mat-button-toggle value="true">Yes</mat-button-toggle> - <mat-button-toggle value="false">No</mat-button-toggle> - </mat-button-toggle-group> - </div> - <ng-container *ngIf="form.controls.outcome.value === 'RESC'"> <mat-form-field appearance="outline" class="date-picker"> <mat-label>Rescinded Date</mat-label> diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.ts index 51d6383cb8..f2bf449825 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.ts @@ -101,7 +101,6 @@ export class DecisionInputV2Component implements OnInit, OnDestroy { ceoCriterion: new FormControl<string | null>(null), isSubjectToConditions: new FormControl<string | undefined>(undefined, [Validators.required]), decisionDescription: new FormControl<string | undefined>(undefined, [Validators.required]), - isStatsRequired: new FormControl<string | undefined>(undefined, [Validators.required]), rescindedDate: new FormControl<Date | null>(null), rescindedComment: new FormControl<string | null>(null), }); @@ -290,7 +289,6 @@ export class DecisionInputV2Component implements OnInit, OnDestroy { postDecision: existingDecision.modifies?.uuid || existingDecision.reconsiders?.uuid, isSubjectToConditions: parseBooleanToString(existingDecision.isSubjectToConditions), decisionDescription: existingDecision.decisionDescription, - isStatsRequired: parseBooleanToString(existingDecision.isStatsRequired), rescindedDate: existingDecision.rescindedDate ? new Date(existingDecision.rescindedDate) : undefined, rescindedComment: existingDecision.rescindedComment, linkedResolutionOutcome: existingDecision.linkedResolutionOutcome?.code, @@ -423,7 +421,6 @@ export class DecisionInputV2Component implements OnInit, OnDestroy { postDecision, isSubjectToConditions, decisionDescription, - isStatsRequired, rescindedDate, rescindedComment, linkedResolutionOutcome, @@ -450,7 +447,6 @@ export class DecisionInputV2Component implements OnInit, OnDestroy { isDraft, isSubjectToConditions: parseStringToBoolean(isSubjectToConditions), decisionDescription: decisionDescription, - isStatsRequired: parseStringToBoolean(isStatsRequired), rescindedDate: rescindedDate ? formatDateForApi(rescindedDate) : rescindedDate, rescindedComment: rescindedComment, decisionComponents: this.components, diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.html index 841e2465ae..7317bd80b5 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.html @@ -131,14 +131,6 @@ <h4>Resolution</h4> ></app-no-data> </div> - <div> - <div class="subheading2">Stats Required</div> - <app-inline-boolean - [selectedValue]="decision.isStatsRequired ?? null" - (save)="onStatsRequiredUpdate(decision.uuid, $event)" - ></app-inline-boolean> - </div> - <div *ngIf="decision.outcome?.code === 'RESC'"> <div class="subheading2">Rescinded Date</div> <ng-container *ngIf="decision.rescindedDate">{{ decision.rescindedDate | momentFormat }}</ng-container> diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.ts index 32a3904d71..69e587dbb1 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.ts @@ -228,14 +228,6 @@ export class DecisionV2Component implements OnInit, OnDestroy { await this.loadDecisions(this.fileNumber); } - async onStatsRequiredUpdate(decisionUuid: string, value: boolean) { - await this.decisionService.update(decisionUuid, { - isStatsRequired: value, - isDraft: this.decisions.find((e) => e.uuid === decisionUuid)?.isDraft, - }); - await this.loadDecisions(this.fileNumber); - } - ngOnDestroy(): void { this.decisionService.clearDecisions(); this.$destroy.next(); diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-input-v2.component.html b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-input-v2.component.html index 029b499c77..5886aa7486 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-input-v2.component.html +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-input-v2.component.html @@ -137,22 +137,6 @@ <h3>Resolution</h3> </mat-form-field> </div> - <div> - <mat-label class="toggle-label">Stats required*</mat-label> - <mat-button-toggle-group - id="isStatsRequired" - formControlName="isStatsRequired" - name="isStatsRequired" - [ngClass]="{ - 'error-field-outlined ng-invalid': - !form.controls.isStatsRequired.valid && form.controls.isStatsRequired.touched - }" - > - <mat-button-toggle value="true">Yes</mat-button-toggle> - <mat-button-toggle value="false">No</mat-button-toggle> - </mat-button-toggle-group> - </div> - <ng-container *ngIf="form.controls.outcome.value === 'RESC'"> <mat-form-field appearance="outline" class="date-picker"> <mat-label>Rescinded Date</mat-label> diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-input-v2.component.ts b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-input-v2.component.ts index 919359f8f3..b4acd1684d 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-input-v2.component.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-input-v2.component.ts @@ -78,7 +78,6 @@ export class DecisionInputV2Component implements OnInit, OnDestroy { auditDate: new FormControl<Date | null>(null), isSubjectToConditions: new FormControl<string | undefined>(undefined, [Validators.required]), decisionDescription: new FormControl<string | undefined>(undefined, [Validators.required]), - isStatsRequired: new FormControl<string | undefined>(undefined, [Validators.required]), rescindedDate: new FormControl<Date | null>(null), rescindedComment: new FormControl<string | null>(null), }); @@ -234,7 +233,6 @@ export class DecisionInputV2Component implements OnInit, OnDestroy { postDecision: existingDecision.modifies?.uuid, isSubjectToConditions: parseBooleanToString(existingDecision.isSubjectToConditions), decisionDescription: existingDecision.decisionDescription, - isStatsRequired: parseBooleanToString(existingDecision.isStatsRequired), rescindedDate: existingDecision.rescindedDate ? new Date(existingDecision.rescindedDate) : undefined, rescindedComment: existingDecision.rescindedComment, }); @@ -310,7 +308,6 @@ export class DecisionInputV2Component implements OnInit, OnDestroy { postDecision, isSubjectToConditions, decisionDescription, - isStatsRequired, rescindedDate, rescindedComment, } = this.form.getRawValue(); @@ -327,7 +324,6 @@ export class DecisionInputV2Component implements OnInit, OnDestroy { isDraft, isSubjectToConditions: parseStringToBoolean(isSubjectToConditions), decisionDescription: decisionDescription, - isStatsRequired: parseStringToBoolean(isStatsRequired), rescindedDate: rescindedDate ? formatDateForApi(rescindedDate) : rescindedDate, rescindedComment: rescindedComment, decisionComponents: this.components, diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-v2.component.html b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-v2.component.html index a8243709e2..599487830d 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-v2.component.html +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-v2.component.html @@ -109,14 +109,6 @@ <h4>Resolution</h4> ></app-no-data> </div> - <div> - <div class="subheading2">Stats Required</div> - <app-inline-boolean - [selectedValue]="decision.isStatsRequired ?? null" - (save)="onStatsRequiredUpdate(decision.uuid, $event)" - ></app-inline-boolean> - </div> - <div *ngIf="decision.outcome?.code === 'RESC'"> <div class="subheading2">Rescinded Date</div> <ng-container *ngIf="decision.rescindedDate">{{ decision.rescindedDate | momentFormat }}</ng-container> diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-v2.component.ts b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-v2.component.ts index 190c48fbd0..3ccb5812cf 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-v2.component.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-v2.component.ts @@ -211,14 +211,6 @@ export class DecisionV2Component implements OnInit, OnDestroy { await this.loadDecisions(this.fileNumber); } - async onStatsRequiredUpdate(decisionUuid: string, value: boolean) { - await this.decisionService.update(decisionUuid, { - isStatsRequired: value, - isDraft: this.decisions.find((e) => e.uuid === decisionUuid)!.isDraft, - }); - await this.loadDecisions(this.fileNumber); - } - ngOnDestroy(): void { this.decisionService.clearDecisions(); this.$destroy.next(); diff --git a/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-v2.dto.ts b/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-v2.dto.ts index db99cf2efe..7b9d8268a1 100644 --- a/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-v2.dto.ts +++ b/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-v2.dto.ts @@ -23,7 +23,6 @@ export interface UpdateApplicationDecisionDto { reconsidersUuid?: string | null; isSubjectToConditions?: boolean | null; decisionDescription?: string | null; - isStatsRequired?: boolean | null; rescindedDate?: number | null; rescindedComment?: string | null; conditions?: UpdateApplicationDecisionConditionDto[]; @@ -65,7 +64,6 @@ export interface ApplicationDecisionDto { isDraft: boolean; isSubjectToConditions?: boolean | null; decisionDescription?: string | null; - isStatsRequired?: boolean | null; rescindedDate?: number | null; rescindedComment?: string | null; modifies?: LinkedResolutionDto; diff --git a/alcs-frontend/src/app/services/notice-of-intent/decision/notice-of-intent-decision.dto.ts b/alcs-frontend/src/app/services/notice-of-intent/decision/notice-of-intent-decision.dto.ts index 791d4d37cf..7e0c7588e4 100644 --- a/alcs-frontend/src/app/services/notice-of-intent/decision/notice-of-intent-decision.dto.ts +++ b/alcs-frontend/src/app/services/notice-of-intent/decision/notice-of-intent-decision.dto.ts @@ -11,7 +11,6 @@ export interface UpdateNoticeOfIntentDecisionDto { modifiesUuid?: string | null; isSubjectToConditions?: boolean | null; decisionDescription?: string | null; - isStatsRequired?: boolean | null; rescindedDate?: number | null; rescindedComment?: string | null; isDraft?: boolean; @@ -45,7 +44,6 @@ export interface NoticeOfIntentDecisionDto { isDraft: boolean; wasReleased: boolean; decisionDescription?: string | null; - isStatsRequired?: boolean | null; rescindedDate?: number | null; rescindedComment?: string | null; fileNumber: string; diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service.ts index ca47f4e725..57935dc15d 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service.ts @@ -270,7 +270,6 @@ export class ApplicationDecisionV2Service { existingDecision.resolutionYear = updateDto.resolutionYear; existingDecision.isSubjectToConditions = updateDto.isSubjectToConditions; existingDecision.decisionDescription = updateDto.decisionDescription; - existingDecision.isStatsRequired = updateDto.isStatsRequired; existingDecision.isDraft = updateDto.isDraft; existingDecision.rescindedDate = formatIncomingDate( updateDto.rescindedDate, @@ -372,7 +371,6 @@ export class ApplicationDecisionV2Service { isDraft: true, isSubjectToConditions: createDto.isSubjectToConditions, decisionDescription: createDto.decisionDescription, - isStatsRequired: createDto.isStatsRequired, rescindedDate: createDto.rescindedDate ? new Date(createDto.rescindedDate) : null, diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision.dto.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision.dto.ts index c4d50ee910..2ae860e115 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision.dto.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision.dto.ts @@ -88,10 +88,6 @@ export class UpdateApplicationDecisionDto { @IsOptional() decisionDescription?: string | null; - @IsBoolean() - @IsOptional() - isStatsRequired?: boolean | null; - @IsNumber() @IsOptional() rescindedDate?: number | null; @@ -205,9 +201,6 @@ export class ApplicationDecisionDto { @AutoMap(() => String) decisionDescription?: string | null; - @AutoMap(() => Boolean) - isStatsRequired?: boolean | null; - @AutoMap(() => Number) rescindedDate?: number | null; diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision.entity.ts b/services/apps/alcs/src/alcs/application-decision/application-decision.entity.ts index 45e1858502..0ca16cc9c9 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision.entity.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision.entity.ts @@ -121,14 +121,6 @@ export class ApplicationDecision extends Base { }) decisionDescription?: string | null; - @AutoMap(() => Boolean) - @Column({ - comment: 'Indicates whether the stats are required for the decision', - nullable: true, - type: 'boolean', - }) - isStatsRequired?: boolean | null; - @AutoMap(() => Date) @Column({ type: 'timestamptz', diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.service.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.service.ts index bbd22bafd3..29aed9adad 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.service.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.service.ts @@ -206,7 +206,6 @@ export class NoticeOfIntentDecisionV2Service { existingDecision.resolutionYear = updateDto.resolutionYear; existingDecision.isSubjectToConditions = updateDto.isSubjectToConditions; existingDecision.decisionDescription = updateDto.decisionDescription; - existingDecision.isStatsRequired = updateDto.isStatsRequired; existingDecision.isDraft = updateDto.isDraft; existingDecision.rescindedDate = formatIncomingDate( updateDto.rescindedDate, @@ -289,7 +288,6 @@ export class NoticeOfIntentDecisionV2Service { isDraft: true, isSubjectToConditions: createDto.isSubjectToConditions, decisionDescription: createDto.decisionDescription, - isStatsRequired: createDto.isStatsRequired, rescindedDate: createDto.rescindedDate ? new Date(createDto.rescindedDate) : null, diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.dto.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.dto.ts index cd1bab37ad..1f963db3d8 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.dto.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.dto.ts @@ -60,10 +60,6 @@ export class UpdateNoticeOfIntentDecisionDto { @IsOptional() decisionDescription?: string | null; - @IsBoolean() - @IsOptional() - isStatsRequired?: boolean | null; - @IsNumber() @IsOptional() rescindedDate?: number | null; @@ -129,9 +125,6 @@ export class NoticeOfIntentDecisionDto { @AutoMap(() => String) decisionDescription?: string | null; - @AutoMap(() => Boolean) - isStatsRequired?: boolean | null; - @AutoMap(() => Number) rescindedDate?: number | null; diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.entity.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.entity.ts index ccc808eabb..1bfcd38aa1 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.entity.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.entity.ts @@ -90,14 +90,6 @@ export class NoticeOfIntentDecision extends Base { }) decisionDescription?: string | null; - @AutoMap(() => Boolean) - @Column({ - comment: 'Indicates whether the stats are required for the decision', - nullable: true, - type: 'boolean', - }) - isStatsRequired?: boolean | null; - @AutoMap(() => Date) @Column({ type: 'timestamptz', diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1697580176148-remove_stats_required.ts b/services/apps/alcs/src/providers/typeorm/migrations/1697580176148-remove_stats_required.ts new file mode 100644 index 0000000000..cf8522334b --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1697580176148-remove_stats_required.ts @@ -0,0 +1,23 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class removeStatsRequired1697580176148 implements MigrationInterface { + name = 'removeStatsRequired1697580176148'; + + public async up(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `ALTER TABLE "alcs"."application_decision" DROP COLUMN "is_stats_required"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_decision" DROP COLUMN "is_stats_required"`, + ); + } + + public async down(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_decision" ADD "is_stats_required" boolean`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_decision" ADD "is_stats_required" boolean`, + ); + } +} From 29bb49dc147a15a5dc4d7d2ab843ef68ce69b517 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Tue, 17 Oct 2023 15:36:40 -0700 Subject: [PATCH 507/954] Add File Overlay Spinner * Add new custom overlay spinner for use specifically during file uploads --- .../app/services/document/document.service.ts | 2 +- .../file-overlay-spinner.component.html | 9 ++++++++ .../file-overlay-spinner.component.scss | 10 +++++++++ .../file-overlay-spinner.component.spec.ts | 22 +++++++++++++++++++ .../file-overlay-spinner.component.ts | 10 +++++++++ .../overlay-spinner.service.ts | 13 +++++++---- .../upload-spinner.component.ts | 0 .../src/app/shared/shared.module.ts | 3 +++ 8 files changed, 64 insertions(+), 5 deletions(-) create mode 100644 portal-frontend/src/app/shared/overlay-spinner/file-overlay-spinner/file-overlay-spinner.component.html create mode 100644 portal-frontend/src/app/shared/overlay-spinner/file-overlay-spinner/file-overlay-spinner.component.scss create mode 100644 portal-frontend/src/app/shared/overlay-spinner/file-overlay-spinner/file-overlay-spinner.component.spec.ts create mode 100644 portal-frontend/src/app/shared/overlay-spinner/file-overlay-spinner/file-overlay-spinner.component.ts create mode 100644 portal-frontend/src/app/shared/overlay-spinner/upload-spinner.component.ts diff --git a/portal-frontend/src/app/services/document/document.service.ts b/portal-frontend/src/app/services/document/document.service.ts index 899968fcbc..23756c53a9 100644 --- a/portal-frontend/src/app/services/document/document.service.ts +++ b/portal-frontend/src/app/services/document/document.service.ts @@ -59,7 +59,7 @@ export class DocumentService { } try { - this.overlayService.showSpinner(); + this.overlayService.showFileSpinner(); const fileKey = await this.uploadFileToStorage(fileId, file, documentType); return await firstValueFrom( diff --git a/portal-frontend/src/app/shared/overlay-spinner/file-overlay-spinner/file-overlay-spinner.component.html b/portal-frontend/src/app/shared/overlay-spinner/file-overlay-spinner/file-overlay-spinner.component.html new file mode 100644 index 0000000000..a7798d3e83 --- /dev/null +++ b/portal-frontend/src/app/shared/overlay-spinner/file-overlay-spinner/file-overlay-spinner.component.html @@ -0,0 +1,9 @@ +<div class="center"> + <mat-spinner /> +</div> +<div class="center"> + <h5> + Uploading &<br /> + Scanning for Viruses + </h5> +</div> diff --git a/portal-frontend/src/app/shared/overlay-spinner/file-overlay-spinner/file-overlay-spinner.component.scss b/portal-frontend/src/app/shared/overlay-spinner/file-overlay-spinner/file-overlay-spinner.component.scss new file mode 100644 index 0000000000..e4369fc856 --- /dev/null +++ b/portal-frontend/src/app/shared/overlay-spinner/file-overlay-spinner/file-overlay-spinner.component.scss @@ -0,0 +1,10 @@ +@use '../../../../styles/functions' as *; + +h5 { + line-height: rem(32); + text-align: center; +} + +.center { + margin-bottom: rem(8); +} diff --git a/portal-frontend/src/app/shared/overlay-spinner/file-overlay-spinner/file-overlay-spinner.component.spec.ts b/portal-frontend/src/app/shared/overlay-spinner/file-overlay-spinner/file-overlay-spinner.component.spec.ts new file mode 100644 index 0000000000..0ff1530970 --- /dev/null +++ b/portal-frontend/src/app/shared/overlay-spinner/file-overlay-spinner/file-overlay-spinner.component.spec.ts @@ -0,0 +1,22 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { FileOverlaySpinnerComponent } from './file-overlay-spinner.component'; + +describe('FileOverlaySpinnerComponent', () => { + let component: FileOverlaySpinnerComponent; + let fixture: ComponentFixture<FileOverlaySpinnerComponent>; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [FileOverlaySpinnerComponent], + }).compileComponents(); + + fixture = TestBed.createComponent(FileOverlaySpinnerComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/shared/overlay-spinner/file-overlay-spinner/file-overlay-spinner.component.ts b/portal-frontend/src/app/shared/overlay-spinner/file-overlay-spinner/file-overlay-spinner.component.ts new file mode 100644 index 0000000000..b861dbc04c --- /dev/null +++ b/portal-frontend/src/app/shared/overlay-spinner/file-overlay-spinner/file-overlay-spinner.component.ts @@ -0,0 +1,10 @@ +import { Component } from '@angular/core'; + +@Component({ + selector: 'app-file-overlay-spinner', + templateUrl: './file-overlay-spinner.component.html', + styleUrls: ['./file-overlay-spinner.component.scss'], +}) +export class FileOverlaySpinnerComponent { + constructor() {} +} diff --git a/portal-frontend/src/app/shared/overlay-spinner/overlay-spinner.service.ts b/portal-frontend/src/app/shared/overlay-spinner/overlay-spinner.service.ts index 967f08cb59..e3cf55628c 100644 --- a/portal-frontend/src/app/shared/overlay-spinner/overlay-spinner.service.ts +++ b/portal-frontend/src/app/shared/overlay-spinner/overlay-spinner.service.ts @@ -1,7 +1,8 @@ import { Overlay, OverlayRef } from '@angular/cdk/overlay'; -import { ComponentPortal } from '@angular/cdk/portal'; -import { Injectable } from '@angular/core'; +import { ComponentPortal, ComponentType } from '@angular/cdk/portal'; +import { Component, Injectable } from '@angular/core'; import { MatProgressSpinner } from '@angular/material/progress-spinner'; +import { FileOverlaySpinnerComponent } from './file-overlay-spinner/file-overlay-spinner.component'; @Injectable({ providedIn: 'root', @@ -12,10 +13,14 @@ export class OverlaySpinnerService { constructor(private overlay: Overlay) {} - showSpinner() { + showFileSpinner() { + this.showSpinner(FileOverlaySpinnerComponent); + } + + showSpinner(component: ComponentType<any> = MatProgressSpinner) { if (!this.spinnerIsVisible) { this.spinnerIsVisible = true; - const portal = new ComponentPortal(MatProgressSpinner); + const portal = new ComponentPortal(component); const spinner = this.spinnerRef.attach(portal); spinner.instance.mode = 'indeterminate'; //Steal focus to prevent spamming the button diff --git a/portal-frontend/src/app/shared/overlay-spinner/upload-spinner.component.ts b/portal-frontend/src/app/shared/overlay-spinner/upload-spinner.component.ts new file mode 100644 index 0000000000..e69de29bb2 diff --git a/portal-frontend/src/app/shared/shared.module.ts b/portal-frontend/src/app/shared/shared.module.ts index 550ab98561..5f1ae97bf5 100644 --- a/portal-frontend/src/app/shared/shared.module.ts +++ b/portal-frontend/src/app/shared/shared.module.ts @@ -33,6 +33,7 @@ import { DragDropDirective } from './file-drag-drop/drag-drop.directive'; import { FileDragDropComponent } from './file-drag-drop/file-drag-drop.component'; import { InfoBannerComponent } from './info-banner/info-banner.component'; import { NoDataComponent } from './no-data/no-data.component'; +import { FileOverlaySpinnerComponent } from './overlay-spinner/file-overlay-spinner/file-overlay-spinner.component'; import { CrownOwnerDialogComponent } from './owner-dialogs/crown-owner-dialog/crown-owner-dialog.component'; import { OwnerDialogComponent } from './owner-dialogs/owner-dialog/owner-dialog.component'; import { AllOwnersDialogComponent } from './owner-dialogs/owners-dialog/all-owners-dialog.component'; @@ -77,6 +78,7 @@ import { WarningBannerComponent } from './warning-banner/warning-banner.componen MatIconModule, MatAutocompleteModule, MatTreeModule, + MatProgressSpinnerModule, ], declarations: [ FileDragDropComponent, @@ -98,6 +100,7 @@ import { WarningBannerComponent } from './warning-banner/warning-banner.componen SoilTableComponent, TableColumnNoDataPipe, FileTypeFilterDropDownComponent, + FileOverlaySpinnerComponent, ], exports: [ CommonModule, From cab4cee1ecaeb92a15262ad8e9f9e465a4d5c01c Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Tue, 17 Oct 2023 15:42:29 -0700 Subject: [PATCH 508/954] Code Review Feedback --- .../src/app/shared/overlay-spinner/upload-spinner.component.ts | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 portal-frontend/src/app/shared/overlay-spinner/upload-spinner.component.ts diff --git a/portal-frontend/src/app/shared/overlay-spinner/upload-spinner.component.ts b/portal-frontend/src/app/shared/overlay-spinner/upload-spinner.component.ts deleted file mode 100644 index e69de29bb2..0000000000 From f89191af05350c87c44d1bd4f936fb00d2b70356 Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Tue, 17 Oct 2023 16:38:23 -0700 Subject: [PATCH 509/954] bugfix 1166 next button scroll fix --- .../alcs-edit-submission/alcs-edit-submission.component.ts | 2 +- .../review-submission/review-submission.component.ts | 2 +- .../alcs-edit-submission/alcs-edit-submission.component.ts | 2 +- .../edit-submission/edit-submission.component.ts | 2 +- .../notifications/edit-submission/edit-submission.component.ts | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/portal-frontend/src/app/features/applications/alcs-edit-submission/alcs-edit-submission.component.ts b/portal-frontend/src/app/features/applications/alcs-edit-submission/alcs-edit-submission.component.ts index 8ab2f8ffc6..0ab680cd87 100644 --- a/portal-frontend/src/app/features/applications/alcs-edit-submission/alcs-edit-submission.component.ts +++ b/portal-frontend/src/app/features/applications/alcs-edit-submission/alcs-edit-submission.component.ts @@ -148,7 +148,7 @@ export class AlcsEditSubmissionComponent implements OnInit, OnDestroy, AfterView async onStepChange($event: StepperSelectionEvent) { // scrolls to step if step selected programmatically - scrollToElement({ id: `stepWrapper_${$event.selectedIndex}`, center: false }); + scrollToElement({ id: `siteLayout`, center: false }); } async saveApplication(step: number) { diff --git a/portal-frontend/src/app/features/applications/review-submission/review-submission.component.ts b/portal-frontend/src/app/features/applications/review-submission/review-submission.component.ts index e9360b815d..0cc8fb1348 100644 --- a/portal-frontend/src/app/features/applications/review-submission/review-submission.component.ts +++ b/portal-frontend/src/app/features/applications/review-submission/review-submission.component.ts @@ -208,7 +208,7 @@ export class ReviewSubmissionComponent implements OnInit, OnDestroy { } async onStepChange($event: StepperSelectionEvent) { - scrollToElement({ id: `stepWrapper_${$event.selectedIndex}`, center: false }); + scrollToElement({ id: `siteLayout`, center: false }); } private async loadApplicationDocuments(fileId: any) { diff --git a/portal-frontend/src/app/features/notice-of-intents/alcs-edit-submission/alcs-edit-submission.component.ts b/portal-frontend/src/app/features/notice-of-intents/alcs-edit-submission/alcs-edit-submission.component.ts index 134caab960..821b156d58 100644 --- a/portal-frontend/src/app/features/notice-of-intents/alcs-edit-submission/alcs-edit-submission.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/alcs-edit-submission/alcs-edit-submission.component.ts @@ -133,7 +133,7 @@ export class AlcsEditSubmissionComponent implements OnInit, OnDestroy, AfterView async onStepChange($event: StepperSelectionEvent) { // scrolls to step if step selected programmatically - scrollToElement({ id: `stepWrapper_${$event.selectedIndex}`, center: false }); + scrollToElement({ id: `siteLayout`, center: false }); } async saveSubmission(step: number) { diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.ts index c114c9693f..bd35b78e0a 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.ts @@ -129,7 +129,7 @@ export class EditSubmissionComponent implements OnDestroy, AfterViewInit { async onStepChange($event: StepperSelectionEvent) { // scrolls to step if step selected programmatically - scrollToElement({ id: `stepWrapper_${$event.selectedIndex}`, center: false }); + scrollToElement({ id: `siteLayout`, center: false }); } async switchStep(index: number) { diff --git a/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.component.ts b/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.component.ts index 11d0ada6ee..6e5682297f 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.component.ts +++ b/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.component.ts @@ -118,7 +118,7 @@ export class EditSubmissionComponent implements OnDestroy, AfterViewInit { onStepChange($event: StepperSelectionEvent) { // scrolls to step if step selected programmatically - scrollToElement({ id: `stepWrapper_${$event.selectedIndex}`, center: false }); + scrollToElement({ id: `siteLayout`, center: false }); } async switchStep(index: number) { From f43e9252fdc119fff6b055aaeac20a138d22b319 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Tue, 17 Oct 2023 16:33:24 -0700 Subject: [PATCH 510/954] Implement visibility flags * Were always visible before * Dynamically calculate --- .../decision-documents.component.html | 8 +-- .../decision-documents.component.ts | 3 ++ .../documents/documents.component.html | 8 ++- .../documents/documents.component.spec.ts | 6 +++ .../documents/documents.component.ts | 30 +++++++++++ .../decision-documents.component.html | 7 ++- .../decision-documents.component.ts | 3 ++ .../documents/documents.component.html | 5 +- .../documents/documents.component.spec.ts | 7 +++ .../documents/documents.component.ts | 53 ++++++++++++++----- 10 files changed, 104 insertions(+), 26 deletions(-) diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-documents/decision-documents.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-documents/decision-documents.component.html index d71013bc1c..8874f6bea1 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-documents/decision-documents.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-documents/decision-documents.component.html @@ -40,10 +40,10 @@ <h3>Documents</h3> <div class="subheading">* = Pending</div> </th> <td mat-cell *matCellDef="let element"> - <span matTooltip="Applicant">A*, </span> - <span matTooltip="Commissioner">C*, </span> - <span matTooltip="L/FNG">G*, </span> - <span matTooltip="Public">P*</span> + <span matTooltip="Applicant">A<span *ngIf="!areDocumentsReleased">*</span>, </span> + <span matTooltip="Commissioner">C<span *ngIf="!areDocumentsReleased">*</span>, </span> + <span matTooltip="L/FNG">G<span *ngIf="!areDocumentsReleased">*</span>, </span> + <span matTooltip="Public">P<span *ngIf="!areDocumentsReleased">*</span></span> </td> </ng-container> diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-documents/decision-documents.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-documents/decision-documents.component.ts index eac574e122..bcc4d5d4e8 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-documents/decision-documents.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-documents/decision-documents.component.ts @@ -27,6 +27,7 @@ export class DecisionDocumentsComponent implements OnInit, OnDestroy { displayedColumns: string[] = ['type', 'fileName', 'source', 'visibilityFlags', 'uploadedAt', 'actions']; documents: ApplicationDecisionDocumentDto[] = []; private fileId = ''; + areDocumentsReleased = false; @ViewChild(MatSort) sort!: MatSort; dataSource: MatTableDataSource<ApplicationDecisionDocumentDto> = @@ -42,11 +43,13 @@ export class DecisionDocumentsComponent implements OnInit, OnDestroy { ngOnInit(): void { if (this.decision && !this.loadData) { this.dataSource = new MatTableDataSource(this.decision.documents); + this.areDocumentsReleased = !this.decision.isDraft && !!this.decision.date && Date.now() >= this.decision.date; } this.decisionService.$decision.pipe(takeUntil(this.$destroy)).subscribe((decision) => { if (decision) { this.dataSource = new MatTableDataSource(decision.documents); this.decision = decision; + this.areDocumentsReleased = !decision.isDraft && !!decision.date && Date.now() >= decision.date; } }); } diff --git a/alcs-frontend/src/app/features/application/documents/documents.component.html b/alcs-frontend/src/app/features/application/documents/documents.component.html index e19dc4ba0a..d9ac5d3ccb 100644 --- a/alcs-frontend/src/app/features/application/documents/documents.component.html +++ b/alcs-frontend/src/app/features/application/documents/documents.component.html @@ -26,9 +26,13 @@ <h3>Documents</h3> <th mat-header-cell *matHeaderCellDef mat-sort-header sortActionDescription="Sort by visibility">Visibility</th> <td mat-cell *matCellDef="let element"> <span *ngIf="element.visibilityFlags.includes('A')" matTooltip="Applicant">A, </span> - <span *ngIf="element.visibilityFlags.includes('C')" matTooltip="Commissioner">C, </span> + <span *ngIf="element.visibilityFlags.includes('C')" matTooltip="Commissioner" + >C<span *ngIf="!hasBeenSetForDiscussion">*</span>, + </span> <span *ngIf="element.visibilityFlags.includes('G')" matTooltip="L/FNG">G, </span> - <span *ngIf="element.visibilityFlags.includes('P')" matTooltip="Public">P</span> + <span *ngIf="element.visibilityFlags.includes('P')" matTooltip="Public" + >P<span *ngIf="!hasBeenReceived">*</span></span + > </td> </ng-container> diff --git a/alcs-frontend/src/app/features/application/documents/documents.component.spec.ts b/alcs-frontend/src/app/features/application/documents/documents.component.spec.ts index cdbeaadb60..4ddbc4a6c3 100644 --- a/alcs-frontend/src/app/features/application/documents/documents.component.spec.ts +++ b/alcs-frontend/src/app/features/application/documents/documents.component.spec.ts @@ -5,6 +5,7 @@ import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { BehaviorSubject } from 'rxjs'; import { ApplicationDetailService } from '../../../services/application/application-detail.service'; import { ApplicationDocumentService } from '../../../services/application/application-document/application-document.service'; +import { ApplicationSubmissionStatusService } from '../../../services/application/application-submission-status/application-submission-status.service'; import { ApplicationDto } from '../../../services/application/application.dto'; import { ToastService } from '../../../services/toast/toast.service'; @@ -17,6 +18,7 @@ describe('DocumentsComponent', () => { let mockAppDetailService: DeepMocked<ApplicationDetailService>; let mockDialog: DeepMocked<MatDialog>; let mockToastService: DeepMocked<ToastService>; + let mockAppSubStatusService: DeepMocked<ApplicationSubmissionStatusService>; beforeEach(async () => { mockAppDocService = createMock(); @@ -44,6 +46,10 @@ describe('DocumentsComponent', () => { provide: ToastService, useValue: mockToastService, }, + { + provide: ApplicationSubmissionStatusService, + useValue: mockAppSubStatusService, + }, ], schemas: [NO_ERRORS_SCHEMA], }).compileComponents(); diff --git a/alcs-frontend/src/app/features/application/documents/documents.component.ts b/alcs-frontend/src/app/features/application/documents/documents.component.ts index 068e4bc8fb..620224ec98 100644 --- a/alcs-frontend/src/app/features/application/documents/documents.component.ts +++ b/alcs-frontend/src/app/features/application/documents/documents.component.ts @@ -2,6 +2,9 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; import { MatSort } from '@angular/material/sort'; import { MatTableDataSource } from '@angular/material/table'; +import { ApplicationSubmissionToSubmissionStatusDto } from '../../../services/application/application-submission-status/application-submission-status.dto'; +import { ApplicationSubmissionStatusService } from '../../../services/application/application-submission-status/application-submission-status.service'; +import { SUBMISSION_STATUS } from '../../../services/application/application.dto'; import { DOCUMENT_SYSTEM } from '../../../shared/document/document.dto'; import { ApplicationDetailService } from '../../../services/application/application-detail.service'; import { ApplicationDocumentDto } from '../../../services/application/application-document/application-document.dto'; @@ -22,6 +25,9 @@ export class DocumentsComponent implements OnInit { DOCUMENT_SYSTEM = DOCUMENT_SYSTEM; + hasBeenReceived = false; + hasBeenSetForDiscussion = false; + @ViewChild(MatSort) sort!: MatSort; dataSource: MatTableDataSource<ApplicationDocumentDto> = new MatTableDataSource<ApplicationDocumentDto>(); @@ -29,6 +35,7 @@ export class DocumentsComponent implements OnInit { private applicationDocumentService: ApplicationDocumentService, private applicationDetailService: ApplicationDetailService, private confirmationDialogService: ConfirmationDialogService, + private applicationSubmissionStatusService: ApplicationSubmissionStatusService, private toastService: ToastService, public dialog: MatDialog ) {} @@ -38,6 +45,7 @@ export class DocumentsComponent implements OnInit { if (application) { this.fileId = application.fileNumber; this.loadDocuments(application.fileNumber); + this.loadStatusHistory(application.fileNumber); } }); } @@ -114,4 +122,26 @@ export class DocumentsComponent implements OnInit { } }); } + + private async loadStatusHistory(fileNumber: string) { + let statusHistory: ApplicationSubmissionToSubmissionStatusDto[] = []; + try { + statusHistory = await this.applicationSubmissionStatusService.fetchSubmissionStatusesByFileNumber( + fileNumber, + false + ); + } catch (e) { + console.warn(`No statuses for ${fileNumber}. Is it a manually created submission?`); + } + + this.hasBeenReceived = + statusHistory.filter( + (status) => status.effectiveDate && status.statusTypeCode === SUBMISSION_STATUS.RECEIVED_BY_ALC + ).length > 0; + + this.hasBeenSetForDiscussion = + statusHistory.filter( + (status) => status.effectiveDate && status.statusTypeCode === SUBMISSION_STATUS.IN_REVIEW_BY_ALC + ).length > 0; + } } diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-documents/decision-documents.component.html b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-documents/decision-documents.component.html index 351641d7a0..4f628d2e0c 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-documents/decision-documents.component.html +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-documents/decision-documents.component.html @@ -40,10 +40,9 @@ <h3>Documents</h3> <div class="subheading">* = Pending</div> </th> <td mat-cell *matCellDef="let element"> - <span matTooltip="Applicant">A*, </span> - <span matTooltip="Commissioner">C*, </span> - <span matTooltip="L/FNG">G*, </span> - <span matTooltip="Public">P*</span> + <span matTooltip="Applicant">A<span *ngIf="!areDocumentsReleased">*</span>, </span> + <span matTooltip="L/FNG">G<span *ngIf="!areDocumentsReleased">*</span>, </span> + <span matTooltip="Public">P<span *ngIf="!areDocumentsReleased">*</span></span> </td> </ng-container> diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-documents/decision-documents.component.ts b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-documents/decision-documents.component.ts index 6dd0e805af..30d43f617c 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-documents/decision-documents.component.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-documents/decision-documents.component.ts @@ -29,6 +29,7 @@ export class DecisionDocumentsComponent implements OnInit, OnDestroy { displayedColumns: string[] = ['type', 'fileName', 'source', 'visibilityFlags', 'uploadedAt', 'actions']; documents: NoticeOfIntentDecisionDocumentDto[] = []; private fileId = ''; + areDocumentsReleased = false; @ViewChild(MatSort) sort!: MatSort; dataSource = new MatTableDataSource<NoticeOfIntentDecisionDocumentDto>(); @@ -43,11 +44,13 @@ export class DecisionDocumentsComponent implements OnInit, OnDestroy { ngOnInit(): void { if (this.decision && !this.loadData) { this.dataSource = new MatTableDataSource(this.decision.documents); + this.areDocumentsReleased = !this.decision.isDraft && !!this.decision.date && Date.now() >= this.decision.date; } this.decisionService.$decision.pipe(takeUntil(this.$destroy)).subscribe((decision) => { if (decision) { this.dataSource = new MatTableDataSource(decision.documents); this.decision = decision; + this.areDocumentsReleased = !decision.isDraft && !!decision.date && Date.now() >= decision.date; } }); } diff --git a/alcs-frontend/src/app/features/notice-of-intent/documents/documents.component.html b/alcs-frontend/src/app/features/notice-of-intent/documents/documents.component.html index e19dc4ba0a..d2de52216f 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/documents/documents.component.html +++ b/alcs-frontend/src/app/features/notice-of-intent/documents/documents.component.html @@ -26,9 +26,10 @@ <h3>Documents</h3> <th mat-header-cell *matHeaderCellDef mat-sort-header sortActionDescription="Sort by visibility">Visibility</th> <td mat-cell *matCellDef="let element"> <span *ngIf="element.visibilityFlags.includes('A')" matTooltip="Applicant">A, </span> - <span *ngIf="element.visibilityFlags.includes('C')" matTooltip="Commissioner">C, </span> <span *ngIf="element.visibilityFlags.includes('G')" matTooltip="L/FNG">G, </span> - <span *ngIf="element.visibilityFlags.includes('P')" matTooltip="Public">P</span> + <span *ngIf="element.visibilityFlags.includes('P')" matTooltip="Public" + >P<span *ngIf="!hasBeenReceived">*</span></span + > </td> </ng-container> diff --git a/alcs-frontend/src/app/features/notice-of-intent/documents/documents.component.spec.ts b/alcs-frontend/src/app/features/notice-of-intent/documents/documents.component.spec.ts index 4c9d0fb7cd..35bc315067 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/documents/documents.component.spec.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/documents/documents.component.spec.ts @@ -5,6 +5,7 @@ import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { BehaviorSubject } from 'rxjs'; import { NoiDocumentService } from '../../../services/notice-of-intent/noi-document/noi-document.service'; import { NoticeOfIntentDetailService } from '../../../services/notice-of-intent/notice-of-intent-detail.service'; +import { NoticeOfIntentSubmissionStatusService } from '../../../services/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service'; import { NoticeOfIntentDto } from '../../../services/notice-of-intent/notice-of-intent.dto'; import { ToastService } from '../../../services/toast/toast.service'; @@ -17,6 +18,7 @@ describe('NoiDocumentsComponent', () => { let mockNoiDetailService: DeepMocked<NoticeOfIntentDetailService>; let mockDialog: DeepMocked<MatDialog>; let mockToastService: DeepMocked<ToastService>; + let mockNoiSubStatusService: DeepMocked<NoticeOfIntentSubmissionStatusService>; beforeEach(async () => { mockNoiDocService = createMock(); @@ -24,6 +26,7 @@ describe('NoiDocumentsComponent', () => { mockDialog = createMock(); mockToastService = createMock(); mockNoiDetailService.$noticeOfIntent = new BehaviorSubject<NoticeOfIntentDto | undefined>(undefined); + mockNoiSubStatusService = createMock(); await TestBed.configureTestingModule({ declarations: [NoiDocumentsComponent], @@ -44,6 +47,10 @@ describe('NoiDocumentsComponent', () => { provide: ToastService, useValue: mockToastService, }, + { + provide: NoticeOfIntentSubmissionStatusService, + useValue: mockNoiSubStatusService, + }, ], schemas: [NO_ERRORS_SCHEMA], }).compileComponents(); diff --git a/alcs-frontend/src/app/features/notice-of-intent/documents/documents.component.ts b/alcs-frontend/src/app/features/notice-of-intent/documents/documents.component.ts index 662c310a89..e4aa1dcd52 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/documents/documents.component.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/documents/documents.component.ts @@ -2,6 +2,13 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; import { MatSort } from '@angular/material/sort'; import { MatTableDataSource } from '@angular/material/table'; +import { ApplicationSubmissionToSubmissionStatusDto } from '../../../services/application/application-submission-status/application-submission-status.dto'; +import { SUBMISSION_STATUS } from '../../../services/application/application.dto'; +import { NoticeOfIntentSubmissionStatusService } from '../../../services/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service'; +import { + NOI_SUBMISSION_STATUS, + NoticeOfIntentSubmissionToSubmissionStatusDto, +} from '../../../services/notice-of-intent/notice-of-intent.dto'; import { DOCUMENT_SYSTEM } from '../../../shared/document/document.dto'; import { ApplicationDocumentDto } from '../../../services/application/application-document/application-document.dto'; import { NoticeOfIntentDocumentDto } from '../../../services/notice-of-intent/noi-document/noi-document.dto'; @@ -23,6 +30,8 @@ export class NoiDocumentsComponent implements OnInit { DOCUMENT_SYSTEM = DOCUMENT_SYSTEM; + hasBeenReceived = false; + @ViewChild(MatSort) sort!: MatSort; dataSource: MatTableDataSource<NoticeOfIntentDocumentDto> = new MatTableDataSource<NoticeOfIntentDocumentDto>(); @@ -30,6 +39,7 @@ export class NoiDocumentsComponent implements OnInit { private noiDocumentService: NoiDocumentService, private noticeOfIntentDetailService: NoticeOfIntentDetailService, private confirmationDialogService: ConfirmationDialogService, + private noiSubmissionStatusService: NoticeOfIntentSubmissionStatusService, private toastService: ToastService, public dialog: MatDialog ) {} @@ -39,6 +49,7 @@ export class NoiDocumentsComponent implements OnInit { if (noticeOfIntent) { this.fileId = noticeOfIntent.fileNumber; this.loadDocuments(noticeOfIntent.fileNumber); + this.loadStatusHistory(noticeOfIntent.fileNumber); } }); } @@ -69,20 +80,6 @@ export class NoiDocumentsComponent implements OnInit { await this.noiDocumentService.download(uuid, fileName, false); } - private async loadDocuments(fileNumber: string) { - this.documents = await this.noiDocumentService.listAll(fileNumber); - this.dataSource = new MatTableDataSource(this.documents); - this.dataSource.sortingDataAccessor = (item, property) => { - switch (property) { - case 'type': - return item.type?.oatsCode; - default: // @ts-ignore Does not like using String for Key access, but that's what Angular provides - return item[property]; - } - }; - this.dataSource.sort = this.sort; - } - onEditFile(element: NoticeOfIntentDocumentDto) { this.dialog .open(DocumentUploadDialogComponent, { @@ -115,4 +112,32 @@ export class NoiDocumentsComponent implements OnInit { } }); } + + private async loadDocuments(fileNumber: string) { + this.documents = await this.noiDocumentService.listAll(fileNumber); + this.dataSource = new MatTableDataSource(this.documents); + this.dataSource.sortingDataAccessor = (item, property) => { + switch (property) { + case 'type': + return item.type?.oatsCode; + default: // @ts-ignore Does not like using String for Key access, but that's what Angular provides + return item[property]; + } + }; + this.dataSource.sort = this.sort; + } + + private async loadStatusHistory(fileNumber: string) { + let statusHistory: NoticeOfIntentSubmissionToSubmissionStatusDto[] = []; + try { + statusHistory = await this.noiSubmissionStatusService.fetchSubmissionStatusesByFileNumber(fileNumber, false); + } catch (e) { + console.warn(`No statuses for ${fileNumber}. Is it a manually created submission?`); + } + + this.hasBeenReceived = + statusHistory.filter( + (status) => status.effectiveDate && status.statusTypeCode === NOI_SUBMISSION_STATUS.RECEIVED_BY_ALC + ).length > 0; + } } From df6b4124b3eeb6a91e6dc5429f506e7a409d73e0 Mon Sep 17 00:00:00 2001 From: Liam Stoddard <lstodd@protonmail.com> Date: Tue, 17 Oct 2023 18:02:43 -0700 Subject: [PATCH 511/954] validation1 --- .../sql/app_submission_validation.sql | 52 +++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 bin/migrate-oats-data/applications/submissions/sql/app_submission_validation.sql diff --git a/bin/migrate-oats-data/applications/submissions/sql/app_submission_validation.sql b/bin/migrate-oats-data/applications/submissions/sql/app_submission_validation.sql new file mode 100644 index 0000000000..87df9e4981 --- /dev/null +++ b/bin/migrate-oats-data/applications/submissions/sql/app_submission_validation.sql @@ -0,0 +1,52 @@ +-- this script selects difference between fields that do not require mapping +WITH apps_with_one_or_zero_component_only AS ( + SELECT oaac.alr_application_id + FROM oats.oats_alr_appl_components oaac + GROUP BY oaac.alr_application_id + HAVING count(oaac.alr_application_id) < 2 +), +oats_app_data AS ( + SELECT oaa.alr_application_id, + oaac.alr_change_code + oaac.rsdntl_use_type_code, + oaac.infra_desc, + oaac.cur_struc_desc, + oaac.component_area, + oaac.support_desc, + oaa.tour_env_desc, + oaac.agricultural_activities_desc, + oaac.impact_reduction_desc, + oaac.owners_notified_ind, + oaac.applicationshare_ind, + oaac.improvements_desc, + oaa.proposal_summary_desc, + oaa.proposal_background_desc, + oaa.current_land_use_desc, + oaa.non_agricultural_uses_desc, + oaa.agricultural_improvement_desc, + oaac.homesite_severance_ind + FROM alcs.application_submission app_sub + JOIN apps_with_one_or_zero_component_only oats_asub ON oats_asub.alr_application_id::TEXT = app_sub.file_number + JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oats_asub.alr_application_id + AND oaa.application_class_code = 'LOA' OR oaa.application_class_code = 'BLK' + JOIN oats.oats_alr_appl_components oaac ON oaac.alr_application_id = oats_asub.alr_application_id +) +SELECT oats_app.alr_application_id, + as2.purpose, + as2.parcels_agriculture_improvement_description, + as2.parcels_agriculture_description, + as2.parcels_non_agriculture_use_description, + as2.naru_infrastructure, + as2.file_number, + oats_app.proposal_summary_desc, + oats_app.agricultural_improvement_desc, + oats_app.current_land_use_desc, + oats_app.non_agricultural_uses_desc, + oats_app.infra_desc +FROM alcs.application_submission as2 + LEFT JOIN oats_app_data AS oats_app ON as2.file_number = oats_app.alr_application_id::TEXT +WHERE as2.purpose != oats_app.proposal_summary_desc + OR as2.parcels_agriculture_improvement_description != oats_app.agricultural_improvement_desc + OR as2.parcels_agriculture_description != oats_app.current_land_use_desc + OR as2.parcels_non_agriculture_use_description != oats_app.non_agricultural_uses_desc + OR as2.naru_infrastructure != oats_app.infra_desc \ No newline at end of file From b8c1fa1fc51c38c27bfa82ba154a98d0715733da Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Wed, 18 Oct 2023 08:46:05 -0700 Subject: [PATCH 512/954] ALCS PROD DB obfuscation (#1068) ALCS PROD DB obfuscation update READ.ME --- bin/migrate-oats-data/README.md | 13 + .../menu/commands/obfuscation.py | 2 + .../prod_db_obfuscation/__init__.py | 3 +- .../prod_db_obfuscation/alcs/__init__.py | 1 + .../prod_db_obfuscation/alcs/obfuscate.py | 384 ++++++++++++++++++ .../prod_db_obfuscation/oats/obfuscate.py | 4 - bin/migrate-oats-data/requirements.txt | 3 +- 7 files changed, 404 insertions(+), 6 deletions(-) create mode 100644 bin/migrate-oats-data/prod_db_obfuscation/alcs/__init__.py create mode 100644 bin/migrate-oats-data/prod_db_obfuscation/alcs/obfuscate.py diff --git a/bin/migrate-oats-data/README.md b/bin/migrate-oats-data/README.md index 52148241ea..609d72f20d 100644 --- a/bin/migrate-oats-data/README.md +++ b/bin/migrate-oats-data/README.md @@ -42,3 +42,16 @@ Where [action] is one of the following: - clean: Cleans up previous ETL operations If you want to see a detailed description of the available arguments and options, run the script with the -h or --help flag. + +## Prod data obfuscation + +Prerequisites: + +- prod OATS postgres DB restored on local +- prod ALCS postgres DB restores on local. NOTE! The ALCS DB obfuscation covers only MVP BD structure, which is deployed at the time of the creation of alcs script! + +### How to run: + +- activate virtual env, the same way you would do it for starting etl, +- install python requirements `pip install -r requirements.txt` +- run data obfuscation `python migrate.py obfuscate` diff --git a/bin/migrate-oats-data/menu/commands/obfuscation.py b/bin/migrate-oats-data/menu/commands/obfuscation.py index 777f8466bc..f1dab719d9 100644 --- a/bin/migrate-oats-data/menu/commands/obfuscation.py +++ b/bin/migrate-oats-data/menu/commands/obfuscation.py @@ -1,7 +1,9 @@ from prod_db_obfuscation import process_oats_data +from prod_db_obfuscation import process_alcs_data def start_obfuscation(console): console.log("Beginning PROD data obfuscation") with console.status("PROD data obfuscation\n") as status: process_oats_data() + process_alcs_data() diff --git a/bin/migrate-oats-data/prod_db_obfuscation/__init__.py b/bin/migrate-oats-data/prod_db_obfuscation/__init__.py index 847680508c..3ddd0c7aac 100644 --- a/bin/migrate-oats-data/prod_db_obfuscation/__init__.py +++ b/bin/migrate-oats-data/prod_db_obfuscation/__init__.py @@ -1 +1,2 @@ -from .oats import process_oats_data \ No newline at end of file +from .oats import process_oats_data +from .alcs import process_alcs_data diff --git a/bin/migrate-oats-data/prod_db_obfuscation/alcs/__init__.py b/bin/migrate-oats-data/prod_db_obfuscation/alcs/__init__.py new file mode 100644 index 0000000000..111cf1c1d6 --- /dev/null +++ b/bin/migrate-oats-data/prod_db_obfuscation/alcs/__init__.py @@ -0,0 +1 @@ +from .obfuscate import process_alcs_data diff --git a/bin/migrate-oats-data/prod_db_obfuscation/alcs/obfuscate.py b/bin/migrate-oats-data/prod_db_obfuscation/alcs/obfuscate.py new file mode 100644 index 0000000000..204f78c87d --- /dev/null +++ b/bin/migrate-oats-data/prod_db_obfuscation/alcs/obfuscate.py @@ -0,0 +1,384 @@ +from common import setup_and_get_logger +from db import inject_conn_pool +from ..lorem_ipsum import lorem_ipsum_string +from faker import Faker +import functools + +logger = setup_and_get_logger("prod_data_obfuscation") + + +def process_alcs_data(): + logger.info("Start alcs obfuscation.") + _update_description_columns() + _delete_data_from_tables() + _update_body_columns() + _update_comment_columns() + _update_with_random_alcs_users() + _update_with_random_alcs_applications() + _update_with_random_alcs_covenant() + _update_with_random_alcs_documents() + _update_with_random_alcs_notice_of_intent() + _update_with_random_alcs_notice_of_intent_decision() + + +def log_process(proc_name): + def decorator_log_process(func): + @functools.wraps(func) + def wrapper_log_process(*args, **kwargs): + logger.info(f"Start '{proc_name}'") + result = func(*args, **kwargs) + logger.info(f"Finished '{proc_name}'") + return result + + return wrapper_log_process + + return decorator_log_process + + +@log_process("update_description_columns") +@inject_conn_pool +def _update_description_columns(conn=None): + create_proc_sql = f""" + {_lorem_ipsum_function_query} + + CREATE OR REPLACE FUNCTION update_description_schema() RETURNS VOID AS $$ + DECLARE + r RECORD; + BEGIN + FOR r IN (SELECT * FROM information_schema.columns WHERE column_name LIKE '%description%' and (data_type='text' or data_type like 'character varying') AND table_schema = 'alcs' AND table_name NOT LIKE '%code' AND table_name NOT LIKE '%type' and table_name not in ('application_status', 'card_status')) LOOP + EXECUTE format('UPDATE alcs.%s SET %s = random_lorem_ipsum() WHERE %s IS NOT NULL', r.table_name, r.column_name, r.column_name); + END LOOP; + END; + $$ LANGUAGE plpgsql; + """ + + execute_proc_sql = "SELECT update_description_schema();" + + try: + with conn.cursor() as cursor: + cursor.execute(create_proc_sql) + cursor.execute(execute_proc_sql) + conn.commit() + except Exception as err: + conn.rollback() + logger.exception(err) + + +@log_process("delete_data_from_tables") +@inject_conn_pool +def _delete_data_from_tables(conn=None): + # List of tables from which you want to delete data + table_names = ["alcs.comment_mention", "alcs.email_status", "alcs.notification"] + + try: + with conn.cursor() as cursor: + for table_name in table_names: + # Check if such a table exists before attempting to delete + check_table_exists_qry = f"SELECT to_regclass('{table_name}');" + del_query = f"DELETE FROM {table_name};" + + cursor.execute(check_table_exists_qry) + if cursor.fetchone()[0] is not None: + cursor.execute(del_query) + else: + logger.info(f"'{table_name}' does not exist.") + + conn.commit() + + except Exception as err: + logger.exception(err) + + +@log_process("update_body_columns") +@inject_conn_pool +def _update_body_columns(conn=None): + create_proc_sql = f""" + {_lorem_ipsum_function_query} + + CREATE OR REPLACE FUNCTION update_body_columns() RETURNS VOID AS $$ + DECLARE + r RECORD; + BEGIN + FOR r IN (SELECT * FROM information_schema.columns WHERE column_name = 'body' and (data_type='text' or data_type like 'character varying') AND table_schema = 'alcs' AND table_name NOT LIKE '%code' AND table_name NOT LIKE '%type') LOOP + EXECUTE format('UPDATE alcs.%s SET %s = random_lorem_ipsum() WHERE %s IS NOT NULL', r.table_name, r.column_name, r.column_name); + END LOOP; + END; + $$ LANGUAGE plpgsql; + """ + + execute_proc_sql = "SELECT update_body_columns();" + + try: + with conn.cursor() as cursor: + cursor.execute(create_proc_sql) + cursor.execute(execute_proc_sql) + conn.commit() + except Exception as err: + conn.rollback() + logger.exception(err) + + +@log_process("update_comment_columns") +@inject_conn_pool +def _update_comment_columns(conn=None): + create_proc_sql = f""" + {_lorem_ipsum_function_query} + + CREATE OR REPLACE FUNCTION update_comment_columns() RETURNS VOID AS $$ + DECLARE + r RECORD; + BEGIN + FOR r IN (SELECT * FROM information_schema.columns WHERE column_name = '%comment%' and (data_type='text' or data_type like 'character varying') AND table_schema = 'alcs') LOOP + EXECUTE format('UPDATE alcs.%s SET %s = random_lorem_ipsum() WHERE %s IS NOT NULL', r.table_name, r.column_name, r.column_name); + END LOOP; + END; + $$ LANGUAGE plpgsql; + """ + + execute_proc_sql = "SELECT update_comment_columns();" + + try: + with conn.cursor() as cursor: + cursor.execute(create_proc_sql) + cursor.execute(execute_proc_sql) + conn.commit() + except Exception as err: + conn.rollback() + logger.exception(err) + + +@log_process("update_with_random_names_oats_persons") +@inject_conn_pool +def _update_with_random_alcs_users(conn=None): + # Set Faker for generating random names + fake = Faker() + + try: + with conn.cursor() as cursor: + cursor.execute("SELECT uuid FROM alcs.user") + record_ids = cursor.fetchall() + + for r_id in record_ids: + sql_query = """ + UPDATE alcs.user + SET email = '11@11', + display_name = %s, + preferred_username = %s, + given_name = %s, + family_name = %s, + idir_user_name = %s, + bceid_user_name = %s, + settings = NULL, + client_roles = '{LUP}' + WHERE uuid = %s; + + UPDATE alcs.user + SET name = given_name || ' ' || family_name; + """ + cursor.execute( + sql_query, + ( + fake.user_name(), + fake.user_name(), + fake.first_name(), + fake.last_name(), + fake.user_name(), + fake.user_name(), + r_id[0], + ), + ) + + conn.commit() + except Exception as err: + conn.rollback() + logger.exception(err) + + +@log_process("update_with_random_alcs_applications") +@inject_conn_pool +def _update_with_random_alcs_applications(conn=None): + # Set Faker for generating random names + fake = Faker() + fake_latin = Faker("la") + + try: + with conn.cursor() as cursor: + cursor.execute("SELECT uuid FROM alcs.application") + record_ids = cursor.fetchall() + + for r_id in record_ids: + sql_query = """ + UPDATE alcs.application + SET summary = CASE WHEN summary IS NOT NULL THEN %s ELSE summary END, + ag_cap_consultant = CASE WHEN ag_cap_consultant IS NOT NULL THEN %s ELSE ag_cap_consultant END, + staff_observations = CASE WHEN staff_observations IS NOT NULL THEN %s ELSE staff_observations END, + applicant = CASE WHEN applicant IS NOT NULL THEN %s ELSE applicant END + WHERE uuid = %s; + """ + cursor.execute( + sql_query, + ( + fake_latin.sentence(nb_words=10), + fake.name(), + fake_latin.sentence(nb_words=5), + fake.name(), + r_id[0], + ), + ) + + conn.commit() + except Exception as err: + conn.rollback() + logger.exception(err) + + +@log_process("update_with_random_alcs_covenant") +@inject_conn_pool +def _update_with_random_alcs_covenant(conn=None): + # Set Faker for generating random names + fake = Faker() + + try: + with conn.cursor() as cursor: + cursor.execute("SELECT uuid FROM alcs.covenant") + record_ids = cursor.fetchall() + + for r_id in record_ids: + sql_query = """ + UPDATE alcs.covenant + SET applicant = CASE WHEN applicant IS NOT NULL THEN %s ELSE applicant END + WHERE uuid = %s; + """ + cursor.execute( + sql_query, + ( + fake.name(), + r_id[0], + ), + ) + + conn.commit() + except Exception as err: + conn.rollback() + logger.exception(err) + + +@log_process("update_with_random_alcs_documents") +@inject_conn_pool +def _update_with_random_alcs_documents(conn=None): + # Set Faker for generating random names + fake = Faker() + + try: + with conn.cursor() as cursor: + cursor.execute("SELECT uuid FROM alcs.document") + record_ids = cursor.fetchall() + + for r_id in record_ids: + sql_query = """ + UPDATE alcs.document + SET file_name = %s, + file_key = %s + WHERE uuid = %s; + """ + cursor.execute( + sql_query, + ( + fake.file_name(extension="pdf"), + fake.uuid4(), + r_id[0], + ), + ) + + conn.commit() + except Exception as err: + conn.rollback() + logger.exception(err) + + +@log_process("update_with_random_alcs_notice_of_intent") +@inject_conn_pool +def _update_with_random_alcs_notice_of_intent(conn=None): + # Set Faker for generating random names + fake = Faker() + fake_latin = Faker("la") + + try: + with conn.cursor() as cursor: + cursor.execute("SELECT uuid FROM alcs.notice_of_intent") + record_ids = cursor.fetchall() + + for r_id in record_ids: + sql_query = """ + UPDATE alcs.notice_of_intent + SET applicant = CASE WHEN applicant IS NOT NULL THEN %s ELSE applicant END, + summary = CASE WHEN summary IS NOT NULL THEN %s ELSE summary END + WHERE uuid = %s; + """ + cursor.execute( + sql_query, + ( + fake.name(), + fake_latin.sentence(nb_words=10), + r_id[0], + ), + ) + + conn.commit() + except Exception as err: + conn.rollback() + logger.exception(err) + + +@log_process("update_with_random_alcs_notice_of_intent_decision") +@inject_conn_pool +def _update_with_random_alcs_notice_of_intent_decision(conn=None): + # Set Faker for generating random names + fake = Faker() + + try: + with conn.cursor() as cursor: + cursor.execute("SELECT uuid FROM alcs.notice_of_intent_decision") + record_ids = cursor.fetchall() + + for r_id in record_ids: + sql_query = """ + UPDATE alcs.notice_of_intent_decision + SET decision_maker_name = CASE WHEN decision_maker_name IS NOT NULL THEN %s ELSE decision_maker_name END + WHERE uuid = %s; + """ + cursor.execute( + sql_query, + ( + fake.name(), + r_id[0], + ), + ) + + conn.commit() + except Exception as err: + conn.rollback() + logger.exception(err) + + +_lorem_ipsum_function_query = f""" +CREATE OR REPLACE FUNCTION random_lorem_ipsum() RETURNS text AS $$ + DECLARE + lorem_ipsum_str text = '{lorem_ipsum_string}';-- put your full string here + + words text[]; + i INT; + output text = ''; + + BEGIN + + words := string_to_array(lorem_ipsum_str, ' '); + + FOR i IN 1..50 LOOP + output := output || ' ' || words[1 + floor(random() * array_length(words, 1))]; + END LOOP; + + RETURN output; + +END; +$$ LANGUAGE plpgsql;""" diff --git a/bin/migrate-oats-data/prod_db_obfuscation/oats/obfuscate.py b/bin/migrate-oats-data/prod_db_obfuscation/oats/obfuscate.py index 632c34a5ce..06cf8c5799 100644 --- a/bin/migrate-oats-data/prod_db_obfuscation/oats/obfuscate.py +++ b/bin/migrate-oats-data/prod_db_obfuscation/oats/obfuscate.py @@ -70,10 +70,6 @@ def _update_person_identification_info(conn=None): create_proc_sql = """ CREATE OR REPLACE FUNCTION update_info_oats_schema() RETURNS VOID AS $$ DECLARE r RECORD; - firstnames TEXT[] := ARRAY['John', 'Jane', 'Adam', 'Sara', 'Mike', 'Emma']; - lastnames TEXT[] := ARRAY['Doe', 'Smith', 'Johnson', 'Brown', 'Williams', 'Miller']; - midnames TEXT[] := ARRAY['A', 'B', 'C', 'D','E', 'F']; - random_index int; BEGIN FOR r IN (SELECT * FROM information_schema.columns WHERE (column_name IN ('phone_number', 'cell_phone_number', 'email', 'email_address', 'website_url', 'fax_number' , 'title')) diff --git a/bin/migrate-oats-data/requirements.txt b/bin/migrate-oats-data/requirements.txt index 6749ce4202..f8b221ee6a 100644 --- a/bin/migrate-oats-data/requirements.txt +++ b/bin/migrate-oats-data/requirements.txt @@ -3,4 +3,5 @@ tqdm==4.64.1 python-dotenv==0.21.0 pyyaml==6.0 rich==13.3.1 -pytz==2023.3 \ No newline at end of file +pytz==2023.3 +faker==19.10.0 \ No newline at end of file From 42f361f3f557cdaf700677332bc2d5ecadbdba56 Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Wed, 18 Oct 2023 11:58:10 -0700 Subject: [PATCH 513/954] task-1166 fixes --- .../alcs-edit-submission/alcs-edit-submission.component.html | 2 +- .../alcs-edit-submission/alcs-edit-submission.component.ts | 4 ++-- .../edit-submission/edit-submission.component.html | 2 +- .../applications/edit-submission/edit-submission.component.ts | 4 ++-- .../review-submission/review-submission.component.html | 4 ++-- .../review-submission/review-submission.component.ts | 2 +- .../alcs-edit-submission/alcs-edit-submission.component.ts | 2 +- .../edit-submission/edit-submission.component.html | 2 +- .../edit-submission/edit-submission.component.ts | 4 ++-- .../edit-submission/edit-submission.component.ts | 2 +- 10 files changed, 14 insertions(+), 14 deletions(-) diff --git a/portal-frontend/src/app/features/applications/alcs-edit-submission/alcs-edit-submission.component.html b/portal-frontend/src/app/features/applications/alcs-edit-submission/alcs-edit-submission.component.html index 00eae59b51..8234ebe5c2 100644 --- a/portal-frontend/src/app/features/applications/alcs-edit-submission/alcs-edit-submission.component.html +++ b/portal-frontend/src/app/features/applications/alcs-edit-submission/alcs-edit-submission.component.html @@ -9,7 +9,7 @@ <h6 *ngIf="applicationSubmission"> <app-custom-stepper class="edit-application" #cdkStepper - (selectionChange)="onStepChange($event)" + (selectionChange)="onStepChange()" (beforeSwitchStep)="switchStep($event)" > <cdk-step label="Parcel Details"> diff --git a/portal-frontend/src/app/features/applications/alcs-edit-submission/alcs-edit-submission.component.ts b/portal-frontend/src/app/features/applications/alcs-edit-submission/alcs-edit-submission.component.ts index 0ab680cd87..4cbfe2e511 100644 --- a/portal-frontend/src/app/features/applications/alcs-edit-submission/alcs-edit-submission.component.ts +++ b/portal-frontend/src/app/features/applications/alcs-edit-submission/alcs-edit-submission.component.ts @@ -146,8 +146,8 @@ export class AlcsEditSubmissionComponent implements OnInit, OnDestroy, AfterView return of(true); } - async onStepChange($event: StepperSelectionEvent) { - // scrolls to step if step selected programmatically + async onStepChange() { + // scrolls to top of page scrollToElement({ id: `siteLayout`, center: false }); } diff --git a/portal-frontend/src/app/features/applications/edit-submission/edit-submission.component.html b/portal-frontend/src/app/features/applications/edit-submission/edit-submission.component.html index 269d5d3ebb..202339627d 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/edit-submission.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/edit-submission.component.html @@ -30,7 +30,7 @@ <h6 *ngIf="applicationSubmission"> <app-custom-stepper class="edit-application" #cdkStepper - (selectionChange)="onStepChange($event)" + (selectionChange)="onStepChange()" (beforeSwitchStep)="onBeforeSwitchStep($event)" > <cdk-step label="Parcel Details"> diff --git a/portal-frontend/src/app/features/applications/edit-submission/edit-submission.component.ts b/portal-frontend/src/app/features/applications/edit-submission/edit-submission.component.ts index b2667077fc..9b40933f47 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/edit-submission.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/edit-submission.component.ts @@ -193,8 +193,8 @@ export class EditSubmissionComponent implements OnInit, OnDestroy, AfterViewInit return of(true); } - async onStepChange($event: StepperSelectionEvent) { - // scrolls to step if step selected programmatically + async onStepChange() { + // scrolls to top of page scrollToElement({ id: `siteLayout`, center: false }); } diff --git a/portal-frontend/src/app/features/applications/review-submission/review-submission.component.html b/portal-frontend/src/app/features/applications/review-submission/review-submission.component.html index 19bf444e54..493c975114 100644 --- a/portal-frontend/src/app/features/applications/review-submission/review-submission.component.html +++ b/portal-frontend/src/app/features/applications/review-submission/review-submission.component.html @@ -12,7 +12,7 @@ <h6 *ngIf="application">Application ID: {{ application.fileNumber }} | {{ applic class="review-application" *ngIf="!isFirstNationGovernment" #cdkStepper - (selectionChange)="onStepChange($event)" + (selectionChange)="onStepChange()" (beforeSwitchStep)="onBeforeSwitchStep($event)" > <cdk-step label="Contact Information"> @@ -78,7 +78,7 @@ <h6 *ngIf="application">Application ID: {{ application.fileNumber }} | {{ applic class="review-application" *ngIf="isFirstNationGovernment" #cdkStepper - (selectionChange)="onStepChange($event)" + (selectionChange)="onStepChange()" (beforeSwitchStep)="onBeforeSwitchStep($event)" > <cdk-step label="Contact Information"> diff --git a/portal-frontend/src/app/features/applications/review-submission/review-submission.component.ts b/portal-frontend/src/app/features/applications/review-submission/review-submission.component.ts index 0cc8fb1348..ed80bdfbb2 100644 --- a/portal-frontend/src/app/features/applications/review-submission/review-submission.component.ts +++ b/portal-frontend/src/app/features/applications/review-submission/review-submission.component.ts @@ -207,7 +207,7 @@ export class ReviewSubmissionComponent implements OnInit, OnDestroy { await this.router.navigateByUrl(`application/${this.fileId}/review/${index}`); } - async onStepChange($event: StepperSelectionEvent) { + async onStepChange() { scrollToElement({ id: `siteLayout`, center: false }); } diff --git a/portal-frontend/src/app/features/notice-of-intents/alcs-edit-submission/alcs-edit-submission.component.ts b/portal-frontend/src/app/features/notice-of-intents/alcs-edit-submission/alcs-edit-submission.component.ts index 821b156d58..585584afbc 100644 --- a/portal-frontend/src/app/features/notice-of-intents/alcs-edit-submission/alcs-edit-submission.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/alcs-edit-submission/alcs-edit-submission.component.ts @@ -132,7 +132,7 @@ export class AlcsEditSubmissionComponent implements OnInit, OnDestroy, AfterView } async onStepChange($event: StepperSelectionEvent) { - // scrolls to step if step selected programmatically + // scrolls to top of page scrollToElement({ id: `siteLayout`, center: false }); } diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.html index 5fd08c36a8..9e3cb811f1 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.html @@ -26,7 +26,7 @@ <h6 *ngIf="noiSubmission">Notice of Intent ID: {{ noiSubmission.fileNumber }} | <app-custom-stepper class="edit-application" #cdkStepper - (selectionChange)="onStepChange($event)" + (selectionChange)="onStepChange()" (beforeSwitchStep)="switchStep($event)" > <cdk-step label="Parcel Details"> diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.ts index bd35b78e0a..897d58983c 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.ts @@ -127,8 +127,8 @@ export class EditSubmissionComponent implements OnDestroy, AfterViewInit { return of(true); } - async onStepChange($event: StepperSelectionEvent) { - // scrolls to step if step selected programmatically + async onStepChange() { + // scrolls to top of page scrollToElement({ id: `siteLayout`, center: false }); } diff --git a/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.component.ts b/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.component.ts index 6e5682297f..74cbd1a6ec 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.component.ts +++ b/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.component.ts @@ -117,7 +117,7 @@ export class EditSubmissionComponent implements OnDestroy, AfterViewInit { } onStepChange($event: StepperSelectionEvent) { - // scrolls to step if step selected programmatically + // scrolls to top of page scrollToElement({ id: `siteLayout`, center: false }); } From c1a5dbf0819cb411145e28ea0b2b4437309e329a Mon Sep 17 00:00:00 2001 From: Liam Stoddard <lstodd@protonmail.com> Date: Wed, 18 Oct 2023 12:33:34 -0700 Subject: [PATCH 514/954] leaving soil duration unresolved --- .../submissions/data_insert/data_prep.py | 8 + .../submissions/data_insert/insert_query.py | 47 +++++ .../data_insert/submap/soil_elements.py | 185 +++++++++++------- .../submissions/sql/app_submission.sql | 4 +- 4 files changed, 176 insertions(+), 68 deletions(-) diff --git a/bin/migrate-oats-data/applications/submissions/data_insert/data_prep.py b/bin/migrate-oats-data/applications/submissions/data_insert/data_prep.py index 5de7430ade..d0d0fb5bf0 100644 --- a/bin/migrate-oats-data/applications/submissions/data_insert/data_prep.py +++ b/bin/migrate-oats-data/applications/submissions/data_insert/data_prep.py @@ -44,6 +44,7 @@ def prepare_app_sub_data(app_sub_raw_data_list, direction_data, subdiv_data, soi naru_data_list = [] tur_data_list = [] subd_data_list = [] + soil_data_list = [] other_data_list = [] for row in app_sub_raw_data_list: @@ -73,6 +74,12 @@ def prepare_app_sub_data(app_sub_raw_data_list, direction_data, subdiv_data, soi tur_data_list.append(data) elif data["alr_change_code"] == ALRChangeCode.SDV.value: subd_data_list.append(data) + elif ( + data["alr_change_code"] == ALRChangeCode.SCH.value + or data["alr_change_code"] == ALRChangeCode.EXT.value + or data["alr_change_code"] == ALRChangeCode.FILL.value + ): + soil_data_list.append(data) else: other_data_list.append(data) @@ -83,6 +90,7 @@ def prepare_app_sub_data(app_sub_raw_data_list, direction_data, subdiv_data, soi naru_data_list, tur_data_list, subd_data_list, + soil_data_list, ) diff --git a/bin/migrate-oats-data/applications/submissions/data_insert/insert_query.py b/bin/migrate-oats-data/applications/submissions/data_insert/insert_query.py index f23e381581..ca85571687 100644 --- a/bin/migrate-oats-data/applications/submissions/data_insert/insert_query.py +++ b/bin/migrate-oats-data/applications/submissions/data_insert/insert_query.py @@ -27,6 +27,7 @@ def insert_app_sub_records( naru_data_list, tur_data_list, subd_data_list, + soil_data_list, ) = prepare_app_sub_data(rows, direction_data, subdiv_data, soil_data) if len(nfu_data_list) > 0: @@ -69,6 +70,14 @@ def insert_app_sub_records( page_size=batch_size, ) + if len(soil_data_list) > 0: + execute_batch( + cursor, + get_insert_query_for_soil(), + soil_data_list, + page_size=batch_size, + ) + if len(other_data_list) > 0: execute_batch( cursor, @@ -233,6 +242,44 @@ def get_insert_query_for_tur(): return get_insert_query(unique_fields, unique_values) +def get_insert_query_for_soil(): + unique_fields = """, soil_type_removed, + soil_reduce_negative_impacts, + soil_to_remove_volume, + soil_to_remove_area, + soil_to_remove_maximum_depth, + soil_to_remove_average_depth, + soil_project_duration_amount, + soil_project_duration_unit, + soil_fill_type_to_place, + soil_alternative_measures, + soil_to_place_volume, + soil_to_place_area, + soil_to_place_maximum_depth, + soil_to_place_average_depth, + soil_is_follow_up, + soil_follow_up_ids + """ + unique_values = """, %(remove_type)s, + %(impact_reduction_desc)s, + %(total_remove)s, + %(remove_area)s, + %(max_remove_depth)s, + %(max_remove_depth)s, + %(duration)s, + %(remove_duration_unit)s, + %(fill_type)s, + %(alternative_measures_desc)s, + %(total_fill)s, + %(fill_area)s, + %(max_fill_depth)s, + %(max_fill_depth)s, + %(followup_noi_ind)s, + %(followup_noi_number)s + """ + return get_insert_query(unique_fields, unique_values) + + def get_insert_query_for_subd(): unique_fields = """, subd_suitability, diff --git a/bin/migrate-oats-data/applications/submissions/data_insert/submap/soil_elements.py b/bin/migrate-oats-data/applications/submissions/data_insert/submap/soil_elements.py index 94061c4159..825298f251 100644 --- a/bin/migrate-oats-data/applications/submissions/data_insert/submap/soil_elements.py +++ b/bin/migrate-oats-data/applications/submissions/data_insert/submap/soil_elements.py @@ -1,21 +1,25 @@ from enum import Enum + class SoilAction(Enum): - RMV = 'REMOVE' - ADD = 'ADD' - -alr_id = 'alr_appl_component_id' -area = 'project_area' -desc = 'material_desc' -origin_desc = 'material_origin_desc' -duration = 'project_duration' -volume = 'volume' -depth = 'depth' + RMV = "REMOVE" + ADD = "ADD" + + +alr_id = "alr_appl_component_id" +area = "project_area" +desc = "material_desc" +origin_desc = "material_origin_desc" +duration = "project_duration" +volume = "volume" +depth = "depth" +alt_measure = "alternative_measures_desc" + def get_soil_rows(rows, cursor): # fetches adjacent land use data, specifically direction, description and type code component_ids = [dict(item)["alr_appl_component_id"] for item in rows] - component_ids_string = ', '.join(str(item) for item in component_ids) + component_ids_string = ", ".join(str(item) for item in component_ids) soil_rows_query = f"""SELECT * from oats.oats_soil_change_elements osc WHERE osc.alr_appl_component_id in ({component_ids_string}) @@ -24,6 +28,7 @@ def get_soil_rows(rows, cursor): soil_rows = cursor.fetchall() return soil_rows + def create_soil_dict(soil_rows): # creates dict containing fill & remove data soil_dict = dict() @@ -31,76 +36,122 @@ def create_soil_dict(soil_rows): for row in soil_rows: app_component_id = row[alr_id] soil_dict.setdefault(app_component_id, {alr_id: row[alr_id]}) - - if (row['soil_change_code'] == SoilAction.RMV.value and 'RMV' not in soil_dict[app_component_id]) or \ - (row['soil_change_code'] == SoilAction.ADD.value and 'ADD' not in soil_dict[app_component_id]): - action_function = dict_rmv_insert if row['soil_change_code'] == SoilAction.RMV.value else dict_fill_insert + + if ( + row["soil_change_code"] == SoilAction.RMV.value + and "RMV" not in soil_dict[app_component_id] + ) or ( + row["soil_change_code"] == SoilAction.ADD.value + and "ADD" not in soil_dict[app_component_id] + ): + action_function = ( + dict_rmv_insert + if row["soil_change_code"] == SoilAction.RMV.value + else dict_fill_insert + ) action_function(soil_dict, app_component_id, row) - - elif row['soil_change_code'] not in [SoilAction.ADD.value, SoilAction.RMV.value]: - print('unknown soil action') + + elif row["soil_change_code"] not in [ + SoilAction.ADD.value, + SoilAction.RMV.value, + ]: + print("unknown soil action") else: - print('ignored element_id:', row['soil_change_element_id']) + print("ignored element_id:", row["soil_change_element_id"]) return soil_dict - + def map_soil_data(data, soil_data): - #map soil data into data - app_component_id = 'alr_appl_component_id' - data['fill_type'] = soil_data.get(data[app_component_id], {}).get('fill_type', None) - data['fill_origin'] = soil_data.get(data[app_component_id], {}).get('fill_origin', None) - data['total_fill'] = soil_data.get(data[app_component_id], {}).get('total_fill', None) - data['max_fill_depth'] = soil_data.get(data[app_component_id], {}).get('max_fill_depth', None) - data['fill_duration'] = soil_data.get(data[app_component_id], {}).get('fill_duration', None) - data['fill_area'] = soil_data.get(data[app_component_id], {}).get('fill_area', None) - data['import_fill'] = soil_data.get(data[app_component_id], {}).get('import_fill', None) - data['fill_duration_unit'] = 'months' - data['remove_duration_unit'] = 'months' - data['remove_type'] = soil_data.get(data[app_component_id], {}).get('remove_type', None) - data['remove_origin'] = soil_data.get(data[app_component_id], {}).get('remove_origin', None) - data['total_remove'] = soil_data.get(data[app_component_id], {}).get('total_remove', None) - data['max_remove_depth'] = soil_data.get(data[app_component_id], {}).get('max_remove_depth', None) - data['remove_duration'] = soil_data.get(data[app_component_id], {}).get('remove_duration', None) - data['remove_area'] = soil_data.get(data[app_component_id], {}).get('remove_area', None) + # map soil data into data + app_component_id = "alr_appl_component_id" + data["fill_type"] = soil_data.get(data[app_component_id], {}).get("fill_type", None) + data["fill_origin"] = soil_data.get(data[app_component_id], {}).get( + "fill_origin", None + ) + data["total_fill"] = soil_data.get(data[app_component_id], {}).get( + "total_fill", None + ) + data["max_fill_depth"] = soil_data.get(data[app_component_id], {}).get( + "max_fill_depth", None + ) + data["fill_duration"] = soil_data.get(data[app_component_id], {}).get( + "fill_duration", None + ) + data["fill_area"] = soil_data.get(data[app_component_id], {}).get("fill_area", None) + data["import_fill"] = soil_data.get(data[app_component_id], {}).get( + "import_fill", None + ) + data["fill_duration_unit"] = "months" + data["remove_duration_unit"] = "months" + data["remove_type"] = soil_data.get(data[app_component_id], {}).get( + "remove_type", None + ) + data["remove_origin"] = soil_data.get(data[app_component_id], {}).get( + "remove_origin", None + ) + data["total_remove"] = soil_data.get(data[app_component_id], {}).get( + "total_remove", None + ) + data["max_remove_depth"] = soil_data.get(data[app_component_id], {}).get( + "max_remove_depth", None + ) + data["remove_duration"] = soil_data.get(data[app_component_id], {}).get( + "remove_duration", None + ) + data["duration"] = soil_data.get(data[app_component_id], {}).get("duration", None) + data["remove_area"] = soil_data.get(data[app_component_id], {}).get( + "remove_area", None + ) + data["alternative_measures_desc"] = soil_data.get(data[app_component_id], {}).get( + "alternative_measures_desc", None + ) return data + def add_soil_field(data): - # populates columns to be inserted - data['fill_type'] = None - data['fill_origin'] = None - data['total_fill'] = None - data['max_fill_depth'] = None - data['fill_duration'] = None - data['fill_area'] = None - data['import_fill'] = None - data['remove_type'] = None - data['remove_origin'] = None - data['total_remove'] = None - data['max_remove_depth'] = None - data['remove_duration'] = None - data['remove_area'] = None - data['fill_duration_unit'] = None - data['remove_duration_unit'] = None + # populates columns to be inserted + data["fill_type"] = None + data["fill_origin"] = None + data["total_fill"] = None + data["max_fill_depth"] = None + data["fill_duration"] = None + data["fill_area"] = None + data["import_fill"] = None + data["remove_type"] = None + data["remove_origin"] = None + data["total_remove"] = None + data["max_remove_depth"] = None + data["remove_duration"] = None + data["duration"] = None + data["remove_area"] = None + data["fill_duration_unit"] = None + data["remove_duration_unit"] = None + data["alternative_measures_desc"] = None return data + def dict_fill_insert(soil_dict, app_component_id, row): - soil_dict[app_component_id]['fill_type'] = row[desc] - soil_dict[app_component_id]['fill_origin'] = row[origin_desc] - soil_dict[app_component_id]['total_fill'] = row[volume] - soil_dict[app_component_id]['max_fill_depth'] = row[depth] - soil_dict[app_component_id]['fill_duration'] = row[duration] - soil_dict[app_component_id]['fill_area'] = row[area] - soil_dict[app_component_id]['import_fill'] = True + soil_dict[app_component_id]["fill_type"] = row[desc] + soil_dict[app_component_id]["fill_origin"] = row[origin_desc] + soil_dict[app_component_id]["total_fill"] = row[volume] + soil_dict[app_component_id]["max_fill_depth"] = row[depth] + soil_dict[app_component_id]["fill_duration"] = row[duration] + soil_dict[app_component_id]["duration"] = row[duration] + soil_dict[app_component_id]["fill_area"] = row[area] + soil_dict[app_component_id]["import_fill"] = True + soil_dict[app_component_id]["alternative_measures_desc"] = row[alt_measure] soil_dict[app_component_id][SoilAction.ADD.name] = True return + def dict_rmv_insert(soil_dict, app_component_id, row): - soil_dict[app_component_id]['remove_type'] = row[desc] - soil_dict[app_component_id]['remove_origin'] = row[origin_desc] - soil_dict[app_component_id]['max_remove_depth'] = row[depth] - soil_dict[app_component_id]['total_remove'] = row[volume] - soil_dict[app_component_id]['remove_duration'] = row[duration] - soil_dict[app_component_id]['remove_area'] = row[area] + soil_dict[app_component_id]["remove_type"] = row[desc] + soil_dict[app_component_id]["remove_origin"] = row[origin_desc] + soil_dict[app_component_id]["max_remove_depth"] = row[depth] + soil_dict[app_component_id]["total_remove"] = row[volume] + soil_dict[app_component_id]["remove_duration"] = row[duration] + soil_dict[app_component_id]["duration"] = row[duration] + soil_dict[app_component_id]["remove_area"] = row[area] soil_dict[app_component_id][SoilAction.RMV.name] = True - return \ No newline at end of file + return diff --git a/bin/migrate-oats-data/applications/submissions/sql/app_submission.sql b/bin/migrate-oats-data/applications/submissions/sql/app_submission.sql index 4ad971bc94..35c73c224f 100644 --- a/bin/migrate-oats-data/applications/submissions/sql/app_submission.sql +++ b/bin/migrate-oats-data/applications/submissions/sql/app_submission.sql @@ -38,7 +38,9 @@ SELECT oc.homesite_severance_ind, oa.current_land_use_desc, oa.non_agricultural_uses_desc, - oa.agricultural_improvement_desc + oa.agricultural_improvement_desc, + oa.followup_noi_ind, + oa.followup_noi_number FROM appl_components_grouped acg From bd877842d62d7cf912ca4e52e9eea11af757d017 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Tue, 19 Sep 2023 10:58:23 -0700 Subject: [PATCH 515/954] Add Permissions Checks to Document Portal Endpoints * Add logic to check that the current user has correct permissions in accordance with the documents visibility flags to access the documents * Add logic so only people who have edit rights on a submission can delete its documents --- .../notification-document.service.spec.ts | 18 -- .../notification-document.service.ts | 12 -- .../application-decision-v2.service.spec.ts | 11 ++ .../application-decision-v2.service.ts | 22 +++ .../application-submission.service.ts | 7 +- ...tice-of-intent-decision-v2.service.spec.ts | 12 ++ .../notice-of-intent-decision-v2.service.ts | 23 +++ .../application-document.controller.spec.ts | 3 + .../application-document.controller.ts | 52 +++-- .../application-submission.service.spec.ts | 178 +++++++++++++++++- .../application-submission.service.ts | 62 ++++++ ...tice-of-intent-document.controller.spec.ts | 32 ++-- .../notice-of-intent-document.controller.ts | 64 +++++-- ...otice-of-intent-submission.service.spec.ts | 171 ++++++++++++++++- .../notice-of-intent-submission.service.ts | 63 +++++++ .../notification-document.controller.spec.ts | 3 + .../notification-document.controller.ts | 61 ++++-- .../notification-submission.entity.ts | 2 - .../notification-submission.service.spec.ts | 166 +++++++++++++++- .../notification-submission.service.ts | 60 ++++++ .../application-decision.controller.spec.ts | 4 +- .../application-decision.controller.ts | 4 +- ...tice-of-intent-decision.controller.spec.ts | 4 +- .../notice-of-intent-decision.controller.ts | 2 +- 24 files changed, 901 insertions(+), 135 deletions(-) diff --git a/portal-frontend/src/app/services/notification-document/notification-document.service.spec.ts b/portal-frontend/src/app/services/notification-document/notification-document.service.spec.ts index b5d044ac77..6f57fdca49 100644 --- a/portal-frontend/src/app/services/notification-document/notification-document.service.spec.ts +++ b/portal-frontend/src/app/services/notification-document/notification-document.service.spec.ts @@ -88,22 +88,4 @@ describe('NotificationDocumentService', () => { expect(mockHttpClient.patch).toHaveBeenCalledTimes(1); expect(mockToastService.showErrorToast).toHaveBeenCalledTimes(1); }); - - it('should make a post request for deleting multiple files', async () => { - mockHttpClient.post.mockReturnValue(of({})); - - await service.deleteExternalFiles(['fileId']); - - expect(mockHttpClient.post).toHaveBeenCalledTimes(1); - expect(mockHttpClient.post.mock.calls[0][0]).toContain('notification-document'); - }); - - it('should show an error toast if deleting a file fails', async () => { - mockHttpClient.post.mockReturnValue(throwError(() => ({}))); - - await service.deleteExternalFiles(['fileId']); - - expect(mockHttpClient.post).toHaveBeenCalledTimes(1); - expect(mockToastService.showErrorToast).toHaveBeenCalledTimes(1); - }); }); diff --git a/portal-frontend/src/app/services/notification-document/notification-document.service.ts b/portal-frontend/src/app/services/notification-document/notification-document.service.ts index 4adc0d9c9b..8a537b6782 100644 --- a/portal-frontend/src/app/services/notification-document/notification-document.service.ts +++ b/portal-frontend/src/app/services/notification-document/notification-document.service.ts @@ -80,18 +80,6 @@ export class NotificationDocumentService { } } - async deleteExternalFiles(fileUuids: string[]) { - try { - this.overlayService.showSpinner(); - await firstValueFrom(this.httpClient.post(`${this.serviceUrl}/delete-files`, fileUuids)); - } catch (e) { - console.error(e); - this.toastService.showErrorToast('Failed to delete documents'); - } finally { - this.overlayService.hideSpinner(); - } - } - async update(fileNumber: string | undefined, updateDtos: NotificationDocumentUpdateDto[]) { try { await firstValueFrom(this.httpClient.patch<void>(`${this.serviceUrl}/notification/${fileNumber}`, updateDtos)); diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service.spec.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service.spec.ts index 9f17506abc..fa96f49015 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service.spec.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service.spec.ts @@ -600,6 +600,17 @@ describe('ApplicationDecisionV2Service', () => { ); }); + it('should call the repository to check if portal user can download document', async () => { + mockDecisionDocumentRepository.findOne.mockResolvedValue( + new ApplicationDecisionDocument(), + ); + mockDocumentService.getDownloadUrl.mockResolvedValue(''); + + await service.getDownloadForPortal('fake-uuid'); + expect(mockDecisionDocumentRepository.findOne).toHaveBeenCalledTimes(1); + expect(mockDocumentService.getDownloadUrl).toHaveBeenCalledTimes(1); + }); + it('should throw an exception when document not found for deletion', async () => { mockDecisionDocumentRepository.findOne.mockResolvedValue(null); await expect(service.deleteDocument('fake-uuid')).rejects.toMatchObject( diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service.ts index 57935dc15d..fbb15ca902 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service.ts @@ -490,6 +490,28 @@ export class ApplicationDecisionV2Service { ); } + async getDownloadForPortal(decisionDocumentUuid: string) { + const decisionDocument = await this.decisionDocumentRepository.findOne({ + where: { + decision: { + isDraft: false, + }, + uuid: decisionDocumentUuid, + }, + relations: { + document: true, + }, + }); + + if (decisionDocument) { + return this.documentService.getDownloadUrl( + decisionDocument.document, + false, + ); + } + throw new ServiceNotFoundException('Failed to find document'); + } + getOutcomeByCode(code: string) { return this.decisionOutcomeRepository.findOneOrFail({ where: { diff --git a/services/apps/alcs/src/alcs/application/application-submission/application-submission.service.ts b/services/apps/alcs/src/alcs/application/application-submission/application-submission.service.ts index 2f4ad15fd0..57bc046b8e 100644 --- a/services/apps/alcs/src/alcs/application/application-submission/application-submission.service.ts +++ b/services/apps/alcs/src/alcs/application/application-submission/application-submission.service.ts @@ -3,14 +3,13 @@ import { InjectMapper } from '@automapper/nestjs'; import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { ApplicationSubmissionStatusService } from '../application-submission-status/application-submission-status.service'; -import { ApplicationSubmissionStatusType } from '../application-submission-status/submission-status-type.entity'; -import { SUBMISSION_STATUS } from '../application-submission-status/submission-status.dto'; import { ApplicationOwnerDto } from '../../../portal/application-submission/application-owner/application-owner.dto'; import { ApplicationOwner } from '../../../portal/application-submission/application-owner/application-owner.entity'; -import { ApplicationSubmissionUpdateDto } from '../../../portal/application-submission/application-submission.dto'; import { ApplicationSubmission } from '../../../portal/application-submission/application-submission.entity'; import { filterUndefined } from '../../../utils/undefined'; +import { ApplicationSubmissionStatusService } from '../application-submission-status/application-submission-status.service'; +import { ApplicationSubmissionStatusType } from '../application-submission-status/submission-status-type.entity'; +import { SUBMISSION_STATUS } from '../application-submission-status/submission-status.dto'; import { AlcsApplicationSubmissionDto } from '../application.dto'; import { AlcsApplicationSubmissionUpdateDto } from './application-submission.dto'; diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.service.spec.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.service.spec.ts index 41497f3afe..44c6288c80 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.service.spec.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.service.spec.ts @@ -9,6 +9,7 @@ import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { DocumentService } from '../../../document/document.service'; +import { ApplicationDecisionDocument } from '../../application-decision/application-decision-document/application-decision-document.entity'; import { NOI_SUBMISSION_STATUS } from '../../notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status.dto'; import { NoticeOfIntentSubmissionStatusService } from '../../notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service'; import { NoticeOfIntent } from '../../notice-of-intent/notice-of-intent.entity'; @@ -461,6 +462,17 @@ describe('NoticeOfIntentDecisionV2Service', () => { expect(mockDocumentService.create).toHaveBeenCalledTimes(1); }); + it('should call the repository to check if portal user can download document', async () => { + mockDecisionDocumentRepository.findOne.mockResolvedValue( + new NoticeOfIntentDecisionDocument(), + ); + mockDocumentService.getDownloadUrl.mockResolvedValue(''); + + await service.getDownloadForPortal('fake-uuid'); + expect(mockDecisionDocumentRepository.findOne).toHaveBeenCalledTimes(1); + expect(mockDocumentService.getDownloadUrl).toHaveBeenCalledTimes(1); + }); + it('should throw an exception when attaching a document to a non-existent decision', async () => { mockDecisionRepository.findOne.mockResolvedValue(null); await expect( diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.service.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.service.ts index 29aed9adad..6942007351 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.service.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.service.ts @@ -410,6 +410,29 @@ export class NoticeOfIntentDecisionV2Service { ); } + async getDownloadForPortal(decisionDocumentUuid: string) { + const decisionDocument = await this.decisionDocumentRepository.findOne({ + where: { + decision: { + isDraft: false, + }, + uuid: decisionDocumentUuid, + }, + relations: { + document: true, + }, + }); + + if (decisionDocument) { + return this.documentService.getDownloadUrl( + decisionDocument.document, + true, + ); + } + + throw new ServiceNotFoundException('Failed to find document'); + } + getOutcomeByCode(code: string) { return this.decisionOutcomeRepository.findOneOrFail({ where: { diff --git a/services/apps/alcs/src/portal/application-document/application-document.controller.spec.ts b/services/apps/alcs/src/portal/application-document/application-document.controller.spec.ts index b4f168d871..8d02d71735 100644 --- a/services/apps/alcs/src/portal/application-document/application-document.controller.spec.ts +++ b/services/apps/alcs/src/portal/application-document/application-document.controller.spec.ts @@ -94,6 +94,7 @@ describe('ApplicationDocumentController', () => { it('should call through to delete documents', async () => { appDocumentService.delete.mockResolvedValue(mockDocument); appDocumentService.get.mockResolvedValue(mockDocument); + mockApplicationSubmissionService.canDeleteDocument.mockResolvedValue(true); await controller.delete('fake-uuid', { user: { @@ -127,6 +128,7 @@ describe('ApplicationDocumentController', () => { const fakeUrl = 'fake-url'; appDocumentService.getInlineUrl.mockResolvedValue(fakeUrl); appDocumentService.get.mockResolvedValue(mockDocument); + mockApplicationSubmissionService.canAccessDocument.mockResolvedValue(true); const res = await controller.open('fake-uuid', { user: { @@ -141,6 +143,7 @@ describe('ApplicationDocumentController', () => { const fakeUrl = 'fake-url'; appDocumentService.getDownloadUrl.mockResolvedValue(fakeUrl); appDocumentService.get.mockResolvedValue(mockDocument); + mockApplicationSubmissionService.canAccessDocument.mockResolvedValue(true); const res = await controller.download('fake-uuid', { user: { diff --git a/services/apps/alcs/src/portal/application-document/application-document.controller.ts b/services/apps/alcs/src/portal/application-document/application-document.controller.ts index f68b2d9088..0536150823 100644 --- a/services/apps/alcs/src/portal/application-document/application-document.controller.ts +++ b/services/apps/alcs/src/portal/application-document/application-document.controller.ts @@ -4,7 +4,9 @@ import { Body, Controller, Delete, + ForbiddenException, Get, + NotFoundException, Param, Patch, Post, @@ -27,6 +29,7 @@ import { } from '../../document/document-code.entity'; import { DOCUMENT_SYSTEM } from '../../document/document.dto'; import { DocumentService } from '../../document/document.service'; +import { User } from '../../user/user.entity'; import { ApplicationSubmissionService } from '../application-submission/application-submission.service'; import { AttachExternalDocumentDto, @@ -65,29 +68,35 @@ export class ApplicationDocumentController { @Get('/:uuid/open') async open(@Param('uuid') fileUuid: string, @Req() req) { const document = await this.applicationDocumentService.get(fileUuid); + const user = req.user.entity as User; - //TODO: How do we know which documents applicant can access? - // await this.applicationSubmissionService.verifyAccess( - // document.applicationUuid, - // req.user.entity, - // ); + const canAccessDocument = + await this.applicationSubmissionService.canAccessDocument(document, user); - const url = await this.applicationDocumentService.getInlineUrl(document); - return { url }; + if (canAccessDocument) { + const url = await this.applicationDocumentService.getInlineUrl(document); + return { url }; + } + + throw new NotFoundException('Failed to find document'); } @Get('/:uuid/download') async download(@Param('uuid') fileUuid: string, @Req() req) { const document = await this.applicationDocumentService.get(fileUuid); + const user = req.user.entity as User; - //TODO: How do we know which documents applicant can access? - // await this.applicationSubmissionService.verifyAccess( - // document.applicationUuid, - // req.user.entity, - // ); + const canAccessDocument = + await this.applicationSubmissionService.canAccessDocument(document, user); - const url = await this.applicationDocumentService.getDownloadUrl(document); - return { url }; + if (canAccessDocument) { + const url = await this.applicationDocumentService.getDownloadUrl( + document, + ); + return { url }; + } + + throw new NotFoundException('Failed to find document'); } @Patch('/application/:fileNumber') @@ -114,14 +123,17 @@ export class ApplicationDocumentController { @Delete('/:uuid') async delete(@Param('uuid') fileUuid: string, @Req() req) { const document = await this.applicationDocumentService.get(fileUuid); + const user = req.user.entity as User; + + const canDeleteDocument = + await this.applicationSubmissionService.canDeleteDocument(document, user); - //TODO: How do we know which documents applicant can delete? - // await this.applicationSubmissionService.verifyAccess( - // document.applicationUuid, - // req.user.entity, - // ); + if (canDeleteDocument) { + await this.applicationDocumentService.delete(document); + } else { + throw new ForbiddenException('Not allowed to delete document'); + } - await this.applicationDocumentService.delete(document); return {}; } diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.service.spec.ts b/services/apps/alcs/src/portal/application-submission/application-submission.service.spec.ts index 5871d6e127..d1ca0a043c 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.service.spec.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.service.spec.ts @@ -7,19 +7,23 @@ import { AutomapperModule } from '@automapper/nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; -import { Repository } from 'typeorm'; -import { LocalGovernment } from '../../alcs/local-government/local-government.entity'; -import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; -import { DOCUMENT_TYPE } from '../../document/document-code.entity'; +import { Repository, SelectQueryBuilder } from 'typeorm'; +import { + ApplicationDocument, + VISIBILITY_FLAG, +} from '../../alcs/application/application-document/application-document.entity'; import { ApplicationDocumentService } from '../../alcs/application/application-document/application-document.service'; -import { Application } from '../../alcs/application/application.entity'; -import { ApplicationService } from '../../alcs/application/application.service'; -import { ApplicationType } from '../../alcs/code/application-code/application-type/application-type.entity'; import { ApplicationSubmissionStatusService } from '../../alcs/application/application-submission-status/application-submission-status.service'; import { ApplicationSubmissionStatusType } from '../../alcs/application/application-submission-status/submission-status-type.entity'; import { SUBMISSION_STATUS } from '../../alcs/application/application-submission-status/submission-status.dto'; import { ApplicationSubmissionToSubmissionStatus } from '../../alcs/application/application-submission-status/submission-status.entity'; +import { Application } from '../../alcs/application/application.entity'; +import { ApplicationService } from '../../alcs/application/application.service'; +import { ApplicationType } from '../../alcs/code/application-code/application-type/application-type.entity'; +import { LocalGovernment } from '../../alcs/local-government/local-government.entity'; +import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; import { ApplicationSubmissionProfile } from '../../common/automapper/application-submission.automapper.profile'; +import { DOCUMENT_TYPE } from '../../document/document-code.entity'; import { FileNumberService } from '../../file-number/file-number.service'; import { User } from '../../user/user.entity'; import { GenerateReviewDocumentService } from '../pdf-generation/generate-review-document.service'; @@ -43,6 +47,7 @@ describe('ApplicationSubmissionService', () => { let mockGenerateReviewDocumentService: DeepMocked<GenerateReviewDocumentService>; let mockApplicationSubmissionStatusService: DeepMocked<ApplicationSubmissionStatusService>; let mockFileNumberService: DeepMocked<FileNumberService>; + let mockQueryBuilder; beforeEach(async () => { mockRepository = createMock(); @@ -118,6 +123,19 @@ describe('ApplicationSubmissionService', () => { service = module.get<ApplicationSubmissionService>( ApplicationSubmissionService, ); + + mockQueryBuilder = createMock<SelectQueryBuilder<ApplicationSubmission>>(); + mockQueryBuilder.leftJoin.mockReturnValue(mockQueryBuilder); + mockQueryBuilder.select.mockReturnValue(mockQueryBuilder); + mockQueryBuilder.where.mockReturnValue(mockQueryBuilder); + mockQueryBuilder.execute.mockResolvedValue([ + { + user_uuid: 'user_uuid', + bceid_business_guid: 'bceid_business_guid', + localGovernment_bceid_business_guid: + 'localGovernment_bceid_business_guid', + }, + ]); }); it('should be defined', () => { @@ -562,4 +580,150 @@ describe('ApplicationSubmissionService', () => { expect(mockNaruSubtypeRepository.find).toHaveBeenCalledTimes(1); }); + + it('should return true for access document if its public', async () => { + const noiSubmission = new ApplicationSubmission(); + mockRepository.findOneOrFail.mockResolvedValue(noiSubmission); + + const res = await service.canAccessDocument( + new ApplicationDocument({ + visibilityFlags: [VISIBILITY_FLAG.PUBLIC], + }), + new User(), + ); + + expect(res).toBe(true); + }); + + it('should return true for access document if its applicant and requesting user owns it', async () => { + mockRepository.createQueryBuilder.mockReturnValue(mockQueryBuilder); + const noiSubmission = new ApplicationSubmission(); + mockRepository.findOneOrFail.mockResolvedValue(noiSubmission); + + const res = await service.canAccessDocument( + new ApplicationDocument({ + visibilityFlags: [VISIBILITY_FLAG.APPLICANT], + }), + new User({ + uuid: 'user_uuid', + }), + ); + + expect(res).toBe(true); + }); + + it('should return false for access document if its applicant and requesting user does not own it', async () => { + mockRepository.createQueryBuilder.mockReturnValue(mockQueryBuilder); + const noiSubmission = new ApplicationSubmission(); + mockRepository.findOneOrFail.mockResolvedValue(noiSubmission); + + const res = await service.canAccessDocument( + new ApplicationDocument({ + visibilityFlags: [VISIBILITY_FLAG.APPLICANT], + }), + new User({ + uuid: 'NOT_user_uuid', + }), + ); + + expect(res).toBe(false); + }); + + it('should return true for access document if its government and requesting user is in that government', async () => { + mockRepository.createQueryBuilder.mockReturnValue(mockQueryBuilder); + const noiSubmission = new ApplicationSubmission(); + mockRepository.findOneOrFail.mockResolvedValue(noiSubmission); + + const res = await service.canAccessDocument( + new ApplicationDocument({ + visibilityFlags: [VISIBILITY_FLAG.GOVERNMENT], + }), + new User({ + bceidBusinessGuid: 'localGovernment_bceid_business_guid', + }), + ); + + expect(res).toBe(true); + }); + + it('should return false for access document if its government and requesting user is NOT in that government', async () => { + mockRepository.createQueryBuilder.mockReturnValue(mockQueryBuilder); + const noiSubmission = new ApplicationSubmission(); + mockRepository.findOneOrFail.mockResolvedValue(noiSubmission); + + const res = await service.canAccessDocument( + new ApplicationDocument({ + visibilityFlags: [VISIBILITY_FLAG.GOVERNMENT], + }), + new User({ + bceidBusinessGuid: 'NOT_localGovernment_bceid_business_guid', + }), + ); + + expect(res).toBe(false); + }); + + it('should return true for access document if its applicant and requesting user is in same business', async () => { + mockRepository.createQueryBuilder.mockReturnValue(mockQueryBuilder); + const noiSubmission = new ApplicationSubmission(); + mockRepository.findOneOrFail.mockResolvedValue(noiSubmission); + + const res = await service.canAccessDocument( + new ApplicationDocument({ + visibilityFlags: [VISIBILITY_FLAG.APPLICANT], + }), + new User({ + bceidBusinessGuid: 'bceid_business_guid', + }), + ); + + expect(res).toBe(true); + }); + + it('should return false for access document if its applicant and requesting user is NOT in same business account', async () => { + mockRepository.createQueryBuilder.mockReturnValue(mockQueryBuilder); + const noiSubmission = new ApplicationSubmission(); + mockRepository.findOneOrFail.mockResolvedValue(noiSubmission); + + const res = await service.canAccessDocument( + new ApplicationDocument({ + visibilityFlags: [VISIBILITY_FLAG.APPLICANT], + }), + new User({ + bceidBusinessGuid: 'NOT_bceid_business_guid', + }), + ); + + expect(res).toBe(false); + }); + + it('should return true for delete document if user is owner', async () => { + mockRepository.createQueryBuilder.mockReturnValue(mockQueryBuilder); + const noiSubmission = new ApplicationSubmission(); + mockRepository.findOneOrFail.mockResolvedValue(noiSubmission); + + const res = await service.canDeleteDocument( + new ApplicationDocument({}), + new User({ + uuid: 'user_uuid', + }), + ); + + expect(res).toBe(true); + }); + + it('should return false for delete document if user is NOT owner', async () => { + mockRepository.createQueryBuilder.mockReturnValue(mockQueryBuilder); + const noiSubmission = new ApplicationSubmission(); + mockRepository.findOneOrFail.mockResolvedValue(noiSubmission); + + const res = await service.canDeleteDocument( + new ApplicationDocument({}), + new User({ + uuid: 'NOT_user_uuid', + }), + ); + + expect(res).toBe(false); + }); }); diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.service.ts b/services/apps/alcs/src/portal/application-submission/application-submission.service.ts index 216affaf5d..4207d5061d 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.service.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.service.ts @@ -7,6 +7,7 @@ import { InjectMapper } from '@automapper/nestjs'; import { forwardRef, Inject, Injectable, Logger } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { FindOptionsRelations, Repository } from 'typeorm'; +import { ApplicationDocument } from '../../alcs/application/application-document/application-document.entity'; import { ApplicationDocumentService } from '../../alcs/application/application-document/application-document.service'; import { ApplicationSubmissionStatusService } from '../../alcs/application/application-submission-status/application-submission-status.service'; import { ApplicationSubmissionStatusType } from '../../alcs/application/application-submission-status/submission-status-type.entity'; @@ -16,6 +17,7 @@ import { Application } from '../../alcs/application/application.entity'; import { ApplicationService } from '../../alcs/application/application.service'; import { LocalGovernment } from '../../alcs/local-government/local-government.entity'; import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; +import { VISIBILITY_FLAG } from '../../alcs/notification/notification-document/notification-document.entity'; import { ROLES_ALLOWED_APPLICATIONS } from '../../common/authorization/roles'; import { DOCUMENT_TYPE } from '../../document/document-code.entity'; import { FileNumberService } from '../../file-number/file-number.service'; @@ -1040,4 +1042,64 @@ export class ApplicationSubmissionService { }); return submission?.fileNumber; } + + async canDeleteDocument(document: ApplicationDocument, user: User) { + const documentFlags = await this.getDocumentFlags(document); + + const isOwner = user.uuid === documentFlags.ownerUuid; + const isGovernmentOnFile = + user.bceidBusinessGuid === documentFlags.localGovernmentGuid; + const isSameAccountAsOwner = + !!user.bceidBusinessGuid && + user.bceidBusinessGuid === documentFlags.ownerGuid; + + return isOwner || isGovernmentOnFile || isSameAccountAsOwner; + } + + async canAccessDocument(document: ApplicationDocument, user: User) { + //If document has P, skip all checks. + if (document.visibilityFlags.includes(VISIBILITY_FLAG.PUBLIC)) { + return true; + } + + const documentFlags = await this.getDocumentFlags(document); + + const applicantFlag = + document.visibilityFlags.includes(VISIBILITY_FLAG.APPLICANT) && + user.uuid === documentFlags.ownerUuid; + const governmentFlag = + !!user.bceidBusinessGuid && + document.visibilityFlags.includes(VISIBILITY_FLAG.GOVERNMENT) && + user.bceidBusinessGuid === documentFlags.localGovernmentGuid; + const sharedAccountFlag = + !!user.bceidBusinessGuid && + document.visibilityFlags.includes(VISIBILITY_FLAG.APPLICANT) && + user.bceidBusinessGuid === documentFlags.ownerGuid; + + return applicantFlag || governmentFlag || sharedAccountFlag; + } + + private async getDocumentFlags(document: ApplicationDocument) { + const result = await this.applicationSubmissionRepository + .createQueryBuilder('submission') + .leftJoin('submission.application', 'application') + .leftJoin('application.documents', 'document') + .leftJoin('submission.createdBy', 'user') + .leftJoin('application.localGovernment', 'localGovernment') + .select([ + 'user.uuid', + 'user.bceid_business_guid', + 'localGovernment.bceidBusinessGuid', + ]) + .where('document.uuid = :uuid', { + uuid: document.uuid, + }) + .execute(); + + return { + ownerUuid: result[0]?.user_uuid, + ownerGuid: result[0]?.bceid_business_guid, + localGovernmentGuid: result[0]?.localGovernment_bceid_business_guid, + }; + } } diff --git a/services/apps/alcs/src/portal/notice-of-intent-document/notice-of-intent-document.controller.spec.ts b/services/apps/alcs/src/portal/notice-of-intent-document/notice-of-intent-document.controller.spec.ts index ac02e8eac5..bbf7125067 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-document/notice-of-intent-document.controller.spec.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-document/notice-of-intent-document.controller.spec.ts @@ -29,6 +29,8 @@ describe('NoticeOfIntentDocumentController', () => { let mockDocumentService: DeepMocked<DocumentService>; let mockNoticeOfIntentService: DeepMocked<NoticeOfIntentService>; + const mockRequest = { user: { entity: 'Bruce' } }; + const mockDocument = new NoticeOfIntentDocument({ document: new Document({ fileName: 'fileName', @@ -92,12 +94,9 @@ describe('NoticeOfIntentDocumentController', () => { it('should call through to delete document', async () => { noiDocumentService.delete.mockResolvedValue(mockDocument); noiDocumentService.get.mockResolvedValue(mockDocument); + mockNoiSubmissionService.canDeleteDocument.mockResolvedValue(true); - await controller.delete('fake-uuid', { - user: { - entity: {}, - }, - }); + await controller.delete('fake-uuid', mockRequest); expect(noiDocumentService.get).toHaveBeenCalledTimes(1); expect(noiDocumentService.delete).toHaveBeenCalledTimes(1); @@ -106,31 +105,20 @@ describe('NoticeOfIntentDocumentController', () => { it('should call through to update documents', async () => { noiDocumentService.updateDescriptionAndType.mockResolvedValue([]); - await controller.update( - 'file-number', - { - user: { - entity: {}, - }, - }, - [], - ); + await controller.update('file-number', mockRequest, []); expect(noiDocumentService.updateDescriptionAndType).toHaveBeenCalledTimes( 1, ); }); - it('should call through for download', async () => { + it('should call through for open', async () => { const fakeUrl = 'fake-url'; noiDocumentService.getInlineUrl.mockResolvedValue(fakeUrl); noiDocumentService.get.mockResolvedValue(mockDocument); + mockNoiSubmissionService.canAccessDocument.mockResolvedValue(true); - const res = await controller.open('fake-uuid', { - user: { - entity: {}, - }, - }); + const res = await controller.open('fake-uuid', mockRequest); expect(res.url).toEqual(fakeUrl); }); @@ -243,8 +231,10 @@ describe('NoticeOfIntentDocumentController', () => { it('should call through to delete multiple documents', async () => { noiDocumentService.deleteMany.mockResolvedValue(); + noiDocumentService.get.mockResolvedValue(new NoticeOfIntentDocument()); + mockNoiSubmissionService.canDeleteDocument.mockResolvedValue(true); - await controller.deleteMany(['fake-uuid']); + await controller.deleteMany(['fake-uuid'], mockRequest); expect(noiDocumentService.deleteMany).toHaveBeenCalledTimes(1); }); diff --git a/services/apps/alcs/src/portal/notice-of-intent-document/notice-of-intent-document.controller.ts b/services/apps/alcs/src/portal/notice-of-intent-document/notice-of-intent-document.controller.ts index bd17843c82..24d35afc8c 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-document/notice-of-intent-document.controller.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-document/notice-of-intent-document.controller.ts @@ -4,7 +4,9 @@ import { Body, Controller, Delete, + ForbiddenException, Get, + NotFoundException, Param, Patch, Post, @@ -26,6 +28,7 @@ import { } from '../../document/document-code.entity'; import { DOCUMENT_SYSTEM } from '../../document/document.dto'; import { DocumentService } from '../../document/document.service'; +import { User } from '../../user/user.entity'; import { NoticeOfIntentSubmissionService } from '../notice-of-intent-submission/notice-of-intent-submission.service'; import { AttachExternalDocumentDto, @@ -66,14 +69,22 @@ export class NoticeOfIntentDocumentController { async open(@Param('uuid') fileUuid: string, @Req() req) { const document = await this.noticeOfIntentDocumentService.get(fileUuid); - //TODO: How do we know which documents applicant can access? - // await this.applicationSubmissionService.verifyAccess( - // document.applicationUuid, - // req.user.entity, - // ); + const user = req.user.entity as User; - const url = await this.noticeOfIntentDocumentService.getInlineUrl(document); - return { url }; + const canAccessDocument = + await this.noticeOfIntentSubmissionService.canAccessDocument( + document, + user, + ); + + if (canAccessDocument) { + const url = await this.noticeOfIntentDocumentService.getInlineUrl( + document, + ); + return { url }; + } + + throw new NotFoundException('Failed to find document'); } @Patch('/notice-of-intent/:fileNumber') @@ -103,24 +114,39 @@ export class NoticeOfIntentDocumentController { @Delete('/:uuid') async delete(@Param('uuid') fileUuid: string, @Req() req) { const document = await this.noticeOfIntentDocumentService.get(fileUuid); + const user = req.user.entity as User; - //TODO: How do we know which documents applicant can delete? - // await this.applicationSubmissionService.verifyAccess( - // document.applicationUuid, - // req.user.entity, - // ); + const canDeleteDocument = + await this.noticeOfIntentSubmissionService.canDeleteDocument( + document, + user, + ); + + if (canDeleteDocument) { + await this.noticeOfIntentDocumentService.delete(document); + } else { + throw new ForbiddenException('Not allowed to delete document'); + } - await this.noticeOfIntentDocumentService.delete(document); return {}; } @Post('/delete-files') - async deleteMany(@Body() fileUuids: string[]) { - //TODO: How do we know which documents applicant can delete? - // await this.applicationSubmissionService.verifyAccess( - // document.applicationUuid, - // req.user.entity, - // ); + async deleteMany(@Body() fileUuids: string[], @Req() req) { + for (const fileUuid of fileUuids) { + const document = await this.noticeOfIntentDocumentService.get(fileUuid); + const user = req.user.entity as User; + + const canDeleteDocument = + await this.noticeOfIntentSubmissionService.canDeleteDocument( + document, + user, + ); + + if (!canDeleteDocument) { + throw new ForbiddenException('Not allowed to delete document'); + } + } await this.noticeOfIntentDocumentService.deleteMany(fileUuids); return {}; } diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts index c35472aa2c..ed59e3ae1e 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts @@ -4,12 +4,17 @@ import { AutomapperModule } from '@automapper/nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; -import { Repository } from 'typeorm'; -import { NoticeOfIntentType } from '../../alcs/notice-of-intent/notice-of-intent-type/notice-of-intent-type.entity'; +import { QueryBuilder, Repository, SelectQueryBuilder } from 'typeorm'; import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; +import { + NoticeOfIntentDocument, + VISIBILITY_FLAG, +} from '../../alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.entity'; import { NoticeOfIntentDocumentService } from '../../alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.service'; +import { NoticeOfIntentSubmissionStatusType } from '../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status-type.entity'; import { NoticeOfIntentSubmissionToSubmissionStatus } from '../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status.entity'; import { NoticeOfIntentSubmissionStatusService } from '../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service'; +import { NoticeOfIntentType } from '../../alcs/notice-of-intent/notice-of-intent-type/notice-of-intent-type.entity'; import { NoticeOfIntent } from '../../alcs/notice-of-intent/notice-of-intent.entity'; import { NoticeOfIntentService } from '../../alcs/notice-of-intent/notice-of-intent.service'; import { NoticeOfIntentSubmissionProfile } from '../../common/automapper/notice-of-intent-submission.automapper.profile'; @@ -21,7 +26,6 @@ import { PORTAL_TO_ALCS_STRUCTURE_MAP, } from './notice-of-intent-submission.entity'; import { NoticeOfIntentSubmissionService } from './notice-of-intent-submission.service'; -import { NoticeOfIntentSubmissionStatusType } from '../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status-type.entity'; describe('NoticeOfIntentSubmissionService', () => { let service: NoticeOfIntentSubmissionService; @@ -35,6 +39,7 @@ describe('NoticeOfIntentSubmissionService', () => { let mockFileNumberService: DeepMocked<FileNumberService>; let mockNoiStatusService: DeepMocked<NoticeOfIntentSubmissionStatusService>; let mockNoiSubmission; + let mockQueryBuilder; beforeEach(async () => { mockRepository = createMock(); @@ -99,6 +104,20 @@ describe('NoticeOfIntentSubmissionService', () => { clientRoles: [], }), }); + + mockQueryBuilder = + createMock<SelectQueryBuilder<NoticeOfIntentSubmission>>(); + mockQueryBuilder.leftJoin.mockReturnValue(mockQueryBuilder); + mockQueryBuilder.select.mockReturnValue(mockQueryBuilder); + mockQueryBuilder.where.mockReturnValue(mockQueryBuilder); + mockQueryBuilder.execute.mockResolvedValue([ + { + user_uuid: 'user_uuid', + bceid_business_guid: 'bceid_business_guid', + localGovernment_bceid_business_guid: + 'localGovernment_bceid_business_guid', + }, + ]); }); it('should be defined', () => { @@ -354,4 +373,150 @@ describe('NoticeOfIntentSubmissionService', () => { expect(app).toBe(noiSubmission); }); + + it('should return true for access document if its public', async () => { + const noiSubmission = new NoticeOfIntentSubmission(); + mockRepository.findOneOrFail.mockResolvedValue(noiSubmission); + + const res = await service.canAccessDocument( + new NoticeOfIntentDocument({ + visibilityFlags: [VISIBILITY_FLAG.PUBLIC], + }), + new User(), + ); + + expect(res).toBe(true); + }); + + it('should return true for access document if its applicant and requesting user owns it', async () => { + mockRepository.createQueryBuilder.mockReturnValue(mockQueryBuilder); + const noiSubmission = new NoticeOfIntentSubmission(); + mockRepository.findOneOrFail.mockResolvedValue(noiSubmission); + + const res = await service.canAccessDocument( + new NoticeOfIntentDocument({ + visibilityFlags: [VISIBILITY_FLAG.APPLICANT], + }), + new User({ + uuid: 'user_uuid', + }), + ); + + expect(res).toBe(true); + }); + + it('should return false for access document if its applicant and requesting user does not own it', async () => { + mockRepository.createQueryBuilder.mockReturnValue(mockQueryBuilder); + const noiSubmission = new NoticeOfIntentSubmission(); + mockRepository.findOneOrFail.mockResolvedValue(noiSubmission); + + const res = await service.canAccessDocument( + new NoticeOfIntentDocument({ + visibilityFlags: [VISIBILITY_FLAG.APPLICANT], + }), + new User({ + uuid: 'NOT_user_uuid', + }), + ); + + expect(res).toBe(false); + }); + + it('should return true for access document if its government and requesting user is in that government', async () => { + mockRepository.createQueryBuilder.mockReturnValue(mockQueryBuilder); + const noiSubmission = new NoticeOfIntentSubmission(); + mockRepository.findOneOrFail.mockResolvedValue(noiSubmission); + + const res = await service.canAccessDocument( + new NoticeOfIntentDocument({ + visibilityFlags: [VISIBILITY_FLAG.GOVERNMENT], + }), + new User({ + bceidBusinessGuid: 'localGovernment_bceid_business_guid', + }), + ); + + expect(res).toBe(true); + }); + + it('should return false for access document if its government and requesting user is NOT in that government', async () => { + mockRepository.createQueryBuilder.mockReturnValue(mockQueryBuilder); + const noiSubmission = new NoticeOfIntentSubmission(); + mockRepository.findOneOrFail.mockResolvedValue(noiSubmission); + + const res = await service.canAccessDocument( + new NoticeOfIntentDocument({ + visibilityFlags: [VISIBILITY_FLAG.GOVERNMENT], + }), + new User({ + bceidBusinessGuid: 'NOT_localGovernment_bceid_business_guid', + }), + ); + + expect(res).toBe(false); + }); + + it('should return true for access document if its applicant and requesting user is in same business', async () => { + mockRepository.createQueryBuilder.mockReturnValue(mockQueryBuilder); + const noiSubmission = new NoticeOfIntentSubmission(); + mockRepository.findOneOrFail.mockResolvedValue(noiSubmission); + + const res = await service.canAccessDocument( + new NoticeOfIntentDocument({ + visibilityFlags: [VISIBILITY_FLAG.APPLICANT], + }), + new User({ + bceidBusinessGuid: 'bceid_business_guid', + }), + ); + + expect(res).toBe(true); + }); + + it('should return false for access document if its applicant and requesting user is NOT in same business account', async () => { + mockRepository.createQueryBuilder.mockReturnValue(mockQueryBuilder); + const noiSubmission = new NoticeOfIntentSubmission(); + mockRepository.findOneOrFail.mockResolvedValue(noiSubmission); + + const res = await service.canAccessDocument( + new NoticeOfIntentDocument({ + visibilityFlags: [VISIBILITY_FLAG.APPLICANT], + }), + new User({ + bceidBusinessGuid: 'NOT_bceid_business_guid', + }), + ); + + expect(res).toBe(false); + }); + + it('should return true for delete document if user is owner', async () => { + mockRepository.createQueryBuilder.mockReturnValue(mockQueryBuilder); + const noiSubmission = new NoticeOfIntentSubmission(); + mockRepository.findOneOrFail.mockResolvedValue(noiSubmission); + + const res = await service.canDeleteDocument( + new NoticeOfIntentDocument({}), + new User({ + uuid: 'user_uuid', + }), + ); + + expect(res).toBe(true); + }); + + it('should return false for delete document if user is NOT owner', async () => { + mockRepository.createQueryBuilder.mockReturnValue(mockQueryBuilder); + const noiSubmission = new NoticeOfIntentSubmission(); + mockRepository.findOneOrFail.mockResolvedValue(noiSubmission); + + const res = await service.canDeleteDocument( + new NoticeOfIntentDocument({}), + new User({ + uuid: 'NOT_user_uuid', + }), + ); + + expect(res).toBe(false); + }); }); diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts index 9e695f0f46..02b40bf445 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts @@ -10,11 +10,14 @@ import { Not, Repository, } from 'typeorm'; +import { ApplicationDocument } from '../../alcs/application/application-document/application-document.entity'; import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; +import { NoticeOfIntentDocument } from '../../alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.entity'; import { NoticeOfIntentDocumentService } from '../../alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.service'; import { NOI_SUBMISSION_STATUS } from '../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status.dto'; import { NoticeOfIntentSubmissionStatusService } from '../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service'; import { NoticeOfIntentService } from '../../alcs/notice-of-intent/notice-of-intent.service'; +import { VISIBILITY_FLAG } from '../../alcs/notification/notification-document/notification-document.entity'; import { ROLES_ALLOWED_APPLICATIONS } from '../../common/authorization/roles'; import { DOCUMENT_TYPE } from '../../document/document-code.entity'; import { FileNumberService } from '../../file-number/file-number.service'; @@ -599,4 +602,64 @@ export class NoticeOfIntentSubmissionService { ); } } + + async canDeleteDocument(document: NoticeOfIntentDocument, user: User) { + const documentFlags = await this.getDocumentFlags(document); + + const isOwner = user.uuid === documentFlags.ownerUuid; + const isGovernmentOnFile = + user.bceidBusinessGuid === documentFlags.localGovernmentGuid; + const isSameAccountAsOwner = + !!user.bceidBusinessGuid && + user.bceidBusinessGuid === documentFlags.ownerGuid; + + return isOwner || isGovernmentOnFile || isSameAccountAsOwner; + } + + async canAccessDocument(document: NoticeOfIntentDocument, user: User) { + //If document has P, skip all checks. + if (document.visibilityFlags.includes(VISIBILITY_FLAG.PUBLIC)) { + return true; + } + + const documentFlags = await this.getDocumentFlags(document); + + const applicantFlag = + document.visibilityFlags.includes(VISIBILITY_FLAG.APPLICANT) && + user.uuid === documentFlags.ownerUuid; + const governmentFlag = + !!user.bceidBusinessGuid && + document.visibilityFlags.includes(VISIBILITY_FLAG.GOVERNMENT) && + user.bceidBusinessGuid === documentFlags.localGovernmentGuid; + const sharedAccountFlag = + !!user.bceidBusinessGuid && + document.visibilityFlags.includes(VISIBILITY_FLAG.APPLICANT) && + user.bceidBusinessGuid === documentFlags.ownerGuid; + + return applicantFlag || governmentFlag || sharedAccountFlag; + } + + private async getDocumentFlags(document: NoticeOfIntentDocument) { + const result = await this.noticeOfIntentSubmissionRepository + .createQueryBuilder('submission') + .leftJoin('submission.noticeOfIntent', 'noticeOfIntent') + .leftJoin('noticeOfIntent.documents', 'document') + .leftJoin('submission.createdBy', 'user') + .leftJoin('noticeOfIntent.localGovernment', 'localGovernment') + .select([ + 'user.uuid', + 'user.bceid_business_guid', + 'localGovernment.bceidBusinessGuid', + ]) + .where('document.uuid = :uuid', { + uuid: document.uuid, + }) + .execute(); + + return { + ownerUuid: result[0]?.user_uuid, + ownerGuid: result[0]?.bceid_business_guid, + localGovernmentGuid: result[0]?.localGovernment_bceid_business_guid, + }; + } } diff --git a/services/apps/alcs/src/portal/notification-document/notification-document.controller.spec.ts b/services/apps/alcs/src/portal/notification-document/notification-document.controller.spec.ts index 9879567d05..6db2f5afc4 100644 --- a/services/apps/alcs/src/portal/notification-document/notification-document.controller.spec.ts +++ b/services/apps/alcs/src/portal/notification-document/notification-document.controller.spec.ts @@ -93,6 +93,7 @@ describe('NotificationDocumentController', () => { it('should call through to delete documents', async () => { mockNotificationDocumentService.delete.mockResolvedValue(mockDocument); mockNotificationDocumentService.get.mockResolvedValue(mockDocument); + mockNotificationSubmissionService.canDeleteDocument.mockResolvedValue(true); await controller.delete('fake-uuid', { user: { @@ -128,6 +129,7 @@ describe('NotificationDocumentController', () => { const fakeUrl = 'fake-url'; mockNotificationDocumentService.getInlineUrl.mockResolvedValue(fakeUrl); mockNotificationDocumentService.get.mockResolvedValue(mockDocument); + mockNotificationSubmissionService.canAccessDocument.mockResolvedValue(true); const res = await controller.open('fake-uuid', { user: { @@ -142,6 +144,7 @@ describe('NotificationDocumentController', () => { const fakeUrl = 'fake-url'; mockNotificationDocumentService.getDownloadUrl.mockResolvedValue(fakeUrl); mockNotificationDocumentService.get.mockResolvedValue(mockDocument); + mockNotificationSubmissionService.canAccessDocument.mockResolvedValue(true); const res = await controller.download('fake-uuid', { user: { diff --git a/services/apps/alcs/src/portal/notification-document/notification-document.controller.ts b/services/apps/alcs/src/portal/notification-document/notification-document.controller.ts index b80d4ded50..27b3c8a1ab 100644 --- a/services/apps/alcs/src/portal/notification-document/notification-document.controller.ts +++ b/services/apps/alcs/src/portal/notification-document/notification-document.controller.ts @@ -4,7 +4,9 @@ import { Body, Controller, Delete, + ForbiddenException, Get, + NotFoundException, Param, Patch, Post, @@ -27,6 +29,7 @@ import { } from '../../document/document-code.entity'; import { DOCUMENT_SYSTEM } from '../../document/document.dto'; import { DocumentService } from '../../document/document.service'; +import { User } from '../../user/user.entity'; import { NotificationSubmissionService } from '../notification-submission/notification-submission.service'; import { AttachExternalDocumentDto, @@ -65,29 +68,41 @@ export class NotificationDocumentController { @Get('/:uuid/open') async open(@Param('uuid') fileUuid: string, @Req() req) { const document = await this.notificationDocumentService.get(fileUuid); + const user = req.user.entity as User; - //TODO: How do we know which documents applicant can access? - // await this.notificationSubmissionService.verifyAccess( - // document.applicationUuid, - // req.user.entity, - // ); + const canAccessDocument = + await this.notificationSubmissionService.canAccessDocument( + document, + user, + ); + + if (canAccessDocument) { + const url = await this.notificationDocumentService.getInlineUrl(document); + return { url }; + } - const url = await this.notificationDocumentService.getInlineUrl(document); - return { url }; + throw new NotFoundException('Failed to find document'); } @Get('/:uuid/download') async download(@Param('uuid') fileUuid: string, @Req() req) { const document = await this.notificationDocumentService.get(fileUuid); + const user = req.user.entity as User; + + const canAccessDocument = + await this.notificationSubmissionService.canAccessDocument( + document, + user, + ); - //TODO: How do we know which documents applicant can access? - // await this.notificationSubmissionService.verifyAccess( - // document.applicationUuid, - // req.user.entity, - // ); + if (canAccessDocument) { + const url = await this.notificationDocumentService.getDownloadUrl( + document, + ); + return { url }; + } - const url = await this.notificationDocumentService.getDownloadUrl(document); - return { url }; + throw new NotFoundException('Failed to find document'); } @Patch('/notification/:fileNumber') @@ -114,14 +129,20 @@ export class NotificationDocumentController { @Delete('/:uuid') async delete(@Param('uuid') fileUuid: string, @Req() req) { const document = await this.notificationDocumentService.get(fileUuid); + const user = req.user.entity as User; - //TODO: How do we know which documents applicant can delete? - // await this.notificationSubmissionService.verifyAccess( - // document.applicationUuid, - // req.user.entity, - // ); + const canDeleteDocument = + await this.notificationSubmissionService.canDeleteDocument( + document, + user, + ); + + if (canDeleteDocument) { + await this.notificationDocumentService.delete(document); + } else { + throw new ForbiddenException('Not allowed to delete document'); + } - await this.notificationDocumentService.delete(document); return {}; } diff --git a/services/apps/alcs/src/portal/notification-submission/notification-submission.entity.ts b/services/apps/alcs/src/portal/notification-submission/notification-submission.entity.ts index c5f7215656..b6c0744c04 100644 --- a/services/apps/alcs/src/portal/notification-submission/notification-submission.entity.ts +++ b/services/apps/alcs/src/portal/notification-submission/notification-submission.entity.ts @@ -8,14 +8,12 @@ import { OneToMany, PrimaryGeneratedColumn, } from 'typeorm'; -import { NoticeOfIntentSubmissionToSubmissionStatus } from '../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status.entity'; import { NotificationSubmissionToSubmissionStatus } from '../../alcs/notification/notification-submission-status/notification-status.entity'; import { Notification } from '../../alcs/notification/notification.entity'; import { Base } from '../../common/entities/base.entity'; import { User } from '../../user/user.entity'; import { ColumnNumericTransformer } from '../../utils/column-numeric-transform'; import { NotificationParcel } from './notification-parcel/notification-parcel.entity'; -import { NotificationTransfereeDto } from './notification-transferee/notification-transferee.dto'; import { NotificationTransferee } from './notification-transferee/notification-transferee.entity'; @Entity() diff --git a/services/apps/alcs/src/portal/notification-submission/notification-submission.service.spec.ts b/services/apps/alcs/src/portal/notification-submission/notification-submission.service.spec.ts index cbb18ca66b..b9d41aef52 100644 --- a/services/apps/alcs/src/portal/notification-submission/notification-submission.service.spec.ts +++ b/services/apps/alcs/src/portal/notification-submission/notification-submission.service.spec.ts @@ -4,7 +4,8 @@ import { AutomapperModule } from '@automapper/nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; -import { Repository } from 'typeorm'; +import { Repository, SelectQueryBuilder } from 'typeorm'; +import { VISIBILITY_FLAG } from '../../alcs/application/application-document/application-document.entity'; import { LocalGovernment } from '../../alcs/local-government/local-government.entity'; import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; import { NoticeOfIntentType } from '../../alcs/notice-of-intent/notice-of-intent-type/notice-of-intent-type.entity'; @@ -16,13 +17,14 @@ import { NotificationSubmissionStatusService } from '../../alcs/notification/not import { Notification } from '../../alcs/notification/notification.entity'; import { NotificationService } from '../../alcs/notification/notification.service'; import { NotificationSubmissionProfile } from '../../common/automapper/notification-submission.automapper.profile'; +import { Document } from '../../document/document.entity'; import { FileNumberService } from '../../file-number/file-number.service'; import { EmailService } from '../../providers/email/email.service'; import { User } from '../../user/user.entity'; +import { ApplicationSubmission } from '../application-submission/application-submission.entity'; import { ValidatedNotificationSubmission } from './notification-submission-validator.service'; import { NotificationSubmission } from './notification-submission.entity'; import { NotificationSubmissionService } from './notification-submission.service'; -import { Document } from '../../document/document.entity'; describe('NotificationSubmissionService', () => { let service: NotificationSubmissionService; @@ -34,6 +36,7 @@ describe('NotificationSubmissionService', () => { let mockDocumentService: DeepMocked<NotificationDocumentService>; let mockEmailService: DeepMocked<EmailService>; let mockSubmission; + let mockQueryBuilder; beforeEach(async () => { mockRepository = createMock(); @@ -97,6 +100,19 @@ describe('NotificationSubmissionService', () => { clientRoles: [], }), }); + + mockQueryBuilder = createMock<SelectQueryBuilder<ApplicationSubmission>>(); + mockQueryBuilder.leftJoin.mockReturnValue(mockQueryBuilder); + mockQueryBuilder.select.mockReturnValue(mockQueryBuilder); + mockQueryBuilder.where.mockReturnValue(mockQueryBuilder); + mockQueryBuilder.execute.mockResolvedValue([ + { + user_uuid: 'user_uuid', + bceid_business_guid: 'bceid_business_guid', + localGovernment_bceid_business_guid: + 'localGovernment_bceid_business_guid', + }, + ]); }); it('should be defined', () => { @@ -393,4 +409,150 @@ describe('NotificationSubmissionService', () => { expect(mockDocumentService.attachDocumentAsBuffer).toHaveBeenCalledTimes(0); expect(mockStatusService.setStatusDate).toHaveBeenCalledTimes(0); }); + + it('should return true for access document if its public', async () => { + const noiSubmission = new NotificationSubmission(); + mockRepository.findOneOrFail.mockResolvedValue(noiSubmission); + + const res = await service.canAccessDocument( + new NotificationDocument({ + visibilityFlags: [VISIBILITY_FLAG.PUBLIC], + }), + new User(), + ); + + expect(res).toBe(true); + }); + + it('should return true for access document if its applicant and requesting user owns it', async () => { + mockRepository.createQueryBuilder.mockReturnValue(mockQueryBuilder); + const noiSubmission = new NotificationSubmission(); + mockRepository.findOneOrFail.mockResolvedValue(noiSubmission); + + const res = await service.canAccessDocument( + new NotificationDocument({ + visibilityFlags: [VISIBILITY_FLAG.APPLICANT], + }), + new User({ + uuid: 'user_uuid', + }), + ); + + expect(res).toBe(true); + }); + + it('should return false for access document if its applicant and requesting user does not own it', async () => { + mockRepository.createQueryBuilder.mockReturnValue(mockQueryBuilder); + const noiSubmission = new NotificationSubmission(); + mockRepository.findOneOrFail.mockResolvedValue(noiSubmission); + + const res = await service.canAccessDocument( + new NotificationDocument({ + visibilityFlags: [VISIBILITY_FLAG.APPLICANT], + }), + new User({ + uuid: 'NOT_user_uuid', + }), + ); + + expect(res).toBe(false); + }); + + it('should return true for access document if its government and requesting user is in that government', async () => { + mockRepository.createQueryBuilder.mockReturnValue(mockQueryBuilder); + const noiSubmission = new NotificationSubmission(); + mockRepository.findOneOrFail.mockResolvedValue(noiSubmission); + + const res = await service.canAccessDocument( + new NotificationDocument({ + visibilityFlags: [VISIBILITY_FLAG.GOVERNMENT], + }), + new User({ + bceidBusinessGuid: 'localGovernment_bceid_business_guid', + }), + ); + + expect(res).toBe(true); + }); + + it('should return false for access document if its government and requesting user is NOT in that government', async () => { + mockRepository.createQueryBuilder.mockReturnValue(mockQueryBuilder); + const noiSubmission = new NotificationSubmission(); + mockRepository.findOneOrFail.mockResolvedValue(noiSubmission); + + const res = await service.canAccessDocument( + new NotificationDocument({ + visibilityFlags: [VISIBILITY_FLAG.GOVERNMENT], + }), + new User({ + bceidBusinessGuid: 'NOT_localGovernment_bceid_business_guid', + }), + ); + + expect(res).toBe(false); + }); + + it('should return true for access document if its applicant and requesting user is in same business', async () => { + mockRepository.createQueryBuilder.mockReturnValue(mockQueryBuilder); + const noiSubmission = new NotificationSubmission(); + mockRepository.findOneOrFail.mockResolvedValue(noiSubmission); + + const res = await service.canAccessDocument( + new NotificationDocument({ + visibilityFlags: [VISIBILITY_FLAG.APPLICANT], + }), + new User({ + bceidBusinessGuid: 'bceid_business_guid', + }), + ); + + expect(res).toBe(true); + }); + + it('should return false for access document if its applicant and requesting user is NOT in same business account', async () => { + mockRepository.createQueryBuilder.mockReturnValue(mockQueryBuilder); + const noiSubmission = new NotificationSubmission(); + mockRepository.findOneOrFail.mockResolvedValue(noiSubmission); + + const res = await service.canAccessDocument( + new NotificationDocument({ + visibilityFlags: [VISIBILITY_FLAG.APPLICANT], + }), + new User({ + bceidBusinessGuid: 'NOT_bceid_business_guid', + }), + ); + + expect(res).toBe(false); + }); + + it('should return true for delete document if user is owner', async () => { + mockRepository.createQueryBuilder.mockReturnValue(mockQueryBuilder); + const noiSubmission = new NotificationSubmission(); + mockRepository.findOneOrFail.mockResolvedValue(noiSubmission); + + const res = await service.canDeleteDocument( + new NotificationDocument({}), + new User({ + uuid: 'user_uuid', + }), + ); + + expect(res).toBe(true); + }); + + it('should return false for delete document if user is NOT owner', async () => { + mockRepository.createQueryBuilder.mockReturnValue(mockQueryBuilder); + const noiSubmission = new NotificationSubmission(); + mockRepository.findOneOrFail.mockResolvedValue(noiSubmission); + + const res = await service.canDeleteDocument( + new NotificationDocument({}), + new User({ + uuid: 'NOT_user_uuid', + }), + ); + + expect(res).toBe(false); + }); }); diff --git a/services/apps/alcs/src/portal/notification-submission/notification-submission.service.ts b/services/apps/alcs/src/portal/notification-submission/notification-submission.service.ts index 68e9dd8571..04e4666be3 100644 --- a/services/apps/alcs/src/portal/notification-submission/notification-submission.service.ts +++ b/services/apps/alcs/src/portal/notification-submission/notification-submission.service.ts @@ -482,4 +482,64 @@ export class NotificationSubmissionService { parentId: notification.uuid, }; } + + async canDeleteDocument(document: NotificationDocument, user: User) { + const documentFlags = await this.getDocumentFlags(document); + + const isOwner = user.uuid === documentFlags.ownerUuid; + const isGovernmentOnFile = + user.bceidBusinessGuid === documentFlags.localGovernmentGuid; + const isSameAccountAsOwner = + !!user.bceidBusinessGuid && + user.bceidBusinessGuid === documentFlags.ownerGuid; + + return isOwner || isGovernmentOnFile || isSameAccountAsOwner; + } + + async canAccessDocument(document: NotificationDocument, user: User) { + //If document has P, skip all checks. + if (document.visibilityFlags.includes(VISIBILITY_FLAG.PUBLIC)) { + return true; + } + + const documentFlags = await this.getDocumentFlags(document); + + const applicantFlag = + document.visibilityFlags.includes(VISIBILITY_FLAG.APPLICANT) && + user.uuid === documentFlags.ownerUuid; + const governmentFlag = + !!user.bceidBusinessGuid && + document.visibilityFlags.includes(VISIBILITY_FLAG.GOVERNMENT) && + user.bceidBusinessGuid === documentFlags.localGovernmentGuid; + const sharedAccountFlag = + !!user.bceidBusinessGuid && + document.visibilityFlags.includes(VISIBILITY_FLAG.APPLICANT) && + user.bceidBusinessGuid === documentFlags.ownerGuid; + + return applicantFlag || governmentFlag || sharedAccountFlag; + } + + private async getDocumentFlags(document: NotificationDocument) { + const result = await this.notificationSubmissionRepository + .createQueryBuilder('submission') + .leftJoin('submission.notification', 'notification') + .leftJoin('notification.documents', 'document') + .leftJoin('submission.createdBy', 'user') + .leftJoin('notification.localGovernment', 'localGovernment') + .select([ + 'user.uuid', + 'user.bceid_business_guid', + 'localGovernment.bceidBusinessGuid', + ]) + .where('document.uuid = :uuid', { + uuid: document.uuid, + }) + .execute(); + + return { + ownerUuid: result[0]?.user_uuid, + ownerGuid: result[0]?.bceid_business_guid, + localGovernmentGuid: result[0]?.localGovernment_bceid_business_guid, + }; + } } diff --git a/services/apps/alcs/src/portal/public/application/application-decision.controller.spec.ts b/services/apps/alcs/src/portal/public/application/application-decision.controller.spec.ts index 24623cbed8..3e8c53f9fd 100644 --- a/services/apps/alcs/src/portal/public/application/application-decision.controller.spec.ts +++ b/services/apps/alcs/src/portal/public/application/application-decision.controller.spec.ts @@ -64,11 +64,11 @@ describe('ApplicationDecisionController', () => { }); it('should call through for loading files', async () => { - mockDecisionService.getDownloadUrl.mockResolvedValue('Mock Url'); + mockDecisionService.getDownloadForPortal.mockResolvedValue('Mock Url'); const res = await controller.openFile(''); expect(res.url).toBeTruthy(); - expect(mockDecisionService.getDownloadUrl).toHaveBeenCalledTimes(1); + expect(mockDecisionService.getDownloadForPortal).toHaveBeenCalledTimes(1); }); }); diff --git a/services/apps/alcs/src/portal/public/application/application-decision.controller.ts b/services/apps/alcs/src/portal/public/application/application-decision.controller.ts index fc7df0afde..939f50b993 100644 --- a/services/apps/alcs/src/portal/public/application/application-decision.controller.ts +++ b/services/apps/alcs/src/portal/public/application/application-decision.controller.ts @@ -1,6 +1,6 @@ import { Mapper } from '@automapper/core'; import { InjectMapper } from '@automapper/nestjs'; -import { Controller, Get, Param, Req } from '@nestjs/common'; +import { Controller, Get, Param } from '@nestjs/common'; import { Public } from 'nest-keycloak-connect'; import { ApplicationDecisionV2Service } from '../../../alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service'; import { ApplicationDecision } from '../../../alcs/application-decision/application-decision.entity'; @@ -31,7 +31,7 @@ export class ApplicationDecisionController { @Get('/:uuid/open') async openFile(@Param('uuid') fileUuid: string) { - const url = await this.decisionService.getDownloadUrl(fileUuid); + const url = await this.decisionService.getDownloadForPortal(fileUuid); return { url }; } diff --git a/services/apps/alcs/src/portal/public/notice-of-intent/notice-of-intent-decision.controller.spec.ts b/services/apps/alcs/src/portal/public/notice-of-intent/notice-of-intent-decision.controller.spec.ts index 530fcdd3bf..88d95cdc0e 100644 --- a/services/apps/alcs/src/portal/public/notice-of-intent/notice-of-intent-decision.controller.spec.ts +++ b/services/apps/alcs/src/portal/public/notice-of-intent/notice-of-intent-decision.controller.spec.ts @@ -69,11 +69,11 @@ describe('NoticeOfIntentDecisionController', () => { }); it('should call through for loading files', async () => { - mockDecisionService.getDownloadUrl.mockResolvedValue('Mock Url'); + mockDecisionService.getDownloadForPortal.mockResolvedValue('Mock Url'); const res = await controller.openFile(''); expect(res.url).toBeTruthy(); - expect(mockDecisionService.getDownloadUrl).toHaveBeenCalledTimes(1); + expect(mockDecisionService.getDownloadForPortal).toHaveBeenCalledTimes(1); }); }); diff --git a/services/apps/alcs/src/portal/public/notice-of-intent/notice-of-intent-decision.controller.ts b/services/apps/alcs/src/portal/public/notice-of-intent/notice-of-intent-decision.controller.ts index 37e669c45b..c42f3e72f4 100644 --- a/services/apps/alcs/src/portal/public/notice-of-intent/notice-of-intent-decision.controller.ts +++ b/services/apps/alcs/src/portal/public/notice-of-intent/notice-of-intent-decision.controller.ts @@ -31,7 +31,7 @@ export class NoticeOfIntentDecisionController { @Get('/:uuid/open') async openFile(@Param('uuid') fileUuid: string) { - const url = await this.decisionService.getDownloadUrl(fileUuid); + const url = await this.decisionService.getDownloadForPortal(fileUuid); return { url }; } From 7401817634345394ed5a7ad448210ffaadd3b062 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Wed, 18 Oct 2023 13:07:05 -0700 Subject: [PATCH 516/954] Fixes for Plan Numbers * Convert empty string to null when sending to back end * Re-load documents after saving to reflect changes on Step 8 --- .../edit-submission/proposal/proposal.component.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/portal-frontend/src/app/features/notifications/edit-submission/proposal/proposal.component.ts b/portal-frontend/src/app/features/notifications/edit-submission/proposal/proposal.component.ts index b8c9c21672..9e9dd6c25b 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/proposal/proposal.component.ts +++ b/portal-frontend/src/app/features/notifications/edit-submission/proposal/proposal.component.ts @@ -132,10 +132,14 @@ export class ProposalComponent extends FilesStepComponent implements OnInit, OnD if (this.isDirty) { const updateDtos: NotificationDocumentUpdateDto[] = this.surveyPlans.map((file) => ({ uuid: file.uuid, - surveyPlanNumber: file.surveyPlanNumber, - controlNumber: file.controlNumber, + surveyPlanNumber: file.surveyPlanNumber || null, + controlNumber: file.controlNumber || null, })); await this.notificationDocumentService.update(this.fileId, updateDtos); + const updatedDocuments = await this.notificationDocumentService.getByFileId(this.fileId); + if (updatedDocuments) { + this.$notificationDocuments.next(updatedDocuments); + } } } From ba56d5b75ffdeb822b24edb1ef5e3737f03d084e Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Wed, 18 Oct 2023 13:22:05 -0700 Subject: [PATCH 517/954] Add missing toast messages * Add more toast messages for virus failed uploads --- .../parcel-entry/parcel-entry.component.spec.ts | 5 +++++ .../parcel-details/parcel-entry/parcel-entry.component.ts | 5 ++++- .../review-attachments/review-attachments.component.spec.ts | 5 +++++ .../review-attachments/review-attachments.component.ts | 5 ++++- .../parcels/parcel-entry/parcel-entry.component.spec.ts | 5 +++++ .../parcels/parcel-entry/parcel-entry.component.ts | 3 +++ 6 files changed, 26 insertions(+), 2 deletions(-) diff --git a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.spec.ts b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.spec.ts index 9df02aa086..6a60718b05 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.spec.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.spec.ts @@ -11,6 +11,7 @@ import { ApplicationOwnerService } from '../../../../../services/application-own import { ApplicationParcelDto } from '../../../../../services/application-parcel/application-parcel.dto'; import { ApplicationParcelService } from '../../../../../services/application-parcel/application-parcel.service'; import { ParcelService } from '../../../../../services/parcel/parcel.service'; +import { ToastService } from '../../../../../services/toast/toast.service'; import { ParcelEntryComponent } from './parcel-entry.component'; describe('ParcelEntryComponent', () => { @@ -64,6 +65,10 @@ describe('ParcelEntryComponent', () => { provide: MatDialog, useValue: {}, }, + { + provide: ToastService, + useValue: {}, + }, ], schemas: [NO_ERRORS_SCHEMA], }).compileComponents(); diff --git a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts index 8d34f6c3b3..eebacf291f 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts @@ -13,6 +13,7 @@ import { } from '../../../../../services/application-parcel/application-parcel.dto'; import { ApplicationParcelService } from '../../../../../services/application-parcel/application-parcel.service'; import { ParcelService } from '../../../../../services/parcel/parcel.service'; +import { ToastService } from '../../../../../services/toast/toast.service'; import { DOCUMENT_TYPE } from '../../../../../shared/dto/document.dto'; import { OWNER_TYPE } from '../../../../../shared/dto/owner.dto'; import { FileHandle } from '../../../../../shared/file-drag-drop/drag-drop.directive'; @@ -114,7 +115,8 @@ export class ParcelEntryComponent implements OnInit { private applicationParcelService: ApplicationParcelService, public applicationOwnerService: ApplicationOwnerService, public applicationDocumentService: ApplicationDocumentService, - private dialog: MatDialog + private dialog: MatDialog, + private toastService: ToastService ) {} ngOnInit(): void { @@ -257,6 +259,7 @@ export class ParcelEntryComponent implements OnInit { ); } catch (e) { this.showVirusError = true; + this.toastService.showErrorToast('Document upload failed'); return; } this.showVirusError = false; diff --git a/portal-frontend/src/app/features/applications/review-submission/review-attachments/review-attachments.component.spec.ts b/portal-frontend/src/app/features/applications/review-submission/review-attachments/review-attachments.component.spec.ts index 5405ebec90..d0cd20dd9c 100644 --- a/portal-frontend/src/app/features/applications/review-submission/review-attachments/review-attachments.component.spec.ts +++ b/portal-frontend/src/app/features/applications/review-submission/review-attachments/review-attachments.component.spec.ts @@ -7,6 +7,7 @@ import { ApplicationDocumentDto } from '../../../../services/application-documen import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; import { ApplicationSubmissionReviewDto } from '../../../../services/application-submission-review/application-submission-review.dto'; import { ApplicationSubmissionReviewService } from '../../../../services/application-submission-review/application-submission-review.service'; +import { ToastService } from '../../../../services/toast/toast.service'; import { ReviewAttachmentsComponent } from './review-attachments.component'; @@ -41,6 +42,10 @@ describe('ReviewAttachmentsComponent', () => { provide: ApplicationDocumentService, useValue: mockAppDocumentService, }, + { + provide: ToastService, + useValue: {}, + }, ], schemas: [NO_ERRORS_SCHEMA], }).compileComponents(); diff --git a/portal-frontend/src/app/features/applications/review-submission/review-attachments/review-attachments.component.ts b/portal-frontend/src/app/features/applications/review-submission/review-attachments/review-attachments.component.ts index 6c9c05e4ac..f0db408194 100644 --- a/portal-frontend/src/app/features/applications/review-submission/review-attachments/review-attachments.component.ts +++ b/portal-frontend/src/app/features/applications/review-submission/review-attachments/review-attachments.component.ts @@ -4,6 +4,7 @@ import { BehaviorSubject, Subject, takeUntil } from 'rxjs'; import { ApplicationDocumentDto } from '../../../../services/application-document/application-document.dto'; import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; import { ApplicationSubmissionReviewService } from '../../../../services/application-submission-review/application-submission-review.service'; +import { ToastService } from '../../../../services/toast/toast.service'; import { DOCUMENT_SOURCE, DOCUMENT_TYPE } from '../../../../shared/dto/document.dto'; import { FileHandle } from '../../../../shared/file-drag-drop/drag-drop.directive'; import { ReviewApplicationFngSteps, ReviewApplicationSteps } from '../review-submission.component'; @@ -38,7 +39,8 @@ export class ReviewAttachmentsComponent implements OnInit, OnDestroy { constructor( private router: Router, private applicationReviewService: ApplicationSubmissionReviewService, - private applicationDocumentService: ApplicationDocumentService + private applicationDocumentService: ApplicationDocumentService, + private toastService: ToastService ) {} ngOnInit(): void { @@ -115,6 +117,7 @@ export class ReviewAttachmentsComponent implements OnInit, OnDestroy { DOCUMENT_SOURCE.LFNG ); } catch (e) { + this.toastService.showErrorToast('Document upload failed'); return false; } await this.loadApplicationDocuments(this.fileId); diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.spec.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.spec.ts index 9bce91efb1..bf675ae32a 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.spec.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.spec.ts @@ -11,6 +11,7 @@ import { NoticeOfIntentOwnerService } from '../../../../../services/notice-of-in import { NoticeOfIntentParcelDto } from '../../../../../services/notice-of-intent-parcel/notice-of-intent-parcel.dto'; import { NoticeOfIntentParcelService } from '../../../../../services/notice-of-intent-parcel/notice-of-intent-parcel.service'; import { ParcelService } from '../../../../../services/parcel/parcel.service'; +import { ToastService } from '../../../../../services/toast/toast.service'; import { ParcelEntryComponent } from './parcel-entry.component'; describe('ParcelEntryComponent', () => { @@ -63,6 +64,10 @@ describe('ParcelEntryComponent', () => { provide: MatDialog, useValue: {}, }, + { + provide: ToastService, + useValue: {}, + }, ], schemas: [NO_ERRORS_SCHEMA], }).compileComponents(); diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.ts index 7c41c18c85..b8c74c50f5 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.ts @@ -11,6 +11,7 @@ import { NoticeOfIntentOwnerService } from '../../../../../services/notice-of-in import { NoticeOfIntentParcelDto } from '../../../../../services/notice-of-intent-parcel/notice-of-intent-parcel.dto'; import { NoticeOfIntentParcelService } from '../../../../../services/notice-of-intent-parcel/notice-of-intent-parcel.service'; import { ParcelService } from '../../../../../services/parcel/parcel.service'; +import { ToastService } from '../../../../../services/toast/toast.service'; import { OWNER_TYPE } from '../../../../../shared/dto/owner.dto'; import { FileHandle } from '../../../../../shared/file-drag-drop/drag-drop.directive'; import { CrownOwnerDialogComponent } from '../../../../../shared/owner-dialogs/crown-owner-dialog/crown-owner-dialog.component'; @@ -109,6 +110,7 @@ export class ParcelEntryComponent implements OnInit { private noticeOfIntentParcelService: NoticeOfIntentParcelService, public noticeOfIntentOwnerService: NoticeOfIntentOwnerService, public noticeOfIntentDocumentService: NoticeOfIntentDocumentService, + private toastService: ToastService, private dialog: MatDialog ) {} @@ -253,6 +255,7 @@ export class ParcelEntryComponent implements OnInit { ); } catch (e) { this.showVirusError = true; + this.toastService.showErrorToast('Document upload failed'); return; } this.showVirusError = false; From ef09d34c9b638c669fbe0947c91c975b789a3ec7 Mon Sep 17 00:00:00 2001 From: Liam Stoddard <lstodd@protonmail.com> Date: Wed, 18 Oct 2023 13:26:15 -0700 Subject: [PATCH 518/954] minor tweaks --- .../submissions/data_insert/insert_query.py | 6 ++++-- .../submissions/sql/app_submission_validation.sql | 11 ++++------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/bin/migrate-oats-data/applications/submissions/data_insert/insert_query.py b/bin/migrate-oats-data/applications/submissions/data_insert/insert_query.py index ca85571687..4d5ff0d532 100644 --- a/bin/migrate-oats-data/applications/submissions/data_insert/insert_query.py +++ b/bin/migrate-oats-data/applications/submissions/data_insert/insert_query.py @@ -149,7 +149,8 @@ def get_insert_query_for_nfu(): nfu_fill_type_description, nfu_fill_origin_description, nfu_project_duration_unit, - nfu_total_fill_area + nfu_total_fill_area, + nfu_agriculture_support """ unique_values = """, %(alr_area)s, %(import_fill)s, @@ -159,7 +160,8 @@ def get_insert_query_for_nfu(): %(fill_type)s, %(fill_origin)s, %(fill_duration_unit)s, - %(fill_area)s + %(fill_area)s, + %(support_desc)s """ return get_insert_query(unique_fields, unique_values) diff --git a/bin/migrate-oats-data/applications/submissions/sql/app_submission_validation.sql b/bin/migrate-oats-data/applications/submissions/sql/app_submission_validation.sql index 87df9e4981..316820dcfd 100644 --- a/bin/migrate-oats-data/applications/submissions/sql/app_submission_validation.sql +++ b/bin/migrate-oats-data/applications/submissions/sql/app_submission_validation.sql @@ -7,13 +7,13 @@ WITH apps_with_one_or_zero_component_only AS ( ), oats_app_data AS ( SELECT oaa.alr_application_id, - oaac.alr_change_code + oaac.alr_change_code, oaac.rsdntl_use_type_code, oaac.infra_desc, oaac.cur_struc_desc, oaac.component_area, oaac.support_desc, - oaa.tour_env_desc, + oaac.tour_env_desc, oaac.agricultural_activities_desc, oaac.impact_reduction_desc, oaac.owners_notified_ind, @@ -36,17 +36,14 @@ SELECT oats_app.alr_application_id, as2.parcels_agriculture_improvement_description, as2.parcels_agriculture_description, as2.parcels_non_agriculture_use_description, - as2.naru_infrastructure, as2.file_number, oats_app.proposal_summary_desc, oats_app.agricultural_improvement_desc, oats_app.current_land_use_desc, - oats_app.non_agricultural_uses_desc, - oats_app.infra_desc + oats_app.non_agricultural_uses_desc FROM alcs.application_submission as2 LEFT JOIN oats_app_data AS oats_app ON as2.file_number = oats_app.alr_application_id::TEXT WHERE as2.purpose != oats_app.proposal_summary_desc OR as2.parcels_agriculture_improvement_description != oats_app.agricultural_improvement_desc OR as2.parcels_agriculture_description != oats_app.current_land_use_desc - OR as2.parcels_non_agriculture_use_description != oats_app.non_agricultural_uses_desc - OR as2.naru_infrastructure != oats_app.infra_desc \ No newline at end of file + OR as2.parcels_non_agriculture_use_description != oats_app.non_agricultural_uses_desc \ No newline at end of file From 48d1f7c7746fe274e44bdcbabfd18aeb68d2a16f Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Wed, 18 Oct 2023 14:55:13 -0700 Subject: [PATCH 519/954] Task-1180 Add legacy id to NOIs --- .../src/app/features/board/board.component.ts | 1 + .../notice-of-intent-dialog.component.html | 1 + .../notice-of-intent/notice-of-intent.dto.ts | 1 + .../notice-of-intent/notice-of-intent.dto.ts | 3 +++ .../notice-of-intent.entity.ts | 2 ++ ...otice-of-intent-advanced-search.service.ts | 6 +++++ .../notice-of-intent-search-view.entity.ts | 3 +++ .../migrations/1697656555589-noi-legacy_id.ts | 24 +++++++++++++++++++ 8 files changed, 41 insertions(+) create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1697656555589-noi-legacy_id.ts diff --git a/alcs-frontend/src/app/features/board/board.component.ts b/alcs-frontend/src/app/features/board/board.component.ts index a6e392f090..ae6bfbe00d 100644 --- a/alcs-frontend/src/app/features/board/board.component.ts +++ b/alcs-frontend/src/app/features/board/board.component.ts @@ -438,6 +438,7 @@ export class BoardComponent implements OnInit, OnDestroy { ? moment().add(60, 'days').subtract(noticeOfIntent.activeDays, 'days').toDate() : undefined, maxActiveDays: 61, + legacyId: noticeOfIntent.legacyId, }; } diff --git a/alcs-frontend/src/app/features/board/dialogs/notice-of-intent/notice-of-intent-dialog.component.html b/alcs-frontend/src/app/features/board/dialogs/notice-of-intent/notice-of-intent-dialog.component.html index dd7c2cf48d..22f154ed21 100644 --- a/alcs-frontend/src/app/features/board/dialogs/notice-of-intent/notice-of-intent-dialog.component.html +++ b/alcs-frontend/src/app/features/board/dialogs/notice-of-intent/notice-of-intent-dialog.component.html @@ -9,6 +9,7 @@ <h6 class="card-type-label">Notice of Intent</h6> <div class="left"> <h3 class="card-title"> <span class="margin-right">{{ cardTitle }}</span> + <app-application-legacy-id [legacyId]="noticeOfIntent.legacyId"></app-application-legacy-id> <app-application-type-pill [type]="noticeOfIntent.type"></app-application-type-pill> <app-application-type-pill *ngIf="noticeOfIntent.retroactive" diff --git a/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent.dto.ts b/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent.dto.ts index 36129c5d8d..2b34a73007 100644 --- a/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent.dto.ts +++ b/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent.dto.ts @@ -58,6 +58,7 @@ export interface NoticeOfIntentDto { agCapConsultant?: string; staffObservations?: string; proposalEndDate?: number; + legacyId?: string; } export interface UpdateNoticeOfIntentDto { diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.dto.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.dto.ts index e9ec34fd2d..c8a6b3348b 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.dto.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.dto.ts @@ -127,6 +127,9 @@ export class NoticeOfIntentDto { staffObservations?: string; proposalEndDate?: number; + + @AutoMap(() => String) + legacyId?: string; } export class UpdateNoticeOfIntentDto { diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.entity.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.entity.ts index 384a1f08d1..8dde9f531a 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.entity.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.entity.ts @@ -157,6 +157,8 @@ export class NoticeOfIntent extends Base { }) alrArea?: number | null; + legacyId?: string | null; + @AutoMap(() => String) @Column({ type: 'text', diff --git a/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-advanced-search.service.ts b/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-advanced-search.service.ts index 2255d426d2..4f482ed5d5 100644 --- a/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-advanced-search.service.ts +++ b/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-advanced-search.service.ts @@ -138,6 +138,12 @@ export class NoticeOfIntentAdvancedSearchService { ); } + if (searchDto.legacyId) { + query = query.andWhere('noiSearch.legacy_id = :legacyId', { + legacyId: searchDto.legacyId, + }); + } + if (searchDto.regionCode) { query = query.andWhere( 'noiSearch.notice_of_intent_region_code = :noi_region_code', diff --git a/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-search-view.entity.ts b/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-search-view.entity.ts index 6dfb3d0fec..a4d54a7ee2 100644 --- a/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-search-view.entity.ts +++ b/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-search-view.entity.ts @@ -91,6 +91,9 @@ export class NoticeOfIntentSubmissionSearchView { @ViewColumn() decisionDate: Date | null; + + @ViewColumn() + legacyId?: string; @ManyToOne(() => NoticeOfIntentType, { nullable: false, diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1697656555589-noi-legacy_id.ts b/services/apps/alcs/src/providers/typeorm/migrations/1697656555589-noi-legacy_id.ts new file mode 100644 index 0000000000..7f2a206ea8 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1697656555589-noi-legacy_id.ts @@ -0,0 +1,24 @@ +import { MigrationInterface, QueryRunner } from "typeorm" + +export class noiLegacyId1697656555589 implements MigrationInterface { + name = 'noiLegacyId1697656555589'; + + public async up(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent" ADD "legacy_id" text`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."notice_of_intent"."legacy_id" IS 'Notice of Intent Id that is applicable only to paper version applications from 70s - 80s'`, + ); + } + + public async down(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."notice_of_intent"."legacy_id" IS 'Notice of Intent Id that is applicable only to paper version applications from 70s - 80s'`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent" DROP COLUMN "legacy_id"`, + ); + } + +} From e2f8462721751c403810b1c60d430320f2210325 Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Wed, 18 Oct 2023 15:12:59 -0700 Subject: [PATCH 520/954] fixes --- .../notice-of-intent-advanced-search.service.ts | 1 + .../notice-of-intent/notice-of-intent-search-view.entity.ts | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-advanced-search.service.ts b/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-advanced-search.service.ts index 4f482ed5d5..d59133b771 100644 --- a/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-advanced-search.service.ts +++ b/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-advanced-search.service.ts @@ -83,6 +83,7 @@ export class NoticeOfIntentAdvancedSearchService { , "noiSearch"."notice_of_intent_region_code" , "noiSearch"."file_number" , "noiSearch"."applicant" + , "noiSearch"."legacy_id" , "noiSearch"."local_government_uuid" , "noiSearch"."local_government_name" , "noiSearch"."notice_of_intent_type_code" diff --git a/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-search-view.entity.ts b/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-search-view.entity.ts index a4d54a7ee2..b775155bac 100644 --- a/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-search-view.entity.ts +++ b/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-search-view.entity.ts @@ -34,6 +34,7 @@ export class SearchNoticeOfIntentSubmissionStatusType { .addSelect('nois.type_code', 'notice_of_intent_type_code') .addSelect('nois.is_draft', 'is_draft') .addSelect('noi.date_submitted_to_alc', 'date_submitted_to_alc') + .addSelect('noi.legacy_id', 'legacy_id') .addSelect('noi.decision_date', 'decision_date') .addSelect('noi.uuid', 'notice_of_intent_uuid') .addSelect('noi.region_code', 'notice_of_intent_region_code') @@ -91,7 +92,7 @@ export class NoticeOfIntentSubmissionSearchView { @ViewColumn() decisionDate: Date | null; - + @ViewColumn() legacyId?: string; From 46ce18a1913e4a484c4aeca0ee527a87ce19af26 Mon Sep 17 00:00:00 2001 From: Liam Stoddard <lstodd@protonmail.com> Date: Wed, 18 Oct 2023 15:22:34 -0700 Subject: [PATCH 521/954] added class for consts --- .../data_insert/submap/soil_elements.py | 51 ++++++++++--------- 1 file changed, 26 insertions(+), 25 deletions(-) diff --git a/bin/migrate-oats-data/applications/submissions/data_insert/submap/soil_elements.py b/bin/migrate-oats-data/applications/submissions/data_insert/submap/soil_elements.py index 825298f251..06ba256e08 100644 --- a/bin/migrate-oats-data/applications/submissions/data_insert/submap/soil_elements.py +++ b/bin/migrate-oats-data/applications/submissions/data_insert/submap/soil_elements.py @@ -6,14 +6,15 @@ class SoilAction(Enum): ADD = "ADD" -alr_id = "alr_appl_component_id" -area = "project_area" -desc = "material_desc" -origin_desc = "material_origin_desc" -duration = "project_duration" -volume = "volume" -depth = "depth" -alt_measure = "alternative_measures_desc" +class Soil: + ALR_ID = "alr_appl_component_id" + AREA = "project_area" + DESC = "material_desc" + ORIGIN_DESC = "material_origin_desc" + DURATION = "project_duration" + VOLUME = "volume" + DEPTH = "depth" + ALT_MEASURE = "alternative_measures_desc" def get_soil_rows(rows, cursor): @@ -34,8 +35,8 @@ def create_soil_dict(soil_rows): soil_dict = dict() for row in soil_rows: - app_component_id = row[alr_id] - soil_dict.setdefault(app_component_id, {alr_id: row[alr_id]}) + app_component_id = row[Soil.ALR_ID] + soil_dict.setdefault(app_component_id, {Soil.ALR_ID: row[Soil.ALR_ID]}) if ( row["soil_change_code"] == SoilAction.RMV.value @@ -132,26 +133,26 @@ def add_soil_field(data): def dict_fill_insert(soil_dict, app_component_id, row): - soil_dict[app_component_id]["fill_type"] = row[desc] - soil_dict[app_component_id]["fill_origin"] = row[origin_desc] - soil_dict[app_component_id]["total_fill"] = row[volume] - soil_dict[app_component_id]["max_fill_depth"] = row[depth] - soil_dict[app_component_id]["fill_duration"] = row[duration] - soil_dict[app_component_id]["duration"] = row[duration] - soil_dict[app_component_id]["fill_area"] = row[area] + soil_dict[app_component_id]["fill_type"] = row[Soil.DESC] + soil_dict[app_component_id]["fill_origin"] = row[Soil.ORIGIN_DESC] + soil_dict[app_component_id]["total_fill"] = row[Soil.VOLUME] + soil_dict[app_component_id]["max_fill_depth"] = row[Soil.DEPTH] + soil_dict[app_component_id]["fill_duration"] = row[Soil.DURATION] + soil_dict[app_component_id]["duration"] = row[Soil.DURATION] + soil_dict[app_component_id]["fill_area"] = row[Soil.AREA] soil_dict[app_component_id]["import_fill"] = True - soil_dict[app_component_id]["alternative_measures_desc"] = row[alt_measure] + soil_dict[app_component_id]["alternative_measures_desc"] = row[Soil.ALT_MEASURE] soil_dict[app_component_id][SoilAction.ADD.name] = True return def dict_rmv_insert(soil_dict, app_component_id, row): - soil_dict[app_component_id]["remove_type"] = row[desc] - soil_dict[app_component_id]["remove_origin"] = row[origin_desc] - soil_dict[app_component_id]["max_remove_depth"] = row[depth] - soil_dict[app_component_id]["total_remove"] = row[volume] - soil_dict[app_component_id]["remove_duration"] = row[duration] - soil_dict[app_component_id]["duration"] = row[duration] - soil_dict[app_component_id]["remove_area"] = row[area] + soil_dict[app_component_id]["remove_type"] = row[Soil.DESC] + soil_dict[app_component_id]["remove_origin"] = row[Soil.ORIGIN_DESC] + soil_dict[app_component_id]["max_remove_depth"] = row[Soil.DEPTH] + soil_dict[app_component_id]["total_remove"] = row[Soil.VOLUME] + soil_dict[app_component_id]["remove_duration"] = row[Soil.DURATION] + soil_dict[app_component_id]["duration"] = row[Soil.DURATION] + soil_dict[app_component_id]["remove_area"] = row[Soil.AREA] soil_dict[app_component_id][SoilAction.RMV.name] = True return From 41f7dd9d53d9f71b110adec80929d0fbfe45d59a Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Wed, 18 Oct 2023 15:41:15 -0700 Subject: [PATCH 522/954] fixes --- .../notice-of-intent.entity.ts | 7 ++++ .../typeorm/1697668754905-migrations.ts | 32 +++++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 services/apps/alcs/src/providers/typeorm/1697668754905-migrations.ts diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.entity.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.entity.ts index 8dde9f531a..3447b0ee98 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.entity.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.entity.ts @@ -157,6 +157,13 @@ export class NoticeOfIntent extends Base { }) alrArea?: number | null; + @AutoMap(() => String) + @Column({ + type: 'text', + comment: + 'NOI Id that is applicable only to paper version applications from 70s - 80s', + nullable: true, + }) legacyId?: string | null; @AutoMap(() => String) diff --git a/services/apps/alcs/src/providers/typeorm/1697668754905-migrations.ts b/services/apps/alcs/src/providers/typeorm/1697668754905-migrations.ts new file mode 100644 index 0000000000..8843f6940f --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/1697668754905-migrations.ts @@ -0,0 +1,32 @@ +import { MigrationInterface, QueryRunner } from "typeorm"; + +export class migrations1697668754905 implements MigrationInterface { + name = 'migrations1697668754905' + + public async up(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query(`DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, ["VIEW","notice_of_intent_submission_search_view","alcs"]); + await queryRunner.query(`DROP VIEW "alcs"."notice_of_intent_submission_search_view"`); + await queryRunner.query(`DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, ["VIEW","application_submission_search_view","alcs"]); + await queryRunner.query(`DROP VIEW "alcs"."application_submission_search_view"`); + await queryRunner.query(`ALTER TABLE "alcs"."notice_of_intent" DROP COLUMN "legacy_id"`); + await queryRunner.query(`ALTER TABLE "alcs"."document" ALTER COLUMN "system" SET DEFAULT 'ALC'`); + await queryRunner.query(`CREATE VIEW "alcs"."application_submission_search_view" AS SELECT "as2"."uuid" AS "uuid", "as2"."applicant" AS "applicant", "a"."uuid" AS "application_uuid", "applicationType"."audit_deleted_date_at" AS "applicationType_audit_deleted_date_at", "applicationType"."audit_created_at" AS "applicationType_audit_created_at", "applicationType"."audit_updated_at" AS "applicationType_audit_updated_at", "applicationType"."audit_created_by" AS "applicationType_audit_created_by", "applicationType"."audit_updated_by" AS "applicationType_audit_updated_by", "applicationType"."label" AS "applicationType_label", "applicationType"."code" AS "applicationType_code", "applicationType"."description" AS "applicationType_description", "applicationType"."short_label" AS "applicationType_short_label", "applicationType"."background_color" AS "applicationType_background_color", "applicationType"."text_color" AS "applicationType_text_color", "applicationType"."html_description" AS "applicationType_html_description", "applicationType"."portal_label" AS "applicationType_portal_label", "localGovernment"."name" AS "local_government_name", "as2"."file_number" AS "file_number", "as2"."local_government_uuid" AS "local_government_uuid", "as2"."type_code" AS "application_type_code", "as2"."is_draft" AS "is_draft", "a"."legacy_id" AS "legacy_id", "a"."date_submitted_to_alc" AS "date_submitted_to_alc", "a"."decision_date" AS "decision_date", "a"."region_code" AS "application_region_code", alcs.get_current_status_for_application_submission_by_uuid("as2"."uuid") AS "status" FROM "alcs"."application_submission" "as2" INNER JOIN "alcs"."application" "a" ON "a"."file_number" = "as2"."file_number" AND "a"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."application_type" "applicationType" ON "as2"."type_code" = "applicationType"."code" AND "applicationType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "as2"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL WHERE "as2"."audit_deleted_date_at" IS NULL`); + await queryRunner.query(`INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, ["alcs","VIEW","application_submission_search_view","SELECT \"as2\".\"uuid\" AS \"uuid\", \"as2\".\"applicant\" AS \"applicant\", \"a\".\"uuid\" AS \"application_uuid\", \"applicationType\".\"audit_deleted_date_at\" AS \"applicationType_audit_deleted_date_at\", \"applicationType\".\"audit_created_at\" AS \"applicationType_audit_created_at\", \"applicationType\".\"audit_updated_at\" AS \"applicationType_audit_updated_at\", \"applicationType\".\"audit_created_by\" AS \"applicationType_audit_created_by\", \"applicationType\".\"audit_updated_by\" AS \"applicationType_audit_updated_by\", \"applicationType\".\"label\" AS \"applicationType_label\", \"applicationType\".\"code\" AS \"applicationType_code\", \"applicationType\".\"description\" AS \"applicationType_description\", \"applicationType\".\"short_label\" AS \"applicationType_short_label\", \"applicationType\".\"background_color\" AS \"applicationType_background_color\", \"applicationType\".\"text_color\" AS \"applicationType_text_color\", \"applicationType\".\"html_description\" AS \"applicationType_html_description\", \"applicationType\".\"portal_label\" AS \"applicationType_portal_label\", \"localGovernment\".\"name\" AS \"local_government_name\", \"as2\".\"file_number\" AS \"file_number\", \"as2\".\"local_government_uuid\" AS \"local_government_uuid\", \"as2\".\"type_code\" AS \"application_type_code\", \"as2\".\"is_draft\" AS \"is_draft\", \"a\".\"legacy_id\" AS \"legacy_id\", \"a\".\"date_submitted_to_alc\" AS \"date_submitted_to_alc\", \"a\".\"decision_date\" AS \"decision_date\", \"a\".\"region_code\" AS \"application_region_code\", alcs.get_current_status_for_application_submission_by_uuid(\"as2\".\"uuid\") AS \"status\" FROM \"alcs\".\"application_submission\" \"as2\" INNER JOIN \"alcs\".\"application\" \"a\" ON \"a\".\"file_number\" = \"as2\".\"file_number\" AND \"a\".\"audit_deleted_date_at\" IS NULL INNER JOIN \"alcs\".\"application_type\" \"applicationType\" ON \"as2\".\"type_code\" = \"applicationType\".\"code\" AND \"applicationType\".\"audit_deleted_date_at\" IS NULL LEFT JOIN \"alcs\".\"local_government\" \"localGovernment\" ON \"as2\".\"local_government_uuid\" = \"localGovernment\".\"uuid\" AND \"localGovernment\".\"audit_deleted_date_at\" IS NULL WHERE \"as2\".\"audit_deleted_date_at\" IS NULL"]); + await queryRunner.query(`CREATE VIEW "alcs"."notice_of_intent_submission_search_view" AS SELECT "nois"."uuid" AS "uuid", "nois"."applicant" AS "applicant", "noi"."uuid" AS "notice_of_intent_uuid", "noticeOfIntentType"."audit_deleted_date_at" AS "noticeOfIntentType_audit_deleted_date_at", "noticeOfIntentType"."audit_created_at" AS "noticeOfIntentType_audit_created_at", "noticeOfIntentType"."audit_updated_at" AS "noticeOfIntentType_audit_updated_at", "noticeOfIntentType"."audit_created_by" AS "noticeOfIntentType_audit_created_by", "noticeOfIntentType"."audit_updated_by" AS "noticeOfIntentType_audit_updated_by", "noticeOfIntentType"."label" AS "noticeOfIntentType_label", "noticeOfIntentType"."code" AS "noticeOfIntentType_code", "noticeOfIntentType"."description" AS "noticeOfIntentType_description", "noticeOfIntentType"."short_label" AS "noticeOfIntentType_short_label", "noticeOfIntentType"."background_color" AS "noticeOfIntentType_background_color", "noticeOfIntentType"."text_color" AS "noticeOfIntentType_text_color", "noticeOfIntentType"."html_description" AS "noticeOfIntentType_html_description", "noticeOfIntentType"."portal_label" AS "noticeOfIntentType_portal_label", "localGovernment"."name" AS "local_government_name", "nois"."file_number" AS "file_number", "nois"."local_government_uuid" AS "local_government_uuid", "nois"."type_code" AS "notice_of_intent_type_code", "nois"."is_draft" AS "is_draft", "noi"."date_submitted_to_alc" AS "date_submitted_to_alc", noi.legacy_id AS "legacy_id", "noi"."decision_date" AS "decision_date", "noi"."region_code" AS "notice_of_intent_region_code", alcs.get_current_status_for_notice_of_intent_submission_by_uuid("nois"."uuid") AS "status" FROM "alcs"."notice_of_intent_submission" "nois" INNER JOIN "alcs"."notice_of_intent" "noi" ON "noi"."file_number" = "nois"."file_number" AND "noi"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."notice_of_intent_type" "noticeOfIntentType" ON "nois"."type_code" = "noticeOfIntentType"."code" AND "noticeOfIntentType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "nois"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL WHERE "nois"."audit_deleted_date_at" IS NULL`); + await queryRunner.query(`INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, ["alcs","VIEW","notice_of_intent_submission_search_view","SELECT \"nois\".\"uuid\" AS \"uuid\", \"nois\".\"applicant\" AS \"applicant\", \"noi\".\"uuid\" AS \"notice_of_intent_uuid\", \"noticeOfIntentType\".\"audit_deleted_date_at\" AS \"noticeOfIntentType_audit_deleted_date_at\", \"noticeOfIntentType\".\"audit_created_at\" AS \"noticeOfIntentType_audit_created_at\", \"noticeOfIntentType\".\"audit_updated_at\" AS \"noticeOfIntentType_audit_updated_at\", \"noticeOfIntentType\".\"audit_created_by\" AS \"noticeOfIntentType_audit_created_by\", \"noticeOfIntentType\".\"audit_updated_by\" AS \"noticeOfIntentType_audit_updated_by\", \"noticeOfIntentType\".\"label\" AS \"noticeOfIntentType_label\", \"noticeOfIntentType\".\"code\" AS \"noticeOfIntentType_code\", \"noticeOfIntentType\".\"description\" AS \"noticeOfIntentType_description\", \"noticeOfIntentType\".\"short_label\" AS \"noticeOfIntentType_short_label\", \"noticeOfIntentType\".\"background_color\" AS \"noticeOfIntentType_background_color\", \"noticeOfIntentType\".\"text_color\" AS \"noticeOfIntentType_text_color\", \"noticeOfIntentType\".\"html_description\" AS \"noticeOfIntentType_html_description\", \"noticeOfIntentType\".\"portal_label\" AS \"noticeOfIntentType_portal_label\", \"localGovernment\".\"name\" AS \"local_government_name\", \"nois\".\"file_number\" AS \"file_number\", \"nois\".\"local_government_uuid\" AS \"local_government_uuid\", \"nois\".\"type_code\" AS \"notice_of_intent_type_code\", \"nois\".\"is_draft\" AS \"is_draft\", \"noi\".\"date_submitted_to_alc\" AS \"date_submitted_to_alc\", noi.legacy_id AS \"legacy_id\", \"noi\".\"decision_date\" AS \"decision_date\", \"noi\".\"region_code\" AS \"notice_of_intent_region_code\", alcs.get_current_status_for_notice_of_intent_submission_by_uuid(\"nois\".\"uuid\") AS \"status\" FROM \"alcs\".\"notice_of_intent_submission\" \"nois\" INNER JOIN \"alcs\".\"notice_of_intent\" \"noi\" ON \"noi\".\"file_number\" = \"nois\".\"file_number\" AND \"noi\".\"audit_deleted_date_at\" IS NULL INNER JOIN \"alcs\".\"notice_of_intent_type\" \"noticeOfIntentType\" ON \"nois\".\"type_code\" = \"noticeOfIntentType\".\"code\" AND \"noticeOfIntentType\".\"audit_deleted_date_at\" IS NULL LEFT JOIN \"alcs\".\"local_government\" \"localGovernment\" ON \"nois\".\"local_government_uuid\" = \"localGovernment\".\"uuid\" AND \"localGovernment\".\"audit_deleted_date_at\" IS NULL WHERE \"nois\".\"audit_deleted_date_at\" IS NULL"]); + } + + public async down(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query(`DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, ["VIEW","notice_of_intent_submission_search_view","alcs"]); + await queryRunner.query(`DROP VIEW "alcs"."notice_of_intent_submission_search_view"`); + await queryRunner.query(`DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, ["VIEW","application_submission_search_view","alcs"]); + await queryRunner.query(`DROP VIEW "alcs"."application_submission_search_view"`); + await queryRunner.query(`ALTER TABLE "alcs"."document" ALTER COLUMN "system" SET DEFAULT 'ALCS'`); + await queryRunner.query(`ALTER TABLE "alcs"."notice_of_intent" ADD "legacy_id" text`); + await queryRunner.query(`CREATE VIEW "alcs"."application_submission_search_view" AS SELECT "as2"."uuid" AS "uuid", "as2"."applicant" AS "applicant", "a"."uuid" AS "application_uuid", "applicationType"."audit_deleted_date_at" AS "applicationType_audit_deleted_date_at", "applicationType"."audit_created_at" AS "applicationType_audit_created_at", "applicationType"."audit_updated_at" AS "applicationType_audit_updated_at", "applicationType"."audit_created_by" AS "applicationType_audit_created_by", "applicationType"."audit_updated_by" AS "applicationType_audit_updated_by", "applicationType"."label" AS "applicationType_label", "applicationType"."code" AS "applicationType_code", "applicationType"."description" AS "applicationType_description", "applicationType"."short_label" AS "applicationType_short_label", "applicationType"."background_color" AS "applicationType_background_color", "applicationType"."text_color" AS "applicationType_text_color", "applicationType"."html_description" AS "applicationType_html_description", "applicationType"."portal_label" AS "applicationType_portal_label", "localGovernment"."name" AS "local_government_name", "as2"."file_number" AS "file_number", "as2"."local_government_uuid" AS "local_government_uuid", "as2"."type_code" AS "application_type_code", "as2"."is_draft" AS "is_draft", "a"."legacy_id" AS "legacy_id", "a"."date_submitted_to_alc" AS "date_submitted_to_alc", "a"."decision_date" AS "decision_date", "a"."region_code" AS "application_region_code", alcs.get_current_status_for_submission_by_uuid("as2"."uuid") AS "status" FROM "alcs"."application_submission" "as2" INNER JOIN "alcs"."application" "a" ON "a"."file_number" = "as2"."file_number" AND "a"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."application_type" "applicationType" ON "as2"."type_code" = "applicationType"."code" AND "applicationType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "as2"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL WHERE "as2"."audit_deleted_date_at" IS NULL`); + await queryRunner.query(`INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, ["alcs","VIEW","application_submission_search_view","SELECT \"as2\".\"uuid\" AS \"uuid\", \"as2\".\"applicant\" AS \"applicant\", \"a\".\"uuid\" AS \"application_uuid\", \"applicationType\".\"audit_deleted_date_at\" AS \"applicationType_audit_deleted_date_at\", \"applicationType\".\"audit_created_at\" AS \"applicationType_audit_created_at\", \"applicationType\".\"audit_updated_at\" AS \"applicationType_audit_updated_at\", \"applicationType\".\"audit_created_by\" AS \"applicationType_audit_created_by\", \"applicationType\".\"audit_updated_by\" AS \"applicationType_audit_updated_by\", \"applicationType\".\"label\" AS \"applicationType_label\", \"applicationType\".\"code\" AS \"applicationType_code\", \"applicationType\".\"description\" AS \"applicationType_description\", \"applicationType\".\"short_label\" AS \"applicationType_short_label\", \"applicationType\".\"background_color\" AS \"applicationType_background_color\", \"applicationType\".\"text_color\" AS \"applicationType_text_color\", \"applicationType\".\"html_description\" AS \"applicationType_html_description\", \"applicationType\".\"portal_label\" AS \"applicationType_portal_label\", \"localGovernment\".\"name\" AS \"local_government_name\", \"as2\".\"file_number\" AS \"file_number\", \"as2\".\"local_government_uuid\" AS \"local_government_uuid\", \"as2\".\"type_code\" AS \"application_type_code\", \"as2\".\"is_draft\" AS \"is_draft\", \"a\".\"legacy_id\" AS \"legacy_id\", \"a\".\"date_submitted_to_alc\" AS \"date_submitted_to_alc\", \"a\".\"decision_date\" AS \"decision_date\", \"a\".\"region_code\" AS \"application_region_code\", alcs.get_current_status_for_submission_by_uuid(\"as2\".\"uuid\") AS \"status\" FROM \"alcs\".\"application_submission\" \"as2\" INNER JOIN \"alcs\".\"application\" \"a\" ON \"a\".\"file_number\" = \"as2\".\"file_number\" AND \"a\".\"audit_deleted_date_at\" IS NULL INNER JOIN \"alcs\".\"application_type\" \"applicationType\" ON \"as2\".\"type_code\" = \"applicationType\".\"code\" AND \"applicationType\".\"audit_deleted_date_at\" IS NULL LEFT JOIN \"alcs\".\"local_government\" \"localGovernment\" ON \"as2\".\"local_government_uuid\" = \"localGovernment\".\"uuid\" AND \"localGovernment\".\"audit_deleted_date_at\" IS NULL WHERE \"as2\".\"audit_deleted_date_at\" IS NULL"]); + await queryRunner.query(`CREATE VIEW "alcs"."notice_of_intent_submission_search_view" AS SELECT "nois"."uuid" AS "uuid", "nois"."applicant" AS "applicant", "noi"."uuid" AS "notice_of_intent_uuid", "noticeOfIntentType"."audit_deleted_date_at" AS "noticeOfIntentType_audit_deleted_date_at", "noticeOfIntentType"."audit_created_at" AS "noticeOfIntentType_audit_created_at", "noticeOfIntentType"."audit_updated_at" AS "noticeOfIntentType_audit_updated_at", "noticeOfIntentType"."audit_created_by" AS "noticeOfIntentType_audit_created_by", "noticeOfIntentType"."audit_updated_by" AS "noticeOfIntentType_audit_updated_by", "noticeOfIntentType"."label" AS "noticeOfIntentType_label", "noticeOfIntentType"."code" AS "noticeOfIntentType_code", "noticeOfIntentType"."description" AS "noticeOfIntentType_description", "noticeOfIntentType"."short_label" AS "noticeOfIntentType_short_label", "noticeOfIntentType"."html_description" AS "noticeOfIntentType_html_description", "noticeOfIntentType"."portal_label" AS "noticeOfIntentType_portal_label", "localGovernment"."name" AS "local_government_name", "nois"."file_number" AS "file_number", "nois"."local_government_uuid" AS "local_government_uuid", "nois"."type_code" AS "notice_of_intent_type_code", "nois"."is_draft" AS "is_draft", "noi"."date_submitted_to_alc" AS "date_submitted_to_alc", "noi"."decision_date" AS "decision_date", "noi"."region_code" AS "notice_of_intent_region_code", alcs.get_current_status_for_notice_of_intent_submission_by_uuid("nois"."uuid") AS "status" FROM "alcs"."notice_of_intent_submission" "nois" INNER JOIN "alcs"."notice_of_intent" "noi" ON "noi"."file_number" = "nois"."file_number" AND "noi"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."notice_of_intent_type" "noticeOfIntentType" ON "nois"."type_code" = "noticeOfIntentType"."code" AND "noticeOfIntentType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "nois"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL WHERE "nois"."audit_deleted_date_at" IS NULL`); + await queryRunner.query(`INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, ["alcs","VIEW","notice_of_intent_submission_search_view","SELECT \"nois\".\"uuid\" AS \"uuid\", \"nois\".\"applicant\" AS \"applicant\", \"noi\".\"uuid\" AS \"notice_of_intent_uuid\", \"noticeOfIntentType\".\"audit_deleted_date_at\" AS \"noticeOfIntentType_audit_deleted_date_at\", \"noticeOfIntentType\".\"audit_created_at\" AS \"noticeOfIntentType_audit_created_at\", \"noticeOfIntentType\".\"audit_updated_at\" AS \"noticeOfIntentType_audit_updated_at\", \"noticeOfIntentType\".\"audit_created_by\" AS \"noticeOfIntentType_audit_created_by\", \"noticeOfIntentType\".\"audit_updated_by\" AS \"noticeOfIntentType_audit_updated_by\", \"noticeOfIntentType\".\"label\" AS \"noticeOfIntentType_label\", \"noticeOfIntentType\".\"code\" AS \"noticeOfIntentType_code\", \"noticeOfIntentType\".\"description\" AS \"noticeOfIntentType_description\", \"noticeOfIntentType\".\"short_label\" AS \"noticeOfIntentType_short_label\", \"noticeOfIntentType\".\"html_description\" AS \"noticeOfIntentType_html_description\", \"noticeOfIntentType\".\"portal_label\" AS \"noticeOfIntentType_portal_label\", \"localGovernment\".\"name\" AS \"local_government_name\", \"nois\".\"file_number\" AS \"file_number\", \"nois\".\"local_government_uuid\" AS \"local_government_uuid\", \"nois\".\"type_code\" AS \"notice_of_intent_type_code\", \"nois\".\"is_draft\" AS \"is_draft\", \"noi\".\"date_submitted_to_alc\" AS \"date_submitted_to_alc\", \"noi\".\"decision_date\" AS \"decision_date\", \"noi\".\"region_code\" AS \"notice_of_intent_region_code\", alcs.get_current_status_for_notice_of_intent_submission_by_uuid(\"nois\".\"uuid\") AS \"status\" FROM \"alcs\".\"notice_of_intent_submission\" \"nois\" INNER JOIN \"alcs\".\"notice_of_intent\" \"noi\" ON \"noi\".\"file_number\" = \"nois\".\"file_number\" AND \"noi\".\"audit_deleted_date_at\" IS NULL INNER JOIN \"alcs\".\"notice_of_intent_type\" \"noticeOfIntentType\" ON \"nois\".\"type_code\" = \"noticeOfIntentType\".\"code\" AND \"noticeOfIntentType\".\"audit_deleted_date_at\" IS NULL LEFT JOIN \"alcs\".\"local_government\" \"localGovernment\" ON \"nois\".\"local_government_uuid\" = \"localGovernment\".\"uuid\" AND \"localGovernment\".\"audit_deleted_date_at\" IS NULL WHERE \"nois\".\"audit_deleted_date_at\" IS NULL"]); + } + +} From 35307a11c1ae3346ebe64e607145f9d971d7a727 Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Wed, 18 Oct 2023 15:44:45 -0700 Subject: [PATCH 523/954] fixes --- .../migrations/1697656555589-noi-legacy_id.ts | 24 ------------------- .../1697669020115-legacyid_noi.ts} | 12 +++++----- 2 files changed, 6 insertions(+), 30 deletions(-) delete mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1697656555589-noi-legacy_id.ts rename services/apps/alcs/src/providers/typeorm/{1697668754905-migrations.ts => migrations/1697669020115-legacyid_noi.ts} (89%) diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1697656555589-noi-legacy_id.ts b/services/apps/alcs/src/providers/typeorm/migrations/1697656555589-noi-legacy_id.ts deleted file mode 100644 index 7f2a206ea8..0000000000 --- a/services/apps/alcs/src/providers/typeorm/migrations/1697656555589-noi-legacy_id.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { MigrationInterface, QueryRunner } from "typeorm" - -export class noiLegacyId1697656555589 implements MigrationInterface { - name = 'noiLegacyId1697656555589'; - - public async up(queryRunner: QueryRunner): Promise<void> { - await queryRunner.query( - `ALTER TABLE "alcs"."notice_of_intent" ADD "legacy_id" text`, - ); - await queryRunner.query( - `COMMENT ON COLUMN "alcs"."notice_of_intent"."legacy_id" IS 'Notice of Intent Id that is applicable only to paper version applications from 70s - 80s'`, - ); - } - - public async down(queryRunner: QueryRunner): Promise<void> { - await queryRunner.query( - `COMMENT ON COLUMN "alcs"."notice_of_intent"."legacy_id" IS 'Notice of Intent Id that is applicable only to paper version applications from 70s - 80s'`, - ); - await queryRunner.query( - `ALTER TABLE "alcs"."notice_of_intent" DROP COLUMN "legacy_id"`, - ); - } - -} diff --git a/services/apps/alcs/src/providers/typeorm/1697668754905-migrations.ts b/services/apps/alcs/src/providers/typeorm/migrations/1697669020115-legacyid_noi.ts similarity index 89% rename from services/apps/alcs/src/providers/typeorm/1697668754905-migrations.ts rename to services/apps/alcs/src/providers/typeorm/migrations/1697669020115-legacyid_noi.ts index 8843f6940f..73d77b4042 100644 --- a/services/apps/alcs/src/providers/typeorm/1697668754905-migrations.ts +++ b/services/apps/alcs/src/providers/typeorm/migrations/1697669020115-legacyid_noi.ts @@ -1,19 +1,19 @@ import { MigrationInterface, QueryRunner } from "typeorm"; -export class migrations1697668754905 implements MigrationInterface { - name = 'migrations1697668754905' +export class legacyidNoi1697669020115 implements MigrationInterface { + name = 'legacyidNoi1697669020115' public async up(queryRunner: QueryRunner): Promise<void> { await queryRunner.query(`DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, ["VIEW","notice_of_intent_submission_search_view","alcs"]); await queryRunner.query(`DROP VIEW "alcs"."notice_of_intent_submission_search_view"`); await queryRunner.query(`DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, ["VIEW","application_submission_search_view","alcs"]); await queryRunner.query(`DROP VIEW "alcs"."application_submission_search_view"`); - await queryRunner.query(`ALTER TABLE "alcs"."notice_of_intent" DROP COLUMN "legacy_id"`); await queryRunner.query(`ALTER TABLE "alcs"."document" ALTER COLUMN "system" SET DEFAULT 'ALC'`); + await queryRunner.query(`COMMENT ON COLUMN "alcs"."notice_of_intent"."legacy_id" IS 'NOI Id that is applicable only to paper version applications from 70s - 80s'`); await queryRunner.query(`CREATE VIEW "alcs"."application_submission_search_view" AS SELECT "as2"."uuid" AS "uuid", "as2"."applicant" AS "applicant", "a"."uuid" AS "application_uuid", "applicationType"."audit_deleted_date_at" AS "applicationType_audit_deleted_date_at", "applicationType"."audit_created_at" AS "applicationType_audit_created_at", "applicationType"."audit_updated_at" AS "applicationType_audit_updated_at", "applicationType"."audit_created_by" AS "applicationType_audit_created_by", "applicationType"."audit_updated_by" AS "applicationType_audit_updated_by", "applicationType"."label" AS "applicationType_label", "applicationType"."code" AS "applicationType_code", "applicationType"."description" AS "applicationType_description", "applicationType"."short_label" AS "applicationType_short_label", "applicationType"."background_color" AS "applicationType_background_color", "applicationType"."text_color" AS "applicationType_text_color", "applicationType"."html_description" AS "applicationType_html_description", "applicationType"."portal_label" AS "applicationType_portal_label", "localGovernment"."name" AS "local_government_name", "as2"."file_number" AS "file_number", "as2"."local_government_uuid" AS "local_government_uuid", "as2"."type_code" AS "application_type_code", "as2"."is_draft" AS "is_draft", "a"."legacy_id" AS "legacy_id", "a"."date_submitted_to_alc" AS "date_submitted_to_alc", "a"."decision_date" AS "decision_date", "a"."region_code" AS "application_region_code", alcs.get_current_status_for_application_submission_by_uuid("as2"."uuid") AS "status" FROM "alcs"."application_submission" "as2" INNER JOIN "alcs"."application" "a" ON "a"."file_number" = "as2"."file_number" AND "a"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."application_type" "applicationType" ON "as2"."type_code" = "applicationType"."code" AND "applicationType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "as2"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL WHERE "as2"."audit_deleted_date_at" IS NULL`); await queryRunner.query(`INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, ["alcs","VIEW","application_submission_search_view","SELECT \"as2\".\"uuid\" AS \"uuid\", \"as2\".\"applicant\" AS \"applicant\", \"a\".\"uuid\" AS \"application_uuid\", \"applicationType\".\"audit_deleted_date_at\" AS \"applicationType_audit_deleted_date_at\", \"applicationType\".\"audit_created_at\" AS \"applicationType_audit_created_at\", \"applicationType\".\"audit_updated_at\" AS \"applicationType_audit_updated_at\", \"applicationType\".\"audit_created_by\" AS \"applicationType_audit_created_by\", \"applicationType\".\"audit_updated_by\" AS \"applicationType_audit_updated_by\", \"applicationType\".\"label\" AS \"applicationType_label\", \"applicationType\".\"code\" AS \"applicationType_code\", \"applicationType\".\"description\" AS \"applicationType_description\", \"applicationType\".\"short_label\" AS \"applicationType_short_label\", \"applicationType\".\"background_color\" AS \"applicationType_background_color\", \"applicationType\".\"text_color\" AS \"applicationType_text_color\", \"applicationType\".\"html_description\" AS \"applicationType_html_description\", \"applicationType\".\"portal_label\" AS \"applicationType_portal_label\", \"localGovernment\".\"name\" AS \"local_government_name\", \"as2\".\"file_number\" AS \"file_number\", \"as2\".\"local_government_uuid\" AS \"local_government_uuid\", \"as2\".\"type_code\" AS \"application_type_code\", \"as2\".\"is_draft\" AS \"is_draft\", \"a\".\"legacy_id\" AS \"legacy_id\", \"a\".\"date_submitted_to_alc\" AS \"date_submitted_to_alc\", \"a\".\"decision_date\" AS \"decision_date\", \"a\".\"region_code\" AS \"application_region_code\", alcs.get_current_status_for_application_submission_by_uuid(\"as2\".\"uuid\") AS \"status\" FROM \"alcs\".\"application_submission\" \"as2\" INNER JOIN \"alcs\".\"application\" \"a\" ON \"a\".\"file_number\" = \"as2\".\"file_number\" AND \"a\".\"audit_deleted_date_at\" IS NULL INNER JOIN \"alcs\".\"application_type\" \"applicationType\" ON \"as2\".\"type_code\" = \"applicationType\".\"code\" AND \"applicationType\".\"audit_deleted_date_at\" IS NULL LEFT JOIN \"alcs\".\"local_government\" \"localGovernment\" ON \"as2\".\"local_government_uuid\" = \"localGovernment\".\"uuid\" AND \"localGovernment\".\"audit_deleted_date_at\" IS NULL WHERE \"as2\".\"audit_deleted_date_at\" IS NULL"]); - await queryRunner.query(`CREATE VIEW "alcs"."notice_of_intent_submission_search_view" AS SELECT "nois"."uuid" AS "uuid", "nois"."applicant" AS "applicant", "noi"."uuid" AS "notice_of_intent_uuid", "noticeOfIntentType"."audit_deleted_date_at" AS "noticeOfIntentType_audit_deleted_date_at", "noticeOfIntentType"."audit_created_at" AS "noticeOfIntentType_audit_created_at", "noticeOfIntentType"."audit_updated_at" AS "noticeOfIntentType_audit_updated_at", "noticeOfIntentType"."audit_created_by" AS "noticeOfIntentType_audit_created_by", "noticeOfIntentType"."audit_updated_by" AS "noticeOfIntentType_audit_updated_by", "noticeOfIntentType"."label" AS "noticeOfIntentType_label", "noticeOfIntentType"."code" AS "noticeOfIntentType_code", "noticeOfIntentType"."description" AS "noticeOfIntentType_description", "noticeOfIntentType"."short_label" AS "noticeOfIntentType_short_label", "noticeOfIntentType"."background_color" AS "noticeOfIntentType_background_color", "noticeOfIntentType"."text_color" AS "noticeOfIntentType_text_color", "noticeOfIntentType"."html_description" AS "noticeOfIntentType_html_description", "noticeOfIntentType"."portal_label" AS "noticeOfIntentType_portal_label", "localGovernment"."name" AS "local_government_name", "nois"."file_number" AS "file_number", "nois"."local_government_uuid" AS "local_government_uuid", "nois"."type_code" AS "notice_of_intent_type_code", "nois"."is_draft" AS "is_draft", "noi"."date_submitted_to_alc" AS "date_submitted_to_alc", noi.legacy_id AS "legacy_id", "noi"."decision_date" AS "decision_date", "noi"."region_code" AS "notice_of_intent_region_code", alcs.get_current_status_for_notice_of_intent_submission_by_uuid("nois"."uuid") AS "status" FROM "alcs"."notice_of_intent_submission" "nois" INNER JOIN "alcs"."notice_of_intent" "noi" ON "noi"."file_number" = "nois"."file_number" AND "noi"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."notice_of_intent_type" "noticeOfIntentType" ON "nois"."type_code" = "noticeOfIntentType"."code" AND "noticeOfIntentType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "nois"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL WHERE "nois"."audit_deleted_date_at" IS NULL`); - await queryRunner.query(`INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, ["alcs","VIEW","notice_of_intent_submission_search_view","SELECT \"nois\".\"uuid\" AS \"uuid\", \"nois\".\"applicant\" AS \"applicant\", \"noi\".\"uuid\" AS \"notice_of_intent_uuid\", \"noticeOfIntentType\".\"audit_deleted_date_at\" AS \"noticeOfIntentType_audit_deleted_date_at\", \"noticeOfIntentType\".\"audit_created_at\" AS \"noticeOfIntentType_audit_created_at\", \"noticeOfIntentType\".\"audit_updated_at\" AS \"noticeOfIntentType_audit_updated_at\", \"noticeOfIntentType\".\"audit_created_by\" AS \"noticeOfIntentType_audit_created_by\", \"noticeOfIntentType\".\"audit_updated_by\" AS \"noticeOfIntentType_audit_updated_by\", \"noticeOfIntentType\".\"label\" AS \"noticeOfIntentType_label\", \"noticeOfIntentType\".\"code\" AS \"noticeOfIntentType_code\", \"noticeOfIntentType\".\"description\" AS \"noticeOfIntentType_description\", \"noticeOfIntentType\".\"short_label\" AS \"noticeOfIntentType_short_label\", \"noticeOfIntentType\".\"background_color\" AS \"noticeOfIntentType_background_color\", \"noticeOfIntentType\".\"text_color\" AS \"noticeOfIntentType_text_color\", \"noticeOfIntentType\".\"html_description\" AS \"noticeOfIntentType_html_description\", \"noticeOfIntentType\".\"portal_label\" AS \"noticeOfIntentType_portal_label\", \"localGovernment\".\"name\" AS \"local_government_name\", \"nois\".\"file_number\" AS \"file_number\", \"nois\".\"local_government_uuid\" AS \"local_government_uuid\", \"nois\".\"type_code\" AS \"notice_of_intent_type_code\", \"nois\".\"is_draft\" AS \"is_draft\", \"noi\".\"date_submitted_to_alc\" AS \"date_submitted_to_alc\", noi.legacy_id AS \"legacy_id\", \"noi\".\"decision_date\" AS \"decision_date\", \"noi\".\"region_code\" AS \"notice_of_intent_region_code\", alcs.get_current_status_for_notice_of_intent_submission_by_uuid(\"nois\".\"uuid\") AS \"status\" FROM \"alcs\".\"notice_of_intent_submission\" \"nois\" INNER JOIN \"alcs\".\"notice_of_intent\" \"noi\" ON \"noi\".\"file_number\" = \"nois\".\"file_number\" AND \"noi\".\"audit_deleted_date_at\" IS NULL INNER JOIN \"alcs\".\"notice_of_intent_type\" \"noticeOfIntentType\" ON \"nois\".\"type_code\" = \"noticeOfIntentType\".\"code\" AND \"noticeOfIntentType\".\"audit_deleted_date_at\" IS NULL LEFT JOIN \"alcs\".\"local_government\" \"localGovernment\" ON \"nois\".\"local_government_uuid\" = \"localGovernment\".\"uuid\" AND \"localGovernment\".\"audit_deleted_date_at\" IS NULL WHERE \"nois\".\"audit_deleted_date_at\" IS NULL"]); + await queryRunner.query(`CREATE VIEW "alcs"."notice_of_intent_submission_search_view" AS SELECT "nois"."uuid" AS "uuid", "nois"."applicant" AS "applicant", "noi"."uuid" AS "notice_of_intent_uuid", "noticeOfIntentType"."audit_deleted_date_at" AS "noticeOfIntentType_audit_deleted_date_at", "noticeOfIntentType"."audit_created_at" AS "noticeOfIntentType_audit_created_at", "noticeOfIntentType"."audit_updated_at" AS "noticeOfIntentType_audit_updated_at", "noticeOfIntentType"."audit_created_by" AS "noticeOfIntentType_audit_created_by", "noticeOfIntentType"."audit_updated_by" AS "noticeOfIntentType_audit_updated_by", "noticeOfIntentType"."label" AS "noticeOfIntentType_label", "noticeOfIntentType"."code" AS "noticeOfIntentType_code", "noticeOfIntentType"."description" AS "noticeOfIntentType_description", "noticeOfIntentType"."short_label" AS "noticeOfIntentType_short_label", "noticeOfIntentType"."background_color" AS "noticeOfIntentType_background_color", "noticeOfIntentType"."text_color" AS "noticeOfIntentType_text_color", "noticeOfIntentType"."html_description" AS "noticeOfIntentType_html_description", "noticeOfIntentType"."portal_label" AS "noticeOfIntentType_portal_label", "localGovernment"."name" AS "local_government_name", "nois"."file_number" AS "file_number", "nois"."local_government_uuid" AS "local_government_uuid", "nois"."type_code" AS "notice_of_intent_type_code", "nois"."is_draft" AS "is_draft", "noi"."date_submitted_to_alc" AS "date_submitted_to_alc", "noi"."legacy_id" AS "legacy_id", "noi"."decision_date" AS "decision_date", "noi"."region_code" AS "notice_of_intent_region_code", alcs.get_current_status_for_notice_of_intent_submission_by_uuid("nois"."uuid") AS "status" FROM "alcs"."notice_of_intent_submission" "nois" INNER JOIN "alcs"."notice_of_intent" "noi" ON "noi"."file_number" = "nois"."file_number" AND "noi"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."notice_of_intent_type" "noticeOfIntentType" ON "nois"."type_code" = "noticeOfIntentType"."code" AND "noticeOfIntentType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "nois"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL WHERE "nois"."audit_deleted_date_at" IS NULL`); + await queryRunner.query(`INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, ["alcs","VIEW","notice_of_intent_submission_search_view","SELECT \"nois\".\"uuid\" AS \"uuid\", \"nois\".\"applicant\" AS \"applicant\", \"noi\".\"uuid\" AS \"notice_of_intent_uuid\", \"noticeOfIntentType\".\"audit_deleted_date_at\" AS \"noticeOfIntentType_audit_deleted_date_at\", \"noticeOfIntentType\".\"audit_created_at\" AS \"noticeOfIntentType_audit_created_at\", \"noticeOfIntentType\".\"audit_updated_at\" AS \"noticeOfIntentType_audit_updated_at\", \"noticeOfIntentType\".\"audit_created_by\" AS \"noticeOfIntentType_audit_created_by\", \"noticeOfIntentType\".\"audit_updated_by\" AS \"noticeOfIntentType_audit_updated_by\", \"noticeOfIntentType\".\"label\" AS \"noticeOfIntentType_label\", \"noticeOfIntentType\".\"code\" AS \"noticeOfIntentType_code\", \"noticeOfIntentType\".\"description\" AS \"noticeOfIntentType_description\", \"noticeOfIntentType\".\"short_label\" AS \"noticeOfIntentType_short_label\", \"noticeOfIntentType\".\"background_color\" AS \"noticeOfIntentType_background_color\", \"noticeOfIntentType\".\"text_color\" AS \"noticeOfIntentType_text_color\", \"noticeOfIntentType\".\"html_description\" AS \"noticeOfIntentType_html_description\", \"noticeOfIntentType\".\"portal_label\" AS \"noticeOfIntentType_portal_label\", \"localGovernment\".\"name\" AS \"local_government_name\", \"nois\".\"file_number\" AS \"file_number\", \"nois\".\"local_government_uuid\" AS \"local_government_uuid\", \"nois\".\"type_code\" AS \"notice_of_intent_type_code\", \"nois\".\"is_draft\" AS \"is_draft\", \"noi\".\"date_submitted_to_alc\" AS \"date_submitted_to_alc\", \"noi\".\"legacy_id\" AS \"legacy_id\", \"noi\".\"decision_date\" AS \"decision_date\", \"noi\".\"region_code\" AS \"notice_of_intent_region_code\", alcs.get_current_status_for_notice_of_intent_submission_by_uuid(\"nois\".\"uuid\") AS \"status\" FROM \"alcs\".\"notice_of_intent_submission\" \"nois\" INNER JOIN \"alcs\".\"notice_of_intent\" \"noi\" ON \"noi\".\"file_number\" = \"nois\".\"file_number\" AND \"noi\".\"audit_deleted_date_at\" IS NULL INNER JOIN \"alcs\".\"notice_of_intent_type\" \"noticeOfIntentType\" ON \"nois\".\"type_code\" = \"noticeOfIntentType\".\"code\" AND \"noticeOfIntentType\".\"audit_deleted_date_at\" IS NULL LEFT JOIN \"alcs\".\"local_government\" \"localGovernment\" ON \"nois\".\"local_government_uuid\" = \"localGovernment\".\"uuid\" AND \"localGovernment\".\"audit_deleted_date_at\" IS NULL WHERE \"nois\".\"audit_deleted_date_at\" IS NULL"]); } public async down(queryRunner: QueryRunner): Promise<void> { @@ -21,8 +21,8 @@ export class migrations1697668754905 implements MigrationInterface { await queryRunner.query(`DROP VIEW "alcs"."notice_of_intent_submission_search_view"`); await queryRunner.query(`DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, ["VIEW","application_submission_search_view","alcs"]); await queryRunner.query(`DROP VIEW "alcs"."application_submission_search_view"`); + await queryRunner.query(`COMMENT ON COLUMN "alcs"."notice_of_intent"."legacy_id" IS 'Notice of Intent Id that is applicable only to paper version applications from 70s - 80s'`); await queryRunner.query(`ALTER TABLE "alcs"."document" ALTER COLUMN "system" SET DEFAULT 'ALCS'`); - await queryRunner.query(`ALTER TABLE "alcs"."notice_of_intent" ADD "legacy_id" text`); await queryRunner.query(`CREATE VIEW "alcs"."application_submission_search_view" AS SELECT "as2"."uuid" AS "uuid", "as2"."applicant" AS "applicant", "a"."uuid" AS "application_uuid", "applicationType"."audit_deleted_date_at" AS "applicationType_audit_deleted_date_at", "applicationType"."audit_created_at" AS "applicationType_audit_created_at", "applicationType"."audit_updated_at" AS "applicationType_audit_updated_at", "applicationType"."audit_created_by" AS "applicationType_audit_created_by", "applicationType"."audit_updated_by" AS "applicationType_audit_updated_by", "applicationType"."label" AS "applicationType_label", "applicationType"."code" AS "applicationType_code", "applicationType"."description" AS "applicationType_description", "applicationType"."short_label" AS "applicationType_short_label", "applicationType"."background_color" AS "applicationType_background_color", "applicationType"."text_color" AS "applicationType_text_color", "applicationType"."html_description" AS "applicationType_html_description", "applicationType"."portal_label" AS "applicationType_portal_label", "localGovernment"."name" AS "local_government_name", "as2"."file_number" AS "file_number", "as2"."local_government_uuid" AS "local_government_uuid", "as2"."type_code" AS "application_type_code", "as2"."is_draft" AS "is_draft", "a"."legacy_id" AS "legacy_id", "a"."date_submitted_to_alc" AS "date_submitted_to_alc", "a"."decision_date" AS "decision_date", "a"."region_code" AS "application_region_code", alcs.get_current_status_for_submission_by_uuid("as2"."uuid") AS "status" FROM "alcs"."application_submission" "as2" INNER JOIN "alcs"."application" "a" ON "a"."file_number" = "as2"."file_number" AND "a"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."application_type" "applicationType" ON "as2"."type_code" = "applicationType"."code" AND "applicationType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "as2"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL WHERE "as2"."audit_deleted_date_at" IS NULL`); await queryRunner.query(`INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, ["alcs","VIEW","application_submission_search_view","SELECT \"as2\".\"uuid\" AS \"uuid\", \"as2\".\"applicant\" AS \"applicant\", \"a\".\"uuid\" AS \"application_uuid\", \"applicationType\".\"audit_deleted_date_at\" AS \"applicationType_audit_deleted_date_at\", \"applicationType\".\"audit_created_at\" AS \"applicationType_audit_created_at\", \"applicationType\".\"audit_updated_at\" AS \"applicationType_audit_updated_at\", \"applicationType\".\"audit_created_by\" AS \"applicationType_audit_created_by\", \"applicationType\".\"audit_updated_by\" AS \"applicationType_audit_updated_by\", \"applicationType\".\"label\" AS \"applicationType_label\", \"applicationType\".\"code\" AS \"applicationType_code\", \"applicationType\".\"description\" AS \"applicationType_description\", \"applicationType\".\"short_label\" AS \"applicationType_short_label\", \"applicationType\".\"background_color\" AS \"applicationType_background_color\", \"applicationType\".\"text_color\" AS \"applicationType_text_color\", \"applicationType\".\"html_description\" AS \"applicationType_html_description\", \"applicationType\".\"portal_label\" AS \"applicationType_portal_label\", \"localGovernment\".\"name\" AS \"local_government_name\", \"as2\".\"file_number\" AS \"file_number\", \"as2\".\"local_government_uuid\" AS \"local_government_uuid\", \"as2\".\"type_code\" AS \"application_type_code\", \"as2\".\"is_draft\" AS \"is_draft\", \"a\".\"legacy_id\" AS \"legacy_id\", \"a\".\"date_submitted_to_alc\" AS \"date_submitted_to_alc\", \"a\".\"decision_date\" AS \"decision_date\", \"a\".\"region_code\" AS \"application_region_code\", alcs.get_current_status_for_submission_by_uuid(\"as2\".\"uuid\") AS \"status\" FROM \"alcs\".\"application_submission\" \"as2\" INNER JOIN \"alcs\".\"application\" \"a\" ON \"a\".\"file_number\" = \"as2\".\"file_number\" AND \"a\".\"audit_deleted_date_at\" IS NULL INNER JOIN \"alcs\".\"application_type\" \"applicationType\" ON \"as2\".\"type_code\" = \"applicationType\".\"code\" AND \"applicationType\".\"audit_deleted_date_at\" IS NULL LEFT JOIN \"alcs\".\"local_government\" \"localGovernment\" ON \"as2\".\"local_government_uuid\" = \"localGovernment\".\"uuid\" AND \"localGovernment\".\"audit_deleted_date_at\" IS NULL WHERE \"as2\".\"audit_deleted_date_at\" IS NULL"]); await queryRunner.query(`CREATE VIEW "alcs"."notice_of_intent_submission_search_view" AS SELECT "nois"."uuid" AS "uuid", "nois"."applicant" AS "applicant", "noi"."uuid" AS "notice_of_intent_uuid", "noticeOfIntentType"."audit_deleted_date_at" AS "noticeOfIntentType_audit_deleted_date_at", "noticeOfIntentType"."audit_created_at" AS "noticeOfIntentType_audit_created_at", "noticeOfIntentType"."audit_updated_at" AS "noticeOfIntentType_audit_updated_at", "noticeOfIntentType"."audit_created_by" AS "noticeOfIntentType_audit_created_by", "noticeOfIntentType"."audit_updated_by" AS "noticeOfIntentType_audit_updated_by", "noticeOfIntentType"."label" AS "noticeOfIntentType_label", "noticeOfIntentType"."code" AS "noticeOfIntentType_code", "noticeOfIntentType"."description" AS "noticeOfIntentType_description", "noticeOfIntentType"."short_label" AS "noticeOfIntentType_short_label", "noticeOfIntentType"."html_description" AS "noticeOfIntentType_html_description", "noticeOfIntentType"."portal_label" AS "noticeOfIntentType_portal_label", "localGovernment"."name" AS "local_government_name", "nois"."file_number" AS "file_number", "nois"."local_government_uuid" AS "local_government_uuid", "nois"."type_code" AS "notice_of_intent_type_code", "nois"."is_draft" AS "is_draft", "noi"."date_submitted_to_alc" AS "date_submitted_to_alc", "noi"."decision_date" AS "decision_date", "noi"."region_code" AS "notice_of_intent_region_code", alcs.get_current_status_for_notice_of_intent_submission_by_uuid("nois"."uuid") AS "status" FROM "alcs"."notice_of_intent_submission" "nois" INNER JOIN "alcs"."notice_of_intent" "noi" ON "noi"."file_number" = "nois"."file_number" AND "noi"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."notice_of_intent_type" "noticeOfIntentType" ON "nois"."type_code" = "noticeOfIntentType"."code" AND "noticeOfIntentType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "nois"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL WHERE "nois"."audit_deleted_date_at" IS NULL`); From ba252cf75d1457aa4777a178e3fbeb0fc78c998f Mon Sep 17 00:00:00 2001 From: Liam Stoddard <lstodd@protonmail.com> Date: Wed, 18 Oct 2023 16:00:03 -0700 Subject: [PATCH 524/954] imported correct functions, added comments & updated console log --- .../menu/commands/import_all.py | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/bin/migrate-oats-data/menu/commands/import_all.py b/bin/migrate-oats-data/menu/commands/import_all.py index 09898f918e..459ea7d7ab 100644 --- a/bin/migrate-oats-data/menu/commands/import_all.py +++ b/bin/migrate-oats-data/menu/commands/import_all.py @@ -19,6 +19,8 @@ from documents import ( process_application_documents, process_noi_documents, + process_documents_noi, + process_documents, ) @@ -38,18 +40,23 @@ def import_all(console, args): console.log("Init NOIs:") init_notice_of_intents(batch_size=import_batch_size) - # TODO Liam question: which process_documents_noi or process_noi_documents is the correct one to keep? - # console.log("Processing NOI specific documents:") - # process_documents_noi(batch_size=import_batch_size) + # OATS -> ALCS documents = process_documents & process_documents_noi. Must take place in order to have usable rows in ALCS documents + # ALCS documents -> application_documents/noi_documents = process_application_documents & process_noi_documents + console.log("Importing NOI specific OATS documents into ALCS:") + process_documents_noi(batch_size=import_batch_size) + # documents_noi brings noi labelled documents into ALCS documents - # console.log("Processing documents:") - # process_documents(batch_size=import_batch_size) + console.log("Importing OATS app_documents into ALCS:") + process_documents(batch_size=import_batch_size) + # documents brings application labelled documents into ALCS documents - console.log("Processing application documents:") + console.log("Processing ALCS application documents:") process_application_documents(batch_size=import_batch_size) + # process_application_documents takes the imported documents from process_documents - console.log("Processing NOI documents:") + console.log("Processing ALCS NOI documents:") process_noi_documents(batch_size=import_batch_size) + # process_noi_documents takes the imported documents from process_documents_noi console.log("Processing application prep:") process_alcs_application_prep_fields(batch_size=import_batch_size) From 84343c892f15f406d9272075b783d292e277fe3e Mon Sep 17 00:00:00 2001 From: Liam Stoddard <lstodd@protonmail.com> Date: Wed, 18 Oct 2023 16:07:35 -0700 Subject: [PATCH 525/954] renamed class --- .../data_insert/submap/soil_elements.py | 40 ++++++++++--------- 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/bin/migrate-oats-data/applications/submissions/data_insert/submap/soil_elements.py b/bin/migrate-oats-data/applications/submissions/data_insert/submap/soil_elements.py index 06ba256e08..e23af5fdd6 100644 --- a/bin/migrate-oats-data/applications/submissions/data_insert/submap/soil_elements.py +++ b/bin/migrate-oats-data/applications/submissions/data_insert/submap/soil_elements.py @@ -6,7 +6,7 @@ class SoilAction(Enum): ADD = "ADD" -class Soil: +class SoilProperties: ALR_ID = "alr_appl_component_id" AREA = "project_area" DESC = "material_desc" @@ -35,8 +35,10 @@ def create_soil_dict(soil_rows): soil_dict = dict() for row in soil_rows: - app_component_id = row[Soil.ALR_ID] - soil_dict.setdefault(app_component_id, {Soil.ALR_ID: row[Soil.ALR_ID]}) + app_component_id = row[SoilProperties.ALR_ID] + soil_dict.setdefault( + app_component_id, {SoilProperties.ALR_ID: row[SoilProperties.ALR_ID]} + ) if ( row["soil_change_code"] == SoilAction.RMV.value @@ -133,26 +135,28 @@ def add_soil_field(data): def dict_fill_insert(soil_dict, app_component_id, row): - soil_dict[app_component_id]["fill_type"] = row[Soil.DESC] - soil_dict[app_component_id]["fill_origin"] = row[Soil.ORIGIN_DESC] - soil_dict[app_component_id]["total_fill"] = row[Soil.VOLUME] - soil_dict[app_component_id]["max_fill_depth"] = row[Soil.DEPTH] - soil_dict[app_component_id]["fill_duration"] = row[Soil.DURATION] - soil_dict[app_component_id]["duration"] = row[Soil.DURATION] - soil_dict[app_component_id]["fill_area"] = row[Soil.AREA] + soil_dict[app_component_id]["fill_type"] = row[SoilProperties.DESC] + soil_dict[app_component_id]["fill_origin"] = row[SoilProperties.ORIGIN_DESC] + soil_dict[app_component_id]["total_fill"] = row[SoilProperties.VOLUME] + soil_dict[app_component_id]["max_fill_depth"] = row[SoilProperties.DEPTH] + soil_dict[app_component_id]["fill_duration"] = row[SoilProperties.DURATION] + soil_dict[app_component_id]["duration"] = row[SoilProperties.DURATION] + soil_dict[app_component_id]["fill_area"] = row[SoilProperties.AREA] soil_dict[app_component_id]["import_fill"] = True - soil_dict[app_component_id]["alternative_measures_desc"] = row[Soil.ALT_MEASURE] + soil_dict[app_component_id]["alternative_measures_desc"] = row[ + SoilProperties.ALT_MEASURE + ] soil_dict[app_component_id][SoilAction.ADD.name] = True return def dict_rmv_insert(soil_dict, app_component_id, row): - soil_dict[app_component_id]["remove_type"] = row[Soil.DESC] - soil_dict[app_component_id]["remove_origin"] = row[Soil.ORIGIN_DESC] - soil_dict[app_component_id]["max_remove_depth"] = row[Soil.DEPTH] - soil_dict[app_component_id]["total_remove"] = row[Soil.VOLUME] - soil_dict[app_component_id]["remove_duration"] = row[Soil.DURATION] - soil_dict[app_component_id]["duration"] = row[Soil.DURATION] - soil_dict[app_component_id]["remove_area"] = row[Soil.AREA] + soil_dict[app_component_id]["remove_type"] = row[SoilProperties.DESC] + soil_dict[app_component_id]["remove_origin"] = row[SoilProperties.ORIGIN_DESC] + soil_dict[app_component_id]["max_remove_depth"] = row[SoilProperties.DEPTH] + soil_dict[app_component_id]["total_remove"] = row[SoilProperties.VOLUME] + soil_dict[app_component_id]["remove_duration"] = row[SoilProperties.DURATION] + soil_dict[app_component_id]["duration"] = row[SoilProperties.DURATION] + soil_dict[app_component_id]["remove_area"] = row[SoilProperties.AREA] soil_dict[app_component_id][SoilAction.RMV.name] = True return From 2ae2e236a5005b2a8b26fe4a539ef383bf0d378f Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Wed, 18 Oct 2023 16:14:15 -0700 Subject: [PATCH 526/954] fixes --- ...id_noi.ts => 1697670803814-legacyid_noi.ts} | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) rename services/apps/alcs/src/providers/typeorm/migrations/{1697669020115-legacyid_noi.ts => 1697670803814-legacyid_noi.ts} (98%) diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1697669020115-legacyid_noi.ts b/services/apps/alcs/src/providers/typeorm/migrations/1697670803814-legacyid_noi.ts similarity index 98% rename from services/apps/alcs/src/providers/typeorm/migrations/1697669020115-legacyid_noi.ts rename to services/apps/alcs/src/providers/typeorm/migrations/1697670803814-legacyid_noi.ts index 73d77b4042..77e310a260 100644 --- a/services/apps/alcs/src/providers/typeorm/migrations/1697669020115-legacyid_noi.ts +++ b/services/apps/alcs/src/providers/typeorm/migrations/1697670803814-legacyid_noi.ts @@ -1,28 +1,30 @@ import { MigrationInterface, QueryRunner } from "typeorm"; -export class legacyidNoi1697669020115 implements MigrationInterface { - name = 'legacyidNoi1697669020115' +export class legacyidNoi1697670803814 implements MigrationInterface { + name = 'legacyidNoi1697670803814' public async up(queryRunner: QueryRunner): Promise<void> { await queryRunner.query(`DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, ["VIEW","notice_of_intent_submission_search_view","alcs"]); await queryRunner.query(`DROP VIEW "alcs"."notice_of_intent_submission_search_view"`); await queryRunner.query(`DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, ["VIEW","application_submission_search_view","alcs"]); await queryRunner.query(`DROP VIEW "alcs"."application_submission_search_view"`); - await queryRunner.query(`ALTER TABLE "alcs"."document" ALTER COLUMN "system" SET DEFAULT 'ALC'`); + await queryRunner.query(`ALTER TABLE "alcs"."notice_of_intent" ADD "legacy_id" text`); await queryRunner.query(`COMMENT ON COLUMN "alcs"."notice_of_intent"."legacy_id" IS 'NOI Id that is applicable only to paper version applications from 70s - 80s'`); - await queryRunner.query(`CREATE VIEW "alcs"."application_submission_search_view" AS SELECT "as2"."uuid" AS "uuid", "as2"."applicant" AS "applicant", "a"."uuid" AS "application_uuid", "applicationType"."audit_deleted_date_at" AS "applicationType_audit_deleted_date_at", "applicationType"."audit_created_at" AS "applicationType_audit_created_at", "applicationType"."audit_updated_at" AS "applicationType_audit_updated_at", "applicationType"."audit_created_by" AS "applicationType_audit_created_by", "applicationType"."audit_updated_by" AS "applicationType_audit_updated_by", "applicationType"."label" AS "applicationType_label", "applicationType"."code" AS "applicationType_code", "applicationType"."description" AS "applicationType_description", "applicationType"."short_label" AS "applicationType_short_label", "applicationType"."background_color" AS "applicationType_background_color", "applicationType"."text_color" AS "applicationType_text_color", "applicationType"."html_description" AS "applicationType_html_description", "applicationType"."portal_label" AS "applicationType_portal_label", "localGovernment"."name" AS "local_government_name", "as2"."file_number" AS "file_number", "as2"."local_government_uuid" AS "local_government_uuid", "as2"."type_code" AS "application_type_code", "as2"."is_draft" AS "is_draft", "a"."legacy_id" AS "legacy_id", "a"."date_submitted_to_alc" AS "date_submitted_to_alc", "a"."decision_date" AS "decision_date", "a"."region_code" AS "application_region_code", alcs.get_current_status_for_application_submission_by_uuid("as2"."uuid") AS "status" FROM "alcs"."application_submission" "as2" INNER JOIN "alcs"."application" "a" ON "a"."file_number" = "as2"."file_number" AND "a"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."application_type" "applicationType" ON "as2"."type_code" = "applicationType"."code" AND "applicationType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "as2"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL WHERE "as2"."audit_deleted_date_at" IS NULL`); - await queryRunner.query(`INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, ["alcs","VIEW","application_submission_search_view","SELECT \"as2\".\"uuid\" AS \"uuid\", \"as2\".\"applicant\" AS \"applicant\", \"a\".\"uuid\" AS \"application_uuid\", \"applicationType\".\"audit_deleted_date_at\" AS \"applicationType_audit_deleted_date_at\", \"applicationType\".\"audit_created_at\" AS \"applicationType_audit_created_at\", \"applicationType\".\"audit_updated_at\" AS \"applicationType_audit_updated_at\", \"applicationType\".\"audit_created_by\" AS \"applicationType_audit_created_by\", \"applicationType\".\"audit_updated_by\" AS \"applicationType_audit_updated_by\", \"applicationType\".\"label\" AS \"applicationType_label\", \"applicationType\".\"code\" AS \"applicationType_code\", \"applicationType\".\"description\" AS \"applicationType_description\", \"applicationType\".\"short_label\" AS \"applicationType_short_label\", \"applicationType\".\"background_color\" AS \"applicationType_background_color\", \"applicationType\".\"text_color\" AS \"applicationType_text_color\", \"applicationType\".\"html_description\" AS \"applicationType_html_description\", \"applicationType\".\"portal_label\" AS \"applicationType_portal_label\", \"localGovernment\".\"name\" AS \"local_government_name\", \"as2\".\"file_number\" AS \"file_number\", \"as2\".\"local_government_uuid\" AS \"local_government_uuid\", \"as2\".\"type_code\" AS \"application_type_code\", \"as2\".\"is_draft\" AS \"is_draft\", \"a\".\"legacy_id\" AS \"legacy_id\", \"a\".\"date_submitted_to_alc\" AS \"date_submitted_to_alc\", \"a\".\"decision_date\" AS \"decision_date\", \"a\".\"region_code\" AS \"application_region_code\", alcs.get_current_status_for_application_submission_by_uuid(\"as2\".\"uuid\") AS \"status\" FROM \"alcs\".\"application_submission\" \"as2\" INNER JOIN \"alcs\".\"application\" \"a\" ON \"a\".\"file_number\" = \"as2\".\"file_number\" AND \"a\".\"audit_deleted_date_at\" IS NULL INNER JOIN \"alcs\".\"application_type\" \"applicationType\" ON \"as2\".\"type_code\" = \"applicationType\".\"code\" AND \"applicationType\".\"audit_deleted_date_at\" IS NULL LEFT JOIN \"alcs\".\"local_government\" \"localGovernment\" ON \"as2\".\"local_government_uuid\" = \"localGovernment\".\"uuid\" AND \"localGovernment\".\"audit_deleted_date_at\" IS NULL WHERE \"as2\".\"audit_deleted_date_at\" IS NULL"]); + await queryRunner.query(`ALTER TABLE "alcs"."document" ALTER COLUMN "system" SET DEFAULT 'ALC'`); await queryRunner.query(`CREATE VIEW "alcs"."notice_of_intent_submission_search_view" AS SELECT "nois"."uuid" AS "uuid", "nois"."applicant" AS "applicant", "noi"."uuid" AS "notice_of_intent_uuid", "noticeOfIntentType"."audit_deleted_date_at" AS "noticeOfIntentType_audit_deleted_date_at", "noticeOfIntentType"."audit_created_at" AS "noticeOfIntentType_audit_created_at", "noticeOfIntentType"."audit_updated_at" AS "noticeOfIntentType_audit_updated_at", "noticeOfIntentType"."audit_created_by" AS "noticeOfIntentType_audit_created_by", "noticeOfIntentType"."audit_updated_by" AS "noticeOfIntentType_audit_updated_by", "noticeOfIntentType"."label" AS "noticeOfIntentType_label", "noticeOfIntentType"."code" AS "noticeOfIntentType_code", "noticeOfIntentType"."description" AS "noticeOfIntentType_description", "noticeOfIntentType"."short_label" AS "noticeOfIntentType_short_label", "noticeOfIntentType"."background_color" AS "noticeOfIntentType_background_color", "noticeOfIntentType"."text_color" AS "noticeOfIntentType_text_color", "noticeOfIntentType"."html_description" AS "noticeOfIntentType_html_description", "noticeOfIntentType"."portal_label" AS "noticeOfIntentType_portal_label", "localGovernment"."name" AS "local_government_name", "nois"."file_number" AS "file_number", "nois"."local_government_uuid" AS "local_government_uuid", "nois"."type_code" AS "notice_of_intent_type_code", "nois"."is_draft" AS "is_draft", "noi"."date_submitted_to_alc" AS "date_submitted_to_alc", "noi"."legacy_id" AS "legacy_id", "noi"."decision_date" AS "decision_date", "noi"."region_code" AS "notice_of_intent_region_code", alcs.get_current_status_for_notice_of_intent_submission_by_uuid("nois"."uuid") AS "status" FROM "alcs"."notice_of_intent_submission" "nois" INNER JOIN "alcs"."notice_of_intent" "noi" ON "noi"."file_number" = "nois"."file_number" AND "noi"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."notice_of_intent_type" "noticeOfIntentType" ON "nois"."type_code" = "noticeOfIntentType"."code" AND "noticeOfIntentType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "nois"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL WHERE "nois"."audit_deleted_date_at" IS NULL`); await queryRunner.query(`INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, ["alcs","VIEW","notice_of_intent_submission_search_view","SELECT \"nois\".\"uuid\" AS \"uuid\", \"nois\".\"applicant\" AS \"applicant\", \"noi\".\"uuid\" AS \"notice_of_intent_uuid\", \"noticeOfIntentType\".\"audit_deleted_date_at\" AS \"noticeOfIntentType_audit_deleted_date_at\", \"noticeOfIntentType\".\"audit_created_at\" AS \"noticeOfIntentType_audit_created_at\", \"noticeOfIntentType\".\"audit_updated_at\" AS \"noticeOfIntentType_audit_updated_at\", \"noticeOfIntentType\".\"audit_created_by\" AS \"noticeOfIntentType_audit_created_by\", \"noticeOfIntentType\".\"audit_updated_by\" AS \"noticeOfIntentType_audit_updated_by\", \"noticeOfIntentType\".\"label\" AS \"noticeOfIntentType_label\", \"noticeOfIntentType\".\"code\" AS \"noticeOfIntentType_code\", \"noticeOfIntentType\".\"description\" AS \"noticeOfIntentType_description\", \"noticeOfIntentType\".\"short_label\" AS \"noticeOfIntentType_short_label\", \"noticeOfIntentType\".\"background_color\" AS \"noticeOfIntentType_background_color\", \"noticeOfIntentType\".\"text_color\" AS \"noticeOfIntentType_text_color\", \"noticeOfIntentType\".\"html_description\" AS \"noticeOfIntentType_html_description\", \"noticeOfIntentType\".\"portal_label\" AS \"noticeOfIntentType_portal_label\", \"localGovernment\".\"name\" AS \"local_government_name\", \"nois\".\"file_number\" AS \"file_number\", \"nois\".\"local_government_uuid\" AS \"local_government_uuid\", \"nois\".\"type_code\" AS \"notice_of_intent_type_code\", \"nois\".\"is_draft\" AS \"is_draft\", \"noi\".\"date_submitted_to_alc\" AS \"date_submitted_to_alc\", \"noi\".\"legacy_id\" AS \"legacy_id\", \"noi\".\"decision_date\" AS \"decision_date\", \"noi\".\"region_code\" AS \"notice_of_intent_region_code\", alcs.get_current_status_for_notice_of_intent_submission_by_uuid(\"nois\".\"uuid\") AS \"status\" FROM \"alcs\".\"notice_of_intent_submission\" \"nois\" INNER JOIN \"alcs\".\"notice_of_intent\" \"noi\" ON \"noi\".\"file_number\" = \"nois\".\"file_number\" AND \"noi\".\"audit_deleted_date_at\" IS NULL INNER JOIN \"alcs\".\"notice_of_intent_type\" \"noticeOfIntentType\" ON \"nois\".\"type_code\" = \"noticeOfIntentType\".\"code\" AND \"noticeOfIntentType\".\"audit_deleted_date_at\" IS NULL LEFT JOIN \"alcs\".\"local_government\" \"localGovernment\" ON \"nois\".\"local_government_uuid\" = \"localGovernment\".\"uuid\" AND \"localGovernment\".\"audit_deleted_date_at\" IS NULL WHERE \"nois\".\"audit_deleted_date_at\" IS NULL"]); + await queryRunner.query(`CREATE VIEW "alcs"."application_submission_search_view" AS SELECT "as2"."uuid" AS "uuid", "as2"."applicant" AS "applicant", "a"."uuid" AS "application_uuid", "applicationType"."audit_deleted_date_at" AS "applicationType_audit_deleted_date_at", "applicationType"."audit_created_at" AS "applicationType_audit_created_at", "applicationType"."audit_updated_at" AS "applicationType_audit_updated_at", "applicationType"."audit_created_by" AS "applicationType_audit_created_by", "applicationType"."audit_updated_by" AS "applicationType_audit_updated_by", "applicationType"."label" AS "applicationType_label", "applicationType"."code" AS "applicationType_code", "applicationType"."description" AS "applicationType_description", "applicationType"."short_label" AS "applicationType_short_label", "applicationType"."background_color" AS "applicationType_background_color", "applicationType"."text_color" AS "applicationType_text_color", "applicationType"."html_description" AS "applicationType_html_description", "applicationType"."portal_label" AS "applicationType_portal_label", "localGovernment"."name" AS "local_government_name", "as2"."file_number" AS "file_number", "as2"."local_government_uuid" AS "local_government_uuid", "as2"."type_code" AS "application_type_code", "as2"."is_draft" AS "is_draft", "a"."legacy_id" AS "legacy_id", "a"."date_submitted_to_alc" AS "date_submitted_to_alc", "a"."decision_date" AS "decision_date", "a"."region_code" AS "application_region_code", alcs.get_current_status_for_application_submission_by_uuid("as2"."uuid") AS "status" FROM "alcs"."application_submission" "as2" INNER JOIN "alcs"."application" "a" ON "a"."file_number" = "as2"."file_number" AND "a"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."application_type" "applicationType" ON "as2"."type_code" = "applicationType"."code" AND "applicationType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "as2"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL WHERE "as2"."audit_deleted_date_at" IS NULL`); + await queryRunner.query(`INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, ["alcs","VIEW","application_submission_search_view","SELECT \"as2\".\"uuid\" AS \"uuid\", \"as2\".\"applicant\" AS \"applicant\", \"a\".\"uuid\" AS \"application_uuid\", \"applicationType\".\"audit_deleted_date_at\" AS \"applicationType_audit_deleted_date_at\", \"applicationType\".\"audit_created_at\" AS \"applicationType_audit_created_at\", \"applicationType\".\"audit_updated_at\" AS \"applicationType_audit_updated_at\", \"applicationType\".\"audit_created_by\" AS \"applicationType_audit_created_by\", \"applicationType\".\"audit_updated_by\" AS \"applicationType_audit_updated_by\", \"applicationType\".\"label\" AS \"applicationType_label\", \"applicationType\".\"code\" AS \"applicationType_code\", \"applicationType\".\"description\" AS \"applicationType_description\", \"applicationType\".\"short_label\" AS \"applicationType_short_label\", \"applicationType\".\"background_color\" AS \"applicationType_background_color\", \"applicationType\".\"text_color\" AS \"applicationType_text_color\", \"applicationType\".\"html_description\" AS \"applicationType_html_description\", \"applicationType\".\"portal_label\" AS \"applicationType_portal_label\", \"localGovernment\".\"name\" AS \"local_government_name\", \"as2\".\"file_number\" AS \"file_number\", \"as2\".\"local_government_uuid\" AS \"local_government_uuid\", \"as2\".\"type_code\" AS \"application_type_code\", \"as2\".\"is_draft\" AS \"is_draft\", \"a\".\"legacy_id\" AS \"legacy_id\", \"a\".\"date_submitted_to_alc\" AS \"date_submitted_to_alc\", \"a\".\"decision_date\" AS \"decision_date\", \"a\".\"region_code\" AS \"application_region_code\", alcs.get_current_status_for_application_submission_by_uuid(\"as2\".\"uuid\") AS \"status\" FROM \"alcs\".\"application_submission\" \"as2\" INNER JOIN \"alcs\".\"application\" \"a\" ON \"a\".\"file_number\" = \"as2\".\"file_number\" AND \"a\".\"audit_deleted_date_at\" IS NULL INNER JOIN \"alcs\".\"application_type\" \"applicationType\" ON \"as2\".\"type_code\" = \"applicationType\".\"code\" AND \"applicationType\".\"audit_deleted_date_at\" IS NULL LEFT JOIN \"alcs\".\"local_government\" \"localGovernment\" ON \"as2\".\"local_government_uuid\" = \"localGovernment\".\"uuid\" AND \"localGovernment\".\"audit_deleted_date_at\" IS NULL WHERE \"as2\".\"audit_deleted_date_at\" IS NULL"]); } public async down(queryRunner: QueryRunner): Promise<void> { - await queryRunner.query(`DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, ["VIEW","notice_of_intent_submission_search_view","alcs"]); - await queryRunner.query(`DROP VIEW "alcs"."notice_of_intent_submission_search_view"`); await queryRunner.query(`DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, ["VIEW","application_submission_search_view","alcs"]); await queryRunner.query(`DROP VIEW "alcs"."application_submission_search_view"`); - await queryRunner.query(`COMMENT ON COLUMN "alcs"."notice_of_intent"."legacy_id" IS 'Notice of Intent Id that is applicable only to paper version applications from 70s - 80s'`); + await queryRunner.query(`DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, ["VIEW","notice_of_intent_submission_search_view","alcs"]); + await queryRunner.query(`DROP VIEW "alcs"."notice_of_intent_submission_search_view"`); await queryRunner.query(`ALTER TABLE "alcs"."document" ALTER COLUMN "system" SET DEFAULT 'ALCS'`); + await queryRunner.query(`COMMENT ON COLUMN "alcs"."notice_of_intent"."legacy_id" IS 'NOI Id that is applicable only to paper version applications from 70s - 80s'`); + await queryRunner.query(`ALTER TABLE "alcs"."notice_of_intent" DROP COLUMN "legacy_id"`); await queryRunner.query(`CREATE VIEW "alcs"."application_submission_search_view" AS SELECT "as2"."uuid" AS "uuid", "as2"."applicant" AS "applicant", "a"."uuid" AS "application_uuid", "applicationType"."audit_deleted_date_at" AS "applicationType_audit_deleted_date_at", "applicationType"."audit_created_at" AS "applicationType_audit_created_at", "applicationType"."audit_updated_at" AS "applicationType_audit_updated_at", "applicationType"."audit_created_by" AS "applicationType_audit_created_by", "applicationType"."audit_updated_by" AS "applicationType_audit_updated_by", "applicationType"."label" AS "applicationType_label", "applicationType"."code" AS "applicationType_code", "applicationType"."description" AS "applicationType_description", "applicationType"."short_label" AS "applicationType_short_label", "applicationType"."background_color" AS "applicationType_background_color", "applicationType"."text_color" AS "applicationType_text_color", "applicationType"."html_description" AS "applicationType_html_description", "applicationType"."portal_label" AS "applicationType_portal_label", "localGovernment"."name" AS "local_government_name", "as2"."file_number" AS "file_number", "as2"."local_government_uuid" AS "local_government_uuid", "as2"."type_code" AS "application_type_code", "as2"."is_draft" AS "is_draft", "a"."legacy_id" AS "legacy_id", "a"."date_submitted_to_alc" AS "date_submitted_to_alc", "a"."decision_date" AS "decision_date", "a"."region_code" AS "application_region_code", alcs.get_current_status_for_submission_by_uuid("as2"."uuid") AS "status" FROM "alcs"."application_submission" "as2" INNER JOIN "alcs"."application" "a" ON "a"."file_number" = "as2"."file_number" AND "a"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."application_type" "applicationType" ON "as2"."type_code" = "applicationType"."code" AND "applicationType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "as2"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL WHERE "as2"."audit_deleted_date_at" IS NULL`); await queryRunner.query(`INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, ["alcs","VIEW","application_submission_search_view","SELECT \"as2\".\"uuid\" AS \"uuid\", \"as2\".\"applicant\" AS \"applicant\", \"a\".\"uuid\" AS \"application_uuid\", \"applicationType\".\"audit_deleted_date_at\" AS \"applicationType_audit_deleted_date_at\", \"applicationType\".\"audit_created_at\" AS \"applicationType_audit_created_at\", \"applicationType\".\"audit_updated_at\" AS \"applicationType_audit_updated_at\", \"applicationType\".\"audit_created_by\" AS \"applicationType_audit_created_by\", \"applicationType\".\"audit_updated_by\" AS \"applicationType_audit_updated_by\", \"applicationType\".\"label\" AS \"applicationType_label\", \"applicationType\".\"code\" AS \"applicationType_code\", \"applicationType\".\"description\" AS \"applicationType_description\", \"applicationType\".\"short_label\" AS \"applicationType_short_label\", \"applicationType\".\"background_color\" AS \"applicationType_background_color\", \"applicationType\".\"text_color\" AS \"applicationType_text_color\", \"applicationType\".\"html_description\" AS \"applicationType_html_description\", \"applicationType\".\"portal_label\" AS \"applicationType_portal_label\", \"localGovernment\".\"name\" AS \"local_government_name\", \"as2\".\"file_number\" AS \"file_number\", \"as2\".\"local_government_uuid\" AS \"local_government_uuid\", \"as2\".\"type_code\" AS \"application_type_code\", \"as2\".\"is_draft\" AS \"is_draft\", \"a\".\"legacy_id\" AS \"legacy_id\", \"a\".\"date_submitted_to_alc\" AS \"date_submitted_to_alc\", \"a\".\"decision_date\" AS \"decision_date\", \"a\".\"region_code\" AS \"application_region_code\", alcs.get_current_status_for_submission_by_uuid(\"as2\".\"uuid\") AS \"status\" FROM \"alcs\".\"application_submission\" \"as2\" INNER JOIN \"alcs\".\"application\" \"a\" ON \"a\".\"file_number\" = \"as2\".\"file_number\" AND \"a\".\"audit_deleted_date_at\" IS NULL INNER JOIN \"alcs\".\"application_type\" \"applicationType\" ON \"as2\".\"type_code\" = \"applicationType\".\"code\" AND \"applicationType\".\"audit_deleted_date_at\" IS NULL LEFT JOIN \"alcs\".\"local_government\" \"localGovernment\" ON \"as2\".\"local_government_uuid\" = \"localGovernment\".\"uuid\" AND \"localGovernment\".\"audit_deleted_date_at\" IS NULL WHERE \"as2\".\"audit_deleted_date_at\" IS NULL"]); await queryRunner.query(`CREATE VIEW "alcs"."notice_of_intent_submission_search_view" AS SELECT "nois"."uuid" AS "uuid", "nois"."applicant" AS "applicant", "noi"."uuid" AS "notice_of_intent_uuid", "noticeOfIntentType"."audit_deleted_date_at" AS "noticeOfIntentType_audit_deleted_date_at", "noticeOfIntentType"."audit_created_at" AS "noticeOfIntentType_audit_created_at", "noticeOfIntentType"."audit_updated_at" AS "noticeOfIntentType_audit_updated_at", "noticeOfIntentType"."audit_created_by" AS "noticeOfIntentType_audit_created_by", "noticeOfIntentType"."audit_updated_by" AS "noticeOfIntentType_audit_updated_by", "noticeOfIntentType"."label" AS "noticeOfIntentType_label", "noticeOfIntentType"."code" AS "noticeOfIntentType_code", "noticeOfIntentType"."description" AS "noticeOfIntentType_description", "noticeOfIntentType"."short_label" AS "noticeOfIntentType_short_label", "noticeOfIntentType"."html_description" AS "noticeOfIntentType_html_description", "noticeOfIntentType"."portal_label" AS "noticeOfIntentType_portal_label", "localGovernment"."name" AS "local_government_name", "nois"."file_number" AS "file_number", "nois"."local_government_uuid" AS "local_government_uuid", "nois"."type_code" AS "notice_of_intent_type_code", "nois"."is_draft" AS "is_draft", "noi"."date_submitted_to_alc" AS "date_submitted_to_alc", "noi"."decision_date" AS "decision_date", "noi"."region_code" AS "notice_of_intent_region_code", alcs.get_current_status_for_notice_of_intent_submission_by_uuid("nois"."uuid") AS "status" FROM "alcs"."notice_of_intent_submission" "nois" INNER JOIN "alcs"."notice_of_intent" "noi" ON "noi"."file_number" = "nois"."file_number" AND "noi"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."notice_of_intent_type" "noticeOfIntentType" ON "nois"."type_code" = "noticeOfIntentType"."code" AND "noticeOfIntentType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "nois"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL WHERE "nois"."audit_deleted_date_at" IS NULL`); From 8cdb196191d77727fffcccf6f3ba8ec63aa226d2 Mon Sep 17 00:00:00 2001 From: Liam Stoddard <lstodd@protonmail.com> Date: Wed, 18 Oct 2023 16:30:39 -0700 Subject: [PATCH 527/954] changed comment order --- bin/migrate-oats-data/menu/commands/import_all.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/bin/migrate-oats-data/menu/commands/import_all.py b/bin/migrate-oats-data/menu/commands/import_all.py index 459ea7d7ab..4ac9d89257 100644 --- a/bin/migrate-oats-data/menu/commands/import_all.py +++ b/bin/migrate-oats-data/menu/commands/import_all.py @@ -42,21 +42,22 @@ def import_all(console, args): # OATS -> ALCS documents = process_documents & process_documents_noi. Must take place in order to have usable rows in ALCS documents # ALCS documents -> application_documents/noi_documents = process_application_documents & process_noi_documents + + # documents_noi brings noi labelled documents into ALCS documents console.log("Importing NOI specific OATS documents into ALCS:") process_documents_noi(batch_size=import_batch_size) - # documents_noi brings noi labelled documents into ALCS documents + # documents brings application labelled documents into ALCS documents console.log("Importing OATS app_documents into ALCS:") process_documents(batch_size=import_batch_size) - # documents brings application labelled documents into ALCS documents + # process_application_documents takes the imported documents from process_documents console.log("Processing ALCS application documents:") process_application_documents(batch_size=import_batch_size) - # process_application_documents takes the imported documents from process_documents + # process_noi_documents takes the imported documents from process_documents_noi console.log("Processing ALCS NOI documents:") process_noi_documents(batch_size=import_batch_size) - # process_noi_documents takes the imported documents from process_documents_noi console.log("Processing application prep:") process_alcs_application_prep_fields(batch_size=import_batch_size) From 6c7ed530e7cb14175bcd23029608870b34ff3749 Mon Sep 17 00:00:00 2001 From: Liam Stoddard <lstodd@protonmail.com> Date: Wed, 18 Oct 2023 17:23:40 -0700 Subject: [PATCH 528/954] renamed hard to understand functions --- .../alcs_documents_to_app_documents.py | 2 +- .../alcs_documents_to_noi_documents.py | 2 +- .../oats_documents_to_alcs_documents_app.py | 2 +- .../oats_documents_to_alcs_documents_noi.py | 14 +++++++---- .../menu/commands/documents.py | 24 +++++++++++-------- .../menu/commands/import_all.py | 23 +++++++----------- 6 files changed, 34 insertions(+), 33 deletions(-) diff --git a/bin/migrate-oats-data/documents/alcs_documents_to_app_documents.py b/bin/migrate-oats-data/documents/alcs_documents_to_app_documents.py index ead947e06b..127f7791ce 100644 --- a/bin/migrate-oats-data/documents/alcs_documents_to_app_documents.py +++ b/bin/migrate-oats-data/documents/alcs_documents_to_app_documents.py @@ -32,7 +32,7 @@ def compile_document_insert_query(number_of_rows_to_insert): @inject_conn_pool -def process_application_documents(conn=None, batch_size=10000): +def link_alcs_docs_to_app_docs(conn=None, batch_size=10000): """ function uses a decorator pattern @inject_conn_pool to inject a database connection pool to the function. It fetches the total count of documents and prints it to the console. Then, it fetches the documents to insert in batches using document IDs, constructs an insert query, and processes them. """ diff --git a/bin/migrate-oats-data/documents/alcs_documents_to_noi_documents.py b/bin/migrate-oats-data/documents/alcs_documents_to_noi_documents.py index 897402b58e..55f777969b 100644 --- a/bin/migrate-oats-data/documents/alcs_documents_to_noi_documents.py +++ b/bin/migrate-oats-data/documents/alcs_documents_to_noi_documents.py @@ -32,7 +32,7 @@ def compile_document_insert_query(number_of_rows_to_insert): @inject_conn_pool -def process_noi_documents(conn=None, batch_size=10000): +def link_alcs_docs_to_noi_docs(conn=None, batch_size=10000): """ function uses a decorator pattern @inject_conn_pool to inject a database connection pool to the function. It fetches the total count of documents and prints it to the console. Then, it fetches the documents to insert in batches using document IDs, constructs an insert query, and processes them. """ diff --git a/bin/migrate-oats-data/documents/oats_documents_to_alcs_documents_app.py b/bin/migrate-oats-data/documents/oats_documents_to_alcs_documents_app.py index e953561823..585f8804c3 100644 --- a/bin/migrate-oats-data/documents/oats_documents_to_alcs_documents_app.py +++ b/bin/migrate-oats-data/documents/oats_documents_to_alcs_documents_app.py @@ -31,7 +31,7 @@ def compile_document_insert_query(number_of_rows_to_insert): @inject_conn_pool -def process_documents(conn=None, batch_size=10000): +def import_oats_app_documents(conn=None, batch_size=10000): """ function uses a decorator pattern @inject_conn_pool to inject a database connection pool to the function. It fetches the total count of documents and prints it to the console. Then, it fetches the documents to insert in batches using document IDs, constructs an insert query, and processes them. """ diff --git a/bin/migrate-oats-data/documents/oats_documents_to_alcs_documents_noi.py b/bin/migrate-oats-data/documents/oats_documents_to_alcs_documents_noi.py index 294538da15..f3bc36088e 100644 --- a/bin/migrate-oats-data/documents/oats_documents_to_alcs_documents_noi.py +++ b/bin/migrate-oats-data/documents/oats_documents_to_alcs_documents_noi.py @@ -31,13 +31,15 @@ def compile_document_insert_query(number_of_rows_to_insert): @inject_conn_pool -def process_documents_noi(conn=None, batch_size=10000): +def import_oats_noi_documents(conn=None, batch_size=10000): """ function uses a decorator pattern @inject_conn_pool to inject a database connection pool to the function. It fetches the total count of documents and prints it to the console. Then, it fetches the documents to insert in batches using document IDs, constructs an insert query, and processes them. """ with conn.cursor() as cursor: with open( - "sql/documents_noi/oats_documents_to_alcs_documents_noi_total_count.sql", "r", encoding="utf-8" + "sql/documents_noi/oats_documents_to_alcs_documents_noi_total_count.sql", + "r", + encoding="utf-8", ) as sql_file: count_query = sql_file.read() cursor.execute(count_query) @@ -48,7 +50,11 @@ def process_documents_noi(conn=None, batch_size=10000): successful_inserts_count = 0 last_document_id = 0 - with open("sql/documents_noi/oats_documents_to_alcs_documents_noi.sql", "r", encoding="utf-8") as sql_file: + with open( + "sql/documents_noi/oats_documents_to_alcs_documents_noi.sql", + "r", + encoding="utf-8", + ) as sql_file: documents_to_insert_sql = sql_file.read() while True: cursor.execute( @@ -82,5 +88,3 @@ def process_documents_noi(conn=None, batch_size=10000): print("Total amount of successful inserts:", successful_inserts_count) print("Total amount of failed inserts:", failed_inserts) - - diff --git a/bin/migrate-oats-data/menu/commands/documents.py b/bin/migrate-oats-data/menu/commands/documents.py index 0a79afffd2..a3b592a535 100644 --- a/bin/migrate-oats-data/menu/commands/documents.py +++ b/bin/migrate-oats-data/menu/commands/documents.py @@ -1,8 +1,8 @@ from documents import ( - process_documents, - process_documents_noi, - process_application_documents, - process_noi_documents, + import_oats_noi_documents, + import_oats_app_documents, + link_alcs_docs_to_noi_docs, + link_alcs_docs_to_app_docs, ) @@ -14,13 +14,15 @@ def document_import(console, args): console.log(f"Processing documents in batch size = {import_batch_size}") - process_documents(batch_size=import_batch_size) - process_documents_noi(batch_size=import_batch_size) + import_oats_app_documents(batch_size=import_batch_size) + import_oats_noi_documents(batch_size=import_batch_size) def app_document_import(console, args): console.log("Beginning OATS -> ALCS app-document-import process") - with console.status("[bold green]Link application documents in ALCS...\n") as status: + with console.status( + "[bold green]Link application documents in ALCS...\n" + ) as status: if args.batch_size: import_batch_size = args.batch_size @@ -28,15 +30,17 @@ def app_document_import(console, args): f"Processing application documents in batch size = {import_batch_size}" ) - process_application_documents(batch_size=import_batch_size) + link_alcs_docs_to_app_docs(batch_size=import_batch_size) def noi_document_import(console, args): console.log("Beginning OATS -> ALCS noi-document-import process") - with console.status("[bold green]Link application documents in ALCS...\n") as status: + with console.status( + "[bold green]Link application documents in ALCS...\n" + ) as status: if args.batch_size: import_batch_size = args.batch_size console.log(f"Processing NOI documents in batch size = {import_batch_size}") - process_noi_documents(batch_size=import_batch_size) + link_alcs_docs_to_noi_docs(batch_size=import_batch_size) diff --git a/bin/migrate-oats-data/menu/commands/import_all.py b/bin/migrate-oats-data/menu/commands/import_all.py index 4ac9d89257..bea1ed25aa 100644 --- a/bin/migrate-oats-data/menu/commands/import_all.py +++ b/bin/migrate-oats-data/menu/commands/import_all.py @@ -17,10 +17,10 @@ process_notice_of_intent, ) from documents import ( - process_application_documents, - process_noi_documents, - process_documents_noi, - process_documents, + import_oats_noi_documents, + import_oats_app_documents, + link_alcs_docs_to_noi_docs, + link_alcs_docs_to_app_docs, ) @@ -40,24 +40,17 @@ def import_all(console, args): console.log("Init NOIs:") init_notice_of_intents(batch_size=import_batch_size) - # OATS -> ALCS documents = process_documents & process_documents_noi. Must take place in order to have usable rows in ALCS documents - # ALCS documents -> application_documents/noi_documents = process_application_documents & process_noi_documents - - # documents_noi brings noi labelled documents into ALCS documents console.log("Importing NOI specific OATS documents into ALCS:") - process_documents_noi(batch_size=import_batch_size) + import_oats_noi_documents(batch_size=import_batch_size) - # documents brings application labelled documents into ALCS documents console.log("Importing OATS app_documents into ALCS:") - process_documents(batch_size=import_batch_size) + import_oats_app_documents(batch_size=import_batch_size) - # process_application_documents takes the imported documents from process_documents console.log("Processing ALCS application documents:") - process_application_documents(batch_size=import_batch_size) + link_alcs_docs_to_app_docs(batch_size=import_batch_size) - # process_noi_documents takes the imported documents from process_documents_noi console.log("Processing ALCS NOI documents:") - process_noi_documents(batch_size=import_batch_size) + link_alcs_docs_to_noi_docs(batch_size=import_batch_size) console.log("Processing application prep:") process_alcs_application_prep_fields(batch_size=import_batch_size) From 222e5b00000e1aebcff1491acabc4a06074c9de5 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Thu, 19 Oct 2023 10:29:40 -0700 Subject: [PATCH 529/954] Advanced Search Improvements * Remove other parcels * Use ng-select for all dropdowns * Add X to file type selector and prevent input * Add toast message and scrolling * Sort nulls differently --- .../application-search-table.component.html | 2 +- .../file-type-filter-drop-down.component.html | 9 +-- .../file-type-filter-drop-down.component.scss | 12 +++- .../file-type-filter-drop-down.component.ts | 47 ++++++++-------- ...tice-of-intent-search-table.component.html | 2 +- .../notification-search-table.component.html | 2 +- .../app/features/search/search.component.html | 56 +++++++++---------- .../app/features/search/search.component.scss | 7 +++ .../app/features/search/search.component.ts | 39 +++++++------ .../src/app/services/search/search.dto.ts | 1 - .../services/search/search.service.spec.ts | 2 - alcs-frontend/src/styles/autocomplete.scss | 2 +- .../app/services/inbox/inbox.service.spec.ts | 1 - .../services/search/search.service.spec.ts | 1 - ...pplication-advanced-search.service.spec.ts | 1 - .../application-advanced-search.service.ts | 20 ++++--- .../non-applications.service.spec.ts | 1 - .../non-applications.service.ts | 6 +- ...-of-intent-advanced-search.service.spec.ts | 1 - ...otice-of-intent-advanced-search.service.ts | 15 +++-- ...tification-advanced-search.service.spec.ts | 1 - .../notification-advanced-search.service.ts | 15 +++-- .../src/alcs/search/search.controller.spec.ts | 25 ++------- .../alcs/src/alcs/search/search.controller.ts | 3 - .../apps/alcs/src/alcs/search/search.dto.ts | 4 -- 25 files changed, 142 insertions(+), 133 deletions(-) diff --git a/alcs-frontend/src/app/features/search/application-search-table/application-search-table.component.html b/alcs-frontend/src/app/features/search/application-search-table/application-search-table.component.html index 03ad623a2f..750be92dd0 100644 --- a/alcs-frontend/src/app/features/search/application-search-table/application-search-table.component.html +++ b/alcs-frontend/src/app/features/search/application-search-table/application-search-table.component.html @@ -16,7 +16,7 @@ </ng-container> <ng-container matColumnDef="dateSubmitted"> - <th mat-header-cell *matHeaderCellDef mat-sort-header>Date Submitted</th> + <th mat-header-cell *matHeaderCellDef mat-sort-header>Date Submitted to ALC</th> <td mat-cell *matCellDef="let element"> {{ element.dateSubmitted | date | emptyColumn }} </td> diff --git a/alcs-frontend/src/app/features/search/file-type-filter-drop-down/file-type-filter-drop-down.component.html b/alcs-frontend/src/app/features/search/file-type-filter-drop-down/file-type-filter-drop-down.component.html index 882625db80..e82a605822 100644 --- a/alcs-frontend/src/app/features/search/file-type-filter-drop-down/file-type-filter-drop-down.component.html +++ b/alcs-frontend/src/app/features/search/file-type-filter-drop-down/file-type-filter-drop-down.component.html @@ -1,11 +1,11 @@ -<mat-form-field appearance="outline" class="file-type-input"> +<mat-form-field appearance="outline" class="file-type-input"> <input value="{{ getSelectedItems() }}" placeholder="File Type" type="text" matInput - (input)="filterChanged($event)" [matAutocomplete]="auto" + onkeydown="return false;" [formControl]="componentTypeControl" /> <mat-autocomplete autoActiveFirstOption #auto="matAutocomplete" class="tall-autocomplete"> @@ -16,7 +16,7 @@ <mat-checkbox class="checklist-leaf-node" [checked]="checklistSelection.isSelected(node)" - (change)="todoLeafItemSelectionToggle(node)" + (change)="leafItemSelectionToggle(node)" >{{ node.item?.label ?? node.item }}</mat-checkbox > </mat-tree-node> @@ -30,11 +30,12 @@ <mat-checkbox [checked]="descendantsAllSelected(node)" [indeterminate]="descendantsPartiallySelected(node)" - (change)="todoItemSelectionToggle(node)" + (change)="itemSelectionToggle(node)" > {{ node.item?.label ?? node.item }}</mat-checkbox > </mat-tree-node> </mat-tree> </mat-autocomplete> + <button *ngIf="hasItemsSelected" class="clear-button" type="button" (click)="clear()">×</button> </mat-form-field> diff --git a/alcs-frontend/src/app/features/search/file-type-filter-drop-down/file-type-filter-drop-down.component.scss b/alcs-frontend/src/app/features/search/file-type-filter-drop-down/file-type-filter-drop-down.component.scss index cd3259d384..6d1e74d882 100644 --- a/alcs-frontend/src/app/features/search/file-type-filter-drop-down/file-type-filter-drop-down.component.scss +++ b/alcs-frontend/src/app/features/search/file-type-filter-drop-down/file-type-filter-drop-down.component.scss @@ -2,6 +2,14 @@ width: 100%; } -.tall-autocomplete { - max-height: 600px !important; +.clear-button { + background: transparent; + padding: 0; + position: absolute; + right: 0; + border: none; + cursor: pointer; + font-size: 20px !important; + font-weight: 400 !important; + color: #313132; } diff --git a/alcs-frontend/src/app/features/search/file-type-filter-drop-down/file-type-filter-drop-down.component.ts b/alcs-frontend/src/app/features/search/file-type-filter-drop-down/file-type-filter-drop-down.component.ts index f077c50fa0..c4a1e67b54 100644 --- a/alcs-frontend/src/app/features/search/file-type-filter-drop-down/file-type-filter-drop-down.component.ts +++ b/alcs-frontend/src/app/features/search/file-type-filter-drop-down/file-type-filter-drop-down.component.ts @@ -3,8 +3,11 @@ import { FlatTreeControl } from '@angular/cdk/tree'; import { AfterViewInit, Component, EventEmitter, Output } from '@angular/core'; import { FormControl } from '@angular/forms'; import { MatTreeFlatDataSource, MatTreeFlattener } from '@angular/material/tree'; -import { Observable } from 'rxjs'; -import { FileTypeDataSourceService, FlatTreeNode, TreeNode } from '../../../services/search/file-type/file-type-data-source.service'; +import { + FileTypeDataSourceService, + FlatTreeNode, + TreeNode, +} from '../../../services/search/file-type/file-type-data-source.service'; @Component({ selector: 'app-file-type-filter-drop-down', @@ -12,6 +15,7 @@ import { FileTypeDataSourceService, FlatTreeNode, TreeNode } from '../../../serv styleUrls: ['./file-type-filter-drop-down.component.scss'], }) export class FileTypeFilterDropDownComponent implements AfterViewInit { + hasItemsSelected = false; /** Map from flat node to nested node. This helps us finding the nested node to be modified */ flatNodeMap = new Map<FlatTreeNode, TreeNode>(); @@ -27,7 +31,6 @@ export class FileTypeFilterDropDownComponent implements AfterViewInit { /** The selection for checklist */ checklistSelection = new SelectionModel<FlatTreeNode>(true); - filteredOptions = new Observable<string[]>(); componentTypeControl = new FormControl<string[] | undefined>(undefined); @Output() fileTypeChange = new EventEmitter<string[]>(); @@ -49,8 +52,6 @@ export class FileTypeFilterDropDownComponent implements AfterViewInit { hasChild = (_: number, _nodeData: FlatTreeNode) => _nodeData.expandable; - hasNoContent = (_: number, _nodeData: FlatTreeNode) => _nodeData.item.value === ''; - /** * Transformer to convert nested node to flat node. Record the nodes in maps for later use. */ @@ -81,22 +82,25 @@ export class FileTypeFilterDropDownComponent implements AfterViewInit { return result && !this.descendantsAllSelected(node); } - /** Toggle the to-do item selection. Select/deselect all the descendants node */ - todoItemSelectionToggle(node: FlatTreeNode): void { + /** Toggle item selection. Select/deselect all the descendants node */ + itemSelectionToggle(node: FlatTreeNode): void { this.checklistSelection.toggle(node); const descendants = this.treeControl.getDescendants(node); - this.checklistSelection.isSelected(node) - ? this.checklistSelection.select(...descendants) - : this.checklistSelection.deselect(...descendants); + const isSelected = this.checklistSelection.isSelected(node); + isSelected ? this.checklistSelection.select(...descendants) : this.checklistSelection.deselect(...descendants); // Force update for the parent descendants.every((child) => this.checklistSelection.isSelected(child)); + + this.hasItemsSelected = this.checklistSelection.selected.length > 0; + this.checkAllParentsSelection(node); } - /** Toggle a leaf to-do item selection. Check all the parents to see if they changed */ - todoLeafItemSelectionToggle(node: FlatTreeNode): void { + /** Toggle item selection. Check all the parents to see if they changed */ + leafItemSelectionToggle(node: FlatTreeNode): void { this.checklistSelection.toggle(node); + this.hasItemsSelected = this.checklistSelection.selected.length > 0; this.checkAllParentsSelection(node); } @@ -154,18 +158,6 @@ export class FileTypeFilterDropDownComponent implements AfterViewInit { .join(', '); } - filterChanged($event: any) { - const filterText = $event.target.value; - // FileTypeTreeComponent.filter method which actually filters the tree and gives back a tree structure - - this.fileTypeData.filter(filterText); - if (filterText) { - this.treeControl.expandAll(); - } else { - this.treeControl.collapseAll(); - } - } - onChange() { this.fileTypeChange.emit( this.checklistSelection.selected @@ -177,9 +169,16 @@ export class FileTypeFilterDropDownComponent implements AfterViewInit { reset() { this.componentTypeControl.reset(); this.checklistSelection.selected.forEach((selectedItem) => this.checklistSelection.deselect(selectedItem)); + this.hasItemsSelected = false; } ngAfterViewInit(): void { this.treeControl.expandAll(); } + + clear() { + this.checklistSelection.selected.forEach((selectedItem) => this.checklistSelection.deselect(selectedItem)); + this.onChange(); + this.hasItemsSelected = false; + } } diff --git a/alcs-frontend/src/app/features/search/notice-of-intent-search-table/notice-of-intent-search-table.component.html b/alcs-frontend/src/app/features/search/notice-of-intent-search-table/notice-of-intent-search-table.component.html index 66d98ff2cb..00e5d7b4b8 100644 --- a/alcs-frontend/src/app/features/search/notice-of-intent-search-table/notice-of-intent-search-table.component.html +++ b/alcs-frontend/src/app/features/search/notice-of-intent-search-table/notice-of-intent-search-table.component.html @@ -16,7 +16,7 @@ </ng-container> <ng-container matColumnDef="dateSubmitted"> - <th mat-header-cell *matHeaderCellDef mat-sort-header>Date Submitted</th> + <th mat-header-cell *matHeaderCellDef mat-sort-header>Date Submitted to ALC</th> <td mat-cell *matCellDef="let element"> {{ element.dateSubmitted | date | emptyColumn }} </td> diff --git a/alcs-frontend/src/app/features/search/notification-search-table/notification-search-table.component.html b/alcs-frontend/src/app/features/search/notification-search-table/notification-search-table.component.html index 1a2402e9b5..6dac6b96eb 100644 --- a/alcs-frontend/src/app/features/search/notification-search-table/notification-search-table.component.html +++ b/alcs-frontend/src/app/features/search/notification-search-table/notification-search-table.component.html @@ -16,7 +16,7 @@ </ng-container> <ng-container matColumnDef="dateSubmitted"> - <th mat-header-cell *matHeaderCellDef mat-sort-header>Date Submitted</th> + <th mat-header-cell *matHeaderCellDef mat-sort-header>Date Submitted to ALC</th> <td mat-cell *matCellDef="let element"> {{ element.dateSubmitted | date | emptyColumn }} </td> diff --git a/alcs-frontend/src/app/features/search/search.component.html b/alcs-frontend/src/app/features/search/search.component.html index 1c0bb37e10..90a93d178c 100644 --- a/alcs-frontend/src/app/features/search/search.component.html +++ b/alcs-frontend/src/app/features/search/search.component.html @@ -64,10 +64,6 @@ <h6 class="subheading">Provide one or more of the following criteria:</h6> <a href="https://arcmaps.gov.bc.ca/ess/hm/alc/" target="_blank">iMap</a> to confirm ALC history on a property </div> </div> - - <mat-checkbox formControlName="isIncludeOtherParcels" - >Expand search to include 'Other Parcels in the Community' from applicant submission</mat-checkbox - > </div> <div class="expand-search search-fields-wrapper"> <div @@ -123,13 +119,15 @@ <h6 class="subheading">Provide one or more of the following criteria:</h6> </div> <div class="row"> <div class="column"> - <mat-form-field appearance="outline"> - <mat-select placeholder="Portal Status" [formControl]="portalStatusControl"> - <mat-option *ngFor="let status of allStatuses" [value]="status.code"> - {{ status.label }} - </mat-option> - </mat-select> - </mat-form-field> + <ng-select + appearance="outline" + placeholder="Current Portal Status" + [items]="allStatuses" + bindLabel="label" + bindValue="code" + [formControl]="portalStatusControl" + > + </ng-select> </div> <div class="column"> @@ -140,22 +138,15 @@ <h6 class="subheading">Provide one or more of the following criteria:</h6> <div class="row"> <div class="column"> - <mat-form-field appearance="outline"> - <input - (blur)="onBlur()" - id="government" - type="text" - matInput - formControlName="government" - placeholder="L/FNG Government" - [matAutocomplete]="auto" - /> - <mat-autocomplete (optionSelected)="onGovernmentChange($event)" #auto="matAutocomplete"> - <mat-option *ngFor="let option of filteredLocalGovernments | async" [value]="option.name"> - {{ option.name }} - </mat-option> - </mat-autocomplete> - </mat-form-field> + <ng-select + appearance="outline" + placeholder="L/FNG Government" + [items]="localGovernments" + bindLabel="name" + bindValue="name" + formControlName="government" + > + </ng-select> </div> <div class="column"> @@ -174,7 +165,7 @@ <h6 class="subheading">Provide one or more of the following criteria:</h6> </ng-select> </div> </div> - <div class="row date-row-label">Date Submitted</div> + <div class="row date-row-label">Date Submitted to ALC</div> <div class="row date-row"> <div class="column"> <mat-form-field appearance="outline" class="date-picker"> @@ -256,37 +247,43 @@ <h6 class="subheading">Provide one or more of the following criteria:</h6> <div class="search-fields-wrapper search-result-wrapper" *ngIf="!searchResultsHidden"> <h2 class="search-title">Search Results:</h2> - <mat-tab-group mat-align-tabs="start" mat-stretch-tabs="false" #searchResultTabs> + <mat-tab-group id="results" mat-align-tabs="start" mat-stretch-tabs="false" #searchResultTabs> <mat-tab> <ng-template mat-tab-label> Applications: {{ applicationTotal }} </ng-template> <app-application-search-table + *ngIf="!isLoading" [applications]="applications" [totalCount]="applicationTotal" [statuses]="applicationStatuses" [regions]="regions" (tableChange)="onTableChange($event)" ></app-application-search-table> + <mat-spinner class="spinner" *ngIf="isLoading"></mat-spinner> </mat-tab> <mat-tab> <ng-template mat-tab-label> Notice of Intent: {{ noticeOfIntentTotal }} </ng-template> <app-notice-of-intent-search-table + *ngIf="!isLoading" [noticeOfIntents]="noticeOfIntents" [totalCount]="noticeOfIntentTotal" [statuses]="noiStatuses" [regions]="regions" (tableChange)="onTableChange($event)" ></app-notice-of-intent-search-table> + <mat-spinner class="spinner" *ngIf="isLoading"></mat-spinner> </mat-tab> <mat-tab> <ng-template mat-tab-label> Non-Applications: {{ nonApplicationsTotal }} </ng-template> <app-non-application-search-table + *ngIf="!isLoading" [nonApplications]="nonApplications" [totalCount]="nonApplicationsTotal" (tableChange)="onTableChange($event)" > </app-non-application-search-table> + <mat-spinner class="spinner" *ngIf="isLoading"></mat-spinner> </mat-tab> <mat-tab> @@ -298,6 +295,7 @@ <h2 class="search-title">Search Results:</h2> (tableChange)="onTableChange($event)" > </app-notification-search-table> + <mat-spinner class="spinner" *ngIf="isLoading"></mat-spinner> </mat-tab> </mat-tab-group> </div> diff --git a/alcs-frontend/src/app/features/search/search.component.scss b/alcs-frontend/src/app/features/search/search.component.scss index 976f020fa7..69199e023c 100644 --- a/alcs-frontend/src/app/features/search/search.component.scss +++ b/alcs-frontend/src/app/features/search/search.component.scss @@ -1,4 +1,9 @@ @use '../../../styles/colors'; + +.spinner { + margin: 20px; +} + :host::ng-deep { h3, div, @@ -105,6 +110,8 @@ align-items: center; cursor: pointer; color: #1a5a96; + margin-top: 12px; + margin-bottom: 24px; span { color: #1a5a96; diff --git a/alcs-frontend/src/app/features/search/search.component.ts b/alcs-frontend/src/app/features/search/search.component.ts index d4fffc38ed..6c0d29a7da 100644 --- a/alcs-frontend/src/app/features/search/search.component.ts +++ b/alcs-frontend/src/app/features/search/search.component.ts @@ -76,7 +76,6 @@ export class SearchComponent implements OnInit, OnDestroy { name: this.nameControl, pid: this.pidControl, civicAddress: this.civicAddressControl, - isIncludeOtherParcels: new FormControl(false), resolutionNumber: new FormControl<string | undefined>(undefined), resolutionYear: new FormControl<number | undefined>(undefined), legacyId: new FormControl<string | undefined>(undefined), @@ -102,6 +101,7 @@ export class SearchComponent implements OnInit, OnDestroy { searchResultsHidden = true; notificationStatuses: NotificationSubmissionStatusDto[] = []; noiStatuses: NoticeOfIntentStatusDto[] = []; + isLoading = false; constructor( private searchService: SearchService, @@ -131,21 +131,7 @@ export class SearchComponent implements OnInit, OnDestroy { if (searchText) { this.searchForm.controls.fileNumber.setValue(searchText); - - this.searchService - .advancedSearchFetch({ - fileNumber: searchText, - isIncludeOtherParcels: false, - pageSize: this.itemsPerPage, - page: this.pageIndex + 1, - sortDirection: this.sortDirection, - sortField: this.sortField, - fileTypes: [], - }) - .then((result) => { - this.searchResultsHidden = false; - this.mapSearchResults(result); - }); + this.onSubmit(); } }); @@ -196,14 +182,32 @@ export class SearchComponent implements OnInit, OnDestroy { async onSubmit() { const searchParams = this.getSearchParams(); + this.isLoading = true; const result = await this.searchService.advancedSearchFetch(searchParams); + this.searchResultsHidden = false; + this.isLoading = false; + this.toastService.showSuccessToast('Results updated'); // push tab activation to next render cycle, after the tabGroup is rendered setTimeout(() => { this.mapSearchResults(result); - this.setActiveTab(); + this.scrollToResults(); + }); + } + + scrollToResults() { + setTimeout(() => { + const element = document.getElementById('results'); + + if (element) { + element.scrollIntoView({ + behavior: 'smooth', + block: 'center', + inline: 'center', + }); + } }); } @@ -258,7 +262,6 @@ export class SearchComponent implements OnInit, OnDestroy { name: this.formatStringSearchParam(this.searchForm.controls.name.value), civicAddress: this.formatStringSearchParam(this.searchForm.controls.civicAddress.value), pid: this.formatStringSearchParam(this.searchForm.controls.pid.value), - isIncludeOtherParcels: this.searchForm.controls.isIncludeOtherParcels.value ?? false, resolutionNumber: resolutionNumberString ? parseInt(resolutionNumberString) : undefined, resolutionYear: this.searchForm.controls.resolutionYear.value ?? undefined, portalStatusCode: this.searchForm.controls.portalStatus.value ?? undefined, diff --git a/alcs-frontend/src/app/services/search/search.dto.ts b/alcs-frontend/src/app/services/search/search.dto.ts index 2e2cdd7467..f5290e7de6 100644 --- a/alcs-frontend/src/app/services/search/search.dto.ts +++ b/alcs-frontend/src/app/services/search/search.dto.ts @@ -56,7 +56,6 @@ export interface SearchRequestDto extends PagingRequestDto { name?: string; pid?: string; civicAddress?: string; - isIncludeOtherParcels: boolean; resolutionNumber?: number; resolutionYear?: number; portalStatusCode?: string; diff --git a/alcs-frontend/src/app/services/search/search.service.spec.ts b/alcs-frontend/src/app/services/search/search.service.spec.ts index aef1dfc0ae..e07c4f0487 100644 --- a/alcs-frontend/src/app/services/search/search.service.spec.ts +++ b/alcs-frontend/src/app/services/search/search.service.spec.ts @@ -55,7 +55,6 @@ describe('SearchService', () => { page: 1, sortField: '1', sortDirection: 'ASC', - isIncludeOtherParcels: false, fileTypes: [], }; @@ -185,7 +184,6 @@ describe('SearchService', () => { expect(mockToastService.showErrorToast).toHaveBeenCalledTimes(1); }); - it('should fetch Non Applications advanced search results by AdvancedSearchRequestDto', async () => { mockHttpClient.post.mockReturnValue(of(mockAdvancedSearchEntityResult)); diff --git a/alcs-frontend/src/styles/autocomplete.scss b/alcs-frontend/src/styles/autocomplete.scss index e52fc2e876..8757768e9a 100644 --- a/alcs-frontend/src/styles/autocomplete.scss +++ b/alcs-frontend/src/styles/autocomplete.scss @@ -1,3 +1,3 @@ .tall-autocomplete { - max-height: 600px !important; + max-height: min(600px, 40vh) !important; } diff --git a/portal-frontend/src/app/services/inbox/inbox.service.spec.ts b/portal-frontend/src/app/services/inbox/inbox.service.spec.ts index 97c1f41556..00c9d5e9ff 100644 --- a/portal-frontend/src/app/services/inbox/inbox.service.spec.ts +++ b/portal-frontend/src/app/services/inbox/inbox.service.spec.ts @@ -29,7 +29,6 @@ describe('InboxService', () => { page: 1, sortField: '1', sortDirection: 'ASC', - isIncludeOtherParcels: false, fileTypes: [], }; diff --git a/portal-frontend/src/app/services/search/search.service.spec.ts b/portal-frontend/src/app/services/search/search.service.spec.ts index f4f3827447..d6a418f0ce 100644 --- a/portal-frontend/src/app/services/search/search.service.spec.ts +++ b/portal-frontend/src/app/services/search/search.service.spec.ts @@ -29,7 +29,6 @@ describe('SearchService', () => { page: 1, sortField: '1', sortDirection: 'ASC', - isIncludeOtherParcels: false, fileTypes: [], }; diff --git a/services/apps/alcs/src/alcs/search/application/application-advanced-search.service.spec.ts b/services/apps/alcs/src/alcs/search/application/application-advanced-search.service.spec.ts index ebe8a97986..85b4d0f0d2 100644 --- a/services/apps/alcs/src/alcs/search/application/application-advanced-search.service.spec.ts +++ b/services/apps/alcs/src/alcs/search/application/application-advanced-search.service.spec.ts @@ -23,7 +23,6 @@ describe('ApplicationAdvancedSearchService', () => { name: 'D', pid: 'E', civicAddress: 'F', - isIncludeOtherParcels: true, dateSubmittedFrom: new Date('2020-10-10').getTime(), dateSubmittedTo: new Date('2021-10-10').getTime(), dateDecidedFrom: new Date('2020-11-10').getTime(), diff --git a/services/apps/alcs/src/alcs/search/application/application-advanced-search.service.ts b/services/apps/alcs/src/alcs/search/application/application-advanced-search.service.ts index e456067a9a..60bac78e15 100644 --- a/services/apps/alcs/src/alcs/search/application/application-advanced-search.service.ts +++ b/services/apps/alcs/src/alcs/search/application/application-advanced-search.service.ts @@ -39,7 +39,11 @@ export class ApplicationAdvancedSearchService { const sortQuery = this.compileSortQuery(searchDto); query = query - .orderBy(sortQuery, searchDto.sortDirection) + .orderBy( + sortQuery, + searchDto.sortDirection, + searchDto.sortDirection === 'ASC' ? 'NULLS FIRST' : 'NULLS LAST', + ) .offset((searchDto.page - 1) * searchDto.pageSize) .limit(searchDto.pageSize); @@ -261,10 +265,7 @@ export class ApplicationAdvancedSearchService { searchDto: SearchRequestDto, query: SelectQueryBuilder<ApplicationSubmissionSearchView>, ) { - if ( - (searchDto.pid || searchDto.civicAddress) && - searchDto.isIncludeOtherParcels - ) { + if (searchDto.pid || searchDto.civicAddress) { query = query.leftJoin( ApplicationParcel, 'parcel', @@ -283,9 +284,12 @@ export class ApplicationAdvancedSearchService { } if (searchDto.civicAddress) { - query = query.andWhere('LOWER(parcel.civic_address) like LOWER(:civic_address)', { - civic_address: `%${searchDto.civicAddress}%`.toLowerCase(), - }); + query = query.andWhere( + 'LOWER(parcel.civic_address) like LOWER(:civic_address)', + { + civic_address: `%${searchDto.civicAddress}%`.toLowerCase(), + }, + ); } return query; } diff --git a/services/apps/alcs/src/alcs/search/non-applications/non-applications.service.spec.ts b/services/apps/alcs/src/alcs/search/non-applications/non-applications.service.spec.ts index 6cac1332bc..ba300db684 100644 --- a/services/apps/alcs/src/alcs/search/non-applications/non-applications.service.spec.ts +++ b/services/apps/alcs/src/alcs/search/non-applications/non-applications.service.spec.ts @@ -24,7 +24,6 @@ describe('NonApplicationsService', () => { sortField: 'applicant', sortDirection: 'ASC', fileTypes: [], - isIncludeOtherParcels: false, }; beforeEach(async () => { diff --git a/services/apps/alcs/src/alcs/search/non-applications/non-applications.service.ts b/services/apps/alcs/src/alcs/search/non-applications/non-applications.service.ts index c818407001..0586789645 100644 --- a/services/apps/alcs/src/alcs/search/non-applications/non-applications.service.ts +++ b/services/apps/alcs/src/alcs/search/non-applications/non-applications.service.ts @@ -21,7 +21,11 @@ export class NonApplicationsAdvancedSearchService { const sortQuery = this.compileSortQuery(searchDto); query = query - .orderBy(sortQuery, searchDto.sortDirection) + .orderBy( + sortQuery, + searchDto.sortDirection, + searchDto.sortDirection === 'ASC' ? 'NULLS FIRST' : 'NULLS LAST', + ) .offset((searchDto.page - 1) * searchDto.pageSize) .limit(searchDto.pageSize); diff --git a/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-advanced-search.service.spec.ts b/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-advanced-search.service.spec.ts index 34c89667eb..9099e7fa6a 100644 --- a/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-advanced-search.service.spec.ts +++ b/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-advanced-search.service.spec.ts @@ -22,7 +22,6 @@ describe('NoticeOfIntentService', () => { name: 'D', pid: 'E', civicAddress: 'F', - isIncludeOtherParcels: false, dateSubmittedFrom: new Date('2020-10-10').getTime(), dateSubmittedTo: new Date('2021-10-10').getTime(), dateDecidedFrom: new Date('2020-11-10').getTime(), diff --git a/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-advanced-search.service.ts b/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-advanced-search.service.ts index d59133b771..4c8a8e0d32 100644 --- a/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-advanced-search.service.ts +++ b/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-advanced-search.service.ts @@ -32,7 +32,11 @@ export class NoticeOfIntentAdvancedSearchService { const sortQuery = this.compileSortQuery(searchDto); query = query - .orderBy(sortQuery, searchDto.sortDirection) + .orderBy( + sortQuery, + searchDto.sortDirection, + searchDto.sortDirection === 'ASC' ? 'NULLS FIRST' : 'NULLS LAST', + ) .offset((searchDto.page - 1) * searchDto.pageSize) .limit(searchDto.pageSize); @@ -264,9 +268,12 @@ export class NoticeOfIntentAdvancedSearchService { } if (searchDto.civicAddress) { - query = query.andWhere('LOWER(parcel.civic_address) like LOWER(:civic_address)', { - civic_address: `%${searchDto.civicAddress}%`.toLowerCase(), - }); + query = query.andWhere( + 'LOWER(parcel.civic_address) like LOWER(:civic_address)', + { + civic_address: `%${searchDto.civicAddress}%`.toLowerCase(), + }, + ); } return query; } diff --git a/services/apps/alcs/src/alcs/search/notification/notification-advanced-search.service.spec.ts b/services/apps/alcs/src/alcs/search/notification/notification-advanced-search.service.spec.ts index eb081abd81..4bf9118d6c 100644 --- a/services/apps/alcs/src/alcs/search/notification/notification-advanced-search.service.spec.ts +++ b/services/apps/alcs/src/alcs/search/notification/notification-advanced-search.service.spec.ts @@ -22,7 +22,6 @@ describe('NotificationAdvancedSearchService', () => { name: 'D', pid: 'E', civicAddress: 'F', - isIncludeOtherParcels: false, dateSubmittedFrom: new Date('2020-10-10').getTime(), dateSubmittedTo: new Date('2021-10-10').getTime(), dateDecidedFrom: new Date('2020-11-10').getTime(), diff --git a/services/apps/alcs/src/alcs/search/notification/notification-advanced-search.service.ts b/services/apps/alcs/src/alcs/search/notification/notification-advanced-search.service.ts index 199d8fb82b..aa07e6a865 100644 --- a/services/apps/alcs/src/alcs/search/notification/notification-advanced-search.service.ts +++ b/services/apps/alcs/src/alcs/search/notification/notification-advanced-search.service.ts @@ -31,7 +31,11 @@ export class NotificationAdvancedSearchService { const sortQuery = this.compileSortQuery(searchDto); query = query - .orderBy(sortQuery, searchDto.sortDirection) + .orderBy( + sortQuery, + searchDto.sortDirection, + searchDto.sortDirection === 'ASC' ? 'NULLS FIRST' : 'NULLS LAST', + ) .offset((searchDto.page - 1) * searchDto.pageSize) .limit(searchDto.pageSize); @@ -193,9 +197,12 @@ export class NotificationAdvancedSearchService { } if (searchDto.civicAddress) { - query = query.andWhere('LOWER(parcel.civic_address) like LOWER(:civic_address)', { - civic_address: `%${searchDto.civicAddress}%`.toLowerCase(), - }); + query = query.andWhere( + 'LOWER(parcel.civic_address) like LOWER(:civic_address)', + { + civic_address: `%${searchDto.civicAddress}%`.toLowerCase(), + }, + ); } return query; } diff --git a/services/apps/alcs/src/alcs/search/search.controller.spec.ts b/services/apps/alcs/src/alcs/search/search.controller.spec.ts index 81a947c0d4..ee9811d084 100644 --- a/services/apps/alcs/src/alcs/search/search.controller.spec.ts +++ b/services/apps/alcs/src/alcs/search/search.controller.spec.ts @@ -147,7 +147,6 @@ describe('SearchController', () => { page: 1, sortField: '1', sortDirection: 'ASC', - isIncludeOtherParcels: false, name: 'test', fileTypes: [], }; @@ -190,7 +189,6 @@ describe('SearchController', () => { page: 1, sortField: '1', sortDirection: 'ASC', - isIncludeOtherParcels: false, fileTypes: [], }; @@ -214,7 +212,6 @@ describe('SearchController', () => { page: 1, sortField: '1', sortDirection: 'ASC', - isIncludeOtherParcels: false, fileTypes: [], }; @@ -234,7 +231,6 @@ describe('SearchController', () => { it('should call non-applications advanced search to retrieve Non-Applications', async () => { const mockSearchRequestDto: SearchRequestDto = { - isIncludeOtherParcels: false, pageSize: 1, page: 1, sortField: '1', @@ -262,7 +258,6 @@ describe('SearchController', () => { page: 1, sortField: '1', sortDirection: 'ASC', - isIncludeOtherParcels: false, fileTypes: ['NFUP'], }; @@ -286,7 +281,6 @@ describe('SearchController', () => { page: 1, sortField: '1', sortDirection: 'ASC', - isIncludeOtherParcels: false, fileTypes: ['NOI'], }; @@ -305,18 +299,15 @@ describe('SearchController', () => { }); it('should call advanced search to retrieve Non Applications only when non application file type selected', async () => { - const mockSearchRequestDto = { + const mockSearchRequestDto: SearchRequestDto = { pageSize: 1, page: 1, sortField: '1', sortDirection: 'ASC', - isIncludeOtherParcels: false, fileTypes: ['COV'], }; - const result = await controller.advancedSearch( - mockSearchRequestDto as SearchRequestDto, - ); + const result = await controller.advancedSearch(mockSearchRequestDto); expect(result.totalNoticeOfIntents).toBe(0); @@ -331,29 +322,25 @@ describe('SearchController', () => { }); it('should NOT call NOI and Non-applications advanced search to retrieve NOIs and Non-applications if no NOI or non-application search fields specified', async () => { - const baseMockSearchRequestDto = { + const baseMockSearchRequestDto: SearchRequestDto = { pageSize: 1, page: 1, sortField: '1', sortDirection: 'ASC', fileTypes: [], }; - const mockSearchRequestDto = { - ...baseMockSearchRequestDto, - isIncludeOtherParcels: false, - }; const result = await controller.advancedSearch({ - ...mockSearchRequestDto, + ...baseMockSearchRequestDto, legacyId: 'test', - } as SearchRequestDto); + }); expect( mockApplicationAdvancedSearchService.searchApplications, ).toBeCalledTimes(1); expect( mockApplicationAdvancedSearchService.searchApplications, - ).toBeCalledWith({ ...mockSearchRequestDto, legacyId: 'test' }); + ).toBeCalledWith({ ...baseMockSearchRequestDto, legacyId: 'test' }); expect(result.applications).toBeDefined(); expect(result.totalApplications).toBe(0); diff --git a/services/apps/alcs/src/alcs/search/search.controller.ts b/services/apps/alcs/src/alcs/search/search.controller.ts index ea99569bda..a4ba34838f 100644 --- a/services/apps/alcs/src/alcs/search/search.controller.ts +++ b/services/apps/alcs/src/alcs/search/search.controller.ts @@ -267,7 +267,6 @@ export class SearchController { const searchNoi = (searchDto.fileTypes.length > 0 ? noiTypeSpecified : true) && - !searchDto.isIncludeOtherParcels && !isStringSetAndNotEmpty(searchDto.legacyId); const searchNonApplications = @@ -278,7 +277,6 @@ export class SearchController { !searchDto.dateDecidedTo && !searchDto.resolutionNumber && !searchDto.resolutionYear && - !searchDto.isIncludeOtherParcels && !searchDto.portalStatusCode && !searchDto.pid && !isStringSetAndNotEmpty(searchDto.legacyId) && @@ -290,7 +288,6 @@ export class SearchController { !searchDto.dateDecidedTo && !searchDto.resolutionNumber && !searchDto.resolutionYear && - !searchDto.isIncludeOtherParcels && !isStringSetAndNotEmpty(searchDto.legacyId); return { diff --git a/services/apps/alcs/src/alcs/search/search.dto.ts b/services/apps/alcs/src/alcs/search/search.dto.ts index 28d9e3ac3b..e169a54787 100644 --- a/services/apps/alcs/src/alcs/search/search.dto.ts +++ b/services/apps/alcs/src/alcs/search/search.dto.ts @@ -120,10 +120,6 @@ export class SearchRequestDto extends PagingRequestDto { @MinLength(3) civicAddress?: string; - @IsBoolean() - @IsOptional() - isIncludeOtherParcels = false; - @IsNumber() @IsOptional() resolutionNumber?: number; From 6ea2508acfb70be8d964c2a978918d9c42dc20a3 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Thu, 19 Oct 2023 10:56:20 -0700 Subject: [PATCH 530/954] Inbox Fixes * Remove double spinner * Adjust text * Add missing dropdown arrow --- .../home/inbox/inbox-list/inbox-list.component.html | 2 +- .../home/inbox/inbox-list/inbox-list.component.ts | 4 +--- .../home/inbox/inbox-table/inbox-table.component.html | 2 +- .../src/app/features/home/inbox/inbox.component.html | 11 ++++++----- .../file-type-filter-drop-down.component.html | 1 + .../file-type-filter-drop-down.component.scss | 4 ++++ 6 files changed, 14 insertions(+), 10 deletions(-) diff --git a/portal-frontend/src/app/features/home/inbox/inbox-list/inbox-list.component.html b/portal-frontend/src/app/features/home/inbox/inbox-list/inbox-list.component.html index c2fbaee312..50a5f4f673 100644 --- a/portal-frontend/src/app/features/home/inbox/inbox-list/inbox-list.component.html +++ b/portal-frontend/src/app/features/home/inbox/inbox-list/inbox-list.component.html @@ -28,6 +28,6 @@ </div> <div class="no-data" *ngIf="totalCount === 0"> - <div><b>No applications found.</b></div> + <div><b>No {{type}} Found</b></div> <div>Please adjust search criteria and try again.</div> </div> diff --git a/portal-frontend/src/app/features/home/inbox/inbox-list/inbox-list.component.ts b/portal-frontend/src/app/features/home/inbox/inbox-list/inbox-list.component.ts index 82ed517f44..443fc37940 100644 --- a/portal-frontend/src/app/features/home/inbox/inbox-list/inbox-list.component.ts +++ b/portal-frontend/src/app/features/home/inbox/inbox-list/inbox-list.component.ts @@ -1,9 +1,6 @@ import { Component, EventEmitter, Input, OnDestroy, Output } from '@angular/core'; import { Router } from '@angular/router'; import { Subject } from 'rxjs'; -import { BaseInboxResultDto } from '../../../../services/inbox/inbox.dto'; -import { BaseCodeDto } from '../../../../shared/dto/base.dto'; -import { SearchResult } from '../../../public/search/search.interface'; import { InboxResultDto } from '../inbox.component'; @Component({ @@ -15,6 +12,7 @@ export class InboxListComponent implements OnDestroy { $destroy = new Subject<void>(); @Input() totalCount = 0; + @Input() type = ''; _items: InboxResultDto[] = []; @Input() set items(items: InboxResultDto[]) { diff --git a/portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.html b/portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.html index d90dbb76a4..22fc6b24da 100644 --- a/portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.html +++ b/portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.html @@ -6,7 +6,7 @@ <!-- Row shown when there is no matching data. --> <tr class="mat-row" *matNoDataRow> - <td class="no-data" colspan="7">No {{ type }} Created</td> + <td class="no-data" colspan="7">No {{ type }} Found</td> </tr> <ng-container matColumnDef="fileNumber"> diff --git a/portal-frontend/src/app/features/home/inbox/inbox.component.html b/portal-frontend/src/app/features/home/inbox/inbox.component.html index 1b28815810..93146cebaf 100644 --- a/portal-frontend/src/app/features/home/inbox/inbox.component.html +++ b/portal-frontend/src/app/features/home/inbox/inbox.component.html @@ -97,14 +97,11 @@ </div> </form> - <div *ngIf="isLoading" class="center"> - <mat-spinner></mat-spinner> - </div> <div class="search-fields-wrapper search-result-wrapper"> <div *ngIf="isLoading" class="center"> <mat-spinner></mat-spinner> </div> - <mat-tab-group mat-align-tabs="start" mat-stretch-tabs #searchResultTabs> + <mat-tab-group *ngIf="!isLoading" mat-align-tabs="start" mat-stretch-tabs #searchResultTabs> <mat-tab> <ng-template mat-tab-label> Applications: {{ applicationTotal }} </ng-template> <app-inbox-list @@ -112,6 +109,7 @@ [items]="applications" [totalCount]="applicationTotal" (loadMore)="onLoadMore('APP')" + type="Applications" > </app-inbox-list> <app-inbox-table @@ -119,6 +117,7 @@ [items]="applications" [totalCount]="applicationTotal" (tableChange)="onTableChange($event)" + type="Applications" ></app-inbox-table> </mat-tab> @@ -129,14 +128,15 @@ [items]="noticeOfIntents" [totalCount]="noticeOfIntentTotal" (loadMore)="onLoadMore('NOI')" + type="Notices of Intent" > </app-inbox-list> <app-inbox-table *ngIf="!isMobile" [items]="noticeOfIntents" - type="Notices of Intent" [totalCount]="noticeOfIntentTotal" (tableChange)="onTableChange($event)" + type="Notices of Intent" ></app-inbox-table> </mat-tab> @@ -147,6 +147,7 @@ [items]="notifications" [totalCount]="notificationTotal" (loadMore)="onLoadMore('NOTI')" + type="Notifications" > </app-inbox-list> <app-inbox-table diff --git a/portal-frontend/src/app/features/public/search/file-type-filter-drop-down/file-type-filter-drop-down.component.html b/portal-frontend/src/app/features/public/search/file-type-filter-drop-down/file-type-filter-drop-down.component.html index ecb3ec7330..ced3864337 100644 --- a/portal-frontend/src/app/features/public/search/file-type-filter-drop-down/file-type-filter-drop-down.component.html +++ b/portal-frontend/src/app/features/public/search/file-type-filter-drop-down/file-type-filter-drop-down.component.html @@ -7,6 +7,7 @@ [matAutocomplete]="auto" [formControl]="componentTypeControl" /> + <mat-icon class='dropdown-arrow' matSuffix>arrow_drop_down</mat-icon> <mat-autocomplete autoActiveFirstOption #auto="matAutocomplete" class="tall-autocomplete"> <mat-option disabled>Please select an item from below</mat-option> <mat-tree [dataSource]="dataSource" [treeControl]="treeControl"> diff --git a/portal-frontend/src/app/features/public/search/file-type-filter-drop-down/file-type-filter-drop-down.component.scss b/portal-frontend/src/app/features/public/search/file-type-filter-drop-down/file-type-filter-drop-down.component.scss index de86d4f003..f7a76450a2 100644 --- a/portal-frontend/src/app/features/public/search/file-type-filter-drop-down/file-type-filter-drop-down.component.scss +++ b/portal-frontend/src/app/features/public/search/file-type-filter-drop-down/file-type-filter-drop-down.component.scss @@ -7,3 +7,7 @@ .tall-autocomplete { max-height: rem(600) !important; } + +.dropdown-arrow { + color: rgba(0, 0, 0, 0.54); +} From 46fd87512d3cc2d529c410a0fc7fa40e894ce29d Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Thu, 19 Oct 2023 12:20:37 -0700 Subject: [PATCH 531/954] Inbox Fixes pt 2 * Only show submitted files when joining on government uuid * Use users business guid instead of governments for account sharing --- .../inbox-application-view.entity.ts | 8 +- .../application/inbox-application.service.ts | 4 +- .../inbox-notice-of-intent-view.entity.ts | 8 +- .../inbox-notice-of-intent.service.ts | 4 +- .../inbox-notification-view.entity.ts | 7 +- .../inbox-notification.service.ts | 3 +- ...7742680683-add_submitted_to_inbox_views.ts | 127 ++++++++++++++++++ 7 files changed, 155 insertions(+), 6 deletions(-) create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1697742680683-add_submitted_to_inbox_views.ts diff --git a/services/apps/alcs/src/portal/inbox/application/inbox-application-view.entity.ts b/services/apps/alcs/src/portal/inbox/application/inbox-application-view.entity.ts index 2fde1cb8b3..7f0f371001 100644 --- a/services/apps/alcs/src/portal/inbox/application/inbox-application-view.entity.ts +++ b/services/apps/alcs/src/portal/inbox/application/inbox-application-view.entity.ts @@ -11,6 +11,7 @@ import { ApplicationSubmissionToSubmissionStatus } from '../../../alcs/applicati import { Application } from '../../../alcs/application/application.entity'; import { ApplicationType } from '../../../alcs/code/application-code/application-type/application-type.entity'; import { LocalGovernment } from '../../../alcs/local-government/local-government.entity'; +import { User } from '../../../user/user.entity'; import { ApplicationSubmissionReview } from '../../application-submission-review/application-submission-review.entity'; import { ApplicationSubmission } from '../../application-submission/application-submission.entity'; import { LinkedStatusType } from '../inbox.dto'; @@ -26,9 +27,10 @@ import { LinkedStatusType } from '../inbox.dto'; .addSelect('app_sub.local_government_uuid', 'local_government_uuid') .addSelect('app_sub.audit_created_at', 'created_at') .addSelect('localGovernment.name', 'local_government_name') - .addSelect('localGovernment.bceid_business_guid', 'bceid_business_guid') + .addSelect('user.bceid_business_guid', 'bceid_business_guid') .addSelect('app_sub.type_code', 'application_type_code') .addSelect('app.uuid', 'application_uuid') + .addSelect('app.date_submitted_to_alc', 'date_submitted_to_alc') .addSelect( 'app_rev.local_government_file_number', 'local_government_file_number', @@ -43,6 +45,7 @@ import { LinkedStatusType } from '../inbox.dto'; ) .from(ApplicationSubmission, 'app_sub') .innerJoin(Application, 'app', 'app.file_number = app_sub.file_number') + .leftJoin(User, 'user', 'user.uuid = app_sub.created_by_uuid') .leftJoin( ApplicationSubmissionReview, 'app_rev', @@ -91,6 +94,9 @@ export class InboxApplicationSubmissionView { @ViewColumn() lastUpdate: Date; + @ViewColumn() + dateSubmittedToAlc: Date | null; + @ViewColumn() createdAt: Date; diff --git a/services/apps/alcs/src/portal/inbox/application/inbox-application.service.ts b/services/apps/alcs/src/portal/inbox/application/inbox-application.service.ts index 0024bf5887..d1e8950932 100644 --- a/services/apps/alcs/src/portal/inbox/application/inbox-application.service.ts +++ b/services/apps/alcs/src/portal/inbox/application/inbox-application.service.ts @@ -61,6 +61,7 @@ export class InboxApplicationService { , "appSearch"."local_government_file_number" , "appSearch"."status" , "appSearch"."created_at" + , "appSearch"."date_submitted_to_alc" , "appSearch"."last_update" , "appSearch"."created_by_uuid" , "appSearch"."bceid_business_guid" @@ -97,7 +98,8 @@ export class InboxApplicationService { where += ' OR appSearch.bceid_business_guid = :bceidBusinessGuid'; } if (governmentUuid) { - where += ' OR appSearch.local_government_uuid = :governmentUuid'; + where += + ' OR (appSearch.local_government_uuid = :governmentUuid AND appSearch.date_submitted_to_alc IS NOT NULL)'; } } else { if (searchDto.filterBy === 'submitted') { diff --git a/services/apps/alcs/src/portal/inbox/notice-of-intent/inbox-notice-of-intent-view.entity.ts b/services/apps/alcs/src/portal/inbox/notice-of-intent/inbox-notice-of-intent-view.entity.ts index b1c828b46f..b28628176b 100644 --- a/services/apps/alcs/src/portal/inbox/notice-of-intent/inbox-notice-of-intent-view.entity.ts +++ b/services/apps/alcs/src/portal/inbox/notice-of-intent/inbox-notice-of-intent-view.entity.ts @@ -11,6 +11,7 @@ import { NoticeOfIntentDecision } from '../../../alcs/notice-of-intent-decision/ import { NoticeOfIntentSubmissionToSubmissionStatus } from '../../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status.entity'; import { NoticeOfIntentType } from '../../../alcs/notice-of-intent/notice-of-intent-type/notice-of-intent-type.entity'; import { NoticeOfIntent } from '../../../alcs/notice-of-intent/notice-of-intent.entity'; +import { User } from '../../../user/user.entity'; import { NoticeOfIntentSubmission } from '../../notice-of-intent-submission/notice-of-intent-submission.entity'; import { LinkedStatusType } from '../inbox.dto'; @@ -24,9 +25,10 @@ import { LinkedStatusType } from '../inbox.dto'; .addSelect('noi_sub.audit_created_at', 'created_at') .addSelect('noi_sub.created_by_uuid', 'created_by_uuid') .addSelect('noi_sub.local_government_uuid', 'local_government_uuid') - .addSelect('localGovernment.bceid_business_guid', 'bceid_business_guid') + .addSelect('user.bceid_business_guid', 'bceid_business_guid') .addSelect('noi_sub.type_code', 'notice_of_intent_type_code') .addSelect('noi.uuid', 'notice_of_intent_uuid') + .addSelect('noi.date_submitted_to_alc', 'date_submitted_to_alc') .addSelect( 'GREATEST(status_link.effective_date, decision_date.date)', 'last_update', @@ -37,6 +39,7 @@ import { LinkedStatusType } from '../inbox.dto'; ) .from(NoticeOfIntentSubmission, 'noi_sub') .innerJoin(NoticeOfIntent, 'noi', 'noi.file_number = noi_sub.file_number') + .leftJoin(User, 'user', 'user.uuid = noi_sub.created_by_uuid') .innerJoinAndSelect( NoticeOfIntentType, 'noticeOfIntentType', @@ -77,6 +80,9 @@ export class InboxNoticeOfIntentSubmissionView { @ViewColumn() noticeOfIntentUuid: string; + @ViewColumn() + dateSubmittedToAlc: Date | null; + @ViewColumn() createdAt: Date; diff --git a/services/apps/alcs/src/portal/inbox/notice-of-intent/inbox-notice-of-intent.service.ts b/services/apps/alcs/src/portal/inbox/notice-of-intent/inbox-notice-of-intent.service.ts index dc2174ec8d..f12b7c53b1 100644 --- a/services/apps/alcs/src/portal/inbox/notice-of-intent/inbox-notice-of-intent.service.ts +++ b/services/apps/alcs/src/portal/inbox/notice-of-intent/inbox-notice-of-intent.service.ts @@ -61,6 +61,7 @@ export class InboxNoticeOfIntentService { , "noiSearch"."status" , "noiSearch"."created_at" , "noiSearch"."last_update" + , "noiSearch"."date_submitted_to_alc" , "noiSearch"."created_by_uuid" , "noiSearch"."bceid_business_guid" , "noticeOfIntentType"."audit_deleted_date_at" @@ -93,7 +94,8 @@ export class InboxNoticeOfIntentService { where += ' OR noiSearch.bceid_business_guid = :bceidBusinessGuid'; } if (governmentUuid) { - where += ' OR noiSearch.local_government_uuid = :governmentUuid'; + where += + ' OR (noiSearch.local_government_uuid = :governmentUuid AND noiSearch.date_submitted_to_alc IS NOT NULL)'; } } else { if (searchDto.filterBy === 'submitted') { diff --git a/services/apps/alcs/src/portal/inbox/notification/inbox-notification-view.entity.ts b/services/apps/alcs/src/portal/inbox/notification/inbox-notification-view.entity.ts index be539981bf..60df01cc8d 100644 --- a/services/apps/alcs/src/portal/inbox/notification/inbox-notification-view.entity.ts +++ b/services/apps/alcs/src/portal/inbox/notification/inbox-notification-view.entity.ts @@ -9,6 +9,7 @@ import { import { LocalGovernment } from '../../../alcs/local-government/local-government.entity'; import { NotificationType } from '../../../alcs/notification/notification-type/notification-type.entity'; import { Notification } from '../../../alcs/notification/notification.entity'; +import { User } from '../../../user/user.entity'; import { NotificationSubmission } from '../../notification-submission/notification-submission.entity'; import { LinkedStatusType } from '../inbox.dto'; @@ -22,7 +23,7 @@ import { LinkedStatusType } from '../inbox.dto'; .addSelect('noti_sub.audit_created_at', 'created_at') .addSelect('noti_sub.created_by_uuid', 'created_by_uuid') .addSelect('noti_sub.local_government_uuid', 'local_government_uuid') - .addSelect('localGovernment.bceid_business_guid', 'bceid_business_guid') + .addSelect('user.bceid_business_guid', 'bceid_business_guid') .addSelect('noti.type_code', 'notification_type_code') .addSelect('noti.date_submitted_to_alc', 'date_submitted_to_alc') .addSelect('noti.uuid', 'notification_uuid') @@ -31,6 +32,7 @@ import { LinkedStatusType } from '../inbox.dto'; 'status', ) .from(NotificationSubmission, 'noti_sub') + .leftJoin(User, 'user', 'user.uuid = noti_sub.created_by_uuid') .innerJoin( Notification, 'noti', @@ -64,6 +66,9 @@ export class InboxNotificationSubmissionView { @ViewColumn() createdAt: Date; + @ViewColumn() + dateSubmittedToAlc: Date | null; + @ViewColumn() createdByUuid: string; diff --git a/services/apps/alcs/src/portal/inbox/notification/inbox-notification.service.ts b/services/apps/alcs/src/portal/inbox/notification/inbox-notification.service.ts index 0518b097e2..003a4786d6 100644 --- a/services/apps/alcs/src/portal/inbox/notification/inbox-notification.service.ts +++ b/services/apps/alcs/src/portal/inbox/notification/inbox-notification.service.ts @@ -61,6 +61,7 @@ export class InboxNotificationService { , "notificationSearch"."status" , "notificationSearch"."created_by_uuid" , "notificationSearch"."bceid_business_guid" + , "notificationSearch"."date_submitted_to_alc" , "notificationType"."audit_deleted_date_at" , "notificationType"."audit_created_at" , "notificationType"."audit_updated_by" @@ -94,7 +95,7 @@ export class InboxNotificationService { } if (governmentUuid) { where += - ' OR notificationSearch.local_government_uuid = :governmentUuid'; + ' OR (notificationSearch.local_government_uuid = :governmentUuid AND notificationSearch.date_submitted_to_alc IS NOT NULL)'; } } else { if (searchDto.filterBy === 'submitted') { diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1697742680683-add_submitted_to_inbox_views.ts b/services/apps/alcs/src/providers/typeorm/migrations/1697742680683-add_submitted_to_inbox_views.ts new file mode 100644 index 0000000000..0118fa7ae1 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1697742680683-add_submitted_to_inbox_views.ts @@ -0,0 +1,127 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class addSubmittedToInboxViews1697742680683 + implements MigrationInterface +{ + name = 'addSubmittedToInboxViews1697742680683'; + + public async up(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, + ['VIEW', 'inbox_application_submission_view', 'alcs'], + ); + await queryRunner.query( + `DROP VIEW "alcs"."inbox_application_submission_view"`, + ); + await queryRunner.query( + `DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, + ['VIEW', 'inbox_notice_of_intent_submission_view', 'alcs'], + ); + await queryRunner.query( + `DROP VIEW "alcs"."inbox_notice_of_intent_submission_view"`, + ); + await queryRunner.query( + `DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, + ['VIEW', 'inbox_notification_submission_view', 'alcs'], + ); + await queryRunner.query( + `DROP VIEW "alcs"."inbox_notification_submission_view"`, + ); + await queryRunner.query( + `CREATE VIEW "alcs"."inbox_notification_submission_view" AS SELECT "noti_sub"."uuid" AS "uuid", "noti_sub"."applicant" AS "applicant", "noti"."uuid" AS "notification_uuid", "notificationType"."audit_deleted_date_at" AS "notificationType_audit_deleted_date_at", "notificationType"."audit_created_at" AS "notificationType_audit_created_at", "notificationType"."audit_updated_at" AS "notificationType_audit_updated_at", "notificationType"."audit_created_by" AS "notificationType_audit_created_by", "notificationType"."audit_updated_by" AS "notificationType_audit_updated_by", "notificationType"."label" AS "notificationType_label", "notificationType"."code" AS "notificationType_code", "notificationType"."description" AS "notificationType_description", "notificationType"."short_label" AS "notificationType_short_label", "notificationType"."background_color" AS "notificationType_background_color", "notificationType"."text_color" AS "notificationType_text_color", "notificationType"."html_description" AS "notificationType_html_description", "notificationType"."portal_label" AS "notificationType_portal_label", "noti_sub"."file_number" AS "file_number", "noti_sub"."audit_created_at" AS "created_at", "noti_sub"."created_by_uuid" AS "created_by_uuid", "noti_sub"."local_government_uuid" AS "local_government_uuid", "user"."bceid_business_guid" AS "bceid_business_guid", "noti"."type_code" AS "notification_type_code", "noti"."date_submitted_to_alc" AS "date_submitted_to_alc", alcs.get_current_status_for_notification_submission_by_uuid("noti_sub"."uuid") AS "status" FROM "alcs"."notification_submission" "noti_sub" LEFT JOIN "alcs"."user" "user" ON "user"."uuid" = "noti_sub"."created_by_uuid" AND "user"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."notification" "noti" ON "noti"."file_number" = "noti_sub"."file_number" AND "noti"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."notification_type" "notificationType" ON "noti_sub"."type_code" = "notificationType"."code" AND "notificationType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "noti"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL WHERE "noti_sub"."audit_deleted_date_at" IS NULL`, + ); + await queryRunner.query( + `INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, + [ + 'alcs', + 'VIEW', + 'inbox_notification_submission_view', + 'SELECT "noti_sub"."uuid" AS "uuid", "noti_sub"."applicant" AS "applicant", "noti"."uuid" AS "notification_uuid", "notificationType"."audit_deleted_date_at" AS "notificationType_audit_deleted_date_at", "notificationType"."audit_created_at" AS "notificationType_audit_created_at", "notificationType"."audit_updated_at" AS "notificationType_audit_updated_at", "notificationType"."audit_created_by" AS "notificationType_audit_created_by", "notificationType"."audit_updated_by" AS "notificationType_audit_updated_by", "notificationType"."label" AS "notificationType_label", "notificationType"."code" AS "notificationType_code", "notificationType"."description" AS "notificationType_description", "notificationType"."short_label" AS "notificationType_short_label", "notificationType"."background_color" AS "notificationType_background_color", "notificationType"."text_color" AS "notificationType_text_color", "notificationType"."html_description" AS "notificationType_html_description", "notificationType"."portal_label" AS "notificationType_portal_label", "noti_sub"."file_number" AS "file_number", "noti_sub"."audit_created_at" AS "created_at", "noti_sub"."created_by_uuid" AS "created_by_uuid", "noti_sub"."local_government_uuid" AS "local_government_uuid", "user"."bceid_business_guid" AS "bceid_business_guid", "noti"."type_code" AS "notification_type_code", "noti"."date_submitted_to_alc" AS "date_submitted_to_alc", alcs.get_current_status_for_notification_submission_by_uuid("noti_sub"."uuid") AS "status" FROM "alcs"."notification_submission" "noti_sub" LEFT JOIN "alcs"."user" "user" ON "user"."uuid" = "noti_sub"."created_by_uuid" AND "user"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."notification" "noti" ON "noti"."file_number" = "noti_sub"."file_number" AND "noti"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."notification_type" "notificationType" ON "noti_sub"."type_code" = "notificationType"."code" AND "notificationType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "noti"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL WHERE "noti_sub"."audit_deleted_date_at" IS NULL', + ], + ); + await queryRunner.query( + `CREATE VIEW "alcs"."inbox_notice_of_intent_submission_view" AS SELECT "noi_sub"."uuid" AS "uuid", "noi_sub"."applicant" AS "applicant", "noi"."uuid" AS "notice_of_intent_uuid", "noticeOfIntentType"."audit_deleted_date_at" AS "noticeOfIntentType_audit_deleted_date_at", "noticeOfIntentType"."audit_created_at" AS "noticeOfIntentType_audit_created_at", "noticeOfIntentType"."audit_updated_at" AS "noticeOfIntentType_audit_updated_at", "noticeOfIntentType"."audit_created_by" AS "noticeOfIntentType_audit_created_by", "noticeOfIntentType"."audit_updated_by" AS "noticeOfIntentType_audit_updated_by", "noticeOfIntentType"."label" AS "noticeOfIntentType_label", "noticeOfIntentType"."code" AS "noticeOfIntentType_code", "noticeOfIntentType"."description" AS "noticeOfIntentType_description", "noticeOfIntentType"."short_label" AS "noticeOfIntentType_short_label", "noticeOfIntentType"."background_color" AS "noticeOfIntentType_background_color", "noticeOfIntentType"."text_color" AS "noticeOfIntentType_text_color", "noticeOfIntentType"."html_description" AS "noticeOfIntentType_html_description", "noticeOfIntentType"."portal_label" AS "noticeOfIntentType_portal_label", "noi_sub"."file_number" AS "file_number", "noi_sub"."audit_created_at" AS "created_at", "noi_sub"."created_by_uuid" AS "created_by_uuid", "noi_sub"."local_government_uuid" AS "local_government_uuid", "user"."bceid_business_guid" AS "bceid_business_guid", "noi_sub"."type_code" AS "notice_of_intent_type_code", "noi"."date_submitted_to_alc" AS "date_submitted_to_alc", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid") AS "status" FROM "alcs"."notice_of_intent_submission" "noi_sub" INNER JOIN "alcs"."notice_of_intent" "noi" ON "noi"."file_number" = "noi_sub"."file_number" AND "noi"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."user" "user" ON "user"."uuid" = "noi_sub"."created_by_uuid" AND "user"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."notice_of_intent_type" "noticeOfIntentType" ON "noi_sub"."type_code" = "noticeOfIntentType"."code" AND "noticeOfIntentType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "noi_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."notice_of_intent_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "noi_sub"."uuid" LEFT JOIN (SELECT MAX("date") AS "date", notice_of_intent_uuid AS "notice_of_intent_uuid" FROM "alcs"."notice_of_intent_decision" "decision_date" WHERE "decision_date"."audit_deleted_date_at" IS NULL GROUP BY notice_of_intent_uuid) "decision_date" ON decision_date."notice_of_intent_uuid" = "noi"."uuid" WHERE ( "noi_sub"."is_draft" = FALSE ) AND ( "noi_sub"."audit_deleted_date_at" IS NULL )`, + ); + await queryRunner.query( + `INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, + [ + 'alcs', + 'VIEW', + 'inbox_notice_of_intent_submission_view', + 'SELECT "noi_sub"."uuid" AS "uuid", "noi_sub"."applicant" AS "applicant", "noi"."uuid" AS "notice_of_intent_uuid", "noticeOfIntentType"."audit_deleted_date_at" AS "noticeOfIntentType_audit_deleted_date_at", "noticeOfIntentType"."audit_created_at" AS "noticeOfIntentType_audit_created_at", "noticeOfIntentType"."audit_updated_at" AS "noticeOfIntentType_audit_updated_at", "noticeOfIntentType"."audit_created_by" AS "noticeOfIntentType_audit_created_by", "noticeOfIntentType"."audit_updated_by" AS "noticeOfIntentType_audit_updated_by", "noticeOfIntentType"."label" AS "noticeOfIntentType_label", "noticeOfIntentType"."code" AS "noticeOfIntentType_code", "noticeOfIntentType"."description" AS "noticeOfIntentType_description", "noticeOfIntentType"."short_label" AS "noticeOfIntentType_short_label", "noticeOfIntentType"."background_color" AS "noticeOfIntentType_background_color", "noticeOfIntentType"."text_color" AS "noticeOfIntentType_text_color", "noticeOfIntentType"."html_description" AS "noticeOfIntentType_html_description", "noticeOfIntentType"."portal_label" AS "noticeOfIntentType_portal_label", "noi_sub"."file_number" AS "file_number", "noi_sub"."audit_created_at" AS "created_at", "noi_sub"."created_by_uuid" AS "created_by_uuid", "noi_sub"."local_government_uuid" AS "local_government_uuid", "user"."bceid_business_guid" AS "bceid_business_guid", "noi_sub"."type_code" AS "notice_of_intent_type_code", "noi"."date_submitted_to_alc" AS "date_submitted_to_alc", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid") AS "status" FROM "alcs"."notice_of_intent_submission" "noi_sub" INNER JOIN "alcs"."notice_of_intent" "noi" ON "noi"."file_number" = "noi_sub"."file_number" AND "noi"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."user" "user" ON "user"."uuid" = "noi_sub"."created_by_uuid" AND "user"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."notice_of_intent_type" "noticeOfIntentType" ON "noi_sub"."type_code" = "noticeOfIntentType"."code" AND "noticeOfIntentType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "noi_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."notice_of_intent_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "noi_sub"."uuid" LEFT JOIN (SELECT MAX("date") AS "date", notice_of_intent_uuid AS "notice_of_intent_uuid" FROM "alcs"."notice_of_intent_decision" "decision_date" WHERE "decision_date"."audit_deleted_date_at" IS NULL GROUP BY notice_of_intent_uuid) "decision_date" ON decision_date."notice_of_intent_uuid" = "noi"."uuid" WHERE ( "noi_sub"."is_draft" = FALSE ) AND ( "noi_sub"."audit_deleted_date_at" IS NULL )', + ], + ); + await queryRunner.query( + `CREATE VIEW "alcs"."inbox_application_submission_view" AS SELECT "app_sub"."uuid" AS "uuid", "app_sub"."applicant" AS "applicant", "app"."uuid" AS "application_uuid", "applicationType"."audit_deleted_date_at" AS "applicationType_audit_deleted_date_at", "applicationType"."audit_created_at" AS "applicationType_audit_created_at", "applicationType"."audit_updated_at" AS "applicationType_audit_updated_at", "applicationType"."audit_created_by" AS "applicationType_audit_created_by", "applicationType"."audit_updated_by" AS "applicationType_audit_updated_by", "applicationType"."label" AS "applicationType_label", "applicationType"."code" AS "applicationType_code", "applicationType"."description" AS "applicationType_description", "applicationType"."short_label" AS "applicationType_short_label", "applicationType"."background_color" AS "applicationType_background_color", "applicationType"."text_color" AS "applicationType_text_color", "applicationType"."html_description" AS "applicationType_html_description", "applicationType"."portal_label" AS "applicationType_portal_label", "localGovernment"."name" AS "local_government_name", "app_sub"."file_number" AS "file_number", "app_sub"."created_by_uuid" AS "created_by_uuid", "app_sub"."local_government_uuid" AS "local_government_uuid", "app_sub"."audit_created_at" AS "created_at", "user"."bceid_business_guid" AS "bceid_business_guid", "app_sub"."type_code" AS "application_type_code", "app"."date_submitted_to_alc" AS "date_submitted_to_alc", "app_rev"."local_government_file_number" AS "local_government_file_number", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid") AS "status" FROM "alcs"."application_submission" "app_sub" INNER JOIN "alcs"."application" "app" ON "app"."file_number" = "app_sub"."file_number" AND "app"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."user" "user" ON "user"."uuid" = "app_sub"."created_by_uuid" AND "user"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."application_submission_review" "app_rev" ON "app"."file_number" = "app_rev"."application_file_number" AND "app_rev"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."application_type" "applicationType" ON "app_sub"."type_code" = "applicationType"."code" AND "applicationType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "app_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."application_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "app_sub"."uuid" LEFT JOIN (SELECT MAX("date") AS "date", application_uuid AS "application_uuid" FROM "alcs"."application_decision" "decision_date" WHERE "decision_date"."audit_deleted_date_at" IS NULL GROUP BY application_uuid) "decision_date" ON decision_date."application_uuid" = "app"."uuid" WHERE ( "app_sub"."is_draft" = FALSE ) AND ( "app_sub"."audit_deleted_date_at" IS NULL )`, + ); + await queryRunner.query( + `INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, + [ + 'alcs', + 'VIEW', + 'inbox_application_submission_view', + 'SELECT "app_sub"."uuid" AS "uuid", "app_sub"."applicant" AS "applicant", "app"."uuid" AS "application_uuid", "applicationType"."audit_deleted_date_at" AS "applicationType_audit_deleted_date_at", "applicationType"."audit_created_at" AS "applicationType_audit_created_at", "applicationType"."audit_updated_at" AS "applicationType_audit_updated_at", "applicationType"."audit_created_by" AS "applicationType_audit_created_by", "applicationType"."audit_updated_by" AS "applicationType_audit_updated_by", "applicationType"."label" AS "applicationType_label", "applicationType"."code" AS "applicationType_code", "applicationType"."description" AS "applicationType_description", "applicationType"."short_label" AS "applicationType_short_label", "applicationType"."background_color" AS "applicationType_background_color", "applicationType"."text_color" AS "applicationType_text_color", "applicationType"."html_description" AS "applicationType_html_description", "applicationType"."portal_label" AS "applicationType_portal_label", "localGovernment"."name" AS "local_government_name", "app_sub"."file_number" AS "file_number", "app_sub"."created_by_uuid" AS "created_by_uuid", "app_sub"."local_government_uuid" AS "local_government_uuid", "app_sub"."audit_created_at" AS "created_at", "user"."bceid_business_guid" AS "bceid_business_guid", "app_sub"."type_code" AS "application_type_code", "app"."date_submitted_to_alc" AS "date_submitted_to_alc", "app_rev"."local_government_file_number" AS "local_government_file_number", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid") AS "status" FROM "alcs"."application_submission" "app_sub" INNER JOIN "alcs"."application" "app" ON "app"."file_number" = "app_sub"."file_number" AND "app"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."user" "user" ON "user"."uuid" = "app_sub"."created_by_uuid" AND "user"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."application_submission_review" "app_rev" ON "app"."file_number" = "app_rev"."application_file_number" AND "app_rev"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."application_type" "applicationType" ON "app_sub"."type_code" = "applicationType"."code" AND "applicationType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "app_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."application_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "app_sub"."uuid" LEFT JOIN (SELECT MAX("date") AS "date", application_uuid AS "application_uuid" FROM "alcs"."application_decision" "decision_date" WHERE "decision_date"."audit_deleted_date_at" IS NULL GROUP BY application_uuid) "decision_date" ON decision_date."application_uuid" = "app"."uuid" WHERE ( "app_sub"."is_draft" = FALSE ) AND ( "app_sub"."audit_deleted_date_at" IS NULL )', + ], + ); + } + + public async down(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, + ['VIEW', 'inbox_application_submission_view', 'alcs'], + ); + await queryRunner.query( + `DROP VIEW "alcs"."inbox_application_submission_view"`, + ); + await queryRunner.query( + `DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, + ['VIEW', 'inbox_notice_of_intent_submission_view', 'alcs'], + ); + await queryRunner.query( + `DROP VIEW "alcs"."inbox_notice_of_intent_submission_view"`, + ); + await queryRunner.query( + `DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, + ['VIEW', 'inbox_notification_submission_view', 'alcs'], + ); + await queryRunner.query( + `DROP VIEW "alcs"."inbox_notification_submission_view"`, + ); + await queryRunner.query( + `CREATE VIEW "alcs"."inbox_notification_submission_view" AS SELECT "noti_sub"."uuid" AS "uuid", "noti_sub"."applicant" AS "applicant", "noti"."uuid" AS "notification_uuid", "notificationType"."audit_deleted_date_at" AS "notificationType_audit_deleted_date_at", "notificationType"."audit_created_at" AS "notificationType_audit_created_at", "notificationType"."audit_updated_at" AS "notificationType_audit_updated_at", "notificationType"."audit_created_by" AS "notificationType_audit_created_by", "notificationType"."audit_updated_by" AS "notificationType_audit_updated_by", "notificationType"."label" AS "notificationType_label", "notificationType"."code" AS "notificationType_code", "notificationType"."description" AS "notificationType_description", "notificationType"."short_label" AS "notificationType_short_label", "notificationType"."background_color" AS "notificationType_background_color", "notificationType"."text_color" AS "notificationType_text_color", "notificationType"."html_description" AS "notificationType_html_description", "notificationType"."portal_label" AS "notificationType_portal_label", "noti_sub"."file_number" AS "file_number", "noti_sub"."audit_created_at" AS "created_at", "noti_sub"."created_by_uuid" AS "created_by_uuid", "noti_sub"."local_government_uuid" AS "local_government_uuid", "localGovernment"."bceid_business_guid" AS "bceid_business_guid", "noti"."type_code" AS "notification_type_code", "noti"."date_submitted_to_alc" AS "date_submitted_to_alc", alcs.get_current_status_for_notification_submission_by_uuid("noti_sub"."uuid") AS "status" FROM "alcs"."notification_submission" "noti_sub" INNER JOIN "alcs"."notification" "noti" ON "noti"."file_number" = "noti_sub"."file_number" AND "noti"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."notification_type" "notificationType" ON "noti_sub"."type_code" = "notificationType"."code" AND "notificationType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "noti"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL WHERE "noti_sub"."audit_deleted_date_at" IS NULL`, + ); + await queryRunner.query( + `INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, + [ + 'alcs', + 'VIEW', + 'inbox_notification_submission_view', + 'SELECT "noti_sub"."uuid" AS "uuid", "noti_sub"."applicant" AS "applicant", "noti"."uuid" AS "notification_uuid", "notificationType"."audit_deleted_date_at" AS "notificationType_audit_deleted_date_at", "notificationType"."audit_created_at" AS "notificationType_audit_created_at", "notificationType"."audit_updated_at" AS "notificationType_audit_updated_at", "notificationType"."audit_created_by" AS "notificationType_audit_created_by", "notificationType"."audit_updated_by" AS "notificationType_audit_updated_by", "notificationType"."label" AS "notificationType_label", "notificationType"."code" AS "notificationType_code", "notificationType"."description" AS "notificationType_description", "notificationType"."short_label" AS "notificationType_short_label", "notificationType"."background_color" AS "notificationType_background_color", "notificationType"."text_color" AS "notificationType_text_color", "notificationType"."html_description" AS "notificationType_html_description", "notificationType"."portal_label" AS "notificationType_portal_label", "noti_sub"."file_number" AS "file_number", "noti_sub"."audit_created_at" AS "created_at", "noti_sub"."created_by_uuid" AS "created_by_uuid", "noti_sub"."local_government_uuid" AS "local_government_uuid", "localGovernment"."bceid_business_guid" AS "bceid_business_guid", "noti"."type_code" AS "notification_type_code", "noti"."date_submitted_to_alc" AS "date_submitted_to_alc", alcs.get_current_status_for_notification_submission_by_uuid("noti_sub"."uuid") AS "status" FROM "alcs"."notification_submission" "noti_sub" INNER JOIN "alcs"."notification" "noti" ON "noti"."file_number" = "noti_sub"."file_number" AND "noti"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."notification_type" "notificationType" ON "noti_sub"."type_code" = "notificationType"."code" AND "notificationType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "noti"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL WHERE "noti_sub"."audit_deleted_date_at" IS NULL', + ], + ); + await queryRunner.query( + `CREATE VIEW "alcs"."inbox_notice_of_intent_submission_view" AS SELECT "noi_sub"."uuid" AS "uuid", "noi_sub"."applicant" AS "applicant", "noi"."uuid" AS "notice_of_intent_uuid", "noticeOfIntentType"."audit_deleted_date_at" AS "noticeOfIntentType_audit_deleted_date_at", "noticeOfIntentType"."audit_created_at" AS "noticeOfIntentType_audit_created_at", "noticeOfIntentType"."audit_updated_at" AS "noticeOfIntentType_audit_updated_at", "noticeOfIntentType"."audit_created_by" AS "noticeOfIntentType_audit_created_by", "noticeOfIntentType"."audit_updated_by" AS "noticeOfIntentType_audit_updated_by", "noticeOfIntentType"."label" AS "noticeOfIntentType_label", "noticeOfIntentType"."code" AS "noticeOfIntentType_code", "noticeOfIntentType"."description" AS "noticeOfIntentType_description", "noticeOfIntentType"."short_label" AS "noticeOfIntentType_short_label", "noticeOfIntentType"."background_color" AS "noticeOfIntentType_background_color", "noticeOfIntentType"."text_color" AS "noticeOfIntentType_text_color", "noticeOfIntentType"."html_description" AS "noticeOfIntentType_html_description", "noticeOfIntentType"."portal_label" AS "noticeOfIntentType_portal_label", "noi_sub"."file_number" AS "file_number", "noi_sub"."audit_created_at" AS "created_at", "noi_sub"."created_by_uuid" AS "created_by_uuid", "noi_sub"."local_government_uuid" AS "local_government_uuid", "localGovernment"."bceid_business_guid" AS "bceid_business_guid", "noi_sub"."type_code" AS "notice_of_intent_type_code", "noi"."date_submitted_to_alc" AS "date_submitted_to_alc", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid") AS "status" FROM "alcs"."notice_of_intent_submission" "noi_sub" INNER JOIN "alcs"."notice_of_intent" "noi" ON "noi"."file_number" = "noi_sub"."file_number" AND "noi"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."notice_of_intent_type" "noticeOfIntentType" ON "noi_sub"."type_code" = "noticeOfIntentType"."code" AND "noticeOfIntentType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "noi_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."notice_of_intent_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "noi_sub"."uuid" LEFT JOIN (SELECT MAX("date") AS "date", notice_of_intent_uuid AS "notice_of_intent_uuid" FROM "alcs"."notice_of_intent_decision" "decision_date" WHERE "decision_date"."audit_deleted_date_at" IS NULL GROUP BY notice_of_intent_uuid) "decision_date" ON decision_date."notice_of_intent_uuid" = "noi"."uuid" WHERE ( "noi_sub"."is_draft" = FALSE ) AND ( "noi_sub"."audit_deleted_date_at" IS NULL )`, + ); + await queryRunner.query( + `INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, + [ + 'alcs', + 'VIEW', + 'inbox_notice_of_intent_submission_view', + 'SELECT "noi_sub"."uuid" AS "uuid", "noi_sub"."applicant" AS "applicant", "noi"."uuid" AS "notice_of_intent_uuid", "noticeOfIntentType"."audit_deleted_date_at" AS "noticeOfIntentType_audit_deleted_date_at", "noticeOfIntentType"."audit_created_at" AS "noticeOfIntentType_audit_created_at", "noticeOfIntentType"."audit_updated_at" AS "noticeOfIntentType_audit_updated_at", "noticeOfIntentType"."audit_created_by" AS "noticeOfIntentType_audit_created_by", "noticeOfIntentType"."audit_updated_by" AS "noticeOfIntentType_audit_updated_by", "noticeOfIntentType"."label" AS "noticeOfIntentType_label", "noticeOfIntentType"."code" AS "noticeOfIntentType_code", "noticeOfIntentType"."description" AS "noticeOfIntentType_description", "noticeOfIntentType"."short_label" AS "noticeOfIntentType_short_label", "noticeOfIntentType"."background_color" AS "noticeOfIntentType_background_color", "noticeOfIntentType"."text_color" AS "noticeOfIntentType_text_color", "noticeOfIntentType"."html_description" AS "noticeOfIntentType_html_description", "noticeOfIntentType"."portal_label" AS "noticeOfIntentType_portal_label", "noi_sub"."file_number" AS "file_number", "noi_sub"."audit_created_at" AS "created_at", "noi_sub"."created_by_uuid" AS "created_by_uuid", "noi_sub"."local_government_uuid" AS "local_government_uuid", "localGovernment"."bceid_business_guid" AS "bceid_business_guid", "noi_sub"."type_code" AS "notice_of_intent_type_code", "noi"."date_submitted_to_alc" AS "date_submitted_to_alc", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid") AS "status" FROM "alcs"."notice_of_intent_submission" "noi_sub" INNER JOIN "alcs"."notice_of_intent" "noi" ON "noi"."file_number" = "noi_sub"."file_number" AND "noi"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."notice_of_intent_type" "noticeOfIntentType" ON "noi_sub"."type_code" = "noticeOfIntentType"."code" AND "noticeOfIntentType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "noi_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."notice_of_intent_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "noi_sub"."uuid" LEFT JOIN (SELECT MAX("date") AS "date", notice_of_intent_uuid AS "notice_of_intent_uuid" FROM "alcs"."notice_of_intent_decision" "decision_date" WHERE "decision_date"."audit_deleted_date_at" IS NULL GROUP BY notice_of_intent_uuid) "decision_date" ON decision_date."notice_of_intent_uuid" = "noi"."uuid" WHERE ( "noi_sub"."is_draft" = FALSE ) AND ( "noi_sub"."audit_deleted_date_at" IS NULL )', + ], + ); + await queryRunner.query( + `CREATE VIEW "alcs"."inbox_application_submission_view" AS SELECT "app_sub"."uuid" AS "uuid", "app_sub"."applicant" AS "applicant", "app"."uuid" AS "application_uuid", "applicationType"."audit_deleted_date_at" AS "applicationType_audit_deleted_date_at", "applicationType"."audit_created_at" AS "applicationType_audit_created_at", "applicationType"."audit_updated_at" AS "applicationType_audit_updated_at", "applicationType"."audit_created_by" AS "applicationType_audit_created_by", "applicationType"."audit_updated_by" AS "applicationType_audit_updated_by", "applicationType"."label" AS "applicationType_label", "applicationType"."code" AS "applicationType_code", "applicationType"."description" AS "applicationType_description", "applicationType"."short_label" AS "applicationType_short_label", "applicationType"."background_color" AS "applicationType_background_color", "applicationType"."text_color" AS "applicationType_text_color", "applicationType"."html_description" AS "applicationType_html_description", "applicationType"."portal_label" AS "applicationType_portal_label", "localGovernment"."name" AS "local_government_name", "app_sub"."file_number" AS "file_number", "app_sub"."created_by_uuid" AS "created_by_uuid", "app_sub"."local_government_uuid" AS "local_government_uuid", "app_sub"."audit_created_at" AS "created_at", "localGovernment"."bceid_business_guid" AS "bceid_business_guid", "app_sub"."type_code" AS "application_type_code", "app"."date_submitted_to_alc" AS "date_submitted_to_alc", "app_rev"."local_government_file_number" AS "local_government_file_number", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid") AS "status" FROM "alcs"."application_submission" "app_sub" INNER JOIN "alcs"."application" "app" ON "app"."file_number" = "app_sub"."file_number" AND "app"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."application_submission_review" "app_rev" ON "app"."file_number" = "app_rev"."application_file_number" AND "app_rev"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."application_type" "applicationType" ON "app_sub"."type_code" = "applicationType"."code" AND "applicationType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "app_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."application_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "app_sub"."uuid" LEFT JOIN (SELECT MAX("date") AS "date", application_uuid AS "application_uuid" FROM "alcs"."application_decision" "decision_date" WHERE "decision_date"."audit_deleted_date_at" IS NULL GROUP BY application_uuid) "decision_date" ON decision_date."application_uuid" = "app"."uuid" WHERE ( "app_sub"."is_draft" = FALSE ) AND ( "app_sub"."audit_deleted_date_at" IS NULL )`, + ); + await queryRunner.query( + `INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, + [ + 'alcs', + 'VIEW', + 'inbox_application_submission_view', + 'SELECT "app_sub"."uuid" AS "uuid", "app_sub"."applicant" AS "applicant", "app"."uuid" AS "application_uuid", "applicationType"."audit_deleted_date_at" AS "applicationType_audit_deleted_date_at", "applicationType"."audit_created_at" AS "applicationType_audit_created_at", "applicationType"."audit_updated_at" AS "applicationType_audit_updated_at", "applicationType"."audit_created_by" AS "applicationType_audit_created_by", "applicationType"."audit_updated_by" AS "applicationType_audit_updated_by", "applicationType"."label" AS "applicationType_label", "applicationType"."code" AS "applicationType_code", "applicationType"."description" AS "applicationType_description", "applicationType"."short_label" AS "applicationType_short_label", "applicationType"."background_color" AS "applicationType_background_color", "applicationType"."text_color" AS "applicationType_text_color", "applicationType"."html_description" AS "applicationType_html_description", "applicationType"."portal_label" AS "applicationType_portal_label", "localGovernment"."name" AS "local_government_name", "app_sub"."file_number" AS "file_number", "app_sub"."created_by_uuid" AS "created_by_uuid", "app_sub"."local_government_uuid" AS "local_government_uuid", "app_sub"."audit_created_at" AS "created_at", "localGovernment"."bceid_business_guid" AS "bceid_business_guid", "app_sub"."type_code" AS "application_type_code", "app"."date_submitted_to_alc" AS "date_submitted_to_alc", "app_rev"."local_government_file_number" AS "local_government_file_number", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid") AS "status" FROM "alcs"."application_submission" "app_sub" INNER JOIN "alcs"."application" "app" ON "app"."file_number" = "app_sub"."file_number" AND "app"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."application_submission_review" "app_rev" ON "app"."file_number" = "app_rev"."application_file_number" AND "app_rev"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."application_type" "applicationType" ON "app_sub"."type_code" = "applicationType"."code" AND "applicationType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "app_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."application_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "app_sub"."uuid" LEFT JOIN (SELECT MAX("date") AS "date", application_uuid AS "application_uuid" FROM "alcs"."application_decision" "decision_date" WHERE "decision_date"."audit_deleted_date_at" IS NULL GROUP BY application_uuid) "decision_date" ON decision_date."application_uuid" = "app"."uuid" WHERE ( "app_sub"."is_draft" = FALSE ) AND ( "app_sub"."audit_deleted_date_at" IS NULL )', + ], + ); + } +} From 8e8ca60b60843d7e6c02f566e011fa41422d6f48 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Thu, 19 Oct 2023 11:13:23 -0700 Subject: [PATCH 532/954] Update Header and Login Page * Redirect Login -> Home if user is already logged in * Update header to not show profile and logout button when on any public page * Remove Portal Inbox from header --- .../src/app/features/login/login.component.ts | 21 +++++++++++++------ .../app/shared/header/header.component.html | 11 +++++----- .../app/shared/header/header.component.scss | 5 ----- .../src/app/shared/header/header.component.ts | 6 +++--- 4 files changed, 23 insertions(+), 20 deletions(-) diff --git a/portal-frontend/src/app/features/login/login.component.ts b/portal-frontend/src/app/features/login/login.component.ts index a6b76dbf78..f9239f39a2 100644 --- a/portal-frontend/src/app/features/login/login.component.ts +++ b/portal-frontend/src/app/features/login/login.component.ts @@ -1,5 +1,6 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, OnDestroy, OnInit } from '@angular/core'; import { Router } from '@angular/router'; +import { Subject, takeUntil } from 'rxjs'; import { AuthenticationService } from '../../services/authentication/authentication.service'; @Component({ @@ -7,14 +8,17 @@ import { AuthenticationService } from '../../services/authentication/authenticat templateUrl: './login.component.html', styleUrls: ['./login.component.scss'], }) -export class LoginComponent implements OnInit { +export class LoginComponent implements OnInit, OnDestroy { + $destroy = new Subject<void>(); constructor(private authenticationService: AuthenticationService, private router: Router) {} async ngOnInit() { - const hasToken = await this.authenticationService.getToken(); - if (hasToken) { - await this.router.navigateByUrl(''); - } + this.authenticationService.getToken(false); + this.authenticationService.$currentProfile.pipe(takeUntil(this.$destroy)).subscribe((user) => { + if (user) { + this.router.navigateByUrl('/home'); + } + }); } async onLogin() { @@ -28,4 +32,9 @@ export class LoginComponent implements OnInit { async navigateToPublicSearch() { await this.router.navigateByUrl('/public'); } + + ngOnDestroy(): void { + this.$destroy.next(); + this.$destroy.complete(); + } } diff --git a/portal-frontend/src/app/shared/header/header.component.html b/portal-frontend/src/app/shared/header/header.component.html index ba6d59f015..6de2cd7ca1 100644 --- a/portal-frontend/src/app/shared/header/header.component.html +++ b/portal-frontend/src/app/shared/header/header.component.html @@ -4,10 +4,10 @@ <li> <a href="https://www.alc.gov.bc.ca/">ALC Website</a> </li> - <li *ngIf="!isOnSearch"> + <li *ngIf="!isOnPublicPage"> <a routerLink="/public">Public Search</a> </li> - <li *ngIf="isOnSearch"> + <li *ngIf="isOnPublicPage"> <a routerLink="/">Portal</a> </li> </ul> @@ -16,15 +16,15 @@ <div class="title"> <img class="logo" (click)="onClickLogo()" src="assets/alc_logo.svg" alt="ALC Portal" /> <h5 class="center"> - <span *ngIf="isOnSearch">Provincial Agricultural Land Commission Public Search</span> - <span *ngIf="!isOnSearch">Provincial Agricultural Land Commission Portal</span> + <span *ngIf="isOnPublicPage">Provincial Agricultural Land Commission Public Search</span> + <span *ngIf="!isOnPublicPage">Provincial Agricultural Land Commission Portal</span> </h5> <div *ngIf="isAuthenticated" class="burger-menu"> <mat-icon (click)="onMenuToggle()">{{ isMenuOpen ? 'close' : 'menu' }}</mat-icon> </div> </div> - <div *ngIf="isAuthenticated" class="controls"> + <div *ngIf="isAuthenticated && !isOnPublicPage" class="controls"> <button mat-button color="primary" @@ -39,7 +39,6 @@ <h5 class="center"> <div class="item">Business: {{ user?.government || user?.businessName }}</div> <div class="item">Type: {{ user?.businessName ? 'BCeID Business' : 'BCeID Basic' }}</div> </mat-menu> - <button class="inbox-btn" routerLink="/home" mat-flat-button color="primary">Portal Inbox</button> <button class="logout-btn" (click)="onLogout()" mat-stroked-button color="primary">Log Out</button> </div> diff --git a/portal-frontend/src/app/shared/header/header.component.scss b/portal-frontend/src/app/shared/header/header.component.scss index ea846103bf..9e6ff19d22 100644 --- a/portal-frontend/src/app/shared/header/header.component.scss +++ b/portal-frontend/src/app/shared/header/header.component.scss @@ -15,7 +15,6 @@ padding: rem(8) rem(36); } - @media screen and (min-width: $desktopBreakpoint) { padding: rem(8) rem(80); } @@ -92,10 +91,6 @@ header { justify-content: space-between; align-items: center; - button:not(:last-child) { - margin-right: rem(28) !important; - } - .title, .title h5 { display: flex; diff --git a/portal-frontend/src/app/shared/header/header.component.ts b/portal-frontend/src/app/shared/header/header.component.ts index f0a47b29be..385eb080ef 100644 --- a/portal-frontend/src/app/shared/header/header.component.ts +++ b/portal-frontend/src/app/shared/header/header.component.ts @@ -13,7 +13,7 @@ export class HeaderComponent implements OnInit, OnDestroy { private $destroy = new Subject<void>(); isAuthenticated = false; isMenuOpen = false; - isOnSearch = false; + isOnPublicPage = false; title = 'Provincial Agricultural Land Commission Portal'; user: UserDto | undefined; @@ -33,7 +33,7 @@ export class HeaderComponent implements OnInit, OnDestroy { this.router.events.pipe(takeUntil(this.$destroy)).subscribe(() => { const url = window.location.href; - this.isOnSearch = url.includes('public'); + this.isOnPublicPage = url.includes('public'); }); } @@ -72,7 +72,7 @@ export class HeaderComponent implements OnInit, OnDestroy { if (isOnLogin) { targetUrl = '/login'; } - if (this.isOnSearch) { + if (this.isOnPublicPage) { targetUrl = '/public'; } From bb1826ee56b7aaae5ecfd09dc47039c9acf17744 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Thu, 19 Oct 2023 13:31:37 -0700 Subject: [PATCH 533/954] Updates to Reconsiderations * Add new Decision Outcome with 3 options * Re-order fields to match new figma * Hide Outcome date unless it is Refused --- .../decision-v1-dialog.component.ts | 2 +- .../decision-input-v2.component.ts | 2 +- ...edit-reconsideration-dialog.component.html | 52 ++++++++++++++----- ...t-reconsideration-dialog.component.spec.ts | 2 +- .../edit-reconsideration-dialog.component.ts | 24 ++++++--- .../post-decision.component.html | 41 ++++++++++----- .../post-decision/post-decision.component.ts | 9 +++- .../reconsideration-dialog.component.spec.ts | 2 +- .../application-reconsideration.dto.ts | 4 +- .../inline-decision-outcome.component.html | 26 ++++++++++ .../inline-decision-outcome.component.scss | 14 +++++ .../inline-decision-outcome.component.spec.ts | 27 ++++++++++ .../inline-decision-outcome.component.ts | 41 +++++++++++++++ .../inline-review-outcome.component.html | 2 +- alcs-frontend/src/app/shared/shared.module.ts | 3 ++ .../application-reconsideration.dto.ts | 7 ++- .../application-reconsideration.entity.ts | 20 +++++-- ...pplication-reconsideration.service.spec.ts | 1 + .../application-reconsideration.service.ts | 2 + ...ion-reconsideration-outcome-type.entity.ts | 5 ++ .../reconsideration.automapper.profile.ts | 45 +++------------- ...697745047619-add_recon_decision_outcome.ts | 31 +++++++++++ ...97745131329-seed_recon_decision_outcome.ts | 19 +++++++ 23 files changed, 295 insertions(+), 86 deletions(-) create mode 100644 alcs-frontend/src/app/shared/inline-editors/inline-review-decision-outcome/inline-decision-outcome.component.html create mode 100644 alcs-frontend/src/app/shared/inline-editors/inline-review-decision-outcome/inline-decision-outcome.component.scss create mode 100644 alcs-frontend/src/app/shared/inline-editors/inline-review-decision-outcome/inline-decision-outcome.component.spec.ts create mode 100644 alcs-frontend/src/app/shared/inline-editors/inline-review-decision-outcome/inline-decision-outcome.component.ts create mode 100644 services/apps/alcs/src/alcs/application-decision/application-reconsideration/reconsideration-decision-outcome-type/application-reconsideration-outcome-type.entity.ts create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1697745047619-add_recon_decision_outcome.ts create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1697745131329-seed_recon_decision_outcome.ts diff --git a/alcs-frontend/src/app/features/application/decision/decision-v1/decision-v1-dialog/decision-v1-dialog.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v1/decision-v1-dialog/decision-v1-dialog.component.ts index b562dab028..884066d755 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v1/decision-v1-dialog/decision-v1-dialog.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v1/decision-v1-dialog/decision-v1-dialog.component.ts @@ -265,7 +265,7 @@ export class DecisionV1DialogComponent implements OnInit { (reconsideration.type.code === RECONSIDERATION_TYPE.T_33_1 && !reconsideration.resultingDecision) ) .map((reconsideration, index) => ({ - label: `Reconsideration Request #${reconsiderations.length - index} - ${reconsideration.reconsideredDecisions + label: `Reconsideration Request #${reconsiderations.length - index} - ${reconsideration.reconsidersDecisions .map((dec) => `#${dec.resolutionNumber}/${dec.resolutionYear}`) .join(', ')}`, uuid: reconsideration.uuid, diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.ts index f2bf449825..5a8edb798d 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.ts @@ -266,7 +266,7 @@ export class DecisionInputV2Component implements OnInit, OnDestroy { (reconsideration.type.code === RECONSIDERATION_TYPE.T_33_1 && !reconsideration.resultingDecision) ) .map((reconsideration, index) => ({ - label: `Reconsideration Request #${reconsiderations.length - index} - ${reconsideration.reconsideredDecisions + label: `Reconsideration Request #${reconsiderations.length - index} - ${reconsideration.reconsidersDecisions .map((dec) => `#${dec.resolutionNumber}/${dec.resolutionYear}`) .join(', ')}`, uuid: reconsideration.uuid, diff --git a/alcs-frontend/src/app/features/application/post-decision/edit-reconsideration-dialog/edit-reconsideration-dialog.component.html b/alcs-frontend/src/app/features/application/post-decision/edit-reconsideration-dialog/edit-reconsideration-dialog.component.html index cd3c565515..e6618cee74 100644 --- a/alcs-frontend/src/app/features/application/post-decision/edit-reconsideration-dialog/edit-reconsideration-dialog.component.html +++ b/alcs-frontend/src/app/features/application/post-decision/edit-reconsideration-dialog/edit-reconsideration-dialog.component.html @@ -18,13 +18,6 @@ <h2 class="card-title">Edit Reconsideration</h2> <mat-datepicker #datePicker type="date"> </mat-datepicker> </mat-form-field> - <mat-form-field appearance="outline"> - <mat-label>Decisions to be Reconsidered</mat-label> - <mat-select formControlName="reconsidersDecisions" multiple> - <mat-option *ngFor="let decision of decisions" [value]="decision.uuid">{{ decision.resolution }}</mat-option> - </mat-select> - </mat-form-field> - <div class="toggle-group"> <mat-label class="toggle-label">Reconsideration Type *</mat-label> <mat-button-toggle-group @@ -37,6 +30,13 @@ <h2 class="card-title">Edit Reconsideration</h2> </mat-button-toggle-group> </div> + <mat-form-field appearance="outline"> + <mat-label>Resolutions to be Reconsidered*</mat-label> + <mat-select formControlName="reconsidersDecisions" multiple> + <mat-option *ngFor="let decision of decisions" [value]="decision.uuid">{{ decision.resolution }}</mat-option> + </mat-select> + </mat-form-field> + <div> <mat-label>New Evidence*</mat-label> <mat-button-toggle-group required id="isNewEvidence" formControlName="isNewEvidence"> @@ -61,16 +61,45 @@ <h2 class="card-title">Edit Reconsideration</h2> </mat-button-toggle-group> </div> + <mat-form-field appearance="outline" class="full-grid-line"> + <mat-label>Request Description</mat-label> + <input matInput id="description" formControlName="description" type="text" /> + </mat-form-field> + <div *ngIf="typeControl.value === '33'" class="full-grid-line toggle-group"> <mat-label class="toggle-label">Review Outcome <span>*</span></mat-label> - <mat-button-toggle-group id="reviewOutcomeCode" formControlName="reviewOutcomeCode" name="reviewOutcomeCode"> + <mat-button-toggle-group + (change)="onChangeReviewOutcome()" + id="reviewOutcomeCode" + formControlName="reviewOutcomeCode" + name="reviewOutcomeCode" + > <mat-button-toggle value="PEN">Pending</mat-button-toggle> <mat-button-toggle value="PRC">Proceed to Reconsider</mat-button-toggle> <mat-button-toggle value="REF">Refuse to Reconsider</mat-button-toggle> </mat-button-toggle-group> </div> - <mat-form-field *ngIf="typeControl.value === '33'" appearance="outline" class="date-picker full-grid-line"> + <div *ngIf="reviewOutcomeCodeControl.value === 'PRC'" class="full-grid-line toggle-group"> + <mat-label class="toggle-label" + >Does the reconsideration confirm, reverse, or vary the previous decision?*<span>*</span></mat-label + > + <mat-button-toggle-group + id="decisionOutcomeCode" + formControlName="decisionOutcomeCode" + name="decisionOutcomeCode" + > + <mat-button-toggle value="CONF">Confirm</mat-button-toggle> + <mat-button-toggle value="REVE">Reverse</mat-button-toggle> + <mat-button-toggle value="VARY">Vary</mat-button-toggle> + </mat-button-toggle-group> + </div> + + <mat-form-field + *ngIf="typeControl.value === '33' && reviewOutcomeCodeControl.value === 'REF'" + appearance="outline" + class="date-picker full-grid-line" + > <mat-label> Outcome Notification Date <mat-icon matTooltip="The date that the applicant/affected party is notified of the review outcome"> @@ -87,11 +116,6 @@ <h2 class="card-title">Edit Reconsideration</h2> <mat-datepicker-toggle matSuffix [for]="reviewDatePicker"></mat-datepicker-toggle> <mat-datepicker #reviewDatePicker type="date"> </mat-datepicker> </mat-form-field> - - <mat-form-field appearance="outline" class="full-grid-line"> - <mat-label>Request Description</mat-label> - <input matInput id="description" formControlName="description" type="text" /> - </mat-form-field> </div> </mat-dialog-content> <mat-dialog-actions align="end"> diff --git a/alcs-frontend/src/app/features/application/post-decision/edit-reconsideration-dialog/edit-reconsideration-dialog.component.spec.ts b/alcs-frontend/src/app/features/application/post-decision/edit-reconsideration-dialog/edit-reconsideration-dialog.component.spec.ts index a4a9fbdc39..69f3e34c49 100644 --- a/alcs-frontend/src/app/features/application/post-decision/edit-reconsideration-dialog/edit-reconsideration-dialog.component.spec.ts +++ b/alcs-frontend/src/app/features/application/post-decision/edit-reconsideration-dialog/edit-reconsideration-dialog.component.spec.ts @@ -29,7 +29,7 @@ describe('EditReconsiderationDialogComponent', () => { }, { provide: MAT_DIALOG_DATA, - useValue: { existingRecon: { type: {}, reconsideredDecisions: [], application: { source: 'fake' } } }, + useValue: { existingRecon: { type: {}, reconsidersDecisions: [], application: { source: 'fake' } } }, }, { provide: MatDialogRef, useValue: {} }, ], diff --git a/alcs-frontend/src/app/features/application/post-decision/edit-reconsideration-dialog/edit-reconsideration-dialog.component.ts b/alcs-frontend/src/app/features/application/post-decision/edit-reconsideration-dialog/edit-reconsideration-dialog.component.ts index 6bba254b83..6627a0f684 100644 --- a/alcs-frontend/src/app/features/application/post-decision/edit-reconsideration-dialog/edit-reconsideration-dialog.component.ts +++ b/alcs-frontend/src/app/features/application/post-decision/edit-reconsideration-dialog/edit-reconsideration-dialog.component.ts @@ -24,12 +24,15 @@ export class EditReconsiderationDialogComponent implements OnInit { typeControl = new FormControl<string | undefined>(undefined, [Validators.required]); reviewOutcomeCodeControl = new FormControl<string | null>(null); + decisionOutcomeCodeControl = new FormControl<string | null>(null); + reviewDateControl = new FormControl<Date | null | undefined>(null); form: FormGroup = new FormGroup({ submittedDate: new FormControl<Date | undefined>(undefined, [Validators.required]), type: this.typeControl, reviewOutcomeCode: this.reviewOutcomeCodeControl, - reviewDate: new FormControl<Date | null | undefined>(null), + decisionOutcomeCode: this.decisionOutcomeCodeControl, + reviewDate: this.reviewDateControl, reconsidersDecisions: new FormControl<string[]>([], [Validators.required]), description: new FormControl<string | null>('', [Validators.required]), isNewProposal: new FormControl<string | undefined>(undefined, [Validators.required]), @@ -59,8 +62,9 @@ export class EditReconsiderationDialogComponent implements OnInit { data.existingRecon.type.code === RECONSIDERATION_TYPE.T_33 ? data.existingRecon.reviewOutcome?.code || 'PEN' : null, + decisionOutcomeCode: data.existingRecon.decisionOutcome?.code, reviewDate: data.existingRecon.reviewDate ? new Date(data.existingRecon.reviewDate) : null, - reconsidersDecisions: data.existingRecon.reconsideredDecisions.map((dec) => dec.uuid), + reconsidersDecisions: data.existingRecon.reconsidersDecisions.map((dec) => dec.uuid), description: data.existingRecon.description ?? null, isNewProposal: parseBooleanToString(data.existingRecon.isNewProposal), isIncorrectFalseInfo: parseBooleanToString(data.existingRecon.isIncorrectFalseInfo), @@ -85,10 +89,12 @@ export class EditReconsiderationDialogComponent implements OnInit { isNewProposal, isIncorrectFalseInfo, isNewEvidence, + decisionOutcomeCode, } = this.form.getRawValue(); const data: UpdateApplicationReconsiderationDto = { submittedDate: formatDateForApi(submittedDate!), reviewOutcomeCode: reviewOutcomeCode, + decisionOutcomeCode: decisionOutcomeCode, typeCode: type!, reviewDate: reviewDate ? formatDateForApi(reviewDate) : reviewDate, reconsideredDecisionUuids: reconsidersDecisions || [], @@ -121,13 +127,15 @@ export class EditReconsiderationDialogComponent implements OnInit { async onTypeReconsiderationChange(reconsiderationType: string) { if (reconsiderationType === RECONSIDERATION_TYPE.T_33_1) { - this.form.patchValue({ - reviewOutcomeCode: null, - }); + this.reviewOutcomeCodeControl.setValue(null); } else { - this.form.patchValue({ - reviewOutcomeCode: 'PEN', - }); + this.reviewOutcomeCodeControl.setValue('PEN'); } } + + onChangeReviewOutcome() { + //Clear fields that only show up sometimes + this.decisionOutcomeCodeControl.setValue(null); + this.reviewDateControl.setValue(null); + } } diff --git a/alcs-frontend/src/app/features/application/post-decision/post-decision.component.html b/alcs-frontend/src/app/features/application/post-decision/post-decision.component.html index 2ad9a4abc4..aaf8883ae7 100644 --- a/alcs-frontend/src/app/features/application/post-decision/post-decision.component.html +++ b/alcs-frontend/src/app/features/application/post-decision/post-decision.component.html @@ -61,7 +61,24 @@ <h5 id="recons" class="post-decision-header"> {{ reconsideration.isNewProposal | booleanToString }} </div> + <div class="full-grid-line"> + <div class="subheading2">Request Description</div> + {{ reconsideration.description }} + </div> + <div *ngIf="reconsideration.type.code === '33'"> + <div class="subheading2">Review Outcome</div> + <span *ngIf="!reconsideration.reviewOutcome || reconsideration.reviewOutcome?.code === 'PEN'"> + <app-inline-review-outcome + (save)="onSaveReconsiderationReviewOutcome(reconsideration.uuid, $event)" + ></app-inline-review-outcome> + </span> + <span *ngIf="reconsideration.reviewOutcome && reconsideration.reviewOutcome?.code !== 'PEN'">{{ + reconsideration.reviewOutcome.label + }}</span> + </div> + + <div *ngIf="reconsideration.type.code === '33' && reconsideration.reviewOutcome?.code === 'REF'"> <div class="subheading2 left"> Outcome Notification Date <mat-icon matTooltip="The date that the applicant/affected party is notified of the review outcome"> @@ -76,27 +93,23 @@ <h5 id="recons" class="post-decision-header"> </span> </div> - <div *ngIf="reconsideration.type.code === '33'"> - <div class="subheading2">Review Outcome</div> - <span *ngIf="!reconsideration.reviewOutcome || reconsideration.reviewOutcome?.code === 'PEN'"> - <app-inline-review-outcome - (save)="onSaveReconsiderationReviewOutcome(reconsideration.uuid, $event)" - ></app-inline-review-outcome> + <div *ngIf="reconsideration.reviewOutcome?.code === 'PRC'"> + <div class="subheading2"> + Does the reconsideration confirm, reverse, or vary + {{ reconsideration.reconsidersDecisionsNumbers.join(', ') }}? + </div> + <span *ngIf="!reconsideration.decisionOutcome"> + <app-inline-decision-outcome + (save)="onSaveReconsiderationDecisionOutcome(reconsideration.uuid, $event)" + ></app-inline-decision-outcome> </span> - <span *ngIf="reconsideration.reviewOutcome && reconsideration.reviewOutcome?.code !== 'PEN'">{{ - reconsideration.reviewOutcome.label - }}</span> + <span *ngIf="reconsideration.decisionOutcome">{{ reconsideration.decisionOutcome.label }}</span> </div> <div *ngIf="!!reconsideration.resultingDecision"> <div class="subheading2">Resulting Resolution</div> #{{ reconsideration.resultingDecision.resolutionNumber }}/{{ reconsideration.resultingDecision.resolutionYear }} </div> - - <div class="full-grid-line"> - <div class="subheading2">Request Description</div> - {{ reconsideration.description }} - </div> </div> </div> </section> diff --git a/alcs-frontend/src/app/features/application/post-decision/post-decision.component.ts b/alcs-frontend/src/app/features/application/post-decision/post-decision.component.ts index 66ba09cbb6..1c3994fec7 100644 --- a/alcs-frontend/src/app/features/application/post-decision/post-decision.component.ts +++ b/alcs-frontend/src/app/features/application/post-decision/post-decision.component.ts @@ -62,7 +62,7 @@ export class PostDecisionComponent implements OnInit, OnDestroy { this.reconsiderations = reconsiderations?.map((r) => ({ ...r, - reconsidersDecisionsNumbers: r.reconsideredDecisions.flatMap( + reconsidersDecisionsNumbers: r.reconsidersDecisions.flatMap( (d) => `#${d.resolutionNumber}/${d.resolutionYear}` ), })) ?? []; @@ -162,6 +162,13 @@ export class PostDecisionComponent implements OnInit, OnDestroy { await this.applicationReconsiderationService.fetchByApplication(this.fileNumber); } + async onSaveReconsiderationDecisionOutcome(reconsiderationUuid: string, decisionOutcomeCode: string) { + await this.applicationReconsiderationService.update(reconsiderationUuid, { + decisionOutcomeCode, + }); + await this.applicationReconsiderationService.fetchByApplication(this.fileNumber); + } + async onSaveModificationReviewDate(uuid: string, reviewDate: number) { await this.modificationService.update(uuid, { reviewDate: formatDateForApi(reviewDate), diff --git a/alcs-frontend/src/app/features/board/dialogs/reconsiderations/reconsideration-dialog.component.spec.ts b/alcs-frontend/src/app/features/board/dialogs/reconsiderations/reconsideration-dialog.component.spec.ts index e3222c716c..8fa3a1789f 100644 --- a/alcs-frontend/src/app/features/board/dialogs/reconsiderations/reconsideration-dialog.component.spec.ts +++ b/alcs-frontend/src/app/features/board/dialogs/reconsiderations/reconsideration-dialog.component.spec.ts @@ -35,7 +35,7 @@ describe('ReconsiderationDialogComponent', () => { const mockReconDto: ApplicationReconsiderationDto = { uuid: '', - reconsideredDecisions: [], + reconsidersDecisions: [], board: { code: 'fake', title: 'Fake', diff --git a/alcs-frontend/src/app/services/application/application-reconsideration/application-reconsideration.dto.ts b/alcs-frontend/src/app/services/application/application-reconsideration/application-reconsideration.dto.ts index a61462469e..00a488f758 100644 --- a/alcs-frontend/src/app/services/application/application-reconsideration/application-reconsideration.dto.ts +++ b/alcs-frontend/src/app/services/application/application-reconsideration/application-reconsideration.dto.ts @@ -41,7 +41,8 @@ export interface ApplicationReconsiderationDto { board: BoardSmallDto; reviewDate?: number; reviewOutcome?: ReconsiderationReviewOutcomeTypeDto | null; - reconsideredDecisions: ApplicationDecisionDto[]; + decisionOutcome?: ReconsiderationReviewOutcomeTypeDto | null; + reconsidersDecisions: ApplicationDecisionDto[]; resultingDecision: ApplicationDecisionDto | null; description?: string; isNewProposal?: boolean | null; @@ -72,6 +73,7 @@ export interface UpdateApplicationReconsiderationDto { typeCode?: string | undefined; reviewDate?: number | null; reviewOutcomeCode?: string | null; + decisionOutcomeCode?: string | null; reconsideredDecisionUuids?: string[]; description?: string; isNewProposal?: boolean | null; diff --git a/alcs-frontend/src/app/shared/inline-editors/inline-review-decision-outcome/inline-decision-outcome.component.html b/alcs-frontend/src/app/shared/inline-editors/inline-review-decision-outcome/inline-decision-outcome.component.html new file mode 100644 index 0000000000..cd563bbbb1 --- /dev/null +++ b/alcs-frontend/src/app/shared/inline-editors/inline-review-decision-outcome/inline-decision-outcome.component.html @@ -0,0 +1,26 @@ +<div> + <span *ngIf="!isEditing"> + <a (click)="toggleEdit()" class="add-date" *ngIf="!pendingReviewOutcome"> Select Outcome </a> + <span *ngIf="!pendingReviewOutcome"> + {{ pendingReviewOutcome }} + </span> + </span> + <div + class="editing" + [ngClass]="{ + hidden: !isEditing + }" + > + <form [formGroup]="form"> + <mat-button-toggle-group id="decisionOutcome" formControlName="decisionOutcome" name="decisionOutcome"> + <mat-button-toggle value="CONF">Confirm</mat-button-toggle> + <mat-button-toggle value="REVE">Reverse</mat-button-toggle> + <mat-button-toggle value="VARY">Vary</mat-button-toggle> + </mat-button-toggle-group> + </form> + <div class="button-container"> + <button mat-button (click)="toggleEdit()">CANCEL</button> + <button mat-button class="save" (click)="onSave()">SAVE</button> + </div> + </div> +</div> diff --git a/alcs-frontend/src/app/shared/inline-editors/inline-review-decision-outcome/inline-decision-outcome.component.scss b/alcs-frontend/src/app/shared/inline-editors/inline-review-decision-outcome/inline-decision-outcome.component.scss new file mode 100644 index 0000000000..820f56a50d --- /dev/null +++ b/alcs-frontend/src/app/shared/inline-editors/inline-review-decision-outcome/inline-decision-outcome.component.scss @@ -0,0 +1,14 @@ +@use '../../../../styles/colors'; + +.editing.hidden { + display: none; +} + +.button-container { + button:not(:last-child) { + margin-right: 2px !important; + } + .save { + color: colors.$primary-color; + } +} diff --git a/alcs-frontend/src/app/shared/inline-editors/inline-review-decision-outcome/inline-decision-outcome.component.spec.ts b/alcs-frontend/src/app/shared/inline-editors/inline-review-decision-outcome/inline-decision-outcome.component.spec.ts new file mode 100644 index 0000000000..dbfb1888dd --- /dev/null +++ b/alcs-frontend/src/app/shared/inline-editors/inline-review-decision-outcome/inline-decision-outcome.component.spec.ts @@ -0,0 +1,27 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { FormsModule, ReactiveFormsModule } from '@angular/forms'; +import { MatButtonToggleModule } from '@angular/material/button-toggle'; +import { SharedModule } from '../../shared.module'; + +import { InlineDecisionOutcomeComponent } from './inline-decision-outcome.component'; + +describe('InlineDecisionOutcomeComponent', () => { + let component: InlineDecisionOutcomeComponent; + let fixture: ComponentFixture<InlineDecisionOutcomeComponent>; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [SharedModule, FormsModule, ReactiveFormsModule, MatButtonToggleModule], + declarations: [InlineDecisionOutcomeComponent], + providers: [], + }).compileComponents(); + + fixture = TestBed.createComponent(InlineDecisionOutcomeComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/alcs-frontend/src/app/shared/inline-editors/inline-review-decision-outcome/inline-decision-outcome.component.ts b/alcs-frontend/src/app/shared/inline-editors/inline-review-decision-outcome/inline-decision-outcome.component.ts new file mode 100644 index 0000000000..1da90de188 --- /dev/null +++ b/alcs-frontend/src/app/shared/inline-editors/inline-review-decision-outcome/inline-decision-outcome.component.ts @@ -0,0 +1,41 @@ +import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; +import { FormBuilder, FormGroup } from '@angular/forms'; + +@Component({ + selector: 'app-inline-decision-outcome', + templateUrl: './inline-decision-outcome.component.html', + styleUrls: ['./inline-decision-outcome.component.scss'], +}) +export class InlineDecisionOutcomeComponent implements OnInit { + @Input() selectedValue?: string | null; + @Input() isModification = false; + + @Output() save = new EventEmitter<string>(); + + form!: FormGroup; + isEditing = false; + pendingReviewOutcome?: string | null; + + constructor(private fb: FormBuilder) { + this.pendingReviewOutcome = this.selectedValue; + } + + ngOnInit(): void { + this.form = this.fb.group({ + decisionOutcome: this.selectedValue, + }); + } + + toggleEdit() { + this.isEditing = !this.isEditing; + this.selectedValue = 'PEN'; + this.form = this.fb.group({ + decisionOutcome: this.selectedValue, + }); + } + + onSave() { + this.save.emit(this.form.get('decisionOutcome')!.value); + this.isEditing = false; + } +} diff --git a/alcs-frontend/src/app/shared/inline-editors/inline-review-outcome/inline-review-outcome.component.html b/alcs-frontend/src/app/shared/inline-editors/inline-review-outcome/inline-review-outcome.component.html index 1d935f19bd..89e7cd39f3 100644 --- a/alcs-frontend/src/app/shared/inline-editors/inline-review-outcome/inline-review-outcome.component.html +++ b/alcs-frontend/src/app/shared/inline-editors/inline-review-outcome/inline-review-outcome.component.html @@ -1,6 +1,6 @@ <div> <span *ngIf="!isEditing"> - <a (click)="toggleEdit()" class="add-date" *ngIf="!pendingReviewOutcome"> Select outcome </a> + <a (click)="toggleEdit()" class="add-date" *ngIf="!pendingReviewOutcome"> Select Outcome </a> <span *ngIf="!pendingReviewOutcome || pendingReviewOutcome === 'PEN'"> {{ pendingReviewOutcome }} </span> diff --git a/alcs-frontend/src/app/shared/shared.module.ts b/alcs-frontend/src/app/shared/shared.module.ts index acf4f6e46a..098804ec82 100644 --- a/alcs-frontend/src/app/shared/shared.module.ts +++ b/alcs-frontend/src/app/shared/shared.module.ts @@ -47,6 +47,7 @@ import { InlineDatepickerComponent } from './inline-editors/inline-datepicker/in import { InlineDropdownComponent } from './inline-editors/inline-dropdown/inline-dropdown.component'; import { InlineNgSelectComponent } from './inline-editors/inline-ng-select/inline-ng-select.component'; import { InlineNumberComponent } from './inline-editors/inline-number/inline-number.component'; +import { InlineDecisionOutcomeComponent } from './inline-editors/inline-review-decision-outcome/inline-decision-outcome.component'; import { InlineReviewOutcomeComponent } from './inline-editors/inline-review-outcome/inline-review-outcome.component'; import { InlineTextComponent } from './inline-editors/inline-text/inline-text.component'; import { InlineTextareaEditComponent } from './inline-editors/inline-textarea-edit/inline-textarea-edit.component'; @@ -95,6 +96,7 @@ import { WarningBannerComponent } from './warning-banner/warning-banner.componen StaffJournalNoteComponent, StaffJournalNoteInputComponent, InlineReviewOutcomeComponent, + InlineDecisionOutcomeComponent, BooleanToStringPipe, NoDataComponent, ApplicationSubmissionStatusTypePillComponent, @@ -188,6 +190,7 @@ import { WarningBannerComponent } from './warning-banner/warning-banner.componen StaffJournalNoteComponent, StaffJournalNoteInputComponent, InlineReviewOutcomeComponent, + InlineDecisionOutcomeComponent, BooleanToStringPipe, NoDataComponent, ApplicationSubmissionStatusTypePillComponent, diff --git a/services/apps/alcs/src/alcs/application-decision/application-reconsideration/application-reconsideration.dto.ts b/services/apps/alcs/src/alcs/application-decision/application-reconsideration/application-reconsideration.dto.ts index 68895acff8..8b5a38d686 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-reconsideration/application-reconsideration.dto.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-reconsideration/application-reconsideration.dto.ts @@ -93,6 +93,10 @@ export class ApplicationReconsiderationUpdateDto { @IsOptional() reviewOutcomeCode?: string; + @IsString() + @IsOptional() + decisionOutcomeCode?: string; + @IsOptional() @IsArray() @ArrayNotEmpty() @@ -151,6 +155,7 @@ export class ApplicationReconsiderationDto extends ApplicationReconsiderationWit submittedDate: number; reviewDate: number; reviewOutcome: ApplicationReconsiderationOutcomeCodeDto | null; - reconsideredDecisions: ApplicationDecisionDto[]; + decisionOutcome: ApplicationReconsiderationOutcomeCodeDto | null; + reconsidersDecisions: ApplicationDecisionDto[]; resultingDecision?: ApplicationDecisionDto; } diff --git a/services/apps/alcs/src/alcs/application-decision/application-reconsideration/application-reconsideration.entity.ts b/services/apps/alcs/src/alcs/application-decision/application-reconsideration/application-reconsideration.entity.ts index 5ccea0691d..2c9cd5ce8b 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-reconsideration/application-reconsideration.entity.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-reconsideration/application-reconsideration.entity.ts @@ -57,7 +57,7 @@ export class ApplicationReconsideration extends Base { @Column({ type: 'boolean', nullable: true }) isNewEvidence?: boolean; - @AutoMap() + @AutoMap(() => ApplicationReconsiderationType) @ManyToOne(() => ApplicationReconsiderationType, { nullable: false, }) @@ -67,17 +67,27 @@ export class ApplicationReconsideration extends Base { @Column({ nullable: true, type: 'text' }) reviewOutcomeCode?: string | null; - @AutoMap() + @AutoMap(() => ApplicationReconsiderationOutcomeType) @ManyToOne(() => ApplicationReconsiderationOutcomeType, { nullable: true, }) reviewOutcome: ApplicationReconsiderationOutcomeType | null; + @AutoMap() + @Column({ nullable: true, type: 'text' }) + decisionOutcomeCode?: string | null; + + @AutoMap(() => ApplicationReconsiderationOutcomeType) + @ManyToOne(() => ApplicationReconsiderationOutcomeType, { + nullable: true, + }) + decisionOutcome: ApplicationReconsiderationOutcomeType | null; + @AutoMap() @Column({ type: 'uuid' }) applicationUuid: string; - @AutoMap() + @AutoMap(() => Application) @ManyToOne(() => Application, { cascade: ['insert'] }) application: Application; @@ -85,18 +95,20 @@ export class ApplicationReconsideration extends Base { @Column({ type: 'uuid' }) cardUuid: string; - @AutoMap() + @AutoMap(() => Card) @OneToOne(() => Card, { cascade: true }) @JoinColumn() @Type(() => Card) card: Card | null; + @AutoMap(() => [ApplicationDecision]) @ManyToMany(() => ApplicationDecision, (decision) => decision.reconsideredBy) @JoinTable({ name: 'application_reconsidered_decisions', }) reconsidersDecisions: ApplicationDecision[]; + @AutoMap(() => ApplicationDecision) @OneToOne(() => ApplicationDecision, (dec) => dec.reconsiders) resultingDecision?: ApplicationDecision; } diff --git a/services/apps/alcs/src/alcs/application-decision/application-reconsideration/application-reconsideration.service.spec.ts b/services/apps/alcs/src/alcs/application-decision/application-reconsideration/application-reconsideration.service.spec.ts index c9c60eabbf..0156c6d2b5 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-reconsideration/application-reconsideration.service.spec.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-reconsideration/application-reconsideration.service.spec.ts @@ -77,6 +77,7 @@ describe('ReconsiderationService', () => { type: true, resultingDecision: true, reviewOutcome: true, + decisionOutcome: true, }; beforeEach(async () => { diff --git a/services/apps/alcs/src/alcs/application-decision/application-reconsideration/application-reconsideration.service.ts b/services/apps/alcs/src/alcs/application-decision/application-reconsideration/application-reconsideration.service.ts index d79a62a3eb..31f65e595e 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-reconsideration/application-reconsideration.service.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-reconsideration/application-reconsideration.service.ts @@ -80,6 +80,7 @@ export class ApplicationReconsiderationService { reconsidersDecisions: true, resultingDecision: true, reviewOutcome: true, + decisionOutcome: true, }; getByBoard(boardUuid: string) { @@ -201,6 +202,7 @@ export class ApplicationReconsiderationService { } reconsideration.reviewOutcomeCode = updateDto.reviewOutcomeCode; + reconsideration.decisionOutcomeCode = updateDto.decisionOutcomeCode; if ( reconsideration.type.code === RECONSIDERATION_TYPE.T_33 && diff --git a/services/apps/alcs/src/alcs/application-decision/application-reconsideration/reconsideration-decision-outcome-type/application-reconsideration-outcome-type.entity.ts b/services/apps/alcs/src/alcs/application-decision/application-reconsideration/reconsideration-decision-outcome-type/application-reconsideration-outcome-type.entity.ts new file mode 100644 index 0000000000..b679a87418 --- /dev/null +++ b/services/apps/alcs/src/alcs/application-decision/application-reconsideration/reconsideration-decision-outcome-type/application-reconsideration-outcome-type.entity.ts @@ -0,0 +1,5 @@ +import { Entity } from 'typeorm'; +import { BaseCodeEntity } from '../../../../common/entities/base.code.entity'; + +@Entity() +export class ApplicationReconsiderationDecisionOutcomeType extends BaseCodeEntity {} diff --git a/services/apps/alcs/src/common/automapper/reconsideration.automapper.profile.ts b/services/apps/alcs/src/common/automapper/reconsideration.automapper.profile.ts index 331d5e623f..32f8f64480 100644 --- a/services/apps/alcs/src/common/automapper/reconsideration.automapper.profile.ts +++ b/services/apps/alcs/src/common/automapper/reconsideration.automapper.profile.ts @@ -14,6 +14,7 @@ import { ReconsiderationTypeDto, } from '../../alcs/application-decision/application-reconsideration/application-reconsideration.dto'; import { ApplicationReconsideration } from '../../alcs/application-decision/application-reconsideration/application-reconsideration.entity'; +import { ApplicationReconsiderationDecisionOutcomeType } from '../../alcs/application-decision/application-reconsideration/reconsideration-decision-outcome-type/application-reconsideration-outcome-type.entity'; import { ApplicationReconsiderationOutcomeType } from '../../alcs/application-decision/application-reconsideration/reconsideration-outcome-type/application-reconsideration-outcome-type.entity'; import { ApplicationReconsiderationType } from '../../alcs/application-decision/application-reconsideration/reconsideration-type/application-reconsideration-type.entity'; import { Application } from '../../alcs/application/application.entity'; @@ -84,44 +85,6 @@ export class ReconsiderationProfile extends AutomapperProfile { (a) => a.reviewDate, mapFrom((rd) => rd.reviewDate?.getTime()), ), - forMember( - (a) => a.card, - mapFrom((rd) => this.mapper.map(rd.card, Card, CardDto)), - ), - forMember( - (a) => a.reconsideredDecisions, - mapFrom((rd) => - this.mapper.mapArray( - rd.reconsidersDecisions ?? [], - ApplicationDecision, - ApplicationDecisionDto, - ), - ), - ), - forMember( - (a) => a.resultingDecision, - mapFrom((rd) => - rd.resultingDecision - ? this.mapper.map( - rd.resultingDecision, - ApplicationDecision, - ApplicationDecisionDto, - ) - : undefined, - ), - ), - forMember( - (a) => a.reviewOutcome, - mapFrom((rd) => - rd.reviewOutcome - ? this.mapper.map( - rd.reviewOutcome, - ApplicationReconsiderationOutcomeType, - ApplicationReconsiderationOutcomeCodeDto, - ) - : null, - ), - ), ); createMap( @@ -130,6 +93,12 @@ export class ReconsiderationProfile extends AutomapperProfile { ApplicationReconsiderationOutcomeCodeDto, ); + createMap( + mapper, + ApplicationReconsiderationDecisionOutcomeType, + ApplicationReconsiderationOutcomeCodeDto, + ); + createMap( mapper, ApplicationReconsideration, diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1697745047619-add_recon_decision_outcome.ts b/services/apps/alcs/src/providers/typeorm/migrations/1697745047619-add_recon_decision_outcome.ts new file mode 100644 index 0000000000..67021130ca --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1697745047619-add_recon_decision_outcome.ts @@ -0,0 +1,31 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class addReconDecisionOutcome1697745047619 + implements MigrationInterface +{ + name = 'addReconDecisionOutcome1697745047619'; + + public async up(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `CREATE TABLE "alcs"."application_reconsideration_decision_outcome_type" ("audit_deleted_date_at" TIMESTAMP WITH TIME ZONE, "audit_created_at" TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now(), "audit_updated_at" TIMESTAMP WITH TIME ZONE DEFAULT now(), "audit_created_by" character varying NOT NULL, "audit_updated_by" character varying, "label" character varying NOT NULL, "code" text NOT NULL, "description" text NOT NULL, CONSTRAINT "UQ_cbc26f96619063caff5e504b1a6" UNIQUE ("description"), CONSTRAINT "PK_7bbc4f41af4ccdf91600ab2213b" PRIMARY KEY ("code"))`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_reconsideration" ADD "decision_outcome_code" text`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_reconsideration" ADD CONSTRAINT "FK_5ff8560b8706d509474e4124435" FOREIGN KEY ("decision_outcome_code") REFERENCES "alcs"."application_reconsideration_outcome_type"("code") ON DELETE NO ACTION ON UPDATE NO ACTION`, + ); + } + + public async down(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `ALTER TABLE "alcs"."application_reconsideration" DROP CONSTRAINT "FK_5ff8560b8706d509474e4124435"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_reconsideration" DROP COLUMN "decision_outcome_code"`, + ); + await queryRunner.query( + `DROP TABLE "alcs"."application_reconsideration_decision_outcome_type"`, + ); + } +} diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1697745131329-seed_recon_decision_outcome.ts b/services/apps/alcs/src/providers/typeorm/migrations/1697745131329-seed_recon_decision_outcome.ts new file mode 100644 index 0000000000..c7ca40b4dc --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1697745131329-seed_recon_decision_outcome.ts @@ -0,0 +1,19 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class seedReconDecisionOutcome1697745131329 + implements MigrationInterface +{ + public async up(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query(` + INSERT INTO "alcs"."application_reconsideration_outcome_type" + ("audit_deleted_date_at", "audit_created_at", "audit_updated_at", "audit_created_by", "audit_updated_by", "label", "code", "description") VALUES + (NULL, NOW(), NULL, 'migration_seed', NULL, 'Confirm', 'CONF', 'Confirm'), + (NULL, NOW(), NULL, 'migration_seed', NULL, 'Reverse', 'REVE', 'Reverse'), + (NULL, NOW(), NULL, 'migration_seed', NULL, 'Vary', 'VARY', 'Vary'); + `); + } + + public async down(): Promise<void> { + //Nope + } +} From aaae64b1ec53a1ff4e6622d851a40615d66f8bcb Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Thu, 19 Oct 2023 16:13:43 -0700 Subject: [PATCH 534/954] NOI Statuses ETL (#1081) ETL for mapping NOI statuses and validation scripts Submitted to ALC Submitted to ALC - Incomplete Received By ALC Cancelled Decision Released validation script for in progress --- .../noi/notice_of_intent_init.py | 2 +- .../noi/notice_of_intent_migration.py | 15 +++ .../notice_of_intent_submissions/__init__.py | 15 +++ ..._of_intent_submission_adjacent_land_use.py | 3 +- .../notice_of_intent_status_cancelled.py | 117 ++++++++++++++++++ ...tice_of_intent_status_decision_released.py | 56 +++++++++ ...notice_of_intent_status_received_by_alc.py | 56 +++++++++ ...otice_of_intent_status_submitted_to_alc.py | 116 +++++++++++++++++ ...tent_status_submitted_to_alc_incomplete.py | 116 +++++++++++++++++ .../notice_of_intent_status_cancelled.sql | 45 +++++++ ...otice_of_intent_status_cancelled_count.sql | 34 +++++ .../statuses/cancelled/validation_script.sql | 52 ++++++++ ...ice_of_intent_status_decision_released.sql | 7 ++ ..._intent_status_decision_released_count.sql | 3 + .../decision_released/validation_script.sql | 12 ++ .../notice_of_intent_status_in_progress.sql | 24 ++-- .../in_progress/validation_script.sql | 48 +++++++ ...otice_of_intent_status_received_by_alc.sql | 7 ++ ...of_intent_status_received_by_alc_count.sql | 3 + .../received_by_alc/validation_script.sql | 12 ++ ...tice_of_intent_status_submitted_to_alc.sql | 14 +++ ...f_intent_status_submitted_to_alc_count.sql | 11 ++ .../submitted_to_alc/validation_script.sql | 21 ++++ ...ent_status_submitted_to_alc_incomplete.sql | 15 +++ ...atus_submitted_to_alc_incomplete_count.sql | 13 ++ .../validation_script.sql | 21 ++++ .../application-submission.service.spec.ts | 2 +- 27 files changed, 826 insertions(+), 14 deletions(-) create mode 100644 bin/migrate-oats-data/noi/notice_of_intent_submissions/statuses/notice_of_intent_status_cancelled.py create mode 100644 bin/migrate-oats-data/noi/notice_of_intent_submissions/statuses/notice_of_intent_status_decision_released.py create mode 100644 bin/migrate-oats-data/noi/notice_of_intent_submissions/statuses/notice_of_intent_status_received_by_alc.py create mode 100644 bin/migrate-oats-data/noi/notice_of_intent_submissions/statuses/notice_of_intent_status_submitted_to_alc.py create mode 100644 bin/migrate-oats-data/noi/notice_of_intent_submissions/statuses/notice_of_intent_status_submitted_to_alc_incomplete.py create mode 100644 bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/cancelled/notice_of_intent_status_cancelled.sql create mode 100644 bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/cancelled/notice_of_intent_status_cancelled_count.sql create mode 100644 bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/cancelled/validation_script.sql create mode 100644 bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/decision_released/notice_of_intent_status_decision_released.sql create mode 100644 bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/decision_released/notice_of_intent_status_decision_released_count.sql create mode 100644 bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/decision_released/validation_script.sql create mode 100644 bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/in_progress/validation_script.sql create mode 100644 bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/received_by_alc/notice_of_intent_status_received_by_alc.sql create mode 100644 bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/received_by_alc/notice_of_intent_status_received_by_alc_count.sql create mode 100644 bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/received_by_alc/validation_script.sql create mode 100644 bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/submitted_to_alc/notice_of_intent_status_submitted_to_alc.sql create mode 100644 bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/submitted_to_alc/notice_of_intent_status_submitted_to_alc_count.sql create mode 100644 bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/submitted_to_alc/validation_script.sql create mode 100644 bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/submitted_to_alc_incomplete/notice_of_intent_status_submitted_to_alc_incomplete.sql create mode 100644 bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/submitted_to_alc_incomplete/notice_of_intent_status_submitted_to_alc_incomplete_count.sql create mode 100644 bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/submitted_to_alc_incomplete/validation_script.sql diff --git a/bin/migrate-oats-data/noi/notice_of_intent_init.py b/bin/migrate-oats-data/noi/notice_of_intent_init.py index 733e142208..49194ed7c8 100644 --- a/bin/migrate-oats-data/noi/notice_of_intent_init.py +++ b/bin/migrate-oats-data/noi/notice_of_intent_init.py @@ -67,7 +67,7 @@ def clean_notice_of_intents(conn=None): logger.info("Start NOI cleaning") with conn.cursor() as cursor: cursor.execute( - f"DELETE FROM alcs.notice_of_intent noi WHERE noi.audit_created_by = '{OATS_ETL_USER}'" + f"DELETE FROM alcs.notice_of_intent WHERE audit_created_by = '{OATS_ETL_USER}' AND audit_updated_by = null" ) logger.info(f"Deleted items count = {cursor.rowcount}") diff --git a/bin/migrate-oats-data/noi/notice_of_intent_migration.py b/bin/migrate-oats-data/noi/notice_of_intent_migration.py index baa07aa05c..219746abde 100644 --- a/bin/migrate-oats-data/noi/notice_of_intent_migration.py +++ b/bin/migrate-oats-data/noi/notice_of_intent_migration.py @@ -12,6 +12,11 @@ init_notice_of_intent_statuses, process_alcs_notice_of_intent_in_progress_status, clean_notice_of_intent_submission_statuses, + process_alcs_notice_of_intent_submitted_to_alc_status, + process_alcs_notice_of_intent_submitted_to_alc_incomplete_status, + process_alcs_notice_of_intent_received_by_alc_status, + process_alcs_notice_of_intent_decision_released_status, + process_alcs_notice_of_intent_cancelled_status, ) from .oats_to_alcs_notice_of_intent_table_etl.notice_of_intent_decision_date import ( process_alcs_notice_of_intent_decision_date, @@ -51,5 +56,15 @@ def process_notice_of_intent(batch_size): process_alcs_notice_of_intent_in_progress_status(batch_size) + process_alcs_notice_of_intent_submitted_to_alc_status(batch_size) + + process_alcs_notice_of_intent_submitted_to_alc_incomplete_status(batch_size) + + process_alcs_notice_of_intent_cancelled_status(batch_size) + + process_alcs_notice_of_intent_received_by_alc_status() + + process_alcs_notice_of_intent_decision_released_status() + # this script must be the last one process_notice_of_intent_submission_status_emails() diff --git a/bin/migrate-oats-data/noi/notice_of_intent_submissions/__init__.py b/bin/migrate-oats-data/noi/notice_of_intent_submissions/__init__.py index e0fa1aca89..a9e38c15a9 100644 --- a/bin/migrate-oats-data/noi/notice_of_intent_submissions/__init__.py +++ b/bin/migrate-oats-data/noi/notice_of_intent_submissions/__init__.py @@ -22,3 +22,18 @@ from .statuses.notice_of_intent_status_in_progress import ( process_alcs_notice_of_intent_in_progress_status, ) +from .statuses.notice_of_intent_status_submitted_to_alc import ( + process_alcs_notice_of_intent_submitted_to_alc_status, +) +from .statuses.notice_of_intent_status_submitted_to_alc_incomplete import ( + process_alcs_notice_of_intent_submitted_to_alc_incomplete_status, +) +from .statuses.notice_of_intent_status_received_by_alc import ( + process_alcs_notice_of_intent_received_by_alc_status, +) +from .statuses.notice_of_intent_status_decision_released import ( + process_alcs_notice_of_intent_decision_released_status, +) +from .statuses.notice_of_intent_status_cancelled import ( + process_alcs_notice_of_intent_cancelled_status, +) diff --git a/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_adjacent_land_use/notice_of_intent_submission_adjacent_land_use.py b/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_adjacent_land_use/notice_of_intent_submission_adjacent_land_use.py index b84aef1b22..a0bcc8a3c8 100644 --- a/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_adjacent_land_use/notice_of_intent_submission_adjacent_land_use.py +++ b/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_adjacent_land_use/notice_of_intent_submission_adjacent_land_use.py @@ -98,7 +98,8 @@ def _update_notice_of_intent_submissions(conn, batch_size, cursor, rows): land_use_data[direction], page_size=batch_size, ) - conn.commit() + + conn.commit() return land_use_data, rows diff --git a/bin/migrate-oats-data/noi/notice_of_intent_submissions/statuses/notice_of_intent_status_cancelled.py b/bin/migrate-oats-data/noi/notice_of_intent_submissions/statuses/notice_of_intent_status_cancelled.py new file mode 100644 index 0000000000..c6ddb9255e --- /dev/null +++ b/bin/migrate-oats-data/noi/notice_of_intent_submissions/statuses/notice_of_intent_status_cancelled.py @@ -0,0 +1,117 @@ +from common import BATCH_UPLOAD_SIZE, setup_and_get_logger, convert_timezone, set_time +from db import inject_conn_pool +from psycopg2.extras import RealDictCursor, execute_batch + +etl_name = "process_alcs_notice_of_intent_cancelled_status" +logger = setup_and_get_logger(etl_name) + + +@inject_conn_pool +def process_alcs_notice_of_intent_cancelled_status( + conn=None, batch_size=BATCH_UPLOAD_SIZE +): + """ + This function is responsible for populating Cancelled status of Notice of Intent in ALCS. + + Args: + conn (psycopg2.extensions.connection): PostgreSQL database connection. Provided by the decorator. + batch_size (int): The number of items to process at once. Defaults to BATCH_UPLOAD_SIZE. + """ + + logger.info(f"Start {etl_name}") + with conn.cursor(cursor_factory=RealDictCursor) as cursor: + with open( + "noi/sql/notice_of_intent_submission/statuses/cancelled/notice_of_intent_status_cancelled_count.sql", + "r", + encoding="utf-8", + ) as sql_file: + count_query = sql_file.read() + cursor.execute(count_query) + count_total = dict(cursor.fetchone())["count"] + logger.info(f"Total Notice of Intents data to update: {count_total}") + + failed_updates = 0 + successful_updates_count = 0 + last_application_id = 0 + + with open( + "noi/sql/notice_of_intent_submission/statuses/cancelled/notice_of_intent_status_cancelled.sql", + "r", + encoding="utf-8", + ) as sql_file: + application_sql = sql_file.read() + while True: + cursor.execute( + f"{application_sql} AND oats_cancelled.alr_application_id > {last_application_id} ORDER BY oats_cancelled.alr_application_id;" + ) + + rows = cursor.fetchmany(batch_size) + + if not rows: + break + try: + records_to_be_updated_count = len(rows) + + _update_records(conn, batch_size, cursor, rows) + + successful_updates_count = ( + successful_updates_count + records_to_be_updated_count + ) + last_application_id = dict(rows[-1])["alr_application_id"] + + logger.debug( + f"retrieved/updated items count: {records_to_be_updated_count}; total successfully updated notice of intents so far {successful_updates_count}; last updated alr_application_id: {last_application_id}" + ) + except Exception as err: + # this is NOT going to be caused by actual data update failure. This code is only executed when the code error appears or connection to DB is lost + logger.exception() + conn.rollback() + failed_updates = count_total - successful_updates_count + last_application_id = last_application_id + 1 + + logger.info( + f"Finished {etl_name}: total amount of successful updates {successful_updates_count}, total failed updates {failed_updates}" + ) + + +def _update_records(conn, batch_size, cursor, rows): + parsed_data_list = _prepare_oats_data(rows) + + if len(parsed_data_list) > 0: + execute_batch( + cursor, + _update_query, + parsed_data_list, + page_size=batch_size, + ) + + conn.commit() + + +_update_query = """ + UPDATE alcs.notice_of_intent_submission_to_submission_status + SET effective_date = %(date)s + WHERE submission_uuid = %(uuid)s and status_type_code = 'CANC' +""" + + +def _prepare_oats_data(row_data_list): + data_list = [] + for row in row_data_list: + data = _map_fields(dict(row)) + data_list.append(data) + return data_list + + +def _map_fields(data): + status_effective_date = None + data["date"] = None + + if data and data.get("min_date", None): + status_effective_date = data["min_date"] + + if status_effective_date: + date = convert_timezone(status_effective_date, "US/Pacific") + data["date"] = set_time(date) + + return data diff --git a/bin/migrate-oats-data/noi/notice_of_intent_submissions/statuses/notice_of_intent_status_decision_released.py b/bin/migrate-oats-data/noi/notice_of_intent_submissions/statuses/notice_of_intent_status_decision_released.py new file mode 100644 index 0000000000..5227da14cd --- /dev/null +++ b/bin/migrate-oats-data/noi/notice_of_intent_submissions/statuses/notice_of_intent_status_decision_released.py @@ -0,0 +1,56 @@ +from common import setup_and_get_logger +from db import inject_conn_pool +from psycopg2.extras import RealDictCursor + + +etl_name = "process_alcs_notice_of_intent_decision_released_status" +logger = setup_and_get_logger(etl_name) + + +@inject_conn_pool +def process_alcs_notice_of_intent_decision_released_status(conn=None): + """ + This function is responsible for populating Decision Released status of Notice of Intent in ALCS. + This function does not use batch since update happens in scope of the same schema + + Args: + conn (psycopg2.extensions.connection): PostgreSQL database connection. Provided by the decorator. + """ + + logger.info(f"Start {etl_name}") + with conn.cursor(cursor_factory=RealDictCursor) as cursor: + with open( + "noi/sql/notice_of_intent_submission/statuses/decision_released/notice_of_intent_status_decision_released_count.sql", + "r", + encoding="utf-8", + ) as sql_file: + count_query = sql_file.read() + cursor.execute(count_query) + count_total = dict(cursor.fetchone())["count"] + logger.info(f"Total Notice of Intents data to update: {count_total}") + + successful_updates_count = 0 + failed_updates = 0 + + with open( + "noi/sql/notice_of_intent_submission/statuses/decision_released/notice_of_intent_status_decision_released.sql", + "r", + encoding="utf-8", + ) as sql_file: + update_sql = sql_file.read() + + try: + cursor.execute(update_sql) + conn.commit() + + successful_updates_count = cursor.rowcount + + except Exception as err: + # this is NOT going to be caused by actual data update failure. This code is only executed when the code error appears or connection to DB is lost + logger.exception(err) + conn.rollback() + failed_updates = count_total - successful_updates_count + + logger.info( + f"Finished {etl_name}: total amount of successful updates {successful_updates_count}, total failed updates {failed_updates}" + ) diff --git a/bin/migrate-oats-data/noi/notice_of_intent_submissions/statuses/notice_of_intent_status_received_by_alc.py b/bin/migrate-oats-data/noi/notice_of_intent_submissions/statuses/notice_of_intent_status_received_by_alc.py new file mode 100644 index 0000000000..97d26cd559 --- /dev/null +++ b/bin/migrate-oats-data/noi/notice_of_intent_submissions/statuses/notice_of_intent_status_received_by_alc.py @@ -0,0 +1,56 @@ +from common import setup_and_get_logger +from db import inject_conn_pool +from psycopg2.extras import RealDictCursor + + +etl_name = "process_alcs_notice_of_intent_received_by_alc_status" +logger = setup_and_get_logger(etl_name) + + +@inject_conn_pool +def process_alcs_notice_of_intent_received_by_alc_status(conn=None): + """ + This function is responsible for populating Received By ALC status of Notice of Intent in ALCS. + This function does not use batch since update happens in scope of the same schema + + Args: + conn (psycopg2.extensions.connection): PostgreSQL database connection. Provided by the decorator. + """ + + logger.info(f"Start {etl_name}") + with conn.cursor(cursor_factory=RealDictCursor) as cursor: + with open( + "noi/sql/notice_of_intent_submission/statuses/received_by_alc/notice_of_intent_status_received_by_alc_count.sql", + "r", + encoding="utf-8", + ) as sql_file: + count_query = sql_file.read() + cursor.execute(count_query) + count_total = dict(cursor.fetchone())["count"] + logger.info(f"Total Notice of Intents data to update: {count_total}") + + successful_updates_count = 0 + failed_updates = 0 + + with open( + "noi/sql/notice_of_intent_submission/statuses/received_by_alc/notice_of_intent_status_received_by_alc.sql", + "r", + encoding="utf-8", + ) as sql_file: + update_sql = sql_file.read() + + try: + cursor.execute(update_sql) + conn.commit() + + successful_updates_count = cursor.rowcount + + except Exception as err: + # this is NOT going to be caused by actual data update failure. This code is only executed when the code error appears or connection to DB is lost + logger.exception(err) + conn.rollback() + failed_updates = count_total - successful_updates_count + + logger.info( + f"Finished {etl_name}: total amount of successful updates {successful_updates_count}, total failed updates {failed_updates}" + ) diff --git a/bin/migrate-oats-data/noi/notice_of_intent_submissions/statuses/notice_of_intent_status_submitted_to_alc.py b/bin/migrate-oats-data/noi/notice_of_intent_submissions/statuses/notice_of_intent_status_submitted_to_alc.py new file mode 100644 index 0000000000..71ad85ae91 --- /dev/null +++ b/bin/migrate-oats-data/noi/notice_of_intent_submissions/statuses/notice_of_intent_status_submitted_to_alc.py @@ -0,0 +1,116 @@ +from common import BATCH_UPLOAD_SIZE, setup_and_get_logger, convert_timezone, set_time +from db import inject_conn_pool +from psycopg2.extras import RealDictCursor, execute_batch + +etl_name = "process_alcs_notice_of_intent_submitted_to_alc_status" +logger = setup_and_get_logger(etl_name) + + +@inject_conn_pool +def process_alcs_notice_of_intent_submitted_to_alc_status( + conn=None, batch_size=BATCH_UPLOAD_SIZE +): + """ + This function is responsible for populating Submitted to ALC status of Notice of Intent in ALCS. + + Args: + conn (psycopg2.extensions.connection): PostgreSQL database connection. Provided by the decorator. + batch_size (int): The number of items to process at once. Defaults to BATCH_UPLOAD_SIZE. + """ + + logger.info(f"Start {etl_name}") + with conn.cursor(cursor_factory=RealDictCursor) as cursor: + with open( + "noi/sql/notice_of_intent_submission/statuses/submitted_to_alc/notice_of_intent_status_submitted_to_alc_count.sql", + "r", + encoding="utf-8", + ) as sql_file: + count_query = sql_file.read() + cursor.execute(count_query) + count_total = dict(cursor.fetchone())["count"] + logger.info(f"Total Notice of Intents data to update: {count_total}") + + failed_inserts = 0 + successful_updates_count = 0 + last_application_id = 0 + + with open( + "noi/sql/notice_of_intent_submission/statuses/submitted_to_alc/notice_of_intent_status_submitted_to_alc.sql", + "r", + encoding="utf-8", + ) as sql_file: + application_sql = sql_file.read() + while True: + cursor.execute( + f"{application_sql} WHERE oaa2.alr_application_id > {last_application_id} ORDER BY oaa2.alr_application_id;" + ) + + rows = cursor.fetchmany(batch_size) + + if not rows: + break + try: + records_to_be_updated_count = len(rows) + + _update_records(conn, batch_size, cursor, rows) + + successful_updates_count = ( + successful_updates_count + records_to_be_updated_count + ) + last_application_id = dict(rows[-1])["alr_application_id"] + + logger.debug( + f"retrieved/updated items count: {records_to_be_updated_count}; total successfully updated notice of intents so far {successful_updates_count}; last updated alr_application_id: {last_application_id}" + ) + except Exception as err: + # this is NOT going to be caused by actual data update failure. This code is only executed when the code error appears or connection to DB is lost + logger.exception(err) + conn.rollback() + failed_inserts = count_total - successful_updates_count + last_application_id = last_application_id + 1 + + logger.info( + f"Finished {etl_name}: total amount of successful updates {successful_updates_count}, total failed updates {failed_inserts}" + ) + + +def _update_records(conn, batch_size, cursor, rows): + parsed_data_list = _prepare_oats_data(rows) + + if len(parsed_data_list) > 0: + execute_batch( + cursor, + _update_query, + parsed_data_list, + page_size=batch_size, + ) + + conn.commit() + + +_update_query = """ + UPDATE alcs.notice_of_intent_submission_to_submission_status + SET effective_date = %(date)s + WHERE submission_uuid = %(uuid)s and status_type_code = 'SUBM' +""" + + +def _prepare_oats_data(row_data_list): + data_list = [] + for row in row_data_list: + data = _map_fields(dict(row)) + data_list.append(data) + return data_list + + +def _map_fields(data): + status_effective_date = None + data["date"] = None + + if data and data["submitted_to_alc_date"]: + status_effective_date = data["submitted_to_alc_date"] + if status_effective_date: + date = convert_timezone(status_effective_date, "US/Pacific") + data["date"] = set_time(date) + + return data diff --git a/bin/migrate-oats-data/noi/notice_of_intent_submissions/statuses/notice_of_intent_status_submitted_to_alc_incomplete.py b/bin/migrate-oats-data/noi/notice_of_intent_submissions/statuses/notice_of_intent_status_submitted_to_alc_incomplete.py new file mode 100644 index 0000000000..e98156aaeb --- /dev/null +++ b/bin/migrate-oats-data/noi/notice_of_intent_submissions/statuses/notice_of_intent_status_submitted_to_alc_incomplete.py @@ -0,0 +1,116 @@ +from common import BATCH_UPLOAD_SIZE, setup_and_get_logger, convert_timezone, set_time +from db import inject_conn_pool +from psycopg2.extras import RealDictCursor, execute_batch + +etl_name = "process_alcs_notice_of_intent_submitted_to_alc_incomplete_status" +logger = setup_and_get_logger(etl_name) + + +@inject_conn_pool +def process_alcs_notice_of_intent_submitted_to_alc_incomplete_status( + conn=None, batch_size=BATCH_UPLOAD_SIZE +): + """ + This function is responsible for populating Submitted to ALC status of Notice of Intent in ALCS. + + Args: + conn (psycopg2.extensions.connection): PostgreSQL database connection. Provided by the decorator. + batch_size (int): The number of items to process at once. Defaults to BATCH_UPLOAD_SIZE. + """ + + logger.info(f"Start {etl_name}") + with conn.cursor(cursor_factory=RealDictCursor) as cursor: + with open( + "noi/sql/notice_of_intent_submission/statuses/submitted_to_alc_incomplete/notice_of_intent_status_submitted_to_alc_incomplete_count.sql", + "r", + encoding="utf-8", + ) as sql_file: + count_query = sql_file.read() + cursor.execute(count_query) + count_total = dict(cursor.fetchone())["count"] + logger.info(f"Total Notice of Intents data to update: {count_total}") + + failed_inserts = 0 + successful_updates_count = 0 + last_application_id = 0 + + with open( + "noi/sql/notice_of_intent_submission/statuses/submitted_to_alc_incomplete/notice_of_intent_status_submitted_to_alc_incomplete.sql", + "r", + encoding="utf-8", + ) as sql_file: + application_sql = sql_file.read() + while True: + cursor.execute( + f"{application_sql} WHERE oa.alr_application_id > {last_application_id} ORDER BY oa.alr_application_id;" + ) + + rows = cursor.fetchmany(batch_size) + + if not rows: + break + try: + records_to_be_updated_count = len(rows) + + _update_records(conn, batch_size, cursor, rows) + + successful_updates_count = ( + successful_updates_count + records_to_be_updated_count + ) + last_application_id = dict(rows[-1])["alr_application_id"] + + logger.debug( + f"retrieved/updated items count: {records_to_be_updated_count}; total successfully updated notice of intents so far {successful_updates_count}; last updated alr_application_id: {last_application_id}" + ) + except Exception as err: + # this is NOT going to be caused by actual data update failure. This code is only executed when the code error appears or connection to DB is lost + logger.exception(err) + conn.rollback() + failed_inserts = count_total - successful_updates_count + last_application_id = last_application_id + 1 + + logger.info( + f"Finished {etl_name}: total amount of successful updates {successful_updates_count}, total failed updates {failed_inserts}" + ) + + +def _update_records(conn, batch_size, cursor, rows): + parsed_data_list = _prepare_oats_data(rows) + + if len(parsed_data_list) > 0: + execute_batch( + cursor, + _update_query, + parsed_data_list, + page_size=batch_size, + ) + + conn.commit() + + +_update_query = """ + UPDATE alcs.notice_of_intent_submission_to_submission_status + SET effective_date = %(date)s + WHERE submission_uuid = %(uuid)s and status_type_code = 'SUIN' +""" + + +def _prepare_oats_data(row_data_list): + data_list = [] + for row in row_data_list: + data = _map_fields(dict(row)) + data_list.append(data) + return data_list + + +def _map_fields(data): + status_effective_date = None + data["date"] = None + + if data and data["completion_date"]: + status_effective_date = data["completion_date"] + if status_effective_date: + date = convert_timezone(status_effective_date, "US/Pacific") + data["date"] = set_time(date) + + return data diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/cancelled/notice_of_intent_status_cancelled.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/cancelled/notice_of_intent_status_cancelled.sql new file mode 100644 index 0000000000..7ce05471e0 --- /dev/null +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/cancelled/notice_of_intent_status_cancelled.sql @@ -0,0 +1,45 @@ +WITH first_cancelled_accomplishment_per_file_number AS ( + SELECT alr_application_id, + accomplishment_code, + min(oa.completion_date) AS completion_date + FROM oats.oats_accomplishments oa + WHERE accomplishment_code = 'CAN' + GROUP BY alr_application_id, + accomplishment_code +), +cancelled_accomplishments_for_noi_only AS ( + SELECT DISTINCT ON ( + first_cancelled.accomplishment_code, + first_cancelled.completion_date, + oaa.alr_application_id, + oaa.cancelled_date + ) first_cancelled.accomplishment_code, + first_cancelled.completion_date, + oaa.alr_application_id, + oaa.cancelled_date + FROM oats.oats_alr_applications oaa + LEFT JOIN first_cancelled_accomplishment_per_file_number AS first_cancelled ON first_cancelled.alr_application_id = oaa.alr_application_id + WHERE oaa.application_class_code = 'NOI' +) +SELECT oats_cancelled.alr_application_id, + oats_cancelled.accomplishment_code, + oats_cancelled.completion_date, + oats_cancelled.cancelled_date, + LEAST( + COALESCE( + oats_cancelled.completion_date, + oats_cancelled.cancelled_date + ), + COALESCE( + oats_cancelled.cancelled_date, + oats_cancelled.completion_date + ) + ) AS min_date, + nois.uuid +FROM cancelled_accomplishments_for_noi_only oats_cancelled + JOIN alcs.notice_of_intent_submission nois ON nois.file_number = oats_cancelled.alr_application_id::TEXT + JOIN alcs.notice_of_intent_submission_to_submission_status noistss ON noistss.submission_uuid = nois.uuid +WHERE ( + oats_cancelled.completion_date IS NOT NULL + OR oats_cancelled.cancelled_date IS NOT NULL + ) \ No newline at end of file diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/cancelled/notice_of_intent_status_cancelled_count.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/cancelled/notice_of_intent_status_cancelled_count.sql new file mode 100644 index 0000000000..d1db709191 --- /dev/null +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/cancelled/notice_of_intent_status_cancelled_count.sql @@ -0,0 +1,34 @@ +WITH first_cancelled_accomplishment_per_file_number AS ( + SELECT alr_application_id, + accomplishment_code, + min(oa.completion_date) AS completion_date + FROM oats.oats_accomplishments oa + WHERE accomplishment_code = 'CAN' + GROUP BY alr_application_id, + accomplishment_code +), +cancelled_accomplishments_for_noi_only AS ( + SELECT DISTINCT ON ( + first_cancelled.accomplishment_code, + first_cancelled.completion_date, + oaa.alr_application_id, + oaa.cancelled_date + ) first_cancelled.accomplishment_code, + first_cancelled.completion_date, + oaa.alr_application_id, + oaa.cancelled_date + FROM oats.oats_alr_applications oaa + LEFT JOIN first_cancelled_accomplishment_per_file_number AS first_cancelled ON first_cancelled.alr_application_id = oaa.alr_application_id + WHERE oaa.application_class_code = 'NOI' +), +all_nois_with_cancelled_status AS ( + SELECT oats_cancelled.alr_application_id + FROM cancelled_accomplishments_for_noi_only oats_cancelled + JOIN alcs.notice_of_intent_submission nois ON nois.file_number = oats_cancelled.alr_application_id::TEXT + JOIN alcs.notice_of_intent_submission_to_submission_status noistss ON noistss.submission_uuid = nois.uuid + WHERE oats_cancelled.completion_date IS NOT NULL + OR oats_cancelled.cancelled_date IS NOT NULL + GROUP BY oats_cancelled.alr_application_id +) +SELECT count(*) +FROM all_nois_with_cancelled_status; \ No newline at end of file diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/cancelled/validation_script.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/cancelled/validation_script.sql new file mode 100644 index 0000000000..5d8f3005ff --- /dev/null +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/cancelled/validation_script.sql @@ -0,0 +1,52 @@ +--- run it manually in IDE of your choice +--- compare to numbers returned by script. They should match +-- total count of set 'CANC' - cancelled in ALCS +SELECT count(*) +FROM alcs.notice_of_intent_submission_to_submission_status noistss +WHERE noistss.status_type_code = 'CANC' + AND effective_date IS NOT null; +--total count of set 'CAN' nois with one or zero components in OATS +WITH first_cancelled_accomplishment_per_file_number AS ( + SELECT alr_application_id, + accomplishment_code, + min(oa.completion_date) AS completion_date + FROM oats.oats_accomplishments oa + WHERE accomplishment_code = 'CAN' + GROUP BY alr_application_id, + accomplishment_code +), +cancelled_accomplishments_for_noi_only AS ( + SELECT DISTINCT ON ( + first_cancelled.accomplishment_code, + first_cancelled.completion_date, + oaa.alr_application_id, + oaa.cancelled_date + ) first_cancelled.accomplishment_code, + first_cancelled.completion_date, + oaa.alr_application_id, + oaa.cancelled_date + FROM oats.oats_alr_applications oaa + LEFT JOIN first_cancelled_accomplishment_per_file_number AS first_cancelled ON first_cancelled.alr_application_id = oaa.alr_application_id + WHERE oaa.application_class_code = 'NOI' + AND ( + first_cancelled.completion_date IS NOT NULL + OR oaa.cancelled_date IS NOT NULL + ) +), +nois_with_one_or_zero_component_only AS ( + SELECT oaac.alr_application_id, + max(oaac.alr_appl_component_id) AS alr_appl_component_id -- this IS NOT going TO effect the query since count < 2 + FROM oats.oats_alr_appl_components oaac + JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id + AND oaa.application_class_code = 'NOI' + GROUP BY oaac.alr_application_id + HAVING count(oaac.alr_application_id) < 2 +), +all_cancelled AS ( + SELECT cancelled.alr_application_id + FROM cancelled_accomplishments_for_noi_only AS cancelled + JOIN nois_with_one_or_zero_component_only AS nois_one_or_zero ON nois_one_or_zero.alr_application_id = cancelled.alr_application_id + GROUP BY cancelled.alr_application_id +) +SELECT count(*) +FROM all_cancelled \ No newline at end of file diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/decision_released/notice_of_intent_status_decision_released.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/decision_released/notice_of_intent_status_decision_released.sql new file mode 100644 index 0000000000..ede0f0f7c3 --- /dev/null +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/decision_released/notice_of_intent_status_decision_released.sql @@ -0,0 +1,7 @@ +UPDATE alcs.notice_of_intent_submission_to_submission_status AS noi_statuses +SET effective_date = noi.decision_date +FROM alcs.notice_of_intent AS noi + JOIN alcs.notice_of_intent_submission nois ON nois.file_number = noi.file_number +WHERE nois.uuid = noi_statuses.submission_uuid + AND noi_statuses.status_type_code = 'ALCD' + AND noi.decision_date IS NOT NULL; \ No newline at end of file diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/decision_released/notice_of_intent_status_decision_released_count.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/decision_released/notice_of_intent_status_decision_released_count.sql new file mode 100644 index 0000000000..72b5480504 --- /dev/null +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/decision_released/notice_of_intent_status_decision_released_count.sql @@ -0,0 +1,3 @@ +SELECT count(*) +FROM alcs.notice_of_intent_submission_to_submission_status noi_statuses +WHERE noi_statuses.status_type_code = 'ALCD'; \ No newline at end of file diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/decision_released/validation_script.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/decision_released/validation_script.sql new file mode 100644 index 0000000000..7db0b32273 --- /dev/null +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/decision_released/validation_script.sql @@ -0,0 +1,12 @@ +--- run it manually in IDE of your choice +--- compare to numbers returned by script. They should match +-- total count of set 'ALCD' - Decision Released +SELECT count(*) +FROM alcs.notice_of_intent_submission_to_submission_status noistss +WHERE noistss.effective_date IS NOT NULL + AND status_type_code = 'ALCD'; +-- total count of expected 'ALCD' - Decision Released +SELECT count(*) +FROM alcs.notice_of_intent noi + JOIN alcs.notice_of_intent_submission nois ON noi.file_number = nois.file_number +WHERE noi.decision_date IS NOT null \ No newline at end of file diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/in_progress/notice_of_intent_status_in_progress.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/in_progress/notice_of_intent_status_in_progress.sql index 7ed6ac1961..6719711b28 100644 --- a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/in_progress/notice_of_intent_status_in_progress.sql +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/in_progress/notice_of_intent_status_in_progress.sql @@ -1,25 +1,28 @@ -WITH latest_in_progress_accomplishment_per_file_number AS ( - SELECT alr_application_id, accomplishment_code, min(oa.completion_date) AS completion_date +WITH earliest_in_progress_accomplishment_per_file_number AS ( + SELECT alr_application_id, + accomplishment_code, + min(oa.completion_date) AS completion_date FROM oats.oats_accomplishments oa WHERE accomplishment_code = 'INP' - GROUP BY alr_application_id, accomplishment_code + GROUP BY alr_application_id, + accomplishment_code ), -latest_in_progress_accomplishments_for_noi_only AS ( +earliest_in_progress_accomplishments_for_noi_only AS ( SELECT DISTINCT ON ( - latest_in_prog.accomplishment_code, - latest_in_prog.completion_date, + earliest_in_prog.accomplishment_code, + earliest_in_prog.completion_date, oaa.alr_application_id, oaa.created_date, oaa.submitted_to_alc_date, oaa.when_created - ) latest_in_prog.accomplishment_code, - latest_in_prog.completion_date, + ) earliest_in_prog.accomplishment_code, + earliest_in_prog.completion_date, oaa.alr_application_id, oaa.created_date, oaa.submitted_to_alc_date, oaa.when_created FROM oats.oats_alr_applications oaa - LEFT JOIN latest_in_progress_accomplishment_per_file_number AS latest_in_prog ON latest_in_prog.alr_application_id = oaa.alr_application_id + LEFT JOIN earliest_in_progress_accomplishment_per_file_number AS earliest_in_prog ON earliest_in_prog.alr_application_id = oaa.alr_application_id WHERE oaa.application_class_code = 'NOI' ) SELECT DISTINCT ON (oats_in_prog.alr_application_id) oats_in_prog.alr_application_id, @@ -31,5 +34,4 @@ SELECT DISTINCT ON (oats_in_prog.alr_application_id) oats_in_prog.alr_applicatio nois.uuid FROM alcs.notice_of_intent_submission_to_submission_status noistss JOIN alcs.notice_of_intent_submission nois ON nois.uuid = noistss.submission_uuid - JOIN latest_in_progress_accomplishments_for_noi_only AS oats_in_prog ON oats_in_prog.alr_application_id::TEXT = nois.file_number - \ No newline at end of file + JOIN earliest_in_progress_accomplishments_for_noi_only AS oats_in_prog ON oats_in_prog.alr_application_id::TEXT = nois.file_number \ No newline at end of file diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/in_progress/validation_script.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/in_progress/validation_script.sql new file mode 100644 index 0000000000..9968abf359 --- /dev/null +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/in_progress/validation_script.sql @@ -0,0 +1,48 @@ +--- run it manually in IDE of your choice +--- compare to numbers returned by script. They should match +-- total count of set 'PROG' - In Progress in ALCS +SELECT count(*) +FROM alcs.notice_of_intent_submission_to_submission_status noistss +WHERE noistss.status_type_code = 'PROG' + AND effective_date IS NOT null; +--total count of set 'INP' - In Progress nois with one or zero components in OATS +WITH inp_accomplishment_per_file_number AS ( + SELECT alr_application_id, + accomplishment_code + FROM oats.oats_accomplishments oa + WHERE accomplishment_code = 'INP' + GROUP BY alr_application_id, + accomplishment_code +), +inp_accomplishments_for_noi_only AS ( + SELECT DISTINCT ON ( + inp_accomplishments.accomplishment_code, + oaa.alr_application_id, + oaa.when_created + ) inp_accomplishments.accomplishment_code, + oaa.alr_application_id, + oaa.when_created + FROM oats.oats_alr_applications oaa + LEFT JOIN inp_accomplishment_per_file_number AS inp_accomplishments ON inp_accomplishments.alr_application_id = oaa.alr_application_id + WHERE oaa.application_class_code = 'NOI' + AND ( + oaa.when_created IS NOT NULL + ) +), +nois_with_one_or_zero_component_only AS ( + SELECT oaac.alr_application_id, + max(oaac.alr_appl_component_id) AS alr_appl_component_id -- this IS NOT going TO effect the query since count < 2 + FROM oats.oats_alr_appl_components oaac + JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id + AND oaa.application_class_code = 'NOI' + GROUP BY oaac.alr_application_id + HAVING count(oaac.alr_application_id) < 2 +), +all_in_progress AS ( + SELECT cancelled.alr_application_id + FROM inp_accomplishments_for_noi_only AS cancelled + JOIN nois_with_one_or_zero_component_only AS nois_one_or_zero ON nois_one_or_zero.alr_application_id = cancelled.alr_application_id + GROUP BY cancelled.alr_application_id +) +SELECT count(*) +FROM all_in_progress; \ No newline at end of file diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/received_by_alc/notice_of_intent_status_received_by_alc.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/received_by_alc/notice_of_intent_status_received_by_alc.sql new file mode 100644 index 0000000000..7febbb7ca1 --- /dev/null +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/received_by_alc/notice_of_intent_status_received_by_alc.sql @@ -0,0 +1,7 @@ +UPDATE alcs.notice_of_intent_submission_to_submission_status AS noi_statuses +SET effective_date = noi.date_received_all_items +FROM alcs.notice_of_intent AS noi + JOIN alcs.notice_of_intent_submission nois ON nois.file_number = noi.file_number +WHERE nois.uuid = noi_statuses.submission_uuid + AND noi_statuses.status_type_code = 'RECA' + AND noi.date_received_all_items IS NOT NULL; \ No newline at end of file diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/received_by_alc/notice_of_intent_status_received_by_alc_count.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/received_by_alc/notice_of_intent_status_received_by_alc_count.sql new file mode 100644 index 0000000000..e63b530ea2 --- /dev/null +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/received_by_alc/notice_of_intent_status_received_by_alc_count.sql @@ -0,0 +1,3 @@ +SELECT count(*) +FROM alcs.notice_of_intent_submission_to_submission_status noi_statuses +WHERE noi_statuses.status_type_code = 'RECA'; \ No newline at end of file diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/received_by_alc/validation_script.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/received_by_alc/validation_script.sql new file mode 100644 index 0000000000..8c5efffca2 --- /dev/null +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/received_by_alc/validation_script.sql @@ -0,0 +1,12 @@ +--- run it manually in IDE of your choice +--- compare to numbers returned by script. They should match +-- total count of set 'RECA' - Received By ALC +SELECT count(*) +FROM alcs.notice_of_intent_submission_to_submission_status noistss +WHERE noistss.effective_date IS NOT NULL + AND status_type_code = 'RECA'; +-- total count of expected 'RECA' - SReceived By ALC +SELECT count(*) +FROM alcs.notice_of_intent noi + JOIN alcs.notice_of_intent_submission nois ON noi.file_number = nois.file_number +WHERE noi.date_received_all_items IS NOT null \ No newline at end of file diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/submitted_to_alc/notice_of_intent_status_submitted_to_alc.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/submitted_to_alc/notice_of_intent_status_submitted_to_alc.sql new file mode 100644 index 0000000000..72d5ce47bd --- /dev/null +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/submitted_to_alc/notice_of_intent_status_submitted_to_alc.sql @@ -0,0 +1,14 @@ +WITH noi_components_grouped AS ( + SELECT oaac.alr_application_id + FROM oats.oats_alr_appl_components oaac + JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id + WHERE oaa.application_class_code = 'NOI' + GROUP BY oaac.alr_application_id + HAVING count(oaac.alr_application_id) < 2 -- ignore notice of intents with multiple components +) +SELECT oaa2.alr_application_id, + oaa2.submitted_to_alc_date, + nois.uuid +FROM oats.oats_alr_applications oaa2 + JOIN noi_components_grouped ncg ON ncg.alr_application_id = oaa2.alr_application_id + JOIN alcs.notice_of_intent_submission nois ON nois.file_number = oaa2.alr_application_id::TEXT \ No newline at end of file diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/submitted_to_alc/notice_of_intent_status_submitted_to_alc_count.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/submitted_to_alc/notice_of_intent_status_submitted_to_alc_count.sql new file mode 100644 index 0000000000..1c57417cd0 --- /dev/null +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/submitted_to_alc/notice_of_intent_status_submitted_to_alc_count.sql @@ -0,0 +1,11 @@ +WITH noi_components_grouped AS ( + SELECT oaac.alr_application_id + FROM oats.oats_alr_appl_components oaac + JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id + WHERE oaa.application_class_code = 'NOI' + GROUP BY oaac.alr_application_id + HAVING count(oaac.alr_application_id) < 2 -- ignore notice of intents with multiple components +) +SELECT count(*) +FROM noi_components_grouped + JOIN alcs.notice_of_intent_submission nois ON nois.file_number = alr_application_id::TEXT; \ No newline at end of file diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/submitted_to_alc/validation_script.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/submitted_to_alc/validation_script.sql new file mode 100644 index 0000000000..9450d8190b --- /dev/null +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/submitted_to_alc/validation_script.sql @@ -0,0 +1,21 @@ +--- run it manually in IDE of your choice +--- compare to numbers returned by script. They should match +-- total count of set 'SUBM' - Submitted to ALC status in ALCS +SELECT count(*) +FROM alcs.notice_of_intent_submission_to_submission_status noistss +WHERE status_type_code = 'SUBM' + AND effective_date IS NOT NULL; +-- total count of expected 'SUBM' - Submitted to ALC status +WITH noi_components_grouped AS ( + SELECT oaac.alr_application_id + FROM oats.oats_alr_appl_components oaac + JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id + WHERE oaa.application_class_code = 'NOI' + GROUP BY oaac.alr_application_id + HAVING count(oaac.alr_application_id) < 2 -- ignore notice of intents with multiple components +) +SELECT count(*) +FROM oats.oats_alr_applications oaa2 + JOIN noi_components_grouped ncg ON ncg.alr_application_id = oaa2.alr_application_id + JOIN alcs.notice_of_intent_submission nois ON nois.file_number = oaa2.alr_application_id::TEXT +WHERE oaa2.submitted_to_alc_date IS NOT null; \ No newline at end of file diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/submitted_to_alc_incomplete/notice_of_intent_status_submitted_to_alc_incomplete.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/submitted_to_alc_incomplete/notice_of_intent_status_submitted_to_alc_incomplete.sql new file mode 100644 index 0000000000..c7cd37ea1b --- /dev/null +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/submitted_to_alc_incomplete/notice_of_intent_status_submitted_to_alc_incomplete.sql @@ -0,0 +1,15 @@ +WITH noi_components_grouped AS ( + SELECT oaac.alr_application_id + FROM oats.oats_alr_appl_components oaac + JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id + WHERE oaa.application_class_code = 'NOI' + GROUP BY oaac.alr_application_id + HAVING count(oaac.alr_application_id) < 2 -- ignore notice of intents with multiple components +) +SELECT oa.alr_application_id, + completion_date, + nois.uuid +FROM noi_components_grouped ncg + JOIN oats.oats_accomplishments oa ON oa.alr_application_id = ncg.alr_application_id + JOIN alcs.notice_of_intent_submission nois ON nois.file_number = oa.alr_application_id::text + AND oa.accomplishment_code = 'AKI' \ No newline at end of file diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/submitted_to_alc_incomplete/notice_of_intent_status_submitted_to_alc_incomplete_count.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/submitted_to_alc_incomplete/notice_of_intent_status_submitted_to_alc_incomplete_count.sql new file mode 100644 index 0000000000..cb11bda499 --- /dev/null +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/submitted_to_alc_incomplete/notice_of_intent_status_submitted_to_alc_incomplete_count.sql @@ -0,0 +1,13 @@ +WITH noi_components_grouped AS ( + SELECT oaac.alr_application_id + FROM oats.oats_alr_appl_components oaac + JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id + WHERE oaa.application_class_code = 'NOI' + GROUP BY oaac.alr_application_id + HAVING count(oaac.alr_application_id) < 2 -- ignore notice of intents with multiple components +) +SELECT count(*) +FROM noi_components_grouped ncg + JOIN oats.oats_accomplishments oa ON oa.alr_application_id = ncg.alr_application_id + JOIN alcs.notice_of_intent_submission nois ON nois.file_number = oa.alr_application_id::text + AND oa.accomplishment_code = 'AKI'; \ No newline at end of file diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/submitted_to_alc_incomplete/validation_script.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/submitted_to_alc_incomplete/validation_script.sql new file mode 100644 index 0000000000..0b8fa5d140 --- /dev/null +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/submitted_to_alc_incomplete/validation_script.sql @@ -0,0 +1,21 @@ +--- run it manually in IDE of your choice +--- compare to numbers returned by script. They should match +-- total count of set 'SUIN' - Submitted to ALC Incomplete status in ALCS +SELECT count(*) +FROM alcs.notice_of_intent_submission_to_submission_status noistss +WHERE status_type_code = 'SUIN' + AND effective_date IS NOT NULL; +-- total count of expected 'AKI' - Submitted to ALC Incomplete status +WITH noi_components_grouped AS ( + SELECT oaac.alr_application_id + FROM oats.oats_alr_appl_components oaac + JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id + WHERE oaa.application_class_code = 'NOI' + GROUP BY oaac.alr_application_id + HAVING count(oaac.alr_application_id) < 2 -- ignore notice of intents with multiple components +) +SELECT count(*) +FROM noi_components_grouped ncg + JOIN oats.oats_accomplishments oa ON oa.alr_application_id = ncg.alr_application_id + AND oa.accomplishment_code = 'AKI' + AND oa.completion_date IS NOT null; \ No newline at end of file diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.service.spec.ts b/services/apps/alcs/src/portal/application-submission/application-submission.service.spec.ts index d1ca0a043c..625f92c155 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.service.spec.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.service.spec.ts @@ -281,7 +281,7 @@ describe('ApplicationSubmissionService', () => { expect(mockRepository.findOne).toHaveBeenCalledTimes(1); }); - it('should load the canceled status and save the application for cancel', async () => { + it('should load the cancelled status and save the application for cancel', async () => { const application = new ApplicationSubmission({ uuid: 'fake', status: new ApplicationSubmissionToSubmissionStatus({ From e1b45674cf80aab1e3c4556b41e15cb069c1e5ae Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Fri, 20 Oct 2023 09:54:01 -0700 Subject: [PATCH 535/954] search criteria fix --- services/apps/alcs/src/alcs/search/search.controller.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/services/apps/alcs/src/alcs/search/search.controller.ts b/services/apps/alcs/src/alcs/search/search.controller.ts index ea99569bda..0c027ccef4 100644 --- a/services/apps/alcs/src/alcs/search/search.controller.ts +++ b/services/apps/alcs/src/alcs/search/search.controller.ts @@ -267,8 +267,7 @@ export class SearchController { const searchNoi = (searchDto.fileTypes.length > 0 ? noiTypeSpecified : true) && - !searchDto.isIncludeOtherParcels && - !isStringSetAndNotEmpty(searchDto.legacyId); + !searchDto.isIncludeOtherParcels; const searchNonApplications = (searchDto.fileTypes.length > 0 ? nonApplicationTypeSpecified : true) && From 078d984cf8f2c339cc993c9aa5d2b6481d87e76a Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Fri, 20 Oct 2023 10:32:39 -0700 Subject: [PATCH 536/954] test fix --- services/apps/alcs/src/alcs/search/search.controller.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/apps/alcs/src/alcs/search/search.controller.spec.ts b/services/apps/alcs/src/alcs/search/search.controller.spec.ts index ee9811d084..365c9e331a 100644 --- a/services/apps/alcs/src/alcs/search/search.controller.spec.ts +++ b/services/apps/alcs/src/alcs/search/search.controller.spec.ts @@ -346,7 +346,7 @@ describe('SearchController', () => { expect( mockNoticeOfIntentAdvancedSearchService.searchNoticeOfIntents, - ).toBeCalledTimes(0); + ).toBeCalledTimes(1); expect(result.noticeOfIntents).toBeDefined(); expect(result.totalNoticeOfIntents).toBe(0); From e269258f3a9eb69c5267cf2183944184e46ebebb Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Fri, 20 Oct 2023 10:35:11 -0700 Subject: [PATCH 537/954] Don't load draft decisions for Public APPs * Use get for portal instead which does not load draft decisions --- .../public/application/public-application.service.spec.ts | 4 ++-- .../portal/public/application/public-application.service.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/services/apps/alcs/src/portal/public/application/public-application.service.spec.ts b/services/apps/alcs/src/portal/public/application/public-application.service.spec.ts index 358913fd51..2203718d66 100644 --- a/services/apps/alcs/src/portal/public/application/public-application.service.spec.ts +++ b/services/apps/alcs/src/portal/public/application/public-application.service.spec.ts @@ -100,7 +100,7 @@ describe('PublicApplicationService', () => { mockAppReviewService.getForPublicReview.mockResolvedValue( new ApplicationSubmissionReview(), ); - mockAppDecService.getByAppFileNumber.mockResolvedValue([]); + mockAppDecService.getForPortal.mockResolvedValue([]); const fileId = 'file-id'; await service.getPublicData(fileId); @@ -115,7 +115,7 @@ describe('PublicApplicationService', () => { VISIBILITY_FLAG.PUBLIC, ]); expect(mockAppReviewService.getForPublicReview).toHaveBeenCalledTimes(1); - expect(mockAppDecService.getByAppFileNumber).toHaveBeenCalledTimes(1); + expect(mockAppDecService.getForPortal).toHaveBeenCalledTimes(1); }); it('should call through to document service for getting files', async () => { diff --git a/services/apps/alcs/src/portal/public/application/public-application.service.ts b/services/apps/alcs/src/portal/public/application/public-application.service.ts index 115a572d49..bea2094227 100644 --- a/services/apps/alcs/src/portal/public/application/public-application.service.ts +++ b/services/apps/alcs/src/portal/public/application/public-application.service.ts @@ -88,7 +88,7 @@ export class PublicApplicationService { ); } - const decisions = await this.applicationDecisionService.getByAppFileNumber( + const decisions = await this.applicationDecisionService.getForPortal( fileNumber, ); const mappedDecisions = this.mapper.mapArray( From 72a8bbf5d83359cd0763601fdaf80f39691013d6 Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Fri, 20 Oct 2023 10:51:35 -0700 Subject: [PATCH 538/954] test description change --- services/apps/alcs/src/alcs/search/search.controller.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/apps/alcs/src/alcs/search/search.controller.spec.ts b/services/apps/alcs/src/alcs/search/search.controller.spec.ts index 365c9e331a..faee5cf67d 100644 --- a/services/apps/alcs/src/alcs/search/search.controller.spec.ts +++ b/services/apps/alcs/src/alcs/search/search.controller.spec.ts @@ -321,7 +321,7 @@ describe('SearchController', () => { expect(result.totalNonApplications).toBe(0); }); - it('should NOT call NOI and Non-applications advanced search to retrieve NOIs and Non-applications if no NOI or non-application search fields specified', async () => { + it('should NOT call Non-applications advanced search to retrieve Non-applications if no non-application search fields specified', async () => { const baseMockSearchRequestDto: SearchRequestDto = { pageSize: 1, page: 1, From f437f00b3ca2b2f57a66583225374fe1c8d2218f Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Fri, 20 Oct 2023 11:38:33 -0700 Subject: [PATCH 539/954] ETL Legacy id for Application and NOI (#1083) * legacy id for Application and NOI --- .../applications/app_prep.py | 3 +- .../sql/application-prep/application_prep.sql | 31 +++++++------------ .../application_prep_basic_validation.sql | 18 ++++++----- ...oats_to_alcs_notice_of_intent_table_etl.py | 1 + .../notice_of_intent_base.sql | 3 +- .../notice_of_intent_base_validation.sql | 10 ++++-- 6 files changed, 35 insertions(+), 31 deletions(-) diff --git a/bin/migrate-oats-data/applications/app_prep.py b/bin/migrate-oats-data/applications/app_prep.py index 9f5cd66365..b1edbaf63f 100644 --- a/bin/migrate-oats-data/applications/app_prep.py +++ b/bin/migrate-oats-data/applications/app_prep.py @@ -258,7 +258,8 @@ def _get_update_query(unique_fields): fee_paid_date = %(fee_received_date)s, fee_waived = %(fee_waived_ind)s, fee_amount = %(applied_fee_amt)s, - fee_split_with_lg = %(split_fee_with_local_gov_ind)s + fee_split_with_lg = %(split_fee_with_local_gov_ind)s, + legacy_id = %(legacy_application_nbr)s {unique_fields} WHERE alcs.application.file_number = %(alr_application_id)s::TEXT; diff --git a/bin/migrate-oats-data/applications/sql/application-prep/application_prep.sql b/bin/migrate-oats-data/applications/sql/application-prep/application_prep.sql index 00af775a77..fc02f3c0b7 100644 --- a/bin/migrate-oats-data/applications/sql/application-prep/application_prep.sql +++ b/bin/migrate-oats-data/applications/sql/application-prep/application_prep.sql @@ -1,19 +1,12 @@ -WITH - appl_components_grouped AS ( - SELECT - oaac.alr_application_id - FROM - oats.oats_alr_appl_components oaac - JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id - WHERE - oaa.application_class_code IN ('LOA', 'BLK') - GROUP BY - oaac.alr_application_id - HAVING - count(oaac.alr_application_id) < 2 -- ignore all applications wit multiple components - ) -SELECT - oaa.alr_application_id, +WITH appl_components_grouped AS ( + SELECT oaac.alr_application_id + FROM oats.oats_alr_appl_components oaac + JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id + WHERE oaa.application_class_code IN ('LOA', 'BLK') + GROUP BY oaac.alr_application_id + HAVING count(oaac.alr_application_id) < 2 -- ignore all applications wit multiple components +) +SELECT oaa.alr_application_id, oaac.agri_capability_code, oaac.agri_cap_map, oaac.agri_cap_consultant, @@ -31,8 +24,8 @@ SELECT oaa.applied_fee_amt, oaa.split_fee_with_local_gov_ind, oaa.fee_waived_ind, - oaa.fee_received_date -FROM - appl_components_grouped acg + oaa.fee_received_date, + oaa.legacy_application_nbr +FROM appl_components_grouped acg JOIN oats.oats_alr_appl_components oaac ON oaac.alr_application_id = acg.alr_application_id JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = acg.alr_application_id \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/sql/application-prep/application_prep_basic_validation.sql b/bin/migrate-oats-data/applications/sql/application-prep/application_prep_basic_validation.sql index a4bda71aed..aa098468bd 100644 --- a/bin/migrate-oats-data/applications/sql/application-prep/application_prep_basic_validation.sql +++ b/bin/migrate-oats-data/applications/sql/application-prep/application_prep_basic_validation.sql @@ -24,6 +24,7 @@ oats_app_prep_data AS ( oaac.nonfarm_use_subtype_code, onutc.description AS nonfarm_use_type_description, onusc.description AS nonfarm_use_subtype_description, + oaa.legacy_application_nbr, -- ALCS has typos fixed and this is required for proper validation CASE WHEN onusc.description = 'Water Distribtion Systems' THEN 'Water Distribution Systems' @@ -32,11 +33,11 @@ oats_app_prep_data AS ( ELSE onusc.description END AS mapped_nonfarm_use_subtype_description, CASE - WHEN oaac.legislation_code = 'SEC_30_1' THEN 'Land Owner' - WHEN oaac.legislation_code = 'SEC_29_1' THEN 'L/FNG Initiated' - WHEN oaac.legislation_code = 'SEC_17_3' THEN 'Land Owner' - WHEN oaac.legislation_code = 'SEC_17_1' THEN 'L/FNG Initiated' - ELSE oaac.legislation_code + WHEN oaac.legislation_code = 'SEC_30_1' THEN 'Land Owner' + WHEN oaac.legislation_code = 'SEC_29_1' THEN 'L/FNG Initiated' + WHEN oaac.legislation_code = 'SEC_17_3' THEN 'Land Owner' + WHEN oaac.legislation_code = 'SEC_17_1' THEN 'L/FNG Initiated' + ELSE oaac.legislation_code END AS mapped_legislation, split_fee_with_local_gov_ind AS fee_lg, fee_received_date AS fee_date, @@ -72,7 +73,9 @@ SELECT oapd.alr_application_id, a.fee_split_with_lg, oapd.fee_lg, oapd.fee_waived, - a.fee_waived + a.fee_waived, + oapd.legacy_application_nbr, + a.legacy_id FROM alcs.application a LEFT JOIN oats_app_prep_data AS oapd ON a.file_number = oapd.alr_application_id::TEXT WHERE a.alr_area != oapd.component_area @@ -81,4 +84,5 @@ WHERE a.alr_area != oapd.component_area OR a.staff_observations != oapd.staff_comment_observations OR a.nfu_use_sub_type != oapd.mapped_nonfarm_use_subtype_description OR a.incl_excl_applicant_type != oapd.mapped_legislation - OR a.fee_amount != oapd.fee_amount \ No newline at end of file + OR a.fee_amount != oapd.fee_amount + OR a.legacy_id != oapd.legacy_application_nbr::text \ No newline at end of file diff --git a/bin/migrate-oats-data/noi/oats_to_alcs_notice_of_intent_table_etl/oats_to_alcs_notice_of_intent_table_etl.py b/bin/migrate-oats-data/noi/oats_to_alcs_notice_of_intent_table_etl/oats_to_alcs_notice_of_intent_table_etl.py index 4f8b76c861..ba36d0813a 100644 --- a/bin/migrate-oats-data/noi/oats_to_alcs_notice_of_intent_table_etl/oats_to_alcs_notice_of_intent_table_etl.py +++ b/bin/migrate-oats-data/noi/oats_to_alcs_notice_of_intent_table_etl/oats_to_alcs_notice_of_intent_table_etl.py @@ -113,6 +113,7 @@ def _get_update_query_from_oats_alr_applications_fields(): ag_cap_map = %(agri_cap_map)s, ag_cap_consultant = %(agri_cap_consultant)s, ag_cap = %(agri_capability_code)s, + legacy_id=%(legacy_application_nbr)s, source = 'APPLICANT' WHERE alcs.notice_of_intent.file_number = %(alr_application_id)s::TEXT; diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_base/notice_of_intent_base.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_base/notice_of_intent_base.sql index b1d10ad2f7..2b8cc68e8a 100644 --- a/bin/migrate-oats-data/noi/sql/notice_of_intent_base/notice_of_intent_base.sql +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_base/notice_of_intent_base.sql @@ -17,7 +17,8 @@ SELECT oaa.fee_waived_ind, oaac.capability_source_code, oaac.agri_cap_map, oaac.agri_cap_consultant, - oaac.agri_capability_code + oaac.agri_capability_code, + oaa.legacy_application_nbr FROM alcs.notice_of_intent noi JOIN nois_with_one_or_zero_component_only oats_noi ON oats_noi.alr_application_id::TEXT = noi.file_number JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oats_noi.alr_application_id diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_base/notice_of_intent_base_validation.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_base/notice_of_intent_base_validation.sql index fe2e8b4887..97017a9cbb 100644 --- a/bin/migrate-oats-data/noi/sql/notice_of_intent_base/notice_of_intent_base_validation.sql +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_base/notice_of_intent_base_validation.sql @@ -17,7 +17,8 @@ oats_noi_data AS ( split_fee_with_local_gov_ind AS fee_lg, fee_received_date AS fee_date, fee_waived_ind AS fee_waived, - applied_fee_amt AS fee_amount + applied_fee_amt AS fee_amount, + oaa.legacy_application_nbr FROM alcs.notice_of_intent noi JOIN nois_with_one_or_zero_component_only oats_noi ON oats_noi.alr_application_id::TEXT = noi.file_number JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oats_noi.alr_application_id @@ -42,7 +43,9 @@ SELECT oats_noi.alr_application_id, noi.fee_split_with_lg, oats_noi.fee_lg, oats_noi.fee_waived, - noi.fee_waived + noi.fee_waived, + noi.legacy_id, + oats_noi.legacy_application_nbr FROM alcs.notice_of_intent noi LEFT JOIN oats_noi_data AS oats_noi ON noi.file_number = oats_noi.alr_application_id::TEXT WHERE noi.alr_area != oats_noi.component_area @@ -51,4 +54,5 @@ WHERE noi.alr_area != oats_noi.component_area OR noi.staff_observations != oats_noi.staff_comment_observations OR noi.fee_amount != oats_noi.fee_amount OR noi.fee_split_with_lg::bool != oats_noi.fee_lg::bool - OR noi.fee_waived::bool != oats_noi.fee_waived::bool \ No newline at end of file + OR noi.fee_waived::bool != oats_noi.fee_waived::bool + OR noi.legacy_id != oats_noi.legacy_application_nbr::text \ No newline at end of file From 90520b125d1de74114dcbfff6d2583ee62e11a36 Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Fri, 20 Oct 2023 12:46:35 -0700 Subject: [PATCH 540/954] fixes --- .../apps/alcs/src/alcs/search/search.controller.spec.ts | 6 ------ 1 file changed, 6 deletions(-) diff --git a/services/apps/alcs/src/alcs/search/search.controller.spec.ts b/services/apps/alcs/src/alcs/search/search.controller.spec.ts index faee5cf67d..107d9ca82d 100644 --- a/services/apps/alcs/src/alcs/search/search.controller.spec.ts +++ b/services/apps/alcs/src/alcs/search/search.controller.spec.ts @@ -344,12 +344,6 @@ describe('SearchController', () => { expect(result.applications).toBeDefined(); expect(result.totalApplications).toBe(0); - expect( - mockNoticeOfIntentAdvancedSearchService.searchNoticeOfIntents, - ).toBeCalledTimes(1); - expect(result.noticeOfIntents).toBeDefined(); - expect(result.totalNoticeOfIntents).toBe(0); - expect( mockNonApplicationsAdvancedSearchService.searchNonApplications, ).toBeCalledTimes(0); From 4fb107b93bd932bcccc4211cab63eea4a14b8e21 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Fri, 20 Oct 2023 13:16:38 -0700 Subject: [PATCH 541/954] Manually decode token on Code Controller * Controller is now public, so without the RolesGuard there is no req.user.entity * Grab token from headers and decode it. --- .../authorization/authorization.module.ts | 2 +- .../authorization/authorization.service.ts | 19 +++++++--- ...rd.spec.ts => roles-guard.service.spec.ts} | 2 +- .../src/portal/code/code.controller.spec.ts | 36 ++++++++++--------- .../alcs/src/portal/code/code.controller.ts | 36 +++++++++++-------- 5 files changed, 57 insertions(+), 38 deletions(-) rename services/apps/alcs/src/common/authorization/{role.guard.spec.ts => roles-guard.service.spec.ts} (99%) diff --git a/services/apps/alcs/src/common/authorization/authorization.module.ts b/services/apps/alcs/src/common/authorization/authorization.module.ts index 12e6cd6235..a148ca97a2 100644 --- a/services/apps/alcs/src/common/authorization/authorization.module.ts +++ b/services/apps/alcs/src/common/authorization/authorization.module.ts @@ -17,6 +17,6 @@ import { AuthorizationService } from './authorization.service'; ], providers: [AuthorizationService], controllers: [AuthorizationController], - exports: [KeycloakConnectModule, UserModule], + exports: [KeycloakConnectModule, UserModule, AuthorizationService], }) export class AuthorizationModule {} diff --git a/services/apps/alcs/src/common/authorization/authorization.service.ts b/services/apps/alcs/src/common/authorization/authorization.service.ts index c0691fbaeb..7ad77b3172 100644 --- a/services/apps/alcs/src/common/authorization/authorization.service.ts +++ b/services/apps/alcs/src/common/authorization/authorization.service.ts @@ -95,11 +95,8 @@ export class AuthorizationService { const token = res.data; //Make sure token is legit, the Authguard will only do this on the next request - const payload = await JWS.createVerify(this.jwks).verify(token.id_token); - if (payload) { - const decodedToken = JSON.parse( - Buffer.from(payload.payload).toString(), - ) as BaseToken; + const decodedToken = await this.decodeToken(token.id_token); + if (decodedToken) { this.logger.debug(decodedToken); await this.registerOrUpdateUser(decodedToken); @@ -109,6 +106,18 @@ export class AuthorizationService { } } + private async decodeToken(token: string) { + const payload = await JWS.createVerify(this.jwks).verify(token); + if (payload && payload.payload) { + return JSON.parse(Buffer.from(payload.payload).toString()) as BaseToken; + } + } + + async decodeHeaderToken(authorization: string) { + const token = authorization.replace('Bearer ', ''); + return this.decodeToken(token); + } + async refreshToken(refreshToken: string): Promise<TokenResponse | undefined> { const secret = this.config.get<string>('KEYCLOAK.SECRET'); const clientId = this.config.get<string>('KEYCLOAK.CLIENT_ID'); diff --git a/services/apps/alcs/src/common/authorization/role.guard.spec.ts b/services/apps/alcs/src/common/authorization/roles-guard.service.spec.ts similarity index 99% rename from services/apps/alcs/src/common/authorization/role.guard.spec.ts rename to services/apps/alcs/src/common/authorization/roles-guard.service.spec.ts index c4b106d13e..059822dee8 100644 --- a/services/apps/alcs/src/common/authorization/role.guard.spec.ts +++ b/services/apps/alcs/src/common/authorization/roles-guard.service.spec.ts @@ -16,7 +16,7 @@ import { mockAppLoggerService } from '../../../test/mocks/mockLogger'; import { RolesGuard } from './roles-guard.service'; import { AUTH_ROLE } from './roles'; -describe('RoleGuard', () => { +describe('RolesGuard', () => { let guard: RolesGuard; let reflector: DeepMocked<Reflector>; let mockContext; diff --git a/services/apps/alcs/src/portal/code/code.controller.spec.ts b/services/apps/alcs/src/portal/code/code.controller.spec.ts index 7611cc9b70..9f4af9f5b6 100644 --- a/services/apps/alcs/src/portal/code/code.controller.spec.ts +++ b/services/apps/alcs/src/portal/code/code.controller.spec.ts @@ -1,18 +1,18 @@ import { classes } from '@automapper/classes'; import { AutomapperModule } from '@automapper/nestjs'; -import { DeepMocked, createMock } from '@golevelup/nestjs-testing'; +import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { ClsService } from 'nestjs-cls'; import { mockKeyCloakProviders } from '../../../test/mocks/mockTypes'; -import { CodeService } from '../../alcs/code/code.service'; -import { LocalGovernment } from '../../alcs/local-government/local-government.entity'; -import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; import { ApplicationDocumentService } from '../../alcs/application/application-document/application-document.service'; import { ApplicationService } from '../../alcs/application/application.service'; import { CardType } from '../../alcs/card/card-type/card-type.entity'; import { CardService } from '../../alcs/card/card.service'; +import { CodeService } from '../../alcs/code/code.service'; +import { LocalGovernment } from '../../alcs/local-government/local-government.entity'; +import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; import { NoticeOfIntentService } from '../../alcs/notice-of-intent/notice-of-intent.service'; -import { User } from '../../user/user.entity'; +import { AuthorizationService } from '../../common/authorization/authorization.service'; import { ApplicationSubmissionService } from '../application-submission/application-submission.service'; import { CodeController } from './code.controller'; @@ -25,6 +25,7 @@ describe('CodeController', () => { let mockAppSubmissionService: DeepMocked<ApplicationSubmissionService>; let mockNoiService: DeepMocked<NoticeOfIntentService>; let mockCodeService: DeepMocked<CodeService>; + let mockAuthorizationService: DeepMocked<AuthorizationService>; beforeEach(async () => { mockLgService = createMock(); @@ -34,6 +35,7 @@ describe('CodeController', () => { mockAppSubmissionService = createMock(); mockNoiService = createMock(); mockCodeService = createMock(); + mockAuthorizationService = createMock(); const app: TestingModule = await Test.createTestingModule({ imports: [ @@ -72,6 +74,10 @@ describe('CodeController', () => { provide: CodeService, useValue: mockCodeService, }, + { + provide: AuthorizationService, + useValue: mockAuthorizationService, + }, { provide: ClsService, useValue: {}, @@ -99,6 +105,8 @@ describe('CodeController', () => { }), ]); + mockAuthorizationService.decodeHeaderToken.mockResolvedValue({} as any); + mockAppDocService.fetchTypes.mockResolvedValue([]); mockAppSubmissionService.listNaruSubtypes.mockResolvedValue([]); mockNoiService.listTypes.mockResolvedValue([]); @@ -115,9 +123,7 @@ describe('CodeController', () => { it('should call out to local government service for fetching codes', async () => { const codes = await portalController.loadCodes({ - user: { - entity: new User(), - }, + headers: {}, }); expect(codes.localGovernments).toBeDefined(); expect(codes.localGovernments.length).toBe(1); @@ -128,6 +134,9 @@ describe('CodeController', () => { it('should set the matches flag correctly when users guid matches government', async () => { const matchingGuid = 'guid'; + mockAuthorizationService.decodeHeaderToken.mockResolvedValue({ + bceid_business_guid: matchingGuid, + } as any); mockLgService.listActive.mockResolvedValue([ new LocalGovernment({ uuid: 'fake-uuid', @@ -138,13 +147,10 @@ describe('CodeController', () => { ]); const codes = await portalController.loadCodes({ - user: { - entity: new User({ - bceidBusinessGuid: matchingGuid, - }), - }, + headers: {}, }); + expect(mockAuthorizationService.decodeHeaderToken).toHaveBeenCalledTimes(1); expect(codes.localGovernments).toBeDefined(); expect(codes.localGovernments.length).toBe(1); expect(codes.localGovernments[0].name).toEqual('fake-name'); @@ -154,9 +160,7 @@ describe('CodeController', () => { it('should call out to local submission service for fetching codes', async () => { const codes = await portalController.loadCodes({ - user: { - entity: new User(), - }, + headers: {}, }); expect(codes.submissionTypes).toBeDefined(); expect(codes.submissionTypes.length).toBe(1); diff --git a/services/apps/alcs/src/portal/code/code.controller.ts b/services/apps/alcs/src/portal/code/code.controller.ts index c9de8660c8..298c1ce10c 100644 --- a/services/apps/alcs/src/portal/code/code.controller.ts +++ b/services/apps/alcs/src/portal/code/code.controller.ts @@ -1,22 +1,21 @@ import { Mapper } from '@automapper/core'; import { InjectMapper } from '@automapper/nestjs'; -import { Controller, Get, Req, UseGuards } from '@nestjs/common'; +import { Controller, Get, Req } from '@nestjs/common'; import { Public } from 'nest-keycloak-connect'; import { ApplicationDecisionMakerCode } from '../../alcs/application-decision/application-decision-maker/application-decision-maker.entity'; import { ApplicationDecisionMakerCodeDto } from '../../alcs/application-decision/application-decision-maker/decision-maker.dto'; -import { ApplicationSubmissionStatusService } from '../../alcs/application/application-submission-status/application-submission-status.service'; +import { ApplicationDocumentService } from '../../alcs/application/application-document/application-document.service'; +import { ApplicationService } from '../../alcs/application/application.service'; +import { CardService } from '../../alcs/card/card.service'; import { ApplicationRegionDto } from '../../alcs/code/application-code/application-region/application-region.dto'; import { ApplicationRegion } from '../../alcs/code/application-code/application-region/application-region.entity'; import { CodeService } from '../../alcs/code/code.service'; import { LocalGovernment } from '../../alcs/local-government/local-government.entity'; import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; import { NoticeOfIntentService } from '../../alcs/notice-of-intent/notice-of-intent.service'; +import { AuthorizationService } from '../../common/authorization/authorization.service'; import { DocumentCode } from '../../document/document-code.entity'; -import { ApplicationDocumentService } from '../../alcs/application/application-document/application-document.service'; -import { ApplicationService } from '../../alcs/application/application.service'; -import { CardService } from '../../alcs/card/card.service'; import { DocumentTypeDto } from '../../document/document.dto'; -import { User } from '../../user/user.entity'; import { ApplicationSubmissionService } from '../application-submission/application-submission.service'; export interface LocalGovernmentDto { @@ -38,6 +37,7 @@ export class CodeController { private applicationSubmissionService: ApplicationSubmissionService, private noticeOfIntentService: NoticeOfIntentService, private codeService: CodeService, + private authorizationService: AuthorizationService, ) {} @Get() @@ -72,10 +72,7 @@ export class CodeController { ); return { - localGovernments: this.mapLocalGovernments( - localGovernments, - req.user?.entity, - ), + localGovernments: await this.mapLocalGovernments(localGovernments, req), applicationTypes, noticeOfIntentTypes, submissionTypes, @@ -86,18 +83,27 @@ export class CodeController { }; } - private mapLocalGovernments( + private async mapLocalGovernments( governments: LocalGovernment[], - user?: User, - ): LocalGovernmentDto[] { + req: any, + ): Promise<LocalGovernmentDto[]> { + //No auth guard, so we can't use req.user.entity + const tokenHeader = req.headers['authorization']; + const token = await this.authorizationService.decodeHeaderToken( + tokenHeader, + ); + const bceidGuid: string | boolean = token + ? token['bceid_business_guid'] + : false; + return governments.map((government) => ({ name: government.name, uuid: government.uuid, hasGuid: government.bceidBusinessGuid !== null, matchesUserGuid: - user && + !!bceidGuid && !!government.bceidBusinessGuid && - government.bceidBusinessGuid === user.bceidBusinessGuid, + government.bceidBusinessGuid === bceidGuid, })); } } From 1057b19ada0815d579123fa8960302d3d14e12ee Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Mon, 23 Oct 2023 10:06:29 -0700 Subject: [PATCH 542/954] fix --- .../src/portal/inbox/application/inbox-application.service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/apps/alcs/src/portal/inbox/application/inbox-application.service.ts b/services/apps/alcs/src/portal/inbox/application/inbox-application.service.ts index d1e8950932..b184b6f004 100644 --- a/services/apps/alcs/src/portal/inbox/application/inbox-application.service.ts +++ b/services/apps/alcs/src/portal/inbox/application/inbox-application.service.ts @@ -177,7 +177,7 @@ export class InboxApplicationService { } if (searchDto.civicAddress) { - query = query.andWhere('parcel.civic_address like :civic_address', { + query = query.andWhere('LOWER(parcel.civic_address) like LOWER(:civic_address)', { civic_address: `%${searchDto.civicAddress}%`, }); } From 5e2ba4f0c0f65f6024760218c4dd39ee9dbe0af8 Mon Sep 17 00:00:00 2001 From: "to. sandra" <76515860+sandratoh@users.noreply.github.com> Date: Mon, 23 Oct 2023 15:47:51 -0700 Subject: [PATCH 543/954] Update responsive view review tables (#1088) --- .../application-details.component.scss | 8 ++++++-- .../pfrs-details/pfrs-details.component.scss | 11 +++++++++-- .../notice-of-intent-details.component.scss | 8 ++++++-- .../pfrs-details/pfrs-details.component.scss | 14 +++++++++++++- 4 files changed, 34 insertions(+), 7 deletions(-) diff --git a/portal-frontend/src/app/features/applications/application-details/application-details.component.scss b/portal-frontend/src/app/features/applications/application-details/application-details.component.scss index 1da0dd8da9..7038482fe5 100644 --- a/portal-frontend/src/app/features/applications/application-details/application-details.component.scss +++ b/portal-frontend/src/app/features/applications/application-details/application-details.component.scss @@ -76,13 +76,17 @@ .adjacent-parcels { display: grid; - grid-template-columns: max-content max-content max-content; overflow-x: auto; grid-column-gap: rem(36); grid-row-gap: rem(12); + grid-template-columns: max-content max-content max-content; @media screen and (min-width: $tabletBreakpoint) { - grid-template-columns: 0.65fr 1fr 1fr; + grid-template-columns: 0.55fr 1fr 1fr; + } + + @media screen and (min-width: $midBreakpoint) { + grid-template-columns: 1fr 1fr 2fr; } .full-width { diff --git a/portal-frontend/src/app/features/applications/application-details/pfrs-details/pfrs-details.component.scss b/portal-frontend/src/app/features/applications/application-details/pfrs-details/pfrs-details.component.scss index e69c993c03..b938f15b74 100644 --- a/portal-frontend/src/app/features/applications/application-details/pfrs-details/pfrs-details.component.scss +++ b/portal-frontend/src/app/features/applications/application-details/pfrs-details/pfrs-details.component.scss @@ -2,11 +2,18 @@ .soil-table { display: grid; - grid-template-columns: 0.625fr 1fr 1fr; - overflow-x: auto; grid-column-gap: rem(36); grid-row-gap: rem(12); + grid-template-columns: max-content max-content max-content; + + @media screen and (min-width: $tabletBreakpoint) { + grid-template-columns: 0.55fr 1fr 1fr; + } + + @media screen and (min-width: $midBreakpoint) { + grid-template-columns: 0.95fr 1fr 2fr; + } .spacer-row { grid-column: 1/4; diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.scss b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.scss index 1da0dd8da9..7038482fe5 100644 --- a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.scss +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.scss @@ -76,13 +76,17 @@ .adjacent-parcels { display: grid; - grid-template-columns: max-content max-content max-content; overflow-x: auto; grid-column-gap: rem(36); grid-row-gap: rem(12); + grid-template-columns: max-content max-content max-content; @media screen and (min-width: $tabletBreakpoint) { - grid-template-columns: 0.65fr 1fr 1fr; + grid-template-columns: 0.55fr 1fr 1fr; + } + + @media screen and (min-width: $midBreakpoint) { + grid-template-columns: 1fr 1fr 2fr; } .full-width { diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pfrs-details/pfrs-details.component.scss b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pfrs-details/pfrs-details.component.scss index 474bd9aed7..b938f15b74 100644 --- a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pfrs-details/pfrs-details.component.scss +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pfrs-details/pfrs-details.component.scss @@ -1,7 +1,19 @@ @use '../../../../../styles/functions' as *; .soil-table { - grid-template-columns: 0.625fr 1fr 1fr; + display: grid; + overflow-x: auto; + grid-column-gap: rem(36); + grid-row-gap: rem(12); + grid-template-columns: max-content max-content max-content; + + @media screen and (min-width: $tabletBreakpoint) { + grid-template-columns: 0.55fr 1fr 1fr; + } + + @media screen and (min-width: $midBreakpoint) { + grid-template-columns: 0.95fr 1fr 2fr; + } .spacer-row { grid-column: 1/4; From 644bd555ac2838866d858d4d7049cac11d88abdd Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Tue, 24 Oct 2023 09:02:18 -0700 Subject: [PATCH 544/954] alcs-1222 onboarding documentation --- README.md | 8 ++++++++ alcs-frontend/README.md | 5 +++-- portal-frontend/README.md | 3 ++- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 2c4b10273a..01f982f5cc 100644 --- a/README.md +++ b/README.md @@ -23,3 +23,11 @@ To report bugs/issues/features requests, please file an [issue](https://github.c - [SchemaSpy - ALCS](https://bcgov.github.io/alcs/schemaspy/alcs/index.html) - [SchemaSpy - OATS](https://bcgov.github.io/alcs/schemaspy/oats/index.html) - [One time Jobs](./docs/jobs.md) + +## Run dev setup +- [Run ALCS Frontend](./alcs-frontend/README.md) +- [Run Portal Frontend Readme](./portal-frontend/README.md) +- [Run Services](./services/README.md) +- [Setup database](./services/README.md) +- Acquire latest development.json from some developer on the team +- Run docker - `docker compose up` \ No newline at end of file diff --git a/alcs-frontend/README.md b/alcs-frontend/README.md index a4d93da7bb..09764d5a88 100644 --- a/alcs-frontend/README.md +++ b/alcs-frontend/README.md @@ -2,9 +2,10 @@ This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 14.0.5. -## Development server -Run `ng serve` for a dev server. Navigate to `http://localhost:4200/`. The application will automatically reload if you change any of the source files. +## Run alcs +Run `npm install --legacy-peer-deps` +Run `npm run start` ## Code scaffolding diff --git a/portal-frontend/README.md b/portal-frontend/README.md index f617463d9c..06c9963a50 100644 --- a/portal-frontend/README.md +++ b/portal-frontend/README.md @@ -4,7 +4,8 @@ This project was generated with [Angular CLI](https://github.com/angular/angular ## Development server -Run `ng serve` for a dev server. Navigate to `http://localhost:4200/`. The application will automatically reload if you change any of the source files. +Run `npm install` +Run `npm run start` ## Code scaffolding From cf5479b572bfa7714ce80680b6f19c9b5557ae72 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Fri, 20 Oct 2023 10:30:20 -0700 Subject: [PATCH 545/954] Modification Updates * Add request description * Remove review date and outcome notification date * Re-order UI Fields --- .../edit-modification-dialog.component.html | 32 +++++-------- .../edit-modification-dialog.component.ts | 11 ++--- .../post-decision.component.html | 26 ++++------ .../post-decision/post-decision.component.ts | 7 --- .../app-modification-dialog.component.spec.ts | 2 +- ...reate-app-modification-dialog.component.ts | 4 ++ .../create-app-modification-dialog.html | 29 +++++++++++- ...ate-noi-modification-dialog.component.scss | 2 +- ...reate-noi-modification-dialog.component.ts | 4 ++ .../create-noi-modification-dialog.html | 29 +++++++++++- .../noi-modification-dialog.component.spec.ts | 3 +- .../edit-modification-dialog.component.html | 37 +++++++++------ .../edit-modification-dialog.component.ts | 16 ++----- .../post-decision.component.html | 16 ++----- .../post-decision/post-decision.component.ts | 7 --- .../application-modification.dto.ts | 5 +- .../application-modification.service.spec.ts | 2 + .../notice-of-intent-modification.dto.ts | 7 ++- ...ice-of-intent-modification.service.spec.ts | 2 + .../application-modification.dto.ts | 14 +++--- .../application-modification.entity.ts | 10 ++-- .../application-modification.service.ts | 12 +++-- .../application-timeline.service.spec.ts | 8 ++-- .../application-timeline.service.ts | 13 ----- .../notice-of-intent-modification.dto.ts | 15 +++--- .../notice-of-intent-modification.entity.ts | 12 +++-- ...ice-of-intent-modification.service.spec.ts | 5 +- .../notice-of-intent-modification.service.ts | 18 +++---- .../notice-of-intent-timeline.service.spec.ts | 10 ++-- .../notice-of-intent-timeline.service.ts | 13 ----- .../modification.automapper.profile.ts | 4 -- ...e-of-intent-decision.automapper.profile.ts | 8 ---- .../1697756665531-update_modifications.ts | 47 +++++++++++++++++++ services/apps/alcs/test/mocks/mockEntities.ts | 2 - 34 files changed, 228 insertions(+), 204 deletions(-) create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1697756665531-update_modifications.ts diff --git a/alcs-frontend/src/app/features/application/post-decision/edit-modification-dialog/edit-modification-dialog.component.html b/alcs-frontend/src/app/features/application/post-decision/edit-modification-dialog/edit-modification-dialog.component.html index 3ddf774f8b..53cb27464d 100644 --- a/alcs-frontend/src/app/features/application/post-decision/edit-modification-dialog/edit-modification-dialog.component.html +++ b/alcs-frontend/src/app/features/application/post-decision/edit-modification-dialog/edit-modification-dialog.component.html @@ -18,26 +18,6 @@ <h2 class="card-title">Edit Modification</h2> <mat-datepicker #datePicker type="date"></mat-datepicker> </mat-form-field> - <mat-form-field appearance="outline"> - <mat-label>Decisions to be Modified</mat-label> - <mat-select formControlName="modifiesDecisions" multiple> - <mat-option *ngFor="let decision of decisions" [value]="decision.uuid">{{ decision.resolution }}</mat-option> - </mat-select> - </mat-form-field> - - <mat-form-field appearance="outline" class="date-picker"> - <mat-label>Outcome Notification Date</mat-label> - <input - matInput - (click)="reviewDatePicker.open()" - [matDatepicker]="reviewDatePicker" - formControlName="reviewDate" - name="reviewDate" - /> - <mat-datepicker-toggle matSuffix [for]="reviewDatePicker"></mat-datepicker-toggle> - <mat-datepicker #reviewDatePicker type="date"></mat-datepicker> - </mat-form-field> - <div> <mat-label class="toggle-label">Condition to be Modified</mat-label> <mat-button-toggle-group id="isTimeExtension" formControlName="isTimeExtension" name="isTimeExtension"> @@ -46,6 +26,18 @@ <h2 class="card-title">Edit Modification</h2> </mat-button-toggle-group> </div> + <mat-form-field class="full-grid-line" appearance="outline"> + <mat-label>Resolutions to be Modified</mat-label> + <mat-select formControlName="modifiesDecisions" multiple> + <mat-option *ngFor="let decision of decisions" [value]="decision.uuid">{{ decision.resolution }}</mat-option> + </mat-select> + </mat-form-field> + + <mat-form-field appearance="outline" class="full-grid-line"> + <mat-label>Description</mat-label> + <input matInput formControlName="description" name="description" required /> + </mat-form-field> + <div class="full-grid-line toggle-group"> <mat-label class="toggle-label">Review Outcome <span>*</span></mat-label> <mat-button-toggle-group id="reviewOutcomeCode" formControlName="reviewOutcomeCode" name="reviewOutcomeCode"> diff --git a/alcs-frontend/src/app/features/application/post-decision/edit-modification-dialog/edit-modification-dialog.component.ts b/alcs-frontend/src/app/features/application/post-decision/edit-modification-dialog/edit-modification-dialog.component.ts index b1b1c03ab8..10b2da46c3 100644 --- a/alcs-frontend/src/app/features/application/post-decision/edit-modification-dialog/edit-modification-dialog.component.ts +++ b/alcs-frontend/src/app/features/application/post-decision/edit-modification-dialog/edit-modification-dialog.component.ts @@ -25,11 +25,10 @@ export class EditModificationDialogComponent implements OnInit { form = new FormGroup({ submittedDate: new FormControl<Date | undefined>(undefined, [Validators.required]), - reviewOutcomeCode: this.reviewOutcomeCodeControl, isTimeExtension: this.isTimeExtensionControl, - reviewDate: new FormControl<Date | null | undefined>(null), - outcomeNotificationDate: new FormControl<Date | null | undefined>(null), modifiesDecisions: new FormControl<string[]>([], [Validators.required]), + description: new FormControl<string | undefined>(undefined), + reviewOutcomeCode: this.reviewOutcomeCodeControl, }); constructor( @@ -47,8 +46,8 @@ export class EditModificationDialogComponent implements OnInit { submittedDate: new Date(data.existingModification.submittedDate), reviewOutcomeCode: data.existingModification.reviewOutcome.code, isTimeExtension: data.existingModification.isTimeExtension ? 'true' : 'false', - reviewDate: data.existingModification.reviewDate ? new Date(data.existingModification.reviewDate) : null, modifiesDecisions: data.existingModification.modifiesDecisions.map((dec) => dec.uuid), + description: data.existingModification.description, }); } @@ -59,14 +58,14 @@ export class EditModificationDialogComponent implements OnInit { async onSubmit() { this.isLoading = true; - const { submittedDate, isTimeExtension, reviewOutcomeCode, reviewDate, modifiesDecisions } = + const { submittedDate, isTimeExtension, reviewOutcomeCode, modifiesDecisions, description } = this.form.getRawValue(); const updateDto: ApplicationModificationUpdateDto = { submittedDate: formatDateForApi(submittedDate!), reviewOutcomeCode: reviewOutcomeCode || undefined, isTimeExtension: isTimeExtension === 'true', - reviewDate: reviewDate ? formatDateForApi(reviewDate) : reviewDate, modifiesDecisionUuids: modifiesDecisions!, + description: description!, }; try { diff --git a/alcs-frontend/src/app/features/application/post-decision/post-decision.component.html b/alcs-frontend/src/app/features/application/post-decision/post-decision.component.html index aaf8883ae7..1669d45890 100644 --- a/alcs-frontend/src/app/features/application/post-decision/post-decision.component.html +++ b/alcs-frontend/src/app/features/application/post-decision/post-decision.component.html @@ -147,6 +147,14 @@ <h5 id="modifications" class="post-decision-header"> <div class="subheading2">Condition to be Modified</div> {{ modification.isTimeExtension ? 'Time Extension' : 'Other' }} </div> + <div> + <div class="subheading2">Resolutions to be Modified</div> + <ng-container> {{ modification.modifiesDecisionsNumbers.join(', ') }} </ng-container> + </div> + <div class="full-grid-line"> + <div class="subheading2">Request Description</div> + <ng-container> {{ modification.description }} </ng-container> + </div> <div> <div class="subheading2">Review Outcome</div> <span *ngIf="modification.reviewOutcome.code === 'PEN'"> @@ -157,28 +165,10 @@ <h5 id="modifications" class="post-decision-header"> </span> <span *ngIf="modification.reviewOutcome.code !== 'PEN'">{{ modification.reviewOutcome.label }}</span> </div> - <div> - <div class="subheading2">Resolutions to be Modified</div> - <ng-container> {{ modification.modifiesDecisionsNumbers.join(', ') }} </ng-container> - </div> <div *ngIf="modification.resultingDecision"> <div class="subheading2">Resulting Resolution</div> #{{ modification.resultingDecision.resolutionNumber }}/{{ modification.resultingDecision.resolutionYear }} </div> - <div> - <div class="subheading2 left"> - Outcome Notification Date - <mat-icon matTooltip="The date that the applicant/affected party is notified of the review outcome"> - info - </mat-icon> - </div> - <span *ngIf="modification.reviewDate">{{ modification.reviewDate | momentFormat }}</span> - <span *ngIf="!modification.reviewDate"> - <app-inline-datepicker - (save)="onSaveModificationReviewDate(modification.uuid, $event)" - ></app-inline-datepicker> - </span> - </div> </div> </div> </section> diff --git a/alcs-frontend/src/app/features/application/post-decision/post-decision.component.ts b/alcs-frontend/src/app/features/application/post-decision/post-decision.component.ts index 1c3994fec7..00dde66ff5 100644 --- a/alcs-frontend/src/app/features/application/post-decision/post-decision.component.ts +++ b/alcs-frontend/src/app/features/application/post-decision/post-decision.component.ts @@ -169,13 +169,6 @@ export class PostDecisionComponent implements OnInit, OnDestroy { await this.applicationReconsiderationService.fetchByApplication(this.fileNumber); } - async onSaveModificationReviewDate(uuid: string, reviewDate: number) { - await this.modificationService.update(uuid, { - reviewDate: formatDateForApi(reviewDate), - }); - await this.modificationService.fetchByApplication(this.fileNumber); - } - async onSaveModificationOutcome(uuid: string, reviewOutcomeCode: string) { await this.modificationService.update(uuid, { reviewOutcomeCode, diff --git a/alcs-frontend/src/app/features/board/dialogs/app-modification/app-modification-dialog.component.spec.ts b/alcs-frontend/src/app/features/board/dialogs/app-modification/app-modification-dialog.component.spec.ts index 2a51ed79ee..ff3bba8c43 100644 --- a/alcs-frontend/src/app/features/board/dialogs/app-modification/app-modification-dialog.component.spec.ts +++ b/alcs-frontend/src/app/features/board/dialogs/app-modification/app-modification-dialog.component.spec.ts @@ -33,8 +33,8 @@ describe('ModificationDialogComponent', () => { uuid: '', modifiesDecisions: [], reviewOutcome: { label: 'mock', code: 'MOCK', description: 'mock' }, + description: '', isTimeExtension: true, - reviewDate: 111111, submittedDate: 111111, application: { statusCode: '', diff --git a/alcs-frontend/src/app/features/board/dialogs/app-modification/create/create-app-modification-dialog.component.ts b/alcs-frontend/src/app/features/board/dialogs/app-modification/create/create-app-modification-dialog.component.ts index ca43dd3bd9..301ad670ab 100644 --- a/alcs-frontend/src/app/features/board/dialogs/app-modification/create/create-app-modification-dialog.component.ts +++ b/alcs-frontend/src/app/features/board/dialogs/app-modification/create/create-app-modification-dialog.component.ts @@ -32,6 +32,7 @@ export class CreateAppModificationDialogComponent implements OnInit, OnDestroy { fileNumberControl = new FormControl<string | any>('', [Validators.required]); applicantControl = new FormControl('', [Validators.required]); + descriptionControl = new FormControl<string | null>(null, [Validators.required]); applicationTypeControl = new FormControl<string | null>(null, [Validators.required]); regionControl = new FormControl<string | null>(null, [Validators.required]); submittedDateControl = new FormControl<Date | undefined>(undefined, [Validators.required]); @@ -44,6 +45,7 @@ export class CreateAppModificationDialogComponent implements OnInit, OnDestroy { fileNumber: this.fileNumberControl, applicant: this.applicantControl, region: this.regionControl, + description: this.descriptionControl, localGovernment: this.localGovernmentControl, submittedDate: this.submittedDateControl, isTimeExtension: this.isTimeExtensionControl, @@ -138,6 +140,7 @@ export class CreateAppModificationDialogComponent implements OnInit, OnDestroy { boardCode: this.currentBoardCode, isTimeExtension: formValues.isTimeExtension === 'true', modifiesDecisionUuids: formValues.modifiesDecisions!, + description: formValues.description!, }; if (!modificationCreateDto.boardCode) { @@ -160,6 +163,7 @@ export class CreateAppModificationDialogComponent implements OnInit, OnDestroy { this.applicationTypeControl.reset(); this.submittedDateControl.reset(); this.modifiesDecisions.reset(); + this.descriptionControl.reset(); this.fileNumberControl.enable(); this.applicantControl.enable(); diff --git a/alcs-frontend/src/app/features/board/dialogs/app-modification/create/create-app-modification-dialog.html b/alcs-frontend/src/app/features/board/dialogs/app-modification/create/create-app-modification-dialog.html index 49c1b627cb..f0399fc453 100644 --- a/alcs-frontend/src/app/features/board/dialogs/app-modification/create/create-app-modification-dialog.html +++ b/alcs-frontend/src/app/features/board/dialogs/app-modification/create/create-app-modification-dialog.html @@ -62,7 +62,7 @@ <h2 class="card-title">Create Modification</h2> This field is required. </mat-error> </mat-form-field> - <div class="full-grid"> + <div> <ng-select appearance="outline" class="card-type" @@ -131,7 +131,7 @@ <h2 class="card-title">Create Modification</h2> </ng-select> </div> <mat-form-field appearance="outline"> - <mat-label>Decisions to be Modified</mat-label> + <mat-label>Resolutions to be Modified</mat-label> <mat-select [formControl]="modifiesDecisions" multiple> <mat-option *ngFor="let decision of decisions" [value]="decision.uuid">{{decision.resolution}}</mat-option> </mat-select> @@ -157,6 +157,31 @@ <h2 class="card-title">Create Modification</h2> <mat-datepicker #datePicker type="date"></mat-datepicker> </mat-form-field> </div> + <div class="full-grid"> + <mat-form-field class="date-picker" appearance="outline"> + <mat-label>Request Description</mat-label> + <input + matInput + id="description" + formControlName="description" + type="text" + [class.valid]=" + createForm.get('description')!.valid && + (createForm.get('description')!.dirty || createForm.get('description')!.touched) + " + [class.invalid]=" + createForm.get('description')!.invalid && + (createForm.get('description')!.dirty || createForm.get('description')!.touched) + " + /> + <mat-error + class="text-danger" + *ngIf="createForm.get('description')!.touched && createForm.get('description')!.hasError('description')" + > + This field is required. + </mat-error> + </mat-form-field> + </div> </div> <div class="warning-section"> <div class="warning" *ngIf="isDecisionDateEmpty"> diff --git a/alcs-frontend/src/app/features/board/dialogs/noi-modification/create/create-noi-modification-dialog.component.scss b/alcs-frontend/src/app/features/board/dialogs/noi-modification/create/create-noi-modification-dialog.component.scss index 28abbc2e3f..3b90fd617e 100644 --- a/alcs-frontend/src/app/features/board/dialogs/noi-modification/create/create-noi-modification-dialog.component.scss +++ b/alcs-frontend/src/app/features/board/dialogs/noi-modification/create/create-noi-modification-dialog.component.scss @@ -12,7 +12,7 @@ margin-bottom: 24px; } -.date-picker { +.full-width { width: 100%; } diff --git a/alcs-frontend/src/app/features/board/dialogs/noi-modification/create/create-noi-modification-dialog.component.ts b/alcs-frontend/src/app/features/board/dialogs/noi-modification/create/create-noi-modification-dialog.component.ts index 3d433ace85..0569522525 100644 --- a/alcs-frontend/src/app/features/board/dialogs/noi-modification/create/create-noi-modification-dialog.component.ts +++ b/alcs-frontend/src/app/features/board/dialogs/noi-modification/create/create-noi-modification-dialog.component.ts @@ -33,6 +33,7 @@ export class CreateNoiModificationDialogComponent implements OnInit, OnDestroy { fileNumberControl = new FormControl<string | any>('', [Validators.required]); applicantControl = new FormControl('', [Validators.required]); + descriptionControl = new FormControl('', [Validators.required]); regionControl = new FormControl<string | null>(null, [Validators.required]); submittedDateControl = new FormControl<Date | undefined>(undefined, [Validators.required]); localGovernmentControl = new FormControl<string | null>(null, [Validators.required]); @@ -41,6 +42,7 @@ export class CreateNoiModificationDialogComponent implements OnInit, OnDestroy { createForm = new FormGroup({ fileNumber: this.fileNumberControl, applicant: this.applicantControl, + description: this.descriptionControl, region: this.regionControl, localGovernment: this.localGovernmentControl, submittedDate: this.submittedDateControl, @@ -126,6 +128,7 @@ export class CreateNoiModificationDialogComponent implements OnInit, OnDestroy { submittedDate: formValues.submittedDate!.valueOf(), boardCode: this.currentBoardCode, modifiesDecisionUuids: formValues.modifiesDecisions!, + description: formValues.description!, }; if (!modificationCreateDto.boardCode) { @@ -147,6 +150,7 @@ export class CreateNoiModificationDialogComponent implements OnInit, OnDestroy { this.regionControl.reset(); this.submittedDateControl.reset(); this.modifiesDecisions.reset(); + this.descriptionControl.reset(); this.fileNumberControl.enable(); this.applicantControl.enable(); diff --git a/alcs-frontend/src/app/features/board/dialogs/noi-modification/create/create-noi-modification-dialog.html b/alcs-frontend/src/app/features/board/dialogs/noi-modification/create/create-noi-modification-dialog.html index bb6d93d144..698ba99143 100644 --- a/alcs-frontend/src/app/features/board/dialogs/noi-modification/create/create-noi-modification-dialog.html +++ b/alcs-frontend/src/app/features/board/dialogs/noi-modification/create/create-noi-modification-dialog.html @@ -95,13 +95,13 @@ <h2 class="card-title">Create Modification</h2> </ng-select> </div> <mat-form-field appearance="outline"> - <mat-label>Decisions to be Modified</mat-label> + <mat-label>Resolutions to be Modified</mat-label> <mat-select [formControl]="modifiesDecisions" multiple> <mat-option *ngFor="let decision of decisions" [value]="decision.uuid">{{decision.resolution}}</mat-option> </mat-select> </mat-form-field> <div> - <mat-form-field class="date-picker" appearance="outline"> + <mat-form-field class="full-width" appearance="outline"> <mat-label>Request Submitted to ALC</mat-label> <input matInput @@ -114,6 +114,31 @@ <h2 class="card-title">Create Modification</h2> <mat-datepicker #datePicker type="date"></mat-datepicker> </mat-form-field> </div> + <div class="full-grid"> + <mat-form-field class="full-width" appearance="outline"> + <mat-label>Request Description</mat-label> + <input + matInput + id="description" + formControlName="description" + type="text" + [class.valid]=" + createForm.get('description')!.valid && + (createForm.get('description')!.dirty || createForm.get('description')!.touched) + " + [class.invalid]=" + createForm.get('description')!.invalid && + (createForm.get('description')!.dirty || createForm.get('description')!.touched) + " + /> + <mat-error + class="text-danger" + *ngIf="createForm.get('description')!.touched && createForm.get('description')!.hasError('description')" + > + This field is required. + </mat-error> + </mat-form-field> + </div> </div> <div class="warning-section"> <div class="warning" *ngIf="isDecisionDateEmpty"> diff --git a/alcs-frontend/src/app/features/board/dialogs/noi-modification/noi-modification-dialog.component.spec.ts b/alcs-frontend/src/app/features/board/dialogs/noi-modification/noi-modification-dialog.component.spec.ts index 60caf2d8dc..2dc2350a8b 100644 --- a/alcs-frontend/src/app/features/board/dialogs/noi-modification/noi-modification-dialog.component.spec.ts +++ b/alcs-frontend/src/app/features/board/dialogs/noi-modification/noi-modification-dialog.component.spec.ts @@ -33,7 +33,7 @@ describe('NoiModificationDialogComponent', () => { uuid: '', modifiesDecisions: [], reviewOutcome: { label: 'mock', code: 'MOCK', description: 'mock' }, - reviewDate: 111111, + description: '', submittedDate: 111111, noticeOfIntent: { statusCode: '', @@ -45,7 +45,6 @@ describe('NoiModificationDialogComponent', () => { localGovernment: {} as ApplicationLocalGovernmentDto, retroactive: false, }, - outcomeNotificationDate: null, card: { status: { code: 'FAKE_STATUS', diff --git a/alcs-frontend/src/app/features/notice-of-intent/post-decision/edit-modification-dialog/edit-modification-dialog.component.html b/alcs-frontend/src/app/features/notice-of-intent/post-decision/edit-modification-dialog/edit-modification-dialog.component.html index d89f2e7846..1aac5ee816 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/post-decision/edit-modification-dialog/edit-modification-dialog.component.html +++ b/alcs-frontend/src/app/features/notice-of-intent/post-decision/edit-modification-dialog/edit-modification-dialog.component.html @@ -19,12 +19,34 @@ <h2 class="card-title">Edit Modification</h2> </mat-form-field> <mat-form-field appearance="outline"> - <mat-label>Decisions to be Modified</mat-label> + <mat-label>Resolutions to be Modified</mat-label> <mat-select formControlName="modifiesDecisions" multiple> <mat-option *ngFor="let decision of decisions" [value]="decision.uuid">{{ decision.resolution }}</mat-option> </mat-select> </mat-form-field> + <mat-form-field class="full-grid-line" appearance="outline"> + <mat-label>Request Description</mat-label> + <input + matInput + id="description" + formControlName="description" + type="text" + [class.valid]=" + form.get('description')!.valid && (form.get('description')!.dirty || form.get('description')!.touched) + " + [class.invalid]=" + form.get('description')!.invalid && (form.get('description')!.dirty || form.get('description')!.touched) + " + /> + <mat-error + class="text-danger" + *ngIf="form.get('description')!.touched && form.get('description')!.hasError('description')" + > + This field is required. + </mat-error> + </mat-form-field> + <div class="full-grid-line toggle-group"> <mat-label class="toggle-label">Review Outcome <span>*</span></mat-label> <mat-button-toggle-group id="reviewOutcomeCode" formControlName="reviewOutcomeCode" name="reviewOutcomeCode"> @@ -33,19 +55,6 @@ <h2 class="card-title">Edit Modification</h2> <mat-button-toggle value="REF">Refuse to Modify</mat-button-toggle> </mat-button-toggle-group> </div> - - <mat-form-field appearance="outline" class="date-picker"> - <mat-label>Outcome Notification Date</mat-label> - <input - matInput - (click)="outcomeDatePicker.open()" - [matDatepicker]="outcomeDatePicker" - formControlName="outcomeNotificationDate" - name="outcomeNotificationDate" - /> - <mat-datepicker-toggle matSuffix [for]="outcomeDatePicker"></mat-datepicker-toggle> - <mat-datepicker #outcomeDatePicker type="date"></mat-datepicker> - </mat-form-field> </div> </mat-dialog-content> <mat-dialog-actions align="end"> diff --git a/alcs-frontend/src/app/features/notice-of-intent/post-decision/edit-modification-dialog/edit-modification-dialog.component.ts b/alcs-frontend/src/app/features/notice-of-intent/post-decision/edit-modification-dialog/edit-modification-dialog.component.ts index 95305320e8..3f27035cda 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/post-decision/edit-modification-dialog/edit-modification-dialog.component.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/post-decision/edit-modification-dialog/edit-modification-dialog.component.ts @@ -25,9 +25,8 @@ export class EditModificationDialogComponent implements OnInit { form = new FormGroup({ submittedDate: new FormControl<Date | undefined>(undefined, [Validators.required]), reviewOutcomeCode: this.reviewOutcomeCodeControl, - outcomeNotificationDate: new FormControl<Date | null>(null), - reviewDate: new FormControl<Date | null | undefined>(null), modifiesDecisions: new FormControl<string[]>([], [Validators.required]), + description: new FormControl<string>('', [Validators.required]), }); constructor( @@ -44,11 +43,8 @@ export class EditModificationDialogComponent implements OnInit { this.form.patchValue({ submittedDate: new Date(data.existingModification.submittedDate), reviewOutcomeCode: data.existingModification.reviewOutcome.code, - reviewDate: data.existingModification.reviewDate ? new Date(data.existingModification.reviewDate) : null, modifiesDecisions: data.existingModification.modifiesDecisions.map((dec) => dec.uuid), - outcomeNotificationDate: data.existingModification.outcomeNotificationDate - ? new Date(data.existingModification.outcomeNotificationDate) - : null, + description: data.existingModification.description, }); } @@ -59,16 +55,12 @@ export class EditModificationDialogComponent implements OnInit { async onSubmit() { this.isLoading = true; - const { submittedDate, reviewOutcomeCode, reviewDate, modifiesDecisions, outcomeNotificationDate } = - this.form.getRawValue(); + const { submittedDate, reviewOutcomeCode, modifiesDecisions, description } = this.form.getRawValue(); const updateDto: NoticeOfIntentModificationUpdateDto = { submittedDate: formatDateForApi(submittedDate!), reviewOutcomeCode: reviewOutcomeCode || undefined, - reviewDate: reviewDate ? formatDateForApi(reviewDate) : reviewDate, - outcomeNotificationDate: outcomeNotificationDate - ? formatDateForApi(outcomeNotificationDate) - : outcomeNotificationDate, modifiesDecisionUuids: modifiesDecisions!, + description: description!, }; try { diff --git a/alcs-frontend/src/app/features/notice-of-intent/post-decision/post-decision.component.html b/alcs-frontend/src/app/features/notice-of-intent/post-decision/post-decision.component.html index be1a5eec90..6d18d9b02d 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/post-decision/post-decision.component.html +++ b/alcs-frontend/src/app/features/notice-of-intent/post-decision/post-decision.component.html @@ -33,19 +33,9 @@ <h5 id="modifications" class="post-decision-header"> <div class="subheading2">Resolutions to be Modified</div> <ng-container> {{ modification.modifiesDecisionsNumbers.join(', ') }} </ng-container> </div> - <div> - <div class="subheading2 left"> - Outcome Notification Date - <mat-icon matTooltip="The date that the proponent is notified of the review outcome"> info </mat-icon> - </div> - <span *ngIf="modification.outcomeNotificationDate">{{ - modification.outcomeNotificationDate | momentFormat - }}</span> - <span *ngIf="!modification.outcomeNotificationDate"> - <app-inline-datepicker - (save)="onSaveModificationNotificationDate(modification.uuid, $event)" - ></app-inline-datepicker> - </span> + <div class="full-grid"> + <div class="subheading2">Request Description</div> + {{ modification.description }} </div> <div> <div class="subheading2">Review Outcome</div> diff --git a/alcs-frontend/src/app/features/notice-of-intent/post-decision/post-decision.component.ts b/alcs-frontend/src/app/features/notice-of-intent/post-decision/post-decision.component.ts index 5dcabb4145..4fbe2f9219 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/post-decision/post-decision.component.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/post-decision/post-decision.component.ts @@ -82,13 +82,6 @@ export class PostDecisionComponent implements OnInit, OnDestroy { }); } - async onSaveModificationNotificationDate(uuid: string, notificationDate: number) { - await this.modificationService.update(uuid, { - outcomeNotificationDate: formatDateForApi(notificationDate), - }); - await this.modificationService.fetchByFileNumber(this.fileNumber); - } - async onSaveModificationOutcome(uuid: string, reviewOutcomeCode: string) { await this.modificationService.update(uuid, { reviewOutcomeCode, diff --git a/alcs-frontend/src/app/services/application/application-modification/application-modification.dto.ts b/alcs-frontend/src/app/services/application/application-modification/application-modification.dto.ts index 276e77d747..c21593c352 100644 --- a/alcs-frontend/src/app/services/application/application-modification/application-modification.dto.ts +++ b/alcs-frontend/src/app/services/application/application-modification/application-modification.dto.ts @@ -10,6 +10,7 @@ export interface ApplicationModificationCreateDto { applicationTypeCode: string; applicant: string; regionCode: string; + description: string; localGovernmentUuid: string; submittedDate: number; boardCode: string; @@ -18,8 +19,8 @@ export interface ApplicationModificationCreateDto { } export interface ApplicationModificationUpdateDto { + description?: string; submittedDate?: number; - reviewDate?: number | null; reviewOutcomeCode?: string; isTimeExtension?: boolean | null; modifiesDecisionUuids?: string[]; @@ -39,8 +40,8 @@ export interface ApplicationModificationDto { uuid: string; application: ApplicationForModificationDto; card: CardDto; + description: string; submittedDate: number; - reviewDate: number; reviewOutcome: ModificationReviewOutcomeTypeDto; isTimeExtension: boolean | null; modifiesDecisions: ApplicationDecisionDto[]; diff --git a/alcs-frontend/src/app/services/application/application-modification/application-modification.service.spec.ts b/alcs-frontend/src/app/services/application/application-modification/application-modification.service.spec.ts index c4a7959a11..05b04bf5f5 100644 --- a/alcs-frontend/src/app/services/application/application-modification/application-modification.service.spec.ts +++ b/alcs-frontend/src/app/services/application/application-modification/application-modification.service.spec.ts @@ -146,6 +146,7 @@ describe('ApplicationReconsiderationService', () => { const res = await service.create({ applicationFileNumber: '', applicationTypeCode: '', + description: '', boardCode: '', isTimeExtension: false, localGovernmentUuid: '', @@ -170,6 +171,7 @@ describe('ApplicationReconsiderationService', () => { const res = await service.create({ applicationFileNumber: '', applicationTypeCode: '', + description: '', boardCode: '', isTimeExtension: false, localGovernmentUuid: '', diff --git a/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent-modification/notice-of-intent-modification.dto.ts b/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent-modification/notice-of-intent-modification.dto.ts index f0fea8366d..3dd8b1845e 100644 --- a/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent-modification/notice-of-intent-modification.dto.ts +++ b/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent-modification/notice-of-intent-modification.dto.ts @@ -7,6 +7,7 @@ import { NoticeOfIntentDecisionDto } from '../decision/notice-of-intent-decision export interface NoticeOfIntentModificationCreateDto { fileNumber: string; applicant: string; + description: string; regionCode: string; localGovernmentUuid: string; submittedDate: number; @@ -15,10 +16,9 @@ export interface NoticeOfIntentModificationCreateDto { } export interface NoticeOfIntentModificationUpdateDto { + description?: string; submittedDate?: number; - reviewDate?: number | null; reviewOutcomeCode?: string; - outcomeNotificationDate?: number | null; modifiesDecisionUuids?: string[]; } @@ -35,9 +35,8 @@ export interface NoticeOfIntentModificationDto { uuid: string; noticeOfIntent: NoticeOfIntentForModificationDto; card: CardDto; + description: string; submittedDate: number; - reviewDate: number; - outcomeNotificationDate: number | null; reviewOutcome: ModificationReviewOutcomeTypeDto; modifiesDecisions: NoticeOfIntentDecisionDto[]; resultingDecision?: NoticeOfIntentDecisionDto; diff --git a/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent-modification/notice-of-intent-modification.service.spec.ts b/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent-modification/notice-of-intent-modification.service.spec.ts index 8a5b69fda3..079811f0f9 100644 --- a/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent-modification/notice-of-intent-modification.service.spec.ts +++ b/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent-modification/notice-of-intent-modification.service.spec.ts @@ -146,6 +146,7 @@ describe('NoticeOfIntentModificationService', () => { const res = await service.create({ fileNumber: '', boardCode: '', + description: '', localGovernmentUuid: '', modifiesDecisionUuids: [], regionCode: '', @@ -168,6 +169,7 @@ describe('NoticeOfIntentModificationService', () => { const res = await service.create({ fileNumber: '', boardCode: '', + description: '', localGovernmentUuid: '', modifiesDecisionUuids: [], regionCode: '', diff --git a/services/apps/alcs/src/alcs/application-decision/application-modification/application-modification.dto.ts b/services/apps/alcs/src/alcs/application-decision/application-modification/application-modification.dto.ts index 155bf25c58..612486175e 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-modification/application-modification.dto.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-modification/application-modification.dto.ts @@ -32,6 +32,10 @@ export class ApplicationModificationCreateDto { @IsString() applicant: string; + @IsNotEmpty() + @IsString() + description: string; + @IsNotEmpty() @IsString() regionCode: string; @@ -56,22 +60,18 @@ export class ApplicationModificationCreateDto { } export class ApplicationModificationUpdateDto { - @AutoMap() @IsNumber() @IsOptional() submittedDate?: number; - @AutoMap() - @IsNumber() + @IsString() @IsOptional() - reviewDate?: number; + description?: string; - @AutoMap() @IsString() @IsOptional() reviewOutcomeCode?: string; - @AutoMap() @IsBoolean() @IsOptional() isTimeExtension?: boolean; @@ -97,7 +97,7 @@ export class ApplicationModificationDto { application: ApplicationForModificationDto; card: CardDto; submittedDate: number; - reviewDate: number; + description: string; reviewOutcome: ApplicationModificationOutcomeCodeDto | null; isTimeExtension: boolean | null; modifiesDecisions: ApplicationDecisionDto[]; diff --git a/services/apps/alcs/src/alcs/application-decision/application-modification/application-modification.entity.ts b/services/apps/alcs/src/alcs/application-decision/application-modification/application-modification.entity.ts index c7b1b5dcb5..ea94dfa352 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-modification/application-modification.entity.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-modification/application-modification.entity.ts @@ -42,9 +42,13 @@ export class ApplicationModification extends Base { @Column() isTimeExtension: boolean; - @AutoMap() - @Column({ type: 'timestamptz', nullable: true }) - reviewDate: Date | null; + @AutoMap(() => String) + @Column({ + type: 'text', + nullable: true, + comment: 'Modification description provided by ALCS staff', + }) + description?: string; @AutoMap() @ManyToOne(() => Application, { cascade: ['insert'] }) diff --git a/services/apps/alcs/src/alcs/application-decision/application-modification/application-modification.service.ts b/services/apps/alcs/src/alcs/application-decision/application-modification/application-modification.service.ts index 4d5ca33e89..f93bdd1be6 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-modification/application-modification.service.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-modification/application-modification.service.ts @@ -10,6 +10,7 @@ import { Not, Repository, } from 'typeorm'; +import { filterUndefined } from '../../../utils/undefined'; import { ApplicationService } from '../../application/application.service'; import { Board } from '../../board/board.entity'; import { CARD_TYPE } from '../../card/card-type/card-type.entity'; @@ -120,6 +121,7 @@ export class ApplicationModificationService { const modification = new ApplicationModification({ submittedDate: new Date(createDto.submittedDate), isTimeExtension: createDto.isTimeExtension, + description: createDto.description, }); modification.card = await this.cardService.create( @@ -168,11 +170,6 @@ export class ApplicationModificationService { if (updateDto.submittedDate) { modification.submittedDate = new Date(updateDto.submittedDate); } - if (updateDto.reviewDate !== undefined) { - modification.reviewDate = updateDto.reviewDate - ? new Date(updateDto.reviewDate) - : null; - } if (updateDto.reviewOutcomeCode) { modification.reviewOutcomeCode = updateDto.reviewOutcomeCode; @@ -182,6 +179,11 @@ export class ApplicationModificationService { modification.isTimeExtension = updateDto.isTimeExtension; } + modification.description = filterUndefined( + updateDto.description, + modification.description, + ); + if (updateDto.modifiesDecisionUuids) { modification.modifiesDecisions = await this.applicationDecisionV1Service.getMany( diff --git a/services/apps/alcs/src/alcs/application/application-timeline/application-timeline.service.spec.ts b/services/apps/alcs/src/alcs/application/application-timeline/application-timeline.service.spec.ts index dae7f9dad1..0a457ef5cf 100644 --- a/services/apps/alcs/src/alcs/application/application-timeline/application-timeline.service.spec.ts +++ b/services/apps/alcs/src/alcs/application/application-timeline/application-timeline.service.spec.ts @@ -201,7 +201,6 @@ describe('ApplicationTimelineService', () => { new ApplicationModification({ isTimeExtension: true, submittedDate: new Date(sameDate.getTime() + 100), - reviewDate: new Date(sameDate.getTime() + 100), reviewOutcome: { label: 'CATS', } as ApplicationModificationOutcomeType, @@ -215,12 +214,11 @@ describe('ApplicationTimelineService', () => { const res = await service.getTimelineEvents('file-number'); expect(res).toBeDefined(); - expect(res.length).toEqual(3); - expect(res[2].htmlText).toEqual('Modification Requested #1 - Other'); - expect(res[1].htmlText).toEqual( + expect(res.length).toEqual(2); + expect(res[1].htmlText).toEqual('Modification Requested #1 - Other'); + expect(res[0].htmlText).toEqual( 'Modification Requested #2 - Time Extension', ); - expect(res[0].htmlText).toEqual('Modification Request Reviewed #2 - CATS'); }); it('should map Meeting Events', async () => { diff --git a/services/apps/alcs/src/alcs/application/application-timeline/application-timeline.service.ts b/services/apps/alcs/src/alcs/application/application-timeline/application-timeline.service.ts index 43cb1099c5..4fee3385f1 100644 --- a/services/apps/alcs/src/alcs/application/application-timeline/application-timeline.service.ts +++ b/services/apps/alcs/src/alcs/application/application-timeline/application-timeline.service.ts @@ -311,19 +311,6 @@ export class ApplicationTimelineService { events.push(mappedEvent); } } - - if (modification.reviewDate) { - events.push({ - htmlText: `Modification Request Reviewed #${ - modifications.length - index - } - ${modification.reviewOutcome.label}`, - startDate: - modification.reviewDate.getTime() + - SORTING_ORDER.MODIFICATION_REVIEW, - fulfilledDate: null, - isFulfilled: true, - }); - } } } diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-modification/notice-of-intent-modification.dto.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-modification/notice-of-intent-modification.dto.ts index 6b420e72f2..80b6a83616 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-modification/notice-of-intent-modification.dto.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-modification/notice-of-intent-modification.dto.ts @@ -25,6 +25,10 @@ export class NoticeOfIntentModificationCreateDto { @IsString() applicant: string; + @IsNotEmpty() + @IsString() + description: string; + @IsNotEmpty() @IsString() regionCode: string; @@ -50,13 +54,9 @@ export class NoticeOfIntentModificationUpdateDto { @IsOptional() submittedDate?: number; - @IsNumber() - @IsOptional() - reviewDate?: number; - - @IsNumber() + @IsString() @IsOptional() - outcomeNotificationDate?: number | null; + description: string; @IsString() @IsOptional() @@ -82,10 +82,9 @@ export class NoticeOfIntentModificationDto { uuid: string; noticeOfIntent: NoticeOfIntentForModificationDto; card: CardDto; + description: string; submittedDate: number; - reviewDate: number; reviewOutcome: NoticeOfIntentModificationOutcomeCodeDto | null; - outcomeNotificationDate: number | null; modifiesDecisions: NoticeOfIntentDecisionDto[]; resultingDecision: NoticeOfIntentDecisionDto | null; } diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-modification/notice-of-intent-modification.entity.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-modification/notice-of-intent-modification.entity.ts index b0db641c7c..865d9288c8 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-modification/notice-of-intent-modification.entity.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-modification/notice-of-intent-modification.entity.ts @@ -27,9 +27,6 @@ export class NoticeOfIntentModification extends Base { @Column({ type: 'timestamptz' }) submittedDate: Date; - @Column({ type: 'timestamptz', nullable: true }) - outcomeNotificationDate: Date | null; - @AutoMap() @Column({ type: 'text', default: 'PEN' }) reviewOutcomeCode: string; @@ -40,8 +37,13 @@ export class NoticeOfIntentModification extends Base { }) reviewOutcome: NoticeOfIntentModificationOutcomeType; - @Column({ type: 'timestamptz', nullable: true }) - reviewDate: Date | null; + @AutoMap(() => String) + @Column({ + type: 'text', + nullable: true, + comment: 'Modification description provided by ALCS staff', + }) + description?: string; @AutoMap() @ManyToOne(() => NoticeOfIntent, { cascade: ['insert'] }) diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-modification/notice-of-intent-modification.service.spec.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-modification/notice-of-intent-modification.service.spec.ts index 9778b62866..1010972975 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-modification/notice-of-intent-modification.service.spec.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-modification/notice-of-intent-modification.service.spec.ts @@ -110,6 +110,7 @@ describe('NoticeOfIntentModificationService', () => { mockModificationCreateDto = { fileNumber: 'fake-app-number', regionCode: 'fake-region', + description: 'description', localGovernmentUuid: 'fake-local-government-uuid', applicant: 'fake-applicant', submittedDate: 11111111111, @@ -186,8 +187,8 @@ describe('NoticeOfIntentModificationService', () => { const uuid = 'fake'; await service.update(uuid, { - isReviewApproved: true, - } as NoticeOfIntentModificationUpdateDto); + description: '', + }); expect(modificationRepoMock.findOneBy).toBeCalledWith({ uuid, diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-modification/notice-of-intent-modification.service.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-modification/notice-of-intent-modification.service.ts index 2c8a542b63..b466e8185c 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-modification/notice-of-intent-modification.service.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-modification/notice-of-intent-modification.service.ts @@ -10,6 +10,7 @@ import { Not, Repository, } from 'typeorm'; +import { filterUndefined } from '../../../utils/undefined'; import { Board } from '../../board/board.entity'; import { CARD_TYPE } from '../../card/card-type/card-type.entity'; import { CardService } from '../../card/card.service'; @@ -110,6 +111,7 @@ export class NoticeOfIntentModificationService { async create(createDto: NoticeOfIntentModificationCreateDto, board: Board) { const modification = new NoticeOfIntentModification({ submittedDate: new Date(createDto.submittedDate), + description: createDto.description, }); modification.card = await this.cardService.create( @@ -136,22 +138,16 @@ export class NoticeOfIntentModificationService { if (updateDto.submittedDate) { modification.submittedDate = new Date(updateDto.submittedDate); } - if (updateDto.reviewDate !== undefined) { - modification.reviewDate = updateDto.reviewDate - ? new Date(updateDto.reviewDate) - : null; - } - - if (updateDto.outcomeNotificationDate !== undefined) { - modification.outcomeNotificationDate = updateDto.outcomeNotificationDate - ? new Date(updateDto.outcomeNotificationDate) - : null; - } if (updateDto.reviewOutcomeCode) { modification.reviewOutcomeCode = updateDto.reviewOutcomeCode; } + modification.description = filterUndefined( + updateDto.description, + modification.description, + ); + if (updateDto.modifiesDecisionUuids) { modification.modifiesDecisions = await this.noticeOfIntentDecisionService.getMany( diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-timeline/notice-of-intent-timeline.service.spec.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-timeline/notice-of-intent-timeline.service.spec.ts index db7857b897..3cc3fb9c3b 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-timeline/notice-of-intent-timeline.service.spec.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-timeline/notice-of-intent-timeline.service.spec.ts @@ -143,14 +143,12 @@ describe('NoticeOfIntentTimelineService', () => { mockNOIModificationRepo.find.mockResolvedValue([ new NoticeOfIntentModification({ submittedDate: new Date(sameDate.getTime() + 1000), - outcomeNotificationDate: new Date(sameDate.getTime() + 1000), reviewOutcome: { label: 'CATS', } as NoticeOfIntentModificationOutcomeType, }), new NoticeOfIntentModification({ submittedDate: sameDate, - outcomeNotificationDate: sameDate, reviewOutcome: { label: 'CATS', } as NoticeOfIntentModificationOutcomeType, @@ -160,11 +158,9 @@ describe('NoticeOfIntentTimelineService', () => { const res = await service.getTimelineEvents('file-number'); expect(res).toBeDefined(); - expect(res.length).toEqual(4); - expect(res[3].htmlText).toEqual('Modification Requested #1'); - expect(res[2].htmlText).toEqual('Modification Request Reviewed #1 - CATS'); - expect(res[1].htmlText).toEqual('Modification Requested #2'); - expect(res[0].htmlText).toEqual('Modification Request Reviewed #2 - CATS'); + expect(res.length).toEqual(2); + expect(res[1].htmlText).toEqual('Modification Requested #1'); + expect(res[0].htmlText).toEqual('Modification Requested #2'); }); it('should map Meeting Events', async () => { diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-timeline/notice-of-intent-timeline.service.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-timeline/notice-of-intent-timeline.service.ts index 7e18208d07..af0243ed75 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-timeline/notice-of-intent-timeline.service.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-timeline/notice-of-intent-timeline.service.ts @@ -208,19 +208,6 @@ export class NoticeOfIntentTimelineService { events.push(mappedEvent); } } - - if (modification.outcomeNotificationDate) { - events.push({ - htmlText: `Modification Request Reviewed #${ - modifications.length - index - } - ${modification.reviewOutcome.label}`, - startDate: - modification.outcomeNotificationDate.getTime() + - SORTING_ORDER.MODIFICATION_REVIEW, - fulfilledDate: null, - isFulfilled: true, - }); - } } } diff --git a/services/apps/alcs/src/common/automapper/modification.automapper.profile.ts b/services/apps/alcs/src/common/automapper/modification.automapper.profile.ts index 5d9d5e2de5..cee5e252ca 100644 --- a/services/apps/alcs/src/common/automapper/modification.automapper.profile.ts +++ b/services/apps/alcs/src/common/automapper/modification.automapper.profile.ts @@ -76,10 +76,6 @@ export class ModificationProfile extends AutomapperProfile { (a) => a.submittedDate, mapFrom((rd) => rd.submittedDate.getTime()), ), - forMember( - (a) => a.reviewDate, - mapFrom((rd) => rd.reviewDate?.getTime()), - ), forMember( (a) => a.reviewOutcome, mapFrom((rd) => diff --git a/services/apps/alcs/src/common/automapper/notice-of-intent-decision.automapper.profile.ts b/services/apps/alcs/src/common/automapper/notice-of-intent-decision.automapper.profile.ts index 65b0555402..2e6dce5f1e 100644 --- a/services/apps/alcs/src/common/automapper/notice-of-intent-decision.automapper.profile.ts +++ b/services/apps/alcs/src/common/automapper/notice-of-intent-decision.automapper.profile.ts @@ -246,14 +246,6 @@ export class NoticeOfIntentDecisionProfile extends AutomapperProfile { (a) => a.submittedDate, mapFrom((rd) => rd.submittedDate.getTime()), ), - forMember( - (a) => a.reviewDate, - mapFrom((rd) => rd.reviewDate?.getTime()), - ), - forMember( - (a) => a.outcomeNotificationDate, - mapFrom((rd) => rd.outcomeNotificationDate?.getTime()), - ), forMember( (a) => a.modifiesDecisions, mapFrom((rd) => diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1697756665531-update_modifications.ts b/services/apps/alcs/src/providers/typeorm/migrations/1697756665531-update_modifications.ts new file mode 100644 index 0000000000..c53b339bfe --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1697756665531-update_modifications.ts @@ -0,0 +1,47 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class updateModifications1697756665531 implements MigrationInterface { + name = 'updateModifications1697756665531'; + + public async up(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_modification" DROP COLUMN "outcome_notification_date"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_modification" ADD "description" text`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."application_modification"."description" IS 'Modification description provided by ALCS staff'`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_modification" ADD "description" text`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."notice_of_intent_modification"."description" IS 'Modification description provided by ALCS staff'`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_modification" DROP COLUMN "review_date"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_modification" DROP COLUMN "review_date"`, + ); + } + + public async down(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_modification" ADD "review_date" TIMESTAMP WITH TIME ZONE`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_modification" ADD "review_date" TIMESTAMP WITH TIME ZONE`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_modification" DROP COLUMN "description"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_modification" DROP COLUMN "description"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_modification" ADD "outcome_notification_date" TIMESTAMP WITH TIME ZONE`, + ); + } +} diff --git a/services/apps/alcs/test/mocks/mockEntities.ts b/services/apps/alcs/test/mocks/mockEntities.ts index 25950830ec..877041a3b1 100644 --- a/services/apps/alcs/test/mocks/mockEntities.ts +++ b/services/apps/alcs/test/mocks/mockEntities.ts @@ -123,7 +123,6 @@ const initApplicationReconsiderationMockEntity = ( reconsideration.applicationUuid = app.uuid; reconsideration.auditCreatedAt = new Date(1, 1, 1, 1, 1, 1, 1); reconsideration.auditUpdatedAt = new Date(1, 1, 1, 1, 1, 1, 1); - reconsideration.reviewDate = new Date(1, 1, 1, 1, 1, 1, 1); reconsideration.submittedDate = new Date(1, 1, 1, 1, 1, 1, 1); const cardEntity = card ?? initCardMockEntity('222'); reconsideration.card = cardEntity; @@ -153,7 +152,6 @@ const initApplicationModificationMockEntity = ( applicationUuid: app.uuid, auditCreatedAt: new Date(1, 1, 1, 1, 1, 1, 1), auditUpdatedAt: new Date(1, 1, 1, 1, 1, 1, 1), - reviewDate: new Date(1, 1, 1, 1, 1, 1, 1), submittedDate: new Date(1, 1, 1, 1, 1, 1, 1), reviewOutcome: { label: 'mock', From 1bc0486643b517c92c7e4364c2befbea21023aef Mon Sep 17 00:00:00 2001 From: "to. sandra" <76515860+sandratoh@users.noreply.github.com> Date: Tue, 24 Oct 2023 13:15:54 -0700 Subject: [PATCH 546/954] Update submission tables responsive view with error message (#1092) --- .../application-details.component.scss | 1 + .../pfrs-details/pfrs-details.component.scss | 1 + .../subd-details/subd-details.component.scss | 8 ++++++++ .../notice-of-intent-details.component.scss | 1 + .../notification-details.component.scss | 1 + .../proposal-details/proposal-details.component.scss | 9 +++++++-- 6 files changed, 19 insertions(+), 2 deletions(-) diff --git a/portal-frontend/src/app/features/applications/application-details/application-details.component.scss b/portal-frontend/src/app/features/applications/application-details/application-details.component.scss index 7038482fe5..7844dfb207 100644 --- a/portal-frontend/src/app/features/applications/application-details/application-details.component.scss +++ b/portal-frontend/src/app/features/applications/application-details/application-details.component.scss @@ -67,6 +67,7 @@ @media screen and (min-width: $tabletBreakpoint) { grid-template-columns: 1fr 1fr 1fr; + grid-column-gap: rem(16); } .full-width { diff --git a/portal-frontend/src/app/features/applications/application-details/pfrs-details/pfrs-details.component.scss b/portal-frontend/src/app/features/applications/application-details/pfrs-details/pfrs-details.component.scss index b938f15b74..36aafed7e7 100644 --- a/portal-frontend/src/app/features/applications/application-details/pfrs-details/pfrs-details.component.scss +++ b/portal-frontend/src/app/features/applications/application-details/pfrs-details/pfrs-details.component.scss @@ -13,6 +13,7 @@ @media screen and (min-width: $midBreakpoint) { grid-template-columns: 0.95fr 1fr 2fr; + grid-column-gap: rem(16); } .spacer-row { diff --git a/portal-frontend/src/app/features/applications/application-details/subd-details/subd-details.component.scss b/portal-frontend/src/app/features/applications/application-details/subd-details/subd-details.component.scss index 8e046d8314..b7c0ee2060 100644 --- a/portal-frontend/src/app/features/applications/application-details/subd-details/subd-details.component.scss +++ b/portal-frontend/src/app/features/applications/application-details/subd-details/subd-details.component.scss @@ -6,4 +6,12 @@ overflow-x: auto; grid-column-gap: rem(36); grid-row-gap: rem(12); + + @media screen and (min-width: $tabletBreakpoint) { + grid-template-columns: 0.55fr 1fr 1fr; + } + + @media screen and (min-width: $midBreakpoint) { + grid-template-columns: 1fr 1fr 2fr; + } } diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.scss b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.scss index 7038482fe5..7844dfb207 100644 --- a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.scss +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.scss @@ -67,6 +67,7 @@ @media screen and (min-width: $tabletBreakpoint) { grid-template-columns: 1fr 1fr 1fr; + grid-column-gap: rem(16); } .full-width { diff --git a/portal-frontend/src/app/features/notifications/notification-details/notification-details.component.scss b/portal-frontend/src/app/features/notifications/notification-details/notification-details.component.scss index db504a7779..020b236421 100644 --- a/portal-frontend/src/app/features/notifications/notification-details/notification-details.component.scss +++ b/portal-frontend/src/app/features/notifications/notification-details/notification-details.component.scss @@ -67,6 +67,7 @@ @media screen and (min-width: $tabletBreakpoint) { grid-template-columns: 1fr 1fr 1fr; + grid-column-gap: rem(16); } .full-width { diff --git a/portal-frontend/src/app/features/notifications/notification-details/proposal-details/proposal-details.component.scss b/portal-frontend/src/app/features/notifications/notification-details/proposal-details/proposal-details.component.scss index 28a051e6eb..00589396a3 100644 --- a/portal-frontend/src/app/features/notifications/notification-details/proposal-details/proposal-details.component.scss +++ b/portal-frontend/src/app/features/notifications/notification-details/proposal-details/proposal-details.component.scss @@ -2,9 +2,14 @@ .survey-table { display: grid; - grid-column-gap: rem(16); - grid-row-gap: rem(8); grid-template-columns: max-content max-content max-content; overflow-x: auto; grid-column: 1/3; + grid-column-gap: rem(36); + grid-row-gap: rem(12); + + @media screen and (min-width: $tabletBreakpoint) { + grid-template-columns: 1fr 1fr 1fr; + grid-column-gap: rem(16); + } } From 4ff0c5178c4010f84625f2de165c0fa01b646dc0 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Tue, 24 Oct 2023 16:27:45 -0700 Subject: [PATCH 547/954] Update Portal Decisions * Replace outcome -> description * Update file listing to new UX * Select last tab if app is in final status * Map fileSize as it was not sent previously * Repeat a bunch of times for each page --- .../decisions/decisions.component.html | 31 ++++++++++++++---- .../decisions/decisions.component.scss | 31 +++++++++++++++++- ...view-application-submission.component.html | 2 +- .../view-application-submission.component.ts | 5 +++ .../decisions/decisions.component.html | 31 ++++++++++++++---- .../decisions/decisions.component.scss | 31 +++++++++++++++++- ...notice-of-intent-submission.component.html | 2 +- ...w-notice-of-intent-submission.component.ts | 9 +++++- ...iew-notification-submission.component.html | 2 +- .../view-notification-submission.component.ts | 6 +++- .../decisions/decisions.component.html | 32 +++++++++++++++---- .../decisions/decisions.component.scss | 31 +++++++++++++++++- .../public-application.component.html | 2 +- .../public-application.component.ts | 4 +++ .../decisions/decisions.component.html | 32 +++++++++++++++---- .../decisions/decisions.component.scss | 31 +++++++++++++++++- .../public-notice-of-intent.component.html | 2 +- .../public-notice-of-intent.component.ts | 4 +++ .../public-notification.component.html | 2 +- .../public-notification.component.ts | 6 ++++ .../application-decision.dto.ts | 1 + .../notice-of-intent-decision.dto.ts | 1 + .../public/public-notification.dto.ts | 3 +- .../application-decision.dto.ts | 8 +---- .../application-decision.dto.ts | 3 ++ .../notice-of-intent-decision.dto.ts | 8 +---- ...lication-decision-v1.automapper.profile.ts | 4 +++ ...lication-decision-v2.automapper.profile.ts | 4 +++ ...e-of-intent-decision.automapper.profile.ts | 4 +++ .../application/application-decision.dto.ts | 3 ++ .../notice-of-intent-decision.dto.ts | 3 ++ 31 files changed, 287 insertions(+), 51 deletions(-) diff --git a/portal-frontend/src/app/features/applications/view-submission/alc-review/decisions/decisions.component.html b/portal-frontend/src/app/features/applications/view-submission/alc-review/decisions/decisions.component.html index ee4d949dba..413266b969 100644 --- a/portal-frontend/src/app/features/applications/view-submission/alc-review/decisions/decisions.component.html +++ b/portal-frontend/src/app/features/applications/view-submission/alc-review/decisions/decisions.component.html @@ -11,15 +11,34 @@ <h4>Decision #{{ decisions.length - index }}</h4> #{{ decision.resolutionNumber }}/{{ decision.resolutionYear }} </div> - <div> - <div class="subheading2">Decision Outcome</div> - {{ decision.outcome.label }} {{ decision.isSubjectToConditions ? '- Subject to Conditions' : '' }} + <div class="full-width"> + <div class="subheading2">Decision Summary</div> + {{ decision.decisionDescription }} </div> - <div> + <div class="full-width"> <div class="subheading2">Decision Document</div> - <div *ngFor="let document of decision.documents"> - <a (click)="openFile(document.uuid)">{{ document.fileName }}</a> + <div class="document split" *ngFor="let document of decision.documents"> + <div> + <a (click)="openFile(document.uuid)">{{ document.fileName }}</a> +  ({{ document.fileSize | filesize }}) + </div> + <button class="center" mat-button (click)="openFile(document.uuid)"> + <mat-icon>file_download</mat-icon> + Download + </button> + </div> + <div class="document responsive left" *ngFor="let document of decision.documents"> + <div class="document-name"> + <a (click)="openFile(document.uuid)">{{ document.fileName }}</a> + </div> + <div class="split"> + <div>{{ document.fileSize | filesize }}</div> + <button class="center" mat-button (click)="openFile(document.uuid)"> + <mat-icon>file_download</mat-icon> + Download + </button> + </div> </div> </div> </div> diff --git a/portal-frontend/src/app/features/applications/view-submission/alc-review/decisions/decisions.component.scss b/portal-frontend/src/app/features/applications/view-submission/alc-review/decisions/decisions.component.scss index c92c6fb6a8..69d2c0b4af 100644 --- a/portal-frontend/src/app/features/applications/view-submission/alc-review/decisions/decisions.component.scss +++ b/portal-frontend/src/app/features/applications/view-submission/alc-review/decisions/decisions.component.scss @@ -15,6 +15,35 @@ @media screen and (min-width: $tabletBreakpoint) { padding: rem(16); margin: rem(24) 0 rem(40) 0; - grid-template-columns: 50% 50%; + grid-template-columns: 49% 49%; + + .full-width { + grid-column: 1/3; + } } } + +.document { + display: none; + padding: rem(9) rem(16); + border-radius: rem(4); + border: rem(1) solid colors.$grey; + background: colors.$white; + margin: rem(8) 0; + + @media screen and (min-width: $tabletBreakpoint) { + display: flex; + } +} + +.responsive { + display: block; + + @media screen and (min-width: $tabletBreakpoint) { + display: none; + } +} + +.document-name { + padding: rem(6) 0; +} diff --git a/portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.html b/portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.html index 2295469417..99106a1479 100644 --- a/portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.html +++ b/portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.html @@ -31,7 +31,7 @@ <h4 *ngIf="application">Application ID: {{ application.fileNumber }}</h4> <button (click)="onNavigateHome()" mat-button color="accent"><mat-icon>chevron_left</mat-icon>Return to Inbox</button> <div> <div class="navigation"> - <mat-tab-group> + <mat-tab-group [(selectedIndex)]="selectedIndex"> <mat-tab label="Applicant Submission"> <div *ngIf="application" class="content"> <section> diff --git a/portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.ts b/portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.ts index 4843830735..6a33a35a96 100644 --- a/portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.ts +++ b/portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.ts @@ -23,6 +23,7 @@ export class ViewApplicationSubmissionComponent implements OnInit, OnDestroy { $application = new BehaviorSubject<ApplicationSubmissionDetailedDto | undefined>(undefined); $applicationDocuments = new BehaviorSubject<ApplicationDocumentDto[]>([]); applicationReview: ApplicationSubmissionReviewDto | undefined; + selectedIndex = 0; $destroy = new Subject<void>(); @@ -50,6 +51,10 @@ export class ViewApplicationSubmissionComponent implements OnInit, OnDestroy { async loadApplication(fileId: string) { this.application = await this.applicationService.getByFileId(fileId); this.$application.next(this.application); + + if (this.application?.status.code === SUBMISSION_STATUS.ALC_DECISION) { + this.selectedIndex = 2; + } this.loadApplicationDocuments(fileId); } diff --git a/portal-frontend/src/app/features/notice-of-intents/view-submission/alc-review/decisions/decisions.component.html b/portal-frontend/src/app/features/notice-of-intents/view-submission/alc-review/decisions/decisions.component.html index ee4d949dba..413266b969 100644 --- a/portal-frontend/src/app/features/notice-of-intents/view-submission/alc-review/decisions/decisions.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/view-submission/alc-review/decisions/decisions.component.html @@ -11,15 +11,34 @@ <h4>Decision #{{ decisions.length - index }}</h4> #{{ decision.resolutionNumber }}/{{ decision.resolutionYear }} </div> - <div> - <div class="subheading2">Decision Outcome</div> - {{ decision.outcome.label }} {{ decision.isSubjectToConditions ? '- Subject to Conditions' : '' }} + <div class="full-width"> + <div class="subheading2">Decision Summary</div> + {{ decision.decisionDescription }} </div> - <div> + <div class="full-width"> <div class="subheading2">Decision Document</div> - <div *ngFor="let document of decision.documents"> - <a (click)="openFile(document.uuid)">{{ document.fileName }}</a> + <div class="document split" *ngFor="let document of decision.documents"> + <div> + <a (click)="openFile(document.uuid)">{{ document.fileName }}</a> +  ({{ document.fileSize | filesize }}) + </div> + <button class="center" mat-button (click)="openFile(document.uuid)"> + <mat-icon>file_download</mat-icon> + Download + </button> + </div> + <div class="document responsive left" *ngFor="let document of decision.documents"> + <div class="document-name"> + <a (click)="openFile(document.uuid)">{{ document.fileName }}</a> + </div> + <div class="split"> + <div>{{ document.fileSize | filesize }}</div> + <button class="center" mat-button (click)="openFile(document.uuid)"> + <mat-icon>file_download</mat-icon> + Download + </button> + </div> </div> </div> </div> diff --git a/portal-frontend/src/app/features/notice-of-intents/view-submission/alc-review/decisions/decisions.component.scss b/portal-frontend/src/app/features/notice-of-intents/view-submission/alc-review/decisions/decisions.component.scss index c92c6fb6a8..69d2c0b4af 100644 --- a/portal-frontend/src/app/features/notice-of-intents/view-submission/alc-review/decisions/decisions.component.scss +++ b/portal-frontend/src/app/features/notice-of-intents/view-submission/alc-review/decisions/decisions.component.scss @@ -15,6 +15,35 @@ @media screen and (min-width: $tabletBreakpoint) { padding: rem(16); margin: rem(24) 0 rem(40) 0; - grid-template-columns: 50% 50%; + grid-template-columns: 49% 49%; + + .full-width { + grid-column: 1/3; + } } } + +.document { + display: none; + padding: rem(9) rem(16); + border-radius: rem(4); + border: rem(1) solid colors.$grey; + background: colors.$white; + margin: rem(8) 0; + + @media screen and (min-width: $tabletBreakpoint) { + display: flex; + } +} + +.responsive { + display: block; + + @media screen and (min-width: $tabletBreakpoint) { + display: none; + } +} + +.document-name { + padding: rem(6) 0; +} diff --git a/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.html b/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.html index cb3c251b59..4f5f1b97f0 100644 --- a/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.html @@ -31,7 +31,7 @@ <h4 *ngIf="submission">NOI ID: {{ submission.fileNumber }}</h4> <button (click)="onNavigateHome()" mat-button color="accent"><mat-icon>chevron_left</mat-icon>Return to Inbox</button> <div> <div class="navigation"> - <mat-tab-group> + <mat-tab-group [(selectedIndex)]="selectedIndex"> <mat-tab label="Applicant Submission"> <div *ngIf="submission" class="content"> <section> diff --git a/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.ts b/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.ts index d572503dc0..7f5c45ccc9 100644 --- a/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.ts @@ -3,7 +3,10 @@ import { ActivatedRoute, Router } from '@angular/router'; import { BehaviorSubject, Subject, takeUntil } from 'rxjs'; import { NoticeOfIntentDocumentDto } from '../../../services/notice-of-intent-document/notice-of-intent-document.dto'; import { NoticeOfIntentDocumentService } from '../../../services/notice-of-intent-document/notice-of-intent-document.service'; -import { NoticeOfIntentSubmissionDetailedDto } from '../../../services/notice-of-intent-submission/notice-of-intent-submission.dto'; +import { + NOI_SUBMISSION_STATUS, + NoticeOfIntentSubmissionDetailedDto, +} from '../../../services/notice-of-intent-submission/notice-of-intent-submission.dto'; import { NoticeOfIntentSubmissionService } from '../../../services/notice-of-intent-submission/notice-of-intent-submission.service'; @Component({ @@ -16,6 +19,7 @@ export class ViewNoticeOfIntentSubmissionComponent implements OnInit, OnDestroy $noiSubmission = new BehaviorSubject<NoticeOfIntentSubmissionDetailedDto | undefined>(undefined); $noiDocuments = new BehaviorSubject<NoticeOfIntentDocumentDto[]>([]); submission: NoticeOfIntentSubmissionDetailedDto | undefined; + selectedIndex = 0; constructor( private noiSubmissionService: NoticeOfIntentSubmissionService, @@ -37,6 +41,9 @@ export class ViewNoticeOfIntentSubmissionComponent implements OnInit, OnDestroy async loadSubmission(fileId: string) { const noiSubmission = await this.noiSubmissionService.getByFileId(fileId); this.submission = noiSubmission; + if (this.submission?.status.code === NOI_SUBMISSION_STATUS.ALC_DECISION) { + this.selectedIndex = 1; + } this.$noiSubmission.next(noiSubmission); } diff --git a/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.html b/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.html index 30e826702d..c7f3f4883a 100644 --- a/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.html +++ b/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.html @@ -31,7 +31,7 @@ <h4 *ngIf="submission">Notification ID: {{ submission.fileNumber }}</h4> <button (click)="onNavigateHome()" mat-button color="accent"><mat-icon>chevron_left</mat-icon>Return to Inbox</button> <div> <div class="navigation"> - <mat-tab-group> + <mat-tab-group [(selectedIndex)]="selectedIndex"> <mat-tab label="Applicant Submission"> <div *ngIf="submission" class="content"> <section> diff --git a/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.ts b/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.ts index b21120939e..0bf889e0a4 100644 --- a/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.ts +++ b/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.ts @@ -4,8 +4,8 @@ import { BehaviorSubject, Subject, takeUntil } from 'rxjs'; import { NotificationDocumentDto } from '../../../services/notification-document/notification-document.dto'; import { NotificationDocumentService } from '../../../services/notification-document/notification-document.service'; import { + NOTIFICATION_STATUS, NotificationSubmissionDetailedDto, - NotificationSubmissionDto, } from '../../../services/notification-submission/notification-submission.dto'; import { NotificationSubmissionService } from '../../../services/notification-submission/notification-submission.service'; import { ConfirmationDialogService } from '../../../shared/confirmation-dialog/confirmation-dialog.service'; @@ -20,6 +20,7 @@ export class ViewNotificationSubmissionComponent implements OnInit, OnDestroy { $notificationSubmission = new BehaviorSubject<NotificationSubmissionDetailedDto | undefined>(undefined); $notificationDocuments = new BehaviorSubject<NotificationDocumentDto[]>([]); submission: NotificationSubmissionDetailedDto | undefined; + selectedIndex = 0; constructor( private notificationSubmissionService: NotificationSubmissionService, @@ -42,6 +43,9 @@ export class ViewNotificationSubmissionComponent implements OnInit, OnDestroy { async loadSubmission(fileId: string) { const notificationSubmission = await this.notificationSubmissionService.getByFileId(fileId); this.submission = notificationSubmission; + if (this.submission?.status.code === NOTIFICATION_STATUS.ALC_RESPONSE) { + this.selectedIndex = 1; + } this.$notificationSubmission.next(notificationSubmission); } diff --git a/portal-frontend/src/app/features/public/application/alc-review/decisions/decisions.component.html b/portal-frontend/src/app/features/public/application/alc-review/decisions/decisions.component.html index 7657271cf1..bcd9a775c9 100644 --- a/portal-frontend/src/app/features/public/application/alc-review/decisions/decisions.component.html +++ b/portal-frontend/src/app/features/public/application/alc-review/decisions/decisions.component.html @@ -11,14 +11,34 @@ <h4>Decision #{{ applicationDecisions.length - index }}</h4> #{{ decision.resolutionNumber }}/{{ decision.resolutionYear }} </div> - <div> - <div class="subheading2">Decision Outcome</div> - {{ decision.outcome.label }} {{ decision.isSubjectToConditions ? '- Subject to Conditions' : '' }} + <div class="full-width"> + <div class="subheading2">Decision Summary</div> + {{ decision.decisionDescription }} </div> - <div> + + <div class="full-width"> <div class="subheading2">Decision Document</div> - <div *ngFor="let document of decision.documents"> - <a (click)="openFile(document.uuid)">{{ document.fileName }}</a> + <div class="document split" *ngFor="let document of decision.documents"> + <div> + <a (click)="openFile(document.uuid)">{{ document.fileName }}</a> +  ({{ document.fileSize | filesize }}) + </div> + <button class="center" mat-button (click)="openFile(document.uuid)"> + <mat-icon>file_download</mat-icon> + Download + </button> + </div> + <div class="document responsive left" *ngFor="let document of decision.documents"> + <div class="document-name"> + <a (click)="openFile(document.uuid)">{{ document.fileName }}</a> + </div> + <div class="split"> + <div>{{ document.fileSize | filesize }}</div> + <button class="center" mat-button (click)="openFile(document.uuid)"> + <mat-icon>file_download</mat-icon> + Download + </button> + </div> </div> </div> </div> diff --git a/portal-frontend/src/app/features/public/application/alc-review/decisions/decisions.component.scss b/portal-frontend/src/app/features/public/application/alc-review/decisions/decisions.component.scss index c92c6fb6a8..69d2c0b4af 100644 --- a/portal-frontend/src/app/features/public/application/alc-review/decisions/decisions.component.scss +++ b/portal-frontend/src/app/features/public/application/alc-review/decisions/decisions.component.scss @@ -15,6 +15,35 @@ @media screen and (min-width: $tabletBreakpoint) { padding: rem(16); margin: rem(24) 0 rem(40) 0; - grid-template-columns: 50% 50%; + grid-template-columns: 49% 49%; + + .full-width { + grid-column: 1/3; + } } } + +.document { + display: none; + padding: rem(9) rem(16); + border-radius: rem(4); + border: rem(1) solid colors.$grey; + background: colors.$white; + margin: rem(8) 0; + + @media screen and (min-width: $tabletBreakpoint) { + display: flex; + } +} + +.responsive { + display: block; + + @media screen and (min-width: $tabletBreakpoint) { + display: none; + } +} + +.document-name { + padding: rem(6) 0; +} diff --git a/portal-frontend/src/app/features/public/application/public-application.component.html b/portal-frontend/src/app/features/public/application/public-application.component.html index addc35e61c..71080e38a4 100644 --- a/portal-frontend/src/app/features/public/application/public-application.component.html +++ b/portal-frontend/src/app/features/public/application/public-application.component.html @@ -34,7 +34,7 @@ <h4 *ngIf="submission">Application ID: {{ submission.fileNumber }}</h4> </button> <div> <div class="navigation"> - <mat-tab-group> + <mat-tab-group [(selectedIndex)]="selectedIndex"> <mat-tab label="Applicant Submission"> <div *ngIf="submission" class="content"> <section> diff --git a/portal-frontend/src/app/features/public/application/public-application.component.ts b/portal-frontend/src/app/features/public/application/public-application.component.ts index 87b7720e97..7b83aecfe3 100644 --- a/portal-frontend/src/app/features/public/application/public-application.component.ts +++ b/portal-frontend/src/app/features/public/application/public-application.component.ts @@ -25,6 +25,7 @@ export class PublicApplicationComponent implements OnInit, OnDestroy { documents: PublicDocumentDto[] = []; parcels: PublicParcelDto[] = []; decisions: ApplicationPortalDecisionDto[] = []; + selectedIndex = 0; constructor(private publicService: PublicService, private route: ActivatedRoute) {} @@ -42,6 +43,9 @@ export class PublicApplicationComponent implements OnInit, OnDestroy { if (res) { const { submission, documents, parcels, review, decisions } = res; + if (submission.status.code === SUBMISSION_STATUS.ALC_DECISION) { + this.selectedIndex = 2; + } this.submission = submission; this.documents = documents; this.parcels = parcels; diff --git a/portal-frontend/src/app/features/public/notice-of-intent/alc-review/decisions/decisions.component.html b/portal-frontend/src/app/features/public/notice-of-intent/alc-review/decisions/decisions.component.html index 5f78f69636..413266b969 100644 --- a/portal-frontend/src/app/features/public/notice-of-intent/alc-review/decisions/decisions.component.html +++ b/portal-frontend/src/app/features/public/notice-of-intent/alc-review/decisions/decisions.component.html @@ -11,14 +11,34 @@ <h4>Decision #{{ decisions.length - index }}</h4> #{{ decision.resolutionNumber }}/{{ decision.resolutionYear }} </div> - <div> - <div class="subheading2">Decision Outcome</div> - {{ decision.outcome.label }} {{ decision.isSubjectToConditions ? '- Subject to Conditions' : '' }} + <div class="full-width"> + <div class="subheading2">Decision Summary</div> + {{ decision.decisionDescription }} </div> - <div> + + <div class="full-width"> <div class="subheading2">Decision Document</div> - <div *ngFor="let document of decision.documents"> - <a (click)="openFile(document.uuid)">{{ document.fileName }}</a> + <div class="document split" *ngFor="let document of decision.documents"> + <div> + <a (click)="openFile(document.uuid)">{{ document.fileName }}</a> +  ({{ document.fileSize | filesize }}) + </div> + <button class="center" mat-button (click)="openFile(document.uuid)"> + <mat-icon>file_download</mat-icon> + Download + </button> + </div> + <div class="document responsive left" *ngFor="let document of decision.documents"> + <div class="document-name"> + <a (click)="openFile(document.uuid)">{{ document.fileName }}</a> + </div> + <div class="split"> + <div>{{ document.fileSize | filesize }}</div> + <button class="center" mat-button (click)="openFile(document.uuid)"> + <mat-icon>file_download</mat-icon> + Download + </button> + </div> </div> </div> </div> diff --git a/portal-frontend/src/app/features/public/notice-of-intent/alc-review/decisions/decisions.component.scss b/portal-frontend/src/app/features/public/notice-of-intent/alc-review/decisions/decisions.component.scss index c92c6fb6a8..69d2c0b4af 100644 --- a/portal-frontend/src/app/features/public/notice-of-intent/alc-review/decisions/decisions.component.scss +++ b/portal-frontend/src/app/features/public/notice-of-intent/alc-review/decisions/decisions.component.scss @@ -15,6 +15,35 @@ @media screen and (min-width: $tabletBreakpoint) { padding: rem(16); margin: rem(24) 0 rem(40) 0; - grid-template-columns: 50% 50%; + grid-template-columns: 49% 49%; + + .full-width { + grid-column: 1/3; + } } } + +.document { + display: none; + padding: rem(9) rem(16); + border-radius: rem(4); + border: rem(1) solid colors.$grey; + background: colors.$white; + margin: rem(8) 0; + + @media screen and (min-width: $tabletBreakpoint) { + display: flex; + } +} + +.responsive { + display: block; + + @media screen and (min-width: $tabletBreakpoint) { + display: none; + } +} + +.document-name { + padding: rem(6) 0; +} diff --git a/portal-frontend/src/app/features/public/notice-of-intent/public-notice-of-intent.component.html b/portal-frontend/src/app/features/public/notice-of-intent/public-notice-of-intent.component.html index dd7dedf518..a3b75fdfef 100644 --- a/portal-frontend/src/app/features/public/notice-of-intent/public-notice-of-intent.component.html +++ b/portal-frontend/src/app/features/public/notice-of-intent/public-notice-of-intent.component.html @@ -34,7 +34,7 @@ <h4 *ngIf="submission">Notice of Intent ID: {{ submission.fileNumber }}</h4> </button> <div> <div class="navigation"> - <mat-tab-group> + <mat-tab-group [(selectedIndex)]="selectedIndex"> <mat-tab label="Applicant Submission"> <div *ngIf="submission" class="content"> <section> diff --git a/portal-frontend/src/app/features/public/notice-of-intent/public-notice-of-intent.component.ts b/portal-frontend/src/app/features/public/notice-of-intent/public-notice-of-intent.component.ts index 80d17b1400..8b35006873 100644 --- a/portal-frontend/src/app/features/public/notice-of-intent/public-notice-of-intent.component.ts +++ b/portal-frontend/src/app/features/public/notice-of-intent/public-notice-of-intent.component.ts @@ -21,6 +21,7 @@ export class PublicNoticeOfIntentComponent implements OnInit, OnDestroy { documents: PublicDocumentDto[] = []; parcels: PublicParcelDto[] = []; decisions: ApplicationPortalDecisionDto[] = []; + selectedIndex = 0; constructor(private publicService: PublicService, private route: ActivatedRoute) {} @@ -39,6 +40,9 @@ export class PublicNoticeOfIntentComponent implements OnInit, OnDestroy { const { submission, documents, parcels, decisions } = res; this.submission = submission; + if (submission.status.code === SUBMISSION_STATUS.ALC_DECISION) { + this.selectedIndex = 2; + } this.documents = documents; this.parcels = parcels; this.decisions = decisions; diff --git a/portal-frontend/src/app/features/public/notification/public-notification.component.html b/portal-frontend/src/app/features/public/notification/public-notification.component.html index 48125cd3a2..b765991cc0 100644 --- a/portal-frontend/src/app/features/public/notification/public-notification.component.html +++ b/portal-frontend/src/app/features/public/notification/public-notification.component.html @@ -34,7 +34,7 @@ <h4 *ngIf="submission">Notification ID: {{ submission.fileNumber }}</h4> </button> <div> <div class="navigation"> - <mat-tab-group> + <mat-tab-group [(selectedIndex)]="selectedIndex"> <mat-tab label="Applicant Submission"> <div *ngIf="submission" class="content"> <section> diff --git a/portal-frontend/src/app/features/public/notification/public-notification.component.ts b/portal-frontend/src/app/features/public/notification/public-notification.component.ts index 7d51fc676e..4caf4b0c82 100644 --- a/portal-frontend/src/app/features/public/notification/public-notification.component.ts +++ b/portal-frontend/src/app/features/public/notification/public-notification.component.ts @@ -2,6 +2,7 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { Subject, takeUntil } from 'rxjs'; import { ApplicationPortalDecisionDto } from '../../../services/application-decision/application-decision.dto'; +import { NOTIFICATION_STATUS } from '../../../services/notification-submission/notification-submission.dto'; import { PublicNotificationSubmissionDto } from '../../../services/public/public-notification.dto'; import { PublicDocumentDto, PublicParcelDto } from '../../../services/public/public.dto'; import { PublicService } from '../../../services/public/public.service'; @@ -18,6 +19,7 @@ export class PublicNotificationComponent implements OnInit, OnDestroy { documents: PublicDocumentDto[] = []; parcels: PublicParcelDto[] = []; decisions: ApplicationPortalDecisionDto[] = []; + selectedIndex = 1; constructor(private publicService: PublicService, private route: ActivatedRoute) {} @@ -35,6 +37,10 @@ export class PublicNotificationComponent implements OnInit, OnDestroy { if (res) { const { submission, documents, parcels } = res; + if (submission.status.code !== NOTIFICATION_STATUS.ALC_RESPONSE) { + this.selectedIndex = 0; + } + this.submission = submission; this.documents = documents; this.parcels = parcels; diff --git a/portal-frontend/src/app/services/application-decision/application-decision.dto.ts b/portal-frontend/src/app/services/application-decision/application-decision.dto.ts index a444a87146..aa71b0d4e9 100644 --- a/portal-frontend/src/app/services/application-decision/application-decision.dto.ts +++ b/portal-frontend/src/app/services/application-decision/application-decision.dto.ts @@ -10,6 +10,7 @@ export interface ApplicationPortalDecisionDto { uuid: string; date: number; outcome: BaseCodeDto; + decisionDescription: string; resolutionNumber: number; resolutionYear: number; documents: ApplicationDocumentDto[]; diff --git a/portal-frontend/src/app/services/notice-of-intent-decision/notice-of-intent-decision.dto.ts b/portal-frontend/src/app/services/notice-of-intent-decision/notice-of-intent-decision.dto.ts index 4684fbaa36..e0a7b2f745 100644 --- a/portal-frontend/src/app/services/notice-of-intent-decision/notice-of-intent-decision.dto.ts +++ b/portal-frontend/src/app/services/notice-of-intent-decision/notice-of-intent-decision.dto.ts @@ -10,6 +10,7 @@ export interface NoticeOfIntentPortalDecisionDto { uuid: string; date: number; outcome: BaseCodeDto; + decisionDescription: string; resolutionNumber: number; resolutionYear: number; documents: ApplicationDocumentDto[]; diff --git a/portal-frontend/src/app/services/public/public-notification.dto.ts b/portal-frontend/src/app/services/public/public-notification.dto.ts index 0e94f58f6e..b2a77ef801 100644 --- a/portal-frontend/src/app/services/public/public-notification.dto.ts +++ b/portal-frontend/src/app/services/public/public-notification.dto.ts @@ -1,6 +1,7 @@ import { ApplicationStatusDto } from '../application-submission/application-submission.dto'; import { NoticeOfIntentPortalDecisionDto } from '../notice-of-intent-decision/notice-of-intent-decision.dto'; import { ProposedStructure } from '../notice-of-intent-submission/notice-of-intent-submission.dto'; +import { NotificationSubmissionStatusDto } from '../notification-submission/notification-submission.dto'; import { PublicDocumentDto, PublicOwnerDto, PublicParcelDto } from './public.dto'; export interface GetPublicNotificationResponseDto { @@ -20,7 +21,7 @@ export interface PublicNotificationSubmissionDto { localGovernmentUuid: string; type: string; typeCode: string; - status: ApplicationStatusDto; + status: NotificationSubmissionStatusDto; lastStatusUpdate: number; transferees: PublicOwnerDto[]; submittersFileNumber: string | null; diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v1/application-decision/application-decision.dto.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v1/application-decision/application-decision.dto.ts index a1c2da2d29..cadee846db 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v1/application-decision/application-decision.dto.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v1/application-decision/application-decision.dto.ts @@ -167,15 +167,9 @@ export class DecisionDocumentDto { @AutoMap() uuid: string; - @AutoMap() fileName: string; - - @AutoMap() + fileSize: number; mimeType: string; - - @AutoMap() uploadedBy: string; - - @AutoMap() uploadedAt: number; } diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision.dto.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision.dto.ts index 2ae860e115..e1c2646599 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision.dto.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision.dto.ts @@ -235,6 +235,9 @@ export class DecisionDocumentDto { @AutoMap() fileName: string; + @AutoMap() + fileSize: number; + @AutoMap() mimeType: string; diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.dto.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.dto.ts index 1f963db3d8..cbed3c2a32 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.dto.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.dto.ts @@ -150,15 +150,9 @@ export class NoticeOfIntentDecisionDocumentDto { @AutoMap() uuid: string; - @AutoMap() fileName: string; - - @AutoMap() + fileSize: number; mimeType: string; - - @AutoMap() uploadedBy: string; - - @AutoMap() uploadedAt: number; } diff --git a/services/apps/alcs/src/common/automapper/application-decision-v1.automapper.profile.ts b/services/apps/alcs/src/common/automapper/application-decision-v1.automapper.profile.ts index 362a4c5ff5..a2954bb542 100644 --- a/services/apps/alcs/src/common/automapper/application-decision-v1.automapper.profile.ts +++ b/services/apps/alcs/src/common/automapper/application-decision-v1.automapper.profile.ts @@ -187,6 +187,10 @@ export class ApplicationDecisionProfile extends AutomapperProfile { (a) => a.fileName, mapFrom((ad) => ad.document.fileName), ), + forMember( + (a) => a.fileSize, + mapFrom((ad) => ad.document.fileSize), + ), forMember( (a) => a.uploadedBy, mapFrom((ad) => ad.document.uploadedBy?.name), diff --git a/services/apps/alcs/src/common/automapper/application-decision-v2.automapper.profile.ts b/services/apps/alcs/src/common/automapper/application-decision-v2.automapper.profile.ts index c716fa6a7e..9926fb63ad 100644 --- a/services/apps/alcs/src/common/automapper/application-decision-v2.automapper.profile.ts +++ b/services/apps/alcs/src/common/automapper/application-decision-v2.automapper.profile.ts @@ -219,6 +219,10 @@ export class ApplicationDecisionProfile extends AutomapperProfile { (a) => a.fileName, mapFrom((ad) => ad.document.fileName), ), + forMember( + (a) => a.fileSize, + mapFrom((ad) => ad.document.fileSize), + ), forMember( (a) => a.uploadedBy, mapFrom((ad) => ad.document.uploadedBy?.name), diff --git a/services/apps/alcs/src/common/automapper/notice-of-intent-decision.automapper.profile.ts b/services/apps/alcs/src/common/automapper/notice-of-intent-decision.automapper.profile.ts index 65b0555402..8576f40b3a 100644 --- a/services/apps/alcs/src/common/automapper/notice-of-intent-decision.automapper.profile.ts +++ b/services/apps/alcs/src/common/automapper/notice-of-intent-decision.automapper.profile.ts @@ -196,6 +196,10 @@ export class NoticeOfIntentDecisionProfile extends AutomapperProfile { (a) => a.fileName, mapFrom((ad) => ad.document.fileName), ), + forMember( + (a) => a.fileSize, + mapFrom((ad) => ad.document.fileSize), + ), forMember( (a) => a.uploadedBy, mapFrom((ad) => ad.document.uploadedBy?.name), diff --git a/services/apps/alcs/src/portal/public/application/application-decision.dto.ts b/services/apps/alcs/src/portal/public/application/application-decision.dto.ts index 9ed5be978d..d27156aa23 100644 --- a/services/apps/alcs/src/portal/public/application/application-decision.dto.ts +++ b/services/apps/alcs/src/portal/public/application/application-decision.dto.ts @@ -14,6 +14,9 @@ export class ApplicationPortalDecisionDto { @AutoMap(() => ApplicationDecisionOutcomeCodeDto) outcome: ApplicationDecisionOutcomeCodeDto; + @AutoMap(() => String) + decisionDescription: string; + @AutoMap(() => String) resolutionNumber: number; diff --git a/services/apps/alcs/src/portal/public/notice-of-intent/notice-of-intent-decision.dto.ts b/services/apps/alcs/src/portal/public/notice-of-intent/notice-of-intent-decision.dto.ts index 9684bb7a4e..4be5dfd02e 100644 --- a/services/apps/alcs/src/portal/public/notice-of-intent/notice-of-intent-decision.dto.ts +++ b/services/apps/alcs/src/portal/public/notice-of-intent/notice-of-intent-decision.dto.ts @@ -16,6 +16,9 @@ export class NoticeOfIntentPortalDecisionDto { @AutoMap(() => NoticeOfIntentDecisionOutcomeCodeDto) outcome: NoticeOfIntentDecisionOutcomeCodeDto; + @AutoMap(() => String) + decisionDescription: string; + @AutoMap(() => String) resolutionNumber: number; From 08a9147a879e9e728abd05afa357a9b05c9b0502 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Mon, 23 Oct 2023 16:48:14 -0700 Subject: [PATCH 548/954] Update Decisions + Add Copying * Remove certain outcomes * Remove linked outcome resolution for App Decisions * Add ability and unit tests for copying an existing decision --- .../decision-conditions.component.spec.ts | 1 - .../decision-input-v2.component.html | 13 +-- .../decision-input-v2.component.ts | 20 ++--- .../decision-v2/decision-v2.component.html | 40 ++++++---- .../decision-v2/decision-v2.component.spec.ts | 3 +- .../decision-v2/decision-v2.component.ts | 7 +- .../decision-v2/decision-v2.component.html | 23 +++++- .../decision-v2/decision-v2.component.spec.ts | 3 +- .../decision-v2/decision-v2.component.ts | 5 +- .../application-decision-v2.dto.ts | 5 +- .../application-decision-v2.service.ts | 1 - .../decision/notice-of-intent-decision.dto.ts | 1 + .../application-decision-v2.module.ts | 2 - ...application-decision-v2.controller.spec.ts | 2 +- .../application-decision-v2.controller.ts | 8 +- .../application-decision-v2.service.spec.ts | 73 ++++++++++++++--- .../application-decision-v2.service.ts | 79 +++++++++++++++---- .../application-decision.dto.ts | 9 +-- .../linked-resolution-outcome-type.entity.ts | 5 -- .../application-decision.entity.ts | 7 -- ...tice-of-intent-decision-v2.service.spec.ts | 56 ++++++++++++- .../notice-of-intent-decision-v2.service.ts | 67 ++++++++++++++-- .../notice-of-intent-decision.dto.ts | 4 + ...lication-decision-v2.automapper.profile.ts | 8 -- .../1698076577193-update_decision_outcomes.ts | 21 +++++ ...6542-remove_linked_outcome_for_app_decs.ts | 35 ++++++++ services/apps/alcs/test/mocks/mockEntities.ts | 1 + 27 files changed, 370 insertions(+), 129 deletions(-) delete mode 100644 services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/linked-resolution-outcome-type.entity.ts create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1698076577193-update_decision_outcomes.ts create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1698104086542-remove_linked_outcome_for_app_decs.ts diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-conditions.component.spec.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-conditions.component.spec.ts index 81eb022bc1..e24b4fb88d 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-conditions.component.spec.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-conditions.component.spec.ts @@ -44,7 +44,6 @@ describe('DecisionConditionComponent', () => { ceoCriterion: [], decisionComponentTypes: [], decisionMakers: [], - linkedResolutionOutcomeTypes: [], naruSubtypes: [], outcomes: [], decisionConditionTypes: [], diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.html index a21979a446..6424b89c81 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.html @@ -71,7 +71,7 @@ <h3>Resolution</h3> class="card-post-decision" [items]="postDecisions" appendTo="body" - placeholder="Linked Recon or Modification Request *" + placeholder="Linked Request*" bindLabel="label" bindValue="uuid" [clearable]="false" @@ -80,17 +80,6 @@ <h3>Resolution</h3> > </ng-select> - <ng-select - *ngIf="!isFirstDecision" - appearance="outline" - [items]="linkedResolutionOutcomes" - formControlName="linkedResolutionOutcome" - appendTo="body" - bindLabel="label" - bindValue="code" - placeholder="Linked Resolution Outcome *" - ></ng-select> - <ng-select appearance="outline" [items]="decisionMakers" diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.ts index 5a8edb798d..7c8e545841 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.ts @@ -14,17 +14,16 @@ import { } from '../../../../../services/application/application-reconsideration/application-reconsideration.dto'; import { ApplicationReconsiderationService } from '../../../../../services/application/application-reconsideration/application-reconsideration.service'; import { + ApplicationDecisionCodesDto, + ApplicationDecisionComponentDto, ApplicationDecisionConditionDto, ApplicationDecisionDto, CeoCriterion, CeoCriterionDto, CreateApplicationDecisionDto, - ApplicationDecisionCodesDto, - ApplicationDecisionComponentDto, DecisionMaker, DecisionMakerDto, DecisionOutcomeCodeDto, - LinkedResolutionOutcomeTypeDto, UpdateApplicationDecisionConditionDto, } from '../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; import { ApplicationDecisionV2Service } from '../../../../../services/application/decision/application-decision-v2/application-decision-v2.service'; @@ -68,7 +67,6 @@ export class DecisionInputV2Component implements OnInit, OnDestroy { outcomes: DecisionOutcomeCodeDto[] = []; decisionMakers: DecisionMakerDto[] = []; ceoCriterionItems: CeoCriterionDto[] = []; - linkedResolutionOutcomes: LinkedResolutionOutcomeTypeDto[] = []; resolutionYears: number[] = []; postDecisions: MappedPostDecision[] = []; @@ -95,7 +93,6 @@ export class DecisionInputV2Component implements OnInit, OnDestroy { chairReviewRequired: new FormControl<string>('true', [Validators.required]), chairReviewDate: new FormControl<Date | null>(null), chairReviewOutcome: new FormControl<string | null>(null), - linkedResolutionOutcome: new FormControl<string | null>(null), auditDate: new FormControl<Date | null>(null), criterionModification: new FormControl<string[]>([]), ceoCriterion: new FormControl<string | null>(null), @@ -171,7 +168,6 @@ export class DecisionInputV2Component implements OnInit, OnDestroy { this.outcomes = this.codes.outcomes; this.decisionMakers = this.codes.decisionMakers; this.ceoCriterionItems = this.codes.ceoCriterion; - this.linkedResolutionOutcomes = this.codes.linkedResolutionOutcomeTypes; } private setupSubscribers() { @@ -291,7 +287,6 @@ export class DecisionInputV2Component implements OnInit, OnDestroy { decisionDescription: existingDecision.decisionDescription, rescindedDate: existingDecision.rescindedDate ? new Date(existingDecision.rescindedDate) : undefined, rescindedComment: existingDecision.rescindedComment, - linkedResolutionOutcome: existingDecision.linkedResolutionOutcome?.code, }); this.conditions = existingDecision.conditions; @@ -335,9 +330,9 @@ export class DecisionInputV2Component implements OnInit, OnDestroy { this.components = existingDecision.components; } - this.requireComponents = ['APPR', 'APPA'].includes(existingDecision.outcome.code); + this.requireComponents = existingDecision.outcome.code === 'APPR'; - if (['APPR', 'APPA', 'RESC'].includes(existingDecision.outcome.code)) { + if (['APPR', 'RESC'].includes(existingDecision.outcome.code)) { this.showComponents = true; } else { this.showComponents = false; @@ -423,7 +418,6 @@ export class DecisionInputV2Component implements OnInit, OnDestroy { decisionDescription, rescindedDate, rescindedComment, - linkedResolutionOutcome, } = this.form.getRawValue(); const selectedDecision = this.postDecisions.find((postDec) => postDec.uuid === postDecision); @@ -451,7 +445,6 @@ export class DecisionInputV2Component implements OnInit, OnDestroy { rescindedComment: rescindedComment, decisionComponents: this.components, conditions: this.conditionUpdates, - linkedResolutionOutcomeCode: linkedResolutionOutcome, }; if (ceoCriterion && ceoCriterion === CeoCriterion.MODIFICATION) { data.isTimeExtension = criterionModification?.includes('isTimeExtension'); @@ -469,17 +462,14 @@ export class DecisionInputV2Component implements OnInit, OnDestroy { this.ceoCriterionItems = this.codes?.ceoCriterion.filter((ceoCriterion) => ceoCriterion.code === CeoCriterion.MODIFICATION) ?? []; this.form.controls.ceoCriterion.disable(); - this.form.controls.linkedResolutionOutcome.disable(); this.form.controls.decisionMaker.disable(); this.form.patchValue({ decisionMaker: DecisionMaker.CEO, ceoCriterion: CeoCriterion.MODIFICATION, - linkedResolutionOutcome: 'VARY', }); } else { this.form.controls.decisionMaker.enable(); - this.form.controls.linkedResolutionOutcome.enable(); this.form.controls.ceoCriterion.enable(); this.ceoCriterionItems = this.codes?.ceoCriterion.filter((ceoCriterion) => ceoCriterion.code !== CeoCriterion.MODIFICATION) ?? []; @@ -604,7 +594,7 @@ export class DecisionInputV2Component implements OnInit, OnDestroy { } onChangeDecisionOutcome(selectedOutcome: DecisionOutcomeCodeDto) { - if (['APPR', 'APPA', 'RESC'].includes(selectedOutcome.code)) { + if (['APPR', 'RESC'].includes(selectedOutcome.code)) { if (this.form.controls.isSubjectToConditions.disabled) { this.showComponents = true; this.form.controls.isSubjectToConditions.enable(); diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.html index 7317bd80b5..b95c28df84 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.html @@ -1,9 +1,30 @@ <div class="split"> <div><h1>Decisions</h1></div> <div matTooltip="{{ disabledCreateBtnTooltip }}" [matTooltipDisabled]="!isPaused && !isDraftExists"> - <button [disabled]="isPaused || isDraftExists" mat-flat-button color="primary" (click)="onCreate()"> + <button + *ngIf="decisions.length === 0" + [disabled]="isPaused || isDraftExists" + mat-flat-button + color="primary" + (click)="onCreate()" + > + Decision Draft </button> + <button + [matMenuTriggerFor]="createMenu" + *ngIf="decisions.length > 0" + [disabled]="isPaused || isDraftExists" + mat-flat-button + color="primary" + > + + Decision Draft + </button> + <mat-menu class="move-board-menu" xPosition="before" #createMenu="matMenu"> + <button *ngFor="let decision of decisions" mat-menu-item (click)="onCreate(decision.uuid)"> + Duplicate Res #{{ decision.resolutionNumber }}/{{ decision.resolutionYear }} + </button> + <button mat-menu-item (click)="onCreate()">Blank Decision</button> + </mat-menu> </div> </div> <section class="no-decisions" *ngIf="!decisions.length"> @@ -110,19 +131,6 @@ <h4>Resolution</h4> <ng-container *ngIf="decision.isOther">Other</ng-container> </div> - <div *ngIf="!!decision.modifies || !!decision.reconsiders"> - <div class="subheading2"> - <span *ngIf="!!decision.modifies">Modification Outcome</span> - <span *ngIf="!!decision.reconsiders">Reconsideration Outcome</span> - </div> - {{ decision.linkedResolutionOutcome?.label }} - <app-no-data - *ngIf="decision.linkedResolutionOutcome === null || decision.linkedResolutionOutcome === undefined" - ></app-no-data> - {{ decision.modifies?.linkedResolutions?.join(', ') }} - {{ decision.reconsiders?.linkedResolutions?.join(', ') }} - </div> - <div class="full-width"> <div class="subheading2">Decision Description</div> {{ decision.decisionDescription }} @@ -151,7 +159,7 @@ <h4>Documents</h4> </section> <!-- Components --> - <ng-container *ngIf="['APPR', 'APPA', 'RESC'].includes(decision.outcome.code)"> + <ng-container *ngIf="['APPR', 'RESC'].includes(decision.outcome.code)"> <h4>Components</h4> <section class="decision-section"> <app-no-data @@ -294,7 +302,7 @@ <h5>{{ component.applicationDecisionComponentType?.label }}</h5> </section> </ng-container> - <ng-container *ngIf="['APPR', 'APPA', 'RESC'].includes(decision.outcome.code) && decision.isSubjectToConditions"> + <ng-container *ngIf="['APPR', 'RESC'].includes(decision.outcome.code) && decision.isSubjectToConditions"> <h4>Conditions</h4> <section class="decision-section"> <div> diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.spec.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.spec.ts index 25930efded..a1b490e13f 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.spec.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.spec.ts @@ -1,6 +1,7 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MatDialog, MatDialogRef } from '@angular/material/dialog'; +import { MatMenuModule } from '@angular/material/menu'; import { MatSnackBarModule } from '@angular/material/snack-bar'; import { ActivatedRoute } from '@angular/router'; import { createMock, DeepMocked } from '@golevelup/ts-jest'; @@ -36,7 +37,7 @@ describe('DecisionV2Component', () => { mockApplicationDecisionComponentService = createMock(); await TestBed.configureTestingModule({ - imports: [MatSnackBarModule], + imports: [MatSnackBarModule, MatMenuModule], declarations: [DecisionV2Component], providers: [ { diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.ts index 7df8be5029..0f5edc40c8 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.ts @@ -6,8 +6,8 @@ import { ApplicationDetailService } from '../../../../services/application/appli import { ApplicationDto } from '../../../../services/application/application.dto'; import { ApplicationDecisionComponentService } from '../../../../services/application/decision/application-decision-v2/application-decision-component/application-decision-component.service'; import { - ApplicationDecisionWithLinkedResolutionDto, APPLICATION_DECISION_COMPONENT_TYPE, + ApplicationDecisionWithLinkedResolutionDto, CeoCriterionDto, DecisionMakerDto, DecisionOutcomeCodeDto, @@ -22,7 +22,6 @@ import { } from '../../../../shared/application-type-pill/application-type-pill.constants'; import { ConfirmationDialogService } from '../../../../shared/confirmation-dialog/confirmation-dialog.service'; import { formatDateForApi } from '../../../../shared/utils/api-date-formatter'; -import { decisionChildRoutes } from '../decision.module'; import { RevertToDraftDialogComponent } from './revert-to-draft-dialog/revert-to-draft-dialog.component'; type LoadingDecision = ApplicationDecisionWithLinkedResolutionDto & { @@ -36,7 +35,6 @@ type LoadingDecision = ApplicationDecisionWithLinkedResolutionDto & { }) export class DecisionV2Component implements OnInit, OnDestroy { $destroy = new Subject<void>(); - createDecision = decisionChildRoutes.find((e) => e.path === 'create')!; isDraftExists = true; disabledCreateBtnTooltip = ''; @@ -112,8 +110,9 @@ export class DecisionV2Component implements OnInit, OnDestroy { }); } - async onCreate() { + async onCreate(existingUuid?: string) { const newDecision = await this.decisionService.create({ + decisionToCopy: existingUuid, resolutionYear: new Date().getFullYear(), chairReviewRequired: true, isDraft: true, diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-v2.component.html b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-v2.component.html index 599487830d..2ffb1673d2 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-v2.component.html +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-v2.component.html @@ -1,9 +1,30 @@ <div class="split"> <div><h1>Decisions</h1></div> <div matTooltip="{{ disabledCreateBtnTooltip }}" [matTooltipDisabled]="!isPaused && !isDraftExists"> - <button [disabled]="isPaused || isDraftExists" mat-flat-button color="primary" (click)="onCreate()"> + <button + *ngIf="decisions.length === 0" + [disabled]="isPaused || isDraftExists" + mat-flat-button + color="primary" + (click)="onCreate()" + > + Decision Draft </button> + <button + [matMenuTriggerFor]="createMenu" + *ngIf="decisions.length > 0" + [disabled]="isPaused || isDraftExists" + mat-flat-button + color="primary" + > + + Decision Draft + </button> + <mat-menu class="move-board-menu" xPosition="before" #createMenu="matMenu"> + <button *ngFor="let decision of decisions" mat-menu-item (click)="onCreate(decision.uuid)"> + Duplicate Res #{{ decision.resolutionNumber }}/{{ decision.resolutionYear }} + </button> + <button mat-menu-item (click)="onCreate()">Blank Decision</button> + </mat-menu> </div> </div> <section class="no-decisions" *ngIf="!decisions.length"> diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-v2.component.spec.ts b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-v2.component.spec.ts index 9ed928895f..a7c5031a77 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-v2.component.spec.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-v2.component.spec.ts @@ -1,6 +1,7 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MatDialog, MatDialogRef } from '@angular/material/dialog'; +import { MatMenuModule } from '@angular/material/menu'; import { MatSnackBarModule } from '@angular/material/snack-bar'; import { ActivatedRoute } from '@angular/router'; import { createMock, DeepMocked } from '@golevelup/ts-jest'; @@ -36,7 +37,7 @@ describe('DecisionV2Component', () => { mockNOIDecisionComponentService = createMock(); await TestBed.configureTestingModule({ - imports: [MatSnackBarModule], + imports: [MatSnackBarModule, MatMenuModule], declarations: [DecisionV2Component], providers: [ { diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-v2.component.ts b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-v2.component.ts index ef6835a5a3..db779c6964 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-v2.component.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-v2.component.ts @@ -19,7 +19,6 @@ import { } from '../../../../shared/application-type-pill/application-type-pill.constants'; import { ConfirmationDialogService } from '../../../../shared/confirmation-dialog/confirmation-dialog.service'; import { formatDateForApi } from '../../../../shared/utils/api-date-formatter'; -import { decisionChildRoutes } from '../decision.module'; import { RevertToDraftDialogComponent } from './revert-to-draft-dialog/revert-to-draft-dialog.component'; type LoadingDecision = NoticeOfIntentDecisionDto & { @@ -35,7 +34,6 @@ export const OUTCOMES_WITH_COMPONENTS = ['APPR', 'APPA', 'RESC']; }) export class DecisionV2Component implements OnInit, OnDestroy { $destroy = new Subject<void>(); - createDecision = decisionChildRoutes.find((e) => e.path === 'create')!; isDraftExists = true; disabledCreateBtnTooltip = ''; @@ -107,12 +105,13 @@ export class DecisionV2Component implements OnInit, OnDestroy { }); } - async onCreate() { + async onCreate(existingUuid?: string) { const newDecision = await this.decisionService.create({ resolutionYear: new Date().getFullYear(), isDraft: true, date: Date.now(), fileNumber: this.fileNumber, + decisionToCopy: existingUuid, }); const index = this.decisions.length; diff --git a/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-v2.dto.ts b/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-v2.dto.ts index 7b9d8268a1..35bdc0280f 100644 --- a/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-v2.dto.ts +++ b/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-v2.dto.ts @@ -26,12 +26,12 @@ export interface UpdateApplicationDecisionDto { rescindedDate?: number | null; rescindedComment?: string | null; conditions?: UpdateApplicationDecisionConditionDto[]; - linkedResolutionOutcomeCode?: string | null; isDraft?: boolean; } export interface CreateApplicationDecisionDto extends UpdateApplicationDecisionDto { date: number; + decisionToCopy?: string; outcomeCode?: string; resolutionNumber?: number | null; resolutionYear: number; @@ -56,7 +56,6 @@ export interface ApplicationDecisionDto { ceoCriterion?: CeoCriterionDto; chairReviewRequired: boolean; chairReviewOutcome: ChairReviewOutcomeCodeDto | null; - linkedResolutionOutcome: LinkedResolutionOutcomeTypeDto | null; applicationFileNumber: string; documents: ApplicationDecisionDocumentDto[]; isTimeExtension?: boolean | null; @@ -194,7 +193,6 @@ export interface ApplicationDecisionCodesDto { ceoCriterion: CeoCriterionDto[]; decisionComponentTypes: DecisionComponentTypeDto[]; decisionConditionTypes: ApplicationDecisionConditionTypeDto[]; - linkedResolutionOutcomeTypes: LinkedResolutionOutcomeTypeDto[]; naruSubtypes: NaruSubtypesDto[]; } @@ -211,7 +209,6 @@ export enum APPLICATION_DECISION_COMPONENT_TYPE { } export interface ApplicationDecisionConditionTypeDto extends BaseCodeDto {} -export interface LinkedResolutionOutcomeTypeDto extends BaseCodeDto {} export interface NaruSubtypesDto extends BaseCodeDto {} export interface ApplicationDecisionConditionDto { diff --git a/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-v2.service.ts b/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-v2.service.ts index 51133aa130..a11a8622c9 100644 --- a/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-v2.service.ts +++ b/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-v2.service.ts @@ -49,7 +49,6 @@ export class ApplicationDecisionV2Service { ceoCriterion: [], decisionComponentTypes: [], decisionConditionTypes: [], - linkedResolutionOutcomeTypes: [], naruSubtypes: [], }; } diff --git a/alcs-frontend/src/app/services/notice-of-intent/decision/notice-of-intent-decision.dto.ts b/alcs-frontend/src/app/services/notice-of-intent/decision/notice-of-intent-decision.dto.ts index 7e0c7588e4..a5134b647f 100644 --- a/alcs-frontend/src/app/services/notice-of-intent/decision/notice-of-intent-decision.dto.ts +++ b/alcs-frontend/src/app/services/notice-of-intent/decision/notice-of-intent-decision.dto.ts @@ -23,6 +23,7 @@ export interface CreateNoticeOfIntentDecisionDto extends UpdateNoticeOfIntentDec resolutionNumber?: number; resolutionYear: number; fileNumber: string; + decisionToCopy?: string; } export interface LinkedResolutionDto { diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision-v2.module.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision-v2.module.ts index 3fccff1009..32e456e283 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision-v2.module.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision-v2.module.ts @@ -43,7 +43,6 @@ import { ApplicationDecisionComponentType } from './application-decision/compone import { ApplicationDecisionComponentController } from './application-decision/component/application-decision-component.controller'; import { ApplicationDecisionComponent } from './application-decision/component/application-decision-component.entity'; import { ApplicationDecisionComponentService } from './application-decision/component/application-decision-component.service'; -import { LinkedResolutionOutcomeType } from './application-decision/linked-resolution-outcome-type.entity'; @Module({ imports: [ @@ -63,7 +62,6 @@ import { LinkedResolutionOutcomeType } from './application-decision/linked-resol ApplicationDecisionComponentType, ApplicationDecisionCondition, ApplicationDecisionConditionType, - LinkedResolutionOutcomeType, NaruSubtype, ApplicationSubmissionToSubmissionStatus, ApplicationSubmission, diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.controller.spec.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.controller.spec.ts index 174ebb5664..b4d79689b8 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.controller.spec.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.controller.spec.ts @@ -106,7 +106,6 @@ describe('ApplicationDecisionV2Controller', () => { decisionMakers: [], decisionComponentTypes: [], decisionConditionTypes: [], - linkedResolutionOutcomeType: [], naruSubtypes: [], }); }); @@ -165,6 +164,7 @@ describe('ApplicationDecisionV2Controller', () => { mockApplication, undefined, undefined, + undefined, ); }); diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.controller.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.controller.ts index f8163272e9..4afaf94e23 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.controller.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.controller.ts @@ -35,13 +35,11 @@ import { ApplicationDecisionDto, ApplicationDecisionOutcomeCodeDto, CreateApplicationDecisionDto, - LinkedResolutionOutcomeTypeDto, UpdateApplicationDecisionDto, } from './application-decision.dto'; import { CeoCriterionCodeDto } from './ceo-criterion/ceo-criterion.dto'; import { ApplicationDecisionComponentType } from './component/application-decision-component-type.entity'; import { ApplicationDecisionComponentTypeDto } from './component/application-decision-component.dto'; -import { LinkedResolutionOutcomeType } from './linked-resolution-outcome-type.entity'; @ApiOAuth2(config.get<string[]>('KEYCLOAK.SCOPES')) @Controller('application-decision') @@ -102,11 +100,6 @@ export class ApplicationDecisionV2Controller { ApplicationDecisionConditionType, ApplicationDecisionConditionTypeDto, ), - linkedResolutionOutcomeTypes: await this.mapper.mapArrayAsync( - codes.linkedResolutionOutcomeType, - LinkedResolutionOutcomeType, - LinkedResolutionOutcomeTypeDto, - ), naruSubtypes: await this.mapper.mapArrayAsync( codes.naruSubtypes, NaruSubtype, @@ -155,6 +148,7 @@ export class ApplicationDecisionV2Controller { application, modification, reconsiders, + createDto.decisionToCopy, ); return this.mapper.mapAsync( diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service.spec.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service.spec.ts index fa96f49015..1190d3c7fa 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service.spec.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service.spec.ts @@ -12,13 +12,14 @@ import { initApplicationDecisionMock, initApplicationMockEntity, } from '../../../../../test/mocks/mockEntities'; -import { ApplicationSubmissionStatusService } from '../../../application/application-submission-status/application-submission-status.service'; -import { SUBMISSION_STATUS } from '../../../application/application-submission-status/submission-status.dto'; import { DocumentService } from '../../../../document/document.service'; import { NaruSubtype } from '../../../../portal/application-submission/naru-subtype/naru-subtype.entity'; +import { ApplicationSubmissionStatusService } from '../../../application/application-submission-status/application-submission-status.service'; +import { SUBMISSION_STATUS } from '../../../application/application-submission-status/submission-status.dto'; import { ApplicationService } from '../../../application/application.service'; import { ApplicationCeoCriterionCode } from '../../application-ceo-criterion/application-ceo-criterion.entity'; import { ApplicationDecisionConditionType } from '../../application-decision-condition/application-decision-condition-code.entity'; +import { ApplicationDecisionCondition } from '../../application-decision-condition/application-decision-condition.entity'; import { ApplicationDecisionConditionService } from '../../application-decision-condition/application-decision-condition.service'; import { ApplicationDecisionDocument } from '../../application-decision-document/application-decision-document.entity'; import { ApplicationDecisionMakerCode } from '../../application-decision-maker/application-decision-maker.entity'; @@ -31,8 +32,8 @@ import { } from './application-decision.dto'; import { ApplicationDecisionComponentType } from './component/application-decision-component-type.entity'; import { ApplicationDecisionComponentDto } from './component/application-decision-component.dto'; +import { ApplicationDecisionComponent } from './component/application-decision-component.entity'; import { ApplicationDecisionComponentService } from './component/application-decision-component.service'; -import { LinkedResolutionOutcomeType } from './linked-resolution-outcome-type.entity'; describe('ApplicationDecisionV2Service', () => { let service: ApplicationDecisionV2Service; @@ -49,9 +50,6 @@ describe('ApplicationDecisionV2Service', () => { let mockCeoCriterionCodeRepository: DeepMocked< Repository<ApplicationCeoCriterionCode> >; - let mockLinkedResolutionOutcomeRepository: DeepMocked< - Repository<LinkedResolutionOutcomeType> - >; let mockApplicationService: DeepMocked<ApplicationService>; let mockDocumentService: DeepMocked<DocumentService>; let mockApplicationDecisionComponentTypeRepository: DeepMocked< @@ -80,7 +78,6 @@ describe('ApplicationDecisionV2Service', () => { mockApplicationDecisionComponentTypeRepository = createMock(); mockDecisionComponentService = createMock(); mockDecisionConditionService = createMock(); - mockLinkedResolutionOutcomeRepository = createMock(); mockNaruSubtypeRepository = createMock(); mockApplicationSubmissionStatusService = createMock(); @@ -112,10 +109,6 @@ describe('ApplicationDecisionV2Service', () => { provide: getRepositoryToken(ApplicationDecisionOutcomeCode), useValue: mockDecisionOutcomeRepository, }, - { - provide: getRepositoryToken(LinkedResolutionOutcomeType), - useValue: mockLinkedResolutionOutcomeRepository, - }, { provide: getRepositoryToken(NaruSubtype), useValue: mockNaruSubtypeRepository, @@ -173,7 +166,6 @@ describe('ApplicationDecisionV2Service', () => { mockDecisionMakerCodeRepository.find.mockResolvedValue([]); mockCeoCriterionCodeRepository.find.mockResolvedValue([]); - mockLinkedResolutionOutcomeRepository.find.mockResolvedValue([]); mockApplicationDecisionComponentTypeRepository.find.mockResolvedValue([]); mockNaruSubtypeRepository.find.mockResolvedValue([]); @@ -268,6 +260,62 @@ describe('ApplicationDecisionV2Service', () => { expect(mockApplicationService.update).toHaveBeenCalledTimes(0); }); + it('should copy the existing decisions fields when one is provided for create', async () => { + mockDecisionRepository.find.mockResolvedValue([]); + const component = new ApplicationDecisionComponent({ + uuid: 'component-uuid', + }); + const condition = new ApplicationDecisionCondition({ + uuid: 'condition-uuid', + components: [component], + }); + + const decision = new ApplicationDecision({ + documents: [], + components: [component], + conditions: [condition], + decisionMakerCode: 'decisionMakerCode', + outcomeCode: 'outcomeCode', + isSubjectToConditions: false, + }); + mockDecisionRepository.findOne.mockResolvedValue(decision); + mockDecisionRepository.exist.mockResolvedValue(false); + + const decisionDate = new Date(2022, 2, 2, 2, 2, 2, 2); + const decisionToCreate: CreateApplicationDecisionDto = { + chairReviewRequired: false, + resolutionNumber: 0, + resolutionYear: 0, + date: decisionDate.getTime(), + applicationFileNumber: 'file-number', + outcomeCode: 'Outcome', + isDraft: true, + decisionToCopy: 'existing-decision-uuid', + }; + + await service.create( + decisionToCreate, + mockApplication, + undefined, + undefined, + 'mock-uuid', + ); + + expect(mockDecisionRepository.save).toBeCalledTimes(3); + expect(mockApplicationService.update).toHaveBeenCalledTimes(0); + const finalDecision = mockDecisionRepository.save.mock.calls[2][0]; + + expect(finalDecision.decisionMakerCode).toEqual( + decision.decisionMakerCode, + ); + expect(finalDecision.outcomeCode).toEqual(decision.outcomeCode); + expect(finalDecision.isSubjectToConditions).toEqual( + decision.isSubjectToConditions, + ); + expect(finalDecision.components?.length).toEqual(1); + expect(finalDecision.conditions?.length).toEqual(1); + }); + it('should fail create a decision if the resolution number is already in use', async () => { mockDecisionRepository.findOne.mockResolvedValue( {} as ApplicationDecision, @@ -372,6 +420,7 @@ describe('ApplicationDecisionV2Service', () => { date: decisionDate, isDraft: false, }); + mockDecisionComponentService.softRemove.mockResolvedValue(); mockDecisionRepository.find.mockResolvedValue([createdDecision]); diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service.ts index fbb15ca902..f45be8946d 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service.ts @@ -2,6 +2,7 @@ import { MultipartFile } from '@fastify/multipart'; import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { In, IsNull, Repository } from 'typeorm'; +import { v4 } from 'uuid'; import { ServiceNotFoundException, ServiceValidationException, @@ -20,6 +21,7 @@ import { Application } from '../../../application/application.entity'; import { ApplicationService } from '../../../application/application.service'; import { ApplicationCeoCriterionCode } from '../../application-ceo-criterion/application-ceo-criterion.entity'; import { ApplicationDecisionConditionType } from '../../application-decision-condition/application-decision-condition-code.entity'; +import { ApplicationDecisionCondition } from '../../application-decision-condition/application-decision-condition.entity'; import { ApplicationDecisionConditionService } from '../../application-decision-condition/application-decision-condition.service'; import { ApplicationDecisionDocument } from '../../application-decision-document/application-decision-document.entity'; import { ApplicationDecisionMakerCode } from '../../application-decision-maker/application-decision-maker.entity'; @@ -34,7 +36,6 @@ import { import { ApplicationDecisionComponentType } from './component/application-decision-component-type.entity'; import { ApplicationDecisionComponent } from './component/application-decision-component.entity'; import { ApplicationDecisionComponentService } from './component/application-decision-component.service'; -import { LinkedResolutionOutcomeType } from './linked-resolution-outcome-type.entity'; @Injectable() export class ApplicationDecisionV2Service { @@ -53,8 +54,6 @@ export class ApplicationDecisionV2Service { private decisionComponentTypeRepository: Repository<ApplicationDecisionComponentType>, @InjectRepository(ApplicationDecisionConditionType) private decisionConditionTypeRepository: Repository<ApplicationDecisionConditionType>, - @InjectRepository(LinkedResolutionOutcomeType) - private linkedResolutionOutcomeTypeRepository: Repository<LinkedResolutionOutcomeType>, @InjectRepository(NaruSubtype) private naruNaruSubtypeRepository: Repository<NaruSubtype>, private applicationService: ApplicationService, @@ -98,7 +97,6 @@ export class ApplicationDecisionV2Service { outcome: true, decisionMaker: true, ceoCriterion: true, - linkedResolutionOutcome: true, modifies: { modifiesDecisions: true, }, @@ -192,7 +190,6 @@ export class ApplicationDecisionV2Service { outcome: true, decisionMaker: true, ceoCriterion: true, - linkedResolutionOutcome: true, documents: { document: true, }, @@ -324,6 +321,7 @@ export class ApplicationDecisionV2Service { application: Application, modifies: ApplicationModification | undefined | null, reconsiders: ApplicationReconsideration | undefined | null, + decisionToCopy?: string, ) { const isDraftExists = await this.appDecisionRepository.exist({ where: { @@ -338,6 +336,13 @@ export class ApplicationDecisionV2Service { ); } + await this.validateDecisionChanges(createDto); + + await this.validateResolutionNumber( + createDto.resolutionNumber, + createDto.resolutionYear, + ); + let decisionComponents: ApplicationDecisionComponent[] = []; if (createDto.decisionComponents) { this.decisionComponentService.validate( @@ -381,20 +386,66 @@ export class ApplicationDecisionV2Service { components: decisionComponents, }); - await this.validateDecisionChanges(createDto); - - await this.validateResolutionNumber( - createDto.resolutionNumber, - createDto.resolutionYear, - ); - const savedDecision = await this.appDecisionRepository.save(decision, { transaction: true, }); + if (decisionToCopy) { + await this.copyDecisionFields(decisionToCopy, savedDecision); + } + return this.get(savedDecision.uuid); } + private async copyDecisionFields( + decisionToCopy: string, + decision: ApplicationDecision, + ) { + //It is intentional to only copy select fields + const existingDecision = await this.get(decisionToCopy); + decision.decisionMakerCode = existingDecision.decisionMakerCode; + decision.outcomeCode = existingDecision.outcomeCode; + decision.isSubjectToConditions = existingDecision.isSubjectToConditions; + + const oldToNewComponentsUuid = new Map<string, string>(); + const newToOldComponentsUuid = new Map<string, string>(); + for (const component of existingDecision.components) { + const newUuid = v4(); + oldToNewComponentsUuid.set(component.uuid, newUuid); + newToOldComponentsUuid.set(newUuid, component.uuid); + } + + decision.components = existingDecision.components.map( + (component) => + new ApplicationDecisionComponent({ + ...component, + uuid: oldToNewComponentsUuid.get(component.uuid), + conditions: [], + }), + ); + const savedDecision = await this.appDecisionRepository.save(decision); + + savedDecision.conditions = existingDecision.conditions.map((condition) => { + const conditionsComponents = condition.components?.map( + (component) => component.uuid, + ); + return new ApplicationDecisionCondition({ + ...condition, + uuid: undefined, + components: savedDecision.components.filter((component) => { + const oldUuid = newToOldComponentsUuid.get(component.uuid); + return ( + !!oldUuid && + conditionsComponents && + conditionsComponents.includes(oldUuid) + ); + }), + }); + }); + + await this.appDecisionRepository.save(savedDecision); + } + private async validateResolutionNumber(number, year) { // we do not need to validate decision without number if (!number) { @@ -538,7 +589,6 @@ export class ApplicationDecisionV2Service { }), this.decisionComponentTypeRepository.find(), this.decisionConditionTypeRepository.find(), - this.linkedResolutionOutcomeTypeRepository.find(), this.naruNaruSubtypeRepository.find(), ]); @@ -548,8 +598,7 @@ export class ApplicationDecisionV2Service { ceoCriterion: values[2], decisionComponentTypes: values[3], decisionConditionTypes: values[4], - linkedResolutionOutcomeType: values[5], - naruSubtypes: values[6], + naruSubtypes: values[5], }; } diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision.dto.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision.dto.ts index 2ae860e115..9b1e490a29 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision.dto.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision.dto.ts @@ -114,6 +114,10 @@ export class CreateApplicationDecisionDto extends UpdateApplicationDecisionDto { @IsNumber() date: number; + @IsString() + @IsOptional() + decisionToCopy?: string; + @IsString() outcomeCode: string; @@ -141,8 +145,6 @@ export class ApplicationDecisionOutcomeCodeDto extends BaseCodeDto { export class ChairReviewOutcomeCodeDto extends BaseCodeDto {} -export class LinkedResolutionOutcomeTypeDto extends BaseCodeDto {} - export class ApplicationDecisionDto { @AutoMap() uuid: string; @@ -177,9 +179,6 @@ export class ApplicationDecisionDto { @AutoMap(() => ChairReviewOutcomeCodeDto) chairReviewOutcome?: ChairReviewOutcomeCodeDto | null; - @AutoMap(() => LinkedResolutionOutcomeTypeDto) - linkedResolutionOutcome?: LinkedResolutionOutcomeTypeDto | null; - @AutoMap(() => [DecisionDocumentDto]) documents: DecisionDocumentDto[]; diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/linked-resolution-outcome-type.entity.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/linked-resolution-outcome-type.entity.ts deleted file mode 100644 index 2fe6ba4c67..0000000000 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/linked-resolution-outcome-type.entity.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { Entity } from 'typeorm'; -import { BaseCodeEntity } from '../../../../common/entities/base.code.entity'; - -@Entity() -export class LinkedResolutionOutcomeType extends BaseCodeEntity {} diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision.entity.ts b/services/apps/alcs/src/alcs/application-decision/application-decision.entity.ts index 0ca16cc9c9..5144af5cb8 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision.entity.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision.entity.ts @@ -21,7 +21,6 @@ import { ApplicationDecisionDocument } from './application-decision-document/app import { ApplicationDecisionMakerCode } from './application-decision-maker/application-decision-maker.entity'; import { ApplicationDecisionChairReviewOutcomeType } from './application-decision-outcome-type/application-decision-outcome-type.entity'; import { ApplicationDecisionComponent } from './application-decision-v2/application-decision/component/application-decision-component.entity'; -import { LinkedResolutionOutcomeType } from './application-decision-v2/application-decision/linked-resolution-outcome-type.entity'; @Entity() @Index(['resolutionNumber', 'resolutionYear'], { @@ -156,12 +155,6 @@ export class ApplicationDecision extends Base { @Column({ nullable: true, type: 'text' }) chairReviewOutcomeCode: string | null; - @AutoMap(() => LinkedResolutionOutcomeType) - @ManyToOne(() => LinkedResolutionOutcomeType, { - nullable: true, - }) - linkedResolutionOutcome: LinkedResolutionOutcomeType | null; - @AutoMap() @Column({ nullable: true, type: 'text' }) linkedResolutionOutcomeCode: string | null; diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.service.spec.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.service.spec.ts index 44c6288c80..e56330cab1 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.service.spec.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.service.spec.ts @@ -9,15 +9,16 @@ import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { DocumentService } from '../../../document/document.service'; -import { ApplicationDecisionDocument } from '../../application-decision/application-decision-document/application-decision-document.entity'; import { NOI_SUBMISSION_STATUS } from '../../notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status.dto'; import { NoticeOfIntentSubmissionStatusService } from '../../notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service'; import { NoticeOfIntent } from '../../notice-of-intent/notice-of-intent.entity'; import { NoticeOfIntentService } from '../../notice-of-intent/notice-of-intent.service'; import { NoticeOfIntentDecisionComponentType } from '../notice-of-intent-decision-component/notice-of-intent-decision-component-type.entity'; import { NoticeOfIntentDecisionComponentDto } from '../notice-of-intent-decision-component/notice-of-intent-decision-component.dto'; +import { NoticeOfIntentDecisionComponent } from '../notice-of-intent-decision-component/notice-of-intent-decision-component.entity'; import { NoticeOfIntentDecisionComponentService } from '../notice-of-intent-decision-component/notice-of-intent-decision-component.service'; import { NoticeOfIntentDecisionConditionType } from '../notice-of-intent-decision-condition/notice-of-intent-decision-condition-code.entity'; +import { NoticeOfIntentDecisionCondition } from '../notice-of-intent-decision-condition/notice-of-intent-decision-condition.entity'; import { NoticeOfIntentDecisionConditionService } from '../notice-of-intent-decision-condition/notice-of-intent-decision-condition.service'; import { NoticeOfIntentDecisionDocument } from '../notice-of-intent-decision-document/notice-of-intent-decision-document.entity'; import { NoticeOfIntentDecisionOutcome } from '../notice-of-intent-decision-outcome.entity'; @@ -211,12 +212,12 @@ describe('NoticeOfIntentDecisionV2Service', () => { mockDecisionRepository.exist.mockResolvedValue(false); const decisionDate = new Date(2022, 2, 2, 2, 2, 2, 2); - const decisionToCreate = { + const decisionToCreate: CreateNoticeOfIntentDecisionDto = { date: decisionDate.getTime(), fileNumber: 'file-number', outcomeCode: 'Outcome', isDraft: true, - } as CreateNoticeOfIntentDecisionDto; + }; await service.create(decisionToCreate, mockNoticeOfIntent, undefined); @@ -224,6 +225,55 @@ describe('NoticeOfIntentDecisionV2Service', () => { expect(mockNoticeOfIntentService.update).toHaveBeenCalledTimes(0); }); + it('should copy the existing decisions fields when one is provided for create', async () => { + mockDecisionRepository.find.mockResolvedValue([]); + const component = new NoticeOfIntentDecisionComponent({ + uuid: 'component-uuid', + }); + const condition = new NoticeOfIntentDecisionCondition({ + uuid: 'condition-uuid', + components: [component], + }); + + const decision = new NoticeOfIntentDecision({ + documents: [], + components: [component], + conditions: [condition], + decisionMaker: 'decisionMaker', + decisionMakerName: 'decisionMakerName', + outcomeCode: 'outcomeCode', + isSubjectToConditions: false, + }); + mockDecisionRepository.findOne.mockResolvedValue(decision); + mockDecisionRepository.exist.mockResolvedValue(false); + + const decisionDate = new Date(2022, 2, 2, 2, 2, 2, 2); + const decisionToCreate: CreateNoticeOfIntentDecisionDto = { + date: decisionDate.getTime(), + fileNumber: 'file-number', + outcomeCode: 'Outcome', + isDraft: true, + decisionToCopy: 'existing-decision-uuid', + }; + + await service.create(decisionToCreate, mockNoticeOfIntent, undefined); + + expect(mockDecisionRepository.save).toBeCalledTimes(3); + expect(mockNoticeOfIntentService.update).toHaveBeenCalledTimes(0); + const finalDecision = mockDecisionRepository.save.mock.calls[2][0]; + + expect(finalDecision.decisionMaker).toEqual(decision.decisionMaker); + expect(finalDecision.outcomeCode).toEqual(decision.outcomeCode); + expect(finalDecision.decisionMakerName).toEqual( + decision.decisionMakerName, + ); + expect(finalDecision.isSubjectToConditions).toEqual( + decision.isSubjectToConditions, + ); + expect(finalDecision.components?.length).toEqual(1); + expect(finalDecision.conditions?.length).toEqual(1); + }); + it('should fail create a decision if the resolution number is already in use', async () => { mockDecisionRepository.findOne.mockResolvedValue( {} as NoticeOfIntentDecision, diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.service.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.service.ts index 6942007351..c66c9da4b3 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.service.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.service.ts @@ -6,6 +6,7 @@ import { MultipartFile } from '@fastify/multipart'; import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { In, IsNull, Repository } from 'typeorm'; +import { v4 } from 'uuid'; import { DOCUMENT_SOURCE, DOCUMENT_SYSTEM, @@ -21,6 +22,7 @@ import { NoticeOfIntentDecisionComponentType } from '../notice-of-intent-decisio import { NoticeOfIntentDecisionComponent } from '../notice-of-intent-decision-component/notice-of-intent-decision-component.entity'; import { NoticeOfIntentDecisionComponentService } from '../notice-of-intent-decision-component/notice-of-intent-decision-component.service'; import { NoticeOfIntentDecisionConditionType } from '../notice-of-intent-decision-condition/notice-of-intent-decision-condition-code.entity'; +import { NoticeOfIntentDecisionCondition } from '../notice-of-intent-decision-condition/notice-of-intent-decision-condition.entity'; import { NoticeOfIntentDecisionConditionService } from '../notice-of-intent-decision-condition/notice-of-intent-decision-condition.service'; import { NoticeOfIntentDecisionDocument } from '../notice-of-intent-decision-document/notice-of-intent-decision-document.entity'; import { NoticeOfIntentDecisionOutcome } from '../notice-of-intent-decision-outcome.entity'; @@ -263,6 +265,11 @@ export class NoticeOfIntentDecisionV2Service { ); } + await this.validateResolutionNumber( + createDto.resolutionNumber, + createDto.resolutionYear, + ); + let decisionComponents: NoticeOfIntentDecisionComponent[] = []; if (createDto.decisionComponents) { this.decisionComponentService.validate( @@ -297,11 +304,6 @@ export class NoticeOfIntentDecisionV2Service { components: decisionComponents, }); - await this.validateResolutionNumber( - createDto.resolutionNumber, - createDto.resolutionYear, - ); - const savedDecision = await this.noticeOfIntentDecisionRepository.save( decision, { @@ -309,9 +311,64 @@ export class NoticeOfIntentDecisionV2Service { }, ); + if (createDto.decisionToCopy) { + await this.copyDecisionFields(createDto.decisionToCopy, savedDecision); + } + return this.get(savedDecision.uuid); } + private async copyDecisionFields( + decisionToCopy: string, + decision: NoticeOfIntentDecision, + ) { + //It is intentional to only copy select fields + const existingDecision = await this.get(decisionToCopy); + decision.decisionMaker = existingDecision.decisionMaker; + decision.outcomeCode = existingDecision.outcomeCode; + decision.decisionMakerName = existingDecision.decisionMakerName; + decision.isSubjectToConditions = existingDecision.isSubjectToConditions; + + const oldToNewComponentsUuid = new Map<string, string>(); + const newToOldComponentsUuid = new Map<string, string>(); + for (const component of existingDecision.components) { + const newUuid = v4(); + oldToNewComponentsUuid.set(component.uuid, newUuid); + newToOldComponentsUuid.set(newUuid, component.uuid); + } + + decision.components = existingDecision.components.map( + (component) => + new NoticeOfIntentDecisionComponent({ + ...component, + uuid: oldToNewComponentsUuid.get(component.uuid), + conditions: [], + }), + ); + const savedDecision = await this.noticeOfIntentDecisionRepository.save( + decision, + ); + + savedDecision.conditions = existingDecision.conditions.map((condition) => { + const conditionsComponents = condition.components?.map( + (component) => component.uuid, + ); + return new NoticeOfIntentDecisionCondition({ + ...condition, + uuid: undefined, + components: savedDecision.components.filter((component) => { + const oldUuid = newToOldComponentsUuid.get(component.uuid); + return ( + !!oldUuid && + conditionsComponents && + conditionsComponents.includes(oldUuid) + ); + }), + }); + }); + await this.noticeOfIntentDecisionRepository.save(savedDecision); + } + private async validateResolutionNumber(number, year) { // we do not need to validate decision without number if (!number) { diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.dto.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.dto.ts index 1f963db3d8..f407b48333 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.dto.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.dto.ts @@ -86,6 +86,10 @@ export class CreateNoticeOfIntentDecisionDto extends UpdateNoticeOfIntentDecisio @IsOptional() override isDraft = true; + + @IsString() + @IsOptional() + decisionToCopy?: string; } export class LinkedResolutionDto { diff --git a/services/apps/alcs/src/common/automapper/application-decision-v2.automapper.profile.ts b/services/apps/alcs/src/common/automapper/application-decision-v2.automapper.profile.ts index c716fa6a7e..59fa998bb2 100644 --- a/services/apps/alcs/src/common/automapper/application-decision-v2.automapper.profile.ts +++ b/services/apps/alcs/src/common/automapper/application-decision-v2.automapper.profile.ts @@ -22,7 +22,6 @@ import { ApplicationDecisionOutcomeCodeDto, ChairReviewOutcomeCodeDto, DecisionDocumentDto, - LinkedResolutionOutcomeTypeDto, } from '../../alcs/application-decision/application-decision-v2/application-decision/application-decision.dto'; import { CeoCriterionCodeDto } from '../../alcs/application-decision/application-decision-v2/application-decision/ceo-criterion/ceo-criterion.dto'; import { ApplicationDecisionComponentType } from '../../alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component-type.entity'; @@ -31,7 +30,6 @@ import { ApplicationDecisionComponentTypeDto, } from '../../alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.dto'; import { ApplicationDecisionComponent } from '../../alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.entity'; -import { LinkedResolutionOutcomeType } from '../../alcs/application-decision/application-decision-v2/application-decision/linked-resolution-outcome-type.entity'; import { ApplicationDecision } from '../../alcs/application-decision/application-decision.entity'; import { ApplicationPortalDecisionDto } from '../../portal/public/application/application-decision.dto'; import { NaruSubtypeDto } from '../../portal/application-submission/application-submission.dto'; @@ -299,12 +297,6 @@ export class ApplicationDecisionProfile extends AutomapperProfile { ), ); - createMap( - mapper, - LinkedResolutionOutcomeType, - LinkedResolutionOutcomeTypeDto, - ); - createMap( mapper, ApplicationDecisionComponentLot, diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1698076577193-update_decision_outcomes.ts b/services/apps/alcs/src/providers/typeorm/migrations/1698076577193-update_decision_outcomes.ts new file mode 100644 index 0000000000..12a1ceaf15 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1698076577193-update_decision_outcomes.ts @@ -0,0 +1,21 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class updateDecisionOutcomes1698076577193 implements MigrationInterface { + name = 'updateDecisionOutcomes1698076577193'; + + public async up(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `UPDATE "alcs"."application_decision" SET "outcome_code" = 'REFU' WHERE "outcome_code" IN ('REVE', 'CONF')`, + ); + await queryRunner.query( + `UPDATE "alcs"."application_decision" SET "outcome_code" = 'APPR' WHERE "outcome_code" IN ('VARY', 'APPA')`, + ); + await queryRunner.query( + `DELETE FROM "alcs"."application_decision_outcome_code" WHERE "code" IN ('REVE', 'CONF', 'VARY', 'APPA')`, + ); + } + + public async down(): Promise<void> { + //No + } +} diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1698104086542-remove_linked_outcome_for_app_decs.ts b/services/apps/alcs/src/providers/typeorm/migrations/1698104086542-remove_linked_outcome_for_app_decs.ts new file mode 100644 index 0000000000..f94cbdc8ac --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1698104086542-remove_linked_outcome_for_app_decs.ts @@ -0,0 +1,35 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class removeLinkedOutcomeForAppDecs1698104086542 + implements MigrationInterface +{ + name = 'removeLinkedOutcomeForAppDecs1698104086542'; + + public async up(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `ALTER TABLE "alcs"."application_decision" DROP CONSTRAINT "FK_c29e943593d2eee247eec5361e5"`, + ); + await queryRunner.query(` + DROP TABLE "alcs"."linked_resolution_outcome_type"; + `); + } + + public async down(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query(` + CREATE TABLE "alcs"."linked_resolution_outcome_type" ( + "audit_deleted_date_at" timestamptz, + "audit_created_at" timestamptz NOT NULL DEFAULT now(), + "audit_updated_at" timestamptz DEFAULT now(), + "audit_created_by" varchar NOT NULL, + "audit_updated_by" varchar, + "label" varchar NOT NULL, + "code" text NOT NULL, + "description" text NOT NULL, + PRIMARY KEY ("code") + ); + `); + await queryRunner.query( + `ALTER TABLE "alcs"."application_decision" ADD CONSTRAINT "FK_c29e943593d2eee247eec5361e5" FOREIGN KEY ("linked_resolution_outcome_code") REFERENCES "alcs"."linked_resolution_outcome_type"("code") ON DELETE NO ACTION ON UPDATE NO ACTION`, + ); + } +} diff --git a/services/apps/alcs/test/mocks/mockEntities.ts b/services/apps/alcs/test/mocks/mockEntities.ts index 25950830ec..a3ce0f751d 100644 --- a/services/apps/alcs/test/mocks/mockEntities.ts +++ b/services/apps/alcs/test/mocks/mockEntities.ts @@ -293,6 +293,7 @@ const initApplicationDecisionMock = (application?: Application) => { application, documents: [], conditions: [], + components: [], }); }; From e8629caeb29c4e8932f897a930a2870560a1a672 Mon Sep 17 00:00:00 2001 From: "to. sandra" <76515860+sandratoh@users.noreply.github.com> Date: Wed, 25 Oct 2023 09:03:57 -0700 Subject: [PATCH 549/954] Update structure table and srw proposal responsive layout (#1094) --- .../additional-information.component.html | 26 +++++-------------- .../additional-information.component.scss | 18 +++++++++++++ .../proposal-details.component.html | 2 +- .../proposal-details.component.scss | 1 - 4 files changed, 26 insertions(+), 21 deletions(-) diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/additional-information/additional-information.component.html b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/additional-information/additional-information.component.html index 0c90be791c..7ad018c322 100644 --- a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/additional-information/additional-information.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/additional-information/additional-information.component.html @@ -13,10 +13,8 @@ </div> <ng-container *ngIf="_noiSubmission.soilIsRemovingSoilForNewStructure"> - <div class="full-width subheading2"> - The total floor area (m<sup>2</sup>) of the proposed structure(s) - </div> - <div class="full-width soil-table"> + <div class="full-width subheading2">The total floor area (m<sup>2</sup>) of the proposed structure(s)</div> + <div class="full-width structure-table"> <div class="grid-1 subheading2">#</div> <div class="grid-2 subheading2">Type</div> <div class="grid-3 subheading2">Area</div> @@ -39,9 +37,7 @@ </div> <ng-container *ngIf="isSoilStructureFarmUseReasonVisible"> - <div class="subheading2 grid-1"> - Describe how the structure is necessary for farm use - </div> + <div class="subheading2 grid-1">Describe how the structure is necessary for farm use</div> <div class="grid-double"> {{ _noiSubmission.soilStructureFarmUseReason }} <app-no-data [showRequired]="showErrors" *ngIf="!_noiSubmission.soilStructureFarmUseReason"></app-no-data> @@ -49,9 +45,7 @@ </ng-container> <ng-container *ngIf="isSoilStructureResidentialUseReasonVisible"> - <div class="subheading2 grid-1"> - Describe how the structure is necessary for residential use - </div> + <div class="subheading2 grid-1">Describe how the structure is necessary for residential use</div> <div class="grid-double"> {{ _noiSubmission.soilStructureResidentialUseReason }} <app-no-data @@ -62,9 +56,7 @@ </ng-container> <ng-container *ngIf="isSoilAgriParcelActivityVisible"> - <div class="subheading2 grid-1"> - Describe the current agricultural activity on the parcel(s) - </div> + <div class="subheading2 grid-1">Describe the current agricultural activity on the parcel(s)</div> <div class="grid-double"> {{ _noiSubmission.soilAgriParcelActivity }} <app-no-data [showRequired]="showErrors" *ngIf="!_noiSubmission.soilAgriParcelActivity"></app-no-data> @@ -72,9 +64,7 @@ </ng-container> <ng-container *ngIf="isSoilStructureResidentialAccessoryUseReasonVisible"> - <div class="subheading2 grid-1"> - Describe the intended use of the residential accessory structure - </div> + <div class="subheading2 grid-1">Describe the intended use of the residential accessory structure</div> <div class="grid-double"> {{ _noiSubmission.soilStructureResidentialAccessoryUseReason }} <app-no-data @@ -85,9 +75,7 @@ </ng-container> <ng-container *ngIf="isSoilOtherStructureVisible"> - <div class="subheading2 grid-1"> - Describe the intended use of the 'Other' structure - </div> + <div class="subheading2 grid-1">Describe the intended use of the 'Other' structure</div> <div class="grid-double"> {{ _noiSubmission.soilStructureOtherUseReason }} <app-no-data [showRequired]="showErrors" *ngIf="!_noiSubmission.soilStructureOtherUseReason"></app-no-data> diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/additional-information/additional-information.component.scss b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/additional-information/additional-information.component.scss index bfe0899632..93126c715b 100644 --- a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/additional-information/additional-information.component.scss +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/additional-information/additional-information.component.scss @@ -1,5 +1,23 @@ +@use '../../../../../styles/functions' as *; + .multiple-documents { a { display: block; } } + +.structure-table { + display: grid; + grid-template-columns: max-content max-content max-content; + overflow-x: auto; + grid-column-gap: rem(36); + grid-row-gap: rem(12); + + @media screen and (min-width: $tabletBreakpoint) { + grid-template-columns: 0.55fr 1fr 1fr; + } + + @media screen and (min-width: $midBreakpoint) { + grid-template-columns: 1fr 1fr 2fr; + } +} diff --git a/portal-frontend/src/app/features/notifications/notification-details/proposal-details/proposal-details.component.html b/portal-frontend/src/app/features/notifications/notification-details/proposal-details/proposal-details.component.html index 7ad45f9784..3d77b4f75e 100644 --- a/portal-frontend/src/app/features/notifications/notification-details/proposal-details/proposal-details.component.html +++ b/portal-frontend/src/app/features/notifications/notification-details/proposal-details/proposal-details.component.html @@ -1,5 +1,5 @@ <div *ngIf="_notificationSubmission" class="review-table"> - <div class="subheading2 grid-1">Submitter’s File Number</div> + <div class="subheading2 grid-1">Submitter's File Number</div> <div class="grid-double"> {{ _notificationSubmission.submittersFileNumber }} <app-no-data [showRequired]="showErrors" *ngIf="!_notificationSubmission.submittersFileNumber"></app-no-data> diff --git a/portal-frontend/src/app/features/notifications/notification-details/proposal-details/proposal-details.component.scss b/portal-frontend/src/app/features/notifications/notification-details/proposal-details/proposal-details.component.scss index 00589396a3..5200273b59 100644 --- a/portal-frontend/src/app/features/notifications/notification-details/proposal-details/proposal-details.component.scss +++ b/portal-frontend/src/app/features/notifications/notification-details/proposal-details/proposal-details.component.scss @@ -4,7 +4,6 @@ display: grid; grid-template-columns: max-content max-content max-content; overflow-x: auto; - grid-column: 1/3; grid-column-gap: rem(36); grid-row-gap: rem(12); From fc0c238415dde6f1f4f35da06eb7fadda6031b1d Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Wed, 25 Oct 2023 10:00:35 -0700 Subject: [PATCH 550/954] Update Selected Own Governmment on Blur * If you type the full government name but do not select it, the warning banner was not showing * By updating the value on Blur, this is fixed --- .../select-government/select-government.component.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/portal-frontend/src/app/features/applications/edit-submission/select-government/select-government.component.ts b/portal-frontend/src/app/features/applications/edit-submission/select-government/select-government.component.ts index aac2bfb205..8b96ffb706 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/select-government/select-government.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/select-government/select-government.component.ts @@ -89,7 +89,9 @@ export class SelectGovernmentComponent extends StepComponent implements OnInit, const localGovernmentName = this.localGovernment.getRawValue(); if (localGovernmentName) { const localGovernment = this.localGovernments.find((lg) => lg.name == localGovernmentName); - if (!localGovernment) { + if (localGovernment) { + this.selectedOwnGovernment = localGovernment.matchesUserGuid; + } else { this.localGovernment.setValue(null); console.log('Clearing Local Government field'); } From 89a46b22da29e6d1369a6147be514a48e064a958 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Wed, 25 Oct 2023 10:19:04 -0700 Subject: [PATCH 551/954] Use add/remove Validators for PID * Set validators and remove validators was clearing the format validator as well as required * Update code to use add/remove so the format validator remains on parcel / form changes --- .../parcel-details/parcel-entry/parcel-entry.component.ts | 6 +++--- .../parcels/parcel-entry/parcel-entry.component.ts | 6 +++--- .../parcels/parcel-entry/parcel-entry.component.ts | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts index eebacf291f..4f3367434d 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts @@ -205,13 +205,13 @@ export class ParcelEntryComponent implements OnInit { this.searchBy.setValue(null); this.pidPinPlaceholder = ''; this.isCrownLand = true; - this.pid.setValidators([]); this.purchaseDate.disable(); + this.pid.removeValidators([Validators.required]); } else { this.searchBy.setValue('pid'); this.pidPinPlaceholder = 'Type 9 digit PID'; this.isCrownLand = false; - this.pid.setValidators([Validators.required]); + this.pid.addValidators([Validators.required]); this.crownLandOwnerType.setValue(null); this.purchaseDate.enable(); } @@ -419,7 +419,7 @@ export class ParcelEntryComponent implements OnInit { if (this.isCrownLand) { this.pidPin.disable(); this.purchaseDate.disable(); - this.pid.setValidators([]); + this.pid.removeValidators([Validators.required]); const pidValue = this.pid.getRawValue(); this.isCertificateOfTitleRequired = !!pidValue && pidValue.length > 0; this.pidPinPlaceholder = ''; diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.ts index b8c74c50f5..c3fdda61fd 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.ts @@ -200,13 +200,13 @@ export class ParcelEntryComponent implements OnInit { this.searchBy.setValue(null); this.pidPinPlaceholder = ''; this.isCrownLand = true; - this.pid.setValidators([]); + this.pid.addValidators([Validators.required]); this.purchaseDate.disable(); } else { this.searchBy.setValue('pid'); this.pidPinPlaceholder = 'Type 9 digit PID'; this.isCrownLand = false; - this.pid.setValidators([Validators.required]); + this.pid.removeValidators([Validators.required]); this.crownLandOwnerType.setValue(null); this.purchaseDate.enable(); } @@ -405,7 +405,7 @@ export class ParcelEntryComponent implements OnInit { if (this.isCrownLand) { this.pidPin.disable(); this.purchaseDate.disable(); - this.pid.setValidators([]); + this.pid.removeValidators([Validators.required]); const pidValue = this.pid.getRawValue(); this.isCertificateOfTitleRequired = !!pidValue && pidValue.length > 0; this.pidPinPlaceholder = ''; diff --git a/portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-entry/parcel-entry.component.ts b/portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-entry/parcel-entry.component.ts index 8107b14e6a..131695b1b5 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-entry/parcel-entry.component.ts +++ b/portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-entry/parcel-entry.component.ts @@ -141,12 +141,12 @@ export class ParcelEntryComponent implements OnInit { this.searchBy.setValue(null); this.pidPinPlaceholder = ''; this.isCrownLand = true; - this.pid.setValidators([]); + this.pid.removeValidators([Validators.required]); } else { this.searchBy.setValue('pid'); this.pidPinPlaceholder = 'Type 9 digit PID'; this.isCrownLand = false; - this.pid.setValidators([Validators.required]); + this.pid.addValidators([Validators.required]); } this.pid.updateValueAndValidity(); @@ -195,7 +195,7 @@ export class ParcelEntryComponent implements OnInit { if (this.isCrownLand) { this.pidPin.disable(); - this.pid.setValidators([]); + this.pid.removeValidators([Validators.required]); this.pidPinPlaceholder = ''; } else { this.pidPinPlaceholder = 'Type 9 digit PID'; From b0a4c156460c2f0a838b9581f654d47c0fbbf0eb Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Wed, 25 Oct 2023 14:00:14 -0700 Subject: [PATCH 552/954] bug fix --- services/apps/alcs/src/alcs/search/search.controller.ts | 3 ++- .../portal/inbox/application/inbox-application.service.ts | 2 +- services/apps/alcs/src/portal/inbox/inbox.controller.ts | 1 - .../inbox/notice-of-intent/inbox-notice-of-intent.service.ts | 4 ++-- .../portal/inbox/notification/inbox-notification.service.ts | 5 +++-- .../search/application/public-application-search.service.ts | 4 ++-- .../public-notice-of-intent-search.service.ts | 4 ++-- .../notification/public-notification-search.service.ts | 4 ++-- 8 files changed, 14 insertions(+), 13 deletions(-) diff --git a/services/apps/alcs/src/alcs/search/search.controller.ts b/services/apps/alcs/src/alcs/search/search.controller.ts index a4ba34838f..a3167eae2d 100644 --- a/services/apps/alcs/src/alcs/search/search.controller.ts +++ b/services/apps/alcs/src/alcs/search/search.controller.ts @@ -288,7 +288,8 @@ export class SearchController { !searchDto.dateDecidedTo && !searchDto.resolutionNumber && !searchDto.resolutionYear && - !isStringSetAndNotEmpty(searchDto.legacyId); + !isStringSetAndNotEmpty(searchDto.legacyId) && + !isStringSetAndNotEmpty(searchDto.civicAddress); return { searchApplications, diff --git a/services/apps/alcs/src/portal/inbox/application/inbox-application.service.ts b/services/apps/alcs/src/portal/inbox/application/inbox-application.service.ts index b184b6f004..ba1b792a5e 100644 --- a/services/apps/alcs/src/portal/inbox/application/inbox-application.service.ts +++ b/services/apps/alcs/src/portal/inbox/application/inbox-application.service.ts @@ -178,7 +178,7 @@ export class InboxApplicationService { if (searchDto.civicAddress) { query = query.andWhere('LOWER(parcel.civic_address) like LOWER(:civic_address)', { - civic_address: `%${searchDto.civicAddress}%`, + civic_address: `%${searchDto.civicAddress}%`.toLowerCase(), }); } return query; diff --git a/services/apps/alcs/src/portal/inbox/inbox.controller.ts b/services/apps/alcs/src/portal/inbox/inbox.controller.ts index ff5c55b4a0..f722ba6786 100644 --- a/services/apps/alcs/src/portal/inbox/inbox.controller.ts +++ b/services/apps/alcs/src/portal/inbox/inbox.controller.ts @@ -230,7 +230,6 @@ export class InboxController { const searchNotifications = (searchDto.fileTypes.length > 0 ? notificationTypeSpecified : true) && - !isStringSetAndNotEmpty(searchDto.civicAddress) && !isStringSetAndNotEmpty(searchDto.governmentFileNumber); return { diff --git a/services/apps/alcs/src/portal/inbox/notice-of-intent/inbox-notice-of-intent.service.ts b/services/apps/alcs/src/portal/inbox/notice-of-intent/inbox-notice-of-intent.service.ts index f12b7c53b1..78db0dead5 100644 --- a/services/apps/alcs/src/portal/inbox/notice-of-intent/inbox-notice-of-intent.service.ts +++ b/services/apps/alcs/src/portal/inbox/notice-of-intent/inbox-notice-of-intent.service.ts @@ -155,8 +155,8 @@ export class InboxNoticeOfIntentService { } if (searchDto.civicAddress) { - query = query.andWhere('parcel.civic_address like :civic_address', { - civic_address: `%${searchDto.civicAddress}%`, + query = query.andWhere('LOWER(parcel.civic_address) like LOWER(:civic_address)', { + civic_address: `%${searchDto.civicAddress}%`.toLowerCase(), }); } return query; diff --git a/services/apps/alcs/src/portal/inbox/notification/inbox-notification.service.ts b/services/apps/alcs/src/portal/inbox/notification/inbox-notification.service.ts index 003a4786d6..0b5e4a4589 100644 --- a/services/apps/alcs/src/portal/inbox/notification/inbox-notification.service.ts +++ b/services/apps/alcs/src/portal/inbox/notification/inbox-notification.service.ts @@ -146,10 +146,11 @@ export class InboxNotificationService { } if (searchDto.civicAddress) { - query = query.andWhere('parcel.civic_address like :civic_address', { - civic_address: `%${searchDto.civicAddress}%`, + query = query.andWhere('LOWER(parcel.civic_address) like LOWER(:civic_address)', { + civic_address: `%${searchDto.civicAddress}%`.toLowerCase(), }); } + console.log(query) return query; } diff --git a/services/apps/alcs/src/portal/public/search/application/public-application-search.service.ts b/services/apps/alcs/src/portal/public/search/application/public-application-search.service.ts index 1b209796ff..891b430f2e 100644 --- a/services/apps/alcs/src/portal/public/search/application/public-application-search.service.ts +++ b/services/apps/alcs/src/portal/public/search/application/public-application-search.service.ts @@ -211,8 +211,8 @@ export class PublicApplicationSearchService { } if (searchDto.civicAddress) { - query = query.andWhere('parcel.civic_address like :civic_address', { - civic_address: `%${searchDto.civicAddress}%`, + query = query.andWhere('LOWER(parcel.civic_address) like LOWER(:civic_address)', { + civic_address: `%${searchDto.civicAddress}%`.toLowerCase(), }); } return query; diff --git a/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search.service.ts b/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search.service.ts index fc4b37569c..5195b69af1 100644 --- a/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search.service.ts +++ b/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search.service.ts @@ -198,8 +198,8 @@ export class PublicNoticeOfIntentSearchService { } if (searchDto.civicAddress) { - query = query.andWhere('parcel.civic_address like :civic_address', { - civic_address: `%${searchDto.civicAddress}%`, + query = query.andWhere('LOWER(parcel.civic_address) like LOWER(:civic_address)', { + civic_address: `%${searchDto.civicAddress}%`.toLowerCase(), }); } return query; diff --git a/services/apps/alcs/src/portal/public/search/notification/public-notification-search.service.ts b/services/apps/alcs/src/portal/public/search/notification/public-notification-search.service.ts index e3140ed66c..735542075f 100644 --- a/services/apps/alcs/src/portal/public/search/notification/public-notification-search.service.ts +++ b/services/apps/alcs/src/portal/public/search/notification/public-notification-search.service.ts @@ -162,8 +162,8 @@ export class PublicNotificationSearchService { } if (searchDto.civicAddress) { - query = query.andWhere('parcel.civic_address like :civic_address', { - civic_address: `%${searchDto.civicAddress}%`, + query = query.andWhere('LOWER(parcel.civic_address) like LOWER(:civic_address)', { + civic_address: `%${searchDto.civicAddress}%`.toLowerCase(), }); } return query; From b6278971533ebc199ba8546dd7648b6a80cac8ae Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Wed, 25 Oct 2023 14:58:45 -0700 Subject: [PATCH 553/954] Add requiresGovernmentReview flag to App Type * Use this flag in front end and back end wherever appropriate compared to checking for TURP * Update Tests --- .../lfng-info/lfng-info.component.ts | 2 +- .../application-dialog.component.spec.ts | 1 + .../notification-dialog.component.spec.ts | 6 +- .../application/application-code.dto.ts | 1 + .../application/application.service.spec.ts | 1 + .../services/search/search.service.spec.ts | 1 + .../details-header.component.ts | 4 +- .../application-details.component.html | 5 +- .../edit-submission.component.ts | 8 +- .../lfng-review/lfng-review.component.ts | 2 +- .../application-submission.dto.ts | 1 + .../alcs/application/application.service.ts | 1 + .../application-type/application-type.dto.ts | 3 + .../application-type.entity.ts | 4 + ...ation-submission-review.controller.spec.ts | 9 +- ...pplication-submission-review.controller.ts | 4 +- ...pplication-submission-validator.service.ts | 2 +- .../application-submission.controller.spec.ts | 32 +++- .../application-submission.controller.ts | 154 +++++++++++------- .../application-submission.dto.ts | 1 + .../application-submission.service.ts | 15 +- ...add_app_type_government_review_required.ts | 22 +++ 22 files changed, 183 insertions(+), 96 deletions(-) create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1698255209608-add_app_type_government_review_required.ts diff --git a/alcs-frontend/src/app/features/application/lfng-info/lfng-info.component.ts b/alcs-frontend/src/app/features/application/lfng-info/lfng-info.component.ts index d48e5f7e2c..4bb7976feb 100644 --- a/alcs-frontend/src/app/features/application/lfng-info/lfng-info.component.ts +++ b/alcs-frontend/src/app/features/application/lfng-info/lfng-info.component.ts @@ -38,7 +38,7 @@ export class LfngInfoComponent implements OnInit { ngOnInit(): void { this.applicationDetailService.$application.subscribe(async (application) => { if (application) { - this.requiresReview = application.type.code !== 'TURP'; + this.requiresReview = application.type.requiresGovernmentReview; this.applicationReview = await this.applicationReviewService.fetchReview(application.fileNumber); this.submission = await this.applicationSubmissionService.fetchSubmission(application.fileNumber); this.showComment = [SUBMISSION_STATUS.WRONG_GOV, SUBMISSION_STATUS.INCOMPLETE].includes( diff --git a/alcs-frontend/src/app/features/board/dialogs/application/application-dialog.component.spec.ts b/alcs-frontend/src/app/features/board/dialogs/application/application-dialog.component.spec.ts index c204ad03a6..afe56ea4d2 100644 --- a/alcs-frontend/src/app/features/board/dialogs/application/application-dialog.component.spec.ts +++ b/alcs-frontend/src/app/features/board/dialogs/application/application-dialog.component.spec.ts @@ -43,6 +43,7 @@ describe('ApplicationDialogComponent', () => { shortLabel: 'short_label', textColor: '#000', backgroundColor: '#fff', + requiresGovernmentReview: false, }; const mockApplication: ApplicationDto = { diff --git a/alcs-frontend/src/app/features/board/dialogs/notification/notification-dialog.component.spec.ts b/alcs-frontend/src/app/features/board/dialogs/notification/notification-dialog.component.spec.ts index 11df790940..8c4608b6b7 100644 --- a/alcs-frontend/src/app/features/board/dialogs/notification/notification-dialog.component.spec.ts +++ b/alcs-frontend/src/app/features/board/dialogs/notification/notification-dialog.component.spec.ts @@ -8,7 +8,7 @@ import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { ApplicationRegionDto, ApplicationTypeDto } from '../../../../services/application/application-code.dto'; import { BoardService } from '../../../../services/board/board.service'; import { CardDto } from '../../../../services/card/card.dto'; -import { NotificationDto } from '../../../../services/notification/notification.dto'; +import { NotificationDto, NotificationTypeDto } from '../../../../services/notification/notification.dto'; import { AssigneeDto } from '../../../../services/user/user.dto'; import { ConfirmationDialogService } from '../../../../shared/confirmation-dialog/confirmation-dialog.service'; import { SharedModule } from '../../../../shared/shared.module'; @@ -35,7 +35,7 @@ describe('NotificationDialogComponent', () => { description: 'this is a test status', }; - const mockApplicationType: ApplicationTypeDto = { + const mockNotificationType: NotificationTypeDto = { label: 'test_ty', code: 'TYPE', description: 'this is a test type', @@ -46,7 +46,7 @@ describe('NotificationDialogComponent', () => { const mockApplication: NotificationDto = { uuid: '', - type: mockApplicationType, + type: mockNotificationType, region: mockApplicationRegion, fileNumber: '1111', applicant: 'I am an applicant', diff --git a/alcs-frontend/src/app/services/application/application-code.dto.ts b/alcs-frontend/src/app/services/application/application-code.dto.ts index 1d7307f365..25d1e734a3 100644 --- a/alcs-frontend/src/app/services/application/application-code.dto.ts +++ b/alcs-frontend/src/app/services/application/application-code.dto.ts @@ -9,6 +9,7 @@ export interface ApplicationTypeDto extends BaseCodeDto { shortLabel: string; backgroundColor: string; textColor: string; + requiresGovernmentReview: boolean; } export interface ApplicationMasterCodesDto { diff --git a/alcs-frontend/src/app/services/application/application.service.spec.ts b/alcs-frontend/src/app/services/application/application.service.spec.ts index f327b07ea3..248d526c27 100644 --- a/alcs-frontend/src/app/services/application/application.service.spec.ts +++ b/alcs-frontend/src/app/services/application/application.service.spec.ts @@ -40,6 +40,7 @@ describe('ApplicationService', () => { shortLabel: '', backgroundColor: '', textColor: '', + requiresGovernmentReview: false, }, source: SYSTEM_SOURCE_TYPES.ALCS, }; diff --git a/alcs-frontend/src/app/services/search/search.service.spec.ts b/alcs-frontend/src/app/services/search/search.service.spec.ts index e07c4f0487..12f94c593d 100644 --- a/alcs-frontend/src/app/services/search/search.service.spec.ts +++ b/alcs-frontend/src/app/services/search/search.service.spec.ts @@ -32,6 +32,7 @@ describe('SearchService', () => { textColor: '#000000', label: 'Application Type 1', description: 'Application Type 1', + requiresGovernmentReview: false, }, }, ]; diff --git a/alcs-frontend/src/app/shared/details-header/details-header.component.ts b/alcs-frontend/src/app/shared/details-header/details-header.component.ts index 3b4634db37..5d99f8128e 100644 --- a/alcs-frontend/src/app/shared/details-header/details-header.component.ts +++ b/alcs-frontend/src/app/shared/details-header/details-header.component.ts @@ -10,7 +10,7 @@ import { ApplicationDto } from '../../services/application/application.dto'; import { CardDto } from '../../services/card/card.dto'; import { CommissionerApplicationDto } from '../../services/commissioner/commissioner.dto'; import { NoticeOfIntentModificationDto } from '../../services/notice-of-intent/notice-of-intent-modification/notice-of-intent-modification.dto'; -import { NoticeOfIntentDto } from '../../services/notice-of-intent/notice-of-intent.dto'; +import { NoticeOfIntentDto, NoticeOfIntentTypeDto } from '../../services/notice-of-intent/notice-of-intent.dto'; import { NotificationSubmissionStatusService } from '../../services/notification/notification-submission-status/notification-submission-status.service'; import { NotificationDto } from '../../services/notification/notification.dto'; import { ApplicationSubmissionStatusPill } from '../application-submission-status-type-pill/application-submission-status-type-pill.component'; @@ -41,7 +41,7 @@ export class DetailsHeaderComponent { legacyId?: string; _application: ApplicationDto | CommissionerApplicationDto | NoticeOfIntentDto | NotificationDto | undefined; - types: ApplicationTypeDto[] = []; + types: ApplicationTypeDto[] | NoticeOfIntentTypeDto[] = []; timeTrackable?: TimeTrackable; @Input() set application( diff --git a/portal-frontend/src/app/features/applications/application-details/application-details.component.html b/portal-frontend/src/app/features/applications/application-details/application-details.component.html index b4c631960b..b9bffd06cd 100644 --- a/portal-frontend/src/app/features/applications/application-details/application-details.component.html +++ b/portal-frontend/src/app/features/applications/application-details/application-details.component.html @@ -97,7 +97,10 @@ <h3>4. Government</h3> </app-warning-banner> <app-warning-banner *ngIf=" - showErrors && localGovernment && localGovernment.matchesUserGuid && applicationSubmission.typeCode !== 'TURP' + showErrors && + localGovernment && + localGovernment.matchesUserGuid && + applicationSubmission.requiresGovernmentReview " class="full-row" > diff --git a/portal-frontend/src/app/features/applications/edit-submission/edit-submission.component.ts b/portal-frontend/src/app/features/applications/edit-submission/edit-submission.component.ts index 9b40933f47..496d92bea5 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/edit-submission.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/edit-submission.component.ts @@ -280,15 +280,15 @@ export class EditSubmissionComponent implements OnInit, OnDestroy, AfterViewInit async onSubmit() { if (this.applicationSubmission) { - const isTUR = this.applicationSubmission.typeCode === 'TURP'; const government = await this.loadGovernment(this.applicationSubmission.localGovernmentUuid); const governmentName = government?.name ?? 'selected local / first nation government'; + const requiresReview = this.applicationSubmission.requiresGovernmentReview; this.dialog .open(SubmitConfirmationDialogComponent, { data: { - governmentName: isTUR ? 'ALC' : governmentName, - userIsGovernment: (government?.matchesUserGuid && !isTUR) ?? false, + governmentName: requiresReview ? governmentName : 'ALC', + userIsGovernment: !!government?.matchesUserGuid && requiresReview, }, }) .beforeClosed() @@ -310,7 +310,7 @@ export class EditSubmissionComponent implements OnInit, OnDestroy, AfterViewInit government = await this.loadGovernment(this.applicationSubmission?.localGovernmentUuid); } - if (government && government.matchesUserGuid && submission.typeCode !== 'TURP') { + if (government && government.matchesUserGuid && submission.requiresGovernmentReview) { const review = await this.applicationReviewService.startReview(submission.fileNumber); if (review) { await this.router.navigateByUrl(`/application/${submission?.fileNumber}/review`); diff --git a/portal-frontend/src/app/features/applications/view-submission/lfng-review/lfng-review.component.ts b/portal-frontend/src/app/features/applications/view-submission/lfng-review/lfng-review.component.ts index e80935380e..68ad28bdcd 100644 --- a/portal-frontend/src/app/features/applications/view-submission/lfng-review/lfng-review.component.ts +++ b/portal-frontend/src/app/features/applications/view-submission/lfng-review/lfng-review.component.ts @@ -93,7 +93,7 @@ export class LfngReviewComponent implements OnInit, OnDestroy { async loadReview() { if ( this.application && - this.application.typeCode !== 'TURP' && + this.application.requiresGovernmentReview && (this.submittedToAlcStatus || (this.application.status.code === SUBMISSION_STATUS.IN_REVIEW_BY_LG && this.application.canReview)) ) { diff --git a/portal-frontend/src/app/services/application-submission/application-submission.dto.ts b/portal-frontend/src/app/services/application-submission/application-submission.dto.ts index fc31603aa5..8a08bd7a84 100644 --- a/portal-frontend/src/app/services/application-submission/application-submission.dto.ts +++ b/portal-frontend/src/app/services/application-submission/application-submission.dto.ts @@ -46,6 +46,7 @@ export interface ApplicationSubmissionDto { purpose: string | null; type: string; typeCode: string; + requiresGovernmentReview: boolean; localGovernmentUuid: string; status: ApplicationStatusDto; canEdit: boolean; diff --git a/services/apps/alcs/src/alcs/application/application.service.ts b/services/apps/alcs/src/alcs/application/application.service.ts index 49c521c79e..d805b3bebb 100644 --- a/services/apps/alcs/src/alcs/application/application.service.ts +++ b/services/apps/alcs/src/alcs/application/application.service.ts @@ -417,6 +417,7 @@ export class ApplicationService { portalLabel: true, htmlDescription: true, label: true, + requiresGovernmentReview: true, }, }); } diff --git a/services/apps/alcs/src/alcs/code/application-code/application-type/application-type.dto.ts b/services/apps/alcs/src/alcs/code/application-code/application-type/application-type.dto.ts index 0386d6f1d6..344874848a 100644 --- a/services/apps/alcs/src/alcs/code/application-code/application-type/application-type.dto.ts +++ b/services/apps/alcs/src/alcs/code/application-code/application-type/application-type.dto.ts @@ -10,4 +10,7 @@ export class ApplicationTypeDto extends BaseCodeDto { @AutoMap() textColor: string; + + @AutoMap() + requiresGovernmentReview: boolean; } diff --git a/services/apps/alcs/src/alcs/code/application-code/application-type/application-type.entity.ts b/services/apps/alcs/src/alcs/code/application-code/application-type/application-type.entity.ts index 9d93f4bb8f..58d9a9c1a9 100644 --- a/services/apps/alcs/src/alcs/code/application-code/application-type/application-type.entity.ts +++ b/services/apps/alcs/src/alcs/code/application-code/application-type/application-type.entity.ts @@ -30,4 +30,8 @@ export class ApplicationType extends BaseCodeEntity { @AutoMap() @Column({ type: 'text', default: '' }) portalLabel: string; + + @AutoMap() + @Column({ default: true }) + requiresGovernmentReview: boolean; } diff --git a/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.spec.ts b/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.spec.ts index dfa850df68..982feff4c8 100644 --- a/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.spec.ts +++ b/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.spec.ts @@ -301,8 +301,7 @@ describe('ApplicationSubmissionReviewController', () => { mockAppReviewService.verifyComplete.mockReturnValue(applicationReview); mockAppReviewService.getByFileNumber.mockResolvedValue(applicationReview); mockAppValidatorService.validateSubmission.mockResolvedValue({ - application: - new ApplicationSubmission() as ValidatedApplicationSubmission, + submission: new ApplicationSubmission() as ValidatedApplicationSubmission, errors: [], }); mockAppDocService.list.mockResolvedValue([]); @@ -349,8 +348,7 @@ describe('ApplicationSubmissionReviewController', () => { }); mockAppValidatorService.validateSubmission.mockResolvedValue({ - application: - new ApplicationSubmission() as ValidatedApplicationSubmission, + submission: new ApplicationSubmission() as ValidatedApplicationSubmission, errors: [], }); @@ -433,8 +431,7 @@ describe('ApplicationSubmissionReviewController', () => { }); mockAppReviewService.getByFileNumber.mockResolvedValue(applicationReview); mockAppValidatorService.validateSubmission.mockResolvedValue({ - application: - new ApplicationSubmission() as ValidatedApplicationSubmission, + submission: new ApplicationSubmission() as ValidatedApplicationSubmission, errors: [], }); mockAppSubmissionService.updateStatus.mockResolvedValue({} as any); diff --git a/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.ts b/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.ts index 5df5e9761c..d4e1ed6d98 100644 --- a/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.ts +++ b/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.ts @@ -263,7 +263,7 @@ export class ApplicationSubmissionReviewController { const validationResult = await this.applicationValidatorService.validateSubmission(application); - if (!validationResult.application) { + if (!validationResult.submission) { throw new BaseServiceException( `Invalid application found during LG Submission ${ application.fileNumber @@ -275,7 +275,7 @@ export class ApplicationSubmissionReviewController { application.status.statusTypeCode === SUBMISSION_STATUS.IN_REVIEW_BY_LG ) { await this.applicationSubmissionService.submitToAlcs( - validationResult.application, + validationResult.submission, req.user.entity, completedReview, ); diff --git a/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.ts b/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.ts index 71f2e658c7..12d6921d43 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.ts @@ -153,7 +153,7 @@ export class ApplicationSubmissionValidatorService { return { errors, - application: errors.length === 0 ? validatedApplication : undefined, + submission: errors.length === 0 ? validatedApplication : undefined, }; } diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.controller.spec.ts b/services/apps/alcs/src/portal/application-submission/application-submission.controller.spec.ts index 0ad4396331..993ff52db0 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.controller.spec.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.controller.spec.ts @@ -20,6 +20,8 @@ import { ApplicationSubmissionStatusType } from '../../alcs/application/applicat import { SUBMISSION_STATUS } from '../../alcs/application/application-submission-status/submission-status.dto'; import { ApplicationSubmissionToSubmissionStatus } from '../../alcs/application/application-submission-status/submission-status.entity'; import { Application } from '../../alcs/application/application.entity'; +import { ApplicationService } from '../../alcs/application/application.service'; +import { ApplicationType } from '../../alcs/code/application-code/application-type/application-type.entity'; import { LocalGovernment } from '../../alcs/local-government/local-government.entity'; import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; import { ApplicationProfile } from '../../common/automapper/application.automapper.profile'; @@ -45,6 +47,7 @@ describe('ApplicationSubmissionController', () => { let mockLgService: DeepMocked<LocalGovernmentService>; let mockAppValidationService: DeepMocked<ApplicationSubmissionValidatorService>; let mockStatusEmailService: DeepMocked<StatusEmailService>; + let mockApplicationService: DeepMocked<ApplicationService>; const localGovernmentUuid = 'local-government'; const primaryContactOwnerUuid = 'primary-contact'; @@ -57,6 +60,7 @@ describe('ApplicationSubmissionController', () => { mockLgService = createMock(); mockAppValidationService = createMock(); mockStatusEmailService = createMock(); + mockApplicationService = createMock(); const module: TestingModule = await Test.createTestingModule({ controllers: [ApplicationSubmissionController], @@ -82,6 +86,10 @@ describe('ApplicationSubmissionController', () => { provide: StatusEmailService, useValue: mockStatusEmailService, }, + { + provide: ApplicationService, + useValue: mockApplicationService, + }, { provide: ClsService, useValue: {}, @@ -116,6 +124,16 @@ describe('ApplicationSubmissionController', () => { mockAppSubmissionService.verifyAccessByUuid.mockResolvedValue( new ApplicationSubmission(), ); + mockApplicationService.fetchApplicationTypes.mockResolvedValue([ + new ApplicationType({ + code: 'TURP', + requiresGovernmentReview: false, + }), + new ApplicationType({ + code: 'NOT-TURP', + requiresGovernmentReview: true, + }), + ]); mockAppSubmissionService.mapToDTOs.mockResolvedValue([]); mockLgService.list.mockResolvedValue([ @@ -135,7 +153,7 @@ describe('ApplicationSubmissionController', () => { it('should call out to service when fetching applications', async () => { mockAppSubmissionService.getByUser.mockResolvedValue([]); - const applications = await controller.getApplications({ + const applications = await controller.list({ user: { entity: new User(), }, @@ -148,7 +166,7 @@ describe('ApplicationSubmissionController', () => { it('should fetch by bceid if user has same guid as a local government', async () => { mockAppSubmissionService.getForGovernment.mockResolvedValue([]); - const applications = await controller.getApplications({ + const applications = await controller.list({ user: { entity: new User({ bceidBusinessGuid, @@ -394,7 +412,7 @@ describe('ApplicationSubmissionController', () => { new ApplicationSubmissionToSubmissionStatus(), ); mockAppValidationService.validateSubmission.mockResolvedValue({ - application: mockApplicationSubmission as ValidatedApplicationSubmission, + submission: mockApplicationSubmission as ValidatedApplicationSubmission, errors: [], }); @@ -458,8 +476,7 @@ describe('ApplicationSubmissionController', () => { mockApplicationSubmission, ); mockAppValidationService.validateSubmission.mockResolvedValue({ - application: - new ApplicationSubmission() as ValidatedApplicationSubmission, + submission: mockApplicationSubmission as ValidatedApplicationSubmission, errors: [], }); mockStatusEmailService.sendApplicationStatusEmail.mockResolvedValue(); @@ -528,8 +545,7 @@ describe('ApplicationSubmissionController', () => { mockApplicationSubmission, ); mockAppValidationService.validateSubmission.mockResolvedValue({ - application: - new ApplicationSubmission() as ValidatedApplicationSubmission, + submission: mockApplicationSubmission as ValidatedApplicationSubmission, errors: [], }); mockStatusEmailService.sendApplicationStatusEmail.mockResolvedValue(); @@ -571,7 +587,7 @@ describe('ApplicationSubmissionController', () => { submissionGovernment: new LocalGovernment(), }); mockAppValidationService.validateSubmission.mockResolvedValue({ - application: undefined, + submission: undefined, errors: [new Error('Failed to validate')], }); diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.controller.ts b/services/apps/alcs/src/portal/application-submission/application-submission.controller.ts index d49f137bff..7041ace2f0 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.controller.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.controller.ts @@ -10,7 +10,10 @@ import { Req, UseGuards, } from '@nestjs/common'; -import { ServiceValidationException } from '../../../../../libs/common/src/exceptions/base.exception'; +import { + BaseServiceException, + ServiceValidationException, +} from '../../../../../libs/common/src/exceptions/base.exception'; import { generateCANCApplicationHtml } from '../../../../../templates/emails/cancelled'; import { generateSUBGTurApplicantHtml, @@ -21,13 +24,17 @@ import { generateSUBGGovernmentHtml, } from '../../../../../templates/emails/submitted-to-lfng'; import { SUBMISSION_STATUS } from '../../alcs/application/application-submission-status/submission-status.dto'; +import { ApplicationService } from '../../alcs/application/application.service'; import { PARENT_TYPE } from '../../alcs/card/card-subtask/card-subtask.dto'; import { LocalGovernment } from '../../alcs/local-government/local-government.entity'; import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; import { PortalAuthGuard } from '../../common/authorization/portal-auth-guard.service'; import { StatusEmailService } from '../../providers/email/status-email.service'; import { User } from '../../user/user.entity'; -import { ApplicationSubmissionValidatorService } from './application-submission-validator.service'; +import { + ApplicationSubmissionValidatorService, + ValidatedApplicationSubmission, +} from './application-submission-validator.service'; import { ApplicationSubmissionCreateDto, ApplicationSubmissionUpdateDto, @@ -44,10 +51,11 @@ export class ApplicationSubmissionController { private localGovernmentService: LocalGovernmentService, private applicationSubmissionValidatorService: ApplicationSubmissionValidatorService, private statusEmailService: StatusEmailService, + private applicationService: ApplicationService, ) {} @Get() - async getApplications(@Req() req) { + async list(@Req() req) { const user = req.user.entity as User; if (user.bceidBusinessGuid) { @@ -239,25 +247,58 @@ export class ApplicationSubmissionController { applicationSubmission, ); + if (validationResult.submission) { + return await this.submitValidatedSubmission( + validationResult.submission, + req.user.entity, + ); + } else { + this.logger.debug(validationResult.errors); + throw new BadRequestException('Invalid Application'); + } + } + + private async submitValidatedSubmission( + validatedSubmission: ValidatedApplicationSubmission, + user: User, + ) { + const applicationTypes = + await this.applicationService.fetchApplicationTypes(); + const matchingType = applicationTypes.find( + (type) => type.code === validatedSubmission.typeCode, + ); + + if (!matchingType) { + throw new BaseServiceException( + `Failed to find Application Type Matching ${validatedSubmission.typeCode}`, + ); + } + const { primaryContact, submissionGovernment } = await this.statusEmailService.getApplicationEmailData( - applicationSubmission.fileNumber, - applicationSubmission, + validatedSubmission.fileNumber, + validatedSubmission, ); - if (validationResult.application) { - const validatedApplicationSubmission = validationResult.application; - if (validatedApplicationSubmission.typeCode === 'TURP') { - await this.applicationSubmissionService.submitToAlcs( - validatedApplicationSubmission, - req.user.entity, - ); + if (matchingType.requiresGovernmentReview) { + const wasSubmittedToLfng = validatedSubmission.submissionStatuses.find( + (s) => + [ + SUBMISSION_STATUS.SUBMITTED_TO_LG, + SUBMISSION_STATUS.IN_REVIEW_BY_LG, + SUBMISSION_STATUS.WRONG_GOV, + SUBMISSION_STATUS.INCOMPLETE, + ].includes(s.statusTypeCode as SUBMISSION_STATUS) && + !!s.effectiveDate, + ); + // Send status emails for first time submissions + if (!wasSubmittedToLfng) { if (primaryContact) { await this.statusEmailService.sendApplicationStatusEmail({ - generateStatusHtml: generateSUBGTurApplicantHtml, - status: SUBMISSION_STATUS.SUBMITTED_TO_ALC, - applicationSubmission, + generateStatusHtml: generateSUBGApplicantHtml, + status: SUBMISSION_STATUS.SUBMITTED_TO_LG, + applicationSubmission: validatedSubmission, government: submissionGovernment, parentType: PARENT_TYPE.APPLICATION, primaryContact, @@ -266,62 +307,49 @@ export class ApplicationSubmissionController { if (submissionGovernment) { await this.statusEmailService.sendApplicationStatusEmail({ - generateStatusHtml: generateSUBGTurGovernmentHtml, - status: SUBMISSION_STATUS.SUBMITTED_TO_ALC, - applicationSubmission, + generateStatusHtml: generateSUBGGovernmentHtml, + status: SUBMISSION_STATUS.SUBMITTED_TO_LG, + applicationSubmission: validatedSubmission, government: submissionGovernment, parentType: PARENT_TYPE.APPLICATION, }); } + } - return await this.applicationSubmissionService.updateStatus( - applicationSubmission, - SUBMISSION_STATUS.SUBMITTED_TO_ALC, - ); - } else { - const wasSubmittedToLfng = - applicationSubmission.submissionStatuses.find( - (s) => - [ - SUBMISSION_STATUS.SUBMITTED_TO_LG, - SUBMISSION_STATUS.IN_REVIEW_BY_LG, - SUBMISSION_STATUS.WRONG_GOV, - SUBMISSION_STATUS.INCOMPLETE, - ].includes(s.statusTypeCode as SUBMISSION_STATUS) && - !!s.effectiveDate, - ); + return await this.applicationSubmissionService.submitToLg( + validatedSubmission, + ); + } else { + await this.applicationSubmissionService.submitToAlcs( + validatedSubmission, + user, + ); - // Send status emails for first time submissions - if (!wasSubmittedToLfng) { - if (primaryContact) { - await this.statusEmailService.sendApplicationStatusEmail({ - generateStatusHtml: generateSUBGApplicantHtml, - status: SUBMISSION_STATUS.SUBMITTED_TO_LG, - applicationSubmission, - government: submissionGovernment, - parentType: PARENT_TYPE.APPLICATION, - primaryContact, - }); - } - - if (submissionGovernment) { - await this.statusEmailService.sendApplicationStatusEmail({ - generateStatusHtml: generateSUBGGovernmentHtml, - status: SUBMISSION_STATUS.SUBMITTED_TO_LG, - applicationSubmission, - government: submissionGovernment, - parentType: PARENT_TYPE.APPLICATION, - }); - } - } + if (primaryContact) { + await this.statusEmailService.sendApplicationStatusEmail({ + generateStatusHtml: generateSUBGTurApplicantHtml, + status: SUBMISSION_STATUS.SUBMITTED_TO_ALC, + applicationSubmission: validatedSubmission, + government: submissionGovernment, + parentType: PARENT_TYPE.APPLICATION, + primaryContact, + }); + } - return await this.applicationSubmissionService.submitToLg( - validatedApplicationSubmission, - ); + if (submissionGovernment) { + await this.statusEmailService.sendApplicationStatusEmail({ + generateStatusHtml: generateSUBGTurGovernmentHtml, + status: SUBMISSION_STATUS.SUBMITTED_TO_ALC, + applicationSubmission: validatedSubmission, + government: submissionGovernment, + parentType: PARENT_TYPE.APPLICATION, + }); } - } else { - this.logger.debug(validationResult.errors); - throw new BadRequestException('Invalid Application'); + + return await this.applicationSubmissionService.updateStatus( + validatedSubmission, + SUBMISSION_STATUS.SUBMITTED_TO_ALC, + ); } } } diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.dto.ts b/services/apps/alcs/src/portal/application-submission/application-submission.dto.ts index a5f2092a88..5461cc4177 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.dto.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.dto.ts @@ -51,6 +51,7 @@ export class ApplicationSubmissionDto { lastStatusUpdate: number; owners: ApplicationOwnerDto[]; type: string; + requiresGovernmentReview: boolean; @AutoMap() typeCode: string; diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.service.ts b/services/apps/alcs/src/portal/application-submission/application-submission.service.ts index 4207d5061d..0eef2259db 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.service.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.service.ts @@ -588,17 +588,19 @@ export class ApplicationSubmissionService { apps: ApplicationSubmission[], user: User, userGovernment?: LocalGovernment, - ) { + ): Promise<ApplicationSubmissionDto[]> { const types = await this.applicationService.fetchApplicationTypes(); return apps.map((app) => { + const matchingAppType = types.find((type) => type.code === app.typeCode); return { ...this.mapper.map( app, ApplicationSubmission, ApplicationSubmissionDto, ), - type: types.find((type) => type.code === app.typeCode)!.label, + type: matchingAppType!.label, + requiresGovernmentReview: matchingAppType!.requiresGovernmentReview, canEdit: [ SUBMISSION_STATUS.IN_PROGRESS, SUBMISSION_STATUS.INCOMPLETE, @@ -610,7 +612,7 @@ export class ApplicationSubmissionService { SUBMISSION_STATUS.SUBMITTED_TO_LG, SUBMISSION_STATUS.IN_REVIEW_BY_LG, ].includes(app.status.statusTypeCode as SUBMISSION_STATUS) && - userGovernment && + !!userGovernment && userGovernment.uuid === app.localGovernmentUuid, }; }); @@ -626,9 +628,14 @@ export class ApplicationSubmissionService { ApplicationSubmission, ApplicationSubmissionDetailedDto, ); + + const matchingAppType = types.find( + (type) => type.code === application.typeCode, + ); return { ...mappedApp, - type: types.find((type) => type.code === application.typeCode)!.label, + type: matchingAppType!.label, + requiresGovernmentReview: matchingAppType!.requiresGovernmentReview, canEdit: [ SUBMISSION_STATUS.IN_PROGRESS, SUBMISSION_STATUS.INCOMPLETE, diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1698255209608-add_app_type_government_review_required.ts b/services/apps/alcs/src/providers/typeorm/migrations/1698255209608-add_app_type_government_review_required.ts new file mode 100644 index 0000000000..ab0595f41c --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1698255209608-add_app_type_government_review_required.ts @@ -0,0 +1,22 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class addAppTypeGovernmentReviewRequired1698255209608 + implements MigrationInterface +{ + name = 'addAppTypeGovernmentReviewRequired1698255209608'; + + public async up(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `ALTER TABLE "alcs"."application_type" ADD "requires_government_review" boolean NOT NULL DEFAULT true`, + ); + await queryRunner.query(` + UPDATE "alcs"."application_type" SET "requires_government_review" = false WHERE "code" = 'TURP'; + `); + } + + public async down(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `ALTER TABLE "alcs"."application_type" DROP COLUMN "requires_government_review"`, + ); + } +} From 22e1f9ea2d210d31e01504a29806879b66192213 Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Wed, 25 Oct 2023 15:19:37 -0700 Subject: [PATCH 554/954] fix --- services/apps/alcs/src/alcs/search/search.controller.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/services/apps/alcs/src/alcs/search/search.controller.ts b/services/apps/alcs/src/alcs/search/search.controller.ts index a3167eae2d..a4ba34838f 100644 --- a/services/apps/alcs/src/alcs/search/search.controller.ts +++ b/services/apps/alcs/src/alcs/search/search.controller.ts @@ -288,8 +288,7 @@ export class SearchController { !searchDto.dateDecidedTo && !searchDto.resolutionNumber && !searchDto.resolutionYear && - !isStringSetAndNotEmpty(searchDto.legacyId) && - !isStringSetAndNotEmpty(searchDto.civicAddress); + !isStringSetAndNotEmpty(searchDto.legacyId); return { searchApplications, From 88409a0bf474a66e897a0de90a9abde84ee840df Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Wed, 25 Oct 2023 15:20:29 -0700 Subject: [PATCH 555/954] Code Review Feedback * Fix up some incorrect types on NOIs --- .../public-notice-of-intent.component.ts | 9 +++++---- .../app/services/public/public-notice-of-intent.dto.ts | 8 +++++--- .../src/app/services/public/public-notification.dto.ts | 3 --- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/portal-frontend/src/app/features/public/notice-of-intent/public-notice-of-intent.component.ts b/portal-frontend/src/app/features/public/notice-of-intent/public-notice-of-intent.component.ts index 8b35006873..ccb027902b 100644 --- a/portal-frontend/src/app/features/public/notice-of-intent/public-notice-of-intent.component.ts +++ b/portal-frontend/src/app/features/public/notice-of-intent/public-notice-of-intent.component.ts @@ -1,8 +1,9 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { Subject, takeUntil } from 'rxjs'; -import { ApplicationPortalDecisionDto } from '../../../services/application-decision/application-decision.dto'; import { SUBMISSION_STATUS } from '../../../services/application-submission/application-submission.dto'; +import { NoticeOfIntentPortalDecisionDto } from '../../../services/notice-of-intent-decision/notice-of-intent-decision.dto'; +import { NOI_SUBMISSION_STATUS } from '../../../services/notice-of-intent-submission/notice-of-intent-submission.dto'; import { PublicNoticeOfIntentSubmissionDto } from '../../../services/public/public-notice-of-intent.dto'; import { PublicDocumentDto, PublicParcelDto } from '../../../services/public/public.dto'; import { PublicService } from '../../../services/public/public.service'; @@ -20,7 +21,7 @@ export class PublicNoticeOfIntentComponent implements OnInit, OnDestroy { submission: PublicNoticeOfIntentSubmissionDto | undefined; documents: PublicDocumentDto[] = []; parcels: PublicParcelDto[] = []; - decisions: ApplicationPortalDecisionDto[] = []; + decisions: NoticeOfIntentPortalDecisionDto[] = []; selectedIndex = 0; constructor(private publicService: PublicService, private route: ActivatedRoute) {} @@ -40,8 +41,8 @@ export class PublicNoticeOfIntentComponent implements OnInit, OnDestroy { const { submission, documents, parcels, decisions } = res; this.submission = submission; - if (submission.status.code === SUBMISSION_STATUS.ALC_DECISION) { - this.selectedIndex = 2; + if (submission.status.code === NOI_SUBMISSION_STATUS.ALC_DECISION) { + this.selectedIndex = 1; } this.documents = documents; this.parcels = parcels; diff --git a/portal-frontend/src/app/services/public/public-notice-of-intent.dto.ts b/portal-frontend/src/app/services/public/public-notice-of-intent.dto.ts index aa608c0699..125285f4e5 100644 --- a/portal-frontend/src/app/services/public/public-notice-of-intent.dto.ts +++ b/portal-frontend/src/app/services/public/public-notice-of-intent.dto.ts @@ -1,6 +1,8 @@ -import { ApplicationStatusDto } from '../application-submission/application-submission.dto'; import { NoticeOfIntentPortalDecisionDto } from '../notice-of-intent-decision/notice-of-intent-decision.dto'; -import { ProposedStructure } from '../notice-of-intent-submission/notice-of-intent-submission.dto'; +import { + NoticeOfIntentSubmissionStatusDto, + ProposedStructure, +} from '../notice-of-intent-submission/notice-of-intent-submission.dto'; import { PublicDocumentDto, PublicOwnerDto, PublicParcelDto } from './public.dto'; export interface GetPublicNoticeOfIntentResponseDto { @@ -19,7 +21,7 @@ export interface PublicNoticeOfIntentSubmissionDto { localGovernmentUuid: string; hasOtherParcelsInCommunity?: boolean | null; lastStatusUpdate: number; - status: ApplicationStatusDto; + status: NoticeOfIntentSubmissionStatusDto; owners: PublicOwnerDto[]; type: string; typeCode: string; diff --git a/portal-frontend/src/app/services/public/public-notification.dto.ts b/portal-frontend/src/app/services/public/public-notification.dto.ts index b2a77ef801..7d862c5db6 100644 --- a/portal-frontend/src/app/services/public/public-notification.dto.ts +++ b/portal-frontend/src/app/services/public/public-notification.dto.ts @@ -1,6 +1,3 @@ -import { ApplicationStatusDto } from '../application-submission/application-submission.dto'; -import { NoticeOfIntentPortalDecisionDto } from '../notice-of-intent-decision/notice-of-intent-decision.dto'; -import { ProposedStructure } from '../notice-of-intent-submission/notice-of-intent-submission.dto'; import { NotificationSubmissionStatusDto } from '../notification-submission/notification-submission.dto'; import { PublicDocumentDto, PublicOwnerDto, PublicParcelDto } from './public.dto'; From fa513198ce449fe7265c3e6b449d797a1dbf72e4 Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Wed, 25 Oct 2023 15:28:09 -0700 Subject: [PATCH 556/954] remove debug --- .../src/portal/inbox/notification/inbox-notification.service.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/services/apps/alcs/src/portal/inbox/notification/inbox-notification.service.ts b/services/apps/alcs/src/portal/inbox/notification/inbox-notification.service.ts index 0b5e4a4589..908a5c4763 100644 --- a/services/apps/alcs/src/portal/inbox/notification/inbox-notification.service.ts +++ b/services/apps/alcs/src/portal/inbox/notification/inbox-notification.service.ts @@ -150,7 +150,6 @@ export class InboxNotificationService { civic_address: `%${searchDto.civicAddress}%`.toLowerCase(), }); } - console.log(query) return query; } From f523b6961b2157c28be92180a4553be0e62de188 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Wed, 25 Oct 2023 15:41:34 -0700 Subject: [PATCH 557/954] Search Bug Fixes * Add type to list component and then use to display not found message * Update code controller to check if there is an authorization header before trying to decode it and failing. --- ...tice-of-intent-search-table.component.html | 2 +- .../search/public-search.component.html | 3 ++ .../search-list/search-list.component.html | 4 ++- .../search-list/search-list.component.ts | 3 +- .../src/portal/code/code.controller.spec.ts | 30 ++++++++++++++++++- .../alcs/src/portal/code/code.controller.ts | 16 +++++----- 6 files changed, 47 insertions(+), 11 deletions(-) diff --git a/portal-frontend/src/app/features/public/search/notice-of-intent-search-table/notice-of-intent-search-table.component.html b/portal-frontend/src/app/features/public/search/notice-of-intent-search-table/notice-of-intent-search-table.component.html index ff1d44f83a..e668f63da1 100644 --- a/portal-frontend/src/app/features/public/search/notice-of-intent-search-table/notice-of-intent-search-table.component.html +++ b/portal-frontend/src/app/features/public/search/notice-of-intent-search-table/notice-of-intent-search-table.component.html @@ -62,7 +62,7 @@ <tr class="mat-row no-data" *matNoDataRow> <td class="text-center" colspan="6"> - <div><b>No notice of intent found.</b></div> + <div><b>No notices of intent found.</b></div> <div>Please adjust search criteria and try again.</div> </td> </tr> diff --git a/portal-frontend/src/app/features/public/search/public-search.component.html b/portal-frontend/src/app/features/public/search/public-search.component.html index 20fad36175..d0280e82d5 100644 --- a/portal-frontend/src/app/features/public/search/public-search.component.html +++ b/portal-frontend/src/app/features/public/search/public-search.component.html @@ -132,6 +132,7 @@ <h2 class="search-title">Search Results</h2> <ng-template mat-tab-label> Applications: {{ applicationTotal }} </ng-template> <app-search-list *ngIf="isMobile" + type="applications" [results]="applications" [totalCount]="applicationTotal" [statuses]="statuses" @@ -151,6 +152,7 @@ <h2 class="search-title">Search Results</h2> <ng-template mat-tab-label> Notice of Intent: {{ noticeOfIntentTotal }} </ng-template> <app-search-list *ngIf="isMobile" + type="notices of intent" [results]="noticeOfIntents" [totalCount]="noticeOfIntentTotal" [statuses]="statuses" @@ -170,6 +172,7 @@ <h2 class="search-title">Search Results</h2> <ng-template mat-tab-label> Notifications: {{ notificationTotal }} </ng-template> <app-search-list *ngIf="isMobile" + type="notifications" [results]="notifications" [totalCount]="notificationTotal" [statuses]="statuses" diff --git a/portal-frontend/src/app/features/public/search/search-list/search-list.component.html b/portal-frontend/src/app/features/public/search/search-list/search-list.component.html index c05af23c85..bcbafa4825 100644 --- a/portal-frontend/src/app/features/public/search/search-list/search-list.component.html +++ b/portal-frontend/src/app/features/public/search/search-list/search-list.component.html @@ -21,6 +21,8 @@ </div> <div class="no-data" *ngIf="totalCount === 0"> - <div><b>No applications found.</b></div> + <div> + <b>No {{ type }} found.</b> + </div> <div>Please adjust search criteria and try again.</div> </div> diff --git a/portal-frontend/src/app/features/public/search/search-list/search-list.component.ts b/portal-frontend/src/app/features/public/search/search-list/search-list.component.ts index 2271f9fc92..4c87da581b 100644 --- a/portal-frontend/src/app/features/public/search/search-list/search-list.component.ts +++ b/portal-frontend/src/app/features/public/search/search-list/search-list.component.ts @@ -12,7 +12,7 @@ const CLASS_TO_URL_MAP: Record<string, string> = { }; @Component({ - selector: 'app-search-list', + selector: 'app-search-list[type]', templateUrl: './search-list.component.html', styleUrls: ['./search-list.component.scss'], }) @@ -21,6 +21,7 @@ export class SearchListComponent implements OnDestroy { @Input() totalCount = 0; @Input() statuses: ApplicationStatusDto[] = []; + @Input() type = ''; _results: SearchResult[] = []; @Input() set results(results: BaseSearchResultDto[]) { diff --git a/services/apps/alcs/src/portal/code/code.controller.spec.ts b/services/apps/alcs/src/portal/code/code.controller.spec.ts index 9f4af9f5b6..fc700c5ee5 100644 --- a/services/apps/alcs/src/portal/code/code.controller.spec.ts +++ b/services/apps/alcs/src/portal/code/code.controller.spec.ts @@ -132,7 +132,7 @@ describe('CodeController', () => { expect(mockLgService.listActive).toHaveBeenCalledTimes(1); }); - it('should set the matches flag correctly when users guid matches government', async () => { + it('should not try and decode the token if there isnt one on the request', async () => { const matchingGuid = 'guid'; mockAuthorizationService.decodeHeaderToken.mockResolvedValue({ bceid_business_guid: matchingGuid, @@ -150,6 +150,34 @@ describe('CodeController', () => { headers: {}, }); + expect(mockAuthorizationService.decodeHeaderToken).toHaveBeenCalledTimes(0); + expect(codes.localGovernments).toBeDefined(); + expect(codes.localGovernments.length).toBe(1); + expect(codes.localGovernments[0].name).toEqual('fake-name'); + expect(codes.localGovernments[0].matchesUserGuid).toBeFalsy(); + expect(mockLgService.listActive).toHaveBeenCalledTimes(1); + }); + + it('should set the matches flag correctly when users guid matches government', async () => { + const matchingGuid = 'guid'; + mockAuthorizationService.decodeHeaderToken.mockResolvedValue({ + bceid_business_guid: matchingGuid, + } as any); + mockLgService.listActive.mockResolvedValue([ + new LocalGovernment({ + uuid: 'fake-uuid', + name: 'fake-name', + isFirstNation: false, + bceidBusinessGuid: matchingGuid, + }), + ]); + + const codes = await portalController.loadCodes({ + headers: { + authorization: 'fake-token', + }, + }); + expect(mockAuthorizationService.decodeHeaderToken).toHaveBeenCalledTimes(1); expect(codes.localGovernments).toBeDefined(); expect(codes.localGovernments.length).toBe(1); diff --git a/services/apps/alcs/src/portal/code/code.controller.ts b/services/apps/alcs/src/portal/code/code.controller.ts index 298c1ce10c..99550bb41f 100644 --- a/services/apps/alcs/src/portal/code/code.controller.ts +++ b/services/apps/alcs/src/portal/code/code.controller.ts @@ -88,13 +88,15 @@ export class CodeController { req: any, ): Promise<LocalGovernmentDto[]> { //No auth guard, so we can't use req.user.entity - const tokenHeader = req.headers['authorization']; - const token = await this.authorizationService.decodeHeaderToken( - tokenHeader, - ); - const bceidGuid: string | boolean = token - ? token['bceid_business_guid'] - : false; + const tokenHeader = req.headers['authorization'] as string | undefined; + + let bceidGuid; + if (tokenHeader) { + const token = await this.authorizationService.decodeHeaderToken( + tokenHeader, + ); + bceidGuid = token ? token['bceid_business_guid'] : false; + } return governments.map((government) => ({ name: government.name, From b1e9a94fffb1b1b62c874ce08c7fb724820eddda Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Wed, 25 Oct 2023 17:05:18 -0700 Subject: [PATCH 558/954] Portal Proposal Fixes * Add error class to parcel error so it gets scrolled to * Update logic for toggling the file uploads for ROSO and PFRS to also update the other ones correctly * Add backend validation for SUBD Proposals including lot size --- .../subd-details/subd-details.component.html | 2 +- .../proposal/pfrs/pfrs-proposal.component.ts | 11 +- .../proposal/roso/roso-proposal.component.ts | 9 +- ...ation-submission-validator.service.spec.ts | 155 ++++++++++++++++++ ...pplication-submission-validator.service.ts | 31 +++- 5 files changed, 197 insertions(+), 11 deletions(-) diff --git a/portal-frontend/src/app/features/applications/application-details/subd-details/subd-details.component.html b/portal-frontend/src/app/features/applications/application-details/subd-details/subd-details.component.html index c4e3f8625f..935ff64df6 100644 --- a/portal-frontend/src/app/features/applications/application-details/subd-details/subd-details.component.html +++ b/portal-frontend/src/app/features/applications/application-details/subd-details/subd-details.component.html @@ -22,7 +22,7 @@ <div *ngIf="_applicationSubmission.subdProposedLots.length === 0" class="full-width"> <app-no-data [showRequired]="showErrors"></app-no-data> </div> - <div *ngIf="showErrors && totalAcres !== totalTargetAcres" class="full-width field-error"> + <div *ngIf="showErrors && totalAcres !== totalTargetAcres" class="full-width error field-error"> <mat-icon>warning</mat-icon> <div>The total lot area proposed must match {{ totalTargetAcres }} hectares as provided in Step 1</div> </div> diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pfrs/pfrs-proposal.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pfrs/pfrs-proposal.component.ts index 17e43e12a8..8e42630419 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pfrs/pfrs-proposal.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pfrs/pfrs-proposal.component.ts @@ -125,7 +125,15 @@ export class PfrsProposalComponent extends FilesStepComponent implements OnInit, if (noiSubmission.soilIsFollowUp) { this.followUpIds.enable(); } - this.allowMiningUploads = !!noiSubmission.soilIsAreaWideFilling; + + this.allowMiningUploads = !!noiSubmission.soilIsAreaWideFilling || !!noiSubmission.soilIsExtractionOrMining; + if (noiSubmission.soilIsExtractionOrMining) { + this.hasSubmittedNotice.enable(); + } else { + this.hasSubmittedNotice.disable(); + } + + this.requiresNoticeOfWork = !!noiSubmission.soilHasSubmittedNotice; this.form.patchValue({ isFollowUp: formatBooleanToString(noiSubmission.soilIsFollowUp), @@ -244,6 +252,7 @@ export class PfrsProposalComponent extends FilesStepComponent implements OnInit, } else { this.hasSubmittedNotice.setValue(null); this.hasSubmittedNotice.disable(); + this.requiresNoticeOfWork = false; } } diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.ts index 9158b805d4..8f2d8a6b93 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.ts @@ -205,14 +205,15 @@ export class RosoProposalComponent extends FilesStepComponent implements OnInit, } else { this.hasSubmittedNotice.disable(); this.hasSubmittedNotice.setValue(null); + this.requiresNoticeOfWork = false; } } - markDirty() { - this.areComponentsDirty = true; - } - onChangeNoticeOfWork(selectedValue: string) { this.requiresNoticeOfWork = selectedValue === 'true'; } + + markDirty() { + this.areComponentsDirty = true; + } } diff --git a/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.spec.ts b/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.spec.ts index 0d32a6b4f2..a447549300 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.spec.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.spec.ts @@ -1210,4 +1210,159 @@ describe('ApplicationSubmissionValidatorService', () => { ).toBe(false); }); }); + + describe('SUBD Applications', () => { + it('should require basic fields to be complete', async () => { + const application = new ApplicationSubmission({ + owners: [], + typeCode: 'SUBD', + subdSuitability: null, + subdAgricultureSupport: null, + subdProposedLots: [], + }); + + const res = await service.validateSubmission(application); + + expect( + includesError( + res.errors, + new Error(`SUBD application is not complete`), + ), + ).toBe(true); + + expect( + includesError( + res.errors, + new Error(`SUBD application has no proposed lots`), + ), + ).toBe(true); + }); + + it('should be happy if basic fields are complete', async () => { + const application = new ApplicationSubmission({ + owners: [], + typeCode: 'SUBD', + subdSuitability: 'subdSuitability', + subdAgricultureSupport: 'subdAgricultureSupport', + subdProposedLots: [ + { + type: 'Lot', + size: 0, + alrArea: null, + planNumbers: null, + }, + ], + }); + + const res = await service.validateSubmission(application); + + expect( + includesError( + res.errors, + new Error(`SUBD application is not complete`), + ), + ).toBe(false); + + expect( + includesError( + res.errors, + new Error(`SUBD application has no proposed lots`), + ), + ).toBe(false); + }); + + it('should require homesite severance when set to true', async () => { + const application = new ApplicationSubmission({ + owners: [], + typeCode: 'SUBD', + subdIsHomeSiteSeverance: true, + subdProposedLots: [], + }); + + const res = await service.validateSubmission(application); + + expect( + includesError( + res.errors, + new Error( + `SUBD declared homesite severance but does not have required document`, + ), + ), + ).toBe(true); + }); + + it('should accept matching parcel sizes', async () => { + const application = new ApplicationSubmission({ + owners: [], + typeCode: 'SUBD', + subdProposedLots: [ + { + type: 'Lot', + size: 6, + planNumbers: null, + alrArea: null, + }, + { + type: 'Lot', + size: 6, + planNumbers: null, + alrArea: null, + }, + ], + }); + + mockAppParcelService.fetchByApplicationFileId.mockResolvedValue([ + new ApplicationParcel({ + mapAreaHectares: 12, + owners: [], + }), + ]); + + const res = await service.validateSubmission(application); + + expect( + includesError( + res.errors, + new Error(`SUBD parcels area is different from proposed lot area`), + ), + ).toBe(false); + }); + }); + + it('should reject mismatched parcel sizes', async () => { + const application = new ApplicationSubmission({ + owners: [], + typeCode: 'SUBD', + subdProposedLots: [ + { + type: 'Lot', + size: 4, + planNumbers: null, + alrArea: null, + }, + { + type: 'Lot', + size: 6, + planNumbers: null, + alrArea: null, + }, + ], + }); + + mockAppParcelService.fetchByApplicationFileId.mockResolvedValue([ + new ApplicationParcel({ + mapAreaHectares: 12, + owners: [], + }), + ]); + + const res = await service.validateSubmission(application); + + expect( + includesError( + res.errors, + new Error(`SUBD parcels area is different from proposed lot area`), + ), + ).toBe(true); + }); }); diff --git a/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.ts b/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.ts index 71f2e658c7..b2eed76d41 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.ts @@ -53,8 +53,13 @@ export class ApplicationSubmissionValidatorService { errors.push(new ServiceValidationException('Missing purpose')); } + const parcels = await this.appParcelService.fetchByApplicationFileId( + applicationSubmission.fileNumber, + ); + const validatedParcels = await this.validateParcels( applicationSubmission, + parcels, errors, ); @@ -86,6 +91,7 @@ export class ApplicationSubmissionValidatorService { await this.validateSubdProposal( applicationSubmission, applicantDocuments, + parcels, errors, ); } @@ -159,12 +165,9 @@ export class ApplicationSubmissionValidatorService { private async validateParcels( applicationSubmission: ApplicationSubmission, + parcels: ApplicationParcel[], errors: Error[], ) { - const parcels = await this.appParcelService.fetchByApplicationFileId( - applicationSubmission.fileNumber, - ); - if (parcels.length === 0) { errors.push(new ServiceValidationException(`Application has no parcels`)); } @@ -456,6 +459,7 @@ export class ApplicationSubmissionValidatorService { private async validateSubdProposal( applicationSubmission: ApplicationSubmission, applicantDocuments: ApplicationDocument[], + parcels: ApplicationParcel[], errors: Error[], ) { if (applicationSubmission.subdProposedLots.length === 0) { @@ -487,11 +491,28 @@ export class ApplicationSubmissionValidatorService { if (homesiteDocuments.length === 0) { errors.push( new ServiceValidationException( - `SUBD delcared homesite severance but does not have required document`, + `SUBD declared homesite severance but does not have required document`, ), ); } } + + const initialArea = parcels.reduce( + (totalSize, parcel) => totalSize + (parcel.mapAreaHectares ?? 0), + 0, + ); + const subdividedArea = applicationSubmission.subdProposedLots.reduce( + (totalSize, proposedLot) => totalSize + (proposedLot.size ?? 0), + 0, + ); + + if (initialArea !== subdividedArea) { + errors.push( + new ServiceValidationException( + `SUBD parcels area is different from proposed lot area`, + ), + ); + } } private async validateRosoProposal( From 17b3dc9086c4af32c2651fa3b0ae496d5747a0f3 Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Thu, 26 Oct 2023 09:28:14 -0700 Subject: [PATCH 559/954] task-1234 email template change TUR application --- .../templates/emails/submitted-to-alc/tur-applicant.template.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/templates/emails/submitted-to-alc/tur-applicant.template.ts b/services/templates/emails/submitted-to-alc/tur-applicant.template.ts index 758ecaccba..18aced8b10 100644 --- a/services/templates/emails/submitted-to-alc/tur-applicant.template.ts +++ b/services/templates/emails/submitted-to-alc/tur-applicant.template.ts @@ -29,7 +29,7 @@ const template = `<mjml> <mj-table> <tr style="text-align: left; font-size: 16px; border: 1px solid black;"> <th style="padding-left: 8px; border-right: 1px solid black;">Application Type</th> - <th style="padding-left: 8px">{{ governmentName }} Portion of Fee</th> + <th style="padding-left: 8px">Application Fee</th> </tr> <tr style="font-size: 16px; border: 1px solid black;"> <td style="padding-left: 8px; border-right: 1px solid black;">Transportation, Utility, and Recreational Trail Uses</td> From 5c18b29c4f0ca7c63aa989d8096760d63637efb3 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Thu, 26 Oct 2023 10:13:14 -0700 Subject: [PATCH 560/954] Update Inbox SQL to only show Submitted Apps to L/FNG * Add and clause to NOI / Notifications to only show ones that are submitted for submitted filter * Update apps to check the above but also check for the two government statuses --- .../inbox/application/inbox-application.service.ts | 14 ++++++++------ .../inbox-notice-of-intent.service.ts | 3 ++- .../notification/inbox-notification.service.ts | 3 ++- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/services/apps/alcs/src/portal/inbox/application/inbox-application.service.ts b/services/apps/alcs/src/portal/inbox/application/inbox-application.service.ts index ba1b792a5e..7c6c0fff58 100644 --- a/services/apps/alcs/src/portal/inbox/application/inbox-application.service.ts +++ b/services/apps/alcs/src/portal/inbox/application/inbox-application.service.ts @@ -98,12 +98,11 @@ export class InboxApplicationService { where += ' OR appSearch.bceid_business_guid = :bceidBusinessGuid'; } if (governmentUuid) { - where += - ' OR (appSearch.local_government_uuid = :governmentUuid AND appSearch.date_submitted_to_alc IS NOT NULL)'; + where += ` OR (appSearch.local_government_uuid = :governmentUuid AND (appSearch.date_submitted_to_alc IS NOT NULL OR appSearch.status ->> 'status_type_code' IN ('REVG', 'SUBG')))`; } } else { if (searchDto.filterBy === 'submitted') { - where = 'appSearch.local_government_uuid = :governmentUuid'; + where = `appSearch.local_government_uuid = :governmentUuid AND (appSearch.date_submitted_to_alc IS NOT NULL OR appSearch.status ->> 'status_type_code' IN ('REVG', 'SUBG'))`; } else { where = '(appSearch.created_by_uuid = :userUuid OR appSearch.bceid_business_guid = :bceidBusinessGuid)'; @@ -177,9 +176,12 @@ export class InboxApplicationService { } if (searchDto.civicAddress) { - query = query.andWhere('LOWER(parcel.civic_address) like LOWER(:civic_address)', { - civic_address: `%${searchDto.civicAddress}%`.toLowerCase(), - }); + query = query.andWhere( + 'LOWER(parcel.civic_address) like LOWER(:civic_address)', + { + civic_address: `%${searchDto.civicAddress}%`.toLowerCase(), + }, + ); } return query; } diff --git a/services/apps/alcs/src/portal/inbox/notice-of-intent/inbox-notice-of-intent.service.ts b/services/apps/alcs/src/portal/inbox/notice-of-intent/inbox-notice-of-intent.service.ts index 78db0dead5..5f90c51900 100644 --- a/services/apps/alcs/src/portal/inbox/notice-of-intent/inbox-notice-of-intent.service.ts +++ b/services/apps/alcs/src/portal/inbox/notice-of-intent/inbox-notice-of-intent.service.ts @@ -99,7 +99,8 @@ export class InboxNoticeOfIntentService { } } else { if (searchDto.filterBy === 'submitted') { - where = 'noiSearch.local_government_uuid = :governmentUuid'; + where = + 'noiSearch.local_government_uuid = :governmentUuid AND noiSearch.date_submitted_to_alc IS NOT NULL'; } else { where = '(noiSearch.created_by_uuid = :userUuid OR noiSearch.bceid_business_guid = :bceidBusinessGuid)'; diff --git a/services/apps/alcs/src/portal/inbox/notification/inbox-notification.service.ts b/services/apps/alcs/src/portal/inbox/notification/inbox-notification.service.ts index 908a5c4763..415da20767 100644 --- a/services/apps/alcs/src/portal/inbox/notification/inbox-notification.service.ts +++ b/services/apps/alcs/src/portal/inbox/notification/inbox-notification.service.ts @@ -99,7 +99,8 @@ export class InboxNotificationService { } } else { if (searchDto.filterBy === 'submitted') { - where = 'notificationSearch.local_government_uuid = :governmentUuid'; + where = + 'notificationSearch.local_government_uuid = :governmentUuid AND notificationSearch.date_submitted_to_alc IS NOT NULL'; } else { where = '(notificationSearch.created_by_uuid = :userUuid OR notificationSearch.bceid_business_guid = :bceidBusinessGuid)'; From 4efac7779dd2c7e7189cc402974aa850cead4e9a Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Thu, 26 Oct 2023 10:34:06 -0700 Subject: [PATCH 561/954] Make sure date received all items is in the past * Previously only checking it was not null, but it needs to be in the past for the status to apply --- .../public-application-search-view.entity.ts | 4 +- ...lic-notice-of-intent-search-view.entity.ts | 4 +- ...5-add_date_check_regenerate_search_view.ts | 89 +++++++++++++++++++ 3 files changed, 95 insertions(+), 2 deletions(-) create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1698341356265-add_date_check_regenerate_search_view.ts diff --git a/services/apps/alcs/src/portal/public/search/application/public-application-search-view.entity.ts b/services/apps/alcs/src/portal/public/search/application/public-application-search-view.entity.ts index 0c49669b0a..bb88bc3a8c 100644 --- a/services/apps/alcs/src/portal/public/search/application/public-application-search-view.entity.ts +++ b/services/apps/alcs/src/portal/public/search/application/public-application-search-view.entity.ts @@ -69,7 +69,9 @@ import { LinkedStatusType } from '../public-search.dto'; 'decision_date."application_uuid" = app.uuid', ) .where('app_sub.is_draft = FALSE') - .andWhere('app.date_received_all_items IS NOT NULL') + .andWhere( + '(app.date_received_all_items IS NOT NULL AND app.date_received_all_items <= NOW())', + ) .andWhere( "alcs.get_current_status_for_application_submission_by_uuid(app_sub.uuid)->>'status_type_code' != 'CNCL'", ), diff --git a/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search-view.entity.ts b/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search-view.entity.ts index bac002d236..303d333caf 100644 --- a/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search-view.entity.ts +++ b/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search-view.entity.ts @@ -69,7 +69,9 @@ import { LinkedStatusType } from '../public-search.dto'; 'decision_date."notice_of_intent_uuid" = noi.uuid', ) .where('noi_sub.is_draft = FALSE') - .andWhere('noi.date_received_all_items IS NOT NULL') + .andWhere( + '(noi.date_received_all_items IS NOT NULL AND noi.date_received_all_items <= NOW())', + ) .andWhere( "alcs.get_current_status_for_notice_of_intent_submission_by_uuid(noi_sub.uuid)->>'status_type_code' != 'CNCL'", ), diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1698341356265-add_date_check_regenerate_search_view.ts b/services/apps/alcs/src/providers/typeorm/migrations/1698341356265-add_date_check_regenerate_search_view.ts new file mode 100644 index 0000000000..59e4ac2919 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1698341356265-add_date_check_regenerate_search_view.ts @@ -0,0 +1,89 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class addDateCheckRegenerateSearchView1698341356265 + implements MigrationInterface +{ + name = 'addDateCheckRegenerateSearchView1698341356265'; + + public async up(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, + ['VIEW', 'public_application_submission_search_view', 'alcs'], + ); + await queryRunner.query( + `DROP VIEW "alcs"."public_application_submission_search_view"`, + ); + await queryRunner.query( + `DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, + ['VIEW', 'public_notice_of_intent_submission_search_view', 'alcs'], + ); + await queryRunner.query( + `DROP VIEW "alcs"."public_notice_of_intent_submission_search_view"`, + ); + await queryRunner.query( + `CREATE VIEW "alcs"."public_application_submission_search_view" AS SELECT "app_sub"."uuid" AS "uuid", "app_sub"."applicant" AS "applicant", "app"."uuid" AS "application_uuid", "applicationType"."audit_deleted_date_at" AS "applicationType_audit_deleted_date_at", "applicationType"."audit_created_at" AS "applicationType_audit_created_at", "applicationType"."audit_updated_at" AS "applicationType_audit_updated_at", "applicationType"."audit_created_by" AS "applicationType_audit_created_by", "applicationType"."audit_updated_by" AS "applicationType_audit_updated_by", "applicationType"."label" AS "applicationType_label", "applicationType"."code" AS "applicationType_code", "applicationType"."description" AS "applicationType_description", "applicationType"."short_label" AS "applicationType_short_label", "applicationType"."background_color" AS "applicationType_background_color", "applicationType"."text_color" AS "applicationType_text_color", "applicationType"."html_description" AS "applicationType_html_description", "applicationType"."portal_label" AS "applicationType_portal_label", "localGovernment"."name" AS "local_government_name", "app_sub"."file_number" AS "file_number", "app_sub"."local_government_uuid" AS "local_government_uuid", "app_sub"."type_code" AS "application_type_code", "app"."date_submitted_to_alc" AS "date_submitted_to_alc", "app"."decision_date" AS "decision_date", "app"."region_code" AS "application_region_code", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid") AS "status" FROM "alcs"."application_submission" "app_sub" INNER JOIN "alcs"."application" "app" ON "app"."file_number" = "app_sub"."file_number" AND "app"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."application_type" "applicationType" ON "app_sub"."type_code" = "applicationType"."code" AND "applicationType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "app_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."application_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "app_sub"."uuid" LEFT JOIN (SELECT MAX("date") AS "date", application_uuid AS "application_uuid" FROM "alcs"."application_decision" "decision_date" WHERE "decision_date"."audit_deleted_date_at" IS NULL GROUP BY application_uuid) "decision_date" ON decision_date."application_uuid" = "app"."uuid" WHERE ( "app_sub"."is_draft" = FALSE AND ("app"."date_received_all_items" IS NOT NULL AND "app"."date_received_all_items" <= NOW()) AND alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid")->>'status_type_code' != 'CNCL' ) AND ( "app_sub"."audit_deleted_date_at" IS NULL )`, + ); + await queryRunner.query( + `INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, + [ + 'alcs', + 'VIEW', + 'public_application_submission_search_view', + 'SELECT "app_sub"."uuid" AS "uuid", "app_sub"."applicant" AS "applicant", "app"."uuid" AS "application_uuid", "applicationType"."audit_deleted_date_at" AS "applicationType_audit_deleted_date_at", "applicationType"."audit_created_at" AS "applicationType_audit_created_at", "applicationType"."audit_updated_at" AS "applicationType_audit_updated_at", "applicationType"."audit_created_by" AS "applicationType_audit_created_by", "applicationType"."audit_updated_by" AS "applicationType_audit_updated_by", "applicationType"."label" AS "applicationType_label", "applicationType"."code" AS "applicationType_code", "applicationType"."description" AS "applicationType_description", "applicationType"."short_label" AS "applicationType_short_label", "applicationType"."background_color" AS "applicationType_background_color", "applicationType"."text_color" AS "applicationType_text_color", "applicationType"."html_description" AS "applicationType_html_description", "applicationType"."portal_label" AS "applicationType_portal_label", "localGovernment"."name" AS "local_government_name", "app_sub"."file_number" AS "file_number", "app_sub"."local_government_uuid" AS "local_government_uuid", "app_sub"."type_code" AS "application_type_code", "app"."date_submitted_to_alc" AS "date_submitted_to_alc", "app"."decision_date" AS "decision_date", "app"."region_code" AS "application_region_code", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid") AS "status" FROM "alcs"."application_submission" "app_sub" INNER JOIN "alcs"."application" "app" ON "app"."file_number" = "app_sub"."file_number" AND "app"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."application_type" "applicationType" ON "app_sub"."type_code" = "applicationType"."code" AND "applicationType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "app_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."application_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "app_sub"."uuid" LEFT JOIN (SELECT MAX("date") AS "date", application_uuid AS "application_uuid" FROM "alcs"."application_decision" "decision_date" WHERE "decision_date"."audit_deleted_date_at" IS NULL GROUP BY application_uuid) "decision_date" ON decision_date."application_uuid" = "app"."uuid" WHERE ( "app_sub"."is_draft" = FALSE AND ("app"."date_received_all_items" IS NOT NULL AND "app"."date_received_all_items" <= NOW()) AND alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid")->>\'status_type_code\' != \'CNCL\' ) AND ( "app_sub"."audit_deleted_date_at" IS NULL )', + ], + ); + await queryRunner.query( + `CREATE VIEW "alcs"."public_notice_of_intent_submission_search_view" AS SELECT "noi_sub"."uuid" AS "uuid", "noi_sub"."applicant" AS "applicant", "noi"."uuid" AS "notice_of_intent_uuid", "noticeOfIntentType"."audit_deleted_date_at" AS "noticeOfIntentType_audit_deleted_date_at", "noticeOfIntentType"."audit_created_at" AS "noticeOfIntentType_audit_created_at", "noticeOfIntentType"."audit_updated_at" AS "noticeOfIntentType_audit_updated_at", "noticeOfIntentType"."audit_created_by" AS "noticeOfIntentType_audit_created_by", "noticeOfIntentType"."audit_updated_by" AS "noticeOfIntentType_audit_updated_by", "noticeOfIntentType"."label" AS "noticeOfIntentType_label", "noticeOfIntentType"."code" AS "noticeOfIntentType_code", "noticeOfIntentType"."description" AS "noticeOfIntentType_description", "noticeOfIntentType"."short_label" AS "noticeOfIntentType_short_label", "noticeOfIntentType"."background_color" AS "noticeOfIntentType_background_color", "noticeOfIntentType"."text_color" AS "noticeOfIntentType_text_color", "noticeOfIntentType"."html_description" AS "noticeOfIntentType_html_description", "noticeOfIntentType"."portal_label" AS "noticeOfIntentType_portal_label", "localGovernment"."name" AS "local_government_name", "noi_sub"."file_number" AS "file_number", "noi_sub"."local_government_uuid" AS "local_government_uuid", "noi_sub"."type_code" AS "notice_of_intent_type_code", "noi"."date_submitted_to_alc" AS "date_submitted_to_alc", "noi"."decision_date" AS "decision_date", "noi"."region_code" AS "notice_of_intent_region_code", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid") AS "status" FROM "alcs"."notice_of_intent_submission" "noi_sub" INNER JOIN "alcs"."notice_of_intent" "noi" ON "noi"."file_number" = "noi_sub"."file_number" AND "noi"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."notice_of_intent_type" "noticeOfIntentType" ON "noi_sub"."type_code" = "noticeOfIntentType"."code" AND "noticeOfIntentType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "noi_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."notice_of_intent_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "noi_sub"."uuid" LEFT JOIN (SELECT MAX("date") AS "date", notice_of_intent_uuid AS "notice_of_intent_uuid" FROM "alcs"."notice_of_intent_decision" "decision_date" WHERE "decision_date"."audit_deleted_date_at" IS NULL GROUP BY notice_of_intent_uuid) "decision_date" ON decision_date."notice_of_intent_uuid" = "noi"."uuid" WHERE ( "noi_sub"."is_draft" = FALSE AND ("noi"."date_received_all_items" IS NOT NULL AND "noi"."date_received_all_items" <= NOW()) AND alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid")->>'status_type_code' != 'CNCL' ) AND ( "noi_sub"."audit_deleted_date_at" IS NULL )`, + ); + await queryRunner.query( + `INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, + [ + 'alcs', + 'VIEW', + 'public_notice_of_intent_submission_search_view', + 'SELECT "noi_sub"."uuid" AS "uuid", "noi_sub"."applicant" AS "applicant", "noi"."uuid" AS "notice_of_intent_uuid", "noticeOfIntentType"."audit_deleted_date_at" AS "noticeOfIntentType_audit_deleted_date_at", "noticeOfIntentType"."audit_created_at" AS "noticeOfIntentType_audit_created_at", "noticeOfIntentType"."audit_updated_at" AS "noticeOfIntentType_audit_updated_at", "noticeOfIntentType"."audit_created_by" AS "noticeOfIntentType_audit_created_by", "noticeOfIntentType"."audit_updated_by" AS "noticeOfIntentType_audit_updated_by", "noticeOfIntentType"."label" AS "noticeOfIntentType_label", "noticeOfIntentType"."code" AS "noticeOfIntentType_code", "noticeOfIntentType"."description" AS "noticeOfIntentType_description", "noticeOfIntentType"."short_label" AS "noticeOfIntentType_short_label", "noticeOfIntentType"."background_color" AS "noticeOfIntentType_background_color", "noticeOfIntentType"."text_color" AS "noticeOfIntentType_text_color", "noticeOfIntentType"."html_description" AS "noticeOfIntentType_html_description", "noticeOfIntentType"."portal_label" AS "noticeOfIntentType_portal_label", "localGovernment"."name" AS "local_government_name", "noi_sub"."file_number" AS "file_number", "noi_sub"."local_government_uuid" AS "local_government_uuid", "noi_sub"."type_code" AS "notice_of_intent_type_code", "noi"."date_submitted_to_alc" AS "date_submitted_to_alc", "noi"."decision_date" AS "decision_date", "noi"."region_code" AS "notice_of_intent_region_code", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid") AS "status" FROM "alcs"."notice_of_intent_submission" "noi_sub" INNER JOIN "alcs"."notice_of_intent" "noi" ON "noi"."file_number" = "noi_sub"."file_number" AND "noi"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."notice_of_intent_type" "noticeOfIntentType" ON "noi_sub"."type_code" = "noticeOfIntentType"."code" AND "noticeOfIntentType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "noi_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."notice_of_intent_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "noi_sub"."uuid" LEFT JOIN (SELECT MAX("date") AS "date", notice_of_intent_uuid AS "notice_of_intent_uuid" FROM "alcs"."notice_of_intent_decision" "decision_date" WHERE "decision_date"."audit_deleted_date_at" IS NULL GROUP BY notice_of_intent_uuid) "decision_date" ON decision_date."notice_of_intent_uuid" = "noi"."uuid" WHERE ( "noi_sub"."is_draft" = FALSE AND ("noi"."date_received_all_items" IS NOT NULL AND "noi"."date_received_all_items" <= NOW()) AND alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid")->>\'status_type_code\' != \'CNCL\' ) AND ( "noi_sub"."audit_deleted_date_at" IS NULL )', + ], + ); + } + + public async down(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, + ['VIEW', 'public_notice_of_intent_submission_search_view', 'alcs'], + ); + await queryRunner.query( + `DROP VIEW "alcs"."public_notice_of_intent_submission_search_view"`, + ); + await queryRunner.query( + `DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, + ['VIEW', 'public_application_submission_search_view', 'alcs'], + ); + await queryRunner.query( + `DROP VIEW "alcs"."public_application_submission_search_view"`, + ); + await queryRunner.query( + `CREATE VIEW "alcs"."public_notice_of_intent_submission_search_view" AS SELECT "noi_sub"."uuid" AS "uuid", "noi_sub"."applicant" AS "applicant", "noi"."uuid" AS "notice_of_intent_uuid", "noticeOfIntentType"."audit_deleted_date_at" AS "noticeOfIntentType_audit_deleted_date_at", "noticeOfIntentType"."audit_created_at" AS "noticeOfIntentType_audit_created_at", "noticeOfIntentType"."audit_updated_at" AS "noticeOfIntentType_audit_updated_at", "noticeOfIntentType"."audit_created_by" AS "noticeOfIntentType_audit_created_by", "noticeOfIntentType"."audit_updated_by" AS "noticeOfIntentType_audit_updated_by", "noticeOfIntentType"."label" AS "noticeOfIntentType_label", "noticeOfIntentType"."code" AS "noticeOfIntentType_code", "noticeOfIntentType"."description" AS "noticeOfIntentType_description", "noticeOfIntentType"."short_label" AS "noticeOfIntentType_short_label", "noticeOfIntentType"."background_color" AS "noticeOfIntentType_background_color", "noticeOfIntentType"."text_color" AS "noticeOfIntentType_text_color", "noticeOfIntentType"."html_description" AS "noticeOfIntentType_html_description", "noticeOfIntentType"."portal_label" AS "noticeOfIntentType_portal_label", "localGovernment"."name" AS "local_government_name", "noi_sub"."file_number" AS "file_number", "noi_sub"."local_government_uuid" AS "local_government_uuid", "noi_sub"."type_code" AS "notice_of_intent_type_code", "noi"."date_submitted_to_alc" AS "date_submitted_to_alc", "noi"."decision_date" AS "decision_date", "noi"."region_code" AS "notice_of_intent_region_code", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid") AS "status" FROM "alcs"."notice_of_intent_submission" "noi_sub" INNER JOIN "alcs"."notice_of_intent" "noi" ON "noi"."file_number" = "noi_sub"."file_number" AND "noi"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."notice_of_intent_type" "noticeOfIntentType" ON "noi_sub"."type_code" = "noticeOfIntentType"."code" AND "noticeOfIntentType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "noi_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."notice_of_intent_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "noi_sub"."uuid" LEFT JOIN (SELECT MAX("date") AS "date", notice_of_intent_uuid AS "notice_of_intent_uuid" FROM "alcs"."notice_of_intent_decision" "decision_date" WHERE "decision_date"."audit_deleted_date_at" IS NULL GROUP BY notice_of_intent_uuid) "decision_date" ON decision_date."notice_of_intent_uuid" = "noi"."uuid" WHERE ( "noi_sub"."is_draft" = FALSE AND "noi"."date_received_all_items" IS NOT NULL AND alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid")->>'status_type_code' != 'CNCL' ) AND ( "noi_sub"."audit_deleted_date_at" IS NULL )`, + ); + await queryRunner.query( + `INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, + [ + 'alcs', + 'VIEW', + 'public_notice_of_intent_submission_search_view', + 'SELECT "noi_sub"."uuid" AS "uuid", "noi_sub"."applicant" AS "applicant", "noi"."uuid" AS "notice_of_intent_uuid", "noticeOfIntentType"."audit_deleted_date_at" AS "noticeOfIntentType_audit_deleted_date_at", "noticeOfIntentType"."audit_created_at" AS "noticeOfIntentType_audit_created_at", "noticeOfIntentType"."audit_updated_at" AS "noticeOfIntentType_audit_updated_at", "noticeOfIntentType"."audit_created_by" AS "noticeOfIntentType_audit_created_by", "noticeOfIntentType"."audit_updated_by" AS "noticeOfIntentType_audit_updated_by", "noticeOfIntentType"."label" AS "noticeOfIntentType_label", "noticeOfIntentType"."code" AS "noticeOfIntentType_code", "noticeOfIntentType"."description" AS "noticeOfIntentType_description", "noticeOfIntentType"."short_label" AS "noticeOfIntentType_short_label", "noticeOfIntentType"."background_color" AS "noticeOfIntentType_background_color", "noticeOfIntentType"."text_color" AS "noticeOfIntentType_text_color", "noticeOfIntentType"."html_description" AS "noticeOfIntentType_html_description", "noticeOfIntentType"."portal_label" AS "noticeOfIntentType_portal_label", "localGovernment"."name" AS "local_government_name", "noi_sub"."file_number" AS "file_number", "noi_sub"."local_government_uuid" AS "local_government_uuid", "noi_sub"."type_code" AS "notice_of_intent_type_code", "noi"."date_submitted_to_alc" AS "date_submitted_to_alc", "noi"."decision_date" AS "decision_date", "noi"."region_code" AS "notice_of_intent_region_code", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid") AS "status" FROM "alcs"."notice_of_intent_submission" "noi_sub" INNER JOIN "alcs"."notice_of_intent" "noi" ON "noi"."file_number" = "noi_sub"."file_number" AND "noi"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."notice_of_intent_type" "noticeOfIntentType" ON "noi_sub"."type_code" = "noticeOfIntentType"."code" AND "noticeOfIntentType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "noi_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."notice_of_intent_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "noi_sub"."uuid" LEFT JOIN (SELECT MAX("date") AS "date", notice_of_intent_uuid AS "notice_of_intent_uuid" FROM "alcs"."notice_of_intent_decision" "decision_date" WHERE "decision_date"."audit_deleted_date_at" IS NULL GROUP BY notice_of_intent_uuid) "decision_date" ON decision_date."notice_of_intent_uuid" = "noi"."uuid" WHERE ( "noi_sub"."is_draft" = FALSE AND "noi"."date_received_all_items" IS NOT NULL AND alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid")->>\'status_type_code\' != \'CNCL\' ) AND ( "noi_sub"."audit_deleted_date_at" IS NULL )', + ], + ); + await queryRunner.query( + `CREATE VIEW "alcs"."public_application_submission_search_view" AS SELECT "app_sub"."uuid" AS "uuid", "app_sub"."applicant" AS "applicant", "app"."uuid" AS "application_uuid", "applicationType"."audit_deleted_date_at" AS "applicationType_audit_deleted_date_at", "applicationType"."audit_created_at" AS "applicationType_audit_created_at", "applicationType"."audit_updated_at" AS "applicationType_audit_updated_at", "applicationType"."audit_created_by" AS "applicationType_audit_created_by", "applicationType"."audit_updated_by" AS "applicationType_audit_updated_by", "applicationType"."label" AS "applicationType_label", "applicationType"."code" AS "applicationType_code", "applicationType"."description" AS "applicationType_description", "applicationType"."short_label" AS "applicationType_short_label", "applicationType"."background_color" AS "applicationType_background_color", "applicationType"."text_color" AS "applicationType_text_color", "applicationType"."html_description" AS "applicationType_html_description", "applicationType"."portal_label" AS "applicationType_portal_label", "localGovernment"."name" AS "local_government_name", "app_sub"."file_number" AS "file_number", "app_sub"."local_government_uuid" AS "local_government_uuid", "app_sub"."type_code" AS "application_type_code", "app"."date_submitted_to_alc" AS "date_submitted_to_alc", "app"."decision_date" AS "decision_date", "app"."region_code" AS "application_region_code", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid") AS "status" FROM "alcs"."application_submission" "app_sub" INNER JOIN "alcs"."application" "app" ON "app"."file_number" = "app_sub"."file_number" AND "app"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."application_type" "applicationType" ON "app_sub"."type_code" = "applicationType"."code" AND "applicationType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "app_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."application_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "app_sub"."uuid" LEFT JOIN (SELECT MAX("date") AS "date", application_uuid AS "application_uuid" FROM "alcs"."application_decision" "decision_date" WHERE "decision_date"."audit_deleted_date_at" IS NULL GROUP BY application_uuid) "decision_date" ON decision_date."application_uuid" = "app"."uuid" WHERE ( "app_sub"."is_draft" = FALSE AND "app"."date_received_all_items" IS NOT NULL AND alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid")->>'status_type_code' != 'CNCL' ) AND ( "app_sub"."audit_deleted_date_at" IS NULL )`, + ); + await queryRunner.query( + `INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, + [ + 'alcs', + 'VIEW', + 'public_application_submission_search_view', + 'SELECT "app_sub"."uuid" AS "uuid", "app_sub"."applicant" AS "applicant", "app"."uuid" AS "application_uuid", "applicationType"."audit_deleted_date_at" AS "applicationType_audit_deleted_date_at", "applicationType"."audit_created_at" AS "applicationType_audit_created_at", "applicationType"."audit_updated_at" AS "applicationType_audit_updated_at", "applicationType"."audit_created_by" AS "applicationType_audit_created_by", "applicationType"."audit_updated_by" AS "applicationType_audit_updated_by", "applicationType"."label" AS "applicationType_label", "applicationType"."code" AS "applicationType_code", "applicationType"."description" AS "applicationType_description", "applicationType"."short_label" AS "applicationType_short_label", "applicationType"."background_color" AS "applicationType_background_color", "applicationType"."text_color" AS "applicationType_text_color", "applicationType"."html_description" AS "applicationType_html_description", "applicationType"."portal_label" AS "applicationType_portal_label", "localGovernment"."name" AS "local_government_name", "app_sub"."file_number" AS "file_number", "app_sub"."local_government_uuid" AS "local_government_uuid", "app_sub"."type_code" AS "application_type_code", "app"."date_submitted_to_alc" AS "date_submitted_to_alc", "app"."decision_date" AS "decision_date", "app"."region_code" AS "application_region_code", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid") AS "status" FROM "alcs"."application_submission" "app_sub" INNER JOIN "alcs"."application" "app" ON "app"."file_number" = "app_sub"."file_number" AND "app"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."application_type" "applicationType" ON "app_sub"."type_code" = "applicationType"."code" AND "applicationType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "app_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."application_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "app_sub"."uuid" LEFT JOIN (SELECT MAX("date") AS "date", application_uuid AS "application_uuid" FROM "alcs"."application_decision" "decision_date" WHERE "decision_date"."audit_deleted_date_at" IS NULL GROUP BY application_uuid) "decision_date" ON decision_date."application_uuid" = "app"."uuid" WHERE ( "app_sub"."is_draft" = FALSE AND "app"."date_received_all_items" IS NOT NULL AND alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid")->>\'status_type_code\' != \'CNCL\' ) AND ( "app_sub"."audit_deleted_date_at" IS NULL )', + ], + ); + } +} From cd4fb6a0e6903b9aa0d747f4d44c76ad1c75606b Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Thu, 26 Oct 2023 10:49:07 -0700 Subject: [PATCH 562/954] Code Review Feedback --- .../application-submission/application-submission.service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.service.ts b/services/apps/alcs/src/portal/application-submission/application-submission.service.ts index 0eef2259db..9d29a6470d 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.service.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.service.ts @@ -648,7 +648,7 @@ export class ApplicationSubmissionService { SUBMISSION_STATUS.SUBMITTED_TO_LG, SUBMISSION_STATUS.IN_REVIEW_BY_LG, ].includes(application.status.statusTypeCode as SUBMISSION_STATUS) && - userGovernment && + !!userGovernment && userGovernment.uuid === application.localGovernmentUuid, }; } From f805150f26a506e38deb2df805c62e67416b17cd Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Thu, 26 Oct 2023 11:44:56 -0700 Subject: [PATCH 563/954] Add Portal Order and Covenants to App Types * Add new covenant type with description * Add portalOrder to set the sorting of the app types in the front end dialog * Update HTML Description for Applications to include Covenants --- .../create-submission-dialog.component.ts | 2 +- .../src/app/services/code/code.dto.ts | 1 + .../alcs/application/application.service.ts | 1 + .../application-type/application-type.dto.ts | 3 + .../application-type.entity.ts | 4 ++ .../1698344015968-add_covenant_app_type.ts | 24 ++++++++ .../1698345181441-add_portal_type_order.ts | 60 +++++++++++++++++++ 7 files changed, 94 insertions(+), 1 deletion(-) create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1698344015968-add_covenant_app_type.ts create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1698345181441-add_portal_type_order.ts diff --git a/portal-frontend/src/app/features/create-submission-dialog/create-submission-dialog.component.ts b/portal-frontend/src/app/features/create-submission-dialog/create-submission-dialog.component.ts index 1ff7a17e9e..17a1cd3073 100644 --- a/portal-frontend/src/app/features/create-submission-dialog/create-submission-dialog.component.ts +++ b/portal-frontend/src/app/features/create-submission-dialog/create-submission-dialog.component.ts @@ -62,7 +62,7 @@ export class CreateSubmissionDialogComponent implements OnInit, AfterViewChecked const codes = await this.codeService.loadCodes(); this.applicationTypes = codes.applicationTypes .filter((type) => !!type.portalLabel) - .sort((a, b) => (a.portalLabel > b.portalLabel ? 1 : -1)); + .sort((a, b) => a.portalOrder - b.portalOrder); this.submissionTypes = codes.submissionTypes.sort((a, b) => (a.code > b.code ? 1 : -1)); this.noticeOfIntentTypes = codes.noticeOfIntentTypes.sort((a, b) => (a.portalLabel > b.portalLabel ? 1 : -1)); } diff --git a/portal-frontend/src/app/services/code/code.dto.ts b/portal-frontend/src/app/services/code/code.dto.ts index e4389ea4f5..1bcb551b6a 100644 --- a/portal-frontend/src/app/services/code/code.dto.ts +++ b/portal-frontend/src/app/services/code/code.dto.ts @@ -18,6 +18,7 @@ export interface ApplicationTypeDto { code: string; portalLabel: string; htmlDescription: string; + portalOrder: number; } export interface NoticeOfIntentTypeDto { diff --git a/services/apps/alcs/src/alcs/application/application.service.ts b/services/apps/alcs/src/alcs/application/application.service.ts index d805b3bebb..c050685b20 100644 --- a/services/apps/alcs/src/alcs/application/application.service.ts +++ b/services/apps/alcs/src/alcs/application/application.service.ts @@ -418,6 +418,7 @@ export class ApplicationService { htmlDescription: true, label: true, requiresGovernmentReview: true, + portalOrder: true, }, }); } diff --git a/services/apps/alcs/src/alcs/code/application-code/application-type/application-type.dto.ts b/services/apps/alcs/src/alcs/code/application-code/application-type/application-type.dto.ts index 344874848a..18f8168a71 100644 --- a/services/apps/alcs/src/alcs/code/application-code/application-type/application-type.dto.ts +++ b/services/apps/alcs/src/alcs/code/application-code/application-type/application-type.dto.ts @@ -13,4 +13,7 @@ export class ApplicationTypeDto extends BaseCodeDto { @AutoMap() requiresGovernmentReview: boolean; + + @AutoMap() + portalOrder: number; } diff --git a/services/apps/alcs/src/alcs/code/application-code/application-type/application-type.entity.ts b/services/apps/alcs/src/alcs/code/application-code/application-type/application-type.entity.ts index 58d9a9c1a9..92e31c05da 100644 --- a/services/apps/alcs/src/alcs/code/application-code/application-type/application-type.entity.ts +++ b/services/apps/alcs/src/alcs/code/application-code/application-type/application-type.entity.ts @@ -31,6 +31,10 @@ export class ApplicationType extends BaseCodeEntity { @Column({ type: 'text', default: '' }) portalLabel: string; + @AutoMap() + @Column({ type: 'int4' }) + portalOrder: number; + @AutoMap() @Column({ default: true }) requiresGovernmentReview: boolean; diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1698344015968-add_covenant_app_type.ts b/services/apps/alcs/src/providers/typeorm/migrations/1698344015968-add_covenant_app_type.ts new file mode 100644 index 0000000000..28a375c817 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1698344015968-add_covenant_app_type.ts @@ -0,0 +1,24 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class addCovenantAppType1698344015968 implements MigrationInterface { + public async up(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query(` + INSERT INTO "alcs"."application_type" + ("audit_deleted_date_at", "audit_created_at", "audit_updated_at", "audit_created_by", "audit_updated_by", "label", "code", "description", "short_label", "background_color", "text_color", "html_description", "portal_label", "requires_government_review") VALUES + (NULL, NOW(), NULL, 'migration_seed', NULL, 'Restrictive Covenant', 'COVE', 'Restrictive Covenants', 'COV', '#c12bdb', '#fff', + 'Choose this option if you are proposing one of the following uses on ALR land that restricts or prohibits the use of agricultural land for farm purposes under + <a target="_blank" href="https://www.bclaws.gov.bc.ca/civix/document/id/complete/statreg/02036_01#section22">Section 22(2) of the Agricultural Land Commission Act.</a><br /><br /> + Including but not limited to: + <ul> + <li>placing a covenant for ecological / habitat conservation;</li> + </ul><br /> + To remove a restrictive covenant from land in the ALR or to satisfy a covenant condition of a previous ALC approval, please contact an ALC Land Use Planner in your region: + <a target="_blank" href="https://www.alc.gov.bc.ca/contact/">Contact Us</a> + ', 'Register a Restrictive Covenant within the ALR', 'f'); + `); + } + + public async down(): Promise<void> { + //No + } +} diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1698345181441-add_portal_type_order.ts b/services/apps/alcs/src/providers/typeorm/migrations/1698345181441-add_portal_type_order.ts new file mode 100644 index 0000000000..3e9218286b --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1698345181441-add_portal_type_order.ts @@ -0,0 +1,60 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class addPortalTypeOrder1698345181441 implements MigrationInterface { + name = 'addPortalTypeOrder1698345181441'; + + public async up(queryRunner: QueryRunner): Promise<void> { + //Add Order + await queryRunner.query( + `ALTER TABLE "alcs"."application_type" ADD "portal_order" integer`, + ); + + //Populate Order + await queryRunner.query( + `UPDATE "alcs"."application_type" SET "portal_order" = '0' WHERE "code" = 'INCL';`, + ); + await queryRunner.query( + `UPDATE "alcs"."application_type" SET "portal_order" = '1' WHERE "code" = 'NARU';`, + ); + await queryRunner.query( + `UPDATE "alcs"."application_type" SET "portal_order" = '2' WHERE "code" = 'POFO';`, + ); + await queryRunner.query( + `UPDATE "alcs"."application_type" SET "portal_order" = '3' WHERE "code" = 'PFRS';`, + ); + await queryRunner.query( + `UPDATE "alcs"."application_type" SET "portal_order" = '4' WHERE "code" = 'ROSO';`, + ); + await queryRunner.query( + `UPDATE "alcs"."application_type" SET "portal_order" = '5' WHERE "code" = 'NFUP';`, + ); + await queryRunner.query( + `UPDATE "alcs"."application_type" SET "portal_order" = '6' WHERE "code" = 'SUBD';`, + ); + await queryRunner.query( + `UPDATE "alcs"."application_type" SET "portal_order" = '7' WHERE "code" = 'TURP';`, + ); + await queryRunner.query( + `UPDATE "alcs"."application_type" SET "portal_order" = '8' WHERE "code" = 'EXCL';`, + ); + await queryRunner.query( + `UPDATE "alcs"."application_type" SET "portal_order" = '9' WHERE "code" = 'COVE';`, + ); + + //Make Not Nullable + await queryRunner.query(` + ALTER TABLE "alcs"."application_type" ALTER COLUMN "portal_order" SET NOT NULL; + `); + + //Update Description + await queryRunner.query(` + UPDATE "alcs"."card_type" SET "portal_html_description" = 'Create an <a target="_blank" href="https://www.alc.gov.bc.ca/application-and-notice-process/applications/">Application</a> if you are proposing to exclude, include, subdivide, conduct a non-farm use activity, conduct a non-adhering residential use, conduct a transportation/utility/recreational trail use, or conduct a soil or fill use, or register a restrictive covenant. Non-adhering residential use applications have a fee of $750. All other applications have a fee of $1,500 fee, except for inclusion of land and registering a restrictive covenant (no fee). Application fees are split equally between the local government and the ALC.' WHERE "code" = 'APP'; + `); + } + + public async down(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `ALTER TABLE "alcs"."application_type" DROP COLUMN "portal_order"`, + ); + } +} From 040cec9bf641bdea0ff256d413a64007c8b3337b Mon Sep 17 00:00:00 2001 From: "to. sandra" <76515860+sandratoh@users.noreply.github.com> Date: Fri, 27 Oct 2023 14:18:15 -0700 Subject: [PATCH 564/954] Change toggle button to full width (#1106) --- .../proposal/subd-proposal/subd-proposal.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.html index a254403170..4cab25c489 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.html @@ -231,7 +231,7 @@ <h6>Documents needed for this step:</h6> <app-info-banner >Please refer to the <a class="subtext">FIXME: Subdivision</a> page on the ALC website for more information </app-info-banner> - <mat-button-toggle-group id="home-site-severance" formControlName="isHomeSiteSeverance"> + <mat-button-toggle-group id="home-site-severance" formControlName="isHomeSiteSeverance" class="input"> <mat-button-toggle class="toggle-button" [ngClass]="{ From 8ad839deeee8d2afe110a611c07f428707542156 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Mon, 30 Oct 2023 09:51:26 -0700 Subject: [PATCH 565/954] Add Covenant Proposal Step * Add Covenant Transferees * Add the other stuff --- .../application-details.component.html | 8 + .../application-details.module.ts | 2 + .../cove-details/cove-details.component.html | 76 ++++++ .../cove-details/cove-details.component.scss | 12 + .../cove-details.component.spec.ts | 43 ++++ .../cove-details/cove-details.component.ts | 65 +++++ .../edit-submission-base.module.ts | 6 + .../edit-submission.component.html | 8 + .../edit-submission.component.ts | 5 + .../cove-proposal.component.html | 226 ++++++++++++++++++ .../cove-proposal.component.scss | 39 +++ .../cove-proposal.component.spec.ts | 63 +++++ .../cove-proposal/cove-proposal.component.ts | 169 +++++++++++++ .../transferee-dialog.component.html | 88 +++++++ .../transferee-dialog.component.scss | 19 ++ .../transferee-dialog.component.spec.ts | 47 ++++ .../transferee-dialog.component.ts | 114 +++++++++ .../application-submission.dto.ts | 11 + .../covenant-transferee.dto.ts | 35 +++ .../covenant-transferee.service.spec.ts | 135 +++++++++++ .../covenant-transferee.service.ts | 77 ++++++ ...plication-submission.automapper.profile.ts | 14 ++ .../application-submission.dto.ts | 27 +++ .../application-submission.entity.ts | 27 +++ .../application-submission.module.ts | 6 + .../application-submission.service.ts | 19 ++ .../covenant-transferee.controller.spec.ts | 192 +++++++++++++++ .../covenant-transferee.controller.ts | 143 +++++++++++ .../covenant-transferee.dto.ts | 63 +++++ .../covenant-transferee.entity.ts | 61 +++++ .../covenant-transferee.service.spec.ts | 145 +++++++++++ .../covenant-transferee.service.ts | 130 ++++++++++ ...53808690-add_covenant_submission_fields.ts | 47 ++++ 33 files changed, 2122 insertions(+) create mode 100644 portal-frontend/src/app/features/applications/application-details/cove-details/cove-details.component.html create mode 100644 portal-frontend/src/app/features/applications/application-details/cove-details/cove-details.component.scss create mode 100644 portal-frontend/src/app/features/applications/application-details/cove-details/cove-details.component.spec.ts create mode 100644 portal-frontend/src/app/features/applications/application-details/cove-details/cove-details.component.ts create mode 100644 portal-frontend/src/app/features/applications/edit-submission/proposal/cove-proposal/cove-proposal.component.html create mode 100644 portal-frontend/src/app/features/applications/edit-submission/proposal/cove-proposal/cove-proposal.component.scss create mode 100644 portal-frontend/src/app/features/applications/edit-submission/proposal/cove-proposal/cove-proposal.component.spec.ts create mode 100644 portal-frontend/src/app/features/applications/edit-submission/proposal/cove-proposal/cove-proposal.component.ts create mode 100644 portal-frontend/src/app/features/applications/edit-submission/proposal/cove-proposal/transferee-dialog/transferee-dialog.component.html create mode 100644 portal-frontend/src/app/features/applications/edit-submission/proposal/cove-proposal/transferee-dialog/transferee-dialog.component.scss create mode 100644 portal-frontend/src/app/features/applications/edit-submission/proposal/cove-proposal/transferee-dialog/transferee-dialog.component.spec.ts create mode 100644 portal-frontend/src/app/features/applications/edit-submission/proposal/cove-proposal/transferee-dialog/transferee-dialog.component.ts create mode 100644 portal-frontend/src/app/services/covenant-transferee/covenant-transferee.dto.ts create mode 100644 portal-frontend/src/app/services/covenant-transferee/covenant-transferee.service.spec.ts create mode 100644 portal-frontend/src/app/services/covenant-transferee/covenant-transferee.service.ts create mode 100644 services/apps/alcs/src/portal/application-submission/covenant-transferee/covenant-transferee.controller.spec.ts create mode 100644 services/apps/alcs/src/portal/application-submission/covenant-transferee/covenant-transferee.controller.ts create mode 100644 services/apps/alcs/src/portal/application-submission/covenant-transferee/covenant-transferee.dto.ts create mode 100644 services/apps/alcs/src/portal/application-submission/covenant-transferee/covenant-transferee.entity.ts create mode 100644 services/apps/alcs/src/portal/application-submission/covenant-transferee/covenant-transferee.service.spec.ts create mode 100644 services/apps/alcs/src/portal/application-submission/covenant-transferee/covenant-transferee.service.ts create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1698353808690-add_covenant_submission_fields.ts diff --git a/portal-frontend/src/app/features/applications/application-details/application-details.component.html b/portal-frontend/src/app/features/applications/application-details/application-details.component.html index b9bffd06cd..8b4402e4e6 100644 --- a/portal-frontend/src/app/features/applications/application-details/application-details.component.html +++ b/portal-frontend/src/app/features/applications/application-details/application-details.component.html @@ -279,6 +279,14 @@ <h3>6. Proposal</h3> [applicationSubmission]="applicationSubmission" [applicationDocuments]="appDocuments" ></app-incl-details> + <app-cove-details + *ngIf="applicationSubmission.typeCode === 'COVE'" + [showErrors]="showErrors" + [showEdit]="showEdit" + [draftMode]="draftMode" + [applicationSubmission]="applicationSubmission" + [applicationDocuments]="appDocuments" + ></app-cove-details> </section> <section> <h3>7. Optional Documents</h3> diff --git a/portal-frontend/src/app/features/applications/application-details/application-details.module.ts b/portal-frontend/src/app/features/applications/application-details/application-details.module.ts index d7eac27fe1..8e69fe8b3f 100644 --- a/portal-frontend/src/app/features/applications/application-details/application-details.module.ts +++ b/portal-frontend/src/app/features/applications/application-details/application-details.module.ts @@ -3,6 +3,7 @@ import { NgModule } from '@angular/core'; import { NgxMaskPipe } from 'ngx-mask'; import { SharedModule } from '../../../shared/shared.module'; import { ApplicationDetailsComponent } from './application-details.component'; +import { CoveDetailsComponent } from './cove-details/cove-details.component'; import { InclDetailsComponent } from './incl-details/incl-details.component'; import { NaruDetailsComponent } from './naru-details/naru-details.component'; import { NfuDetailsComponent } from './nfu-details/nfu-details.component'; @@ -27,6 +28,7 @@ import { ExclDetailsComponent } from './excl-details/excl-details.component'; NaruDetailsComponent, ExclDetailsComponent, InclDetailsComponent, + CoveDetailsComponent, ], imports: [CommonModule, SharedModule, NgxMaskPipe], exports: [ApplicationDetailsComponent], diff --git a/portal-frontend/src/app/features/applications/application-details/cove-details/cove-details.component.html b/portal-frontend/src/app/features/applications/application-details/cove-details/cove-details.component.html new file mode 100644 index 0000000000..729c1af3ae --- /dev/null +++ b/portal-frontend/src/app/features/applications/application-details/cove-details/cove-details.component.html @@ -0,0 +1,76 @@ +<div *ngIf="_applicationSubmission" class="review-table"> + <div class="subheading2 full-width">Provide the name and contact information for all transferees</div> + <div class="full-width transferee-table"> + <div class="subheading2">Type</div> + <div class="subheading2">Full Name</div> + <div class="subheading2">Organization Name</div> + <div class="subheading2">Phone</div> + <div class="subheading2">Email</div> + <ng-container *ngFor="let transferee of transferees"> + <div>{{ transferee.type.code === 'INDV' ? 'Individual' : 'Organization' }}</div> + <div>{{ transferee.displayName }}</div> + <div> + {{ transferee.organizationName }} + <app-no-data [showRequired]="false" *ngIf="!transferee.organizationName"></app-no-data> + </div> + <div> + <span *ngIf="transferee.phoneNumber">{{ transferee.phoneNumber | mask : '(000) 000-0000' }}</span> + </div> + <div>{{ transferee.email }}</div> + </ng-container> + </div> + <app-no-data class="full-width" [showRequired]="showErrors" *ngIf="transferees.length === 0"></app-no-data> + + <div class="subheading2 grid-1">How many hectares will the covenant impact?</div> + <div class="grid-double"> + {{ _applicationSubmission.coveAreaImpacted }}<span *ngIf="_applicationSubmission.coveAreaImpacted"> ha</span> + <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.coveAreaImpacted"></app-no-data> + </div> + + <div class="subheading2 grid-1">What is the purpose of this covenant?</div> + <div class="grid-double"> + {{ _applicationSubmission.purpose }} + <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.purpose"></app-no-data> + </div> + + <div class="subheading2 grid-1">Explain how the covenant impacts the use of agricultural land for farm purposes.</div> + <div class="grid-double"> + <span *ngIf="_applicationSubmission.coveFarmImpact !== null"> + {{ _applicationSubmission.coveFarmImpact }} + </span> + <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.coveFarmImpact"></app-no-data> + </div> + + <div class="subheading2 grid-1">Proposal Map / Site Plan</div> + <div class="grid-double"> + <a *ngFor="let map of proposalMap" (click)="openFile(map.uuid)"> + {{ map.fileName }} + </a> + <app-no-data [showRequired]="showErrors" *ngIf="proposalMap.length === 0"></app-no-data> + </div> + + <div class="subheading2 grid-1">Do you have a draft copy of the covenant?</div> + <div class="grid-double"> + <span *ngIf="_applicationSubmission.coveHasDraft !== null"> + {{ _applicationSubmission.coveHasDraft ? 'Yes' : 'No' }} + </span> + <app-no-data [showRequired]="showErrors" *ngIf="_applicationSubmission.coveHasDraft === null"></app-no-data> + </div> + + <div class="subheading2 grid-1">Draft Covenant</div> + <div class="grid-double"> + <div *ngFor="let file of srwTerms"> + <a (click)="openFile(file.uuid)"> + {{ file.fileName }} + </a> + </div> + <app-no-data + [showRequired]="showErrors && !!_applicationSubmission.coveHasDraft" + *ngIf="srwTerms.length === 0" + ></app-no-data> + </div> + + <div *ngIf="showEdit" class="edit-button"> + <button mat-flat-button (click)="onEditSection(5)" color="accent">Edit Section</button> + </div> +</div> diff --git a/portal-frontend/src/app/features/applications/application-details/cove-details/cove-details.component.scss b/portal-frontend/src/app/features/applications/application-details/cove-details/cove-details.component.scss new file mode 100644 index 0000000000..447d17d081 --- /dev/null +++ b/portal-frontend/src/app/features/applications/application-details/cove-details/cove-details.component.scss @@ -0,0 +1,12 @@ +@use '../../../../../styles/functions' as *; +@use '../../../../../styles/colors'; + +.transferee-table { + display: grid; + grid-template-columns: minmax(max-content, 1fr) minmax(max-content, 1fr) minmax(max-content, 1fr) minmax(max-content, 1fr) minmax(max-content, 1fr); + overflow-x: auto; + grid-column-gap: rem(36); + grid-row-gap: rem(12); + overflow: unset; + margin-bottom: rem(12); +} diff --git a/portal-frontend/src/app/features/applications/application-details/cove-details/cove-details.component.spec.ts b/portal-frontend/src/app/features/applications/application-details/cove-details/cove-details.component.spec.ts new file mode 100644 index 0000000000..4fbcec7bc9 --- /dev/null +++ b/portal-frontend/src/app/features/applications/application-details/cove-details/cove-details.component.spec.ts @@ -0,0 +1,43 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { DeepMocked } from '@golevelup/ts-jest'; +import { CovenantTransfereeService } from '../../../../services/covenant-transferee/covenant-transferee.service'; + +import { CoveDetailsComponent } from './cove-details.component'; +import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; +import { ApplicationParcelService } from '../../../../services/application-parcel/application-parcel.service'; + +describe('CoveDetailsComponent', () => { + let component: CoveDetailsComponent; + let fixture: ComponentFixture<CoveDetailsComponent>; + let mockAppDocumentService: DeepMocked<ApplicationDocumentService>; + let mockAppParcelService: DeepMocked<ApplicationParcelService>; + let mockTransfereeService: DeepMocked<CovenantTransfereeService>; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [CoveDetailsComponent], + providers: [ + { + provide: ApplicationDocumentService, + useValue: mockAppDocumentService, + }, + { + provide: ApplicationParcelService, + useValue: mockAppParcelService, + }, + { + provide: CovenantTransfereeService, + useValue: mockTransfereeService, + }, + ], + }).compileComponents(); + + fixture = TestBed.createComponent(CoveDetailsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/applications/application-details/cove-details/cove-details.component.ts b/portal-frontend/src/app/features/applications/application-details/cove-details/cove-details.component.ts new file mode 100644 index 0000000000..e0eb30d3ce --- /dev/null +++ b/portal-frontend/src/app/features/applications/application-details/cove-details/cove-details.component.ts @@ -0,0 +1,65 @@ +import { Component, Input, OnInit } from '@angular/core'; +import { Router } from '@angular/router'; +import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; +import { ApplicationSubmissionDetailedDto } from '../../../../services/application-submission/application-submission.dto'; +import { ApplicationDocumentDto } from '../../../../services/application-document/application-document.dto'; +import { CovenantTransfereeDto } from '../../../../services/covenant-transferee/covenant-transferee.dto'; +import { CovenantTransfereeService } from '../../../../services/covenant-transferee/covenant-transferee.service'; +import { DOCUMENT_TYPE } from '../../../../shared/dto/document.dto'; + +@Component({ + selector: 'app-cove-details', + templateUrl: './cove-details.component.html', + styleUrls: ['./cove-details.component.scss'], +}) +export class CoveDetailsComponent { + @Input() showErrors = true; + @Input() showEdit = true; + @Input() draftMode = false; + + _applicationSubmission: ApplicationSubmissionDetailedDto | undefined; + + @Input() set applicationSubmission(applicationSubmission: ApplicationSubmissionDetailedDto | undefined) { + if (applicationSubmission) { + this._applicationSubmission = applicationSubmission; + this.loadTransferees(applicationSubmission.uuid); + } + } + + @Input() set applicationDocuments(documents: ApplicationDocumentDto[]) { + this.proposalMap = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.PROPOSAL_MAP); + this.srwTerms = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.SRW_TERMS); + } + + proposalMap: ApplicationDocumentDto[] = []; + srwTerms: ApplicationDocumentDto[] = []; + transferees: CovenantTransfereeDto[] = []; + + constructor( + private router: Router, + private applicationDocumentService: ApplicationDocumentService, + private covenantTransfereeService: CovenantTransfereeService + ) {} + + async onEditSection(step: number) { + if (this.draftMode) { + await this.router.navigateByUrl( + `/alcs/application/${this._applicationSubmission?.fileNumber}/edit/${step}?errors=t` + ); + } else { + await this.router.navigateByUrl(`application/${this._applicationSubmission?.fileNumber}/edit/${step}?errors=t`); + } + } + + async openFile(uuid: string) { + const res = await this.applicationDocumentService.openFile(uuid); + window.open(res?.url, '_blank'); + } + + private async loadTransferees(uuid: string) { + const transferees = await this.covenantTransfereeService.fetchBySubmissionId(uuid); + if (transferees) { + this.transferees = transferees; + } + } +} diff --git a/portal-frontend/src/app/features/applications/edit-submission/edit-submission-base.module.ts b/portal-frontend/src/app/features/applications/edit-submission/edit-submission-base.module.ts index d55740124f..5468887371 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/edit-submission-base.module.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/edit-submission-base.module.ts @@ -20,6 +20,8 @@ import { ParcelDetailsComponent } from './parcel-details/parcel-details.componen import { ParcelEntryConfirmationDialogComponent } from './parcel-details/parcel-entry/parcel-entry-confirmation-dialog/parcel-entry-confirmation-dialog.component'; import { ParcelEntryComponent } from './parcel-details/parcel-entry/parcel-entry.component'; import { PrimaryContactComponent } from './primary-contact/primary-contact.component'; +import { CoveProposalComponent } from './proposal/cove-proposal/cove-proposal.component'; +import { CovenantTransfereeDialogComponent } from './proposal/cove-proposal/transferee-dialog/transferee-dialog.component'; import { ExclProposalComponent } from './proposal/excl-proposal/excl-proposal.component'; import { InclProposalComponent } from './proposal/incl-proposal/incl-proposal.component'; import { ChangeSubtypeConfirmationDialogComponent } from './proposal/naru-proposal/change-subtype-confirmation-dialog/change-subtype-confirmation-dialog.component'; @@ -60,6 +62,8 @@ import { SelectGovernmentComponent } from './select-government/select-government ChangeSubtypeConfirmationDialogComponent, ExclProposalComponent, InclProposalComponent, + CoveProposalComponent, + CovenantTransfereeDialogComponent, ], imports: [ CommonModule, @@ -97,6 +101,8 @@ import { SelectGovernmentComponent } from './select-government/select-government NaruProposalComponent, ExclProposalComponent, InclProposalComponent, + CoveProposalComponent, + CovenantTransfereeDialogComponent, ], }) export class EditSubmissionBaseModule {} diff --git a/portal-frontend/src/app/features/applications/edit-submission/edit-submission.component.html b/portal-frontend/src/app/features/applications/edit-submission/edit-submission.component.html index 202339627d..ba478a8db4 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/edit-submission.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/edit-submission.component.html @@ -165,6 +165,14 @@ <h6 *ngIf="applicationSubmission"> (navigateToStep)="onBeforeSwitchStep($event)" (exit)="onExit()" ></app-incl-proposal> + <app-cove-proposal + *ngIf="applicationSubmission.typeCode === 'COVE'" + [$applicationSubmission]="$applicationSubmission" + [$applicationDocuments]="$applicationDocuments" + [showErrors]="showValidationErrors" + (navigateToStep)="onBeforeSwitchStep($event)" + (exit)="onExit()" + ></app-cove-proposal> </div> </cdk-step> <cdk-step label="Upload Attachments"> diff --git a/portal-frontend/src/app/features/applications/edit-submission/edit-submission.component.ts b/portal-frontend/src/app/features/applications/edit-submission/edit-submission.component.ts index 496d92bea5..315f8ce8c3 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/edit-submission.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/edit-submission.component.ts @@ -23,6 +23,7 @@ import { OtherAttachmentsComponent } from './other-attachments/other-attachments import { OtherParcelsComponent } from './other-parcels/other-parcels.component'; import { ParcelDetailsComponent } from './parcel-details/parcel-details.component'; import { PrimaryContactComponent } from './primary-contact/primary-contact.component'; +import { CoveProposalComponent } from './proposal/cove-proposal/cove-proposal.component'; import { ExclProposalComponent } from './proposal/excl-proposal/excl-proposal.component'; import { InclProposalComponent } from './proposal/incl-proposal/incl-proposal.component'; import { NaruProposalComponent } from './proposal/naru-proposal/naru-proposal.component'; @@ -81,6 +82,7 @@ export class EditSubmissionComponent implements OnInit, OnDestroy, AfterViewInit @ViewChild(NaruProposalComponent) naruProposalComponent?: NaruProposalComponent; @ViewChild(ExclProposalComponent) exclProposalComponent?: ExclProposalComponent; @ViewChild(InclProposalComponent) inclProposalComponent?: InclProposalComponent; + @ViewChild(CoveProposalComponent) coveProposalComponent?: CoveProposalComponent; @ViewChild(OtherAttachmentsComponent) otherAttachmentsComponent!: OtherAttachmentsComponent; constructor( @@ -256,6 +258,9 @@ export class EditSubmissionComponent implements OnInit, OnDestroy, AfterViewInit if (this.inclProposalComponent) { await this.inclProposalComponent.onSave(); } + if (this.coveProposalComponent) { + await this.coveProposalComponent.onSave(); + } } async onBeforeSwitchStep(index: number) { diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/cove-proposal/cove-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/cove-proposal/cove-proposal.component.html new file mode 100644 index 0000000000..09e3d84ca0 --- /dev/null +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/cove-proposal/cove-proposal.component.html @@ -0,0 +1,226 @@ +<div class="step-description"> + <h2>Proposal</h2> + <p> + Considerations are subject to + <a> Section 6 of the ALC Act. </a> + </p> + <p>*All fields are required unless stated optional.</p> +</div> +<app-warning-banner> + Please consult the ' + <a + href="https://www.alc.gov.bc.ca/application-and-notice-process/applications/what-the-commission-considers/" + target="_blank" + > + What the Commission Considers + </a> + ' page of the ALC website for more information. +</app-warning-banner> +<section> + <div class="split"> + <div class="subheading2">Provide the name and contact information for all transferees</div> + <div> + <button + mat-flat-button + color="accent" + [ngClass]="{ + 'error-outline': transferees.length === 0 && showErrors + }" + (click)="onAdd()" + > + Add New Transferee + </button> + <app-validation-error *ngIf="transferees.length === 0 && showErrors"> + At least one transferee is required + </app-validation-error> + </div> + </div> + <div class="table"> + <table mat-table [dataSource]="transferees"> + <ng-container matColumnDef="type"> + <th mat-header-cell *matHeaderCellDef>Type</th> + <td mat-cell *matCellDef="let element">{{ element.type.code === 'INDV' ? 'Individual' : 'Organization' }}</td> + </ng-container> + + <ng-container matColumnDef="fullName"> + <th mat-header-cell *matHeaderCellDef>Full Name</th> + <td mat-cell *matCellDef="let element">{{ element.displayName }}</td> + </ng-container> + + <ng-container matColumnDef="organizationName"> + <th mat-header-cell *matHeaderCellDef>Organization Name</th> + <td mat-cell *matCellDef="let element"> + <span *ngIf="element.organizationName"> + {{ element.organizationName }} + </span> + <span class="no-data" *ngIf="!element.organizationName"> No Data </span> + </td> + </ng-container> + + <ng-container matColumnDef="phone"> + <th mat-header-cell *matHeaderCellDef>Phone</th> + <td mat-cell *matCellDef="let element"> + {{ element.phoneNumber | mask : '(000) 000-0000' }} + </td> + </ng-container> + + <ng-container matColumnDef="email"> + <th mat-header-cell *matHeaderCellDef>Email</th> + <td mat-cell *matCellDef="let element"> + {{ element.email }} + </td> + </ng-container> + + <ng-container matColumnDef="actions"> + <th mat-header-cell *matHeaderCellDef>Actions</th> + <td class="actions-cell" mat-cell *matCellDef="let element"> + <button mat-flat-button color="primary" (click)="onEdit(element.uuid)">Edit</button> + <button mat-stroked-button color="warn" (click)="onDelete(element.uuid)">Remove</button> + </td> + </ng-container> + + <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr> + <tr mat-row *matRowDef="let row; columns: displayedColumns"></tr> + <tr class="mat-row" *matNoDataRow> + <td class="no-data" colspan="6"> + No Transferee added. Use ‘Add New Transferee’ button to the right to add your first transferee. + </td> + </tr> + </table> + </div> + <form [formGroup]="form"> + <div class="form-row"> + <div> + <label for="hectares">How many hectares will the covenant impact?</label> + <div class="subtext">Note: 0.01 ha is 100m<sup>2</sup></div> + <mat-form-field appearance="outline"> + <input + id="hectares" + mask="separator.2" + thousandSeparator="," + separatorLimit="9999999999" + min="0.01" + matInput + formControlName="hectares" + placeholder="Type area in hectares" + /> + <span matTextSuffix>ha</span> + </mat-form-field> + <div *ngIf="hectares.invalid && (hectares.dirty || hectares.touched)" class="field-error"> + <mat-icon>warning</mat-icon> + <div *ngIf="hectares.errors?.['required']">This field is required</div> + </div> + </div> + <div class="full-row"> + <label for="purpose">What is the purpose of the covenant?</label> + <div class="subtext"> + Include why you are applying for a restrictive covenant, what the proposal will achieve, and any benefits to + agriculture that the proposal provides. + </div> + <mat-form-field appearance="outline"> + <textarea + formControlName="purpose" + #purposeText + maxlength="4000" + id="purpose" + matInput + placeholder="Type comment" + ></textarea> + </mat-form-field> + <div *ngIf="purpose.invalid && (purpose.dirty || purpose.touched)" class="field-error"> + <mat-icon>warning</mat-icon> + <div *ngIf="purpose.errors?.['required']">This field is required</div> + </div> + <div class="subtext">Characters left: {{ 4000 - purposeText.textLength }}</div> + </div> + <div class="full-row"> + <label for="farmImpact">Explain how the covenant impacts the use of agricultural land for farm purposes.</label> + <div class="subtext">Does the covenant restrict or prohibit agricultural use?</div> + <mat-form-field appearance="outline"> + <textarea + formControlName="farmImpact" + #purposeText + maxlength="4000" + id="farmImpact" + matInput + placeholder="Type comment" + ></textarea> + </mat-form-field> + <div *ngIf="farmImpact.invalid && (farmImpact.dirty || farmImpact.touched)" class="field-error"> + <mat-icon>warning</mat-icon> + <div *ngIf="farmImpact.errors?.['required']">This field is required</div> + </div> + <div class="subtext">Characters left: {{ 4000 - purposeText.textLength }}</div> + </div> + <div class="full-row"> + <label class="subheading2" for="proposal-map">Proposal Map / Site Plan</label> + <div class="subtext">A visual representation of your proposal.</div> + <app-file-drag-drop + id="proposal-map" + [uploadedFiles]="proposalMap" + (uploadFiles)="attachProposalMap($event)" + (deleteFile)="onDeleteFile($event)" + (openFile)="openFile($event)" + [showErrors]="showErrors" + [isRequired]="true" + [showVirusError]="showProposalMapVirus" + ></app-file-drag-drop> + </div> + <div class="full-row"> + <label for="hasDraftCopy"> Do you have a draft copy of the covenant? </label> + <div class="subtext">If yes, please attach the Draft in the section below.</div> + <div> + <mat-button-toggle-group + class="input" + (change)="onChangeHasDraftCopy($event.value)" + id="hasDraftCopy" + formControlName="hasDraftCopy" + > + <mat-button-toggle + class="toggle-button" + [ngClass]="{ + 'error-outline': hasDraftCopy.invalid && (hasDraftCopy.dirty || hasDraftCopy.touched) + }" + value="true" + >Yes + </mat-button-toggle> + <mat-button-toggle + class="toggle-button" + [ngClass]="{ + 'error-outline': hasDraftCopy.invalid && (hasDraftCopy.dirty || hasDraftCopy.touched) + }" + value="false" + >No + </mat-button-toggle> + </mat-button-toggle-group> + </div> + </div> + <div class="full-row"> + <label class="subheading2" for="proposal-map">Draft Covenant</label> + <div class="subtext">A visual representation of your proposal.</div> + <app-file-drag-drop + id="draftCovenant" + [uploadedFiles]="draftCovenant" + (uploadFiles)="attachDraftCovenant($event)" + (deleteFile)="onDeleteFile($event)" + (openFile)="openFile($event)" + [showErrors]="showErrors" + [isRequired]="true" + [disabled]="!canUploadDraft" + [showVirusError]="showDraftCovenantVirus" + ></app-file-drag-drop> + </div> + </div> + </form> +</section> +<div class="button-container"> + <button (click)="onSaveExit()" mat-stroked-button color="accent">Save and Exit</button> + <div> + <button mat-stroked-button color="primary" (click)="onNavigateToStep(currentStep - 1)"> + Previous<span class="mobile-hidden"> Step</span> + </button> + <button mat-flat-button color="primary" (click)="onNavigateToStep(currentStep + 1)"> + Next<span class="mobile-hidden"> Step</span> + </button> + </div> +</div> diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/cove-proposal/cove-proposal.component.scss b/portal-frontend/src/app/features/applications/edit-submission/proposal/cove-proposal/cove-proposal.component.scss new file mode 100644 index 0000000000..bd13f86821 --- /dev/null +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/cove-proposal/cove-proposal.component.scss @@ -0,0 +1,39 @@ +@use '../../../../../../styles/functions' as *; +@use '../../../../../../styles/colors'; + +.no-data { + color: colors.$grey; + text-align: center; + padding: rem(8); +} + +.actions-cell { + button:not(:last-child) { + margin-right: rem(12) !important; + } +} + +.split { + margin-bottom: rem(16); +} + +@media screen and (max-width: $desktopBreakpoint) { + .table { + overflow-x: auto; + max-width: 100vw; + + table { + white-space: nowrap; + } + } + + .split { + flex-direction: column; + align-items: start; + + div, button { + margin-top: rem(4); + width: 100%; + } + } +} diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/cove-proposal/cove-proposal.component.spec.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/cove-proposal/cove-proposal.component.spec.ts new file mode 100644 index 0000000000..9b05928cb9 --- /dev/null +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/cove-proposal/cove-proposal.component.spec.ts @@ -0,0 +1,63 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { MatDialog } from '@angular/material/dialog'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { BehaviorSubject } from 'rxjs'; +import { ApplicationDocumentDto } from '../../../../../services/application-document/application-document.dto'; +import { ApplicationDocumentService } from '../../../../../services/application-document/application-document.service'; +import { ApplicationSubmissionDetailedDto } from '../../../../../services/application-submission/application-submission.dto'; +import { ApplicationSubmissionService } from '../../../../../services/application-submission/application-submission.service'; +import { CovenantTransfereeService } from '../../../../../services/covenant-transferee/covenant-transferee.service'; +import { ToastService } from '../../../../../services/toast/toast.service'; + +import { CoveProposalComponent } from './cove-proposal.component'; + +describe('CoveProposalComponent', () => { + let component: CoveProposalComponent; + let fixture: ComponentFixture<CoveProposalComponent>; + let mockTransfereeService: DeepMocked<CovenantTransfereeService>; + let mockAppSubService: DeepMocked<ApplicationSubmissionService>; + let mockAppDocService: DeepMocked<ApplicationDocumentService>; + + beforeEach(async () => { + mockTransfereeService = createMock(); + mockAppSubService = createMock(); + + await TestBed.configureTestingModule({ + providers: [ + { + provide: CovenantTransfereeService, + useValue: mockTransfereeService, + }, + { + provide: ApplicationSubmissionService, + useValue: mockAppSubService, + }, + { + provide: ApplicationDocumentService, + useValue: mockAppDocService, + }, + { + provide: MatDialog, + useValue: {}, + }, + { + provide: ToastService, + useValue: {}, + }, + ], + declarations: [CoveProposalComponent], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(CoveProposalComponent); + component = fixture.componentInstance; + component.$applicationSubmission = new BehaviorSubject<ApplicationSubmissionDetailedDto | undefined>(undefined); + component.$applicationDocuments = new BehaviorSubject<ApplicationDocumentDto[]>([]); + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/cove-proposal/cove-proposal.component.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/cove-proposal/cove-proposal.component.ts new file mode 100644 index 0000000000..49a4acade3 --- /dev/null +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/cove-proposal/cove-proposal.component.ts @@ -0,0 +1,169 @@ +import { Component, OnDestroy, OnInit } from '@angular/core'; +import { FormControl, FormGroup, Validators } from '@angular/forms'; +import { MatDialog } from '@angular/material/dialog'; +import { Router } from '@angular/router'; +import { takeUntil } from 'rxjs'; +import { ApplicationDocumentDto } from '../../../../../services/application-document/application-document.dto'; +import { ApplicationDocumentService } from '../../../../../services/application-document/application-document.service'; +import { ApplicationSubmissionUpdateDto } from '../../../../../services/application-submission/application-submission.dto'; +import { ApplicationSubmissionService } from '../../../../../services/application-submission/application-submission.service'; +import { CovenantTransfereeDto } from '../../../../../services/covenant-transferee/covenant-transferee.dto'; +import { CovenantTransfereeService } from '../../../../../services/covenant-transferee/covenant-transferee.service'; +import { ToastService } from '../../../../../services/toast/toast.service'; +import { DOCUMENT_TYPE } from '../../../../../shared/dto/document.dto'; +import { FileHandle } from '../../../../../shared/file-drag-drop/drag-drop.directive'; +import { formatBooleanToString } from '../../../../../shared/utils/boolean-helper'; +import { parseStringToBoolean } from '../../../../../shared/utils/string-helper'; +import { EditApplicationSteps } from '../../edit-submission.component'; +import { FilesStepComponent } from '../../files-step.partial'; +import { CovenantTransfereeDialogComponent } from './transferee-dialog/transferee-dialog.component'; + +@Component({ + selector: 'app-cove-proposal', + templateUrl: './cove-proposal.component.html', + styleUrls: ['./cove-proposal.component.scss'], +}) +export class CoveProposalComponent extends FilesStepComponent implements OnInit, OnDestroy { + currentStep = EditApplicationSteps.Proposal; + + transferees: CovenantTransfereeDto[] = []; + isDirty = false; + displayedColumns: string[] = ['type', 'fullName', 'organizationName', 'phone', 'email', 'actions']; + + private submissionUuid = ''; + + hectares = new FormControl<string | null>(null, [Validators.required]); + farmImpact = new FormControl<string | null>(null, [Validators.required]); + purpose = new FormControl<string | null>(null, [Validators.required]); + hasDraftCopy = new FormControl<string | null>(null, [Validators.required]); + canUploadDraft = false; + + form = new FormGroup({ + hectares: this.hectares, + purpose: this.purpose, + farmImpact: this.farmImpact, + hasDraftCopy: this.hasDraftCopy, + }); + + proposalMap: ApplicationDocumentDto[] = []; + showProposalMapVirus = false; + draftCovenant: ApplicationDocumentDto[] = []; + showDraftCovenantVirus = false; + + constructor( + private router: Router, + private covenantTransfereeService: CovenantTransfereeService, + private applicationSubmissionService: ApplicationSubmissionService, + applicationDocumentService: ApplicationDocumentService, + dialog: MatDialog, + toastService: ToastService + ) { + super(applicationDocumentService, dialog, toastService); + } + + ngOnInit(): void { + this.$applicationSubmission.pipe(takeUntil(this.$destroy)).subscribe((submission) => { + if (submission) { + this.submissionUuid = submission.uuid; + this.fileId = submission.fileNumber; + this.loadTransferees(submission.uuid); + + this.form.patchValue({ + farmImpact: submission.coveFarmImpact, + hasDraftCopy: formatBooleanToString(submission.coveHasDraft), + purpose: submission.purpose, + hectares: submission.coveAreaImpacted?.toString(), + }); + + this.canUploadDraft = !!submission.coveHasDraft; + } + }); + + this.$applicationDocuments.pipe(takeUntil(this.$destroy)).subscribe((documents) => { + this.proposalMap = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.PROPOSAL_MAP); + this.draftCovenant = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.SRW_TERMS); + }); + } + + async onSave() { + await this.save(); + } + + protected async save() { + if (this.fileId && this.form.dirty) { + const purpose = this.purpose.value; + const hectares = this.hectares.value; + const impact = this.farmImpact.value; + const hasDraftCopy = this.hasDraftCopy.value; + + const updateDto: ApplicationSubmissionUpdateDto = { + purpose, + coveAreaImpacted: hectares ? parseFloat(hectares) : null, + coveFarmImpact: impact, + coveHasDraft: parseStringToBoolean(hasDraftCopy), + }; + + const updatedApp = await this.applicationSubmissionService.updatePending(this.submissionUuid, updateDto); + this.$applicationSubmission.next(updatedApp); + } + } + + private async loadTransferees(submissionUuid: string) { + const transferees = await this.covenantTransfereeService.fetchBySubmissionId(submissionUuid); + if (transferees) { + this.transferees = transferees; + } + } + + async attachProposalMap(file: FileHandle) { + const res = await this.attachFile(file, DOCUMENT_TYPE.PROPOSAL_MAP); + this.showProposalMapVirus = !res; + } + + async attachDraftCovenant(file: FileHandle) { + const res = await this.attachFile(file, DOCUMENT_TYPE.SRW_TERMS); + this.showProposalMapVirus = !res; + } + + onAdd() { + this.dialog + .open(CovenantTransfereeDialogComponent, { + data: { + submissionUuid: this.submissionUuid, + }, + }) + .beforeClosed() + .subscribe((didCreate) => { + if (didCreate) { + this.loadTransferees(this.submissionUuid); + } + }); + } + + onEdit(uuid: string) { + const selectedTransferee = this.transferees.find((transferee) => transferee.uuid === uuid); + this.dialog + .open(CovenantTransfereeDialogComponent, { + data: { + submissionUuid: this.submissionUuid, + existingTransferee: selectedTransferee, + }, + }) + .beforeClosed() + .subscribe((didSave) => { + if (didSave) { + this.loadTransferees(this.submissionUuid); + } + }); + } + + async onDelete(uuid: string) { + await this.covenantTransfereeService.delete(uuid); + await this.loadTransferees(this.submissionUuid); + } + + onChangeHasDraftCopy(value: string) { + const isTrue = parseStringToBoolean(value); + this.canUploadDraft = !!isTrue; + } +} diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/cove-proposal/transferee-dialog/transferee-dialog.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/cove-proposal/transferee-dialog/transferee-dialog.component.html new file mode 100644 index 0000000000..a2e4d42e9b --- /dev/null +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/cove-proposal/transferee-dialog/transferee-dialog.component.html @@ -0,0 +1,88 @@ +<div mat-dialog-title> + <h3 *ngIf="!isEdit">Add New Transferee</h3> + <h3 *ngIf="isEdit">Edit Transferee</h3> +</div> +<div mat-dialog-content> + <form [formGroup]="form"> + <div class="form-row"> + <div class="full-row"> + <label for="type">Transferee Type</label> + <mat-button-toggle-group (change)="onChangeType($event)" class="input" id="type" formControlName="type"> + <mat-button-toggle color="primary" [value]="OWNER_TYPE.INDIVIDUAL">Individual</mat-button-toggle> + <mat-button-toggle color="primary" [value]="OWNER_TYPE.ORGANIZATION">Organization</mat-button-toggle> + </mat-button-toggle-group> + </div> + <div class="full-row" *ngIf="type.getRawValue() === OWNER_TYPE.ORGANIZATION"> + <label for="orgName">Organization Name</label> + <mat-form-field appearance="outline"> + <input id="orgName" matInput placeholder="Enter Organization Name" formControlName="organizationName" /> + </mat-form-field> + <div + *ngIf="organizationName.invalid && (organizationName.dirty || organizationName.touched)" + class="field-error" + > + <mat-icon>warning</mat-icon> + <div *ngIf="organizationName.errors?.['required']">This field is required</div> + </div> + </div> + <h5 class="full-row" *ngIf="type.getRawValue() === OWNER_TYPE.ORGANIZATION">Organization Contact Info</h5> + <div> + <label for="firstName">First Name</label> + <mat-form-field appearance="outline"> + <input id="firstName" matInput placeholder="Enter First Name" formControlName="firstName" /> + </mat-form-field> + <div *ngIf="firstName.invalid && (firstName.dirty || firstName.touched)" class="field-error"> + <mat-icon>warning</mat-icon> + <div *ngIf="firstName.errors?.['required']">This field is required</div> + </div> + </div> + <div> + <label for="lastName">Last Name</label> + <mat-form-field appearance="outline"> + <input id="lastName" matInput placeholder="Enter Last Name" formControlName="lastName" /> + </mat-form-field> + <div *ngIf="lastName.invalid && (lastName.dirty || lastName.touched)" class="field-error"> + <mat-icon>warning</mat-icon> + <div *ngIf="lastName.errors?.['required']">This field is required</div> + </div> + </div> + <div> + <label for="phoneNumber">Phone Number</label> + <mat-form-field appearance="outline"> + <input + id="phoneNumber" + mask="(000) 000-0000" + matInput + placeholder="(555) 555-5555" + formControlName="phoneNumber" + /> + </mat-form-field> + <div *ngIf="phoneNumber.invalid && (phoneNumber.dirty || phoneNumber.touched)" class="field-error"> + <mat-icon>warning</mat-icon> + <div *ngIf="phoneNumber.errors?.['required']">This field is required</div> + <div *ngIf="phoneNumber.errors?.['mask']">Invalid format</div> + </div> + </div> + <div> + <label for="firstName">Email</label> + <mat-form-field appearance="outline"> + <input id="email" type="email" matInput placeholder="Enter Email" formControlName="email" /> + </mat-form-field> + <div *ngIf="email.invalid && (email.dirty || email.touched)" class="field-error"> + <mat-icon>warning</mat-icon> + <div *ngIf="email.errors?.['required']">This field is required</div> + <div *ngIf="email.errors?.['email']">Invalid format</div> + </div> + </div> + </div> + </form> +</div> +<div mat-dialog-actions class="actions"> + <button mat-stroked-button color="primary" (click)="onClose()">Cancel</button> + <button mat-flat-button color="primary" [disabled]="form.invalid || isLoading" *ngIf="!isEdit" (click)="onCreate()"> + Add + </button> + <button mat-flat-button color="primary" [disabled]="form.invalid || isLoading" *ngIf="isEdit" (click)="onSave()"> + Save + </button> +</div> diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/cove-proposal/transferee-dialog/transferee-dialog.component.scss b/portal-frontend/src/app/features/applications/edit-submission/proposal/cove-proposal/transferee-dialog/transferee-dialog.component.scss new file mode 100644 index 0000000000..d7ad53de43 --- /dev/null +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/cove-proposal/transferee-dialog/transferee-dialog.component.scss @@ -0,0 +1,19 @@ +@use '../../../../../../../styles/functions' as *; +@use '../../../../../../../styles/colors'; + +.actions { + button:not(:last-child) { + margin-right: rem(8) !important; + } +} + +:host::ng-deep { + .field-error { + color: colors.$error-color; + font-size: rem(15); + font-weight: 700; + display: flex; + align-items: center; + margin-top: rem(4); + } +} diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/cove-proposal/transferee-dialog/transferee-dialog.component.spec.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/cove-proposal/transferee-dialog/transferee-dialog.component.spec.ts new file mode 100644 index 0000000000..aa44082c5e --- /dev/null +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/cove-proposal/transferee-dialog/transferee-dialog.component.spec.ts @@ -0,0 +1,47 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { MAT_DIALOG_DATA, MatDialog, MatDialogRef } from '@angular/material/dialog'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { CovenantTransfereeService } from '../../../../../../services/covenant-transferee/covenant-transferee.service'; +import { CovenantTransfereeDialogComponent } from './transferee-dialog.component'; + +describe('TransfereeDialogComponent', () => { + let component: CovenantTransfereeDialogComponent; + let fixture: ComponentFixture<CovenantTransfereeDialogComponent>; + let mockTransfereeService: DeepMocked<CovenantTransfereeService>; + + beforeEach(async () => { + mockTransfereeService = createMock(); + + await TestBed.configureTestingModule({ + providers: [ + { + provide: CovenantTransfereeService, + useValue: mockTransfereeService, + }, + { + provide: MatDialogRef, + useValue: {}, + }, + { + provide: MAT_DIALOG_DATA, + useValue: {}, + }, + { + provide: MatDialog, + useValue: {}, + }, + ], + declarations: [CovenantTransfereeDialogComponent], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(CovenantTransfereeDialogComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/cove-proposal/transferee-dialog/transferee-dialog.component.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/cove-proposal/transferee-dialog/transferee-dialog.component.ts new file mode 100644 index 0000000000..18b0e58aa6 --- /dev/null +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/cove-proposal/transferee-dialog/transferee-dialog.component.ts @@ -0,0 +1,114 @@ +import { Component, Inject } from '@angular/core'; +import { FormControl, FormGroup, Validators } from '@angular/forms'; +import { MatButtonToggleChange } from '@angular/material/button-toggle'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; +import { + CovenantTransfereeCreateDto, + CovenantTransfereeDto, + CovenantTransfereeUpdateDto, +} from '../../../../../../services/covenant-transferee/covenant-transferee.dto'; +import { CovenantTransfereeService } from '../../../../../../services/covenant-transferee/covenant-transferee.service'; +import { OWNER_TYPE } from '../../../../../../shared/dto/owner.dto'; +import { TransfereeDialogComponent } from '../../../../../notifications/edit-submission/transferees/transferee-dialog/transferee-dialog.component'; + +@Component({ + selector: 'app-transferee-dialog', + templateUrl: './transferee-dialog.component.html', + styleUrls: ['./transferee-dialog.component.scss'], +}) +export class CovenantTransfereeDialogComponent { + OWNER_TYPE = OWNER_TYPE; + type = new FormControl<string | null>(OWNER_TYPE.INDIVIDUAL); + firstName = new FormControl<string | null>('', [Validators.required]); + lastName = new FormControl<string | null>('', [Validators.required]); + organizationName = new FormControl<string | null>(''); + phoneNumber = new FormControl<string | null>('', [Validators.required]); + email = new FormControl<string | null>('', [Validators.required, Validators.email]); + + isEdit = false; + isLoading = false; + existingUuid: string | undefined; + + form = new FormGroup({ + type: this.type, + firstName: this.firstName, + lastName: this.lastName, + organizationName: this.organizationName, + phoneNumber: this.phoneNumber, + email: this.email, + }); + + constructor( + private dialogRef: MatDialogRef<TransfereeDialogComponent>, + private transfereeService: CovenantTransfereeService, + @Inject(MAT_DIALOG_DATA) + public data: { + submissionUuid: string; + existingTransferee?: CovenantTransfereeDto; + } + ) { + if (data && data.existingTransferee) { + this.onChangeType({ + value: data.existingTransferee.type.code, + } as any); + this.isEdit = true; + this.type.setValue(data.existingTransferee.type.code); + this.firstName.setValue(data.existingTransferee.firstName); + this.lastName.setValue(data.existingTransferee.lastName); + this.organizationName.setValue(data.existingTransferee.organizationName); + this.phoneNumber.setValue(data.existingTransferee.phoneNumber); + this.email.setValue(data.existingTransferee.email); + this.existingUuid = data.existingTransferee.uuid; + } + } + + onChangeType($event: MatButtonToggleChange) { + if ($event.value === OWNER_TYPE.ORGANIZATION) { + this.organizationName.setValidators([Validators.required]); + } else { + this.organizationName.setValidators([]); + this.organizationName.reset(); + } + } + + async onCreate() { + if (!this.data.submissionUuid) { + console.error('TransfereeDialogComponent misconfigured, needs submissionUuid for create'); + return; + } + this.isLoading = true; + + const createDto: CovenantTransfereeCreateDto = { + organizationName: this.organizationName.getRawValue() || undefined, + firstName: this.firstName.getRawValue() || undefined, + lastName: this.lastName.getRawValue() || undefined, + email: this.email.getRawValue()!, + phoneNumber: this.phoneNumber.getRawValue()!, + typeCode: this.type.getRawValue()!, + applicationSubmissionUuid: this.data.submissionUuid, + }; + + await this.transfereeService.create(createDto); + this.dialogRef.close(true); + } + + async onClose() { + this.dialogRef.close(false); + } + + async onSave() { + const updateDto: CovenantTransfereeUpdateDto = { + organizationName: this.organizationName.getRawValue(), + firstName: this.firstName.getRawValue(), + lastName: this.lastName.getRawValue(), + email: this.email.getRawValue()!, + phoneNumber: this.phoneNumber.getRawValue()!, + typeCode: this.type.getRawValue()!, + }; + if (this.existingUuid) { + this.isLoading = true; + await this.transfereeService.update(this.existingUuid, updateDto); + this.dialogRef.close(true); + } + } +} diff --git a/portal-frontend/src/app/services/application-submission/application-submission.dto.ts b/portal-frontend/src/app/services/application-submission/application-submission.dto.ts index 8a08bd7a84..2ec110b00d 100644 --- a/portal-frontend/src/app/services/application-submission/application-submission.dto.ts +++ b/portal-frontend/src/app/services/application-submission/application-submission.dto.ts @@ -1,5 +1,6 @@ import { BaseCodeDto } from '../../shared/dto/base.dto'; import { ApplicationOwnerDetailedDto } from '../application-owner/application-owner.dto'; +import { CovenantTransfereeDto } from '../covenant-transferee/covenant-transferee.dto'; export enum SUBMISSION_STATUS { IN_PROGRESS = 'PROG', @@ -155,6 +156,11 @@ export interface ApplicationSubmissionDetailedDto extends ApplicationSubmissionD inclImprovements: string | null; exclShareGovernmentBorders: boolean | null; inclGovernmentOwnsAllParcels: boolean | null; + + //Covenant Fields + coveHasDraft: boolean | null; + coveFarmImpact: string | null; + coveAreaImpacted: number | null; } export interface ApplicationSubmissionUpdateDto { @@ -260,4 +266,9 @@ export interface ApplicationSubmissionUpdateDto { inclImprovements?: string | null; exclShareGovernmentBorders?: boolean | null; inclGovernmentOwnsAllParcels?: boolean | null; + + //Covenant Fields + coveHasDraft?: boolean | null; + coveFarmImpact?: string | null; + coveAreaImpacted?: number | null; } diff --git a/portal-frontend/src/app/services/covenant-transferee/covenant-transferee.dto.ts b/portal-frontend/src/app/services/covenant-transferee/covenant-transferee.dto.ts new file mode 100644 index 0000000000..aa6faec3cd --- /dev/null +++ b/portal-frontend/src/app/services/covenant-transferee/covenant-transferee.dto.ts @@ -0,0 +1,35 @@ +import { BaseCodeDto } from '../../shared/dto/base.dto'; + +export enum OWNER_TYPE { + INDIVIDUAL = 'INDV', + ORGANIZATION = 'ORGZ', +} + +export interface OwnerTypeDto extends BaseCodeDto { + code: OWNER_TYPE; +} + +export interface CovenantTransfereeDto { + uuid: string; + applicationSubmissionUuid: string; + displayName: string; + firstName: string | null; + lastName: string | null; + organizationName: string | null; + phoneNumber: string | null; + email: string | null; + type: OwnerTypeDto; +} + +export interface CovenantTransfereeUpdateDto { + firstName?: string | null; + lastName?: string | null; + organizationName?: string | null; + phoneNumber: string; + email: string; + typeCode: string; +} + +export interface CovenantTransfereeCreateDto extends CovenantTransfereeUpdateDto { + applicationSubmissionUuid: string; +} diff --git a/portal-frontend/src/app/services/covenant-transferee/covenant-transferee.service.spec.ts b/portal-frontend/src/app/services/covenant-transferee/covenant-transferee.service.spec.ts new file mode 100644 index 0000000000..495ec36f4b --- /dev/null +++ b/portal-frontend/src/app/services/covenant-transferee/covenant-transferee.service.spec.ts @@ -0,0 +1,135 @@ +import { HttpClient } from '@angular/common/http'; +import { TestBed } from '@angular/core/testing'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { of, throwError } from 'rxjs'; +import { DocumentService } from '../document/document.service'; +import { ToastService } from '../toast/toast.service'; + +import { CovenantTransfereeService } from './covenant-transferee.service'; + +describe('CovenantTransfereeService', () => { + let service: CovenantTransfereeService; + let mockHttpClient: DeepMocked<HttpClient>; + let mockToastService: DeepMocked<ToastService>; + let mockDocumentService: DeepMocked<DocumentService>; + + let fileId = '123'; + + beforeEach(() => { + mockHttpClient = createMock(); + mockToastService = createMock(); + mockDocumentService = createMock(); + + TestBed.configureTestingModule({ + providers: [ + { + provide: HttpClient, + useValue: mockHttpClient, + }, + { + provide: ToastService, + useValue: mockToastService, + }, + { + provide: DocumentService, + useValue: mockDocumentService, + }, + ], + }); + service = TestBed.inject(CovenantTransfereeService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); + + it('should make a get request for loading transferees', async () => { + mockHttpClient.get.mockReturnValue(of({})); + + await service.fetchBySubmissionId(fileId); + + expect(mockHttpClient.get).toHaveBeenCalledTimes(1); + expect(mockHttpClient.get.mock.calls[0][0]).toContain('covenant-transferee'); + }); + + it('should show an error toast if getting transferees fails', async () => { + mockHttpClient.get.mockReturnValue(throwError(() => ({}))); + + await service.fetchBySubmissionId(fileId); + + expect(mockHttpClient.get).toHaveBeenCalledTimes(1); + expect(mockToastService.showErrorToast).toHaveBeenCalledTimes(1); + }); + + it('should make a post request for create', async () => { + mockHttpClient.post.mockReturnValue(of({})); + + await service.create({ + applicationSubmissionUuid: '', + email: '', + phoneNumber: '', + typeCode: '', + }); + + expect(mockHttpClient.post).toHaveBeenCalledTimes(1); + expect(mockHttpClient.post.mock.calls[0][0]).toContain('covenant-transferee'); + }); + + it('should show an error toast if creating transferee fails', async () => { + mockHttpClient.post.mockReturnValue(throwError(() => ({}))); + + await service.create({ + applicationSubmissionUuid: '', + email: '', + phoneNumber: '', + typeCode: '', + }); + + expect(mockHttpClient.post).toHaveBeenCalledTimes(1); + expect(mockToastService.showErrorToast).toHaveBeenCalledTimes(1); + }); + + it('should make a patch request for update', async () => { + mockHttpClient.patch.mockReturnValue(of({})); + + await service.update('', { + email: '', + phoneNumber: '', + typeCode: '', + }); + + expect(mockHttpClient.patch).toHaveBeenCalledTimes(1); + expect(mockHttpClient.patch.mock.calls[0][0]).toContain('covenant-transferee'); + }); + + it('should show an error toast if updating transferee fails', async () => { + mockHttpClient.patch.mockReturnValue(throwError(() => ({}))); + + await service.update('', { + email: '', + phoneNumber: '', + typeCode: '', + }); + + expect(mockHttpClient.patch).toHaveBeenCalledTimes(1); + expect(mockToastService.showErrorToast).toHaveBeenCalledTimes(1); + }); + + it('should make a delete request for delete', async () => { + mockHttpClient.delete.mockReturnValue(of({})); + + await service.delete(''); + + expect(mockHttpClient.delete).toHaveBeenCalledTimes(1); + expect(mockHttpClient.delete.mock.calls[0][0]).toContain('covenant-transferee'); + }); + + it('should show an error toast if delete transferee fails', async () => { + mockHttpClient.delete.mockReturnValue(throwError(() => ({}))); + + await service.delete(''); + + expect(mockHttpClient.delete).toHaveBeenCalledTimes(1); + expect(mockToastService.showErrorToast).toHaveBeenCalledTimes(1); + }); +}); diff --git a/portal-frontend/src/app/services/covenant-transferee/covenant-transferee.service.ts b/portal-frontend/src/app/services/covenant-transferee/covenant-transferee.service.ts new file mode 100644 index 0000000000..5f461aca2e --- /dev/null +++ b/portal-frontend/src/app/services/covenant-transferee/covenant-transferee.service.ts @@ -0,0 +1,77 @@ +import { HttpClient } from '@angular/common/http'; +import { Injectable } from '@angular/core'; +import { firstValueFrom } from 'rxjs'; +import { environment } from '../../../environments/environment'; +import { ToastService } from '../toast/toast.service'; +import { + CovenantTransfereeCreateDto, + CovenantTransfereeDto, + CovenantTransfereeUpdateDto, +} from './covenant-transferee.dto'; + +@Injectable({ + providedIn: 'root', +}) +export class CovenantTransfereeService { + private serviceUrl = `${environment.apiUrl}/covenant-transferee`; + + constructor(private httpClient: HttpClient, private toastService: ToastService) {} + async fetchBySubmissionId(submissionUuid: string) { + try { + return await firstValueFrom( + this.httpClient.get<CovenantTransfereeDto[]>(`${this.serviceUrl}/submission/${submissionUuid}`) + ); + } catch (e) { + console.error(e); + this.toastService.showErrorToast('Failed to load Transferees, please try again later'); + } + return undefined; + } + + async create(dto: CovenantTransfereeCreateDto) { + try { + const res = await firstValueFrom(this.httpClient.post<CovenantTransfereeDto>(`${this.serviceUrl}`, dto)); + this.toastService.showSuccessToast('Transferee created'); + return res; + } catch (e) { + console.error(e); + this.toastService.showErrorToast('Failed to create Transferee, please try again later'); + return undefined; + } + } + + async update(uuid: string, updateDto: CovenantTransfereeUpdateDto) { + try { + const res = await firstValueFrom( + this.httpClient.patch<CovenantTransfereeDto>(`${this.serviceUrl}/${uuid}`, updateDto) + ); + this.toastService.showSuccessToast('Transferee saved'); + return res; + } catch (e) { + console.error(e); + this.toastService.showErrorToast('Failed to update Transferee, please try again later'); + return undefined; + } + } + async delete(uuid: string) { + try { + const result = await firstValueFrom(this.httpClient.delete(`${this.serviceUrl}/${uuid}`)); + this.toastService.showSuccessToast('Transferees deleted'); + return result; + } catch (e) { + console.error(e); + this.toastService.showErrorToast('Failed to delete Transferee, please try again'); + } + return undefined; + } + + sortOwners(a: CovenantTransfereeDto, b: CovenantTransfereeDto) { + if (a.displayName < b.displayName) { + return -1; + } + if (a.displayName > b.displayName) { + return 1; + } + return 0; + } +} diff --git a/services/apps/alcs/src/common/automapper/application-submission.automapper.profile.ts b/services/apps/alcs/src/common/automapper/application-submission.automapper.profile.ts index c92dbb15d5..7a98038f69 100644 --- a/services/apps/alcs/src/common/automapper/application-submission.automapper.profile.ts +++ b/services/apps/alcs/src/common/automapper/application-submission.automapper.profile.ts @@ -19,7 +19,11 @@ import { NaruSubtypeDto, } from '../../portal/application-submission/application-submission.dto'; import { ApplicationSubmission } from '../../portal/application-submission/application-submission.entity'; +import { CovenantTransfereeDto } from '../../portal/application-submission/covenant-transferee/covenant-transferee.dto'; +import { CovenantTransferee } from '../../portal/application-submission/covenant-transferee/covenant-transferee.entity'; import { NaruSubtype } from '../../portal/application-submission/naru-subtype/naru-subtype.entity'; +import { NotificationTransfereeDto } from '../../portal/notification-submission/notification-transferee/notification-transferee.dto'; +import { NotificationTransferee } from '../../portal/notification-submission/notification-transferee/notification-transferee.entity'; @Injectable() export class ApplicationSubmissionProfile extends AutomapperProfile { @@ -76,6 +80,16 @@ export class ApplicationSubmissionProfile extends AutomapperProfile { createMap(mapper, ApplicationSubmissionStatusType, ApplicationStatusDto); createMap(mapper, NaruSubtype, NaruSubtypeDto); + createMap( + mapper, + CovenantTransferee, + CovenantTransfereeDto, + forMember( + (pd) => pd.displayName, + mapFrom((p) => `${p.firstName} ${p.lastName}`), + ), + ); + createMap( mapper, ApplicationSubmission, diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.dto.ts b/services/apps/alcs/src/portal/application-submission/application-submission.dto.ts index 5461cc4177..37740083cd 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.dto.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.dto.ts @@ -16,6 +16,7 @@ import { import { BaseCodeDto } from '../../common/dtos/base.dto'; import { ApplicationOwnerDto } from './application-owner/application-owner.dto'; import { ProposedLot } from './application-submission.entity'; +import { CovenantTransfereeDto } from './covenant-transferee/covenant-transferee.dto'; export const MAX_DESCRIPTION_FIELD_LENGTH = 4000; @@ -310,6 +311,19 @@ export class ApplicationSubmissionDetailedDto extends ApplicationSubmissionDto { @AutoMap(() => Boolean) inclGovernmentOwnsAllParcels?: boolean | null; + + //Covenant Fields + @AutoMap(() => Boolean) + coveHasDraft: boolean | null; + + @AutoMap(() => String) + coveFarmImpact: string | null; + + @AutoMap(() => [CovenantTransfereeDto]) + coveTransferees: CovenantTransfereeDto[]; + + @AutoMap(() => Number) + coveAreaImpacted: number | null; } export class ApplicationSubmissionCreateDto { @@ -695,4 +709,17 @@ export class ApplicationSubmissionUpdateDto { @IsBoolean() @IsOptional() inclGovernmentOwnsAllParcels?: boolean | null; + + //Covenant Fields + @IsBoolean() + @IsOptional() + coveHasDraft?: boolean | null; + + @IsString() + @IsOptional() + coveFarmImpact?: string | null; + + @IsNumber() + @IsOptional() + coveAreaImpacted?: number | null; } diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts b/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts index 6fce49dc5d..27a2f9c9e1 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts @@ -13,8 +13,10 @@ import { ApplicationSubmissionToSubmissionStatus } from '../../alcs/application/ import { Base } from '../../common/entities/base.entity'; import { User } from '../../user/user.entity'; import { ColumnNumericTransformer } from '../../utils/column-numeric-transform'; +import { NotificationTransferee } from '../notification-submission/notification-transferee/notification-transferee.entity'; import { ApplicationOwner } from './application-owner/application-owner.entity'; import { ApplicationParcel } from './application-parcel/application-parcel.entity'; +import { CovenantTransferee } from './covenant-transferee/covenant-transferee.entity'; import { NaruSubtype } from './naru-subtype/naru-subtype.entity'; export class ProposedLot { @@ -702,6 +704,31 @@ export class ApplicationSubmission extends Base { @Column({ type: 'boolean', nullable: true }) inclGovernmentOwnsAllParcels: boolean | null; + @AutoMap(() => Number) + @Column({ + type: 'decimal', + nullable: true, + precision: 12, + scale: 2, + transformer: new ColumnNumericTransformer(), + }) + coveAreaImpacted: number | null; + + @AutoMap(() => Boolean) + @Column({ type: 'boolean', nullable: true }) + coveHasDraft: boolean | null; + + @AutoMap(() => String) + @Column({ type: 'text', nullable: true }) + coveFarmImpact: string | null; + + @AutoMap(() => [CovenantTransferee]) + @OneToMany( + () => CovenantTransferee, + (transferee) => transferee.applicationSubmission, + ) + coveTransferees: CovenantTransferee[]; + //END SUBMISSION FIELDS @AutoMap(() => Application) diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.module.ts b/services/apps/alcs/src/portal/application-submission/application-submission.module.ts index e21e206c59..7928657e7f 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.module.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.module.ts @@ -23,6 +23,9 @@ import { ApplicationSubmissionValidatorService } from './application-submission- import { ApplicationSubmissionController } from './application-submission.controller'; import { ApplicationSubmission } from './application-submission.entity'; import { ApplicationSubmissionService } from './application-submission.service'; +import { CovenantTransfereeController } from './covenant-transferee/covenant-transferee.controller'; +import { CovenantTransferee } from './covenant-transferee/covenant-transferee.entity'; +import { CovenantTransfereeService } from './covenant-transferee/covenant-transferee.service'; import { NaruSubtype } from './naru-subtype/naru-subtype.entity'; @Module({ @@ -36,6 +39,7 @@ import { NaruSubtype } from './naru-subtype/naru-subtype.entity'; OwnerType, NaruSubtype, ApplicationSubmissionToSubmissionStatus, + CovenantTransferee, ]), forwardRef(() => ApplicationModule), AuthorizationModule, @@ -52,11 +56,13 @@ import { NaruSubtype } from './naru-subtype/naru-subtype.entity'; ApplicationOwnerService, ApplicationOwnerProfile, ApplicationSubmissionValidatorService, + CovenantTransfereeService, ], controllers: [ ApplicationSubmissionController, ApplicationParcelController, ApplicationOwnerController, + CovenantTransfereeController, ], exports: [ ApplicationSubmissionService, diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.service.ts b/services/apps/alcs/src/portal/application-submission/application-submission.service.ts index 9d29a6470d..bfcb57b644 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.service.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.service.ts @@ -190,6 +190,7 @@ export class ApplicationSubmissionService { await this.setSoilFields(applicationSubmission, updateDto); this.setNARUFields(applicationSubmission, updateDto); this.setInclusionExclusionFields(applicationSubmission, updateDto); + this.setCovenantFields(applicationSubmission, updateDto); await this.applicationSubmissionRepository.save(applicationSubmission); @@ -1027,6 +1028,24 @@ export class ApplicationSubmissionService { ); } + private setCovenantFields( + applicationSubmission: ApplicationSubmission, + updateDto: ApplicationSubmissionUpdateDto, + ) { + applicationSubmission.coveAreaImpacted = filterUndefined( + updateDto.coveAreaImpacted, + applicationSubmission.coveAreaImpacted, + ); + applicationSubmission.coveFarmImpact = filterUndefined( + updateDto.coveFarmImpact, + applicationSubmission.coveFarmImpact, + ); + applicationSubmission.coveHasDraft = filterUndefined( + updateDto.coveHasDraft, + applicationSubmission.coveHasDraft, + ); + } + async listNaruSubtypes() { return this.naruSubtypeRepository.find({ select: { diff --git a/services/apps/alcs/src/portal/application-submission/covenant-transferee/covenant-transferee.controller.spec.ts b/services/apps/alcs/src/portal/application-submission/covenant-transferee/covenant-transferee.controller.spec.ts new file mode 100644 index 0000000000..53af45848e --- /dev/null +++ b/services/apps/alcs/src/portal/application-submission/covenant-transferee/covenant-transferee.controller.spec.ts @@ -0,0 +1,192 @@ +import { classes } from '@automapper/classes'; +import { AutomapperModule } from '@automapper/nestjs'; +import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; +import { BadRequestException } from '@nestjs/common'; +import { Test, TestingModule } from '@nestjs/testing'; +import { ClsService } from 'nestjs-cls'; +import { mockKeyCloakProviders } from '../../../../test/mocks/mockTypes'; +import { ApplicationSubmissionProfile } from '../../../common/automapper/application-submission.automapper.profile'; +import { ApplicationSubmission } from '../application-submission.entity'; +import { ApplicationSubmissionService } from '../application-submission.service'; +import { CovenantTransfereeController } from './covenant-transferee.controller'; +import { CovenantTransferee } from './covenant-transferee.entity'; +import { CovenantTransfereeService } from './covenant-transferee.service'; + +describe('CovenantTransfereeController', () => { + let controller: CovenantTransfereeController; + let mockAppSubService: DeepMocked<ApplicationSubmissionService>; + let mockCovTransfereeService: DeepMocked<CovenantTransfereeService>; + + beforeEach(async () => { + mockAppSubService = createMock(); + mockCovTransfereeService = createMock(); + + const module: TestingModule = await Test.createTestingModule({ + imports: [ + AutomapperModule.forRoot({ + strategyInitializer: classes(), + }), + ], + controllers: [CovenantTransfereeController], + providers: [ + { + provide: ApplicationSubmissionService, + useValue: mockAppSubService, + }, + { + provide: CovenantTransfereeService, + useValue: mockCovTransfereeService, + }, + { + provide: ClsService, + useValue: {}, + }, + ApplicationSubmissionProfile, + ...mockKeyCloakProviders, + ], + }).compile(); + + controller = module.get<CovenantTransfereeController>( + CovenantTransfereeController, + ); + }); + + it('should be defined', () => { + expect(controller).toBeDefined(); + }); + + it('should verify access before fetching transferees and map displayName', async () => { + const transferee = new CovenantTransferee({ + firstName: 'Bruce', + lastName: 'Wayne', + }); + mockAppSubService.verifyAccessByUuid.mockResolvedValue( + new ApplicationSubmission({}), + ); + + mockCovTransfereeService.fetchBySubmissionUuid.mockResolvedValue([ + transferee, + ]); + + const owners = await controller.fetchByFileId('', { + user: { + entity: {}, + }, + }); + + expect(owners.length).toEqual(1); + expect(owners[0].displayName).toBe('Bruce Wayne'); + expect(mockAppSubService.verifyAccessByUuid).toHaveBeenCalledTimes(1); + }); + + it('should verify the dto and file access then create', async () => { + const owner = new CovenantTransferee({ + firstName: 'Bruce', + lastName: 'Wayne', + }); + mockAppSubService.verifyAccessByUuid.mockResolvedValue( + new ApplicationSubmission(), + ); + mockCovTransfereeService.create.mockResolvedValue(owner); + + const createdOwner = await controller.create( + { + firstName: 'B', + lastName: 'W', + applicationSubmissionUuid: '', + email: '', + phoneNumber: '', + typeCode: 'INDV', + }, + { + user: { + entity: {}, + }, + }, + ); + + expect(createdOwner).toBeDefined(); + expect(mockAppSubService.verifyAccessByUuid).toHaveBeenCalledTimes(1); + expect(mockCovTransfereeService.create).toHaveBeenCalledTimes(1); + }); + + it('should throw an exception when creating an individual owner without first name', async () => { + const promise = controller.create( + { + lastName: 'W', + applicationSubmissionUuid: '', + email: '', + phoneNumber: '', + typeCode: 'INDV', + }, + { + user: { + entity: {}, + }, + }, + ); + await expect(promise).rejects.toMatchObject( + new BadRequestException('Individuals require both first and last name'), + ); + }); + + it('should throw an exception when creating an organization an org name', async () => { + const promise = controller.create( + { + applicationSubmissionUuid: '', + email: '', + phoneNumber: '', + typeCode: 'ORGZ', + }, + { + user: { + entity: {}, + }, + }, + ); + await expect(promise).rejects.toMatchObject( + new BadRequestException('Organizations must have an organizationName'), + ); + }); + + it('should call through for update', async () => { + mockCovTransfereeService.update.mockResolvedValue(new CovenantTransferee()); + + const res = await controller.update( + '', + { + organizationName: 'orgName', + email: '', + phoneNumber: '', + typeCode: 'ORGZ', + }, + { + user: { + entity: {}, + }, + }, + ); + + expect(mockCovTransfereeService.update).toHaveBeenCalledTimes(1); + }); + + it('should call through for delete', async () => { + mockCovTransfereeService.delete.mockResolvedValue({} as any); + mockCovTransfereeService.getOwner.mockResolvedValue( + new CovenantTransferee(), + ); + mockAppSubService.verifyAccessByUuid.mockResolvedValue( + new ApplicationSubmission(), + ); + + await controller.delete('', { + user: { + entity: {}, + }, + }); + + expect(mockAppSubService.verifyAccessByUuid).toHaveBeenCalledTimes(1); + expect(mockCovTransfereeService.delete).toHaveBeenCalledTimes(1); + expect(mockCovTransfereeService.getOwner).toHaveBeenCalledTimes(1); + }); +}); diff --git a/services/apps/alcs/src/portal/application-submission/covenant-transferee/covenant-transferee.controller.ts b/services/apps/alcs/src/portal/application-submission/covenant-transferee/covenant-transferee.controller.ts new file mode 100644 index 0000000000..e07f2bcb33 --- /dev/null +++ b/services/apps/alcs/src/portal/application-submission/covenant-transferee/covenant-transferee.controller.ts @@ -0,0 +1,143 @@ +import { Mapper } from '@automapper/core'; +import { InjectMapper } from '@automapper/nestjs'; +import { + BadRequestException, + Body, + Controller, + Delete, + Get, + Param, + Patch, + Post, + Req, + UseGuards, +} from '@nestjs/common'; +import { PortalAuthGuard } from '../../../common/authorization/portal-auth-guard.service'; +import { OWNER_TYPE } from '../../../common/owner-type/owner-type.entity'; +import { + ApplicationOwnerCreateDto, + ApplicationOwnerUpdateDto, +} from '../application-owner/application-owner.dto'; +import { ApplicationSubmissionService } from '../application-submission.service'; +import { + CovenantTransfereeCreateDto, + CovenantTransfereeDto, + CovenantTransfereeUpdateDto, +} from './covenant-transferee.dto'; +import { CovenantTransferee } from './covenant-transferee.entity'; +import { CovenantTransfereeService } from './covenant-transferee.service'; + +@Controller('covenant-transferee') +@UseGuards(PortalAuthGuard) +export class CovenantTransfereeController { + constructor( + private covenantTransfereeService: CovenantTransfereeService, + private applicationSubmissionService: ApplicationSubmissionService, + @InjectMapper() private mapper: Mapper, + ) {} + + @Get('submission/:submissionUuid') + async fetchByFileId( + @Param('submissionUuid') submissionUuid: string, + @Req() req, + ): Promise<CovenantTransfereeDto[]> { + const applicationSubmission = + await this.applicationSubmissionService.verifyAccessByUuid( + submissionUuid, + req.user.entity, + ); + + const transferees = + await this.covenantTransfereeService.fetchBySubmissionUuid( + applicationSubmission.uuid, + ); + + return this.mapper.mapArrayAsync( + transferees, + CovenantTransferee, + CovenantTransfereeDto, + ); + } + + @Post() + async create( + @Body() createDto: CovenantTransfereeCreateDto, + @Req() req, + ): Promise<CovenantTransfereeDto> { + this.verifyDto(createDto); + + const applicationSubmission = + await this.applicationSubmissionService.verifyAccessByUuid( + createDto.applicationSubmissionUuid, + req.user.entity, + ); + const owner = await this.covenantTransfereeService.create( + createDto, + applicationSubmission, + req.user.entity, + ); + + return this.mapper.mapAsync( + owner, + CovenantTransferee, + CovenantTransfereeDto, + ); + } + + @Patch('/:uuid') + async update( + @Param('uuid') uuid: string, + @Body() updateDto: CovenantTransfereeUpdateDto, + @Req() req, + ) { + this.verifyDto(updateDto); + + const covenantTransferee = await this.covenantTransfereeService.update( + uuid, + updateDto, + req.user.entity, + ); + + return this.mapper.mapAsync( + covenantTransferee, + CovenantTransferee, + CovenantTransfereeDto, + ); + } + + @Delete('/:uuid') + async delete(@Param('uuid') uuid: string, @Req() req) { + const owner = await this.verifyAccessAndGetOwner(req, uuid); + await this.covenantTransfereeService.delete(owner); + return { uuid }; + } + + private verifyDto( + dto: ApplicationOwnerUpdateDto | ApplicationOwnerCreateDto, + ) { + if ( + dto.typeCode === OWNER_TYPE.INDIVIDUAL && + (!dto.firstName || !dto.lastName) + ) { + throw new BadRequestException( + 'Individuals require both first and last name', + ); + } + + if (dto.typeCode === OWNER_TYPE.ORGANIZATION && !dto.organizationName) { + throw new BadRequestException( + 'Organizations must have an organizationName', + ); + } + } + + private async verifyAccessAndGetOwner(@Req() req, ownerUuid: string) { + const owner = await this.covenantTransfereeService.getOwner(ownerUuid); + await this.applicationSubmissionService.verifyAccessByUuid( + owner.applicationSubmissionUuid, + req.user.entity, + ); + + return owner; + } +} diff --git a/services/apps/alcs/src/portal/application-submission/covenant-transferee/covenant-transferee.dto.ts b/services/apps/alcs/src/portal/application-submission/covenant-transferee/covenant-transferee.dto.ts new file mode 100644 index 0000000000..e377c4ea71 --- /dev/null +++ b/services/apps/alcs/src/portal/application-submission/covenant-transferee/covenant-transferee.dto.ts @@ -0,0 +1,63 @@ +import { AutoMap } from '@automapper/classes'; +import { IsOptional, IsString, Matches } from 'class-validator'; +import { OwnerTypeDto } from '../../../common/owner-type/owner-type.entity'; +import { emailRegex } from '../../../utils/email.helper'; + +export class CovenantTransfereeDto { + @AutoMap() + uuid: string; + + @AutoMap() + applicationSubmissionUuid: string; + + displayName: string; + + @AutoMap(() => String) + firstName?: string | null; + + @AutoMap(() => String) + lastName?: string | null; + + @AutoMap(() => String) + organizationName?: string | null; + + @AutoMap(() => String) + phoneNumber?: string | null; + + @AutoMap(() => String) + email?: string | null; + + @AutoMap() + type: OwnerTypeDto; +} + +export class CovenantTransfereeUpdateDto { + @IsString() + @IsOptional() + firstName?: string; + + @IsString() + @IsOptional() + lastName?: string; + + @IsString() + @IsOptional() + organizationName?: string; + + @IsString() + @IsOptional() + phoneNumber?: string; + + @Matches(emailRegex) + @IsOptional() + email?: string; + + @IsString() + @IsOptional() + typeCode?: string; +} + +export class CovenantTransfereeCreateDto extends CovenantTransfereeUpdateDto { + @IsString() + applicationSubmissionUuid: string; +} diff --git a/services/apps/alcs/src/portal/application-submission/covenant-transferee/covenant-transferee.entity.ts b/services/apps/alcs/src/portal/application-submission/covenant-transferee/covenant-transferee.entity.ts new file mode 100644 index 0000000000..55c549cc12 --- /dev/null +++ b/services/apps/alcs/src/portal/application-submission/covenant-transferee/covenant-transferee.entity.ts @@ -0,0 +1,61 @@ +import { AutoMap } from '@automapper/classes'; +import { Column, Entity, ManyToOne } from 'typeorm'; +import { Base } from '../../../common/entities/base.entity'; +import { OwnerType } from '../../../common/owner-type/owner-type.entity'; +import { ApplicationSubmission } from '../application-submission.entity'; + +@Entity() +export class CovenantTransferee extends Base { + constructor(data?: Partial<CovenantTransferee>) { + super(); + if (data) { + Object.assign(this, data); + } + } + + @AutoMap(() => String) + @Column({ + type: 'varchar', + nullable: true, + }) + firstName?: string | null; + + @AutoMap(() => String) + @Column({ + type: 'varchar', + nullable: true, + }) + lastName?: string | null; + + @AutoMap(() => String) + @Column({ + type: 'varchar', + nullable: true, + }) + organizationName?: string | null; + + @AutoMap(() => String) + @Column({ + type: 'varchar', + nullable: true, + }) + phoneNumber?: string | null; + + @AutoMap(() => String) + @Column({ + type: 'varchar', + nullable: true, + }) + email?: string | null; + + @AutoMap() + @ManyToOne(() => OwnerType, { nullable: false }) + type: OwnerType; + + @ManyToOne(() => ApplicationSubmission, { nullable: false }) + applicationSubmission: ApplicationSubmission; + + @AutoMap() + @Column() + applicationSubmissionUuid: string; +} diff --git a/services/apps/alcs/src/portal/application-submission/covenant-transferee/covenant-transferee.service.spec.ts b/services/apps/alcs/src/portal/application-submission/covenant-transferee/covenant-transferee.service.spec.ts new file mode 100644 index 0000000000..2aedf9682f --- /dev/null +++ b/services/apps/alcs/src/portal/application-submission/covenant-transferee/covenant-transferee.service.spec.ts @@ -0,0 +1,145 @@ +import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; +import { Test, TestingModule } from '@nestjs/testing'; +import { getRepositoryToken } from '@nestjs/typeorm'; +import { Repository } from 'typeorm'; +import { NotificationService } from '../../../alcs/notification/notification.service'; +import { OwnerType } from '../../../common/owner-type/owner-type.entity'; +import { User } from '../../../user/user.entity'; +import { ApplicationSubmission } from '../application-submission.entity'; +import { ApplicationSubmissionService } from '../application-submission.service'; +import { CovenantTransferee } from './covenant-transferee.entity'; +import { CovenantTransfereeService } from './covenant-transferee.service'; + +describe('CovenantTransfereeService', () => { + let service: CovenantTransfereeService; + let mockRepo: DeepMocked<Repository<CovenantTransferee>>; + let mockTypeRepo: DeepMocked<Repository<OwnerType>>; + let mockSubmissionService: DeepMocked<ApplicationSubmissionService>; + let mockNotificationService: DeepMocked<NotificationService>; + + beforeEach(async () => { + mockRepo = createMock(); + mockTypeRepo = createMock(); + mockSubmissionService = createMock(); + mockNotificationService = createMock(); + + const module: TestingModule = await Test.createTestingModule({ + providers: [ + CovenantTransfereeService, + { + provide: getRepositoryToken(CovenantTransferee), + useValue: mockRepo, + }, + { + provide: getRepositoryToken(OwnerType), + useValue: mockTypeRepo, + }, + { + provide: ApplicationSubmissionService, + useValue: mockSubmissionService, + }, + { + provide: NotificationService, + useValue: mockNotificationService, + }, + ], + }).compile(); + + service = module.get<CovenantTransfereeService>(CovenantTransfereeService); + mockSubmissionService.update.mockResolvedValue(new ApplicationSubmission()); + mockNotificationService.updateApplicant.mockResolvedValue(); + mockSubmissionService.getFileNumber.mockResolvedValue('file-number'); + }); + + it('should be defined', () => { + expect(service).toBeDefined(); + }); + + it('should call find for find', async () => { + mockRepo.find.mockResolvedValue([new CovenantTransferee()]); + + await service.fetchBySubmissionUuid(''); + + expect(mockRepo.find).toHaveBeenCalledTimes(1); + }); + + it('should load the type and then call save for create', async () => { + mockRepo.save.mockResolvedValue(new CovenantTransferee()); + mockTypeRepo.findOneOrFail.mockResolvedValue(new OwnerType()); + mockRepo.find.mockResolvedValue([]); + + await service.create( + { + applicationSubmissionUuid: '', + email: '', + phoneNumber: '', + typeCode: '', + }, + new ApplicationSubmission(), + new User(), + ); + + expect(mockRepo.save).toHaveBeenCalledTimes(1); + expect(mockTypeRepo.findOneOrFail).toHaveBeenCalledTimes(1); + }); + + it('should set properties and call save for update', async () => { + const owner = new CovenantTransferee({ + firstName: 'Bruce', + lastName: 'Wayne', + }); + mockRepo.findOneOrFail.mockResolvedValue(owner); + mockRepo.save.mockResolvedValue(new CovenantTransferee()); + mockRepo.find.mockResolvedValue([new CovenantTransferee()]); + + await service.update( + '', + { + firstName: 'I Am', + lastName: 'Batman', + email: '', + phoneNumber: '', + typeCode: '', + }, + new User(), + ); + + expect(owner.firstName).toEqual('I Am'); + expect(owner.lastName).toEqual('Batman'); + expect(mockRepo.findOneOrFail).toHaveBeenCalledTimes(1); + expect(mockRepo.save).toHaveBeenCalledTimes(1); + }); + + it('should call through for delete', async () => { + mockRepo.remove.mockResolvedValue({} as any); + mockRepo.find.mockResolvedValue([new CovenantTransferee()]); + + await service.delete(new CovenantTransferee()); + + expect(mockRepo.remove).toHaveBeenCalledTimes(1); + }); + + it('should call through for verify', async () => { + mockRepo.findOneOrFail.mockResolvedValue(new CovenantTransferee()); + + await service.getOwner(''); + + expect(mockRepo.findOneOrFail).toHaveBeenCalledTimes(1); + }); + + it('should call through for getMany', async () => { + mockRepo.find.mockResolvedValue([new CovenantTransferee()]); + + await service.getMany([]); + + expect(mockRepo.find).toHaveBeenCalledTimes(1); + }); + + it('should call through for save', async () => { + mockRepo.save.mockResolvedValue(new CovenantTransferee()); + + await service.save(new CovenantTransferee()); + + expect(mockRepo.save).toHaveBeenCalledTimes(1); + }); +}); diff --git a/services/apps/alcs/src/portal/application-submission/covenant-transferee/covenant-transferee.service.ts b/services/apps/alcs/src/portal/application-submission/covenant-transferee/covenant-transferee.service.ts new file mode 100644 index 0000000000..f2c8adbd4f --- /dev/null +++ b/services/apps/alcs/src/portal/application-submission/covenant-transferee/covenant-transferee.service.ts @@ -0,0 +1,130 @@ +import { forwardRef, Inject, Injectable } from '@nestjs/common'; +import { InjectRepository } from '@nestjs/typeorm'; +import { Any, Repository } from 'typeorm'; +import { OwnerType } from '../../../common/owner-type/owner-type.entity'; +import { User } from '../../../user/user.entity'; +import { ApplicationSubmission } from '../application-submission.entity'; +import { ApplicationSubmissionService } from '../application-submission.service'; +import { + CovenantTransfereeCreateDto, + CovenantTransfereeUpdateDto, +} from './covenant-transferee.dto'; +import { CovenantTransferee } from './covenant-transferee.entity'; + +@Injectable() +export class CovenantTransfereeService { + constructor( + @InjectRepository(CovenantTransferee) + private repository: Repository<CovenantTransferee>, + @InjectRepository(OwnerType) + private typeRepository: Repository<OwnerType>, + @Inject(forwardRef(() => ApplicationSubmissionService)) + private applicationSubmissionService: ApplicationSubmissionService, + ) {} + + async fetchBySubmissionUuid(uuid: string) { + return this.repository.find({ + where: { + applicationSubmissionUuid: uuid, + }, + relations: { + type: true, + }, + }); + } + + async create( + createDto: CovenantTransfereeCreateDto, + applicationSubmission: ApplicationSubmission, + user: User, + ) { + const type = await this.typeRepository.findOneOrFail({ + where: { + code: createDto.typeCode, + }, + }); + + const newOwner = new CovenantTransferee({ + firstName: createDto.firstName, + lastName: createDto.lastName, + organizationName: createDto.organizationName, + email: createDto.email, + phoneNumber: createDto.phoneNumber, + applicationSubmission: applicationSubmission, + type, + }); + + return await this.repository.save(newOwner); + } + + async save(owner: CovenantTransferee) { + await this.repository.save(owner); + } + + async update( + uuid: string, + updateDto: CovenantTransfereeUpdateDto, + user: User, + ) { + const existingOwner = await this.repository.findOneOrFail({ + where: { + uuid, + }, + }); + + if (updateDto.typeCode) { + existingOwner.type = await this.typeRepository.findOneOrFail({ + where: { + code: updateDto.typeCode, + }, + }); + } + existingOwner.organizationName = + updateDto.organizationName !== undefined + ? updateDto.organizationName + : existingOwner.organizationName; + + existingOwner.firstName = + updateDto.firstName !== undefined + ? updateDto.firstName + : existingOwner.firstName; + + existingOwner.lastName = + updateDto.lastName !== undefined + ? updateDto.lastName + : existingOwner.lastName; + + existingOwner.phoneNumber = + updateDto.phoneNumber !== undefined + ? updateDto.phoneNumber + : existingOwner.phoneNumber; + + existingOwner.email = + updateDto.email !== undefined ? updateDto.email : existingOwner.email; + + return await this.repository.save(existingOwner); + } + + async delete(owner: CovenantTransferee) { + return await this.repository.remove(owner); + } + + async getOwner(ownerUuid: string) { + return await this.repository.findOneOrFail({ + where: { + uuid: ownerUuid, + }, + relations: { + type: true, + }, + }); + } + + async getMany(ownerUuids: string[]) { + return await this.repository.find({ + where: { + uuid: Any(ownerUuids), + }, + }); + } +} diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1698353808690-add_covenant_submission_fields.ts b/services/apps/alcs/src/providers/typeorm/migrations/1698353808690-add_covenant_submission_fields.ts new file mode 100644 index 0000000000..a35958d7d1 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1698353808690-add_covenant_submission_fields.ts @@ -0,0 +1,47 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class addCovenantSubmissionFields1698353808690 + implements MigrationInterface +{ + name = 'addCovenantSubmissionFields1698353808690'; + + public async up(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `CREATE TABLE "alcs"."covenant_transferee" ("audit_deleted_date_at" TIMESTAMP WITH TIME ZONE, "audit_created_at" TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now(), "audit_updated_at" TIMESTAMP WITH TIME ZONE DEFAULT now(), "audit_created_by" character varying NOT NULL, "audit_updated_by" character varying, "uuid" uuid NOT NULL DEFAULT gen_random_uuid(), "first_name" character varying, "last_name" character varying, "organization_name" character varying, "phone_number" character varying, "email" character varying, "application_submission_uuid" uuid NOT NULL, "type_code" text NOT NULL, CONSTRAINT "PK_cae224f147ca2f991458001a996" PRIMARY KEY ("uuid"))`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" ADD "cove_area_impacted" numeric(12,2)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" ADD "cove_has_draft" boolean`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" ADD "cove_farm_impact" text`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."covenant_transferee" ADD CONSTRAINT "FK_b0b99b320c30dd49a15f43fd515" FOREIGN KEY ("type_code") REFERENCES "alcs"."owner_type"("code") ON DELETE NO ACTION ON UPDATE NO ACTION`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."covenant_transferee" ADD CONSTRAINT "FK_a1c022ef4e1785b2877cb6aab69" FOREIGN KEY ("application_submission_uuid") REFERENCES "alcs"."application_submission"("uuid") ON DELETE NO ACTION ON UPDATE NO ACTION`, + ); + } + + public async down(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `ALTER TABLE "alcs"."covenant_transferee" DROP CONSTRAINT "FK_a1c022ef4e1785b2877cb6aab69"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."covenant_transferee" DROP CONSTRAINT "FK_b0b99b320c30dd49a15f43fd515"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" DROP COLUMN "cove_farm_impact"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" DROP COLUMN "cove_has_draft"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" DROP COLUMN "cove_area_impacted"`, + ); + await queryRunner.query(`DROP TABLE "alcs"."covenant_transferee"`); + } +} From c2eb2b23ab3fe38b674dd4cd6ed0f0c612e7bd8b Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Mon, 30 Oct 2023 10:50:55 -0700 Subject: [PATCH 566/954] task-1229 add button enabled by default --- .../transferee-dialog.component.html | 4 +- .../transferee-dialog.component.ts | 60 ++++++++++--------- 2 files changed, 34 insertions(+), 30 deletions(-) diff --git a/portal-frontend/src/app/features/notifications/edit-submission/transferees/transferee-dialog/transferee-dialog.component.html b/portal-frontend/src/app/features/notifications/edit-submission/transferees/transferee-dialog/transferee-dialog.component.html index a2e4d42e9b..0beef716cc 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/transferees/transferee-dialog/transferee-dialog.component.html +++ b/portal-frontend/src/app/features/notifications/edit-submission/transferees/transferee-dialog/transferee-dialog.component.html @@ -79,10 +79,10 @@ <h5 class="full-row" *ngIf="type.getRawValue() === OWNER_TYPE.ORGANIZATION">Orga </div> <div mat-dialog-actions class="actions"> <button mat-stroked-button color="primary" (click)="onClose()">Cancel</button> - <button mat-flat-button color="primary" [disabled]="form.invalid || isLoading" *ngIf="!isEdit" (click)="onCreate()"> + <button mat-flat-button color="primary" [disabled]="isLoading" *ngIf="!isEdit" (click)="onCreate()"> Add </button> - <button mat-flat-button color="primary" [disabled]="form.invalid || isLoading" *ngIf="isEdit" (click)="onSave()"> + <button mat-flat-button color="primary" [disabled]="isLoading" *ngIf="isEdit" (click)="onSave()"> Save </button> </div> diff --git a/portal-frontend/src/app/features/notifications/edit-submission/transferees/transferee-dialog/transferee-dialog.component.ts b/portal-frontend/src/app/features/notifications/edit-submission/transferees/transferee-dialog/transferee-dialog.component.ts index a4a3aaec97..85260d3444 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/transferees/transferee-dialog/transferee-dialog.component.ts +++ b/portal-frontend/src/app/features/notifications/edit-submission/transferees/transferee-dialog/transferee-dialog.component.ts @@ -71,24 +71,26 @@ export class TransfereeDialogComponent { } async onCreate() { - if (!this.data.submissionUuid) { - console.error('TransfereeDialogComponent misconfigured, needs submissionUuid for create'); - return; - } - this.isLoading = true; + if (this.form.valid) { + if (!this.data.submissionUuid) { + console.error('TransfereeDialogComponent misconfigured, needs submissionUuid for create'); + return; + } + this.isLoading = true; - const createDto: NotificationTransfereeCreateDto = { - organizationName: this.organizationName.getRawValue() || undefined, - firstName: this.firstName.getRawValue() || undefined, - lastName: this.lastName.getRawValue() || undefined, - email: this.email.getRawValue()!, - phoneNumber: this.phoneNumber.getRawValue()!, - typeCode: this.type.getRawValue()!, - notificationSubmissionUuid: this.data.submissionUuid, - }; + const createDto: NotificationTransfereeCreateDto = { + organizationName: this.organizationName.getRawValue() || undefined, + firstName: this.firstName.getRawValue() || undefined, + lastName: this.lastName.getRawValue() || undefined, + email: this.email.getRawValue()!, + phoneNumber: this.phoneNumber.getRawValue()!, + typeCode: this.type.getRawValue()!, + notificationSubmissionUuid: this.data.submissionUuid, + }; - await this.transfereeService.create(createDto); - this.dialogRef.close(true); + await this.transfereeService.create(createDto); + this.dialogRef.close(true); + } } async onClose() { @@ -96,18 +98,20 @@ export class TransfereeDialogComponent { } async onSave() { - const updateDto: NotificationTransfereeUpdateDto = { - organizationName: this.organizationName.getRawValue(), - firstName: this.firstName.getRawValue(), - lastName: this.lastName.getRawValue(), - email: this.email.getRawValue()!, - phoneNumber: this.phoneNumber.getRawValue()!, - typeCode: this.type.getRawValue()!, - }; - if (this.existingUuid) { - this.isLoading = true; - await this.transfereeService.update(this.existingUuid, updateDto); - this.dialogRef.close(true); + if (this.form.valid) { + const updateDto: NotificationTransfereeUpdateDto = { + organizationName: this.organizationName.getRawValue(), + firstName: this.firstName.getRawValue(), + lastName: this.lastName.getRawValue(), + email: this.email.getRawValue()!, + phoneNumber: this.phoneNumber.getRawValue()!, + typeCode: this.type.getRawValue()!, + }; + if (this.existingUuid) { + this.isLoading = true; + await this.transfereeService.update(this.existingUuid, updateDto); + this.dialogRef.close(true); + } } } } From a093c24604859ad94bde0931a7d7e73fc481abb6 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Mon, 30 Oct 2023 10:56:57 -0700 Subject: [PATCH 567/954] Bug Fixes * Align default page size to 10 * Remove PDF button for SRWs * Remove createdBy filter accidentally set for app file numbers --- .../home/inbox/inbox-table/inbox-table.component.ts | 2 +- .../src/app/features/home/inbox/inbox.component.ts | 2 +- .../edit-submission/edit-submission.component.html | 10 ---------- .../edit-submission/edit-submission.component.ts | 6 ------ .../review-and-submit/review-and-submit.component.html | 10 ---------- .../review-and-submit.component.spec.ts | 5 ----- .../review-and-submit/review-and-submit.component.ts | 4 ---- .../view-notification-submission.component.html | 3 --- .../view-notification-submission.component.ts | 4 ---- .../application/inbox-application.service.spec.ts | 2 +- .../inbox/application/inbox-application.service.ts | 1 - 11 files changed, 3 insertions(+), 46 deletions(-) diff --git a/portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.ts b/portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.ts index 0f25c2ccc1..9dd9d328ce 100644 --- a/portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.ts +++ b/portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.ts @@ -45,7 +45,7 @@ export class InboxTableComponent implements OnDestroy { ]; dataSource = new MatTableDataSource<InboxResultDto>(); pageIndex = 0; - itemsPerPage = 20; + itemsPerPage = 10; total = 0; sortDirection = 'DESC'; sortField = 'lastUpdate'; diff --git a/portal-frontend/src/app/features/home/inbox/inbox.component.ts b/portal-frontend/src/app/features/home/inbox/inbox.component.ts index b985860311..3a035c20a1 100644 --- a/portal-frontend/src/app/features/home/inbox/inbox.component.ts +++ b/portal-frontend/src/app/features/home/inbox/inbox.component.ts @@ -53,7 +53,7 @@ export class InboxComponent implements OnInit, OnDestroy { notificationTotal = 0; pageIndex = 0; - itemsPerPage = 20; + itemsPerPage = 10; governmentFileNumber = new FormControl<string | undefined>(undefined); portalStatusControl = new FormControl<string[]>([]); diff --git a/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.component.html b/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.component.html index 78ad8d9568..ed59e1c6c4 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.component.html +++ b/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.component.html @@ -3,16 +3,6 @@ <h6 *ngIf="notificationSubmission"> Notification ID: {{ notificationSubmission.fileNumber }} | {{ notificationSubmission.type }} </h6> - <div class="header-btn-wrapper"> - <button - *ngIf="notificationSubmission?.fileNumber && cdkStepper.selectedIndex === steps.ReviewAndSubmit" - mat-flat-button - color="primary" - (click)="onDownloadPdf(notificationSubmission?.fileNumber)" - > - Download PDF - </button> - </div> </div> </ng-template> diff --git a/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.component.ts b/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.component.ts index 74cbd1a6ec..60f898ee76 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.component.ts +++ b/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.component.ts @@ -173,12 +173,6 @@ export class EditSubmissionComponent implements OnDestroy, AfterViewInit { } } - async onDownloadPdf(fileNumber: string | undefined) { - if (fileNumber) { - //TODO: Hook this up later - } - } - async onSubmit() { if (this.notificationSubmission) { this.dialog diff --git a/portal-frontend/src/app/features/notifications/edit-submission/review-and-submit/review-and-submit.component.html b/portal-frontend/src/app/features/notifications/edit-submission/review-and-submit/review-and-submit.component.html index 67656e913b..0b222a1c74 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/review-and-submit/review-and-submit.component.html +++ b/portal-frontend/src/app/features/notifications/edit-submission/review-and-submit/review-and-submit.component.html @@ -3,16 +3,6 @@ [$notificationSubmission]="$notificationSubmission" [$notificationDocuments]="$notificationDocuments" ></app-notification-details> - <div class="button-container"> - <button - *ngIf="notificationSubmission?.fileNumber" - mat-flat-button - color="primary" - (click)="onDownloadPdf(notificationSubmission?.fileNumber)" - > - Download PDF - </button> - </div> <div class="button-container"> <button (click)="onSaveExit()" mat-stroked-button color="accent">Save and Exit</button> diff --git a/portal-frontend/src/app/features/notifications/edit-submission/review-and-submit/review-and-submit.component.spec.ts b/portal-frontend/src/app/features/notifications/edit-submission/review-and-submit/review-and-submit.component.spec.ts index 1b4c879efa..25123e5153 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/review-and-submit/review-and-submit.component.spec.ts +++ b/portal-frontend/src/app/features/notifications/edit-submission/review-and-submit/review-and-submit.component.spec.ts @@ -5,7 +5,6 @@ import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { BehaviorSubject } from 'rxjs'; import { NotificationSubmissionDetailedDto } from '../../../../services/notification-submission/notification-submission.dto'; import { NotificationSubmissionService } from '../../../../services/notification-submission/notification-submission.service'; -import { PdfGenerationService } from '../../../../services/pdf-generation/pdf-generation.service'; import { ToastService } from '../../../../services/toast/toast.service'; import { ReviewAndSubmitComponent } from './review-and-submit.component'; @@ -38,10 +37,6 @@ describe('ReviewAndSubmitComponent', () => { provide: NotificationSubmissionService, useValue: mockNotificationSubmissionService, }, - { - provide: PdfGenerationService, - useValue: {}, - }, ], }).compileComponents(); diff --git a/portal-frontend/src/app/features/notifications/edit-submission/review-and-submit/review-and-submit.component.ts b/portal-frontend/src/app/features/notifications/edit-submission/review-and-submit/review-and-submit.component.ts index 6a5c201989..ed96e9a119 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/review-and-submit/review-and-submit.component.ts +++ b/portal-frontend/src/app/features/notifications/edit-submission/review-and-submit/review-and-submit.component.ts @@ -45,8 +45,4 @@ export class ReviewAndSubmitComponent extends StepComponent implements OnInit, O } } } - - async onDownloadPdf(fileNumber: string | undefined) { - //TODO - } } diff --git a/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.html b/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.html index c7f3f4883a..f8f2428568 100644 --- a/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.html +++ b/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.html @@ -49,9 +49,6 @@ <h3>Applicant Submission</h3> > Edit SRW </button> - <button mat-flat-button color="accent" (click)="onDownloadSubmissionPdf(submission.fileNumber)"> - Download PDF - </button> </div> </div> <div> diff --git a/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.ts b/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.ts index 0bf889e0a4..851f63bdfb 100644 --- a/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.ts +++ b/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.ts @@ -79,8 +79,4 @@ export class ViewNotificationSubmissionComponent implements OnInit, OnDestroy { } }); } - - onDownloadSubmissionPdf(fileNumber: string) { - //TODO: When we add PDFs - } } diff --git a/services/apps/alcs/src/portal/inbox/application/inbox-application.service.spec.ts b/services/apps/alcs/src/portal/inbox/application/inbox-application.service.spec.ts index fcc9e9c9cd..3007ece27c 100644 --- a/services/apps/alcs/src/portal/inbox/application/inbox-application.service.spec.ts +++ b/services/apps/alcs/src/portal/inbox/application/inbox-application.service.spec.ts @@ -74,7 +74,7 @@ describe('InboxApplicationService', () => { expect( mockApplicationSubmissionSearchViewRepository.createQueryBuilder, ).toBeCalledTimes(1); - expect(mockQuery.andWhere).toBeCalledTimes(8); + expect(mockQuery.andWhere).toBeCalledTimes(7); }); it('should call compileApplicationSearchQuery method correctly', async () => { diff --git a/services/apps/alcs/src/portal/inbox/application/inbox-application.service.ts b/services/apps/alcs/src/portal/inbox/application/inbox-application.service.ts index 7c6c0fff58..77ee9d33ad 100644 --- a/services/apps/alcs/src/portal/inbox/application/inbox-application.service.ts +++ b/services/apps/alcs/src/portal/inbox/application/inbox-application.service.ts @@ -117,7 +117,6 @@ export class InboxApplicationService { if (searchDto.fileNumber) { query .andWhere('appSearch.file_number = :fileNumber') - .andWhere('appSearch.created_by_uuid = :userUuid') .setParameters({ fileNumber: searchDto.fileNumber ?? null, userUuid }); } From 3748bafa30f7dea7b2cd3185bb5220b55277e42f Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Mon, 30 Oct 2023 11:18:42 -0700 Subject: [PATCH 568/954] Update Missed Text for NOI Decisions Linked Modification Request -> Linked Request --- .../decision/decision-dialog/decision-dialog.component.html | 2 +- .../decision-v2/decision-input/decision-input-v2.component.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-dialog/decision-dialog.component.html b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-dialog/decision-dialog.component.html index 1f0a607e2b..6908fc6af1 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-dialog/decision-dialog.component.html +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-dialog/decision-dialog.component.html @@ -40,7 +40,7 @@ <h2 class="card-title">{{ isEdit ? 'Edit' : 'Create' }} Decision</h2> class="card-post-decision" [items]="postDecisions" appendTo="body" - placeholder="Linked Modification Request *" + placeholder="Linked Request *" bindLabel="label" bindValue="uuid" [clearable]="false" diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-input-v2.component.html b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-input-v2.component.html index 5886aa7486..4bd28b7620 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-input-v2.component.html +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-input-v2.component.html @@ -90,7 +90,7 @@ <h3>Resolution</h3> class="card-post-decision" [items]="postDecisions" appendTo="body" - placeholder="Linked Modification Request *" + placeholder="Linked Request *" bindLabel="label" bindValue="uuid" [clearable]="false" From 88564fdd687afacf938806ff10ba47141b536a62 Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Mon, 30 Oct 2023 12:55:17 -0700 Subject: [PATCH 569/954] Task-1267 Commissioner header says 'Business Days' --- .../src/app/features/commissioner/commissioner.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alcs-frontend/src/app/features/commissioner/commissioner.component.html b/alcs-frontend/src/app/features/commissioner/commissioner.component.html index c09404d0bb..8984d0890b 100644 --- a/alcs-frontend/src/app/features/commissioner/commissioner.component.html +++ b/alcs-frontend/src/app/features/commissioner/commissioner.component.html @@ -1,6 +1,6 @@ <div class="layout"> <div class="application"> - <app-details-header [application]="application" heading="Application"></app-details-header> + <app-details-header [application]="application" heading="Application" days="Business Days"></app-details-header> <section class="content"> <app-document *ngIf="fileNumber" From 7e8b422490a878867742587fc433a16e8dd0d83d Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Mon, 30 Oct 2023 13:21:18 -0700 Subject: [PATCH 570/954] Remove double asterisk --- .../edit-reconsideration-dialog.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alcs-frontend/src/app/features/application/post-decision/edit-reconsideration-dialog/edit-reconsideration-dialog.component.html b/alcs-frontend/src/app/features/application/post-decision/edit-reconsideration-dialog/edit-reconsideration-dialog.component.html index e6618cee74..4fb9f7cdc3 100644 --- a/alcs-frontend/src/app/features/application/post-decision/edit-reconsideration-dialog/edit-reconsideration-dialog.component.html +++ b/alcs-frontend/src/app/features/application/post-decision/edit-reconsideration-dialog/edit-reconsideration-dialog.component.html @@ -31,7 +31,7 @@ <h2 class="card-title">Edit Reconsideration</h2> </div> <mat-form-field appearance="outline"> - <mat-label>Resolutions to be Reconsidered*</mat-label> + <mat-label>Resolutions to be Reconsidered</mat-label> <mat-select formControlName="reconsidersDecisions" multiple> <mat-option *ngFor="let decision of decisions" [value]="decision.uuid">{{ decision.resolution }}</mat-option> </mat-select> From 25c7a63b933d0fd64318a0d50104e55e41f9d072 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Mon, 30 Oct 2023 15:09:57 -0700 Subject: [PATCH 571/954] Code Review Feedback --- .../cove-details/cove-details.component.spec.ts | 2 ++ .../migrations/1698353808690-add_covenant_submission_fields.ts | 3 +++ 2 files changed, 5 insertions(+) diff --git a/portal-frontend/src/app/features/applications/application-details/cove-details/cove-details.component.spec.ts b/portal-frontend/src/app/features/applications/application-details/cove-details/cove-details.component.spec.ts index 4fbcec7bc9..8a6a682ad3 100644 --- a/portal-frontend/src/app/features/applications/application-details/cove-details/cove-details.component.spec.ts +++ b/portal-frontend/src/app/features/applications/application-details/cove-details/cove-details.component.spec.ts @@ -1,3 +1,4 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { DeepMocked } from '@golevelup/ts-jest'; import { CovenantTransfereeService } from '../../../../services/covenant-transferee/covenant-transferee.service'; @@ -30,6 +31,7 @@ describe('CoveDetailsComponent', () => { useValue: mockTransfereeService, }, ], + schemas: [NO_ERRORS_SCHEMA], }).compileComponents(); fixture = TestBed.createComponent(CoveDetailsComponent); diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1698353808690-add_covenant_submission_fields.ts b/services/apps/alcs/src/providers/typeorm/migrations/1698353808690-add_covenant_submission_fields.ts index a35958d7d1..a7fc97a756 100644 --- a/services/apps/alcs/src/providers/typeorm/migrations/1698353808690-add_covenant_submission_fields.ts +++ b/services/apps/alcs/src/providers/typeorm/migrations/1698353808690-add_covenant_submission_fields.ts @@ -24,6 +24,9 @@ export class addCovenantSubmissionFields1698353808690 await queryRunner.query( `ALTER TABLE "alcs"."covenant_transferee" ADD CONSTRAINT "FK_a1c022ef4e1785b2877cb6aab69" FOREIGN KEY ("application_submission_uuid") REFERENCES "alcs"."application_submission"("uuid") ON DELETE NO ACTION ON UPDATE NO ACTION`, ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."covenant_transferee" IS 'Stores Transferees for Restrictive Covenant Applications'`, + ); } public async down(queryRunner: QueryRunner): Promise<void> { From daf820123dc73f0cd739c9b997c5a24c98d49a33 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Mon, 30 Oct 2023 16:28:19 -0700 Subject: [PATCH 572/954] Add Covenant Validation and ALCS View * Added validation in backend + tests for Covenant Submissions * Add covenant proposal step to ALCS * Update SRW Terms Label --- .../application-details.component.html | 6 + .../application-details.component.spec.ts | 3 + .../application-details.module.ts | 2 + .../cove-details/cove-details.component.html | 72 +++++++++ .../cove-details/cove-details.component.scss | 10 ++ .../cove-details.component.spec.ts | 44 ++++++ .../cove-details/cove-details.component.ts | 55 +++++++ .../application-submission.service.spec.ts | 3 + .../application-submission.service.ts | 11 +- .../services/application/application.dto.ts | 17 ++ .../cove-details/cove-details.component.ts | 4 +- .../select-government.component.html | 2 +- .../select-government.component.ts | 4 +- .../application-submission.controller.spec.ts | 28 ++-- .../application-submission.controller.ts | 20 ++- .../application-submission.service.spec.ts | 16 ++ .../application-submission.service.ts | 17 ++ .../alcs/application/application.module.ts | 2 + ...ation-submission-validator.service.spec.ts | 145 ++++++++++++++---- ...pplication-submission-validator.service.ts | 63 ++++++++ .../application-submission.entity.ts | 7 - .../covenant-transferee.service.ts | 14 ++ .../1698708663714-relabel_srw_terms.ts | 15 ++ 23 files changed, 503 insertions(+), 57 deletions(-) create mode 100644 alcs-frontend/src/app/features/application/applicant-info/application-details/cove-details/cove-details.component.html create mode 100644 alcs-frontend/src/app/features/application/applicant-info/application-details/cove-details/cove-details.component.scss create mode 100644 alcs-frontend/src/app/features/application/applicant-info/application-details/cove-details/cove-details.component.spec.ts create mode 100644 alcs-frontend/src/app/features/application/applicant-info/application-details/cove-details/cove-details.component.ts create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1698708663714-relabel_srw_terms.ts diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.html b/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.html index bcd74331c1..f1b83427ee 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.html +++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.html @@ -193,6 +193,12 @@ <h3>Proposal</h3> [files]="files" > </app-incl-details> + <app-cove-details + *ngIf="submission && applicationType === 'COVE'" + [applicationSubmission]="submission" + [files]="files" + > + </app-cove-details> <div class="review-table edit-section"> <div class="full-width center"> <button *ngIf="showEdit" [disabled]="disableEdit" (click)="onEdit(5)" mat-flat-button color="accent"> diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.spec.ts b/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.spec.ts index 0f2f203f54..1cc93143fb 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.spec.ts +++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.spec.ts @@ -109,6 +109,9 @@ describe('ApplicationDetailsComponent', () => { turOutsideLands: null, turReduceNegativeImpacts: null, turTotalCorridorArea: null, + coveHasDraft: null, + coveFarmImpact: null, + coveAreaImpacted: null, primaryContact: { type: { code: '', diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.module.ts b/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.module.ts index 7a74386482..c67312e3dd 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.module.ts +++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.module.ts @@ -2,6 +2,7 @@ import { CommonModule, NgForOf, NgIf } from '@angular/common'; import { NgModule } from '@angular/core'; import { SharedModule } from '../../../../shared/shared.module'; import { ApplicationDetailsComponent } from './application-details.component'; +import { CoveDetailsComponent } from './cove-details/cove-details.component'; import { InclDetailsComponent } from './incl-details/incl-details.component'; import { NaruDetailsComponent } from './naru-details/naru-details.component'; import { NfuDetailsComponent } from './nfu-details/nfu-details.component'; @@ -26,6 +27,7 @@ import { ExclDetailsComponent } from './excl-details/excl-details.component'; NaruDetailsComponent, ExclDetailsComponent, InclDetailsComponent, + CoveDetailsComponent, ], imports: [CommonModule, SharedModule], exports: [ApplicationDetailsComponent], diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/cove-details/cove-details.component.html b/alcs-frontend/src/app/features/application/applicant-info/application-details/cove-details/cove-details.component.html new file mode 100644 index 0000000000..343a3368b3 --- /dev/null +++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/cove-details/cove-details.component.html @@ -0,0 +1,72 @@ +<div *ngIf="_applicationSubmission" class="review-table"> + <div class="subheading2 full-width">Provide the name and contact information for all transferees</div> + <div class="full-width transferee-table"> + <div class="subheading2">Type</div> + <div class="subheading2">Full Name</div> + <div class="subheading2">Organization Name</div> + <div class="subheading2">Phone</div> + <div class="subheading2">Email</div> + <ng-container *ngFor="let transferee of transferees"> + <div>{{ transferee.type.code === 'INDV' ? 'Individual' : 'Organization' }}</div> + <div>{{ transferee.displayName }}</div> + <div> + {{ transferee.organizationName }} + <app-no-data [showRequired]="false" *ngIf="!transferee.organizationName"></app-no-data> + </div> + <div> + <span *ngIf="transferee.phoneNumber">{{ transferee.phoneNumber | mask : '(000) 000-0000' }}</span> + </div> + <div>{{ transferee.email }}</div> + </ng-container> + </div> + <app-no-data class="full-width" [showRequired]="showErrors" *ngIf="transferees.length === 0"></app-no-data> + + <div class="subheading2 grid-1">How many hectares will the covenant impact?</div> + <div class="grid-double"> + {{ _applicationSubmission.coveAreaImpacted }}<span *ngIf="_applicationSubmission.coveAreaImpacted"> ha</span> + <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.coveAreaImpacted"></app-no-data> + </div> + + <div class="subheading2 grid-1">What is the purpose of this covenant?</div> + <div class="grid-double"> + {{ _applicationSubmission.purpose }} + <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.purpose"></app-no-data> + </div> + + <div class="subheading2 grid-1">Explain how the covenant impacts the use of agricultural land for farm purposes.</div> + <div class="grid-double"> + <span *ngIf="_applicationSubmission.coveFarmImpact !== null"> + {{ _applicationSubmission.coveFarmImpact }} + </span> + <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.coveFarmImpact"></app-no-data> + </div> + + <div class="subheading2 grid-1">Proposal Map / Site Plan</div> + <div class="grid-double"> + <a *ngFor="let map of proposalMap" (click)="openFile(map)"> + {{ map.fileName }} + </a> + <app-no-data [showRequired]="showErrors" *ngIf="proposalMap.length === 0"></app-no-data> + </div> + + <div class="subheading2 grid-1">Do you have a draft copy of the covenant?</div> + <div class="grid-double"> + <span *ngIf="_applicationSubmission.coveHasDraft !== null"> + {{ _applicationSubmission.coveHasDraft ? 'Yes' : 'No' }} + </span> + <app-no-data [showRequired]="showErrors" *ngIf="_applicationSubmission.coveHasDraft === null"></app-no-data> + </div> + + <div class="subheading2 grid-1">Draft Covenant</div> + <div class="grid-double"> + <div *ngFor="let file of srwTerms"> + <a (click)="openFile(file)"> + {{ file.fileName }} + </a> + </div> + <app-no-data + [showRequired]="showErrors && !!_applicationSubmission.coveHasDraft" + *ngIf="srwTerms.length === 0" + ></app-no-data> + </div> +</div> diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/cove-details/cove-details.component.scss b/alcs-frontend/src/app/features/application/applicant-info/application-details/cove-details/cove-details.component.scss new file mode 100644 index 0000000000..bdc16e75f5 --- /dev/null +++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/cove-details/cove-details.component.scss @@ -0,0 +1,10 @@ + +.transferee-table { + display: grid; + grid-template-columns: minmax(max-content, 1fr) minmax(max-content, 1fr) minmax(max-content, 1fr) minmax(max-content, 1fr) minmax(max-content, 1fr); + overflow-x: auto; + grid-column-gap: 36px; + grid-row-gap: 12px; + overflow: unset; + margin-bottom: 12px; +} diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/cove-details/cove-details.component.spec.ts b/alcs-frontend/src/app/features/application/applicant-info/application-details/cove-details/cove-details.component.spec.ts new file mode 100644 index 0000000000..56b4eef009 --- /dev/null +++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/cove-details/cove-details.component.spec.ts @@ -0,0 +1,44 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { DeepMocked } from '@golevelup/ts-jest'; +import { ApplicationDocumentService } from '../../../../../services/application/application-document/application-document.service'; +import { ApplicationParcelService } from '../../../../../services/application/application-parcel/application-parcel.service'; +import { ApplicationSubmissionService } from '../../../../../services/application/application-submission/application-submission.service'; +import { CoveDetailsComponent } from './cove-details.component'; + +describe('CoveDetailsComponent', () => { + let component: CoveDetailsComponent; + let fixture: ComponentFixture<CoveDetailsComponent>; + let mockAppDocumentService: DeepMocked<ApplicationDocumentService>; + let mockAppParcelService: DeepMocked<ApplicationParcelService>; + let mockAppSubService: DeepMocked<ApplicationSubmissionService>; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [CoveDetailsComponent], + providers: [ + { + provide: ApplicationDocumentService, + useValue: mockAppDocumentService, + }, + { + provide: ApplicationParcelService, + useValue: mockAppParcelService, + }, + { + provide: ApplicationSubmissionService, + useValue: mockAppSubService, + }, + ], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(CoveDetailsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/cove-details/cove-details.component.ts b/alcs-frontend/src/app/features/application/applicant-info/application-details/cove-details/cove-details.component.ts new file mode 100644 index 0000000000..d45738e83b --- /dev/null +++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/cove-details/cove-details.component.ts @@ -0,0 +1,55 @@ +import { Component, Input } from '@angular/core'; +import { Router } from '@angular/router'; +import { ApplicationDocumentDto } from '../../../../../services/application/application-document/application-document.dto'; +import { ApplicationDocumentService } from '../../../../../services/application/application-document/application-document.service'; +import { ApplicationSubmissionService } from '../../../../../services/application/application-submission/application-submission.service'; +import { ApplicationSubmissionDto, CovenantTransfereeDto } from '../../../../../services/application/application.dto'; +import { DOCUMENT_TYPE } from '../../../../../shared/document/document.dto'; + +@Component({ + selector: 'app-cove-details', + templateUrl: './cove-details.component.html', + styleUrls: ['./cove-details.component.scss'], +}) +export class CoveDetailsComponent { + @Input() showErrors = true; + @Input() showEdit = true; + @Input() draftMode = false; + + _applicationSubmission: ApplicationSubmissionDto | undefined; + + @Input() set applicationSubmission(applicationSubmission: ApplicationSubmissionDto | undefined) { + if (applicationSubmission) { + this._applicationSubmission = applicationSubmission; + this.loadTransferees(applicationSubmission.fileNumber); + } + } + + @Input() set files(documents: ApplicationDocumentDto[] | undefined) { + if (documents) { + this.proposalMap = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.PROPOSAL_MAP); + this.srwTerms = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.SRW_TERMS); + } + } + + proposalMap: ApplicationDocumentDto[] = []; + srwTerms: ApplicationDocumentDto[] = []; + transferees: CovenantTransfereeDto[] = []; + + constructor( + private router: Router, + private applicationDocumentService: ApplicationDocumentService, + private appSubmissionService: ApplicationSubmissionService + ) {} + + async openFile(file: ApplicationDocumentDto) { + await this.applicationDocumentService.download(file.uuid, file.fileName); + } + + private async loadTransferees(fileNumber: string) { + const transferees = await this.appSubmissionService.fetchTransferees(fileNumber); + if (transferees) { + this.transferees = transferees; + } + } +} diff --git a/alcs-frontend/src/app/services/application/application-submission/application-submission.service.spec.ts b/alcs-frontend/src/app/services/application/application-submission/application-submission.service.spec.ts index e891624796..d106476ea7 100644 --- a/alcs-frontend/src/app/services/application/application-submission/application-submission.service.spec.ts +++ b/alcs-frontend/src/app/services/application/application-submission/application-submission.service.spec.ts @@ -107,6 +107,9 @@ describe('ApplicationSubmissionService', () => { inclGovernmentOwnsAllParcels: null, exclWhyLand: null, inclExclHectares: null, + coveAreaImpacted: null, + coveFarmImpact: null, + coveHasDraft: null, prescribedBody: null, submissionStatuses: [], }; diff --git a/alcs-frontend/src/app/services/application/application-submission/application-submission.service.ts b/alcs-frontend/src/app/services/application/application-submission/application-submission.service.ts index 9ec1e88d94..0b7f412714 100644 --- a/alcs-frontend/src/app/services/application/application-submission/application-submission.service.ts +++ b/alcs-frontend/src/app/services/application/application-submission/application-submission.service.ts @@ -4,7 +4,7 @@ import { firstValueFrom } from 'rxjs'; import { environment } from '../../../../environments/environment'; import { openFileInline } from '../../../shared/utils/file'; import { ToastService } from '../../toast/toast.service'; -import { ApplicationSubmissionDto, UpdateApplicationSubmissionDto } from '../application.dto'; +import { ApplicationSubmissionDto, CovenantTransfereeDto, UpdateApplicationSubmissionDto } from '../application.dto'; @Injectable({ providedIn: 'root', @@ -44,4 +44,13 @@ export class ApplicationSubmissionService { throw e; } } + + async fetchTransferees(fileNumber: string) { + try { + return firstValueFrom(this.http.get<CovenantTransfereeDto[]>(`${this.baseUrl}/${fileNumber}/transferee`)); + } catch (e) { + this.toastService.showErrorToast('Failed to fetch Application Transfrees'); + throw e; + } + } } diff --git a/alcs-frontend/src/app/services/application/application.dto.ts b/alcs-frontend/src/app/services/application/application.dto.ts index 0e3b34dae0..3dd7764955 100644 --- a/alcs-frontend/src/app/services/application/application.dto.ts +++ b/alcs-frontend/src/app/services/application/application.dto.ts @@ -214,6 +214,11 @@ export interface ApplicationSubmissionDto { inclImprovements: string | null; exclShareGovernmentBorders: boolean | null; inclGovernmentOwnsAllParcels: boolean | null; + + //Covenant Fields + coveHasDraft: boolean | null; + coveFarmImpact: string | null; + coveAreaImpacted: number | null; } export interface ApplicationDto { @@ -285,3 +290,15 @@ export interface UpdateApplicationDto { proposalEndDate?: number; proposalExpiryDate?: number; } + +export interface CovenantTransfereeDto { + uuid: string; + applicationSubmissionUuid: string; + displayName: string; + firstName: string | null; + lastName: string | null; + organizationName: string | null; + phoneNumber: string | null; + email: string | null; + type: BaseCodeDto; +} diff --git a/portal-frontend/src/app/features/applications/application-details/cove-details/cove-details.component.ts b/portal-frontend/src/app/features/applications/application-details/cove-details/cove-details.component.ts index e0eb30d3ce..c53b94252c 100644 --- a/portal-frontend/src/app/features/applications/application-details/cove-details/cove-details.component.ts +++ b/portal-frontend/src/app/features/applications/application-details/cove-details/cove-details.component.ts @@ -1,8 +1,8 @@ -import { Component, Input, OnInit } from '@angular/core'; +import { Component, Input } from '@angular/core'; import { Router } from '@angular/router'; +import { ApplicationDocumentDto } from '../../../../services/application-document/application-document.dto'; import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; import { ApplicationSubmissionDetailedDto } from '../../../../services/application-submission/application-submission.dto'; -import { ApplicationDocumentDto } from '../../../../services/application-document/application-document.dto'; import { CovenantTransfereeDto } from '../../../../services/covenant-transferee/covenant-transferee.dto'; import { CovenantTransfereeService } from '../../../../services/covenant-transferee/covenant-transferee.service'; import { DOCUMENT_TYPE } from '../../../../shared/dto/document.dto'; diff --git a/portal-frontend/src/app/features/applications/edit-submission/select-government/select-government.component.html b/portal-frontend/src/app/features/applications/edit-submission/select-government/select-government.component.html index c6b2f40f23..6ba310a3c0 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/select-government/select-government.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/select-government/select-government.component.html @@ -45,7 +45,7 @@ <h2>Government</h2> will need to 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> </app-warning-banner> -<app-warning-banner *ngIf="selectedOwnGovernment && typeCode !== 'TURP'" class="full-row"> +<app-warning-banner *ngIf="selectedOwnGovernment && requiresGovernmentReview" 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 application is submitted. diff --git a/portal-frontend/src/app/features/applications/edit-submission/select-government/select-government.component.ts b/portal-frontend/src/app/features/applications/edit-submission/select-government/select-government.component.ts index 8b96ffb706..ba8df2a1b9 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/select-government/select-government.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/select-government/select-government.component.ts @@ -30,7 +30,7 @@ export class SelectGovernmentComponent extends StepComponent implements OnInit, form = new FormGroup({ localGovernment: this.localGovernment, }); - typeCode = ''; + requiresGovernmentReview = false; constructor(private codeService: CodeService, private applicationSubmissionService: ApplicationSubmissionService) { super(); @@ -44,7 +44,7 @@ export class SelectGovernmentComponent extends StepComponent implements OnInit, this.selectGovernmentUuid = applicationSubmission.localGovernmentUuid; this.fileId = applicationSubmission.fileNumber; this.submissionUuid = applicationSubmission.uuid; - this.typeCode = applicationSubmission.typeCode; + this.requiresGovernmentReview = applicationSubmission.requiresGovernmentReview; this.populateLocalGovernment(applicationSubmission.localGovernmentUuid); } }); diff --git a/services/apps/alcs/src/alcs/application/application-submission/application-submission.controller.spec.ts b/services/apps/alcs/src/alcs/application/application-submission/application-submission.controller.spec.ts index dce7a1f24b..e11d3c7ce1 100644 --- a/services/apps/alcs/src/alcs/application/application-submission/application-submission.controller.spec.ts +++ b/services/apps/alcs/src/alcs/application/application-submission/application-submission.controller.spec.ts @@ -1,3 +1,5 @@ +import { classes } from '@automapper/classes'; +import { AutomapperModule } from '@automapper/nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { ClsService } from 'nestjs-cls'; @@ -19,6 +21,11 @@ describe('ApplicationSubmissionController', () => { mockDocumentService = createMock(); const module: TestingModule = await Test.createTestingModule({ + imports: [ + AutomapperModule.forRoot({ + strategyInitializer: classes(), + }), + ], controllers: [ApplicationSubmissionController], providers: [ { @@ -63,22 +70,17 @@ describe('ApplicationSubmissionController', () => { expect(result).toBeDefined(); }); - it('should call documentService to get inline download url Submission', async () => { - const fakeDownloadUrl = 'fake_download'; - const fakeUuid = 'fake'; + it('should call through to service for fetching transferees', async () => { + const fakeFileNumber = 'fake'; - mockDocumentService.getDocument.mockResolvedValue({} as Document); - mockDocumentService.getDownloadUrl.mockResolvedValue(fakeDownloadUrl); + mockApplicationSubmissionService.getTransferees.mockResolvedValue([]); - const result = await controller.downloadFile(fakeUuid); + const result = await controller.getCovenantTransferees(fakeFileNumber); - expect(mockDocumentService.getDocument).toBeCalledTimes(1); - expect(mockDocumentService.getDownloadUrl).toBeCalledTimes(1); - expect(mockDocumentService.getDocument).toBeCalledWith(fakeUuid); - expect(mockDocumentService.getDownloadUrl).toBeCalledWith( - {} as Document, - true, + expect(mockApplicationSubmissionService.getTransferees).toBeCalledTimes(1); + expect(mockApplicationSubmissionService.getTransferees).toBeCalledWith( + fakeFileNumber, ); - expect(result).toEqual({ url: fakeDownloadUrl }); + expect(result).toEqual([]); }); }); diff --git a/services/apps/alcs/src/alcs/application/application-submission/application-submission.controller.ts b/services/apps/alcs/src/alcs/application/application-submission/application-submission.controller.ts index 8893f811de..18b45da712 100644 --- a/services/apps/alcs/src/alcs/application/application-submission/application-submission.controller.ts +++ b/services/apps/alcs/src/alcs/application/application-submission/application-submission.controller.ts @@ -1,12 +1,16 @@ +import { Mapper } from '@automapper/core'; +import { InjectMapper } from '@automapper/nestjs'; import { Body, Controller, Get, Param, Patch, UseGuards } from '@nestjs/common'; import { ApiOAuth2 } from '@nestjs/swagger'; import * as config from 'config'; import { ServiceValidationException } from '../../../../../../libs/common/src/exceptions/base.exception'; -import { SUBMISSION_STATUS } from '../application-submission-status/submission-status.dto'; import { ANY_AUTH_ROLE } from '../../../common/authorization/roles'; import { RolesGuard } from '../../../common/authorization/roles-guard.service'; import { UserRoles } from '../../../common/authorization/roles.decorator'; import { DocumentService } from '../../../document/document.service'; +import { CovenantTransfereeDto } from '../../../portal/application-submission/covenant-transferee/covenant-transferee.dto'; +import { CovenantTransferee } from '../../../portal/application-submission/covenant-transferee/covenant-transferee.entity'; +import { SUBMISSION_STATUS } from '../application-submission-status/submission-status.dto'; import { AlcsApplicationSubmissionUpdateDto } from './application-submission.dto'; import { ApplicationSubmissionService } from './application-submission.service'; @@ -17,6 +21,7 @@ export class ApplicationSubmissionController { constructor( private applicationSubmissionService: ApplicationSubmissionService, private documentService: DocumentService, + @InjectMapper() private mapper: Mapper, ) {} @UserRoles(...ANY_AUTH_ROLE) @@ -27,6 +32,19 @@ export class ApplicationSubmissionController { return await this.applicationSubmissionService.mapToDto(submission); } + @UserRoles(...ANY_AUTH_ROLE) + @Get('/:fileNumber/transferee') + async getCovenantTransferees(@Param('fileNumber') fileNumber: string) { + const covenantTransferees = + await this.applicationSubmissionService.getTransferees(fileNumber); + + return this.mapper.mapArray( + covenantTransferees, + CovenantTransferee, + CovenantTransfereeDto, + ); + } + @UserRoles(...ANY_AUTH_ROLE) @Get('/document/:uuid/open') async downloadFile(@Param('uuid') uuid: string) { diff --git a/services/apps/alcs/src/alcs/application/application-submission/application-submission.service.spec.ts b/services/apps/alcs/src/alcs/application/application-submission/application-submission.service.spec.ts index 66e5fb6903..47ff6c355c 100644 --- a/services/apps/alcs/src/alcs/application/application-submission/application-submission.service.spec.ts +++ b/services/apps/alcs/src/alcs/application/application-submission/application-submission.service.spec.ts @@ -4,6 +4,7 @@ import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; +import { CovenantTransferee } from '../../../portal/application-submission/covenant-transferee/covenant-transferee.entity'; import { ApplicationSubmissionStatusService } from '../application-submission-status/application-submission-status.service'; import { ApplicationSubmissionStatusType } from '../application-submission-status/submission-status-type.entity'; import { SUBMISSION_STATUS } from '../application-submission-status/submission-status.dto'; @@ -22,11 +23,13 @@ describe('ApplicationSubmissionService', () => { Repository<ApplicationSubmissionStatusType> >; let mockApplicationSubmissionStatusService: DeepMocked<ApplicationSubmissionStatusService>; + let mockCovenantTransfereeRepo: DeepMocked<Repository<CovenantTransferee>>; beforeEach(async () => { mockApplicationSubmissionRepository = createMock(); mockApplicationStatusRepository = createMock(); mockApplicationSubmissionStatusService = createMock(); + mockCovenantTransfereeRepo = createMock(); const module: TestingModule = await Test.createTestingModule({ imports: [ @@ -50,6 +53,10 @@ describe('ApplicationSubmissionService', () => { provide: ApplicationSubmissionStatusService, useValue: mockApplicationSubmissionStatusService, }, + { + provide: getRepositoryToken(CovenantTransferee), + useValue: mockCovenantTransfereeRepo, + }, ], }).compile(); @@ -151,4 +158,13 @@ describe('ApplicationSubmissionService', () => { SUBMISSION_STATUS.ALC_DECISION, ); }); + + it('should call repo for retrieving transferees', async () => { + mockCovenantTransfereeRepo.find.mockResolvedValue([]); + + const result = await service.getTransferees('file-number'); + + expect(result).toBeDefined(); + expect(mockCovenantTransfereeRepo.find).toBeCalledTimes(1); + }); }); diff --git a/services/apps/alcs/src/alcs/application/application-submission/application-submission.service.ts b/services/apps/alcs/src/alcs/application/application-submission/application-submission.service.ts index 57bc046b8e..f79976302c 100644 --- a/services/apps/alcs/src/alcs/application/application-submission/application-submission.service.ts +++ b/services/apps/alcs/src/alcs/application/application-submission/application-submission.service.ts @@ -6,6 +6,7 @@ import { Repository } from 'typeorm'; import { ApplicationOwnerDto } from '../../../portal/application-submission/application-owner/application-owner.dto'; import { ApplicationOwner } from '../../../portal/application-submission/application-owner/application-owner.entity'; import { ApplicationSubmission } from '../../../portal/application-submission/application-submission.entity'; +import { CovenantTransferee } from '../../../portal/application-submission/covenant-transferee/covenant-transferee.entity'; import { filterUndefined } from '../../../utils/undefined'; import { ApplicationSubmissionStatusService } from '../application-submission-status/application-submission-status.service'; import { ApplicationSubmissionStatusType } from '../application-submission-status/submission-status-type.entity'; @@ -22,6 +23,8 @@ export class ApplicationSubmissionService { private applicationStatusRepository: Repository<ApplicationSubmissionStatusType>, @InjectMapper() private mapper: Mapper, private applicationSubmissionStatusService: ApplicationSubmissionStatusService, + @InjectRepository(CovenantTransferee) + private covenantTransfereeRepository: Repository<CovenantTransferee>, ) {} async get(fileNumber: string) { @@ -41,6 +44,20 @@ export class ApplicationSubmissionService { }); } + async getTransferees(fileNumber: string) { + return this.covenantTransfereeRepository.find({ + where: { + applicationSubmission: { + fileNumber, + isDraft: false, + }, + }, + relations: { + type: true, + }, + }); + } + async mapToDto(submission: ApplicationSubmission) { const mappedSubmission = await this.mapper.mapAsync( submission, diff --git a/services/apps/alcs/src/alcs/application/application.module.ts b/services/apps/alcs/src/alcs/application/application.module.ts index 9b75149e09..4498e03076 100644 --- a/services/apps/alcs/src/alcs/application/application.module.ts +++ b/services/apps/alcs/src/alcs/application/application.module.ts @@ -1,5 +1,6 @@ import { forwardRef, Module } from '@nestjs/common'; import { TypeOrmModule } from '@nestjs/typeorm'; +import { CovenantTransferee } from '../../portal/application-submission/covenant-transferee/covenant-transferee.entity'; import { ApplicationSubmissionStatusModule } from './application-submission-status/application-submission-status.module'; import { ApplicationSubmissionStatusType } from './application-submission-status/submission-status-type.entity'; import { ApplicationSubmissionToSubmissionStatus } from './application-submission-status/submission-status.entity'; @@ -58,6 +59,7 @@ import { ApplicationService } from './application.service'; ApplicationSubmissionStatusType, ApplicationSubmissionToSubmissionStatus, LocalGovernment, + CovenantTransferee, ]), MessageModule, DocumentModule, diff --git a/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.spec.ts b/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.spec.ts index a447549300..937831ced7 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.spec.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.spec.ts @@ -21,6 +21,8 @@ import { ApplicationParcel } from './application-parcel/application-parcel.entit import { ApplicationParcelService } from './application-parcel/application-parcel.service'; import { ApplicationSubmissionValidatorService } from './application-submission-validator.service'; import { ApplicationSubmission } from './application-submission.entity'; +import { CovenantTransferee } from './covenant-transferee/covenant-transferee.entity'; +import { CovenantTransfereeService } from './covenant-transferee/covenant-transferee.service'; function includesError(errors: Error[], target: Error) { return errors.some((error) => error.message === target.message); @@ -31,11 +33,13 @@ describe('ApplicationSubmissionValidatorService', () => { let mockLGService: DeepMocked<LocalGovernmentService>; let mockAppParcelService: DeepMocked<ApplicationParcelService>; let mockAppDocumentService: DeepMocked<ApplicationDocumentService>; + let mockCovenantTransfereeService: DeepMocked<CovenantTransfereeService>; beforeEach(async () => { mockLGService = createMock(); mockAppParcelService = createMock(); mockAppDocumentService = createMock(); + mockCovenantTransfereeService = createMock(); const module: TestingModule = await Test.createTestingModule({ providers: [ @@ -52,6 +56,10 @@ describe('ApplicationSubmissionValidatorService', () => { provide: ApplicationDocumentService, useValue: mockAppDocumentService, }, + { + provide: CovenantTransfereeService, + useValue: mockCovenantTransfereeService, + }, ], }).compile(); @@ -1327,42 +1335,119 @@ describe('ApplicationSubmissionValidatorService', () => { ), ).toBe(false); }); + + it('should reject mismatched parcel sizes', async () => { + const application = new ApplicationSubmission({ + owners: [], + typeCode: 'SUBD', + subdProposedLots: [ + { + type: 'Lot', + size: 4, + planNumbers: null, + alrArea: null, + }, + { + type: 'Lot', + size: 6, + planNumbers: null, + alrArea: null, + }, + ], + }); + + mockAppParcelService.fetchByApplicationFileId.mockResolvedValue([ + new ApplicationParcel({ + mapAreaHectares: 12, + owners: [], + }), + ]); + + const res = await service.validateSubmission(application); + + expect( + includesError( + res.errors, + new Error(`SUBD parcels area is different from proposed lot area`), + ), + ).toBe(true); + }); }); - it('should reject mismatched parcel sizes', async () => { - const application = new ApplicationSubmission({ - owners: [], - typeCode: 'SUBD', - subdProposedLots: [ - { - type: 'Lot', - size: 4, - planNumbers: null, - alrArea: null, - }, - { - type: 'Lot', - size: 6, - planNumbers: null, - alrArea: null, - }, - ], + describe('COVE Applications', () => { + beforeEach(() => { + mockCovenantTransfereeService.fetchBySubmissionUuid.mockResolvedValue([]); }); - mockAppParcelService.fetchByApplicationFileId.mockResolvedValue([ - new ApplicationParcel({ - mapAreaHectares: 12, + it('should require basic fields to be complete', async () => { + const application = new ApplicationSubmission({ owners: [], - }), - ]); + typeCode: 'COVE', + coveAreaImpacted: null, + coveFarmImpact: null, + }); - const res = await service.validateSubmission(application); + const res = await service.validateSubmission(application); - expect( - includesError( - res.errors, - new Error(`SUBD parcels area is different from proposed lot area`), - ), - ).toBe(true); + expect( + includesError( + res.errors, + new Error(`COVE proposal missing covenant fields`), + ), + ).toBe(true); + + expect( + includesError( + res.errors, + new Error(`COVE proposal is is missing covenant transferees`), + ), + ).toBe(true); + }); + + it('should be happy if basic fields are complete', async () => { + const application = new ApplicationSubmission({ + owners: [], + typeCode: 'COVE', + coveAreaImpacted: 1.512, + coveFarmImpact: 'Farming impact', + coveHasDraft: false, + }); + mockCovenantTransfereeService.fetchBySubmissionUuid.mockResolvedValue([ + new CovenantTransferee(), + ]); + + const res = await service.validateSubmission(application); + + expect( + includesError( + res.errors, + new Error(`COVE proposal missing covenant fields`), + ), + ).toBe(false); + + expect( + includesError( + res.errors, + new Error(`COVE proposal is is missing covenant transferees`), + ), + ).toBe(false); + }); + + it('should require draft proposal when draft is true', async () => { + const application = new ApplicationSubmission({ + owners: [], + typeCode: 'COVE', + coveHasDraft: true, + }); + + const res = await service.validateSubmission(application); + expect( + includesError( + res.errors, + new Error(`COVE proposal is missing draft proposal but has it true`), + ), + ).toBe(true); + }); }); }); +``; diff --git a/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.ts b/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.ts index 62cda949ee..d0fd4028ad 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.ts @@ -10,6 +10,7 @@ import { PARCEL_TYPE } from './application-parcel/application-parcel.dto'; import { ApplicationParcel } from './application-parcel/application-parcel.entity'; import { ApplicationParcelService } from './application-parcel/application-parcel.service'; import { ApplicationSubmission } from './application-submission.entity'; +import { CovenantTransfereeService } from './covenant-transferee/covenant-transferee.service'; export class ValidatedApplicationSubmission extends ApplicationSubmission { applicant: string; @@ -40,6 +41,7 @@ export class ApplicationSubmissionValidatorService { private localGovernmentService: LocalGovernmentService, private appParcelService: ApplicationParcelService, private appDocumentService: ApplicationDocumentService, + private covenantTransfereeService: CovenantTransfereeService, ) {} async validateSubmission(applicationSubmission: ApplicationSubmission) { @@ -142,6 +144,13 @@ export class ApplicationSubmissionValidatorService { errors, ); } + if (applicationSubmission.typeCode === 'COVE') { + await this.validateCoveProposal( + applicationSubmission, + applicantDocuments, + errors, + ); + } const validatedApplication = validatedParcels && validatedPrimaryContact @@ -828,4 +837,58 @@ export class ApplicationSubmissionValidatorService { } } } + + private async validateCoveProposal( + applicationSubmission: ApplicationSubmission, + applicantDocuments: ApplicationDocument[], + errors: Error[], + ) { + if ( + applicationSubmission.coveHasDraft === null || + applicationSubmission.coveFarmImpact === null || + applicationSubmission.coveAreaImpacted === null + ) { + errors.push( + new ServiceValidationException( + `${applicationSubmission.typeCode} proposal missing covenant fields`, + ), + ); + } + + const proposalMap = applicantDocuments.filter( + (document) => document.typeCode === DOCUMENT_TYPE.PROPOSAL_MAP, + ); + if (proposalMap.length === 0) { + errors.push( + new ServiceValidationException( + `${applicationSubmission.typeCode} proposal is missing proposal map / site plan`, + ), + ); + } + + if (applicationSubmission.coveHasDraft === true) { + const draftProposal = applicantDocuments.filter( + (document) => document.typeCode === DOCUMENT_TYPE.SRW_TERMS, + ); + if (draftProposal.length === 0) { + errors.push( + new ServiceValidationException( + `${applicationSubmission.typeCode} proposal is missing draft proposal but has it true`, + ), + ); + } + } + + const coveTransferess = + await this.covenantTransfereeService.fetchBySubmissionUuid( + applicationSubmission.uuid, + ); + if (coveTransferess.length === 0) { + errors.push( + new ServiceValidationException( + `${applicationSubmission.typeCode} proposal is is missing covenant transferees`, + ), + ); + } + } } diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts b/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts index 27a2f9c9e1..bd7e3a30cc 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts @@ -722,13 +722,6 @@ export class ApplicationSubmission extends Base { @Column({ type: 'text', nullable: true }) coveFarmImpact: string | null; - @AutoMap(() => [CovenantTransferee]) - @OneToMany( - () => CovenantTransferee, - (transferee) => transferee.applicationSubmission, - ) - coveTransferees: CovenantTransferee[]; - //END SUBMISSION FIELDS @AutoMap(() => Application) diff --git a/services/apps/alcs/src/portal/application-submission/covenant-transferee/covenant-transferee.service.ts b/services/apps/alcs/src/portal/application-submission/covenant-transferee/covenant-transferee.service.ts index f2c8adbd4f..266c147b14 100644 --- a/services/apps/alcs/src/portal/application-submission/covenant-transferee/covenant-transferee.service.ts +++ b/services/apps/alcs/src/portal/application-submission/covenant-transferee/covenant-transferee.service.ts @@ -33,6 +33,20 @@ export class CovenantTransfereeService { }); } + async fetchByFileNumber(fileNumber: string) { + return this.repository.find({ + where: { + applicationSubmission: { + fileNumber: fileNumber, + isDraft: false, + }, + }, + relations: { + type: true, + }, + }); + } + async create( createDto: CovenantTransfereeCreateDto, applicationSubmission: ApplicationSubmission, diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1698708663714-relabel_srw_terms.ts b/services/apps/alcs/src/providers/typeorm/migrations/1698708663714-relabel_srw_terms.ts new file mode 100644 index 0000000000..b5cd9552a6 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1698708663714-relabel_srw_terms.ts @@ -0,0 +1,15 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class relabelSrwTerms1698708663714 implements MigrationInterface { + name = 'relabelSrwTerms1698708663714'; + + public async up(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query(` + UPDATE "alcs"."document_code" SET "label" = 'Terms of Instrument', "description" = 'SRW Terms of Instrument Documents' WHERE "code" = 'SRTD'; + `); + } + + public async down(): Promise<void> { + //NOPE + } +} From 7b5f60b84e5bbf7a47d7863863062b15c7b406fb Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Tue, 31 Oct 2023 09:02:23 -0700 Subject: [PATCH 573/954] Migration Fix --- .../migrations/1698353808690-add_covenant_submission_fields.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1698353808690-add_covenant_submission_fields.ts b/services/apps/alcs/src/providers/typeorm/migrations/1698353808690-add_covenant_submission_fields.ts index a7fc97a756..b2674702d8 100644 --- a/services/apps/alcs/src/providers/typeorm/migrations/1698353808690-add_covenant_submission_fields.ts +++ b/services/apps/alcs/src/providers/typeorm/migrations/1698353808690-add_covenant_submission_fields.ts @@ -25,7 +25,7 @@ export class addCovenantSubmissionFields1698353808690 `ALTER TABLE "alcs"."covenant_transferee" ADD CONSTRAINT "FK_a1c022ef4e1785b2877cb6aab69" FOREIGN KEY ("application_submission_uuid") REFERENCES "alcs"."application_submission"("uuid") ON DELETE NO ACTION ON UPDATE NO ACTION`, ); await queryRunner.query( - `COMMENT ON COLUMN "alcs"."covenant_transferee" IS 'Stores Transferees for Restrictive Covenant Applications'`, + `COMMENT ON TABLE "alcs"."covenant_transferee" IS 'Stores Transferees for Restrictive Covenant Applications'`, ); } From bbbe1e310838e62eb36aa78aa49fd3a8e567e42a Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Tue, 31 Oct 2023 09:21:22 -0700 Subject: [PATCH 574/954] Update Text and CSS Fill -> Soil Make Input half Width --- .../app/features/application/proposal/soil/soil.component.html | 2 +- .../features/notice-of-intent/proposal/soil/soil.component.html | 2 +- .../edit-submission/proposal/proposal.component.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/alcs-frontend/src/app/features/application/proposal/soil/soil.component.html b/alcs-frontend/src/app/features/application/proposal/soil/soil.component.html index 53347cd2fe..f681faaec2 100644 --- a/alcs-frontend/src/app/features/application/proposal/soil/soil.component.html +++ b/alcs-frontend/src/app/features/application/proposal/soil/soil.component.html @@ -21,7 +21,7 @@ <thead> <th></th> <th *ngIf="submission.soilToPlaceVolume !== null">Fill to be Placed</th> - <th *ngIf="submission.soilToRemoveVolume !== null">Fill to be Removed</th> + <th *ngIf="submission.soilToRemoveVolume !== null">Soil to be Removed</th> </thead> <tbody> <tr> diff --git a/alcs-frontend/src/app/features/notice-of-intent/proposal/soil/soil.component.html b/alcs-frontend/src/app/features/notice-of-intent/proposal/soil/soil.component.html index af596da7f0..ade80649b7 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/proposal/soil/soil.component.html +++ b/alcs-frontend/src/app/features/notice-of-intent/proposal/soil/soil.component.html @@ -21,7 +21,7 @@ <thead> <th></th> <th *ngIf="submission.soilToPlaceVolume !== null">Fill to be Placed</th> - <th *ngIf="submission.soilToRemoveVolume !== null">Fill to be Removed</th> + <th *ngIf="submission.soilToRemoveVolume !== null">Soil to be Removed</th> </thead> <tbody> <tr> diff --git a/portal-frontend/src/app/features/notifications/edit-submission/proposal/proposal.component.html b/portal-frontend/src/app/features/notifications/edit-submission/proposal/proposal.component.html index 484ac37cd0..7755e9ffa9 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/proposal/proposal.component.html +++ b/portal-frontend/src/app/features/notifications/edit-submission/proposal/proposal.component.html @@ -44,7 +44,7 @@ <h2>Purpose of SRW</h2> <div class="subtext">Characters left: {{ 4000 - purposeText.textLength }}</div> </div> - <div class="full-row"> + <div> <label for="total-area">Total area of the SRW</label> <div class="subtext">Provide in hectares. If SRW is for the whole parcel, indicate total parcel area</div> <mat-form-field appearance="outline"> From 1b61066d8e9702c1ef8c12e2ed27f51c6e24ed47 Mon Sep 17 00:00:00 2001 From: "to. sandra" <76515860+sandratoh@users.noreply.github.com> Date: Tue, 31 Oct 2023 09:29:41 -0700 Subject: [PATCH 575/954] Update ALCS applicant info pages to match Portal (#1105) * Update alcs applicant info proposal layout * Separate multi document uploads into rows * Update ALCS NOI and App multi document layout * Update alcs srw layout to match portal * Update alcs noi structure table layout --- .../application-details.component.html | 12 +- .../application-details.component.scss | 11 +- .../parcel/parcel.component.html | 23 ++-- .../parcel/parcel.component.scss | 11 +- .../pfrs-details/pfrs-details.component.html | 52 +++++---- .../pfrs-details/pfrs-details.component.scss | 3 +- .../pofo-details/pofo-details.component.html | 107 ++++++++++-------- .../pofo-details/pofo-details.component.scss | 7 -- .../roso-details/roso-details.component.html | 106 +++++++++-------- .../roso-details/roso-details.component.scss | 7 -- .../subd-details/subd-details.component.scss | 3 +- .../additional-information.component.html | 4 +- .../additional-information.component.scss | 7 ++ .../notice-of-intent-details.component.scss | 6 +- .../parcel/parcel.component.html | 20 ++-- .../parcel/parcel.component.scss | 10 +- .../pfrs-details/pfrs-details.component.html | 30 +++-- .../pfrs-details/pfrs-details.component.scss | 4 +- .../pofo-details/pofo-details.component.html | 102 +++++++++-------- .../notification-details.component.html | 12 +- .../notification-details.component.scss | 12 +- .../parcel/parcel.component.scss | 21 ---- .../application-details.component.scss | 6 + .../pfrs-details/pfrs-details.component.html | 14 +-- .../pofo-details/pofo-details.component.html | 4 +- .../roso-details/roso-details.component.html | 4 +- .../additional-information.component.scss | 6 - .../notice-of-intent-details.component.scss | 6 + .../roso-details/roso-details.component.html | 6 +- 29 files changed, 304 insertions(+), 312 deletions(-) diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.html b/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.html index f1b83427ee..2eb0f5a12e 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.html +++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.html @@ -83,21 +83,15 @@ <h3>Land Use</h3> <div class="full-width"> <h4>Land Use of Parcel(s) under Application</h4> </div> - <div class="subheading2 grid-1"> - Describe all agriculture that currently takes place on the parcel(s). - </div> + <div class="subheading2 grid-1">Describe all agriculture that currently takes place on the parcel(s).</div> <div class="grid-double"> {{ submission.parcelsAgricultureDescription }} </div> - <div class="subheading2 grid-1"> - Describe all agricultural improvements made to the parcel(s). - </div> + <div class="subheading2 grid-1">Describe all agricultural improvements made to the parcel(s).</div> <div class="grid-double"> {{ submission.parcelsAgricultureImprovementDescription }} </div> - <div class="subheading2 grid-1"> - Describe all other uses that currently take place on the parcel(s). - </div> + <div class="subheading2 grid-1">Describe all other uses that currently take place on the parcel(s).</div> <div class="grid-double"> {{ submission.parcelsNonAgricultureUseDescription }} </div> diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.scss b/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.scss index c6763c1fc7..0e5a80d06c 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.scss +++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.scss @@ -1,6 +1,12 @@ @use '../../../../../styles/colors'; :host::ng-deep { + .multiple-documents { + a { + display: block; + } + } + .view-grid-item { display: grid; grid-template-columns: minmax(100px, 0.5fr) 1fr; @@ -52,8 +58,7 @@ .other-attachments { display: grid; - grid-template-columns: max-content max-content max-content; - overflow-x: auto; + grid-template-columns: 1fr 1fr 1fr; grid-column-gap: 36px; grid-row-gap: 12px; @@ -64,7 +69,7 @@ .adjacent-parcels { display: grid; - grid-template-columns: max-content max-content max-content; + grid-template-columns: 1fr 1fr 2fr; overflow-x: auto; grid-column-gap: 36px; grid-row-gap: 12px; diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/parcel/parcel.component.html b/alcs-frontend/src/app/features/application/applicant-info/application-details/parcel/parcel.component.html index 5c8c151124..db3cc3fb93 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/application-details/parcel/parcel.component.html +++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/parcel/parcel.component.html @@ -73,27 +73,32 @@ <h4 [id]="parcel.uuid">Parcel {{ parcelInd + 1 }}: Parcel and Owner Information< <a (click)="openFile(parcel.certificateOfTitle)">{{ parcel.certificateOfTitle.fileName }}</a> </div> </div> - <div class="full-width subheading1">Owner Information</div> - <div class="full-width owner-information"> - <div class="subheading2">Type</div> - <div class="subheading2">Full Name</div> + <div + class="full-width owner-information" + [ngClass]="{ 'crown-owner-information': parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN }" + > + <div class="subheading2" *ngIf="parcel.ownershipTypeCode !== PARCEL_OWNERSHIP_TYPES.CROWN">Land Owner(s)</div> + <div class="subheading2" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">Crown Contact(s)</div> <div class="subheading2" *ngIf="parcel.ownershipTypeCode !== PARCEL_OWNERSHIP_TYPES.CROWN">Organization</div> <div class="subheading2" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN"> - Ministry/ Department + Ministry/Department </div> <div class="subheading2">Phone</div> <div class="subheading2">Email</div> - <div class="subheading2">Corporate Summary</div> + <div class="subheading2" *ngIf="parcel.ownershipTypeCode !== PARCEL_OWNERSHIP_TYPES.CROWN">Corporate Summary</div> <ng-container *ngFor="let owner of parcel.owners"> - <div>{{ owner.type.label }}</div> <div>{{ owner.displayName }}</div> - <div>{{ owner.organizationName }}</div> + <div> + {{ owner.organizationName }} + <app-no-data *ngIf="!owner.organizationName"></app-no-data> + </div> <div>{{ owner.phoneNumber }}</div> <div>{{ owner.email }}</div> - <div> + <div *ngIf="parcel.ownershipTypeCode !== PARCEL_OWNERSHIP_TYPES.CROWN"> <a *ngIf="owner.corporateSummary" (click)="openFile(owner.corporateSummary)">{{ owner.corporateSummary.fileName }}</a> + <app-no-data *ngIf="!owner.corporateSummary"></app-no-data> </div> </ng-container> </div> diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/parcel/parcel.component.scss b/alcs-frontend/src/app/features/application/applicant-info/application-details/parcel/parcel.component.scss index 9c8bc25837..f1dc4cd6e1 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/application-details/parcel/parcel.component.scss +++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/parcel/parcel.component.scss @@ -1,7 +1,6 @@ .owner-information { display: grid; - grid-template-columns: max-content max-content max-content max-content max-content max-content; - overflow-x: auto; + grid-template-columns: 1fr 1fr 1fr 1fr 1fr; grid-column-gap: 36px; grid-row-gap: 12px; @@ -10,12 +9,8 @@ } } -.review-table { - grid-template-columns: 1fr 1fr !important; - - .full-width { - grid-column: 1/5; - } +.crown-owner-information { + grid-template-columns: 1fr 1fr 1fr 1fr; } .crown-land { diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/pfrs-details/pfrs-details.component.html b/alcs-frontend/src/app/features/application/applicant-info/application-details/pfrs-details/pfrs-details.component.html index 238f719925..160fd5efd1 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/application-details/pfrs-details/pfrs-details.component.html +++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/pfrs-details/pfrs-details.component.html @@ -14,6 +14,24 @@ <span>{{ _applicationSubmission.purpose }}</span> </div> + <div class="subheading2 grid-1">Project Duration</div> + <div class="grid-double"> + <div *ngIf="_applicationSubmission.soilProjectDurationAmount && _applicationSubmission.soilProjectDurationUnit"> + {{ _applicationSubmission.soilProjectDurationAmount }} + <ng-container [ngPlural]="_applicationSubmission.soilProjectDurationAmount"> + <ng-template ngPluralCase="=1"> + {{ _applicationSubmission.soilProjectDurationUnit.slice(0, -1) | titlecase }} + </ng-template> + <ng-template ngPluralCase="other"> + {{ _applicationSubmission.soilProjectDurationUnit | titlecase }} + </ng-template> + </ng-container> + </div> + <app-no-data + *ngIf="!_applicationSubmission.soilProjectDurationAmount || !_applicationSubmission.soilProjectDurationUnit" + ></app-no-data> + </div> + <div class="full-width soil-table"> <div></div> <div><strong>Soil to be Removed</strong></div> @@ -106,18 +124,6 @@ </div> </div> - <div class="full-width"> - <span class="subheading1">Project Duration</span> - </div> - <div class="subheading2 grid-1">Duration</div> - <div class="grid-double"> - {{ _applicationSubmission.soilProjectDurationUnit }} - </div> - <div class="subheading2 grid-1">Length</div> - <div class="grid-double"> - {{ _applicationSubmission.soilProjectDurationAmount }} - </div> - <div class="subheading2 grid-1"> What alternative measures have you considered or attempted before proposing to place fill? </div> @@ -146,7 +152,7 @@ </a> </div> <div class="subheading2 grid-1">Cross Sections</div> - <div class="grid-double"> + <div class="grid-double multiple-documents"> <div> <a *ngFor="let file of crossSections" (click)="openFile(file)"> {{ file.fileName }} @@ -154,12 +160,10 @@ </div> </div> <div class="subheading2 grid-1">Reclamation Plan</div> - <div class="grid-double"> - <div *ngFor="let file of reclamationPlans"> - <a (click)="openFile(file)"> - {{ file.fileName }} - </a> - </div> + <div class="grid-double multiple-documents"> + <a *ngFor="let file of reclamationPlans" (click)="openFile(file)"> + {{ file.fileName }} + </a> </div> <div class="subheading2 grid-1">Is your proposal for aggregate extraction or placer mining?</div> @@ -179,11 +183,9 @@ </div> <div *ngIf="_applicationSubmission.soilHasSubmittedNotice" class="subheading2 grid-1">Notice of Work</div> - <div *ngIf="_applicationSubmission.soilHasSubmittedNotice" class="grid-double"> - <div *ngFor="let file of noticeOfWork"> - <a (click)="openFile(file)"> - {{ file.fileName }} - </a> - </div> + <div *ngIf="_applicationSubmission.soilHasSubmittedNotice" class="grid-double multiple-documents"> + <a *ngFor="let file of noticeOfWork" (click)="openFile(file)"> + {{ file.fileName }} + </a> </div> </div> diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/pfrs-details/pfrs-details.component.scss b/alcs-frontend/src/app/features/application/applicant-info/application-details/pfrs-details/pfrs-details.component.scss index 94aaca504d..f4efa4f475 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/application-details/pfrs-details/pfrs-details.component.scss +++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/pfrs-details/pfrs-details.component.scss @@ -1,7 +1,6 @@ .soil-table { display: grid; - grid-template-columns: max-content max-content max-content; - overflow-x: auto; + grid-template-columns: 0.95fr 1fr 2fr; grid-column-gap: 36px; grid-row-gap: 12px; diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/pofo-details/pofo-details.component.html b/alcs-frontend/src/app/features/application/applicant-info/application-details/pofo-details/pofo-details.component.html index 8b093c8712..0a21b8d3a6 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/application-details/pofo-details/pofo-details.component.html +++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/pofo-details/pofo-details.component.html @@ -14,63 +14,70 @@ <span>{{ _applicationSubmission.purpose }}</span> </div> - <div class="subheading1 full-width">Fill to be Placed</div> - <div class="full-width soil-table"> - <div class="grid-1"><strong>Volume</strong></div> - <div class="grid-2"> - {{ _applicationSubmission.soilToPlaceVolume }} - <span *ngIf="_applicationSubmission.soilToPlaceVolume">m<sup>3</sup></span> - </div> - <div class="grid-1"><strong>Area</strong></div> - <div class="grid-2"> - {{ _applicationSubmission.soilToPlaceArea }} <span *ngIf="_applicationSubmission.soilToPlaceArea">m<sup>2</sup></span> - </div> - <div class="grid-1"><strong>Maximum Depth</strong></div> - <div class="grid-2"> - {{ _applicationSubmission.soilToPlaceMaximumDepth }} - <span *ngIf="_applicationSubmission.soilToPlaceMaximumDepth">m</span> - </div> - <div class="grid-1"><strong>Average Depth</strong></div> - <div class="grid-2"> - {{ _applicationSubmission.soilToPlaceAverageDepth }} - <span *ngIf="_applicationSubmission.soilToPlaceAverageDepth">m</span> + <div class="subheading2 grid-1">Project Duration</div> + <div class="grid-double"> + <div *ngIf="_applicationSubmission.soilProjectDurationAmount && _applicationSubmission.soilProjectDurationUnit"> + {{ _applicationSubmission.soilProjectDurationAmount }} + <ng-container [ngPlural]="_applicationSubmission.soilProjectDurationAmount"> + <ng-template ngPluralCase="=1"> + {{ _applicationSubmission.soilProjectDurationUnit.slice(0, -1) | titlecase }} + </ng-template> + <ng-template ngPluralCase="other"> + {{ _applicationSubmission.soilProjectDurationUnit | titlecase }} + </ng-template> + </ng-container> </div> + <app-no-data + *ngIf="!_applicationSubmission.soilProjectDurationAmount || !_applicationSubmission.soilProjectDurationUnit" + ></app-no-data> </div> - <div class="subheading1 full-width">Fill already Placed</div> - <div class="full-width soil-table"> - <div class="grid-1"><strong>Volume</strong></div> - <div class="grid-2"> - {{ _applicationSubmission.soilAlreadyPlacedVolume }} - <span *ngIf="_applicationSubmission.soilAlreadyPlacedVolume">m<sup>3</sup></span> - </div> - <div class="grid-1"><strong>Area</strong></div> - <div class="grid-2"> - {{ _applicationSubmission.soilAlreadyPlacedArea }} - <span *ngIf="_applicationSubmission.soilAlreadyPlacedArea">m<sup>2</sup></span> - </div> - <div class="grid-1"><strong>Maximum Depth</strong></div> - <div class="grid-2"> - {{ _applicationSubmission.soilAlreadyPlacedMaximumDepth }} - <span *ngIf="_applicationSubmission.soilAlreadyPlacedMaximumDepth">m</span> - </div> - <div class="grid-1"><strong>Average Depth</strong></div> - <div class="grid-2"> - {{ _applicationSubmission.soilAlreadyPlacedAverageDepth }} - <span *ngIf="_applicationSubmission.soilAlreadyPlacedAverageDepth">m</span> - </div> + <div class="grid-1"></div> + <div class="subheading2 grid-double">Fill to be Placed</div> + + <div class="subheading2 grid-1">Volume</div> + <div class="grid-double"> + {{ _applicationSubmission.soilToPlaceVolume }} + <span *ngIf="_applicationSubmission.soilToPlaceVolume">m<sup>3</sup></span> + </div> + <div class="subheading2 grid-1">Area</div> + <div class="grid-double"> + {{ _applicationSubmission.soilToPlaceArea }} + <span *ngIf="_applicationSubmission.soilToPlaceArea">m<sup>2</sup></span> + </div> + <div class="subheading2 grid-1">Maximum Depth</div> + <div class="grid-double"> + {{ _applicationSubmission.soilToPlaceMaximumDepth }} + <span *ngIf="_applicationSubmission.soilToPlaceMaximumDepth">m</span> </div> + <div class="subheading2 grid-1">Average Depth</div> + <div class="grid-double"> + {{ _applicationSubmission.soilToPlaceAverageDepth }} + <span *ngIf="_applicationSubmission.soilToPlaceAverageDepth">m</span> + </div> + + <div class="grid-1"></div> + <div class="subheading2 grid-double">Fill already Placed</div> - <div class="full-width"> - <span class="subheading1">Project Duration</span> + <div class="subheading2 grid-1">Volume</div> + <div class="grid-double"> + {{ _applicationSubmission.soilAlreadyPlacedVolume }} + <span *ngIf="_applicationSubmission.soilAlreadyPlacedVolume">m<sup>3</sup></span> + </div> + <div class="subheading2 grid-1">Area</div> + <div class="grid-double"> + {{ _applicationSubmission.soilAlreadyPlacedArea }} + <span *ngIf="_applicationSubmission.soilAlreadyPlacedArea">m<sup>2</sup></span> </div> - <div class="subheading2 grid-1">Duration</div> + <div class="subheading2 grid-1">Maximum Depth</div> <div class="grid-double"> - {{ _applicationSubmission.soilProjectDurationUnit }} + {{ _applicationSubmission.soilAlreadyPlacedMaximumDepth }} + <span *ngIf="_applicationSubmission.soilAlreadyPlacedMaximumDepth">m</span> </div> - <div class="subheading2 grid-1">Length</div> + <div class="subheading2 grid-1">Average Depth</div> <div class="grid-double"> - {{ _applicationSubmission.soilProjectDurationAmount }} + {{ _applicationSubmission.soilAlreadyPlacedAverageDepth }} + <span *ngIf="_applicationSubmission.soilAlreadyPlacedAverageDepth">m</span> </div> <div class="subheading2 grid-1"> @@ -96,13 +103,13 @@ </a> </div> <div class="subheading2 grid-1">Cross Sections</div> - <div class="grid-double"> + <div class="grid-double multiple-documents"> <a *ngFor="let file of crossSections" (click)="openFile(file)"> {{ file.fileName }} </a> </div> <div class="subheading2 grid-1">Reclamation Plan</div> - <div class="grid-double"> + <div class="grid-double multiple-documents"> <a *ngFor="let file of reclamationPlans" (click)="openFile(file)"> {{ file.fileName }} </a> diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/pofo-details/pofo-details.component.scss b/alcs-frontend/src/app/features/application/applicant-info/application-details/pofo-details/pofo-details.component.scss index b2b6b90127..e69de29bb2 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/application-details/pofo-details/pofo-details.component.scss +++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/pofo-details/pofo-details.component.scss @@ -1,7 +0,0 @@ -.soil-table { - display: grid; - grid-template-columns: max-content max-content; - overflow-x: auto; - grid-column-gap: 36px; - grid-row-gap: 12px; -} diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/roso-details/roso-details.component.html b/alcs-frontend/src/app/features/application/applicant-info/application-details/roso-details/roso-details.component.html index 18f022380c..20864c54a0 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/application-details/roso-details/roso-details.component.html +++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/roso-details/roso-details.component.html @@ -14,63 +14,69 @@ <span>{{ _applicationSubmission.purpose }}</span> </div> - <div class="subheading1 full-width">Soil to be Removed</div> - <div class="full-width soil-table"> - <div class="grid-1"><strong>Volume</strong></div> - <div class="grid-2"> - {{ _applicationSubmission.soilToRemoveVolume }} - <span *ngIf="_applicationSubmission.soilToRemoveVolume">m<sup>3</sup></span> - </div> - <div class="grid-1"><strong>Area</strong></div> - <div class="grid-2"> - {{ _applicationSubmission.soilToRemoveArea }} <span *ngIf="_applicationSubmission.soilToRemoveArea">ha</span> - </div> - <div class="grid-1"><strong>Maximum Depth</strong></div> - <div class="grid-2"> - {{ _applicationSubmission.soilToRemoveMaximumDepth }} - <span *ngIf="_applicationSubmission.soilToRemoveMaximumDepth">m</span> - </div> - <div class="grid-1"><strong>Average Depth</strong></div> - <div class="grid-2"> - {{ _applicationSubmission.soilToRemoveAverageDepth }} - <span *ngIf="_applicationSubmission.soilToRemoveAverageDepth">m</span> + <div class="subheading2 grid-1">Project Duration</div> + <div class="grid-double"> + <div *ngIf="_applicationSubmission.soilProjectDurationAmount && _applicationSubmission.soilProjectDurationUnit"> + {{ _applicationSubmission.soilProjectDurationAmount }} + <ng-container [ngPlural]="_applicationSubmission.soilProjectDurationAmount"> + <ng-template ngPluralCase="=1"> + {{ _applicationSubmission.soilProjectDurationUnit.slice(0, -1) | titlecase }} + </ng-template> + <ng-template ngPluralCase="other"> + {{ _applicationSubmission.soilProjectDurationUnit | titlecase }} + </ng-template> + </ng-container> </div> + <app-no-data + *ngIf="!_applicationSubmission.soilProjectDurationAmount || !_applicationSubmission.soilProjectDurationUnit" + ></app-no-data> </div> - <div class="subheading1 full-width">Soil already Removed</div> - <div class="full-width soil-table"> - <div class="grid-1"><strong>Volume</strong></div> - <div class="grid-2"> - {{ _applicationSubmission.soilAlreadyRemovedVolume }} - <span *ngIf="_applicationSubmission.soilAlreadyRemovedVolume">m<sup>3</sup></span> - </div> - <div class="grid-1"><strong>Area</strong></div> - <div class="grid-2"> - {{ _applicationSubmission.soilAlreadyRemovedArea }} - <span *ngIf="_applicationSubmission.soilAlreadyRemovedArea">ha</span> - </div> - <div class="grid-1"><strong>Maximum Depth</strong></div> - <div class="grid-2"> - {{ _applicationSubmission.soilAlreadyRemovedMaximumDepth }} - <span *ngIf="_applicationSubmission.soilAlreadyRemovedMaximumDepth">m</span> - </div> - <div class="grid-1"><strong>Average Depth</strong></div> - <div class="grid-2"> - {{ _applicationSubmission.soilAlreadyRemovedAverageDepth }} - <span *ngIf="_applicationSubmission.soilAlreadyRemovedAverageDepth">m</span> - </div> + <div class="grid-1"></div> + <div class="subheading2 grid-double">Soil to be Removed</div> + + <div class="subheading2 grid-1">Volume</div> + <div class="grid-double"> + {{ _applicationSubmission.soilToRemoveVolume }} + <span *ngIf="_applicationSubmission.soilToRemoveVolume">m<sup>3</sup></span> + </div> + <div class="subheading2 grid-1">Area</div> + <div class="grid-double"> + {{ _applicationSubmission.soilToRemoveArea }} <span *ngIf="_applicationSubmission.soilToRemoveArea">ha</span> + </div> + <div class="subheading2 grid-1">Maximum Depth</div> + <div class="grid-double"> + {{ _applicationSubmission.soilToRemoveMaximumDepth }} + <span *ngIf="_applicationSubmission.soilToRemoveMaximumDepth">m</span> </div> + <div class="subheading2 grid-1">Average Depth</div> + <div class="grid-double"> + {{ _applicationSubmission.soilToRemoveAverageDepth }} + <span *ngIf="_applicationSubmission.soilToRemoveAverageDepth">m</span> + </div> + + <div class="grid-1"></div> + <div class="subheading2 grid-double">Soil already Removed</div> - <div class="full-width"> - <span class="subheading1">Project Duration</span> + <div class="subheading2 grid-1">Volume</div> + <div class="grid-double"> + {{ _applicationSubmission.soilAlreadyRemovedVolume }} + <span *ngIf="_applicationSubmission.soilAlreadyRemovedVolume">m<sup>3</sup></span> + </div> + <div class="subheading2 grid-1">Area</div> + <div class="grid-double"> + {{ _applicationSubmission.soilAlreadyRemovedArea }} + <span *ngIf="_applicationSubmission.soilAlreadyRemovedArea">ha</span> </div> - <div class="subheading2 grid-1">Duration</div> + <div class="subheading2 grid-1">Maximum Depth</div> <div class="grid-double"> - {{ _applicationSubmission.soilProjectDurationUnit }} + {{ _applicationSubmission.soilAlreadyRemovedMaximumDepth }} + <span *ngIf="_applicationSubmission.soilAlreadyRemovedMaximumDepth">m</span> </div> - <div class="subheading2 grid-1">Length</div> + <div class="subheading2 grid-1">Average Depth</div> <div class="grid-double"> - {{ _applicationSubmission.soilProjectDurationAmount }} + {{ _applicationSubmission.soilAlreadyRemovedAverageDepth }} + <span *ngIf="_applicationSubmission.soilAlreadyRemovedAverageDepth">m</span> </div> <div class="subheading2 grid-1">Describe the type of soil proposed to be removed.</div> @@ -89,13 +95,13 @@ </a> </div> <div class="subheading2 grid-1">Cross Sections</div> - <div class="grid-double"> + <div class="grid-double multiple-documents"> <a *ngFor="let file of crossSections" (click)="openFile(file)"> {{ file.fileName }} </a> </div> <div class="subheading2 grid-1">Reclamation Plan</div> - <div class="grid-double"> + <div class="grid-double multiple-documents"> <a *ngFor="let file of reclamationPlans" (click)="openFile(file)"> {{ file.fileName }} </a> diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/roso-details/roso-details.component.scss b/alcs-frontend/src/app/features/application/applicant-info/application-details/roso-details/roso-details.component.scss index b2b6b90127..e69de29bb2 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/application-details/roso-details/roso-details.component.scss +++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/roso-details/roso-details.component.scss @@ -1,7 +0,0 @@ -.soil-table { - display: grid; - grid-template-columns: max-content max-content; - overflow-x: auto; - grid-column-gap: 36px; - grid-row-gap: 12px; -} diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/subd-details/subd-details.component.scss b/alcs-frontend/src/app/features/application/applicant-info/application-details/subd-details/subd-details.component.scss index d8d3148a01..e4b52411fa 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/application-details/subd-details/subd-details.component.scss +++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/subd-details/subd-details.component.scss @@ -1,7 +1,6 @@ .parcel-table { display: grid; - grid-template-columns: max-content max-content max-content; - overflow-x: auto; + grid-template-columns: 1fr 1fr 2fr; grid-column-gap: 36px; grid-row-gap: 12px; } diff --git a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/additional-information/additional-information.component.html b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/additional-information/additional-information.component.html index beb1db4deb..abc15b9f7c 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/additional-information/additional-information.component.html +++ b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/additional-information/additional-information.component.html @@ -8,8 +8,8 @@ </div> <ng-container *ngIf="_noiSubmission.soilIsRemovingSoilForNewStructure"> - <div class="full-width subheading2">The total floor area (m2) of the proposed structure(s)</div> - <div class="full-width soil-table"> + <div class="full-width subheading2">The total floor area (m<sup>2</sup>) of the proposed structure(s)</div> + <div class="full-width structure-table"> <div class="grid-1 subheading2">#</div> <div class="grid-2 subheading2">Type</div> <div class="grid-3 subheading2">Area</div> diff --git a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/additional-information/additional-information.component.scss b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/additional-information/additional-information.component.scss index e69de29bb2..68f6ea8546 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/additional-information/additional-information.component.scss +++ b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/additional-information/additional-information.component.scss @@ -0,0 +1,7 @@ +.structure-table { + display: grid; + grid-template-columns: max-content max-content max-content; + grid-template-columns: 1fr 1fr 2fr; + grid-column-gap: rem(36); + grid-row-gap: rem(12); +} diff --git a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/notice-of-intent-details.component.scss b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/notice-of-intent-details.component.scss index 07f76efb25..0b7bac3eec 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/notice-of-intent-details.component.scss +++ b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/notice-of-intent-details.component.scss @@ -67,9 +67,7 @@ .other-attachments { display: grid; - grid-template-columns: max-content max-content max-content; - overflow-x: auto; - overflow-y: hidden; + grid-template-columns: 1fr 1fr 1fr; grid-column-gap: 36px; grid-row-gap: 12px; @@ -80,7 +78,7 @@ .adjacent-parcels { display: grid; - grid-template-columns: max-content max-content max-content; + grid-template-columns: 1fr 1fr 2fr; overflow-x: auto; grid-column-gap: 36px; grid-row-gap: 12px; diff --git a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/parcel/parcel.component.html b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/parcel/parcel.component.html index 761a1bfc18..4b5afb0b50 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/parcel/parcel.component.html +++ b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/parcel/parcel.component.html @@ -63,27 +63,33 @@ <h4 [id]="parcel.uuid">Parcel {{ parcelInd + 1 }}: Parcel and Owner Information< <a (click)="onOpenFile(parcel.certificateOfTitle.documentUuid)">{{ parcel.certificateOfTitle.fileName }}</a> </div> </div> - <div class="full-width subheading1">Owner Information</div> - <div class="full-width owner-information"> - <div class="subheading2">Type</div> - <div class="subheading2">Full Name</div> + + <div + class="full-width owner-information" + [ngClass]="{ 'crown-owner-information': parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN }" + > + <div class="subheading2" *ngIf="parcel.ownershipTypeCode !== PARCEL_OWNERSHIP_TYPES.CROWN">Land Owner(s)</div> + <div class="subheading2" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">Crown Contact(s)</div> <div class="subheading2" *ngIf="parcel.ownershipTypeCode !== PARCEL_OWNERSHIP_TYPES.CROWN">Organization</div> <div class="subheading2" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN"> - Ministry/ Department + Ministry/Department </div> <div class="subheading2">Phone</div> <div class="subheading2">Email</div> <div class="subheading2">Corporate Summary</div> <ng-container *ngFor="let owner of parcel.owners"> - <div>{{ owner.type.label }}</div> <div>{{ owner.displayName }}</div> - <div>{{ owner.organizationName }}</div> + <div> + {{ owner.organizationName }} + <app-no-data *ngIf="!owner.organizationName"></app-no-data> + </div> <div>{{ owner.phoneNumber }}</div> <div>{{ owner.email }}</div> <div> <a *ngIf="owner.corporateSummary" (click)="onOpenFile(owner.corporateSummary.uuid)">{{ owner.corporateSummary.fileName }}</a> + <app-no-data *ngIf="!owner.corporateSummary"></app-no-data> </div> </ng-container> </div> diff --git a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/parcel/parcel.component.scss b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/parcel/parcel.component.scss index e79cc4a08f..7cb2d56dd5 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/parcel/parcel.component.scss +++ b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/parcel/parcel.component.scss @@ -1,6 +1,6 @@ .owner-information { display: grid; - grid-template-columns: max-content max-content max-content max-content max-content max-content; + grid-template-columns: 1fr 1fr 1fr 1fr 1fr; overflow-x: auto; overflow-y: hidden; grid-column-gap: 36px; @@ -11,12 +11,8 @@ } } -.review-table { - grid-template-columns: 1fr 1fr !important; - - .full-width { - grid-column: 1/5; - } +.crown-owner-information { + grid-template-columns: 1fr 1fr 1fr 1fr; } .crown-land { diff --git a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/pfrs-details/pfrs-details.component.html b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/pfrs-details/pfrs-details.component.html index 9ed94ebb1a..a34ba32991 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/pfrs-details/pfrs-details.component.html +++ b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/pfrs-details/pfrs-details.component.html @@ -14,6 +14,24 @@ <span>{{ _noiSubmission.purpose }}</span> </div> + <div class="subheading2 grid-1">Project Duration</div> + <div class="grid-double"> + <div *ngIf="_noiSubmission.soilProjectDurationAmount && _noiSubmission.soilProjectDurationUnit"> + {{ _noiSubmission.soilProjectDurationAmount }} + <ng-container [ngPlural]="_noiSubmission.soilProjectDurationAmount"> + <ng-template ngPluralCase="=1"> + {{ _noiSubmission.soilProjectDurationUnit.slice(0, -1) | titlecase }} + </ng-template> + <ng-template ngPluralCase="other"> + {{ _noiSubmission.soilProjectDurationUnit | titlecase }} + </ng-template> + </ng-container> + </div> + <app-no-data + *ngIf="!_noiSubmission.soilProjectDurationAmount || !_noiSubmission.soilProjectDurationUnit" + ></app-no-data> + </div> + <div class="full-width soil-table"> <div></div> <div><strong>Soil to be Removed</strong></div> @@ -106,18 +124,6 @@ </div> </div> - <div class="full-width"> - <span class="subheading1">Project Duration</span> - </div> - <div class="subheading2 grid-1">Duration</div> - <div class="grid-double"> - {{ _noiSubmission.soilProjectDurationUnit }} - </div> - <div class="subheading2 grid-1">Length</div> - <div class="grid-double"> - {{ _noiSubmission.soilProjectDurationAmount }} - </div> - <div class="subheading2 grid-1">Describe the type, origin and quality of fill proposed to be placed.</div> <div class="grid-double"> <span>{{ _noiSubmission.soilFillTypeToPlace }}</span> diff --git a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/pfrs-details/pfrs-details.component.scss b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/pfrs-details/pfrs-details.component.scss index 8ced66c4ba..f4efa4f475 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/pfrs-details/pfrs-details.component.scss +++ b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/pfrs-details/pfrs-details.component.scss @@ -1,8 +1,6 @@ .soil-table { display: grid; - grid-template-columns: max-content max-content max-content; - overflow-x: auto; - overflow-y: hidden; + grid-template-columns: 0.95fr 1fr 2fr; grid-column-gap: 36px; grid-row-gap: 12px; diff --git a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/pofo-details/pofo-details.component.html b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/pofo-details/pofo-details.component.html index c23c8d82cd..e0402fd64c 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/pofo-details/pofo-details.component.html +++ b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/pofo-details/pofo-details.component.html @@ -14,63 +14,69 @@ <span>{{ _noiSubmission.purpose }}</span> </div> - <div class="subheading1 full-width">Fill to be Placed</div> - <div class="full-width soil-table"> - <div class="grid-1"><strong>Volume</strong></div> - <div class="grid-2"> - {{ _noiSubmission.soilToPlaceVolume }} - <span *ngIf="_noiSubmission.soilToPlaceVolume">m<sup>3</sup></span> - </div> - <div class="grid-1"><strong>Area</strong></div> - <div class="grid-2"> - {{ _noiSubmission.soilToPlaceArea }} <span *ngIf="_noiSubmission.soilToPlaceArea">m<sup>2</sup></span> - </div> - <div class="grid-1"><strong>Maximum Depth</strong></div> - <div class="grid-2"> - {{ _noiSubmission.soilToPlaceMaximumDepth }} - <span *ngIf="_noiSubmission.soilToPlaceMaximumDepth">m</span> - </div> - <div class="grid-1"><strong>Average Depth</strong></div> - <div class="grid-2"> - {{ _noiSubmission.soilToPlaceAverageDepth }} - <span *ngIf="_noiSubmission.soilToPlaceAverageDepth">m</span> + <div class="subheading2 grid-1">Project Duration</div> + <div class="grid-double"> + <div *ngIf="_noiSubmission.soilProjectDurationAmount && _noiSubmission.soilProjectDurationUnit"> + {{ _noiSubmission.soilProjectDurationAmount }} + <ng-container [ngPlural]="_noiSubmission.soilProjectDurationAmount"> + <ng-template ngPluralCase="=1"> + {{ _noiSubmission.soilProjectDurationUnit.slice(0, -1) | titlecase }} + </ng-template> + <ng-template ngPluralCase="other"> + {{ _noiSubmission.soilProjectDurationUnit | titlecase }} + </ng-template> + </ng-container> </div> + <app-no-data + *ngIf="!_noiSubmission.soilProjectDurationAmount || !_noiSubmission.soilProjectDurationUnit" + ></app-no-data> </div> - <div class="subheading1 full-width">Fill already Placed</div> - <div class="full-width soil-table"> - <div class="grid-1"><strong>Volume</strong></div> - <div class="grid-2"> - {{ _noiSubmission.soilAlreadyPlacedVolume }} - <span *ngIf="_noiSubmission.soilAlreadyPlacedVolume">m<sup>3</sup></span> - </div> - <div class="grid-1"><strong>Area</strong></div> - <div class="grid-2"> - {{ _noiSubmission.soilAlreadyPlacedArea }} - <span *ngIf="_noiSubmission.soilAlreadyPlacedArea">m<sup>2</sup></span> - </div> - <div class="grid-1"><strong>Maximum Depth</strong></div> - <div class="grid-2"> - {{ _noiSubmission.soilAlreadyPlacedMaximumDepth }} - <span *ngIf="_noiSubmission.soilAlreadyPlacedMaximumDepth">m</span> - </div> - <div class="grid-1"><strong>Average Depth</strong></div> - <div class="grid-2"> - {{ _noiSubmission.soilAlreadyPlacedAverageDepth }} - <span *ngIf="_noiSubmission.soilAlreadyPlacedAverageDepth">m</span> - </div> + <div class="grid-1"></div> + <div class="subheading2 grid-double">Fill to be Placed</div> + + <div class="subheading2 grid-1">Volume</div> + <div class="grid-double"> + {{ _noiSubmission.soilToPlaceVolume }} + <span *ngIf="_noiSubmission.soilToPlaceVolume">m<sup>3</sup></span> </div> + <div class="subheading2 grid-1">Area</div> + <div class="grid-double"> + {{ _noiSubmission.soilToPlaceArea }} <span *ngIf="_noiSubmission.soilToPlaceArea">m<sup>2</sup></span> + </div> + <div class="subheading2 grid-1">Maximum Depth</div> + <div class="grid-double"> + {{ _noiSubmission.soilToPlaceMaximumDepth }} + <span *ngIf="_noiSubmission.soilToPlaceMaximumDepth">m</span> + </div> + <div class="subheading2 grid-1">Average Depth</div> + <div class="grid-double"> + {{ _noiSubmission.soilToPlaceAverageDepth }} + <span *ngIf="_noiSubmission.soilToPlaceAverageDepth">m</span> + </div> + + <div class="grid-1"></div> + <div class="subheading2 grid-double">Fill already Placed</div> - <div class="full-width"> - <span class="subheading1">Project Duration</span> + <div class="subheading2 grid-1">Volume</div> + <div class="grid-double"> + {{ _noiSubmission.soilAlreadyPlacedVolume }} + <span *ngIf="_noiSubmission.soilAlreadyPlacedVolume">m<sup>3</sup></span> + </div> + <div class="subheading2 grid-1">Area</div> + <div class="grid-double"> + {{ _noiSubmission.soilAlreadyPlacedArea }} + <span *ngIf="_noiSubmission.soilAlreadyPlacedArea">m<sup>2</sup></span> </div> - <div class="subheading2 grid-1">Duration</div> + <div class="subheading2 grid-1">Maximum Depth</div> <div class="grid-double"> - {{ _noiSubmission.soilProjectDurationUnit }} + {{ _noiSubmission.soilAlreadyPlacedMaximumDepth }} + <span *ngIf="_noiSubmission.soilAlreadyPlacedMaximumDepth">m</span> </div> - <div class="subheading2 grid-1">Length</div> + <div class="subheading2 grid-1">Average Depth</div> <div class="grid-double"> - {{ _noiSubmission.soilProjectDurationAmount }} + {{ _noiSubmission.soilAlreadyPlacedAverageDepth }} + <span *ngIf="_noiSubmission.soilAlreadyPlacedAverageDepth">m</span> </div> <div class="subheading2 grid-1">Describe the type, origin and quality of fill proposed to be placed.</div> diff --git a/alcs-frontend/src/app/features/notification/applicant-info/notification-details/notification-details.component.html b/alcs-frontend/src/app/features/notification/applicant-info/notification-details/notification-details.component.html index 07e43a6738..86f34b9c41 100644 --- a/alcs-frontend/src/app/features/notification/applicant-info/notification-details/notification-details.component.html +++ b/alcs-frontend/src/app/features/notification/applicant-info/notification-details/notification-details.component.html @@ -109,18 +109,18 @@ <h3>Purpose of SRW</h3> <h3>Optional Documents</h3> <div *ngIf="submission" class="review-table"> <div class="other-attachments full-width"> - <div class="grid-1 subheading2">File Name</div> - <div class="grid-2 subheading2">Type</div> - <div class="grid-3 subheading2">Description</div> + <div class="subheading2">File Name</div> + <div class="subheading2">Type</div> + <div class="subheading2">Description</div> <ng-container *ngFor="let file of otherFiles"> - <div class="grid-1"> + <div> <a (click)="openFile(file.uuid)">{{ file.fileName }}</a> </div> - <div class="grid-2"> + <div> {{ file.type?.label }} </div> - <div class="grid-3"> + <div> {{ file.description }} </div> </ng-container> diff --git a/alcs-frontend/src/app/features/notification/applicant-info/notification-details/notification-details.component.scss b/alcs-frontend/src/app/features/notification/applicant-info/notification-details/notification-details.component.scss index b7cc10222d..7cec24e431 100644 --- a/alcs-frontend/src/app/features/notification/applicant-info/notification-details/notification-details.component.scss +++ b/alcs-frontend/src/app/features/notification/applicant-info/notification-details/notification-details.component.scss @@ -44,20 +44,16 @@ :host::ng-deep { .transferee-table { display: grid; - grid-template-columns: max-content max-content max-content max-content max-content; - overflow-x: auto; + grid-template-columns: 1fr 1fr 1fr 1fr 1fr; grid-column-gap: 36px; grid-row-gap: 12px; - overflow: unset; } .survey-plan-table { display: grid; - grid-template-columns: max-content max-content max-content; - overflow-x: auto; + grid-template-columns: 1fr 1fr 1fr; grid-column-gap: 36px; grid-row-gap: 12px; - overflow: unset; } .scrollable { @@ -66,9 +62,7 @@ .other-attachments { display: grid; - grid-template-columns: max-content max-content max-content; - overflow-x: auto; - overflow-y: hidden; + grid-template-columns: 1fr 1fr 1fr; grid-column-gap: 36px; grid-row-gap: 12px; diff --git a/alcs-frontend/src/app/features/notification/applicant-info/notification-details/parcel/parcel.component.scss b/alcs-frontend/src/app/features/notification/applicant-info/notification-details/parcel/parcel.component.scss index e79cc4a08f..5bc4cf3042 100644 --- a/alcs-frontend/src/app/features/notification/applicant-info/notification-details/parcel/parcel.component.scss +++ b/alcs-frontend/src/app/features/notification/applicant-info/notification-details/parcel/parcel.component.scss @@ -1,24 +1,3 @@ -.owner-information { - display: grid; - grid-template-columns: max-content max-content max-content max-content max-content max-content; - overflow-x: auto; - overflow-y: hidden; - grid-column-gap: 36px; - grid-row-gap: 12px; - - .full-width { - grid-column: 1/3; - } -} - -.review-table { - grid-template-columns: 1fr 1fr !important; - - .full-width { - grid-column: 1/5; - } -} - .crown-land { text-transform: capitalize; } diff --git a/portal-frontend/src/app/features/applications/application-details/application-details.component.scss b/portal-frontend/src/app/features/applications/application-details/application-details.component.scss index 7844dfb207..8c860798c8 100644 --- a/portal-frontend/src/app/features/applications/application-details/application-details.component.scss +++ b/portal-frontend/src/app/features/applications/application-details/application-details.component.scss @@ -2,6 +2,12 @@ @use '../../../../styles/colors'; :host::ng-deep { + .multiple-documents { + a { + display: block; + } + } + .view-grid-item { display: grid; grid-template-columns: minmax(rem(100), 0.5fr) 1fr; diff --git a/portal-frontend/src/app/features/applications/application-details/pfrs-details/pfrs-details.component.html b/portal-frontend/src/app/features/applications/application-details/pfrs-details/pfrs-details.component.html index 2c37cd65af..5495d512b3 100644 --- a/portal-frontend/src/app/features/applications/application-details/pfrs-details/pfrs-details.component.html +++ b/portal-frontend/src/app/features/applications/application-details/pfrs-details/pfrs-details.component.html @@ -219,7 +219,7 @@ </div> <div class="subheading2 grid-1">Cross Sections</div> - <div class="grid-double"> + <div class="grid-double multiple-documents"> <a *ngFor="let file of crossSections" (click)="openFile(file.uuid)"> {{ file.fileName }} </a> @@ -227,7 +227,7 @@ </div> <div class="subheading2 grid-1">Reclamation Plan</div> - <div class="grid-double"> + <div class="grid-double multiple-documents"> <a *ngFor="let file of crossSections" (click)="openFile(file.uuid)"> {{ file.fileName }} </a> @@ -259,12 +259,10 @@ </div> <div *ngIf="_applicationSubmission.soilHasSubmittedNotice" class="subheading2 grid-1">Notice of Work</div> - <div *ngIf="_applicationSubmission.soilHasSubmittedNotice" class="grid-double"> - <div *ngFor="let file of noticeOfWork"> - <a (click)="openFile(file.uuid)"> - {{ file.fileName }} - </a> - </div> + <div *ngIf="_applicationSubmission.soilHasSubmittedNotice" class="grid-double multiple-documents"> + <a *ngFor="let file of noticeOfWork" (click)="openFile(file.uuid)"> + {{ file.fileName }} + </a> <app-no-data [showRequired]="showErrors" *ngIf="noticeOfWork.length === 0"></app-no-data> </div> diff --git a/portal-frontend/src/app/features/applications/application-details/pofo-details/pofo-details.component.html b/portal-frontend/src/app/features/applications/application-details/pofo-details/pofo-details.component.html index d1f6cfc3e0..e6c6146782 100644 --- a/portal-frontend/src/app/features/applications/application-details/pofo-details/pofo-details.component.html +++ b/portal-frontend/src/app/features/applications/application-details/pofo-details/pofo-details.component.html @@ -143,7 +143,7 @@ </div> <div class="subheading2 grid-1">Cross Sections</div> - <div class="grid-double"> + <div class="grid-double multiple-documents"> <a *ngFor="let file of crossSections" (click)="openFile(file.uuid)"> {{ file.fileName }} </a> @@ -151,7 +151,7 @@ </div> <div class="subheading2 grid-1">Reclamation Plan</div> - <div class="grid-double"> + <div class="grid-double multiple-documents"> <a *ngFor="let file of crossSections" (click)="openFile(file.uuid)"> {{ file.fileName }} </a> diff --git a/portal-frontend/src/app/features/applications/application-details/roso-details/roso-details.component.html b/portal-frontend/src/app/features/applications/application-details/roso-details/roso-details.component.html index b3a81ee86b..bd4a7980f2 100644 --- a/portal-frontend/src/app/features/applications/application-details/roso-details/roso-details.component.html +++ b/portal-frontend/src/app/features/applications/application-details/roso-details/roso-details.component.html @@ -134,7 +134,7 @@ </div> <div class="subheading2 grid-1">Cross Sections</div> - <div class="grid-double"> + <div class="grid-double multiple-documents"> <a *ngFor="let file of crossSections" (click)="openFile(file.uuid)"> {{ file.fileName }} </a> @@ -142,7 +142,7 @@ </div> <div class="subheading2 grid-1">Reclamation Plan</div> - <div class="grid-double"> + <div class="grid-double multiple-documents"> <a *ngFor="let file of crossSections" (click)="openFile(file.uuid)"> {{ file.fileName }} </a> diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/additional-information/additional-information.component.scss b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/additional-information/additional-information.component.scss index 93126c715b..b2f1eb8288 100644 --- a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/additional-information/additional-information.component.scss +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/additional-information/additional-information.component.scss @@ -1,11 +1,5 @@ @use '../../../../../styles/functions' as *; -.multiple-documents { - a { - display: block; - } -} - .structure-table { display: grid; grid-template-columns: max-content max-content max-content; diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.scss b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.scss index 7844dfb207..8c860798c8 100644 --- a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.scss +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.scss @@ -2,6 +2,12 @@ @use '../../../../styles/colors'; :host::ng-deep { + .multiple-documents { + a { + display: block; + } + } + .view-grid-item { display: grid; grid-template-columns: minmax(rem(100), 0.5fr) 1fr; diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/roso-details/roso-details.component.html b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/roso-details/roso-details.component.html index dcbf7ea084..283cce4cbe 100644 --- a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/roso-details/roso-details.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/roso-details/roso-details.component.html @@ -133,7 +133,7 @@ <ng-container *ngIf="_noiSubmission?.soilIsExtractionOrMining"> <div class="subheading2 grid-1">Cross Sections</div> - <div class="grid-double"> + <div class="grid-double multiple-documents"> <a *ngFor="let file of crossSections" (click)="openFile(file.uuid)"> {{ file.fileName }} </a> @@ -141,7 +141,7 @@ </div> <div class="subheading2 grid-1">Reclamation Plan</div> - <div class="grid-double"> + <div class="grid-double multiple-documents"> <a *ngFor="let file of crossSections" (click)="openFile(file.uuid)"> {{ file.fileName }} </a> @@ -160,7 +160,7 @@ <ng-container *ngIf="_noiSubmission.soilHasSubmittedNotice"> <div class="subheading2 grid-1">Notice of Work</div> - <div class="grid-double"> + <div class="grid-double multiple-documents"> <a *ngFor="let file of noticeOfWorks" (click)="openFile(file.uuid)"> {{ file.fileName }} </a> From 67ae62fdbdbad8065412da1ed8023dfd4caa081c Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Tue, 31 Oct 2023 11:03:56 -0700 Subject: [PATCH 576/954] Cove Updates * Update labels on app prep / noi prep * Add Covenant to App Types dropdown * Fix Covenant color * Remove Creating V1 covenants from all boards --- .../parcel-prep/parcel-prep.component.html | 2 +- .../proposal/proposal.component.html | 2 +- .../parcel-prep/parcel-prep.component.html | 2 +- .../file-type/file-type-data-source.service.ts | 3 +++ .../generate-submission-document.service.ts | 8 ++++---- .../migrations/1698773732187-fix_cove_color.ts | 18 ++++++++++++++++++ 6 files changed, 28 insertions(+), 7 deletions(-) create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1698773732187-fix_cove_color.ts diff --git a/alcs-frontend/src/app/features/application/proposal/parcel-prep/parcel-prep.component.html b/alcs-frontend/src/app/features/application/proposal/parcel-prep/parcel-prep.component.html index 610596a4ac..91cfbd81db 100644 --- a/alcs-frontend/src/app/features/application/proposal/parcel-prep/parcel-prep.component.html +++ b/alcs-frontend/src/app/features/application/proposal/parcel-prep/parcel-prep.component.html @@ -34,7 +34,7 @@ <td mat-cell *matCellDef="let row">{{ row.mapAreaHectares }}</td> </ng-container> <ng-container matColumnDef="alrArea"> - <th mat-header-cell *matHeaderCellDef>ALR Area Impacted (ha)</th> + <th mat-header-cell *matHeaderCellDef>ALR Area (ha)</th> <td mat-cell *matCellDef="let row"> <app-inline-number [value]="row.alrArea" (save)="saveParcel(row.uuid, $event)"></app-inline-number> </td> diff --git a/alcs-frontend/src/app/features/application/proposal/proposal.component.html b/alcs-frontend/src/app/features/application/proposal/proposal.component.html index 5837ee6133..ddd31928d3 100644 --- a/alcs-frontend/src/app/features/application/proposal/proposal.component.html +++ b/alcs-frontend/src/app/features/application/proposal/proposal.component.html @@ -47,7 +47,7 @@ <h5>Proposal Components - {{ application?.type?.label }}</h5> <app-proposal-naru *ngIf="application && application.type.code === 'NARU'"></app-proposal-naru> </section> <section> - <h5>Application Parcels</h5> + <h5>Parcels</h5> <app-parcel-prep *ngIf="application" [fileNumber]="application.fileNumber"></app-parcel-prep> </section> <section> diff --git a/alcs-frontend/src/app/features/notice-of-intent/proposal/parcel-prep/parcel-prep.component.html b/alcs-frontend/src/app/features/notice-of-intent/proposal/parcel-prep/parcel-prep.component.html index 610596a4ac..91cfbd81db 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/proposal/parcel-prep/parcel-prep.component.html +++ b/alcs-frontend/src/app/features/notice-of-intent/proposal/parcel-prep/parcel-prep.component.html @@ -34,7 +34,7 @@ <td mat-cell *matCellDef="let row">{{ row.mapAreaHectares }}</td> </ng-container> <ng-container matColumnDef="alrArea"> - <th mat-header-cell *matHeaderCellDef>ALR Area Impacted (ha)</th> + <th mat-header-cell *matHeaderCellDef>ALR Area (ha)</th> <td mat-cell *matCellDef="let row"> <app-inline-number [value]="row.alrArea" (save)="saveParcel(row.uuid, $event)"></app-inline-number> </td> diff --git a/alcs-frontend/src/app/services/search/file-type/file-type-data-source.service.ts b/alcs-frontend/src/app/services/search/file-type/file-type-data-source.service.ts index b8fbe732f6..cf66283046 100644 --- a/alcs-frontend/src/app/services/search/file-type/file-type-data-source.service.ts +++ b/alcs-frontend/src/app/services/search/file-type/file-type-data-source.service.ts @@ -47,6 +47,9 @@ const TREE_DATA: TreeNode[] = [ { item: { label: 'Transportation, Utility, Trail Permits', value: 'TURP' }, }, + { + item: { label: 'Restrictive Covenant', value: 'COVE' }, + }, ], }, { diff --git a/services/apps/alcs/src/portal/pdf-generation/generate-submission-document.service.ts b/services/apps/alcs/src/portal/pdf-generation/generate-submission-document.service.ts index b96cff2719..18bd8cab45 100644 --- a/services/apps/alcs/src/portal/pdf-generation/generate-submission-document.service.ts +++ b/services/apps/alcs/src/portal/pdf-generation/generate-submission-document.service.ts @@ -1,5 +1,4 @@ import { CdogsService } from '@app/common/cdogs/cdogs.service'; -import { ServiceNotFoundException } from '@app/common/exceptions/base.exception'; import { forwardRef, HttpStatus, @@ -9,15 +8,15 @@ import { } from '@nestjs/common'; import * as config from 'config'; import * as dayjs from 'dayjs'; -import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; -import { OWNER_TYPE } from '../../common/owner-type/owner-type.entity'; -import { DOCUMENT_TYPE } from '../../document/document-code.entity'; import { ApplicationDocument, VISIBILITY_FLAG, } from '../../alcs/application/application-document/application-document.entity'; import { ApplicationDocumentService } from '../../alcs/application/application-document/application-document.service'; import { ApplicationService } from '../../alcs/application/application.service'; +import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; +import { OWNER_TYPE } from '../../common/owner-type/owner-type.entity'; +import { DOCUMENT_TYPE } from '../../document/document-code.entity'; import { DOCUMENT_SOURCE, DOCUMENT_SYSTEM } from '../../document/document.dto'; import { User } from '../../user/user.entity'; import { formatBooleanToYesNoString } from '../../utils/boolean-formatter'; @@ -38,6 +37,7 @@ export enum APPLICATION_SUBMISSION_TYPES { SUBD = 'SUBD', INCL = 'INCL', EXCL = 'EXCL', + COVE = 'COVE', } class PdfTemplate { diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1698773732187-fix_cove_color.ts b/services/apps/alcs/src/providers/typeorm/migrations/1698773732187-fix_cove_color.ts new file mode 100644 index 0000000000..2127728409 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1698773732187-fix_cove_color.ts @@ -0,0 +1,18 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class fixCoveColor1698773732187 implements MigrationInterface { + public async up(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query(` + UPDATE "alcs"."application_type" SET "background_color" = '#002447' WHERE "code" = 'COVE'; + `); + + //Prevent Creating V1 Covenants + await queryRunner.query(` + DELETE FROM "alcs"."board_create_card_types_card_type" WHERE "card_type_code" = 'COV'; + `); + } + + public async down(): Promise<void> { + //Nope + } +} From 2a66fad858fefff472407280a5e3061e21fbdf0d Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Tue, 31 Oct 2023 11:47:15 -0700 Subject: [PATCH 577/954] Rename Turp Dec Component -> Expiry Date Component * Use for both Turp and Covenant * Add Covenant to Decision Component Types --- .../expiry-date.component.html} | 0 .../expiry-date.component.scss} | 0 .../expiry-date.component.spec.ts} | 10 +++---- .../expiry-date.component.ts} | 8 +++--- .../decision-component.component.html | 16 +++++++---- .../decision-component.component.ts | 28 ++++++++++--------- .../expiry-date-input.component.html} | 0 .../expiry-date-input.component.scss} | 0 .../expiry-date-input.component.spec.ts} | 10 +++---- .../expiry-date-input.component.ts | 11 ++++++++ .../turp-input/turp-input.component.ts | 11 -------- .../decision-components.component.ts | 10 +++++-- .../decision-v2/decision-v2.component.html | 9 ++++-- .../application/decision/decision.module.ts | 8 +++--- .../application-decision-v2.dto.ts | 1 + ...98776304748-add_cove_decision_component.ts | 19 +++++++++++++ 16 files changed, 87 insertions(+), 54 deletions(-) rename alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/{turp/turp.component.html => expiry-date/expiry-date.component.html} (100%) rename alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/{turp/turp.component.scss => expiry-date/expiry-date.component.scss} (100%) rename alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/{turp/turp.component.spec.ts => expiry-date/expiry-date.component.spec.ts} (71%) rename alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/{turp/turp.component.ts => expiry-date/expiry-date.component.ts} (65%) rename alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/{turp-input/turp-input.component.html => expiry-date-input/expiry-date-input.component.html} (100%) rename alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/{turp-input/turp-input.component.scss => expiry-date-input/expiry-date-input.component.scss} (100%) rename alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/{turp-input/turp-input.component.spec.ts => expiry-date-input/expiry-date-input.component.spec.ts} (60%) create mode 100644 alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/expiry-date-input/expiry-date-input.component.ts delete mode 100644 alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/turp-input/turp-input.component.ts create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1698776304748-add_cove_decision_component.ts diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/turp/turp.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/expiry-date/expiry-date.component.html similarity index 100% rename from alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/turp/turp.component.html rename to alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/expiry-date/expiry-date.component.html diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/turp/turp.component.scss b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/expiry-date/expiry-date.component.scss similarity index 100% rename from alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/turp/turp.component.scss rename to alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/expiry-date/expiry-date.component.scss diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/turp/turp.component.spec.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/expiry-date/expiry-date.component.spec.ts similarity index 71% rename from alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/turp/turp.component.spec.ts rename to alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/expiry-date/expiry-date.component.spec.ts index 12425f4802..208b3e5d41 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/turp/turp.component.spec.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/expiry-date/expiry-date.component.spec.ts @@ -2,19 +2,19 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ApplicationDecisionComponentDto } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; -import { TurpComponent } from './turp.component'; +import { ExpiryDateComponent } from './expiry-date.component'; describe('TurpComponent', () => { - let component: TurpComponent; - let fixture: ComponentFixture<TurpComponent>; + let component: ExpiryDateComponent; + let fixture: ComponentFixture<ExpiryDateComponent>; beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [TurpComponent], + declarations: [ExpiryDateComponent], schemas: [NO_ERRORS_SCHEMA], }).compileComponents(); - fixture = TestBed.createComponent(TurpComponent); + fixture = TestBed.createComponent(ExpiryDateComponent); component = fixture.componentInstance; component.component = {} as ApplicationDecisionComponentDto; fixture.detectChanges(); diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/turp/turp.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/expiry-date/expiry-date.component.ts similarity index 65% rename from alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/turp/turp.component.ts rename to alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/expiry-date/expiry-date.component.ts index c9030c3662..ad71090b7a 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/turp/turp.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/expiry-date/expiry-date.component.ts @@ -2,10 +2,10 @@ import { Component, EventEmitter, Input, Output } from '@angular/core'; import { ApplicationDecisionComponentDto } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; @Component({ - selector: 'app-turp', - templateUrl: './turp.component.html', - styleUrls: ['./turp.component.scss'], + selector: 'app-expiry-date', + templateUrl: './expiry-date.component.html', + styleUrls: ['./expiry-date.component.scss'], }) -export class TurpComponent { +export class ExpiryDateComponent { @Input() component!: ApplicationDecisionComponentDto; } diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.html index 80bc71f308..b7101b2b8b 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.html @@ -1,8 +1,6 @@ -<div class='split'> +<div class="split"> <h5>{{ data.applicationDecisionComponentType?.label }}</h5> - <button type="button" class="remove-button" mat-stroked-button color="warn" (click)="onRemove()"> - Remove - </button> + <button type="button" class="remove-button" mat-stroked-button color="warn" (click)="onRemove()">Remove</button> </div> <form [formGroup]="form" class="decision-component-form"> @@ -10,8 +8,14 @@ <h5>{{ data.applicationDecisionComponentType?.label }}</h5> <app-nfu-input [form]="form"></app-nfu-input> </div> - <div *ngIf="data.applicationDecisionComponentTypeCode === COMPONENT_TYPE.TURP" class="row-no-flex"> - <app-turp-input [form]="form"></app-turp-input> + <div + *ngIf=" + data.applicationDecisionComponentTypeCode === COMPONENT_TYPE.TURP || + data.applicationDecisionComponentTypeCode === COMPONENT_TYPE.COVE + " + class="row-no-flex" + > + <app-expiry-date-input [form]="form"></app-expiry-date-input> </div> <div *ngIf="data.applicationDecisionComponentTypeCode === COMPONENT_TYPE.POFO" class="row-no-flex"> diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.ts index 8446e128e5..86d658fd85 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.ts @@ -41,7 +41,7 @@ export class DecisionComponentComponent implements OnInit { nfuSubType = new FormControl<string | null>(null, [Validators.required]); endDate = new FormControl<Date | null>(null, [Validators.required]); - // turp + // expiry-date & cove expiryDate = new FormControl<Date | null>(null); // pofo, pfrs @@ -98,7 +98,8 @@ export class DecisionComponentComponent implements OnInit { this.patchNfuFields(); break; case APPLICATION_DECISION_COMPONENT_TYPE.TURP: - this.patchTurpFields(); + case APPLICATION_DECISION_COMPONENT_TYPE.COVE: + this.addExpiryDateField(); break; case APPLICATION_DECISION_COMPONENT_TYPE.POFO: this.patchPofoFields(); @@ -129,6 +130,14 @@ export class DecisionComponentComponent implements OnInit { this.onFormValueChanges(); } + markTouched() { + this.subdInputComponent?.markAllAsTouched(); + } + + onRemove() { + this.remove.emit(); + } + private onFormValueChanges() { this.form.valueChanges.subscribe((changes) => { let dataChange = { @@ -167,7 +176,8 @@ export class DecisionComponentComponent implements OnInit { dataChange = { ...dataChange, ...this.getNfuDataChange() }; break; case APPLICATION_DECISION_COMPONENT_TYPE.TURP: - dataChange = { ...dataChange, ...this.getTurpDataChange() }; + case APPLICATION_DECISION_COMPONENT_TYPE.COVE: + dataChange = { ...dataChange, ...this.getExpiryDateDataChange() }; break; case APPLICATION_DECISION_COMPONENT_TYPE.POFO: dataChange = { ...dataChange, ...this.getPofoDataChange() }; @@ -205,7 +215,7 @@ export class DecisionComponentComponent implements OnInit { this.endDate.setValue(this.data.endDate ? new Date(this.data.endDate) : null); } - private patchTurpFields() { + private addExpiryDateField() { this.form.addControl('expiryDate', this.expiryDate); this.expiryDate.setValue(this.data.expiryDate ? new Date(this.data.expiryDate) : null); @@ -275,7 +285,7 @@ export class DecisionComponentComponent implements OnInit { }; } - private getTurpDataChange(): TurpDecisionComponentDto { + private getExpiryDateDataChange(): TurpDecisionComponentDto { return { expiryDate: this.expiryDate.value ? formatDateForApi(this.expiryDate.value) : null, }; @@ -334,18 +344,10 @@ export class DecisionComponentComponent implements OnInit { }; } - markTouched() { - this.subdInputComponent?.markAllAsTouched(); - } - private getInclExclDataChange() { return { inclExclApplicantType: this.applicantType.value ?? undefined, expiryDate: this.expiryDate.value ? formatDateForApi(this.expiryDate.value) : null, }; } - - onRemove() { - this.remove.emit(); - } } diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/turp-input/turp-input.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/expiry-date-input/expiry-date-input.component.html similarity index 100% rename from alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/turp-input/turp-input.component.html rename to alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/expiry-date-input/expiry-date-input.component.html diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/turp-input/turp-input.component.scss b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/expiry-date-input/expiry-date-input.component.scss similarity index 100% rename from alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/turp-input/turp-input.component.scss rename to alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/expiry-date-input/expiry-date-input.component.scss diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/turp-input/turp-input.component.spec.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/expiry-date-input/expiry-date-input.component.spec.ts similarity index 60% rename from alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/turp-input/turp-input.component.spec.ts rename to alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/expiry-date-input/expiry-date-input.component.spec.ts index dc56df922d..4eb8ed26a4 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/turp-input/turp-input.component.spec.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/expiry-date-input/expiry-date-input.component.spec.ts @@ -1,19 +1,19 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { TurpInputComponent } from './turp-input.component'; +import { ExpiryDateInputComponent } from './expiry-date-input.component'; describe('TurpInputComponent', () => { - let component: TurpInputComponent; - let fixture: ComponentFixture<TurpInputComponent>; + let component: ExpiryDateInputComponent; + let fixture: ComponentFixture<ExpiryDateInputComponent>; beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [TurpInputComponent], + declarations: [ExpiryDateInputComponent], schemas: [NO_ERRORS_SCHEMA], }).compileComponents(); - fixture = TestBed.createComponent(TurpInputComponent); + fixture = TestBed.createComponent(ExpiryDateInputComponent); component = fixture.componentInstance; fixture.detectChanges(); }); diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/expiry-date-input/expiry-date-input.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/expiry-date-input/expiry-date-input.component.ts new file mode 100644 index 0000000000..cad007ad50 --- /dev/null +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/expiry-date-input/expiry-date-input.component.ts @@ -0,0 +1,11 @@ +import { Component, Input } from '@angular/core'; +import { FormGroup } from '@angular/forms'; + +@Component({ + selector: 'app-expiry-date-input', + templateUrl: './expiry-date-input.component.html', + styleUrls: ['./expiry-date-input.component.scss'], +}) +export class ExpiryDateInputComponent { + @Input() form!: FormGroup; +} diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/turp-input/turp-input.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/turp-input/turp-input.component.ts deleted file mode 100644 index 4bf9a6f79e..0000000000 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/turp-input/turp-input.component.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { Component, Input } from '@angular/core'; -import { FormGroup } from '@angular/forms'; - -@Component({ - selector: 'app-turp-input', - templateUrl: './turp-input.component.html', - styleUrls: ['./turp-input.component.scss'], -}) -export class TurpInputComponent { - @Input() form!: FormGroup; -} diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-components.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-components.component.ts index 09429cc6d5..a6cdc0d82b 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-components.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-components.component.ts @@ -104,8 +104,11 @@ export class DecisionComponentsComponent implements OnInit, OnDestroy, AfterView this.patchNfuFields(component); } - if (typeCode === APPLICATION_DECISION_COMPONENT_TYPE.TURP) { - this.patchTurpFields(component); + if ( + typeCode === APPLICATION_DECISION_COMPONENT_TYPE.TURP || + typeCode === APPLICATION_DECISION_COMPONENT_TYPE.COVE + ) { + this.setExpiryDateFields(component); } if (typeCode === APPLICATION_DECISION_COMPONENT_TYPE.POFO) { @@ -143,6 +146,7 @@ export class DecisionComponentsComponent implements OnInit, OnDestroy, AfterView case APPLICATION_DECISION_COMPONENT_TYPE.SUBD: case APPLICATION_DECISION_COMPONENT_TYPE.INCL: case APPLICATION_DECISION_COMPONENT_TYPE.EXCL: + case APPLICATION_DECISION_COMPONENT_TYPE.COVE: this.components.unshift({ applicationDecisionComponentTypeCode: typeCode, applicationDecisionComponentType: this.decisionComponentTypes.find( @@ -225,7 +229,7 @@ export class DecisionComponentsComponent implements OnInit, OnDestroy, AfterView component.endDate = this.application.proposalEndDate; } - private patchTurpFields(component: ApplicationDecisionComponentDto) { + private setExpiryDateFields(component: ApplicationDecisionComponentDto) { component.expiryDate = this.application.proposalExpiryDate; } diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.html index b95c28df84..1adc7b6ee6 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.html @@ -182,9 +182,12 @@ <h5>{{ component.applicationDecisionComponentType?.label }}</h5> ></app-basic> </app-nfup> - <app-turp + <app-expiry-date class="grid-2" - *ngIf="component.applicationDecisionComponentTypeCode === COMPONENT_TYPE.TURP" + *ngIf=" + component.applicationDecisionComponentTypeCode === COMPONENT_TYPE.TURP || + component.applicationDecisionComponentTypeCode === COMPONENT_TYPE.COVE + " [component]="component" > <app-basic @@ -192,7 +195,7 @@ <h5>{{ component.applicationDecisionComponentType?.label }}</h5> [fillRow]="true" (saveAlrArea)="onSaveAlrArea(decision.uuid, component.uuid, $event)" ></app-basic - ></app-turp> + ></app-expiry-date> <app-pofo class="grid-2" diff --git a/alcs-frontend/src/app/features/application/decision/decision.module.ts b/alcs-frontend/src/app/features/application/decision/decision.module.ts index b5fd0f9ddc..1827963976 100644 --- a/alcs-frontend/src/app/features/application/decision/decision.module.ts +++ b/alcs-frontend/src/app/features/application/decision/decision.module.ts @@ -21,7 +21,7 @@ import { PfrsComponent } from './decision-v2/decision-component/pfrs/pfrs.compon import { PofoComponent } from './decision-v2/decision-component/pofo/pofo.component'; import { RosoComponent } from './decision-v2/decision-component/roso/roso.component'; import { SubdComponent } from './decision-v2/decision-component/subd/subd.component'; -import { TurpComponent } from './decision-v2/decision-component/turp/turp.component'; +import { ExpiryDateComponent } from './decision-v2/decision-component/expiry-date/expiry-date.component'; import { DecisionDocumentsComponent } from './decision-v2/decision-documents/decision-documents.component'; import { DecisionComponentComponent } from './decision-v2/decision-input/decision-components/decision-component/decision-component.component'; import { InclExclInputComponent } from './decision-v2/decision-input/decision-components/decision-component/incl-excl-input/incl-excl-input.component'; @@ -31,7 +31,7 @@ import { PfrsInputComponent } from './decision-v2/decision-input/decision-compon import { PofoInputComponent } from './decision-v2/decision-input/decision-components/decision-component/pofo-input/pofo-input.component'; import { RosoInputComponent } from './decision-v2/decision-input/decision-components/decision-component/roso-input/roso-input.component'; import { SubdInputComponent } from './decision-v2/decision-input/decision-components/decision-component/subd-input/subd-input.component'; -import { TurpInputComponent } from './decision-v2/decision-input/decision-components/decision-component/turp-input/turp-input.component'; +import { ExpiryDateInputComponent } from './decision-v2/decision-input/decision-components/decision-component/expiry-date-input/expiry-date-input.component'; import { DecisionComponentsComponent } from './decision-v2/decision-input/decision-components/decision-components.component'; import { DecisionConditionComponent } from './decision-v2/decision-input/decision-conditions/decision-condition/decision-condition.component'; import { DecisionConditionsComponent } from './decision-v2/decision-input/decision-conditions/decision-conditions.component'; @@ -86,9 +86,9 @@ export const decisionChildRoutes = [ NfuInputComponent, DecisionConditionComponent, DecisionConditionsComponent, - TurpInputComponent, + ExpiryDateInputComponent, NfupComponent, - TurpComponent, + ExpiryDateComponent, PofoInputComponent, PofoComponent, RosoComponent, diff --git a/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-v2.dto.ts b/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-v2.dto.ts index 35bdc0280f..90138a5eae 100644 --- a/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-v2.dto.ts +++ b/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-v2.dto.ts @@ -206,6 +206,7 @@ export enum APPLICATION_DECISION_COMPONENT_TYPE { SUBD = 'SUBD', INCL = 'INCL', EXCL = 'EXCL', + COVE = 'COVE', } export interface ApplicationDecisionConditionTypeDto extends BaseCodeDto {} diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1698776304748-add_cove_decision_component.ts b/services/apps/alcs/src/providers/typeorm/migrations/1698776304748-add_cove_decision_component.ts new file mode 100644 index 0000000000..3fd476d3a2 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1698776304748-add_cove_decision_component.ts @@ -0,0 +1,19 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class addCoveDecisionComponent1698776304748 + implements MigrationInterface +{ + name = 'addCoveDecisionComponent1698776304748'; + + public async up(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query(` + INSERT INTO "alcs"."application_decision_component_type" + ("audit_deleted_date_at", "audit_created_at", "audit_updated_at", "audit_created_by", "audit_updated_by", "label", "code", "description") VALUES + (NULL, NOW(), NULL, 'seed-migration', 'seed-migration', 'Restrictive Covenant', 'COVE', 'Restrictive Covenant'); + `); + } + + public async down(): Promise<void> { + //Nope + } +} From 3f316a127f439687c6bb900b1abe2ccaff39a4e4 Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Tue, 31 Oct 2023 11:48:46 -0700 Subject: [PATCH 578/954] task-1247 input focus select --- .../shared/soil-table/soil-table.component.html | 16 ++++++++-------- .../shared/soil-table/soil-table.component.ts | 5 +++++ 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/portal-frontend/src/app/shared/soil-table/soil-table.component.html b/portal-frontend/src/app/shared/soil-table/soil-table.component.html index 2a2bb1d1b3..4eb13745e2 100644 --- a/portal-frontend/src/app/shared/soil-table/soil-table.component.html +++ b/portal-frontend/src/app/shared/soil-table/soil-table.component.html @@ -32,7 +32,7 @@ separatorLimit="9999999999" matInput formControlName="volume" - onfocus="this.select()" + (focus)="onInputFocus($event)" /> <span matTextSuffix>m<sup>3</sup></span> </mat-form-field> @@ -51,7 +51,7 @@ separatorLimit="9999999999" matInput formControlName="volume2" - onfocus="this.select()" + (focus)="onInputFocus($event)" /> <span matTextSuffix>m<sup>3</sup></span> </mat-form-field> @@ -74,7 +74,7 @@ separatorLimit="9999999999" matInput formControlName="area" - onfocus="this.select()" + (focus)="onInputFocus($event)" /> <span matTextSuffix>m<sup>2</sup></span> </mat-form-field> @@ -93,7 +93,7 @@ separatorLimit="9999999999" matInput formControlName="area2" - onfocus="this.select()" + (focus)="onInputFocus($event)" /> <span matTextSuffix>m<sup>2</sup></span> </mat-form-field> @@ -116,7 +116,7 @@ separatorLimit="9999999999" matInput formControlName="maximumDepth" - onfocus="this.select()" + (focus)="onInputFocus($event)" /> <span matTextSuffix>m</span> </mat-form-field> @@ -135,7 +135,7 @@ separatorLimit="9999999999" matInput formControlName="maximumDepth2" - onfocus="this.select()" + (focus)="onInputFocus($event)" /> <span matTextSuffix>m</span> </mat-form-field> @@ -158,7 +158,7 @@ separatorLimit="9999999999" matInput formControlName="averageDepth" - onfocus="this.select()" + (focus)="onInputFocus($event)" /> <span matTextSuffix>m</span> </mat-form-field> @@ -177,7 +177,7 @@ separatorLimit="9999999999" matInput formControlName="averageDepth2" - onfocus="this.select()" + (focus)="onInputFocus($event)" /> <span matTextSuffix>m</span> </mat-form-field> diff --git a/portal-frontend/src/app/shared/soil-table/soil-table.component.ts b/portal-frontend/src/app/shared/soil-table/soil-table.component.ts index 06ef98354f..dcaf6f7563 100644 --- a/portal-frontend/src/app/shared/soil-table/soil-table.component.ts +++ b/portal-frontend/src/app/shared/soil-table/soil-table.component.ts @@ -86,4 +86,9 @@ export class SoilTableComponent implements OnInit, OnChanges { } } } + + onInputFocus(event: Event) { + const inputElement = event.target as HTMLInputElement; + inputElement.select() + } } From 62ad1c906ee8ad8d7d60ee9d973ae24a896267d0 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Tue, 31 Oct 2023 13:26:51 -0700 Subject: [PATCH 579/954] Code Review Feedback --- .../expiry-date/expiry-date.component.spec.ts | 2 +- .../decision-component/decision-component.component.ts | 6 +++--- .../expiry-date-input/expiry-date-input.component.html | 2 +- .../expiry-date-input/expiry-date-input.component.spec.ts | 2 +- .../incl-excl-input/incl-excl-input.component.html | 2 +- .../application-decision-v2/application-decision-v2.dto.ts | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/expiry-date/expiry-date.component.spec.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/expiry-date/expiry-date.component.spec.ts index 208b3e5d41..3a802fd56b 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/expiry-date/expiry-date.component.spec.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/expiry-date/expiry-date.component.spec.ts @@ -4,7 +4,7 @@ import { ApplicationDecisionComponentDto } from '../../../../../../services/appl import { ExpiryDateComponent } from './expiry-date.component'; -describe('TurpComponent', () => { +describe('ExpiryDateComponent', () => { let component: ExpiryDateComponent; let fixture: ComponentFixture<ExpiryDateComponent>; diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.ts index 86d658fd85..3592a1be0e 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.ts @@ -11,7 +11,7 @@ import { ProposedDecisionLotDto, RosoDecisionComponentDto, SubdDecisionComponentDto, - TurpDecisionComponentDto, + ExpiryDateDecisionComponentDto, } from '../../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; import { ToastService } from '../../../../../../../services/toast/toast.service'; import { AG_CAP_OPTIONS, AG_CAP_SOURCE_OPTIONS } from '../../../../../../../shared/dto/ag-cap.types.dto'; @@ -41,7 +41,7 @@ export class DecisionComponentComponent implements OnInit { nfuSubType = new FormControl<string | null>(null, [Validators.required]); endDate = new FormControl<Date | null>(null, [Validators.required]); - // expiry-date & cove + // turp & cove expiryDate = new FormControl<Date | null>(null); // pofo, pfrs @@ -285,7 +285,7 @@ export class DecisionComponentComponent implements OnInit { }; } - private getExpiryDateDataChange(): TurpDecisionComponentDto { + private getExpiryDateDataChange(): ExpiryDateDecisionComponentDto { return { expiryDate: this.expiryDate.value ? formatDateForApi(this.expiryDate.value) : null, }; diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/expiry-date-input/expiry-date-input.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/expiry-date-input/expiry-date-input.component.html index b64b949e8b..418d69ca45 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/expiry-date-input/expiry-date-input.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/expiry-date-input/expiry-date-input.component.html @@ -1,4 +1,4 @@ -<form [formGroup]="form" class="turp-component-form"> +<form [formGroup]="form"> <div class="grid-2"> <mat-form-field appearance="outline"> <mat-label>ALR Area Impacted (ha)</mat-label> diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/expiry-date-input/expiry-date-input.component.spec.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/expiry-date-input/expiry-date-input.component.spec.ts index 4eb8ed26a4..48fdd8ac68 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/expiry-date-input/expiry-date-input.component.spec.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/expiry-date-input/expiry-date-input.component.spec.ts @@ -3,7 +3,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ExpiryDateInputComponent } from './expiry-date-input.component'; -describe('TurpInputComponent', () => { +describe('ExpiryDateInputComponent', () => { let component: ExpiryDateInputComponent; let fixture: ComponentFixture<ExpiryDateInputComponent>; diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/incl-excl-input/incl-excl-input.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/incl-excl-input/incl-excl-input.component.html index 1022aa19e4..5da41dfebd 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/incl-excl-input/incl-excl-input.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/incl-excl-input/incl-excl-input.component.html @@ -1,4 +1,4 @@ -<form [formGroup]="form" class="turp-component-form"> +<form [formGroup]="form"> <div class="grid"> <mat-form-field appearance="outline"> <mat-label>ALR Area Impacted (ha)</mat-label> diff --git a/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-v2.dto.ts b/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-v2.dto.ts index 90138a5eae..46e408ee40 100644 --- a/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-v2.dto.ts +++ b/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-v2.dto.ts @@ -129,7 +129,7 @@ export interface NfuDecisionComponentDto { endDate?: number | null; } -export interface TurpDecisionComponentDto { +export interface ExpiryDateDecisionComponentDto { expiryDate?: number | null; } @@ -169,7 +169,7 @@ export interface InclExclDecisionComponentDto { export interface ApplicationDecisionComponentDto extends NfuDecisionComponentDto, - TurpDecisionComponentDto, + ExpiryDateDecisionComponentDto, PofoDecisionComponentDto, RosoDecisionComponentDto, NaruDecisionComponentDto, From dfcf8d540c7a1ca663e0a3dfba6aca535be3c836 Mon Sep 17 00:00:00 2001 From: "to. sandra" <76515860+sandratoh@users.noreply.github.com> Date: Tue, 31 Oct 2023 14:04:23 -0700 Subject: [PATCH 580/954] Update portal inbox table heading (#1120) --- .../home/inbox/inbox-table/inbox-table.component.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.html b/portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.html index 22fc6b24da..2aa190cf59 100644 --- a/portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.html +++ b/portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.html @@ -20,12 +20,12 @@ </ng-container> <ng-container matColumnDef="applicant"> - <th mat-header-cell *matHeaderCellDef>Owner Name</th> + <th mat-header-cell *matHeaderCellDef>{{ type === 'Notifications' ? 'Transferee' : 'Owner Name' }}</th> <td mat-cell *matCellDef="let row">{{ row.ownerName || '(Unknown)' }}</td> </ng-container> <ng-container matColumnDef="applicationType"> - <th mat-header-cell *matHeaderCellDef>Application Type</th> + <th mat-header-cell *matHeaderCellDef>Type</th> <td mat-cell *matCellDef="let row">{{ row.type }}</td> </ng-container> From 773aa398e0df9fee796c3b1785193c4e1ec0fb5d Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Tue, 31 Oct 2023 14:16:32 -0700 Subject: [PATCH 581/954] Add Email Template for Covenants * TURP and COVE use same government template so renamed to no-review template --- .../application-submission.controller.spec.ts | 4 +- .../application-submission.controller.ts | 58 +++++++++++-------- .../cove-applicant.template.ts | 50 ++++++++++++++++ .../emails/submitted-to-alc/index.ts | 2 +- ...te.ts => no-review-government.template.ts} | 2 +- 5 files changed, 89 insertions(+), 27 deletions(-) create mode 100644 services/templates/emails/submitted-to-alc/cove-applicant.template.ts rename services/templates/emails/submitted-to-alc/{tur-government.template.ts => no-review-government.template.ts} (96%) diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.controller.spec.ts b/services/apps/alcs/src/portal/application-submission/application-submission.controller.spec.ts index 993ff52db0..873b1254aa 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.controller.spec.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.controller.spec.ts @@ -8,7 +8,7 @@ import { ServiceValidationException } from '../../../../../libs/common/src/excep import { generateCANCApplicationHtml } from '../../../../../templates/emails/cancelled'; import { generateSUBGTurApplicantHtml, - generateSUBGTurGovernmentHtml, + generateSUBGNoReviewGovernmentTemplateEmail, } from '../../../../../templates/emails/submitted-to-alc'; import { generateSUBGApplicantHtml, @@ -452,7 +452,7 @@ describe('ApplicationSubmissionController', () => { expect( mockStatusEmailService.sendApplicationStatusEmail, ).toHaveBeenCalledWith({ - generateStatusHtml: generateSUBGTurGovernmentHtml, + generateStatusHtml: generateSUBGNoReviewGovernmentTemplateEmail, status: SUBMISSION_STATUS.SUBMITTED_TO_ALC, applicationSubmission: mockApplicationSubmission, government: mockGovernment, diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.controller.ts b/services/apps/alcs/src/portal/application-submission/application-submission.controller.ts index 7041ace2f0..1b5da076a0 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.controller.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.controller.ts @@ -17,8 +17,9 @@ import { import { generateCANCApplicationHtml } from '../../../../../templates/emails/cancelled'; import { generateSUBGTurApplicantHtml, - generateSUBGTurGovernmentHtml, + generateSUBGNoReviewGovernmentTemplateEmail, } from '../../../../../templates/emails/submitted-to-alc'; +import { generateSUBGCoveApplicantHtml } from '../../../../../templates/emails/submitted-to-alc/cove-applicant.template'; import { generateSUBGApplicantHtml, generateSUBGGovernmentHtml, @@ -31,6 +32,7 @@ import { LocalGovernmentService } from '../../alcs/local-government/local-govern import { PortalAuthGuard } from '../../common/authorization/portal-auth-guard.service'; import { StatusEmailService } from '../../providers/email/status-email.service'; import { User } from '../../user/user.entity'; +import { APPLICATION_SUBMISSION_TYPES } from '../pdf-generation/generate-submission-document.service'; import { ApplicationSubmissionValidatorService, ValidatedApplicationSubmission, @@ -326,30 +328,40 @@ export class ApplicationSubmissionController { ); if (primaryContact) { - await this.statusEmailService.sendApplicationStatusEmail({ - generateStatusHtml: generateSUBGTurApplicantHtml, - status: SUBMISSION_STATUS.SUBMITTED_TO_ALC, - applicationSubmission: validatedSubmission, - government: submissionGovernment, - parentType: PARENT_TYPE.APPLICATION, - primaryContact, - }); - } + if ( + matchingType.code === APPLICATION_SUBMISSION_TYPES.TURP || + matchingType.code === APPLICATION_SUBMISSION_TYPES.COVE + ) { + const generateTemplateFunction = + matchingType.code === APPLICATION_SUBMISSION_TYPES.TURP + ? generateSUBGTurApplicantHtml + : generateSUBGCoveApplicantHtml; - if (submissionGovernment) { - await this.statusEmailService.sendApplicationStatusEmail({ - generateStatusHtml: generateSUBGTurGovernmentHtml, - status: SUBMISSION_STATUS.SUBMITTED_TO_ALC, - applicationSubmission: validatedSubmission, - government: submissionGovernment, - parentType: PARENT_TYPE.APPLICATION, - }); - } + await this.statusEmailService.sendApplicationStatusEmail({ + generateStatusHtml: generateTemplateFunction, + status: SUBMISSION_STATUS.SUBMITTED_TO_ALC, + applicationSubmission: validatedSubmission, + government: submissionGovernment, + parentType: PARENT_TYPE.APPLICATION, + primaryContact, + }); + } - return await this.applicationSubmissionService.updateStatus( - validatedSubmission, - SUBMISSION_STATUS.SUBMITTED_TO_ALC, - ); + if (submissionGovernment) { + await this.statusEmailService.sendApplicationStatusEmail({ + generateStatusHtml: generateSUBGNoReviewGovernmentTemplateEmail, + status: SUBMISSION_STATUS.SUBMITTED_TO_ALC, + applicationSubmission: validatedSubmission, + government: submissionGovernment, + parentType: PARENT_TYPE.APPLICATION, + }); + } + + return await this.applicationSubmissionService.updateStatus( + validatedSubmission, + SUBMISSION_STATUS.SUBMITTED_TO_ALC, + ); + } } } } diff --git a/services/templates/emails/submitted-to-alc/cove-applicant.template.ts b/services/templates/emails/submitted-to-alc/cove-applicant.template.ts new file mode 100644 index 0000000000..a4cd371325 --- /dev/null +++ b/services/templates/emails/submitted-to-alc/cove-applicant.template.ts @@ -0,0 +1,50 @@ +import { MJMLParseResults } from 'mjml-core'; +import { StatusUpdateEmail } from '../../../apps/alcs/src/providers/email/status-email.service'; +import { EmailTemplateService } from '../../../libs/common/src/email-template-service/email-template.service'; +import { header, footer, notificationOnly, portalButton } from '../partials'; + +const template = `<mjml> + <mj-head> + <mj-style> + .line-height div { + line-height: 24px !important; + } + + .align-left { + float: left !important; + } + </mj-style> + </mj-head> + <mj-body width="600px"> + ${header} + + <mj-section background-color="white" padding="48px 0px 48px 0px"> + <mj-column width="600px" css-class='line-height'> + <mj-text font-size='16px'> + This email is to acknowledge that the Agricultural Land Commission (ALC) is in receipt of the above noted <b>{{ childType }}</b> application. Please refer to the ALC Application ID in all future correspondence with this office. A copy of this application has been forwarded to the <b>{{ governmentName }}</b> for information purposes. + </mj-text> + <mj-text font-size='16px'> + There is no application fee associated with registering a Restrictive Covenant. + </mj-text> + <mj-text font-size='16px'> + If you are an agent acting on behalf of the applicant(s) / landowner(s), it is your responsibility to advise them of this, and any future, correspondence. + </mj-text> + <mj-text font-size='16px'> + Please log into the ALC Portal for further updates on the application as it progresses. + </mj-text> + ${notificationOnly} + </mj-column> + </mj-section> + + ${portalButton} + + ${footer} + </mj-body> +</mjml> +`; + +export const generateSUBGCoveApplicantHtml = ( + data: StatusUpdateEmail, +): MJMLParseResults => { + return new EmailTemplateService().generateEmailBase(template, data); +}; diff --git a/services/templates/emails/submitted-to-alc/index.ts b/services/templates/emails/submitted-to-alc/index.ts index 0232ab77f0..b3862e78c7 100644 --- a/services/templates/emails/submitted-to-alc/index.ts +++ b/services/templates/emails/submitted-to-alc/index.ts @@ -2,4 +2,4 @@ export * from './application.template'; export * from './noi-applicant.template'; export * from './noi-government.template'; export * from './tur-applicant.template'; -export * from './tur-government.template'; +export * from './no-review-government.template'; diff --git a/services/templates/emails/submitted-to-alc/tur-government.template.ts b/services/templates/emails/submitted-to-alc/no-review-government.template.ts similarity index 96% rename from services/templates/emails/submitted-to-alc/tur-government.template.ts rename to services/templates/emails/submitted-to-alc/no-review-government.template.ts index b39d2ff217..4738519796 100644 --- a/services/templates/emails/submitted-to-alc/tur-government.template.ts +++ b/services/templates/emails/submitted-to-alc/no-review-government.template.ts @@ -37,7 +37,7 @@ const template = `<mjml> </mjml> `; -export const generateSUBGTurGovernmentHtml = ( +export const generateSUBGNoReviewGovernmentTemplateEmail = ( data: StatusUpdateEmail, ): MJMLParseResults => { return new EmailTemplateService().generateEmailBase(template, data); From 96c4470c1ee1eb75f50b7c53ba4302810d967286 Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Tue, 31 Oct 2023 14:50:13 -0700 Subject: [PATCH 582/954] fixes --- .../transferee-dialog/transferee-dialog.component.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/portal-frontend/src/app/features/notifications/edit-submission/transferees/transferee-dialog/transferee-dialog.component.ts b/portal-frontend/src/app/features/notifications/edit-submission/transferees/transferee-dialog/transferee-dialog.component.ts index 85260d3444..d2335059d2 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/transferees/transferee-dialog/transferee-dialog.component.ts +++ b/portal-frontend/src/app/features/notifications/edit-submission/transferees/transferee-dialog/transferee-dialog.component.ts @@ -90,6 +90,8 @@ export class TransfereeDialogComponent { await this.transfereeService.create(createDto); this.dialogRef.close(true); + } else { + this.form.markAllAsTouched() } } @@ -112,6 +114,8 @@ export class TransfereeDialogComponent { await this.transfereeService.update(this.existingUuid, updateDto); this.dialogRef.close(true); } + } else { + this.form.markAllAsTouched() } } } From 783c640040ca8cfabdae0d24447e67f9683dc415 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Tue, 31 Oct 2023 15:08:53 -0700 Subject: [PATCH 583/954] Covenant Public View * Add Public Covenant Proposal * Send Transferees in the main request for Covenants --- .../public-application.component.html | 1 + .../public-application.component.ts | 6 ++- .../application/public-application.module.ts | 2 + .../cove-details/cove-details.component.html | 42 +++++++++++++++++++ .../cove-details/cove-details.component.scss | 12 ++++++ .../cove-details.component.spec.ts | 33 +++++++++++++++ .../cove-details/cove-details.component.ts | 28 +++++++++++++ .../excl-details/excl-details.component.ts | 2 +- .../submission-details.component.html | 6 +++ .../submission-details.component.ts | 2 +- .../services/public/public-application.dto.ts | 6 +++ .../file-type-data-source.service.ts | 3 ++ .../automapper/public.automapper.profile.ts | 11 +++++ .../application-submission.dto.ts | 3 -- .../application-submission.module.ts | 1 + .../application/public-application.dto.ts | 7 ++++ .../public-application.service.spec.ts | 39 +++++++++++++++++ .../application/public-application.service.ts | 25 ++++++++++- 18 files changed, 220 insertions(+), 9 deletions(-) create mode 100644 portal-frontend/src/app/features/public/application/submission/cove-details/cove-details.component.html create mode 100644 portal-frontend/src/app/features/public/application/submission/cove-details/cove-details.component.scss create mode 100644 portal-frontend/src/app/features/public/application/submission/cove-details/cove-details.component.spec.ts create mode 100644 portal-frontend/src/app/features/public/application/submission/cove-details/cove-details.component.ts diff --git a/portal-frontend/src/app/features/public/application/public-application.component.html b/portal-frontend/src/app/features/public/application/public-application.component.html index 71080e38a4..17488ded75 100644 --- a/portal-frontend/src/app/features/public/application/public-application.component.html +++ b/portal-frontend/src/app/features/public/application/public-application.component.html @@ -45,6 +45,7 @@ <h3>Applicant Submission</h3> [applicationDocuments]="documents" [applicationSubmission]="submission" [applicationParcels]="parcels" + [transferees]="transferees" > </app-public-app-submission-details> </section> diff --git a/portal-frontend/src/app/features/public/application/public-application.component.ts b/portal-frontend/src/app/features/public/application/public-application.component.ts index 7b83aecfe3..88dacb8f8c 100644 --- a/portal-frontend/src/app/features/public/application/public-application.component.ts +++ b/portal-frontend/src/app/features/public/application/public-application.component.ts @@ -7,7 +7,7 @@ import { PublicApplicationSubmissionDto, PublicApplicationSubmissionReviewDto, } from '../../../services/public/public-application.dto'; -import { PublicDocumentDto, PublicParcelDto } from '../../../services/public/public.dto'; +import { PublicDocumentDto, PublicOwnerDto, PublicParcelDto } from '../../../services/public/public.dto'; import { PublicService } from '../../../services/public/public.service'; @Component({ @@ -25,6 +25,7 @@ export class PublicApplicationComponent implements OnInit, OnDestroy { documents: PublicDocumentDto[] = []; parcels: PublicParcelDto[] = []; decisions: ApplicationPortalDecisionDto[] = []; + transferees: PublicOwnerDto[] = []; selectedIndex = 0; constructor(private publicService: PublicService, private route: ActivatedRoute) {} @@ -41,7 +42,7 @@ export class PublicApplicationComponent implements OnInit, OnDestroy { private async loadApplication(fileId: string) { const res = await this.publicService.getApplication(fileId); if (res) { - const { submission, documents, parcels, review, decisions } = res; + const { submission, documents, parcels, review, decisions, transferees } = res; if (submission.status.code === SUBMISSION_STATUS.ALC_DECISION) { this.selectedIndex = 2; @@ -51,6 +52,7 @@ export class PublicApplicationComponent implements OnInit, OnDestroy { this.parcels = parcels; this.review = review; this.decisions = decisions; + this.transferees = transferees; } } diff --git a/portal-frontend/src/app/features/public/application/public-application.module.ts b/portal-frontend/src/app/features/public/application/public-application.module.ts index eff5aefe9d..943c36f406 100644 --- a/portal-frontend/src/app/features/public/application/public-application.module.ts +++ b/portal-frontend/src/app/features/public/application/public-application.module.ts @@ -11,6 +11,7 @@ import { PublicDecisionsComponent } from './alc-review/decisions/decisions.compo import { PublicSubmissionDocumentsComponent } from './alc-review/submission-documents/submission-documents.component'; import { PublicLfngReviewComponent } from './lfng-review/lfng-review.component'; import { PublicApplicationComponent } from './public-application.component'; +import { CoveDetailsComponent } from './submission/cove-details/cove-details.component'; import { ExclDetailsComponent } from './submission/excl-details/excl-details.component'; import { InclDetailsComponent } from './submission/incl-details/incl-details.component'; import { NaruDetailsComponent } from './submission/naru-details/naru-details.component'; @@ -48,6 +49,7 @@ const routes: Routes = [ NaruDetailsComponent, ExclDetailsComponent, InclDetailsComponent, + CoveDetailsComponent, ], imports: [ CommonModule, diff --git a/portal-frontend/src/app/features/public/application/submission/cove-details/cove-details.component.html b/portal-frontend/src/app/features/public/application/submission/cove-details/cove-details.component.html new file mode 100644 index 0000000000..e48358fe16 --- /dev/null +++ b/portal-frontend/src/app/features/public/application/submission/cove-details/cove-details.component.html @@ -0,0 +1,42 @@ +<div *ngIf="applicationSubmission" class="review-table"> + <div class="subheading2 full-width">Provide the name and contact information for all transferees</div> + <div class="full-width transferee-table"> + <div class="subheading2">Type</div> + <div class="subheading2">Full Name</div> + <div class="subheading2">Organization Name</div> + <ng-container *ngFor="let transferee of transferees"> + <div>{{ transferee.type.code === 'INDV' ? 'Individual' : 'Organization' }}</div> + <div>{{ transferee.displayName }}</div> + <div> + {{ transferee.organizationName }} + <app-no-data [showRequired]="false" *ngIf="!transferee.organizationName"></app-no-data> + </div> + </ng-container> + </div> + <app-no-data class="full-width" *ngIf="transferees.length === 0"></app-no-data> + + <div class="subheading2 grid-1">How many hectares will the covenant impact?</div> + <div class="grid-double"> + {{ applicationSubmission.coveAreaImpacted }}<span *ngIf="applicationSubmission.coveAreaImpacted"> ha</span> + </div> + + <div class="subheading2 grid-1">What is the purpose of this covenant?</div> + <div class="grid-double"> + {{ applicationSubmission.purpose }} + </div> + + <div class="subheading2 grid-1">Explain how the covenant impacts the use of agricultural land for farm purposes.</div> + <div class="grid-double"> + <span *ngIf="applicationSubmission.coveFarmImpact !== null"> + {{ applicationSubmission.coveFarmImpact }} + </span> + </div> + + <div class="subheading2 grid-1">Proposal Map / Site Plan</div> + <div class="grid-double"> + <a *ngFor="let map of proposalMap" (click)="openFile(map.uuid)"> + {{ map.fileName }} + </a> + <app-no-data *ngIf="proposalMap.length === 0"></app-no-data> + </div> +</div> diff --git a/portal-frontend/src/app/features/public/application/submission/cove-details/cove-details.component.scss b/portal-frontend/src/app/features/public/application/submission/cove-details/cove-details.component.scss new file mode 100644 index 0000000000..d1f221301c --- /dev/null +++ b/portal-frontend/src/app/features/public/application/submission/cove-details/cove-details.component.scss @@ -0,0 +1,12 @@ +@use '../../../../../../styles/functions' as *; +@use '../../../../../../styles/colors'; + +.transferee-table { + display: grid; + grid-template-columns: minmax(max-content, 1fr) minmax(max-content, 1fr) minmax(max-content, 1fr); + overflow-x: auto; + max-width: 100%; + grid-column-gap: rem(36); + grid-row-gap: rem(12); + margin-bottom: rem(12); +} diff --git a/portal-frontend/src/app/features/public/application/submission/cove-details/cove-details.component.spec.ts b/portal-frontend/src/app/features/public/application/submission/cove-details/cove-details.component.spec.ts new file mode 100644 index 0000000000..01d9a9186c --- /dev/null +++ b/portal-frontend/src/app/features/public/application/submission/cove-details/cove-details.component.spec.ts @@ -0,0 +1,33 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { DeepMocked } from '@golevelup/ts-jest'; +import { PublicService } from '../../../../../services/public/public.service'; + +import { CoveDetailsComponent } from './cove-details.component'; + +describe('CoveDetailsComponent', () => { + let component: CoveDetailsComponent; + let fixture: ComponentFixture<CoveDetailsComponent>; + let mockPublicService: DeepMocked<PublicService>; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [CoveDetailsComponent], + providers: [ + { + provide: PublicService, + useValue: mockPublicService, + }, + ], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(CoveDetailsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/public/application/submission/cove-details/cove-details.component.ts b/portal-frontend/src/app/features/public/application/submission/cove-details/cove-details.component.ts new file mode 100644 index 0000000000..f094e9c5bd --- /dev/null +++ b/portal-frontend/src/app/features/public/application/submission/cove-details/cove-details.component.ts @@ -0,0 +1,28 @@ +import { Component, Input } from '@angular/core'; +import { PublicApplicationSubmissionDto } from '../../../../../services/public/public-application.dto'; +import { PublicDocumentDto, PublicOwnerDto } from '../../../../../services/public/public.dto'; +import { PublicService } from '../../../../../services/public/public.service'; +import { DOCUMENT_TYPE } from '../../../../../shared/dto/document.dto'; + +@Component({ + selector: 'app-cove-details', + templateUrl: './cove-details.component.html', + styleUrls: ['./cove-details.component.scss'], +}) +export class CoveDetailsComponent { + @Input() applicationSubmission!: PublicApplicationSubmissionDto; + @Input() transferees!: PublicOwnerDto[]; + + @Input() set applicationDocuments(documents: PublicDocumentDto[]) { + this.proposalMap = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.PROPOSAL_MAP); + } + + proposalMap: PublicDocumentDto[] = []; + + constructor(private publicService: PublicService) {} + + async openFile(uuid: string) { + const res = await this.publicService.getApplicationOpenFileUrl(uuid, this.applicationSubmission.fileNumber); + window.open(res?.url, '_blank'); + } +} diff --git a/portal-frontend/src/app/features/public/application/submission/excl-details/excl-details.component.ts b/portal-frontend/src/app/features/public/application/submission/excl-details/excl-details.component.ts index 5261bfbde8..a26e563831 100644 --- a/portal-frontend/src/app/features/public/application/submission/excl-details/excl-details.component.ts +++ b/portal-frontend/src/app/features/public/application/submission/excl-details/excl-details.component.ts @@ -23,7 +23,7 @@ export class ExclDetailsComponent { proposalMap: PublicDocumentDto[] = []; reportOfPublicHearing: PublicDocumentDto[] = []; - constructor(private router: Router, private publicService: PublicService) {} + constructor(private publicService: PublicService) {} async openFile(uuid: string) { const res = await this.publicService.getApplicationOpenFileUrl(this.applicationSubmission.fileNumber, uuid); diff --git a/portal-frontend/src/app/features/public/application/submission/submission-details.component.html b/portal-frontend/src/app/features/public/application/submission/submission-details.component.html index 979dd4889e..f963c4e837 100644 --- a/portal-frontend/src/app/features/public/application/submission/submission-details.component.html +++ b/portal-frontend/src/app/features/public/application/submission/submission-details.component.html @@ -157,4 +157,10 @@ <h3>Proposal</h3> [applicationSubmission]="applicationSubmission" [applicationDocuments]="applicationDocuments" ></app-incl-details> + <app-cove-details + *ngIf="applicationSubmission.typeCode === 'COVE'" + [applicationSubmission]="applicationSubmission" + [applicationDocuments]="applicationDocuments" + [transferees]='transferees' + ></app-cove-details> </section> diff --git a/portal-frontend/src/app/features/public/application/submission/submission-details.component.ts b/portal-frontend/src/app/features/public/application/submission/submission-details.component.ts index bde5ff49fd..7362fd5649 100644 --- a/portal-frontend/src/app/features/public/application/submission/submission-details.component.ts +++ b/portal-frontend/src/app/features/public/application/submission/submission-details.component.ts @@ -5,7 +5,6 @@ import { LocalGovernmentDto } from '../../../../services/code/code.dto'; import { CodeService } from '../../../../services/code/code.service'; import { PublicApplicationSubmissionDto } from '../../../../services/public/public-application.dto'; import { PublicDocumentDto, PublicOwnerDto, PublicParcelDto } from '../../../../services/public/public.dto'; -import { PublicService } from '../../../../services/public/public.service'; import { OWNER_TYPE } from '../../../../shared/dto/owner.dto'; @Component({ @@ -19,6 +18,7 @@ export class SubmissionDetailsComponent implements OnInit, OnDestroy { @Input() applicationSubmission!: PublicApplicationSubmissionDto; @Input() applicationDocuments: PublicDocumentDto[] = []; @Input() applicationParcels: PublicParcelDto[] = []; + @Input() transferees: PublicOwnerDto[] = []; parcelType = PARCEL_TYPE; primaryContact: PublicOwnerDto | undefined; diff --git a/portal-frontend/src/app/services/public/public-application.dto.ts b/portal-frontend/src/app/services/public/public-application.dto.ts index 35264573ff..f3549d67fb 100644 --- a/portal-frontend/src/app/services/public/public-application.dto.ts +++ b/portal-frontend/src/app/services/public/public-application.dto.ts @@ -4,6 +4,7 @@ import { NaruSubtypeDto, ProposedLot, } from '../application-submission/application-submission.dto'; +import { CovenantTransfereeDto, OwnerTypeDto } from '../covenant-transferee/covenant-transferee.dto'; import { PublicParcelDto, PublicDocumentDto, PublicOwnerDto } from './public.dto'; export interface GetPublicApplicationResponseDto { @@ -12,6 +13,7 @@ export interface GetPublicApplicationResponseDto { documents: PublicDocumentDto[]; review?: PublicApplicationSubmissionReviewDto; decisions: ApplicationPortalDecisionDto[]; + transferees: PublicOwnerDto[]; } export interface PublicApplicationSubmissionDto { @@ -122,6 +124,10 @@ export interface PublicApplicationSubmissionDto { inclImprovements: string | null; exclShareGovernmentBorders: boolean | null; inclGovernmentOwnsAllParcels?: boolean | null; + + //Covenant Fields + coveFarmImpact: string | null; + coveAreaImpacted: number | null; } export interface PublicApplicationSubmissionReviewDto { diff --git a/portal-frontend/src/app/services/search/file-type/file-type-data-source.service.ts b/portal-frontend/src/app/services/search/file-type/file-type-data-source.service.ts index 84c7decf15..b67beabc26 100644 --- a/portal-frontend/src/app/services/search/file-type/file-type-data-source.service.ts +++ b/portal-frontend/src/app/services/search/file-type/file-type-data-source.service.ts @@ -47,6 +47,9 @@ const TREE_DATA: TreeNode[] = [ { item: { label: 'Transportation, Utility, Trail Permits', value: 'TURP' }, }, + { + item: { label: 'Restrictive Covenant', value: 'COVE' }, + }, ], }, { diff --git a/services/apps/alcs/src/common/automapper/public.automapper.profile.ts b/services/apps/alcs/src/common/automapper/public.automapper.profile.ts index 0f38be46c2..6b5699502a 100644 --- a/services/apps/alcs/src/common/automapper/public.automapper.profile.ts +++ b/services/apps/alcs/src/common/automapper/public.automapper.profile.ts @@ -8,6 +8,7 @@ import { ApplicationSubmissionReview } from '../../portal/application-submission import { ApplicationOwner } from '../../portal/application-submission/application-owner/application-owner.entity'; import { ApplicationParcel } from '../../portal/application-submission/application-parcel/application-parcel.entity'; import { ApplicationSubmission } from '../../portal/application-submission/application-submission.entity'; +import { CovenantTransferee } from '../../portal/application-submission/covenant-transferee/covenant-transferee.entity'; import { NoticeOfIntentOwner } from '../../portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.entity'; import { NoticeOfIntentParcel } from '../../portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.entity'; import { NoticeOfIntentSubmission } from '../../portal/notice-of-intent-submission/notice-of-intent-submission.entity'; @@ -122,6 +123,16 @@ export class PublicAutomapperProfile extends AutomapperProfile { ), ); + createMap( + mapper, + CovenantTransferee, + PublicOwnerDto, + forMember( + (pd) => pd.displayName, + mapFrom((p) => `${p.firstName} ${p.lastName}`), + ), + ); + createMap( mapper, ApplicationParcel, diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.dto.ts b/services/apps/alcs/src/portal/application-submission/application-submission.dto.ts index 37740083cd..012980c84d 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.dto.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.dto.ts @@ -319,9 +319,6 @@ export class ApplicationSubmissionDetailedDto extends ApplicationSubmissionDto { @AutoMap(() => String) coveFarmImpact: string | null; - @AutoMap(() => [CovenantTransfereeDto]) - coveTransferees: CovenantTransfereeDto[]; - @AutoMap(() => Number) coveAreaImpacted: number | null; } diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.module.ts b/services/apps/alcs/src/portal/application-submission/application-submission.module.ts index 7928657e7f..9c06277738 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.module.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.module.ts @@ -69,6 +69,7 @@ import { NaruSubtype } from './naru-subtype/naru-subtype.entity'; ApplicationOwnerService, ApplicationSubmissionValidatorService, ApplicationParcelService, + CovenantTransfereeService, ], }) export class ApplicationSubmissionModule {} diff --git a/services/apps/alcs/src/portal/public/application/public-application.dto.ts b/services/apps/alcs/src/portal/public/application/public-application.dto.ts index f936453adb..c8ec4a89f6 100644 --- a/services/apps/alcs/src/portal/public/application/public-application.dto.ts +++ b/services/apps/alcs/src/portal/public/application/public-application.dto.ts @@ -295,6 +295,13 @@ export class PublicApplicationSubmissionDto { @AutoMap(() => Boolean) inclGovernmentOwnsAllParcels?: boolean | null; + + //Covenant Fields + @AutoMap(() => String) + coveFarmImpact: string | null; + + @AutoMap(() => Number) + coveAreaImpacted: number | null; } export class PublicApplicationSubmissionReviewDto { diff --git a/services/apps/alcs/src/portal/public/application/public-application.service.spec.ts b/services/apps/alcs/src/portal/public/application/public-application.service.spec.ts index 2203718d66..a06559ce66 100644 --- a/services/apps/alcs/src/portal/public/application/public-application.service.spec.ts +++ b/services/apps/alcs/src/portal/public/application/public-application.service.spec.ts @@ -19,6 +19,8 @@ import { ApplicationSubmissionReviewService } from '../../application-submission import { ApplicationParcelService } from '../../application-submission/application-parcel/application-parcel.service'; import { ApplicationSubmission } from '../../application-submission/application-submission.entity'; import { ApplicationSubmissionService } from '../../application-submission/application-submission.service'; +import { CovenantTransfereeService } from '../../application-submission/covenant-transferee/covenant-transferee.service'; +import { APPLICATION_SUBMISSION_TYPES } from '../../pdf-generation/generate-submission-document.service'; import { PublicApplicationService } from './public-application.service'; describe('PublicApplicationService', () => { @@ -29,6 +31,7 @@ describe('PublicApplicationService', () => { let mockAppDocService: DeepMocked<ApplicationDocumentService>; let mockAppReviewService: DeepMocked<ApplicationSubmissionReviewService>; let mockAppDecService: DeepMocked<ApplicationDecisionV2Service>; + let mockCovenantTransfereeService: DeepMocked<CovenantTransfereeService>; beforeEach(async () => { mockAppService = createMock(); @@ -37,6 +40,7 @@ describe('PublicApplicationService', () => { mockAppDocService = createMock(); mockAppReviewService = createMock(); mockAppDecService = createMock(); + mockCovenantTransfereeService = createMock(); const module: TestingModule = await Test.createTestingModule({ imports: [ @@ -71,6 +75,10 @@ describe('PublicApplicationService', () => { provide: ApplicationDecisionV2Service, useValue: mockAppDecService, }, + { + provide: CovenantTransfereeService, + useValue: mockCovenantTransfereeService, + }, ], }).compile(); @@ -118,6 +126,37 @@ describe('PublicApplicationService', () => { expect(mockAppDecService.getForPortal).toHaveBeenCalledTimes(1); }); + it('load Transferees for Covenant Applications', async () => { + mockAppService.get.mockResolvedValue( + new Application({ + dateReceivedAllItems: new Date(), + type: new ApplicationType(), + typeCode: APPLICATION_SUBMISSION_TYPES.COVE, + }), + ); + mockAppSubService.getOrFailByFileNumber.mockResolvedValue( + new ApplicationSubmission({ + get status(): ApplicationSubmissionToSubmissionStatus { + return new ApplicationSubmissionToSubmissionStatus(); + }, + }), + ); + mockAppParcelService.fetchByApplicationFileId.mockResolvedValue([]); + mockAppDocService.list.mockResolvedValue([]); + mockAppReviewService.getForPublicReview.mockResolvedValue( + new ApplicationSubmissionReview(), + ); + mockAppDecService.getForPortal.mockResolvedValue([]); + mockCovenantTransfereeService.fetchBySubmissionUuid.mockResolvedValue([]); + + const fileId = 'file-id'; + await service.getPublicData(fileId); + + expect( + mockCovenantTransfereeService.fetchBySubmissionUuid, + ).toHaveBeenCalledTimes(1); + }); + it('should call through to document service for getting files', async () => { const mockDoc = new ApplicationDocument({ visibilityFlags: [VISIBILITY_FLAG.PUBLIC], diff --git a/services/apps/alcs/src/portal/public/application/public-application.service.ts b/services/apps/alcs/src/portal/public/application/public-application.service.ts index bea2094227..2da8905f07 100644 --- a/services/apps/alcs/src/portal/public/application/public-application.service.ts +++ b/services/apps/alcs/src/portal/public/application/public-application.service.ts @@ -10,14 +10,21 @@ import { } from '../../../alcs/application/application-document/application-document.entity'; import { ApplicationDocumentService } from '../../../alcs/application/application-document/application-document.service'; import { ApplicationService } from '../../../alcs/application/application.service'; -import { PublicDocumentDto, PublicParcelDto } from '../public.dto'; -import { ApplicationPortalDecisionDto } from './application-decision.dto'; import { ApplicationSubmissionReview } from '../../application-submission-review/application-submission-review.entity'; import { ApplicationSubmissionReviewService } from '../../application-submission-review/application-submission-review.service'; import { ApplicationParcel } from '../../application-submission/application-parcel/application-parcel.entity'; import { ApplicationParcelService } from '../../application-submission/application-parcel/application-parcel.service'; import { ApplicationSubmission } from '../../application-submission/application-submission.entity'; import { ApplicationSubmissionService } from '../../application-submission/application-submission.service'; +import { CovenantTransferee } from '../../application-submission/covenant-transferee/covenant-transferee.entity'; +import { CovenantTransfereeService } from '../../application-submission/covenant-transferee/covenant-transferee.service'; +import { APPLICATION_SUBMISSION_TYPES } from '../../pdf-generation/generate-submission-document.service'; +import { + PublicDocumentDto, + PublicOwnerDto, + PublicParcelDto, +} from '../public.dto'; +import { ApplicationPortalDecisionDto } from './application-decision.dto'; import { PublicApplicationSubmissionDto, PublicApplicationSubmissionReviewDto, @@ -32,6 +39,7 @@ export class PublicApplicationService { private applicationDocumentService: ApplicationDocumentService, private applicationSubmissionReviewService: ApplicationSubmissionReviewService, private applicationDecisionService: ApplicationDecisionV2Service, + private covenantTransfereeService: CovenantTransfereeService, @InjectMapper() private mapper: Mapper, ) {} @@ -97,12 +105,25 @@ export class PublicApplicationService { ApplicationPortalDecisionDto, ); + let transferees: CovenantTransferee[] = []; + if (application.typeCode === APPLICATION_SUBMISSION_TYPES.COVE) { + transferees = await this.covenantTransfereeService.fetchBySubmissionUuid( + submission.uuid, + ); + } + const mappedTransferees = this.mapper.mapArray( + transferees, + CovenantTransferee, + PublicOwnerDto, + ); + return { submission: mappedSubmission, parcels: mappedParcels, documents: mappedDocuments, review: mappedReview, decisions: mappedDecisions, + transferees: mappedTransferees, }; } From 4e6e69e6b1f54903818a5e1a7f884c5bc84cb028 Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Tue, 31 Oct 2023 15:35:59 -0700 Subject: [PATCH 584/954] NOI COALESCE on update for fee_paid_date (#1115) * NOI COALESCE on update * validation script for fee_paid_date --- .../noi/notice_of_intent_init.py | 6 ++--- ...oats_to_alcs_notice_of_intent_table_etl.py | 24 +++++++++---------- ..._oats_does_not_override_alcs_with_null.sql | 17 +++++++++++++ 3 files changed, 32 insertions(+), 15 deletions(-) create mode 100644 bin/migrate-oats-data/noi/sql/notice_of_intent_base/validate_that_oats_does_not_override_alcs_with_null.sql diff --git a/bin/migrate-oats-data/noi/notice_of_intent_init.py b/bin/migrate-oats-data/noi/notice_of_intent_init.py index 49194ed7c8..cb12880026 100644 --- a/bin/migrate-oats-data/noi/notice_of_intent_init.py +++ b/bin/migrate-oats-data/noi/notice_of_intent_init.py @@ -83,9 +83,9 @@ def _noi_insert_query(number_of_rows_to_insert): VALUES{nois_to_insert} ON CONFLICT (file_number) DO UPDATE SET file_number = EXCLUDED.file_number, - applicant = EXCLUDED.applicant, - region_code = EXCLUDED.region_code, - local_government_uuid = EXCLUDED.local_government_uuid, + applicant = COALESCE((CASE WHEN EXCLUDED.applicant = 'Unknown' THEN alcs.notice_of_intent.applicant ELSE EXCLUDED.applicant END), EXCLUDED.applicant), + region_code = COALESCE(EXCLUDED.region_code, alcs.notice_of_intent.region_code), + local_government_uuid = COALESCE(EXCLUDED.local_government_uuid, alcs.notice_of_intent.local_government_uuid), audit_created_by = EXCLUDED.audit_created_by, type_code = EXCLUDED.type_code """ diff --git a/bin/migrate-oats-data/noi/oats_to_alcs_notice_of_intent_table_etl/oats_to_alcs_notice_of_intent_table_etl.py b/bin/migrate-oats-data/noi/oats_to_alcs_notice_of_intent_table_etl/oats_to_alcs_notice_of_intent_table_etl.py index ba36d0813a..9f6e990e3e 100644 --- a/bin/migrate-oats-data/noi/oats_to_alcs_notice_of_intent_table_etl/oats_to_alcs_notice_of_intent_table_etl.py +++ b/bin/migrate-oats-data/noi/oats_to_alcs_notice_of_intent_table_etl/oats_to_alcs_notice_of_intent_table_etl.py @@ -102,18 +102,18 @@ def _update_fee_fields_records(conn, batch_size, cursor, rows): def _get_update_query_from_oats_alr_applications_fields(): query = """ UPDATE alcs.notice_of_intent - SET fee_paid_date = %(fee_received_date)s, - fee_waived = %(fee_waived_ind)s, - fee_amount = %(applied_fee_amt)s, - fee_split_with_lg = %(split_fee_with_local_gov_ind)s, - date_submitted_to_alc = %(submitted_to_alc_date)s, - staff_observations = %(staff_comment_observations)s, - alr_area = %(component_area)s, - ag_cap_source = %(capability_source_code)s, - ag_cap_map = %(agri_cap_map)s, - ag_cap_consultant = %(agri_cap_consultant)s, - ag_cap = %(agri_capability_code)s, - legacy_id=%(legacy_application_nbr)s, + SET fee_paid_date = COALESCE(%(fee_received_date)s, fee_paid_date), + fee_waived = COALESCE(%(fee_waived_ind)s, fee_waived), + fee_amount = COALESCE(%(applied_fee_amt)s, fee_amount), + fee_split_with_lg = COALESCE(%(split_fee_with_local_gov_ind)s, fee_split_with_lg), + date_submitted_to_alc = COALESCE(%(submitted_to_alc_date)s, date_submitted_to_alc), + staff_observations = COALESCE(%(staff_comment_observations)s, staff_observations), + alr_area = COALESCE(%(component_area)s, alr_area), + ag_cap_source = COALESCE(%(capability_source_code)s, ag_cap_source), + ag_cap_map = COALESCE(%(agri_cap_map)s, ag_cap_map), + ag_cap_consultant = COALESCE(%(agri_cap_consultant)s, ag_cap_consultant), + ag_cap = COALESCE(%(agri_capability_code)s, ag_cap), + legacy_id= COALESCE(%(legacy_application_nbr)s, legacy_id), source = 'APPLICANT' WHERE alcs.notice_of_intent.file_number = %(alr_application_id)s::TEXT; diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_base/validate_that_oats_does_not_override_alcs_with_null.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_base/validate_that_oats_does_not_override_alcs_with_null.sql new file mode 100644 index 0000000000..ae12c8585c --- /dev/null +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_base/validate_that_oats_does_not_override_alcs_with_null.sql @@ -0,0 +1,17 @@ +-- this query checks that OATS NULL does not override fee_paid_date if it has value in ALCS +WITH noi_with_one_component AS ( + SELECT oaac.alr_application_id + FROM oats.oats_alr_appl_components oaac + JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id + WHERE oaa.application_class_code = 'NOI' + GROUP BY oaac.alr_application_id + HAVING count(oaac.alr_application_id) < 2 -- ignore notice of intents wit multiple components +) +SELECT noi.fee_paid_date AT TIME ZONE 'UTC', + oaa.fee_received_date, + oats_noi.alr_application_id +FROM alcs.notice_of_intent noi + JOIN noi_with_one_component oats_noi ON oats_noi.alr_application_id::TEXT = noi.file_number + JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oats_noi.alr_application_id +WHERE oaa.fee_received_date IS NULL + AND noi.fee_paid_date IS NOT NULL; \ No newline at end of file From 6a028438ab3e0bca59c0434c97fa1430a620b719 Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Tue, 31 Oct 2023 15:52:44 -0700 Subject: [PATCH 585/954] Feature/alcs 1227 (#1124) added mapping for missing application field do not override ALCS data with OATS null for specific fields validation script --- .../applications/app_prep.py | 7 +++--- .../applications/base_applications.py | 6 ++--- .../sql/application-prep/application_prep.sql | 3 ++- ..._oats_does_not_override_alcs_with_null.sql | 22 +++++++++++++++++++ ..._oats_does_not_override_alcs_with_null.sql | 1 + 5 files changed, 32 insertions(+), 7 deletions(-) create mode 100644 bin/migrate-oats-data/applications/sql/validate_that_oats_does_not_override_alcs_with_null.sql diff --git a/bin/migrate-oats-data/applications/app_prep.py b/bin/migrate-oats-data/applications/app_prep.py index b1edbaf63f..6ce26cf599 100644 --- a/bin/migrate-oats-data/applications/app_prep.py +++ b/bin/migrate-oats-data/applications/app_prep.py @@ -107,7 +107,7 @@ def process_alcs_application_prep_fields(conn=None, batch_size=BATCH_UPLOAD_SIZE ) except Exception as e: # this is NOT going to be caused by actual data update failure. This code is only executed when the code error appears or connection to DB is lost - logger.exception() + logger.exception(e) conn.rollback() failed_inserts = count_total - successful_updates_count last_application_id = last_application_id + 1 @@ -255,11 +255,12 @@ def _get_update_query(unique_fields): alr_area = %(component_area)s, ag_cap_source = %(capability_source_code)s, staff_observations = %(staff_comment_observations)s, - fee_paid_date = %(fee_received_date)s, + fee_paid_date = COALESCE(%(fee_received_date)s, fee_paid_date), fee_waived = %(fee_waived_ind)s, fee_amount = %(applied_fee_amt)s, fee_split_with_lg = %(split_fee_with_local_gov_ind)s, - legacy_id = %(legacy_application_nbr)s + legacy_id = %(legacy_application_nbr)s, + date_submitted_to_alc = COALESCE(%(submitted_to_alc_date)s, date_submitted_to_alc) {unique_fields} WHERE alcs.application.file_number = %(alr_application_id)s::TEXT; diff --git a/bin/migrate-oats-data/applications/base_applications.py b/bin/migrate-oats-data/applications/base_applications.py index f0f59416e0..fd2b788d7a 100644 --- a/bin/migrate-oats-data/applications/base_applications.py +++ b/bin/migrate-oats-data/applications/base_applications.py @@ -111,9 +111,9 @@ def _compile_application_insert_query(number_of_rows_to_insert): ON CONFLICT (file_number) DO UPDATE SET file_number = EXCLUDED.file_number, type_code = EXCLUDED.type_code, - applicant = EXCLUDED.applicant, - region_code = EXCLUDED.region_code, - local_government_uuid = EXCLUDED.local_government_uuid, + applicant = COALESCE((CASE WHEN EXCLUDED.applicant = 'Unknown' THEN alcs.application.applicant ELSE EXCLUDED.applicant END), EXCLUDED.applicant), + region_code = COALESCE(EXCLUDED.region_code, alcs.application.region_code), + local_government_uuid = COALESCE(EXCLUDED.local_government_uuid, alcs.application.local_government_uuid), audit_created_by = EXCLUDED.audit_created_by """ diff --git a/bin/migrate-oats-data/applications/sql/application-prep/application_prep.sql b/bin/migrate-oats-data/applications/sql/application-prep/application_prep.sql index fc02f3c0b7..7a3d830459 100644 --- a/bin/migrate-oats-data/applications/sql/application-prep/application_prep.sql +++ b/bin/migrate-oats-data/applications/sql/application-prep/application_prep.sql @@ -25,7 +25,8 @@ SELECT oaa.alr_application_id, oaa.split_fee_with_local_gov_ind, oaa.fee_waived_ind, oaa.fee_received_date, - oaa.legacy_application_nbr + oaa.legacy_application_nbr, + oaa.submitted_to_alc_date FROM appl_components_grouped acg JOIN oats.oats_alr_appl_components oaac ON oaac.alr_application_id = acg.alr_application_id JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = acg.alr_application_id \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/sql/validate_that_oats_does_not_override_alcs_with_null.sql b/bin/migrate-oats-data/applications/sql/validate_that_oats_does_not_override_alcs_with_null.sql new file mode 100644 index 0000000000..e529fcb963 --- /dev/null +++ b/bin/migrate-oats-data/applications/sql/validate_that_oats_does_not_override_alcs_with_null.sql @@ -0,0 +1,22 @@ +-- This query checks that OATS NULL does not override fee_paid_date if it has value in ALCS. +-- Run this query before ETL and after to ensure that the result is the same +WITH appl_with_one_component AS ( + SELECT oaac.alr_application_id + FROM oats.oats_alr_appl_components oaac + JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id + WHERE oaa.application_class_code IN ('LOA', 'BLK') + GROUP BY oaac.alr_application_id + HAVING count(oaac.alr_application_id) < 2 -- ignore all applications wit multiple components +) +SELECT +oats_appl.alr_application_id, + appl.fee_paid_date AT TIME ZONE 'UTC', + oaa.fee_received_date, + appl.date_submitted_to_alc , + oaa.submitted_to_alc_date +FROM alcs.application appl + JOIN appl_with_one_component oats_appl ON oats_appl.alr_application_id::TEXT = appl.file_number + JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oats_appl.alr_application_id +WHERE +(oaa.fee_received_date IS NULL AND appl.fee_paid_date IS NOT NULL) +OR (oaa.submitted_to_alc_date IS NULL AND appl.date_submitted_to_alc IS NOT NULL) \ No newline at end of file diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_base/validate_that_oats_does_not_override_alcs_with_null.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_base/validate_that_oats_does_not_override_alcs_with_null.sql index ae12c8585c..2550759287 100644 --- a/bin/migrate-oats-data/noi/sql/notice_of_intent_base/validate_that_oats_does_not_override_alcs_with_null.sql +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_base/validate_that_oats_does_not_override_alcs_with_null.sql @@ -1,4 +1,5 @@ -- this query checks that OATS NULL does not override fee_paid_date if it has value in ALCS +-- Run this query before ETL and after to ensure that the result is the same WITH noi_with_one_component AS ( SELECT oaac.alr_application_id FROM oats.oats_alr_appl_components oaac From 4fa59f22b933ceba4d4f0ea98f16081a05c92f44 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Tue, 31 Oct 2023 16:19:17 -0700 Subject: [PATCH 586/954] Code Review Feedback --- .../src/app/services/public/public-application.dto.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/portal-frontend/src/app/services/public/public-application.dto.ts b/portal-frontend/src/app/services/public/public-application.dto.ts index f3549d67fb..5456187032 100644 --- a/portal-frontend/src/app/services/public/public-application.dto.ts +++ b/portal-frontend/src/app/services/public/public-application.dto.ts @@ -4,8 +4,7 @@ import { NaruSubtypeDto, ProposedLot, } from '../application-submission/application-submission.dto'; -import { CovenantTransfereeDto, OwnerTypeDto } from '../covenant-transferee/covenant-transferee.dto'; -import { PublicParcelDto, PublicDocumentDto, PublicOwnerDto } from './public.dto'; +import { PublicDocumentDto, PublicOwnerDto, PublicParcelDto } from './public.dto'; export interface GetPublicApplicationResponseDto { submission: PublicApplicationSubmissionDto; From 41d0bf3e9a0c212e063564d05bf9d0cf775f098d Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Wed, 1 Nov 2023 14:16:44 -0700 Subject: [PATCH 587/954] Upgrade Angular Upgrade Angular in both front ends to 16 Upgrade Node in Docker to 20 Apply fixes for upgrade issues --- alcs-frontend/Dockerfile | 2 +- alcs-frontend/package-lock.json | 34237 +++++----------- alcs-frontend/package.json | 72 +- alcs-frontend/src/app/app-routing.module.ts | 1 + .../card-status-dialog.component.spec.ts | 13 +- .../ceo-criterion/ceo-criterion.component.ts | 1 - .../conditions/conditions.component.ts | 2 +- .../basic/basic.component.ts | 2 +- .../decision-component/pfrs/pfrs.component.ts | 2 +- .../decision-component/pofo/pofo.component.ts | 2 +- .../decision-component/roso/roso.component.ts | 2 +- .../decision-component.component.html | 2 +- .../pofo-input/pofo-input.component.ts | 2 +- .../decision-condition.component.ts | 2 +- .../decision-conditions.component.html | 4 +- .../decision-conditions.component.ts | 2 +- ...cision-document-upload-dialog.component.ts | 2 +- .../decision-input-v2.component.html | 4 +- .../decision-v2/decision-v2.component.html | 44 +- .../revert-to-draft-dialog.component.spec.ts | 9 +- .../revert-to-draft-dialog.component.ts | 2 +- .../decision/decision.component.ts | 2 +- .../info-requests/info-requests.component.ts | 2 +- .../info-request-dialog.component.ts | 2 +- ...edit-modification-dialog.component.spec.ts | 9 +- ...t-reconsideration-dialog.component.spec.ts | 9 +- .../src/app/features/board/board.component.ts | 2 +- .../application-dialog.component.html | 5 +- .../application-dialog.component.ts | 6 +- .../commissioner.component.spec.ts | 9 +- .../home/assigned/assigned.component.spec.ts | 18 +- .../home/subtask/subtask.component.spec.ts | 5 +- .../conditions/conditions.component.ts | 2 +- .../basic/basic.component.ts | 2 +- .../decision-component/pfrs/pfrs.component.ts | 2 +- .../decision-component/pofo/pofo.component.ts | 2 +- .../decision-component/roso/roso.component.ts | 2 +- .../decision-component.component.html | 2 +- .../pofo-input/pofo-input.component.ts | 2 +- .../decision-condition.component.ts | 2 +- .../decision-conditions.component.html | 4 +- .../decision-conditions.component.ts | 2 +- ...cision-document-upload-dialog.component.ts | 2 +- .../decision-input-v2.component.html | 4 +- .../decision-v2/decision-v2.component.html | 24 +- .../revert-to-draft-dialog.component.spec.ts | 9 +- .../revert-to-draft-dialog.component.ts | 2 +- .../decision/decision.component.ts | 2 +- .../info-request-dialog.component.ts | 2 +- .../info-requests/info-requests.component.ts | 2 +- ...edit-modification-dialog.component.spec.ts | 6 +- .../uncancel-notification-dialog.component.ts | 2 +- .../commenting/comments.component.spec.ts | 6 +- .../notifications.component.spec.ts | 9 +- .../notifications/notifications.component.ts | 8 +- .../lots-table-form.component.spec.ts | 2 + alcs-frontend/src/styles.scss | 9 + portal-frontend/Dockerfile | 2 +- portal-frontend/package-lock.json | 21575 +++------- portal-frontend/package.json | 54 +- .../application-details.component.spec.ts | 12 + ...-application-type-dialog.component.spec.ts | 18 +- .../other-attachments.component.spec.ts | 12 + .../parcel-details.component.ts | 2 +- .../naru-proposal.component.spec.ts | 16 +- .../select-government.component.spec.ts | 12 +- ...create-submission-dialog.component.spec.ts | 18 +- .../home/inbox/inbox.component.spec.ts | 22 +- .../features/home/inbox/inbox.component.ts | 2 - .../features/login/login.component.spec.ts | 9 +- .../src/app/features/login/login.component.ts | 2 +- .../change-noi-type-dialog.component.spec.ts | 18 +- .../other-attachments.component.spec.ts | 12 + .../parcels/parcel-details.component.ts | 2 +- .../select-government.component.spec.ts | 12 + ...notice-of-intent-details.component.spec.ts | 12 + .../other-attachments.component.spec.ts | 12 + .../parcels/parcel-details.component.ts | 2 +- .../select-government.component.spec.ts | 12 + .../notification-details.component.spec.ts | 12 + .../submission-details.component.spec.ts | 12 + .../submission-details.component.spec.ts | 12 + .../submission-details.component.spec.ts | 13 +- .../search/public-search.component.spec.ts | 26 +- portal-frontend/src/styles.scss | 9 + services/Dockerfile | 6 +- services/Dockerfile.local | 2 +- services/Dockerfile.migrate | 2 +- 88 files changed, 17339 insertions(+), 39182 deletions(-) diff --git a/alcs-frontend/Dockerfile b/alcs-frontend/Dockerfile index e4b0ec33cc..1d82f1b2c0 100644 --- a/alcs-frontend/Dockerfile +++ b/alcs-frontend/Dockerfile @@ -1,5 +1,5 @@ ###### Install dependencies only when needed ###### -FROM node:18.12-alpine AS build +FROM node:20-alpine AS build # Make /app as working directory WORKDIR /app diff --git a/alcs-frontend/package-lock.json b/alcs-frontend/package-lock.json index 742ef3c80e..3d94614839 100644 --- a/alcs-frontend/package-lock.json +++ b/alcs-frontend/package-lock.json @@ -1,7 +1,7 @@ { "name": "alcs-frontend", "version": "0.0.0", - "lockfileVersion": 2, + "lockfileVersion": 3, "requires": true, "packages": { "": { @@ -9,57 +9,66 @@ "version": "0.0.0", "license": "Apache-2.0", "dependencies": { - "@angular/animations": "^15.1.3", - "@angular/cdk": "^15.1.3", - "@angular/common": "^15.1.3", - "@angular/compiler": "^15.1.3", - "@angular/core": "^15.1.3", - "@angular/forms": "^15.1.3", - "@angular/material": "^15.1.3", - "@angular/material-moment-adapter": "^15.1.3", - "@angular/platform-browser": "^15.1.3", - "@angular/platform-browser-dynamic": "^15.1.3", - "@angular/router": "^15.1.3", - "@bcgov/bc-sans": "^1.0.1", - "@ng-matero/extensions": "^15.0.1", - "@ng-select/ng-option-highlight": "^0.0.7", + "@angular/animations": "^16.2.11", + "@angular/cdk": "^16.2.11", + "@angular/common": "^16.2.11", + "@angular/compiler": "^16.2.11", + "@angular/core": "^16.2.11", + "@angular/forms": "^16.2.11", + "@angular/material": "^16.2.11", + "@angular/material-moment-adapter": "^16.2.11", + "@angular/platform-browser": "^16.2.11", + "@angular/platform-browser-dynamic": "^16.2.11", + "@angular/router": "^16.2.11", + "@bcgov/bc-sans": "^2.1.0", + "@ng-matero/extensions": "^16.1.2", + "@ng-select/ng-option-highlight": "^11.2.0", "angular-mentions": "^1.5.0", "jwt-decode": "^3.1.2", "moment": "^2.29.4", - "moment-timezone": "^0.5.37", - "ngx-mask": "^15.0.3", - "rxjs": "~7.5.0", + "moment-timezone": "^0.5.43", + "ngx-mask": "^16.3.9", + "rxjs": "~7.8.1", "source-map-support": "^0.5.21", - "tslib": "^2.4.1", - "zone.js": "~0.11.4" + "tslib": "^2.6.2", + "zone.js": "~0.13.3" }, "devDependencies": { - "@angular-builders/jest": "^15.0.0", - "@angular-devkit/build-angular": "^15.1.4", - "@angular-eslint/builder": "14.1.2", - "@angular-eslint/eslint-plugin": "14.1.2", - "@angular-eslint/eslint-plugin-template": "14.1.2", - "@angular-eslint/schematics": "^15.2.0", - "@angular-eslint/template-parser": "14.1.2", - "@angular/cli": "~15.1.2", - "@angular/compiler-cli": "^15.1.3", - "@golevelup/ts-jest": "^0.3.4", - "@types/jest": "^28.1.1", - "@typescript-eslint/eslint-plugin": "5.37.0", - "@typescript-eslint/parser": "5.37.0", - "eslint": "^8.23.1", - "jest": "^28.1.3", - "prettier": "^2.8.3", - "typescript": "4.9.4" + "@angular-builders/jest": "^16.0.1", + "@angular-devkit/build-angular": "^16.2.9", + "@angular-eslint/builder": "^16.2.0", + "@angular-eslint/eslint-plugin": "^16.2.0", + "@angular-eslint/eslint-plugin-template": "^16.2.0", + "@angular-eslint/schematics": "^16.2.0", + "@angular-eslint/template-parser": "^16.2.0", + "@angular/cli": "~16.2.9", + "@angular/compiler-cli": "^16.2.11", + "@golevelup/ts-jest": "^0.4.0", + "@types/jest": "^29.5.7", + "@typescript-eslint/eslint-plugin": "6.9.1", + "@typescript-eslint/parser": "6.9.1", + "eslint": "^8.52.0", + "jest": "^29.7.0", + "prettier": "^3.0.3", + "typescript": "4.9.5" + } + }, + "node_modules/@aashutoshrathi/word-wrap": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz", + "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==", + "dev": true, + "engines": { + "node": ">=0.10.0" } }, "node_modules/@ampproject/remapping": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz", - "integrity": "sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==", + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.1.tgz", + "integrity": "sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==", "dev": true, "dependencies": { - "@jridgewell/gen-mapping": "^0.1.0", + "@jridgewell/gen-mapping": "^0.3.0", "@jridgewell/trace-mapping": "^0.3.9" }, "engines": { @@ -67,14 +76,14 @@ } }, "node_modules/@angular-builders/jest": { - "version": "15.0.0", - "resolved": "https://registry.npmjs.org/@angular-builders/jest/-/jest-15.0.0.tgz", - "integrity": "sha512-rJpO4QAsAXBXvkTI8E5kHxhLJEh6JR8iBYH3tHuXeTkABgifH+IRdDNWjogHTy32ratnhUPEaMOpPPDryIL+tw==", + "version": "16.0.1", + "resolved": "https://registry.npmjs.org/@angular-builders/jest/-/jest-16.0.1.tgz", + "integrity": "sha512-FuYkfy8JwdfTHevjgs8z18sXt0egcWbSSkefyM/QsGVkMHs+b4N4xzV20MQtyx0Yc6nJzuknIH5ZvDwLYUDPyQ==", "dev": true, "dependencies": { - "@angular-devkit/architect": ">=0.1500.0 < 0.1600.0", - "@angular-devkit/core": "^15.0.0", - "jest-preset-angular": "12.2.3", + "@angular-devkit/architect": ">=0.1600.0 < 0.1700.0", + "@angular-devkit/core": "^16.0.0", + "jest-preset-angular": "13.1.1", "lodash": "^4.17.15", "tsconfig-paths": "^4.1.0" }, @@ -82,79 +91,63 @@ "node": "^14.20.0 || ^16.13.0 || >=18.10.0" }, "peerDependencies": { - "@angular-devkit/build-angular": "^15.0.0", - "@angular/compiler-cli": "^15.0.0", - "@angular/core": "^15.0.0", - "@angular/platform-browser-dynamic": "^15.0.0", - "jest": ">=28" + "@angular-devkit/build-angular": "^16.0.0", + "@angular/compiler-cli": "^16.0.0", + "@angular/core": "^16.0.0", + "@angular/platform-browser-dynamic": "^16.0.0", + "jest": ">=29" } }, "node_modules/@angular-devkit/architect": { - "version": "0.1501.4", - "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1501.4.tgz", - "integrity": "sha512-PE0CqPaNzcz8yHEuJwqtKxYvXX9hgWWvC6hI2DWKtC+5WgJLAYJNEGofXQRc227Nj+YySEYUUo8Ja8SYl3lDxA==", + "version": "0.1602.9", + "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1602.9.tgz", + "integrity": "sha512-U3vfb/e2sFfg0D9FyyRBXRPP7g4FBFtGK8Q3JPmvAVsHHwi5AUFRNR7YBChB/T5TMNY077HcTyEirVh2FeUpdA==", "dev": true, "dependencies": { - "@angular-devkit/core": "15.1.4", - "rxjs": "6.6.7" + "@angular-devkit/core": "16.2.9", + "rxjs": "7.8.1" }, "engines": { - "node": "^14.20.0 || ^16.13.0 || >=18.10.0", + "node": "^16.14.0 || >=18.10.0", "npm": "^6.11.0 || ^7.5.6 || >=8.0.0", "yarn": ">= 1.13.0" } }, - "node_modules/@angular-devkit/architect/node_modules/rxjs": { - "version": "6.6.7", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", - "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", - "dev": true, - "dependencies": { - "tslib": "^1.9.0" - }, - "engines": { - "npm": ">=2.0.0" - } - }, - "node_modules/@angular-devkit/architect/node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", - "dev": true - }, "node_modules/@angular-devkit/build-angular": { - "version": "15.1.4", - "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-15.1.4.tgz", - "integrity": "sha512-+vubHYyQn8HJ+uJQndr8xFlX6C7y1kdnzTiKgx6QFvA5sd/IhXXzsnDd1wFer1lCrZ+1qgfhG9HI/RL3cBeKrA==", - "dev": true, - "dependencies": { - "@ampproject/remapping": "2.2.0", - "@angular-devkit/architect": "0.1501.4", - "@angular-devkit/build-webpack": "0.1501.4", - "@angular-devkit/core": "15.1.4", - "@babel/core": "7.20.12", - "@babel/generator": "7.20.7", - "@babel/helper-annotate-as-pure": "7.18.6", + "version": "16.2.9", + "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-16.2.9.tgz", + "integrity": "sha512-S1C4UYxRVyNt3C0wCxbT2jZ1dN5i37kS0mol3PQjbR8gQ0GQzHmzhjTBl1oImo8aouET9yhrk9etk65oat4mBQ==", + "dev": true, + "dependencies": { + "@ampproject/remapping": "2.2.1", + "@angular-devkit/architect": "0.1602.9", + "@angular-devkit/build-webpack": "0.1602.9", + "@angular-devkit/core": "16.2.9", + "@babel/core": "7.22.9", + "@babel/generator": "7.22.9", + "@babel/helper-annotate-as-pure": "7.22.5", + "@babel/helper-split-export-declaration": "7.22.6", "@babel/plugin-proposal-async-generator-functions": "7.20.7", - "@babel/plugin-transform-async-to-generator": "7.20.7", - "@babel/plugin-transform-runtime": "7.19.6", - "@babel/preset-env": "7.20.2", - "@babel/runtime": "7.20.7", - "@babel/template": "7.20.7", + "@babel/plugin-transform-async-to-generator": "7.22.5", + "@babel/plugin-transform-runtime": "7.22.9", + "@babel/preset-env": "7.22.9", + "@babel/runtime": "7.22.6", + "@babel/template": "7.22.5", "@discoveryjs/json-ext": "0.5.7", - "@ngtools/webpack": "15.1.4", + "@ngtools/webpack": "16.2.9", + "@vitejs/plugin-basic-ssl": "1.0.1", "ansi-colors": "4.1.3", - "autoprefixer": "10.4.13", - "babel-loader": "9.1.2", + "autoprefixer": "10.4.14", + "babel-loader": "9.1.3", "babel-plugin-istanbul": "6.1.1", - "browserslist": "4.21.4", - "cacache": "17.0.4", + "browserslist": "^4.21.5", "chokidar": "3.5.3", "copy-webpack-plugin": "11.0.0", - "critters": "0.0.16", - "css-loader": "6.7.3", - "esbuild-wasm": "0.16.17", - "glob": "8.0.3", + "critters": "0.0.20", + "css-loader": "6.8.1", + "esbuild-wasm": "0.18.17", + "fast-glob": "3.3.1", + "guess-parser": "0.4.22", "https-proxy-agent": "5.0.1", "inquirer": "8.2.4", "jsonc-parser": "3.2.0", @@ -163,49 +156,54 @@ "less-loader": "11.1.0", "license-webpack-plugin": "4.0.2", "loader-utils": "3.2.1", - "magic-string": "0.27.0", - "mini-css-extract-plugin": "2.7.2", - "open": "8.4.0", + "magic-string": "0.30.1", + "mini-css-extract-plugin": "2.7.6", + "mrmime": "1.0.1", + "open": "8.4.2", "ora": "5.4.1", - "parse5-html-rewriting-stream": "6.0.1", - "piscina": "3.2.0", - "postcss": "8.4.21", - "postcss-loader": "7.0.2", + "parse5-html-rewriting-stream": "7.0.0", + "picomatch": "2.3.1", + "piscina": "4.0.0", + "postcss": "8.4.31", + "postcss-loader": "7.3.3", "resolve-url-loader": "5.0.0", - "rxjs": "6.6.7", - "sass": "1.57.1", - "sass-loader": "13.2.0", - "semver": "7.3.8", + "rxjs": "7.8.1", + "sass": "1.64.1", + "sass-loader": "13.3.2", + "semver": "7.5.4", "source-map-loader": "4.0.1", "source-map-support": "0.5.21", - "terser": "5.16.1", + "terser": "5.19.2", "text-table": "0.2.0", "tree-kill": "1.2.2", - "tslib": "2.4.1", - "webpack": "5.75.0", - "webpack-dev-middleware": "6.0.1", - "webpack-dev-server": "4.11.1", - "webpack-merge": "5.8.0", + "tslib": "2.6.1", + "vite": "4.4.7", + "webpack": "5.88.2", + "webpack-dev-middleware": "6.1.1", + "webpack-dev-server": "4.15.1", + "webpack-merge": "5.9.0", "webpack-subresource-integrity": "5.1.0" }, "engines": { - "node": "^14.20.0 || ^16.13.0 || >=18.10.0", + "node": "^16.14.0 || >=18.10.0", "npm": "^6.11.0 || ^7.5.6 || >=8.0.0", "yarn": ">= 1.13.0" }, "optionalDependencies": { - "esbuild": "0.16.17" + "esbuild": "0.18.17" }, "peerDependencies": { - "@angular/compiler-cli": "^15.0.0", - "@angular/localize": "^15.0.0", - "@angular/platform-server": "^15.0.0", - "@angular/service-worker": "^15.0.0", + "@angular/compiler-cli": "^16.0.0", + "@angular/localize": "^16.0.0", + "@angular/platform-server": "^16.0.0", + "@angular/service-worker": "^16.0.0", + "jest": "^29.5.0", + "jest-environment-jsdom": "^29.5.0", "karma": "^6.3.0", - "ng-packagr": "^15.0.0", + "ng-packagr": "^16.0.0", "protractor": "^7.0.0", "tailwindcss": "^2.0.0 || ^3.0.0", - "typescript": ">=4.8.2 <5.0" + "typescript": ">=4.9.3 <5.2" }, "peerDependenciesMeta": { "@angular/localize": { @@ -217,6 +215,12 @@ "@angular/service-worker": { "optional": true }, + "jest": { + "optional": true + }, + "jest-environment-jsdom": { + "optional": true + }, "karma": { "optional": true }, @@ -231,74 +235,23 @@ } } }, - "node_modules/@angular-devkit/build-angular/node_modules/@babel/core": { - "version": "7.20.12", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.20.12.tgz", - "integrity": "sha512-XsMfHovsUYHFMdrIHkZphTN/2Hzzi78R08NuHfDBehym2VsPDL6Zn/JAD/JQdnRvbSsbQc4mVaU1m6JgtTEElg==", - "dev": true, - "dependencies": { - "@ampproject/remapping": "^2.1.0", - "@babel/code-frame": "^7.18.6", - "@babel/generator": "^7.20.7", - "@babel/helper-compilation-targets": "^7.20.7", - "@babel/helper-module-transforms": "^7.20.11", - "@babel/helpers": "^7.20.7", - "@babel/parser": "^7.20.7", - "@babel/template": "^7.20.7", - "@babel/traverse": "^7.20.12", - "@babel/types": "^7.20.7", - "convert-source-map": "^1.7.0", - "debug": "^4.1.0", - "gensync": "^1.0.0-beta.2", - "json5": "^2.2.2", - "semver": "^6.3.0" - }, - "engines": { - "node": ">=6.9.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/babel" - } - }, - "node_modules/@angular-devkit/build-angular/node_modules/@babel/core/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true, - "bin": { - "semver": "bin/semver.js" - } - }, - "node_modules/@angular-devkit/build-angular/node_modules/rxjs": { - "version": "6.6.7", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", - "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", - "dev": true, - "dependencies": { - "tslib": "^1.9.0" - }, - "engines": { - "npm": ">=2.0.0" - } - }, - "node_modules/@angular-devkit/build-angular/node_modules/rxjs/node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "node_modules/@angular-devkit/build-angular/node_modules/tslib": { + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.1.tgz", + "integrity": "sha512-t0hLfiEKfMUoqhG+U1oid7Pva4bbDPHYfJNiB7BiIjRkj1pyC++4N3huJfqY6aRH6VTB0rvtzQwjM4K6qpfOig==", "dev": true }, "node_modules/@angular-devkit/build-webpack": { - "version": "0.1501.4", - "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1501.4.tgz", - "integrity": "sha512-rJ7KTBDW0UHgVJjQ23qJfGun+pDX3ZG2z0OtsskdsOI62SAvW1cVLuS50ICTcWW6gtcDO0R/6Q1RLbaV1JHZ5A==", + "version": "0.1602.9", + "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1602.9.tgz", + "integrity": "sha512-+3IxovfBPR2Vy730mGa0SVKkd5LQVom85gjXOs7WcnnnZmfc1q/BtFlqTgW1UWvTxP8IQdm7UYWVclQfL/WExw==", "dev": true, "dependencies": { - "@angular-devkit/architect": "0.1501.4", - "rxjs": "6.6.7" + "@angular-devkit/architect": "0.1602.9", + "rxjs": "7.8.1" }, "engines": { - "node": "^14.20.0 || ^16.13.0 || >=18.10.0", + "node": "^16.14.0 || >=18.10.0", "npm": "^6.11.0 || ^7.5.6 || >=8.0.0", "yarn": ">= 1.13.0" }, @@ -307,38 +260,21 @@ "webpack-dev-server": "^4.0.0" } }, - "node_modules/@angular-devkit/build-webpack/node_modules/rxjs": { - "version": "6.6.7", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", - "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", - "dev": true, - "dependencies": { - "tslib": "^1.9.0" - }, - "engines": { - "npm": ">=2.0.0" - } - }, - "node_modules/@angular-devkit/build-webpack/node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", - "dev": true - }, "node_modules/@angular-devkit/core": { - "version": "15.1.4", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-15.1.4.tgz", - "integrity": "sha512-PW5MRmd9DHJR4FaXchwQtj9pXnsghSTnwRvfZeCRNYgU2sv0DKyTV+YTSJB+kNXnoPNG1Je6amDEkiXecpspXg==", + "version": "16.2.9", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-16.2.9.tgz", + "integrity": "sha512-dcHWjHBNGm3yCeNz19y8A1At4KgyC6XHNnbFL0y+nnZYiaESXjUoXJYKASedI6A+Bpl0HNq2URhH6bL6Af3+4w==", "dev": true, "dependencies": { "ajv": "8.12.0", "ajv-formats": "2.1.1", "jsonc-parser": "3.2.0", - "rxjs": "6.6.7", + "picomatch": "2.3.1", + "rxjs": "7.8.1", "source-map": "0.7.4" }, "engines": { - "node": "^14.20.0 || ^16.13.0 || >=18.10.0", + "node": "^16.14.0 || >=18.10.0", "npm": "^6.11.0 || ^7.5.6 || >=8.0.0", "yarn": ">= 1.13.0" }, @@ -351,749 +287,445 @@ } } }, - "node_modules/@angular-devkit/core/node_modules/rxjs": { - "version": "6.6.7", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", - "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", - "dev": true, - "dependencies": { - "tslib": "^1.9.0" - }, - "engines": { - "npm": ">=2.0.0" - } - }, - "node_modules/@angular-devkit/core/node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", - "dev": true - }, "node_modules/@angular-devkit/schematics": { - "version": "15.1.4", - "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-15.1.4.tgz", - "integrity": "sha512-jpddxo9Qd2yRQ1t9FLhAx5S+luz6HkyhDytq0LFKbxf9ikf1J4oy9riPBFl4pRmrNARWcHZ6GbD20/Ky8PjmXQ==", + "version": "16.2.9", + "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-16.2.9.tgz", + "integrity": "sha512-lB51CGCILpcSI37CwKUAGDLxMqh7zmuRbiPo9s9mSkCM4ccqxFlaL+VFTq2/laneARD6aikpOHnkVm5myNzQPw==", "dev": true, "dependencies": { - "@angular-devkit/core": "15.1.4", + "@angular-devkit/core": "16.2.9", "jsonc-parser": "3.2.0", - "magic-string": "0.27.0", + "magic-string": "0.30.1", "ora": "5.4.1", - "rxjs": "6.6.7" - }, - "engines": { - "node": "^14.20.0 || ^16.13.0 || >=18.10.0", - "npm": "^6.11.0 || ^7.5.6 || >=8.0.0", - "yarn": ">= 1.13.0" - } - }, - "node_modules/@angular-devkit/schematics/node_modules/@angular-devkit/core": { - "version": "15.1.4", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-15.1.4.tgz", - "integrity": "sha512-PW5MRmd9DHJR4FaXchwQtj9pXnsghSTnwRvfZeCRNYgU2sv0DKyTV+YTSJB+kNXnoPNG1Je6amDEkiXecpspXg==", - "dev": true, - "dependencies": { - "ajv": "8.12.0", - "ajv-formats": "2.1.1", - "jsonc-parser": "3.2.0", - "rxjs": "6.6.7", - "source-map": "0.7.4" + "rxjs": "7.8.1" }, "engines": { - "node": "^14.20.0 || ^16.13.0 || >=18.10.0", + "node": "^16.14.0 || >=18.10.0", "npm": "^6.11.0 || ^7.5.6 || >=8.0.0", "yarn": ">= 1.13.0" - }, - "peerDependencies": { - "chokidar": "^3.5.2" - }, - "peerDependenciesMeta": { - "chokidar": { - "optional": true - } } }, - "node_modules/@angular-devkit/schematics/node_modules/rxjs": { - "version": "6.6.7", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", - "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", + "node_modules/@angular-eslint/builder": { + "version": "16.2.0", + "resolved": "https://registry.npmjs.org/@angular-eslint/builder/-/builder-16.2.0.tgz", + "integrity": "sha512-SZjXOi3YIjuX2CocuRsR2QH6k1ca9lRO6IMm0YIYMmBPFCRP2KFHkL6aQnXM6DSaymQNN2TXfpuvUd45NxhU1w==", "dev": true, "dependencies": { - "tslib": "^1.9.0" + "@nx/devkit": "16.5.1", + "nx": "16.5.1" }, - "engines": { - "npm": ">=2.0.0" - } - }, - "node_modules/@angular-devkit/schematics/node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", - "dev": true - }, - "node_modules/@angular-eslint/builder": { - "version": "14.1.2", - "resolved": "https://registry.npmjs.org/@angular-eslint/builder/-/builder-14.1.2.tgz", - "integrity": "sha512-J+LRidjlJOGfRNXJwUyOhz5TnasEBK+kL3QkkCE4ZSt/dH40QqT+3q9qV5zc45wdaAeJM4/jp1IhI6kPwWI5Yw==", - "dev": true, "peerDependencies": { - "eslint": "^7.0.0 || ^8.0.0", + "eslint": "^7.20.0 || ^8.0.0", "typescript": "*" } }, "node_modules/@angular-eslint/bundled-angular-compiler": { - "version": "14.1.2", - "resolved": "https://registry.npmjs.org/@angular-eslint/bundled-angular-compiler/-/bundled-angular-compiler-14.1.2.tgz", - "integrity": "sha512-d5/jTKXP+t9hNSucj3m8zZYBl62fZ2xFMVNbAOArYAkA7WwwX3D7Gae57BNW54cd2fl2/is7Dn6UgYhu1wqkSQ==", + "version": "16.2.0", + "resolved": "https://registry.npmjs.org/@angular-eslint/bundled-angular-compiler/-/bundled-angular-compiler-16.2.0.tgz", + "integrity": "sha512-ct9orDYxkMl2+uvM7UBfgV28Dq57V4dEs+Drh7cD673JIMa6sXbgmd0QEtm8W3cmyK/jcTzmuoufxbH7hOxd6g==", "dev": true }, "node_modules/@angular-eslint/eslint-plugin": { - "version": "14.1.2", - "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin/-/eslint-plugin-14.1.2.tgz", - "integrity": "sha512-5pJaTcFfM7yDHNtMxw3uNTpBTLjNYH9mlOLX5FFQ9EahAuycwCtV8VJkIntK2ZiOTdRVJYA9/PEdD/xVxX02rw==", + "version": "16.2.0", + "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin/-/eslint-plugin-16.2.0.tgz", + "integrity": "sha512-zdiAIox1T+B71HL+A8m+1jWdU34nvPGLhCRw/uZNwHzknsF4tYzNQ9W7T/SC/g/2s1yT2yNosEVNJSGSFvunJg==", "dev": true, "dependencies": { - "@angular-eslint/utils": "14.1.2", - "@typescript-eslint/utils": "5.37.0" + "@angular-eslint/utils": "16.2.0", + "@typescript-eslint/utils": "5.62.0" }, "peerDependencies": { - "eslint": "^7.0.0 || ^8.0.0", + "eslint": "^7.20.0 || ^8.0.0", "typescript": "*" } }, "node_modules/@angular-eslint/eslint-plugin-template": { - "version": "14.1.2", - "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin-template/-/eslint-plugin-template-14.1.2.tgz", - "integrity": "sha512-gMgYJ8ZwPvq2H/YEzPztVRAK2NYs2cJFUDZD4iGjSRtDgYq9OHjyTo+r6tkcyjcK2qvesy0RccHQKh+x3hYMTA==", + "version": "16.2.0", + "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin-template/-/eslint-plugin-template-16.2.0.tgz", + "integrity": "sha512-YFdQ6hHX6NlQj0lfogZwfyKjU8pqkJU+Zsk0ehjlXP8VfKFVmDeQT5/Xr6Df9C8pveC3hvq6Jgd8vo67S9Enxg==", "dev": true, "dependencies": { - "@angular-eslint/bundled-angular-compiler": "14.1.2", - "@typescript-eslint/type-utils": "5.37.0", - "@typescript-eslint/utils": "5.37.0", - "aria-query": "5.0.2", - "axobject-query": "3.0.1" + "@angular-eslint/bundled-angular-compiler": "16.2.0", + "@angular-eslint/utils": "16.2.0", + "@typescript-eslint/type-utils": "5.62.0", + "@typescript-eslint/utils": "5.62.0", + "aria-query": "5.3.0", + "axobject-query": "3.2.1" }, "peerDependencies": { - "eslint": "^7.0.0 || ^8.0.0", + "eslint": "^7.20.0 || ^8.0.0", "typescript": "*" } }, "node_modules/@angular-eslint/schematics": { - "version": "15.2.0", - "resolved": "https://registry.npmjs.org/@angular-eslint/schematics/-/schematics-15.2.0.tgz", - "integrity": "sha512-N9tuVu3vL47beppTsV9wAF+v6M9trbJnuNWYQGGsqA3mtCAkFUvJuHyWcXNPdSCNv/cJtR1OOJ7Y922uB5JPJQ==", + "version": "16.2.0", + "resolved": "https://registry.npmjs.org/@angular-eslint/schematics/-/schematics-16.2.0.tgz", + "integrity": "sha512-2JUVR7hAKx37mgWeDjvyWEMH5uSeeksYuaQT5wwlgIzgrO4BNFuqs6Rgyp2jiYa7BFMX/qHULSa+bSq5J5ceEA==", "dev": true, "dependencies": { - "@angular-eslint/eslint-plugin": "15.2.0", - "@angular-eslint/eslint-plugin-template": "15.2.0", + "@angular-eslint/eslint-plugin": "16.2.0", + "@angular-eslint/eslint-plugin-template": "16.2.0", + "@nx/devkit": "16.5.1", "ignore": "5.2.4", + "nx": "16.5.1", "strip-json-comments": "3.1.1", "tmp": "0.2.1" }, "peerDependencies": { - "@angular/cli": ">= 15.0.0 < 16.0.0" + "@angular/cli": ">= 16.0.0 < 17.0.0" } }, - "node_modules/@angular-eslint/schematics/node_modules/@angular-eslint/bundled-angular-compiler": { - "version": "15.2.0", - "resolved": "https://registry.npmjs.org/@angular-eslint/bundled-angular-compiler/-/bundled-angular-compiler-15.2.0.tgz", - "integrity": "sha512-a0bfXxYyGoWJHrVQ4QER0HdRgselcTtJeyqiFPAxID2ZxF0IBGKLNTtugUTXekEmiLev8yGLX9TqAtthN57fEg==", - "dev": true - }, - "node_modules/@angular-eslint/schematics/node_modules/@angular-eslint/eslint-plugin": { - "version": "15.2.0", - "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin/-/eslint-plugin-15.2.0.tgz", - "integrity": "sha512-yJGbmSUU0B0MFJ48ktpkqqEK+zv5k9iwlZSqEHtiQMKvDelfluovnEusihel7uPRo1c1iVlbSgXfGpxpUCfocA==", + "node_modules/@angular-eslint/template-parser": { + "version": "16.2.0", + "resolved": "https://registry.npmjs.org/@angular-eslint/template-parser/-/template-parser-16.2.0.tgz", + "integrity": "sha512-v2jVKTy2wN7iM9nHpBkxLn2wfL8jSl4IlPrXThIqj8No2VHtpLQZPKuXbGPUXQX05VS2Mj5feScQ36ZVGS8Rbw==", "dev": true, "dependencies": { - "@angular-eslint/utils": "15.2.0", - "@typescript-eslint/utils": "5.48.1" + "@angular-eslint/bundled-angular-compiler": "16.2.0", + "eslint-scope": "^7.0.0" }, "peerDependencies": { "eslint": "^7.20.0 || ^8.0.0", "typescript": "*" } }, - "node_modules/@angular-eslint/schematics/node_modules/@angular-eslint/eslint-plugin-template": { - "version": "15.2.0", - "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin-template/-/eslint-plugin-template-15.2.0.tgz", - "integrity": "sha512-aL3czf5Jpv29rKN3UG20tQepX1+V0d6xc0g+1l0zPHZJYjVd6Oy0nIxWiGfl4yanaXiVpmxiV4vUcLlqqaFwbw==", + "node_modules/@angular-eslint/utils": { + "version": "16.2.0", + "resolved": "https://registry.npmjs.org/@angular-eslint/utils/-/utils-16.2.0.tgz", + "integrity": "sha512-NxMRwnlIgzmbJQfWkfd9y3Sz0hzjFdK5LH44i+3D5NhpPdZ6SzwHAjMYWoYsmmNQX5tlDXoicYF9Mz9Wz8DJ/A==", "dev": true, "dependencies": { - "@angular-eslint/bundled-angular-compiler": "15.2.0", - "@angular-eslint/utils": "15.2.0", - "@typescript-eslint/type-utils": "5.48.1", - "@typescript-eslint/utils": "5.48.1", - "aria-query": "5.1.3", - "axobject-query": "3.1.1" + "@angular-eslint/bundled-angular-compiler": "16.2.0", + "@typescript-eslint/utils": "5.62.0" }, "peerDependencies": { "eslint": "^7.20.0 || ^8.0.0", "typescript": "*" } }, - "node_modules/@angular-eslint/schematics/node_modules/@angular-eslint/utils": { - "version": "15.2.0", - "resolved": "https://registry.npmjs.org/@angular-eslint/utils/-/utils-15.2.0.tgz", - "integrity": "sha512-qfTOKQ+aef/YER679/xN1E+FkZKMd0I73P6txUZAb9k2G1ACVktG+wOUIBfgjIlUVq9Q01AV91LGOWcd+rdEEA==", - "dev": true, + "node_modules/@angular/animations": { + "version": "16.2.11", + "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-16.2.11.tgz", + "integrity": "sha512-xdLYXsGi7OuJawhiVIppl2VkPHhPdxUP/nR6+ETR3TdAscVruCWJs4z9XKval4fbik/brekbFNFuYtlx6csDhQ==", "dependencies": { - "@angular-eslint/bundled-angular-compiler": "15.2.0", - "@typescript-eslint/utils": "5.48.1" + "tslib": "^2.3.0" + }, + "engines": { + "node": "^16.14.0 || >=18.10.0" }, "peerDependencies": { - "eslint": "^7.20.0 || ^8.0.0", - "typescript": "*" + "@angular/core": "16.2.11" } }, - "node_modules/@angular-eslint/schematics/node_modules/@typescript-eslint/scope-manager": { - "version": "5.48.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.48.1.tgz", - "integrity": "sha512-S035ueRrbxRMKvSTv9vJKIWgr86BD8s3RqoRZmsSh/s8HhIs90g6UlK8ZabUSjUZQkhVxt7nmZ63VJ9dcZhtDQ==", - "dev": true, + "node_modules/@angular/cdk": { + "version": "16.2.11", + "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-16.2.11.tgz", + "integrity": "sha512-FcJ9xd9ptjULdScnBNg7YkVnY9NKePFfmvvs2zt841Hd489L8BUkTUdbvtCLhMJTTSN+k+D+RYFhevZuhPKVVg==", "dependencies": { - "@typescript-eslint/types": "5.48.1", - "@typescript-eslint/visitor-keys": "5.48.1" + "tslib": "^2.3.0" }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "optionalDependencies": { + "parse5": "^7.1.2" }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" + "peerDependencies": { + "@angular/common": "^16.0.0 || ^17.0.0", + "@angular/core": "^16.0.0 || ^17.0.0", + "rxjs": "^6.5.3 || ^7.4.0" } }, - "node_modules/@angular-eslint/schematics/node_modules/@typescript-eslint/type-utils": { - "version": "5.48.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.48.1.tgz", - "integrity": "sha512-Hyr8HU8Alcuva1ppmqSYtM/Gp0q4JOp1F+/JH5D1IZm/bUBrV0edoewQZiEc1r6I8L4JL21broddxK8HAcZiqQ==", + "node_modules/@angular/cli": { + "version": "16.2.9", + "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-16.2.9.tgz", + "integrity": "sha512-wkpV/Ni26LUeDmhee2TPXXEq3feEdZMSG8+nkfUK9kqIcxm0IjI1GLPeiVOX7aQobuKNe2cCAFNwsrXWjj+2og==", "dev": true, "dependencies": { - "@typescript-eslint/typescript-estree": "5.48.1", - "@typescript-eslint/utils": "5.48.1", - "debug": "^4.3.4", - "tsutils": "^3.21.0" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" + "@angular-devkit/architect": "0.1602.9", + "@angular-devkit/core": "16.2.9", + "@angular-devkit/schematics": "16.2.9", + "@schematics/angular": "16.2.9", + "@yarnpkg/lockfile": "1.1.0", + "ansi-colors": "4.1.3", + "ini": "4.1.1", + "inquirer": "8.2.4", + "jsonc-parser": "3.2.0", + "npm-package-arg": "10.1.0", + "npm-pick-manifest": "8.0.1", + "open": "8.4.2", + "ora": "5.4.1", + "pacote": "15.2.0", + "resolve": "1.22.2", + "semver": "7.5.4", + "symbol-observable": "4.0.0", + "yargs": "17.7.2" }, - "peerDependencies": { - "eslint": "*" + "bin": { + "ng": "bin/ng.js" }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } + "engines": { + "node": "^16.14.0 || >=18.10.0", + "npm": "^6.11.0 || ^7.5.6 || >=8.0.0", + "yarn": ">= 1.13.0" } }, - "node_modules/@angular-eslint/schematics/node_modules/@typescript-eslint/types": { - "version": "5.48.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.48.1.tgz", - "integrity": "sha512-xHyDLU6MSuEEdIlzrrAerCGS3T7AA/L8Hggd0RCYBi0w3JMvGYxlLlXHeg50JI9Tfg5MrtsfuNxbS/3zF1/ATg==", - "dev": true, + "node_modules/@angular/common": { + "version": "16.2.11", + "resolved": "https://registry.npmjs.org/@angular/common/-/common-16.2.11.tgz", + "integrity": "sha512-h80WUR2OYlqxQy+4XgNtWT2vB+vZ6oCrFX/q8cU5jAvbvGQfJuH0zfcbSlUflStmAhk5/OT25F0mt96cqapEAw==", + "dependencies": { + "tslib": "^2.3.0" + }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^16.14.0 || >=18.10.0" }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" + "peerDependencies": { + "@angular/core": "16.2.11", + "rxjs": "^6.5.3 || ^7.4.0" } }, - "node_modules/@angular-eslint/schematics/node_modules/@typescript-eslint/typescript-estree": { - "version": "5.48.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.48.1.tgz", - "integrity": "sha512-Hut+Osk5FYr+sgFh8J/FHjqX6HFcDzTlWLrFqGoK5kVUN3VBHF/QzZmAsIXCQ8T/W9nQNBTqalxi1P3LSqWnRA==", - "dev": true, + "node_modules/@angular/compiler": { + "version": "16.2.11", + "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-16.2.11.tgz", + "integrity": "sha512-9q/E3uurvoQbdTTWDyWCLpzmfJ4+et7SUca1/EljD/X7Xg2FNU5GpTMutBtWFL7wDyWk1oswivuq9/C4GVW7fA==", "dependencies": { - "@typescript-eslint/types": "5.48.1", - "@typescript-eslint/visitor-keys": "5.48.1", - "debug": "^4.3.4", - "globby": "^11.1.0", - "is-glob": "^4.0.3", - "semver": "^7.3.7", - "tsutils": "^3.21.0" + "tslib": "^2.3.0" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^16.14.0 || >=18.10.0" }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" + "peerDependencies": { + "@angular/core": "16.2.11" }, "peerDependenciesMeta": { - "typescript": { + "@angular/core": { "optional": true } } }, - "node_modules/@angular-eslint/schematics/node_modules/@typescript-eslint/utils": { - "version": "5.48.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.48.1.tgz", - "integrity": "sha512-SmQuSrCGUOdmGMwivW14Z0Lj8dxG1mOFZ7soeJ0TQZEJcs3n5Ndgkg0A4bcMFzBELqLJ6GTHnEU+iIoaD6hFGA==", + "node_modules/@angular/compiler-cli": { + "version": "16.2.11", + "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-16.2.11.tgz", + "integrity": "sha512-ZtZCXfkVBH78HUm2Byf+WX3Y6WzQK9EXYXNU/ni1rvSZ1vLNwieLDfWb/xwiO7QojrHZTym1RJ10jTMinTguqw==", "dev": true, "dependencies": { - "@types/json-schema": "^7.0.9", - "@types/semver": "^7.3.12", - "@typescript-eslint/scope-manager": "5.48.1", - "@typescript-eslint/types": "5.48.1", - "@typescript-eslint/typescript-estree": "5.48.1", - "eslint-scope": "^5.1.1", - "eslint-utils": "^3.0.0", - "semver": "^7.3.7" + "@babel/core": "7.23.2", + "@jridgewell/sourcemap-codec": "^1.4.14", + "chokidar": "^3.0.0", + "convert-source-map": "^1.5.1", + "reflect-metadata": "^0.1.2", + "semver": "^7.0.0", + "tslib": "^2.3.0", + "yargs": "^17.2.1" }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "bin": { + "ng-xi18n": "bundles/src/bin/ng_xi18n.js", + "ngc": "bundles/src/bin/ngc.js", + "ngcc": "bundles/ngcc/index.js" }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" + "engines": { + "node": "^16.14.0 || >=18.10.0" }, "peerDependencies": { - "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" - } - }, - "node_modules/@angular-eslint/schematics/node_modules/@typescript-eslint/visitor-keys": { - "version": "5.48.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.48.1.tgz", - "integrity": "sha512-Ns0XBwmfuX7ZknznfXozgnydyR8F6ev/KEGePP4i74uL3ArsKbEhJ7raeKr1JSa997DBDwol/4a0Y+At82c9dA==", - "dev": true, - "dependencies": { - "@typescript-eslint/types": "5.48.1", - "eslint-visitor-keys": "^3.3.0" + "@angular/compiler": "16.2.11", + "typescript": ">=4.9.3 <5.2" + } + }, + "node_modules/@angular/compiler-cli/node_modules/@babel/core": { + "version": "7.23.2", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.2.tgz", + "integrity": "sha512-n7s51eWdaWZ3vGT2tD4T7J6eJs3QoBXydv7vkUM06Bf1cbVD2Kc2UrkzhiQwobfV7NwOnQXYL7UBJ5VPU+RGoQ==", + "dev": true, + "dependencies": { + "@ampproject/remapping": "^2.2.0", + "@babel/code-frame": "^7.22.13", + "@babel/generator": "^7.23.0", + "@babel/helper-compilation-targets": "^7.22.15", + "@babel/helper-module-transforms": "^7.23.0", + "@babel/helpers": "^7.23.2", + "@babel/parser": "^7.23.0", + "@babel/template": "^7.22.15", + "@babel/traverse": "^7.23.2", + "@babel/types": "^7.23.0", + "convert-source-map": "^2.0.0", + "debug": "^4.1.0", + "gensync": "^1.0.0-beta.2", + "json5": "^2.2.3", + "semver": "^6.3.1" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": ">=6.9.0" }, "funding": { "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" + "url": "https://opencollective.com/babel" } }, - "node_modules/@angular-eslint/schematics/node_modules/aria-query": { - "version": "5.1.3", - "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.1.3.tgz", - "integrity": "sha512-R5iJ5lkuHybztUfuOAznmboyjWq8O6sqNqtK7CLOqdydi54VNbORp49mb14KbWgG1QD3JFO9hJdZ+y4KutfdOQ==", + "node_modules/@angular/compiler-cli/node_modules/@babel/core/node_modules/convert-source-map": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", + "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", + "dev": true + }, + "node_modules/@angular/compiler-cli/node_modules/@babel/core/node_modules/semver": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, - "dependencies": { - "deep-equal": "^2.0.5" + "bin": { + "semver": "bin/semver.js" } }, - "node_modules/@angular-eslint/schematics/node_modules/axobject-query": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-3.1.1.tgz", - "integrity": "sha512-goKlv8DZrK9hUh975fnHzhNIO4jUnFCfv/dszV5VwUGDFjI6vQ2VwoyjYjYNEbBE8AH87TduWP5uyDR1D+Iteg==", + "node_modules/@angular/compiler-cli/node_modules/@babel/generator": { + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.0.tgz", + "integrity": "sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==", "dev": true, "dependencies": { - "deep-equal": "^2.0.5" + "@babel/types": "^7.23.0", + "@jridgewell/gen-mapping": "^0.3.2", + "@jridgewell/trace-mapping": "^0.3.17", + "jsesc": "^2.5.1" + }, + "engines": { + "node": ">=6.9.0" } }, - "node_modules/@angular-eslint/schematics/node_modules/globby": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", - "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==", + "node_modules/@angular/compiler-cli/node_modules/@babel/template": { + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz", + "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==", "dev": true, "dependencies": { - "array-union": "^2.1.0", - "dir-glob": "^3.0.1", - "fast-glob": "^3.2.9", - "ignore": "^5.2.0", - "merge2": "^1.4.1", - "slash": "^3.0.0" + "@babel/code-frame": "^7.22.13", + "@babel/parser": "^7.22.15", + "@babel/types": "^7.22.15" }, "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/@angular-eslint/schematics/node_modules/slash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/@angular-eslint/schematics/node_modules/tmp": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz", - "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==", - "dev": true, - "dependencies": { - "rimraf": "^3.0.0" - }, - "engines": { - "node": ">=8.17.0" - } - }, - "node_modules/@angular-eslint/template-parser": { - "version": "14.1.2", - "resolved": "https://registry.npmjs.org/@angular-eslint/template-parser/-/template-parser-14.1.2.tgz", - "integrity": "sha512-bQI+poQDIyR3OU9EQzJeLYRtmsvjFGtV5dc+4XPJ6eIyRAc8baCG/0V/cOrpofIdSf7e/sCV8H7rXcFg6tSdUw==", - "dev": true, - "dependencies": { - "@angular-eslint/bundled-angular-compiler": "14.1.2", - "eslint-scope": "^5.1.0" - }, - "peerDependencies": { - "eslint": "^7.0.0 || ^8.0.0", - "typescript": "*" - } - }, - "node_modules/@angular-eslint/utils": { - "version": "14.1.2", - "resolved": "https://registry.npmjs.org/@angular-eslint/utils/-/utils-14.1.2.tgz", - "integrity": "sha512-EtblG9zO0+kWG9EHsoEshFKvsH5DMSK1DqwQsNOVGAF0Aa5DFOqrwouJUyBNJ0d4fSWI9QcuzVkZ1x9JyLIeXQ==", - "dev": true, - "dependencies": { - "@angular-eslint/bundled-angular-compiler": "14.1.2", - "@typescript-eslint/utils": "5.37.0" - }, - "peerDependencies": { - "eslint": "^7.0.0 || ^8.0.0", - "typescript": "*" - } - }, - "node_modules/@angular/animations": { - "version": "15.1.3", - "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-15.1.3.tgz", - "integrity": "sha512-qvOLYx8XWolwFWwYoPjt+jQLDFaCQEPjb26iczewiqd+xcAdYn4Tl10NCJtOsx+YfTdpWtKRzvxYr1JxnGQTdw==", - "dependencies": { - "tslib": "^2.3.0" - }, - "engines": { - "node": "^14.20.0 || ^16.13.0 || >=18.10.0" - }, - "peerDependencies": { - "@angular/core": "15.1.3" - } - }, - "node_modules/@angular/cdk": { - "version": "15.1.3", - "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-15.1.3.tgz", - "integrity": "sha512-FRb1ZirybQGVlRx34vsnkIyy4WHJlrRg2mwPeJ90b0DzIWuIZIiPYxxR2bAi/Si1IjnK8YBdacd5DXPdrW1jyw==", - "dependencies": { - "tslib": "^2.3.0" - }, - "optionalDependencies": { - "parse5": "^7.1.2" - }, - "peerDependencies": { - "@angular/common": "^15.0.0 || ^16.0.0", - "@angular/core": "^15.0.0 || ^16.0.0", - "rxjs": "^6.5.3 || ^7.4.0" - } - }, - "node_modules/@angular/cdk/node_modules/entities": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/entities/-/entities-4.4.0.tgz", - "integrity": "sha512-oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA==", - "optional": true, - "engines": { - "node": ">=0.12" - }, - "funding": { - "url": "https://github.com/fb55/entities?sponsor=1" - } - }, - "node_modules/@angular/cdk/node_modules/parse5": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.1.2.tgz", - "integrity": "sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==", - "optional": true, - "dependencies": { - "entities": "^4.4.0" - }, - "funding": { - "url": "https://github.com/inikulin/parse5?sponsor=1" - } - }, - "node_modules/@angular/cli": { - "version": "15.1.4", - "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-15.1.4.tgz", - "integrity": "sha512-ebZiI4arb9wtOUMmTyUvjgDovmwpY8hmGLbkKZiEmAX8+2gbl4e97M+zd0SICZDU8bu5VcpoP6Q3Qb6vVjab9A==", - "dev": true, - "dependencies": { - "@angular-devkit/architect": "0.1501.4", - "@angular-devkit/core": "15.1.4", - "@angular-devkit/schematics": "15.1.4", - "@schematics/angular": "15.1.4", - "@yarnpkg/lockfile": "1.1.0", - "ansi-colors": "4.1.3", - "ini": "3.0.1", - "inquirer": "8.2.4", - "jsonc-parser": "3.2.0", - "npm-package-arg": "10.1.0", - "npm-pick-manifest": "8.0.1", - "open": "8.4.0", - "ora": "5.4.1", - "pacote": "15.0.8", - "resolve": "1.22.1", - "semver": "7.3.8", - "symbol-observable": "4.0.0", - "yargs": "17.6.2" - }, - "bin": { - "ng": "bin/ng.js" - }, - "engines": { - "node": "^14.20.0 || ^16.13.0 || >=18.10.0", - "npm": "^6.11.0 || ^7.5.6 || >=8.0.0", - "yarn": ">= 1.13.0" - } - }, - "node_modules/@angular/cli/node_modules/@angular-devkit/architect": { - "version": "0.1501.4", - "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1501.4.tgz", - "integrity": "sha512-PE0CqPaNzcz8yHEuJwqtKxYvXX9hgWWvC6hI2DWKtC+5WgJLAYJNEGofXQRc227Nj+YySEYUUo8Ja8SYl3lDxA==", - "dev": true, - "dependencies": { - "@angular-devkit/core": "15.1.4", - "rxjs": "6.6.7" - }, - "engines": { - "node": "^14.20.0 || ^16.13.0 || >=18.10.0", - "npm": "^6.11.0 || ^7.5.6 || >=8.0.0", - "yarn": ">= 1.13.0" - } - }, - "node_modules/@angular/cli/node_modules/@angular-devkit/core": { - "version": "15.1.4", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-15.1.4.tgz", - "integrity": "sha512-PW5MRmd9DHJR4FaXchwQtj9pXnsghSTnwRvfZeCRNYgU2sv0DKyTV+YTSJB+kNXnoPNG1Je6amDEkiXecpspXg==", - "dev": true, - "dependencies": { - "ajv": "8.12.0", - "ajv-formats": "2.1.1", - "jsonc-parser": "3.2.0", - "rxjs": "6.6.7", - "source-map": "0.7.4" - }, - "engines": { - "node": "^14.20.0 || ^16.13.0 || >=18.10.0", - "npm": "^6.11.0 || ^7.5.6 || >=8.0.0", - "yarn": ">= 1.13.0" - }, - "peerDependencies": { - "chokidar": "^3.5.2" - }, - "peerDependenciesMeta": { - "chokidar": { - "optional": true - } - } - }, - "node_modules/@angular/cli/node_modules/rxjs": { - "version": "6.6.7", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", - "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", - "dev": true, - "dependencies": { - "tslib": "^1.9.0" - }, - "engines": { - "npm": ">=2.0.0" - } - }, - "node_modules/@angular/cli/node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", - "dev": true - }, - "node_modules/@angular/common": { - "version": "15.1.3", - "resolved": "https://registry.npmjs.org/@angular/common/-/common-15.1.3.tgz", - "integrity": "sha512-UjC0COaOcU1g/ODBBetv/BpdaFC/Y32DvXJ9qbD7kkwLwoqCjGOLDvtP36r9zEzPmH7oNkgNGDkgR3gyb82s5A==", - "dependencies": { - "tslib": "^2.3.0" - }, - "engines": { - "node": "^14.20.0 || ^16.13.0 || >=18.10.0" - }, - "peerDependencies": { - "@angular/core": "15.1.3", - "rxjs": "^6.5.3 || ^7.4.0" - } - }, - "node_modules/@angular/compiler": { - "version": "15.1.3", - "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-15.1.3.tgz", - "integrity": "sha512-CxEpm5Z3EpjeGNoWKtcHOrf2IQTSckpAEFwsRrADP2nqcXXYp/IjIHi+PUTjLhjrOEbukH9zreHsL5BoIQhgUQ==", - "dependencies": { - "tslib": "^2.3.0" - }, - "engines": { - "node": "^14.20.0 || ^16.13.0 || >=18.10.0" - }, - "peerDependencies": { - "@angular/core": "15.1.3" - }, - "peerDependenciesMeta": { - "@angular/core": { - "optional": true - } - } - }, - "node_modules/@angular/compiler-cli": { - "version": "15.1.3", - "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-15.1.3.tgz", - "integrity": "sha512-z5bGdQQcStXWPpb5vztqqUOET+vxw+GUFtfktYxV40kE2d1zHLZh93AGEnM1NnBaOz+9NZrX+dWoEyWmv/T2LQ==", - "dev": true, - "dependencies": { - "@babel/core": "7.19.3", - "@jridgewell/sourcemap-codec": "^1.4.14", - "chokidar": "^3.0.0", - "convert-source-map": "^1.5.1", - "dependency-graph": "^0.11.0", - "magic-string": "^0.27.0", - "reflect-metadata": "^0.1.2", - "semver": "^7.0.0", - "tslib": "^2.3.0", - "yargs": "^17.2.1" - }, - "bin": { - "ng-xi18n": "bundles/src/bin/ng_xi18n.js", - "ngc": "bundles/src/bin/ngc.js", - "ngcc": "bundles/ngcc/main-ngcc.js" - }, - "engines": { - "node": "^14.20.0 || ^16.13.0 || >=18.10.0" - }, - "peerDependencies": { - "@angular/compiler": "15.1.3", - "typescript": ">=4.8.2 <5.0" + "node": ">=6.9.0" } }, "node_modules/@angular/core": { - "version": "15.1.3", - "resolved": "https://registry.npmjs.org/@angular/core/-/core-15.1.3.tgz", - "integrity": "sha512-rad9OYnaoRnXBztOBXsiD59VvOZTpsvO3sWx6KndytQFceFfkL722bF2l2LARN+R3IWDOwRap46HOtc0O0N+sw==", + "version": "16.2.11", + "resolved": "https://registry.npmjs.org/@angular/core/-/core-16.2.11.tgz", + "integrity": "sha512-Jb+7/p1vczQRQ3iC1QxUS5cE4X1hPVAvbrFnyMpSx6Pq5o274v/lK6PvhUZrfKrp9FxFp9pN+WHjUqNFqOuJZg==", "dependencies": { "tslib": "^2.3.0" }, "engines": { - "node": "^14.20.0 || ^16.13.0 || >=18.10.0" + "node": "^16.14.0 || >=18.10.0" }, "peerDependencies": { "rxjs": "^6.5.3 || ^7.4.0", - "zone.js": "~0.11.4 || ~0.12.0" + "zone.js": "~0.13.0" } }, "node_modules/@angular/forms": { - "version": "15.1.3", - "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-15.1.3.tgz", - "integrity": "sha512-vEgiZBk3rGGp4tBQHl9EaspEjYh70lkz6/zYreObTbMdCB54bkbl+jn+JbQyFj+TPfukiumtiG3/477vKzYnSg==", + "version": "16.2.11", + "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-16.2.11.tgz", + "integrity": "sha512-2powweUorehB1opfev6/sUeb3Bdey+Txq4gjI1Qdeo9c9OgtaKu6wK0KXgoism8HXXRFcGHMfS0dUVoDPVrtiQ==", "dependencies": { "tslib": "^2.3.0" }, "engines": { - "node": "^14.20.0 || ^16.13.0 || >=18.10.0" + "node": "^16.14.0 || >=18.10.0" }, "peerDependencies": { - "@angular/common": "15.1.3", - "@angular/core": "15.1.3", - "@angular/platform-browser": "15.1.3", + "@angular/common": "16.2.11", + "@angular/core": "16.2.11", + "@angular/platform-browser": "16.2.11", "rxjs": "^6.5.3 || ^7.4.0" } }, "node_modules/@angular/material": { - "version": "15.1.3", - "resolved": "https://registry.npmjs.org/@angular/material/-/material-15.1.3.tgz", - "integrity": "sha512-Jj17GwvL1PsIVPiRBRQQRRvTQb5TlmMP+49JgIWTSTF03G7F9guoYapoYzuufK7dWA3Ga0KzDPKfjUmcnBg+Fw==", - "dependencies": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/auto-init": "15.0.0-canary.684e33d25.0", - "@material/banner": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/button": "15.0.0-canary.684e33d25.0", - "@material/card": "15.0.0-canary.684e33d25.0", - "@material/checkbox": "15.0.0-canary.684e33d25.0", - "@material/chips": "15.0.0-canary.684e33d25.0", - "@material/circular-progress": "15.0.0-canary.684e33d25.0", - "@material/data-table": "15.0.0-canary.684e33d25.0", - "@material/density": "15.0.0-canary.684e33d25.0", - "@material/dialog": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/drawer": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/fab": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/floating-label": "15.0.0-canary.684e33d25.0", - "@material/form-field": "15.0.0-canary.684e33d25.0", - "@material/icon-button": "15.0.0-canary.684e33d25.0", - "@material/image-list": "15.0.0-canary.684e33d25.0", - "@material/layout-grid": "15.0.0-canary.684e33d25.0", - "@material/line-ripple": "15.0.0-canary.684e33d25.0", - "@material/linear-progress": "15.0.0-canary.684e33d25.0", - "@material/list": "15.0.0-canary.684e33d25.0", - "@material/menu": "15.0.0-canary.684e33d25.0", - "@material/menu-surface": "15.0.0-canary.684e33d25.0", - "@material/notched-outline": "15.0.0-canary.684e33d25.0", - "@material/radio": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/segmented-button": "15.0.0-canary.684e33d25.0", - "@material/select": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/slider": "15.0.0-canary.684e33d25.0", - "@material/snackbar": "15.0.0-canary.684e33d25.0", - "@material/switch": "15.0.0-canary.684e33d25.0", - "@material/tab": "15.0.0-canary.684e33d25.0", - "@material/tab-bar": "15.0.0-canary.684e33d25.0", - "@material/tab-indicator": "15.0.0-canary.684e33d25.0", - "@material/tab-scroller": "15.0.0-canary.684e33d25.0", - "@material/textfield": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tooltip": "15.0.0-canary.684e33d25.0", - "@material/top-app-bar": "15.0.0-canary.684e33d25.0", - "@material/touch-target": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", + "version": "16.2.11", + "resolved": "https://registry.npmjs.org/@angular/material/-/material-16.2.11.tgz", + "integrity": "sha512-hrkRD9/38++nIyo3k/KQpxsIaWm+FOJVmoJa83qvwZZt+fHKfT7xaNvRPZ+L2oqFaAvH5ivnL1u1nDuDyWz/0w==", + "dependencies": { + "@material/animation": "15.0.0-canary.bc9ae6c9c.0", + "@material/auto-init": "15.0.0-canary.bc9ae6c9c.0", + "@material/banner": "15.0.0-canary.bc9ae6c9c.0", + "@material/base": "15.0.0-canary.bc9ae6c9c.0", + "@material/button": "15.0.0-canary.bc9ae6c9c.0", + "@material/card": "15.0.0-canary.bc9ae6c9c.0", + "@material/checkbox": "15.0.0-canary.bc9ae6c9c.0", + "@material/chips": "15.0.0-canary.bc9ae6c9c.0", + "@material/circular-progress": "15.0.0-canary.bc9ae6c9c.0", + "@material/data-table": "15.0.0-canary.bc9ae6c9c.0", + "@material/density": "15.0.0-canary.bc9ae6c9c.0", + "@material/dialog": "15.0.0-canary.bc9ae6c9c.0", + "@material/dom": "15.0.0-canary.bc9ae6c9c.0", + "@material/drawer": "15.0.0-canary.bc9ae6c9c.0", + "@material/elevation": "15.0.0-canary.bc9ae6c9c.0", + "@material/fab": "15.0.0-canary.bc9ae6c9c.0", + "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0", + "@material/floating-label": "15.0.0-canary.bc9ae6c9c.0", + "@material/form-field": "15.0.0-canary.bc9ae6c9c.0", + "@material/icon-button": "15.0.0-canary.bc9ae6c9c.0", + "@material/image-list": "15.0.0-canary.bc9ae6c9c.0", + "@material/layout-grid": "15.0.0-canary.bc9ae6c9c.0", + "@material/line-ripple": "15.0.0-canary.bc9ae6c9c.0", + "@material/linear-progress": "15.0.0-canary.bc9ae6c9c.0", + "@material/list": "15.0.0-canary.bc9ae6c9c.0", + "@material/menu": "15.0.0-canary.bc9ae6c9c.0", + "@material/menu-surface": "15.0.0-canary.bc9ae6c9c.0", + "@material/notched-outline": "15.0.0-canary.bc9ae6c9c.0", + "@material/radio": "15.0.0-canary.bc9ae6c9c.0", + "@material/ripple": "15.0.0-canary.bc9ae6c9c.0", + "@material/rtl": "15.0.0-canary.bc9ae6c9c.0", + "@material/segmented-button": "15.0.0-canary.bc9ae6c9c.0", + "@material/select": "15.0.0-canary.bc9ae6c9c.0", + "@material/shape": "15.0.0-canary.bc9ae6c9c.0", + "@material/slider": "15.0.0-canary.bc9ae6c9c.0", + "@material/snackbar": "15.0.0-canary.bc9ae6c9c.0", + "@material/switch": "15.0.0-canary.bc9ae6c9c.0", + "@material/tab": "15.0.0-canary.bc9ae6c9c.0", + "@material/tab-bar": "15.0.0-canary.bc9ae6c9c.0", + "@material/tab-indicator": "15.0.0-canary.bc9ae6c9c.0", + "@material/tab-scroller": "15.0.0-canary.bc9ae6c9c.0", + "@material/textfield": "15.0.0-canary.bc9ae6c9c.0", + "@material/theme": "15.0.0-canary.bc9ae6c9c.0", + "@material/tooltip": "15.0.0-canary.bc9ae6c9c.0", + "@material/top-app-bar": "15.0.0-canary.bc9ae6c9c.0", + "@material/touch-target": "15.0.0-canary.bc9ae6c9c.0", + "@material/typography": "15.0.0-canary.bc9ae6c9c.0", "tslib": "^2.3.0" }, "peerDependencies": { - "@angular/animations": "^15.0.0 || ^16.0.0", - "@angular/cdk": "15.1.3", - "@angular/common": "^15.0.0 || ^16.0.0", - "@angular/core": "^15.0.0 || ^16.0.0", - "@angular/forms": "^15.0.0 || ^16.0.0", - "@angular/platform-browser": "^15.0.0 || ^16.0.0", + "@angular/animations": "^16.0.0 || ^17.0.0", + "@angular/cdk": "16.2.11", + "@angular/common": "^16.0.0 || ^17.0.0", + "@angular/core": "^16.0.0 || ^17.0.0", + "@angular/forms": "^16.0.0 || ^17.0.0", + "@angular/platform-browser": "^16.0.0 || ^17.0.0", "rxjs": "^6.5.3 || ^7.4.0" } }, "node_modules/@angular/material-moment-adapter": { - "version": "15.1.3", - "resolved": "https://registry.npmjs.org/@angular/material-moment-adapter/-/material-moment-adapter-15.1.3.tgz", - "integrity": "sha512-kENestgo5JHG8A4vkjvyBrT/ACgG2QQYWUclrtPa1z3wgsfoHE6ofSHxv4Ne+WhNNW5DMlhyYI74w6n5fM+dyw==", + "version": "16.2.11", + "resolved": "https://registry.npmjs.org/@angular/material-moment-adapter/-/material-moment-adapter-16.2.11.tgz", + "integrity": "sha512-vAwWi1GehmqrgOcaAnL6C6EAfr6q6liZqyNyrGC+xaNChqLD2TrzOo9qljIGiYdkRm1p36Fe4BOdBFjh+73EwQ==", "dependencies": { "tslib": "^2.3.0" }, "peerDependencies": { - "@angular/core": "^15.0.0 || ^16.0.0", - "@angular/material": "15.1.3", + "@angular/core": "^16.0.0 || ^17.0.0", + "@angular/material": "16.2.11", "moment": "^2.18.1" } }, "node_modules/@angular/platform-browser": { - "version": "15.1.3", - "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-15.1.3.tgz", - "integrity": "sha512-WJBN3klssfcRGKY2L2DIpNGbaMQfi2X1le1ZXQAnsfECQ/pua+lFstJUT+RP+Bx4X8icuDggKkS/JPOiBhxARw==", + "version": "16.2.11", + "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-16.2.11.tgz", + "integrity": "sha512-gUptbI3lbaRg+L8rcTlxKtFunYmR/M/mm9/l9uRd+5qk2mnFI0+s/tzRoaq7K0XaRGKZiWLNTz6FTkviO1zo2g==", "dependencies": { "tslib": "^2.3.0" }, "engines": { - "node": "^14.20.0 || ^16.13.0 || >=18.10.0" + "node": "^16.14.0 || >=18.10.0" }, "peerDependencies": { - "@angular/animations": "15.1.3", - "@angular/common": "15.1.3", - "@angular/core": "15.1.3" + "@angular/animations": "16.2.11", + "@angular/common": "16.2.11", + "@angular/core": "16.2.11" }, "peerDependenciesMeta": { "@angular/animations": { @@ -1102,36 +734,36 @@ } }, "node_modules/@angular/platform-browser-dynamic": { - "version": "15.1.3", - "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-15.1.3.tgz", - "integrity": "sha512-lUfHmO+x3goSL1KnlAbekieKpak2KVGcOcAzOVOIMFt1SyWPBHq0NyyPOH2PUAnjPRbvCLEs2casjFggk0JzsQ==", + "version": "16.2.11", + "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-16.2.11.tgz", + "integrity": "sha512-e+A7z6MUJaqC4Fdq7XQfIhAox3ZPM1lczM6G08fUKPbFDEe+c9i7C8YRLL+69BXDuG790btugIeOQcn5lnJcFg==", "dependencies": { "tslib": "^2.3.0" }, "engines": { - "node": "^14.20.0 || ^16.13.0 || >=18.10.0" + "node": "^16.14.0 || >=18.10.0" }, "peerDependencies": { - "@angular/common": "15.1.3", - "@angular/compiler": "15.1.3", - "@angular/core": "15.1.3", - "@angular/platform-browser": "15.1.3" + "@angular/common": "16.2.11", + "@angular/compiler": "16.2.11", + "@angular/core": "16.2.11", + "@angular/platform-browser": "16.2.11" } }, "node_modules/@angular/router": { - "version": "15.1.3", - "resolved": "https://registry.npmjs.org/@angular/router/-/router-15.1.3.tgz", - "integrity": "sha512-GxvGZO0N7LIoaTV2EZ082kqb9asJl2rWe0kNsUQwu9IQAODOCCTQu2USg63J6hEOcKPJSZzbxdXLaxlpqKeC4A==", + "version": "16.2.11", + "resolved": "https://registry.npmjs.org/@angular/router/-/router-16.2.11.tgz", + "integrity": "sha512-QTssqJue+xQ8M1gzmfJcIHPIpPOijVwGnXQjt7cnFggNe/CedOckLEzk2j7/6aC1b5aQKuZePPw6XMvk8ciilQ==", "dependencies": { "tslib": "^2.3.0" }, "engines": { - "node": "^14.20.0 || ^16.13.0 || >=18.10.0" + "node": "^16.14.0 || >=18.10.0" }, "peerDependencies": { - "@angular/common": "15.1.3", - "@angular/core": "15.1.3", - "@angular/platform-browser": "15.1.3", + "@angular/common": "16.2.11", + "@angular/core": "16.2.11", + "@angular/platform-browser": "16.2.11", "rxjs": "^6.5.3 || ^7.4.0" } }, @@ -1142,47 +774,48 @@ "dev": true }, "node_modules/@babel/code-frame": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz", - "integrity": "sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==", + "version": "7.22.13", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz", + "integrity": "sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==", "dev": true, "dependencies": { - "@babel/highlight": "^7.18.6" + "@babel/highlight": "^7.22.13", + "chalk": "^2.4.2" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/compat-data": { - "version": "7.20.10", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.20.10.tgz", - "integrity": "sha512-sEnuDPpOJR/fcafHMjpcpGN5M2jbUGUHwmuWKM/YdPzeEDJg8bgmbcWQFUfE32MQjti1koACvoPVsDe8Uq+idg==", + "version": "7.23.2", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.23.2.tgz", + "integrity": "sha512-0S9TQMmDHlqAZ2ITT95irXKfxN9bncq8ZCoJhun3nHL/lLUxd2NKBJYoNGWH7S0hz6fRQwWlAWn/ILM0C70KZQ==", "dev": true, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/core": { - "version": "7.19.3", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.19.3.tgz", - "integrity": "sha512-WneDJxdsjEvyKtXKsaBGbDeiyOjR5vYq4HcShxnIbG0qixpoHjI3MqeZM9NDvsojNCEBItQE4juOo/bU6e72gQ==", - "dev": true, - "dependencies": { - "@ampproject/remapping": "^2.1.0", - "@babel/code-frame": "^7.18.6", - "@babel/generator": "^7.19.3", - "@babel/helper-compilation-targets": "^7.19.3", - "@babel/helper-module-transforms": "^7.19.0", - "@babel/helpers": "^7.19.0", - "@babel/parser": "^7.19.3", - "@babel/template": "^7.18.10", - "@babel/traverse": "^7.19.3", - "@babel/types": "^7.19.3", + "version": "7.22.9", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.9.tgz", + "integrity": "sha512-G2EgeufBcYw27U4hhoIwFcgc1XU7TlXJ3mv04oOv1WCuo900U/anZSPzEqNjwdjgffkk2Gs0AN0dW1CKVLcG7w==", + "dev": true, + "dependencies": { + "@ampproject/remapping": "^2.2.0", + "@babel/code-frame": "^7.22.5", + "@babel/generator": "^7.22.9", + "@babel/helper-compilation-targets": "^7.22.9", + "@babel/helper-module-transforms": "^7.22.9", + "@babel/helpers": "^7.22.6", + "@babel/parser": "^7.22.7", + "@babel/template": "^7.22.5", + "@babel/traverse": "^7.22.8", + "@babel/types": "^7.22.5", "convert-source-map": "^1.7.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", - "json5": "^2.2.1", - "semver": "^6.3.0" + "json5": "^2.2.2", + "semver": "^6.3.1" }, "engines": { "node": ">=6.9.0" @@ -1193,124 +826,93 @@ } }, "node_modules/@babel/core/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, "bin": { "semver": "bin/semver.js" } }, "node_modules/@babel/generator": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.20.7.tgz", - "integrity": "sha512-7wqMOJq8doJMZmP4ApXTzLxSr7+oO2jroJURrVEp6XShrQUObV8Tq/D0NCcoYg2uHqUrjzO0zwBjoYzelxK+sw==", + "version": "7.22.9", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.9.tgz", + "integrity": "sha512-KtLMbmicyuK2Ak/FTCJVbDnkN1SlT8/kceFTiuDiiRUUSMnHMidxSCdG4ndkTOHHpoomWe/4xkvHkEOncwjYIw==", "dev": true, "dependencies": { - "@babel/types": "^7.20.7", + "@babel/types": "^7.22.5", "@jridgewell/gen-mapping": "^0.3.2", + "@jridgewell/trace-mapping": "^0.3.17", "jsesc": "^2.5.1" }, "engines": { "node": ">=6.9.0" } }, - "node_modules/@babel/generator/node_modules/@jridgewell/gen-mapping": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz", - "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==", - "dev": true, - "dependencies": { - "@jridgewell/set-array": "^1.0.1", - "@jridgewell/sourcemap-codec": "^1.4.10", - "@jridgewell/trace-mapping": "^0.3.9" - }, - "engines": { - "node": ">=6.0.0" - } - }, "node_modules/@babel/helper-annotate-as-pure": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz", - "integrity": "sha512-duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz", + "integrity": "sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==", "dev": true, "dependencies": { - "@babel/types": "^7.18.6" + "@babel/types": "^7.22.5" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-builder-binary-assignment-operator-visitor": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.18.9.tgz", - "integrity": "sha512-yFQ0YCHoIqarl8BCRwBL8ulYUaZpz3bNsA7oFepAzee+8/+ImtADXNOmO5vJvsPff3qi+hvpkY/NYBTrBQgdNw==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.15.tgz", + "integrity": "sha512-QkBXwGgaoC2GtGZRoma6kv7Szfv06khvhFav67ZExau2RaXzy8MpHSMO2PNoP2XtmQphJQRHFfg77Bq731Yizw==", "dev": true, "dependencies": { - "@babel/helper-explode-assignable-expression": "^7.18.6", - "@babel/types": "^7.18.9" + "@babel/types": "^7.22.15" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-compilation-targets": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.7.tgz", - "integrity": "sha512-4tGORmfQcrc+bvrjb5y3dG9Mx1IOZjsHqQVUz7XCNHO+iTmqxWnVg3KRygjGmpRLJGdQSKuvFinbIb0CnZwHAQ==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.15.tgz", + "integrity": "sha512-y6EEzULok0Qvz8yyLkCvVX+02ic+By2UdOhylwUOvOn9dvYc9mKICJuuU1n1XBI02YWsNsnrY1kc6DVbjcXbtw==", "dev": true, "dependencies": { - "@babel/compat-data": "^7.20.5", - "@babel/helper-validator-option": "^7.18.6", - "browserslist": "^4.21.3", + "@babel/compat-data": "^7.22.9", + "@babel/helper-validator-option": "^7.22.15", + "browserslist": "^4.21.9", "lru-cache": "^5.1.1", - "semver": "^6.3.0" + "semver": "^6.3.1" }, "engines": { "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0" - } - }, - "node_modules/@babel/helper-compilation-targets/node_modules/lru-cache": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", - "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", - "dev": true, - "dependencies": { - "yallist": "^3.0.2" } }, "node_modules/@babel/helper-compilation-targets/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, "bin": { "semver": "bin/semver.js" } }, - "node_modules/@babel/helper-compilation-targets/node_modules/yallist": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", - "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", - "dev": true - }, "node_modules/@babel/helper-create-class-features-plugin": { - "version": "7.20.12", - "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.20.12.tgz", - "integrity": "sha512-9OunRkbT0JQcednL0UFvbfXpAsUXiGjUk0a7sN8fUXX7Mue79cUSMjHGDRRi/Vz9vYlpIhLV5fMD5dKoMhhsNQ==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.15.tgz", + "integrity": "sha512-jKkwA59IXcvSaiK2UN45kKwSC9o+KuoXsBDvHvU/7BecYIp8GQ2UwrVvFgJASUT+hBnwJx6MhvMCuMzwZZ7jlg==", "dev": true, "dependencies": { - "@babel/helper-annotate-as-pure": "^7.18.6", - "@babel/helper-environment-visitor": "^7.18.9", - "@babel/helper-function-name": "^7.19.0", - "@babel/helper-member-expression-to-functions": "^7.20.7", - "@babel/helper-optimise-call-expression": "^7.18.6", - "@babel/helper-replace-supers": "^7.20.7", - "@babel/helper-skip-transparent-expression-wrappers": "^7.20.0", - "@babel/helper-split-export-declaration": "^7.18.6" + "@babel/helper-annotate-as-pure": "^7.22.5", + "@babel/helper-environment-visitor": "^7.22.5", + "@babel/helper-function-name": "^7.22.5", + "@babel/helper-member-expression-to-functions": "^7.22.15", + "@babel/helper-optimise-call-expression": "^7.22.5", + "@babel/helper-replace-supers": "^7.22.9", + "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5", + "@babel/helper-split-export-declaration": "^7.22.6", + "semver": "^6.3.1" }, "engines": { "node": ">=6.9.0" @@ -1319,14 +921,24 @@ "@babel/core": "^7.0.0" } }, + "node_modules/@babel/helper-create-class-features-plugin/node_modules/semver": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "dev": true, + "bin": { + "semver": "bin/semver.js" + } + }, "node_modules/@babel/helper-create-regexp-features-plugin": { - "version": "7.20.5", - "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.20.5.tgz", - "integrity": "sha512-m68B1lkg3XDGX5yCvGO0kPx3v9WIYLnzjKfPcQiwntEQa5ZeRkPmo2X/ISJc8qxWGfwUr+kvZAeEzAwLec2r2w==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.15.tgz", + "integrity": "sha512-29FkPLFjn4TPEa3RE7GpW+qbE8tlsu3jntNYNfcGsc49LphF1PQIiD+vMZ1z1xVOKt+93khA9tc2JBs3kBjA7w==", "dev": true, "dependencies": { - "@babel/helper-annotate-as-pure": "^7.18.6", - "regexpu-core": "^5.2.1" + "@babel/helper-annotate-as-pure": "^7.22.5", + "regexpu-core": "^5.3.1", + "semver": "^6.3.1" }, "engines": { "node": ">=6.9.0" @@ -1335,152 +947,152 @@ "@babel/core": "^7.0.0" } }, + "node_modules/@babel/helper-create-regexp-features-plugin/node_modules/semver": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "dev": true, + "bin": { + "semver": "bin/semver.js" + } + }, "node_modules/@babel/helper-define-polyfill-provider": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.3.tgz", - "integrity": "sha512-z5aQKU4IzbqCC1XH0nAqfsFLMVSo22SBKUc0BxGrLkolTdPTructy0ToNnlO2zA4j9Q/7pjMZf0DSY+DSTYzww==", + "version": "0.4.3", + "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.3.tgz", + "integrity": "sha512-WBrLmuPP47n7PNwsZ57pqam6G/RGo1vw/87b0Blc53tZNGZ4x7YvZ6HgQe2vo1W/FR20OgjeZuGXzudPiXHFug==", "dev": true, "dependencies": { - "@babel/helper-compilation-targets": "^7.17.7", - "@babel/helper-plugin-utils": "^7.16.7", + "@babel/helper-compilation-targets": "^7.22.6", + "@babel/helper-plugin-utils": "^7.22.5", "debug": "^4.1.1", "lodash.debounce": "^4.0.8", - "resolve": "^1.14.2", - "semver": "^6.1.2" + "resolve": "^1.14.2" }, "peerDependencies": { - "@babel/core": "^7.4.0-0" - } - }, - "node_modules/@babel/helper-define-polyfill-provider/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true, - "bin": { - "semver": "bin/semver.js" + "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0" } }, "node_modules/@babel/helper-environment-visitor": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz", - "integrity": "sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==", + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz", + "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==", "dev": true, "engines": { "node": ">=6.9.0" } }, - "node_modules/@babel/helper-explode-assignable-expression": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.18.6.tgz", - "integrity": "sha512-eyAYAsQmB80jNfg4baAtLeWAQHfHFiR483rzFK+BhETlGZaQC9bsfrugfXDCbRHLQbIA7U5NxhhOxN7p/dWIcg==", + "node_modules/@babel/helper-function-name": { + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz", + "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==", "dev": true, "dependencies": { - "@babel/types": "^7.18.6" + "@babel/template": "^7.22.15", + "@babel/types": "^7.23.0" }, "engines": { "node": ">=6.9.0" } }, - "node_modules/@babel/helper-function-name": { - "version": "7.19.0", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz", - "integrity": "sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==", + "node_modules/@babel/helper-function-name/node_modules/@babel/template": { + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz", + "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==", "dev": true, "dependencies": { - "@babel/template": "^7.18.10", - "@babel/types": "^7.19.0" + "@babel/code-frame": "^7.22.13", + "@babel/parser": "^7.22.15", + "@babel/types": "^7.22.15" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-hoist-variables": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz", - "integrity": "sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz", + "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==", "dev": true, "dependencies": { - "@babel/types": "^7.18.6" + "@babel/types": "^7.22.5" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-member-expression-to-functions": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.20.7.tgz", - "integrity": "sha512-9J0CxJLq315fEdi4s7xK5TQaNYjZw+nDVpVqr1axNGKzdrdwYBD5b4uKv3n75aABG0rCCTK8Im8Ww7eYfMrZgw==", + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.23.0.tgz", + "integrity": "sha512-6gfrPwh7OuT6gZyJZvd6WbTfrqAo7vm4xCzAXOusKqq/vWdKXphTpj5klHKNmRUU6/QRGlBsyU9mAIPaWHlqJA==", "dev": true, "dependencies": { - "@babel/types": "^7.20.7" + "@babel/types": "^7.23.0" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-module-imports": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz", - "integrity": "sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz", + "integrity": "sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==", "dev": true, "dependencies": { - "@babel/types": "^7.18.6" + "@babel/types": "^7.22.15" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-module-transforms": { - "version": "7.20.11", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.20.11.tgz", - "integrity": "sha512-uRy78kN4psmji1s2QtbtcCSaj/LILFDp0f/ymhpQH5QY3nljUZCaNWz9X1dEj/8MBdBEFECs7yRhKn8i7NjZgg==", + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.23.0.tgz", + "integrity": "sha512-WhDWw1tdrlT0gMgUJSlX0IQvoO1eN279zrAUbVB+KpV2c3Tylz8+GnKOLllCS6Z/iZQEyVYxhZVUdPTqs2YYPw==", "dev": true, "dependencies": { - "@babel/helper-environment-visitor": "^7.18.9", - "@babel/helper-module-imports": "^7.18.6", - "@babel/helper-simple-access": "^7.20.2", - "@babel/helper-split-export-declaration": "^7.18.6", - "@babel/helper-validator-identifier": "^7.19.1", - "@babel/template": "^7.20.7", - "@babel/traverse": "^7.20.10", - "@babel/types": "^7.20.7" + "@babel/helper-environment-visitor": "^7.22.20", + "@babel/helper-module-imports": "^7.22.15", + "@babel/helper-simple-access": "^7.22.5", + "@babel/helper-split-export-declaration": "^7.22.6", + "@babel/helper-validator-identifier": "^7.22.20" }, "engines": { "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0" } }, "node_modules/@babel/helper-optimise-call-expression": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.18.6.tgz", - "integrity": "sha512-HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.22.5.tgz", + "integrity": "sha512-HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw==", "dev": true, "dependencies": { - "@babel/types": "^7.18.6" + "@babel/types": "^7.22.5" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-plugin-utils": { - "version": "7.20.2", - "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz", - "integrity": "sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz", + "integrity": "sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==", "dev": true, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-remap-async-to-generator": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.18.9.tgz", - "integrity": "sha512-dI7q50YKd8BAv3VEfgg7PS7yD3Rtbi2J1XMXaalXO0W0164hYLnh8zpjRS0mte9MfVp/tltvr/cfdXPvJr1opA==", + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.20.tgz", + "integrity": "sha512-pBGyV4uBqOns+0UvhsTO8qgl8hO89PmiDYv+/COyp1aeMcmfrfruz+/nCMFiYyFF/Knn0yfrC85ZzNFjembFTw==", "dev": true, "dependencies": { - "@babel/helper-annotate-as-pure": "^7.18.6", - "@babel/helper-environment-visitor": "^7.18.9", - "@babel/helper-wrap-function": "^7.18.9", - "@babel/types": "^7.18.9" + "@babel/helper-annotate-as-pure": "^7.22.5", + "@babel/helper-environment-visitor": "^7.22.20", + "@babel/helper-wrap-function": "^7.22.20" }, "engines": { "node": ">=6.9.0" @@ -1490,122 +1102,149 @@ } }, "node_modules/@babel/helper-replace-supers": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.20.7.tgz", - "integrity": "sha512-vujDMtB6LVfNW13jhlCrp48QNslK6JXi7lQG736HVbHz/mbf4Dc7tIRh1Xf5C0rF7BP8iiSxGMCmY6Ci1ven3A==", + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.22.20.tgz", + "integrity": "sha512-qsW0In3dbwQUbK8kejJ4R7IHVGwHJlV6lpG6UA7a9hSa2YEiAib+N1T2kr6PEeUT+Fl7najmSOS6SmAwCHK6Tw==", "dev": true, "dependencies": { - "@babel/helper-environment-visitor": "^7.18.9", - "@babel/helper-member-expression-to-functions": "^7.20.7", - "@babel/helper-optimise-call-expression": "^7.18.6", - "@babel/template": "^7.20.7", - "@babel/traverse": "^7.20.7", - "@babel/types": "^7.20.7" + "@babel/helper-environment-visitor": "^7.22.20", + "@babel/helper-member-expression-to-functions": "^7.22.15", + "@babel/helper-optimise-call-expression": "^7.22.5" }, "engines": { "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0" } }, "node_modules/@babel/helper-simple-access": { - "version": "7.20.2", - "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz", - "integrity": "sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz", + "integrity": "sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==", "dev": true, "dependencies": { - "@babel/types": "^7.20.2" + "@babel/types": "^7.22.5" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-skip-transparent-expression-wrappers": { - "version": "7.20.0", - "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.20.0.tgz", - "integrity": "sha512-5y1JYeNKfvnT8sZcK9DVRtpTbGiomYIHviSP3OQWmDPU3DeH4a1ZlT/N2lyQ5P8egjcRaT/Y9aNqUxK0WsnIIg==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.22.5.tgz", + "integrity": "sha512-tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q==", "dev": true, "dependencies": { - "@babel/types": "^7.20.0" + "@babel/types": "^7.22.5" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-split-export-declaration": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz", - "integrity": "sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==", + "version": "7.22.6", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz", + "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==", "dev": true, "dependencies": { - "@babel/types": "^7.18.6" + "@babel/types": "^7.22.5" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-string-parser": { - "version": "7.19.4", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz", - "integrity": "sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz", + "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==", "dev": true, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-validator-identifier": { - "version": "7.19.1", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz", - "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==", + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz", + "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==", "dev": true, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-validator-option": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz", - "integrity": "sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.22.15.tgz", + "integrity": "sha512-bMn7RmyFjY/mdECUbgn9eoSY4vqvacUnS9i9vGAGttgFWesO6B4CYWA7XlpbWgBt71iv/hfbPlynohStqnu5hA==", "dev": true, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-wrap-function": { - "version": "7.20.5", - "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.20.5.tgz", - "integrity": "sha512-bYMxIWK5mh+TgXGVqAtnu5Yn1un+v8DDZtqyzKRLUzrh70Eal2O3aZ7aPYiMADO4uKlkzOiRiZ6GX5q3qxvW9Q==", + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.22.20.tgz", + "integrity": "sha512-pms/UwkOpnQe/PDAEdV/d7dVCoBbB+R4FvYoHGZz+4VPcg7RtYy2KP7S2lbuWM6FCSgob5wshfGESbC/hzNXZw==", + "dev": true, + "dependencies": { + "@babel/helper-function-name": "^7.22.5", + "@babel/template": "^7.22.15", + "@babel/types": "^7.22.19" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-wrap-function/node_modules/@babel/template": { + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz", + "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==", "dev": true, "dependencies": { - "@babel/helper-function-name": "^7.19.0", - "@babel/template": "^7.18.10", - "@babel/traverse": "^7.20.5", - "@babel/types": "^7.20.5" + "@babel/code-frame": "^7.22.13", + "@babel/parser": "^7.22.15", + "@babel/types": "^7.22.15" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helpers": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.20.7.tgz", - "integrity": "sha512-PBPjs5BppzsGaxHQCDKnZ6Gd9s6xl8bBCluz3vEInLGRJmnZan4F6BYCeqtyXqkk4W5IlPmjK4JlOuZkpJ3xZA==", + "version": "7.23.2", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.2.tgz", + "integrity": "sha512-lzchcp8SjTSVe/fPmLwtWVBFC7+Tbn8LGHDVfDp9JGxpAY5opSaEFgt8UQvrnECWOTdji2mOWMz1rOhkHscmGQ==", "dev": true, "dependencies": { - "@babel/template": "^7.20.7", - "@babel/traverse": "^7.20.7", - "@babel/types": "^7.20.7" + "@babel/template": "^7.22.15", + "@babel/traverse": "^7.23.2", + "@babel/types": "^7.23.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helpers/node_modules/@babel/template": { + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz", + "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==", + "dev": true, + "dependencies": { + "@babel/code-frame": "^7.22.13", + "@babel/parser": "^7.22.15", + "@babel/types": "^7.22.15" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/highlight": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz", - "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==", + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.20.tgz", + "integrity": "sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==", "dev": true, "dependencies": { - "@babel/helper-validator-identifier": "^7.18.6", - "chalk": "^2.0.0", + "@babel/helper-validator-identifier": "^7.22.20", + "chalk": "^2.4.2", "js-tokens": "^4.0.0" }, "engines": { @@ -1613,9 +1252,9 @@ } }, "node_modules/@babel/parser": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.20.7.tgz", - "integrity": "sha512-T3Z9oHybU+0vZlY9CiDSJQTD5ZapcW18ZctFMi0MOAl/4BjFF4ul7NVSARLdbGO5vDqy9eQiGTV0LtKfvCYvcg==", + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.0.tgz", + "integrity": "sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==", "dev": true, "bin": { "parser": "bin/babel-parser.js" @@ -1625,12 +1264,12 @@ } }, "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6.tgz", - "integrity": "sha512-Dgxsyg54Fx1d4Nge8UnvTrED63vrwOdPmyvPzlNN/boaliRP54pm3pGzZD1SJUwrBA+Cs/xdG8kXX6Mn/RfISQ==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.22.15.tgz", + "integrity": "sha512-FB9iYlz7rURmRJyXRKEnalYPPdn87H5no108cyuQQyMwlpJ2SJtpIUBI27kdTin956pz+LPypkPVPUTlxOmrsg==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.18.6" + "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { "node": ">=6.9.0" @@ -1640,14 +1279,14 @@ } }, "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.20.7.tgz", - "integrity": "sha512-sbr9+wNE5aXMBBFBICk01tt7sBf2Oc9ikRFEcem/ZORup9IMUdNhW7/wVLEbbtlWOsEubJet46mHAL2C8+2jKQ==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.22.15.tgz", + "integrity": "sha512-Hyph9LseGvAeeXzikV88bczhsrLrIZqDPxO+sSmAunMPaGrBGhfMWzCPYTtiW9t+HzSE2wtV8e5cc5P6r1xMDQ==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.20.2", - "@babel/helper-skip-transparent-expression-wrappers": "^7.20.0", - "@babel/plugin-proposal-optional-chaining": "^7.20.7" + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5", + "@babel/plugin-transform-optional-chaining": "^7.22.15" }, "engines": { "node": ">=6.9.0" @@ -1660,6 +1299,7 @@ "version": "7.20.7", "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.20.7.tgz", "integrity": "sha512-xMbiLsn/8RK7Wq7VeVytytS2L6qE69bXPB10YCmMdDZbKF4okCqY74pI/jJQ/8U0b/F6NrT2+14b8/P9/3AMGA==", + "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-async-generator-functions instead.", "dev": true, "dependencies": { "@babel/helper-environment-visitor": "^7.18.9", @@ -1674,214 +1314,11 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-proposal-class-properties": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz", - "integrity": "sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==", - "dev": true, - "dependencies": { - "@babel/helper-create-class-features-plugin": "^7.18.6", - "@babel/helper-plugin-utils": "^7.18.6" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-proposal-class-static-block": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.20.7.tgz", - "integrity": "sha512-AveGOoi9DAjUYYuUAG//Ig69GlazLnoyzMw68VCDux+c1tsnnH/OkYcpz/5xzMkEFC6UxjR5Gw1c+iY2wOGVeQ==", - "dev": true, - "dependencies": { - "@babel/helper-create-class-features-plugin": "^7.20.7", - "@babel/helper-plugin-utils": "^7.20.2", - "@babel/plugin-syntax-class-static-block": "^7.14.5" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.12.0" - } - }, - "node_modules/@babel/plugin-proposal-dynamic-import": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.18.6.tgz", - "integrity": "sha512-1auuwmK+Rz13SJj36R+jqFPMJWyKEDd7lLSdOj4oJK0UTgGueSAtkrCvz9ewmgyU/P941Rv2fQwZJN8s6QruXw==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.18.6", - "@babel/plugin-syntax-dynamic-import": "^7.8.3" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-proposal-export-namespace-from": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.18.9.tgz", - "integrity": "sha512-k1NtHyOMvlDDFeb9G5PhUXuGj8m/wiwojgQVEhJ/fsVsMCpLyOP4h0uGEjYJKrRI+EVPlb5Jk+Gt9P97lOGwtA==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.18.9", - "@babel/plugin-syntax-export-namespace-from": "^7.8.3" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-proposal-json-strings": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.18.6.tgz", - "integrity": "sha512-lr1peyn9kOdbYc0xr0OdHTZ5FMqS6Di+H0Fz2I/JwMzGmzJETNeOFq2pBySw6X/KFL5EWDjlJuMsUGRFb8fQgQ==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.18.6", - "@babel/plugin-syntax-json-strings": "^7.8.3" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-proposal-logical-assignment-operators": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.20.7.tgz", - "integrity": "sha512-y7C7cZgpMIjWlKE5T7eJwp+tnRYM89HmRvWM5EQuB5BoHEONjmQ8lSNmBUwOyy/GFRsohJED51YBF79hE1djug==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.20.2", - "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-proposal-nullish-coalescing-operator": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz", - "integrity": "sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.18.6", - "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-proposal-numeric-separator": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz", - "integrity": "sha512-ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.18.6", - "@babel/plugin-syntax-numeric-separator": "^7.10.4" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-proposal-object-rest-spread": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.20.7.tgz", - "integrity": "sha512-d2S98yCiLxDVmBmE8UjGcfPvNEUbA1U5q5WxaWFUGRzJSVAZqm5W6MbPct0jxnegUZ0niLeNX+IOzEs7wYg9Dg==", - "dev": true, - "dependencies": { - "@babel/compat-data": "^7.20.5", - "@babel/helper-compilation-targets": "^7.20.7", - "@babel/helper-plugin-utils": "^7.20.2", - "@babel/plugin-syntax-object-rest-spread": "^7.8.3", - "@babel/plugin-transform-parameters": "^7.20.7" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-proposal-optional-catch-binding": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.18.6.tgz", - "integrity": "sha512-Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.18.6", - "@babel/plugin-syntax-optional-catch-binding": "^7.8.3" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-proposal-optional-chaining": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.20.7.tgz", - "integrity": "sha512-T+A7b1kfjtRM51ssoOfS1+wbyCVqorfyZhT99TvxxLMirPShD8CzKMRepMlCBGM5RpHMbn8s+5MMHnPstJH6mQ==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.20.2", - "@babel/helper-skip-transparent-expression-wrappers": "^7.20.0", - "@babel/plugin-syntax-optional-chaining": "^7.8.3" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-proposal-private-methods": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz", - "integrity": "sha512-nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA==", - "dev": true, - "dependencies": { - "@babel/helper-create-class-features-plugin": "^7.18.6", - "@babel/helper-plugin-utils": "^7.18.6" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, "node_modules/@babel/plugin-proposal-private-property-in-object": { - "version": "7.20.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.20.5.tgz", - "integrity": "sha512-Vq7b9dUA12ByzB4EjQTPo25sFhY+08pQDBSZRtUAkj7lb7jahaHR5igera16QZ+3my1nYR4dKsNdYj5IjPHilQ==", + "version": "7.21.0-placeholder-for-preset-env.2", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz", + "integrity": "sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==", "dev": true, - "dependencies": { - "@babel/helper-annotate-as-pure": "^7.18.6", - "@babel/helper-create-class-features-plugin": "^7.20.5", - "@babel/helper-plugin-utils": "^7.20.2", - "@babel/plugin-syntax-private-property-in-object": "^7.14.5" - }, "engines": { "node": ">=6.9.0" }, @@ -1893,6 +1330,7 @@ "version": "7.18.6", "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz", "integrity": "sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w==", + "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-unicode-property-regex instead.", "dev": true, "dependencies": { "@babel/helper-create-regexp-features-plugin": "^7.18.6", @@ -1981,12 +1419,27 @@ } }, "node_modules/@babel/plugin-syntax-import-assertions": { - "version": "7.20.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.20.0.tgz", - "integrity": "sha512-IUh1vakzNoWalR8ch/areW7qFopR2AEw03JlG7BbrDqmQ4X3q9uuipQwSGrUn7oGiemKjtSLDhNtQHzMHr1JdQ==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.22.5.tgz", + "integrity": "sha512-rdV97N7KqsRzeNGoWUOK6yUsWarLjE5Su/Snk9IYPU9CwkWHs4t+rTGOvffTR8XGkJMTAdLfO0xVnXm8wugIJg==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-import-attributes": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.22.5.tgz", + "integrity": "sha512-KwvoWDeNKPETmozyFE0P2rOLqh39EoQHNjqizrI5B8Vt0ZNS7M56s7dAiAqbYfiAYOuIzIh96z3iR2ktgu3tEg==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.19.0" + "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { "node": ">=6.9.0" @@ -2019,6 +1472,21 @@ "@babel/core": "^7.0.0-0" } }, + "node_modules/@babel/plugin-syntax-jsx": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.22.5.tgz", + "integrity": "sha512-gvyP4hZrgrs/wWMaocvxZ44Hw0b3W8Pe+cMxc8V1ULQ07oh8VNbIRaoD1LRZVTvD+0nieDKjfgKg89sD7rrKrg==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, "node_modules/@babel/plugin-syntax-logical-assignment-operators": { "version": "7.10.4", "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz", @@ -2122,12 +1590,12 @@ } }, "node_modules/@babel/plugin-syntax-typescript": { - "version": "7.20.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.20.0.tgz", - "integrity": "sha512-rd9TkG+u1CExzS4SM1BlMEhMXwFLKVjOAFFCDx9PbX5ycJWDoWMcwdJH9RhkPu1dOgn5TrxLot/Gx6lWFuAUNQ==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.22.5.tgz", + "integrity": "sha512-1mS2o03i7t1c6VzH6fdQ3OA8tcEIxwG18zIPRp+UY1Ihv6W+XZzBCVxExF9upussPXJ0xE9XRHwMoNs1ep/nRQ==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.19.0" + "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { "node": ">=6.9.0" @@ -2136,30 +1604,29 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-transform-arrow-functions": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.20.7.tgz", - "integrity": "sha512-3poA5E7dzDomxj9WXWwuD6A5F3kc7VXwIJO+E+J8qtDtS+pXPAhrgEyh+9GBwBgPq1Z+bB+/JD60lp5jsN7JPQ==", + "node_modules/@babel/plugin-syntax-unicode-sets-regex": { + "version": "7.18.6", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-unicode-sets-regex/-/plugin-syntax-unicode-sets-regex-7.18.6.tgz", + "integrity": "sha512-727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.20.2" + "@babel/helper-create-regexp-features-plugin": "^7.18.6", + "@babel/helper-plugin-utils": "^7.18.6" }, "engines": { "node": ">=6.9.0" }, "peerDependencies": { - "@babel/core": "^7.0.0-0" + "@babel/core": "^7.0.0" } }, - "node_modules/@babel/plugin-transform-async-to-generator": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.20.7.tgz", - "integrity": "sha512-Uo5gwHPT9vgnSXQxqGtpdufUiWp96gk7yiP4Mp5bm1QMkEmLXBO7PAGYbKoJ6DhAwiNkcHFBol/x5zZZkL/t0Q==", + "node_modules/@babel/plugin-transform-arrow-functions": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.22.5.tgz", + "integrity": "sha512-26lTNXoVRdAnsaDXPpvCNUq+OVWEVC6bx7Vvz9rC53F2bagUWW4u4ii2+h8Fejfh7RYqPxn+libeFBBck9muEw==", "dev": true, "dependencies": { - "@babel/helper-module-imports": "^7.18.6", - "@babel/helper-plugin-utils": "^7.20.2", - "@babel/helper-remap-async-to-generator": "^7.18.9" + "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { "node": ">=6.9.0" @@ -2168,13 +1635,16 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-transform-block-scoped-functions": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.18.6.tgz", - "integrity": "sha512-ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ==", + "node_modules/@babel/plugin-transform-async-generator-functions": { + "version": "7.23.2", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.23.2.tgz", + "integrity": "sha512-BBYVGxbDVHfoeXbOwcagAkOQAm9NxoTdMGfTqghu1GrvadSaw6iW3Je6IcL5PNOw8VwjxqBECXy50/iCQSY/lQ==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.18.6" + "@babel/helper-environment-visitor": "^7.22.20", + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/helper-remap-async-to-generator": "^7.22.20", + "@babel/plugin-syntax-async-generators": "^7.8.4" }, "engines": { "node": ">=6.9.0" @@ -2183,13 +1653,15 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-transform-block-scoping": { - "version": "7.20.11", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.20.11.tgz", - "integrity": "sha512-tA4N427a7fjf1P0/2I4ScsHGc5jcHPbb30xMbaTke2gxDuWpUfXDuX1FEymJwKk4tuGUvGcejAR6HdZVqmmPyw==", + "node_modules/@babel/plugin-transform-async-to-generator": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.22.5.tgz", + "integrity": "sha512-b1A8D8ZzE/VhNDoV1MSJTnpKkCG5bJo+19R4o4oy03zM7ws8yEMK755j61Dc3EyvdysbqH5BOOTquJ7ZX9C6vQ==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.20.2" + "@babel/helper-module-imports": "^7.22.5", + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/helper-remap-async-to-generator": "^7.22.5" }, "engines": { "node": ">=6.9.0" @@ -2198,21 +1670,13 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-transform-classes": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.20.7.tgz", - "integrity": "sha512-LWYbsiXTPKl+oBlXUGlwNlJZetXD5Am+CyBdqhPsDVjM9Jc8jwBJFrKhHf900Kfk2eZG1y9MAG3UNajol7A4VQ==", + "node_modules/@babel/plugin-transform-block-scoped-functions": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.22.5.tgz", + "integrity": "sha512-tdXZ2UdknEKQWKJP1KMNmuF5Lx3MymtMN/pvA+p/VEkhK8jVcQ1fzSy8KM9qRYhAf2/lV33hoMPKI/xaI9sADA==", "dev": true, "dependencies": { - "@babel/helper-annotate-as-pure": "^7.18.6", - "@babel/helper-compilation-targets": "^7.20.7", - "@babel/helper-environment-visitor": "^7.18.9", - "@babel/helper-function-name": "^7.19.0", - "@babel/helper-optimise-call-expression": "^7.18.6", - "@babel/helper-plugin-utils": "^7.20.2", - "@babel/helper-replace-supers": "^7.20.7", - "@babel/helper-split-export-declaration": "^7.18.6", - "globals": "^11.1.0" + "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { "node": ">=6.9.0" @@ -2221,14 +1685,13 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-transform-computed-properties": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.20.7.tgz", - "integrity": "sha512-Lz7MvBK6DTjElHAmfu6bfANzKcxpyNPeYBGEafyA6E5HtRpjpZwU+u7Qrgz/2OR0z+5TvKYbPdphfSaAcZBrYQ==", + "node_modules/@babel/plugin-transform-block-scoping": { + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.23.0.tgz", + "integrity": "sha512-cOsrbmIOXmf+5YbL99/S49Y3j46k/T16b9ml8bm9lP6N9US5iQ2yBK7gpui1pg0V/WMcXdkfKbTb7HXq9u+v4g==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.20.2", - "@babel/template": "^7.20.7" + "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { "node": ">=6.9.0" @@ -2237,13 +1700,14 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-transform-destructuring": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.20.7.tgz", - "integrity": "sha512-Xwg403sRrZb81IVB79ZPqNQME23yhugYVqgTxAhT99h485F4f+GMELFhhOsscDUB7HCswepKeCKLn/GZvUKoBA==", + "node_modules/@babel/plugin-transform-class-properties": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.22.5.tgz", + "integrity": "sha512-nDkQ0NfkOhPTq8YCLiWNxp1+f9fCobEjCb0n8WdbNUBc4IB5V7P1QnX9IjpSoquKrXF5SKojHleVNs2vGeHCHQ==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.20.2" + "@babel/helper-create-class-features-plugin": "^7.22.5", + "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { "node": ">=6.9.0" @@ -2252,29 +1716,38 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-transform-dotall-regex": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.18.6.tgz", - "integrity": "sha512-6S3jpun1eEbAxq7TdjLotAsl4WpQI9DxfkycRcKrjhQYzU87qpXdknpBg/e+TdcMehqGnLFi7tnFUBR02Vq6wg==", + "node_modules/@babel/plugin-transform-class-static-block": { + "version": "7.22.11", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.22.11.tgz", + "integrity": "sha512-GMM8gGmqI7guS/llMFk1bJDkKfn3v3C4KHK9Yg1ey5qcHcOlKb0QvcMrgzvxo+T03/4szNh5lghY+fEC98Kq9g==", "dev": true, "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.18.6", - "@babel/helper-plugin-utils": "^7.18.6" + "@babel/helper-create-class-features-plugin": "^7.22.11", + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/plugin-syntax-class-static-block": "^7.14.5" }, "engines": { "node": ">=6.9.0" }, "peerDependencies": { - "@babel/core": "^7.0.0-0" + "@babel/core": "^7.12.0" } }, - "node_modules/@babel/plugin-transform-duplicate-keys": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.18.9.tgz", - "integrity": "sha512-d2bmXCtZXYc59/0SanQKbiWINadaJXqtvIQIzd4+hNwkWBgyCd5F/2t1kXoUdvPMrxzPvhK6EMQRROxsue+mfw==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.18.9" + "node_modules/@babel/plugin-transform-classes": { + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.22.15.tgz", + "integrity": "sha512-VbbC3PGjBdE0wAWDdHM9G8Gm977pnYI0XpqMd6LrKISj8/DJXEsWqgRuTYaNE9Bv0JGhTZUzHDlMk18IpOuoqw==", + "dev": true, + "dependencies": { + "@babel/helper-annotate-as-pure": "^7.22.5", + "@babel/helper-compilation-targets": "^7.22.15", + "@babel/helper-environment-visitor": "^7.22.5", + "@babel/helper-function-name": "^7.22.5", + "@babel/helper-optimise-call-expression": "^7.22.5", + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/helper-replace-supers": "^7.22.9", + "@babel/helper-split-export-declaration": "^7.22.6", + "globals": "^11.1.0" }, "engines": { "node": ">=6.9.0" @@ -2283,14 +1756,14 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-transform-exponentiation-operator": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.18.6.tgz", - "integrity": "sha512-wzEtc0+2c88FVR34aQmiz56dxEkxr2g8DQb/KfaFa1JYXOFVsbhvAonFN6PwVWj++fKmku8NP80plJ5Et4wqHw==", + "node_modules/@babel/plugin-transform-computed-properties": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.22.5.tgz", + "integrity": "sha512-4GHWBgRf0krxPX+AaPtgBAlTgTeZmqDynokHOX7aqqAB4tHs3U2Y02zH6ETFdLZGcg9UQSD1WCmkVrE9ErHeOg==", "dev": true, "dependencies": { - "@babel/helper-builder-binary-assignment-operator-visitor": "^7.18.6", - "@babel/helper-plugin-utils": "^7.18.6" + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/template": "^7.22.5" }, "engines": { "node": ">=6.9.0" @@ -2299,13 +1772,13 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-transform-for-of": { - "version": "7.18.8", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.18.8.tgz", - "integrity": "sha512-yEfTRnjuskWYo0k1mHUqrVWaZwrdq8AYbfrpqULOJOaucGSp4mNMVps+YtA8byoevxS/urwU75vyhQIxcCgiBQ==", + "node_modules/@babel/plugin-transform-destructuring": { + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.23.0.tgz", + "integrity": "sha512-vaMdgNXFkYrB+8lbgniSYWHsgqK5gjaMNcc84bMIOMRLH0L9AqYq3hwMdvnyqj1OPqea8UtjPEuS/DCenah1wg==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.18.6" + "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { "node": ">=6.9.0" @@ -2314,15 +1787,14 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-transform-function-name": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.18.9.tgz", - "integrity": "sha512-WvIBoRPaJQ5yVHzcnJFor7oS5Ls0PYixlTYE63lCj2RtdQEl15M68FXQlxnG6wdraJIXRdR7KI+hQ7q/9QjrCQ==", + "node_modules/@babel/plugin-transform-dotall-regex": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.22.5.tgz", + "integrity": "sha512-5/Yk9QxCQCl+sOIB1WelKnVRxTJDSAIxtJLL2/pqL14ZVlbH0fUQUZa/T5/UnQtBNgghR7mfB8ERBKyKPCi7Vw==", "dev": true, "dependencies": { - "@babel/helper-compilation-targets": "^7.18.9", - "@babel/helper-function-name": "^7.18.9", - "@babel/helper-plugin-utils": "^7.18.9" + "@babel/helper-create-regexp-features-plugin": "^7.22.5", + "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { "node": ">=6.9.0" @@ -2331,13 +1803,13 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-transform-literals": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.18.9.tgz", - "integrity": "sha512-IFQDSRoTPnrAIrI5zoZv73IFeZu2dhu6irxQjY9rNjTT53VmKg9fenjvoiOWOkJ6mm4jKVPtdMzBY98Fp4Z4cg==", + "node_modules/@babel/plugin-transform-duplicate-keys": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.22.5.tgz", + "integrity": "sha512-dEnYD+9BBgld5VBXHnF/DbYGp3fqGMsyxKbtD1mDyIA7AkTSpKXFhCVuj/oQVOoALfBs77DudA0BE4d5mcpmqw==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.18.9" + "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { "node": ">=6.9.0" @@ -2346,13 +1818,14 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-transform-member-expression-literals": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.18.6.tgz", - "integrity": "sha512-qSF1ihLGO3q+/g48k85tUjD033C29TNTVB2paCwZPVmOsjn9pClvYYrM2VeJpBY2bcNkuny0YUyTNRyRxJ54KA==", + "node_modules/@babel/plugin-transform-dynamic-import": { + "version": "7.22.11", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.22.11.tgz", + "integrity": "sha512-g/21plo58sfteWjaO0ZNVb+uEOkJNjAaHhbejrnBmu011l/eNDScmkbjCC3l4FKb10ViaGU4aOkFznSu2zRHgA==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.18.6" + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/plugin-syntax-dynamic-import": "^7.8.3" }, "engines": { "node": ">=6.9.0" @@ -2361,14 +1834,140 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-transform-modules-amd": { - "version": "7.20.11", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.20.11.tgz", - "integrity": "sha512-NuzCt5IIYOW0O30UvqktzHYR2ud5bOWbY0yaxWZ6G+aFzOMJvrs5YHNikrbdaT15+KNO31nPOy5Fim3ku6Zb5g==", + "node_modules/@babel/plugin-transform-exponentiation-operator": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.22.5.tgz", + "integrity": "sha512-vIpJFNM/FjZ4rh1myqIya9jXwrwwgFRHPjT3DkUA9ZLHuzox8jiXkOLvwm1H+PQIP3CqfC++WPKeuDi0Sjdj1g==", "dev": true, "dependencies": { - "@babel/helper-module-transforms": "^7.20.11", - "@babel/helper-plugin-utils": "^7.20.2" + "@babel/helper-builder-binary-assignment-operator-visitor": "^7.22.5", + "@babel/helper-plugin-utils": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-export-namespace-from": { + "version": "7.22.11", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.22.11.tgz", + "integrity": "sha512-xa7aad7q7OiT8oNZ1mU7NrISjlSkVdMbNxn9IuLZyL9AJEhs1Apba3I+u5riX1dIkdptP5EKDG5XDPByWxtehw==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/plugin-syntax-export-namespace-from": "^7.8.3" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-for-of": { + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.22.15.tgz", + "integrity": "sha512-me6VGeHsx30+xh9fbDLLPi0J1HzmeIIyenoOQHuw2D4m2SAU3NrspX5XxJLBpqn5yrLzrlw2Iy3RA//Bx27iOA==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-function-name": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.22.5.tgz", + "integrity": "sha512-UIzQNMS0p0HHiQm3oelztj+ECwFnj+ZRV4KnguvlsD2of1whUeM6o7wGNj6oLwcDoAXQ8gEqfgC24D+VdIcevg==", + "dev": true, + "dependencies": { + "@babel/helper-compilation-targets": "^7.22.5", + "@babel/helper-function-name": "^7.22.5", + "@babel/helper-plugin-utils": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-json-strings": { + "version": "7.22.11", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.22.11.tgz", + "integrity": "sha512-CxT5tCqpA9/jXFlme9xIBCc5RPtdDq3JpkkhgHQqtDdiTnTI0jtZ0QzXhr5DILeYifDPp2wvY2ad+7+hLMW5Pw==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/plugin-syntax-json-strings": "^7.8.3" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-literals": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.22.5.tgz", + "integrity": "sha512-fTLj4D79M+mepcw3dgFBTIDYpbcB9Sm0bpm4ppXPaO+U+PKFFyV9MGRvS0gvGw62sd10kT5lRMKXAADb9pWy8g==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-logical-assignment-operators": { + "version": "7.22.11", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.22.11.tgz", + "integrity": "sha512-qQwRTP4+6xFCDV5k7gZBF3C31K34ut0tbEcTKxlX/0KXxm9GLcO14p570aWxFvVzx6QAfPgq7gaeIHXJC8LswQ==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-member-expression-literals": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.22.5.tgz", + "integrity": "sha512-RZEdkNtzzYCFl9SE9ATaUMTj2hqMb4StarOJLrZRbqqU4HSBE7UlBw9WBWQiDzrJZJdUWiMTVDI6Gv/8DPvfew==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-modules-amd": { + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.23.0.tgz", + "integrity": "sha512-xWT5gefv2HGSm4QHtgc1sYPbseOyf+FFDo2JbpE25GWl5BqTGO9IMwTYJRoIdjsF85GE+VegHxSCUt5EvoYTAw==", + "dev": true, + "dependencies": { + "@babel/helper-module-transforms": "^7.23.0", + "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { "node": ">=6.9.0" @@ -2378,14 +1977,14 @@ } }, "node_modules/@babel/plugin-transform-modules-commonjs": { - "version": "7.20.11", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.20.11.tgz", - "integrity": "sha512-S8e1f7WQ7cimJQ51JkAaDrEtohVEitXjgCGAS2N8S31Y42E+kWwfSz83LYz57QdBm7q9diARVqanIaH2oVgQnw==", + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.23.0.tgz", + "integrity": "sha512-32Xzss14/UVc7k9g775yMIvkVK8xwKE0DPdP5JTapr3+Z9w4tzeOuLNY6BXDQR6BdnzIlXnCGAzsk/ICHBLVWQ==", "dev": true, "dependencies": { - "@babel/helper-module-transforms": "^7.20.11", - "@babel/helper-plugin-utils": "^7.20.2", - "@babel/helper-simple-access": "^7.20.2" + "@babel/helper-module-transforms": "^7.23.0", + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/helper-simple-access": "^7.22.5" }, "engines": { "node": ">=6.9.0" @@ -2395,15 +1994,15 @@ } }, "node_modules/@babel/plugin-transform-modules-systemjs": { - "version": "7.20.11", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.20.11.tgz", - "integrity": "sha512-vVu5g9BPQKSFEmvt2TA4Da5N+QVS66EX21d8uoOihC+OCpUoGvzVsXeqFdtAEfVa5BILAeFt+U7yVmLbQnAJmw==", + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.23.0.tgz", + "integrity": "sha512-qBej6ctXZD2f+DhlOC9yO47yEYgUh5CZNz/aBoH4j/3NOlRfJXJbY7xDQCqQVf9KbrqGzIWER1f23doHGrIHFg==", "dev": true, "dependencies": { - "@babel/helper-hoist-variables": "^7.18.6", - "@babel/helper-module-transforms": "^7.20.11", - "@babel/helper-plugin-utils": "^7.20.2", - "@babel/helper-validator-identifier": "^7.19.1" + "@babel/helper-hoist-variables": "^7.22.5", + "@babel/helper-module-transforms": "^7.23.0", + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/helper-validator-identifier": "^7.22.20" }, "engines": { "node": ">=6.9.0" @@ -2413,13 +2012,13 @@ } }, "node_modules/@babel/plugin-transform-modules-umd": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.6.tgz", - "integrity": "sha512-dcegErExVeXcRqNtkRU/z8WlBLnvD4MRnHgNs3MytRO1Mn1sHRyhbcpYbVMGclAqOjdW+9cfkdZno9dFdfKLfQ==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.22.5.tgz", + "integrity": "sha512-+S6kzefN/E1vkSsKx8kmQuqeQsvCKCd1fraCM7zXm4SFoggI099Tr4G8U81+5gtMdUeMQ4ipdQffbKLX0/7dBQ==", "dev": true, "dependencies": { - "@babel/helper-module-transforms": "^7.18.6", - "@babel/helper-plugin-utils": "^7.18.6" + "@babel/helper-module-transforms": "^7.22.5", + "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { "node": ">=6.9.0" @@ -2429,13 +2028,13 @@ } }, "node_modules/@babel/plugin-transform-named-capturing-groups-regex": { - "version": "7.20.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.20.5.tgz", - "integrity": "sha512-mOW4tTzi5iTLnw+78iEq3gr8Aoq4WNRGpmSlrogqaiCBoR1HFhpU4JkpQFOHfeYx3ReVIFWOQJS4aZBRvuZ6mA==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.22.5.tgz", + "integrity": "sha512-YgLLKmS3aUBhHaxp5hi1WJTgOUb/NCuDHzGT9z9WTt3YG+CPRhJs6nprbStx6DnWM4dh6gt7SU3sZodbZ08adQ==", "dev": true, "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.20.5", - "@babel/helper-plugin-utils": "^7.20.2" + "@babel/helper-create-regexp-features-plugin": "^7.22.5", + "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { "node": ">=6.9.0" @@ -2445,12 +2044,63 @@ } }, "node_modules/@babel/plugin-transform-new-target": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.18.6.tgz", - "integrity": "sha512-DjwFA/9Iu3Z+vrAn+8pBUGcjhxKguSMlsFqeCKbhb9BAV756v0krzVK04CRDi/4aqmk8BsHb4a/gFcaA5joXRw==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.22.5.tgz", + "integrity": "sha512-AsF7K0Fx/cNKVyk3a+DW0JLo+Ua598/NxMRvxDnkpCIGFh43+h/v2xyhRUYf6oD8gE4QtL83C7zZVghMjHd+iw==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.18.6" + "@babel/helper-plugin-utils": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-nullish-coalescing-operator": { + "version": "7.22.11", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.22.11.tgz", + "integrity": "sha512-YZWOw4HxXrotb5xsjMJUDlLgcDXSfO9eCmdl1bgW4+/lAGdkjaEvOnQ4p5WKKdUgSzO39dgPl0pTnfxm0OAXcg==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-numeric-separator": { + "version": "7.22.11", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.22.11.tgz", + "integrity": "sha512-3dzU4QGPsILdJbASKhF/V2TVP+gJya1PsueQCxIPCEcerqF21oEcrob4mzjsp2Py/1nLfF5m+xYNMDpmA8vffg==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/plugin-syntax-numeric-separator": "^7.10.4" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-object-rest-spread": { + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.22.15.tgz", + "integrity": "sha512-fEB+I1+gAmfAyxZcX1+ZUwLeAuuf8VIg67CTznZE0MqVFumWkh8xWtn58I4dxdVf080wn7gzWoF8vndOViJe9Q==", + "dev": true, + "dependencies": { + "@babel/compat-data": "^7.22.9", + "@babel/helper-compilation-targets": "^7.22.15", + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/plugin-syntax-object-rest-spread": "^7.8.3", + "@babel/plugin-transform-parameters": "^7.22.15" }, "engines": { "node": ">=6.9.0" @@ -2460,13 +2110,46 @@ } }, "node_modules/@babel/plugin-transform-object-super": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.18.6.tgz", - "integrity": "sha512-uvGz6zk+pZoS1aTZrOvrbj6Pp/kK2mp45t2B+bTDre2UgsZZ8EZLSJtUg7m/no0zOJUWgFONpB7Zv9W2tSaFlA==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.22.5.tgz", + "integrity": "sha512-klXqyaT9trSjIUrcsYIfETAzmOEZL3cBYqOYLJxBHfMFFggmXOv+NYSX/Jbs9mzMVESw/WycLFPRx8ba/b2Ipw==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.18.6", - "@babel/helper-replace-supers": "^7.18.6" + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/helper-replace-supers": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-optional-catch-binding": { + "version": "7.22.11", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.22.11.tgz", + "integrity": "sha512-rli0WxesXUeCJnMYhzAglEjLWVDF6ahb45HuprcmQuLidBJFWjNnOzssk2kuc6e33FlLaiZhG/kUIzUMWdBKaQ==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/plugin-syntax-optional-catch-binding": "^7.8.3" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-optional-chaining": { + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.23.0.tgz", + "integrity": "sha512-sBBGXbLJjxTzLBF5rFWaikMnOGOk/BmK6vVByIdEggZ7Vn6CvWXZyRkkLFK6WE0IF8jSliyOkUN6SScFgzCM0g==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5", + "@babel/plugin-syntax-optional-chaining": "^7.8.3" }, "engines": { "node": ">=6.9.0" @@ -2476,12 +2159,46 @@ } }, "node_modules/@babel/plugin-transform-parameters": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.20.7.tgz", - "integrity": "sha512-WiWBIkeHKVOSYPO0pWkxGPfKeWrCJyD3NJ53+Lrp/QMSZbsVPovrVl2aWZ19D/LTVnaDv5Ap7GJ/B2CTOZdrfA==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.22.15.tgz", + "integrity": "sha512-hjk7qKIqhyzhhUvRT683TYQOFa/4cQKwQy7ALvTpODswN40MljzNDa0YldevS6tGbxwaEKVn502JmY0dP7qEtQ==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-private-methods": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.22.5.tgz", + "integrity": "sha512-PPjh4gyrQnGe97JTalgRGMuU4icsZFnWkzicB/fUtzlKUqvsWBKEpPPfr5a2JiyirZkHxnAqkQMO5Z5B2kK3fA==", + "dev": true, + "dependencies": { + "@babel/helper-create-class-features-plugin": "^7.22.5", + "@babel/helper-plugin-utils": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-private-property-in-object": { + "version": "7.22.11", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.22.11.tgz", + "integrity": "sha512-sSCbqZDBKHetvjSwpyWzhuHkmW5RummxJBVbYLkGkaiTOWGxml7SXt0iWa03bzxFIx7wOj3g/ILRd0RcJKBeSQ==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.20.2" + "@babel/helper-annotate-as-pure": "^7.22.5", + "@babel/helper-create-class-features-plugin": "^7.22.11", + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/plugin-syntax-private-property-in-object": "^7.14.5" }, "engines": { "node": ">=6.9.0" @@ -2491,12 +2208,12 @@ } }, "node_modules/@babel/plugin-transform-property-literals": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.18.6.tgz", - "integrity": "sha512-cYcs6qlgafTud3PAzrrRNbQtfpQ8+y/+M5tKmksS9+M1ckbH6kzY8MrexEM9mcA6JDsukE19iIRvAyYl463sMg==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.22.5.tgz", + "integrity": "sha512-TiOArgddK3mK/x1Qwf5hay2pxI6wCZnvQqrFSqbtg1GLl2JcNMitVH/YnqjP+M31pLUeTfzY1HAXFDnUBV30rQ==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.18.6" + "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { "node": ">=6.9.0" @@ -2506,13 +2223,13 @@ } }, "node_modules/@babel/plugin-transform-regenerator": { - "version": "7.20.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.20.5.tgz", - "integrity": "sha512-kW/oO7HPBtntbsahzQ0qSE3tFvkFwnbozz3NWFhLGqH75vLEg+sCGngLlhVkePlCs3Jv0dBBHDzCHxNiFAQKCQ==", + "version": "7.22.10", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.22.10.tgz", + "integrity": "sha512-F28b1mDt8KcT5bUyJc/U9nwzw6cV+UmTeRlXYIl2TNqMMJif0Jeey9/RQ3C4NOd2zp0/TRsDns9ttj2L523rsw==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.20.2", - "regenerator-transform": "^0.15.1" + "@babel/helper-plugin-utils": "^7.22.5", + "regenerator-transform": "^0.15.2" }, "engines": { "node": ">=6.9.0" @@ -2522,12 +2239,12 @@ } }, "node_modules/@babel/plugin-transform-reserved-words": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.18.6.tgz", - "integrity": "sha512-oX/4MyMoypzHjFrT1CdivfKZ+XvIPMFXwwxHp/r0Ddy2Vuomt4HDFGmft1TAY2yiTKiNSsh3kjBAzcM8kSdsjA==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.22.5.tgz", + "integrity": "sha512-DTtGKFRQUDm8svigJzZHzb/2xatPc6TzNvAIJ5GqOKDsGFYgAskjRulbR/vGsPKq3OPqtexnz327qYpP57RFyA==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.18.6" + "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { "node": ">=6.9.0" @@ -2537,17 +2254,17 @@ } }, "node_modules/@babel/plugin-transform-runtime": { - "version": "7.19.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.19.6.tgz", - "integrity": "sha512-PRH37lz4JU156lYFW1p8OxE5i7d6Sl/zV58ooyr+q1J1lnQPyg5tIiXlIwNVhJaY4W3TmOtdc8jqdXQcB1v5Yw==", + "version": "7.22.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.22.9.tgz", + "integrity": "sha512-9KjBH61AGJetCPYp/IEyLEp47SyybZb0nDRpBvmtEkm+rUIwxdlKpyNHI1TmsGkeuLclJdleQHRZ8XLBnnh8CQ==", "dev": true, "dependencies": { - "@babel/helper-module-imports": "^7.18.6", - "@babel/helper-plugin-utils": "^7.19.0", - "babel-plugin-polyfill-corejs2": "^0.3.3", - "babel-plugin-polyfill-corejs3": "^0.6.0", - "babel-plugin-polyfill-regenerator": "^0.4.1", - "semver": "^6.3.0" + "@babel/helper-module-imports": "^7.22.5", + "@babel/helper-plugin-utils": "^7.22.5", + "babel-plugin-polyfill-corejs2": "^0.4.4", + "babel-plugin-polyfill-corejs3": "^0.8.2", + "babel-plugin-polyfill-regenerator": "^0.5.1", + "semver": "^6.3.1" }, "engines": { "node": ">=6.9.0" @@ -2557,21 +2274,21 @@ } }, "node_modules/@babel/plugin-transform-runtime/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, "bin": { "semver": "bin/semver.js" } }, "node_modules/@babel/plugin-transform-shorthand-properties": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.18.6.tgz", - "integrity": "sha512-eCLXXJqv8okzg86ywZJbRn19YJHU4XUa55oz2wbHhaQVn/MM+XhukiT7SYqp/7o00dg52Rj51Ny+Ecw4oyoygw==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.22.5.tgz", + "integrity": "sha512-vM4fq9IXHscXVKzDv5itkO1X52SmdFBFcMIBZ2FRn2nqVYqw6dBexUgMvAjHW+KXpPPViD/Yo3GrDEBaRC0QYA==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.18.6" + "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { "node": ">=6.9.0" @@ -2581,13 +2298,13 @@ } }, "node_modules/@babel/plugin-transform-spread": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.20.7.tgz", - "integrity": "sha512-ewBbHQ+1U/VnH1fxltbJqDeWBU1oNLG8Dj11uIv3xVf7nrQu0bPGe5Rf716r7K5Qz+SqtAOVswoVunoiBtGhxw==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.22.5.tgz", + "integrity": "sha512-5ZzDQIGyvN4w8+dMmpohL6MBo+l2G7tfC/O2Dg7/hjpgeWvUx8FzfeOKxGog9IimPa4YekaQ9PlDqTLOljkcxg==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.20.2", - "@babel/helper-skip-transparent-expression-wrappers": "^7.20.0" + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5" }, "engines": { "node": ">=6.9.0" @@ -2597,12 +2314,12 @@ } }, "node_modules/@babel/plugin-transform-sticky-regex": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.18.6.tgz", - "integrity": "sha512-kfiDrDQ+PBsQDO85yj1icueWMfGfJFKN1KCkndygtu/C9+XUfydLC8Iv5UYJqRwy4zk8EcplRxEOeLyjq1gm6Q==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.22.5.tgz", + "integrity": "sha512-zf7LuNpHG0iEeiyCNwX4j3gDg1jgt1k3ZdXBKbZSoA3BbGQGvMiSvfbZRR3Dr3aeJe3ooWFZxOOG3IRStYp2Bw==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.18.6" + "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { "node": ">=6.9.0" @@ -2612,12 +2329,12 @@ } }, "node_modules/@babel/plugin-transform-template-literals": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.9.tgz", - "integrity": "sha512-S8cOWfT82gTezpYOiVaGHrCbhlHgKhQt8XH5ES46P2XWmX92yisoZywf5km75wv5sYcXDUCLMmMxOLCtthDgMA==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.22.5.tgz", + "integrity": "sha512-5ciOehRNf+EyUeewo8NkbQiUs4d6ZxiHo6BcBcnFlgiJfu16q0bQUw9Jvo0b0gBKFG1SMhDSjeKXSYuJLeFSMA==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.18.9" + "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { "node": ">=6.9.0" @@ -2627,12 +2344,12 @@ } }, "node_modules/@babel/plugin-transform-typeof-symbol": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.18.9.tgz", - "integrity": "sha512-SRfwTtF11G2aemAZWivL7PD+C9z52v9EvMqH9BuYbabyPuKUvSWks3oCg6041pT925L4zVFqaVBeECwsmlguEw==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.22.5.tgz", + "integrity": "sha512-bYkI5lMzL4kPii4HHEEChkD0rkc+nvnlR6+o/qdqR6zrm0Sv/nodmyLhlq2DO0YKLUNd2VePmPRjJXSBh9OIdA==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.18.9" + "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { "node": ">=6.9.0" @@ -2642,12 +2359,28 @@ } }, "node_modules/@babel/plugin-transform-unicode-escapes": { - "version": "7.18.10", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.18.10.tgz", - "integrity": "sha512-kKAdAI+YzPgGY/ftStBFXTI1LZFju38rYThnfMykS+IXy8BVx+res7s2fxf1l8I35DV2T97ezo6+SGrXz6B3iQ==", + "version": "7.22.10", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.22.10.tgz", + "integrity": "sha512-lRfaRKGZCBqDlRU3UIFovdp9c9mEvlylmpod0/OatICsSfuQ9YFthRo1tpTkGsklEefZdqlEFdY4A2dwTb6ohg==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-unicode-property-regex": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.22.5.tgz", + "integrity": "sha512-HCCIb+CbJIAE6sXn5CjFQXMwkCClcOfPCzTlilJ8cUatfzwHlWQkbtV0zD338u9dZskwvuOYTuuaMaA8J5EI5A==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.18.9" + "@babel/helper-create-regexp-features-plugin": "^7.22.5", + "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { "node": ">=6.9.0" @@ -2657,13 +2390,13 @@ } }, "node_modules/@babel/plugin-transform-unicode-regex": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.18.6.tgz", - "integrity": "sha512-gE7A6Lt7YLnNOL3Pb9BNeZvi+d8l7tcRrG4+pwJjK9hD2xX4mEvjlQW60G9EEmfXVYRPv9VRQcyegIVHCql/AA==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.22.5.tgz", + "integrity": "sha512-028laaOKptN5vHJf9/Arr/HiJekMd41hOEZYvNsrsXqJ7YPYuX2bQxh31fkZzGmq3YqHRJzYFFAVYvKfMPKqyg==", "dev": true, "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.18.6", - "@babel/helper-plugin-utils": "^7.18.6" + "@babel/helper-create-regexp-features-plugin": "^7.22.5", + "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { "node": ">=6.9.0" @@ -2672,39 +2405,43 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/preset-env": { - "version": "7.20.2", - "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.20.2.tgz", - "integrity": "sha512-1G0efQEWR1EHkKvKHqbG+IN/QdgwfByUpM5V5QroDzGV2t3S/WXNQd693cHiHTlCFMpr9B6FkPFXDA2lQcKoDg==", + "node_modules/@babel/plugin-transform-unicode-sets-regex": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.22.5.tgz", + "integrity": "sha512-lhMfi4FC15j13eKrh3DnYHjpGj6UKQHtNKTbtc1igvAhRy4+kLhV07OpLcsN0VgDEw/MjAvJO4BdMJsHwMhzCg==", "dev": true, "dependencies": { - "@babel/compat-data": "^7.20.1", - "@babel/helper-compilation-targets": "^7.20.0", - "@babel/helper-plugin-utils": "^7.20.2", - "@babel/helper-validator-option": "^7.18.6", - "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.18.6", - "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.18.9", - "@babel/plugin-proposal-async-generator-functions": "^7.20.1", - "@babel/plugin-proposal-class-properties": "^7.18.6", - "@babel/plugin-proposal-class-static-block": "^7.18.6", - "@babel/plugin-proposal-dynamic-import": "^7.18.6", - "@babel/plugin-proposal-export-namespace-from": "^7.18.9", - "@babel/plugin-proposal-json-strings": "^7.18.6", - "@babel/plugin-proposal-logical-assignment-operators": "^7.18.9", - "@babel/plugin-proposal-nullish-coalescing-operator": "^7.18.6", - "@babel/plugin-proposal-numeric-separator": "^7.18.6", - "@babel/plugin-proposal-object-rest-spread": "^7.20.2", - "@babel/plugin-proposal-optional-catch-binding": "^7.18.6", - "@babel/plugin-proposal-optional-chaining": "^7.18.9", - "@babel/plugin-proposal-private-methods": "^7.18.6", - "@babel/plugin-proposal-private-property-in-object": "^7.18.6", - "@babel/plugin-proposal-unicode-property-regex": "^7.18.6", + "@babel/helper-create-regexp-features-plugin": "^7.22.5", + "@babel/helper-plugin-utils": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0" + } + }, + "node_modules/@babel/preset-env": { + "version": "7.22.9", + "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.22.9.tgz", + "integrity": "sha512-wNi5H/Emkhll/bqPjsjQorSykrlfY5OWakd6AulLvMEytpKasMVUpVy8RL4qBIBs5Ac6/5i0/Rv0b/Fg6Eag/g==", + "dev": true, + "dependencies": { + "@babel/compat-data": "^7.22.9", + "@babel/helper-compilation-targets": "^7.22.9", + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/helper-validator-option": "^7.22.5", + "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.22.5", + "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.22.5", + "@babel/plugin-proposal-private-property-in-object": "7.21.0-placeholder-for-preset-env.2", "@babel/plugin-syntax-async-generators": "^7.8.4", "@babel/plugin-syntax-class-properties": "^7.12.13", "@babel/plugin-syntax-class-static-block": "^7.14.5", "@babel/plugin-syntax-dynamic-import": "^7.8.3", "@babel/plugin-syntax-export-namespace-from": "^7.8.3", - "@babel/plugin-syntax-import-assertions": "^7.20.0", + "@babel/plugin-syntax-import-assertions": "^7.22.5", + "@babel/plugin-syntax-import-attributes": "^7.22.5", + "@babel/plugin-syntax-import-meta": "^7.10.4", "@babel/plugin-syntax-json-strings": "^7.8.3", "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4", "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3", @@ -2714,45 +2451,62 @@ "@babel/plugin-syntax-optional-chaining": "^7.8.3", "@babel/plugin-syntax-private-property-in-object": "^7.14.5", "@babel/plugin-syntax-top-level-await": "^7.14.5", - "@babel/plugin-transform-arrow-functions": "^7.18.6", - "@babel/plugin-transform-async-to-generator": "^7.18.6", - "@babel/plugin-transform-block-scoped-functions": "^7.18.6", - "@babel/plugin-transform-block-scoping": "^7.20.2", - "@babel/plugin-transform-classes": "^7.20.2", - "@babel/plugin-transform-computed-properties": "^7.18.9", - "@babel/plugin-transform-destructuring": "^7.20.2", - "@babel/plugin-transform-dotall-regex": "^7.18.6", - "@babel/plugin-transform-duplicate-keys": "^7.18.9", - "@babel/plugin-transform-exponentiation-operator": "^7.18.6", - "@babel/plugin-transform-for-of": "^7.18.8", - "@babel/plugin-transform-function-name": "^7.18.9", - "@babel/plugin-transform-literals": "^7.18.9", - "@babel/plugin-transform-member-expression-literals": "^7.18.6", - "@babel/plugin-transform-modules-amd": "^7.19.6", - "@babel/plugin-transform-modules-commonjs": "^7.19.6", - "@babel/plugin-transform-modules-systemjs": "^7.19.6", - "@babel/plugin-transform-modules-umd": "^7.18.6", - "@babel/plugin-transform-named-capturing-groups-regex": "^7.19.1", - "@babel/plugin-transform-new-target": "^7.18.6", - "@babel/plugin-transform-object-super": "^7.18.6", - "@babel/plugin-transform-parameters": "^7.20.1", - "@babel/plugin-transform-property-literals": "^7.18.6", - "@babel/plugin-transform-regenerator": "^7.18.6", - "@babel/plugin-transform-reserved-words": "^7.18.6", - "@babel/plugin-transform-shorthand-properties": "^7.18.6", - "@babel/plugin-transform-spread": "^7.19.0", - "@babel/plugin-transform-sticky-regex": "^7.18.6", - "@babel/plugin-transform-template-literals": "^7.18.9", - "@babel/plugin-transform-typeof-symbol": "^7.18.9", - "@babel/plugin-transform-unicode-escapes": "^7.18.10", - "@babel/plugin-transform-unicode-regex": "^7.18.6", + "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6", + "@babel/plugin-transform-arrow-functions": "^7.22.5", + "@babel/plugin-transform-async-generator-functions": "^7.22.7", + "@babel/plugin-transform-async-to-generator": "^7.22.5", + "@babel/plugin-transform-block-scoped-functions": "^7.22.5", + "@babel/plugin-transform-block-scoping": "^7.22.5", + "@babel/plugin-transform-class-properties": "^7.22.5", + "@babel/plugin-transform-class-static-block": "^7.22.5", + "@babel/plugin-transform-classes": "^7.22.6", + "@babel/plugin-transform-computed-properties": "^7.22.5", + "@babel/plugin-transform-destructuring": "^7.22.5", + "@babel/plugin-transform-dotall-regex": "^7.22.5", + "@babel/plugin-transform-duplicate-keys": "^7.22.5", + "@babel/plugin-transform-dynamic-import": "^7.22.5", + "@babel/plugin-transform-exponentiation-operator": "^7.22.5", + "@babel/plugin-transform-export-namespace-from": "^7.22.5", + "@babel/plugin-transform-for-of": "^7.22.5", + "@babel/plugin-transform-function-name": "^7.22.5", + "@babel/plugin-transform-json-strings": "^7.22.5", + "@babel/plugin-transform-literals": "^7.22.5", + "@babel/plugin-transform-logical-assignment-operators": "^7.22.5", + "@babel/plugin-transform-member-expression-literals": "^7.22.5", + "@babel/plugin-transform-modules-amd": "^7.22.5", + "@babel/plugin-transform-modules-commonjs": "^7.22.5", + "@babel/plugin-transform-modules-systemjs": "^7.22.5", + "@babel/plugin-transform-modules-umd": "^7.22.5", + "@babel/plugin-transform-named-capturing-groups-regex": "^7.22.5", + "@babel/plugin-transform-new-target": "^7.22.5", + "@babel/plugin-transform-nullish-coalescing-operator": "^7.22.5", + "@babel/plugin-transform-numeric-separator": "^7.22.5", + "@babel/plugin-transform-object-rest-spread": "^7.22.5", + "@babel/plugin-transform-object-super": "^7.22.5", + "@babel/plugin-transform-optional-catch-binding": "^7.22.5", + "@babel/plugin-transform-optional-chaining": "^7.22.6", + "@babel/plugin-transform-parameters": "^7.22.5", + "@babel/plugin-transform-private-methods": "^7.22.5", + "@babel/plugin-transform-private-property-in-object": "^7.22.5", + "@babel/plugin-transform-property-literals": "^7.22.5", + "@babel/plugin-transform-regenerator": "^7.22.5", + "@babel/plugin-transform-reserved-words": "^7.22.5", + "@babel/plugin-transform-shorthand-properties": "^7.22.5", + "@babel/plugin-transform-spread": "^7.22.5", + "@babel/plugin-transform-sticky-regex": "^7.22.5", + "@babel/plugin-transform-template-literals": "^7.22.5", + "@babel/plugin-transform-typeof-symbol": "^7.22.5", + "@babel/plugin-transform-unicode-escapes": "^7.22.5", + "@babel/plugin-transform-unicode-property-regex": "^7.22.5", + "@babel/plugin-transform-unicode-regex": "^7.22.5", + "@babel/plugin-transform-unicode-sets-regex": "^7.22.5", "@babel/preset-modules": "^0.1.5", - "@babel/types": "^7.20.2", - "babel-plugin-polyfill-corejs2": "^0.3.3", - "babel-plugin-polyfill-corejs3": "^0.6.0", - "babel-plugin-polyfill-regenerator": "^0.4.1", - "core-js-compat": "^3.25.1", - "semver": "^6.3.0" + "@babel/types": "^7.22.5", + "babel-plugin-polyfill-corejs2": "^0.4.4", + "babel-plugin-polyfill-corejs3": "^0.8.2", + "babel-plugin-polyfill-regenerator": "^0.5.1", + "core-js-compat": "^3.31.0", + "semver": "^6.3.1" }, "engines": { "node": ">=6.9.0" @@ -2762,18 +2516,18 @@ } }, "node_modules/@babel/preset-env/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, "bin": { "semver": "bin/semver.js" } }, "node_modules/@babel/preset-modules": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.5.tgz", - "integrity": "sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==", + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.6.tgz", + "integrity": "sha512-ID2yj6K/4lKfhuU3+EX4UvNbIt7eACFbHmNUjzA+ep+B5971CknnA/9DEWKbRokfbbtblxxxXFJJrH47UEAMVg==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.0.0", @@ -2783,13 +2537,19 @@ "esutils": "^2.0.2" }, "peerDependencies": { - "@babel/core": "^7.0.0-0" + "@babel/core": "^7.0.0-0 || ^8.0.0-0 <8.0.0" } }, + "node_modules/@babel/regjsgen": { + "version": "0.8.0", + "resolved": "https://registry.npmjs.org/@babel/regjsgen/-/regjsgen-0.8.0.tgz", + "integrity": "sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==", + "dev": true + }, "node_modules/@babel/runtime": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.7.tgz", - "integrity": "sha512-UF0tvkUtxwAgZ5W/KrkHf0Rn0fdnLDU9ScxBrEVNUprE/MzirjK4MJUX1/BVDv00Sv8cljtukVK1aky++X1SjQ==", + "version": "7.22.6", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.22.6.tgz", + "integrity": "sha512-wDb5pWm4WDdF6LFUde3Jl8WzPA+3ZbxYqkC6xAXuD3irdEHN1k0NfTRrJD8ZD378SJ61miMLCqIOXYhd8x+AJQ==", "dev": true, "dependencies": { "regenerator-runtime": "^0.13.11" @@ -2799,33 +2559,33 @@ } }, "node_modules/@babel/template": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.20.7.tgz", - "integrity": "sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.5.tgz", + "integrity": "sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw==", "dev": true, "dependencies": { - "@babel/code-frame": "^7.18.6", - "@babel/parser": "^7.20.7", - "@babel/types": "^7.20.7" + "@babel/code-frame": "^7.22.5", + "@babel/parser": "^7.22.5", + "@babel/types": "^7.22.5" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/traverse": { - "version": "7.20.12", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.20.12.tgz", - "integrity": "sha512-MsIbFN0u+raeja38qboyF8TIT7K0BFzz/Yd/77ta4MsUsmP2RAnidIlwq7d5HFQrH/OZJecGV6B71C4zAgpoSQ==", - "dev": true, - "dependencies": { - "@babel/code-frame": "^7.18.6", - "@babel/generator": "^7.20.7", - "@babel/helper-environment-visitor": "^7.18.9", - "@babel/helper-function-name": "^7.19.0", - "@babel/helper-hoist-variables": "^7.18.6", - "@babel/helper-split-export-declaration": "^7.18.6", - "@babel/parser": "^7.20.7", - "@babel/types": "^7.20.7", + "version": "7.23.2", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.2.tgz", + "integrity": "sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==", + "dev": true, + "dependencies": { + "@babel/code-frame": "^7.22.13", + "@babel/generator": "^7.23.0", + "@babel/helper-environment-visitor": "^7.22.20", + "@babel/helper-function-name": "^7.23.0", + "@babel/helper-hoist-variables": "^7.22.5", + "@babel/helper-split-export-declaration": "^7.22.6", + "@babel/parser": "^7.23.0", + "@babel/types": "^7.23.0", "debug": "^4.1.0", "globals": "^11.1.0" }, @@ -2833,14 +2593,29 @@ "node": ">=6.9.0" } }, + "node_modules/@babel/traverse/node_modules/@babel/generator": { + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.0.tgz", + "integrity": "sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==", + "dev": true, + "dependencies": { + "@babel/types": "^7.23.0", + "@jridgewell/gen-mapping": "^0.3.2", + "@jridgewell/trace-mapping": "^0.3.17", + "jsesc": "^2.5.1" + }, + "engines": { + "node": ">=6.9.0" + } + }, "node_modules/@babel/types": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.20.7.tgz", - "integrity": "sha512-69OnhBxSSgK0OzTJai4kyPDiKTIe3j+ctaHdIGVbRahTLAT7L3R9oeXHC2aVSuGYt3cVnoAMDmOCgJ2yaiLMvg==", + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.0.tgz", + "integrity": "sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==", "dev": true, "dependencies": { - "@babel/helper-string-parser": "^7.19.4", - "@babel/helper-validator-identifier": "^7.19.1", + "@babel/helper-string-parser": "^7.22.5", + "@babel/helper-validator-identifier": "^7.22.20", "to-fast-properties": "^2.0.0" }, "engines": { @@ -2848,9 +2623,9 @@ } }, "node_modules/@bcgov/bc-sans": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@bcgov/bc-sans/-/bc-sans-1.0.1.tgz", - "integrity": "sha512-4suRUBFeHcuFkwXXJu9pKJNB5Z2G3bpuLEHIq203KVCKC8KrsnqvsyUOf645TypgLwqOTOYCETiXYzfxF4gLAw==" + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/@bcgov/bc-sans/-/bc-sans-2.1.0.tgz", + "integrity": "sha512-1MesF4NAVpM5dywoJ68wNcBylHbPqg1dDV/FNuQm0BbspETGlPmfX8LG8rtrCjCAPhWuL2qRT/lBYDUMvFTUnw==" }, "node_modules/@bcoe/v8-coverage": { "version": "0.2.3", @@ -2859,9 +2634,9 @@ "dev": true }, "node_modules/@ctrl/tinycolor": { - "version": "3.4.1", - "resolved": "https://registry.npmjs.org/@ctrl/tinycolor/-/tinycolor-3.4.1.tgz", - "integrity": "sha512-ej5oVy6lykXsvieQtqZxCOaLT+xD4+QNarq78cIYISHmZXshCvROLudpQN3lfL8G0NL7plMSSK+zlyvCaIJ4Iw==", + "version": "3.6.1", + "resolved": "https://registry.npmjs.org/@ctrl/tinycolor/-/tinycolor-3.6.1.tgz", + "integrity": "sha512-SITSV6aIXsuVNV3f3O0f2n/cgyEDWoSqtZMYiAmcsYHydcKrOz3gUxB/iXd/Qf08+IZX4KpgNbvUdMBmWz+kcA==", "engines": { "node": ">=10" } @@ -2876,9 +2651,9 @@ } }, "node_modules/@esbuild/android-arm": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.16.17.tgz", - "integrity": "sha512-N9x1CMXVhtWEAMS7pNNONyA14f71VPQN9Cnavj1XQh6T7bskqiLLrSca4O0Vr8Wdcga943eThxnVp3JLnBMYtw==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.17.tgz", + "integrity": "sha512-wHsmJG/dnL3OkpAcwbgoBTTMHVi4Uyou3F5mf58ZtmUyIKfcdA7TROav/6tCzET4A3QW2Q2FC+eFneMU+iyOxg==", "cpu": [ "arm" ], @@ -2892,9 +2667,9 @@ } }, "node_modules/@esbuild/android-arm64": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.16.17.tgz", - "integrity": "sha512-MIGl6p5sc3RDTLLkYL1MyL8BMRN4tLMRCn+yRJJmEDvYZ2M7tmAf80hx1kbNEUX2KJ50RRtxZ4JHLvCfuB6kBg==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.18.17.tgz", + "integrity": "sha512-9np+YYdNDed5+Jgr1TdWBsozZ85U1Oa3xW0c7TWqH0y2aGghXtZsuT8nYRbzOMcl0bXZXjOGbksoTtVOlWrRZg==", "cpu": [ "arm64" ], @@ -2908,9 +2683,9 @@ } }, "node_modules/@esbuild/android-x64": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.16.17.tgz", - "integrity": "sha512-a3kTv3m0Ghh4z1DaFEuEDfz3OLONKuFvI4Xqczqx4BqLyuFaFkuaG4j2MtA6fuWEFeC5x9IvqnX7drmRq/fyAQ==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.18.17.tgz", + "integrity": "sha512-O+FeWB/+xya0aLg23hHEM2E3hbfwZzjqumKMSIqcHbNvDa+dza2D0yLuymRBQQnC34CWrsJUXyH2MG5VnLd6uw==", "cpu": [ "x64" ], @@ -2924,9 +2699,9 @@ } }, "node_modules/@esbuild/darwin-arm64": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.16.17.tgz", - "integrity": "sha512-/2agbUEfmxWHi9ARTX6OQ/KgXnOWfsNlTeLcoV7HSuSTv63E4DqtAc+2XqGw1KHxKMHGZgbVCZge7HXWX9Vn+w==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.18.17.tgz", + "integrity": "sha512-M9uJ9VSB1oli2BE/dJs3zVr9kcCBBsE883prage1NWz6pBS++1oNn/7soPNS3+1DGj0FrkSvnED4Bmlu1VAE9g==", "cpu": [ "arm64" ], @@ -2940,9 +2715,9 @@ } }, "node_modules/@esbuild/darwin-x64": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.16.17.tgz", - "integrity": "sha512-2By45OBHulkd9Svy5IOCZt376Aa2oOkiE9QWUK9fe6Tb+WDr8hXL3dpqi+DeLiMed8tVXspzsTAvd0jUl96wmg==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.18.17.tgz", + "integrity": "sha512-XDre+J5YeIJDMfp3n0279DFNrGCXlxOuGsWIkRb1NThMZ0BsrWXoTg23Jer7fEXQ9Ye5QjrvXpxnhzl3bHtk0g==", "cpu": [ "x64" ], @@ -2956,9 +2731,9 @@ } }, "node_modules/@esbuild/freebsd-arm64": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.16.17.tgz", - "integrity": "sha512-mt+cxZe1tVx489VTb4mBAOo2aKSnJ33L9fr25JXpqQqzbUIw/yzIzi+NHwAXK2qYV1lEFp4OoVeThGjUbmWmdw==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.17.tgz", + "integrity": "sha512-cjTzGa3QlNfERa0+ptykyxs5A6FEUQQF0MuilYXYBGdBxD3vxJcKnzDlhDCa1VAJCmAxed6mYhA2KaJIbtiNuQ==", "cpu": [ "arm64" ], @@ -2972,9 +2747,9 @@ } }, "node_modules/@esbuild/freebsd-x64": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.16.17.tgz", - "integrity": "sha512-8ScTdNJl5idAKjH8zGAsN7RuWcyHG3BAvMNpKOBaqqR7EbUhhVHOqXRdL7oZvz8WNHL2pr5+eIT5c65kA6NHug==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.18.17.tgz", + "integrity": "sha512-sOxEvR8d7V7Kw8QqzxWc7bFfnWnGdaFBut1dRUYtu+EIRXefBc/eIsiUiShnW0hM3FmQ5Zf27suDuHsKgZ5QrA==", "cpu": [ "x64" ], @@ -2988,9 +2763,9 @@ } }, "node_modules/@esbuild/linux-arm": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.16.17.tgz", - "integrity": "sha512-iihzrWbD4gIT7j3caMzKb/RsFFHCwqqbrbH9SqUSRrdXkXaygSZCZg1FybsZz57Ju7N/SHEgPyaR0LZ8Zbe9gQ==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.18.17.tgz", + "integrity": "sha512-2d3Lw6wkwgSLC2fIvXKoMNGVaeY8qdN0IC3rfuVxJp89CRfA3e3VqWifGDfuakPmp90+ZirmTfye1n4ncjv2lg==", "cpu": [ "arm" ], @@ -3004,9 +2779,9 @@ } }, "node_modules/@esbuild/linux-arm64": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.16.17.tgz", - "integrity": "sha512-7S8gJnSlqKGVJunnMCrXHU9Q8Q/tQIxk/xL8BqAP64wchPCTzuM6W3Ra8cIa1HIflAvDnNOt2jaL17vaW+1V0g==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.18.17.tgz", + "integrity": "sha512-c9w3tE7qA3CYWjT+M3BMbwMt+0JYOp3vCMKgVBrCl1nwjAlOMYzEo+gG7QaZ9AtqZFj5MbUc885wuBBmu6aADQ==", "cpu": [ "arm64" ], @@ -3020,9 +2795,9 @@ } }, "node_modules/@esbuild/linux-ia32": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.16.17.tgz", - "integrity": "sha512-kiX69+wcPAdgl3Lonh1VI7MBr16nktEvOfViszBSxygRQqSpzv7BffMKRPMFwzeJGPxcio0pdD3kYQGpqQ2SSg==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.18.17.tgz", + "integrity": "sha512-1DS9F966pn5pPnqXYz16dQqWIB0dmDfAQZd6jSSpiT9eX1NzKh07J6VKR3AoXXXEk6CqZMojiVDSZi1SlmKVdg==", "cpu": [ "ia32" ], @@ -3036,9 +2811,9 @@ } }, "node_modules/@esbuild/linux-loong64": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.16.17.tgz", - "integrity": "sha512-dTzNnQwembNDhd654cA4QhbS9uDdXC3TKqMJjgOWsC0yNCbpzfWoXdZvp0mY7HU6nzk5E0zpRGGx3qoQg8T2DQ==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.18.17.tgz", + "integrity": "sha512-EvLsxCk6ZF0fpCB6w6eOI2Fc8KW5N6sHlIovNe8uOFObL2O+Mr0bflPHyHwLT6rwMg9r77WOAWb2FqCQrVnwFg==", "cpu": [ "loong64" ], @@ -3052,9 +2827,9 @@ } }, "node_modules/@esbuild/linux-mips64el": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.16.17.tgz", - "integrity": "sha512-ezbDkp2nDl0PfIUn0CsQ30kxfcLTlcx4Foz2kYv8qdC6ia2oX5Q3E/8m6lq84Dj/6b0FrkgD582fJMIfHhJfSw==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.18.17.tgz", + "integrity": "sha512-e0bIdHA5p6l+lwqTE36NAW5hHtw2tNRmHlGBygZC14QObsA3bD4C6sXLJjvnDIjSKhW1/0S3eDy+QmX/uZWEYQ==", "cpu": [ "mips64el" ], @@ -3068,9 +2843,9 @@ } }, "node_modules/@esbuild/linux-ppc64": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.16.17.tgz", - "integrity": "sha512-dzS678gYD1lJsW73zrFhDApLVdM3cUF2MvAa1D8K8KtcSKdLBPP4zZSLy6LFZ0jYqQdQ29bjAHJDgz0rVbLB3g==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.18.17.tgz", + "integrity": "sha512-BAAilJ0M5O2uMxHYGjFKn4nJKF6fNCdP1E0o5t5fvMYYzeIqy2JdAP88Az5LHt9qBoUa4tDaRpfWt21ep5/WqQ==", "cpu": [ "ppc64" ], @@ -3084,9 +2859,9 @@ } }, "node_modules/@esbuild/linux-riscv64": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.16.17.tgz", - "integrity": "sha512-ylNlVsxuFjZK8DQtNUwiMskh6nT0vI7kYl/4fZgV1llP5d6+HIeL/vmmm3jpuoo8+NuXjQVZxmKuhDApK0/cKw==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.18.17.tgz", + "integrity": "sha512-Wh/HW2MPnC3b8BqRSIme/9Zhab36PPH+3zam5pqGRH4pE+4xTrVLx2+XdGp6fVS3L2x+DrsIcsbMleex8fbE6g==", "cpu": [ "riscv64" ], @@ -3100,9 +2875,9 @@ } }, "node_modules/@esbuild/linux-s390x": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.16.17.tgz", - "integrity": "sha512-gzy7nUTO4UA4oZ2wAMXPNBGTzZFP7mss3aKR2hH+/4UUkCOyqmjXiKpzGrY2TlEUhbbejzXVKKGazYcQTZWA/w==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.18.17.tgz", + "integrity": "sha512-j/34jAl3ul3PNcK3pfI0NSlBANduT2UO5kZ7FCaK33XFv3chDhICLY8wJJWIhiQ+YNdQ9dxqQctRg2bvrMlYgg==", "cpu": [ "s390x" ], @@ -3116,9 +2891,9 @@ } }, "node_modules/@esbuild/linux-x64": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.16.17.tgz", - "integrity": "sha512-mdPjPxfnmoqhgpiEArqi4egmBAMYvaObgn4poorpUaqmvzzbvqbowRllQ+ZgzGVMGKaPkqUmPDOOFQRUFDmeUw==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.18.17.tgz", + "integrity": "sha512-QM50vJ/y+8I60qEmFxMoxIx4de03pGo2HwxdBeFd4nMh364X6TIBZ6VQ5UQmPbQWUVWHWws5MmJXlHAXvJEmpQ==", "cpu": [ "x64" ], @@ -3132,9 +2907,9 @@ } }, "node_modules/@esbuild/netbsd-x64": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.16.17.tgz", - "integrity": "sha512-/PzmzD/zyAeTUsduZa32bn0ORug+Jd1EGGAUJvqfeixoEISYpGnAezN6lnJoskauoai0Jrs+XSyvDhppCPoKOA==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.18.17.tgz", + "integrity": "sha512-/jGlhWR7Sj9JPZHzXyyMZ1RFMkNPjC6QIAan0sDOtIo2TYk3tZn5UDrkE0XgsTQCxWTTOcMPf9p6Rh2hXtl5TQ==", "cpu": [ "x64" ], @@ -3148,9 +2923,9 @@ } }, "node_modules/@esbuild/openbsd-x64": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.16.17.tgz", - "integrity": "sha512-2yaWJhvxGEz2RiftSk0UObqJa/b+rIAjnODJgv2GbGGpRwAfpgzyrg1WLK8rqA24mfZa9GvpjLcBBg8JHkoodg==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.18.17.tgz", + "integrity": "sha512-rSEeYaGgyGGf4qZM2NonMhMOP/5EHp4u9ehFiBrg7stH6BYEEjlkVREuDEcQ0LfIl53OXLxNbfuIj7mr5m29TA==", "cpu": [ "x64" ], @@ -3164,9 +2939,9 @@ } }, "node_modules/@esbuild/sunos-x64": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.16.17.tgz", - "integrity": "sha512-xtVUiev38tN0R3g8VhRfN7Zl42YCJvyBhRKw1RJjwE1d2emWTVToPLNEQj/5Qxc6lVFATDiy6LjVHYhIPrLxzw==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.18.17.tgz", + "integrity": "sha512-Y7ZBbkLqlSgn4+zot4KUNYst0bFoO68tRgI6mY2FIM+b7ZbyNVtNbDP5y8qlu4/knZZ73fgJDlXID+ohY5zt5g==", "cpu": [ "x64" ], @@ -3180,9 +2955,9 @@ } }, "node_modules/@esbuild/win32-arm64": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.16.17.tgz", - "integrity": "sha512-ga8+JqBDHY4b6fQAmOgtJJue36scANy4l/rL97W+0wYmijhxKetzZdKOJI7olaBaMhWt8Pac2McJdZLxXWUEQw==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.18.17.tgz", + "integrity": "sha512-bwPmTJsEQcbZk26oYpc4c/8PvTY3J5/QK8jM19DVlEsAB41M39aWovWoHtNm78sd6ip6prilxeHosPADXtEJFw==", "cpu": [ "arm64" ], @@ -3196,9 +2971,9 @@ } }, "node_modules/@esbuild/win32-ia32": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.16.17.tgz", - "integrity": "sha512-WnsKaf46uSSF/sZhwnqE4L/F89AYNMiD4YtEcYekBt9Q7nj0DiId2XH2Ng2PHM54qi5oPrQ8luuzGszqi/veig==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.18.17.tgz", + "integrity": "sha512-H/XaPtPKli2MhW+3CQueo6Ni3Avggi6hP/YvgkEe1aSaxw+AeO8MFjq8DlgfTd9Iz4Yih3QCZI6YLMoyccnPRg==", "cpu": [ "ia32" ], @@ -3212,9 +2987,9 @@ } }, "node_modules/@esbuild/win32-x64": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.16.17.tgz", - "integrity": "sha512-y+EHuSchhL7FjHgvQL/0fnnFmO4T1bhvWANX6gcnqTjtnKWbTvUMCpGnv2+t+31d7RzyEAYAd4u2fnIhHL6N/Q==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.17.tgz", + "integrity": "sha512-fGEb8f2BSA3CW7riJVurug65ACLuQAzKq0SSqkY2b2yHHH0MzDfbLyKIGzHwOI/gkHcxM/leuSW6D5w/LMNitA==", "cpu": [ "x64" ], @@ -3227,16 +3002,40 @@ "node": ">=12" } }, + "node_modules/@eslint-community/eslint-utils": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz", + "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==", + "dev": true, + "dependencies": { + "eslint-visitor-keys": "^3.3.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "peerDependencies": { + "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0" + } + }, + "node_modules/@eslint-community/regexpp": { + "version": "4.10.0", + "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.10.0.tgz", + "integrity": "sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==", + "dev": true, + "engines": { + "node": "^12.0.0 || ^14.0.0 || >=16.0.0" + } + }, "node_modules/@eslint/eslintrc": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.2.tgz", - "integrity": "sha512-AXYd23w1S/bv3fTs3Lz0vjiYemS08jWkI3hYyS9I1ry+0f+Yjs1wm+sU0BS8qDOPrBIkp4qHYC16I8uVtpLajQ==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.2.tgz", + "integrity": "sha512-+wvgpDsrB1YqAMdEUCcnTlpfVBH7Vqn6A/NT3D8WVXFIaKMlErPIZT3oCIAVCOtarRpMtelZLqJeU3t7WY6X6g==", "dev": true, "dependencies": { "ajv": "^6.12.4", "debug": "^4.3.2", - "espree": "^9.4.0", - "globals": "^13.15.0", + "espree": "^9.6.0", + "globals": "^13.19.0", "ignore": "^5.2.0", "import-fresh": "^3.2.1", "js-yaml": "^4.1.0", @@ -3272,20 +3071,10 @@ "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", "dev": true }, - "node_modules/@eslint/eslintrc/node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/@eslint/eslintrc/node_modules/globals": { - "version": "13.17.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz", - "integrity": "sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==", + "node_modules/@eslint/eslintrc/node_modules/globals": { + "version": "13.23.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.23.0.tgz", + "integrity": "sha512-XAmF0RjlrjY23MA51q3HltdlGxUpXPvg0GioKiD9X6HD28iMjo2dKC8Vqwm7lne4GNr78+RHTfliktR6ZH09wA==", "dev": true, "dependencies": { "type-fest": "^0.20.2" @@ -3315,18 +3104,6 @@ "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", "dev": true }, - "node_modules/@eslint/eslintrc/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, "node_modules/@eslint/eslintrc/node_modules/type-fest": { "version": "0.20.2", "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", @@ -3339,6 +3116,15 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/@eslint/js": { + "version": "8.52.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.52.0.tgz", + "integrity": "sha512-mjZVbpaeMZludF2fsWLD0Z9gCref1Tk4i9+wddjRvpUNqqcndPkBD09N/Mapey0b3jaXbLm2kICwFv2E64QinA==", + "dev": true, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + } + }, "node_modules/@gar/promisify": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz", @@ -3346,76 +3132,140 @@ "dev": true }, "node_modules/@golevelup/ts-jest": { - "version": "0.3.4", - "resolved": "https://registry.npmjs.org/@golevelup/ts-jest/-/ts-jest-0.3.4.tgz", - "integrity": "sha512-UXas4+20gNmYfVR7DTJ9iRppy00o0ElqQrRQyn9cF3Gq90iM1Xx1lKvipTEe5NniHDD9FiMZNweOfB+9ebZRZA==", + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/@golevelup/ts-jest/-/ts-jest-0.4.0.tgz", + "integrity": "sha512-ehgllV/xU8PC+yVyEUtTzhiSQKsr7k5Jz74B6dtCaVJz7/Vo7JiaACsCLvD7/iATlJUAEqvBson0OHewD3JDzQ==", "dev": true }, "node_modules/@humanwhocodes/config-array": { - "version": "0.10.5", - "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.10.5.tgz", - "integrity": "sha512-XVVDtp+dVvRxMoxSiSfasYaG02VEe1qH5cKgMQJWhol6HwzbcqoCMJi8dAGoYAO57jhUyhI6cWuRiTcRaDaYug==", + "version": "0.11.13", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.13.tgz", + "integrity": "sha512-JSBDMiDKSzQVngfRjOdFXgFfklaXI4K9nLF49Auh21lmBWRLIK3+xTErTWD4KU54pb6coM6ESE7Awz/FNU3zgQ==", "dev": true, "dependencies": { - "@humanwhocodes/object-schema": "^1.2.1", + "@humanwhocodes/object-schema": "^2.0.1", "debug": "^4.1.1", - "minimatch": "^3.0.4" + "minimatch": "^3.0.5" }, "engines": { "node": ">=10.10.0" } }, - "node_modules/@humanwhocodes/config-array/node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "node_modules/@humanwhocodes/module-importer": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", + "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", "dev": true, - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" + "engines": { + "node": ">=12.22" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/nzakas" } }, - "node_modules/@humanwhocodes/config-array/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "node_modules/@humanwhocodes/object-schema": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.1.tgz", + "integrity": "sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw==", + "dev": true + }, + "node_modules/@isaacs/cliui": { + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", + "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==", "dev": true, "dependencies": { - "brace-expansion": "^1.1.7" + "string-width": "^5.1.2", + "string-width-cjs": "npm:string-width@^4.2.0", + "strip-ansi": "^7.0.1", + "strip-ansi-cjs": "npm:strip-ansi@^6.0.1", + "wrap-ansi": "^8.1.0", + "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0" }, "engines": { - "node": "*" + "node": ">=12" } }, - "node_modules/@humanwhocodes/gitignore-to-minimatch": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@humanwhocodes/gitignore-to-minimatch/-/gitignore-to-minimatch-1.0.2.tgz", - "integrity": "sha512-rSqmMJDdLFUsyxR6FMtD00nfQKKLFb1kv+qBbOVKqErvloEIJLo5bDTJTQNTYgeyp78JsA7u/NPi5jT1GR/MuA==", + "node_modules/@isaacs/cliui/node_modules/ansi-regex": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", + "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", "dev": true, + "engines": { + "node": ">=12" + }, "funding": { - "type": "github", - "url": "https://github.com/sponsors/nzakas" + "url": "https://github.com/chalk/ansi-regex?sponsor=1" } }, - "node_modules/@humanwhocodes/module-importer": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", - "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", + "node_modules/@isaacs/cliui/node_modules/ansi-styles": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", + "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", "dev": true, "engines": { - "node": ">=12.22" + "node": ">=12" }, "funding": { - "type": "github", - "url": "https://github.com/sponsors/nzakas" + "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, - "node_modules/@humanwhocodes/object-schema": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz", - "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==", + "node_modules/@isaacs/cliui/node_modules/emoji-regex": { + "version": "9.2.2", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", + "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", "dev": true }, + "node_modules/@isaacs/cliui/node_modules/string-width": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", + "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", + "dev": true, + "dependencies": { + "eastasianwidth": "^0.2.0", + "emoji-regex": "^9.2.2", + "strip-ansi": "^7.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/@isaacs/cliui/node_modules/strip-ansi": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", + "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", + "dev": true, + "dependencies": { + "ansi-regex": "^6.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/strip-ansi?sponsor=1" + } + }, + "node_modules/@isaacs/cliui/node_modules/wrap-ansi": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", + "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", + "dev": true, + "dependencies": { + "ansi-styles": "^6.1.0", + "string-width": "^5.0.1", + "strip-ansi": "^7.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, "node_modules/@istanbuljs/load-nyc-config": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz", @@ -3442,20 +3292,20 @@ } }, "node_modules/@jest/console": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/console/-/console-28.1.3.tgz", - "integrity": "sha512-QPAkP5EwKdK/bxIr6C1I4Vs0rm2nHiANzj/Z5X2JQkrZo6IqvC4ldZ9K95tF0HdidhA8Bo6egxSzUFPYKcEXLw==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/console/-/console-29.7.0.tgz", + "integrity": "sha512-5Ni4CU7XHQi32IJ398EEP4RrB8eV09sXP2ROqD4bksHrnTree52PsxvX8tpL8LvTZ3pFzXyPbNQReSN41CAhOg==", "dev": true, "dependencies": { - "@jest/types": "^28.1.3", + "@jest/types": "^29.6.3", "@types/node": "*", "chalk": "^4.0.0", - "jest-message-util": "^28.1.3", - "jest-util": "^28.1.3", + "jest-message-util": "^29.7.0", + "jest-util": "^29.7.0", "slash": "^3.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/@jest/console/node_modules/ansi-styles": { @@ -3516,15 +3366,6 @@ "node": ">=8" } }, - "node_modules/@jest/console/node_modules/slash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", - "dev": true, - "engines": { - "node": ">=8" - } - }, "node_modules/@jest/console/node_modules/supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", @@ -3538,43 +3379,42 @@ } }, "node_modules/@jest/core": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/core/-/core-28.1.3.tgz", - "integrity": "sha512-CIKBrlaKOzA7YG19BEqCw3SLIsEwjZkeJzf5bdooVnW4bH5cktqe3JX+G2YV1aK5vP8N9na1IGWFzYaTp6k6NA==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/core/-/core-29.7.0.tgz", + "integrity": "sha512-n7aeXWKMnGtDA48y8TLWJPJmLmmZ642Ceo78cYWEpiD7FzDgmNDV/GCVRorPABdXLJZ/9wzzgZAlHjXjxDHGsg==", "dev": true, "dependencies": { - "@jest/console": "^28.1.3", - "@jest/reporters": "^28.1.3", - "@jest/test-result": "^28.1.3", - "@jest/transform": "^28.1.3", - "@jest/types": "^28.1.3", + "@jest/console": "^29.7.0", + "@jest/reporters": "^29.7.0", + "@jest/test-result": "^29.7.0", + "@jest/transform": "^29.7.0", + "@jest/types": "^29.6.3", "@types/node": "*", "ansi-escapes": "^4.2.1", "chalk": "^4.0.0", "ci-info": "^3.2.0", "exit": "^0.1.2", "graceful-fs": "^4.2.9", - "jest-changed-files": "^28.1.3", - "jest-config": "^28.1.3", - "jest-haste-map": "^28.1.3", - "jest-message-util": "^28.1.3", - "jest-regex-util": "^28.0.2", - "jest-resolve": "^28.1.3", - "jest-resolve-dependencies": "^28.1.3", - "jest-runner": "^28.1.3", - "jest-runtime": "^28.1.3", - "jest-snapshot": "^28.1.3", - "jest-util": "^28.1.3", - "jest-validate": "^28.1.3", - "jest-watcher": "^28.1.3", + "jest-changed-files": "^29.7.0", + "jest-config": "^29.7.0", + "jest-haste-map": "^29.7.0", + "jest-message-util": "^29.7.0", + "jest-regex-util": "^29.6.3", + "jest-resolve": "^29.7.0", + "jest-resolve-dependencies": "^29.7.0", + "jest-runner": "^29.7.0", + "jest-runtime": "^29.7.0", + "jest-snapshot": "^29.7.0", + "jest-util": "^29.7.0", + "jest-validate": "^29.7.0", + "jest-watcher": "^29.7.0", "micromatch": "^4.0.4", - "pretty-format": "^28.1.3", - "rimraf": "^3.0.0", + "pretty-format": "^29.7.0", "slash": "^3.0.0", "strip-ansi": "^6.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" }, "peerDependencies": { "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0" @@ -3643,15 +3483,6 @@ "node": ">=8" } }, - "node_modules/@jest/core/node_modules/slash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", - "dev": true, - "engines": { - "node": ">=8" - } - }, "node_modules/@jest/core/node_modules/supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", @@ -3665,88 +3496,89 @@ } }, "node_modules/@jest/environment": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-28.1.3.tgz", - "integrity": "sha512-1bf40cMFTEkKyEf585R9Iz1WayDjHoHqvts0XFYEqyKM3cFWDpeMoqKKTAF9LSYQModPUlh8FKptoM2YcMWAXA==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.7.0.tgz", + "integrity": "sha512-aQIfHDq33ExsN4jP1NWGXhxgQ/wixs60gDiKO+XVMd8Mn0NWPWgc34ZQDTb2jKaUWQ7MuwoitXAsN2XVXNMpAw==", "dev": true, "dependencies": { - "@jest/fake-timers": "^28.1.3", - "@jest/types": "^28.1.3", + "@jest/fake-timers": "^29.7.0", + "@jest/types": "^29.6.3", "@types/node": "*", - "jest-mock": "^28.1.3" + "jest-mock": "^29.7.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/@jest/expect": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-28.1.3.tgz", - "integrity": "sha512-lzc8CpUbSoE4dqT0U+g1qODQjBRHPpCPXissXD4mS9+sWQdmmpeJ9zSH1rS1HEkrsMN0fb7nKrJ9giAR1d3wBw==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.7.0.tgz", + "integrity": "sha512-8uMeAMycttpva3P1lBHB8VciS9V0XAr3GymPpipdyQXbBcuhkLQOSe8E/p92RyAdToS6ZD1tFkX+CkhoECE0dQ==", "dev": true, "dependencies": { - "expect": "^28.1.3", - "jest-snapshot": "^28.1.3" + "expect": "^29.7.0", + "jest-snapshot": "^29.7.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/@jest/expect-utils": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-28.1.3.tgz", - "integrity": "sha512-wvbi9LUrHJLn3NlDW6wF2hvIMtd4JUl2QNVrjq+IBSHirgfrR3o9RnVtxzdEGO2n9JyIWwHnLfby5KzqBGg2YA==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.7.0.tgz", + "integrity": "sha512-GlsNBWiFQFCVi9QVSx7f5AgMeLxe9YCCs5PuP2O2LdjDAA8Jh9eX7lA1Jq/xdXw3Wb3hyvlFNfZIfcRetSzYcA==", "dev": true, "dependencies": { - "jest-get-type": "^28.0.2" + "jest-get-type": "^29.6.3" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/@jest/fake-timers": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-28.1.3.tgz", - "integrity": "sha512-D/wOkL2POHv52h+ok5Oj/1gOG9HSywdoPtFsRCUmlCILXNn5eIWmcnd3DIiWlJnpGvQtmajqBP95Ei0EimxfLw==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.7.0.tgz", + "integrity": "sha512-q4DH1Ha4TTFPdxLsqDXK1d3+ioSL7yL5oCMJZgDYm6i+6CygW5E5xVr/D1HdsGxjt1ZWSfUAs9OxSB/BNelWrQ==", "dev": true, "dependencies": { - "@jest/types": "^28.1.3", - "@sinonjs/fake-timers": "^9.1.2", + "@jest/types": "^29.6.3", + "@sinonjs/fake-timers": "^10.0.2", "@types/node": "*", - "jest-message-util": "^28.1.3", - "jest-mock": "^28.1.3", - "jest-util": "^28.1.3" + "jest-message-util": "^29.7.0", + "jest-mock": "^29.7.0", + "jest-util": "^29.7.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/@jest/globals": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-28.1.3.tgz", - "integrity": "sha512-XFU4P4phyryCXu1pbcqMO0GSQcYe1IsalYCDzRNyhetyeyxMcIxa11qPNDpVNLeretItNqEmYYQn1UYz/5x1NA==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.7.0.tgz", + "integrity": "sha512-mpiz3dutLbkW2MNFubUGUEVLkTGiqW6yLVTA+JbP6fI6J5iL9Y0Nlg8k95pcF8ctKwCS7WVxteBs29hhfAotzQ==", "dev": true, "dependencies": { - "@jest/environment": "^28.1.3", - "@jest/expect": "^28.1.3", - "@jest/types": "^28.1.3" + "@jest/environment": "^29.7.0", + "@jest/expect": "^29.7.0", + "@jest/types": "^29.6.3", + "jest-mock": "^29.7.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/@jest/reporters": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-28.1.3.tgz", - "integrity": "sha512-JuAy7wkxQZVNU/V6g9xKzCGC5LVXx9FDcABKsSXp5MiKPEE2144a/vXTEDoyzjUpZKfVwp08Wqg5A4WfTMAzjg==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.7.0.tgz", + "integrity": "sha512-DApq0KJbJOEzAFYjHADNNxAE3KbhxQB1y5Kplb5Waqw6zVbuWatSnMjE5gs8FUgEPmNsnZA3NCWl9NG0ia04Pg==", "dev": true, "dependencies": { "@bcoe/v8-coverage": "^0.2.3", - "@jest/console": "^28.1.3", - "@jest/test-result": "^28.1.3", - "@jest/transform": "^28.1.3", - "@jest/types": "^28.1.3", - "@jridgewell/trace-mapping": "^0.3.13", + "@jest/console": "^29.7.0", + "@jest/test-result": "^29.7.0", + "@jest/transform": "^29.7.0", + "@jest/types": "^29.6.3", + "@jridgewell/trace-mapping": "^0.3.18", "@types/node": "*", "chalk": "^4.0.0", "collect-v8-coverage": "^1.0.0", @@ -3754,21 +3586,20 @@ "glob": "^7.1.3", "graceful-fs": "^4.2.9", "istanbul-lib-coverage": "^3.0.0", - "istanbul-lib-instrument": "^5.1.0", + "istanbul-lib-instrument": "^6.0.0", "istanbul-lib-report": "^3.0.0", "istanbul-lib-source-maps": "^4.0.0", "istanbul-reports": "^3.1.3", - "jest-message-util": "^28.1.3", - "jest-util": "^28.1.3", - "jest-worker": "^28.1.3", + "jest-message-util": "^29.7.0", + "jest-util": "^29.7.0", + "jest-worker": "^29.7.0", "slash": "^3.0.0", "string-length": "^4.0.1", "strip-ansi": "^6.0.0", - "terminal-link": "^2.0.0", "v8-to-istanbul": "^9.0.1" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" }, "peerDependencies": { "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0" @@ -3794,16 +3625,6 @@ "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, - "node_modules/@jest/reporters/node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, "node_modules/@jest/reporters/node_modules/chalk": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", @@ -3838,26 +3659,6 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, - "node_modules/@jest/reporters/node_modules/glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "dev": true, - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, "node_modules/@jest/reporters/node_modules/has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", @@ -3867,54 +3668,20 @@ "node": ">=8" } }, - "node_modules/@jest/reporters/node_modules/jest-worker": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-28.1.3.tgz", - "integrity": "sha512-CqRA220YV/6jCo8VWvAt1KKx6eek1VIHMPeLEbpcfSfkEeWyBNppynM/o6q+Wmw+sOhos2ml34wZbSX3G13//g==", - "dev": true, - "dependencies": { - "@types/node": "*", - "merge-stream": "^2.0.0", - "supports-color": "^8.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/@jest/reporters/node_modules/jest-worker/node_modules/supports-color": { - "version": "8.1.1", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", - "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", + "node_modules/@jest/reporters/node_modules/istanbul-lib-instrument": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.1.tgz", + "integrity": "sha512-EAMEJBsYuyyztxMxW3g7ugGPkrZsV57v0Hmv3mm1uQsmB+QnZuepg731CRaIgeUVSdmsTngOkSnauNF8p7FIhA==", "dev": true, "dependencies": { - "has-flag": "^4.0.0" + "@babel/core": "^7.12.3", + "@babel/parser": "^7.14.7", + "@istanbuljs/schema": "^0.1.2", + "istanbul-lib-coverage": "^3.2.0", + "semver": "^7.5.4" }, "engines": { "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/supports-color?sponsor=1" - } - }, - "node_modules/@jest/reporters/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "node_modules/@jest/reporters/node_modules/slash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", - "dev": true, - "engines": { - "node": ">=8" } }, "node_modules/@jest/reporters/node_modules/supports-color": { @@ -3930,94 +3697,85 @@ } }, "node_modules/@jest/schemas": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz", - "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==", + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", + "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==", "dev": true, "dependencies": { - "@sinclair/typebox": "^0.24.1" + "@sinclair/typebox": "^0.27.8" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/@jest/source-map": { - "version": "28.1.2", - "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-28.1.2.tgz", - "integrity": "sha512-cV8Lx3BeStJb8ipPHnqVw/IM2VCMWO3crWZzYodSIkxXnRcXJipCdx1JCK0K5MsJJouZQTH73mzf4vgxRaH9ww==", + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-29.6.3.tgz", + "integrity": "sha512-MHjT95QuipcPrpLM+8JMSzFx6eHp5Bm+4XeFDJlwsvVBjmKNiIAvasGK2fxz2WbGRlnvqehFbh07MMa7n3YJnw==", "dev": true, "dependencies": { - "@jridgewell/trace-mapping": "^0.3.13", + "@jridgewell/trace-mapping": "^0.3.18", "callsites": "^3.0.0", "graceful-fs": "^4.2.9" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/@jest/test-result": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-28.1.3.tgz", - "integrity": "sha512-kZAkxnSE+FqE8YjW8gNuoVkkC9I7S1qmenl8sGcDOLropASP+BkcGKwhXoyqQuGOGeYY0y/ixjrd/iERpEXHNg==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.7.0.tgz", + "integrity": "sha512-Fdx+tv6x1zlkJPcWXmMDAG2HBnaR9XPSd5aDWQVsfrZmLVT3lU1cwyxLgRmXR9yrq4NBoEm9BMsfgFzTQAbJYA==", "dev": true, "dependencies": { - "@jest/console": "^28.1.3", - "@jest/types": "^28.1.3", + "@jest/console": "^29.7.0", + "@jest/types": "^29.6.3", "@types/istanbul-lib-coverage": "^2.0.0", "collect-v8-coverage": "^1.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/@jest/test-sequencer": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-28.1.3.tgz", - "integrity": "sha512-NIMPEqqa59MWnDi1kvXXpYbqsfQmSJsIbnd85mdVGkiDfQ9WQQTXOLsvISUfonmnBT+w85WEgneCigEEdHDFxw==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.7.0.tgz", + "integrity": "sha512-GQwJ5WZVrKnOJuiYiAF52UNUJXgTZx1NHjFSEB0qEMmSZKAkdMoIzw/Cj6x6NF4AvV23AUqDpFzQkN/eYCYTxw==", "dev": true, "dependencies": { - "@jest/test-result": "^28.1.3", + "@jest/test-result": "^29.7.0", "graceful-fs": "^4.2.9", - "jest-haste-map": "^28.1.3", + "jest-haste-map": "^29.7.0", "slash": "^3.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/@jest/test-sequencer/node_modules/slash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", - "dev": true, - "engines": { - "node": ">=8" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/@jest/transform": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-28.1.3.tgz", - "integrity": "sha512-u5dT5di+oFI6hfcLOHGTAfmUxFRrjK+vnaP0kkVow9Md/M7V/MxqQMOz/VV25UZO8pzeA9PjfTpOu6BDuwSPQA==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.7.0.tgz", + "integrity": "sha512-ok/BTPFzFKVMwO5eOHRrvnBVHdRy9IrsrW1GpMaQ9MCnilNLXQKmAX8s1YXDFaai9xJpac2ySzV0YeRRECr2Vw==", "dev": true, "dependencies": { "@babel/core": "^7.11.6", - "@jest/types": "^28.1.3", - "@jridgewell/trace-mapping": "^0.3.13", + "@jest/types": "^29.6.3", + "@jridgewell/trace-mapping": "^0.3.18", "babel-plugin-istanbul": "^6.1.1", "chalk": "^4.0.0", - "convert-source-map": "^1.4.0", - "fast-json-stable-stringify": "^2.0.0", + "convert-source-map": "^2.0.0", + "fast-json-stable-stringify": "^2.1.0", "graceful-fs": "^4.2.9", - "jest-haste-map": "^28.1.3", - "jest-regex-util": "^28.0.2", - "jest-util": "^28.1.3", + "jest-haste-map": "^29.7.0", + "jest-regex-util": "^29.6.3", + "jest-util": "^29.7.0", "micromatch": "^4.0.4", "pirates": "^4.0.4", "slash": "^3.0.0", - "write-file-atomic": "^4.0.1" + "write-file-atomic": "^4.0.2" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/@jest/transform/node_modules/ansi-styles": { @@ -4069,6 +3827,12 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, + "node_modules/@jest/transform/node_modules/convert-source-map": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", + "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", + "dev": true + }, "node_modules/@jest/transform/node_modules/has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", @@ -4078,15 +3842,6 @@ "node": ">=8" } }, - "node_modules/@jest/transform/node_modules/slash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", - "dev": true, - "engines": { - "node": ">=8" - } - }, "node_modules/@jest/transform/node_modules/supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", @@ -4100,12 +3855,12 @@ } }, "node_modules/@jest/types": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz", - "integrity": "sha512-RyjiyMUZrKz/c+zlMFO1pm70DcIlST8AeWTkoUdZevew44wcNZQHsEVOiCVtgVnlFFD82FPaXycys58cf2muVQ==", + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", + "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", "dev": true, "dependencies": { - "@jest/schemas": "^28.1.3", + "@jest/schemas": "^29.6.3", "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^3.0.0", "@types/node": "*", @@ -4113,7 +3868,7 @@ "chalk": "^4.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/@jest/types/node_modules/ansi-styles": { @@ -4187,22 +3942,23 @@ } }, "node_modules/@jridgewell/gen-mapping": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz", - "integrity": "sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==", + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz", + "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==", "dev": true, "dependencies": { - "@jridgewell/set-array": "^1.0.0", - "@jridgewell/sourcemap-codec": "^1.4.10" + "@jridgewell/set-array": "^1.0.1", + "@jridgewell/sourcemap-codec": "^1.4.10", + "@jridgewell/trace-mapping": "^0.3.9" }, "engines": { "node": ">=6.0.0" } }, "node_modules/@jridgewell/resolve-uri": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz", - "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz", + "integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==", "dev": true, "engines": { "node": ">=6.0.0" @@ -4218,43 +3974,29 @@ } }, "node_modules/@jridgewell/source-map": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.2.tgz", - "integrity": "sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==", + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.5.tgz", + "integrity": "sha512-UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ==", "dev": true, "dependencies": { "@jridgewell/gen-mapping": "^0.3.0", "@jridgewell/trace-mapping": "^0.3.9" } }, - "node_modules/@jridgewell/source-map/node_modules/@jridgewell/gen-mapping": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz", - "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==", - "dev": true, - "dependencies": { - "@jridgewell/set-array": "^1.0.1", - "@jridgewell/sourcemap-codec": "^1.4.10", - "@jridgewell/trace-mapping": "^0.3.9" - }, - "engines": { - "node": ">=6.0.0" - } - }, "node_modules/@jridgewell/sourcemap-codec": { - "version": "1.4.14", - "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz", - "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==", + "version": "1.4.15", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz", + "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==", "dev": true }, "node_modules/@jridgewell/trace-mapping": { - "version": "0.3.17", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz", - "integrity": "sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==", + "version": "0.3.20", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.20.tgz", + "integrity": "sha512-R8LcPeWZol2zR8mmH3JeKQ6QRCFb7XgUhV9ZlGhHLGyg4wpPiPZNQOOWhFZhxKw8u//yTbNGI42Bx/3paXEQ+Q==", "dev": true, "dependencies": { - "@jridgewell/resolve-uri": "3.1.0", - "@jridgewell/sourcemap-codec": "1.4.14" + "@jridgewell/resolve-uri": "^3.1.0", + "@jridgewell/sourcemap-codec": "^1.4.14" } }, "node_modules/@leichtgewicht/ip-codec": { @@ -4264,816 +4006,817 @@ "dev": true }, "node_modules/@material/animation": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/animation/-/animation-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-5osi1z4JQIXcklPALbH/zTfOm2pDzHt9Fxm7ZyURy250xIZj6QjULRzPTnzOhC2ropfix9ra2Cfggbf0dcRbEQ==", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/animation/-/animation-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-leRf+BcZTfC/iSigLXnYgcHAGvFVQveoJT5+2PIRdyPI/bIG7hhciRgacHRsCKC0sGya81dDblLgdkjSUemYLw==", "dependencies": { "tslib": "^2.1.0" } }, "node_modules/@material/auto-init": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/auto-init/-/auto-init-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-OigQTmrVzkcGvxNjOaIe5oItTFPgrO9xLewvharDI6m6yvO1z7OBnkcW+sFN6ggLNYNxd0O1u9v64vMsmeDABQ==", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/auto-init/-/auto-init-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-uxzDq7q3c0Bu1pAsMugc1Ik9ftQYQqZY+5e2ybNplT8gTImJhNt4M2mMiMHbMANk2l3UgICmUyRSomgPBWCPIA==", "dependencies": { - "@material/base": "15.0.0-canary.684e33d25.0", + "@material/base": "15.0.0-canary.bc9ae6c9c.0", "tslib": "^2.1.0" } }, "node_modules/@material/banner": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/banner/-/banner-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-PqtGp3KWzdu58rWv/DIvSfe38m5YKOBbAAbBinSvgadBb/da+IE1t5F7YPNKE1T5lJsQBGVUYx6QBIeXm+aI/A==", - "dependencies": { - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/button": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/banner/-/banner-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-SHeVoidCUFVhXANN6MNWxK9SZoTSgpIP8GZB7kAl52BywLxtV+FirTtLXkg/8RUkxZRyRWl7HvQ0ZFZa7QQAyA==", + "dependencies": { + "@material/base": "15.0.0-canary.bc9ae6c9c.0", + "@material/button": "15.0.0-canary.bc9ae6c9c.0", + "@material/dom": "15.0.0-canary.bc9ae6c9c.0", + "@material/elevation": "15.0.0-canary.bc9ae6c9c.0", + "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0", + "@material/ripple": "15.0.0-canary.bc9ae6c9c.0", + "@material/rtl": "15.0.0-canary.bc9ae6c9c.0", + "@material/shape": "15.0.0-canary.bc9ae6c9c.0", + "@material/theme": "15.0.0-canary.bc9ae6c9c.0", + "@material/tokens": "15.0.0-canary.bc9ae6c9c.0", + "@material/typography": "15.0.0-canary.bc9ae6c9c.0", "tslib": "^2.1.0" } }, "node_modules/@material/base": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/base/-/base-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-oOaqb/SfjWwTKsdJUZmeh/Qrs41nIJI0N+zELsxnvbGjSIN1ZMAKYZFPMahqvC68OJ6+5CvJM8PoTNs5l+B8IQ==", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/base/-/base-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-Fc3vGuOf+duGo22HTRP6dHdc+MUe0VqQfWOuKrn/wXKD62m0QQR2TqJd3rRhCumH557T5QUyheW943M3E+IGfg==", "dependencies": { "tslib": "^2.1.0" } }, "node_modules/@material/button": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/button/-/button-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-Nkekk4edeX+ObVOa7UlwavaHdmckPV5wU4SAJf3iA3R61cmz+KsgAgpzfcwv5WfNhIlc2nLu8QYEecpHdo9d/w==", - "dependencies": { - "@material/density": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/focus-ring": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", - "@material/touch-target": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/button/-/button-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-3AQgwrPZCTWHDJvwgKq7Cj+BurQ4wTjDdGL+FEnIGUAjJDskwi1yzx5tW2Wf/NxIi7IoPFyOY3UB41jwMiOrnw==", + "dependencies": { + "@material/density": "15.0.0-canary.bc9ae6c9c.0", + "@material/dom": "15.0.0-canary.bc9ae6c9c.0", + "@material/elevation": "15.0.0-canary.bc9ae6c9c.0", + "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0", + "@material/focus-ring": "15.0.0-canary.bc9ae6c9c.0", + "@material/ripple": "15.0.0-canary.bc9ae6c9c.0", + "@material/rtl": "15.0.0-canary.bc9ae6c9c.0", + "@material/shape": "15.0.0-canary.bc9ae6c9c.0", + "@material/theme": "15.0.0-canary.bc9ae6c9c.0", + "@material/tokens": "15.0.0-canary.bc9ae6c9c.0", + "@material/touch-target": "15.0.0-canary.bc9ae6c9c.0", + "@material/typography": "15.0.0-canary.bc9ae6c9c.0", "tslib": "^2.1.0" } }, "node_modules/@material/card": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/card/-/card-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-xhyB7XX5KkEiCEqwSPkl58ZGYL6xFdnY62zimyBXJRG/Eaa0Swj3kW20hVCpt4f7c9Zmp8Se27rg8vnKmhvO3g==", - "dependencies": { - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/card/-/card-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-nPlhiWvbLmooTnBmV5gmzB0eLWSgLKsSRBYAbIBmO76Okgz1y+fQNLag+lpm/TDaHVsn5fmQJH8e0zIg0rYsQA==", + "dependencies": { + "@material/dom": "15.0.0-canary.bc9ae6c9c.0", + "@material/elevation": "15.0.0-canary.bc9ae6c9c.0", + "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0", + "@material/ripple": "15.0.0-canary.bc9ae6c9c.0", + "@material/rtl": "15.0.0-canary.bc9ae6c9c.0", + "@material/shape": "15.0.0-canary.bc9ae6c9c.0", + "@material/theme": "15.0.0-canary.bc9ae6c9c.0", + "@material/tokens": "15.0.0-canary.bc9ae6c9c.0", "tslib": "^2.1.0" } }, "node_modules/@material/checkbox": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/checkbox/-/checkbox-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-NFpM3TS924PmVsk2KQLNU95OYCf8ZwYgzeqfnAexU0bEfjUJXINBun2Go0AaeOUMjuvWUe+byjrXgv8SFYbMUA==", - "dependencies": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/density": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/focus-ring": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/touch-target": "15.0.0-canary.684e33d25.0", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/checkbox/-/checkbox-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-4tpNnO1L0IppoMF3oeQn8F17t2n0WHB0D7mdJK9rhrujen/fLbekkIC82APB3fdGtLGg3qeNqDqPsJm1YnmrwA==", + "dependencies": { + "@material/animation": "15.0.0-canary.bc9ae6c9c.0", + "@material/base": "15.0.0-canary.bc9ae6c9c.0", + "@material/density": "15.0.0-canary.bc9ae6c9c.0", + "@material/dom": "15.0.0-canary.bc9ae6c9c.0", + "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0", + "@material/focus-ring": "15.0.0-canary.bc9ae6c9c.0", + "@material/ripple": "15.0.0-canary.bc9ae6c9c.0", + "@material/rtl": "15.0.0-canary.bc9ae6c9c.0", + "@material/theme": "15.0.0-canary.bc9ae6c9c.0", + "@material/touch-target": "15.0.0-canary.bc9ae6c9c.0", "tslib": "^2.1.0" } }, "node_modules/@material/chips": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/chips/-/chips-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-z4ajQ4NnsAQ/Si9tZ4xmxzjj2Qb+vW++4QjCjjjwAGIZbCe0xglAnMh2t66XLJUxt7RoKZuZVEO7ZqcFZpvJFQ==", - "dependencies": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/checkbox": "15.0.0-canary.684e33d25.0", - "@material/density": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/focus-ring": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", - "@material/touch-target": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/chips/-/chips-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-fqHKvE5bSWK0bXVkf57MWxZtytGqYBZvvHIOs4JI9HPHEhaJy4CpSw562BEtbm3yFxxALoQknvPW2KYzvADnmA==", + "dependencies": { + "@material/animation": "15.0.0-canary.bc9ae6c9c.0", + "@material/base": "15.0.0-canary.bc9ae6c9c.0", + "@material/checkbox": "15.0.0-canary.bc9ae6c9c.0", + "@material/density": "15.0.0-canary.bc9ae6c9c.0", + "@material/dom": "15.0.0-canary.bc9ae6c9c.0", + "@material/elevation": "15.0.0-canary.bc9ae6c9c.0", + "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0", + "@material/focus-ring": "15.0.0-canary.bc9ae6c9c.0", + "@material/ripple": "15.0.0-canary.bc9ae6c9c.0", + "@material/rtl": "15.0.0-canary.bc9ae6c9c.0", + "@material/shape": "15.0.0-canary.bc9ae6c9c.0", + "@material/theme": "15.0.0-canary.bc9ae6c9c.0", + "@material/tokens": "15.0.0-canary.bc9ae6c9c.0", + "@material/touch-target": "15.0.0-canary.bc9ae6c9c.0", + "@material/typography": "15.0.0-canary.bc9ae6c9c.0", "safevalues": "^0.3.4", "tslib": "^2.1.0" } }, "node_modules/@material/circular-progress": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/circular-progress/-/circular-progress-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-G6qD0nGNtEUwWnAMJuA9INYFpZoKtx7KFjBaPF4Ol2YLHtmShALNAYyn54TMAK8AZ2IpW08PXjGS7Ye88vrdEQ==", - "dependencies": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/progress-indicator": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/circular-progress/-/circular-progress-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-Lxe8BGAxQwCQqrLhrYrIP0Uok10h7aYS3RBXP41ph+5GmwJd5zdyE2t93qm2dyThvU6qKuXw9726Dtq/N+wvZQ==", + "dependencies": { + "@material/animation": "15.0.0-canary.bc9ae6c9c.0", + "@material/base": "15.0.0-canary.bc9ae6c9c.0", + "@material/dom": "15.0.0-canary.bc9ae6c9c.0", + "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0", + "@material/progress-indicator": "15.0.0-canary.bc9ae6c9c.0", + "@material/rtl": "15.0.0-canary.bc9ae6c9c.0", + "@material/theme": "15.0.0-canary.bc9ae6c9c.0", "tslib": "^2.1.0" } }, "node_modules/@material/data-table": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/data-table/-/data-table-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-+wDw1DDDFfAsKAMzs84f/5GCjux39zjNfW8tL4wFbkWNwewmQrG9zaQMJhBpVOtLCrM8Gj6SOgOANqgqoCjvGg==", - "dependencies": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/checkbox": "15.0.0-canary.684e33d25.0", - "@material/density": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/icon-button": "15.0.0-canary.684e33d25.0", - "@material/linear-progress": "15.0.0-canary.684e33d25.0", - "@material/list": "15.0.0-canary.684e33d25.0", - "@material/menu": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/select": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", - "@material/touch-target": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/data-table/-/data-table-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-j/7qplT9+sUpfe4pyWhPbl01qJA+OoNAG3VMJruBBR461ZBKyTi7ssKH9yksFGZ8eCEPkOsk/+kDxsiZvRWkeQ==", + "dependencies": { + "@material/animation": "15.0.0-canary.bc9ae6c9c.0", + "@material/base": "15.0.0-canary.bc9ae6c9c.0", + "@material/checkbox": "15.0.0-canary.bc9ae6c9c.0", + "@material/density": "15.0.0-canary.bc9ae6c9c.0", + "@material/dom": "15.0.0-canary.bc9ae6c9c.0", + "@material/elevation": "15.0.0-canary.bc9ae6c9c.0", + "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0", + "@material/icon-button": "15.0.0-canary.bc9ae6c9c.0", + "@material/linear-progress": "15.0.0-canary.bc9ae6c9c.0", + "@material/list": "15.0.0-canary.bc9ae6c9c.0", + "@material/menu": "15.0.0-canary.bc9ae6c9c.0", + "@material/rtl": "15.0.0-canary.bc9ae6c9c.0", + "@material/select": "15.0.0-canary.bc9ae6c9c.0", + "@material/shape": "15.0.0-canary.bc9ae6c9c.0", + "@material/theme": "15.0.0-canary.bc9ae6c9c.0", + "@material/tokens": "15.0.0-canary.bc9ae6c9c.0", + "@material/touch-target": "15.0.0-canary.bc9ae6c9c.0", + "@material/typography": "15.0.0-canary.bc9ae6c9c.0", "tslib": "^2.1.0" } }, "node_modules/@material/density": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/density/-/density-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-661yEVRMGrlq6S6WuSbPRO+ZwpdUOg2glCc7y96doM6itSLOa3UEAldjOLfsYZVB74GnKCiuDp//QmfoRyYTfA==", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/density/-/density-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-Zt3u07fXrBWLW06Tl5fgvjicxNQMkFdawLyNTzZ5TvbXfVkErILLePwwGaw8LNcvzqJP6ABLA8jiR+sKNoJQCg==", "dependencies": { "tslib": "^2.1.0" } }, "node_modules/@material/dialog": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/dialog/-/dialog-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-szn0dHnfeQTSOC6SSRSGAzX6Tnx+4NnSMUwNkXm+3bwjds8ZVK26+DXwLrP5f3ID5F1K5sFsRf2INo5/TNTHyQ==", - "dependencies": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/button": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/icon-button": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", - "@material/touch-target": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/dialog/-/dialog-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-o+9a/fmwJ9+gY3Z/uhj/PMVJDq7it1NTWKJn2GwAKdB+fDkT4hb9qEdcxMPyvJJ5ups+XiKZo03+tZrD+38c1w==", + "dependencies": { + "@material/animation": "15.0.0-canary.bc9ae6c9c.0", + "@material/base": "15.0.0-canary.bc9ae6c9c.0", + "@material/button": "15.0.0-canary.bc9ae6c9c.0", + "@material/dom": "15.0.0-canary.bc9ae6c9c.0", + "@material/elevation": "15.0.0-canary.bc9ae6c9c.0", + "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0", + "@material/icon-button": "15.0.0-canary.bc9ae6c9c.0", + "@material/ripple": "15.0.0-canary.bc9ae6c9c.0", + "@material/rtl": "15.0.0-canary.bc9ae6c9c.0", + "@material/shape": "15.0.0-canary.bc9ae6c9c.0", + "@material/theme": "15.0.0-canary.bc9ae6c9c.0", + "@material/tokens": "15.0.0-canary.bc9ae6c9c.0", + "@material/touch-target": "15.0.0-canary.bc9ae6c9c.0", + "@material/typography": "15.0.0-canary.bc9ae6c9c.0", "tslib": "^2.1.0" } }, "node_modules/@material/dom": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/dom/-/dom-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-7pEJLYov+tGgfuD8mZxoVU6rWtPI8ppjTAhz+F27Hz9FG0JETMWTKpDPBXLnKvX7vhIxL83GvZ9geNHCe8Hfog==", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/dom/-/dom-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-ly78R7aoCJtundSUu0UROU+5pQD5Piae0Y1MkN6bs0724azeazX1KeXFeaf06JOXnlr5/41ol+fSUPowjoqnOg==", "dependencies": { - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", + "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0", + "@material/rtl": "15.0.0-canary.bc9ae6c9c.0", "tslib": "^2.1.0" } }, "node_modules/@material/drawer": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/drawer/-/drawer-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-/KMckLf1PYU/H3PXnS4e0aFl03qG3JlSv4LGgX6juJufcONqGTl/m63EMO/L/eUy6H1CRrXmVDjik/jzHLyDhg==", - "dependencies": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/list": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/drawer/-/drawer-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-PFL4cEFnt7VTxDsuspFVNhsFDYyumjU0VWfj3PWB7XudsEfQ3lo85D3HCEtTTbRsCainGN8bgYNDNafLBqiigw==", + "dependencies": { + "@material/animation": "15.0.0-canary.bc9ae6c9c.0", + "@material/base": "15.0.0-canary.bc9ae6c9c.0", + "@material/dom": "15.0.0-canary.bc9ae6c9c.0", + "@material/elevation": "15.0.0-canary.bc9ae6c9c.0", + "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0", + "@material/list": "15.0.0-canary.bc9ae6c9c.0", + "@material/ripple": "15.0.0-canary.bc9ae6c9c.0", + "@material/rtl": "15.0.0-canary.bc9ae6c9c.0", + "@material/shape": "15.0.0-canary.bc9ae6c9c.0", + "@material/theme": "15.0.0-canary.bc9ae6c9c.0", + "@material/typography": "15.0.0-canary.bc9ae6c9c.0", "tslib": "^2.1.0" } }, "node_modules/@material/elevation": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/elevation/-/elevation-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-WDF8SsRtq3rXUbVVbd9K4DUijIPH0bUFSOreVYxudpuxAfTlDS5+aeS1EK9UIBFYLuba4u5wVT2tDv6e1RTfrQ==", - "dependencies": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/elevation/-/elevation-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-Ro+Pk8jFuap+T0B0shA3xI1hs2b89dNQ2EIPCNjNMp87emHKAzJfhKb7EZGIwv3+gFLlVaLyIVkb94I89KLsyg==", + "dependencies": { + "@material/animation": "15.0.0-canary.bc9ae6c9c.0", + "@material/base": "15.0.0-canary.bc9ae6c9c.0", + "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0", + "@material/rtl": "15.0.0-canary.bc9ae6c9c.0", + "@material/theme": "15.0.0-canary.bc9ae6c9c.0", "tslib": "^2.1.0" } }, "node_modules/@material/fab": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/fab/-/fab-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-KCu87rWOKEAe9vZcAm6K8XazYSWPNjMG+OhrbPjHW6bCO7as1YCgtmkBkhff7csY/rFmcVpIy884xtUfLmSudQ==", - "dependencies": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/focus-ring": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", - "@material/touch-target": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/fab/-/fab-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-dvU0KWMRglwJEQwmQtFAmJcAjzg9VFF6Aqj78bJYu/DAIGFJ1VTTTSgoXM/XCm1YyQEZ7kZRvxBO37CH54rSDg==", + "dependencies": { + "@material/animation": "15.0.0-canary.bc9ae6c9c.0", + "@material/dom": "15.0.0-canary.bc9ae6c9c.0", + "@material/elevation": "15.0.0-canary.bc9ae6c9c.0", + "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0", + "@material/focus-ring": "15.0.0-canary.bc9ae6c9c.0", + "@material/ripple": "15.0.0-canary.bc9ae6c9c.0", + "@material/rtl": "15.0.0-canary.bc9ae6c9c.0", + "@material/shape": "15.0.0-canary.bc9ae6c9c.0", + "@material/theme": "15.0.0-canary.bc9ae6c9c.0", + "@material/tokens": "15.0.0-canary.bc9ae6c9c.0", + "@material/touch-target": "15.0.0-canary.bc9ae6c9c.0", + "@material/typography": "15.0.0-canary.bc9ae6c9c.0", "tslib": "^2.1.0" } }, "node_modules/@material/feature-targeting": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/feature-targeting/-/feature-targeting-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-HyH1erNTSjS63sigNSUMaCd0nJhTNdDFeC+myrxwtDaQm+uYJ8troCNtQM3g6mx0XATNtX5aTOoPmrM6yVVi1A==", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/feature-targeting/-/feature-targeting-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-wkDjVcoVEYYaJvun28IXdln/foLgPD7n9ZC9TY76GErGCwTq+HWpU6wBAAk+ePmpRFDayw4vI4wBlaWGxLtysQ==", "dependencies": { "tslib": "^2.1.0" } }, "node_modules/@material/floating-label": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/floating-label/-/floating-label-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-f7TPp6bKpGvV3sYYiZHSGlrixXKkXXITW3Esp7KB9jRq42c0H82novmdwvY0eTef4ootmA2JEysr78KQfHBUPg==", - "dependencies": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/floating-label/-/floating-label-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-bUWPtXzZITOD/2mkvLkEPO1ngDWmb74y0Kgbz6llHLOQBtycyJIpuoQJ1q2Ez0NM/tFLwPphhAgRqmL3YQ/Kzw==", + "dependencies": { + "@material/animation": "15.0.0-canary.bc9ae6c9c.0", + "@material/base": "15.0.0-canary.bc9ae6c9c.0", + "@material/dom": "15.0.0-canary.bc9ae6c9c.0", + "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0", + "@material/rtl": "15.0.0-canary.bc9ae6c9c.0", + "@material/theme": "15.0.0-canary.bc9ae6c9c.0", + "@material/typography": "15.0.0-canary.bc9ae6c9c.0", "tslib": "^2.1.0" } }, "node_modules/@material/focus-ring": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/focus-ring/-/focus-ring-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-ikw2RVUfgzXChpWIzPH1VzRvTjYb5ZKj4H+CZf7jqPUXMstFOZg90Bp7ARLZHqYiyNMuUq3zUTHozS6iHorSqg==", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/focus-ring/-/focus-ring-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-cZHThVose3GvAlJzpJoBI1iqL6d1/Jj9hXrR+r8Mwtb1hBIUEG3hxfsRd4vGREuzROPlf0OgNf/V+YHoSwgR5w==", "dependencies": { - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0" + "@material/dom": "15.0.0-canary.bc9ae6c9c.0", + "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0", + "@material/rtl": "15.0.0-canary.bc9ae6c9c.0" } }, "node_modules/@material/form-field": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/form-field/-/form-field-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-vpF9N/uq5no/7+8GAbEH0868FhOuBgxAWRr1Sfb+jthKfBr8OS/wPU/AHzZHdHdAm7PQynbeOXfDsX2dI//PDA==", - "dependencies": { - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/form-field/-/form-field-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-+JFXy5X44Gue1CbZZAQ6YejnI203lebYwL0i6k0ylDpWHEOdD5xkF2PyHR28r9/65Ebcbwbff6q7kI1SGoT7MA==", + "dependencies": { + "@material/base": "15.0.0-canary.bc9ae6c9c.0", + "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0", + "@material/ripple": "15.0.0-canary.bc9ae6c9c.0", + "@material/rtl": "15.0.0-canary.bc9ae6c9c.0", + "@material/theme": "15.0.0-canary.bc9ae6c9c.0", + "@material/typography": "15.0.0-canary.bc9ae6c9c.0", "tslib": "^2.1.0" } }, "node_modules/@material/icon-button": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/icon-button/-/icon-button-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-wMI+XGzmIN/o2ePBKg2hLyx7H4pXCRAyyIKMQS1FMp1UKa2tYmiHVX/V8skhKwCqxg3i6Ls/LxMjfPxTR18WvQ==", - "dependencies": { - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/density": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/focus-ring": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/touch-target": "15.0.0-canary.684e33d25.0", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/icon-button/-/icon-button-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-1a0MHgyIwOs4RzxrVljsqSizGYFlM1zY2AZaLDsgT4G3kzsplTx8HZQ022GpUCjAygW+WLvg4z1qAhQHvsbqlw==", + "dependencies": { + "@material/base": "15.0.0-canary.bc9ae6c9c.0", + "@material/density": "15.0.0-canary.bc9ae6c9c.0", + "@material/dom": "15.0.0-canary.bc9ae6c9c.0", + "@material/elevation": "15.0.0-canary.bc9ae6c9c.0", + "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0", + "@material/focus-ring": "15.0.0-canary.bc9ae6c9c.0", + "@material/ripple": "15.0.0-canary.bc9ae6c9c.0", + "@material/rtl": "15.0.0-canary.bc9ae6c9c.0", + "@material/theme": "15.0.0-canary.bc9ae6c9c.0", + "@material/touch-target": "15.0.0-canary.bc9ae6c9c.0", "tslib": "^2.1.0" } }, "node_modules/@material/image-list": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/image-list/-/image-list-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-Ol+uaHYBe5R/cgzlfh5ONnMVX0wO6fV74JMUcQCQlxP6lXau/edARo4tkRc7A7UJUkU3VRv0EpEjLoCRNUPGaA==", - "dependencies": { - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/image-list/-/image-list-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-WKWmiYap2iu4QdqmeUSliLlN4O2Ueqa0OuVAYHn/TCzmQ2xmnhZ1pvDLbs6TplpOmlki7vFfe+aSt5SU9gwfOQ==", + "dependencies": { + "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0", + "@material/shape": "15.0.0-canary.bc9ae6c9c.0", + "@material/theme": "15.0.0-canary.bc9ae6c9c.0", + "@material/typography": "15.0.0-canary.bc9ae6c9c.0", "tslib": "^2.1.0" } }, "node_modules/@material/layout-grid": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/layout-grid/-/layout-grid-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-ALXE1mqFNb/RB2lVRQ3/r1Aufw2mFZnOjRE+boYDVepmAG/xWyPCyaGoavELJF5l4GAb0tXi8wA/8HeGbLOpuA==", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/layout-grid/-/layout-grid-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-5GqmT6oTZhUGWIb+CLD0ZNyDyTiJsr/rm9oRIi3+vCujACwxFkON9tzBlZohdtFS16nuzUusthN6Jt9UrJcN6Q==", "dependencies": { "tslib": "^2.1.0" } }, "node_modules/@material/line-ripple": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/line-ripple/-/line-ripple-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-7hRx8C/e9i0P6pgQpNOMfTwSS2r1fwEvBL72QDVGLtLuoKKwsjjgP6Z0Jat/GeHJe87u9LQvGBoD4upt+of/HA==", - "dependencies": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/line-ripple/-/line-ripple-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-8S30WXEuUdgDdBulzUDlPXD6qMzwCX9SxYb5mGDYLwl199cpSGdXHtGgEcCjokvnpLhdZhcT1Dsxeo1g2Evh5Q==", + "dependencies": { + "@material/animation": "15.0.0-canary.bc9ae6c9c.0", + "@material/base": "15.0.0-canary.bc9ae6c9c.0", + "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0", + "@material/theme": "15.0.0-canary.bc9ae6c9c.0", "tslib": "^2.1.0" } }, "node_modules/@material/linear-progress": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/linear-progress/-/linear-progress-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-iJclt7mKmcMk6pqD7ocXKfCWZhqBoODp7N593jYlxVpTJuEz2wiVAjZUDn/YGj/Uz3CRH+2YFfOiLr9pwWjhDg==", - "dependencies": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/progress-indicator": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/linear-progress/-/linear-progress-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-6EJpjrz6aoH2/gXLg9iMe0yF2C42hpQyZoHpmcgTLKeci85ktDvJIjwup8tnk8ULQyFiGiIrhXw2v2RSsiFjvQ==", + "dependencies": { + "@material/animation": "15.0.0-canary.bc9ae6c9c.0", + "@material/base": "15.0.0-canary.bc9ae6c9c.0", + "@material/dom": "15.0.0-canary.bc9ae6c9c.0", + "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0", + "@material/progress-indicator": "15.0.0-canary.bc9ae6c9c.0", + "@material/rtl": "15.0.0-canary.bc9ae6c9c.0", + "@material/theme": "15.0.0-canary.bc9ae6c9c.0", "tslib": "^2.1.0" } }, "node_modules/@material/list": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/list/-/list-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-rQ+FCSdzmwTcT00IYE0uRV3CS4oGSccKFl9hkcF+aHFW61L7ORh/SCGUDPrEfQFrFkMn5f8qroVJjpUAMXBz4g==", - "dependencies": { - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/density": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/list/-/list-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-TQ1ppqiCMQj/P7bGD4edbIIv4goczZUoiUAaPq/feb1dflvrFMzYqJ7tQRRCyBL8nRhJoI2x99tk8Q2RXvlGUQ==", + "dependencies": { + "@material/base": "15.0.0-canary.bc9ae6c9c.0", + "@material/density": "15.0.0-canary.bc9ae6c9c.0", + "@material/dom": "15.0.0-canary.bc9ae6c9c.0", + "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0", + "@material/ripple": "15.0.0-canary.bc9ae6c9c.0", + "@material/rtl": "15.0.0-canary.bc9ae6c9c.0", + "@material/shape": "15.0.0-canary.bc9ae6c9c.0", + "@material/theme": "15.0.0-canary.bc9ae6c9c.0", + "@material/tokens": "15.0.0-canary.bc9ae6c9c.0", + "@material/typography": "15.0.0-canary.bc9ae6c9c.0", "tslib": "^2.1.0" } }, "node_modules/@material/menu": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/menu/-/menu-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-r7wzDLSGSI9629/mfpvsMzkVxpmV75kcD3IrW0Pcu6/Bv/1xi0EvjcUXzNJJoQlwN4Zj35Ymz/PCjZkIDIz68Q==", - "dependencies": { - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/list": "15.0.0-canary.684e33d25.0", - "@material/menu-surface": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/menu/-/menu-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-IlAh61xzrzxXs38QZlt74UYt8J431zGznSzDtB1Fqs6YFNd11QPKoiRXn1J2Qu/lUxbFV7i8NBKMCKtia0n6/Q==", + "dependencies": { + "@material/base": "15.0.0-canary.bc9ae6c9c.0", + "@material/dom": "15.0.0-canary.bc9ae6c9c.0", + "@material/elevation": "15.0.0-canary.bc9ae6c9c.0", + "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0", + "@material/list": "15.0.0-canary.bc9ae6c9c.0", + "@material/menu-surface": "15.0.0-canary.bc9ae6c9c.0", + "@material/ripple": "15.0.0-canary.bc9ae6c9c.0", + "@material/rtl": "15.0.0-canary.bc9ae6c9c.0", + "@material/shape": "15.0.0-canary.bc9ae6c9c.0", + "@material/theme": "15.0.0-canary.bc9ae6c9c.0", + "@material/tokens": "15.0.0-canary.bc9ae6c9c.0", "tslib": "^2.1.0" } }, "node_modules/@material/menu-surface": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/menu-surface/-/menu-surface-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-RVO5GAYcfWPaKwxsF/NhUAmrYXQCQBKvRQW0TIlbmAJz6lcFeTs6YZqF3u1C7qrL3ZQGz+sur/7ywj6QU0oMow==", - "dependencies": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/menu-surface/-/menu-surface-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-dMtSPN+olTWE+08M5qe4ea1IZOhVryYqzK0Gyb2u1G75rSArUxCOB5rr6OC/ST3Mq3RS6zGuYo7srZt4534K9Q==", + "dependencies": { + "@material/animation": "15.0.0-canary.bc9ae6c9c.0", + "@material/base": "15.0.0-canary.bc9ae6c9c.0", + "@material/elevation": "15.0.0-canary.bc9ae6c9c.0", + "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0", + "@material/rtl": "15.0.0-canary.bc9ae6c9c.0", + "@material/shape": "15.0.0-canary.bc9ae6c9c.0", + "@material/theme": "15.0.0-canary.bc9ae6c9c.0", "tslib": "^2.1.0" } }, "node_modules/@material/notched-outline": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/notched-outline/-/notched-outline-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-9YHcBkvJLPVYzkHcWoTpBZAFrEd+j1hjhGxLhh0LuNrZe8VroUkZD1TTnUAPHRG3os6EqEWWaKb0RN+aPIF2yQ==", - "dependencies": { - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/floating-label": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/notched-outline/-/notched-outline-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-WuurMg44xexkvLTBTnsO0A+qnzFjpcPdvgWBGstBepYozsvSF9zJGdb1x7Zv1MmqbpYh/Ohnuxtb/Y3jOh6irg==", + "dependencies": { + "@material/base": "15.0.0-canary.bc9ae6c9c.0", + "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0", + "@material/floating-label": "15.0.0-canary.bc9ae6c9c.0", + "@material/rtl": "15.0.0-canary.bc9ae6c9c.0", + "@material/shape": "15.0.0-canary.bc9ae6c9c.0", + "@material/theme": "15.0.0-canary.bc9ae6c9c.0", "tslib": "^2.1.0" } }, "node_modules/@material/progress-indicator": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/progress-indicator/-/progress-indicator-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-c0icji4faeNWUoqGENGC7Hav0Puxh0RwXIDVizffaUxKIGbajpIp5+4Zop73fK/xFLGMB/npg7TbP+aCGjQ3fw==", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/progress-indicator/-/progress-indicator-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-uOnsvqw5F2fkeTnTl4MrYzjI7KCLmmLyZaM0cgLNuLsWVlddQE+SGMl28tENx7DUK3HebWq0FxCP8f25LuDD+w==", "dependencies": { "tslib": "^2.1.0" } }, "node_modules/@material/radio": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/radio/-/radio-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-U3Eh8sNUA8trDla1Bq8Bo02foxYvtoewaKeF8A8tAju81XZ4jRiftfOsOWZDZEHCVbbCB2QwvutvFlnay5n+Aw==", - "dependencies": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/density": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/focus-ring": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/touch-target": "15.0.0-canary.684e33d25.0", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/radio/-/radio-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-ehzOK+U1IxQN+OQjgD2lsnf1t7t7RAwQzeO6Czkiuid29ookYbQynWuLWk7NW8H8ohl7lnmfqTP1xSNkkL/F0g==", + "dependencies": { + "@material/animation": "15.0.0-canary.bc9ae6c9c.0", + "@material/base": "15.0.0-canary.bc9ae6c9c.0", + "@material/density": "15.0.0-canary.bc9ae6c9c.0", + "@material/dom": "15.0.0-canary.bc9ae6c9c.0", + "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0", + "@material/focus-ring": "15.0.0-canary.bc9ae6c9c.0", + "@material/ripple": "15.0.0-canary.bc9ae6c9c.0", + "@material/theme": "15.0.0-canary.bc9ae6c9c.0", + "@material/touch-target": "15.0.0-canary.bc9ae6c9c.0", "tslib": "^2.1.0" } }, "node_modules/@material/ripple": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/ripple/-/ripple-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-RyePu7SjIm/OuyyEieZ/gxiPYkNZOZHeid72WRcN9ofdlljj2pifcdPvcfZA+v/DMS33xo5GjG2L/Qj6ClWrKw==", - "dependencies": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/ripple/-/ripple-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-JfLW+g3GMVDv4cruQ19+HUxpKVdWCldFlIPw1UYezz2h3WTNDy05S3uP2zUdXzZ01C3dkBFviv4nqZ0GCT16MA==", + "dependencies": { + "@material/animation": "15.0.0-canary.bc9ae6c9c.0", + "@material/base": "15.0.0-canary.bc9ae6c9c.0", + "@material/dom": "15.0.0-canary.bc9ae6c9c.0", + "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0", + "@material/rtl": "15.0.0-canary.bc9ae6c9c.0", + "@material/theme": "15.0.0-canary.bc9ae6c9c.0", "tslib": "^2.1.0" } }, "node_modules/@material/rtl": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/rtl/-/rtl-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-NqdJl8Ayupp1Th+vCNCpVQHbUFOuF7TCte9LD1norTIBUF/QizIxWby2W5uUEiPbnh5j9PmE1CJtfLwKun3pcw==", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/rtl/-/rtl-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-SkKLNLFp5QtG7/JEFg9R92qq4MzTcZ5As6sWbH7rRg6ahTHoJEuqE+pOb9Vrtbj84k5gtX+vCYPvCILtSlr2uw==", "dependencies": { - "@material/theme": "15.0.0-canary.684e33d25.0", + "@material/theme": "15.0.0-canary.bc9ae6c9c.0", "tslib": "^2.1.0" } }, "node_modules/@material/segmented-button": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/segmented-button/-/segmented-button-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-bEGgg8vgXNLyukyV8HRjFMuQ6t6nm5LQ4Pgm22um61Yc8qyi0BOqV41OR4SVdUrUqZxh1aVD+p+4NN03+LfQXw==", - "dependencies": { - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/touch-target": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/segmented-button/-/segmented-button-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-YDwkCWP9l5mIZJ7pZJZ2hMDxfBlIGVJ+deNzr8O+Z7/xC5LGXbl4R5aPtUVHygvXAXxpf5096ZD+dSXzYzvWlw==", + "dependencies": { + "@material/base": "15.0.0-canary.bc9ae6c9c.0", + "@material/elevation": "15.0.0-canary.bc9ae6c9c.0", + "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0", + "@material/ripple": "15.0.0-canary.bc9ae6c9c.0", + "@material/theme": "15.0.0-canary.bc9ae6c9c.0", + "@material/touch-target": "15.0.0-canary.bc9ae6c9c.0", + "@material/typography": "15.0.0-canary.bc9ae6c9c.0", "tslib": "^2.1.0" } }, "node_modules/@material/select": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/select/-/select-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-kf178/2TeEinTv0mgmSBcmmExQ2h7a7dtR1E3WuqQgisJ/R6+zVLMkC2CnfIyzxYX2vkuUTG0ue3Reh/6XiqSg==", - "dependencies": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/density": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/floating-label": "15.0.0-canary.684e33d25.0", - "@material/line-ripple": "15.0.0-canary.684e33d25.0", - "@material/list": "15.0.0-canary.684e33d25.0", - "@material/menu": "15.0.0-canary.684e33d25.0", - "@material/menu-surface": "15.0.0-canary.684e33d25.0", - "@material/notched-outline": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/select/-/select-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-unfOWVf7T0sixVG+3k3RTuATfzqvCF6QAzA6J9rlCh/Tq4HuIBNDdV4z19IVu4zwmgWYxY0iSvqWUvdJJYwakQ==", + "dependencies": { + "@material/animation": "15.0.0-canary.bc9ae6c9c.0", + "@material/base": "15.0.0-canary.bc9ae6c9c.0", + "@material/density": "15.0.0-canary.bc9ae6c9c.0", + "@material/dom": "15.0.0-canary.bc9ae6c9c.0", + "@material/elevation": "15.0.0-canary.bc9ae6c9c.0", + "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0", + "@material/floating-label": "15.0.0-canary.bc9ae6c9c.0", + "@material/line-ripple": "15.0.0-canary.bc9ae6c9c.0", + "@material/list": "15.0.0-canary.bc9ae6c9c.0", + "@material/menu": "15.0.0-canary.bc9ae6c9c.0", + "@material/menu-surface": "15.0.0-canary.bc9ae6c9c.0", + "@material/notched-outline": "15.0.0-canary.bc9ae6c9c.0", + "@material/ripple": "15.0.0-canary.bc9ae6c9c.0", + "@material/rtl": "15.0.0-canary.bc9ae6c9c.0", + "@material/shape": "15.0.0-canary.bc9ae6c9c.0", + "@material/theme": "15.0.0-canary.bc9ae6c9c.0", + "@material/tokens": "15.0.0-canary.bc9ae6c9c.0", + "@material/typography": "15.0.0-canary.bc9ae6c9c.0", "tslib": "^2.1.0" } }, "node_modules/@material/shape": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/shape/-/shape-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-aEelpaTFmpnCji3TUGP9bVCS/bRVjUmLTHBPZtuu1gOrUVVtJ6kYOg73dZNJF+XOoNL2yOX/LRcKwsop29tptA==", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/shape/-/shape-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-Dsvr771ZKC46ODzoixLdGwlLEQLfxfLrtnRojXABoZf5G3o9KtJU+J+5Ld5aa960OAsCzzANuaub4iR88b1guA==", "dependencies": { - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", + "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0", + "@material/rtl": "15.0.0-canary.bc9ae6c9c.0", + "@material/theme": "15.0.0-canary.bc9ae6c9c.0", "tslib": "^2.1.0" } }, "node_modules/@material/slider": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/slider/-/slider-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-WVyK+2pSNSZmj07M2K/a3TADoQ9FBCndfNC/vE7/wGIg4dddJJK5KvQ+yruf9R2cSzTL/S1sZ5WpyyeM8E9HTw==", - "dependencies": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/slider/-/slider-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-3AEu+7PwW4DSNLndue47dh2u7ga4hDJRYmuu7wnJCIWJBnLCkp6C92kNc4Rj5iQY2ftJio5aj1gqryluh5tlYg==", + "dependencies": { + "@material/animation": "15.0.0-canary.bc9ae6c9c.0", + "@material/base": "15.0.0-canary.bc9ae6c9c.0", + "@material/dom": "15.0.0-canary.bc9ae6c9c.0", + "@material/elevation": "15.0.0-canary.bc9ae6c9c.0", + "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0", + "@material/ripple": "15.0.0-canary.bc9ae6c9c.0", + "@material/rtl": "15.0.0-canary.bc9ae6c9c.0", + "@material/theme": "15.0.0-canary.bc9ae6c9c.0", + "@material/tokens": "15.0.0-canary.bc9ae6c9c.0", + "@material/typography": "15.0.0-canary.bc9ae6c9c.0", "tslib": "^2.1.0" } }, "node_modules/@material/snackbar": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/snackbar/-/snackbar-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-itO+DCkOannZzR1/cCHcqAm7ifhuFvXmDItNoA8qLEcAyJDJJRkhpwj3XQ01yuo9gBFcSctp7Txt7e+Hncm/Jg==", - "dependencies": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/button": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/icon-button": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/snackbar/-/snackbar-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-TwwQSYxfGK6mc03/rdDamycND6o+1p61WNd7ElZv1F1CLxB4ihRjbCoH7Qo+oVDaP8CTpjeclka+24RLhQq0mA==", + "dependencies": { + "@material/animation": "15.0.0-canary.bc9ae6c9c.0", + "@material/base": "15.0.0-canary.bc9ae6c9c.0", + "@material/button": "15.0.0-canary.bc9ae6c9c.0", + "@material/dom": "15.0.0-canary.bc9ae6c9c.0", + "@material/elevation": "15.0.0-canary.bc9ae6c9c.0", + "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0", + "@material/icon-button": "15.0.0-canary.bc9ae6c9c.0", + "@material/ripple": "15.0.0-canary.bc9ae6c9c.0", + "@material/rtl": "15.0.0-canary.bc9ae6c9c.0", + "@material/shape": "15.0.0-canary.bc9ae6c9c.0", + "@material/theme": "15.0.0-canary.bc9ae6c9c.0", + "@material/tokens": "15.0.0-canary.bc9ae6c9c.0", + "@material/typography": "15.0.0-canary.bc9ae6c9c.0", "tslib": "^2.1.0" } }, "node_modules/@material/switch": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/switch/-/switch-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-Jxi0gl92yvvZZsAPxvVHzXx2ga+T/djMow98jvEczmpUorWnAhgiCr9CsSSRoosahWyRB8NLZOxUQrACxvffjw==", - "dependencies": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/density": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/focus-ring": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/switch/-/switch-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-OjUjtT0kRz1ASAsOS+dNzwMwvsjmqy5edK57692qmrP6bL4GblFfBDoiNJ6t0AN4OaKcmL5Hy/xNrTdOZW7Qqw==", + "dependencies": { + "@material/animation": "15.0.0-canary.bc9ae6c9c.0", + "@material/base": "15.0.0-canary.bc9ae6c9c.0", + "@material/density": "15.0.0-canary.bc9ae6c9c.0", + "@material/dom": "15.0.0-canary.bc9ae6c9c.0", + "@material/elevation": "15.0.0-canary.bc9ae6c9c.0", + "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0", + "@material/focus-ring": "15.0.0-canary.bc9ae6c9c.0", + "@material/ripple": "15.0.0-canary.bc9ae6c9c.0", + "@material/rtl": "15.0.0-canary.bc9ae6c9c.0", + "@material/shape": "15.0.0-canary.bc9ae6c9c.0", + "@material/theme": "15.0.0-canary.bc9ae6c9c.0", + "@material/tokens": "15.0.0-canary.bc9ae6c9c.0", "safevalues": "^0.3.4", "tslib": "^2.1.0" } }, "node_modules/@material/tab": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/tab/-/tab-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-WQL3wj9syHNcfe8KbgGGUcA34M8C/xZ+n0Fkkh8Kk6puVwaU+xqUNihsxPY6YzKpmh4PZ4oJaBdiN8zvFT1zqQ==", - "dependencies": { - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/focus-ring": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/tab-indicator": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/tab/-/tab-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-s/L9otAwn/pZwVQZBRQJmPqYeNbjoEbzbjMpDQf/VBG/6dJ+aP03ilIBEkqo8NVnCoChqcdtVCoDNRtbU+yp6w==", + "dependencies": { + "@material/base": "15.0.0-canary.bc9ae6c9c.0", + "@material/elevation": "15.0.0-canary.bc9ae6c9c.0", + "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0", + "@material/focus-ring": "15.0.0-canary.bc9ae6c9c.0", + "@material/ripple": "15.0.0-canary.bc9ae6c9c.0", + "@material/rtl": "15.0.0-canary.bc9ae6c9c.0", + "@material/tab-indicator": "15.0.0-canary.bc9ae6c9c.0", + "@material/theme": "15.0.0-canary.bc9ae6c9c.0", + "@material/tokens": "15.0.0-canary.bc9ae6c9c.0", + "@material/typography": "15.0.0-canary.bc9ae6c9c.0", "tslib": "^2.1.0" } }, "node_modules/@material/tab-bar": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/tab-bar/-/tab-bar-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-SW/cMaDsIGGkM1ag3A7GJRlmr8eXmObWsvitQJzh6Azr5zzZtSI+GQygkMesAEE1gbpqOVN8d40rh3H7VVIAcA==", - "dependencies": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/density": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/tab": "15.0.0-canary.684e33d25.0", - "@material/tab-indicator": "15.0.0-canary.684e33d25.0", - "@material/tab-scroller": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/tab-bar/-/tab-bar-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-Xmtq0wJGfu5k+zQeFeNsr4bUKv7L+feCmUp/gsapJ655LQKMXOUQZtSv9ZqWOfrCMy55hoF1CzGFV+oN3tyWWQ==", + "dependencies": { + "@material/animation": "15.0.0-canary.bc9ae6c9c.0", + "@material/base": "15.0.0-canary.bc9ae6c9c.0", + "@material/density": "15.0.0-canary.bc9ae6c9c.0", + "@material/elevation": "15.0.0-canary.bc9ae6c9c.0", + "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0", + "@material/tab": "15.0.0-canary.bc9ae6c9c.0", + "@material/tab-indicator": "15.0.0-canary.bc9ae6c9c.0", + "@material/tab-scroller": "15.0.0-canary.bc9ae6c9c.0", + "@material/theme": "15.0.0-canary.bc9ae6c9c.0", + "@material/tokens": "15.0.0-canary.bc9ae6c9c.0", + "@material/typography": "15.0.0-canary.bc9ae6c9c.0", "tslib": "^2.1.0" } }, "node_modules/@material/tab-indicator": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/tab-indicator/-/tab-indicator-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-kKICqSPqOlaf0lzaFFCmuOqPXJC+cK48Qmsc+m5o6fJhkmuZRCYpIwB2JeP+uZSOq/bTH+SrPtCtnVlgWg6ksA==", - "dependencies": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/tab-indicator/-/tab-indicator-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-despCJYi1GrDDq7F2hvLQkObHnSLZPPDxnOzU16zJ6FNYvIdszgfzn2HgAZ6pl5hLOexQ8cla6cAqjTDuaJBhQ==", + "dependencies": { + "@material/animation": "15.0.0-canary.bc9ae6c9c.0", + "@material/base": "15.0.0-canary.bc9ae6c9c.0", + "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0", + "@material/theme": "15.0.0-canary.bc9ae6c9c.0", "tslib": "^2.1.0" } }, "node_modules/@material/tab-scroller": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/tab-scroller/-/tab-scroller-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-H6EU/TSiK/M2DyyORX5GEtXD9rKYxTMHC2VxsNWARPMFJGzgeW2ugYkFv+rKI1/c0bs0CJ4e+qFnOlBsQXZvyQ==", - "dependencies": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/tab": "15.0.0-canary.684e33d25.0", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/tab-scroller/-/tab-scroller-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-QWHG/EWxirj4V9u2IHz+OSY9XCWrnNrPnNgEufxAJVUKV/A8ma1DYeFSQqxhX709R8wKGdycJksg0Flkl7Gq7w==", + "dependencies": { + "@material/animation": "15.0.0-canary.bc9ae6c9c.0", + "@material/base": "15.0.0-canary.bc9ae6c9c.0", + "@material/dom": "15.0.0-canary.bc9ae6c9c.0", + "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0", + "@material/tab": "15.0.0-canary.bc9ae6c9c.0", "tslib": "^2.1.0" } }, "node_modules/@material/textfield": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/textfield/-/textfield-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-OvgpDXjvpyJTtAWskO69IDybFvDNzr9w2PN/Fk7yFm+uNVupaWz1Ew8lZ4gGslaTNSVmh2XcsvmzxcLINSiiNg==", - "dependencies": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/density": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/floating-label": "15.0.0-canary.684e33d25.0", - "@material/line-ripple": "15.0.0-canary.684e33d25.0", - "@material/notched-outline": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/textfield/-/textfield-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-R3qRex9kCaZIAK8DuxPnVC42R0OaW7AB7fsFknDKeTeVQvRcbnV8E+iWSdqTiGdsi6QQHifX8idUrXw+O45zPw==", + "dependencies": { + "@material/animation": "15.0.0-canary.bc9ae6c9c.0", + "@material/base": "15.0.0-canary.bc9ae6c9c.0", + "@material/density": "15.0.0-canary.bc9ae6c9c.0", + "@material/dom": "15.0.0-canary.bc9ae6c9c.0", + "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0", + "@material/floating-label": "15.0.0-canary.bc9ae6c9c.0", + "@material/line-ripple": "15.0.0-canary.bc9ae6c9c.0", + "@material/notched-outline": "15.0.0-canary.bc9ae6c9c.0", + "@material/ripple": "15.0.0-canary.bc9ae6c9c.0", + "@material/rtl": "15.0.0-canary.bc9ae6c9c.0", + "@material/shape": "15.0.0-canary.bc9ae6c9c.0", + "@material/theme": "15.0.0-canary.bc9ae6c9c.0", + "@material/tokens": "15.0.0-canary.bc9ae6c9c.0", + "@material/typography": "15.0.0-canary.bc9ae6c9c.0", "tslib": "^2.1.0" } }, "node_modules/@material/theme": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/theme/-/theme-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-AZxaXXAvRKzAi20RlMxzt2U5UmkCWyv7DMWEBXsxtG5Tk54mi1HsbVUp3fxDPTlmL7Pq8p1/DESg/o7TgRCVlw==", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/theme/-/theme-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-CpUwXGE0dbhxQ45Hu9r9wbJtO/MAlv5ER4tBHA9tp/K+SU+lDgurBE2touFMg5INmdfVNtdumxb0nPPLaNQcUg==", "dependencies": { - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", + "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0", "tslib": "^2.1.0" } }, "node_modules/@material/tokens": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/tokens/-/tokens-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-wVwbQOTCXDPKYPdHQHLr026y36MMFelID1CmbfRk6mSol4O8yE9U0fXcShfRDW8Qo5E3X31w9c2A6T3neJY7wQ==", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/tokens/-/tokens-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-nbEuGj05txWz6ZMUanpM47SaAD7soyjKILR+XwDell9Zg3bGhsnexCNXPEz2fD+YgomS+jM5XmIcaJJHg/H93Q==", "dependencies": { - "@material/elevation": "15.0.0-canary.684e33d25.0" + "@material/elevation": "15.0.0-canary.bc9ae6c9c.0" } }, "node_modules/@material/tooltip": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/tooltip/-/tooltip-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-dtm26QjxyQdinc8btgz6yys07b7bUW4FZgNF2EBPeGrICrPg7jf+JEvDziz5g8VMaTBQLOQRSCGy0MKuRlOjLw==", - "dependencies": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/button": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/tooltip/-/tooltip-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-UzuXp0b9NuWuYLYpPguxrjbJnCmT/Cco8CkjI/6JajxaeA3o2XEBbQfRMTq8PTafuBjCHTc0b0mQY7rtxUp1Gg==", + "dependencies": { + "@material/animation": "15.0.0-canary.bc9ae6c9c.0", + "@material/base": "15.0.0-canary.bc9ae6c9c.0", + "@material/button": "15.0.0-canary.bc9ae6c9c.0", + "@material/dom": "15.0.0-canary.bc9ae6c9c.0", + "@material/elevation": "15.0.0-canary.bc9ae6c9c.0", + "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0", + "@material/rtl": "15.0.0-canary.bc9ae6c9c.0", + "@material/shape": "15.0.0-canary.bc9ae6c9c.0", + "@material/theme": "15.0.0-canary.bc9ae6c9c.0", + "@material/tokens": "15.0.0-canary.bc9ae6c9c.0", + "@material/typography": "15.0.0-canary.bc9ae6c9c.0", "safevalues": "^0.3.4", "tslib": "^2.1.0" } }, "node_modules/@material/top-app-bar": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/top-app-bar/-/top-app-bar-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-1M+oupUxflfW7u81P1XlxoLZB8bLzwtpKofIfDNRbEsiKhlLTERJR3Yak3BGE9xakNMysAaBHlkb5MrN5bNPFw==", - "dependencies": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/top-app-bar/-/top-app-bar-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-vJWjsvqtdSD5+yQ/9vgoBtBSCvPJ5uF/DVssv8Hdhgs1PYaAcODUi77kdi0+sy/TaWyOsTkQixqmwnFS16zesA==", + "dependencies": { + "@material/animation": "15.0.0-canary.bc9ae6c9c.0", + "@material/base": "15.0.0-canary.bc9ae6c9c.0", + "@material/elevation": "15.0.0-canary.bc9ae6c9c.0", + "@material/ripple": "15.0.0-canary.bc9ae6c9c.0", + "@material/rtl": "15.0.0-canary.bc9ae6c9c.0", + "@material/shape": "15.0.0-canary.bc9ae6c9c.0", + "@material/theme": "15.0.0-canary.bc9ae6c9c.0", + "@material/typography": "15.0.0-canary.bc9ae6c9c.0", "tslib": "^2.1.0" } }, "node_modules/@material/touch-target": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/touch-target/-/touch-target-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-zdE69Slg8+T7sTn1OwqZ6H7WBYac9mxJ/JlJqfTqthzIjZRcCxBSYymQJcDHjsrPnUojOtr9U4Tpm5YZ96TEkQ==", - "dependencies": { - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/touch-target/-/touch-target-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-AqYh9fjt+tv4ZE0C6MeYHblS2H+XwLbDl2mtyrK0DOEnCVQk5/l5ImKDfhrUdFWHvS4a5nBM4AA+sa7KaroLoA==", + "dependencies": { + "@material/base": "15.0.0-canary.bc9ae6c9c.0", + "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0", + "@material/rtl": "15.0.0-canary.bc9ae6c9c.0", + "@material/theme": "15.0.0-canary.bc9ae6c9c.0", "tslib": "^2.1.0" } }, "node_modules/@material/typography": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/typography/-/typography-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-aVnvgMwcfNa/K4wujzpKDIxjGl2hbkEL+m+OKDSQqWYjKcP9QrbzCXJruJBqxrBoPRHLbqo47k5f9uT8raSgjw==", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/typography/-/typography-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-CKsG1zyv34AKPNyZC8olER2OdPII64iR2SzQjpqh1UUvmIFiMPk23LvQ1OnC5aCB14pOXzmVgvJt31r9eNdZ6Q==", "dependencies": { - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", + "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0", + "@material/theme": "15.0.0-canary.bc9ae6c9c.0", "tslib": "^2.1.0" } }, "node_modules/@ng-matero/extensions": { - "version": "15.0.1", - "resolved": "https://registry.npmjs.org/@ng-matero/extensions/-/extensions-15.0.1.tgz", - "integrity": "sha512-MuI+s48H0UEoij1WprcDLhY+FG21FxsXhhNWzcXaktP0ARQenG4PGtYx24blCHYA4wFhXLnGczr8rcf6MLRLJQ==", + "version": "16.1.2", + "resolved": "https://registry.npmjs.org/@ng-matero/extensions/-/extensions-16.1.2.tgz", + "integrity": "sha512-GKpKwSZTzSPkFrMB99cSXlwxfnZIbjT+SsqOhQqLBKIJddtzj4Pxx7wIqzfb/q3SROWlQpg72kGeUfiR5Z5FCA==", "dependencies": { - "@ng-select/ng-select": "^10.0.0", - "ngx-color": "^8.0.0", - "photoviewer": "^3.6.0", + "@ng-select/ng-select": "^11.0.0", + "ngx-color": "^9.0.0", + "photoviewer": "^3.8.0", "tslib": "^2.4.0" }, "peerDependencies": { - "@angular/animations": ">=15.0.0", - "@angular/cdk": ">=15.0.0", - "@angular/common": ">=15.0.0", - "@angular/core": ">=15.0.0", - "@angular/material": ">=15.0.0" + "@angular/animations": ">=16.0.0", + "@angular/cdk": ">=16.0.0", + "@angular/common": ">=16.0.0", + "@angular/core": ">=16.0.0", + "@angular/material": ">=16.0.0" } }, "node_modules/@ng-select/ng-option-highlight": { - "version": "0.0.7", - "resolved": "https://registry.npmjs.org/@ng-select/ng-option-highlight/-/ng-option-highlight-0.0.7.tgz", - "integrity": "sha512-5G6PLOQuuGbnxYSGHo+hup/Rwu7xhNNpuAE1h69OcRRrr9ltpihUIvEa4kfq22yPQz4/4Y5UGtIGLZtWCJ1tJg==", + "version": "11.2.0", + "resolved": "https://registry.npmjs.org/@ng-select/ng-option-highlight/-/ng-option-highlight-11.2.0.tgz", + "integrity": "sha512-kgUs+riATO/lbQIXo8yDIvdJV+ntXX8soT8yRIBxsIov6QaKLhRnn9nebkkfreeS8lxnriu9oXfKZFhikVXPLg==", "dependencies": { "tslib": "^2.3.0" }, "peerDependencies": { - "@angular/common": ">=13.0.0 <14.0.0", - "@angular/core": ">=13.0.0 <14.0.0" + "@angular/common": "^16.0.0", + "@angular/core": "^16.0.0" } }, "node_modules/@ng-select/ng-select": { - "version": "10.0.3", - "resolved": "https://registry.npmjs.org/@ng-select/ng-select/-/ng-select-10.0.3.tgz", - "integrity": "sha512-Ma8pzKMI5TWnsKgOiONQLGeUeTko9gI6AtqpMMOVhrCktjtUSo9h5N17WomHRGtba9D7QviTZcR7UBhKOPwZ7g==", + "version": "11.2.0", + "resolved": "https://registry.npmjs.org/@ng-select/ng-select/-/ng-select-11.2.0.tgz", + "integrity": "sha512-lTyw93kFdKGecp9eKmOP0PQSCaAJS8DCt4D60ns055+ixvRSp2fuXAuJUvn1e3gAsvpZor37osmYlOJ4LYwYIA==", "dependencies": { "tslib": "^2.3.1" }, "engines": { - "node": ">= 12.20.0", - "npm": ">= 6.0.0" + "node": ">= 16", + "npm": ">= 8" }, "peerDependencies": { - "@angular/common": "<16.0.0", - "@angular/core": "<16.0.0", - "@angular/forms": "<16.0.0" + "@angular/common": "^16.0.0", + "@angular/core": "^16.0.0", + "@angular/forms": "^16.0.0" } }, "node_modules/@ngtools/webpack": { - "version": "15.1.4", - "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-15.1.4.tgz", - "integrity": "sha512-IvKXK8AvPlLkP99Uf0RL1EHlcsXNQd86II9HsLjupUtmFC/pPuDWrRFMP9bjWUMh2ZeYpgUeEAbcCH3doSrdIA==", + "version": "16.2.9", + "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-16.2.9.tgz", + "integrity": "sha512-rOclD7FfT4OSwVA0nDnULbJS6TORJ0+sQiuT2ebaNFErYr3LOm6Zut05tnmzFw8q1cePrILbG+xpnbggNr9Pyw==", "dev": true, "engines": { - "node": "^14.20.0 || ^16.13.0 || >=18.10.0", + "node": "^16.14.0 || >=18.10.0", "npm": "^6.11.0 || ^7.5.6 || >=8.0.0", "yarn": ">= 1.13.0" }, "peerDependencies": { - "@angular/compiler-cli": "^15.0.0", - "typescript": ">=4.8.2 <5.0", + "@angular/compiler-cli": "^16.0.0", + "typescript": ">=4.9.3 <5.2", "webpack": "^5.54.0" } }, @@ -5125,14 +4868,13 @@ } }, "node_modules/@npmcli/git": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/@npmcli/git/-/git-4.0.3.tgz", - "integrity": "sha512-8cXNkDIbnXPVbhXMmQ7/bklCAjtmPaXfI9aEM4iH+xSuEHINLMHhlfESvVwdqmHJRJkR48vNJTSUvoF6GRPSFA==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/@npmcli/git/-/git-4.1.0.tgz", + "integrity": "sha512-9hwoB3gStVfa0N31ymBmrX+GuDGdVA/QWShZVqE0HK2Af+7QGGrCTbZia/SW0ImUTjTne7SP91qxDmtXvDHRPQ==", "dev": true, "dependencies": { "@npmcli/promise-spawn": "^6.0.0", "lru-cache": "^7.4.4", - "mkdirp": "^1.0.4", "npm-pick-manifest": "^8.0.0", "proc-log": "^3.0.0", "promise-inflight": "^1.0.1", @@ -5144,10 +4886,34 @@ "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, + "node_modules/@npmcli/git/node_modules/lru-cache": { + "version": "7.18.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", + "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", + "dev": true, + "engines": { + "node": ">=12" + } + }, + "node_modules/@npmcli/git/node_modules/which": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/which/-/which-3.0.1.tgz", + "integrity": "sha512-XA1b62dzQzLfaEOSQFTCOd5KFf/1VSzZo7/7TUjnya6u0vGGKzU96UQBZTAThCb2j4/xjBAyii1OhRLJEivHvg==", + "dev": true, + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/which.js" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, "node_modules/@npmcli/installed-package-contents": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@npmcli/installed-package-contents/-/installed-package-contents-2.0.1.tgz", - "integrity": "sha512-GIykAFdOVK31Q1/zAtT5MbxqQL2vyl9mvFJv+OGu01zxbhL3p0xc8gJjdNGX1mWmUT43aEKVO2L6V/2j4TOsAA==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/@npmcli/installed-package-contents/-/installed-package-contents-2.0.2.tgz", + "integrity": "sha512-xACzLPhnfD51GKvTOOuNX2/V4G4mz9/1I2MfDoye9kBM3RYe5g2YbscsaGoTlaWqkxeiapBWyseULVKpSVHtKQ==", "dev": true, "dependencies": { "npm-bundled": "^3.0.0", @@ -5195,1221 +4961,1448 @@ "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "node_modules/@npmcli/run-script": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/@npmcli/run-script/-/run-script-6.0.0.tgz", - "integrity": "sha512-ql+AbRur1TeOdl1FY+RAwGW9fcr4ZwiVKabdvm93mujGREVuVLbdkXRJDrkTXSdCjaxYydr1wlA2v67jxWG5BQ==", + "node_modules/@npmcli/promise-spawn/node_modules/which": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/which/-/which-3.0.1.tgz", + "integrity": "sha512-XA1b62dzQzLfaEOSQFTCOd5KFf/1VSzZo7/7TUjnya6u0vGGKzU96UQBZTAThCb2j4/xjBAyii1OhRLJEivHvg==", "dev": true, "dependencies": { - "@npmcli/node-gyp": "^3.0.0", - "@npmcli/promise-spawn": "^6.0.0", - "node-gyp": "^9.0.0", - "read-package-json-fast": "^3.0.0", - "which": "^3.0.0" + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/which.js" }, "engines": { "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "node_modules/@schematics/angular": { - "version": "15.1.4", - "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-15.1.4.tgz", - "integrity": "sha512-4SV8dDGZeSvts01b8y2W6FmpDD0dQhBlGMhMJKC/tUnhfNKfYCs2VKtMBsIc3ZiGP2yoA3+nUiMmtS6hEkXYHw==", + "node_modules/@npmcli/run-script": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/@npmcli/run-script/-/run-script-6.0.2.tgz", + "integrity": "sha512-NCcr1uQo1k5U+SYlnIrbAh3cxy+OQT1VtqiAbxdymSlptbzBb62AjH2xXgjNCoP073hoa1CfCAcwoZ8k96C4nA==", "dev": true, "dependencies": { - "@angular-devkit/core": "15.1.4", - "@angular-devkit/schematics": "15.1.4", - "jsonc-parser": "3.2.0" + "@npmcli/node-gyp": "^3.0.0", + "@npmcli/promise-spawn": "^6.0.0", + "node-gyp": "^9.0.0", + "read-package-json-fast": "^3.0.0", + "which": "^3.0.0" }, "engines": { - "node": "^14.20.0 || ^16.13.0 || >=18.10.0", - "npm": "^6.11.0 || ^7.5.6 || >=8.0.0", - "yarn": ">= 1.13.0" + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "node_modules/@schematics/angular/node_modules/@angular-devkit/core": { - "version": "15.1.4", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-15.1.4.tgz", - "integrity": "sha512-PW5MRmd9DHJR4FaXchwQtj9pXnsghSTnwRvfZeCRNYgU2sv0DKyTV+YTSJB+kNXnoPNG1Je6amDEkiXecpspXg==", + "node_modules/@npmcli/run-script/node_modules/which": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/which/-/which-3.0.1.tgz", + "integrity": "sha512-XA1b62dzQzLfaEOSQFTCOd5KFf/1VSzZo7/7TUjnya6u0vGGKzU96UQBZTAThCb2j4/xjBAyii1OhRLJEivHvg==", "dev": true, "dependencies": { - "ajv": "8.12.0", - "ajv-formats": "2.1.1", - "jsonc-parser": "3.2.0", - "rxjs": "6.6.7", - "source-map": "0.7.4" - }, - "engines": { - "node": "^14.20.0 || ^16.13.0 || >=18.10.0", - "npm": "^6.11.0 || ^7.5.6 || >=8.0.0", - "yarn": ">= 1.13.0" + "isexe": "^2.0.0" }, - "peerDependencies": { - "chokidar": "^3.5.2" + "bin": { + "node-which": "bin/which.js" }, - "peerDependenciesMeta": { - "chokidar": { - "optional": true - } + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "node_modules/@schematics/angular/node_modules/rxjs": { - "version": "6.6.7", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", - "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", + "node_modules/@nrwl/devkit": { + "version": "16.5.1", + "resolved": "https://registry.npmjs.org/@nrwl/devkit/-/devkit-16.5.1.tgz", + "integrity": "sha512-NB+DE/+AFJ7lKH/WBFyatJEhcZGj25F24ncDkwjZ6MzEiSOGOJS0LaV/R+VUsmS5EHTPXYOpn3zHWWAcJhyOmA==", "dev": true, "dependencies": { - "tslib": "^1.9.0" - }, - "engines": { - "npm": ">=2.0.0" + "@nx/devkit": "16.5.1" } }, - "node_modules/@schematics/angular/node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", - "dev": true - }, - "node_modules/@sinclair/typebox": { - "version": "0.24.51", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz", - "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==", - "dev": true - }, - "node_modules/@sinonjs/commons": { - "version": "1.8.6", - "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.6.tgz", - "integrity": "sha512-Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ==", + "node_modules/@nrwl/tao": { + "version": "16.5.1", + "resolved": "https://registry.npmjs.org/@nrwl/tao/-/tao-16.5.1.tgz", + "integrity": "sha512-x+gi/fKdM6uQNIti9exFlm3V5LBP3Y8vOEziO42HdOigyrXa0S0HD2WMpccmp6PclYKhwEDUjKJ39xh5sdh4Ig==", "dev": true, "dependencies": { - "type-detect": "4.0.8" + "nx": "16.5.1" + }, + "bin": { + "tao": "index.js" } }, - "node_modules/@sinonjs/fake-timers": { - "version": "9.1.2", - "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-9.1.2.tgz", - "integrity": "sha512-BPS4ynJW/o92PUR4wgriz2Ud5gpST5vz6GQfMixEDK0Z8ZCUv2M7SkBLykH56T++Xs+8ln9zTGbOvNGIe02/jw==", + "node_modules/@nx/devkit": { + "version": "16.5.1", + "resolved": "https://registry.npmjs.org/@nx/devkit/-/devkit-16.5.1.tgz", + "integrity": "sha512-T1acZrVVmJw/sJ4PIGidCBYBiBqlg/jT9e8nIGXLSDS20xcLvfo4zBQf8UZLrmHglnwwpDpOWuVJCp2rYA5aDg==", "dev": true, "dependencies": { - "@sinonjs/commons": "^1.7.0" + "@nrwl/devkit": "16.5.1", + "ejs": "^3.1.7", + "ignore": "^5.0.4", + "semver": "7.5.3", + "tmp": "~0.2.1", + "tslib": "^2.3.0" + }, + "peerDependencies": { + "nx": ">= 15 <= 17" } }, - "node_modules/@tootallnate/once": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz", - "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==", + "node_modules/@nx/devkit/node_modules/lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", "dev": true, + "dependencies": { + "yallist": "^4.0.0" + }, "engines": { - "node": ">= 10" + "node": ">=10" } }, - "node_modules/@types/babel__core": { - "version": "7.1.20", - "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.20.tgz", - "integrity": "sha512-PVb6Bg2QuscZ30FvOU7z4guG6c926D9YRvOxEaelzndpMsvP+YM74Q/dAFASpg2l6+XLalxSGxcq/lrgYWZtyQ==", + "node_modules/@nx/devkit/node_modules/semver": { + "version": "7.5.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.3.tgz", + "integrity": "sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ==", "dev": true, "dependencies": { - "@babel/parser": "^7.1.0", - "@babel/types": "^7.0.0", - "@types/babel__generator": "*", - "@types/babel__template": "*", - "@types/babel__traverse": "*" + "lru-cache": "^6.0.0" + }, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" } }, - "node_modules/@types/babel__generator": { - "version": "7.6.4", - "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.4.tgz", - "integrity": "sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==", + "node_modules/@nx/devkit/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true + }, + "node_modules/@nx/nx-darwin-arm64": { + "version": "16.5.1", + "resolved": "https://registry.npmjs.org/@nx/nx-darwin-arm64/-/nx-darwin-arm64-16.5.1.tgz", + "integrity": "sha512-q98TFI4B/9N9PmKUr1jcbtD4yAFs1HfYd9jUXXTQOlfO9SbDjnrYJgZ4Fp9rMNfrBhgIQ4x1qx0AukZccKmH9Q==", + "cpu": [ + "arm64" + ], "dev": true, - "dependencies": { - "@babel/types": "^7.0.0" + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">= 10" } }, - "node_modules/@types/babel__template": { - "version": "7.4.1", - "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.1.tgz", - "integrity": "sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==", + "node_modules/@nx/nx-darwin-x64": { + "version": "16.5.1", + "resolved": "https://registry.npmjs.org/@nx/nx-darwin-x64/-/nx-darwin-x64-16.5.1.tgz", + "integrity": "sha512-j9HmL1l8k7EVJ3eOM5y8COF93gqrydpxCDoz23ZEtsY+JHY77VAiRQsmqBgEx9GGA2dXi9VEdS67B0+1vKariw==", + "cpu": [ + "x64" + ], "dev": true, - "dependencies": { - "@babel/parser": "^7.1.0", - "@babel/types": "^7.0.0" + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">= 10" } }, - "node_modules/@types/babel__traverse": { - "version": "7.18.3", - "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.18.3.tgz", - "integrity": "sha512-1kbcJ40lLB7MHsj39U4Sh1uTd2E7rLEa79kmDpI6cy+XiXsteB3POdQomoq4FxszMrO3ZYchkhYJw7A2862b3w==", + "node_modules/@nx/nx-freebsd-x64": { + "version": "16.5.1", + "resolved": "https://registry.npmjs.org/@nx/nx-freebsd-x64/-/nx-freebsd-x64-16.5.1.tgz", + "integrity": "sha512-CXSPT01aVS869tvCCF2tZ7LnCa8l41wJ3mTVtWBkjmRde68E5Up093hklRMyXb3kfiDYlfIKWGwrV4r0eH6x1A==", + "cpu": [ + "x64" + ], "dev": true, - "dependencies": { - "@babel/types": "^7.3.0" + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">= 10" } }, - "node_modules/@types/body-parser": { - "version": "1.19.2", - "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.2.tgz", - "integrity": "sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==", + "node_modules/@nx/nx-linux-arm-gnueabihf": { + "version": "16.5.1", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-16.5.1.tgz", + "integrity": "sha512-BhrumqJSZCWFfLFUKl4CAUwR0Y0G2H5EfFVGKivVecEQbb+INAek1aa6c89evg2/OvetQYsJ+51QknskwqvLsA==", + "cpu": [ + "arm" + ], "dev": true, - "dependencies": { - "@types/connect": "*", - "@types/node": "*" + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" } }, - "node_modules/@types/bonjour": { - "version": "3.5.10", - "resolved": "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.10.tgz", - "integrity": "sha512-p7ienRMiS41Nu2/igbJxxLDWrSZ0WxM8UQgCeO9KhoVF7cOVFkrKsiDr1EsJIla8vV3oEEjGcz11jc5yimhzZw==", + "node_modules/@nx/nx-linux-arm64-gnu": { + "version": "16.5.1", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-16.5.1.tgz", + "integrity": "sha512-x7MsSG0W+X43WVv7JhiSq2eKvH2suNKdlUHEG09Yt0vm3z0bhtym1UCMUg3IUAK7jy9hhLeDaFVFkC6zo+H/XQ==", + "cpu": [ + "arm64" + ], "dev": true, - "dependencies": { - "@types/node": "*" + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" } }, - "node_modules/@types/connect": { - "version": "3.4.35", - "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.35.tgz", - "integrity": "sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==", + "node_modules/@nx/nx-linux-arm64-musl": { + "version": "16.5.1", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-musl/-/nx-linux-arm64-musl-16.5.1.tgz", + "integrity": "sha512-J+/v/mFjOm74I0PNtH5Ka+fDd+/dWbKhpcZ2R1/6b9agzZk+Ff/SrwJcSYFXXWKbPX+uQ4RcJoytT06Zs3s0ow==", + "cpu": [ + "arm64" + ], "dev": true, - "dependencies": { - "@types/node": "*" + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" } }, - "node_modules/@types/connect-history-api-fallback": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.3.5.tgz", - "integrity": "sha512-h8QJa8xSb1WD4fpKBDcATDNGXghFj6/3GRWG6dhmRcu0RX1Ubasur2Uvx5aeEwlf0MwblEC2bMzzMQntxnw/Cw==", + "node_modules/@nx/nx-linux-x64-gnu": { + "version": "16.5.1", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-gnu/-/nx-linux-x64-gnu-16.5.1.tgz", + "integrity": "sha512-igooWJ5YxQ94Zft7IqgL+Lw0qHaY15Btw4gfK756g/YTYLZEt4tTvR1y6RnK/wdpE3sa68bFTLVBNCGTyiTiDQ==", + "cpu": [ + "x64" + ], "dev": true, - "dependencies": { - "@types/express-serve-static-core": "*", - "@types/node": "*" + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" } }, - "node_modules/@types/eslint": { - "version": "8.4.10", - "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.10.tgz", - "integrity": "sha512-Sl/HOqN8NKPmhWo2VBEPm0nvHnu2LL3v9vKo8MEq0EtbJ4eVzGPl41VNPvn5E1i5poMk4/XD8UriLHpJvEP/Nw==", + "node_modules/@nx/nx-linux-x64-musl": { + "version": "16.5.1", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-musl/-/nx-linux-x64-musl-16.5.1.tgz", + "integrity": "sha512-zF/exnPqFYbrLAduGhTmZ7zNEyADid2bzNQiIjJkh8Y6NpDwrQIwVIyvIxqynsjMrIs51kBH+8TUjKjj2Jgf5A==", + "cpu": [ + "x64" + ], "dev": true, - "dependencies": { - "@types/estree": "*", - "@types/json-schema": "*" + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" } }, - "node_modules/@types/eslint-scope": { - "version": "3.7.4", - "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.4.tgz", - "integrity": "sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==", + "node_modules/@nx/nx-win32-arm64-msvc": { + "version": "16.5.1", + "resolved": "https://registry.npmjs.org/@nx/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-16.5.1.tgz", + "integrity": "sha512-qtqiLS9Y9TYyAbbpq58kRoOroko4ZXg5oWVqIWFHoxc5bGPweQSJCROEqd1AOl2ZDC6BxfuVHfhDDop1kK05WA==", + "cpu": [ + "arm64" + ], "dev": true, - "dependencies": { - "@types/eslint": "*", - "@types/estree": "*" + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 10" } }, - "node_modules/@types/estree": { - "version": "0.0.51", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.51.tgz", - "integrity": "sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==", - "dev": true - }, - "node_modules/@types/express": { - "version": "4.17.15", - "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.15.tgz", - "integrity": "sha512-Yv0k4bXGOH+8a+7bELd2PqHQsuiANB+A8a4gnQrkRWzrkKlb6KHaVvyXhqs04sVW/OWlbPyYxRgYlIXLfrufMQ==", + "node_modules/@nx/nx-win32-x64-msvc": { + "version": "16.5.1", + "resolved": "https://registry.npmjs.org/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-16.5.1.tgz", + "integrity": "sha512-kUJBLakK7iyA9WfsGGQBVennA4jwf5XIgm0lu35oMOphtZIluvzItMt0EYBmylEROpmpEIhHq0P6J9FA+WH0Rg==", + "cpu": [ + "x64" + ], "dev": true, - "dependencies": { - "@types/body-parser": "*", - "@types/express-serve-static-core": "^4.17.31", - "@types/qs": "*", - "@types/serve-static": "*" + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 10" } }, - "node_modules/@types/express-serve-static-core": { - "version": "4.17.32", - "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.32.tgz", - "integrity": "sha512-aI5h/VOkxOF2Z1saPy0Zsxs5avets/iaiAJYznQFm5By/pamU31xWKL//epiF4OfUA2qTOc9PV6tCUjhO8wlZA==", + "node_modules/@parcel/watcher": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.0.4.tgz", + "integrity": "sha512-cTDi+FUDBIUOBKEtj+nhiJ71AZVlkAsQFuGQTun5tV9mwQBQgZvhCzG+URPQc8myeN32yRVZEfVAPCs1RW+Jvg==", "dev": true, + "hasInstallScript": true, "dependencies": { - "@types/node": "*", - "@types/qs": "*", - "@types/range-parser": "*" + "node-addon-api": "^3.2.1", + "node-gyp-build": "^4.3.0" + }, + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" } }, - "node_modules/@types/graceful-fs": { - "version": "4.1.5", - "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.5.tgz", - "integrity": "sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw==", + "node_modules/@pkgjs/parseargs": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", + "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==", "dev": true, - "dependencies": { - "@types/node": "*" + "optional": true, + "engines": { + "node": ">=14" } }, - "node_modules/@types/http-proxy": { - "version": "1.17.9", - "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.9.tgz", - "integrity": "sha512-QsbSjA/fSk7xB+UXlCT3wHBy5ai9wOcNDWwZAtud+jXhwOM3l+EYZh8Lng4+/6n8uar0J7xILzqftJdJ/Wdfkw==", + "node_modules/@schematics/angular": { + "version": "16.2.9", + "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-16.2.9.tgz", + "integrity": "sha512-uiU2YbZRVHgk1N1DDsek/5CKhfpZ8myJYNJk8eHV5LswnXOP3aqvH23VhneaAgOYwK5fISC7eMG0pLVKMvFfZQ==", "dev": true, "dependencies": { - "@types/node": "*" + "@angular-devkit/core": "16.2.9", + "@angular-devkit/schematics": "16.2.9", + "jsonc-parser": "3.2.0" + }, + "engines": { + "node": "^16.14.0 || >=18.10.0", + "npm": "^6.11.0 || ^7.5.6 || >=8.0.0", + "yarn": ">= 1.13.0" } }, - "node_modules/@types/istanbul-lib-coverage": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz", - "integrity": "sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g==", - "dev": true - }, - "node_modules/@types/istanbul-lib-report": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz", - "integrity": "sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==", + "node_modules/@sigstore/bundle": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@sigstore/bundle/-/bundle-1.1.0.tgz", + "integrity": "sha512-PFutXEy0SmQxYI4texPw3dd2KewuNqv7OuK1ZFtY2fM754yhvG2KdgwIhRnoEE2uHdtdGNQ8s0lb94dW9sELog==", "dev": true, "dependencies": { - "@types/istanbul-lib-coverage": "*" + "@sigstore/protobuf-specs": "^0.2.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "node_modules/@types/istanbul-reports": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz", - "integrity": "sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==", + "node_modules/@sigstore/protobuf-specs": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/@sigstore/protobuf-specs/-/protobuf-specs-0.2.1.tgz", + "integrity": "sha512-XTWVxnWJu+c1oCshMLwnKvz8ZQJJDVOlciMfgpJBQbThVjKTCG8dwyhgLngBD2KN0ap9F/gOV8rFDEx8uh7R2A==", "dev": true, - "dependencies": { - "@types/istanbul-lib-report": "*" + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "node_modules/@types/jest": { - "version": "28.1.8", - "resolved": "https://registry.npmjs.org/@types/jest/-/jest-28.1.8.tgz", - "integrity": "sha512-8TJkV++s7B6XqnDrzR1m/TT0A0h948Pnl/097veySPN67VRAgQ4gZ7n2KfJo2rVq6njQjdxU3GCCyDvAeuHoiw==", + "node_modules/@sigstore/sign": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@sigstore/sign/-/sign-1.0.0.tgz", + "integrity": "sha512-INxFVNQteLtcfGmcoldzV6Je0sbbfh9I16DM4yJPw3j5+TFP8X6uIiA18mvpEa9yyeycAKgPmOA3X9hVdVTPUA==", "dev": true, "dependencies": { - "expect": "^28.0.0", - "pretty-format": "^28.0.0" - } - }, - "node_modules/@types/jsdom": { - "version": "16.2.15", - "resolved": "https://registry.npmjs.org/@types/jsdom/-/jsdom-16.2.15.tgz", - "integrity": "sha512-nwF87yjBKuX/roqGYerZZM0Nv1pZDMAT5YhOHYeM/72Fic+VEqJh4nyoqoapzJnW3pUlfxPY5FhgsJtM+dRnQQ==", - "dev": true, - "dependencies": { - "@types/node": "*", - "@types/parse5": "^6.0.3", - "@types/tough-cookie": "*" + "@sigstore/bundle": "^1.1.0", + "@sigstore/protobuf-specs": "^0.2.0", + "make-fetch-happen": "^11.0.1" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "node_modules/@types/json-schema": { - "version": "7.0.11", - "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz", - "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==", - "dev": true - }, - "node_modules/@types/mime": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/@types/mime/-/mime-3.0.1.tgz", - "integrity": "sha512-Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA==", - "dev": true - }, - "node_modules/@types/node": { - "version": "18.0.3", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.0.3.tgz", - "integrity": "sha512-HzNRZtp4eepNitP+BD6k2L6DROIDG4Q0fm4x+dwfsr6LGmROENnok75VGw40628xf+iR24WeMFcHuuBDUAzzsQ==", - "dev": true - }, - "node_modules/@types/parse-json": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz", - "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==", - "dev": true - }, - "node_modules/@types/parse5": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/@types/parse5/-/parse5-6.0.3.tgz", - "integrity": "sha512-SuT16Q1K51EAVPz1K29DJ/sXjhSQ0zjvsypYJ6tlwVsRV9jwW5Adq2ch8Dq8kDBCkYnELS7N7VNCSB5nC56t/g==", - "dev": true - }, - "node_modules/@types/prettier": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.7.1.tgz", - "integrity": "sha512-ri0UmynRRvZiiUJdiz38MmIblKK+oH30MztdBVR95dv/Ubw6neWSb8u1XpRb72L4qsZOhz+L+z9JD40SJmfWow==", - "dev": true - }, - "node_modules/@types/qs": { - "version": "6.9.7", - "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.7.tgz", - "integrity": "sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==", - "dev": true - }, - "node_modules/@types/range-parser": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.4.tgz", - "integrity": "sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==", - "dev": true - }, - "node_modules/@types/retry": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.0.tgz", - "integrity": "sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==", - "dev": true - }, - "node_modules/@types/semver": { - "version": "7.3.13", - "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.3.13.tgz", - "integrity": "sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw==", - "dev": true - }, - "node_modules/@types/serve-index": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.1.tgz", - "integrity": "sha512-d/Hs3nWDxNL2xAczmOVZNj92YZCS6RGxfBPjKzuu/XirCgXdpKEb88dYNbrYGint6IVWLNP+yonwVAuRC0T2Dg==", + "node_modules/@sigstore/sign/node_modules/@tootallnate/once": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz", + "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==", "dev": true, - "dependencies": { - "@types/express": "*" + "engines": { + "node": ">= 10" } }, - "node_modules/@types/serve-static": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.0.tgz", - "integrity": "sha512-z5xyF6uh8CbjAu9760KDKsH2FcDxZ2tFCsA4HIMWE6IkiYMXfVoa+4f9KX+FN0ZLsaMw1WNG2ETLA6N+/YA+cg==", + "node_modules/@sigstore/sign/node_modules/http-proxy-agent": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz", + "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==", "dev": true, "dependencies": { - "@types/mime": "*", - "@types/node": "*" + "@tootallnate/once": "2", + "agent-base": "6", + "debug": "4" + }, + "engines": { + "node": ">= 6" } }, - "node_modules/@types/sockjs": { - "version": "0.3.33", - "resolved": "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.33.tgz", - "integrity": "sha512-f0KEEe05NvUnat+boPTZ0dgaLZ4SfSouXUgv5noUiefG2ajgKjmETo9ZJyuqsl7dfl2aHlLJUiki6B4ZYldiiw==", + "node_modules/@sigstore/sign/node_modules/lru-cache": { + "version": "7.18.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", + "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", "dev": true, - "dependencies": { - "@types/node": "*" + "engines": { + "node": ">=12" } }, - "node_modules/@types/stack-utils": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.1.tgz", - "integrity": "sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==", - "dev": true - }, - "node_modules/@types/tough-cookie": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.2.tgz", - "integrity": "sha512-Q5vtl1W5ue16D+nIaW8JWebSSraJVlK+EthKn7e7UcD4KWsaSJ8BqGPXNaPghgtcn/fhvrN17Tv8ksUsQpiplw==", - "dev": true - }, - "node_modules/@types/ws": { - "version": "8.5.4", - "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.4.tgz", - "integrity": "sha512-zdQDHKUgcX/zBc4GrwsE/7dVdAD8JR4EuiAXiiUhhfyIJXXb2+PrGshFyeXWQPMmmZ2XxgaqclgpIC7eTXc1mg==", + "node_modules/@sigstore/sign/node_modules/make-fetch-happen": { + "version": "11.1.1", + "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-11.1.1.tgz", + "integrity": "sha512-rLWS7GCSTcEujjVBs2YqG7Y4643u8ucvCJeSRqiLYhesrDuzeuFIk37xREzAsfQaqzl8b9rNCE4m6J8tvX4Q8w==", "dev": true, "dependencies": { - "@types/node": "*" + "agentkeepalive": "^4.2.1", + "cacache": "^17.0.0", + "http-cache-semantics": "^4.1.1", + "http-proxy-agent": "^5.0.0", + "https-proxy-agent": "^5.0.0", + "is-lambda": "^1.0.1", + "lru-cache": "^7.7.1", + "minipass": "^5.0.0", + "minipass-fetch": "^3.0.0", + "minipass-flush": "^1.0.5", + "minipass-pipeline": "^1.2.4", + "negotiator": "^0.6.3", + "promise-retry": "^2.0.1", + "socks-proxy-agent": "^7.0.0", + "ssri": "^10.0.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "node_modules/@types/yargs": { - "version": "17.0.15", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.15.tgz", - "integrity": "sha512-ZHc4W2dnEQPfhn06TBEdWaiUHEZAocYaiVMfwOipY5jcJt/251wVrKCBWBetGZWO5CF8tdb7L3DmdxVlZ2BOIg==", + "node_modules/@sigstore/sign/node_modules/minipass-fetch": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.4.tgz", + "integrity": "sha512-jHAqnA728uUpIaFm7NWsCnqKT6UqZz7GcI/bDpPATuwYyKwJwW0remxSCxUlKiEty+eopHGa3oc8WxgQ1FFJqg==", "dev": true, "dependencies": { - "@types/yargs-parser": "*" + "minipass": "^7.0.3", + "minipass-sized": "^1.0.3", + "minizlib": "^2.1.2" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + }, + "optionalDependencies": { + "encoding": "^0.1.13" } }, - "node_modules/@types/yargs-parser": { - "version": "21.0.0", - "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.0.tgz", - "integrity": "sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==", - "dev": true - }, - "node_modules/@typescript-eslint/eslint-plugin": { - "version": "5.37.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.37.0.tgz", - "integrity": "sha512-Fde6W0IafXktz1UlnhGkrrmnnGpAo1kyX7dnyHHVrmwJOn72Oqm3eYtddrpOwwel2W8PAK9F3pIL5S+lfoM0og==", + "node_modules/@sigstore/sign/node_modules/minipass-fetch/node_modules/minipass": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz", + "integrity": "sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==", "dev": true, - "dependencies": { - "@typescript-eslint/scope-manager": "5.37.0", - "@typescript-eslint/type-utils": "5.37.0", - "@typescript-eslint/utils": "5.37.0", - "debug": "^4.3.4", - "functional-red-black-tree": "^1.0.1", - "ignore": "^5.2.0", - "regexpp": "^3.2.0", - "semver": "^7.3.7", - "tsutils": "^3.21.0" - }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "@typescript-eslint/parser": "^5.0.0", - "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } + "node": ">=16 || 14 >=14.17" } }, - "node_modules/@typescript-eslint/parser": { - "version": "5.37.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.37.0.tgz", - "integrity": "sha512-01VzI/ipYKuaG5PkE5+qyJ6m02fVALmMPY3Qq5BHflDx3y4VobbLdHQkSMg9VPRS4KdNt4oYTMaomFoHonBGAw==", + "node_modules/@sigstore/tuf": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@sigstore/tuf/-/tuf-1.0.3.tgz", + "integrity": "sha512-2bRovzs0nJZFlCN3rXirE4gwxCn97JNjMmwpecqlbgV9WcxX7WRuIrgzx/X7Ib7MYRbyUTpBYE0s2x6AmZXnlg==", "dev": true, "dependencies": { - "@typescript-eslint/scope-manager": "5.37.0", - "@typescript-eslint/types": "5.37.0", - "@typescript-eslint/typescript-estree": "5.37.0", - "debug": "^4.3.4" + "@sigstore/protobuf-specs": "^0.2.0", + "tuf-js": "^1.1.7" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "node_modules/@typescript-eslint/scope-manager": { - "version": "5.37.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.37.0.tgz", - "integrity": "sha512-F67MqrmSXGd/eZnujjtkPgBQzgespu/iCZ+54Ok9X5tALb9L2v3G+QBSoWkXG0p3lcTJsL+iXz5eLUEdSiJU9Q==", + "node_modules/@sinclair/typebox": { + "version": "0.27.8", + "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", + "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==", + "dev": true + }, + "node_modules/@sinonjs/commons": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.0.tgz", + "integrity": "sha512-jXBtWAF4vmdNmZgD5FoKsVLv3rPgDnLgPbU84LIJ3otV44vJlDRokVng5v8NFJdCf/da9legHcKaRuZs4L7faA==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.37.0", - "@typescript-eslint/visitor-keys": "5.37.0" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" + "type-detect": "4.0.8" } }, - "node_modules/@typescript-eslint/type-utils": { - "version": "5.37.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.37.0.tgz", - "integrity": "sha512-BSx/O0Z0SXOF5tY0bNTBcDEKz2Ec20GVYvq/H/XNKiUorUFilH7NPbFUuiiyzWaSdN3PA8JV0OvYx0gH/5aFAQ==", + "node_modules/@sinonjs/fake-timers": { + "version": "10.3.0", + "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-10.3.0.tgz", + "integrity": "sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA==", "dev": true, "dependencies": { - "@typescript-eslint/typescript-estree": "5.37.0", - "@typescript-eslint/utils": "5.37.0", - "debug": "^4.3.4", - "tsutils": "^3.21.0" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "eslint": "*" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } + "@sinonjs/commons": "^3.0.0" } }, - "node_modules/@typescript-eslint/types": { - "version": "5.37.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.37.0.tgz", - "integrity": "sha512-3frIJiTa5+tCb2iqR/bf7XwU20lnU05r/sgPJnRpwvfZaqCJBrl8Q/mw9vr3NrNdB/XtVyMA0eppRMMBqdJ1bA==", + "node_modules/@tootallnate/once": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", + "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==", "dev": true, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" + "node": ">= 6" } }, - "node_modules/@typescript-eslint/typescript-estree": { - "version": "5.37.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.37.0.tgz", - "integrity": "sha512-JkFoFIt/cx59iqEDSgIGnQpCTRv96MQnXCYvJi7QhBC24uyuzbD8wVbajMB1b9x4I0octYFJ3OwjAwNqk1AjDA==", + "node_modules/@tufjs/canonical-json": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@tufjs/canonical-json/-/canonical-json-1.0.0.tgz", + "integrity": "sha512-QTnf++uxunWvG2z3UFNzAoQPHxnSXOwtaI3iJ+AohhV+5vONuArPjJE7aPXPVXfXJsqrVbZBu9b81AJoSd09IQ==", "dev": true, - "dependencies": { - "@typescript-eslint/types": "5.37.0", - "@typescript-eslint/visitor-keys": "5.37.0", - "debug": "^4.3.4", - "globby": "^11.1.0", - "is-glob": "^4.0.3", - "semver": "^7.3.7", - "tsutils": "^3.21.0" - }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "node_modules/@typescript-eslint/typescript-estree/node_modules/globby": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", - "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==", + "node_modules/@tufjs/models": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@tufjs/models/-/models-1.0.4.tgz", + "integrity": "sha512-qaGV9ltJP0EO25YfFUPhxRVK0evXFIAGicsVXuRim4Ed9cjPxYhNnNJ49SFmbeLgtxpslIkX317IgpfcHPVj/A==", "dev": true, "dependencies": { - "array-union": "^2.1.0", - "dir-glob": "^3.0.1", - "fast-glob": "^3.2.9", - "ignore": "^5.2.0", - "merge2": "^1.4.1", - "slash": "^3.0.0" + "@tufjs/canonical-json": "1.0.0", + "minimatch": "^9.0.0" }, "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "node_modules/@typescript-eslint/typescript-estree/node_modules/slash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", + "node_modules/@tufjs/models/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", "dev": true, - "engines": { - "node": ">=8" + "dependencies": { + "balanced-match": "^1.0.0" } }, - "node_modules/@typescript-eslint/utils": { - "version": "5.37.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.37.0.tgz", - "integrity": "sha512-jUEJoQrWbZhmikbcWSMDuUSxEE7ID2W/QCV/uz10WtQqfOuKZUqFGjqLJ+qhDd17rjgp+QJPqTdPIBWwoob2NQ==", + "node_modules/@tufjs/models/node_modules/minimatch": { + "version": "9.0.3", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", + "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==", "dev": true, "dependencies": { - "@types/json-schema": "^7.0.9", - "@typescript-eslint/scope-manager": "5.37.0", - "@typescript-eslint/types": "5.37.0", - "@typescript-eslint/typescript-estree": "5.37.0", - "eslint-scope": "^5.1.1", - "eslint-utils": "^3.0.0" + "brace-expansion": "^2.0.1" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": ">=16 || 14 >=14.17" }, "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" + "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/@typescript-eslint/visitor-keys": { - "version": "5.37.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.37.0.tgz", - "integrity": "sha512-Hp7rT4cENBPIzMwrlehLW/28EVCOcE9U1Z1BQTc8EA8v5qpr7GRGuG+U58V5tTY48zvUOA3KHvw3rA8tY9fbdA==", + "node_modules/@types/babel__core": { + "version": "7.20.3", + "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.3.tgz", + "integrity": "sha512-54fjTSeSHwfan8AyHWrKbfBWiEUrNTZsUwPTDSNaaP1QDQIZbeNUg3a59E9D+375MzUw/x1vx2/0F5LBz+AeYA==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.37.0", - "eslint-visitor-keys": "^3.3.0" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" + "@babel/parser": "^7.20.7", + "@babel/types": "^7.20.7", + "@types/babel__generator": "*", + "@types/babel__template": "*", + "@types/babel__traverse": "*" } }, - "node_modules/@webassemblyjs/ast": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz", - "integrity": "sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==", + "node_modules/@types/babel__generator": { + "version": "7.6.6", + "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.6.tgz", + "integrity": "sha512-66BXMKb/sUWbMdBNdMvajU7i/44RkrA3z/Yt1c7R5xejt8qh84iU54yUWCtm0QwGJlDcf/gg4zd/x4mpLAlb/w==", "dev": true, "dependencies": { - "@webassemblyjs/helper-numbers": "1.11.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.1" + "@babel/types": "^7.0.0" } }, - "node_modules/@webassemblyjs/floating-point-hex-parser": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz", - "integrity": "sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==", - "dev": true - }, - "node_modules/@webassemblyjs/helper-api-error": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz", - "integrity": "sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==", - "dev": true - }, - "node_modules/@webassemblyjs/helper-buffer": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz", - "integrity": "sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==", - "dev": true - }, - "node_modules/@webassemblyjs/helper-numbers": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz", - "integrity": "sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==", + "node_modules/@types/babel__template": { + "version": "7.4.3", + "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.3.tgz", + "integrity": "sha512-ciwyCLeuRfxboZ4isgdNZi/tkt06m8Tw6uGbBSBgWrnnZGNXiEyM27xc/PjXGQLqlZ6ylbgHMnm7ccF9tCkOeQ==", "dev": true, "dependencies": { - "@webassemblyjs/floating-point-hex-parser": "1.11.1", - "@webassemblyjs/helper-api-error": "1.11.1", - "@xtuc/long": "4.2.2" + "@babel/parser": "^7.1.0", + "@babel/types": "^7.0.0" } }, - "node_modules/@webassemblyjs/helper-wasm-bytecode": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz", - "integrity": "sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==", - "dev": true - }, - "node_modules/@webassemblyjs/helper-wasm-section": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz", - "integrity": "sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==", + "node_modules/@types/babel__traverse": { + "version": "7.20.3", + "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.3.tgz", + "integrity": "sha512-Lsh766rGEFbaxMIDH7Qa+Yha8cMVI3qAK6CHt3OR0YfxOIn5Z54iHiyDRycHrBqeIiqGa20Kpsv1cavfBKkRSw==", "dev": true, "dependencies": { - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/helper-buffer": "1.11.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.1", - "@webassemblyjs/wasm-gen": "1.11.1" + "@babel/types": "^7.20.7" } }, - "node_modules/@webassemblyjs/ieee754": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz", - "integrity": "sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==", + "node_modules/@types/body-parser": { + "version": "1.19.4", + "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.4.tgz", + "integrity": "sha512-N7UDG0/xiPQa2D/XrVJXjkWbpqHCd2sBaB32ggRF2l83RhPfamgKGF8gwwqyksS95qUS5ZYF9aF+lLPRlwI2UA==", "dev": true, "dependencies": { - "@xtuc/ieee754": "^1.2.0" + "@types/connect": "*", + "@types/node": "*" } }, - "node_modules/@webassemblyjs/leb128": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.1.tgz", - "integrity": "sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==", + "node_modules/@types/bonjour": { + "version": "3.5.12", + "resolved": "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.12.tgz", + "integrity": "sha512-ky0kWSqXVxSqgqJvPIkgFkcn4C8MnRog308Ou8xBBIVo39OmUFy+jqNe0nPwLCDFxUpmT9EvT91YzOJgkDRcFg==", "dev": true, "dependencies": { - "@xtuc/long": "4.2.2" + "@types/node": "*" } }, - "node_modules/@webassemblyjs/utf8": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.1.tgz", - "integrity": "sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==", - "dev": true - }, - "node_modules/@webassemblyjs/wasm-edit": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz", - "integrity": "sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==", + "node_modules/@types/connect": { + "version": "3.4.37", + "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.37.tgz", + "integrity": "sha512-zBUSRqkfZ59OcwXon4HVxhx5oWCJmc0OtBTK05M+p0dYjgN6iTwIL2T/WbsQZrEsdnwaF9cWQ+azOnpPvIqY3Q==", "dev": true, "dependencies": { - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/helper-buffer": "1.11.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.1", - "@webassemblyjs/helper-wasm-section": "1.11.1", - "@webassemblyjs/wasm-gen": "1.11.1", - "@webassemblyjs/wasm-opt": "1.11.1", - "@webassemblyjs/wasm-parser": "1.11.1", - "@webassemblyjs/wast-printer": "1.11.1" + "@types/node": "*" } }, - "node_modules/@webassemblyjs/wasm-gen": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz", - "integrity": "sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==", + "node_modules/@types/connect-history-api-fallback": { + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.2.tgz", + "integrity": "sha512-gX2j9x+NzSh4zOhnRPSdPPmTepS4DfxES0AvIFv3jGv5QyeAJf6u6dY5/BAoAJU9Qq1uTvwOku8SSC2GnCRl6Q==", "dev": true, "dependencies": { - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.1", - "@webassemblyjs/ieee754": "1.11.1", - "@webassemblyjs/leb128": "1.11.1", - "@webassemblyjs/utf8": "1.11.1" + "@types/express-serve-static-core": "*", + "@types/node": "*" } }, - "node_modules/@webassemblyjs/wasm-opt": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz", - "integrity": "sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==", + "node_modules/@types/eslint": { + "version": "8.44.6", + "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.44.6.tgz", + "integrity": "sha512-P6bY56TVmX8y9J87jHNgQh43h6VVU+6H7oN7hgvivV81K2XY8qJZ5vqPy/HdUoVIelii2kChYVzQanlswPWVFw==", "dev": true, "dependencies": { - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/helper-buffer": "1.11.1", - "@webassemblyjs/wasm-gen": "1.11.1", - "@webassemblyjs/wasm-parser": "1.11.1" + "@types/estree": "*", + "@types/json-schema": "*" } }, - "node_modules/@webassemblyjs/wasm-parser": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz", - "integrity": "sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==", + "node_modules/@types/eslint-scope": { + "version": "3.7.6", + "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.6.tgz", + "integrity": "sha512-zfM4ipmxVKWdxtDaJ3MP3pBurDXOCoyjvlpE3u6Qzrmw4BPbfm4/ambIeTk/r/J0iq/+2/xp0Fmt+gFvXJY2PQ==", "dev": true, "dependencies": { - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/helper-api-error": "1.11.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.1", - "@webassemblyjs/ieee754": "1.11.1", - "@webassemblyjs/leb128": "1.11.1", - "@webassemblyjs/utf8": "1.11.1" + "@types/eslint": "*", + "@types/estree": "*" } }, - "node_modules/@webassemblyjs/wast-printer": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz", - "integrity": "sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==", + "node_modules/@types/estree": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.4.tgz", + "integrity": "sha512-2JwWnHK9H+wUZNorf2Zr6ves96WHoWDJIftkcxPKsS7Djta6Zu519LarhRNljPXkpsZR2ZMwNCPeW7omW07BJw==", + "dev": true + }, + "node_modules/@types/express": { + "version": "4.17.20", + "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.20.tgz", + "integrity": "sha512-rOaqlkgEvOW495xErXMsmyX3WKBInbhG5eqojXYi3cGUaLoRDlXa5d52fkfWZT963AZ3v2eZ4MbKE6WpDAGVsw==", "dev": true, "dependencies": { - "@webassemblyjs/ast": "1.11.1", - "@xtuc/long": "4.2.2" + "@types/body-parser": "*", + "@types/express-serve-static-core": "^4.17.33", + "@types/qs": "*", + "@types/serve-static": "*" } }, - "node_modules/@xtuc/ieee754": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz", - "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==", - "dev": true + "node_modules/@types/express-serve-static-core": { + "version": "4.17.39", + "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.39.tgz", + "integrity": "sha512-BiEUfAiGCOllomsRAZOiMFP7LAnrifHpt56pc4Z7l9K6ACyN06Ns1JLMBxwkfLOjJRlSf06NwWsT7yzfpaVpyQ==", + "dev": true, + "dependencies": { + "@types/node": "*", + "@types/qs": "*", + "@types/range-parser": "*", + "@types/send": "*" + } }, - "node_modules/@xtuc/long": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz", - "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==", - "dev": true + "node_modules/@types/graceful-fs": { + "version": "4.1.8", + "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.8.tgz", + "integrity": "sha512-NhRH7YzWq8WiNKVavKPBmtLYZHxNY19Hh+az28O/phfp68CF45pMFud+ZzJ8ewnxnC5smIdF3dqFeiSUQ5I+pw==", + "dev": true, + "dependencies": { + "@types/node": "*" + } }, - "node_modules/@yarnpkg/lockfile": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz", - "integrity": "sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==", + "node_modules/@types/http-errors": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.3.tgz", + "integrity": "sha512-pP0P/9BnCj1OVvQR2lF41EkDG/lWWnDyA203b/4Fmi2eTyORnBtcDoKDwjWQthELrBvWkMOrvSOnZ8OVlW6tXA==", "dev": true }, - "node_modules/abab": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz", - "integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==", - "dev": true + "node_modules/@types/http-proxy": { + "version": "1.17.13", + "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.13.tgz", + "integrity": "sha512-GkhdWcMNiR5QSQRYnJ+/oXzu0+7JJEPC8vkWXK351BkhjraZF+1W13CUYARUvX9+NqIU2n6YHA4iwywsc/M6Sw==", + "dev": true, + "dependencies": { + "@types/node": "*" + } }, - "node_modules/abbrev": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", - "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", + "node_modules/@types/istanbul-lib-coverage": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.5.tgz", + "integrity": "sha512-zONci81DZYCZjiLe0r6equvZut0b+dBRPBN5kBDjsONnutYNtJMoWQ9uR2RkL1gLG9NMTzvf+29e5RFfPbeKhQ==", "dev": true }, - "node_modules/accepts": { - "version": "1.3.8", - "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz", - "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==", + "node_modules/@types/istanbul-lib-report": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.2.tgz", + "integrity": "sha512-8toY6FgdltSdONav1XtUHl4LN1yTmLza+EuDazb/fEmRNCwjyqNVIQWs2IfC74IqjHkREs/nQ2FWq5kZU9IC0w==", "dev": true, "dependencies": { - "mime-types": "~2.1.34", - "negotiator": "0.6.3" - }, - "engines": { - "node": ">= 0.6" + "@types/istanbul-lib-coverage": "*" } }, - "node_modules/acorn": { - "version": "8.8.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.0.tgz", - "integrity": "sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==", + "node_modules/@types/istanbul-reports": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.3.tgz", + "integrity": "sha512-1nESsePMBlf0RPRffLZi5ujYh7IH1BWL4y9pr+Bn3cJBdxz+RTP8bUFljLz9HvzhhOSWKdyBZ4DIivdL6rvgZg==", "dev": true, - "bin": { - "acorn": "bin/acorn" - }, - "engines": { - "node": ">=0.4.0" + "dependencies": { + "@types/istanbul-lib-report": "*" } }, - "node_modules/acorn-globals": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-6.0.0.tgz", - "integrity": "sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==", + "node_modules/@types/jest": { + "version": "29.5.7", + "resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.7.tgz", + "integrity": "sha512-HLyetab6KVPSiF+7pFcUyMeLsx25LDNDemw9mGsJBkai/oouwrjTycocSDYopMEwFhN2Y4s9oPyOCZNofgSt2g==", "dev": true, "dependencies": { - "acorn": "^7.1.1", - "acorn-walk": "^7.1.1" + "expect": "^29.0.0", + "pretty-format": "^29.0.0" } }, - "node_modules/acorn-globals/node_modules/acorn": { - "version": "7.4.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", - "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==", + "node_modules/@types/jsdom": { + "version": "20.0.1", + "resolved": "https://registry.npmjs.org/@types/jsdom/-/jsdom-20.0.1.tgz", + "integrity": "sha512-d0r18sZPmMQr1eG35u12FZfhIXNrnsPU/g5wvRKCUf/tOGilKKwYMYGqh33BNR6ba+2gkHw1EUiHoN3mn7E5IQ==", "dev": true, - "bin": { - "acorn": "bin/acorn" - }, - "engines": { - "node": ">=0.4.0" + "dependencies": { + "@types/node": "*", + "@types/tough-cookie": "*", + "parse5": "^7.0.0" } }, - "node_modules/acorn-import-assertions": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz", - "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==", + "node_modules/@types/json-schema": { + "version": "7.0.14", + "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.14.tgz", + "integrity": "sha512-U3PUjAudAdJBeC2pgN8uTIKgxrb4nlDF3SF0++EldXQvQBGkpFZMSnwQiIoDU77tv45VgNkl/L4ouD+rEomujw==", + "dev": true + }, + "node_modules/@types/mime": { + "version": "1.3.4", + "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.4.tgz", + "integrity": "sha512-1Gjee59G25MrQGk8bsNvC6fxNiRgUlGn2wlhGf95a59DrprnnHk80FIMMFG9XHMdrfsuA119ht06QPDXA1Z7tw==", + "dev": true + }, + "node_modules/@types/node": { + "version": "20.8.10", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.8.10.tgz", + "integrity": "sha512-TlgT8JntpcbmKUFzjhsyhGfP2fsiz1Mv56im6enJ905xG1DAYesxJaeSbGqQmAw8OWPdhyJGhGSQGKRNJ45u9w==", "dev": true, - "peerDependencies": { - "acorn": "^8" + "dependencies": { + "undici-types": "~5.26.4" } }, - "node_modules/acorn-jsx": { - "version": "5.3.2", - "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", - "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", + "node_modules/@types/node-forge": { + "version": "1.3.8", + "resolved": "https://registry.npmjs.org/@types/node-forge/-/node-forge-1.3.8.tgz", + "integrity": "sha512-vGXshY9vim9CJjrpcS5raqSjEfKlJcWy2HNdgUasR66fAnVEYarrf1ULV4nfvpC1nZq/moA9qyqBcu83x+Jlrg==", "dev": true, - "peerDependencies": { - "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" + "dependencies": { + "@types/node": "*" } }, - "node_modules/acorn-walk": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz", - "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==", + "node_modules/@types/qs": { + "version": "6.9.9", + "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.9.tgz", + "integrity": "sha512-wYLxw35euwqGvTDx6zfY1vokBFnsK0HNrzc6xNHchxfO2hpuRg74GbkEW7e3sSmPvj0TjCDT1VCa6OtHXnubsg==", + "dev": true + }, + "node_modules/@types/range-parser": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.6.tgz", + "integrity": "sha512-+0autS93xyXizIYiyL02FCY8N+KkKPhILhcUSA276HxzreZ16kl+cmwvV2qAM/PuCCwPXzOXOWhiPcw20uSFcA==", + "dev": true + }, + "node_modules/@types/retry": { + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.0.tgz", + "integrity": "sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==", + "dev": true + }, + "node_modules/@types/semver": { + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-MMzuxN3GdFwskAnb6fz0orFvhfqi752yjaXylr0Rp4oDg5H0Zn1IuyRhDVvYOwAXoJirx2xuS16I3WjxnAIHiQ==", + "dev": true + }, + "node_modules/@types/send": { + "version": "0.17.3", + "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.3.tgz", + "integrity": "sha512-/7fKxvKUoETxjFUsuFlPB9YndePpxxRAOfGC/yJdc9kTjTeP5kRCTzfnE8kPUKCeyiyIZu0YQ76s50hCedI1ug==", "dev": true, - "engines": { - "node": ">=0.4.0" + "dependencies": { + "@types/mime": "^1", + "@types/node": "*" } }, - "node_modules/adjust-sourcemap-loader": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/adjust-sourcemap-loader/-/adjust-sourcemap-loader-4.0.0.tgz", - "integrity": "sha512-OXwN5b9pCUXNQHJpwwD2qP40byEmSgzj8B4ydSN0uMNYWiFmJ6x6KwUllMmfk8Rwu/HJDFR7U8ubsWBoN0Xp0A==", + "node_modules/@types/serve-index": { + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.3.tgz", + "integrity": "sha512-4KG+yMEuvDPRrYq5fyVm/I2uqAJSAwZK9VSa+Zf+zUq9/oxSSvy3kkIqyL+jjStv6UCVi8/Aho0NHtB1Fwosrg==", "dev": true, "dependencies": { - "loader-utils": "^2.0.0", - "regex-parser": "^2.2.11" - }, - "engines": { - "node": ">=8.9" + "@types/express": "*" } }, - "node_modules/adjust-sourcemap-loader/node_modules/loader-utils": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz", - "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==", + "node_modules/@types/serve-static": { + "version": "1.15.4", + "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.4.tgz", + "integrity": "sha512-aqqNfs1XTF0HDrFdlY//+SGUxmdSUbjeRXb5iaZc3x0/vMbYmdw9qvOgHWOyyLFxSSRnUuP5+724zBgfw8/WAw==", "dev": true, "dependencies": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^2.1.2" - }, - "engines": { - "node": ">=8.9.0" + "@types/http-errors": "*", + "@types/mime": "*", + "@types/node": "*" } }, - "node_modules/agent-base": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", - "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", + "node_modules/@types/sockjs": { + "version": "0.3.35", + "resolved": "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.35.tgz", + "integrity": "sha512-tIF57KB+ZvOBpAQwSaACfEu7htponHXaFzP7RfKYgsOS0NoYnn+9+jzp7bbq4fWerizI3dTB4NfAZoyeQKWJLw==", "dev": true, "dependencies": { - "debug": "4" - }, - "engines": { - "node": ">= 6.0.0" + "@types/node": "*" } }, - "node_modules/agentkeepalive": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.2.1.tgz", - "integrity": "sha512-Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA==", + "node_modules/@types/stack-utils": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.2.tgz", + "integrity": "sha512-g7CK9nHdwjK2n0ymT2CW698FuWJRIx+RP6embAzZ2Qi8/ilIrA1Imt2LVSeHUzKvpoi7BhmmQcXz95eS0f2JXw==", + "dev": true + }, + "node_modules/@types/tough-cookie": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.4.tgz", + "integrity": "sha512-95Sfz4nvMAb0Nl9DTxN3j64adfwfbBPEYq14VN7zT5J5O2M9V6iZMIIQU1U+pJyl9agHYHNCqhCXgyEtIRRa5A==", + "dev": true + }, + "node_modules/@types/ws": { + "version": "8.5.8", + "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.8.tgz", + "integrity": "sha512-flUksGIQCnJd6sZ1l5dqCEG/ksaoAg/eUwiLAGTJQcfgvZJKF++Ta4bJA6A5aPSJmsr+xlseHn4KLgVlNnvPTg==", "dev": true, "dependencies": { - "debug": "^4.1.0", - "depd": "^1.1.2", - "humanize-ms": "^1.2.1" - }, - "engines": { - "node": ">= 8.0.0" + "@types/node": "*" } }, - "node_modules/aggregate-error": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz", - "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==", + "node_modules/@types/yargs": { + "version": "17.0.29", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.29.tgz", + "integrity": "sha512-nacjqA3ee9zRF/++a3FUY1suHTFKZeHba2n8WeDw9cCVdmzmHpIxyzOJBcpHvvEmS8E9KqWlSnWHUkOrkhWcvA==", "dev": true, "dependencies": { - "clean-stack": "^2.0.0", - "indent-string": "^4.0.0" - }, - "engines": { - "node": ">=8" + "@types/yargs-parser": "*" } }, - "node_modules/ajv": { - "version": "8.12.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz", - "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==", + "node_modules/@types/yargs-parser": { + "version": "21.0.2", + "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.2.tgz", + "integrity": "sha512-5qcvofLPbfjmBfKaLfj/+f+Sbd6pN4zl7w7VSVI5uz7m9QZTuB2aZAa2uo1wHFBNN2x6g/SoTkXmd8mQnQF2Cw==", + "dev": true + }, + "node_modules/@typescript-eslint/eslint-plugin": { + "version": "6.9.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.9.1.tgz", + "integrity": "sha512-w0tiiRc9I4S5XSXXrMHOWgHgxbrBn1Ro+PmiYhSg2ZVdxrAJtQgzU5o2m1BfP6UOn7Vxcc6152vFjQfmZR4xEg==", "dev": true, "dependencies": { - "fast-deep-equal": "^3.1.1", - "json-schema-traverse": "^1.0.0", - "require-from-string": "^2.0.2", - "uri-js": "^4.2.2" + "@eslint-community/regexpp": "^4.5.1", + "@typescript-eslint/scope-manager": "6.9.1", + "@typescript-eslint/type-utils": "6.9.1", + "@typescript-eslint/utils": "6.9.1", + "@typescript-eslint/visitor-keys": "6.9.1", + "debug": "^4.3.4", + "graphemer": "^1.4.0", + "ignore": "^5.2.4", + "natural-compare": "^1.4.0", + "semver": "^7.5.4", + "ts-api-utils": "^1.0.1" + }, + "engines": { + "node": "^16.0.0 || >=18.0.0" }, "funding": { - "type": "github", - "url": "https://github.com/sponsors/epoberezkin" + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "@typescript-eslint/parser": "^6.0.0 || ^6.0.0-alpha", + "eslint": "^7.0.0 || ^8.0.0" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } } }, - "node_modules/ajv-formats": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz", - "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==", + "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/type-utils": { + "version": "6.9.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.9.1.tgz", + "integrity": "sha512-eh2oHaUKCK58qIeYp19F5V5TbpM52680sB4zNSz29VBQPTWIlE/hCj5P5B1AChxECe/fmZlspAWFuRniep1Skg==", "dev": true, "dependencies": { - "ajv": "^8.0.0" + "@typescript-eslint/typescript-estree": "6.9.1", + "@typescript-eslint/utils": "6.9.1", + "debug": "^4.3.4", + "ts-api-utils": "^1.0.1" + }, + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "ajv": "^8.0.0" + "eslint": "^7.0.0 || ^8.0.0" }, "peerDependenciesMeta": { - "ajv": { + "typescript": { "optional": true } } }, - "node_modules/ajv-keywords": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz", - "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==", + "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/utils": { + "version": "6.9.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.9.1.tgz", + "integrity": "sha512-L1T0A5nFdQrMVunpZgzqPL6y2wVreSyHhKGZryS6jrEN7bD9NplVAyMryUhXsQ4TWLnZmxc2ekar/lSGIlprCA==", "dev": true, "dependencies": { - "fast-deep-equal": "^3.1.3" + "@eslint-community/eslint-utils": "^4.4.0", + "@types/json-schema": "^7.0.12", + "@types/semver": "^7.5.0", + "@typescript-eslint/scope-manager": "6.9.1", + "@typescript-eslint/types": "6.9.1", + "@typescript-eslint/typescript-estree": "6.9.1", + "semver": "^7.5.4" + }, + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "ajv": "^8.8.2" + "eslint": "^7.0.0 || ^8.0.0" } }, - "node_modules/angular-mentions": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/angular-mentions/-/angular-mentions-1.5.0.tgz", - "integrity": "sha512-6l63v7AvrX9vFzj2h7jAPTnQ390IomCz3HiQP+b3PnDvaZiycd+tiVavi5RxAIX8WYjsamAR+tTPCkOkBkqZ+w==", + "node_modules/@typescript-eslint/parser": { + "version": "6.9.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.9.1.tgz", + "integrity": "sha512-C7AK2wn43GSaCUZ9do6Ksgi2g3mwFkMO3Cis96kzmgudoVaKyt62yNzJOktP0HDLb/iO2O0n2lBOzJgr6Q/cyg==", + "dev": true, "dependencies": { - "tslib": "^2.0.0" + "@typescript-eslint/scope-manager": "6.9.1", + "@typescript-eslint/types": "6.9.1", + "@typescript-eslint/typescript-estree": "6.9.1", + "@typescript-eslint/visitor-keys": "6.9.1", + "debug": "^4.3.4" + }, + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "@angular/common": ">=7.2.0", - "@angular/core": ">=7.2.0" + "eslint": "^7.0.0 || ^8.0.0" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } } }, - "node_modules/ansi-colors": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz", - "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==", + "node_modules/@typescript-eslint/scope-manager": { + "version": "6.9.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.9.1.tgz", + "integrity": "sha512-38IxvKB6NAne3g/+MyXMs2Cda/Sz+CEpmm+KLGEM8hx/CvnSRuw51i8ukfwB/B/sESdeTGet1NH1Wj7I0YXswg==", "dev": true, + "dependencies": { + "@typescript-eslint/types": "6.9.1", + "@typescript-eslint/visitor-keys": "6.9.1" + }, "engines": { - "node": ">=6" + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" } }, - "node_modules/ansi-escapes": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz", - "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==", + "node_modules/@typescript-eslint/type-utils": { + "version": "5.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.62.0.tgz", + "integrity": "sha512-xsSQreu+VnfbqQpW5vnCJdq1Z3Q0U31qiWmRhr98ONQmcp/yhiPJFPq8MXiJVLiksmOKSjIldZzkebzHuCGzew==", "dev": true, "dependencies": { - "type-fest": "^0.21.3" + "@typescript-eslint/typescript-estree": "5.62.0", + "@typescript-eslint/utils": "5.62.0", + "debug": "^4.3.4", + "tsutils": "^3.21.0" }, "engines": { - "node": ">=8" + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" }, "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/ansi-html-community": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/ansi-html-community/-/ansi-html-community-0.0.8.tgz", - "integrity": "sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==", - "dev": true, - "engines": [ - "node >= 0.8.0" - ], - "bin": { - "ansi-html": "bin/ansi-html" + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "*" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } } }, - "node_modules/ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/types": { + "version": "5.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.62.0.tgz", + "integrity": "sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==", "dev": true, "engines": { - "node": ">=8" + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" } }, - "node_modules/ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/typescript-estree": { + "version": "5.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz", + "integrity": "sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==", "dev": true, "dependencies": { - "color-convert": "^1.9.0" + "@typescript-eslint/types": "5.62.0", + "@typescript-eslint/visitor-keys": "5.62.0", + "debug": "^4.3.4", + "globby": "^11.1.0", + "is-glob": "^4.0.3", + "semver": "^7.3.7", + "tsutils": "^3.21.0" }, "engines": { - "node": ">=4" + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } } }, - "node_modules/anymatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz", - "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==", + "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/visitor-keys": { + "version": "5.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz", + "integrity": "sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==", "dev": true, "dependencies": { - "normalize-path": "^3.0.0", - "picomatch": "^2.0.4" + "@typescript-eslint/types": "5.62.0", + "eslint-visitor-keys": "^3.3.0" }, "engines": { - "node": ">= 8" + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" } }, - "node_modules/aproba": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz", - "integrity": "sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==", - "dev": true + "node_modules/@typescript-eslint/types": { + "version": "6.9.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.9.1.tgz", + "integrity": "sha512-BUGslGOb14zUHOUmDB2FfT6SI1CcZEJYfF3qFwBeUrU6srJfzANonwRYHDpLBuzbq3HaoF2XL2hcr01c8f8OaQ==", + "dev": true, + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } }, - "node_modules/are-we-there-yet": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz", - "integrity": "sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg==", + "node_modules/@typescript-eslint/typescript-estree": { + "version": "6.9.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.9.1.tgz", + "integrity": "sha512-U+mUylTHfcqeO7mLWVQ5W/tMLXqVpRv61wm9ZtfE5egz7gtnmqVIw9ryh0mgIlkKk9rZLY3UHygsBSdB9/ftyw==", "dev": true, "dependencies": { - "delegates": "^1.0.0", - "readable-stream": "^3.6.0" + "@typescript-eslint/types": "6.9.1", + "@typescript-eslint/visitor-keys": "6.9.1", + "debug": "^4.3.4", + "globby": "^11.1.0", + "is-glob": "^4.0.3", + "semver": "^7.5.4", + "ts-api-utils": "^1.0.1" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } } }, - "node_modules/argparse": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", - "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", + "node_modules/@typescript-eslint/utils": { + "version": "5.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.62.0.tgz", + "integrity": "sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==", "dev": true, "dependencies": { - "sprintf-js": "~1.0.2" + "@eslint-community/eslint-utils": "^4.2.0", + "@types/json-schema": "^7.0.9", + "@types/semver": "^7.3.12", + "@typescript-eslint/scope-manager": "5.62.0", + "@typescript-eslint/types": "5.62.0", + "@typescript-eslint/typescript-estree": "5.62.0", + "eslint-scope": "^5.1.1", + "semver": "^7.3.7" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" } }, - "node_modules/aria-query": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.0.2.tgz", - "integrity": "sha512-eigU3vhqSO+Z8BKDnVLN/ompjhf3pYzecKXz8+whRy+9gZu8n1TCGfwzQUUPnqdHl9ax1Hr9031orZ+UOEYr7Q==", + "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/scope-manager": { + "version": "5.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz", + "integrity": "sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==", "dev": true, + "dependencies": { + "@typescript-eslint/types": "5.62.0", + "@typescript-eslint/visitor-keys": "5.62.0" + }, "engines": { - "node": ">=6.0" + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" } }, - "node_modules/array-flatten": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz", - "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==", - "dev": true - }, - "node_modules/array-union": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", - "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", + "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/types": { + "version": "5.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.62.0.tgz", + "integrity": "sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==", "dev": true, "engines": { - "node": ">=8" + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" } }, - "node_modules/asynckit": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==", - "dev": true - }, - "node_modules/autoprefixer": { - "version": "10.4.13", - "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.13.tgz", - "integrity": "sha512-49vKpMqcZYsJjwotvt4+h/BCjJVnhGwcLpDt5xkcaOG3eLrG/HUYLagrihYsQ+qrIBgIzX1Rw7a6L8I/ZA1Atg==", + "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/typescript-estree": { + "version": "5.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz", + "integrity": "sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==", "dev": true, - "funding": [ - { - "type": "opencollective", - "url": "https://opencollective.com/postcss/" - }, - { - "type": "tidelift", - "url": "https://tidelift.com/funding/github/npm/autoprefixer" - } - ], "dependencies": { - "browserslist": "^4.21.4", - "caniuse-lite": "^1.0.30001426", - "fraction.js": "^4.2.0", - "normalize-range": "^0.1.2", - "picocolors": "^1.0.0", - "postcss-value-parser": "^4.2.0" + "@typescript-eslint/types": "5.62.0", + "@typescript-eslint/visitor-keys": "5.62.0", + "debug": "^4.3.4", + "globby": "^11.1.0", + "is-glob": "^4.0.3", + "semver": "^7.3.7", + "tsutils": "^3.21.0" }, - "bin": { - "autoprefixer": "bin/autoprefixer" + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/visitor-keys": { + "version": "5.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz", + "integrity": "sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==", + "dev": true, + "dependencies": { + "@typescript-eslint/types": "5.62.0", + "eslint-visitor-keys": "^3.3.0" }, "engines": { - "node": "^10 || ^12 || >=14" + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" }, - "peerDependencies": { - "postcss": "^8.1.0" + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" } }, - "node_modules/available-typed-arrays": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz", - "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==", + "node_modules/@typescript-eslint/utils/node_modules/eslint-scope": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", + "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", "dev": true, + "dependencies": { + "esrecurse": "^4.3.0", + "estraverse": "^4.1.1" + }, "engines": { - "node": ">= 0.4" + "node": ">=8.0.0" + } + }, + "node_modules/@typescript-eslint/utils/node_modules/estraverse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", + "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", + "dev": true, + "engines": { + "node": ">=4.0" + } + }, + "node_modules/@typescript-eslint/visitor-keys": { + "version": "6.9.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.9.1.tgz", + "integrity": "sha512-MUaPUe/QRLEffARsmNfmpghuQkW436DvESW+h+M52w0coICHRfD6Np9/K6PdACwnrq1HmuLl+cSPZaJmeVPkSw==", + "dev": true, + "dependencies": { + "@typescript-eslint/types": "6.9.1", + "eslint-visitor-keys": "^3.4.1" + }, + "engines": { + "node": "^16.0.0 || >=18.0.0" }, "funding": { - "url": "https://github.com/sponsors/ljharb" + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" } }, - "node_modules/axobject-query": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-3.0.1.tgz", - "integrity": "sha512-vy5JPSOibF9yAeC2PoemRdA1MuSXX7vX5osdoxKf/6OUeppAWekZ3JIJVNWFMH6wgj7uHYyqZUSqE/b/3JLV1A==", + "node_modules/@ungap/structured-clone": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz", + "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==", + "dev": true + }, + "node_modules/@vitejs/plugin-basic-ssl": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@vitejs/plugin-basic-ssl/-/plugin-basic-ssl-1.0.1.tgz", + "integrity": "sha512-pcub+YbFtFhaGRTo1832FQHQSHvMrlb43974e2eS8EKleR3p1cDdkJFPci1UhwkEf1J9Bz+wKBSzqpKp7nNj2A==", "dev": true, "engines": { - "node": ">=6.0" + "node": ">=14.6.0" + }, + "peerDependencies": { + "vite": "^3.0.0 || ^4.0.0" } }, - "node_modules/babel-jest": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-28.1.3.tgz", - "integrity": "sha512-epUaPOEWMk3cWX0M/sPvCHHCe9fMFAa/9hXEgKP8nFfNl/jlGkE9ucq9NqkZGXLDduCJYS0UvSlPUwC0S+rH6Q==", + "node_modules/@webassemblyjs/ast": { + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.6.tgz", + "integrity": "sha512-IN1xI7PwOvLPgjcf180gC1bqn3q/QaOCwYUahIOhbYUu8KA/3tw2RT/T0Gidi1l7Hhj5D/INhJxiICObqpMu4Q==", "dev": true, "dependencies": { - "@jest/transform": "^28.1.3", - "@types/babel__core": "^7.1.14", - "babel-plugin-istanbul": "^6.1.1", - "babel-preset-jest": "^28.1.3", - "chalk": "^4.0.0", - "graceful-fs": "^4.2.9", - "slash": "^3.0.0" + "@webassemblyjs/helper-numbers": "1.11.6", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6" + } + }, + "node_modules/@webassemblyjs/floating-point-hex-parser": { + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz", + "integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==", + "dev": true + }, + "node_modules/@webassemblyjs/helper-api-error": { + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz", + "integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==", + "dev": true + }, + "node_modules/@webassemblyjs/helper-buffer": { + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.6.tgz", + "integrity": "sha512-z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA==", + "dev": true + }, + "node_modules/@webassemblyjs/helper-numbers": { + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz", + "integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==", + "dev": true, + "dependencies": { + "@webassemblyjs/floating-point-hex-parser": "1.11.6", + "@webassemblyjs/helper-api-error": "1.11.6", + "@xtuc/long": "4.2.2" + } + }, + "node_modules/@webassemblyjs/helper-wasm-bytecode": { + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz", + "integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==", + "dev": true + }, + "node_modules/@webassemblyjs/helper-wasm-section": { + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.6.tgz", + "integrity": "sha512-LPpZbSOwTpEC2cgn4hTydySy1Ke+XEu+ETXuoyvuyezHO3Kjdu90KK95Sh9xTbmjrCsUwvWwCOQQNta37VrS9g==", + "dev": true, + "dependencies": { + "@webassemblyjs/ast": "1.11.6", + "@webassemblyjs/helper-buffer": "1.11.6", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6", + "@webassemblyjs/wasm-gen": "1.11.6" + } + }, + "node_modules/@webassemblyjs/ieee754": { + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz", + "integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==", + "dev": true, + "dependencies": { + "@xtuc/ieee754": "^1.2.0" + } + }, + "node_modules/@webassemblyjs/leb128": { + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.6.tgz", + "integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==", + "dev": true, + "dependencies": { + "@xtuc/long": "4.2.2" + } + }, + "node_modules/@webassemblyjs/utf8": { + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz", + "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==", + "dev": true + }, + "node_modules/@webassemblyjs/wasm-edit": { + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.6.tgz", + "integrity": "sha512-Ybn2I6fnfIGuCR+Faaz7YcvtBKxvoLV3Lebn1tM4o/IAJzmi9AWYIPWpyBfU8cC+JxAO57bk4+zdsTjJR+VTOw==", + "dev": true, + "dependencies": { + "@webassemblyjs/ast": "1.11.6", + "@webassemblyjs/helper-buffer": "1.11.6", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6", + "@webassemblyjs/helper-wasm-section": "1.11.6", + "@webassemblyjs/wasm-gen": "1.11.6", + "@webassemblyjs/wasm-opt": "1.11.6", + "@webassemblyjs/wasm-parser": "1.11.6", + "@webassemblyjs/wast-printer": "1.11.6" + } + }, + "node_modules/@webassemblyjs/wasm-gen": { + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.6.tgz", + "integrity": "sha512-3XOqkZP/y6B4F0PBAXvI1/bky7GryoogUtfwExeP/v7Nzwo1QLcq5oQmpKlftZLbT+ERUOAZVQjuNVak6UXjPA==", + "dev": true, + "dependencies": { + "@webassemblyjs/ast": "1.11.6", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6", + "@webassemblyjs/ieee754": "1.11.6", + "@webassemblyjs/leb128": "1.11.6", + "@webassemblyjs/utf8": "1.11.6" + } + }, + "node_modules/@webassemblyjs/wasm-opt": { + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.6.tgz", + "integrity": "sha512-cOrKuLRE7PCe6AsOVl7WasYf3wbSo4CeOk6PkrjS7g57MFfVUF9u6ysQBBODX0LdgSvQqRiGz3CXvIDKcPNy4g==", + "dev": true, + "dependencies": { + "@webassemblyjs/ast": "1.11.6", + "@webassemblyjs/helper-buffer": "1.11.6", + "@webassemblyjs/wasm-gen": "1.11.6", + "@webassemblyjs/wasm-parser": "1.11.6" + } + }, + "node_modules/@webassemblyjs/wasm-parser": { + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.6.tgz", + "integrity": "sha512-6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ==", + "dev": true, + "dependencies": { + "@webassemblyjs/ast": "1.11.6", + "@webassemblyjs/helper-api-error": "1.11.6", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6", + "@webassemblyjs/ieee754": "1.11.6", + "@webassemblyjs/leb128": "1.11.6", + "@webassemblyjs/utf8": "1.11.6" + } + }, + "node_modules/@webassemblyjs/wast-printer": { + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.6.tgz", + "integrity": "sha512-JM7AhRcE+yW2GWYaKeHL5vt4xqee5N2WcezptmgyhNS+ScggqcT1OtXykhAb13Sn5Yas0j2uv9tHgrjwvzAP4A==", + "dev": true, + "dependencies": { + "@webassemblyjs/ast": "1.11.6", + "@xtuc/long": "4.2.2" + } + }, + "node_modules/@wessberg/ts-evaluator": { + "version": "0.0.27", + "resolved": "https://registry.npmjs.org/@wessberg/ts-evaluator/-/ts-evaluator-0.0.27.tgz", + "integrity": "sha512-7gOpVm3yYojUp/Yn7F4ZybJRxyqfMNf0LXK5KJiawbPfL0XTsJV+0mgrEDjOIR6Bi0OYk2Cyg4tjFu1r8MCZaA==", + "deprecated": "this package has been renamed to ts-evaluator. Please install ts-evaluator instead", + "dev": true, + "dependencies": { + "chalk": "^4.1.0", + "jsdom": "^16.4.0", + "object-path": "^0.11.5", + "tslib": "^2.0.3" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": ">=10.1.0" + }, + "funding": { + "type": "github", + "url": "https://github.com/wessberg/ts-evaluator?sponsor=1" }, "peerDependencies": { - "@babel/core": "^7.8.0" + "typescript": ">=3.2.x || >= 4.x" } }, - "node_modules/babel-jest/node_modules/ansi-styles": { + "node_modules/@wessberg/ts-evaluator/node_modules/ansi-styles": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", @@ -6424,7 +6417,7 @@ "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, - "node_modules/babel-jest/node_modules/chalk": { + "node_modules/@wessberg/ts-evaluator/node_modules/chalk": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", @@ -6440,7 +6433,7 @@ "url": "https://github.com/chalk/chalk?sponsor=1" } }, - "node_modules/babel-jest/node_modules/color-convert": { + "node_modules/@wessberg/ts-evaluator/node_modules/color-convert": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", @@ -6452,13 +6445,13 @@ "node": ">=7.0.0" } }, - "node_modules/babel-jest/node_modules/color-name": { + "node_modules/@wessberg/ts-evaluator/node_modules/color-name": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, - "node_modules/babel-jest/node_modules/has-flag": { + "node_modules/@wessberg/ts-evaluator/node_modules/has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", @@ -6467,16 +6460,7 @@ "node": ">=8" } }, - "node_modules/babel-jest/node_modules/slash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/babel-jest/node_modules/supports-color": { + "node_modules/@wessberg/ts-evaluator/node_modules/supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", @@ -6488,791 +6472,699 @@ "node": ">=8" } }, - "node_modules/babel-loader": { - "version": "9.1.2", - "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-9.1.2.tgz", - "integrity": "sha512-mN14niXW43tddohGl8HPu5yfQq70iUThvFL/4QzESA7GcZoC0eVOhvWdQ8+3UlSjaDE9MVtsW9mxDY07W7VpVA==", + "node_modules/@xtuc/ieee754": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz", + "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==", + "dev": true + }, + "node_modules/@xtuc/long": { + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz", + "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==", + "dev": true + }, + "node_modules/@yarnpkg/lockfile": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz", + "integrity": "sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==", + "dev": true + }, + "node_modules/@yarnpkg/parsers": { + "version": "3.0.0-rc.46", + "resolved": "https://registry.npmjs.org/@yarnpkg/parsers/-/parsers-3.0.0-rc.46.tgz", + "integrity": "sha512-aiATs7pSutzda/rq8fnuPwTglyVwjM22bNnK2ZgjrpAjQHSSl3lztd2f9evst1W/qnC58DRz7T7QndUDumAR4Q==", "dev": true, "dependencies": { - "find-cache-dir": "^3.3.2", - "schema-utils": "^4.0.0" + "js-yaml": "^3.10.0", + "tslib": "^2.4.0" }, "engines": { - "node": ">= 14.15.0" - }, - "peerDependencies": { - "@babel/core": "^7.12.0", - "webpack": ">=5" + "node": ">=14.15.0" } }, - "node_modules/babel-plugin-istanbul": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz", - "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==", + "node_modules/@zkochan/js-yaml": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/@zkochan/js-yaml/-/js-yaml-0.0.6.tgz", + "integrity": "sha512-nzvgl3VfhcELQ8LyVrYOru+UtAy1nrygk2+AGbTm8a5YcO6o8lSjAT+pfg3vJWxIoZKOUhrK6UU7xW/+00kQrg==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.0.0", - "@istanbuljs/load-nyc-config": "^1.0.0", - "@istanbuljs/schema": "^0.1.2", - "istanbul-lib-instrument": "^5.0.4", - "test-exclude": "^6.0.0" + "argparse": "^2.0.1" }, - "engines": { - "node": ">=8" + "bin": { + "js-yaml": "bin/js-yaml.js" } }, - "node_modules/babel-plugin-jest-hoist": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-28.1.3.tgz", - "integrity": "sha512-Ys3tUKAmfnkRUpPdpa98eYrAR0nV+sSFUZZEGuQ2EbFd1y4SOLtD5QDNHAq+bb9a+bbXvYQC4b+ID/THIMcU6Q==", + "node_modules/@zkochan/js-yaml/node_modules/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true + }, + "node_modules/abab": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz", + "integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==", + "dev": true + }, + "node_modules/abbrev": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", + "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", + "dev": true + }, + "node_modules/accepts": { + "version": "1.3.8", + "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz", + "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==", "dev": true, "dependencies": { - "@babel/template": "^7.3.3", - "@babel/types": "^7.3.3", - "@types/babel__core": "^7.1.14", - "@types/babel__traverse": "^7.0.6" + "mime-types": "~2.1.34", + "negotiator": "0.6.3" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": ">= 0.6" } }, - "node_modules/babel-plugin-polyfill-corejs2": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.3.tgz", - "integrity": "sha512-8hOdmFYFSZhqg2C/JgLUQ+t52o5nirNwaWM2B9LWteozwIvM14VSwdsCAUET10qT+kmySAlseadmfeeSWFCy+Q==", + "node_modules/acorn": { + "version": "8.11.2", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.2.tgz", + "integrity": "sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w==", "dev": true, - "dependencies": { - "@babel/compat-data": "^7.17.7", - "@babel/helper-define-polyfill-provider": "^0.3.3", - "semver": "^6.1.1" + "bin": { + "acorn": "bin/acorn" }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" + "engines": { + "node": ">=0.4.0" } }, - "node_modules/babel-plugin-polyfill-corejs2/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "node_modules/acorn-globals": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-6.0.0.tgz", + "integrity": "sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==", "dev": true, - "bin": { - "semver": "bin/semver.js" + "dependencies": { + "acorn": "^7.1.1", + "acorn-walk": "^7.1.1" } }, - "node_modules/babel-plugin-polyfill-corejs3": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.6.0.tgz", - "integrity": "sha512-+eHqR6OPcBhJOGgsIar7xoAB1GcSwVUA3XjAd7HJNzOXT4wv6/H7KIdA/Nc60cvUlDbKApmqNvD1B1bzOt4nyA==", + "node_modules/acorn-globals/node_modules/acorn": { + "version": "7.4.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", + "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==", "dev": true, - "dependencies": { - "@babel/helper-define-polyfill-provider": "^0.3.3", - "core-js-compat": "^3.25.1" + "bin": { + "acorn": "bin/acorn" }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" + "engines": { + "node": ">=0.4.0" } }, - "node_modules/babel-plugin-polyfill-regenerator": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.1.tgz", - "integrity": "sha512-NtQGmyQDXjQqQ+IzRkBVwEOz9lQ4zxAQZgoAYEtU9dJjnl1Oc98qnN7jcp+bE7O7aYzVpavXE3/VKXNzUbh7aw==", + "node_modules/acorn-import-assertions": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz", + "integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==", "dev": true, - "dependencies": { - "@babel/helper-define-polyfill-provider": "^0.3.3" - }, "peerDependencies": { - "@babel/core": "^7.0.0-0" + "acorn": "^8" } }, - "node_modules/babel-preset-current-node-syntax": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz", - "integrity": "sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==", + "node_modules/acorn-jsx": { + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", + "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", "dev": true, - "dependencies": { - "@babel/plugin-syntax-async-generators": "^7.8.4", - "@babel/plugin-syntax-bigint": "^7.8.3", - "@babel/plugin-syntax-class-properties": "^7.8.3", - "@babel/plugin-syntax-import-meta": "^7.8.3", - "@babel/plugin-syntax-json-strings": "^7.8.3", - "@babel/plugin-syntax-logical-assignment-operators": "^7.8.3", - "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3", - "@babel/plugin-syntax-numeric-separator": "^7.8.3", - "@babel/plugin-syntax-object-rest-spread": "^7.8.3", - "@babel/plugin-syntax-optional-catch-binding": "^7.8.3", - "@babel/plugin-syntax-optional-chaining": "^7.8.3", - "@babel/plugin-syntax-top-level-await": "^7.8.3" - }, "peerDependencies": { - "@babel/core": "^7.0.0" + "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" } }, - "node_modules/babel-preset-jest": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-28.1.3.tgz", - "integrity": "sha512-L+fupJvlWAHbQfn74coNX3zf60LXMJsezNvvx8eIh7iOR1luJ1poxYgQk1F8PYtNq/6QODDHCqsSnTFSWC491A==", + "node_modules/acorn-walk": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz", + "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==", "dev": true, - "dependencies": { - "babel-plugin-jest-hoist": "^28.1.3", - "babel-preset-current-node-syntax": "^1.0.0" - }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0" + "node": ">=0.4.0" } }, - "node_modules/balanced-match": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", - "dev": true - }, - "node_modules/base64-js": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", - "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ] - }, - "node_modules/batch": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz", - "integrity": "sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==", - "dev": true - }, - "node_modules/big.js": { - "version": "5.2.2", - "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz", - "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==", + "node_modules/adjust-sourcemap-loader": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/adjust-sourcemap-loader/-/adjust-sourcemap-loader-4.0.0.tgz", + "integrity": "sha512-OXwN5b9pCUXNQHJpwwD2qP40byEmSgzj8B4ydSN0uMNYWiFmJ6x6KwUllMmfk8Rwu/HJDFR7U8ubsWBoN0Xp0A==", "dev": true, + "dependencies": { + "loader-utils": "^2.0.0", + "regex-parser": "^2.2.11" + }, "engines": { - "node": "*" + "node": ">=8.9" } }, - "node_modules/binary-extensions": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", - "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==", + "node_modules/adjust-sourcemap-loader/node_modules/loader-utils": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz", + "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==", "dev": true, + "dependencies": { + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^2.1.2" + }, "engines": { - "node": ">=8" + "node": ">=8.9.0" } }, - "node_modules/bl": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", - "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==", + "node_modules/agent-base": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", + "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", "dev": true, "dependencies": { - "buffer": "^5.5.0", - "inherits": "^2.0.4", - "readable-stream": "^3.4.0" + "debug": "4" + }, + "engines": { + "node": ">= 6.0.0" } }, - "node_modules/body-parser": { - "version": "1.20.1", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz", - "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==", + "node_modules/agentkeepalive": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.5.0.tgz", + "integrity": "sha512-5GG/5IbQQpC9FpkRGsSvZI5QYeSCzlJHdpBQntCsuTOxhKD8lqKhrleg2Yi7yvMIf82Ycmmqln9U8V9qwEiJew==", "dev": true, "dependencies": { - "bytes": "3.1.2", - "content-type": "~1.0.4", - "debug": "2.6.9", - "depd": "2.0.0", - "destroy": "1.2.0", - "http-errors": "2.0.0", - "iconv-lite": "0.4.24", - "on-finished": "2.4.1", - "qs": "6.11.0", - "raw-body": "2.5.1", - "type-is": "~1.6.18", - "unpipe": "1.0.0" + "humanize-ms": "^1.2.1" }, "engines": { - "node": ">= 0.8", - "npm": "1.2.8000 || >= 1.4.16" + "node": ">= 8.0.0" } }, - "node_modules/body-parser/node_modules/bytes": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", - "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", + "node_modules/aggregate-error": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz", + "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==", "dev": true, + "dependencies": { + "clean-stack": "^2.0.0", + "indent-string": "^4.0.0" + }, "engines": { - "node": ">= 0.8" + "node": ">=8" } }, - "node_modules/body-parser/node_modules/debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "node_modules/ajv": { + "version": "8.12.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz", + "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==", "dev": true, "dependencies": { - "ms": "2.0.0" + "fast-deep-equal": "^3.1.1", + "json-schema-traverse": "^1.0.0", + "require-from-string": "^2.0.2", + "uri-js": "^4.2.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" } }, - "node_modules/body-parser/node_modules/depd": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", - "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", + "node_modules/ajv-formats": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz", + "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==", "dev": true, - "engines": { - "node": ">= 0.8" + "dependencies": { + "ajv": "^8.0.0" + }, + "peerDependencies": { + "ajv": "^8.0.0" + }, + "peerDependenciesMeta": { + "ajv": { + "optional": true + } } }, - "node_modules/body-parser/node_modules/ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "dev": true - }, - "node_modules/bonjour-service": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.1.0.tgz", - "integrity": "sha512-LVRinRB3k1/K0XzZ2p58COnWvkQknIY6sf0zF2rpErvcJXpMBttEPQSxK+HEXSS9VmpZlDoDnQWv8ftJT20B0Q==", + "node_modules/ajv-keywords": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz", + "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==", "dev": true, "dependencies": { - "array-flatten": "^2.1.2", - "dns-equal": "^1.0.0", - "fast-deep-equal": "^3.1.3", - "multicast-dns": "^7.2.5" + "fast-deep-equal": "^3.1.3" + }, + "peerDependencies": { + "ajv": "^8.8.2" } }, - "node_modules/boolbase": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", - "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==", - "dev": true - }, - "node_modules/brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", - "dev": true, + "node_modules/angular-mentions": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/angular-mentions/-/angular-mentions-1.5.0.tgz", + "integrity": "sha512-6l63v7AvrX9vFzj2h7jAPTnQ390IomCz3HiQP+b3PnDvaZiycd+tiVavi5RxAIX8WYjsamAR+tTPCkOkBkqZ+w==", "dependencies": { - "balanced-match": "^1.0.0" + "tslib": "^2.0.0" + }, + "peerDependencies": { + "@angular/common": ">=7.2.0", + "@angular/core": ">=7.2.0" } }, - "node_modules/braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "node_modules/ansi-colors": { + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz", + "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==", "dev": true, - "dependencies": { - "fill-range": "^7.0.1" - }, "engines": { - "node": ">=8" + "node": ">=6" } }, - "node_modules/browser-process-hrtime": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz", - "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==", - "dev": true - }, - "node_modules/browserslist": { - "version": "4.21.4", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz", - "integrity": "sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==", + "node_modules/ansi-escapes": { + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz", + "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==", "dev": true, - "funding": [ - { - "type": "opencollective", - "url": "https://opencollective.com/browserslist" - }, - { - "type": "tidelift", - "url": "https://tidelift.com/funding/github/npm/browserslist" - } - ], "dependencies": { - "caniuse-lite": "^1.0.30001400", - "electron-to-chromium": "^1.4.251", - "node-releases": "^2.0.6", - "update-browserslist-db": "^1.0.9" - }, - "bin": { - "browserslist": "cli.js" + "type-fest": "^0.21.3" }, "engines": { - "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7" - } - }, - "node_modules/bs-logger": { - "version": "0.2.6", - "resolved": "https://registry.npmjs.org/bs-logger/-/bs-logger-0.2.6.tgz", - "integrity": "sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==", - "dev": true, - "dependencies": { - "fast-json-stable-stringify": "2.x" + "node": ">=8" }, - "engines": { - "node": ">= 6" + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/bser": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz", - "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==", + "node_modules/ansi-html-community": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/ansi-html-community/-/ansi-html-community-0.0.8.tgz", + "integrity": "sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==", "dev": true, - "dependencies": { - "node-int64": "^0.4.0" + "engines": [ + "node >= 0.8.0" + ], + "bin": { + "ansi-html": "bin/ansi-html" } }, - "node_modules/buffer": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", - "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", + "node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "dependencies": { - "base64-js": "^1.3.1", - "ieee754": "^1.1.13" + "engines": { + "node": ">=8" } }, - "node_modules/buffer-from": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", - "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==" - }, - "node_modules/builtins": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/builtins/-/builtins-5.0.1.tgz", - "integrity": "sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==", + "node_modules/ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", "dev": true, "dependencies": { - "semver": "^7.0.0" + "color-convert": "^1.9.0" + }, + "engines": { + "node": ">=4" } }, - "node_modules/bytes": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz", - "integrity": "sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==", + "node_modules/anymatch": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", + "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", "dev": true, + "dependencies": { + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" + }, "engines": { - "node": ">= 0.8" + "node": ">= 8" } }, - "node_modules/cacache": { - "version": "17.0.4", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-17.0.4.tgz", - "integrity": "sha512-Z/nL3gU+zTUjz5pCA5vVjYM8pmaw2kxM7JEiE0fv3w77Wj+sFbi70CrBruUWH0uNcEdvLDixFpgA2JM4F4DBjA==", + "node_modules/aproba": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz", + "integrity": "sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==", + "dev": true + }, + "node_modules/are-we-there-yet": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz", + "integrity": "sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg==", "dev": true, "dependencies": { - "@npmcli/fs": "^3.1.0", - "fs-minipass": "^3.0.0", - "glob": "^8.0.1", - "lru-cache": "^7.7.1", - "minipass": "^4.0.0", - "minipass-collect": "^1.0.2", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.4", - "p-map": "^4.0.0", - "promise-inflight": "^1.0.1", - "ssri": "^10.0.0", - "tar": "^6.1.11", - "unique-filename": "^3.0.0" + "delegates": "^1.0.0", + "readable-stream": "^3.6.0" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" } }, - "node_modules/call-bind": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", - "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", + "node_modules/argparse": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", + "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", "dev": true, "dependencies": { - "function-bind": "^1.1.1", - "get-intrinsic": "^1.0.2" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" + "sprintf-js": "~1.0.2" } }, - "node_modules/callsites": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", - "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", + "node_modules/aria-query": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.0.tgz", + "integrity": "sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==", "dev": true, - "engines": { - "node": ">=6" + "dependencies": { + "dequal": "^2.0.3" } }, - "node_modules/camelcase": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", - "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", + "node_modules/array-flatten": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz", + "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==", + "dev": true + }, + "node_modules/array-union": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", + "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", "dev": true, "engines": { - "node": ">=6" + "node": ">=8" } }, - "node_modules/caniuse-lite": { - "version": "1.0.30001442", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001442.tgz", - "integrity": "sha512-239m03Pqy0hwxYPYR5JwOIxRJfLTWtle9FV8zosfV5pHg+/51uD4nxcUlM8+mWWGfwKtt8lJNHnD3cWw9VZ6ow==", + "node_modules/async": { + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/async/-/async-3.2.4.tgz", + "integrity": "sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==", + "dev": true + }, + "node_modules/asynckit": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==", + "dev": true + }, + "node_modules/autoprefixer": { + "version": "10.4.14", + "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.14.tgz", + "integrity": "sha512-FQzyfOsTlwVzjHxKEqRIAdJx9niO6VCBCoEwax/VLSoQF29ggECcPuBqUMZ+u8jCZOPSy8b8/8KnuFbp0SaFZQ==", "dev": true, "funding": [ { "type": "opencollective", - "url": "https://opencollective.com/browserslist" + "url": "https://opencollective.com/postcss/" }, { "type": "tidelift", - "url": "https://tidelift.com/funding/github/npm/caniuse-lite" + "url": "https://tidelift.com/funding/github/npm/autoprefixer" } - ] - }, - "node_modules/chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, + ], "dependencies": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" + "browserslist": "^4.21.5", + "caniuse-lite": "^1.0.30001464", + "fraction.js": "^4.2.0", + "normalize-range": "^0.1.2", + "picocolors": "^1.0.0", + "postcss-value-parser": "^4.2.0" + }, + "bin": { + "autoprefixer": "bin/autoprefixer" }, "engines": { - "node": ">=4" + "node": "^10 || ^12 || >=14" + }, + "peerDependencies": { + "postcss": "^8.1.0" } }, - "node_modules/char-regex": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz", - "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==", + "node_modules/axios": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.0.tgz", + "integrity": "sha512-EZ1DYihju9pwVB+jg67ogm+Tmqc6JmhamRN6I4Zt8DfZu5lbcQGw3ozH9lFejSJgs/ibaef3A9PMXPLeefFGJg==", "dev": true, - "engines": { - "node": ">=10" + "dependencies": { + "follow-redirects": "^1.15.0", + "form-data": "^4.0.0", + "proxy-from-env": "^1.1.0" } }, - "node_modules/chardet": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz", - "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==", - "dev": true - }, - "node_modules/chokidar": { - "version": "3.5.3", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz", - "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==", + "node_modules/axios/node_modules/form-data": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", + "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://paulmillr.com/funding/" - } - ], "dependencies": { - "anymatch": "~3.1.2", - "braces": "~3.0.2", - "glob-parent": "~5.1.2", - "is-binary-path": "~2.1.0", - "is-glob": "~4.0.1", - "normalize-path": "~3.0.0", - "readdirp": "~3.6.0" + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" }, "engines": { - "node": ">= 8.10.0" - }, - "optionalDependencies": { - "fsevents": "~2.3.2" + "node": ">= 6" } }, - "node_modules/chownr": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", - "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==", + "node_modules/axobject-query": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-3.2.1.tgz", + "integrity": "sha512-jsyHu61e6N4Vbz/v18DHwWYKK0bSWLqn47eeDSKPB7m8tqMHF9YJ+mhIk2lVteyZrY8tnSj/jHOv4YiTCuCJgg==", "dev": true, - "engines": { - "node": ">=10" + "dependencies": { + "dequal": "^2.0.3" } }, - "node_modules/chrome-trace-event": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz", - "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==", + "node_modules/babel-jest": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.7.0.tgz", + "integrity": "sha512-BrvGY3xZSwEcCzKvKsCi2GgHqDqsYkOP4/by5xCgIwGXQxIEh+8ew3gmrE1y7XRR6LHZIj6yLYnUi/mm2KXKBg==", "dev": true, + "dependencies": { + "@jest/transform": "^29.7.0", + "@types/babel__core": "^7.1.14", + "babel-plugin-istanbul": "^6.1.1", + "babel-preset-jest": "^29.6.3", + "chalk": "^4.0.0", + "graceful-fs": "^4.2.9", + "slash": "^3.0.0" + }, "engines": { - "node": ">=6.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + }, + "peerDependencies": { + "@babel/core": "^7.8.0" } }, - "node_modules/ci-info": { - "version": "3.7.0", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.7.0.tgz", - "integrity": "sha512-2CpRNYmImPx+RXKLq6jko/L07phmS9I02TyqkcNU20GCF/GgaWvc58hPtjxDX8lPpkdwc9sNh72V9k00S7ezog==", + "node_modules/babel-jest/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "dev": true, + "dependencies": { + "color-convert": "^2.0.1" + }, "engines": { "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, - "node_modules/cjs-module-lexer": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz", - "integrity": "sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA==", - "dev": true - }, - "node_modules/clean-stack": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", - "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==", + "node_modules/babel-jest/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", "dev": true, + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, "engines": { - "node": ">=6" + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" } }, - "node_modules/cli-cursor": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz", - "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==", + "node_modules/babel-jest/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", "dev": true, "dependencies": { - "restore-cursor": "^3.1.0" + "color-name": "~1.1.4" }, "engines": { - "node": ">=8" + "node": ">=7.0.0" } }, - "node_modules/cli-spinners": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.6.1.tgz", - "integrity": "sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g==", - "dev": true, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } + "node_modules/babel-jest/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true }, - "node_modules/cli-width": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz", - "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==", + "node_modules/babel-jest/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true, "engines": { - "node": ">= 10" + "node": ">=8" } }, - "node_modules/cliui": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", - "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", + "node_modules/babel-jest/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", "dev": true, "dependencies": { - "string-width": "^4.2.0", - "strip-ansi": "^6.0.1", - "wrap-ansi": "^7.0.0" + "has-flag": "^4.0.0" }, "engines": { - "node": ">=12" + "node": ">=8" } }, - "node_modules/clone": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz", - "integrity": "sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==", + "node_modules/babel-loader": { + "version": "9.1.3", + "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-9.1.3.tgz", + "integrity": "sha512-xG3ST4DglodGf8qSwv0MdeWLhrDsw/32QMdTO5T1ZIp9gQur0HkCyFs7Awskr10JKXFXwpAhiCuYX5oGXnRGbw==", "dev": true, + "dependencies": { + "find-cache-dir": "^4.0.0", + "schema-utils": "^4.0.0" + }, "engines": { - "node": ">=0.8" + "node": ">= 14.15.0" + }, + "peerDependencies": { + "@babel/core": "^7.12.0", + "webpack": ">=5" } }, - "node_modules/clone-deep": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz", - "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==", + "node_modules/babel-plugin-istanbul": { + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz", + "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==", "dev": true, "dependencies": { - "is-plain-object": "^2.0.4", - "kind-of": "^6.0.2", - "shallow-clone": "^3.0.0" + "@babel/helper-plugin-utils": "^7.0.0", + "@istanbuljs/load-nyc-config": "^1.0.0", + "@istanbuljs/schema": "^0.1.2", + "istanbul-lib-instrument": "^5.0.4", + "test-exclude": "^6.0.0" }, "engines": { - "node": ">=6" + "node": ">=8" } }, - "node_modules/co": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", - "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==", + "node_modules/babel-plugin-jest-hoist": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.6.3.tgz", + "integrity": "sha512-ESAc/RJvGTFEzRwOTT4+lNDk/GNHMkKbNzsvT0qKRfDyyYTskxB5rnU2njIDYVxXCBHHEI1c0YwHob3WaYujOg==", "dev": true, + "dependencies": { + "@babel/template": "^7.3.3", + "@babel/types": "^7.3.3", + "@types/babel__core": "^7.1.14", + "@types/babel__traverse": "^7.0.6" + }, "engines": { - "iojs": ">= 1.0.0", - "node": ">= 0.12.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/collect-v8-coverage": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz", - "integrity": "sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==", - "dev": true - }, - "node_modules/color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "node_modules/babel-plugin-polyfill-corejs2": { + "version": "0.4.6", + "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.6.tgz", + "integrity": "sha512-jhHiWVZIlnPbEUKSSNb9YoWcQGdlTLq7z1GHL4AjFxaoOUMuuEVJ+Y4pAaQUGOGk93YsVCKPbqbfw3m0SM6H8Q==", "dev": true, "dependencies": { - "color-name": "1.1.3" + "@babel/compat-data": "^7.22.6", + "@babel/helper-define-polyfill-provider": "^0.4.3", + "semver": "^6.3.1" + }, + "peerDependencies": { + "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0" } }, - "node_modules/color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", - "dev": true - }, - "node_modules/color-support": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz", - "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==", + "node_modules/babel-plugin-polyfill-corejs2/node_modules/semver": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, "bin": { - "color-support": "bin.js" + "semver": "bin/semver.js" } }, - "node_modules/colorette": { - "version": "2.0.19", - "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.19.tgz", - "integrity": "sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ==", - "dev": true - }, - "node_modules/combined-stream": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", - "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "node_modules/babel-plugin-polyfill-corejs3": { + "version": "0.8.6", + "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.6.tgz", + "integrity": "sha512-leDIc4l4tUgU7str5BWLS2h8q2N4Nf6lGZP6UrNDxdtfF2g69eJ5L0H7S8A5Ln/arfFAfHor5InAdZuIOwZdgQ==", "dev": true, "dependencies": { - "delayed-stream": "~1.0.0" + "@babel/helper-define-polyfill-provider": "^0.4.3", + "core-js-compat": "^3.33.1" }, - "engines": { - "node": ">= 0.8" + "peerDependencies": { + "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0" } }, - "node_modules/commander": { - "version": "2.20.3", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", - "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", - "dev": true - }, - "node_modules/commondir": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz", - "integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==", - "dev": true - }, - "node_modules/compressible": { - "version": "2.0.18", - "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz", - "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==", + "node_modules/babel-plugin-polyfill-regenerator": { + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.3.tgz", + "integrity": "sha512-8sHeDOmXC8csczMrYEOf0UTNa4yE2SxV5JGeT/LP1n0OYVDUUFPxG9vdk2AlDlIit4t+Kf0xCtpgXPBwnn/9pw==", "dev": true, "dependencies": { - "mime-db": ">= 1.43.0 < 2" + "@babel/helper-define-polyfill-provider": "^0.4.3" }, - "engines": { - "node": ">= 0.6" + "peerDependencies": { + "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0" } }, - "node_modules/compression": { - "version": "1.7.4", - "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz", - "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==", + "node_modules/babel-preset-current-node-syntax": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz", + "integrity": "sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==", "dev": true, "dependencies": { - "accepts": "~1.3.5", - "bytes": "3.0.0", - "compressible": "~2.0.16", - "debug": "2.6.9", - "on-headers": "~1.0.2", - "safe-buffer": "5.1.2", - "vary": "~1.1.2" + "@babel/plugin-syntax-async-generators": "^7.8.4", + "@babel/plugin-syntax-bigint": "^7.8.3", + "@babel/plugin-syntax-class-properties": "^7.8.3", + "@babel/plugin-syntax-import-meta": "^7.8.3", + "@babel/plugin-syntax-json-strings": "^7.8.3", + "@babel/plugin-syntax-logical-assignment-operators": "^7.8.3", + "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3", + "@babel/plugin-syntax-numeric-separator": "^7.8.3", + "@babel/plugin-syntax-object-rest-spread": "^7.8.3", + "@babel/plugin-syntax-optional-catch-binding": "^7.8.3", + "@babel/plugin-syntax-optional-chaining": "^7.8.3", + "@babel/plugin-syntax-top-level-await": "^7.8.3" }, - "engines": { - "node": ">= 0.8.0" + "peerDependencies": { + "@babel/core": "^7.0.0" } }, - "node_modules/compression/node_modules/debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "node_modules/babel-preset-jest": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-29.6.3.tgz", + "integrity": "sha512-0B3bhxR6snWXJZtR/RliHTDPRgn1sNHOR0yVtq/IiQFyuOVjFS+wuio/R4gSNkyYmKmJB4wGZv2NZanmKmTnNA==", "dev": true, "dependencies": { - "ms": "2.0.0" + "babel-plugin-jest-hoist": "^29.6.3", + "babel-preset-current-node-syntax": "^1.0.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0" } }, - "node_modules/compression/node_modules/ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "dev": true - }, - "node_modules/concat-map": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", - "dev": true - }, - "node_modules/connect-history-api-fallback": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz", - "integrity": "sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA==", - "dev": true, - "engines": { - "node": ">=0.8" - } - }, - "node_modules/console-control-strings": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", - "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==", + "node_modules/balanced-match": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", "dev": true }, - "node_modules/content-disposition": { - "version": "0.5.4", - "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz", - "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==", - "dev": true, - "dependencies": { - "safe-buffer": "5.2.1" - }, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/content-disposition/node_modules/safe-buffer": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", + "node_modules/base64-js": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", + "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", "dev": true, "funding": [ { @@ -7289,1095 +7181,978 @@ } ] }, - "node_modules/content-type": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz", - "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==", - "dev": true, - "engines": { - "node": ">= 0.6" - } + "node_modules/batch": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz", + "integrity": "sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==", + "dev": true }, - "node_modules/convert-source-map": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz", - "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==", + "node_modules/big.js": { + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz", + "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==", "dev": true, - "dependencies": { - "safe-buffer": "~5.1.1" + "engines": { + "node": "*" } }, - "node_modules/cookie": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz", - "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==", + "node_modules/binary-extensions": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", + "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==", "dev": true, "engines": { - "node": ">= 0.6" + "node": ">=8" } }, - "node_modules/cookie-signature": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", - "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==", - "dev": true - }, - "node_modules/copy-anything": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/copy-anything/-/copy-anything-2.0.6.tgz", - "integrity": "sha512-1j20GZTsvKNkc4BY3NpMOM8tt///wY3FpIzozTOFO2ffuZcV61nojHXVKIy3WM+7ADCy5FVhdZYHYDdgTU0yJw==", + "node_modules/bl": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", + "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==", "dev": true, "dependencies": { - "is-what": "^3.14.1" - }, - "funding": { - "url": "https://github.com/sponsors/mesqueeb" + "buffer": "^5.5.0", + "inherits": "^2.0.4", + "readable-stream": "^3.4.0" } }, - "node_modules/copy-webpack-plugin": { - "version": "11.0.0", - "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-11.0.0.tgz", - "integrity": "sha512-fX2MWpamkW0hZxMEg0+mYnA40LTosOSa5TqZ9GYIBzyJa9C3QUaMPSE2xAi/buNr8u89SfD9wHSQVBzrRa/SOQ==", + "node_modules/body-parser": { + "version": "1.20.1", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz", + "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==", "dev": true, "dependencies": { - "fast-glob": "^3.2.11", - "glob-parent": "^6.0.1", - "globby": "^13.1.1", - "normalize-path": "^3.0.0", - "schema-utils": "^4.0.0", - "serialize-javascript": "^6.0.0" + "bytes": "3.1.2", + "content-type": "~1.0.4", + "debug": "2.6.9", + "depd": "2.0.0", + "destroy": "1.2.0", + "http-errors": "2.0.0", + "iconv-lite": "0.4.24", + "on-finished": "2.4.1", + "qs": "6.11.0", + "raw-body": "2.5.1", + "type-is": "~1.6.18", + "unpipe": "1.0.0" }, "engines": { - "node": ">= 14.15.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/webpack" - }, - "peerDependencies": { - "webpack": "^5.1.0" + "node": ">= 0.8", + "npm": "1.2.8000 || >= 1.4.16" } }, - "node_modules/copy-webpack-plugin/node_modules/glob-parent": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", - "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", + "node_modules/body-parser/node_modules/bytes": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", + "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", "dev": true, - "dependencies": { - "is-glob": "^4.0.3" - }, "engines": { - "node": ">=10.13.0" + "node": ">= 0.8" } }, - "node_modules/core-js-compat": { - "version": "3.27.2", - "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.27.2.tgz", - "integrity": "sha512-welaYuF7ZtbYKGrIy7y3eb40d37rG1FvzEOfe7hSLd2iD6duMDqUhRfSvCGyC46HhR6Y8JXXdZ2lnRUMkPBpvg==", + "node_modules/body-parser/node_modules/debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "dev": true, "dependencies": { - "browserslist": "^4.21.4" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/core-js" + "ms": "2.0.0" } }, - "node_modules/core-util-is": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz", - "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==", + "node_modules/body-parser/node_modules/ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", "dev": true }, - "node_modules/cosmiconfig": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.1.0.tgz", - "integrity": "sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==", + "node_modules/bonjour-service": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.1.1.tgz", + "integrity": "sha512-Z/5lQRMOG9k7W+FkeGTNjh7htqn/2LMnfOvBZ8pynNZCM9MwkQkI3zeI4oz09uWdcgmgHugVvBqxGg4VQJ5PCg==", "dev": true, "dependencies": { - "@types/parse-json": "^4.0.0", - "import-fresh": "^3.2.1", - "parse-json": "^5.0.0", - "path-type": "^4.0.0", - "yaml": "^1.10.0" - }, - "engines": { - "node": ">=10" + "array-flatten": "^2.1.2", + "dns-equal": "^1.0.0", + "fast-deep-equal": "^3.1.3", + "multicast-dns": "^7.2.5" } }, - "node_modules/critters": { - "version": "0.0.16", - "resolved": "https://registry.npmjs.org/critters/-/critters-0.0.16.tgz", - "integrity": "sha512-JwjgmO6i3y6RWtLYmXwO5jMd+maZt8Tnfu7VVISmEWyQqfLpB8soBswf8/2bu6SBXxtKA68Al3c+qIG1ApT68A==", + "node_modules/boolbase": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", + "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==", + "dev": true + }, + "node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "dev": true, "dependencies": { - "chalk": "^4.1.0", - "css-select": "^4.2.0", - "parse5": "^6.0.1", - "parse5-htmlparser2-tree-adapter": "^6.0.1", - "postcss": "^8.3.7", - "pretty-bytes": "^5.3.0" + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" } }, - "node_modules/critters/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "node_modules/braces": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", + "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", "dev": true, "dependencies": { - "color-convert": "^2.0.1" + "fill-range": "^7.0.1" }, "engines": { "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, - "node_modules/critters/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "node_modules/browser-process-hrtime": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz", + "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==", + "dev": true + }, + "node_modules/browserslist": { + "version": "4.22.1", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.22.1.tgz", + "integrity": "sha512-FEVc202+2iuClEhZhrWy6ZiAcRLvNMyYcxZ8raemul1DYVOVdFsbqckWLdsixQZCpJlwe77Z3UTalE7jsjnKfQ==", "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/browserslist" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" + "caniuse-lite": "^1.0.30001541", + "electron-to-chromium": "^1.4.535", + "node-releases": "^2.0.13", + "update-browserslist-db": "^1.0.13" }, - "engines": { - "node": ">=10" + "bin": { + "browserslist": "cli.js" }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" + "engines": { + "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7" } }, - "node_modules/critters/node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "node_modules/bs-logger": { + "version": "0.2.6", + "resolved": "https://registry.npmjs.org/bs-logger/-/bs-logger-0.2.6.tgz", + "integrity": "sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==", "dev": true, "dependencies": { - "color-name": "~1.1.4" + "fast-json-stable-stringify": "2.x" }, "engines": { - "node": ">=7.0.0" + "node": ">= 6" } }, - "node_modules/critters/node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "node_modules/critters/node_modules/has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "node_modules/bser": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz", + "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==", "dev": true, - "engines": { - "node": ">=8" + "dependencies": { + "node-int64": "^0.4.0" } }, - "node_modules/critters/node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "node_modules/buffer": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", + "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=8" + "base64-js": "^1.3.1", + "ieee754": "^1.1.13" } }, - "node_modules/cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "node_modules/buffer-from": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", + "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==" + }, + "node_modules/builtins": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/builtins/-/builtins-5.0.1.tgz", + "integrity": "sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==", "dev": true, "dependencies": { - "path-key": "^3.1.0", - "shebang-command": "^2.0.0", - "which": "^2.0.1" - }, - "engines": { - "node": ">= 8" + "semver": "^7.0.0" } }, - "node_modules/cross-spawn/node_modules/which": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", - "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "node_modules/bytes": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz", + "integrity": "sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==", "dev": true, - "dependencies": { - "isexe": "^2.0.0" - }, - "bin": { - "node-which": "bin/node-which" - }, "engines": { - "node": ">= 8" + "node": ">= 0.8" } }, - "node_modules/css-loader": { - "version": "6.7.3", - "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.7.3.tgz", - "integrity": "sha512-qhOH1KlBMnZP8FzRO6YCH9UHXQhVMcEGLyNdb7Hv2cpcmJbW0YrddO+tG1ab5nT41KpHIYGsbeHqxB9xPu1pKQ==", + "node_modules/cacache": { + "version": "17.1.4", + "resolved": "https://registry.npmjs.org/cacache/-/cacache-17.1.4.tgz", + "integrity": "sha512-/aJwG2l3ZMJ1xNAnqbMpA40of9dj/pIH3QfiuQSqjfPJF747VR0J/bHn+/KdNnHKc6XQcWt/AfRSBft82W1d2A==", "dev": true, "dependencies": { - "icss-utils": "^5.1.0", - "postcss": "^8.4.19", - "postcss-modules-extract-imports": "^3.0.0", - "postcss-modules-local-by-default": "^4.0.0", - "postcss-modules-scope": "^3.0.0", - "postcss-modules-values": "^4.0.0", - "postcss-value-parser": "^4.2.0", - "semver": "^7.3.8" + "@npmcli/fs": "^3.1.0", + "fs-minipass": "^3.0.0", + "glob": "^10.2.2", + "lru-cache": "^7.7.1", + "minipass": "^7.0.3", + "minipass-collect": "^1.0.2", + "minipass-flush": "^1.0.5", + "minipass-pipeline": "^1.2.4", + "p-map": "^4.0.0", + "ssri": "^10.0.0", + "tar": "^6.1.11", + "unique-filename": "^3.0.0" }, "engines": { - "node": ">= 12.13.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/webpack" - }, - "peerDependencies": { - "webpack": "^5.0.0" + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "node_modules/css-select": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz", - "integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==", + "node_modules/cacache/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", "dev": true, "dependencies": { - "boolbase": "^1.0.0", - "css-what": "^6.0.1", - "domhandler": "^4.3.1", - "domutils": "^2.8.0", - "nth-check": "^2.0.1" - }, - "funding": { - "url": "https://github.com/sponsors/fb55" + "balanced-match": "^1.0.0" } }, - "node_modules/css-what": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz", - "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==", + "node_modules/cacache/node_modules/glob": { + "version": "10.3.10", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz", + "integrity": "sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==", "dev": true, - "engines": { - "node": ">= 6" + "dependencies": { + "foreground-child": "^3.1.0", + "jackspeak": "^2.3.5", + "minimatch": "^9.0.1", + "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0", + "path-scurry": "^1.10.1" }, - "funding": { - "url": "https://github.com/sponsors/fb55" - } - }, - "node_modules/cssesc": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz", - "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==", - "dev": true, "bin": { - "cssesc": "bin/cssesc" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/cssom": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.5.0.tgz", - "integrity": "sha512-iKuQcq+NdHqlAcwUY0o/HL69XQrUaQdMjmStJ8JFmUaiiQErlhrmuigkg/CU4E2J0IyUKUrMAgl36TvN67MqTw==", - "dev": true - }, - "node_modules/cssstyle": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz", - "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==", - "dev": true, - "dependencies": { - "cssom": "~0.3.6" + "glob": "dist/esm/bin.mjs" }, "engines": { - "node": ">=8" - } - }, - "node_modules/cssstyle/node_modules/cssom": { - "version": "0.3.8", - "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz", - "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==", - "dev": true - }, - "node_modules/data-urls": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-3.0.2.tgz", - "integrity": "sha512-Jy/tj3ldjZJo63sVAvg6LHt2mHvl4V6AgRAmNDtLdm7faqtsx+aJG42rsyCo9JCoRVKwPFzKlIPx3DIibwSIaQ==", - "dev": true, - "dependencies": { - "abab": "^2.0.6", - "whatwg-mimetype": "^3.0.0", - "whatwg-url": "^11.0.0" + "node": ">=16 || 14 >=14.17" }, - "engines": { - "node": ">=12" + "funding": { + "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/data-urls/node_modules/whatwg-url": { - "version": "11.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-11.0.0.tgz", - "integrity": "sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ==", + "node_modules/cacache/node_modules/lru-cache": { + "version": "7.18.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", + "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", "dev": true, - "dependencies": { - "tr46": "^3.0.0", - "webidl-conversions": "^7.0.0" - }, "engines": { "node": ">=12" } }, - "node_modules/debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "node_modules/cacache/node_modules/minimatch": { + "version": "9.0.3", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", + "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==", "dev": true, "dependencies": { - "ms": "2.1.2" + "brace-expansion": "^2.0.1" }, "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "node_modules/decimal.js": { - "version": "10.4.3", - "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.3.tgz", - "integrity": "sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==", - "dev": true - }, - "node_modules/dedent": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz", - "integrity": "sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==", - "dev": true - }, - "node_modules/deep-equal": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-2.2.0.tgz", - "integrity": "sha512-RdpzE0Hv4lhowpIUKKMJfeH6C1pXdtT1/it80ubgWqwI3qpuxUBpC1S4hnHg+zjnuOoDkzUtUCEEkG+XG5l3Mw==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "es-get-iterator": "^1.1.2", - "get-intrinsic": "^1.1.3", - "is-arguments": "^1.1.1", - "is-array-buffer": "^3.0.1", - "is-date-object": "^1.0.5", - "is-regex": "^1.1.4", - "is-shared-array-buffer": "^1.0.2", - "isarray": "^2.0.5", - "object-is": "^1.1.5", - "object-keys": "^1.1.1", - "object.assign": "^4.1.4", - "regexp.prototype.flags": "^1.4.3", - "side-channel": "^1.0.4", - "which-boxed-primitive": "^1.0.2", - "which-collection": "^1.0.1", - "which-typed-array": "^1.1.9" + "node": ">=16 || 14 >=14.17" }, "funding": { - "url": "https://github.com/sponsors/ljharb" + "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/deep-is": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", - "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", - "dev": true - }, - "node_modules/deepmerge": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz", - "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==", + "node_modules/cacache/node_modules/minipass": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz", + "integrity": "sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==", "dev": true, "engines": { - "node": ">=0.10.0" + "node": ">=16 || 14 >=14.17" } }, - "node_modules/default-gateway": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-6.0.3.tgz", - "integrity": "sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg==", + "node_modules/call-bind": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.5.tgz", + "integrity": "sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ==", "dev": true, "dependencies": { - "execa": "^5.0.0" + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.1", + "set-function-length": "^1.1.1" }, - "engines": { - "node": ">= 10" - } - }, - "node_modules/defaults": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz", - "integrity": "sha512-s82itHOnYrN0Ib8r+z7laQz3sdE+4FP3d9Q7VLO7U+KRT+CR0GsWuyHxzdAY82I7cXv0G/twrqomTJLOssO5HA==", - "dev": true, - "dependencies": { - "clone": "^1.0.2" + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/define-lazy-prop": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz", - "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==", + "node_modules/callsites": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", + "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", "dev": true, "engines": { - "node": ">=8" + "node": ">=6" } }, - "node_modules/define-properties": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz", - "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==", + "node_modules/camelcase": { + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", + "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", "dev": true, - "dependencies": { - "has-property-descriptors": "^1.0.0", - "object-keys": "^1.1.1" - }, "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" + "node": ">=6" } }, - "node_modules/delayed-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", - "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", + "node_modules/caniuse-lite": { + "version": "1.0.30001559", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001559.tgz", + "integrity": "sha512-cPiMKZgqgkg5LY3/ntGeLFUpi6tzddBNS58A4tnTgQw1zON7u2sZMU7SzOeVH4tj20++9ggL+V6FDOFMTaFFYA==", "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/caniuse-lite" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ] + }, + "node_modules/chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "dev": true, + "dependencies": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + }, "engines": { - "node": ">=0.4.0" + "node": ">=4" } }, - "node_modules/delegates": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", - "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==", + "node_modules/char-regex": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz", + "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==", + "dev": true, + "engines": { + "node": ">=10" + } + }, + "node_modules/chardet": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz", + "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==", "dev": true }, - "node_modules/depd": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", - "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==", + "node_modules/chokidar": { + "version": "3.5.3", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz", + "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==", "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://paulmillr.com/funding/" + } + ], + "dependencies": { + "anymatch": "~3.1.2", + "braces": "~3.0.2", + "glob-parent": "~5.1.2", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.6.0" + }, "engines": { - "node": ">= 0.6" + "node": ">= 8.10.0" + }, + "optionalDependencies": { + "fsevents": "~2.3.2" } }, - "node_modules/dependency-graph": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/dependency-graph/-/dependency-graph-0.11.0.tgz", - "integrity": "sha512-JeMq7fEshyepOWDfcfHK06N3MhyPhz++vtqWhMT5O9A3K42rdsEDpfdVqjaqaAhsw6a+ZqeDvQVtD0hFHQWrzg==", + "node_modules/chownr": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", + "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==", "dev": true, "engines": { - "node": ">= 0.6.0" + "node": ">=10" } }, - "node_modules/destroy": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz", - "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==", + "node_modules/chrome-trace-event": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz", + "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==", "dev": true, "engines": { - "node": ">= 0.8", - "npm": "1.2.8000 || >= 1.4.16" + "node": ">=6.0" } }, - "node_modules/detect-newline": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz", - "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==", + "node_modules/ci-info": { + "version": "3.9.0", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", + "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==", "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/sibiraj-s" + } + ], "engines": { "node": ">=8" } }, - "node_modules/detect-node": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz", - "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==", + "node_modules/cjs-module-lexer": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.3.tgz", + "integrity": "sha512-0TNiGstbQmCFwt4akjjBg5pLRTSyj/PkWQ1ZoO2zntmg9yLqSRxwEa4iCfQLGjqhiqBfOJa7W/E8wfGrTDmlZQ==", "dev": true }, - "node_modules/diff-sequences": { - "version": "28.1.1", - "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-28.1.1.tgz", - "integrity": "sha512-FU0iFaH/E23a+a718l8Qa/19bF9p06kgE0KipMOMadwa3SjnaElKzPaUC0vnibs6/B/9ni97s61mcejk8W1fQw==", + "node_modules/clean-stack": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", + "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==", "dev": true, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": ">=6" } }, - "node_modules/dir-glob": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", - "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", + "node_modules/cli-cursor": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz", + "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==", "dev": true, "dependencies": { - "path-type": "^4.0.0" + "restore-cursor": "^3.1.0" }, "engines": { "node": ">=8" } }, - "node_modules/dns-equal": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz", - "integrity": "sha512-z+paD6YUQsk+AbGCEM4PrOXSss5gd66QfcVBFTKR/HpFL9jCqikS94HYwKww6fQyO7IxrIIyUu+g0Ka9tUS2Cg==", - "dev": true - }, - "node_modules/dns-packet": { - "version": "5.4.0", - "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-5.4.0.tgz", - "integrity": "sha512-EgqGeaBB8hLiHLZtp/IbaDQTL8pZ0+IvwzSHA6d7VyMDM+B9hgddEMa9xjK5oYnw0ci0JQ6g2XCD7/f6cafU6g==", + "node_modules/cli-spinners": { + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.6.1.tgz", + "integrity": "sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g==", "dev": true, - "dependencies": { - "@leichtgewicht/ip-codec": "^2.0.1" - }, "engines": { "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/doctrine": { + "node_modules/cli-width": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", - "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", + "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz", + "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==", "dev": true, - "dependencies": { - "esutils": "^2.0.2" - }, "engines": { - "node": ">=6.0.0" + "node": ">= 10" } }, - "node_modules/dom-serializer": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz", - "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==", + "node_modules/cliui": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", + "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", "dev": true, "dependencies": { - "domelementtype": "^2.0.1", - "domhandler": "^4.2.0", - "entities": "^2.0.0" - }, - "funding": { - "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1" + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^7.0.0" } }, - "node_modules/domelementtype": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz", - "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==", + "node_modules/clone": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz", + "integrity": "sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==", "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/fb55" - } - ] + "engines": { + "node": ">=0.8" + } }, - "node_modules/domexception": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/domexception/-/domexception-4.0.0.tgz", - "integrity": "sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==", + "node_modules/clone-deep": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz", + "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==", "dev": true, "dependencies": { - "webidl-conversions": "^7.0.0" + "is-plain-object": "^2.0.4", + "kind-of": "^6.0.2", + "shallow-clone": "^3.0.0" }, "engines": { - "node": ">=12" + "node": ">=6" } }, - "node_modules/domhandler": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz", - "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==", + "node_modules/co": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", + "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==", "dev": true, - "dependencies": { - "domelementtype": "^2.2.0" - }, "engines": { - "node": ">= 4" - }, - "funding": { - "url": "https://github.com/fb55/domhandler?sponsor=1" + "iojs": ">= 1.0.0", + "node": ">= 0.12.0" } }, - "node_modules/domq.js": { - "version": "0.6.7", - "resolved": "https://registry.npmjs.org/domq.js/-/domq.js-0.6.7.tgz", - "integrity": "sha512-WwRGORo/eYGf7v7YXZ3M6x/PEoxCsP3D0my7pnAVwtbfsKRvW6qioSdlLsy1MFzfwN1TM9oO9QJcvkE8ERYmlg==" + "node_modules/collect-v8-coverage": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz", + "integrity": "sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q==", + "dev": true }, - "node_modules/domutils": { - "version": "2.8.0", - "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz", - "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==", + "node_modules/color-convert": { + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", + "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", "dev": true, "dependencies": { - "dom-serializer": "^1.0.1", - "domelementtype": "^2.2.0", - "domhandler": "^4.2.0" - }, - "funding": { - "url": "https://github.com/fb55/domutils?sponsor=1" + "color-name": "1.1.3" } }, - "node_modules/ee-first": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", - "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==", + "node_modules/color-name": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", "dev": true }, - "node_modules/electron-to-chromium": { - "version": "1.4.284", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz", - "integrity": "sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==", + "node_modules/color-support": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz", + "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==", + "dev": true, + "bin": { + "color-support": "bin.js" + } + }, + "node_modules/colorette": { + "version": "2.0.20", + "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz", + "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==", "dev": true }, - "node_modules/emittery": { - "version": "0.10.2", - "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.10.2.tgz", - "integrity": "sha512-aITqOwnLanpHLNXZJENbOgjUBeHocD+xsSJmNrjovKBW5HbSpW3d1pEls7GFQPUWXiwG9+0P4GtHfEqC/4M0Iw==", + "node_modules/combined-stream": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", "dev": true, - "engines": { - "node": ">=12" + "dependencies": { + "delayed-stream": "~1.0.0" }, - "funding": { - "url": "https://github.com/sindresorhus/emittery?sponsor=1" + "engines": { + "node": ">= 0.8" } }, - "node_modules/emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "node_modules/commander": { + "version": "2.20.3", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", + "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", "dev": true }, - "node_modules/emojis-list": { + "node_modules/common-path-prefix": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz", - "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==", + "resolved": "https://registry.npmjs.org/common-path-prefix/-/common-path-prefix-3.0.0.tgz", + "integrity": "sha512-QE33hToZseCH3jS0qN96O/bSh3kaw/h+Tq7ngyY9eWDUnTlTNUyqfqvCXioLe5Na5jFsL78ra/wuBU4iuEgd4w==", + "dev": true + }, + "node_modules/compressible": { + "version": "2.0.18", + "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz", + "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==", "dev": true, + "dependencies": { + "mime-db": ">= 1.43.0 < 2" + }, "engines": { - "node": ">= 4" + "node": ">= 0.6" } }, - "node_modules/encodeurl": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", - "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", + "node_modules/compression": { + "version": "1.7.4", + "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz", + "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==", "dev": true, + "dependencies": { + "accepts": "~1.3.5", + "bytes": "3.0.0", + "compressible": "~2.0.16", + "debug": "2.6.9", + "on-headers": "~1.0.2", + "safe-buffer": "5.1.2", + "vary": "~1.1.2" + }, "engines": { - "node": ">= 0.8" + "node": ">= 0.8.0" } }, - "node_modules/encoding": { - "version": "0.1.13", - "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz", - "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==", + "node_modules/compression/node_modules/debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "dev": true, - "optional": true, "dependencies": { - "iconv-lite": "^0.6.2" + "ms": "2.0.0" } }, - "node_modules/encoding/node_modules/iconv-lite": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", - "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", + "node_modules/compression/node_modules/ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", + "dev": true + }, + "node_modules/compression/node_modules/safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", + "dev": true + }, + "node_modules/concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", + "dev": true + }, + "node_modules/connect-history-api-fallback": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz", + "integrity": "sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA==", "dev": true, - "optional": true, - "dependencies": { - "safer-buffer": ">= 2.1.2 < 3.0.0" - }, "engines": { - "node": ">=0.10.0" + "node": ">=0.8" } }, - "node_modules/enhanced-resolve": { - "version": "5.12.0", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz", - "integrity": "sha512-QHTXI/sZQmko1cbDoNAa3mJ5qhWUUNAq3vR0/YiD379fWQrcfuoX1+HW2S0MTt7XmoPLapdaDKUtelUSPic7hQ==", + "node_modules/console-control-strings": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", + "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==", + "dev": true + }, + "node_modules/content-disposition": { + "version": "0.5.4", + "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz", + "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==", "dev": true, "dependencies": { - "graceful-fs": "^4.2.4", - "tapable": "^2.2.0" + "safe-buffer": "5.2.1" }, "engines": { - "node": ">=10.13.0" + "node": ">= 0.6" } }, - "node_modules/entities": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz", - "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==", + "node_modules/content-type": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz", + "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==", "dev": true, - "funding": { - "url": "https://github.com/fb55/entities?sponsor=1" + "engines": { + "node": ">= 0.6" } }, - "node_modules/env-paths": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz", - "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==", + "node_modules/convert-source-map": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz", + "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==", + "dev": true + }, + "node_modules/cookie": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz", + "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==", "dev": true, "engines": { - "node": ">=6" + "node": ">= 0.6" } }, - "node_modules/err-code": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz", - "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==", + "node_modules/cookie-signature": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", + "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==", "dev": true }, - "node_modules/errno": { - "version": "0.1.8", - "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz", - "integrity": "sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==", + "node_modules/copy-anything": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/copy-anything/-/copy-anything-2.0.6.tgz", + "integrity": "sha512-1j20GZTsvKNkc4BY3NpMOM8tt///wY3FpIzozTOFO2ffuZcV61nojHXVKIy3WM+7ADCy5FVhdZYHYDdgTU0yJw==", "dev": true, - "optional": true, "dependencies": { - "prr": "~1.0.1" + "is-what": "^3.14.1" }, - "bin": { - "errno": "cli.js" + "funding": { + "url": "https://github.com/sponsors/mesqueeb" } }, - "node_modules/error-ex": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", - "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", + "node_modules/copy-webpack-plugin": { + "version": "11.0.0", + "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-11.0.0.tgz", + "integrity": "sha512-fX2MWpamkW0hZxMEg0+mYnA40LTosOSa5TqZ9GYIBzyJa9C3QUaMPSE2xAi/buNr8u89SfD9wHSQVBzrRa/SOQ==", "dev": true, "dependencies": { - "is-arrayish": "^0.2.1" + "fast-glob": "^3.2.11", + "glob-parent": "^6.0.1", + "globby": "^13.1.1", + "normalize-path": "^3.0.0", + "schema-utils": "^4.0.0", + "serialize-javascript": "^6.0.0" + }, + "engines": { + "node": ">= 14.15.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, + "peerDependencies": { + "webpack": "^5.1.0" } }, - "node_modules/es-get-iterator": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.3.tgz", - "integrity": "sha512-sPZmqHBe6JIiTfN5q2pEi//TwxmAFHwj/XEuYjTuse78i8KxaqMTTzxPoFKuzRpDpTJ+0NAbpfenkmH2rePtuw==", + "node_modules/copy-webpack-plugin/node_modules/glob-parent": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", + "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", - "get-intrinsic": "^1.1.3", - "has-symbols": "^1.0.3", - "is-arguments": "^1.1.1", - "is-map": "^2.0.2", - "is-set": "^2.0.2", - "is-string": "^1.0.7", - "isarray": "^2.0.5", - "stop-iteration-iterator": "^1.0.0" + "is-glob": "^4.0.3" }, - "funding": { - "url": "https://github.com/sponsors/ljharb" + "engines": { + "node": ">=10.13.0" } }, - "node_modules/es-module-lexer": { - "version": "0.9.3", - "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz", - "integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==", - "dev": true - }, - "node_modules/esbuild": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.16.17.tgz", - "integrity": "sha512-G8LEkV0XzDMNwXKgM0Jwu3nY3lSTwSGY6XbxM9cr9+s0T/qSV1q1JVPBGzm3dcjhCic9+emZDmMffkwgPeOeLg==", + "node_modules/copy-webpack-plugin/node_modules/globby": { + "version": "13.2.2", + "resolved": "https://registry.npmjs.org/globby/-/globby-13.2.2.tgz", + "integrity": "sha512-Y1zNGV+pzQdh7H39l9zgB4PJqjRNqydvdYCDG4HFXM4XuvSaQQlEc91IU1yALL8gUTDomgBAfz3XJdmUS+oo0w==", "dev": true, - "hasInstallScript": true, - "optional": true, - "bin": { - "esbuild": "bin/esbuild" + "dependencies": { + "dir-glob": "^3.0.1", + "fast-glob": "^3.3.0", + "ignore": "^5.2.4", + "merge2": "^1.4.1", + "slash": "^4.0.0" }, "engines": { - "node": ">=12" + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" }, - "optionalDependencies": { - "@esbuild/android-arm": "0.16.17", - "@esbuild/android-arm64": "0.16.17", - "@esbuild/android-x64": "0.16.17", - "@esbuild/darwin-arm64": "0.16.17", - "@esbuild/darwin-x64": "0.16.17", - "@esbuild/freebsd-arm64": "0.16.17", - "@esbuild/freebsd-x64": "0.16.17", - "@esbuild/linux-arm": "0.16.17", - "@esbuild/linux-arm64": "0.16.17", - "@esbuild/linux-ia32": "0.16.17", - "@esbuild/linux-loong64": "0.16.17", - "@esbuild/linux-mips64el": "0.16.17", - "@esbuild/linux-ppc64": "0.16.17", - "@esbuild/linux-riscv64": "0.16.17", - "@esbuild/linux-s390x": "0.16.17", - "@esbuild/linux-x64": "0.16.17", - "@esbuild/netbsd-x64": "0.16.17", - "@esbuild/openbsd-x64": "0.16.17", - "@esbuild/sunos-x64": "0.16.17", - "@esbuild/win32-arm64": "0.16.17", - "@esbuild/win32-ia32": "0.16.17", - "@esbuild/win32-x64": "0.16.17" + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/esbuild-wasm": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/esbuild-wasm/-/esbuild-wasm-0.16.17.tgz", - "integrity": "sha512-Tn7NuMqRcM+T/qCOxbQRq0qrwWl1sUWp6ARfJRakE8Bepew6zata4qrKgH2YqovNC5e/2fcTa7o+VL/FAOZC1Q==", + "node_modules/copy-webpack-plugin/node_modules/slash": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz", + "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==", "dev": true, - "bin": { - "esbuild": "bin/esbuild" - }, "engines": { "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/escalade": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", - "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", + "node_modules/core-js-compat": { + "version": "3.33.2", + "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.33.2.tgz", + "integrity": "sha512-axfo+wxFVxnqf8RvxTzoAlzW4gRoacrHeoFlc9n0x50+7BEyZL/Rt3hicaED1/CEd7I6tPCPVUYcJwCMO5XUYw==", "dev": true, - "engines": { - "node": ">=6" + "dependencies": { + "browserslist": "^4.22.1" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/core-js" } }, - "node_modules/escape-html": { + "node_modules/core-util-is": { "version": "1.0.3", - "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", - "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz", + "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==", "dev": true }, - "node_modules/escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", + "node_modules/cosmiconfig": { + "version": "8.3.6", + "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.3.6.tgz", + "integrity": "sha512-kcZ6+W5QzcJ3P1Mt+83OUv/oHFqZHIx8DuxG6eZ5RGMERoLqp4BuGjhHLYGK+Kf5XVkQvqBSmAy/nGWN3qDgEA==", "dev": true, + "dependencies": { + "import-fresh": "^3.3.0", + "js-yaml": "^4.1.0", + "parse-json": "^5.2.0", + "path-type": "^4.0.0" + }, "engines": { - "node": ">=0.8.0" + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/d-fischer" + }, + "peerDependencies": { + "typescript": ">=4.9.5" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } } }, - "node_modules/escodegen": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz", - "integrity": "sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==", + "node_modules/cosmiconfig/node_modules/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true + }, + "node_modules/cosmiconfig/node_modules/js-yaml": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", "dev": true, "dependencies": { - "esprima": "^4.0.1", - "estraverse": "^5.2.0", - "esutils": "^2.0.2", - "optionator": "^0.8.1" + "argparse": "^2.0.1" }, "bin": { - "escodegen": "bin/escodegen.js", - "esgenerate": "bin/esgenerate.js" - }, - "engines": { - "node": ">=6.0" - }, - "optionalDependencies": { - "source-map": "~0.6.1" - } - }, - "node_modules/escodegen/node_modules/estraverse": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", - "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", - "dev": true, - "engines": { - "node": ">=4.0" + "js-yaml": "bin/js-yaml.js" } }, - "node_modules/escodegen/node_modules/levn": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", - "integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==", + "node_modules/create-jest": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/create-jest/-/create-jest-29.7.0.tgz", + "integrity": "sha512-Adz2bdH0Vq3F53KEMJOoftQFutWCukm6J24wbPWRO4k1kMY7gS7ds/uoJkNuV8wDCtWWnuwGcJwpWcih+zEW1Q==", "dev": true, "dependencies": { - "prelude-ls": "~1.1.2", - "type-check": "~0.3.2" + "@jest/types": "^29.6.3", + "chalk": "^4.0.0", + "exit": "^0.1.2", + "graceful-fs": "^4.2.9", + "jest-config": "^29.7.0", + "jest-util": "^29.7.0", + "prompts": "^2.0.1" }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/escodegen/node_modules/optionator": { - "version": "0.8.3", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz", - "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==", - "dev": true, - "dependencies": { - "deep-is": "~0.1.3", - "fast-levenshtein": "~2.0.6", - "levn": "~0.3.0", - "prelude-ls": "~1.1.2", - "type-check": "~0.3.2", - "word-wrap": "~1.2.3" + "bin": { + "create-jest": "bin/create-jest.js" }, "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/escodegen/node_modules/prelude-ls": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", - "integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==", - "dev": true, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/escodegen/node_modules/source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true, - "optional": true, - "engines": { - "node": ">=0.10.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/escodegen/node_modules/type-check": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", - "integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==", + "node_modules/create-jest/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "dev": true, "dependencies": { - "prelude-ls": "~1.1.2" + "color-convert": "^2.0.1" }, "engines": { - "node": ">= 0.8.0" + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, - "node_modules/eslint": { - "version": "8.23.1", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.23.1.tgz", - "integrity": "sha512-w7C1IXCc6fNqjpuYd0yPlcTKKmHlHHktRkzmBPZ+7cvNBQuiNjx0xaMTjAJGCafJhQkrFJooREv0CtrVzmHwqg==", + "node_modules/create-jest/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", "dev": true, "dependencies": { - "@eslint/eslintrc": "^1.3.2", - "@humanwhocodes/config-array": "^0.10.4", - "@humanwhocodes/gitignore-to-minimatch": "^1.0.2", - "@humanwhocodes/module-importer": "^1.0.1", - "ajv": "^6.10.0", - "chalk": "^4.0.0", - "cross-spawn": "^7.0.2", - "debug": "^4.3.2", - "doctrine": "^3.0.0", - "escape-string-regexp": "^4.0.0", - "eslint-scope": "^7.1.1", - "eslint-utils": "^3.0.0", - "eslint-visitor-keys": "^3.3.0", - "espree": "^9.4.0", - "esquery": "^1.4.0", - "esutils": "^2.0.2", - "fast-deep-equal": "^3.1.3", - "file-entry-cache": "^6.0.1", - "find-up": "^5.0.0", - "glob-parent": "^6.0.1", - "globals": "^13.15.0", - "globby": "^11.1.0", - "grapheme-splitter": "^1.0.4", - "ignore": "^5.2.0", - "import-fresh": "^3.0.0", - "imurmurhash": "^0.1.4", - "is-glob": "^4.0.0", - "js-sdsl": "^4.1.4", - "js-yaml": "^4.1.0", - "json-stable-stringify-without-jsonify": "^1.0.1", - "levn": "^0.4.1", - "lodash.merge": "^4.6.2", - "minimatch": "^3.1.2", - "natural-compare": "^1.4.0", - "optionator": "^0.9.1", - "regexpp": "^3.2.0", - "strip-ansi": "^6.0.1", - "strip-json-comments": "^3.1.0", - "text-table": "^0.2.0" - }, - "bin": { - "eslint": "bin/eslint.js" + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": ">=10" }, "funding": { - "url": "https://opencollective.com/eslint" + "url": "https://github.com/chalk/chalk?sponsor=1" } }, - "node_modules/eslint-scope": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", - "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", + "node_modules/create-jest/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", "dev": true, "dependencies": { - "esrecurse": "^4.3.0", - "estraverse": "^4.1.1" + "color-name": "~1.1.4" }, "engines": { - "node": ">=8.0.0" + "node": ">=7.0.0" } }, - "node_modules/eslint-utils": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz", - "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==", - "dev": true, - "dependencies": { - "eslint-visitor-keys": "^2.0.0" - }, - "engines": { - "node": "^10.0.0 || ^12.0.0 || >= 14.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/mysticatea" - }, - "peerDependencies": { - "eslint": ">=5" - } + "node_modules/create-jest/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true }, - "node_modules/eslint-utils/node_modules/eslint-visitor-keys": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz", - "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==", + "node_modules/create-jest/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true, "engines": { - "node": ">=10" + "node": ">=8" } }, - "node_modules/eslint-visitor-keys": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz", - "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==", + "node_modules/create-jest/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": ">=8" } }, - "node_modules/eslint/node_modules/ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "node_modules/critters": { + "version": "0.0.20", + "resolved": "https://registry.npmjs.org/critters/-/critters-0.0.20.tgz", + "integrity": "sha512-CImNRorKOl5d8TWcnAz5n5izQ6HFsvz29k327/ELy6UFcmbiZNOsinaKvzv16WZR0P6etfSWYzE47C4/56B3Uw==", "dev": true, "dependencies": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/epoberezkin" + "chalk": "^4.1.0", + "css-select": "^5.1.0", + "dom-serializer": "^2.0.0", + "domhandler": "^5.0.2", + "htmlparser2": "^8.0.2", + "postcss": "^8.4.23", + "pretty-bytes": "^5.3.0" } }, - "node_modules/eslint/node_modules/ansi-styles": { + "node_modules/critters/node_modules/ansi-styles": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", @@ -8392,23 +8167,7 @@ "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, - "node_modules/eslint/node_modules/argparse": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", - "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", - "dev": true - }, - "node_modules/eslint/node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/eslint/node_modules/chalk": { + "node_modules/critters/node_modules/chalk": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", @@ -8424,7 +8183,7 @@ "url": "https://github.com/chalk/chalk?sponsor=1" } }, - "node_modules/eslint/node_modules/color-convert": { + "node_modules/critters/node_modules/color-convert": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", @@ -8436,1839 +8195,1876 @@ "node": ">=7.0.0" } }, - "node_modules/eslint/node_modules/color-name": { + "node_modules/critters/node_modules/color-name": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, - "node_modules/eslint/node_modules/escape-string-regexp": { + "node_modules/critters/node_modules/has-flag": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", - "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true, "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "node": ">=8" } }, - "node_modules/eslint/node_modules/eslint-scope": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz", - "integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==", + "node_modules/critters/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", "dev": true, "dependencies": { - "esrecurse": "^4.3.0", - "estraverse": "^5.2.0" + "has-flag": "^4.0.0" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": ">=8" } }, - "node_modules/eslint/node_modules/estraverse": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", - "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", + "node_modules/cross-spawn": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", + "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", "dev": true, + "dependencies": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + }, "engines": { - "node": ">=4.0" + "node": ">= 8" } }, - "node_modules/eslint/node_modules/find-up": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", - "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", + "node_modules/css-loader": { + "version": "6.8.1", + "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.8.1.tgz", + "integrity": "sha512-xDAXtEVGlD0gJ07iclwWVkLoZOpEvAWaSyf6W18S2pOC//K8+qUDIx8IIT3D+HjnmkJPQeesOPv5aiUaJsCM2g==", "dev": true, "dependencies": { - "locate-path": "^6.0.0", - "path-exists": "^4.0.0" + "icss-utils": "^5.1.0", + "postcss": "^8.4.21", + "postcss-modules-extract-imports": "^3.0.0", + "postcss-modules-local-by-default": "^4.0.3", + "postcss-modules-scope": "^3.0.0", + "postcss-modules-values": "^4.0.0", + "postcss-value-parser": "^4.2.0", + "semver": "^7.3.8" }, "engines": { - "node": ">=10" + "node": ">= 12.13.0" }, "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, + "peerDependencies": { + "webpack": "^5.0.0" } }, - "node_modules/eslint/node_modules/glob-parent": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", - "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", + "node_modules/css-select": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/css-select/-/css-select-5.1.0.tgz", + "integrity": "sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg==", "dev": true, "dependencies": { - "is-glob": "^4.0.3" + "boolbase": "^1.0.0", + "css-what": "^6.1.0", + "domhandler": "^5.0.2", + "domutils": "^3.0.1", + "nth-check": "^2.0.1" }, - "engines": { - "node": ">=10.13.0" + "funding": { + "url": "https://github.com/sponsors/fb55" } }, - "node_modules/eslint/node_modules/globals": { - "version": "13.17.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz", - "integrity": "sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==", + "node_modules/css-what": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz", + "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==", "dev": true, - "dependencies": { - "type-fest": "^0.20.2" - }, "engines": { - "node": ">=8" + "node": ">= 6" }, "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "url": "https://github.com/sponsors/fb55" } }, - "node_modules/eslint/node_modules/globby": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", - "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==", + "node_modules/cssesc": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz", + "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==", "dev": true, - "dependencies": { - "array-union": "^2.1.0", - "dir-glob": "^3.0.1", - "fast-glob": "^3.2.9", - "ignore": "^5.2.0", - "merge2": "^1.4.1", - "slash": "^3.0.0" + "bin": { + "cssesc": "bin/cssesc" }, "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "node": ">=4" } }, - "node_modules/eslint/node_modules/has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, - "engines": { - "node": ">=8" - } + "node_modules/cssom": { + "version": "0.4.4", + "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz", + "integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==", + "dev": true }, - "node_modules/eslint/node_modules/js-yaml": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", - "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "node_modules/cssstyle": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz", + "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==", "dev": true, "dependencies": { - "argparse": "^2.0.1" + "cssom": "~0.3.6" }, - "bin": { - "js-yaml": "bin/js-yaml.js" + "engines": { + "node": ">=8" } }, - "node_modules/eslint/node_modules/json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "node_modules/cssstyle/node_modules/cssom": { + "version": "0.3.8", + "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz", + "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==", "dev": true }, - "node_modules/eslint/node_modules/locate-path": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", - "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", + "node_modules/data-urls": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-2.0.0.tgz", + "integrity": "sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==", "dev": true, "dependencies": { - "p-locate": "^5.0.0" + "abab": "^2.0.3", + "whatwg-mimetype": "^2.3.0", + "whatwg-url": "^8.0.0" }, "engines": { "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/eslint/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" } }, - "node_modules/eslint/node_modules/p-limit": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", - "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "node_modules/debug": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", "dev": true, "dependencies": { - "yocto-queue": "^0.1.0" + "ms": "2.1.2" }, "engines": { - "node": ">=10" + "node": ">=6.0" }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } } }, - "node_modules/eslint/node_modules/p-locate": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", - "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", + "node_modules/decimal.js": { + "version": "10.4.3", + "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.3.tgz", + "integrity": "sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==", + "dev": true + }, + "node_modules/dedent": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.5.1.tgz", + "integrity": "sha512-+LxW+KLWxu3HW3M2w2ympwtqPrqYRzU8fqi6Fhd18fBALe15blJPI/I4+UHveMVG6lJqB4JNd4UG0S5cnVHwIg==", "dev": true, - "dependencies": { - "p-limit": "^3.0.2" - }, - "engines": { - "node": ">=10" + "peerDependencies": { + "babel-plugin-macros": "^3.1.0" }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "peerDependenciesMeta": { + "babel-plugin-macros": { + "optional": true + } } }, - "node_modules/eslint/node_modules/slash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", + "node_modules/deep-is": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", + "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", + "dev": true + }, + "node_modules/deepmerge": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz", + "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==", "dev": true, "engines": { - "node": ">=8" + "node": ">=0.10.0" } }, - "node_modules/eslint/node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "node_modules/default-gateway": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-6.0.3.tgz", + "integrity": "sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg==", "dev": true, "dependencies": { - "has-flag": "^4.0.0" + "execa": "^5.0.0" }, "engines": { - "node": ">=8" + "node": ">= 10" } }, - "node_modules/eslint/node_modules/type-fest": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", - "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", + "node_modules/defaults": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.4.tgz", + "integrity": "sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==", "dev": true, - "engines": { - "node": ">=10" + "dependencies": { + "clone": "^1.0.2" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/espree": { - "version": "9.4.0", - "resolved": "https://registry.npmjs.org/espree/-/espree-9.4.0.tgz", - "integrity": "sha512-DQmnRpLj7f6TgN/NYb0MTzJXL+vJF9h3pHy4JhCIs3zwcgez8xmGg3sXHcEO97BrmO2OSvCwMdfdlyl+E9KjOw==", + "node_modules/define-data-property": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.1.tgz", + "integrity": "sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==", "dev": true, "dependencies": { - "acorn": "^8.8.0", - "acorn-jsx": "^5.3.2", - "eslint-visitor-keys": "^3.3.0" + "get-intrinsic": "^1.2.1", + "gopd": "^1.0.1", + "has-property-descriptors": "^1.0.0" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" + "node": ">= 0.4" } }, - "node_modules/esprima": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", - "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", + "node_modules/define-lazy-prop": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz", + "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==", "dev": true, - "bin": { - "esparse": "bin/esparse.js", - "esvalidate": "bin/esvalidate.js" - }, "engines": { - "node": ">=4" + "node": ">=8" } }, - "node_modules/esquery": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz", - "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==", + "node_modules/delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", "dev": true, - "dependencies": { - "estraverse": "^5.1.0" - }, "engines": { - "node": ">=0.10" + "node": ">=0.4.0" } }, - "node_modules/esquery/node_modules/estraverse": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", - "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", + "node_modules/delegates": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", + "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==", + "dev": true + }, + "node_modules/depd": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", + "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", "dev": true, "engines": { - "node": ">=4.0" + "node": ">= 0.8" } }, - "node_modules/esrecurse": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", - "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", + "node_modules/dequal": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz", + "integrity": "sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==", "dev": true, - "dependencies": { - "estraverse": "^5.2.0" - }, "engines": { - "node": ">=4.0" + "node": ">=6" } }, - "node_modules/esrecurse/node_modules/estraverse": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", - "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", + "node_modules/destroy": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz", + "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==", "dev": true, "engines": { - "node": ">=4.0" + "node": ">= 0.8", + "npm": "1.2.8000 || >= 1.4.16" } }, - "node_modules/estraverse": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", - "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", + "node_modules/detect-newline": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz", + "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==", "dev": true, "engines": { - "node": ">=4.0" + "node": ">=8" } }, - "node_modules/esutils": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", - "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", + "node_modules/detect-node": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz", + "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==", + "dev": true + }, + "node_modules/diff-sequences": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz", + "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==", "dev": true, "engines": { - "node": ">=0.10.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/etag": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", - "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==", + "node_modules/dir-glob": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", + "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", "dev": true, + "dependencies": { + "path-type": "^4.0.0" + }, "engines": { - "node": ">= 0.6" + "node": ">=8" } }, - "node_modules/eventemitter-asyncresource": { + "node_modules/dns-equal": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/eventemitter-asyncresource/-/eventemitter-asyncresource-1.0.0.tgz", - "integrity": "sha512-39F7TBIV0G7gTelxwbEqnwhp90eqCPON1k0NwNfwhgKn4Co4ybUbj2pECcXT0B3ztRKZ7Pw1JujUUgmQJHcVAQ==", - "dev": true - }, - "node_modules/eventemitter3": { - "version": "4.0.7", - "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz", - "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==", + "resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz", + "integrity": "sha512-z+paD6YUQsk+AbGCEM4PrOXSss5gd66QfcVBFTKR/HpFL9jCqikS94HYwKww6fQyO7IxrIIyUu+g0Ka9tUS2Cg==", "dev": true }, - "node_modules/events": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz", - "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==", + "node_modules/dns-packet": { + "version": "5.6.1", + "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-5.6.1.tgz", + "integrity": "sha512-l4gcSouhcgIKRvyy99RNVOgxXiicE+2jZoNmaNmZ6JXiGajBOJAesk1OBlJuM5k2c+eudGdLxDqXuPCKIj6kpw==", "dev": true, + "dependencies": { + "@leichtgewicht/ip-codec": "^2.0.1" + }, "engines": { - "node": ">=0.8.x" + "node": ">=6" } }, - "node_modules/execa": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz", - "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==", + "node_modules/doctrine": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", + "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", "dev": true, "dependencies": { - "cross-spawn": "^7.0.3", - "get-stream": "^6.0.0", - "human-signals": "^2.1.0", - "is-stream": "^2.0.0", - "merge-stream": "^2.0.0", - "npm-run-path": "^4.0.1", - "onetime": "^5.1.2", - "signal-exit": "^3.0.3", - "strip-final-newline": "^2.0.0" + "esutils": "^2.0.2" }, "engines": { - "node": ">=10" + "node": ">=6.0.0" + } + }, + "node_modules/dom-serializer": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz", + "integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==", + "dev": true, + "dependencies": { + "domelementtype": "^2.3.0", + "domhandler": "^5.0.2", + "entities": "^4.2.0" }, "funding": { - "url": "https://github.com/sindresorhus/execa?sponsor=1" + "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1" } }, - "node_modules/exit": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz", - "integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==", + "node_modules/domelementtype": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz", + "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==", "dev": true, - "engines": { - "node": ">= 0.8.0" - } + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/fb55" + } + ] }, - "node_modules/expect": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/expect/-/expect-28.1.3.tgz", - "integrity": "sha512-eEh0xn8HlsuOBxFgIss+2mX85VAS4Qy3OSkjV7rlBWljtA4oWH37glVGyOZSZvErDT/yBywZdPGwCXuTvSG85g==", + "node_modules/domexception": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/domexception/-/domexception-2.0.1.tgz", + "integrity": "sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==", "dev": true, "dependencies": { - "@jest/expect-utils": "^28.1.3", - "jest-get-type": "^28.0.2", - "jest-matcher-utils": "^28.1.3", - "jest-message-util": "^28.1.3", - "jest-util": "^28.1.3" + "webidl-conversions": "^5.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": ">=8" } }, - "node_modules/express": { - "version": "4.18.2", - "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz", - "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==", + "node_modules/domexception/node_modules/webidl-conversions": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz", + "integrity": "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/domhandler": { + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz", + "integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==", "dev": true, "dependencies": { - "accepts": "~1.3.8", - "array-flatten": "1.1.1", - "body-parser": "1.20.1", - "content-disposition": "0.5.4", - "content-type": "~1.0.4", - "cookie": "0.5.0", - "cookie-signature": "1.0.6", - "debug": "2.6.9", - "depd": "2.0.0", - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "etag": "~1.8.1", - "finalhandler": "1.2.0", - "fresh": "0.5.2", - "http-errors": "2.0.0", - "merge-descriptors": "1.0.1", - "methods": "~1.1.2", - "on-finished": "2.4.1", - "parseurl": "~1.3.3", - "path-to-regexp": "0.1.7", - "proxy-addr": "~2.0.7", - "qs": "6.11.0", - "range-parser": "~1.2.1", - "safe-buffer": "5.2.1", - "send": "0.18.0", - "serve-static": "1.15.0", - "setprototypeof": "1.2.0", - "statuses": "2.0.1", - "type-is": "~1.6.18", - "utils-merge": "1.0.1", - "vary": "~1.1.2" + "domelementtype": "^2.3.0" }, "engines": { - "node": ">= 0.10.0" + "node": ">= 4" + }, + "funding": { + "url": "https://github.com/fb55/domhandler?sponsor=1" } }, - "node_modules/express/node_modules/array-flatten": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", - "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==", - "dev": true + "node_modules/domq.js": { + "version": "0.6.8", + "resolved": "https://registry.npmjs.org/domq.js/-/domq.js-0.6.8.tgz", + "integrity": "sha512-G9kHE7/dUr9VhtczUEPVQpQQvH9N599a9usD+Q+eHwVbAptVKGSodKdEnVBgW3PPeOAnL0rFaZlasGjFlbaBwA==" }, - "node_modules/express/node_modules/debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "node_modules/domutils": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.1.0.tgz", + "integrity": "sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==", "dev": true, "dependencies": { - "ms": "2.0.0" + "dom-serializer": "^2.0.0", + "domelementtype": "^2.3.0", + "domhandler": "^5.0.3" + }, + "funding": { + "url": "https://github.com/fb55/domutils?sponsor=1" } }, - "node_modules/express/node_modules/depd": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", - "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", + "node_modules/dotenv": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz", + "integrity": "sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==", "dev": true, "engines": { - "node": ">= 0.8" + "node": ">=10" } }, - "node_modules/express/node_modules/ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", + "node_modules/duplexer": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz", + "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==", "dev": true }, - "node_modules/express/node_modules/safe-buffer": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ] + "node_modules/eastasianwidth": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", + "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==", + "dev": true }, - "node_modules/external-editor": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz", - "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==", + "node_modules/ee-first": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", + "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==", + "dev": true + }, + "node_modules/ejs": { + "version": "3.1.9", + "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.9.tgz", + "integrity": "sha512-rC+QVNMJWv+MtPgkt0y+0rVEIdbtxVADApW9JXrUVlzHetgcyczP/E7DJmWJ4fJCZF2cPcBk0laWO9ZHMG3DmQ==", "dev": true, "dependencies": { - "chardet": "^0.7.0", - "iconv-lite": "^0.4.24", - "tmp": "^0.0.33" + "jake": "^10.8.5" + }, + "bin": { + "ejs": "bin/cli.js" }, "engines": { - "node": ">=4" + "node": ">=0.10.0" } }, - "node_modules/fast-deep-equal": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", - "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", + "node_modules/electron-to-chromium": { + "version": "1.4.572", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.572.tgz", + "integrity": "sha512-RlFobl4D3ieetbnR+2EpxdzFl9h0RAJkPK3pfiwMug2nhBin2ZCsGIAJWdpNniLz43sgXam/CgipOmvTA+rUiA==", "dev": true }, - "node_modules/fast-glob": { - "version": "3.2.11", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz", - "integrity": "sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==", + "node_modules/emittery": { + "version": "0.13.1", + "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.13.1.tgz", + "integrity": "sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==", "dev": true, - "dependencies": { - "@nodelib/fs.stat": "^2.0.2", - "@nodelib/fs.walk": "^1.2.3", - "glob-parent": "^5.1.2", - "merge2": "^1.3.0", - "micromatch": "^4.0.4" - }, "engines": { - "node": ">=8.6.0" + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sindresorhus/emittery?sponsor=1" } }, - "node_modules/fast-json-stable-stringify": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", - "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", + "node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", "dev": true }, - "node_modules/fast-levenshtein": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", - "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", - "dev": true + "node_modules/emojis-list": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz", + "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==", + "dev": true, + "engines": { + "node": ">= 4" + } }, - "node_modules/fastq": { - "version": "1.13.0", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz", - "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==", + "node_modules/encodeurl": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", + "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", + "dev": true, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/encoding": { + "version": "0.1.13", + "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz", + "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==", "dev": true, + "optional": true, "dependencies": { - "reusify": "^1.0.4" + "iconv-lite": "^0.6.2" } }, - "node_modules/faye-websocket": { - "version": "0.11.4", - "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz", - "integrity": "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==", + "node_modules/encoding/node_modules/iconv-lite": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", + "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", "dev": true, + "optional": true, "dependencies": { - "websocket-driver": ">=0.5.1" + "safer-buffer": ">= 2.1.2 < 3.0.0" }, "engines": { - "node": ">=0.8.0" + "node": ">=0.10.0" } }, - "node_modules/fb-watchman": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz", - "integrity": "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==", + "node_modules/end-of-stream": { + "version": "1.4.4", + "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", + "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", "dev": true, "dependencies": { - "bser": "2.1.1" + "once": "^1.4.0" } }, - "node_modules/figures": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz", - "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==", + "node_modules/enhanced-resolve": { + "version": "5.15.0", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz", + "integrity": "sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==", "dev": true, "dependencies": { - "escape-string-regexp": "^1.0.5" + "graceful-fs": "^4.2.4", + "tapable": "^2.2.0" }, "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "node": ">=10.13.0" } }, - "node_modules/file-entry-cache": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", - "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", + "node_modules/enquirer": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz", + "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==", "dev": true, "dependencies": { - "flat-cache": "^3.0.4" + "ansi-colors": "^4.1.1" }, "engines": { - "node": "^10.12.0 || >=12.0.0" + "node": ">=8.6" } }, - "node_modules/fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", - "dev": true, - "dependencies": { - "to-regex-range": "^5.0.1" + "node_modules/entities": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", + "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==", + "devOptional": true, + "engines": { + "node": ">=0.12" }, + "funding": { + "url": "https://github.com/fb55/entities?sponsor=1" + } + }, + "node_modules/env-paths": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz", + "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==", + "dev": true, "engines": { - "node": ">=8" + "node": ">=6" } }, - "node_modules/finalhandler": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz", - "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==", + "node_modules/err-code": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz", + "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==", + "dev": true + }, + "node_modules/errno": { + "version": "0.1.8", + "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz", + "integrity": "sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==", "dev": true, + "optional": true, "dependencies": { - "debug": "2.6.9", - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "on-finished": "2.4.1", - "parseurl": "~1.3.3", - "statuses": "2.0.1", - "unpipe": "~1.0.0" + "prr": "~1.0.1" }, - "engines": { - "node": ">= 0.8" + "bin": { + "errno": "cli.js" } }, - "node_modules/finalhandler/node_modules/debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "node_modules/error-ex": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", + "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", "dev": true, "dependencies": { - "ms": "2.0.0" + "is-arrayish": "^0.2.1" } }, - "node_modules/finalhandler/node_modules/ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", + "node_modules/es-module-lexer": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.3.1.tgz", + "integrity": "sha512-JUFAyicQV9mXc3YRxPnDlrfBKpqt6hUYzz9/boprUJHs4e4KVr3XwOF70doO6gwXUor6EWZJAyWAfKki84t20Q==", "dev": true }, - "node_modules/find-cache-dir": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz", - "integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==", + "node_modules/esbuild": { + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.18.17.tgz", + "integrity": "sha512-1GJtYnUxsJreHYA0Y+iQz2UEykonY66HNWOb0yXYZi9/kNrORUEHVg87eQsCtqh59PEJ5YVZJO98JHznMJSWjg==", "dev": true, - "dependencies": { - "commondir": "^1.0.1", - "make-dir": "^3.0.2", - "pkg-dir": "^4.1.0" + "hasInstallScript": true, + "bin": { + "esbuild": "bin/esbuild" }, "engines": { - "node": ">=8" + "node": ">=12" }, - "funding": { - "url": "https://github.com/avajs/find-cache-dir?sponsor=1" + "optionalDependencies": { + "@esbuild/android-arm": "0.18.17", + "@esbuild/android-arm64": "0.18.17", + "@esbuild/android-x64": "0.18.17", + "@esbuild/darwin-arm64": "0.18.17", + "@esbuild/darwin-x64": "0.18.17", + "@esbuild/freebsd-arm64": "0.18.17", + "@esbuild/freebsd-x64": "0.18.17", + "@esbuild/linux-arm": "0.18.17", + "@esbuild/linux-arm64": "0.18.17", + "@esbuild/linux-ia32": "0.18.17", + "@esbuild/linux-loong64": "0.18.17", + "@esbuild/linux-mips64el": "0.18.17", + "@esbuild/linux-ppc64": "0.18.17", + "@esbuild/linux-riscv64": "0.18.17", + "@esbuild/linux-s390x": "0.18.17", + "@esbuild/linux-x64": "0.18.17", + "@esbuild/netbsd-x64": "0.18.17", + "@esbuild/openbsd-x64": "0.18.17", + "@esbuild/sunos-x64": "0.18.17", + "@esbuild/win32-arm64": "0.18.17", + "@esbuild/win32-ia32": "0.18.17", + "@esbuild/win32-x64": "0.18.17" } }, - "node_modules/find-up": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", - "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "node_modules/esbuild-wasm": { + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/esbuild-wasm/-/esbuild-wasm-0.18.17.tgz", + "integrity": "sha512-9OHGcuRzy+I8ziF9FzjfKLWAPbvi0e/metACVg9k6bK+SI4FFxeV6PcZsz8RIVaMD4YNehw+qj6UMR3+qj/EuQ==", "dev": true, - "dependencies": { - "locate-path": "^5.0.0", - "path-exists": "^4.0.0" + "bin": { + "esbuild": "bin/esbuild" }, "engines": { - "node": ">=8" + "node": ">=12" } }, - "node_modules/flat-cache": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz", - "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==", + "node_modules/escalade": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", + "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", "dev": true, - "dependencies": { - "flatted": "^3.1.0", - "rimraf": "^3.0.2" - }, "engines": { - "node": "^10.12.0 || >=12.0.0" + "node": ">=6" } }, - "node_modules/flatted": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.6.tgz", - "integrity": "sha512-0sQoMh9s0BYsm+12Huy/rkKxVu4R1+r96YX5cG44rHV0pQ6iC3Q+mkoMFaGWObMFYQxCVT+ssG1ksneA2MI9KQ==", + "node_modules/escape-html": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", + "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==", "dev": true }, - "node_modules/follow-redirects": { - "version": "1.15.2", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz", - "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==", + "node_modules/escape-string-regexp": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://github.com/sponsors/RubenVerborgh" - } - ], "engines": { - "node": ">=4.0" - }, - "peerDependenciesMeta": { - "debug": { - "optional": true - } + "node": ">=0.8.0" } }, - "node_modules/for-each": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz", - "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==", + "node_modules/escodegen": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.1.0.tgz", + "integrity": "sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==", "dev": true, "dependencies": { - "is-callable": "^1.1.3" + "esprima": "^4.0.1", + "estraverse": "^5.2.0", + "esutils": "^2.0.2" + }, + "bin": { + "escodegen": "bin/escodegen.js", + "esgenerate": "bin/esgenerate.js" + }, + "engines": { + "node": ">=6.0" + }, + "optionalDependencies": { + "source-map": "~0.6.1" } }, - "node_modules/form-data": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", - "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", + "node_modules/escodegen/node_modules/source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true, + "optional": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/eslint": { + "version": "8.52.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.52.0.tgz", + "integrity": "sha512-zh/JHnaixqHZsolRB/w9/02akBk9EPrOs9JwcTP2ek7yL5bVvXuRariiaAjjoJ5DvuwQ1WAE/HsMz+w17YgBCg==", "dev": true, "dependencies": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.8", - "mime-types": "^2.1.12" + "@eslint-community/eslint-utils": "^4.2.0", + "@eslint-community/regexpp": "^4.6.1", + "@eslint/eslintrc": "^2.1.2", + "@eslint/js": "8.52.0", + "@humanwhocodes/config-array": "^0.11.13", + "@humanwhocodes/module-importer": "^1.0.1", + "@nodelib/fs.walk": "^1.2.8", + "@ungap/structured-clone": "^1.2.0", + "ajv": "^6.12.4", + "chalk": "^4.0.0", + "cross-spawn": "^7.0.2", + "debug": "^4.3.2", + "doctrine": "^3.0.0", + "escape-string-regexp": "^4.0.0", + "eslint-scope": "^7.2.2", + "eslint-visitor-keys": "^3.4.3", + "espree": "^9.6.1", + "esquery": "^1.4.2", + "esutils": "^2.0.2", + "fast-deep-equal": "^3.1.3", + "file-entry-cache": "^6.0.1", + "find-up": "^5.0.0", + "glob-parent": "^6.0.2", + "globals": "^13.19.0", + "graphemer": "^1.4.0", + "ignore": "^5.2.0", + "imurmurhash": "^0.1.4", + "is-glob": "^4.0.0", + "is-path-inside": "^3.0.3", + "js-yaml": "^4.1.0", + "json-stable-stringify-without-jsonify": "^1.0.1", + "levn": "^0.4.1", + "lodash.merge": "^4.6.2", + "minimatch": "^3.1.2", + "natural-compare": "^1.4.0", + "optionator": "^0.9.3", + "strip-ansi": "^6.0.1", + "text-table": "^0.2.0" + }, + "bin": { + "eslint": "bin/eslint.js" }, "engines": { - "node": ">= 6" + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" } }, - "node_modules/forwarded": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", - "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==", + "node_modules/eslint-scope": { + "version": "7.2.2", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz", + "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==", "dev": true, + "dependencies": { + "esrecurse": "^4.3.0", + "estraverse": "^5.2.0" + }, "engines": { - "node": ">= 0.6" + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" } }, - "node_modules/fraction.js": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.2.0.tgz", - "integrity": "sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA==", + "node_modules/eslint-visitor-keys": { + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", + "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", "dev": true, "engines": { - "node": "*" + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" }, "funding": { - "type": "patreon", - "url": "https://www.patreon.com/infusion" + "url": "https://opencollective.com/eslint" } }, - "node_modules/fresh": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", - "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==", + "node_modules/eslint/node_modules/ajv": { + "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", "dev": true, - "engines": { - "node": ">= 0.6" + "dependencies": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" } }, - "node_modules/fs-minipass": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.0.tgz", - "integrity": "sha512-EUojgQaSPy6sxcqcZgQv6TVF6jiKvurji3AxhAivs/Ep4O1UpS8TusaxpybfFHZ2skRhLqzk6WR8nqNYIMMDeA==", + "node_modules/eslint/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "dev": true, "dependencies": { - "minipass": "^4.0.0" + "color-convert": "^2.0.1" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, - "node_modules/fs-monkey": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.3.tgz", - "integrity": "sha512-cybjIfiiE+pTWicSCLFHSrXZ6EilF30oh91FDP9S2B051prEa7QWfrVTQm10/dDpswBDXZugPa1Ogu8Yh+HV0Q==", + "node_modules/eslint/node_modules/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", "dev": true }, - "node_modules/fs.realpath": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", - "dev": true - }, - "node_modules/fsevents": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", - "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", + "node_modules/eslint/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", "dev": true, - "hasInstallScript": true, - "optional": true, - "os": [ - "darwin" - ], + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, "engines": { - "node": "^8.16.0 || ^10.6.0 || >=11.0.0" - } - }, - "node_modules/function-bind": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", - "dev": true - }, - "node_modules/functional-red-black-tree": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz", - "integrity": "sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==", - "dev": true - }, - "node_modules/functions-have-names": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz", - "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==", - "dev": true, + "node": ">=10" + }, "funding": { - "url": "https://github.com/sponsors/ljharb" + "url": "https://github.com/chalk/chalk?sponsor=1" } }, - "node_modules/gauge": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/gauge/-/gauge-4.0.4.tgz", - "integrity": "sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==", + "node_modules/eslint/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", "dev": true, "dependencies": { - "aproba": "^1.0.3 || ^2.0.0", - "color-support": "^1.1.3", - "console-control-strings": "^1.1.0", - "has-unicode": "^2.0.1", - "signal-exit": "^3.0.7", - "string-width": "^4.2.3", - "strip-ansi": "^6.0.1", - "wide-align": "^1.1.5" + "color-name": "~1.1.4" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + "node": ">=7.0.0" } }, - "node_modules/gensync": { - "version": "1.0.0-beta.2", - "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", - "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==", - "dev": true, - "engines": { - "node": ">=6.9.0" - } + "node_modules/eslint/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true }, - "node_modules/get-caller-file": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", - "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", + "node_modules/eslint/node_modules/escape-string-regexp": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", + "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", "dev": true, "engines": { - "node": "6.* || 8.* || >= 10.*" + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/get-intrinsic": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz", - "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==", + "node_modules/eslint/node_modules/find-up": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", + "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", "dev": true, "dependencies": { - "function-bind": "^1.1.1", - "has": "^1.0.3", - "has-symbols": "^1.0.3" + "locate-path": "^6.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=10" }, "funding": { - "url": "https://github.com/sponsors/ljharb" + "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/get-package-type": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz", - "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==", + "node_modules/eslint/node_modules/glob-parent": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", + "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", "dev": true, + "dependencies": { + "is-glob": "^4.0.3" + }, "engines": { - "node": ">=8.0.0" + "node": ">=10.13.0" } }, - "node_modules/get-stream": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", - "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", + "node_modules/eslint/node_modules/globals": { + "version": "13.23.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.23.0.tgz", + "integrity": "sha512-XAmF0RjlrjY23MA51q3HltdlGxUpXPvg0GioKiD9X6HD28iMjo2dKC8Vqwm7lne4GNr78+RHTfliktR6ZH09wA==", "dev": true, + "dependencies": { + "type-fest": "^0.20.2" + }, "engines": { - "node": ">=10" + "node": ">=8" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/glob": { - "version": "8.0.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-8.0.3.tgz", - "integrity": "sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ==", + "node_modules/eslint/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true, - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^5.0.1", - "once": "^1.3.0" - }, "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" + "node": ">=8" } }, - "node_modules/glob-parent": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", - "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "node_modules/eslint/node_modules/js-yaml": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", "dev": true, "dependencies": { - "is-glob": "^4.0.1" + "argparse": "^2.0.1" }, - "engines": { - "node": ">= 6" + "bin": { + "js-yaml": "bin/js-yaml.js" } }, - "node_modules/glob-to-regexp": { + "node_modules/eslint/node_modules/json-schema-traverse": { "version": "0.4.1", - "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz", - "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", "dev": true }, - "node_modules/globals": { - "version": "11.12.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", - "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/globby": { - "version": "13.1.3", - "resolved": "https://registry.npmjs.org/globby/-/globby-13.1.3.tgz", - "integrity": "sha512-8krCNHXvlCgHDpegPzleMq07yMYTO2sXKASmZmquEYWEmCx6J5UTRbp5RwMJkTJGtcQ44YpiUYUiN0b9mzy8Bw==", + "node_modules/eslint/node_modules/locate-path": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", + "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", "dev": true, "dependencies": { - "dir-glob": "^3.0.1", - "fast-glob": "^3.2.11", - "ignore": "^5.2.0", - "merge2": "^1.4.1", - "slash": "^4.0.0" + "p-locate": "^5.0.0" }, "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + "node": ">=10" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/gopd": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", - "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==", + "node_modules/eslint/node_modules/p-locate": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", + "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", "dev": true, "dependencies": { - "get-intrinsic": "^1.1.3" + "p-limit": "^3.0.2" + }, + "engines": { + "node": ">=10" }, "funding": { - "url": "https://github.com/sponsors/ljharb" + "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/graceful-fs": { - "version": "4.2.10", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", - "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", - "dev": true - }, - "node_modules/grapheme-splitter": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz", - "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==", - "dev": true - }, - "node_modules/handle-thing": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz", - "integrity": "sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==", - "dev": true - }, - "node_modules/has": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", - "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", + "node_modules/eslint/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", "dev": true, "dependencies": { - "function-bind": "^1.1.1" + "has-flag": "^4.0.0" }, "engines": { - "node": ">= 0.4.0" - } - }, - "node_modules/has-bigints": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz", - "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==", - "dev": true, - "funding": { - "url": "https://github.com/sponsors/ljharb" + "node": ">=8" } }, - "node_modules/has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", + "node_modules/eslint/node_modules/type-fest": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", + "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", "dev": true, "engines": { - "node": ">=4" + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/has-property-descriptors": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz", - "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==", + "node_modules/espree": { + "version": "9.6.1", + "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz", + "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==", "dev": true, "dependencies": { - "get-intrinsic": "^1.1.1" + "acorn": "^8.9.0", + "acorn-jsx": "^5.3.2", + "eslint-visitor-keys": "^3.4.1" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" }, "funding": { - "url": "https://github.com/sponsors/ljharb" + "url": "https://opencollective.com/eslint" } }, - "node_modules/has-symbols": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", - "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", + "node_modules/esprima": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", + "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", "dev": true, - "engines": { - "node": ">= 0.4" + "bin": { + "esparse": "bin/esparse.js", + "esvalidate": "bin/esvalidate.js" }, - "funding": { - "url": "https://github.com/sponsors/ljharb" + "engines": { + "node": ">=4" } }, - "node_modules/has-tostringtag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz", - "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==", + "node_modules/esquery": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz", + "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==", "dev": true, "dependencies": { - "has-symbols": "^1.0.2" + "estraverse": "^5.1.0" }, "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" + "node": ">=0.10" } }, - "node_modules/has-unicode": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", - "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==", - "dev": true - }, - "node_modules/hdr-histogram-js": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/hdr-histogram-js/-/hdr-histogram-js-2.0.3.tgz", - "integrity": "sha512-Hkn78wwzWHNCp2uarhzQ2SGFLU3JY8SBDDd3TAABK4fc30wm+MuPOrg5QVFVfkKOQd6Bfz3ukJEI+q9sXEkK1g==", + "node_modules/esrecurse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", + "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", "dev": true, "dependencies": { - "@assemblyscript/loader": "^0.10.1", - "base64-js": "^1.2.0", - "pako": "^1.0.3" + "estraverse": "^5.2.0" + }, + "engines": { + "node": ">=4.0" } }, - "node_modules/hdr-histogram-percentiles-obj": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/hdr-histogram-percentiles-obj/-/hdr-histogram-percentiles-obj-3.0.0.tgz", - "integrity": "sha512-7kIufnBqdsBGcSZLPJwqHT3yhk1QTsSlFsVD3kx5ixH/AlgBs9yM1q6DPhXZ8f8gtdqgh7N7/5btRLpQsS2gHw==", - "dev": true + "node_modules/estraverse": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", + "dev": true, + "engines": { + "node": ">=4.0" + } }, - "node_modules/hosted-git-info": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-6.1.1.tgz", - "integrity": "sha512-r0EI+HBMcXadMrugk0GCQ+6BQV39PiWAZVfq7oIckeGiN7sjRGyQxPdft3nQekFTCQbYxLBH+/axZMeH8UX6+w==", + "node_modules/esutils": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", + "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", "dev": true, - "dependencies": { - "lru-cache": "^7.5.1" - }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": ">=0.10.0" } }, - "node_modules/hpack.js": { - "version": "2.1.6", - "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz", - "integrity": "sha512-zJxVehUdMGIKsRaNt7apO2Gqp0BdqW5yaiGHXXmbpvxgBYVZnAql+BJb4RO5ad2MgpbZKn5G6nMnegrH1FcNYQ==", + "node_modules/etag": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", + "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==", "dev": true, - "dependencies": { - "inherits": "^2.0.1", - "obuf": "^1.0.0", - "readable-stream": "^2.0.1", - "wbuf": "^1.1.0" + "engines": { + "node": ">= 0.6" } }, - "node_modules/hpack.js/node_modules/isarray": { + "node_modules/eventemitter-asyncresource": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==", + "resolved": "https://registry.npmjs.org/eventemitter-asyncresource/-/eventemitter-asyncresource-1.0.0.tgz", + "integrity": "sha512-39F7TBIV0G7gTelxwbEqnwhp90eqCPON1k0NwNfwhgKn4Co4ybUbj2pECcXT0B3ztRKZ7Pw1JujUUgmQJHcVAQ==", "dev": true }, - "node_modules/hpack.js/node_modules/readable-stream": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", - "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "node_modules/eventemitter3": { + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz", + "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==", + "dev": true + }, + "node_modules/events": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz", + "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==", "dev": true, - "dependencies": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" + "engines": { + "node": ">=0.8.x" } }, - "node_modules/hpack.js/node_modules/string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "node_modules/execa": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz", + "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==", "dev": true, "dependencies": { - "safe-buffer": "~5.1.0" + "cross-spawn": "^7.0.3", + "get-stream": "^6.0.0", + "human-signals": "^2.1.0", + "is-stream": "^2.0.0", + "merge-stream": "^2.0.0", + "npm-run-path": "^4.0.1", + "onetime": "^5.1.2", + "signal-exit": "^3.0.3", + "strip-final-newline": "^2.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sindresorhus/execa?sponsor=1" } }, - "node_modules/html-encoding-sniffer": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz", - "integrity": "sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==", + "node_modules/exit": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz", + "integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==", + "dev": true, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/expect": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/expect/-/expect-29.7.0.tgz", + "integrity": "sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==", "dev": true, "dependencies": { - "whatwg-encoding": "^2.0.0" + "@jest/expect-utils": "^29.7.0", + "jest-get-type": "^29.6.3", + "jest-matcher-utils": "^29.7.0", + "jest-message-util": "^29.7.0", + "jest-util": "^29.7.0" }, "engines": { - "node": ">=12" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/html-entities": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.3.3.tgz", - "integrity": "sha512-DV5Ln36z34NNTDgnz0EWGBLZENelNAtkiFA4kyNOG2tDI6Mz1uSWiq1wAKdyjnJwyDiDO7Fa2SO1CTxPXL8VxA==", - "dev": true - }, - "node_modules/html-escaper": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz", - "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==", - "dev": true - }, - "node_modules/http-cache-semantics": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz", - "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==", - "dev": true - }, - "node_modules/http-deceiver": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz", - "integrity": "sha512-LmpOGxTfbpgtGVxJrj5k7asXHCgNZp5nLfp+hWc8QQRqtb7fUy6kRY3BO1h9ddF6yIPYUARgxGOwB42DnxIaNw==", + "node_modules/exponential-backoff": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.1.tgz", + "integrity": "sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw==", "dev": true }, - "node_modules/http-errors": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz", - "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==", + "node_modules/express": { + "version": "4.18.2", + "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz", + "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==", "dev": true, "dependencies": { + "accepts": "~1.3.8", + "array-flatten": "1.1.1", + "body-parser": "1.20.1", + "content-disposition": "0.5.4", + "content-type": "~1.0.4", + "cookie": "0.5.0", + "cookie-signature": "1.0.6", + "debug": "2.6.9", "depd": "2.0.0", - "inherits": "2.0.4", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "etag": "~1.8.1", + "finalhandler": "1.2.0", + "fresh": "0.5.2", + "http-errors": "2.0.0", + "merge-descriptors": "1.0.1", + "methods": "~1.1.2", + "on-finished": "2.4.1", + "parseurl": "~1.3.3", + "path-to-regexp": "0.1.7", + "proxy-addr": "~2.0.7", + "qs": "6.11.0", + "range-parser": "~1.2.1", + "safe-buffer": "5.2.1", + "send": "0.18.0", + "serve-static": "1.15.0", "setprototypeof": "1.2.0", "statuses": "2.0.1", - "toidentifier": "1.0.1" + "type-is": "~1.6.18", + "utils-merge": "1.0.1", + "vary": "~1.1.2" }, "engines": { - "node": ">= 0.8" + "node": ">= 0.10.0" } }, - "node_modules/http-errors/node_modules/depd": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", - "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", + "node_modules/express/node_modules/array-flatten": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", + "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==", + "dev": true + }, + "node_modules/express/node_modules/debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "dev": true, - "engines": { - "node": ">= 0.8" + "dependencies": { + "ms": "2.0.0" } }, - "node_modules/http-parser-js": { - "version": "0.5.8", - "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.8.tgz", - "integrity": "sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q==", + "node_modules/express/node_modules/ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", "dev": true }, - "node_modules/http-proxy": { - "version": "1.18.1", - "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz", - "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==", + "node_modules/external-editor": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz", + "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==", "dev": true, "dependencies": { - "eventemitter3": "^4.0.0", - "follow-redirects": "^1.0.0", - "requires-port": "^1.0.0" + "chardet": "^0.7.0", + "iconv-lite": "^0.4.24", + "tmp": "^0.0.33" }, "engines": { - "node": ">=8.0.0" + "node": ">=4" } }, - "node_modules/http-proxy-agent": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz", - "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==", + "node_modules/external-editor/node_modules/tmp": { + "version": "0.0.33", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", + "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", "dev": true, "dependencies": { - "@tootallnate/once": "2", - "agent-base": "6", - "debug": "4" + "os-tmpdir": "~1.0.2" }, "engines": { - "node": ">= 6" + "node": ">=0.6.0" } }, - "node_modules/http-proxy-middleware": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz", - "integrity": "sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==", - "dev": true, - "dependencies": { - "@types/http-proxy": "^1.17.8", - "http-proxy": "^1.18.1", - "is-glob": "^4.0.1", - "is-plain-obj": "^3.0.0", - "micromatch": "^4.0.2" - }, - "engines": { - "node": ">=12.0.0" - }, - "peerDependencies": { - "@types/express": "^4.17.13" - }, - "peerDependenciesMeta": { - "@types/express": { - "optional": true - } - } + "node_modules/fast-deep-equal": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", + "dev": true }, - "node_modules/https-proxy-agent": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", - "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", + "node_modules/fast-glob": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.1.tgz", + "integrity": "sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==", "dev": true, "dependencies": { - "agent-base": "6", - "debug": "4" + "@nodelib/fs.stat": "^2.0.2", + "@nodelib/fs.walk": "^1.2.3", + "glob-parent": "^5.1.2", + "merge2": "^1.3.0", + "micromatch": "^4.0.4" }, "engines": { - "node": ">= 6" + "node": ">=8.6.0" } }, - "node_modules/human-signals": { + "node_modules/fast-json-stable-stringify": { "version": "2.1.0", - "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz", - "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==", + "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", + "dev": true + }, + "node_modules/fast-levenshtein": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", + "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", + "dev": true + }, + "node_modules/fastq": { + "version": "1.15.0", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz", + "integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==", "dev": true, + "dependencies": { + "reusify": "^1.0.4" + } + }, + "node_modules/faye-websocket": { + "version": "0.11.4", + "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz", + "integrity": "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==", + "dev": true, + "dependencies": { + "websocket-driver": ">=0.5.1" + }, "engines": { - "node": ">=10.17.0" + "node": ">=0.8.0" } }, - "node_modules/humanize-ms": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz", - "integrity": "sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==", + "node_modules/fb-watchman": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz", + "integrity": "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==", "dev": true, "dependencies": { - "ms": "^2.0.0" + "bser": "2.1.1" } }, - "node_modules/iconv-lite": { - "version": "0.4.24", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", - "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "node_modules/figures": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz", + "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==", "dev": true, "dependencies": { - "safer-buffer": ">= 2.1.2 < 3" + "escape-string-regexp": "^1.0.5" }, "engines": { - "node": ">=0.10.0" + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/icss-utils": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz", - "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==", + "node_modules/file-entry-cache": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", + "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", "dev": true, - "engines": { - "node": "^10 || ^12 || >= 14" + "dependencies": { + "flat-cache": "^3.0.4" }, - "peerDependencies": { - "postcss": "^8.1.0" + "engines": { + "node": "^10.12.0 || >=12.0.0" } }, - "node_modules/ieee754": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", - "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", + "node_modules/filelist": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz", + "integrity": "sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==", "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ] + "dependencies": { + "minimatch": "^5.0.1" + } }, - "node_modules/ignore": { - "version": "5.2.4", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz", - "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==", + "node_modules/filelist/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", "dev": true, - "engines": { - "node": ">= 4" + "dependencies": { + "balanced-match": "^1.0.0" } }, - "node_modules/ignore-walk": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-6.0.0.tgz", - "integrity": "sha512-bTf9UWe/UP1yxG3QUrj/KOvEhTAUWPcv+WvbFZ28LcqznXabp7Xu6o9y1JEC18+oqODuS7VhTpekV5XvFwsxJg==", + "node_modules/filelist/node_modules/minimatch": { + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", + "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", "dev": true, "dependencies": { - "minimatch": "^5.0.1" + "brace-expansion": "^2.0.1" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": ">=10" } }, - "node_modules/image-size": { - "version": "0.5.5", - "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz", - "integrity": "sha512-6TDAlDPZxUFCv+fuOkIoXT/V/f3Qbq8e37p+YOiYrUv3v9cc3/6x78VdfPgFVaB9dZYeLUfKgHRebpkm/oP2VQ==", + "node_modules/fill-range": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", + "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", "dev": true, - "optional": true, - "bin": { - "image-size": "bin/image-size.js" + "dependencies": { + "to-regex-range": "^5.0.1" }, "engines": { - "node": ">=0.10.0" + "node": ">=8" } }, - "node_modules/immutable": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.2.2.tgz", - "integrity": "sha512-fTMKDwtbvO5tldky9QZ2fMX7slR0mYpY5nbnFWYp0fOzDhHqhgIw9KoYgxLWsoNTS9ZHGauHj18DTyEw6BK3Og==", - "dev": true - }, - "node_modules/import-fresh": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", - "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", + "node_modules/finalhandler": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz", + "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==", "dev": true, "dependencies": { - "parent-module": "^1.0.0", - "resolve-from": "^4.0.0" + "debug": "2.6.9", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "on-finished": "2.4.1", + "parseurl": "~1.3.3", + "statuses": "2.0.1", + "unpipe": "~1.0.0" }, "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "node": ">= 0.8" } }, - "node_modules/import-fresh/node_modules/resolve-from": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", - "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", + "node_modules/finalhandler/node_modules/debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "dev": true, - "engines": { - "node": ">=4" + "dependencies": { + "ms": "2.0.0" } }, - "node_modules/import-local": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz", - "integrity": "sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==", + "node_modules/finalhandler/node_modules/ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", + "dev": true + }, + "node_modules/find-cache-dir": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-4.0.0.tgz", + "integrity": "sha512-9ZonPT4ZAK4a+1pUPVPZJapbi7O5qbbJPdYw/NOQWZZbVLdDTYM3A4R9z/DpAM08IDaFGsvPgiGZ82WEwUDWjg==", "dev": true, "dependencies": { - "pkg-dir": "^4.2.0", - "resolve-cwd": "^3.0.0" - }, - "bin": { - "import-local-fixture": "fixtures/cli.js" + "common-path-prefix": "^3.0.0", + "pkg-dir": "^7.0.0" }, "engines": { - "node": ">=8" + "node": ">=14.16" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/imurmurhash": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", - "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", + "node_modules/find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", "dev": true, + "dependencies": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + }, "engines": { - "node": ">=0.8.19" + "node": ">=8" } }, - "node_modules/indent-string": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", - "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==", + "node_modules/flat": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz", + "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==", "dev": true, - "engines": { - "node": ">=8" + "bin": { + "flat": "cli.js" } }, - "node_modules/infer-owner": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz", - "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==", - "dev": true - }, - "node_modules/inflight": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", + "node_modules/flat-cache": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.1.1.tgz", + "integrity": "sha512-/qM2b3LUIaIgviBQovTLvijfyOQXPtSRnRK26ksj2J7rzPIecePUIpJsZ4T02Qg+xiAEKIs5K8dsHEd+VaKa/Q==", "dev": true, "dependencies": { - "once": "^1.3.0", - "wrappy": "1" + "flatted": "^3.2.9", + "keyv": "^4.5.3", + "rimraf": "^3.0.2" + }, + "engines": { + "node": ">=12.0.0" } }, - "node_modules/inherits": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", + "node_modules/flatted": { + "version": "3.2.9", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.9.tgz", + "integrity": "sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==", "dev": true }, - "node_modules/ini": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/ini/-/ini-3.0.1.tgz", - "integrity": "sha512-it4HyVAUTKBc6m8e1iXWvXSTdndF7HbdN713+kvLrymxTaU4AUBWrJ4vEooP+V7fexnVD3LKcBshjGGPefSMUQ==", + "node_modules/follow-redirects": { + "version": "1.15.3", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.3.tgz", + "integrity": "sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q==", "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://github.com/sponsors/RubenVerborgh" + } + ], "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + "node": ">=4.0" + }, + "peerDependenciesMeta": { + "debug": { + "optional": true + } } }, - "node_modules/inquirer": { - "version": "8.2.4", - "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-8.2.4.tgz", - "integrity": "sha512-nn4F01dxU8VeKfq192IjLsxu0/OmMZ4Lg3xKAns148rCaXP6ntAoEkVYZThWjwON8AlzdZZi6oqnhNbxUG9hVg==", + "node_modules/foreground-child": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz", + "integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==", "dev": true, "dependencies": { - "ansi-escapes": "^4.2.1", - "chalk": "^4.1.1", - "cli-cursor": "^3.1.0", - "cli-width": "^3.0.0", - "external-editor": "^3.0.3", - "figures": "^3.0.0", - "lodash": "^4.17.21", - "mute-stream": "0.0.8", - "ora": "^5.4.1", - "run-async": "^2.4.0", - "rxjs": "^7.5.5", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0", - "through": "^2.3.6", - "wrap-ansi": "^7.0.0" + "cross-spawn": "^7.0.0", + "signal-exit": "^4.0.1" }, "engines": { - "node": ">=12.0.0" + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/inquirer/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "node_modules/foreground-child/node_modules/signal-exit": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", + "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", "dev": true, - "dependencies": { - "color-convert": "^2.0.1" - }, "engines": { - "node": ">=8" + "node": ">=14" }, "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" + "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/inquirer/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "node_modules/form-data": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz", + "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==", "dev": true, "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" }, "engines": { - "node": ">=10" + "node": ">= 6" + } + }, + "node_modules/forwarded": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", + "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==", + "dev": true, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/fraction.js": { + "version": "4.3.7", + "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.3.7.tgz", + "integrity": "sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew==", + "dev": true, + "engines": { + "node": "*" }, "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" + "type": "patreon", + "url": "https://github.com/sponsors/rawify" } }, - "node_modules/inquirer/node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "node_modules/fresh": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", + "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==", "dev": true, - "dependencies": { - "color-name": "~1.1.4" - }, "engines": { - "node": ">=7.0.0" + "node": ">= 0.6" } }, - "node_modules/inquirer/node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "node_modules/fs-constants": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz", + "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==", "dev": true }, - "node_modules/inquirer/node_modules/has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "node_modules/fs-extra": { + "version": "11.1.1", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.1.tgz", + "integrity": "sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==", "dev": true, + "dependencies": { + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" + }, "engines": { - "node": ">=8" + "node": ">=14.14" } }, - "node_modules/inquirer/node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "node_modules/fs-minipass": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.3.tgz", + "integrity": "sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==", "dev": true, "dependencies": { - "has-flag": "^4.0.0" + "minipass": "^7.0.3" }, "engines": { - "node": ">=8" + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "node_modules/internal-slot": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.4.tgz", - "integrity": "sha512-tA8URYccNzMo94s5MQZgH8NB/XTa6HsOo0MLfXTKKEnHVVdegzaQoFZ7Jp44bdvLvY2waT5dc+j5ICEswhi7UQ==", + "node_modules/fs-minipass/node_modules/minipass": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz", + "integrity": "sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==", "dev": true, - "dependencies": { - "get-intrinsic": "^1.1.3", - "has": "^1.0.3", - "side-channel": "^1.0.4" - }, "engines": { - "node": ">= 0.4" + "node": ">=16 || 14 >=14.17" } }, - "node_modules/ip": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ip/-/ip-2.0.0.tgz", - "integrity": "sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==", + "node_modules/fs-monkey": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.5.tgz", + "integrity": "sha512-8uMbBjrhzW76TYgEV27Y5E//W2f/lTFmx78P2w19FZSxarhI/798APGQyuGCwmkNxgwGRhrLfvWyLBvNtuOmew==", "dev": true }, - "node_modules/ipaddr.js": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.0.1.tgz", - "integrity": "sha512-1qTgH9NG+IIJ4yfKs2e6Pp1bZg8wbDbKHT21HrLIeYBTRLgMYKnMTPAuI3Lcs61nfx5h1xlXnbJtH1kX5/d/ng==", + "node_modules/fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", + "dev": true + }, + "node_modules/fsevents": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", + "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", "dev": true, + "hasInstallScript": true, + "optional": true, + "os": [ + "darwin" + ], "engines": { - "node": ">= 10" + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" } }, - "node_modules/is-arguments": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz", - "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==", + "node_modules/function-bind": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "has-tostringtag": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - }, "funding": { "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/is-array-buffer": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.1.tgz", - "integrity": "sha512-ASfLknmY8Xa2XtB4wmbz13Wu202baeA18cJBCeCy0wXUHZF0IPyVEXqKEcd+t2fNSLLL1vC6k7lxZEojNbISXQ==", + "node_modules/gauge": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/gauge/-/gauge-4.0.4.tgz", + "integrity": "sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", - "get-intrinsic": "^1.1.3", - "is-typed-array": "^1.1.10" + "aproba": "^1.0.3 || ^2.0.0", + "color-support": "^1.1.3", + "console-control-strings": "^1.1.0", + "has-unicode": "^2.0.1", + "signal-exit": "^3.0.7", + "string-width": "^4.2.3", + "strip-ansi": "^6.0.1", + "wide-align": "^1.1.5" }, - "funding": { - "url": "https://github.com/sponsors/ljharb" + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" } }, - "node_modules/is-arrayish": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", - "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==", - "dev": true - }, - "node_modules/is-bigint": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz", - "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==", + "node_modules/gensync": { + "version": "1.0.0-beta.2", + "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", + "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==", "dev": true, - "dependencies": { - "has-bigints": "^1.0.1" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" + "engines": { + "node": ">=6.9.0" } }, - "node_modules/is-binary-path": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", - "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", + "node_modules/get-caller-file": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", "dev": true, - "dependencies": { - "binary-extensions": "^2.0.0" - }, "engines": { - "node": ">=8" + "node": "6.* || 8.* || >= 10.*" } }, - "node_modules/is-boolean-object": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz", - "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==", + "node_modules/get-intrinsic": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.2.tgz", + "integrity": "sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", - "has-tostringtag": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" + "function-bind": "^1.1.2", + "has-proto": "^1.0.1", + "has-symbols": "^1.0.3", + "hasown": "^2.0.0" }, "funding": { "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/is-callable": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz", - "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==", + "node_modules/get-package-type": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz", + "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==", "dev": true, "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" + "node": ">=8.0.0" } }, - "node_modules/is-core-module": { - "version": "2.9.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz", - "integrity": "sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==", + "node_modules/get-stream": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", + "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", "dev": true, - "dependencies": { - "has": "^1.0.3" + "engines": { + "node": ">=10" }, "funding": { - "url": "https://github.com/sponsors/ljharb" + "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/is-date-object": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz", - "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==", + "node_modules/glob": { + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", "dev": true, "dependencies": { - "has-tostringtag": "^1.0.0" + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.1.1", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" }, "engines": { - "node": ">= 0.4" + "node": "*" }, "funding": { - "url": "https://github.com/sponsors/ljharb" + "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/is-docker": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz", - "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==", + "node_modules/glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", "dev": true, - "bin": { - "is-docker": "cli.js" + "dependencies": { + "is-glob": "^4.0.1" }, "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/is-extglob": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", - "dev": true, - "engines": { - "node": ">=0.10.0" + "node": ">= 6" } }, - "node_modules/is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true, - "engines": { - "node": ">=8" - } + "node_modules/glob-to-regexp": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz", + "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==", + "dev": true }, - "node_modules/is-generator-fn": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz", - "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==", + "node_modules/globals": { + "version": "11.12.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", + "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", "dev": true, "engines": { - "node": ">=6" + "node": ">=4" } }, - "node_modules/is-glob": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", - "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", + "node_modules/globby": { + "version": "11.1.0", + "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", + "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==", "dev": true, "dependencies": { - "is-extglob": "^2.1.1" + "array-union": "^2.1.0", + "dir-glob": "^3.0.1", + "fast-glob": "^3.2.9", + "ignore": "^5.2.0", + "merge2": "^1.4.1", + "slash": "^3.0.0" }, "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-interactive": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz", - "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==", - "dev": true, - "engines": { - "node": ">=8" + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/is-lambda": { + "node_modules/gopd": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz", - "integrity": "sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==", - "dev": true - }, - "node_modules/is-map": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.2.tgz", - "integrity": "sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg==", + "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", + "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==", "dev": true, + "dependencies": { + "get-intrinsic": "^1.1.3" + }, "funding": { "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/is-number": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", - "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", - "dev": true, - "engines": { - "node": ">=0.12.0" - } + "node_modules/graceful-fs": { + "version": "4.2.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", + "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", + "dev": true }, - "node_modules/is-number-object": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz", - "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==", + "node_modules/graphemer": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz", + "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", + "dev": true + }, + "node_modules/guess-parser": { + "version": "0.4.22", + "resolved": "https://registry.npmjs.org/guess-parser/-/guess-parser-0.4.22.tgz", + "integrity": "sha512-KcUWZ5ACGaBM69SbqwVIuWGoSAgD+9iJnchR9j/IarVI1jHVeXv+bUXBIMeqVMSKt3zrn0Dgf9UpcOEpPBLbSg==", "dev": true, "dependencies": { - "has-tostringtag": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" + "@wessberg/ts-evaluator": "0.0.27" }, - "funding": { - "url": "https://github.com/sponsors/ljharb" + "peerDependencies": { + "typescript": ">=3.7.5" } }, - "node_modules/is-plain-obj": { + "node_modules/handle-thing": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz", + "integrity": "sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==", + "dev": true + }, + "node_modules/has-flag": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz", - "integrity": "sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", "dev": true, "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "node": ">=4" } }, - "node_modules/is-plain-object": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", - "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", + "node_modules/has-property-descriptors": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.1.tgz", + "integrity": "sha512-VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg==", "dev": true, "dependencies": { - "isobject": "^3.0.1" + "get-intrinsic": "^1.2.2" }, - "engines": { - "node": ">=0.10.0" + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/is-potential-custom-element-name": { + "node_modules/has-proto": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz", - "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==", - "dev": true - }, - "node_modules/is-regex": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz", - "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==", + "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz", + "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==", "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "has-tostringtag": "^1.0.0" - }, "engines": { "node": ">= 0.4" }, @@ -10276,594 +10072,526 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/is-set": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.2.tgz", - "integrity": "sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g==", - "dev": true, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-shared-array-buffer": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz", - "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==", + "node_modules/has-symbols": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", + "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", "dev": true, - "dependencies": { - "call-bind": "^1.0.2" + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/is-stream": { + "node_modules/has-unicode": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", - "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", - "dev": true, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } + "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", + "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==", + "dev": true }, - "node_modules/is-string": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz", - "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==", + "node_modules/hasown": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.0.tgz", + "integrity": "sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==", "dev": true, "dependencies": { - "has-tostringtag": "^1.0.0" + "function-bind": "^1.1.2" }, "engines": { "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/is-symbol": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz", - "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==", + "node_modules/hdr-histogram-js": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/hdr-histogram-js/-/hdr-histogram-js-2.0.3.tgz", + "integrity": "sha512-Hkn78wwzWHNCp2uarhzQ2SGFLU3JY8SBDDd3TAABK4fc30wm+MuPOrg5QVFVfkKOQd6Bfz3ukJEI+q9sXEkK1g==", "dev": true, "dependencies": { - "has-symbols": "^1.0.2" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" + "@assemblyscript/loader": "^0.10.1", + "base64-js": "^1.2.0", + "pako": "^1.0.3" } }, - "node_modules/is-typed-array": { - "version": "1.1.10", - "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.10.tgz", - "integrity": "sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A==", + "node_modules/hdr-histogram-percentiles-obj": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/hdr-histogram-percentiles-obj/-/hdr-histogram-percentiles-obj-3.0.0.tgz", + "integrity": "sha512-7kIufnBqdsBGcSZLPJwqHT3yhk1QTsSlFsVD3kx5ixH/AlgBs9yM1q6DPhXZ8f8gtdqgh7N7/5btRLpQsS2gHw==", + "dev": true + }, + "node_modules/hosted-git-info": { + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-6.1.1.tgz", + "integrity": "sha512-r0EI+HBMcXadMrugk0GCQ+6BQV39PiWAZVfq7oIckeGiN7sjRGyQxPdft3nQekFTCQbYxLBH+/axZMeH8UX6+w==", "dev": true, "dependencies": { - "available-typed-arrays": "^1.0.5", - "call-bind": "^1.0.2", - "for-each": "^0.3.3", - "gopd": "^1.0.1", - "has-tostringtag": "^1.0.0" + "lru-cache": "^7.5.1" }, "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "node_modules/is-unicode-supported": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz", - "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==", + "node_modules/hosted-git-info/node_modules/lru-cache": { + "version": "7.18.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", + "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", "dev": true, "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "node": ">=12" } }, - "node_modules/is-weakmap": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.1.tgz", - "integrity": "sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA==", + "node_modules/hpack.js": { + "version": "2.1.6", + "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz", + "integrity": "sha512-zJxVehUdMGIKsRaNt7apO2Gqp0BdqW5yaiGHXXmbpvxgBYVZnAql+BJb4RO5ad2MgpbZKn5G6nMnegrH1FcNYQ==", "dev": true, - "funding": { - "url": "https://github.com/sponsors/ljharb" + "dependencies": { + "inherits": "^2.0.1", + "obuf": "^1.0.0", + "readable-stream": "^2.0.1", + "wbuf": "^1.1.0" } }, - "node_modules/is-weakset": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.2.tgz", - "integrity": "sha512-t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg==", + "node_modules/hpack.js/node_modules/readable-stream": { + "version": "2.3.8", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", + "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", - "get-intrinsic": "^1.1.1" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" } }, - "node_modules/is-what": { - "version": "3.14.1", - "resolved": "https://registry.npmjs.org/is-what/-/is-what-3.14.1.tgz", - "integrity": "sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA==", + "node_modules/hpack.js/node_modules/safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", "dev": true }, - "node_modules/is-wsl": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz", - "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==", + "node_modules/hpack.js/node_modules/string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "dev": true, "dependencies": { - "is-docker": "^2.0.0" - }, - "engines": { - "node": ">=8" + "safe-buffer": "~5.1.0" } }, - "node_modules/isarray": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", - "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==", - "dev": true - }, - "node_modules/isexe": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", - "dev": true - }, - "node_modules/isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/istanbul-lib-coverage": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz", - "integrity": "sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/istanbul-lib-instrument": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.0.tgz", - "integrity": "sha512-6Lthe1hqXHBNsqvgDzGO6l03XNeu3CrG4RqQ1KM9+l5+jNGpEJfIELx1NS3SEHmJQA8np/u+E4EPRKRiu6m19A==", + "node_modules/html-encoding-sniffer": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz", + "integrity": "sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==", "dev": true, "dependencies": { - "@babel/core": "^7.12.3", - "@babel/parser": "^7.14.7", - "@istanbuljs/schema": "^0.1.2", - "istanbul-lib-coverage": "^3.2.0", - "semver": "^6.3.0" + "whatwg-encoding": "^1.0.5" }, "engines": { - "node": ">=8" + "node": ">=10" } }, - "node_modules/istanbul-lib-instrument/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "node_modules/html-entities": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.4.0.tgz", + "integrity": "sha512-igBTJcNNNhvZFRtm8uA6xMY6xYleeDwn3PeBCkDz7tHttv4F2hsDI2aPgNERWzvRcNYHNT3ymRaQzllmXj4YsQ==", "dev": true, - "bin": { - "semver": "bin/semver.js" - } + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/mdevils" + }, + { + "type": "patreon", + "url": "https://patreon.com/mdevils" + } + ] }, - "node_modules/istanbul-lib-report": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz", - "integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==", + "node_modules/html-escaper": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz", + "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==", + "dev": true + }, + "node_modules/htmlparser2": { + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-8.0.2.tgz", + "integrity": "sha512-GYdjWKDkbRLkZ5geuHs5NY1puJ+PXwP7+fHPRz06Eirsb9ugf6d8kkXav6ADhcODhFFPMIXyxkxSuMf3D6NCFA==", "dev": true, + "funding": [ + "https://github.com/fb55/htmlparser2?sponsor=1", + { + "type": "github", + "url": "https://github.com/sponsors/fb55" + } + ], "dependencies": { - "istanbul-lib-coverage": "^3.0.0", - "make-dir": "^3.0.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=8" + "domelementtype": "^2.3.0", + "domhandler": "^5.0.3", + "domutils": "^3.0.1", + "entities": "^4.4.0" } }, - "node_modules/istanbul-lib-report/node_modules/has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, - "engines": { - "node": ">=8" - } + "node_modules/http-cache-semantics": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz", + "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==", + "dev": true }, - "node_modules/istanbul-lib-report/node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "node_modules/http-deceiver": { + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz", + "integrity": "sha512-LmpOGxTfbpgtGVxJrj5k7asXHCgNZp5nLfp+hWc8QQRqtb7fUy6kRY3BO1h9ddF6yIPYUARgxGOwB42DnxIaNw==", + "dev": true + }, + "node_modules/http-errors": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz", + "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==", "dev": true, "dependencies": { - "has-flag": "^4.0.0" + "depd": "2.0.0", + "inherits": "2.0.4", + "setprototypeof": "1.2.0", + "statuses": "2.0.1", + "toidentifier": "1.0.1" }, "engines": { - "node": ">=8" + "node": ">= 0.8" } }, - "node_modules/istanbul-lib-source-maps": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz", - "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==", + "node_modules/http-parser-js": { + "version": "0.5.8", + "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.8.tgz", + "integrity": "sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q==", + "dev": true + }, + "node_modules/http-proxy": { + "version": "1.18.1", + "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz", + "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==", "dev": true, "dependencies": { - "debug": "^4.1.1", - "istanbul-lib-coverage": "^3.0.0", - "source-map": "^0.6.1" + "eventemitter3": "^4.0.0", + "follow-redirects": "^1.0.0", + "requires-port": "^1.0.0" }, "engines": { - "node": ">=10" - } - }, - "node_modules/istanbul-lib-source-maps/node_modules/source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true, - "engines": { - "node": ">=0.10.0" + "node": ">=8.0.0" } }, - "node_modules/istanbul-reports": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.5.tgz", - "integrity": "sha512-nUsEMa9pBt/NOHqbcbeJEgqIlY/K7rVWUX6Lql2orY5e9roQOthbR3vtY4zzf2orPELg80fnxxk9zUyPlgwD1w==", + "node_modules/http-proxy-agent": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz", + "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==", "dev": true, "dependencies": { - "html-escaper": "^2.0.0", - "istanbul-lib-report": "^3.0.0" + "@tootallnate/once": "1", + "agent-base": "6", + "debug": "4" }, "engines": { - "node": ">=8" + "node": ">= 6" } }, - "node_modules/jest": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest/-/jest-28.1.3.tgz", - "integrity": "sha512-N4GT5on8UkZgH0O5LUavMRV1EDEhNTL0KEfRmDIeZHSV7p2XgLoY9t9VDUgL6o+yfdgYHVxuz81G8oB9VG5uyA==", + "node_modules/http-proxy-middleware": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz", + "integrity": "sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==", "dev": true, "dependencies": { - "@jest/core": "^28.1.3", - "@jest/types": "^28.1.3", - "import-local": "^3.0.2", - "jest-cli": "^28.1.3" - }, - "bin": { - "jest": "bin/jest.js" + "@types/http-proxy": "^1.17.8", + "http-proxy": "^1.18.1", + "is-glob": "^4.0.1", + "is-plain-obj": "^3.0.0", + "micromatch": "^4.0.2" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": ">=12.0.0" }, "peerDependencies": { - "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0" + "@types/express": "^4.17.13" }, "peerDependenciesMeta": { - "node-notifier": { + "@types/express": { "optional": true } } }, - "node_modules/jest-changed-files": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-28.1.3.tgz", - "integrity": "sha512-esaOfUWJXk2nfZt9SPyC8gA1kNfdKLkQWyzsMlqq8msYSlNKfmZxfRgZn4Cd4MGVUF+7v6dBs0d5TOAKa7iIiA==", + "node_modules/https-proxy-agent": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", + "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", "dev": true, "dependencies": { - "execa": "^5.0.0", - "p-limit": "^3.1.0" + "agent-base": "6", + "debug": "4" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": ">= 6" } }, - "node_modules/jest-changed-files/node_modules/p-limit": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", - "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "node_modules/human-signals": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz", + "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==", "dev": true, - "dependencies": { - "yocto-queue": "^0.1.0" - }, "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "node": ">=10.17.0" } }, - "node_modules/jest-circus": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-28.1.3.tgz", - "integrity": "sha512-cZ+eS5zc79MBwt+IhQhiEp0OeBddpc1n8MBo1nMB8A7oPMKEO+Sre+wHaLJexQUj9Ya/8NOBY0RESUgYjB6fow==", + "node_modules/humanize-ms": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz", + "integrity": "sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==", "dev": true, "dependencies": { - "@jest/environment": "^28.1.3", - "@jest/expect": "^28.1.3", - "@jest/test-result": "^28.1.3", - "@jest/types": "^28.1.3", - "@types/node": "*", - "chalk": "^4.0.0", - "co": "^4.6.0", - "dedent": "^0.7.0", - "is-generator-fn": "^2.0.0", - "jest-each": "^28.1.3", - "jest-matcher-utils": "^28.1.3", - "jest-message-util": "^28.1.3", - "jest-runtime": "^28.1.3", - "jest-snapshot": "^28.1.3", - "jest-util": "^28.1.3", - "p-limit": "^3.1.0", - "pretty-format": "^28.1.3", - "slash": "^3.0.0", - "stack-utils": "^2.0.3" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "ms": "^2.0.0" } }, - "node_modules/jest-circus/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "node_modules/iconv-lite": { + "version": "0.4.24", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", "dev": true, "dependencies": { - "color-convert": "^2.0.1" + "safer-buffer": ">= 2.1.2 < 3" }, "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" + "node": ">=0.10.0" } }, - "node_modules/jest-circus/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "node_modules/icss-utils": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz", + "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==", "dev": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, "engines": { - "node": ">=10" + "node": "^10 || ^12 || >= 14" }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" + "peerDependencies": { + "postcss": "^8.1.0" } }, - "node_modules/jest-circus/node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "node_modules/ieee754": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", + "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", "dev": true, - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/jest-circus/node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "node_modules/jest-circus/node_modules/has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ] + }, + "node_modules/ignore": { + "version": "5.2.4", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz", + "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==", "dev": true, "engines": { - "node": ">=8" + "node": ">= 4" } }, - "node_modules/jest-circus/node_modules/p-limit": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", - "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "node_modules/ignore-walk": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-6.0.3.tgz", + "integrity": "sha512-C7FfFoTA+bI10qfeydT8aZbvr91vAEU+2W5BZUlzPec47oNb07SsOfwYrtxuvOYdUApPP/Qlh4DtAO51Ekk2QA==", "dev": true, "dependencies": { - "yocto-queue": "^0.1.0" + "minimatch": "^9.0.0" }, "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "node_modules/jest-circus/node_modules/slash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", + "node_modules/ignore-walk/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", "dev": true, - "engines": { - "node": ">=8" + "dependencies": { + "balanced-match": "^1.0.0" } }, - "node_modules/jest-circus/node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "node_modules/ignore-walk/node_modules/minimatch": { + "version": "9.0.3", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", + "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==", "dev": true, "dependencies": { - "has-flag": "^4.0.0" + "brace-expansion": "^2.0.1" }, "engines": { - "node": ">=8" + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/jest-cli": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-28.1.3.tgz", - "integrity": "sha512-roY3kvrv57Azn1yPgdTebPAXvdR2xfezaKKYzVxZ6It/5NCxzJym6tUI5P1zkdWhfUYkxEI9uZWcQdaFLo8mJQ==", + "node_modules/image-size": { + "version": "0.5.5", + "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz", + "integrity": "sha512-6TDAlDPZxUFCv+fuOkIoXT/V/f3Qbq8e37p+YOiYrUv3v9cc3/6x78VdfPgFVaB9dZYeLUfKgHRebpkm/oP2VQ==", "dev": true, - "dependencies": { - "@jest/core": "^28.1.3", - "@jest/test-result": "^28.1.3", - "@jest/types": "^28.1.3", - "chalk": "^4.0.0", - "exit": "^0.1.2", - "graceful-fs": "^4.2.9", - "import-local": "^3.0.2", - "jest-config": "^28.1.3", - "jest-util": "^28.1.3", - "jest-validate": "^28.1.3", - "prompts": "^2.0.1", - "yargs": "^17.3.1" - }, + "optional": true, "bin": { - "jest": "bin/jest.js" + "image-size": "bin/image-size.js" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - }, - "peerDependencies": { - "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0" - }, - "peerDependenciesMeta": { - "node-notifier": { - "optional": true - } + "node": ">=0.10.0" } }, - "node_modules/jest-cli/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "node_modules/immutable": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.4.tgz", + "integrity": "sha512-fsXeu4J4i6WNWSikpI88v/PcVflZz+6kMhUfIwc5SY+poQRPnaf5V7qds6SUyUN3cVxEzuCab7QIoLOQ+DQ1wA==", + "dev": true + }, + "node_modules/import-fresh": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", + "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", "dev": true, "dependencies": { - "color-convert": "^2.0.1" + "parent-module": "^1.0.0", + "resolve-from": "^4.0.0" }, "engines": { - "node": ">=8" + "node": ">=6" }, "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" + "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/jest-cli/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "node_modules/import-fresh/node_modules/resolve-from": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", + "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/import-local": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz", + "integrity": "sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==", "dev": true, "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" + "pkg-dir": "^4.2.0", + "resolve-cwd": "^3.0.0" + }, + "bin": { + "import-local-fixture": "fixtures/cli.js" }, "engines": { - "node": ">=10" + "node": ">=8" }, "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" + "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/jest-cli/node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "node_modules/import-local/node_modules/pkg-dir": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", + "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", "dev": true, "dependencies": { - "color-name": "~1.1.4" + "find-up": "^4.0.0" }, "engines": { - "node": ">=7.0.0" + "node": ">=8" } }, - "node_modules/jest-cli/node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true + "node_modules/imurmurhash": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", + "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", + "dev": true, + "engines": { + "node": ">=0.8.19" + } }, - "node_modules/jest-cli/node_modules/has-flag": { + "node_modules/indent-string": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", + "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==", "dev": true, "engines": { "node": ">=8" } }, - "node_modules/jest-cli/node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "node_modules/infer-owner": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz", + "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==", + "dev": true + }, + "node_modules/inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", "dev": true, "dependencies": { - "has-flag": "^4.0.0" - }, + "once": "^1.3.0", + "wrappy": "1" + } + }, + "node_modules/inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", + "dev": true + }, + "node_modules/ini": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/ini/-/ini-4.1.1.tgz", + "integrity": "sha512-QQnnxNyfvmHFIsj7gkPcYymR8Jdw/o7mp5ZFihxn6h8Ci6fh3Dx4E1gPjpQEpIuPo9XVNY/ZUwh4BPMjGyL01g==", + "dev": true, "engines": { - "node": ">=8" + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "node_modules/jest-config": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-28.1.3.tgz", - "integrity": "sha512-MG3INjByJ0J4AsNBm7T3hsuxKQqFIiRo/AUqb1q9LRKI5UU6Aar9JHbr9Ivn1TVwfUD9KirRoM/T6u8XlcQPHQ==", + "node_modules/inquirer": { + "version": "8.2.4", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-8.2.4.tgz", + "integrity": "sha512-nn4F01dxU8VeKfq192IjLsxu0/OmMZ4Lg3xKAns148rCaXP6ntAoEkVYZThWjwON8AlzdZZi6oqnhNbxUG9hVg==", "dev": true, "dependencies": { - "@babel/core": "^7.11.6", - "@jest/test-sequencer": "^28.1.3", - "@jest/types": "^28.1.3", - "babel-jest": "^28.1.3", - "chalk": "^4.0.0", - "ci-info": "^3.2.0", - "deepmerge": "^4.2.2", - "glob": "^7.1.3", - "graceful-fs": "^4.2.9", - "jest-circus": "^28.1.3", - "jest-environment-node": "^28.1.3", - "jest-get-type": "^28.0.2", - "jest-regex-util": "^28.0.2", - "jest-resolve": "^28.1.3", - "jest-runner": "^28.1.3", - "jest-util": "^28.1.3", - "jest-validate": "^28.1.3", - "micromatch": "^4.0.4", - "parse-json": "^5.2.0", - "pretty-format": "^28.1.3", - "slash": "^3.0.0", - "strip-json-comments": "^3.1.1" + "ansi-escapes": "^4.2.1", + "chalk": "^4.1.1", + "cli-cursor": "^3.1.0", + "cli-width": "^3.0.0", + "external-editor": "^3.0.3", + "figures": "^3.0.0", + "lodash": "^4.17.21", + "mute-stream": "0.0.8", + "ora": "^5.4.1", + "run-async": "^2.4.0", + "rxjs": "^7.5.5", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0", + "through": "^2.3.6", + "wrap-ansi": "^7.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - }, - "peerDependencies": { - "@types/node": "*", - "ts-node": ">=9.0.0" - }, - "peerDependenciesMeta": { - "@types/node": { - "optional": true - }, - "ts-node": { - "optional": true - } + "node": ">=12.0.0" } }, - "node_modules/jest-config/node_modules/ansi-styles": { + "node_modules/inquirer/node_modules/ansi-styles": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", @@ -10878,17 +10606,7 @@ "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, - "node_modules/jest-config/node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/jest-config/node_modules/chalk": { + "node_modules/inquirer/node_modules/chalk": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", @@ -10904,7 +10622,7 @@ "url": "https://github.com/chalk/chalk?sponsor=1" } }, - "node_modules/jest-config/node_modules/color-convert": { + "node_modules/inquirer/node_modules/color-convert": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", @@ -10916,328 +10634,307 @@ "node": ">=7.0.0" } }, - "node_modules/jest-config/node_modules/color-name": { + "node_modules/inquirer/node_modules/color-name": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, - "node_modules/jest-config/node_modules/glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "dev": true, - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/jest-config/node_modules/has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "node_modules/inquirer/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true, "engines": { "node": ">=8" } }, - "node_modules/jest-config/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "node_modules/inquirer/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", "dev": true, "dependencies": { - "brace-expansion": "^1.1.7" + "has-flag": "^4.0.0" }, "engines": { - "node": "*" + "node": ">=8" } }, - "node_modules/jest-config/node_modules/slash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", + "node_modules/ip": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ip/-/ip-2.0.0.tgz", + "integrity": "sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==", + "dev": true + }, + "node_modules/ipaddr.js": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.1.0.tgz", + "integrity": "sha512-LlbxQ7xKzfBusov6UMi4MFpEg0m+mAm9xyNGEduwXMEDuf4WfzB/RZwMVYEd7IKGvh4IUkEXYxtAVu9T3OelJQ==", "dev": true, "engines": { - "node": ">=8" + "node": ">= 10" } }, - "node_modules/jest-config/node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "node_modules/is-arrayish": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", + "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==", + "dev": true + }, + "node_modules/is-binary-path": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", + "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", "dev": true, "dependencies": { - "has-flag": "^4.0.0" + "binary-extensions": "^2.0.0" }, "engines": { "node": ">=8" } }, - "node_modules/jest-diff": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-28.1.3.tgz", - "integrity": "sha512-8RqP1B/OXzjjTWkqMX67iqgwBVJRgCyKD3L9nq+6ZqJMdvjE8RgHktqZ6jNrkdMT+dJuYNI3rhQpxaz7drJHfw==", + "node_modules/is-core-module": { + "version": "2.13.1", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz", + "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==", "dev": true, "dependencies": { - "chalk": "^4.0.0", - "diff-sequences": "^28.1.1", - "jest-get-type": "^28.0.2", - "pretty-format": "^28.1.3" + "hasown": "^2.0.0" }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/jest-diff/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "node_modules/is-docker": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz", + "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==", "dev": true, - "dependencies": { - "color-convert": "^2.0.1" + "bin": { + "is-docker": "cli.js" }, "engines": { "node": ">=8" }, "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" + "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/jest-diff/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "node_modules/is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", "dev": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" + "node": ">=0.10.0" } }, - "node_modules/jest-diff/node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "node_modules/is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", "dev": true, - "dependencies": { - "color-name": "~1.1.4" - }, "engines": { - "node": ">=7.0.0" + "node": ">=8" } }, - "node_modules/jest-diff/node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "node_modules/jest-diff/node_modules/has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "node_modules/is-generator-fn": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz", + "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==", "dev": true, "engines": { - "node": ">=8" + "node": ">=6" } }, - "node_modules/jest-diff/node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "node_modules/is-glob": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", + "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", "dev": true, "dependencies": { - "has-flag": "^4.0.0" + "is-extglob": "^2.1.1" }, "engines": { - "node": ">=8" + "node": ">=0.10.0" } }, - "node_modules/jest-docblock": { - "version": "28.1.1", - "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-28.1.1.tgz", - "integrity": "sha512-3wayBVNiOYx0cwAbl9rwm5kKFP8yHH3d/fkEaL02NPTkDojPtheGB7HZSFY4wzX+DxyrvhXz0KSCVksmCknCuA==", + "node_modules/is-interactive": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz", + "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==", "dev": true, - "dependencies": { - "detect-newline": "^3.0.0" - }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": ">=8" } }, - "node_modules/jest-each": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-28.1.3.tgz", - "integrity": "sha512-arT1z4sg2yABU5uogObVPvSlSMQlDA48owx07BDPAiasW0yYpYHYOo4HHLz9q0BVzDVU4hILFjzJw0So9aCL/g==", + "node_modules/is-lambda": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz", + "integrity": "sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==", + "dev": true + }, + "node_modules/is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", "dev": true, - "dependencies": { - "@jest/types": "^28.1.3", - "chalk": "^4.0.0", - "jest-get-type": "^28.0.2", - "jest-util": "^28.1.3", - "pretty-format": "^28.1.3" - }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": ">=0.12.0" } }, - "node_modules/jest-each/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "node_modules/is-path-inside": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", + "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", "dev": true, - "dependencies": { - "color-convert": "^2.0.1" - }, "engines": { "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, - "node_modules/jest-each/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "node_modules/is-plain-obj": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz", + "integrity": "sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==", "dev": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, "engines": { "node": ">=10" }, "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" + "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/jest-each/node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "node_modules/is-plain-object": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", + "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", "dev": true, "dependencies": { - "color-name": "~1.1.4" + "isobject": "^3.0.1" }, "engines": { - "node": ">=7.0.0" + "node": ">=0.10.0" } }, - "node_modules/jest-each/node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "node_modules/is-potential-custom-element-name": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz", + "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==", "dev": true }, - "node_modules/jest-each/node_modules/has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "node_modules/is-stream": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", + "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", "dev": true, "engines": { "node": ">=8" - } - }, - "node_modules/jest-each/node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "dependencies": { - "has-flag": "^4.0.0" }, - "engines": { - "node": ">=8" + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/jest-environment-jsdom": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-28.1.3.tgz", - "integrity": "sha512-HnlGUmZRdxfCByd3GM2F100DgQOajUBzEitjGqIREcb45kGjZvRrKUdlaF6escXBdcXNl0OBh+1ZrfeZT3GnAg==", + "node_modules/is-unicode-supported": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz", + "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==", "dev": true, - "dependencies": { - "@jest/environment": "^28.1.3", - "@jest/fake-timers": "^28.1.3", - "@jest/types": "^28.1.3", - "@types/jsdom": "^16.2.4", - "@types/node": "*", - "jest-mock": "^28.1.3", - "jest-util": "^28.1.3", - "jsdom": "^19.0.0" - }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/jest-environment-node": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-28.1.3.tgz", - "integrity": "sha512-ugP6XOhEpjAEhGYvp5Xj989ns5cB1K6ZdjBYuS30umT4CQEETaxSiPcZ/E1kFktX4GkrcM4qu07IIlDYX1gp+A==", + "node_modules/is-what": { + "version": "3.14.1", + "resolved": "https://registry.npmjs.org/is-what/-/is-what-3.14.1.tgz", + "integrity": "sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA==", + "dev": true + }, + "node_modules/is-wsl": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz", + "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==", "dev": true, "dependencies": { - "@jest/environment": "^28.1.3", - "@jest/fake-timers": "^28.1.3", - "@jest/types": "^28.1.3", - "@types/node": "*", - "jest-mock": "^28.1.3", - "jest-util": "^28.1.3" + "is-docker": "^2.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/jest-get-type": { - "version": "28.0.2", - "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-28.0.2.tgz", - "integrity": "sha512-ioj2w9/DxSYHfOm5lJKCdcAmPJzQXmbM/Url3rhlghrPvT3tt+7a/+oXc9azkKmLvoiXjtV83bEWqi+vs5nlPA==", - "dev": true, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": ">=8" } }, - "node_modules/jest-haste-map": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-28.1.3.tgz", - "integrity": "sha512-3S+RQWDXccXDKSWnkHa/dPwt+2qwA8CJzR61w3FoYCvoo3Pn8tvGcysmMF0Bj0EX5RYvAI2EIvC57OmotfdtKA==", + "node_modules/isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==", + "dev": true + }, + "node_modules/isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", + "dev": true + }, + "node_modules/isobject": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/istanbul-lib-coverage": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz", + "integrity": "sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/istanbul-lib-instrument": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz", + "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==", "dev": true, "dependencies": { - "@jest/types": "^28.1.3", - "@types/graceful-fs": "^4.1.3", - "@types/node": "*", - "anymatch": "^3.0.3", - "fb-watchman": "^2.0.0", - "graceful-fs": "^4.2.9", - "jest-regex-util": "^28.0.2", - "jest-util": "^28.1.3", - "jest-worker": "^28.1.3", - "micromatch": "^4.0.4", - "walker": "^1.0.8" + "@babel/core": "^7.12.3", + "@babel/parser": "^7.14.7", + "@istanbuljs/schema": "^0.1.2", + "istanbul-lib-coverage": "^3.2.0", + "semver": "^6.3.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": ">=8" + } + }, + "node_modules/istanbul-lib-instrument/node_modules/semver": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "dev": true, + "bin": { + "semver": "bin/semver.js" + } + }, + "node_modules/istanbul-lib-report": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz", + "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==", + "dev": true, + "dependencies": { + "istanbul-lib-coverage": "^3.0.0", + "make-dir": "^4.0.0", + "supports-color": "^7.1.0" }, - "optionalDependencies": { - "fsevents": "^2.3.2" + "engines": { + "node": ">=10" } }, - "node_modules/jest-haste-map/node_modules/has-flag": { + "node_modules/istanbul-lib-report/node_modules/has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", @@ -11246,64 +10943,91 @@ "node": ">=8" } }, - "node_modules/jest-haste-map/node_modules/jest-worker": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-28.1.3.tgz", - "integrity": "sha512-CqRA220YV/6jCo8VWvAt1KKx6eek1VIHMPeLEbpcfSfkEeWyBNppynM/o6q+Wmw+sOhos2ml34wZbSX3G13//g==", + "node_modules/istanbul-lib-report/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", "dev": true, "dependencies": { - "@types/node": "*", - "merge-stream": "^2.0.0", - "supports-color": "^8.0.0" + "has-flag": "^4.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": ">=8" } }, - "node_modules/jest-haste-map/node_modules/jest-worker/node_modules/supports-color": { - "version": "8.1.1", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", - "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", + "node_modules/istanbul-lib-source-maps": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz", + "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==", "dev": true, "dependencies": { - "has-flag": "^4.0.0" + "debug": "^4.1.1", + "istanbul-lib-coverage": "^3.0.0", + "source-map": "^0.6.1" }, "engines": { "node": ">=10" + } + }, + "node_modules/istanbul-lib-source-maps/node_modules/source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/istanbul-reports": { + "version": "3.1.6", + "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.6.tgz", + "integrity": "sha512-TLgnMkKg3iTDsQ9PbPTdpfAK2DzjF9mqUG7RMgcQl8oFjad8ob4laGxv5XV5U9MAfx8D6tSJiUyuAwzLicaxlg==", + "dev": true, + "dependencies": { + "html-escaper": "^2.0.0", + "istanbul-lib-report": "^3.0.0" }, - "funding": { - "url": "https://github.com/chalk/supports-color?sponsor=1" + "engines": { + "node": ">=8" } }, - "node_modules/jest-leak-detector": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-28.1.3.tgz", - "integrity": "sha512-WFVJhnQsiKtDEo5lG2mM0v40QWnBM+zMdHHyJs8AWZ7J0QZJS59MsyKeJHWhpBZBH32S48FOVvGyOFT1h0DlqA==", + "node_modules/jackspeak": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.6.tgz", + "integrity": "sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==", "dev": true, "dependencies": { - "jest-get-type": "^28.0.2", - "pretty-format": "^28.1.3" + "@isaacs/cliui": "^8.0.2" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + }, + "optionalDependencies": { + "@pkgjs/parseargs": "^0.11.0" } }, - "node_modules/jest-matcher-utils": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-28.1.3.tgz", - "integrity": "sha512-kQeJ7qHemKfbzKoGjHHrRKH6atgxMk8Enkk2iPQ3XwO6oE/KYD8lMYOziCkeSB9G4adPM4nR1DE8Tf5JeWH6Bw==", + "node_modules/jake": { + "version": "10.8.7", + "resolved": "https://registry.npmjs.org/jake/-/jake-10.8.7.tgz", + "integrity": "sha512-ZDi3aP+fG/LchyBzUM804VjddnwfSfsdeYkwt8NcbKRvo4rFkjhs456iLFn3k2ZUWvNe4i48WACDbza8fhq2+w==", "dev": true, "dependencies": { - "chalk": "^4.0.0", - "jest-diff": "^28.1.3", - "jest-get-type": "^28.0.2", - "pretty-format": "^28.1.3" + "async": "^3.2.3", + "chalk": "^4.0.2", + "filelist": "^1.0.4", + "minimatch": "^3.1.2" + }, + "bin": { + "jake": "bin/cli.js" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": ">=10" } }, - "node_modules/jest-matcher-utils/node_modules/ansi-styles": { + "node_modules/jake/node_modules/ansi-styles": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", @@ -11318,7 +11042,7 @@ "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, - "node_modules/jest-matcher-utils/node_modules/chalk": { + "node_modules/jake/node_modules/chalk": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", @@ -11334,7 +11058,7 @@ "url": "https://github.com/chalk/chalk?sponsor=1" } }, - "node_modules/jest-matcher-utils/node_modules/color-convert": { + "node_modules/jake/node_modules/color-convert": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", @@ -11346,13 +11070,13 @@ "node": ">=7.0.0" } }, - "node_modules/jest-matcher-utils/node_modules/color-name": { + "node_modules/jake/node_modules/color-name": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, - "node_modules/jest-matcher-utils/node_modules/has-flag": { + "node_modules/jake/node_modules/has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", @@ -11361,7 +11085,7 @@ "node": ">=8" } }, - "node_modules/jest-matcher-utils/node_modules/supports-color": { + "node_modules/jake/node_modules/supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", @@ -11373,27 +11097,78 @@ "node": ">=8" } }, - "node_modules/jest-message-util": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-28.1.3.tgz", - "integrity": "sha512-PFdn9Iewbt575zKPf1286Ht9EPoJmYT7P0kY+RibeYZ2XtOr53pDLEFoTWXbd1h4JiGiWpTBC84fc8xMXQMb7g==", + "node_modules/jest": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest/-/jest-29.7.0.tgz", + "integrity": "sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==", "dev": true, "dependencies": { - "@babel/code-frame": "^7.12.13", - "@jest/types": "^28.1.3", - "@types/stack-utils": "^2.0.0", + "@jest/core": "^29.7.0", + "@jest/types": "^29.6.3", + "import-local": "^3.0.2", + "jest-cli": "^29.7.0" + }, + "bin": { + "jest": "bin/jest.js" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + }, + "peerDependencies": { + "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0" + }, + "peerDependenciesMeta": { + "node-notifier": { + "optional": true + } + } + }, + "node_modules/jest-changed-files": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.7.0.tgz", + "integrity": "sha512-fEArFiwf1BpQ+4bXSprcDc3/x4HSzL4al2tozwVpDFpsxALjLYdyiIK4e5Vz66GQJIbXJ82+35PtysofptNX2w==", + "dev": true, + "dependencies": { + "execa": "^5.0.0", + "jest-util": "^29.7.0", + "p-limit": "^3.1.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-circus": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.7.0.tgz", + "integrity": "sha512-3E1nCMgipcTkCocFwM90XXQab9bS+GMsjdpmPrlelaxwD93Ad8iVEjX/vvHPdLPnFf+L40u+5+iutRdA1N9myw==", + "dev": true, + "dependencies": { + "@jest/environment": "^29.7.0", + "@jest/expect": "^29.7.0", + "@jest/test-result": "^29.7.0", + "@jest/types": "^29.6.3", + "@types/node": "*", "chalk": "^4.0.0", - "graceful-fs": "^4.2.9", - "micromatch": "^4.0.4", - "pretty-format": "^28.1.3", + "co": "^4.6.0", + "dedent": "^1.0.0", + "is-generator-fn": "^2.0.0", + "jest-each": "^29.7.0", + "jest-matcher-utils": "^29.7.0", + "jest-message-util": "^29.7.0", + "jest-runtime": "^29.7.0", + "jest-snapshot": "^29.7.0", + "jest-util": "^29.7.0", + "p-limit": "^3.1.0", + "pretty-format": "^29.7.0", + "pure-rand": "^6.0.0", "slash": "^3.0.0", "stack-utils": "^2.0.3" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/jest-message-util/node_modules/ansi-styles": { + "node_modules/jest-circus/node_modules/ansi-styles": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", @@ -11408,7 +11183,7 @@ "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, - "node_modules/jest-message-util/node_modules/chalk": { + "node_modules/jest-circus/node_modules/chalk": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", @@ -11424,7 +11199,7 @@ "url": "https://github.com/chalk/chalk?sponsor=1" } }, - "node_modules/jest-message-util/node_modules/color-convert": { + "node_modules/jest-circus/node_modules/color-convert": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", @@ -11436,13 +11211,13 @@ "node": ">=7.0.0" } }, - "node_modules/jest-message-util/node_modules/color-name": { + "node_modules/jest-circus/node_modules/color-name": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, - "node_modules/jest-message-util/node_modules/has-flag": { + "node_modules/jest-circus/node_modules/has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", @@ -11451,16 +11226,7 @@ "node": ">=8" } }, - "node_modules/jest-message-util/node_modules/slash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/jest-message-util/node_modules/supports-color": { + "node_modules/jest-circus/node_modules/supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", @@ -11472,180 +11238,71 @@ "node": ">=8" } }, - "node_modules/jest-mock": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-28.1.3.tgz", - "integrity": "sha512-o3J2jr6dMMWYVH4Lh/NKmDXdosrsJgi4AviS8oXLujcjpCMBb1FMsblDnOXKZKfSiHLxYub1eS0IHuRXsio9eA==", + "node_modules/jest-cli": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.7.0.tgz", + "integrity": "sha512-OVVobw2IubN/GSYsxETi+gOe7Ka59EFMR/twOU3Jb2GnKKeMGJB5SGUUrEz3SFVmJASUdZUzy83sLNNQ2gZslg==", "dev": true, "dependencies": { - "@jest/types": "^28.1.3", - "@types/node": "*" + "@jest/core": "^29.7.0", + "@jest/test-result": "^29.7.0", + "@jest/types": "^29.6.3", + "chalk": "^4.0.0", + "create-jest": "^29.7.0", + "exit": "^0.1.2", + "import-local": "^3.0.2", + "jest-config": "^29.7.0", + "jest-util": "^29.7.0", + "jest-validate": "^29.7.0", + "yargs": "^17.3.1" + }, + "bin": { + "jest": "bin/jest.js" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/jest-pnp-resolver": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz", - "integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==", - "dev": true, - "engines": { - "node": ">=6" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" }, "peerDependencies": { - "jest-resolve": "*" + "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0" }, "peerDependenciesMeta": { - "jest-resolve": { + "node-notifier": { "optional": true } } }, - "node_modules/jest-preset-angular": { - "version": "12.2.3", - "resolved": "https://registry.npmjs.org/jest-preset-angular/-/jest-preset-angular-12.2.3.tgz", - "integrity": "sha512-9vgawXuki/lg4IRPtl5k83krWLKADTal7BBm06xNAWOK09AbHK1foXqZdVOMObsWbaMDeQ1cjba60vS/aEVY4Q==", + "node_modules/jest-cli/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "dev": true, "dependencies": { - "bs-logger": "^0.2.6", - "esbuild-wasm": ">=0.13.8", - "jest-environment-jsdom": "^28.0.0", - "pretty-format": "^28.0.0", - "ts-jest": "^28.0.0" + "color-convert": "^2.0.1" }, "engines": { - "node": "^14.15.0 || >=16.10.0" - }, - "optionalDependencies": { - "esbuild": ">=0.13.8" + "node": ">=8" }, - "peerDependencies": { - "@angular-devkit/build-angular": ">=12.2.18 <16.0.0", - "@angular/compiler-cli": ">=12.2.16 <16.0.0", - "@angular/core": ">=12.2.16 <16.0.0", - "@angular/platform-browser-dynamic": ">=12.2.16 <16.0.0", - "jest": "^28.0.0", - "typescript": ">=4.4" + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, - "node_modules/jest-preset-angular/node_modules/ts-jest": { - "version": "28.0.8", - "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-28.0.8.tgz", - "integrity": "sha512-5FaG0lXmRPzApix8oFG8RKjAz4ehtm8yMKOTy5HX3fY6W8kmvOrmcY0hKDElW52FJov+clhUbrKAqofnj4mXTg==", + "node_modules/jest-cli/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", "dev": true, "dependencies": { - "bs-logger": "0.x", - "fast-json-stable-stringify": "2.x", - "jest-util": "^28.0.0", - "json5": "^2.2.1", - "lodash.memoize": "4.x", - "make-error": "1.x", - "semver": "7.x", - "yargs-parser": "^21.0.1" - }, - "bin": { - "ts-jest": "cli.js" + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - }, - "peerDependencies": { - "@babel/core": ">=7.0.0-beta.0 <8", - "@jest/types": "^28.0.0", - "babel-jest": "^28.0.0", - "jest": "^28.0.0", - "typescript": ">=4.3" + "node": ">=10" }, - "peerDependenciesMeta": { - "@babel/core": { - "optional": true - }, - "@jest/types": { - "optional": true - }, - "babel-jest": { - "optional": true - }, - "esbuild": { - "optional": true - } + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" } }, - "node_modules/jest-regex-util": { - "version": "28.0.2", - "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-28.0.2.tgz", - "integrity": "sha512-4s0IgyNIy0y9FK+cjoVYoxamT7Zeo7MhzqRGx7YDYmaQn1wucY9rotiGkBzzcMXTtjrCAP/f7f+E0F7+fxPNdw==", - "dev": true, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/jest-resolve": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-28.1.3.tgz", - "integrity": "sha512-Z1W3tTjE6QaNI90qo/BJpfnvpxtaFTFw5CDgwpyE/Kz8U/06N1Hjf4ia9quUhCh39qIGWF1ZuxFiBiJQwSEYKQ==", - "dev": true, - "dependencies": { - "chalk": "^4.0.0", - "graceful-fs": "^4.2.9", - "jest-haste-map": "^28.1.3", - "jest-pnp-resolver": "^1.2.2", - "jest-util": "^28.1.3", - "jest-validate": "^28.1.3", - "resolve": "^1.20.0", - "resolve.exports": "^1.1.0", - "slash": "^3.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/jest-resolve-dependencies": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-28.1.3.tgz", - "integrity": "sha512-qa0QO2Q0XzQoNPouMbCc7Bvtsem8eQgVPNkwn9LnS+R2n8DaVDPL/U1gngC0LTl1RYXJU0uJa2BMC2DbTfFrHA==", - "dev": true, - "dependencies": { - "jest-regex-util": "^28.0.2", - "jest-snapshot": "^28.1.3" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/jest-resolve/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/jest-resolve/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, - "node_modules/jest-resolve/node_modules/color-convert": { + "node_modules/jest-cli/node_modules/color-convert": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", @@ -11657,13 +11314,13 @@ "node": ">=7.0.0" } }, - "node_modules/jest-resolve/node_modules/color-name": { + "node_modules/jest-cli/node_modules/color-name": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, - "node_modules/jest-resolve/node_modules/has-flag": { + "node_modules/jest-cli/node_modules/has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", @@ -11672,16 +11329,7 @@ "node": ">=8" } }, - "node_modules/jest-resolve/node_modules/slash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/jest-resolve/node_modules/supports-color": { + "node_modules/jest-cli/node_modules/supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", @@ -11693,39 +11341,52 @@ "node": ">=8" } }, - "node_modules/jest-runner": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-28.1.3.tgz", - "integrity": "sha512-GkMw4D/0USd62OVO0oEgjn23TM+YJa2U2Wu5zz9xsQB1MxWKDOlrnykPxnMsN0tnJllfLPinHTka61u0QhaxBA==", + "node_modules/jest-config": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.7.0.tgz", + "integrity": "sha512-uXbpfeQ7R6TZBqI3/TxCU4q4ttk3u0PJeC+E0zbfSoSjq6bJ7buBPxzQPL0ifrkY4DNu4JUdk0ImlBUYi840eQ==", "dev": true, "dependencies": { - "@jest/console": "^28.1.3", - "@jest/environment": "^28.1.3", - "@jest/test-result": "^28.1.3", - "@jest/transform": "^28.1.3", - "@jest/types": "^28.1.3", - "@types/node": "*", + "@babel/core": "^7.11.6", + "@jest/test-sequencer": "^29.7.0", + "@jest/types": "^29.6.3", + "babel-jest": "^29.7.0", "chalk": "^4.0.0", - "emittery": "^0.10.2", + "ci-info": "^3.2.0", + "deepmerge": "^4.2.2", + "glob": "^7.1.3", "graceful-fs": "^4.2.9", - "jest-docblock": "^28.1.1", - "jest-environment-node": "^28.1.3", - "jest-haste-map": "^28.1.3", - "jest-leak-detector": "^28.1.3", - "jest-message-util": "^28.1.3", - "jest-resolve": "^28.1.3", - "jest-runtime": "^28.1.3", - "jest-util": "^28.1.3", - "jest-watcher": "^28.1.3", - "jest-worker": "^28.1.3", - "p-limit": "^3.1.0", - "source-map-support": "0.5.13" + "jest-circus": "^29.7.0", + "jest-environment-node": "^29.7.0", + "jest-get-type": "^29.6.3", + "jest-regex-util": "^29.6.3", + "jest-resolve": "^29.7.0", + "jest-runner": "^29.7.0", + "jest-util": "^29.7.0", + "jest-validate": "^29.7.0", + "micromatch": "^4.0.4", + "parse-json": "^5.2.0", + "pretty-format": "^29.7.0", + "slash": "^3.0.0", + "strip-json-comments": "^3.1.1" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + }, + "peerDependencies": { + "@types/node": "*", + "ts-node": ">=9.0.0" + }, + "peerDependenciesMeta": { + "@types/node": { + "optional": true + }, + "ts-node": { + "optional": true + } } }, - "node_modules/jest-runner/node_modules/ansi-styles": { + "node_modules/jest-config/node_modules/ansi-styles": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", @@ -11740,7 +11401,7 @@ "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, - "node_modules/jest-runner/node_modules/chalk": { + "node_modules/jest-config/node_modules/chalk": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", @@ -11756,7 +11417,7 @@ "url": "https://github.com/chalk/chalk?sponsor=1" } }, - "node_modules/jest-runner/node_modules/color-convert": { + "node_modules/jest-config/node_modules/color-convert": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", @@ -11768,13 +11429,13 @@ "node": ">=7.0.0" } }, - "node_modules/jest-runner/node_modules/color-name": { + "node_modules/jest-config/node_modules/color-name": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, - "node_modules/jest-runner/node_modules/has-flag": { + "node_modules/jest-config/node_modules/has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", @@ -11783,70 +11444,7 @@ "node": ">=8" } }, - "node_modules/jest-runner/node_modules/jest-worker": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-28.1.3.tgz", - "integrity": "sha512-CqRA220YV/6jCo8VWvAt1KKx6eek1VIHMPeLEbpcfSfkEeWyBNppynM/o6q+Wmw+sOhos2ml34wZbSX3G13//g==", - "dev": true, - "dependencies": { - "@types/node": "*", - "merge-stream": "^2.0.0", - "supports-color": "^8.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/jest-runner/node_modules/jest-worker/node_modules/supports-color": { - "version": "8.1.1", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", - "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", - "dev": true, - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/supports-color?sponsor=1" - } - }, - "node_modules/jest-runner/node_modules/p-limit": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", - "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", - "dev": true, - "dependencies": { - "yocto-queue": "^0.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/jest-runner/node_modules/source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/jest-runner/node_modules/source-map-support": { - "version": "0.5.13", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz", - "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==", - "dev": true, - "dependencies": { - "buffer-from": "^1.0.0", - "source-map": "^0.6.0" - } - }, - "node_modules/jest-runner/node_modules/supports-color": { + "node_modules/jest-config/node_modules/supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", @@ -11858,40 +11456,22 @@ "node": ">=8" } }, - "node_modules/jest-runtime": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-28.1.3.tgz", - "integrity": "sha512-NU+881ScBQQLc1JHG5eJGU7Ui3kLKrmwCPPtYsJtBykixrM2OhVQlpMmFWJjMyDfdkGgBMNjXCGB/ebzsgNGQw==", - "dev": true, - "dependencies": { - "@jest/environment": "^28.1.3", - "@jest/fake-timers": "^28.1.3", - "@jest/globals": "^28.1.3", - "@jest/source-map": "^28.1.2", - "@jest/test-result": "^28.1.3", - "@jest/transform": "^28.1.3", - "@jest/types": "^28.1.3", + "node_modules/jest-diff": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz", + "integrity": "sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==", + "dev": true, + "dependencies": { "chalk": "^4.0.0", - "cjs-module-lexer": "^1.0.0", - "collect-v8-coverage": "^1.0.0", - "execa": "^5.0.0", - "glob": "^7.1.3", - "graceful-fs": "^4.2.9", - "jest-haste-map": "^28.1.3", - "jest-message-util": "^28.1.3", - "jest-mock": "^28.1.3", - "jest-regex-util": "^28.0.2", - "jest-resolve": "^28.1.3", - "jest-snapshot": "^28.1.3", - "jest-util": "^28.1.3", - "slash": "^3.0.0", - "strip-bom": "^4.0.0" + "diff-sequences": "^29.6.3", + "jest-get-type": "^29.6.3", + "pretty-format": "^29.7.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/jest-runtime/node_modules/ansi-styles": { + "node_modules/jest-diff/node_modules/ansi-styles": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", @@ -11906,17 +11486,7 @@ "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, - "node_modules/jest-runtime/node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/jest-runtime/node_modules/chalk": { + "node_modules/jest-diff/node_modules/chalk": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", @@ -11932,7 +11502,7 @@ "url": "https://github.com/chalk/chalk?sponsor=1" } }, - "node_modules/jest-runtime/node_modules/color-convert": { + "node_modules/jest-diff/node_modules/color-convert": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", @@ -11944,33 +11514,13 @@ "node": ">=7.0.0" } }, - "node_modules/jest-runtime/node_modules/color-name": { + "node_modules/jest-diff/node_modules/color-name": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, - "node_modules/jest-runtime/node_modules/glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "dev": true, - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/jest-runtime/node_modules/has-flag": { + "node_modules/jest-diff/node_modules/has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", @@ -11979,74 +11529,47 @@ "node": ">=8" } }, - "node_modules/jest-runtime/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "node_modules/jest-diff/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", "dev": true, "dependencies": { - "brace-expansion": "^1.1.7" + "has-flag": "^4.0.0" }, - "engines": { - "node": "*" - } - }, - "node_modules/jest-runtime/node_modules/slash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", - "dev": true, "engines": { "node": ">=8" } }, - "node_modules/jest-runtime/node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "node_modules/jest-docblock": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-29.7.0.tgz", + "integrity": "sha512-q617Auw3A612guyaFgsbFeYpNP5t2aoUNLwBUbc/0kD1R4t9ixDbyFTHd1nok4epoVFpr7PmeWHrhvuV3XaJ4g==", "dev": true, "dependencies": { - "has-flag": "^4.0.0" + "detect-newline": "^3.0.0" }, "engines": { - "node": ">=8" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/jest-snapshot": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-28.1.3.tgz", - "integrity": "sha512-4lzMgtiNlc3DU/8lZfmqxN3AYD6GGLbl+72rdBpXvcV+whX7mDrREzkPdp2RnmfIiWBg1YbuFSkXduF2JcafJg==", + "node_modules/jest-each": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.7.0.tgz", + "integrity": "sha512-gns+Er14+ZrEoC5fhOfYCY1LOHHr0TI+rQUHZS8Ttw2l7gl+80eHc/gFf2Ktkw0+SIACDTeWvpFcv3B04VembQ==", "dev": true, "dependencies": { - "@babel/core": "^7.11.6", - "@babel/generator": "^7.7.2", - "@babel/plugin-syntax-typescript": "^7.7.2", - "@babel/traverse": "^7.7.2", - "@babel/types": "^7.3.3", - "@jest/expect-utils": "^28.1.3", - "@jest/transform": "^28.1.3", - "@jest/types": "^28.1.3", - "@types/babel__traverse": "^7.0.6", - "@types/prettier": "^2.1.5", - "babel-preset-current-node-syntax": "^1.0.0", + "@jest/types": "^29.6.3", "chalk": "^4.0.0", - "expect": "^28.1.3", - "graceful-fs": "^4.2.9", - "jest-diff": "^28.1.3", - "jest-get-type": "^28.0.2", - "jest-haste-map": "^28.1.3", - "jest-matcher-utils": "^28.1.3", - "jest-message-util": "^28.1.3", - "jest-util": "^28.1.3", - "natural-compare": "^1.4.0", - "pretty-format": "^28.1.3", - "semver": "^7.3.5" + "jest-get-type": "^29.6.3", + "jest-util": "^29.7.0", + "pretty-format": "^29.7.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/jest-snapshot/node_modules/ansi-styles": { + "node_modules/jest-each/node_modules/ansi-styles": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", @@ -12061,7 +11584,7 @@ "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, - "node_modules/jest-snapshot/node_modules/chalk": { + "node_modules/jest-each/node_modules/chalk": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", @@ -12077,7 +11600,7 @@ "url": "https://github.com/chalk/chalk?sponsor=1" } }, - "node_modules/jest-snapshot/node_modules/color-convert": { + "node_modules/jest-each/node_modules/color-convert": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", @@ -12089,13 +11612,13 @@ "node": ">=7.0.0" } }, - "node_modules/jest-snapshot/node_modules/color-name": { + "node_modules/jest-each/node_modules/color-name": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, - "node_modules/jest-snapshot/node_modules/has-flag": { + "node_modules/jest-each/node_modules/has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", @@ -12104,7 +11627,7 @@ "node": ">=8" } }, - "node_modules/jest-snapshot/node_modules/supports-color": { + "node_modules/jest-each/node_modules/supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", @@ -12116,684 +11639,640 @@ "node": ">=8" } }, - "node_modules/jest-util": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-28.1.3.tgz", - "integrity": "sha512-XdqfpHwpcSRko/C35uLYFM2emRAltIIKZiJ9eAmhjsj0CqZMa0p1ib0R5fWIqGhn1a103DebTbpqIaP1qCQ6tQ==", + "node_modules/jest-environment-jsdom": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-29.7.0.tgz", + "integrity": "sha512-k9iQbsf9OyOfdzWH8HDmrRT0gSIcX+FLNW7IQq94tFX0gynPwqDTW0Ho6iMVNjGz/nb+l/vW3dWM2bbLLpkbXA==", "dev": true, "dependencies": { - "@jest/types": "^28.1.3", + "@jest/environment": "^29.7.0", + "@jest/fake-timers": "^29.7.0", + "@jest/types": "^29.6.3", + "@types/jsdom": "^20.0.0", "@types/node": "*", - "chalk": "^4.0.0", - "ci-info": "^3.2.0", - "graceful-fs": "^4.2.9", - "picomatch": "^2.2.3" + "jest-mock": "^29.7.0", + "jest-util": "^29.7.0", + "jsdom": "^20.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + }, + "peerDependencies": { + "canvas": "^2.5.0" + }, + "peerDependenciesMeta": { + "canvas": { + "optional": true + } } }, - "node_modules/jest-util/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "node_modules/jest-environment-jsdom/node_modules/@tootallnate/once": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz", + "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==", "dev": true, - "dependencies": { - "color-convert": "^2.0.1" - }, "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" + "node": ">= 10" } }, - "node_modules/jest-util/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "node_modules/jest-environment-jsdom/node_modules/acorn-globals": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-7.0.1.tgz", + "integrity": "sha512-umOSDSDrfHbTNPuNpC2NSnnA3LUrqpevPb4T9jRx4MagXNS0rs+gwiTcAvqCRmsD6utzsrzNt+ebm00SNWiC3Q==", "dev": true, "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, + "acorn": "^8.1.0", + "acorn-walk": "^8.0.2" + } + }, + "node_modules/jest-environment-jsdom/node_modules/acorn-walk": { + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.0.tgz", + "integrity": "sha512-FS7hV565M5l1R08MXqo8odwMTB02C2UqzB17RVgu9EyuYFBqJZ3/ZY97sQD5FewVu1UyDFc1yztUDrAwT0EypA==", + "dev": true, "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" + "node": ">=0.4.0" } }, - "node_modules/jest-util/node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "node_modules/jest-environment-jsdom/node_modules/cssom": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.5.0.tgz", + "integrity": "sha512-iKuQcq+NdHqlAcwUY0o/HL69XQrUaQdMjmStJ8JFmUaiiQErlhrmuigkg/CU4E2J0IyUKUrMAgl36TvN67MqTw==", + "dev": true + }, + "node_modules/jest-environment-jsdom/node_modules/data-urls": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-3.0.2.tgz", + "integrity": "sha512-Jy/tj3ldjZJo63sVAvg6LHt2mHvl4V6AgRAmNDtLdm7faqtsx+aJG42rsyCo9JCoRVKwPFzKlIPx3DIibwSIaQ==", "dev": true, "dependencies": { - "color-name": "~1.1.4" + "abab": "^2.0.6", + "whatwg-mimetype": "^3.0.0", + "whatwg-url": "^11.0.0" }, "engines": { - "node": ">=7.0.0" + "node": ">=12" } }, - "node_modules/jest-util/node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "node_modules/jest-util/node_modules/has-flag": { + "node_modules/jest-environment-jsdom/node_modules/domexception": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "resolved": "https://registry.npmjs.org/domexception/-/domexception-4.0.0.tgz", + "integrity": "sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==", "dev": true, + "dependencies": { + "webidl-conversions": "^7.0.0" + }, "engines": { - "node": ">=8" + "node": ">=12" } }, - "node_modules/jest-util/node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "node_modules/jest-environment-jsdom/node_modules/form-data": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", + "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", "dev": true, "dependencies": { - "has-flag": "^4.0.0" + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" }, "engines": { - "node": ">=8" + "node": ">= 6" } }, - "node_modules/jest-validate": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-28.1.3.tgz", - "integrity": "sha512-SZbOGBWEsaTxBGCOpsRWlXlvNkvTkY0XxRfh7zYmvd8uL5Qzyg0CHAXiXKROflh801quA6+/DsT4ODDthOC/OA==", + "node_modules/jest-environment-jsdom/node_modules/html-encoding-sniffer": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz", + "integrity": "sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==", "dev": true, "dependencies": { - "@jest/types": "^28.1.3", - "camelcase": "^6.2.0", - "chalk": "^4.0.0", - "jest-get-type": "^28.0.2", - "leven": "^3.1.0", - "pretty-format": "^28.1.3" + "whatwg-encoding": "^2.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": ">=12" } }, - "node_modules/jest-validate/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "node_modules/jest-environment-jsdom/node_modules/http-proxy-agent": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz", + "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==", "dev": true, "dependencies": { - "color-convert": "^2.0.1" + "@tootallnate/once": "2", + "agent-base": "6", + "debug": "4" }, "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" + "node": ">= 6" } }, - "node_modules/jest-validate/node_modules/camelcase": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz", - "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==", + "node_modules/jest-environment-jsdom/node_modules/iconv-lite": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", + "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", "dev": true, - "engines": { - "node": ">=10" + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3.0.0" }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "engines": { + "node": ">=0.10.0" } }, - "node_modules/jest-validate/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "node_modules/jest-environment-jsdom/node_modules/jsdom": { + "version": "20.0.3", + "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-20.0.3.tgz", + "integrity": "sha512-SYhBvTh89tTfCD/CRdSOm13mOBa42iTaTyfyEWBdKcGdPxPtLFBXuHR8XHb33YNYaP+lLbmSvBTsnoesCNJEsQ==", "dev": true, "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" + "abab": "^2.0.6", + "acorn": "^8.8.1", + "acorn-globals": "^7.0.0", + "cssom": "^0.5.0", + "cssstyle": "^2.3.0", + "data-urls": "^3.0.2", + "decimal.js": "^10.4.2", + "domexception": "^4.0.0", + "escodegen": "^2.0.0", + "form-data": "^4.0.0", + "html-encoding-sniffer": "^3.0.0", + "http-proxy-agent": "^5.0.0", + "https-proxy-agent": "^5.0.1", + "is-potential-custom-element-name": "^1.0.1", + "nwsapi": "^2.2.2", + "parse5": "^7.1.1", + "saxes": "^6.0.0", + "symbol-tree": "^3.2.4", + "tough-cookie": "^4.1.2", + "w3c-xmlserializer": "^4.0.0", + "webidl-conversions": "^7.0.0", + "whatwg-encoding": "^2.0.0", + "whatwg-mimetype": "^3.0.0", + "whatwg-url": "^11.0.0", + "ws": "^8.11.0", + "xml-name-validator": "^4.0.0" }, "engines": { - "node": ">=10" + "node": ">=14" }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" + "peerDependencies": { + "canvas": "^2.5.0" + }, + "peerDependenciesMeta": { + "canvas": { + "optional": true + } } }, - "node_modules/jest-validate/node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "node_modules/jest-environment-jsdom/node_modules/saxes": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/saxes/-/saxes-6.0.0.tgz", + "integrity": "sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==", "dev": true, "dependencies": { - "color-name": "~1.1.4" + "xmlchars": "^2.2.0" }, "engines": { - "node": ">=7.0.0" + "node": ">=v12.22.7" } }, - "node_modules/jest-validate/node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "node_modules/jest-validate/node_modules/has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "node_modules/jest-environment-jsdom/node_modules/tr46": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-3.0.0.tgz", + "integrity": "sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==", "dev": true, + "dependencies": { + "punycode": "^2.1.1" + }, "engines": { - "node": ">=8" + "node": ">=12" } }, - "node_modules/jest-validate/node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "node_modules/jest-environment-jsdom/node_modules/w3c-xmlserializer": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-4.0.0.tgz", + "integrity": "sha512-d+BFHzbiCx6zGfz0HyQ6Rg69w9k19nviJspaj4yNscGjrHu94sVP+aRm75yEbCh+r2/yR+7q6hux9LVtbuTGBw==", "dev": true, "dependencies": { - "has-flag": "^4.0.0" + "xml-name-validator": "^4.0.0" }, "engines": { - "node": ">=8" + "node": ">=14" } }, - "node_modules/jest-watcher": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-28.1.3.tgz", - "integrity": "sha512-t4qcqj9hze+jviFPUN3YAtAEeFnr/azITXQEMARf5cMwKY2SMBRnCQTXLixTl20OR6mLh9KLMrgVJgJISym+1g==", + "node_modules/jest-environment-jsdom/node_modules/webidl-conversions": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz", + "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==", "dev": true, - "dependencies": { - "@jest/test-result": "^28.1.3", - "@jest/types": "^28.1.3", - "@types/node": "*", - "ansi-escapes": "^4.2.1", - "chalk": "^4.0.0", - "emittery": "^0.10.2", - "jest-util": "^28.1.3", - "string-length": "^4.0.1" - }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": ">=12" } }, - "node_modules/jest-watcher/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "node_modules/jest-environment-jsdom/node_modules/whatwg-encoding": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz", + "integrity": "sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==", "dev": true, "dependencies": { - "color-convert": "^2.0.1" + "iconv-lite": "0.6.3" }, "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" + "node": ">=12" } }, - "node_modules/jest-watcher/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "node_modules/jest-environment-jsdom/node_modules/whatwg-mimetype": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz", + "integrity": "sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==", "dev": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" + "node": ">=12" } }, - "node_modules/jest-watcher/node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "node_modules/jest-environment-jsdom/node_modules/whatwg-url": { + "version": "11.0.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-11.0.0.tgz", + "integrity": "sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ==", "dev": true, "dependencies": { - "color-name": "~1.1.4" + "tr46": "^3.0.0", + "webidl-conversions": "^7.0.0" }, "engines": { - "node": ">=7.0.0" + "node": ">=12" } }, - "node_modules/jest-watcher/node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "node_modules/jest-watcher/node_modules/has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "node_modules/jest-environment-jsdom/node_modules/ws": { + "version": "8.14.2", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.14.2.tgz", + "integrity": "sha512-wEBG1ftX4jcglPxgFCMJmZ2PLtSbJ2Peg6TmpJFTbe9GZYOQCDPdMYu/Tm0/bGZkw8paZnJY45J4K2PZrLYq8g==", "dev": true, "engines": { - "node": ">=8" + "node": ">=10.0.0" + }, + "peerDependencies": { + "bufferutil": "^4.0.1", + "utf-8-validate": ">=5.0.2" + }, + "peerDependenciesMeta": { + "bufferutil": { + "optional": true + }, + "utf-8-validate": { + "optional": true + } } }, - "node_modules/jest-watcher/node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "node_modules/jest-environment-jsdom/node_modules/xml-name-validator": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz", + "integrity": "sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==", "dev": true, - "dependencies": { - "has-flag": "^4.0.0" - }, "engines": { - "node": ">=8" + "node": ">=12" } }, - "node_modules/jest-worker": { - "version": "27.5.1", - "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz", - "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==", + "node_modules/jest-environment-node": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.7.0.tgz", + "integrity": "sha512-DOSwCRqXirTOyheM+4d5YZOrWcdu0LNZ87ewUoywbcb2XR4wKgqiG8vNeYwhjFMbEkfju7wx2GYH0P2gevGvFw==", "dev": true, "dependencies": { + "@jest/environment": "^29.7.0", + "@jest/fake-timers": "^29.7.0", + "@jest/types": "^29.6.3", "@types/node": "*", - "merge-stream": "^2.0.0", - "supports-color": "^8.0.0" + "jest-mock": "^29.7.0", + "jest-util": "^29.7.0" }, "engines": { - "node": ">= 10.13.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/jest-worker/node_modules/has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "node_modules/jest-get-type": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz", + "integrity": "sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==", "dev": true, "engines": { - "node": ">=8" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/jest-worker/node_modules/supports-color": { - "version": "8.1.1", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", - "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", + "node_modules/jest-haste-map": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.7.0.tgz", + "integrity": "sha512-fP8u2pyfqx0K1rGn1R9pyE0/KTn+G7PxktWidOBTqFPLYX0b9ksaMFkhK5vrS3DVun09pckLdlx90QthlW7AmA==", "dev": true, "dependencies": { - "has-flag": "^4.0.0" + "@jest/types": "^29.6.3", + "@types/graceful-fs": "^4.1.3", + "@types/node": "*", + "anymatch": "^3.0.3", + "fb-watchman": "^2.0.0", + "graceful-fs": "^4.2.9", + "jest-regex-util": "^29.6.3", + "jest-util": "^29.7.0", + "jest-worker": "^29.7.0", + "micromatch": "^4.0.4", + "walker": "^1.0.8" }, "engines": { - "node": ">=10" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" }, - "funding": { - "url": "https://github.com/chalk/supports-color?sponsor=1" + "optionalDependencies": { + "fsevents": "^2.3.2" } }, - "node_modules/js-sdsl": { - "version": "4.1.4", - "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.1.4.tgz", - "integrity": "sha512-Y2/yD55y5jteOAmY50JbUZYwk3CP3wnLPEZnlR1w9oKhITrBEtAxwuWKebFf8hMrPMgbYwFoWK/lH2sBkErELw==", - "dev": true - }, - "node_modules/js-tokens": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", - "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", - "dev": true - }, - "node_modules/js-yaml": { - "version": "3.14.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", - "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", + "node_modules/jest-leak-detector": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.7.0.tgz", + "integrity": "sha512-kYA8IJcSYtST2BY9I+SMC32nDpBT3J2NvWJx8+JCuCdl/CR1I4EKUJROiP8XtCcxqgTTBGJNdbB1A8XRKbTetw==", "dev": true, "dependencies": { - "argparse": "^1.0.7", - "esprima": "^4.0.0" + "jest-get-type": "^29.6.3", + "pretty-format": "^29.7.0" }, - "bin": { - "js-yaml": "bin/js-yaml.js" + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/jsdom": { - "version": "19.0.0", - "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-19.0.0.tgz", - "integrity": "sha512-RYAyjCbxy/vri/CfnjUWJQQtZ3LKlLnDqj+9XLNnJPgEGeirZs3hllKR20re8LUZ6o1b1X4Jat+Qd26zmP41+A==", + "node_modules/jest-matcher-utils": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.7.0.tgz", + "integrity": "sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==", "dev": true, "dependencies": { - "abab": "^2.0.5", - "acorn": "^8.5.0", - "acorn-globals": "^6.0.0", - "cssom": "^0.5.0", - "cssstyle": "^2.3.0", - "data-urls": "^3.0.1", - "decimal.js": "^10.3.1", - "domexception": "^4.0.0", - "escodegen": "^2.0.0", - "form-data": "^4.0.0", - "html-encoding-sniffer": "^3.0.0", - "http-proxy-agent": "^5.0.0", - "https-proxy-agent": "^5.0.0", - "is-potential-custom-element-name": "^1.0.1", - "nwsapi": "^2.2.0", - "parse5": "6.0.1", - "saxes": "^5.0.1", - "symbol-tree": "^3.2.4", - "tough-cookie": "^4.0.0", - "w3c-hr-time": "^1.0.2", - "w3c-xmlserializer": "^3.0.0", - "webidl-conversions": "^7.0.0", - "whatwg-encoding": "^2.0.0", - "whatwg-mimetype": "^3.0.0", - "whatwg-url": "^10.0.0", - "ws": "^8.2.3", - "xml-name-validator": "^4.0.0" + "chalk": "^4.0.0", + "jest-diff": "^29.7.0", + "jest-get-type": "^29.6.3", + "pretty-format": "^29.7.0" }, "engines": { - "node": ">=12" - }, - "peerDependencies": { - "canvas": "^2.5.0" - }, - "peerDependenciesMeta": { - "canvas": { - "optional": true - } + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/jsesc": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", - "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", + "node_modules/jest-matcher-utils/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "dev": true, - "bin": { - "jsesc": "bin/jsesc" + "dependencies": { + "color-convert": "^2.0.1" }, "engines": { - "node": ">=4" + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, - "node_modules/json-parse-even-better-errors": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", - "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", - "dev": true - }, - "node_modules/json-schema-traverse": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", - "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", - "dev": true - }, - "node_modules/json-stable-stringify-without-jsonify": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", - "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==", - "dev": true - }, - "node_modules/json5": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", - "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", + "node_modules/jest-matcher-utils/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", "dev": true, - "bin": { - "json5": "lib/cli.js" + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" }, "engines": { - "node": ">=6" + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" } }, - "node_modules/jsonc-parser": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz", - "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==", - "dev": true - }, - "node_modules/jsonparse": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz", - "integrity": "sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==", - "dev": true, - "engines": [ - "node >= 0.2.0" - ] - }, - "node_modules/jwt-decode": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/jwt-decode/-/jwt-decode-3.1.2.tgz", - "integrity": "sha512-UfpWE/VZn0iP50d8cz9NrZLM9lSWhcJ+0Gt/nm4by88UL+J1SiKN8/5dkjMmbEzwL2CAe+67GsegCbIKtbp75A==" - }, - "node_modules/karma-source-map-support": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/karma-source-map-support/-/karma-source-map-support-1.4.0.tgz", - "integrity": "sha512-RsBECncGO17KAoJCYXjv+ckIz+Ii9NCi+9enk+rq6XC81ezYkb4/RHE6CTXdA7IOJqoF3wcaLfVG0CPmE5ca6A==", + "node_modules/jest-matcher-utils/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", "dev": true, "dependencies": { - "source-map-support": "^0.5.5" + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" } }, - "node_modules/kind-of": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", - "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", + "node_modules/jest-matcher-utils/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "node_modules/jest-matcher-utils/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true, "engines": { - "node": ">=0.10.0" + "node": ">=8" } }, - "node_modules/kleur": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz", - "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==", + "node_modules/jest-matcher-utils/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, "engines": { - "node": ">=6" + "node": ">=8" } }, - "node_modules/klona": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.6.tgz", - "integrity": "sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA==", + "node_modules/jest-message-util": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.7.0.tgz", + "integrity": "sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==", "dev": true, + "dependencies": { + "@babel/code-frame": "^7.12.13", + "@jest/types": "^29.6.3", + "@types/stack-utils": "^2.0.0", + "chalk": "^4.0.0", + "graceful-fs": "^4.2.9", + "micromatch": "^4.0.4", + "pretty-format": "^29.7.0", + "slash": "^3.0.0", + "stack-utils": "^2.0.3" + }, "engines": { - "node": ">= 8" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/less": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/less/-/less-4.1.3.tgz", - "integrity": "sha512-w16Xk/Ta9Hhyei0Gpz9m7VS8F28nieJaL/VyShID7cYvP6IL5oHeL6p4TXSDJqZE/lNv0oJ2pGVjJsRkfwm5FA==", + "node_modules/jest-message-util/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "dev": true, "dependencies": { - "copy-anything": "^2.0.1", - "parse-node-version": "^1.0.1", - "tslib": "^2.3.0" - }, - "bin": { - "lessc": "bin/lessc" + "color-convert": "^2.0.1" }, "engines": { - "node": ">=6" + "node": ">=8" }, - "optionalDependencies": { - "errno": "^0.1.1", - "graceful-fs": "^4.1.2", - "image-size": "~0.5.0", - "make-dir": "^2.1.0", - "mime": "^1.4.1", - "needle": "^3.1.0", - "source-map": "~0.6.0" + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, - "node_modules/less-loader": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/less-loader/-/less-loader-11.1.0.tgz", - "integrity": "sha512-C+uDBV7kS7W5fJlUjq5mPBeBVhYpTIm5gB09APT9o3n/ILeaXVsiSFTbZpTJCJwQ/Crczfn3DmfQFwxYusWFug==", + "node_modules/jest-message-util/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", "dev": true, "dependencies": { - "klona": "^2.0.4" + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" }, "engines": { - "node": ">= 14.15.0" + "node": ">=10" }, "funding": { - "type": "opencollective", - "url": "https://opencollective.com/webpack" - }, - "peerDependencies": { - "less": "^3.5.0 || ^4.0.0", - "webpack": "^5.0.0" + "url": "https://github.com/chalk/chalk?sponsor=1" } }, - "node_modules/less/node_modules/make-dir": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz", - "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==", + "node_modules/jest-message-util/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", "dev": true, - "optional": true, "dependencies": { - "pify": "^4.0.1", - "semver": "^5.6.0" + "color-name": "~1.1.4" }, "engines": { - "node": ">=6" + "node": ">=7.0.0" } }, - "node_modules/less/node_modules/semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", - "dev": true, - "optional": true, - "bin": { - "semver": "bin/semver" - } + "node_modules/jest-message-util/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true }, - "node_modules/less/node_modules/source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "node_modules/jest-message-util/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true, - "optional": true, "engines": { - "node": ">=0.10.0" + "node": ">=8" } }, - "node_modules/leven": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz", - "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==", + "node_modules/jest-message-util/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, "engines": { - "node": ">=6" + "node": ">=8" } }, - "node_modules/levn": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", - "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", + "node_modules/jest-mock": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.7.0.tgz", + "integrity": "sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw==", "dev": true, "dependencies": { - "prelude-ls": "^1.2.1", - "type-check": "~0.4.0" + "@jest/types": "^29.6.3", + "@types/node": "*", + "jest-util": "^29.7.0" }, "engines": { - "node": ">= 0.8.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/license-webpack-plugin": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/license-webpack-plugin/-/license-webpack-plugin-4.0.2.tgz", - "integrity": "sha512-771TFWFD70G1wLTC4oU2Cw4qvtmNrIw+wRvBtn+okgHl7slJVi7zfNcdmqDL72BojM30VNJ2UHylr1o77U37Jw==", + "node_modules/jest-pnp-resolver": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz", + "integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==", "dev": true, - "dependencies": { - "webpack-sources": "^3.0.0" + "engines": { + "node": ">=6" + }, + "peerDependencies": { + "jest-resolve": "*" }, "peerDependenciesMeta": { - "webpack": { - "optional": true - }, - "webpack-sources": { + "jest-resolve": { "optional": true } } }, - "node_modules/lines-and-columns": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", - "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==", - "dev": true - }, - "node_modules/loader-runner": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz", - "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==", + "node_modules/jest-preset-angular": { + "version": "13.1.1", + "resolved": "https://registry.npmjs.org/jest-preset-angular/-/jest-preset-angular-13.1.1.tgz", + "integrity": "sha512-X8i7icKt9U5uhj7YKqdEZm7ZZPvNFRxfBnU+9SALdIkHYJhwtlJ5/MUk9wo4f3lX2smOkIl9LPJUu1APO+11Jg==", "dev": true, + "dependencies": { + "bs-logger": "^0.2.6", + "esbuild-wasm": ">=0.13.8", + "jest-environment-jsdom": "^29.0.0", + "jest-util": "^29.0.0", + "pretty-format": "^29.0.0", + "ts-jest": "^29.0.0" + }, "engines": { - "node": ">=6.11.5" + "node": "^14.15.0 || >=16.10.0" + }, + "optionalDependencies": { + "esbuild": ">=0.13.8" + }, + "peerDependencies": { + "@angular-devkit/build-angular": ">=13.0.0 <17.0.0", + "@angular/compiler-cli": ">=13.0.0 <17.0.0", + "@angular/core": ">=13.0.0 <17.0.0", + "@angular/platform-browser-dynamic": ">=13.0.0 <17.0.0", + "jest": "^29.0.0", + "typescript": ">=4.4" } }, - "node_modules/loader-utils": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-3.2.1.tgz", - "integrity": "sha512-ZvFw1KWS3GVyYBYb7qkmRM/WwL2TQQBxgCK62rlvm4WpVQ23Nb4tYjApUlfjrEGvOs7KHEsmyUn75OHZrJMWPw==", + "node_modules/jest-regex-util": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.6.3.tgz", + "integrity": "sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==", "dev": true, "engines": { - "node": ">= 12.13.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/locate-path": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", - "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "node_modules/jest-resolve": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.7.0.tgz", + "integrity": "sha512-IOVhZSrg+UvVAshDSDtHyFCCBUl/Q3AAJv8iZ6ZjnZ74xzvwuzLXid9IIIPgTnY62SJjfuupMKZsZQRsCvxEgA==", "dev": true, "dependencies": { - "p-locate": "^4.1.0" + "chalk": "^4.0.0", + "graceful-fs": "^4.2.9", + "jest-haste-map": "^29.7.0", + "jest-pnp-resolver": "^1.2.2", + "jest-util": "^29.7.0", + "jest-validate": "^29.7.0", + "resolve": "^1.20.0", + "resolve.exports": "^2.0.0", + "slash": "^3.0.0" }, "engines": { - "node": ">=8" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/lodash": { - "version": "4.17.21", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", - "dev": true - }, - "node_modules/lodash.debounce": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz", - "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==", - "dev": true - }, - "node_modules/lodash.memoize": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz", - "integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==", - "dev": true - }, - "node_modules/lodash.merge": { - "version": "4.6.2", - "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", - "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", - "dev": true - }, - "node_modules/log-symbols": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz", - "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==", + "node_modules/jest-resolve-dependencies": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.7.0.tgz", + "integrity": "sha512-un0zD/6qxJ+S0et7WxeI3H5XSe9lTBBR7bOHCHXkKR6luG5mwDDlIzVQ0V5cZCuoTgEdcdwzTghYkTWfubi+nA==", "dev": true, "dependencies": { - "chalk": "^4.1.0", - "is-unicode-supported": "^0.1.0" + "jest-regex-util": "^29.6.3", + "jest-snapshot": "^29.7.0" }, "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/log-symbols/node_modules/ansi-styles": { + "node_modules/jest-resolve/node_modules/ansi-styles": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", @@ -12808,7 +12287,7 @@ "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, - "node_modules/log-symbols/node_modules/chalk": { + "node_modules/jest-resolve/node_modules/chalk": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", @@ -12824,7 +12303,7 @@ "url": "https://github.com/chalk/chalk?sponsor=1" } }, - "node_modules/log-symbols/node_modules/color-convert": { + "node_modules/jest-resolve/node_modules/color-convert": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", @@ -12836,13 +12315,13 @@ "node": ">=7.0.0" } }, - "node_modules/log-symbols/node_modules/color-name": { + "node_modules/jest-resolve/node_modules/color-name": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, - "node_modules/log-symbols/node_modules/has-flag": { + "node_modules/jest-resolve/node_modules/has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", @@ -12851,7 +12330,7 @@ "node": ">=8" } }, - "node_modules/log-symbols/node_modules/supports-color": { + "node_modules/jest-resolve/node_modules/supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", @@ -12863,3964 +12342,4035 @@ "node": ">=8" } }, - "node_modules/lru-cache": { - "version": "7.14.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.14.1.tgz", - "integrity": "sha512-ysxwsnTKdAx96aTRdhDOCQfDgbHnt8SK0KY8SEjO0wHinhWOFTESbjVCMPbU1uGXg/ch4lifqx0wfjOawU2+WA==", + "node_modules/jest-runner": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.7.0.tgz", + "integrity": "sha512-fsc4N6cPCAahybGBfTRcq5wFR6fpLznMg47sY5aDpsoejOcVYFb07AHuSnR0liMcPTgBsA3ZJL6kFOjPdoNipQ==", "dev": true, + "dependencies": { + "@jest/console": "^29.7.0", + "@jest/environment": "^29.7.0", + "@jest/test-result": "^29.7.0", + "@jest/transform": "^29.7.0", + "@jest/types": "^29.6.3", + "@types/node": "*", + "chalk": "^4.0.0", + "emittery": "^0.13.1", + "graceful-fs": "^4.2.9", + "jest-docblock": "^29.7.0", + "jest-environment-node": "^29.7.0", + "jest-haste-map": "^29.7.0", + "jest-leak-detector": "^29.7.0", + "jest-message-util": "^29.7.0", + "jest-resolve": "^29.7.0", + "jest-runtime": "^29.7.0", + "jest-util": "^29.7.0", + "jest-watcher": "^29.7.0", + "jest-worker": "^29.7.0", + "p-limit": "^3.1.0", + "source-map-support": "0.5.13" + }, "engines": { - "node": ">=12" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/magic-string": { - "version": "0.27.0", - "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.27.0.tgz", - "integrity": "sha512-8UnnX2PeRAPZuN12svgR9j7M1uWMovg/CEnIwIG0LFkXSJJe4PdfUGiTGl8V9bsBHFUtfVINcSyYxd7q+kx9fA==", + "node_modules/jest-runner/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "dev": true, "dependencies": { - "@jridgewell/sourcemap-codec": "^1.4.13" + "color-convert": "^2.0.1" }, "engines": { - "node": ">=12" + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, - "node_modules/make-dir": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", - "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", + "node_modules/jest-runner/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", "dev": true, "dependencies": { - "semver": "^6.0.0" + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" }, "engines": { - "node": ">=8" + "node": ">=10" }, "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "url": "https://github.com/chalk/chalk?sponsor=1" } }, - "node_modules/make-dir/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "node_modules/jest-runner/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", "dev": true, - "bin": { - "semver": "bin/semver.js" + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" } }, - "node_modules/make-error": { - "version": "1.3.6", - "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz", - "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==", + "node_modules/jest-runner/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, - "node_modules/make-fetch-happen": { - "version": "10.2.1", - "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-10.2.1.tgz", - "integrity": "sha512-NgOPbRiaQM10DYXvN3/hhGVI2M5MtITFryzBGxHM5p4wnFxsVCbxkrBrDsk+EZ5OB4jEOT7AjDxtdF+KVEFT7w==", + "node_modules/jest-runner/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true, - "dependencies": { - "agentkeepalive": "^4.2.1", - "cacache": "^16.1.0", - "http-cache-semantics": "^4.1.0", - "http-proxy-agent": "^5.0.0", - "https-proxy-agent": "^5.0.0", - "is-lambda": "^1.0.1", - "lru-cache": "^7.7.1", - "minipass": "^3.1.6", - "minipass-collect": "^1.0.2", - "minipass-fetch": "^2.0.3", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.4", - "negotiator": "^0.6.3", - "promise-retry": "^2.0.1", - "socks-proxy-agent": "^7.0.0", - "ssri": "^9.0.0" - }, "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + "node": ">=8" } }, - "node_modules/make-fetch-happen/node_modules/@npmcli/fs": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-2.1.2.tgz", - "integrity": "sha512-yOJKRvohFOaLqipNtwYB9WugyZKhC/DZC4VYPmpaCzDBrA8YpK3qHZ8/HGscMnE4GqbkLNuVcCnxkeQEdGt6LQ==", + "node_modules/jest-runner/node_modules/source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", "dev": true, - "dependencies": { - "@gar/promisify": "^1.1.3", - "semver": "^7.3.5" - }, "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + "node": ">=0.10.0" } }, - "node_modules/make-fetch-happen/node_modules/cacache": { - "version": "16.1.3", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-16.1.3.tgz", - "integrity": "sha512-/+Emcj9DAXxX4cwlLmRI9c166RuL3w30zp4R7Joiv2cQTtTtA+jeuCAjH3ZlGnYS3tKENSrKhAzVVP9GVyzeYQ==", + "node_modules/jest-runner/node_modules/source-map-support": { + "version": "0.5.13", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz", + "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==", "dev": true, "dependencies": { - "@npmcli/fs": "^2.1.0", - "@npmcli/move-file": "^2.0.0", - "chownr": "^2.0.0", - "fs-minipass": "^2.1.0", - "glob": "^8.0.1", - "infer-owner": "^1.0.4", - "lru-cache": "^7.7.1", - "minipass": "^3.1.6", - "minipass-collect": "^1.0.2", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.4", - "mkdirp": "^1.0.4", - "p-map": "^4.0.0", - "promise-inflight": "^1.0.1", - "rimraf": "^3.0.2", - "ssri": "^9.0.0", - "tar": "^6.1.11", - "unique-filename": "^2.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" } }, - "node_modules/make-fetch-happen/node_modules/fs-minipass": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", - "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", + "node_modules/jest-runner/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", "dev": true, "dependencies": { - "minipass": "^3.0.0" + "has-flag": "^4.0.0" }, "engines": { - "node": ">= 8" + "node": ">=8" } }, - "node_modules/make-fetch-happen/node_modules/minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", - "dev": true, - "dependencies": { - "yallist": "^4.0.0" + "node_modules/jest-runtime": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.7.0.tgz", + "integrity": "sha512-gUnLjgwdGqW7B4LvOIkbKs9WGbn+QLqRQQ9juC6HndeDiezIwhDP+mhMwHWCEcfQ5RUXa6OPnFF8BJh5xegwwQ==", + "dev": true, + "dependencies": { + "@jest/environment": "^29.7.0", + "@jest/fake-timers": "^29.7.0", + "@jest/globals": "^29.7.0", + "@jest/source-map": "^29.6.3", + "@jest/test-result": "^29.7.0", + "@jest/transform": "^29.7.0", + "@jest/types": "^29.6.3", + "@types/node": "*", + "chalk": "^4.0.0", + "cjs-module-lexer": "^1.0.0", + "collect-v8-coverage": "^1.0.0", + "glob": "^7.1.3", + "graceful-fs": "^4.2.9", + "jest-haste-map": "^29.7.0", + "jest-message-util": "^29.7.0", + "jest-mock": "^29.7.0", + "jest-regex-util": "^29.6.3", + "jest-resolve": "^29.7.0", + "jest-snapshot": "^29.7.0", + "jest-util": "^29.7.0", + "slash": "^3.0.0", + "strip-bom": "^4.0.0" }, "engines": { - "node": ">=8" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/make-fetch-happen/node_modules/ssri": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/ssri/-/ssri-9.0.1.tgz", - "integrity": "sha512-o57Wcn66jMQvfHG1FlYbWeZWW/dHZhJXjpIcTfXldXEk5nz5lStPo3mK0OJQfGR3RbZUlbISexbljkJzuEj/8Q==", + "node_modules/jest-runtime/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "dev": true, "dependencies": { - "minipass": "^3.1.1" + "color-convert": "^2.0.1" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, - "node_modules/make-fetch-happen/node_modules/unique-filename": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-2.0.1.tgz", - "integrity": "sha512-ODWHtkkdx3IAR+veKxFV+VBkUMcN+FaqzUUd7IZzt+0zhDZFPFxhlqwPF3YQvMHx1TD0tdgYl+kuPnJ8E6ql7A==", + "node_modules/jest-runtime/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", "dev": true, "dependencies": { - "unique-slug": "^3.0.0" + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" } }, - "node_modules/make-fetch-happen/node_modules/unique-slug": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-3.0.0.tgz", - "integrity": "sha512-8EyMynh679x/0gqE9fT9oilG+qEt+ibFyqjuVTsZn1+CMxH+XLlpvr2UZx4nVcCwTpx81nICr2JQFkM+HPLq4w==", + "node_modules/jest-runtime/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", "dev": true, "dependencies": { - "imurmurhash": "^0.1.4" + "color-name": "~1.1.4" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/makeerror": { - "version": "1.0.12", - "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz", - "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==", - "dev": true, - "dependencies": { - "tmpl": "1.0.5" + "node": ">=7.0.0" } }, - "node_modules/material-colors": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/material-colors/-/material-colors-1.2.6.tgz", - "integrity": "sha512-6qE4B9deFBIa9YSpOc9O0Sgc43zTeVYbgDT5veRKSlB2+ZuHNoVVxA1L/ckMUayV9Ay9y7Z/SZCLcGteW9i7bg==" + "node_modules/jest-runtime/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true }, - "node_modules/media-typer": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", - "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==", + "node_modules/jest-runtime/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true, "engines": { - "node": ">= 0.6" + "node": ">=8" } }, - "node_modules/memfs": { - "version": "3.4.13", - "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.4.13.tgz", - "integrity": "sha512-omTM41g3Skpvx5dSYeZIbXKcXoAVc/AoMNwn9TKx++L/gaen/+4TTttmu8ZSch5vfVJ8uJvGbroTsIlslRg6lg==", + "node_modules/jest-runtime/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", "dev": true, "dependencies": { - "fs-monkey": "^1.0.3" + "has-flag": "^4.0.0" }, "engines": { - "node": ">= 4.0.0" + "node": ">=8" } }, - "node_modules/merge-descriptors": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", - "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==", - "dev": true - }, - "node_modules/merge-stream": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", - "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", - "dev": true - }, - "node_modules/merge2": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", - "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", + "node_modules/jest-snapshot": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.7.0.tgz", + "integrity": "sha512-Rm0BMWtxBcioHr1/OX5YCP8Uov4riHvKPknOGs804Zg9JGZgmIBkbtlxJC/7Z4msKYVbIJtfU+tKb8xlYNfdkw==", "dev": true, + "dependencies": { + "@babel/core": "^7.11.6", + "@babel/generator": "^7.7.2", + "@babel/plugin-syntax-jsx": "^7.7.2", + "@babel/plugin-syntax-typescript": "^7.7.2", + "@babel/types": "^7.3.3", + "@jest/expect-utils": "^29.7.0", + "@jest/transform": "^29.7.0", + "@jest/types": "^29.6.3", + "babel-preset-current-node-syntax": "^1.0.0", + "chalk": "^4.0.0", + "expect": "^29.7.0", + "graceful-fs": "^4.2.9", + "jest-diff": "^29.7.0", + "jest-get-type": "^29.6.3", + "jest-matcher-utils": "^29.7.0", + "jest-message-util": "^29.7.0", + "jest-util": "^29.7.0", + "natural-compare": "^1.4.0", + "pretty-format": "^29.7.0", + "semver": "^7.5.3" + }, "engines": { - "node": ">= 8" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/methods": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", - "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==", + "node_modules/jest-snapshot/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "dev": true, + "dependencies": { + "color-convert": "^2.0.1" + }, "engines": { - "node": ">= 0.6" + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, - "node_modules/micromatch": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", - "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", + "node_modules/jest-snapshot/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", "dev": true, "dependencies": { - "braces": "^3.0.2", - "picomatch": "^2.3.1" + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" }, "engines": { - "node": ">=8.6" + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" } }, - "node_modules/mime": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", - "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", + "node_modules/jest-snapshot/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", "dev": true, - "bin": { - "mime": "cli.js" + "dependencies": { + "color-name": "~1.1.4" }, "engines": { - "node": ">=4" + "node": ">=7.0.0" } }, - "node_modules/mime-db": { - "version": "1.52.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", - "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", + "node_modules/jest-snapshot/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "node_modules/jest-snapshot/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true, "engines": { - "node": ">= 0.6" + "node": ">=8" } }, - "node_modules/mime-types": { - "version": "2.1.35", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", - "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", + "node_modules/jest-snapshot/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", "dev": true, "dependencies": { - "mime-db": "1.52.0" + "has-flag": "^4.0.0" }, "engines": { - "node": ">= 0.6" + "node": ">=8" } }, - "node_modules/mimic-fn": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", - "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", + "node_modules/jest-util": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz", + "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==", "dev": true, + "dependencies": { + "@jest/types": "^29.6.3", + "@types/node": "*", + "chalk": "^4.0.0", + "ci-info": "^3.2.0", + "graceful-fs": "^4.2.9", + "picomatch": "^2.2.3" + }, "engines": { - "node": ">=6" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/mini-css-extract-plugin": { - "version": "2.7.2", - "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.7.2.tgz", - "integrity": "sha512-EdlUizq13o0Pd+uCp+WO/JpkLvHRVGt97RqfeGhXqAcorYo1ypJSpkV+WDT0vY/kmh/p7wRdJNJtuyK540PXDw==", + "node_modules/jest-util/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "dev": true, "dependencies": { - "schema-utils": "^4.0.0" + "color-convert": "^2.0.1" }, "engines": { - "node": ">= 12.13.0" + "node": ">=8" }, "funding": { - "type": "opencollective", - "url": "https://opencollective.com/webpack" - }, - "peerDependencies": { - "webpack": "^5.0.0" + "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, - "node_modules/minimalistic-assert": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz", - "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==", - "dev": true - }, - "node_modules/minimatch": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.0.tgz", - "integrity": "sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==", + "node_modules/jest-util/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", "dev": true, "dependencies": { - "brace-expansion": "^2.0.1" + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" }, "engines": { "node": ">=10" - } - }, - "node_modules/minimist": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz", - "integrity": "sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==", - "dev": true, + }, "funding": { - "url": "https://github.com/sponsors/ljharb" + "url": "https://github.com/chalk/chalk?sponsor=1" } }, - "node_modules/minipass": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-4.0.0.tgz", - "integrity": "sha512-g2Uuh2jEKoht+zvO6vJqXmYpflPqzRBT+Th2h01DKh5z7wbY/AZ2gCQ78cP70YoHPyFdY30YBV5WxgLOEwOykw==", + "node_modules/jest-util/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", "dev": true, "dependencies": { - "yallist": "^4.0.0" + "color-name": "~1.1.4" }, "engines": { - "node": ">=8" + "node": ">=7.0.0" } }, - "node_modules/minipass-collect": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz", - "integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==", + "node_modules/jest-util/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "node_modules/jest-util/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true, - "dependencies": { - "minipass": "^3.0.0" - }, "engines": { - "node": ">= 8" + "node": ">=8" } }, - "node_modules/minipass-collect/node_modules/minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "node_modules/jest-util/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", "dev": true, "dependencies": { - "yallist": "^4.0.0" + "has-flag": "^4.0.0" }, "engines": { "node": ">=8" } }, - "node_modules/minipass-fetch": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-2.1.2.tgz", - "integrity": "sha512-LT49Zi2/WMROHYoqGgdlQIZh8mLPZmOrN2NdJjMXxYe4nkN6FUyuPuOAOedNJDrx0IRGg9+4guZewtp8hE6TxA==", + "node_modules/jest-validate": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.7.0.tgz", + "integrity": "sha512-ZB7wHqaRGVw/9hST/OuFUReG7M8vKeq0/J2egIGLdvjHCmYqGARhzXmtgi+gVeZ5uXFF219aOc3Ls2yLg27tkw==", "dev": true, "dependencies": { - "minipass": "^3.1.6", - "minipass-sized": "^1.0.3", - "minizlib": "^2.1.2" + "@jest/types": "^29.6.3", + "camelcase": "^6.2.0", + "chalk": "^4.0.0", + "jest-get-type": "^29.6.3", + "leven": "^3.1.0", + "pretty-format": "^29.7.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - }, - "optionalDependencies": { - "encoding": "^0.1.13" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/minipass-fetch/node_modules/minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "node_modules/jest-validate/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "dev": true, "dependencies": { - "yallist": "^4.0.0" + "color-convert": "^2.0.1" }, "engines": { "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, - "node_modules/minipass-flush": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz", - "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==", + "node_modules/jest-validate/node_modules/camelcase": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz", + "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==", "dev": true, - "dependencies": { - "minipass": "^3.0.0" - }, "engines": { - "node": ">= 8" + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/minipass-flush/node_modules/minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "node_modules/jest-validate/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", "dev": true, "dependencies": { - "yallist": "^4.0.0" + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" }, "engines": { - "node": ">=8" + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" } }, - "node_modules/minipass-json-stream": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/minipass-json-stream/-/minipass-json-stream-1.0.1.tgz", - "integrity": "sha512-ODqY18UZt/I8k+b7rl2AENgbWE8IDYam+undIJONvigAz8KR5GWblsFTEfQs0WODsjbSXWlm+JHEv8Gr6Tfdbg==", + "node_modules/jest-validate/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", "dev": true, "dependencies": { - "jsonparse": "^1.3.1", - "minipass": "^3.0.0" + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" } }, - "node_modules/minipass-json-stream/node_modules/minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "node_modules/jest-validate/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "node_modules/jest-validate/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true, - "dependencies": { - "yallist": "^4.0.0" - }, "engines": { "node": ">=8" } }, - "node_modules/minipass-pipeline": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz", - "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==", + "node_modules/jest-validate/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", "dev": true, "dependencies": { - "minipass": "^3.0.0" + "has-flag": "^4.0.0" }, "engines": { "node": ">=8" } }, - "node_modules/minipass-pipeline/node_modules/minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "node_modules/jest-watcher": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.7.0.tgz", + "integrity": "sha512-49Fg7WXkU3Vl2h6LbLtMQ/HyB6rXSIX7SqvBLQmssRBGN9I0PNvPmAmCWSOY6SOvrjhI/F7/bGAv9RtnsPA03g==", "dev": true, "dependencies": { - "yallist": "^4.0.0" + "@jest/test-result": "^29.7.0", + "@jest/types": "^29.6.3", + "@types/node": "*", + "ansi-escapes": "^4.2.1", + "chalk": "^4.0.0", + "emittery": "^0.13.1", + "jest-util": "^29.7.0", + "string-length": "^4.0.1" }, "engines": { - "node": ">=8" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/minipass-sized": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz", - "integrity": "sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==", + "node_modules/jest-watcher/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "dev": true, "dependencies": { - "minipass": "^3.0.0" + "color-convert": "^2.0.1" }, "engines": { "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, - "node_modules/minipass-sized/node_modules/minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "node_modules/jest-watcher/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", "dev": true, "dependencies": { - "yallist": "^4.0.0" + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" }, "engines": { - "node": ">=8" - } - }, - "node_modules/minizlib": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", - "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/jest-watcher/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", "dev": true, "dependencies": { - "minipass": "^3.0.0", - "yallist": "^4.0.0" + "color-name": "~1.1.4" }, "engines": { - "node": ">= 8" + "node": ">=7.0.0" } }, - "node_modules/minizlib/node_modules/minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "node_modules/jest-watcher/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "node_modules/jest-watcher/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/jest-watcher/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", "dev": true, "dependencies": { - "yallist": "^4.0.0" + "has-flag": "^4.0.0" }, "engines": { "node": ">=8" } }, - "node_modules/mkdirp": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", - "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", + "node_modules/jest-worker": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.7.0.tgz", + "integrity": "sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==", "dev": true, - "bin": { - "mkdirp": "bin/cmd.js" + "dependencies": { + "@types/node": "*", + "jest-util": "^29.7.0", + "merge-stream": "^2.0.0", + "supports-color": "^8.0.0" }, "engines": { - "node": ">=10" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/moment": { - "version": "2.29.4", - "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz", - "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==", + "node_modules/jest-worker/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, "engines": { - "node": "*" + "node": ">=8" } }, - "node_modules/moment-timezone": { - "version": "0.5.37", - "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.37.tgz", - "integrity": "sha512-uEDzDNFhfaywRl+vwXxffjjq1q0Vzr+fcQpQ1bU0kbzorfS7zVtZnCnGc8mhWmF39d4g4YriF6kwA75mJKE/Zg==", + "node_modules/jest-worker/node_modules/supports-color": { + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", + "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", + "dev": true, "dependencies": { - "moment": ">= 2.9.0" + "has-flag": "^4.0.0" }, "engines": { - "node": "*" + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/supports-color?sponsor=1" } }, - "node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "node_modules/jiti": { + "version": "1.21.0", + "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.0.tgz", + "integrity": "sha512-gFqAIbuKyyso/3G2qhiO2OM6shY6EPP/R0+mkDbyspxKazh8BXDC5FiFsUjlczgdNz/vfra0da2y+aHrusLG/Q==", + "dev": true, + "bin": { + "jiti": "bin/jiti.js" + } + }, + "node_modules/js-tokens": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", "dev": true }, - "node_modules/multicast-dns": { - "version": "7.2.5", - "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.2.5.tgz", - "integrity": "sha512-2eznPJP8z2BFLX50tf0LuODrpINqP1RVIm/CObbTcBRITQgmC/TjcREF1NeTBzIcR5XO/ukWo+YHOjBbFwIupg==", + "node_modules/js-yaml": { + "version": "3.14.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", + "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", "dev": true, "dependencies": { - "dns-packet": "^5.2.2", - "thunky": "^1.0.2" + "argparse": "^1.0.7", + "esprima": "^4.0.0" }, "bin": { - "multicast-dns": "cli.js" + "js-yaml": "bin/js-yaml.js" } }, - "node_modules/mute-stream": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz", - "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==", + "node_modules/jsdom": { + "version": "16.7.0", + "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.7.0.tgz", + "integrity": "sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw==", + "dev": true, + "dependencies": { + "abab": "^2.0.5", + "acorn": "^8.2.4", + "acorn-globals": "^6.0.0", + "cssom": "^0.4.4", + "cssstyle": "^2.3.0", + "data-urls": "^2.0.0", + "decimal.js": "^10.2.1", + "domexception": "^2.0.1", + "escodegen": "^2.0.0", + "form-data": "^3.0.0", + "html-encoding-sniffer": "^2.0.1", + "http-proxy-agent": "^4.0.1", + "https-proxy-agent": "^5.0.0", + "is-potential-custom-element-name": "^1.0.1", + "nwsapi": "^2.2.0", + "parse5": "6.0.1", + "saxes": "^5.0.1", + "symbol-tree": "^3.2.4", + "tough-cookie": "^4.0.0", + "w3c-hr-time": "^1.0.2", + "w3c-xmlserializer": "^2.0.0", + "webidl-conversions": "^6.1.0", + "whatwg-encoding": "^1.0.5", + "whatwg-mimetype": "^2.3.0", + "whatwg-url": "^8.5.0", + "ws": "^7.4.6", + "xml-name-validator": "^3.0.0" + }, + "engines": { + "node": ">=10" + }, + "peerDependencies": { + "canvas": "^2.5.0" + }, + "peerDependenciesMeta": { + "canvas": { + "optional": true + } + } + }, + "node_modules/jsdom/node_modules/parse5": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz", + "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==", "dev": true }, - "node_modules/nanoid": { - "version": "3.3.4", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz", - "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==", + "node_modules/jsesc": { + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", + "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", "dev": true, "bin": { - "nanoid": "bin/nanoid.cjs" + "jsesc": "bin/jsesc" }, "engines": { - "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" + "node": ">=4" } }, - "node_modules/natural-compare": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", - "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", + "node_modules/json-buffer": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", + "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", "dev": true }, - "node_modules/needle": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/needle/-/needle-3.2.0.tgz", - "integrity": "sha512-oUvzXnyLiVyVGoianLijF9O/RecZUf7TkBfimjGrLM4eQhXyeJwM6GeAWccwfQ9aa4gMCZKqhAOuLaMIcQxajQ==", + "node_modules/json-parse-even-better-errors": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", + "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", + "dev": true + }, + "node_modules/json-schema-traverse": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", + "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", + "dev": true + }, + "node_modules/json-stable-stringify-without-jsonify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", + "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==", + "dev": true + }, + "node_modules/json5": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", + "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", "dev": true, - "optional": true, - "dependencies": { - "debug": "^3.2.6", - "iconv-lite": "^0.6.3", - "sax": "^1.2.4" - }, "bin": { - "needle": "bin/needle" + "json5": "lib/cli.js" }, "engines": { - "node": ">= 4.4.x" + "node": ">=6" } }, - "node_modules/needle/node_modules/debug": { - "version": "3.2.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", - "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", - "dev": true, - "optional": true, - "dependencies": { - "ms": "^2.1.1" - } + "node_modules/jsonc-parser": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz", + "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==", + "dev": true }, - "node_modules/needle/node_modules/iconv-lite": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", - "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", + "node_modules/jsonfile": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", + "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", "dev": true, - "optional": true, "dependencies": { - "safer-buffer": ">= 2.1.2 < 3.0.0" + "universalify": "^2.0.0" }, - "engines": { - "node": ">=0.10.0" + "optionalDependencies": { + "graceful-fs": "^4.1.6" } }, - "node_modules/negotiator": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", - "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==", + "node_modules/jsonparse": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz", + "integrity": "sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==", "dev": true, - "engines": { - "node": ">= 0.6" - } + "engines": [ + "node >= 0.2.0" + ] }, - "node_modules/neo-async": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz", - "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", - "dev": true + "node_modules/jwt-decode": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/jwt-decode/-/jwt-decode-3.1.2.tgz", + "integrity": "sha512-UfpWE/VZn0iP50d8cz9NrZLM9lSWhcJ+0Gt/nm4by88UL+J1SiKN8/5dkjMmbEzwL2CAe+67GsegCbIKtbp75A==" }, - "node_modules/ngx-color": { - "version": "8.0.3", - "resolved": "https://registry.npmjs.org/ngx-color/-/ngx-color-8.0.3.tgz", - "integrity": "sha512-tuLP+uIoDEu2m0bh711kb2P1M1bh/oIrOn8mJd9mb8xGL2v+OcokcxPmVvWRn0avMG1lXL53CjSlWXGkdV4CDA==", + "node_modules/karma-source-map-support": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/karma-source-map-support/-/karma-source-map-support-1.4.0.tgz", + "integrity": "sha512-RsBECncGO17KAoJCYXjv+ckIz+Ii9NCi+9enk+rq6XC81ezYkb4/RHE6CTXdA7IOJqoF3wcaLfVG0CPmE5ca6A==", + "dev": true, "dependencies": { - "@ctrl/tinycolor": "^3.4.1", - "material-colors": "^1.2.6", - "tslib": "^2.3.0" - }, - "peerDependencies": { - "@angular/common": ">=14.0.0-0", - "@angular/core": ">=14.0.0-0" + "source-map-support": "^0.5.5" } }, - "node_modules/ngx-mask": { - "version": "15.0.3", - "resolved": "https://registry.npmjs.org/ngx-mask/-/ngx-mask-15.0.3.tgz", - "integrity": "sha512-oVwJaTVF9KcQLuUk4HOpH2Id/qagiVgz8Orez11qQEKjXs43Yz79LlGOt30ZsNkgLiQCw/Sw0VnhEnaAdX9aNg==", + "node_modules/keyv": { + "version": "4.5.4", + "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", + "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", + "dev": true, "dependencies": { - "tslib": "^2.3.0" - }, - "peerDependencies": { - "@angular/common": ">=14.0.0", - "@angular/core": ">=14.0.0", - "@angular/forms": ">=14.0.0" + "json-buffer": "3.0.1" } }, - "node_modules/nice-napi": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/nice-napi/-/nice-napi-1.0.2.tgz", - "integrity": "sha512-px/KnJAJZf5RuBGcfD+Sp2pAKq0ytz8j+1NehvgIGFkvtvFrDM3T8E4x/JJODXK9WZow8RRGrbA9QQ3hs+pDhA==", - "dev": true, - "hasInstallScript": true, - "optional": true, - "os": [ - "!win32" - ], - "dependencies": { - "node-addon-api": "^3.0.0", - "node-gyp-build": "^4.2.2" - } - }, - "node_modules/node-addon-api": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz", - "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==", - "dev": true, - "optional": true - }, - "node_modules/node-forge": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz", - "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==", + "node_modules/kind-of": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", "dev": true, "engines": { - "node": ">= 6.13.0" + "node": ">=0.10.0" } }, - "node_modules/node-gyp": { - "version": "9.3.1", - "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-9.3.1.tgz", - "integrity": "sha512-4Q16ZCqq3g8awk6UplT7AuxQ35XN4R/yf/+wSAwcBUAjg7l58RTactWaP8fIDTi0FzI7YcVLujwExakZlfWkXg==", + "node_modules/kleur": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz", + "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==", "dev": true, - "dependencies": { - "env-paths": "^2.2.0", - "glob": "^7.1.4", - "graceful-fs": "^4.2.6", - "make-fetch-happen": "^10.0.3", - "nopt": "^6.0.0", - "npmlog": "^6.0.0", - "rimraf": "^3.0.2", - "semver": "^7.3.5", - "tar": "^6.1.2", - "which": "^2.0.2" - }, - "bin": { - "node-gyp": "bin/node-gyp.js" - }, "engines": { - "node": "^12.13 || ^14.13 || >=16" + "node": ">=6" } }, - "node_modules/node-gyp-build": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.6.0.tgz", - "integrity": "sha512-NTZVKn9IylLwUzaKjkas1e4u2DLNcV4rdYagA4PWdPwW87Bi7z+BznyKSRwS/761tV/lzCGXplWsiaMjLqP2zQ==", + "node_modules/klona": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.6.tgz", + "integrity": "sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA==", "dev": true, - "optional": true, - "bin": { - "node-gyp-build": "bin.js", - "node-gyp-build-optional": "optional.js", - "node-gyp-build-test": "build-test.js" + "engines": { + "node": ">= 8" } }, - "node_modules/node-gyp/node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "node_modules/launch-editor": { + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/launch-editor/-/launch-editor-2.6.1.tgz", + "integrity": "sha512-eB/uXmFVpY4zezmGp5XtU21kwo7GBbKB+EQ+UZeWtGb9yAM5xt/Evk+lYH3eRNAtId+ej4u7TYPFZ07w4s7rRw==", "dev": true, "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" + "picocolors": "^1.0.0", + "shell-quote": "^1.8.1" } }, - "node_modules/node-gyp/node_modules/glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "node_modules/less": { + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/less/-/less-4.1.3.tgz", + "integrity": "sha512-w16Xk/Ta9Hhyei0Gpz9m7VS8F28nieJaL/VyShID7cYvP6IL5oHeL6p4TXSDJqZE/lNv0oJ2pGVjJsRkfwm5FA==", "dev": true, "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" + "copy-anything": "^2.0.1", + "parse-node-version": "^1.0.1", + "tslib": "^2.3.0" + }, + "bin": { + "lessc": "bin/lessc" }, "engines": { - "node": "*" + "node": ">=6" }, - "funding": { - "url": "https://github.com/sponsors/isaacs" + "optionalDependencies": { + "errno": "^0.1.1", + "graceful-fs": "^4.1.2", + "image-size": "~0.5.0", + "make-dir": "^2.1.0", + "mime": "^1.4.1", + "needle": "^3.1.0", + "source-map": "~0.6.0" } }, - "node_modules/node-gyp/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "node_modules/less-loader": { + "version": "11.1.0", + "resolved": "https://registry.npmjs.org/less-loader/-/less-loader-11.1.0.tgz", + "integrity": "sha512-C+uDBV7kS7W5fJlUjq5mPBeBVhYpTIm5gB09APT9o3n/ILeaXVsiSFTbZpTJCJwQ/Crczfn3DmfQFwxYusWFug==", "dev": true, "dependencies": { - "brace-expansion": "^1.1.7" + "klona": "^2.0.4" }, "engines": { - "node": "*" - } - }, - "node_modules/node-gyp/node_modules/which": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", - "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", - "dev": true, - "dependencies": { - "isexe": "^2.0.0" + "node": ">= 14.15.0" }, - "bin": { - "node-which": "bin/node-which" + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" }, - "engines": { - "node": ">= 8" + "peerDependencies": { + "less": "^3.5.0 || ^4.0.0", + "webpack": "^5.0.0" } }, - "node_modules/node-int64": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz", - "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==", - "dev": true - }, - "node_modules/node-releases": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.6.tgz", - "integrity": "sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg==", - "dev": true - }, - "node_modules/nopt": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-6.0.0.tgz", - "integrity": "sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g==", + "node_modules/less/node_modules/make-dir": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz", + "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==", "dev": true, + "optional": true, "dependencies": { - "abbrev": "^1.0.0" - }, - "bin": { - "nopt": "bin/nopt.js" + "pify": "^4.0.1", + "semver": "^5.6.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + "node": ">=6" } }, - "node_modules/normalize-package-data": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-5.0.0.tgz", - "integrity": "sha512-h9iPVIfrVZ9wVYQnxFgtw1ugSvGEMOlyPWWtm8BMJhnwyEL/FLbYbTY3V3PpjI/BUK67n9PEWDu6eHzu1fB15Q==", + "node_modules/less/node_modules/semver": { + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", "dev": true, - "dependencies": { - "hosted-git-info": "^6.0.0", - "is-core-module": "^2.8.1", - "semver": "^7.3.5", - "validate-npm-package-license": "^3.0.4" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "optional": true, + "bin": { + "semver": "bin/semver" } }, - "node_modules/normalize-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", - "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "node_modules/less/node_modules/source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", "dev": true, + "optional": true, "engines": { "node": ">=0.10.0" } }, - "node_modules/normalize-range": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz", - "integrity": "sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==", + "node_modules/leven": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz", + "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==", "dev": true, "engines": { - "node": ">=0.10.0" + "node": ">=6" } }, - "node_modules/npm-bundled": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-3.0.0.tgz", - "integrity": "sha512-Vq0eyEQy+elFpzsKjMss9kxqb9tG3YHg4dsyWuUENuzvSUWe1TCnW/vV9FkhvBk/brEDoDiVd+M1Btosa6ImdQ==", + "node_modules/levn": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", + "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", "dev": true, "dependencies": { - "npm-normalize-package-bin": "^3.0.0" + "prelude-ls": "^1.2.1", + "type-check": "~0.4.0" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": ">= 0.8.0" } }, - "node_modules/npm-install-checks": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-6.0.0.tgz", - "integrity": "sha512-SBU9oFglRVZnfElwAtF14NivyulDqF1VKqqwNsFW9HDcbHMAPHpRSsVFgKuwFGq/hVvWZExz62Th0kvxn/XE7Q==", + "node_modules/license-webpack-plugin": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/license-webpack-plugin/-/license-webpack-plugin-4.0.2.tgz", + "integrity": "sha512-771TFWFD70G1wLTC4oU2Cw4qvtmNrIw+wRvBtn+okgHl7slJVi7zfNcdmqDL72BojM30VNJ2UHylr1o77U37Jw==", "dev": true, "dependencies": { - "semver": "^7.1.1" + "webpack-sources": "^3.0.0" }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "peerDependenciesMeta": { + "webpack": { + "optional": true + }, + "webpack-sources": { + "optional": true + } } }, - "node_modules/npm-normalize-package-bin": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-3.0.0.tgz", - "integrity": "sha512-g+DPQSkusnk7HYXr75NtzkIP4+N81i3RPsGFidF3DzHd9MT9wWngmqoeg/fnHFz5MNdtG4w03s+QnhewSLTT2Q==", + "node_modules/lines-and-columns": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-2.0.3.tgz", + "integrity": "sha512-cNOjgCnLB+FnvWWtyRTzmB3POJ+cXxTA81LoW7u8JdmhfXzriropYwpjShnz1QLLWsQwY7nIxoDmcPTwphDK9w==", "dev": true, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" } }, - "node_modules/npm-package-arg": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-10.1.0.tgz", - "integrity": "sha512-uFyyCEmgBfZTtrKk/5xDfHp6+MdrqGotX/VoOyEEl3mBwiEE5FlBaePanazJSVMPT7vKepcjYBY2ztg9A3yPIA==", + "node_modules/loader-runner": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz", + "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==", "dev": true, - "dependencies": { - "hosted-git-info": "^6.0.0", - "proc-log": "^3.0.0", - "semver": "^7.3.5", - "validate-npm-package-name": "^5.0.0" - }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": ">=6.11.5" } }, - "node_modules/npm-packlist": { - "version": "7.0.4", - "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-7.0.4.tgz", - "integrity": "sha512-d6RGEuRrNS5/N84iglPivjaJPxhDbZmlbTwTDX2IbcRHG5bZCdtysYMhwiPvcF4GisXHGn7xsxv+GQ7T/02M5Q==", + "node_modules/loader-utils": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-3.2.1.tgz", + "integrity": "sha512-ZvFw1KWS3GVyYBYb7qkmRM/WwL2TQQBxgCK62rlvm4WpVQ23Nb4tYjApUlfjrEGvOs7KHEsmyUn75OHZrJMWPw==", "dev": true, - "dependencies": { - "ignore-walk": "^6.0.0" - }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": ">= 12.13.0" } }, - "node_modules/npm-pick-manifest": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-8.0.1.tgz", - "integrity": "sha512-mRtvlBjTsJvfCCdmPtiu2bdlx8d/KXtF7yNXNWe7G0Z36qWA9Ny5zXsI2PfBZEv7SXgoxTmNaTzGSbbzDZChoA==", + "node_modules/locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", "dev": true, "dependencies": { - "npm-install-checks": "^6.0.0", - "npm-normalize-package-bin": "^3.0.0", - "npm-package-arg": "^10.0.0", - "semver": "^7.3.5" + "p-locate": "^4.1.0" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": ">=8" } }, - "node_modules/npm-registry-fetch": { - "version": "14.0.3", - "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-14.0.3.tgz", - "integrity": "sha512-YaeRbVNpnWvsGOjX2wk5s85XJ7l1qQBGAp724h8e2CZFFhMSuw9enom7K1mWVUtvXO1uUSFIAPofQK0pPN0ZcA==", + "node_modules/lodash": { + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", + "dev": true + }, + "node_modules/lodash.debounce": { + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz", + "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==", + "dev": true + }, + "node_modules/lodash.memoize": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz", + "integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==", + "dev": true + }, + "node_modules/lodash.merge": { + "version": "4.6.2", + "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", + "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", + "dev": true + }, + "node_modules/log-symbols": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz", + "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==", "dev": true, "dependencies": { - "make-fetch-happen": "^11.0.0", - "minipass": "^4.0.0", - "minipass-fetch": "^3.0.0", - "minipass-json-stream": "^1.0.1", - "minizlib": "^2.1.2", - "npm-package-arg": "^10.0.0", - "proc-log": "^3.0.0" + "chalk": "^4.1.0", + "is-unicode-supported": "^0.1.0" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/npm-registry-fetch/node_modules/make-fetch-happen": { - "version": "11.0.2", - "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-11.0.2.tgz", - "integrity": "sha512-5n/Pq41w/uZghpdlXAY5kIM85RgJThtTH/NYBRAZ9VUOBWV90USaQjwGrw76fZP3Lj5hl/VZjpVvOaRBMoL/2w==", + "node_modules/log-symbols/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "dev": true, "dependencies": { - "agentkeepalive": "^4.2.1", - "cacache": "^17.0.0", - "http-cache-semantics": "^4.1.0", - "http-proxy-agent": "^5.0.0", - "https-proxy-agent": "^5.0.0", - "is-lambda": "^1.0.1", - "lru-cache": "^7.7.1", - "minipass": "^4.0.0", - "minipass-collect": "^1.0.2", - "minipass-fetch": "^3.0.0", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.4", - "negotiator": "^0.6.3", - "promise-retry": "^2.0.1", - "socks-proxy-agent": "^7.0.0", - "ssri": "^10.0.0" + "color-convert": "^2.0.1" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, - "node_modules/npm-registry-fetch/node_modules/minipass-fetch": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.1.tgz", - "integrity": "sha512-t9/wowtf7DYkwz8cfMSt0rMwiyNIBXf5CKZ3S5ZMqRqMYT0oLTp0x1WorMI9WTwvaPg21r1JbFxJMum8JrLGfw==", + "node_modules/log-symbols/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", "dev": true, "dependencies": { - "minipass": "^4.0.0", - "minipass-sized": "^1.0.3", - "minizlib": "^2.1.2" + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": ">=10" }, - "optionalDependencies": { - "encoding": "^0.1.13" + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" } }, - "node_modules/npm-run-path": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", - "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", + "node_modules/log-symbols/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", "dev": true, "dependencies": { - "path-key": "^3.0.0" + "color-name": "~1.1.4" }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/log-symbols/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "node_modules/log-symbols/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, "engines": { "node": ">=8" } }, - "node_modules/npmlog": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-6.0.2.tgz", - "integrity": "sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==", + "node_modules/log-symbols/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", "dev": true, "dependencies": { - "are-we-there-yet": "^3.0.0", - "console-control-strings": "^1.1.0", - "gauge": "^4.0.3", - "set-blocking": "^2.0.0" + "has-flag": "^4.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + "node": ">=8" } }, - "node_modules/nth-check": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz", - "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==", + "node_modules/lru-cache": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", + "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", "dev": true, "dependencies": { - "boolbase": "^1.0.0" - }, - "funding": { - "url": "https://github.com/fb55/nth-check?sponsor=1" + "yallist": "^3.0.2" } }, - "node_modules/nwsapi": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.2.tgz", - "integrity": "sha512-90yv+6538zuvUMnN+zCr8LuV6bPFdq50304114vJYJ8RDyK8D5O9Phpbd6SZWgI7PwzmmfN1upeOJlvybDSgCw==", - "dev": true - }, - "node_modules/object-inspect": { - "version": "1.12.3", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz", - "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==", + "node_modules/magic-string": { + "version": "0.30.1", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.1.tgz", + "integrity": "sha512-mbVKXPmS0z0G4XqFDCTllmDQ6coZzn94aMlb0o/A4HEHJCKcanlDZwYJgwnkmgD3jyWhUgj9VsPrfd972yPffA==", "dev": true, - "funding": { - "url": "https://github.com/sponsors/ljharb" + "dependencies": { + "@jridgewell/sourcemap-codec": "^1.4.15" + }, + "engines": { + "node": ">=12" } }, - "node_modules/object-is": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz", - "integrity": "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==", + "node_modules/make-dir": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz", + "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.3" + "semver": "^7.5.3" }, "engines": { - "node": ">= 0.4" + "node": ">=10" }, "funding": { - "url": "https://github.com/sponsors/ljharb" + "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/object-keys": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", - "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", - "dev": true, - "engines": { - "node": ">= 0.4" - } + "node_modules/make-error": { + "version": "1.3.6", + "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz", + "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==", + "dev": true }, - "node_modules/object.assign": { - "version": "4.1.4", - "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz", - "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==", + "node_modules/make-fetch-happen": { + "version": "10.2.1", + "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-10.2.1.tgz", + "integrity": "sha512-NgOPbRiaQM10DYXvN3/hhGVI2M5MtITFryzBGxHM5p4wnFxsVCbxkrBrDsk+EZ5OB4jEOT7AjDxtdF+KVEFT7w==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "has-symbols": "^1.0.3", - "object-keys": "^1.1.1" + "agentkeepalive": "^4.2.1", + "cacache": "^16.1.0", + "http-cache-semantics": "^4.1.0", + "http-proxy-agent": "^5.0.0", + "https-proxy-agent": "^5.0.0", + "is-lambda": "^1.0.1", + "lru-cache": "^7.7.1", + "minipass": "^3.1.6", + "minipass-collect": "^1.0.2", + "minipass-fetch": "^2.0.3", + "minipass-flush": "^1.0.5", + "minipass-pipeline": "^1.2.4", + "negotiator": "^0.6.3", + "promise-retry": "^2.0.1", + "socks-proxy-agent": "^7.0.0", + "ssri": "^9.0.0" }, "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" } }, - "node_modules/obuf": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz", - "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==", - "dev": true - }, - "node_modules/on-finished": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", - "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", + "node_modules/make-fetch-happen/node_modules/@npmcli/fs": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-2.1.2.tgz", + "integrity": "sha512-yOJKRvohFOaLqipNtwYB9WugyZKhC/DZC4VYPmpaCzDBrA8YpK3qHZ8/HGscMnE4GqbkLNuVcCnxkeQEdGt6LQ==", "dev": true, "dependencies": { - "ee-first": "1.1.1" + "@gar/promisify": "^1.1.3", + "semver": "^7.3.5" }, "engines": { - "node": ">= 0.8" + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" } }, - "node_modules/on-headers": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz", - "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==", + "node_modules/make-fetch-happen/node_modules/@tootallnate/once": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz", + "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==", "dev": true, "engines": { - "node": ">= 0.8" + "node": ">= 10" } }, - "node_modules/once": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", + "node_modules/make-fetch-happen/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", "dev": true, "dependencies": { - "wrappy": "1" + "balanced-match": "^1.0.0" } }, - "node_modules/onetime": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", - "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", + "node_modules/make-fetch-happen/node_modules/cacache": { + "version": "16.1.3", + "resolved": "https://registry.npmjs.org/cacache/-/cacache-16.1.3.tgz", + "integrity": "sha512-/+Emcj9DAXxX4cwlLmRI9c166RuL3w30zp4R7Joiv2cQTtTtA+jeuCAjH3ZlGnYS3tKENSrKhAzVVP9GVyzeYQ==", "dev": true, "dependencies": { - "mimic-fn": "^2.1.0" + "@npmcli/fs": "^2.1.0", + "@npmcli/move-file": "^2.0.0", + "chownr": "^2.0.0", + "fs-minipass": "^2.1.0", + "glob": "^8.0.1", + "infer-owner": "^1.0.4", + "lru-cache": "^7.7.1", + "minipass": "^3.1.6", + "minipass-collect": "^1.0.2", + "minipass-flush": "^1.0.5", + "minipass-pipeline": "^1.2.4", + "mkdirp": "^1.0.4", + "p-map": "^4.0.0", + "promise-inflight": "^1.0.1", + "rimraf": "^3.0.2", + "ssri": "^9.0.0", + "tar": "^6.1.11", + "unique-filename": "^2.0.0" }, "engines": { - "node": ">=6" + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, + "node_modules/make-fetch-happen/node_modules/fs-minipass": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", + "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", + "dev": true, + "dependencies": { + "minipass": "^3.0.0" }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "engines": { + "node": ">= 8" } }, - "node_modules/open": { - "version": "8.4.0", - "resolved": "https://registry.npmjs.org/open/-/open-8.4.0.tgz", - "integrity": "sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==", + "node_modules/make-fetch-happen/node_modules/glob": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", + "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", "dev": true, "dependencies": { - "define-lazy-prop": "^2.0.0", - "is-docker": "^2.1.1", - "is-wsl": "^2.2.0" + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^5.0.1", + "once": "^1.3.0" }, "engines": { "node": ">=12" }, "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/optionator": { - "version": "0.9.1", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz", - "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==", + "node_modules/make-fetch-happen/node_modules/http-proxy-agent": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz", + "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==", "dev": true, "dependencies": { - "deep-is": "^0.1.3", - "fast-levenshtein": "^2.0.6", - "levn": "^0.4.1", - "prelude-ls": "^1.2.1", - "type-check": "^0.4.0", - "word-wrap": "^1.2.3" + "@tootallnate/once": "2", + "agent-base": "6", + "debug": "4" }, "engines": { - "node": ">= 0.8.0" + "node": ">= 6" } }, - "node_modules/ora": { - "version": "5.4.1", - "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz", - "integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==", + "node_modules/make-fetch-happen/node_modules/lru-cache": { + "version": "7.18.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", + "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", + "dev": true, + "engines": { + "node": ">=12" + } + }, + "node_modules/make-fetch-happen/node_modules/minimatch": { + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", + "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", "dev": true, "dependencies": { - "bl": "^4.1.0", - "chalk": "^4.1.0", - "cli-cursor": "^3.1.0", - "cli-spinners": "^2.5.0", - "is-interactive": "^1.0.0", - "is-unicode-supported": "^0.1.0", - "log-symbols": "^4.1.0", - "strip-ansi": "^6.0.0", - "wcwidth": "^1.0.1" + "brace-expansion": "^2.0.1" }, "engines": { "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/ora/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "node_modules/make-fetch-happen/node_modules/minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", "dev": true, "dependencies": { - "color-convert": "^2.0.1" + "yallist": "^4.0.0" }, "engines": { "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, - "node_modules/ora/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "node_modules/make-fetch-happen/node_modules/ssri": { + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/ssri/-/ssri-9.0.1.tgz", + "integrity": "sha512-o57Wcn66jMQvfHG1FlYbWeZWW/dHZhJXjpIcTfXldXEk5nz5lStPo3mK0OJQfGR3RbZUlbISexbljkJzuEj/8Q==", "dev": true, "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" + "minipass": "^3.1.1" }, "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" } }, - "node_modules/ora/node_modules/color-convert": { + "node_modules/make-fetch-happen/node_modules/unique-filename": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-2.0.1.tgz", + "integrity": "sha512-ODWHtkkdx3IAR+veKxFV+VBkUMcN+FaqzUUd7IZzt+0zhDZFPFxhlqwPF3YQvMHx1TD0tdgYl+kuPnJ8E6ql7A==", "dev": true, "dependencies": { - "color-name": "~1.1.4" + "unique-slug": "^3.0.0" }, "engines": { - "node": ">=7.0.0" + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" } }, - "node_modules/ora/node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "node_modules/ora/node_modules/has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "node_modules/make-fetch-happen/node_modules/unique-slug": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-3.0.0.tgz", + "integrity": "sha512-8EyMynh679x/0gqE9fT9oilG+qEt+ibFyqjuVTsZn1+CMxH+XLlpvr2UZx4nVcCwTpx81nICr2JQFkM+HPLq4w==", "dev": true, + "dependencies": { + "imurmurhash": "^0.1.4" + }, "engines": { - "node": ">=8" + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" } }, - "node_modules/ora/node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "node_modules/make-fetch-happen/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true + }, + "node_modules/makeerror": { + "version": "1.0.12", + "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz", + "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==", "dev": true, "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=8" + "tmpl": "1.0.5" } }, - "node_modules/os-tmpdir": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", - "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==", + "node_modules/material-colors": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/material-colors/-/material-colors-1.2.6.tgz", + "integrity": "sha512-6qE4B9deFBIa9YSpOc9O0Sgc43zTeVYbgDT5veRKSlB2+ZuHNoVVxA1L/ckMUayV9Ay9y7Z/SZCLcGteW9i7bg==" + }, + "node_modules/media-typer": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", + "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==", "dev": true, "engines": { - "node": ">=0.10.0" + "node": ">= 0.6" } }, - "node_modules/p-limit": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "node_modules/memfs": { + "version": "3.5.3", + "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.5.3.tgz", + "integrity": "sha512-UERzLsxzllchadvbPs5aolHh65ISpKpM+ccLbOJ8/vvpBKmAWf+la7dXFy7Mr0ySHbdHrFv5kGFCUHHe6GFEmw==", "dev": true, "dependencies": { - "p-try": "^2.0.0" + "fs-monkey": "^1.0.4" }, "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "node": ">= 4.0.0" } }, - "node_modules/p-locate": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", - "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "node_modules/merge-descriptors": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", + "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==", + "dev": true + }, + "node_modules/merge-stream": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", + "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", + "dev": true + }, + "node_modules/merge2": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", + "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", "dev": true, - "dependencies": { - "p-limit": "^2.2.0" - }, "engines": { - "node": ">=8" + "node": ">= 8" } }, - "node_modules/p-map": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz", - "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==", + "node_modules/methods": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", + "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==", "dev": true, - "dependencies": { - "aggregate-error": "^3.0.0" - }, "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "node": ">= 0.6" } }, - "node_modules/p-retry": { - "version": "4.6.2", - "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-4.6.2.tgz", - "integrity": "sha512-312Id396EbJdvRONlngUx0NydfrIQ5lsYu0znKVUzVvArzEIt08V1qhtyESbGVd1FGX7UKtiFp5uwKZdM8wIuQ==", + "node_modules/micromatch": { + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", + "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", "dev": true, "dependencies": { - "@types/retry": "0.12.0", - "retry": "^0.13.1" + "braces": "^3.0.2", + "picomatch": "^2.3.1" }, "engines": { - "node": ">=8" + "node": ">=8.6" } }, - "node_modules/p-retry/node_modules/retry": { - "version": "0.13.1", - "resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz", - "integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==", + "node_modules/mime": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", + "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", "dev": true, + "bin": { + "mime": "cli.js" + }, "engines": { - "node": ">= 4" + "node": ">=4" } }, - "node_modules/p-try": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", - "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", + "node_modules/mime-db": { + "version": "1.52.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", + "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", "dev": true, "engines": { - "node": ">=6" + "node": ">= 0.6" } }, - "node_modules/pacote": { - "version": "15.0.8", - "resolved": "https://registry.npmjs.org/pacote/-/pacote-15.0.8.tgz", - "integrity": "sha512-UlcumB/XS6xyyIMwg/WwMAyUmga+RivB5KgkRwA1hZNtrx+0Bt41KxHCvg1kr0pZ/ZeD8qjhW4fph6VaYRCbLw==", + "node_modules/mime-types": { + "version": "2.1.35", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", + "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", "dev": true, "dependencies": { - "@npmcli/git": "^4.0.0", - "@npmcli/installed-package-contents": "^2.0.1", - "@npmcli/promise-spawn": "^6.0.1", - "@npmcli/run-script": "^6.0.0", - "cacache": "^17.0.0", - "fs-minipass": "^3.0.0", - "minipass": "^4.0.0", - "npm-package-arg": "^10.0.0", - "npm-packlist": "^7.0.0", - "npm-pick-manifest": "^8.0.0", - "npm-registry-fetch": "^14.0.0", - "proc-log": "^3.0.0", - "promise-retry": "^2.0.1", - "read-package-json": "^6.0.0", - "read-package-json-fast": "^3.0.0", - "ssri": "^10.0.0", - "tar": "^6.1.11" - }, - "bin": { - "pacote": "lib/bin.js" + "mime-db": "1.52.0" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": ">= 0.6" } }, - "node_modules/pako": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz", - "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==", - "dev": true - }, - "node_modules/parent-module": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", - "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", + "node_modules/mimic-fn": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", + "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", "dev": true, - "dependencies": { - "callsites": "^3.0.0" - }, "engines": { "node": ">=6" } }, - "node_modules/parse-json": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", - "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==", + "node_modules/mini-css-extract-plugin": { + "version": "2.7.6", + "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.7.6.tgz", + "integrity": "sha512-Qk7HcgaPkGG6eD77mLvZS1nmxlao3j+9PkrT9Uc7HAE1id3F41+DdBRYRYkbyfNRGzm8/YWtzhw7nVPmwhqTQw==", "dev": true, "dependencies": { - "@babel/code-frame": "^7.0.0", - "error-ex": "^1.3.1", - "json-parse-even-better-errors": "^2.3.0", - "lines-and-columns": "^1.1.6" + "schema-utils": "^4.0.0" }, "engines": { - "node": ">=8" + "node": ">= 12.13.0" }, "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, + "peerDependencies": { + "webpack": "^5.0.0" } }, - "node_modules/parse-node-version": { + "node_modules/minimalistic-assert": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz", - "integrity": "sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==", - "dev": true, - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/parse5": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz", - "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==", + "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz", + "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==", "dev": true }, - "node_modules/parse5-html-rewriting-stream": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/parse5-html-rewriting-stream/-/parse5-html-rewriting-stream-6.0.1.tgz", - "integrity": "sha512-vwLQzynJVEfUlURxgnf51yAJDQTtVpNyGD8tKi2Za7m+akukNHxCcUQMAa/mUGLhCeicFdpy7Tlvj8ZNKadprg==", - "dev": true, - "dependencies": { - "parse5": "^6.0.1", - "parse5-sax-parser": "^6.0.1" - } - }, - "node_modules/parse5-htmlparser2-tree-adapter": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz", - "integrity": "sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA==", - "dev": true, - "dependencies": { - "parse5": "^6.0.1" - } - }, - "node_modules/parse5-sax-parser": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/parse5-sax-parser/-/parse5-sax-parser-6.0.1.tgz", - "integrity": "sha512-kXX+5S81lgESA0LsDuGjAlBybImAChYRMT+/uKCEXFBFOeEhS52qUCydGhU3qLRD8D9DVjaUo821WK7DM4iCeg==", + "node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", "dev": true, "dependencies": { - "parse5": "^6.0.1" + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" } }, - "node_modules/parseurl": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", - "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==", + "node_modules/minimist": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", + "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", "dev": true, - "engines": { - "node": ">= 0.8" + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/path-exists": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", - "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "node_modules/minipass": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", + "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", "dev": true, "engines": { "node": ">=8" } }, - "node_modules/path-is-absolute": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", + "node_modules/minipass-collect": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz", + "integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==", "dev": true, + "dependencies": { + "minipass": "^3.0.0" + }, "engines": { - "node": ">=0.10.0" + "node": ">= 8" } }, - "node_modules/path-key": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", - "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "node_modules/minipass-collect/node_modules/minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", "dev": true, + "dependencies": { + "yallist": "^4.0.0" + }, "engines": { "node": ">=8" } }, - "node_modules/path-parse": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", - "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", - "dev": true - }, - "node_modules/path-to-regexp": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", - "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==", + "node_modules/minipass-collect/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", "dev": true }, - "node_modules/path-type": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", - "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", + "node_modules/minipass-fetch": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-2.1.2.tgz", + "integrity": "sha512-LT49Zi2/WMROHYoqGgdlQIZh8mLPZmOrN2NdJjMXxYe4nkN6FUyuPuOAOedNJDrx0IRGg9+4guZewtp8hE6TxA==", "dev": true, + "dependencies": { + "minipass": "^3.1.6", + "minipass-sized": "^1.0.3", + "minizlib": "^2.1.2" + }, "engines": { - "node": ">=8" + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + }, + "optionalDependencies": { + "encoding": "^0.1.13" } }, - "node_modules/photoviewer": { - "version": "3.6.5", - "resolved": "https://registry.npmjs.org/photoviewer/-/photoviewer-3.6.5.tgz", - "integrity": "sha512-qCxKJ2TMPpA4rBl23/hQiTmxZIMOU8RQJF2plSyOe8j/whIjtIN/SxGw0y4CtRhLK4skYuDnay2xDLxPIMvrCg==", + "node_modules/minipass-fetch/node_modules/minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "dev": true, "dependencies": { - "domq.js": "^0.6.7" + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=8" } }, - "node_modules/picocolors": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", - "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==", + "node_modules/minipass-fetch/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", "dev": true }, - "node_modules/picomatch": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", - "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "node_modules/minipass-flush": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz", + "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==", "dev": true, - "engines": { - "node": ">=8.6" + "dependencies": { + "minipass": "^3.0.0" }, - "funding": { - "url": "https://github.com/sponsors/jonschlinkert" - } - }, - "node_modules/pify": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", - "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==", - "dev": true, - "optional": true, "engines": { - "node": ">=6" + "node": ">= 8" } }, - "node_modules/pirates": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.5.tgz", - "integrity": "sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ==", + "node_modules/minipass-flush/node_modules/minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", "dev": true, + "dependencies": { + "yallist": "^4.0.0" + }, "engines": { - "node": ">= 6" + "node": ">=8" } }, - "node_modules/piscina": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/piscina/-/piscina-3.2.0.tgz", - "integrity": "sha512-yn/jMdHRw+q2ZJhFhyqsmANcbF6V2QwmD84c6xRau+QpQOmtrBCoRGdvTfeuFDYXB5W2m6MfLkjkvQa9lUSmIA==", + "node_modules/minipass-flush/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true + }, + "node_modules/minipass-json-stream": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/minipass-json-stream/-/minipass-json-stream-1.0.1.tgz", + "integrity": "sha512-ODqY18UZt/I8k+b7rl2AENgbWE8IDYam+undIJONvigAz8KR5GWblsFTEfQs0WODsjbSXWlm+JHEv8Gr6Tfdbg==", "dev": true, "dependencies": { - "eventemitter-asyncresource": "^1.0.0", - "hdr-histogram-js": "^2.0.1", - "hdr-histogram-percentiles-obj": "^3.0.0" - }, - "optionalDependencies": { - "nice-napi": "^1.0.2" + "jsonparse": "^1.3.1", + "minipass": "^3.0.0" } }, - "node_modules/pkg-dir": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", - "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", + "node_modules/minipass-json-stream/node_modules/minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", "dev": true, "dependencies": { - "find-up": "^4.0.0" + "yallist": "^4.0.0" }, "engines": { "node": ">=8" } }, - "node_modules/postcss": { - "version": "8.4.21", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.21.tgz", - "integrity": "sha512-tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg==", + "node_modules/minipass-json-stream/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true + }, + "node_modules/minipass-pipeline": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz", + "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==", "dev": true, - "funding": [ - { - "type": "opencollective", - "url": "https://opencollective.com/postcss/" - }, - { - "type": "tidelift", - "url": "https://tidelift.com/funding/github/npm/postcss" - } - ], "dependencies": { - "nanoid": "^3.3.4", - "picocolors": "^1.0.0", - "source-map-js": "^1.0.2" + "minipass": "^3.0.0" }, "engines": { - "node": "^10 || ^12 || >=14" + "node": ">=8" } }, - "node_modules/postcss-loader": { - "version": "7.0.2", - "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-7.0.2.tgz", - "integrity": "sha512-fUJzV/QH7NXUAqV8dWJ9Lg4aTkDCezpTS5HgJ2DvqznexTbSTxgi/dTECvTZ15BwKTtk8G/bqI/QTu2HPd3ZCg==", + "node_modules/minipass-pipeline/node_modules/minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", "dev": true, "dependencies": { - "cosmiconfig": "^7.0.0", - "klona": "^2.0.5", - "semver": "^7.3.8" - }, - "engines": { - "node": ">= 14.15.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/webpack" + "yallist": "^4.0.0" }, - "peerDependencies": { - "postcss": "^7.0.0 || ^8.0.1", - "webpack": "^5.0.0" - } - }, - "node_modules/postcss-modules-extract-imports": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz", - "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==", - "dev": true, "engines": { - "node": "^10 || ^12 || >= 14" - }, - "peerDependencies": { - "postcss": "^8.1.0" + "node": ">=8" } }, - "node_modules/postcss-modules-local-by-default": { + "node_modules/minipass-pipeline/node_modules/yallist": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz", - "integrity": "sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ==", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true + }, + "node_modules/minipass-sized": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz", + "integrity": "sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==", "dev": true, "dependencies": { - "icss-utils": "^5.0.0", - "postcss-selector-parser": "^6.0.2", - "postcss-value-parser": "^4.1.0" + "minipass": "^3.0.0" }, "engines": { - "node": "^10 || ^12 || >= 14" - }, - "peerDependencies": { - "postcss": "^8.1.0" + "node": ">=8" } }, - "node_modules/postcss-modules-scope": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz", - "integrity": "sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==", + "node_modules/minipass-sized/node_modules/minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", "dev": true, "dependencies": { - "postcss-selector-parser": "^6.0.4" + "yallist": "^4.0.0" }, "engines": { - "node": "^10 || ^12 || >= 14" - }, - "peerDependencies": { - "postcss": "^8.1.0" + "node": ">=8" } }, - "node_modules/postcss-modules-values": { + "node_modules/minipass-sized/node_modules/yallist": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz", - "integrity": "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true + }, + "node_modules/minizlib": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", + "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", "dev": true, "dependencies": { - "icss-utils": "^5.0.0" + "minipass": "^3.0.0", + "yallist": "^4.0.0" }, "engines": { - "node": "^10 || ^12 || >= 14" - }, - "peerDependencies": { - "postcss": "^8.1.0" + "node": ">= 8" } }, - "node_modules/postcss-selector-parser": { - "version": "6.0.11", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.11.tgz", - "integrity": "sha512-zbARubNdogI9j7WY4nQJBiNqQf3sLS3wCP4WfOidu+p28LofJqDH1tcXypGrcmMHhDk2t9wGhCsYe/+szLTy1g==", + "node_modules/minizlib/node_modules/minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", "dev": true, "dependencies": { - "cssesc": "^3.0.0", - "util-deprecate": "^1.0.2" + "yallist": "^4.0.0" }, "engines": { - "node": ">=4" + "node": ">=8" } }, - "node_modules/postcss-value-parser": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz", - "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==", + "node_modules/minizlib/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", "dev": true }, - "node_modules/prelude-ls": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", - "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", - "dev": true, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/prettier": { - "version": "2.8.3", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.3.tgz", - "integrity": "sha512-tJ/oJ4amDihPoufT5sM0Z1SKEuKay8LfVAMlbbhnnkvt6BUserZylqo2PN+p9KeljLr0OHa2rXHU1T8reeoTrw==", + "node_modules/mkdirp": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", + "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", "dev": true, "bin": { - "prettier": "bin-prettier.js" + "mkdirp": "bin/cmd.js" }, "engines": { - "node": ">=10.13.0" - }, - "funding": { - "url": "https://github.com/prettier/prettier?sponsor=1" + "node": ">=10" } }, - "node_modules/pretty-bytes": { - "version": "5.6.0", - "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.6.0.tgz", - "integrity": "sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==", - "dev": true, + "node_modules/moment": { + "version": "2.29.4", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz", + "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==", "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "node": "*" } }, - "node_modules/pretty-format": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz", - "integrity": "sha512-8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q==", - "dev": true, + "node_modules/moment-timezone": { + "version": "0.5.43", + "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.43.tgz", + "integrity": "sha512-72j3aNyuIsDxdF1i7CEgV2FfxM1r6aaqJyLB2vwb33mXYyoyLly+F1zbWqhA3/bVIoJ4szlUoMbUnVdid32NUQ==", "dependencies": { - "@jest/schemas": "^28.1.3", - "ansi-regex": "^5.0.1", - "ansi-styles": "^5.0.0", - "react-is": "^18.0.0" + "moment": "^2.29.4" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "*" } }, - "node_modules/pretty-format/node_modules/ansi-styles": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", - "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", + "node_modules/mrmime": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/mrmime/-/mrmime-1.0.1.tgz", + "integrity": "sha512-hzzEagAgDyoU1Q6yg5uI+AorQgdvMCur3FcKf7NhMKWsaYg+RnbTyHRa/9IlLF9rf455MOCtcqqrQQ83pPP7Uw==", "dev": true, "engines": { "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, - "node_modules/proc-log": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-3.0.0.tgz", - "integrity": "sha512-++Vn7NS4Xf9NacaU9Xq3URUuqZETPsf8L4j5/ckhaRYsfPeRyzGw+iDjFhV/Jr3uNmTvvddEJFWh5R1gRgUH8A==", + "node_modules/ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + }, + "node_modules/multicast-dns": { + "version": "7.2.5", + "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.2.5.tgz", + "integrity": "sha512-2eznPJP8z2BFLX50tf0LuODrpINqP1RVIm/CObbTcBRITQgmC/TjcREF1NeTBzIcR5XO/ukWo+YHOjBbFwIupg==", "dev": true, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "dependencies": { + "dns-packet": "^5.2.2", + "thunky": "^1.0.2" + }, + "bin": { + "multicast-dns": "cli.js" } }, - "node_modules/process-nextick-args": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", - "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==", - "dev": true - }, - "node_modules/promise-inflight": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz", - "integrity": "sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==", + "node_modules/mute-stream": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz", + "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==", "dev": true }, - "node_modules/promise-retry": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz", - "integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==", + "node_modules/nanoid": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz", + "integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==", "dev": true, - "dependencies": { - "err-code": "^2.0.2", - "retry": "^0.12.0" + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "bin": { + "nanoid": "bin/nanoid.cjs" }, "engines": { - "node": ">=10" + "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" } }, - "node_modules/prompts": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz", - "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==", + "node_modules/natural-compare": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", + "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", + "dev": true + }, + "node_modules/needle": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/needle/-/needle-3.2.0.tgz", + "integrity": "sha512-oUvzXnyLiVyVGoianLijF9O/RecZUf7TkBfimjGrLM4eQhXyeJwM6GeAWccwfQ9aa4gMCZKqhAOuLaMIcQxajQ==", "dev": true, + "optional": true, "dependencies": { - "kleur": "^3.0.3", - "sisteransi": "^1.0.5" + "debug": "^3.2.6", + "iconv-lite": "^0.6.3", + "sax": "^1.2.4" + }, + "bin": { + "needle": "bin/needle" }, "engines": { - "node": ">= 6" + "node": ">= 4.4.x" } }, - "node_modules/proxy-addr": { - "version": "2.0.7", - "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", - "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==", - "dev": true, - "dependencies": { - "forwarded": "0.2.0", - "ipaddr.js": "1.9.1" - }, - "engines": { - "node": ">= 0.10" + "node_modules/needle/node_modules/debug": { + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", + "dev": true, + "optional": true, + "dependencies": { + "ms": "^2.1.1" } }, - "node_modules/proxy-addr/node_modules/ipaddr.js": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", - "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==", + "node_modules/needle/node_modules/iconv-lite": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", + "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", "dev": true, + "optional": true, + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3.0.0" + }, "engines": { - "node": ">= 0.10" + "node": ">=0.10.0" } }, - "node_modules/prr": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz", - "integrity": "sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw==", + "node_modules/negotiator": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", + "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==", "dev": true, - "optional": true + "engines": { + "node": ">= 0.6" + } }, - "node_modules/psl": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz", - "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==", + "node_modules/neo-async": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz", + "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", "dev": true }, - "node_modules/punycode": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", - "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", - "dev": true, - "engines": { - "node": ">=6" + "node_modules/ngx-color": { + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/ngx-color/-/ngx-color-9.0.0.tgz", + "integrity": "sha512-zyAFux+FRI4cACZ7g8DQQsBbNMhqmFkhtUPaxhkiVHhPzWU1iqXP8MqWH6By3guNOCch5oYrYNBWlHToklbdDg==", + "dependencies": { + "@ctrl/tinycolor": "^3.6.0", + "material-colors": "^1.2.6", + "tslib": "^2.3.0" + }, + "peerDependencies": { + "@angular/common": ">=16.0.0-0", + "@angular/core": ">=16.0.0-0" } }, - "node_modules/qs": { - "version": "6.11.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz", - "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==", - "dev": true, + "node_modules/ngx-mask": { + "version": "16.3.9", + "resolved": "https://registry.npmjs.org/ngx-mask/-/ngx-mask-16.3.9.tgz", + "integrity": "sha512-cptsvlI4OLI8Tpj23ZgSQDKz5jksyWGzAuEEn5pd58cq2oFGeeHZS2i1SQQi8kp+a+Dh/2RvDsfFmDWmI5Ln9w==", "dependencies": { - "side-channel": "^1.0.4" - }, - "engines": { - "node": ">=0.6" + "tslib": "^2.3.0" }, - "funding": { - "url": "https://github.com/sponsors/ljharb" + "peerDependencies": { + "@angular/common": ">=14.0.0", + "@angular/core": ">=14.0.0", + "@angular/forms": ">=14.0.0" } }, - "node_modules/querystringify": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz", - "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==", - "dev": true - }, - "node_modules/queue-microtask": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", - "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ] - }, - "node_modules/randombytes": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", - "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==", + "node_modules/nice-napi": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/nice-napi/-/nice-napi-1.0.2.tgz", + "integrity": "sha512-px/KnJAJZf5RuBGcfD+Sp2pAKq0ytz8j+1NehvgIGFkvtvFrDM3T8E4x/JJODXK9WZow8RRGrbA9QQ3hs+pDhA==", "dev": true, + "hasInstallScript": true, + "optional": true, + "os": [ + "!win32" + ], "dependencies": { - "safe-buffer": "^5.1.0" + "node-addon-api": "^3.0.0", + "node-gyp-build": "^4.2.2" } }, - "node_modules/range-parser": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", - "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==", + "node_modules/node-addon-api": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz", + "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==", + "dev": true + }, + "node_modules/node-forge": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz", + "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==", "dev": true, "engines": { - "node": ">= 0.6" + "node": ">= 6.13.0" } }, - "node_modules/raw-body": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz", - "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==", + "node_modules/node-gyp": { + "version": "9.4.1", + "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-9.4.1.tgz", + "integrity": "sha512-OQkWKbjQKbGkMf/xqI1jjy3oCTgMKJac58G2+bjZb3fza6gW2YrCSdMQYaoTb70crvE//Gngr4f0AgVHmqHvBQ==", "dev": true, "dependencies": { - "bytes": "3.1.2", - "http-errors": "2.0.0", - "iconv-lite": "0.4.24", - "unpipe": "1.0.0" + "env-paths": "^2.2.0", + "exponential-backoff": "^3.1.1", + "glob": "^7.1.4", + "graceful-fs": "^4.2.6", + "make-fetch-happen": "^10.0.3", + "nopt": "^6.0.0", + "npmlog": "^6.0.0", + "rimraf": "^3.0.2", + "semver": "^7.3.5", + "tar": "^6.1.2", + "which": "^2.0.2" + }, + "bin": { + "node-gyp": "bin/node-gyp.js" }, "engines": { - "node": ">= 0.8" + "node": "^12.13 || ^14.13 || >=16" } }, - "node_modules/raw-body/node_modules/bytes": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", - "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", + "node_modules/node-gyp-build": { + "version": "4.6.1", + "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.6.1.tgz", + "integrity": "sha512-24vnklJmyRS8ViBNI8KbtK/r/DmXQMRiOMXTNz2nrTnAYUwjmEEbnnpB/+kt+yWRv73bPsSPRFddrcIbAxSiMQ==", "dev": true, - "engines": { - "node": ">= 0.8" + "bin": { + "node-gyp-build": "bin.js", + "node-gyp-build-optional": "optional.js", + "node-gyp-build-test": "build-test.js" } }, - "node_modules/react-is": { - "version": "18.2.0", - "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz", - "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==", + "node_modules/node-int64": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz", + "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==", "dev": true }, - "node_modules/read-package-json": { + "node_modules/node-releases": { + "version": "2.0.13", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.13.tgz", + "integrity": "sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==", + "dev": true + }, + "node_modules/nopt": { "version": "6.0.0", - "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-6.0.0.tgz", - "integrity": "sha512-b/9jxWJ8EwogJPpv99ma+QwtqB7FSl3+V6UXS7Aaay8/5VwMY50oIFooY1UKXMWpfNCM6T/PoGqa5GD1g9xf9w==", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-6.0.0.tgz", + "integrity": "sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g==", "dev": true, "dependencies": { - "glob": "^8.0.1", - "json-parse-even-better-errors": "^3.0.0", - "normalize-package-data": "^5.0.0", - "npm-normalize-package-bin": "^3.0.0" + "abbrev": "^1.0.0" + }, + "bin": { + "nopt": "bin/nopt.js" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" } }, - "node_modules/read-package-json-fast": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/read-package-json-fast/-/read-package-json-fast-3.0.2.tgz", - "integrity": "sha512-0J+Msgym3vrLOUB3hzQCuZHII0xkNGCtz/HJH9xZshwv9DbDwkw1KaE3gx/e2J5rpEY5rtOy6cyhKOPrkP7FZw==", + "node_modules/normalize-package-data": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-5.0.0.tgz", + "integrity": "sha512-h9iPVIfrVZ9wVYQnxFgtw1ugSvGEMOlyPWWtm8BMJhnwyEL/FLbYbTY3V3PpjI/BUK67n9PEWDu6eHzu1fB15Q==", "dev": true, "dependencies": { - "json-parse-even-better-errors": "^3.0.0", - "npm-normalize-package-bin": "^3.0.0" + "hosted-git-info": "^6.0.0", + "is-core-module": "^2.8.1", + "semver": "^7.3.5", + "validate-npm-package-license": "^3.0.4" }, "engines": { "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "node_modules/read-package-json-fast/node_modules/json-parse-even-better-errors": { + "node_modules/normalize-path": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-3.0.0.tgz", - "integrity": "sha512-iZbGHafX/59r39gPwVPRBGw0QQKnA7tte5pSMrhWOW7swGsVvVTjmfyAV9pNqk8YGT7tRCdxRu8uzcgZwoDooA==", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", "dev": true, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": ">=0.10.0" } }, - "node_modules/read-package-json/node_modules/json-parse-even-better-errors": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-3.0.0.tgz", - "integrity": "sha512-iZbGHafX/59r39gPwVPRBGw0QQKnA7tte5pSMrhWOW7swGsVvVTjmfyAV9pNqk8YGT7tRCdxRu8uzcgZwoDooA==", + "node_modules/normalize-range": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz", + "integrity": "sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==", "dev": true, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": ">=0.10.0" } }, - "node_modules/readable-stream": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", - "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", + "node_modules/npm-bundled": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-3.0.0.tgz", + "integrity": "sha512-Vq0eyEQy+elFpzsKjMss9kxqb9tG3YHg4dsyWuUENuzvSUWe1TCnW/vV9FkhvBk/brEDoDiVd+M1Btosa6ImdQ==", "dev": true, "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" + "npm-normalize-package-bin": "^3.0.0" }, "engines": { - "node": ">= 6" + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "node_modules/readdirp": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", - "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", + "node_modules/npm-install-checks": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-6.3.0.tgz", + "integrity": "sha512-W29RiK/xtpCGqn6f3ixfRYGk+zRyr+Ew9F2E20BfXxT5/euLdA/Nm7fO7OeTGuAmTs30cpgInyJ0cYe708YTZw==", "dev": true, "dependencies": { - "picomatch": "^2.2.1" + "semver": "^7.1.1" }, "engines": { - "node": ">=8.10.0" + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "node_modules/reflect-metadata": { - "version": "0.1.13", - "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.13.tgz", - "integrity": "sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg==", - "dev": true - }, - "node_modules/regenerate": { - "version": "1.4.2", - "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz", - "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==", - "dev": true - }, - "node_modules/regenerate-unicode-properties": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz", - "integrity": "sha512-d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ==", + "node_modules/npm-normalize-package-bin": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-3.0.1.tgz", + "integrity": "sha512-dMxCf+zZ+3zeQZXKxmyuCKlIDPGuv8EF940xbkC4kQVDTtqoh6rJFO+JTKSA6/Rwi0getWmtuy4Itup0AMcaDQ==", "dev": true, - "dependencies": { - "regenerate": "^1.4.2" - }, "engines": { - "node": ">=4" - } - }, - "node_modules/regenerator-runtime": { - "version": "0.13.11", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz", - "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==", - "dev": true - }, - "node_modules/regenerator-transform": { - "version": "0.15.1", - "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.1.tgz", - "integrity": "sha512-knzmNAcuyxV+gQCufkYcvOqX/qIIfHLv0u5x79kRxuGojfYVky1f15TzZEu2Avte8QGepvUNTnLskf8E6X6Vyg==", - "dev": true, - "dependencies": { - "@babel/runtime": "^7.8.4" + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "node_modules/regex-parser": { - "version": "2.2.11", - "resolved": "https://registry.npmjs.org/regex-parser/-/regex-parser-2.2.11.tgz", - "integrity": "sha512-jbD/FT0+9MBU2XAZluI7w2OBs1RBi6p9M83nkoZayQXXU9e8Robt69FcZc7wU4eJD/YFTjn1JdCk3rbMJajz8Q==", - "dev": true - }, - "node_modules/regexp.prototype.flags": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz", - "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==", + "node_modules/npm-package-arg": { + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-10.1.0.tgz", + "integrity": "sha512-uFyyCEmgBfZTtrKk/5xDfHp6+MdrqGotX/VoOyEEl3mBwiEE5FlBaePanazJSVMPT7vKepcjYBY2ztg9A3yPIA==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.3", - "functions-have-names": "^1.2.2" + "hosted-git-info": "^6.0.0", + "proc-log": "^3.0.0", + "semver": "^7.3.5", + "validate-npm-package-name": "^5.0.0" }, "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "node_modules/regexpp": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz", - "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==", + "node_modules/npm-packlist": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-7.0.4.tgz", + "integrity": "sha512-d6RGEuRrNS5/N84iglPivjaJPxhDbZmlbTwTDX2IbcRHG5bZCdtysYMhwiPvcF4GisXHGn7xsxv+GQ7T/02M5Q==", "dev": true, - "engines": { - "node": ">=8" + "dependencies": { + "ignore-walk": "^6.0.0" }, - "funding": { - "url": "https://github.com/sponsors/mysticatea" + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "node_modules/regexpu-core": { - "version": "5.2.2", - "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.2.2.tgz", - "integrity": "sha512-T0+1Zp2wjF/juXMrMxHxidqGYn8U4R+zleSJhX9tQ1PUsS8a9UtYfbsF9LdiVgNX3kiX8RNaKM42nfSgvFJjmw==", + "node_modules/npm-pick-manifest": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-8.0.1.tgz", + "integrity": "sha512-mRtvlBjTsJvfCCdmPtiu2bdlx8d/KXtF7yNXNWe7G0Z36qWA9Ny5zXsI2PfBZEv7SXgoxTmNaTzGSbbzDZChoA==", "dev": true, "dependencies": { - "regenerate": "^1.4.2", - "regenerate-unicode-properties": "^10.1.0", - "regjsgen": "^0.7.1", - "regjsparser": "^0.9.1", - "unicode-match-property-ecmascript": "^2.0.0", - "unicode-match-property-value-ecmascript": "^2.1.0" + "npm-install-checks": "^6.0.0", + "npm-normalize-package-bin": "^3.0.0", + "npm-package-arg": "^10.0.0", + "semver": "^7.3.5" }, "engines": { - "node": ">=4" + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "node_modules/regjsgen": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.7.1.tgz", - "integrity": "sha512-RAt+8H2ZEzHeYWxZ3H2z6tF18zyyOnlcdaafLrm21Bguj7uZy6ULibiAFdXEtKQY4Sy7wDTwDiOazasMLc4KPA==", - "dev": true - }, - "node_modules/regjsparser": { - "version": "0.9.1", - "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.9.1.tgz", - "integrity": "sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==", + "node_modules/npm-registry-fetch": { + "version": "14.0.5", + "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-14.0.5.tgz", + "integrity": "sha512-kIDMIo4aBm6xg7jOttupWZamsZRkAqMqwqqbVXnUqstY5+tapvv6bkH/qMR76jdgV+YljEUCyWx3hRYMrJiAgA==", "dev": true, "dependencies": { - "jsesc": "~0.5.0" + "make-fetch-happen": "^11.0.0", + "minipass": "^5.0.0", + "minipass-fetch": "^3.0.0", + "minipass-json-stream": "^1.0.1", + "minizlib": "^2.1.2", + "npm-package-arg": "^10.0.0", + "proc-log": "^3.0.0" }, - "bin": { - "regjsparser": "bin/parser" + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "node_modules/regjsparser/node_modules/jsesc": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", - "integrity": "sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==", + "node_modules/npm-registry-fetch/node_modules/@tootallnate/once": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz", + "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==", "dev": true, - "bin": { - "jsesc": "bin/jsesc" + "engines": { + "node": ">= 10" } }, - "node_modules/require-directory": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", - "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", + "node_modules/npm-registry-fetch/node_modules/http-proxy-agent": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz", + "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==", "dev": true, + "dependencies": { + "@tootallnate/once": "2", + "agent-base": "6", + "debug": "4" + }, "engines": { - "node": ">=0.10.0" + "node": ">= 6" } }, - "node_modules/require-from-string": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", - "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==", + "node_modules/npm-registry-fetch/node_modules/lru-cache": { + "version": "7.18.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", + "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", "dev": true, "engines": { - "node": ">=0.10.0" + "node": ">=12" } }, - "node_modules/requires-port": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz", - "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==", - "dev": true - }, - "node_modules/resolve": { - "version": "1.22.1", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz", - "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==", + "node_modules/npm-registry-fetch/node_modules/make-fetch-happen": { + "version": "11.1.1", + "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-11.1.1.tgz", + "integrity": "sha512-rLWS7GCSTcEujjVBs2YqG7Y4643u8ucvCJeSRqiLYhesrDuzeuFIk37xREzAsfQaqzl8b9rNCE4m6J8tvX4Q8w==", "dev": true, "dependencies": { - "is-core-module": "^2.9.0", - "path-parse": "^1.0.7", - "supports-preserve-symlinks-flag": "^1.0.0" - }, - "bin": { - "resolve": "bin/resolve" + "agentkeepalive": "^4.2.1", + "cacache": "^17.0.0", + "http-cache-semantics": "^4.1.1", + "http-proxy-agent": "^5.0.0", + "https-proxy-agent": "^5.0.0", + "is-lambda": "^1.0.1", + "lru-cache": "^7.7.1", + "minipass": "^5.0.0", + "minipass-fetch": "^3.0.0", + "minipass-flush": "^1.0.5", + "minipass-pipeline": "^1.2.4", + "negotiator": "^0.6.3", + "promise-retry": "^2.0.1", + "socks-proxy-agent": "^7.0.0", + "ssri": "^10.0.0" }, - "funding": { - "url": "https://github.com/sponsors/ljharb" + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "node_modules/resolve-cwd": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz", - "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==", + "node_modules/npm-registry-fetch/node_modules/minipass-fetch": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.4.tgz", + "integrity": "sha512-jHAqnA728uUpIaFm7NWsCnqKT6UqZz7GcI/bDpPATuwYyKwJwW0remxSCxUlKiEty+eopHGa3oc8WxgQ1FFJqg==", "dev": true, "dependencies": { - "resolve-from": "^5.0.0" + "minipass": "^7.0.3", + "minipass-sized": "^1.0.3", + "minizlib": "^2.1.2" }, "engines": { - "node": ">=8" + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + }, + "optionalDependencies": { + "encoding": "^0.1.13" } }, - "node_modules/resolve-from": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", - "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", + "node_modules/npm-registry-fetch/node_modules/minipass-fetch/node_modules/minipass": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz", + "integrity": "sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==", "dev": true, "engines": { - "node": ">=8" + "node": ">=16 || 14 >=14.17" } }, - "node_modules/resolve-url-loader": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/resolve-url-loader/-/resolve-url-loader-5.0.0.tgz", - "integrity": "sha512-uZtduh8/8srhBoMx//5bwqjQ+rfYOUq8zC9NrMUGtjBiGTtFJM42s58/36+hTqeqINcnYe08Nj3LkK9lW4N8Xg==", + "node_modules/npm-run-path": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", + "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", "dev": true, "dependencies": { - "adjust-sourcemap-loader": "^4.0.0", - "convert-source-map": "^1.7.0", - "loader-utils": "^2.0.0", - "postcss": "^8.2.14", - "source-map": "0.6.1" + "path-key": "^3.0.0" }, "engines": { - "node": ">=12" + "node": ">=8" } }, - "node_modules/resolve-url-loader/node_modules/loader-utils": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz", - "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==", + "node_modules/npmlog": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-6.0.2.tgz", + "integrity": "sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==", "dev": true, "dependencies": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^2.1.2" + "are-we-there-yet": "^3.0.0", + "console-control-strings": "^1.1.0", + "gauge": "^4.0.3", + "set-blocking": "^2.0.0" }, "engines": { - "node": ">=8.9.0" + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" } }, - "node_modules/resolve-url-loader/node_modules/source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "node_modules/nth-check": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz", + "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==", "dev": true, - "engines": { - "node": ">=0.10.0" + "dependencies": { + "boolbase": "^1.0.0" + }, + "funding": { + "url": "https://github.com/fb55/nth-check?sponsor=1" } }, - "node_modules/resolve.exports": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-1.1.0.tgz", - "integrity": "sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ==", - "dev": true, - "engines": { - "node": ">=10" - } + "node_modules/nwsapi": { + "version": "2.2.7", + "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.7.tgz", + "integrity": "sha512-ub5E4+FBPKwAZx0UwIQOjYWGHTEq5sPqHQNRN8Z9e4A7u3Tj1weLJsL59yH9vmvqEtBHaOmT6cYQKIZOxp35FQ==", + "dev": true }, - "node_modules/restore-cursor": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", - "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==", + "node_modules/nx": { + "version": "16.5.1", + "resolved": "https://registry.npmjs.org/nx/-/nx-16.5.1.tgz", + "integrity": "sha512-I3hJRE4hG7JWAtncWwDEO3GVeGPpN0TtM8xH5ArZXyDuVeTth/i3TtJzdDzqXO1HHtIoAQN0xeq4n9cLuMil5g==", "dev": true, + "hasInstallScript": true, "dependencies": { - "onetime": "^5.1.0", - "signal-exit": "^3.0.2" + "@nrwl/tao": "16.5.1", + "@parcel/watcher": "2.0.4", + "@yarnpkg/lockfile": "^1.1.0", + "@yarnpkg/parsers": "3.0.0-rc.46", + "@zkochan/js-yaml": "0.0.6", + "axios": "^1.0.0", + "chalk": "^4.1.0", + "cli-cursor": "3.1.0", + "cli-spinners": "2.6.1", + "cliui": "^7.0.2", + "dotenv": "~10.0.0", + "enquirer": "~2.3.6", + "fast-glob": "3.2.7", + "figures": "3.2.0", + "flat": "^5.0.2", + "fs-extra": "^11.1.0", + "glob": "7.1.4", + "ignore": "^5.0.4", + "js-yaml": "4.1.0", + "jsonc-parser": "3.2.0", + "lines-and-columns": "~2.0.3", + "minimatch": "3.0.5", + "npm-run-path": "^4.0.1", + "open": "^8.4.0", + "semver": "7.5.3", + "string-width": "^4.2.3", + "strong-log-transformer": "^2.1.0", + "tar-stream": "~2.2.0", + "tmp": "~0.2.1", + "tsconfig-paths": "^4.1.2", + "tslib": "^2.3.0", + "v8-compile-cache": "2.3.0", + "yargs": "^17.6.2", + "yargs-parser": "21.1.1" }, - "engines": { - "node": ">=8" + "bin": { + "nx": "bin/nx.js" + }, + "optionalDependencies": { + "@nx/nx-darwin-arm64": "16.5.1", + "@nx/nx-darwin-x64": "16.5.1", + "@nx/nx-freebsd-x64": "16.5.1", + "@nx/nx-linux-arm-gnueabihf": "16.5.1", + "@nx/nx-linux-arm64-gnu": "16.5.1", + "@nx/nx-linux-arm64-musl": "16.5.1", + "@nx/nx-linux-x64-gnu": "16.5.1", + "@nx/nx-linux-x64-musl": "16.5.1", + "@nx/nx-win32-arm64-msvc": "16.5.1", + "@nx/nx-win32-x64-msvc": "16.5.1" + }, + "peerDependencies": { + "@swc-node/register": "^1.4.2", + "@swc/core": "^1.2.173" + }, + "peerDependenciesMeta": { + "@swc-node/register": { + "optional": true + }, + "@swc/core": { + "optional": true + } } }, - "node_modules/retry": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz", - "integrity": "sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==", + "node_modules/nx/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "dev": true, + "dependencies": { + "color-convert": "^2.0.1" + }, "engines": { - "node": ">= 4" + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, - "node_modules/reusify": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", - "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", + "node_modules/nx/node_modules/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true + }, + "node_modules/nx/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", "dev": true, + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, "engines": { - "iojs": ">=1.0.0", - "node": ">=0.10.0" + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" } }, - "node_modules/rimraf": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "node_modules/nx/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", "dev": true, "dependencies": { - "glob": "^7.1.3" - }, - "bin": { - "rimraf": "bin.js" + "color-name": "~1.1.4" }, - "funding": { - "url": "https://github.com/sponsors/isaacs" + "engines": { + "node": ">=7.0.0" } }, - "node_modules/rimraf/node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "node_modules/nx/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "node_modules/nx/node_modules/fast-glob": { + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.7.tgz", + "integrity": "sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==", "dev": true, "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" + "@nodelib/fs.stat": "^2.0.2", + "@nodelib/fs.walk": "^1.2.3", + "glob-parent": "^5.1.2", + "merge2": "^1.3.0", + "micromatch": "^4.0.4" + }, + "engines": { + "node": ">=8" } }, - "node_modules/rimraf/node_modules/glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "node_modules/nx/node_modules/glob": { + "version": "7.1.4", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz", + "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==", "dev": true, "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", "inherits": "2", - "minimatch": "^3.1.1", + "minimatch": "^3.0.4", "once": "^1.3.0", "path-is-absolute": "^1.0.0" }, "engines": { "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/rimraf/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "node_modules/nx/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true, - "dependencies": { - "brace-expansion": "^1.1.7" - }, "engines": { - "node": "*" + "node": ">=8" } }, - "node_modules/run-async": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz", - "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==", + "node_modules/nx/node_modules/js-yaml": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", "dev": true, - "engines": { - "node": ">=0.12.0" + "dependencies": { + "argparse": "^2.0.1" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" } }, - "node_modules/run-parallel": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", - "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", + "node_modules/nx/node_modules/lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], "dependencies": { - "queue-microtask": "^1.2.2" + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" } }, - "node_modules/rxjs": { - "version": "7.5.6", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.6.tgz", - "integrity": "sha512-dnyv2/YsXhnm461G+R/Pe5bWP41Nm6LBXEYWI6eiFP4fiwx6WRI/CD0zbdVAudd9xwLEF2IDcKXLHit0FYjUzw==", + "node_modules/nx/node_modules/minimatch": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.5.tgz", + "integrity": "sha512-tUpxzX0VAzJHjLu0xUfFv1gwVp9ba3IOuRAVH2EGuRW8a5emA2FlACLqiT/lDVtS1W+TGNwqz3sWaNyLgDJWuw==", + "dev": true, "dependencies": { - "tslib": "^2.1.0" + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" } }, - "node_modules/safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "dev": true - }, - "node_modules/safer-buffer": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", - "dev": true - }, - "node_modules/safevalues": { - "version": "0.3.4", - "resolved": "https://registry.npmjs.org/safevalues/-/safevalues-0.3.4.tgz", - "integrity": "sha512-LRneZZRXNgjzwG4bDQdOTSbze3fHm1EAKN/8bePxnlEZiBmkYEDggaHbuvHI9/hoqHbGfsEA7tWS9GhYHZBBsw==" - }, - "node_modules/sass": { - "version": "1.57.1", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.57.1.tgz", - "integrity": "sha512-O2+LwLS79op7GI0xZ8fqzF7X2m/m8WFfI02dHOdsK5R2ECeS5F62zrwg/relM1rjSLy7Vd/DiMNIvPrQGsA0jw==", + "node_modules/nx/node_modules/semver": { + "version": "7.5.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.3.tgz", + "integrity": "sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ==", "dev": true, "dependencies": { - "chokidar": ">=3.0.0 <4.0.0", - "immutable": "^4.0.0", - "source-map-js": ">=0.6.2 <2.0.0" + "lru-cache": "^6.0.0" }, "bin": { - "sass": "sass.js" + "semver": "bin/semver.js" }, "engines": { - "node": ">=12.0.0" + "node": ">=10" } }, - "node_modules/sass-loader": { - "version": "13.2.0", - "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-13.2.0.tgz", - "integrity": "sha512-JWEp48djQA4nbZxmgC02/Wh0eroSUutulROUusYJO9P9zltRbNN80JCBHqRGzjd4cmZCa/r88xgfkjGD0TXsHg==", + "node_modules/nx/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", "dev": true, "dependencies": { - "klona": "^2.0.4", - "neo-async": "^2.6.2" + "has-flag": "^4.0.0" }, "engines": { - "node": ">= 14.15.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/webpack" - }, - "peerDependencies": { - "fibers": ">= 3.1.0", - "node-sass": "^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0", - "sass": "^1.3.0", - "sass-embedded": "*", - "webpack": "^5.0.0" - }, - "peerDependenciesMeta": { - "fibers": { - "optional": true - }, - "node-sass": { - "optional": true - }, - "sass": { - "optional": true - }, - "sass-embedded": { - "optional": true - } + "node": ">=8" } }, - "node_modules/sax": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", - "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==", - "dev": true, - "optional": true + "node_modules/nx/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true }, - "node_modules/saxes": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz", - "integrity": "sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==", + "node_modules/object-inspect": { + "version": "1.13.1", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz", + "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==", "dev": true, - "dependencies": { - "xmlchars": "^2.2.0" - }, - "engines": { - "node": ">=10" + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/schema-utils": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz", - "integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==", + "node_modules/object-path": { + "version": "0.11.8", + "resolved": "https://registry.npmjs.org/object-path/-/object-path-0.11.8.tgz", + "integrity": "sha512-YJjNZrlXJFM42wTBn6zgOJVar9KFJvzx6sTWDte8sWZF//cnjl0BxHNpfZx+ZffXX63A9q0b1zsFiBX4g4X5KA==", "dev": true, - "dependencies": { - "@types/json-schema": "^7.0.9", - "ajv": "^8.8.0", - "ajv-formats": "^2.1.1", - "ajv-keywords": "^5.0.0" - }, "engines": { - "node": ">= 12.13.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/webpack" + "node": ">= 10.12.0" } }, - "node_modules/select-hose": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz", - "integrity": "sha512-mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg==", + "node_modules/obuf": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz", + "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==", "dev": true }, - "node_modules/selfsigned": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-2.1.1.tgz", - "integrity": "sha512-GSL3aowiF7wa/WtSFwnUrludWFoNhftq8bUkH9pkzjpN2XSPOAYEgg6e0sS9s0rZwgJzJiQRPU18A6clnoW5wQ==", + "node_modules/on-finished": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", + "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", "dev": true, "dependencies": { - "node-forge": "^1" + "ee-first": "1.1.1" }, "engines": { - "node": ">=10" + "node": ">= 0.8" } }, - "node_modules/semver": { - "version": "7.3.8", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", - "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", + "node_modules/on-headers": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz", + "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==", "dev": true, - "dependencies": { - "lru-cache": "^6.0.0" - }, - "bin": { - "semver": "bin/semver.js" - }, "engines": { - "node": ">=10" + "node": ">= 0.8" } }, - "node_modules/semver/node_modules/lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "node_modules/once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", "dev": true, "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" + "wrappy": "1" } }, - "node_modules/send": { - "version": "0.18.0", - "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz", - "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==", + "node_modules/onetime": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", + "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", "dev": true, "dependencies": { - "debug": "2.6.9", - "depd": "2.0.0", - "destroy": "1.2.0", - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "etag": "~1.8.1", - "fresh": "0.5.2", - "http-errors": "2.0.0", - "mime": "1.6.0", - "ms": "2.1.3", - "on-finished": "2.4.1", - "range-parser": "~1.2.1", - "statuses": "2.0.1" + "mimic-fn": "^2.1.0" }, "engines": { - "node": ">= 0.8.0" + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/send/node_modules/debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "node_modules/open": { + "version": "8.4.2", + "resolved": "https://registry.npmjs.org/open/-/open-8.4.2.tgz", + "integrity": "sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==", "dev": true, "dependencies": { - "ms": "2.0.0" - } - }, - "node_modules/send/node_modules/debug/node_modules/ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "dev": true - }, - "node_modules/send/node_modules/depd": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", - "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", - "dev": true, + "define-lazy-prop": "^2.0.0", + "is-docker": "^2.1.1", + "is-wsl": "^2.2.0" + }, "engines": { - "node": ">= 0.8" - } - }, - "node_modules/send/node_modules/ms": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", - "dev": true - }, - "node_modules/serialize-javascript": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.1.tgz", - "integrity": "sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==", - "dev": true, - "dependencies": { - "randombytes": "^2.1.0" + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/serve-index": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz", - "integrity": "sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw==", + "node_modules/optionator": { + "version": "0.9.3", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz", + "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==", "dev": true, "dependencies": { - "accepts": "~1.3.4", - "batch": "0.6.1", - "debug": "2.6.9", - "escape-html": "~1.0.3", - "http-errors": "~1.6.2", - "mime-types": "~2.1.17", - "parseurl": "~1.3.2" + "@aashutoshrathi/word-wrap": "^1.2.3", + "deep-is": "^0.1.3", + "fast-levenshtein": "^2.0.6", + "levn": "^0.4.1", + "prelude-ls": "^1.2.1", + "type-check": "^0.4.0" }, "engines": { "node": ">= 0.8.0" } }, - "node_modules/serve-index/node_modules/debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "node_modules/ora": { + "version": "5.4.1", + "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz", + "integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==", "dev": true, "dependencies": { - "ms": "2.0.0" + "bl": "^4.1.0", + "chalk": "^4.1.0", + "cli-cursor": "^3.1.0", + "cli-spinners": "^2.5.0", + "is-interactive": "^1.0.0", + "is-unicode-supported": "^0.1.0", + "log-symbols": "^4.1.0", + "strip-ansi": "^6.0.0", + "wcwidth": "^1.0.1" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/serve-index/node_modules/http-errors": { - "version": "1.6.3", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz", - "integrity": "sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==", + "node_modules/ora/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "dev": true, "dependencies": { - "depd": "~1.1.2", - "inherits": "2.0.3", - "setprototypeof": "1.1.0", - "statuses": ">= 1.4.0 < 2" + "color-convert": "^2.0.1" }, "engines": { - "node": ">= 0.6" + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, - "node_modules/serve-index/node_modules/inherits": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==", - "dev": true - }, - "node_modules/serve-index/node_modules/ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "dev": true - }, - "node_modules/serve-index/node_modules/setprototypeof": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz", - "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==", - "dev": true - }, - "node_modules/serve-index/node_modules/statuses": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", - "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==", + "node_modules/ora/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", "dev": true, + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, "engines": { - "node": ">= 0.6" + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" } }, - "node_modules/serve-static": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz", - "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==", + "node_modules/ora/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", "dev": true, "dependencies": { - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "parseurl": "~1.3.3", - "send": "0.18.0" + "color-name": "~1.1.4" }, "engines": { - "node": ">= 0.8.0" + "node": ">=7.0.0" } }, - "node_modules/set-blocking": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", - "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==", - "dev": true - }, - "node_modules/setprototypeof": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", - "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==", + "node_modules/ora/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, - "node_modules/shallow-clone": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz", - "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==", + "node_modules/ora/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true, - "dependencies": { - "kind-of": "^6.0.2" - }, "engines": { "node": ">=8" } }, - "node_modules/shebang-command": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", - "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "node_modules/ora/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", "dev": true, "dependencies": { - "shebang-regex": "^3.0.0" + "has-flag": "^4.0.0" }, "engines": { "node": ">=8" } }, - "node_modules/shebang-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", - "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "node_modules/os-tmpdir": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", + "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==", "dev": true, "engines": { - "node": ">=8" + "node": ">=0.10.0" } }, - "node_modules/side-channel": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", - "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==", + "node_modules/p-limit": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", "dev": true, "dependencies": { - "call-bind": "^1.0.0", - "get-intrinsic": "^1.0.2", - "object-inspect": "^1.9.0" + "yocto-queue": "^0.1.0" + }, + "engines": { + "node": ">=10" }, "funding": { - "url": "https://github.com/sponsors/ljharb" + "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/signal-exit": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", - "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", - "dev": true + "node_modules/p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "dev": true, + "dependencies": { + "p-limit": "^2.2.0" + }, + "engines": { + "node": ">=8" + } }, - "node_modules/sisteransi": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz", - "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==", - "dev": true + "node_modules/p-locate/node_modules/p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "dev": true, + "dependencies": { + "p-try": "^2.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } }, - "node_modules/slash": { + "node_modules/p-map": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz", - "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==", + "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz", + "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==", "dev": true, + "dependencies": { + "aggregate-error": "^3.0.0" + }, "engines": { - "node": ">=12" + "node": ">=10" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/smart-buffer": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz", - "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==", + "node_modules/p-retry": { + "version": "4.6.2", + "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-4.6.2.tgz", + "integrity": "sha512-312Id396EbJdvRONlngUx0NydfrIQ5lsYu0znKVUzVvArzEIt08V1qhtyESbGVd1FGX7UKtiFp5uwKZdM8wIuQ==", "dev": true, + "dependencies": { + "@types/retry": "0.12.0", + "retry": "^0.13.1" + }, "engines": { - "node": ">= 6.0.0", - "npm": ">= 3.0.0" + "node": ">=8" } }, - "node_modules/sockjs": { - "version": "0.3.24", - "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.24.tgz", - "integrity": "sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ==", + "node_modules/p-retry/node_modules/retry": { + "version": "0.13.1", + "resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz", + "integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==", "dev": true, - "dependencies": { - "faye-websocket": "^0.11.3", - "uuid": "^8.3.2", - "websocket-driver": "^0.7.4" + "engines": { + "node": ">= 4" } }, - "node_modules/socks": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/socks/-/socks-2.7.1.tgz", - "integrity": "sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ==", + "node_modules/p-try": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", + "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/pacote": { + "version": "15.2.0", + "resolved": "https://registry.npmjs.org/pacote/-/pacote-15.2.0.tgz", + "integrity": "sha512-rJVZeIwHTUta23sIZgEIM62WYwbmGbThdbnkt81ravBplQv+HjyroqnLRNH2+sLJHcGZmLRmhPwACqhfTcOmnA==", "dev": true, "dependencies": { - "ip": "^2.0.0", - "smart-buffer": "^4.2.0" + "@npmcli/git": "^4.0.0", + "@npmcli/installed-package-contents": "^2.0.1", + "@npmcli/promise-spawn": "^6.0.1", + "@npmcli/run-script": "^6.0.0", + "cacache": "^17.0.0", + "fs-minipass": "^3.0.0", + "minipass": "^5.0.0", + "npm-package-arg": "^10.0.0", + "npm-packlist": "^7.0.0", + "npm-pick-manifest": "^8.0.0", + "npm-registry-fetch": "^14.0.0", + "proc-log": "^3.0.0", + "promise-retry": "^2.0.1", + "read-package-json": "^6.0.0", + "read-package-json-fast": "^3.0.0", + "sigstore": "^1.3.0", + "ssri": "^10.0.0", + "tar": "^6.1.11" + }, + "bin": { + "pacote": "lib/bin.js" }, "engines": { - "node": ">= 10.13.0", - "npm": ">= 3.0.0" + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "node_modules/socks-proxy-agent": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz", - "integrity": "sha512-Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww==", + "node_modules/pako": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz", + "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==", + "dev": true + }, + "node_modules/parent-module": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", + "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", "dev": true, "dependencies": { - "agent-base": "^6.0.2", - "debug": "^4.3.3", - "socks": "^2.6.2" + "callsites": "^3.0.0" }, "engines": { - "node": ">= 10" + "node": ">=6" } }, - "node_modules/source-map": { - "version": "0.7.4", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz", - "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==", + "node_modules/parse-json": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", + "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==", "dev": true, + "dependencies": { + "@babel/code-frame": "^7.0.0", + "error-ex": "^1.3.1", + "json-parse-even-better-errors": "^2.3.0", + "lines-and-columns": "^1.1.6" + }, "engines": { - "node": ">= 8" + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/source-map-js": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz", - "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==", + "node_modules/parse-json/node_modules/lines-and-columns": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", + "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==", + "dev": true + }, + "node_modules/parse-node-version": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz", + "integrity": "sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==", "dev": true, "engines": { - "node": ">=0.10.0" + "node": ">= 0.10" } }, - "node_modules/source-map-loader": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/source-map-loader/-/source-map-loader-4.0.1.tgz", - "integrity": "sha512-oqXpzDIByKONVY8g1NUPOTQhe0UTU5bWUl32GSkqK2LjJj0HmwTMVKxcUip0RgAYhY1mqgOxjbQM48a0mmeNfA==", - "dev": true, + "node_modules/parse5": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.1.2.tgz", + "integrity": "sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==", + "devOptional": true, "dependencies": { - "abab": "^2.0.6", - "iconv-lite": "^0.6.3", - "source-map-js": "^1.0.2" - }, - "engines": { - "node": ">= 14.15.0" + "entities": "^4.4.0" }, "funding": { - "type": "opencollective", - "url": "https://opencollective.com/webpack" + "url": "https://github.com/inikulin/parse5?sponsor=1" + } + }, + "node_modules/parse5-html-rewriting-stream": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/parse5-html-rewriting-stream/-/parse5-html-rewriting-stream-7.0.0.tgz", + "integrity": "sha512-mazCyGWkmCRWDI15Zp+UiCqMp/0dgEmkZRvhlsqqKYr4SsVm/TvnSpD9fCvqCA2zoWJcfRym846ejWBBHRiYEg==", + "dev": true, + "dependencies": { + "entities": "^4.3.0", + "parse5": "^7.0.0", + "parse5-sax-parser": "^7.0.0" }, - "peerDependencies": { - "webpack": "^5.72.1" + "funding": { + "url": "https://github.com/inikulin/parse5?sponsor=1" } }, - "node_modules/source-map-loader/node_modules/iconv-lite": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", - "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", + "node_modules/parse5-sax-parser": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/parse5-sax-parser/-/parse5-sax-parser-7.0.0.tgz", + "integrity": "sha512-5A+v2SNsq8T6/mG3ahcz8ZtQ0OUFTatxPbeidoMB7tkJSGDY3tdfl4MHovtLQHkEn5CGxijNWRQHhRQ6IRpXKg==", "dev": true, "dependencies": { - "safer-buffer": ">= 2.1.2 < 3.0.0" + "parse5": "^7.0.0" }, + "funding": { + "url": "https://github.com/inikulin/parse5?sponsor=1" + } + }, + "node_modules/parseurl": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", + "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==", + "dev": true, "engines": { - "node": ">=0.10.0" + "node": ">= 0.8" } }, - "node_modules/source-map-support": { - "version": "0.5.21", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", - "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", - "dependencies": { - "buffer-from": "^1.0.0", - "source-map": "^0.6.0" + "node_modules/path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "dev": true, + "engines": { + "node": ">=8" } }, - "node_modules/source-map-support/node_modules/source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "node_modules/path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", + "dev": true, "engines": { "node": ">=0.10.0" } }, - "node_modules/spdx-correct": { + "node_modules/path-key": { "version": "3.1.1", - "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz", - "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", "dev": true, - "dependencies": { - "spdx-expression-parse": "^3.0.0", - "spdx-license-ids": "^3.0.0" + "engines": { + "node": ">=8" } }, - "node_modules/spdx-exceptions": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz", - "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==", + "node_modules/path-parse": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", + "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", "dev": true }, - "node_modules/spdx-expression-parse": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz", - "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==", + "node_modules/path-scurry": { + "version": "1.10.1", + "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.10.1.tgz", + "integrity": "sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ==", "dev": true, "dependencies": { - "spdx-exceptions": "^2.1.0", - "spdx-license-ids": "^3.0.0" + "lru-cache": "^9.1.1 || ^10.0.0", + "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/spdx-license-ids": { - "version": "3.0.12", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.12.tgz", - "integrity": "sha512-rr+VVSXtRhO4OHbXUiAF7xW3Bo9DuuF6C5jH+q/x15j2jniycgKbxU09Hr0WqlSLUs4i4ltHGXqTe7VHclYWyA==", + "node_modules/path-scurry/node_modules/lru-cache": { + "version": "10.0.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.0.1.tgz", + "integrity": "sha512-IJ4uwUTi2qCccrioU6g9g/5rvvVl13bsdczUUcqbciD9iLr095yj8DQKdObriEvuNSx325N1rV1O0sJFszx75g==", + "dev": true, + "engines": { + "node": "14 || >=16.14" + } + }, + "node_modules/path-to-regexp": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", + "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==", "dev": true }, - "node_modules/spdy": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz", - "integrity": "sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==", + "node_modules/path-type": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", + "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", "dev": true, - "dependencies": { - "debug": "^4.1.0", - "handle-thing": "^2.0.0", - "http-deceiver": "^1.2.7", - "select-hose": "^2.0.0", - "spdy-transport": "^3.0.0" - }, "engines": { - "node": ">=6.0.0" + "node": ">=8" } }, - "node_modules/spdy-transport": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz", - "integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==", - "dev": true, + "node_modules/photoviewer": { + "version": "3.8.1", + "resolved": "https://registry.npmjs.org/photoviewer/-/photoviewer-3.8.1.tgz", + "integrity": "sha512-JkG1j0n/24y3HZ4v+1JEcHOqPwPV/ltRMw3Z0TAUQzgeorMghbqE0IGQneljkc0qkNCjgiNhwG1ApWvnxoQMWg==", "dependencies": { - "debug": "^4.1.0", - "detect-node": "^2.0.4", - "hpack.js": "^2.1.6", - "obuf": "^1.1.2", - "readable-stream": "^3.0.6", - "wbuf": "^1.7.3" + "domq.js": "^0.6.8" } }, - "node_modules/sprintf-js": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==", + "node_modules/picocolors": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", + "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==", "dev": true }, - "node_modules/ssri": { - "version": "10.0.1", - "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.1.tgz", - "integrity": "sha512-WVy6di9DlPOeBWEjMScpNipeSX2jIZBGEn5Uuo8Q7aIuFEuDX0pw8RxcOjlD1TWP4obi24ki7m/13+nFpcbXrw==", + "node_modules/picomatch": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", "dev": true, - "dependencies": { - "minipass": "^4.0.0" - }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/stack-utils": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz", - "integrity": "sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==", - "dev": true, - "dependencies": { - "escape-string-regexp": "^2.0.0" + "node": ">=8.6" }, - "engines": { - "node": ">=10" + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" } }, - "node_modules/stack-utils/node_modules/escape-string-regexp": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz", - "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==", + "node_modules/pify": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", + "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==", "dev": true, + "optional": true, "engines": { - "node": ">=8" + "node": ">=6" } }, - "node_modules/statuses": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", - "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==", + "node_modules/pirates": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz", + "integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==", "dev": true, "engines": { - "node": ">= 0.8" + "node": ">= 6" } }, - "node_modules/stop-iteration-iterator": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.0.0.tgz", - "integrity": "sha512-iCGQj+0l0HOdZ2AEeBADlsRC+vsnDsZsbdSiH1yNSjcfKM7fdpCMfqAL/dwF5BLiw/XhRft/Wax6zQbhq2BcjQ==", + "node_modules/piscina": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/piscina/-/piscina-4.0.0.tgz", + "integrity": "sha512-641nAmJS4k4iqpNUqfggqUBUMmlw0ZoM5VZKdQkV2e970Inn3Tk9kroCc1wpsYLD07vCwpys5iY0d3xI/9WkTg==", "dev": true, "dependencies": { - "internal-slot": "^1.0.4" + "eventemitter-asyncresource": "^1.0.0", + "hdr-histogram-js": "^2.0.1", + "hdr-histogram-percentiles-obj": "^3.0.0" }, - "engines": { - "node": ">= 0.4" + "optionalDependencies": { + "nice-napi": "^1.0.2" } }, - "node_modules/string_decoder": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", - "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", + "node_modules/pkg-dir": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-7.0.0.tgz", + "integrity": "sha512-Ie9z/WINcxxLp27BKOCHGde4ITq9UklYKDzVo1nhk5sqGEXU3FpkwP5GM2voTGJkGd9B3Otl+Q4uwSOeSUtOBA==", "dev": true, "dependencies": { - "safe-buffer": "~5.2.0" + "find-up": "^6.3.0" + }, + "engines": { + "node": ">=14.16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/string_decoder/node_modules/safe-buffer": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ] - }, - "node_modules/string-length": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz", - "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==", + "node_modules/pkg-dir/node_modules/find-up": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-6.3.0.tgz", + "integrity": "sha512-v2ZsoEuVHYy8ZIlYqwPe/39Cy+cFDzp4dXPaxNvkEuouymu+2Jbz0PxpKarJHYJTmv2HWT3O382qY8l4jMWthw==", "dev": true, "dependencies": { - "char-regex": "^1.0.2", - "strip-ansi": "^6.0.0" + "locate-path": "^7.1.0", + "path-exists": "^5.0.0" }, "engines": { - "node": ">=10" + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/string-width": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "node_modules/pkg-dir/node_modules/locate-path": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-7.2.0.tgz", + "integrity": "sha512-gvVijfZvn7R+2qyPX8mAuKcFGDf6Nc61GdvGafQsHL0sBIxfKzA+usWn4GFC/bk+QdwPUD4kWFJLhElipq+0VA==", "dev": true, "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" + "p-locate": "^6.0.0" }, "engines": { - "node": ">=8" + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "node_modules/pkg-dir/node_modules/p-limit": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-4.0.0.tgz", + "integrity": "sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==", "dev": true, "dependencies": { - "ansi-regex": "^5.0.1" + "yocto-queue": "^1.0.0" }, "engines": { - "node": ">=8" + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/strip-bom": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz", - "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==", + "node_modules/pkg-dir/node_modules/p-locate": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-6.0.0.tgz", + "integrity": "sha512-wPrq66Llhl7/4AGC6I+cqxT07LhXvWL08LNXz1fENOw0Ap4sRZZ/gZpTTJ5jpurzzzfS2W/Ge9BY3LgLjCShcw==", "dev": true, + "dependencies": { + "p-limit": "^4.0.0" + }, "engines": { - "node": ">=8" + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/strip-final-newline": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", - "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==", + "node_modules/pkg-dir/node_modules/path-exists": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-5.0.0.tgz", + "integrity": "sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ==", "dev": true, "engines": { - "node": ">=6" + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" } }, - "node_modules/strip-json-comments": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", - "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", + "node_modules/pkg-dir/node_modules/yocto-queue": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.0.0.tgz", + "integrity": "sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==", "dev": true, "engines": { - "node": ">=8" + "node": ">=12.20" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "node_modules/postcss": { + "version": "8.4.31", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz", + "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==", "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/postcss/" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/postcss" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], "dependencies": { - "has-flag": "^3.0.0" + "nanoid": "^3.3.6", + "picocolors": "^1.0.0", + "source-map-js": "^1.0.2" }, "engines": { - "node": ">=4" + "node": "^10 || ^12 || >=14" } }, - "node_modules/supports-hyperlinks": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.3.0.tgz", - "integrity": "sha512-RpsAZlpWcDwOPQA22aCH4J0t7L8JmAvsCxfOSEwm7cQs3LshN36QaTkwd70DnBOXDWGssw2eUoc8CaRWT0XunA==", + "node_modules/postcss-loader": { + "version": "7.3.3", + "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-7.3.3.tgz", + "integrity": "sha512-YgO/yhtevGO/vJePCQmTxiaEwER94LABZN0ZMT4A0vsak9TpO+RvKRs7EmJ8peIlB9xfXCsS7M8LjqncsUZ5HA==", "dev": true, "dependencies": { - "has-flag": "^4.0.0", - "supports-color": "^7.0.0" + "cosmiconfig": "^8.2.0", + "jiti": "^1.18.2", + "semver": "^7.3.8" }, "engines": { - "node": ">=8" + "node": ">= 14.15.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, + "peerDependencies": { + "postcss": "^7.0.0 || ^8.0.1", + "webpack": "^5.0.0" } }, - "node_modules/supports-hyperlinks/node_modules/has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "node_modules/postcss-modules-extract-imports": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz", + "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==", "dev": true, "engines": { - "node": ">=8" + "node": "^10 || ^12 || >= 14" + }, + "peerDependencies": { + "postcss": "^8.1.0" } }, - "node_modules/supports-hyperlinks/node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "node_modules/postcss-modules-local-by-default": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.3.tgz", + "integrity": "sha512-2/u2zraspoACtrbFRnTijMiQtb4GW4BvatjaG/bCjYQo8kLTdevCUlwuBHx2sCnSyrI3x3qj4ZK1j5LQBgzmwA==", "dev": true, "dependencies": { - "has-flag": "^4.0.0" + "icss-utils": "^5.0.0", + "postcss-selector-parser": "^6.0.2", + "postcss-value-parser": "^4.1.0" }, "engines": { - "node": ">=8" - } - }, - "node_modules/supports-preserve-symlinks-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", - "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", - "dev": true, - "engines": { - "node": ">= 0.4" + "node": "^10 || ^12 || >= 14" }, - "funding": { - "url": "https://github.com/sponsors/ljharb" + "peerDependencies": { + "postcss": "^8.1.0" } }, - "node_modules/symbol-observable": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-4.0.0.tgz", - "integrity": "sha512-b19dMThMV4HVFynSAM1++gBHAbk2Tc/osgLIBZMKsyqh34jb2e8Os7T6ZW/Bt3pJFdBTd2JwAnAAEQV7rSNvcQ==", + "node_modules/postcss-modules-scope": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz", + "integrity": "sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==", "dev": true, + "dependencies": { + "postcss-selector-parser": "^6.0.4" + }, "engines": { - "node": ">=0.10" + "node": "^10 || ^12 || >= 14" + }, + "peerDependencies": { + "postcss": "^8.1.0" } }, - "node_modules/symbol-tree": { - "version": "3.2.4", - "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz", - "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==", - "dev": true - }, - "node_modules/tapable": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz", - "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==", + "node_modules/postcss-modules-values": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz", + "integrity": "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==", "dev": true, + "dependencies": { + "icss-utils": "^5.0.0" + }, "engines": { - "node": ">=6" + "node": "^10 || ^12 || >= 14" + }, + "peerDependencies": { + "postcss": "^8.1.0" } }, - "node_modules/tar": { - "version": "6.1.13", - "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.13.tgz", - "integrity": "sha512-jdIBIN6LTIe2jqzay/2vtYLlBHa3JF42ot3h1dW8Q0PaAG4v8rm0cvpVePtau5C6OKXGGcgO9q2AMNSWxiLqKw==", + "node_modules/postcss-selector-parser": { + "version": "6.0.13", + "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.13.tgz", + "integrity": "sha512-EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ==", "dev": true, "dependencies": { - "chownr": "^2.0.0", - "fs-minipass": "^2.0.0", - "minipass": "^4.0.0", - "minizlib": "^2.1.1", - "mkdirp": "^1.0.3", - "yallist": "^4.0.0" + "cssesc": "^3.0.0", + "util-deprecate": "^1.0.2" }, "engines": { - "node": ">=10" + "node": ">=4" } }, - "node_modules/tar/node_modules/fs-minipass": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", - "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", + "node_modules/postcss-value-parser": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz", + "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==", + "dev": true + }, + "node_modules/prelude-ls": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", + "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", "dev": true, - "dependencies": { - "minipass": "^3.0.0" - }, "engines": { - "node": ">= 8" + "node": ">= 0.8.0" } }, - "node_modules/tar/node_modules/fs-minipass/node_modules/minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "node_modules/prettier": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.0.3.tgz", + "integrity": "sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg==", "dev": true, - "dependencies": { - "yallist": "^4.0.0" + "bin": { + "prettier": "bin/prettier.cjs" }, "engines": { - "node": ">=8" + "node": ">=14" + }, + "funding": { + "url": "https://github.com/prettier/prettier?sponsor=1" } }, - "node_modules/terminal-link": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/terminal-link/-/terminal-link-2.1.1.tgz", - "integrity": "sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==", + "node_modules/pretty-bytes": { + "version": "5.6.0", + "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.6.0.tgz", + "integrity": "sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==", "dev": true, - "dependencies": { - "ansi-escapes": "^4.2.1", - "supports-hyperlinks": "^2.0.0" - }, "engines": { - "node": ">=8" + "node": ">=6" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/terser": { - "version": "5.16.1", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.16.1.tgz", - "integrity": "sha512-xvQfyfA1ayT0qdK47zskQgRZeWLoOQ8JQ6mIgRGVNwZKdQMU+5FkCBjmv4QjcrTzyZquRw2FVtlJSRUmMKQslw==", + "node_modules/pretty-format": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz", + "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==", "dev": true, "dependencies": { - "@jridgewell/source-map": "^0.3.2", - "acorn": "^8.5.0", - "commander": "^2.20.0", - "source-map-support": "~0.5.20" - }, - "bin": { - "terser": "bin/terser" + "@jest/schemas": "^29.6.3", + "ansi-styles": "^5.0.0", + "react-is": "^18.0.0" }, "engines": { - "node": ">=10" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/terser-webpack-plugin": { - "version": "5.3.6", - "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.6.tgz", - "integrity": "sha512-kfLFk+PoLUQIbLmB1+PZDMRSZS99Mp+/MHqDNmMA6tOItzRt+Npe3E+fsMs5mfcM0wCtrrdU387UnV+vnSffXQ==", + "node_modules/pretty-format/node_modules/ansi-styles": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", + "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", "dev": true, - "dependencies": { - "@jridgewell/trace-mapping": "^0.3.14", - "jest-worker": "^27.4.5", - "schema-utils": "^3.1.1", - "serialize-javascript": "^6.0.0", - "terser": "^5.14.1" - }, "engines": { - "node": ">= 10.13.0" + "node": ">=10" }, "funding": { - "type": "opencollective", - "url": "https://opencollective.com/webpack" - }, - "peerDependencies": { - "webpack": "^5.1.0" - }, - "peerDependenciesMeta": { - "@swc/core": { - "optional": true - }, - "esbuild": { - "optional": true - }, - "uglify-js": { - "optional": true - } + "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, - "node_modules/terser-webpack-plugin/node_modules/ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "node_modules/proc-log": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-3.0.0.tgz", + "integrity": "sha512-++Vn7NS4Xf9NacaU9Xq3URUuqZETPsf8L4j5/ckhaRYsfPeRyzGw+iDjFhV/Jr3uNmTvvddEJFWh5R1gRgUH8A==", "dev": true, - "dependencies": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/epoberezkin" + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "node_modules/terser-webpack-plugin/node_modules/ajv-keywords": { - "version": "3.5.2", - "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", - "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", - "dev": true, - "peerDependencies": { - "ajv": "^6.9.1" - } + "node_modules/process-nextick-args": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", + "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==", + "dev": true }, - "node_modules/terser-webpack-plugin/node_modules/json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "node_modules/promise-inflight": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz", + "integrity": "sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==", "dev": true }, - "node_modules/terser-webpack-plugin/node_modules/schema-utils": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz", - "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==", + "node_modules/promise-retry": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz", + "integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==", "dev": true, "dependencies": { - "@types/json-schema": "^7.0.8", - "ajv": "^6.12.5", - "ajv-keywords": "^3.5.2" + "err-code": "^2.0.2", + "retry": "^0.12.0" }, "engines": { - "node": ">= 10.13.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/webpack" + "node": ">=10" } }, - "node_modules/test-exclude": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz", - "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==", + "node_modules/prompts": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz", + "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==", "dev": true, "dependencies": { - "@istanbuljs/schema": "^0.1.2", - "glob": "^7.1.4", - "minimatch": "^3.0.4" + "kleur": "^3.0.3", + "sisteransi": "^1.0.5" }, "engines": { - "node": ">=8" - } - }, - "node_modules/test-exclude/node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" + "node": ">= 6" } }, - "node_modules/test-exclude/node_modules/glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "node_modules/proxy-addr": { + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", + "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==", "dev": true, "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" + "forwarded": "0.2.0", + "ipaddr.js": "1.9.1" }, "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" + "node": ">= 0.10" } }, - "node_modules/test-exclude/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "node_modules/proxy-addr/node_modules/ipaddr.js": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", + "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==", "dev": true, - "dependencies": { - "brace-expansion": "^1.1.7" - }, "engines": { - "node": "*" + "node": ">= 0.10" } }, - "node_modules/text-table": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", - "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", + "node_modules/proxy-from-env": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==", "dev": true }, - "node_modules/through": { - "version": "2.3.8", - "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", - "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==", - "dev": true + "node_modules/prr": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz", + "integrity": "sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw==", + "dev": true, + "optional": true }, - "node_modules/thunky": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz", - "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==", + "node_modules/psl": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz", + "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==", "dev": true }, - "node_modules/tmp": { - "version": "0.0.33", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", - "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", + "node_modules/punycode": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", + "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/pure-rand": { + "version": "6.0.4", + "resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-6.0.4.tgz", + "integrity": "sha512-LA0Y9kxMYv47GIPJy6MI84fqTd2HmYZI83W/kM/SkKfDlajnZYfmXFTxkbY+xSBPkLJxltMa9hIkmdc29eguMA==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://github.com/sponsors/dubzzz" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/fast-check" + } + ] + }, + "node_modules/qs": { + "version": "6.11.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz", + "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==", "dev": true, "dependencies": { - "os-tmpdir": "~1.0.2" + "side-channel": "^1.0.4" }, "engines": { - "node": ">=0.6.0" + "node": ">=0.6" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/tmpl": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz", - "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==", + "node_modules/querystringify": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz", + "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==", "dev": true }, - "node_modules/to-fast-properties": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", - "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==", + "node_modules/queue-microtask": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", + "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", "dev": true, - "engines": { - "node": ">=4" - } + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ] }, - "node_modules/to-regex-range": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", - "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "node_modules/randombytes": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", + "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==", "dev": true, "dependencies": { - "is-number": "^7.0.0" - }, - "engines": { - "node": ">=8.0" + "safe-buffer": "^5.1.0" } }, - "node_modules/toidentifier": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", - "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==", + "node_modules/range-parser": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", + "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==", "dev": true, "engines": { - "node": ">=0.6" + "node": ">= 0.6" } }, - "node_modules/tough-cookie": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.2.tgz", - "integrity": "sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ==", + "node_modules/raw-body": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz", + "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==", "dev": true, "dependencies": { - "psl": "^1.1.33", - "punycode": "^2.1.1", - "universalify": "^0.2.0", - "url-parse": "^1.5.3" + "bytes": "3.1.2", + "http-errors": "2.0.0", + "iconv-lite": "0.4.24", + "unpipe": "1.0.0" }, "engines": { - "node": ">=6" + "node": ">= 0.8" } }, - "node_modules/tr46": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-3.0.0.tgz", - "integrity": "sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==", + "node_modules/raw-body/node_modules/bytes": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", + "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", "dev": true, - "dependencies": { - "punycode": "^2.1.1" - }, "engines": { - "node": ">=12" + "node": ">= 0.8" } }, - "node_modules/tree-kill": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz", - "integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==", + "node_modules/react-is": { + "version": "18.2.0", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz", + "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==", + "dev": true + }, + "node_modules/read-package-json": { + "version": "6.0.4", + "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-6.0.4.tgz", + "integrity": "sha512-AEtWXYfopBj2z5N5PbkAOeNHRPUg5q+Nen7QLxV8M2zJq1ym6/lCz3fYNTCXe19puu2d06jfHhrP7v/S2PtMMw==", "dev": true, - "bin": { - "tree-kill": "cli.js" + "dependencies": { + "glob": "^10.2.2", + "json-parse-even-better-errors": "^3.0.0", + "normalize-package-data": "^5.0.0", + "npm-normalize-package-bin": "^3.0.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "node_modules/tsconfig-paths": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-4.1.2.tgz", - "integrity": "sha512-uhxiMgnXQp1IR622dUXI+9Ehnws7i/y6xvpZB9IbUVOPy0muvdvgXeZOn88UcGPiT98Vp3rJPTa8bFoalZ3Qhw==", + "node_modules/read-package-json-fast": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/read-package-json-fast/-/read-package-json-fast-3.0.2.tgz", + "integrity": "sha512-0J+Msgym3vrLOUB3hzQCuZHII0xkNGCtz/HJH9xZshwv9DbDwkw1KaE3gx/e2J5rpEY5rtOy6cyhKOPrkP7FZw==", "dev": true, "dependencies": { - "json5": "^2.2.2", - "minimist": "^1.2.6", - "strip-bom": "^3.0.0" + "json-parse-even-better-errors": "^3.0.0", + "npm-normalize-package-bin": "^3.0.0" }, "engines": { - "node": ">=6" + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "node_modules/tsconfig-paths/node_modules/strip-bom": { + "node_modules/read-package-json-fast/node_modules/json-parse-even-better-errors": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", - "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==", + "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-3.0.0.tgz", + "integrity": "sha512-iZbGHafX/59r39gPwVPRBGw0QQKnA7tte5pSMrhWOW7swGsVvVTjmfyAV9pNqk8YGT7tRCdxRu8uzcgZwoDooA==", "dev": true, "engines": { - "node": ">=4" + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "node_modules/tslib": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz", - "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==" - }, - "node_modules/tsutils": { - "version": "3.21.0", - "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz", - "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==", + "node_modules/read-package-json/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", "dev": true, "dependencies": { - "tslib": "^1.8.1" - }, - "engines": { - "node": ">= 6" - }, - "peerDependencies": { - "typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta" + "balanced-match": "^1.0.0" } }, - "node_modules/tsutils/node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", - "dev": true - }, - "node_modules/type-check": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", - "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", + "node_modules/read-package-json/node_modules/glob": { + "version": "10.3.10", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz", + "integrity": "sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==", "dev": true, "dependencies": { - "prelude-ls": "^1.2.1" + "foreground-child": "^3.1.0", + "jackspeak": "^2.3.5", + "minimatch": "^9.0.1", + "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0", + "path-scurry": "^1.10.1" + }, + "bin": { + "glob": "dist/esm/bin.mjs" }, "engines": { - "node": ">= 0.8.0" + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/type-detect": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", - "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==", + "node_modules/read-package-json/node_modules/json-parse-even-better-errors": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-3.0.0.tgz", + "integrity": "sha512-iZbGHafX/59r39gPwVPRBGw0QQKnA7tte5pSMrhWOW7swGsVvVTjmfyAV9pNqk8YGT7tRCdxRu8uzcgZwoDooA==", "dev": true, "engines": { - "node": ">=4" + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "node_modules/type-fest": { - "version": "0.21.3", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz", - "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==", + "node_modules/read-package-json/node_modules/minimatch": { + "version": "9.0.3", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", + "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==", "dev": true, + "dependencies": { + "brace-expansion": "^2.0.1" + }, "engines": { - "node": ">=10" + "node": ">=16 || 14 >=14.17" }, "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/type-is": { - "version": "1.6.18", - "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", - "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==", + "node_modules/readable-stream": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", + "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", "dev": true, "dependencies": { - "media-typer": "0.3.0", - "mime-types": "~2.1.24" + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" }, "engines": { - "node": ">= 0.6" + "node": ">= 6" } }, - "node_modules/typed-assert": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/typed-assert/-/typed-assert-1.0.9.tgz", - "integrity": "sha512-KNNZtayBCtmnNmbo5mG47p1XsCyrx6iVqomjcZnec/1Y5GGARaxPs6r49RnSPeUP3YjNYiU9sQHAtY4BBvnZwg==", - "dev": true - }, - "node_modules/typescript": { - "version": "4.9.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.4.tgz", - "integrity": "sha512-Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg==", - "dev": true, - "bin": { - "tsc": "bin/tsc", - "tsserver": "bin/tsserver" + "node_modules/readdirp": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", + "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", + "dev": true, + "dependencies": { + "picomatch": "^2.2.1" }, "engines": { - "node": ">=4.2.0" + "node": ">=8.10.0" } }, - "node_modules/unicode-canonical-property-names-ecmascript": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz", - "integrity": "sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==", - "dev": true, - "engines": { - "node": ">=4" - } + "node_modules/reflect-metadata": { + "version": "0.1.13", + "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.13.tgz", + "integrity": "sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg==", + "dev": true }, - "node_modules/unicode-match-property-ecmascript": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz", - "integrity": "sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==", + "node_modules/regenerate": { + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz", + "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==", + "dev": true + }, + "node_modules/regenerate-unicode-properties": { + "version": "10.1.1", + "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.1.tgz", + "integrity": "sha512-X007RyZLsCJVVrjgEFVpLUTZwyOZk3oiL75ZcuYjlIWd6rNJtOjkBwQc5AsRrpbKVkxN6sklw/k/9m2jJYOf8Q==", "dev": true, "dependencies": { - "unicode-canonical-property-names-ecmascript": "^2.0.0", - "unicode-property-aliases-ecmascript": "^2.0.0" + "regenerate": "^1.4.2" }, "engines": { "node": ">=4" } }, - "node_modules/unicode-match-property-value-ecmascript": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz", - "integrity": "sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA==", + "node_modules/regenerator-runtime": { + "version": "0.13.11", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz", + "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==", + "dev": true + }, + "node_modules/regenerator-transform": { + "version": "0.15.2", + "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.2.tgz", + "integrity": "sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg==", "dev": true, - "engines": { - "node": ">=4" + "dependencies": { + "@babel/runtime": "^7.8.4" } }, - "node_modules/unicode-property-aliases-ecmascript": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz", - "integrity": "sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==", + "node_modules/regex-parser": { + "version": "2.2.11", + "resolved": "https://registry.npmjs.org/regex-parser/-/regex-parser-2.2.11.tgz", + "integrity": "sha512-jbD/FT0+9MBU2XAZluI7w2OBs1RBi6p9M83nkoZayQXXU9e8Robt69FcZc7wU4eJD/YFTjn1JdCk3rbMJajz8Q==", + "dev": true + }, + "node_modules/regexpu-core": { + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.3.2.tgz", + "integrity": "sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ==", "dev": true, + "dependencies": { + "@babel/regjsgen": "^0.8.0", + "regenerate": "^1.4.2", + "regenerate-unicode-properties": "^10.1.0", + "regjsparser": "^0.9.1", + "unicode-match-property-ecmascript": "^2.0.0", + "unicode-match-property-value-ecmascript": "^2.1.0" + }, "engines": { "node": ">=4" } }, - "node_modules/unique-filename": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-3.0.0.tgz", - "integrity": "sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g==", + "node_modules/regjsparser": { + "version": "0.9.1", + "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.9.1.tgz", + "integrity": "sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==", "dev": true, "dependencies": { - "unique-slug": "^4.0.0" + "jsesc": "~0.5.0" }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "bin": { + "regjsparser": "bin/parser" } }, - "node_modules/unique-slug": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-4.0.0.tgz", - "integrity": "sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ==", + "node_modules/regjsparser/node_modules/jsesc": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", + "integrity": "sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==", "dev": true, - "dependencies": { - "imurmurhash": "^0.1.4" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "bin": { + "jsesc": "bin/jsesc" } }, - "node_modules/universalify": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz", - "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==", + "node_modules/require-directory": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", + "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", "dev": true, "engines": { - "node": ">= 4.0.0" + "node": ">=0.10.0" } }, - "node_modules/unpipe": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", - "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==", + "node_modules/require-from-string": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", + "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==", "dev": true, "engines": { - "node": ">= 0.8" + "node": ">=0.10.0" } }, - "node_modules/update-browserslist-db": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz", - "integrity": "sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==", + "node_modules/requires-port": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz", + "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==", + "dev": true + }, + "node_modules/resolve": { + "version": "1.22.2", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.2.tgz", + "integrity": "sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==", "dev": true, - "funding": [ - { - "type": "opencollective", - "url": "https://opencollective.com/browserslist" - }, - { - "type": "tidelift", - "url": "https://tidelift.com/funding/github/npm/browserslist" - } - ], "dependencies": { - "escalade": "^3.1.1", - "picocolors": "^1.0.0" + "is-core-module": "^2.11.0", + "path-parse": "^1.0.7", + "supports-preserve-symlinks-flag": "^1.0.0" }, "bin": { - "browserslist-lint": "cli.js" + "resolve": "bin/resolve" }, - "peerDependencies": { - "browserslist": ">= 4.21.0" - } - }, - "node_modules/uri-js": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", - "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", - "dev": true, - "dependencies": { - "punycode": "^2.1.0" + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/url-parse": { - "version": "1.5.10", - "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz", - "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==", + "node_modules/resolve-cwd": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz", + "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==", "dev": true, "dependencies": { - "querystringify": "^2.1.1", - "requires-port": "^1.0.0" - } - }, - "node_modules/util-deprecate": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", - "dev": true - }, - "node_modules/utils-merge": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", - "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==", - "dev": true, + "resolve-from": "^5.0.0" + }, "engines": { - "node": ">= 0.4.0" + "node": ">=8" } }, - "node_modules/uuid": { - "version": "8.3.2", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", - "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==", + "node_modules/resolve-from": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", + "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", "dev": true, - "bin": { - "uuid": "dist/bin/uuid" + "engines": { + "node": ">=8" } }, - "node_modules/v8-to-istanbul": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.0.1.tgz", - "integrity": "sha512-74Y4LqY74kLE6IFyIjPtkSTWzUZmj8tdHT9Ii/26dvQ6K9Dl2NbEfj0XgU2sHCtKgt5VupqhlO/5aWuqS+IY1w==", + "node_modules/resolve-url-loader": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/resolve-url-loader/-/resolve-url-loader-5.0.0.tgz", + "integrity": "sha512-uZtduh8/8srhBoMx//5bwqjQ+rfYOUq8zC9NrMUGtjBiGTtFJM42s58/36+hTqeqINcnYe08Nj3LkK9lW4N8Xg==", "dev": true, "dependencies": { - "@jridgewell/trace-mapping": "^0.3.12", - "@types/istanbul-lib-coverage": "^2.0.1", - "convert-source-map": "^1.6.0" + "adjust-sourcemap-loader": "^4.0.0", + "convert-source-map": "^1.7.0", + "loader-utils": "^2.0.0", + "postcss": "^8.2.14", + "source-map": "0.6.1" }, "engines": { - "node": ">=10.12.0" - } - }, - "node_modules/validate-npm-package-license": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", - "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==", - "dev": true, - "dependencies": { - "spdx-correct": "^3.0.0", - "spdx-expression-parse": "^3.0.0" + "node": ">=12" } }, - "node_modules/validate-npm-package-name": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-5.0.0.tgz", - "integrity": "sha512-YuKoXDAhBYxY7SfOKxHBDoSyENFeW5VvIIQp2TGQuit8gpK6MnWaQelBKxso72DoxTZfZdcP3W90LqpSkgPzLQ==", + "node_modules/resolve-url-loader/node_modules/loader-utils": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz", + "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==", "dev": true, "dependencies": { - "builtins": "^5.0.0" + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^2.1.2" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": ">=8.9.0" } }, - "node_modules/vary": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", - "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==", + "node_modules/resolve-url-loader/node_modules/source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", "dev": true, "engines": { - "node": ">= 0.8" + "node": ">=0.10.0" } }, - "node_modules/w3c-hr-time": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz", - "integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==", - "deprecated": "Use your platform's native performance.now() and performance.timeOrigin.", + "node_modules/resolve.exports": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.2.tgz", + "integrity": "sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg==", "dev": true, - "dependencies": { - "browser-process-hrtime": "^1.0.0" + "engines": { + "node": ">=10" } }, - "node_modules/w3c-xmlserializer": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-3.0.0.tgz", - "integrity": "sha512-3WFqGEgSXIyGhOmAFtlicJNMjEps8b1MG31NCA0/vOF9+nKMUW1ckhi9cnNHmf88Rzw5V+dwIwsm2C7X8k9aQg==", + "node_modules/restore-cursor": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", + "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==", "dev": true, "dependencies": { - "xml-name-validator": "^4.0.0" + "onetime": "^5.1.0", + "signal-exit": "^3.0.2" }, "engines": { - "node": ">=12" + "node": ">=8" } }, - "node_modules/walker": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz", - "integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==", + "node_modules/retry": { + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz", + "integrity": "sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==", "dev": true, - "dependencies": { - "makeerror": "1.0.12" + "engines": { + "node": ">= 4" } }, - "node_modules/watchpack": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz", - "integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==", + "node_modules/reusify": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", + "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", "dev": true, - "dependencies": { - "glob-to-regexp": "^0.4.1", - "graceful-fs": "^4.1.2" - }, "engines": { - "node": ">=10.13.0" + "iojs": ">=1.0.0", + "node": ">=0.10.0" } }, - "node_modules/wbuf": { - "version": "1.7.3", - "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz", - "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==", + "node_modules/rimraf": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", "dev": true, "dependencies": { - "minimalistic-assert": "^1.0.0" + "glob": "^7.1.3" + }, + "bin": { + "rimraf": "bin.js" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/wcwidth": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz", - "integrity": "sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==", + "node_modules/rollup": { + "version": "3.29.4", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.29.4.tgz", + "integrity": "sha512-oWzmBZwvYrU0iJHtDmhsm662rC15FRXmcjCk1xD771dFDx5jJ02ufAQQTn0etB2emNk4J9EZg/yWKpsn9BWGRw==", "dev": true, - "dependencies": { - "defaults": "^1.0.3" + "bin": { + "rollup": "dist/bin/rollup" + }, + "engines": { + "node": ">=14.18.0", + "npm": ">=8.0.0" + }, + "optionalDependencies": { + "fsevents": "~2.3.2" } }, - "node_modules/webidl-conversions": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz", - "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==", + "node_modules/run-async": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz", + "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==", "dev": true, "engines": { - "node": ">=12" + "node": ">=0.12.0" } }, - "node_modules/webpack": { - "version": "5.75.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.75.0.tgz", - "integrity": "sha512-piaIaoVJlqMsPtX/+3KTTO6jfvrSYgauFVdt8cr9LTHKmcq/AMd4mhzsiP7ZF/PGRNPGA8336jldh9l2Kt2ogQ==", + "node_modules/run-parallel": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", + "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], "dependencies": { - "@types/eslint-scope": "^3.7.3", - "@types/estree": "^0.0.51", - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/wasm-edit": "1.11.1", - "@webassemblyjs/wasm-parser": "1.11.1", - "acorn": "^8.7.1", - "acorn-import-assertions": "^1.7.6", - "browserslist": "^4.14.5", - "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^5.10.0", - "es-module-lexer": "^0.9.0", - "eslint-scope": "5.1.1", - "events": "^3.2.0", - "glob-to-regexp": "^0.4.1", - "graceful-fs": "^4.2.9", - "json-parse-even-better-errors": "^2.3.1", - "loader-runner": "^4.2.0", - "mime-types": "^2.1.27", - "neo-async": "^2.6.2", - "schema-utils": "^3.1.0", - "tapable": "^2.1.1", - "terser-webpack-plugin": "^5.1.3", - "watchpack": "^2.4.0", - "webpack-sources": "^3.2.3" + "queue-microtask": "^1.2.2" + } + }, + "node_modules/rxjs": { + "version": "7.8.1", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz", + "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==", + "dependencies": { + "tslib": "^2.1.0" + } + }, + "node_modules/safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ] + }, + "node_modules/safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", + "dev": true + }, + "node_modules/safevalues": { + "version": "0.3.4", + "resolved": "https://registry.npmjs.org/safevalues/-/safevalues-0.3.4.tgz", + "integrity": "sha512-LRneZZRXNgjzwG4bDQdOTSbze3fHm1EAKN/8bePxnlEZiBmkYEDggaHbuvHI9/hoqHbGfsEA7tWS9GhYHZBBsw==" + }, + "node_modules/sass": { + "version": "1.64.1", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.64.1.tgz", + "integrity": "sha512-16rRACSOFEE8VN7SCgBu1MpYCyN7urj9At898tyzdXFhC+a+yOX5dXwAR7L8/IdPJ1NB8OYoXmD55DM30B2kEQ==", + "dev": true, + "dependencies": { + "chokidar": ">=3.0.0 <4.0.0", + "immutable": "^4.0.0", + "source-map-js": ">=0.6.2 <2.0.0" }, "bin": { - "webpack": "bin/webpack.js" + "sass": "sass.js" }, "engines": { - "node": ">=10.13.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/webpack" - }, - "peerDependenciesMeta": { - "webpack-cli": { - "optional": true - } + "node": ">=14.0.0" } }, - "node_modules/webpack-dev-middleware": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-6.0.1.tgz", - "integrity": "sha512-PZPZ6jFinmqVPJZbisfggDiC+2EeGZ1ZByyMP5sOFJcPPWSexalISz+cvm+j+oYPT7FIJyxT76esjnw9DhE5sw==", + "node_modules/sass-loader": { + "version": "13.3.2", + "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-13.3.2.tgz", + "integrity": "sha512-CQbKl57kdEv+KDLquhC+gE3pXt74LEAzm+tzywcA0/aHZuub8wTErbjAoNI57rPUWRYRNC5WUnNl8eGJNbDdwg==", "dev": true, "dependencies": { - "colorette": "^2.0.10", - "memfs": "^3.4.12", - "mime-types": "^2.1.31", - "range-parser": "^1.2.1", - "schema-utils": "^4.0.0" + "neo-async": "^2.6.2" }, "engines": { "node": ">= 14.15.0" @@ -16830,47 +16380,56 @@ "url": "https://opencollective.com/webpack" }, "peerDependencies": { + "fibers": ">= 3.1.0", + "node-sass": "^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0", + "sass": "^1.3.0", + "sass-embedded": "*", "webpack": "^5.0.0" + }, + "peerDependenciesMeta": { + "fibers": { + "optional": true + }, + "node-sass": { + "optional": true + }, + "sass": { + "optional": true + }, + "sass-embedded": { + "optional": true + } } }, - "node_modules/webpack-dev-server": { - "version": "4.11.1", - "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.11.1.tgz", - "integrity": "sha512-lILVz9tAUy1zGFwieuaQtYiadImb5M3d+H+L1zDYalYoDl0cksAB1UNyuE5MMWJrG6zR1tXkCP2fitl7yoUJiw==", + "node_modules/sax": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/sax/-/sax-1.3.0.tgz", + "integrity": "sha512-0s+oAmw9zLl1V1cS9BtZN7JAd0cW5e0QH4W3LWEK6a4LaLEA2OTpGYWDY+6XasBLtz6wkm3u1xRw95mRuJ59WA==", + "dev": true, + "optional": true + }, + "node_modules/saxes": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz", + "integrity": "sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==", "dev": true, "dependencies": { - "@types/bonjour": "^3.5.9", - "@types/connect-history-api-fallback": "^1.3.5", - "@types/express": "^4.17.13", - "@types/serve-index": "^1.9.1", - "@types/serve-static": "^1.13.10", - "@types/sockjs": "^0.3.33", - "@types/ws": "^8.5.1", - "ansi-html-community": "^0.0.8", - "bonjour-service": "^1.0.11", - "chokidar": "^3.5.3", - "colorette": "^2.0.10", - "compression": "^1.7.4", - "connect-history-api-fallback": "^2.0.0", - "default-gateway": "^6.0.3", - "express": "^4.17.3", - "graceful-fs": "^4.2.6", - "html-entities": "^2.3.2", - "http-proxy-middleware": "^2.0.3", - "ipaddr.js": "^2.0.1", - "open": "^8.0.9", - "p-retry": "^4.5.0", - "rimraf": "^3.0.2", - "schema-utils": "^4.0.0", - "selfsigned": "^2.1.1", - "serve-index": "^1.9.1", - "sockjs": "^0.3.24", - "spdy": "^4.0.2", - "webpack-dev-middleware": "^5.3.1", - "ws": "^8.4.2" + "xmlchars": "^2.2.0" }, - "bin": { - "webpack-dev-server": "bin/webpack-dev-server.js" + "engines": { + "node": ">=10" + } + }, + "node_modules/schema-utils": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz", + "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==", + "dev": true, + "dependencies": { + "@types/json-schema": "^7.0.9", + "ajv": "^8.9.0", + "ajv-formats": "^2.1.1", + "ajv-keywords": "^5.1.0" }, "engines": { "node": ">= 12.13.0" @@ -16878,12964 +16437,1776 @@ "funding": { "type": "opencollective", "url": "https://opencollective.com/webpack" - }, - "peerDependencies": { - "webpack": "^4.37.0 || ^5.0.0" - }, - "peerDependenciesMeta": { - "webpack-cli": { - "optional": true - } } }, - "node_modules/webpack-dev-server/node_modules/webpack-dev-middleware": { - "version": "5.3.3", - "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.3.tgz", - "integrity": "sha512-hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA==", - "dev": true, + "node_modules/select-hose": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz", + "integrity": "sha512-mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg==", + "dev": true + }, + "node_modules/selfsigned": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-2.4.1.tgz", + "integrity": "sha512-th5B4L2U+eGLq1TVh7zNRGBapioSORUeymIydxgFpwww9d2qyKvtuPU2jJuHvYAwwqi2Y596QBL3eEqcPEYL8Q==", + "dev": true, "dependencies": { - "colorette": "^2.0.10", - "memfs": "^3.4.3", - "mime-types": "^2.1.31", - "range-parser": "^1.2.1", - "schema-utils": "^4.0.0" + "@types/node-forge": "^1.3.0", + "node-forge": "^1" }, "engines": { - "node": ">= 12.13.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/webpack" - }, - "peerDependencies": { - "webpack": "^4.0.0 || ^5.0.0" + "node": ">=10" } }, - "node_modules/webpack-merge": { - "version": "5.8.0", - "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.8.0.tgz", - "integrity": "sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q==", + "node_modules/semver": { + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "dev": true, "dependencies": { - "clone-deep": "^4.0.1", - "wildcard": "^2.0.0" + "lru-cache": "^6.0.0" + }, + "bin": { + "semver": "bin/semver.js" }, "engines": { - "node": ">=10.0.0" + "node": ">=10" } }, - "node_modules/webpack-sources": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz", - "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==", + "node_modules/semver/node_modules/lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", "dev": true, + "dependencies": { + "yallist": "^4.0.0" + }, "engines": { - "node": ">=10.13.0" + "node": ">=10" } }, - "node_modules/webpack-subresource-integrity": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/webpack-subresource-integrity/-/webpack-subresource-integrity-5.1.0.tgz", - "integrity": "sha512-sacXoX+xd8r4WKsy9MvH/q/vBtEHr86cpImXwyg74pFIpERKt6FmB8cXpeuh0ZLgclOlHI4Wcll7+R5L02xk9Q==", + "node_modules/semver/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true + }, + "node_modules/send": { + "version": "0.18.0", + "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz", + "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==", "dev": true, "dependencies": { - "typed-assert": "^1.0.8" + "debug": "2.6.9", + "depd": "2.0.0", + "destroy": "1.2.0", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "etag": "~1.8.1", + "fresh": "0.5.2", + "http-errors": "2.0.0", + "mime": "1.6.0", + "ms": "2.1.3", + "on-finished": "2.4.1", + "range-parser": "~1.2.1", + "statuses": "2.0.1" }, "engines": { - "node": ">= 12" - }, - "peerDependencies": { - "html-webpack-plugin": ">= 5.0.0-beta.1 < 6", - "webpack": "^5.12.0" - }, - "peerDependenciesMeta": { - "html-webpack-plugin": { - "optional": true - } + "node": ">= 0.8.0" } }, - "node_modules/webpack/node_modules/ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "node_modules/send/node_modules/debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "dev": true, "dependencies": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/epoberezkin" + "ms": "2.0.0" } }, - "node_modules/webpack/node_modules/ajv-keywords": { - "version": "3.5.2", - "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", - "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", - "dev": true, - "peerDependencies": { - "ajv": "^6.9.1" - } + "node_modules/send/node_modules/debug/node_modules/ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", + "dev": true }, - "node_modules/webpack/node_modules/json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "node_modules/send/node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "dev": true }, - "node_modules/webpack/node_modules/schema-utils": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz", - "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==", + "node_modules/serialize-javascript": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.1.tgz", + "integrity": "sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==", "dev": true, "dependencies": { - "@types/json-schema": "^7.0.8", - "ajv": "^6.12.5", - "ajv-keywords": "^3.5.2" - }, - "engines": { - "node": ">= 10.13.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/webpack" + "randombytes": "^2.1.0" } }, - "node_modules/websocket-driver": { - "version": "0.7.4", - "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz", - "integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==", + "node_modules/serve-index": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz", + "integrity": "sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw==", "dev": true, "dependencies": { - "http-parser-js": ">=0.5.1", - "safe-buffer": ">=5.1.0", - "websocket-extensions": ">=0.1.1" + "accepts": "~1.3.4", + "batch": "0.6.1", + "debug": "2.6.9", + "escape-html": "~1.0.3", + "http-errors": "~1.6.2", + "mime-types": "~2.1.17", + "parseurl": "~1.3.2" }, "engines": { - "node": ">=0.8.0" + "node": ">= 0.8.0" } }, - "node_modules/websocket-extensions": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz", - "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==", + "node_modules/serve-index/node_modules/debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "dev": true, - "engines": { - "node": ">=0.8.0" + "dependencies": { + "ms": "2.0.0" } }, - "node_modules/whatwg-encoding": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz", - "integrity": "sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==", + "node_modules/serve-index/node_modules/depd": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", + "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==", "dev": true, - "dependencies": { - "iconv-lite": "0.6.3" - }, "engines": { - "node": ">=12" + "node": ">= 0.6" } }, - "node_modules/whatwg-encoding/node_modules/iconv-lite": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", - "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", + "node_modules/serve-index/node_modules/http-errors": { + "version": "1.6.3", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz", + "integrity": "sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==", "dev": true, "dependencies": { - "safer-buffer": ">= 2.1.2 < 3.0.0" + "depd": "~1.1.2", + "inherits": "2.0.3", + "setprototypeof": "1.1.0", + "statuses": ">= 1.4.0 < 2" }, "engines": { - "node": ">=0.10.0" + "node": ">= 0.6" } }, - "node_modules/whatwg-mimetype": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz", - "integrity": "sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==", + "node_modules/serve-index/node_modules/inherits": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", + "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==", + "dev": true + }, + "node_modules/serve-index/node_modules/ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", + "dev": true + }, + "node_modules/serve-index/node_modules/setprototypeof": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz", + "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==", + "dev": true + }, + "node_modules/serve-index/node_modules/statuses": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", + "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==", "dev": true, "engines": { - "node": ">=12" + "node": ">= 0.6" } }, - "node_modules/whatwg-url": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-10.0.0.tgz", - "integrity": "sha512-CLxxCmdUby142H5FZzn4D8ikO1cmypvXVQktsgosNy4a4BHrDHeciBBGZhb0bNoR5/MltoCatso+vFjjGx8t0w==", + "node_modules/serve-static": { + "version": "1.15.0", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz", + "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==", "dev": true, "dependencies": { - "tr46": "^3.0.0", - "webidl-conversions": "^7.0.0" + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "parseurl": "~1.3.3", + "send": "0.18.0" }, "engines": { - "node": ">=12" + "node": ">= 0.8.0" } }, - "node_modules/which": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/which/-/which-3.0.0.tgz", - "integrity": "sha512-nla//68K9NU6yRiwDY/Q8aU6siKlSs64aEC7+IV56QoAuyQT2ovsJcgGYGyqMOmI/CGN1BOR6mM5EN0FBO+zyQ==", + "node_modules/set-blocking": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", + "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==", + "dev": true + }, + "node_modules/set-function-length": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.1.1.tgz", + "integrity": "sha512-VoaqjbBJKiWtg4yRcKBQ7g7wnGnLV3M8oLvVWwOk2PdYY6PEFegR1vezXR0tw6fZGF9csVakIRjrJiy2veSBFQ==", "dev": true, "dependencies": { - "isexe": "^2.0.0" - }, - "bin": { - "node-which": "bin/which.js" + "define-data-property": "^1.1.1", + "get-intrinsic": "^1.2.1", + "gopd": "^1.0.1", + "has-property-descriptors": "^1.0.0" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": ">= 0.4" } }, - "node_modules/which-boxed-primitive": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz", - "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==", + "node_modules/setprototypeof": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", + "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==", + "dev": true + }, + "node_modules/shallow-clone": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz", + "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==", "dev": true, "dependencies": { - "is-bigint": "^1.0.1", - "is-boolean-object": "^1.1.0", - "is-number-object": "^1.0.4", - "is-string": "^1.0.5", - "is-symbol": "^1.0.3" + "kind-of": "^6.0.2" }, - "funding": { - "url": "https://github.com/sponsors/ljharb" + "engines": { + "node": ">=8" } }, - "node_modules/which-collection": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.1.tgz", - "integrity": "sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A==", + "node_modules/shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", "dev": true, "dependencies": { - "is-map": "^2.0.1", - "is-set": "^2.0.1", - "is-weakmap": "^2.0.1", - "is-weakset": "^2.0.1" + "shebang-regex": "^3.0.0" }, - "funding": { - "url": "https://github.com/sponsors/ljharb" + "engines": { + "node": ">=8" } }, - "node_modules/which-typed-array": { - "version": "1.1.9", - "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.9.tgz", - "integrity": "sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA==", + "node_modules/shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", "dev": true, - "dependencies": { - "available-typed-arrays": "^1.0.5", - "call-bind": "^1.0.2", - "for-each": "^0.3.3", - "gopd": "^1.0.1", - "has-tostringtag": "^1.0.0", - "is-typed-array": "^1.1.10" - }, "engines": { - "node": ">= 0.4" - }, + "node": ">=8" + } + }, + "node_modules/shell-quote": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.1.tgz", + "integrity": "sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==", + "dev": true, "funding": { "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/wide-align": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz", - "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==", + "node_modules/side-channel": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", + "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==", "dev": true, "dependencies": { - "string-width": "^1.0.2 || 2 || 3 || 4" + "call-bind": "^1.0.0", + "get-intrinsic": "^1.0.2", + "object-inspect": "^1.9.0" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/wildcard": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.0.tgz", - "integrity": "sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==", + "node_modules/signal-exit": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", + "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", "dev": true }, - "node_modules/word-wrap": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", - "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==", + "node_modules/sigstore": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/sigstore/-/sigstore-1.9.0.tgz", + "integrity": "sha512-0Zjz0oe37d08VeOtBIuB6cRriqXse2e8w+7yIy2XSXjshRKxbc2KkhXjL229jXSxEm7UbcjS76wcJDGQddVI9A==", "dev": true, + "dependencies": { + "@sigstore/bundle": "^1.1.0", + "@sigstore/protobuf-specs": "^0.2.0", + "@sigstore/sign": "^1.0.0", + "@sigstore/tuf": "^1.0.3", + "make-fetch-happen": "^11.0.1" + }, + "bin": { + "sigstore": "bin/sigstore.js" + }, "engines": { - "node": ">=0.10.0" + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "node_modules/wrap-ansi": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", - "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "node_modules/sigstore/node_modules/@tootallnate/once": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz", + "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==", "dev": true, - "dependencies": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" - }, "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + "node": ">= 10" } }, - "node_modules/wrap-ansi/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "node_modules/sigstore/node_modules/http-proxy-agent": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz", + "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==", "dev": true, "dependencies": { - "color-convert": "^2.0.1" + "@tootallnate/once": "2", + "agent-base": "6", + "debug": "4" }, "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" + "node": ">= 6" } }, - "node_modules/wrap-ansi/node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "node_modules/sigstore/node_modules/lru-cache": { + "version": "7.18.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", + "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", "dev": true, - "dependencies": { - "color-name": "~1.1.4" - }, "engines": { - "node": ">=7.0.0" + "node": ">=12" } }, - "node_modules/wrap-ansi/node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "node_modules/wrappy": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", - "dev": true - }, - "node_modules/write-file-atomic": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz", - "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==", + "node_modules/sigstore/node_modules/make-fetch-happen": { + "version": "11.1.1", + "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-11.1.1.tgz", + "integrity": "sha512-rLWS7GCSTcEujjVBs2YqG7Y4643u8ucvCJeSRqiLYhesrDuzeuFIk37xREzAsfQaqzl8b9rNCE4m6J8tvX4Q8w==", "dev": true, "dependencies": { - "imurmurhash": "^0.1.4", - "signal-exit": "^3.0.7" + "agentkeepalive": "^4.2.1", + "cacache": "^17.0.0", + "http-cache-semantics": "^4.1.1", + "http-proxy-agent": "^5.0.0", + "https-proxy-agent": "^5.0.0", + "is-lambda": "^1.0.1", + "lru-cache": "^7.7.1", + "minipass": "^5.0.0", + "minipass-fetch": "^3.0.0", + "minipass-flush": "^1.0.5", + "minipass-pipeline": "^1.2.4", + "negotiator": "^0.6.3", + "promise-retry": "^2.0.1", + "socks-proxy-agent": "^7.0.0", + "ssri": "^10.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "node_modules/ws": { - "version": "8.12.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.12.0.tgz", - "integrity": "sha512-kU62emKIdKVeEIOIKVegvqpXMSTAMLJozpHZaJNDYqBjzlSYXQGviYwN1osDLJ9av68qHd4a2oSjd7yD4pacig==", + "node_modules/sigstore/node_modules/minipass-fetch": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.4.tgz", + "integrity": "sha512-jHAqnA728uUpIaFm7NWsCnqKT6UqZz7GcI/bDpPATuwYyKwJwW0remxSCxUlKiEty+eopHGa3oc8WxgQ1FFJqg==", "dev": true, - "engines": { - "node": ">=10.0.0" + "dependencies": { + "minipass": "^7.0.3", + "minipass-sized": "^1.0.3", + "minizlib": "^2.1.2" }, - "peerDependencies": { - "bufferutil": "^4.0.1", - "utf-8-validate": ">=5.0.2" + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" }, - "peerDependenciesMeta": { - "bufferutil": { - "optional": true - }, - "utf-8-validate": { - "optional": true - } + "optionalDependencies": { + "encoding": "^0.1.13" } }, - "node_modules/xml-name-validator": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz", - "integrity": "sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==", + "node_modules/sigstore/node_modules/minipass-fetch/node_modules/minipass": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz", + "integrity": "sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==", "dev": true, "engines": { - "node": ">=12" + "node": ">=16 || 14 >=14.17" } }, - "node_modules/xmlchars": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz", - "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==", + "node_modules/sisteransi": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz", + "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==", "dev": true }, - "node_modules/y18n": { - "version": "5.0.8", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", - "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", + "node_modules/slash": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", "dev": true, "engines": { - "node": ">=10" + "node": ">=8" } }, - "node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true - }, - "node_modules/yaml": { - "version": "1.10.2", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz", - "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==", + "node_modules/smart-buffer": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz", + "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==", "dev": true, "engines": { - "node": ">= 6" + "node": ">= 6.0.0", + "npm": ">= 3.0.0" } }, - "node_modules/yargs": { - "version": "17.6.2", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.6.2.tgz", - "integrity": "sha512-1/9UrdHjDZc0eOU0HxOHoS78C69UD3JRMvzlJ7S79S2nTaWRA/whGCTV8o9e/N/1Va9YIV7Q4sOxD8VV4pCWOw==", + "node_modules/sockjs": { + "version": "0.3.24", + "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.24.tgz", + "integrity": "sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ==", "dev": true, "dependencies": { - "cliui": "^8.0.1", - "escalade": "^3.1.1", - "get-caller-file": "^2.0.5", - "require-directory": "^2.1.1", - "string-width": "^4.2.3", - "y18n": "^5.0.5", - "yargs-parser": "^21.1.1" - }, - "engines": { - "node": ">=12" + "faye-websocket": "^0.11.3", + "uuid": "^8.3.2", + "websocket-driver": "^0.7.4" } }, - "node_modules/yargs-parser": { - "version": "21.1.1", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", - "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", + "node_modules/socks": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/socks/-/socks-2.7.1.tgz", + "integrity": "sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ==", "dev": true, + "dependencies": { + "ip": "^2.0.0", + "smart-buffer": "^4.2.0" + }, "engines": { - "node": ">=12" + "node": ">= 10.13.0", + "npm": ">= 3.0.0" } }, - "node_modules/yocto-queue": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", - "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", + "node_modules/socks-proxy-agent": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz", + "integrity": "sha512-Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww==", "dev": true, - "engines": { - "node": ">=10" + "dependencies": { + "agent-base": "^6.0.2", + "debug": "^4.3.3", + "socks": "^2.6.2" }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "engines": { + "node": ">= 10" } }, - "node_modules/zone.js": { - "version": "0.11.6", - "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.11.6.tgz", - "integrity": "sha512-umJqFtKyZlPli669gB1gOrRE9hxUUGkZr7mo878z+NEBJZZixJkKeVYfnoLa7g25SseUDc92OZrMKKHySyJrFg==", - "dependencies": { - "tslib": "^2.3.0" - } - } - }, - "dependencies": { - "@ampproject/remapping": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz", - "integrity": "sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==", + "node_modules/source-map": { + "version": "0.7.4", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz", + "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==", "dev": true, - "requires": { - "@jridgewell/gen-mapping": "^0.1.0", - "@jridgewell/trace-mapping": "^0.3.9" + "engines": { + "node": ">= 8" } }, - "@angular-builders/jest": { - "version": "15.0.0", - "resolved": "https://registry.npmjs.org/@angular-builders/jest/-/jest-15.0.0.tgz", - "integrity": "sha512-rJpO4QAsAXBXvkTI8E5kHxhLJEh6JR8iBYH3tHuXeTkABgifH+IRdDNWjogHTy32ratnhUPEaMOpPPDryIL+tw==", + "node_modules/source-map-js": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz", + "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==", "dev": true, - "requires": { - "@angular-devkit/architect": ">=0.1500.0 < 0.1600.0", - "@angular-devkit/core": "^15.0.0", - "jest-preset-angular": "12.2.3", - "lodash": "^4.17.15", - "tsconfig-paths": "^4.1.0" + "engines": { + "node": ">=0.10.0" } }, - "@angular-devkit/architect": { - "version": "0.1501.4", - "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1501.4.tgz", - "integrity": "sha512-PE0CqPaNzcz8yHEuJwqtKxYvXX9hgWWvC6hI2DWKtC+5WgJLAYJNEGofXQRc227Nj+YySEYUUo8Ja8SYl3lDxA==", + "node_modules/source-map-loader": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/source-map-loader/-/source-map-loader-4.0.1.tgz", + "integrity": "sha512-oqXpzDIByKONVY8g1NUPOTQhe0UTU5bWUl32GSkqK2LjJj0HmwTMVKxcUip0RgAYhY1mqgOxjbQM48a0mmeNfA==", "dev": true, - "requires": { - "@angular-devkit/core": "15.1.4", - "rxjs": "6.6.7" - }, "dependencies": { - "rxjs": { - "version": "6.6.7", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", - "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", - "dev": true, - "requires": { - "tslib": "^1.9.0" - } - }, - "tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", - "dev": true - } + "abab": "^2.0.6", + "iconv-lite": "^0.6.3", + "source-map-js": "^1.0.2" + }, + "engines": { + "node": ">= 14.15.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, + "peerDependencies": { + "webpack": "^5.72.1" } }, - "@angular-devkit/build-angular": { - "version": "15.1.4", - "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-15.1.4.tgz", - "integrity": "sha512-+vubHYyQn8HJ+uJQndr8xFlX6C7y1kdnzTiKgx6QFvA5sd/IhXXzsnDd1wFer1lCrZ+1qgfhG9HI/RL3cBeKrA==", + "node_modules/source-map-loader/node_modules/iconv-lite": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", + "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", "dev": true, - "requires": { - "@ampproject/remapping": "2.2.0", - "@angular-devkit/architect": "0.1501.4", - "@angular-devkit/build-webpack": "0.1501.4", - "@angular-devkit/core": "15.1.4", - "@babel/core": "7.20.12", - "@babel/generator": "7.20.7", - "@babel/helper-annotate-as-pure": "7.18.6", - "@babel/plugin-proposal-async-generator-functions": "7.20.7", - "@babel/plugin-transform-async-to-generator": "7.20.7", - "@babel/plugin-transform-runtime": "7.19.6", - "@babel/preset-env": "7.20.2", - "@babel/runtime": "7.20.7", - "@babel/template": "7.20.7", - "@discoveryjs/json-ext": "0.5.7", - "@ngtools/webpack": "15.1.4", - "ansi-colors": "4.1.3", - "autoprefixer": "10.4.13", - "babel-loader": "9.1.2", - "babel-plugin-istanbul": "6.1.1", - "browserslist": "4.21.4", - "cacache": "17.0.4", - "chokidar": "3.5.3", - "copy-webpack-plugin": "11.0.0", - "critters": "0.0.16", - "css-loader": "6.7.3", - "esbuild": "0.16.17", - "esbuild-wasm": "0.16.17", - "glob": "8.0.3", - "https-proxy-agent": "5.0.1", - "inquirer": "8.2.4", - "jsonc-parser": "3.2.0", - "karma-source-map-support": "1.4.0", - "less": "4.1.3", - "less-loader": "11.1.0", - "license-webpack-plugin": "4.0.2", - "loader-utils": "3.2.1", - "magic-string": "0.27.0", - "mini-css-extract-plugin": "2.7.2", - "open": "8.4.0", - "ora": "5.4.1", - "parse5-html-rewriting-stream": "6.0.1", - "piscina": "3.2.0", - "postcss": "8.4.21", - "postcss-loader": "7.0.2", - "resolve-url-loader": "5.0.0", - "rxjs": "6.6.7", - "sass": "1.57.1", - "sass-loader": "13.2.0", - "semver": "7.3.8", - "source-map-loader": "4.0.1", - "source-map-support": "0.5.21", - "terser": "5.16.1", - "text-table": "0.2.0", - "tree-kill": "1.2.2", - "tslib": "2.4.1", - "webpack": "5.75.0", - "webpack-dev-middleware": "6.0.1", - "webpack-dev-server": "4.11.1", - "webpack-merge": "5.8.0", - "webpack-subresource-integrity": "5.1.0" - }, "dependencies": { - "@babel/core": { - "version": "7.20.12", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.20.12.tgz", - "integrity": "sha512-XsMfHovsUYHFMdrIHkZphTN/2Hzzi78R08NuHfDBehym2VsPDL6Zn/JAD/JQdnRvbSsbQc4mVaU1m6JgtTEElg==", - "dev": true, - "requires": { - "@ampproject/remapping": "^2.1.0", - "@babel/code-frame": "^7.18.6", - "@babel/generator": "^7.20.7", - "@babel/helper-compilation-targets": "^7.20.7", - "@babel/helper-module-transforms": "^7.20.11", - "@babel/helpers": "^7.20.7", - "@babel/parser": "^7.20.7", - "@babel/template": "^7.20.7", - "@babel/traverse": "^7.20.12", - "@babel/types": "^7.20.7", - "convert-source-map": "^1.7.0", - "debug": "^4.1.0", - "gensync": "^1.0.0-beta.2", - "json5": "^2.2.2", - "semver": "^6.3.0" - }, - "dependencies": { - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true - } - } - }, - "rxjs": { - "version": "6.6.7", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", - "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", - "dev": true, - "requires": { - "tslib": "^1.9.0" - }, - "dependencies": { - "tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", - "dev": true - } - } - } + "safer-buffer": ">= 2.1.2 < 3.0.0" + }, + "engines": { + "node": ">=0.10.0" } }, - "@angular-devkit/build-webpack": { - "version": "0.1501.4", - "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1501.4.tgz", - "integrity": "sha512-rJ7KTBDW0UHgVJjQ23qJfGun+pDX3ZG2z0OtsskdsOI62SAvW1cVLuS50ICTcWW6gtcDO0R/6Q1RLbaV1JHZ5A==", - "dev": true, - "requires": { - "@angular-devkit/architect": "0.1501.4", - "rxjs": "6.6.7" - }, + "node_modules/source-map-support": { + "version": "0.5.21", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", + "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", "dependencies": { - "rxjs": { - "version": "6.6.7", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", - "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", - "dev": true, - "requires": { - "tslib": "^1.9.0" - } - }, - "tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", - "dev": true - } + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" } }, - "@angular-devkit/core": { - "version": "15.1.4", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-15.1.4.tgz", - "integrity": "sha512-PW5MRmd9DHJR4FaXchwQtj9pXnsghSTnwRvfZeCRNYgU2sv0DKyTV+YTSJB+kNXnoPNG1Je6amDEkiXecpspXg==", - "dev": true, - "requires": { - "ajv": "8.12.0", - "ajv-formats": "2.1.1", - "jsonc-parser": "3.2.0", - "rxjs": "6.6.7", - "source-map": "0.7.4" - }, - "dependencies": { - "rxjs": { - "version": "6.6.7", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", - "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", - "dev": true, - "requires": { - "tslib": "^1.9.0" - } - }, - "tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", - "dev": true - } + "node_modules/source-map-support/node_modules/source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "engines": { + "node": ">=0.10.0" } }, - "@angular-devkit/schematics": { - "version": "15.1.4", - "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-15.1.4.tgz", - "integrity": "sha512-jpddxo9Qd2yRQ1t9FLhAx5S+luz6HkyhDytq0LFKbxf9ikf1J4oy9riPBFl4pRmrNARWcHZ6GbD20/Ky8PjmXQ==", + "node_modules/spdx-correct": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz", + "integrity": "sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==", "dev": true, - "requires": { - "@angular-devkit/core": "15.1.4", - "jsonc-parser": "3.2.0", - "magic-string": "0.27.0", - "ora": "5.4.1", - "rxjs": "6.6.7" - }, - "dependencies": { - "@angular-devkit/core": { - "version": "15.1.4", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-15.1.4.tgz", - "integrity": "sha512-PW5MRmd9DHJR4FaXchwQtj9pXnsghSTnwRvfZeCRNYgU2sv0DKyTV+YTSJB+kNXnoPNG1Je6amDEkiXecpspXg==", - "dev": true, - "requires": { - "ajv": "8.12.0", - "ajv-formats": "2.1.1", - "jsonc-parser": "3.2.0", - "rxjs": "6.6.7", - "source-map": "0.7.4" - } - }, - "rxjs": { - "version": "6.6.7", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", - "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", - "dev": true, - "requires": { - "tslib": "^1.9.0" - } - }, - "tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", - "dev": true - } + "dependencies": { + "spdx-expression-parse": "^3.0.0", + "spdx-license-ids": "^3.0.0" } }, - "@angular-eslint/builder": { - "version": "14.1.2", - "resolved": "https://registry.npmjs.org/@angular-eslint/builder/-/builder-14.1.2.tgz", - "integrity": "sha512-J+LRidjlJOGfRNXJwUyOhz5TnasEBK+kL3QkkCE4ZSt/dH40QqT+3q9qV5zc45wdaAeJM4/jp1IhI6kPwWI5Yw==", + "node_modules/spdx-exceptions": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz", + "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==", "dev": true }, - "@angular-eslint/bundled-angular-compiler": { - "version": "14.1.2", - "resolved": "https://registry.npmjs.org/@angular-eslint/bundled-angular-compiler/-/bundled-angular-compiler-14.1.2.tgz", - "integrity": "sha512-d5/jTKXP+t9hNSucj3m8zZYBl62fZ2xFMVNbAOArYAkA7WwwX3D7Gae57BNW54cd2fl2/is7Dn6UgYhu1wqkSQ==", + "node_modules/spdx-expression-parse": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz", + "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==", + "dev": true, + "dependencies": { + "spdx-exceptions": "^2.1.0", + "spdx-license-ids": "^3.0.0" + } + }, + "node_modules/spdx-license-ids": { + "version": "3.0.16", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.16.tgz", + "integrity": "sha512-eWN+LnM3GR6gPu35WxNgbGl8rmY1AEmoMDvL/QD6zYmPWgywxWqJWNdLGT+ke8dKNWrcYgYjPpG5gbTfghP8rw==", "dev": true }, - "@angular-eslint/eslint-plugin": { - "version": "14.1.2", - "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin/-/eslint-plugin-14.1.2.tgz", - "integrity": "sha512-5pJaTcFfM7yDHNtMxw3uNTpBTLjNYH9mlOLX5FFQ9EahAuycwCtV8VJkIntK2ZiOTdRVJYA9/PEdD/xVxX02rw==", + "node_modules/spdy": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz", + "integrity": "sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==", "dev": true, - "requires": { - "@angular-eslint/utils": "14.1.2", - "@typescript-eslint/utils": "5.37.0" + "dependencies": { + "debug": "^4.1.0", + "handle-thing": "^2.0.0", + "http-deceiver": "^1.2.7", + "select-hose": "^2.0.0", + "spdy-transport": "^3.0.0" + }, + "engines": { + "node": ">=6.0.0" } }, - "@angular-eslint/eslint-plugin-template": { - "version": "14.1.2", - "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin-template/-/eslint-plugin-template-14.1.2.tgz", - "integrity": "sha512-gMgYJ8ZwPvq2H/YEzPztVRAK2NYs2cJFUDZD4iGjSRtDgYq9OHjyTo+r6tkcyjcK2qvesy0RccHQKh+x3hYMTA==", + "node_modules/spdy-transport": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz", + "integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==", "dev": true, - "requires": { - "@angular-eslint/bundled-angular-compiler": "14.1.2", - "@typescript-eslint/type-utils": "5.37.0", - "@typescript-eslint/utils": "5.37.0", - "aria-query": "5.0.2", - "axobject-query": "3.0.1" + "dependencies": { + "debug": "^4.1.0", + "detect-node": "^2.0.4", + "hpack.js": "^2.1.6", + "obuf": "^1.1.2", + "readable-stream": "^3.0.6", + "wbuf": "^1.7.3" } }, - "@angular-eslint/schematics": { - "version": "15.2.0", - "resolved": "https://registry.npmjs.org/@angular-eslint/schematics/-/schematics-15.2.0.tgz", - "integrity": "sha512-N9tuVu3vL47beppTsV9wAF+v6M9trbJnuNWYQGGsqA3mtCAkFUvJuHyWcXNPdSCNv/cJtR1OOJ7Y922uB5JPJQ==", + "node_modules/sprintf-js": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", + "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==", + "dev": true + }, + "node_modules/ssri": { + "version": "10.0.5", + "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.5.tgz", + "integrity": "sha512-bSf16tAFkGeRlUNDjXu8FzaMQt6g2HZJrun7mtMbIPOddxt3GLMSz5VWUWcqTJUPfLEaDIepGxv+bYQW49596A==", "dev": true, - "requires": { - "@angular-eslint/eslint-plugin": "15.2.0", - "@angular-eslint/eslint-plugin-template": "15.2.0", - "ignore": "5.2.4", - "strip-json-comments": "3.1.1", - "tmp": "0.2.1" - }, "dependencies": { - "@angular-eslint/bundled-angular-compiler": { - "version": "15.2.0", - "resolved": "https://registry.npmjs.org/@angular-eslint/bundled-angular-compiler/-/bundled-angular-compiler-15.2.0.tgz", - "integrity": "sha512-a0bfXxYyGoWJHrVQ4QER0HdRgselcTtJeyqiFPAxID2ZxF0IBGKLNTtugUTXekEmiLev8yGLX9TqAtthN57fEg==", - "dev": true - }, - "@angular-eslint/eslint-plugin": { - "version": "15.2.0", - "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin/-/eslint-plugin-15.2.0.tgz", - "integrity": "sha512-yJGbmSUU0B0MFJ48ktpkqqEK+zv5k9iwlZSqEHtiQMKvDelfluovnEusihel7uPRo1c1iVlbSgXfGpxpUCfocA==", - "dev": true, - "requires": { - "@angular-eslint/utils": "15.2.0", - "@typescript-eslint/utils": "5.48.1" - } - }, - "@angular-eslint/eslint-plugin-template": { - "version": "15.2.0", - "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin-template/-/eslint-plugin-template-15.2.0.tgz", - "integrity": "sha512-aL3czf5Jpv29rKN3UG20tQepX1+V0d6xc0g+1l0zPHZJYjVd6Oy0nIxWiGfl4yanaXiVpmxiV4vUcLlqqaFwbw==", - "dev": true, - "requires": { - "@angular-eslint/bundled-angular-compiler": "15.2.0", - "@angular-eslint/utils": "15.2.0", - "@typescript-eslint/type-utils": "5.48.1", - "@typescript-eslint/utils": "5.48.1", - "aria-query": "5.1.3", - "axobject-query": "3.1.1" - } - }, - "@angular-eslint/utils": { - "version": "15.2.0", - "resolved": "https://registry.npmjs.org/@angular-eslint/utils/-/utils-15.2.0.tgz", - "integrity": "sha512-qfTOKQ+aef/YER679/xN1E+FkZKMd0I73P6txUZAb9k2G1ACVktG+wOUIBfgjIlUVq9Q01AV91LGOWcd+rdEEA==", - "dev": true, - "requires": { - "@angular-eslint/bundled-angular-compiler": "15.2.0", - "@typescript-eslint/utils": "5.48.1" - } - }, - "@typescript-eslint/scope-manager": { - "version": "5.48.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.48.1.tgz", - "integrity": "sha512-S035ueRrbxRMKvSTv9vJKIWgr86BD8s3RqoRZmsSh/s8HhIs90g6UlK8ZabUSjUZQkhVxt7nmZ63VJ9dcZhtDQ==", - "dev": true, - "requires": { - "@typescript-eslint/types": "5.48.1", - "@typescript-eslint/visitor-keys": "5.48.1" - } - }, - "@typescript-eslint/type-utils": { - "version": "5.48.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.48.1.tgz", - "integrity": "sha512-Hyr8HU8Alcuva1ppmqSYtM/Gp0q4JOp1F+/JH5D1IZm/bUBrV0edoewQZiEc1r6I8L4JL21broddxK8HAcZiqQ==", - "dev": true, - "requires": { - "@typescript-eslint/typescript-estree": "5.48.1", - "@typescript-eslint/utils": "5.48.1", - "debug": "^4.3.4", - "tsutils": "^3.21.0" - } - }, - "@typescript-eslint/types": { - "version": "5.48.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.48.1.tgz", - "integrity": "sha512-xHyDLU6MSuEEdIlzrrAerCGS3T7AA/L8Hggd0RCYBi0w3JMvGYxlLlXHeg50JI9Tfg5MrtsfuNxbS/3zF1/ATg==", - "dev": true - }, - "@typescript-eslint/typescript-estree": { - "version": "5.48.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.48.1.tgz", - "integrity": "sha512-Hut+Osk5FYr+sgFh8J/FHjqX6HFcDzTlWLrFqGoK5kVUN3VBHF/QzZmAsIXCQ8T/W9nQNBTqalxi1P3LSqWnRA==", - "dev": true, - "requires": { - "@typescript-eslint/types": "5.48.1", - "@typescript-eslint/visitor-keys": "5.48.1", - "debug": "^4.3.4", - "globby": "^11.1.0", - "is-glob": "^4.0.3", - "semver": "^7.3.7", - "tsutils": "^3.21.0" - } - }, - "@typescript-eslint/utils": { - "version": "5.48.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.48.1.tgz", - "integrity": "sha512-SmQuSrCGUOdmGMwivW14Z0Lj8dxG1mOFZ7soeJ0TQZEJcs3n5Ndgkg0A4bcMFzBELqLJ6GTHnEU+iIoaD6hFGA==", - "dev": true, - "requires": { - "@types/json-schema": "^7.0.9", - "@types/semver": "^7.3.12", - "@typescript-eslint/scope-manager": "5.48.1", - "@typescript-eslint/types": "5.48.1", - "@typescript-eslint/typescript-estree": "5.48.1", - "eslint-scope": "^5.1.1", - "eslint-utils": "^3.0.0", - "semver": "^7.3.7" - } - }, - "@typescript-eslint/visitor-keys": { - "version": "5.48.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.48.1.tgz", - "integrity": "sha512-Ns0XBwmfuX7ZknznfXozgnydyR8F6ev/KEGePP4i74uL3ArsKbEhJ7raeKr1JSa997DBDwol/4a0Y+At82c9dA==", - "dev": true, - "requires": { - "@typescript-eslint/types": "5.48.1", - "eslint-visitor-keys": "^3.3.0" - } - }, - "aria-query": { - "version": "5.1.3", - "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.1.3.tgz", - "integrity": "sha512-R5iJ5lkuHybztUfuOAznmboyjWq8O6sqNqtK7CLOqdydi54VNbORp49mb14KbWgG1QD3JFO9hJdZ+y4KutfdOQ==", - "dev": true, - "requires": { - "deep-equal": "^2.0.5" - } - }, - "axobject-query": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-3.1.1.tgz", - "integrity": "sha512-goKlv8DZrK9hUh975fnHzhNIO4jUnFCfv/dszV5VwUGDFjI6vQ2VwoyjYjYNEbBE8AH87TduWP5uyDR1D+Iteg==", - "dev": true, - "requires": { - "deep-equal": "^2.0.5" - } - }, - "globby": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", - "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==", - "dev": true, - "requires": { - "array-union": "^2.1.0", - "dir-glob": "^3.0.1", - "fast-glob": "^3.2.9", - "ignore": "^5.2.0", - "merge2": "^1.4.1", - "slash": "^3.0.0" - } - }, - "slash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", - "dev": true - }, - "tmp": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz", - "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==", - "dev": true, - "requires": { - "rimraf": "^3.0.0" - } - } + "minipass": "^7.0.3" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "@angular-eslint/template-parser": { - "version": "14.1.2", - "resolved": "https://registry.npmjs.org/@angular-eslint/template-parser/-/template-parser-14.1.2.tgz", - "integrity": "sha512-bQI+poQDIyR3OU9EQzJeLYRtmsvjFGtV5dc+4XPJ6eIyRAc8baCG/0V/cOrpofIdSf7e/sCV8H7rXcFg6tSdUw==", + "node_modules/ssri/node_modules/minipass": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz", + "integrity": "sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==", "dev": true, - "requires": { - "@angular-eslint/bundled-angular-compiler": "14.1.2", - "eslint-scope": "^5.1.0" + "engines": { + "node": ">=16 || 14 >=14.17" } }, - "@angular-eslint/utils": { - "version": "14.1.2", - "resolved": "https://registry.npmjs.org/@angular-eslint/utils/-/utils-14.1.2.tgz", - "integrity": "sha512-EtblG9zO0+kWG9EHsoEshFKvsH5DMSK1DqwQsNOVGAF0Aa5DFOqrwouJUyBNJ0d4fSWI9QcuzVkZ1x9JyLIeXQ==", + "node_modules/stack-utils": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz", + "integrity": "sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==", "dev": true, - "requires": { - "@angular-eslint/bundled-angular-compiler": "14.1.2", - "@typescript-eslint/utils": "5.37.0" + "dependencies": { + "escape-string-regexp": "^2.0.0" + }, + "engines": { + "node": ">=10" } }, - "@angular/animations": { - "version": "15.1.3", - "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-15.1.3.tgz", - "integrity": "sha512-qvOLYx8XWolwFWwYoPjt+jQLDFaCQEPjb26iczewiqd+xcAdYn4Tl10NCJtOsx+YfTdpWtKRzvxYr1JxnGQTdw==", - "requires": { - "tslib": "^2.3.0" + "node_modules/stack-utils/node_modules/escape-string-regexp": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz", + "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==", + "dev": true, + "engines": { + "node": ">=8" } }, - "@angular/cdk": { - "version": "15.1.3", - "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-15.1.3.tgz", - "integrity": "sha512-FRb1ZirybQGVlRx34vsnkIyy4WHJlrRg2mwPeJ90b0DzIWuIZIiPYxxR2bAi/Si1IjnK8YBdacd5DXPdrW1jyw==", - "requires": { - "parse5": "^7.1.2", - "tslib": "^2.3.0" - }, - "dependencies": { - "entities": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/entities/-/entities-4.4.0.tgz", - "integrity": "sha512-oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA==", - "optional": true - }, - "parse5": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.1.2.tgz", - "integrity": "sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==", - "optional": true, - "requires": { - "entities": "^4.4.0" - } - } + "node_modules/statuses": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", + "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==", + "dev": true, + "engines": { + "node": ">= 0.8" } }, - "@angular/cli": { - "version": "15.1.4", - "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-15.1.4.tgz", - "integrity": "sha512-ebZiI4arb9wtOUMmTyUvjgDovmwpY8hmGLbkKZiEmAX8+2gbl4e97M+zd0SICZDU8bu5VcpoP6Q3Qb6vVjab9A==", + "node_modules/string_decoder": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", + "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", "dev": true, - "requires": { - "@angular-devkit/architect": "0.1501.4", - "@angular-devkit/core": "15.1.4", - "@angular-devkit/schematics": "15.1.4", - "@schematics/angular": "15.1.4", - "@yarnpkg/lockfile": "1.1.0", - "ansi-colors": "4.1.3", - "ini": "3.0.1", - "inquirer": "8.2.4", - "jsonc-parser": "3.2.0", - "npm-package-arg": "10.1.0", - "npm-pick-manifest": "8.0.1", - "open": "8.4.0", - "ora": "5.4.1", - "pacote": "15.0.8", - "resolve": "1.22.1", - "semver": "7.3.8", - "symbol-observable": "4.0.0", - "yargs": "17.6.2" - }, - "dependencies": { - "@angular-devkit/architect": { - "version": "0.1501.4", - "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1501.4.tgz", - "integrity": "sha512-PE0CqPaNzcz8yHEuJwqtKxYvXX9hgWWvC6hI2DWKtC+5WgJLAYJNEGofXQRc227Nj+YySEYUUo8Ja8SYl3lDxA==", - "dev": true, - "requires": { - "@angular-devkit/core": "15.1.4", - "rxjs": "6.6.7" - } - }, - "@angular-devkit/core": { - "version": "15.1.4", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-15.1.4.tgz", - "integrity": "sha512-PW5MRmd9DHJR4FaXchwQtj9pXnsghSTnwRvfZeCRNYgU2sv0DKyTV+YTSJB+kNXnoPNG1Je6amDEkiXecpspXg==", - "dev": true, - "requires": { - "ajv": "8.12.0", - "ajv-formats": "2.1.1", - "jsonc-parser": "3.2.0", - "rxjs": "6.6.7", - "source-map": "0.7.4" - } - }, - "rxjs": { - "version": "6.6.7", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", - "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", - "dev": true, - "requires": { - "tslib": "^1.9.0" - } - }, - "tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", - "dev": true - } + "dependencies": { + "safe-buffer": "~5.2.0" } }, - "@angular/common": { - "version": "15.1.3", - "resolved": "https://registry.npmjs.org/@angular/common/-/common-15.1.3.tgz", - "integrity": "sha512-UjC0COaOcU1g/ODBBetv/BpdaFC/Y32DvXJ9qbD7kkwLwoqCjGOLDvtP36r9zEzPmH7oNkgNGDkgR3gyb82s5A==", - "requires": { - "tslib": "^2.3.0" + "node_modules/string-length": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz", + "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==", + "dev": true, + "dependencies": { + "char-regex": "^1.0.2", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" } }, - "@angular/compiler": { - "version": "15.1.3", - "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-15.1.3.tgz", - "integrity": "sha512-CxEpm5Z3EpjeGNoWKtcHOrf2IQTSckpAEFwsRrADP2nqcXXYp/IjIHi+PUTjLhjrOEbukH9zreHsL5BoIQhgUQ==", - "requires": { - "tslib": "^2.3.0" + "node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" } }, - "@angular/compiler-cli": { - "version": "15.1.3", - "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-15.1.3.tgz", - "integrity": "sha512-z5bGdQQcStXWPpb5vztqqUOET+vxw+GUFtfktYxV40kE2d1zHLZh93AGEnM1NnBaOz+9NZrX+dWoEyWmv/T2LQ==", + "node_modules/string-width-cjs": { + "name": "string-width", + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", "dev": true, - "requires": { - "@babel/core": "7.19.3", - "@jridgewell/sourcemap-codec": "^1.4.14", - "chokidar": "^3.0.0", - "convert-source-map": "^1.5.1", - "dependency-graph": "^0.11.0", - "magic-string": "^0.27.0", - "reflect-metadata": "^0.1.2", - "semver": "^7.0.0", - "tslib": "^2.3.0", - "yargs": "^17.2.1" - } - }, - "@angular/core": { - "version": "15.1.3", - "resolved": "https://registry.npmjs.org/@angular/core/-/core-15.1.3.tgz", - "integrity": "sha512-rad9OYnaoRnXBztOBXsiD59VvOZTpsvO3sWx6KndytQFceFfkL722bF2l2LARN+R3IWDOwRap46HOtc0O0N+sw==", - "requires": { - "tslib": "^2.3.0" - } - }, - "@angular/forms": { - "version": "15.1.3", - "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-15.1.3.tgz", - "integrity": "sha512-vEgiZBk3rGGp4tBQHl9EaspEjYh70lkz6/zYreObTbMdCB54bkbl+jn+JbQyFj+TPfukiumtiG3/477vKzYnSg==", - "requires": { - "tslib": "^2.3.0" - } - }, - "@angular/material": { - "version": "15.1.3", - "resolved": "https://registry.npmjs.org/@angular/material/-/material-15.1.3.tgz", - "integrity": "sha512-Jj17GwvL1PsIVPiRBRQQRRvTQb5TlmMP+49JgIWTSTF03G7F9guoYapoYzuufK7dWA3Ga0KzDPKfjUmcnBg+Fw==", - "requires": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/auto-init": "15.0.0-canary.684e33d25.0", - "@material/banner": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/button": "15.0.0-canary.684e33d25.0", - "@material/card": "15.0.0-canary.684e33d25.0", - "@material/checkbox": "15.0.0-canary.684e33d25.0", - "@material/chips": "15.0.0-canary.684e33d25.0", - "@material/circular-progress": "15.0.0-canary.684e33d25.0", - "@material/data-table": "15.0.0-canary.684e33d25.0", - "@material/density": "15.0.0-canary.684e33d25.0", - "@material/dialog": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/drawer": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/fab": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/floating-label": "15.0.0-canary.684e33d25.0", - "@material/form-field": "15.0.0-canary.684e33d25.0", - "@material/icon-button": "15.0.0-canary.684e33d25.0", - "@material/image-list": "15.0.0-canary.684e33d25.0", - "@material/layout-grid": "15.0.0-canary.684e33d25.0", - "@material/line-ripple": "15.0.0-canary.684e33d25.0", - "@material/linear-progress": "15.0.0-canary.684e33d25.0", - "@material/list": "15.0.0-canary.684e33d25.0", - "@material/menu": "15.0.0-canary.684e33d25.0", - "@material/menu-surface": "15.0.0-canary.684e33d25.0", - "@material/notched-outline": "15.0.0-canary.684e33d25.0", - "@material/radio": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/segmented-button": "15.0.0-canary.684e33d25.0", - "@material/select": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/slider": "15.0.0-canary.684e33d25.0", - "@material/snackbar": "15.0.0-canary.684e33d25.0", - "@material/switch": "15.0.0-canary.684e33d25.0", - "@material/tab": "15.0.0-canary.684e33d25.0", - "@material/tab-bar": "15.0.0-canary.684e33d25.0", - "@material/tab-indicator": "15.0.0-canary.684e33d25.0", - "@material/tab-scroller": "15.0.0-canary.684e33d25.0", - "@material/textfield": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tooltip": "15.0.0-canary.684e33d25.0", - "@material/top-app-bar": "15.0.0-canary.684e33d25.0", - "@material/touch-target": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", - "tslib": "^2.3.0" - } - }, - "@angular/material-moment-adapter": { - "version": "15.1.3", - "resolved": "https://registry.npmjs.org/@angular/material-moment-adapter/-/material-moment-adapter-15.1.3.tgz", - "integrity": "sha512-kENestgo5JHG8A4vkjvyBrT/ACgG2QQYWUclrtPa1z3wgsfoHE6ofSHxv4Ne+WhNNW5DMlhyYI74w6n5fM+dyw==", - "requires": { - "tslib": "^2.3.0" - } - }, - "@angular/platform-browser": { - "version": "15.1.3", - "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-15.1.3.tgz", - "integrity": "sha512-WJBN3klssfcRGKY2L2DIpNGbaMQfi2X1le1ZXQAnsfECQ/pua+lFstJUT+RP+Bx4X8icuDggKkS/JPOiBhxARw==", - "requires": { - "tslib": "^2.3.0" - } - }, - "@angular/platform-browser-dynamic": { - "version": "15.1.3", - "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-15.1.3.tgz", - "integrity": "sha512-lUfHmO+x3goSL1KnlAbekieKpak2KVGcOcAzOVOIMFt1SyWPBHq0NyyPOH2PUAnjPRbvCLEs2casjFggk0JzsQ==", - "requires": { - "tslib": "^2.3.0" - } - }, - "@angular/router": { - "version": "15.1.3", - "resolved": "https://registry.npmjs.org/@angular/router/-/router-15.1.3.tgz", - "integrity": "sha512-GxvGZO0N7LIoaTV2EZ082kqb9asJl2rWe0kNsUQwu9IQAODOCCTQu2USg63J6hEOcKPJSZzbxdXLaxlpqKeC4A==", - "requires": { - "tslib": "^2.3.0" + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" } }, - "@assemblyscript/loader": { - "version": "0.10.1", - "resolved": "https://registry.npmjs.org/@assemblyscript/loader/-/loader-0.10.1.tgz", - "integrity": "sha512-H71nDOOL8Y7kWRLqf6Sums+01Q5msqBW2KhDUTemh1tvY04eSkSXrK0uj/4mmY0Xr16/3zyZmsrxN7CKuRbNRg==", - "dev": true - }, - "@babel/code-frame": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz", - "integrity": "sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==", + "node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", "dev": true, - "requires": { - "@babel/highlight": "^7.18.6" - } - }, - "@babel/compat-data": { - "version": "7.20.10", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.20.10.tgz", - "integrity": "sha512-sEnuDPpOJR/fcafHMjpcpGN5M2jbUGUHwmuWKM/YdPzeEDJg8bgmbcWQFUfE32MQjti1koACvoPVsDe8Uq+idg==", - "dev": true - }, - "@babel/core": { - "version": "7.19.3", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.19.3.tgz", - "integrity": "sha512-WneDJxdsjEvyKtXKsaBGbDeiyOjR5vYq4HcShxnIbG0qixpoHjI3MqeZM9NDvsojNCEBItQE4juOo/bU6e72gQ==", - "dev": true, - "requires": { - "@ampproject/remapping": "^2.1.0", - "@babel/code-frame": "^7.18.6", - "@babel/generator": "^7.19.3", - "@babel/helper-compilation-targets": "^7.19.3", - "@babel/helper-module-transforms": "^7.19.0", - "@babel/helpers": "^7.19.0", - "@babel/parser": "^7.19.3", - "@babel/template": "^7.18.10", - "@babel/traverse": "^7.19.3", - "@babel/types": "^7.19.3", - "convert-source-map": "^1.7.0", - "debug": "^4.1.0", - "gensync": "^1.0.0-beta.2", - "json5": "^2.2.1", - "semver": "^6.3.0" - }, "dependencies": { - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true - } + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" } }, - "@babel/generator": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.20.7.tgz", - "integrity": "sha512-7wqMOJq8doJMZmP4ApXTzLxSr7+oO2jroJURrVEp6XShrQUObV8Tq/D0NCcoYg2uHqUrjzO0zwBjoYzelxK+sw==", + "node_modules/strip-ansi-cjs": { + "name": "strip-ansi", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", "dev": true, - "requires": { - "@babel/types": "^7.20.7", - "@jridgewell/gen-mapping": "^0.3.2", - "jsesc": "^2.5.1" - }, "dependencies": { - "@jridgewell/gen-mapping": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz", - "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==", - "dev": true, - "requires": { - "@jridgewell/set-array": "^1.0.1", - "@jridgewell/sourcemap-codec": "^1.4.10", - "@jridgewell/trace-mapping": "^0.3.9" - } - } + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" } }, - "@babel/helper-annotate-as-pure": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz", - "integrity": "sha512-duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA==", + "node_modules/strip-bom": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz", + "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==", "dev": true, - "requires": { - "@babel/types": "^7.18.6" + "engines": { + "node": ">=8" } }, - "@babel/helper-builder-binary-assignment-operator-visitor": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.18.9.tgz", - "integrity": "sha512-yFQ0YCHoIqarl8BCRwBL8ulYUaZpz3bNsA7oFepAzee+8/+ImtADXNOmO5vJvsPff3qi+hvpkY/NYBTrBQgdNw==", + "node_modules/strip-final-newline": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", + "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==", "dev": true, - "requires": { - "@babel/helper-explode-assignable-expression": "^7.18.6", - "@babel/types": "^7.18.9" + "engines": { + "node": ">=6" } }, - "@babel/helper-compilation-targets": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.7.tgz", - "integrity": "sha512-4tGORmfQcrc+bvrjb5y3dG9Mx1IOZjsHqQVUz7XCNHO+iTmqxWnVg3KRygjGmpRLJGdQSKuvFinbIb0CnZwHAQ==", + "node_modules/strip-json-comments": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", + "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", "dev": true, - "requires": { - "@babel/compat-data": "^7.20.5", - "@babel/helper-validator-option": "^7.18.6", - "browserslist": "^4.21.3", - "lru-cache": "^5.1.1", - "semver": "^6.3.0" + "engines": { + "node": ">=8" }, - "dependencies": { - "lru-cache": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", - "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", - "dev": true, - "requires": { - "yallist": "^3.0.2" - } - }, - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true - }, - "yallist": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", - "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", - "dev": true - } + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, - "@babel/helper-create-class-features-plugin": { - "version": "7.20.12", - "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.20.12.tgz", - "integrity": "sha512-9OunRkbT0JQcednL0UFvbfXpAsUXiGjUk0a7sN8fUXX7Mue79cUSMjHGDRRi/Vz9vYlpIhLV5fMD5dKoMhhsNQ==", + "node_modules/strong-log-transformer": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/strong-log-transformer/-/strong-log-transformer-2.1.0.tgz", + "integrity": "sha512-B3Hgul+z0L9a236FAUC9iZsL+nVHgoCJnqCbN588DjYxvGXaXaaFbfmQ/JhvKjZwsOukuR72XbHv71Qkug0HxA==", "dev": true, - "requires": { - "@babel/helper-annotate-as-pure": "^7.18.6", - "@babel/helper-environment-visitor": "^7.18.9", - "@babel/helper-function-name": "^7.19.0", - "@babel/helper-member-expression-to-functions": "^7.20.7", - "@babel/helper-optimise-call-expression": "^7.18.6", - "@babel/helper-replace-supers": "^7.20.7", - "@babel/helper-skip-transparent-expression-wrappers": "^7.20.0", - "@babel/helper-split-export-declaration": "^7.18.6" + "dependencies": { + "duplexer": "^0.1.1", + "minimist": "^1.2.0", + "through": "^2.3.4" + }, + "bin": { + "sl-log-transformer": "bin/sl-log-transformer.js" + }, + "engines": { + "node": ">=4" } }, - "@babel/helper-create-regexp-features-plugin": { - "version": "7.20.5", - "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.20.5.tgz", - "integrity": "sha512-m68B1lkg3XDGX5yCvGO0kPx3v9WIYLnzjKfPcQiwntEQa5ZeRkPmo2X/ISJc8qxWGfwUr+kvZAeEzAwLec2r2w==", + "node_modules/supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", "dev": true, - "requires": { - "@babel/helper-annotate-as-pure": "^7.18.6", - "regexpu-core": "^5.2.1" + "dependencies": { + "has-flag": "^3.0.0" + }, + "engines": { + "node": ">=4" } }, - "@babel/helper-define-polyfill-provider": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.3.tgz", - "integrity": "sha512-z5aQKU4IzbqCC1XH0nAqfsFLMVSo22SBKUc0BxGrLkolTdPTructy0ToNnlO2zA4j9Q/7pjMZf0DSY+DSTYzww==", + "node_modules/supports-preserve-symlinks-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", + "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", "dev": true, - "requires": { - "@babel/helper-compilation-targets": "^7.17.7", - "@babel/helper-plugin-utils": "^7.16.7", - "debug": "^4.1.1", - "lodash.debounce": "^4.0.8", - "resolve": "^1.14.2", - "semver": "^6.1.2" + "engines": { + "node": ">= 0.4" }, - "dependencies": { - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true - } + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "@babel/helper-environment-visitor": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz", - "integrity": "sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==", - "dev": true - }, - "@babel/helper-explode-assignable-expression": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.18.6.tgz", - "integrity": "sha512-eyAYAsQmB80jNfg4baAtLeWAQHfHFiR483rzFK+BhETlGZaQC9bsfrugfXDCbRHLQbIA7U5NxhhOxN7p/dWIcg==", + "node_modules/symbol-observable": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-4.0.0.tgz", + "integrity": "sha512-b19dMThMV4HVFynSAM1++gBHAbk2Tc/osgLIBZMKsyqh34jb2e8Os7T6ZW/Bt3pJFdBTd2JwAnAAEQV7rSNvcQ==", "dev": true, - "requires": { - "@babel/types": "^7.18.6" + "engines": { + "node": ">=0.10" } }, - "@babel/helper-function-name": { - "version": "7.19.0", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz", - "integrity": "sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==", - "dev": true, - "requires": { - "@babel/template": "^7.18.10", - "@babel/types": "^7.19.0" - } + "node_modules/symbol-tree": { + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz", + "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==", + "dev": true }, - "@babel/helper-hoist-variables": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz", - "integrity": "sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==", + "node_modules/tapable": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz", + "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==", "dev": true, - "requires": { - "@babel/types": "^7.18.6" + "engines": { + "node": ">=6" } }, - "@babel/helper-member-expression-to-functions": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.20.7.tgz", - "integrity": "sha512-9J0CxJLq315fEdi4s7xK5TQaNYjZw+nDVpVqr1axNGKzdrdwYBD5b4uKv3n75aABG0rCCTK8Im8Ww7eYfMrZgw==", + "node_modules/tar": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.0.tgz", + "integrity": "sha512-/Wo7DcT0u5HUV486xg675HtjNd3BXZ6xDbzsCUZPt5iw8bTQ63bP0Raut3mvro9u+CUyq7YQd8Cx55fsZXxqLQ==", "dev": true, - "requires": { - "@babel/types": "^7.20.7" + "dependencies": { + "chownr": "^2.0.0", + "fs-minipass": "^2.0.0", + "minipass": "^5.0.0", + "minizlib": "^2.1.1", + "mkdirp": "^1.0.3", + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" } }, - "@babel/helper-module-imports": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz", - "integrity": "sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==", + "node_modules/tar-stream": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz", + "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==", "dev": true, - "requires": { - "@babel/types": "^7.18.6" + "dependencies": { + "bl": "^4.0.3", + "end-of-stream": "^1.4.1", + "fs-constants": "^1.0.0", + "inherits": "^2.0.3", + "readable-stream": "^3.1.1" + }, + "engines": { + "node": ">=6" } }, - "@babel/helper-module-transforms": { - "version": "7.20.11", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.20.11.tgz", - "integrity": "sha512-uRy78kN4psmji1s2QtbtcCSaj/LILFDp0f/ymhpQH5QY3nljUZCaNWz9X1dEj/8MBdBEFECs7yRhKn8i7NjZgg==", + "node_modules/tar/node_modules/fs-minipass": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", + "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", "dev": true, - "requires": { - "@babel/helper-environment-visitor": "^7.18.9", - "@babel/helper-module-imports": "^7.18.6", - "@babel/helper-simple-access": "^7.20.2", - "@babel/helper-split-export-declaration": "^7.18.6", - "@babel/helper-validator-identifier": "^7.19.1", - "@babel/template": "^7.20.7", - "@babel/traverse": "^7.20.10", - "@babel/types": "^7.20.7" + "dependencies": { + "minipass": "^3.0.0" + }, + "engines": { + "node": ">= 8" } }, - "@babel/helper-optimise-call-expression": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.18.6.tgz", - "integrity": "sha512-HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA==", + "node_modules/tar/node_modules/fs-minipass/node_modules/minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", "dev": true, - "requires": { - "@babel/types": "^7.18.6" + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=8" } }, - "@babel/helper-plugin-utils": { - "version": "7.20.2", - "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz", - "integrity": "sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ==", + "node_modules/tar/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", "dev": true }, - "@babel/helper-remap-async-to-generator": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.18.9.tgz", - "integrity": "sha512-dI7q50YKd8BAv3VEfgg7PS7yD3Rtbi2J1XMXaalXO0W0164hYLnh8zpjRS0mte9MfVp/tltvr/cfdXPvJr1opA==", + "node_modules/terser": { + "version": "5.19.2", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.19.2.tgz", + "integrity": "sha512-qC5+dmecKJA4cpYxRa5aVkKehYsQKc+AHeKl0Oe62aYjBL8ZA33tTljktDHJSaxxMnbI5ZYw+o/S2DxxLu8OfA==", "dev": true, - "requires": { - "@babel/helper-annotate-as-pure": "^7.18.6", - "@babel/helper-environment-visitor": "^7.18.9", - "@babel/helper-wrap-function": "^7.18.9", - "@babel/types": "^7.18.9" + "dependencies": { + "@jridgewell/source-map": "^0.3.3", + "acorn": "^8.8.2", + "commander": "^2.20.0", + "source-map-support": "~0.5.20" + }, + "bin": { + "terser": "bin/terser" + }, + "engines": { + "node": ">=10" } }, - "@babel/helper-replace-supers": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.20.7.tgz", - "integrity": "sha512-vujDMtB6LVfNW13jhlCrp48QNslK6JXi7lQG736HVbHz/mbf4Dc7tIRh1Xf5C0rF7BP8iiSxGMCmY6Ci1ven3A==", + "node_modules/terser-webpack-plugin": { + "version": "5.3.9", + "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.9.tgz", + "integrity": "sha512-ZuXsqE07EcggTWQjXUj+Aot/OMcD0bMKGgF63f7UxYcu5/AJF53aIpK1YoP5xR9l6s/Hy2b+t1AM0bLNPRuhwA==", "dev": true, - "requires": { - "@babel/helper-environment-visitor": "^7.18.9", - "@babel/helper-member-expression-to-functions": "^7.20.7", - "@babel/helper-optimise-call-expression": "^7.18.6", - "@babel/template": "^7.20.7", - "@babel/traverse": "^7.20.7", - "@babel/types": "^7.20.7" + "dependencies": { + "@jridgewell/trace-mapping": "^0.3.17", + "jest-worker": "^27.4.5", + "schema-utils": "^3.1.1", + "serialize-javascript": "^6.0.1", + "terser": "^5.16.8" + }, + "engines": { + "node": ">= 10.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, + "peerDependencies": { + "webpack": "^5.1.0" + }, + "peerDependenciesMeta": { + "@swc/core": { + "optional": true + }, + "esbuild": { + "optional": true + }, + "uglify-js": { + "optional": true + } } }, - "@babel/helper-simple-access": { - "version": "7.20.2", - "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz", - "integrity": "sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA==", + "node_modules/terser-webpack-plugin/node_modules/ajv": { + "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", "dev": true, - "requires": { - "@babel/types": "^7.20.2" + "dependencies": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" } }, - "@babel/helper-skip-transparent-expression-wrappers": { - "version": "7.20.0", - "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.20.0.tgz", - "integrity": "sha512-5y1JYeNKfvnT8sZcK9DVRtpTbGiomYIHviSP3OQWmDPU3DeH4a1ZlT/N2lyQ5P8egjcRaT/Y9aNqUxK0WsnIIg==", + "node_modules/terser-webpack-plugin/node_modules/ajv-keywords": { + "version": "3.5.2", + "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", + "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", "dev": true, - "requires": { - "@babel/types": "^7.20.0" + "peerDependencies": { + "ajv": "^6.9.1" } }, - "@babel/helper-split-export-declaration": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz", - "integrity": "sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==", - "dev": true, - "requires": { - "@babel/types": "^7.18.6" - } - }, - "@babel/helper-string-parser": { - "version": "7.19.4", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz", - "integrity": "sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==", - "dev": true - }, - "@babel/helper-validator-identifier": { - "version": "7.19.1", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz", - "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==", - "dev": true - }, - "@babel/helper-validator-option": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz", - "integrity": "sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==", - "dev": true - }, - "@babel/helper-wrap-function": { - "version": "7.20.5", - "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.20.5.tgz", - "integrity": "sha512-bYMxIWK5mh+TgXGVqAtnu5Yn1un+v8DDZtqyzKRLUzrh70Eal2O3aZ7aPYiMADO4uKlkzOiRiZ6GX5q3qxvW9Q==", - "dev": true, - "requires": { - "@babel/helper-function-name": "^7.19.0", - "@babel/template": "^7.18.10", - "@babel/traverse": "^7.20.5", - "@babel/types": "^7.20.5" - } - }, - "@babel/helpers": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.20.7.tgz", - "integrity": "sha512-PBPjs5BppzsGaxHQCDKnZ6Gd9s6xl8bBCluz3vEInLGRJmnZan4F6BYCeqtyXqkk4W5IlPmjK4JlOuZkpJ3xZA==", + "node_modules/terser-webpack-plugin/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true, - "requires": { - "@babel/template": "^7.20.7", - "@babel/traverse": "^7.20.7", - "@babel/types": "^7.20.7" + "engines": { + "node": ">=8" } }, - "@babel/highlight": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz", - "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==", + "node_modules/terser-webpack-plugin/node_modules/jest-worker": { + "version": "27.5.1", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz", + "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==", "dev": true, - "requires": { - "@babel/helper-validator-identifier": "^7.18.6", - "chalk": "^2.0.0", - "js-tokens": "^4.0.0" + "dependencies": { + "@types/node": "*", + "merge-stream": "^2.0.0", + "supports-color": "^8.0.0" + }, + "engines": { + "node": ">= 10.13.0" } }, - "@babel/parser": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.20.7.tgz", - "integrity": "sha512-T3Z9oHybU+0vZlY9CiDSJQTD5ZapcW18ZctFMi0MOAl/4BjFF4ul7NVSARLdbGO5vDqy9eQiGTV0LtKfvCYvcg==", + "node_modules/terser-webpack-plugin/node_modules/json-schema-traverse": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", "dev": true }, - "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6.tgz", - "integrity": "sha512-Dgxsyg54Fx1d4Nge8UnvTrED63vrwOdPmyvPzlNN/boaliRP54pm3pGzZD1SJUwrBA+Cs/xdG8kXX6Mn/RfISQ==", + "node_modules/terser-webpack-plugin/node_modules/schema-utils": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz", + "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==", "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.18.6" + "dependencies": { + "@types/json-schema": "^7.0.8", + "ajv": "^6.12.5", + "ajv-keywords": "^3.5.2" + }, + "engines": { + "node": ">= 10.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" } }, - "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.20.7.tgz", - "integrity": "sha512-sbr9+wNE5aXMBBFBICk01tt7sBf2Oc9ikRFEcem/ZORup9IMUdNhW7/wVLEbbtlWOsEubJet46mHAL2C8+2jKQ==", + "node_modules/terser-webpack-plugin/node_modules/supports-color": { + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", + "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.20.2", - "@babel/helper-skip-transparent-expression-wrappers": "^7.20.0", - "@babel/plugin-proposal-optional-chaining": "^7.20.7" + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/supports-color?sponsor=1" } }, - "@babel/plugin-proposal-async-generator-functions": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.20.7.tgz", - "integrity": "sha512-xMbiLsn/8RK7Wq7VeVytytS2L6qE69bXPB10YCmMdDZbKF4okCqY74pI/jJQ/8U0b/F6NrT2+14b8/P9/3AMGA==", + "node_modules/test-exclude": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz", + "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==", "dev": true, - "requires": { - "@babel/helper-environment-visitor": "^7.18.9", - "@babel/helper-plugin-utils": "^7.20.2", - "@babel/helper-remap-async-to-generator": "^7.18.9", - "@babel/plugin-syntax-async-generators": "^7.8.4" + "dependencies": { + "@istanbuljs/schema": "^0.1.2", + "glob": "^7.1.4", + "minimatch": "^3.0.4" + }, + "engines": { + "node": ">=8" } }, - "@babel/plugin-proposal-class-properties": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz", - "integrity": "sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==", - "dev": true, - "requires": { - "@babel/helper-create-class-features-plugin": "^7.18.6", - "@babel/helper-plugin-utils": "^7.18.6" - } + "node_modules/text-table": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", + "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", + "dev": true }, - "@babel/plugin-proposal-class-static-block": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.20.7.tgz", - "integrity": "sha512-AveGOoi9DAjUYYuUAG//Ig69GlazLnoyzMw68VCDux+c1tsnnH/OkYcpz/5xzMkEFC6UxjR5Gw1c+iY2wOGVeQ==", - "dev": true, - "requires": { - "@babel/helper-create-class-features-plugin": "^7.20.7", - "@babel/helper-plugin-utils": "^7.20.2", - "@babel/plugin-syntax-class-static-block": "^7.14.5" - } + "node_modules/through": { + "version": "2.3.8", + "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", + "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==", + "dev": true }, - "@babel/plugin-proposal-dynamic-import": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.18.6.tgz", - "integrity": "sha512-1auuwmK+Rz13SJj36R+jqFPMJWyKEDd7lLSdOj4oJK0UTgGueSAtkrCvz9ewmgyU/P941Rv2fQwZJN8s6QruXw==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.18.6", - "@babel/plugin-syntax-dynamic-import": "^7.8.3" - } + "node_modules/thunky": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz", + "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==", + "dev": true }, - "@babel/plugin-proposal-export-namespace-from": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.18.9.tgz", - "integrity": "sha512-k1NtHyOMvlDDFeb9G5PhUXuGj8m/wiwojgQVEhJ/fsVsMCpLyOP4h0uGEjYJKrRI+EVPlb5Jk+Gt9P97lOGwtA==", + "node_modules/tmp": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz", + "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==", "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.18.9", - "@babel/plugin-syntax-export-namespace-from": "^7.8.3" + "dependencies": { + "rimraf": "^3.0.0" + }, + "engines": { + "node": ">=8.17.0" } }, - "@babel/plugin-proposal-json-strings": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.18.6.tgz", - "integrity": "sha512-lr1peyn9kOdbYc0xr0OdHTZ5FMqS6Di+H0Fz2I/JwMzGmzJETNeOFq2pBySw6X/KFL5EWDjlJuMsUGRFb8fQgQ==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.18.6", - "@babel/plugin-syntax-json-strings": "^7.8.3" - } + "node_modules/tmpl": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz", + "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==", + "dev": true }, - "@babel/plugin-proposal-logical-assignment-operators": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.20.7.tgz", - "integrity": "sha512-y7C7cZgpMIjWlKE5T7eJwp+tnRYM89HmRvWM5EQuB5BoHEONjmQ8lSNmBUwOyy/GFRsohJED51YBF79hE1djug==", + "node_modules/to-fast-properties": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", + "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==", "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.20.2", - "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4" + "engines": { + "node": ">=4" } }, - "@babel/plugin-proposal-nullish-coalescing-operator": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz", - "integrity": "sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==", + "node_modules/to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.18.6", - "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3" + "dependencies": { + "is-number": "^7.0.0" + }, + "engines": { + "node": ">=8.0" } }, - "@babel/plugin-proposal-numeric-separator": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz", - "integrity": "sha512-ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q==", + "node_modules/toidentifier": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", + "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==", "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.18.6", - "@babel/plugin-syntax-numeric-separator": "^7.10.4" + "engines": { + "node": ">=0.6" } }, - "@babel/plugin-proposal-object-rest-spread": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.20.7.tgz", - "integrity": "sha512-d2S98yCiLxDVmBmE8UjGcfPvNEUbA1U5q5WxaWFUGRzJSVAZqm5W6MbPct0jxnegUZ0niLeNX+IOzEs7wYg9Dg==", + "node_modules/tough-cookie": { + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz", + "integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==", "dev": true, - "requires": { - "@babel/compat-data": "^7.20.5", - "@babel/helper-compilation-targets": "^7.20.7", - "@babel/helper-plugin-utils": "^7.20.2", - "@babel/plugin-syntax-object-rest-spread": "^7.8.3", - "@babel/plugin-transform-parameters": "^7.20.7" + "dependencies": { + "psl": "^1.1.33", + "punycode": "^2.1.1", + "universalify": "^0.2.0", + "url-parse": "^1.5.3" + }, + "engines": { + "node": ">=6" } }, - "@babel/plugin-proposal-optional-catch-binding": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.18.6.tgz", - "integrity": "sha512-Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw==", + "node_modules/tough-cookie/node_modules/universalify": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz", + "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==", "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.18.6", - "@babel/plugin-syntax-optional-catch-binding": "^7.8.3" + "engines": { + "node": ">= 4.0.0" } }, - "@babel/plugin-proposal-optional-chaining": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.20.7.tgz", - "integrity": "sha512-T+A7b1kfjtRM51ssoOfS1+wbyCVqorfyZhT99TvxxLMirPShD8CzKMRepMlCBGM5RpHMbn8s+5MMHnPstJH6mQ==", + "node_modules/tr46": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz", + "integrity": "sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==", "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.20.2", - "@babel/helper-skip-transparent-expression-wrappers": "^7.20.0", - "@babel/plugin-syntax-optional-chaining": "^7.8.3" + "dependencies": { + "punycode": "^2.1.1" + }, + "engines": { + "node": ">=8" } }, - "@babel/plugin-proposal-private-methods": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz", - "integrity": "sha512-nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA==", + "node_modules/tree-kill": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz", + "integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==", "dev": true, - "requires": { - "@babel/helper-create-class-features-plugin": "^7.18.6", - "@babel/helper-plugin-utils": "^7.18.6" + "bin": { + "tree-kill": "cli.js" } }, - "@babel/plugin-proposal-private-property-in-object": { - "version": "7.20.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.20.5.tgz", - "integrity": "sha512-Vq7b9dUA12ByzB4EjQTPo25sFhY+08pQDBSZRtUAkj7lb7jahaHR5igera16QZ+3my1nYR4dKsNdYj5IjPHilQ==", + "node_modules/ts-api-utils": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.0.3.tgz", + "integrity": "sha512-wNMeqtMz5NtwpT/UZGY5alT+VoKdSsOOP/kqHFcUW1P/VRhH2wJ48+DN2WwUliNbQ976ETwDL0Ifd2VVvgonvg==", "dev": true, - "requires": { - "@babel/helper-annotate-as-pure": "^7.18.6", - "@babel/helper-create-class-features-plugin": "^7.20.5", - "@babel/helper-plugin-utils": "^7.20.2", - "@babel/plugin-syntax-private-property-in-object": "^7.14.5" + "engines": { + "node": ">=16.13.0" + }, + "peerDependencies": { + "typescript": ">=4.2.0" } }, - "@babel/plugin-proposal-unicode-property-regex": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz", - "integrity": "sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w==", + "node_modules/ts-jest": { + "version": "29.1.1", + "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.1.1.tgz", + "integrity": "sha512-D6xjnnbP17cC85nliwGiL+tpoKN0StpgE0TeOjXQTU6MVCfsB4v7aW05CgQ/1OywGb0x/oy9hHFnN+sczTiRaA==", "dev": true, - "requires": { - "@babel/helper-create-regexp-features-plugin": "^7.18.6", - "@babel/helper-plugin-utils": "^7.18.6" + "dependencies": { + "bs-logger": "0.x", + "fast-json-stable-stringify": "2.x", + "jest-util": "^29.0.0", + "json5": "^2.2.3", + "lodash.memoize": "4.x", + "make-error": "1.x", + "semver": "^7.5.3", + "yargs-parser": "^21.0.1" + }, + "bin": { + "ts-jest": "cli.js" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + }, + "peerDependencies": { + "@babel/core": ">=7.0.0-beta.0 <8", + "@jest/types": "^29.0.0", + "babel-jest": "^29.0.0", + "jest": "^29.0.0", + "typescript": ">=4.3 <6" + }, + "peerDependenciesMeta": { + "@babel/core": { + "optional": true + }, + "@jest/types": { + "optional": true + }, + "babel-jest": { + "optional": true + }, + "esbuild": { + "optional": true + } } }, - "@babel/plugin-syntax-async-generators": { - "version": "7.8.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz", - "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==", + "node_modules/tsconfig-paths": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-4.2.0.tgz", + "integrity": "sha512-NoZ4roiN7LnbKn9QqE1amc9DJfzvZXxF4xDavcOWt1BPkdx+m+0gJuPM+S0vCe7zTJMYUP0R8pO2XMr+Y8oLIg==", "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.8.0" + "dependencies": { + "json5": "^2.2.2", + "minimist": "^1.2.6", + "strip-bom": "^3.0.0" + }, + "engines": { + "node": ">=6" } }, - "@babel/plugin-syntax-bigint": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz", - "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==", + "node_modules/tsconfig-paths/node_modules/strip-bom": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", + "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==", "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.8.0" + "engines": { + "node": ">=4" } }, - "@babel/plugin-syntax-class-properties": { - "version": "7.12.13", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz", - "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.12.13" - } - }, - "@babel/plugin-syntax-class-static-block": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz", - "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.14.5" - } - }, - "@babel/plugin-syntax-dynamic-import": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz", - "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.8.0" - } - }, - "@babel/plugin-syntax-export-namespace-from": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz", - "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.8.3" - } - }, - "@babel/plugin-syntax-import-assertions": { - "version": "7.20.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.20.0.tgz", - "integrity": "sha512-IUh1vakzNoWalR8ch/areW7qFopR2AEw03JlG7BbrDqmQ4X3q9uuipQwSGrUn7oGiemKjtSLDhNtQHzMHr1JdQ==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.19.0" - } - }, - "@babel/plugin-syntax-import-meta": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz", - "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.10.4" - } - }, - "@babel/plugin-syntax-json-strings": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz", - "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.8.0" - } - }, - "@babel/plugin-syntax-logical-assignment-operators": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz", - "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.10.4" - } - }, - "@babel/plugin-syntax-nullish-coalescing-operator": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz", - "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.8.0" - } - }, - "@babel/plugin-syntax-numeric-separator": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz", - "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.10.4" - } - }, - "@babel/plugin-syntax-object-rest-spread": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz", - "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.8.0" - } - }, - "@babel/plugin-syntax-optional-catch-binding": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz", - "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.8.0" - } - }, - "@babel/plugin-syntax-optional-chaining": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz", - "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.8.0" - } - }, - "@babel/plugin-syntax-private-property-in-object": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz", - "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.14.5" - } - }, - "@babel/plugin-syntax-top-level-await": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz", - "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.14.5" - } - }, - "@babel/plugin-syntax-typescript": { - "version": "7.20.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.20.0.tgz", - "integrity": "sha512-rd9TkG+u1CExzS4SM1BlMEhMXwFLKVjOAFFCDx9PbX5ycJWDoWMcwdJH9RhkPu1dOgn5TrxLot/Gx6lWFuAUNQ==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.19.0" - } - }, - "@babel/plugin-transform-arrow-functions": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.20.7.tgz", - "integrity": "sha512-3poA5E7dzDomxj9WXWwuD6A5F3kc7VXwIJO+E+J8qtDtS+pXPAhrgEyh+9GBwBgPq1Z+bB+/JD60lp5jsN7JPQ==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.20.2" - } - }, - "@babel/plugin-transform-async-to-generator": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.20.7.tgz", - "integrity": "sha512-Uo5gwHPT9vgnSXQxqGtpdufUiWp96gk7yiP4Mp5bm1QMkEmLXBO7PAGYbKoJ6DhAwiNkcHFBol/x5zZZkL/t0Q==", - "dev": true, - "requires": { - "@babel/helper-module-imports": "^7.18.6", - "@babel/helper-plugin-utils": "^7.20.2", - "@babel/helper-remap-async-to-generator": "^7.18.9" - } - }, - "@babel/plugin-transform-block-scoped-functions": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.18.6.tgz", - "integrity": "sha512-ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.18.6" - } - }, - "@babel/plugin-transform-block-scoping": { - "version": "7.20.11", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.20.11.tgz", - "integrity": "sha512-tA4N427a7fjf1P0/2I4ScsHGc5jcHPbb30xMbaTke2gxDuWpUfXDuX1FEymJwKk4tuGUvGcejAR6HdZVqmmPyw==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.20.2" - } - }, - "@babel/plugin-transform-classes": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.20.7.tgz", - "integrity": "sha512-LWYbsiXTPKl+oBlXUGlwNlJZetXD5Am+CyBdqhPsDVjM9Jc8jwBJFrKhHf900Kfk2eZG1y9MAG3UNajol7A4VQ==", - "dev": true, - "requires": { - "@babel/helper-annotate-as-pure": "^7.18.6", - "@babel/helper-compilation-targets": "^7.20.7", - "@babel/helper-environment-visitor": "^7.18.9", - "@babel/helper-function-name": "^7.19.0", - "@babel/helper-optimise-call-expression": "^7.18.6", - "@babel/helper-plugin-utils": "^7.20.2", - "@babel/helper-replace-supers": "^7.20.7", - "@babel/helper-split-export-declaration": "^7.18.6", - "globals": "^11.1.0" - } - }, - "@babel/plugin-transform-computed-properties": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.20.7.tgz", - "integrity": "sha512-Lz7MvBK6DTjElHAmfu6bfANzKcxpyNPeYBGEafyA6E5HtRpjpZwU+u7Qrgz/2OR0z+5TvKYbPdphfSaAcZBrYQ==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.20.2", - "@babel/template": "^7.20.7" - } - }, - "@babel/plugin-transform-destructuring": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.20.7.tgz", - "integrity": "sha512-Xwg403sRrZb81IVB79ZPqNQME23yhugYVqgTxAhT99h485F4f+GMELFhhOsscDUB7HCswepKeCKLn/GZvUKoBA==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.20.2" - } - }, - "@babel/plugin-transform-dotall-regex": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.18.6.tgz", - "integrity": "sha512-6S3jpun1eEbAxq7TdjLotAsl4WpQI9DxfkycRcKrjhQYzU87qpXdknpBg/e+TdcMehqGnLFi7tnFUBR02Vq6wg==", - "dev": true, - "requires": { - "@babel/helper-create-regexp-features-plugin": "^7.18.6", - "@babel/helper-plugin-utils": "^7.18.6" - } - }, - "@babel/plugin-transform-duplicate-keys": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.18.9.tgz", - "integrity": "sha512-d2bmXCtZXYc59/0SanQKbiWINadaJXqtvIQIzd4+hNwkWBgyCd5F/2t1kXoUdvPMrxzPvhK6EMQRROxsue+mfw==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.18.9" - } - }, - "@babel/plugin-transform-exponentiation-operator": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.18.6.tgz", - "integrity": "sha512-wzEtc0+2c88FVR34aQmiz56dxEkxr2g8DQb/KfaFa1JYXOFVsbhvAonFN6PwVWj++fKmku8NP80plJ5Et4wqHw==", - "dev": true, - "requires": { - "@babel/helper-builder-binary-assignment-operator-visitor": "^7.18.6", - "@babel/helper-plugin-utils": "^7.18.6" - } - }, - "@babel/plugin-transform-for-of": { - "version": "7.18.8", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.18.8.tgz", - "integrity": "sha512-yEfTRnjuskWYo0k1mHUqrVWaZwrdq8AYbfrpqULOJOaucGSp4mNMVps+YtA8byoevxS/urwU75vyhQIxcCgiBQ==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.18.6" - } - }, - "@babel/plugin-transform-function-name": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.18.9.tgz", - "integrity": "sha512-WvIBoRPaJQ5yVHzcnJFor7oS5Ls0PYixlTYE63lCj2RtdQEl15M68FXQlxnG6wdraJIXRdR7KI+hQ7q/9QjrCQ==", - "dev": true, - "requires": { - "@babel/helper-compilation-targets": "^7.18.9", - "@babel/helper-function-name": "^7.18.9", - "@babel/helper-plugin-utils": "^7.18.9" - } - }, - "@babel/plugin-transform-literals": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.18.9.tgz", - "integrity": "sha512-IFQDSRoTPnrAIrI5zoZv73IFeZu2dhu6irxQjY9rNjTT53VmKg9fenjvoiOWOkJ6mm4jKVPtdMzBY98Fp4Z4cg==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.18.9" - } - }, - "@babel/plugin-transform-member-expression-literals": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.18.6.tgz", - "integrity": "sha512-qSF1ihLGO3q+/g48k85tUjD033C29TNTVB2paCwZPVmOsjn9pClvYYrM2VeJpBY2bcNkuny0YUyTNRyRxJ54KA==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.18.6" - } - }, - "@babel/plugin-transform-modules-amd": { - "version": "7.20.11", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.20.11.tgz", - "integrity": "sha512-NuzCt5IIYOW0O30UvqktzHYR2ud5bOWbY0yaxWZ6G+aFzOMJvrs5YHNikrbdaT15+KNO31nPOy5Fim3ku6Zb5g==", - "dev": true, - "requires": { - "@babel/helper-module-transforms": "^7.20.11", - "@babel/helper-plugin-utils": "^7.20.2" - } - }, - "@babel/plugin-transform-modules-commonjs": { - "version": "7.20.11", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.20.11.tgz", - "integrity": "sha512-S8e1f7WQ7cimJQ51JkAaDrEtohVEitXjgCGAS2N8S31Y42E+kWwfSz83LYz57QdBm7q9diARVqanIaH2oVgQnw==", - "dev": true, - "requires": { - "@babel/helper-module-transforms": "^7.20.11", - "@babel/helper-plugin-utils": "^7.20.2", - "@babel/helper-simple-access": "^7.20.2" - } - }, - "@babel/plugin-transform-modules-systemjs": { - "version": "7.20.11", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.20.11.tgz", - "integrity": "sha512-vVu5g9BPQKSFEmvt2TA4Da5N+QVS66EX21d8uoOihC+OCpUoGvzVsXeqFdtAEfVa5BILAeFt+U7yVmLbQnAJmw==", - "dev": true, - "requires": { - "@babel/helper-hoist-variables": "^7.18.6", - "@babel/helper-module-transforms": "^7.20.11", - "@babel/helper-plugin-utils": "^7.20.2", - "@babel/helper-validator-identifier": "^7.19.1" - } - }, - "@babel/plugin-transform-modules-umd": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.6.tgz", - "integrity": "sha512-dcegErExVeXcRqNtkRU/z8WlBLnvD4MRnHgNs3MytRO1Mn1sHRyhbcpYbVMGclAqOjdW+9cfkdZno9dFdfKLfQ==", - "dev": true, - "requires": { - "@babel/helper-module-transforms": "^7.18.6", - "@babel/helper-plugin-utils": "^7.18.6" - } - }, - "@babel/plugin-transform-named-capturing-groups-regex": { - "version": "7.20.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.20.5.tgz", - "integrity": "sha512-mOW4tTzi5iTLnw+78iEq3gr8Aoq4WNRGpmSlrogqaiCBoR1HFhpU4JkpQFOHfeYx3ReVIFWOQJS4aZBRvuZ6mA==", - "dev": true, - "requires": { - "@babel/helper-create-regexp-features-plugin": "^7.20.5", - "@babel/helper-plugin-utils": "^7.20.2" - } - }, - "@babel/plugin-transform-new-target": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.18.6.tgz", - "integrity": "sha512-DjwFA/9Iu3Z+vrAn+8pBUGcjhxKguSMlsFqeCKbhb9BAV756v0krzVK04CRDi/4aqmk8BsHb4a/gFcaA5joXRw==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.18.6" - } - }, - "@babel/plugin-transform-object-super": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.18.6.tgz", - "integrity": "sha512-uvGz6zk+pZoS1aTZrOvrbj6Pp/kK2mp45t2B+bTDre2UgsZZ8EZLSJtUg7m/no0zOJUWgFONpB7Zv9W2tSaFlA==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.18.6", - "@babel/helper-replace-supers": "^7.18.6" - } - }, - "@babel/plugin-transform-parameters": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.20.7.tgz", - "integrity": "sha512-WiWBIkeHKVOSYPO0pWkxGPfKeWrCJyD3NJ53+Lrp/QMSZbsVPovrVl2aWZ19D/LTVnaDv5Ap7GJ/B2CTOZdrfA==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.20.2" - } - }, - "@babel/plugin-transform-property-literals": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.18.6.tgz", - "integrity": "sha512-cYcs6qlgafTud3PAzrrRNbQtfpQ8+y/+M5tKmksS9+M1ckbH6kzY8MrexEM9mcA6JDsukE19iIRvAyYl463sMg==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.18.6" - } - }, - "@babel/plugin-transform-regenerator": { - "version": "7.20.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.20.5.tgz", - "integrity": "sha512-kW/oO7HPBtntbsahzQ0qSE3tFvkFwnbozz3NWFhLGqH75vLEg+sCGngLlhVkePlCs3Jv0dBBHDzCHxNiFAQKCQ==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.20.2", - "regenerator-transform": "^0.15.1" - } - }, - "@babel/plugin-transform-reserved-words": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.18.6.tgz", - "integrity": "sha512-oX/4MyMoypzHjFrT1CdivfKZ+XvIPMFXwwxHp/r0Ddy2Vuomt4HDFGmft1TAY2yiTKiNSsh3kjBAzcM8kSdsjA==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.18.6" - } - }, - "@babel/plugin-transform-runtime": { - "version": "7.19.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.19.6.tgz", - "integrity": "sha512-PRH37lz4JU156lYFW1p8OxE5i7d6Sl/zV58ooyr+q1J1lnQPyg5tIiXlIwNVhJaY4W3TmOtdc8jqdXQcB1v5Yw==", - "dev": true, - "requires": { - "@babel/helper-module-imports": "^7.18.6", - "@babel/helper-plugin-utils": "^7.19.0", - "babel-plugin-polyfill-corejs2": "^0.3.3", - "babel-plugin-polyfill-corejs3": "^0.6.0", - "babel-plugin-polyfill-regenerator": "^0.4.1", - "semver": "^6.3.0" - }, - "dependencies": { - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true - } - } - }, - "@babel/plugin-transform-shorthand-properties": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.18.6.tgz", - "integrity": "sha512-eCLXXJqv8okzg86ywZJbRn19YJHU4XUa55oz2wbHhaQVn/MM+XhukiT7SYqp/7o00dg52Rj51Ny+Ecw4oyoygw==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.18.6" - } - }, - "@babel/plugin-transform-spread": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.20.7.tgz", - "integrity": "sha512-ewBbHQ+1U/VnH1fxltbJqDeWBU1oNLG8Dj11uIv3xVf7nrQu0bPGe5Rf716r7K5Qz+SqtAOVswoVunoiBtGhxw==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.20.2", - "@babel/helper-skip-transparent-expression-wrappers": "^7.20.0" - } - }, - "@babel/plugin-transform-sticky-regex": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.18.6.tgz", - "integrity": "sha512-kfiDrDQ+PBsQDO85yj1icueWMfGfJFKN1KCkndygtu/C9+XUfydLC8Iv5UYJqRwy4zk8EcplRxEOeLyjq1gm6Q==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.18.6" - } - }, - "@babel/plugin-transform-template-literals": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.9.tgz", - "integrity": "sha512-S8cOWfT82gTezpYOiVaGHrCbhlHgKhQt8XH5ES46P2XWmX92yisoZywf5km75wv5sYcXDUCLMmMxOLCtthDgMA==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.18.9" - } - }, - "@babel/plugin-transform-typeof-symbol": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.18.9.tgz", - "integrity": "sha512-SRfwTtF11G2aemAZWivL7PD+C9z52v9EvMqH9BuYbabyPuKUvSWks3oCg6041pT925L4zVFqaVBeECwsmlguEw==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.18.9" - } - }, - "@babel/plugin-transform-unicode-escapes": { - "version": "7.18.10", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.18.10.tgz", - "integrity": "sha512-kKAdAI+YzPgGY/ftStBFXTI1LZFju38rYThnfMykS+IXy8BVx+res7s2fxf1l8I35DV2T97ezo6+SGrXz6B3iQ==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.18.9" - } - }, - "@babel/plugin-transform-unicode-regex": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.18.6.tgz", - "integrity": "sha512-gE7A6Lt7YLnNOL3Pb9BNeZvi+d8l7tcRrG4+pwJjK9hD2xX4mEvjlQW60G9EEmfXVYRPv9VRQcyegIVHCql/AA==", - "dev": true, - "requires": { - "@babel/helper-create-regexp-features-plugin": "^7.18.6", - "@babel/helper-plugin-utils": "^7.18.6" - } - }, - "@babel/preset-env": { - "version": "7.20.2", - "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.20.2.tgz", - "integrity": "sha512-1G0efQEWR1EHkKvKHqbG+IN/QdgwfByUpM5V5QroDzGV2t3S/WXNQd693cHiHTlCFMpr9B6FkPFXDA2lQcKoDg==", - "dev": true, - "requires": { - "@babel/compat-data": "^7.20.1", - "@babel/helper-compilation-targets": "^7.20.0", - "@babel/helper-plugin-utils": "^7.20.2", - "@babel/helper-validator-option": "^7.18.6", - "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.18.6", - "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.18.9", - "@babel/plugin-proposal-async-generator-functions": "^7.20.1", - "@babel/plugin-proposal-class-properties": "^7.18.6", - "@babel/plugin-proposal-class-static-block": "^7.18.6", - "@babel/plugin-proposal-dynamic-import": "^7.18.6", - "@babel/plugin-proposal-export-namespace-from": "^7.18.9", - "@babel/plugin-proposal-json-strings": "^7.18.6", - "@babel/plugin-proposal-logical-assignment-operators": "^7.18.9", - "@babel/plugin-proposal-nullish-coalescing-operator": "^7.18.6", - "@babel/plugin-proposal-numeric-separator": "^7.18.6", - "@babel/plugin-proposal-object-rest-spread": "^7.20.2", - "@babel/plugin-proposal-optional-catch-binding": "^7.18.6", - "@babel/plugin-proposal-optional-chaining": "^7.18.9", - "@babel/plugin-proposal-private-methods": "^7.18.6", - "@babel/plugin-proposal-private-property-in-object": "^7.18.6", - "@babel/plugin-proposal-unicode-property-regex": "^7.18.6", - "@babel/plugin-syntax-async-generators": "^7.8.4", - "@babel/plugin-syntax-class-properties": "^7.12.13", - "@babel/plugin-syntax-class-static-block": "^7.14.5", - "@babel/plugin-syntax-dynamic-import": "^7.8.3", - "@babel/plugin-syntax-export-namespace-from": "^7.8.3", - "@babel/plugin-syntax-import-assertions": "^7.20.0", - "@babel/plugin-syntax-json-strings": "^7.8.3", - "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4", - "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3", - "@babel/plugin-syntax-numeric-separator": "^7.10.4", - "@babel/plugin-syntax-object-rest-spread": "^7.8.3", - "@babel/plugin-syntax-optional-catch-binding": "^7.8.3", - "@babel/plugin-syntax-optional-chaining": "^7.8.3", - "@babel/plugin-syntax-private-property-in-object": "^7.14.5", - "@babel/plugin-syntax-top-level-await": "^7.14.5", - "@babel/plugin-transform-arrow-functions": "^7.18.6", - "@babel/plugin-transform-async-to-generator": "^7.18.6", - "@babel/plugin-transform-block-scoped-functions": "^7.18.6", - "@babel/plugin-transform-block-scoping": "^7.20.2", - "@babel/plugin-transform-classes": "^7.20.2", - "@babel/plugin-transform-computed-properties": "^7.18.9", - "@babel/plugin-transform-destructuring": "^7.20.2", - "@babel/plugin-transform-dotall-regex": "^7.18.6", - "@babel/plugin-transform-duplicate-keys": "^7.18.9", - "@babel/plugin-transform-exponentiation-operator": "^7.18.6", - "@babel/plugin-transform-for-of": "^7.18.8", - "@babel/plugin-transform-function-name": "^7.18.9", - "@babel/plugin-transform-literals": "^7.18.9", - "@babel/plugin-transform-member-expression-literals": "^7.18.6", - "@babel/plugin-transform-modules-amd": "^7.19.6", - "@babel/plugin-transform-modules-commonjs": "^7.19.6", - "@babel/plugin-transform-modules-systemjs": "^7.19.6", - "@babel/plugin-transform-modules-umd": "^7.18.6", - "@babel/plugin-transform-named-capturing-groups-regex": "^7.19.1", - "@babel/plugin-transform-new-target": "^7.18.6", - "@babel/plugin-transform-object-super": "^7.18.6", - "@babel/plugin-transform-parameters": "^7.20.1", - "@babel/plugin-transform-property-literals": "^7.18.6", - "@babel/plugin-transform-regenerator": "^7.18.6", - "@babel/plugin-transform-reserved-words": "^7.18.6", - "@babel/plugin-transform-shorthand-properties": "^7.18.6", - "@babel/plugin-transform-spread": "^7.19.0", - "@babel/plugin-transform-sticky-regex": "^7.18.6", - "@babel/plugin-transform-template-literals": "^7.18.9", - "@babel/plugin-transform-typeof-symbol": "^7.18.9", - "@babel/plugin-transform-unicode-escapes": "^7.18.10", - "@babel/plugin-transform-unicode-regex": "^7.18.6", - "@babel/preset-modules": "^0.1.5", - "@babel/types": "^7.20.2", - "babel-plugin-polyfill-corejs2": "^0.3.3", - "babel-plugin-polyfill-corejs3": "^0.6.0", - "babel-plugin-polyfill-regenerator": "^0.4.1", - "core-js-compat": "^3.25.1", - "semver": "^6.3.0" - }, - "dependencies": { - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true - } - } - }, - "@babel/preset-modules": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.5.tgz", - "integrity": "sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.0.0", - "@babel/plugin-proposal-unicode-property-regex": "^7.4.4", - "@babel/plugin-transform-dotall-regex": "^7.4.4", - "@babel/types": "^7.4.4", - "esutils": "^2.0.2" - } - }, - "@babel/runtime": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.7.tgz", - "integrity": "sha512-UF0tvkUtxwAgZ5W/KrkHf0Rn0fdnLDU9ScxBrEVNUprE/MzirjK4MJUX1/BVDv00Sv8cljtukVK1aky++X1SjQ==", - "dev": true, - "requires": { - "regenerator-runtime": "^0.13.11" - } - }, - "@babel/template": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.20.7.tgz", - "integrity": "sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.18.6", - "@babel/parser": "^7.20.7", - "@babel/types": "^7.20.7" - } - }, - "@babel/traverse": { - "version": "7.20.12", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.20.12.tgz", - "integrity": "sha512-MsIbFN0u+raeja38qboyF8TIT7K0BFzz/Yd/77ta4MsUsmP2RAnidIlwq7d5HFQrH/OZJecGV6B71C4zAgpoSQ==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.18.6", - "@babel/generator": "^7.20.7", - "@babel/helper-environment-visitor": "^7.18.9", - "@babel/helper-function-name": "^7.19.0", - "@babel/helper-hoist-variables": "^7.18.6", - "@babel/helper-split-export-declaration": "^7.18.6", - "@babel/parser": "^7.20.7", - "@babel/types": "^7.20.7", - "debug": "^4.1.0", - "globals": "^11.1.0" - } - }, - "@babel/types": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.20.7.tgz", - "integrity": "sha512-69OnhBxSSgK0OzTJai4kyPDiKTIe3j+ctaHdIGVbRahTLAT7L3R9oeXHC2aVSuGYt3cVnoAMDmOCgJ2yaiLMvg==", - "dev": true, - "requires": { - "@babel/helper-string-parser": "^7.19.4", - "@babel/helper-validator-identifier": "^7.19.1", - "to-fast-properties": "^2.0.0" - } - }, - "@bcgov/bc-sans": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@bcgov/bc-sans/-/bc-sans-1.0.1.tgz", - "integrity": "sha512-4suRUBFeHcuFkwXXJu9pKJNB5Z2G3bpuLEHIq203KVCKC8KrsnqvsyUOf645TypgLwqOTOYCETiXYzfxF4gLAw==" - }, - "@bcoe/v8-coverage": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz", - "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==", - "dev": true - }, - "@ctrl/tinycolor": { - "version": "3.4.1", - "resolved": "https://registry.npmjs.org/@ctrl/tinycolor/-/tinycolor-3.4.1.tgz", - "integrity": "sha512-ej5oVy6lykXsvieQtqZxCOaLT+xD4+QNarq78cIYISHmZXshCvROLudpQN3lfL8G0NL7plMSSK+zlyvCaIJ4Iw==" - }, - "@discoveryjs/json-ext": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz", - "integrity": "sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==", - "dev": true - }, - "@esbuild/android-arm": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.16.17.tgz", - "integrity": "sha512-N9x1CMXVhtWEAMS7pNNONyA14f71VPQN9Cnavj1XQh6T7bskqiLLrSca4O0Vr8Wdcga943eThxnVp3JLnBMYtw==", - "dev": true, - "optional": true - }, - "@esbuild/android-arm64": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.16.17.tgz", - "integrity": "sha512-MIGl6p5sc3RDTLLkYL1MyL8BMRN4tLMRCn+yRJJmEDvYZ2M7tmAf80hx1kbNEUX2KJ50RRtxZ4JHLvCfuB6kBg==", - "dev": true, - "optional": true - }, - "@esbuild/android-x64": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.16.17.tgz", - "integrity": "sha512-a3kTv3m0Ghh4z1DaFEuEDfz3OLONKuFvI4Xqczqx4BqLyuFaFkuaG4j2MtA6fuWEFeC5x9IvqnX7drmRq/fyAQ==", - "dev": true, - "optional": true - }, - "@esbuild/darwin-arm64": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.16.17.tgz", - "integrity": "sha512-/2agbUEfmxWHi9ARTX6OQ/KgXnOWfsNlTeLcoV7HSuSTv63E4DqtAc+2XqGw1KHxKMHGZgbVCZge7HXWX9Vn+w==", - "dev": true, - "optional": true - }, - "@esbuild/darwin-x64": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.16.17.tgz", - "integrity": "sha512-2By45OBHulkd9Svy5IOCZt376Aa2oOkiE9QWUK9fe6Tb+WDr8hXL3dpqi+DeLiMed8tVXspzsTAvd0jUl96wmg==", - "dev": true, - "optional": true - }, - "@esbuild/freebsd-arm64": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.16.17.tgz", - "integrity": "sha512-mt+cxZe1tVx489VTb4mBAOo2aKSnJ33L9fr25JXpqQqzbUIw/yzIzi+NHwAXK2qYV1lEFp4OoVeThGjUbmWmdw==", - "dev": true, - "optional": true - }, - "@esbuild/freebsd-x64": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.16.17.tgz", - "integrity": "sha512-8ScTdNJl5idAKjH8zGAsN7RuWcyHG3BAvMNpKOBaqqR7EbUhhVHOqXRdL7oZvz8WNHL2pr5+eIT5c65kA6NHug==", - "dev": true, - "optional": true - }, - "@esbuild/linux-arm": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.16.17.tgz", - "integrity": "sha512-iihzrWbD4gIT7j3caMzKb/RsFFHCwqqbrbH9SqUSRrdXkXaygSZCZg1FybsZz57Ju7N/SHEgPyaR0LZ8Zbe9gQ==", - "dev": true, - "optional": true - }, - "@esbuild/linux-arm64": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.16.17.tgz", - "integrity": "sha512-7S8gJnSlqKGVJunnMCrXHU9Q8Q/tQIxk/xL8BqAP64wchPCTzuM6W3Ra8cIa1HIflAvDnNOt2jaL17vaW+1V0g==", - "dev": true, - "optional": true - }, - "@esbuild/linux-ia32": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.16.17.tgz", - "integrity": "sha512-kiX69+wcPAdgl3Lonh1VI7MBr16nktEvOfViszBSxygRQqSpzv7BffMKRPMFwzeJGPxcio0pdD3kYQGpqQ2SSg==", - "dev": true, - "optional": true - }, - "@esbuild/linux-loong64": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.16.17.tgz", - "integrity": "sha512-dTzNnQwembNDhd654cA4QhbS9uDdXC3TKqMJjgOWsC0yNCbpzfWoXdZvp0mY7HU6nzk5E0zpRGGx3qoQg8T2DQ==", - "dev": true, - "optional": true - }, - "@esbuild/linux-mips64el": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.16.17.tgz", - "integrity": "sha512-ezbDkp2nDl0PfIUn0CsQ30kxfcLTlcx4Foz2kYv8qdC6ia2oX5Q3E/8m6lq84Dj/6b0FrkgD582fJMIfHhJfSw==", - "dev": true, - "optional": true - }, - "@esbuild/linux-ppc64": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.16.17.tgz", - "integrity": "sha512-dzS678gYD1lJsW73zrFhDApLVdM3cUF2MvAa1D8K8KtcSKdLBPP4zZSLy6LFZ0jYqQdQ29bjAHJDgz0rVbLB3g==", - "dev": true, - "optional": true - }, - "@esbuild/linux-riscv64": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.16.17.tgz", - "integrity": "sha512-ylNlVsxuFjZK8DQtNUwiMskh6nT0vI7kYl/4fZgV1llP5d6+HIeL/vmmm3jpuoo8+NuXjQVZxmKuhDApK0/cKw==", - "dev": true, - "optional": true - }, - "@esbuild/linux-s390x": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.16.17.tgz", - "integrity": "sha512-gzy7nUTO4UA4oZ2wAMXPNBGTzZFP7mss3aKR2hH+/4UUkCOyqmjXiKpzGrY2TlEUhbbejzXVKKGazYcQTZWA/w==", - "dev": true, - "optional": true - }, - "@esbuild/linux-x64": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.16.17.tgz", - "integrity": "sha512-mdPjPxfnmoqhgpiEArqi4egmBAMYvaObgn4poorpUaqmvzzbvqbowRllQ+ZgzGVMGKaPkqUmPDOOFQRUFDmeUw==", - "dev": true, - "optional": true - }, - "@esbuild/netbsd-x64": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.16.17.tgz", - "integrity": "sha512-/PzmzD/zyAeTUsduZa32bn0ORug+Jd1EGGAUJvqfeixoEISYpGnAezN6lnJoskauoai0Jrs+XSyvDhppCPoKOA==", - "dev": true, - "optional": true - }, - "@esbuild/openbsd-x64": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.16.17.tgz", - "integrity": "sha512-2yaWJhvxGEz2RiftSk0UObqJa/b+rIAjnODJgv2GbGGpRwAfpgzyrg1WLK8rqA24mfZa9GvpjLcBBg8JHkoodg==", - "dev": true, - "optional": true - }, - "@esbuild/sunos-x64": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.16.17.tgz", - "integrity": "sha512-xtVUiev38tN0R3g8VhRfN7Zl42YCJvyBhRKw1RJjwE1d2emWTVToPLNEQj/5Qxc6lVFATDiy6LjVHYhIPrLxzw==", - "dev": true, - "optional": true - }, - "@esbuild/win32-arm64": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.16.17.tgz", - "integrity": "sha512-ga8+JqBDHY4b6fQAmOgtJJue36scANy4l/rL97W+0wYmijhxKetzZdKOJI7olaBaMhWt8Pac2McJdZLxXWUEQw==", - "dev": true, - "optional": true - }, - "@esbuild/win32-ia32": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.16.17.tgz", - "integrity": "sha512-WnsKaf46uSSF/sZhwnqE4L/F89AYNMiD4YtEcYekBt9Q7nj0DiId2XH2Ng2PHM54qi5oPrQ8luuzGszqi/veig==", - "dev": true, - "optional": true - }, - "@esbuild/win32-x64": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.16.17.tgz", - "integrity": "sha512-y+EHuSchhL7FjHgvQL/0fnnFmO4T1bhvWANX6gcnqTjtnKWbTvUMCpGnv2+t+31d7RzyEAYAd4u2fnIhHL6N/Q==", - "dev": true, - "optional": true - }, - "@eslint/eslintrc": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.2.tgz", - "integrity": "sha512-AXYd23w1S/bv3fTs3Lz0vjiYemS08jWkI3hYyS9I1ry+0f+Yjs1wm+sU0BS8qDOPrBIkp4qHYC16I8uVtpLajQ==", - "dev": true, - "requires": { - "ajv": "^6.12.4", - "debug": "^4.3.2", - "espree": "^9.4.0", - "globals": "^13.15.0", - "ignore": "^5.2.0", - "import-fresh": "^3.2.1", - "js-yaml": "^4.1.0", - "minimatch": "^3.1.2", - "strip-json-comments": "^3.1.1" - }, - "dependencies": { - "ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", - "dev": true, - "requires": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - } - }, - "argparse": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", - "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", - "dev": true - }, - "brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "globals": { - "version": "13.17.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz", - "integrity": "sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==", - "dev": true, - "requires": { - "type-fest": "^0.20.2" - } - }, - "js-yaml": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", - "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", - "dev": true, - "requires": { - "argparse": "^2.0.1" - } - }, - "json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true - }, - "minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "requires": { - "brace-expansion": "^1.1.7" - } - }, - "type-fest": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", - "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", - "dev": true - } - } - }, - "@gar/promisify": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz", - "integrity": "sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==", - "dev": true - }, - "@golevelup/ts-jest": { - "version": "0.3.4", - "resolved": "https://registry.npmjs.org/@golevelup/ts-jest/-/ts-jest-0.3.4.tgz", - "integrity": "sha512-UXas4+20gNmYfVR7DTJ9iRppy00o0ElqQrRQyn9cF3Gq90iM1Xx1lKvipTEe5NniHDD9FiMZNweOfB+9ebZRZA==", - "dev": true - }, - "@humanwhocodes/config-array": { - "version": "0.10.5", - "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.10.5.tgz", - "integrity": "sha512-XVVDtp+dVvRxMoxSiSfasYaG02VEe1qH5cKgMQJWhol6HwzbcqoCMJi8dAGoYAO57jhUyhI6cWuRiTcRaDaYug==", - "dev": true, - "requires": { - "@humanwhocodes/object-schema": "^1.2.1", - "debug": "^4.1.1", - "minimatch": "^3.0.4" - }, - "dependencies": { - "brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "requires": { - "brace-expansion": "^1.1.7" - } - } - } - }, - "@humanwhocodes/gitignore-to-minimatch": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@humanwhocodes/gitignore-to-minimatch/-/gitignore-to-minimatch-1.0.2.tgz", - "integrity": "sha512-rSqmMJDdLFUsyxR6FMtD00nfQKKLFb1kv+qBbOVKqErvloEIJLo5bDTJTQNTYgeyp78JsA7u/NPi5jT1GR/MuA==", - "dev": true - }, - "@humanwhocodes/module-importer": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", - "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", - "dev": true - }, - "@humanwhocodes/object-schema": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz", - "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==", - "dev": true - }, - "@istanbuljs/load-nyc-config": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz", - "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==", - "dev": true, - "requires": { - "camelcase": "^5.3.1", - "find-up": "^4.1.0", - "get-package-type": "^0.1.0", - "js-yaml": "^3.13.1", - "resolve-from": "^5.0.0" - } - }, - "@istanbuljs/schema": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz", - "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==", - "dev": true - }, - "@jest/console": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/console/-/console-28.1.3.tgz", - "integrity": "sha512-QPAkP5EwKdK/bxIr6C1I4Vs0rm2nHiANzj/Z5X2JQkrZo6IqvC4ldZ9K95tF0HdidhA8Bo6egxSzUFPYKcEXLw==", - "dev": true, - "requires": { - "@jest/types": "^28.1.3", - "@types/node": "*", - "chalk": "^4.0.0", - "jest-message-util": "^28.1.3", - "jest-util": "^28.1.3", - "slash": "^3.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true - }, - "slash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", - "dev": true - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "@jest/core": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/core/-/core-28.1.3.tgz", - "integrity": "sha512-CIKBrlaKOzA7YG19BEqCw3SLIsEwjZkeJzf5bdooVnW4bH5cktqe3JX+G2YV1aK5vP8N9na1IGWFzYaTp6k6NA==", - "dev": true, - "requires": { - "@jest/console": "^28.1.3", - "@jest/reporters": "^28.1.3", - "@jest/test-result": "^28.1.3", - "@jest/transform": "^28.1.3", - "@jest/types": "^28.1.3", - "@types/node": "*", - "ansi-escapes": "^4.2.1", - "chalk": "^4.0.0", - "ci-info": "^3.2.0", - "exit": "^0.1.2", - "graceful-fs": "^4.2.9", - "jest-changed-files": "^28.1.3", - "jest-config": "^28.1.3", - "jest-haste-map": "^28.1.3", - "jest-message-util": "^28.1.3", - "jest-regex-util": "^28.0.2", - "jest-resolve": "^28.1.3", - "jest-resolve-dependencies": "^28.1.3", - "jest-runner": "^28.1.3", - "jest-runtime": "^28.1.3", - "jest-snapshot": "^28.1.3", - "jest-util": "^28.1.3", - "jest-validate": "^28.1.3", - "jest-watcher": "^28.1.3", - "micromatch": "^4.0.4", - "pretty-format": "^28.1.3", - "rimraf": "^3.0.0", - "slash": "^3.0.0", - "strip-ansi": "^6.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true - }, - "slash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", - "dev": true - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "@jest/environment": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-28.1.3.tgz", - "integrity": "sha512-1bf40cMFTEkKyEf585R9Iz1WayDjHoHqvts0XFYEqyKM3cFWDpeMoqKKTAF9LSYQModPUlh8FKptoM2YcMWAXA==", - "dev": true, - "requires": { - "@jest/fake-timers": "^28.1.3", - "@jest/types": "^28.1.3", - "@types/node": "*", - "jest-mock": "^28.1.3" - } - }, - "@jest/expect": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-28.1.3.tgz", - "integrity": "sha512-lzc8CpUbSoE4dqT0U+g1qODQjBRHPpCPXissXD4mS9+sWQdmmpeJ9zSH1rS1HEkrsMN0fb7nKrJ9giAR1d3wBw==", - "dev": true, - "requires": { - "expect": "^28.1.3", - "jest-snapshot": "^28.1.3" - } - }, - "@jest/expect-utils": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-28.1.3.tgz", - "integrity": "sha512-wvbi9LUrHJLn3NlDW6wF2hvIMtd4JUl2QNVrjq+IBSHirgfrR3o9RnVtxzdEGO2n9JyIWwHnLfby5KzqBGg2YA==", - "dev": true, - "requires": { - "jest-get-type": "^28.0.2" - } - }, - "@jest/fake-timers": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-28.1.3.tgz", - "integrity": "sha512-D/wOkL2POHv52h+ok5Oj/1gOG9HSywdoPtFsRCUmlCILXNn5eIWmcnd3DIiWlJnpGvQtmajqBP95Ei0EimxfLw==", - "dev": true, - "requires": { - "@jest/types": "^28.1.3", - "@sinonjs/fake-timers": "^9.1.2", - "@types/node": "*", - "jest-message-util": "^28.1.3", - "jest-mock": "^28.1.3", - "jest-util": "^28.1.3" - } - }, - "@jest/globals": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-28.1.3.tgz", - "integrity": "sha512-XFU4P4phyryCXu1pbcqMO0GSQcYe1IsalYCDzRNyhetyeyxMcIxa11qPNDpVNLeretItNqEmYYQn1UYz/5x1NA==", - "dev": true, - "requires": { - "@jest/environment": "^28.1.3", - "@jest/expect": "^28.1.3", - "@jest/types": "^28.1.3" - } - }, - "@jest/reporters": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-28.1.3.tgz", - "integrity": "sha512-JuAy7wkxQZVNU/V6g9xKzCGC5LVXx9FDcABKsSXp5MiKPEE2144a/vXTEDoyzjUpZKfVwp08Wqg5A4WfTMAzjg==", - "dev": true, - "requires": { - "@bcoe/v8-coverage": "^0.2.3", - "@jest/console": "^28.1.3", - "@jest/test-result": "^28.1.3", - "@jest/transform": "^28.1.3", - "@jest/types": "^28.1.3", - "@jridgewell/trace-mapping": "^0.3.13", - "@types/node": "*", - "chalk": "^4.0.0", - "collect-v8-coverage": "^1.0.0", - "exit": "^0.1.2", - "glob": "^7.1.3", - "graceful-fs": "^4.2.9", - "istanbul-lib-coverage": "^3.0.0", - "istanbul-lib-instrument": "^5.1.0", - "istanbul-lib-report": "^3.0.0", - "istanbul-lib-source-maps": "^4.0.0", - "istanbul-reports": "^3.1.3", - "jest-message-util": "^28.1.3", - "jest-util": "^28.1.3", - "jest-worker": "^28.1.3", - "slash": "^3.0.0", - "string-length": "^4.0.1", - "strip-ansi": "^6.0.0", - "terminal-link": "^2.0.0", - "v8-to-istanbul": "^9.0.1" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "dev": true, - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true - }, - "jest-worker": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-28.1.3.tgz", - "integrity": "sha512-CqRA220YV/6jCo8VWvAt1KKx6eek1VIHMPeLEbpcfSfkEeWyBNppynM/o6q+Wmw+sOhos2ml34wZbSX3G13//g==", - "dev": true, - "requires": { - "@types/node": "*", - "merge-stream": "^2.0.0", - "supports-color": "^8.0.0" - }, - "dependencies": { - "supports-color": { - "version": "8.1.1", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", - "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "requires": { - "brace-expansion": "^1.1.7" - } - }, - "slash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", - "dev": true - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "@jest/schemas": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz", - "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==", - "dev": true, - "requires": { - "@sinclair/typebox": "^0.24.1" - } - }, - "@jest/source-map": { - "version": "28.1.2", - "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-28.1.2.tgz", - "integrity": "sha512-cV8Lx3BeStJb8ipPHnqVw/IM2VCMWO3crWZzYodSIkxXnRcXJipCdx1JCK0K5MsJJouZQTH73mzf4vgxRaH9ww==", - "dev": true, - "requires": { - "@jridgewell/trace-mapping": "^0.3.13", - "callsites": "^3.0.0", - "graceful-fs": "^4.2.9" - } - }, - "@jest/test-result": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-28.1.3.tgz", - "integrity": "sha512-kZAkxnSE+FqE8YjW8gNuoVkkC9I7S1qmenl8sGcDOLropASP+BkcGKwhXoyqQuGOGeYY0y/ixjrd/iERpEXHNg==", - "dev": true, - "requires": { - "@jest/console": "^28.1.3", - "@jest/types": "^28.1.3", - "@types/istanbul-lib-coverage": "^2.0.0", - "collect-v8-coverage": "^1.0.0" - } - }, - "@jest/test-sequencer": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-28.1.3.tgz", - "integrity": "sha512-NIMPEqqa59MWnDi1kvXXpYbqsfQmSJsIbnd85mdVGkiDfQ9WQQTXOLsvISUfonmnBT+w85WEgneCigEEdHDFxw==", - "dev": true, - "requires": { - "@jest/test-result": "^28.1.3", - "graceful-fs": "^4.2.9", - "jest-haste-map": "^28.1.3", - "slash": "^3.0.0" - }, - "dependencies": { - "slash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", - "dev": true - } - } - }, - "@jest/transform": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-28.1.3.tgz", - "integrity": "sha512-u5dT5di+oFI6hfcLOHGTAfmUxFRrjK+vnaP0kkVow9Md/M7V/MxqQMOz/VV25UZO8pzeA9PjfTpOu6BDuwSPQA==", - "dev": true, - "requires": { - "@babel/core": "^7.11.6", - "@jest/types": "^28.1.3", - "@jridgewell/trace-mapping": "^0.3.13", - "babel-plugin-istanbul": "^6.1.1", - "chalk": "^4.0.0", - "convert-source-map": "^1.4.0", - "fast-json-stable-stringify": "^2.0.0", - "graceful-fs": "^4.2.9", - "jest-haste-map": "^28.1.3", - "jest-regex-util": "^28.0.2", - "jest-util": "^28.1.3", - "micromatch": "^4.0.4", - "pirates": "^4.0.4", - "slash": "^3.0.0", - "write-file-atomic": "^4.0.1" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true - }, - "slash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", - "dev": true - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "@jest/types": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz", - "integrity": "sha512-RyjiyMUZrKz/c+zlMFO1pm70DcIlST8AeWTkoUdZevew44wcNZQHsEVOiCVtgVnlFFD82FPaXycys58cf2muVQ==", - "dev": true, - "requires": { - "@jest/schemas": "^28.1.3", - "@types/istanbul-lib-coverage": "^2.0.0", - "@types/istanbul-reports": "^3.0.0", - "@types/node": "*", - "@types/yargs": "^17.0.8", - "chalk": "^4.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "@jridgewell/gen-mapping": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz", - "integrity": "sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==", - "dev": true, - "requires": { - "@jridgewell/set-array": "^1.0.0", - "@jridgewell/sourcemap-codec": "^1.4.10" - } - }, - "@jridgewell/resolve-uri": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz", - "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==", - "dev": true - }, - "@jridgewell/set-array": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz", - "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==", - "dev": true - }, - "@jridgewell/source-map": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.2.tgz", - "integrity": "sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==", - "dev": true, - "requires": { - "@jridgewell/gen-mapping": "^0.3.0", - "@jridgewell/trace-mapping": "^0.3.9" - }, - "dependencies": { - "@jridgewell/gen-mapping": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz", - "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==", - "dev": true, - "requires": { - "@jridgewell/set-array": "^1.0.1", - "@jridgewell/sourcemap-codec": "^1.4.10", - "@jridgewell/trace-mapping": "^0.3.9" - } - } - } - }, - "@jridgewell/sourcemap-codec": { - "version": "1.4.14", - "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz", - "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==", - "dev": true - }, - "@jridgewell/trace-mapping": { - "version": "0.3.17", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz", - "integrity": "sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==", - "dev": true, - "requires": { - "@jridgewell/resolve-uri": "3.1.0", - "@jridgewell/sourcemap-codec": "1.4.14" - } - }, - "@leichtgewicht/ip-codec": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz", - "integrity": "sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A==", - "dev": true - }, - "@material/animation": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/animation/-/animation-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-5osi1z4JQIXcklPALbH/zTfOm2pDzHt9Fxm7ZyURy250xIZj6QjULRzPTnzOhC2ropfix9ra2Cfggbf0dcRbEQ==", - "requires": { - "tslib": "^2.1.0" - } - }, - "@material/auto-init": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/auto-init/-/auto-init-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-OigQTmrVzkcGvxNjOaIe5oItTFPgrO9xLewvharDI6m6yvO1z7OBnkcW+sFN6ggLNYNxd0O1u9v64vMsmeDABQ==", - "requires": { - "@material/base": "15.0.0-canary.684e33d25.0", - "tslib": "^2.1.0" - } - }, - "@material/banner": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/banner/-/banner-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-PqtGp3KWzdu58rWv/DIvSfe38m5YKOBbAAbBinSvgadBb/da+IE1t5F7YPNKE1T5lJsQBGVUYx6QBIeXm+aI/A==", - "requires": { - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/button": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", - "tslib": "^2.1.0" - } - }, - "@material/base": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/base/-/base-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-oOaqb/SfjWwTKsdJUZmeh/Qrs41nIJI0N+zELsxnvbGjSIN1ZMAKYZFPMahqvC68OJ6+5CvJM8PoTNs5l+B8IQ==", - "requires": { - "tslib": "^2.1.0" - } - }, - "@material/button": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/button/-/button-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-Nkekk4edeX+ObVOa7UlwavaHdmckPV5wU4SAJf3iA3R61cmz+KsgAgpzfcwv5WfNhIlc2nLu8QYEecpHdo9d/w==", - "requires": { - "@material/density": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/focus-ring": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", - "@material/touch-target": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", - "tslib": "^2.1.0" - } - }, - "@material/card": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/card/-/card-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-xhyB7XX5KkEiCEqwSPkl58ZGYL6xFdnY62zimyBXJRG/Eaa0Swj3kW20hVCpt4f7c9Zmp8Se27rg8vnKmhvO3g==", - "requires": { - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", - "tslib": "^2.1.0" - } - }, - "@material/checkbox": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/checkbox/-/checkbox-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-NFpM3TS924PmVsk2KQLNU95OYCf8ZwYgzeqfnAexU0bEfjUJXINBun2Go0AaeOUMjuvWUe+byjrXgv8SFYbMUA==", - "requires": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/density": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/focus-ring": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/touch-target": "15.0.0-canary.684e33d25.0", - "tslib": "^2.1.0" - } - }, - "@material/chips": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/chips/-/chips-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-z4ajQ4NnsAQ/Si9tZ4xmxzjj2Qb+vW++4QjCjjjwAGIZbCe0xglAnMh2t66XLJUxt7RoKZuZVEO7ZqcFZpvJFQ==", - "requires": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/checkbox": "15.0.0-canary.684e33d25.0", - "@material/density": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/focus-ring": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", - "@material/touch-target": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", - "safevalues": "^0.3.4", - "tslib": "^2.1.0" - } - }, - "@material/circular-progress": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/circular-progress/-/circular-progress-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-G6qD0nGNtEUwWnAMJuA9INYFpZoKtx7KFjBaPF4Ol2YLHtmShALNAYyn54TMAK8AZ2IpW08PXjGS7Ye88vrdEQ==", - "requires": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/progress-indicator": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "tslib": "^2.1.0" - } - }, - "@material/data-table": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/data-table/-/data-table-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-+wDw1DDDFfAsKAMzs84f/5GCjux39zjNfW8tL4wFbkWNwewmQrG9zaQMJhBpVOtLCrM8Gj6SOgOANqgqoCjvGg==", - "requires": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/checkbox": "15.0.0-canary.684e33d25.0", - "@material/density": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/icon-button": "15.0.0-canary.684e33d25.0", - "@material/linear-progress": "15.0.0-canary.684e33d25.0", - "@material/list": "15.0.0-canary.684e33d25.0", - "@material/menu": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/select": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", - "@material/touch-target": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", - "tslib": "^2.1.0" - } - }, - "@material/density": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/density/-/density-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-661yEVRMGrlq6S6WuSbPRO+ZwpdUOg2glCc7y96doM6itSLOa3UEAldjOLfsYZVB74GnKCiuDp//QmfoRyYTfA==", - "requires": { - "tslib": "^2.1.0" - } - }, - "@material/dialog": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/dialog/-/dialog-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-szn0dHnfeQTSOC6SSRSGAzX6Tnx+4NnSMUwNkXm+3bwjds8ZVK26+DXwLrP5f3ID5F1K5sFsRf2INo5/TNTHyQ==", - "requires": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/button": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/icon-button": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", - "@material/touch-target": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", - "tslib": "^2.1.0" - } - }, - "@material/dom": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/dom/-/dom-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-7pEJLYov+tGgfuD8mZxoVU6rWtPI8ppjTAhz+F27Hz9FG0JETMWTKpDPBXLnKvX7vhIxL83GvZ9geNHCe8Hfog==", - "requires": { - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "tslib": "^2.1.0" - } - }, - "@material/drawer": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/drawer/-/drawer-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-/KMckLf1PYU/H3PXnS4e0aFl03qG3JlSv4LGgX6juJufcONqGTl/m63EMO/L/eUy6H1CRrXmVDjik/jzHLyDhg==", - "requires": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/list": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", - "tslib": "^2.1.0" - } - }, - "@material/elevation": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/elevation/-/elevation-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-WDF8SsRtq3rXUbVVbd9K4DUijIPH0bUFSOreVYxudpuxAfTlDS5+aeS1EK9UIBFYLuba4u5wVT2tDv6e1RTfrQ==", - "requires": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "tslib": "^2.1.0" - } - }, - "@material/fab": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/fab/-/fab-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-KCu87rWOKEAe9vZcAm6K8XazYSWPNjMG+OhrbPjHW6bCO7as1YCgtmkBkhff7csY/rFmcVpIy884xtUfLmSudQ==", - "requires": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/focus-ring": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", - "@material/touch-target": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", - "tslib": "^2.1.0" - } - }, - "@material/feature-targeting": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/feature-targeting/-/feature-targeting-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-HyH1erNTSjS63sigNSUMaCd0nJhTNdDFeC+myrxwtDaQm+uYJ8troCNtQM3g6mx0XATNtX5aTOoPmrM6yVVi1A==", - "requires": { - "tslib": "^2.1.0" - } - }, - "@material/floating-label": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/floating-label/-/floating-label-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-f7TPp6bKpGvV3sYYiZHSGlrixXKkXXITW3Esp7KB9jRq42c0H82novmdwvY0eTef4ootmA2JEysr78KQfHBUPg==", - "requires": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", - "tslib": "^2.1.0" - } - }, - "@material/focus-ring": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/focus-ring/-/focus-ring-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-ikw2RVUfgzXChpWIzPH1VzRvTjYb5ZKj4H+CZf7jqPUXMstFOZg90Bp7ARLZHqYiyNMuUq3zUTHozS6iHorSqg==", - "requires": { - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0" - } - }, - "@material/form-field": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/form-field/-/form-field-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-vpF9N/uq5no/7+8GAbEH0868FhOuBgxAWRr1Sfb+jthKfBr8OS/wPU/AHzZHdHdAm7PQynbeOXfDsX2dI//PDA==", - "requires": { - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", - "tslib": "^2.1.0" - } - }, - "@material/icon-button": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/icon-button/-/icon-button-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-wMI+XGzmIN/o2ePBKg2hLyx7H4pXCRAyyIKMQS1FMp1UKa2tYmiHVX/V8skhKwCqxg3i6Ls/LxMjfPxTR18WvQ==", - "requires": { - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/density": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/focus-ring": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/touch-target": "15.0.0-canary.684e33d25.0", - "tslib": "^2.1.0" - } - }, - "@material/image-list": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/image-list/-/image-list-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-Ol+uaHYBe5R/cgzlfh5ONnMVX0wO6fV74JMUcQCQlxP6lXau/edARo4tkRc7A7UJUkU3VRv0EpEjLoCRNUPGaA==", - "requires": { - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", - "tslib": "^2.1.0" - } - }, - "@material/layout-grid": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/layout-grid/-/layout-grid-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-ALXE1mqFNb/RB2lVRQ3/r1Aufw2mFZnOjRE+boYDVepmAG/xWyPCyaGoavELJF5l4GAb0tXi8wA/8HeGbLOpuA==", - "requires": { - "tslib": "^2.1.0" - } - }, - "@material/line-ripple": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/line-ripple/-/line-ripple-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-7hRx8C/e9i0P6pgQpNOMfTwSS2r1fwEvBL72QDVGLtLuoKKwsjjgP6Z0Jat/GeHJe87u9LQvGBoD4upt+of/HA==", - "requires": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "tslib": "^2.1.0" - } - }, - "@material/linear-progress": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/linear-progress/-/linear-progress-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-iJclt7mKmcMk6pqD7ocXKfCWZhqBoODp7N593jYlxVpTJuEz2wiVAjZUDn/YGj/Uz3CRH+2YFfOiLr9pwWjhDg==", - "requires": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/progress-indicator": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "tslib": "^2.1.0" - } - }, - "@material/list": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/list/-/list-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-rQ+FCSdzmwTcT00IYE0uRV3CS4oGSccKFl9hkcF+aHFW61L7ORh/SCGUDPrEfQFrFkMn5f8qroVJjpUAMXBz4g==", - "requires": { - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/density": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", - "tslib": "^2.1.0" - } - }, - "@material/menu": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/menu/-/menu-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-r7wzDLSGSI9629/mfpvsMzkVxpmV75kcD3IrW0Pcu6/Bv/1xi0EvjcUXzNJJoQlwN4Zj35Ymz/PCjZkIDIz68Q==", - "requires": { - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/list": "15.0.0-canary.684e33d25.0", - "@material/menu-surface": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", - "tslib": "^2.1.0" - } - }, - "@material/menu-surface": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/menu-surface/-/menu-surface-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-RVO5GAYcfWPaKwxsF/NhUAmrYXQCQBKvRQW0TIlbmAJz6lcFeTs6YZqF3u1C7qrL3ZQGz+sur/7ywj6QU0oMow==", - "requires": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "tslib": "^2.1.0" - } - }, - "@material/notched-outline": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/notched-outline/-/notched-outline-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-9YHcBkvJLPVYzkHcWoTpBZAFrEd+j1hjhGxLhh0LuNrZe8VroUkZD1TTnUAPHRG3os6EqEWWaKb0RN+aPIF2yQ==", - "requires": { - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/floating-label": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "tslib": "^2.1.0" - } - }, - "@material/progress-indicator": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/progress-indicator/-/progress-indicator-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-c0icji4faeNWUoqGENGC7Hav0Puxh0RwXIDVizffaUxKIGbajpIp5+4Zop73fK/xFLGMB/npg7TbP+aCGjQ3fw==", - "requires": { - "tslib": "^2.1.0" - } - }, - "@material/radio": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/radio/-/radio-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-U3Eh8sNUA8trDla1Bq8Bo02foxYvtoewaKeF8A8tAju81XZ4jRiftfOsOWZDZEHCVbbCB2QwvutvFlnay5n+Aw==", - "requires": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/density": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/focus-ring": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/touch-target": "15.0.0-canary.684e33d25.0", - "tslib": "^2.1.0" - } - }, - "@material/ripple": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/ripple/-/ripple-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-RyePu7SjIm/OuyyEieZ/gxiPYkNZOZHeid72WRcN9ofdlljj2pifcdPvcfZA+v/DMS33xo5GjG2L/Qj6ClWrKw==", - "requires": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "tslib": "^2.1.0" - } - }, - "@material/rtl": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/rtl/-/rtl-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-NqdJl8Ayupp1Th+vCNCpVQHbUFOuF7TCte9LD1norTIBUF/QizIxWby2W5uUEiPbnh5j9PmE1CJtfLwKun3pcw==", - "requires": { - "@material/theme": "15.0.0-canary.684e33d25.0", - "tslib": "^2.1.0" - } - }, - "@material/segmented-button": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/segmented-button/-/segmented-button-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-bEGgg8vgXNLyukyV8HRjFMuQ6t6nm5LQ4Pgm22um61Yc8qyi0BOqV41OR4SVdUrUqZxh1aVD+p+4NN03+LfQXw==", - "requires": { - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/touch-target": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", - "tslib": "^2.1.0" - } - }, - "@material/select": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/select/-/select-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-kf178/2TeEinTv0mgmSBcmmExQ2h7a7dtR1E3WuqQgisJ/R6+zVLMkC2CnfIyzxYX2vkuUTG0ue3Reh/6XiqSg==", - "requires": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/density": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/floating-label": "15.0.0-canary.684e33d25.0", - "@material/line-ripple": "15.0.0-canary.684e33d25.0", - "@material/list": "15.0.0-canary.684e33d25.0", - "@material/menu": "15.0.0-canary.684e33d25.0", - "@material/menu-surface": "15.0.0-canary.684e33d25.0", - "@material/notched-outline": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", - "tslib": "^2.1.0" - } - }, - "@material/shape": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/shape/-/shape-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-aEelpaTFmpnCji3TUGP9bVCS/bRVjUmLTHBPZtuu1gOrUVVtJ6kYOg73dZNJF+XOoNL2yOX/LRcKwsop29tptA==", - "requires": { - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "tslib": "^2.1.0" - } - }, - "@material/slider": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/slider/-/slider-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-WVyK+2pSNSZmj07M2K/a3TADoQ9FBCndfNC/vE7/wGIg4dddJJK5KvQ+yruf9R2cSzTL/S1sZ5WpyyeM8E9HTw==", - "requires": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", - "tslib": "^2.1.0" - } - }, - "@material/snackbar": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/snackbar/-/snackbar-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-itO+DCkOannZzR1/cCHcqAm7ifhuFvXmDItNoA8qLEcAyJDJJRkhpwj3XQ01yuo9gBFcSctp7Txt7e+Hncm/Jg==", - "requires": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/button": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/icon-button": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", - "tslib": "^2.1.0" - } - }, - "@material/switch": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/switch/-/switch-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-Jxi0gl92yvvZZsAPxvVHzXx2ga+T/djMow98jvEczmpUorWnAhgiCr9CsSSRoosahWyRB8NLZOxUQrACxvffjw==", - "requires": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/density": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/focus-ring": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", - "safevalues": "^0.3.4", - "tslib": "^2.1.0" - } - }, - "@material/tab": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/tab/-/tab-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-WQL3wj9syHNcfe8KbgGGUcA34M8C/xZ+n0Fkkh8Kk6puVwaU+xqUNihsxPY6YzKpmh4PZ4oJaBdiN8zvFT1zqQ==", - "requires": { - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/focus-ring": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/tab-indicator": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", - "tslib": "^2.1.0" - } - }, - "@material/tab-bar": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/tab-bar/-/tab-bar-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-SW/cMaDsIGGkM1ag3A7GJRlmr8eXmObWsvitQJzh6Azr5zzZtSI+GQygkMesAEE1gbpqOVN8d40rh3H7VVIAcA==", - "requires": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/density": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/tab": "15.0.0-canary.684e33d25.0", - "@material/tab-indicator": "15.0.0-canary.684e33d25.0", - "@material/tab-scroller": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", - "tslib": "^2.1.0" - } - }, - "@material/tab-indicator": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/tab-indicator/-/tab-indicator-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-kKICqSPqOlaf0lzaFFCmuOqPXJC+cK48Qmsc+m5o6fJhkmuZRCYpIwB2JeP+uZSOq/bTH+SrPtCtnVlgWg6ksA==", - "requires": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "tslib": "^2.1.0" - } - }, - "@material/tab-scroller": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/tab-scroller/-/tab-scroller-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-H6EU/TSiK/M2DyyORX5GEtXD9rKYxTMHC2VxsNWARPMFJGzgeW2ugYkFv+rKI1/c0bs0CJ4e+qFnOlBsQXZvyQ==", - "requires": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/tab": "15.0.0-canary.684e33d25.0", - "tslib": "^2.1.0" - } - }, - "@material/textfield": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/textfield/-/textfield-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-OvgpDXjvpyJTtAWskO69IDybFvDNzr9w2PN/Fk7yFm+uNVupaWz1Ew8lZ4gGslaTNSVmh2XcsvmzxcLINSiiNg==", - "requires": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/density": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/floating-label": "15.0.0-canary.684e33d25.0", - "@material/line-ripple": "15.0.0-canary.684e33d25.0", - "@material/notched-outline": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", - "tslib": "^2.1.0" - } - }, - "@material/theme": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/theme/-/theme-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-AZxaXXAvRKzAi20RlMxzt2U5UmkCWyv7DMWEBXsxtG5Tk54mi1HsbVUp3fxDPTlmL7Pq8p1/DESg/o7TgRCVlw==", - "requires": { - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "tslib": "^2.1.0" - } - }, - "@material/tokens": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/tokens/-/tokens-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-wVwbQOTCXDPKYPdHQHLr026y36MMFelID1CmbfRk6mSol4O8yE9U0fXcShfRDW8Qo5E3X31w9c2A6T3neJY7wQ==", - "requires": { - "@material/elevation": "15.0.0-canary.684e33d25.0" - } - }, - "@material/tooltip": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/tooltip/-/tooltip-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-dtm26QjxyQdinc8btgz6yys07b7bUW4FZgNF2EBPeGrICrPg7jf+JEvDziz5g8VMaTBQLOQRSCGy0MKuRlOjLw==", - "requires": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/button": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", - "safevalues": "^0.3.4", - "tslib": "^2.1.0" - } - }, - "@material/top-app-bar": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/top-app-bar/-/top-app-bar-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-1M+oupUxflfW7u81P1XlxoLZB8bLzwtpKofIfDNRbEsiKhlLTERJR3Yak3BGE9xakNMysAaBHlkb5MrN5bNPFw==", - "requires": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", - "tslib": "^2.1.0" - } - }, - "@material/touch-target": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/touch-target/-/touch-target-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-zdE69Slg8+T7sTn1OwqZ6H7WBYac9mxJ/JlJqfTqthzIjZRcCxBSYymQJcDHjsrPnUojOtr9U4Tpm5YZ96TEkQ==", - "requires": { - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "tslib": "^2.1.0" - } - }, - "@material/typography": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/typography/-/typography-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-aVnvgMwcfNa/K4wujzpKDIxjGl2hbkEL+m+OKDSQqWYjKcP9QrbzCXJruJBqxrBoPRHLbqo47k5f9uT8raSgjw==", - "requires": { - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "tslib": "^2.1.0" - } - }, - "@ng-matero/extensions": { - "version": "15.0.1", - "resolved": "https://registry.npmjs.org/@ng-matero/extensions/-/extensions-15.0.1.tgz", - "integrity": "sha512-MuI+s48H0UEoij1WprcDLhY+FG21FxsXhhNWzcXaktP0ARQenG4PGtYx24blCHYA4wFhXLnGczr8rcf6MLRLJQ==", - "requires": { - "@ng-select/ng-select": "^10.0.0", - "ngx-color": "^8.0.0", - "photoviewer": "^3.6.0", - "tslib": "^2.4.0" - } - }, - "@ng-select/ng-option-highlight": { - "version": "0.0.7", - "resolved": "https://registry.npmjs.org/@ng-select/ng-option-highlight/-/ng-option-highlight-0.0.7.tgz", - "integrity": "sha512-5G6PLOQuuGbnxYSGHo+hup/Rwu7xhNNpuAE1h69OcRRrr9ltpihUIvEa4kfq22yPQz4/4Y5UGtIGLZtWCJ1tJg==", - "requires": { - "tslib": "^2.3.0" - } - }, - "@ng-select/ng-select": { - "version": "10.0.3", - "resolved": "https://registry.npmjs.org/@ng-select/ng-select/-/ng-select-10.0.3.tgz", - "integrity": "sha512-Ma8pzKMI5TWnsKgOiONQLGeUeTko9gI6AtqpMMOVhrCktjtUSo9h5N17WomHRGtba9D7QviTZcR7UBhKOPwZ7g==", - "requires": { - "tslib": "^2.3.1" - } - }, - "@ngtools/webpack": { - "version": "15.1.4", - "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-15.1.4.tgz", - "integrity": "sha512-IvKXK8AvPlLkP99Uf0RL1EHlcsXNQd86II9HsLjupUtmFC/pPuDWrRFMP9bjWUMh2ZeYpgUeEAbcCH3doSrdIA==", - "dev": true - }, - "@nodelib/fs.scandir": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", - "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", - "dev": true, - "requires": { - "@nodelib/fs.stat": "2.0.5", - "run-parallel": "^1.1.9" - } - }, - "@nodelib/fs.stat": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", - "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", - "dev": true - }, - "@nodelib/fs.walk": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", - "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", - "dev": true, - "requires": { - "@nodelib/fs.scandir": "2.1.5", - "fastq": "^1.6.0" - } - }, - "@npmcli/fs": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-3.1.0.tgz", - "integrity": "sha512-7kZUAaLscfgbwBQRbvdMYaZOWyMEcPTH/tJjnyAWJ/dvvs9Ef+CERx/qJb9GExJpl1qipaDGn7KqHnFGGixd0w==", - "dev": true, - "requires": { - "semver": "^7.3.5" - } - }, - "@npmcli/git": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/@npmcli/git/-/git-4.0.3.tgz", - "integrity": "sha512-8cXNkDIbnXPVbhXMmQ7/bklCAjtmPaXfI9aEM4iH+xSuEHINLMHhlfESvVwdqmHJRJkR48vNJTSUvoF6GRPSFA==", - "dev": true, - "requires": { - "@npmcli/promise-spawn": "^6.0.0", - "lru-cache": "^7.4.4", - "mkdirp": "^1.0.4", - "npm-pick-manifest": "^8.0.0", - "proc-log": "^3.0.0", - "promise-inflight": "^1.0.1", - "promise-retry": "^2.0.1", - "semver": "^7.3.5", - "which": "^3.0.0" - } - }, - "@npmcli/installed-package-contents": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@npmcli/installed-package-contents/-/installed-package-contents-2.0.1.tgz", - "integrity": "sha512-GIykAFdOVK31Q1/zAtT5MbxqQL2vyl9mvFJv+OGu01zxbhL3p0xc8gJjdNGX1mWmUT43aEKVO2L6V/2j4TOsAA==", - "dev": true, - "requires": { - "npm-bundled": "^3.0.0", - "npm-normalize-package-bin": "^3.0.0" - } - }, - "@npmcli/move-file": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-2.0.1.tgz", - "integrity": "sha512-mJd2Z5TjYWq/ttPLLGqArdtnC74J6bOzg4rMDnN+p1xTacZ2yPRCk2y0oSWQtygLR9YVQXgOcONrwtnk3JupxQ==", - "dev": true, - "requires": { - "mkdirp": "^1.0.4", - "rimraf": "^3.0.2" - } - }, - "@npmcli/node-gyp": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@npmcli/node-gyp/-/node-gyp-3.0.0.tgz", - "integrity": "sha512-gp8pRXC2oOxu0DUE1/M3bYtb1b3/DbJ5aM113+XJBgfXdussRAsX0YOrOhdd8WvnAR6auDBvJomGAkLKA5ydxA==", - "dev": true - }, - "@npmcli/promise-spawn": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-6.0.2.tgz", - "integrity": "sha512-gGq0NJkIGSwdbUt4yhdF8ZrmkGKVz9vAdVzpOfnom+V8PLSmSOVhZwbNvZZS1EYcJN5hzzKBxmmVVAInM6HQLg==", - "dev": true, - "requires": { - "which": "^3.0.0" - } - }, - "@npmcli/run-script": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/@npmcli/run-script/-/run-script-6.0.0.tgz", - "integrity": "sha512-ql+AbRur1TeOdl1FY+RAwGW9fcr4ZwiVKabdvm93mujGREVuVLbdkXRJDrkTXSdCjaxYydr1wlA2v67jxWG5BQ==", - "dev": true, - "requires": { - "@npmcli/node-gyp": "^3.0.0", - "@npmcli/promise-spawn": "^6.0.0", - "node-gyp": "^9.0.0", - "read-package-json-fast": "^3.0.0", - "which": "^3.0.0" - } - }, - "@schematics/angular": { - "version": "15.1.4", - "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-15.1.4.tgz", - "integrity": "sha512-4SV8dDGZeSvts01b8y2W6FmpDD0dQhBlGMhMJKC/tUnhfNKfYCs2VKtMBsIc3ZiGP2yoA3+nUiMmtS6hEkXYHw==", - "dev": true, - "requires": { - "@angular-devkit/core": "15.1.4", - "@angular-devkit/schematics": "15.1.4", - "jsonc-parser": "3.2.0" - }, - "dependencies": { - "@angular-devkit/core": { - "version": "15.1.4", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-15.1.4.tgz", - "integrity": "sha512-PW5MRmd9DHJR4FaXchwQtj9pXnsghSTnwRvfZeCRNYgU2sv0DKyTV+YTSJB+kNXnoPNG1Je6amDEkiXecpspXg==", - "dev": true, - "requires": { - "ajv": "8.12.0", - "ajv-formats": "2.1.1", - "jsonc-parser": "3.2.0", - "rxjs": "6.6.7", - "source-map": "0.7.4" - } - }, - "rxjs": { - "version": "6.6.7", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", - "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", - "dev": true, - "requires": { - "tslib": "^1.9.0" - } - }, - "tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", - "dev": true - } - } - }, - "@sinclair/typebox": { - "version": "0.24.51", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz", - "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==", - "dev": true - }, - "@sinonjs/commons": { - "version": "1.8.6", - "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.6.tgz", - "integrity": "sha512-Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ==", - "dev": true, - "requires": { - "type-detect": "4.0.8" - } - }, - "@sinonjs/fake-timers": { - "version": "9.1.2", - "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-9.1.2.tgz", - "integrity": "sha512-BPS4ynJW/o92PUR4wgriz2Ud5gpST5vz6GQfMixEDK0Z8ZCUv2M7SkBLykH56T++Xs+8ln9zTGbOvNGIe02/jw==", - "dev": true, - "requires": { - "@sinonjs/commons": "^1.7.0" - } - }, - "@tootallnate/once": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz", - "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==", - "dev": true - }, - "@types/babel__core": { - "version": "7.1.20", - "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.20.tgz", - "integrity": "sha512-PVb6Bg2QuscZ30FvOU7z4guG6c926D9YRvOxEaelzndpMsvP+YM74Q/dAFASpg2l6+XLalxSGxcq/lrgYWZtyQ==", - "dev": true, - "requires": { - "@babel/parser": "^7.1.0", - "@babel/types": "^7.0.0", - "@types/babel__generator": "*", - "@types/babel__template": "*", - "@types/babel__traverse": "*" - } - }, - "@types/babel__generator": { - "version": "7.6.4", - "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.4.tgz", - "integrity": "sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==", - "dev": true, - "requires": { - "@babel/types": "^7.0.0" - } - }, - "@types/babel__template": { - "version": "7.4.1", - "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.1.tgz", - "integrity": "sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==", - "dev": true, - "requires": { - "@babel/parser": "^7.1.0", - "@babel/types": "^7.0.0" - } - }, - "@types/babel__traverse": { - "version": "7.18.3", - "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.18.3.tgz", - "integrity": "sha512-1kbcJ40lLB7MHsj39U4Sh1uTd2E7rLEa79kmDpI6cy+XiXsteB3POdQomoq4FxszMrO3ZYchkhYJw7A2862b3w==", - "dev": true, - "requires": { - "@babel/types": "^7.3.0" - } - }, - "@types/body-parser": { - "version": "1.19.2", - "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.2.tgz", - "integrity": "sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==", - "dev": true, - "requires": { - "@types/connect": "*", - "@types/node": "*" - } - }, - "@types/bonjour": { - "version": "3.5.10", - "resolved": "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.10.tgz", - "integrity": "sha512-p7ienRMiS41Nu2/igbJxxLDWrSZ0WxM8UQgCeO9KhoVF7cOVFkrKsiDr1EsJIla8vV3oEEjGcz11jc5yimhzZw==", - "dev": true, - "requires": { - "@types/node": "*" - } - }, - "@types/connect": { - "version": "3.4.35", - "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.35.tgz", - "integrity": "sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==", - "dev": true, - "requires": { - "@types/node": "*" - } - }, - "@types/connect-history-api-fallback": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.3.5.tgz", - "integrity": "sha512-h8QJa8xSb1WD4fpKBDcATDNGXghFj6/3GRWG6dhmRcu0RX1Ubasur2Uvx5aeEwlf0MwblEC2bMzzMQntxnw/Cw==", - "dev": true, - "requires": { - "@types/express-serve-static-core": "*", - "@types/node": "*" - } - }, - "@types/eslint": { - "version": "8.4.10", - "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.10.tgz", - "integrity": "sha512-Sl/HOqN8NKPmhWo2VBEPm0nvHnu2LL3v9vKo8MEq0EtbJ4eVzGPl41VNPvn5E1i5poMk4/XD8UriLHpJvEP/Nw==", - "dev": true, - "requires": { - "@types/estree": "*", - "@types/json-schema": "*" - } - }, - "@types/eslint-scope": { - "version": "3.7.4", - "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.4.tgz", - "integrity": "sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==", - "dev": true, - "requires": { - "@types/eslint": "*", - "@types/estree": "*" - } - }, - "@types/estree": { - "version": "0.0.51", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.51.tgz", - "integrity": "sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==", - "dev": true - }, - "@types/express": { - "version": "4.17.15", - "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.15.tgz", - "integrity": "sha512-Yv0k4bXGOH+8a+7bELd2PqHQsuiANB+A8a4gnQrkRWzrkKlb6KHaVvyXhqs04sVW/OWlbPyYxRgYlIXLfrufMQ==", - "dev": true, - "requires": { - "@types/body-parser": "*", - "@types/express-serve-static-core": "^4.17.31", - "@types/qs": "*", - "@types/serve-static": "*" - } - }, - "@types/express-serve-static-core": { - "version": "4.17.32", - "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.32.tgz", - "integrity": "sha512-aI5h/VOkxOF2Z1saPy0Zsxs5avets/iaiAJYznQFm5By/pamU31xWKL//epiF4OfUA2qTOc9PV6tCUjhO8wlZA==", - "dev": true, - "requires": { - "@types/node": "*", - "@types/qs": "*", - "@types/range-parser": "*" - } - }, - "@types/graceful-fs": { - "version": "4.1.5", - "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.5.tgz", - "integrity": "sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw==", - "dev": true, - "requires": { - "@types/node": "*" - } - }, - "@types/http-proxy": { - "version": "1.17.9", - "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.9.tgz", - "integrity": "sha512-QsbSjA/fSk7xB+UXlCT3wHBy5ai9wOcNDWwZAtud+jXhwOM3l+EYZh8Lng4+/6n8uar0J7xILzqftJdJ/Wdfkw==", - "dev": true, - "requires": { - "@types/node": "*" - } - }, - "@types/istanbul-lib-coverage": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz", - "integrity": "sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g==", - "dev": true - }, - "@types/istanbul-lib-report": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz", - "integrity": "sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==", - "dev": true, - "requires": { - "@types/istanbul-lib-coverage": "*" - } - }, - "@types/istanbul-reports": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz", - "integrity": "sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==", - "dev": true, - "requires": { - "@types/istanbul-lib-report": "*" - } - }, - "@types/jest": { - "version": "28.1.8", - "resolved": "https://registry.npmjs.org/@types/jest/-/jest-28.1.8.tgz", - "integrity": "sha512-8TJkV++s7B6XqnDrzR1m/TT0A0h948Pnl/097veySPN67VRAgQ4gZ7n2KfJo2rVq6njQjdxU3GCCyDvAeuHoiw==", - "dev": true, - "requires": { - "expect": "^28.0.0", - "pretty-format": "^28.0.0" - } - }, - "@types/jsdom": { - "version": "16.2.15", - "resolved": "https://registry.npmjs.org/@types/jsdom/-/jsdom-16.2.15.tgz", - "integrity": "sha512-nwF87yjBKuX/roqGYerZZM0Nv1pZDMAT5YhOHYeM/72Fic+VEqJh4nyoqoapzJnW3pUlfxPY5FhgsJtM+dRnQQ==", - "dev": true, - "requires": { - "@types/node": "*", - "@types/parse5": "^6.0.3", - "@types/tough-cookie": "*" - } - }, - "@types/json-schema": { - "version": "7.0.11", - "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz", - "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==", - "dev": true - }, - "@types/mime": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/@types/mime/-/mime-3.0.1.tgz", - "integrity": "sha512-Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA==", - "dev": true - }, - "@types/node": { - "version": "18.0.3", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.0.3.tgz", - "integrity": "sha512-HzNRZtp4eepNitP+BD6k2L6DROIDG4Q0fm4x+dwfsr6LGmROENnok75VGw40628xf+iR24WeMFcHuuBDUAzzsQ==", - "dev": true - }, - "@types/parse-json": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz", - "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==", - "dev": true - }, - "@types/parse5": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/@types/parse5/-/parse5-6.0.3.tgz", - "integrity": "sha512-SuT16Q1K51EAVPz1K29DJ/sXjhSQ0zjvsypYJ6tlwVsRV9jwW5Adq2ch8Dq8kDBCkYnELS7N7VNCSB5nC56t/g==", - "dev": true - }, - "@types/prettier": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.7.1.tgz", - "integrity": "sha512-ri0UmynRRvZiiUJdiz38MmIblKK+oH30MztdBVR95dv/Ubw6neWSb8u1XpRb72L4qsZOhz+L+z9JD40SJmfWow==", - "dev": true - }, - "@types/qs": { - "version": "6.9.7", - "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.7.tgz", - "integrity": "sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==", - "dev": true - }, - "@types/range-parser": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.4.tgz", - "integrity": "sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==", - "dev": true - }, - "@types/retry": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.0.tgz", - "integrity": "sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==", - "dev": true - }, - "@types/semver": { - "version": "7.3.13", - "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.3.13.tgz", - "integrity": "sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw==", - "dev": true - }, - "@types/serve-index": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.1.tgz", - "integrity": "sha512-d/Hs3nWDxNL2xAczmOVZNj92YZCS6RGxfBPjKzuu/XirCgXdpKEb88dYNbrYGint6IVWLNP+yonwVAuRC0T2Dg==", - "dev": true, - "requires": { - "@types/express": "*" - } - }, - "@types/serve-static": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.0.tgz", - "integrity": "sha512-z5xyF6uh8CbjAu9760KDKsH2FcDxZ2tFCsA4HIMWE6IkiYMXfVoa+4f9KX+FN0ZLsaMw1WNG2ETLA6N+/YA+cg==", - "dev": true, - "requires": { - "@types/mime": "*", - "@types/node": "*" - } - }, - "@types/sockjs": { - "version": "0.3.33", - "resolved": "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.33.tgz", - "integrity": "sha512-f0KEEe05NvUnat+boPTZ0dgaLZ4SfSouXUgv5noUiefG2ajgKjmETo9ZJyuqsl7dfl2aHlLJUiki6B4ZYldiiw==", - "dev": true, - "requires": { - "@types/node": "*" - } - }, - "@types/stack-utils": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.1.tgz", - "integrity": "sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==", - "dev": true - }, - "@types/tough-cookie": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.2.tgz", - "integrity": "sha512-Q5vtl1W5ue16D+nIaW8JWebSSraJVlK+EthKn7e7UcD4KWsaSJ8BqGPXNaPghgtcn/fhvrN17Tv8ksUsQpiplw==", - "dev": true - }, - "@types/ws": { - "version": "8.5.4", - "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.4.tgz", - "integrity": "sha512-zdQDHKUgcX/zBc4GrwsE/7dVdAD8JR4EuiAXiiUhhfyIJXXb2+PrGshFyeXWQPMmmZ2XxgaqclgpIC7eTXc1mg==", - "dev": true, - "requires": { - "@types/node": "*" - } - }, - "@types/yargs": { - "version": "17.0.15", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.15.tgz", - "integrity": "sha512-ZHc4W2dnEQPfhn06TBEdWaiUHEZAocYaiVMfwOipY5jcJt/251wVrKCBWBetGZWO5CF8tdb7L3DmdxVlZ2BOIg==", - "dev": true, - "requires": { - "@types/yargs-parser": "*" - } - }, - "@types/yargs-parser": { - "version": "21.0.0", - "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.0.tgz", - "integrity": "sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==", - "dev": true - }, - "@typescript-eslint/eslint-plugin": { - "version": "5.37.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.37.0.tgz", - "integrity": "sha512-Fde6W0IafXktz1UlnhGkrrmnnGpAo1kyX7dnyHHVrmwJOn72Oqm3eYtddrpOwwel2W8PAK9F3pIL5S+lfoM0og==", - "dev": true, - "requires": { - "@typescript-eslint/scope-manager": "5.37.0", - "@typescript-eslint/type-utils": "5.37.0", - "@typescript-eslint/utils": "5.37.0", - "debug": "^4.3.4", - "functional-red-black-tree": "^1.0.1", - "ignore": "^5.2.0", - "regexpp": "^3.2.0", - "semver": "^7.3.7", - "tsutils": "^3.21.0" - } - }, - "@typescript-eslint/parser": { - "version": "5.37.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.37.0.tgz", - "integrity": "sha512-01VzI/ipYKuaG5PkE5+qyJ6m02fVALmMPY3Qq5BHflDx3y4VobbLdHQkSMg9VPRS4KdNt4oYTMaomFoHonBGAw==", - "dev": true, - "requires": { - "@typescript-eslint/scope-manager": "5.37.0", - "@typescript-eslint/types": "5.37.0", - "@typescript-eslint/typescript-estree": "5.37.0", - "debug": "^4.3.4" - } - }, - "@typescript-eslint/scope-manager": { - "version": "5.37.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.37.0.tgz", - "integrity": "sha512-F67MqrmSXGd/eZnujjtkPgBQzgespu/iCZ+54Ok9X5tALb9L2v3G+QBSoWkXG0p3lcTJsL+iXz5eLUEdSiJU9Q==", - "dev": true, - "requires": { - "@typescript-eslint/types": "5.37.0", - "@typescript-eslint/visitor-keys": "5.37.0" - } - }, - "@typescript-eslint/type-utils": { - "version": "5.37.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.37.0.tgz", - "integrity": "sha512-BSx/O0Z0SXOF5tY0bNTBcDEKz2Ec20GVYvq/H/XNKiUorUFilH7NPbFUuiiyzWaSdN3PA8JV0OvYx0gH/5aFAQ==", - "dev": true, - "requires": { - "@typescript-eslint/typescript-estree": "5.37.0", - "@typescript-eslint/utils": "5.37.0", - "debug": "^4.3.4", - "tsutils": "^3.21.0" - } - }, - "@typescript-eslint/types": { - "version": "5.37.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.37.0.tgz", - "integrity": "sha512-3frIJiTa5+tCb2iqR/bf7XwU20lnU05r/sgPJnRpwvfZaqCJBrl8Q/mw9vr3NrNdB/XtVyMA0eppRMMBqdJ1bA==", - "dev": true - }, - "@typescript-eslint/typescript-estree": { - "version": "5.37.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.37.0.tgz", - "integrity": "sha512-JkFoFIt/cx59iqEDSgIGnQpCTRv96MQnXCYvJi7QhBC24uyuzbD8wVbajMB1b9x4I0octYFJ3OwjAwNqk1AjDA==", - "dev": true, - "requires": { - "@typescript-eslint/types": "5.37.0", - "@typescript-eslint/visitor-keys": "5.37.0", - "debug": "^4.3.4", - "globby": "^11.1.0", - "is-glob": "^4.0.3", - "semver": "^7.3.7", - "tsutils": "^3.21.0" - }, - "dependencies": { - "globby": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", - "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==", - "dev": true, - "requires": { - "array-union": "^2.1.0", - "dir-glob": "^3.0.1", - "fast-glob": "^3.2.9", - "ignore": "^5.2.0", - "merge2": "^1.4.1", - "slash": "^3.0.0" - } - }, - "slash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", - "dev": true - } - } - }, - "@typescript-eslint/utils": { - "version": "5.37.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.37.0.tgz", - "integrity": "sha512-jUEJoQrWbZhmikbcWSMDuUSxEE7ID2W/QCV/uz10WtQqfOuKZUqFGjqLJ+qhDd17rjgp+QJPqTdPIBWwoob2NQ==", - "dev": true, - "requires": { - "@types/json-schema": "^7.0.9", - "@typescript-eslint/scope-manager": "5.37.0", - "@typescript-eslint/types": "5.37.0", - "@typescript-eslint/typescript-estree": "5.37.0", - "eslint-scope": "^5.1.1", - "eslint-utils": "^3.0.0" - } - }, - "@typescript-eslint/visitor-keys": { - "version": "5.37.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.37.0.tgz", - "integrity": "sha512-Hp7rT4cENBPIzMwrlehLW/28EVCOcE9U1Z1BQTc8EA8v5qpr7GRGuG+U58V5tTY48zvUOA3KHvw3rA8tY9fbdA==", - "dev": true, - "requires": { - "@typescript-eslint/types": "5.37.0", - "eslint-visitor-keys": "^3.3.0" - } - }, - "@webassemblyjs/ast": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz", - "integrity": "sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==", - "dev": true, - "requires": { - "@webassemblyjs/helper-numbers": "1.11.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.1" - } - }, - "@webassemblyjs/floating-point-hex-parser": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz", - "integrity": "sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==", - "dev": true - }, - "@webassemblyjs/helper-api-error": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz", - "integrity": "sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==", - "dev": true - }, - "@webassemblyjs/helper-buffer": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz", - "integrity": "sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==", - "dev": true - }, - "@webassemblyjs/helper-numbers": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz", - "integrity": "sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==", - "dev": true, - "requires": { - "@webassemblyjs/floating-point-hex-parser": "1.11.1", - "@webassemblyjs/helper-api-error": "1.11.1", - "@xtuc/long": "4.2.2" - } - }, - "@webassemblyjs/helper-wasm-bytecode": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz", - "integrity": "sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==", - "dev": true - }, - "@webassemblyjs/helper-wasm-section": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz", - "integrity": "sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==", - "dev": true, - "requires": { - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/helper-buffer": "1.11.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.1", - "@webassemblyjs/wasm-gen": "1.11.1" - } - }, - "@webassemblyjs/ieee754": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz", - "integrity": "sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==", - "dev": true, - "requires": { - "@xtuc/ieee754": "^1.2.0" - } - }, - "@webassemblyjs/leb128": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.1.tgz", - "integrity": "sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==", - "dev": true, - "requires": { - "@xtuc/long": "4.2.2" - } - }, - "@webassemblyjs/utf8": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.1.tgz", - "integrity": "sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==", - "dev": true - }, - "@webassemblyjs/wasm-edit": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz", - "integrity": "sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==", - "dev": true, - "requires": { - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/helper-buffer": "1.11.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.1", - "@webassemblyjs/helper-wasm-section": "1.11.1", - "@webassemblyjs/wasm-gen": "1.11.1", - "@webassemblyjs/wasm-opt": "1.11.1", - "@webassemblyjs/wasm-parser": "1.11.1", - "@webassemblyjs/wast-printer": "1.11.1" - } - }, - "@webassemblyjs/wasm-gen": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz", - "integrity": "sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==", - "dev": true, - "requires": { - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.1", - "@webassemblyjs/ieee754": "1.11.1", - "@webassemblyjs/leb128": "1.11.1", - "@webassemblyjs/utf8": "1.11.1" - } - }, - "@webassemblyjs/wasm-opt": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz", - "integrity": "sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==", - "dev": true, - "requires": { - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/helper-buffer": "1.11.1", - "@webassemblyjs/wasm-gen": "1.11.1", - "@webassemblyjs/wasm-parser": "1.11.1" - } - }, - "@webassemblyjs/wasm-parser": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz", - "integrity": "sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==", - "dev": true, - "requires": { - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/helper-api-error": "1.11.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.1", - "@webassemblyjs/ieee754": "1.11.1", - "@webassemblyjs/leb128": "1.11.1", - "@webassemblyjs/utf8": "1.11.1" - } - }, - "@webassemblyjs/wast-printer": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz", - "integrity": "sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==", - "dev": true, - "requires": { - "@webassemblyjs/ast": "1.11.1", - "@xtuc/long": "4.2.2" - } - }, - "@xtuc/ieee754": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz", - "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==", - "dev": true - }, - "@xtuc/long": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz", - "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==", - "dev": true - }, - "@yarnpkg/lockfile": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz", - "integrity": "sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==", - "dev": true - }, - "abab": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz", - "integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==", - "dev": true - }, - "abbrev": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", - "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", - "dev": true - }, - "accepts": { - "version": "1.3.8", - "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz", - "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==", - "dev": true, - "requires": { - "mime-types": "~2.1.34", - "negotiator": "0.6.3" - } - }, - "acorn": { - "version": "8.8.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.0.tgz", - "integrity": "sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==", - "dev": true - }, - "acorn-globals": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-6.0.0.tgz", - "integrity": "sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==", - "dev": true, - "requires": { - "acorn": "^7.1.1", - "acorn-walk": "^7.1.1" - }, - "dependencies": { - "acorn": { - "version": "7.4.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", - "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==", - "dev": true - } - } - }, - "acorn-import-assertions": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz", - "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==", - "dev": true - }, - "acorn-jsx": { - "version": "5.3.2", - "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", - "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", - "dev": true - }, - "acorn-walk": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz", - "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==", - "dev": true - }, - "adjust-sourcemap-loader": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/adjust-sourcemap-loader/-/adjust-sourcemap-loader-4.0.0.tgz", - "integrity": "sha512-OXwN5b9pCUXNQHJpwwD2qP40byEmSgzj8B4ydSN0uMNYWiFmJ6x6KwUllMmfk8Rwu/HJDFR7U8ubsWBoN0Xp0A==", - "dev": true, - "requires": { - "loader-utils": "^2.0.0", - "regex-parser": "^2.2.11" - }, - "dependencies": { - "loader-utils": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz", - "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==", - "dev": true, - "requires": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^2.1.2" - } - } - } - }, - "agent-base": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", - "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", - "dev": true, - "requires": { - "debug": "4" - } - }, - "agentkeepalive": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.2.1.tgz", - "integrity": "sha512-Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA==", - "dev": true, - "requires": { - "debug": "^4.1.0", - "depd": "^1.1.2", - "humanize-ms": "^1.2.1" - } - }, - "aggregate-error": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz", - "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==", - "dev": true, - "requires": { - "clean-stack": "^2.0.0", - "indent-string": "^4.0.0" - } - }, - "ajv": { - "version": "8.12.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz", - "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==", - "dev": true, - "requires": { - "fast-deep-equal": "^3.1.1", - "json-schema-traverse": "^1.0.0", - "require-from-string": "^2.0.2", - "uri-js": "^4.2.2" - } - }, - "ajv-formats": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz", - "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==", - "dev": true, - "requires": { - "ajv": "^8.0.0" - } - }, - "ajv-keywords": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz", - "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==", - "dev": true, - "requires": { - "fast-deep-equal": "^3.1.3" - } - }, - "angular-mentions": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/angular-mentions/-/angular-mentions-1.5.0.tgz", - "integrity": "sha512-6l63v7AvrX9vFzj2h7jAPTnQ390IomCz3HiQP+b3PnDvaZiycd+tiVavi5RxAIX8WYjsamAR+tTPCkOkBkqZ+w==", - "requires": { - "tslib": "^2.0.0" - } - }, - "ansi-colors": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz", - "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==", - "dev": true - }, - "ansi-escapes": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz", - "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==", - "dev": true, - "requires": { - "type-fest": "^0.21.3" - } - }, - "ansi-html-community": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/ansi-html-community/-/ansi-html-community-0.0.8.tgz", - "integrity": "sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==", - "dev": true - }, - "ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true - }, - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "requires": { - "color-convert": "^1.9.0" - } - }, - "anymatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz", - "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==", - "dev": true, - "requires": { - "normalize-path": "^3.0.0", - "picomatch": "^2.0.4" - } - }, - "aproba": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz", - "integrity": "sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==", - "dev": true - }, - "are-we-there-yet": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz", - "integrity": "sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg==", - "dev": true, - "requires": { - "delegates": "^1.0.0", - "readable-stream": "^3.6.0" - } - }, - "argparse": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", - "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", - "dev": true, - "requires": { - "sprintf-js": "~1.0.2" - } - }, - "aria-query": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.0.2.tgz", - "integrity": "sha512-eigU3vhqSO+Z8BKDnVLN/ompjhf3pYzecKXz8+whRy+9gZu8n1TCGfwzQUUPnqdHl9ax1Hr9031orZ+UOEYr7Q==", - "dev": true - }, - "array-flatten": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz", - "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==", - "dev": true - }, - "array-union": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", - "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", - "dev": true - }, - "asynckit": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==", - "dev": true - }, - "autoprefixer": { - "version": "10.4.13", - "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.13.tgz", - "integrity": "sha512-49vKpMqcZYsJjwotvt4+h/BCjJVnhGwcLpDt5xkcaOG3eLrG/HUYLagrihYsQ+qrIBgIzX1Rw7a6L8I/ZA1Atg==", - "dev": true, - "requires": { - "browserslist": "^4.21.4", - "caniuse-lite": "^1.0.30001426", - "fraction.js": "^4.2.0", - "normalize-range": "^0.1.2", - "picocolors": "^1.0.0", - "postcss-value-parser": "^4.2.0" - } - }, - "available-typed-arrays": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz", - "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==", - "dev": true - }, - "axobject-query": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-3.0.1.tgz", - "integrity": "sha512-vy5JPSOibF9yAeC2PoemRdA1MuSXX7vX5osdoxKf/6OUeppAWekZ3JIJVNWFMH6wgj7uHYyqZUSqE/b/3JLV1A==", - "dev": true - }, - "babel-jest": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-28.1.3.tgz", - "integrity": "sha512-epUaPOEWMk3cWX0M/sPvCHHCe9fMFAa/9hXEgKP8nFfNl/jlGkE9ucq9NqkZGXLDduCJYS0UvSlPUwC0S+rH6Q==", - "dev": true, - "requires": { - "@jest/transform": "^28.1.3", - "@types/babel__core": "^7.1.14", - "babel-plugin-istanbul": "^6.1.1", - "babel-preset-jest": "^28.1.3", - "chalk": "^4.0.0", - "graceful-fs": "^4.2.9", - "slash": "^3.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true - }, - "slash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", - "dev": true - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "babel-loader": { - "version": "9.1.2", - "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-9.1.2.tgz", - "integrity": "sha512-mN14niXW43tddohGl8HPu5yfQq70iUThvFL/4QzESA7GcZoC0eVOhvWdQ8+3UlSjaDE9MVtsW9mxDY07W7VpVA==", - "dev": true, - "requires": { - "find-cache-dir": "^3.3.2", - "schema-utils": "^4.0.0" - } - }, - "babel-plugin-istanbul": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz", - "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.0.0", - "@istanbuljs/load-nyc-config": "^1.0.0", - "@istanbuljs/schema": "^0.1.2", - "istanbul-lib-instrument": "^5.0.4", - "test-exclude": "^6.0.0" - } - }, - "babel-plugin-jest-hoist": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-28.1.3.tgz", - "integrity": "sha512-Ys3tUKAmfnkRUpPdpa98eYrAR0nV+sSFUZZEGuQ2EbFd1y4SOLtD5QDNHAq+bb9a+bbXvYQC4b+ID/THIMcU6Q==", - "dev": true, - "requires": { - "@babel/template": "^7.3.3", - "@babel/types": "^7.3.3", - "@types/babel__core": "^7.1.14", - "@types/babel__traverse": "^7.0.6" - } - }, - "babel-plugin-polyfill-corejs2": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.3.tgz", - "integrity": "sha512-8hOdmFYFSZhqg2C/JgLUQ+t52o5nirNwaWM2B9LWteozwIvM14VSwdsCAUET10qT+kmySAlseadmfeeSWFCy+Q==", - "dev": true, - "requires": { - "@babel/compat-data": "^7.17.7", - "@babel/helper-define-polyfill-provider": "^0.3.3", - "semver": "^6.1.1" - }, - "dependencies": { - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true - } - } - }, - "babel-plugin-polyfill-corejs3": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.6.0.tgz", - "integrity": "sha512-+eHqR6OPcBhJOGgsIar7xoAB1GcSwVUA3XjAd7HJNzOXT4wv6/H7KIdA/Nc60cvUlDbKApmqNvD1B1bzOt4nyA==", - "dev": true, - "requires": { - "@babel/helper-define-polyfill-provider": "^0.3.3", - "core-js-compat": "^3.25.1" - } - }, - "babel-plugin-polyfill-regenerator": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.1.tgz", - "integrity": "sha512-NtQGmyQDXjQqQ+IzRkBVwEOz9lQ4zxAQZgoAYEtU9dJjnl1Oc98qnN7jcp+bE7O7aYzVpavXE3/VKXNzUbh7aw==", - "dev": true, - "requires": { - "@babel/helper-define-polyfill-provider": "^0.3.3" - } - }, - "babel-preset-current-node-syntax": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz", - "integrity": "sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==", - "dev": true, - "requires": { - "@babel/plugin-syntax-async-generators": "^7.8.4", - "@babel/plugin-syntax-bigint": "^7.8.3", - "@babel/plugin-syntax-class-properties": "^7.8.3", - "@babel/plugin-syntax-import-meta": "^7.8.3", - "@babel/plugin-syntax-json-strings": "^7.8.3", - "@babel/plugin-syntax-logical-assignment-operators": "^7.8.3", - "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3", - "@babel/plugin-syntax-numeric-separator": "^7.8.3", - "@babel/plugin-syntax-object-rest-spread": "^7.8.3", - "@babel/plugin-syntax-optional-catch-binding": "^7.8.3", - "@babel/plugin-syntax-optional-chaining": "^7.8.3", - "@babel/plugin-syntax-top-level-await": "^7.8.3" - } - }, - "babel-preset-jest": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-28.1.3.tgz", - "integrity": "sha512-L+fupJvlWAHbQfn74coNX3zf60LXMJsezNvvx8eIh7iOR1luJ1poxYgQk1F8PYtNq/6QODDHCqsSnTFSWC491A==", - "dev": true, - "requires": { - "babel-plugin-jest-hoist": "^28.1.3", - "babel-preset-current-node-syntax": "^1.0.0" - } - }, - "balanced-match": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", - "dev": true - }, - "base64-js": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", - "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", - "dev": true - }, - "batch": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz", - "integrity": "sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==", - "dev": true - }, - "big.js": { - "version": "5.2.2", - "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz", - "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==", - "dev": true - }, - "binary-extensions": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", - "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==", - "dev": true - }, - "bl": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", - "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==", - "dev": true, - "requires": { - "buffer": "^5.5.0", - "inherits": "^2.0.4", - "readable-stream": "^3.4.0" - } - }, - "body-parser": { - "version": "1.20.1", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz", - "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==", - "dev": true, - "requires": { - "bytes": "3.1.2", - "content-type": "~1.0.4", - "debug": "2.6.9", - "depd": "2.0.0", - "destroy": "1.2.0", - "http-errors": "2.0.0", - "iconv-lite": "0.4.24", - "on-finished": "2.4.1", - "qs": "6.11.0", - "raw-body": "2.5.1", - "type-is": "~1.6.18", - "unpipe": "1.0.0" - }, - "dependencies": { - "bytes": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", - "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", - "dev": true - }, - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "depd": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", - "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", - "dev": true - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "dev": true - } - } - }, - "bonjour-service": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.1.0.tgz", - "integrity": "sha512-LVRinRB3k1/K0XzZ2p58COnWvkQknIY6sf0zF2rpErvcJXpMBttEPQSxK+HEXSS9VmpZlDoDnQWv8ftJT20B0Q==", - "dev": true, - "requires": { - "array-flatten": "^2.1.2", - "dns-equal": "^1.0.0", - "fast-deep-equal": "^3.1.3", - "multicast-dns": "^7.2.5" - } - }, - "boolbase": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", - "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==", - "dev": true - }, - "brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", - "dev": true, - "requires": { - "balanced-match": "^1.0.0" - } - }, - "braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", - "dev": true, - "requires": { - "fill-range": "^7.0.1" - } - }, - "browser-process-hrtime": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz", - "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==", - "dev": true - }, - "browserslist": { - "version": "4.21.4", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz", - "integrity": "sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==", - "dev": true, - "requires": { - "caniuse-lite": "^1.0.30001400", - "electron-to-chromium": "^1.4.251", - "node-releases": "^2.0.6", - "update-browserslist-db": "^1.0.9" - } - }, - "bs-logger": { - "version": "0.2.6", - "resolved": "https://registry.npmjs.org/bs-logger/-/bs-logger-0.2.6.tgz", - "integrity": "sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==", - "dev": true, - "requires": { - "fast-json-stable-stringify": "2.x" - } - }, - "bser": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz", - "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==", - "dev": true, - "requires": { - "node-int64": "^0.4.0" - } - }, - "buffer": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", - "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", - "dev": true, - "requires": { - "base64-js": "^1.3.1", - "ieee754": "^1.1.13" - } - }, - "buffer-from": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", - "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==" - }, - "builtins": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/builtins/-/builtins-5.0.1.tgz", - "integrity": "sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==", - "dev": true, - "requires": { - "semver": "^7.0.0" - } - }, - "bytes": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz", - "integrity": "sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==", - "dev": true - }, - "cacache": { - "version": "17.0.4", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-17.0.4.tgz", - "integrity": "sha512-Z/nL3gU+zTUjz5pCA5vVjYM8pmaw2kxM7JEiE0fv3w77Wj+sFbi70CrBruUWH0uNcEdvLDixFpgA2JM4F4DBjA==", - "dev": true, - "requires": { - "@npmcli/fs": "^3.1.0", - "fs-minipass": "^3.0.0", - "glob": "^8.0.1", - "lru-cache": "^7.7.1", - "minipass": "^4.0.0", - "minipass-collect": "^1.0.2", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.4", - "p-map": "^4.0.0", - "promise-inflight": "^1.0.1", - "ssri": "^10.0.0", - "tar": "^6.1.11", - "unique-filename": "^3.0.0" - } - }, - "call-bind": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", - "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", - "dev": true, - "requires": { - "function-bind": "^1.1.1", - "get-intrinsic": "^1.0.2" - } - }, - "callsites": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", - "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", - "dev": true - }, - "camelcase": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", - "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", - "dev": true - }, - "caniuse-lite": { - "version": "1.0.30001442", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001442.tgz", - "integrity": "sha512-239m03Pqy0hwxYPYR5JwOIxRJfLTWtle9FV8zosfV5pHg+/51uD4nxcUlM8+mWWGfwKtt8lJNHnD3cWw9VZ6ow==", - "dev": true - }, - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - } - }, - "char-regex": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz", - "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==", - "dev": true - }, - "chardet": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz", - "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==", - "dev": true - }, - "chokidar": { - "version": "3.5.3", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz", - "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==", - "dev": true, - "requires": { - "anymatch": "~3.1.2", - "braces": "~3.0.2", - "fsevents": "~2.3.2", - "glob-parent": "~5.1.2", - "is-binary-path": "~2.1.0", - "is-glob": "~4.0.1", - "normalize-path": "~3.0.0", - "readdirp": "~3.6.0" - } - }, - "chownr": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", - "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==", - "dev": true - }, - "chrome-trace-event": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz", - "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==", - "dev": true - }, - "ci-info": { - "version": "3.7.0", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.7.0.tgz", - "integrity": "sha512-2CpRNYmImPx+RXKLq6jko/L07phmS9I02TyqkcNU20GCF/GgaWvc58hPtjxDX8lPpkdwc9sNh72V9k00S7ezog==", - "dev": true - }, - "cjs-module-lexer": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz", - "integrity": "sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA==", - "dev": true - }, - "clean-stack": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", - "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==", - "dev": true - }, - "cli-cursor": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz", - "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==", - "dev": true, - "requires": { - "restore-cursor": "^3.1.0" - } - }, - "cli-spinners": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.6.1.tgz", - "integrity": "sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g==", - "dev": true - }, - "cli-width": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz", - "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==", - "dev": true - }, - "cliui": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", - "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", - "dev": true, - "requires": { - "string-width": "^4.2.0", - "strip-ansi": "^6.0.1", - "wrap-ansi": "^7.0.0" - } - }, - "clone": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz", - "integrity": "sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==", - "dev": true - }, - "clone-deep": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz", - "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==", - "dev": true, - "requires": { - "is-plain-object": "^2.0.4", - "kind-of": "^6.0.2", - "shallow-clone": "^3.0.0" - } - }, - "co": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", - "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==", - "dev": true - }, - "collect-v8-coverage": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz", - "integrity": "sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==", - "dev": true - }, - "color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, - "requires": { - "color-name": "1.1.3" - } - }, - "color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", - "dev": true - }, - "color-support": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz", - "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==", - "dev": true - }, - "colorette": { - "version": "2.0.19", - "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.19.tgz", - "integrity": "sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ==", - "dev": true - }, - "combined-stream": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", - "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", - "dev": true, - "requires": { - "delayed-stream": "~1.0.0" - } - }, - "commander": { - "version": "2.20.3", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", - "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", - "dev": true - }, - "commondir": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz", - "integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==", - "dev": true - }, - "compressible": { - "version": "2.0.18", - "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz", - "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==", - "dev": true, - "requires": { - "mime-db": ">= 1.43.0 < 2" - } - }, - "compression": { - "version": "1.7.4", - "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz", - "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==", - "dev": true, - "requires": { - "accepts": "~1.3.5", - "bytes": "3.0.0", - "compressible": "~2.0.16", - "debug": "2.6.9", - "on-headers": "~1.0.2", - "safe-buffer": "5.1.2", - "vary": "~1.1.2" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "dev": true - } - } - }, - "concat-map": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", - "dev": true - }, - "connect-history-api-fallback": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz", - "integrity": "sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA==", - "dev": true - }, - "console-control-strings": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", - "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==", - "dev": true - }, - "content-disposition": { - "version": "0.5.4", - "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz", - "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==", - "dev": true, - "requires": { - "safe-buffer": "5.2.1" - }, - "dependencies": { - "safe-buffer": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", - "dev": true - } - } - }, - "content-type": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz", - "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==", - "dev": true - }, - "convert-source-map": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz", - "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==", - "dev": true, - "requires": { - "safe-buffer": "~5.1.1" - } - }, - "cookie": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz", - "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==", - "dev": true - }, - "cookie-signature": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", - "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==", - "dev": true - }, - "copy-anything": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/copy-anything/-/copy-anything-2.0.6.tgz", - "integrity": "sha512-1j20GZTsvKNkc4BY3NpMOM8tt///wY3FpIzozTOFO2ffuZcV61nojHXVKIy3WM+7ADCy5FVhdZYHYDdgTU0yJw==", - "dev": true, - "requires": { - "is-what": "^3.14.1" - } - }, - "copy-webpack-plugin": { - "version": "11.0.0", - "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-11.0.0.tgz", - "integrity": "sha512-fX2MWpamkW0hZxMEg0+mYnA40LTosOSa5TqZ9GYIBzyJa9C3QUaMPSE2xAi/buNr8u89SfD9wHSQVBzrRa/SOQ==", - "dev": true, - "requires": { - "fast-glob": "^3.2.11", - "glob-parent": "^6.0.1", - "globby": "^13.1.1", - "normalize-path": "^3.0.0", - "schema-utils": "^4.0.0", - "serialize-javascript": "^6.0.0" - }, - "dependencies": { - "glob-parent": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", - "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", - "dev": true, - "requires": { - "is-glob": "^4.0.3" - } - } - } - }, - "core-js-compat": { - "version": "3.27.2", - "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.27.2.tgz", - "integrity": "sha512-welaYuF7ZtbYKGrIy7y3eb40d37rG1FvzEOfe7hSLd2iD6duMDqUhRfSvCGyC46HhR6Y8JXXdZ2lnRUMkPBpvg==", - "dev": true, - "requires": { - "browserslist": "^4.21.4" - } - }, - "core-util-is": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz", - "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==", - "dev": true - }, - "cosmiconfig": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.1.0.tgz", - "integrity": "sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==", - "dev": true, - "requires": { - "@types/parse-json": "^4.0.0", - "import-fresh": "^3.2.1", - "parse-json": "^5.0.0", - "path-type": "^4.0.0", - "yaml": "^1.10.0" - } - }, - "critters": { - "version": "0.0.16", - "resolved": "https://registry.npmjs.org/critters/-/critters-0.0.16.tgz", - "integrity": "sha512-JwjgmO6i3y6RWtLYmXwO5jMd+maZt8Tnfu7VVISmEWyQqfLpB8soBswf8/2bu6SBXxtKA68Al3c+qIG1ApT68A==", - "dev": true, - "requires": { - "chalk": "^4.1.0", - "css-select": "^4.2.0", - "parse5": "^6.0.1", - "parse5-htmlparser2-tree-adapter": "^6.0.1", - "postcss": "^8.3.7", - "pretty-bytes": "^5.3.0" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", - "dev": true, - "requires": { - "path-key": "^3.1.0", - "shebang-command": "^2.0.0", - "which": "^2.0.1" - }, - "dependencies": { - "which": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", - "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", - "dev": true, - "requires": { - "isexe": "^2.0.0" - } - } - } - }, - "css-loader": { - "version": "6.7.3", - "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.7.3.tgz", - "integrity": "sha512-qhOH1KlBMnZP8FzRO6YCH9UHXQhVMcEGLyNdb7Hv2cpcmJbW0YrddO+tG1ab5nT41KpHIYGsbeHqxB9xPu1pKQ==", - "dev": true, - "requires": { - "icss-utils": "^5.1.0", - "postcss": "^8.4.19", - "postcss-modules-extract-imports": "^3.0.0", - "postcss-modules-local-by-default": "^4.0.0", - "postcss-modules-scope": "^3.0.0", - "postcss-modules-values": "^4.0.0", - "postcss-value-parser": "^4.2.0", - "semver": "^7.3.8" - } - }, - "css-select": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz", - "integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==", - "dev": true, - "requires": { - "boolbase": "^1.0.0", - "css-what": "^6.0.1", - "domhandler": "^4.3.1", - "domutils": "^2.8.0", - "nth-check": "^2.0.1" - } - }, - "css-what": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz", - "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==", - "dev": true - }, - "cssesc": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz", - "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==", - "dev": true - }, - "cssom": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.5.0.tgz", - "integrity": "sha512-iKuQcq+NdHqlAcwUY0o/HL69XQrUaQdMjmStJ8JFmUaiiQErlhrmuigkg/CU4E2J0IyUKUrMAgl36TvN67MqTw==", - "dev": true - }, - "cssstyle": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz", - "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==", - "dev": true, - "requires": { - "cssom": "~0.3.6" - }, - "dependencies": { - "cssom": { - "version": "0.3.8", - "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz", - "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==", - "dev": true - } - } - }, - "data-urls": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-3.0.2.tgz", - "integrity": "sha512-Jy/tj3ldjZJo63sVAvg6LHt2mHvl4V6AgRAmNDtLdm7faqtsx+aJG42rsyCo9JCoRVKwPFzKlIPx3DIibwSIaQ==", - "dev": true, - "requires": { - "abab": "^2.0.6", - "whatwg-mimetype": "^3.0.0", - "whatwg-url": "^11.0.0" - }, - "dependencies": { - "whatwg-url": { - "version": "11.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-11.0.0.tgz", - "integrity": "sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ==", - "dev": true, - "requires": { - "tr46": "^3.0.0", - "webidl-conversions": "^7.0.0" - } - } - } - }, - "debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "dev": true, - "requires": { - "ms": "2.1.2" - } - }, - "decimal.js": { - "version": "10.4.3", - "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.3.tgz", - "integrity": "sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==", - "dev": true - }, - "dedent": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz", - "integrity": "sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==", - "dev": true - }, - "deep-equal": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-2.2.0.tgz", - "integrity": "sha512-RdpzE0Hv4lhowpIUKKMJfeH6C1pXdtT1/it80ubgWqwI3qpuxUBpC1S4hnHg+zjnuOoDkzUtUCEEkG+XG5l3Mw==", - "dev": true, - "requires": { - "call-bind": "^1.0.2", - "es-get-iterator": "^1.1.2", - "get-intrinsic": "^1.1.3", - "is-arguments": "^1.1.1", - "is-array-buffer": "^3.0.1", - "is-date-object": "^1.0.5", - "is-regex": "^1.1.4", - "is-shared-array-buffer": "^1.0.2", - "isarray": "^2.0.5", - "object-is": "^1.1.5", - "object-keys": "^1.1.1", - "object.assign": "^4.1.4", - "regexp.prototype.flags": "^1.4.3", - "side-channel": "^1.0.4", - "which-boxed-primitive": "^1.0.2", - "which-collection": "^1.0.1", - "which-typed-array": "^1.1.9" - } - }, - "deep-is": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", - "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", - "dev": true - }, - "deepmerge": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz", - "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==", - "dev": true - }, - "default-gateway": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-6.0.3.tgz", - "integrity": "sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg==", - "dev": true, - "requires": { - "execa": "^5.0.0" - } - }, - "defaults": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz", - "integrity": "sha512-s82itHOnYrN0Ib8r+z7laQz3sdE+4FP3d9Q7VLO7U+KRT+CR0GsWuyHxzdAY82I7cXv0G/twrqomTJLOssO5HA==", - "dev": true, - "requires": { - "clone": "^1.0.2" - } - }, - "define-lazy-prop": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz", - "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==", - "dev": true - }, - "define-properties": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz", - "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==", - "dev": true, - "requires": { - "has-property-descriptors": "^1.0.0", - "object-keys": "^1.1.1" - } - }, - "delayed-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", - "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", - "dev": true - }, - "delegates": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", - "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==", - "dev": true - }, - "depd": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", - "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==", - "dev": true - }, - "dependency-graph": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/dependency-graph/-/dependency-graph-0.11.0.tgz", - "integrity": "sha512-JeMq7fEshyepOWDfcfHK06N3MhyPhz++vtqWhMT5O9A3K42rdsEDpfdVqjaqaAhsw6a+ZqeDvQVtD0hFHQWrzg==", - "dev": true - }, - "destroy": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz", - "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==", - "dev": true - }, - "detect-newline": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz", - "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==", - "dev": true - }, - "detect-node": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz", - "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==", - "dev": true - }, - "diff-sequences": { - "version": "28.1.1", - "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-28.1.1.tgz", - "integrity": "sha512-FU0iFaH/E23a+a718l8Qa/19bF9p06kgE0KipMOMadwa3SjnaElKzPaUC0vnibs6/B/9ni97s61mcejk8W1fQw==", - "dev": true - }, - "dir-glob": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", - "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", - "dev": true, - "requires": { - "path-type": "^4.0.0" - } - }, - "dns-equal": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz", - "integrity": "sha512-z+paD6YUQsk+AbGCEM4PrOXSss5gd66QfcVBFTKR/HpFL9jCqikS94HYwKww6fQyO7IxrIIyUu+g0Ka9tUS2Cg==", - "dev": true - }, - "dns-packet": { - "version": "5.4.0", - "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-5.4.0.tgz", - "integrity": "sha512-EgqGeaBB8hLiHLZtp/IbaDQTL8pZ0+IvwzSHA6d7VyMDM+B9hgddEMa9xjK5oYnw0ci0JQ6g2XCD7/f6cafU6g==", - "dev": true, - "requires": { - "@leichtgewicht/ip-codec": "^2.0.1" - } - }, - "doctrine": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", - "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", - "dev": true, - "requires": { - "esutils": "^2.0.2" - } - }, - "dom-serializer": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz", - "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==", - "dev": true, - "requires": { - "domelementtype": "^2.0.1", - "domhandler": "^4.2.0", - "entities": "^2.0.0" - } - }, - "domelementtype": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz", - "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==", - "dev": true - }, - "domexception": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/domexception/-/domexception-4.0.0.tgz", - "integrity": "sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==", - "dev": true, - "requires": { - "webidl-conversions": "^7.0.0" - } - }, - "domhandler": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz", - "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==", - "dev": true, - "requires": { - "domelementtype": "^2.2.0" - } - }, - "domq.js": { - "version": "0.6.7", - "resolved": "https://registry.npmjs.org/domq.js/-/domq.js-0.6.7.tgz", - "integrity": "sha512-WwRGORo/eYGf7v7YXZ3M6x/PEoxCsP3D0my7pnAVwtbfsKRvW6qioSdlLsy1MFzfwN1TM9oO9QJcvkE8ERYmlg==" - }, - "domutils": { - "version": "2.8.0", - "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz", - "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==", - "dev": true, - "requires": { - "dom-serializer": "^1.0.1", - "domelementtype": "^2.2.0", - "domhandler": "^4.2.0" - } - }, - "ee-first": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", - "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==", - "dev": true - }, - "electron-to-chromium": { - "version": "1.4.284", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz", - "integrity": "sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==", - "dev": true - }, - "emittery": { - "version": "0.10.2", - "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.10.2.tgz", - "integrity": "sha512-aITqOwnLanpHLNXZJENbOgjUBeHocD+xsSJmNrjovKBW5HbSpW3d1pEls7GFQPUWXiwG9+0P4GtHfEqC/4M0Iw==", - "dev": true - }, - "emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true - }, - "emojis-list": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz", - "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==", - "dev": true - }, - "encodeurl": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", - "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", - "dev": true - }, - "encoding": { - "version": "0.1.13", - "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz", - "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==", - "dev": true, - "optional": true, - "requires": { - "iconv-lite": "^0.6.2" - }, - "dependencies": { - "iconv-lite": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", - "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", - "dev": true, - "optional": true, - "requires": { - "safer-buffer": ">= 2.1.2 < 3.0.0" - } - } - } - }, - "enhanced-resolve": { - "version": "5.12.0", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz", - "integrity": "sha512-QHTXI/sZQmko1cbDoNAa3mJ5qhWUUNAq3vR0/YiD379fWQrcfuoX1+HW2S0MTt7XmoPLapdaDKUtelUSPic7hQ==", - "dev": true, - "requires": { - "graceful-fs": "^4.2.4", - "tapable": "^2.2.0" - } - }, - "entities": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz", - "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==", - "dev": true - }, - "env-paths": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz", - "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==", - "dev": true - }, - "err-code": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz", - "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==", - "dev": true - }, - "errno": { - "version": "0.1.8", - "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz", - "integrity": "sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==", - "dev": true, - "optional": true, - "requires": { - "prr": "~1.0.1" - } - }, - "error-ex": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", - "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", - "dev": true, - "requires": { - "is-arrayish": "^0.2.1" - } - }, - "es-get-iterator": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.3.tgz", - "integrity": "sha512-sPZmqHBe6JIiTfN5q2pEi//TwxmAFHwj/XEuYjTuse78i8KxaqMTTzxPoFKuzRpDpTJ+0NAbpfenkmH2rePtuw==", - "dev": true, - "requires": { - "call-bind": "^1.0.2", - "get-intrinsic": "^1.1.3", - "has-symbols": "^1.0.3", - "is-arguments": "^1.1.1", - "is-map": "^2.0.2", - "is-set": "^2.0.2", - "is-string": "^1.0.7", - "isarray": "^2.0.5", - "stop-iteration-iterator": "^1.0.0" - } - }, - "es-module-lexer": { - "version": "0.9.3", - "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz", - "integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==", - "dev": true - }, - "esbuild": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.16.17.tgz", - "integrity": "sha512-G8LEkV0XzDMNwXKgM0Jwu3nY3lSTwSGY6XbxM9cr9+s0T/qSV1q1JVPBGzm3dcjhCic9+emZDmMffkwgPeOeLg==", - "dev": true, - "optional": true, - "requires": { - "@esbuild/android-arm": "0.16.17", - "@esbuild/android-arm64": "0.16.17", - "@esbuild/android-x64": "0.16.17", - "@esbuild/darwin-arm64": "0.16.17", - "@esbuild/darwin-x64": "0.16.17", - "@esbuild/freebsd-arm64": "0.16.17", - "@esbuild/freebsd-x64": "0.16.17", - "@esbuild/linux-arm": "0.16.17", - "@esbuild/linux-arm64": "0.16.17", - "@esbuild/linux-ia32": "0.16.17", - "@esbuild/linux-loong64": "0.16.17", - "@esbuild/linux-mips64el": "0.16.17", - "@esbuild/linux-ppc64": "0.16.17", - "@esbuild/linux-riscv64": "0.16.17", - "@esbuild/linux-s390x": "0.16.17", - "@esbuild/linux-x64": "0.16.17", - "@esbuild/netbsd-x64": "0.16.17", - "@esbuild/openbsd-x64": "0.16.17", - "@esbuild/sunos-x64": "0.16.17", - "@esbuild/win32-arm64": "0.16.17", - "@esbuild/win32-ia32": "0.16.17", - "@esbuild/win32-x64": "0.16.17" - } - }, - "esbuild-wasm": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/esbuild-wasm/-/esbuild-wasm-0.16.17.tgz", - "integrity": "sha512-Tn7NuMqRcM+T/qCOxbQRq0qrwWl1sUWp6ARfJRakE8Bepew6zata4qrKgH2YqovNC5e/2fcTa7o+VL/FAOZC1Q==", - "dev": true - }, - "escalade": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", - "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", - "dev": true - }, - "escape-html": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", - "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==", - "dev": true - }, - "escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", - "dev": true - }, - "escodegen": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz", - "integrity": "sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==", - "dev": true, - "requires": { - "esprima": "^4.0.1", - "estraverse": "^5.2.0", - "esutils": "^2.0.2", - "optionator": "^0.8.1", - "source-map": "~0.6.1" - }, - "dependencies": { - "estraverse": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", - "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", - "dev": true - }, - "levn": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", - "integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==", - "dev": true, - "requires": { - "prelude-ls": "~1.1.2", - "type-check": "~0.3.2" - } - }, - "optionator": { - "version": "0.8.3", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz", - "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==", - "dev": true, - "requires": { - "deep-is": "~0.1.3", - "fast-levenshtein": "~2.0.6", - "levn": "~0.3.0", - "prelude-ls": "~1.1.2", - "type-check": "~0.3.2", - "word-wrap": "~1.2.3" - } - }, - "prelude-ls": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", - "integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==", - "dev": true - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true, - "optional": true - }, - "type-check": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", - "integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==", - "dev": true, - "requires": { - "prelude-ls": "~1.1.2" - } - } - } - }, - "eslint": { - "version": "8.23.1", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.23.1.tgz", - "integrity": "sha512-w7C1IXCc6fNqjpuYd0yPlcTKKmHlHHktRkzmBPZ+7cvNBQuiNjx0xaMTjAJGCafJhQkrFJooREv0CtrVzmHwqg==", - "dev": true, - "requires": { - "@eslint/eslintrc": "^1.3.2", - "@humanwhocodes/config-array": "^0.10.4", - "@humanwhocodes/gitignore-to-minimatch": "^1.0.2", - "@humanwhocodes/module-importer": "^1.0.1", - "ajv": "^6.10.0", - "chalk": "^4.0.0", - "cross-spawn": "^7.0.2", - "debug": "^4.3.2", - "doctrine": "^3.0.0", - "escape-string-regexp": "^4.0.0", - "eslint-scope": "^7.1.1", - "eslint-utils": "^3.0.0", - "eslint-visitor-keys": "^3.3.0", - "espree": "^9.4.0", - "esquery": "^1.4.0", - "esutils": "^2.0.2", - "fast-deep-equal": "^3.1.3", - "file-entry-cache": "^6.0.1", - "find-up": "^5.0.0", - "glob-parent": "^6.0.1", - "globals": "^13.15.0", - "globby": "^11.1.0", - "grapheme-splitter": "^1.0.4", - "ignore": "^5.2.0", - "import-fresh": "^3.0.0", - "imurmurhash": "^0.1.4", - "is-glob": "^4.0.0", - "js-sdsl": "^4.1.4", - "js-yaml": "^4.1.0", - "json-stable-stringify-without-jsonify": "^1.0.1", - "levn": "^0.4.1", - "lodash.merge": "^4.6.2", - "minimatch": "^3.1.2", - "natural-compare": "^1.4.0", - "optionator": "^0.9.1", - "regexpp": "^3.2.0", - "strip-ansi": "^6.0.1", - "strip-json-comments": "^3.1.0", - "text-table": "^0.2.0" - }, - "dependencies": { - "ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", - "dev": true, - "requires": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - } - }, - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "argparse": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", - "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", - "dev": true - }, - "brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "escape-string-regexp": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", - "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", - "dev": true - }, - "eslint-scope": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz", - "integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==", - "dev": true, - "requires": { - "esrecurse": "^4.3.0", - "estraverse": "^5.2.0" - } - }, - "estraverse": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", - "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", - "dev": true - }, - "find-up": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", - "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", - "dev": true, - "requires": { - "locate-path": "^6.0.0", - "path-exists": "^4.0.0" - } - }, - "glob-parent": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", - "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", - "dev": true, - "requires": { - "is-glob": "^4.0.3" - } - }, - "globals": { - "version": "13.17.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz", - "integrity": "sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==", - "dev": true, - "requires": { - "type-fest": "^0.20.2" - } - }, - "globby": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", - "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==", - "dev": true, - "requires": { - "array-union": "^2.1.0", - "dir-glob": "^3.0.1", - "fast-glob": "^3.2.9", - "ignore": "^5.2.0", - "merge2": "^1.4.1", - "slash": "^3.0.0" - } - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true - }, - "js-yaml": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", - "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", - "dev": true, - "requires": { - "argparse": "^2.0.1" - } - }, - "json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true - }, - "locate-path": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", - "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", - "dev": true, - "requires": { - "p-locate": "^5.0.0" - } - }, - "minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "requires": { - "brace-expansion": "^1.1.7" - } - }, - "p-limit": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", - "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", - "dev": true, - "requires": { - "yocto-queue": "^0.1.0" - } - }, - "p-locate": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", - "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", - "dev": true, - "requires": { - "p-limit": "^3.0.2" - } - }, - "slash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", - "dev": true - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - }, - "type-fest": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", - "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", - "dev": true - } - } - }, - "eslint-scope": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", - "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", - "dev": true, - "requires": { - "esrecurse": "^4.3.0", - "estraverse": "^4.1.1" - } - }, - "eslint-utils": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz", - "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==", - "dev": true, - "requires": { - "eslint-visitor-keys": "^2.0.0" - }, - "dependencies": { - "eslint-visitor-keys": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz", - "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==", - "dev": true - } - } - }, - "eslint-visitor-keys": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz", - "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==", - "dev": true - }, - "espree": { - "version": "9.4.0", - "resolved": "https://registry.npmjs.org/espree/-/espree-9.4.0.tgz", - "integrity": "sha512-DQmnRpLj7f6TgN/NYb0MTzJXL+vJF9h3pHy4JhCIs3zwcgez8xmGg3sXHcEO97BrmO2OSvCwMdfdlyl+E9KjOw==", - "dev": true, - "requires": { - "acorn": "^8.8.0", - "acorn-jsx": "^5.3.2", - "eslint-visitor-keys": "^3.3.0" - } - }, - "esprima": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", - "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", - "dev": true - }, - "esquery": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz", - "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==", - "dev": true, - "requires": { - "estraverse": "^5.1.0" - }, - "dependencies": { - "estraverse": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", - "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", - "dev": true - } - } - }, - "esrecurse": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", - "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", - "dev": true, - "requires": { - "estraverse": "^5.2.0" - }, - "dependencies": { - "estraverse": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", - "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", - "dev": true - } - } - }, - "estraverse": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", - "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", - "dev": true - }, - "esutils": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", - "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", - "dev": true - }, - "etag": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", - "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==", - "dev": true - }, - "eventemitter-asyncresource": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/eventemitter-asyncresource/-/eventemitter-asyncresource-1.0.0.tgz", - "integrity": "sha512-39F7TBIV0G7gTelxwbEqnwhp90eqCPON1k0NwNfwhgKn4Co4ybUbj2pECcXT0B3ztRKZ7Pw1JujUUgmQJHcVAQ==", - "dev": true - }, - "eventemitter3": { - "version": "4.0.7", - "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz", - "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==", - "dev": true - }, - "events": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz", - "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==", - "dev": true - }, - "execa": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz", - "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==", - "dev": true, - "requires": { - "cross-spawn": "^7.0.3", - "get-stream": "^6.0.0", - "human-signals": "^2.1.0", - "is-stream": "^2.0.0", - "merge-stream": "^2.0.0", - "npm-run-path": "^4.0.1", - "onetime": "^5.1.2", - "signal-exit": "^3.0.3", - "strip-final-newline": "^2.0.0" - } - }, - "exit": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz", - "integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==", - "dev": true - }, - "expect": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/expect/-/expect-28.1.3.tgz", - "integrity": "sha512-eEh0xn8HlsuOBxFgIss+2mX85VAS4Qy3OSkjV7rlBWljtA4oWH37glVGyOZSZvErDT/yBywZdPGwCXuTvSG85g==", - "dev": true, - "requires": { - "@jest/expect-utils": "^28.1.3", - "jest-get-type": "^28.0.2", - "jest-matcher-utils": "^28.1.3", - "jest-message-util": "^28.1.3", - "jest-util": "^28.1.3" - } - }, - "express": { - "version": "4.18.2", - "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz", - "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==", - "dev": true, - "requires": { - "accepts": "~1.3.8", - "array-flatten": "1.1.1", - "body-parser": "1.20.1", - "content-disposition": "0.5.4", - "content-type": "~1.0.4", - "cookie": "0.5.0", - "cookie-signature": "1.0.6", - "debug": "2.6.9", - "depd": "2.0.0", - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "etag": "~1.8.1", - "finalhandler": "1.2.0", - "fresh": "0.5.2", - "http-errors": "2.0.0", - "merge-descriptors": "1.0.1", - "methods": "~1.1.2", - "on-finished": "2.4.1", - "parseurl": "~1.3.3", - "path-to-regexp": "0.1.7", - "proxy-addr": "~2.0.7", - "qs": "6.11.0", - "range-parser": "~1.2.1", - "safe-buffer": "5.2.1", - "send": "0.18.0", - "serve-static": "1.15.0", - "setprototypeof": "1.2.0", - "statuses": "2.0.1", - "type-is": "~1.6.18", - "utils-merge": "1.0.1", - "vary": "~1.1.2" - }, - "dependencies": { - "array-flatten": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", - "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==", - "dev": true - }, - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "depd": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", - "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", - "dev": true - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "dev": true - }, - "safe-buffer": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", - "dev": true - } - } - }, - "external-editor": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz", - "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==", - "dev": true, - "requires": { - "chardet": "^0.7.0", - "iconv-lite": "^0.4.24", - "tmp": "^0.0.33" - } - }, - "fast-deep-equal": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", - "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", - "dev": true - }, - "fast-glob": { - "version": "3.2.11", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz", - "integrity": "sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==", - "dev": true, - "requires": { - "@nodelib/fs.stat": "^2.0.2", - "@nodelib/fs.walk": "^1.2.3", - "glob-parent": "^5.1.2", - "merge2": "^1.3.0", - "micromatch": "^4.0.4" - } - }, - "fast-json-stable-stringify": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", - "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", - "dev": true - }, - "fast-levenshtein": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", - "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", - "dev": true - }, - "fastq": { - "version": "1.13.0", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz", - "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==", - "dev": true, - "requires": { - "reusify": "^1.0.4" - } - }, - "faye-websocket": { - "version": "0.11.4", - "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz", - "integrity": "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==", - "dev": true, - "requires": { - "websocket-driver": ">=0.5.1" - } - }, - "fb-watchman": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz", - "integrity": "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==", - "dev": true, - "requires": { - "bser": "2.1.1" - } - }, - "figures": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz", - "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==", - "dev": true, - "requires": { - "escape-string-regexp": "^1.0.5" - } - }, - "file-entry-cache": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", - "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", - "dev": true, - "requires": { - "flat-cache": "^3.0.4" - } - }, - "fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", - "dev": true, - "requires": { - "to-regex-range": "^5.0.1" - } - }, - "finalhandler": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz", - "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==", - "dev": true, - "requires": { - "debug": "2.6.9", - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "on-finished": "2.4.1", - "parseurl": "~1.3.3", - "statuses": "2.0.1", - "unpipe": "~1.0.0" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "dev": true - } - } - }, - "find-cache-dir": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz", - "integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==", - "dev": true, - "requires": { - "commondir": "^1.0.1", - "make-dir": "^3.0.2", - "pkg-dir": "^4.1.0" - } - }, - "find-up": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", - "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", - "dev": true, - "requires": { - "locate-path": "^5.0.0", - "path-exists": "^4.0.0" - } - }, - "flat-cache": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz", - "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==", - "dev": true, - "requires": { - "flatted": "^3.1.0", - "rimraf": "^3.0.2" - } - }, - "flatted": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.6.tgz", - "integrity": "sha512-0sQoMh9s0BYsm+12Huy/rkKxVu4R1+r96YX5cG44rHV0pQ6iC3Q+mkoMFaGWObMFYQxCVT+ssG1ksneA2MI9KQ==", - "dev": true - }, - "follow-redirects": { - "version": "1.15.2", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz", - "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==", - "dev": true - }, - "for-each": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz", - "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==", - "dev": true, - "requires": { - "is-callable": "^1.1.3" - } - }, - "form-data": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", - "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", - "dev": true, - "requires": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.8", - "mime-types": "^2.1.12" - } - }, - "forwarded": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", - "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==", - "dev": true - }, - "fraction.js": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.2.0.tgz", - "integrity": "sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA==", - "dev": true - }, - "fresh": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", - "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==", - "dev": true - }, - "fs-minipass": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.0.tgz", - "integrity": "sha512-EUojgQaSPy6sxcqcZgQv6TVF6jiKvurji3AxhAivs/Ep4O1UpS8TusaxpybfFHZ2skRhLqzk6WR8nqNYIMMDeA==", - "dev": true, - "requires": { - "minipass": "^4.0.0" - } - }, - "fs-monkey": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.3.tgz", - "integrity": "sha512-cybjIfiiE+pTWicSCLFHSrXZ6EilF30oh91FDP9S2B051prEa7QWfrVTQm10/dDpswBDXZugPa1Ogu8Yh+HV0Q==", - "dev": true - }, - "fs.realpath": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", - "dev": true - }, - "fsevents": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", - "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", - "dev": true, - "optional": true - }, - "function-bind": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", - "dev": true - }, - "functional-red-black-tree": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz", - "integrity": "sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==", - "dev": true - }, - "functions-have-names": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz", - "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==", - "dev": true - }, - "gauge": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/gauge/-/gauge-4.0.4.tgz", - "integrity": "sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==", - "dev": true, - "requires": { - "aproba": "^1.0.3 || ^2.0.0", - "color-support": "^1.1.3", - "console-control-strings": "^1.1.0", - "has-unicode": "^2.0.1", - "signal-exit": "^3.0.7", - "string-width": "^4.2.3", - "strip-ansi": "^6.0.1", - "wide-align": "^1.1.5" - } - }, - "gensync": { - "version": "1.0.0-beta.2", - "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", - "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==", - "dev": true - }, - "get-caller-file": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", - "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", - "dev": true - }, - "get-intrinsic": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz", - "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==", - "dev": true, - "requires": { - "function-bind": "^1.1.1", - "has": "^1.0.3", - "has-symbols": "^1.0.3" - } - }, - "get-package-type": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz", - "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==", - "dev": true - }, - "get-stream": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", - "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", - "dev": true - }, - "glob": { - "version": "8.0.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-8.0.3.tgz", - "integrity": "sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ==", - "dev": true, - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^5.0.1", - "once": "^1.3.0" - } - }, - "glob-parent": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", - "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", - "dev": true, - "requires": { - "is-glob": "^4.0.1" - } - }, - "glob-to-regexp": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz", - "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==", - "dev": true - }, - "globals": { - "version": "11.12.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", - "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", - "dev": true - }, - "globby": { - "version": "13.1.3", - "resolved": "https://registry.npmjs.org/globby/-/globby-13.1.3.tgz", - "integrity": "sha512-8krCNHXvlCgHDpegPzleMq07yMYTO2sXKASmZmquEYWEmCx6J5UTRbp5RwMJkTJGtcQ44YpiUYUiN0b9mzy8Bw==", - "dev": true, - "requires": { - "dir-glob": "^3.0.1", - "fast-glob": "^3.2.11", - "ignore": "^5.2.0", - "merge2": "^1.4.1", - "slash": "^4.0.0" - } - }, - "gopd": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", - "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==", - "dev": true, - "requires": { - "get-intrinsic": "^1.1.3" - } - }, - "graceful-fs": { - "version": "4.2.10", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", - "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", - "dev": true - }, - "grapheme-splitter": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz", - "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==", - "dev": true - }, - "handle-thing": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz", - "integrity": "sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==", - "dev": true - }, - "has": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", - "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", - "dev": true, - "requires": { - "function-bind": "^1.1.1" - } - }, - "has-bigints": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz", - "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==", - "dev": true - }, - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", - "dev": true - }, - "has-property-descriptors": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz", - "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==", - "dev": true, - "requires": { - "get-intrinsic": "^1.1.1" - } - }, - "has-symbols": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", - "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", - "dev": true - }, - "has-tostringtag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz", - "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==", - "dev": true, - "requires": { - "has-symbols": "^1.0.2" - } - }, - "has-unicode": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", - "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==", - "dev": true - }, - "hdr-histogram-js": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/hdr-histogram-js/-/hdr-histogram-js-2.0.3.tgz", - "integrity": "sha512-Hkn78wwzWHNCp2uarhzQ2SGFLU3JY8SBDDd3TAABK4fc30wm+MuPOrg5QVFVfkKOQd6Bfz3ukJEI+q9sXEkK1g==", - "dev": true, - "requires": { - "@assemblyscript/loader": "^0.10.1", - "base64-js": "^1.2.0", - "pako": "^1.0.3" - } - }, - "hdr-histogram-percentiles-obj": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/hdr-histogram-percentiles-obj/-/hdr-histogram-percentiles-obj-3.0.0.tgz", - "integrity": "sha512-7kIufnBqdsBGcSZLPJwqHT3yhk1QTsSlFsVD3kx5ixH/AlgBs9yM1q6DPhXZ8f8gtdqgh7N7/5btRLpQsS2gHw==", - "dev": true - }, - "hosted-git-info": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-6.1.1.tgz", - "integrity": "sha512-r0EI+HBMcXadMrugk0GCQ+6BQV39PiWAZVfq7oIckeGiN7sjRGyQxPdft3nQekFTCQbYxLBH+/axZMeH8UX6+w==", - "dev": true, - "requires": { - "lru-cache": "^7.5.1" - } - }, - "hpack.js": { - "version": "2.1.6", - "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz", - "integrity": "sha512-zJxVehUdMGIKsRaNt7apO2Gqp0BdqW5yaiGHXXmbpvxgBYVZnAql+BJb4RO5ad2MgpbZKn5G6nMnegrH1FcNYQ==", - "dev": true, - "requires": { - "inherits": "^2.0.1", - "obuf": "^1.0.0", - "readable-stream": "^2.0.1", - "wbuf": "^1.1.0" - }, - "dependencies": { - "isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==", - "dev": true - }, - "readable-stream": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", - "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", - "dev": true, - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } - }, - "string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true, - "requires": { - "safe-buffer": "~5.1.0" - } - } - } - }, - "html-encoding-sniffer": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz", - "integrity": "sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==", - "dev": true, - "requires": { - "whatwg-encoding": "^2.0.0" - } - }, - "html-entities": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.3.3.tgz", - "integrity": "sha512-DV5Ln36z34NNTDgnz0EWGBLZENelNAtkiFA4kyNOG2tDI6Mz1uSWiq1wAKdyjnJwyDiDO7Fa2SO1CTxPXL8VxA==", - "dev": true - }, - "html-escaper": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz", - "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==", - "dev": true - }, - "http-cache-semantics": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz", - "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==", - "dev": true - }, - "http-deceiver": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz", - "integrity": "sha512-LmpOGxTfbpgtGVxJrj5k7asXHCgNZp5nLfp+hWc8QQRqtb7fUy6kRY3BO1h9ddF6yIPYUARgxGOwB42DnxIaNw==", - "dev": true - }, - "http-errors": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz", - "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==", - "dev": true, - "requires": { - "depd": "2.0.0", - "inherits": "2.0.4", - "setprototypeof": "1.2.0", - "statuses": "2.0.1", - "toidentifier": "1.0.1" - }, - "dependencies": { - "depd": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", - "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", - "dev": true - } - } - }, - "http-parser-js": { - "version": "0.5.8", - "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.8.tgz", - "integrity": "sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q==", - "dev": true - }, - "http-proxy": { - "version": "1.18.1", - "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz", - "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==", - "dev": true, - "requires": { - "eventemitter3": "^4.0.0", - "follow-redirects": "^1.0.0", - "requires-port": "^1.0.0" - } - }, - "http-proxy-agent": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz", - "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==", - "dev": true, - "requires": { - "@tootallnate/once": "2", - "agent-base": "6", - "debug": "4" - } - }, - "http-proxy-middleware": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz", - "integrity": "sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==", - "dev": true, - "requires": { - "@types/http-proxy": "^1.17.8", - "http-proxy": "^1.18.1", - "is-glob": "^4.0.1", - "is-plain-obj": "^3.0.0", - "micromatch": "^4.0.2" - } - }, - "https-proxy-agent": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", - "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", - "dev": true, - "requires": { - "agent-base": "6", - "debug": "4" - } - }, - "human-signals": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz", - "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==", - "dev": true - }, - "humanize-ms": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz", - "integrity": "sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==", - "dev": true, - "requires": { - "ms": "^2.0.0" - } - }, - "iconv-lite": { - "version": "0.4.24", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", - "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", - "dev": true, - "requires": { - "safer-buffer": ">= 2.1.2 < 3" - } - }, - "icss-utils": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz", - "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==", - "dev": true - }, - "ieee754": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", - "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", - "dev": true - }, - "ignore": { - "version": "5.2.4", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz", - "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==", - "dev": true - }, - "ignore-walk": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-6.0.0.tgz", - "integrity": "sha512-bTf9UWe/UP1yxG3QUrj/KOvEhTAUWPcv+WvbFZ28LcqznXabp7Xu6o9y1JEC18+oqODuS7VhTpekV5XvFwsxJg==", - "dev": true, - "requires": { - "minimatch": "^5.0.1" - } - }, - "image-size": { - "version": "0.5.5", - "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz", - "integrity": "sha512-6TDAlDPZxUFCv+fuOkIoXT/V/f3Qbq8e37p+YOiYrUv3v9cc3/6x78VdfPgFVaB9dZYeLUfKgHRebpkm/oP2VQ==", - "dev": true, - "optional": true - }, - "immutable": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.2.2.tgz", - "integrity": "sha512-fTMKDwtbvO5tldky9QZ2fMX7slR0mYpY5nbnFWYp0fOzDhHqhgIw9KoYgxLWsoNTS9ZHGauHj18DTyEw6BK3Og==", - "dev": true - }, - "import-fresh": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", - "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", - "dev": true, - "requires": { - "parent-module": "^1.0.0", - "resolve-from": "^4.0.0" - }, - "dependencies": { - "resolve-from": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", - "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", - "dev": true - } - } - }, - "import-local": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz", - "integrity": "sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==", - "dev": true, - "requires": { - "pkg-dir": "^4.2.0", - "resolve-cwd": "^3.0.0" - } - }, - "imurmurhash": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", - "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", - "dev": true - }, - "indent-string": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", - "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==", - "dev": true - }, - "infer-owner": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz", - "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==", - "dev": true - }, - "inflight": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", - "dev": true, - "requires": { - "once": "^1.3.0", - "wrappy": "1" - } - }, - "inherits": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", - "dev": true - }, - "ini": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/ini/-/ini-3.0.1.tgz", - "integrity": "sha512-it4HyVAUTKBc6m8e1iXWvXSTdndF7HbdN713+kvLrymxTaU4AUBWrJ4vEooP+V7fexnVD3LKcBshjGGPefSMUQ==", - "dev": true - }, - "inquirer": { - "version": "8.2.4", - "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-8.2.4.tgz", - "integrity": "sha512-nn4F01dxU8VeKfq192IjLsxu0/OmMZ4Lg3xKAns148rCaXP6ntAoEkVYZThWjwON8AlzdZZi6oqnhNbxUG9hVg==", - "dev": true, - "requires": { - "ansi-escapes": "^4.2.1", - "chalk": "^4.1.1", - "cli-cursor": "^3.1.0", - "cli-width": "^3.0.0", - "external-editor": "^3.0.3", - "figures": "^3.0.0", - "lodash": "^4.17.21", - "mute-stream": "0.0.8", - "ora": "^5.4.1", - "run-async": "^2.4.0", - "rxjs": "^7.5.5", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0", - "through": "^2.3.6", - "wrap-ansi": "^7.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "internal-slot": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.4.tgz", - "integrity": "sha512-tA8URYccNzMo94s5MQZgH8NB/XTa6HsOo0MLfXTKKEnHVVdegzaQoFZ7Jp44bdvLvY2waT5dc+j5ICEswhi7UQ==", - "dev": true, - "requires": { - "get-intrinsic": "^1.1.3", - "has": "^1.0.3", - "side-channel": "^1.0.4" - } - }, - "ip": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ip/-/ip-2.0.0.tgz", - "integrity": "sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==", - "dev": true - }, - "ipaddr.js": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.0.1.tgz", - "integrity": "sha512-1qTgH9NG+IIJ4yfKs2e6Pp1bZg8wbDbKHT21HrLIeYBTRLgMYKnMTPAuI3Lcs61nfx5h1xlXnbJtH1kX5/d/ng==", - "dev": true - }, - "is-arguments": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz", - "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==", - "dev": true, - "requires": { - "call-bind": "^1.0.2", - "has-tostringtag": "^1.0.0" - } - }, - "is-array-buffer": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.1.tgz", - "integrity": "sha512-ASfLknmY8Xa2XtB4wmbz13Wu202baeA18cJBCeCy0wXUHZF0IPyVEXqKEcd+t2fNSLLL1vC6k7lxZEojNbISXQ==", - "dev": true, - "requires": { - "call-bind": "^1.0.2", - "get-intrinsic": "^1.1.3", - "is-typed-array": "^1.1.10" - } - }, - "is-arrayish": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", - "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==", - "dev": true - }, - "is-bigint": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz", - "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==", - "dev": true, - "requires": { - "has-bigints": "^1.0.1" - } - }, - "is-binary-path": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", - "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", - "dev": true, - "requires": { - "binary-extensions": "^2.0.0" - } - }, - "is-boolean-object": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz", - "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==", - "dev": true, - "requires": { - "call-bind": "^1.0.2", - "has-tostringtag": "^1.0.0" - } - }, - "is-callable": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz", - "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==", - "dev": true - }, - "is-core-module": { - "version": "2.9.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz", - "integrity": "sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==", - "dev": true, - "requires": { - "has": "^1.0.3" - } - }, - "is-date-object": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz", - "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==", - "dev": true, - "requires": { - "has-tostringtag": "^1.0.0" - } - }, - "is-docker": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz", - "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==", - "dev": true - }, - "is-extglob": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", - "dev": true - }, - "is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true - }, - "is-generator-fn": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz", - "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==", - "dev": true - }, - "is-glob": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", - "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", - "dev": true, - "requires": { - "is-extglob": "^2.1.1" - } - }, - "is-interactive": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz", - "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==", - "dev": true - }, - "is-lambda": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz", - "integrity": "sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==", - "dev": true - }, - "is-map": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.2.tgz", - "integrity": "sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg==", - "dev": true - }, - "is-number": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", - "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", - "dev": true - }, - "is-number-object": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz", - "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==", - "dev": true, - "requires": { - "has-tostringtag": "^1.0.0" - } - }, - "is-plain-obj": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz", - "integrity": "sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==", - "dev": true - }, - "is-plain-object": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", - "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", - "dev": true, - "requires": { - "isobject": "^3.0.1" - } - }, - "is-potential-custom-element-name": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz", - "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==", - "dev": true - }, - "is-regex": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz", - "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==", - "dev": true, - "requires": { - "call-bind": "^1.0.2", - "has-tostringtag": "^1.0.0" - } - }, - "is-set": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.2.tgz", - "integrity": "sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g==", - "dev": true - }, - "is-shared-array-buffer": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz", - "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==", - "dev": true, - "requires": { - "call-bind": "^1.0.2" - } - }, - "is-stream": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", - "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", - "dev": true - }, - "is-string": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz", - "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==", - "dev": true, - "requires": { - "has-tostringtag": "^1.0.0" - } - }, - "is-symbol": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz", - "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==", - "dev": true, - "requires": { - "has-symbols": "^1.0.2" - } - }, - "is-typed-array": { - "version": "1.1.10", - "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.10.tgz", - "integrity": "sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A==", - "dev": true, - "requires": { - "available-typed-arrays": "^1.0.5", - "call-bind": "^1.0.2", - "for-each": "^0.3.3", - "gopd": "^1.0.1", - "has-tostringtag": "^1.0.0" - } - }, - "is-unicode-supported": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz", - "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==", - "dev": true - }, - "is-weakmap": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.1.tgz", - "integrity": "sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA==", - "dev": true - }, - "is-weakset": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.2.tgz", - "integrity": "sha512-t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg==", - "dev": true, - "requires": { - "call-bind": "^1.0.2", - "get-intrinsic": "^1.1.1" - } - }, - "is-what": { - "version": "3.14.1", - "resolved": "https://registry.npmjs.org/is-what/-/is-what-3.14.1.tgz", - "integrity": "sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA==", - "dev": true - }, - "is-wsl": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz", - "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==", - "dev": true, - "requires": { - "is-docker": "^2.0.0" - } - }, - "isarray": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", - "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==", - "dev": true - }, - "isexe": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", - "dev": true - }, - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==", - "dev": true - }, - "istanbul-lib-coverage": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz", - "integrity": "sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==", - "dev": true - }, - "istanbul-lib-instrument": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.0.tgz", - "integrity": "sha512-6Lthe1hqXHBNsqvgDzGO6l03XNeu3CrG4RqQ1KM9+l5+jNGpEJfIELx1NS3SEHmJQA8np/u+E4EPRKRiu6m19A==", - "dev": true, - "requires": { - "@babel/core": "^7.12.3", - "@babel/parser": "^7.14.7", - "@istanbuljs/schema": "^0.1.2", - "istanbul-lib-coverage": "^3.2.0", - "semver": "^6.3.0" - }, - "dependencies": { - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true - } - } - }, - "istanbul-lib-report": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz", - "integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==", - "dev": true, - "requires": { - "istanbul-lib-coverage": "^3.0.0", - "make-dir": "^3.0.0", - "supports-color": "^7.1.0" - }, - "dependencies": { - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "istanbul-lib-source-maps": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz", - "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==", - "dev": true, - "requires": { - "debug": "^4.1.1", - "istanbul-lib-coverage": "^3.0.0", - "source-map": "^0.6.1" - }, - "dependencies": { - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - } - } - }, - "istanbul-reports": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.5.tgz", - "integrity": "sha512-nUsEMa9pBt/NOHqbcbeJEgqIlY/K7rVWUX6Lql2orY5e9roQOthbR3vtY4zzf2orPELg80fnxxk9zUyPlgwD1w==", - "dev": true, - "requires": { - "html-escaper": "^2.0.0", - "istanbul-lib-report": "^3.0.0" - } - }, - "jest": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest/-/jest-28.1.3.tgz", - "integrity": "sha512-N4GT5on8UkZgH0O5LUavMRV1EDEhNTL0KEfRmDIeZHSV7p2XgLoY9t9VDUgL6o+yfdgYHVxuz81G8oB9VG5uyA==", - "dev": true, - "requires": { - "@jest/core": "^28.1.3", - "@jest/types": "^28.1.3", - "import-local": "^3.0.2", - "jest-cli": "^28.1.3" - } - }, - "jest-changed-files": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-28.1.3.tgz", - "integrity": "sha512-esaOfUWJXk2nfZt9SPyC8gA1kNfdKLkQWyzsMlqq8msYSlNKfmZxfRgZn4Cd4MGVUF+7v6dBs0d5TOAKa7iIiA==", - "dev": true, - "requires": { - "execa": "^5.0.0", - "p-limit": "^3.1.0" - }, - "dependencies": { - "p-limit": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", - "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", - "dev": true, - "requires": { - "yocto-queue": "^0.1.0" - } - } - } - }, - "jest-circus": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-28.1.3.tgz", - "integrity": "sha512-cZ+eS5zc79MBwt+IhQhiEp0OeBddpc1n8MBo1nMB8A7oPMKEO+Sre+wHaLJexQUj9Ya/8NOBY0RESUgYjB6fow==", - "dev": true, - "requires": { - "@jest/environment": "^28.1.3", - "@jest/expect": "^28.1.3", - "@jest/test-result": "^28.1.3", - "@jest/types": "^28.1.3", - "@types/node": "*", - "chalk": "^4.0.0", - "co": "^4.6.0", - "dedent": "^0.7.0", - "is-generator-fn": "^2.0.0", - "jest-each": "^28.1.3", - "jest-matcher-utils": "^28.1.3", - "jest-message-util": "^28.1.3", - "jest-runtime": "^28.1.3", - "jest-snapshot": "^28.1.3", - "jest-util": "^28.1.3", - "p-limit": "^3.1.0", - "pretty-format": "^28.1.3", - "slash": "^3.0.0", - "stack-utils": "^2.0.3" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true - }, - "p-limit": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", - "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", - "dev": true, - "requires": { - "yocto-queue": "^0.1.0" - } - }, - "slash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", - "dev": true - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "jest-cli": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-28.1.3.tgz", - "integrity": "sha512-roY3kvrv57Azn1yPgdTebPAXvdR2xfezaKKYzVxZ6It/5NCxzJym6tUI5P1zkdWhfUYkxEI9uZWcQdaFLo8mJQ==", - "dev": true, - "requires": { - "@jest/core": "^28.1.3", - "@jest/test-result": "^28.1.3", - "@jest/types": "^28.1.3", - "chalk": "^4.0.0", - "exit": "^0.1.2", - "graceful-fs": "^4.2.9", - "import-local": "^3.0.2", - "jest-config": "^28.1.3", - "jest-util": "^28.1.3", - "jest-validate": "^28.1.3", - "prompts": "^2.0.1", - "yargs": "^17.3.1" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "jest-config": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-28.1.3.tgz", - "integrity": "sha512-MG3INjByJ0J4AsNBm7T3hsuxKQqFIiRo/AUqb1q9LRKI5UU6Aar9JHbr9Ivn1TVwfUD9KirRoM/T6u8XlcQPHQ==", - "dev": true, - "requires": { - "@babel/core": "^7.11.6", - "@jest/test-sequencer": "^28.1.3", - "@jest/types": "^28.1.3", - "babel-jest": "^28.1.3", - "chalk": "^4.0.0", - "ci-info": "^3.2.0", - "deepmerge": "^4.2.2", - "glob": "^7.1.3", - "graceful-fs": "^4.2.9", - "jest-circus": "^28.1.3", - "jest-environment-node": "^28.1.3", - "jest-get-type": "^28.0.2", - "jest-regex-util": "^28.0.2", - "jest-resolve": "^28.1.3", - "jest-runner": "^28.1.3", - "jest-util": "^28.1.3", - "jest-validate": "^28.1.3", - "micromatch": "^4.0.4", - "parse-json": "^5.2.0", - "pretty-format": "^28.1.3", - "slash": "^3.0.0", - "strip-json-comments": "^3.1.1" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "dev": true, - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true - }, - "minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "requires": { - "brace-expansion": "^1.1.7" - } - }, - "slash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", - "dev": true - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "jest-diff": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-28.1.3.tgz", - "integrity": "sha512-8RqP1B/OXzjjTWkqMX67iqgwBVJRgCyKD3L9nq+6ZqJMdvjE8RgHktqZ6jNrkdMT+dJuYNI3rhQpxaz7drJHfw==", - "dev": true, - "requires": { - "chalk": "^4.0.0", - "diff-sequences": "^28.1.1", - "jest-get-type": "^28.0.2", - "pretty-format": "^28.1.3" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "jest-docblock": { - "version": "28.1.1", - "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-28.1.1.tgz", - "integrity": "sha512-3wayBVNiOYx0cwAbl9rwm5kKFP8yHH3d/fkEaL02NPTkDojPtheGB7HZSFY4wzX+DxyrvhXz0KSCVksmCknCuA==", - "dev": true, - "requires": { - "detect-newline": "^3.0.0" - } - }, - "jest-each": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-28.1.3.tgz", - "integrity": "sha512-arT1z4sg2yABU5uogObVPvSlSMQlDA48owx07BDPAiasW0yYpYHYOo4HHLz9q0BVzDVU4hILFjzJw0So9aCL/g==", - "dev": true, - "requires": { - "@jest/types": "^28.1.3", - "chalk": "^4.0.0", - "jest-get-type": "^28.0.2", - "jest-util": "^28.1.3", - "pretty-format": "^28.1.3" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "jest-environment-jsdom": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-28.1.3.tgz", - "integrity": "sha512-HnlGUmZRdxfCByd3GM2F100DgQOajUBzEitjGqIREcb45kGjZvRrKUdlaF6escXBdcXNl0OBh+1ZrfeZT3GnAg==", - "dev": true, - "requires": { - "@jest/environment": "^28.1.3", - "@jest/fake-timers": "^28.1.3", - "@jest/types": "^28.1.3", - "@types/jsdom": "^16.2.4", - "@types/node": "*", - "jest-mock": "^28.1.3", - "jest-util": "^28.1.3", - "jsdom": "^19.0.0" - } - }, - "jest-environment-node": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-28.1.3.tgz", - "integrity": "sha512-ugP6XOhEpjAEhGYvp5Xj989ns5cB1K6ZdjBYuS30umT4CQEETaxSiPcZ/E1kFktX4GkrcM4qu07IIlDYX1gp+A==", - "dev": true, - "requires": { - "@jest/environment": "^28.1.3", - "@jest/fake-timers": "^28.1.3", - "@jest/types": "^28.1.3", - "@types/node": "*", - "jest-mock": "^28.1.3", - "jest-util": "^28.1.3" - } - }, - "jest-get-type": { - "version": "28.0.2", - "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-28.0.2.tgz", - "integrity": "sha512-ioj2w9/DxSYHfOm5lJKCdcAmPJzQXmbM/Url3rhlghrPvT3tt+7a/+oXc9azkKmLvoiXjtV83bEWqi+vs5nlPA==", - "dev": true - }, - "jest-haste-map": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-28.1.3.tgz", - "integrity": "sha512-3S+RQWDXccXDKSWnkHa/dPwt+2qwA8CJzR61w3FoYCvoo3Pn8tvGcysmMF0Bj0EX5RYvAI2EIvC57OmotfdtKA==", - "dev": true, - "requires": { - "@jest/types": "^28.1.3", - "@types/graceful-fs": "^4.1.3", - "@types/node": "*", - "anymatch": "^3.0.3", - "fb-watchman": "^2.0.0", - "fsevents": "^2.3.2", - "graceful-fs": "^4.2.9", - "jest-regex-util": "^28.0.2", - "jest-util": "^28.1.3", - "jest-worker": "^28.1.3", - "micromatch": "^4.0.4", - "walker": "^1.0.8" - }, - "dependencies": { - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true - }, - "jest-worker": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-28.1.3.tgz", - "integrity": "sha512-CqRA220YV/6jCo8VWvAt1KKx6eek1VIHMPeLEbpcfSfkEeWyBNppynM/o6q+Wmw+sOhos2ml34wZbSX3G13//g==", - "dev": true, - "requires": { - "@types/node": "*", - "merge-stream": "^2.0.0", - "supports-color": "^8.0.0" - }, - "dependencies": { - "supports-color": { - "version": "8.1.1", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", - "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - } - } - }, - "jest-leak-detector": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-28.1.3.tgz", - "integrity": "sha512-WFVJhnQsiKtDEo5lG2mM0v40QWnBM+zMdHHyJs8AWZ7J0QZJS59MsyKeJHWhpBZBH32S48FOVvGyOFT1h0DlqA==", - "dev": true, - "requires": { - "jest-get-type": "^28.0.2", - "pretty-format": "^28.1.3" - } - }, - "jest-matcher-utils": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-28.1.3.tgz", - "integrity": "sha512-kQeJ7qHemKfbzKoGjHHrRKH6atgxMk8Enkk2iPQ3XwO6oE/KYD8lMYOziCkeSB9G4adPM4nR1DE8Tf5JeWH6Bw==", - "dev": true, - "requires": { - "chalk": "^4.0.0", - "jest-diff": "^28.1.3", - "jest-get-type": "^28.0.2", - "pretty-format": "^28.1.3" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "jest-message-util": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-28.1.3.tgz", - "integrity": "sha512-PFdn9Iewbt575zKPf1286Ht9EPoJmYT7P0kY+RibeYZ2XtOr53pDLEFoTWXbd1h4JiGiWpTBC84fc8xMXQMb7g==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.12.13", - "@jest/types": "^28.1.3", - "@types/stack-utils": "^2.0.0", - "chalk": "^4.0.0", - "graceful-fs": "^4.2.9", - "micromatch": "^4.0.4", - "pretty-format": "^28.1.3", - "slash": "^3.0.0", - "stack-utils": "^2.0.3" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true - }, - "slash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", - "dev": true - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "jest-mock": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-28.1.3.tgz", - "integrity": "sha512-o3J2jr6dMMWYVH4Lh/NKmDXdosrsJgi4AviS8oXLujcjpCMBb1FMsblDnOXKZKfSiHLxYub1eS0IHuRXsio9eA==", - "dev": true, - "requires": { - "@jest/types": "^28.1.3", - "@types/node": "*" - } - }, - "jest-pnp-resolver": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz", - "integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==", - "dev": true - }, - "jest-preset-angular": { - "version": "12.2.3", - "resolved": "https://registry.npmjs.org/jest-preset-angular/-/jest-preset-angular-12.2.3.tgz", - "integrity": "sha512-9vgawXuki/lg4IRPtl5k83krWLKADTal7BBm06xNAWOK09AbHK1foXqZdVOMObsWbaMDeQ1cjba60vS/aEVY4Q==", - "dev": true, - "requires": { - "bs-logger": "^0.2.6", - "esbuild": ">=0.13.8", - "esbuild-wasm": ">=0.13.8", - "jest-environment-jsdom": "^28.0.0", - "pretty-format": "^28.0.0", - "ts-jest": "^28.0.0" - }, - "dependencies": { - "ts-jest": { - "version": "28.0.8", - "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-28.0.8.tgz", - "integrity": "sha512-5FaG0lXmRPzApix8oFG8RKjAz4ehtm8yMKOTy5HX3fY6W8kmvOrmcY0hKDElW52FJov+clhUbrKAqofnj4mXTg==", - "dev": true, - "requires": { - "bs-logger": "0.x", - "fast-json-stable-stringify": "2.x", - "jest-util": "^28.0.0", - "json5": "^2.2.1", - "lodash.memoize": "4.x", - "make-error": "1.x", - "semver": "7.x", - "yargs-parser": "^21.0.1" - } - } - } - }, - "jest-regex-util": { - "version": "28.0.2", - "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-28.0.2.tgz", - "integrity": "sha512-4s0IgyNIy0y9FK+cjoVYoxamT7Zeo7MhzqRGx7YDYmaQn1wucY9rotiGkBzzcMXTtjrCAP/f7f+E0F7+fxPNdw==", - "dev": true - }, - "jest-resolve": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-28.1.3.tgz", - "integrity": "sha512-Z1W3tTjE6QaNI90qo/BJpfnvpxtaFTFw5CDgwpyE/Kz8U/06N1Hjf4ia9quUhCh39qIGWF1ZuxFiBiJQwSEYKQ==", - "dev": true, - "requires": { - "chalk": "^4.0.0", - "graceful-fs": "^4.2.9", - "jest-haste-map": "^28.1.3", - "jest-pnp-resolver": "^1.2.2", - "jest-util": "^28.1.3", - "jest-validate": "^28.1.3", - "resolve": "^1.20.0", - "resolve.exports": "^1.1.0", - "slash": "^3.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true - }, - "slash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", - "dev": true - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "jest-resolve-dependencies": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-28.1.3.tgz", - "integrity": "sha512-qa0QO2Q0XzQoNPouMbCc7Bvtsem8eQgVPNkwn9LnS+R2n8DaVDPL/U1gngC0LTl1RYXJU0uJa2BMC2DbTfFrHA==", - "dev": true, - "requires": { - "jest-regex-util": "^28.0.2", - "jest-snapshot": "^28.1.3" - } - }, - "jest-runner": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-28.1.3.tgz", - "integrity": "sha512-GkMw4D/0USd62OVO0oEgjn23TM+YJa2U2Wu5zz9xsQB1MxWKDOlrnykPxnMsN0tnJllfLPinHTka61u0QhaxBA==", - "dev": true, - "requires": { - "@jest/console": "^28.1.3", - "@jest/environment": "^28.1.3", - "@jest/test-result": "^28.1.3", - "@jest/transform": "^28.1.3", - "@jest/types": "^28.1.3", - "@types/node": "*", - "chalk": "^4.0.0", - "emittery": "^0.10.2", - "graceful-fs": "^4.2.9", - "jest-docblock": "^28.1.1", - "jest-environment-node": "^28.1.3", - "jest-haste-map": "^28.1.3", - "jest-leak-detector": "^28.1.3", - "jest-message-util": "^28.1.3", - "jest-resolve": "^28.1.3", - "jest-runtime": "^28.1.3", - "jest-util": "^28.1.3", - "jest-watcher": "^28.1.3", - "jest-worker": "^28.1.3", - "p-limit": "^3.1.0", - "source-map-support": "0.5.13" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true - }, - "jest-worker": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-28.1.3.tgz", - "integrity": "sha512-CqRA220YV/6jCo8VWvAt1KKx6eek1VIHMPeLEbpcfSfkEeWyBNppynM/o6q+Wmw+sOhos2ml34wZbSX3G13//g==", - "dev": true, - "requires": { - "@types/node": "*", - "merge-stream": "^2.0.0", - "supports-color": "^8.0.0" - }, - "dependencies": { - "supports-color": { - "version": "8.1.1", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", - "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "p-limit": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", - "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", - "dev": true, - "requires": { - "yocto-queue": "^0.1.0" - } - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - }, - "source-map-support": { - "version": "0.5.13", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz", - "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==", - "dev": true, - "requires": { - "buffer-from": "^1.0.0", - "source-map": "^0.6.0" - } - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "jest-runtime": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-28.1.3.tgz", - "integrity": "sha512-NU+881ScBQQLc1JHG5eJGU7Ui3kLKrmwCPPtYsJtBykixrM2OhVQlpMmFWJjMyDfdkGgBMNjXCGB/ebzsgNGQw==", - "dev": true, - "requires": { - "@jest/environment": "^28.1.3", - "@jest/fake-timers": "^28.1.3", - "@jest/globals": "^28.1.3", - "@jest/source-map": "^28.1.2", - "@jest/test-result": "^28.1.3", - "@jest/transform": "^28.1.3", - "@jest/types": "^28.1.3", - "chalk": "^4.0.0", - "cjs-module-lexer": "^1.0.0", - "collect-v8-coverage": "^1.0.0", - "execa": "^5.0.0", - "glob": "^7.1.3", - "graceful-fs": "^4.2.9", - "jest-haste-map": "^28.1.3", - "jest-message-util": "^28.1.3", - "jest-mock": "^28.1.3", - "jest-regex-util": "^28.0.2", - "jest-resolve": "^28.1.3", - "jest-snapshot": "^28.1.3", - "jest-util": "^28.1.3", - "slash": "^3.0.0", - "strip-bom": "^4.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "dev": true, - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true - }, - "minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "requires": { - "brace-expansion": "^1.1.7" - } - }, - "slash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", - "dev": true - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "jest-snapshot": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-28.1.3.tgz", - "integrity": "sha512-4lzMgtiNlc3DU/8lZfmqxN3AYD6GGLbl+72rdBpXvcV+whX7mDrREzkPdp2RnmfIiWBg1YbuFSkXduF2JcafJg==", - "dev": true, - "requires": { - "@babel/core": "^7.11.6", - "@babel/generator": "^7.7.2", - "@babel/plugin-syntax-typescript": "^7.7.2", - "@babel/traverse": "^7.7.2", - "@babel/types": "^7.3.3", - "@jest/expect-utils": "^28.1.3", - "@jest/transform": "^28.1.3", - "@jest/types": "^28.1.3", - "@types/babel__traverse": "^7.0.6", - "@types/prettier": "^2.1.5", - "babel-preset-current-node-syntax": "^1.0.0", - "chalk": "^4.0.0", - "expect": "^28.1.3", - "graceful-fs": "^4.2.9", - "jest-diff": "^28.1.3", - "jest-get-type": "^28.0.2", - "jest-haste-map": "^28.1.3", - "jest-matcher-utils": "^28.1.3", - "jest-message-util": "^28.1.3", - "jest-util": "^28.1.3", - "natural-compare": "^1.4.0", - "pretty-format": "^28.1.3", - "semver": "^7.3.5" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "jest-util": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-28.1.3.tgz", - "integrity": "sha512-XdqfpHwpcSRko/C35uLYFM2emRAltIIKZiJ9eAmhjsj0CqZMa0p1ib0R5fWIqGhn1a103DebTbpqIaP1qCQ6tQ==", - "dev": true, - "requires": { - "@jest/types": "^28.1.3", - "@types/node": "*", - "chalk": "^4.0.0", - "ci-info": "^3.2.0", - "graceful-fs": "^4.2.9", - "picomatch": "^2.2.3" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "jest-validate": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-28.1.3.tgz", - "integrity": "sha512-SZbOGBWEsaTxBGCOpsRWlXlvNkvTkY0XxRfh7zYmvd8uL5Qzyg0CHAXiXKROflh801quA6+/DsT4ODDthOC/OA==", - "dev": true, - "requires": { - "@jest/types": "^28.1.3", - "camelcase": "^6.2.0", - "chalk": "^4.0.0", - "jest-get-type": "^28.0.2", - "leven": "^3.1.0", - "pretty-format": "^28.1.3" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "camelcase": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz", - "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==", - "dev": true - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "jest-watcher": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-28.1.3.tgz", - "integrity": "sha512-t4qcqj9hze+jviFPUN3YAtAEeFnr/azITXQEMARf5cMwKY2SMBRnCQTXLixTl20OR6mLh9KLMrgVJgJISym+1g==", - "dev": true, - "requires": { - "@jest/test-result": "^28.1.3", - "@jest/types": "^28.1.3", - "@types/node": "*", - "ansi-escapes": "^4.2.1", - "chalk": "^4.0.0", - "emittery": "^0.10.2", - "jest-util": "^28.1.3", - "string-length": "^4.0.1" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "jest-worker": { - "version": "27.5.1", - "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz", - "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==", - "dev": true, - "requires": { - "@types/node": "*", - "merge-stream": "^2.0.0", - "supports-color": "^8.0.0" - }, - "dependencies": { - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true - }, - "supports-color": { - "version": "8.1.1", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", - "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "js-sdsl": { - "version": "4.1.4", - "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.1.4.tgz", - "integrity": "sha512-Y2/yD55y5jteOAmY50JbUZYwk3CP3wnLPEZnlR1w9oKhITrBEtAxwuWKebFf8hMrPMgbYwFoWK/lH2sBkErELw==", - "dev": true - }, - "js-tokens": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", - "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", - "dev": true - }, - "js-yaml": { - "version": "3.14.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", - "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", - "dev": true, - "requires": { - "argparse": "^1.0.7", - "esprima": "^4.0.0" - } - }, - "jsdom": { - "version": "19.0.0", - "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-19.0.0.tgz", - "integrity": "sha512-RYAyjCbxy/vri/CfnjUWJQQtZ3LKlLnDqj+9XLNnJPgEGeirZs3hllKR20re8LUZ6o1b1X4Jat+Qd26zmP41+A==", - "dev": true, - "requires": { - "abab": "^2.0.5", - "acorn": "^8.5.0", - "acorn-globals": "^6.0.0", - "cssom": "^0.5.0", - "cssstyle": "^2.3.0", - "data-urls": "^3.0.1", - "decimal.js": "^10.3.1", - "domexception": "^4.0.0", - "escodegen": "^2.0.0", - "form-data": "^4.0.0", - "html-encoding-sniffer": "^3.0.0", - "http-proxy-agent": "^5.0.0", - "https-proxy-agent": "^5.0.0", - "is-potential-custom-element-name": "^1.0.1", - "nwsapi": "^2.2.0", - "parse5": "6.0.1", - "saxes": "^5.0.1", - "symbol-tree": "^3.2.4", - "tough-cookie": "^4.0.0", - "w3c-hr-time": "^1.0.2", - "w3c-xmlserializer": "^3.0.0", - "webidl-conversions": "^7.0.0", - "whatwg-encoding": "^2.0.0", - "whatwg-mimetype": "^3.0.0", - "whatwg-url": "^10.0.0", - "ws": "^8.2.3", - "xml-name-validator": "^4.0.0" - } - }, - "jsesc": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", - "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", - "dev": true - }, - "json-parse-even-better-errors": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", - "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", - "dev": true - }, - "json-schema-traverse": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", - "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", - "dev": true - }, - "json-stable-stringify-without-jsonify": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", - "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==", - "dev": true - }, - "json5": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", - "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", - "dev": true - }, - "jsonc-parser": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz", - "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==", - "dev": true - }, - "jsonparse": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz", - "integrity": "sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==", - "dev": true - }, - "jwt-decode": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/jwt-decode/-/jwt-decode-3.1.2.tgz", - "integrity": "sha512-UfpWE/VZn0iP50d8cz9NrZLM9lSWhcJ+0Gt/nm4by88UL+J1SiKN8/5dkjMmbEzwL2CAe+67GsegCbIKtbp75A==" - }, - "karma-source-map-support": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/karma-source-map-support/-/karma-source-map-support-1.4.0.tgz", - "integrity": "sha512-RsBECncGO17KAoJCYXjv+ckIz+Ii9NCi+9enk+rq6XC81ezYkb4/RHE6CTXdA7IOJqoF3wcaLfVG0CPmE5ca6A==", - "dev": true, - "requires": { - "source-map-support": "^0.5.5" - } - }, - "kind-of": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", - "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", - "dev": true - }, - "kleur": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz", - "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==", - "dev": true - }, - "klona": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.6.tgz", - "integrity": "sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA==", - "dev": true - }, - "less": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/less/-/less-4.1.3.tgz", - "integrity": "sha512-w16Xk/Ta9Hhyei0Gpz9m7VS8F28nieJaL/VyShID7cYvP6IL5oHeL6p4TXSDJqZE/lNv0oJ2pGVjJsRkfwm5FA==", - "dev": true, - "requires": { - "copy-anything": "^2.0.1", - "errno": "^0.1.1", - "graceful-fs": "^4.1.2", - "image-size": "~0.5.0", - "make-dir": "^2.1.0", - "mime": "^1.4.1", - "needle": "^3.1.0", - "parse-node-version": "^1.0.1", - "source-map": "~0.6.0", - "tslib": "^2.3.0" - }, - "dependencies": { - "make-dir": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz", - "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==", - "dev": true, - "optional": true, - "requires": { - "pify": "^4.0.1", - "semver": "^5.6.0" - } - }, - "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", - "dev": true, - "optional": true - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true, - "optional": true - } - } - }, - "less-loader": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/less-loader/-/less-loader-11.1.0.tgz", - "integrity": "sha512-C+uDBV7kS7W5fJlUjq5mPBeBVhYpTIm5gB09APT9o3n/ILeaXVsiSFTbZpTJCJwQ/Crczfn3DmfQFwxYusWFug==", - "dev": true, - "requires": { - "klona": "^2.0.4" - } - }, - "leven": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz", - "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==", - "dev": true - }, - "levn": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", - "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", - "dev": true, - "requires": { - "prelude-ls": "^1.2.1", - "type-check": "~0.4.0" - } - }, - "license-webpack-plugin": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/license-webpack-plugin/-/license-webpack-plugin-4.0.2.tgz", - "integrity": "sha512-771TFWFD70G1wLTC4oU2Cw4qvtmNrIw+wRvBtn+okgHl7slJVi7zfNcdmqDL72BojM30VNJ2UHylr1o77U37Jw==", - "dev": true, - "requires": { - "webpack-sources": "^3.0.0" - } - }, - "lines-and-columns": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", - "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==", - "dev": true - }, - "loader-runner": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz", - "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==", - "dev": true - }, - "loader-utils": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-3.2.1.tgz", - "integrity": "sha512-ZvFw1KWS3GVyYBYb7qkmRM/WwL2TQQBxgCK62rlvm4WpVQ23Nb4tYjApUlfjrEGvOs7KHEsmyUn75OHZrJMWPw==", - "dev": true - }, - "locate-path": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", - "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", - "dev": true, - "requires": { - "p-locate": "^4.1.0" - } - }, - "lodash": { - "version": "4.17.21", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", - "dev": true - }, - "lodash.debounce": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz", - "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==", - "dev": true - }, - "lodash.memoize": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz", - "integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==", - "dev": true - }, - "lodash.merge": { - "version": "4.6.2", - "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", - "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", - "dev": true - }, - "log-symbols": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz", - "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==", - "dev": true, - "requires": { - "chalk": "^4.1.0", - "is-unicode-supported": "^0.1.0" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "lru-cache": { - "version": "7.14.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.14.1.tgz", - "integrity": "sha512-ysxwsnTKdAx96aTRdhDOCQfDgbHnt8SK0KY8SEjO0wHinhWOFTESbjVCMPbU1uGXg/ch4lifqx0wfjOawU2+WA==", - "dev": true - }, - "magic-string": { - "version": "0.27.0", - "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.27.0.tgz", - "integrity": "sha512-8UnnX2PeRAPZuN12svgR9j7M1uWMovg/CEnIwIG0LFkXSJJe4PdfUGiTGl8V9bsBHFUtfVINcSyYxd7q+kx9fA==", - "dev": true, - "requires": { - "@jridgewell/sourcemap-codec": "^1.4.13" - } - }, - "make-dir": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", - "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", - "dev": true, - "requires": { - "semver": "^6.0.0" - }, - "dependencies": { - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true - } - } - }, - "make-error": { - "version": "1.3.6", - "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz", - "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==", - "dev": true - }, - "make-fetch-happen": { - "version": "10.2.1", - "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-10.2.1.tgz", - "integrity": "sha512-NgOPbRiaQM10DYXvN3/hhGVI2M5MtITFryzBGxHM5p4wnFxsVCbxkrBrDsk+EZ5OB4jEOT7AjDxtdF+KVEFT7w==", - "dev": true, - "requires": { - "agentkeepalive": "^4.2.1", - "cacache": "^16.1.0", - "http-cache-semantics": "^4.1.0", - "http-proxy-agent": "^5.0.0", - "https-proxy-agent": "^5.0.0", - "is-lambda": "^1.0.1", - "lru-cache": "^7.7.1", - "minipass": "^3.1.6", - "minipass-collect": "^1.0.2", - "minipass-fetch": "^2.0.3", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.4", - "negotiator": "^0.6.3", - "promise-retry": "^2.0.1", - "socks-proxy-agent": "^7.0.0", - "ssri": "^9.0.0" - }, - "dependencies": { - "@npmcli/fs": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-2.1.2.tgz", - "integrity": "sha512-yOJKRvohFOaLqipNtwYB9WugyZKhC/DZC4VYPmpaCzDBrA8YpK3qHZ8/HGscMnE4GqbkLNuVcCnxkeQEdGt6LQ==", - "dev": true, - "requires": { - "@gar/promisify": "^1.1.3", - "semver": "^7.3.5" - } - }, - "cacache": { - "version": "16.1.3", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-16.1.3.tgz", - "integrity": "sha512-/+Emcj9DAXxX4cwlLmRI9c166RuL3w30zp4R7Joiv2cQTtTtA+jeuCAjH3ZlGnYS3tKENSrKhAzVVP9GVyzeYQ==", - "dev": true, - "requires": { - "@npmcli/fs": "^2.1.0", - "@npmcli/move-file": "^2.0.0", - "chownr": "^2.0.0", - "fs-minipass": "^2.1.0", - "glob": "^8.0.1", - "infer-owner": "^1.0.4", - "lru-cache": "^7.7.1", - "minipass": "^3.1.6", - "minipass-collect": "^1.0.2", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.4", - "mkdirp": "^1.0.4", - "p-map": "^4.0.0", - "promise-inflight": "^1.0.1", - "rimraf": "^3.0.2", - "ssri": "^9.0.0", - "tar": "^6.1.11", - "unique-filename": "^2.0.0" - } - }, - "fs-minipass": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", - "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", - "dev": true, - "requires": { - "minipass": "^3.0.0" - } - }, - "minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", - "dev": true, - "requires": { - "yallist": "^4.0.0" - } - }, - "ssri": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/ssri/-/ssri-9.0.1.tgz", - "integrity": "sha512-o57Wcn66jMQvfHG1FlYbWeZWW/dHZhJXjpIcTfXldXEk5nz5lStPo3mK0OJQfGR3RbZUlbISexbljkJzuEj/8Q==", - "dev": true, - "requires": { - "minipass": "^3.1.1" - } - }, - "unique-filename": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-2.0.1.tgz", - "integrity": "sha512-ODWHtkkdx3IAR+veKxFV+VBkUMcN+FaqzUUd7IZzt+0zhDZFPFxhlqwPF3YQvMHx1TD0tdgYl+kuPnJ8E6ql7A==", - "dev": true, - "requires": { - "unique-slug": "^3.0.0" - } - }, - "unique-slug": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-3.0.0.tgz", - "integrity": "sha512-8EyMynh679x/0gqE9fT9oilG+qEt+ibFyqjuVTsZn1+CMxH+XLlpvr2UZx4nVcCwTpx81nICr2JQFkM+HPLq4w==", - "dev": true, - "requires": { - "imurmurhash": "^0.1.4" - } - } - } - }, - "makeerror": { - "version": "1.0.12", - "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz", - "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==", - "dev": true, - "requires": { - "tmpl": "1.0.5" - } - }, - "material-colors": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/material-colors/-/material-colors-1.2.6.tgz", - "integrity": "sha512-6qE4B9deFBIa9YSpOc9O0Sgc43zTeVYbgDT5veRKSlB2+ZuHNoVVxA1L/ckMUayV9Ay9y7Z/SZCLcGteW9i7bg==" - }, - "media-typer": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", - "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==", - "dev": true - }, - "memfs": { - "version": "3.4.13", - "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.4.13.tgz", - "integrity": "sha512-omTM41g3Skpvx5dSYeZIbXKcXoAVc/AoMNwn9TKx++L/gaen/+4TTttmu8ZSch5vfVJ8uJvGbroTsIlslRg6lg==", - "dev": true, - "requires": { - "fs-monkey": "^1.0.3" - } - }, - "merge-descriptors": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", - "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==", - "dev": true - }, - "merge-stream": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", - "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", - "dev": true - }, - "merge2": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", - "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", - "dev": true - }, - "methods": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", - "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==", - "dev": true - }, - "micromatch": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", - "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", - "dev": true, - "requires": { - "braces": "^3.0.2", - "picomatch": "^2.3.1" - } - }, - "mime": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", - "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", - "dev": true - }, - "mime-db": { - "version": "1.52.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", - "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", - "dev": true - }, - "mime-types": { - "version": "2.1.35", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", - "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", - "dev": true, - "requires": { - "mime-db": "1.52.0" - } - }, - "mimic-fn": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", - "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", - "dev": true - }, - "mini-css-extract-plugin": { - "version": "2.7.2", - "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.7.2.tgz", - "integrity": "sha512-EdlUizq13o0Pd+uCp+WO/JpkLvHRVGt97RqfeGhXqAcorYo1ypJSpkV+WDT0vY/kmh/p7wRdJNJtuyK540PXDw==", - "dev": true, - "requires": { - "schema-utils": "^4.0.0" - } - }, - "minimalistic-assert": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz", - "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==", - "dev": true - }, - "minimatch": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.0.tgz", - "integrity": "sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==", - "dev": true, - "requires": { - "brace-expansion": "^2.0.1" - } - }, - "minimist": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz", - "integrity": "sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==", - "dev": true - }, - "minipass": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-4.0.0.tgz", - "integrity": "sha512-g2Uuh2jEKoht+zvO6vJqXmYpflPqzRBT+Th2h01DKh5z7wbY/AZ2gCQ78cP70YoHPyFdY30YBV5WxgLOEwOykw==", - "dev": true, - "requires": { - "yallist": "^4.0.0" - } - }, - "minipass-collect": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz", - "integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==", - "dev": true, - "requires": { - "minipass": "^3.0.0" - }, - "dependencies": { - "minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", - "dev": true, - "requires": { - "yallist": "^4.0.0" - } - } - } - }, - "minipass-fetch": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-2.1.2.tgz", - "integrity": "sha512-LT49Zi2/WMROHYoqGgdlQIZh8mLPZmOrN2NdJjMXxYe4nkN6FUyuPuOAOedNJDrx0IRGg9+4guZewtp8hE6TxA==", - "dev": true, - "requires": { - "encoding": "^0.1.13", - "minipass": "^3.1.6", - "minipass-sized": "^1.0.3", - "minizlib": "^2.1.2" - }, - "dependencies": { - "minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", - "dev": true, - "requires": { - "yallist": "^4.0.0" - } - } - } - }, - "minipass-flush": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz", - "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==", - "dev": true, - "requires": { - "minipass": "^3.0.0" - }, - "dependencies": { - "minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", - "dev": true, - "requires": { - "yallist": "^4.0.0" - } - } - } - }, - "minipass-json-stream": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/minipass-json-stream/-/minipass-json-stream-1.0.1.tgz", - "integrity": "sha512-ODqY18UZt/I8k+b7rl2AENgbWE8IDYam+undIJONvigAz8KR5GWblsFTEfQs0WODsjbSXWlm+JHEv8Gr6Tfdbg==", - "dev": true, - "requires": { - "jsonparse": "^1.3.1", - "minipass": "^3.0.0" - }, - "dependencies": { - "minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", - "dev": true, - "requires": { - "yallist": "^4.0.0" - } - } - } - }, - "minipass-pipeline": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz", - "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==", - "dev": true, - "requires": { - "minipass": "^3.0.0" - }, - "dependencies": { - "minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", - "dev": true, - "requires": { - "yallist": "^4.0.0" - } - } - } - }, - "minipass-sized": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz", - "integrity": "sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==", - "dev": true, - "requires": { - "minipass": "^3.0.0" - }, - "dependencies": { - "minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", - "dev": true, - "requires": { - "yallist": "^4.0.0" - } - } - } - }, - "minizlib": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", - "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", - "dev": true, - "requires": { - "minipass": "^3.0.0", - "yallist": "^4.0.0" - }, - "dependencies": { - "minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", - "dev": true, - "requires": { - "yallist": "^4.0.0" - } - } - } - }, - "mkdirp": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", - "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", - "dev": true - }, - "moment": { - "version": "2.29.4", - "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz", - "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==" - }, - "moment-timezone": { - "version": "0.5.37", - "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.37.tgz", - "integrity": "sha512-uEDzDNFhfaywRl+vwXxffjjq1q0Vzr+fcQpQ1bU0kbzorfS7zVtZnCnGc8mhWmF39d4g4YriF6kwA75mJKE/Zg==", - "requires": { - "moment": ">= 2.9.0" - } - }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true - }, - "multicast-dns": { - "version": "7.2.5", - "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.2.5.tgz", - "integrity": "sha512-2eznPJP8z2BFLX50tf0LuODrpINqP1RVIm/CObbTcBRITQgmC/TjcREF1NeTBzIcR5XO/ukWo+YHOjBbFwIupg==", - "dev": true, - "requires": { - "dns-packet": "^5.2.2", - "thunky": "^1.0.2" - } - }, - "mute-stream": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz", - "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==", - "dev": true - }, - "nanoid": { - "version": "3.3.4", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz", - "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==", - "dev": true - }, - "natural-compare": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", - "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", - "dev": true - }, - "needle": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/needle/-/needle-3.2.0.tgz", - "integrity": "sha512-oUvzXnyLiVyVGoianLijF9O/RecZUf7TkBfimjGrLM4eQhXyeJwM6GeAWccwfQ9aa4gMCZKqhAOuLaMIcQxajQ==", - "dev": true, - "optional": true, - "requires": { - "debug": "^3.2.6", - "iconv-lite": "^0.6.3", - "sax": "^1.2.4" - }, - "dependencies": { - "debug": { - "version": "3.2.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", - "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", - "dev": true, - "optional": true, - "requires": { - "ms": "^2.1.1" - } - }, - "iconv-lite": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", - "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", - "dev": true, - "optional": true, - "requires": { - "safer-buffer": ">= 2.1.2 < 3.0.0" - } - } - } - }, - "negotiator": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", - "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==", - "dev": true - }, - "neo-async": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz", - "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", - "dev": true - }, - "ngx-color": { - "version": "8.0.3", - "resolved": "https://registry.npmjs.org/ngx-color/-/ngx-color-8.0.3.tgz", - "integrity": "sha512-tuLP+uIoDEu2m0bh711kb2P1M1bh/oIrOn8mJd9mb8xGL2v+OcokcxPmVvWRn0avMG1lXL53CjSlWXGkdV4CDA==", - "requires": { - "@ctrl/tinycolor": "^3.4.1", - "material-colors": "^1.2.6", - "tslib": "^2.3.0" - } - }, - "ngx-mask": { - "version": "15.0.3", - "resolved": "https://registry.npmjs.org/ngx-mask/-/ngx-mask-15.0.3.tgz", - "integrity": "sha512-oVwJaTVF9KcQLuUk4HOpH2Id/qagiVgz8Orez11qQEKjXs43Yz79LlGOt30ZsNkgLiQCw/Sw0VnhEnaAdX9aNg==", - "requires": { - "tslib": "^2.3.0" - } - }, - "nice-napi": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/nice-napi/-/nice-napi-1.0.2.tgz", - "integrity": "sha512-px/KnJAJZf5RuBGcfD+Sp2pAKq0ytz8j+1NehvgIGFkvtvFrDM3T8E4x/JJODXK9WZow8RRGrbA9QQ3hs+pDhA==", - "dev": true, - "optional": true, - "requires": { - "node-addon-api": "^3.0.0", - "node-gyp-build": "^4.2.2" - } - }, - "node-addon-api": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz", - "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==", - "dev": true, - "optional": true - }, - "node-forge": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz", - "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==", - "dev": true - }, - "node-gyp": { - "version": "9.3.1", - "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-9.3.1.tgz", - "integrity": "sha512-4Q16ZCqq3g8awk6UplT7AuxQ35XN4R/yf/+wSAwcBUAjg7l58RTactWaP8fIDTi0FzI7YcVLujwExakZlfWkXg==", - "dev": true, - "requires": { - "env-paths": "^2.2.0", - "glob": "^7.1.4", - "graceful-fs": "^4.2.6", - "make-fetch-happen": "^10.0.3", - "nopt": "^6.0.0", - "npmlog": "^6.0.0", - "rimraf": "^3.0.2", - "semver": "^7.3.5", - "tar": "^6.1.2", - "which": "^2.0.2" - }, - "dependencies": { - "brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "dev": true, - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, - "minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "requires": { - "brace-expansion": "^1.1.7" - } - }, - "which": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", - "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", - "dev": true, - "requires": { - "isexe": "^2.0.0" - } - } - } - }, - "node-gyp-build": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.6.0.tgz", - "integrity": "sha512-NTZVKn9IylLwUzaKjkas1e4u2DLNcV4rdYagA4PWdPwW87Bi7z+BznyKSRwS/761tV/lzCGXplWsiaMjLqP2zQ==", - "dev": true, - "optional": true - }, - "node-int64": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz", - "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==", - "dev": true - }, - "node-releases": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.6.tgz", - "integrity": "sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg==", - "dev": true - }, - "nopt": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-6.0.0.tgz", - "integrity": "sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g==", - "dev": true, - "requires": { - "abbrev": "^1.0.0" - } - }, - "normalize-package-data": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-5.0.0.tgz", - "integrity": "sha512-h9iPVIfrVZ9wVYQnxFgtw1ugSvGEMOlyPWWtm8BMJhnwyEL/FLbYbTY3V3PpjI/BUK67n9PEWDu6eHzu1fB15Q==", - "dev": true, - "requires": { - "hosted-git-info": "^6.0.0", - "is-core-module": "^2.8.1", - "semver": "^7.3.5", - "validate-npm-package-license": "^3.0.4" - } - }, - "normalize-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", - "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", - "dev": true - }, - "normalize-range": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz", - "integrity": "sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==", - "dev": true - }, - "npm-bundled": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-3.0.0.tgz", - "integrity": "sha512-Vq0eyEQy+elFpzsKjMss9kxqb9tG3YHg4dsyWuUENuzvSUWe1TCnW/vV9FkhvBk/brEDoDiVd+M1Btosa6ImdQ==", - "dev": true, - "requires": { - "npm-normalize-package-bin": "^3.0.0" - } - }, - "npm-install-checks": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-6.0.0.tgz", - "integrity": "sha512-SBU9oFglRVZnfElwAtF14NivyulDqF1VKqqwNsFW9HDcbHMAPHpRSsVFgKuwFGq/hVvWZExz62Th0kvxn/XE7Q==", - "dev": true, - "requires": { - "semver": "^7.1.1" - } - }, - "npm-normalize-package-bin": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-3.0.0.tgz", - "integrity": "sha512-g+DPQSkusnk7HYXr75NtzkIP4+N81i3RPsGFidF3DzHd9MT9wWngmqoeg/fnHFz5MNdtG4w03s+QnhewSLTT2Q==", - "dev": true - }, - "npm-package-arg": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-10.1.0.tgz", - "integrity": "sha512-uFyyCEmgBfZTtrKk/5xDfHp6+MdrqGotX/VoOyEEl3mBwiEE5FlBaePanazJSVMPT7vKepcjYBY2ztg9A3yPIA==", - "dev": true, - "requires": { - "hosted-git-info": "^6.0.0", - "proc-log": "^3.0.0", - "semver": "^7.3.5", - "validate-npm-package-name": "^5.0.0" - } - }, - "npm-packlist": { - "version": "7.0.4", - "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-7.0.4.tgz", - "integrity": "sha512-d6RGEuRrNS5/N84iglPivjaJPxhDbZmlbTwTDX2IbcRHG5bZCdtysYMhwiPvcF4GisXHGn7xsxv+GQ7T/02M5Q==", - "dev": true, - "requires": { - "ignore-walk": "^6.0.0" - } - }, - "npm-pick-manifest": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-8.0.1.tgz", - "integrity": "sha512-mRtvlBjTsJvfCCdmPtiu2bdlx8d/KXtF7yNXNWe7G0Z36qWA9Ny5zXsI2PfBZEv7SXgoxTmNaTzGSbbzDZChoA==", - "dev": true, - "requires": { - "npm-install-checks": "^6.0.0", - "npm-normalize-package-bin": "^3.0.0", - "npm-package-arg": "^10.0.0", - "semver": "^7.3.5" - } - }, - "npm-registry-fetch": { - "version": "14.0.3", - "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-14.0.3.tgz", - "integrity": "sha512-YaeRbVNpnWvsGOjX2wk5s85XJ7l1qQBGAp724h8e2CZFFhMSuw9enom7K1mWVUtvXO1uUSFIAPofQK0pPN0ZcA==", - "dev": true, - "requires": { - "make-fetch-happen": "^11.0.0", - "minipass": "^4.0.0", - "minipass-fetch": "^3.0.0", - "minipass-json-stream": "^1.0.1", - "minizlib": "^2.1.2", - "npm-package-arg": "^10.0.0", - "proc-log": "^3.0.0" - }, - "dependencies": { - "make-fetch-happen": { - "version": "11.0.2", - "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-11.0.2.tgz", - "integrity": "sha512-5n/Pq41w/uZghpdlXAY5kIM85RgJThtTH/NYBRAZ9VUOBWV90USaQjwGrw76fZP3Lj5hl/VZjpVvOaRBMoL/2w==", - "dev": true, - "requires": { - "agentkeepalive": "^4.2.1", - "cacache": "^17.0.0", - "http-cache-semantics": "^4.1.0", - "http-proxy-agent": "^5.0.0", - "https-proxy-agent": "^5.0.0", - "is-lambda": "^1.0.1", - "lru-cache": "^7.7.1", - "minipass": "^4.0.0", - "minipass-collect": "^1.0.2", - "minipass-fetch": "^3.0.0", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.4", - "negotiator": "^0.6.3", - "promise-retry": "^2.0.1", - "socks-proxy-agent": "^7.0.0", - "ssri": "^10.0.0" - } - }, - "minipass-fetch": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.1.tgz", - "integrity": "sha512-t9/wowtf7DYkwz8cfMSt0rMwiyNIBXf5CKZ3S5ZMqRqMYT0oLTp0x1WorMI9WTwvaPg21r1JbFxJMum8JrLGfw==", - "dev": true, - "requires": { - "encoding": "^0.1.13", - "minipass": "^4.0.0", - "minipass-sized": "^1.0.3", - "minizlib": "^2.1.2" - } - } - } - }, - "npm-run-path": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", - "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", - "dev": true, - "requires": { - "path-key": "^3.0.0" - } - }, - "npmlog": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-6.0.2.tgz", - "integrity": "sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==", - "dev": true, - "requires": { - "are-we-there-yet": "^3.0.0", - "console-control-strings": "^1.1.0", - "gauge": "^4.0.3", - "set-blocking": "^2.0.0" - } - }, - "nth-check": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz", - "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==", - "dev": true, - "requires": { - "boolbase": "^1.0.0" - } - }, - "nwsapi": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.2.tgz", - "integrity": "sha512-90yv+6538zuvUMnN+zCr8LuV6bPFdq50304114vJYJ8RDyK8D5O9Phpbd6SZWgI7PwzmmfN1upeOJlvybDSgCw==", - "dev": true - }, - "object-inspect": { - "version": "1.12.3", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz", - "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==", - "dev": true - }, - "object-is": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz", - "integrity": "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==", - "dev": true, - "requires": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.3" - } - }, - "object-keys": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", - "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", - "dev": true - }, - "object.assign": { - "version": "4.1.4", - "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz", - "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==", - "dev": true, - "requires": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "has-symbols": "^1.0.3", - "object-keys": "^1.1.1" - } - }, - "obuf": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz", - "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==", - "dev": true - }, - "on-finished": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", - "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", - "dev": true, - "requires": { - "ee-first": "1.1.1" - } - }, - "on-headers": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz", - "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==", - "dev": true - }, - "once": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", - "dev": true, - "requires": { - "wrappy": "1" - } - }, - "onetime": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", - "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", - "dev": true, - "requires": { - "mimic-fn": "^2.1.0" - } - }, - "open": { - "version": "8.4.0", - "resolved": "https://registry.npmjs.org/open/-/open-8.4.0.tgz", - "integrity": "sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==", - "dev": true, - "requires": { - "define-lazy-prop": "^2.0.0", - "is-docker": "^2.1.1", - "is-wsl": "^2.2.0" - } - }, - "optionator": { - "version": "0.9.1", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz", - "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==", - "dev": true, - "requires": { - "deep-is": "^0.1.3", - "fast-levenshtein": "^2.0.6", - "levn": "^0.4.1", - "prelude-ls": "^1.2.1", - "type-check": "^0.4.0", - "word-wrap": "^1.2.3" - } - }, - "ora": { - "version": "5.4.1", - "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz", - "integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==", - "dev": true, - "requires": { - "bl": "^4.1.0", - "chalk": "^4.1.0", - "cli-cursor": "^3.1.0", - "cli-spinners": "^2.5.0", - "is-interactive": "^1.0.0", - "is-unicode-supported": "^0.1.0", - "log-symbols": "^4.1.0", - "strip-ansi": "^6.0.0", - "wcwidth": "^1.0.1" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "os-tmpdir": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", - "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==", - "dev": true - }, - "p-limit": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", - "dev": true, - "requires": { - "p-try": "^2.0.0" - } - }, - "p-locate": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", - "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", - "dev": true, - "requires": { - "p-limit": "^2.2.0" - } - }, - "p-map": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz", - "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==", - "dev": true, - "requires": { - "aggregate-error": "^3.0.0" - } - }, - "p-retry": { - "version": "4.6.2", - "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-4.6.2.tgz", - "integrity": "sha512-312Id396EbJdvRONlngUx0NydfrIQ5lsYu0znKVUzVvArzEIt08V1qhtyESbGVd1FGX7UKtiFp5uwKZdM8wIuQ==", - "dev": true, - "requires": { - "@types/retry": "0.12.0", - "retry": "^0.13.1" - }, - "dependencies": { - "retry": { - "version": "0.13.1", - "resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz", - "integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==", - "dev": true - } - } - }, - "p-try": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", - "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", - "dev": true - }, - "pacote": { - "version": "15.0.8", - "resolved": "https://registry.npmjs.org/pacote/-/pacote-15.0.8.tgz", - "integrity": "sha512-UlcumB/XS6xyyIMwg/WwMAyUmga+RivB5KgkRwA1hZNtrx+0Bt41KxHCvg1kr0pZ/ZeD8qjhW4fph6VaYRCbLw==", - "dev": true, - "requires": { - "@npmcli/git": "^4.0.0", - "@npmcli/installed-package-contents": "^2.0.1", - "@npmcli/promise-spawn": "^6.0.1", - "@npmcli/run-script": "^6.0.0", - "cacache": "^17.0.0", - "fs-minipass": "^3.0.0", - "minipass": "^4.0.0", - "npm-package-arg": "^10.0.0", - "npm-packlist": "^7.0.0", - "npm-pick-manifest": "^8.0.0", - "npm-registry-fetch": "^14.0.0", - "proc-log": "^3.0.0", - "promise-retry": "^2.0.1", - "read-package-json": "^6.0.0", - "read-package-json-fast": "^3.0.0", - "ssri": "^10.0.0", - "tar": "^6.1.11" - } - }, - "pako": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz", - "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==", - "dev": true - }, - "parent-module": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", - "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", - "dev": true, - "requires": { - "callsites": "^3.0.0" - } - }, - "parse-json": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", - "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.0.0", - "error-ex": "^1.3.1", - "json-parse-even-better-errors": "^2.3.0", - "lines-and-columns": "^1.1.6" - } - }, - "parse-node-version": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz", - "integrity": "sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==", - "dev": true - }, - "parse5": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz", - "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==", - "dev": true - }, - "parse5-html-rewriting-stream": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/parse5-html-rewriting-stream/-/parse5-html-rewriting-stream-6.0.1.tgz", - "integrity": "sha512-vwLQzynJVEfUlURxgnf51yAJDQTtVpNyGD8tKi2Za7m+akukNHxCcUQMAa/mUGLhCeicFdpy7Tlvj8ZNKadprg==", - "dev": true, - "requires": { - "parse5": "^6.0.1", - "parse5-sax-parser": "^6.0.1" - } - }, - "parse5-htmlparser2-tree-adapter": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz", - "integrity": "sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA==", - "dev": true, - "requires": { - "parse5": "^6.0.1" - } - }, - "parse5-sax-parser": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/parse5-sax-parser/-/parse5-sax-parser-6.0.1.tgz", - "integrity": "sha512-kXX+5S81lgESA0LsDuGjAlBybImAChYRMT+/uKCEXFBFOeEhS52qUCydGhU3qLRD8D9DVjaUo821WK7DM4iCeg==", - "dev": true, - "requires": { - "parse5": "^6.0.1" - } - }, - "parseurl": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", - "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==", - "dev": true - }, - "path-exists": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", - "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", - "dev": true - }, - "path-is-absolute": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", - "dev": true - }, - "path-key": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", - "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", - "dev": true - }, - "path-parse": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", - "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", - "dev": true - }, - "path-to-regexp": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", - "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==", - "dev": true - }, - "path-type": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", - "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", - "dev": true - }, - "photoviewer": { - "version": "3.6.5", - "resolved": "https://registry.npmjs.org/photoviewer/-/photoviewer-3.6.5.tgz", - "integrity": "sha512-qCxKJ2TMPpA4rBl23/hQiTmxZIMOU8RQJF2plSyOe8j/whIjtIN/SxGw0y4CtRhLK4skYuDnay2xDLxPIMvrCg==", - "requires": { - "domq.js": "^0.6.7" - } - }, - "picocolors": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", - "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==", - "dev": true - }, - "picomatch": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", - "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", - "dev": true - }, - "pify": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", - "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==", - "dev": true, - "optional": true - }, - "pirates": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.5.tgz", - "integrity": "sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ==", - "dev": true - }, - "piscina": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/piscina/-/piscina-3.2.0.tgz", - "integrity": "sha512-yn/jMdHRw+q2ZJhFhyqsmANcbF6V2QwmD84c6xRau+QpQOmtrBCoRGdvTfeuFDYXB5W2m6MfLkjkvQa9lUSmIA==", - "dev": true, - "requires": { - "eventemitter-asyncresource": "^1.0.0", - "hdr-histogram-js": "^2.0.1", - "hdr-histogram-percentiles-obj": "^3.0.0", - "nice-napi": "^1.0.2" - } - }, - "pkg-dir": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", - "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", - "dev": true, - "requires": { - "find-up": "^4.0.0" - } - }, - "postcss": { - "version": "8.4.21", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.21.tgz", - "integrity": "sha512-tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg==", - "dev": true, - "requires": { - "nanoid": "^3.3.4", - "picocolors": "^1.0.0", - "source-map-js": "^1.0.2" - } - }, - "postcss-loader": { - "version": "7.0.2", - "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-7.0.2.tgz", - "integrity": "sha512-fUJzV/QH7NXUAqV8dWJ9Lg4aTkDCezpTS5HgJ2DvqznexTbSTxgi/dTECvTZ15BwKTtk8G/bqI/QTu2HPd3ZCg==", - "dev": true, - "requires": { - "cosmiconfig": "^7.0.0", - "klona": "^2.0.5", - "semver": "^7.3.8" - } - }, - "postcss-modules-extract-imports": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz", - "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==", - "dev": true - }, - "postcss-modules-local-by-default": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz", - "integrity": "sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ==", - "dev": true, - "requires": { - "icss-utils": "^5.0.0", - "postcss-selector-parser": "^6.0.2", - "postcss-value-parser": "^4.1.0" - } - }, - "postcss-modules-scope": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz", - "integrity": "sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==", - "dev": true, - "requires": { - "postcss-selector-parser": "^6.0.4" - } - }, - "postcss-modules-values": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz", - "integrity": "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==", - "dev": true, - "requires": { - "icss-utils": "^5.0.0" - } - }, - "postcss-selector-parser": { - "version": "6.0.11", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.11.tgz", - "integrity": "sha512-zbARubNdogI9j7WY4nQJBiNqQf3sLS3wCP4WfOidu+p28LofJqDH1tcXypGrcmMHhDk2t9wGhCsYe/+szLTy1g==", - "dev": true, - "requires": { - "cssesc": "^3.0.0", - "util-deprecate": "^1.0.2" - } - }, - "postcss-value-parser": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz", - "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==", - "dev": true - }, - "prelude-ls": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", - "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", - "dev": true - }, - "prettier": { - "version": "2.8.3", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.3.tgz", - "integrity": "sha512-tJ/oJ4amDihPoufT5sM0Z1SKEuKay8LfVAMlbbhnnkvt6BUserZylqo2PN+p9KeljLr0OHa2rXHU1T8reeoTrw==", - "dev": true - }, - "pretty-bytes": { - "version": "5.6.0", - "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.6.0.tgz", - "integrity": "sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==", - "dev": true - }, - "pretty-format": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz", - "integrity": "sha512-8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q==", - "dev": true, - "requires": { - "@jest/schemas": "^28.1.3", - "ansi-regex": "^5.0.1", - "ansi-styles": "^5.0.0", - "react-is": "^18.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", - "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", - "dev": true - } - } - }, - "proc-log": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-3.0.0.tgz", - "integrity": "sha512-++Vn7NS4Xf9NacaU9Xq3URUuqZETPsf8L4j5/ckhaRYsfPeRyzGw+iDjFhV/Jr3uNmTvvddEJFWh5R1gRgUH8A==", - "dev": true - }, - "process-nextick-args": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", - "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==", - "dev": true - }, - "promise-inflight": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz", - "integrity": "sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==", - "dev": true - }, - "promise-retry": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz", - "integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==", - "dev": true, - "requires": { - "err-code": "^2.0.2", - "retry": "^0.12.0" - } - }, - "prompts": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz", - "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==", - "dev": true, - "requires": { - "kleur": "^3.0.3", - "sisteransi": "^1.0.5" - } - }, - "proxy-addr": { - "version": "2.0.7", - "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", - "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==", - "dev": true, - "requires": { - "forwarded": "0.2.0", - "ipaddr.js": "1.9.1" - }, - "dependencies": { - "ipaddr.js": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", - "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==", - "dev": true - } - } - }, - "prr": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz", - "integrity": "sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw==", - "dev": true, - "optional": true - }, - "psl": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz", - "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==", - "dev": true - }, - "punycode": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", - "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", - "dev": true - }, - "qs": { - "version": "6.11.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz", - "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==", - "dev": true, - "requires": { - "side-channel": "^1.0.4" - } - }, - "querystringify": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz", - "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==", - "dev": true - }, - "queue-microtask": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", - "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", - "dev": true - }, - "randombytes": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", - "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==", - "dev": true, - "requires": { - "safe-buffer": "^5.1.0" - } - }, - "range-parser": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", - "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==", - "dev": true - }, - "raw-body": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz", - "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==", - "dev": true, - "requires": { - "bytes": "3.1.2", - "http-errors": "2.0.0", - "iconv-lite": "0.4.24", - "unpipe": "1.0.0" - }, - "dependencies": { - "bytes": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", - "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", - "dev": true - } - } - }, - "react-is": { - "version": "18.2.0", - "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz", - "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==", - "dev": true - }, - "read-package-json": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-6.0.0.tgz", - "integrity": "sha512-b/9jxWJ8EwogJPpv99ma+QwtqB7FSl3+V6UXS7Aaay8/5VwMY50oIFooY1UKXMWpfNCM6T/PoGqa5GD1g9xf9w==", - "dev": true, - "requires": { - "glob": "^8.0.1", - "json-parse-even-better-errors": "^3.0.0", - "normalize-package-data": "^5.0.0", - "npm-normalize-package-bin": "^3.0.0" - }, - "dependencies": { - "json-parse-even-better-errors": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-3.0.0.tgz", - "integrity": "sha512-iZbGHafX/59r39gPwVPRBGw0QQKnA7tte5pSMrhWOW7swGsVvVTjmfyAV9pNqk8YGT7tRCdxRu8uzcgZwoDooA==", - "dev": true - } - } - }, - "read-package-json-fast": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/read-package-json-fast/-/read-package-json-fast-3.0.2.tgz", - "integrity": "sha512-0J+Msgym3vrLOUB3hzQCuZHII0xkNGCtz/HJH9xZshwv9DbDwkw1KaE3gx/e2J5rpEY5rtOy6cyhKOPrkP7FZw==", - "dev": true, - "requires": { - "json-parse-even-better-errors": "^3.0.0", - "npm-normalize-package-bin": "^3.0.0" - }, - "dependencies": { - "json-parse-even-better-errors": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-3.0.0.tgz", - "integrity": "sha512-iZbGHafX/59r39gPwVPRBGw0QQKnA7tte5pSMrhWOW7swGsVvVTjmfyAV9pNqk8YGT7tRCdxRu8uzcgZwoDooA==", - "dev": true - } - } - }, - "readable-stream": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", - "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", - "dev": true, - "requires": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - } - }, - "readdirp": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", - "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", - "dev": true, - "requires": { - "picomatch": "^2.2.1" - } - }, - "reflect-metadata": { - "version": "0.1.13", - "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.13.tgz", - "integrity": "sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg==", - "dev": true - }, - "regenerate": { - "version": "1.4.2", - "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz", - "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==", - "dev": true - }, - "regenerate-unicode-properties": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz", - "integrity": "sha512-d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ==", - "dev": true, - "requires": { - "regenerate": "^1.4.2" - } - }, - "regenerator-runtime": { - "version": "0.13.11", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz", - "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==", - "dev": true - }, - "regenerator-transform": { - "version": "0.15.1", - "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.1.tgz", - "integrity": "sha512-knzmNAcuyxV+gQCufkYcvOqX/qIIfHLv0u5x79kRxuGojfYVky1f15TzZEu2Avte8QGepvUNTnLskf8E6X6Vyg==", - "dev": true, - "requires": { - "@babel/runtime": "^7.8.4" - } - }, - "regex-parser": { - "version": "2.2.11", - "resolved": "https://registry.npmjs.org/regex-parser/-/regex-parser-2.2.11.tgz", - "integrity": "sha512-jbD/FT0+9MBU2XAZluI7w2OBs1RBi6p9M83nkoZayQXXU9e8Robt69FcZc7wU4eJD/YFTjn1JdCk3rbMJajz8Q==", - "dev": true - }, - "regexp.prototype.flags": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz", - "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==", - "dev": true, - "requires": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.3", - "functions-have-names": "^1.2.2" - } - }, - "regexpp": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz", - "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==", - "dev": true - }, - "regexpu-core": { - "version": "5.2.2", - "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.2.2.tgz", - "integrity": "sha512-T0+1Zp2wjF/juXMrMxHxidqGYn8U4R+zleSJhX9tQ1PUsS8a9UtYfbsF9LdiVgNX3kiX8RNaKM42nfSgvFJjmw==", - "dev": true, - "requires": { - "regenerate": "^1.4.2", - "regenerate-unicode-properties": "^10.1.0", - "regjsgen": "^0.7.1", - "regjsparser": "^0.9.1", - "unicode-match-property-ecmascript": "^2.0.0", - "unicode-match-property-value-ecmascript": "^2.1.0" - } - }, - "regjsgen": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.7.1.tgz", - "integrity": "sha512-RAt+8H2ZEzHeYWxZ3H2z6tF18zyyOnlcdaafLrm21Bguj7uZy6ULibiAFdXEtKQY4Sy7wDTwDiOazasMLc4KPA==", - "dev": true - }, - "regjsparser": { - "version": "0.9.1", - "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.9.1.tgz", - "integrity": "sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==", - "dev": true, - "requires": { - "jsesc": "~0.5.0" - }, - "dependencies": { - "jsesc": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", - "integrity": "sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==", - "dev": true - } - } - }, - "require-directory": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", - "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", - "dev": true - }, - "require-from-string": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", - "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==", - "dev": true - }, - "requires-port": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz", - "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==", - "dev": true - }, - "resolve": { - "version": "1.22.1", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz", - "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==", - "dev": true, - "requires": { - "is-core-module": "^2.9.0", - "path-parse": "^1.0.7", - "supports-preserve-symlinks-flag": "^1.0.0" - } - }, - "resolve-cwd": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz", - "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==", - "dev": true, - "requires": { - "resolve-from": "^5.0.0" - } - }, - "resolve-from": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", - "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", - "dev": true - }, - "resolve-url-loader": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/resolve-url-loader/-/resolve-url-loader-5.0.0.tgz", - "integrity": "sha512-uZtduh8/8srhBoMx//5bwqjQ+rfYOUq8zC9NrMUGtjBiGTtFJM42s58/36+hTqeqINcnYe08Nj3LkK9lW4N8Xg==", - "dev": true, - "requires": { - "adjust-sourcemap-loader": "^4.0.0", - "convert-source-map": "^1.7.0", - "loader-utils": "^2.0.0", - "postcss": "^8.2.14", - "source-map": "0.6.1" - }, - "dependencies": { - "loader-utils": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz", - "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==", - "dev": true, - "requires": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^2.1.2" - } - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - } - } - }, - "resolve.exports": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-1.1.0.tgz", - "integrity": "sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ==", - "dev": true - }, - "restore-cursor": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", - "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==", - "dev": true, - "requires": { - "onetime": "^5.1.0", - "signal-exit": "^3.0.2" - } - }, - "retry": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz", - "integrity": "sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==", - "dev": true - }, - "reusify": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", - "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", - "dev": true - }, - "rimraf": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", - "dev": true, - "requires": { - "glob": "^7.1.3" - }, - "dependencies": { - "brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "dev": true, - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, - "minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "requires": { - "brace-expansion": "^1.1.7" - } - } - } - }, - "run-async": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz", - "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==", - "dev": true - }, - "run-parallel": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", - "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", - "dev": true, - "requires": { - "queue-microtask": "^1.2.2" - } - }, - "rxjs": { - "version": "7.5.6", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.6.tgz", - "integrity": "sha512-dnyv2/YsXhnm461G+R/Pe5bWP41Nm6LBXEYWI6eiFP4fiwx6WRI/CD0zbdVAudd9xwLEF2IDcKXLHit0FYjUzw==", - "requires": { - "tslib": "^2.1.0" - } - }, - "safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "dev": true - }, - "safer-buffer": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", - "dev": true - }, - "safevalues": { - "version": "0.3.4", - "resolved": "https://registry.npmjs.org/safevalues/-/safevalues-0.3.4.tgz", - "integrity": "sha512-LRneZZRXNgjzwG4bDQdOTSbze3fHm1EAKN/8bePxnlEZiBmkYEDggaHbuvHI9/hoqHbGfsEA7tWS9GhYHZBBsw==" - }, - "sass": { - "version": "1.57.1", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.57.1.tgz", - "integrity": "sha512-O2+LwLS79op7GI0xZ8fqzF7X2m/m8WFfI02dHOdsK5R2ECeS5F62zrwg/relM1rjSLy7Vd/DiMNIvPrQGsA0jw==", - "dev": true, - "requires": { - "chokidar": ">=3.0.0 <4.0.0", - "immutable": "^4.0.0", - "source-map-js": ">=0.6.2 <2.0.0" - } - }, - "sass-loader": { - "version": "13.2.0", - "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-13.2.0.tgz", - "integrity": "sha512-JWEp48djQA4nbZxmgC02/Wh0eroSUutulROUusYJO9P9zltRbNN80JCBHqRGzjd4cmZCa/r88xgfkjGD0TXsHg==", - "dev": true, - "requires": { - "klona": "^2.0.4", - "neo-async": "^2.6.2" - } - }, - "sax": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", - "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==", - "dev": true, - "optional": true - }, - "saxes": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz", - "integrity": "sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==", - "dev": true, - "requires": { - "xmlchars": "^2.2.0" - } - }, - "schema-utils": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz", - "integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==", - "dev": true, - "requires": { - "@types/json-schema": "^7.0.9", - "ajv": "^8.8.0", - "ajv-formats": "^2.1.1", - "ajv-keywords": "^5.0.0" - } - }, - "select-hose": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz", - "integrity": "sha512-mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg==", - "dev": true - }, - "selfsigned": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-2.1.1.tgz", - "integrity": "sha512-GSL3aowiF7wa/WtSFwnUrludWFoNhftq8bUkH9pkzjpN2XSPOAYEgg6e0sS9s0rZwgJzJiQRPU18A6clnoW5wQ==", - "dev": true, - "requires": { - "node-forge": "^1" - } - }, - "semver": { - "version": "7.3.8", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", - "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", - "dev": true, - "requires": { - "lru-cache": "^6.0.0" - }, - "dependencies": { - "lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dev": true, - "requires": { - "yallist": "^4.0.0" - } - } - } - }, - "send": { - "version": "0.18.0", - "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz", - "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==", - "dev": true, - "requires": { - "debug": "2.6.9", - "depd": "2.0.0", - "destroy": "1.2.0", - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "etag": "~1.8.1", - "fresh": "0.5.2", - "http-errors": "2.0.0", - "mime": "1.6.0", - "ms": "2.1.3", - "on-finished": "2.4.1", - "range-parser": "~1.2.1", - "statuses": "2.0.1" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "requires": { - "ms": "2.0.0" - }, - "dependencies": { - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "dev": true - } - } - }, - "depd": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", - "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", - "dev": true - }, - "ms": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", - "dev": true - } - } - }, - "serialize-javascript": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.1.tgz", - "integrity": "sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==", - "dev": true, - "requires": { - "randombytes": "^2.1.0" - } - }, - "serve-index": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz", - "integrity": "sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw==", - "dev": true, - "requires": { - "accepts": "~1.3.4", - "batch": "0.6.1", - "debug": "2.6.9", - "escape-html": "~1.0.3", - "http-errors": "~1.6.2", - "mime-types": "~2.1.17", - "parseurl": "~1.3.2" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "http-errors": { - "version": "1.6.3", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz", - "integrity": "sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==", - "dev": true, - "requires": { - "depd": "~1.1.2", - "inherits": "2.0.3", - "setprototypeof": "1.1.0", - "statuses": ">= 1.4.0 < 2" - } - }, - "inherits": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==", - "dev": true - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "dev": true - }, - "setprototypeof": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz", - "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==", - "dev": true - }, - "statuses": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", - "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==", - "dev": true - } - } - }, - "serve-static": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz", - "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==", - "dev": true, - "requires": { - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "parseurl": "~1.3.3", - "send": "0.18.0" - } - }, - "set-blocking": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", - "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==", - "dev": true - }, - "setprototypeof": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", - "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==", - "dev": true - }, - "shallow-clone": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz", - "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==", - "dev": true, - "requires": { - "kind-of": "^6.0.2" - } - }, - "shebang-command": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", - "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", - "dev": true, - "requires": { - "shebang-regex": "^3.0.0" - } - }, - "shebang-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", - "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", - "dev": true - }, - "side-channel": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", - "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==", - "dev": true, - "requires": { - "call-bind": "^1.0.0", - "get-intrinsic": "^1.0.2", - "object-inspect": "^1.9.0" - } - }, - "signal-exit": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", - "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", - "dev": true - }, - "sisteransi": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz", - "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==", - "dev": true - }, - "slash": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz", - "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==", - "dev": true - }, - "smart-buffer": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz", - "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==", - "dev": true - }, - "sockjs": { - "version": "0.3.24", - "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.24.tgz", - "integrity": "sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ==", - "dev": true, - "requires": { - "faye-websocket": "^0.11.3", - "uuid": "^8.3.2", - "websocket-driver": "^0.7.4" - } - }, - "socks": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/socks/-/socks-2.7.1.tgz", - "integrity": "sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ==", - "dev": true, - "requires": { - "ip": "^2.0.0", - "smart-buffer": "^4.2.0" - } - }, - "socks-proxy-agent": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz", - "integrity": "sha512-Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww==", - "dev": true, - "requires": { - "agent-base": "^6.0.2", - "debug": "^4.3.3", - "socks": "^2.6.2" - } - }, - "source-map": { - "version": "0.7.4", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz", - "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==", - "dev": true - }, - "source-map-js": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz", - "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==", - "dev": true - }, - "source-map-loader": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/source-map-loader/-/source-map-loader-4.0.1.tgz", - "integrity": "sha512-oqXpzDIByKONVY8g1NUPOTQhe0UTU5bWUl32GSkqK2LjJj0HmwTMVKxcUip0RgAYhY1mqgOxjbQM48a0mmeNfA==", - "dev": true, - "requires": { - "abab": "^2.0.6", - "iconv-lite": "^0.6.3", - "source-map-js": "^1.0.2" - }, - "dependencies": { - "iconv-lite": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", - "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", - "dev": true, - "requires": { - "safer-buffer": ">= 2.1.2 < 3.0.0" - } - } - } - }, - "source-map-support": { - "version": "0.5.21", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", - "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", - "requires": { - "buffer-from": "^1.0.0", - "source-map": "^0.6.0" - }, - "dependencies": { - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" - } - } - }, - "spdx-correct": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz", - "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==", - "dev": true, - "requires": { - "spdx-expression-parse": "^3.0.0", - "spdx-license-ids": "^3.0.0" - } - }, - "spdx-exceptions": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz", - "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==", - "dev": true - }, - "spdx-expression-parse": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz", - "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==", - "dev": true, - "requires": { - "spdx-exceptions": "^2.1.0", - "spdx-license-ids": "^3.0.0" - } - }, - "spdx-license-ids": { - "version": "3.0.12", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.12.tgz", - "integrity": "sha512-rr+VVSXtRhO4OHbXUiAF7xW3Bo9DuuF6C5jH+q/x15j2jniycgKbxU09Hr0WqlSLUs4i4ltHGXqTe7VHclYWyA==", - "dev": true - }, - "spdy": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz", - "integrity": "sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==", - "dev": true, - "requires": { - "debug": "^4.1.0", - "handle-thing": "^2.0.0", - "http-deceiver": "^1.2.7", - "select-hose": "^2.0.0", - "spdy-transport": "^3.0.0" - } - }, - "spdy-transport": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz", - "integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==", - "dev": true, - "requires": { - "debug": "^4.1.0", - "detect-node": "^2.0.4", - "hpack.js": "^2.1.6", - "obuf": "^1.1.2", - "readable-stream": "^3.0.6", - "wbuf": "^1.7.3" - } - }, - "sprintf-js": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==", - "dev": true - }, - "ssri": { - "version": "10.0.1", - "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.1.tgz", - "integrity": "sha512-WVy6di9DlPOeBWEjMScpNipeSX2jIZBGEn5Uuo8Q7aIuFEuDX0pw8RxcOjlD1TWP4obi24ki7m/13+nFpcbXrw==", - "dev": true, - "requires": { - "minipass": "^4.0.0" - } - }, - "stack-utils": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz", - "integrity": "sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==", - "dev": true, - "requires": { - "escape-string-regexp": "^2.0.0" - }, - "dependencies": { - "escape-string-regexp": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz", - "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==", - "dev": true - } - } - }, - "statuses": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", - "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==", - "dev": true - }, - "stop-iteration-iterator": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.0.0.tgz", - "integrity": "sha512-iCGQj+0l0HOdZ2AEeBADlsRC+vsnDsZsbdSiH1yNSjcfKM7fdpCMfqAL/dwF5BLiw/XhRft/Wax6zQbhq2BcjQ==", - "dev": true, - "requires": { - "internal-slot": "^1.0.4" - } - }, - "string_decoder": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", - "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", - "dev": true, - "requires": { - "safe-buffer": "~5.2.0" - }, - "dependencies": { - "safe-buffer": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", - "dev": true - } - } - }, - "string-length": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz", - "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==", - "dev": true, - "requires": { - "char-regex": "^1.0.2", - "strip-ansi": "^6.0.0" - } - }, - "string-width": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dev": true, - "requires": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - } - }, - "strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, - "requires": { - "ansi-regex": "^5.0.1" - } - }, - "strip-bom": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz", - "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==", - "dev": true - }, - "strip-final-newline": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", - "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==", - "dev": true - }, - "strip-json-comments": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", - "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", - "dev": true - }, - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - }, - "supports-hyperlinks": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.3.0.tgz", - "integrity": "sha512-RpsAZlpWcDwOPQA22aCH4J0t7L8JmAvsCxfOSEwm7cQs3LshN36QaTkwd70DnBOXDWGssw2eUoc8CaRWT0XunA==", - "dev": true, - "requires": { - "has-flag": "^4.0.0", - "supports-color": "^7.0.0" - }, - "dependencies": { - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "supports-preserve-symlinks-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", - "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", - "dev": true - }, - "symbol-observable": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-4.0.0.tgz", - "integrity": "sha512-b19dMThMV4HVFynSAM1++gBHAbk2Tc/osgLIBZMKsyqh34jb2e8Os7T6ZW/Bt3pJFdBTd2JwAnAAEQV7rSNvcQ==", - "dev": true - }, - "symbol-tree": { - "version": "3.2.4", - "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz", - "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==", - "dev": true - }, - "tapable": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz", - "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==", - "dev": true + "node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" }, - "tar": { - "version": "6.1.13", - "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.13.tgz", - "integrity": "sha512-jdIBIN6LTIe2jqzay/2vtYLlBHa3JF42ot3h1dW8Q0PaAG4v8rm0cvpVePtau5C6OKXGGcgO9q2AMNSWxiLqKw==", + "node_modules/tsutils": { + "version": "3.21.0", + "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz", + "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==", "dev": true, - "requires": { - "chownr": "^2.0.0", - "fs-minipass": "^2.0.0", - "minipass": "^4.0.0", - "minizlib": "^2.1.1", - "mkdirp": "^1.0.3", - "yallist": "^4.0.0" - }, "dependencies": { - "fs-minipass": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", - "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", - "dev": true, - "requires": { - "minipass": "^3.0.0" - }, - "dependencies": { - "minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", - "dev": true, - "requires": { - "yallist": "^4.0.0" - } - } - } - } - } - }, - "terminal-link": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/terminal-link/-/terminal-link-2.1.1.tgz", - "integrity": "sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==", - "dev": true, - "requires": { - "ansi-escapes": "^4.2.1", - "supports-hyperlinks": "^2.0.0" - } - }, - "terser": { - "version": "5.16.1", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.16.1.tgz", - "integrity": "sha512-xvQfyfA1ayT0qdK47zskQgRZeWLoOQ8JQ6mIgRGVNwZKdQMU+5FkCBjmv4QjcrTzyZquRw2FVtlJSRUmMKQslw==", - "dev": true, - "requires": { - "@jridgewell/source-map": "^0.3.2", - "acorn": "^8.5.0", - "commander": "^2.20.0", - "source-map-support": "~0.5.20" - } - }, - "terser-webpack-plugin": { - "version": "5.3.6", - "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.6.tgz", - "integrity": "sha512-kfLFk+PoLUQIbLmB1+PZDMRSZS99Mp+/MHqDNmMA6tOItzRt+Npe3E+fsMs5mfcM0wCtrrdU387UnV+vnSffXQ==", - "dev": true, - "requires": { - "@jridgewell/trace-mapping": "^0.3.14", - "jest-worker": "^27.4.5", - "schema-utils": "^3.1.1", - "serialize-javascript": "^6.0.0", - "terser": "^5.14.1" + "tslib": "^1.8.1" }, - "dependencies": { - "ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", - "dev": true, - "requires": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - } - }, - "ajv-keywords": { - "version": "3.5.2", - "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", - "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", - "dev": true - }, - "json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true - }, - "schema-utils": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz", - "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==", - "dev": true, - "requires": { - "@types/json-schema": "^7.0.8", - "ajv": "^6.12.5", - "ajv-keywords": "^3.5.2" - } - } - } - }, - "test-exclude": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz", - "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==", - "dev": true, - "requires": { - "@istanbuljs/schema": "^0.1.2", - "glob": "^7.1.4", - "minimatch": "^3.0.4" + "engines": { + "node": ">= 6" }, - "dependencies": { - "brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "dev": true, - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, - "minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "requires": { - "brace-expansion": "^1.1.7" - } - } + "peerDependencies": { + "typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta" } }, - "text-table": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", - "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", - "dev": true - }, - "through": { - "version": "2.3.8", - "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", - "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==", - "dev": true - }, - "thunky": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz", - "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==", + "node_modules/tsutils/node_modules/tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", "dev": true }, - "tmp": { - "version": "0.0.33", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", - "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", + "node_modules/tuf-js": { + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/tuf-js/-/tuf-js-1.1.7.tgz", + "integrity": "sha512-i3P9Kgw3ytjELUfpuKVDNBJvk4u5bXL6gskv572mcevPbSKCV3zt3djhmlEQ65yERjIbOSncy7U4cQJaB1CBCg==", "dev": true, - "requires": { - "os-tmpdir": "~1.0.2" + "dependencies": { + "@tufjs/models": "1.0.4", + "debug": "^4.3.4", + "make-fetch-happen": "^11.1.1" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "tmpl": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz", - "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==", - "dev": true - }, - "to-fast-properties": { + "node_modules/tuf-js/node_modules/@tootallnate/once": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", - "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==", - "dev": true - }, - "to-regex-range": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", - "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz", + "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==", "dev": true, - "requires": { - "is-number": "^7.0.0" + "engines": { + "node": ">= 10" } }, - "toidentifier": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", - "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==", - "dev": true - }, - "tough-cookie": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.2.tgz", - "integrity": "sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ==", + "node_modules/tuf-js/node_modules/http-proxy-agent": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz", + "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==", "dev": true, - "requires": { - "psl": "^1.1.33", - "punycode": "^2.1.1", - "universalify": "^0.2.0", - "url-parse": "^1.5.3" + "dependencies": { + "@tootallnate/once": "2", + "agent-base": "6", + "debug": "4" + }, + "engines": { + "node": ">= 6" } }, - "tr46": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-3.0.0.tgz", - "integrity": "sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==", + "node_modules/tuf-js/node_modules/lru-cache": { + "version": "7.18.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", + "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", "dev": true, - "requires": { - "punycode": "^2.1.1" + "engines": { + "node": ">=12" } }, - "tree-kill": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz", - "integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==", - "dev": true - }, - "tsconfig-paths": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-4.1.2.tgz", - "integrity": "sha512-uhxiMgnXQp1IR622dUXI+9Ehnws7i/y6xvpZB9IbUVOPy0muvdvgXeZOn88UcGPiT98Vp3rJPTa8bFoalZ3Qhw==", + "node_modules/tuf-js/node_modules/make-fetch-happen": { + "version": "11.1.1", + "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-11.1.1.tgz", + "integrity": "sha512-rLWS7GCSTcEujjVBs2YqG7Y4643u8ucvCJeSRqiLYhesrDuzeuFIk37xREzAsfQaqzl8b9rNCE4m6J8tvX4Q8w==", "dev": true, - "requires": { - "json5": "^2.2.2", - "minimist": "^1.2.6", - "strip-bom": "^3.0.0" - }, "dependencies": { - "strip-bom": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", - "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==", - "dev": true - } + "agentkeepalive": "^4.2.1", + "cacache": "^17.0.0", + "http-cache-semantics": "^4.1.1", + "http-proxy-agent": "^5.0.0", + "https-proxy-agent": "^5.0.0", + "is-lambda": "^1.0.1", + "lru-cache": "^7.7.1", + "minipass": "^5.0.0", + "minipass-fetch": "^3.0.0", + "minipass-flush": "^1.0.5", + "minipass-pipeline": "^1.2.4", + "negotiator": "^0.6.3", + "promise-retry": "^2.0.1", + "socks-proxy-agent": "^7.0.0", + "ssri": "^10.0.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "tslib": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz", - "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==" - }, - "tsutils": { - "version": "3.21.0", - "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz", - "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==", + "node_modules/tuf-js/node_modules/minipass-fetch": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.4.tgz", + "integrity": "sha512-jHAqnA728uUpIaFm7NWsCnqKT6UqZz7GcI/bDpPATuwYyKwJwW0remxSCxUlKiEty+eopHGa3oc8WxgQ1FFJqg==", "dev": true, - "requires": { - "tslib": "^1.8.1" - }, "dependencies": { - "tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", - "dev": true - } + "minipass": "^7.0.3", + "minipass-sized": "^1.0.3", + "minizlib": "^2.1.2" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + }, + "optionalDependencies": { + "encoding": "^0.1.13" } }, - "type-check": { + "node_modules/tuf-js/node_modules/minipass-fetch/node_modules/minipass": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz", + "integrity": "sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==", + "dev": true, + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, + "node_modules/type-check": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", "dev": true, - "requires": { + "dependencies": { "prelude-ls": "^1.2.1" + }, + "engines": { + "node": ">= 0.8.0" } }, - "type-detect": { + "node_modules/type-detect": { "version": "4.0.8", "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==", - "dev": true + "dev": true, + "engines": { + "node": ">=4" + } }, - "type-fest": { + "node_modules/type-fest": { "version": "0.21.3", "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz", "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==", - "dev": true + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } }, - "type-is": { + "node_modules/type-is": { "version": "1.6.18", "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==", "dev": true, - "requires": { + "dependencies": { "media-typer": "0.3.0", "mime-types": "~2.1.24" + }, + "engines": { + "node": ">= 0.6" } }, - "typed-assert": { + "node_modules/typed-assert": { "version": "1.0.9", "resolved": "https://registry.npmjs.org/typed-assert/-/typed-assert-1.0.9.tgz", "integrity": "sha512-KNNZtayBCtmnNmbo5mG47p1XsCyrx6iVqomjcZnec/1Y5GGARaxPs6r49RnSPeUP3YjNYiU9sQHAtY4BBvnZwg==", "dev": true }, - "typescript": { - "version": "4.9.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.4.tgz", - "integrity": "sha512-Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg==", + "node_modules/typescript": { + "version": "4.9.5", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz", + "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==", + "dev": true, + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=4.2.0" + } + }, + "node_modules/undici-types": { + "version": "5.26.5", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", + "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==", "dev": true }, - "unicode-canonical-property-names-ecmascript": { + "node_modules/unicode-canonical-property-names-ecmascript": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz", "integrity": "sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==", - "dev": true + "dev": true, + "engines": { + "node": ">=4" + } }, - "unicode-match-property-ecmascript": { + "node_modules/unicode-match-property-ecmascript": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz", "integrity": "sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==", "dev": true, - "requires": { + "dependencies": { "unicode-canonical-property-names-ecmascript": "^2.0.0", "unicode-property-aliases-ecmascript": "^2.0.0" + }, + "engines": { + "node": ">=4" } }, - "unicode-match-property-value-ecmascript": { + "node_modules/unicode-match-property-value-ecmascript": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz", "integrity": "sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA==", - "dev": true + "dev": true, + "engines": { + "node": ">=4" + } }, - "unicode-property-aliases-ecmascript": { + "node_modules/unicode-property-aliases-ecmascript": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz", "integrity": "sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==", - "dev": true + "dev": true, + "engines": { + "node": ">=4" + } }, - "unique-filename": { + "node_modules/unique-filename": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-3.0.0.tgz", "integrity": "sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g==", "dev": true, - "requires": { + "dependencies": { "unique-slug": "^4.0.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "unique-slug": { + "node_modules/unique-slug": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-4.0.0.tgz", "integrity": "sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ==", "dev": true, - "requires": { + "dependencies": { "imurmurhash": "^0.1.4" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "universalify": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz", - "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==", - "dev": true + "node_modules/universalify": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", + "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", + "dev": true, + "engines": { + "node": ">= 10.0.0" + } }, - "unpipe": { + "node_modules/unpipe": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==", - "dev": true + "dev": true, + "engines": { + "node": ">= 0.8" + } }, - "update-browserslist-db": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz", - "integrity": "sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==", + "node_modules/update-browserslist-db": { + "version": "1.0.13", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz", + "integrity": "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==", "dev": true, - "requires": { + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/browserslist" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "dependencies": { "escalade": "^3.1.1", "picocolors": "^1.0.0" + }, + "bin": { + "update-browserslist-db": "cli.js" + }, + "peerDependencies": { + "browserslist": ">= 4.21.0" } }, - "uri-js": { + "node_modules/uri-js": { "version": "4.4.1", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", "dev": true, - "requires": { + "dependencies": { "punycode": "^2.1.0" } }, - "url-parse": { + "node_modules/url-parse": { "version": "1.5.10", "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz", "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==", "dev": true, - "requires": { + "dependencies": { "querystringify": "^2.1.1", "requires-port": "^1.0.0" } }, - "util-deprecate": { + "node_modules/util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", "dev": true }, - "utils-merge": { + "node_modules/utils-merge": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==", - "dev": true + "dev": true, + "engines": { + "node": ">= 0.4.0" + } }, - "uuid": { + "node_modules/uuid": { "version": "8.3.2", "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==", + "dev": true, + "bin": { + "uuid": "dist/bin/uuid" + } + }, + "node_modules/v8-compile-cache": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz", + "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==", "dev": true }, - "v8-to-istanbul": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.0.1.tgz", - "integrity": "sha512-74Y4LqY74kLE6IFyIjPtkSTWzUZmj8tdHT9Ii/26dvQ6K9Dl2NbEfj0XgU2sHCtKgt5VupqhlO/5aWuqS+IY1w==", + "node_modules/v8-to-istanbul": { + "version": "9.1.3", + "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.1.3.tgz", + "integrity": "sha512-9lDD+EVI2fjFsMWXc6dy5JJzBsVTcQ2fVkfBvncZ6xJWG9wtBhOldG+mHkSL0+V1K/xgZz0JDO5UT5hFwHUghg==", "dev": true, - "requires": { + "dependencies": { "@jridgewell/trace-mapping": "^0.3.12", "@types/istanbul-lib-coverage": "^2.0.1", - "convert-source-map": "^1.6.0" + "convert-source-map": "^2.0.0" + }, + "engines": { + "node": ">=10.12.0" } }, - "validate-npm-package-license": { + "node_modules/v8-to-istanbul/node_modules/convert-source-map": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", + "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", + "dev": true + }, + "node_modules/validate-npm-package-license": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==", "dev": true, - "requires": { + "dependencies": { "spdx-correct": "^3.0.0", "spdx-expression-parse": "^3.0.0" } }, - "validate-npm-package-name": { + "node_modules/validate-npm-package-name": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-5.0.0.tgz", "integrity": "sha512-YuKoXDAhBYxY7SfOKxHBDoSyENFeW5VvIIQp2TGQuit8gpK6MnWaQelBKxso72DoxTZfZdcP3W90LqpSkgPzLQ==", "dev": true, - "requires": { + "dependencies": { "builtins": "^5.0.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "vary": { + "node_modules/vary": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==", - "dev": true + "dev": true, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/vite": { + "version": "4.4.7", + "resolved": "https://registry.npmjs.org/vite/-/vite-4.4.7.tgz", + "integrity": "sha512-6pYf9QJ1mHylfVh39HpuSfMPojPSKVxZvnclX1K1FyZ1PXDOcLBibdq5t1qxJSnL63ca8Wf4zts6mD8u8oc9Fw==", + "dev": true, + "dependencies": { + "esbuild": "^0.18.10", + "postcss": "^8.4.26", + "rollup": "^3.25.2" + }, + "bin": { + "vite": "bin/vite.js" + }, + "engines": { + "node": "^14.18.0 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/vitejs/vite?sponsor=1" + }, + "optionalDependencies": { + "fsevents": "~2.3.2" + }, + "peerDependencies": { + "@types/node": ">= 14", + "less": "*", + "lightningcss": "^1.21.0", + "sass": "*", + "stylus": "*", + "sugarss": "*", + "terser": "^5.4.0" + }, + "peerDependenciesMeta": { + "@types/node": { + "optional": true + }, + "less": { + "optional": true + }, + "lightningcss": { + "optional": true + }, + "sass": { + "optional": true + }, + "stylus": { + "optional": true + }, + "sugarss": { + "optional": true + }, + "terser": { + "optional": true + } + } }, - "w3c-hr-time": { + "node_modules/w3c-hr-time": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz", "integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==", + "deprecated": "Use your platform's native performance.now() and performance.timeOrigin.", "dev": true, - "requires": { + "dependencies": { "browser-process-hrtime": "^1.0.0" } }, - "w3c-xmlserializer": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-3.0.0.tgz", - "integrity": "sha512-3WFqGEgSXIyGhOmAFtlicJNMjEps8b1MG31NCA0/vOF9+nKMUW1ckhi9cnNHmf88Rzw5V+dwIwsm2C7X8k9aQg==", + "node_modules/w3c-xmlserializer": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz", + "integrity": "sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==", "dev": true, - "requires": { - "xml-name-validator": "^4.0.0" + "dependencies": { + "xml-name-validator": "^3.0.0" + }, + "engines": { + "node": ">=10" } }, - "walker": { + "node_modules/walker": { "version": "1.0.8", "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz", "integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==", "dev": true, - "requires": { + "dependencies": { "makeerror": "1.0.12" } }, - "watchpack": { + "node_modules/watchpack": { "version": "2.4.0", "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz", "integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==", "dev": true, - "requires": { + "dependencies": { "glob-to-regexp": "^0.4.1", "graceful-fs": "^4.1.2" + }, + "engines": { + "node": ">=10.13.0" } }, - "wbuf": { + "node_modules/wbuf": { "version": "1.7.3", "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz", "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==", "dev": true, - "requires": { + "dependencies": { "minimalistic-assert": "^1.0.0" } }, - "wcwidth": { + "node_modules/wcwidth": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz", "integrity": "sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==", "dev": true, - "requires": { + "dependencies": { "defaults": "^1.0.3" } }, - "webidl-conversions": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz", - "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==", - "dev": true + "node_modules/webidl-conversions": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz", + "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==", + "dev": true, + "engines": { + "node": ">=10.4" + } }, - "webpack": { - "version": "5.75.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.75.0.tgz", - "integrity": "sha512-piaIaoVJlqMsPtX/+3KTTO6jfvrSYgauFVdt8cr9LTHKmcq/AMd4mhzsiP7ZF/PGRNPGA8336jldh9l2Kt2ogQ==", + "node_modules/webpack": { + "version": "5.88.2", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.88.2.tgz", + "integrity": "sha512-JmcgNZ1iKj+aiR0OvTYtWQqJwq37Pf683dY9bVORwVbUrDhLhdn/PlO2sHsFHPkj7sHNQF3JwaAkp49V+Sq1tQ==", "dev": true, - "requires": { + "dependencies": { "@types/eslint-scope": "^3.7.3", - "@types/estree": "^0.0.51", - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/wasm-edit": "1.11.1", - "@webassemblyjs/wasm-parser": "1.11.1", + "@types/estree": "^1.0.0", + "@webassemblyjs/ast": "^1.11.5", + "@webassemblyjs/wasm-edit": "^1.11.5", + "@webassemblyjs/wasm-parser": "^1.11.5", "acorn": "^8.7.1", - "acorn-import-assertions": "^1.7.6", + "acorn-import-assertions": "^1.9.0", "browserslist": "^4.14.5", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^5.10.0", - "es-module-lexer": "^0.9.0", + "enhanced-resolve": "^5.15.0", + "es-module-lexer": "^1.2.1", "eslint-scope": "5.1.1", "events": "^3.2.0", "glob-to-regexp": "^0.4.1", @@ -29844,76 +18215,69 @@ "loader-runner": "^4.2.0", "mime-types": "^2.1.27", "neo-async": "^2.6.2", - "schema-utils": "^3.1.0", + "schema-utils": "^3.2.0", "tapable": "^2.1.1", - "terser-webpack-plugin": "^5.1.3", + "terser-webpack-plugin": "^5.3.7", "watchpack": "^2.4.0", "webpack-sources": "^3.2.3" }, - "dependencies": { - "ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", - "dev": true, - "requires": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - } - }, - "ajv-keywords": { - "version": "3.5.2", - "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", - "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", - "dev": true - }, - "json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true - }, - "schema-utils": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz", - "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==", - "dev": true, - "requires": { - "@types/json-schema": "^7.0.8", - "ajv": "^6.12.5", - "ajv-keywords": "^3.5.2" - } + "bin": { + "webpack": "bin/webpack.js" + }, + "engines": { + "node": ">=10.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, + "peerDependenciesMeta": { + "webpack-cli": { + "optional": true } } }, - "webpack-dev-middleware": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-6.0.1.tgz", - "integrity": "sha512-PZPZ6jFinmqVPJZbisfggDiC+2EeGZ1ZByyMP5sOFJcPPWSexalISz+cvm+j+oYPT7FIJyxT76esjnw9DhE5sw==", + "node_modules/webpack-dev-middleware": { + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-6.1.1.tgz", + "integrity": "sha512-y51HrHaFeeWir0YO4f0g+9GwZawuigzcAdRNon6jErXy/SqV/+O6eaVAzDqE6t3e3NpGeR5CS+cCDaTC+V3yEQ==", "dev": true, - "requires": { + "dependencies": { "colorette": "^2.0.10", "memfs": "^3.4.12", "mime-types": "^2.1.31", "range-parser": "^1.2.1", "schema-utils": "^4.0.0" + }, + "engines": { + "node": ">= 14.15.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, + "peerDependencies": { + "webpack": "^5.0.0" + }, + "peerDependenciesMeta": { + "webpack": { + "optional": true + } } }, - "webpack-dev-server": { - "version": "4.11.1", - "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.11.1.tgz", - "integrity": "sha512-lILVz9tAUy1zGFwieuaQtYiadImb5M3d+H+L1zDYalYoDl0cksAB1UNyuE5MMWJrG6zR1tXkCP2fitl7yoUJiw==", + "node_modules/webpack-dev-server": { + "version": "4.15.1", + "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.15.1.tgz", + "integrity": "sha512-5hbAst3h3C3L8w6W4P96L5vaV0PxSmJhxZvWKYIdgxOQm8pNZ5dEOmmSLBVpP85ReeyRt6AS1QJNyo/oFFPeVA==", "dev": true, - "requires": { + "dependencies": { "@types/bonjour": "^3.5.9", "@types/connect-history-api-fallback": "^1.3.5", "@types/express": "^4.17.13", "@types/serve-index": "^1.9.1", "@types/serve-static": "^1.13.10", "@types/sockjs": "^0.3.33", - "@types/ws": "^8.5.1", + "@types/ws": "^8.5.5", "ansi-html-community": "^0.0.8", "bonjour-service": "^1.0.11", "chokidar": "^3.5.3", @@ -29926,6 +18290,7 @@ "html-entities": "^2.3.2", "http-proxy-middleware": "^2.0.3", "ipaddr.js": "^2.0.1", + "launch-editor": "^2.6.0", "open": "^8.0.9", "p-retry": "^4.5.0", "rimraf": "^3.0.2", @@ -29935,266 +18300,444 @@ "sockjs": "^0.3.24", "spdy": "^4.0.2", "webpack-dev-middleware": "^5.3.1", - "ws": "^8.4.2" - }, - "dependencies": { - "webpack-dev-middleware": { - "version": "5.3.3", - "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.3.tgz", - "integrity": "sha512-hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA==", - "dev": true, - "requires": { - "colorette": "^2.0.10", - "memfs": "^3.4.3", - "mime-types": "^2.1.31", - "range-parser": "^1.2.1", - "schema-utils": "^4.0.0" - } + "ws": "^8.13.0" + }, + "bin": { + "webpack-dev-server": "bin/webpack-dev-server.js" + }, + "engines": { + "node": ">= 12.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, + "peerDependencies": { + "webpack": "^4.37.0 || ^5.0.0" + }, + "peerDependenciesMeta": { + "webpack": { + "optional": true + }, + "webpack-cli": { + "optional": true + } + } + }, + "node_modules/webpack-dev-server/node_modules/webpack-dev-middleware": { + "version": "5.3.3", + "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.3.tgz", + "integrity": "sha512-hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA==", + "dev": true, + "dependencies": { + "colorette": "^2.0.10", + "memfs": "^3.4.3", + "mime-types": "^2.1.31", + "range-parser": "^1.2.1", + "schema-utils": "^4.0.0" + }, + "engines": { + "node": ">= 12.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, + "peerDependencies": { + "webpack": "^4.0.0 || ^5.0.0" + } + }, + "node_modules/webpack-dev-server/node_modules/ws": { + "version": "8.14.2", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.14.2.tgz", + "integrity": "sha512-wEBG1ftX4jcglPxgFCMJmZ2PLtSbJ2Peg6TmpJFTbe9GZYOQCDPdMYu/Tm0/bGZkw8paZnJY45J4K2PZrLYq8g==", + "dev": true, + "engines": { + "node": ">=10.0.0" + }, + "peerDependencies": { + "bufferutil": "^4.0.1", + "utf-8-validate": ">=5.0.2" + }, + "peerDependenciesMeta": { + "bufferutil": { + "optional": true + }, + "utf-8-validate": { + "optional": true } } }, - "webpack-merge": { - "version": "5.8.0", - "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.8.0.tgz", - "integrity": "sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q==", + "node_modules/webpack-merge": { + "version": "5.9.0", + "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.9.0.tgz", + "integrity": "sha512-6NbRQw4+Sy50vYNTw7EyOn41OZItPiXB8GNv3INSoe3PSFaHJEz3SHTrYVaRm2LilNGnFUzh0FAwqPEmU/CwDg==", "dev": true, - "requires": { + "dependencies": { "clone-deep": "^4.0.1", "wildcard": "^2.0.0" + }, + "engines": { + "node": ">=10.0.0" + } + }, + "node_modules/webpack-sources": { + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz", + "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==", + "dev": true, + "engines": { + "node": ">=10.13.0" + } + }, + "node_modules/webpack-subresource-integrity": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/webpack-subresource-integrity/-/webpack-subresource-integrity-5.1.0.tgz", + "integrity": "sha512-sacXoX+xd8r4WKsy9MvH/q/vBtEHr86cpImXwyg74pFIpERKt6FmB8cXpeuh0ZLgclOlHI4Wcll7+R5L02xk9Q==", + "dev": true, + "dependencies": { + "typed-assert": "^1.0.8" + }, + "engines": { + "node": ">= 12" + }, + "peerDependencies": { + "html-webpack-plugin": ">= 5.0.0-beta.1 < 6", + "webpack": "^5.12.0" + }, + "peerDependenciesMeta": { + "html-webpack-plugin": { + "optional": true + } + } + }, + "node_modules/webpack/node_modules/ajv": { + "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "dev": true, + "dependencies": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" + } + }, + "node_modules/webpack/node_modules/ajv-keywords": { + "version": "3.5.2", + "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", + "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", + "dev": true, + "peerDependencies": { + "ajv": "^6.9.1" + } + }, + "node_modules/webpack/node_modules/eslint-scope": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", + "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", + "dev": true, + "dependencies": { + "esrecurse": "^4.3.0", + "estraverse": "^4.1.1" + }, + "engines": { + "node": ">=8.0.0" + } + }, + "node_modules/webpack/node_modules/estraverse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", + "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", + "dev": true, + "engines": { + "node": ">=4.0" } }, - "webpack-sources": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz", - "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==", + "node_modules/webpack/node_modules/json-schema-traverse": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", "dev": true }, - "webpack-subresource-integrity": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/webpack-subresource-integrity/-/webpack-subresource-integrity-5.1.0.tgz", - "integrity": "sha512-sacXoX+xd8r4WKsy9MvH/q/vBtEHr86cpImXwyg74pFIpERKt6FmB8cXpeuh0ZLgclOlHI4Wcll7+R5L02xk9Q==", + "node_modules/webpack/node_modules/schema-utils": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz", + "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==", "dev": true, - "requires": { - "typed-assert": "^1.0.8" + "dependencies": { + "@types/json-schema": "^7.0.8", + "ajv": "^6.12.5", + "ajv-keywords": "^3.5.2" + }, + "engines": { + "node": ">= 10.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" } }, - "websocket-driver": { + "node_modules/websocket-driver": { "version": "0.7.4", "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz", "integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==", "dev": true, - "requires": { + "dependencies": { "http-parser-js": ">=0.5.1", "safe-buffer": ">=5.1.0", "websocket-extensions": ">=0.1.1" + }, + "engines": { + "node": ">=0.8.0" } }, - "websocket-extensions": { + "node_modules/websocket-extensions": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz", "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==", - "dev": true + "dev": true, + "engines": { + "node": ">=0.8.0" + } }, - "whatwg-encoding": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz", - "integrity": "sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==", + "node_modules/whatwg-encoding": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz", + "integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==", "dev": true, - "requires": { - "iconv-lite": "0.6.3" - }, "dependencies": { - "iconv-lite": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", - "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", - "dev": true, - "requires": { - "safer-buffer": ">= 2.1.2 < 3.0.0" - } - } + "iconv-lite": "0.4.24" } }, - "whatwg-mimetype": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz", - "integrity": "sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==", + "node_modules/whatwg-mimetype": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz", + "integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==", "dev": true }, - "whatwg-url": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-10.0.0.tgz", - "integrity": "sha512-CLxxCmdUby142H5FZzn4D8ikO1cmypvXVQktsgosNy4a4BHrDHeciBBGZhb0bNoR5/MltoCatso+vFjjGx8t0w==", + "node_modules/whatwg-url": { + "version": "8.7.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.7.0.tgz", + "integrity": "sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==", "dev": true, - "requires": { - "tr46": "^3.0.0", - "webidl-conversions": "^7.0.0" + "dependencies": { + "lodash": "^4.7.0", + "tr46": "^2.1.0", + "webidl-conversions": "^6.1.0" + }, + "engines": { + "node": ">=10" } }, - "which": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/which/-/which-3.0.0.tgz", - "integrity": "sha512-nla//68K9NU6yRiwDY/Q8aU6siKlSs64aEC7+IV56QoAuyQT2ovsJcgGYGyqMOmI/CGN1BOR6mM5EN0FBO+zyQ==", + "node_modules/which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", "dev": true, - "requires": { + "dependencies": { "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/node-which" + }, + "engines": { + "node": ">= 8" } }, - "which-boxed-primitive": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz", - "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==", - "dev": true, - "requires": { - "is-bigint": "^1.0.1", - "is-boolean-object": "^1.1.0", - "is-number-object": "^1.0.4", - "is-string": "^1.0.5", - "is-symbol": "^1.0.3" - } - }, - "which-collection": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.1.tgz", - "integrity": "sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A==", - "dev": true, - "requires": { - "is-map": "^2.0.1", - "is-set": "^2.0.1", - "is-weakmap": "^2.0.1", - "is-weakset": "^2.0.1" - } - }, - "which-typed-array": { - "version": "1.1.9", - "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.9.tgz", - "integrity": "sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA==", - "dev": true, - "requires": { - "available-typed-arrays": "^1.0.5", - "call-bind": "^1.0.2", - "for-each": "^0.3.3", - "gopd": "^1.0.1", - "has-tostringtag": "^1.0.0", - "is-typed-array": "^1.1.10" - } - }, - "wide-align": { + "node_modules/wide-align": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz", "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==", "dev": true, - "requires": { + "dependencies": { "string-width": "^1.0.2 || 2 || 3 || 4" } }, - "wildcard": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.0.tgz", - "integrity": "sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==", + "node_modules/wildcard": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.1.tgz", + "integrity": "sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==", "dev": true }, - "word-wrap": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", - "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==", - "dev": true + "node_modules/wrap-ansi": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } }, - "wrap-ansi": { + "node_modules/wrap-ansi-cjs": { + "name": "wrap-ansi", "version": "7.0.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", "dev": true, - "requires": { + "dependencies": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", "strip-ansi": "^6.0.0" }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/wrap-ansi-cjs/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - } + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, - "wrappy": { + "node_modules/wrap-ansi-cjs/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/wrap-ansi-cjs/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "node_modules/wrap-ansi/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/wrap-ansi/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/wrap-ansi/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "node_modules/wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", "dev": true }, - "write-file-atomic": { + "node_modules/write-file-atomic": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz", "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==", "dev": true, - "requires": { + "dependencies": { "imurmurhash": "^0.1.4", "signal-exit": "^3.0.7" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" } }, - "ws": { - "version": "8.12.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.12.0.tgz", - "integrity": "sha512-kU62emKIdKVeEIOIKVegvqpXMSTAMLJozpHZaJNDYqBjzlSYXQGviYwN1osDLJ9av68qHd4a2oSjd7yD4pacig==", - "dev": true + "node_modules/ws": { + "version": "7.5.9", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz", + "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==", + "dev": true, + "engines": { + "node": ">=8.3.0" + }, + "peerDependencies": { + "bufferutil": "^4.0.1", + "utf-8-validate": "^5.0.2" + }, + "peerDependenciesMeta": { + "bufferutil": { + "optional": true + }, + "utf-8-validate": { + "optional": true + } + } }, - "xml-name-validator": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz", - "integrity": "sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==", + "node_modules/xml-name-validator": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz", + "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==", "dev": true }, - "xmlchars": { + "node_modules/xmlchars": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz", "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==", "dev": true }, - "y18n": { + "node_modules/y18n": { "version": "5.0.8", "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", - "dev": true - }, - "yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true + "dev": true, + "engines": { + "node": ">=10" + } }, - "yaml": { - "version": "1.10.2", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz", - "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==", + "node_modules/yallist": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", + "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", "dev": true }, - "yargs": { - "version": "17.6.2", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.6.2.tgz", - "integrity": "sha512-1/9UrdHjDZc0eOU0HxOHoS78C69UD3JRMvzlJ7S79S2nTaWRA/whGCTV8o9e/N/1Va9YIV7Q4sOxD8VV4pCWOw==", + "node_modules/yargs": { + "version": "17.7.2", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", + "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==", "dev": true, - "requires": { + "dependencies": { "cliui": "^8.0.1", "escalade": "^3.1.1", "get-caller-file": "^2.0.5", @@ -30202,25 +18745,51 @@ "string-width": "^4.2.3", "y18n": "^5.0.5", "yargs-parser": "^21.1.1" + }, + "engines": { + "node": ">=12" } }, - "yargs-parser": { + "node_modules/yargs-parser": { "version": "21.1.1", "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", - "dev": true + "dev": true, + "engines": { + "node": ">=12" + } + }, + "node_modules/yargs/node_modules/cliui": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", + "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", + "dev": true, + "dependencies": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.1", + "wrap-ansi": "^7.0.0" + }, + "engines": { + "node": ">=12" + } }, - "yocto-queue": { + "node_modules/yocto-queue": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", - "dev": true + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } }, - "zone.js": { - "version": "0.11.6", - "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.11.6.tgz", - "integrity": "sha512-umJqFtKyZlPli669gB1gOrRE9hxUUGkZr7mo878z+NEBJZZixJkKeVYfnoLa7g25SseUDc92OZrMKKHySyJrFg==", - "requires": { + "node_modules/zone.js": { + "version": "0.13.3", + "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.13.3.tgz", + "integrity": "sha512-MKPbmZie6fASC/ps4dkmIhaT5eonHkEt6eAy80K42tAm0G2W+AahLJjbfi6X9NPdciOE9GRFTTM8u2IiF6O3ww==", + "dependencies": { "tslib": "^2.3.0" } } diff --git a/alcs-frontend/package.json b/alcs-frontend/package.json index 0d012ce30c..e6b4ed3838 100644 --- a/alcs-frontend/package.json +++ b/alcs-frontend/package.json @@ -15,47 +15,47 @@ }, "private": true, "dependencies": { - "@angular/animations": "^15.1.3", - "@angular/cdk": "^15.1.3", - "@angular/common": "^15.1.3", - "@angular/compiler": "^15.1.3", - "@angular/core": "^15.1.3", - "@angular/forms": "^15.1.3", - "@angular/material": "^15.1.3", - "@angular/material-moment-adapter": "^15.1.3", - "@angular/platform-browser": "^15.1.3", - "@angular/platform-browser-dynamic": "^15.1.3", - "@angular/router": "^15.1.3", - "@bcgov/bc-sans": "^1.0.1", - "@ng-matero/extensions": "^15.0.1", - "@ng-select/ng-option-highlight": "^0.0.7", + "@angular/animations": "^16.2.11", + "@angular/cdk": "^16.2.11", + "@angular/common": "^16.2.11", + "@angular/compiler": "^16.2.11", + "@angular/core": "^16.2.11", + "@angular/forms": "^16.2.11", + "@angular/material": "^16.2.11", + "@angular/material-moment-adapter": "^16.2.11", + "@angular/platform-browser": "^16.2.11", + "@angular/platform-browser-dynamic": "^16.2.11", + "@angular/router": "^16.2.11", + "@bcgov/bc-sans": "^2.1.0", + "@ng-matero/extensions": "^16.1.2", + "@ng-select/ng-option-highlight": "^11.2.0", "angular-mentions": "^1.5.0", "jwt-decode": "^3.1.2", "moment": "^2.29.4", - "moment-timezone": "^0.5.37", - "ngx-mask": "^15.0.3", - "rxjs": "~7.5.0", + "moment-timezone": "^0.5.43", + "ngx-mask": "^16.3.9", + "rxjs": "~7.8.1", "source-map-support": "^0.5.21", - "tslib": "^2.4.1", - "zone.js": "~0.11.4" + "tslib": "^2.6.2", + "zone.js": "~0.13.3" }, "devDependencies": { - "@angular-builders/jest": "^15.0.0", - "@angular-devkit/build-angular": "^15.1.4", - "@angular-eslint/builder": "14.1.2", - "@angular-eslint/eslint-plugin": "14.1.2", - "@angular-eslint/eslint-plugin-template": "14.1.2", - "@angular-eslint/schematics": "^15.2.0", - "@angular-eslint/template-parser": "14.1.2", - "@angular/cli": "~15.1.2", - "@angular/compiler-cli": "^15.1.3", - "@golevelup/ts-jest": "^0.3.4", - "@types/jest": "^28.1.1", - "@typescript-eslint/eslint-plugin": "5.37.0", - "@typescript-eslint/parser": "5.37.0", - "eslint": "^8.23.1", - "jest": "^28.1.3", - "prettier": "^2.8.3", - "typescript": "4.9.4" + "@angular-builders/jest": "^16.0.1", + "@angular-devkit/build-angular": "^16.2.9", + "@angular-eslint/builder": "^16.2.0", + "@angular-eslint/eslint-plugin": "^16.2.0", + "@angular-eslint/eslint-plugin-template": "^16.2.0", + "@angular-eslint/schematics": "^16.2.0", + "@angular-eslint/template-parser": "^16.2.0", + "@angular/cli": "~16.2.9", + "@angular/compiler-cli": "^16.2.11", + "@golevelup/ts-jest": "^0.4.0", + "@types/jest": "^29.5.7", + "@typescript-eslint/eslint-plugin": "6.9.1", + "@typescript-eslint/parser": "6.9.1", + "eslint": "^8.52.0", + "jest": "^29.7.0", + "prettier": "^3.0.3", + "typescript": "4.9.5" } } diff --git a/alcs-frontend/src/app/app-routing.module.ts b/alcs-frontend/src/app/app-routing.module.ts index 94d71b7f2f..ce5da50120 100644 --- a/alcs-frontend/src/app/app-routing.module.ts +++ b/alcs-frontend/src/app/app-routing.module.ts @@ -106,6 +106,7 @@ const routes: Routes = [ imports: [ RouterModule.forRoot(routes, { preloadingStrategy: PreloadAllModules, + enableTracing: true, }), ], exports: [RouterModule], diff --git a/alcs-frontend/src/app/features/admin/card-status/card-status-dialog/card-status-dialog.component.spec.ts b/alcs-frontend/src/app/features/admin/card-status/card-status-dialog/card-status-dialog.component.spec.ts index 89b844851c..f53c3b25cd 100644 --- a/alcs-frontend/src/app/features/admin/card-status/card-status-dialog/card-status-dialog.component.spec.ts +++ b/alcs-frontend/src/app/features/admin/card-status/card-status-dialog/card-status-dialog.component.spec.ts @@ -2,16 +2,19 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { CardStatusService } from '../../../../services/card/card-status/card-status.service'; -import { ApplicationDecisionConditionTypesService } from '../../../../services/application/application-decision-condition-types/application-decision-condition-types.service'; import { CardStatusDialogComponent } from './card-status-dialog.component'; describe('CardStatusDialogComponent', () => { let component: CardStatusDialogComponent; let fixture: ComponentFixture<CardStatusDialogComponent>; + let mockCardStatusService: DeepMocked<CardStatusService>; beforeEach(async () => { + mockCardStatusService = createMock(); + await TestBed.configureTestingModule({ imports: [ReactiveFormsModule, FormsModule], declarations: [CardStatusDialogComponent], @@ -20,7 +23,7 @@ describe('CardStatusDialogComponent', () => { { provide: MatDialogRef, useValue: {} }, { provide: CardStatusService, - useValue: {}, + useValue: mockCardStatusService, }, ], schemas: [NO_ERRORS_SCHEMA], @@ -28,6 +31,12 @@ describe('CardStatusDialogComponent', () => { fixture = TestBed.createComponent(CardStatusDialogComponent); component = fixture.componentInstance; + + mockCardStatusService.canDelete.mockResolvedValue({ + canDelete: false, + reason: '', + }); + fixture.detectChanges(); }); diff --git a/alcs-frontend/src/app/features/admin/ceo-criterion/ceo-criterion.component.ts b/alcs-frontend/src/app/features/admin/ceo-criterion/ceo-criterion.component.ts index 6c7adce43d..e6d8bb183f 100644 --- a/alcs-frontend/src/app/features/admin/ceo-criterion/ceo-criterion.component.ts +++ b/alcs-frontend/src/app/features/admin/ceo-criterion/ceo-criterion.component.ts @@ -1,6 +1,5 @@ import { Component, OnInit } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; -import { parse } from '@typescript-eslint/parser'; import { Subject } from 'rxjs'; import { CeoCriterionDto } from '../../../services/application/decision/application-decision-v1/application-decision.dto'; import { CeoCriterionService } from '../../../services/ceo-criterion/ceo-criterion.service'; diff --git a/alcs-frontend/src/app/features/application/decision/conditions/conditions.component.ts b/alcs-frontend/src/app/features/application/decision/conditions/conditions.component.ts index 8b84edc196..4853798278 100644 --- a/alcs-frontend/src/app/features/application/decision/conditions/conditions.component.ts +++ b/alcs-frontend/src/app/features/application/decision/conditions/conditions.component.ts @@ -40,7 +40,7 @@ export const CONDITION_STATUS = { }; @Component({ - selector: 'app-conditions', + selector: 'app-app-conditions', templateUrl: './conditions.component.html', styleUrls: ['./conditions.component.scss'], }) diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/basic/basic.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/basic/basic.component.ts index ab85edd3e9..3bbe0074cf 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/basic/basic.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/basic/basic.component.ts @@ -2,7 +2,7 @@ import { Component, EventEmitter, Input, Output } from '@angular/core'; import { ApplicationDecisionComponentDto } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; @Component({ - selector: 'app-basic', + selector: 'app-app-basic', templateUrl: './basic.component.html', styleUrls: ['./basic.component.scss'], }) diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pfrs/pfrs.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pfrs/pfrs.component.ts index b8b3304d59..94882d40e7 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pfrs/pfrs.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pfrs/pfrs.component.ts @@ -2,7 +2,7 @@ import { Component, EventEmitter, Input, Output } from '@angular/core'; import { ApplicationDecisionComponentDto } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; @Component({ - selector: 'app-pfrs', + selector: 'app-app-pfrs', templateUrl: './pfrs.component.html', styleUrls: ['./pfrs.component.scss'], }) diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pofo/pofo.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pofo/pofo.component.ts index 90b0ca0879..c4d5b9912c 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pofo/pofo.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pofo/pofo.component.ts @@ -2,7 +2,7 @@ import { Component, EventEmitter, Input, Output } from '@angular/core'; import { ApplicationDecisionComponentDto } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; @Component({ - selector: 'app-pofo', + selector: 'app-app-pofo', templateUrl: './pofo.component.html', styleUrls: ['./pofo.component.scss'], }) diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/roso/roso.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/roso/roso.component.ts index a6caddf3df..e3e7983691 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/roso/roso.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/roso/roso.component.ts @@ -2,7 +2,7 @@ import { Component, EventEmitter, Input, Output } from '@angular/core'; import { ApplicationDecisionComponentDto } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; @Component({ - selector: 'app-roso', + selector: 'app-app-roso', templateUrl: './roso.component.html', styleUrls: ['./roso.component.scss'], }) diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.html index b7101b2b8b..63d3ed6e30 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.html @@ -19,7 +19,7 @@ <h5>{{ data.applicationDecisionComponentType?.label }}</h5> </div> <div *ngIf="data.applicationDecisionComponentTypeCode === COMPONENT_TYPE.POFO" class="row-no-flex"> - <app-pofo-input [form]="form"></app-pofo-input> + <app-app-pofo-input [form]="form"></app-app-pofo-input> </div> <div *ngIf="data.applicationDecisionComponentTypeCode === COMPONENT_TYPE.ROSO" class="row-no-flex"> diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/pofo-input/pofo-input.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/pofo-input/pofo-input.component.ts index dc8f525fdc..1161cfeb36 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/pofo-input/pofo-input.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/pofo-input/pofo-input.component.ts @@ -2,7 +2,7 @@ import { Component, Input } from '@angular/core'; import { FormGroup } from '@angular/forms'; @Component({ - selector: 'app-pofo-input', + selector: 'app-app-pofo-input', templateUrl: './pofo-input.component.html', styleUrls: ['./pofo-input.component.scss'], }) diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-condition/decision-condition.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-condition/decision-condition.component.ts index 5b7a0808d3..127a55cde7 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-condition/decision-condition.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-condition/decision-condition.component.ts @@ -4,7 +4,7 @@ import { parseStringToBoolean } from '../../../../../../../shared/utils/boolean- import { SelectableComponent, TempApplicationDecisionConditionDto } from '../decision-conditions.component'; @Component({ - selector: 'app-decision-condition', + selector: 'app-app-decision-condition', templateUrl: './decision-condition.component.html', styleUrls: ['./decision-condition.component.scss'], }) diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-conditions.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-conditions.component.html index 029df03dfa..e5e262e144 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-conditions.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-conditions.component.html @@ -28,11 +28,11 @@ <h3>Conditions</h3> </mat-menu> <div class="condition" *ngFor="let condition of mappedConditions; let index = index; trackBy: trackByFn"> - <app-decision-condition + <app-app-decision-condition [(data)]="mappedConditions[index]" (dataChange)="onChanges()" (remove)="onRemoveCondition(index)" [selectableComponents]="selectableComponents" - ></app-decision-condition> + ></app-app-decision-condition> </div> </section> diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-conditions.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-conditions.component.ts index 21682af88e..d384aa0260 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-conditions.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-conditions.component.ts @@ -25,7 +25,7 @@ export type TempApplicationDecisionConditionDto = UpdateApplicationDecisionCondi export type SelectableComponent = { uuid?: string; tempId: string; decisionUuid: string; code: string; label: string }; @Component({ - selector: 'app-decision-conditions', + selector: 'app-app-decision-conditions', templateUrl: './decision-conditions.component.html', styleUrls: ['./decision-conditions.component.scss'], }) diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-file-upload-dialog/decision-document-upload-dialog.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-file-upload-dialog/decision-document-upload-dialog.component.ts index cf73a10386..56c5132c3e 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-file-upload-dialog/decision-document-upload-dialog.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-file-upload-dialog/decision-document-upload-dialog.component.ts @@ -8,7 +8,7 @@ import { ToastService } from '../../../../../../services/toast/toast.service'; import { DOCUMENT_SOURCE } from '../../../../../../shared/document/document.dto'; @Component({ - selector: 'app-decision-document-upload-dialog', + selector: 'app-app-decision-document-upload-dialog', templateUrl: './decision-document-upload-dialog.component.html', styleUrls: ['./decision-document-upload-dialog.component.scss'], }) diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.html index 6424b89c81..3a6ddf37d0 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.html @@ -201,14 +201,14 @@ <h3>Resolution</h3> </app-decision-components> <div> - <app-decision-conditions + <app-app-decision-conditions *ngIf="codes && showComponents && showConditions" [codes]="codes" [components]="components" [conditions]="conditions" (conditionsChange)="onConditionsChange($event)" [showError]="form.touched && conditionUpdates.length < 1 && showConditions" - ></app-decision-conditions> + ></app-app-decision-conditions> </div> <section> diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.html index 1adc7b6ee6..53f8bcf3d5 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.html @@ -175,11 +175,11 @@ <h5>{{ component.applicationDecisionComponentType?.label }}</h5> *ngIf="component.applicationDecisionComponentTypeCode === COMPONENT_TYPE.NFUP" [component]="component" > - <app-basic + <app-app-basic [component]="component" [fillRow]="true" (saveAlrArea)="onSaveAlrArea(decision.uuid, component.uuid, $event)" - ></app-basic> + ></app-app-basic> </app-nfup> <app-expiry-date @@ -190,59 +190,59 @@ <h5>{{ component.applicationDecisionComponentType?.label }}</h5> " [component]="component" > - <app-basic + <app-app-basic [component]="component" [fillRow]="true" (saveAlrArea)="onSaveAlrArea(decision.uuid, component.uuid, $event)" - ></app-basic + ></app-app-basic ></app-expiry-date> - <app-pofo + <app-app-pofo class="grid-2" *ngIf="component.applicationDecisionComponentTypeCode === COMPONENT_TYPE.POFO" [component]="component" > - <app-basic + <app-app-basic [component]="component" [fillRow]="true" (saveAlrArea)="onSaveAlrArea(decision.uuid, component.uuid, $event)" - ></app-basic - ></app-pofo> + ></app-app-basic + ></app-app-pofo> - <app-roso + <app-app-roso class="grid-2" *ngIf="component.applicationDecisionComponentTypeCode === COMPONENT_TYPE.ROSO" [component]="component" > - <app-basic + <app-app-basic [component]="component" [fillRow]="true" (saveAlrArea)="onSaveAlrArea(decision.uuid, component.uuid, $event)" - ></app-basic - ></app-roso> + ></app-app-basic + ></app-app-roso> - <app-pfrs + <app-app-pfrs class="grid-2" *ngIf="component.applicationDecisionComponentTypeCode === COMPONENT_TYPE.PFRS" [component]="component" > - <app-basic + <app-app-basic [component]="component" [fillRow]="true" (saveAlrArea)="onSaveAlrArea(decision.uuid, component.uuid, $event)" - ></app-basic - ></app-pfrs> + ></app-app-basic + ></app-app-pfrs> <app-naru class="grid-2" *ngIf="component.applicationDecisionComponentTypeCode === COMPONENT_TYPE.NARU" [component]="component" > - <app-basic + <app-app-basic [component]="component" [fillRow]="true" (saveAlrArea)="onSaveAlrArea(decision.uuid, component.uuid, $event)" - ></app-basic + ></app-app-basic ></app-naru> <app-subd @@ -250,11 +250,11 @@ <h5>{{ component.applicationDecisionComponentType?.label }}</h5> *ngIf="component.applicationDecisionComponentTypeCode === COMPONENT_TYPE.SUBD" [component]="component" > - <app-basic + <app-app-basic [component]="component" [fillRow]="true" (saveAlrArea)="onSaveAlrArea(decision.uuid, component.uuid, $event)" - ></app-basic + ></app-app-basic ></app-subd> <app-incl-excl @@ -265,11 +265,11 @@ <h5>{{ component.applicationDecisionComponentType?.label }}</h5> " [component]="component" > - <app-basic + <app-app-basic [component]="component" [fillRow]="true" (saveAlrArea)="onSaveAlrArea(decision.uuid, component.uuid, $event)" - ></app-basic + ></app-app-basic ></app-incl-excl> <div class="grid-2"> diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/revert-to-draft-dialog/revert-to-draft-dialog.component.spec.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/revert-to-draft-dialog/revert-to-draft-dialog.component.spec.ts index 715b315854..45e573e56f 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/revert-to-draft-dialog/revert-to-draft-dialog.component.spec.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/revert-to-draft-dialog/revert-to-draft-dialog.component.spec.ts @@ -1,6 +1,7 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { ApplicationSubmissionStatusService } from '../../../../../services/application/application-submission-status/application-submission-status.service'; import { RevertToDraftDialogComponent } from './revert-to-draft-dialog.component'; @@ -8,13 +9,16 @@ import { RevertToDraftDialogComponent } from './revert-to-draft-dialog.component describe('RevertToDraftDialogComponent', () => { let component: RevertToDraftDialogComponent; let fixture: ComponentFixture<RevertToDraftDialogComponent>; + let mockAppSubStatusService: DeepMocked<ApplicationSubmissionStatusService>; beforeEach(async () => { + mockAppSubStatusService = createMock(); + await TestBed.configureTestingModule({ declarations: [RevertToDraftDialogComponent], providers: [ { provide: MatDialogRef, useValue: {} }, - { provide: ApplicationSubmissionStatusService, useValue: {} }, + { provide: ApplicationSubmissionStatusService, useValue: mockAppSubStatusService }, { provide: MAT_DIALOG_DATA, useValue: {} }, ], schemas: [NO_ERRORS_SCHEMA], @@ -22,6 +26,9 @@ describe('RevertToDraftDialogComponent', () => { fixture = TestBed.createComponent(RevertToDraftDialogComponent); component = fixture.componentInstance; + + mockAppSubStatusService.fetchSubmissionStatusesByFileNumber.mockResolvedValue([]); + fixture.detectChanges(); }); diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/revert-to-draft-dialog/revert-to-draft-dialog.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/revert-to-draft-dialog/revert-to-draft-dialog.component.ts index c9a77874a7..a26e3917c6 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/revert-to-draft-dialog/revert-to-draft-dialog.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/revert-to-draft-dialog/revert-to-draft-dialog.component.ts @@ -5,7 +5,7 @@ import { SUBMISSION_STATUS } from '../../../../../services/application/applicati import { ApplicationSubmissionStatusPill } from '../../../../../shared/application-submission-status-type-pill/application-submission-status-type-pill.component'; @Component({ - selector: 'app-revert-to-draft-dialog', + selector: 'app-app-revert-to-draft-dialog', templateUrl: './revert-to-draft-dialog.component.html', styleUrls: ['./revert-to-draft-dialog.component.scss'], }) diff --git a/alcs-frontend/src/app/features/application/decision/decision.component.ts b/alcs-frontend/src/app/features/application/decision/decision.component.ts index aa04a71268..74169ea6fc 100644 --- a/alcs-frontend/src/app/features/application/decision/decision.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision.component.ts @@ -6,7 +6,7 @@ import { SYSTEM_SOURCE_TYPES } from '../../../shared/dto/system-source.types.dto import { decisionChildRoutes } from './decision.module'; @Component({ - selector: 'app-decision', + selector: 'app-app-decision', templateUrl: './decision.component.html', styleUrls: ['./decision.component.scss'], }) diff --git a/alcs-frontend/src/app/features/application/info-requests/info-requests.component.ts b/alcs-frontend/src/app/features/application/info-requests/info-requests.component.ts index 55f1ffb6ff..7da6860541 100644 --- a/alcs-frontend/src/app/features/application/info-requests/info-requests.component.ts +++ b/alcs-frontend/src/app/features/application/info-requests/info-requests.component.ts @@ -12,7 +12,7 @@ import { ConfirmationDialogService } from '../../../shared/confirmation-dialog/c import { InfoRequestDialogComponent, REASON_TYPE } from './info-rquest-dialog/info-request-dialog.component'; @Component({ - selector: 'app-info-requests', + selector: 'app-app-info-requests', templateUrl: './info-requests.component.html', styleUrls: ['./info-requests.component.scss'], }) diff --git a/alcs-frontend/src/app/features/application/info-requests/info-rquest-dialog/info-request-dialog.component.ts b/alcs-frontend/src/app/features/application/info-requests/info-rquest-dialog/info-request-dialog.component.ts index d07436dabc..443f298d21 100644 --- a/alcs-frontend/src/app/features/application/info-requests/info-rquest-dialog/info-request-dialog.component.ts +++ b/alcs-frontend/src/app/features/application/info-requests/info-rquest-dialog/info-request-dialog.component.ts @@ -22,7 +22,7 @@ export const REASON_TYPE = { }; @Component({ - selector: 'app-info-request-dialog', + selector: 'app-app-info-request-dialog', templateUrl: './info-request-dialog.component.html', styleUrls: ['./info-request-dialog.component.scss'], }) diff --git a/alcs-frontend/src/app/features/application/post-decision/edit-modification-dialog/edit-modification-dialog.component.spec.ts b/alcs-frontend/src/app/features/application/post-decision/edit-modification-dialog/edit-modification-dialog.component.spec.ts index bb72eddc3e..1f78ba7065 100644 --- a/alcs-frontend/src/app/features/application/post-decision/edit-modification-dialog/edit-modification-dialog.component.spec.ts +++ b/alcs-frontend/src/app/features/application/post-decision/edit-modification-dialog/edit-modification-dialog.component.spec.ts @@ -1,6 +1,7 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { ApplicationModificationService } from '../../../../services/application/application-modification/application-modification.service'; import { ApplicationDecisionService } from '../../../../services/application/decision/application-decision-v1/application-decision.service'; import { ToastService } from '../../../../services/toast/toast.service'; @@ -10,8 +11,11 @@ import { EditModificationDialogComponent } from './edit-modification-dialog.comp describe('EditModificationDialogComponent', () => { let component: EditModificationDialogComponent; let fixture: ComponentFixture<EditModificationDialogComponent>; + let mockDecisionService: DeepMocked<ApplicationDecisionService>; beforeEach(async () => { + mockDecisionService = createMock(); + await TestBed.configureTestingModule({ declarations: [EditModificationDialogComponent], providers: [ @@ -21,7 +25,7 @@ describe('EditModificationDialogComponent', () => { }, { provide: ApplicationDecisionService, - useValue: {}, + useValue: mockDecisionService, }, { provide: ToastService, @@ -40,6 +44,9 @@ describe('EditModificationDialogComponent', () => { fixture = TestBed.createComponent(EditModificationDialogComponent); component = fixture.componentInstance; + + mockDecisionService.fetchByApplication.mockResolvedValue({} as any); + fixture.detectChanges(); }); diff --git a/alcs-frontend/src/app/features/application/post-decision/edit-reconsideration-dialog/edit-reconsideration-dialog.component.spec.ts b/alcs-frontend/src/app/features/application/post-decision/edit-reconsideration-dialog/edit-reconsideration-dialog.component.spec.ts index 69f3e34c49..250a93bf1f 100644 --- a/alcs-frontend/src/app/features/application/post-decision/edit-reconsideration-dialog/edit-reconsideration-dialog.component.spec.ts +++ b/alcs-frontend/src/app/features/application/post-decision/edit-reconsideration-dialog/edit-reconsideration-dialog.component.spec.ts @@ -1,6 +1,7 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { ApplicationReconsiderationService } from '../../../../services/application/application-reconsideration/application-reconsideration.service'; import { ApplicationDecisionService } from '../../../../services/application/decision/application-decision-v1/application-decision.service'; import { ToastService } from '../../../../services/toast/toast.service'; @@ -10,8 +11,11 @@ import { EditReconsiderationDialogComponent } from './edit-reconsideration-dialo describe('EditReconsiderationDialogComponent', () => { let component: EditReconsiderationDialogComponent; let fixture: ComponentFixture<EditReconsiderationDialogComponent>; + let mockDecisionService: DeepMocked<ApplicationDecisionService>; beforeEach(async () => { + mockDecisionService = createMock(); + await TestBed.configureTestingModule({ declarations: [EditReconsiderationDialogComponent], providers: [ @@ -21,7 +25,7 @@ describe('EditReconsiderationDialogComponent', () => { }, { provide: ApplicationDecisionService, - useValue: {}, + useValue: mockDecisionService, }, { provide: ToastService, @@ -37,6 +41,9 @@ describe('EditReconsiderationDialogComponent', () => { }).compileComponents(); fixture = TestBed.createComponent(EditReconsiderationDialogComponent); + + mockDecisionService.fetchByApplication.mockResolvedValue([]); + component = fixture.componentInstance; fixture.detectChanges(); }); diff --git a/alcs-frontend/src/app/features/board/board.component.ts b/alcs-frontend/src/app/features/board/board.component.ts index ae6bfbe00d..33e83eea8e 100644 --- a/alcs-frontend/src/app/features/board/board.component.ts +++ b/alcs-frontend/src/app/features/board/board.component.ts @@ -489,7 +489,7 @@ export class BoardComponent implements OnInit, OnDestroy { data, }); - dialogRef.afterClosed().subscribe((isDirty) => { + dialogRef.beforeClosed().subscribe((isDirty) => { this.setUrl(); if (isDirty && this.selectedBoardCode) { diff --git a/alcs-frontend/src/app/features/board/dialogs/application/application-dialog.component.html b/alcs-frontend/src/app/features/board/dialogs/application/application-dialog.component.html index d10de71d06..272424e607 100644 --- a/alcs-frontend/src/app/features/board/dialogs/application/application-dialog.component.html +++ b/alcs-frontend/src/app/features/board/dialogs/application/application-dialog.component.html @@ -8,6 +8,7 @@ <h6 class="card-type-label">Application</h6> <div class="header-row"> <div class="left"> <h3 class="card-title"> + ` <span class="margin-right">{{ cardTitle }}</span> <app-application-legacy-id [legacyId]="application.legacyId"></app-application-legacy-id> <app-application-type-pill [type]="application.type"></app-application-type-pill> @@ -16,9 +17,7 @@ <h3 class="card-title"> <div class="center"> <button color="accent" [matMenuTriggerFor]="moreActions" mat-flat-button>More Actions â–¾</button> <mat-menu xPosition="before" #moreActions="matMenu"> - <button [mat-dialog-close]="isDirty" [routerLink]="['application', application.fileNumber]" mat-menu-item> - View Detail - </button> + <button [mat-dialog-close]="isDirty" (click)="goToDetailpage()" mat-menu-item>View Detail</button> <button [mat-dialog-close]="isDirty" [routerLink]="['application', application.fileNumber, 'info-request']" diff --git a/alcs-frontend/src/app/features/board/dialogs/application/application-dialog.component.ts b/alcs-frontend/src/app/features/board/dialogs/application/application-dialog.component.ts index 673ae390c2..bbc1e2ab34 100644 --- a/alcs-frontend/src/app/features/board/dialogs/application/application-dialog.component.ts +++ b/alcs-frontend/src/app/features/board/dialogs/application/application-dialog.component.ts @@ -32,9 +32,9 @@ export class ApplicationDialogComponent extends CardDialogComponent implements O constructor( @Inject(MAT_DIALOG_DATA) public data: ApplicationDto, - private dialogRef: MatDialogRef<ApplicationDialogComponent>, private applicationService: ApplicationService, private router: Router, + dialogRef: MatDialogRef<ApplicationDialogComponent>, userService: UserService, confirmationDialogService: ConfirmationDialogService, boardService: BoardService, @@ -119,4 +119,8 @@ export class ApplicationDialogComponent extends CardDialogComponent implements O }); } } + + async goToDetailpage() { + await this.router.navigateByUrl(`application/${this.application.fileNumber}`); + } } diff --git a/alcs-frontend/src/app/features/commissioner/commissioner.component.spec.ts b/alcs-frontend/src/app/features/commissioner/commissioner.component.spec.ts index 8da30e8384..bcf121aca4 100644 --- a/alcs-frontend/src/app/features/commissioner/commissioner.component.spec.ts +++ b/alcs-frontend/src/app/features/commissioner/commissioner.component.spec.ts @@ -1,6 +1,7 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { CommissionerService } from '../../services/commissioner/commissioner.service'; import { CommissionerComponent } from './commissioner.component'; @@ -8,15 +9,18 @@ import { CommissionerComponent } from './commissioner.component'; describe('CommissionerComponent', () => { let component: CommissionerComponent; let fixture: ComponentFixture<CommissionerComponent>; + let mockCommissionerService: DeepMocked<CommissionerService>; beforeEach(async () => { + mockCommissionerService = createMock(); + await TestBed.configureTestingModule({ imports: [RouterTestingModule], declarations: [CommissionerComponent], providers: [ { provide: CommissionerService, - useValue: {}, + useValue: mockCommissionerService, }, ], schemas: [NO_ERRORS_SCHEMA], @@ -24,6 +28,9 @@ describe('CommissionerComponent', () => { fixture = TestBed.createComponent(CommissionerComponent); component = fixture.componentInstance; + + mockCommissionerService.fetchApplication.mockResolvedValue({} as any); + fixture.detectChanges(); }); diff --git a/alcs-frontend/src/app/features/home/assigned/assigned.component.spec.ts b/alcs-frontend/src/app/features/home/assigned/assigned.component.spec.ts index b1f92eaa54..faaed9663b 100644 --- a/alcs-frontend/src/app/features/home/assigned/assigned.component.spec.ts +++ b/alcs-frontend/src/app/features/home/assigned/assigned.component.spec.ts @@ -1,6 +1,7 @@ import { EventEmitter, NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { ApplicationService } from '../../../services/application/application.service'; import { HomeService } from '../../../services/home/home.service'; @@ -9,8 +10,11 @@ import { AssignedComponent } from './assigned.component'; describe('AssignedComponent', () => { let component: AssignedComponent; let fixture: ComponentFixture<AssignedComponent>; + let mockHomeService: DeepMocked<HomeService>; beforeEach(async () => { + mockHomeService = createMock(); + await TestBed.configureTestingModule({ imports: [RouterTestingModule], providers: [ @@ -21,7 +25,7 @@ describe('AssignedComponent', () => { $cardStatuses: new EventEmitter(), }, }, - { provide: HomeService, useValue: {} }, + { provide: HomeService, useValue: mockHomeService }, ], declarations: [AssignedComponent], schemas: [NO_ERRORS_SCHEMA], @@ -29,6 +33,18 @@ describe('AssignedComponent', () => { fixture = TestBed.createComponent(AssignedComponent); component = fixture.componentInstance; + + mockHomeService.fetchAssignedToMe.mockResolvedValue({ + applications: [], + covenants: [], + modifications: [], + noticeOfIntentModifications: [], + planningReviews: [], + reconsiderations: [], + noticeOfIntents: [], + notifications: [], + }); + fixture.detectChanges(); }); diff --git a/alcs-frontend/src/app/features/home/subtask/subtask.component.spec.ts b/alcs-frontend/src/app/features/home/subtask/subtask.component.spec.ts index e079454aca..b3539585dc 100644 --- a/alcs-frontend/src/app/features/home/subtask/subtask.component.spec.ts +++ b/alcs-frontend/src/app/features/home/subtask/subtask.component.spec.ts @@ -16,6 +16,7 @@ describe('AuditComponent', () => { let fixture: ComponentFixture<SubtaskComponent>; let mockUserService: DeepMocked<UserService>; let mockAuthenticationService: DeepMocked<AuthenticationService>; + let mockHomeService: DeepMocked<HomeService>; beforeEach(async () => { mockUserService = createMock(); @@ -24,6 +25,8 @@ describe('AuditComponent', () => { mockAuthenticationService = createMock(); mockAuthenticationService.$currentUser = new BehaviorSubject<ICurrentUser | undefined>(undefined); + mockHomeService = createMock(); + await TestBed.configureTestingModule({ imports: [RouterTestingModule], providers: [ @@ -39,7 +42,7 @@ describe('AuditComponent', () => { provide: UserService, useValue: mockUserService, }, - { provide: HomeService, useValue: {} }, + { provide: HomeService, useValue: mockHomeService }, ], declarations: [SubtaskComponent], schemas: [NO_ERRORS_SCHEMA], diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/conditions/conditions.component.ts b/alcs-frontend/src/app/features/notice-of-intent/decision/conditions/conditions.component.ts index 174497db5a..68c58b233b 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/decision/conditions/conditions.component.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/conditions/conditions.component.ts @@ -38,7 +38,7 @@ export const CONDITION_STATUS = { }; @Component({ - selector: 'app-conditions', + selector: 'app-noi-conditions', templateUrl: './conditions.component.html', styleUrls: ['./conditions.component.scss'], }) diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/basic/basic.component.ts b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/basic/basic.component.ts index d642d55165..5e6df76c2e 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/basic/basic.component.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/basic/basic.component.ts @@ -2,7 +2,7 @@ import { Component, EventEmitter, Input, Output } from '@angular/core'; import { NoticeOfIntentDecisionComponentDto } from '../../../../../../services/notice-of-intent/decision/notice-of-intent-decision.dto'; @Component({ - selector: 'app-basic', + selector: 'app-noi-basic', templateUrl: './basic.component.html', styleUrls: ['./basic.component.scss'], }) diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/pfrs/pfrs.component.ts b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/pfrs/pfrs.component.ts index b97670a565..8b68a6244b 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/pfrs/pfrs.component.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/pfrs/pfrs.component.ts @@ -2,7 +2,7 @@ import { Component, Input } from '@angular/core'; import { NoticeOfIntentDecisionComponentDto } from '../../../../../../services/notice-of-intent/decision/notice-of-intent-decision.dto'; @Component({ - selector: 'app-pfrs', + selector: 'app-noi-pfrs', templateUrl: './pfrs.component.html', styleUrls: ['./pfrs.component.scss'], }) diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/pofo/pofo.component.ts b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/pofo/pofo.component.ts index d8082846da..de962933fc 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/pofo/pofo.component.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/pofo/pofo.component.ts @@ -2,7 +2,7 @@ import { Component, Input } from '@angular/core'; import { NoticeOfIntentDecisionComponentDto } from '../../../../../../services/notice-of-intent/decision/notice-of-intent-decision.dto'; @Component({ - selector: 'app-pofo', + selector: 'app-noi-pofo', templateUrl: './pofo.component.html', styleUrls: ['./pofo.component.scss'], }) diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/roso/roso.component.ts b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/roso/roso.component.ts index 773423f87f..4a9ef8fd27 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/roso/roso.component.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/roso/roso.component.ts @@ -2,7 +2,7 @@ import { Component, Input } from '@angular/core'; import { NoticeOfIntentDecisionComponentDto } from '../../../../../../services/notice-of-intent/decision/notice-of-intent-decision.dto'; @Component({ - selector: 'app-roso', + selector: 'app-noi-roso', templateUrl: './roso.component.html', styleUrls: ['./roso.component.scss'], }) diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.html b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.html index 3f8d3b0196..dcbf2561f5 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.html +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.html @@ -5,7 +5,7 @@ <h5>{{ data.noticeOfIntentDecisionComponentType?.label }}</h5> <form [formGroup]="form" class="decision-component-form"> <div *ngIf="data.noticeOfIntentDecisionComponentTypeCode === COMPONENT_TYPE.POFO" class="row-no-flex"> - <app-pofo-input [form]="form"></app-pofo-input> + <app-noi-pofo-input [form]="form"></app-noi-pofo-input> </div> <div *ngIf="data.noticeOfIntentDecisionComponentTypeCode === COMPONENT_TYPE.ROSO" class="row-no-flex"> diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/pofo-input/pofo-input.component.ts b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/pofo-input/pofo-input.component.ts index dc8f525fdc..a77813e4ca 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/pofo-input/pofo-input.component.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/pofo-input/pofo-input.component.ts @@ -2,7 +2,7 @@ import { Component, Input } from '@angular/core'; import { FormGroup } from '@angular/forms'; @Component({ - selector: 'app-pofo-input', + selector: 'app-noi-pofo-input', templateUrl: './pofo-input.component.html', styleUrls: ['./pofo-input.component.scss'], }) diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-conditions/decision-condition/decision-condition.component.ts b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-conditions/decision-condition/decision-condition.component.ts index d2c9d59f81..80a2895424 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-conditions/decision-condition/decision-condition.component.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-conditions/decision-condition/decision-condition.component.ts @@ -4,7 +4,7 @@ import { parseStringToBoolean } from '../../../../../../../shared/utils/boolean- import { SelectableComponent, TempNoticeOfIntentDecisionConditionDto } from '../decision-conditions.component'; @Component({ - selector: 'app-decision-condition', + selector: 'app-noi-decision-condition', templateUrl: './decision-condition.component.html', styleUrls: ['./decision-condition.component.scss'], }) diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-conditions/decision-conditions.component.html b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-conditions/decision-conditions.component.html index 029df03dfa..32e2452ce5 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-conditions/decision-conditions.component.html +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-conditions/decision-conditions.component.html @@ -28,11 +28,11 @@ <h3>Conditions</h3> </mat-menu> <div class="condition" *ngFor="let condition of mappedConditions; let index = index; trackBy: trackByFn"> - <app-decision-condition + <app-noi-decision-condition [(data)]="mappedConditions[index]" (dataChange)="onChanges()" (remove)="onRemoveCondition(index)" [selectableComponents]="selectableComponents" - ></app-decision-condition> + ></app-noi-decision-condition> </div> </section> diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-conditions/decision-conditions.component.ts b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-conditions/decision-conditions.component.ts index 0addc94d27..c5823ada0e 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-conditions/decision-conditions.component.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-conditions/decision-conditions.component.ts @@ -25,7 +25,7 @@ export type TempNoticeOfIntentDecisionConditionDto = UpdateNoticeOfIntentDecisio export type SelectableComponent = { uuid?: string; tempId: string; decisionUuid: string; code: string; label: string }; @Component({ - selector: 'app-decision-conditions', + selector: 'app-noi-decision-conditions', templateUrl: './decision-conditions.component.html', styleUrls: ['./decision-conditions.component.scss'], }) diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-file-upload-dialog/decision-document-upload-dialog.component.ts b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-file-upload-dialog/decision-document-upload-dialog.component.ts index 50fa2bedd6..b6945f20bc 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-file-upload-dialog/decision-document-upload-dialog.component.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-file-upload-dialog/decision-document-upload-dialog.component.ts @@ -8,7 +8,7 @@ import { ToastService } from '../../../../../../services/toast/toast.service'; import { DOCUMENT_SOURCE } from '../../../../../../shared/document/document.dto'; @Component({ - selector: 'app-decision-document-upload-dialog', + selector: 'app-noi-decision-document-upload-dialog', templateUrl: './decision-document-upload-dialog.component.html', styleUrls: ['./decision-document-upload-dialog.component.scss'], }) diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-input-v2.component.html b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-input-v2.component.html index 4bd28b7620..77a6911341 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-input-v2.component.html +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-input-v2.component.html @@ -179,14 +179,14 @@ <h3>Resolution</h3> </app-decision-components> <div> - <app-decision-conditions + <app-noi-decision-conditions *ngIf="codes && showComponents && showConditions" [codes]="codes" [components]="components" [conditions]="conditions" (conditionsChange)="onConditionsChange($event)" [showError]="form.touched && conditionUpdates.length < 1 && showConditions" - ></app-decision-conditions> + ></app-noi-decision-conditions> </div> <section> diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-v2.component.html b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-v2.component.html index 2ffb1673d2..f0eced6a20 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-v2.component.html +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-v2.component.html @@ -161,41 +161,41 @@ <h4>Components</h4> <ng-container *ngFor="let component of decision.components; let index = index"> <h5>{{ component.noticeOfIntentDecisionComponentType?.label }}</h5> <div> - <app-pofo + <app-noi-pofo class="grid-2" *ngIf="component.noticeOfIntentDecisionComponentTypeCode === COMPONENT_TYPE.POFO" [component]="component" > - <app-basic + <app-noi-basic [component]="component" [fillRow]="true" (saveAlrArea)="onSaveAlrArea(decision.uuid, component.uuid, $event)" - ></app-basic> - </app-pofo> + ></app-noi-basic> + </app-noi-pofo> - <app-roso + <app-noi-roso class="grid-2" *ngIf="component.noticeOfIntentDecisionComponentTypeCode === COMPONENT_TYPE.ROSO" [component]="component" > - <app-basic + <app-noi-basic [component]="component" [fillRow]="true" (saveAlrArea)="onSaveAlrArea(decision.uuid, component.uuid, $event)" - ></app-basic> - </app-roso> + ></app-noi-basic> + </app-noi-roso> - <app-pfrs + <app-noi-pfrs class="grid-2" *ngIf="component.noticeOfIntentDecisionComponentTypeCode === COMPONENT_TYPE.PFRS" [component]="component" > - <app-basic + <app-noi-basic [component]="component" [fillRow]="true" (saveAlrArea)="onSaveAlrArea(decision.uuid, component.uuid, $event)" - ></app-basic> - </app-pfrs> + ></app-noi-basic> + </app-noi-pfrs> <div class="grid-2"> <div> diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/revert-to-draft-dialog/revert-to-draft-dialog.component.spec.ts b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/revert-to-draft-dialog/revert-to-draft-dialog.component.spec.ts index dfa843d347..0502f749ec 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/revert-to-draft-dialog/revert-to-draft-dialog.component.spec.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/revert-to-draft-dialog/revert-to-draft-dialog.component.spec.ts @@ -1,6 +1,7 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { NoticeOfIntentSubmissionStatusService } from '../../../../../services/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service'; import { RevertToDraftDialogComponent } from './revert-to-draft-dialog.component'; @@ -8,13 +9,16 @@ import { RevertToDraftDialogComponent } from './revert-to-draft-dialog.component describe('RevertToDraftDialogComponent', () => { let component: RevertToDraftDialogComponent; let fixture: ComponentFixture<RevertToDraftDialogComponent>; + let mockNOISubStatusService: DeepMocked<NoticeOfIntentSubmissionStatusService>; beforeEach(async () => { + mockNOISubStatusService = createMock(); + await TestBed.configureTestingModule({ declarations: [RevertToDraftDialogComponent], providers: [ { provide: MatDialogRef, useValue: {} }, - { provide: NoticeOfIntentSubmissionStatusService, useValue: {} }, + { provide: NoticeOfIntentSubmissionStatusService, useValue: mockNOISubStatusService }, { provide: MAT_DIALOG_DATA, useValue: {} }, ], schemas: [NO_ERRORS_SCHEMA], @@ -22,6 +26,9 @@ describe('RevertToDraftDialogComponent', () => { fixture = TestBed.createComponent(RevertToDraftDialogComponent); component = fixture.componentInstance; + + mockNOISubStatusService.fetchSubmissionStatusesByFileNumber.mockResolvedValue([]); + fixture.detectChanges(); }); diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/revert-to-draft-dialog/revert-to-draft-dialog.component.ts b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/revert-to-draft-dialog/revert-to-draft-dialog.component.ts index faec1414a0..d90fcdc3a1 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/revert-to-draft-dialog/revert-to-draft-dialog.component.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/revert-to-draft-dialog/revert-to-draft-dialog.component.ts @@ -5,7 +5,7 @@ import { NoticeOfIntentSubmissionStatusService } from '../../../../../services/n import { ApplicationSubmissionStatusPill } from '../../../../../shared/application-submission-status-type-pill/application-submission-status-type-pill.component'; @Component({ - selector: 'app-revert-to-draft-dialog', + selector: 'app-noi-revert-to-draft-dialog', templateUrl: './revert-to-draft-dialog.component.html', styleUrls: ['./revert-to-draft-dialog.component.scss'], }) diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision.component.ts b/alcs-frontend/src/app/features/notice-of-intent/decision/decision.component.ts index b66c07d007..e1c85bae4d 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/decision/decision.component.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision.component.ts @@ -5,7 +5,7 @@ import { NoticeOfIntentDto } from '../../../services/notice-of-intent/notice-of- import { SYSTEM_SOURCE_TYPES } from '../../../shared/dto/system-source.types.dto'; @Component({ - selector: 'app-decision', + selector: 'app-noi-decision', templateUrl: './decision.component.html', styleUrls: ['./decision.component.scss'], }) diff --git a/alcs-frontend/src/app/features/notice-of-intent/info-requests/info-request-dialog/info-request-dialog.component.ts b/alcs-frontend/src/app/features/notice-of-intent/info-requests/info-request-dialog/info-request-dialog.component.ts index 2225024f71..f0d9952b19 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/info-requests/info-request-dialog/info-request-dialog.component.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/info-requests/info-request-dialog/info-request-dialog.component.ts @@ -22,7 +22,7 @@ export const REASON_TYPE = { }; @Component({ - selector: 'app-info-request-dialog', + selector: 'app-noi-info-request-dialog', templateUrl: './info-request-dialog.component.html', styleUrls: ['./info-request-dialog.component.scss'], }) diff --git a/alcs-frontend/src/app/features/notice-of-intent/info-requests/info-requests.component.ts b/alcs-frontend/src/app/features/notice-of-intent/info-requests/info-requests.component.ts index 174de6eddc..bed17c40bc 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/info-requests/info-requests.component.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/info-requests/info-requests.component.ts @@ -12,7 +12,7 @@ import { ConfirmationDialogService } from '../../../shared/confirmation-dialog/c import { InfoRequestDialogComponent, REASON_TYPE } from './info-request-dialog/info-request-dialog.component'; @Component({ - selector: 'app-info-requests', + selector: 'app-noi-info-requests', templateUrl: './info-requests.component.html', styleUrls: ['./info-requests.component.scss'], }) diff --git a/alcs-frontend/src/app/features/notice-of-intent/post-decision/edit-modification-dialog/edit-modification-dialog.component.spec.ts b/alcs-frontend/src/app/features/notice-of-intent/post-decision/edit-modification-dialog/edit-modification-dialog.component.spec.ts index 5d11ce61fb..8498c401e3 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/post-decision/edit-modification-dialog/edit-modification-dialog.component.spec.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/post-decision/edit-modification-dialog/edit-modification-dialog.component.spec.ts @@ -1,6 +1,7 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { NoticeOfIntentDecisionService } from '../../../../services/notice-of-intent/decision/notice-of-intent-decision.service'; import { NoticeOfIntentModificationService } from '../../../../services/notice-of-intent/notice-of-intent-modification/notice-of-intent-modification.service'; import { ToastService } from '../../../../services/toast/toast.service'; @@ -10,8 +11,11 @@ import { EditModificationDialogComponent } from './edit-modification-dialog.comp describe('EditModificationDialogComponent', () => { let component: EditModificationDialogComponent; let fixture: ComponentFixture<EditModificationDialogComponent>; + let mockDecisionService: DeepMocked<NoticeOfIntentDecisionService>; beforeEach(async () => { + mockDecisionService = createMock(); + await TestBed.configureTestingModule({ declarations: [EditModificationDialogComponent], providers: [ @@ -21,7 +25,7 @@ describe('EditModificationDialogComponent', () => { }, { provide: NoticeOfIntentDecisionService, - useValue: {}, + useValue: mockDecisionService, }, { provide: ToastService, diff --git a/alcs-frontend/src/app/features/notification/overview/uncancel-notification-dialog/uncancel-notification-dialog.component.ts b/alcs-frontend/src/app/features/notification/overview/uncancel-notification-dialog/uncancel-notification-dialog.component.ts index 1e5c97aa7e..00daa1f6b3 100644 --- a/alcs-frontend/src/app/features/notification/overview/uncancel-notification-dialog/uncancel-notification-dialog.component.ts +++ b/alcs-frontend/src/app/features/notification/overview/uncancel-notification-dialog/uncancel-notification-dialog.component.ts @@ -7,7 +7,7 @@ import { NotificationSubmissionToSubmissionStatusDto } from '../../../../service import { ApplicationSubmissionStatusPill } from '../../../../shared/application-submission-status-type-pill/application-submission-status-type-pill.component'; @Component({ - selector: 'app-uncancel-notice-of-intent-dialog', + selector: 'app-noti-uncancel-notice-of-intent-dialog', templateUrl: './uncancel-notification-dialog.component.html', styleUrls: ['./uncancel-notification-dialog.component.scss'], }) diff --git a/alcs-frontend/src/app/shared/commenting/comments.component.spec.ts b/alcs-frontend/src/app/shared/commenting/comments.component.spec.ts index 3e3d18fe2b..660dd1f3df 100644 --- a/alcs-frontend/src/app/shared/commenting/comments.component.spec.ts +++ b/alcs-frontend/src/app/shared/commenting/comments.component.spec.ts @@ -15,8 +15,10 @@ describe('CommentsComponent', () => { let component: CommentsComponent; let fixture: ComponentFixture<CommentsComponent>; let mockUserService: DeepMocked<UserService>; + let mockCommentService: DeepMocked<CommentService>; beforeEach(async () => { + mockCommentService = createMock(); mockUserService = createMock(); mockUserService.$assignableUsers = new BehaviorSubject<AssigneeDto[]>([]); @@ -24,7 +26,7 @@ describe('CommentsComponent', () => { providers: [ { provide: CommentService, - useValue: {}, + useValue: mockCommentService, }, { provide: UserService, @@ -56,6 +58,8 @@ describe('CommentsComponent', () => { mentions: [], }; + mockCommentService.fetchComments.mockResolvedValue([]); + fixture.detectChanges(); }); diff --git a/alcs-frontend/src/app/shared/header/notifications/notifications.component.spec.ts b/alcs-frontend/src/app/shared/header/notifications/notifications.component.spec.ts index e9d79ab38e..a7dad96c3e 100644 --- a/alcs-frontend/src/app/shared/header/notifications/notifications.component.spec.ts +++ b/alcs-frontend/src/app/shared/header/notifications/notifications.component.spec.ts @@ -2,6 +2,7 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MatMenuModule } from '@angular/material/menu'; import { RouterTestingModule } from '@angular/router/testing'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { MessageService } from '../../../services/message/message.service'; import { NotificationsComponent } from './notifications.component'; @@ -9,14 +10,17 @@ import { NotificationsComponent } from './notifications.component'; describe('NotificationsComponent', () => { let component: NotificationsComponent; let fixture: ComponentFixture<NotificationsComponent>; + let mockMessageService: DeepMocked<MessageService>; beforeEach(async () => { + mockMessageService = createMock(); + await TestBed.configureTestingModule({ imports: [RouterTestingModule, MatMenuModule], providers: [ { provide: MessageService, - useValue: {}, + useValue: mockMessageService, }, ], declarations: [NotificationsComponent], @@ -25,6 +29,9 @@ describe('NotificationsComponent', () => { fixture = TestBed.createComponent(NotificationsComponent); component = fixture.componentInstance; + + mockMessageService.fetchMyNotifications.mockResolvedValue([]); + fixture.detectChanges(); }); diff --git a/alcs-frontend/src/app/shared/header/notifications/notifications.component.ts b/alcs-frontend/src/app/shared/header/notifications/notifications.component.ts index d96af69cff..e4f22c6d30 100644 --- a/alcs-frontend/src/app/shared/header/notifications/notifications.component.ts +++ b/alcs-frontend/src/app/shared/header/notifications/notifications.component.ts @@ -24,14 +24,14 @@ export class NotificationsComponent implements OnInit { hasUnread = false; unreadCount = 0; - constructor(private router: Router, private notificationService: MessageService) {} + constructor(private router: Router, private messageService: MessageService) {} ngOnInit(): void { this.loadNotifications(); } async loadNotifications() { - const notifications = await this.notificationService.fetchMyNotifications(); + const notifications = await this.messageService.fetchMyNotifications(); this.formattedNotifications = notifications.map((notification) => ({ ...notification, @@ -52,7 +52,7 @@ export class NotificationsComponent implements OnInit { } async onSelectNotification(notification: FormattedNotification) { - await this.notificationService.markRead(notification.uuid); + await this.messageService.markRead(notification.uuid); this.formattedNotifications = this.formattedNotifications.map((formattedNotification) => ({ ...formattedNotification, read: formattedNotification.uuid === notification.uuid ? true : formattedNotification.read, @@ -75,7 +75,7 @@ export class NotificationsComponent implements OnInit { async onMarkAllRead($event: MouseEvent) { $event.stopPropagation(); - await this.notificationService.markAllRead(); + await this.messageService.markAllRead(); this.formattedNotifications = this.formattedNotifications.map((notification) => ({ ...notification, read: true, diff --git a/alcs-frontend/src/app/shared/lots-table/lots-table-form.component.spec.ts b/alcs-frontend/src/app/shared/lots-table/lots-table-form.component.spec.ts index ffde6b07e5..3986834a1b 100644 --- a/alcs-frontend/src/app/shared/lots-table/lots-table-form.component.spec.ts +++ b/alcs-frontend/src/app/shared/lots-table/lots-table-form.component.spec.ts @@ -1,3 +1,4 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { LotsTableFormComponent } from './lots-table-form.component'; @@ -9,6 +10,7 @@ describe('LotsTableComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ declarations: [LotsTableFormComponent], + schemas: [NO_ERRORS_SCHEMA], }).compileComponents(); fixture = TestBed.createComponent(LotsTableFormComponent); diff --git a/alcs-frontend/src/styles.scss b/alcs-frontend/src/styles.scss index 1f64919524..c865196401 100644 --- a/alcs-frontend/src/styles.scss +++ b/alcs-frontend/src/styles.scss @@ -305,6 +305,15 @@ mat-button-toggle-group { display: none !important; } +.mat-mdc-cell { + font-size: 16px; +} + +.mat-mdc-header-cell { + font-size: 16px; + font-weight: 700 !important; +} + @mixin text-ellipsis($lines: 1) { text-overflow: ellipsis; overflow: hidden; diff --git a/portal-frontend/Dockerfile b/portal-frontend/Dockerfile index 5600b73cff..8b3f351595 100644 --- a/portal-frontend/Dockerfile +++ b/portal-frontend/Dockerfile @@ -1,5 +1,5 @@ ###### Install dependencies only when needed ###### -FROM node:18.12-alpine AS build +FROM node:20-alpine AS build # Make /app as working directory WORKDIR /app diff --git a/portal-frontend/package-lock.json b/portal-frontend/package-lock.json index e33fe2459b..a781f50aa8 100644 --- a/portal-frontend/package-lock.json +++ b/portal-frontend/package-lock.json @@ -1,54 +1,63 @@ { "name": "portal-frontend", "version": "0.0.0", - "lockfileVersion": 2, + "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "portal-frontend", "version": "0.0.0", "dependencies": { - "@angular/animations": "^15.1.1", - "@angular/common": "^15.1.1", - "@angular/compiler": "^15.1.1", - "@angular/core": "^15.1.1", - "@angular/forms": "^15.1.1", - "@angular/material": "^15.1.1", - "@angular/material-moment-adapter": "^15.1.1", - "@angular/platform-browser": "^15.1.1", - "@angular/platform-browser-dynamic": "^15.1.1", - "@angular/router": "^15.1.1", - "@bcgov/bc-sans": "^1.0.1", + "@angular/animations": "^16.2.11", + "@angular/common": "^16.2.11", + "@angular/compiler": "^16.2.11", + "@angular/core": "^16.2.11", + "@angular/forms": "^16.2.11", + "@angular/material": "^16.2.11", + "@angular/material-moment-adapter": "^16.2.11", + "@angular/platform-browser": "^16.2.11", + "@angular/platform-browser-dynamic": "^16.2.11", + "@angular/router": "^16.2.11", + "@bcgov/bc-sans": "^2.1.0", "jwt-decode": "^3.1.2", - "ngx-mask": "^15.0.2", - "rxjs": "~7.5.0", + "ngx-mask": "^16.3.9", + "rxjs": "~7.8.1", "source-map-support": "^0.5.21", - "tslib": "^2.4.1", - "zone.js": "~0.11.4" + "tslib": "^2.6.2", + "zone.js": "~0.13.3" }, "devDependencies": { - "@angular-builders/jest": "^15.0.0", - "@angular-devkit/build-angular": "^15.1.2", - "@angular/cli": "~15.1.2", - "@angular/compiler-cli": "^15.1.1", - "@golevelup/ts-jest": "^0.3.4", - "@types/jest": "^28.1.1", - "@typescript-eslint/eslint-plugin": "5.49.0", - "@typescript-eslint/parser": "5.49.0", - "eslint": "^8.32.0", - "jest": "^28.1.3", - "jest-preset-angular": "^12.2.5", - "prettier": "^2.8.3", + "@angular-builders/jest": "^16.0.1", + "@angular-devkit/build-angular": "^16.2.9", + "@angular/cli": "~16.2.9", + "@angular/compiler-cli": "^16.2.11", + "@golevelup/ts-jest": "^0.4.0", + "@types/jest": "^29.5.7", + "@typescript-eslint/eslint-plugin": "5.62.0", + "@typescript-eslint/parser": "5.62.0", + "eslint": "^8.52.0", + "jest": "^29.7.0", + "jest-preset-angular": "^13.1.2", + "prettier": "^2.8.8", "typescript": "4.9.4" } }, + "node_modules/@aashutoshrathi/word-wrap": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz", + "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/@ampproject/remapping": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz", - "integrity": "sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==", + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.1.tgz", + "integrity": "sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==", "dev": true, "dependencies": { - "@jridgewell/gen-mapping": "^0.1.0", + "@jridgewell/gen-mapping": "^0.3.0", "@jridgewell/trace-mapping": "^0.3.9" }, "engines": { @@ -56,14 +65,14 @@ } }, "node_modules/@angular-builders/jest": { - "version": "15.0.0", - "resolved": "https://registry.npmjs.org/@angular-builders/jest/-/jest-15.0.0.tgz", - "integrity": "sha512-rJpO4QAsAXBXvkTI8E5kHxhLJEh6JR8iBYH3tHuXeTkABgifH+IRdDNWjogHTy32ratnhUPEaMOpPPDryIL+tw==", + "version": "16.0.1", + "resolved": "https://registry.npmjs.org/@angular-builders/jest/-/jest-16.0.1.tgz", + "integrity": "sha512-FuYkfy8JwdfTHevjgs8z18sXt0egcWbSSkefyM/QsGVkMHs+b4N4xzV20MQtyx0Yc6nJzuknIH5ZvDwLYUDPyQ==", "dev": true, "dependencies": { - "@angular-devkit/architect": ">=0.1500.0 < 0.1600.0", - "@angular-devkit/core": "^15.0.0", - "jest-preset-angular": "12.2.3", + "@angular-devkit/architect": ">=0.1600.0 < 0.1700.0", + "@angular-devkit/core": "^16.0.0", + "jest-preset-angular": "13.1.1", "lodash": "^4.17.15", "tsconfig-paths": "^4.1.0" }, @@ -71,24 +80,25 @@ "node": "^14.20.0 || ^16.13.0 || >=18.10.0" }, "peerDependencies": { - "@angular-devkit/build-angular": "^15.0.0", - "@angular/compiler-cli": "^15.0.0", - "@angular/core": "^15.0.0", - "@angular/platform-browser-dynamic": "^15.0.0", - "jest": ">=28" + "@angular-devkit/build-angular": "^16.0.0", + "@angular/compiler-cli": "^16.0.0", + "@angular/core": "^16.0.0", + "@angular/platform-browser-dynamic": "^16.0.0", + "jest": ">=29" } }, "node_modules/@angular-builders/jest/node_modules/jest-preset-angular": { - "version": "12.2.3", - "resolved": "https://registry.npmjs.org/jest-preset-angular/-/jest-preset-angular-12.2.3.tgz", - "integrity": "sha512-9vgawXuki/lg4IRPtl5k83krWLKADTal7BBm06xNAWOK09AbHK1foXqZdVOMObsWbaMDeQ1cjba60vS/aEVY4Q==", + "version": "13.1.1", + "resolved": "https://registry.npmjs.org/jest-preset-angular/-/jest-preset-angular-13.1.1.tgz", + "integrity": "sha512-X8i7icKt9U5uhj7YKqdEZm7ZZPvNFRxfBnU+9SALdIkHYJhwtlJ5/MUk9wo4f3lX2smOkIl9LPJUu1APO+11Jg==", "dev": true, "dependencies": { "bs-logger": "^0.2.6", "esbuild-wasm": ">=0.13.8", - "jest-environment-jsdom": "^28.0.0", - "pretty-format": "^28.0.0", - "ts-jest": "^28.0.0" + "jest-environment-jsdom": "^29.0.0", + "jest-util": "^29.0.0", + "pretty-format": "^29.0.0", + "ts-jest": "^29.0.0" }, "engines": { "node": "^14.15.0 || >=16.10.0" @@ -97,80 +107,64 @@ "esbuild": ">=0.13.8" }, "peerDependencies": { - "@angular-devkit/build-angular": ">=12.2.18 <16.0.0", - "@angular/compiler-cli": ">=12.2.16 <16.0.0", - "@angular/core": ">=12.2.16 <16.0.0", - "@angular/platform-browser-dynamic": ">=12.2.16 <16.0.0", - "jest": "^28.0.0", + "@angular-devkit/build-angular": ">=13.0.0 <17.0.0", + "@angular/compiler-cli": ">=13.0.0 <17.0.0", + "@angular/core": ">=13.0.0 <17.0.0", + "@angular/platform-browser-dynamic": ">=13.0.0 <17.0.0", + "jest": "^29.0.0", "typescript": ">=4.4" } }, "node_modules/@angular-devkit/architect": { - "version": "0.1501.2", - "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1501.2.tgz", - "integrity": "sha512-AfORVGLN0FBIUXO3FkfGOKu+Gz6oJjF8Bu8cPn27duiI0wszxGNY3fATKwbSg7JcKx1oQS/G7RjyC5OiTA6a0Q==", + "version": "0.1602.9", + "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1602.9.tgz", + "integrity": "sha512-U3vfb/e2sFfg0D9FyyRBXRPP7g4FBFtGK8Q3JPmvAVsHHwi5AUFRNR7YBChB/T5TMNY077HcTyEirVh2FeUpdA==", "dev": true, "dependencies": { - "@angular-devkit/core": "15.1.2", - "rxjs": "6.6.7" + "@angular-devkit/core": "16.2.9", + "rxjs": "7.8.1" }, "engines": { - "node": "^14.20.0 || ^16.13.0 || >=18.10.0", + "node": "^16.14.0 || >=18.10.0", "npm": "^6.11.0 || ^7.5.6 || >=8.0.0", "yarn": ">= 1.13.0" } }, - "node_modules/@angular-devkit/architect/node_modules/rxjs": { - "version": "6.6.7", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", - "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", - "dev": true, - "dependencies": { - "tslib": "^1.9.0" - }, - "engines": { - "npm": ">=2.0.0" - } - }, - "node_modules/@angular-devkit/architect/node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", - "dev": true - }, "node_modules/@angular-devkit/build-angular": { - "version": "15.1.2", - "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-15.1.2.tgz", - "integrity": "sha512-8udBKfHo3c/hOuh6VB11UKQZcqbolcNW2smtM9HJMm3fcykvyFEIitoCyl/tgraST+14/kA4aiINdl4EQ4BanQ==", - "dev": true, - "dependencies": { - "@ampproject/remapping": "2.2.0", - "@angular-devkit/architect": "0.1501.2", - "@angular-devkit/build-webpack": "0.1501.2", - "@angular-devkit/core": "15.1.2", - "@babel/core": "7.20.12", - "@babel/generator": "7.20.7", - "@babel/helper-annotate-as-pure": "7.18.6", + "version": "16.2.9", + "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-16.2.9.tgz", + "integrity": "sha512-S1C4UYxRVyNt3C0wCxbT2jZ1dN5i37kS0mol3PQjbR8gQ0GQzHmzhjTBl1oImo8aouET9yhrk9etk65oat4mBQ==", + "dev": true, + "dependencies": { + "@ampproject/remapping": "2.2.1", + "@angular-devkit/architect": "0.1602.9", + "@angular-devkit/build-webpack": "0.1602.9", + "@angular-devkit/core": "16.2.9", + "@babel/core": "7.22.9", + "@babel/generator": "7.22.9", + "@babel/helper-annotate-as-pure": "7.22.5", + "@babel/helper-split-export-declaration": "7.22.6", "@babel/plugin-proposal-async-generator-functions": "7.20.7", - "@babel/plugin-transform-async-to-generator": "7.20.7", - "@babel/plugin-transform-runtime": "7.19.6", - "@babel/preset-env": "7.20.2", - "@babel/runtime": "7.20.7", - "@babel/template": "7.20.7", + "@babel/plugin-transform-async-to-generator": "7.22.5", + "@babel/plugin-transform-runtime": "7.22.9", + "@babel/preset-env": "7.22.9", + "@babel/runtime": "7.22.6", + "@babel/template": "7.22.5", "@discoveryjs/json-ext": "0.5.7", - "@ngtools/webpack": "15.1.2", + "@ngtools/webpack": "16.2.9", + "@vitejs/plugin-basic-ssl": "1.0.1", "ansi-colors": "4.1.3", - "autoprefixer": "10.4.13", - "babel-loader": "9.1.2", + "autoprefixer": "10.4.14", + "babel-loader": "9.1.3", "babel-plugin-istanbul": "6.1.1", - "browserslist": "4.21.4", - "cacache": "17.0.4", + "browserslist": "^4.21.5", "chokidar": "3.5.3", "copy-webpack-plugin": "11.0.0", - "critters": "0.0.16", - "css-loader": "6.7.3", - "esbuild-wasm": "0.16.17", - "glob": "8.0.3", + "critters": "0.0.20", + "css-loader": "6.8.1", + "esbuild-wasm": "0.18.17", + "fast-glob": "3.3.1", + "guess-parser": "0.4.22", "https-proxy-agent": "5.0.1", "inquirer": "8.2.4", "jsonc-parser": "3.2.0", @@ -179,49 +173,54 @@ "less-loader": "11.1.0", "license-webpack-plugin": "4.0.2", "loader-utils": "3.2.1", - "magic-string": "0.27.0", - "mini-css-extract-plugin": "2.7.2", - "open": "8.4.0", + "magic-string": "0.30.1", + "mini-css-extract-plugin": "2.7.6", + "mrmime": "1.0.1", + "open": "8.4.2", "ora": "5.4.1", - "parse5-html-rewriting-stream": "6.0.1", - "piscina": "3.2.0", - "postcss": "8.4.21", - "postcss-loader": "7.0.2", + "parse5-html-rewriting-stream": "7.0.0", + "picomatch": "2.3.1", + "piscina": "4.0.0", + "postcss": "8.4.31", + "postcss-loader": "7.3.3", "resolve-url-loader": "5.0.0", - "rxjs": "6.6.7", - "sass": "1.57.1", - "sass-loader": "13.2.0", - "semver": "7.3.8", + "rxjs": "7.8.1", + "sass": "1.64.1", + "sass-loader": "13.3.2", + "semver": "7.5.4", "source-map-loader": "4.0.1", "source-map-support": "0.5.21", - "terser": "5.16.1", + "terser": "5.19.2", "text-table": "0.2.0", "tree-kill": "1.2.2", - "tslib": "2.4.1", - "webpack": "5.75.0", - "webpack-dev-middleware": "6.0.1", - "webpack-dev-server": "4.11.1", - "webpack-merge": "5.8.0", + "tslib": "2.6.1", + "vite": "4.4.7", + "webpack": "5.88.2", + "webpack-dev-middleware": "6.1.1", + "webpack-dev-server": "4.15.1", + "webpack-merge": "5.9.0", "webpack-subresource-integrity": "5.1.0" }, "engines": { - "node": "^14.20.0 || ^16.13.0 || >=18.10.0", + "node": "^16.14.0 || >=18.10.0", "npm": "^6.11.0 || ^7.5.6 || >=8.0.0", "yarn": ">= 1.13.0" }, "optionalDependencies": { - "esbuild": "0.16.17" + "esbuild": "0.18.17" }, "peerDependencies": { - "@angular/compiler-cli": "^15.0.0", - "@angular/localize": "^15.0.0", - "@angular/platform-server": "^15.0.0", - "@angular/service-worker": "^15.0.0", + "@angular/compiler-cli": "^16.0.0", + "@angular/localize": "^16.0.0", + "@angular/platform-server": "^16.0.0", + "@angular/service-worker": "^16.0.0", + "jest": "^29.5.0", + "jest-environment-jsdom": "^29.5.0", "karma": "^6.3.0", - "ng-packagr": "^15.0.0", + "ng-packagr": "^16.0.0", "protractor": "^7.0.0", "tailwindcss": "^2.0.0 || ^3.0.0", - "typescript": ">=4.8.2 <5.0" + "typescript": ">=4.9.3 <5.2" }, "peerDependenciesMeta": { "@angular/localize": { @@ -233,6 +232,12 @@ "@angular/service-worker": { "optional": true }, + "jest": { + "optional": true + }, + "jest-environment-jsdom": { + "optional": true + }, "karma": { "optional": true }, @@ -247,74 +252,23 @@ } } }, - "node_modules/@angular-devkit/build-angular/node_modules/@babel/core": { - "version": "7.20.12", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.20.12.tgz", - "integrity": "sha512-XsMfHovsUYHFMdrIHkZphTN/2Hzzi78R08NuHfDBehym2VsPDL6Zn/JAD/JQdnRvbSsbQc4mVaU1m6JgtTEElg==", - "dev": true, - "dependencies": { - "@ampproject/remapping": "^2.1.0", - "@babel/code-frame": "^7.18.6", - "@babel/generator": "^7.20.7", - "@babel/helper-compilation-targets": "^7.20.7", - "@babel/helper-module-transforms": "^7.20.11", - "@babel/helpers": "^7.20.7", - "@babel/parser": "^7.20.7", - "@babel/template": "^7.20.7", - "@babel/traverse": "^7.20.12", - "@babel/types": "^7.20.7", - "convert-source-map": "^1.7.0", - "debug": "^4.1.0", - "gensync": "^1.0.0-beta.2", - "json5": "^2.2.2", - "semver": "^6.3.0" - }, - "engines": { - "node": ">=6.9.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/babel" - } - }, - "node_modules/@angular-devkit/build-angular/node_modules/@babel/core/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true, - "bin": { - "semver": "bin/semver.js" - } - }, - "node_modules/@angular-devkit/build-angular/node_modules/rxjs": { - "version": "6.6.7", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", - "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", - "dev": true, - "dependencies": { - "tslib": "^1.9.0" - }, - "engines": { - "npm": ">=2.0.0" - } - }, - "node_modules/@angular-devkit/build-angular/node_modules/rxjs/node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "node_modules/@angular-devkit/build-angular/node_modules/tslib": { + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.1.tgz", + "integrity": "sha512-t0hLfiEKfMUoqhG+U1oid7Pva4bbDPHYfJNiB7BiIjRkj1pyC++4N3huJfqY6aRH6VTB0rvtzQwjM4K6qpfOig==", "dev": true }, "node_modules/@angular-devkit/build-webpack": { - "version": "0.1501.2", - "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1501.2.tgz", - "integrity": "sha512-FzslFvjuAabwtz2wMTCeemYCJA4NqRECz+WEsEZbtwESBMmKdaqmpbdW9ypsepB2iC7eIbHK43R95XAM75utTw==", + "version": "0.1602.9", + "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1602.9.tgz", + "integrity": "sha512-+3IxovfBPR2Vy730mGa0SVKkd5LQVom85gjXOs7WcnnnZmfc1q/BtFlqTgW1UWvTxP8IQdm7UYWVclQfL/WExw==", "dev": true, "dependencies": { - "@angular-devkit/architect": "0.1501.2", - "rxjs": "6.6.7" + "@angular-devkit/architect": "0.1602.9", + "rxjs": "7.8.1" }, "engines": { - "node": "^14.20.0 || ^16.13.0 || >=18.10.0", + "node": "^16.14.0 || >=18.10.0", "npm": "^6.11.0 || ^7.5.6 || >=8.0.0", "yarn": ">= 1.13.0" }, @@ -323,38 +277,21 @@ "webpack-dev-server": "^4.0.0" } }, - "node_modules/@angular-devkit/build-webpack/node_modules/rxjs": { - "version": "6.6.7", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", - "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", - "dev": true, - "dependencies": { - "tslib": "^1.9.0" - }, - "engines": { - "npm": ">=2.0.0" - } - }, - "node_modules/@angular-devkit/build-webpack/node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", - "dev": true - }, "node_modules/@angular-devkit/core": { - "version": "15.1.2", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-15.1.2.tgz", - "integrity": "sha512-wkLZYvTZt30Ge6Z83Gxsr6mO1TIHCu3SImdE0zwW63EdU9o1NYkU74z1D9VUZ9Up7uHi1cHs/dssbxUuZ4eWOA==", + "version": "16.2.9", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-16.2.9.tgz", + "integrity": "sha512-dcHWjHBNGm3yCeNz19y8A1At4KgyC6XHNnbFL0y+nnZYiaESXjUoXJYKASedI6A+Bpl0HNq2URhH6bL6Af3+4w==", "dev": true, "dependencies": { "ajv": "8.12.0", "ajv-formats": "2.1.1", "jsonc-parser": "3.2.0", - "rxjs": "6.6.7", + "picomatch": "2.3.1", + "rxjs": "7.8.1", "source-map": "0.7.4" }, "engines": { - "node": "^14.20.0 || ^16.13.0 || >=18.10.0", + "node": "^16.14.0 || >=18.10.0", "npm": "^6.11.0 || ^7.5.6 || >=8.0.0", "yarn": ">= 1.13.0" }, @@ -367,78 +304,42 @@ } } }, - "node_modules/@angular-devkit/core/node_modules/rxjs": { - "version": "6.6.7", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", - "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", - "dev": true, - "dependencies": { - "tslib": "^1.9.0" - }, - "engines": { - "npm": ">=2.0.0" - } - }, - "node_modules/@angular-devkit/core/node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", - "dev": true - }, "node_modules/@angular-devkit/schematics": { - "version": "15.1.2", - "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-15.1.2.tgz", - "integrity": "sha512-HjJPm+4SS5TdAHHvdpXLv25wsvwVOn5RYs0A9MazTndlm80ct3PKeYUgakNDRFjRj8uORNlJMKmQIIhUSDjFsw==", + "version": "16.2.9", + "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-16.2.9.tgz", + "integrity": "sha512-lB51CGCILpcSI37CwKUAGDLxMqh7zmuRbiPo9s9mSkCM4ccqxFlaL+VFTq2/laneARD6aikpOHnkVm5myNzQPw==", "dev": true, "dependencies": { - "@angular-devkit/core": "15.1.2", + "@angular-devkit/core": "16.2.9", "jsonc-parser": "3.2.0", - "magic-string": "0.27.0", + "magic-string": "0.30.1", "ora": "5.4.1", - "rxjs": "6.6.7" + "rxjs": "7.8.1" }, "engines": { - "node": "^14.20.0 || ^16.13.0 || >=18.10.0", + "node": "^16.14.0 || >=18.10.0", "npm": "^6.11.0 || ^7.5.6 || >=8.0.0", "yarn": ">= 1.13.0" } }, - "node_modules/@angular-devkit/schematics/node_modules/rxjs": { - "version": "6.6.7", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", - "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", - "dev": true, - "dependencies": { - "tslib": "^1.9.0" - }, - "engines": { - "npm": ">=2.0.0" - } - }, - "node_modules/@angular-devkit/schematics/node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", - "dev": true - }, "node_modules/@angular/animations": { - "version": "15.1.1", - "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-15.1.1.tgz", - "integrity": "sha512-oQrbO7uDsw1VcqhuSqvwQQPxEUjmssMM3nDbFUrs6A0MX7XIuhGnkB7mN35M6ZSd0Chj9DMzgbrYToPg1LoLHQ==", + "version": "16.2.11", + "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-16.2.11.tgz", + "integrity": "sha512-xdLYXsGi7OuJawhiVIppl2VkPHhPdxUP/nR6+ETR3TdAscVruCWJs4z9XKval4fbik/brekbFNFuYtlx6csDhQ==", "dependencies": { "tslib": "^2.3.0" }, "engines": { - "node": "^14.20.0 || ^16.13.0 || >=18.10.0" + "node": "^16.14.0 || >=18.10.0" }, "peerDependencies": { - "@angular/core": "15.1.1" + "@angular/core": "16.2.11" } }, "node_modules/@angular/cdk": { - "version": "15.1.1", - "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-15.1.1.tgz", - "integrity": "sha512-99zaW+EqS/pJh2BLxC+L+/mAyaC3oncRUqRL4WWLENZI2lqD6mCe/kRYDL57WbSZaI54Of38u9GhkBVA/0rn7A==", + "version": "16.2.11", + "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-16.2.11.tgz", + "integrity": "sha512-FcJ9xd9ptjULdScnBNg7YkVnY9NKePFfmvvs2zt841Hd489L8BUkTUdbvtCLhMJTTSN+k+D+RYFhevZuhPKVVg==", "peer": true, "dependencies": { "tslib": "^2.3.0" @@ -447,72 +348,72 @@ "parse5": "^7.1.2" }, "peerDependencies": { - "@angular/common": "^15.0.0 || ^16.0.0", - "@angular/core": "^15.0.0 || ^16.0.0", + "@angular/common": "^16.0.0 || ^17.0.0", + "@angular/core": "^16.0.0 || ^17.0.0", "rxjs": "^6.5.3 || ^7.4.0" } }, "node_modules/@angular/cli": { - "version": "15.1.2", - "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-15.1.2.tgz", - "integrity": "sha512-h42k410W6PPnz9KjX8dCtruMqf1mHgIf7UWrLa8icKpk03U2SIgoJzaXgY/spSHiMGIdDnY1dAYKWV0GQS4zEg==", + "version": "16.2.9", + "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-16.2.9.tgz", + "integrity": "sha512-wkpV/Ni26LUeDmhee2TPXXEq3feEdZMSG8+nkfUK9kqIcxm0IjI1GLPeiVOX7aQobuKNe2cCAFNwsrXWjj+2og==", "dev": true, "dependencies": { - "@angular-devkit/architect": "0.1501.2", - "@angular-devkit/core": "15.1.2", - "@angular-devkit/schematics": "15.1.2", - "@schematics/angular": "15.1.2", + "@angular-devkit/architect": "0.1602.9", + "@angular-devkit/core": "16.2.9", + "@angular-devkit/schematics": "16.2.9", + "@schematics/angular": "16.2.9", "@yarnpkg/lockfile": "1.1.0", "ansi-colors": "4.1.3", - "ini": "3.0.1", + "ini": "4.1.1", "inquirer": "8.2.4", "jsonc-parser": "3.2.0", "npm-package-arg": "10.1.0", "npm-pick-manifest": "8.0.1", - "open": "8.4.0", + "open": "8.4.2", "ora": "5.4.1", - "pacote": "15.0.8", - "resolve": "1.22.1", - "semver": "7.3.8", + "pacote": "15.2.0", + "resolve": "1.22.2", + "semver": "7.5.4", "symbol-observable": "4.0.0", - "yargs": "17.6.2" + "yargs": "17.7.2" }, "bin": { "ng": "bin/ng.js" }, "engines": { - "node": "^14.20.0 || ^16.13.0 || >=18.10.0", + "node": "^16.14.0 || >=18.10.0", "npm": "^6.11.0 || ^7.5.6 || >=8.0.0", "yarn": ">= 1.13.0" } }, "node_modules/@angular/common": { - "version": "15.1.1", - "resolved": "https://registry.npmjs.org/@angular/common/-/common-15.1.1.tgz", - "integrity": "sha512-P4f2rK/YBQQT4clQrcQ9goLf53RS63Q1x2d1dvz7Syr3gcOUyxO7NZQ7Au5afzvbIKZ5Okd+X0+TCGV4q9wQjw==", + "version": "16.2.11", + "resolved": "https://registry.npmjs.org/@angular/common/-/common-16.2.11.tgz", + "integrity": "sha512-h80WUR2OYlqxQy+4XgNtWT2vB+vZ6oCrFX/q8cU5jAvbvGQfJuH0zfcbSlUflStmAhk5/OT25F0mt96cqapEAw==", "dependencies": { "tslib": "^2.3.0" }, "engines": { - "node": "^14.20.0 || ^16.13.0 || >=18.10.0" + "node": "^16.14.0 || >=18.10.0" }, "peerDependencies": { - "@angular/core": "15.1.1", + "@angular/core": "16.2.11", "rxjs": "^6.5.3 || ^7.4.0" } }, "node_modules/@angular/compiler": { - "version": "15.1.1", - "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-15.1.1.tgz", - "integrity": "sha512-A35iXLTTDEej4F2tm5t1flA+5Tv+jYAkQx+d0xvH6LDiWvsiDsOe5OjP8L2LD8dejwWl/JYUz2TH0JZcvw0uqA==", + "version": "16.2.11", + "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-16.2.11.tgz", + "integrity": "sha512-9q/E3uurvoQbdTTWDyWCLpzmfJ4+et7SUca1/EljD/X7Xg2FNU5GpTMutBtWFL7wDyWk1oswivuq9/C4GVW7fA==", "dependencies": { "tslib": "^2.3.0" }, "engines": { - "node": "^14.20.0 || ^16.13.0 || >=18.10.0" + "node": "^16.14.0 || >=18.10.0" }, "peerDependencies": { - "@angular/core": "15.1.1" + "@angular/core": "16.2.11" }, "peerDependenciesMeta": { "@angular/core": { @@ -521,17 +422,15 @@ } }, "node_modules/@angular/compiler-cli": { - "version": "15.1.1", - "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-15.1.1.tgz", - "integrity": "sha512-sBYvh6Y08aKuZPAVwzT1YGVfG63xeXElEfAfq6No9FLUHDo83QB9fU7ovXnu1RJFJiVIy16DHjmTpAmgvlomGA==", + "version": "16.2.11", + "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-16.2.11.tgz", + "integrity": "sha512-ZtZCXfkVBH78HUm2Byf+WX3Y6WzQK9EXYXNU/ni1rvSZ1vLNwieLDfWb/xwiO7QojrHZTym1RJ10jTMinTguqw==", "dev": true, "dependencies": { - "@babel/core": "7.19.3", + "@babel/core": "7.23.2", "@jridgewell/sourcemap-codec": "^1.4.14", "chokidar": "^3.0.0", "convert-source-map": "^1.5.1", - "dependency-graph": "^0.11.0", - "magic-string": "^0.27.0", "reflect-metadata": "^0.1.2", "semver": "^7.0.0", "tslib": "^2.3.0", @@ -540,139 +439,213 @@ "bin": { "ng-xi18n": "bundles/src/bin/ng_xi18n.js", "ngc": "bundles/src/bin/ngc.js", - "ngcc": "bundles/ngcc/main-ngcc.js" + "ngcc": "bundles/ngcc/index.js" }, "engines": { - "node": "^14.20.0 || ^16.13.0 || >=18.10.0" + "node": "^16.14.0 || >=18.10.0" }, "peerDependencies": { - "@angular/compiler": "15.1.1", - "typescript": ">=4.8.2 <5.0" + "@angular/compiler": "16.2.11", + "typescript": ">=4.9.3 <5.2" + } + }, + "node_modules/@angular/compiler-cli/node_modules/@babel/core": { + "version": "7.23.2", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.2.tgz", + "integrity": "sha512-n7s51eWdaWZ3vGT2tD4T7J6eJs3QoBXydv7vkUM06Bf1cbVD2Kc2UrkzhiQwobfV7NwOnQXYL7UBJ5VPU+RGoQ==", + "dev": true, + "dependencies": { + "@ampproject/remapping": "^2.2.0", + "@babel/code-frame": "^7.22.13", + "@babel/generator": "^7.23.0", + "@babel/helper-compilation-targets": "^7.22.15", + "@babel/helper-module-transforms": "^7.23.0", + "@babel/helpers": "^7.23.2", + "@babel/parser": "^7.23.0", + "@babel/template": "^7.22.15", + "@babel/traverse": "^7.23.2", + "@babel/types": "^7.23.0", + "convert-source-map": "^2.0.0", + "debug": "^4.1.0", + "gensync": "^1.0.0-beta.2", + "json5": "^2.2.3", + "semver": "^6.3.1" + }, + "engines": { + "node": ">=6.9.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/babel" + } + }, + "node_modules/@angular/compiler-cli/node_modules/@babel/core/node_modules/convert-source-map": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", + "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", + "dev": true + }, + "node_modules/@angular/compiler-cli/node_modules/@babel/core/node_modules/semver": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "dev": true, + "bin": { + "semver": "bin/semver.js" + } + }, + "node_modules/@angular/compiler-cli/node_modules/@babel/generator": { + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.0.tgz", + "integrity": "sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==", + "dev": true, + "dependencies": { + "@babel/types": "^7.23.0", + "@jridgewell/gen-mapping": "^0.3.2", + "@jridgewell/trace-mapping": "^0.3.17", + "jsesc": "^2.5.1" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@angular/compiler-cli/node_modules/@babel/template": { + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz", + "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==", + "dev": true, + "dependencies": { + "@babel/code-frame": "^7.22.13", + "@babel/parser": "^7.22.15", + "@babel/types": "^7.22.15" + }, + "engines": { + "node": ">=6.9.0" } }, "node_modules/@angular/core": { - "version": "15.1.1", - "resolved": "https://registry.npmjs.org/@angular/core/-/core-15.1.1.tgz", - "integrity": "sha512-nsz+IXdkQanAGhqA2vcwTrGGyw5zIm3TgtYQ/JqK185qkmlhsQfSRvdSPsFPhmIFYp9ngZVUbkhY3D4P3gDzIg==", + "version": "16.2.11", + "resolved": "https://registry.npmjs.org/@angular/core/-/core-16.2.11.tgz", + "integrity": "sha512-Jb+7/p1vczQRQ3iC1QxUS5cE4X1hPVAvbrFnyMpSx6Pq5o274v/lK6PvhUZrfKrp9FxFp9pN+WHjUqNFqOuJZg==", "dependencies": { "tslib": "^2.3.0" }, "engines": { - "node": "^14.20.0 || ^16.13.0 || >=18.10.0" + "node": "^16.14.0 || >=18.10.0" }, "peerDependencies": { "rxjs": "^6.5.3 || ^7.4.0", - "zone.js": "~0.11.4 || ~0.12.0" + "zone.js": "~0.13.0" } }, "node_modules/@angular/forms": { - "version": "15.1.1", - "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-15.1.1.tgz", - "integrity": "sha512-1c/oZD+eSbGzDCcmC+hOqkPH+AzLOiGHxII5QiOOj8so8M958UBrsFBwrnLz06d9OK5Z4IrR4UL2JJspZNbpjw==", + "version": "16.2.11", + "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-16.2.11.tgz", + "integrity": "sha512-2powweUorehB1opfev6/sUeb3Bdey+Txq4gjI1Qdeo9c9OgtaKu6wK0KXgoism8HXXRFcGHMfS0dUVoDPVrtiQ==", "dependencies": { "tslib": "^2.3.0" }, "engines": { - "node": "^14.20.0 || ^16.13.0 || >=18.10.0" + "node": "^16.14.0 || >=18.10.0" }, "peerDependencies": { - "@angular/common": "15.1.1", - "@angular/core": "15.1.1", - "@angular/platform-browser": "15.1.1", + "@angular/common": "16.2.11", + "@angular/core": "16.2.11", + "@angular/platform-browser": "16.2.11", "rxjs": "^6.5.3 || ^7.4.0" } }, "node_modules/@angular/material": { - "version": "15.1.1", - "resolved": "https://registry.npmjs.org/@angular/material/-/material-15.1.1.tgz", - "integrity": "sha512-QhyTJv9CnimXKXb4LCH93ovJVAdnoHyElwspl80PcfAV/6A6VrRQAflFoul0WL4WPrV50DG7TWYiEwHPpblbCw==", - "dependencies": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/auto-init": "15.0.0-canary.684e33d25.0", - "@material/banner": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/button": "15.0.0-canary.684e33d25.0", - "@material/card": "15.0.0-canary.684e33d25.0", - "@material/checkbox": "15.0.0-canary.684e33d25.0", - "@material/chips": "15.0.0-canary.684e33d25.0", - "@material/circular-progress": "15.0.0-canary.684e33d25.0", - "@material/data-table": "15.0.0-canary.684e33d25.0", - "@material/density": "15.0.0-canary.684e33d25.0", - "@material/dialog": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/drawer": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/fab": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/floating-label": "15.0.0-canary.684e33d25.0", - "@material/form-field": "15.0.0-canary.684e33d25.0", - "@material/icon-button": "15.0.0-canary.684e33d25.0", - "@material/image-list": "15.0.0-canary.684e33d25.0", - "@material/layout-grid": "15.0.0-canary.684e33d25.0", - "@material/line-ripple": "15.0.0-canary.684e33d25.0", - "@material/linear-progress": "15.0.0-canary.684e33d25.0", - "@material/list": "15.0.0-canary.684e33d25.0", - "@material/menu": "15.0.0-canary.684e33d25.0", - "@material/menu-surface": "15.0.0-canary.684e33d25.0", - "@material/notched-outline": "15.0.0-canary.684e33d25.0", - "@material/radio": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/segmented-button": "15.0.0-canary.684e33d25.0", - "@material/select": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/slider": "15.0.0-canary.684e33d25.0", - "@material/snackbar": "15.0.0-canary.684e33d25.0", - "@material/switch": "15.0.0-canary.684e33d25.0", - "@material/tab": "15.0.0-canary.684e33d25.0", - "@material/tab-bar": "15.0.0-canary.684e33d25.0", - "@material/tab-indicator": "15.0.0-canary.684e33d25.0", - "@material/tab-scroller": "15.0.0-canary.684e33d25.0", - "@material/textfield": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tooltip": "15.0.0-canary.684e33d25.0", - "@material/top-app-bar": "15.0.0-canary.684e33d25.0", - "@material/touch-target": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", + "version": "16.2.11", + "resolved": "https://registry.npmjs.org/@angular/material/-/material-16.2.11.tgz", + "integrity": "sha512-hrkRD9/38++nIyo3k/KQpxsIaWm+FOJVmoJa83qvwZZt+fHKfT7xaNvRPZ+L2oqFaAvH5ivnL1u1nDuDyWz/0w==", + "dependencies": { + "@material/animation": "15.0.0-canary.bc9ae6c9c.0", + "@material/auto-init": "15.0.0-canary.bc9ae6c9c.0", + "@material/banner": "15.0.0-canary.bc9ae6c9c.0", + "@material/base": "15.0.0-canary.bc9ae6c9c.0", + "@material/button": "15.0.0-canary.bc9ae6c9c.0", + "@material/card": "15.0.0-canary.bc9ae6c9c.0", + "@material/checkbox": "15.0.0-canary.bc9ae6c9c.0", + "@material/chips": "15.0.0-canary.bc9ae6c9c.0", + "@material/circular-progress": "15.0.0-canary.bc9ae6c9c.0", + "@material/data-table": "15.0.0-canary.bc9ae6c9c.0", + "@material/density": "15.0.0-canary.bc9ae6c9c.0", + "@material/dialog": "15.0.0-canary.bc9ae6c9c.0", + "@material/dom": "15.0.0-canary.bc9ae6c9c.0", + "@material/drawer": "15.0.0-canary.bc9ae6c9c.0", + "@material/elevation": "15.0.0-canary.bc9ae6c9c.0", + "@material/fab": "15.0.0-canary.bc9ae6c9c.0", + "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0", + "@material/floating-label": "15.0.0-canary.bc9ae6c9c.0", + "@material/form-field": "15.0.0-canary.bc9ae6c9c.0", + "@material/icon-button": "15.0.0-canary.bc9ae6c9c.0", + "@material/image-list": "15.0.0-canary.bc9ae6c9c.0", + "@material/layout-grid": "15.0.0-canary.bc9ae6c9c.0", + "@material/line-ripple": "15.0.0-canary.bc9ae6c9c.0", + "@material/linear-progress": "15.0.0-canary.bc9ae6c9c.0", + "@material/list": "15.0.0-canary.bc9ae6c9c.0", + "@material/menu": "15.0.0-canary.bc9ae6c9c.0", + "@material/menu-surface": "15.0.0-canary.bc9ae6c9c.0", + "@material/notched-outline": "15.0.0-canary.bc9ae6c9c.0", + "@material/radio": "15.0.0-canary.bc9ae6c9c.0", + "@material/ripple": "15.0.0-canary.bc9ae6c9c.0", + "@material/rtl": "15.0.0-canary.bc9ae6c9c.0", + "@material/segmented-button": "15.0.0-canary.bc9ae6c9c.0", + "@material/select": "15.0.0-canary.bc9ae6c9c.0", + "@material/shape": "15.0.0-canary.bc9ae6c9c.0", + "@material/slider": "15.0.0-canary.bc9ae6c9c.0", + "@material/snackbar": "15.0.0-canary.bc9ae6c9c.0", + "@material/switch": "15.0.0-canary.bc9ae6c9c.0", + "@material/tab": "15.0.0-canary.bc9ae6c9c.0", + "@material/tab-bar": "15.0.0-canary.bc9ae6c9c.0", + "@material/tab-indicator": "15.0.0-canary.bc9ae6c9c.0", + "@material/tab-scroller": "15.0.0-canary.bc9ae6c9c.0", + "@material/textfield": "15.0.0-canary.bc9ae6c9c.0", + "@material/theme": "15.0.0-canary.bc9ae6c9c.0", + "@material/tooltip": "15.0.0-canary.bc9ae6c9c.0", + "@material/top-app-bar": "15.0.0-canary.bc9ae6c9c.0", + "@material/touch-target": "15.0.0-canary.bc9ae6c9c.0", + "@material/typography": "15.0.0-canary.bc9ae6c9c.0", "tslib": "^2.3.0" }, "peerDependencies": { - "@angular/animations": "^15.0.0 || ^16.0.0", - "@angular/cdk": "15.1.1", - "@angular/common": "^15.0.0 || ^16.0.0", - "@angular/core": "^15.0.0 || ^16.0.0", - "@angular/forms": "^15.0.0 || ^16.0.0", - "@angular/platform-browser": "^15.0.0 || ^16.0.0", + "@angular/animations": "^16.0.0 || ^17.0.0", + "@angular/cdk": "16.2.11", + "@angular/common": "^16.0.0 || ^17.0.0", + "@angular/core": "^16.0.0 || ^17.0.0", + "@angular/forms": "^16.0.0 || ^17.0.0", + "@angular/platform-browser": "^16.0.0 || ^17.0.0", "rxjs": "^6.5.3 || ^7.4.0" } }, "node_modules/@angular/material-moment-adapter": { - "version": "15.1.1", - "resolved": "https://registry.npmjs.org/@angular/material-moment-adapter/-/material-moment-adapter-15.1.1.tgz", - "integrity": "sha512-1o4+JnnUjreL+keQbw4bUCkrRXVbG05hj1lH8Fg2B2co/sUfq7ISwLTb2jvFhodX6n2rzUHbskZ3w1nFVhN9GQ==", + "version": "16.2.11", + "resolved": "https://registry.npmjs.org/@angular/material-moment-adapter/-/material-moment-adapter-16.2.11.tgz", + "integrity": "sha512-vAwWi1GehmqrgOcaAnL6C6EAfr6q6liZqyNyrGC+xaNChqLD2TrzOo9qljIGiYdkRm1p36Fe4BOdBFjh+73EwQ==", "dependencies": { "tslib": "^2.3.0" }, "peerDependencies": { - "@angular/core": "^15.0.0 || ^16.0.0", - "@angular/material": "15.1.1", + "@angular/core": "^16.0.0 || ^17.0.0", + "@angular/material": "16.2.11", "moment": "^2.18.1" } }, "node_modules/@angular/platform-browser": { - "version": "15.1.1", - "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-15.1.1.tgz", - "integrity": "sha512-U1MXowvyigmMpffsnMQI6e9gX7tA6Su7unY0pjN5u9wRYJIkEbKuFyVijguQ83bt+JK3ZBHXD0dvskYnscGUzg==", + "version": "16.2.11", + "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-16.2.11.tgz", + "integrity": "sha512-gUptbI3lbaRg+L8rcTlxKtFunYmR/M/mm9/l9uRd+5qk2mnFI0+s/tzRoaq7K0XaRGKZiWLNTz6FTkviO1zo2g==", "dependencies": { "tslib": "^2.3.0" }, "engines": { - "node": "^14.20.0 || ^16.13.0 || >=18.10.0" + "node": "^16.14.0 || >=18.10.0" }, "peerDependencies": { - "@angular/animations": "15.1.1", - "@angular/common": "15.1.1", - "@angular/core": "15.1.1" + "@angular/animations": "16.2.11", + "@angular/common": "16.2.11", + "@angular/core": "16.2.11" }, "peerDependenciesMeta": { "@angular/animations": { @@ -681,36 +654,36 @@ } }, "node_modules/@angular/platform-browser-dynamic": { - "version": "15.1.1", - "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-15.1.1.tgz", - "integrity": "sha512-iCbvYduSGtyBWuQfTzm/MDZy7Rd5MNsjpknEtJ45nbjZzv9EL1tGo6qufaTgPXHP8Nbfcco/4UO9w84Gp5irLA==", + "version": "16.2.11", + "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-16.2.11.tgz", + "integrity": "sha512-e+A7z6MUJaqC4Fdq7XQfIhAox3ZPM1lczM6G08fUKPbFDEe+c9i7C8YRLL+69BXDuG790btugIeOQcn5lnJcFg==", "dependencies": { "tslib": "^2.3.0" }, "engines": { - "node": "^14.20.0 || ^16.13.0 || >=18.10.0" + "node": "^16.14.0 || >=18.10.0" }, "peerDependencies": { - "@angular/common": "15.1.1", - "@angular/compiler": "15.1.1", - "@angular/core": "15.1.1", - "@angular/platform-browser": "15.1.1" + "@angular/common": "16.2.11", + "@angular/compiler": "16.2.11", + "@angular/core": "16.2.11", + "@angular/platform-browser": "16.2.11" } }, "node_modules/@angular/router": { - "version": "15.1.1", - "resolved": "https://registry.npmjs.org/@angular/router/-/router-15.1.1.tgz", - "integrity": "sha512-5l1+6MzeJW01BeO8ZNfYe/TEVzxIHDKHWUrsmGE6oQW01LezG5LUjwR1T23YeR8G5zzRs/p+AU72wTn/aPGQHg==", + "version": "16.2.11", + "resolved": "https://registry.npmjs.org/@angular/router/-/router-16.2.11.tgz", + "integrity": "sha512-QTssqJue+xQ8M1gzmfJcIHPIpPOijVwGnXQjt7cnFggNe/CedOckLEzk2j7/6aC1b5aQKuZePPw6XMvk8ciilQ==", "dependencies": { "tslib": "^2.3.0" }, "engines": { - "node": "^14.20.0 || ^16.13.0 || >=18.10.0" + "node": "^16.14.0 || >=18.10.0" }, "peerDependencies": { - "@angular/common": "15.1.1", - "@angular/core": "15.1.1", - "@angular/platform-browser": "15.1.1", + "@angular/common": "16.2.11", + "@angular/core": "16.2.11", + "@angular/platform-browser": "16.2.11", "rxjs": "^6.5.3 || ^7.4.0" } }, @@ -721,47 +694,48 @@ "dev": true }, "node_modules/@babel/code-frame": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz", - "integrity": "sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==", + "version": "7.22.13", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz", + "integrity": "sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==", "dev": true, "dependencies": { - "@babel/highlight": "^7.18.6" + "@babel/highlight": "^7.22.13", + "chalk": "^2.4.2" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/compat-data": { - "version": "7.20.10", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.20.10.tgz", - "integrity": "sha512-sEnuDPpOJR/fcafHMjpcpGN5M2jbUGUHwmuWKM/YdPzeEDJg8bgmbcWQFUfE32MQjti1koACvoPVsDe8Uq+idg==", + "version": "7.23.2", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.23.2.tgz", + "integrity": "sha512-0S9TQMmDHlqAZ2ITT95irXKfxN9bncq8ZCoJhun3nHL/lLUxd2NKBJYoNGWH7S0hz6fRQwWlAWn/ILM0C70KZQ==", "dev": true, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/core": { - "version": "7.19.3", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.19.3.tgz", - "integrity": "sha512-WneDJxdsjEvyKtXKsaBGbDeiyOjR5vYq4HcShxnIbG0qixpoHjI3MqeZM9NDvsojNCEBItQE4juOo/bU6e72gQ==", - "dev": true, - "dependencies": { - "@ampproject/remapping": "^2.1.0", - "@babel/code-frame": "^7.18.6", - "@babel/generator": "^7.19.3", - "@babel/helper-compilation-targets": "^7.19.3", - "@babel/helper-module-transforms": "^7.19.0", - "@babel/helpers": "^7.19.0", - "@babel/parser": "^7.19.3", - "@babel/template": "^7.18.10", - "@babel/traverse": "^7.19.3", - "@babel/types": "^7.19.3", + "version": "7.22.9", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.9.tgz", + "integrity": "sha512-G2EgeufBcYw27U4hhoIwFcgc1XU7TlXJ3mv04oOv1WCuo900U/anZSPzEqNjwdjgffkk2Gs0AN0dW1CKVLcG7w==", + "dev": true, + "dependencies": { + "@ampproject/remapping": "^2.2.0", + "@babel/code-frame": "^7.22.5", + "@babel/generator": "^7.22.9", + "@babel/helper-compilation-targets": "^7.22.9", + "@babel/helper-module-transforms": "^7.22.9", + "@babel/helpers": "^7.22.6", + "@babel/parser": "^7.22.7", + "@babel/template": "^7.22.5", + "@babel/traverse": "^7.22.8", + "@babel/types": "^7.22.5", "convert-source-map": "^1.7.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", - "json5": "^2.2.1", - "semver": "^6.3.0" + "json5": "^2.2.2", + "semver": "^6.3.1" }, "engines": { "node": ">=6.9.0" @@ -772,109 +746,93 @@ } }, "node_modules/@babel/core/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, "bin": { "semver": "bin/semver.js" } }, "node_modules/@babel/generator": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.20.7.tgz", - "integrity": "sha512-7wqMOJq8doJMZmP4ApXTzLxSr7+oO2jroJURrVEp6XShrQUObV8Tq/D0NCcoYg2uHqUrjzO0zwBjoYzelxK+sw==", + "version": "7.22.9", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.9.tgz", + "integrity": "sha512-KtLMbmicyuK2Ak/FTCJVbDnkN1SlT8/kceFTiuDiiRUUSMnHMidxSCdG4ndkTOHHpoomWe/4xkvHkEOncwjYIw==", "dev": true, "dependencies": { - "@babel/types": "^7.20.7", + "@babel/types": "^7.22.5", "@jridgewell/gen-mapping": "^0.3.2", + "@jridgewell/trace-mapping": "^0.3.17", "jsesc": "^2.5.1" }, "engines": { "node": ">=6.9.0" } }, - "node_modules/@babel/generator/node_modules/@jridgewell/gen-mapping": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz", - "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==", - "dev": true, - "dependencies": { - "@jridgewell/set-array": "^1.0.1", - "@jridgewell/sourcemap-codec": "^1.4.10", - "@jridgewell/trace-mapping": "^0.3.9" - }, - "engines": { - "node": ">=6.0.0" - } - }, "node_modules/@babel/helper-annotate-as-pure": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz", - "integrity": "sha512-duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz", + "integrity": "sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==", "dev": true, "dependencies": { - "@babel/types": "^7.18.6" + "@babel/types": "^7.22.5" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-builder-binary-assignment-operator-visitor": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.18.9.tgz", - "integrity": "sha512-yFQ0YCHoIqarl8BCRwBL8ulYUaZpz3bNsA7oFepAzee+8/+ImtADXNOmO5vJvsPff3qi+hvpkY/NYBTrBQgdNw==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.15.tgz", + "integrity": "sha512-QkBXwGgaoC2GtGZRoma6kv7Szfv06khvhFav67ZExau2RaXzy8MpHSMO2PNoP2XtmQphJQRHFfg77Bq731Yizw==", "dev": true, "dependencies": { - "@babel/helper-explode-assignable-expression": "^7.18.6", - "@babel/types": "^7.18.9" + "@babel/types": "^7.22.15" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-compilation-targets": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.7.tgz", - "integrity": "sha512-4tGORmfQcrc+bvrjb5y3dG9Mx1IOZjsHqQVUz7XCNHO+iTmqxWnVg3KRygjGmpRLJGdQSKuvFinbIb0CnZwHAQ==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.15.tgz", + "integrity": "sha512-y6EEzULok0Qvz8yyLkCvVX+02ic+By2UdOhylwUOvOn9dvYc9mKICJuuU1n1XBI02YWsNsnrY1kc6DVbjcXbtw==", "dev": true, "dependencies": { - "@babel/compat-data": "^7.20.5", - "@babel/helper-validator-option": "^7.18.6", - "browserslist": "^4.21.3", + "@babel/compat-data": "^7.22.9", + "@babel/helper-validator-option": "^7.22.15", + "browserslist": "^4.21.9", "lru-cache": "^5.1.1", - "semver": "^6.3.0" + "semver": "^6.3.1" }, "engines": { "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0" } }, "node_modules/@babel/helper-compilation-targets/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, "bin": { "semver": "bin/semver.js" } }, "node_modules/@babel/helper-create-class-features-plugin": { - "version": "7.20.12", - "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.20.12.tgz", - "integrity": "sha512-9OunRkbT0JQcednL0UFvbfXpAsUXiGjUk0a7sN8fUXX7Mue79cUSMjHGDRRi/Vz9vYlpIhLV5fMD5dKoMhhsNQ==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.15.tgz", + "integrity": "sha512-jKkwA59IXcvSaiK2UN45kKwSC9o+KuoXsBDvHvU/7BecYIp8GQ2UwrVvFgJASUT+hBnwJx6MhvMCuMzwZZ7jlg==", "dev": true, "dependencies": { - "@babel/helper-annotate-as-pure": "^7.18.6", - "@babel/helper-environment-visitor": "^7.18.9", - "@babel/helper-function-name": "^7.19.0", - "@babel/helper-member-expression-to-functions": "^7.20.7", - "@babel/helper-optimise-call-expression": "^7.18.6", - "@babel/helper-replace-supers": "^7.20.7", - "@babel/helper-skip-transparent-expression-wrappers": "^7.20.0", - "@babel/helper-split-export-declaration": "^7.18.6" + "@babel/helper-annotate-as-pure": "^7.22.5", + "@babel/helper-environment-visitor": "^7.22.5", + "@babel/helper-function-name": "^7.22.5", + "@babel/helper-member-expression-to-functions": "^7.22.15", + "@babel/helper-optimise-call-expression": "^7.22.5", + "@babel/helper-replace-supers": "^7.22.9", + "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5", + "@babel/helper-split-export-declaration": "^7.22.6", + "semver": "^6.3.1" }, "engines": { "node": ">=6.9.0" @@ -883,14 +841,24 @@ "@babel/core": "^7.0.0" } }, + "node_modules/@babel/helper-create-class-features-plugin/node_modules/semver": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "dev": true, + "bin": { + "semver": "bin/semver.js" + } + }, "node_modules/@babel/helper-create-regexp-features-plugin": { - "version": "7.20.5", - "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.20.5.tgz", - "integrity": "sha512-m68B1lkg3XDGX5yCvGO0kPx3v9WIYLnzjKfPcQiwntEQa5ZeRkPmo2X/ISJc8qxWGfwUr+kvZAeEzAwLec2r2w==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.15.tgz", + "integrity": "sha512-29FkPLFjn4TPEa3RE7GpW+qbE8tlsu3jntNYNfcGsc49LphF1PQIiD+vMZ1z1xVOKt+93khA9tc2JBs3kBjA7w==", "dev": true, "dependencies": { - "@babel/helper-annotate-as-pure": "^7.18.6", - "regexpu-core": "^5.2.1" + "@babel/helper-annotate-as-pure": "^7.22.5", + "regexpu-core": "^5.3.1", + "semver": "^6.3.1" }, "engines": { "node": ">=6.9.0" @@ -899,152 +867,152 @@ "@babel/core": "^7.0.0" } }, + "node_modules/@babel/helper-create-regexp-features-plugin/node_modules/semver": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "dev": true, + "bin": { + "semver": "bin/semver.js" + } + }, "node_modules/@babel/helper-define-polyfill-provider": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.3.tgz", - "integrity": "sha512-z5aQKU4IzbqCC1XH0nAqfsFLMVSo22SBKUc0BxGrLkolTdPTructy0ToNnlO2zA4j9Q/7pjMZf0DSY+DSTYzww==", + "version": "0.4.3", + "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.3.tgz", + "integrity": "sha512-WBrLmuPP47n7PNwsZ57pqam6G/RGo1vw/87b0Blc53tZNGZ4x7YvZ6HgQe2vo1W/FR20OgjeZuGXzudPiXHFug==", "dev": true, "dependencies": { - "@babel/helper-compilation-targets": "^7.17.7", - "@babel/helper-plugin-utils": "^7.16.7", + "@babel/helper-compilation-targets": "^7.22.6", + "@babel/helper-plugin-utils": "^7.22.5", "debug": "^4.1.1", "lodash.debounce": "^4.0.8", - "resolve": "^1.14.2", - "semver": "^6.1.2" + "resolve": "^1.14.2" }, "peerDependencies": { - "@babel/core": "^7.4.0-0" - } - }, - "node_modules/@babel/helper-define-polyfill-provider/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true, - "bin": { - "semver": "bin/semver.js" + "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0" } }, "node_modules/@babel/helper-environment-visitor": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz", - "integrity": "sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==", + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz", + "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==", "dev": true, "engines": { "node": ">=6.9.0" } }, - "node_modules/@babel/helper-explode-assignable-expression": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.18.6.tgz", - "integrity": "sha512-eyAYAsQmB80jNfg4baAtLeWAQHfHFiR483rzFK+BhETlGZaQC9bsfrugfXDCbRHLQbIA7U5NxhhOxN7p/dWIcg==", + "node_modules/@babel/helper-function-name": { + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz", + "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==", "dev": true, "dependencies": { - "@babel/types": "^7.18.6" + "@babel/template": "^7.22.15", + "@babel/types": "^7.23.0" }, "engines": { "node": ">=6.9.0" } }, - "node_modules/@babel/helper-function-name": { - "version": "7.19.0", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz", - "integrity": "sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==", + "node_modules/@babel/helper-function-name/node_modules/@babel/template": { + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz", + "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==", "dev": true, "dependencies": { - "@babel/template": "^7.18.10", - "@babel/types": "^7.19.0" + "@babel/code-frame": "^7.22.13", + "@babel/parser": "^7.22.15", + "@babel/types": "^7.22.15" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-hoist-variables": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz", - "integrity": "sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz", + "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==", "dev": true, "dependencies": { - "@babel/types": "^7.18.6" + "@babel/types": "^7.22.5" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-member-expression-to-functions": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.20.7.tgz", - "integrity": "sha512-9J0CxJLq315fEdi4s7xK5TQaNYjZw+nDVpVqr1axNGKzdrdwYBD5b4uKv3n75aABG0rCCTK8Im8Ww7eYfMrZgw==", + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.23.0.tgz", + "integrity": "sha512-6gfrPwh7OuT6gZyJZvd6WbTfrqAo7vm4xCzAXOusKqq/vWdKXphTpj5klHKNmRUU6/QRGlBsyU9mAIPaWHlqJA==", "dev": true, "dependencies": { - "@babel/types": "^7.20.7" + "@babel/types": "^7.23.0" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-module-imports": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz", - "integrity": "sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz", + "integrity": "sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==", "dev": true, "dependencies": { - "@babel/types": "^7.18.6" + "@babel/types": "^7.22.15" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-module-transforms": { - "version": "7.20.11", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.20.11.tgz", - "integrity": "sha512-uRy78kN4psmji1s2QtbtcCSaj/LILFDp0f/ymhpQH5QY3nljUZCaNWz9X1dEj/8MBdBEFECs7yRhKn8i7NjZgg==", + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.23.0.tgz", + "integrity": "sha512-WhDWw1tdrlT0gMgUJSlX0IQvoO1eN279zrAUbVB+KpV2c3Tylz8+GnKOLllCS6Z/iZQEyVYxhZVUdPTqs2YYPw==", "dev": true, "dependencies": { - "@babel/helper-environment-visitor": "^7.18.9", - "@babel/helper-module-imports": "^7.18.6", - "@babel/helper-simple-access": "^7.20.2", - "@babel/helper-split-export-declaration": "^7.18.6", - "@babel/helper-validator-identifier": "^7.19.1", - "@babel/template": "^7.20.7", - "@babel/traverse": "^7.20.10", - "@babel/types": "^7.20.7" + "@babel/helper-environment-visitor": "^7.22.20", + "@babel/helper-module-imports": "^7.22.15", + "@babel/helper-simple-access": "^7.22.5", + "@babel/helper-split-export-declaration": "^7.22.6", + "@babel/helper-validator-identifier": "^7.22.20" }, "engines": { "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0" } }, "node_modules/@babel/helper-optimise-call-expression": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.18.6.tgz", - "integrity": "sha512-HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.22.5.tgz", + "integrity": "sha512-HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw==", "dev": true, "dependencies": { - "@babel/types": "^7.18.6" + "@babel/types": "^7.22.5" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-plugin-utils": { - "version": "7.20.2", - "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz", - "integrity": "sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz", + "integrity": "sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==", "dev": true, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-remap-async-to-generator": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.18.9.tgz", - "integrity": "sha512-dI7q50YKd8BAv3VEfgg7PS7yD3Rtbi2J1XMXaalXO0W0164hYLnh8zpjRS0mte9MfVp/tltvr/cfdXPvJr1opA==", + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.20.tgz", + "integrity": "sha512-pBGyV4uBqOns+0UvhsTO8qgl8hO89PmiDYv+/COyp1aeMcmfrfruz+/nCMFiYyFF/Knn0yfrC85ZzNFjembFTw==", "dev": true, "dependencies": { - "@babel/helper-annotate-as-pure": "^7.18.6", - "@babel/helper-environment-visitor": "^7.18.9", - "@babel/helper-wrap-function": "^7.18.9", - "@babel/types": "^7.18.9" + "@babel/helper-annotate-as-pure": "^7.22.5", + "@babel/helper-environment-visitor": "^7.22.20", + "@babel/helper-wrap-function": "^7.22.20" }, "engines": { "node": ">=6.9.0" @@ -1054,122 +1022,149 @@ } }, "node_modules/@babel/helper-replace-supers": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.20.7.tgz", - "integrity": "sha512-vujDMtB6LVfNW13jhlCrp48QNslK6JXi7lQG736HVbHz/mbf4Dc7tIRh1Xf5C0rF7BP8iiSxGMCmY6Ci1ven3A==", + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.22.20.tgz", + "integrity": "sha512-qsW0In3dbwQUbK8kejJ4R7IHVGwHJlV6lpG6UA7a9hSa2YEiAib+N1T2kr6PEeUT+Fl7najmSOS6SmAwCHK6Tw==", "dev": true, "dependencies": { - "@babel/helper-environment-visitor": "^7.18.9", - "@babel/helper-member-expression-to-functions": "^7.20.7", - "@babel/helper-optimise-call-expression": "^7.18.6", - "@babel/template": "^7.20.7", - "@babel/traverse": "^7.20.7", - "@babel/types": "^7.20.7" + "@babel/helper-environment-visitor": "^7.22.20", + "@babel/helper-member-expression-to-functions": "^7.22.15", + "@babel/helper-optimise-call-expression": "^7.22.5" }, "engines": { "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0" } }, "node_modules/@babel/helper-simple-access": { - "version": "7.20.2", - "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz", - "integrity": "sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz", + "integrity": "sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==", "dev": true, "dependencies": { - "@babel/types": "^7.20.2" + "@babel/types": "^7.22.5" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-skip-transparent-expression-wrappers": { - "version": "7.20.0", - "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.20.0.tgz", - "integrity": "sha512-5y1JYeNKfvnT8sZcK9DVRtpTbGiomYIHviSP3OQWmDPU3DeH4a1ZlT/N2lyQ5P8egjcRaT/Y9aNqUxK0WsnIIg==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.22.5.tgz", + "integrity": "sha512-tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q==", "dev": true, "dependencies": { - "@babel/types": "^7.20.0" + "@babel/types": "^7.22.5" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-split-export-declaration": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz", - "integrity": "sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==", + "version": "7.22.6", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz", + "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==", "dev": true, "dependencies": { - "@babel/types": "^7.18.6" + "@babel/types": "^7.22.5" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-string-parser": { - "version": "7.19.4", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz", - "integrity": "sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz", + "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==", "dev": true, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-validator-identifier": { - "version": "7.19.1", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz", - "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==", + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz", + "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==", "dev": true, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-validator-option": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz", - "integrity": "sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.22.15.tgz", + "integrity": "sha512-bMn7RmyFjY/mdECUbgn9eoSY4vqvacUnS9i9vGAGttgFWesO6B4CYWA7XlpbWgBt71iv/hfbPlynohStqnu5hA==", "dev": true, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-wrap-function": { - "version": "7.20.5", - "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.20.5.tgz", - "integrity": "sha512-bYMxIWK5mh+TgXGVqAtnu5Yn1un+v8DDZtqyzKRLUzrh70Eal2O3aZ7aPYiMADO4uKlkzOiRiZ6GX5q3qxvW9Q==", + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.22.20.tgz", + "integrity": "sha512-pms/UwkOpnQe/PDAEdV/d7dVCoBbB+R4FvYoHGZz+4VPcg7RtYy2KP7S2lbuWM6FCSgob5wshfGESbC/hzNXZw==", + "dev": true, + "dependencies": { + "@babel/helper-function-name": "^7.22.5", + "@babel/template": "^7.22.15", + "@babel/types": "^7.22.19" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-wrap-function/node_modules/@babel/template": { + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz", + "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==", "dev": true, "dependencies": { - "@babel/helper-function-name": "^7.19.0", - "@babel/template": "^7.18.10", - "@babel/traverse": "^7.20.5", - "@babel/types": "^7.20.5" + "@babel/code-frame": "^7.22.13", + "@babel/parser": "^7.22.15", + "@babel/types": "^7.22.15" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helpers": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.20.7.tgz", - "integrity": "sha512-PBPjs5BppzsGaxHQCDKnZ6Gd9s6xl8bBCluz3vEInLGRJmnZan4F6BYCeqtyXqkk4W5IlPmjK4JlOuZkpJ3xZA==", + "version": "7.23.2", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.2.tgz", + "integrity": "sha512-lzchcp8SjTSVe/fPmLwtWVBFC7+Tbn8LGHDVfDp9JGxpAY5opSaEFgt8UQvrnECWOTdji2mOWMz1rOhkHscmGQ==", "dev": true, "dependencies": { - "@babel/template": "^7.20.7", - "@babel/traverse": "^7.20.7", - "@babel/types": "^7.20.7" + "@babel/template": "^7.22.15", + "@babel/traverse": "^7.23.2", + "@babel/types": "^7.23.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helpers/node_modules/@babel/template": { + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz", + "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==", + "dev": true, + "dependencies": { + "@babel/code-frame": "^7.22.13", + "@babel/parser": "^7.22.15", + "@babel/types": "^7.22.15" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/highlight": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz", - "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==", + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.20.tgz", + "integrity": "sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==", "dev": true, "dependencies": { - "@babel/helper-validator-identifier": "^7.18.6", - "chalk": "^2.0.0", + "@babel/helper-validator-identifier": "^7.22.20", + "chalk": "^2.4.2", "js-tokens": "^4.0.0" }, "engines": { @@ -1177,9 +1172,9 @@ } }, "node_modules/@babel/parser": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.20.7.tgz", - "integrity": "sha512-T3Z9oHybU+0vZlY9CiDSJQTD5ZapcW18ZctFMi0MOAl/4BjFF4ul7NVSARLdbGO5vDqy9eQiGTV0LtKfvCYvcg==", + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.0.tgz", + "integrity": "sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==", "dev": true, "bin": { "parser": "bin/babel-parser.js" @@ -1189,12 +1184,12 @@ } }, "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6.tgz", - "integrity": "sha512-Dgxsyg54Fx1d4Nge8UnvTrED63vrwOdPmyvPzlNN/boaliRP54pm3pGzZD1SJUwrBA+Cs/xdG8kXX6Mn/RfISQ==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.22.15.tgz", + "integrity": "sha512-FB9iYlz7rURmRJyXRKEnalYPPdn87H5no108cyuQQyMwlpJ2SJtpIUBI27kdTin956pz+LPypkPVPUTlxOmrsg==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.18.6" + "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { "node": ">=6.9.0" @@ -1204,14 +1199,14 @@ } }, "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.20.7.tgz", - "integrity": "sha512-sbr9+wNE5aXMBBFBICk01tt7sBf2Oc9ikRFEcem/ZORup9IMUdNhW7/wVLEbbtlWOsEubJet46mHAL2C8+2jKQ==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.22.15.tgz", + "integrity": "sha512-Hyph9LseGvAeeXzikV88bczhsrLrIZqDPxO+sSmAunMPaGrBGhfMWzCPYTtiW9t+HzSE2wtV8e5cc5P6r1xMDQ==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.20.2", - "@babel/helper-skip-transparent-expression-wrappers": "^7.20.0", - "@babel/plugin-proposal-optional-chaining": "^7.20.7" + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5", + "@babel/plugin-transform-optional-chaining": "^7.22.15" }, "engines": { "node": ">=6.9.0" @@ -1224,6 +1219,7 @@ "version": "7.20.7", "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.20.7.tgz", "integrity": "sha512-xMbiLsn/8RK7Wq7VeVytytS2L6qE69bXPB10YCmMdDZbKF4okCqY74pI/jJQ/8U0b/F6NrT2+14b8/P9/3AMGA==", + "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-async-generator-functions instead.", "dev": true, "dependencies": { "@babel/helper-environment-visitor": "^7.18.9", @@ -1238,15 +1234,11 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-proposal-class-properties": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz", - "integrity": "sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==", + "node_modules/@babel/plugin-proposal-private-property-in-object": { + "version": "7.21.0-placeholder-for-preset-env.2", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz", + "integrity": "sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==", "dev": true, - "dependencies": { - "@babel/helper-create-class-features-plugin": "^7.18.6", - "@babel/helper-plugin-utils": "^7.18.6" - }, "engines": { "node": ">=6.9.0" }, @@ -1254,240 +1246,42 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-proposal-class-static-block": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.20.7.tgz", - "integrity": "sha512-AveGOoi9DAjUYYuUAG//Ig69GlazLnoyzMw68VCDux+c1tsnnH/OkYcpz/5xzMkEFC6UxjR5Gw1c+iY2wOGVeQ==", + "node_modules/@babel/plugin-proposal-unicode-property-regex": { + "version": "7.18.6", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz", + "integrity": "sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w==", + "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-unicode-property-regex instead.", "dev": true, "dependencies": { - "@babel/helper-create-class-features-plugin": "^7.20.7", - "@babel/helper-plugin-utils": "^7.20.2", - "@babel/plugin-syntax-class-static-block": "^7.14.5" + "@babel/helper-create-regexp-features-plugin": "^7.18.6", + "@babel/helper-plugin-utils": "^7.18.6" }, "engines": { - "node": ">=6.9.0" + "node": ">=4" }, "peerDependencies": { - "@babel/core": "^7.12.0" + "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-proposal-dynamic-import": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.18.6.tgz", - "integrity": "sha512-1auuwmK+Rz13SJj36R+jqFPMJWyKEDd7lLSdOj4oJK0UTgGueSAtkrCvz9ewmgyU/P941Rv2fQwZJN8s6QruXw==", + "node_modules/@babel/plugin-syntax-async-generators": { + "version": "7.8.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz", + "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.18.6", - "@babel/plugin-syntax-dynamic-import": "^7.8.3" - }, - "engines": { - "node": ">=6.9.0" + "@babel/helper-plugin-utils": "^7.8.0" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-proposal-export-namespace-from": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.18.9.tgz", - "integrity": "sha512-k1NtHyOMvlDDFeb9G5PhUXuGj8m/wiwojgQVEhJ/fsVsMCpLyOP4h0uGEjYJKrRI+EVPlb5Jk+Gt9P97lOGwtA==", + "node_modules/@babel/plugin-syntax-bigint": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz", + "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.18.9", - "@babel/plugin-syntax-export-namespace-from": "^7.8.3" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-proposal-json-strings": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.18.6.tgz", - "integrity": "sha512-lr1peyn9kOdbYc0xr0OdHTZ5FMqS6Di+H0Fz2I/JwMzGmzJETNeOFq2pBySw6X/KFL5EWDjlJuMsUGRFb8fQgQ==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.18.6", - "@babel/plugin-syntax-json-strings": "^7.8.3" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-proposal-logical-assignment-operators": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.20.7.tgz", - "integrity": "sha512-y7C7cZgpMIjWlKE5T7eJwp+tnRYM89HmRvWM5EQuB5BoHEONjmQ8lSNmBUwOyy/GFRsohJED51YBF79hE1djug==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.20.2", - "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-proposal-nullish-coalescing-operator": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz", - "integrity": "sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.18.6", - "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-proposal-numeric-separator": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz", - "integrity": "sha512-ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.18.6", - "@babel/plugin-syntax-numeric-separator": "^7.10.4" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-proposal-object-rest-spread": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.20.7.tgz", - "integrity": "sha512-d2S98yCiLxDVmBmE8UjGcfPvNEUbA1U5q5WxaWFUGRzJSVAZqm5W6MbPct0jxnegUZ0niLeNX+IOzEs7wYg9Dg==", - "dev": true, - "dependencies": { - "@babel/compat-data": "^7.20.5", - "@babel/helper-compilation-targets": "^7.20.7", - "@babel/helper-plugin-utils": "^7.20.2", - "@babel/plugin-syntax-object-rest-spread": "^7.8.3", - "@babel/plugin-transform-parameters": "^7.20.7" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-proposal-optional-catch-binding": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.18.6.tgz", - "integrity": "sha512-Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.18.6", - "@babel/plugin-syntax-optional-catch-binding": "^7.8.3" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-proposal-optional-chaining": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.20.7.tgz", - "integrity": "sha512-T+A7b1kfjtRM51ssoOfS1+wbyCVqorfyZhT99TvxxLMirPShD8CzKMRepMlCBGM5RpHMbn8s+5MMHnPstJH6mQ==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.20.2", - "@babel/helper-skip-transparent-expression-wrappers": "^7.20.0", - "@babel/plugin-syntax-optional-chaining": "^7.8.3" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-proposal-private-methods": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz", - "integrity": "sha512-nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA==", - "dev": true, - "dependencies": { - "@babel/helper-create-class-features-plugin": "^7.18.6", - "@babel/helper-plugin-utils": "^7.18.6" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-proposal-private-property-in-object": { - "version": "7.20.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.20.5.tgz", - "integrity": "sha512-Vq7b9dUA12ByzB4EjQTPo25sFhY+08pQDBSZRtUAkj7lb7jahaHR5igera16QZ+3my1nYR4dKsNdYj5IjPHilQ==", - "dev": true, - "dependencies": { - "@babel/helper-annotate-as-pure": "^7.18.6", - "@babel/helper-create-class-features-plugin": "^7.20.5", - "@babel/helper-plugin-utils": "^7.20.2", - "@babel/plugin-syntax-private-property-in-object": "^7.14.5" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-proposal-unicode-property-regex": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz", - "integrity": "sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w==", - "dev": true, - "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.18.6", - "@babel/helper-plugin-utils": "^7.18.6" - }, - "engines": { - "node": ">=4" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-async-generators": { - "version": "7.8.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz", - "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.8.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-bigint": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz", - "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.8.0" + "@babel/helper-plugin-utils": "^7.8.0" }, "peerDependencies": { "@babel/core": "^7.0.0-0" @@ -1545,12 +1339,27 @@ } }, "node_modules/@babel/plugin-syntax-import-assertions": { - "version": "7.20.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.20.0.tgz", - "integrity": "sha512-IUh1vakzNoWalR8ch/areW7qFopR2AEw03JlG7BbrDqmQ4X3q9uuipQwSGrUn7oGiemKjtSLDhNtQHzMHr1JdQ==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.22.5.tgz", + "integrity": "sha512-rdV97N7KqsRzeNGoWUOK6yUsWarLjE5Su/Snk9IYPU9CwkWHs4t+rTGOvffTR8XGkJMTAdLfO0xVnXm8wugIJg==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-import-attributes": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.22.5.tgz", + "integrity": "sha512-KwvoWDeNKPETmozyFE0P2rOLqh39EoQHNjqizrI5B8Vt0ZNS7M56s7dAiAqbYfiAYOuIzIh96z3iR2ktgu3tEg==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.19.0" + "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { "node": ">=6.9.0" @@ -1583,6 +1392,21 @@ "@babel/core": "^7.0.0-0" } }, + "node_modules/@babel/plugin-syntax-jsx": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.22.5.tgz", + "integrity": "sha512-gvyP4hZrgrs/wWMaocvxZ44Hw0b3W8Pe+cMxc8V1ULQ07oh8VNbIRaoD1LRZVTvD+0nieDKjfgKg89sD7rrKrg==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, "node_modules/@babel/plugin-syntax-logical-assignment-operators": { "version": "7.10.4", "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz", @@ -1686,12 +1510,12 @@ } }, "node_modules/@babel/plugin-syntax-typescript": { - "version": "7.20.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.20.0.tgz", - "integrity": "sha512-rd9TkG+u1CExzS4SM1BlMEhMXwFLKVjOAFFCDx9PbX5ycJWDoWMcwdJH9RhkPu1dOgn5TrxLot/Gx6lWFuAUNQ==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.22.5.tgz", + "integrity": "sha512-1mS2o03i7t1c6VzH6fdQ3OA8tcEIxwG18zIPRp+UY1Ihv6W+XZzBCVxExF9upussPXJ0xE9XRHwMoNs1ep/nRQ==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.19.0" + "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { "node": ">=6.9.0" @@ -1700,30 +1524,29 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-transform-arrow-functions": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.20.7.tgz", - "integrity": "sha512-3poA5E7dzDomxj9WXWwuD6A5F3kc7VXwIJO+E+J8qtDtS+pXPAhrgEyh+9GBwBgPq1Z+bB+/JD60lp5jsN7JPQ==", + "node_modules/@babel/plugin-syntax-unicode-sets-regex": { + "version": "7.18.6", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-unicode-sets-regex/-/plugin-syntax-unicode-sets-regex-7.18.6.tgz", + "integrity": "sha512-727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.20.2" + "@babel/helper-create-regexp-features-plugin": "^7.18.6", + "@babel/helper-plugin-utils": "^7.18.6" }, "engines": { "node": ">=6.9.0" }, "peerDependencies": { - "@babel/core": "^7.0.0-0" + "@babel/core": "^7.0.0" } }, - "node_modules/@babel/plugin-transform-async-to-generator": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.20.7.tgz", - "integrity": "sha512-Uo5gwHPT9vgnSXQxqGtpdufUiWp96gk7yiP4Mp5bm1QMkEmLXBO7PAGYbKoJ6DhAwiNkcHFBol/x5zZZkL/t0Q==", + "node_modules/@babel/plugin-transform-arrow-functions": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.22.5.tgz", + "integrity": "sha512-26lTNXoVRdAnsaDXPpvCNUq+OVWEVC6bx7Vvz9rC53F2bagUWW4u4ii2+h8Fejfh7RYqPxn+libeFBBck9muEw==", "dev": true, "dependencies": { - "@babel/helper-module-imports": "^7.18.6", - "@babel/helper-plugin-utils": "^7.20.2", - "@babel/helper-remap-async-to-generator": "^7.18.9" + "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { "node": ">=6.9.0" @@ -1732,13 +1555,16 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-transform-block-scoped-functions": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.18.6.tgz", - "integrity": "sha512-ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ==", + "node_modules/@babel/plugin-transform-async-generator-functions": { + "version": "7.23.2", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.23.2.tgz", + "integrity": "sha512-BBYVGxbDVHfoeXbOwcagAkOQAm9NxoTdMGfTqghu1GrvadSaw6iW3Je6IcL5PNOw8VwjxqBECXy50/iCQSY/lQ==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.18.6" + "@babel/helper-environment-visitor": "^7.22.20", + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/helper-remap-async-to-generator": "^7.22.20", + "@babel/plugin-syntax-async-generators": "^7.8.4" }, "engines": { "node": ">=6.9.0" @@ -1747,13 +1573,15 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-transform-block-scoping": { - "version": "7.20.11", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.20.11.tgz", - "integrity": "sha512-tA4N427a7fjf1P0/2I4ScsHGc5jcHPbb30xMbaTke2gxDuWpUfXDuX1FEymJwKk4tuGUvGcejAR6HdZVqmmPyw==", + "node_modules/@babel/plugin-transform-async-to-generator": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.22.5.tgz", + "integrity": "sha512-b1A8D8ZzE/VhNDoV1MSJTnpKkCG5bJo+19R4o4oy03zM7ws8yEMK755j61Dc3EyvdysbqH5BOOTquJ7ZX9C6vQ==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.20.2" + "@babel/helper-module-imports": "^7.22.5", + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/helper-remap-async-to-generator": "^7.22.5" }, "engines": { "node": ">=6.9.0" @@ -1762,21 +1590,13 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-transform-classes": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.20.7.tgz", - "integrity": "sha512-LWYbsiXTPKl+oBlXUGlwNlJZetXD5Am+CyBdqhPsDVjM9Jc8jwBJFrKhHf900Kfk2eZG1y9MAG3UNajol7A4VQ==", + "node_modules/@babel/plugin-transform-block-scoped-functions": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.22.5.tgz", + "integrity": "sha512-tdXZ2UdknEKQWKJP1KMNmuF5Lx3MymtMN/pvA+p/VEkhK8jVcQ1fzSy8KM9qRYhAf2/lV33hoMPKI/xaI9sADA==", "dev": true, "dependencies": { - "@babel/helper-annotate-as-pure": "^7.18.6", - "@babel/helper-compilation-targets": "^7.20.7", - "@babel/helper-environment-visitor": "^7.18.9", - "@babel/helper-function-name": "^7.19.0", - "@babel/helper-optimise-call-expression": "^7.18.6", - "@babel/helper-plugin-utils": "^7.20.2", - "@babel/helper-replace-supers": "^7.20.7", - "@babel/helper-split-export-declaration": "^7.18.6", - "globals": "^11.1.0" + "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { "node": ">=6.9.0" @@ -1785,14 +1605,13 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-transform-computed-properties": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.20.7.tgz", - "integrity": "sha512-Lz7MvBK6DTjElHAmfu6bfANzKcxpyNPeYBGEafyA6E5HtRpjpZwU+u7Qrgz/2OR0z+5TvKYbPdphfSaAcZBrYQ==", + "node_modules/@babel/plugin-transform-block-scoping": { + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.23.0.tgz", + "integrity": "sha512-cOsrbmIOXmf+5YbL99/S49Y3j46k/T16b9ml8bm9lP6N9US5iQ2yBK7gpui1pg0V/WMcXdkfKbTb7HXq9u+v4g==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.20.2", - "@babel/template": "^7.20.7" + "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { "node": ">=6.9.0" @@ -1801,13 +1620,14 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-transform-destructuring": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.20.7.tgz", - "integrity": "sha512-Xwg403sRrZb81IVB79ZPqNQME23yhugYVqgTxAhT99h485F4f+GMELFhhOsscDUB7HCswepKeCKLn/GZvUKoBA==", + "node_modules/@babel/plugin-transform-class-properties": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.22.5.tgz", + "integrity": "sha512-nDkQ0NfkOhPTq8YCLiWNxp1+f9fCobEjCb0n8WdbNUBc4IB5V7P1QnX9IjpSoquKrXF5SKojHleVNs2vGeHCHQ==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.20.2" + "@babel/helper-create-class-features-plugin": "^7.22.5", + "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { "node": ">=6.9.0" @@ -1816,29 +1636,38 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-transform-dotall-regex": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.18.6.tgz", - "integrity": "sha512-6S3jpun1eEbAxq7TdjLotAsl4WpQI9DxfkycRcKrjhQYzU87qpXdknpBg/e+TdcMehqGnLFi7tnFUBR02Vq6wg==", + "node_modules/@babel/plugin-transform-class-static-block": { + "version": "7.22.11", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.22.11.tgz", + "integrity": "sha512-GMM8gGmqI7guS/llMFk1bJDkKfn3v3C4KHK9Yg1ey5qcHcOlKb0QvcMrgzvxo+T03/4szNh5lghY+fEC98Kq9g==", "dev": true, "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.18.6", - "@babel/helper-plugin-utils": "^7.18.6" + "@babel/helper-create-class-features-plugin": "^7.22.11", + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/plugin-syntax-class-static-block": "^7.14.5" }, "engines": { "node": ">=6.9.0" }, "peerDependencies": { - "@babel/core": "^7.0.0-0" + "@babel/core": "^7.12.0" } }, - "node_modules/@babel/plugin-transform-duplicate-keys": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.18.9.tgz", - "integrity": "sha512-d2bmXCtZXYc59/0SanQKbiWINadaJXqtvIQIzd4+hNwkWBgyCd5F/2t1kXoUdvPMrxzPvhK6EMQRROxsue+mfw==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.18.9" + "node_modules/@babel/plugin-transform-classes": { + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.22.15.tgz", + "integrity": "sha512-VbbC3PGjBdE0wAWDdHM9G8Gm977pnYI0XpqMd6LrKISj8/DJXEsWqgRuTYaNE9Bv0JGhTZUzHDlMk18IpOuoqw==", + "dev": true, + "dependencies": { + "@babel/helper-annotate-as-pure": "^7.22.5", + "@babel/helper-compilation-targets": "^7.22.15", + "@babel/helper-environment-visitor": "^7.22.5", + "@babel/helper-function-name": "^7.22.5", + "@babel/helper-optimise-call-expression": "^7.22.5", + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/helper-replace-supers": "^7.22.9", + "@babel/helper-split-export-declaration": "^7.22.6", + "globals": "^11.1.0" }, "engines": { "node": ">=6.9.0" @@ -1847,14 +1676,14 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-transform-exponentiation-operator": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.18.6.tgz", - "integrity": "sha512-wzEtc0+2c88FVR34aQmiz56dxEkxr2g8DQb/KfaFa1JYXOFVsbhvAonFN6PwVWj++fKmku8NP80plJ5Et4wqHw==", + "node_modules/@babel/plugin-transform-computed-properties": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.22.5.tgz", + "integrity": "sha512-4GHWBgRf0krxPX+AaPtgBAlTgTeZmqDynokHOX7aqqAB4tHs3U2Y02zH6ETFdLZGcg9UQSD1WCmkVrE9ErHeOg==", "dev": true, "dependencies": { - "@babel/helper-builder-binary-assignment-operator-visitor": "^7.18.6", - "@babel/helper-plugin-utils": "^7.18.6" + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/template": "^7.22.5" }, "engines": { "node": ">=6.9.0" @@ -1863,13 +1692,13 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-transform-for-of": { - "version": "7.18.8", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.18.8.tgz", - "integrity": "sha512-yEfTRnjuskWYo0k1mHUqrVWaZwrdq8AYbfrpqULOJOaucGSp4mNMVps+YtA8byoevxS/urwU75vyhQIxcCgiBQ==", + "node_modules/@babel/plugin-transform-destructuring": { + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.23.0.tgz", + "integrity": "sha512-vaMdgNXFkYrB+8lbgniSYWHsgqK5gjaMNcc84bMIOMRLH0L9AqYq3hwMdvnyqj1OPqea8UtjPEuS/DCenah1wg==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.18.6" + "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { "node": ">=6.9.0" @@ -1878,15 +1707,14 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-transform-function-name": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.18.9.tgz", - "integrity": "sha512-WvIBoRPaJQ5yVHzcnJFor7oS5Ls0PYixlTYE63lCj2RtdQEl15M68FXQlxnG6wdraJIXRdR7KI+hQ7q/9QjrCQ==", + "node_modules/@babel/plugin-transform-dotall-regex": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.22.5.tgz", + "integrity": "sha512-5/Yk9QxCQCl+sOIB1WelKnVRxTJDSAIxtJLL2/pqL14ZVlbH0fUQUZa/T5/UnQtBNgghR7mfB8ERBKyKPCi7Vw==", "dev": true, "dependencies": { - "@babel/helper-compilation-targets": "^7.18.9", - "@babel/helper-function-name": "^7.18.9", - "@babel/helper-plugin-utils": "^7.18.9" + "@babel/helper-create-regexp-features-plugin": "^7.22.5", + "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { "node": ">=6.9.0" @@ -1895,13 +1723,13 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-transform-literals": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.18.9.tgz", - "integrity": "sha512-IFQDSRoTPnrAIrI5zoZv73IFeZu2dhu6irxQjY9rNjTT53VmKg9fenjvoiOWOkJ6mm4jKVPtdMzBY98Fp4Z4cg==", + "node_modules/@babel/plugin-transform-duplicate-keys": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.22.5.tgz", + "integrity": "sha512-dEnYD+9BBgld5VBXHnF/DbYGp3fqGMsyxKbtD1mDyIA7AkTSpKXFhCVuj/oQVOoALfBs77DudA0BE4d5mcpmqw==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.18.9" + "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { "node": ">=6.9.0" @@ -1910,13 +1738,14 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-transform-member-expression-literals": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.18.6.tgz", - "integrity": "sha512-qSF1ihLGO3q+/g48k85tUjD033C29TNTVB2paCwZPVmOsjn9pClvYYrM2VeJpBY2bcNkuny0YUyTNRyRxJ54KA==", + "node_modules/@babel/plugin-transform-dynamic-import": { + "version": "7.22.11", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.22.11.tgz", + "integrity": "sha512-g/21plo58sfteWjaO0ZNVb+uEOkJNjAaHhbejrnBmu011l/eNDScmkbjCC3l4FKb10ViaGU4aOkFznSu2zRHgA==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.18.6" + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/plugin-syntax-dynamic-import": "^7.8.3" }, "engines": { "node": ">=6.9.0" @@ -1925,14 +1754,14 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-transform-modules-amd": { - "version": "7.20.11", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.20.11.tgz", - "integrity": "sha512-NuzCt5IIYOW0O30UvqktzHYR2ud5bOWbY0yaxWZ6G+aFzOMJvrs5YHNikrbdaT15+KNO31nPOy5Fim3ku6Zb5g==", + "node_modules/@babel/plugin-transform-exponentiation-operator": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.22.5.tgz", + "integrity": "sha512-vIpJFNM/FjZ4rh1myqIya9jXwrwwgFRHPjT3DkUA9ZLHuzox8jiXkOLvwm1H+PQIP3CqfC++WPKeuDi0Sjdj1g==", "dev": true, "dependencies": { - "@babel/helper-module-transforms": "^7.20.11", - "@babel/helper-plugin-utils": "^7.20.2" + "@babel/helper-builder-binary-assignment-operator-visitor": "^7.22.5", + "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { "node": ">=6.9.0" @@ -1941,15 +1770,14 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-transform-modules-commonjs": { - "version": "7.20.11", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.20.11.tgz", - "integrity": "sha512-S8e1f7WQ7cimJQ51JkAaDrEtohVEitXjgCGAS2N8S31Y42E+kWwfSz83LYz57QdBm7q9diARVqanIaH2oVgQnw==", + "node_modules/@babel/plugin-transform-export-namespace-from": { + "version": "7.22.11", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.22.11.tgz", + "integrity": "sha512-xa7aad7q7OiT8oNZ1mU7NrISjlSkVdMbNxn9IuLZyL9AJEhs1Apba3I+u5riX1dIkdptP5EKDG5XDPByWxtehw==", "dev": true, "dependencies": { - "@babel/helper-module-transforms": "^7.20.11", - "@babel/helper-plugin-utils": "^7.20.2", - "@babel/helper-simple-access": "^7.20.2" + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/plugin-syntax-export-namespace-from": "^7.8.3" }, "engines": { "node": ">=6.9.0" @@ -1958,16 +1786,13 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-transform-modules-systemjs": { - "version": "7.20.11", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.20.11.tgz", - "integrity": "sha512-vVu5g9BPQKSFEmvt2TA4Da5N+QVS66EX21d8uoOihC+OCpUoGvzVsXeqFdtAEfVa5BILAeFt+U7yVmLbQnAJmw==", + "node_modules/@babel/plugin-transform-for-of": { + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.22.15.tgz", + "integrity": "sha512-me6VGeHsx30+xh9fbDLLPi0J1HzmeIIyenoOQHuw2D4m2SAU3NrspX5XxJLBpqn5yrLzrlw2Iy3RA//Bx27iOA==", "dev": true, "dependencies": { - "@babel/helper-hoist-variables": "^7.18.6", - "@babel/helper-module-transforms": "^7.20.11", - "@babel/helper-plugin-utils": "^7.20.2", - "@babel/helper-validator-identifier": "^7.19.1" + "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { "node": ">=6.9.0" @@ -1976,14 +1801,15 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-transform-modules-umd": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.6.tgz", - "integrity": "sha512-dcegErExVeXcRqNtkRU/z8WlBLnvD4MRnHgNs3MytRO1Mn1sHRyhbcpYbVMGclAqOjdW+9cfkdZno9dFdfKLfQ==", + "node_modules/@babel/plugin-transform-function-name": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.22.5.tgz", + "integrity": "sha512-UIzQNMS0p0HHiQm3oelztj+ECwFnj+ZRV4KnguvlsD2of1whUeM6o7wGNj6oLwcDoAXQ8gEqfgC24D+VdIcevg==", "dev": true, "dependencies": { - "@babel/helper-module-transforms": "^7.18.6", - "@babel/helper-plugin-utils": "^7.18.6" + "@babel/helper-compilation-targets": "^7.22.5", + "@babel/helper-function-name": "^7.22.5", + "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { "node": ">=6.9.0" @@ -1992,29 +1818,29 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-transform-named-capturing-groups-regex": { - "version": "7.20.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.20.5.tgz", - "integrity": "sha512-mOW4tTzi5iTLnw+78iEq3gr8Aoq4WNRGpmSlrogqaiCBoR1HFhpU4JkpQFOHfeYx3ReVIFWOQJS4aZBRvuZ6mA==", + "node_modules/@babel/plugin-transform-json-strings": { + "version": "7.22.11", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.22.11.tgz", + "integrity": "sha512-CxT5tCqpA9/jXFlme9xIBCc5RPtdDq3JpkkhgHQqtDdiTnTI0jtZ0QzXhr5DILeYifDPp2wvY2ad+7+hLMW5Pw==", "dev": true, "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.20.5", - "@babel/helper-plugin-utils": "^7.20.2" + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/plugin-syntax-json-strings": "^7.8.3" }, "engines": { "node": ">=6.9.0" }, "peerDependencies": { - "@babel/core": "^7.0.0" + "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-transform-new-target": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.18.6.tgz", - "integrity": "sha512-DjwFA/9Iu3Z+vrAn+8pBUGcjhxKguSMlsFqeCKbhb9BAV756v0krzVK04CRDi/4aqmk8BsHb4a/gFcaA5joXRw==", + "node_modules/@babel/plugin-transform-literals": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.22.5.tgz", + "integrity": "sha512-fTLj4D79M+mepcw3dgFBTIDYpbcB9Sm0bpm4ppXPaO+U+PKFFyV9MGRvS0gvGw62sd10kT5lRMKXAADb9pWy8g==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.18.6" + "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { "node": ">=6.9.0" @@ -2023,14 +1849,14 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-transform-object-super": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.18.6.tgz", - "integrity": "sha512-uvGz6zk+pZoS1aTZrOvrbj6Pp/kK2mp45t2B+bTDre2UgsZZ8EZLSJtUg7m/no0zOJUWgFONpB7Zv9W2tSaFlA==", + "node_modules/@babel/plugin-transform-logical-assignment-operators": { + "version": "7.22.11", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.22.11.tgz", + "integrity": "sha512-qQwRTP4+6xFCDV5k7gZBF3C31K34ut0tbEcTKxlX/0KXxm9GLcO14p570aWxFvVzx6QAfPgq7gaeIHXJC8LswQ==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.18.6", - "@babel/helper-replace-supers": "^7.18.6" + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4" }, "engines": { "node": ">=6.9.0" @@ -2039,13 +1865,13 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-transform-parameters": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.20.7.tgz", - "integrity": "sha512-WiWBIkeHKVOSYPO0pWkxGPfKeWrCJyD3NJ53+Lrp/QMSZbsVPovrVl2aWZ19D/LTVnaDv5Ap7GJ/B2CTOZdrfA==", + "node_modules/@babel/plugin-transform-member-expression-literals": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.22.5.tgz", + "integrity": "sha512-RZEdkNtzzYCFl9SE9ATaUMTj2hqMb4StarOJLrZRbqqU4HSBE7UlBw9WBWQiDzrJZJdUWiMTVDI6Gv/8DPvfew==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.20.2" + "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { "node": ">=6.9.0" @@ -2054,13 +1880,14 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-transform-property-literals": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.18.6.tgz", - "integrity": "sha512-cYcs6qlgafTud3PAzrrRNbQtfpQ8+y/+M5tKmksS9+M1ckbH6kzY8MrexEM9mcA6JDsukE19iIRvAyYl463sMg==", + "node_modules/@babel/plugin-transform-modules-amd": { + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.23.0.tgz", + "integrity": "sha512-xWT5gefv2HGSm4QHtgc1sYPbseOyf+FFDo2JbpE25GWl5BqTGO9IMwTYJRoIdjsF85GE+VegHxSCUt5EvoYTAw==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.18.6" + "@babel/helper-module-transforms": "^7.23.0", + "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { "node": ">=6.9.0" @@ -2069,14 +1896,260 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-transform-regenerator": { - "version": "7.20.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.20.5.tgz", - "integrity": "sha512-kW/oO7HPBtntbsahzQ0qSE3tFvkFwnbozz3NWFhLGqH75vLEg+sCGngLlhVkePlCs3Jv0dBBHDzCHxNiFAQKCQ==", + "node_modules/@babel/plugin-transform-modules-commonjs": { + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.23.0.tgz", + "integrity": "sha512-32Xzss14/UVc7k9g775yMIvkVK8xwKE0DPdP5JTapr3+Z9w4tzeOuLNY6BXDQR6BdnzIlXnCGAzsk/ICHBLVWQ==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.20.2", - "regenerator-transform": "^0.15.1" + "@babel/helper-module-transforms": "^7.23.0", + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/helper-simple-access": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-modules-systemjs": { + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.23.0.tgz", + "integrity": "sha512-qBej6ctXZD2f+DhlOC9yO47yEYgUh5CZNz/aBoH4j/3NOlRfJXJbY7xDQCqQVf9KbrqGzIWER1f23doHGrIHFg==", + "dev": true, + "dependencies": { + "@babel/helper-hoist-variables": "^7.22.5", + "@babel/helper-module-transforms": "^7.23.0", + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/helper-validator-identifier": "^7.22.20" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-modules-umd": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.22.5.tgz", + "integrity": "sha512-+S6kzefN/E1vkSsKx8kmQuqeQsvCKCd1fraCM7zXm4SFoggI099Tr4G8U81+5gtMdUeMQ4ipdQffbKLX0/7dBQ==", + "dev": true, + "dependencies": { + "@babel/helper-module-transforms": "^7.22.5", + "@babel/helper-plugin-utils": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-named-capturing-groups-regex": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.22.5.tgz", + "integrity": "sha512-YgLLKmS3aUBhHaxp5hi1WJTgOUb/NCuDHzGT9z9WTt3YG+CPRhJs6nprbStx6DnWM4dh6gt7SU3sZodbZ08adQ==", + "dev": true, + "dependencies": { + "@babel/helper-create-regexp-features-plugin": "^7.22.5", + "@babel/helper-plugin-utils": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0" + } + }, + "node_modules/@babel/plugin-transform-new-target": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.22.5.tgz", + "integrity": "sha512-AsF7K0Fx/cNKVyk3a+DW0JLo+Ua598/NxMRvxDnkpCIGFh43+h/v2xyhRUYf6oD8gE4QtL83C7zZVghMjHd+iw==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-nullish-coalescing-operator": { + "version": "7.22.11", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.22.11.tgz", + "integrity": "sha512-YZWOw4HxXrotb5xsjMJUDlLgcDXSfO9eCmdl1bgW4+/lAGdkjaEvOnQ4p5WKKdUgSzO39dgPl0pTnfxm0OAXcg==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-numeric-separator": { + "version": "7.22.11", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.22.11.tgz", + "integrity": "sha512-3dzU4QGPsILdJbASKhF/V2TVP+gJya1PsueQCxIPCEcerqF21oEcrob4mzjsp2Py/1nLfF5m+xYNMDpmA8vffg==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/plugin-syntax-numeric-separator": "^7.10.4" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-object-rest-spread": { + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.22.15.tgz", + "integrity": "sha512-fEB+I1+gAmfAyxZcX1+ZUwLeAuuf8VIg67CTznZE0MqVFumWkh8xWtn58I4dxdVf080wn7gzWoF8vndOViJe9Q==", + "dev": true, + "dependencies": { + "@babel/compat-data": "^7.22.9", + "@babel/helper-compilation-targets": "^7.22.15", + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/plugin-syntax-object-rest-spread": "^7.8.3", + "@babel/plugin-transform-parameters": "^7.22.15" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-object-super": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.22.5.tgz", + "integrity": "sha512-klXqyaT9trSjIUrcsYIfETAzmOEZL3cBYqOYLJxBHfMFFggmXOv+NYSX/Jbs9mzMVESw/WycLFPRx8ba/b2Ipw==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/helper-replace-supers": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-optional-catch-binding": { + "version": "7.22.11", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.22.11.tgz", + "integrity": "sha512-rli0WxesXUeCJnMYhzAglEjLWVDF6ahb45HuprcmQuLidBJFWjNnOzssk2kuc6e33FlLaiZhG/kUIzUMWdBKaQ==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/plugin-syntax-optional-catch-binding": "^7.8.3" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-optional-chaining": { + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.23.0.tgz", + "integrity": "sha512-sBBGXbLJjxTzLBF5rFWaikMnOGOk/BmK6vVByIdEggZ7Vn6CvWXZyRkkLFK6WE0IF8jSliyOkUN6SScFgzCM0g==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5", + "@babel/plugin-syntax-optional-chaining": "^7.8.3" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-parameters": { + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.22.15.tgz", + "integrity": "sha512-hjk7qKIqhyzhhUvRT683TYQOFa/4cQKwQy7ALvTpODswN40MljzNDa0YldevS6tGbxwaEKVn502JmY0dP7qEtQ==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-private-methods": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.22.5.tgz", + "integrity": "sha512-PPjh4gyrQnGe97JTalgRGMuU4icsZFnWkzicB/fUtzlKUqvsWBKEpPPfr5a2JiyirZkHxnAqkQMO5Z5B2kK3fA==", + "dev": true, + "dependencies": { + "@babel/helper-create-class-features-plugin": "^7.22.5", + "@babel/helper-plugin-utils": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-private-property-in-object": { + "version": "7.22.11", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.22.11.tgz", + "integrity": "sha512-sSCbqZDBKHetvjSwpyWzhuHkmW5RummxJBVbYLkGkaiTOWGxml7SXt0iWa03bzxFIx7wOj3g/ILRd0RcJKBeSQ==", + "dev": true, + "dependencies": { + "@babel/helper-annotate-as-pure": "^7.22.5", + "@babel/helper-create-class-features-plugin": "^7.22.11", + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/plugin-syntax-private-property-in-object": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-property-literals": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.22.5.tgz", + "integrity": "sha512-TiOArgddK3mK/x1Qwf5hay2pxI6wCZnvQqrFSqbtg1GLl2JcNMitVH/YnqjP+M31pLUeTfzY1HAXFDnUBV30rQ==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-regenerator": { + "version": "7.22.10", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.22.10.tgz", + "integrity": "sha512-F28b1mDt8KcT5bUyJc/U9nwzw6cV+UmTeRlXYIl2TNqMMJif0Jeey9/RQ3C4NOd2zp0/TRsDns9ttj2L523rsw==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.22.5", + "regenerator-transform": "^0.15.2" }, "engines": { "node": ">=6.9.0" @@ -2086,12 +2159,12 @@ } }, "node_modules/@babel/plugin-transform-reserved-words": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.18.6.tgz", - "integrity": "sha512-oX/4MyMoypzHjFrT1CdivfKZ+XvIPMFXwwxHp/r0Ddy2Vuomt4HDFGmft1TAY2yiTKiNSsh3kjBAzcM8kSdsjA==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.22.5.tgz", + "integrity": "sha512-DTtGKFRQUDm8svigJzZHzb/2xatPc6TzNvAIJ5GqOKDsGFYgAskjRulbR/vGsPKq3OPqtexnz327qYpP57RFyA==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.18.6" + "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { "node": ">=6.9.0" @@ -2101,17 +2174,17 @@ } }, "node_modules/@babel/plugin-transform-runtime": { - "version": "7.19.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.19.6.tgz", - "integrity": "sha512-PRH37lz4JU156lYFW1p8OxE5i7d6Sl/zV58ooyr+q1J1lnQPyg5tIiXlIwNVhJaY4W3TmOtdc8jqdXQcB1v5Yw==", + "version": "7.22.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.22.9.tgz", + "integrity": "sha512-9KjBH61AGJetCPYp/IEyLEp47SyybZb0nDRpBvmtEkm+rUIwxdlKpyNHI1TmsGkeuLclJdleQHRZ8XLBnnh8CQ==", "dev": true, "dependencies": { - "@babel/helper-module-imports": "^7.18.6", - "@babel/helper-plugin-utils": "^7.19.0", - "babel-plugin-polyfill-corejs2": "^0.3.3", - "babel-plugin-polyfill-corejs3": "^0.6.0", - "babel-plugin-polyfill-regenerator": "^0.4.1", - "semver": "^6.3.0" + "@babel/helper-module-imports": "^7.22.5", + "@babel/helper-plugin-utils": "^7.22.5", + "babel-plugin-polyfill-corejs2": "^0.4.4", + "babel-plugin-polyfill-corejs3": "^0.8.2", + "babel-plugin-polyfill-regenerator": "^0.5.1", + "semver": "^6.3.1" }, "engines": { "node": ">=6.9.0" @@ -2121,21 +2194,21 @@ } }, "node_modules/@babel/plugin-transform-runtime/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, "bin": { "semver": "bin/semver.js" } }, "node_modules/@babel/plugin-transform-shorthand-properties": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.18.6.tgz", - "integrity": "sha512-eCLXXJqv8okzg86ywZJbRn19YJHU4XUa55oz2wbHhaQVn/MM+XhukiT7SYqp/7o00dg52Rj51Ny+Ecw4oyoygw==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.22.5.tgz", + "integrity": "sha512-vM4fq9IXHscXVKzDv5itkO1X52SmdFBFcMIBZ2FRn2nqVYqw6dBexUgMvAjHW+KXpPPViD/Yo3GrDEBaRC0QYA==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.18.6" + "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { "node": ">=6.9.0" @@ -2145,13 +2218,13 @@ } }, "node_modules/@babel/plugin-transform-spread": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.20.7.tgz", - "integrity": "sha512-ewBbHQ+1U/VnH1fxltbJqDeWBU1oNLG8Dj11uIv3xVf7nrQu0bPGe5Rf716r7K5Qz+SqtAOVswoVunoiBtGhxw==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.22.5.tgz", + "integrity": "sha512-5ZzDQIGyvN4w8+dMmpohL6MBo+l2G7tfC/O2Dg7/hjpgeWvUx8FzfeOKxGog9IimPa4YekaQ9PlDqTLOljkcxg==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.20.2", - "@babel/helper-skip-transparent-expression-wrappers": "^7.20.0" + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5" }, "engines": { "node": ">=6.9.0" @@ -2161,12 +2234,12 @@ } }, "node_modules/@babel/plugin-transform-sticky-regex": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.18.6.tgz", - "integrity": "sha512-kfiDrDQ+PBsQDO85yj1icueWMfGfJFKN1KCkndygtu/C9+XUfydLC8Iv5UYJqRwy4zk8EcplRxEOeLyjq1gm6Q==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.22.5.tgz", + "integrity": "sha512-zf7LuNpHG0iEeiyCNwX4j3gDg1jgt1k3ZdXBKbZSoA3BbGQGvMiSvfbZRR3Dr3aeJe3ooWFZxOOG3IRStYp2Bw==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.18.6" + "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { "node": ">=6.9.0" @@ -2176,12 +2249,12 @@ } }, "node_modules/@babel/plugin-transform-template-literals": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.9.tgz", - "integrity": "sha512-S8cOWfT82gTezpYOiVaGHrCbhlHgKhQt8XH5ES46P2XWmX92yisoZywf5km75wv5sYcXDUCLMmMxOLCtthDgMA==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.22.5.tgz", + "integrity": "sha512-5ciOehRNf+EyUeewo8NkbQiUs4d6ZxiHo6BcBcnFlgiJfu16q0bQUw9Jvo0b0gBKFG1SMhDSjeKXSYuJLeFSMA==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.18.9" + "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { "node": ">=6.9.0" @@ -2191,12 +2264,12 @@ } }, "node_modules/@babel/plugin-transform-typeof-symbol": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.18.9.tgz", - "integrity": "sha512-SRfwTtF11G2aemAZWivL7PD+C9z52v9EvMqH9BuYbabyPuKUvSWks3oCg6041pT925L4zVFqaVBeECwsmlguEw==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.22.5.tgz", + "integrity": "sha512-bYkI5lMzL4kPii4HHEEChkD0rkc+nvnlR6+o/qdqR6zrm0Sv/nodmyLhlq2DO0YKLUNd2VePmPRjJXSBh9OIdA==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.18.9" + "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { "node": ">=6.9.0" @@ -2206,12 +2279,28 @@ } }, "node_modules/@babel/plugin-transform-unicode-escapes": { - "version": "7.18.10", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.18.10.tgz", - "integrity": "sha512-kKAdAI+YzPgGY/ftStBFXTI1LZFju38rYThnfMykS+IXy8BVx+res7s2fxf1l8I35DV2T97ezo6+SGrXz6B3iQ==", + "version": "7.22.10", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.22.10.tgz", + "integrity": "sha512-lRfaRKGZCBqDlRU3UIFovdp9c9mEvlylmpod0/OatICsSfuQ9YFthRo1tpTkGsklEefZdqlEFdY4A2dwTb6ohg==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.18.9" + "@babel/helper-plugin-utils": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-unicode-property-regex": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.22.5.tgz", + "integrity": "sha512-HCCIb+CbJIAE6sXn5CjFQXMwkCClcOfPCzTlilJ8cUatfzwHlWQkbtV0zD338u9dZskwvuOYTuuaMaA8J5EI5A==", + "dev": true, + "dependencies": { + "@babel/helper-create-regexp-features-plugin": "^7.22.5", + "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { "node": ">=6.9.0" @@ -2221,13 +2310,13 @@ } }, "node_modules/@babel/plugin-transform-unicode-regex": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.18.6.tgz", - "integrity": "sha512-gE7A6Lt7YLnNOL3Pb9BNeZvi+d8l7tcRrG4+pwJjK9hD2xX4mEvjlQW60G9EEmfXVYRPv9VRQcyegIVHCql/AA==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.22.5.tgz", + "integrity": "sha512-028laaOKptN5vHJf9/Arr/HiJekMd41hOEZYvNsrsXqJ7YPYuX2bQxh31fkZzGmq3YqHRJzYFFAVYvKfMPKqyg==", "dev": true, "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.18.6", - "@babel/helper-plugin-utils": "^7.18.6" + "@babel/helper-create-regexp-features-plugin": "^7.22.5", + "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { "node": ">=6.9.0" @@ -2236,39 +2325,43 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/preset-env": { - "version": "7.20.2", - "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.20.2.tgz", - "integrity": "sha512-1G0efQEWR1EHkKvKHqbG+IN/QdgwfByUpM5V5QroDzGV2t3S/WXNQd693cHiHTlCFMpr9B6FkPFXDA2lQcKoDg==", + "node_modules/@babel/plugin-transform-unicode-sets-regex": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.22.5.tgz", + "integrity": "sha512-lhMfi4FC15j13eKrh3DnYHjpGj6UKQHtNKTbtc1igvAhRy4+kLhV07OpLcsN0VgDEw/MjAvJO4BdMJsHwMhzCg==", "dev": true, "dependencies": { - "@babel/compat-data": "^7.20.1", - "@babel/helper-compilation-targets": "^7.20.0", - "@babel/helper-plugin-utils": "^7.20.2", - "@babel/helper-validator-option": "^7.18.6", - "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.18.6", - "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.18.9", - "@babel/plugin-proposal-async-generator-functions": "^7.20.1", - "@babel/plugin-proposal-class-properties": "^7.18.6", - "@babel/plugin-proposal-class-static-block": "^7.18.6", - "@babel/plugin-proposal-dynamic-import": "^7.18.6", - "@babel/plugin-proposal-export-namespace-from": "^7.18.9", - "@babel/plugin-proposal-json-strings": "^7.18.6", - "@babel/plugin-proposal-logical-assignment-operators": "^7.18.9", - "@babel/plugin-proposal-nullish-coalescing-operator": "^7.18.6", - "@babel/plugin-proposal-numeric-separator": "^7.18.6", - "@babel/plugin-proposal-object-rest-spread": "^7.20.2", - "@babel/plugin-proposal-optional-catch-binding": "^7.18.6", - "@babel/plugin-proposal-optional-chaining": "^7.18.9", - "@babel/plugin-proposal-private-methods": "^7.18.6", - "@babel/plugin-proposal-private-property-in-object": "^7.18.6", - "@babel/plugin-proposal-unicode-property-regex": "^7.18.6", + "@babel/helper-create-regexp-features-plugin": "^7.22.5", + "@babel/helper-plugin-utils": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0" + } + }, + "node_modules/@babel/preset-env": { + "version": "7.22.9", + "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.22.9.tgz", + "integrity": "sha512-wNi5H/Emkhll/bqPjsjQorSykrlfY5OWakd6AulLvMEytpKasMVUpVy8RL4qBIBs5Ac6/5i0/Rv0b/Fg6Eag/g==", + "dev": true, + "dependencies": { + "@babel/compat-data": "^7.22.9", + "@babel/helper-compilation-targets": "^7.22.9", + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/helper-validator-option": "^7.22.5", + "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.22.5", + "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.22.5", + "@babel/plugin-proposal-private-property-in-object": "7.21.0-placeholder-for-preset-env.2", "@babel/plugin-syntax-async-generators": "^7.8.4", "@babel/plugin-syntax-class-properties": "^7.12.13", "@babel/plugin-syntax-class-static-block": "^7.14.5", "@babel/plugin-syntax-dynamic-import": "^7.8.3", "@babel/plugin-syntax-export-namespace-from": "^7.8.3", - "@babel/plugin-syntax-import-assertions": "^7.20.0", + "@babel/plugin-syntax-import-assertions": "^7.22.5", + "@babel/plugin-syntax-import-attributes": "^7.22.5", + "@babel/plugin-syntax-import-meta": "^7.10.4", "@babel/plugin-syntax-json-strings": "^7.8.3", "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4", "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3", @@ -2278,45 +2371,62 @@ "@babel/plugin-syntax-optional-chaining": "^7.8.3", "@babel/plugin-syntax-private-property-in-object": "^7.14.5", "@babel/plugin-syntax-top-level-await": "^7.14.5", - "@babel/plugin-transform-arrow-functions": "^7.18.6", - "@babel/plugin-transform-async-to-generator": "^7.18.6", - "@babel/plugin-transform-block-scoped-functions": "^7.18.6", - "@babel/plugin-transform-block-scoping": "^7.20.2", - "@babel/plugin-transform-classes": "^7.20.2", - "@babel/plugin-transform-computed-properties": "^7.18.9", - "@babel/plugin-transform-destructuring": "^7.20.2", - "@babel/plugin-transform-dotall-regex": "^7.18.6", - "@babel/plugin-transform-duplicate-keys": "^7.18.9", - "@babel/plugin-transform-exponentiation-operator": "^7.18.6", - "@babel/plugin-transform-for-of": "^7.18.8", - "@babel/plugin-transform-function-name": "^7.18.9", - "@babel/plugin-transform-literals": "^7.18.9", - "@babel/plugin-transform-member-expression-literals": "^7.18.6", - "@babel/plugin-transform-modules-amd": "^7.19.6", - "@babel/plugin-transform-modules-commonjs": "^7.19.6", - "@babel/plugin-transform-modules-systemjs": "^7.19.6", - "@babel/plugin-transform-modules-umd": "^7.18.6", - "@babel/plugin-transform-named-capturing-groups-regex": "^7.19.1", - "@babel/plugin-transform-new-target": "^7.18.6", - "@babel/plugin-transform-object-super": "^7.18.6", - "@babel/plugin-transform-parameters": "^7.20.1", - "@babel/plugin-transform-property-literals": "^7.18.6", - "@babel/plugin-transform-regenerator": "^7.18.6", - "@babel/plugin-transform-reserved-words": "^7.18.6", - "@babel/plugin-transform-shorthand-properties": "^7.18.6", - "@babel/plugin-transform-spread": "^7.19.0", - "@babel/plugin-transform-sticky-regex": "^7.18.6", - "@babel/plugin-transform-template-literals": "^7.18.9", - "@babel/plugin-transform-typeof-symbol": "^7.18.9", - "@babel/plugin-transform-unicode-escapes": "^7.18.10", - "@babel/plugin-transform-unicode-regex": "^7.18.6", + "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6", + "@babel/plugin-transform-arrow-functions": "^7.22.5", + "@babel/plugin-transform-async-generator-functions": "^7.22.7", + "@babel/plugin-transform-async-to-generator": "^7.22.5", + "@babel/plugin-transform-block-scoped-functions": "^7.22.5", + "@babel/plugin-transform-block-scoping": "^7.22.5", + "@babel/plugin-transform-class-properties": "^7.22.5", + "@babel/plugin-transform-class-static-block": "^7.22.5", + "@babel/plugin-transform-classes": "^7.22.6", + "@babel/plugin-transform-computed-properties": "^7.22.5", + "@babel/plugin-transform-destructuring": "^7.22.5", + "@babel/plugin-transform-dotall-regex": "^7.22.5", + "@babel/plugin-transform-duplicate-keys": "^7.22.5", + "@babel/plugin-transform-dynamic-import": "^7.22.5", + "@babel/plugin-transform-exponentiation-operator": "^7.22.5", + "@babel/plugin-transform-export-namespace-from": "^7.22.5", + "@babel/plugin-transform-for-of": "^7.22.5", + "@babel/plugin-transform-function-name": "^7.22.5", + "@babel/plugin-transform-json-strings": "^7.22.5", + "@babel/plugin-transform-literals": "^7.22.5", + "@babel/plugin-transform-logical-assignment-operators": "^7.22.5", + "@babel/plugin-transform-member-expression-literals": "^7.22.5", + "@babel/plugin-transform-modules-amd": "^7.22.5", + "@babel/plugin-transform-modules-commonjs": "^7.22.5", + "@babel/plugin-transform-modules-systemjs": "^7.22.5", + "@babel/plugin-transform-modules-umd": "^7.22.5", + "@babel/plugin-transform-named-capturing-groups-regex": "^7.22.5", + "@babel/plugin-transform-new-target": "^7.22.5", + "@babel/plugin-transform-nullish-coalescing-operator": "^7.22.5", + "@babel/plugin-transform-numeric-separator": "^7.22.5", + "@babel/plugin-transform-object-rest-spread": "^7.22.5", + "@babel/plugin-transform-object-super": "^7.22.5", + "@babel/plugin-transform-optional-catch-binding": "^7.22.5", + "@babel/plugin-transform-optional-chaining": "^7.22.6", + "@babel/plugin-transform-parameters": "^7.22.5", + "@babel/plugin-transform-private-methods": "^7.22.5", + "@babel/plugin-transform-private-property-in-object": "^7.22.5", + "@babel/plugin-transform-property-literals": "^7.22.5", + "@babel/plugin-transform-regenerator": "^7.22.5", + "@babel/plugin-transform-reserved-words": "^7.22.5", + "@babel/plugin-transform-shorthand-properties": "^7.22.5", + "@babel/plugin-transform-spread": "^7.22.5", + "@babel/plugin-transform-sticky-regex": "^7.22.5", + "@babel/plugin-transform-template-literals": "^7.22.5", + "@babel/plugin-transform-typeof-symbol": "^7.22.5", + "@babel/plugin-transform-unicode-escapes": "^7.22.5", + "@babel/plugin-transform-unicode-property-regex": "^7.22.5", + "@babel/plugin-transform-unicode-regex": "^7.22.5", + "@babel/plugin-transform-unicode-sets-regex": "^7.22.5", "@babel/preset-modules": "^0.1.5", - "@babel/types": "^7.20.2", - "babel-plugin-polyfill-corejs2": "^0.3.3", - "babel-plugin-polyfill-corejs3": "^0.6.0", - "babel-plugin-polyfill-regenerator": "^0.4.1", - "core-js-compat": "^3.25.1", - "semver": "^6.3.0" + "@babel/types": "^7.22.5", + "babel-plugin-polyfill-corejs2": "^0.4.4", + "babel-plugin-polyfill-corejs3": "^0.8.2", + "babel-plugin-polyfill-regenerator": "^0.5.1", + "core-js-compat": "^3.31.0", + "semver": "^6.3.1" }, "engines": { "node": ">=6.9.0" @@ -2326,18 +2436,18 @@ } }, "node_modules/@babel/preset-env/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, "bin": { "semver": "bin/semver.js" } }, "node_modules/@babel/preset-modules": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.5.tgz", - "integrity": "sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==", + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.6.tgz", + "integrity": "sha512-ID2yj6K/4lKfhuU3+EX4UvNbIt7eACFbHmNUjzA+ep+B5971CknnA/9DEWKbRokfbbtblxxxXFJJrH47UEAMVg==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.0.0", @@ -2347,13 +2457,19 @@ "esutils": "^2.0.2" }, "peerDependencies": { - "@babel/core": "^7.0.0-0" + "@babel/core": "^7.0.0-0 || ^8.0.0-0 <8.0.0" } }, + "node_modules/@babel/regjsgen": { + "version": "0.8.0", + "resolved": "https://registry.npmjs.org/@babel/regjsgen/-/regjsgen-0.8.0.tgz", + "integrity": "sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==", + "dev": true + }, "node_modules/@babel/runtime": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.7.tgz", - "integrity": "sha512-UF0tvkUtxwAgZ5W/KrkHf0Rn0fdnLDU9ScxBrEVNUprE/MzirjK4MJUX1/BVDv00Sv8cljtukVK1aky++X1SjQ==", + "version": "7.22.6", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.22.6.tgz", + "integrity": "sha512-wDb5pWm4WDdF6LFUde3Jl8WzPA+3ZbxYqkC6xAXuD3irdEHN1k0NfTRrJD8ZD378SJ61miMLCqIOXYhd8x+AJQ==", "dev": true, "dependencies": { "regenerator-runtime": "^0.13.11" @@ -2363,33 +2479,33 @@ } }, "node_modules/@babel/template": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.20.7.tgz", - "integrity": "sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.5.tgz", + "integrity": "sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw==", "dev": true, "dependencies": { - "@babel/code-frame": "^7.18.6", - "@babel/parser": "^7.20.7", - "@babel/types": "^7.20.7" + "@babel/code-frame": "^7.22.5", + "@babel/parser": "^7.22.5", + "@babel/types": "^7.22.5" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/traverse": { - "version": "7.20.12", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.20.12.tgz", - "integrity": "sha512-MsIbFN0u+raeja38qboyF8TIT7K0BFzz/Yd/77ta4MsUsmP2RAnidIlwq7d5HFQrH/OZJecGV6B71C4zAgpoSQ==", - "dev": true, - "dependencies": { - "@babel/code-frame": "^7.18.6", - "@babel/generator": "^7.20.7", - "@babel/helper-environment-visitor": "^7.18.9", - "@babel/helper-function-name": "^7.19.0", - "@babel/helper-hoist-variables": "^7.18.6", - "@babel/helper-split-export-declaration": "^7.18.6", - "@babel/parser": "^7.20.7", - "@babel/types": "^7.20.7", + "version": "7.23.2", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.2.tgz", + "integrity": "sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==", + "dev": true, + "dependencies": { + "@babel/code-frame": "^7.22.13", + "@babel/generator": "^7.23.0", + "@babel/helper-environment-visitor": "^7.22.20", + "@babel/helper-function-name": "^7.23.0", + "@babel/helper-hoist-variables": "^7.22.5", + "@babel/helper-split-export-declaration": "^7.22.6", + "@babel/parser": "^7.23.0", + "@babel/types": "^7.23.0", "debug": "^4.1.0", "globals": "^11.1.0" }, @@ -2397,14 +2513,29 @@ "node": ">=6.9.0" } }, + "node_modules/@babel/traverse/node_modules/@babel/generator": { + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.0.tgz", + "integrity": "sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==", + "dev": true, + "dependencies": { + "@babel/types": "^7.23.0", + "@jridgewell/gen-mapping": "^0.3.2", + "@jridgewell/trace-mapping": "^0.3.17", + "jsesc": "^2.5.1" + }, + "engines": { + "node": ">=6.9.0" + } + }, "node_modules/@babel/types": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.20.7.tgz", - "integrity": "sha512-69OnhBxSSgK0OzTJai4kyPDiKTIe3j+ctaHdIGVbRahTLAT7L3R9oeXHC2aVSuGYt3cVnoAMDmOCgJ2yaiLMvg==", + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.0.tgz", + "integrity": "sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==", "dev": true, "dependencies": { - "@babel/helper-string-parser": "^7.19.4", - "@babel/helper-validator-identifier": "^7.19.1", + "@babel/helper-string-parser": "^7.22.5", + "@babel/helper-validator-identifier": "^7.22.20", "to-fast-properties": "^2.0.0" }, "engines": { @@ -2412,9 +2543,9 @@ } }, "node_modules/@bcgov/bc-sans": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@bcgov/bc-sans/-/bc-sans-1.0.1.tgz", - "integrity": "sha512-4suRUBFeHcuFkwXXJu9pKJNB5Z2G3bpuLEHIq203KVCKC8KrsnqvsyUOf645TypgLwqOTOYCETiXYzfxF4gLAw==" + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/@bcgov/bc-sans/-/bc-sans-2.1.0.tgz", + "integrity": "sha512-1MesF4NAVpM5dywoJ68wNcBylHbPqg1dDV/FNuQm0BbspETGlPmfX8LG8rtrCjCAPhWuL2qRT/lBYDUMvFTUnw==" }, "node_modules/@bcoe/v8-coverage": { "version": "0.2.3", @@ -2432,9 +2563,9 @@ } }, "node_modules/@esbuild/android-arm": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.16.17.tgz", - "integrity": "sha512-N9x1CMXVhtWEAMS7pNNONyA14f71VPQN9Cnavj1XQh6T7bskqiLLrSca4O0Vr8Wdcga943eThxnVp3JLnBMYtw==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.17.tgz", + "integrity": "sha512-wHsmJG/dnL3OkpAcwbgoBTTMHVi4Uyou3F5mf58ZtmUyIKfcdA7TROav/6tCzET4A3QW2Q2FC+eFneMU+iyOxg==", "cpu": [ "arm" ], @@ -2448,9 +2579,9 @@ } }, "node_modules/@esbuild/android-arm64": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.16.17.tgz", - "integrity": "sha512-MIGl6p5sc3RDTLLkYL1MyL8BMRN4tLMRCn+yRJJmEDvYZ2M7tmAf80hx1kbNEUX2KJ50RRtxZ4JHLvCfuB6kBg==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.18.17.tgz", + "integrity": "sha512-9np+YYdNDed5+Jgr1TdWBsozZ85U1Oa3xW0c7TWqH0y2aGghXtZsuT8nYRbzOMcl0bXZXjOGbksoTtVOlWrRZg==", "cpu": [ "arm64" ], @@ -2464,9 +2595,9 @@ } }, "node_modules/@esbuild/android-x64": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.16.17.tgz", - "integrity": "sha512-a3kTv3m0Ghh4z1DaFEuEDfz3OLONKuFvI4Xqczqx4BqLyuFaFkuaG4j2MtA6fuWEFeC5x9IvqnX7drmRq/fyAQ==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.18.17.tgz", + "integrity": "sha512-O+FeWB/+xya0aLg23hHEM2E3hbfwZzjqumKMSIqcHbNvDa+dza2D0yLuymRBQQnC34CWrsJUXyH2MG5VnLd6uw==", "cpu": [ "x64" ], @@ -2480,9 +2611,9 @@ } }, "node_modules/@esbuild/darwin-arm64": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.16.17.tgz", - "integrity": "sha512-/2agbUEfmxWHi9ARTX6OQ/KgXnOWfsNlTeLcoV7HSuSTv63E4DqtAc+2XqGw1KHxKMHGZgbVCZge7HXWX9Vn+w==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.18.17.tgz", + "integrity": "sha512-M9uJ9VSB1oli2BE/dJs3zVr9kcCBBsE883prage1NWz6pBS++1oNn/7soPNS3+1DGj0FrkSvnED4Bmlu1VAE9g==", "cpu": [ "arm64" ], @@ -2496,9 +2627,9 @@ } }, "node_modules/@esbuild/darwin-x64": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.16.17.tgz", - "integrity": "sha512-2By45OBHulkd9Svy5IOCZt376Aa2oOkiE9QWUK9fe6Tb+WDr8hXL3dpqi+DeLiMed8tVXspzsTAvd0jUl96wmg==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.18.17.tgz", + "integrity": "sha512-XDre+J5YeIJDMfp3n0279DFNrGCXlxOuGsWIkRb1NThMZ0BsrWXoTg23Jer7fEXQ9Ye5QjrvXpxnhzl3bHtk0g==", "cpu": [ "x64" ], @@ -2512,9 +2643,9 @@ } }, "node_modules/@esbuild/freebsd-arm64": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.16.17.tgz", - "integrity": "sha512-mt+cxZe1tVx489VTb4mBAOo2aKSnJ33L9fr25JXpqQqzbUIw/yzIzi+NHwAXK2qYV1lEFp4OoVeThGjUbmWmdw==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.17.tgz", + "integrity": "sha512-cjTzGa3QlNfERa0+ptykyxs5A6FEUQQF0MuilYXYBGdBxD3vxJcKnzDlhDCa1VAJCmAxed6mYhA2KaJIbtiNuQ==", "cpu": [ "arm64" ], @@ -2528,9 +2659,9 @@ } }, "node_modules/@esbuild/freebsd-x64": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.16.17.tgz", - "integrity": "sha512-8ScTdNJl5idAKjH8zGAsN7RuWcyHG3BAvMNpKOBaqqR7EbUhhVHOqXRdL7oZvz8WNHL2pr5+eIT5c65kA6NHug==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.18.17.tgz", + "integrity": "sha512-sOxEvR8d7V7Kw8QqzxWc7bFfnWnGdaFBut1dRUYtu+EIRXefBc/eIsiUiShnW0hM3FmQ5Zf27suDuHsKgZ5QrA==", "cpu": [ "x64" ], @@ -2544,9 +2675,9 @@ } }, "node_modules/@esbuild/linux-arm": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.16.17.tgz", - "integrity": "sha512-iihzrWbD4gIT7j3caMzKb/RsFFHCwqqbrbH9SqUSRrdXkXaygSZCZg1FybsZz57Ju7N/SHEgPyaR0LZ8Zbe9gQ==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.18.17.tgz", + "integrity": "sha512-2d3Lw6wkwgSLC2fIvXKoMNGVaeY8qdN0IC3rfuVxJp89CRfA3e3VqWifGDfuakPmp90+ZirmTfye1n4ncjv2lg==", "cpu": [ "arm" ], @@ -2560,9 +2691,9 @@ } }, "node_modules/@esbuild/linux-arm64": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.16.17.tgz", - "integrity": "sha512-7S8gJnSlqKGVJunnMCrXHU9Q8Q/tQIxk/xL8BqAP64wchPCTzuM6W3Ra8cIa1HIflAvDnNOt2jaL17vaW+1V0g==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.18.17.tgz", + "integrity": "sha512-c9w3tE7qA3CYWjT+M3BMbwMt+0JYOp3vCMKgVBrCl1nwjAlOMYzEo+gG7QaZ9AtqZFj5MbUc885wuBBmu6aADQ==", "cpu": [ "arm64" ], @@ -2576,9 +2707,9 @@ } }, "node_modules/@esbuild/linux-ia32": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.16.17.tgz", - "integrity": "sha512-kiX69+wcPAdgl3Lonh1VI7MBr16nktEvOfViszBSxygRQqSpzv7BffMKRPMFwzeJGPxcio0pdD3kYQGpqQ2SSg==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.18.17.tgz", + "integrity": "sha512-1DS9F966pn5pPnqXYz16dQqWIB0dmDfAQZd6jSSpiT9eX1NzKh07J6VKR3AoXXXEk6CqZMojiVDSZi1SlmKVdg==", "cpu": [ "ia32" ], @@ -2592,9 +2723,9 @@ } }, "node_modules/@esbuild/linux-loong64": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.16.17.tgz", - "integrity": "sha512-dTzNnQwembNDhd654cA4QhbS9uDdXC3TKqMJjgOWsC0yNCbpzfWoXdZvp0mY7HU6nzk5E0zpRGGx3qoQg8T2DQ==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.18.17.tgz", + "integrity": "sha512-EvLsxCk6ZF0fpCB6w6eOI2Fc8KW5N6sHlIovNe8uOFObL2O+Mr0bflPHyHwLT6rwMg9r77WOAWb2FqCQrVnwFg==", "cpu": [ "loong64" ], @@ -2608,9 +2739,9 @@ } }, "node_modules/@esbuild/linux-mips64el": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.16.17.tgz", - "integrity": "sha512-ezbDkp2nDl0PfIUn0CsQ30kxfcLTlcx4Foz2kYv8qdC6ia2oX5Q3E/8m6lq84Dj/6b0FrkgD582fJMIfHhJfSw==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.18.17.tgz", + "integrity": "sha512-e0bIdHA5p6l+lwqTE36NAW5hHtw2tNRmHlGBygZC14QObsA3bD4C6sXLJjvnDIjSKhW1/0S3eDy+QmX/uZWEYQ==", "cpu": [ "mips64el" ], @@ -2624,9 +2755,9 @@ } }, "node_modules/@esbuild/linux-ppc64": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.16.17.tgz", - "integrity": "sha512-dzS678gYD1lJsW73zrFhDApLVdM3cUF2MvAa1D8K8KtcSKdLBPP4zZSLy6LFZ0jYqQdQ29bjAHJDgz0rVbLB3g==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.18.17.tgz", + "integrity": "sha512-BAAilJ0M5O2uMxHYGjFKn4nJKF6fNCdP1E0o5t5fvMYYzeIqy2JdAP88Az5LHt9qBoUa4tDaRpfWt21ep5/WqQ==", "cpu": [ "ppc64" ], @@ -2640,9 +2771,9 @@ } }, "node_modules/@esbuild/linux-riscv64": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.16.17.tgz", - "integrity": "sha512-ylNlVsxuFjZK8DQtNUwiMskh6nT0vI7kYl/4fZgV1llP5d6+HIeL/vmmm3jpuoo8+NuXjQVZxmKuhDApK0/cKw==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.18.17.tgz", + "integrity": "sha512-Wh/HW2MPnC3b8BqRSIme/9Zhab36PPH+3zam5pqGRH4pE+4xTrVLx2+XdGp6fVS3L2x+DrsIcsbMleex8fbE6g==", "cpu": [ "riscv64" ], @@ -2656,9 +2787,9 @@ } }, "node_modules/@esbuild/linux-s390x": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.16.17.tgz", - "integrity": "sha512-gzy7nUTO4UA4oZ2wAMXPNBGTzZFP7mss3aKR2hH+/4UUkCOyqmjXiKpzGrY2TlEUhbbejzXVKKGazYcQTZWA/w==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.18.17.tgz", + "integrity": "sha512-j/34jAl3ul3PNcK3pfI0NSlBANduT2UO5kZ7FCaK33XFv3chDhICLY8wJJWIhiQ+YNdQ9dxqQctRg2bvrMlYgg==", "cpu": [ "s390x" ], @@ -2672,9 +2803,9 @@ } }, "node_modules/@esbuild/linux-x64": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.16.17.tgz", - "integrity": "sha512-mdPjPxfnmoqhgpiEArqi4egmBAMYvaObgn4poorpUaqmvzzbvqbowRllQ+ZgzGVMGKaPkqUmPDOOFQRUFDmeUw==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.18.17.tgz", + "integrity": "sha512-QM50vJ/y+8I60qEmFxMoxIx4de03pGo2HwxdBeFd4nMh364X6TIBZ6VQ5UQmPbQWUVWHWws5MmJXlHAXvJEmpQ==", "cpu": [ "x64" ], @@ -2688,9 +2819,9 @@ } }, "node_modules/@esbuild/netbsd-x64": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.16.17.tgz", - "integrity": "sha512-/PzmzD/zyAeTUsduZa32bn0ORug+Jd1EGGAUJvqfeixoEISYpGnAezN6lnJoskauoai0Jrs+XSyvDhppCPoKOA==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.18.17.tgz", + "integrity": "sha512-/jGlhWR7Sj9JPZHzXyyMZ1RFMkNPjC6QIAan0sDOtIo2TYk3tZn5UDrkE0XgsTQCxWTTOcMPf9p6Rh2hXtl5TQ==", "cpu": [ "x64" ], @@ -2704,9 +2835,9 @@ } }, "node_modules/@esbuild/openbsd-x64": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.16.17.tgz", - "integrity": "sha512-2yaWJhvxGEz2RiftSk0UObqJa/b+rIAjnODJgv2GbGGpRwAfpgzyrg1WLK8rqA24mfZa9GvpjLcBBg8JHkoodg==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.18.17.tgz", + "integrity": "sha512-rSEeYaGgyGGf4qZM2NonMhMOP/5EHp4u9ehFiBrg7stH6BYEEjlkVREuDEcQ0LfIl53OXLxNbfuIj7mr5m29TA==", "cpu": [ "x64" ], @@ -2720,9 +2851,9 @@ } }, "node_modules/@esbuild/sunos-x64": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.16.17.tgz", - "integrity": "sha512-xtVUiev38tN0R3g8VhRfN7Zl42YCJvyBhRKw1RJjwE1d2emWTVToPLNEQj/5Qxc6lVFATDiy6LjVHYhIPrLxzw==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.18.17.tgz", + "integrity": "sha512-Y7ZBbkLqlSgn4+zot4KUNYst0bFoO68tRgI6mY2FIM+b7ZbyNVtNbDP5y8qlu4/knZZ73fgJDlXID+ohY5zt5g==", "cpu": [ "x64" ], @@ -2736,9 +2867,9 @@ } }, "node_modules/@esbuild/win32-arm64": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.16.17.tgz", - "integrity": "sha512-ga8+JqBDHY4b6fQAmOgtJJue36scANy4l/rL97W+0wYmijhxKetzZdKOJI7olaBaMhWt8Pac2McJdZLxXWUEQw==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.18.17.tgz", + "integrity": "sha512-bwPmTJsEQcbZk26oYpc4c/8PvTY3J5/QK8jM19DVlEsAB41M39aWovWoHtNm78sd6ip6prilxeHosPADXtEJFw==", "cpu": [ "arm64" ], @@ -2752,9 +2883,9 @@ } }, "node_modules/@esbuild/win32-ia32": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.16.17.tgz", - "integrity": "sha512-WnsKaf46uSSF/sZhwnqE4L/F89AYNMiD4YtEcYekBt9Q7nj0DiId2XH2Ng2PHM54qi5oPrQ8luuzGszqi/veig==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.18.17.tgz", + "integrity": "sha512-H/XaPtPKli2MhW+3CQueo6Ni3Avggi6hP/YvgkEe1aSaxw+AeO8MFjq8DlgfTd9Iz4Yih3QCZI6YLMoyccnPRg==", "cpu": [ "ia32" ], @@ -2768,9 +2899,9 @@ } }, "node_modules/@esbuild/win32-x64": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.16.17.tgz", - "integrity": "sha512-y+EHuSchhL7FjHgvQL/0fnnFmO4T1bhvWANX6gcnqTjtnKWbTvUMCpGnv2+t+31d7RzyEAYAd4u2fnIhHL6N/Q==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.17.tgz", + "integrity": "sha512-fGEb8f2BSA3CW7riJVurug65ACLuQAzKq0SSqkY2b2yHHH0MzDfbLyKIGzHwOI/gkHcxM/leuSW6D5w/LMNitA==", "cpu": [ "x64" ], @@ -2783,15 +2914,39 @@ "node": ">=12" } }, + "node_modules/@eslint-community/eslint-utils": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz", + "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==", + "dev": true, + "dependencies": { + "eslint-visitor-keys": "^3.3.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "peerDependencies": { + "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0" + } + }, + "node_modules/@eslint-community/regexpp": { + "version": "4.10.0", + "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.10.0.tgz", + "integrity": "sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==", + "dev": true, + "engines": { + "node": "^12.0.0 || ^14.0.0 || >=16.0.0" + } + }, "node_modules/@eslint/eslintrc": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.4.1.tgz", - "integrity": "sha512-XXrH9Uarn0stsyldqDYq8r++mROmWRI1xKMXa640Bb//SY1+ECYX6VzT6Lcx5frD0V30XieqJ0oX9I2Xj5aoMA==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.2.tgz", + "integrity": "sha512-+wvgpDsrB1YqAMdEUCcnTlpfVBH7Vqn6A/NT3D8WVXFIaKMlErPIZT3oCIAVCOtarRpMtelZLqJeU3t7WY6X6g==", "dev": true, "dependencies": { "ajv": "^6.12.4", "debug": "^4.3.2", - "espree": "^9.4.0", + "espree": "^9.6.0", "globals": "^13.19.0", "ignore": "^5.2.0", "import-fresh": "^3.2.1", @@ -2828,20 +2983,10 @@ "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", "dev": true }, - "node_modules/@eslint/eslintrc/node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, "node_modules/@eslint/eslintrc/node_modules/globals": { - "version": "13.19.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.19.0.tgz", - "integrity": "sha512-dkQ957uSRWHw7CFXLUtUHQI3g3aWApYhfNR2O6jn/907riyTYKVBmxYVROkBcY614FSSeSJh7Xm7SrUWCxvJMQ==", + "version": "13.23.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.23.0.tgz", + "integrity": "sha512-XAmF0RjlrjY23MA51q3HltdlGxUpXPvg0GioKiD9X6HD28iMjo2dKC8Vqwm7lne4GNr78+RHTfliktR6ZH09wA==", "dev": true, "dependencies": { "type-fest": "^0.20.2" @@ -2871,18 +3016,6 @@ "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", "dev": true }, - "node_modules/@eslint/eslintrc/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, "node_modules/@eslint/eslintrc/node_modules/type-fest": { "version": "0.20.2", "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", @@ -2895,6 +3028,15 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/@eslint/js": { + "version": "8.52.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.52.0.tgz", + "integrity": "sha512-mjZVbpaeMZludF2fsWLD0Z9gCref1Tk4i9+wddjRvpUNqqcndPkBD09N/Mapey0b3jaXbLm2kICwFv2E64QinA==", + "dev": true, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + } + }, "node_modules/@gar/promisify": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz", @@ -2902,18 +3044,18 @@ "dev": true }, "node_modules/@golevelup/ts-jest": { - "version": "0.3.4", - "resolved": "https://registry.npmjs.org/@golevelup/ts-jest/-/ts-jest-0.3.4.tgz", - "integrity": "sha512-UXas4+20gNmYfVR7DTJ9iRppy00o0ElqQrRQyn9cF3Gq90iM1Xx1lKvipTEe5NniHDD9FiMZNweOfB+9ebZRZA==", + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/@golevelup/ts-jest/-/ts-jest-0.4.0.tgz", + "integrity": "sha512-ehgllV/xU8PC+yVyEUtTzhiSQKsr7k5Jz74B6dtCaVJz7/Vo7JiaACsCLvD7/iATlJUAEqvBson0OHewD3JDzQ==", "dev": true }, "node_modules/@humanwhocodes/config-array": { - "version": "0.11.8", - "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.8.tgz", - "integrity": "sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g==", + "version": "0.11.13", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.13.tgz", + "integrity": "sha512-JSBDMiDKSzQVngfRjOdFXgFfklaXI4K9nLF49Auh21lmBWRLIK3+xTErTWD4KU54pb6coM6ESE7Awz/FNU3zgQ==", "dev": true, "dependencies": { - "@humanwhocodes/object-schema": "^1.2.1", + "@humanwhocodes/object-schema": "^2.0.1", "debug": "^4.1.1", "minimatch": "^3.0.5" }, @@ -2921,47 +3063,121 @@ "node": ">=10.10.0" } }, - "node_modules/@humanwhocodes/config-array/node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "node_modules/@humanwhocodes/module-importer": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", + "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", "dev": true, - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" + "engines": { + "node": ">=12.22" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/nzakas" } }, - "node_modules/@humanwhocodes/config-array/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "node_modules/@humanwhocodes/object-schema": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.1.tgz", + "integrity": "sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw==", + "dev": true + }, + "node_modules/@isaacs/cliui": { + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", + "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==", "dev": true, "dependencies": { - "brace-expansion": "^1.1.7" + "string-width": "^5.1.2", + "string-width-cjs": "npm:string-width@^4.2.0", + "strip-ansi": "^7.0.1", + "strip-ansi-cjs": "npm:strip-ansi@^6.0.1", + "wrap-ansi": "^8.1.0", + "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0" }, "engines": { - "node": "*" + "node": ">=12" } }, - "node_modules/@humanwhocodes/module-importer": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", - "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", + "node_modules/@isaacs/cliui/node_modules/ansi-regex": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", + "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", "dev": true, "engines": { - "node": ">=12.22" + "node": ">=12" }, "funding": { - "type": "github", - "url": "https://github.com/sponsors/nzakas" + "url": "https://github.com/chalk/ansi-regex?sponsor=1" } }, - "node_modules/@humanwhocodes/object-schema": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz", - "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==", + "node_modules/@isaacs/cliui/node_modules/ansi-styles": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", + "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/@isaacs/cliui/node_modules/emoji-regex": { + "version": "9.2.2", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", + "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", "dev": true }, + "node_modules/@isaacs/cliui/node_modules/string-width": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", + "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", + "dev": true, + "dependencies": { + "eastasianwidth": "^0.2.0", + "emoji-regex": "^9.2.2", + "strip-ansi": "^7.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/@isaacs/cliui/node_modules/strip-ansi": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", + "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", + "dev": true, + "dependencies": { + "ansi-regex": "^6.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/strip-ansi?sponsor=1" + } + }, + "node_modules/@isaacs/cliui/node_modules/wrap-ansi": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", + "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", + "dev": true, + "dependencies": { + "ansi-styles": "^6.1.0", + "string-width": "^5.0.1", + "strip-ansi": "^7.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, "node_modules/@istanbuljs/load-nyc-config": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz", @@ -2988,20 +3204,20 @@ } }, "node_modules/@jest/console": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/console/-/console-28.1.3.tgz", - "integrity": "sha512-QPAkP5EwKdK/bxIr6C1I4Vs0rm2nHiANzj/Z5X2JQkrZo6IqvC4ldZ9K95tF0HdidhA8Bo6egxSzUFPYKcEXLw==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/console/-/console-29.7.0.tgz", + "integrity": "sha512-5Ni4CU7XHQi32IJ398EEP4RrB8eV09sXP2ROqD4bksHrnTree52PsxvX8tpL8LvTZ3pFzXyPbNQReSN41CAhOg==", "dev": true, "dependencies": { - "@jest/types": "^28.1.3", + "@jest/types": "^29.6.3", "@types/node": "*", "chalk": "^4.0.0", - "jest-message-util": "^28.1.3", - "jest-util": "^28.1.3", + "jest-message-util": "^29.7.0", + "jest-util": "^29.7.0", "slash": "^3.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/@jest/console/node_modules/ansi-styles": { @@ -3075,43 +3291,42 @@ } }, "node_modules/@jest/core": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/core/-/core-28.1.3.tgz", - "integrity": "sha512-CIKBrlaKOzA7YG19BEqCw3SLIsEwjZkeJzf5bdooVnW4bH5cktqe3JX+G2YV1aK5vP8N9na1IGWFzYaTp6k6NA==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/core/-/core-29.7.0.tgz", + "integrity": "sha512-n7aeXWKMnGtDA48y8TLWJPJmLmmZ642Ceo78cYWEpiD7FzDgmNDV/GCVRorPABdXLJZ/9wzzgZAlHjXjxDHGsg==", "dev": true, "dependencies": { - "@jest/console": "^28.1.3", - "@jest/reporters": "^28.1.3", - "@jest/test-result": "^28.1.3", - "@jest/transform": "^28.1.3", - "@jest/types": "^28.1.3", + "@jest/console": "^29.7.0", + "@jest/reporters": "^29.7.0", + "@jest/test-result": "^29.7.0", + "@jest/transform": "^29.7.0", + "@jest/types": "^29.6.3", "@types/node": "*", "ansi-escapes": "^4.2.1", "chalk": "^4.0.0", "ci-info": "^3.2.0", "exit": "^0.1.2", "graceful-fs": "^4.2.9", - "jest-changed-files": "^28.1.3", - "jest-config": "^28.1.3", - "jest-haste-map": "^28.1.3", - "jest-message-util": "^28.1.3", - "jest-regex-util": "^28.0.2", - "jest-resolve": "^28.1.3", - "jest-resolve-dependencies": "^28.1.3", - "jest-runner": "^28.1.3", - "jest-runtime": "^28.1.3", - "jest-snapshot": "^28.1.3", - "jest-util": "^28.1.3", - "jest-validate": "^28.1.3", - "jest-watcher": "^28.1.3", + "jest-changed-files": "^29.7.0", + "jest-config": "^29.7.0", + "jest-haste-map": "^29.7.0", + "jest-message-util": "^29.7.0", + "jest-regex-util": "^29.6.3", + "jest-resolve": "^29.7.0", + "jest-resolve-dependencies": "^29.7.0", + "jest-runner": "^29.7.0", + "jest-runtime": "^29.7.0", + "jest-snapshot": "^29.7.0", + "jest-util": "^29.7.0", + "jest-validate": "^29.7.0", + "jest-watcher": "^29.7.0", "micromatch": "^4.0.4", - "pretty-format": "^28.1.3", - "rimraf": "^3.0.0", + "pretty-format": "^29.7.0", "slash": "^3.0.0", "strip-ansi": "^6.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" }, "peerDependencies": { "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0" @@ -3193,88 +3408,89 @@ } }, "node_modules/@jest/environment": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-28.1.3.tgz", - "integrity": "sha512-1bf40cMFTEkKyEf585R9Iz1WayDjHoHqvts0XFYEqyKM3cFWDpeMoqKKTAF9LSYQModPUlh8FKptoM2YcMWAXA==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.7.0.tgz", + "integrity": "sha512-aQIfHDq33ExsN4jP1NWGXhxgQ/wixs60gDiKO+XVMd8Mn0NWPWgc34ZQDTb2jKaUWQ7MuwoitXAsN2XVXNMpAw==", "dev": true, "dependencies": { - "@jest/fake-timers": "^28.1.3", - "@jest/types": "^28.1.3", + "@jest/fake-timers": "^29.7.0", + "@jest/types": "^29.6.3", "@types/node": "*", - "jest-mock": "^28.1.3" + "jest-mock": "^29.7.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/@jest/expect": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-28.1.3.tgz", - "integrity": "sha512-lzc8CpUbSoE4dqT0U+g1qODQjBRHPpCPXissXD4mS9+sWQdmmpeJ9zSH1rS1HEkrsMN0fb7nKrJ9giAR1d3wBw==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.7.0.tgz", + "integrity": "sha512-8uMeAMycttpva3P1lBHB8VciS9V0XAr3GymPpipdyQXbBcuhkLQOSe8E/p92RyAdToS6ZD1tFkX+CkhoECE0dQ==", "dev": true, "dependencies": { - "expect": "^28.1.3", - "jest-snapshot": "^28.1.3" + "expect": "^29.7.0", + "jest-snapshot": "^29.7.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/@jest/expect-utils": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-28.1.3.tgz", - "integrity": "sha512-wvbi9LUrHJLn3NlDW6wF2hvIMtd4JUl2QNVrjq+IBSHirgfrR3o9RnVtxzdEGO2n9JyIWwHnLfby5KzqBGg2YA==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.7.0.tgz", + "integrity": "sha512-GlsNBWiFQFCVi9QVSx7f5AgMeLxe9YCCs5PuP2O2LdjDAA8Jh9eX7lA1Jq/xdXw3Wb3hyvlFNfZIfcRetSzYcA==", "dev": true, "dependencies": { - "jest-get-type": "^28.0.2" + "jest-get-type": "^29.6.3" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/@jest/fake-timers": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-28.1.3.tgz", - "integrity": "sha512-D/wOkL2POHv52h+ok5Oj/1gOG9HSywdoPtFsRCUmlCILXNn5eIWmcnd3DIiWlJnpGvQtmajqBP95Ei0EimxfLw==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.7.0.tgz", + "integrity": "sha512-q4DH1Ha4TTFPdxLsqDXK1d3+ioSL7yL5oCMJZgDYm6i+6CygW5E5xVr/D1HdsGxjt1ZWSfUAs9OxSB/BNelWrQ==", "dev": true, "dependencies": { - "@jest/types": "^28.1.3", - "@sinonjs/fake-timers": "^9.1.2", + "@jest/types": "^29.6.3", + "@sinonjs/fake-timers": "^10.0.2", "@types/node": "*", - "jest-message-util": "^28.1.3", - "jest-mock": "^28.1.3", - "jest-util": "^28.1.3" + "jest-message-util": "^29.7.0", + "jest-mock": "^29.7.0", + "jest-util": "^29.7.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/@jest/globals": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-28.1.3.tgz", - "integrity": "sha512-XFU4P4phyryCXu1pbcqMO0GSQcYe1IsalYCDzRNyhetyeyxMcIxa11qPNDpVNLeretItNqEmYYQn1UYz/5x1NA==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.7.0.tgz", + "integrity": "sha512-mpiz3dutLbkW2MNFubUGUEVLkTGiqW6yLVTA+JbP6fI6J5iL9Y0Nlg8k95pcF8ctKwCS7WVxteBs29hhfAotzQ==", "dev": true, "dependencies": { - "@jest/environment": "^28.1.3", - "@jest/expect": "^28.1.3", - "@jest/types": "^28.1.3" + "@jest/environment": "^29.7.0", + "@jest/expect": "^29.7.0", + "@jest/types": "^29.6.3", + "jest-mock": "^29.7.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/@jest/reporters": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-28.1.3.tgz", - "integrity": "sha512-JuAy7wkxQZVNU/V6g9xKzCGC5LVXx9FDcABKsSXp5MiKPEE2144a/vXTEDoyzjUpZKfVwp08Wqg5A4WfTMAzjg==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.7.0.tgz", + "integrity": "sha512-DApq0KJbJOEzAFYjHADNNxAE3KbhxQB1y5Kplb5Waqw6zVbuWatSnMjE5gs8FUgEPmNsnZA3NCWl9NG0ia04Pg==", "dev": true, "dependencies": { "@bcoe/v8-coverage": "^0.2.3", - "@jest/console": "^28.1.3", - "@jest/test-result": "^28.1.3", - "@jest/transform": "^28.1.3", - "@jest/types": "^28.1.3", - "@jridgewell/trace-mapping": "^0.3.13", + "@jest/console": "^29.7.0", + "@jest/test-result": "^29.7.0", + "@jest/transform": "^29.7.0", + "@jest/types": "^29.6.3", + "@jridgewell/trace-mapping": "^0.3.18", "@types/node": "*", "chalk": "^4.0.0", "collect-v8-coverage": "^1.0.0", @@ -3282,21 +3498,20 @@ "glob": "^7.1.3", "graceful-fs": "^4.2.9", "istanbul-lib-coverage": "^3.0.0", - "istanbul-lib-instrument": "^5.1.0", + "istanbul-lib-instrument": "^6.0.0", "istanbul-lib-report": "^3.0.0", "istanbul-lib-source-maps": "^4.0.0", "istanbul-reports": "^3.1.3", - "jest-message-util": "^28.1.3", - "jest-util": "^28.1.3", - "jest-worker": "^28.1.3", + "jest-message-util": "^29.7.0", + "jest-util": "^29.7.0", + "jest-worker": "^29.7.0", "slash": "^3.0.0", "string-length": "^4.0.1", "strip-ansi": "^6.0.0", - "terminal-link": "^2.0.0", "v8-to-istanbul": "^9.0.1" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" }, "peerDependencies": { "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0" @@ -3322,16 +3537,6 @@ "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, - "node_modules/@jest/reporters/node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, "node_modules/@jest/reporters/node_modules/chalk": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", @@ -3366,26 +3571,6 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, - "node_modules/@jest/reporters/node_modules/glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "dev": true, - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, "node_modules/@jest/reporters/node_modules/has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", @@ -3395,45 +3580,20 @@ "node": ">=8" } }, - "node_modules/@jest/reporters/node_modules/jest-worker": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-28.1.3.tgz", - "integrity": "sha512-CqRA220YV/6jCo8VWvAt1KKx6eek1VIHMPeLEbpcfSfkEeWyBNppynM/o6q+Wmw+sOhos2ml34wZbSX3G13//g==", - "dev": true, - "dependencies": { - "@types/node": "*", - "merge-stream": "^2.0.0", - "supports-color": "^8.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/@jest/reporters/node_modules/jest-worker/node_modules/supports-color": { - "version": "8.1.1", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", - "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", + "node_modules/@jest/reporters/node_modules/istanbul-lib-instrument": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.1.tgz", + "integrity": "sha512-EAMEJBsYuyyztxMxW3g7ugGPkrZsV57v0Hmv3mm1uQsmB+QnZuepg731CRaIgeUVSdmsTngOkSnauNF8p7FIhA==", "dev": true, "dependencies": { - "has-flag": "^4.0.0" + "@babel/core": "^7.12.3", + "@babel/parser": "^7.14.7", + "@istanbuljs/schema": "^0.1.2", + "istanbul-lib-coverage": "^3.2.0", + "semver": "^7.5.4" }, "engines": { "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/supports-color?sponsor=1" - } - }, - "node_modules/@jest/reporters/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" } }, "node_modules/@jest/reporters/node_modules/supports-color": { @@ -3449,85 +3609,85 @@ } }, "node_modules/@jest/schemas": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz", - "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==", + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", + "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==", "dev": true, "dependencies": { - "@sinclair/typebox": "^0.24.1" + "@sinclair/typebox": "^0.27.8" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/@jest/source-map": { - "version": "28.1.2", - "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-28.1.2.tgz", - "integrity": "sha512-cV8Lx3BeStJb8ipPHnqVw/IM2VCMWO3crWZzYodSIkxXnRcXJipCdx1JCK0K5MsJJouZQTH73mzf4vgxRaH9ww==", + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-29.6.3.tgz", + "integrity": "sha512-MHjT95QuipcPrpLM+8JMSzFx6eHp5Bm+4XeFDJlwsvVBjmKNiIAvasGK2fxz2WbGRlnvqehFbh07MMa7n3YJnw==", "dev": true, "dependencies": { - "@jridgewell/trace-mapping": "^0.3.13", + "@jridgewell/trace-mapping": "^0.3.18", "callsites": "^3.0.0", "graceful-fs": "^4.2.9" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/@jest/test-result": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-28.1.3.tgz", - "integrity": "sha512-kZAkxnSE+FqE8YjW8gNuoVkkC9I7S1qmenl8sGcDOLropASP+BkcGKwhXoyqQuGOGeYY0y/ixjrd/iERpEXHNg==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.7.0.tgz", + "integrity": "sha512-Fdx+tv6x1zlkJPcWXmMDAG2HBnaR9XPSd5aDWQVsfrZmLVT3lU1cwyxLgRmXR9yrq4NBoEm9BMsfgFzTQAbJYA==", "dev": true, "dependencies": { - "@jest/console": "^28.1.3", - "@jest/types": "^28.1.3", + "@jest/console": "^29.7.0", + "@jest/types": "^29.6.3", "@types/istanbul-lib-coverage": "^2.0.0", "collect-v8-coverage": "^1.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/@jest/test-sequencer": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-28.1.3.tgz", - "integrity": "sha512-NIMPEqqa59MWnDi1kvXXpYbqsfQmSJsIbnd85mdVGkiDfQ9WQQTXOLsvISUfonmnBT+w85WEgneCigEEdHDFxw==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.7.0.tgz", + "integrity": "sha512-GQwJ5WZVrKnOJuiYiAF52UNUJXgTZx1NHjFSEB0qEMmSZKAkdMoIzw/Cj6x6NF4AvV23AUqDpFzQkN/eYCYTxw==", "dev": true, "dependencies": { - "@jest/test-result": "^28.1.3", + "@jest/test-result": "^29.7.0", "graceful-fs": "^4.2.9", - "jest-haste-map": "^28.1.3", + "jest-haste-map": "^29.7.0", "slash": "^3.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/@jest/transform": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-28.1.3.tgz", - "integrity": "sha512-u5dT5di+oFI6hfcLOHGTAfmUxFRrjK+vnaP0kkVow9Md/M7V/MxqQMOz/VV25UZO8pzeA9PjfTpOu6BDuwSPQA==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.7.0.tgz", + "integrity": "sha512-ok/BTPFzFKVMwO5eOHRrvnBVHdRy9IrsrW1GpMaQ9MCnilNLXQKmAX8s1YXDFaai9xJpac2ySzV0YeRRECr2Vw==", "dev": true, "dependencies": { "@babel/core": "^7.11.6", - "@jest/types": "^28.1.3", - "@jridgewell/trace-mapping": "^0.3.13", + "@jest/types": "^29.6.3", + "@jridgewell/trace-mapping": "^0.3.18", "babel-plugin-istanbul": "^6.1.1", "chalk": "^4.0.0", - "convert-source-map": "^1.4.0", - "fast-json-stable-stringify": "^2.0.0", + "convert-source-map": "^2.0.0", + "fast-json-stable-stringify": "^2.1.0", "graceful-fs": "^4.2.9", - "jest-haste-map": "^28.1.3", - "jest-regex-util": "^28.0.2", - "jest-util": "^28.1.3", + "jest-haste-map": "^29.7.0", + "jest-regex-util": "^29.6.3", + "jest-util": "^29.7.0", "micromatch": "^4.0.4", "pirates": "^4.0.4", "slash": "^3.0.0", - "write-file-atomic": "^4.0.1" + "write-file-atomic": "^4.0.2" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/@jest/transform/node_modules/ansi-styles": { @@ -3579,6 +3739,12 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, + "node_modules/@jest/transform/node_modules/convert-source-map": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", + "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", + "dev": true + }, "node_modules/@jest/transform/node_modules/has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", @@ -3601,12 +3767,12 @@ } }, "node_modules/@jest/types": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz", - "integrity": "sha512-RyjiyMUZrKz/c+zlMFO1pm70DcIlST8AeWTkoUdZevew44wcNZQHsEVOiCVtgVnlFFD82FPaXycys58cf2muVQ==", + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", + "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", "dev": true, "dependencies": { - "@jest/schemas": "^28.1.3", + "@jest/schemas": "^29.6.3", "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^3.0.0", "@types/node": "*", @@ -3614,7 +3780,7 @@ "chalk": "^4.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/@jest/types/node_modules/ansi-styles": { @@ -3688,22 +3854,23 @@ } }, "node_modules/@jridgewell/gen-mapping": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz", - "integrity": "sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==", + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz", + "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==", "dev": true, "dependencies": { - "@jridgewell/set-array": "^1.0.0", - "@jridgewell/sourcemap-codec": "^1.4.10" + "@jridgewell/set-array": "^1.0.1", + "@jridgewell/sourcemap-codec": "^1.4.10", + "@jridgewell/trace-mapping": "^0.3.9" }, "engines": { "node": ">=6.0.0" } }, "node_modules/@jridgewell/resolve-uri": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz", - "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz", + "integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==", "dev": true, "engines": { "node": ">=6.0.0" @@ -3719,43 +3886,29 @@ } }, "node_modules/@jridgewell/source-map": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.2.tgz", - "integrity": "sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==", + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.5.tgz", + "integrity": "sha512-UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ==", "dev": true, "dependencies": { "@jridgewell/gen-mapping": "^0.3.0", "@jridgewell/trace-mapping": "^0.3.9" } }, - "node_modules/@jridgewell/source-map/node_modules/@jridgewell/gen-mapping": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz", - "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==", - "dev": true, - "dependencies": { - "@jridgewell/set-array": "^1.0.1", - "@jridgewell/sourcemap-codec": "^1.4.10", - "@jridgewell/trace-mapping": "^0.3.9" - }, - "engines": { - "node": ">=6.0.0" - } - }, "node_modules/@jridgewell/sourcemap-codec": { - "version": "1.4.14", - "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz", - "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==", + "version": "1.4.15", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz", + "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==", "dev": true }, "node_modules/@jridgewell/trace-mapping": { - "version": "0.3.17", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz", - "integrity": "sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==", + "version": "0.3.20", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.20.tgz", + "integrity": "sha512-R8LcPeWZol2zR8mmH3JeKQ6QRCFb7XgUhV9ZlGhHLGyg4wpPiPZNQOOWhFZhxKw8u//yTbNGI42Bx/3paXEQ+Q==", "dev": true, "dependencies": { - "@jridgewell/resolve-uri": "3.1.0", - "@jridgewell/sourcemap-codec": "1.4.14" + "@jridgewell/resolve-uri": "^3.1.0", + "@jridgewell/sourcemap-codec": "^1.4.14" } }, "node_modules/@leichtgewicht/ip-codec": { @@ -3765,769 +3918,770 @@ "dev": true }, "node_modules/@material/animation": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/animation/-/animation-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-5osi1z4JQIXcklPALbH/zTfOm2pDzHt9Fxm7ZyURy250xIZj6QjULRzPTnzOhC2ropfix9ra2Cfggbf0dcRbEQ==", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/animation/-/animation-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-leRf+BcZTfC/iSigLXnYgcHAGvFVQveoJT5+2PIRdyPI/bIG7hhciRgacHRsCKC0sGya81dDblLgdkjSUemYLw==", "dependencies": { "tslib": "^2.1.0" } }, "node_modules/@material/auto-init": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/auto-init/-/auto-init-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-OigQTmrVzkcGvxNjOaIe5oItTFPgrO9xLewvharDI6m6yvO1z7OBnkcW+sFN6ggLNYNxd0O1u9v64vMsmeDABQ==", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/auto-init/-/auto-init-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-uxzDq7q3c0Bu1pAsMugc1Ik9ftQYQqZY+5e2ybNplT8gTImJhNt4M2mMiMHbMANk2l3UgICmUyRSomgPBWCPIA==", "dependencies": { - "@material/base": "15.0.0-canary.684e33d25.0", + "@material/base": "15.0.0-canary.bc9ae6c9c.0", "tslib": "^2.1.0" } }, "node_modules/@material/banner": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/banner/-/banner-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-PqtGp3KWzdu58rWv/DIvSfe38m5YKOBbAAbBinSvgadBb/da+IE1t5F7YPNKE1T5lJsQBGVUYx6QBIeXm+aI/A==", - "dependencies": { - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/button": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/banner/-/banner-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-SHeVoidCUFVhXANN6MNWxK9SZoTSgpIP8GZB7kAl52BywLxtV+FirTtLXkg/8RUkxZRyRWl7HvQ0ZFZa7QQAyA==", + "dependencies": { + "@material/base": "15.0.0-canary.bc9ae6c9c.0", + "@material/button": "15.0.0-canary.bc9ae6c9c.0", + "@material/dom": "15.0.0-canary.bc9ae6c9c.0", + "@material/elevation": "15.0.0-canary.bc9ae6c9c.0", + "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0", + "@material/ripple": "15.0.0-canary.bc9ae6c9c.0", + "@material/rtl": "15.0.0-canary.bc9ae6c9c.0", + "@material/shape": "15.0.0-canary.bc9ae6c9c.0", + "@material/theme": "15.0.0-canary.bc9ae6c9c.0", + "@material/tokens": "15.0.0-canary.bc9ae6c9c.0", + "@material/typography": "15.0.0-canary.bc9ae6c9c.0", "tslib": "^2.1.0" } }, "node_modules/@material/base": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/base/-/base-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-oOaqb/SfjWwTKsdJUZmeh/Qrs41nIJI0N+zELsxnvbGjSIN1ZMAKYZFPMahqvC68OJ6+5CvJM8PoTNs5l+B8IQ==", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/base/-/base-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-Fc3vGuOf+duGo22HTRP6dHdc+MUe0VqQfWOuKrn/wXKD62m0QQR2TqJd3rRhCumH557T5QUyheW943M3E+IGfg==", "dependencies": { "tslib": "^2.1.0" } }, "node_modules/@material/button": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/button/-/button-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-Nkekk4edeX+ObVOa7UlwavaHdmckPV5wU4SAJf3iA3R61cmz+KsgAgpzfcwv5WfNhIlc2nLu8QYEecpHdo9d/w==", - "dependencies": { - "@material/density": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/focus-ring": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", - "@material/touch-target": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/button/-/button-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-3AQgwrPZCTWHDJvwgKq7Cj+BurQ4wTjDdGL+FEnIGUAjJDskwi1yzx5tW2Wf/NxIi7IoPFyOY3UB41jwMiOrnw==", + "dependencies": { + "@material/density": "15.0.0-canary.bc9ae6c9c.0", + "@material/dom": "15.0.0-canary.bc9ae6c9c.0", + "@material/elevation": "15.0.0-canary.bc9ae6c9c.0", + "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0", + "@material/focus-ring": "15.0.0-canary.bc9ae6c9c.0", + "@material/ripple": "15.0.0-canary.bc9ae6c9c.0", + "@material/rtl": "15.0.0-canary.bc9ae6c9c.0", + "@material/shape": "15.0.0-canary.bc9ae6c9c.0", + "@material/theme": "15.0.0-canary.bc9ae6c9c.0", + "@material/tokens": "15.0.0-canary.bc9ae6c9c.0", + "@material/touch-target": "15.0.0-canary.bc9ae6c9c.0", + "@material/typography": "15.0.0-canary.bc9ae6c9c.0", "tslib": "^2.1.0" } }, "node_modules/@material/card": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/card/-/card-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-xhyB7XX5KkEiCEqwSPkl58ZGYL6xFdnY62zimyBXJRG/Eaa0Swj3kW20hVCpt4f7c9Zmp8Se27rg8vnKmhvO3g==", - "dependencies": { - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/card/-/card-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-nPlhiWvbLmooTnBmV5gmzB0eLWSgLKsSRBYAbIBmO76Okgz1y+fQNLag+lpm/TDaHVsn5fmQJH8e0zIg0rYsQA==", + "dependencies": { + "@material/dom": "15.0.0-canary.bc9ae6c9c.0", + "@material/elevation": "15.0.0-canary.bc9ae6c9c.0", + "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0", + "@material/ripple": "15.0.0-canary.bc9ae6c9c.0", + "@material/rtl": "15.0.0-canary.bc9ae6c9c.0", + "@material/shape": "15.0.0-canary.bc9ae6c9c.0", + "@material/theme": "15.0.0-canary.bc9ae6c9c.0", + "@material/tokens": "15.0.0-canary.bc9ae6c9c.0", "tslib": "^2.1.0" } }, "node_modules/@material/checkbox": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/checkbox/-/checkbox-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-NFpM3TS924PmVsk2KQLNU95OYCf8ZwYgzeqfnAexU0bEfjUJXINBun2Go0AaeOUMjuvWUe+byjrXgv8SFYbMUA==", - "dependencies": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/density": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/focus-ring": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/touch-target": "15.0.0-canary.684e33d25.0", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/checkbox/-/checkbox-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-4tpNnO1L0IppoMF3oeQn8F17t2n0WHB0D7mdJK9rhrujen/fLbekkIC82APB3fdGtLGg3qeNqDqPsJm1YnmrwA==", + "dependencies": { + "@material/animation": "15.0.0-canary.bc9ae6c9c.0", + "@material/base": "15.0.0-canary.bc9ae6c9c.0", + "@material/density": "15.0.0-canary.bc9ae6c9c.0", + "@material/dom": "15.0.0-canary.bc9ae6c9c.0", + "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0", + "@material/focus-ring": "15.0.0-canary.bc9ae6c9c.0", + "@material/ripple": "15.0.0-canary.bc9ae6c9c.0", + "@material/rtl": "15.0.0-canary.bc9ae6c9c.0", + "@material/theme": "15.0.0-canary.bc9ae6c9c.0", + "@material/touch-target": "15.0.0-canary.bc9ae6c9c.0", "tslib": "^2.1.0" } }, "node_modules/@material/chips": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/chips/-/chips-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-z4ajQ4NnsAQ/Si9tZ4xmxzjj2Qb+vW++4QjCjjjwAGIZbCe0xglAnMh2t66XLJUxt7RoKZuZVEO7ZqcFZpvJFQ==", - "dependencies": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/checkbox": "15.0.0-canary.684e33d25.0", - "@material/density": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/focus-ring": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", - "@material/touch-target": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/chips/-/chips-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-fqHKvE5bSWK0bXVkf57MWxZtytGqYBZvvHIOs4JI9HPHEhaJy4CpSw562BEtbm3yFxxALoQknvPW2KYzvADnmA==", + "dependencies": { + "@material/animation": "15.0.0-canary.bc9ae6c9c.0", + "@material/base": "15.0.0-canary.bc9ae6c9c.0", + "@material/checkbox": "15.0.0-canary.bc9ae6c9c.0", + "@material/density": "15.0.0-canary.bc9ae6c9c.0", + "@material/dom": "15.0.0-canary.bc9ae6c9c.0", + "@material/elevation": "15.0.0-canary.bc9ae6c9c.0", + "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0", + "@material/focus-ring": "15.0.0-canary.bc9ae6c9c.0", + "@material/ripple": "15.0.0-canary.bc9ae6c9c.0", + "@material/rtl": "15.0.0-canary.bc9ae6c9c.0", + "@material/shape": "15.0.0-canary.bc9ae6c9c.0", + "@material/theme": "15.0.0-canary.bc9ae6c9c.0", + "@material/tokens": "15.0.0-canary.bc9ae6c9c.0", + "@material/touch-target": "15.0.0-canary.bc9ae6c9c.0", + "@material/typography": "15.0.0-canary.bc9ae6c9c.0", "safevalues": "^0.3.4", "tslib": "^2.1.0" } }, "node_modules/@material/circular-progress": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/circular-progress/-/circular-progress-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-G6qD0nGNtEUwWnAMJuA9INYFpZoKtx7KFjBaPF4Ol2YLHtmShALNAYyn54TMAK8AZ2IpW08PXjGS7Ye88vrdEQ==", - "dependencies": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/progress-indicator": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/circular-progress/-/circular-progress-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-Lxe8BGAxQwCQqrLhrYrIP0Uok10h7aYS3RBXP41ph+5GmwJd5zdyE2t93qm2dyThvU6qKuXw9726Dtq/N+wvZQ==", + "dependencies": { + "@material/animation": "15.0.0-canary.bc9ae6c9c.0", + "@material/base": "15.0.0-canary.bc9ae6c9c.0", + "@material/dom": "15.0.0-canary.bc9ae6c9c.0", + "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0", + "@material/progress-indicator": "15.0.0-canary.bc9ae6c9c.0", + "@material/rtl": "15.0.0-canary.bc9ae6c9c.0", + "@material/theme": "15.0.0-canary.bc9ae6c9c.0", "tslib": "^2.1.0" } }, "node_modules/@material/data-table": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/data-table/-/data-table-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-+wDw1DDDFfAsKAMzs84f/5GCjux39zjNfW8tL4wFbkWNwewmQrG9zaQMJhBpVOtLCrM8Gj6SOgOANqgqoCjvGg==", - "dependencies": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/checkbox": "15.0.0-canary.684e33d25.0", - "@material/density": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/icon-button": "15.0.0-canary.684e33d25.0", - "@material/linear-progress": "15.0.0-canary.684e33d25.0", - "@material/list": "15.0.0-canary.684e33d25.0", - "@material/menu": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/select": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", - "@material/touch-target": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/data-table/-/data-table-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-j/7qplT9+sUpfe4pyWhPbl01qJA+OoNAG3VMJruBBR461ZBKyTi7ssKH9yksFGZ8eCEPkOsk/+kDxsiZvRWkeQ==", + "dependencies": { + "@material/animation": "15.0.0-canary.bc9ae6c9c.0", + "@material/base": "15.0.0-canary.bc9ae6c9c.0", + "@material/checkbox": "15.0.0-canary.bc9ae6c9c.0", + "@material/density": "15.0.0-canary.bc9ae6c9c.0", + "@material/dom": "15.0.0-canary.bc9ae6c9c.0", + "@material/elevation": "15.0.0-canary.bc9ae6c9c.0", + "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0", + "@material/icon-button": "15.0.0-canary.bc9ae6c9c.0", + "@material/linear-progress": "15.0.0-canary.bc9ae6c9c.0", + "@material/list": "15.0.0-canary.bc9ae6c9c.0", + "@material/menu": "15.0.0-canary.bc9ae6c9c.0", + "@material/rtl": "15.0.0-canary.bc9ae6c9c.0", + "@material/select": "15.0.0-canary.bc9ae6c9c.0", + "@material/shape": "15.0.0-canary.bc9ae6c9c.0", + "@material/theme": "15.0.0-canary.bc9ae6c9c.0", + "@material/tokens": "15.0.0-canary.bc9ae6c9c.0", + "@material/touch-target": "15.0.0-canary.bc9ae6c9c.0", + "@material/typography": "15.0.0-canary.bc9ae6c9c.0", "tslib": "^2.1.0" } }, "node_modules/@material/density": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/density/-/density-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-661yEVRMGrlq6S6WuSbPRO+ZwpdUOg2glCc7y96doM6itSLOa3UEAldjOLfsYZVB74GnKCiuDp//QmfoRyYTfA==", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/density/-/density-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-Zt3u07fXrBWLW06Tl5fgvjicxNQMkFdawLyNTzZ5TvbXfVkErILLePwwGaw8LNcvzqJP6ABLA8jiR+sKNoJQCg==", "dependencies": { "tslib": "^2.1.0" } }, "node_modules/@material/dialog": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/dialog/-/dialog-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-szn0dHnfeQTSOC6SSRSGAzX6Tnx+4NnSMUwNkXm+3bwjds8ZVK26+DXwLrP5f3ID5F1K5sFsRf2INo5/TNTHyQ==", - "dependencies": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/button": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/icon-button": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", - "@material/touch-target": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/dialog/-/dialog-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-o+9a/fmwJ9+gY3Z/uhj/PMVJDq7it1NTWKJn2GwAKdB+fDkT4hb9qEdcxMPyvJJ5ups+XiKZo03+tZrD+38c1w==", + "dependencies": { + "@material/animation": "15.0.0-canary.bc9ae6c9c.0", + "@material/base": "15.0.0-canary.bc9ae6c9c.0", + "@material/button": "15.0.0-canary.bc9ae6c9c.0", + "@material/dom": "15.0.0-canary.bc9ae6c9c.0", + "@material/elevation": "15.0.0-canary.bc9ae6c9c.0", + "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0", + "@material/icon-button": "15.0.0-canary.bc9ae6c9c.0", + "@material/ripple": "15.0.0-canary.bc9ae6c9c.0", + "@material/rtl": "15.0.0-canary.bc9ae6c9c.0", + "@material/shape": "15.0.0-canary.bc9ae6c9c.0", + "@material/theme": "15.0.0-canary.bc9ae6c9c.0", + "@material/tokens": "15.0.0-canary.bc9ae6c9c.0", + "@material/touch-target": "15.0.0-canary.bc9ae6c9c.0", + "@material/typography": "15.0.0-canary.bc9ae6c9c.0", "tslib": "^2.1.0" } }, "node_modules/@material/dom": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/dom/-/dom-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-7pEJLYov+tGgfuD8mZxoVU6rWtPI8ppjTAhz+F27Hz9FG0JETMWTKpDPBXLnKvX7vhIxL83GvZ9geNHCe8Hfog==", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/dom/-/dom-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-ly78R7aoCJtundSUu0UROU+5pQD5Piae0Y1MkN6bs0724azeazX1KeXFeaf06JOXnlr5/41ol+fSUPowjoqnOg==", "dependencies": { - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", + "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0", + "@material/rtl": "15.0.0-canary.bc9ae6c9c.0", "tslib": "^2.1.0" } }, "node_modules/@material/drawer": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/drawer/-/drawer-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-/KMckLf1PYU/H3PXnS4e0aFl03qG3JlSv4LGgX6juJufcONqGTl/m63EMO/L/eUy6H1CRrXmVDjik/jzHLyDhg==", - "dependencies": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/list": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/drawer/-/drawer-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-PFL4cEFnt7VTxDsuspFVNhsFDYyumjU0VWfj3PWB7XudsEfQ3lo85D3HCEtTTbRsCainGN8bgYNDNafLBqiigw==", + "dependencies": { + "@material/animation": "15.0.0-canary.bc9ae6c9c.0", + "@material/base": "15.0.0-canary.bc9ae6c9c.0", + "@material/dom": "15.0.0-canary.bc9ae6c9c.0", + "@material/elevation": "15.0.0-canary.bc9ae6c9c.0", + "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0", + "@material/list": "15.0.0-canary.bc9ae6c9c.0", + "@material/ripple": "15.0.0-canary.bc9ae6c9c.0", + "@material/rtl": "15.0.0-canary.bc9ae6c9c.0", + "@material/shape": "15.0.0-canary.bc9ae6c9c.0", + "@material/theme": "15.0.0-canary.bc9ae6c9c.0", + "@material/typography": "15.0.0-canary.bc9ae6c9c.0", "tslib": "^2.1.0" } }, "node_modules/@material/elevation": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/elevation/-/elevation-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-WDF8SsRtq3rXUbVVbd9K4DUijIPH0bUFSOreVYxudpuxAfTlDS5+aeS1EK9UIBFYLuba4u5wVT2tDv6e1RTfrQ==", - "dependencies": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/elevation/-/elevation-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-Ro+Pk8jFuap+T0B0shA3xI1hs2b89dNQ2EIPCNjNMp87emHKAzJfhKb7EZGIwv3+gFLlVaLyIVkb94I89KLsyg==", + "dependencies": { + "@material/animation": "15.0.0-canary.bc9ae6c9c.0", + "@material/base": "15.0.0-canary.bc9ae6c9c.0", + "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0", + "@material/rtl": "15.0.0-canary.bc9ae6c9c.0", + "@material/theme": "15.0.0-canary.bc9ae6c9c.0", "tslib": "^2.1.0" } }, "node_modules/@material/fab": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/fab/-/fab-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-KCu87rWOKEAe9vZcAm6K8XazYSWPNjMG+OhrbPjHW6bCO7as1YCgtmkBkhff7csY/rFmcVpIy884xtUfLmSudQ==", - "dependencies": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/focus-ring": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", - "@material/touch-target": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/fab/-/fab-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-dvU0KWMRglwJEQwmQtFAmJcAjzg9VFF6Aqj78bJYu/DAIGFJ1VTTTSgoXM/XCm1YyQEZ7kZRvxBO37CH54rSDg==", + "dependencies": { + "@material/animation": "15.0.0-canary.bc9ae6c9c.0", + "@material/dom": "15.0.0-canary.bc9ae6c9c.0", + "@material/elevation": "15.0.0-canary.bc9ae6c9c.0", + "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0", + "@material/focus-ring": "15.0.0-canary.bc9ae6c9c.0", + "@material/ripple": "15.0.0-canary.bc9ae6c9c.0", + "@material/rtl": "15.0.0-canary.bc9ae6c9c.0", + "@material/shape": "15.0.0-canary.bc9ae6c9c.0", + "@material/theme": "15.0.0-canary.bc9ae6c9c.0", + "@material/tokens": "15.0.0-canary.bc9ae6c9c.0", + "@material/touch-target": "15.0.0-canary.bc9ae6c9c.0", + "@material/typography": "15.0.0-canary.bc9ae6c9c.0", "tslib": "^2.1.0" } }, "node_modules/@material/feature-targeting": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/feature-targeting/-/feature-targeting-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-HyH1erNTSjS63sigNSUMaCd0nJhTNdDFeC+myrxwtDaQm+uYJ8troCNtQM3g6mx0XATNtX5aTOoPmrM6yVVi1A==", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/feature-targeting/-/feature-targeting-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-wkDjVcoVEYYaJvun28IXdln/foLgPD7n9ZC9TY76GErGCwTq+HWpU6wBAAk+ePmpRFDayw4vI4wBlaWGxLtysQ==", "dependencies": { "tslib": "^2.1.0" } }, "node_modules/@material/floating-label": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/floating-label/-/floating-label-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-f7TPp6bKpGvV3sYYiZHSGlrixXKkXXITW3Esp7KB9jRq42c0H82novmdwvY0eTef4ootmA2JEysr78KQfHBUPg==", - "dependencies": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/floating-label/-/floating-label-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-bUWPtXzZITOD/2mkvLkEPO1ngDWmb74y0Kgbz6llHLOQBtycyJIpuoQJ1q2Ez0NM/tFLwPphhAgRqmL3YQ/Kzw==", + "dependencies": { + "@material/animation": "15.0.0-canary.bc9ae6c9c.0", + "@material/base": "15.0.0-canary.bc9ae6c9c.0", + "@material/dom": "15.0.0-canary.bc9ae6c9c.0", + "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0", + "@material/rtl": "15.0.0-canary.bc9ae6c9c.0", + "@material/theme": "15.0.0-canary.bc9ae6c9c.0", + "@material/typography": "15.0.0-canary.bc9ae6c9c.0", "tslib": "^2.1.0" } }, "node_modules/@material/focus-ring": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/focus-ring/-/focus-ring-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-ikw2RVUfgzXChpWIzPH1VzRvTjYb5ZKj4H+CZf7jqPUXMstFOZg90Bp7ARLZHqYiyNMuUq3zUTHozS6iHorSqg==", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/focus-ring/-/focus-ring-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-cZHThVose3GvAlJzpJoBI1iqL6d1/Jj9hXrR+r8Mwtb1hBIUEG3hxfsRd4vGREuzROPlf0OgNf/V+YHoSwgR5w==", "dependencies": { - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0" + "@material/dom": "15.0.0-canary.bc9ae6c9c.0", + "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0", + "@material/rtl": "15.0.0-canary.bc9ae6c9c.0" } }, "node_modules/@material/form-field": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/form-field/-/form-field-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-vpF9N/uq5no/7+8GAbEH0868FhOuBgxAWRr1Sfb+jthKfBr8OS/wPU/AHzZHdHdAm7PQynbeOXfDsX2dI//PDA==", - "dependencies": { - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/form-field/-/form-field-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-+JFXy5X44Gue1CbZZAQ6YejnI203lebYwL0i6k0ylDpWHEOdD5xkF2PyHR28r9/65Ebcbwbff6q7kI1SGoT7MA==", + "dependencies": { + "@material/base": "15.0.0-canary.bc9ae6c9c.0", + "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0", + "@material/ripple": "15.0.0-canary.bc9ae6c9c.0", + "@material/rtl": "15.0.0-canary.bc9ae6c9c.0", + "@material/theme": "15.0.0-canary.bc9ae6c9c.0", + "@material/typography": "15.0.0-canary.bc9ae6c9c.0", "tslib": "^2.1.0" } }, "node_modules/@material/icon-button": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/icon-button/-/icon-button-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-wMI+XGzmIN/o2ePBKg2hLyx7H4pXCRAyyIKMQS1FMp1UKa2tYmiHVX/V8skhKwCqxg3i6Ls/LxMjfPxTR18WvQ==", - "dependencies": { - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/density": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/focus-ring": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/touch-target": "15.0.0-canary.684e33d25.0", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/icon-button/-/icon-button-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-1a0MHgyIwOs4RzxrVljsqSizGYFlM1zY2AZaLDsgT4G3kzsplTx8HZQ022GpUCjAygW+WLvg4z1qAhQHvsbqlw==", + "dependencies": { + "@material/base": "15.0.0-canary.bc9ae6c9c.0", + "@material/density": "15.0.0-canary.bc9ae6c9c.0", + "@material/dom": "15.0.0-canary.bc9ae6c9c.0", + "@material/elevation": "15.0.0-canary.bc9ae6c9c.0", + "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0", + "@material/focus-ring": "15.0.0-canary.bc9ae6c9c.0", + "@material/ripple": "15.0.0-canary.bc9ae6c9c.0", + "@material/rtl": "15.0.0-canary.bc9ae6c9c.0", + "@material/theme": "15.0.0-canary.bc9ae6c9c.0", + "@material/touch-target": "15.0.0-canary.bc9ae6c9c.0", "tslib": "^2.1.0" } }, "node_modules/@material/image-list": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/image-list/-/image-list-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-Ol+uaHYBe5R/cgzlfh5ONnMVX0wO6fV74JMUcQCQlxP6lXau/edARo4tkRc7A7UJUkU3VRv0EpEjLoCRNUPGaA==", - "dependencies": { - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/image-list/-/image-list-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-WKWmiYap2iu4QdqmeUSliLlN4O2Ueqa0OuVAYHn/TCzmQ2xmnhZ1pvDLbs6TplpOmlki7vFfe+aSt5SU9gwfOQ==", + "dependencies": { + "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0", + "@material/shape": "15.0.0-canary.bc9ae6c9c.0", + "@material/theme": "15.0.0-canary.bc9ae6c9c.0", + "@material/typography": "15.0.0-canary.bc9ae6c9c.0", "tslib": "^2.1.0" } }, "node_modules/@material/layout-grid": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/layout-grid/-/layout-grid-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-ALXE1mqFNb/RB2lVRQ3/r1Aufw2mFZnOjRE+boYDVepmAG/xWyPCyaGoavELJF5l4GAb0tXi8wA/8HeGbLOpuA==", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/layout-grid/-/layout-grid-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-5GqmT6oTZhUGWIb+CLD0ZNyDyTiJsr/rm9oRIi3+vCujACwxFkON9tzBlZohdtFS16nuzUusthN6Jt9UrJcN6Q==", "dependencies": { "tslib": "^2.1.0" } }, "node_modules/@material/line-ripple": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/line-ripple/-/line-ripple-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-7hRx8C/e9i0P6pgQpNOMfTwSS2r1fwEvBL72QDVGLtLuoKKwsjjgP6Z0Jat/GeHJe87u9LQvGBoD4upt+of/HA==", - "dependencies": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/line-ripple/-/line-ripple-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-8S30WXEuUdgDdBulzUDlPXD6qMzwCX9SxYb5mGDYLwl199cpSGdXHtGgEcCjokvnpLhdZhcT1Dsxeo1g2Evh5Q==", + "dependencies": { + "@material/animation": "15.0.0-canary.bc9ae6c9c.0", + "@material/base": "15.0.0-canary.bc9ae6c9c.0", + "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0", + "@material/theme": "15.0.0-canary.bc9ae6c9c.0", "tslib": "^2.1.0" } }, "node_modules/@material/linear-progress": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/linear-progress/-/linear-progress-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-iJclt7mKmcMk6pqD7ocXKfCWZhqBoODp7N593jYlxVpTJuEz2wiVAjZUDn/YGj/Uz3CRH+2YFfOiLr9pwWjhDg==", - "dependencies": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/progress-indicator": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/linear-progress/-/linear-progress-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-6EJpjrz6aoH2/gXLg9iMe0yF2C42hpQyZoHpmcgTLKeci85ktDvJIjwup8tnk8ULQyFiGiIrhXw2v2RSsiFjvQ==", + "dependencies": { + "@material/animation": "15.0.0-canary.bc9ae6c9c.0", + "@material/base": "15.0.0-canary.bc9ae6c9c.0", + "@material/dom": "15.0.0-canary.bc9ae6c9c.0", + "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0", + "@material/progress-indicator": "15.0.0-canary.bc9ae6c9c.0", + "@material/rtl": "15.0.0-canary.bc9ae6c9c.0", + "@material/theme": "15.0.0-canary.bc9ae6c9c.0", "tslib": "^2.1.0" } }, "node_modules/@material/list": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/list/-/list-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-rQ+FCSdzmwTcT00IYE0uRV3CS4oGSccKFl9hkcF+aHFW61L7ORh/SCGUDPrEfQFrFkMn5f8qroVJjpUAMXBz4g==", - "dependencies": { - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/density": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/list/-/list-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-TQ1ppqiCMQj/P7bGD4edbIIv4goczZUoiUAaPq/feb1dflvrFMzYqJ7tQRRCyBL8nRhJoI2x99tk8Q2RXvlGUQ==", + "dependencies": { + "@material/base": "15.0.0-canary.bc9ae6c9c.0", + "@material/density": "15.0.0-canary.bc9ae6c9c.0", + "@material/dom": "15.0.0-canary.bc9ae6c9c.0", + "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0", + "@material/ripple": "15.0.0-canary.bc9ae6c9c.0", + "@material/rtl": "15.0.0-canary.bc9ae6c9c.0", + "@material/shape": "15.0.0-canary.bc9ae6c9c.0", + "@material/theme": "15.0.0-canary.bc9ae6c9c.0", + "@material/tokens": "15.0.0-canary.bc9ae6c9c.0", + "@material/typography": "15.0.0-canary.bc9ae6c9c.0", "tslib": "^2.1.0" } }, "node_modules/@material/menu": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/menu/-/menu-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-r7wzDLSGSI9629/mfpvsMzkVxpmV75kcD3IrW0Pcu6/Bv/1xi0EvjcUXzNJJoQlwN4Zj35Ymz/PCjZkIDIz68Q==", - "dependencies": { - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/list": "15.0.0-canary.684e33d25.0", - "@material/menu-surface": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/menu/-/menu-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-IlAh61xzrzxXs38QZlt74UYt8J431zGznSzDtB1Fqs6YFNd11QPKoiRXn1J2Qu/lUxbFV7i8NBKMCKtia0n6/Q==", + "dependencies": { + "@material/base": "15.0.0-canary.bc9ae6c9c.0", + "@material/dom": "15.0.0-canary.bc9ae6c9c.0", + "@material/elevation": "15.0.0-canary.bc9ae6c9c.0", + "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0", + "@material/list": "15.0.0-canary.bc9ae6c9c.0", + "@material/menu-surface": "15.0.0-canary.bc9ae6c9c.0", + "@material/ripple": "15.0.0-canary.bc9ae6c9c.0", + "@material/rtl": "15.0.0-canary.bc9ae6c9c.0", + "@material/shape": "15.0.0-canary.bc9ae6c9c.0", + "@material/theme": "15.0.0-canary.bc9ae6c9c.0", + "@material/tokens": "15.0.0-canary.bc9ae6c9c.0", "tslib": "^2.1.0" } }, "node_modules/@material/menu-surface": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/menu-surface/-/menu-surface-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-RVO5GAYcfWPaKwxsF/NhUAmrYXQCQBKvRQW0TIlbmAJz6lcFeTs6YZqF3u1C7qrL3ZQGz+sur/7ywj6QU0oMow==", - "dependencies": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/menu-surface/-/menu-surface-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-dMtSPN+olTWE+08M5qe4ea1IZOhVryYqzK0Gyb2u1G75rSArUxCOB5rr6OC/ST3Mq3RS6zGuYo7srZt4534K9Q==", + "dependencies": { + "@material/animation": "15.0.0-canary.bc9ae6c9c.0", + "@material/base": "15.0.0-canary.bc9ae6c9c.0", + "@material/elevation": "15.0.0-canary.bc9ae6c9c.0", + "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0", + "@material/rtl": "15.0.0-canary.bc9ae6c9c.0", + "@material/shape": "15.0.0-canary.bc9ae6c9c.0", + "@material/theme": "15.0.0-canary.bc9ae6c9c.0", "tslib": "^2.1.0" } }, "node_modules/@material/notched-outline": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/notched-outline/-/notched-outline-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-9YHcBkvJLPVYzkHcWoTpBZAFrEd+j1hjhGxLhh0LuNrZe8VroUkZD1TTnUAPHRG3os6EqEWWaKb0RN+aPIF2yQ==", - "dependencies": { - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/floating-label": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/notched-outline/-/notched-outline-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-WuurMg44xexkvLTBTnsO0A+qnzFjpcPdvgWBGstBepYozsvSF9zJGdb1x7Zv1MmqbpYh/Ohnuxtb/Y3jOh6irg==", + "dependencies": { + "@material/base": "15.0.0-canary.bc9ae6c9c.0", + "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0", + "@material/floating-label": "15.0.0-canary.bc9ae6c9c.0", + "@material/rtl": "15.0.0-canary.bc9ae6c9c.0", + "@material/shape": "15.0.0-canary.bc9ae6c9c.0", + "@material/theme": "15.0.0-canary.bc9ae6c9c.0", "tslib": "^2.1.0" } }, "node_modules/@material/progress-indicator": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/progress-indicator/-/progress-indicator-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-c0icji4faeNWUoqGENGC7Hav0Puxh0RwXIDVizffaUxKIGbajpIp5+4Zop73fK/xFLGMB/npg7TbP+aCGjQ3fw==", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/progress-indicator/-/progress-indicator-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-uOnsvqw5F2fkeTnTl4MrYzjI7KCLmmLyZaM0cgLNuLsWVlddQE+SGMl28tENx7DUK3HebWq0FxCP8f25LuDD+w==", "dependencies": { "tslib": "^2.1.0" } }, "node_modules/@material/radio": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/radio/-/radio-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-U3Eh8sNUA8trDla1Bq8Bo02foxYvtoewaKeF8A8tAju81XZ4jRiftfOsOWZDZEHCVbbCB2QwvutvFlnay5n+Aw==", - "dependencies": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/density": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/focus-ring": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/touch-target": "15.0.0-canary.684e33d25.0", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/radio/-/radio-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-ehzOK+U1IxQN+OQjgD2lsnf1t7t7RAwQzeO6Czkiuid29ookYbQynWuLWk7NW8H8ohl7lnmfqTP1xSNkkL/F0g==", + "dependencies": { + "@material/animation": "15.0.0-canary.bc9ae6c9c.0", + "@material/base": "15.0.0-canary.bc9ae6c9c.0", + "@material/density": "15.0.0-canary.bc9ae6c9c.0", + "@material/dom": "15.0.0-canary.bc9ae6c9c.0", + "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0", + "@material/focus-ring": "15.0.0-canary.bc9ae6c9c.0", + "@material/ripple": "15.0.0-canary.bc9ae6c9c.0", + "@material/theme": "15.0.0-canary.bc9ae6c9c.0", + "@material/touch-target": "15.0.0-canary.bc9ae6c9c.0", "tslib": "^2.1.0" } }, "node_modules/@material/ripple": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/ripple/-/ripple-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-RyePu7SjIm/OuyyEieZ/gxiPYkNZOZHeid72WRcN9ofdlljj2pifcdPvcfZA+v/DMS33xo5GjG2L/Qj6ClWrKw==", - "dependencies": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/ripple/-/ripple-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-JfLW+g3GMVDv4cruQ19+HUxpKVdWCldFlIPw1UYezz2h3WTNDy05S3uP2zUdXzZ01C3dkBFviv4nqZ0GCT16MA==", + "dependencies": { + "@material/animation": "15.0.0-canary.bc9ae6c9c.0", + "@material/base": "15.0.0-canary.bc9ae6c9c.0", + "@material/dom": "15.0.0-canary.bc9ae6c9c.0", + "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0", + "@material/rtl": "15.0.0-canary.bc9ae6c9c.0", + "@material/theme": "15.0.0-canary.bc9ae6c9c.0", "tslib": "^2.1.0" } }, "node_modules/@material/rtl": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/rtl/-/rtl-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-NqdJl8Ayupp1Th+vCNCpVQHbUFOuF7TCte9LD1norTIBUF/QizIxWby2W5uUEiPbnh5j9PmE1CJtfLwKun3pcw==", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/rtl/-/rtl-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-SkKLNLFp5QtG7/JEFg9R92qq4MzTcZ5As6sWbH7rRg6ahTHoJEuqE+pOb9Vrtbj84k5gtX+vCYPvCILtSlr2uw==", "dependencies": { - "@material/theme": "15.0.0-canary.684e33d25.0", + "@material/theme": "15.0.0-canary.bc9ae6c9c.0", "tslib": "^2.1.0" } }, "node_modules/@material/segmented-button": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/segmented-button/-/segmented-button-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-bEGgg8vgXNLyukyV8HRjFMuQ6t6nm5LQ4Pgm22um61Yc8qyi0BOqV41OR4SVdUrUqZxh1aVD+p+4NN03+LfQXw==", - "dependencies": { - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/touch-target": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/segmented-button/-/segmented-button-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-YDwkCWP9l5mIZJ7pZJZ2hMDxfBlIGVJ+deNzr8O+Z7/xC5LGXbl4R5aPtUVHygvXAXxpf5096ZD+dSXzYzvWlw==", + "dependencies": { + "@material/base": "15.0.0-canary.bc9ae6c9c.0", + "@material/elevation": "15.0.0-canary.bc9ae6c9c.0", + "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0", + "@material/ripple": "15.0.0-canary.bc9ae6c9c.0", + "@material/theme": "15.0.0-canary.bc9ae6c9c.0", + "@material/touch-target": "15.0.0-canary.bc9ae6c9c.0", + "@material/typography": "15.0.0-canary.bc9ae6c9c.0", "tslib": "^2.1.0" } }, "node_modules/@material/select": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/select/-/select-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-kf178/2TeEinTv0mgmSBcmmExQ2h7a7dtR1E3WuqQgisJ/R6+zVLMkC2CnfIyzxYX2vkuUTG0ue3Reh/6XiqSg==", - "dependencies": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/density": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/floating-label": "15.0.0-canary.684e33d25.0", - "@material/line-ripple": "15.0.0-canary.684e33d25.0", - "@material/list": "15.0.0-canary.684e33d25.0", - "@material/menu": "15.0.0-canary.684e33d25.0", - "@material/menu-surface": "15.0.0-canary.684e33d25.0", - "@material/notched-outline": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/select/-/select-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-unfOWVf7T0sixVG+3k3RTuATfzqvCF6QAzA6J9rlCh/Tq4HuIBNDdV4z19IVu4zwmgWYxY0iSvqWUvdJJYwakQ==", + "dependencies": { + "@material/animation": "15.0.0-canary.bc9ae6c9c.0", + "@material/base": "15.0.0-canary.bc9ae6c9c.0", + "@material/density": "15.0.0-canary.bc9ae6c9c.0", + "@material/dom": "15.0.0-canary.bc9ae6c9c.0", + "@material/elevation": "15.0.0-canary.bc9ae6c9c.0", + "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0", + "@material/floating-label": "15.0.0-canary.bc9ae6c9c.0", + "@material/line-ripple": "15.0.0-canary.bc9ae6c9c.0", + "@material/list": "15.0.0-canary.bc9ae6c9c.0", + "@material/menu": "15.0.0-canary.bc9ae6c9c.0", + "@material/menu-surface": "15.0.0-canary.bc9ae6c9c.0", + "@material/notched-outline": "15.0.0-canary.bc9ae6c9c.0", + "@material/ripple": "15.0.0-canary.bc9ae6c9c.0", + "@material/rtl": "15.0.0-canary.bc9ae6c9c.0", + "@material/shape": "15.0.0-canary.bc9ae6c9c.0", + "@material/theme": "15.0.0-canary.bc9ae6c9c.0", + "@material/tokens": "15.0.0-canary.bc9ae6c9c.0", + "@material/typography": "15.0.0-canary.bc9ae6c9c.0", "tslib": "^2.1.0" } }, "node_modules/@material/shape": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/shape/-/shape-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-aEelpaTFmpnCji3TUGP9bVCS/bRVjUmLTHBPZtuu1gOrUVVtJ6kYOg73dZNJF+XOoNL2yOX/LRcKwsop29tptA==", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/shape/-/shape-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-Dsvr771ZKC46ODzoixLdGwlLEQLfxfLrtnRojXABoZf5G3o9KtJU+J+5Ld5aa960OAsCzzANuaub4iR88b1guA==", "dependencies": { - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", + "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0", + "@material/rtl": "15.0.0-canary.bc9ae6c9c.0", + "@material/theme": "15.0.0-canary.bc9ae6c9c.0", "tslib": "^2.1.0" } }, "node_modules/@material/slider": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/slider/-/slider-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-WVyK+2pSNSZmj07M2K/a3TADoQ9FBCndfNC/vE7/wGIg4dddJJK5KvQ+yruf9R2cSzTL/S1sZ5WpyyeM8E9HTw==", - "dependencies": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/slider/-/slider-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-3AEu+7PwW4DSNLndue47dh2u7ga4hDJRYmuu7wnJCIWJBnLCkp6C92kNc4Rj5iQY2ftJio5aj1gqryluh5tlYg==", + "dependencies": { + "@material/animation": "15.0.0-canary.bc9ae6c9c.0", + "@material/base": "15.0.0-canary.bc9ae6c9c.0", + "@material/dom": "15.0.0-canary.bc9ae6c9c.0", + "@material/elevation": "15.0.0-canary.bc9ae6c9c.0", + "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0", + "@material/ripple": "15.0.0-canary.bc9ae6c9c.0", + "@material/rtl": "15.0.0-canary.bc9ae6c9c.0", + "@material/theme": "15.0.0-canary.bc9ae6c9c.0", + "@material/tokens": "15.0.0-canary.bc9ae6c9c.0", + "@material/typography": "15.0.0-canary.bc9ae6c9c.0", "tslib": "^2.1.0" } }, "node_modules/@material/snackbar": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/snackbar/-/snackbar-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-itO+DCkOannZzR1/cCHcqAm7ifhuFvXmDItNoA8qLEcAyJDJJRkhpwj3XQ01yuo9gBFcSctp7Txt7e+Hncm/Jg==", - "dependencies": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/button": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/icon-button": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/snackbar/-/snackbar-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-TwwQSYxfGK6mc03/rdDamycND6o+1p61WNd7ElZv1F1CLxB4ihRjbCoH7Qo+oVDaP8CTpjeclka+24RLhQq0mA==", + "dependencies": { + "@material/animation": "15.0.0-canary.bc9ae6c9c.0", + "@material/base": "15.0.0-canary.bc9ae6c9c.0", + "@material/button": "15.0.0-canary.bc9ae6c9c.0", + "@material/dom": "15.0.0-canary.bc9ae6c9c.0", + "@material/elevation": "15.0.0-canary.bc9ae6c9c.0", + "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0", + "@material/icon-button": "15.0.0-canary.bc9ae6c9c.0", + "@material/ripple": "15.0.0-canary.bc9ae6c9c.0", + "@material/rtl": "15.0.0-canary.bc9ae6c9c.0", + "@material/shape": "15.0.0-canary.bc9ae6c9c.0", + "@material/theme": "15.0.0-canary.bc9ae6c9c.0", + "@material/tokens": "15.0.0-canary.bc9ae6c9c.0", + "@material/typography": "15.0.0-canary.bc9ae6c9c.0", "tslib": "^2.1.0" } }, "node_modules/@material/switch": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/switch/-/switch-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-Jxi0gl92yvvZZsAPxvVHzXx2ga+T/djMow98jvEczmpUorWnAhgiCr9CsSSRoosahWyRB8NLZOxUQrACxvffjw==", - "dependencies": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/density": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/focus-ring": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/switch/-/switch-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-OjUjtT0kRz1ASAsOS+dNzwMwvsjmqy5edK57692qmrP6bL4GblFfBDoiNJ6t0AN4OaKcmL5Hy/xNrTdOZW7Qqw==", + "dependencies": { + "@material/animation": "15.0.0-canary.bc9ae6c9c.0", + "@material/base": "15.0.0-canary.bc9ae6c9c.0", + "@material/density": "15.0.0-canary.bc9ae6c9c.0", + "@material/dom": "15.0.0-canary.bc9ae6c9c.0", + "@material/elevation": "15.0.0-canary.bc9ae6c9c.0", + "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0", + "@material/focus-ring": "15.0.0-canary.bc9ae6c9c.0", + "@material/ripple": "15.0.0-canary.bc9ae6c9c.0", + "@material/rtl": "15.0.0-canary.bc9ae6c9c.0", + "@material/shape": "15.0.0-canary.bc9ae6c9c.0", + "@material/theme": "15.0.0-canary.bc9ae6c9c.0", + "@material/tokens": "15.0.0-canary.bc9ae6c9c.0", "safevalues": "^0.3.4", "tslib": "^2.1.0" } }, "node_modules/@material/tab": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/tab/-/tab-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-WQL3wj9syHNcfe8KbgGGUcA34M8C/xZ+n0Fkkh8Kk6puVwaU+xqUNihsxPY6YzKpmh4PZ4oJaBdiN8zvFT1zqQ==", - "dependencies": { - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/focus-ring": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/tab-indicator": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/tab/-/tab-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-s/L9otAwn/pZwVQZBRQJmPqYeNbjoEbzbjMpDQf/VBG/6dJ+aP03ilIBEkqo8NVnCoChqcdtVCoDNRtbU+yp6w==", + "dependencies": { + "@material/base": "15.0.0-canary.bc9ae6c9c.0", + "@material/elevation": "15.0.0-canary.bc9ae6c9c.0", + "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0", + "@material/focus-ring": "15.0.0-canary.bc9ae6c9c.0", + "@material/ripple": "15.0.0-canary.bc9ae6c9c.0", + "@material/rtl": "15.0.0-canary.bc9ae6c9c.0", + "@material/tab-indicator": "15.0.0-canary.bc9ae6c9c.0", + "@material/theme": "15.0.0-canary.bc9ae6c9c.0", + "@material/tokens": "15.0.0-canary.bc9ae6c9c.0", + "@material/typography": "15.0.0-canary.bc9ae6c9c.0", "tslib": "^2.1.0" } }, "node_modules/@material/tab-bar": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/tab-bar/-/tab-bar-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-SW/cMaDsIGGkM1ag3A7GJRlmr8eXmObWsvitQJzh6Azr5zzZtSI+GQygkMesAEE1gbpqOVN8d40rh3H7VVIAcA==", - "dependencies": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/density": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/tab": "15.0.0-canary.684e33d25.0", - "@material/tab-indicator": "15.0.0-canary.684e33d25.0", - "@material/tab-scroller": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/tab-bar/-/tab-bar-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-Xmtq0wJGfu5k+zQeFeNsr4bUKv7L+feCmUp/gsapJ655LQKMXOUQZtSv9ZqWOfrCMy55hoF1CzGFV+oN3tyWWQ==", + "dependencies": { + "@material/animation": "15.0.0-canary.bc9ae6c9c.0", + "@material/base": "15.0.0-canary.bc9ae6c9c.0", + "@material/density": "15.0.0-canary.bc9ae6c9c.0", + "@material/elevation": "15.0.0-canary.bc9ae6c9c.0", + "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0", + "@material/tab": "15.0.0-canary.bc9ae6c9c.0", + "@material/tab-indicator": "15.0.0-canary.bc9ae6c9c.0", + "@material/tab-scroller": "15.0.0-canary.bc9ae6c9c.0", + "@material/theme": "15.0.0-canary.bc9ae6c9c.0", + "@material/tokens": "15.0.0-canary.bc9ae6c9c.0", + "@material/typography": "15.0.0-canary.bc9ae6c9c.0", "tslib": "^2.1.0" } }, "node_modules/@material/tab-indicator": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/tab-indicator/-/tab-indicator-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-kKICqSPqOlaf0lzaFFCmuOqPXJC+cK48Qmsc+m5o6fJhkmuZRCYpIwB2JeP+uZSOq/bTH+SrPtCtnVlgWg6ksA==", - "dependencies": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/tab-indicator/-/tab-indicator-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-despCJYi1GrDDq7F2hvLQkObHnSLZPPDxnOzU16zJ6FNYvIdszgfzn2HgAZ6pl5hLOexQ8cla6cAqjTDuaJBhQ==", + "dependencies": { + "@material/animation": "15.0.0-canary.bc9ae6c9c.0", + "@material/base": "15.0.0-canary.bc9ae6c9c.0", + "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0", + "@material/theme": "15.0.0-canary.bc9ae6c9c.0", "tslib": "^2.1.0" } }, "node_modules/@material/tab-scroller": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/tab-scroller/-/tab-scroller-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-H6EU/TSiK/M2DyyORX5GEtXD9rKYxTMHC2VxsNWARPMFJGzgeW2ugYkFv+rKI1/c0bs0CJ4e+qFnOlBsQXZvyQ==", - "dependencies": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/tab": "15.0.0-canary.684e33d25.0", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/tab-scroller/-/tab-scroller-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-QWHG/EWxirj4V9u2IHz+OSY9XCWrnNrPnNgEufxAJVUKV/A8ma1DYeFSQqxhX709R8wKGdycJksg0Flkl7Gq7w==", + "dependencies": { + "@material/animation": "15.0.0-canary.bc9ae6c9c.0", + "@material/base": "15.0.0-canary.bc9ae6c9c.0", + "@material/dom": "15.0.0-canary.bc9ae6c9c.0", + "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0", + "@material/tab": "15.0.0-canary.bc9ae6c9c.0", "tslib": "^2.1.0" } }, "node_modules/@material/textfield": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/textfield/-/textfield-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-OvgpDXjvpyJTtAWskO69IDybFvDNzr9w2PN/Fk7yFm+uNVupaWz1Ew8lZ4gGslaTNSVmh2XcsvmzxcLINSiiNg==", - "dependencies": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/density": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/floating-label": "15.0.0-canary.684e33d25.0", - "@material/line-ripple": "15.0.0-canary.684e33d25.0", - "@material/notched-outline": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/textfield/-/textfield-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-R3qRex9kCaZIAK8DuxPnVC42R0OaW7AB7fsFknDKeTeVQvRcbnV8E+iWSdqTiGdsi6QQHifX8idUrXw+O45zPw==", + "dependencies": { + "@material/animation": "15.0.0-canary.bc9ae6c9c.0", + "@material/base": "15.0.0-canary.bc9ae6c9c.0", + "@material/density": "15.0.0-canary.bc9ae6c9c.0", + "@material/dom": "15.0.0-canary.bc9ae6c9c.0", + "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0", + "@material/floating-label": "15.0.0-canary.bc9ae6c9c.0", + "@material/line-ripple": "15.0.0-canary.bc9ae6c9c.0", + "@material/notched-outline": "15.0.0-canary.bc9ae6c9c.0", + "@material/ripple": "15.0.0-canary.bc9ae6c9c.0", + "@material/rtl": "15.0.0-canary.bc9ae6c9c.0", + "@material/shape": "15.0.0-canary.bc9ae6c9c.0", + "@material/theme": "15.0.0-canary.bc9ae6c9c.0", + "@material/tokens": "15.0.0-canary.bc9ae6c9c.0", + "@material/typography": "15.0.0-canary.bc9ae6c9c.0", "tslib": "^2.1.0" } }, "node_modules/@material/theme": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/theme/-/theme-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-AZxaXXAvRKzAi20RlMxzt2U5UmkCWyv7DMWEBXsxtG5Tk54mi1HsbVUp3fxDPTlmL7Pq8p1/DESg/o7TgRCVlw==", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/theme/-/theme-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-CpUwXGE0dbhxQ45Hu9r9wbJtO/MAlv5ER4tBHA9tp/K+SU+lDgurBE2touFMg5INmdfVNtdumxb0nPPLaNQcUg==", "dependencies": { - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", + "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0", "tslib": "^2.1.0" } }, "node_modules/@material/tokens": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/tokens/-/tokens-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-wVwbQOTCXDPKYPdHQHLr026y36MMFelID1CmbfRk6mSol4O8yE9U0fXcShfRDW8Qo5E3X31w9c2A6T3neJY7wQ==", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/tokens/-/tokens-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-nbEuGj05txWz6ZMUanpM47SaAD7soyjKILR+XwDell9Zg3bGhsnexCNXPEz2fD+YgomS+jM5XmIcaJJHg/H93Q==", "dependencies": { - "@material/elevation": "15.0.0-canary.684e33d25.0" + "@material/elevation": "15.0.0-canary.bc9ae6c9c.0" } }, "node_modules/@material/tooltip": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/tooltip/-/tooltip-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-dtm26QjxyQdinc8btgz6yys07b7bUW4FZgNF2EBPeGrICrPg7jf+JEvDziz5g8VMaTBQLOQRSCGy0MKuRlOjLw==", - "dependencies": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/button": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/tooltip/-/tooltip-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-UzuXp0b9NuWuYLYpPguxrjbJnCmT/Cco8CkjI/6JajxaeA3o2XEBbQfRMTq8PTafuBjCHTc0b0mQY7rtxUp1Gg==", + "dependencies": { + "@material/animation": "15.0.0-canary.bc9ae6c9c.0", + "@material/base": "15.0.0-canary.bc9ae6c9c.0", + "@material/button": "15.0.0-canary.bc9ae6c9c.0", + "@material/dom": "15.0.0-canary.bc9ae6c9c.0", + "@material/elevation": "15.0.0-canary.bc9ae6c9c.0", + "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0", + "@material/rtl": "15.0.0-canary.bc9ae6c9c.0", + "@material/shape": "15.0.0-canary.bc9ae6c9c.0", + "@material/theme": "15.0.0-canary.bc9ae6c9c.0", + "@material/tokens": "15.0.0-canary.bc9ae6c9c.0", + "@material/typography": "15.0.0-canary.bc9ae6c9c.0", "safevalues": "^0.3.4", "tslib": "^2.1.0" } }, "node_modules/@material/top-app-bar": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/top-app-bar/-/top-app-bar-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-1M+oupUxflfW7u81P1XlxoLZB8bLzwtpKofIfDNRbEsiKhlLTERJR3Yak3BGE9xakNMysAaBHlkb5MrN5bNPFw==", - "dependencies": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/top-app-bar/-/top-app-bar-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-vJWjsvqtdSD5+yQ/9vgoBtBSCvPJ5uF/DVssv8Hdhgs1PYaAcODUi77kdi0+sy/TaWyOsTkQixqmwnFS16zesA==", + "dependencies": { + "@material/animation": "15.0.0-canary.bc9ae6c9c.0", + "@material/base": "15.0.0-canary.bc9ae6c9c.0", + "@material/elevation": "15.0.0-canary.bc9ae6c9c.0", + "@material/ripple": "15.0.0-canary.bc9ae6c9c.0", + "@material/rtl": "15.0.0-canary.bc9ae6c9c.0", + "@material/shape": "15.0.0-canary.bc9ae6c9c.0", + "@material/theme": "15.0.0-canary.bc9ae6c9c.0", + "@material/typography": "15.0.0-canary.bc9ae6c9c.0", "tslib": "^2.1.0" } }, "node_modules/@material/touch-target": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/touch-target/-/touch-target-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-zdE69Slg8+T7sTn1OwqZ6H7WBYac9mxJ/JlJqfTqthzIjZRcCxBSYymQJcDHjsrPnUojOtr9U4Tpm5YZ96TEkQ==", - "dependencies": { - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/touch-target/-/touch-target-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-AqYh9fjt+tv4ZE0C6MeYHblS2H+XwLbDl2mtyrK0DOEnCVQk5/l5ImKDfhrUdFWHvS4a5nBM4AA+sa7KaroLoA==", + "dependencies": { + "@material/base": "15.0.0-canary.bc9ae6c9c.0", + "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0", + "@material/rtl": "15.0.0-canary.bc9ae6c9c.0", + "@material/theme": "15.0.0-canary.bc9ae6c9c.0", "tslib": "^2.1.0" } }, "node_modules/@material/typography": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/typography/-/typography-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-aVnvgMwcfNa/K4wujzpKDIxjGl2hbkEL+m+OKDSQqWYjKcP9QrbzCXJruJBqxrBoPRHLbqo47k5f9uT8raSgjw==", + "version": "15.0.0-canary.bc9ae6c9c.0", + "resolved": "https://registry.npmjs.org/@material/typography/-/typography-15.0.0-canary.bc9ae6c9c.0.tgz", + "integrity": "sha512-CKsG1zyv34AKPNyZC8olER2OdPII64iR2SzQjpqh1UUvmIFiMPk23LvQ1OnC5aCB14pOXzmVgvJt31r9eNdZ6Q==", "dependencies": { - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", + "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0", + "@material/theme": "15.0.0-canary.bc9ae6c9c.0", "tslib": "^2.1.0" } }, "node_modules/@ngtools/webpack": { - "version": "15.1.2", - "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-15.1.2.tgz", - "integrity": "sha512-IxKPqyA5hiwUioAAptFaETF2TifH6cTGOc7qKYFxFgzK+llZtEBcNj3w9zrL5uCFnPHWDZqdIDhH3/WM4zBmkw==", + "version": "16.2.9", + "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-16.2.9.tgz", + "integrity": "sha512-rOclD7FfT4OSwVA0nDnULbJS6TORJ0+sQiuT2ebaNFErYr3LOm6Zut05tnmzFw8q1cePrILbG+xpnbggNr9Pyw==", "dev": true, "engines": { - "node": "^14.20.0 || ^16.13.0 || >=18.10.0", + "node": "^16.14.0 || >=18.10.0", "npm": "^6.11.0 || ^7.5.6 || >=8.0.0", "yarn": ">= 1.13.0" }, "peerDependencies": { - "@angular/compiler-cli": "^15.0.0", - "typescript": ">=4.8.2 <5.0", + "@angular/compiler-cli": "^16.0.0", + "typescript": ">=4.9.3 <5.2", "webpack": "^5.54.0" } }, @@ -4579,14 +4733,13 @@ } }, "node_modules/@npmcli/git": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/@npmcli/git/-/git-4.0.3.tgz", - "integrity": "sha512-8cXNkDIbnXPVbhXMmQ7/bklCAjtmPaXfI9aEM4iH+xSuEHINLMHhlfESvVwdqmHJRJkR48vNJTSUvoF6GRPSFA==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/@npmcli/git/-/git-4.1.0.tgz", + "integrity": "sha512-9hwoB3gStVfa0N31ymBmrX+GuDGdVA/QWShZVqE0HK2Af+7QGGrCTbZia/SW0ImUTjTne7SP91qxDmtXvDHRPQ==", "dev": true, "dependencies": { "@npmcli/promise-spawn": "^6.0.0", "lru-cache": "^7.4.4", - "mkdirp": "^1.0.4", "npm-pick-manifest": "^8.0.0", "proc-log": "^3.0.0", "promise-inflight": "^1.0.1", @@ -4599,18 +4752,18 @@ } }, "node_modules/@npmcli/git/node_modules/lru-cache": { - "version": "7.14.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.14.1.tgz", - "integrity": "sha512-ysxwsnTKdAx96aTRdhDOCQfDgbHnt8SK0KY8SEjO0wHinhWOFTESbjVCMPbU1uGXg/ch4lifqx0wfjOawU2+WA==", + "version": "7.18.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", + "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", "dev": true, "engines": { "node": ">=12" } }, "node_modules/@npmcli/git/node_modules/which": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/which/-/which-3.0.0.tgz", - "integrity": "sha512-nla//68K9NU6yRiwDY/Q8aU6siKlSs64aEC7+IV56QoAuyQT2ovsJcgGYGyqMOmI/CGN1BOR6mM5EN0FBO+zyQ==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/which/-/which-3.0.1.tgz", + "integrity": "sha512-XA1b62dzQzLfaEOSQFTCOd5KFf/1VSzZo7/7TUjnya6u0vGGKzU96UQBZTAThCb2j4/xjBAyii1OhRLJEivHvg==", "dev": true, "dependencies": { "isexe": "^2.0.0" @@ -4623,9 +4776,9 @@ } }, "node_modules/@npmcli/installed-package-contents": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@npmcli/installed-package-contents/-/installed-package-contents-2.0.1.tgz", - "integrity": "sha512-GIykAFdOVK31Q1/zAtT5MbxqQL2vyl9mvFJv+OGu01zxbhL3p0xc8gJjdNGX1mWmUT43aEKVO2L6V/2j4TOsAA==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/@npmcli/installed-package-contents/-/installed-package-contents-2.0.2.tgz", + "integrity": "sha512-xACzLPhnfD51GKvTOOuNX2/V4G4mz9/1I2MfDoye9kBM3RYe5g2YbscsaGoTlaWqkxeiapBWyseULVKpSVHtKQ==", "dev": true, "dependencies": { "npm-bundled": "^3.0.0", @@ -4674,9 +4827,9 @@ } }, "node_modules/@npmcli/promise-spawn/node_modules/which": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/which/-/which-3.0.0.tgz", - "integrity": "sha512-nla//68K9NU6yRiwDY/Q8aU6siKlSs64aEC7+IV56QoAuyQT2ovsJcgGYGyqMOmI/CGN1BOR6mM5EN0FBO+zyQ==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/which/-/which-3.0.1.tgz", + "integrity": "sha512-XA1b62dzQzLfaEOSQFTCOd5KFf/1VSzZo7/7TUjnya6u0vGGKzU96UQBZTAThCb2j4/xjBAyii1OhRLJEivHvg==", "dev": true, "dependencies": { "isexe": "^2.0.0" @@ -4689,9 +4842,9 @@ } }, "node_modules/@npmcli/run-script": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/@npmcli/run-script/-/run-script-6.0.0.tgz", - "integrity": "sha512-ql+AbRur1TeOdl1FY+RAwGW9fcr4ZwiVKabdvm93mujGREVuVLbdkXRJDrkTXSdCjaxYydr1wlA2v67jxWG5BQ==", + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/@npmcli/run-script/-/run-script-6.0.2.tgz", + "integrity": "sha512-NCcr1uQo1k5U+SYlnIrbAh3cxy+OQT1VtqiAbxdymSlptbzBb62AjH2xXgjNCoP073hoa1CfCAcwoZ8k96C4nA==", "dev": true, "dependencies": { "@npmcli/node-gyp": "^3.0.0", @@ -4705,9 +4858,9 @@ } }, "node_modules/@npmcli/run-script/node_modules/which": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/which/-/which-3.0.0.tgz", - "integrity": "sha512-nla//68K9NU6yRiwDY/Q8aU6siKlSs64aEC7+IV56QoAuyQT2ovsJcgGYGyqMOmI/CGN1BOR6mM5EN0FBO+zyQ==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/which/-/which-3.0.1.tgz", + "integrity": "sha512-XA1b62dzQzLfaEOSQFTCOd5KFf/1VSzZo7/7TUjnya6u0vGGKzU96UQBZTAThCb2j4/xjBAyii1OhRLJEivHvg==", "dev": true, "dependencies": { "isexe": "^2.0.0" @@ -4719,47 +4872,68 @@ "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, + "node_modules/@pkgjs/parseargs": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", + "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==", + "dev": true, + "optional": true, + "engines": { + "node": ">=14" + } + }, "node_modules/@schematics/angular": { - "version": "15.1.2", - "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-15.1.2.tgz", - "integrity": "sha512-PcAbjbWvaW3yKvcGCqHrlHm4BTwGuqr58czCASc49Hy6tJba+dRblYatzB0D1tzdJOTsa684Ghg7knCN86fHeg==", + "version": "16.2.9", + "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-16.2.9.tgz", + "integrity": "sha512-uiU2YbZRVHgk1N1DDsek/5CKhfpZ8myJYNJk8eHV5LswnXOP3aqvH23VhneaAgOYwK5fISC7eMG0pLVKMvFfZQ==", "dev": true, "dependencies": { - "@angular-devkit/core": "15.1.2", - "@angular-devkit/schematics": "15.1.2", + "@angular-devkit/core": "16.2.9", + "@angular-devkit/schematics": "16.2.9", "jsonc-parser": "3.2.0" }, "engines": { - "node": "^14.20.0 || ^16.13.0 || >=18.10.0", + "node": "^16.14.0 || >=18.10.0", "npm": "^6.11.0 || ^7.5.6 || >=8.0.0", "yarn": ">= 1.13.0" } }, - "node_modules/@sinclair/typebox": { - "version": "0.24.51", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz", - "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==", - "dev": true - }, - "node_modules/@sinonjs/commons": { - "version": "1.8.6", - "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.6.tgz", - "integrity": "sha512-Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ==", + "node_modules/@sigstore/bundle": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@sigstore/bundle/-/bundle-1.1.0.tgz", + "integrity": "sha512-PFutXEy0SmQxYI4texPw3dd2KewuNqv7OuK1ZFtY2fM754yhvG2KdgwIhRnoEE2uHdtdGNQ8s0lb94dW9sELog==", "dev": true, "dependencies": { - "type-detect": "4.0.8" + "@sigstore/protobuf-specs": "^0.2.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "node_modules/@sinonjs/fake-timers": { - "version": "9.1.2", - "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-9.1.2.tgz", - "integrity": "sha512-BPS4ynJW/o92PUR4wgriz2Ud5gpST5vz6GQfMixEDK0Z8ZCUv2M7SkBLykH56T++Xs+8ln9zTGbOvNGIe02/jw==", + "node_modules/@sigstore/protobuf-specs": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/@sigstore/protobuf-specs/-/protobuf-specs-0.2.1.tgz", + "integrity": "sha512-XTWVxnWJu+c1oCshMLwnKvz8ZQJJDVOlciMfgpJBQbThVjKTCG8dwyhgLngBD2KN0ap9F/gOV8rFDEx8uh7R2A==", + "dev": true, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/@sigstore/sign": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@sigstore/sign/-/sign-1.0.0.tgz", + "integrity": "sha512-INxFVNQteLtcfGmcoldzV6Je0sbbfh9I16DM4yJPw3j5+TFP8X6uIiA18mvpEa9yyeycAKgPmOA3X9hVdVTPUA==", "dev": true, "dependencies": { - "@sinonjs/commons": "^1.7.0" + "@sigstore/bundle": "^1.1.0", + "@sigstore/protobuf-specs": "^0.2.0", + "make-fetch-happen": "^11.0.1" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "node_modules/@tootallnate/once": { + "node_modules/@sigstore/sign/node_modules/@tootallnate/once": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz", "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==", @@ -4768,51 +4942,218 @@ "node": ">= 10" } }, - "node_modules/@types/babel__core": { - "version": "7.20.0", - "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.0.tgz", - "integrity": "sha512-+n8dL/9GWblDO0iU6eZAwEIJVr5DWigtle+Q6HLOrh/pdbXOhOtqzq8VPPE2zvNJzSKY4vH/z3iT3tn0A3ypiQ==", + "node_modules/@sigstore/sign/node_modules/http-proxy-agent": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz", + "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==", "dev": true, "dependencies": { - "@babel/parser": "^7.20.7", - "@babel/types": "^7.20.7", - "@types/babel__generator": "*", - "@types/babel__template": "*", - "@types/babel__traverse": "*" + "@tootallnate/once": "2", + "agent-base": "6", + "debug": "4" + }, + "engines": { + "node": ">= 6" } }, - "node_modules/@types/babel__generator": { - "version": "7.6.4", - "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.4.tgz", - "integrity": "sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==", + "node_modules/@sigstore/sign/node_modules/lru-cache": { + "version": "7.18.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", + "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", "dev": true, - "dependencies": { - "@babel/types": "^7.0.0" + "engines": { + "node": ">=12" } }, - "node_modules/@types/babel__template": { - "version": "7.4.1", - "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.1.tgz", - "integrity": "sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==", + "node_modules/@sigstore/sign/node_modules/make-fetch-happen": { + "version": "11.1.1", + "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-11.1.1.tgz", + "integrity": "sha512-rLWS7GCSTcEujjVBs2YqG7Y4643u8ucvCJeSRqiLYhesrDuzeuFIk37xREzAsfQaqzl8b9rNCE4m6J8tvX4Q8w==", "dev": true, "dependencies": { - "@babel/parser": "^7.1.0", - "@babel/types": "^7.0.0" + "agentkeepalive": "^4.2.1", + "cacache": "^17.0.0", + "http-cache-semantics": "^4.1.1", + "http-proxy-agent": "^5.0.0", + "https-proxy-agent": "^5.0.0", + "is-lambda": "^1.0.1", + "lru-cache": "^7.7.1", + "minipass": "^5.0.0", + "minipass-fetch": "^3.0.0", + "minipass-flush": "^1.0.5", + "minipass-pipeline": "^1.2.4", + "negotiator": "^0.6.3", + "promise-retry": "^2.0.1", + "socks-proxy-agent": "^7.0.0", + "ssri": "^10.0.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "node_modules/@types/babel__traverse": { - "version": "7.18.3", - "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.18.3.tgz", - "integrity": "sha512-1kbcJ40lLB7MHsj39U4Sh1uTd2E7rLEa79kmDpI6cy+XiXsteB3POdQomoq4FxszMrO3ZYchkhYJw7A2862b3w==", + "node_modules/@sigstore/sign/node_modules/minipass-fetch": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.4.tgz", + "integrity": "sha512-jHAqnA728uUpIaFm7NWsCnqKT6UqZz7GcI/bDpPATuwYyKwJwW0remxSCxUlKiEty+eopHGa3oc8WxgQ1FFJqg==", "dev": true, "dependencies": { - "@babel/types": "^7.3.0" + "minipass": "^7.0.3", + "minipass-sized": "^1.0.3", + "minizlib": "^2.1.2" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + }, + "optionalDependencies": { + "encoding": "^0.1.13" + } + }, + "node_modules/@sigstore/sign/node_modules/minipass-fetch/node_modules/minipass": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz", + "integrity": "sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==", + "dev": true, + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, + "node_modules/@sigstore/tuf": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@sigstore/tuf/-/tuf-1.0.3.tgz", + "integrity": "sha512-2bRovzs0nJZFlCN3rXirE4gwxCn97JNjMmwpecqlbgV9WcxX7WRuIrgzx/X7Ib7MYRbyUTpBYE0s2x6AmZXnlg==", + "dev": true, + "dependencies": { + "@sigstore/protobuf-specs": "^0.2.0", + "tuf-js": "^1.1.7" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/@sinclair/typebox": { + "version": "0.27.8", + "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", + "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==", + "dev": true + }, + "node_modules/@sinonjs/commons": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.0.tgz", + "integrity": "sha512-jXBtWAF4vmdNmZgD5FoKsVLv3rPgDnLgPbU84LIJ3otV44vJlDRokVng5v8NFJdCf/da9legHcKaRuZs4L7faA==", + "dev": true, + "dependencies": { + "type-detect": "4.0.8" + } + }, + "node_modules/@sinonjs/fake-timers": { + "version": "10.3.0", + "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-10.3.0.tgz", + "integrity": "sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA==", + "dev": true, + "dependencies": { + "@sinonjs/commons": "^3.0.0" + } + }, + "node_modules/@tootallnate/once": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", + "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==", + "dev": true, + "engines": { + "node": ">= 6" + } + }, + "node_modules/@tufjs/canonical-json": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@tufjs/canonical-json/-/canonical-json-1.0.0.tgz", + "integrity": "sha512-QTnf++uxunWvG2z3UFNzAoQPHxnSXOwtaI3iJ+AohhV+5vONuArPjJE7aPXPVXfXJsqrVbZBu9b81AJoSd09IQ==", + "dev": true, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/@tufjs/models": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@tufjs/models/-/models-1.0.4.tgz", + "integrity": "sha512-qaGV9ltJP0EO25YfFUPhxRVK0evXFIAGicsVXuRim4Ed9cjPxYhNnNJ49SFmbeLgtxpslIkX317IgpfcHPVj/A==", + "dev": true, + "dependencies": { + "@tufjs/canonical-json": "1.0.0", + "minimatch": "^9.0.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/@tufjs/models/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/@tufjs/models/node_modules/minimatch": { + "version": "9.0.3", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", + "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==", + "dev": true, + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/@types/babel__core": { + "version": "7.20.3", + "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.3.tgz", + "integrity": "sha512-54fjTSeSHwfan8AyHWrKbfBWiEUrNTZsUwPTDSNaaP1QDQIZbeNUg3a59E9D+375MzUw/x1vx2/0F5LBz+AeYA==", + "dev": true, + "dependencies": { + "@babel/parser": "^7.20.7", + "@babel/types": "^7.20.7", + "@types/babel__generator": "*", + "@types/babel__template": "*", + "@types/babel__traverse": "*" + } + }, + "node_modules/@types/babel__generator": { + "version": "7.6.6", + "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.6.tgz", + "integrity": "sha512-66BXMKb/sUWbMdBNdMvajU7i/44RkrA3z/Yt1c7R5xejt8qh84iU54yUWCtm0QwGJlDcf/gg4zd/x4mpLAlb/w==", + "dev": true, + "dependencies": { + "@babel/types": "^7.0.0" + } + }, + "node_modules/@types/babel__template": { + "version": "7.4.3", + "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.3.tgz", + "integrity": "sha512-ciwyCLeuRfxboZ4isgdNZi/tkt06m8Tw6uGbBSBgWrnnZGNXiEyM27xc/PjXGQLqlZ6ylbgHMnm7ccF9tCkOeQ==", + "dev": true, + "dependencies": { + "@babel/parser": "^7.1.0", + "@babel/types": "^7.0.0" + } + }, + "node_modules/@types/babel__traverse": { + "version": "7.20.3", + "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.3.tgz", + "integrity": "sha512-Lsh766rGEFbaxMIDH7Qa+Yha8cMVI3qAK6CHt3OR0YfxOIn5Z54iHiyDRycHrBqeIiqGa20Kpsv1cavfBKkRSw==", + "dev": true, + "dependencies": { + "@babel/types": "^7.20.7" } }, "node_modules/@types/body-parser": { - "version": "1.19.2", - "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.2.tgz", - "integrity": "sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==", + "version": "1.19.4", + "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.4.tgz", + "integrity": "sha512-N7UDG0/xiPQa2D/XrVJXjkWbpqHCd2sBaB32ggRF2l83RhPfamgKGF8gwwqyksS95qUS5ZYF9aF+lLPRlwI2UA==", "dev": true, "dependencies": { "@types/connect": "*", @@ -4820,27 +5161,27 @@ } }, "node_modules/@types/bonjour": { - "version": "3.5.10", - "resolved": "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.10.tgz", - "integrity": "sha512-p7ienRMiS41Nu2/igbJxxLDWrSZ0WxM8UQgCeO9KhoVF7cOVFkrKsiDr1EsJIla8vV3oEEjGcz11jc5yimhzZw==", + "version": "3.5.12", + "resolved": "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.12.tgz", + "integrity": "sha512-ky0kWSqXVxSqgqJvPIkgFkcn4C8MnRog308Ou8xBBIVo39OmUFy+jqNe0nPwLCDFxUpmT9EvT91YzOJgkDRcFg==", "dev": true, "dependencies": { "@types/node": "*" } }, "node_modules/@types/connect": { - "version": "3.4.35", - "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.35.tgz", - "integrity": "sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==", + "version": "3.4.37", + "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.37.tgz", + "integrity": "sha512-zBUSRqkfZ59OcwXon4HVxhx5oWCJmc0OtBTK05M+p0dYjgN6iTwIL2T/WbsQZrEsdnwaF9cWQ+azOnpPvIqY3Q==", "dev": true, "dependencies": { "@types/node": "*" } }, "node_modules/@types/connect-history-api-fallback": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.3.5.tgz", - "integrity": "sha512-h8QJa8xSb1WD4fpKBDcATDNGXghFj6/3GRWG6dhmRcu0RX1Ubasur2Uvx5aeEwlf0MwblEC2bMzzMQntxnw/Cw==", + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.2.tgz", + "integrity": "sha512-gX2j9x+NzSh4zOhnRPSdPPmTepS4DfxES0AvIFv3jGv5QyeAJf6u6dY5/BAoAJU9Qq1uTvwOku8SSC2GnCRl6Q==", "dev": true, "dependencies": { "@types/express-serve-static-core": "*", @@ -4848,9 +5189,9 @@ } }, "node_modules/@types/eslint": { - "version": "8.4.10", - "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.10.tgz", - "integrity": "sha512-Sl/HOqN8NKPmhWo2VBEPm0nvHnu2LL3v9vKo8MEq0EtbJ4eVzGPl41VNPvn5E1i5poMk4/XD8UriLHpJvEP/Nw==", + "version": "8.44.6", + "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.44.6.tgz", + "integrity": "sha512-P6bY56TVmX8y9J87jHNgQh43h6VVU+6H7oN7hgvivV81K2XY8qJZ5vqPy/HdUoVIelii2kChYVzQanlswPWVFw==", "dev": true, "dependencies": { "@types/estree": "*", @@ -4858,9 +5199,9 @@ } }, "node_modules/@types/eslint-scope": { - "version": "3.7.4", - "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.4.tgz", - "integrity": "sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==", + "version": "3.7.6", + "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.6.tgz", + "integrity": "sha512-zfM4ipmxVKWdxtDaJ3MP3pBurDXOCoyjvlpE3u6Qzrmw4BPbfm4/ambIeTk/r/J0iq/+2/xp0Fmt+gFvXJY2PQ==", "dev": true, "dependencies": { "@types/eslint": "*", @@ -4868,143 +5209,144 @@ } }, "node_modules/@types/estree": { - "version": "0.0.51", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.51.tgz", - "integrity": "sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.4.tgz", + "integrity": "sha512-2JwWnHK9H+wUZNorf2Zr6ves96WHoWDJIftkcxPKsS7Djta6Zu519LarhRNljPXkpsZR2ZMwNCPeW7omW07BJw==", "dev": true }, "node_modules/@types/express": { - "version": "4.17.15", - "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.15.tgz", - "integrity": "sha512-Yv0k4bXGOH+8a+7bELd2PqHQsuiANB+A8a4gnQrkRWzrkKlb6KHaVvyXhqs04sVW/OWlbPyYxRgYlIXLfrufMQ==", + "version": "4.17.20", + "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.20.tgz", + "integrity": "sha512-rOaqlkgEvOW495xErXMsmyX3WKBInbhG5eqojXYi3cGUaLoRDlXa5d52fkfWZT963AZ3v2eZ4MbKE6WpDAGVsw==", "dev": true, "dependencies": { "@types/body-parser": "*", - "@types/express-serve-static-core": "^4.17.31", + "@types/express-serve-static-core": "^4.17.33", "@types/qs": "*", "@types/serve-static": "*" } }, "node_modules/@types/express-serve-static-core": { - "version": "4.17.32", - "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.32.tgz", - "integrity": "sha512-aI5h/VOkxOF2Z1saPy0Zsxs5avets/iaiAJYznQFm5By/pamU31xWKL//epiF4OfUA2qTOc9PV6tCUjhO8wlZA==", + "version": "4.17.39", + "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.39.tgz", + "integrity": "sha512-BiEUfAiGCOllomsRAZOiMFP7LAnrifHpt56pc4Z7l9K6ACyN06Ns1JLMBxwkfLOjJRlSf06NwWsT7yzfpaVpyQ==", "dev": true, "dependencies": { "@types/node": "*", "@types/qs": "*", - "@types/range-parser": "*" + "@types/range-parser": "*", + "@types/send": "*" } }, "node_modules/@types/graceful-fs": { - "version": "4.1.6", - "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.6.tgz", - "integrity": "sha512-Sig0SNORX9fdW+bQuTEovKj3uHcUL6LQKbCrrqb1X7J6/ReAbhCXRAhc+SMejhLELFj2QcyuxmUooZ4bt5ReSw==", + "version": "4.1.8", + "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.8.tgz", + "integrity": "sha512-NhRH7YzWq8WiNKVavKPBmtLYZHxNY19Hh+az28O/phfp68CF45pMFud+ZzJ8ewnxnC5smIdF3dqFeiSUQ5I+pw==", "dev": true, "dependencies": { "@types/node": "*" } }, + "node_modules/@types/http-errors": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.3.tgz", + "integrity": "sha512-pP0P/9BnCj1OVvQR2lF41EkDG/lWWnDyA203b/4Fmi2eTyORnBtcDoKDwjWQthELrBvWkMOrvSOnZ8OVlW6tXA==", + "dev": true + }, "node_modules/@types/http-proxy": { - "version": "1.17.9", - "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.9.tgz", - "integrity": "sha512-QsbSjA/fSk7xB+UXlCT3wHBy5ai9wOcNDWwZAtud+jXhwOM3l+EYZh8Lng4+/6n8uar0J7xILzqftJdJ/Wdfkw==", + "version": "1.17.13", + "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.13.tgz", + "integrity": "sha512-GkhdWcMNiR5QSQRYnJ+/oXzu0+7JJEPC8vkWXK351BkhjraZF+1W13CUYARUvX9+NqIU2n6YHA4iwywsc/M6Sw==", "dev": true, "dependencies": { "@types/node": "*" } }, "node_modules/@types/istanbul-lib-coverage": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz", - "integrity": "sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.5.tgz", + "integrity": "sha512-zONci81DZYCZjiLe0r6equvZut0b+dBRPBN5kBDjsONnutYNtJMoWQ9uR2RkL1gLG9NMTzvf+29e5RFfPbeKhQ==", "dev": true }, "node_modules/@types/istanbul-lib-report": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz", - "integrity": "sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.2.tgz", + "integrity": "sha512-8toY6FgdltSdONav1XtUHl4LN1yTmLza+EuDazb/fEmRNCwjyqNVIQWs2IfC74IqjHkREs/nQ2FWq5kZU9IC0w==", "dev": true, "dependencies": { "@types/istanbul-lib-coverage": "*" } }, "node_modules/@types/istanbul-reports": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz", - "integrity": "sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.3.tgz", + "integrity": "sha512-1nESsePMBlf0RPRffLZi5ujYh7IH1BWL4y9pr+Bn3cJBdxz+RTP8bUFljLz9HvzhhOSWKdyBZ4DIivdL6rvgZg==", "dev": true, "dependencies": { "@types/istanbul-lib-report": "*" } }, "node_modules/@types/jest": { - "version": "28.1.8", - "resolved": "https://registry.npmjs.org/@types/jest/-/jest-28.1.8.tgz", - "integrity": "sha512-8TJkV++s7B6XqnDrzR1m/TT0A0h948Pnl/097veySPN67VRAgQ4gZ7n2KfJo2rVq6njQjdxU3GCCyDvAeuHoiw==", + "version": "29.5.7", + "resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.7.tgz", + "integrity": "sha512-HLyetab6KVPSiF+7pFcUyMeLsx25LDNDemw9mGsJBkai/oouwrjTycocSDYopMEwFhN2Y4s9oPyOCZNofgSt2g==", "dev": true, "dependencies": { - "expect": "^28.0.0", - "pretty-format": "^28.0.0" + "expect": "^29.0.0", + "pretty-format": "^29.0.0" } }, "node_modules/@types/jsdom": { - "version": "16.2.15", - "resolved": "https://registry.npmjs.org/@types/jsdom/-/jsdom-16.2.15.tgz", - "integrity": "sha512-nwF87yjBKuX/roqGYerZZM0Nv1pZDMAT5YhOHYeM/72Fic+VEqJh4nyoqoapzJnW3pUlfxPY5FhgsJtM+dRnQQ==", + "version": "20.0.1", + "resolved": "https://registry.npmjs.org/@types/jsdom/-/jsdom-20.0.1.tgz", + "integrity": "sha512-d0r18sZPmMQr1eG35u12FZfhIXNrnsPU/g5wvRKCUf/tOGilKKwYMYGqh33BNR6ba+2gkHw1EUiHoN3mn7E5IQ==", "dev": true, "dependencies": { "@types/node": "*", - "@types/parse5": "^6.0.3", - "@types/tough-cookie": "*" + "@types/tough-cookie": "*", + "parse5": "^7.0.0" } }, "node_modules/@types/json-schema": { - "version": "7.0.11", - "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz", - "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==", + "version": "7.0.14", + "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.14.tgz", + "integrity": "sha512-U3PUjAudAdJBeC2pgN8uTIKgxrb4nlDF3SF0++EldXQvQBGkpFZMSnwQiIoDU77tv45VgNkl/L4ouD+rEomujw==", "dev": true }, "node_modules/@types/mime": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/@types/mime/-/mime-3.0.1.tgz", - "integrity": "sha512-Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA==", + "version": "1.3.4", + "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.4.tgz", + "integrity": "sha512-1Gjee59G25MrQGk8bsNvC6fxNiRgUlGn2wlhGf95a59DrprnnHk80FIMMFG9XHMdrfsuA119ht06QPDXA1Z7tw==", "dev": true }, "node_modules/@types/node": { - "version": "18.11.9", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.9.tgz", - "integrity": "sha512-CRpX21/kGdzjOpFsZSkcrXMGIBWMGNIHXXBVFSH+ggkftxg+XYP20TESbh+zFvFj3EQOl5byk0HTRn1IL6hbqg==", - "dev": true - }, - "node_modules/@types/parse-json": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz", - "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==", - "dev": true - }, - "node_modules/@types/parse5": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/@types/parse5/-/parse5-6.0.3.tgz", - "integrity": "sha512-SuT16Q1K51EAVPz1K29DJ/sXjhSQ0zjvsypYJ6tlwVsRV9jwW5Adq2ch8Dq8kDBCkYnELS7N7VNCSB5nC56t/g==", - "dev": true + "version": "20.8.10", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.8.10.tgz", + "integrity": "sha512-TlgT8JntpcbmKUFzjhsyhGfP2fsiz1Mv56im6enJ905xG1DAYesxJaeSbGqQmAw8OWPdhyJGhGSQGKRNJ45u9w==", + "dev": true, + "dependencies": { + "undici-types": "~5.26.4" + } }, - "node_modules/@types/prettier": { - "version": "2.7.2", - "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.7.2.tgz", - "integrity": "sha512-KufADq8uQqo1pYKVIYzfKbJfBAc0sOeXqGbFaSpv8MRmC/zXgowNZmFcbngndGk922QDmOASEXUZCaY48gs4cg==", - "dev": true + "node_modules/@types/node-forge": { + "version": "1.3.8", + "resolved": "https://registry.npmjs.org/@types/node-forge/-/node-forge-1.3.8.tgz", + "integrity": "sha512-vGXshY9vim9CJjrpcS5raqSjEfKlJcWy2HNdgUasR66fAnVEYarrf1ULV4nfvpC1nZq/moA9qyqBcu83x+Jlrg==", + "dev": true, + "dependencies": { + "@types/node": "*" + } }, "node_modules/@types/qs": { - "version": "6.9.7", - "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.7.tgz", - "integrity": "sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==", + "version": "6.9.9", + "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.9.tgz", + "integrity": "sha512-wYLxw35euwqGvTDx6zfY1vokBFnsK0HNrzc6xNHchxfO2hpuRg74GbkEW7e3sSmPvj0TjCDT1VCa6OtHXnubsg==", "dev": true }, "node_modules/@types/range-parser": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.4.tgz", - "integrity": "sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==", + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.6.tgz", + "integrity": "sha512-+0autS93xyXizIYiyL02FCY8N+KkKPhILhcUSA276HxzreZ16kl+cmwvV2qAM/PuCCwPXzOXOWhiPcw20uSFcA==", "dev": true }, "node_modules/@types/retry": { @@ -5014,88 +5356,100 @@ "dev": true }, "node_modules/@types/semver": { - "version": "7.3.13", - "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.3.13.tgz", - "integrity": "sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-MMzuxN3GdFwskAnb6fz0orFvhfqi752yjaXylr0Rp4oDg5H0Zn1IuyRhDVvYOwAXoJirx2xuS16I3WjxnAIHiQ==", "dev": true }, + "node_modules/@types/send": { + "version": "0.17.3", + "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.3.tgz", + "integrity": "sha512-/7fKxvKUoETxjFUsuFlPB9YndePpxxRAOfGC/yJdc9kTjTeP5kRCTzfnE8kPUKCeyiyIZu0YQ76s50hCedI1ug==", + "dev": true, + "dependencies": { + "@types/mime": "^1", + "@types/node": "*" + } + }, "node_modules/@types/serve-index": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.1.tgz", - "integrity": "sha512-d/Hs3nWDxNL2xAczmOVZNj92YZCS6RGxfBPjKzuu/XirCgXdpKEb88dYNbrYGint6IVWLNP+yonwVAuRC0T2Dg==", + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.3.tgz", + "integrity": "sha512-4KG+yMEuvDPRrYq5fyVm/I2uqAJSAwZK9VSa+Zf+zUq9/oxSSvy3kkIqyL+jjStv6UCVi8/Aho0NHtB1Fwosrg==", "dev": true, "dependencies": { "@types/express": "*" } }, "node_modules/@types/serve-static": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.0.tgz", - "integrity": "sha512-z5xyF6uh8CbjAu9760KDKsH2FcDxZ2tFCsA4HIMWE6IkiYMXfVoa+4f9KX+FN0ZLsaMw1WNG2ETLA6N+/YA+cg==", + "version": "1.15.4", + "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.4.tgz", + "integrity": "sha512-aqqNfs1XTF0HDrFdlY//+SGUxmdSUbjeRXb5iaZc3x0/vMbYmdw9qvOgHWOyyLFxSSRnUuP5+724zBgfw8/WAw==", "dev": true, "dependencies": { + "@types/http-errors": "*", "@types/mime": "*", "@types/node": "*" } }, "node_modules/@types/sockjs": { - "version": "0.3.33", - "resolved": "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.33.tgz", - "integrity": "sha512-f0KEEe05NvUnat+boPTZ0dgaLZ4SfSouXUgv5noUiefG2ajgKjmETo9ZJyuqsl7dfl2aHlLJUiki6B4ZYldiiw==", + "version": "0.3.35", + "resolved": "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.35.tgz", + "integrity": "sha512-tIF57KB+ZvOBpAQwSaACfEu7htponHXaFzP7RfKYgsOS0NoYnn+9+jzp7bbq4fWerizI3dTB4NfAZoyeQKWJLw==", "dev": true, "dependencies": { "@types/node": "*" } }, "node_modules/@types/stack-utils": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.1.tgz", - "integrity": "sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.2.tgz", + "integrity": "sha512-g7CK9nHdwjK2n0ymT2CW698FuWJRIx+RP6embAzZ2Qi8/ilIrA1Imt2LVSeHUzKvpoi7BhmmQcXz95eS0f2JXw==", "dev": true }, "node_modules/@types/tough-cookie": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.2.tgz", - "integrity": "sha512-Q5vtl1W5ue16D+nIaW8JWebSSraJVlK+EthKn7e7UcD4KWsaSJ8BqGPXNaPghgtcn/fhvrN17Tv8ksUsQpiplw==", + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.4.tgz", + "integrity": "sha512-95Sfz4nvMAb0Nl9DTxN3j64adfwfbBPEYq14VN7zT5J5O2M9V6iZMIIQU1U+pJyl9agHYHNCqhCXgyEtIRRa5A==", "dev": true }, "node_modules/@types/ws": { - "version": "8.5.4", - "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.4.tgz", - "integrity": "sha512-zdQDHKUgcX/zBc4GrwsE/7dVdAD8JR4EuiAXiiUhhfyIJXXb2+PrGshFyeXWQPMmmZ2XxgaqclgpIC7eTXc1mg==", + "version": "8.5.8", + "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.8.tgz", + "integrity": "sha512-flUksGIQCnJd6sZ1l5dqCEG/ksaoAg/eUwiLAGTJQcfgvZJKF++Ta4bJA6A5aPSJmsr+xlseHn4KLgVlNnvPTg==", "dev": true, "dependencies": { "@types/node": "*" } }, "node_modules/@types/yargs": { - "version": "17.0.17", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.17.tgz", - "integrity": "sha512-72bWxFKTK6uwWJAVT+3rF6Jo6RTojiJ27FQo8Rf60AL+VZbzoVPnMFhKsUnbjR8A3BTCYQ7Mv3hnl8T0A+CX9g==", + "version": "17.0.29", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.29.tgz", + "integrity": "sha512-nacjqA3ee9zRF/++a3FUY1suHTFKZeHba2n8WeDw9cCVdmzmHpIxyzOJBcpHvvEmS8E9KqWlSnWHUkOrkhWcvA==", "dev": true, "dependencies": { "@types/yargs-parser": "*" } }, "node_modules/@types/yargs-parser": { - "version": "21.0.0", - "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.0.tgz", - "integrity": "sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==", + "version": "21.0.2", + "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.2.tgz", + "integrity": "sha512-5qcvofLPbfjmBfKaLfj/+f+Sbd6pN4zl7w7VSVI5uz7m9QZTuB2aZAa2uo1wHFBNN2x6g/SoTkXmd8mQnQF2Cw==", "dev": true }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "5.49.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.49.0.tgz", - "integrity": "sha512-IhxabIpcf++TBaBa1h7jtOWyon80SXPRLDq0dVz5SLFC/eW6tofkw/O7Ar3lkx5z5U6wzbKDrl2larprp5kk5Q==", + "version": "5.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.62.0.tgz", + "integrity": "sha512-TiZzBSJja/LbhNPvk6yc0JrX9XqhQ0hdh6M2svYfsHGejaKFIAGd9MQ+ERIMzLGlN/kZoYIgdxFV0PuljTKXag==", "dev": true, "dependencies": { - "@typescript-eslint/scope-manager": "5.49.0", - "@typescript-eslint/type-utils": "5.49.0", - "@typescript-eslint/utils": "5.49.0", + "@eslint-community/regexpp": "^4.4.0", + "@typescript-eslint/scope-manager": "5.62.0", + "@typescript-eslint/type-utils": "5.62.0", + "@typescript-eslint/utils": "5.62.0", "debug": "^4.3.4", + "graphemer": "^1.4.0", "ignore": "^5.2.0", "natural-compare-lite": "^1.4.0", - "regexpp": "^3.2.0", "semver": "^7.3.7", "tsutils": "^3.21.0" }, @@ -5117,14 +5471,14 @@ } }, "node_modules/@typescript-eslint/parser": { - "version": "5.49.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.49.0.tgz", - "integrity": "sha512-veDlZN9mUhGqU31Qiv2qEp+XrJj5fgZpJ8PW30sHU+j/8/e5ruAhLaVDAeznS7A7i4ucb/s8IozpDtt9NqCkZg==", + "version": "5.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.62.0.tgz", + "integrity": "sha512-VlJEV0fOQ7BExOsHYAGrgbEiZoi8D+Bl2+f6V2RrXerRSylnp+ZBHmPvaIa8cz0Ajx7WO7Z5RqfgYg7ED1nRhA==", "dev": true, "dependencies": { - "@typescript-eslint/scope-manager": "5.49.0", - "@typescript-eslint/types": "5.49.0", - "@typescript-eslint/typescript-estree": "5.49.0", + "@typescript-eslint/scope-manager": "5.62.0", + "@typescript-eslint/types": "5.62.0", + "@typescript-eslint/typescript-estree": "5.62.0", "debug": "^4.3.4" }, "engines": { @@ -5144,13 +5498,13 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "5.49.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.49.0.tgz", - "integrity": "sha512-clpROBOiMIzpbWNxCe1xDK14uPZh35u4QaZO1GddilEzoCLAEz4szb51rBpdgurs5k2YzPtJeTEN3qVbG+LRUQ==", + "version": "5.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz", + "integrity": "sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.49.0", - "@typescript-eslint/visitor-keys": "5.49.0" + "@typescript-eslint/types": "5.62.0", + "@typescript-eslint/visitor-keys": "5.62.0" }, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -5161,13 +5515,13 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "5.49.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.49.0.tgz", - "integrity": "sha512-eUgLTYq0tR0FGU5g1YHm4rt5H/+V2IPVkP0cBmbhRyEmyGe4XvJ2YJ6sYTmONfjmdMqyMLad7SB8GvblbeESZA==", + "version": "5.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.62.0.tgz", + "integrity": "sha512-xsSQreu+VnfbqQpW5vnCJdq1Z3Q0U31qiWmRhr98ONQmcp/yhiPJFPq8MXiJVLiksmOKSjIldZzkebzHuCGzew==", "dev": true, "dependencies": { - "@typescript-eslint/typescript-estree": "5.49.0", - "@typescript-eslint/utils": "5.49.0", + "@typescript-eslint/typescript-estree": "5.62.0", + "@typescript-eslint/utils": "5.62.0", "debug": "^4.3.4", "tsutils": "^3.21.0" }, @@ -5188,9 +5542,9 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "5.49.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.49.0.tgz", - "integrity": "sha512-7If46kusG+sSnEpu0yOz2xFv5nRz158nzEXnJFCGVEHWnuzolXKwrH5Bsf9zsNlOQkyZuk0BZKKoJQI+1JPBBg==", + "version": "5.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.62.0.tgz", + "integrity": "sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==", "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -5201,13 +5555,13 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "5.49.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.49.0.tgz", - "integrity": "sha512-PBdx+V7deZT/3GjNYPVQv1Nc0U46dAHbIuOG8AZ3on3vuEKiPDwFE/lG1snN2eUB9IhF7EyF7K1hmTcLztNIsA==", + "version": "5.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz", + "integrity": "sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.49.0", - "@typescript-eslint/visitor-keys": "5.49.0", + "@typescript-eslint/types": "5.62.0", + "@typescript-eslint/visitor-keys": "5.62.0", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", @@ -5228,18 +5582,18 @@ } }, "node_modules/@typescript-eslint/utils": { - "version": "5.49.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.49.0.tgz", - "integrity": "sha512-cPJue/4Si25FViIb74sHCLtM4nTSBXtLx1d3/QT6mirQ/c65bV8arBEebBJJizfq8W2YyMoPI/WWPFWitmNqnQ==", + "version": "5.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.62.0.tgz", + "integrity": "sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==", "dev": true, "dependencies": { + "@eslint-community/eslint-utils": "^4.2.0", "@types/json-schema": "^7.0.9", "@types/semver": "^7.3.12", - "@typescript-eslint/scope-manager": "5.49.0", - "@typescript-eslint/types": "5.49.0", - "@typescript-eslint/typescript-estree": "5.49.0", + "@typescript-eslint/scope-manager": "5.62.0", + "@typescript-eslint/types": "5.62.0", + "@typescript-eslint/typescript-estree": "5.62.0", "eslint-scope": "^5.1.1", - "eslint-utils": "^3.0.0", "semver": "^7.3.7" }, "engines": { @@ -5254,12 +5608,12 @@ } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "5.49.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.49.0.tgz", - "integrity": "sha512-v9jBMjpNWyn8B6k/Mjt6VbUS4J1GvUlR4x3Y+ibnP1z7y7V4n0WRz+50DY6+Myj0UaXVSuUlHohO+eZ8IJEnkg==", + "version": "5.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz", + "integrity": "sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.49.0", + "@typescript-eslint/types": "5.62.0", "eslint-visitor-keys": "^3.3.0" }, "engines": { @@ -5270,152 +5624,263 @@ "url": "https://opencollective.com/typescript-eslint" } }, + "node_modules/@ungap/structured-clone": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz", + "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==", + "dev": true + }, + "node_modules/@vitejs/plugin-basic-ssl": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@vitejs/plugin-basic-ssl/-/plugin-basic-ssl-1.0.1.tgz", + "integrity": "sha512-pcub+YbFtFhaGRTo1832FQHQSHvMrlb43974e2eS8EKleR3p1cDdkJFPci1UhwkEf1J9Bz+wKBSzqpKp7nNj2A==", + "dev": true, + "engines": { + "node": ">=14.6.0" + }, + "peerDependencies": { + "vite": "^3.0.0 || ^4.0.0" + } + }, "node_modules/@webassemblyjs/ast": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz", - "integrity": "sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.6.tgz", + "integrity": "sha512-IN1xI7PwOvLPgjcf180gC1bqn3q/QaOCwYUahIOhbYUu8KA/3tw2RT/T0Gidi1l7Hhj5D/INhJxiICObqpMu4Q==", "dev": true, "dependencies": { - "@webassemblyjs/helper-numbers": "1.11.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.1" + "@webassemblyjs/helper-numbers": "1.11.6", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6" } }, "node_modules/@webassemblyjs/floating-point-hex-parser": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz", - "integrity": "sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz", + "integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==", "dev": true }, "node_modules/@webassemblyjs/helper-api-error": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz", - "integrity": "sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz", + "integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==", "dev": true }, "node_modules/@webassemblyjs/helper-buffer": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz", - "integrity": "sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.6.tgz", + "integrity": "sha512-z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA==", "dev": true }, "node_modules/@webassemblyjs/helper-numbers": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz", - "integrity": "sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz", + "integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==", "dev": true, "dependencies": { - "@webassemblyjs/floating-point-hex-parser": "1.11.1", - "@webassemblyjs/helper-api-error": "1.11.1", + "@webassemblyjs/floating-point-hex-parser": "1.11.6", + "@webassemblyjs/helper-api-error": "1.11.6", "@xtuc/long": "4.2.2" } }, "node_modules/@webassemblyjs/helper-wasm-bytecode": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz", - "integrity": "sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz", + "integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==", "dev": true }, "node_modules/@webassemblyjs/helper-wasm-section": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz", - "integrity": "sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.6.tgz", + "integrity": "sha512-LPpZbSOwTpEC2cgn4hTydySy1Ke+XEu+ETXuoyvuyezHO3Kjdu90KK95Sh9xTbmjrCsUwvWwCOQQNta37VrS9g==", "dev": true, "dependencies": { - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/helper-buffer": "1.11.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.1", - "@webassemblyjs/wasm-gen": "1.11.1" + "@webassemblyjs/ast": "1.11.6", + "@webassemblyjs/helper-buffer": "1.11.6", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6", + "@webassemblyjs/wasm-gen": "1.11.6" } }, "node_modules/@webassemblyjs/ieee754": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz", - "integrity": "sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz", + "integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==", "dev": true, "dependencies": { "@xtuc/ieee754": "^1.2.0" } }, "node_modules/@webassemblyjs/leb128": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.1.tgz", - "integrity": "sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.6.tgz", + "integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==", "dev": true, "dependencies": { "@xtuc/long": "4.2.2" } }, "node_modules/@webassemblyjs/utf8": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.1.tgz", - "integrity": "sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz", + "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==", "dev": true }, "node_modules/@webassemblyjs/wasm-edit": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz", - "integrity": "sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.6.tgz", + "integrity": "sha512-Ybn2I6fnfIGuCR+Faaz7YcvtBKxvoLV3Lebn1tM4o/IAJzmi9AWYIPWpyBfU8cC+JxAO57bk4+zdsTjJR+VTOw==", "dev": true, "dependencies": { - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/helper-buffer": "1.11.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.1", - "@webassemblyjs/helper-wasm-section": "1.11.1", - "@webassemblyjs/wasm-gen": "1.11.1", - "@webassemblyjs/wasm-opt": "1.11.1", - "@webassemblyjs/wasm-parser": "1.11.1", - "@webassemblyjs/wast-printer": "1.11.1" + "@webassemblyjs/ast": "1.11.6", + "@webassemblyjs/helper-buffer": "1.11.6", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6", + "@webassemblyjs/helper-wasm-section": "1.11.6", + "@webassemblyjs/wasm-gen": "1.11.6", + "@webassemblyjs/wasm-opt": "1.11.6", + "@webassemblyjs/wasm-parser": "1.11.6", + "@webassemblyjs/wast-printer": "1.11.6" } }, "node_modules/@webassemblyjs/wasm-gen": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz", - "integrity": "sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.6.tgz", + "integrity": "sha512-3XOqkZP/y6B4F0PBAXvI1/bky7GryoogUtfwExeP/v7Nzwo1QLcq5oQmpKlftZLbT+ERUOAZVQjuNVak6UXjPA==", "dev": true, "dependencies": { - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.1", - "@webassemblyjs/ieee754": "1.11.1", - "@webassemblyjs/leb128": "1.11.1", - "@webassemblyjs/utf8": "1.11.1" + "@webassemblyjs/ast": "1.11.6", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6", + "@webassemblyjs/ieee754": "1.11.6", + "@webassemblyjs/leb128": "1.11.6", + "@webassemblyjs/utf8": "1.11.6" } }, "node_modules/@webassemblyjs/wasm-opt": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz", - "integrity": "sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.6.tgz", + "integrity": "sha512-cOrKuLRE7PCe6AsOVl7WasYf3wbSo4CeOk6PkrjS7g57MFfVUF9u6ysQBBODX0LdgSvQqRiGz3CXvIDKcPNy4g==", "dev": true, "dependencies": { - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/helper-buffer": "1.11.1", - "@webassemblyjs/wasm-gen": "1.11.1", - "@webassemblyjs/wasm-parser": "1.11.1" + "@webassemblyjs/ast": "1.11.6", + "@webassemblyjs/helper-buffer": "1.11.6", + "@webassemblyjs/wasm-gen": "1.11.6", + "@webassemblyjs/wasm-parser": "1.11.6" } }, "node_modules/@webassemblyjs/wasm-parser": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz", - "integrity": "sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.6.tgz", + "integrity": "sha512-6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ==", "dev": true, "dependencies": { - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/helper-api-error": "1.11.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.1", - "@webassemblyjs/ieee754": "1.11.1", - "@webassemblyjs/leb128": "1.11.1", - "@webassemblyjs/utf8": "1.11.1" + "@webassemblyjs/ast": "1.11.6", + "@webassemblyjs/helper-api-error": "1.11.6", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6", + "@webassemblyjs/ieee754": "1.11.6", + "@webassemblyjs/leb128": "1.11.6", + "@webassemblyjs/utf8": "1.11.6" } }, "node_modules/@webassemblyjs/wast-printer": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz", - "integrity": "sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.6.tgz", + "integrity": "sha512-JM7AhRcE+yW2GWYaKeHL5vt4xqee5N2WcezptmgyhNS+ScggqcT1OtXykhAb13Sn5Yas0j2uv9tHgrjwvzAP4A==", "dev": true, "dependencies": { - "@webassemblyjs/ast": "1.11.1", + "@webassemblyjs/ast": "1.11.6", "@xtuc/long": "4.2.2" } }, + "node_modules/@wessberg/ts-evaluator": { + "version": "0.0.27", + "resolved": "https://registry.npmjs.org/@wessberg/ts-evaluator/-/ts-evaluator-0.0.27.tgz", + "integrity": "sha512-7gOpVm3yYojUp/Yn7F4ZybJRxyqfMNf0LXK5KJiawbPfL0XTsJV+0mgrEDjOIR6Bi0OYk2Cyg4tjFu1r8MCZaA==", + "deprecated": "this package has been renamed to ts-evaluator. Please install ts-evaluator instead", + "dev": true, + "dependencies": { + "chalk": "^4.1.0", + "jsdom": "^16.4.0", + "object-path": "^0.11.5", + "tslib": "^2.0.3" + }, + "engines": { + "node": ">=10.1.0" + }, + "funding": { + "type": "github", + "url": "https://github.com/wessberg/ts-evaluator?sponsor=1" + }, + "peerDependencies": { + "typescript": ">=3.2.x || >= 4.x" + } + }, + "node_modules/@wessberg/ts-evaluator/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/@wessberg/ts-evaluator/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/@wessberg/ts-evaluator/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/@wessberg/ts-evaluator/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "node_modules/@wessberg/ts-evaluator/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/@wessberg/ts-evaluator/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/@xtuc/ieee754": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz", @@ -5460,9 +5925,9 @@ } }, "node_modules/acorn": { - "version": "8.8.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz", - "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==", + "version": "8.11.2", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.2.tgz", + "integrity": "sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w==", "dev": true, "bin": { "acorn": "bin/acorn" @@ -5494,9 +5959,9 @@ } }, "node_modules/acorn-import-assertions": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz", - "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz", + "integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==", "dev": true, "peerDependencies": { "acorn": "^8" @@ -5560,13 +6025,11 @@ } }, "node_modules/agentkeepalive": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.2.1.tgz", - "integrity": "sha512-Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA==", + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.5.0.tgz", + "integrity": "sha512-5GG/5IbQQpC9FpkRGsSvZI5QYeSCzlJHdpBQntCsuTOxhKD8lqKhrleg2Yi7yvMIf82Ycmmqln9U8V9qwEiJew==", "dev": true, "dependencies": { - "debug": "^4.1.0", - "depd": "^1.1.2", "humanize-ms": "^1.2.1" }, "engines": { @@ -5751,9 +6214,9 @@ "dev": true }, "node_modules/autoprefixer": { - "version": "10.4.13", - "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.13.tgz", - "integrity": "sha512-49vKpMqcZYsJjwotvt4+h/BCjJVnhGwcLpDt5xkcaOG3eLrG/HUYLagrihYsQ+qrIBgIzX1Rw7a6L8I/ZA1Atg==", + "version": "10.4.14", + "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.14.tgz", + "integrity": "sha512-FQzyfOsTlwVzjHxKEqRIAdJx9niO6VCBCoEwax/VLSoQF29ggECcPuBqUMZ+u8jCZOPSy8b8/8KnuFbp0SaFZQ==", "dev": true, "funding": [ { @@ -5766,8 +6229,8 @@ } ], "dependencies": { - "browserslist": "^4.21.4", - "caniuse-lite": "^1.0.30001426", + "browserslist": "^4.21.5", + "caniuse-lite": "^1.0.30001464", "fraction.js": "^4.2.0", "normalize-range": "^0.1.2", "picocolors": "^1.0.0", @@ -5784,21 +6247,21 @@ } }, "node_modules/babel-jest": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-28.1.3.tgz", - "integrity": "sha512-epUaPOEWMk3cWX0M/sPvCHHCe9fMFAa/9hXEgKP8nFfNl/jlGkE9ucq9NqkZGXLDduCJYS0UvSlPUwC0S+rH6Q==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.7.0.tgz", + "integrity": "sha512-BrvGY3xZSwEcCzKvKsCi2GgHqDqsYkOP4/by5xCgIwGXQxIEh+8ew3gmrE1y7XRR6LHZIj6yLYnUi/mm2KXKBg==", "dev": true, "dependencies": { - "@jest/transform": "^28.1.3", + "@jest/transform": "^29.7.0", "@types/babel__core": "^7.1.14", "babel-plugin-istanbul": "^6.1.1", - "babel-preset-jest": "^28.1.3", + "babel-preset-jest": "^29.6.3", "chalk": "^4.0.0", "graceful-fs": "^4.2.9", "slash": "^3.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" }, "peerDependencies": { "@babel/core": "^7.8.0" @@ -5875,12 +6338,12 @@ } }, "node_modules/babel-loader": { - "version": "9.1.2", - "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-9.1.2.tgz", - "integrity": "sha512-mN14niXW43tddohGl8HPu5yfQq70iUThvFL/4QzESA7GcZoC0eVOhvWdQ8+3UlSjaDE9MVtsW9mxDY07W7VpVA==", + "version": "9.1.3", + "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-9.1.3.tgz", + "integrity": "sha512-xG3ST4DglodGf8qSwv0MdeWLhrDsw/32QMdTO5T1ZIp9gQur0HkCyFs7Awskr10JKXFXwpAhiCuYX5oGXnRGbw==", "dev": true, "dependencies": { - "find-cache-dir": "^3.3.2", + "find-cache-dir": "^4.0.0", "schema-utils": "^4.0.0" }, "engines": { @@ -5908,9 +6371,9 @@ } }, "node_modules/babel-plugin-jest-hoist": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-28.1.3.tgz", - "integrity": "sha512-Ys3tUKAmfnkRUpPdpa98eYrAR0nV+sSFUZZEGuQ2EbFd1y4SOLtD5QDNHAq+bb9a+bbXvYQC4b+ID/THIMcU6Q==", + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.6.3.tgz", + "integrity": "sha512-ESAc/RJvGTFEzRwOTT4+lNDk/GNHMkKbNzsvT0qKRfDyyYTskxB5rnU2njIDYVxXCBHHEI1c0YwHob3WaYujOg==", "dev": true, "dependencies": { "@babel/template": "^7.3.3", @@ -5919,55 +6382,55 @@ "@types/babel__traverse": "^7.0.6" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/babel-plugin-polyfill-corejs2": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.3.tgz", - "integrity": "sha512-8hOdmFYFSZhqg2C/JgLUQ+t52o5nirNwaWM2B9LWteozwIvM14VSwdsCAUET10qT+kmySAlseadmfeeSWFCy+Q==", + "version": "0.4.6", + "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.6.tgz", + "integrity": "sha512-jhHiWVZIlnPbEUKSSNb9YoWcQGdlTLq7z1GHL4AjFxaoOUMuuEVJ+Y4pAaQUGOGk93YsVCKPbqbfw3m0SM6H8Q==", "dev": true, "dependencies": { - "@babel/compat-data": "^7.17.7", - "@babel/helper-define-polyfill-provider": "^0.3.3", - "semver": "^6.1.1" + "@babel/compat-data": "^7.22.6", + "@babel/helper-define-polyfill-provider": "^0.4.3", + "semver": "^6.3.1" }, "peerDependencies": { - "@babel/core": "^7.0.0-0" + "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0" } }, "node_modules/babel-plugin-polyfill-corejs2/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, "bin": { "semver": "bin/semver.js" } }, "node_modules/babel-plugin-polyfill-corejs3": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.6.0.tgz", - "integrity": "sha512-+eHqR6OPcBhJOGgsIar7xoAB1GcSwVUA3XjAd7HJNzOXT4wv6/H7KIdA/Nc60cvUlDbKApmqNvD1B1bzOt4nyA==", + "version": "0.8.6", + "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.6.tgz", + "integrity": "sha512-leDIc4l4tUgU7str5BWLS2h8q2N4Nf6lGZP6UrNDxdtfF2g69eJ5L0H7S8A5Ln/arfFAfHor5InAdZuIOwZdgQ==", "dev": true, "dependencies": { - "@babel/helper-define-polyfill-provider": "^0.3.3", - "core-js-compat": "^3.25.1" + "@babel/helper-define-polyfill-provider": "^0.4.3", + "core-js-compat": "^3.33.1" }, "peerDependencies": { - "@babel/core": "^7.0.0-0" + "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0" } }, "node_modules/babel-plugin-polyfill-regenerator": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.1.tgz", - "integrity": "sha512-NtQGmyQDXjQqQ+IzRkBVwEOz9lQ4zxAQZgoAYEtU9dJjnl1Oc98qnN7jcp+bE7O7aYzVpavXE3/VKXNzUbh7aw==", + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.3.tgz", + "integrity": "sha512-8sHeDOmXC8csczMrYEOf0UTNa4yE2SxV5JGeT/LP1n0OYVDUUFPxG9vdk2AlDlIit4t+Kf0xCtpgXPBwnn/9pw==", "dev": true, "dependencies": { - "@babel/helper-define-polyfill-provider": "^0.3.3" + "@babel/helper-define-polyfill-provider": "^0.4.3" }, "peerDependencies": { - "@babel/core": "^7.0.0-0" + "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0" } }, "node_modules/babel-preset-current-node-syntax": { @@ -5994,16 +6457,16 @@ } }, "node_modules/babel-preset-jest": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-28.1.3.tgz", - "integrity": "sha512-L+fupJvlWAHbQfn74coNX3zf60LXMJsezNvvx8eIh7iOR1luJ1poxYgQk1F8PYtNq/6QODDHCqsSnTFSWC491A==", + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-29.6.3.tgz", + "integrity": "sha512-0B3bhxR6snWXJZtR/RliHTDPRgn1sNHOR0yVtq/IiQFyuOVjFS+wuio/R4gSNkyYmKmJB4wGZv2NZanmKmTnNA==", "dev": true, "dependencies": { - "babel-plugin-jest-hoist": "^28.1.3", + "babel-plugin-jest-hoist": "^29.6.3", "babel-preset-current-node-syntax": "^1.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" }, "peerDependencies": { "@babel/core": "^7.0.0" @@ -6112,15 +6575,6 @@ "ms": "2.0.0" } }, - "node_modules/body-parser/node_modules/depd": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", - "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", - "dev": true, - "engines": { - "node": ">= 0.8" - } - }, "node_modules/body-parser/node_modules/ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", @@ -6128,9 +6582,9 @@ "dev": true }, "node_modules/bonjour-service": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.1.0.tgz", - "integrity": "sha512-LVRinRB3k1/K0XzZ2p58COnWvkQknIY6sf0zF2rpErvcJXpMBttEPQSxK+HEXSS9VmpZlDoDnQWv8ftJT20B0Q==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.1.1.tgz", + "integrity": "sha512-Z/5lQRMOG9k7W+FkeGTNjh7htqn/2LMnfOvBZ8pynNZCM9MwkQkI3zeI4oz09uWdcgmgHugVvBqxGg4VQJ5PCg==", "dev": true, "dependencies": { "array-flatten": "^2.1.2", @@ -6146,13 +6600,14 @@ "dev": true }, "node_modules/brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "dev": true, "dependencies": { - "balanced-match": "^1.0.0" - } + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } }, "node_modules/braces": { "version": "3.0.2", @@ -6173,9 +6628,9 @@ "dev": true }, "node_modules/browserslist": { - "version": "4.21.4", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz", - "integrity": "sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==", + "version": "4.22.1", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.22.1.tgz", + "integrity": "sha512-FEVc202+2iuClEhZhrWy6ZiAcRLvNMyYcxZ8raemul1DYVOVdFsbqckWLdsixQZCpJlwe77Z3UTalE7jsjnKfQ==", "dev": true, "funding": [ { @@ -6185,13 +6640,17 @@ { "type": "tidelift", "url": "https://tidelift.com/funding/github/npm/browserslist" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" } ], "dependencies": { - "caniuse-lite": "^1.0.30001400", - "electron-to-chromium": "^1.4.251", - "node-releases": "^2.0.6", - "update-browserslist-db": "^1.0.9" + "caniuse-lite": "^1.0.30001541", + "electron-to-chromium": "^1.4.535", + "node-releases": "^2.0.13", + "update-browserslist-db": "^1.0.13" }, "bin": { "browserslist": "cli.js" @@ -6269,21 +6728,20 @@ } }, "node_modules/cacache": { - "version": "17.0.4", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-17.0.4.tgz", - "integrity": "sha512-Z/nL3gU+zTUjz5pCA5vVjYM8pmaw2kxM7JEiE0fv3w77Wj+sFbi70CrBruUWH0uNcEdvLDixFpgA2JM4F4DBjA==", + "version": "17.1.4", + "resolved": "https://registry.npmjs.org/cacache/-/cacache-17.1.4.tgz", + "integrity": "sha512-/aJwG2l3ZMJ1xNAnqbMpA40of9dj/pIH3QfiuQSqjfPJF747VR0J/bHn+/KdNnHKc6XQcWt/AfRSBft82W1d2A==", "dev": true, "dependencies": { "@npmcli/fs": "^3.1.0", "fs-minipass": "^3.0.0", - "glob": "^8.0.1", + "glob": "^10.2.2", "lru-cache": "^7.7.1", - "minipass": "^4.0.0", + "minipass": "^7.0.3", "minipass-collect": "^1.0.2", "minipass-flush": "^1.0.5", "minipass-pipeline": "^1.2.4", "p-map": "^4.0.0", - "promise-inflight": "^1.0.1", "ssri": "^10.0.0", "tar": "^6.1.11", "unique-filename": "^3.0.0" @@ -6292,23 +6750,79 @@ "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, + "node_modules/cacache/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/cacache/node_modules/glob": { + "version": "10.3.10", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz", + "integrity": "sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==", + "dev": true, + "dependencies": { + "foreground-child": "^3.1.0", + "jackspeak": "^2.3.5", + "minimatch": "^9.0.1", + "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0", + "path-scurry": "^1.10.1" + }, + "bin": { + "glob": "dist/esm/bin.mjs" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, "node_modules/cacache/node_modules/lru-cache": { - "version": "7.14.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.14.1.tgz", - "integrity": "sha512-ysxwsnTKdAx96aTRdhDOCQfDgbHnt8SK0KY8SEjO0wHinhWOFTESbjVCMPbU1uGXg/ch4lifqx0wfjOawU2+WA==", + "version": "7.18.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", + "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", "dev": true, "engines": { "node": ">=12" } }, + "node_modules/cacache/node_modules/minimatch": { + "version": "9.0.3", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", + "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==", + "dev": true, + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/cacache/node_modules/minipass": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz", + "integrity": "sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==", + "dev": true, + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, "node_modules/call-bind": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", - "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.5.tgz", + "integrity": "sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ==", "dev": true, "dependencies": { - "function-bind": "^1.1.1", - "get-intrinsic": "^1.0.2" + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.1", + "set-function-length": "^1.1.1" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -6333,9 +6847,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001434", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001434.tgz", - "integrity": "sha512-aOBHrLmTQw//WFa2rcF1If9fa3ypkC1wzqqiKHgfdrXTWcU8C4gKVZT77eQAPWN1APys3+uQ0Df07rKauXGEYA==", + "version": "1.0.30001559", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001559.tgz", + "integrity": "sha512-cPiMKZgqgkg5LY3/ntGeLFUpi6tzddBNS58A4tnTgQw1zON7u2sZMU7SzOeVH4tj20++9ggL+V6FDOFMTaFFYA==", "dev": true, "funding": [ { @@ -6345,6 +6859,10 @@ { "type": "tidelift", "url": "https://tidelift.com/funding/github/npm/caniuse-lite" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" } ] }, @@ -6423,18 +6941,24 @@ } }, "node_modules/ci-info": { - "version": "3.7.0", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.7.0.tgz", - "integrity": "sha512-2CpRNYmImPx+RXKLq6jko/L07phmS9I02TyqkcNU20GCF/GgaWvc58hPtjxDX8lPpkdwc9sNh72V9k00S7ezog==", + "version": "3.9.0", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", + "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==", "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/sibiraj-s" + } + ], "engines": { "node": ">=8" } }, "node_modules/cjs-module-lexer": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz", - "integrity": "sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA==", + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.3.tgz", + "integrity": "sha512-0TNiGstbQmCFwt4akjjBg5pLRTSyj/PkWQ1ZoO2zntmg9yLqSRxwEa4iCfQLGjqhiqBfOJa7W/E8wfGrTDmlZQ==", "dev": true }, "node_modules/clean-stack": { @@ -6459,9 +6983,9 @@ } }, "node_modules/cli-spinners": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.7.0.tgz", - "integrity": "sha512-qu3pN8Y3qHNgE2AFweciB1IfMnmZ/fsNTEE+NOFjmGB2F/7rLhnhzppvpCnN4FovtP26k8lHyy9ptEbNwWFLzw==", + "version": "2.9.1", + "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.9.1.tgz", + "integrity": "sha512-jHgecW0pxkonBJdrKsqxgRX9AcG+u/5k0Q7WPDfi8AogLAdwxEkyYYNWwZ5GvVFoFx2uiY1eNcSK00fh+1+FyQ==", "dev": true, "engines": { "node": ">=6" @@ -6527,9 +7051,9 @@ } }, "node_modules/collect-v8-coverage": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz", - "integrity": "sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz", + "integrity": "sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q==", "dev": true }, "node_modules/color-convert": { @@ -6557,9 +7081,9 @@ } }, "node_modules/colorette": { - "version": "2.0.19", - "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.19.tgz", - "integrity": "sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ==", + "version": "2.0.20", + "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz", + "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==", "dev": true }, "node_modules/combined-stream": { @@ -6580,10 +7104,10 @@ "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", "dev": true }, - "node_modules/commondir": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz", - "integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==", + "node_modules/common-path-prefix": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/common-path-prefix/-/common-path-prefix-3.0.0.tgz", + "integrity": "sha512-QE33hToZseCH3jS0qN96O/bSh3kaw/h+Tq7ngyY9eWDUnTlTNUyqfqvCXioLe5Na5jFsL78ra/wuBU4iuEgd4w==", "dev": true }, "node_modules/compressible": { @@ -6671,9 +7195,9 @@ } }, "node_modules/content-type": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz", - "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz", + "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==", "dev": true, "engines": { "node": ">= 0.6" @@ -6749,14 +7273,14 @@ } }, "node_modules/copy-webpack-plugin/node_modules/globby": { - "version": "13.1.3", - "resolved": "https://registry.npmjs.org/globby/-/globby-13.1.3.tgz", - "integrity": "sha512-8krCNHXvlCgHDpegPzleMq07yMYTO2sXKASmZmquEYWEmCx6J5UTRbp5RwMJkTJGtcQ44YpiUYUiN0b9mzy8Bw==", + "version": "13.2.2", + "resolved": "https://registry.npmjs.org/globby/-/globby-13.2.2.tgz", + "integrity": "sha512-Y1zNGV+pzQdh7H39l9zgB4PJqjRNqydvdYCDG4HFXM4XuvSaQQlEc91IU1yALL8gUTDomgBAfz3XJdmUS+oo0w==", "dev": true, "dependencies": { "dir-glob": "^3.0.1", - "fast-glob": "^3.2.11", - "ignore": "^5.2.0", + "fast-glob": "^3.3.0", + "ignore": "^5.2.4", "merge2": "^1.4.1", "slash": "^4.0.0" }, @@ -6780,12 +7304,12 @@ } }, "node_modules/core-js-compat": { - "version": "3.27.2", - "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.27.2.tgz", - "integrity": "sha512-welaYuF7ZtbYKGrIy7y3eb40d37rG1FvzEOfe7hSLd2iD6duMDqUhRfSvCGyC46HhR6Y8JXXdZ2lnRUMkPBpvg==", + "version": "3.33.2", + "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.33.2.tgz", + "integrity": "sha512-axfo+wxFVxnqf8RvxTzoAlzW4gRoacrHeoFlc9n0x50+7BEyZL/Rt3hicaED1/CEd7I6tPCPVUYcJwCMO5XUYw==", "dev": true, "dependencies": { - "browserslist": "^4.21.4" + "browserslist": "^4.22.1" }, "funding": { "type": "opencollective", @@ -6798,33 +7322,109 @@ "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==", "dev": true }, - "node_modules/cosmiconfig": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.1.0.tgz", - "integrity": "sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==", + "node_modules/create-jest": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/create-jest/-/create-jest-29.7.0.tgz", + "integrity": "sha512-Adz2bdH0Vq3F53KEMJOoftQFutWCukm6J24wbPWRO4k1kMY7gS7ds/uoJkNuV8wDCtWWnuwGcJwpWcih+zEW1Q==", "dev": true, "dependencies": { - "@types/parse-json": "^4.0.0", - "import-fresh": "^3.2.1", - "parse-json": "^5.0.0", - "path-type": "^4.0.0", - "yaml": "^1.10.0" + "@jest/types": "^29.6.3", + "chalk": "^4.0.0", + "exit": "^0.1.2", + "graceful-fs": "^4.2.9", + "jest-config": "^29.7.0", + "jest-util": "^29.7.0", + "prompts": "^2.0.1" + }, + "bin": { + "create-jest": "bin/create-jest.js" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/create-jest/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/create-jest/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" }, "engines": { "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/create-jest/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/create-jest/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "node_modules/create-jest/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/create-jest/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" } }, "node_modules/critters": { - "version": "0.0.16", - "resolved": "https://registry.npmjs.org/critters/-/critters-0.0.16.tgz", - "integrity": "sha512-JwjgmO6i3y6RWtLYmXwO5jMd+maZt8Tnfu7VVISmEWyQqfLpB8soBswf8/2bu6SBXxtKA68Al3c+qIG1ApT68A==", + "version": "0.0.20", + "resolved": "https://registry.npmjs.org/critters/-/critters-0.0.20.tgz", + "integrity": "sha512-CImNRorKOl5d8TWcnAz5n5izQ6HFsvz29k327/ELy6UFcmbiZNOsinaKvzv16WZR0P6etfSWYzE47C4/56B3Uw==", "dev": true, "dependencies": { "chalk": "^4.1.0", - "css-select": "^4.2.0", - "parse5": "^6.0.1", - "parse5-htmlparser2-tree-adapter": "^6.0.1", - "postcss": "^8.3.7", + "css-select": "^5.1.0", + "dom-serializer": "^2.0.0", + "domhandler": "^5.0.2", + "htmlparser2": "^8.0.2", + "postcss": "^8.4.23", "pretty-bytes": "^5.3.0" } }, @@ -6886,12 +7486,6 @@ "node": ">=8" } }, - "node_modules/critters/node_modules/parse5": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz", - "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==", - "dev": true - }, "node_modules/critters/node_modules/supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", @@ -6919,15 +7513,15 @@ } }, "node_modules/css-loader": { - "version": "6.7.3", - "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.7.3.tgz", - "integrity": "sha512-qhOH1KlBMnZP8FzRO6YCH9UHXQhVMcEGLyNdb7Hv2cpcmJbW0YrddO+tG1ab5nT41KpHIYGsbeHqxB9xPu1pKQ==", + "version": "6.8.1", + "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.8.1.tgz", + "integrity": "sha512-xDAXtEVGlD0gJ07iclwWVkLoZOpEvAWaSyf6W18S2pOC//K8+qUDIx8IIT3D+HjnmkJPQeesOPv5aiUaJsCM2g==", "dev": true, "dependencies": { "icss-utils": "^5.1.0", - "postcss": "^8.4.19", + "postcss": "^8.4.21", "postcss-modules-extract-imports": "^3.0.0", - "postcss-modules-local-by-default": "^4.0.0", + "postcss-modules-local-by-default": "^4.0.3", "postcss-modules-scope": "^3.0.0", "postcss-modules-values": "^4.0.0", "postcss-value-parser": "^4.2.0", @@ -6945,15 +7539,15 @@ } }, "node_modules/css-select": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz", - "integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/css-select/-/css-select-5.1.0.tgz", + "integrity": "sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg==", "dev": true, "dependencies": { "boolbase": "^1.0.0", - "css-what": "^6.0.1", - "domhandler": "^4.3.1", - "domutils": "^2.8.0", + "css-what": "^6.1.0", + "domhandler": "^5.0.2", + "domutils": "^3.0.1", "nth-check": "^2.0.1" }, "funding": { @@ -6985,9 +7579,9 @@ } }, "node_modules/cssom": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.5.0.tgz", - "integrity": "sha512-iKuQcq+NdHqlAcwUY0o/HL69XQrUaQdMjmStJ8JFmUaiiQErlhrmuigkg/CU4E2J0IyUKUrMAgl36TvN67MqTw==", + "version": "0.4.4", + "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz", + "integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==", "dev": true }, "node_modules/cssstyle": { @@ -7009,30 +7603,17 @@ "dev": true }, "node_modules/data-urls": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-3.0.2.tgz", - "integrity": "sha512-Jy/tj3ldjZJo63sVAvg6LHt2mHvl4V6AgRAmNDtLdm7faqtsx+aJG42rsyCo9JCoRVKwPFzKlIPx3DIibwSIaQ==", - "dev": true, - "dependencies": { - "abab": "^2.0.6", - "whatwg-mimetype": "^3.0.0", - "whatwg-url": "^11.0.0" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/data-urls/node_modules/whatwg-url": { - "version": "11.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-11.0.0.tgz", - "integrity": "sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-2.0.0.tgz", + "integrity": "sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==", "dev": true, "dependencies": { - "tr46": "^3.0.0", - "webidl-conversions": "^7.0.0" + "abab": "^2.0.3", + "whatwg-mimetype": "^2.3.0", + "whatwg-url": "^8.0.0" }, "engines": { - "node": ">=12" + "node": ">=10" } }, "node_modules/debug": { @@ -7059,10 +7640,18 @@ "dev": true }, "node_modules/dedent": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz", - "integrity": "sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==", - "dev": true + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.5.1.tgz", + "integrity": "sha512-+LxW+KLWxu3HW3M2w2ympwtqPrqYRzU8fqi6Fhd18fBALe15blJPI/I4+UHveMVG6lJqB4JNd4UG0S5cnVHwIg==", + "dev": true, + "peerDependencies": { + "babel-plugin-macros": "^3.1.0" + }, + "peerDependenciesMeta": { + "babel-plugin-macros": { + "optional": true + } + } }, "node_modules/deep-is": { "version": "0.1.4", @@ -7071,9 +7660,9 @@ "dev": true }, "node_modules/deepmerge": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz", - "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz", + "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==", "dev": true, "engines": { "node": ">=0.10.0" @@ -7103,6 +7692,20 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/define-data-property": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.1.tgz", + "integrity": "sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==", + "dev": true, + "dependencies": { + "get-intrinsic": "^1.2.1", + "gopd": "^1.0.1", + "has-property-descriptors": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/define-lazy-prop": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz", @@ -7128,21 +7731,12 @@ "dev": true }, "node_modules/depd": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", - "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==", - "dev": true, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/dependency-graph": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/dependency-graph/-/dependency-graph-0.11.0.tgz", - "integrity": "sha512-JeMq7fEshyepOWDfcfHK06N3MhyPhz++vtqWhMT5O9A3K42rdsEDpfdVqjaqaAhsw6a+ZqeDvQVtD0hFHQWrzg==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", + "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", "dev": true, "engines": { - "node": ">= 0.6.0" + "node": ">= 0.8" } }, "node_modules/destroy": { @@ -7171,12 +7765,12 @@ "dev": true }, "node_modules/diff-sequences": { - "version": "28.1.1", - "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-28.1.1.tgz", - "integrity": "sha512-FU0iFaH/E23a+a718l8Qa/19bF9p06kgE0KipMOMadwa3SjnaElKzPaUC0vnibs6/B/9ni97s61mcejk8W1fQw==", + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz", + "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==", "dev": true, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/dir-glob": { @@ -7198,9 +7792,9 @@ "dev": true }, "node_modules/dns-packet": { - "version": "5.4.0", - "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-5.4.0.tgz", - "integrity": "sha512-EgqGeaBB8hLiHLZtp/IbaDQTL8pZ0+IvwzSHA6d7VyMDM+B9hgddEMa9xjK5oYnw0ci0JQ6g2XCD7/f6cafU6g==", + "version": "5.6.1", + "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-5.6.1.tgz", + "integrity": "sha512-l4gcSouhcgIKRvyy99RNVOgxXiicE+2jZoNmaNmZ6JXiGajBOJAesk1OBlJuM5k2c+eudGdLxDqXuPCKIj6kpw==", "dev": true, "dependencies": { "@leichtgewicht/ip-codec": "^2.0.1" @@ -7222,14 +7816,14 @@ } }, "node_modules/dom-serializer": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz", - "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz", + "integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==", "dev": true, "dependencies": { - "domelementtype": "^2.0.1", - "domhandler": "^4.2.0", - "entities": "^2.0.0" + "domelementtype": "^2.3.0", + "domhandler": "^5.0.2", + "entities": "^4.2.0" }, "funding": { "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1" @@ -7248,24 +7842,33 @@ ] }, "node_modules/domexception": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/domexception/-/domexception-4.0.0.tgz", - "integrity": "sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/domexception/-/domexception-2.0.1.tgz", + "integrity": "sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==", "dev": true, "dependencies": { - "webidl-conversions": "^7.0.0" + "webidl-conversions": "^5.0.0" }, "engines": { - "node": ">=12" + "node": ">=8" + } + }, + "node_modules/domexception/node_modules/webidl-conversions": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz", + "integrity": "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==", + "dev": true, + "engines": { + "node": ">=8" } }, "node_modules/domhandler": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz", - "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==", + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz", + "integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==", "dev": true, "dependencies": { - "domelementtype": "^2.2.0" + "domelementtype": "^2.3.0" }, "engines": { "node": ">= 4" @@ -7275,19 +7878,25 @@ } }, "node_modules/domutils": { - "version": "2.8.0", - "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz", - "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.1.0.tgz", + "integrity": "sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==", "dev": true, "dependencies": { - "dom-serializer": "^1.0.1", - "domelementtype": "^2.2.0", - "domhandler": "^4.2.0" + "dom-serializer": "^2.0.0", + "domelementtype": "^2.3.0", + "domhandler": "^5.0.3" }, "funding": { "url": "https://github.com/fb55/domutils?sponsor=1" } }, + "node_modules/eastasianwidth": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", + "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==", + "dev": true + }, "node_modules/ee-first": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", @@ -7295,15 +7904,15 @@ "dev": true }, "node_modules/electron-to-chromium": { - "version": "1.4.284", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz", - "integrity": "sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==", + "version": "1.4.572", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.572.tgz", + "integrity": "sha512-RlFobl4D3ieetbnR+2EpxdzFl9h0RAJkPK3pfiwMug2nhBin2ZCsGIAJWdpNniLz43sgXam/CgipOmvTA+rUiA==", "dev": true }, "node_modules/emittery": { - "version": "0.10.2", - "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.10.2.tgz", - "integrity": "sha512-aITqOwnLanpHLNXZJENbOgjUBeHocD+xsSJmNrjovKBW5HbSpW3d1pEls7GFQPUWXiwG9+0P4GtHfEqC/4M0Iw==", + "version": "0.13.1", + "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.13.1.tgz", + "integrity": "sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==", "dev": true, "engines": { "node": ">=12" @@ -7360,9 +7969,9 @@ } }, "node_modules/enhanced-resolve": { - "version": "5.12.0", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz", - "integrity": "sha512-QHTXI/sZQmko1cbDoNAa3mJ5qhWUUNAq3vR0/YiD379fWQrcfuoX1+HW2S0MTt7XmoPLapdaDKUtelUSPic7hQ==", + "version": "5.15.0", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz", + "integrity": "sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==", "dev": true, "dependencies": { "graceful-fs": "^4.2.4", @@ -7373,10 +7982,13 @@ } }, "node_modules/entities": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz", - "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==", - "dev": true, + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", + "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==", + "devOptional": true, + "engines": { + "node": ">=0.12" + }, "funding": { "url": "https://github.com/fb55/entities?sponsor=1" } @@ -7419,18 +8031,17 @@ } }, "node_modules/es-module-lexer": { - "version": "0.9.3", - "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz", - "integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.3.1.tgz", + "integrity": "sha512-JUFAyicQV9mXc3YRxPnDlrfBKpqt6hUYzz9/boprUJHs4e4KVr3XwOF70doO6gwXUor6EWZJAyWAfKki84t20Q==", "dev": true }, "node_modules/esbuild": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.16.17.tgz", - "integrity": "sha512-G8LEkV0XzDMNwXKgM0Jwu3nY3lSTwSGY6XbxM9cr9+s0T/qSV1q1JVPBGzm3dcjhCic9+emZDmMffkwgPeOeLg==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.18.17.tgz", + "integrity": "sha512-1GJtYnUxsJreHYA0Y+iQz2UEykonY66HNWOb0yXYZi9/kNrORUEHVg87eQsCtqh59PEJ5YVZJO98JHznMJSWjg==", "dev": true, "hasInstallScript": true, - "optional": true, "bin": { "esbuild": "bin/esbuild" }, @@ -7438,34 +8049,34 @@ "node": ">=12" }, "optionalDependencies": { - "@esbuild/android-arm": "0.16.17", - "@esbuild/android-arm64": "0.16.17", - "@esbuild/android-x64": "0.16.17", - "@esbuild/darwin-arm64": "0.16.17", - "@esbuild/darwin-x64": "0.16.17", - "@esbuild/freebsd-arm64": "0.16.17", - "@esbuild/freebsd-x64": "0.16.17", - "@esbuild/linux-arm": "0.16.17", - "@esbuild/linux-arm64": "0.16.17", - "@esbuild/linux-ia32": "0.16.17", - "@esbuild/linux-loong64": "0.16.17", - "@esbuild/linux-mips64el": "0.16.17", - "@esbuild/linux-ppc64": "0.16.17", - "@esbuild/linux-riscv64": "0.16.17", - "@esbuild/linux-s390x": "0.16.17", - "@esbuild/linux-x64": "0.16.17", - "@esbuild/netbsd-x64": "0.16.17", - "@esbuild/openbsd-x64": "0.16.17", - "@esbuild/sunos-x64": "0.16.17", - "@esbuild/win32-arm64": "0.16.17", - "@esbuild/win32-ia32": "0.16.17", - "@esbuild/win32-x64": "0.16.17" + "@esbuild/android-arm": "0.18.17", + "@esbuild/android-arm64": "0.18.17", + "@esbuild/android-x64": "0.18.17", + "@esbuild/darwin-arm64": "0.18.17", + "@esbuild/darwin-x64": "0.18.17", + "@esbuild/freebsd-arm64": "0.18.17", + "@esbuild/freebsd-x64": "0.18.17", + "@esbuild/linux-arm": "0.18.17", + "@esbuild/linux-arm64": "0.18.17", + "@esbuild/linux-ia32": "0.18.17", + "@esbuild/linux-loong64": "0.18.17", + "@esbuild/linux-mips64el": "0.18.17", + "@esbuild/linux-ppc64": "0.18.17", + "@esbuild/linux-riscv64": "0.18.17", + "@esbuild/linux-s390x": "0.18.17", + "@esbuild/linux-x64": "0.18.17", + "@esbuild/netbsd-x64": "0.18.17", + "@esbuild/openbsd-x64": "0.18.17", + "@esbuild/sunos-x64": "0.18.17", + "@esbuild/win32-arm64": "0.18.17", + "@esbuild/win32-ia32": "0.18.17", + "@esbuild/win32-x64": "0.18.17" } }, "node_modules/esbuild-wasm": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/esbuild-wasm/-/esbuild-wasm-0.16.17.tgz", - "integrity": "sha512-Tn7NuMqRcM+T/qCOxbQRq0qrwWl1sUWp6ARfJRakE8Bepew6zata4qrKgH2YqovNC5e/2fcTa7o+VL/FAOZC1Q==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/esbuild-wasm/-/esbuild-wasm-0.18.17.tgz", + "integrity": "sha512-9OHGcuRzy+I8ziF9FzjfKLWAPbvi0e/metACVg9k6bK+SI4FFxeV6PcZsz8RIVaMD4YNehw+qj6UMR3+qj/EuQ==", "dev": true, "bin": { "esbuild": "bin/esbuild" @@ -7499,15 +8110,14 @@ } }, "node_modules/escodegen": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz", - "integrity": "sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.1.0.tgz", + "integrity": "sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==", "dev": true, "dependencies": { "esprima": "^4.0.1", "estraverse": "^5.2.0", - "esutils": "^2.0.2", - "optionator": "^0.8.1" + "esutils": "^2.0.2" }, "bin": { "escodegen": "bin/escodegen.js", @@ -7529,45 +8139,6 @@ "node": ">=4.0" } }, - "node_modules/escodegen/node_modules/levn": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", - "integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==", - "dev": true, - "dependencies": { - "prelude-ls": "~1.1.2", - "type-check": "~0.3.2" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/escodegen/node_modules/optionator": { - "version": "0.8.3", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz", - "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==", - "dev": true, - "dependencies": { - "deep-is": "~0.1.3", - "fast-levenshtein": "~2.0.6", - "levn": "~0.3.0", - "prelude-ls": "~1.1.2", - "type-check": "~0.3.2", - "word-wrap": "~1.2.3" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/escodegen/node_modules/prelude-ls": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", - "integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==", - "dev": true, - "engines": { - "node": ">= 0.8.0" - } - }, "node_modules/escodegen/node_modules/source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", @@ -7578,62 +8149,49 @@ "node": ">=0.10.0" } }, - "node_modules/escodegen/node_modules/type-check": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", - "integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==", + "node_modules/eslint": { + "version": "8.52.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.52.0.tgz", + "integrity": "sha512-zh/JHnaixqHZsolRB/w9/02akBk9EPrOs9JwcTP2ek7yL5bVvXuRariiaAjjoJ5DvuwQ1WAE/HsMz+w17YgBCg==", "dev": true, "dependencies": { - "prelude-ls": "~1.1.2" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/eslint": { - "version": "8.32.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.32.0.tgz", - "integrity": "sha512-nETVXpnthqKPFyuY2FNjz/bEd6nbosRgKbkgS/y1C7LJop96gYHWpiguLecMHQ2XCPxn77DS0P+68WzG6vkZSQ==", - "dev": true, - "dependencies": { - "@eslint/eslintrc": "^1.4.1", - "@humanwhocodes/config-array": "^0.11.8", + "@eslint-community/eslint-utils": "^4.2.0", + "@eslint-community/regexpp": "^4.6.1", + "@eslint/eslintrc": "^2.1.2", + "@eslint/js": "8.52.0", + "@humanwhocodes/config-array": "^0.11.13", "@humanwhocodes/module-importer": "^1.0.1", "@nodelib/fs.walk": "^1.2.8", - "ajv": "^6.10.0", + "@ungap/structured-clone": "^1.2.0", + "ajv": "^6.12.4", "chalk": "^4.0.0", "cross-spawn": "^7.0.2", "debug": "^4.3.2", "doctrine": "^3.0.0", "escape-string-regexp": "^4.0.0", - "eslint-scope": "^7.1.1", - "eslint-utils": "^3.0.0", - "eslint-visitor-keys": "^3.3.0", - "espree": "^9.4.0", - "esquery": "^1.4.0", + "eslint-scope": "^7.2.2", + "eslint-visitor-keys": "^3.4.3", + "espree": "^9.6.1", + "esquery": "^1.4.2", "esutils": "^2.0.2", "fast-deep-equal": "^3.1.3", "file-entry-cache": "^6.0.1", "find-up": "^5.0.0", "glob-parent": "^6.0.2", "globals": "^13.19.0", - "grapheme-splitter": "^1.0.4", + "graphemer": "^1.4.0", "ignore": "^5.2.0", - "import-fresh": "^3.0.0", "imurmurhash": "^0.1.4", "is-glob": "^4.0.0", "is-path-inside": "^3.0.3", - "js-sdsl": "^4.1.4", "js-yaml": "^4.1.0", "json-stable-stringify-without-jsonify": "^1.0.1", "levn": "^0.4.1", "lodash.merge": "^4.6.2", "minimatch": "^3.1.2", "natural-compare": "^1.4.0", - "optionator": "^0.9.1", - "regexpp": "^3.2.0", + "optionator": "^0.9.3", "strip-ansi": "^6.0.1", - "strip-json-comments": "^3.1.0", "text-table": "^0.2.0" }, "bin": { @@ -7659,40 +8217,16 @@ "node": ">=8.0.0" } }, - "node_modules/eslint-utils": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz", - "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==", - "dev": true, - "dependencies": { - "eslint-visitor-keys": "^2.0.0" - }, - "engines": { - "node": "^10.0.0 || ^12.0.0 || >= 14.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/mysticatea" - }, - "peerDependencies": { - "eslint": ">=5" - } - }, - "node_modules/eslint-utils/node_modules/eslint-visitor-keys": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz", - "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==", - "dev": true, - "engines": { - "node": ">=10" - } - }, "node_modules/eslint-visitor-keys": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz", - "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==", + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", + "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" } }, "node_modules/eslint/node_modules/ajv": { @@ -7732,16 +8266,6 @@ "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", "dev": true }, - "node_modules/eslint/node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, "node_modules/eslint/node_modules/chalk": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", @@ -7789,9 +8313,9 @@ } }, "node_modules/eslint/node_modules/eslint-scope": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz", - "integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==", + "version": "7.2.2", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz", + "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==", "dev": true, "dependencies": { "esrecurse": "^4.3.0", @@ -7799,6 +8323,9 @@ }, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" } }, "node_modules/eslint/node_modules/estraverse": { @@ -7839,9 +8366,9 @@ } }, "node_modules/eslint/node_modules/globals": { - "version": "13.19.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.19.0.tgz", - "integrity": "sha512-dkQ957uSRWHw7CFXLUtUHQI3g3aWApYhfNR2O6jn/907riyTYKVBmxYVROkBcY614FSSeSJh7Xm7SrUWCxvJMQ==", + "version": "13.23.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.23.0.tgz", + "integrity": "sha512-XAmF0RjlrjY23MA51q3HltdlGxUpXPvg0GioKiD9X6HD28iMjo2dKC8Vqwm7lne4GNr78+RHTfliktR6ZH09wA==", "dev": true, "dependencies": { "type-fest": "^0.20.2" @@ -7895,33 +8422,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/eslint/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "node_modules/eslint/node_modules/p-limit": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", - "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", - "dev": true, - "dependencies": { - "yocto-queue": "^0.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/eslint/node_modules/p-locate": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", @@ -7962,14 +8462,14 @@ } }, "node_modules/espree": { - "version": "9.4.1", - "resolved": "https://registry.npmjs.org/espree/-/espree-9.4.1.tgz", - "integrity": "sha512-XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg==", + "version": "9.6.1", + "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz", + "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==", "dev": true, "dependencies": { - "acorn": "^8.8.0", + "acorn": "^8.9.0", "acorn-jsx": "^5.3.2", - "eslint-visitor-keys": "^3.3.0" + "eslint-visitor-keys": "^3.4.1" }, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -7992,9 +8492,9 @@ } }, "node_modules/esquery": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz", - "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz", + "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==", "dev": true, "dependencies": { "estraverse": "^5.1.0" @@ -8114,21 +8614,27 @@ } }, "node_modules/expect": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/expect/-/expect-28.1.3.tgz", - "integrity": "sha512-eEh0xn8HlsuOBxFgIss+2mX85VAS4Qy3OSkjV7rlBWljtA4oWH37glVGyOZSZvErDT/yBywZdPGwCXuTvSG85g==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/expect/-/expect-29.7.0.tgz", + "integrity": "sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==", "dev": true, "dependencies": { - "@jest/expect-utils": "^28.1.3", - "jest-get-type": "^28.0.2", - "jest-matcher-utils": "^28.1.3", - "jest-message-util": "^28.1.3", - "jest-util": "^28.1.3" + "@jest/expect-utils": "^29.7.0", + "jest-get-type": "^29.6.3", + "jest-matcher-utils": "^29.7.0", + "jest-message-util": "^29.7.0", + "jest-util": "^29.7.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, + "node_modules/exponential-backoff": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.1.tgz", + "integrity": "sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw==", + "dev": true + }, "node_modules/express": { "version": "4.18.2", "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz", @@ -8186,15 +8692,6 @@ "ms": "2.0.0" } }, - "node_modules/express/node_modules/depd": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", - "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", - "dev": true, - "engines": { - "node": ">= 0.8" - } - }, "node_modules/express/node_modules/ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", @@ -8222,9 +8719,9 @@ "dev": true }, "node_modules/fast-glob": { - "version": "3.2.12", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz", - "integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==", + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.1.tgz", + "integrity": "sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==", "dev": true, "dependencies": { "@nodelib/fs.stat": "^2.0.2", @@ -8250,9 +8747,9 @@ "dev": true }, "node_modules/fastq": { - "version": "1.13.0", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz", - "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==", + "version": "1.15.0", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz", + "integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==", "dev": true, "dependencies": { "reusify": "^1.0.4" @@ -8352,20 +8849,19 @@ "dev": true }, "node_modules/find-cache-dir": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz", - "integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-4.0.0.tgz", + "integrity": "sha512-9ZonPT4ZAK4a+1pUPVPZJapbi7O5qbbJPdYw/NOQWZZbVLdDTYM3A4R9z/DpAM08IDaFGsvPgiGZ82WEwUDWjg==", "dev": true, "dependencies": { - "commondir": "^1.0.1", - "make-dir": "^3.0.2", - "pkg-dir": "^4.1.0" + "common-path-prefix": "^3.0.0", + "pkg-dir": "^7.0.0" }, "engines": { - "node": ">=8" + "node": ">=14.16" }, "funding": { - "url": "https://github.com/avajs/find-cache-dir?sponsor=1" + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/find-up": { @@ -8382,28 +8878,29 @@ } }, "node_modules/flat-cache": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz", - "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.1.1.tgz", + "integrity": "sha512-/qM2b3LUIaIgviBQovTLvijfyOQXPtSRnRK26ksj2J7rzPIecePUIpJsZ4T02Qg+xiAEKIs5K8dsHEd+VaKa/Q==", "dev": true, "dependencies": { - "flatted": "^3.1.0", + "flatted": "^3.2.9", + "keyv": "^4.5.3", "rimraf": "^3.0.2" }, "engines": { - "node": "^10.12.0 || >=12.0.0" + "node": ">=12.0.0" } }, "node_modules/flatted": { - "version": "3.2.7", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz", - "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==", + "version": "3.2.9", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.9.tgz", + "integrity": "sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==", "dev": true }, "node_modules/follow-redirects": { - "version": "1.15.2", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz", - "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==", + "version": "1.15.3", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.3.tgz", + "integrity": "sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q==", "dev": true, "funding": [ { @@ -8420,10 +8917,38 @@ } } }, + "node_modules/foreground-child": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz", + "integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==", + "dev": true, + "dependencies": { + "cross-spawn": "^7.0.0", + "signal-exit": "^4.0.1" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/foreground-child/node_modules/signal-exit": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", + "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", + "dev": true, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, "node_modules/form-data": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", - "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz", + "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==", "dev": true, "dependencies": { "asynckit": "^0.4.0", @@ -8444,16 +8969,16 @@ } }, "node_modules/fraction.js": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.2.0.tgz", - "integrity": "sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA==", + "version": "4.3.7", + "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.3.7.tgz", + "integrity": "sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew==", "dev": true, "engines": { "node": "*" }, "funding": { "type": "patreon", - "url": "https://www.patreon.com/infusion" + "url": "https://github.com/sponsors/rawify" } }, "node_modules/fresh": { @@ -8466,21 +8991,30 @@ } }, "node_modules/fs-minipass": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.0.tgz", - "integrity": "sha512-EUojgQaSPy6sxcqcZgQv6TVF6jiKvurji3AxhAivs/Ep4O1UpS8TusaxpybfFHZ2skRhLqzk6WR8nqNYIMMDeA==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.3.tgz", + "integrity": "sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==", "dev": true, "dependencies": { - "minipass": "^4.0.0" + "minipass": "^7.0.3" }, "engines": { "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, + "node_modules/fs-minipass/node_modules/minipass": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz", + "integrity": "sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==", + "dev": true, + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, "node_modules/fs-monkey": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.3.tgz", - "integrity": "sha512-cybjIfiiE+pTWicSCLFHSrXZ6EilF30oh91FDP9S2B051prEa7QWfrVTQm10/dDpswBDXZugPa1Ogu8Yh+HV0Q==", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.5.tgz", + "integrity": "sha512-8uMbBjrhzW76TYgEV27Y5E//W2f/lTFmx78P2w19FZSxarhI/798APGQyuGCwmkNxgwGRhrLfvWyLBvNtuOmew==", "dev": true }, "node_modules/fs.realpath": { @@ -8490,9 +9024,9 @@ "dev": true }, "node_modules/fsevents": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", - "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", + "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", "dev": true, "hasInstallScript": true, "optional": true, @@ -8504,10 +9038,13 @@ } }, "node_modules/function-bind": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", - "dev": true + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", + "dev": true, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } }, "node_modules/gauge": { "version": "4.0.4", @@ -8547,14 +9084,15 @@ } }, "node_modules/get-intrinsic": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz", - "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.2.tgz", + "integrity": "sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==", "dev": true, "dependencies": { - "function-bind": "^1.1.1", - "has": "^1.0.3", - "has-symbols": "^1.0.3" + "function-bind": "^1.1.2", + "has-proto": "^1.0.1", + "has-symbols": "^1.0.3", + "hasown": "^2.0.0" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -8582,19 +9120,20 @@ } }, "node_modules/glob": { - "version": "8.0.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-8.0.3.tgz", - "integrity": "sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ==", + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", "dev": true, "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", "inherits": "2", - "minimatch": "^5.0.1", - "once": "^1.3.0" + "minimatch": "^3.1.1", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" }, "engines": { - "node": ">=12" + "node": "*" }, "funding": { "url": "https://github.com/sponsors/isaacs" @@ -8647,36 +9186,48 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/gopd": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", + "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==", + "dev": true, + "dependencies": { + "get-intrinsic": "^1.1.3" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/graceful-fs": { - "version": "4.2.10", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", - "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", + "version": "4.2.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", + "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", "dev": true }, - "node_modules/grapheme-splitter": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz", - "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==", + "node_modules/graphemer": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz", + "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", "dev": true }, + "node_modules/guess-parser": { + "version": "0.4.22", + "resolved": "https://registry.npmjs.org/guess-parser/-/guess-parser-0.4.22.tgz", + "integrity": "sha512-KcUWZ5ACGaBM69SbqwVIuWGoSAgD+9iJnchR9j/IarVI1jHVeXv+bUXBIMeqVMSKt3zrn0Dgf9UpcOEpPBLbSg==", + "dev": true, + "dependencies": { + "@wessberg/ts-evaluator": "0.0.27" + }, + "peerDependencies": { + "typescript": ">=3.7.5" + } + }, "node_modules/handle-thing": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz", "integrity": "sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==", "dev": true }, - "node_modules/has": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", - "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", - "dev": true, - "dependencies": { - "function-bind": "^1.1.1" - }, - "engines": { - "node": ">= 0.4.0" - } - }, "node_modules/has-flag": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", @@ -8686,6 +9237,30 @@ "node": ">=4" } }, + "node_modules/has-property-descriptors": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.1.tgz", + "integrity": "sha512-VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg==", + "dev": true, + "dependencies": { + "get-intrinsic": "^1.2.2" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-proto": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz", + "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==", + "dev": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/has-symbols": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", @@ -8704,6 +9279,18 @@ "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==", "dev": true }, + "node_modules/hasown": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.0.tgz", + "integrity": "sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==", + "dev": true, + "dependencies": { + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/hdr-histogram-js": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/hdr-histogram-js/-/hdr-histogram-js-2.0.3.tgz", @@ -8734,9 +9321,9 @@ } }, "node_modules/hosted-git-info/node_modules/lru-cache": { - "version": "7.14.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.14.1.tgz", - "integrity": "sha512-ysxwsnTKdAx96aTRdhDOCQfDgbHnt8SK0KY8SEjO0wHinhWOFTESbjVCMPbU1uGXg/ch4lifqx0wfjOawU2+WA==", + "version": "7.18.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", + "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", "dev": true, "engines": { "node": ">=12" @@ -8755,9 +9342,9 @@ } }, "node_modules/hpack.js/node_modules/readable-stream": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", - "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "version": "2.3.8", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", + "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==", "dev": true, "dependencies": { "core-util-is": "~1.0.0", @@ -8785,22 +9372,32 @@ } }, "node_modules/html-encoding-sniffer": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz", - "integrity": "sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz", + "integrity": "sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==", "dev": true, "dependencies": { - "whatwg-encoding": "^2.0.0" + "whatwg-encoding": "^1.0.5" }, "engines": { - "node": ">=12" + "node": ">=10" } }, "node_modules/html-entities": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.3.3.tgz", - "integrity": "sha512-DV5Ln36z34NNTDgnz0EWGBLZENelNAtkiFA4kyNOG2tDI6Mz1uSWiq1wAKdyjnJwyDiDO7Fa2SO1CTxPXL8VxA==", - "dev": true + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.4.0.tgz", + "integrity": "sha512-igBTJcNNNhvZFRtm8uA6xMY6xYleeDwn3PeBCkDz7tHttv4F2hsDI2aPgNERWzvRcNYHNT3ymRaQzllmXj4YsQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/mdevils" + }, + { + "type": "patreon", + "url": "https://patreon.com/mdevils" + } + ] }, "node_modules/html-escaper": { "version": "2.0.2", @@ -8808,10 +9405,29 @@ "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==", "dev": true }, + "node_modules/htmlparser2": { + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-8.0.2.tgz", + "integrity": "sha512-GYdjWKDkbRLkZ5geuHs5NY1puJ+PXwP7+fHPRz06Eirsb9ugf6d8kkXav6ADhcODhFFPMIXyxkxSuMf3D6NCFA==", + "dev": true, + "funding": [ + "https://github.com/fb55/htmlparser2?sponsor=1", + { + "type": "github", + "url": "https://github.com/sponsors/fb55" + } + ], + "dependencies": { + "domelementtype": "^2.3.0", + "domhandler": "^5.0.3", + "domutils": "^3.0.1", + "entities": "^4.4.0" + } + }, "node_modules/http-cache-semantics": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz", - "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz", + "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==", "dev": true }, "node_modules/http-deceiver": { @@ -8836,15 +9452,6 @@ "node": ">= 0.8" } }, - "node_modules/http-errors/node_modules/depd": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", - "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", - "dev": true, - "engines": { - "node": ">= 0.8" - } - }, "node_modules/http-parser-js": { "version": "0.5.8", "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.8.tgz", @@ -8866,12 +9473,12 @@ } }, "node_modules/http-proxy-agent": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz", - "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz", + "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==", "dev": true, "dependencies": { - "@tootallnate/once": "2", + "@tootallnate/once": "1", "agent-base": "6", "debug": "4" }, @@ -8979,26 +9586,50 @@ ] }, "node_modules/ignore": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz", - "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==", + "version": "5.2.4", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz", + "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==", "dev": true, "engines": { "node": ">= 4" } }, "node_modules/ignore-walk": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-6.0.0.tgz", - "integrity": "sha512-bTf9UWe/UP1yxG3QUrj/KOvEhTAUWPcv+WvbFZ28LcqznXabp7Xu6o9y1JEC18+oqODuS7VhTpekV5XvFwsxJg==", + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-6.0.3.tgz", + "integrity": "sha512-C7FfFoTA+bI10qfeydT8aZbvr91vAEU+2W5BZUlzPec47oNb07SsOfwYrtxuvOYdUApPP/Qlh4DtAO51Ekk2QA==", "dev": true, "dependencies": { - "minimatch": "^5.0.1" + "minimatch": "^9.0.0" }, "engines": { "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, + "node_modules/ignore-walk/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/ignore-walk/node_modules/minimatch": { + "version": "9.0.3", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", + "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==", + "dev": true, + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, "node_modules/image-size": { "version": "0.5.5", "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz", @@ -9013,9 +9644,9 @@ } }, "node_modules/immutable": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.2.2.tgz", - "integrity": "sha512-fTMKDwtbvO5tldky9QZ2fMX7slR0mYpY5nbnFWYp0fOzDhHqhgIw9KoYgxLWsoNTS9ZHGauHj18DTyEw6BK3Og==", + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.4.tgz", + "integrity": "sha512-fsXeu4J4i6WNWSikpI88v/PcVflZz+6kMhUfIwc5SY+poQRPnaf5V7qds6SUyUN3cVxEzuCab7QIoLOQ+DQ1wA==", "dev": true }, "node_modules/import-fresh": { @@ -9062,6 +9693,18 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/import-local/node_modules/pkg-dir": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", + "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", + "dev": true, + "dependencies": { + "find-up": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/imurmurhash": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", @@ -9103,12 +9746,12 @@ "dev": true }, "node_modules/ini": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/ini/-/ini-3.0.1.tgz", - "integrity": "sha512-it4HyVAUTKBc6m8e1iXWvXSTdndF7HbdN713+kvLrymxTaU4AUBWrJ4vEooP+V7fexnVD3LKcBshjGGPefSMUQ==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/ini/-/ini-4.1.1.tgz", + "integrity": "sha512-QQnnxNyfvmHFIsj7gkPcYymR8Jdw/o7mp5ZFihxn6h8Ci6fh3Dx4E1gPjpQEpIuPo9XVNY/ZUwh4BPMjGyL01g==", "dev": true, "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, "node_modules/inquirer": { @@ -9214,9 +9857,9 @@ "dev": true }, "node_modules/ipaddr.js": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.0.1.tgz", - "integrity": "sha512-1qTgH9NG+IIJ4yfKs2e6Pp1bZg8wbDbKHT21HrLIeYBTRLgMYKnMTPAuI3Lcs61nfx5h1xlXnbJtH1kX5/d/ng==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.1.0.tgz", + "integrity": "sha512-LlbxQ7xKzfBusov6UMi4MFpEg0m+mAm9xyNGEduwXMEDuf4WfzB/RZwMVYEd7IKGvh4IUkEXYxtAVu9T3OelJQ==", "dev": true, "engines": { "node": ">= 10" @@ -9241,12 +9884,12 @@ } }, "node_modules/is-core-module": { - "version": "2.11.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz", - "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==", + "version": "2.13.1", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz", + "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==", "dev": true, "dependencies": { - "has": "^1.0.3" + "hasown": "^2.0.0" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -9458,26 +10101,26 @@ } }, "node_modules/istanbul-lib-instrument/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, "bin": { "semver": "bin/semver.js" } }, "node_modules/istanbul-lib-report": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz", - "integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz", + "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==", "dev": true, "dependencies": { "istanbul-lib-coverage": "^3.0.0", - "make-dir": "^3.0.0", + "make-dir": "^4.0.0", "supports-color": "^7.1.0" }, "engines": { - "node": ">=8" + "node": ">=10" } }, "node_modules/istanbul-lib-report/node_modules/has-flag": { @@ -9525,9 +10168,9 @@ } }, "node_modules/istanbul-reports": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.5.tgz", - "integrity": "sha512-nUsEMa9pBt/NOHqbcbeJEgqIlY/K7rVWUX6Lql2orY5e9roQOthbR3vtY4zzf2orPELg80fnxxk9zUyPlgwD1w==", + "version": "3.1.6", + "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.6.tgz", + "integrity": "sha512-TLgnMkKg3iTDsQ9PbPTdpfAK2DzjF9mqUG7RMgcQl8oFjad8ob4laGxv5XV5U9MAfx8D6tSJiUyuAwzLicaxlg==", "dev": true, "dependencies": { "html-escaper": "^2.0.0", @@ -9537,22 +10180,40 @@ "node": ">=8" } }, + "node_modules/jackspeak": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.6.tgz", + "integrity": "sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==", + "dev": true, + "dependencies": { + "@isaacs/cliui": "^8.0.2" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + }, + "optionalDependencies": { + "@pkgjs/parseargs": "^0.11.0" + } + }, "node_modules/jest": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest/-/jest-28.1.3.tgz", - "integrity": "sha512-N4GT5on8UkZgH0O5LUavMRV1EDEhNTL0KEfRmDIeZHSV7p2XgLoY9t9VDUgL6o+yfdgYHVxuz81G8oB9VG5uyA==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest/-/jest-29.7.0.tgz", + "integrity": "sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==", "dev": true, "dependencies": { - "@jest/core": "^28.1.3", - "@jest/types": "^28.1.3", + "@jest/core": "^29.7.0", + "@jest/types": "^29.6.3", "import-local": "^3.0.2", - "jest-cli": "^28.1.3" + "jest-cli": "^29.7.0" }, "bin": { "jest": "bin/jest.js" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" }, "peerDependencies": { "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0" @@ -9564,61 +10225,48 @@ } }, "node_modules/jest-changed-files": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-28.1.3.tgz", - "integrity": "sha512-esaOfUWJXk2nfZt9SPyC8gA1kNfdKLkQWyzsMlqq8msYSlNKfmZxfRgZn4Cd4MGVUF+7v6dBs0d5TOAKa7iIiA==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.7.0.tgz", + "integrity": "sha512-fEArFiwf1BpQ+4bXSprcDc3/x4HSzL4al2tozwVpDFpsxALjLYdyiIK4e5Vz66GQJIbXJ82+35PtysofptNX2w==", "dev": true, "dependencies": { "execa": "^5.0.0", + "jest-util": "^29.7.0", "p-limit": "^3.1.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/jest-changed-files/node_modules/p-limit": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", - "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", - "dev": true, - "dependencies": { - "yocto-queue": "^0.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-circus": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-28.1.3.tgz", - "integrity": "sha512-cZ+eS5zc79MBwt+IhQhiEp0OeBddpc1n8MBo1nMB8A7oPMKEO+Sre+wHaLJexQUj9Ya/8NOBY0RESUgYjB6fow==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.7.0.tgz", + "integrity": "sha512-3E1nCMgipcTkCocFwM90XXQab9bS+GMsjdpmPrlelaxwD93Ad8iVEjX/vvHPdLPnFf+L40u+5+iutRdA1N9myw==", "dev": true, "dependencies": { - "@jest/environment": "^28.1.3", - "@jest/expect": "^28.1.3", - "@jest/test-result": "^28.1.3", - "@jest/types": "^28.1.3", + "@jest/environment": "^29.7.0", + "@jest/expect": "^29.7.0", + "@jest/test-result": "^29.7.0", + "@jest/types": "^29.6.3", "@types/node": "*", "chalk": "^4.0.0", "co": "^4.6.0", - "dedent": "^0.7.0", + "dedent": "^1.0.0", "is-generator-fn": "^2.0.0", - "jest-each": "^28.1.3", - "jest-matcher-utils": "^28.1.3", - "jest-message-util": "^28.1.3", - "jest-runtime": "^28.1.3", - "jest-snapshot": "^28.1.3", - "jest-util": "^28.1.3", + "jest-each": "^29.7.0", + "jest-matcher-utils": "^29.7.0", + "jest-message-util": "^29.7.0", + "jest-runtime": "^29.7.0", + "jest-snapshot": "^29.7.0", + "jest-util": "^29.7.0", "p-limit": "^3.1.0", - "pretty-format": "^28.1.3", + "pretty-format": "^29.7.0", + "pure-rand": "^6.0.0", "slash": "^3.0.0", "stack-utils": "^2.0.3" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-circus/node_modules/ansi-styles": { @@ -9679,21 +10327,6 @@ "node": ">=8" } }, - "node_modules/jest-circus/node_modules/p-limit": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", - "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", - "dev": true, - "dependencies": { - "yocto-queue": "^0.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/jest-circus/node_modules/supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", @@ -9707,29 +10340,28 @@ } }, "node_modules/jest-cli": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-28.1.3.tgz", - "integrity": "sha512-roY3kvrv57Azn1yPgdTebPAXvdR2xfezaKKYzVxZ6It/5NCxzJym6tUI5P1zkdWhfUYkxEI9uZWcQdaFLo8mJQ==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.7.0.tgz", + "integrity": "sha512-OVVobw2IubN/GSYsxETi+gOe7Ka59EFMR/twOU3Jb2GnKKeMGJB5SGUUrEz3SFVmJASUdZUzy83sLNNQ2gZslg==", "dev": true, "dependencies": { - "@jest/core": "^28.1.3", - "@jest/test-result": "^28.1.3", - "@jest/types": "^28.1.3", + "@jest/core": "^29.7.0", + "@jest/test-result": "^29.7.0", + "@jest/types": "^29.6.3", "chalk": "^4.0.0", + "create-jest": "^29.7.0", "exit": "^0.1.2", - "graceful-fs": "^4.2.9", "import-local": "^3.0.2", - "jest-config": "^28.1.3", - "jest-util": "^28.1.3", - "jest-validate": "^28.1.3", - "prompts": "^2.0.1", + "jest-config": "^29.7.0", + "jest-util": "^29.7.0", + "jest-validate": "^29.7.0", "yargs": "^17.3.1" }, "bin": { "jest": "bin/jest.js" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" }, "peerDependencies": { "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0" @@ -9811,36 +10443,36 @@ } }, "node_modules/jest-config": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-28.1.3.tgz", - "integrity": "sha512-MG3INjByJ0J4AsNBm7T3hsuxKQqFIiRo/AUqb1q9LRKI5UU6Aar9JHbr9Ivn1TVwfUD9KirRoM/T6u8XlcQPHQ==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.7.0.tgz", + "integrity": "sha512-uXbpfeQ7R6TZBqI3/TxCU4q4ttk3u0PJeC+E0zbfSoSjq6bJ7buBPxzQPL0ifrkY4DNu4JUdk0ImlBUYi840eQ==", "dev": true, "dependencies": { "@babel/core": "^7.11.6", - "@jest/test-sequencer": "^28.1.3", - "@jest/types": "^28.1.3", - "babel-jest": "^28.1.3", + "@jest/test-sequencer": "^29.7.0", + "@jest/types": "^29.6.3", + "babel-jest": "^29.7.0", "chalk": "^4.0.0", "ci-info": "^3.2.0", "deepmerge": "^4.2.2", "glob": "^7.1.3", "graceful-fs": "^4.2.9", - "jest-circus": "^28.1.3", - "jest-environment-node": "^28.1.3", - "jest-get-type": "^28.0.2", - "jest-regex-util": "^28.0.2", - "jest-resolve": "^28.1.3", - "jest-runner": "^28.1.3", - "jest-util": "^28.1.3", - "jest-validate": "^28.1.3", + "jest-circus": "^29.7.0", + "jest-environment-node": "^29.7.0", + "jest-get-type": "^29.6.3", + "jest-regex-util": "^29.6.3", + "jest-resolve": "^29.7.0", + "jest-runner": "^29.7.0", + "jest-util": "^29.7.0", + "jest-validate": "^29.7.0", "micromatch": "^4.0.4", "parse-json": "^5.2.0", - "pretty-format": "^28.1.3", + "pretty-format": "^29.7.0", "slash": "^3.0.0", "strip-json-comments": "^3.1.1" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" }, "peerDependencies": { "@types/node": "*", @@ -9870,16 +10502,6 @@ "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, - "node_modules/jest-config/node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, "node_modules/jest-config/node_modules/chalk": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", @@ -9914,26 +10536,6 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, - "node_modules/jest-config/node_modules/glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "dev": true, - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, "node_modules/jest-config/node_modules/has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", @@ -9943,18 +10545,6 @@ "node": ">=8" } }, - "node_modules/jest-config/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, "node_modules/jest-config/node_modules/supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", @@ -9968,18 +10558,18 @@ } }, "node_modules/jest-diff": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-28.1.3.tgz", - "integrity": "sha512-8RqP1B/OXzjjTWkqMX67iqgwBVJRgCyKD3L9nq+6ZqJMdvjE8RgHktqZ6jNrkdMT+dJuYNI3rhQpxaz7drJHfw==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz", + "integrity": "sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==", "dev": true, "dependencies": { "chalk": "^4.0.0", - "diff-sequences": "^28.1.1", - "jest-get-type": "^28.0.2", - "pretty-format": "^28.1.3" + "diff-sequences": "^29.6.3", + "jest-get-type": "^29.6.3", + "pretty-format": "^29.7.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-diff/node_modules/ansi-styles": { @@ -10053,31 +10643,31 @@ } }, "node_modules/jest-docblock": { - "version": "28.1.1", - "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-28.1.1.tgz", - "integrity": "sha512-3wayBVNiOYx0cwAbl9rwm5kKFP8yHH3d/fkEaL02NPTkDojPtheGB7HZSFY4wzX+DxyrvhXz0KSCVksmCknCuA==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-29.7.0.tgz", + "integrity": "sha512-q617Auw3A612guyaFgsbFeYpNP5t2aoUNLwBUbc/0kD1R4t9ixDbyFTHd1nok4epoVFpr7PmeWHrhvuV3XaJ4g==", "dev": true, "dependencies": { "detect-newline": "^3.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-each": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-28.1.3.tgz", - "integrity": "sha512-arT1z4sg2yABU5uogObVPvSlSMQlDA48owx07BDPAiasW0yYpYHYOo4HHLz9q0BVzDVU4hILFjzJw0So9aCL/g==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.7.0.tgz", + "integrity": "sha512-gns+Er14+ZrEoC5fhOfYCY1LOHHr0TI+rQUHZS8Ttw2l7gl+80eHc/gFf2Ktkw0+SIACDTeWvpFcv3B04VembQ==", "dev": true, "dependencies": { - "@jest/types": "^28.1.3", + "@jest/types": "^29.6.3", "chalk": "^4.0.0", - "jest-get-type": "^28.0.2", - "jest-util": "^28.1.3", - "pretty-format": "^28.1.3" + "jest-get-type": "^29.6.3", + "jest-util": "^29.7.0", + "pretty-format": "^29.7.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-each/node_modules/ansi-styles": { @@ -10151,196 +10741,432 @@ } }, "node_modules/jest-environment-jsdom": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-28.1.3.tgz", - "integrity": "sha512-HnlGUmZRdxfCByd3GM2F100DgQOajUBzEitjGqIREcb45kGjZvRrKUdlaF6escXBdcXNl0OBh+1ZrfeZT3GnAg==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-29.7.0.tgz", + "integrity": "sha512-k9iQbsf9OyOfdzWH8HDmrRT0gSIcX+FLNW7IQq94tFX0gynPwqDTW0Ho6iMVNjGz/nb+l/vW3dWM2bbLLpkbXA==", "dev": true, "dependencies": { - "@jest/environment": "^28.1.3", - "@jest/fake-timers": "^28.1.3", - "@jest/types": "^28.1.3", - "@types/jsdom": "^16.2.4", + "@jest/environment": "^29.7.0", + "@jest/fake-timers": "^29.7.0", + "@jest/types": "^29.6.3", + "@types/jsdom": "^20.0.0", "@types/node": "*", - "jest-mock": "^28.1.3", - "jest-util": "^28.1.3", - "jsdom": "^19.0.0" + "jest-mock": "^29.7.0", + "jest-util": "^29.7.0", + "jsdom": "^20.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + }, + "peerDependencies": { + "canvas": "^2.5.0" + }, + "peerDependenciesMeta": { + "canvas": { + "optional": true + } } }, - "node_modules/jest-environment-node": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-28.1.3.tgz", - "integrity": "sha512-ugP6XOhEpjAEhGYvp5Xj989ns5cB1K6ZdjBYuS30umT4CQEETaxSiPcZ/E1kFktX4GkrcM4qu07IIlDYX1gp+A==", + "node_modules/jest-environment-jsdom/node_modules/@tootallnate/once": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz", + "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==", "dev": true, - "dependencies": { - "@jest/environment": "^28.1.3", - "@jest/fake-timers": "^28.1.3", - "@jest/types": "^28.1.3", - "@types/node": "*", - "jest-mock": "^28.1.3", - "jest-util": "^28.1.3" - }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": ">= 10" } }, - "node_modules/jest-get-type": { - "version": "28.0.2", - "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-28.0.2.tgz", - "integrity": "sha512-ioj2w9/DxSYHfOm5lJKCdcAmPJzQXmbM/Url3rhlghrPvT3tt+7a/+oXc9azkKmLvoiXjtV83bEWqi+vs5nlPA==", + "node_modules/jest-environment-jsdom/node_modules/acorn-globals": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-7.0.1.tgz", + "integrity": "sha512-umOSDSDrfHbTNPuNpC2NSnnA3LUrqpevPb4T9jRx4MagXNS0rs+gwiTcAvqCRmsD6utzsrzNt+ebm00SNWiC3Q==", + "dev": true, + "dependencies": { + "acorn": "^8.1.0", + "acorn-walk": "^8.0.2" + } + }, + "node_modules/jest-environment-jsdom/node_modules/acorn-walk": { + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.0.tgz", + "integrity": "sha512-FS7hV565M5l1R08MXqo8odwMTB02C2UqzB17RVgu9EyuYFBqJZ3/ZY97sQD5FewVu1UyDFc1yztUDrAwT0EypA==", "dev": true, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": ">=0.4.0" } }, - "node_modules/jest-haste-map": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-28.1.3.tgz", - "integrity": "sha512-3S+RQWDXccXDKSWnkHa/dPwt+2qwA8CJzR61w3FoYCvoo3Pn8tvGcysmMF0Bj0EX5RYvAI2EIvC57OmotfdtKA==", + "node_modules/jest-environment-jsdom/node_modules/cssom": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.5.0.tgz", + "integrity": "sha512-iKuQcq+NdHqlAcwUY0o/HL69XQrUaQdMjmStJ8JFmUaiiQErlhrmuigkg/CU4E2J0IyUKUrMAgl36TvN67MqTw==", + "dev": true + }, + "node_modules/jest-environment-jsdom/node_modules/data-urls": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-3.0.2.tgz", + "integrity": "sha512-Jy/tj3ldjZJo63sVAvg6LHt2mHvl4V6AgRAmNDtLdm7faqtsx+aJG42rsyCo9JCoRVKwPFzKlIPx3DIibwSIaQ==", "dev": true, "dependencies": { - "@jest/types": "^28.1.3", - "@types/graceful-fs": "^4.1.3", - "@types/node": "*", - "anymatch": "^3.0.3", - "fb-watchman": "^2.0.0", - "graceful-fs": "^4.2.9", - "jest-regex-util": "^28.0.2", - "jest-util": "^28.1.3", - "jest-worker": "^28.1.3", - "micromatch": "^4.0.4", - "walker": "^1.0.8" + "abab": "^2.0.6", + "whatwg-mimetype": "^3.0.0", + "whatwg-url": "^11.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - }, - "optionalDependencies": { - "fsevents": "^2.3.2" + "node": ">=12" } }, - "node_modules/jest-haste-map/node_modules/has-flag": { + "node_modules/jest-environment-jsdom/node_modules/domexception": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "resolved": "https://registry.npmjs.org/domexception/-/domexception-4.0.0.tgz", + "integrity": "sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==", "dev": true, + "dependencies": { + "webidl-conversions": "^7.0.0" + }, "engines": { - "node": ">=8" + "node": ">=12" } }, - "node_modules/jest-haste-map/node_modules/jest-worker": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-28.1.3.tgz", - "integrity": "sha512-CqRA220YV/6jCo8VWvAt1KKx6eek1VIHMPeLEbpcfSfkEeWyBNppynM/o6q+Wmw+sOhos2ml34wZbSX3G13//g==", + "node_modules/jest-environment-jsdom/node_modules/form-data": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", + "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", "dev": true, "dependencies": { - "@types/node": "*", - "merge-stream": "^2.0.0", - "supports-color": "^8.0.0" + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": ">= 6" } }, - "node_modules/jest-haste-map/node_modules/jest-worker/node_modules/supports-color": { - "version": "8.1.1", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", - "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", + "node_modules/jest-environment-jsdom/node_modules/html-encoding-sniffer": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz", + "integrity": "sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==", "dev": true, "dependencies": { - "has-flag": "^4.0.0" + "whatwg-encoding": "^2.0.0" }, "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/supports-color?sponsor=1" + "node": ">=12" } }, - "node_modules/jest-leak-detector": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-28.1.3.tgz", - "integrity": "sha512-WFVJhnQsiKtDEo5lG2mM0v40QWnBM+zMdHHyJs8AWZ7J0QZJS59MsyKeJHWhpBZBH32S48FOVvGyOFT1h0DlqA==", + "node_modules/jest-environment-jsdom/node_modules/http-proxy-agent": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz", + "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==", "dev": true, "dependencies": { - "jest-get-type": "^28.0.2", - "pretty-format": "^28.1.3" + "@tootallnate/once": "2", + "agent-base": "6", + "debug": "4" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": ">= 6" } }, - "node_modules/jest-matcher-utils": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-28.1.3.tgz", - "integrity": "sha512-kQeJ7qHemKfbzKoGjHHrRKH6atgxMk8Enkk2iPQ3XwO6oE/KYD8lMYOziCkeSB9G4adPM4nR1DE8Tf5JeWH6Bw==", + "node_modules/jest-environment-jsdom/node_modules/iconv-lite": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", + "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", "dev": true, "dependencies": { - "chalk": "^4.0.0", - "jest-diff": "^28.1.3", - "jest-get-type": "^28.0.2", - "pretty-format": "^28.1.3" + "safer-buffer": ">= 2.1.2 < 3.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": ">=0.10.0" } }, - "node_modules/jest-matcher-utils/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "node_modules/jest-environment-jsdom/node_modules/jsdom": { + "version": "20.0.3", + "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-20.0.3.tgz", + "integrity": "sha512-SYhBvTh89tTfCD/CRdSOm13mOBa42iTaTyfyEWBdKcGdPxPtLFBXuHR8XHb33YNYaP+lLbmSvBTsnoesCNJEsQ==", "dev": true, "dependencies": { - "color-convert": "^2.0.1" + "abab": "^2.0.6", + "acorn": "^8.8.1", + "acorn-globals": "^7.0.0", + "cssom": "^0.5.0", + "cssstyle": "^2.3.0", + "data-urls": "^3.0.2", + "decimal.js": "^10.4.2", + "domexception": "^4.0.0", + "escodegen": "^2.0.0", + "form-data": "^4.0.0", + "html-encoding-sniffer": "^3.0.0", + "http-proxy-agent": "^5.0.0", + "https-proxy-agent": "^5.0.1", + "is-potential-custom-element-name": "^1.0.1", + "nwsapi": "^2.2.2", + "parse5": "^7.1.1", + "saxes": "^6.0.0", + "symbol-tree": "^3.2.4", + "tough-cookie": "^4.1.2", + "w3c-xmlserializer": "^4.0.0", + "webidl-conversions": "^7.0.0", + "whatwg-encoding": "^2.0.0", + "whatwg-mimetype": "^3.0.0", + "whatwg-url": "^11.0.0", + "ws": "^8.11.0", + "xml-name-validator": "^4.0.0" }, "engines": { - "node": ">=8" + "node": ">=14" }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" + "peerDependencies": { + "canvas": "^2.5.0" + }, + "peerDependenciesMeta": { + "canvas": { + "optional": true + } } }, - "node_modules/jest-matcher-utils/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "node_modules/jest-environment-jsdom/node_modules/saxes": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/saxes/-/saxes-6.0.0.tgz", + "integrity": "sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==", "dev": true, "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" + "xmlchars": "^2.2.0" }, "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" + "node": ">=v12.22.7" } }, - "node_modules/jest-matcher-utils/node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "node_modules/jest-environment-jsdom/node_modules/tr46": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-3.0.0.tgz", + "integrity": "sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==", "dev": true, "dependencies": { - "color-name": "~1.1.4" + "punycode": "^2.1.1" }, "engines": { - "node": ">=7.0.0" + "node": ">=12" } }, - "node_modules/jest-matcher-utils/node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "node_modules/jest-matcher-utils/node_modules/has-flag": { + "node_modules/jest-environment-jsdom/node_modules/w3c-xmlserializer": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-4.0.0.tgz", + "integrity": "sha512-d+BFHzbiCx6zGfz0HyQ6Rg69w9k19nviJspaj4yNscGjrHu94sVP+aRm75yEbCh+r2/yR+7q6hux9LVtbuTGBw==", "dev": true, - "engines": { + "dependencies": { + "xml-name-validator": "^4.0.0" + }, + "engines": { + "node": ">=14" + } + }, + "node_modules/jest-environment-jsdom/node_modules/webidl-conversions": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz", + "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==", + "dev": true, + "engines": { + "node": ">=12" + } + }, + "node_modules/jest-environment-jsdom/node_modules/whatwg-encoding": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz", + "integrity": "sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==", + "dev": true, + "dependencies": { + "iconv-lite": "0.6.3" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/jest-environment-jsdom/node_modules/whatwg-mimetype": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz", + "integrity": "sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==", + "dev": true, + "engines": { + "node": ">=12" + } + }, + "node_modules/jest-environment-jsdom/node_modules/whatwg-url": { + "version": "11.0.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-11.0.0.tgz", + "integrity": "sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ==", + "dev": true, + "dependencies": { + "tr46": "^3.0.0", + "webidl-conversions": "^7.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/jest-environment-jsdom/node_modules/ws": { + "version": "8.14.2", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.14.2.tgz", + "integrity": "sha512-wEBG1ftX4jcglPxgFCMJmZ2PLtSbJ2Peg6TmpJFTbe9GZYOQCDPdMYu/Tm0/bGZkw8paZnJY45J4K2PZrLYq8g==", + "dev": true, + "engines": { + "node": ">=10.0.0" + }, + "peerDependencies": { + "bufferutil": "^4.0.1", + "utf-8-validate": ">=5.0.2" + }, + "peerDependenciesMeta": { + "bufferutil": { + "optional": true + }, + "utf-8-validate": { + "optional": true + } + } + }, + "node_modules/jest-environment-jsdom/node_modules/xml-name-validator": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz", + "integrity": "sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==", + "dev": true, + "engines": { + "node": ">=12" + } + }, + "node_modules/jest-environment-node": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.7.0.tgz", + "integrity": "sha512-DOSwCRqXirTOyheM+4d5YZOrWcdu0LNZ87ewUoywbcb2XR4wKgqiG8vNeYwhjFMbEkfju7wx2GYH0P2gevGvFw==", + "dev": true, + "dependencies": { + "@jest/environment": "^29.7.0", + "@jest/fake-timers": "^29.7.0", + "@jest/types": "^29.6.3", + "@types/node": "*", + "jest-mock": "^29.7.0", + "jest-util": "^29.7.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-get-type": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz", + "integrity": "sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==", + "dev": true, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-haste-map": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.7.0.tgz", + "integrity": "sha512-fP8u2pyfqx0K1rGn1R9pyE0/KTn+G7PxktWidOBTqFPLYX0b9ksaMFkhK5vrS3DVun09pckLdlx90QthlW7AmA==", + "dev": true, + "dependencies": { + "@jest/types": "^29.6.3", + "@types/graceful-fs": "^4.1.3", + "@types/node": "*", + "anymatch": "^3.0.3", + "fb-watchman": "^2.0.0", + "graceful-fs": "^4.2.9", + "jest-regex-util": "^29.6.3", + "jest-util": "^29.7.0", + "jest-worker": "^29.7.0", + "micromatch": "^4.0.4", + "walker": "^1.0.8" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + }, + "optionalDependencies": { + "fsevents": "^2.3.2" + } + }, + "node_modules/jest-leak-detector": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.7.0.tgz", + "integrity": "sha512-kYA8IJcSYtST2BY9I+SMC32nDpBT3J2NvWJx8+JCuCdl/CR1I4EKUJROiP8XtCcxqgTTBGJNdbB1A8XRKbTetw==", + "dev": true, + "dependencies": { + "jest-get-type": "^29.6.3", + "pretty-format": "^29.7.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-matcher-utils": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.7.0.tgz", + "integrity": "sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==", + "dev": true, + "dependencies": { + "chalk": "^4.0.0", + "jest-diff": "^29.7.0", + "jest-get-type": "^29.6.3", + "pretty-format": "^29.7.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-matcher-utils/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/jest-matcher-utils/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/jest-matcher-utils/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/jest-matcher-utils/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "node_modules/jest-matcher-utils/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { "node": ">=8" } }, @@ -10357,23 +11183,23 @@ } }, "node_modules/jest-message-util": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-28.1.3.tgz", - "integrity": "sha512-PFdn9Iewbt575zKPf1286Ht9EPoJmYT7P0kY+RibeYZ2XtOr53pDLEFoTWXbd1h4JiGiWpTBC84fc8xMXQMb7g==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.7.0.tgz", + "integrity": "sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==", "dev": true, "dependencies": { "@babel/code-frame": "^7.12.13", - "@jest/types": "^28.1.3", + "@jest/types": "^29.6.3", "@types/stack-utils": "^2.0.0", "chalk": "^4.0.0", "graceful-fs": "^4.2.9", "micromatch": "^4.0.4", - "pretty-format": "^28.1.3", + "pretty-format": "^29.7.0", "slash": "^3.0.0", "stack-utils": "^2.0.3" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-message-util/node_modules/ansi-styles": { @@ -10447,16 +11273,17 @@ } }, "node_modules/jest-mock": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-28.1.3.tgz", - "integrity": "sha512-o3J2jr6dMMWYVH4Lh/NKmDXdosrsJgi4AviS8oXLujcjpCMBb1FMsblDnOXKZKfSiHLxYub1eS0IHuRXsio9eA==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.7.0.tgz", + "integrity": "sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw==", "dev": true, "dependencies": { - "@jest/types": "^28.1.3", - "@types/node": "*" + "@jest/types": "^29.6.3", + "@types/node": "*", + "jest-util": "^29.7.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-pnp-resolver": { @@ -10477,16 +11304,17 @@ } }, "node_modules/jest-preset-angular": { - "version": "12.2.5", - "resolved": "https://registry.npmjs.org/jest-preset-angular/-/jest-preset-angular-12.2.5.tgz", - "integrity": "sha512-TNWzvG9lZzkqsmQz8pkH3S7YVGE6mK2xmfyeGTKX9Lp9Y8C0H4ucHG7FFq4tqp/DWHkJuwAgu5YMY51ml4KDPQ==", + "version": "13.1.2", + "resolved": "https://registry.npmjs.org/jest-preset-angular/-/jest-preset-angular-13.1.2.tgz", + "integrity": "sha512-kuzuIch/YYTMaMnuGDaiZEu++Bjc5WskOAmMwqWO0Grpcd0SulqTOV70Gz6Q/ZOQuMye+LS4KPyIVfqnJr2e3g==", "dev": true, "dependencies": { "bs-logger": "^0.2.6", "esbuild-wasm": ">=0.13.8", - "jest-environment-jsdom": "^28.0.0", - "pretty-format": "^28.0.0", - "ts-jest": "^28.0.0" + "jest-environment-jsdom": "^29.0.0", + "jest-util": "^29.0.0", + "pretty-format": "^29.0.0", + "ts-jest": "^29.0.0" }, "engines": { "node": "^14.15.0 || >=16.10.0" @@ -10495,54 +11323,54 @@ "esbuild": ">=0.13.8" }, "peerDependencies": { - "@angular-devkit/build-angular": ">=12.2.18 <16.0.0", - "@angular/compiler-cli": ">=12.2.16 <16.0.0", - "@angular/core": ">=12.2.16 <16.0.0", - "@angular/platform-browser-dynamic": ">=12.2.16 <16.0.0", - "jest": "^28.0.0", - "typescript": ">=4.2" + "@angular-devkit/build-angular": ">=13.0.0 <17.0.0", + "@angular/compiler-cli": ">=13.0.0 <17.0.0", + "@angular/core": ">=13.0.0 <17.0.0", + "@angular/platform-browser-dynamic": ">=13.0.0 <17.0.0", + "jest": "^29.0.0", + "typescript": ">=4.4" } }, "node_modules/jest-regex-util": { - "version": "28.0.2", - "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-28.0.2.tgz", - "integrity": "sha512-4s0IgyNIy0y9FK+cjoVYoxamT7Zeo7MhzqRGx7YDYmaQn1wucY9rotiGkBzzcMXTtjrCAP/f7f+E0F7+fxPNdw==", + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.6.3.tgz", + "integrity": "sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==", "dev": true, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-resolve": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-28.1.3.tgz", - "integrity": "sha512-Z1W3tTjE6QaNI90qo/BJpfnvpxtaFTFw5CDgwpyE/Kz8U/06N1Hjf4ia9quUhCh39qIGWF1ZuxFiBiJQwSEYKQ==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.7.0.tgz", + "integrity": "sha512-IOVhZSrg+UvVAshDSDtHyFCCBUl/Q3AAJv8iZ6ZjnZ74xzvwuzLXid9IIIPgTnY62SJjfuupMKZsZQRsCvxEgA==", "dev": true, "dependencies": { "chalk": "^4.0.0", "graceful-fs": "^4.2.9", - "jest-haste-map": "^28.1.3", + "jest-haste-map": "^29.7.0", "jest-pnp-resolver": "^1.2.2", - "jest-util": "^28.1.3", - "jest-validate": "^28.1.3", + "jest-util": "^29.7.0", + "jest-validate": "^29.7.0", "resolve": "^1.20.0", - "resolve.exports": "^1.1.0", + "resolve.exports": "^2.0.0", "slash": "^3.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-resolve-dependencies": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-28.1.3.tgz", - "integrity": "sha512-qa0QO2Q0XzQoNPouMbCc7Bvtsem8eQgVPNkwn9LnS+R2n8DaVDPL/U1gngC0LTl1RYXJU0uJa2BMC2DbTfFrHA==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.7.0.tgz", + "integrity": "sha512-un0zD/6qxJ+S0et7WxeI3H5XSe9lTBBR7bOHCHXkKR6luG5mwDDlIzVQ0V5cZCuoTgEdcdwzTghYkTWfubi+nA==", "dev": true, "dependencies": { - "jest-regex-util": "^28.0.2", - "jest-snapshot": "^28.1.3" + "jest-regex-util": "^29.6.3", + "jest-snapshot": "^29.7.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-resolve/node_modules/ansi-styles": { @@ -10616,35 +11444,35 @@ } }, "node_modules/jest-runner": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-28.1.3.tgz", - "integrity": "sha512-GkMw4D/0USd62OVO0oEgjn23TM+YJa2U2Wu5zz9xsQB1MxWKDOlrnykPxnMsN0tnJllfLPinHTka61u0QhaxBA==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.7.0.tgz", + "integrity": "sha512-fsc4N6cPCAahybGBfTRcq5wFR6fpLznMg47sY5aDpsoejOcVYFb07AHuSnR0liMcPTgBsA3ZJL6kFOjPdoNipQ==", "dev": true, "dependencies": { - "@jest/console": "^28.1.3", - "@jest/environment": "^28.1.3", - "@jest/test-result": "^28.1.3", - "@jest/transform": "^28.1.3", - "@jest/types": "^28.1.3", + "@jest/console": "^29.7.0", + "@jest/environment": "^29.7.0", + "@jest/test-result": "^29.7.0", + "@jest/transform": "^29.7.0", + "@jest/types": "^29.6.3", "@types/node": "*", "chalk": "^4.0.0", - "emittery": "^0.10.2", + "emittery": "^0.13.1", "graceful-fs": "^4.2.9", - "jest-docblock": "^28.1.1", - "jest-environment-node": "^28.1.3", - "jest-haste-map": "^28.1.3", - "jest-leak-detector": "^28.1.3", - "jest-message-util": "^28.1.3", - "jest-resolve": "^28.1.3", - "jest-runtime": "^28.1.3", - "jest-util": "^28.1.3", - "jest-watcher": "^28.1.3", - "jest-worker": "^28.1.3", + "jest-docblock": "^29.7.0", + "jest-environment-node": "^29.7.0", + "jest-haste-map": "^29.7.0", + "jest-leak-detector": "^29.7.0", + "jest-message-util": "^29.7.0", + "jest-resolve": "^29.7.0", + "jest-runtime": "^29.7.0", + "jest-util": "^29.7.0", + "jest-watcher": "^29.7.0", + "jest-worker": "^29.7.0", "p-limit": "^3.1.0", "source-map-support": "0.5.13" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-runner/node_modules/ansi-styles": { @@ -10705,50 +11533,6 @@ "node": ">=8" } }, - "node_modules/jest-runner/node_modules/jest-worker": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-28.1.3.tgz", - "integrity": "sha512-CqRA220YV/6jCo8VWvAt1KKx6eek1VIHMPeLEbpcfSfkEeWyBNppynM/o6q+Wmw+sOhos2ml34wZbSX3G13//g==", - "dev": true, - "dependencies": { - "@types/node": "*", - "merge-stream": "^2.0.0", - "supports-color": "^8.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/jest-runner/node_modules/jest-worker/node_modules/supports-color": { - "version": "8.1.1", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", - "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", - "dev": true, - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/supports-color?sponsor=1" - } - }, - "node_modules/jest-runner/node_modules/p-limit": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", - "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", - "dev": true, - "dependencies": { - "yocto-queue": "^0.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/jest-runner/node_modules/source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", @@ -10781,36 +11565,36 @@ } }, "node_modules/jest-runtime": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-28.1.3.tgz", - "integrity": "sha512-NU+881ScBQQLc1JHG5eJGU7Ui3kLKrmwCPPtYsJtBykixrM2OhVQlpMmFWJjMyDfdkGgBMNjXCGB/ebzsgNGQw==", - "dev": true, - "dependencies": { - "@jest/environment": "^28.1.3", - "@jest/fake-timers": "^28.1.3", - "@jest/globals": "^28.1.3", - "@jest/source-map": "^28.1.2", - "@jest/test-result": "^28.1.3", - "@jest/transform": "^28.1.3", - "@jest/types": "^28.1.3", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.7.0.tgz", + "integrity": "sha512-gUnLjgwdGqW7B4LvOIkbKs9WGbn+QLqRQQ9juC6HndeDiezIwhDP+mhMwHWCEcfQ5RUXa6OPnFF8BJh5xegwwQ==", + "dev": true, + "dependencies": { + "@jest/environment": "^29.7.0", + "@jest/fake-timers": "^29.7.0", + "@jest/globals": "^29.7.0", + "@jest/source-map": "^29.6.3", + "@jest/test-result": "^29.7.0", + "@jest/transform": "^29.7.0", + "@jest/types": "^29.6.3", + "@types/node": "*", "chalk": "^4.0.0", "cjs-module-lexer": "^1.0.0", "collect-v8-coverage": "^1.0.0", - "execa": "^5.0.0", "glob": "^7.1.3", "graceful-fs": "^4.2.9", - "jest-haste-map": "^28.1.3", - "jest-message-util": "^28.1.3", - "jest-mock": "^28.1.3", - "jest-regex-util": "^28.0.2", - "jest-resolve": "^28.1.3", - "jest-snapshot": "^28.1.3", - "jest-util": "^28.1.3", + "jest-haste-map": "^29.7.0", + "jest-message-util": "^29.7.0", + "jest-mock": "^29.7.0", + "jest-regex-util": "^29.6.3", + "jest-resolve": "^29.7.0", + "jest-snapshot": "^29.7.0", + "jest-util": "^29.7.0", "slash": "^3.0.0", "strip-bom": "^4.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-runtime/node_modules/ansi-styles": { @@ -10828,16 +11612,6 @@ "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, - "node_modules/jest-runtime/node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, "node_modules/jest-runtime/node_modules/chalk": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", @@ -10872,26 +11646,6 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, - "node_modules/jest-runtime/node_modules/glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "dev": true, - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, "node_modules/jest-runtime/node_modules/has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", @@ -10901,18 +11655,6 @@ "node": ">=8" } }, - "node_modules/jest-runtime/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, "node_modules/jest-runtime/node_modules/supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", @@ -10926,37 +11668,34 @@ } }, "node_modules/jest-snapshot": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-28.1.3.tgz", - "integrity": "sha512-4lzMgtiNlc3DU/8lZfmqxN3AYD6GGLbl+72rdBpXvcV+whX7mDrREzkPdp2RnmfIiWBg1YbuFSkXduF2JcafJg==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.7.0.tgz", + "integrity": "sha512-Rm0BMWtxBcioHr1/OX5YCP8Uov4riHvKPknOGs804Zg9JGZgmIBkbtlxJC/7Z4msKYVbIJtfU+tKb8xlYNfdkw==", "dev": true, "dependencies": { "@babel/core": "^7.11.6", "@babel/generator": "^7.7.2", + "@babel/plugin-syntax-jsx": "^7.7.2", "@babel/plugin-syntax-typescript": "^7.7.2", - "@babel/traverse": "^7.7.2", "@babel/types": "^7.3.3", - "@jest/expect-utils": "^28.1.3", - "@jest/transform": "^28.1.3", - "@jest/types": "^28.1.3", - "@types/babel__traverse": "^7.0.6", - "@types/prettier": "^2.1.5", + "@jest/expect-utils": "^29.7.0", + "@jest/transform": "^29.7.0", + "@jest/types": "^29.6.3", "babel-preset-current-node-syntax": "^1.0.0", "chalk": "^4.0.0", - "expect": "^28.1.3", + "expect": "^29.7.0", "graceful-fs": "^4.2.9", - "jest-diff": "^28.1.3", - "jest-get-type": "^28.0.2", - "jest-haste-map": "^28.1.3", - "jest-matcher-utils": "^28.1.3", - "jest-message-util": "^28.1.3", - "jest-util": "^28.1.3", + "jest-diff": "^29.7.0", + "jest-get-type": "^29.6.3", + "jest-matcher-utils": "^29.7.0", + "jest-message-util": "^29.7.0", + "jest-util": "^29.7.0", "natural-compare": "^1.4.0", - "pretty-format": "^28.1.3", - "semver": "^7.3.5" + "pretty-format": "^29.7.0", + "semver": "^7.5.3" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-snapshot/node_modules/ansi-styles": { @@ -11030,12 +11769,12 @@ } }, "node_modules/jest-util": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-28.1.3.tgz", - "integrity": "sha512-XdqfpHwpcSRko/C35uLYFM2emRAltIIKZiJ9eAmhjsj0CqZMa0p1ib0R5fWIqGhn1a103DebTbpqIaP1qCQ6tQ==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz", + "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==", "dev": true, "dependencies": { - "@jest/types": "^28.1.3", + "@jest/types": "^29.6.3", "@types/node": "*", "chalk": "^4.0.0", "ci-info": "^3.2.0", @@ -11043,7 +11782,7 @@ "picomatch": "^2.2.3" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-util/node_modules/ansi-styles": { @@ -11117,20 +11856,20 @@ } }, "node_modules/jest-validate": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-28.1.3.tgz", - "integrity": "sha512-SZbOGBWEsaTxBGCOpsRWlXlvNkvTkY0XxRfh7zYmvd8uL5Qzyg0CHAXiXKROflh801quA6+/DsT4ODDthOC/OA==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.7.0.tgz", + "integrity": "sha512-ZB7wHqaRGVw/9hST/OuFUReG7M8vKeq0/J2egIGLdvjHCmYqGARhzXmtgi+gVeZ5uXFF219aOc3Ls2yLg27tkw==", "dev": true, "dependencies": { - "@jest/types": "^28.1.3", + "@jest/types": "^29.6.3", "camelcase": "^6.2.0", "chalk": "^4.0.0", - "jest-get-type": "^28.0.2", + "jest-get-type": "^29.6.3", "leven": "^3.1.0", - "pretty-format": "^28.1.3" + "pretty-format": "^29.7.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-validate/node_modules/ansi-styles": { @@ -11216,22 +11955,22 @@ } }, "node_modules/jest-watcher": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-28.1.3.tgz", - "integrity": "sha512-t4qcqj9hze+jviFPUN3YAtAEeFnr/azITXQEMARf5cMwKY2SMBRnCQTXLixTl20OR6mLh9KLMrgVJgJISym+1g==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.7.0.tgz", + "integrity": "sha512-49Fg7WXkU3Vl2h6LbLtMQ/HyB6rXSIX7SqvBLQmssRBGN9I0PNvPmAmCWSOY6SOvrjhI/F7/bGAv9RtnsPA03g==", "dev": true, "dependencies": { - "@jest/test-result": "^28.1.3", - "@jest/types": "^28.1.3", + "@jest/test-result": "^29.7.0", + "@jest/types": "^29.6.3", "@types/node": "*", "ansi-escapes": "^4.2.1", "chalk": "^4.0.0", - "emittery": "^0.10.2", - "jest-util": "^28.1.3", + "emittery": "^0.13.1", + "jest-util": "^29.7.0", "string-length": "^4.0.1" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-watcher/node_modules/ansi-styles": { @@ -11305,17 +12044,18 @@ } }, "node_modules/jest-worker": { - "version": "27.5.1", - "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz", - "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.7.0.tgz", + "integrity": "sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==", "dev": true, "dependencies": { "@types/node": "*", + "jest-util": "^29.7.0", "merge-stream": "^2.0.0", "supports-color": "^8.0.0" }, "engines": { - "node": ">= 10.13.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-worker/node_modules/has-flag": { @@ -11342,14 +12082,13 @@ "url": "https://github.com/chalk/supports-color?sponsor=1" } }, - "node_modules/js-sdsl": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.2.0.tgz", - "integrity": "sha512-dyBIzQBDkCqCu+0upx25Y2jGdbTGxE9fshMsCdK0ViOongpV+n5tXRcZY9v7CaVQ79AGS9KA1KHtojxiM7aXSQ==", + "node_modules/jiti": { + "version": "1.21.0", + "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.0.tgz", + "integrity": "sha512-gFqAIbuKyyso/3G2qhiO2OM6shY6EPP/R0+mkDbyspxKazh8BXDC5FiFsUjlczgdNz/vfra0da2y+aHrusLG/Q==", "dev": true, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/js-sdsl" + "bin": { + "jiti": "bin/jiti.js" } }, "node_modules/js-tokens": { @@ -11372,23 +12111,23 @@ } }, "node_modules/jsdom": { - "version": "19.0.0", - "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-19.0.0.tgz", - "integrity": "sha512-RYAyjCbxy/vri/CfnjUWJQQtZ3LKlLnDqj+9XLNnJPgEGeirZs3hllKR20re8LUZ6o1b1X4Jat+Qd26zmP41+A==", + "version": "16.7.0", + "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.7.0.tgz", + "integrity": "sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw==", "dev": true, "dependencies": { "abab": "^2.0.5", - "acorn": "^8.5.0", + "acorn": "^8.2.4", "acorn-globals": "^6.0.0", - "cssom": "^0.5.0", + "cssom": "^0.4.4", "cssstyle": "^2.3.0", - "data-urls": "^3.0.1", - "decimal.js": "^10.3.1", - "domexception": "^4.0.0", + "data-urls": "^2.0.0", + "decimal.js": "^10.2.1", + "domexception": "^2.0.1", "escodegen": "^2.0.0", - "form-data": "^4.0.0", - "html-encoding-sniffer": "^3.0.0", - "http-proxy-agent": "^5.0.0", + "form-data": "^3.0.0", + "html-encoding-sniffer": "^2.0.1", + "http-proxy-agent": "^4.0.1", "https-proxy-agent": "^5.0.0", "is-potential-custom-element-name": "^1.0.1", "nwsapi": "^2.2.0", @@ -11397,16 +12136,16 @@ "symbol-tree": "^3.2.4", "tough-cookie": "^4.0.0", "w3c-hr-time": "^1.0.2", - "w3c-xmlserializer": "^3.0.0", - "webidl-conversions": "^7.0.0", - "whatwg-encoding": "^2.0.0", - "whatwg-mimetype": "^3.0.0", - "whatwg-url": "^10.0.0", - "ws": "^8.2.3", - "xml-name-validator": "^4.0.0" + "w3c-xmlserializer": "^2.0.0", + "webidl-conversions": "^6.1.0", + "whatwg-encoding": "^1.0.5", + "whatwg-mimetype": "^2.3.0", + "whatwg-url": "^8.5.0", + "ws": "^7.4.6", + "xml-name-validator": "^3.0.0" }, "engines": { - "node": ">=12" + "node": ">=10" }, "peerDependencies": { "canvas": "^2.5.0" @@ -11435,6 +12174,12 @@ "node": ">=4" } }, + "node_modules/json-buffer": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", + "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", + "dev": true + }, "node_modules/json-parse-even-better-errors": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", @@ -11494,6 +12239,15 @@ "source-map-support": "^0.5.5" } }, + "node_modules/keyv": { + "version": "4.5.4", + "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", + "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", + "dev": true, + "dependencies": { + "json-buffer": "3.0.1" + } + }, "node_modules/kind-of": { "version": "6.0.3", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", @@ -11521,6 +12275,16 @@ "node": ">= 8" } }, + "node_modules/launch-editor": { + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/launch-editor/-/launch-editor-2.6.1.tgz", + "integrity": "sha512-eB/uXmFVpY4zezmGp5XtU21kwo7GBbKB+EQ+UZeWtGb9yAM5xt/Evk+lYH3eRNAtId+ej4u7TYPFZ07w4s7rRw==", + "dev": true, + "dependencies": { + "picocolors": "^1.0.0", + "shell-quote": "^1.8.1" + } + }, "node_modules/less": { "version": "4.1.3", "resolved": "https://registry.npmjs.org/less/-/less-4.1.3.tgz", @@ -11582,9 +12346,9 @@ } }, "node_modules/less/node_modules/semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", "dev": true, "optional": true, "bin": { @@ -11795,48 +12559,33 @@ "yallist": "^3.0.2" } }, - "node_modules/lru-cache/node_modules/yallist": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", - "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", - "dev": true - }, "node_modules/magic-string": { - "version": "0.27.0", - "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.27.0.tgz", - "integrity": "sha512-8UnnX2PeRAPZuN12svgR9j7M1uWMovg/CEnIwIG0LFkXSJJe4PdfUGiTGl8V9bsBHFUtfVINcSyYxd7q+kx9fA==", + "version": "0.30.1", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.1.tgz", + "integrity": "sha512-mbVKXPmS0z0G4XqFDCTllmDQ6coZzn94aMlb0o/A4HEHJCKcanlDZwYJgwnkmgD3jyWhUgj9VsPrfd972yPffA==", "dev": true, "dependencies": { - "@jridgewell/sourcemap-codec": "^1.4.13" + "@jridgewell/sourcemap-codec": "^1.4.15" }, "engines": { "node": ">=12" } }, "node_modules/make-dir": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", - "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz", + "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==", "dev": true, "dependencies": { - "semver": "^6.0.0" + "semver": "^7.5.3" }, "engines": { - "node": ">=8" + "node": ">=10" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/make-dir/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true, - "bin": { - "semver": "bin/semver.js" - } - }, "node_modules/make-error": { "version": "1.3.6", "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz", @@ -11883,6 +12632,24 @@ "node": "^12.13.0 || ^14.15.0 || >=16.0.0" } }, + "node_modules/make-fetch-happen/node_modules/@tootallnate/once": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz", + "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==", + "dev": true, + "engines": { + "node": ">= 10" + } + }, + "node_modules/make-fetch-happen/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0" + } + }, "node_modules/make-fetch-happen/node_modules/cacache": { "version": "16.1.3", "resolved": "https://registry.npmjs.org/cacache/-/cacache-16.1.3.tgz", @@ -11924,15 +12691,60 @@ "node": ">= 8" } }, + "node_modules/make-fetch-happen/node_modules/glob": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", + "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", + "dev": true, + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^5.0.1", + "once": "^1.3.0" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/make-fetch-happen/node_modules/http-proxy-agent": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz", + "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==", + "dev": true, + "dependencies": { + "@tootallnate/once": "2", + "agent-base": "6", + "debug": "4" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/make-fetch-happen/node_modules/lru-cache": { - "version": "7.14.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.14.1.tgz", - "integrity": "sha512-ysxwsnTKdAx96aTRdhDOCQfDgbHnt8SK0KY8SEjO0wHinhWOFTESbjVCMPbU1uGXg/ch4lifqx0wfjOawU2+WA==", + "version": "7.18.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", + "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", "dev": true, "engines": { "node": ">=12" } }, + "node_modules/make-fetch-happen/node_modules/minimatch": { + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", + "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", + "dev": true, + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/make-fetch-happen/node_modules/minipass": { "version": "3.3.6", "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", @@ -11981,6 +12793,12 @@ "node": "^12.13.0 || ^14.15.0 || >=16.0.0" } }, + "node_modules/make-fetch-happen/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true + }, "node_modules/makeerror": { "version": "1.0.12", "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz", @@ -12000,12 +12818,12 @@ } }, "node_modules/memfs": { - "version": "3.4.13", - "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.4.13.tgz", - "integrity": "sha512-omTM41g3Skpvx5dSYeZIbXKcXoAVc/AoMNwn9TKx++L/gaen/+4TTttmu8ZSch5vfVJ8uJvGbroTsIlslRg6lg==", + "version": "3.5.3", + "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.5.3.tgz", + "integrity": "sha512-UERzLsxzllchadvbPs5aolHh65ISpKpM+ccLbOJ8/vvpBKmAWf+la7dXFy7Mr0ySHbdHrFv5kGFCUHHe6GFEmw==", "dev": true, "dependencies": { - "fs-monkey": "^1.0.3" + "fs-monkey": "^1.0.4" }, "engines": { "node": ">= 4.0.0" @@ -12097,9 +12915,9 @@ } }, "node_modules/mini-css-extract-plugin": { - "version": "2.7.2", - "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.7.2.tgz", - "integrity": "sha512-EdlUizq13o0Pd+uCp+WO/JpkLvHRVGt97RqfeGhXqAcorYo1ypJSpkV+WDT0vY/kmh/p7wRdJNJtuyK540PXDw==", + "version": "2.7.6", + "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.7.6.tgz", + "integrity": "sha512-Qk7HcgaPkGG6eD77mLvZS1nmxlao3j+9PkrT9Uc7HAE1id3F41+DdBRYRYkbyfNRGzm8/YWtzhw7nVPmwhqTQw==", "dev": true, "dependencies": { "schema-utils": "^4.0.0" @@ -12122,34 +12940,31 @@ "dev": true }, "node_modules/minimatch": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.0.tgz", - "integrity": "sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", "dev": true, "dependencies": { - "brace-expansion": "^2.0.1" + "brace-expansion": "^1.1.7" }, "engines": { - "node": ">=10" + "node": "*" } }, "node_modules/minimist": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz", - "integrity": "sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==", + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", + "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", "dev": true, "funding": { "url": "https://github.com/sponsors/ljharb" } }, "node_modules/minipass": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-4.0.0.tgz", - "integrity": "sha512-g2Uuh2jEKoht+zvO6vJqXmYpflPqzRBT+Th2h01DKh5z7wbY/AZ2gCQ78cP70YoHPyFdY30YBV5WxgLOEwOykw==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", + "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", "dev": true, - "dependencies": { - "yallist": "^4.0.0" - }, "engines": { "node": ">=8" } @@ -12178,6 +12993,12 @@ "node": ">=8" } }, + "node_modules/minipass-collect/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true + }, "node_modules/minipass-fetch": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-2.1.2.tgz", @@ -12207,6 +13028,12 @@ "node": ">=8" } }, + "node_modules/minipass-fetch/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true + }, "node_modules/minipass-flush": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz", @@ -12231,6 +13058,12 @@ "node": ">=8" } }, + "node_modules/minipass-flush/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true + }, "node_modules/minipass-json-stream": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/minipass-json-stream/-/minipass-json-stream-1.0.1.tgz", @@ -12253,6 +13086,12 @@ "node": ">=8" } }, + "node_modules/minipass-json-stream/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true + }, "node_modules/minipass-pipeline": { "version": "1.2.4", "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz", @@ -12277,6 +13116,12 @@ "node": ">=8" } }, + "node_modules/minipass-pipeline/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true + }, "node_modules/minipass-sized": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz", @@ -12301,6 +13146,12 @@ "node": ">=8" } }, + "node_modules/minipass-sized/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true + }, "node_modules/minizlib": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", @@ -12326,6 +13177,12 @@ "node": ">=8" } }, + "node_modules/minizlib/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true + }, "node_modules/mkdirp": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", @@ -12347,6 +13204,15 @@ "node": "*" } }, + "node_modules/mrmime": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/mrmime/-/mrmime-1.0.1.tgz", + "integrity": "sha512-hzzEagAgDyoU1Q6yg5uI+AorQgdvMCur3FcKf7NhMKWsaYg+RnbTyHRa/9IlLF9rf455MOCtcqqrQQ83pPP7Uw==", + "dev": true, + "engines": { + "node": ">=10" + } + }, "node_modules/ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", @@ -12373,10 +13239,16 @@ "dev": true }, "node_modules/nanoid": { - "version": "3.3.4", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz", - "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==", + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz", + "integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==", "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], "bin": { "nanoid": "bin/nanoid.cjs" }, @@ -12453,9 +13325,9 @@ "dev": true }, "node_modules/ngx-mask": { - "version": "15.0.2", - "resolved": "https://registry.npmjs.org/ngx-mask/-/ngx-mask-15.0.2.tgz", - "integrity": "sha512-O0w4+rwcrIWTu60j9bPAHk7hDrvrriCfniJ1DVL4OSWqS8fvlCLalld+oTNelMatkIOCyR/TTyhkm+38DXPUrg==", + "version": "16.3.9", + "resolved": "https://registry.npmjs.org/ngx-mask/-/ngx-mask-16.3.9.tgz", + "integrity": "sha512-cptsvlI4OLI8Tpj23ZgSQDKz5jksyWGzAuEEn5pd58cq2oFGeeHZS2i1SQQi8kp+a+Dh/2RvDsfFmDWmI5Ln9w==", "dependencies": { "tslib": "^2.3.0" }, @@ -12497,12 +13369,13 @@ } }, "node_modules/node-gyp": { - "version": "9.3.1", - "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-9.3.1.tgz", - "integrity": "sha512-4Q16ZCqq3g8awk6UplT7AuxQ35XN4R/yf/+wSAwcBUAjg7l58RTactWaP8fIDTi0FzI7YcVLujwExakZlfWkXg==", + "version": "9.4.1", + "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-9.4.1.tgz", + "integrity": "sha512-OQkWKbjQKbGkMf/xqI1jjy3oCTgMKJac58G2+bjZb3fza6gW2YrCSdMQYaoTb70crvE//Gngr4f0AgVHmqHvBQ==", "dev": true, "dependencies": { "env-paths": "^2.2.0", + "exponential-backoff": "^3.1.1", "glob": "^7.1.4", "graceful-fs": "^4.2.6", "make-fetch-happen": "^10.0.3", @@ -12521,9 +13394,9 @@ } }, "node_modules/node-gyp-build": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.6.0.tgz", - "integrity": "sha512-NTZVKn9IylLwUzaKjkas1e4u2DLNcV4rdYagA4PWdPwW87Bi7z+BznyKSRwS/761tV/lzCGXplWsiaMjLqP2zQ==", + "version": "4.6.1", + "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.6.1.tgz", + "integrity": "sha512-24vnklJmyRS8ViBNI8KbtK/r/DmXQMRiOMXTNz2nrTnAYUwjmEEbnnpB/+kt+yWRv73bPsSPRFddrcIbAxSiMQ==", "dev": true, "optional": true, "bin": { @@ -12532,48 +13405,6 @@ "node-gyp-build-test": "build-test.js" } }, - "node_modules/node-gyp/node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/node-gyp/node_modules/glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "dev": true, - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/node-gyp/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, "node_modules/node-int64": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz", @@ -12581,9 +13412,9 @@ "dev": true }, "node_modules/node-releases": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.6.tgz", - "integrity": "sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg==", + "version": "2.0.13", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.13.tgz", + "integrity": "sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==", "dev": true }, "node_modules/nopt": { @@ -12647,9 +13478,9 @@ } }, "node_modules/npm-install-checks": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-6.0.0.tgz", - "integrity": "sha512-SBU9oFglRVZnfElwAtF14NivyulDqF1VKqqwNsFW9HDcbHMAPHpRSsVFgKuwFGq/hVvWZExz62Th0kvxn/XE7Q==", + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-6.3.0.tgz", + "integrity": "sha512-W29RiK/xtpCGqn6f3ixfRYGk+zRyr+Ew9F2E20BfXxT5/euLdA/Nm7fO7OeTGuAmTs30cpgInyJ0cYe708YTZw==", "dev": true, "dependencies": { "semver": "^7.1.1" @@ -12659,9 +13490,9 @@ } }, "node_modules/npm-normalize-package-bin": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-3.0.0.tgz", - "integrity": "sha512-g+DPQSkusnk7HYXr75NtzkIP4+N81i3RPsGFidF3DzHd9MT9wWngmqoeg/fnHFz5MNdtG4w03s+QnhewSLTT2Q==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-3.0.1.tgz", + "integrity": "sha512-dMxCf+zZ+3zeQZXKxmyuCKlIDPGuv8EF940xbkC4kQVDTtqoh6rJFO+JTKSA6/Rwi0getWmtuy4Itup0AMcaDQ==", "dev": true, "engines": { "node": "^14.17.0 || ^16.13.0 || >=18.0.0" @@ -12710,13 +13541,13 @@ } }, "node_modules/npm-registry-fetch": { - "version": "14.0.3", - "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-14.0.3.tgz", - "integrity": "sha512-YaeRbVNpnWvsGOjX2wk5s85XJ7l1qQBGAp724h8e2CZFFhMSuw9enom7K1mWVUtvXO1uUSFIAPofQK0pPN0ZcA==", + "version": "14.0.5", + "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-14.0.5.tgz", + "integrity": "sha512-kIDMIo4aBm6xg7jOttupWZamsZRkAqMqwqqbVXnUqstY5+tapvv6bkH/qMR76jdgV+YljEUCyWx3hRYMrJiAgA==", "dev": true, "dependencies": { "make-fetch-happen": "^11.0.0", - "minipass": "^4.0.0", + "minipass": "^5.0.0", "minipass-fetch": "^3.0.0", "minipass-json-stream": "^1.0.1", "minizlib": "^2.1.2", @@ -12727,30 +13558,52 @@ "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, + "node_modules/npm-registry-fetch/node_modules/@tootallnate/once": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz", + "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==", + "dev": true, + "engines": { + "node": ">= 10" + } + }, + "node_modules/npm-registry-fetch/node_modules/http-proxy-agent": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz", + "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==", + "dev": true, + "dependencies": { + "@tootallnate/once": "2", + "agent-base": "6", + "debug": "4" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/npm-registry-fetch/node_modules/lru-cache": { - "version": "7.14.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.14.1.tgz", - "integrity": "sha512-ysxwsnTKdAx96aTRdhDOCQfDgbHnt8SK0KY8SEjO0wHinhWOFTESbjVCMPbU1uGXg/ch4lifqx0wfjOawU2+WA==", + "version": "7.18.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", + "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", "dev": true, "engines": { "node": ">=12" } }, "node_modules/npm-registry-fetch/node_modules/make-fetch-happen": { - "version": "11.0.2", - "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-11.0.2.tgz", - "integrity": "sha512-5n/Pq41w/uZghpdlXAY5kIM85RgJThtTH/NYBRAZ9VUOBWV90USaQjwGrw76fZP3Lj5hl/VZjpVvOaRBMoL/2w==", + "version": "11.1.1", + "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-11.1.1.tgz", + "integrity": "sha512-rLWS7GCSTcEujjVBs2YqG7Y4643u8ucvCJeSRqiLYhesrDuzeuFIk37xREzAsfQaqzl8b9rNCE4m6J8tvX4Q8w==", "dev": true, "dependencies": { "agentkeepalive": "^4.2.1", "cacache": "^17.0.0", - "http-cache-semantics": "^4.1.0", + "http-cache-semantics": "^4.1.1", "http-proxy-agent": "^5.0.0", "https-proxy-agent": "^5.0.0", "is-lambda": "^1.0.1", "lru-cache": "^7.7.1", - "minipass": "^4.0.0", - "minipass-collect": "^1.0.2", + "minipass": "^5.0.0", "minipass-fetch": "^3.0.0", "minipass-flush": "^1.0.5", "minipass-pipeline": "^1.2.4", @@ -12764,12 +13617,12 @@ } }, "node_modules/npm-registry-fetch/node_modules/minipass-fetch": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.1.tgz", - "integrity": "sha512-t9/wowtf7DYkwz8cfMSt0rMwiyNIBXf5CKZ3S5ZMqRqMYT0oLTp0x1WorMI9WTwvaPg21r1JbFxJMum8JrLGfw==", + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.4.tgz", + "integrity": "sha512-jHAqnA728uUpIaFm7NWsCnqKT6UqZz7GcI/bDpPATuwYyKwJwW0remxSCxUlKiEty+eopHGa3oc8WxgQ1FFJqg==", "dev": true, "dependencies": { - "minipass": "^4.0.0", + "minipass": "^7.0.3", "minipass-sized": "^1.0.3", "minizlib": "^2.1.2" }, @@ -12780,6 +13633,15 @@ "encoding": "^0.1.13" } }, + "node_modules/npm-registry-fetch/node_modules/minipass-fetch/node_modules/minipass": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz", + "integrity": "sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==", + "dev": true, + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, "node_modules/npm-run-path": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", @@ -12820,20 +13682,29 @@ } }, "node_modules/nwsapi": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.2.tgz", - "integrity": "sha512-90yv+6538zuvUMnN+zCr8LuV6bPFdq50304114vJYJ8RDyK8D5O9Phpbd6SZWgI7PwzmmfN1upeOJlvybDSgCw==", + "version": "2.2.7", + "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.7.tgz", + "integrity": "sha512-ub5E4+FBPKwAZx0UwIQOjYWGHTEq5sPqHQNRN8Z9e4A7u3Tj1weLJsL59yH9vmvqEtBHaOmT6cYQKIZOxp35FQ==", "dev": true }, "node_modules/object-inspect": { - "version": "1.12.3", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz", - "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==", + "version": "1.13.1", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz", + "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==", "dev": true, "funding": { "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/object-path": { + "version": "0.11.8", + "resolved": "https://registry.npmjs.org/object-path/-/object-path-0.11.8.tgz", + "integrity": "sha512-YJjNZrlXJFM42wTBn6zgOJVar9KFJvzx6sTWDte8sWZF//cnjl0BxHNpfZx+ZffXX63A9q0b1zsFiBX4g4X5KA==", + "dev": true, + "engines": { + "node": ">= 10.12.0" + } + }, "node_modules/obuf": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz", @@ -12886,9 +13757,9 @@ } }, "node_modules/open": { - "version": "8.4.0", - "resolved": "https://registry.npmjs.org/open/-/open-8.4.0.tgz", - "integrity": "sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==", + "version": "8.4.2", + "resolved": "https://registry.npmjs.org/open/-/open-8.4.2.tgz", + "integrity": "sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==", "dev": true, "dependencies": { "define-lazy-prop": "^2.0.0", @@ -12903,17 +13774,17 @@ } }, "node_modules/optionator": { - "version": "0.9.1", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz", - "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==", + "version": "0.9.3", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz", + "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==", "dev": true, "dependencies": { + "@aashutoshrathi/word-wrap": "^1.2.3", "deep-is": "^0.1.3", "fast-levenshtein": "^2.0.6", "levn": "^0.4.1", "prelude-ls": "^1.2.1", - "type-check": "^0.4.0", - "word-wrap": "^1.2.3" + "type-check": "^0.4.0" }, "engines": { "node": ">= 0.8.0" @@ -13022,15 +13893,15 @@ } }, "node_modules/p-limit": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", "dev": true, "dependencies": { - "p-try": "^2.0.0" + "yocto-queue": "^0.1.0" }, "engines": { - "node": ">=6" + "node": ">=10" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" @@ -13048,6 +13919,21 @@ "node": ">=8" } }, + "node_modules/p-locate/node_modules/p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "dev": true, + "dependencies": { + "p-try": "^2.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/p-map": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz", @@ -13095,9 +13981,9 @@ } }, "node_modules/pacote": { - "version": "15.0.8", - "resolved": "https://registry.npmjs.org/pacote/-/pacote-15.0.8.tgz", - "integrity": "sha512-UlcumB/XS6xyyIMwg/WwMAyUmga+RivB5KgkRwA1hZNtrx+0Bt41KxHCvg1kr0pZ/ZeD8qjhW4fph6VaYRCbLw==", + "version": "15.2.0", + "resolved": "https://registry.npmjs.org/pacote/-/pacote-15.2.0.tgz", + "integrity": "sha512-rJVZeIwHTUta23sIZgEIM62WYwbmGbThdbnkt81ravBplQv+HjyroqnLRNH2+sLJHcGZmLRmhPwACqhfTcOmnA==", "dev": true, "dependencies": { "@npmcli/git": "^4.0.0", @@ -13106,7 +13992,7 @@ "@npmcli/run-script": "^6.0.0", "cacache": "^17.0.0", "fs-minipass": "^3.0.0", - "minipass": "^4.0.0", + "minipass": "^5.0.0", "npm-package-arg": "^10.0.0", "npm-packlist": "^7.0.0", "npm-pick-manifest": "^8.0.0", @@ -13115,6 +14001,7 @@ "promise-retry": "^2.0.1", "read-package-json": "^6.0.0", "read-package-json-fast": "^3.0.0", + "sigstore": "^1.3.0", "ssri": "^10.0.0", "tar": "^6.1.11" }, @@ -13174,8 +14061,7 @@ "version": "7.1.2", "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.1.2.tgz", "integrity": "sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==", - "optional": true, - "peer": true, + "devOptional": true, "dependencies": { "entities": "^4.4.0" }, @@ -13184,62 +14070,29 @@ } }, "node_modules/parse5-html-rewriting-stream": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/parse5-html-rewriting-stream/-/parse5-html-rewriting-stream-6.0.1.tgz", - "integrity": "sha512-vwLQzynJVEfUlURxgnf51yAJDQTtVpNyGD8tKi2Za7m+akukNHxCcUQMAa/mUGLhCeicFdpy7Tlvj8ZNKadprg==", - "dev": true, - "dependencies": { - "parse5": "^6.0.1", - "parse5-sax-parser": "^6.0.1" - } - }, - "node_modules/parse5-html-rewriting-stream/node_modules/parse5": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz", - "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==", - "dev": true - }, - "node_modules/parse5-htmlparser2-tree-adapter": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz", - "integrity": "sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/parse5-html-rewriting-stream/-/parse5-html-rewriting-stream-7.0.0.tgz", + "integrity": "sha512-mazCyGWkmCRWDI15Zp+UiCqMp/0dgEmkZRvhlsqqKYr4SsVm/TvnSpD9fCvqCA2zoWJcfRym846ejWBBHRiYEg==", "dev": true, "dependencies": { - "parse5": "^6.0.1" + "entities": "^4.3.0", + "parse5": "^7.0.0", + "parse5-sax-parser": "^7.0.0" + }, + "funding": { + "url": "https://github.com/inikulin/parse5?sponsor=1" } }, - "node_modules/parse5-htmlparser2-tree-adapter/node_modules/parse5": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz", - "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==", - "dev": true - }, "node_modules/parse5-sax-parser": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/parse5-sax-parser/-/parse5-sax-parser-6.0.1.tgz", - "integrity": "sha512-kXX+5S81lgESA0LsDuGjAlBybImAChYRMT+/uKCEXFBFOeEhS52qUCydGhU3qLRD8D9DVjaUo821WK7DM4iCeg==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/parse5-sax-parser/-/parse5-sax-parser-7.0.0.tgz", + "integrity": "sha512-5A+v2SNsq8T6/mG3ahcz8ZtQ0OUFTatxPbeidoMB7tkJSGDY3tdfl4MHovtLQHkEn5CGxijNWRQHhRQ6IRpXKg==", "dev": true, "dependencies": { - "parse5": "^6.0.1" - } - }, - "node_modules/parse5-sax-parser/node_modules/parse5": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz", - "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==", - "dev": true - }, - "node_modules/parse5/node_modules/entities": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/entities/-/entities-4.4.0.tgz", - "integrity": "sha512-oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA==", - "optional": true, - "peer": true, - "engines": { - "node": ">=0.12" + "parse5": "^7.0.0" }, "funding": { - "url": "https://github.com/fb55/entities?sponsor=1" + "url": "https://github.com/inikulin/parse5?sponsor=1" } }, "node_modules/parseurl": { @@ -13284,6 +14137,31 @@ "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", "dev": true }, + "node_modules/path-scurry": { + "version": "1.10.1", + "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.10.1.tgz", + "integrity": "sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ==", + "dev": true, + "dependencies": { + "lru-cache": "^9.1.1 || ^10.0.0", + "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/path-scurry/node_modules/lru-cache": { + "version": "10.0.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.0.1.tgz", + "integrity": "sha512-IJ4uwUTi2qCccrioU6g9g/5rvvVl13bsdczUUcqbciD9iLr095yj8DQKdObriEvuNSx325N1rV1O0sJFszx75g==", + "dev": true, + "engines": { + "node": "14 || >=16.14" + } + }, "node_modules/path-to-regexp": { "version": "0.1.7", "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", @@ -13328,18 +14206,18 @@ } }, "node_modules/pirates": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.5.tgz", - "integrity": "sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ==", + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz", + "integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==", "dev": true, "engines": { "node": ">= 6" } }, "node_modules/piscina": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/piscina/-/piscina-3.2.0.tgz", - "integrity": "sha512-yn/jMdHRw+q2ZJhFhyqsmANcbF6V2QwmD84c6xRau+QpQOmtrBCoRGdvTfeuFDYXB5W2m6MfLkjkvQa9lUSmIA==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/piscina/-/piscina-4.0.0.tgz", + "integrity": "sha512-641nAmJS4k4iqpNUqfggqUBUMmlw0ZoM5VZKdQkV2e970Inn3Tk9kroCc1wpsYLD07vCwpys5iY0d3xI/9WkTg==", "dev": true, "dependencies": { "eventemitter-asyncresource": "^1.0.0", @@ -13351,21 +14229,106 @@ } }, "node_modules/pkg-dir": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", - "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-7.0.0.tgz", + "integrity": "sha512-Ie9z/WINcxxLp27BKOCHGde4ITq9UklYKDzVo1nhk5sqGEXU3FpkwP5GM2voTGJkGd9B3Otl+Q4uwSOeSUtOBA==", "dev": true, "dependencies": { - "find-up": "^4.0.0" + "find-up": "^6.3.0" }, "engines": { - "node": ">=8" + "node": ">=14.16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/pkg-dir/node_modules/find-up": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-6.3.0.tgz", + "integrity": "sha512-v2ZsoEuVHYy8ZIlYqwPe/39Cy+cFDzp4dXPaxNvkEuouymu+2Jbz0PxpKarJHYJTmv2HWT3O382qY8l4jMWthw==", + "dev": true, + "dependencies": { + "locate-path": "^7.1.0", + "path-exists": "^5.0.0" + }, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/pkg-dir/node_modules/locate-path": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-7.2.0.tgz", + "integrity": "sha512-gvVijfZvn7R+2qyPX8mAuKcFGDf6Nc61GdvGafQsHL0sBIxfKzA+usWn4GFC/bk+QdwPUD4kWFJLhElipq+0VA==", + "dev": true, + "dependencies": { + "p-locate": "^6.0.0" + }, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/pkg-dir/node_modules/p-limit": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-4.0.0.tgz", + "integrity": "sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==", + "dev": true, + "dependencies": { + "yocto-queue": "^1.0.0" + }, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/pkg-dir/node_modules/p-locate": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-6.0.0.tgz", + "integrity": "sha512-wPrq66Llhl7/4AGC6I+cqxT07LhXvWL08LNXz1fENOw0Ap4sRZZ/gZpTTJ5jpurzzzfS2W/Ge9BY3LgLjCShcw==", + "dev": true, + "dependencies": { + "p-limit": "^4.0.0" + }, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/pkg-dir/node_modules/path-exists": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-5.0.0.tgz", + "integrity": "sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ==", + "dev": true, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + } + }, + "node_modules/pkg-dir/node_modules/yocto-queue": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.0.0.tgz", + "integrity": "sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==", + "dev": true, + "engines": { + "node": ">=12.20" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/postcss": { - "version": "8.4.21", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.21.tgz", - "integrity": "sha512-tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg==", + "version": "8.4.31", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz", + "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==", "dev": true, "funding": [ { @@ -13375,10 +14338,14 @@ { "type": "tidelift", "url": "https://tidelift.com/funding/github/npm/postcss" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" } ], "dependencies": { - "nanoid": "^3.3.4", + "nanoid": "^3.3.6", "picocolors": "^1.0.0", "source-map-js": "^1.0.2" }, @@ -13387,13 +14354,13 @@ } }, "node_modules/postcss-loader": { - "version": "7.0.2", - "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-7.0.2.tgz", - "integrity": "sha512-fUJzV/QH7NXUAqV8dWJ9Lg4aTkDCezpTS5HgJ2DvqznexTbSTxgi/dTECvTZ15BwKTtk8G/bqI/QTu2HPd3ZCg==", + "version": "7.3.3", + "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-7.3.3.tgz", + "integrity": "sha512-YgO/yhtevGO/vJePCQmTxiaEwER94LABZN0ZMT4A0vsak9TpO+RvKRs7EmJ8peIlB9xfXCsS7M8LjqncsUZ5HA==", "dev": true, "dependencies": { - "cosmiconfig": "^7.0.0", - "klona": "^2.0.5", + "cosmiconfig": "^8.2.0", + "jiti": "^1.18.2", "semver": "^7.3.8" }, "engines": { @@ -13408,6 +14375,65 @@ "webpack": "^5.0.0" } }, + "node_modules/postcss-loader/node_modules/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true + }, + "node_modules/postcss-loader/node_modules/cosmiconfig": { + "version": "8.3.6", + "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.3.6.tgz", + "integrity": "sha512-kcZ6+W5QzcJ3P1Mt+83OUv/oHFqZHIx8DuxG6eZ5RGMERoLqp4BuGjhHLYGK+Kf5XVkQvqBSmAy/nGWN3qDgEA==", + "dev": true, + "dependencies": { + "import-fresh": "^3.3.0", + "js-yaml": "^4.1.0", + "parse-json": "^5.2.0", + "path-type": "^4.0.0" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/d-fischer" + }, + "peerDependencies": { + "typescript": ">=4.9.5" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/postcss-loader/node_modules/js-yaml": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "dev": true, + "dependencies": { + "argparse": "^2.0.1" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/postcss-loader/node_modules/typescript": { + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz", + "integrity": "sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==", + "dev": true, + "optional": true, + "peer": true, + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=14.17" + } + }, "node_modules/postcss-modules-extract-imports": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz", @@ -13421,9 +14447,9 @@ } }, "node_modules/postcss-modules-local-by-default": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz", - "integrity": "sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ==", + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.3.tgz", + "integrity": "sha512-2/u2zraspoACtrbFRnTijMiQtb4GW4BvatjaG/bCjYQo8kLTdevCUlwuBHx2sCnSyrI3x3qj4ZK1j5LQBgzmwA==", "dev": true, "dependencies": { "icss-utils": "^5.0.0", @@ -13468,9 +14494,9 @@ } }, "node_modules/postcss-selector-parser": { - "version": "6.0.11", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.11.tgz", - "integrity": "sha512-zbARubNdogI9j7WY4nQJBiNqQf3sLS3wCP4WfOidu+p28LofJqDH1tcXypGrcmMHhDk2t9wGhCsYe/+szLTy1g==", + "version": "6.0.13", + "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.13.tgz", + "integrity": "sha512-EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ==", "dev": true, "dependencies": { "cssesc": "^3.0.0", @@ -13496,9 +14522,9 @@ } }, "node_modules/prettier": { - "version": "2.8.3", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.3.tgz", - "integrity": "sha512-tJ/oJ4amDihPoufT5sM0Z1SKEuKay8LfVAMlbbhnnkvt6BUserZylqo2PN+p9KeljLr0OHa2rXHU1T8reeoTrw==", + "version": "2.8.8", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz", + "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==", "dev": true, "bin": { "prettier": "bin-prettier.js" @@ -13523,18 +14549,17 @@ } }, "node_modules/pretty-format": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz", - "integrity": "sha512-8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz", + "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==", "dev": true, "dependencies": { - "@jest/schemas": "^28.1.3", - "ansi-regex": "^5.0.1", + "@jest/schemas": "^29.6.3", "ansi-styles": "^5.0.0", "react-is": "^18.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/pretty-format/node_modules/ansi-styles": { @@ -13632,14 +14657,30 @@ "dev": true }, "node_modules/punycode": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", - "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", + "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", "dev": true, "engines": { "node": ">=6" } }, + "node_modules/pure-rand": { + "version": "6.0.4", + "resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-6.0.4.tgz", + "integrity": "sha512-LA0Y9kxMYv47GIPJy6MI84fqTd2HmYZI83W/kM/SkKfDlajnZYfmXFTxkbY+xSBPkLJxltMa9hIkmdc29eguMA==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://github.com/sponsors/dubzzz" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/fast-check" + } + ] + }, "node_modules/qs": { "version": "6.11.0", "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz", @@ -13730,12 +14771,12 @@ "dev": true }, "node_modules/read-package-json": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-6.0.0.tgz", - "integrity": "sha512-b/9jxWJ8EwogJPpv99ma+QwtqB7FSl3+V6UXS7Aaay8/5VwMY50oIFooY1UKXMWpfNCM6T/PoGqa5GD1g9xf9w==", + "version": "6.0.4", + "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-6.0.4.tgz", + "integrity": "sha512-AEtWXYfopBj2z5N5PbkAOeNHRPUg5q+Nen7QLxV8M2zJq1ym6/lCz3fYNTCXe19puu2d06jfHhrP7v/S2PtMMw==", "dev": true, "dependencies": { - "glob": "^8.0.1", + "glob": "^10.2.2", "json-parse-even-better-errors": "^3.0.0", "normalize-package-data": "^5.0.0", "npm-normalize-package-bin": "^3.0.0" @@ -13766,6 +14807,37 @@ "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, + "node_modules/read-package-json/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/read-package-json/node_modules/glob": { + "version": "10.3.10", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz", + "integrity": "sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==", + "dev": true, + "dependencies": { + "foreground-child": "^3.1.0", + "jackspeak": "^2.3.5", + "minimatch": "^9.0.1", + "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0", + "path-scurry": "^1.10.1" + }, + "bin": { + "glob": "dist/esm/bin.mjs" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, "node_modules/read-package-json/node_modules/json-parse-even-better-errors": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-3.0.0.tgz", @@ -13775,10 +14847,25 @@ "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, + "node_modules/read-package-json/node_modules/minimatch": { + "version": "9.0.3", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", + "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==", + "dev": true, + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, "node_modules/readable-stream": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", - "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", + "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", "dev": true, "dependencies": { "inherits": "^2.0.3", @@ -13814,9 +14901,9 @@ "dev": true }, "node_modules/regenerate-unicode-properties": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz", - "integrity": "sha512-d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ==", + "version": "10.1.1", + "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.1.tgz", + "integrity": "sha512-X007RyZLsCJVVrjgEFVpLUTZwyOZk3oiL75ZcuYjlIWd6rNJtOjkBwQc5AsRrpbKVkxN6sklw/k/9m2jJYOf8Q==", "dev": true, "dependencies": { "regenerate": "^1.4.2" @@ -13832,9 +14919,9 @@ "dev": true }, "node_modules/regenerator-transform": { - "version": "0.15.1", - "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.1.tgz", - "integrity": "sha512-knzmNAcuyxV+gQCufkYcvOqX/qIIfHLv0u5x79kRxuGojfYVky1f15TzZEu2Avte8QGepvUNTnLskf8E6X6Vyg==", + "version": "0.15.2", + "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.2.tgz", + "integrity": "sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg==", "dev": true, "dependencies": { "@babel/runtime": "^7.8.4" @@ -13846,27 +14933,15 @@ "integrity": "sha512-jbD/FT0+9MBU2XAZluI7w2OBs1RBi6p9M83nkoZayQXXU9e8Robt69FcZc7wU4eJD/YFTjn1JdCk3rbMJajz8Q==", "dev": true }, - "node_modules/regexpp": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz", - "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==", - "dev": true, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/mysticatea" - } - }, "node_modules/regexpu-core": { - "version": "5.2.2", - "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.2.2.tgz", - "integrity": "sha512-T0+1Zp2wjF/juXMrMxHxidqGYn8U4R+zleSJhX9tQ1PUsS8a9UtYfbsF9LdiVgNX3kiX8RNaKM42nfSgvFJjmw==", + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.3.2.tgz", + "integrity": "sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ==", "dev": true, "dependencies": { + "@babel/regjsgen": "^0.8.0", "regenerate": "^1.4.2", "regenerate-unicode-properties": "^10.1.0", - "regjsgen": "^0.7.1", "regjsparser": "^0.9.1", "unicode-match-property-ecmascript": "^2.0.0", "unicode-match-property-value-ecmascript": "^2.1.0" @@ -13875,12 +14950,6 @@ "node": ">=4" } }, - "node_modules/regjsgen": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.7.1.tgz", - "integrity": "sha512-RAt+8H2ZEzHeYWxZ3H2z6tF18zyyOnlcdaafLrm21Bguj7uZy6ULibiAFdXEtKQY4Sy7wDTwDiOazasMLc4KPA==", - "dev": true - }, "node_modules/regjsparser": { "version": "0.9.1", "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.9.1.tgz", @@ -13927,12 +14996,12 @@ "dev": true }, "node_modules/resolve": { - "version": "1.22.1", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz", - "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==", + "version": "1.22.2", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.2.tgz", + "integrity": "sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==", "dev": true, "dependencies": { - "is-core-module": "^2.9.0", + "is-core-module": "^2.11.0", "path-parse": "^1.0.7", "supports-preserve-symlinks-flag": "^1.0.0" }, @@ -14004,9 +15073,9 @@ } }, "node_modules/resolve.exports": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-1.1.1.tgz", - "integrity": "sha512-/NtpHNDN7jWhAaQ9BvBUYZ6YTXsRBgfqWFWP7BZBaoMJO/I3G5OFzvTuWNlZC3aPjins1F+TNrLKsGbH4rfsRQ==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.2.tgz", + "integrity": "sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg==", "dev": true, "engines": { "node": ">=10" @@ -14059,46 +15128,20 @@ "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/rimraf/node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "node_modules/rollup": { + "version": "3.29.4", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.29.4.tgz", + "integrity": "sha512-oWzmBZwvYrU0iJHtDmhsm662rC15FRXmcjCk1xD771dFDx5jJ02ufAQQTn0etB2emNk4J9EZg/yWKpsn9BWGRw==", "dev": true, - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/rimraf/node_modules/glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "dev": true, - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" + "bin": { + "rollup": "dist/bin/rollup" }, "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/rimraf/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "dependencies": { - "brace-expansion": "^1.1.7" + "node": ">=14.18.0", + "npm": ">=8.0.0" }, - "engines": { - "node": "*" + "optionalDependencies": { + "fsevents": "~2.3.2" } }, "node_modules/run-async": { @@ -14134,9 +15177,9 @@ } }, "node_modules/rxjs": { - "version": "7.5.7", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.7.tgz", - "integrity": "sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==", + "version": "7.8.1", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz", + "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==", "dependencies": { "tslib": "^2.1.0" } @@ -14173,9 +15216,9 @@ "integrity": "sha512-LRneZZRXNgjzwG4bDQdOTSbze3fHm1EAKN/8bePxnlEZiBmkYEDggaHbuvHI9/hoqHbGfsEA7tWS9GhYHZBBsw==" }, "node_modules/sass": { - "version": "1.57.1", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.57.1.tgz", - "integrity": "sha512-O2+LwLS79op7GI0xZ8fqzF7X2m/m8WFfI02dHOdsK5R2ECeS5F62zrwg/relM1rjSLy7Vd/DiMNIvPrQGsA0jw==", + "version": "1.64.1", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.64.1.tgz", + "integrity": "sha512-16rRACSOFEE8VN7SCgBu1MpYCyN7urj9At898tyzdXFhC+a+yOX5dXwAR7L8/IdPJ1NB8OYoXmD55DM30B2kEQ==", "dev": true, "dependencies": { "chokidar": ">=3.0.0 <4.0.0", @@ -14186,16 +15229,15 @@ "sass": "sass.js" }, "engines": { - "node": ">=12.0.0" + "node": ">=14.0.0" } }, "node_modules/sass-loader": { - "version": "13.2.0", - "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-13.2.0.tgz", - "integrity": "sha512-JWEp48djQA4nbZxmgC02/Wh0eroSUutulROUusYJO9P9zltRbNN80JCBHqRGzjd4cmZCa/r88xgfkjGD0TXsHg==", + "version": "13.3.2", + "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-13.3.2.tgz", + "integrity": "sha512-CQbKl57kdEv+KDLquhC+gE3pXt74LEAzm+tzywcA0/aHZuub8wTErbjAoNI57rPUWRYRNC5WUnNl8eGJNbDdwg==", "dev": true, "dependencies": { - "klona": "^2.0.4", "neo-async": "^2.6.2" }, "engines": { @@ -14207,7 +15249,7 @@ }, "peerDependencies": { "fibers": ">= 3.1.0", - "node-sass": "^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0", + "node-sass": "^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0", "sass": "^1.3.0", "sass-embedded": "*", "webpack": "^5.0.0" @@ -14228,9 +15270,9 @@ } }, "node_modules/sax": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", - "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/sax/-/sax-1.3.0.tgz", + "integrity": "sha512-0s+oAmw9zLl1V1cS9BtZN7JAd0cW5e0QH4W3LWEK6a4LaLEA2OTpGYWDY+6XasBLtz6wkm3u1xRw95mRuJ59WA==", "dev": true, "optional": true }, @@ -14247,15 +15289,15 @@ } }, "node_modules/schema-utils": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz", - "integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz", + "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==", "dev": true, "dependencies": { "@types/json-schema": "^7.0.9", - "ajv": "^8.8.0", + "ajv": "^8.9.0", "ajv-formats": "^2.1.1", - "ajv-keywords": "^5.0.0" + "ajv-keywords": "^5.1.0" }, "engines": { "node": ">= 12.13.0" @@ -14272,11 +15314,12 @@ "dev": true }, "node_modules/selfsigned": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-2.1.1.tgz", - "integrity": "sha512-GSL3aowiF7wa/WtSFwnUrludWFoNhftq8bUkH9pkzjpN2XSPOAYEgg6e0sS9s0rZwgJzJiQRPU18A6clnoW5wQ==", + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-2.4.1.tgz", + "integrity": "sha512-th5B4L2U+eGLq1TVh7zNRGBapioSORUeymIydxgFpwww9d2qyKvtuPU2jJuHvYAwwqi2Y596QBL3eEqcPEYL8Q==", "dev": true, "dependencies": { + "@types/node-forge": "^1.3.0", "node-forge": "^1" }, "engines": { @@ -14284,9 +15327,9 @@ } }, "node_modules/semver": { - "version": "7.3.8", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", - "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "dev": true, "dependencies": { "lru-cache": "^6.0.0" @@ -14310,6 +15353,12 @@ "node": ">=10" } }, + "node_modules/semver/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true + }, "node_modules/send": { "version": "0.18.0", "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz", @@ -14349,15 +15398,6 @@ "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", "dev": true }, - "node_modules/send/node_modules/depd": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", - "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", - "dev": true, - "engines": { - "node": ">= 0.8" - } - }, "node_modules/send/node_modules/ms": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", @@ -14400,6 +15440,15 @@ "ms": "2.0.0" } }, + "node_modules/serve-index/node_modules/depd": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", + "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==", + "dev": true, + "engines": { + "node": ">= 0.6" + } + }, "node_modules/serve-index/node_modules/http-errors": { "version": "1.6.3", "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz", @@ -14463,6 +15512,21 @@ "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==", "dev": true }, + "node_modules/set-function-length": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.1.1.tgz", + "integrity": "sha512-VoaqjbBJKiWtg4yRcKBQ7g7wnGnLV3M8oLvVWwOk2PdYY6PEFegR1vezXR0tw6fZGF9csVakIRjrJiy2veSBFQ==", + "dev": true, + "dependencies": { + "define-data-property": "^1.1.1", + "get-intrinsic": "^1.2.1", + "gopd": "^1.0.1", + "has-property-descriptors": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/setprototypeof": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", @@ -14502,6 +15566,15 @@ "node": ">=8" } }, + "node_modules/shell-quote": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.1.tgz", + "integrity": "sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==", + "dev": true, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/side-channel": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", @@ -14522,6 +15595,109 @@ "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", "dev": true }, + "node_modules/sigstore": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/sigstore/-/sigstore-1.9.0.tgz", + "integrity": "sha512-0Zjz0oe37d08VeOtBIuB6cRriqXse2e8w+7yIy2XSXjshRKxbc2KkhXjL229jXSxEm7UbcjS76wcJDGQddVI9A==", + "dev": true, + "dependencies": { + "@sigstore/bundle": "^1.1.0", + "@sigstore/protobuf-specs": "^0.2.0", + "@sigstore/sign": "^1.0.0", + "@sigstore/tuf": "^1.0.3", + "make-fetch-happen": "^11.0.1" + }, + "bin": { + "sigstore": "bin/sigstore.js" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/sigstore/node_modules/@tootallnate/once": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz", + "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==", + "dev": true, + "engines": { + "node": ">= 10" + } + }, + "node_modules/sigstore/node_modules/http-proxy-agent": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz", + "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==", + "dev": true, + "dependencies": { + "@tootallnate/once": "2", + "agent-base": "6", + "debug": "4" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/sigstore/node_modules/lru-cache": { + "version": "7.18.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", + "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", + "dev": true, + "engines": { + "node": ">=12" + } + }, + "node_modules/sigstore/node_modules/make-fetch-happen": { + "version": "11.1.1", + "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-11.1.1.tgz", + "integrity": "sha512-rLWS7GCSTcEujjVBs2YqG7Y4643u8ucvCJeSRqiLYhesrDuzeuFIk37xREzAsfQaqzl8b9rNCE4m6J8tvX4Q8w==", + "dev": true, + "dependencies": { + "agentkeepalive": "^4.2.1", + "cacache": "^17.0.0", + "http-cache-semantics": "^4.1.1", + "http-proxy-agent": "^5.0.0", + "https-proxy-agent": "^5.0.0", + "is-lambda": "^1.0.1", + "lru-cache": "^7.7.1", + "minipass": "^5.0.0", + "minipass-fetch": "^3.0.0", + "minipass-flush": "^1.0.5", + "minipass-pipeline": "^1.2.4", + "negotiator": "^0.6.3", + "promise-retry": "^2.0.1", + "socks-proxy-agent": "^7.0.0", + "ssri": "^10.0.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/sigstore/node_modules/minipass-fetch": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.4.tgz", + "integrity": "sha512-jHAqnA728uUpIaFm7NWsCnqKT6UqZz7GcI/bDpPATuwYyKwJwW0remxSCxUlKiEty+eopHGa3oc8WxgQ1FFJqg==", + "dev": true, + "dependencies": { + "minipass": "^7.0.3", + "minipass-sized": "^1.0.3", + "minizlib": "^2.1.2" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + }, + "optionalDependencies": { + "encoding": "^0.1.13" + } + }, + "node_modules/sigstore/node_modules/minipass-fetch/node_modules/minipass": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz", + "integrity": "sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==", + "dev": true, + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, "node_modules/sisteransi": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz", @@ -14655,9 +15831,9 @@ } }, "node_modules/spdx-correct": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz", - "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz", + "integrity": "sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==", "dev": true, "dependencies": { "spdx-expression-parse": "^3.0.0", @@ -14681,9 +15857,9 @@ } }, "node_modules/spdx-license-ids": { - "version": "3.0.12", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.12.tgz", - "integrity": "sha512-rr+VVSXtRhO4OHbXUiAF7xW3Bo9DuuF6C5jH+q/x15j2jniycgKbxU09Hr0WqlSLUs4i4ltHGXqTe7VHclYWyA==", + "version": "3.0.16", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.16.tgz", + "integrity": "sha512-eWN+LnM3GR6gPu35WxNgbGl8rmY1AEmoMDvL/QD6zYmPWgywxWqJWNdLGT+ke8dKNWrcYgYjPpG5gbTfghP8rw==", "dev": true }, "node_modules/spdy": { @@ -14723,17 +15899,26 @@ "dev": true }, "node_modules/ssri": { - "version": "10.0.1", - "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.1.tgz", - "integrity": "sha512-WVy6di9DlPOeBWEjMScpNipeSX2jIZBGEn5Uuo8Q7aIuFEuDX0pw8RxcOjlD1TWP4obi24ki7m/13+nFpcbXrw==", + "version": "10.0.5", + "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.5.tgz", + "integrity": "sha512-bSf16tAFkGeRlUNDjXu8FzaMQt6g2HZJrun7mtMbIPOddxt3GLMSz5VWUWcqTJUPfLEaDIepGxv+bYQW49596A==", "dev": true, "dependencies": { - "minipass": "^4.0.0" + "minipass": "^7.0.3" }, "engines": { "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, + "node_modules/ssri/node_modules/minipass": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz", + "integrity": "sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==", + "dev": true, + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, "node_modules/stack-utils": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz", @@ -14800,6 +15985,21 @@ "node": ">=8" } }, + "node_modules/string-width-cjs": { + "name": "string-width", + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/strip-ansi": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", @@ -14812,6 +16012,19 @@ "node": ">=8" } }, + "node_modules/strip-ansi-cjs": { + "name": "strip-ansi", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/strip-bom": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz", @@ -14854,40 +16067,6 @@ "node": ">=4" } }, - "node_modules/supports-hyperlinks": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.3.0.tgz", - "integrity": "sha512-RpsAZlpWcDwOPQA22aCH4J0t7L8JmAvsCxfOSEwm7cQs3LshN36QaTkwd70DnBOXDWGssw2eUoc8CaRWT0XunA==", - "dev": true, - "dependencies": { - "has-flag": "^4.0.0", - "supports-color": "^7.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/supports-hyperlinks/node_modules/has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/supports-hyperlinks/node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/supports-preserve-symlinks-flag": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", @@ -14925,14 +16104,14 @@ } }, "node_modules/tar": { - "version": "6.1.13", - "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.13.tgz", - "integrity": "sha512-jdIBIN6LTIe2jqzay/2vtYLlBHa3JF42ot3h1dW8Q0PaAG4v8rm0cvpVePtau5C6OKXGGcgO9q2AMNSWxiLqKw==", + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.0.tgz", + "integrity": "sha512-/Wo7DcT0u5HUV486xg675HtjNd3BXZ6xDbzsCUZPt5iw8bTQ63bP0Raut3mvro9u+CUyq7YQd8Cx55fsZXxqLQ==", "dev": true, "dependencies": { "chownr": "^2.0.0", "fs-minipass": "^2.0.0", - "minipass": "^4.0.0", + "minipass": "^5.0.0", "minizlib": "^2.1.1", "mkdirp": "^1.0.3", "yallist": "^4.0.0" @@ -14965,30 +16144,20 @@ "node": ">=8" } }, - "node_modules/terminal-link": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/terminal-link/-/terminal-link-2.1.1.tgz", - "integrity": "sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==", - "dev": true, - "dependencies": { - "ansi-escapes": "^4.2.1", - "supports-hyperlinks": "^2.0.0" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } + "node_modules/tar/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true }, "node_modules/terser": { - "version": "5.16.1", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.16.1.tgz", - "integrity": "sha512-xvQfyfA1ayT0qdK47zskQgRZeWLoOQ8JQ6mIgRGVNwZKdQMU+5FkCBjmv4QjcrTzyZquRw2FVtlJSRUmMKQslw==", + "version": "5.19.2", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.19.2.tgz", + "integrity": "sha512-qC5+dmecKJA4cpYxRa5aVkKehYsQKc+AHeKl0Oe62aYjBL8ZA33tTljktDHJSaxxMnbI5ZYw+o/S2DxxLu8OfA==", "dev": true, "dependencies": { - "@jridgewell/source-map": "^0.3.2", - "acorn": "^8.5.0", + "@jridgewell/source-map": "^0.3.3", + "acorn": "^8.8.2", "commander": "^2.20.0", "source-map-support": "~0.5.20" }, @@ -15000,16 +16169,16 @@ } }, "node_modules/terser-webpack-plugin": { - "version": "5.3.6", - "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.6.tgz", - "integrity": "sha512-kfLFk+PoLUQIbLmB1+PZDMRSZS99Mp+/MHqDNmMA6tOItzRt+Npe3E+fsMs5mfcM0wCtrrdU387UnV+vnSffXQ==", + "version": "5.3.9", + "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.9.tgz", + "integrity": "sha512-ZuXsqE07EcggTWQjXUj+Aot/OMcD0bMKGgF63f7UxYcu5/AJF53aIpK1YoP5xR9l6s/Hy2b+t1AM0bLNPRuhwA==", "dev": true, "dependencies": { - "@jridgewell/trace-mapping": "^0.3.14", + "@jridgewell/trace-mapping": "^0.3.17", "jest-worker": "^27.4.5", "schema-utils": "^3.1.1", - "serialize-javascript": "^6.0.0", - "terser": "^5.14.1" + "serialize-javascript": "^6.0.1", + "terser": "^5.16.8" }, "engines": { "node": ">= 10.13.0" @@ -15058,6 +16227,29 @@ "ajv": "^6.9.1" } }, + "node_modules/terser-webpack-plugin/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/terser-webpack-plugin/node_modules/jest-worker": { + "version": "27.5.1", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz", + "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==", + "dev": true, + "dependencies": { + "@types/node": "*", + "merge-stream": "^2.0.0", + "supports-color": "^8.0.0" + }, + "engines": { + "node": ">= 10.13.0" + } + }, "node_modules/terser-webpack-plugin/node_modules/json-schema-traverse": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", @@ -15065,9 +16257,9 @@ "dev": true }, "node_modules/terser-webpack-plugin/node_modules/schema-utils": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz", - "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz", + "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==", "dev": true, "dependencies": { "@types/json-schema": "^7.0.8", @@ -15082,6 +16274,21 @@ "url": "https://opencollective.com/webpack" } }, + "node_modules/terser-webpack-plugin/node_modules/supports-color": { + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", + "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/supports-color?sponsor=1" + } + }, "node_modules/test-exclude": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz", @@ -15096,48 +16303,6 @@ "node": ">=8" } }, - "node_modules/test-exclude/node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/test-exclude/node_modules/glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "dev": true, - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/test-exclude/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, "node_modules/text-table": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", @@ -15205,9 +16370,9 @@ } }, "node_modules/tough-cookie": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.2.tgz", - "integrity": "sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ==", + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz", + "integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==", "dev": true, "dependencies": { "psl": "^1.1.33", @@ -15220,15 +16385,15 @@ } }, "node_modules/tr46": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-3.0.0.tgz", - "integrity": "sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz", + "integrity": "sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==", "dev": true, "dependencies": { "punycode": "^2.1.1" }, "engines": { - "node": ">=12" + "node": ">=8" } }, "node_modules/tree-kill": { @@ -15241,32 +16406,32 @@ } }, "node_modules/ts-jest": { - "version": "28.0.8", - "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-28.0.8.tgz", - "integrity": "sha512-5FaG0lXmRPzApix8oFG8RKjAz4ehtm8yMKOTy5HX3fY6W8kmvOrmcY0hKDElW52FJov+clhUbrKAqofnj4mXTg==", + "version": "29.1.1", + "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.1.1.tgz", + "integrity": "sha512-D6xjnnbP17cC85nliwGiL+tpoKN0StpgE0TeOjXQTU6MVCfsB4v7aW05CgQ/1OywGb0x/oy9hHFnN+sczTiRaA==", "dev": true, "dependencies": { "bs-logger": "0.x", "fast-json-stable-stringify": "2.x", - "jest-util": "^28.0.0", - "json5": "^2.2.1", + "jest-util": "^29.0.0", + "json5": "^2.2.3", "lodash.memoize": "4.x", "make-error": "1.x", - "semver": "7.x", + "semver": "^7.5.3", "yargs-parser": "^21.0.1" }, "bin": { "ts-jest": "cli.js" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" }, "peerDependencies": { "@babel/core": ">=7.0.0-beta.0 <8", - "@jest/types": "^28.0.0", - "babel-jest": "^28.0.0", - "jest": "^28.0.0", - "typescript": ">=4.3" + "@jest/types": "^29.0.0", + "babel-jest": "^29.0.0", + "jest": "^29.0.0", + "typescript": ">=4.3 <6" }, "peerDependenciesMeta": { "@babel/core": { @@ -15284,9 +16449,9 @@ } }, "node_modules/tsconfig-paths": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-4.1.2.tgz", - "integrity": "sha512-uhxiMgnXQp1IR622dUXI+9Ehnws7i/y6xvpZB9IbUVOPy0muvdvgXeZOn88UcGPiT98Vp3rJPTa8bFoalZ3Qhw==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-4.2.0.tgz", + "integrity": "sha512-NoZ4roiN7LnbKn9QqE1amc9DJfzvZXxF4xDavcOWt1BPkdx+m+0gJuPM+S0vCe7zTJMYUP0R8pO2XMr+Y8oLIg==", "dev": true, "dependencies": { "json5": "^2.2.2", @@ -15307,9 +16472,9 @@ } }, "node_modules/tslib": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz", - "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==" + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" }, "node_modules/tsutils": { "version": "3.21.0", @@ -15332,6 +16497,104 @@ "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", "dev": true }, + "node_modules/tuf-js": { + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/tuf-js/-/tuf-js-1.1.7.tgz", + "integrity": "sha512-i3P9Kgw3ytjELUfpuKVDNBJvk4u5bXL6gskv572mcevPbSKCV3zt3djhmlEQ65yERjIbOSncy7U4cQJaB1CBCg==", + "dev": true, + "dependencies": { + "@tufjs/models": "1.0.4", + "debug": "^4.3.4", + "make-fetch-happen": "^11.1.1" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/tuf-js/node_modules/@tootallnate/once": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz", + "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==", + "dev": true, + "engines": { + "node": ">= 10" + } + }, + "node_modules/tuf-js/node_modules/http-proxy-agent": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz", + "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==", + "dev": true, + "dependencies": { + "@tootallnate/once": "2", + "agent-base": "6", + "debug": "4" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/tuf-js/node_modules/lru-cache": { + "version": "7.18.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", + "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", + "dev": true, + "engines": { + "node": ">=12" + } + }, + "node_modules/tuf-js/node_modules/make-fetch-happen": { + "version": "11.1.1", + "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-11.1.1.tgz", + "integrity": "sha512-rLWS7GCSTcEujjVBs2YqG7Y4643u8ucvCJeSRqiLYhesrDuzeuFIk37xREzAsfQaqzl8b9rNCE4m6J8tvX4Q8w==", + "dev": true, + "dependencies": { + "agentkeepalive": "^4.2.1", + "cacache": "^17.0.0", + "http-cache-semantics": "^4.1.1", + "http-proxy-agent": "^5.0.0", + "https-proxy-agent": "^5.0.0", + "is-lambda": "^1.0.1", + "lru-cache": "^7.7.1", + "minipass": "^5.0.0", + "minipass-fetch": "^3.0.0", + "minipass-flush": "^1.0.5", + "minipass-pipeline": "^1.2.4", + "negotiator": "^0.6.3", + "promise-retry": "^2.0.1", + "socks-proxy-agent": "^7.0.0", + "ssri": "^10.0.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/tuf-js/node_modules/minipass-fetch": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.4.tgz", + "integrity": "sha512-jHAqnA728uUpIaFm7NWsCnqKT6UqZz7GcI/bDpPATuwYyKwJwW0remxSCxUlKiEty+eopHGa3oc8WxgQ1FFJqg==", + "dev": true, + "dependencies": { + "minipass": "^7.0.3", + "minipass-sized": "^1.0.3", + "minizlib": "^2.1.2" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + }, + "optionalDependencies": { + "encoding": "^0.1.13" + } + }, + "node_modules/tuf-js/node_modules/minipass-fetch/node_modules/minipass": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz", + "integrity": "sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==", + "dev": true, + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, "node_modules/type-check": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", @@ -15397,6 +16660,12 @@ "node": ">=4.2.0" } }, + "node_modules/undici-types": { + "version": "5.26.5", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", + "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==", + "dev": true + }, "node_modules/unicode-canonical-property-names-ecmascript": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz", @@ -15480,9 +16749,9 @@ } }, "node_modules/update-browserslist-db": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz", - "integrity": "sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==", + "version": "1.0.13", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz", + "integrity": "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==", "dev": true, "funding": [ { @@ -15492,6 +16761,10 @@ { "type": "tidelift", "url": "https://tidelift.com/funding/github/npm/browserslist" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" } ], "dependencies": { @@ -15499,7 +16772,7 @@ "picocolors": "^1.0.0" }, "bin": { - "browserslist-lint": "cli.js" + "update-browserslist-db": "cli.js" }, "peerDependencies": { "browserslist": ">= 4.21.0" @@ -15549,19 +16822,25 @@ } }, "node_modules/v8-to-istanbul": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.0.1.tgz", - "integrity": "sha512-74Y4LqY74kLE6IFyIjPtkSTWzUZmj8tdHT9Ii/26dvQ6K9Dl2NbEfj0XgU2sHCtKgt5VupqhlO/5aWuqS+IY1w==", + "version": "9.1.3", + "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.1.3.tgz", + "integrity": "sha512-9lDD+EVI2fjFsMWXc6dy5JJzBsVTcQ2fVkfBvncZ6xJWG9wtBhOldG+mHkSL0+V1K/xgZz0JDO5UT5hFwHUghg==", "dev": true, "dependencies": { "@jridgewell/trace-mapping": "^0.3.12", "@types/istanbul-lib-coverage": "^2.0.1", - "convert-source-map": "^1.6.0" + "convert-source-map": "^2.0.0" }, "engines": { "node": ">=10.12.0" } }, + "node_modules/v8-to-istanbul/node_modules/convert-source-map": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", + "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", + "dev": true + }, "node_modules/validate-npm-package-license": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", @@ -15593,6 +16872,61 @@ "node": ">= 0.8" } }, + "node_modules/vite": { + "version": "4.4.7", + "resolved": "https://registry.npmjs.org/vite/-/vite-4.4.7.tgz", + "integrity": "sha512-6pYf9QJ1mHylfVh39HpuSfMPojPSKVxZvnclX1K1FyZ1PXDOcLBibdq5t1qxJSnL63ca8Wf4zts6mD8u8oc9Fw==", + "dev": true, + "dependencies": { + "esbuild": "^0.18.10", + "postcss": "^8.4.26", + "rollup": "^3.25.2" + }, + "bin": { + "vite": "bin/vite.js" + }, + "engines": { + "node": "^14.18.0 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/vitejs/vite?sponsor=1" + }, + "optionalDependencies": { + "fsevents": "~2.3.2" + }, + "peerDependencies": { + "@types/node": ">= 14", + "less": "*", + "lightningcss": "^1.21.0", + "sass": "*", + "stylus": "*", + "sugarss": "*", + "terser": "^5.4.0" + }, + "peerDependenciesMeta": { + "@types/node": { + "optional": true + }, + "less": { + "optional": true + }, + "lightningcss": { + "optional": true + }, + "sass": { + "optional": true + }, + "stylus": { + "optional": true + }, + "sugarss": { + "optional": true + }, + "terser": { + "optional": true + } + } + }, "node_modules/w3c-hr-time": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz", @@ -15604,15 +16938,15 @@ } }, "node_modules/w3c-xmlserializer": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-3.0.0.tgz", - "integrity": "sha512-3WFqGEgSXIyGhOmAFtlicJNMjEps8b1MG31NCA0/vOF9+nKMUW1ckhi9cnNHmf88Rzw5V+dwIwsm2C7X8k9aQg==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz", + "integrity": "sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==", "dev": true, "dependencies": { - "xml-name-validator": "^4.0.0" + "xml-name-validator": "^3.0.0" }, "engines": { - "node": ">=12" + "node": ">=10" } }, "node_modules/walker": { @@ -15656,31 +16990,31 @@ } }, "node_modules/webidl-conversions": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz", - "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz", + "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==", "dev": true, "engines": { - "node": ">=12" + "node": ">=10.4" } }, "node_modules/webpack": { - "version": "5.75.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.75.0.tgz", - "integrity": "sha512-piaIaoVJlqMsPtX/+3KTTO6jfvrSYgauFVdt8cr9LTHKmcq/AMd4mhzsiP7ZF/PGRNPGA8336jldh9l2Kt2ogQ==", + "version": "5.88.2", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.88.2.tgz", + "integrity": "sha512-JmcgNZ1iKj+aiR0OvTYtWQqJwq37Pf683dY9bVORwVbUrDhLhdn/PlO2sHsFHPkj7sHNQF3JwaAkp49V+Sq1tQ==", "dev": true, "dependencies": { "@types/eslint-scope": "^3.7.3", - "@types/estree": "^0.0.51", - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/wasm-edit": "1.11.1", - "@webassemblyjs/wasm-parser": "1.11.1", + "@types/estree": "^1.0.0", + "@webassemblyjs/ast": "^1.11.5", + "@webassemblyjs/wasm-edit": "^1.11.5", + "@webassemblyjs/wasm-parser": "^1.11.5", "acorn": "^8.7.1", - "acorn-import-assertions": "^1.7.6", + "acorn-import-assertions": "^1.9.0", "browserslist": "^4.14.5", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^5.10.0", - "es-module-lexer": "^0.9.0", + "enhanced-resolve": "^5.15.0", + "es-module-lexer": "^1.2.1", "eslint-scope": "5.1.1", "events": "^3.2.0", "glob-to-regexp": "^0.4.1", @@ -15689,9 +17023,9 @@ "loader-runner": "^4.2.0", "mime-types": "^2.1.27", "neo-async": "^2.6.2", - "schema-utils": "^3.1.0", + "schema-utils": "^3.2.0", "tapable": "^2.1.1", - "terser-webpack-plugin": "^5.1.3", + "terser-webpack-plugin": "^5.3.7", "watchpack": "^2.4.0", "webpack-sources": "^3.2.3" }, @@ -15712,9 +17046,9 @@ } }, "node_modules/webpack-dev-middleware": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-6.0.1.tgz", - "integrity": "sha512-PZPZ6jFinmqVPJZbisfggDiC+2EeGZ1ZByyMP5sOFJcPPWSexalISz+cvm+j+oYPT7FIJyxT76esjnw9DhE5sw==", + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-6.1.1.tgz", + "integrity": "sha512-y51HrHaFeeWir0YO4f0g+9GwZawuigzcAdRNon6jErXy/SqV/+O6eaVAzDqE6t3e3NpGeR5CS+cCDaTC+V3yEQ==", "dev": true, "dependencies": { "colorette": "^2.0.10", @@ -15732,12 +17066,17 @@ }, "peerDependencies": { "webpack": "^5.0.0" + }, + "peerDependenciesMeta": { + "webpack": { + "optional": true + } } }, "node_modules/webpack-dev-server": { - "version": "4.11.1", - "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.11.1.tgz", - "integrity": "sha512-lILVz9tAUy1zGFwieuaQtYiadImb5M3d+H+L1zDYalYoDl0cksAB1UNyuE5MMWJrG6zR1tXkCP2fitl7yoUJiw==", + "version": "4.15.1", + "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.15.1.tgz", + "integrity": "sha512-5hbAst3h3C3L8w6W4P96L5vaV0PxSmJhxZvWKYIdgxOQm8pNZ5dEOmmSLBVpP85ReeyRt6AS1QJNyo/oFFPeVA==", "dev": true, "dependencies": { "@types/bonjour": "^3.5.9", @@ -15746,7 +17085,7 @@ "@types/serve-index": "^1.9.1", "@types/serve-static": "^1.13.10", "@types/sockjs": "^0.3.33", - "@types/ws": "^8.5.1", + "@types/ws": "^8.5.5", "ansi-html-community": "^0.0.8", "bonjour-service": "^1.0.11", "chokidar": "^3.5.3", @@ -15759,6 +17098,7 @@ "html-entities": "^2.3.2", "http-proxy-middleware": "^2.0.3", "ipaddr.js": "^2.0.1", + "launch-editor": "^2.6.0", "open": "^8.0.9", "p-retry": "^4.5.0", "rimraf": "^3.0.2", @@ -15768,7 +17108,7 @@ "sockjs": "^0.3.24", "spdy": "^4.0.2", "webpack-dev-middleware": "^5.3.1", - "ws": "^8.4.2" + "ws": "^8.13.0" }, "bin": { "webpack-dev-server": "bin/webpack-dev-server.js" @@ -15784,6 +17124,9 @@ "webpack": "^4.37.0 || ^5.0.0" }, "peerDependenciesMeta": { + "webpack": { + "optional": true + }, "webpack-cli": { "optional": true } @@ -15812,10 +17155,31 @@ "webpack": "^4.0.0 || ^5.0.0" } }, + "node_modules/webpack-dev-server/node_modules/ws": { + "version": "8.14.2", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.14.2.tgz", + "integrity": "sha512-wEBG1ftX4jcglPxgFCMJmZ2PLtSbJ2Peg6TmpJFTbe9GZYOQCDPdMYu/Tm0/bGZkw8paZnJY45J4K2PZrLYq8g==", + "dev": true, + "engines": { + "node": ">=10.0.0" + }, + "peerDependencies": { + "bufferutil": "^4.0.1", + "utf-8-validate": ">=5.0.2" + }, + "peerDependenciesMeta": { + "bufferutil": { + "optional": true + }, + "utf-8-validate": { + "optional": true + } + } + }, "node_modules/webpack-merge": { - "version": "5.8.0", - "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.8.0.tgz", - "integrity": "sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q==", + "version": "5.9.0", + "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.9.0.tgz", + "integrity": "sha512-6NbRQw4+Sy50vYNTw7EyOn41OZItPiXB8GNv3INSoe3PSFaHJEz3SHTrYVaRm2LilNGnFUzh0FAwqPEmU/CwDg==", "dev": true, "dependencies": { "clone-deep": "^4.0.1", @@ -15887,9 +17251,9 @@ "dev": true }, "node_modules/webpack/node_modules/schema-utils": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz", - "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz", + "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==", "dev": true, "dependencies": { "@types/json-schema": "^7.0.8", @@ -15928,49 +17292,32 @@ } }, "node_modules/whatwg-encoding": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz", - "integrity": "sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==", - "dev": true, - "dependencies": { - "iconv-lite": "0.6.3" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/whatwg-encoding/node_modules/iconv-lite": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", - "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz", + "integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==", "dev": true, "dependencies": { - "safer-buffer": ">= 2.1.2 < 3.0.0" - }, - "engines": { - "node": ">=0.10.0" + "iconv-lite": "0.4.24" } }, "node_modules/whatwg-mimetype": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz", - "integrity": "sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==", - "dev": true, - "engines": { - "node": ">=12" - } + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz", + "integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==", + "dev": true }, "node_modules/whatwg-url": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-10.0.0.tgz", - "integrity": "sha512-CLxxCmdUby142H5FZzn4D8ikO1cmypvXVQktsgosNy4a4BHrDHeciBBGZhb0bNoR5/MltoCatso+vFjjGx8t0w==", + "version": "8.7.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.7.0.tgz", + "integrity": "sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==", "dev": true, "dependencies": { - "tr46": "^3.0.0", - "webidl-conversions": "^7.0.0" + "lodash": "^4.7.0", + "tr46": "^2.1.0", + "webidl-conversions": "^6.1.0" }, "engines": { - "node": ">=12" + "node": ">=10" } }, "node_modules/which": { @@ -15998,21 +17345,30 @@ } }, "node_modules/wildcard": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.0.tgz", - "integrity": "sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.1.tgz", + "integrity": "sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==", "dev": true }, - "node_modules/word-wrap": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", - "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==", + "node_modules/wrap-ansi": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", "dev": true, + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, "engines": { - "node": ">=0.10.0" + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" } }, - "node_modules/wrap-ansi": { + "node_modules/wrap-ansi-cjs": { + "name": "wrap-ansi", "version": "7.0.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", @@ -16029,7 +17385,40 @@ "url": "https://github.com/chalk/wrap-ansi?sponsor=1" } }, - "node_modules/wrap-ansi/node_modules/ansi-styles": { + "node_modules/wrap-ansi-cjs/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/wrap-ansi-cjs/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/wrap-ansi-cjs/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "node_modules/wrap-ansi/node_modules/ansi-styles": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", @@ -16082,16 +17471,16 @@ } }, "node_modules/ws": { - "version": "8.12.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.12.0.tgz", - "integrity": "sha512-kU62emKIdKVeEIOIKVegvqpXMSTAMLJozpHZaJNDYqBjzlSYXQGviYwN1osDLJ9av68qHd4a2oSjd7yD4pacig==", + "version": "7.5.9", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz", + "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==", "dev": true, "engines": { - "node": ">=10.0.0" + "node": ">=8.3.0" }, "peerDependencies": { "bufferutil": "^4.0.1", - "utf-8-validate": ">=5.0.2" + "utf-8-validate": "^5.0.2" }, "peerDependenciesMeta": { "bufferutil": { @@ -16103,13 +17492,10 @@ } }, "node_modules/xml-name-validator": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz", - "integrity": "sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==", - "dev": true, - "engines": { - "node": ">=12" - } + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz", + "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==", + "dev": true }, "node_modules/xmlchars": { "version": "2.2.0", @@ -16127,24 +17513,15 @@ } }, "node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", + "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", "dev": true }, - "node_modules/yaml": { - "version": "1.10.2", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz", - "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==", - "dev": true, - "engines": { - "node": ">= 6" - } - }, "node_modules/yargs": { - "version": "17.6.2", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.6.2.tgz", - "integrity": "sha512-1/9UrdHjDZc0eOU0HxOHoS78C69UD3JRMvzlJ7S79S2nTaWRA/whGCTV8o9e/N/1Va9YIV7Q4sOxD8VV4pCWOw==", + "version": "17.7.2", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", + "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==", "dev": true, "dependencies": { "cliui": "^8.0.1", @@ -16181,12148 +17558,10 @@ } }, "node_modules/zone.js": { - "version": "0.11.8", - "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.11.8.tgz", - "integrity": "sha512-82bctBg2hKcEJ21humWIkXRlLBBmrc3nN7DFh5LGGhcyycO2S7FN8NmdvlcKaGFDNVL4/9kFLmwmInTavdJERA==", - "dependencies": { - "tslib": "^2.3.0" - } - } - }, - "dependencies": { - "@ampproject/remapping": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz", - "integrity": "sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==", - "dev": true, - "requires": { - "@jridgewell/gen-mapping": "^0.1.0", - "@jridgewell/trace-mapping": "^0.3.9" - } - }, - "@angular-builders/jest": { - "version": "15.0.0", - "resolved": "https://registry.npmjs.org/@angular-builders/jest/-/jest-15.0.0.tgz", - "integrity": "sha512-rJpO4QAsAXBXvkTI8E5kHxhLJEh6JR8iBYH3tHuXeTkABgifH+IRdDNWjogHTy32ratnhUPEaMOpPPDryIL+tw==", - "dev": true, - "requires": { - "@angular-devkit/architect": ">=0.1500.0 < 0.1600.0", - "@angular-devkit/core": "^15.0.0", - "jest-preset-angular": "12.2.3", - "lodash": "^4.17.15", - "tsconfig-paths": "^4.1.0" - }, - "dependencies": { - "jest-preset-angular": { - "version": "12.2.3", - "resolved": "https://registry.npmjs.org/jest-preset-angular/-/jest-preset-angular-12.2.3.tgz", - "integrity": "sha512-9vgawXuki/lg4IRPtl5k83krWLKADTal7BBm06xNAWOK09AbHK1foXqZdVOMObsWbaMDeQ1cjba60vS/aEVY4Q==", - "dev": true, - "requires": { - "bs-logger": "^0.2.6", - "esbuild": ">=0.13.8", - "esbuild-wasm": ">=0.13.8", - "jest-environment-jsdom": "^28.0.0", - "pretty-format": "^28.0.0", - "ts-jest": "^28.0.0" - } - } - } - }, - "@angular-devkit/architect": { - "version": "0.1501.2", - "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1501.2.tgz", - "integrity": "sha512-AfORVGLN0FBIUXO3FkfGOKu+Gz6oJjF8Bu8cPn27duiI0wszxGNY3fATKwbSg7JcKx1oQS/G7RjyC5OiTA6a0Q==", - "dev": true, - "requires": { - "@angular-devkit/core": "15.1.2", - "rxjs": "6.6.7" - }, - "dependencies": { - "rxjs": { - "version": "6.6.7", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", - "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", - "dev": true, - "requires": { - "tslib": "^1.9.0" - } - }, - "tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", - "dev": true - } - } - }, - "@angular-devkit/build-angular": { - "version": "15.1.2", - "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-15.1.2.tgz", - "integrity": "sha512-8udBKfHo3c/hOuh6VB11UKQZcqbolcNW2smtM9HJMm3fcykvyFEIitoCyl/tgraST+14/kA4aiINdl4EQ4BanQ==", - "dev": true, - "requires": { - "@ampproject/remapping": "2.2.0", - "@angular-devkit/architect": "0.1501.2", - "@angular-devkit/build-webpack": "0.1501.2", - "@angular-devkit/core": "15.1.2", - "@babel/core": "7.20.12", - "@babel/generator": "7.20.7", - "@babel/helper-annotate-as-pure": "7.18.6", - "@babel/plugin-proposal-async-generator-functions": "7.20.7", - "@babel/plugin-transform-async-to-generator": "7.20.7", - "@babel/plugin-transform-runtime": "7.19.6", - "@babel/preset-env": "7.20.2", - "@babel/runtime": "7.20.7", - "@babel/template": "7.20.7", - "@discoveryjs/json-ext": "0.5.7", - "@ngtools/webpack": "15.1.2", - "ansi-colors": "4.1.3", - "autoprefixer": "10.4.13", - "babel-loader": "9.1.2", - "babel-plugin-istanbul": "6.1.1", - "browserslist": "4.21.4", - "cacache": "17.0.4", - "chokidar": "3.5.3", - "copy-webpack-plugin": "11.0.0", - "critters": "0.0.16", - "css-loader": "6.7.3", - "esbuild": "0.16.17", - "esbuild-wasm": "0.16.17", - "glob": "8.0.3", - "https-proxy-agent": "5.0.1", - "inquirer": "8.2.4", - "jsonc-parser": "3.2.0", - "karma-source-map-support": "1.4.0", - "less": "4.1.3", - "less-loader": "11.1.0", - "license-webpack-plugin": "4.0.2", - "loader-utils": "3.2.1", - "magic-string": "0.27.0", - "mini-css-extract-plugin": "2.7.2", - "open": "8.4.0", - "ora": "5.4.1", - "parse5-html-rewriting-stream": "6.0.1", - "piscina": "3.2.0", - "postcss": "8.4.21", - "postcss-loader": "7.0.2", - "resolve-url-loader": "5.0.0", - "rxjs": "6.6.7", - "sass": "1.57.1", - "sass-loader": "13.2.0", - "semver": "7.3.8", - "source-map-loader": "4.0.1", - "source-map-support": "0.5.21", - "terser": "5.16.1", - "text-table": "0.2.0", - "tree-kill": "1.2.2", - "tslib": "2.4.1", - "webpack": "5.75.0", - "webpack-dev-middleware": "6.0.1", - "webpack-dev-server": "4.11.1", - "webpack-merge": "5.8.0", - "webpack-subresource-integrity": "5.1.0" - }, - "dependencies": { - "@babel/core": { - "version": "7.20.12", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.20.12.tgz", - "integrity": "sha512-XsMfHovsUYHFMdrIHkZphTN/2Hzzi78R08NuHfDBehym2VsPDL6Zn/JAD/JQdnRvbSsbQc4mVaU1m6JgtTEElg==", - "dev": true, - "requires": { - "@ampproject/remapping": "^2.1.0", - "@babel/code-frame": "^7.18.6", - "@babel/generator": "^7.20.7", - "@babel/helper-compilation-targets": "^7.20.7", - "@babel/helper-module-transforms": "^7.20.11", - "@babel/helpers": "^7.20.7", - "@babel/parser": "^7.20.7", - "@babel/template": "^7.20.7", - "@babel/traverse": "^7.20.12", - "@babel/types": "^7.20.7", - "convert-source-map": "^1.7.0", - "debug": "^4.1.0", - "gensync": "^1.0.0-beta.2", - "json5": "^2.2.2", - "semver": "^6.3.0" - }, - "dependencies": { - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true - } - } - }, - "rxjs": { - "version": "6.6.7", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", - "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", - "dev": true, - "requires": { - "tslib": "^1.9.0" - }, - "dependencies": { - "tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", - "dev": true - } - } - } - } - }, - "@angular-devkit/build-webpack": { - "version": "0.1501.2", - "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1501.2.tgz", - "integrity": "sha512-FzslFvjuAabwtz2wMTCeemYCJA4NqRECz+WEsEZbtwESBMmKdaqmpbdW9ypsepB2iC7eIbHK43R95XAM75utTw==", - "dev": true, - "requires": { - "@angular-devkit/architect": "0.1501.2", - "rxjs": "6.6.7" - }, - "dependencies": { - "rxjs": { - "version": "6.6.7", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", - "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", - "dev": true, - "requires": { - "tslib": "^1.9.0" - } - }, - "tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", - "dev": true - } - } - }, - "@angular-devkit/core": { - "version": "15.1.2", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-15.1.2.tgz", - "integrity": "sha512-wkLZYvTZt30Ge6Z83Gxsr6mO1TIHCu3SImdE0zwW63EdU9o1NYkU74z1D9VUZ9Up7uHi1cHs/dssbxUuZ4eWOA==", - "dev": true, - "requires": { - "ajv": "8.12.0", - "ajv-formats": "2.1.1", - "jsonc-parser": "3.2.0", - "rxjs": "6.6.7", - "source-map": "0.7.4" - }, - "dependencies": { - "rxjs": { - "version": "6.6.7", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", - "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", - "dev": true, - "requires": { - "tslib": "^1.9.0" - } - }, - "tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", - "dev": true - } - } - }, - "@angular-devkit/schematics": { - "version": "15.1.2", - "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-15.1.2.tgz", - "integrity": "sha512-HjJPm+4SS5TdAHHvdpXLv25wsvwVOn5RYs0A9MazTndlm80ct3PKeYUgakNDRFjRj8uORNlJMKmQIIhUSDjFsw==", - "dev": true, - "requires": { - "@angular-devkit/core": "15.1.2", - "jsonc-parser": "3.2.0", - "magic-string": "0.27.0", - "ora": "5.4.1", - "rxjs": "6.6.7" - }, - "dependencies": { - "rxjs": { - "version": "6.6.7", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", - "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", - "dev": true, - "requires": { - "tslib": "^1.9.0" - } - }, - "tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", - "dev": true - } - } - }, - "@angular/animations": { - "version": "15.1.1", - "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-15.1.1.tgz", - "integrity": "sha512-oQrbO7uDsw1VcqhuSqvwQQPxEUjmssMM3nDbFUrs6A0MX7XIuhGnkB7mN35M6ZSd0Chj9DMzgbrYToPg1LoLHQ==", - "requires": { - "tslib": "^2.3.0" - } - }, - "@angular/cdk": { - "version": "15.1.1", - "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-15.1.1.tgz", - "integrity": "sha512-99zaW+EqS/pJh2BLxC+L+/mAyaC3oncRUqRL4WWLENZI2lqD6mCe/kRYDL57WbSZaI54Of38u9GhkBVA/0rn7A==", - "peer": true, - "requires": { - "parse5": "^7.1.2", - "tslib": "^2.3.0" - } - }, - "@angular/cli": { - "version": "15.1.2", - "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-15.1.2.tgz", - "integrity": "sha512-h42k410W6PPnz9KjX8dCtruMqf1mHgIf7UWrLa8icKpk03U2SIgoJzaXgY/spSHiMGIdDnY1dAYKWV0GQS4zEg==", - "dev": true, - "requires": { - "@angular-devkit/architect": "0.1501.2", - "@angular-devkit/core": "15.1.2", - "@angular-devkit/schematics": "15.1.2", - "@schematics/angular": "15.1.2", - "@yarnpkg/lockfile": "1.1.0", - "ansi-colors": "4.1.3", - "ini": "3.0.1", - "inquirer": "8.2.4", - "jsonc-parser": "3.2.0", - "npm-package-arg": "10.1.0", - "npm-pick-manifest": "8.0.1", - "open": "8.4.0", - "ora": "5.4.1", - "pacote": "15.0.8", - "resolve": "1.22.1", - "semver": "7.3.8", - "symbol-observable": "4.0.0", - "yargs": "17.6.2" - } - }, - "@angular/common": { - "version": "15.1.1", - "resolved": "https://registry.npmjs.org/@angular/common/-/common-15.1.1.tgz", - "integrity": "sha512-P4f2rK/YBQQT4clQrcQ9goLf53RS63Q1x2d1dvz7Syr3gcOUyxO7NZQ7Au5afzvbIKZ5Okd+X0+TCGV4q9wQjw==", - "requires": { - "tslib": "^2.3.0" - } - }, - "@angular/compiler": { - "version": "15.1.1", - "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-15.1.1.tgz", - "integrity": "sha512-A35iXLTTDEej4F2tm5t1flA+5Tv+jYAkQx+d0xvH6LDiWvsiDsOe5OjP8L2LD8dejwWl/JYUz2TH0JZcvw0uqA==", - "requires": { - "tslib": "^2.3.0" - } - }, - "@angular/compiler-cli": { - "version": "15.1.1", - "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-15.1.1.tgz", - "integrity": "sha512-sBYvh6Y08aKuZPAVwzT1YGVfG63xeXElEfAfq6No9FLUHDo83QB9fU7ovXnu1RJFJiVIy16DHjmTpAmgvlomGA==", - "dev": true, - "requires": { - "@babel/core": "7.19.3", - "@jridgewell/sourcemap-codec": "^1.4.14", - "chokidar": "^3.0.0", - "convert-source-map": "^1.5.1", - "dependency-graph": "^0.11.0", - "magic-string": "^0.27.0", - "reflect-metadata": "^0.1.2", - "semver": "^7.0.0", - "tslib": "^2.3.0", - "yargs": "^17.2.1" - } - }, - "@angular/core": { - "version": "15.1.1", - "resolved": "https://registry.npmjs.org/@angular/core/-/core-15.1.1.tgz", - "integrity": "sha512-nsz+IXdkQanAGhqA2vcwTrGGyw5zIm3TgtYQ/JqK185qkmlhsQfSRvdSPsFPhmIFYp9ngZVUbkhY3D4P3gDzIg==", - "requires": { - "tslib": "^2.3.0" - } - }, - "@angular/forms": { - "version": "15.1.1", - "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-15.1.1.tgz", - "integrity": "sha512-1c/oZD+eSbGzDCcmC+hOqkPH+AzLOiGHxII5QiOOj8so8M958UBrsFBwrnLz06d9OK5Z4IrR4UL2JJspZNbpjw==", - "requires": { - "tslib": "^2.3.0" - } - }, - "@angular/material": { - "version": "15.1.1", - "resolved": "https://registry.npmjs.org/@angular/material/-/material-15.1.1.tgz", - "integrity": "sha512-QhyTJv9CnimXKXb4LCH93ovJVAdnoHyElwspl80PcfAV/6A6VrRQAflFoul0WL4WPrV50DG7TWYiEwHPpblbCw==", - "requires": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/auto-init": "15.0.0-canary.684e33d25.0", - "@material/banner": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/button": "15.0.0-canary.684e33d25.0", - "@material/card": "15.0.0-canary.684e33d25.0", - "@material/checkbox": "15.0.0-canary.684e33d25.0", - "@material/chips": "15.0.0-canary.684e33d25.0", - "@material/circular-progress": "15.0.0-canary.684e33d25.0", - "@material/data-table": "15.0.0-canary.684e33d25.0", - "@material/density": "15.0.0-canary.684e33d25.0", - "@material/dialog": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/drawer": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/fab": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/floating-label": "15.0.0-canary.684e33d25.0", - "@material/form-field": "15.0.0-canary.684e33d25.0", - "@material/icon-button": "15.0.0-canary.684e33d25.0", - "@material/image-list": "15.0.0-canary.684e33d25.0", - "@material/layout-grid": "15.0.0-canary.684e33d25.0", - "@material/line-ripple": "15.0.0-canary.684e33d25.0", - "@material/linear-progress": "15.0.0-canary.684e33d25.0", - "@material/list": "15.0.0-canary.684e33d25.0", - "@material/menu": "15.0.0-canary.684e33d25.0", - "@material/menu-surface": "15.0.0-canary.684e33d25.0", - "@material/notched-outline": "15.0.0-canary.684e33d25.0", - "@material/radio": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/segmented-button": "15.0.0-canary.684e33d25.0", - "@material/select": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/slider": "15.0.0-canary.684e33d25.0", - "@material/snackbar": "15.0.0-canary.684e33d25.0", - "@material/switch": "15.0.0-canary.684e33d25.0", - "@material/tab": "15.0.0-canary.684e33d25.0", - "@material/tab-bar": "15.0.0-canary.684e33d25.0", - "@material/tab-indicator": "15.0.0-canary.684e33d25.0", - "@material/tab-scroller": "15.0.0-canary.684e33d25.0", - "@material/textfield": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tooltip": "15.0.0-canary.684e33d25.0", - "@material/top-app-bar": "15.0.0-canary.684e33d25.0", - "@material/touch-target": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", - "tslib": "^2.3.0" - } - }, - "@angular/material-moment-adapter": { - "version": "15.1.1", - "resolved": "https://registry.npmjs.org/@angular/material-moment-adapter/-/material-moment-adapter-15.1.1.tgz", - "integrity": "sha512-1o4+JnnUjreL+keQbw4bUCkrRXVbG05hj1lH8Fg2B2co/sUfq7ISwLTb2jvFhodX6n2rzUHbskZ3w1nFVhN9GQ==", - "requires": { - "tslib": "^2.3.0" - } - }, - "@angular/platform-browser": { - "version": "15.1.1", - "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-15.1.1.tgz", - "integrity": "sha512-U1MXowvyigmMpffsnMQI6e9gX7tA6Su7unY0pjN5u9wRYJIkEbKuFyVijguQ83bt+JK3ZBHXD0dvskYnscGUzg==", - "requires": { - "tslib": "^2.3.0" - } - }, - "@angular/platform-browser-dynamic": { - "version": "15.1.1", - "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-15.1.1.tgz", - "integrity": "sha512-iCbvYduSGtyBWuQfTzm/MDZy7Rd5MNsjpknEtJ45nbjZzv9EL1tGo6qufaTgPXHP8Nbfcco/4UO9w84Gp5irLA==", - "requires": { - "tslib": "^2.3.0" - } - }, - "@angular/router": { - "version": "15.1.1", - "resolved": "https://registry.npmjs.org/@angular/router/-/router-15.1.1.tgz", - "integrity": "sha512-5l1+6MzeJW01BeO8ZNfYe/TEVzxIHDKHWUrsmGE6oQW01LezG5LUjwR1T23YeR8G5zzRs/p+AU72wTn/aPGQHg==", - "requires": { - "tslib": "^2.3.0" - } - }, - "@assemblyscript/loader": { - "version": "0.10.1", - "resolved": "https://registry.npmjs.org/@assemblyscript/loader/-/loader-0.10.1.tgz", - "integrity": "sha512-H71nDOOL8Y7kWRLqf6Sums+01Q5msqBW2KhDUTemh1tvY04eSkSXrK0uj/4mmY0Xr16/3zyZmsrxN7CKuRbNRg==", - "dev": true - }, - "@babel/code-frame": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz", - "integrity": "sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==", - "dev": true, - "requires": { - "@babel/highlight": "^7.18.6" - } - }, - "@babel/compat-data": { - "version": "7.20.10", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.20.10.tgz", - "integrity": "sha512-sEnuDPpOJR/fcafHMjpcpGN5M2jbUGUHwmuWKM/YdPzeEDJg8bgmbcWQFUfE32MQjti1koACvoPVsDe8Uq+idg==", - "dev": true - }, - "@babel/core": { - "version": "7.19.3", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.19.3.tgz", - "integrity": "sha512-WneDJxdsjEvyKtXKsaBGbDeiyOjR5vYq4HcShxnIbG0qixpoHjI3MqeZM9NDvsojNCEBItQE4juOo/bU6e72gQ==", - "dev": true, - "requires": { - "@ampproject/remapping": "^2.1.0", - "@babel/code-frame": "^7.18.6", - "@babel/generator": "^7.19.3", - "@babel/helper-compilation-targets": "^7.19.3", - "@babel/helper-module-transforms": "^7.19.0", - "@babel/helpers": "^7.19.0", - "@babel/parser": "^7.19.3", - "@babel/template": "^7.18.10", - "@babel/traverse": "^7.19.3", - "@babel/types": "^7.19.3", - "convert-source-map": "^1.7.0", - "debug": "^4.1.0", - "gensync": "^1.0.0-beta.2", - "json5": "^2.2.1", - "semver": "^6.3.0" - }, - "dependencies": { - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true - } - } - }, - "@babel/generator": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.20.7.tgz", - "integrity": "sha512-7wqMOJq8doJMZmP4ApXTzLxSr7+oO2jroJURrVEp6XShrQUObV8Tq/D0NCcoYg2uHqUrjzO0zwBjoYzelxK+sw==", - "dev": true, - "requires": { - "@babel/types": "^7.20.7", - "@jridgewell/gen-mapping": "^0.3.2", - "jsesc": "^2.5.1" - }, - "dependencies": { - "@jridgewell/gen-mapping": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz", - "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==", - "dev": true, - "requires": { - "@jridgewell/set-array": "^1.0.1", - "@jridgewell/sourcemap-codec": "^1.4.10", - "@jridgewell/trace-mapping": "^0.3.9" - } - } - } - }, - "@babel/helper-annotate-as-pure": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz", - "integrity": "sha512-duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA==", - "dev": true, - "requires": { - "@babel/types": "^7.18.6" - } - }, - "@babel/helper-builder-binary-assignment-operator-visitor": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.18.9.tgz", - "integrity": "sha512-yFQ0YCHoIqarl8BCRwBL8ulYUaZpz3bNsA7oFepAzee+8/+ImtADXNOmO5vJvsPff3qi+hvpkY/NYBTrBQgdNw==", - "dev": true, - "requires": { - "@babel/helper-explode-assignable-expression": "^7.18.6", - "@babel/types": "^7.18.9" - } - }, - "@babel/helper-compilation-targets": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.7.tgz", - "integrity": "sha512-4tGORmfQcrc+bvrjb5y3dG9Mx1IOZjsHqQVUz7XCNHO+iTmqxWnVg3KRygjGmpRLJGdQSKuvFinbIb0CnZwHAQ==", - "dev": true, - "requires": { - "@babel/compat-data": "^7.20.5", - "@babel/helper-validator-option": "^7.18.6", - "browserslist": "^4.21.3", - "lru-cache": "^5.1.1", - "semver": "^6.3.0" - }, - "dependencies": { - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true - } - } - }, - "@babel/helper-create-class-features-plugin": { - "version": "7.20.12", - "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.20.12.tgz", - "integrity": "sha512-9OunRkbT0JQcednL0UFvbfXpAsUXiGjUk0a7sN8fUXX7Mue79cUSMjHGDRRi/Vz9vYlpIhLV5fMD5dKoMhhsNQ==", - "dev": true, - "requires": { - "@babel/helper-annotate-as-pure": "^7.18.6", - "@babel/helper-environment-visitor": "^7.18.9", - "@babel/helper-function-name": "^7.19.0", - "@babel/helper-member-expression-to-functions": "^7.20.7", - "@babel/helper-optimise-call-expression": "^7.18.6", - "@babel/helper-replace-supers": "^7.20.7", - "@babel/helper-skip-transparent-expression-wrappers": "^7.20.0", - "@babel/helper-split-export-declaration": "^7.18.6" - } - }, - "@babel/helper-create-regexp-features-plugin": { - "version": "7.20.5", - "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.20.5.tgz", - "integrity": "sha512-m68B1lkg3XDGX5yCvGO0kPx3v9WIYLnzjKfPcQiwntEQa5ZeRkPmo2X/ISJc8qxWGfwUr+kvZAeEzAwLec2r2w==", - "dev": true, - "requires": { - "@babel/helper-annotate-as-pure": "^7.18.6", - "regexpu-core": "^5.2.1" - } - }, - "@babel/helper-define-polyfill-provider": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.3.tgz", - "integrity": "sha512-z5aQKU4IzbqCC1XH0nAqfsFLMVSo22SBKUc0BxGrLkolTdPTructy0ToNnlO2zA4j9Q/7pjMZf0DSY+DSTYzww==", - "dev": true, - "requires": { - "@babel/helper-compilation-targets": "^7.17.7", - "@babel/helper-plugin-utils": "^7.16.7", - "debug": "^4.1.1", - "lodash.debounce": "^4.0.8", - "resolve": "^1.14.2", - "semver": "^6.1.2" - }, + "version": "0.13.3", + "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.13.3.tgz", + "integrity": "sha512-MKPbmZie6fASC/ps4dkmIhaT5eonHkEt6eAy80K42tAm0G2W+AahLJjbfi6X9NPdciOE9GRFTTM8u2IiF6O3ww==", "dependencies": { - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true - } - } - }, - "@babel/helper-environment-visitor": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz", - "integrity": "sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==", - "dev": true - }, - "@babel/helper-explode-assignable-expression": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.18.6.tgz", - "integrity": "sha512-eyAYAsQmB80jNfg4baAtLeWAQHfHFiR483rzFK+BhETlGZaQC9bsfrugfXDCbRHLQbIA7U5NxhhOxN7p/dWIcg==", - "dev": true, - "requires": { - "@babel/types": "^7.18.6" - } - }, - "@babel/helper-function-name": { - "version": "7.19.0", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz", - "integrity": "sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==", - "dev": true, - "requires": { - "@babel/template": "^7.18.10", - "@babel/types": "^7.19.0" - } - }, - "@babel/helper-hoist-variables": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz", - "integrity": "sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==", - "dev": true, - "requires": { - "@babel/types": "^7.18.6" - } - }, - "@babel/helper-member-expression-to-functions": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.20.7.tgz", - "integrity": "sha512-9J0CxJLq315fEdi4s7xK5TQaNYjZw+nDVpVqr1axNGKzdrdwYBD5b4uKv3n75aABG0rCCTK8Im8Ww7eYfMrZgw==", - "dev": true, - "requires": { - "@babel/types": "^7.20.7" - } - }, - "@babel/helper-module-imports": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz", - "integrity": "sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==", - "dev": true, - "requires": { - "@babel/types": "^7.18.6" - } - }, - "@babel/helper-module-transforms": { - "version": "7.20.11", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.20.11.tgz", - "integrity": "sha512-uRy78kN4psmji1s2QtbtcCSaj/LILFDp0f/ymhpQH5QY3nljUZCaNWz9X1dEj/8MBdBEFECs7yRhKn8i7NjZgg==", - "dev": true, - "requires": { - "@babel/helper-environment-visitor": "^7.18.9", - "@babel/helper-module-imports": "^7.18.6", - "@babel/helper-simple-access": "^7.20.2", - "@babel/helper-split-export-declaration": "^7.18.6", - "@babel/helper-validator-identifier": "^7.19.1", - "@babel/template": "^7.20.7", - "@babel/traverse": "^7.20.10", - "@babel/types": "^7.20.7" - } - }, - "@babel/helper-optimise-call-expression": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.18.6.tgz", - "integrity": "sha512-HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA==", - "dev": true, - "requires": { - "@babel/types": "^7.18.6" - } - }, - "@babel/helper-plugin-utils": { - "version": "7.20.2", - "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz", - "integrity": "sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ==", - "dev": true - }, - "@babel/helper-remap-async-to-generator": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.18.9.tgz", - "integrity": "sha512-dI7q50YKd8BAv3VEfgg7PS7yD3Rtbi2J1XMXaalXO0W0164hYLnh8zpjRS0mte9MfVp/tltvr/cfdXPvJr1opA==", - "dev": true, - "requires": { - "@babel/helper-annotate-as-pure": "^7.18.6", - "@babel/helper-environment-visitor": "^7.18.9", - "@babel/helper-wrap-function": "^7.18.9", - "@babel/types": "^7.18.9" - } - }, - "@babel/helper-replace-supers": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.20.7.tgz", - "integrity": "sha512-vujDMtB6LVfNW13jhlCrp48QNslK6JXi7lQG736HVbHz/mbf4Dc7tIRh1Xf5C0rF7BP8iiSxGMCmY6Ci1ven3A==", - "dev": true, - "requires": { - "@babel/helper-environment-visitor": "^7.18.9", - "@babel/helper-member-expression-to-functions": "^7.20.7", - "@babel/helper-optimise-call-expression": "^7.18.6", - "@babel/template": "^7.20.7", - "@babel/traverse": "^7.20.7", - "@babel/types": "^7.20.7" - } - }, - "@babel/helper-simple-access": { - "version": "7.20.2", - "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz", - "integrity": "sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA==", - "dev": true, - "requires": { - "@babel/types": "^7.20.2" - } - }, - "@babel/helper-skip-transparent-expression-wrappers": { - "version": "7.20.0", - "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.20.0.tgz", - "integrity": "sha512-5y1JYeNKfvnT8sZcK9DVRtpTbGiomYIHviSP3OQWmDPU3DeH4a1ZlT/N2lyQ5P8egjcRaT/Y9aNqUxK0WsnIIg==", - "dev": true, - "requires": { - "@babel/types": "^7.20.0" - } - }, - "@babel/helper-split-export-declaration": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz", - "integrity": "sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==", - "dev": true, - "requires": { - "@babel/types": "^7.18.6" - } - }, - "@babel/helper-string-parser": { - "version": "7.19.4", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz", - "integrity": "sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==", - "dev": true - }, - "@babel/helper-validator-identifier": { - "version": "7.19.1", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz", - "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==", - "dev": true - }, - "@babel/helper-validator-option": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz", - "integrity": "sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==", - "dev": true - }, - "@babel/helper-wrap-function": { - "version": "7.20.5", - "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.20.5.tgz", - "integrity": "sha512-bYMxIWK5mh+TgXGVqAtnu5Yn1un+v8DDZtqyzKRLUzrh70Eal2O3aZ7aPYiMADO4uKlkzOiRiZ6GX5q3qxvW9Q==", - "dev": true, - "requires": { - "@babel/helper-function-name": "^7.19.0", - "@babel/template": "^7.18.10", - "@babel/traverse": "^7.20.5", - "@babel/types": "^7.20.5" - } - }, - "@babel/helpers": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.20.7.tgz", - "integrity": "sha512-PBPjs5BppzsGaxHQCDKnZ6Gd9s6xl8bBCluz3vEInLGRJmnZan4F6BYCeqtyXqkk4W5IlPmjK4JlOuZkpJ3xZA==", - "dev": true, - "requires": { - "@babel/template": "^7.20.7", - "@babel/traverse": "^7.20.7", - "@babel/types": "^7.20.7" - } - }, - "@babel/highlight": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz", - "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==", - "dev": true, - "requires": { - "@babel/helper-validator-identifier": "^7.18.6", - "chalk": "^2.0.0", - "js-tokens": "^4.0.0" - } - }, - "@babel/parser": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.20.7.tgz", - "integrity": "sha512-T3Z9oHybU+0vZlY9CiDSJQTD5ZapcW18ZctFMi0MOAl/4BjFF4ul7NVSARLdbGO5vDqy9eQiGTV0LtKfvCYvcg==", - "dev": true - }, - "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6.tgz", - "integrity": "sha512-Dgxsyg54Fx1d4Nge8UnvTrED63vrwOdPmyvPzlNN/boaliRP54pm3pGzZD1SJUwrBA+Cs/xdG8kXX6Mn/RfISQ==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.18.6" - } - }, - "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.20.7.tgz", - "integrity": "sha512-sbr9+wNE5aXMBBFBICk01tt7sBf2Oc9ikRFEcem/ZORup9IMUdNhW7/wVLEbbtlWOsEubJet46mHAL2C8+2jKQ==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.20.2", - "@babel/helper-skip-transparent-expression-wrappers": "^7.20.0", - "@babel/plugin-proposal-optional-chaining": "^7.20.7" - } - }, - "@babel/plugin-proposal-async-generator-functions": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.20.7.tgz", - "integrity": "sha512-xMbiLsn/8RK7Wq7VeVytytS2L6qE69bXPB10YCmMdDZbKF4okCqY74pI/jJQ/8U0b/F6NrT2+14b8/P9/3AMGA==", - "dev": true, - "requires": { - "@babel/helper-environment-visitor": "^7.18.9", - "@babel/helper-plugin-utils": "^7.20.2", - "@babel/helper-remap-async-to-generator": "^7.18.9", - "@babel/plugin-syntax-async-generators": "^7.8.4" - } - }, - "@babel/plugin-proposal-class-properties": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz", - "integrity": "sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==", - "dev": true, - "requires": { - "@babel/helper-create-class-features-plugin": "^7.18.6", - "@babel/helper-plugin-utils": "^7.18.6" - } - }, - "@babel/plugin-proposal-class-static-block": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.20.7.tgz", - "integrity": "sha512-AveGOoi9DAjUYYuUAG//Ig69GlazLnoyzMw68VCDux+c1tsnnH/OkYcpz/5xzMkEFC6UxjR5Gw1c+iY2wOGVeQ==", - "dev": true, - "requires": { - "@babel/helper-create-class-features-plugin": "^7.20.7", - "@babel/helper-plugin-utils": "^7.20.2", - "@babel/plugin-syntax-class-static-block": "^7.14.5" - } - }, - "@babel/plugin-proposal-dynamic-import": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.18.6.tgz", - "integrity": "sha512-1auuwmK+Rz13SJj36R+jqFPMJWyKEDd7lLSdOj4oJK0UTgGueSAtkrCvz9ewmgyU/P941Rv2fQwZJN8s6QruXw==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.18.6", - "@babel/plugin-syntax-dynamic-import": "^7.8.3" - } - }, - "@babel/plugin-proposal-export-namespace-from": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.18.9.tgz", - "integrity": "sha512-k1NtHyOMvlDDFeb9G5PhUXuGj8m/wiwojgQVEhJ/fsVsMCpLyOP4h0uGEjYJKrRI+EVPlb5Jk+Gt9P97lOGwtA==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.18.9", - "@babel/plugin-syntax-export-namespace-from": "^7.8.3" - } - }, - "@babel/plugin-proposal-json-strings": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.18.6.tgz", - "integrity": "sha512-lr1peyn9kOdbYc0xr0OdHTZ5FMqS6Di+H0Fz2I/JwMzGmzJETNeOFq2pBySw6X/KFL5EWDjlJuMsUGRFb8fQgQ==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.18.6", - "@babel/plugin-syntax-json-strings": "^7.8.3" - } - }, - "@babel/plugin-proposal-logical-assignment-operators": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.20.7.tgz", - "integrity": "sha512-y7C7cZgpMIjWlKE5T7eJwp+tnRYM89HmRvWM5EQuB5BoHEONjmQ8lSNmBUwOyy/GFRsohJED51YBF79hE1djug==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.20.2", - "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4" - } - }, - "@babel/plugin-proposal-nullish-coalescing-operator": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz", - "integrity": "sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.18.6", - "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3" - } - }, - "@babel/plugin-proposal-numeric-separator": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz", - "integrity": "sha512-ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.18.6", - "@babel/plugin-syntax-numeric-separator": "^7.10.4" - } - }, - "@babel/plugin-proposal-object-rest-spread": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.20.7.tgz", - "integrity": "sha512-d2S98yCiLxDVmBmE8UjGcfPvNEUbA1U5q5WxaWFUGRzJSVAZqm5W6MbPct0jxnegUZ0niLeNX+IOzEs7wYg9Dg==", - "dev": true, - "requires": { - "@babel/compat-data": "^7.20.5", - "@babel/helper-compilation-targets": "^7.20.7", - "@babel/helper-plugin-utils": "^7.20.2", - "@babel/plugin-syntax-object-rest-spread": "^7.8.3", - "@babel/plugin-transform-parameters": "^7.20.7" - } - }, - "@babel/plugin-proposal-optional-catch-binding": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.18.6.tgz", - "integrity": "sha512-Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.18.6", - "@babel/plugin-syntax-optional-catch-binding": "^7.8.3" - } - }, - "@babel/plugin-proposal-optional-chaining": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.20.7.tgz", - "integrity": "sha512-T+A7b1kfjtRM51ssoOfS1+wbyCVqorfyZhT99TvxxLMirPShD8CzKMRepMlCBGM5RpHMbn8s+5MMHnPstJH6mQ==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.20.2", - "@babel/helper-skip-transparent-expression-wrappers": "^7.20.0", - "@babel/plugin-syntax-optional-chaining": "^7.8.3" - } - }, - "@babel/plugin-proposal-private-methods": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz", - "integrity": "sha512-nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA==", - "dev": true, - "requires": { - "@babel/helper-create-class-features-plugin": "^7.18.6", - "@babel/helper-plugin-utils": "^7.18.6" - } - }, - "@babel/plugin-proposal-private-property-in-object": { - "version": "7.20.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.20.5.tgz", - "integrity": "sha512-Vq7b9dUA12ByzB4EjQTPo25sFhY+08pQDBSZRtUAkj7lb7jahaHR5igera16QZ+3my1nYR4dKsNdYj5IjPHilQ==", - "dev": true, - "requires": { - "@babel/helper-annotate-as-pure": "^7.18.6", - "@babel/helper-create-class-features-plugin": "^7.20.5", - "@babel/helper-plugin-utils": "^7.20.2", - "@babel/plugin-syntax-private-property-in-object": "^7.14.5" - } - }, - "@babel/plugin-proposal-unicode-property-regex": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz", - "integrity": "sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w==", - "dev": true, - "requires": { - "@babel/helper-create-regexp-features-plugin": "^7.18.6", - "@babel/helper-plugin-utils": "^7.18.6" - } - }, - "@babel/plugin-syntax-async-generators": { - "version": "7.8.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz", - "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.8.0" - } - }, - "@babel/plugin-syntax-bigint": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz", - "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.8.0" - } - }, - "@babel/plugin-syntax-class-properties": { - "version": "7.12.13", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz", - "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.12.13" - } - }, - "@babel/plugin-syntax-class-static-block": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz", - "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.14.5" - } - }, - "@babel/plugin-syntax-dynamic-import": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz", - "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.8.0" - } - }, - "@babel/plugin-syntax-export-namespace-from": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz", - "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.8.3" - } - }, - "@babel/plugin-syntax-import-assertions": { - "version": "7.20.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.20.0.tgz", - "integrity": "sha512-IUh1vakzNoWalR8ch/areW7qFopR2AEw03JlG7BbrDqmQ4X3q9uuipQwSGrUn7oGiemKjtSLDhNtQHzMHr1JdQ==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.19.0" - } - }, - "@babel/plugin-syntax-import-meta": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz", - "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.10.4" - } - }, - "@babel/plugin-syntax-json-strings": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz", - "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.8.0" - } - }, - "@babel/plugin-syntax-logical-assignment-operators": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz", - "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.10.4" - } - }, - "@babel/plugin-syntax-nullish-coalescing-operator": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz", - "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.8.0" - } - }, - "@babel/plugin-syntax-numeric-separator": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz", - "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.10.4" - } - }, - "@babel/plugin-syntax-object-rest-spread": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz", - "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.8.0" - } - }, - "@babel/plugin-syntax-optional-catch-binding": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz", - "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.8.0" - } - }, - "@babel/plugin-syntax-optional-chaining": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz", - "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.8.0" - } - }, - "@babel/plugin-syntax-private-property-in-object": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz", - "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.14.5" - } - }, - "@babel/plugin-syntax-top-level-await": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz", - "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.14.5" - } - }, - "@babel/plugin-syntax-typescript": { - "version": "7.20.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.20.0.tgz", - "integrity": "sha512-rd9TkG+u1CExzS4SM1BlMEhMXwFLKVjOAFFCDx9PbX5ycJWDoWMcwdJH9RhkPu1dOgn5TrxLot/Gx6lWFuAUNQ==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.19.0" - } - }, - "@babel/plugin-transform-arrow-functions": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.20.7.tgz", - "integrity": "sha512-3poA5E7dzDomxj9WXWwuD6A5F3kc7VXwIJO+E+J8qtDtS+pXPAhrgEyh+9GBwBgPq1Z+bB+/JD60lp5jsN7JPQ==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.20.2" - } - }, - "@babel/plugin-transform-async-to-generator": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.20.7.tgz", - "integrity": "sha512-Uo5gwHPT9vgnSXQxqGtpdufUiWp96gk7yiP4Mp5bm1QMkEmLXBO7PAGYbKoJ6DhAwiNkcHFBol/x5zZZkL/t0Q==", - "dev": true, - "requires": { - "@babel/helper-module-imports": "^7.18.6", - "@babel/helper-plugin-utils": "^7.20.2", - "@babel/helper-remap-async-to-generator": "^7.18.9" - } - }, - "@babel/plugin-transform-block-scoped-functions": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.18.6.tgz", - "integrity": "sha512-ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.18.6" - } - }, - "@babel/plugin-transform-block-scoping": { - "version": "7.20.11", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.20.11.tgz", - "integrity": "sha512-tA4N427a7fjf1P0/2I4ScsHGc5jcHPbb30xMbaTke2gxDuWpUfXDuX1FEymJwKk4tuGUvGcejAR6HdZVqmmPyw==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.20.2" - } - }, - "@babel/plugin-transform-classes": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.20.7.tgz", - "integrity": "sha512-LWYbsiXTPKl+oBlXUGlwNlJZetXD5Am+CyBdqhPsDVjM9Jc8jwBJFrKhHf900Kfk2eZG1y9MAG3UNajol7A4VQ==", - "dev": true, - "requires": { - "@babel/helper-annotate-as-pure": "^7.18.6", - "@babel/helper-compilation-targets": "^7.20.7", - "@babel/helper-environment-visitor": "^7.18.9", - "@babel/helper-function-name": "^7.19.0", - "@babel/helper-optimise-call-expression": "^7.18.6", - "@babel/helper-plugin-utils": "^7.20.2", - "@babel/helper-replace-supers": "^7.20.7", - "@babel/helper-split-export-declaration": "^7.18.6", - "globals": "^11.1.0" - } - }, - "@babel/plugin-transform-computed-properties": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.20.7.tgz", - "integrity": "sha512-Lz7MvBK6DTjElHAmfu6bfANzKcxpyNPeYBGEafyA6E5HtRpjpZwU+u7Qrgz/2OR0z+5TvKYbPdphfSaAcZBrYQ==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.20.2", - "@babel/template": "^7.20.7" - } - }, - "@babel/plugin-transform-destructuring": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.20.7.tgz", - "integrity": "sha512-Xwg403sRrZb81IVB79ZPqNQME23yhugYVqgTxAhT99h485F4f+GMELFhhOsscDUB7HCswepKeCKLn/GZvUKoBA==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.20.2" - } - }, - "@babel/plugin-transform-dotall-regex": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.18.6.tgz", - "integrity": "sha512-6S3jpun1eEbAxq7TdjLotAsl4WpQI9DxfkycRcKrjhQYzU87qpXdknpBg/e+TdcMehqGnLFi7tnFUBR02Vq6wg==", - "dev": true, - "requires": { - "@babel/helper-create-regexp-features-plugin": "^7.18.6", - "@babel/helper-plugin-utils": "^7.18.6" - } - }, - "@babel/plugin-transform-duplicate-keys": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.18.9.tgz", - "integrity": "sha512-d2bmXCtZXYc59/0SanQKbiWINadaJXqtvIQIzd4+hNwkWBgyCd5F/2t1kXoUdvPMrxzPvhK6EMQRROxsue+mfw==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.18.9" - } - }, - "@babel/plugin-transform-exponentiation-operator": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.18.6.tgz", - "integrity": "sha512-wzEtc0+2c88FVR34aQmiz56dxEkxr2g8DQb/KfaFa1JYXOFVsbhvAonFN6PwVWj++fKmku8NP80plJ5Et4wqHw==", - "dev": true, - "requires": { - "@babel/helper-builder-binary-assignment-operator-visitor": "^7.18.6", - "@babel/helper-plugin-utils": "^7.18.6" - } - }, - "@babel/plugin-transform-for-of": { - "version": "7.18.8", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.18.8.tgz", - "integrity": "sha512-yEfTRnjuskWYo0k1mHUqrVWaZwrdq8AYbfrpqULOJOaucGSp4mNMVps+YtA8byoevxS/urwU75vyhQIxcCgiBQ==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.18.6" - } - }, - "@babel/plugin-transform-function-name": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.18.9.tgz", - "integrity": "sha512-WvIBoRPaJQ5yVHzcnJFor7oS5Ls0PYixlTYE63lCj2RtdQEl15M68FXQlxnG6wdraJIXRdR7KI+hQ7q/9QjrCQ==", - "dev": true, - "requires": { - "@babel/helper-compilation-targets": "^7.18.9", - "@babel/helper-function-name": "^7.18.9", - "@babel/helper-plugin-utils": "^7.18.9" - } - }, - "@babel/plugin-transform-literals": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.18.9.tgz", - "integrity": "sha512-IFQDSRoTPnrAIrI5zoZv73IFeZu2dhu6irxQjY9rNjTT53VmKg9fenjvoiOWOkJ6mm4jKVPtdMzBY98Fp4Z4cg==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.18.9" - } - }, - "@babel/plugin-transform-member-expression-literals": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.18.6.tgz", - "integrity": "sha512-qSF1ihLGO3q+/g48k85tUjD033C29TNTVB2paCwZPVmOsjn9pClvYYrM2VeJpBY2bcNkuny0YUyTNRyRxJ54KA==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.18.6" - } - }, - "@babel/plugin-transform-modules-amd": { - "version": "7.20.11", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.20.11.tgz", - "integrity": "sha512-NuzCt5IIYOW0O30UvqktzHYR2ud5bOWbY0yaxWZ6G+aFzOMJvrs5YHNikrbdaT15+KNO31nPOy5Fim3ku6Zb5g==", - "dev": true, - "requires": { - "@babel/helper-module-transforms": "^7.20.11", - "@babel/helper-plugin-utils": "^7.20.2" - } - }, - "@babel/plugin-transform-modules-commonjs": { - "version": "7.20.11", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.20.11.tgz", - "integrity": "sha512-S8e1f7WQ7cimJQ51JkAaDrEtohVEitXjgCGAS2N8S31Y42E+kWwfSz83LYz57QdBm7q9diARVqanIaH2oVgQnw==", - "dev": true, - "requires": { - "@babel/helper-module-transforms": "^7.20.11", - "@babel/helper-plugin-utils": "^7.20.2", - "@babel/helper-simple-access": "^7.20.2" - } - }, - "@babel/plugin-transform-modules-systemjs": { - "version": "7.20.11", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.20.11.tgz", - "integrity": "sha512-vVu5g9BPQKSFEmvt2TA4Da5N+QVS66EX21d8uoOihC+OCpUoGvzVsXeqFdtAEfVa5BILAeFt+U7yVmLbQnAJmw==", - "dev": true, - "requires": { - "@babel/helper-hoist-variables": "^7.18.6", - "@babel/helper-module-transforms": "^7.20.11", - "@babel/helper-plugin-utils": "^7.20.2", - "@babel/helper-validator-identifier": "^7.19.1" - } - }, - "@babel/plugin-transform-modules-umd": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.6.tgz", - "integrity": "sha512-dcegErExVeXcRqNtkRU/z8WlBLnvD4MRnHgNs3MytRO1Mn1sHRyhbcpYbVMGclAqOjdW+9cfkdZno9dFdfKLfQ==", - "dev": true, - "requires": { - "@babel/helper-module-transforms": "^7.18.6", - "@babel/helper-plugin-utils": "^7.18.6" - } - }, - "@babel/plugin-transform-named-capturing-groups-regex": { - "version": "7.20.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.20.5.tgz", - "integrity": "sha512-mOW4tTzi5iTLnw+78iEq3gr8Aoq4WNRGpmSlrogqaiCBoR1HFhpU4JkpQFOHfeYx3ReVIFWOQJS4aZBRvuZ6mA==", - "dev": true, - "requires": { - "@babel/helper-create-regexp-features-plugin": "^7.20.5", - "@babel/helper-plugin-utils": "^7.20.2" - } - }, - "@babel/plugin-transform-new-target": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.18.6.tgz", - "integrity": "sha512-DjwFA/9Iu3Z+vrAn+8pBUGcjhxKguSMlsFqeCKbhb9BAV756v0krzVK04CRDi/4aqmk8BsHb4a/gFcaA5joXRw==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.18.6" - } - }, - "@babel/plugin-transform-object-super": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.18.6.tgz", - "integrity": "sha512-uvGz6zk+pZoS1aTZrOvrbj6Pp/kK2mp45t2B+bTDre2UgsZZ8EZLSJtUg7m/no0zOJUWgFONpB7Zv9W2tSaFlA==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.18.6", - "@babel/helper-replace-supers": "^7.18.6" - } - }, - "@babel/plugin-transform-parameters": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.20.7.tgz", - "integrity": "sha512-WiWBIkeHKVOSYPO0pWkxGPfKeWrCJyD3NJ53+Lrp/QMSZbsVPovrVl2aWZ19D/LTVnaDv5Ap7GJ/B2CTOZdrfA==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.20.2" - } - }, - "@babel/plugin-transform-property-literals": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.18.6.tgz", - "integrity": "sha512-cYcs6qlgafTud3PAzrrRNbQtfpQ8+y/+M5tKmksS9+M1ckbH6kzY8MrexEM9mcA6JDsukE19iIRvAyYl463sMg==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.18.6" - } - }, - "@babel/plugin-transform-regenerator": { - "version": "7.20.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.20.5.tgz", - "integrity": "sha512-kW/oO7HPBtntbsahzQ0qSE3tFvkFwnbozz3NWFhLGqH75vLEg+sCGngLlhVkePlCs3Jv0dBBHDzCHxNiFAQKCQ==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.20.2", - "regenerator-transform": "^0.15.1" - } - }, - "@babel/plugin-transform-reserved-words": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.18.6.tgz", - "integrity": "sha512-oX/4MyMoypzHjFrT1CdivfKZ+XvIPMFXwwxHp/r0Ddy2Vuomt4HDFGmft1TAY2yiTKiNSsh3kjBAzcM8kSdsjA==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.18.6" - } - }, - "@babel/plugin-transform-runtime": { - "version": "7.19.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.19.6.tgz", - "integrity": "sha512-PRH37lz4JU156lYFW1p8OxE5i7d6Sl/zV58ooyr+q1J1lnQPyg5tIiXlIwNVhJaY4W3TmOtdc8jqdXQcB1v5Yw==", - "dev": true, - "requires": { - "@babel/helper-module-imports": "^7.18.6", - "@babel/helper-plugin-utils": "^7.19.0", - "babel-plugin-polyfill-corejs2": "^0.3.3", - "babel-plugin-polyfill-corejs3": "^0.6.0", - "babel-plugin-polyfill-regenerator": "^0.4.1", - "semver": "^6.3.0" - }, - "dependencies": { - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true - } - } - }, - "@babel/plugin-transform-shorthand-properties": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.18.6.tgz", - "integrity": "sha512-eCLXXJqv8okzg86ywZJbRn19YJHU4XUa55oz2wbHhaQVn/MM+XhukiT7SYqp/7o00dg52Rj51Ny+Ecw4oyoygw==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.18.6" - } - }, - "@babel/plugin-transform-spread": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.20.7.tgz", - "integrity": "sha512-ewBbHQ+1U/VnH1fxltbJqDeWBU1oNLG8Dj11uIv3xVf7nrQu0bPGe5Rf716r7K5Qz+SqtAOVswoVunoiBtGhxw==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.20.2", - "@babel/helper-skip-transparent-expression-wrappers": "^7.20.0" - } - }, - "@babel/plugin-transform-sticky-regex": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.18.6.tgz", - "integrity": "sha512-kfiDrDQ+PBsQDO85yj1icueWMfGfJFKN1KCkndygtu/C9+XUfydLC8Iv5UYJqRwy4zk8EcplRxEOeLyjq1gm6Q==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.18.6" - } - }, - "@babel/plugin-transform-template-literals": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.9.tgz", - "integrity": "sha512-S8cOWfT82gTezpYOiVaGHrCbhlHgKhQt8XH5ES46P2XWmX92yisoZywf5km75wv5sYcXDUCLMmMxOLCtthDgMA==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.18.9" - } - }, - "@babel/plugin-transform-typeof-symbol": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.18.9.tgz", - "integrity": "sha512-SRfwTtF11G2aemAZWivL7PD+C9z52v9EvMqH9BuYbabyPuKUvSWks3oCg6041pT925L4zVFqaVBeECwsmlguEw==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.18.9" - } - }, - "@babel/plugin-transform-unicode-escapes": { - "version": "7.18.10", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.18.10.tgz", - "integrity": "sha512-kKAdAI+YzPgGY/ftStBFXTI1LZFju38rYThnfMykS+IXy8BVx+res7s2fxf1l8I35DV2T97ezo6+SGrXz6B3iQ==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.18.9" - } - }, - "@babel/plugin-transform-unicode-regex": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.18.6.tgz", - "integrity": "sha512-gE7A6Lt7YLnNOL3Pb9BNeZvi+d8l7tcRrG4+pwJjK9hD2xX4mEvjlQW60G9EEmfXVYRPv9VRQcyegIVHCql/AA==", - "dev": true, - "requires": { - "@babel/helper-create-regexp-features-plugin": "^7.18.6", - "@babel/helper-plugin-utils": "^7.18.6" - } - }, - "@babel/preset-env": { - "version": "7.20.2", - "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.20.2.tgz", - "integrity": "sha512-1G0efQEWR1EHkKvKHqbG+IN/QdgwfByUpM5V5QroDzGV2t3S/WXNQd693cHiHTlCFMpr9B6FkPFXDA2lQcKoDg==", - "dev": true, - "requires": { - "@babel/compat-data": "^7.20.1", - "@babel/helper-compilation-targets": "^7.20.0", - "@babel/helper-plugin-utils": "^7.20.2", - "@babel/helper-validator-option": "^7.18.6", - "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.18.6", - "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.18.9", - "@babel/plugin-proposal-async-generator-functions": "^7.20.1", - "@babel/plugin-proposal-class-properties": "^7.18.6", - "@babel/plugin-proposal-class-static-block": "^7.18.6", - "@babel/plugin-proposal-dynamic-import": "^7.18.6", - "@babel/plugin-proposal-export-namespace-from": "^7.18.9", - "@babel/plugin-proposal-json-strings": "^7.18.6", - "@babel/plugin-proposal-logical-assignment-operators": "^7.18.9", - "@babel/plugin-proposal-nullish-coalescing-operator": "^7.18.6", - "@babel/plugin-proposal-numeric-separator": "^7.18.6", - "@babel/plugin-proposal-object-rest-spread": "^7.20.2", - "@babel/plugin-proposal-optional-catch-binding": "^7.18.6", - "@babel/plugin-proposal-optional-chaining": "^7.18.9", - "@babel/plugin-proposal-private-methods": "^7.18.6", - "@babel/plugin-proposal-private-property-in-object": "^7.18.6", - "@babel/plugin-proposal-unicode-property-regex": "^7.18.6", - "@babel/plugin-syntax-async-generators": "^7.8.4", - "@babel/plugin-syntax-class-properties": "^7.12.13", - "@babel/plugin-syntax-class-static-block": "^7.14.5", - "@babel/plugin-syntax-dynamic-import": "^7.8.3", - "@babel/plugin-syntax-export-namespace-from": "^7.8.3", - "@babel/plugin-syntax-import-assertions": "^7.20.0", - "@babel/plugin-syntax-json-strings": "^7.8.3", - "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4", - "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3", - "@babel/plugin-syntax-numeric-separator": "^7.10.4", - "@babel/plugin-syntax-object-rest-spread": "^7.8.3", - "@babel/plugin-syntax-optional-catch-binding": "^7.8.3", - "@babel/plugin-syntax-optional-chaining": "^7.8.3", - "@babel/plugin-syntax-private-property-in-object": "^7.14.5", - "@babel/plugin-syntax-top-level-await": "^7.14.5", - "@babel/plugin-transform-arrow-functions": "^7.18.6", - "@babel/plugin-transform-async-to-generator": "^7.18.6", - "@babel/plugin-transform-block-scoped-functions": "^7.18.6", - "@babel/plugin-transform-block-scoping": "^7.20.2", - "@babel/plugin-transform-classes": "^7.20.2", - "@babel/plugin-transform-computed-properties": "^7.18.9", - "@babel/plugin-transform-destructuring": "^7.20.2", - "@babel/plugin-transform-dotall-regex": "^7.18.6", - "@babel/plugin-transform-duplicate-keys": "^7.18.9", - "@babel/plugin-transform-exponentiation-operator": "^7.18.6", - "@babel/plugin-transform-for-of": "^7.18.8", - "@babel/plugin-transform-function-name": "^7.18.9", - "@babel/plugin-transform-literals": "^7.18.9", - "@babel/plugin-transform-member-expression-literals": "^7.18.6", - "@babel/plugin-transform-modules-amd": "^7.19.6", - "@babel/plugin-transform-modules-commonjs": "^7.19.6", - "@babel/plugin-transform-modules-systemjs": "^7.19.6", - "@babel/plugin-transform-modules-umd": "^7.18.6", - "@babel/plugin-transform-named-capturing-groups-regex": "^7.19.1", - "@babel/plugin-transform-new-target": "^7.18.6", - "@babel/plugin-transform-object-super": "^7.18.6", - "@babel/plugin-transform-parameters": "^7.20.1", - "@babel/plugin-transform-property-literals": "^7.18.6", - "@babel/plugin-transform-regenerator": "^7.18.6", - "@babel/plugin-transform-reserved-words": "^7.18.6", - "@babel/plugin-transform-shorthand-properties": "^7.18.6", - "@babel/plugin-transform-spread": "^7.19.0", - "@babel/plugin-transform-sticky-regex": "^7.18.6", - "@babel/plugin-transform-template-literals": "^7.18.9", - "@babel/plugin-transform-typeof-symbol": "^7.18.9", - "@babel/plugin-transform-unicode-escapes": "^7.18.10", - "@babel/plugin-transform-unicode-regex": "^7.18.6", - "@babel/preset-modules": "^0.1.5", - "@babel/types": "^7.20.2", - "babel-plugin-polyfill-corejs2": "^0.3.3", - "babel-plugin-polyfill-corejs3": "^0.6.0", - "babel-plugin-polyfill-regenerator": "^0.4.1", - "core-js-compat": "^3.25.1", - "semver": "^6.3.0" - }, - "dependencies": { - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true - } - } - }, - "@babel/preset-modules": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.5.tgz", - "integrity": "sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.0.0", - "@babel/plugin-proposal-unicode-property-regex": "^7.4.4", - "@babel/plugin-transform-dotall-regex": "^7.4.4", - "@babel/types": "^7.4.4", - "esutils": "^2.0.2" - } - }, - "@babel/runtime": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.7.tgz", - "integrity": "sha512-UF0tvkUtxwAgZ5W/KrkHf0Rn0fdnLDU9ScxBrEVNUprE/MzirjK4MJUX1/BVDv00Sv8cljtukVK1aky++X1SjQ==", - "dev": true, - "requires": { - "regenerator-runtime": "^0.13.11" - } - }, - "@babel/template": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.20.7.tgz", - "integrity": "sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.18.6", - "@babel/parser": "^7.20.7", - "@babel/types": "^7.20.7" - } - }, - "@babel/traverse": { - "version": "7.20.12", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.20.12.tgz", - "integrity": "sha512-MsIbFN0u+raeja38qboyF8TIT7K0BFzz/Yd/77ta4MsUsmP2RAnidIlwq7d5HFQrH/OZJecGV6B71C4zAgpoSQ==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.18.6", - "@babel/generator": "^7.20.7", - "@babel/helper-environment-visitor": "^7.18.9", - "@babel/helper-function-name": "^7.19.0", - "@babel/helper-hoist-variables": "^7.18.6", - "@babel/helper-split-export-declaration": "^7.18.6", - "@babel/parser": "^7.20.7", - "@babel/types": "^7.20.7", - "debug": "^4.1.0", - "globals": "^11.1.0" - } - }, - "@babel/types": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.20.7.tgz", - "integrity": "sha512-69OnhBxSSgK0OzTJai4kyPDiKTIe3j+ctaHdIGVbRahTLAT7L3R9oeXHC2aVSuGYt3cVnoAMDmOCgJ2yaiLMvg==", - "dev": true, - "requires": { - "@babel/helper-string-parser": "^7.19.4", - "@babel/helper-validator-identifier": "^7.19.1", - "to-fast-properties": "^2.0.0" - } - }, - "@bcgov/bc-sans": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@bcgov/bc-sans/-/bc-sans-1.0.1.tgz", - "integrity": "sha512-4suRUBFeHcuFkwXXJu9pKJNB5Z2G3bpuLEHIq203KVCKC8KrsnqvsyUOf645TypgLwqOTOYCETiXYzfxF4gLAw==" - }, - "@bcoe/v8-coverage": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz", - "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==", - "dev": true - }, - "@discoveryjs/json-ext": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz", - "integrity": "sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==", - "dev": true - }, - "@esbuild/android-arm": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.16.17.tgz", - "integrity": "sha512-N9x1CMXVhtWEAMS7pNNONyA14f71VPQN9Cnavj1XQh6T7bskqiLLrSca4O0Vr8Wdcga943eThxnVp3JLnBMYtw==", - "dev": true, - "optional": true - }, - "@esbuild/android-arm64": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.16.17.tgz", - "integrity": "sha512-MIGl6p5sc3RDTLLkYL1MyL8BMRN4tLMRCn+yRJJmEDvYZ2M7tmAf80hx1kbNEUX2KJ50RRtxZ4JHLvCfuB6kBg==", - "dev": true, - "optional": true - }, - "@esbuild/android-x64": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.16.17.tgz", - "integrity": "sha512-a3kTv3m0Ghh4z1DaFEuEDfz3OLONKuFvI4Xqczqx4BqLyuFaFkuaG4j2MtA6fuWEFeC5x9IvqnX7drmRq/fyAQ==", - "dev": true, - "optional": true - }, - "@esbuild/darwin-arm64": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.16.17.tgz", - "integrity": "sha512-/2agbUEfmxWHi9ARTX6OQ/KgXnOWfsNlTeLcoV7HSuSTv63E4DqtAc+2XqGw1KHxKMHGZgbVCZge7HXWX9Vn+w==", - "dev": true, - "optional": true - }, - "@esbuild/darwin-x64": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.16.17.tgz", - "integrity": "sha512-2By45OBHulkd9Svy5IOCZt376Aa2oOkiE9QWUK9fe6Tb+WDr8hXL3dpqi+DeLiMed8tVXspzsTAvd0jUl96wmg==", - "dev": true, - "optional": true - }, - "@esbuild/freebsd-arm64": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.16.17.tgz", - "integrity": "sha512-mt+cxZe1tVx489VTb4mBAOo2aKSnJ33L9fr25JXpqQqzbUIw/yzIzi+NHwAXK2qYV1lEFp4OoVeThGjUbmWmdw==", - "dev": true, - "optional": true - }, - "@esbuild/freebsd-x64": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.16.17.tgz", - "integrity": "sha512-8ScTdNJl5idAKjH8zGAsN7RuWcyHG3BAvMNpKOBaqqR7EbUhhVHOqXRdL7oZvz8WNHL2pr5+eIT5c65kA6NHug==", - "dev": true, - "optional": true - }, - "@esbuild/linux-arm": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.16.17.tgz", - "integrity": "sha512-iihzrWbD4gIT7j3caMzKb/RsFFHCwqqbrbH9SqUSRrdXkXaygSZCZg1FybsZz57Ju7N/SHEgPyaR0LZ8Zbe9gQ==", - "dev": true, - "optional": true - }, - "@esbuild/linux-arm64": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.16.17.tgz", - "integrity": "sha512-7S8gJnSlqKGVJunnMCrXHU9Q8Q/tQIxk/xL8BqAP64wchPCTzuM6W3Ra8cIa1HIflAvDnNOt2jaL17vaW+1V0g==", - "dev": true, - "optional": true - }, - "@esbuild/linux-ia32": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.16.17.tgz", - "integrity": "sha512-kiX69+wcPAdgl3Lonh1VI7MBr16nktEvOfViszBSxygRQqSpzv7BffMKRPMFwzeJGPxcio0pdD3kYQGpqQ2SSg==", - "dev": true, - "optional": true - }, - "@esbuild/linux-loong64": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.16.17.tgz", - "integrity": "sha512-dTzNnQwembNDhd654cA4QhbS9uDdXC3TKqMJjgOWsC0yNCbpzfWoXdZvp0mY7HU6nzk5E0zpRGGx3qoQg8T2DQ==", - "dev": true, - "optional": true - }, - "@esbuild/linux-mips64el": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.16.17.tgz", - "integrity": "sha512-ezbDkp2nDl0PfIUn0CsQ30kxfcLTlcx4Foz2kYv8qdC6ia2oX5Q3E/8m6lq84Dj/6b0FrkgD582fJMIfHhJfSw==", - "dev": true, - "optional": true - }, - "@esbuild/linux-ppc64": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.16.17.tgz", - "integrity": "sha512-dzS678gYD1lJsW73zrFhDApLVdM3cUF2MvAa1D8K8KtcSKdLBPP4zZSLy6LFZ0jYqQdQ29bjAHJDgz0rVbLB3g==", - "dev": true, - "optional": true - }, - "@esbuild/linux-riscv64": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.16.17.tgz", - "integrity": "sha512-ylNlVsxuFjZK8DQtNUwiMskh6nT0vI7kYl/4fZgV1llP5d6+HIeL/vmmm3jpuoo8+NuXjQVZxmKuhDApK0/cKw==", - "dev": true, - "optional": true - }, - "@esbuild/linux-s390x": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.16.17.tgz", - "integrity": "sha512-gzy7nUTO4UA4oZ2wAMXPNBGTzZFP7mss3aKR2hH+/4UUkCOyqmjXiKpzGrY2TlEUhbbejzXVKKGazYcQTZWA/w==", - "dev": true, - "optional": true - }, - "@esbuild/linux-x64": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.16.17.tgz", - "integrity": "sha512-mdPjPxfnmoqhgpiEArqi4egmBAMYvaObgn4poorpUaqmvzzbvqbowRllQ+ZgzGVMGKaPkqUmPDOOFQRUFDmeUw==", - "dev": true, - "optional": true - }, - "@esbuild/netbsd-x64": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.16.17.tgz", - "integrity": "sha512-/PzmzD/zyAeTUsduZa32bn0ORug+Jd1EGGAUJvqfeixoEISYpGnAezN6lnJoskauoai0Jrs+XSyvDhppCPoKOA==", - "dev": true, - "optional": true - }, - "@esbuild/openbsd-x64": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.16.17.tgz", - "integrity": "sha512-2yaWJhvxGEz2RiftSk0UObqJa/b+rIAjnODJgv2GbGGpRwAfpgzyrg1WLK8rqA24mfZa9GvpjLcBBg8JHkoodg==", - "dev": true, - "optional": true - }, - "@esbuild/sunos-x64": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.16.17.tgz", - "integrity": "sha512-xtVUiev38tN0R3g8VhRfN7Zl42YCJvyBhRKw1RJjwE1d2emWTVToPLNEQj/5Qxc6lVFATDiy6LjVHYhIPrLxzw==", - "dev": true, - "optional": true - }, - "@esbuild/win32-arm64": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.16.17.tgz", - "integrity": "sha512-ga8+JqBDHY4b6fQAmOgtJJue36scANy4l/rL97W+0wYmijhxKetzZdKOJI7olaBaMhWt8Pac2McJdZLxXWUEQw==", - "dev": true, - "optional": true - }, - "@esbuild/win32-ia32": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.16.17.tgz", - "integrity": "sha512-WnsKaf46uSSF/sZhwnqE4L/F89AYNMiD4YtEcYekBt9Q7nj0DiId2XH2Ng2PHM54qi5oPrQ8luuzGszqi/veig==", - "dev": true, - "optional": true - }, - "@esbuild/win32-x64": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.16.17.tgz", - "integrity": "sha512-y+EHuSchhL7FjHgvQL/0fnnFmO4T1bhvWANX6gcnqTjtnKWbTvUMCpGnv2+t+31d7RzyEAYAd4u2fnIhHL6N/Q==", - "dev": true, - "optional": true - }, - "@eslint/eslintrc": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.4.1.tgz", - "integrity": "sha512-XXrH9Uarn0stsyldqDYq8r++mROmWRI1xKMXa640Bb//SY1+ECYX6VzT6Lcx5frD0V30XieqJ0oX9I2Xj5aoMA==", - "dev": true, - "requires": { - "ajv": "^6.12.4", - "debug": "^4.3.2", - "espree": "^9.4.0", - "globals": "^13.19.0", - "ignore": "^5.2.0", - "import-fresh": "^3.2.1", - "js-yaml": "^4.1.0", - "minimatch": "^3.1.2", - "strip-json-comments": "^3.1.1" - }, - "dependencies": { - "ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", - "dev": true, - "requires": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - } - }, - "argparse": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", - "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", - "dev": true - }, - "brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "globals": { - "version": "13.19.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.19.0.tgz", - "integrity": "sha512-dkQ957uSRWHw7CFXLUtUHQI3g3aWApYhfNR2O6jn/907riyTYKVBmxYVROkBcY614FSSeSJh7Xm7SrUWCxvJMQ==", - "dev": true, - "requires": { - "type-fest": "^0.20.2" - } - }, - "js-yaml": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", - "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", - "dev": true, - "requires": { - "argparse": "^2.0.1" - } - }, - "json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true - }, - "minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "requires": { - "brace-expansion": "^1.1.7" - } - }, - "type-fest": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", - "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", - "dev": true - } - } - }, - "@gar/promisify": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz", - "integrity": "sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==", - "dev": true - }, - "@golevelup/ts-jest": { - "version": "0.3.4", - "resolved": "https://registry.npmjs.org/@golevelup/ts-jest/-/ts-jest-0.3.4.tgz", - "integrity": "sha512-UXas4+20gNmYfVR7DTJ9iRppy00o0ElqQrRQyn9cF3Gq90iM1Xx1lKvipTEe5NniHDD9FiMZNweOfB+9ebZRZA==", - "dev": true - }, - "@humanwhocodes/config-array": { - "version": "0.11.8", - "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.8.tgz", - "integrity": "sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g==", - "dev": true, - "requires": { - "@humanwhocodes/object-schema": "^1.2.1", - "debug": "^4.1.1", - "minimatch": "^3.0.5" - }, - "dependencies": { - "brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "requires": { - "brace-expansion": "^1.1.7" - } - } - } - }, - "@humanwhocodes/module-importer": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", - "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", - "dev": true - }, - "@humanwhocodes/object-schema": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz", - "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==", - "dev": true - }, - "@istanbuljs/load-nyc-config": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz", - "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==", - "dev": true, - "requires": { - "camelcase": "^5.3.1", - "find-up": "^4.1.0", - "get-package-type": "^0.1.0", - "js-yaml": "^3.13.1", - "resolve-from": "^5.0.0" - } - }, - "@istanbuljs/schema": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz", - "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==", - "dev": true - }, - "@jest/console": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/console/-/console-28.1.3.tgz", - "integrity": "sha512-QPAkP5EwKdK/bxIr6C1I4Vs0rm2nHiANzj/Z5X2JQkrZo6IqvC4ldZ9K95tF0HdidhA8Bo6egxSzUFPYKcEXLw==", - "dev": true, - "requires": { - "@jest/types": "^28.1.3", - "@types/node": "*", - "chalk": "^4.0.0", - "jest-message-util": "^28.1.3", - "jest-util": "^28.1.3", - "slash": "^3.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "@jest/core": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/core/-/core-28.1.3.tgz", - "integrity": "sha512-CIKBrlaKOzA7YG19BEqCw3SLIsEwjZkeJzf5bdooVnW4bH5cktqe3JX+G2YV1aK5vP8N9na1IGWFzYaTp6k6NA==", - "dev": true, - "requires": { - "@jest/console": "^28.1.3", - "@jest/reporters": "^28.1.3", - "@jest/test-result": "^28.1.3", - "@jest/transform": "^28.1.3", - "@jest/types": "^28.1.3", - "@types/node": "*", - "ansi-escapes": "^4.2.1", - "chalk": "^4.0.0", - "ci-info": "^3.2.0", - "exit": "^0.1.2", - "graceful-fs": "^4.2.9", - "jest-changed-files": "^28.1.3", - "jest-config": "^28.1.3", - "jest-haste-map": "^28.1.3", - "jest-message-util": "^28.1.3", - "jest-regex-util": "^28.0.2", - "jest-resolve": "^28.1.3", - "jest-resolve-dependencies": "^28.1.3", - "jest-runner": "^28.1.3", - "jest-runtime": "^28.1.3", - "jest-snapshot": "^28.1.3", - "jest-util": "^28.1.3", - "jest-validate": "^28.1.3", - "jest-watcher": "^28.1.3", - "micromatch": "^4.0.4", - "pretty-format": "^28.1.3", - "rimraf": "^3.0.0", - "slash": "^3.0.0", - "strip-ansi": "^6.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "@jest/environment": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-28.1.3.tgz", - "integrity": "sha512-1bf40cMFTEkKyEf585R9Iz1WayDjHoHqvts0XFYEqyKM3cFWDpeMoqKKTAF9LSYQModPUlh8FKptoM2YcMWAXA==", - "dev": true, - "requires": { - "@jest/fake-timers": "^28.1.3", - "@jest/types": "^28.1.3", - "@types/node": "*", - "jest-mock": "^28.1.3" - } - }, - "@jest/expect": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-28.1.3.tgz", - "integrity": "sha512-lzc8CpUbSoE4dqT0U+g1qODQjBRHPpCPXissXD4mS9+sWQdmmpeJ9zSH1rS1HEkrsMN0fb7nKrJ9giAR1d3wBw==", - "dev": true, - "requires": { - "expect": "^28.1.3", - "jest-snapshot": "^28.1.3" - } - }, - "@jest/expect-utils": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-28.1.3.tgz", - "integrity": "sha512-wvbi9LUrHJLn3NlDW6wF2hvIMtd4JUl2QNVrjq+IBSHirgfrR3o9RnVtxzdEGO2n9JyIWwHnLfby5KzqBGg2YA==", - "dev": true, - "requires": { - "jest-get-type": "^28.0.2" - } - }, - "@jest/fake-timers": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-28.1.3.tgz", - "integrity": "sha512-D/wOkL2POHv52h+ok5Oj/1gOG9HSywdoPtFsRCUmlCILXNn5eIWmcnd3DIiWlJnpGvQtmajqBP95Ei0EimxfLw==", - "dev": true, - "requires": { - "@jest/types": "^28.1.3", - "@sinonjs/fake-timers": "^9.1.2", - "@types/node": "*", - "jest-message-util": "^28.1.3", - "jest-mock": "^28.1.3", - "jest-util": "^28.1.3" - } - }, - "@jest/globals": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-28.1.3.tgz", - "integrity": "sha512-XFU4P4phyryCXu1pbcqMO0GSQcYe1IsalYCDzRNyhetyeyxMcIxa11qPNDpVNLeretItNqEmYYQn1UYz/5x1NA==", - "dev": true, - "requires": { - "@jest/environment": "^28.1.3", - "@jest/expect": "^28.1.3", - "@jest/types": "^28.1.3" - } - }, - "@jest/reporters": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-28.1.3.tgz", - "integrity": "sha512-JuAy7wkxQZVNU/V6g9xKzCGC5LVXx9FDcABKsSXp5MiKPEE2144a/vXTEDoyzjUpZKfVwp08Wqg5A4WfTMAzjg==", - "dev": true, - "requires": { - "@bcoe/v8-coverage": "^0.2.3", - "@jest/console": "^28.1.3", - "@jest/test-result": "^28.1.3", - "@jest/transform": "^28.1.3", - "@jest/types": "^28.1.3", - "@jridgewell/trace-mapping": "^0.3.13", - "@types/node": "*", - "chalk": "^4.0.0", - "collect-v8-coverage": "^1.0.0", - "exit": "^0.1.2", - "glob": "^7.1.3", - "graceful-fs": "^4.2.9", - "istanbul-lib-coverage": "^3.0.0", - "istanbul-lib-instrument": "^5.1.0", - "istanbul-lib-report": "^3.0.0", - "istanbul-lib-source-maps": "^4.0.0", - "istanbul-reports": "^3.1.3", - "jest-message-util": "^28.1.3", - "jest-util": "^28.1.3", - "jest-worker": "^28.1.3", - "slash": "^3.0.0", - "string-length": "^4.0.1", - "strip-ansi": "^6.0.0", - "terminal-link": "^2.0.0", - "v8-to-istanbul": "^9.0.1" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "dev": true, - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true - }, - "jest-worker": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-28.1.3.tgz", - "integrity": "sha512-CqRA220YV/6jCo8VWvAt1KKx6eek1VIHMPeLEbpcfSfkEeWyBNppynM/o6q+Wmw+sOhos2ml34wZbSX3G13//g==", - "dev": true, - "requires": { - "@types/node": "*", - "merge-stream": "^2.0.0", - "supports-color": "^8.0.0" - }, - "dependencies": { - "supports-color": { - "version": "8.1.1", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", - "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "requires": { - "brace-expansion": "^1.1.7" - } - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "@jest/schemas": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz", - "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==", - "dev": true, - "requires": { - "@sinclair/typebox": "^0.24.1" - } - }, - "@jest/source-map": { - "version": "28.1.2", - "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-28.1.2.tgz", - "integrity": "sha512-cV8Lx3BeStJb8ipPHnqVw/IM2VCMWO3crWZzYodSIkxXnRcXJipCdx1JCK0K5MsJJouZQTH73mzf4vgxRaH9ww==", - "dev": true, - "requires": { - "@jridgewell/trace-mapping": "^0.3.13", - "callsites": "^3.0.0", - "graceful-fs": "^4.2.9" - } - }, - "@jest/test-result": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-28.1.3.tgz", - "integrity": "sha512-kZAkxnSE+FqE8YjW8gNuoVkkC9I7S1qmenl8sGcDOLropASP+BkcGKwhXoyqQuGOGeYY0y/ixjrd/iERpEXHNg==", - "dev": true, - "requires": { - "@jest/console": "^28.1.3", - "@jest/types": "^28.1.3", - "@types/istanbul-lib-coverage": "^2.0.0", - "collect-v8-coverage": "^1.0.0" - } - }, - "@jest/test-sequencer": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-28.1.3.tgz", - "integrity": "sha512-NIMPEqqa59MWnDi1kvXXpYbqsfQmSJsIbnd85mdVGkiDfQ9WQQTXOLsvISUfonmnBT+w85WEgneCigEEdHDFxw==", - "dev": true, - "requires": { - "@jest/test-result": "^28.1.3", - "graceful-fs": "^4.2.9", - "jest-haste-map": "^28.1.3", - "slash": "^3.0.0" - } - }, - "@jest/transform": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-28.1.3.tgz", - "integrity": "sha512-u5dT5di+oFI6hfcLOHGTAfmUxFRrjK+vnaP0kkVow9Md/M7V/MxqQMOz/VV25UZO8pzeA9PjfTpOu6BDuwSPQA==", - "dev": true, - "requires": { - "@babel/core": "^7.11.6", - "@jest/types": "^28.1.3", - "@jridgewell/trace-mapping": "^0.3.13", - "babel-plugin-istanbul": "^6.1.1", - "chalk": "^4.0.0", - "convert-source-map": "^1.4.0", - "fast-json-stable-stringify": "^2.0.0", - "graceful-fs": "^4.2.9", - "jest-haste-map": "^28.1.3", - "jest-regex-util": "^28.0.2", - "jest-util": "^28.1.3", - "micromatch": "^4.0.4", - "pirates": "^4.0.4", - "slash": "^3.0.0", - "write-file-atomic": "^4.0.1" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "@jest/types": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz", - "integrity": "sha512-RyjiyMUZrKz/c+zlMFO1pm70DcIlST8AeWTkoUdZevew44wcNZQHsEVOiCVtgVnlFFD82FPaXycys58cf2muVQ==", - "dev": true, - "requires": { - "@jest/schemas": "^28.1.3", - "@types/istanbul-lib-coverage": "^2.0.0", - "@types/istanbul-reports": "^3.0.0", - "@types/node": "*", - "@types/yargs": "^17.0.8", - "chalk": "^4.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "@jridgewell/gen-mapping": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz", - "integrity": "sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==", - "dev": true, - "requires": { - "@jridgewell/set-array": "^1.0.0", - "@jridgewell/sourcemap-codec": "^1.4.10" - } - }, - "@jridgewell/resolve-uri": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz", - "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==", - "dev": true - }, - "@jridgewell/set-array": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz", - "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==", - "dev": true - }, - "@jridgewell/source-map": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.2.tgz", - "integrity": "sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==", - "dev": true, - "requires": { - "@jridgewell/gen-mapping": "^0.3.0", - "@jridgewell/trace-mapping": "^0.3.9" - }, - "dependencies": { - "@jridgewell/gen-mapping": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz", - "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==", - "dev": true, - "requires": { - "@jridgewell/set-array": "^1.0.1", - "@jridgewell/sourcemap-codec": "^1.4.10", - "@jridgewell/trace-mapping": "^0.3.9" - } - } - } - }, - "@jridgewell/sourcemap-codec": { - "version": "1.4.14", - "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz", - "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==", - "dev": true - }, - "@jridgewell/trace-mapping": { - "version": "0.3.17", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz", - "integrity": "sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==", - "dev": true, - "requires": { - "@jridgewell/resolve-uri": "3.1.0", - "@jridgewell/sourcemap-codec": "1.4.14" - } - }, - "@leichtgewicht/ip-codec": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz", - "integrity": "sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A==", - "dev": true - }, - "@material/animation": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/animation/-/animation-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-5osi1z4JQIXcklPALbH/zTfOm2pDzHt9Fxm7ZyURy250xIZj6QjULRzPTnzOhC2ropfix9ra2Cfggbf0dcRbEQ==", - "requires": { - "tslib": "^2.1.0" - } - }, - "@material/auto-init": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/auto-init/-/auto-init-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-OigQTmrVzkcGvxNjOaIe5oItTFPgrO9xLewvharDI6m6yvO1z7OBnkcW+sFN6ggLNYNxd0O1u9v64vMsmeDABQ==", - "requires": { - "@material/base": "15.0.0-canary.684e33d25.0", - "tslib": "^2.1.0" - } - }, - "@material/banner": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/banner/-/banner-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-PqtGp3KWzdu58rWv/DIvSfe38m5YKOBbAAbBinSvgadBb/da+IE1t5F7YPNKE1T5lJsQBGVUYx6QBIeXm+aI/A==", - "requires": { - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/button": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", - "tslib": "^2.1.0" - } - }, - "@material/base": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/base/-/base-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-oOaqb/SfjWwTKsdJUZmeh/Qrs41nIJI0N+zELsxnvbGjSIN1ZMAKYZFPMahqvC68OJ6+5CvJM8PoTNs5l+B8IQ==", - "requires": { - "tslib": "^2.1.0" - } - }, - "@material/button": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/button/-/button-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-Nkekk4edeX+ObVOa7UlwavaHdmckPV5wU4SAJf3iA3R61cmz+KsgAgpzfcwv5WfNhIlc2nLu8QYEecpHdo9d/w==", - "requires": { - "@material/density": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/focus-ring": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", - "@material/touch-target": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", - "tslib": "^2.1.0" - } - }, - "@material/card": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/card/-/card-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-xhyB7XX5KkEiCEqwSPkl58ZGYL6xFdnY62zimyBXJRG/Eaa0Swj3kW20hVCpt4f7c9Zmp8Se27rg8vnKmhvO3g==", - "requires": { - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", - "tslib": "^2.1.0" - } - }, - "@material/checkbox": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/checkbox/-/checkbox-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-NFpM3TS924PmVsk2KQLNU95OYCf8ZwYgzeqfnAexU0bEfjUJXINBun2Go0AaeOUMjuvWUe+byjrXgv8SFYbMUA==", - "requires": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/density": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/focus-ring": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/touch-target": "15.0.0-canary.684e33d25.0", - "tslib": "^2.1.0" - } - }, - "@material/chips": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/chips/-/chips-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-z4ajQ4NnsAQ/Si9tZ4xmxzjj2Qb+vW++4QjCjjjwAGIZbCe0xglAnMh2t66XLJUxt7RoKZuZVEO7ZqcFZpvJFQ==", - "requires": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/checkbox": "15.0.0-canary.684e33d25.0", - "@material/density": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/focus-ring": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", - "@material/touch-target": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", - "safevalues": "^0.3.4", - "tslib": "^2.1.0" - } - }, - "@material/circular-progress": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/circular-progress/-/circular-progress-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-G6qD0nGNtEUwWnAMJuA9INYFpZoKtx7KFjBaPF4Ol2YLHtmShALNAYyn54TMAK8AZ2IpW08PXjGS7Ye88vrdEQ==", - "requires": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/progress-indicator": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "tslib": "^2.1.0" - } - }, - "@material/data-table": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/data-table/-/data-table-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-+wDw1DDDFfAsKAMzs84f/5GCjux39zjNfW8tL4wFbkWNwewmQrG9zaQMJhBpVOtLCrM8Gj6SOgOANqgqoCjvGg==", - "requires": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/checkbox": "15.0.0-canary.684e33d25.0", - "@material/density": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/icon-button": "15.0.0-canary.684e33d25.0", - "@material/linear-progress": "15.0.0-canary.684e33d25.0", - "@material/list": "15.0.0-canary.684e33d25.0", - "@material/menu": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/select": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", - "@material/touch-target": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", - "tslib": "^2.1.0" - } - }, - "@material/density": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/density/-/density-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-661yEVRMGrlq6S6WuSbPRO+ZwpdUOg2glCc7y96doM6itSLOa3UEAldjOLfsYZVB74GnKCiuDp//QmfoRyYTfA==", - "requires": { - "tslib": "^2.1.0" - } - }, - "@material/dialog": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/dialog/-/dialog-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-szn0dHnfeQTSOC6SSRSGAzX6Tnx+4NnSMUwNkXm+3bwjds8ZVK26+DXwLrP5f3ID5F1K5sFsRf2INo5/TNTHyQ==", - "requires": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/button": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/icon-button": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", - "@material/touch-target": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", - "tslib": "^2.1.0" - } - }, - "@material/dom": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/dom/-/dom-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-7pEJLYov+tGgfuD8mZxoVU6rWtPI8ppjTAhz+F27Hz9FG0JETMWTKpDPBXLnKvX7vhIxL83GvZ9geNHCe8Hfog==", - "requires": { - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "tslib": "^2.1.0" - } - }, - "@material/drawer": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/drawer/-/drawer-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-/KMckLf1PYU/H3PXnS4e0aFl03qG3JlSv4LGgX6juJufcONqGTl/m63EMO/L/eUy6H1CRrXmVDjik/jzHLyDhg==", - "requires": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/list": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", - "tslib": "^2.1.0" - } - }, - "@material/elevation": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/elevation/-/elevation-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-WDF8SsRtq3rXUbVVbd9K4DUijIPH0bUFSOreVYxudpuxAfTlDS5+aeS1EK9UIBFYLuba4u5wVT2tDv6e1RTfrQ==", - "requires": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "tslib": "^2.1.0" - } - }, - "@material/fab": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/fab/-/fab-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-KCu87rWOKEAe9vZcAm6K8XazYSWPNjMG+OhrbPjHW6bCO7as1YCgtmkBkhff7csY/rFmcVpIy884xtUfLmSudQ==", - "requires": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/focus-ring": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", - "@material/touch-target": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", - "tslib": "^2.1.0" - } - }, - "@material/feature-targeting": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/feature-targeting/-/feature-targeting-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-HyH1erNTSjS63sigNSUMaCd0nJhTNdDFeC+myrxwtDaQm+uYJ8troCNtQM3g6mx0XATNtX5aTOoPmrM6yVVi1A==", - "requires": { - "tslib": "^2.1.0" - } - }, - "@material/floating-label": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/floating-label/-/floating-label-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-f7TPp6bKpGvV3sYYiZHSGlrixXKkXXITW3Esp7KB9jRq42c0H82novmdwvY0eTef4ootmA2JEysr78KQfHBUPg==", - "requires": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", - "tslib": "^2.1.0" - } - }, - "@material/focus-ring": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/focus-ring/-/focus-ring-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-ikw2RVUfgzXChpWIzPH1VzRvTjYb5ZKj4H+CZf7jqPUXMstFOZg90Bp7ARLZHqYiyNMuUq3zUTHozS6iHorSqg==", - "requires": { - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0" - } - }, - "@material/form-field": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/form-field/-/form-field-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-vpF9N/uq5no/7+8GAbEH0868FhOuBgxAWRr1Sfb+jthKfBr8OS/wPU/AHzZHdHdAm7PQynbeOXfDsX2dI//PDA==", - "requires": { - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", - "tslib": "^2.1.0" - } - }, - "@material/icon-button": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/icon-button/-/icon-button-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-wMI+XGzmIN/o2ePBKg2hLyx7H4pXCRAyyIKMQS1FMp1UKa2tYmiHVX/V8skhKwCqxg3i6Ls/LxMjfPxTR18WvQ==", - "requires": { - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/density": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/focus-ring": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/touch-target": "15.0.0-canary.684e33d25.0", - "tslib": "^2.1.0" - } - }, - "@material/image-list": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/image-list/-/image-list-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-Ol+uaHYBe5R/cgzlfh5ONnMVX0wO6fV74JMUcQCQlxP6lXau/edARo4tkRc7A7UJUkU3VRv0EpEjLoCRNUPGaA==", - "requires": { - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", - "tslib": "^2.1.0" - } - }, - "@material/layout-grid": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/layout-grid/-/layout-grid-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-ALXE1mqFNb/RB2lVRQ3/r1Aufw2mFZnOjRE+boYDVepmAG/xWyPCyaGoavELJF5l4GAb0tXi8wA/8HeGbLOpuA==", - "requires": { - "tslib": "^2.1.0" - } - }, - "@material/line-ripple": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/line-ripple/-/line-ripple-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-7hRx8C/e9i0P6pgQpNOMfTwSS2r1fwEvBL72QDVGLtLuoKKwsjjgP6Z0Jat/GeHJe87u9LQvGBoD4upt+of/HA==", - "requires": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "tslib": "^2.1.0" - } - }, - "@material/linear-progress": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/linear-progress/-/linear-progress-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-iJclt7mKmcMk6pqD7ocXKfCWZhqBoODp7N593jYlxVpTJuEz2wiVAjZUDn/YGj/Uz3CRH+2YFfOiLr9pwWjhDg==", - "requires": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/progress-indicator": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "tslib": "^2.1.0" - } - }, - "@material/list": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/list/-/list-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-rQ+FCSdzmwTcT00IYE0uRV3CS4oGSccKFl9hkcF+aHFW61L7ORh/SCGUDPrEfQFrFkMn5f8qroVJjpUAMXBz4g==", - "requires": { - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/density": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", - "tslib": "^2.1.0" - } - }, - "@material/menu": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/menu/-/menu-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-r7wzDLSGSI9629/mfpvsMzkVxpmV75kcD3IrW0Pcu6/Bv/1xi0EvjcUXzNJJoQlwN4Zj35Ymz/PCjZkIDIz68Q==", - "requires": { - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/list": "15.0.0-canary.684e33d25.0", - "@material/menu-surface": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", - "tslib": "^2.1.0" - } - }, - "@material/menu-surface": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/menu-surface/-/menu-surface-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-RVO5GAYcfWPaKwxsF/NhUAmrYXQCQBKvRQW0TIlbmAJz6lcFeTs6YZqF3u1C7qrL3ZQGz+sur/7ywj6QU0oMow==", - "requires": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "tslib": "^2.1.0" - } - }, - "@material/notched-outline": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/notched-outline/-/notched-outline-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-9YHcBkvJLPVYzkHcWoTpBZAFrEd+j1hjhGxLhh0LuNrZe8VroUkZD1TTnUAPHRG3os6EqEWWaKb0RN+aPIF2yQ==", - "requires": { - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/floating-label": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "tslib": "^2.1.0" - } - }, - "@material/progress-indicator": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/progress-indicator/-/progress-indicator-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-c0icji4faeNWUoqGENGC7Hav0Puxh0RwXIDVizffaUxKIGbajpIp5+4Zop73fK/xFLGMB/npg7TbP+aCGjQ3fw==", - "requires": { - "tslib": "^2.1.0" - } - }, - "@material/radio": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/radio/-/radio-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-U3Eh8sNUA8trDla1Bq8Bo02foxYvtoewaKeF8A8tAju81XZ4jRiftfOsOWZDZEHCVbbCB2QwvutvFlnay5n+Aw==", - "requires": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/density": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/focus-ring": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/touch-target": "15.0.0-canary.684e33d25.0", - "tslib": "^2.1.0" - } - }, - "@material/ripple": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/ripple/-/ripple-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-RyePu7SjIm/OuyyEieZ/gxiPYkNZOZHeid72WRcN9ofdlljj2pifcdPvcfZA+v/DMS33xo5GjG2L/Qj6ClWrKw==", - "requires": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "tslib": "^2.1.0" - } - }, - "@material/rtl": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/rtl/-/rtl-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-NqdJl8Ayupp1Th+vCNCpVQHbUFOuF7TCte9LD1norTIBUF/QizIxWby2W5uUEiPbnh5j9PmE1CJtfLwKun3pcw==", - "requires": { - "@material/theme": "15.0.0-canary.684e33d25.0", - "tslib": "^2.1.0" - } - }, - "@material/segmented-button": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/segmented-button/-/segmented-button-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-bEGgg8vgXNLyukyV8HRjFMuQ6t6nm5LQ4Pgm22um61Yc8qyi0BOqV41OR4SVdUrUqZxh1aVD+p+4NN03+LfQXw==", - "requires": { - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/touch-target": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", - "tslib": "^2.1.0" - } - }, - "@material/select": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/select/-/select-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-kf178/2TeEinTv0mgmSBcmmExQ2h7a7dtR1E3WuqQgisJ/R6+zVLMkC2CnfIyzxYX2vkuUTG0ue3Reh/6XiqSg==", - "requires": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/density": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/floating-label": "15.0.0-canary.684e33d25.0", - "@material/line-ripple": "15.0.0-canary.684e33d25.0", - "@material/list": "15.0.0-canary.684e33d25.0", - "@material/menu": "15.0.0-canary.684e33d25.0", - "@material/menu-surface": "15.0.0-canary.684e33d25.0", - "@material/notched-outline": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", - "tslib": "^2.1.0" - } - }, - "@material/shape": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/shape/-/shape-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-aEelpaTFmpnCji3TUGP9bVCS/bRVjUmLTHBPZtuu1gOrUVVtJ6kYOg73dZNJF+XOoNL2yOX/LRcKwsop29tptA==", - "requires": { - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "tslib": "^2.1.0" - } - }, - "@material/slider": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/slider/-/slider-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-WVyK+2pSNSZmj07M2K/a3TADoQ9FBCndfNC/vE7/wGIg4dddJJK5KvQ+yruf9R2cSzTL/S1sZ5WpyyeM8E9HTw==", - "requires": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", - "tslib": "^2.1.0" - } - }, - "@material/snackbar": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/snackbar/-/snackbar-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-itO+DCkOannZzR1/cCHcqAm7ifhuFvXmDItNoA8qLEcAyJDJJRkhpwj3XQ01yuo9gBFcSctp7Txt7e+Hncm/Jg==", - "requires": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/button": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/icon-button": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", - "tslib": "^2.1.0" - } - }, - "@material/switch": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/switch/-/switch-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-Jxi0gl92yvvZZsAPxvVHzXx2ga+T/djMow98jvEczmpUorWnAhgiCr9CsSSRoosahWyRB8NLZOxUQrACxvffjw==", - "requires": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/density": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/focus-ring": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", - "safevalues": "^0.3.4", - "tslib": "^2.1.0" - } - }, - "@material/tab": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/tab/-/tab-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-WQL3wj9syHNcfe8KbgGGUcA34M8C/xZ+n0Fkkh8Kk6puVwaU+xqUNihsxPY6YzKpmh4PZ4oJaBdiN8zvFT1zqQ==", - "requires": { - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/focus-ring": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/tab-indicator": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", - "tslib": "^2.1.0" - } - }, - "@material/tab-bar": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/tab-bar/-/tab-bar-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-SW/cMaDsIGGkM1ag3A7GJRlmr8eXmObWsvitQJzh6Azr5zzZtSI+GQygkMesAEE1gbpqOVN8d40rh3H7VVIAcA==", - "requires": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/density": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/tab": "15.0.0-canary.684e33d25.0", - "@material/tab-indicator": "15.0.0-canary.684e33d25.0", - "@material/tab-scroller": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", - "tslib": "^2.1.0" - } - }, - "@material/tab-indicator": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/tab-indicator/-/tab-indicator-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-kKICqSPqOlaf0lzaFFCmuOqPXJC+cK48Qmsc+m5o6fJhkmuZRCYpIwB2JeP+uZSOq/bTH+SrPtCtnVlgWg6ksA==", - "requires": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "tslib": "^2.1.0" - } - }, - "@material/tab-scroller": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/tab-scroller/-/tab-scroller-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-H6EU/TSiK/M2DyyORX5GEtXD9rKYxTMHC2VxsNWARPMFJGzgeW2ugYkFv+rKI1/c0bs0CJ4e+qFnOlBsQXZvyQ==", - "requires": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/tab": "15.0.0-canary.684e33d25.0", - "tslib": "^2.1.0" - } - }, - "@material/textfield": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/textfield/-/textfield-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-OvgpDXjvpyJTtAWskO69IDybFvDNzr9w2PN/Fk7yFm+uNVupaWz1Ew8lZ4gGslaTNSVmh2XcsvmzxcLINSiiNg==", - "requires": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/density": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/floating-label": "15.0.0-canary.684e33d25.0", - "@material/line-ripple": "15.0.0-canary.684e33d25.0", - "@material/notched-outline": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", - "tslib": "^2.1.0" - } - }, - "@material/theme": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/theme/-/theme-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-AZxaXXAvRKzAi20RlMxzt2U5UmkCWyv7DMWEBXsxtG5Tk54mi1HsbVUp3fxDPTlmL7Pq8p1/DESg/o7TgRCVlw==", - "requires": { - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "tslib": "^2.1.0" - } - }, - "@material/tokens": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/tokens/-/tokens-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-wVwbQOTCXDPKYPdHQHLr026y36MMFelID1CmbfRk6mSol4O8yE9U0fXcShfRDW8Qo5E3X31w9c2A6T3neJY7wQ==", - "requires": { - "@material/elevation": "15.0.0-canary.684e33d25.0" - } - }, - "@material/tooltip": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/tooltip/-/tooltip-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-dtm26QjxyQdinc8btgz6yys07b7bUW4FZgNF2EBPeGrICrPg7jf+JEvDziz5g8VMaTBQLOQRSCGy0MKuRlOjLw==", - "requires": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/button": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", - "safevalues": "^0.3.4", - "tslib": "^2.1.0" - } - }, - "@material/top-app-bar": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/top-app-bar/-/top-app-bar-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-1M+oupUxflfW7u81P1XlxoLZB8bLzwtpKofIfDNRbEsiKhlLTERJR3Yak3BGE9xakNMysAaBHlkb5MrN5bNPFw==", - "requires": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", - "tslib": "^2.1.0" - } - }, - "@material/touch-target": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/touch-target/-/touch-target-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-zdE69Slg8+T7sTn1OwqZ6H7WBYac9mxJ/JlJqfTqthzIjZRcCxBSYymQJcDHjsrPnUojOtr9U4Tpm5YZ96TEkQ==", - "requires": { - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "tslib": "^2.1.0" - } - }, - "@material/typography": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/typography/-/typography-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-aVnvgMwcfNa/K4wujzpKDIxjGl2hbkEL+m+OKDSQqWYjKcP9QrbzCXJruJBqxrBoPRHLbqo47k5f9uT8raSgjw==", - "requires": { - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "tslib": "^2.1.0" - } - }, - "@ngtools/webpack": { - "version": "15.1.2", - "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-15.1.2.tgz", - "integrity": "sha512-IxKPqyA5hiwUioAAptFaETF2TifH6cTGOc7qKYFxFgzK+llZtEBcNj3w9zrL5uCFnPHWDZqdIDhH3/WM4zBmkw==", - "dev": true, - "requires": {} - }, - "@nodelib/fs.scandir": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", - "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", - "dev": true, - "requires": { - "@nodelib/fs.stat": "2.0.5", - "run-parallel": "^1.1.9" - } - }, - "@nodelib/fs.stat": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", - "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", - "dev": true - }, - "@nodelib/fs.walk": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", - "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", - "dev": true, - "requires": { - "@nodelib/fs.scandir": "2.1.5", - "fastq": "^1.6.0" - } - }, - "@npmcli/fs": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-3.1.0.tgz", - "integrity": "sha512-7kZUAaLscfgbwBQRbvdMYaZOWyMEcPTH/tJjnyAWJ/dvvs9Ef+CERx/qJb9GExJpl1qipaDGn7KqHnFGGixd0w==", - "dev": true, - "requires": { - "semver": "^7.3.5" - } - }, - "@npmcli/git": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/@npmcli/git/-/git-4.0.3.tgz", - "integrity": "sha512-8cXNkDIbnXPVbhXMmQ7/bklCAjtmPaXfI9aEM4iH+xSuEHINLMHhlfESvVwdqmHJRJkR48vNJTSUvoF6GRPSFA==", - "dev": true, - "requires": { - "@npmcli/promise-spawn": "^6.0.0", - "lru-cache": "^7.4.4", - "mkdirp": "^1.0.4", - "npm-pick-manifest": "^8.0.0", - "proc-log": "^3.0.0", - "promise-inflight": "^1.0.1", - "promise-retry": "^2.0.1", - "semver": "^7.3.5", - "which": "^3.0.0" - }, - "dependencies": { - "lru-cache": { - "version": "7.14.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.14.1.tgz", - "integrity": "sha512-ysxwsnTKdAx96aTRdhDOCQfDgbHnt8SK0KY8SEjO0wHinhWOFTESbjVCMPbU1uGXg/ch4lifqx0wfjOawU2+WA==", - "dev": true - }, - "which": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/which/-/which-3.0.0.tgz", - "integrity": "sha512-nla//68K9NU6yRiwDY/Q8aU6siKlSs64aEC7+IV56QoAuyQT2ovsJcgGYGyqMOmI/CGN1BOR6mM5EN0FBO+zyQ==", - "dev": true, - "requires": { - "isexe": "^2.0.0" - } - } - } - }, - "@npmcli/installed-package-contents": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@npmcli/installed-package-contents/-/installed-package-contents-2.0.1.tgz", - "integrity": "sha512-GIykAFdOVK31Q1/zAtT5MbxqQL2vyl9mvFJv+OGu01zxbhL3p0xc8gJjdNGX1mWmUT43aEKVO2L6V/2j4TOsAA==", - "dev": true, - "requires": { - "npm-bundled": "^3.0.0", - "npm-normalize-package-bin": "^3.0.0" - } - }, - "@npmcli/move-file": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-2.0.1.tgz", - "integrity": "sha512-mJd2Z5TjYWq/ttPLLGqArdtnC74J6bOzg4rMDnN+p1xTacZ2yPRCk2y0oSWQtygLR9YVQXgOcONrwtnk3JupxQ==", - "dev": true, - "requires": { - "mkdirp": "^1.0.4", - "rimraf": "^3.0.2" - } - }, - "@npmcli/node-gyp": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@npmcli/node-gyp/-/node-gyp-3.0.0.tgz", - "integrity": "sha512-gp8pRXC2oOxu0DUE1/M3bYtb1b3/DbJ5aM113+XJBgfXdussRAsX0YOrOhdd8WvnAR6auDBvJomGAkLKA5ydxA==", - "dev": true - }, - "@npmcli/promise-spawn": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-6.0.2.tgz", - "integrity": "sha512-gGq0NJkIGSwdbUt4yhdF8ZrmkGKVz9vAdVzpOfnom+V8PLSmSOVhZwbNvZZS1EYcJN5hzzKBxmmVVAInM6HQLg==", - "dev": true, - "requires": { - "which": "^3.0.0" - }, - "dependencies": { - "which": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/which/-/which-3.0.0.tgz", - "integrity": "sha512-nla//68K9NU6yRiwDY/Q8aU6siKlSs64aEC7+IV56QoAuyQT2ovsJcgGYGyqMOmI/CGN1BOR6mM5EN0FBO+zyQ==", - "dev": true, - "requires": { - "isexe": "^2.0.0" - } - } - } - }, - "@npmcli/run-script": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/@npmcli/run-script/-/run-script-6.0.0.tgz", - "integrity": "sha512-ql+AbRur1TeOdl1FY+RAwGW9fcr4ZwiVKabdvm93mujGREVuVLbdkXRJDrkTXSdCjaxYydr1wlA2v67jxWG5BQ==", - "dev": true, - "requires": { - "@npmcli/node-gyp": "^3.0.0", - "@npmcli/promise-spawn": "^6.0.0", - "node-gyp": "^9.0.0", - "read-package-json-fast": "^3.0.0", - "which": "^3.0.0" - }, - "dependencies": { - "which": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/which/-/which-3.0.0.tgz", - "integrity": "sha512-nla//68K9NU6yRiwDY/Q8aU6siKlSs64aEC7+IV56QoAuyQT2ovsJcgGYGyqMOmI/CGN1BOR6mM5EN0FBO+zyQ==", - "dev": true, - "requires": { - "isexe": "^2.0.0" - } - } - } - }, - "@schematics/angular": { - "version": "15.1.2", - "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-15.1.2.tgz", - "integrity": "sha512-PcAbjbWvaW3yKvcGCqHrlHm4BTwGuqr58czCASc49Hy6tJba+dRblYatzB0D1tzdJOTsa684Ghg7knCN86fHeg==", - "dev": true, - "requires": { - "@angular-devkit/core": "15.1.2", - "@angular-devkit/schematics": "15.1.2", - "jsonc-parser": "3.2.0" - } - }, - "@sinclair/typebox": { - "version": "0.24.51", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz", - "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==", - "dev": true - }, - "@sinonjs/commons": { - "version": "1.8.6", - "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.6.tgz", - "integrity": "sha512-Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ==", - "dev": true, - "requires": { - "type-detect": "4.0.8" - } - }, - "@sinonjs/fake-timers": { - "version": "9.1.2", - "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-9.1.2.tgz", - "integrity": "sha512-BPS4ynJW/o92PUR4wgriz2Ud5gpST5vz6GQfMixEDK0Z8ZCUv2M7SkBLykH56T++Xs+8ln9zTGbOvNGIe02/jw==", - "dev": true, - "requires": { - "@sinonjs/commons": "^1.7.0" - } - }, - "@tootallnate/once": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz", - "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==", - "dev": true - }, - "@types/babel__core": { - "version": "7.20.0", - "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.0.tgz", - "integrity": "sha512-+n8dL/9GWblDO0iU6eZAwEIJVr5DWigtle+Q6HLOrh/pdbXOhOtqzq8VPPE2zvNJzSKY4vH/z3iT3tn0A3ypiQ==", - "dev": true, - "requires": { - "@babel/parser": "^7.20.7", - "@babel/types": "^7.20.7", - "@types/babel__generator": "*", - "@types/babel__template": "*", - "@types/babel__traverse": "*" - } - }, - "@types/babel__generator": { - "version": "7.6.4", - "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.4.tgz", - "integrity": "sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==", - "dev": true, - "requires": { - "@babel/types": "^7.0.0" - } - }, - "@types/babel__template": { - "version": "7.4.1", - "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.1.tgz", - "integrity": "sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==", - "dev": true, - "requires": { - "@babel/parser": "^7.1.0", - "@babel/types": "^7.0.0" - } - }, - "@types/babel__traverse": { - "version": "7.18.3", - "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.18.3.tgz", - "integrity": "sha512-1kbcJ40lLB7MHsj39U4Sh1uTd2E7rLEa79kmDpI6cy+XiXsteB3POdQomoq4FxszMrO3ZYchkhYJw7A2862b3w==", - "dev": true, - "requires": { - "@babel/types": "^7.3.0" - } - }, - "@types/body-parser": { - "version": "1.19.2", - "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.2.tgz", - "integrity": "sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==", - "dev": true, - "requires": { - "@types/connect": "*", - "@types/node": "*" - } - }, - "@types/bonjour": { - "version": "3.5.10", - "resolved": "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.10.tgz", - "integrity": "sha512-p7ienRMiS41Nu2/igbJxxLDWrSZ0WxM8UQgCeO9KhoVF7cOVFkrKsiDr1EsJIla8vV3oEEjGcz11jc5yimhzZw==", - "dev": true, - "requires": { - "@types/node": "*" - } - }, - "@types/connect": { - "version": "3.4.35", - "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.35.tgz", - "integrity": "sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==", - "dev": true, - "requires": { - "@types/node": "*" - } - }, - "@types/connect-history-api-fallback": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.3.5.tgz", - "integrity": "sha512-h8QJa8xSb1WD4fpKBDcATDNGXghFj6/3GRWG6dhmRcu0RX1Ubasur2Uvx5aeEwlf0MwblEC2bMzzMQntxnw/Cw==", - "dev": true, - "requires": { - "@types/express-serve-static-core": "*", - "@types/node": "*" - } - }, - "@types/eslint": { - "version": "8.4.10", - "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.10.tgz", - "integrity": "sha512-Sl/HOqN8NKPmhWo2VBEPm0nvHnu2LL3v9vKo8MEq0EtbJ4eVzGPl41VNPvn5E1i5poMk4/XD8UriLHpJvEP/Nw==", - "dev": true, - "requires": { - "@types/estree": "*", - "@types/json-schema": "*" - } - }, - "@types/eslint-scope": { - "version": "3.7.4", - "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.4.tgz", - "integrity": "sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==", - "dev": true, - "requires": { - "@types/eslint": "*", - "@types/estree": "*" - } - }, - "@types/estree": { - "version": "0.0.51", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.51.tgz", - "integrity": "sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==", - "dev": true - }, - "@types/express": { - "version": "4.17.15", - "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.15.tgz", - "integrity": "sha512-Yv0k4bXGOH+8a+7bELd2PqHQsuiANB+A8a4gnQrkRWzrkKlb6KHaVvyXhqs04sVW/OWlbPyYxRgYlIXLfrufMQ==", - "dev": true, - "requires": { - "@types/body-parser": "*", - "@types/express-serve-static-core": "^4.17.31", - "@types/qs": "*", - "@types/serve-static": "*" - } - }, - "@types/express-serve-static-core": { - "version": "4.17.32", - "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.32.tgz", - "integrity": "sha512-aI5h/VOkxOF2Z1saPy0Zsxs5avets/iaiAJYznQFm5By/pamU31xWKL//epiF4OfUA2qTOc9PV6tCUjhO8wlZA==", - "dev": true, - "requires": { - "@types/node": "*", - "@types/qs": "*", - "@types/range-parser": "*" - } - }, - "@types/graceful-fs": { - "version": "4.1.6", - "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.6.tgz", - "integrity": "sha512-Sig0SNORX9fdW+bQuTEovKj3uHcUL6LQKbCrrqb1X7J6/ReAbhCXRAhc+SMejhLELFj2QcyuxmUooZ4bt5ReSw==", - "dev": true, - "requires": { - "@types/node": "*" - } - }, - "@types/http-proxy": { - "version": "1.17.9", - "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.9.tgz", - "integrity": "sha512-QsbSjA/fSk7xB+UXlCT3wHBy5ai9wOcNDWwZAtud+jXhwOM3l+EYZh8Lng4+/6n8uar0J7xILzqftJdJ/Wdfkw==", - "dev": true, - "requires": { - "@types/node": "*" - } - }, - "@types/istanbul-lib-coverage": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz", - "integrity": "sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g==", - "dev": true - }, - "@types/istanbul-lib-report": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz", - "integrity": "sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==", - "dev": true, - "requires": { - "@types/istanbul-lib-coverage": "*" - } - }, - "@types/istanbul-reports": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz", - "integrity": "sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==", - "dev": true, - "requires": { - "@types/istanbul-lib-report": "*" - } - }, - "@types/jest": { - "version": "28.1.8", - "resolved": "https://registry.npmjs.org/@types/jest/-/jest-28.1.8.tgz", - "integrity": "sha512-8TJkV++s7B6XqnDrzR1m/TT0A0h948Pnl/097veySPN67VRAgQ4gZ7n2KfJo2rVq6njQjdxU3GCCyDvAeuHoiw==", - "dev": true, - "requires": { - "expect": "^28.0.0", - "pretty-format": "^28.0.0" - } - }, - "@types/jsdom": { - "version": "16.2.15", - "resolved": "https://registry.npmjs.org/@types/jsdom/-/jsdom-16.2.15.tgz", - "integrity": "sha512-nwF87yjBKuX/roqGYerZZM0Nv1pZDMAT5YhOHYeM/72Fic+VEqJh4nyoqoapzJnW3pUlfxPY5FhgsJtM+dRnQQ==", - "dev": true, - "requires": { - "@types/node": "*", - "@types/parse5": "^6.0.3", - "@types/tough-cookie": "*" - } - }, - "@types/json-schema": { - "version": "7.0.11", - "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz", - "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==", - "dev": true - }, - "@types/mime": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/@types/mime/-/mime-3.0.1.tgz", - "integrity": "sha512-Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA==", - "dev": true - }, - "@types/node": { - "version": "18.11.9", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.9.tgz", - "integrity": "sha512-CRpX21/kGdzjOpFsZSkcrXMGIBWMGNIHXXBVFSH+ggkftxg+XYP20TESbh+zFvFj3EQOl5byk0HTRn1IL6hbqg==", - "dev": true - }, - "@types/parse-json": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz", - "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==", - "dev": true - }, - "@types/parse5": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/@types/parse5/-/parse5-6.0.3.tgz", - "integrity": "sha512-SuT16Q1K51EAVPz1K29DJ/sXjhSQ0zjvsypYJ6tlwVsRV9jwW5Adq2ch8Dq8kDBCkYnELS7N7VNCSB5nC56t/g==", - "dev": true - }, - "@types/prettier": { - "version": "2.7.2", - "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.7.2.tgz", - "integrity": "sha512-KufADq8uQqo1pYKVIYzfKbJfBAc0sOeXqGbFaSpv8MRmC/zXgowNZmFcbngndGk922QDmOASEXUZCaY48gs4cg==", - "dev": true - }, - "@types/qs": { - "version": "6.9.7", - "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.7.tgz", - "integrity": "sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==", - "dev": true - }, - "@types/range-parser": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.4.tgz", - "integrity": "sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==", - "dev": true - }, - "@types/retry": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.0.tgz", - "integrity": "sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==", - "dev": true - }, - "@types/semver": { - "version": "7.3.13", - "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.3.13.tgz", - "integrity": "sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw==", - "dev": true - }, - "@types/serve-index": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.1.tgz", - "integrity": "sha512-d/Hs3nWDxNL2xAczmOVZNj92YZCS6RGxfBPjKzuu/XirCgXdpKEb88dYNbrYGint6IVWLNP+yonwVAuRC0T2Dg==", - "dev": true, - "requires": { - "@types/express": "*" - } - }, - "@types/serve-static": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.0.tgz", - "integrity": "sha512-z5xyF6uh8CbjAu9760KDKsH2FcDxZ2tFCsA4HIMWE6IkiYMXfVoa+4f9KX+FN0ZLsaMw1WNG2ETLA6N+/YA+cg==", - "dev": true, - "requires": { - "@types/mime": "*", - "@types/node": "*" - } - }, - "@types/sockjs": { - "version": "0.3.33", - "resolved": "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.33.tgz", - "integrity": "sha512-f0KEEe05NvUnat+boPTZ0dgaLZ4SfSouXUgv5noUiefG2ajgKjmETo9ZJyuqsl7dfl2aHlLJUiki6B4ZYldiiw==", - "dev": true, - "requires": { - "@types/node": "*" - } - }, - "@types/stack-utils": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.1.tgz", - "integrity": "sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==", - "dev": true - }, - "@types/tough-cookie": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.2.tgz", - "integrity": "sha512-Q5vtl1W5ue16D+nIaW8JWebSSraJVlK+EthKn7e7UcD4KWsaSJ8BqGPXNaPghgtcn/fhvrN17Tv8ksUsQpiplw==", - "dev": true - }, - "@types/ws": { - "version": "8.5.4", - "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.4.tgz", - "integrity": "sha512-zdQDHKUgcX/zBc4GrwsE/7dVdAD8JR4EuiAXiiUhhfyIJXXb2+PrGshFyeXWQPMmmZ2XxgaqclgpIC7eTXc1mg==", - "dev": true, - "requires": { - "@types/node": "*" - } - }, - "@types/yargs": { - "version": "17.0.17", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.17.tgz", - "integrity": "sha512-72bWxFKTK6uwWJAVT+3rF6Jo6RTojiJ27FQo8Rf60AL+VZbzoVPnMFhKsUnbjR8A3BTCYQ7Mv3hnl8T0A+CX9g==", - "dev": true, - "requires": { - "@types/yargs-parser": "*" - } - }, - "@types/yargs-parser": { - "version": "21.0.0", - "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.0.tgz", - "integrity": "sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==", - "dev": true - }, - "@typescript-eslint/eslint-plugin": { - "version": "5.49.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.49.0.tgz", - "integrity": "sha512-IhxabIpcf++TBaBa1h7jtOWyon80SXPRLDq0dVz5SLFC/eW6tofkw/O7Ar3lkx5z5U6wzbKDrl2larprp5kk5Q==", - "dev": true, - "requires": { - "@typescript-eslint/scope-manager": "5.49.0", - "@typescript-eslint/type-utils": "5.49.0", - "@typescript-eslint/utils": "5.49.0", - "debug": "^4.3.4", - "ignore": "^5.2.0", - "natural-compare-lite": "^1.4.0", - "regexpp": "^3.2.0", - "semver": "^7.3.7", - "tsutils": "^3.21.0" - } - }, - "@typescript-eslint/parser": { - "version": "5.49.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.49.0.tgz", - "integrity": "sha512-veDlZN9mUhGqU31Qiv2qEp+XrJj5fgZpJ8PW30sHU+j/8/e5ruAhLaVDAeznS7A7i4ucb/s8IozpDtt9NqCkZg==", - "dev": true, - "requires": { - "@typescript-eslint/scope-manager": "5.49.0", - "@typescript-eslint/types": "5.49.0", - "@typescript-eslint/typescript-estree": "5.49.0", - "debug": "^4.3.4" - } - }, - "@typescript-eslint/scope-manager": { - "version": "5.49.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.49.0.tgz", - "integrity": "sha512-clpROBOiMIzpbWNxCe1xDK14uPZh35u4QaZO1GddilEzoCLAEz4szb51rBpdgurs5k2YzPtJeTEN3qVbG+LRUQ==", - "dev": true, - "requires": { - "@typescript-eslint/types": "5.49.0", - "@typescript-eslint/visitor-keys": "5.49.0" - } - }, - "@typescript-eslint/type-utils": { - "version": "5.49.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.49.0.tgz", - "integrity": "sha512-eUgLTYq0tR0FGU5g1YHm4rt5H/+V2IPVkP0cBmbhRyEmyGe4XvJ2YJ6sYTmONfjmdMqyMLad7SB8GvblbeESZA==", - "dev": true, - "requires": { - "@typescript-eslint/typescript-estree": "5.49.0", - "@typescript-eslint/utils": "5.49.0", - "debug": "^4.3.4", - "tsutils": "^3.21.0" - } - }, - "@typescript-eslint/types": { - "version": "5.49.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.49.0.tgz", - "integrity": "sha512-7If46kusG+sSnEpu0yOz2xFv5nRz158nzEXnJFCGVEHWnuzolXKwrH5Bsf9zsNlOQkyZuk0BZKKoJQI+1JPBBg==", - "dev": true - }, - "@typescript-eslint/typescript-estree": { - "version": "5.49.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.49.0.tgz", - "integrity": "sha512-PBdx+V7deZT/3GjNYPVQv1Nc0U46dAHbIuOG8AZ3on3vuEKiPDwFE/lG1snN2eUB9IhF7EyF7K1hmTcLztNIsA==", - "dev": true, - "requires": { - "@typescript-eslint/types": "5.49.0", - "@typescript-eslint/visitor-keys": "5.49.0", - "debug": "^4.3.4", - "globby": "^11.1.0", - "is-glob": "^4.0.3", - "semver": "^7.3.7", - "tsutils": "^3.21.0" - } - }, - "@typescript-eslint/utils": { - "version": "5.49.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.49.0.tgz", - "integrity": "sha512-cPJue/4Si25FViIb74sHCLtM4nTSBXtLx1d3/QT6mirQ/c65bV8arBEebBJJizfq8W2YyMoPI/WWPFWitmNqnQ==", - "dev": true, - "requires": { - "@types/json-schema": "^7.0.9", - "@types/semver": "^7.3.12", - "@typescript-eslint/scope-manager": "5.49.0", - "@typescript-eslint/types": "5.49.0", - "@typescript-eslint/typescript-estree": "5.49.0", - "eslint-scope": "^5.1.1", - "eslint-utils": "^3.0.0", - "semver": "^7.3.7" - } - }, - "@typescript-eslint/visitor-keys": { - "version": "5.49.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.49.0.tgz", - "integrity": "sha512-v9jBMjpNWyn8B6k/Mjt6VbUS4J1GvUlR4x3Y+ibnP1z7y7V4n0WRz+50DY6+Myj0UaXVSuUlHohO+eZ8IJEnkg==", - "dev": true, - "requires": { - "@typescript-eslint/types": "5.49.0", - "eslint-visitor-keys": "^3.3.0" - } - }, - "@webassemblyjs/ast": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz", - "integrity": "sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==", - "dev": true, - "requires": { - "@webassemblyjs/helper-numbers": "1.11.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.1" - } - }, - "@webassemblyjs/floating-point-hex-parser": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz", - "integrity": "sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==", - "dev": true - }, - "@webassemblyjs/helper-api-error": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz", - "integrity": "sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==", - "dev": true - }, - "@webassemblyjs/helper-buffer": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz", - "integrity": "sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==", - "dev": true - }, - "@webassemblyjs/helper-numbers": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz", - "integrity": "sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==", - "dev": true, - "requires": { - "@webassemblyjs/floating-point-hex-parser": "1.11.1", - "@webassemblyjs/helper-api-error": "1.11.1", - "@xtuc/long": "4.2.2" - } - }, - "@webassemblyjs/helper-wasm-bytecode": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz", - "integrity": "sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==", - "dev": true - }, - "@webassemblyjs/helper-wasm-section": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz", - "integrity": "sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==", - "dev": true, - "requires": { - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/helper-buffer": "1.11.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.1", - "@webassemblyjs/wasm-gen": "1.11.1" - } - }, - "@webassemblyjs/ieee754": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz", - "integrity": "sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==", - "dev": true, - "requires": { - "@xtuc/ieee754": "^1.2.0" - } - }, - "@webassemblyjs/leb128": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.1.tgz", - "integrity": "sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==", - "dev": true, - "requires": { - "@xtuc/long": "4.2.2" - } - }, - "@webassemblyjs/utf8": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.1.tgz", - "integrity": "sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==", - "dev": true - }, - "@webassemblyjs/wasm-edit": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz", - "integrity": "sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==", - "dev": true, - "requires": { - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/helper-buffer": "1.11.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.1", - "@webassemblyjs/helper-wasm-section": "1.11.1", - "@webassemblyjs/wasm-gen": "1.11.1", - "@webassemblyjs/wasm-opt": "1.11.1", - "@webassemblyjs/wasm-parser": "1.11.1", - "@webassemblyjs/wast-printer": "1.11.1" - } - }, - "@webassemblyjs/wasm-gen": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz", - "integrity": "sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==", - "dev": true, - "requires": { - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.1", - "@webassemblyjs/ieee754": "1.11.1", - "@webassemblyjs/leb128": "1.11.1", - "@webassemblyjs/utf8": "1.11.1" - } - }, - "@webassemblyjs/wasm-opt": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz", - "integrity": "sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==", - "dev": true, - "requires": { - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/helper-buffer": "1.11.1", - "@webassemblyjs/wasm-gen": "1.11.1", - "@webassemblyjs/wasm-parser": "1.11.1" - } - }, - "@webassemblyjs/wasm-parser": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz", - "integrity": "sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==", - "dev": true, - "requires": { - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/helper-api-error": "1.11.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.1", - "@webassemblyjs/ieee754": "1.11.1", - "@webassemblyjs/leb128": "1.11.1", - "@webassemblyjs/utf8": "1.11.1" - } - }, - "@webassemblyjs/wast-printer": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz", - "integrity": "sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==", - "dev": true, - "requires": { - "@webassemblyjs/ast": "1.11.1", - "@xtuc/long": "4.2.2" - } - }, - "@xtuc/ieee754": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz", - "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==", - "dev": true - }, - "@xtuc/long": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz", - "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==", - "dev": true - }, - "@yarnpkg/lockfile": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz", - "integrity": "sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==", - "dev": true - }, - "abab": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz", - "integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==", - "dev": true - }, - "abbrev": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", - "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", - "dev": true - }, - "accepts": { - "version": "1.3.8", - "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz", - "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==", - "dev": true, - "requires": { - "mime-types": "~2.1.34", - "negotiator": "0.6.3" - } - }, - "acorn": { - "version": "8.8.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz", - "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==", - "dev": true - }, - "acorn-globals": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-6.0.0.tgz", - "integrity": "sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==", - "dev": true, - "requires": { - "acorn": "^7.1.1", - "acorn-walk": "^7.1.1" - }, - "dependencies": { - "acorn": { - "version": "7.4.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", - "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==", - "dev": true - } - } - }, - "acorn-import-assertions": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz", - "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==", - "dev": true, - "requires": {} - }, - "acorn-jsx": { - "version": "5.3.2", - "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", - "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", - "dev": true, - "requires": {} - }, - "acorn-walk": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz", - "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==", - "dev": true - }, - "adjust-sourcemap-loader": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/adjust-sourcemap-loader/-/adjust-sourcemap-loader-4.0.0.tgz", - "integrity": "sha512-OXwN5b9pCUXNQHJpwwD2qP40byEmSgzj8B4ydSN0uMNYWiFmJ6x6KwUllMmfk8Rwu/HJDFR7U8ubsWBoN0Xp0A==", - "dev": true, - "requires": { - "loader-utils": "^2.0.0", - "regex-parser": "^2.2.11" - }, - "dependencies": { - "loader-utils": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz", - "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==", - "dev": true, - "requires": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^2.1.2" - } - } - } - }, - "agent-base": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", - "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", - "dev": true, - "requires": { - "debug": "4" - } - }, - "agentkeepalive": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.2.1.tgz", - "integrity": "sha512-Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA==", - "dev": true, - "requires": { - "debug": "^4.1.0", - "depd": "^1.1.2", - "humanize-ms": "^1.2.1" - } - }, - "aggregate-error": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz", - "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==", - "dev": true, - "requires": { - "clean-stack": "^2.0.0", - "indent-string": "^4.0.0" - } - }, - "ajv": { - "version": "8.12.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz", - "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==", - "dev": true, - "requires": { - "fast-deep-equal": "^3.1.1", - "json-schema-traverse": "^1.0.0", - "require-from-string": "^2.0.2", - "uri-js": "^4.2.2" - } - }, - "ajv-formats": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz", - "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==", - "dev": true, - "requires": { - "ajv": "^8.0.0" - } - }, - "ajv-keywords": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz", - "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==", - "dev": true, - "requires": { - "fast-deep-equal": "^3.1.3" - } - }, - "ansi-colors": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz", - "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==", - "dev": true - }, - "ansi-escapes": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz", - "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==", - "dev": true, - "requires": { - "type-fest": "^0.21.3" - } - }, - "ansi-html-community": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/ansi-html-community/-/ansi-html-community-0.0.8.tgz", - "integrity": "sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==", - "dev": true - }, - "ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true - }, - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "requires": { - "color-convert": "^1.9.0" - } - }, - "anymatch": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", - "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", - "dev": true, - "requires": { - "normalize-path": "^3.0.0", - "picomatch": "^2.0.4" - } - }, - "aproba": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz", - "integrity": "sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==", - "dev": true - }, - "are-we-there-yet": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz", - "integrity": "sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg==", - "dev": true, - "requires": { - "delegates": "^1.0.0", - "readable-stream": "^3.6.0" - } - }, - "argparse": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", - "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", - "dev": true, - "requires": { - "sprintf-js": "~1.0.2" - } - }, - "array-flatten": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz", - "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==", - "dev": true - }, - "array-union": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", - "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", - "dev": true - }, - "asynckit": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==", - "dev": true - }, - "autoprefixer": { - "version": "10.4.13", - "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.13.tgz", - "integrity": "sha512-49vKpMqcZYsJjwotvt4+h/BCjJVnhGwcLpDt5xkcaOG3eLrG/HUYLagrihYsQ+qrIBgIzX1Rw7a6L8I/ZA1Atg==", - "dev": true, - "requires": { - "browserslist": "^4.21.4", - "caniuse-lite": "^1.0.30001426", - "fraction.js": "^4.2.0", - "normalize-range": "^0.1.2", - "picocolors": "^1.0.0", - "postcss-value-parser": "^4.2.0" - } - }, - "babel-jest": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-28.1.3.tgz", - "integrity": "sha512-epUaPOEWMk3cWX0M/sPvCHHCe9fMFAa/9hXEgKP8nFfNl/jlGkE9ucq9NqkZGXLDduCJYS0UvSlPUwC0S+rH6Q==", - "dev": true, - "requires": { - "@jest/transform": "^28.1.3", - "@types/babel__core": "^7.1.14", - "babel-plugin-istanbul": "^6.1.1", - "babel-preset-jest": "^28.1.3", - "chalk": "^4.0.0", - "graceful-fs": "^4.2.9", - "slash": "^3.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "babel-loader": { - "version": "9.1.2", - "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-9.1.2.tgz", - "integrity": "sha512-mN14niXW43tddohGl8HPu5yfQq70iUThvFL/4QzESA7GcZoC0eVOhvWdQ8+3UlSjaDE9MVtsW9mxDY07W7VpVA==", - "dev": true, - "requires": { - "find-cache-dir": "^3.3.2", - "schema-utils": "^4.0.0" - } - }, - "babel-plugin-istanbul": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz", - "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.0.0", - "@istanbuljs/load-nyc-config": "^1.0.0", - "@istanbuljs/schema": "^0.1.2", - "istanbul-lib-instrument": "^5.0.4", - "test-exclude": "^6.0.0" - } - }, - "babel-plugin-jest-hoist": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-28.1.3.tgz", - "integrity": "sha512-Ys3tUKAmfnkRUpPdpa98eYrAR0nV+sSFUZZEGuQ2EbFd1y4SOLtD5QDNHAq+bb9a+bbXvYQC4b+ID/THIMcU6Q==", - "dev": true, - "requires": { - "@babel/template": "^7.3.3", - "@babel/types": "^7.3.3", - "@types/babel__core": "^7.1.14", - "@types/babel__traverse": "^7.0.6" - } - }, - "babel-plugin-polyfill-corejs2": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.3.tgz", - "integrity": "sha512-8hOdmFYFSZhqg2C/JgLUQ+t52o5nirNwaWM2B9LWteozwIvM14VSwdsCAUET10qT+kmySAlseadmfeeSWFCy+Q==", - "dev": true, - "requires": { - "@babel/compat-data": "^7.17.7", - "@babel/helper-define-polyfill-provider": "^0.3.3", - "semver": "^6.1.1" - }, - "dependencies": { - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true - } - } - }, - "babel-plugin-polyfill-corejs3": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.6.0.tgz", - "integrity": "sha512-+eHqR6OPcBhJOGgsIar7xoAB1GcSwVUA3XjAd7HJNzOXT4wv6/H7KIdA/Nc60cvUlDbKApmqNvD1B1bzOt4nyA==", - "dev": true, - "requires": { - "@babel/helper-define-polyfill-provider": "^0.3.3", - "core-js-compat": "^3.25.1" - } - }, - "babel-plugin-polyfill-regenerator": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.1.tgz", - "integrity": "sha512-NtQGmyQDXjQqQ+IzRkBVwEOz9lQ4zxAQZgoAYEtU9dJjnl1Oc98qnN7jcp+bE7O7aYzVpavXE3/VKXNzUbh7aw==", - "dev": true, - "requires": { - "@babel/helper-define-polyfill-provider": "^0.3.3" - } - }, - "babel-preset-current-node-syntax": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz", - "integrity": "sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==", - "dev": true, - "requires": { - "@babel/plugin-syntax-async-generators": "^7.8.4", - "@babel/plugin-syntax-bigint": "^7.8.3", - "@babel/plugin-syntax-class-properties": "^7.8.3", - "@babel/plugin-syntax-import-meta": "^7.8.3", - "@babel/plugin-syntax-json-strings": "^7.8.3", - "@babel/plugin-syntax-logical-assignment-operators": "^7.8.3", - "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3", - "@babel/plugin-syntax-numeric-separator": "^7.8.3", - "@babel/plugin-syntax-object-rest-spread": "^7.8.3", - "@babel/plugin-syntax-optional-catch-binding": "^7.8.3", - "@babel/plugin-syntax-optional-chaining": "^7.8.3", - "@babel/plugin-syntax-top-level-await": "^7.8.3" - } - }, - "babel-preset-jest": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-28.1.3.tgz", - "integrity": "sha512-L+fupJvlWAHbQfn74coNX3zf60LXMJsezNvvx8eIh7iOR1luJ1poxYgQk1F8PYtNq/6QODDHCqsSnTFSWC491A==", - "dev": true, - "requires": { - "babel-plugin-jest-hoist": "^28.1.3", - "babel-preset-current-node-syntax": "^1.0.0" - } - }, - "balanced-match": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", - "dev": true - }, - "base64-js": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", - "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", - "dev": true - }, - "batch": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz", - "integrity": "sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==", - "dev": true - }, - "big.js": { - "version": "5.2.2", - "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz", - "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==", - "dev": true - }, - "binary-extensions": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", - "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==", - "dev": true - }, - "bl": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", - "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==", - "dev": true, - "requires": { - "buffer": "^5.5.0", - "inherits": "^2.0.4", - "readable-stream": "^3.4.0" - } - }, - "body-parser": { - "version": "1.20.1", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz", - "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==", - "dev": true, - "requires": { - "bytes": "3.1.2", - "content-type": "~1.0.4", - "debug": "2.6.9", - "depd": "2.0.0", - "destroy": "1.2.0", - "http-errors": "2.0.0", - "iconv-lite": "0.4.24", - "on-finished": "2.4.1", - "qs": "6.11.0", - "raw-body": "2.5.1", - "type-is": "~1.6.18", - "unpipe": "1.0.0" - }, - "dependencies": { - "bytes": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", - "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", - "dev": true - }, - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "depd": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", - "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", - "dev": true - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "dev": true - } - } - }, - "bonjour-service": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.1.0.tgz", - "integrity": "sha512-LVRinRB3k1/K0XzZ2p58COnWvkQknIY6sf0zF2rpErvcJXpMBttEPQSxK+HEXSS9VmpZlDoDnQWv8ftJT20B0Q==", - "dev": true, - "requires": { - "array-flatten": "^2.1.2", - "dns-equal": "^1.0.0", - "fast-deep-equal": "^3.1.3", - "multicast-dns": "^7.2.5" - } - }, - "boolbase": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", - "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==", - "dev": true - }, - "brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", - "dev": true, - "requires": { - "balanced-match": "^1.0.0" - } - }, - "braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", - "dev": true, - "requires": { - "fill-range": "^7.0.1" - } - }, - "browser-process-hrtime": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz", - "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==", - "dev": true - }, - "browserslist": { - "version": "4.21.4", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz", - "integrity": "sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==", - "dev": true, - "requires": { - "caniuse-lite": "^1.0.30001400", - "electron-to-chromium": "^1.4.251", - "node-releases": "^2.0.6", - "update-browserslist-db": "^1.0.9" - } - }, - "bs-logger": { - "version": "0.2.6", - "resolved": "https://registry.npmjs.org/bs-logger/-/bs-logger-0.2.6.tgz", - "integrity": "sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==", - "dev": true, - "requires": { - "fast-json-stable-stringify": "2.x" - } - }, - "bser": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz", - "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==", - "dev": true, - "requires": { - "node-int64": "^0.4.0" - } - }, - "buffer": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", - "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", - "dev": true, - "requires": { - "base64-js": "^1.3.1", - "ieee754": "^1.1.13" - } - }, - "buffer-from": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", - "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==" - }, - "builtins": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/builtins/-/builtins-5.0.1.tgz", - "integrity": "sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==", - "dev": true, - "requires": { - "semver": "^7.0.0" - } - }, - "bytes": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz", - "integrity": "sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==", - "dev": true - }, - "cacache": { - "version": "17.0.4", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-17.0.4.tgz", - "integrity": "sha512-Z/nL3gU+zTUjz5pCA5vVjYM8pmaw2kxM7JEiE0fv3w77Wj+sFbi70CrBruUWH0uNcEdvLDixFpgA2JM4F4DBjA==", - "dev": true, - "requires": { - "@npmcli/fs": "^3.1.0", - "fs-minipass": "^3.0.0", - "glob": "^8.0.1", - "lru-cache": "^7.7.1", - "minipass": "^4.0.0", - "minipass-collect": "^1.0.2", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.4", - "p-map": "^4.0.0", - "promise-inflight": "^1.0.1", - "ssri": "^10.0.0", - "tar": "^6.1.11", - "unique-filename": "^3.0.0" - }, - "dependencies": { - "lru-cache": { - "version": "7.14.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.14.1.tgz", - "integrity": "sha512-ysxwsnTKdAx96aTRdhDOCQfDgbHnt8SK0KY8SEjO0wHinhWOFTESbjVCMPbU1uGXg/ch4lifqx0wfjOawU2+WA==", - "dev": true - } - } - }, - "call-bind": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", - "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", - "dev": true, - "requires": { - "function-bind": "^1.1.1", - "get-intrinsic": "^1.0.2" - } - }, - "callsites": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", - "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", - "dev": true - }, - "camelcase": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", - "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", - "dev": true - }, - "caniuse-lite": { - "version": "1.0.30001434", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001434.tgz", - "integrity": "sha512-aOBHrLmTQw//WFa2rcF1If9fa3ypkC1wzqqiKHgfdrXTWcU8C4gKVZT77eQAPWN1APys3+uQ0Df07rKauXGEYA==", - "dev": true - }, - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - } - }, - "char-regex": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz", - "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==", - "dev": true - }, - "chardet": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz", - "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==", - "dev": true - }, - "chokidar": { - "version": "3.5.3", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz", - "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==", - "dev": true, - "requires": { - "anymatch": "~3.1.2", - "braces": "~3.0.2", - "fsevents": "~2.3.2", - "glob-parent": "~5.1.2", - "is-binary-path": "~2.1.0", - "is-glob": "~4.0.1", - "normalize-path": "~3.0.0", - "readdirp": "~3.6.0" - } - }, - "chownr": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", - "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==", - "dev": true - }, - "chrome-trace-event": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz", - "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==", - "dev": true - }, - "ci-info": { - "version": "3.7.0", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.7.0.tgz", - "integrity": "sha512-2CpRNYmImPx+RXKLq6jko/L07phmS9I02TyqkcNU20GCF/GgaWvc58hPtjxDX8lPpkdwc9sNh72V9k00S7ezog==", - "dev": true - }, - "cjs-module-lexer": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz", - "integrity": "sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA==", - "dev": true - }, - "clean-stack": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", - "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==", - "dev": true - }, - "cli-cursor": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz", - "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==", - "dev": true, - "requires": { - "restore-cursor": "^3.1.0" - } - }, - "cli-spinners": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.7.0.tgz", - "integrity": "sha512-qu3pN8Y3qHNgE2AFweciB1IfMnmZ/fsNTEE+NOFjmGB2F/7rLhnhzppvpCnN4FovtP26k8lHyy9ptEbNwWFLzw==", - "dev": true - }, - "cli-width": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz", - "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==", - "dev": true - }, - "cliui": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", - "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", - "dev": true, - "requires": { - "string-width": "^4.2.0", - "strip-ansi": "^6.0.1", - "wrap-ansi": "^7.0.0" - } - }, - "clone": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz", - "integrity": "sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==", - "dev": true - }, - "clone-deep": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz", - "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==", - "dev": true, - "requires": { - "is-plain-object": "^2.0.4", - "kind-of": "^6.0.2", - "shallow-clone": "^3.0.0" - } - }, - "co": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", - "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==", - "dev": true - }, - "collect-v8-coverage": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz", - "integrity": "sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==", - "dev": true - }, - "color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, - "requires": { - "color-name": "1.1.3" - } - }, - "color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", - "dev": true - }, - "color-support": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz", - "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==", - "dev": true - }, - "colorette": { - "version": "2.0.19", - "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.19.tgz", - "integrity": "sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ==", - "dev": true - }, - "combined-stream": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", - "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", - "dev": true, - "requires": { - "delayed-stream": "~1.0.0" - } - }, - "commander": { - "version": "2.20.3", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", - "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", - "dev": true - }, - "commondir": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz", - "integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==", - "dev": true - }, - "compressible": { - "version": "2.0.18", - "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz", - "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==", - "dev": true, - "requires": { - "mime-db": ">= 1.43.0 < 2" - } - }, - "compression": { - "version": "1.7.4", - "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz", - "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==", - "dev": true, - "requires": { - "accepts": "~1.3.5", - "bytes": "3.0.0", - "compressible": "~2.0.16", - "debug": "2.6.9", - "on-headers": "~1.0.2", - "safe-buffer": "5.1.2", - "vary": "~1.1.2" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "dev": true - }, - "safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "dev": true - } - } - }, - "concat-map": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", - "dev": true - }, - "connect-history-api-fallback": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz", - "integrity": "sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA==", - "dev": true - }, - "console-control-strings": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", - "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==", - "dev": true - }, - "content-disposition": { - "version": "0.5.4", - "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz", - "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==", - "dev": true, - "requires": { - "safe-buffer": "5.2.1" - } - }, - "content-type": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz", - "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==", - "dev": true - }, - "convert-source-map": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz", - "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==", - "dev": true - }, - "cookie": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz", - "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==", - "dev": true - }, - "cookie-signature": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", - "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==", - "dev": true - }, - "copy-anything": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/copy-anything/-/copy-anything-2.0.6.tgz", - "integrity": "sha512-1j20GZTsvKNkc4BY3NpMOM8tt///wY3FpIzozTOFO2ffuZcV61nojHXVKIy3WM+7ADCy5FVhdZYHYDdgTU0yJw==", - "dev": true, - "requires": { - "is-what": "^3.14.1" - } - }, - "copy-webpack-plugin": { - "version": "11.0.0", - "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-11.0.0.tgz", - "integrity": "sha512-fX2MWpamkW0hZxMEg0+mYnA40LTosOSa5TqZ9GYIBzyJa9C3QUaMPSE2xAi/buNr8u89SfD9wHSQVBzrRa/SOQ==", - "dev": true, - "requires": { - "fast-glob": "^3.2.11", - "glob-parent": "^6.0.1", - "globby": "^13.1.1", - "normalize-path": "^3.0.0", - "schema-utils": "^4.0.0", - "serialize-javascript": "^6.0.0" - }, - "dependencies": { - "glob-parent": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", - "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", - "dev": true, - "requires": { - "is-glob": "^4.0.3" - } - }, - "globby": { - "version": "13.1.3", - "resolved": "https://registry.npmjs.org/globby/-/globby-13.1.3.tgz", - "integrity": "sha512-8krCNHXvlCgHDpegPzleMq07yMYTO2sXKASmZmquEYWEmCx6J5UTRbp5RwMJkTJGtcQ44YpiUYUiN0b9mzy8Bw==", - "dev": true, - "requires": { - "dir-glob": "^3.0.1", - "fast-glob": "^3.2.11", - "ignore": "^5.2.0", - "merge2": "^1.4.1", - "slash": "^4.0.0" - } - }, - "slash": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz", - "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==", - "dev": true - } - } - }, - "core-js-compat": { - "version": "3.27.2", - "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.27.2.tgz", - "integrity": "sha512-welaYuF7ZtbYKGrIy7y3eb40d37rG1FvzEOfe7hSLd2iD6duMDqUhRfSvCGyC46HhR6Y8JXXdZ2lnRUMkPBpvg==", - "dev": true, - "requires": { - "browserslist": "^4.21.4" - } - }, - "core-util-is": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz", - "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==", - "dev": true - }, - "cosmiconfig": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.1.0.tgz", - "integrity": "sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==", - "dev": true, - "requires": { - "@types/parse-json": "^4.0.0", - "import-fresh": "^3.2.1", - "parse-json": "^5.0.0", - "path-type": "^4.0.0", - "yaml": "^1.10.0" - } - }, - "critters": { - "version": "0.0.16", - "resolved": "https://registry.npmjs.org/critters/-/critters-0.0.16.tgz", - "integrity": "sha512-JwjgmO6i3y6RWtLYmXwO5jMd+maZt8Tnfu7VVISmEWyQqfLpB8soBswf8/2bu6SBXxtKA68Al3c+qIG1ApT68A==", - "dev": true, - "requires": { - "chalk": "^4.1.0", - "css-select": "^4.2.0", - "parse5": "^6.0.1", - "parse5-htmlparser2-tree-adapter": "^6.0.1", - "postcss": "^8.3.7", - "pretty-bytes": "^5.3.0" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true - }, - "parse5": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz", - "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==", - "dev": true - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", - "dev": true, - "requires": { - "path-key": "^3.1.0", - "shebang-command": "^2.0.0", - "which": "^2.0.1" - } - }, - "css-loader": { - "version": "6.7.3", - "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.7.3.tgz", - "integrity": "sha512-qhOH1KlBMnZP8FzRO6YCH9UHXQhVMcEGLyNdb7Hv2cpcmJbW0YrddO+tG1ab5nT41KpHIYGsbeHqxB9xPu1pKQ==", - "dev": true, - "requires": { - "icss-utils": "^5.1.0", - "postcss": "^8.4.19", - "postcss-modules-extract-imports": "^3.0.0", - "postcss-modules-local-by-default": "^4.0.0", - "postcss-modules-scope": "^3.0.0", - "postcss-modules-values": "^4.0.0", - "postcss-value-parser": "^4.2.0", - "semver": "^7.3.8" - } - }, - "css-select": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz", - "integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==", - "dev": true, - "requires": { - "boolbase": "^1.0.0", - "css-what": "^6.0.1", - "domhandler": "^4.3.1", - "domutils": "^2.8.0", - "nth-check": "^2.0.1" - } - }, - "css-what": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz", - "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==", - "dev": true - }, - "cssesc": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz", - "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==", - "dev": true - }, - "cssom": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.5.0.tgz", - "integrity": "sha512-iKuQcq+NdHqlAcwUY0o/HL69XQrUaQdMjmStJ8JFmUaiiQErlhrmuigkg/CU4E2J0IyUKUrMAgl36TvN67MqTw==", - "dev": true - }, - "cssstyle": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz", - "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==", - "dev": true, - "requires": { - "cssom": "~0.3.6" - }, - "dependencies": { - "cssom": { - "version": "0.3.8", - "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz", - "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==", - "dev": true - } - } - }, - "data-urls": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-3.0.2.tgz", - "integrity": "sha512-Jy/tj3ldjZJo63sVAvg6LHt2mHvl4V6AgRAmNDtLdm7faqtsx+aJG42rsyCo9JCoRVKwPFzKlIPx3DIibwSIaQ==", - "dev": true, - "requires": { - "abab": "^2.0.6", - "whatwg-mimetype": "^3.0.0", - "whatwg-url": "^11.0.0" - }, - "dependencies": { - "whatwg-url": { - "version": "11.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-11.0.0.tgz", - "integrity": "sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ==", - "dev": true, - "requires": { - "tr46": "^3.0.0", - "webidl-conversions": "^7.0.0" - } - } - } - }, - "debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "dev": true, - "requires": { - "ms": "2.1.2" - } - }, - "decimal.js": { - "version": "10.4.3", - "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.3.tgz", - "integrity": "sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==", - "dev": true - }, - "dedent": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz", - "integrity": "sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==", - "dev": true - }, - "deep-is": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", - "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", - "dev": true - }, - "deepmerge": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz", - "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==", - "dev": true - }, - "default-gateway": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-6.0.3.tgz", - "integrity": "sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg==", - "dev": true, - "requires": { - "execa": "^5.0.0" - } - }, - "defaults": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.4.tgz", - "integrity": "sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==", - "dev": true, - "requires": { - "clone": "^1.0.2" - } - }, - "define-lazy-prop": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz", - "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==", - "dev": true - }, - "delayed-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", - "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", - "dev": true - }, - "delegates": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", - "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==", - "dev": true - }, - "depd": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", - "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==", - "dev": true - }, - "dependency-graph": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/dependency-graph/-/dependency-graph-0.11.0.tgz", - "integrity": "sha512-JeMq7fEshyepOWDfcfHK06N3MhyPhz++vtqWhMT5O9A3K42rdsEDpfdVqjaqaAhsw6a+ZqeDvQVtD0hFHQWrzg==", - "dev": true - }, - "destroy": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz", - "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==", - "dev": true - }, - "detect-newline": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz", - "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==", - "dev": true - }, - "detect-node": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz", - "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==", - "dev": true - }, - "diff-sequences": { - "version": "28.1.1", - "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-28.1.1.tgz", - "integrity": "sha512-FU0iFaH/E23a+a718l8Qa/19bF9p06kgE0KipMOMadwa3SjnaElKzPaUC0vnibs6/B/9ni97s61mcejk8W1fQw==", - "dev": true - }, - "dir-glob": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", - "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", - "dev": true, - "requires": { - "path-type": "^4.0.0" - } - }, - "dns-equal": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz", - "integrity": "sha512-z+paD6YUQsk+AbGCEM4PrOXSss5gd66QfcVBFTKR/HpFL9jCqikS94HYwKww6fQyO7IxrIIyUu+g0Ka9tUS2Cg==", - "dev": true - }, - "dns-packet": { - "version": "5.4.0", - "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-5.4.0.tgz", - "integrity": "sha512-EgqGeaBB8hLiHLZtp/IbaDQTL8pZ0+IvwzSHA6d7VyMDM+B9hgddEMa9xjK5oYnw0ci0JQ6g2XCD7/f6cafU6g==", - "dev": true, - "requires": { - "@leichtgewicht/ip-codec": "^2.0.1" - } - }, - "doctrine": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", - "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", - "dev": true, - "requires": { - "esutils": "^2.0.2" - } - }, - "dom-serializer": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz", - "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==", - "dev": true, - "requires": { - "domelementtype": "^2.0.1", - "domhandler": "^4.2.0", - "entities": "^2.0.0" - } - }, - "domelementtype": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz", - "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==", - "dev": true - }, - "domexception": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/domexception/-/domexception-4.0.0.tgz", - "integrity": "sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==", - "dev": true, - "requires": { - "webidl-conversions": "^7.0.0" - } - }, - "domhandler": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz", - "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==", - "dev": true, - "requires": { - "domelementtype": "^2.2.0" - } - }, - "domutils": { - "version": "2.8.0", - "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz", - "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==", - "dev": true, - "requires": { - "dom-serializer": "^1.0.1", - "domelementtype": "^2.2.0", - "domhandler": "^4.2.0" - } - }, - "ee-first": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", - "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==", - "dev": true - }, - "electron-to-chromium": { - "version": "1.4.284", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz", - "integrity": "sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==", - "dev": true - }, - "emittery": { - "version": "0.10.2", - "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.10.2.tgz", - "integrity": "sha512-aITqOwnLanpHLNXZJENbOgjUBeHocD+xsSJmNrjovKBW5HbSpW3d1pEls7GFQPUWXiwG9+0P4GtHfEqC/4M0Iw==", - "dev": true - }, - "emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true - }, - "emojis-list": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz", - "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==", - "dev": true - }, - "encodeurl": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", - "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", - "dev": true - }, - "encoding": { - "version": "0.1.13", - "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz", - "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==", - "dev": true, - "optional": true, - "requires": { - "iconv-lite": "^0.6.2" - }, - "dependencies": { - "iconv-lite": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", - "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", - "dev": true, - "optional": true, - "requires": { - "safer-buffer": ">= 2.1.2 < 3.0.0" - } - } - } - }, - "enhanced-resolve": { - "version": "5.12.0", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz", - "integrity": "sha512-QHTXI/sZQmko1cbDoNAa3mJ5qhWUUNAq3vR0/YiD379fWQrcfuoX1+HW2S0MTt7XmoPLapdaDKUtelUSPic7hQ==", - "dev": true, - "requires": { - "graceful-fs": "^4.2.4", - "tapable": "^2.2.0" - } - }, - "entities": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz", - "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==", - "dev": true - }, - "env-paths": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz", - "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==", - "dev": true - }, - "err-code": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz", - "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==", - "dev": true - }, - "errno": { - "version": "0.1.8", - "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz", - "integrity": "sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==", - "dev": true, - "optional": true, - "requires": { - "prr": "~1.0.1" - } - }, - "error-ex": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", - "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", - "dev": true, - "requires": { - "is-arrayish": "^0.2.1" - } - }, - "es-module-lexer": { - "version": "0.9.3", - "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz", - "integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==", - "dev": true - }, - "esbuild": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.16.17.tgz", - "integrity": "sha512-G8LEkV0XzDMNwXKgM0Jwu3nY3lSTwSGY6XbxM9cr9+s0T/qSV1q1JVPBGzm3dcjhCic9+emZDmMffkwgPeOeLg==", - "dev": true, - "optional": true, - "requires": { - "@esbuild/android-arm": "0.16.17", - "@esbuild/android-arm64": "0.16.17", - "@esbuild/android-x64": "0.16.17", - "@esbuild/darwin-arm64": "0.16.17", - "@esbuild/darwin-x64": "0.16.17", - "@esbuild/freebsd-arm64": "0.16.17", - "@esbuild/freebsd-x64": "0.16.17", - "@esbuild/linux-arm": "0.16.17", - "@esbuild/linux-arm64": "0.16.17", - "@esbuild/linux-ia32": "0.16.17", - "@esbuild/linux-loong64": "0.16.17", - "@esbuild/linux-mips64el": "0.16.17", - "@esbuild/linux-ppc64": "0.16.17", - "@esbuild/linux-riscv64": "0.16.17", - "@esbuild/linux-s390x": "0.16.17", - "@esbuild/linux-x64": "0.16.17", - "@esbuild/netbsd-x64": "0.16.17", - "@esbuild/openbsd-x64": "0.16.17", - "@esbuild/sunos-x64": "0.16.17", - "@esbuild/win32-arm64": "0.16.17", - "@esbuild/win32-ia32": "0.16.17", - "@esbuild/win32-x64": "0.16.17" - } - }, - "esbuild-wasm": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/esbuild-wasm/-/esbuild-wasm-0.16.17.tgz", - "integrity": "sha512-Tn7NuMqRcM+T/qCOxbQRq0qrwWl1sUWp6ARfJRakE8Bepew6zata4qrKgH2YqovNC5e/2fcTa7o+VL/FAOZC1Q==", - "dev": true - }, - "escalade": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", - "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", - "dev": true - }, - "escape-html": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", - "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==", - "dev": true - }, - "escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", - "dev": true - }, - "escodegen": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz", - "integrity": "sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==", - "dev": true, - "requires": { - "esprima": "^4.0.1", - "estraverse": "^5.2.0", - "esutils": "^2.0.2", - "optionator": "^0.8.1", - "source-map": "~0.6.1" - }, - "dependencies": { - "estraverse": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", - "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", - "dev": true - }, - "levn": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", - "integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==", - "dev": true, - "requires": { - "prelude-ls": "~1.1.2", - "type-check": "~0.3.2" - } - }, - "optionator": { - "version": "0.8.3", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz", - "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==", - "dev": true, - "requires": { - "deep-is": "~0.1.3", - "fast-levenshtein": "~2.0.6", - "levn": "~0.3.0", - "prelude-ls": "~1.1.2", - "type-check": "~0.3.2", - "word-wrap": "~1.2.3" - } - }, - "prelude-ls": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", - "integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==", - "dev": true - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true, - "optional": true - }, - "type-check": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", - "integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==", - "dev": true, - "requires": { - "prelude-ls": "~1.1.2" - } - } - } - }, - "eslint": { - "version": "8.32.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.32.0.tgz", - "integrity": "sha512-nETVXpnthqKPFyuY2FNjz/bEd6nbosRgKbkgS/y1C7LJop96gYHWpiguLecMHQ2XCPxn77DS0P+68WzG6vkZSQ==", - "dev": true, - "requires": { - "@eslint/eslintrc": "^1.4.1", - "@humanwhocodes/config-array": "^0.11.8", - "@humanwhocodes/module-importer": "^1.0.1", - "@nodelib/fs.walk": "^1.2.8", - "ajv": "^6.10.0", - "chalk": "^4.0.0", - "cross-spawn": "^7.0.2", - "debug": "^4.3.2", - "doctrine": "^3.0.0", - "escape-string-regexp": "^4.0.0", - "eslint-scope": "^7.1.1", - "eslint-utils": "^3.0.0", - "eslint-visitor-keys": "^3.3.0", - "espree": "^9.4.0", - "esquery": "^1.4.0", - "esutils": "^2.0.2", - "fast-deep-equal": "^3.1.3", - "file-entry-cache": "^6.0.1", - "find-up": "^5.0.0", - "glob-parent": "^6.0.2", - "globals": "^13.19.0", - "grapheme-splitter": "^1.0.4", - "ignore": "^5.2.0", - "import-fresh": "^3.0.0", - "imurmurhash": "^0.1.4", - "is-glob": "^4.0.0", - "is-path-inside": "^3.0.3", - "js-sdsl": "^4.1.4", - "js-yaml": "^4.1.0", - "json-stable-stringify-without-jsonify": "^1.0.1", - "levn": "^0.4.1", - "lodash.merge": "^4.6.2", - "minimatch": "^3.1.2", - "natural-compare": "^1.4.0", - "optionator": "^0.9.1", - "regexpp": "^3.2.0", - "strip-ansi": "^6.0.1", - "strip-json-comments": "^3.1.0", - "text-table": "^0.2.0" - }, - "dependencies": { - "ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", - "dev": true, - "requires": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - } - }, - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "argparse": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", - "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", - "dev": true - }, - "brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "escape-string-regexp": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", - "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", - "dev": true - }, - "eslint-scope": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz", - "integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==", - "dev": true, - "requires": { - "esrecurse": "^4.3.0", - "estraverse": "^5.2.0" - } - }, - "estraverse": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", - "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", - "dev": true - }, - "find-up": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", - "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", - "dev": true, - "requires": { - "locate-path": "^6.0.0", - "path-exists": "^4.0.0" - } - }, - "glob-parent": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", - "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", - "dev": true, - "requires": { - "is-glob": "^4.0.3" - } - }, - "globals": { - "version": "13.19.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.19.0.tgz", - "integrity": "sha512-dkQ957uSRWHw7CFXLUtUHQI3g3aWApYhfNR2O6jn/907riyTYKVBmxYVROkBcY614FSSeSJh7Xm7SrUWCxvJMQ==", - "dev": true, - "requires": { - "type-fest": "^0.20.2" - } - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true - }, - "js-yaml": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", - "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", - "dev": true, - "requires": { - "argparse": "^2.0.1" - } - }, - "json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true - }, - "locate-path": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", - "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", - "dev": true, - "requires": { - "p-locate": "^5.0.0" - } - }, - "minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "requires": { - "brace-expansion": "^1.1.7" - } - }, - "p-limit": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", - "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", - "dev": true, - "requires": { - "yocto-queue": "^0.1.0" - } - }, - "p-locate": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", - "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", - "dev": true, - "requires": { - "p-limit": "^3.0.2" - } - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - }, - "type-fest": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", - "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", - "dev": true - } - } - }, - "eslint-scope": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", - "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", - "dev": true, - "requires": { - "esrecurse": "^4.3.0", - "estraverse": "^4.1.1" - } - }, - "eslint-utils": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz", - "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==", - "dev": true, - "requires": { - "eslint-visitor-keys": "^2.0.0" - }, - "dependencies": { - "eslint-visitor-keys": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz", - "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==", - "dev": true - } - } - }, - "eslint-visitor-keys": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz", - "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==", - "dev": true - }, - "espree": { - "version": "9.4.1", - "resolved": "https://registry.npmjs.org/espree/-/espree-9.4.1.tgz", - "integrity": "sha512-XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg==", - "dev": true, - "requires": { - "acorn": "^8.8.0", - "acorn-jsx": "^5.3.2", - "eslint-visitor-keys": "^3.3.0" - } - }, - "esprima": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", - "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", - "dev": true - }, - "esquery": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz", - "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==", - "dev": true, - "requires": { - "estraverse": "^5.1.0" - }, - "dependencies": { - "estraverse": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", - "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", - "dev": true - } - } - }, - "esrecurse": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", - "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", - "dev": true, - "requires": { - "estraverse": "^5.2.0" - }, - "dependencies": { - "estraverse": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", - "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", - "dev": true - } - } - }, - "estraverse": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", - "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", - "dev": true - }, - "esutils": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", - "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", - "dev": true - }, - "etag": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", - "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==", - "dev": true - }, - "eventemitter-asyncresource": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/eventemitter-asyncresource/-/eventemitter-asyncresource-1.0.0.tgz", - "integrity": "sha512-39F7TBIV0G7gTelxwbEqnwhp90eqCPON1k0NwNfwhgKn4Co4ybUbj2pECcXT0B3ztRKZ7Pw1JujUUgmQJHcVAQ==", - "dev": true - }, - "eventemitter3": { - "version": "4.0.7", - "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz", - "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==", - "dev": true - }, - "events": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz", - "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==", - "dev": true - }, - "execa": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz", - "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==", - "dev": true, - "requires": { - "cross-spawn": "^7.0.3", - "get-stream": "^6.0.0", - "human-signals": "^2.1.0", - "is-stream": "^2.0.0", - "merge-stream": "^2.0.0", - "npm-run-path": "^4.0.1", - "onetime": "^5.1.2", - "signal-exit": "^3.0.3", - "strip-final-newline": "^2.0.0" - } - }, - "exit": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz", - "integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==", - "dev": true - }, - "expect": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/expect/-/expect-28.1.3.tgz", - "integrity": "sha512-eEh0xn8HlsuOBxFgIss+2mX85VAS4Qy3OSkjV7rlBWljtA4oWH37glVGyOZSZvErDT/yBywZdPGwCXuTvSG85g==", - "dev": true, - "requires": { - "@jest/expect-utils": "^28.1.3", - "jest-get-type": "^28.0.2", - "jest-matcher-utils": "^28.1.3", - "jest-message-util": "^28.1.3", - "jest-util": "^28.1.3" - } - }, - "express": { - "version": "4.18.2", - "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz", - "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==", - "dev": true, - "requires": { - "accepts": "~1.3.8", - "array-flatten": "1.1.1", - "body-parser": "1.20.1", - "content-disposition": "0.5.4", - "content-type": "~1.0.4", - "cookie": "0.5.0", - "cookie-signature": "1.0.6", - "debug": "2.6.9", - "depd": "2.0.0", - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "etag": "~1.8.1", - "finalhandler": "1.2.0", - "fresh": "0.5.2", - "http-errors": "2.0.0", - "merge-descriptors": "1.0.1", - "methods": "~1.1.2", - "on-finished": "2.4.1", - "parseurl": "~1.3.3", - "path-to-regexp": "0.1.7", - "proxy-addr": "~2.0.7", - "qs": "6.11.0", - "range-parser": "~1.2.1", - "safe-buffer": "5.2.1", - "send": "0.18.0", - "serve-static": "1.15.0", - "setprototypeof": "1.2.0", - "statuses": "2.0.1", - "type-is": "~1.6.18", - "utils-merge": "1.0.1", - "vary": "~1.1.2" - }, - "dependencies": { - "array-flatten": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", - "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==", - "dev": true - }, - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "depd": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", - "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", - "dev": true - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "dev": true - } - } - }, - "external-editor": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz", - "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==", - "dev": true, - "requires": { - "chardet": "^0.7.0", - "iconv-lite": "^0.4.24", - "tmp": "^0.0.33" - } - }, - "fast-deep-equal": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", - "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", - "dev": true - }, - "fast-glob": { - "version": "3.2.12", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz", - "integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==", - "dev": true, - "requires": { - "@nodelib/fs.stat": "^2.0.2", - "@nodelib/fs.walk": "^1.2.3", - "glob-parent": "^5.1.2", - "merge2": "^1.3.0", - "micromatch": "^4.0.4" - } - }, - "fast-json-stable-stringify": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", - "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", - "dev": true - }, - "fast-levenshtein": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", - "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", - "dev": true - }, - "fastq": { - "version": "1.13.0", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz", - "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==", - "dev": true, - "requires": { - "reusify": "^1.0.4" - } - }, - "faye-websocket": { - "version": "0.11.4", - "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz", - "integrity": "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==", - "dev": true, - "requires": { - "websocket-driver": ">=0.5.1" - } - }, - "fb-watchman": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz", - "integrity": "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==", - "dev": true, - "requires": { - "bser": "2.1.1" - } - }, - "figures": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz", - "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==", - "dev": true, - "requires": { - "escape-string-regexp": "^1.0.5" - } - }, - "file-entry-cache": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", - "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", - "dev": true, - "requires": { - "flat-cache": "^3.0.4" - } - }, - "fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", - "dev": true, - "requires": { - "to-regex-range": "^5.0.1" - } - }, - "finalhandler": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz", - "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==", - "dev": true, - "requires": { - "debug": "2.6.9", - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "on-finished": "2.4.1", - "parseurl": "~1.3.3", - "statuses": "2.0.1", - "unpipe": "~1.0.0" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "dev": true - } - } - }, - "find-cache-dir": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz", - "integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==", - "dev": true, - "requires": { - "commondir": "^1.0.1", - "make-dir": "^3.0.2", - "pkg-dir": "^4.1.0" - } - }, - "find-up": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", - "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", - "dev": true, - "requires": { - "locate-path": "^5.0.0", - "path-exists": "^4.0.0" - } - }, - "flat-cache": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz", - "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==", - "dev": true, - "requires": { - "flatted": "^3.1.0", - "rimraf": "^3.0.2" - } - }, - "flatted": { - "version": "3.2.7", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz", - "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==", - "dev": true - }, - "follow-redirects": { - "version": "1.15.2", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz", - "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==", - "dev": true - }, - "form-data": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", - "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", - "dev": true, - "requires": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.8", - "mime-types": "^2.1.12" - } - }, - "forwarded": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", - "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==", - "dev": true - }, - "fraction.js": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.2.0.tgz", - "integrity": "sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA==", - "dev": true - }, - "fresh": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", - "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==", - "dev": true - }, - "fs-minipass": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.0.tgz", - "integrity": "sha512-EUojgQaSPy6sxcqcZgQv6TVF6jiKvurji3AxhAivs/Ep4O1UpS8TusaxpybfFHZ2skRhLqzk6WR8nqNYIMMDeA==", - "dev": true, - "requires": { - "minipass": "^4.0.0" - } - }, - "fs-monkey": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.3.tgz", - "integrity": "sha512-cybjIfiiE+pTWicSCLFHSrXZ6EilF30oh91FDP9S2B051prEa7QWfrVTQm10/dDpswBDXZugPa1Ogu8Yh+HV0Q==", - "dev": true - }, - "fs.realpath": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", - "dev": true - }, - "fsevents": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", - "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", - "dev": true, - "optional": true - }, - "function-bind": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", - "dev": true - }, - "gauge": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/gauge/-/gauge-4.0.4.tgz", - "integrity": "sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==", - "dev": true, - "requires": { - "aproba": "^1.0.3 || ^2.0.0", - "color-support": "^1.1.3", - "console-control-strings": "^1.1.0", - "has-unicode": "^2.0.1", - "signal-exit": "^3.0.7", - "string-width": "^4.2.3", - "strip-ansi": "^6.0.1", - "wide-align": "^1.1.5" - } - }, - "gensync": { - "version": "1.0.0-beta.2", - "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", - "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==", - "dev": true - }, - "get-caller-file": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", - "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", - "dev": true - }, - "get-intrinsic": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz", - "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==", - "dev": true, - "requires": { - "function-bind": "^1.1.1", - "has": "^1.0.3", - "has-symbols": "^1.0.3" - } - }, - "get-package-type": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz", - "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==", - "dev": true - }, - "get-stream": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", - "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", - "dev": true - }, - "glob": { - "version": "8.0.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-8.0.3.tgz", - "integrity": "sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ==", - "dev": true, - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^5.0.1", - "once": "^1.3.0" - } - }, - "glob-parent": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", - "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", - "dev": true, - "requires": { - "is-glob": "^4.0.1" - } - }, - "glob-to-regexp": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz", - "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==", - "dev": true - }, - "globals": { - "version": "11.12.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", - "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", - "dev": true - }, - "globby": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", - "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==", - "dev": true, - "requires": { - "array-union": "^2.1.0", - "dir-glob": "^3.0.1", - "fast-glob": "^3.2.9", - "ignore": "^5.2.0", - "merge2": "^1.4.1", - "slash": "^3.0.0" - } - }, - "graceful-fs": { - "version": "4.2.10", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", - "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", - "dev": true - }, - "grapheme-splitter": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz", - "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==", - "dev": true - }, - "handle-thing": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz", - "integrity": "sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==", - "dev": true - }, - "has": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", - "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", - "dev": true, - "requires": { - "function-bind": "^1.1.1" - } - }, - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", - "dev": true - }, - "has-symbols": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", - "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", - "dev": true - }, - "has-unicode": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", - "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==", - "dev": true - }, - "hdr-histogram-js": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/hdr-histogram-js/-/hdr-histogram-js-2.0.3.tgz", - "integrity": "sha512-Hkn78wwzWHNCp2uarhzQ2SGFLU3JY8SBDDd3TAABK4fc30wm+MuPOrg5QVFVfkKOQd6Bfz3ukJEI+q9sXEkK1g==", - "dev": true, - "requires": { - "@assemblyscript/loader": "^0.10.1", - "base64-js": "^1.2.0", - "pako": "^1.0.3" - } - }, - "hdr-histogram-percentiles-obj": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/hdr-histogram-percentiles-obj/-/hdr-histogram-percentiles-obj-3.0.0.tgz", - "integrity": "sha512-7kIufnBqdsBGcSZLPJwqHT3yhk1QTsSlFsVD3kx5ixH/AlgBs9yM1q6DPhXZ8f8gtdqgh7N7/5btRLpQsS2gHw==", - "dev": true - }, - "hosted-git-info": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-6.1.1.tgz", - "integrity": "sha512-r0EI+HBMcXadMrugk0GCQ+6BQV39PiWAZVfq7oIckeGiN7sjRGyQxPdft3nQekFTCQbYxLBH+/axZMeH8UX6+w==", - "dev": true, - "requires": { - "lru-cache": "^7.5.1" - }, - "dependencies": { - "lru-cache": { - "version": "7.14.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.14.1.tgz", - "integrity": "sha512-ysxwsnTKdAx96aTRdhDOCQfDgbHnt8SK0KY8SEjO0wHinhWOFTESbjVCMPbU1uGXg/ch4lifqx0wfjOawU2+WA==", - "dev": true - } - } - }, - "hpack.js": { - "version": "2.1.6", - "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz", - "integrity": "sha512-zJxVehUdMGIKsRaNt7apO2Gqp0BdqW5yaiGHXXmbpvxgBYVZnAql+BJb4RO5ad2MgpbZKn5G6nMnegrH1FcNYQ==", - "dev": true, - "requires": { - "inherits": "^2.0.1", - "obuf": "^1.0.0", - "readable-stream": "^2.0.1", - "wbuf": "^1.1.0" - }, - "dependencies": { - "readable-stream": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", - "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", - "dev": true, - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } - }, - "safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "dev": true - }, - "string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true, - "requires": { - "safe-buffer": "~5.1.0" - } - } - } - }, - "html-encoding-sniffer": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz", - "integrity": "sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==", - "dev": true, - "requires": { - "whatwg-encoding": "^2.0.0" - } - }, - "html-entities": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.3.3.tgz", - "integrity": "sha512-DV5Ln36z34NNTDgnz0EWGBLZENelNAtkiFA4kyNOG2tDI6Mz1uSWiq1wAKdyjnJwyDiDO7Fa2SO1CTxPXL8VxA==", - "dev": true - }, - "html-escaper": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz", - "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==", - "dev": true - }, - "http-cache-semantics": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz", - "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==", - "dev": true - }, - "http-deceiver": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz", - "integrity": "sha512-LmpOGxTfbpgtGVxJrj5k7asXHCgNZp5nLfp+hWc8QQRqtb7fUy6kRY3BO1h9ddF6yIPYUARgxGOwB42DnxIaNw==", - "dev": true - }, - "http-errors": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz", - "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==", - "dev": true, - "requires": { - "depd": "2.0.0", - "inherits": "2.0.4", - "setprototypeof": "1.2.0", - "statuses": "2.0.1", - "toidentifier": "1.0.1" - }, - "dependencies": { - "depd": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", - "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", - "dev": true - } - } - }, - "http-parser-js": { - "version": "0.5.8", - "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.8.tgz", - "integrity": "sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q==", - "dev": true - }, - "http-proxy": { - "version": "1.18.1", - "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz", - "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==", - "dev": true, - "requires": { - "eventemitter3": "^4.0.0", - "follow-redirects": "^1.0.0", - "requires-port": "^1.0.0" - } - }, - "http-proxy-agent": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz", - "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==", - "dev": true, - "requires": { - "@tootallnate/once": "2", - "agent-base": "6", - "debug": "4" - } - }, - "http-proxy-middleware": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz", - "integrity": "sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==", - "dev": true, - "requires": { - "@types/http-proxy": "^1.17.8", - "http-proxy": "^1.18.1", - "is-glob": "^4.0.1", - "is-plain-obj": "^3.0.0", - "micromatch": "^4.0.2" - } - }, - "https-proxy-agent": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", - "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", - "dev": true, - "requires": { - "agent-base": "6", - "debug": "4" - } - }, - "human-signals": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz", - "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==", - "dev": true - }, - "humanize-ms": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz", - "integrity": "sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==", - "dev": true, - "requires": { - "ms": "^2.0.0" - } - }, - "iconv-lite": { - "version": "0.4.24", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", - "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", - "dev": true, - "requires": { - "safer-buffer": ">= 2.1.2 < 3" - } - }, - "icss-utils": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz", - "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==", - "dev": true, - "requires": {} - }, - "ieee754": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", - "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", - "dev": true - }, - "ignore": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz", - "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==", - "dev": true - }, - "ignore-walk": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-6.0.0.tgz", - "integrity": "sha512-bTf9UWe/UP1yxG3QUrj/KOvEhTAUWPcv+WvbFZ28LcqznXabp7Xu6o9y1JEC18+oqODuS7VhTpekV5XvFwsxJg==", - "dev": true, - "requires": { - "minimatch": "^5.0.1" - } - }, - "image-size": { - "version": "0.5.5", - "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz", - "integrity": "sha512-6TDAlDPZxUFCv+fuOkIoXT/V/f3Qbq8e37p+YOiYrUv3v9cc3/6x78VdfPgFVaB9dZYeLUfKgHRebpkm/oP2VQ==", - "dev": true, - "optional": true - }, - "immutable": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.2.2.tgz", - "integrity": "sha512-fTMKDwtbvO5tldky9QZ2fMX7slR0mYpY5nbnFWYp0fOzDhHqhgIw9KoYgxLWsoNTS9ZHGauHj18DTyEw6BK3Og==", - "dev": true - }, - "import-fresh": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", - "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", - "dev": true, - "requires": { - "parent-module": "^1.0.0", - "resolve-from": "^4.0.0" - }, - "dependencies": { - "resolve-from": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", - "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", - "dev": true - } - } - }, - "import-local": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz", - "integrity": "sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==", - "dev": true, - "requires": { - "pkg-dir": "^4.2.0", - "resolve-cwd": "^3.0.0" - } - }, - "imurmurhash": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", - "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", - "dev": true - }, - "indent-string": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", - "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==", - "dev": true - }, - "infer-owner": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz", - "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==", - "dev": true - }, - "inflight": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", - "dev": true, - "requires": { - "once": "^1.3.0", - "wrappy": "1" - } - }, - "inherits": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", - "dev": true - }, - "ini": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/ini/-/ini-3.0.1.tgz", - "integrity": "sha512-it4HyVAUTKBc6m8e1iXWvXSTdndF7HbdN713+kvLrymxTaU4AUBWrJ4vEooP+V7fexnVD3LKcBshjGGPefSMUQ==", - "dev": true - }, - "inquirer": { - "version": "8.2.4", - "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-8.2.4.tgz", - "integrity": "sha512-nn4F01dxU8VeKfq192IjLsxu0/OmMZ4Lg3xKAns148rCaXP6ntAoEkVYZThWjwON8AlzdZZi6oqnhNbxUG9hVg==", - "dev": true, - "requires": { - "ansi-escapes": "^4.2.1", - "chalk": "^4.1.1", - "cli-cursor": "^3.1.0", - "cli-width": "^3.0.0", - "external-editor": "^3.0.3", - "figures": "^3.0.0", - "lodash": "^4.17.21", - "mute-stream": "0.0.8", - "ora": "^5.4.1", - "run-async": "^2.4.0", - "rxjs": "^7.5.5", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0", - "through": "^2.3.6", - "wrap-ansi": "^7.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "ip": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ip/-/ip-2.0.0.tgz", - "integrity": "sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==", - "dev": true - }, - "ipaddr.js": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.0.1.tgz", - "integrity": "sha512-1qTgH9NG+IIJ4yfKs2e6Pp1bZg8wbDbKHT21HrLIeYBTRLgMYKnMTPAuI3Lcs61nfx5h1xlXnbJtH1kX5/d/ng==", - "dev": true - }, - "is-arrayish": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", - "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==", - "dev": true - }, - "is-binary-path": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", - "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", - "dev": true, - "requires": { - "binary-extensions": "^2.0.0" - } - }, - "is-core-module": { - "version": "2.11.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz", - "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==", - "dev": true, - "requires": { - "has": "^1.0.3" - } - }, - "is-docker": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz", - "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==", - "dev": true - }, - "is-extglob": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", - "dev": true - }, - "is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true - }, - "is-generator-fn": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz", - "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==", - "dev": true - }, - "is-glob": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", - "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", - "dev": true, - "requires": { - "is-extglob": "^2.1.1" - } - }, - "is-interactive": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz", - "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==", - "dev": true - }, - "is-lambda": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz", - "integrity": "sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==", - "dev": true - }, - "is-number": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", - "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", - "dev": true - }, - "is-path-inside": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", - "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", - "dev": true - }, - "is-plain-obj": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz", - "integrity": "sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==", - "dev": true - }, - "is-plain-object": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", - "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", - "dev": true, - "requires": { - "isobject": "^3.0.1" - } - }, - "is-potential-custom-element-name": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz", - "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==", - "dev": true - }, - "is-stream": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", - "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", - "dev": true - }, - "is-unicode-supported": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz", - "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==", - "dev": true - }, - "is-what": { - "version": "3.14.1", - "resolved": "https://registry.npmjs.org/is-what/-/is-what-3.14.1.tgz", - "integrity": "sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA==", - "dev": true - }, - "is-wsl": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz", - "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==", - "dev": true, - "requires": { - "is-docker": "^2.0.0" - } - }, - "isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==", - "dev": true - }, - "isexe": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", - "dev": true - }, - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==", - "dev": true - }, - "istanbul-lib-coverage": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz", - "integrity": "sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==", - "dev": true - }, - "istanbul-lib-instrument": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz", - "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==", - "dev": true, - "requires": { - "@babel/core": "^7.12.3", - "@babel/parser": "^7.14.7", - "@istanbuljs/schema": "^0.1.2", - "istanbul-lib-coverage": "^3.2.0", - "semver": "^6.3.0" - }, - "dependencies": { - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true - } - } - }, - "istanbul-lib-report": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz", - "integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==", - "dev": true, - "requires": { - "istanbul-lib-coverage": "^3.0.0", - "make-dir": "^3.0.0", - "supports-color": "^7.1.0" - }, - "dependencies": { - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "istanbul-lib-source-maps": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz", - "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==", - "dev": true, - "requires": { - "debug": "^4.1.1", - "istanbul-lib-coverage": "^3.0.0", - "source-map": "^0.6.1" - }, - "dependencies": { - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - } - } - }, - "istanbul-reports": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.5.tgz", - "integrity": "sha512-nUsEMa9pBt/NOHqbcbeJEgqIlY/K7rVWUX6Lql2orY5e9roQOthbR3vtY4zzf2orPELg80fnxxk9zUyPlgwD1w==", - "dev": true, - "requires": { - "html-escaper": "^2.0.0", - "istanbul-lib-report": "^3.0.0" - } - }, - "jest": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest/-/jest-28.1.3.tgz", - "integrity": "sha512-N4GT5on8UkZgH0O5LUavMRV1EDEhNTL0KEfRmDIeZHSV7p2XgLoY9t9VDUgL6o+yfdgYHVxuz81G8oB9VG5uyA==", - "dev": true, - "requires": { - "@jest/core": "^28.1.3", - "@jest/types": "^28.1.3", - "import-local": "^3.0.2", - "jest-cli": "^28.1.3" - } - }, - "jest-changed-files": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-28.1.3.tgz", - "integrity": "sha512-esaOfUWJXk2nfZt9SPyC8gA1kNfdKLkQWyzsMlqq8msYSlNKfmZxfRgZn4Cd4MGVUF+7v6dBs0d5TOAKa7iIiA==", - "dev": true, - "requires": { - "execa": "^5.0.0", - "p-limit": "^3.1.0" - }, - "dependencies": { - "p-limit": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", - "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", - "dev": true, - "requires": { - "yocto-queue": "^0.1.0" - } - } - } - }, - "jest-circus": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-28.1.3.tgz", - "integrity": "sha512-cZ+eS5zc79MBwt+IhQhiEp0OeBddpc1n8MBo1nMB8A7oPMKEO+Sre+wHaLJexQUj9Ya/8NOBY0RESUgYjB6fow==", - "dev": true, - "requires": { - "@jest/environment": "^28.1.3", - "@jest/expect": "^28.1.3", - "@jest/test-result": "^28.1.3", - "@jest/types": "^28.1.3", - "@types/node": "*", - "chalk": "^4.0.0", - "co": "^4.6.0", - "dedent": "^0.7.0", - "is-generator-fn": "^2.0.0", - "jest-each": "^28.1.3", - "jest-matcher-utils": "^28.1.3", - "jest-message-util": "^28.1.3", - "jest-runtime": "^28.1.3", - "jest-snapshot": "^28.1.3", - "jest-util": "^28.1.3", - "p-limit": "^3.1.0", - "pretty-format": "^28.1.3", - "slash": "^3.0.0", - "stack-utils": "^2.0.3" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true - }, - "p-limit": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", - "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", - "dev": true, - "requires": { - "yocto-queue": "^0.1.0" - } - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "jest-cli": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-28.1.3.tgz", - "integrity": "sha512-roY3kvrv57Azn1yPgdTebPAXvdR2xfezaKKYzVxZ6It/5NCxzJym6tUI5P1zkdWhfUYkxEI9uZWcQdaFLo8mJQ==", - "dev": true, - "requires": { - "@jest/core": "^28.1.3", - "@jest/test-result": "^28.1.3", - "@jest/types": "^28.1.3", - "chalk": "^4.0.0", - "exit": "^0.1.2", - "graceful-fs": "^4.2.9", - "import-local": "^3.0.2", - "jest-config": "^28.1.3", - "jest-util": "^28.1.3", - "jest-validate": "^28.1.3", - "prompts": "^2.0.1", - "yargs": "^17.3.1" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "jest-config": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-28.1.3.tgz", - "integrity": "sha512-MG3INjByJ0J4AsNBm7T3hsuxKQqFIiRo/AUqb1q9LRKI5UU6Aar9JHbr9Ivn1TVwfUD9KirRoM/T6u8XlcQPHQ==", - "dev": true, - "requires": { - "@babel/core": "^7.11.6", - "@jest/test-sequencer": "^28.1.3", - "@jest/types": "^28.1.3", - "babel-jest": "^28.1.3", - "chalk": "^4.0.0", - "ci-info": "^3.2.0", - "deepmerge": "^4.2.2", - "glob": "^7.1.3", - "graceful-fs": "^4.2.9", - "jest-circus": "^28.1.3", - "jest-environment-node": "^28.1.3", - "jest-get-type": "^28.0.2", - "jest-regex-util": "^28.0.2", - "jest-resolve": "^28.1.3", - "jest-runner": "^28.1.3", - "jest-util": "^28.1.3", - "jest-validate": "^28.1.3", - "micromatch": "^4.0.4", - "parse-json": "^5.2.0", - "pretty-format": "^28.1.3", - "slash": "^3.0.0", - "strip-json-comments": "^3.1.1" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "dev": true, - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true - }, - "minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "requires": { - "brace-expansion": "^1.1.7" - } - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "jest-diff": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-28.1.3.tgz", - "integrity": "sha512-8RqP1B/OXzjjTWkqMX67iqgwBVJRgCyKD3L9nq+6ZqJMdvjE8RgHktqZ6jNrkdMT+dJuYNI3rhQpxaz7drJHfw==", - "dev": true, - "requires": { - "chalk": "^4.0.0", - "diff-sequences": "^28.1.1", - "jest-get-type": "^28.0.2", - "pretty-format": "^28.1.3" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "jest-docblock": { - "version": "28.1.1", - "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-28.1.1.tgz", - "integrity": "sha512-3wayBVNiOYx0cwAbl9rwm5kKFP8yHH3d/fkEaL02NPTkDojPtheGB7HZSFY4wzX+DxyrvhXz0KSCVksmCknCuA==", - "dev": true, - "requires": { - "detect-newline": "^3.0.0" - } - }, - "jest-each": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-28.1.3.tgz", - "integrity": "sha512-arT1z4sg2yABU5uogObVPvSlSMQlDA48owx07BDPAiasW0yYpYHYOo4HHLz9q0BVzDVU4hILFjzJw0So9aCL/g==", - "dev": true, - "requires": { - "@jest/types": "^28.1.3", - "chalk": "^4.0.0", - "jest-get-type": "^28.0.2", - "jest-util": "^28.1.3", - "pretty-format": "^28.1.3" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "jest-environment-jsdom": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-28.1.3.tgz", - "integrity": "sha512-HnlGUmZRdxfCByd3GM2F100DgQOajUBzEitjGqIREcb45kGjZvRrKUdlaF6escXBdcXNl0OBh+1ZrfeZT3GnAg==", - "dev": true, - "requires": { - "@jest/environment": "^28.1.3", - "@jest/fake-timers": "^28.1.3", - "@jest/types": "^28.1.3", - "@types/jsdom": "^16.2.4", - "@types/node": "*", - "jest-mock": "^28.1.3", - "jest-util": "^28.1.3", - "jsdom": "^19.0.0" - } - }, - "jest-environment-node": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-28.1.3.tgz", - "integrity": "sha512-ugP6XOhEpjAEhGYvp5Xj989ns5cB1K6ZdjBYuS30umT4CQEETaxSiPcZ/E1kFktX4GkrcM4qu07IIlDYX1gp+A==", - "dev": true, - "requires": { - "@jest/environment": "^28.1.3", - "@jest/fake-timers": "^28.1.3", - "@jest/types": "^28.1.3", - "@types/node": "*", - "jest-mock": "^28.1.3", - "jest-util": "^28.1.3" - } - }, - "jest-get-type": { - "version": "28.0.2", - "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-28.0.2.tgz", - "integrity": "sha512-ioj2w9/DxSYHfOm5lJKCdcAmPJzQXmbM/Url3rhlghrPvT3tt+7a/+oXc9azkKmLvoiXjtV83bEWqi+vs5nlPA==", - "dev": true - }, - "jest-haste-map": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-28.1.3.tgz", - "integrity": "sha512-3S+RQWDXccXDKSWnkHa/dPwt+2qwA8CJzR61w3FoYCvoo3Pn8tvGcysmMF0Bj0EX5RYvAI2EIvC57OmotfdtKA==", - "dev": true, - "requires": { - "@jest/types": "^28.1.3", - "@types/graceful-fs": "^4.1.3", - "@types/node": "*", - "anymatch": "^3.0.3", - "fb-watchman": "^2.0.0", - "fsevents": "^2.3.2", - "graceful-fs": "^4.2.9", - "jest-regex-util": "^28.0.2", - "jest-util": "^28.1.3", - "jest-worker": "^28.1.3", - "micromatch": "^4.0.4", - "walker": "^1.0.8" - }, - "dependencies": { - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true - }, - "jest-worker": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-28.1.3.tgz", - "integrity": "sha512-CqRA220YV/6jCo8VWvAt1KKx6eek1VIHMPeLEbpcfSfkEeWyBNppynM/o6q+Wmw+sOhos2ml34wZbSX3G13//g==", - "dev": true, - "requires": { - "@types/node": "*", - "merge-stream": "^2.0.0", - "supports-color": "^8.0.0" - }, - "dependencies": { - "supports-color": { - "version": "8.1.1", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", - "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - } - } - }, - "jest-leak-detector": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-28.1.3.tgz", - "integrity": "sha512-WFVJhnQsiKtDEo5lG2mM0v40QWnBM+zMdHHyJs8AWZ7J0QZJS59MsyKeJHWhpBZBH32S48FOVvGyOFT1h0DlqA==", - "dev": true, - "requires": { - "jest-get-type": "^28.0.2", - "pretty-format": "^28.1.3" - } - }, - "jest-matcher-utils": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-28.1.3.tgz", - "integrity": "sha512-kQeJ7qHemKfbzKoGjHHrRKH6atgxMk8Enkk2iPQ3XwO6oE/KYD8lMYOziCkeSB9G4adPM4nR1DE8Tf5JeWH6Bw==", - "dev": true, - "requires": { - "chalk": "^4.0.0", - "jest-diff": "^28.1.3", - "jest-get-type": "^28.0.2", - "pretty-format": "^28.1.3" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "jest-message-util": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-28.1.3.tgz", - "integrity": "sha512-PFdn9Iewbt575zKPf1286Ht9EPoJmYT7P0kY+RibeYZ2XtOr53pDLEFoTWXbd1h4JiGiWpTBC84fc8xMXQMb7g==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.12.13", - "@jest/types": "^28.1.3", - "@types/stack-utils": "^2.0.0", - "chalk": "^4.0.0", - "graceful-fs": "^4.2.9", - "micromatch": "^4.0.4", - "pretty-format": "^28.1.3", - "slash": "^3.0.0", - "stack-utils": "^2.0.3" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "jest-mock": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-28.1.3.tgz", - "integrity": "sha512-o3J2jr6dMMWYVH4Lh/NKmDXdosrsJgi4AviS8oXLujcjpCMBb1FMsblDnOXKZKfSiHLxYub1eS0IHuRXsio9eA==", - "dev": true, - "requires": { - "@jest/types": "^28.1.3", - "@types/node": "*" - } - }, - "jest-pnp-resolver": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz", - "integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==", - "dev": true, - "requires": {} - }, - "jest-preset-angular": { - "version": "12.2.5", - "resolved": "https://registry.npmjs.org/jest-preset-angular/-/jest-preset-angular-12.2.5.tgz", - "integrity": "sha512-TNWzvG9lZzkqsmQz8pkH3S7YVGE6mK2xmfyeGTKX9Lp9Y8C0H4ucHG7FFq4tqp/DWHkJuwAgu5YMY51ml4KDPQ==", - "dev": true, - "requires": { - "bs-logger": "^0.2.6", - "esbuild": ">=0.13.8", - "esbuild-wasm": ">=0.13.8", - "jest-environment-jsdom": "^28.0.0", - "pretty-format": "^28.0.0", - "ts-jest": "^28.0.0" - } - }, - "jest-regex-util": { - "version": "28.0.2", - "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-28.0.2.tgz", - "integrity": "sha512-4s0IgyNIy0y9FK+cjoVYoxamT7Zeo7MhzqRGx7YDYmaQn1wucY9rotiGkBzzcMXTtjrCAP/f7f+E0F7+fxPNdw==", - "dev": true - }, - "jest-resolve": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-28.1.3.tgz", - "integrity": "sha512-Z1W3tTjE6QaNI90qo/BJpfnvpxtaFTFw5CDgwpyE/Kz8U/06N1Hjf4ia9quUhCh39qIGWF1ZuxFiBiJQwSEYKQ==", - "dev": true, - "requires": { - "chalk": "^4.0.0", - "graceful-fs": "^4.2.9", - "jest-haste-map": "^28.1.3", - "jest-pnp-resolver": "^1.2.2", - "jest-util": "^28.1.3", - "jest-validate": "^28.1.3", - "resolve": "^1.20.0", - "resolve.exports": "^1.1.0", - "slash": "^3.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "jest-resolve-dependencies": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-28.1.3.tgz", - "integrity": "sha512-qa0QO2Q0XzQoNPouMbCc7Bvtsem8eQgVPNkwn9LnS+R2n8DaVDPL/U1gngC0LTl1RYXJU0uJa2BMC2DbTfFrHA==", - "dev": true, - "requires": { - "jest-regex-util": "^28.0.2", - "jest-snapshot": "^28.1.3" - } - }, - "jest-runner": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-28.1.3.tgz", - "integrity": "sha512-GkMw4D/0USd62OVO0oEgjn23TM+YJa2U2Wu5zz9xsQB1MxWKDOlrnykPxnMsN0tnJllfLPinHTka61u0QhaxBA==", - "dev": true, - "requires": { - "@jest/console": "^28.1.3", - "@jest/environment": "^28.1.3", - "@jest/test-result": "^28.1.3", - "@jest/transform": "^28.1.3", - "@jest/types": "^28.1.3", - "@types/node": "*", - "chalk": "^4.0.0", - "emittery": "^0.10.2", - "graceful-fs": "^4.2.9", - "jest-docblock": "^28.1.1", - "jest-environment-node": "^28.1.3", - "jest-haste-map": "^28.1.3", - "jest-leak-detector": "^28.1.3", - "jest-message-util": "^28.1.3", - "jest-resolve": "^28.1.3", - "jest-runtime": "^28.1.3", - "jest-util": "^28.1.3", - "jest-watcher": "^28.1.3", - "jest-worker": "^28.1.3", - "p-limit": "^3.1.0", - "source-map-support": "0.5.13" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true - }, - "jest-worker": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-28.1.3.tgz", - "integrity": "sha512-CqRA220YV/6jCo8VWvAt1KKx6eek1VIHMPeLEbpcfSfkEeWyBNppynM/o6q+Wmw+sOhos2ml34wZbSX3G13//g==", - "dev": true, - "requires": { - "@types/node": "*", - "merge-stream": "^2.0.0", - "supports-color": "^8.0.0" - }, - "dependencies": { - "supports-color": { - "version": "8.1.1", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", - "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "p-limit": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", - "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", - "dev": true, - "requires": { - "yocto-queue": "^0.1.0" - } - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - }, - "source-map-support": { - "version": "0.5.13", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz", - "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==", - "dev": true, - "requires": { - "buffer-from": "^1.0.0", - "source-map": "^0.6.0" - } - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "jest-runtime": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-28.1.3.tgz", - "integrity": "sha512-NU+881ScBQQLc1JHG5eJGU7Ui3kLKrmwCPPtYsJtBykixrM2OhVQlpMmFWJjMyDfdkGgBMNjXCGB/ebzsgNGQw==", - "dev": true, - "requires": { - "@jest/environment": "^28.1.3", - "@jest/fake-timers": "^28.1.3", - "@jest/globals": "^28.1.3", - "@jest/source-map": "^28.1.2", - "@jest/test-result": "^28.1.3", - "@jest/transform": "^28.1.3", - "@jest/types": "^28.1.3", - "chalk": "^4.0.0", - "cjs-module-lexer": "^1.0.0", - "collect-v8-coverage": "^1.0.0", - "execa": "^5.0.0", - "glob": "^7.1.3", - "graceful-fs": "^4.2.9", - "jest-haste-map": "^28.1.3", - "jest-message-util": "^28.1.3", - "jest-mock": "^28.1.3", - "jest-regex-util": "^28.0.2", - "jest-resolve": "^28.1.3", - "jest-snapshot": "^28.1.3", - "jest-util": "^28.1.3", - "slash": "^3.0.0", - "strip-bom": "^4.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "dev": true, - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true - }, - "minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "requires": { - "brace-expansion": "^1.1.7" - } - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "jest-snapshot": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-28.1.3.tgz", - "integrity": "sha512-4lzMgtiNlc3DU/8lZfmqxN3AYD6GGLbl+72rdBpXvcV+whX7mDrREzkPdp2RnmfIiWBg1YbuFSkXduF2JcafJg==", - "dev": true, - "requires": { - "@babel/core": "^7.11.6", - "@babel/generator": "^7.7.2", - "@babel/plugin-syntax-typescript": "^7.7.2", - "@babel/traverse": "^7.7.2", - "@babel/types": "^7.3.3", - "@jest/expect-utils": "^28.1.3", - "@jest/transform": "^28.1.3", - "@jest/types": "^28.1.3", - "@types/babel__traverse": "^7.0.6", - "@types/prettier": "^2.1.5", - "babel-preset-current-node-syntax": "^1.0.0", - "chalk": "^4.0.0", - "expect": "^28.1.3", - "graceful-fs": "^4.2.9", - "jest-diff": "^28.1.3", - "jest-get-type": "^28.0.2", - "jest-haste-map": "^28.1.3", - "jest-matcher-utils": "^28.1.3", - "jest-message-util": "^28.1.3", - "jest-util": "^28.1.3", - "natural-compare": "^1.4.0", - "pretty-format": "^28.1.3", - "semver": "^7.3.5" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "jest-util": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-28.1.3.tgz", - "integrity": "sha512-XdqfpHwpcSRko/C35uLYFM2emRAltIIKZiJ9eAmhjsj0CqZMa0p1ib0R5fWIqGhn1a103DebTbpqIaP1qCQ6tQ==", - "dev": true, - "requires": { - "@jest/types": "^28.1.3", - "@types/node": "*", - "chalk": "^4.0.0", - "ci-info": "^3.2.0", - "graceful-fs": "^4.2.9", - "picomatch": "^2.2.3" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "jest-validate": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-28.1.3.tgz", - "integrity": "sha512-SZbOGBWEsaTxBGCOpsRWlXlvNkvTkY0XxRfh7zYmvd8uL5Qzyg0CHAXiXKROflh801quA6+/DsT4ODDthOC/OA==", - "dev": true, - "requires": { - "@jest/types": "^28.1.3", - "camelcase": "^6.2.0", - "chalk": "^4.0.0", - "jest-get-type": "^28.0.2", - "leven": "^3.1.0", - "pretty-format": "^28.1.3" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "camelcase": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz", - "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==", - "dev": true - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "jest-watcher": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-28.1.3.tgz", - "integrity": "sha512-t4qcqj9hze+jviFPUN3YAtAEeFnr/azITXQEMARf5cMwKY2SMBRnCQTXLixTl20OR6mLh9KLMrgVJgJISym+1g==", - "dev": true, - "requires": { - "@jest/test-result": "^28.1.3", - "@jest/types": "^28.1.3", - "@types/node": "*", - "ansi-escapes": "^4.2.1", - "chalk": "^4.0.0", - "emittery": "^0.10.2", - "jest-util": "^28.1.3", - "string-length": "^4.0.1" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "jest-worker": { - "version": "27.5.1", - "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz", - "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==", - "dev": true, - "requires": { - "@types/node": "*", - "merge-stream": "^2.0.0", - "supports-color": "^8.0.0" - }, - "dependencies": { - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true - }, - "supports-color": { - "version": "8.1.1", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", - "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "js-sdsl": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.2.0.tgz", - "integrity": "sha512-dyBIzQBDkCqCu+0upx25Y2jGdbTGxE9fshMsCdK0ViOongpV+n5tXRcZY9v7CaVQ79AGS9KA1KHtojxiM7aXSQ==", - "dev": true - }, - "js-tokens": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", - "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", - "dev": true - }, - "js-yaml": { - "version": "3.14.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", - "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", - "dev": true, - "requires": { - "argparse": "^1.0.7", - "esprima": "^4.0.0" - } - }, - "jsdom": { - "version": "19.0.0", - "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-19.0.0.tgz", - "integrity": "sha512-RYAyjCbxy/vri/CfnjUWJQQtZ3LKlLnDqj+9XLNnJPgEGeirZs3hllKR20re8LUZ6o1b1X4Jat+Qd26zmP41+A==", - "dev": true, - "requires": { - "abab": "^2.0.5", - "acorn": "^8.5.0", - "acorn-globals": "^6.0.0", - "cssom": "^0.5.0", - "cssstyle": "^2.3.0", - "data-urls": "^3.0.1", - "decimal.js": "^10.3.1", - "domexception": "^4.0.0", - "escodegen": "^2.0.0", - "form-data": "^4.0.0", - "html-encoding-sniffer": "^3.0.0", - "http-proxy-agent": "^5.0.0", - "https-proxy-agent": "^5.0.0", - "is-potential-custom-element-name": "^1.0.1", - "nwsapi": "^2.2.0", - "parse5": "6.0.1", - "saxes": "^5.0.1", - "symbol-tree": "^3.2.4", - "tough-cookie": "^4.0.0", - "w3c-hr-time": "^1.0.2", - "w3c-xmlserializer": "^3.0.0", - "webidl-conversions": "^7.0.0", - "whatwg-encoding": "^2.0.0", - "whatwg-mimetype": "^3.0.0", - "whatwg-url": "^10.0.0", - "ws": "^8.2.3", - "xml-name-validator": "^4.0.0" - }, - "dependencies": { - "parse5": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz", - "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==", - "dev": true - } - } - }, - "jsesc": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", - "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", - "dev": true - }, - "json-parse-even-better-errors": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", - "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", - "dev": true - }, - "json-schema-traverse": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", - "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", - "dev": true - }, - "json-stable-stringify-without-jsonify": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", - "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==", - "dev": true - }, - "json5": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", - "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", - "dev": true - }, - "jsonc-parser": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz", - "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==", - "dev": true - }, - "jsonparse": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz", - "integrity": "sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==", - "dev": true - }, - "jwt-decode": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/jwt-decode/-/jwt-decode-3.1.2.tgz", - "integrity": "sha512-UfpWE/VZn0iP50d8cz9NrZLM9lSWhcJ+0Gt/nm4by88UL+J1SiKN8/5dkjMmbEzwL2CAe+67GsegCbIKtbp75A==" - }, - "karma-source-map-support": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/karma-source-map-support/-/karma-source-map-support-1.4.0.tgz", - "integrity": "sha512-RsBECncGO17KAoJCYXjv+ckIz+Ii9NCi+9enk+rq6XC81ezYkb4/RHE6CTXdA7IOJqoF3wcaLfVG0CPmE5ca6A==", - "dev": true, - "requires": { - "source-map-support": "^0.5.5" - } - }, - "kind-of": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", - "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", - "dev": true - }, - "kleur": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz", - "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==", - "dev": true - }, - "klona": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.6.tgz", - "integrity": "sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA==", - "dev": true - }, - "less": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/less/-/less-4.1.3.tgz", - "integrity": "sha512-w16Xk/Ta9Hhyei0Gpz9m7VS8F28nieJaL/VyShID7cYvP6IL5oHeL6p4TXSDJqZE/lNv0oJ2pGVjJsRkfwm5FA==", - "dev": true, - "requires": { - "copy-anything": "^2.0.1", - "errno": "^0.1.1", - "graceful-fs": "^4.1.2", - "image-size": "~0.5.0", - "make-dir": "^2.1.0", - "mime": "^1.4.1", - "needle": "^3.1.0", - "parse-node-version": "^1.0.1", - "source-map": "~0.6.0", - "tslib": "^2.3.0" - }, - "dependencies": { - "make-dir": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz", - "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==", - "dev": true, - "optional": true, - "requires": { - "pify": "^4.0.1", - "semver": "^5.6.0" - } - }, - "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", - "dev": true, - "optional": true - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true, - "optional": true - } - } - }, - "less-loader": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/less-loader/-/less-loader-11.1.0.tgz", - "integrity": "sha512-C+uDBV7kS7W5fJlUjq5mPBeBVhYpTIm5gB09APT9o3n/ILeaXVsiSFTbZpTJCJwQ/Crczfn3DmfQFwxYusWFug==", - "dev": true, - "requires": { - "klona": "^2.0.4" - } - }, - "leven": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz", - "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==", - "dev": true - }, - "levn": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", - "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", - "dev": true, - "requires": { - "prelude-ls": "^1.2.1", - "type-check": "~0.4.0" - } - }, - "license-webpack-plugin": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/license-webpack-plugin/-/license-webpack-plugin-4.0.2.tgz", - "integrity": "sha512-771TFWFD70G1wLTC4oU2Cw4qvtmNrIw+wRvBtn+okgHl7slJVi7zfNcdmqDL72BojM30VNJ2UHylr1o77U37Jw==", - "dev": true, - "requires": { - "webpack-sources": "^3.0.0" - } - }, - "lines-and-columns": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", - "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==", - "dev": true - }, - "loader-runner": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz", - "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==", - "dev": true - }, - "loader-utils": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-3.2.1.tgz", - "integrity": "sha512-ZvFw1KWS3GVyYBYb7qkmRM/WwL2TQQBxgCK62rlvm4WpVQ23Nb4tYjApUlfjrEGvOs7KHEsmyUn75OHZrJMWPw==", - "dev": true - }, - "locate-path": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", - "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", - "dev": true, - "requires": { - "p-locate": "^4.1.0" - } - }, - "lodash": { - "version": "4.17.21", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", - "dev": true - }, - "lodash.debounce": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz", - "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==", - "dev": true - }, - "lodash.memoize": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz", - "integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==", - "dev": true - }, - "lodash.merge": { - "version": "4.6.2", - "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", - "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", - "dev": true - }, - "log-symbols": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz", - "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==", - "dev": true, - "requires": { - "chalk": "^4.1.0", - "is-unicode-supported": "^0.1.0" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "lru-cache": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", - "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", - "dev": true, - "requires": { - "yallist": "^3.0.2" - }, - "dependencies": { - "yallist": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", - "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", - "dev": true - } - } - }, - "magic-string": { - "version": "0.27.0", - "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.27.0.tgz", - "integrity": "sha512-8UnnX2PeRAPZuN12svgR9j7M1uWMovg/CEnIwIG0LFkXSJJe4PdfUGiTGl8V9bsBHFUtfVINcSyYxd7q+kx9fA==", - "dev": true, - "requires": { - "@jridgewell/sourcemap-codec": "^1.4.13" - } - }, - "make-dir": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", - "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", - "dev": true, - "requires": { - "semver": "^6.0.0" - }, - "dependencies": { - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true - } - } - }, - "make-error": { - "version": "1.3.6", - "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz", - "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==", - "dev": true - }, - "make-fetch-happen": { - "version": "10.2.1", - "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-10.2.1.tgz", - "integrity": "sha512-NgOPbRiaQM10DYXvN3/hhGVI2M5MtITFryzBGxHM5p4wnFxsVCbxkrBrDsk+EZ5OB4jEOT7AjDxtdF+KVEFT7w==", - "dev": true, - "requires": { - "agentkeepalive": "^4.2.1", - "cacache": "^16.1.0", - "http-cache-semantics": "^4.1.0", - "http-proxy-agent": "^5.0.0", - "https-proxy-agent": "^5.0.0", - "is-lambda": "^1.0.1", - "lru-cache": "^7.7.1", - "minipass": "^3.1.6", - "minipass-collect": "^1.0.2", - "minipass-fetch": "^2.0.3", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.4", - "negotiator": "^0.6.3", - "promise-retry": "^2.0.1", - "socks-proxy-agent": "^7.0.0", - "ssri": "^9.0.0" - }, - "dependencies": { - "@npmcli/fs": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-2.1.2.tgz", - "integrity": "sha512-yOJKRvohFOaLqipNtwYB9WugyZKhC/DZC4VYPmpaCzDBrA8YpK3qHZ8/HGscMnE4GqbkLNuVcCnxkeQEdGt6LQ==", - "dev": true, - "requires": { - "@gar/promisify": "^1.1.3", - "semver": "^7.3.5" - } - }, - "cacache": { - "version": "16.1.3", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-16.1.3.tgz", - "integrity": "sha512-/+Emcj9DAXxX4cwlLmRI9c166RuL3w30zp4R7Joiv2cQTtTtA+jeuCAjH3ZlGnYS3tKENSrKhAzVVP9GVyzeYQ==", - "dev": true, - "requires": { - "@npmcli/fs": "^2.1.0", - "@npmcli/move-file": "^2.0.0", - "chownr": "^2.0.0", - "fs-minipass": "^2.1.0", - "glob": "^8.0.1", - "infer-owner": "^1.0.4", - "lru-cache": "^7.7.1", - "minipass": "^3.1.6", - "minipass-collect": "^1.0.2", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.4", - "mkdirp": "^1.0.4", - "p-map": "^4.0.0", - "promise-inflight": "^1.0.1", - "rimraf": "^3.0.2", - "ssri": "^9.0.0", - "tar": "^6.1.11", - "unique-filename": "^2.0.0" - } - }, - "fs-minipass": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", - "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", - "dev": true, - "requires": { - "minipass": "^3.0.0" - } - }, - "lru-cache": { - "version": "7.14.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.14.1.tgz", - "integrity": "sha512-ysxwsnTKdAx96aTRdhDOCQfDgbHnt8SK0KY8SEjO0wHinhWOFTESbjVCMPbU1uGXg/ch4lifqx0wfjOawU2+WA==", - "dev": true - }, - "minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", - "dev": true, - "requires": { - "yallist": "^4.0.0" - } - }, - "ssri": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/ssri/-/ssri-9.0.1.tgz", - "integrity": "sha512-o57Wcn66jMQvfHG1FlYbWeZWW/dHZhJXjpIcTfXldXEk5nz5lStPo3mK0OJQfGR3RbZUlbISexbljkJzuEj/8Q==", - "dev": true, - "requires": { - "minipass": "^3.1.1" - } - }, - "unique-filename": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-2.0.1.tgz", - "integrity": "sha512-ODWHtkkdx3IAR+veKxFV+VBkUMcN+FaqzUUd7IZzt+0zhDZFPFxhlqwPF3YQvMHx1TD0tdgYl+kuPnJ8E6ql7A==", - "dev": true, - "requires": { - "unique-slug": "^3.0.0" - } - }, - "unique-slug": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-3.0.0.tgz", - "integrity": "sha512-8EyMynh679x/0gqE9fT9oilG+qEt+ibFyqjuVTsZn1+CMxH+XLlpvr2UZx4nVcCwTpx81nICr2JQFkM+HPLq4w==", - "dev": true, - "requires": { - "imurmurhash": "^0.1.4" - } - } - } - }, - "makeerror": { - "version": "1.0.12", - "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz", - "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==", - "dev": true, - "requires": { - "tmpl": "1.0.5" - } - }, - "media-typer": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", - "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==", - "dev": true - }, - "memfs": { - "version": "3.4.13", - "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.4.13.tgz", - "integrity": "sha512-omTM41g3Skpvx5dSYeZIbXKcXoAVc/AoMNwn9TKx++L/gaen/+4TTttmu8ZSch5vfVJ8uJvGbroTsIlslRg6lg==", - "dev": true, - "requires": { - "fs-monkey": "^1.0.3" - } - }, - "merge-descriptors": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", - "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==", - "dev": true - }, - "merge-stream": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", - "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", - "dev": true - }, - "merge2": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", - "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", - "dev": true - }, - "methods": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", - "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==", - "dev": true - }, - "micromatch": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", - "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", - "dev": true, - "requires": { - "braces": "^3.0.2", - "picomatch": "^2.3.1" - } - }, - "mime": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", - "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", - "dev": true - }, - "mime-db": { - "version": "1.52.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", - "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", - "dev": true - }, - "mime-types": { - "version": "2.1.35", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", - "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", - "dev": true, - "requires": { - "mime-db": "1.52.0" - } - }, - "mimic-fn": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", - "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", - "dev": true - }, - "mini-css-extract-plugin": { - "version": "2.7.2", - "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.7.2.tgz", - "integrity": "sha512-EdlUizq13o0Pd+uCp+WO/JpkLvHRVGt97RqfeGhXqAcorYo1ypJSpkV+WDT0vY/kmh/p7wRdJNJtuyK540PXDw==", - "dev": true, - "requires": { - "schema-utils": "^4.0.0" - } - }, - "minimalistic-assert": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz", - "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==", - "dev": true - }, - "minimatch": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.0.tgz", - "integrity": "sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==", - "dev": true, - "requires": { - "brace-expansion": "^2.0.1" - } - }, - "minimist": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz", - "integrity": "sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==", - "dev": true - }, - "minipass": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-4.0.0.tgz", - "integrity": "sha512-g2Uuh2jEKoht+zvO6vJqXmYpflPqzRBT+Th2h01DKh5z7wbY/AZ2gCQ78cP70YoHPyFdY30YBV5WxgLOEwOykw==", - "dev": true, - "requires": { - "yallist": "^4.0.0" - } - }, - "minipass-collect": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz", - "integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==", - "dev": true, - "requires": { - "minipass": "^3.0.0" - }, - "dependencies": { - "minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", - "dev": true, - "requires": { - "yallist": "^4.0.0" - } - } - } - }, - "minipass-fetch": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-2.1.2.tgz", - "integrity": "sha512-LT49Zi2/WMROHYoqGgdlQIZh8mLPZmOrN2NdJjMXxYe4nkN6FUyuPuOAOedNJDrx0IRGg9+4guZewtp8hE6TxA==", - "dev": true, - "requires": { - "encoding": "^0.1.13", - "minipass": "^3.1.6", - "minipass-sized": "^1.0.3", - "minizlib": "^2.1.2" - }, - "dependencies": { - "minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", - "dev": true, - "requires": { - "yallist": "^4.0.0" - } - } - } - }, - "minipass-flush": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz", - "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==", - "dev": true, - "requires": { - "minipass": "^3.0.0" - }, - "dependencies": { - "minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", - "dev": true, - "requires": { - "yallist": "^4.0.0" - } - } - } - }, - "minipass-json-stream": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/minipass-json-stream/-/minipass-json-stream-1.0.1.tgz", - "integrity": "sha512-ODqY18UZt/I8k+b7rl2AENgbWE8IDYam+undIJONvigAz8KR5GWblsFTEfQs0WODsjbSXWlm+JHEv8Gr6Tfdbg==", - "dev": true, - "requires": { - "jsonparse": "^1.3.1", - "minipass": "^3.0.0" - }, - "dependencies": { - "minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", - "dev": true, - "requires": { - "yallist": "^4.0.0" - } - } - } - }, - "minipass-pipeline": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz", - "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==", - "dev": true, - "requires": { - "minipass": "^3.0.0" - }, - "dependencies": { - "minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", - "dev": true, - "requires": { - "yallist": "^4.0.0" - } - } - } - }, - "minipass-sized": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz", - "integrity": "sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==", - "dev": true, - "requires": { - "minipass": "^3.0.0" - }, - "dependencies": { - "minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", - "dev": true, - "requires": { - "yallist": "^4.0.0" - } - } - } - }, - "minizlib": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", - "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", - "dev": true, - "requires": { - "minipass": "^3.0.0", - "yallist": "^4.0.0" - }, - "dependencies": { - "minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", - "dev": true, - "requires": { - "yallist": "^4.0.0" - } - } - } - }, - "mkdirp": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", - "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", - "dev": true - }, - "moment": { - "version": "2.29.4", - "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz", - "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==", - "peer": true - }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true - }, - "multicast-dns": { - "version": "7.2.5", - "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.2.5.tgz", - "integrity": "sha512-2eznPJP8z2BFLX50tf0LuODrpINqP1RVIm/CObbTcBRITQgmC/TjcREF1NeTBzIcR5XO/ukWo+YHOjBbFwIupg==", - "dev": true, - "requires": { - "dns-packet": "^5.2.2", - "thunky": "^1.0.2" - } - }, - "mute-stream": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz", - "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==", - "dev": true - }, - "nanoid": { - "version": "3.3.4", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz", - "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==", - "dev": true - }, - "natural-compare": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", - "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", - "dev": true - }, - "natural-compare-lite": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz", - "integrity": "sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==", - "dev": true - }, - "needle": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/needle/-/needle-3.2.0.tgz", - "integrity": "sha512-oUvzXnyLiVyVGoianLijF9O/RecZUf7TkBfimjGrLM4eQhXyeJwM6GeAWccwfQ9aa4gMCZKqhAOuLaMIcQxajQ==", - "dev": true, - "optional": true, - "requires": { - "debug": "^3.2.6", - "iconv-lite": "^0.6.3", - "sax": "^1.2.4" - }, - "dependencies": { - "debug": { - "version": "3.2.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", - "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", - "dev": true, - "optional": true, - "requires": { - "ms": "^2.1.1" - } - }, - "iconv-lite": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", - "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", - "dev": true, - "optional": true, - "requires": { - "safer-buffer": ">= 2.1.2 < 3.0.0" - } - } - } - }, - "negotiator": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", - "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==", - "dev": true - }, - "neo-async": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz", - "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", - "dev": true - }, - "ngx-mask": { - "version": "15.0.2", - "resolved": "https://registry.npmjs.org/ngx-mask/-/ngx-mask-15.0.2.tgz", - "integrity": "sha512-O0w4+rwcrIWTu60j9bPAHk7hDrvrriCfniJ1DVL4OSWqS8fvlCLalld+oTNelMatkIOCyR/TTyhkm+38DXPUrg==", - "requires": { - "tslib": "^2.3.0" - } - }, - "nice-napi": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/nice-napi/-/nice-napi-1.0.2.tgz", - "integrity": "sha512-px/KnJAJZf5RuBGcfD+Sp2pAKq0ytz8j+1NehvgIGFkvtvFrDM3T8E4x/JJODXK9WZow8RRGrbA9QQ3hs+pDhA==", - "dev": true, - "optional": true, - "requires": { - "node-addon-api": "^3.0.0", - "node-gyp-build": "^4.2.2" - } - }, - "node-addon-api": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz", - "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==", - "dev": true, - "optional": true - }, - "node-forge": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz", - "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==", - "dev": true - }, - "node-gyp": { - "version": "9.3.1", - "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-9.3.1.tgz", - "integrity": "sha512-4Q16ZCqq3g8awk6UplT7AuxQ35XN4R/yf/+wSAwcBUAjg7l58RTactWaP8fIDTi0FzI7YcVLujwExakZlfWkXg==", - "dev": true, - "requires": { - "env-paths": "^2.2.0", - "glob": "^7.1.4", - "graceful-fs": "^4.2.6", - "make-fetch-happen": "^10.0.3", - "nopt": "^6.0.0", - "npmlog": "^6.0.0", - "rimraf": "^3.0.2", - "semver": "^7.3.5", - "tar": "^6.1.2", - "which": "^2.0.2" - }, - "dependencies": { - "brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "dev": true, - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, - "minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "requires": { - "brace-expansion": "^1.1.7" - } - } - } - }, - "node-gyp-build": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.6.0.tgz", - "integrity": "sha512-NTZVKn9IylLwUzaKjkas1e4u2DLNcV4rdYagA4PWdPwW87Bi7z+BznyKSRwS/761tV/lzCGXplWsiaMjLqP2zQ==", - "dev": true, - "optional": true - }, - "node-int64": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz", - "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==", - "dev": true - }, - "node-releases": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.6.tgz", - "integrity": "sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg==", - "dev": true - }, - "nopt": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-6.0.0.tgz", - "integrity": "sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g==", - "dev": true, - "requires": { - "abbrev": "^1.0.0" - } - }, - "normalize-package-data": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-5.0.0.tgz", - "integrity": "sha512-h9iPVIfrVZ9wVYQnxFgtw1ugSvGEMOlyPWWtm8BMJhnwyEL/FLbYbTY3V3PpjI/BUK67n9PEWDu6eHzu1fB15Q==", - "dev": true, - "requires": { - "hosted-git-info": "^6.0.0", - "is-core-module": "^2.8.1", - "semver": "^7.3.5", - "validate-npm-package-license": "^3.0.4" - } - }, - "normalize-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", - "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", - "dev": true - }, - "normalize-range": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz", - "integrity": "sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==", - "dev": true - }, - "npm-bundled": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-3.0.0.tgz", - "integrity": "sha512-Vq0eyEQy+elFpzsKjMss9kxqb9tG3YHg4dsyWuUENuzvSUWe1TCnW/vV9FkhvBk/brEDoDiVd+M1Btosa6ImdQ==", - "dev": true, - "requires": { - "npm-normalize-package-bin": "^3.0.0" - } - }, - "npm-install-checks": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-6.0.0.tgz", - "integrity": "sha512-SBU9oFglRVZnfElwAtF14NivyulDqF1VKqqwNsFW9HDcbHMAPHpRSsVFgKuwFGq/hVvWZExz62Th0kvxn/XE7Q==", - "dev": true, - "requires": { - "semver": "^7.1.1" - } - }, - "npm-normalize-package-bin": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-3.0.0.tgz", - "integrity": "sha512-g+DPQSkusnk7HYXr75NtzkIP4+N81i3RPsGFidF3DzHd9MT9wWngmqoeg/fnHFz5MNdtG4w03s+QnhewSLTT2Q==", - "dev": true - }, - "npm-package-arg": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-10.1.0.tgz", - "integrity": "sha512-uFyyCEmgBfZTtrKk/5xDfHp6+MdrqGotX/VoOyEEl3mBwiEE5FlBaePanazJSVMPT7vKepcjYBY2ztg9A3yPIA==", - "dev": true, - "requires": { - "hosted-git-info": "^6.0.0", - "proc-log": "^3.0.0", - "semver": "^7.3.5", - "validate-npm-package-name": "^5.0.0" - } - }, - "npm-packlist": { - "version": "7.0.4", - "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-7.0.4.tgz", - "integrity": "sha512-d6RGEuRrNS5/N84iglPivjaJPxhDbZmlbTwTDX2IbcRHG5bZCdtysYMhwiPvcF4GisXHGn7xsxv+GQ7T/02M5Q==", - "dev": true, - "requires": { - "ignore-walk": "^6.0.0" - } - }, - "npm-pick-manifest": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-8.0.1.tgz", - "integrity": "sha512-mRtvlBjTsJvfCCdmPtiu2bdlx8d/KXtF7yNXNWe7G0Z36qWA9Ny5zXsI2PfBZEv7SXgoxTmNaTzGSbbzDZChoA==", - "dev": true, - "requires": { - "npm-install-checks": "^6.0.0", - "npm-normalize-package-bin": "^3.0.0", - "npm-package-arg": "^10.0.0", - "semver": "^7.3.5" - } - }, - "npm-registry-fetch": { - "version": "14.0.3", - "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-14.0.3.tgz", - "integrity": "sha512-YaeRbVNpnWvsGOjX2wk5s85XJ7l1qQBGAp724h8e2CZFFhMSuw9enom7K1mWVUtvXO1uUSFIAPofQK0pPN0ZcA==", - "dev": true, - "requires": { - "make-fetch-happen": "^11.0.0", - "minipass": "^4.0.0", - "minipass-fetch": "^3.0.0", - "minipass-json-stream": "^1.0.1", - "minizlib": "^2.1.2", - "npm-package-arg": "^10.0.0", - "proc-log": "^3.0.0" - }, - "dependencies": { - "lru-cache": { - "version": "7.14.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.14.1.tgz", - "integrity": "sha512-ysxwsnTKdAx96aTRdhDOCQfDgbHnt8SK0KY8SEjO0wHinhWOFTESbjVCMPbU1uGXg/ch4lifqx0wfjOawU2+WA==", - "dev": true - }, - "make-fetch-happen": { - "version": "11.0.2", - "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-11.0.2.tgz", - "integrity": "sha512-5n/Pq41w/uZghpdlXAY5kIM85RgJThtTH/NYBRAZ9VUOBWV90USaQjwGrw76fZP3Lj5hl/VZjpVvOaRBMoL/2w==", - "dev": true, - "requires": { - "agentkeepalive": "^4.2.1", - "cacache": "^17.0.0", - "http-cache-semantics": "^4.1.0", - "http-proxy-agent": "^5.0.0", - "https-proxy-agent": "^5.0.0", - "is-lambda": "^1.0.1", - "lru-cache": "^7.7.1", - "minipass": "^4.0.0", - "minipass-collect": "^1.0.2", - "minipass-fetch": "^3.0.0", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.4", - "negotiator": "^0.6.3", - "promise-retry": "^2.0.1", - "socks-proxy-agent": "^7.0.0", - "ssri": "^10.0.0" - } - }, - "minipass-fetch": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.1.tgz", - "integrity": "sha512-t9/wowtf7DYkwz8cfMSt0rMwiyNIBXf5CKZ3S5ZMqRqMYT0oLTp0x1WorMI9WTwvaPg21r1JbFxJMum8JrLGfw==", - "dev": true, - "requires": { - "encoding": "^0.1.13", - "minipass": "^4.0.0", - "minipass-sized": "^1.0.3", - "minizlib": "^2.1.2" - } - } - } - }, - "npm-run-path": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", - "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", - "dev": true, - "requires": { - "path-key": "^3.0.0" - } - }, - "npmlog": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-6.0.2.tgz", - "integrity": "sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==", - "dev": true, - "requires": { - "are-we-there-yet": "^3.0.0", - "console-control-strings": "^1.1.0", - "gauge": "^4.0.3", - "set-blocking": "^2.0.0" - } - }, - "nth-check": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz", - "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==", - "dev": true, - "requires": { - "boolbase": "^1.0.0" - } - }, - "nwsapi": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.2.tgz", - "integrity": "sha512-90yv+6538zuvUMnN+zCr8LuV6bPFdq50304114vJYJ8RDyK8D5O9Phpbd6SZWgI7PwzmmfN1upeOJlvybDSgCw==", - "dev": true - }, - "object-inspect": { - "version": "1.12.3", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz", - "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==", - "dev": true - }, - "obuf": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz", - "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==", - "dev": true - }, - "on-finished": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", - "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", - "dev": true, - "requires": { - "ee-first": "1.1.1" - } - }, - "on-headers": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz", - "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==", - "dev": true - }, - "once": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", - "dev": true, - "requires": { - "wrappy": "1" - } - }, - "onetime": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", - "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", - "dev": true, - "requires": { - "mimic-fn": "^2.1.0" - } - }, - "open": { - "version": "8.4.0", - "resolved": "https://registry.npmjs.org/open/-/open-8.4.0.tgz", - "integrity": "sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==", - "dev": true, - "requires": { - "define-lazy-prop": "^2.0.0", - "is-docker": "^2.1.1", - "is-wsl": "^2.2.0" - } - }, - "optionator": { - "version": "0.9.1", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz", - "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==", - "dev": true, - "requires": { - "deep-is": "^0.1.3", - "fast-levenshtein": "^2.0.6", - "levn": "^0.4.1", - "prelude-ls": "^1.2.1", - "type-check": "^0.4.0", - "word-wrap": "^1.2.3" - } - }, - "ora": { - "version": "5.4.1", - "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz", - "integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==", - "dev": true, - "requires": { - "bl": "^4.1.0", - "chalk": "^4.1.0", - "cli-cursor": "^3.1.0", - "cli-spinners": "^2.5.0", - "is-interactive": "^1.0.0", - "is-unicode-supported": "^0.1.0", - "log-symbols": "^4.1.0", - "strip-ansi": "^6.0.0", - "wcwidth": "^1.0.1" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "os-tmpdir": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", - "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==", - "dev": true - }, - "p-limit": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", - "dev": true, - "requires": { - "p-try": "^2.0.0" - } - }, - "p-locate": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", - "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", - "dev": true, - "requires": { - "p-limit": "^2.2.0" - } - }, - "p-map": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz", - "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==", - "dev": true, - "requires": { - "aggregate-error": "^3.0.0" - } - }, - "p-retry": { - "version": "4.6.2", - "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-4.6.2.tgz", - "integrity": "sha512-312Id396EbJdvRONlngUx0NydfrIQ5lsYu0znKVUzVvArzEIt08V1qhtyESbGVd1FGX7UKtiFp5uwKZdM8wIuQ==", - "dev": true, - "requires": { - "@types/retry": "0.12.0", - "retry": "^0.13.1" - }, - "dependencies": { - "retry": { - "version": "0.13.1", - "resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz", - "integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==", - "dev": true - } - } - }, - "p-try": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", - "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", - "dev": true - }, - "pacote": { - "version": "15.0.8", - "resolved": "https://registry.npmjs.org/pacote/-/pacote-15.0.8.tgz", - "integrity": "sha512-UlcumB/XS6xyyIMwg/WwMAyUmga+RivB5KgkRwA1hZNtrx+0Bt41KxHCvg1kr0pZ/ZeD8qjhW4fph6VaYRCbLw==", - "dev": true, - "requires": { - "@npmcli/git": "^4.0.0", - "@npmcli/installed-package-contents": "^2.0.1", - "@npmcli/promise-spawn": "^6.0.1", - "@npmcli/run-script": "^6.0.0", - "cacache": "^17.0.0", - "fs-minipass": "^3.0.0", - "minipass": "^4.0.0", - "npm-package-arg": "^10.0.0", - "npm-packlist": "^7.0.0", - "npm-pick-manifest": "^8.0.0", - "npm-registry-fetch": "^14.0.0", - "proc-log": "^3.0.0", - "promise-retry": "^2.0.1", - "read-package-json": "^6.0.0", - "read-package-json-fast": "^3.0.0", - "ssri": "^10.0.0", - "tar": "^6.1.11" - } - }, - "pako": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz", - "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==", - "dev": true - }, - "parent-module": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", - "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", - "dev": true, - "requires": { - "callsites": "^3.0.0" - } - }, - "parse-json": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", - "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.0.0", - "error-ex": "^1.3.1", - "json-parse-even-better-errors": "^2.3.0", - "lines-and-columns": "^1.1.6" - } - }, - "parse-node-version": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz", - "integrity": "sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==", - "dev": true - }, - "parse5": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.1.2.tgz", - "integrity": "sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==", - "optional": true, - "peer": true, - "requires": { - "entities": "^4.4.0" - }, - "dependencies": { - "entities": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/entities/-/entities-4.4.0.tgz", - "integrity": "sha512-oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA==", - "optional": true, - "peer": true - } - } - }, - "parse5-html-rewriting-stream": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/parse5-html-rewriting-stream/-/parse5-html-rewriting-stream-6.0.1.tgz", - "integrity": "sha512-vwLQzynJVEfUlURxgnf51yAJDQTtVpNyGD8tKi2Za7m+akukNHxCcUQMAa/mUGLhCeicFdpy7Tlvj8ZNKadprg==", - "dev": true, - "requires": { - "parse5": "^6.0.1", - "parse5-sax-parser": "^6.0.1" - }, - "dependencies": { - "parse5": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz", - "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==", - "dev": true - } - } - }, - "parse5-htmlparser2-tree-adapter": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz", - "integrity": "sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA==", - "dev": true, - "requires": { - "parse5": "^6.0.1" - }, - "dependencies": { - "parse5": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz", - "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==", - "dev": true - } - } - }, - "parse5-sax-parser": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/parse5-sax-parser/-/parse5-sax-parser-6.0.1.tgz", - "integrity": "sha512-kXX+5S81lgESA0LsDuGjAlBybImAChYRMT+/uKCEXFBFOeEhS52qUCydGhU3qLRD8D9DVjaUo821WK7DM4iCeg==", - "dev": true, - "requires": { - "parse5": "^6.0.1" - }, - "dependencies": { - "parse5": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz", - "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==", - "dev": true - } - } - }, - "parseurl": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", - "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==", - "dev": true - }, - "path-exists": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", - "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", - "dev": true - }, - "path-is-absolute": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", - "dev": true - }, - "path-key": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", - "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", - "dev": true - }, - "path-parse": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", - "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", - "dev": true - }, - "path-to-regexp": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", - "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==", - "dev": true - }, - "path-type": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", - "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", - "dev": true - }, - "picocolors": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", - "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==", - "dev": true - }, - "picomatch": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", - "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", - "dev": true - }, - "pify": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", - "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==", - "dev": true, - "optional": true - }, - "pirates": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.5.tgz", - "integrity": "sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ==", - "dev": true - }, - "piscina": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/piscina/-/piscina-3.2.0.tgz", - "integrity": "sha512-yn/jMdHRw+q2ZJhFhyqsmANcbF6V2QwmD84c6xRau+QpQOmtrBCoRGdvTfeuFDYXB5W2m6MfLkjkvQa9lUSmIA==", - "dev": true, - "requires": { - "eventemitter-asyncresource": "^1.0.0", - "hdr-histogram-js": "^2.0.1", - "hdr-histogram-percentiles-obj": "^3.0.0", - "nice-napi": "^1.0.2" - } - }, - "pkg-dir": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", - "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", - "dev": true, - "requires": { - "find-up": "^4.0.0" - } - }, - "postcss": { - "version": "8.4.21", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.21.tgz", - "integrity": "sha512-tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg==", - "dev": true, - "requires": { - "nanoid": "^3.3.4", - "picocolors": "^1.0.0", - "source-map-js": "^1.0.2" - } - }, - "postcss-loader": { - "version": "7.0.2", - "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-7.0.2.tgz", - "integrity": "sha512-fUJzV/QH7NXUAqV8dWJ9Lg4aTkDCezpTS5HgJ2DvqznexTbSTxgi/dTECvTZ15BwKTtk8G/bqI/QTu2HPd3ZCg==", - "dev": true, - "requires": { - "cosmiconfig": "^7.0.0", - "klona": "^2.0.5", - "semver": "^7.3.8" - } - }, - "postcss-modules-extract-imports": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz", - "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==", - "dev": true, - "requires": {} - }, - "postcss-modules-local-by-default": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz", - "integrity": "sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ==", - "dev": true, - "requires": { - "icss-utils": "^5.0.0", - "postcss-selector-parser": "^6.0.2", - "postcss-value-parser": "^4.1.0" - } - }, - "postcss-modules-scope": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz", - "integrity": "sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==", - "dev": true, - "requires": { - "postcss-selector-parser": "^6.0.4" - } - }, - "postcss-modules-values": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz", - "integrity": "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==", - "dev": true, - "requires": { - "icss-utils": "^5.0.0" - } - }, - "postcss-selector-parser": { - "version": "6.0.11", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.11.tgz", - "integrity": "sha512-zbARubNdogI9j7WY4nQJBiNqQf3sLS3wCP4WfOidu+p28LofJqDH1tcXypGrcmMHhDk2t9wGhCsYe/+szLTy1g==", - "dev": true, - "requires": { - "cssesc": "^3.0.0", - "util-deprecate": "^1.0.2" - } - }, - "postcss-value-parser": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz", - "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==", - "dev": true - }, - "prelude-ls": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", - "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", - "dev": true - }, - "prettier": { - "version": "2.8.3", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.3.tgz", - "integrity": "sha512-tJ/oJ4amDihPoufT5sM0Z1SKEuKay8LfVAMlbbhnnkvt6BUserZylqo2PN+p9KeljLr0OHa2rXHU1T8reeoTrw==", - "dev": true - }, - "pretty-bytes": { - "version": "5.6.0", - "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.6.0.tgz", - "integrity": "sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==", - "dev": true - }, - "pretty-format": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz", - "integrity": "sha512-8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q==", - "dev": true, - "requires": { - "@jest/schemas": "^28.1.3", - "ansi-regex": "^5.0.1", - "ansi-styles": "^5.0.0", - "react-is": "^18.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", - "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", - "dev": true - } - } - }, - "proc-log": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-3.0.0.tgz", - "integrity": "sha512-++Vn7NS4Xf9NacaU9Xq3URUuqZETPsf8L4j5/ckhaRYsfPeRyzGw+iDjFhV/Jr3uNmTvvddEJFWh5R1gRgUH8A==", - "dev": true - }, - "process-nextick-args": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", - "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==", - "dev": true - }, - "promise-inflight": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz", - "integrity": "sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==", - "dev": true - }, - "promise-retry": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz", - "integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==", - "dev": true, - "requires": { - "err-code": "^2.0.2", - "retry": "^0.12.0" - } - }, - "prompts": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz", - "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==", - "dev": true, - "requires": { - "kleur": "^3.0.3", - "sisteransi": "^1.0.5" - } - }, - "proxy-addr": { - "version": "2.0.7", - "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", - "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==", - "dev": true, - "requires": { - "forwarded": "0.2.0", - "ipaddr.js": "1.9.1" - }, - "dependencies": { - "ipaddr.js": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", - "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==", - "dev": true - } - } - }, - "prr": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz", - "integrity": "sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw==", - "dev": true, - "optional": true - }, - "psl": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz", - "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==", - "dev": true - }, - "punycode": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", - "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", - "dev": true - }, - "qs": { - "version": "6.11.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz", - "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==", - "dev": true, - "requires": { - "side-channel": "^1.0.4" - } - }, - "querystringify": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz", - "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==", - "dev": true - }, - "queue-microtask": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", - "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", - "dev": true - }, - "randombytes": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", - "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==", - "dev": true, - "requires": { - "safe-buffer": "^5.1.0" - } - }, - "range-parser": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", - "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==", - "dev": true - }, - "raw-body": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz", - "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==", - "dev": true, - "requires": { - "bytes": "3.1.2", - "http-errors": "2.0.0", - "iconv-lite": "0.4.24", - "unpipe": "1.0.0" - }, - "dependencies": { - "bytes": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", - "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", - "dev": true - } - } - }, - "react-is": { - "version": "18.2.0", - "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz", - "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==", - "dev": true - }, - "read-package-json": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-6.0.0.tgz", - "integrity": "sha512-b/9jxWJ8EwogJPpv99ma+QwtqB7FSl3+V6UXS7Aaay8/5VwMY50oIFooY1UKXMWpfNCM6T/PoGqa5GD1g9xf9w==", - "dev": true, - "requires": { - "glob": "^8.0.1", - "json-parse-even-better-errors": "^3.0.0", - "normalize-package-data": "^5.0.0", - "npm-normalize-package-bin": "^3.0.0" - }, - "dependencies": { - "json-parse-even-better-errors": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-3.0.0.tgz", - "integrity": "sha512-iZbGHafX/59r39gPwVPRBGw0QQKnA7tte5pSMrhWOW7swGsVvVTjmfyAV9pNqk8YGT7tRCdxRu8uzcgZwoDooA==", - "dev": true - } - } - }, - "read-package-json-fast": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/read-package-json-fast/-/read-package-json-fast-3.0.2.tgz", - "integrity": "sha512-0J+Msgym3vrLOUB3hzQCuZHII0xkNGCtz/HJH9xZshwv9DbDwkw1KaE3gx/e2J5rpEY5rtOy6cyhKOPrkP7FZw==", - "dev": true, - "requires": { - "json-parse-even-better-errors": "^3.0.0", - "npm-normalize-package-bin": "^3.0.0" - }, - "dependencies": { - "json-parse-even-better-errors": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-3.0.0.tgz", - "integrity": "sha512-iZbGHafX/59r39gPwVPRBGw0QQKnA7tte5pSMrhWOW7swGsVvVTjmfyAV9pNqk8YGT7tRCdxRu8uzcgZwoDooA==", - "dev": true - } - } - }, - "readable-stream": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", - "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", - "dev": true, - "requires": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - } - }, - "readdirp": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", - "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", - "dev": true, - "requires": { - "picomatch": "^2.2.1" - } - }, - "reflect-metadata": { - "version": "0.1.13", - "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.13.tgz", - "integrity": "sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg==", - "dev": true - }, - "regenerate": { - "version": "1.4.2", - "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz", - "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==", - "dev": true - }, - "regenerate-unicode-properties": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz", - "integrity": "sha512-d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ==", - "dev": true, - "requires": { - "regenerate": "^1.4.2" - } - }, - "regenerator-runtime": { - "version": "0.13.11", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz", - "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==", - "dev": true - }, - "regenerator-transform": { - "version": "0.15.1", - "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.1.tgz", - "integrity": "sha512-knzmNAcuyxV+gQCufkYcvOqX/qIIfHLv0u5x79kRxuGojfYVky1f15TzZEu2Avte8QGepvUNTnLskf8E6X6Vyg==", - "dev": true, - "requires": { - "@babel/runtime": "^7.8.4" - } - }, - "regex-parser": { - "version": "2.2.11", - "resolved": "https://registry.npmjs.org/regex-parser/-/regex-parser-2.2.11.tgz", - "integrity": "sha512-jbD/FT0+9MBU2XAZluI7w2OBs1RBi6p9M83nkoZayQXXU9e8Robt69FcZc7wU4eJD/YFTjn1JdCk3rbMJajz8Q==", - "dev": true - }, - "regexpp": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz", - "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==", - "dev": true - }, - "regexpu-core": { - "version": "5.2.2", - "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.2.2.tgz", - "integrity": "sha512-T0+1Zp2wjF/juXMrMxHxidqGYn8U4R+zleSJhX9tQ1PUsS8a9UtYfbsF9LdiVgNX3kiX8RNaKM42nfSgvFJjmw==", - "dev": true, - "requires": { - "regenerate": "^1.4.2", - "regenerate-unicode-properties": "^10.1.0", - "regjsgen": "^0.7.1", - "regjsparser": "^0.9.1", - "unicode-match-property-ecmascript": "^2.0.0", - "unicode-match-property-value-ecmascript": "^2.1.0" - } - }, - "regjsgen": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.7.1.tgz", - "integrity": "sha512-RAt+8H2ZEzHeYWxZ3H2z6tF18zyyOnlcdaafLrm21Bguj7uZy6ULibiAFdXEtKQY4Sy7wDTwDiOazasMLc4KPA==", - "dev": true - }, - "regjsparser": { - "version": "0.9.1", - "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.9.1.tgz", - "integrity": "sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==", - "dev": true, - "requires": { - "jsesc": "~0.5.0" - }, - "dependencies": { - "jsesc": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", - "integrity": "sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==", - "dev": true - } - } - }, - "require-directory": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", - "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", - "dev": true - }, - "require-from-string": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", - "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==", - "dev": true - }, - "requires-port": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz", - "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==", - "dev": true - }, - "resolve": { - "version": "1.22.1", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz", - "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==", - "dev": true, - "requires": { - "is-core-module": "^2.9.0", - "path-parse": "^1.0.7", - "supports-preserve-symlinks-flag": "^1.0.0" - } - }, - "resolve-cwd": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz", - "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==", - "dev": true, - "requires": { - "resolve-from": "^5.0.0" - } - }, - "resolve-from": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", - "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", - "dev": true - }, - "resolve-url-loader": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/resolve-url-loader/-/resolve-url-loader-5.0.0.tgz", - "integrity": "sha512-uZtduh8/8srhBoMx//5bwqjQ+rfYOUq8zC9NrMUGtjBiGTtFJM42s58/36+hTqeqINcnYe08Nj3LkK9lW4N8Xg==", - "dev": true, - "requires": { - "adjust-sourcemap-loader": "^4.0.0", - "convert-source-map": "^1.7.0", - "loader-utils": "^2.0.0", - "postcss": "^8.2.14", - "source-map": "0.6.1" - }, - "dependencies": { - "loader-utils": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz", - "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==", - "dev": true, - "requires": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^2.1.2" - } - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - } - } - }, - "resolve.exports": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-1.1.1.tgz", - "integrity": "sha512-/NtpHNDN7jWhAaQ9BvBUYZ6YTXsRBgfqWFWP7BZBaoMJO/I3G5OFzvTuWNlZC3aPjins1F+TNrLKsGbH4rfsRQ==", - "dev": true - }, - "restore-cursor": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", - "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==", - "dev": true, - "requires": { - "onetime": "^5.1.0", - "signal-exit": "^3.0.2" - } - }, - "retry": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz", - "integrity": "sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==", - "dev": true - }, - "reusify": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", - "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", - "dev": true - }, - "rimraf": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", - "dev": true, - "requires": { - "glob": "^7.1.3" - }, - "dependencies": { - "brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "dev": true, - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, - "minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "requires": { - "brace-expansion": "^1.1.7" - } - } - } - }, - "run-async": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz", - "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==", - "dev": true - }, - "run-parallel": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", - "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", - "dev": true, - "requires": { - "queue-microtask": "^1.2.2" - } - }, - "rxjs": { - "version": "7.5.7", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.7.tgz", - "integrity": "sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==", - "requires": { - "tslib": "^2.1.0" - } - }, - "safe-buffer": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", - "dev": true - }, - "safer-buffer": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", - "dev": true - }, - "safevalues": { - "version": "0.3.4", - "resolved": "https://registry.npmjs.org/safevalues/-/safevalues-0.3.4.tgz", - "integrity": "sha512-LRneZZRXNgjzwG4bDQdOTSbze3fHm1EAKN/8bePxnlEZiBmkYEDggaHbuvHI9/hoqHbGfsEA7tWS9GhYHZBBsw==" - }, - "sass": { - "version": "1.57.1", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.57.1.tgz", - "integrity": "sha512-O2+LwLS79op7GI0xZ8fqzF7X2m/m8WFfI02dHOdsK5R2ECeS5F62zrwg/relM1rjSLy7Vd/DiMNIvPrQGsA0jw==", - "dev": true, - "requires": { - "chokidar": ">=3.0.0 <4.0.0", - "immutable": "^4.0.0", - "source-map-js": ">=0.6.2 <2.0.0" - } - }, - "sass-loader": { - "version": "13.2.0", - "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-13.2.0.tgz", - "integrity": "sha512-JWEp48djQA4nbZxmgC02/Wh0eroSUutulROUusYJO9P9zltRbNN80JCBHqRGzjd4cmZCa/r88xgfkjGD0TXsHg==", - "dev": true, - "requires": { - "klona": "^2.0.4", - "neo-async": "^2.6.2" - } - }, - "sax": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", - "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==", - "dev": true, - "optional": true - }, - "saxes": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz", - "integrity": "sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==", - "dev": true, - "requires": { - "xmlchars": "^2.2.0" - } - }, - "schema-utils": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz", - "integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==", - "dev": true, - "requires": { - "@types/json-schema": "^7.0.9", - "ajv": "^8.8.0", - "ajv-formats": "^2.1.1", - "ajv-keywords": "^5.0.0" - } - }, - "select-hose": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz", - "integrity": "sha512-mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg==", - "dev": true - }, - "selfsigned": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-2.1.1.tgz", - "integrity": "sha512-GSL3aowiF7wa/WtSFwnUrludWFoNhftq8bUkH9pkzjpN2XSPOAYEgg6e0sS9s0rZwgJzJiQRPU18A6clnoW5wQ==", - "dev": true, - "requires": { - "node-forge": "^1" - } - }, - "semver": { - "version": "7.3.8", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", - "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", - "dev": true, - "requires": { - "lru-cache": "^6.0.0" - }, - "dependencies": { - "lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dev": true, - "requires": { - "yallist": "^4.0.0" - } - } - } - }, - "send": { - "version": "0.18.0", - "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz", - "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==", - "dev": true, - "requires": { - "debug": "2.6.9", - "depd": "2.0.0", - "destroy": "1.2.0", - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "etag": "~1.8.1", - "fresh": "0.5.2", - "http-errors": "2.0.0", - "mime": "1.6.0", - "ms": "2.1.3", - "on-finished": "2.4.1", - "range-parser": "~1.2.1", - "statuses": "2.0.1" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "requires": { - "ms": "2.0.0" - }, - "dependencies": { - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "dev": true - } - } - }, - "depd": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", - "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", - "dev": true - }, - "ms": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", - "dev": true - } - } - }, - "serialize-javascript": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.1.tgz", - "integrity": "sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==", - "dev": true, - "requires": { - "randombytes": "^2.1.0" - } - }, - "serve-index": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz", - "integrity": "sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw==", - "dev": true, - "requires": { - "accepts": "~1.3.4", - "batch": "0.6.1", - "debug": "2.6.9", - "escape-html": "~1.0.3", - "http-errors": "~1.6.2", - "mime-types": "~2.1.17", - "parseurl": "~1.3.2" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "http-errors": { - "version": "1.6.3", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz", - "integrity": "sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==", - "dev": true, - "requires": { - "depd": "~1.1.2", - "inherits": "2.0.3", - "setprototypeof": "1.1.0", - "statuses": ">= 1.4.0 < 2" - } - }, - "inherits": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==", - "dev": true - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "dev": true - }, - "setprototypeof": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz", - "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==", - "dev": true - }, - "statuses": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", - "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==", - "dev": true - } - } - }, - "serve-static": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz", - "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==", - "dev": true, - "requires": { - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "parseurl": "~1.3.3", - "send": "0.18.0" - } - }, - "set-blocking": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", - "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==", - "dev": true - }, - "setprototypeof": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", - "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==", - "dev": true - }, - "shallow-clone": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz", - "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==", - "dev": true, - "requires": { - "kind-of": "^6.0.2" - } - }, - "shebang-command": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", - "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", - "dev": true, - "requires": { - "shebang-regex": "^3.0.0" - } - }, - "shebang-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", - "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", - "dev": true - }, - "side-channel": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", - "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==", - "dev": true, - "requires": { - "call-bind": "^1.0.0", - "get-intrinsic": "^1.0.2", - "object-inspect": "^1.9.0" - } - }, - "signal-exit": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", - "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", - "dev": true - }, - "sisteransi": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz", - "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==", - "dev": true - }, - "slash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", - "dev": true - }, - "smart-buffer": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz", - "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==", - "dev": true - }, - "sockjs": { - "version": "0.3.24", - "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.24.tgz", - "integrity": "sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ==", - "dev": true, - "requires": { - "faye-websocket": "^0.11.3", - "uuid": "^8.3.2", - "websocket-driver": "^0.7.4" - } - }, - "socks": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/socks/-/socks-2.7.1.tgz", - "integrity": "sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ==", - "dev": true, - "requires": { - "ip": "^2.0.0", - "smart-buffer": "^4.2.0" - } - }, - "socks-proxy-agent": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz", - "integrity": "sha512-Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww==", - "dev": true, - "requires": { - "agent-base": "^6.0.2", - "debug": "^4.3.3", - "socks": "^2.6.2" - } - }, - "source-map": { - "version": "0.7.4", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz", - "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==", - "dev": true - }, - "source-map-js": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz", - "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==", - "dev": true - }, - "source-map-loader": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/source-map-loader/-/source-map-loader-4.0.1.tgz", - "integrity": "sha512-oqXpzDIByKONVY8g1NUPOTQhe0UTU5bWUl32GSkqK2LjJj0HmwTMVKxcUip0RgAYhY1mqgOxjbQM48a0mmeNfA==", - "dev": true, - "requires": { - "abab": "^2.0.6", - "iconv-lite": "^0.6.3", - "source-map-js": "^1.0.2" - }, - "dependencies": { - "iconv-lite": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", - "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", - "dev": true, - "requires": { - "safer-buffer": ">= 2.1.2 < 3.0.0" - } - } - } - }, - "source-map-support": { - "version": "0.5.21", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", - "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", - "requires": { - "buffer-from": "^1.0.0", - "source-map": "^0.6.0" - }, - "dependencies": { - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" - } - } - }, - "spdx-correct": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz", - "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==", - "dev": true, - "requires": { - "spdx-expression-parse": "^3.0.0", - "spdx-license-ids": "^3.0.0" - } - }, - "spdx-exceptions": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz", - "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==", - "dev": true - }, - "spdx-expression-parse": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz", - "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==", - "dev": true, - "requires": { - "spdx-exceptions": "^2.1.0", - "spdx-license-ids": "^3.0.0" - } - }, - "spdx-license-ids": { - "version": "3.0.12", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.12.tgz", - "integrity": "sha512-rr+VVSXtRhO4OHbXUiAF7xW3Bo9DuuF6C5jH+q/x15j2jniycgKbxU09Hr0WqlSLUs4i4ltHGXqTe7VHclYWyA==", - "dev": true - }, - "spdy": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz", - "integrity": "sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==", - "dev": true, - "requires": { - "debug": "^4.1.0", - "handle-thing": "^2.0.0", - "http-deceiver": "^1.2.7", - "select-hose": "^2.0.0", - "spdy-transport": "^3.0.0" - } - }, - "spdy-transport": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz", - "integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==", - "dev": true, - "requires": { - "debug": "^4.1.0", - "detect-node": "^2.0.4", - "hpack.js": "^2.1.6", - "obuf": "^1.1.2", - "readable-stream": "^3.0.6", - "wbuf": "^1.7.3" - } - }, - "sprintf-js": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==", - "dev": true - }, - "ssri": { - "version": "10.0.1", - "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.1.tgz", - "integrity": "sha512-WVy6di9DlPOeBWEjMScpNipeSX2jIZBGEn5Uuo8Q7aIuFEuDX0pw8RxcOjlD1TWP4obi24ki7m/13+nFpcbXrw==", - "dev": true, - "requires": { - "minipass": "^4.0.0" - } - }, - "stack-utils": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz", - "integrity": "sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==", - "dev": true, - "requires": { - "escape-string-regexp": "^2.0.0" - }, - "dependencies": { - "escape-string-regexp": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz", - "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==", - "dev": true - } - } - }, - "statuses": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", - "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==", - "dev": true - }, - "string_decoder": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", - "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", - "dev": true, - "requires": { - "safe-buffer": "~5.2.0" - } - }, - "string-length": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz", - "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==", - "dev": true, - "requires": { - "char-regex": "^1.0.2", - "strip-ansi": "^6.0.0" - } - }, - "string-width": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dev": true, - "requires": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - } - }, - "strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, - "requires": { - "ansi-regex": "^5.0.1" - } - }, - "strip-bom": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz", - "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==", - "dev": true - }, - "strip-final-newline": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", - "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==", - "dev": true - }, - "strip-json-comments": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", - "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", - "dev": true - }, - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - }, - "supports-hyperlinks": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.3.0.tgz", - "integrity": "sha512-RpsAZlpWcDwOPQA22aCH4J0t7L8JmAvsCxfOSEwm7cQs3LshN36QaTkwd70DnBOXDWGssw2eUoc8CaRWT0XunA==", - "dev": true, - "requires": { - "has-flag": "^4.0.0", - "supports-color": "^7.0.0" - }, - "dependencies": { - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "supports-preserve-symlinks-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", - "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", - "dev": true - }, - "symbol-observable": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-4.0.0.tgz", - "integrity": "sha512-b19dMThMV4HVFynSAM1++gBHAbk2Tc/osgLIBZMKsyqh34jb2e8Os7T6ZW/Bt3pJFdBTd2JwAnAAEQV7rSNvcQ==", - "dev": true - }, - "symbol-tree": { - "version": "3.2.4", - "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz", - "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==", - "dev": true - }, - "tapable": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz", - "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==", - "dev": true - }, - "tar": { - "version": "6.1.13", - "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.13.tgz", - "integrity": "sha512-jdIBIN6LTIe2jqzay/2vtYLlBHa3JF42ot3h1dW8Q0PaAG4v8rm0cvpVePtau5C6OKXGGcgO9q2AMNSWxiLqKw==", - "dev": true, - "requires": { - "chownr": "^2.0.0", - "fs-minipass": "^2.0.0", - "minipass": "^4.0.0", - "minizlib": "^2.1.1", - "mkdirp": "^1.0.3", - "yallist": "^4.0.0" - }, - "dependencies": { - "fs-minipass": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", - "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", - "dev": true, - "requires": { - "minipass": "^3.0.0" - }, - "dependencies": { - "minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", - "dev": true, - "requires": { - "yallist": "^4.0.0" - } - } - } - } - } - }, - "terminal-link": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/terminal-link/-/terminal-link-2.1.1.tgz", - "integrity": "sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==", - "dev": true, - "requires": { - "ansi-escapes": "^4.2.1", - "supports-hyperlinks": "^2.0.0" - } - }, - "terser": { - "version": "5.16.1", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.16.1.tgz", - "integrity": "sha512-xvQfyfA1ayT0qdK47zskQgRZeWLoOQ8JQ6mIgRGVNwZKdQMU+5FkCBjmv4QjcrTzyZquRw2FVtlJSRUmMKQslw==", - "dev": true, - "requires": { - "@jridgewell/source-map": "^0.3.2", - "acorn": "^8.5.0", - "commander": "^2.20.0", - "source-map-support": "~0.5.20" - } - }, - "terser-webpack-plugin": { - "version": "5.3.6", - "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.6.tgz", - "integrity": "sha512-kfLFk+PoLUQIbLmB1+PZDMRSZS99Mp+/MHqDNmMA6tOItzRt+Npe3E+fsMs5mfcM0wCtrrdU387UnV+vnSffXQ==", - "dev": true, - "requires": { - "@jridgewell/trace-mapping": "^0.3.14", - "jest-worker": "^27.4.5", - "schema-utils": "^3.1.1", - "serialize-javascript": "^6.0.0", - "terser": "^5.14.1" - }, - "dependencies": { - "ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", - "dev": true, - "requires": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - } - }, - "ajv-keywords": { - "version": "3.5.2", - "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", - "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", - "dev": true, - "requires": {} - }, - "json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true - }, - "schema-utils": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz", - "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==", - "dev": true, - "requires": { - "@types/json-schema": "^7.0.8", - "ajv": "^6.12.5", - "ajv-keywords": "^3.5.2" - } - } - } - }, - "test-exclude": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz", - "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==", - "dev": true, - "requires": { - "@istanbuljs/schema": "^0.1.2", - "glob": "^7.1.4", - "minimatch": "^3.0.4" - }, - "dependencies": { - "brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "dev": true, - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, - "minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "requires": { - "brace-expansion": "^1.1.7" - } - } - } - }, - "text-table": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", - "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", - "dev": true - }, - "through": { - "version": "2.3.8", - "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", - "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==", - "dev": true - }, - "thunky": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz", - "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==", - "dev": true - }, - "tmp": { - "version": "0.0.33", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", - "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", - "dev": true, - "requires": { - "os-tmpdir": "~1.0.2" - } - }, - "tmpl": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz", - "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==", - "dev": true - }, - "to-fast-properties": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", - "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==", - "dev": true - }, - "to-regex-range": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", - "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", - "dev": true, - "requires": { - "is-number": "^7.0.0" - } - }, - "toidentifier": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", - "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==", - "dev": true - }, - "tough-cookie": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.2.tgz", - "integrity": "sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ==", - "dev": true, - "requires": { - "psl": "^1.1.33", - "punycode": "^2.1.1", - "universalify": "^0.2.0", - "url-parse": "^1.5.3" - } - }, - "tr46": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-3.0.0.tgz", - "integrity": "sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==", - "dev": true, - "requires": { - "punycode": "^2.1.1" - } - }, - "tree-kill": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz", - "integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==", - "dev": true - }, - "ts-jest": { - "version": "28.0.8", - "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-28.0.8.tgz", - "integrity": "sha512-5FaG0lXmRPzApix8oFG8RKjAz4ehtm8yMKOTy5HX3fY6W8kmvOrmcY0hKDElW52FJov+clhUbrKAqofnj4mXTg==", - "dev": true, - "requires": { - "bs-logger": "0.x", - "fast-json-stable-stringify": "2.x", - "jest-util": "^28.0.0", - "json5": "^2.2.1", - "lodash.memoize": "4.x", - "make-error": "1.x", - "semver": "7.x", - "yargs-parser": "^21.0.1" - } - }, - "tsconfig-paths": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-4.1.2.tgz", - "integrity": "sha512-uhxiMgnXQp1IR622dUXI+9Ehnws7i/y6xvpZB9IbUVOPy0muvdvgXeZOn88UcGPiT98Vp3rJPTa8bFoalZ3Qhw==", - "dev": true, - "requires": { - "json5": "^2.2.2", - "minimist": "^1.2.6", - "strip-bom": "^3.0.0" - }, - "dependencies": { - "strip-bom": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", - "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==", - "dev": true - } - } - }, - "tslib": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz", - "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==" - }, - "tsutils": { - "version": "3.21.0", - "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz", - "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==", - "dev": true, - "requires": { - "tslib": "^1.8.1" - }, - "dependencies": { - "tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", - "dev": true - } - } - }, - "type-check": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", - "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", - "dev": true, - "requires": { - "prelude-ls": "^1.2.1" - } - }, - "type-detect": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", - "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==", - "dev": true - }, - "type-fest": { - "version": "0.21.3", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz", - "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==", - "dev": true - }, - "type-is": { - "version": "1.6.18", - "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", - "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==", - "dev": true, - "requires": { - "media-typer": "0.3.0", - "mime-types": "~2.1.24" - } - }, - "typed-assert": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/typed-assert/-/typed-assert-1.0.9.tgz", - "integrity": "sha512-KNNZtayBCtmnNmbo5mG47p1XsCyrx6iVqomjcZnec/1Y5GGARaxPs6r49RnSPeUP3YjNYiU9sQHAtY4BBvnZwg==", - "dev": true - }, - "typescript": { - "version": "4.9.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.4.tgz", - "integrity": "sha512-Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg==", - "dev": true - }, - "unicode-canonical-property-names-ecmascript": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz", - "integrity": "sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==", - "dev": true - }, - "unicode-match-property-ecmascript": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz", - "integrity": "sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==", - "dev": true, - "requires": { - "unicode-canonical-property-names-ecmascript": "^2.0.0", - "unicode-property-aliases-ecmascript": "^2.0.0" - } - }, - "unicode-match-property-value-ecmascript": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz", - "integrity": "sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA==", - "dev": true - }, - "unicode-property-aliases-ecmascript": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz", - "integrity": "sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==", - "dev": true - }, - "unique-filename": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-3.0.0.tgz", - "integrity": "sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g==", - "dev": true, - "requires": { - "unique-slug": "^4.0.0" - } - }, - "unique-slug": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-4.0.0.tgz", - "integrity": "sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ==", - "dev": true, - "requires": { - "imurmurhash": "^0.1.4" - } - }, - "universalify": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz", - "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==", - "dev": true - }, - "unpipe": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", - "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==", - "dev": true - }, - "update-browserslist-db": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz", - "integrity": "sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==", - "dev": true, - "requires": { - "escalade": "^3.1.1", - "picocolors": "^1.0.0" - } - }, - "uri-js": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", - "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", - "dev": true, - "requires": { - "punycode": "^2.1.0" - } - }, - "url-parse": { - "version": "1.5.10", - "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz", - "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==", - "dev": true, - "requires": { - "querystringify": "^2.1.1", - "requires-port": "^1.0.0" - } - }, - "util-deprecate": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", - "dev": true - }, - "utils-merge": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", - "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==", - "dev": true - }, - "uuid": { - "version": "8.3.2", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", - "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==", - "dev": true - }, - "v8-to-istanbul": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.0.1.tgz", - "integrity": "sha512-74Y4LqY74kLE6IFyIjPtkSTWzUZmj8tdHT9Ii/26dvQ6K9Dl2NbEfj0XgU2sHCtKgt5VupqhlO/5aWuqS+IY1w==", - "dev": true, - "requires": { - "@jridgewell/trace-mapping": "^0.3.12", - "@types/istanbul-lib-coverage": "^2.0.1", - "convert-source-map": "^1.6.0" - } - }, - "validate-npm-package-license": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", - "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==", - "dev": true, - "requires": { - "spdx-correct": "^3.0.0", - "spdx-expression-parse": "^3.0.0" - } - }, - "validate-npm-package-name": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-5.0.0.tgz", - "integrity": "sha512-YuKoXDAhBYxY7SfOKxHBDoSyENFeW5VvIIQp2TGQuit8gpK6MnWaQelBKxso72DoxTZfZdcP3W90LqpSkgPzLQ==", - "dev": true, - "requires": { - "builtins": "^5.0.0" - } - }, - "vary": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", - "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==", - "dev": true - }, - "w3c-hr-time": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz", - "integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==", - "dev": true, - "requires": { - "browser-process-hrtime": "^1.0.0" - } - }, - "w3c-xmlserializer": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-3.0.0.tgz", - "integrity": "sha512-3WFqGEgSXIyGhOmAFtlicJNMjEps8b1MG31NCA0/vOF9+nKMUW1ckhi9cnNHmf88Rzw5V+dwIwsm2C7X8k9aQg==", - "dev": true, - "requires": { - "xml-name-validator": "^4.0.0" - } - }, - "walker": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz", - "integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==", - "dev": true, - "requires": { - "makeerror": "1.0.12" - } - }, - "watchpack": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz", - "integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==", - "dev": true, - "requires": { - "glob-to-regexp": "^0.4.1", - "graceful-fs": "^4.1.2" - } - }, - "wbuf": { - "version": "1.7.3", - "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz", - "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==", - "dev": true, - "requires": { - "minimalistic-assert": "^1.0.0" - } - }, - "wcwidth": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz", - "integrity": "sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==", - "dev": true, - "requires": { - "defaults": "^1.0.3" - } - }, - "webidl-conversions": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz", - "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==", - "dev": true - }, - "webpack": { - "version": "5.75.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.75.0.tgz", - "integrity": "sha512-piaIaoVJlqMsPtX/+3KTTO6jfvrSYgauFVdt8cr9LTHKmcq/AMd4mhzsiP7ZF/PGRNPGA8336jldh9l2Kt2ogQ==", - "dev": true, - "requires": { - "@types/eslint-scope": "^3.7.3", - "@types/estree": "^0.0.51", - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/wasm-edit": "1.11.1", - "@webassemblyjs/wasm-parser": "1.11.1", - "acorn": "^8.7.1", - "acorn-import-assertions": "^1.7.6", - "browserslist": "^4.14.5", - "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^5.10.0", - "es-module-lexer": "^0.9.0", - "eslint-scope": "5.1.1", - "events": "^3.2.0", - "glob-to-regexp": "^0.4.1", - "graceful-fs": "^4.2.9", - "json-parse-even-better-errors": "^2.3.1", - "loader-runner": "^4.2.0", - "mime-types": "^2.1.27", - "neo-async": "^2.6.2", - "schema-utils": "^3.1.0", - "tapable": "^2.1.1", - "terser-webpack-plugin": "^5.1.3", - "watchpack": "^2.4.0", - "webpack-sources": "^3.2.3" - }, - "dependencies": { - "ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", - "dev": true, - "requires": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - } - }, - "ajv-keywords": { - "version": "3.5.2", - "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", - "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", - "dev": true, - "requires": {} - }, - "json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true - }, - "schema-utils": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz", - "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==", - "dev": true, - "requires": { - "@types/json-schema": "^7.0.8", - "ajv": "^6.12.5", - "ajv-keywords": "^3.5.2" - } - } - } - }, - "webpack-dev-middleware": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-6.0.1.tgz", - "integrity": "sha512-PZPZ6jFinmqVPJZbisfggDiC+2EeGZ1ZByyMP5sOFJcPPWSexalISz+cvm+j+oYPT7FIJyxT76esjnw9DhE5sw==", - "dev": true, - "requires": { - "colorette": "^2.0.10", - "memfs": "^3.4.12", - "mime-types": "^2.1.31", - "range-parser": "^1.2.1", - "schema-utils": "^4.0.0" - } - }, - "webpack-dev-server": { - "version": "4.11.1", - "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.11.1.tgz", - "integrity": "sha512-lILVz9tAUy1zGFwieuaQtYiadImb5M3d+H+L1zDYalYoDl0cksAB1UNyuE5MMWJrG6zR1tXkCP2fitl7yoUJiw==", - "dev": true, - "requires": { - "@types/bonjour": "^3.5.9", - "@types/connect-history-api-fallback": "^1.3.5", - "@types/express": "^4.17.13", - "@types/serve-index": "^1.9.1", - "@types/serve-static": "^1.13.10", - "@types/sockjs": "^0.3.33", - "@types/ws": "^8.5.1", - "ansi-html-community": "^0.0.8", - "bonjour-service": "^1.0.11", - "chokidar": "^3.5.3", - "colorette": "^2.0.10", - "compression": "^1.7.4", - "connect-history-api-fallback": "^2.0.0", - "default-gateway": "^6.0.3", - "express": "^4.17.3", - "graceful-fs": "^4.2.6", - "html-entities": "^2.3.2", - "http-proxy-middleware": "^2.0.3", - "ipaddr.js": "^2.0.1", - "open": "^8.0.9", - "p-retry": "^4.5.0", - "rimraf": "^3.0.2", - "schema-utils": "^4.0.0", - "selfsigned": "^2.1.1", - "serve-index": "^1.9.1", - "sockjs": "^0.3.24", - "spdy": "^4.0.2", - "webpack-dev-middleware": "^5.3.1", - "ws": "^8.4.2" - }, - "dependencies": { - "webpack-dev-middleware": { - "version": "5.3.3", - "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.3.tgz", - "integrity": "sha512-hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA==", - "dev": true, - "requires": { - "colorette": "^2.0.10", - "memfs": "^3.4.3", - "mime-types": "^2.1.31", - "range-parser": "^1.2.1", - "schema-utils": "^4.0.0" - } - } - } - }, - "webpack-merge": { - "version": "5.8.0", - "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.8.0.tgz", - "integrity": "sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q==", - "dev": true, - "requires": { - "clone-deep": "^4.0.1", - "wildcard": "^2.0.0" - } - }, - "webpack-sources": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz", - "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==", - "dev": true - }, - "webpack-subresource-integrity": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/webpack-subresource-integrity/-/webpack-subresource-integrity-5.1.0.tgz", - "integrity": "sha512-sacXoX+xd8r4WKsy9MvH/q/vBtEHr86cpImXwyg74pFIpERKt6FmB8cXpeuh0ZLgclOlHI4Wcll7+R5L02xk9Q==", - "dev": true, - "requires": { - "typed-assert": "^1.0.8" - } - }, - "websocket-driver": { - "version": "0.7.4", - "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz", - "integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==", - "dev": true, - "requires": { - "http-parser-js": ">=0.5.1", - "safe-buffer": ">=5.1.0", - "websocket-extensions": ">=0.1.1" - } - }, - "websocket-extensions": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz", - "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==", - "dev": true - }, - "whatwg-encoding": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz", - "integrity": "sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==", - "dev": true, - "requires": { - "iconv-lite": "0.6.3" - }, - "dependencies": { - "iconv-lite": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", - "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", - "dev": true, - "requires": { - "safer-buffer": ">= 2.1.2 < 3.0.0" - } - } - } - }, - "whatwg-mimetype": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz", - "integrity": "sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==", - "dev": true - }, - "whatwg-url": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-10.0.0.tgz", - "integrity": "sha512-CLxxCmdUby142H5FZzn4D8ikO1cmypvXVQktsgosNy4a4BHrDHeciBBGZhb0bNoR5/MltoCatso+vFjjGx8t0w==", - "dev": true, - "requires": { - "tr46": "^3.0.0", - "webidl-conversions": "^7.0.0" - } - }, - "which": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", - "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", - "dev": true, - "requires": { - "isexe": "^2.0.0" - } - }, - "wide-align": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz", - "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==", - "dev": true, - "requires": { - "string-width": "^1.0.2 || 2 || 3 || 4" - } - }, - "wildcard": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.0.tgz", - "integrity": "sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==", - "dev": true - }, - "word-wrap": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", - "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==", - "dev": true - }, - "wrap-ansi": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", - "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", - "dev": true, - "requires": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - } - } - }, - "wrappy": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", - "dev": true - }, - "write-file-atomic": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz", - "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==", - "dev": true, - "requires": { - "imurmurhash": "^0.1.4", - "signal-exit": "^3.0.7" - } - }, - "ws": { - "version": "8.12.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.12.0.tgz", - "integrity": "sha512-kU62emKIdKVeEIOIKVegvqpXMSTAMLJozpHZaJNDYqBjzlSYXQGviYwN1osDLJ9av68qHd4a2oSjd7yD4pacig==", - "dev": true, - "requires": {} - }, - "xml-name-validator": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz", - "integrity": "sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==", - "dev": true - }, - "xmlchars": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz", - "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==", - "dev": true - }, - "y18n": { - "version": "5.0.8", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", - "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", - "dev": true - }, - "yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true - }, - "yaml": { - "version": "1.10.2", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz", - "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==", - "dev": true - }, - "yargs": { - "version": "17.6.2", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.6.2.tgz", - "integrity": "sha512-1/9UrdHjDZc0eOU0HxOHoS78C69UD3JRMvzlJ7S79S2nTaWRA/whGCTV8o9e/N/1Va9YIV7Q4sOxD8VV4pCWOw==", - "dev": true, - "requires": { - "cliui": "^8.0.1", - "escalade": "^3.1.1", - "get-caller-file": "^2.0.5", - "require-directory": "^2.1.1", - "string-width": "^4.2.3", - "y18n": "^5.0.5", - "yargs-parser": "^21.1.1" - } - }, - "yargs-parser": { - "version": "21.1.1", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", - "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", - "dev": true - }, - "yocto-queue": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", - "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", - "dev": true - }, - "zone.js": { - "version": "0.11.8", - "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.11.8.tgz", - "integrity": "sha512-82bctBg2hKcEJ21humWIkXRlLBBmrc3nN7DFh5LGGhcyycO2S7FN8NmdvlcKaGFDNVL4/9kFLmwmInTavdJERA==", - "requires": { "tslib": "^2.3.0" } } diff --git a/portal-frontend/package.json b/portal-frontend/package.json index d206446381..e1add12804 100644 --- a/portal-frontend/package.json +++ b/portal-frontend/package.json @@ -13,37 +13,37 @@ }, "private": true, "dependencies": { - "@angular/animations": "^15.1.1", - "@angular/common": "^15.1.1", - "@angular/compiler": "^15.1.1", - "@angular/core": "^15.1.1", - "@angular/forms": "^15.1.1", - "@angular/material": "^15.1.1", - "@angular/material-moment-adapter": "^15.1.1", - "@angular/platform-browser": "^15.1.1", - "@angular/platform-browser-dynamic": "^15.1.1", - "@angular/router": "^15.1.1", - "@bcgov/bc-sans": "^1.0.1", + "@angular/animations": "^16.2.11", + "@angular/common": "^16.2.11", + "@angular/compiler": "^16.2.11", + "@angular/core": "^16.2.11", + "@angular/forms": "^16.2.11", + "@angular/material": "^16.2.11", + "@angular/material-moment-adapter": "^16.2.11", + "@angular/platform-browser": "^16.2.11", + "@angular/platform-browser-dynamic": "^16.2.11", + "@angular/router": "^16.2.11", + "@bcgov/bc-sans": "^2.1.0", "jwt-decode": "^3.1.2", - "ngx-mask": "^15.0.2", - "rxjs": "~7.5.0", + "ngx-mask": "^16.3.9", + "rxjs": "~7.8.1", "source-map-support": "^0.5.21", - "tslib": "^2.4.1", - "zone.js": "~0.11.4" + "tslib": "^2.6.2", + "zone.js": "~0.13.3" }, "devDependencies": { - "@angular-builders/jest": "^15.0.0", - "@angular-devkit/build-angular": "^15.1.2", - "@angular/cli": "~15.1.2", - "@angular/compiler-cli": "^15.1.1", - "@golevelup/ts-jest": "^0.3.4", - "@types/jest": "^28.1.1", - "@typescript-eslint/eslint-plugin": "5.49.0", - "@typescript-eslint/parser": "5.49.0", - "eslint": "^8.32.0", - "jest": "^28.1.3", - "jest-preset-angular": "^12.2.5", - "prettier": "^2.8.3", + "@angular-builders/jest": "^16.0.1", + "@angular-devkit/build-angular": "^16.2.9", + "@angular/cli": "~16.2.9", + "@angular/compiler-cli": "^16.2.11", + "@golevelup/ts-jest": "^0.4.0", + "@types/jest": "^29.5.7", + "@typescript-eslint/eslint-plugin": "5.62.0", + "@typescript-eslint/parser": "5.62.0", + "eslint": "^8.52.0", + "jest": "^29.7.0", + "jest-preset-angular": "^13.1.2", + "prettier": "^2.8.8", "typescript": "4.9.4" } } diff --git a/portal-frontend/src/app/features/applications/application-details/application-details.component.spec.ts b/portal-frontend/src/app/features/applications/application-details/application-details.component.spec.ts index 0554a68a05..2b7e88ab0b 100644 --- a/portal-frontend/src/app/features/applications/application-details/application-details.component.spec.ts +++ b/portal-frontend/src/app/features/applications/application-details/application-details.component.spec.ts @@ -60,6 +60,18 @@ describe('ApplicationDetailsComponent', () => { component = fixture.componentInstance; component.$application = new BehaviorSubject<ApplicationSubmissionDetailedDto | undefined>(undefined); component.$applicationDocuments = applicationDocumentPipe; + + mockCodeService.loadCodes.mockResolvedValue({ + localGovernments: [], + applicationTypes: [], + decisionMakers: [], + documentTypes: [], + naruSubtypes: [], + noticeOfIntentTypes: [], + regions: [], + submissionTypes: [], + }); + fixture.detectChanges(); }); diff --git a/portal-frontend/src/app/features/applications/edit-submission/change-application-type-dialog/change-application-type-dialog.component.spec.ts b/portal-frontend/src/app/features/applications/edit-submission/change-application-type-dialog/change-application-type-dialog.component.spec.ts index d435997d09..4bb1a4242d 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/change-application-type-dialog/change-application-type-dialog.component.spec.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/change-application-type-dialog/change-application-type-dialog.component.spec.ts @@ -3,6 +3,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MAT_DIALOG_DATA, MatDialogModule, MatDialogRef } from '@angular/material/dialog'; import { MatRadioModule } from '@angular/material/radio'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { ApplicationSubmissionService } from '../../../../services/application-submission/application-submission.service'; import { CodeService } from '../../../../services/code/code.service'; import { ChangeApplicationTypeDialogComponent } from './change-application-type-dialog.component'; @@ -10,8 +11,11 @@ import { ChangeApplicationTypeDialogComponent } from './change-application-type- describe('ChangeApplicationTypeDialogComponent', () => { let component: ChangeApplicationTypeDialogComponent; let fixture: ComponentFixture<ChangeApplicationTypeDialogComponent>; + let mockCodeService: DeepMocked<CodeService>; beforeEach(async () => { + mockCodeService = createMock(); + await TestBed.configureTestingModule({ imports: [MatDialogModule, MatRadioModule], providers: [ @@ -22,7 +26,7 @@ describe('ChangeApplicationTypeDialogComponent', () => { }, { provide: CodeService, - useValue: {}, + useValue: mockCodeService, }, { provide: MAT_DIALOG_DATA, useValue: { fileId: 'fake' } }, ], @@ -32,6 +36,18 @@ describe('ChangeApplicationTypeDialogComponent', () => { fixture = TestBed.createComponent(ChangeApplicationTypeDialogComponent); component = fixture.componentInstance; + + mockCodeService.loadCodes.mockResolvedValue({ + localGovernments: [], + applicationTypes: [], + decisionMakers: [], + documentTypes: [], + naruSubtypes: [], + noticeOfIntentTypes: [], + regions: [], + submissionTypes: [], + }); + fixture.detectChanges(); }); diff --git a/portal-frontend/src/app/features/applications/edit-submission/other-attachments/other-attachments.component.spec.ts b/portal-frontend/src/app/features/applications/edit-submission/other-attachments/other-attachments.component.spec.ts index dd7da0cbab..16db626bc8 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/other-attachments/other-attachments.component.spec.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/other-attachments/other-attachments.component.spec.ts @@ -64,6 +64,18 @@ describe('OtherAttachmentsComponent', () => { component = fixture.componentInstance; component.$applicationSubmission = new BehaviorSubject<ApplicationSubmissionDetailedDto | undefined>(undefined); component.$applicationDocuments = applicationDocumentPipe; + + mockCodeService.loadCodes.mockResolvedValue({ + localGovernments: [], + applicationTypes: [], + decisionMakers: [], + documentTypes: [], + naruSubtypes: [], + noticeOfIntentTypes: [], + regions: [], + submissionTypes: [], + }); + fixture.detectChanges(); }); diff --git a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-details.component.ts b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-details.component.ts index 3cc45bef0e..da9e95e9e5 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-details.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-details.component.ts @@ -61,7 +61,7 @@ export class ParcelDetailsComponent extends StepComponent implements OnInit, Aft } ngAfterViewInit(): void { - setTimeout((_) => this.componentInitialized.emit(true)); + setTimeout(() => this.componentInitialized.emit(true)); } async loadParcels() { diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.spec.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.spec.ts index c151850c2a..e66713b6ea 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.spec.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.spec.ts @@ -18,10 +18,12 @@ describe('NaruProposalComponent', () => { let fixture: ComponentFixture<NaruProposalComponent>; let mockApplicationService: DeepMocked<ApplicationSubmissionService>; let mockRouter: DeepMocked<Router>; + let mockCodeService: DeepMocked<CodeService>; beforeEach(async () => { mockApplicationService = createMock(); mockRouter = createMock(); + mockCodeService = createMock(); await TestBed.configureTestingModule({ providers: [ @@ -43,7 +45,7 @@ describe('NaruProposalComponent', () => { }, { provide: CodeService, - useValue: {}, + useValue: mockCodeService, }, { provide: ToastService, @@ -58,6 +60,18 @@ describe('NaruProposalComponent', () => { component = fixture.componentInstance; component.$applicationSubmission = new BehaviorSubject<ApplicationSubmissionDetailedDto | undefined>(undefined); component.$applicationDocuments = new BehaviorSubject<ApplicationDocumentDto[]>([]); + + mockCodeService.loadCodes.mockResolvedValue({ + localGovernments: [], + applicationTypes: [], + decisionMakers: [], + documentTypes: [], + naruSubtypes: [], + noticeOfIntentTypes: [], + regions: [], + submissionTypes: [], + }); + fixture.detectChanges(); }); diff --git a/portal-frontend/src/app/features/applications/edit-submission/select-government/select-government.component.spec.ts b/portal-frontend/src/app/features/applications/edit-submission/select-government/select-government.component.spec.ts index c0e86d5608..a2b9669ba9 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/select-government/select-government.component.spec.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/select-government/select-government.component.spec.ts @@ -1,7 +1,7 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MatAutocomplete } from '@angular/material/autocomplete'; -import { DeepMocked, createMock } from '@golevelup/ts-jest'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { BehaviorSubject } from 'rxjs'; import { ApplicationSubmissionDetailedDto } from '../../../../services/application-submission/application-submission.dto'; import { ApplicationSubmissionService } from '../../../../services/application-submission/application-submission.service'; @@ -34,6 +34,16 @@ describe('SelectGovernmentComponent', () => { fixture = TestBed.createComponent(SelectGovernmentComponent); component = fixture.componentInstance; component.$applicationSubmission = new BehaviorSubject<ApplicationSubmissionDetailedDto | undefined>(undefined); + mockCodeService.loadCodes.mockResolvedValue({ + localGovernments: [], + applicationTypes: [], + decisionMakers: [], + documentTypes: [], + naruSubtypes: [], + noticeOfIntentTypes: [], + regions: [], + submissionTypes: [], + }); fixture.detectChanges(); }); diff --git a/portal-frontend/src/app/features/create-submission-dialog/create-submission-dialog.component.spec.ts b/portal-frontend/src/app/features/create-submission-dialog/create-submission-dialog.component.spec.ts index 18431020ac..57f1b7ff16 100644 --- a/portal-frontend/src/app/features/create-submission-dialog/create-submission-dialog.component.spec.ts +++ b/portal-frontend/src/app/features/create-submission-dialog/create-submission-dialog.component.spec.ts @@ -2,6 +2,7 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MatDialogModule, MatDialogRef } from '@angular/material/dialog'; import { MatRadioModule } from '@angular/material/radio'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { ApplicationSubmissionService } from '../../services/application-submission/application-submission.service'; import { CodeService } from '../../services/code/code.service'; import { NoticeOfIntentSubmissionService } from '../../services/notice-of-intent-submission/notice-of-intent-submission.service'; @@ -11,8 +12,11 @@ import { CreateSubmissionDialogComponent } from './create-submission-dialog.comp describe('CreateSubmissionDialogComponent', () => { let component: CreateSubmissionDialogComponent; let fixture: ComponentFixture<CreateSubmissionDialogComponent>; + let mockCodeService: DeepMocked<CodeService>; beforeEach(async () => { + mockCodeService = createMock(); + await TestBed.configureTestingModule({ imports: [MatDialogModule, MatRadioModule], providers: [ @@ -23,7 +27,7 @@ describe('CreateSubmissionDialogComponent', () => { }, { provide: CodeService, - useValue: {}, + useValue: mockCodeService, }, { provide: NoticeOfIntentSubmissionService, @@ -40,6 +44,18 @@ describe('CreateSubmissionDialogComponent', () => { fixture = TestBed.createComponent(CreateSubmissionDialogComponent); component = fixture.componentInstance; + + mockCodeService.loadCodes.mockResolvedValue({ + localGovernments: [], + applicationTypes: [], + decisionMakers: [], + documentTypes: [], + naruSubtypes: [], + noticeOfIntentTypes: [], + regions: [], + submissionTypes: [], + }); + fixture.detectChanges(); }); diff --git a/portal-frontend/src/app/features/home/inbox/inbox.component.spec.ts b/portal-frontend/src/app/features/home/inbox/inbox.component.spec.ts index 113b8544da..3ba1df223a 100644 --- a/portal-frontend/src/app/features/home/inbox/inbox.component.spec.ts +++ b/portal-frontend/src/app/features/home/inbox/inbox.component.spec.ts @@ -17,10 +17,12 @@ describe('InboxComponent', () => { let fixture: ComponentFixture<InboxComponent>; let mockInboxService: DeepMocked<InboxService>; let mockAuthService: DeepMocked<AuthenticationService>; + let mockCodeService: DeepMocked<CodeService>; beforeEach(async () => { mockInboxService = createMock(); mockAuthService = createMock(); + mockCodeService = createMock(); mockAuthService.$currentProfile = new BehaviorSubject<UserDto | undefined>(undefined); @@ -34,7 +36,7 @@ describe('InboxComponent', () => { }, { provide: CodeService, - useValue: {}, + useValue: mockCodeService, }, { provide: StatusService, @@ -54,6 +56,24 @@ describe('InboxComponent', () => { fixture = TestBed.createComponent(InboxComponent); component = fixture.componentInstance; + + mockCodeService.loadCodes.mockResolvedValue({ + localGovernments: [], + applicationTypes: [], + decisionMakers: [], + documentTypes: [], + naruSubtypes: [], + noticeOfIntentTypes: [], + regions: [], + submissionTypes: [], + }); + + mockInboxService.listStatuses.mockResolvedValue({ + application: [], + noticeOfIntent: [], + notification: [], + }); + fixture.detectChanges(); }); diff --git a/portal-frontend/src/app/features/home/inbox/inbox.component.ts b/portal-frontend/src/app/features/home/inbox/inbox.component.ts index 3a035c20a1..f6da2d3a31 100644 --- a/portal-frontend/src/app/features/home/inbox/inbox.component.ts +++ b/portal-frontend/src/app/features/home/inbox/inbox.component.ts @@ -11,7 +11,6 @@ import { } from '../../../services/application-submission/application-submission.dto'; import { UserDto } from '../../../services/authentication/authentication.dto'; import { AuthenticationService } from '../../../services/authentication/authentication.service'; -import { CodeService } from '../../../services/code/code.service'; import { BaseInboxResultDto, InboxRequestDto, InboxSearchResponseDto } from '../../../services/inbox/inbox.dto'; import { InboxService } from '../../../services/inbox/inbox.service'; import { ToastService } from '../../../services/toast/toast.service'; @@ -105,7 +104,6 @@ export class InboxComponent implements OnInit, OnDestroy { constructor( private inboxService: InboxService, - private codeService: CodeService, private toastService: ToastService, private titleService: Title, private authenticationService: AuthenticationService diff --git a/portal-frontend/src/app/features/login/login.component.spec.ts b/portal-frontend/src/app/features/login/login.component.spec.ts index af69d0e5ba..331bfd2562 100644 --- a/portal-frontend/src/app/features/login/login.component.spec.ts +++ b/portal-frontend/src/app/features/login/login.component.spec.ts @@ -1,5 +1,8 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { BehaviorSubject } from 'rxjs'; +import { UserDto } from '../../services/authentication/authentication.dto'; import { AuthenticationService } from '../../services/authentication/authentication.service'; import { LoginComponent } from './login.component'; @@ -7,14 +10,18 @@ import { LoginComponent } from './login.component'; describe('LoginComponent', () => { let component: LoginComponent; let fixture: ComponentFixture<LoginComponent>; + let mockAuthService: DeepMocked<AuthenticationService>; beforeEach(async () => { + mockAuthService = createMock(); + mockAuthService.$currentProfile = new BehaviorSubject<UserDto | undefined>(undefined); + await TestBed.configureTestingModule({ declarations: [LoginComponent], providers: [ { provide: AuthenticationService, - useValue: {}, + useValue: mockAuthService, }, ], schemas: [NO_ERRORS_SCHEMA], diff --git a/portal-frontend/src/app/features/login/login.component.ts b/portal-frontend/src/app/features/login/login.component.ts index f9239f39a2..a330084fd5 100644 --- a/portal-frontend/src/app/features/login/login.component.ts +++ b/portal-frontend/src/app/features/login/login.component.ts @@ -12,7 +12,7 @@ export class LoginComponent implements OnInit, OnDestroy { $destroy = new Subject<void>(); constructor(private authenticationService: AuthenticationService, private router: Router) {} - async ngOnInit() { + ngOnInit() { this.authenticationService.getToken(false); this.authenticationService.$currentProfile.pipe(takeUntil(this.$destroy)).subscribe((user) => { if (user) { diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/change-noi-type-dialog/change-noi-type-dialog.component.spec.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/change-noi-type-dialog/change-noi-type-dialog.component.spec.ts index 58ef5bbcf4..f87d63ffc9 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/change-noi-type-dialog/change-noi-type-dialog.component.spec.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/change-noi-type-dialog/change-noi-type-dialog.component.spec.ts @@ -3,6 +3,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MAT_DIALOG_DATA, MatDialogModule, MatDialogRef } from '@angular/material/dialog'; import { MatRadioModule } from '@angular/material/radio'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { CodeService } from '../../../../services/code/code.service'; import { NoticeOfIntentSubmissionService } from '../../../../services/notice-of-intent-submission/notice-of-intent-submission.service'; import { ChangeNoiTypeDialogComponent } from './change-noi-type-dialog.component'; @@ -10,8 +11,11 @@ import { ChangeNoiTypeDialogComponent } from './change-noi-type-dialog.component describe('ChangeNoiTypeDialogComponent', () => { let component: ChangeNoiTypeDialogComponent; let fixture: ComponentFixture<ChangeNoiTypeDialogComponent>; + let mockCodeService: DeepMocked<CodeService>; beforeEach(async () => { + mockCodeService = createMock(); + await TestBed.configureTestingModule({ imports: [MatDialogModule, MatRadioModule], providers: [ @@ -22,7 +26,7 @@ describe('ChangeNoiTypeDialogComponent', () => { }, { provide: CodeService, - useValue: {}, + useValue: mockCodeService, }, { provide: MAT_DIALOG_DATA, useValue: { fileId: 'fake' } }, ], @@ -32,6 +36,18 @@ describe('ChangeNoiTypeDialogComponent', () => { fixture = TestBed.createComponent(ChangeNoiTypeDialogComponent); component = fixture.componentInstance; + + mockCodeService.loadCodes.mockResolvedValue({ + localGovernments: [], + applicationTypes: [], + decisionMakers: [], + documentTypes: [], + naruSubtypes: [], + noticeOfIntentTypes: [], + regions: [], + submissionTypes: [], + }); + fixture.detectChanges(); }); diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/other-attachments/other-attachments.component.spec.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/other-attachments/other-attachments.component.spec.ts index 151551bcfa..4b10cb8874 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/other-attachments/other-attachments.component.spec.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/other-attachments/other-attachments.component.spec.ts @@ -64,6 +64,18 @@ describe('OtherAttachmentsComponent', () => { component = fixture.componentInstance; component.$noiSubmission = new BehaviorSubject<NoticeOfIntentSubmissionDetailedDto | undefined>(undefined); component.$noiDocuments = noiDocumentPipe; + + mockCodeService.loadCodes.mockResolvedValue({ + localGovernments: [], + applicationTypes: [], + decisionMakers: [], + documentTypes: [], + naruSubtypes: [], + noticeOfIntentTypes: [], + regions: [], + submissionTypes: [], + }); + fixture.detectChanges(); }); diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-details.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-details.component.ts index 596788e2a6..5ad3957ae1 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-details.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-details.component.ts @@ -60,7 +60,7 @@ export class ParcelDetailsComponent extends StepComponent implements OnInit, Aft } ngAfterViewInit(): void { - setTimeout((_) => this.componentInitialized.emit(true)); + setTimeout(() => this.componentInitialized.emit(true)); } async loadParcels() { diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/select-government/select-government.component.spec.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/select-government/select-government.component.spec.ts index e2b7139ef2..fd9c1abe6d 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/select-government/select-government.component.spec.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/select-government/select-government.component.spec.ts @@ -34,6 +34,18 @@ describe('SelectGovernmentComponent', () => { fixture = TestBed.createComponent(SelectGovernmentComponent); component = fixture.componentInstance; component.$noiSubmission = new BehaviorSubject<NoticeOfIntentSubmissionDetailedDto | undefined>(undefined); + + mockCodeService.loadCodes.mockResolvedValue({ + localGovernments: [], + applicationTypes: [], + decisionMakers: [], + documentTypes: [], + naruSubtypes: [], + noticeOfIntentTypes: [], + regions: [], + submissionTypes: [], + }); + fixture.detectChanges(); }); diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.spec.ts b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.spec.ts index 470a008ab5..f1984f6d56 100644 --- a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.spec.ts +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.spec.ts @@ -62,6 +62,18 @@ describe('NoticeOfIntentDetailsComponent', () => { undefined ); component.$noiDocuments = noiDocumentPipe; + + mockCodeService.loadCodes.mockResolvedValue({ + localGovernments: [], + applicationTypes: [], + decisionMakers: [], + documentTypes: [], + naruSubtypes: [], + noticeOfIntentTypes: [], + regions: [], + submissionTypes: [], + }); + fixture.detectChanges(); }); diff --git a/portal-frontend/src/app/features/notifications/edit-submission/other-attachments/other-attachments.component.spec.ts b/portal-frontend/src/app/features/notifications/edit-submission/other-attachments/other-attachments.component.spec.ts index a5ff6f3bb7..3dd3285a2c 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/other-attachments/other-attachments.component.spec.ts +++ b/portal-frontend/src/app/features/notifications/edit-submission/other-attachments/other-attachments.component.spec.ts @@ -64,6 +64,18 @@ describe('OtherAttachmentsComponent', () => { component = fixture.componentInstance; component.$notificationSubmission = new BehaviorSubject<NotificationSubmissionDetailedDto | undefined>(undefined); component.$notificationDocuments = documentPipe; + + mockCodeService.loadCodes.mockResolvedValue({ + localGovernments: [], + applicationTypes: [], + decisionMakers: [], + documentTypes: [], + naruSubtypes: [], + noticeOfIntentTypes: [], + regions: [], + submissionTypes: [], + }); + fixture.detectChanges(); }); diff --git a/portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-details.component.ts b/portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-details.component.ts index d057afd748..6c634fd052 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-details.component.ts +++ b/portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-details.component.ts @@ -51,7 +51,7 @@ export class ParcelDetailsComponent extends StepComponent implements OnInit, Aft } ngAfterViewInit(): void { - setTimeout((_) => this.componentInitialized.emit(true)); + setTimeout(() => this.componentInitialized.emit(true)); } openParcel(index: string) { diff --git a/portal-frontend/src/app/features/notifications/edit-submission/select-government/select-government.component.spec.ts b/portal-frontend/src/app/features/notifications/edit-submission/select-government/select-government.component.spec.ts index 29b4e16495..087b3b5700 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/select-government/select-government.component.spec.ts +++ b/portal-frontend/src/app/features/notifications/edit-submission/select-government/select-government.component.spec.ts @@ -34,6 +34,18 @@ describe('SelectGovernmentComponent', () => { fixture = TestBed.createComponent(SelectGovernmentComponent); component = fixture.componentInstance; component.$notificationSubmission = new BehaviorSubject<NotificationSubmissionDetailedDto | undefined>(undefined); + + mockCodeService.loadCodes.mockResolvedValue({ + localGovernments: [], + applicationTypes: [], + decisionMakers: [], + documentTypes: [], + naruSubtypes: [], + noticeOfIntentTypes: [], + regions: [], + submissionTypes: [], + }); + fixture.detectChanges(); }); diff --git a/portal-frontend/src/app/features/notifications/notification-details/notification-details.component.spec.ts b/portal-frontend/src/app/features/notifications/notification-details/notification-details.component.spec.ts index b0996f7eae..2a2c9c7823 100644 --- a/portal-frontend/src/app/features/notifications/notification-details/notification-details.component.spec.ts +++ b/portal-frontend/src/app/features/notifications/notification-details/notification-details.component.spec.ts @@ -47,6 +47,18 @@ describe('NoticeOfIntentDetailsComponent', () => { component = fixture.componentInstance; component.$notificationSubmission = new BehaviorSubject<NotificationSubmissionDetailedDto | undefined>(undefined); component.$notificationDocuments = documentPipe; + + mockCodeService.loadCodes.mockResolvedValue({ + localGovernments: [], + applicationTypes: [], + decisionMakers: [], + documentTypes: [], + naruSubtypes: [], + noticeOfIntentTypes: [], + regions: [], + submissionTypes: [], + }); + fixture.detectChanges(); }); diff --git a/portal-frontend/src/app/features/public/application/submission/submission-details.component.spec.ts b/portal-frontend/src/app/features/public/application/submission/submission-details.component.spec.ts index 4f407dd4e4..5fc5389133 100644 --- a/portal-frontend/src/app/features/public/application/submission/submission-details.component.spec.ts +++ b/portal-frontend/src/app/features/public/application/submission/submission-details.component.spec.ts @@ -26,6 +26,18 @@ describe('SubmissionDetailsComponent', () => { fixture = TestBed.createComponent(SubmissionDetailsComponent); component = fixture.componentInstance; + + mockCodeService.loadCodes.mockResolvedValue({ + localGovernments: [], + applicationTypes: [], + decisionMakers: [], + documentTypes: [], + naruSubtypes: [], + noticeOfIntentTypes: [], + regions: [], + submissionTypes: [], + }); + fixture.detectChanges(); }); diff --git a/portal-frontend/src/app/features/public/notice-of-intent/submission/submission-details.component.spec.ts b/portal-frontend/src/app/features/public/notice-of-intent/submission/submission-details.component.spec.ts index 4f407dd4e4..5fc5389133 100644 --- a/portal-frontend/src/app/features/public/notice-of-intent/submission/submission-details.component.spec.ts +++ b/portal-frontend/src/app/features/public/notice-of-intent/submission/submission-details.component.spec.ts @@ -26,6 +26,18 @@ describe('SubmissionDetailsComponent', () => { fixture = TestBed.createComponent(SubmissionDetailsComponent); component = fixture.componentInstance; + + mockCodeService.loadCodes.mockResolvedValue({ + localGovernments: [], + applicationTypes: [], + decisionMakers: [], + documentTypes: [], + naruSubtypes: [], + noticeOfIntentTypes: [], + regions: [], + submissionTypes: [], + }); + fixture.detectChanges(); }); diff --git a/portal-frontend/src/app/features/public/notification/submission/submission-details.component.spec.ts b/portal-frontend/src/app/features/public/notification/submission/submission-details.component.spec.ts index 1043a2cfcf..5fc5389133 100644 --- a/portal-frontend/src/app/features/public/notification/submission/submission-details.component.spec.ts +++ b/portal-frontend/src/app/features/public/notification/submission/submission-details.component.spec.ts @@ -1,7 +1,6 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { createMock, DeepMocked } from '@golevelup/ts-jest'; -import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; import { CodeService } from '../../../../services/code/code.service'; import { SubmissionDetailsComponent } from './submission-details.component'; @@ -27,6 +26,18 @@ describe('SubmissionDetailsComponent', () => { fixture = TestBed.createComponent(SubmissionDetailsComponent); component = fixture.componentInstance; + + mockCodeService.loadCodes.mockResolvedValue({ + localGovernments: [], + applicationTypes: [], + decisionMakers: [], + documentTypes: [], + naruSubtypes: [], + noticeOfIntentTypes: [], + regions: [], + submissionTypes: [], + }); + fixture.detectChanges(); }); diff --git a/portal-frontend/src/app/features/public/search/public-search.component.spec.ts b/portal-frontend/src/app/features/public/search/public-search.component.spec.ts index d172155307..e5eb21ee8e 100644 --- a/portal-frontend/src/app/features/public/search/public-search.component.spec.ts +++ b/portal-frontend/src/app/features/public/search/public-search.component.spec.ts @@ -1,7 +1,7 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MatAutocompleteModule } from '@angular/material/autocomplete'; -import { DeepMocked } from '@golevelup/ts-jest'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { CodeService } from '../../../services/code/code.service'; import { SearchService } from '../../../services/search/search.service'; import { StatusService } from '../../../services/status/status.service'; @@ -13,8 +13,14 @@ describe('PublicSearchComponent', () => { let component: PublicSearchComponent; let fixture: ComponentFixture<PublicSearchComponent>; let mockSearchService: DeepMocked<SearchService>; + let mockCodeService: DeepMocked<CodeService>; + let mockStatusService: DeepMocked<StatusService>; beforeEach(async () => { + mockCodeService = createMock(); + mockSearchService = createMock(); + mockStatusService = createMock(); + await TestBed.configureTestingModule({ imports: [MatAutocompleteModule], declarations: [PublicSearchComponent], @@ -25,11 +31,11 @@ describe('PublicSearchComponent', () => { }, { provide: CodeService, - useValue: {}, + useValue: mockCodeService, }, { provide: StatusService, - useValue: {}, + useValue: mockStatusService, }, { provide: ToastService, @@ -41,6 +47,20 @@ describe('PublicSearchComponent', () => { fixture = TestBed.createComponent(PublicSearchComponent); component = fixture.componentInstance; + + mockCodeService.loadCodes.mockResolvedValue({ + localGovernments: [], + applicationTypes: [], + decisionMakers: [], + documentTypes: [], + naruSubtypes: [], + noticeOfIntentTypes: [], + regions: [], + submissionTypes: [], + }); + + mockStatusService.getStatuses.mockResolvedValue([]); + fixture.detectChanges(); }); diff --git a/portal-frontend/src/styles.scss b/portal-frontend/src/styles.scss index 39f30dd8e9..93ca58ded0 100644 --- a/portal-frontend/src/styles.scss +++ b/portal-frontend/src/styles.scss @@ -93,6 +93,15 @@ a { max-height: 99vh !important; } +.mat-mdc-cell { + font-size: rem(16); +} + +.mat-mdc-header-cell { + font-size: rem(16); + font-weight: 700 !important; +} + .backdrop { background-color: rgba(255, 255, 255, 0.7); } diff --git a/services/Dockerfile b/services/Dockerfile index 1ce031b336..b636f713f8 100644 --- a/services/Dockerfile +++ b/services/Dockerfile @@ -3,7 +3,7 @@ # https://www.tomray.dev/nestjs-docker-production ################### -FROM node:18.12-alpine As development +FROM node:20-alpine As development WORKDIR /opt/app-root/ @@ -19,7 +19,7 @@ USER node # BUILD FOR PRODUCTION ################### -FROM node:18.12-alpine As build +FROM node:20-alpine As build ARG NEST_APP=alcs WORKDIR /opt/app-root/ @@ -40,7 +40,7 @@ USER node # PRODUCTION ################### -FROM node:18.12-alpine As production +FROM node:20-alpine As production ARG NEST_APP=alcs # Init diff --git a/services/Dockerfile.local b/services/Dockerfile.local index 9f96763d9f..8bc479a0d1 100644 --- a/services/Dockerfile.local +++ b/services/Dockerfile.local @@ -1,4 +1,4 @@ -FROM node:18.12-alpine As development +FROM node:20-alpine As development WORKDIR /opt/app-root/ RUN chown node:node /opt/app-root/ diff --git a/services/Dockerfile.migrate b/services/Dockerfile.migrate index ae11f4d1a1..401ce620ff 100644 --- a/services/Dockerfile.migrate +++ b/services/Dockerfile.migrate @@ -2,7 +2,7 @@ # DATABASE MIGRATION ##################### -FROM node:18.12-alpine As development +FROM node:20-alpine As development WORKDIR /opt/app-root/ From ab1d6e7affc20f5a36ae5addc527f0c9f2e96c4a Mon Sep 17 00:00:00 2001 From: Liam Stoddard <lstodd@protonmail.com> Date: Fri, 20 Oct 2023 13:14:43 -0700 Subject: [PATCH 588/954] initial --- .../statuses/init_app_submission_status.sql | 30 ++++++++ .../init_app_submission_status_count.sql | 27 ++++++++ .../application_status_base_insert.py | 69 +++++++++++++++++++ 3 files changed, 126 insertions(+) create mode 100644 bin/migrate-oats-data/applications/submissions/sql/statuses/init_app_submission_status.sql create mode 100644 bin/migrate-oats-data/applications/submissions/sql/statuses/init_app_submission_status_count.sql create mode 100644 bin/migrate-oats-data/applications/submissions/statuses/application_status_base_insert.py diff --git a/bin/migrate-oats-data/applications/submissions/sql/statuses/init_app_submission_status.sql b/bin/migrate-oats-data/applications/submissions/sql/statuses/init_app_submission_status.sql new file mode 100644 index 0000000000..af65388330 --- /dev/null +++ b/bin/migrate-oats-data/applications/submissions/sql/statuses/init_app_submission_status.sql @@ -0,0 +1,30 @@ +INSERT INTO alcs.application_submission_to_submission_status(submission_uuid, status_type_code) -- retrieve Notice of Intents from OATS that have only 1 proposal component + WITH application_components_grouped AS ( + SELECT oaac.alr_application_id + FROM oats.oats_alr_appl_components oaac + JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id + WHERE oaa.application_class_code IN ('LOA', 'BLK') + GROUP BY oaac.alr_application_id + HAVING count(oaac.alr_application_id) < 2 -- ignore notice of intents with multiple components + ), + -- alcs_submissions_with_statuses is required for development environment only. Production environment does not have submissions. + alcs_submissions_with_statuses AS ( + SELECT app_sub.file_number + FROM alcs.application_submission app_sub + JOIN alcs.application_submission_to_submission_status appss ON app_sub.uuid = appss.submission_uuid + GROUP BY app_sub.file_number + ), + -- retrieve submission_uuid from ALCS that were imported with ETL + alcs_submission_uuids_to_populate AS ( + SELECT oaa.alr_application_id, + nois.uuid + FROM noi_components_grouped + JOIN oats.oats_alr_applications oaa ON noi_components_grouped.alr_application_id = oaa.alr_application_id + JOIN alcs.notice_of_intent_submission nois ON oaa.alr_application_id::TEXT = nois.file_number -- make sure TO WORK ONLY with the ones that were imported TO ALCS + LEFT JOIN alcs_submissions_with_statuses ON alcs_submissions_with_statuses.file_number = nois.file_number + WHERE alcs_submissions_with_statuses.file_number IS NULL -- filter out all submissions that have statuses populated before the ETL; + ) +SELECT uuid, + noisst.code +FROM alcs_submission_uuids_to_populate + CROSS JOIN alcs.notice_of_intent_submission_status_type noisst \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/submissions/sql/statuses/init_app_submission_status_count.sql b/bin/migrate-oats-data/applications/submissions/sql/statuses/init_app_submission_status_count.sql new file mode 100644 index 0000000000..7536ae4157 --- /dev/null +++ b/bin/migrate-oats-data/applications/submissions/sql/statuses/init_app_submission_status_count.sql @@ -0,0 +1,27 @@ +WITH noi_components_grouped AS ( + SELECT oaac.alr_application_id + FROM oats.oats_alr_appl_components oaac + JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id + WHERE oaa.application_class_code = 'NOI' + GROUP BY oaac.alr_application_id + HAVING count(oaac.alr_application_id) < 2 -- ignore notice of intents with multiple components +), +alcs_submissions_with_statuses AS ( + SELECT nois.file_number + FROM alcs.notice_of_intent_submission nois + JOIN alcs.notice_of_intent_submission_to_submission_status noistss ON nois.uuid = noistss.submission_uuid + GROUP BY nois.file_number +), +-- alcs_submissions_with_statuses is required for developement environment only. Production environment does not have submissions. +alcs_submission_uuids_to_populate AS ( + SELECT oaa.alr_application_id, + nois.uuid + FROM noi_components_grouped + JOIN oats.oats_alr_applications oaa ON noi_components_grouped.alr_application_id = oaa.alr_application_id + JOIN alcs.notice_of_intent_submission nois ON oaa.alr_application_id::TEXT = nois.file_number -- make sure TO WORK ONLY with the ones that were imported TO ALCS + LEFT JOIN alcs_submissions_with_statuses ON alcs_submissions_with_statuses.file_number = nois.file_number + WHERE alcs_submissions_with_statuses.file_number IS NULL -- filter out all submissons that have statuses populated before the ETL; +) +SELECT count(*) +FROM alcs_submission_uuids_to_populate + CROSS JOIN alcs.notice_of_intent_submission_status_type noisst \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/submissions/statuses/application_status_base_insert.py b/bin/migrate-oats-data/applications/submissions/statuses/application_status_base_insert.py new file mode 100644 index 0000000000..506515caf1 --- /dev/null +++ b/bin/migrate-oats-data/applications/submissions/statuses/application_status_base_insert.py @@ -0,0 +1,69 @@ +from common import OATS_ETL_USER, setup_and_get_logger +from db import inject_conn_pool +from psycopg2.extras import RealDictCursor + +etl_name = "init_application_statuses" +logger = setup_and_get_logger(etl_name) + + +@inject_conn_pool +def init_notice_of_intent_statuses(conn=None): + """ + This function is responsible for initializing napplication statuses. + Initializing means inserting status_to_submission record without the effective_date. + + Args: + conn (psycopg2.extensions.connection): PostgreSQL database connection. Provided by the decorator. + batch_size (int): The number of items to process at once. Defaults to BATCH_UPLOAD_SIZE. + """ + + logger.info(f"Start {etl_name}") + with conn.cursor(cursor_factory=RealDictCursor) as cursor: + with open( + "noi/sql/notice_of_intent_submission/statuses/init_notice_of_intent_submission_statuses_count.sql", + "r", + encoding="utf-8", + ) as sql_file: + count_query = sql_file.read() + cursor.execute(count_query) + count_total = dict(cursor.fetchone())["count"] + logger.info(f"Total Notice of Intents data to insert: {count_total}") + + failed_inserts = 0 + successful_inserts_count = 0 + last_application_id = 0 + + with open( + "noi/sql/notice_of_intent_submission/statuses/init_notice_of_intent_submission_statuses.sql", + "r", + encoding="utf-8", + ) as sql_file: + query = sql_file.read() + + try: + cursor.execute(query) + conn.commit() + successful_inserts_count = cursor.rowcount + except Exception as err: + logger.exception() + conn.rollback() + failed_inserts = count_total - successful_inserts_count + last_application_id = last_application_id + 1 + + logger.info( + f"Finished {etl_name}: total amount of successful inserts {successful_inserts_count}, total failed updates {failed_inserts}" + ) + + +@inject_conn_pool +def clean_notice_of_intent_submission_statuses(conn=None): + logger.info("Start init_notice_of_intent_statuses cleaning") + with conn.cursor() as cursor: + cursor.execute( + f"""DELETE FROM alcs.notice_of_intent_submission_to_submission_status noi_st + USING alcs.notice_of_intent_submission nois + WHERE noi_st.submission_uuid = nois.uuid AND nois.audit_created_by = '{OATS_ETL_USER}';""" + ) + logger.info(f"Deleted items count = {cursor.rowcount}") + + conn.commit() From c6e23e00af4f2a8c60e750607c49057bacc4803c Mon Sep 17 00:00:00 2001 From: Liam Stoddard <lstodd@protonmail.com> Date: Wed, 25 Oct 2023 14:43:02 -0700 Subject: [PATCH 589/954] back on track --- .../applications/__init__.py | 12 +- .../applications/submissions/__init__.py | 11 +- .../sql/statuses/application_in_progress.sql | 37 ++++++ .../application_in_progress_count.sql | 36 +++++ .../statuses/application_incomplete_alc.sql | 15 +++ .../application_incomplete_alc_count.sql | 13 ++ .../sql/statuses/application_rec_by_alc.sql | 10 ++ .../statuses/application_rec_by_alc_count.sql | 6 + .../statuses/application_submitted_to_alc.sql | 14 ++ .../application_submitted_to_alc_count.sql | 11 ++ .../statuses/init_app_submission_status.sql | 18 +-- .../init_app_submission_status_batch.sql | 30 +++++ .../init_app_submission_status_count.sql | 26 ++-- .../submissions/statuses/__init__.py | 13 ++ .../application_status_base_insert.py | 114 ++++++++++++++-- .../application_status_in_progress.py | 123 ++++++++++++++++++ .../statuses/application_status_rec_alc.py | 55 ++++++++ .../application_status_submitted_alc.py | 116 +++++++++++++++++ ...ication_status_submitted_incomplete_alc.py | 116 +++++++++++++++++ .../menu/commands/applications.py | 28 ++++ .../menu/commands/clean_all.py | 6 +- .../menu/commands/import_all.py | 24 +++- 22 files changed, 792 insertions(+), 42 deletions(-) create mode 100644 bin/migrate-oats-data/applications/submissions/sql/statuses/application_in_progress.sql create mode 100644 bin/migrate-oats-data/applications/submissions/sql/statuses/application_in_progress_count.sql create mode 100644 bin/migrate-oats-data/applications/submissions/sql/statuses/application_incomplete_alc.sql create mode 100644 bin/migrate-oats-data/applications/submissions/sql/statuses/application_incomplete_alc_count.sql create mode 100644 bin/migrate-oats-data/applications/submissions/sql/statuses/application_rec_by_alc.sql create mode 100644 bin/migrate-oats-data/applications/submissions/sql/statuses/application_rec_by_alc_count.sql create mode 100644 bin/migrate-oats-data/applications/submissions/sql/statuses/application_submitted_to_alc.sql create mode 100644 bin/migrate-oats-data/applications/submissions/sql/statuses/application_submitted_to_alc_count.sql create mode 100644 bin/migrate-oats-data/applications/submissions/sql/statuses/init_app_submission_status_batch.sql create mode 100644 bin/migrate-oats-data/applications/submissions/statuses/__init__.py create mode 100644 bin/migrate-oats-data/applications/submissions/statuses/application_status_in_progress.py create mode 100644 bin/migrate-oats-data/applications/submissions/statuses/application_status_rec_alc.py create mode 100644 bin/migrate-oats-data/applications/submissions/statuses/application_status_submitted_alc.py create mode 100644 bin/migrate-oats-data/applications/submissions/statuses/application_status_submitted_incomplete_alc.py diff --git a/bin/migrate-oats-data/applications/__init__.py b/bin/migrate-oats-data/applications/__init__.py index 8e0663d4c5..7436463afd 100644 --- a/bin/migrate-oats-data/applications/__init__.py +++ b/bin/migrate-oats-data/applications/__init__.py @@ -1,6 +1,16 @@ from .base_applications import * from .app_prep import process_alcs_application_prep_fields -from .submissions import process_alcs_app_submissions +from .submissions import ( + process_alcs_app_submissions, + clean_application_submission, + init_application_statuses, + clean_application_submission_statuses, + process_alcs_application_in_progress_status, + process_alcs_application_received_by_alc_status, + process_alcs_application_submitted_to_alc_status, + batch_application_statuses, + process_alcs_application_submitted_to_alc_incomplete_status, +) from .application_submission_status_email import ( process_application_submission_status_emails, clean_application_submission_status_emails, diff --git a/bin/migrate-oats-data/applications/submissions/__init__.py b/bin/migrate-oats-data/applications/submissions/__init__.py index 6d8ed07ef9..50b94fed9e 100644 --- a/bin/migrate-oats-data/applications/submissions/__init__.py +++ b/bin/migrate-oats-data/applications/submissions/__init__.py @@ -1 +1,10 @@ -from .app_submissions import process_alcs_app_submissions, clean_application_submission \ No newline at end of file +from .app_submissions import process_alcs_app_submissions, clean_application_submission +from .statuses import ( + init_application_statuses, + clean_application_submission_statuses, + process_alcs_application_in_progress_status, + process_alcs_application_received_by_alc_status, + process_alcs_application_submitted_to_alc_status, + batch_application_statuses, + process_alcs_application_submitted_to_alc_incomplete_status, +) diff --git a/bin/migrate-oats-data/applications/submissions/sql/statuses/application_in_progress.sql b/bin/migrate-oats-data/applications/submissions/sql/statuses/application_in_progress.sql new file mode 100644 index 0000000000..e3d018c9dc --- /dev/null +++ b/bin/migrate-oats-data/applications/submissions/sql/statuses/application_in_progress.sql @@ -0,0 +1,37 @@ +WITH earliest_in_progress_accomplishment_per_file_number AS ( + SELECT alr_application_id, + accomplishment_code, + min(oa.completion_date) AS completion_date + FROM oats.oats_accomplishments oa + WHERE accomplishment_code = 'INP' + GROUP BY alr_application_id, + accomplishment_code +), +earliest_in_progress_accomplishments_for_app_only AS ( + SELECT DISTINCT ON ( + earliest_in_prog.accomplishment_code, + earliest_in_prog.completion_date, + oaa.alr_application_id, + oaa.created_date, + oaa.submitted_to_alc_date, + oaa.when_created + ) earliest_in_prog.accomplishment_code, + earliest_in_prog.completion_date, + oaa.alr_application_id, + oaa.created_date, + oaa.submitted_to_alc_date, + oaa.when_created + FROM oats.oats_alr_applications oaa + LEFT JOIN earliest_in_progress_accomplishment_per_file_number AS earliest_in_prog ON earliest_in_prog.alr_application_id = oaa.alr_application_id + WHERE oaa.application_class_code IN ('LOA', 'BLK') +) +SELECT DISTINCT ON (oats_in_prog.alr_application_id) oats_in_prog.alr_application_id, + oats_in_prog.accomplishment_code, + oats_in_prog.completion_date, + oats_in_prog.created_date, + oats_in_prog.submitted_to_alc_date, + oats_in_prog.when_created, + apps.uuid +FROM alcs.application_submission_to_submission_status apstss + JOIN alcs.application_submission apps ON apps.uuid = apstss.submission_uuid + JOIN earliest_in_progress_accomplishments_for_app_only AS oats_in_prog ON oats_in_prog.alr_application_id::TEXT = apps.file_number \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/submissions/sql/statuses/application_in_progress_count.sql b/bin/migrate-oats-data/applications/submissions/sql/statuses/application_in_progress_count.sql new file mode 100644 index 0000000000..7c05118ca4 --- /dev/null +++ b/bin/migrate-oats-data/applications/submissions/sql/statuses/application_in_progress_count.sql @@ -0,0 +1,36 @@ +WITH latest_in_progress_accomplishment_per_file_number AS ( + SELECT alr_application_id, + accomplishment_code, + min(oa.completion_date) AS completion_date + FROM oats.oats_accomplishments oa + WHERE accomplishment_code = 'INP' + GROUP BY alr_application_id, + accomplishment_code +), +latest_in_progress_accomplishments_for_app_only AS ( + SELECT DISTINCT ON ( + latest_in_prog.accomplishment_code, + latest_in_prog.completion_date, + oaa.alr_application_id, + oaa.created_date, + oaa.submitted_to_alc_date, + oaa.when_created + ) latest_in_prog.accomplishment_code, + latest_in_prog.completion_date, + oaa.alr_application_id, + oaa.created_date, + oaa.submitted_to_alc_date, + oaa.when_created + FROM oats.oats_alr_applications oaa + LEFT JOIN latest_in_progress_accomplishment_per_file_number AS latest_in_prog ON latest_in_prog.alr_application_id = oaa.alr_application_id + WHERE oaa.application_class_code IN ('LOA', 'BLK') +), +submission_statuses_to_update AS ( + SELECT count(*) + FROM alcs.application_submission_to_submission_status appstss + JOIN alcs.application_submission apps ON apps.uuid = appstss.submission_uuid + JOIN latest_in_progress_accomplishments_for_app_only AS oats_in_prog ON oats_in_prog.alr_application_id::TEXT = apps.file_number + GROUP BY appstss.submission_uuid +) +SELECT count(*) +FROM submission_statuses_to_update \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/submissions/sql/statuses/application_incomplete_alc.sql b/bin/migrate-oats-data/applications/submissions/sql/statuses/application_incomplete_alc.sql new file mode 100644 index 0000000000..fd36762611 --- /dev/null +++ b/bin/migrate-oats-data/applications/submissions/sql/statuses/application_incomplete_alc.sql @@ -0,0 +1,15 @@ +WITH app_components_grouped AS ( + SELECT oaac.alr_application_id + FROM oats.oats_alr_appl_components oaac + JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id + WHERE oaa.application_class_code IN ('LOA', 'BLK') + GROUP BY oaac.alr_application_id + HAVING count(oaac.alr_application_id) < 2 -- ignore applications with multiple components +) +SELECT oa.alr_application_id, + completion_date, + apps.uuid +FROM app_components_grouped acg + JOIN oats.oats_accomplishments oa ON oa.alr_application_id = acg.alr_application_id + JOIN alcs.application_submission apps ON apps.file_number = oa.alr_application_id::text + AND oa.accomplishment_code = 'AKI' \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/submissions/sql/statuses/application_incomplete_alc_count.sql b/bin/migrate-oats-data/applications/submissions/sql/statuses/application_incomplete_alc_count.sql new file mode 100644 index 0000000000..fc71804e66 --- /dev/null +++ b/bin/migrate-oats-data/applications/submissions/sql/statuses/application_incomplete_alc_count.sql @@ -0,0 +1,13 @@ +WITH app_components_grouped AS ( + SELECT oaac.alr_application_id + FROM oats.oats_alr_appl_components oaac + JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id + WHERE oaa.application_class_code IN ('LOA', 'BLK') + GROUP BY oaac.alr_application_id + HAVING count(oaac.alr_application_id) < 2 -- ignore applications with multiple components +) +SELECT count(*) +FROM app_components_grouped acg + JOIN oats.oats_accomplishments oa ON oa.alr_application_id = acg.alr_application_id + JOIN alcs.application_submission apps ON apps.file_number = oa.alr_application_id::text + AND oa.accomplishment_code = 'AKI'; \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/submissions/sql/statuses/application_rec_by_alc.sql b/bin/migrate-oats-data/applications/submissions/sql/statuses/application_rec_by_alc.sql new file mode 100644 index 0000000000..a68e3e962f --- /dev/null +++ b/bin/migrate-oats-data/applications/submissions/sql/statuses/application_rec_by_alc.sql @@ -0,0 +1,10 @@ +UPDATE alcs.application_submission_to_submission_status AS app_statuses +SET + effective_date = app.date_received_all_items +FROM + alcs.application AS app + JOIN alcs.application_submission apps ON apps.file_number = app.file_number +WHERE + apps.uuid = app_statuses.submission_uuid + AND app_statuses.status_type_code = 'RECA' + AND app.date_received_all_items IS NOT NULL; \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/submissions/sql/statuses/application_rec_by_alc_count.sql b/bin/migrate-oats-data/applications/submissions/sql/statuses/application_rec_by_alc_count.sql new file mode 100644 index 0000000000..33dd6076b4 --- /dev/null +++ b/bin/migrate-oats-data/applications/submissions/sql/statuses/application_rec_by_alc_count.sql @@ -0,0 +1,6 @@ +SELECT + count(*) +FROM + alcs.application_submission_to_submission_status app_statuses +WHERE + app_statuses.status_type_code = 'RECA'; \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/submissions/sql/statuses/application_submitted_to_alc.sql b/bin/migrate-oats-data/applications/submissions/sql/statuses/application_submitted_to_alc.sql new file mode 100644 index 0000000000..bbe41d7bf2 --- /dev/null +++ b/bin/migrate-oats-data/applications/submissions/sql/statuses/application_submitted_to_alc.sql @@ -0,0 +1,14 @@ +WITH app_components_grouped AS ( + SELECT oaac.alr_application_id + FROM oats.oats_alr_appl_components oaac + JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id + WHERE oaa.application_class_code IN ('LOA', 'BLK') + GROUP BY oaac.alr_application_id + HAVING count(oaac.alr_application_id) < 2 -- ignore applications with multiple components +) +SELECT oaa2.alr_application_id, + oaa2.submitted_to_alc_date, + apps.uuid +FROM oats.oats_alr_applications oaa2 + JOIN app_components_grouped acg ON acg.alr_application_id = oaa2.alr_application_id + JOIN alcs.application_submission apps ON apps.file_number = oaa2.alr_application_id::TEXT \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/submissions/sql/statuses/application_submitted_to_alc_count.sql b/bin/migrate-oats-data/applications/submissions/sql/statuses/application_submitted_to_alc_count.sql new file mode 100644 index 0000000000..7f63f61b6b --- /dev/null +++ b/bin/migrate-oats-data/applications/submissions/sql/statuses/application_submitted_to_alc_count.sql @@ -0,0 +1,11 @@ +WITH app_components_grouped AS ( + SELECT oaac.alr_application_id + FROM oats.oats_alr_appl_components oaac + JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id + WHERE oaa.application_class_code IN ('LOA', 'BLK') + GROUP BY oaac.alr_application_id + HAVING count(oaac.alr_application_id) < 2 -- ignore notice of intents with multiple components +) +SELECT count(*) +FROM app_components_grouped + JOIN alcs.application_submission apps ON apps.file_number = alr_application_id::TEXT; \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/submissions/sql/statuses/init_app_submission_status.sql b/bin/migrate-oats-data/applications/submissions/sql/statuses/init_app_submission_status.sql index af65388330..35b55c32d3 100644 --- a/bin/migrate-oats-data/applications/submissions/sql/statuses/init_app_submission_status.sql +++ b/bin/migrate-oats-data/applications/submissions/sql/statuses/init_app_submission_status.sql @@ -1,11 +1,11 @@ -INSERT INTO alcs.application_submission_to_submission_status(submission_uuid, status_type_code) -- retrieve Notice of Intents from OATS that have only 1 proposal component +INSERT INTO alcs.application_submission_to_submission_status(submission_uuid, status_type_code) -- retrieve applications from OATS that have only 1 proposal component WITH application_components_grouped AS ( SELECT oaac.alr_application_id FROM oats.oats_alr_appl_components oaac JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id WHERE oaa.application_class_code IN ('LOA', 'BLK') GROUP BY oaac.alr_application_id - HAVING count(oaac.alr_application_id) < 2 -- ignore notice of intents with multiple components + HAVING count(oaac.alr_application_id) < 2 -- ignore applications with multiple components ), -- alcs_submissions_with_statuses is required for development environment only. Production environment does not have submissions. alcs_submissions_with_statuses AS ( @@ -17,14 +17,14 @@ INSERT INTO alcs.application_submission_to_submission_status(submission_uuid, st -- retrieve submission_uuid from ALCS that were imported with ETL alcs_submission_uuids_to_populate AS ( SELECT oaa.alr_application_id, - nois.uuid - FROM noi_components_grouped - JOIN oats.oats_alr_applications oaa ON noi_components_grouped.alr_application_id = oaa.alr_application_id - JOIN alcs.notice_of_intent_submission nois ON oaa.alr_application_id::TEXT = nois.file_number -- make sure TO WORK ONLY with the ones that were imported TO ALCS - LEFT JOIN alcs_submissions_with_statuses ON alcs_submissions_with_statuses.file_number = nois.file_number + appss.uuid + FROM application_components_grouped + JOIN oats.oats_alr_applications oaa ON application_components_grouped.alr_application_id = oaa.alr_application_id + JOIN alcs.application_submission appss ON oaa.alr_application_id::TEXT = appss.file_number -- make sure TO WORK ONLY with the ones that were imported TO ALCS + LEFT JOIN alcs_submissions_with_statuses ON alcs_submissions_with_statuses.file_number = appss.file_number WHERE alcs_submissions_with_statuses.file_number IS NULL -- filter out all submissions that have statuses populated before the ETL; ) SELECT uuid, - noisst.code + apsst.code FROM alcs_submission_uuids_to_populate - CROSS JOIN alcs.notice_of_intent_submission_status_type noisst \ No newline at end of file + CROSS JOIN alcs.application_submission_status_type apsst \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/submissions/sql/statuses/init_app_submission_status_batch.sql b/bin/migrate-oats-data/applications/submissions/sql/statuses/init_app_submission_status_batch.sql new file mode 100644 index 0000000000..87e8ea8ae2 --- /dev/null +++ b/bin/migrate-oats-data/applications/submissions/sql/statuses/init_app_submission_status_batch.sql @@ -0,0 +1,30 @@ +WITH application_components_grouped AS ( + SELECT oaac.alr_application_id + FROM oats.oats_alr_appl_components oaac + JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id + WHERE oaa.application_class_code IN ('LOA', 'BLK') + GROUP BY oaac.alr_application_id + HAVING count(oaac.alr_application_id) < 2 -- ignore applications with multiple components +), +-- alcs_submissions_with_statuses is required for development environment only. Production environment does not have submissions. +alcs_submissions_with_statuses AS ( + SELECT app_sub.file_number + FROM alcs.application_submission app_sub + JOIN alcs.application_submission_to_submission_status appss ON app_sub.uuid = appss.submission_uuid + GROUP BY app_sub.file_number +), +-- retrieve submission_uuid from ALCS that were imported with ETL +alcs_submission_uuids_to_populate AS ( + SELECT oaa.alr_application_id, + appss.uuid + FROM application_components_grouped + JOIN oats.oats_alr_applications oaa ON application_components_grouped.alr_application_id = oaa.alr_application_id + JOIN alcs.application_submission appss ON oaa.alr_application_id::TEXT = appss.file_number -- make sure TO WORK ONLY with the ones that were imported TO ALCS + LEFT JOIN alcs_submissions_with_statuses ON alcs_submissions_with_statuses.file_number = appss.file_number + WHERE alcs_submissions_with_statuses.file_number IS NULL -- filter out all submissions that have statuses populated before the ETL; +) +SELECT asup.alr_application_id, + apsst.code AS sscode, + asup.uuid +FROM alcs_submission_uuids_to_populate asup + CROSS JOIN alcs.application_submission_status_type apsst \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/submissions/sql/statuses/init_app_submission_status_count.sql b/bin/migrate-oats-data/applications/submissions/sql/statuses/init_app_submission_status_count.sql index 7536ae4157..8b00f89a8a 100644 --- a/bin/migrate-oats-data/applications/submissions/sql/statuses/init_app_submission_status_count.sql +++ b/bin/migrate-oats-data/applications/submissions/sql/statuses/init_app_submission_status_count.sql @@ -1,27 +1,27 @@ -WITH noi_components_grouped AS ( +WITH app_components_grouped AS ( SELECT oaac.alr_application_id FROM oats.oats_alr_appl_components oaac JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id - WHERE oaa.application_class_code = 'NOI' + WHERE oaa.application_class_code IN ('LOA', 'BLK') GROUP BY oaac.alr_application_id - HAVING count(oaac.alr_application_id) < 2 -- ignore notice of intents with multiple components + HAVING count(oaac.alr_application_id) < 2 -- ignore applications with multiple components ), alcs_submissions_with_statuses AS ( - SELECT nois.file_number - FROM alcs.notice_of_intent_submission nois - JOIN alcs.notice_of_intent_submission_to_submission_status noistss ON nois.uuid = noistss.submission_uuid - GROUP BY nois.file_number + SELECT apps.file_number + FROM alcs.application_submission apps + JOIN alcs.application_submission_to_submission_status apstss ON apps.uuid = apstss.submission_uuid + GROUP BY apps.file_number ), -- alcs_submissions_with_statuses is required for developement environment only. Production environment does not have submissions. alcs_submission_uuids_to_populate AS ( SELECT oaa.alr_application_id, - nois.uuid - FROM noi_components_grouped - JOIN oats.oats_alr_applications oaa ON noi_components_grouped.alr_application_id = oaa.alr_application_id - JOIN alcs.notice_of_intent_submission nois ON oaa.alr_application_id::TEXT = nois.file_number -- make sure TO WORK ONLY with the ones that were imported TO ALCS - LEFT JOIN alcs_submissions_with_statuses ON alcs_submissions_with_statuses.file_number = nois.file_number + apps.uuid + FROM app_components_grouped + JOIN oats.oats_alr_applications oaa ON app_components_grouped.alr_application_id = oaa.alr_application_id + JOIN alcs.application_submission apps ON oaa.alr_application_id::TEXT = apps.file_number -- make sure TO WORK ONLY with the ones that were imported TO ALCS + LEFT JOIN alcs_submissions_with_statuses ON alcs_submissions_with_statuses.file_number = apps.file_number WHERE alcs_submissions_with_statuses.file_number IS NULL -- filter out all submissons that have statuses populated before the ETL; ) SELECT count(*) FROM alcs_submission_uuids_to_populate - CROSS JOIN alcs.notice_of_intent_submission_status_type noisst \ No newline at end of file + CROSS JOIN alcs.application_submission_status_type apsst \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/submissions/statuses/__init__.py b/bin/migrate-oats-data/applications/submissions/statuses/__init__.py new file mode 100644 index 0000000000..62ac0a40b8 --- /dev/null +++ b/bin/migrate-oats-data/applications/submissions/statuses/__init__.py @@ -0,0 +1,13 @@ +from .application_status_base_insert import ( + init_application_statuses, + clean_application_submission_statuses, + batch_application_statuses, +) +from .application_status_in_progress import process_alcs_application_in_progress_status +from .application_status_rec_alc import process_alcs_application_received_by_alc_status +from .application_status_submitted_alc import ( + process_alcs_application_submitted_to_alc_status, +) +from .application_status_submitted_incomplete_alc import ( + process_alcs_application_submitted_to_alc_incomplete_status, +) diff --git a/bin/migrate-oats-data/applications/submissions/statuses/application_status_base_insert.py b/bin/migrate-oats-data/applications/submissions/statuses/application_status_base_insert.py index 506515caf1..467292c3d8 100644 --- a/bin/migrate-oats-data/applications/submissions/statuses/application_status_base_insert.py +++ b/bin/migrate-oats-data/applications/submissions/statuses/application_status_base_insert.py @@ -1,40 +1,38 @@ -from common import OATS_ETL_USER, setup_and_get_logger +from common import OATS_ETL_USER, setup_and_get_logger, BATCH_UPLOAD_SIZE from db import inject_conn_pool -from psycopg2.extras import RealDictCursor +from psycopg2.extras import RealDictCursor, execute_batch etl_name = "init_application_statuses" logger = setup_and_get_logger(etl_name) @inject_conn_pool -def init_notice_of_intent_statuses(conn=None): +def init_application_statuses(conn=None): """ - This function is responsible for initializing napplication statuses. + This function is responsible for initializing application statuses. Initializing means inserting status_to_submission record without the effective_date. Args: conn (psycopg2.extensions.connection): PostgreSQL database connection. Provided by the decorator. batch_size (int): The number of items to process at once. Defaults to BATCH_UPLOAD_SIZE. """ - logger.info(f"Start {etl_name}") with conn.cursor(cursor_factory=RealDictCursor) as cursor: with open( - "noi/sql/notice_of_intent_submission/statuses/init_notice_of_intent_submission_statuses_count.sql", + "applications/submissions/sql/statuses/init_app_submission_status_count.sql", "r", encoding="utf-8", ) as sql_file: count_query = sql_file.read() cursor.execute(count_query) count_total = dict(cursor.fetchone())["count"] - logger.info(f"Total Notice of Intents data to insert: {count_total}") - + logger.info(f"Total Application data to insert: {count_total}") failed_inserts = 0 successful_inserts_count = 0 last_application_id = 0 with open( - "noi/sql/notice_of_intent_submission/statuses/init_notice_of_intent_submission_statuses.sql", + "applications/submissions/sql/statuses/init_app_submission_status.sql", "r", encoding="utf-8", ) as sql_file: @@ -56,14 +54,102 @@ def init_notice_of_intent_statuses(conn=None): @inject_conn_pool -def clean_notice_of_intent_submission_statuses(conn=None): - logger.info("Start init_notice_of_intent_statuses cleaning") +def clean_application_submission_statuses(conn=None): + logger.debug("Start application_statuses cleaning") with conn.cursor() as cursor: cursor.execute( - f"""DELETE FROM alcs.notice_of_intent_submission_to_submission_status noi_st - USING alcs.notice_of_intent_submission nois - WHERE noi_st.submission_uuid = nois.uuid AND nois.audit_created_by = '{OATS_ETL_USER}';""" + f"""DELETE FROM alcs.application_submission_to_submission_status app_st + USING alcs.application_submission apss + WHERE app_st.submission_uuid = apss.uuid AND apss.audit_created_by = '{OATS_ETL_USER}';""" ) logger.info(f"Deleted items count = {cursor.rowcount}") conn.commit() + + +@inject_conn_pool +def batch_application_statuses(conn=None, batch_size=BATCH_UPLOAD_SIZE): + """ + This function is responsible for initializing application statuses. + Initializing means inserting status_to_submission record without the effective_date. + + Args: + conn (psycopg2.extensions.connection): PostgreSQL database connection. Provided by the decorator. + batch_size (int): The number of items to process at once. Defaults to BATCH_UPLOAD_SIZE. + """ + logger.info(f"Start {etl_name}") + with conn.cursor(cursor_factory=RealDictCursor) as cursor: + with open( + "applications/submissions/sql/statuses/init_app_submission_status_count.sql", + "r", + encoding="utf-8", + ) as sql_file: + count_query = sql_file.read() + cursor.execute(count_query) + count_total = dict(cursor.fetchone())["count"] + logger.info(f"Total Application data to insert: {count_total}") + print(count_total) + failed_inserts = 0 + successful_inserts_count = 0 + last_application_id = 0 + # mod_batch allows batching to work at the closest integer division of 12 which is the number of unique status types in alcs applications + mod_batch = batch_size // 12 + mod_batch = mod_batch * 12 + with open( + "applications/submissions/sql/statuses/init_app_submission_status_batch.sql", + "r", + encoding="utf-8", + ) as sql_file: + query = sql_file.read() + while True: + cursor.execute( + f"{query} WHERE asup.alr_application_id > {last_application_id} ORDER by asup.alr_application_id;" + ) + rows = cursor.fetchmany(mod_batch) + if not rows: + break + try: + applications_to_be_inserted_count = len(rows) + + _get_insert_query(cursor, rows, mod_batch, conn) + conn.commit() + last_application_id = dict(rows[-1])["alr_application_id"] + successful_inserts_count = ( + successful_inserts_count + applications_to_be_inserted_count + ) + + logger.info( + f"retrieved/inserted items count: {applications_to_be_inserted_count}; total successfully inserted/updated applications so far {successful_inserts_count}; last inserted applidation_id: {last_application_id}" + ) + except Exception as err: + logger.exception() + conn.rollback() + failed_inserts = count_total - successful_inserts_count + last_application_id = last_application_id + 1 + + logger.info( + f"Finished {etl_name}: total amount of successful inserts {successful_inserts_count}, total failed updates {failed_inserts}" + ) + + +def _get_insert_query(cursor, rows, batch_size, conn): + execute_batch( + cursor, + _insert_query(), + rows, + page_size=batch_size, + ) + + +def _insert_query(): + query = """ + INSERT INTO alcs.application_submission_to_submission_status ( + submission_uuid, + status_type_code + ) + VALUES ( + %(uuid)s, + %(sscode)s + ) + """ + return query diff --git a/bin/migrate-oats-data/applications/submissions/statuses/application_status_in_progress.py b/bin/migrate-oats-data/applications/submissions/statuses/application_status_in_progress.py new file mode 100644 index 0000000000..50de5d954a --- /dev/null +++ b/bin/migrate-oats-data/applications/submissions/statuses/application_status_in_progress.py @@ -0,0 +1,123 @@ +from common import BATCH_UPLOAD_SIZE, setup_and_get_logger, convert_timezone, set_time +from db import inject_conn_pool +from psycopg2.extras import RealDictCursor, execute_batch + +etl_name = "process_application_in_progress_status" +logger = setup_and_get_logger(etl_name) + + +@inject_conn_pool +def process_alcs_application_in_progress_status( + conn=None, batch_size=BATCH_UPLOAD_SIZE +): + """ + This function is responsible for populating In Progress status of Applications in ALCS. + + Args: + conn (psycopg2.extensions.connection): PostgreSQL database connection. Provided by the decorator. + batch_size (int): The number of items to process at once. Defaults to BATCH_UPLOAD_SIZE. + """ + + logger.info(f"Start {etl_name}") + with conn.cursor(cursor_factory=RealDictCursor) as cursor: + with open( + "applications/submissions/sql/statuses/application_in_progress_count.sql", + "r", + encoding="utf-8", + ) as sql_file: + count_query = sql_file.read() + cursor.execute(count_query) + count_total = dict(cursor.fetchone())["count"] + logger.info(f"Total application data to update: {count_total}") + + failed_inserts = 0 + successful_updates_count = 0 + last_application_id = 0 + + with open( + "applications/submissions/sql/statuses/application_in_progress.sql", + "r", + encoding="utf-8", + ) as sql_file: + application_sql = sql_file.read() + while True: + cursor.execute( + f"{application_sql} WHERE oats_in_prog.alr_application_id > {last_application_id} ORDER BY oats_in_prog.alr_application_id;" + ) + + rows = cursor.fetchmany(batch_size) + + if not rows: + break + try: + records_to_be_updated_count = len(rows) + + _update_records(conn, batch_size, cursor, rows) + + successful_updates_count = ( + successful_updates_count + records_to_be_updated_count + ) + last_application_id = dict(rows[-1])["alr_application_id"] + + logger.debug( + f"retrieved/updated items count: {records_to_be_updated_count}; total successfully updated applications so far {successful_updates_count}; last updated alr_application_id: {last_application_id}" + ) + except Exception as err: + # this is NOT going to be caused by actual data update failure. This code is only executed when the code error appears or connection to DB is lost + logger.exception() + conn.rollback() + failed_inserts = count_total - successful_updates_count + last_application_id = last_application_id + 1 + + logger.info( + f"Finished {etl_name}: total amount of successful updates {successful_updates_count}, total failed updates {failed_inserts}" + ) + + +def _update_records(conn, batch_size, cursor, rows): + parsed_data_list = _prepare_oats_data(rows) + + if len(parsed_data_list) > 0: + execute_batch( + cursor, + _update_query, + parsed_data_list, + page_size=batch_size, + ) + + conn.commit() + + +_update_query = """ + UPDATE alcs.application_submission_to_submission_status + SET effective_date = %(date)s + WHERE submission_uuid = %(uuid)s and status_type_code = 'PROG' +""" + + +def _prepare_oats_data(row_data_list): + data_list = [] + for row in row_data_list: + data = _map_fields(dict(row)) + data_list.append(data) + return data_list + + +def _map_fields(data): + status_effective_date = None + + if data: + if data["completion_date"]: + status_effective_date = data["completion_date"] + elif data["created_date"]: + status_effective_date = data["created_date"] + elif data["submitted_to_alc_date"]: + status_effective_date = data["submitted_to_alc_date"] + else: + status_effective_date = data["when_created"] + + if status_effective_date: + date = convert_timezone(status_effective_date, "US/Pacific") + data["date"] = set_time(date) + + return data diff --git a/bin/migrate-oats-data/applications/submissions/statuses/application_status_rec_alc.py b/bin/migrate-oats-data/applications/submissions/statuses/application_status_rec_alc.py new file mode 100644 index 0000000000..8b670c6126 --- /dev/null +++ b/bin/migrate-oats-data/applications/submissions/statuses/application_status_rec_alc.py @@ -0,0 +1,55 @@ +from common import setup_and_get_logger +from db import inject_conn_pool +from psycopg2.extras import RealDictCursor + + +etl_name = "process_alcs_application_received_by_alc_status" +logger = setup_and_get_logger(etl_name) + + +@inject_conn_pool +def process_alcs_application_received_by_alc_status(conn=None): + """ + This function is responsible for populating Received By ALC status of Applications in ALCS. + This function does not use batch since update happens in scope of the same schema + + Args: + conn (psycopg2.extensions.connection): PostgreSQL database connection. Provided by the decorator. + """ + logger.info(f"Start {etl_name}") + with conn.cursor(cursor_factory=RealDictCursor) as cursor: + with open( + "applications/submissions/sql/statuses/application_rec_by_alc_count.sql", + "r", + encoding="utf-8", + ) as sql_file: + count_query = sql_file.read() + cursor.execute(count_query) + count_total = dict(cursor.fetchone())["count"] + logger.info(f"Total Application data to update: {count_total}") + + successful_updates_count = 0 + failed_updates = 0 + + with open( + "applications/submissions/sql/statuses/application_rec_by_alc.sql", + "r", + encoding="utf-8", + ) as sql_file: + update_sql = sql_file.read() + + try: + cursor.execute(update_sql) + conn.commit() + + successful_updates_count = cursor.rowcount + + except Exception as err: + # this is NOT going to be caused by actual data update failure. This code is only executed when the code error appears or connection to DB is lost + logger.exception(err) + conn.rollback() + failed_updates = count_total - successful_updates_count + + logger.info( + f"Finished {etl_name}: total amount of successful updates {successful_updates_count}, total failed updates {failed_updates}" + ) diff --git a/bin/migrate-oats-data/applications/submissions/statuses/application_status_submitted_alc.py b/bin/migrate-oats-data/applications/submissions/statuses/application_status_submitted_alc.py new file mode 100644 index 0000000000..604dcba42a --- /dev/null +++ b/bin/migrate-oats-data/applications/submissions/statuses/application_status_submitted_alc.py @@ -0,0 +1,116 @@ +from common import BATCH_UPLOAD_SIZE, setup_and_get_logger, convert_timezone, set_time +from db import inject_conn_pool +from psycopg2.extras import RealDictCursor, execute_batch + +etl_name = "process_alcs_application_submitted_to_alc_status" +logger = setup_and_get_logger(etl_name) + + +@inject_conn_pool +def process_alcs_application_submitted_to_alc_status( + conn=None, batch_size=BATCH_UPLOAD_SIZE +): + """ + This function is responsible for populating Submitted to ALC status of Applications in ALCS. + + Args: + conn (psycopg2.extensions.connection): PostgreSQL database connection. Provided by the decorator. + batch_size (int): The number of items to process at once. Defaults to BATCH_UPLOAD_SIZE. + """ + print("alc status?") + logger.info(f"Start {etl_name}") + with conn.cursor(cursor_factory=RealDictCursor) as cursor: + with open( + "applications/submissions/sql/statuses/application_submitted_to_alc_count.sql", + "r", + encoding="utf-8", + ) as sql_file: + count_query = sql_file.read() + cursor.execute(count_query) + count_total = dict(cursor.fetchone())["count"] + logger.info(f"Total Application data to update: {count_total}") + + failed_inserts = 0 + successful_updates_count = 0 + last_application_id = 0 + + with open( + "applications/submissions/sql/statuses/application_submitted_to_alc.sql", + "r", + encoding="utf-8", + ) as sql_file: + application_sql = sql_file.read() + while True: + cursor.execute( + f"{application_sql} WHERE oaa2.alr_application_id > {last_application_id} ORDER BY oaa2.alr_application_id;" + ) + + rows = cursor.fetchmany(batch_size) + + if not rows: + break + try: + records_to_be_updated_count = len(rows) + + _update_records(conn, batch_size, cursor, rows) + + successful_updates_count = ( + successful_updates_count + records_to_be_updated_count + ) + last_application_id = dict(rows[-1])["alr_application_id"] + + logger.debug( + f"retrieved/updated items count: {records_to_be_updated_count}; total successfully updated notice of intents so far {successful_updates_count}; last updated alr_application_id: {last_application_id}" + ) + except Exception as err: + # this is NOT going to be caused by actual data update failure. This code is only executed when the code error appears or connection to DB is lost + logger.exception(err) + conn.rollback() + failed_inserts = count_total - successful_updates_count + last_application_id = last_application_id + 1 + + logger.info( + f"Finished {etl_name}: total amount of successful updates {successful_updates_count}, total failed updates {failed_inserts}" + ) + + +def _update_records(conn, batch_size, cursor, rows): + parsed_data_list = _prepare_oats_data(rows) + + if len(parsed_data_list) > 0: + execute_batch( + cursor, + _update_query, + parsed_data_list, + page_size=batch_size, + ) + + conn.commit() + + +_update_query = """ + UPDATE alcs.application_submission_to_submission_status + SET effective_date = %(date)s + WHERE submission_uuid = %(uuid)s and status_type_code = 'SUBM' +""" + + +def _prepare_oats_data(row_data_list): + data_list = [] + for row in row_data_list: + data = _map_fields(dict(row)) + data_list.append(data) + return data_list + + +def _map_fields(data): + status_effective_date = None + data["date"] = None + + if data and data["submitted_to_alc_date"]: + status_effective_date = data["submitted_to_alc_date"] + if status_effective_date: + date = convert_timezone(status_effective_date, "US/Pacific") + data["date"] = set_time(date) + + return data diff --git a/bin/migrate-oats-data/applications/submissions/statuses/application_status_submitted_incomplete_alc.py b/bin/migrate-oats-data/applications/submissions/statuses/application_status_submitted_incomplete_alc.py new file mode 100644 index 0000000000..bf3e4f32f2 --- /dev/null +++ b/bin/migrate-oats-data/applications/submissions/statuses/application_status_submitted_incomplete_alc.py @@ -0,0 +1,116 @@ +from common import BATCH_UPLOAD_SIZE, setup_and_get_logger, convert_timezone, set_time +from db import inject_conn_pool +from psycopg2.extras import RealDictCursor, execute_batch + +etl_name = "process_alcs_application_submitted_to_alc_incomplete_status" +logger = setup_and_get_logger(etl_name) + + +@inject_conn_pool +def process_alcs_application_submitted_to_alc_incomplete_status( + conn=None, batch_size=BATCH_UPLOAD_SIZE +): + """ + This function is responsible for populating Submitted to ALC status of Applications in ALCS. + + Args: + conn (psycopg2.extensions.connection): PostgreSQL database connection. Provided by the decorator. + batch_size (int): The number of items to process at once. Defaults to BATCH_UPLOAD_SIZE. + """ + + logger.info(f"Start {etl_name}") + with conn.cursor(cursor_factory=RealDictCursor) as cursor: + with open( + "applications/submissions/sql/statuses/application_incomplete_alc_count.sql", + "r", + encoding="utf-8", + ) as sql_file: + count_query = sql_file.read() + cursor.execute(count_query) + count_total = dict(cursor.fetchone())["count"] + logger.info(f"Total Application data to update: {count_total}") + + failed_inserts = 0 + successful_updates_count = 0 + last_application_id = 0 + + with open( + "applications/submissions/sql/statuses/application_incomplete_alc.sql", + "r", + encoding="utf-8", + ) as sql_file: + application_sql = sql_file.read() + while True: + cursor.execute( + f"{application_sql} WHERE oa.alr_application_id > {last_application_id} ORDER BY oa.alr_application_id;" + ) + + rows = cursor.fetchmany(batch_size) + + if not rows: + break + try: + records_to_be_updated_count = len(rows) + + _update_records(conn, batch_size, cursor, rows) + + successful_updates_count = ( + successful_updates_count + records_to_be_updated_count + ) + last_application_id = dict(rows[-1])["alr_application_id"] + + logger.debug( + f"retrieved/updated items count: {records_to_be_updated_count}; total successfully updated applications so far {successful_updates_count}; last updated alr_application_id: {last_application_id}" + ) + except Exception as err: + # this is NOT going to be caused by actual data update failure. This code is only executed when the code error appears or connection to DB is lost + logger.exception(err) + conn.rollback() + failed_inserts = count_total - successful_updates_count + last_application_id = last_application_id + 1 + + logger.info( + f"Finished {etl_name}: total amount of successful updates {successful_updates_count}, total failed updates {failed_inserts}" + ) + + +def _update_records(conn, batch_size, cursor, rows): + parsed_data_list = _prepare_oats_data(rows) + + if len(parsed_data_list) > 0: + execute_batch( + cursor, + _update_query, + parsed_data_list, + page_size=batch_size, + ) + + conn.commit() + + +_update_query = """ + UPDATE alcs.application_submission_to_submission_status + SET effective_date = %(date)s + WHERE submission_uuid = %(uuid)s and status_type_code = 'SUIN' +""" + + +def _prepare_oats_data(row_data_list): + data_list = [] + for row in row_data_list: + data = _map_fields(dict(row)) + data_list.append(data) + return data_list + + +def _map_fields(data): + status_effective_date = None + data["date"] = None + + if data and data["completion_date"]: + status_effective_date = data["completion_date"] + if status_effective_date: + date = convert_timezone(status_effective_date, "US/Pacific") + data["date"] = set_time(date) + + return data diff --git a/bin/migrate-oats-data/menu/commands/applications.py b/bin/migrate-oats-data/menu/commands/applications.py index 7dee6710f6..2df5be561b 100644 --- a/bin/migrate-oats-data/menu/commands/applications.py +++ b/bin/migrate-oats-data/menu/commands/applications.py @@ -2,6 +2,12 @@ process_applications, process_alcs_application_prep_fields, process_alcs_app_submissions, + init_application_statuses, + process_alcs_application_in_progress_status, + process_alcs_application_received_by_alc_status, + process_alcs_application_submitted_to_alc_status, + batch_application_statuses, + process_alcs_application_submitted_to_alc_incomplete_status, ) @@ -44,3 +50,25 @@ def application_submission_import(console, args): console.log(f"Processing app-sub import in batch size = {import_batch_size}") process_alcs_app_submissions(batch_size=import_batch_size) + + +def application_status_import(console, args): + console.log("Beginning OATS -> ALCS app-status import process") + with console.status( + "[bold green]App submission status import (application_submission_to_submission_status table update in ALCS)...\n" + ) as status: + if args.batch_size: + import_batch_size = args.batch_size + + console.log( + f"Processing application statuses import in batch size = {import_batch_size}" + ) + + init_application_statuses() + # batch_application_statuses(batch_size=import_batch_size) + process_alcs_application_in_progress_status(batch_size=import_batch_size) + process_alcs_application_received_by_alc_status() + process_alcs_application_submitted_to_alc_status(batch_size=import_batch_size) + process_alcs_application_submitted_to_alc_incomplete_status( + batch_size=import_batch_size + ) diff --git a/bin/migrate-oats-data/menu/commands/clean_all.py b/bin/migrate-oats-data/menu/commands/clean_all.py index d9326584ee..0216574b11 100644 --- a/bin/migrate-oats-data/menu/commands/clean_all.py +++ b/bin/migrate-oats-data/menu/commands/clean_all.py @@ -1,6 +1,9 @@ from applications import clean_applications from noi.notice_of_intent_migration import clean_notice_of_intent -from applications.submissions import clean_application_submission +from applications.submissions import ( + clean_application_submission, + clean_application_submission_statuses, +) from applications.application_submission_status_email import ( clean_application_submission_status_emails, ) @@ -22,6 +25,7 @@ def clean_all(console, args): clean_application_documents() clean_noi_documents() clean_documents() + clean_application_submission_statuses() clean_application_submission() clean_applications() clean_notice_of_intent() diff --git a/bin/migrate-oats-data/menu/commands/import_all.py b/bin/migrate-oats-data/menu/commands/import_all.py index bea1ed25aa..1bec3eb20b 100644 --- a/bin/migrate-oats-data/menu/commands/import_all.py +++ b/bin/migrate-oats-data/menu/commands/import_all.py @@ -6,7 +6,15 @@ init_notice_of_intents, process_notice_of_intent, ) -from applications.submissions import process_alcs_app_submissions +from applications.submissions import ( + process_alcs_app_submissions, + init_application_statuses, + process_alcs_application_in_progress_status, + process_alcs_application_received_by_alc_status, + process_alcs_application_submitted_to_alc_status, + batch_application_statuses, + process_alcs_application_submitted_to_alc_incomplete_status, +) from applications.application_submission_status_email import ( process_application_submission_status_emails, ) @@ -41,10 +49,10 @@ def import_all(console, args): init_notice_of_intents(batch_size=import_batch_size) console.log("Importing NOI specific OATS documents into ALCS:") - import_oats_noi_documents(batch_size=import_batch_size) + # import_oats_noi_documents(batch_size=import_batch_size) console.log("Importing OATS app_documents into ALCS:") - import_oats_app_documents(batch_size=import_batch_size) + # import_oats_app_documents(batch_size=import_batch_size) console.log("Processing ALCS application documents:") link_alcs_docs_to_app_docs(batch_size=import_batch_size) @@ -58,6 +66,16 @@ def import_all(console, args): console.log("Processing application submission:") process_alcs_app_submissions(batch_size=import_batch_size) + console.log("Processing application status:") + # init_application_statuses() + batch_application_statuses(batch_size=import_batch_size) + process_alcs_application_in_progress_status(batch_size=import_batch_size) + process_alcs_application_submitted_to_alc_status(batch_size=import_batch_size) + process_alcs_application_received_by_alc_status() + process_alcs_application_submitted_to_alc_incomplete_status( + batch_size=import_batch_size + ) + console.log("Processing notice of intents") process_notice_of_intent(batch_size=import_batch_size) From 2d2ddfa914c3b469f179e32d088d2014501226bc Mon Sep 17 00:00:00 2001 From: Liam Stoddard <lstodd@protonmail.com> Date: Mon, 30 Oct 2023 21:49:55 -0700 Subject: [PATCH 590/954] Fixing cancelled, fixed SUBG --- .../applications/__init__.py | 6 + .../applications/submissions/__init__.py | 6 + .../sql/statuses/application_cancelled.sql | 44 +++++++ .../statuses/application_cancelled_count.sql | 34 +++++ .../application_decision_released.sql | 10 ++ .../application_decision_released_count.sql | 6 + .../application_returned_incomplete_lfng.sql | 24 ++++ ...ication_returned_incomplete_lfng_count.sql | 21 ++++ .../application_submitted_to_lfng.sql | 44 +++++++ .../application_submitted_to_lfng_count.sql | 48 +++++++ .../application_under_review_lfng.sql | 24 ++++ .../application_under_review_lfng_count.sql | 21 ++++ .../sql/statuses/application_wrong_lfng.sql | 24 ++++ .../statuses/application_wrong_lfng_count.sql | 21 ++++ .../init_app_submission_status_batch.sql | 4 +- .../submissions/statuses/__init__.py | 14 ++- .../application_status_base_insert.py | 91 +------------- .../application_status_batch_insert.py | 103 +++++++++++++++ .../statuses/application_status_cancelled.py | 115 +++++++++++++++++ .../application_status_descision_released.py | 56 +++++++++ ...ication_status_returned_incomplete_lfng.py | 117 ++++++++++++++++++ .../application_status_review_lfng.py | 117 ++++++++++++++++++ .../application_status_submitted_alc.py | 1 - .../application_status_submitted_lfng.py | 117 ++++++++++++++++++ .../statuses/application_status_type_code.py | 35 ++++++ .../statuses/application_status_wrong_lfng.py | 115 +++++++++++++++++ .../menu/commands/applications.py | 14 +++ .../menu/commands/import_all.py | 18 ++- 28 files changed, 1155 insertions(+), 95 deletions(-) create mode 100644 bin/migrate-oats-data/applications/submissions/sql/statuses/application_cancelled.sql create mode 100644 bin/migrate-oats-data/applications/submissions/sql/statuses/application_cancelled_count.sql create mode 100644 bin/migrate-oats-data/applications/submissions/sql/statuses/application_decision_released.sql create mode 100644 bin/migrate-oats-data/applications/submissions/sql/statuses/application_decision_released_count.sql create mode 100644 bin/migrate-oats-data/applications/submissions/sql/statuses/application_returned_incomplete_lfng.sql create mode 100644 bin/migrate-oats-data/applications/submissions/sql/statuses/application_returned_incomplete_lfng_count.sql create mode 100644 bin/migrate-oats-data/applications/submissions/sql/statuses/application_submitted_to_lfng.sql create mode 100644 bin/migrate-oats-data/applications/submissions/sql/statuses/application_submitted_to_lfng_count.sql create mode 100644 bin/migrate-oats-data/applications/submissions/sql/statuses/application_under_review_lfng.sql create mode 100644 bin/migrate-oats-data/applications/submissions/sql/statuses/application_under_review_lfng_count.sql create mode 100644 bin/migrate-oats-data/applications/submissions/sql/statuses/application_wrong_lfng.sql create mode 100644 bin/migrate-oats-data/applications/submissions/sql/statuses/application_wrong_lfng_count.sql create mode 100644 bin/migrate-oats-data/applications/submissions/statuses/application_status_batch_insert.py create mode 100644 bin/migrate-oats-data/applications/submissions/statuses/application_status_cancelled.py create mode 100644 bin/migrate-oats-data/applications/submissions/statuses/application_status_descision_released.py create mode 100644 bin/migrate-oats-data/applications/submissions/statuses/application_status_returned_incomplete_lfng.py create mode 100644 bin/migrate-oats-data/applications/submissions/statuses/application_status_review_lfng.py create mode 100644 bin/migrate-oats-data/applications/submissions/statuses/application_status_submitted_lfng.py create mode 100644 bin/migrate-oats-data/applications/submissions/statuses/application_status_type_code.py create mode 100644 bin/migrate-oats-data/applications/submissions/statuses/application_status_wrong_lfng.py diff --git a/bin/migrate-oats-data/applications/__init__.py b/bin/migrate-oats-data/applications/__init__.py index 7436463afd..62c6c1a09b 100644 --- a/bin/migrate-oats-data/applications/__init__.py +++ b/bin/migrate-oats-data/applications/__init__.py @@ -10,6 +10,12 @@ process_alcs_application_submitted_to_alc_status, batch_application_statuses, process_alcs_application_submitted_to_alc_incomplete_status, + process_alcs_application_decision_released_status, + process_alcs_application_cancelled_status, + process_alcs_application_review_lfng_status, + process_alcs_application_wrong_lfng_status, + process_alcs_application_returned_incomplete_lfng_status, + process_alcs_application_submitted_lfng_status, ) from .application_submission_status_email import ( process_application_submission_status_emails, diff --git a/bin/migrate-oats-data/applications/submissions/__init__.py b/bin/migrate-oats-data/applications/submissions/__init__.py index 50b94fed9e..796d9cff8d 100644 --- a/bin/migrate-oats-data/applications/submissions/__init__.py +++ b/bin/migrate-oats-data/applications/submissions/__init__.py @@ -7,4 +7,10 @@ process_alcs_application_submitted_to_alc_status, batch_application_statuses, process_alcs_application_submitted_to_alc_incomplete_status, + process_alcs_application_decision_released_status, + process_alcs_application_cancelled_status, + process_alcs_application_review_lfng_status, + process_alcs_application_wrong_lfng_status, + process_alcs_application_returned_incomplete_lfng_status, + process_alcs_application_submitted_lfng_status, ) diff --git a/bin/migrate-oats-data/applications/submissions/sql/statuses/application_cancelled.sql b/bin/migrate-oats-data/applications/submissions/sql/statuses/application_cancelled.sql new file mode 100644 index 0000000000..5d118dfb6f --- /dev/null +++ b/bin/migrate-oats-data/applications/submissions/sql/statuses/application_cancelled.sql @@ -0,0 +1,44 @@ +WITH first_cancelled_accomplishment_per_file_number AS ( + SELECT alr_application_id, + accomplishment_code, + min(oa.completion_date) AS completion_date + FROM oats.oats_accomplishments oa + WHERE accomplishment_code = 'CAN' + GROUP BY alr_application_id, + accomplishment_code +), +cancelled_accomplishments_for_app_only AS ( + SELECT DISTINCT ON ( + first_cancelled.accomplishment_code, + first_cancelled.completion_date, + oaa.alr_application_id, + oaa.cancelled_date + ) first_cancelled.accomplishment_code, + first_cancelled.completion_date, + oaa.alr_application_id, + oaa.cancelled_date + FROM oats.oats_alr_applications oaa + LEFT JOIN first_cancelled_accomplishment_per_file_number AS first_cancelled ON first_cancelled.alr_application_id = oaa.alr_application_id + WHERE oaa.application_class_code IN ('LOA', 'BLK') +) +SELECT oats_cancelled.alr_application_id, + oats_cancelled.accomplishment_code, + oats_cancelled.completion_date, + oats_cancelled.cancelled_date, + LEAST( + COALESCE( + oats_cancelled.completion_date, + oats_cancelled.cancelled_date + ), + COALESCE( + oats_cancelled.cancelled_date, + oats_cancelled.completion_date + ) + ) AS min_date, + apps.uuid +FROM cancelled_accomplishments_for_app_only oats_cancelled + JOIN alcs.application_submission apps ON apps.file_number = oats_cancelled.alr_application_id::TEXT +WHERE ( + oats_cancelled.completion_date IS NOT NULL + OR oats_cancelled.cancelled_date IS NOT NULL + ) \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/submissions/sql/statuses/application_cancelled_count.sql b/bin/migrate-oats-data/applications/submissions/sql/statuses/application_cancelled_count.sql new file mode 100644 index 0000000000..46fb27b7f0 --- /dev/null +++ b/bin/migrate-oats-data/applications/submissions/sql/statuses/application_cancelled_count.sql @@ -0,0 +1,34 @@ +WITH first_cancelled_accomplishment_per_file_number AS ( + SELECT alr_application_id, + accomplishment_code, + min(oa.completion_date) AS completion_date + FROM oats.oats_accomplishments oa + WHERE accomplishment_code = 'CAN' + GROUP BY alr_application_id, + accomplishment_code +), +cancelled_accomplishments_for_app_only AS ( + SELECT DISTINCT ON ( + first_cancelled.accomplishment_code, + first_cancelled.completion_date, + oaa.alr_application_id, + oaa.cancelled_date + ) first_cancelled.accomplishment_code, + first_cancelled.completion_date, + oaa.alr_application_id, + oaa.cancelled_date + FROM oats.oats_alr_applications oaa + LEFT JOIN first_cancelled_accomplishment_per_file_number AS first_cancelled ON first_cancelled.alr_application_id = oaa.alr_application_id + WHERE oaa.application_class_code IN ('LOA', 'BLK') +), +all_apps_with_cancelled_status AS ( + SELECT oats_cancelled.alr_application_id + FROM cancelled_accomplishments_for_app_only oats_cancelled + JOIN alcs.application_submission apps ON apps.file_number = oats_cancelled.alr_application_id::TEXT + JOIN alcs.application_submission_to_submission_status appstss ON appstss.submission_uuid = apps.uuid + WHERE oats_cancelled.completion_date IS NOT NULL + OR oats_cancelled.cancelled_date IS NOT NULL + GROUP BY oats_cancelled.alr_application_id +) +SELECT count(*) +FROM all_apps_with_cancelled_status; \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/submissions/sql/statuses/application_decision_released.sql b/bin/migrate-oats-data/applications/submissions/sql/statuses/application_decision_released.sql new file mode 100644 index 0000000000..2a68387421 --- /dev/null +++ b/bin/migrate-oats-data/applications/submissions/sql/statuses/application_decision_released.sql @@ -0,0 +1,10 @@ +UPDATE alcs.application_submission_to_submission_status AS app_statuses +SET + effective_date = app.decision_date +FROM + alcs.application AS app + JOIN alcs.application_submission apps ON apps.file_number = app.file_number +WHERE + apps.uuid = app_statuses.submission_uuid + AND app_statuses.status_type_code = 'ALCD' + AND app.decision_date IS NOT NULL; \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/submissions/sql/statuses/application_decision_released_count.sql b/bin/migrate-oats-data/applications/submissions/sql/statuses/application_decision_released_count.sql new file mode 100644 index 0000000000..032fc58978 --- /dev/null +++ b/bin/migrate-oats-data/applications/submissions/sql/statuses/application_decision_released_count.sql @@ -0,0 +1,6 @@ +SELECT + count(*) +FROM + alcs.application_submission_to_submission_status app_statuses +WHERE + app_statuses.status_type_code = 'ALCD'; \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/submissions/sql/statuses/application_returned_incomplete_lfng.sql b/bin/migrate-oats-data/applications/submissions/sql/statuses/application_returned_incomplete_lfng.sql new file mode 100644 index 0000000000..0da08a6447 --- /dev/null +++ b/bin/migrate-oats-data/applications/submissions/sql/statuses/application_returned_incomplete_lfng.sql @@ -0,0 +1,24 @@ +WITH last_lgi_per_file_number AS ( + SELECT alr_application_id, + accomplishment_code, + MAX(oa.completion_date) AS completion_date + FROM oats.oats_accomplishments oa + WHERE accomplishment_code = 'LGI' + GROUP BY alr_application_id, + accomplishment_code +), +returned_lfng_accomplishments_for_app_only AS ( + SELECT last_lgi.accomplishment_code, + last_lgi.completion_date, + oaa.alr_application_id + FROM oats.oats_alr_applications oaa + LEFT JOIN last_lgi_per_file_number AS last_lgi ON last_lgi.alr_application_id = oaa.alr_application_id + WHERE oaa.application_class_code IN ('LOA', 'BLK') +) +SELECT oats_lfng_return.alr_application_id, + oats_lfng_return.accomplishment_code, + oats_lfng_return.completion_date AS max_date, + apps.uuid +FROM returned_lfng_accomplishments_for_app_only oats_lfng_return + JOIN alcs.application_submission apps ON apps.file_number = oats_lfng_return.alr_application_id::TEXT + WHERE oats_lfng_return.accomplishment_code = 'LGI' \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/submissions/sql/statuses/application_returned_incomplete_lfng_count.sql b/bin/migrate-oats-data/applications/submissions/sql/statuses/application_returned_incomplete_lfng_count.sql new file mode 100644 index 0000000000..3eec67616d --- /dev/null +++ b/bin/migrate-oats-data/applications/submissions/sql/statuses/application_returned_incomplete_lfng_count.sql @@ -0,0 +1,21 @@ +WITH last_lgi_per_file_number AS ( + SELECT alr_application_id, + accomplishment_code, + MAX(oa.completion_date) AS completion_date + FROM oats.oats_accomplishments oa + WHERE accomplishment_code = 'LGI' + GROUP BY alr_application_id, + accomplishment_code +), +returned_lfng_accomplishments_for_app_only AS ( + SELECT last_lgi.accomplishment_code, + last_lgi.completion_date, + oaa.alr_application_id + FROM oats.oats_alr_applications oaa + LEFT JOIN last_lgi_per_file_number AS last_lgi ON last_lgi.alr_application_id = oaa.alr_application_id + WHERE oaa.application_class_code IN ('LOA', 'BLK') +) +SELECT count(*) +FROM returned_lfng_accomplishments_for_app_only oats_lfng_return + JOIN alcs.application_submission apps ON apps.file_number = oats_lfng_return.alr_application_id::TEXT + WHERE oats_lfng_return.accomplishment_code = 'LGI' \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/submissions/sql/statuses/application_submitted_to_lfng.sql b/bin/migrate-oats-data/applications/submissions/sql/statuses/application_submitted_to_lfng.sql new file mode 100644 index 0000000000..28f90cc274 --- /dev/null +++ b/bin/migrate-oats-data/applications/submissions/sql/statuses/application_submitted_to_lfng.sql @@ -0,0 +1,44 @@ +WITH submitted_accomplishment_per_file_number AS ( + SELECT alr_application_id, + accomplishment_code, + max(oa.completion_date) AS completion_date + FROM oats.oats_accomplishments oa + WHERE accomplishment_code = 'SLG' + GROUP BY alr_application_id, + accomplishment_code +), +submitted_lg_accomplishments_for_app_only AS ( + SELECT DISTINCT ON ( + last_sub.accomplishment_code, + last_sub.completion_date, + oaa.alr_application_id, + oaa.submitted_to_lg_date + ) last_sub.accomplishment_code, + last_sub.completion_date, + oaa.alr_application_id, + oaa.submitted_to_lg_date + FROM oats.oats_alr_applications oaa + LEFT JOIN submitted_accomplishment_per_file_number AS last_sub ON last_sub.alr_application_id = oaa.alr_application_id + WHERE oaa.application_class_code IN ('LOA', 'BLK') +) +SELECT oats_sub_lg.alr_application_id, + oats_sub_lg.accomplishment_code, + oats_sub_lg.completion_date, + oats_sub_lg.submitted_to_lg_date, + GREATEST( + COALESCE( + oats_sub_lg.completion_date, + oats_sub_lg.submitted_to_lg_date + ), + COALESCE( + oats_sub_lg.submitted_to_lg_date, + oats_sub_lg.completion_date + ) + ) AS max_date, + apps.uuid +FROM submitted_lg_accomplishments_for_app_only oats_sub_lg + JOIN alcs.application_submission apps ON apps.file_number = oats_sub_lg.alr_application_id::TEXT +WHERE ( + oats_sub_lg.completion_date IS NOT NULL + OR oats_sub_lg.submitted_to_lg_date IS NOT NULL + ) \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/submissions/sql/statuses/application_submitted_to_lfng_count.sql b/bin/migrate-oats-data/applications/submissions/sql/statuses/application_submitted_to_lfng_count.sql new file mode 100644 index 0000000000..5839847500 --- /dev/null +++ b/bin/migrate-oats-data/applications/submissions/sql/statuses/application_submitted_to_lfng_count.sql @@ -0,0 +1,48 @@ +WITH submitted_accomplishment_per_file_number AS ( + SELECT alr_application_id, + accomplishment_code, + max(oa.completion_date) AS completion_date + FROM oats.oats_accomplishments oa + WHERE accomplishment_code = 'SLG' + GROUP BY alr_application_id, + accomplishment_code +), +submitted_lg_accomplishments_for_app_only AS ( + SELECT DISTINCT ON ( + last_sub.accomplishment_code, + last_sub.completion_date, + oaa.alr_application_id, + oaa.submitted_to_lg_date + ) last_sub.accomplishment_code, + last_sub.completion_date, + oaa.alr_application_id, + oaa.submitted_to_lg_date + FROM oats.oats_alr_applications oaa + LEFT JOIN submitted_accomplishment_per_file_number AS last_sub ON last_sub.alr_application_id = oaa.alr_application_id + WHERE oaa.application_class_code IN ('LOA', 'BLK') +), +rows_to_update as ( +SELECT oats_sub_lg.alr_application_id, + oats_sub_lg.accomplishment_code, + oats_sub_lg.completion_date, + oats_sub_lg.submitted_to_lg_date, + GREATEST( + COALESCE( + oats_sub_lg.completion_date, + oats_sub_lg.submitted_to_lg_date + ), + COALESCE( + oats_sub_lg.submitted_to_lg_date, + oats_sub_lg.completion_date + ) + ) AS max_date, + apps.uuid +FROM submitted_lg_accomplishments_for_app_only oats_sub_lg + JOIN alcs.application_submission apps ON apps.file_number = oats_sub_lg.alr_application_id::TEXT +WHERE ( + oats_sub_lg.completion_date IS NOT NULL + OR oats_sub_lg.submitted_to_lg_date IS NOT NULL + + ) +) +SELECT count(*) FROM rows_to_update \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/submissions/sql/statuses/application_under_review_lfng.sql b/bin/migrate-oats-data/applications/submissions/sql/statuses/application_under_review_lfng.sql new file mode 100644 index 0000000000..00126e038c --- /dev/null +++ b/bin/migrate-oats-data/applications/submissions/sql/statuses/application_under_review_lfng.sql @@ -0,0 +1,24 @@ +WITH last_review_per_file_number AS ( + SELECT alr_application_id, + accomplishment_code, + MAX(oa.completion_date) AS completion_date + FROM oats.oats_accomplishments oa + WHERE accomplishment_code = 'ULG' + GROUP BY alr_application_id, + accomplishment_code +), +lfng_rev_accomplishments_for_app_only AS ( + SELECT last_rev.accomplishment_code, + last_rev.completion_date, + oaa.alr_application_id + FROM oats.oats_alr_applications oaa + LEFT JOIN last_review_per_file_number AS last_rev ON last_rev.alr_application_id = oaa.alr_application_id + WHERE oaa.application_class_code IN ('LOA', 'BLK') +) +SELECT oats_lfng_rev.alr_application_id, + oats_lfng_rev.accomplishment_code, + oats_lfng_rev.completion_date AS max_date, + apps.uuid +FROM lfng_rev_accomplishments_for_app_only oats_lfng_rev + JOIN alcs.application_submission apps ON apps.file_number = oats_lfng_rev.alr_application_id::TEXT + WHERE oats_lfng_rev.accomplishment_code = 'ULG' diff --git a/bin/migrate-oats-data/applications/submissions/sql/statuses/application_under_review_lfng_count.sql b/bin/migrate-oats-data/applications/submissions/sql/statuses/application_under_review_lfng_count.sql new file mode 100644 index 0000000000..412a1322d7 --- /dev/null +++ b/bin/migrate-oats-data/applications/submissions/sql/statuses/application_under_review_lfng_count.sql @@ -0,0 +1,21 @@ +WITH last_review_per_file_number AS ( + SELECT alr_application_id, + accomplishment_code, + MAX(oa.completion_date) AS completion_date + FROM oats.oats_accomplishments oa + WHERE accomplishment_code = 'ULG' + GROUP BY alr_application_id, + accomplishment_code +), +lfng_rev_accomplishments_for_app_only AS ( + SELECT last_rev.accomplishment_code, + last_rev.completion_date, + oaa.alr_application_id + FROM oats.oats_alr_applications oaa + LEFT JOIN last_review_per_file_number AS last_rev ON last_rev.alr_application_id = oaa.alr_application_id + WHERE oaa.application_class_code IN ('LOA', 'BLK') +) +SELECT count(*) +FROM lfng_rev_accomplishments_for_app_only oats_lfng_rev + JOIN alcs.application_submission apps ON apps.file_number = oats_lfng_rev.alr_application_id::TEXT + WHERE oats_lfng_rev.accomplishment_code = 'ULG' diff --git a/bin/migrate-oats-data/applications/submissions/sql/statuses/application_wrong_lfng.sql b/bin/migrate-oats-data/applications/submissions/sql/statuses/application_wrong_lfng.sql new file mode 100644 index 0000000000..8d64f68a85 --- /dev/null +++ b/bin/migrate-oats-data/applications/submissions/sql/statuses/application_wrong_lfng.sql @@ -0,0 +1,24 @@ +WITH last_wlg_per_file_number AS ( + SELECT alr_application_id, + accomplishment_code, + MAX(oa.completion_date) AS completion_date + FROM oats.oats_accomplishments oa + WHERE accomplishment_code = 'WLG' + GROUP BY alr_application_id, + accomplishment_code +), +wrong_lfng_accomplishments_for_app_only AS ( + SELECT last_wlg.accomplishment_code, + last_wlg.completion_date, + oaa.alr_application_id + FROM oats.oats_alr_applications oaa + LEFT JOIN last_wlg_per_file_number AS last_wlg ON last_wlg.alr_application_id = oaa.alr_application_id + WHERE oaa.application_class_code IN ('LOA', 'BLK') +) +SELECT oats_lfng_wrong.alr_application_id, + oats_lfng_wrong.accomplishment_code, + oats_lfng_wrong.completion_date AS max_date, + apps.uuid +FROM wrong_lfng_accomplishments_for_app_only oats_lfng_wrong + JOIN alcs.application_submission apps ON apps.file_number = oats_lfng_wrong.alr_application_id::TEXT + WHERE oats_lfng_wrong.accomplishment_code = 'WLG' \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/submissions/sql/statuses/application_wrong_lfng_count.sql b/bin/migrate-oats-data/applications/submissions/sql/statuses/application_wrong_lfng_count.sql new file mode 100644 index 0000000000..6530124946 --- /dev/null +++ b/bin/migrate-oats-data/applications/submissions/sql/statuses/application_wrong_lfng_count.sql @@ -0,0 +1,21 @@ +WITH last_wlg_per_file_number AS ( + SELECT alr_application_id, + accomplishment_code, + MAX(oa.completion_date) AS completion_date + FROM oats.oats_accomplishments oa + WHERE accomplishment_code = 'WLG' + GROUP BY alr_application_id, + accomplishment_code +), +wrong_lfng_accomplishments_for_app_only AS ( + SELECT last_wlg.accomplishment_code, + last_wlg.completion_date, + oaa.alr_application_id + FROM oats.oats_alr_applications oaa + LEFT JOIN last_wlg_per_file_number AS last_wlg ON last_wlg.alr_application_id = oaa.alr_application_id + WHERE oaa.application_class_code IN ('LOA', 'BLK') +) +SELECT count(*) +FROM wrong_lfng_accomplishments_for_app_only oats_lfng_wrong + JOIN alcs.application_submission apps ON apps.file_number = oats_lfng_wrong.alr_application_id::TEXT + WHERE oats_lfng_wrong.accomplishment_code = 'WLG' diff --git a/bin/migrate-oats-data/applications/submissions/sql/statuses/init_app_submission_status_batch.sql b/bin/migrate-oats-data/applications/submissions/sql/statuses/init_app_submission_status_batch.sql index 87e8ea8ae2..a868ae7c05 100644 --- a/bin/migrate-oats-data/applications/submissions/sql/statuses/init_app_submission_status_batch.sql +++ b/bin/migrate-oats-data/applications/submissions/sql/statuses/init_app_submission_status_batch.sql @@ -24,7 +24,7 @@ alcs_submission_uuids_to_populate AS ( WHERE alcs_submissions_with_statuses.file_number IS NULL -- filter out all submissions that have statuses populated before the ETL; ) SELECT asup.alr_application_id, - apsst.code AS sscode, + --apsst.code AS sscode, asup.uuid FROM alcs_submission_uuids_to_populate asup - CROSS JOIN alcs.application_submission_status_type apsst \ No newline at end of file + --CROSS JOIN alcs.application_submission_status_type apsst \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/submissions/statuses/__init__.py b/bin/migrate-oats-data/applications/submissions/statuses/__init__.py index 62ac0a40b8..ba01d767ab 100644 --- a/bin/migrate-oats-data/applications/submissions/statuses/__init__.py +++ b/bin/migrate-oats-data/applications/submissions/statuses/__init__.py @@ -1,7 +1,6 @@ from .application_status_base_insert import ( init_application_statuses, clean_application_submission_statuses, - batch_application_statuses, ) from .application_status_in_progress import process_alcs_application_in_progress_status from .application_status_rec_alc import process_alcs_application_received_by_alc_status @@ -11,3 +10,16 @@ from .application_status_submitted_incomplete_alc import ( process_alcs_application_submitted_to_alc_incomplete_status, ) +from .application_status_descision_released import ( + process_alcs_application_decision_released_status, +) +from .application_status_batch_insert import batch_application_statuses +from .application_status_cancelled import process_alcs_application_cancelled_status +from .application_status_review_lfng import process_alcs_application_review_lfng_status +from .application_status_wrong_lfng import process_alcs_application_wrong_lfng_status +from .application_status_returned_incomplete_lfng import ( + process_alcs_application_returned_incomplete_lfng_status, +) +from .application_status_submitted_lfng import ( + process_alcs_application_submitted_lfng_status, +) diff --git a/bin/migrate-oats-data/applications/submissions/statuses/application_status_base_insert.py b/bin/migrate-oats-data/applications/submissions/statuses/application_status_base_insert.py index 467292c3d8..cc173fe060 100644 --- a/bin/migrate-oats-data/applications/submissions/statuses/application_status_base_insert.py +++ b/bin/migrate-oats-data/applications/submissions/statuses/application_status_base_insert.py @@ -1,6 +1,7 @@ from common import OATS_ETL_USER, setup_and_get_logger, BATCH_UPLOAD_SIZE from db import inject_conn_pool -from psycopg2.extras import RealDictCursor, execute_batch +from psycopg2.extras import RealDictCursor +from .application_status_type_code import * etl_name = "init_application_statuses" logger = setup_and_get_logger(etl_name) @@ -65,91 +66,3 @@ def clean_application_submission_statuses(conn=None): logger.info(f"Deleted items count = {cursor.rowcount}") conn.commit() - - -@inject_conn_pool -def batch_application_statuses(conn=None, batch_size=BATCH_UPLOAD_SIZE): - """ - This function is responsible for initializing application statuses. - Initializing means inserting status_to_submission record without the effective_date. - - Args: - conn (psycopg2.extensions.connection): PostgreSQL database connection. Provided by the decorator. - batch_size (int): The number of items to process at once. Defaults to BATCH_UPLOAD_SIZE. - """ - logger.info(f"Start {etl_name}") - with conn.cursor(cursor_factory=RealDictCursor) as cursor: - with open( - "applications/submissions/sql/statuses/init_app_submission_status_count.sql", - "r", - encoding="utf-8", - ) as sql_file: - count_query = sql_file.read() - cursor.execute(count_query) - count_total = dict(cursor.fetchone())["count"] - logger.info(f"Total Application data to insert: {count_total}") - print(count_total) - failed_inserts = 0 - successful_inserts_count = 0 - last_application_id = 0 - # mod_batch allows batching to work at the closest integer division of 12 which is the number of unique status types in alcs applications - mod_batch = batch_size // 12 - mod_batch = mod_batch * 12 - with open( - "applications/submissions/sql/statuses/init_app_submission_status_batch.sql", - "r", - encoding="utf-8", - ) as sql_file: - query = sql_file.read() - while True: - cursor.execute( - f"{query} WHERE asup.alr_application_id > {last_application_id} ORDER by asup.alr_application_id;" - ) - rows = cursor.fetchmany(mod_batch) - if not rows: - break - try: - applications_to_be_inserted_count = len(rows) - - _get_insert_query(cursor, rows, mod_batch, conn) - conn.commit() - last_application_id = dict(rows[-1])["alr_application_id"] - successful_inserts_count = ( - successful_inserts_count + applications_to_be_inserted_count - ) - - logger.info( - f"retrieved/inserted items count: {applications_to_be_inserted_count}; total successfully inserted/updated applications so far {successful_inserts_count}; last inserted applidation_id: {last_application_id}" - ) - except Exception as err: - logger.exception() - conn.rollback() - failed_inserts = count_total - successful_inserts_count - last_application_id = last_application_id + 1 - - logger.info( - f"Finished {etl_name}: total amount of successful inserts {successful_inserts_count}, total failed updates {failed_inserts}" - ) - - -def _get_insert_query(cursor, rows, batch_size, conn): - execute_batch( - cursor, - _insert_query(), - rows, - page_size=batch_size, - ) - - -def _insert_query(): - query = """ - INSERT INTO alcs.application_submission_to_submission_status ( - submission_uuid, - status_type_code - ) - VALUES ( - %(uuid)s, - %(sscode)s - ) - """ - return query diff --git a/bin/migrate-oats-data/applications/submissions/statuses/application_status_batch_insert.py b/bin/migrate-oats-data/applications/submissions/statuses/application_status_batch_insert.py new file mode 100644 index 0000000000..4857579e8c --- /dev/null +++ b/bin/migrate-oats-data/applications/submissions/statuses/application_status_batch_insert.py @@ -0,0 +1,103 @@ +from common import OATS_ETL_USER, setup_and_get_logger, BATCH_UPLOAD_SIZE +from db import inject_conn_pool +from psycopg2.extras import RealDictCursor, execute_batch +from .application_status_type_code import * + +etl_name = "init_application_statuses_batch" +logger = setup_and_get_logger(etl_name) + + +@inject_conn_pool +def batch_application_statuses(conn=None, batch_size=BATCH_UPLOAD_SIZE): + print("enter sandman") + """ + This function is responsible for initializing application statuses. + Initializing means inserting status_to_submission record without the effective_date. + + Args: + conn (psycopg2.extensions.connection): PostgreSQL database connection. Provided by the decorator. + batch_size (int): The number of items to process at once. Defaults to BATCH_UPLOAD_SIZE. + """ + logger.info(f"Start {etl_name}") + with conn.cursor(cursor_factory=RealDictCursor) as cursor: + with open( + "applications/submissions/sql/statuses/init_app_submission_status_count.sql", + "r", + encoding="utf-8", + ) as sql_file: + count_query = sql_file.read() + cursor.execute(count_query) + count_total = dict(cursor.fetchone())["count"] + logger.info(f"Total Application data to insert: {count_total}") + print(count_total) + app_status_type = get_app_status_type(cursor) + app_status_count = get_app_status_count(cursor) + print(app_status_count, app_status_type) + failed_inserts = 0 + successful_inserts_count = 0 + last_application_id = 0 + # mod_batch allows batching to work at the closest integer division of 12 which is the number of unique status types in alcs applications + mod_batch = batch_size // 12 + mod_batch = mod_batch * 12 + with open( + "applications/submissions/sql/statuses/init_app_submission_status_batch.sql", + "r", + encoding="utf-8", + ) as sql_file: + query = sql_file.read() + while True: + cursor.execute( + f"{query} WHERE asup.alr_application_id > {last_application_id} ORDER by asup.alr_application_id;" + ) + rows = cursor.fetchmany(mod_batch) + if not rows: + break + try: + applications_to_be_inserted_count = len(rows) + insert_data = make_rows(app_status_type, rows) + page_length = len(insert_data) + _get_insert_query(cursor, insert_data) + conn.commit() + last_application_id = dict(rows[-1])["alr_application_id"] + successful_inserts_count = ( + successful_inserts_count + applications_to_be_inserted_count + ) + + logger.info( + f"retrieved/inserted items count: {applications_to_be_inserted_count}; total successfully inserted/updated applications so far {successful_inserts_count}; last inserted applidation_id: {last_application_id}" + ) + except Exception as err: + logger.exception() + conn.rollback() + failed_inserts = count_total - successful_inserts_count + last_application_id = last_application_id + 1 + + logger.info( + f"Finished {etl_name}: total amount of successful inserts {successful_inserts_count}, total failed updates {failed_inserts}" + ) + + +def _get_insert_query(cursor, data): + data_rows = [] + for row in data: + print(len(data_rows)) + execute_batch( + cursor, + _insert_query(), + data_rows, + page_size=len(data_rows), + ) + + +def _insert_query(): + query = """ + INSERT INTO alcs.application_submission_to_submission_status ( + submission_uuid, + status_type_code + ) + VALUES ( + %(submission_uuid)s, + %(status_type_code)s + ) + """ + return query diff --git a/bin/migrate-oats-data/applications/submissions/statuses/application_status_cancelled.py b/bin/migrate-oats-data/applications/submissions/statuses/application_status_cancelled.py new file mode 100644 index 0000000000..19762b5a4d --- /dev/null +++ b/bin/migrate-oats-data/applications/submissions/statuses/application_status_cancelled.py @@ -0,0 +1,115 @@ +from common import BATCH_UPLOAD_SIZE, setup_and_get_logger, convert_timezone, set_time +from db import inject_conn_pool +from psycopg2.extras import RealDictCursor, execute_batch + +etl_name = "process_alcs_application_cancelled_status" +logger = setup_and_get_logger(etl_name) + + +@inject_conn_pool +def process_alcs_application_cancelled_status(conn=None, batch_size=BATCH_UPLOAD_SIZE): + """ + This function is responsible for populating Cancelled status of Applications in ALCS. + + Args: + conn (psycopg2.extensions.connection): PostgreSQL database connection. Provided by the decorator. + batch_size (int): The number of items to process at once. Defaults to BATCH_UPLOAD_SIZE. + """ + + logger.info(f"Start {etl_name}") + with conn.cursor(cursor_factory=RealDictCursor) as cursor: + with open( + "applications/submissions/sql/statuses/application_cancelled_count.sql", + "r", + encoding="utf-8", + ) as sql_file: + count_query = sql_file.read() + cursor.execute(count_query) + count_total = dict(cursor.fetchone())["count"] + logger.info(f"Total Applications data to update: {count_total}") + + failed_updates = 0 + successful_updates_count = 0 + last_application_id = 0 + + with open( + "applications/submissions/sql/statuses/application_cancelled.sql", + "r", + encoding="utf-8", + ) as sql_file: + application_sql = sql_file.read() + while True: + cursor.execute( + f"{application_sql} AND oats_cancelled.alr_application_id > {last_application_id} ORDER BY oats_cancelled.alr_application_id;" + ) + + rows = cursor.fetchmany(batch_size) + + if not rows: + break + try: + records_to_be_updated_count = len(rows) + + _update_records(conn, batch_size, cursor, rows) + + successful_updates_count = ( + successful_updates_count + records_to_be_updated_count + ) + last_application_id = dict(rows[-1])["alr_application_id"] + + logger.debug( + f"retrieved/updated items count: {records_to_be_updated_count}; total successfully updated applications so far {successful_updates_count}; last updated alr_application_id: {last_application_id}" + ) + except Exception as err: + # this is NOT going to be caused by actual data update failure. This code is only executed when the code error appears or connection to DB is lost + logger.exception() + conn.rollback() + failed_updates = count_total - successful_updates_count + last_application_id = last_application_id + 1 + + logger.info( + f"Finished {etl_name}: total amount of successful updates {successful_updates_count}, total failed updates {failed_updates}" + ) + + +def _update_records(conn, batch_size, cursor, rows): + parsed_data_list = _prepare_oats_data(rows) + + if len(parsed_data_list) > 0: + execute_batch( + cursor, + _update_query, + parsed_data_list, + page_size=batch_size, + ) + + conn.commit() + + +_update_query = """ + UPDATE alcs.application_submission_to_submission_status + SET effective_date = %(date)s + WHERE submission_uuid = %(uuid)s and status_type_code = 'CANC' +""" + + +def _prepare_oats_data(row_data_list): + data_list = [] + for row in row_data_list: + data = _map_fields(dict(row)) + data_list.append(data) + return data_list + + +def _map_fields(data): + status_effective_date = None + data["date"] = None + + if data and data.get("min_date", None): + status_effective_date = data["min_date"] + + if status_effective_date: + date = convert_timezone(status_effective_date, "US/Pacific") + data["date"] = set_time(date) + + return data diff --git a/bin/migrate-oats-data/applications/submissions/statuses/application_status_descision_released.py b/bin/migrate-oats-data/applications/submissions/statuses/application_status_descision_released.py new file mode 100644 index 0000000000..f48515f6de --- /dev/null +++ b/bin/migrate-oats-data/applications/submissions/statuses/application_status_descision_released.py @@ -0,0 +1,56 @@ +from common import setup_and_get_logger +from db import inject_conn_pool +from psycopg2.extras import RealDictCursor + + +etl_name = "process_alcs_application_decision_released_status" +logger = setup_and_get_logger(etl_name) + + +@inject_conn_pool +def process_alcs_application_decision_released_status(conn=None): + """ + This function is responsible for populating Decision Released status of Application in ALCS. + This function does not use batch since update happens in scope of the same schema + + Args: + conn (psycopg2.extensions.connection): PostgreSQL database connection. Provided by the decorator. + """ + + logger.info(f"Start {etl_name}") + with conn.cursor(cursor_factory=RealDictCursor) as cursor: + with open( + "applications/submissions/sql/statuses/application_decision_released_count.sql", + "r", + encoding="utf-8", + ) as sql_file: + count_query = sql_file.read() + cursor.execute(count_query) + count_total = dict(cursor.fetchone())["count"] + logger.info(f"Total Application data to update: {count_total}") + + successful_updates_count = 0 + failed_updates = 0 + + with open( + "applications/submissions/sql/statuses/application_decision_released.sql", + "r", + encoding="utf-8", + ) as sql_file: + update_sql = sql_file.read() + + try: + cursor.execute(update_sql) + conn.commit() + + successful_updates_count = cursor.rowcount + + except Exception as err: + # this is NOT going to be caused by actual data update failure. This code is only executed when the code error appears or connection to DB is lost + logger.exception(err) + conn.rollback() + failed_updates = count_total - successful_updates_count + + logger.info( + f"Finished {etl_name}: total amount of successful updates {successful_updates_count}, total failed updates {failed_updates}" + ) diff --git a/bin/migrate-oats-data/applications/submissions/statuses/application_status_returned_incomplete_lfng.py b/bin/migrate-oats-data/applications/submissions/statuses/application_status_returned_incomplete_lfng.py new file mode 100644 index 0000000000..cb0f08d12b --- /dev/null +++ b/bin/migrate-oats-data/applications/submissions/statuses/application_status_returned_incomplete_lfng.py @@ -0,0 +1,117 @@ +from common import BATCH_UPLOAD_SIZE, setup_and_get_logger, convert_timezone, set_time +from db import inject_conn_pool +from psycopg2.extras import RealDictCursor, execute_batch + +etl_name = "process_alcs_application_returned_incomplete_lfng_status" +logger = setup_and_get_logger(etl_name) + + +@inject_conn_pool +def process_alcs_application_returned_incomplete_lfng_status( + conn=None, batch_size=BATCH_UPLOAD_SIZE +): + """ + This function is responsible for populating LFN/G Returned Incomplete status of Applications in ALCS. + + Args: + conn (psycopg2.extensions.connection): PostgreSQL database connection. Provided by the decorator. + batch_size (int): The number of items to process at once. Defaults to BATCH_UPLOAD_SIZE. + """ + + logger.info(f"Start {etl_name}") + with conn.cursor(cursor_factory=RealDictCursor) as cursor: + with open( + "applications/submissions/sql/statuses/application_returned_incomplete_lfng_count.sql", + "r", + encoding="utf-8", + ) as sql_file: + count_query = sql_file.read() + cursor.execute(count_query) + count_total = dict(cursor.fetchone())["count"] + logger.info(f"Total Applications data to update: {count_total}") + + failed_updates = 0 + successful_updates_count = 0 + last_application_id = 0 + + with open( + "applications/submissions/sql/statuses/application_returned_incomplete_lfng.sql", + "r", + encoding="utf-8", + ) as sql_file: + application_sql = sql_file.read() + while True: + cursor.execute( + f"{application_sql} AND oats_lfng_return.alr_application_id > {last_application_id} ORDER BY oats_lfng_return.alr_application_id;" + ) + + rows = cursor.fetchmany(batch_size) + + if not rows: + break + try: + records_to_be_updated_count = len(rows) + + _update_records(conn, batch_size, cursor, rows) + + successful_updates_count = ( + successful_updates_count + records_to_be_updated_count + ) + last_application_id = dict(rows[-1])["alr_application_id"] + + logger.debug( + f"retrieved/updated items count: {records_to_be_updated_count}; total successfully updated applications so far {successful_updates_count}; last updated alr_application_id: {last_application_id}" + ) + except Exception as err: + # this is NOT going to be caused by actual data update failure. This code is only executed when the code error appears or connection to DB is lost + logger.exception() + conn.rollback() + failed_updates = count_total - successful_updates_count + last_application_id = last_application_id + 1 + + logger.info( + f"Finished {etl_name}: total amount of successful updates {successful_updates_count}, total failed updates {failed_updates}" + ) + + +def _update_records(conn, batch_size, cursor, rows): + parsed_data_list = _prepare_oats_data(rows) + + if len(parsed_data_list) > 0: + execute_batch( + cursor, + _update_query, + parsed_data_list, + page_size=batch_size, + ) + + conn.commit() + + +_update_query = """ + UPDATE alcs.application_submission_to_submission_status + SET effective_date = %(date)s + WHERE submission_uuid = %(uuid)s and status_type_code = 'INCM' +""" + + +def _prepare_oats_data(row_data_list): + data_list = [] + for row in row_data_list: + data = _map_fields(dict(row)) + data_list.append(data) + return data_list + + +def _map_fields(data): + status_effective_date = None + data["date"] = None + + if data and data.get("max_date", None): + status_effective_date = data["max_date"] + + if status_effective_date: + date = convert_timezone(status_effective_date, "US/Pacific") + data["date"] = set_time(date) + + return data diff --git a/bin/migrate-oats-data/applications/submissions/statuses/application_status_review_lfng.py b/bin/migrate-oats-data/applications/submissions/statuses/application_status_review_lfng.py new file mode 100644 index 0000000000..ab3941cf44 --- /dev/null +++ b/bin/migrate-oats-data/applications/submissions/statuses/application_status_review_lfng.py @@ -0,0 +1,117 @@ +from common import BATCH_UPLOAD_SIZE, setup_and_get_logger, convert_timezone, set_time +from db import inject_conn_pool +from psycopg2.extras import RealDictCursor, execute_batch + +etl_name = "process_alcs_application_review_lfng_status" +logger = setup_and_get_logger(etl_name) + + +@inject_conn_pool +def process_alcs_application_review_lfng_status( + conn=None, batch_size=BATCH_UPLOAD_SIZE +): + """ + This function is responsible for populating Under Review by LFN/G status of Applications in ALCS. + + Args: + conn (psycopg2.extensions.connection): PostgreSQL database connection. Provided by the decorator. + batch_size (int): The number of items to process at once. Defaults to BATCH_UPLOAD_SIZE. + """ + + logger.info(f"Start {etl_name}") + with conn.cursor(cursor_factory=RealDictCursor) as cursor: + with open( + "applications/submissions/sql/statuses/application_under_review_lfng_count.sql", + "r", + encoding="utf-8", + ) as sql_file: + count_query = sql_file.read() + cursor.execute(count_query) + count_total = dict(cursor.fetchone())["count"] + logger.info(f"Total Applications data to update: {count_total}") + + failed_updates = 0 + successful_updates_count = 0 + last_application_id = 0 + + with open( + "applications/submissions/sql/statuses/application_under_review_lfng.sql", + "r", + encoding="utf-8", + ) as sql_file: + application_sql = sql_file.read() + while True: + cursor.execute( + f"{application_sql} AND oats_lfng_rev.alr_application_id > {last_application_id} ORDER BY oats_lfng_rev.alr_application_id;" + ) + + rows = cursor.fetchmany(batch_size) + + if not rows: + break + try: + records_to_be_updated_count = len(rows) + + _update_records(conn, batch_size, cursor, rows) + + successful_updates_count = ( + successful_updates_count + records_to_be_updated_count + ) + last_application_id = dict(rows[-1])["alr_application_id"] + + logger.debug( + f"retrieved/updated items count: {records_to_be_updated_count}; total successfully updated applications so far {successful_updates_count}; last updated alr_application_id: {last_application_id}" + ) + except Exception as err: + # this is NOT going to be caused by actual data update failure. This code is only executed when the code error appears or connection to DB is lost + logger.exception() + conn.rollback() + failed_updates = count_total - successful_updates_count + last_application_id = last_application_id + 1 + + logger.info( + f"Finished {etl_name}: total amount of successful updates {successful_updates_count}, total failed updates {failed_updates}" + ) + + +def _update_records(conn, batch_size, cursor, rows): + parsed_data_list = _prepare_oats_data(rows) + + if len(parsed_data_list) > 0: + execute_batch( + cursor, + _update_query, + parsed_data_list, + page_size=batch_size, + ) + + conn.commit() + + +_update_query = """ + UPDATE alcs.application_submission_to_submission_status + SET effective_date = %(date)s + WHERE submission_uuid = %(uuid)s and status_type_code = 'REVG' +""" + + +def _prepare_oats_data(row_data_list): + data_list = [] + for row in row_data_list: + data = _map_fields(dict(row)) + data_list.append(data) + return data_list + + +def _map_fields(data): + status_effective_date = None + data["date"] = None + + if data and data.get("max_date", None): + status_effective_date = data["max_date"] + + if status_effective_date: + date = convert_timezone(status_effective_date, "US/Pacific") + data["date"] = set_time(date) + + return data diff --git a/bin/migrate-oats-data/applications/submissions/statuses/application_status_submitted_alc.py b/bin/migrate-oats-data/applications/submissions/statuses/application_status_submitted_alc.py index 604dcba42a..3a30e44950 100644 --- a/bin/migrate-oats-data/applications/submissions/statuses/application_status_submitted_alc.py +++ b/bin/migrate-oats-data/applications/submissions/statuses/application_status_submitted_alc.py @@ -17,7 +17,6 @@ def process_alcs_application_submitted_to_alc_status( conn (psycopg2.extensions.connection): PostgreSQL database connection. Provided by the decorator. batch_size (int): The number of items to process at once. Defaults to BATCH_UPLOAD_SIZE. """ - print("alc status?") logger.info(f"Start {etl_name}") with conn.cursor(cursor_factory=RealDictCursor) as cursor: with open( diff --git a/bin/migrate-oats-data/applications/submissions/statuses/application_status_submitted_lfng.py b/bin/migrate-oats-data/applications/submissions/statuses/application_status_submitted_lfng.py new file mode 100644 index 0000000000..ffd3cef979 --- /dev/null +++ b/bin/migrate-oats-data/applications/submissions/statuses/application_status_submitted_lfng.py @@ -0,0 +1,117 @@ +from common import BATCH_UPLOAD_SIZE, setup_and_get_logger, convert_timezone, set_time +from db import inject_conn_pool +from psycopg2.extras import RealDictCursor, execute_batch + +etl_name = "process_alcs_application_submitted_lfng_status" +logger = setup_and_get_logger(etl_name) + + +@inject_conn_pool +def process_alcs_application_submitted_lfng_status( + conn=None, batch_size=BATCH_UPLOAD_SIZE +): + """ + This function is responsible for populating Submitted to LFN/G status of Applications in ALCS. + + Args: + conn (psycopg2.extensions.connection): PostgreSQL database connection. Provided by the decorator. + batch_size (int): The number of items to process at once. Defaults to BATCH_UPLOAD_SIZE. + """ + + logger.info(f"Start {etl_name}") + with conn.cursor(cursor_factory=RealDictCursor) as cursor: + with open( + "applications/submissions/sql/statuses/application_submitted_to_lfng_count.sql", + "r", + encoding="utf-8", + ) as sql_file: + count_query = sql_file.read() + cursor.execute(count_query) + count_total = dict(cursor.fetchone())["count"] + logger.info(f"Total Applications data to update: {count_total}") + + failed_updates = 0 + successful_updates_count = 0 + last_application_id = 0 + + with open( + "applications/submissions/sql/statuses/application_submitted_to_lfng.sql", + "r", + encoding="utf-8", + ) as sql_file: + application_sql = sql_file.read() + while True: + cursor.execute( + f"{application_sql} AND oats_sub_lg.alr_application_id > {last_application_id} ORDER BY oats_sub_lg.alr_application_id;" + ) + + rows = cursor.fetchmany(batch_size) + + if not rows: + break + try: + records_to_be_updated_count = len(rows) + + _update_records(conn, batch_size, cursor, rows) + + successful_updates_count = ( + successful_updates_count + records_to_be_updated_count + ) + last_application_id = dict(rows[-1])["alr_application_id"] + + logger.debug( + f"retrieved/updated items count: {records_to_be_updated_count}; total successfully updated applications so far {successful_updates_count}; last updated alr_application_id: {last_application_id}" + ) + except Exception as err: + # this is NOT going to be caused by actual data update failure. This code is only executed when the code error appears or connection to DB is lost + logger.exception() + conn.rollback() + failed_updates = count_total - successful_updates_count + last_application_id = last_application_id + 1 + + logger.info( + f"Finished {etl_name}: total amount of successful updates {successful_updates_count}, total failed updates {failed_updates}" + ) + + +def _update_records(conn, batch_size, cursor, rows): + parsed_data_list = _prepare_oats_data(rows) + + if len(parsed_data_list) > 0: + execute_batch( + cursor, + _update_query, + parsed_data_list, + page_size=batch_size, + ) + + conn.commit() + + +_update_query = """ + UPDATE alcs.application_submission_to_submission_status + SET effective_date = %(date)s + WHERE submission_uuid = %(uuid)s and status_type_code = 'SUBG' +""" + + +def _prepare_oats_data(row_data_list): + data_list = [] + for row in row_data_list: + data = _map_fields(dict(row)) + data_list.append(data) + return data_list + + +def _map_fields(data): + status_effective_date = None + data["date"] = None + + if data and data.get("max_date", None): + status_effective_date = data["max_date"] + + if status_effective_date: + date = convert_timezone(status_effective_date, "US/Pacific") + data["date"] = set_time(date) + + return data diff --git a/bin/migrate-oats-data/applications/submissions/statuses/application_status_type_code.py b/bin/migrate-oats-data/applications/submissions/statuses/application_status_type_code.py new file mode 100644 index 0000000000..3cf9696563 --- /dev/null +++ b/bin/migrate-oats-data/applications/submissions/statuses/application_status_type_code.py @@ -0,0 +1,35 @@ +def get_app_status_type(cursor): + query = f"""SELECT code from + alcs.application_submission_status_type + """ + cursor.execute(query) + status_rows = cursor.fetchall() + return status_rows + + +def get_app_status_count(cursor): + query = f"""SELECT count(*) from + alcs.application_submission_status_type + """ + cursor.execute(query) + count_rows = cursor.fetchall() + return count_rows + + +def make_rows(types, rows): + alr_id = "alr_application_id" + type_dict = {} + for row in rows: + for stat in types: + app_id = row[alr_id] + if app_id in type_dict: + type_dict[app_id].append( + {"status_type_code": stat["code"], "submission_uuid": row["uuid"]} + ) + + else: + type_dict[app_id] = [] + type_dict[app_id].append( + {"status_type_code": stat["code"], "submission_uuid": row["uuid"]} + ) + return type_dict diff --git a/bin/migrate-oats-data/applications/submissions/statuses/application_status_wrong_lfng.py b/bin/migrate-oats-data/applications/submissions/statuses/application_status_wrong_lfng.py new file mode 100644 index 0000000000..c8583ae185 --- /dev/null +++ b/bin/migrate-oats-data/applications/submissions/statuses/application_status_wrong_lfng.py @@ -0,0 +1,115 @@ +from common import BATCH_UPLOAD_SIZE, setup_and_get_logger, convert_timezone, set_time +from db import inject_conn_pool +from psycopg2.extras import RealDictCursor, execute_batch + +etl_name = "process_alcs_application_wrong_lfng_status" +logger = setup_and_get_logger(etl_name) + + +@inject_conn_pool +def process_alcs_application_wrong_lfng_status(conn=None, batch_size=BATCH_UPLOAD_SIZE): + """ + This function is responsible for populating Wrong LFN/G status of Applications in ALCS. + + Args: + conn (psycopg2.extensions.connection): PostgreSQL database connection. Provided by the decorator. + batch_size (int): The number of items to process at once. Defaults to BATCH_UPLOAD_SIZE. + """ + + logger.info(f"Start {etl_name}") + with conn.cursor(cursor_factory=RealDictCursor) as cursor: + with open( + "applications/submissions/sql/statuses/application_wrong_lfng_count.sql", + "r", + encoding="utf-8", + ) as sql_file: + count_query = sql_file.read() + cursor.execute(count_query) + count_total = dict(cursor.fetchone())["count"] + logger.info(f"Total Applications data to update: {count_total}") + + failed_updates = 0 + successful_updates_count = 0 + last_application_id = 0 + + with open( + "applications/submissions/sql/statuses/application_wrong_lfng.sql", + "r", + encoding="utf-8", + ) as sql_file: + application_sql = sql_file.read() + while True: + cursor.execute( + f"{application_sql} AND oats_lfng_wrong.alr_application_id > {last_application_id} ORDER BY oats_lfng_wrong.alr_application_id;" + ) + + rows = cursor.fetchmany(batch_size) + + if not rows: + break + try: + records_to_be_updated_count = len(rows) + + _update_records(conn, batch_size, cursor, rows) + + successful_updates_count = ( + successful_updates_count + records_to_be_updated_count + ) + last_application_id = dict(rows[-1])["alr_application_id"] + + logger.debug( + f"retrieved/updated items count: {records_to_be_updated_count}; total successfully updated applications so far {successful_updates_count}; last updated alr_application_id: {last_application_id}" + ) + except Exception as err: + # this is NOT going to be caused by actual data update failure. This code is only executed when the code error appears or connection to DB is lost + logger.exception() + conn.rollback() + failed_updates = count_total - successful_updates_count + last_application_id = last_application_id + 1 + + logger.info( + f"Finished {etl_name}: total amount of successful updates {successful_updates_count}, total failed updates {failed_updates}" + ) + + +def _update_records(conn, batch_size, cursor, rows): + parsed_data_list = _prepare_oats_data(rows) + + if len(parsed_data_list) > 0: + execute_batch( + cursor, + _update_query, + parsed_data_list, + page_size=batch_size, + ) + + conn.commit() + + +_update_query = """ + UPDATE alcs.application_submission_to_submission_status + SET effective_date = %(date)s + WHERE submission_uuid = %(uuid)s and status_type_code = 'WRNG' +""" + + +def _prepare_oats_data(row_data_list): + data_list = [] + for row in row_data_list: + data = _map_fields(dict(row)) + data_list.append(data) + return data_list + + +def _map_fields(data): + status_effective_date = None + data["date"] = None + + if data and data.get("max_date", None): + status_effective_date = data["max_date"] + + if status_effective_date: + date = convert_timezone(status_effective_date, "US/Pacific") + data["date"] = set_time(date) + + return data diff --git a/bin/migrate-oats-data/menu/commands/applications.py b/bin/migrate-oats-data/menu/commands/applications.py index 2df5be561b..ec19c9d8c7 100644 --- a/bin/migrate-oats-data/menu/commands/applications.py +++ b/bin/migrate-oats-data/menu/commands/applications.py @@ -8,6 +8,12 @@ process_alcs_application_submitted_to_alc_status, batch_application_statuses, process_alcs_application_submitted_to_alc_incomplete_status, + process_alcs_application_decision_released_status, + process_alcs_application_cancelled_status, + process_alcs_application_review_lfng_status, + process_alcs_application_wrong_lfng_status, + process_alcs_application_returned_incomplete_lfng_status, + process_alcs_application_submitted_lfng_status, ) @@ -72,3 +78,11 @@ def application_status_import(console, args): process_alcs_application_submitted_to_alc_incomplete_status( batch_size=import_batch_size ) + process_alcs_application_decision_released_status() + process_alcs_application_cancelled_status(batch_size=import_batch_size) + process_alcs_application_review_lfng_status(batch_size=import_batch_size) + process_alcs_application_wrong_lfng_status(batch_size=import_batch_size) + process_alcs_application_returned_incomplete_lfng_status( + batch_size=import_batch_size + ) + process_alcs_application_submitted_lfng_status(batch_size=import_batch_size) diff --git a/bin/migrate-oats-data/menu/commands/import_all.py b/bin/migrate-oats-data/menu/commands/import_all.py index 1bec3eb20b..533ed400c6 100644 --- a/bin/migrate-oats-data/menu/commands/import_all.py +++ b/bin/migrate-oats-data/menu/commands/import_all.py @@ -14,6 +14,12 @@ process_alcs_application_submitted_to_alc_status, batch_application_statuses, process_alcs_application_submitted_to_alc_incomplete_status, + process_alcs_application_decision_released_status, + process_alcs_application_cancelled_status, + process_alcs_application_review_lfng_status, + process_alcs_application_wrong_lfng_status, + process_alcs_application_returned_incomplete_lfng_status, + process_alcs_application_submitted_lfng_status, ) from applications.application_submission_status_email import ( process_application_submission_status_emails, @@ -67,14 +73,22 @@ def import_all(console, args): process_alcs_app_submissions(batch_size=import_batch_size) console.log("Processing application status:") - # init_application_statuses() - batch_application_statuses(batch_size=import_batch_size) + init_application_statuses() + # batch_application_statuses(batch_size=import_batch_size) process_alcs_application_in_progress_status(batch_size=import_batch_size) process_alcs_application_submitted_to_alc_status(batch_size=import_batch_size) process_alcs_application_received_by_alc_status() process_alcs_application_submitted_to_alc_incomplete_status( batch_size=import_batch_size ) + process_alcs_application_decision_released_status() + process_alcs_application_cancelled_status(batch_size=import_batch_size) + process_alcs_application_review_lfng_status(batch_size=import_batch_size) + process_alcs_application_wrong_lfng_status(batch_size=import_batch_size) + process_alcs_application_returned_incomplete_lfng_status( + batch_size=import_batch_size + ) + process_alcs_application_submitted_lfng_status(batch_size=import_batch_size) console.log("Processing notice of intents") process_notice_of_intent(batch_size=import_batch_size) From be715b3620ea193de3f5e51ec013073a5c0e0adb Mon Sep 17 00:00:00 2001 From: Liam Stoddard <lstodd@protonmail.com> Date: Wed, 1 Nov 2023 10:38:26 -0700 Subject: [PATCH 591/954] cleaned up before adding validation --- .../applications/__init__.py | 2 + .../applications/submissions/__init__.py | 4 + .../migrate_application_submissions.py | 34 +++++++++ .../application_cancelled_validation.sql | 75 +++++++++++++++++++ .../application_decision_released.sql | 19 +++++ .../application_in_progress_validation.sql | 69 +++++++++++++++++ .../application_rec_by_alc_validation.sql | 19 +++++ ...lication_sub_incomplete_alc_validation.sql | 35 +++++++++ ...pplication_submitted_to_alc_validation.sql | 36 +++++++++ .../application_command_parser.py | 29 +++++++ .../menu/commands/applications.py | 30 +------- .../menu/commands/clean_all.py | 6 +- .../menu/commands/import_all.py | 36 ++------- bin/migrate-oats-data/menu/menu.py | 4 + bin/migrate-oats-data/migrate.py | 8 ++ 15 files changed, 343 insertions(+), 63 deletions(-) create mode 100644 bin/migrate-oats-data/applications/submissions/migrate_application_submissions.py create mode 100644 bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_cancelled_validation.sql create mode 100644 bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_decision_released.sql create mode 100644 bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_in_progress_validation.sql create mode 100644 bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_rec_by_alc_validation.sql create mode 100644 bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_sub_incomplete_alc_validation.sql create mode 100644 bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_submitted_to_alc_validation.sql diff --git a/bin/migrate-oats-data/applications/__init__.py b/bin/migrate-oats-data/applications/__init__.py index 62c6c1a09b..79843e8baf 100644 --- a/bin/migrate-oats-data/applications/__init__.py +++ b/bin/migrate-oats-data/applications/__init__.py @@ -16,6 +16,8 @@ process_alcs_application_wrong_lfng_status, process_alcs_application_returned_incomplete_lfng_status, process_alcs_application_submitted_lfng_status, + process_application_statuses, + clean_app_submissions, ) from .application_submission_status_email import ( process_application_submission_status_emails, diff --git a/bin/migrate-oats-data/applications/submissions/__init__.py b/bin/migrate-oats-data/applications/submissions/__init__.py index 796d9cff8d..7f0f591ff6 100644 --- a/bin/migrate-oats-data/applications/submissions/__init__.py +++ b/bin/migrate-oats-data/applications/submissions/__init__.py @@ -14,3 +14,7 @@ process_alcs_application_returned_incomplete_lfng_status, process_alcs_application_submitted_lfng_status, ) +from .migrate_application_submissions import ( + process_application_statuses, + clean_app_submissions, +) diff --git a/bin/migrate-oats-data/applications/submissions/migrate_application_submissions.py b/bin/migrate-oats-data/applications/submissions/migrate_application_submissions.py new file mode 100644 index 0000000000..19c0a7c8dd --- /dev/null +++ b/bin/migrate-oats-data/applications/submissions/migrate_application_submissions.py @@ -0,0 +1,34 @@ +from .app_submissions import process_alcs_app_submissions, clean_application_submission +from .statuses import ( + init_application_statuses, + clean_application_submission_statuses, + process_alcs_application_in_progress_status, + process_alcs_application_received_by_alc_status, + process_alcs_application_submitted_to_alc_status, + process_alcs_application_submitted_to_alc_incomplete_status, + process_alcs_application_decision_released_status, + process_alcs_application_cancelled_status, + process_alcs_application_review_lfng_status, + process_alcs_application_wrong_lfng_status, + process_alcs_application_returned_incomplete_lfng_status, + process_alcs_application_submitted_lfng_status, +) + + +def clean_app_submissions(): + clean_application_submission_statuses() + clean_application_submission() + + +def process_application_statuses(batch_size): + init_application_statuses() + process_alcs_application_in_progress_status(batch_size) + process_alcs_application_received_by_alc_status() + process_alcs_application_submitted_to_alc_status(batch_size) + process_alcs_application_submitted_to_alc_incomplete_status(batch_size) + process_alcs_application_decision_released_status() + process_alcs_application_cancelled_status(batch_size) + process_alcs_application_review_lfng_status(batch_size) + process_alcs_application_wrong_lfng_status(batch_size) + process_alcs_application_returned_incomplete_lfng_status(batch_size) + process_alcs_application_submitted_lfng_status(batch_size) diff --git a/bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_cancelled_validation.sql b/bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_cancelled_validation.sql new file mode 100644 index 0000000000..9aa19db23b --- /dev/null +++ b/bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_cancelled_validation.sql @@ -0,0 +1,75 @@ +--- run it manually in IDE of your choice +--- compare to numbers returned by script. +-- total count of set 'CANC' - cancelled in ALCS +SELECT + count(*) +FROM + alcs.application_submission_to_submission_status appstss + JOIN alcs.application_submission as2 ON as2.uuid = appstss.submission_uuid +WHERE + appstss.status_type_code = 'CANC' + AND effective_date IS NOT NULL + AND as2.audit_created_by = 'oats_etl'; + +--total count of set 'CAN' apps with one or zero components in OATS +WITH + first_cancelled_accomplishment_per_file_number AS ( + SELECT + alr_application_id, + accomplishment_code, + MIN(oa.completion_date) AS completion_date + FROM + oats.oats_accomplishments oa + WHERE + accomplishment_code = 'CAN' + GROUP BY + alr_application_id, + accomplishment_code + ), + cancelled_accomplishments_for_app_only AS ( + SELECT DISTINCT + ON ( + first_cancelled.accomplishment_code, + first_cancelled.completion_date, + oaa.alr_application_id, + oaa.cancelled_date + ) first_cancelled.accomplishment_code, + first_cancelled.completion_date, + oaa.alr_application_id, + oaa.cancelled_date + FROM + oats.oats_alr_applications oaa + LEFT JOIN first_cancelled_accomplishment_per_file_number AS first_cancelled ON first_cancelled.alr_application_id = oaa.alr_application_id + WHERE + oaa.application_class_code IN ('LOA', 'BLK') + AND ( + first_cancelled.completion_date IS NOT NULL + OR oaa.cancelled_date IS NOT NULL + ) + ), + apps_with_one_or_zero_component_only AS ( + SELECT + oaac.alr_application_id, + max(oaac.alr_appl_component_id) AS alr_appl_component_id -- this IS NOT going TO effect the query since count < 2 + FROM + oats.oats_alr_appl_components oaac + JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id + AND oaa.application_class_code IN ('LOA', 'BLK') + GROUP BY + oaac.alr_application_id + HAVING + count(oaac.alr_application_id) < 2 + ), + all_cancelled AS ( + SELECT + cancelled.alr_application_id + FROM + cancelled_accomplishments_for_app_only AS cancelled + JOIN apps_with_one_or_zero_component_only AS apps_one_or_zero ON apps_one_or_zero.alr_application_id = cancelled.alr_application_id + GROUP BY + cancelled.alr_application_id + ) +SELECT + count(*) +FROM + all_cancelled \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_decision_released.sql b/bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_decision_released.sql new file mode 100644 index 0000000000..8c3b2777a2 --- /dev/null +++ b/bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_decision_released.sql @@ -0,0 +1,19 @@ +--- run it manually in IDE of your choice +--- compare to numbers returned by script. They should match +-- total count of set 'ALCD' - Decision Released +SELECT + count(*) +FROM + alcs.application_submission_to_submission_status appstss +WHERE + appstss.effective_date IS NOT NULL + AND status_type_code = 'ALCD'; + +-- total count of expected 'ALCD' - Decision Released +SELECT + count(*) +FROM + alcs.application app + JOIN alcs.application_submission apps ON app.file_number = apps.file_number +WHERE + app.decision_date IS NOT NULL \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_in_progress_validation.sql b/bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_in_progress_validation.sql new file mode 100644 index 0000000000..203b77a9c7 --- /dev/null +++ b/bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_in_progress_validation.sql @@ -0,0 +1,69 @@ +--- run it manually in IDE of your choice +--- compare to numbers returned by script. They should match +-- total count of set 'PROG' - In Progress in ALCS +SELECT + count(*) +FROM + alcs.application_submission_to_submission_status appstss + JOIN alcs.application_submission as2 ON as2.uuid = appstss.submission_uuid +WHERE + status_type_code = 'SUBM' + AND effective_date IS NOT NULL + AND as2.audit_created_by = 'oats_etl'; + +--total count of set 'INP' - In Progress apps with one or zero components in OATS +WITH + inp_accomplishment_per_file_number AS ( + SELECT + alr_application_id, + accomplishment_code + FROM + oats.oats_accomplishments oa + WHERE + accomplishment_code = 'INP' + GROUP BY + alr_application_id, + accomplishment_code + ), + inp_accomplishments_for_app_only AS ( + SELECT DISTINCT + ON ( + inp_accomplishments.accomplishment_code, + oaa.alr_application_id, + oaa.when_created + ) inp_accomplishments.accomplishment_code, + oaa.alr_application_id, + oaa.when_created + FROM + oats.oats_alr_applications oaa + LEFT JOIN inp_accomplishment_per_file_number AS inp_accomplishments ON inp_accomplishments.alr_application_id = oaa.alr_application_id + WHERE + oaa.application_class_code IN ('LOA', 'BLK') + AND (oaa.when_created IS NOT NULL) + ), + apps_with_one_or_zero_component_only AS ( + SELECT + oaac.alr_application_id, + max(oaac.alr_appl_component_id) AS alr_appl_component_id -- this IS NOT going TO effect the query since count < 2 + FROM + oats.oats_alr_appl_components oaac + JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id + AND oaa.application_class_code IN ('LOA', 'BLK') + GROUP BY + oaac.alr_application_id + HAVING + count(oaac.alr_application_id) < 2 + ), + all_in_progress AS ( + SELECT + cancelled.alr_application_id + FROM + inp_accomplishments_for_app_only AS cancelled + JOIN apps_with_one_or_zero_component_only AS apps_one_or_zero ON apps_one_or_zero.alr_application_id = cancelled.alr_application_id + GROUP BY + cancelled.alr_application_id + ) +SELECT + count(*) +FROM + all_in_progress; \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_rec_by_alc_validation.sql b/bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_rec_by_alc_validation.sql new file mode 100644 index 0000000000..d7d42d598d --- /dev/null +++ b/bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_rec_by_alc_validation.sql @@ -0,0 +1,19 @@ +--- run it manually in IDE of your choice +--- compare to numbers returned by script. They should match +-- total count of set 'RECA' - Received By ALC +SELECT + count(*) +FROM + alcs.application_submission_to_submission_status appstss +WHERE + appstss.effective_date IS NOT NULL + AND status_type_code = 'RECA'; + +-- total count of expected 'RECA' - Received By ALC +SELECT + count(*) +FROM + alcs.application app + JOIN alcs.application_submission apps ON app.file_number = apps.file_number +WHERE + app.date_received_all_items IS NOT NULL \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_sub_incomplete_alc_validation.sql b/bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_sub_incomplete_alc_validation.sql new file mode 100644 index 0000000000..24a89bc326 --- /dev/null +++ b/bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_sub_incomplete_alc_validation.sql @@ -0,0 +1,35 @@ +--- run it manually in IDE of your choice +--- compare to numbers returned by script. They should match +-- total count of set 'SUIN' - Submitted to ALC Incomplete status in ALCS +SELECT + count(*) +FROM + alcs.application_submission_to_submission_status appstss + JOIN alcs.application_submission as2 ON as2.uuid = appstss.submission_uuid +WHERE + status_type_code = 'SUIN' + AND effective_date IS NOT NULL + AND as2.audit_created_by = 'oats_etl'; + +-- total count of expected 'AKI' - Submitted to ALC Incomplete status +WITH + app_components_grouped AS ( + SELECT + oaac.alr_application_id + FROM + oats.oats_alr_appl_components oaac + JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id + WHERE + oaa.application_class_code IN ('LOA', 'BLK') + GROUP BY + oaac.alr_application_id + HAVING + count(oaac.alr_application_id) < 2 -- ignore notice of intents with multiple components + ) +SELECT + count(*) +FROM + app_components_grouped ncg + JOIN oats.oats_accomplishments oa ON oa.alr_application_id = ncg.alr_application_id + AND oa.accomplishment_code = 'AKI' + AND oa.completion_date IS NOT NULL; \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_submitted_to_alc_validation.sql b/bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_submitted_to_alc_validation.sql new file mode 100644 index 0000000000..3b22094674 --- /dev/null +++ b/bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_submitted_to_alc_validation.sql @@ -0,0 +1,36 @@ +--- run it manually in IDE of your choice +--- compare to numbers returned by script. They should match +-- total count of set 'SUBM' - Submitted to ALC status in ALCS +SELECT + count(*) +FROM + alcs.application_submission_to_submission_status appstss + JOIN alcs.application_submission as2 ON as2.uuid = appstss.submission_uuid +WHERE + status_type_code = 'SUBM' + AND effective_date IS NOT NULL + AND as2.audit_created_by = 'oats_etl'; + +-- total count of expected 'SUBM' - Submitted to ALC status +WITH + app_components_grouped AS ( + SELECT + oaac.alr_application_id + FROM + oats.oats_alr_appl_components oaac + JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id + WHERE + oaa.application_class_code IN ('LOA', 'BLK') + GROUP BY + oaac.alr_application_id + HAVING + count(oaac.alr_application_id) < 2 -- ignore notice of intents with multiple components + ) +SELECT + count(*) +FROM + oats.oats_alr_applications oaa2 + JOIN app_components_grouped ncg ON ncg.alr_application_id = oaa2.alr_application_id + JOIN alcs.application_submission apps ON apps.file_number = oaa2.alr_application_id::TEXT +WHERE + oaa2.submitted_to_alc_date IS NOT NULL; \ No newline at end of file diff --git a/bin/migrate-oats-data/menu/command_parser/application_command_parser.py b/bin/migrate-oats-data/menu/command_parser/application_command_parser.py index 91894fb298..20092fa0ff 100644 --- a/bin/migrate-oats-data/menu/command_parser/application_command_parser.py +++ b/bin/migrate-oats-data/menu/command_parser/application_command_parser.py @@ -38,3 +38,32 @@ def app_sub_import_command_parser(import_batch_size, subparsers): metavar="", help=f"batch size (default: {import_batch_size})", ) + + +def app_status_import_command_parser(import_batch_size, subparsers): + app_status_import_command = subparsers.add_parser( + "app-status-import", + help=f"Import App submission statuses into ALCS (update application_submission_to_submission_status table) in specified batch size: (default: {import_batch_size})", + ) + app_status_import_command.add_argument( + "--batch-size", + type=int, + default=import_batch_size, + metavar="", + help=f"batch size (default: {import_batch_size})", + ) + + +def app_all_import_command_parser(import_batch_size, subparsers): + # This is to make development quicker as to not wait + app_all_import_command = subparsers.add_parser( + "app-all-import", + help=f"Import all non document application related tables in specified batch size: (default: {import_batch_size})", + ) + app_all_import_command.add_argument( + "--batch-size", + type=int, + default=import_batch_size, + metavar="", + help=f"batch size (default: {import_batch_size})", + ) diff --git a/bin/migrate-oats-data/menu/commands/applications.py b/bin/migrate-oats-data/menu/commands/applications.py index ec19c9d8c7..f7ea68917f 100644 --- a/bin/migrate-oats-data/menu/commands/applications.py +++ b/bin/migrate-oats-data/menu/commands/applications.py @@ -1,19 +1,8 @@ from applications import ( process_applications, process_alcs_application_prep_fields, + process_application_statuses, process_alcs_app_submissions, - init_application_statuses, - process_alcs_application_in_progress_status, - process_alcs_application_received_by_alc_status, - process_alcs_application_submitted_to_alc_status, - batch_application_statuses, - process_alcs_application_submitted_to_alc_incomplete_status, - process_alcs_application_decision_released_status, - process_alcs_application_cancelled_status, - process_alcs_application_review_lfng_status, - process_alcs_application_wrong_lfng_status, - process_alcs_application_returned_incomplete_lfng_status, - process_alcs_application_submitted_lfng_status, ) @@ -70,19 +59,4 @@ def application_status_import(console, args): f"Processing application statuses import in batch size = {import_batch_size}" ) - init_application_statuses() - # batch_application_statuses(batch_size=import_batch_size) - process_alcs_application_in_progress_status(batch_size=import_batch_size) - process_alcs_application_received_by_alc_status() - process_alcs_application_submitted_to_alc_status(batch_size=import_batch_size) - process_alcs_application_submitted_to_alc_incomplete_status( - batch_size=import_batch_size - ) - process_alcs_application_decision_released_status() - process_alcs_application_cancelled_status(batch_size=import_batch_size) - process_alcs_application_review_lfng_status(batch_size=import_batch_size) - process_alcs_application_wrong_lfng_status(batch_size=import_batch_size) - process_alcs_application_returned_incomplete_lfng_status( - batch_size=import_batch_size - ) - process_alcs_application_submitted_lfng_status(batch_size=import_batch_size) + process_application_statuses(batch_size=import_batch_size) diff --git a/bin/migrate-oats-data/menu/commands/clean_all.py b/bin/migrate-oats-data/menu/commands/clean_all.py index 0216574b11..8d84da8b38 100644 --- a/bin/migrate-oats-data/menu/commands/clean_all.py +++ b/bin/migrate-oats-data/menu/commands/clean_all.py @@ -1,8 +1,7 @@ from applications import clean_applications from noi.notice_of_intent_migration import clean_notice_of_intent from applications.submissions import ( - clean_application_submission, - clean_application_submission_statuses, + clean_app_submissions, ) from applications.application_submission_status_email import ( clean_application_submission_status_emails, @@ -25,8 +24,7 @@ def clean_all(console, args): clean_application_documents() clean_noi_documents() clean_documents() - clean_application_submission_statuses() - clean_application_submission() + clean_app_submissions() clean_applications() clean_notice_of_intent() clean_application_submission_status_emails(), diff --git a/bin/migrate-oats-data/menu/commands/import_all.py b/bin/migrate-oats-data/menu/commands/import_all.py index 533ed400c6..e507e0988d 100644 --- a/bin/migrate-oats-data/menu/commands/import_all.py +++ b/bin/migrate-oats-data/menu/commands/import_all.py @@ -7,19 +7,8 @@ process_notice_of_intent, ) from applications.submissions import ( + process_application_statuses, process_alcs_app_submissions, - init_application_statuses, - process_alcs_application_in_progress_status, - process_alcs_application_received_by_alc_status, - process_alcs_application_submitted_to_alc_status, - batch_application_statuses, - process_alcs_application_submitted_to_alc_incomplete_status, - process_alcs_application_decision_released_status, - process_alcs_application_cancelled_status, - process_alcs_application_review_lfng_status, - process_alcs_application_wrong_lfng_status, - process_alcs_application_returned_incomplete_lfng_status, - process_alcs_application_submitted_lfng_status, ) from applications.application_submission_status_email import ( process_application_submission_status_emails, @@ -55,10 +44,10 @@ def import_all(console, args): init_notice_of_intents(batch_size=import_batch_size) console.log("Importing NOI specific OATS documents into ALCS:") - # import_oats_noi_documents(batch_size=import_batch_size) + import_oats_noi_documents(batch_size=import_batch_size) console.log("Importing OATS app_documents into ALCS:") - # import_oats_app_documents(batch_size=import_batch_size) + import_oats_app_documents(batch_size=import_batch_size) console.log("Processing ALCS application documents:") link_alcs_docs_to_app_docs(batch_size=import_batch_size) @@ -72,23 +61,8 @@ def import_all(console, args): console.log("Processing application submission:") process_alcs_app_submissions(batch_size=import_batch_size) - console.log("Processing application status:") - init_application_statuses() - # batch_application_statuses(batch_size=import_batch_size) - process_alcs_application_in_progress_status(batch_size=import_batch_size) - process_alcs_application_submitted_to_alc_status(batch_size=import_batch_size) - process_alcs_application_received_by_alc_status() - process_alcs_application_submitted_to_alc_incomplete_status( - batch_size=import_batch_size - ) - process_alcs_application_decision_released_status() - process_alcs_application_cancelled_status(batch_size=import_batch_size) - process_alcs_application_review_lfng_status(batch_size=import_batch_size) - process_alcs_application_wrong_lfng_status(batch_size=import_batch_size) - process_alcs_application_returned_incomplete_lfng_status( - batch_size=import_batch_size - ) - process_alcs_application_submitted_lfng_status(batch_size=import_batch_size) + console.log("Processing application statuses:") + process_application_statuses(batch_size=import_batch_size) console.log("Processing notice of intents") process_notice_of_intent(batch_size=import_batch_size) diff --git a/bin/migrate-oats-data/menu/menu.py b/bin/migrate-oats-data/menu/menu.py index 30edaf4de7..5243843330 100644 --- a/bin/migrate-oats-data/menu/menu.py +++ b/bin/migrate-oats-data/menu/menu.py @@ -3,6 +3,8 @@ application_import_command_parser, app_prep_import_command_parser, app_sub_import_command_parser, + app_status_import_command_parser, + app_all_import_command_parser, ) from .command_parser.notice_of_intent_command_parser import ( noi_import_command_parser, @@ -48,6 +50,8 @@ def setup_menu_args_parser(import_batch_size): noi_document_import_command_parser(import_batch_size, subparsers) _import_command_parser(subparsers) app_sub_import_command_parser(import_batch_size, subparsers) + app_status_import_command_parser(import_batch_size, subparsers) + app_all_import_command_parser(import_batch_size, subparsers) subparsers.add_parser("clean", help="Clean all imported data") diff --git a/bin/migrate-oats-data/migrate.py b/bin/migrate-oats-data/migrate.py index ad4d8f0ec1..5eb6b71b1f 100644 --- a/bin/migrate-oats-data/migrate.py +++ b/bin/migrate-oats-data/migrate.py @@ -17,6 +17,7 @@ notice_of_intent_import, notice_of_intent_clean, start_obfuscation, + application_status_import, ) from db import connection_pool from common import BATCH_UPLOAD_SIZE, setup_and_get_logger @@ -56,6 +57,13 @@ application_submission_import(console, args) case "obfuscate": start_obfuscation(console) + case "app-status-import": + application_status_import(console, args) + case "app-all-import": + application_import(console, args) + app_prep_import(console, args) + application_submission_import(console, args) + application_status_import(console, args) finally: if connection_pool: From ba492492a234a7e1d8c914b15e6d5c8d6dae8a35 Mon Sep 17 00:00:00 2001 From: Liam Stoddard <lstodd@protonmail.com> Date: Wed, 1 Nov 2023 14:56:59 -0700 Subject: [PATCH 592/954] Cleaned up and removed unused files, added rest of validation --- .../applications/__init__.py | 1 - .../applications/submissions/__init__.py | 1 - .../application_submitted_to_alc_count.sql | 2 +- .../init_app_submission_status_batch.sql | 30 ----- .../application_in_progress_validation.sql | 10 +- ...tion_return_incomplete_lfng_validation.sql | 56 ++++++++++ ...lication_sub_incomplete_alc_validation.sql | 2 +- .../application_submitted_lfng_validation.sql | 75 +++++++++++++ ...pplication_submitted_to_alc_validation.sql | 2 +- ...plication_under_review_lfng_validation.sql | 56 ++++++++++ .../application_wrong_lfng_validation.sql | 56 ++++++++++ .../submissions/statuses/__init__.py | 1 - .../application_status_batch_insert.py | 103 ------------------ .../application_status_submitted_alc.py | 2 +- 14 files changed, 252 insertions(+), 145 deletions(-) delete mode 100644 bin/migrate-oats-data/applications/submissions/sql/statuses/init_app_submission_status_batch.sql create mode 100644 bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_return_incomplete_lfng_validation.sql create mode 100644 bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_submitted_lfng_validation.sql create mode 100644 bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_under_review_lfng_validation.sql create mode 100644 bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_wrong_lfng_validation.sql delete mode 100644 bin/migrate-oats-data/applications/submissions/statuses/application_status_batch_insert.py diff --git a/bin/migrate-oats-data/applications/__init__.py b/bin/migrate-oats-data/applications/__init__.py index 79843e8baf..3184071a45 100644 --- a/bin/migrate-oats-data/applications/__init__.py +++ b/bin/migrate-oats-data/applications/__init__.py @@ -8,7 +8,6 @@ process_alcs_application_in_progress_status, process_alcs_application_received_by_alc_status, process_alcs_application_submitted_to_alc_status, - batch_application_statuses, process_alcs_application_submitted_to_alc_incomplete_status, process_alcs_application_decision_released_status, process_alcs_application_cancelled_status, diff --git a/bin/migrate-oats-data/applications/submissions/__init__.py b/bin/migrate-oats-data/applications/submissions/__init__.py index 7f0f591ff6..ed8c750deb 100644 --- a/bin/migrate-oats-data/applications/submissions/__init__.py +++ b/bin/migrate-oats-data/applications/submissions/__init__.py @@ -5,7 +5,6 @@ process_alcs_application_in_progress_status, process_alcs_application_received_by_alc_status, process_alcs_application_submitted_to_alc_status, - batch_application_statuses, process_alcs_application_submitted_to_alc_incomplete_status, process_alcs_application_decision_released_status, process_alcs_application_cancelled_status, diff --git a/bin/migrate-oats-data/applications/submissions/sql/statuses/application_submitted_to_alc_count.sql b/bin/migrate-oats-data/applications/submissions/sql/statuses/application_submitted_to_alc_count.sql index 7f63f61b6b..102bd66010 100644 --- a/bin/migrate-oats-data/applications/submissions/sql/statuses/application_submitted_to_alc_count.sql +++ b/bin/migrate-oats-data/applications/submissions/sql/statuses/application_submitted_to_alc_count.sql @@ -4,7 +4,7 @@ WITH app_components_grouped AS ( JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id WHERE oaa.application_class_code IN ('LOA', 'BLK') GROUP BY oaac.alr_application_id - HAVING count(oaac.alr_application_id) < 2 -- ignore notice of intents with multiple components + HAVING count(oaac.alr_application_id) < 2 -- ignore applications with multiple components ) SELECT count(*) FROM app_components_grouped diff --git a/bin/migrate-oats-data/applications/submissions/sql/statuses/init_app_submission_status_batch.sql b/bin/migrate-oats-data/applications/submissions/sql/statuses/init_app_submission_status_batch.sql deleted file mode 100644 index a868ae7c05..0000000000 --- a/bin/migrate-oats-data/applications/submissions/sql/statuses/init_app_submission_status_batch.sql +++ /dev/null @@ -1,30 +0,0 @@ -WITH application_components_grouped AS ( - SELECT oaac.alr_application_id - FROM oats.oats_alr_appl_components oaac - JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id - WHERE oaa.application_class_code IN ('LOA', 'BLK') - GROUP BY oaac.alr_application_id - HAVING count(oaac.alr_application_id) < 2 -- ignore applications with multiple components -), --- alcs_submissions_with_statuses is required for development environment only. Production environment does not have submissions. -alcs_submissions_with_statuses AS ( - SELECT app_sub.file_number - FROM alcs.application_submission app_sub - JOIN alcs.application_submission_to_submission_status appss ON app_sub.uuid = appss.submission_uuid - GROUP BY app_sub.file_number -), --- retrieve submission_uuid from ALCS that were imported with ETL -alcs_submission_uuids_to_populate AS ( - SELECT oaa.alr_application_id, - appss.uuid - FROM application_components_grouped - JOIN oats.oats_alr_applications oaa ON application_components_grouped.alr_application_id = oaa.alr_application_id - JOIN alcs.application_submission appss ON oaa.alr_application_id::TEXT = appss.file_number -- make sure TO WORK ONLY with the ones that were imported TO ALCS - LEFT JOIN alcs_submissions_with_statuses ON alcs_submissions_with_statuses.file_number = appss.file_number - WHERE alcs_submissions_with_statuses.file_number IS NULL -- filter out all submissions that have statuses populated before the ETL; -) -SELECT asup.alr_application_id, - --apsst.code AS sscode, - asup.uuid -FROM alcs_submission_uuids_to_populate asup - --CROSS JOIN alcs.application_submission_status_type apsst \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_in_progress_validation.sql b/bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_in_progress_validation.sql index 203b77a9c7..f60d8a7bb9 100644 --- a/bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_in_progress_validation.sql +++ b/bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_in_progress_validation.sql @@ -7,7 +7,7 @@ FROM alcs.application_submission_to_submission_status appstss JOIN alcs.application_submission as2 ON as2.uuid = appstss.submission_uuid WHERE - status_type_code = 'SUBM' + appstss.status_type_code = 'PROG' AND effective_date IS NOT NULL AND as2.audit_created_by = 'oats_etl'; @@ -56,12 +56,12 @@ WITH ), all_in_progress AS ( SELECT - cancelled.alr_application_id + inp.alr_application_id FROM - inp_accomplishments_for_app_only AS cancelled - JOIN apps_with_one_or_zero_component_only AS apps_one_or_zero ON apps_one_or_zero.alr_application_id = cancelled.alr_application_id + inp_accomplishments_for_app_only AS inp + JOIN apps_with_one_or_zero_component_only AS apps_one_or_zero ON apps_one_or_zero.alr_application_id = inp.alr_application_id GROUP BY - cancelled.alr_application_id + inp.alr_application_id ) SELECT count(*) diff --git a/bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_return_incomplete_lfng_validation.sql b/bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_return_incomplete_lfng_validation.sql new file mode 100644 index 0000000000..91db7c4737 --- /dev/null +++ b/bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_return_incomplete_lfng_validation.sql @@ -0,0 +1,56 @@ +--- run it manually in IDE of your choice +--- compare to numbers returned by script. +-- total count of set 'INCM' - LFNG returned incomplete in ALCS +SELECT + count(*) +FROM + alcs.application_submission_to_submission_status appstss + JOIN alcs.application_submission as2 ON as2.uuid = appstss.submission_uuid +WHERE + appstss.status_type_code = 'INCM' + AND effective_date IS NOT NULL + AND as2.audit_created_by = 'oats_etl'; + +--total count of set 'LGI' apps in OATS +WITH + last_return_per_file_number AS ( + SELECT + alr_application_id, + accomplishment_code, + MAX(oa.completion_date) AS completion_date + FROM + oats.oats_accomplishments oa + WHERE + accomplishment_code = 'LGI' + GROUP BY + alr_application_id, + accomplishment_code + ), + lfng_returned_accomplishments_for_app_only AS ( + SELECT + last_return.accomplishment_code, + last_return.completion_date, + oaa.alr_application_id + FROM + oats.oats_alr_applications oaa + LEFT JOIN last_return_per_file_number AS last_return ON last_return.alr_application_id = oaa.alr_application_id + WHERE + oaa.application_class_code IN ('LOA', 'BLK') + ), + all_returned AS ( + SELECT + oats_lfng_return.alr_application_id, + oats_lfng_return.accomplishment_code, + oats_lfng_return.completion_date AS max_date, + apps.uuid + FROM + lfng_returned_accomplishments_for_app_only oats_lfng_return + JOIN alcs.application_submission apps ON apps.file_number = oats_lfng_return.alr_application_id::TEXT + WHERE + oats_lfng_return.accomplishment_code = 'LGI' + and oats_lfng_return.completion_date IS NOT NULL + ) +SELECT + COUNT(*) +FROM + all_returned \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_sub_incomplete_alc_validation.sql b/bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_sub_incomplete_alc_validation.sql index 24a89bc326..7e9af97171 100644 --- a/bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_sub_incomplete_alc_validation.sql +++ b/bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_sub_incomplete_alc_validation.sql @@ -24,7 +24,7 @@ WITH GROUP BY oaac.alr_application_id HAVING - count(oaac.alr_application_id) < 2 -- ignore notice of intents with multiple components + count(oaac.alr_application_id) < 2 -- ignore applications with multiple components ) SELECT count(*) diff --git a/bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_submitted_lfng_validation.sql b/bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_submitted_lfng_validation.sql new file mode 100644 index 0000000000..6b330f0f64 --- /dev/null +++ b/bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_submitted_lfng_validation.sql @@ -0,0 +1,75 @@ +--- run it manually in IDE of your choice +--- compare to numbers returned by script. +-- total count of set 'SUBG' - Submitted to LFNG in ALCS +SELECT + count(*) +FROM + alcs.application_submission_to_submission_status appstss + JOIN alcs.application_submission as2 ON as2.uuid = appstss.submission_uuid +WHERE + appstss.status_type_code = 'SUBG' + AND effective_date IS NOT NULL + AND as2.audit_created_by = 'oats_etl'; + +--total count of set 'SLG' apps with one or zero components in OATS +WITH + last_sub_lg_accomplishment_per_file_number AS ( + SELECT + alr_application_id, + accomplishment_code, + MAX(oa.completion_date) AS completion_date + FROM + oats.oats_accomplishments oa + WHERE + accomplishment_code = 'SLG' + GROUP BY + alr_application_id, + accomplishment_code + ), + sub_lg_accomplishments_for_app_only AS ( + SELECT DISTINCT + ON ( + last_sub_lg.accomplishment_code, + last_sub_lg.completion_date, + oaa.alr_application_id, + oaa.submitted_to_lg_date + ) last_sub_lg.accomplishment_code, + last_sub_lg.completion_date, + oaa.alr_application_id, + oaa.submitted_to_lg_date + FROM + oats.oats_alr_applications oaa + LEFT JOIN last_sub_lg_accomplishment_per_file_number AS last_sub_lg ON last_sub_lg.alr_application_id = oaa.alr_application_id + WHERE + oaa.application_class_code IN ('LOA', 'BLK') + AND ( + last_sub_lg.completion_date IS NOT NULL + OR oaa.submitted_to_lg_date IS NOT NULL + ) + ), + apps_with_one_or_zero_component_only AS ( + SELECT + oaac.alr_application_id, + max(oaac.alr_appl_component_id) AS alr_appl_component_id -- this IS NOT going TO effect the query since count < 2 + FROM + oats.oats_alr_appl_components oaac + JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id + AND oaa.application_class_code IN ('LOA', 'BLK') + GROUP BY + oaac.alr_application_id + HAVING + COUNT(oaac.alr_application_id) < 2 + ), + all_sub_lg AS ( + SELECT + sub_lg.alr_application_id + FROM + sub_lg_accomplishments_for_app_only AS sub_lg + JOIN apps_with_one_or_zero_component_only AS apps_one_or_zero ON apps_one_or_zero.alr_application_id = sub_lg.alr_application_id + GROUP BY + sub_lg.alr_application_id + ) +SELECT + count(*) +FROM + all_sub_lg \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_submitted_to_alc_validation.sql b/bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_submitted_to_alc_validation.sql index 3b22094674..006fe0c554 100644 --- a/bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_submitted_to_alc_validation.sql +++ b/bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_submitted_to_alc_validation.sql @@ -24,7 +24,7 @@ WITH GROUP BY oaac.alr_application_id HAVING - count(oaac.alr_application_id) < 2 -- ignore notice of intents with multiple components + count(oaac.alr_application_id) < 2 -- ignore applications with multiple components ) SELECT count(*) diff --git a/bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_under_review_lfng_validation.sql b/bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_under_review_lfng_validation.sql new file mode 100644 index 0000000000..6e466c7b08 --- /dev/null +++ b/bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_under_review_lfng_validation.sql @@ -0,0 +1,56 @@ +--- run it manually in IDE of your choice +--- compare to numbers returned by script. +-- total count of set 'REVG' - Under Review by LFNG in ALCS +SELECT + count(*) +FROM + alcs.application_submission_to_submission_status appstss + JOIN alcs.application_submission as2 ON as2.uuid = appstss.submission_uuid +WHERE + appstss.status_type_code = 'REVG' + AND effective_date IS NOT NULL + AND as2.audit_created_by = 'oats_etl'; + +--total count of set 'ULG' apps in OATS +WITH + last_review_per_file_number AS ( + SELECT + alr_application_id, + accomplishment_code, + MAX(oa.completion_date) AS completion_date + FROM + oats.oats_accomplishments oa + WHERE + accomplishment_code = 'ULG' + GROUP BY + alr_application_id, + accomplishment_code + ), + lfng_rev_accomplishments_for_app_only AS ( + SELECT + last_rev.accomplishment_code, + last_rev.completion_date, + oaa.alr_application_id + FROM + oats.oats_alr_applications oaa + LEFT JOIN last_review_per_file_number AS last_rev ON last_rev.alr_application_id = oaa.alr_application_id + WHERE + oaa.application_class_code IN ('LOA', 'BLK') + ), + all_under_rev AS ( + SELECT + oats_lfng_rev.alr_application_id, + oats_lfng_rev.accomplishment_code, + oats_lfng_rev.completion_date AS max_date, + apps.uuid + FROM + lfng_rev_accomplishments_for_app_only oats_lfng_rev + JOIN alcs.application_submission apps ON apps.file_number = oats_lfng_rev.alr_application_id::TEXT + WHERE + oats_lfng_rev.accomplishment_code = 'ULG' + and oats_lfng_rev.completion_date IS NOT NULL + ) +SELECT + COUNT(*) +FROM + all_under_rev \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_wrong_lfng_validation.sql b/bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_wrong_lfng_validation.sql new file mode 100644 index 0000000000..8e144a16b7 --- /dev/null +++ b/bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_wrong_lfng_validation.sql @@ -0,0 +1,56 @@ +--- run it manually in IDE of your choice +--- compare to numbers returned by script. +-- total count of set 'WRNG' - Wrong LFNG in ALCS +SELECT + count(*) +FROM + alcs.application_submission_to_submission_status appstss + JOIN alcs.application_submission as2 ON as2.uuid = appstss.submission_uuid +WHERE + appstss.status_type_code = 'WRNG' + AND effective_date IS NOT NULL + AND as2.audit_created_by = 'oats_etl'; + +--total count of set 'WLG' apps in OATS +WITH + last_wrong_per_file_number AS ( + SELECT + alr_application_id, + accomplishment_code, + MAX(oa.completion_date) AS completion_date + FROM + oats.oats_accomplishments oa + WHERE + accomplishment_code = 'WLG' + GROUP BY + alr_application_id, + accomplishment_code + ), + lfng_wrong_accomplishments_for_app_only AS ( + SELECT + last_wlg.accomplishment_code, + last_wlg.completion_date, + oaa.alr_application_id + FROM + oats.oats_alr_applications oaa + LEFT JOIN last_wrong_per_file_number AS last_wlg ON last_wlg.alr_application_id = oaa.alr_application_id + WHERE + oaa.application_class_code IN ('LOA', 'BLK') + ), + all_wlg AS ( + SELECT + oats_lfng_wlg.alr_application_id, + oats_lfng_wlg.accomplishment_code, + oats_lfng_wlg.completion_date AS max_date, + apps.uuid + FROM + lfng_wrong_accomplishments_for_app_only oats_lfng_wlg + JOIN alcs.application_submission apps ON apps.file_number = oats_lfng_wlg.alr_application_id::TEXT + WHERE + oats_lfng_wlg.accomplishment_code = 'WLG' + and oats_lfng_wlg.completion_date IS NOT NULL + ) +SELECT + COUNT(*) +FROM + all_wlg \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/submissions/statuses/__init__.py b/bin/migrate-oats-data/applications/submissions/statuses/__init__.py index ba01d767ab..ea8e31ece8 100644 --- a/bin/migrate-oats-data/applications/submissions/statuses/__init__.py +++ b/bin/migrate-oats-data/applications/submissions/statuses/__init__.py @@ -13,7 +13,6 @@ from .application_status_descision_released import ( process_alcs_application_decision_released_status, ) -from .application_status_batch_insert import batch_application_statuses from .application_status_cancelled import process_alcs_application_cancelled_status from .application_status_review_lfng import process_alcs_application_review_lfng_status from .application_status_wrong_lfng import process_alcs_application_wrong_lfng_status diff --git a/bin/migrate-oats-data/applications/submissions/statuses/application_status_batch_insert.py b/bin/migrate-oats-data/applications/submissions/statuses/application_status_batch_insert.py deleted file mode 100644 index 4857579e8c..0000000000 --- a/bin/migrate-oats-data/applications/submissions/statuses/application_status_batch_insert.py +++ /dev/null @@ -1,103 +0,0 @@ -from common import OATS_ETL_USER, setup_and_get_logger, BATCH_UPLOAD_SIZE -from db import inject_conn_pool -from psycopg2.extras import RealDictCursor, execute_batch -from .application_status_type_code import * - -etl_name = "init_application_statuses_batch" -logger = setup_and_get_logger(etl_name) - - -@inject_conn_pool -def batch_application_statuses(conn=None, batch_size=BATCH_UPLOAD_SIZE): - print("enter sandman") - """ - This function is responsible for initializing application statuses. - Initializing means inserting status_to_submission record without the effective_date. - - Args: - conn (psycopg2.extensions.connection): PostgreSQL database connection. Provided by the decorator. - batch_size (int): The number of items to process at once. Defaults to BATCH_UPLOAD_SIZE. - """ - logger.info(f"Start {etl_name}") - with conn.cursor(cursor_factory=RealDictCursor) as cursor: - with open( - "applications/submissions/sql/statuses/init_app_submission_status_count.sql", - "r", - encoding="utf-8", - ) as sql_file: - count_query = sql_file.read() - cursor.execute(count_query) - count_total = dict(cursor.fetchone())["count"] - logger.info(f"Total Application data to insert: {count_total}") - print(count_total) - app_status_type = get_app_status_type(cursor) - app_status_count = get_app_status_count(cursor) - print(app_status_count, app_status_type) - failed_inserts = 0 - successful_inserts_count = 0 - last_application_id = 0 - # mod_batch allows batching to work at the closest integer division of 12 which is the number of unique status types in alcs applications - mod_batch = batch_size // 12 - mod_batch = mod_batch * 12 - with open( - "applications/submissions/sql/statuses/init_app_submission_status_batch.sql", - "r", - encoding="utf-8", - ) as sql_file: - query = sql_file.read() - while True: - cursor.execute( - f"{query} WHERE asup.alr_application_id > {last_application_id} ORDER by asup.alr_application_id;" - ) - rows = cursor.fetchmany(mod_batch) - if not rows: - break - try: - applications_to_be_inserted_count = len(rows) - insert_data = make_rows(app_status_type, rows) - page_length = len(insert_data) - _get_insert_query(cursor, insert_data) - conn.commit() - last_application_id = dict(rows[-1])["alr_application_id"] - successful_inserts_count = ( - successful_inserts_count + applications_to_be_inserted_count - ) - - logger.info( - f"retrieved/inserted items count: {applications_to_be_inserted_count}; total successfully inserted/updated applications so far {successful_inserts_count}; last inserted applidation_id: {last_application_id}" - ) - except Exception as err: - logger.exception() - conn.rollback() - failed_inserts = count_total - successful_inserts_count - last_application_id = last_application_id + 1 - - logger.info( - f"Finished {etl_name}: total amount of successful inserts {successful_inserts_count}, total failed updates {failed_inserts}" - ) - - -def _get_insert_query(cursor, data): - data_rows = [] - for row in data: - print(len(data_rows)) - execute_batch( - cursor, - _insert_query(), - data_rows, - page_size=len(data_rows), - ) - - -def _insert_query(): - query = """ - INSERT INTO alcs.application_submission_to_submission_status ( - submission_uuid, - status_type_code - ) - VALUES ( - %(submission_uuid)s, - %(status_type_code)s - ) - """ - return query diff --git a/bin/migrate-oats-data/applications/submissions/statuses/application_status_submitted_alc.py b/bin/migrate-oats-data/applications/submissions/statuses/application_status_submitted_alc.py index 3a30e44950..8201fc8acd 100644 --- a/bin/migrate-oats-data/applications/submissions/statuses/application_status_submitted_alc.py +++ b/bin/migrate-oats-data/applications/submissions/statuses/application_status_submitted_alc.py @@ -59,7 +59,7 @@ def process_alcs_application_submitted_to_alc_status( last_application_id = dict(rows[-1])["alr_application_id"] logger.debug( - f"retrieved/updated items count: {records_to_be_updated_count}; total successfully updated notice of intents so far {successful_updates_count}; last updated alr_application_id: {last_application_id}" + f"retrieved/updated items count: {records_to_be_updated_count}; total successfully updated applications so far {successful_updates_count}; last updated alr_application_id: {last_application_id}" ) except Exception as err: # this is NOT going to be caused by actual data update failure. This code is only executed when the code error appears or connection to DB is lost From 011464b74c97cdcceffc77bfdebd0512f49ec774 Mon Sep 17 00:00:00 2001 From: Liam Stoddard <lstodd@protonmail.com> Date: Wed, 1 Nov 2023 16:30:26 -0700 Subject: [PATCH 593/954] correct typo --- .../submissions/statuses/application_status_base_insert.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/migrate-oats-data/applications/submissions/statuses/application_status_base_insert.py b/bin/migrate-oats-data/applications/submissions/statuses/application_status_base_insert.py index cc173fe060..4b1ee2920e 100644 --- a/bin/migrate-oats-data/applications/submissions/statuses/application_status_base_insert.py +++ b/bin/migrate-oats-data/applications/submissions/statuses/application_status_base_insert.py @@ -11,7 +11,7 @@ def init_application_statuses(conn=None): """ This function is responsible for initializing application statuses. - Initializing means inserting status_to_submission record without the effective_date. + Initializing means inserting application_status_to_submission_status record without the effective_date. Args: conn (psycopg2.extensions.connection): PostgreSQL database connection. Provided by the decorator. From c6e3ea4c1779d49a2a8f1296ff8258177ca25294 Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Thu, 2 Nov 2023 12:51:07 -0700 Subject: [PATCH 594/954] task-1221 styling fixes --- .../naru-details/naru-details.component.scss | 23 +++++++ ...view-application-submission.component.html | 8 +-- ...notice-of-intent-submission.component.html | 8 +-- ...iew-notification-submission.component.html | 8 +-- .../naru-details/naru-details.component.html | 55 ++++++++-------- .../naru-details/naru-details.component.scss | 6 +- .../nfu-details/nfu-details.component.scss | 22 ++++++- .../subd-details/subd-details.component.scss | 10 ++- .../submission-details.component.scss | 22 ++++++- .../pofo-details/pofo-details.component.html | 66 +++++++++---------- .../submission-details.component.scss | 18 ++++- .../submission-details.component.scss | 6 ++ 12 files changed, 168 insertions(+), 84 deletions(-) diff --git a/portal-frontend/src/app/features/applications/application-details/naru-details/naru-details.component.scss b/portal-frontend/src/app/features/applications/application-details/naru-details/naru-details.component.scss index e69de29bb2..36aafed7e7 100644 --- a/portal-frontend/src/app/features/applications/application-details/naru-details/naru-details.component.scss +++ b/portal-frontend/src/app/features/applications/application-details/naru-details/naru-details.component.scss @@ -0,0 +1,23 @@ +@use '../../../../../styles/functions' as *; + +.soil-table { + display: grid; + overflow-x: auto; + grid-column-gap: rem(36); + grid-row-gap: rem(12); + grid-template-columns: max-content max-content max-content; + + @media screen and (min-width: $tabletBreakpoint) { + grid-template-columns: 0.55fr 1fr 1fr; + } + + @media screen and (min-width: $midBreakpoint) { + grid-template-columns: 0.95fr 1fr 2fr; + grid-column-gap: rem(16); + } + + .spacer-row { + grid-column: 1/4; + height: rem(16); + } +} diff --git a/portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.html b/portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.html index 99106a1479..d5e6e2c8e3 100644 --- a/portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.html +++ b/portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.html @@ -3,14 +3,14 @@ <h4 *ngIf="application">Application ID: {{ application.fileNumber }} | {{ application.type }}</h4> </div> <div class="banner-status"> - <div> - <div class="subheading2">Application Status</div> - <span *ngIf="application">{{ application.status.label }}</span> - </div> <div> <div class="subheading2">Status Date</div> <span *ngIf="application">{{ application.lastStatusUpdate | date }}</span> </div> + <div> + <div class="subheading2">Application Status</div> + <span *ngIf="application">{{ application.status.label }}</span> + </div> </div> </div> <div class="banner"> diff --git a/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.html b/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.html index 4f5f1b97f0..355b574ef1 100644 --- a/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.html @@ -3,14 +3,14 @@ <h4 *ngIf="submission">NOI ID: {{ submission.fileNumber }} | {{ submission.type }}</h4> </div> <div class="banner-status"> - <div> - <div class="subheading2">NOI Status</div> - <span *ngIf="submission">{{ submission.status.label }}</span> - </div> <div> <div class="subheading2">Status Date</div> <span *ngIf="submission">{{ submission.lastStatusUpdate | date }}</span> </div> + <div> + <div class="subheading2">NOI Status</div> + <span *ngIf="submission">{{ submission.status.label }}</span> + </div> </div> </div> <div class="banner"> diff --git a/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.html b/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.html index f8f2428568..2ee406bba0 100644 --- a/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.html +++ b/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.html @@ -3,14 +3,14 @@ <h4 *ngIf="submission">Notification ID: {{ submission.fileNumber }} | {{ submission.type }}</h4> </div> <div class="banner-status"> - <div> - <div class="subheading2">Notification Status</div> - <span *ngIf="submission">{{ submission.status.label }}</span> - </div> <div> <div class="subheading2">Status Date</div> <span *ngIf="submission">{{ submission.lastStatusUpdate | date }}</span> </div> + <div> + <div class="subheading2">Notification Status</div> + <span *ngIf="submission">{{ submission.status.label }}</span> + </div> </div> </div> <div class="banner"> diff --git a/portal-frontend/src/app/features/public/application/submission/naru-details/naru-details.component.html b/portal-frontend/src/app/features/public/application/submission/naru-details/naru-details.component.html index 552d817696..f2236d1664 100644 --- a/portal-frontend/src/app/features/public/application/submission/naru-details/naru-details.component.html +++ b/portal-frontend/src/app/features/public/application/submission/naru-details/naru-details.component.html @@ -163,33 +163,36 @@ {{ applicationSubmission.naruFillOrigin }} <app-no-data *ngIf="!applicationSubmission.naruFillOrigin"></app-no-data> </div> + <div class="grid-1"></div> + <div class="subheading2 grid-double">Fill to be Placed</div> - <div class="subheading1 full-width">Fill to be Placed</div> - <div class="full-width soil-table"> - <div class="grid-1"><strong>Volume</strong></div> - <div class="grid-2"> - {{ applicationSubmission.naruToPlaceVolume }} - <span *ngIf="applicationSubmission.naruToPlaceVolume !== null">m<sup>3</sup></span> - <app-no-data *ngIf="applicationSubmission.naruToPlaceVolume === null"></app-no-data> - </div> - <div class="grid-1"><strong>Area</strong></div> - <div class="grid-2"> - {{ applicationSubmission.naruToPlaceArea }} - <span *ngIf="applicationSubmission.naruToPlaceArea !== null">m<sup>2</sup></span> - <app-no-data *ngIf="applicationSubmission.naruToPlaceArea === null"></app-no-data> - </div> - <div class="grid-1"><strong>Maximum Depth</strong></div> - <div class="grid-2"> - {{ applicationSubmission.naruToPlaceMaximumDepth }} - <span *ngIf="applicationSubmission.naruToPlaceMaximumDepth !== null">m</span> - <app-no-data *ngIf="applicationSubmission.naruToPlaceMaximumDepth === null"></app-no-data> - </div> - <div class="grid-1"><strong>Average Depth</strong></div> - <div class="grid-2"> - {{ applicationSubmission.naruToPlaceAverageDepth }} - <span *ngIf="applicationSubmission.naruToPlaceAverageDepth !== null">m</span> - <app-no-data *ngIf="applicationSubmission.naruToPlaceAverageDepth === null"></app-no-data> - </div> + <div class="subheading2 grid-1">Volume</div> + <div class="grid-double"> + {{ applicationSubmission.naruToPlaceVolume }} + <span *ngIf="applicationSubmission.naruToPlaceVolume !== null">m<sup>3</sup></span> + <app-no-data *ngIf="applicationSubmission.naruToPlaceVolume === null"></app-no-data> + </div> + <div class="subheading2 grid-1">Area</div> + <div class="grid-double"> + {{ applicationSubmission.naruToPlaceArea }} + <span *ngIf="applicationSubmission.naruToPlaceArea !== null">m<sup>2</sup></span> + <app-no-data *ngIf="applicationSubmission.naruToPlaceArea === null"></app-no-data> + </div> + <div class="subheading2 grid-1">Maximum Depth</div> + <div class="grid-double"> + {{ applicationSubmission.naruToPlaceMaximumDepth }} + <span *ngIf="applicationSubmission.naruToPlaceMaximumDepth !== null">m</span> + <app-no-data + *ngIf="applicationSubmission.naruToPlaceMaximumDepth === null" + ></app-no-data> + </div> + <div class="subheading2 grid-1">Average Depth</div> + <div class="grid-double"> + {{ applicationSubmission.naruToPlaceAverageDepth }} + <span *ngIf="applicationSubmission.naruToPlaceAverageDepth !== null">m</span> + <app-no-data + *ngIf="applicationSubmission.naruToPlaceAverageDepth === null" + ></app-no-data> </div> <div class="full-width"> diff --git a/portal-frontend/src/app/features/public/application/submission/naru-details/naru-details.component.scss b/portal-frontend/src/app/features/public/application/submission/naru-details/naru-details.component.scss index 75917bf09c..b2b6b90127 100644 --- a/portal-frontend/src/app/features/public/application/submission/naru-details/naru-details.component.scss +++ b/portal-frontend/src/app/features/public/application/submission/naru-details/naru-details.component.scss @@ -1,9 +1,7 @@ -@use '../../../../../../styles/functions' as *; - .soil-table { display: grid; grid-template-columns: max-content max-content; overflow-x: auto; - grid-column-gap: rem(36); - grid-row-gap: rem(12); + grid-column-gap: 36px; + grid-row-gap: 12px; } diff --git a/portal-frontend/src/app/features/public/application/submission/nfu-details/nfu-details.component.scss b/portal-frontend/src/app/features/public/application/submission/nfu-details/nfu-details.component.scss index b2b6b90127..27b6f028ba 100644 --- a/portal-frontend/src/app/features/public/application/submission/nfu-details/nfu-details.component.scss +++ b/portal-frontend/src/app/features/public/application/submission/nfu-details/nfu-details.component.scss @@ -1,7 +1,23 @@ +@use '../../../../../../styles/functions' as *; + .soil-table { display: grid; - grid-template-columns: max-content max-content; overflow-x: auto; - grid-column-gap: 36px; - grid-row-gap: 12px; + grid-column-gap: rem(36); + grid-row-gap: rem(12); + grid-template-columns: max-content max-content max-content; + + @media screen and (min-width: $tabletBreakpoint) { + grid-template-columns: 0.55fr 1fr 1fr; + } + + @media screen and (min-width: $midBreakpoint) { + grid-template-columns: 0.95fr 1fr 2fr; + grid-column-gap: rem(16); + } + + .spacer-row { + grid-column: 1/4; + height: rem(16); + } } diff --git a/portal-frontend/src/app/features/public/application/submission/subd-details/subd-details.component.scss b/portal-frontend/src/app/features/public/application/submission/subd-details/subd-details.component.scss index e50cc03d80..44d2821c88 100644 --- a/portal-frontend/src/app/features/public/application/submission/subd-details/subd-details.component.scss +++ b/portal-frontend/src/app/features/public/application/submission/subd-details/subd-details.component.scss @@ -1,4 +1,4 @@ -@use '../../../../../../styles/functions' as *; +@use '../../../../../../styles/functions.scss' as *; .parcel-table { display: grid; @@ -6,4 +6,12 @@ overflow-x: auto; grid-column-gap: rem(36); grid-row-gap: rem(12); + + @media screen and (min-width: $tabletBreakpoint) { + grid-template-columns: 0.55fr 1fr 1fr; + } + + @media screen and (min-width: $midBreakpoint) { + grid-template-columns: 1fr 1fr 2fr; + } } diff --git a/portal-frontend/src/app/features/public/application/submission/submission-details.component.scss b/portal-frontend/src/app/features/public/application/submission/submission-details.component.scss index 8aae88078a..91e45cf6f5 100644 --- a/portal-frontend/src/app/features/public/application/submission/submission-details.component.scss +++ b/portal-frontend/src/app/features/public/application/submission/submission-details.component.scss @@ -72,10 +72,18 @@ .adjacent-parcels { display: grid; - grid-template-columns: max-content max-content max-content; overflow-x: auto; grid-column-gap: rem(36); grid-row-gap: rem(12); + grid-template-columns: max-content max-content max-content; + + @media screen and (min-width: $tabletBreakpoint) { + grid-template-columns: 0.55fr 1fr 1fr; + } + + @media screen and (min-width: $midBreakpoint) { + grid-template-columns: 1fr 1fr 2fr; + } .full-width { grid-column: 1/4; @@ -87,7 +95,7 @@ margin: rem(12) 0 rem(20) 0; background-color: colors.$grey-light; display: grid; - grid-row-gap: rem(24); + grid-row-gap: rem(4); grid-column-gap: rem(16); grid-template-columns: 1fr; word-wrap: break-word; @@ -106,6 +114,14 @@ } } + .subheading2 { + margin-bottom: 4px !important; + } + + .grid-double { + margin-bottom: rem(16); + } + .subheading2 { margin-bottom: rem(4) !important; } @@ -114,6 +130,7 @@ padding: rem(16); margin: rem(24) 0 rem(40) 0; grid-template-columns: minmax(rem(60), 1fr) minmax(rem(60), 1fr) minmax(rem(60), 1fr) minmax(rem(60), 1fr); + grid-row-gap: rem(24); .full-width { grid-column: 1/5; @@ -121,6 +138,7 @@ .grid-double { grid-column: 2/5; + margin-bottom: unset; } .grid-1 { diff --git a/portal-frontend/src/app/features/public/notice-of-intent/submission/pofo-details/pofo-details.component.html b/portal-frontend/src/app/features/public/notice-of-intent/submission/pofo-details/pofo-details.component.html index 5304c27347..242abeb87b 100644 --- a/portal-frontend/src/app/features/public/notice-of-intent/submission/pofo-details/pofo-details.component.html +++ b/portal-frontend/src/app/features/public/notice-of-intent/submission/pofo-details/pofo-details.component.html @@ -28,62 +28,60 @@ </div> <div class="grid-1"></div> - <div class="grid-2"> + <div class="grid-double"> <strong> Fill to be Placed</strong> </div> <div class="grid-1"><strong>Volume</strong></div> - <div class="grid-2"> + <div class="grid-double"> {{ noiSubmission.soilToPlaceVolume }} <span *ngIf="noiSubmission.soilToPlaceVolume">m<sup>3</sup></span> <app-no-data *ngIf="!noiSubmission.soilToPlaceVolume"></app-no-data> </div> <div class="grid-1"><strong>Area</strong></div> - <div class="grid-2"> + <div class="grid-double"> {{ noiSubmission.soilToPlaceArea }} <span *ngIf="noiSubmission.soilToPlaceArea">m<sup>2</sup></span> <app-no-data *ngIf="!noiSubmission.soilToPlaceArea"></app-no-data> </div> <div class="grid-1"><strong>Maximum Depth</strong></div> - <div class="grid-2"> + <div class="grid-double"> {{ noiSubmission.soilToPlaceMaximumDepth }} <span *ngIf="noiSubmission.soilToPlaceMaximumDepth">m</span> <app-no-data *ngIf="!noiSubmission.soilToPlaceMaximumDepth"></app-no-data> </div> <div class="grid-1"><strong>Average Depth</strong></div> - <div class="grid-2"> + <div class="grid-double"> {{ noiSubmission.soilToPlaceAverageDepth }} <span *ngIf="noiSubmission.soilToPlaceAverageDepth">m</span> <app-no-data *ngIf="!noiSubmission.soilToPlaceAverageDepth"></app-no-data> </div> - <div class="full-width soil-table"> - <div class="grid-1"></div> - <div class="grid-2"> - <strong> Fill already Placed</strong> - </div> - <div class="grid-1"><strong>Volume</strong></div> - <div class="grid-2"> - {{ noiSubmission.soilAlreadyPlacedVolume }} - <span *ngIf="noiSubmission.soilAlreadyPlacedVolume !== null">m<sup>3</sup></span> - <app-no-data *ngIf="noiSubmission.soilAlreadyPlacedVolume === null"></app-no-data> - </div> - <div class="grid-1"><strong>Area</strong></div> - <div class="grid-2"> - {{ noiSubmission.soilAlreadyPlacedArea }} - <span *ngIf="noiSubmission.soilAlreadyPlacedArea !== null">m<sup>2</sup></span> - <app-no-data *ngIf="noiSubmission.soilAlreadyPlacedArea === null"></app-no-data> - </div> - <div class="grid-1"><strong>Maximum Depth</strong></div> - <div class="grid-2"> - {{ noiSubmission.soilAlreadyPlacedMaximumDepth }} - <span *ngIf="noiSubmission.soilAlreadyPlacedMaximumDepth !== null">m</span> - <app-no-data *ngIf="noiSubmission.soilAlreadyPlacedMaximumDepth === null"></app-no-data> - </div> - <div class="grid-1"><strong>Average Depth</strong></div> - <div class="grid-2"> - {{ noiSubmission.soilAlreadyPlacedAverageDepth }} - <span *ngIf="noiSubmission.soilAlreadyPlacedAverageDepth !== null">m</span> - <app-no-data *ngIf="noiSubmission.soilAlreadyPlacedAverageDepth === null"></app-no-data> - </div> + <div class="grid-1"></div> + <div class="grid-double"> + <strong> Fill already Placed</strong> + </div> + <div class="grid-1"><strong>Volume</strong></div> + <div class="grid-double"> + {{ noiSubmission.soilAlreadyPlacedVolume }} + <span *ngIf="noiSubmission.soilAlreadyPlacedVolume !== null">m<sup>3</sup></span> + <app-no-data *ngIf="noiSubmission.soilAlreadyPlacedVolume === null"></app-no-data> + </div> + <div class="grid-1"><strong>Area</strong></div> + <div class="grid-double"> + {{ noiSubmission.soilAlreadyPlacedArea }} + <span *ngIf="noiSubmission.soilAlreadyPlacedArea !== null">m<sup>2</sup></span> + <app-no-data *ngIf="noiSubmission.soilAlreadyPlacedArea === null"></app-no-data> + </div> + <div class="grid-1"><strong>Maximum Depth</strong></div> + <div class="grid-double"> + {{ noiSubmission.soilAlreadyPlacedMaximumDepth }} + <span *ngIf="noiSubmission.soilAlreadyPlacedMaximumDepth !== null">m</span> + <app-no-data *ngIf="noiSubmission.soilAlreadyPlacedMaximumDepth === null"></app-no-data> + </div> + <div class="grid-1"><strong>Average Depth</strong></div> + <div class="grid-double"> + {{ noiSubmission.soilAlreadyPlacedAverageDepth }} + <span *ngIf="noiSubmission.soilAlreadyPlacedAverageDepth !== null">m</span> + <app-no-data *ngIf="noiSubmission.soilAlreadyPlacedAverageDepth === null"></app-no-data> </div> <div class="full-width"> diff --git a/portal-frontend/src/app/features/public/notice-of-intent/submission/submission-details.component.scss b/portal-frontend/src/app/features/public/notice-of-intent/submission/submission-details.component.scss index 397ba4f7bc..d0e591d936 100644 --- a/portal-frontend/src/app/features/public/notice-of-intent/submission/submission-details.component.scss +++ b/portal-frontend/src/app/features/public/notice-of-intent/submission/submission-details.component.scss @@ -70,10 +70,18 @@ .adjacent-parcels { display: grid; - grid-template-columns: max-content max-content max-content; overflow-x: auto; grid-column-gap: rem(36); grid-row-gap: rem(12); + grid-template-columns: max-content max-content max-content; + + @media screen and (min-width: $tabletBreakpoint) { + grid-template-columns: 0.55fr 1fr 1fr; + } + + @media screen and (min-width: $midBreakpoint) { + grid-template-columns: 1fr 1fr 2fr; + } .full-width { grid-column: 1/4; @@ -85,7 +93,7 @@ margin: rem(12) 0 rem(20) 0; background-color: colors.$grey-light; display: grid; - grid-row-gap: rem(24); + grid-row-gap: rem(4); grid-column-gap: rem(16); grid-template-columns: 1fr; word-wrap: break-word; @@ -104,6 +112,10 @@ } } + .grid-double { + margin-bottom: rem(16); + } + .subheading2 { margin-bottom: rem(4) !important; } @@ -112,6 +124,7 @@ padding: rem(16); margin: rem(24) 0 rem(40) 0; grid-template-columns: minmax(rem(60), 1fr) minmax(rem(60), 1fr) minmax(rem(60), 1fr) minmax(rem(60), 1fr); + grid-row-gap: rem(24); .full-width { grid-column: 1/5; @@ -119,6 +132,7 @@ .grid-double { grid-column: 2/5; + margin-bottom: unset; } .grid-1 { diff --git a/portal-frontend/src/app/features/public/notification/submission/submission-details.component.scss b/portal-frontend/src/app/features/public/notification/submission/submission-details.component.scss index 821554db72..7f51c39fff 100644 --- a/portal-frontend/src/app/features/public/notification/submission/submission-details.component.scss +++ b/portal-frontend/src/app/features/public/notification/submission/submission-details.component.scss @@ -92,6 +92,7 @@ padding: rem(16); margin: rem(24) 0 rem(40) 0; grid-template-columns: minmax(rem(60), 1fr) minmax(rem(60), 1fr) minmax(rem(60), 1fr) minmax(rem(60), 1fr); + grid-row-gap: rem(24); .full-width { grid-column: 1/5; @@ -99,6 +100,7 @@ .grid-double { grid-column: 2/5; + margin-bottom: unset; } .grid-1 { @@ -112,6 +114,10 @@ .grid-3 { grid-column: 3/5; } + + .edit-button { + grid-column: 1/5; + } } } } From 0e661abf803ef2689204d1fe1acd78ab201a7716 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Thu, 2 Nov 2023 13:22:20 -0700 Subject: [PATCH 595/954] Covenant Fixes * Mark form fields as dirty * Allow overflow to work --- .../cove-details/cove-details.component.scss | 1 - .../cove-details/cove-details.component.scss | 1 - .../proposal/cove-proposal/cove-proposal.component.ts | 5 ++++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/cove-details/cove-details.component.scss b/alcs-frontend/src/app/features/application/applicant-info/application-details/cove-details/cove-details.component.scss index bdc16e75f5..6ae03fd94e 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/application-details/cove-details/cove-details.component.scss +++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/cove-details/cove-details.component.scss @@ -5,6 +5,5 @@ overflow-x: auto; grid-column-gap: 36px; grid-row-gap: 12px; - overflow: unset; margin-bottom: 12px; } diff --git a/portal-frontend/src/app/features/applications/application-details/cove-details/cove-details.component.scss b/portal-frontend/src/app/features/applications/application-details/cove-details/cove-details.component.scss index 447d17d081..a2993dd182 100644 --- a/portal-frontend/src/app/features/applications/application-details/cove-details/cove-details.component.scss +++ b/portal-frontend/src/app/features/applications/application-details/cove-details/cove-details.component.scss @@ -7,6 +7,5 @@ overflow-x: auto; grid-column-gap: rem(36); grid-row-gap: rem(12); - overflow: unset; margin-bottom: rem(12); } diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/cove-proposal/cove-proposal.component.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/cove-proposal/cove-proposal.component.ts index 49a4acade3..ad7e9c0fe4 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/cove-proposal/cove-proposal.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/cove-proposal/cove-proposal.component.ts @@ -51,7 +51,6 @@ export class CoveProposalComponent extends FilesStepComponent implements OnInit, showDraftCovenantVirus = false; constructor( - private router: Router, private covenantTransfereeService: CovenantTransfereeService, private applicationSubmissionService: ApplicationSubmissionService, applicationDocumentService: ApplicationDocumentService, @@ -76,6 +75,10 @@ export class CoveProposalComponent extends FilesStepComponent implements OnInit, }); this.canUploadDraft = !!submission.coveHasDraft; + + if (this.showErrors) { + this.form.markAllAsTouched(); + } } }); From d5f4ae7574086dd1e3e0ce84973ae1999229f5f0 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Thu, 2 Nov 2023 16:47:59 -0700 Subject: [PATCH 596/954] Update ALCS Edit Submission for Covenants * Copy over covenants when creating draft * Delete when publishing --- .../application-dialog.component.html | 1 - .../alcs-edit-submission.component.html | 8 +++ .../alcs-edit-submission.component.ts | 6 ++- ...plication-submission-draft.service.spec.ts | 27 +++++++++- .../application-submission-draft.service.ts | 52 ++++++++++++++++++- .../covenant-transferee.controller.ts | 1 - .../covenant-transferee.service.spec.ts | 1 - .../covenant-transferee.service.ts | 9 ++-- ...of-intent-submission-draft.service.spec.ts | 3 ++ 9 files changed, 97 insertions(+), 11 deletions(-) diff --git a/alcs-frontend/src/app/features/board/dialogs/application/application-dialog.component.html b/alcs-frontend/src/app/features/board/dialogs/application/application-dialog.component.html index 272424e607..4d8fd736c7 100644 --- a/alcs-frontend/src/app/features/board/dialogs/application/application-dialog.component.html +++ b/alcs-frontend/src/app/features/board/dialogs/application/application-dialog.component.html @@ -8,7 +8,6 @@ <h6 class="card-type-label">Application</h6> <div class="header-row"> <div class="left"> <h3 class="card-title"> - ` <span class="margin-right">{{ cardTitle }}</span> <app-application-legacy-id [legacyId]="application.legacyId"></app-application-legacy-id> <app-application-type-pill [type]="application.type"></app-application-type-pill> diff --git a/portal-frontend/src/app/features/applications/alcs-edit-submission/alcs-edit-submission.component.html b/portal-frontend/src/app/features/applications/alcs-edit-submission/alcs-edit-submission.component.html index 8234ebe5c2..786daf15c5 100644 --- a/portal-frontend/src/app/features/applications/alcs-edit-submission/alcs-edit-submission.component.html +++ b/portal-frontend/src/app/features/applications/alcs-edit-submission/alcs-edit-submission.component.html @@ -154,6 +154,14 @@ <h6 *ngIf="applicationSubmission"> (navigateToStep)="switchStep($event)" (exit)="onExit()" ></app-incl-proposal> + <app-cove-proposal + *ngIf="applicationSubmission.typeCode === 'COVE'" + [$applicationSubmission]="$applicationSubmission" + [$applicationDocuments]="$applicationDocuments" + [showErrors]="showValidationErrors" + (navigateToStep)="switchStep($event)" + (exit)="onExit()" + ></app-cove-proposal> </div> </cdk-step> <cdk-step label="Upload Attachments"> diff --git a/portal-frontend/src/app/features/applications/alcs-edit-submission/alcs-edit-submission.component.ts b/portal-frontend/src/app/features/applications/alcs-edit-submission/alcs-edit-submission.component.ts index 4cbfe2e511..6f3644bd85 100644 --- a/portal-frontend/src/app/features/applications/alcs-edit-submission/alcs-edit-submission.component.ts +++ b/portal-frontend/src/app/features/applications/alcs-edit-submission/alcs-edit-submission.component.ts @@ -1,4 +1,3 @@ -import { StepperSelectionEvent } from '@angular/cdk/stepper'; import { AfterViewInit, Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; import { ActivatedRoute, Router } from '@angular/router'; @@ -19,6 +18,7 @@ import { OtherAttachmentsComponent } from '../edit-submission/other-attachments/ import { OtherParcelsComponent } from '../edit-submission/other-parcels/other-parcels.component'; import { ParcelDetailsComponent } from '../edit-submission/parcel-details/parcel-details.component'; import { PrimaryContactComponent } from '../edit-submission/primary-contact/primary-contact.component'; +import { CoveProposalComponent } from '../edit-submission/proposal/cove-proposal/cove-proposal.component'; import { NfuProposalComponent } from '../edit-submission/proposal/nfu-proposal/nfu-proposal.component'; import { PfrsProposalComponent } from '../edit-submission/proposal/pfrs-proposal/pfrs-proposal.component'; import { PofoProposalComponent } from '../edit-submission/proposal/pofo-proposal/pofo-proposal.component'; @@ -66,6 +66,7 @@ export class AlcsEditSubmissionComponent implements OnInit, OnDestroy, AfterView @ViewChild(PfrsProposalComponent) pfrsProposalComponent?: PfrsProposalComponent; @ViewChild(ExclProposalComponent) exclProposalComponent?: ExclProposalComponent; @ViewChild(InclProposalComponent) inclProposalComponent?: InclProposalComponent; + @ViewChild(CoveProposalComponent) coveProposalComponent?: CoveProposalComponent; @ViewChild(OtherAttachmentsComponent) otherAttachmentsComponent!: OtherAttachmentsComponent; constructor( @@ -206,6 +207,9 @@ export class AlcsEditSubmissionComponent implements OnInit, OnDestroy, AfterView if (this.inclProposalComponent) { await this.inclProposalComponent.onSave(); } + if (this.coveProposalComponent) { + await this.coveProposalComponent.onSave(); + } } async switchStep(index: number) { diff --git a/services/apps/alcs/src/portal/application-submission-draft/application-submission-draft.service.spec.ts b/services/apps/alcs/src/portal/application-submission-draft/application-submission-draft.service.spec.ts index d9d213219c..14cfbde99a 100644 --- a/services/apps/alcs/src/portal/application-submission-draft/application-submission-draft.service.spec.ts +++ b/services/apps/alcs/src/portal/application-submission-draft/application-submission-draft.service.spec.ts @@ -1,6 +1,7 @@ import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; +import { create } from 'handlebars'; import { Repository } from 'typeorm'; import { ApplicationSubmissionStatusService } from '../../alcs/application/application-submission-status/application-submission-status.service'; import { User } from '../../user/user.entity'; @@ -8,6 +9,8 @@ import { ApplicationOwnerService } from '../application-submission/application-o import { ApplicationParcelService } from '../application-submission/application-parcel/application-parcel.service'; import { ApplicationSubmission } from '../application-submission/application-submission.entity'; import { ApplicationSubmissionService } from '../application-submission/application-submission.service'; +import { CovenantTransferee } from '../application-submission/covenant-transferee/covenant-transferee.entity'; +import { CovenantTransfereeService } from '../application-submission/covenant-transferee/covenant-transferee.service'; import { GenerateSubmissionDocumentService } from '../pdf-generation/generate-submission-document.service'; import { ApplicationSubmissionDraftService } from './application-submission-draft.service'; @@ -19,6 +22,7 @@ describe('ApplicationSubmissionDraftService', () => { let mockAppOwnerService: DeepMocked<ApplicationOwnerService>; let mockGenerateSubmissionDocumentService: DeepMocked<GenerateSubmissionDocumentService>; let mockApplicationSubmissionStatusService: DeepMocked<ApplicationSubmissionStatusService>; + let mockTransfereeService: DeepMocked<CovenantTransfereeService>; beforeEach(async () => { mockSubmissionRepo = createMock(); @@ -27,6 +31,7 @@ describe('ApplicationSubmissionDraftService', () => { mockAppOwnerService = createMock(); mockGenerateSubmissionDocumentService = createMock(); mockApplicationSubmissionStatusService = createMock(); + mockTransfereeService = createMock(); const module: TestingModule = await Test.createTestingModule({ providers: [ @@ -55,6 +60,10 @@ describe('ApplicationSubmissionDraftService', () => { provide: ApplicationSubmissionStatusService, useValue: mockApplicationSubmissionStatusService, }, + { + provide: CovenantTransfereeService, + useValue: mockTransfereeService, + }, ], }).compile(); @@ -105,7 +114,7 @@ describe('ApplicationSubmissionDraftService', () => { expect(draft).toBeDefined(); }); - it('should delete a draft, attached parcels, statuses and owners', async () => { + it('should delete a draft, attached parcels, statuses, transferees and owners', async () => { mockSubmissionRepo.findOne.mockResolvedValue( new ApplicationSubmission({ owners: [], @@ -118,11 +127,19 @@ describe('ApplicationSubmissionDraftService', () => { mockApplicationSubmissionStatusService.removeStatuses.mockResolvedValue( {} as any, ); + mockTransfereeService.fetchBySubmissionUuid.mockResolvedValue([ + new CovenantTransferee(), + ]); + mockTransfereeService.delete.mockResolvedValue({} as any); await service.deleteDraft('fileNumber'); expect(mockSubmissionRepo.findOne).toHaveBeenCalledTimes(1); expect(mockSubmissionRepo.remove).toHaveBeenCalledTimes(1); + expect(mockTransfereeService.fetchBySubmissionUuid).toHaveBeenCalledTimes( + 1, + ); + expect(mockTransfereeService.delete).toHaveBeenCalledTimes(1); expect(mockParcelService.deleteMany).toHaveBeenCalledTimes(1); expect( mockApplicationSubmissionStatusService.removeStatuses, @@ -145,12 +162,20 @@ describe('ApplicationSubmissionDraftService', () => { mockApplicationSubmissionStatusService.removeStatuses.mockResolvedValue( {} as any, ); + mockTransfereeService.fetchBySubmissionUuid.mockResolvedValue([ + new CovenantTransferee(), + ]); + mockTransfereeService.delete.mockResolvedValue({} as any); await service.publish('fileNumber', new User()); expect(mockSubmissionRepo.findOne).toHaveBeenCalledTimes(2); expect(mockSubmissionRepo.delete).toHaveBeenCalledTimes(1); expect(mockSubmissionRepo.delete).toBeCalledWith({ uuid: 'fake' }); + expect(mockTransfereeService.fetchBySubmissionUuid).toHaveBeenCalledTimes( + 1, + ); + expect(mockTransfereeService.delete).toHaveBeenCalledTimes(1); expect(mockParcelService.deleteMany).toHaveBeenCalledTimes(1); expect(mockSubmissionRepo.save).toHaveBeenCalledTimes(1); expect( diff --git a/services/apps/alcs/src/portal/application-submission-draft/application-submission-draft.service.ts b/services/apps/alcs/src/portal/application-submission-draft/application-submission-draft.service.ts index 32d88b773d..61468ad253 100644 --- a/services/apps/alcs/src/portal/application-submission-draft/application-submission-draft.service.ts +++ b/services/apps/alcs/src/portal/application-submission-draft/application-submission-draft.service.ts @@ -9,7 +9,12 @@ import { ApplicationParcelUpdateDto } from '../application-submission/applicatio import { ApplicationParcelService } from '../application-submission/application-parcel/application-parcel.service'; import { ApplicationSubmission } from '../application-submission/application-submission.entity'; import { ApplicationSubmissionService } from '../application-submission/application-submission.service'; -import { GenerateSubmissionDocumentService } from '../pdf-generation/generate-submission-document.service'; +import { CovenantTransferee } from '../application-submission/covenant-transferee/covenant-transferee.entity'; +import { CovenantTransfereeService } from '../application-submission/covenant-transferee/covenant-transferee.service'; +import { + APPLICATION_SUBMISSION_TYPES, + GenerateSubmissionDocumentService, +} from '../pdf-generation/generate-submission-document.service'; @Injectable() export class ApplicationSubmissionDraftService { @@ -23,6 +28,7 @@ export class ApplicationSubmissionDraftService { private applicationOwnerService: ApplicationOwnerService, private generateSubmissionDocumentService: GenerateSubmissionDocumentService, private applicationSubmissionStatusService: ApplicationSubmissionStatusService, + private covenantTransfereeService: CovenantTransfereeService, ) {} async getOrCreateDraft(fileNumber: string) { @@ -166,6 +172,10 @@ export class ApplicationSubmissionDraftService { ); } + if (originalSubmission.typeCode === APPLICATION_SUBMISSION_TYPES.COVE) { + await this.copyTransferees(originalSubmission, newSubmission); + } + this.logger.debug(`Draft Created for File Number ${fileNumber}`); const submission = await this.getDraft(fileNumber); @@ -205,6 +215,13 @@ export class ApplicationSubmissionDraftService { for (const owner of original.owners) { await this.applicationOwnerService.delete(owner); } + + const transferees = + await this.covenantTransfereeService.fetchBySubmissionUuid(original.uuid); + for (const transferee of transferees) { + await this.covenantTransfereeService.delete(transferee); + } + const parcelUuids = original.parcels.map((parcel) => parcel.uuid); await this.applicationParcelService.deleteMany(parcelUuids); await this.applicationSubmissionStatusService.removeStatuses(original.uuid); @@ -248,6 +265,14 @@ export class ApplicationSubmissionDraftService { await this.applicationOwnerService.delete(owner); } + const transferees = + await this.covenantTransfereeService.fetchBySubmissionUuid( + draftSubmission.uuid, + ); + for (const transferee of transferees) { + await this.covenantTransfereeService.delete(transferee); + } + await this.applicationSubmissionStatusService.removeStatuses( draftSubmission.uuid, ); @@ -270,4 +295,29 @@ export class ApplicationSubmissionDraftService { canView: true, }; } + + private async copyTransferees( + originalSubmission: ApplicationSubmission, + newSubmission: ApplicationSubmission, + ) { + const transferees = + await this.covenantTransfereeService.fetchBySubmissionUuid( + originalSubmission.uuid, + ); + + for (const transferee of transferees) { + await this.covenantTransfereeService.create( + { + firstName: transferee.firstName ?? undefined, + lastName: transferee.lastName ?? undefined, + organizationName: transferee.organizationName ?? undefined, + email: transferee.email ?? undefined, + phoneNumber: transferee.phoneNumber ?? undefined, + typeCode: transferee.type.code, + applicationSubmissionUuid: newSubmission.uuid, + }, + newSubmission, + ); + } + } } diff --git a/services/apps/alcs/src/portal/application-submission/covenant-transferee/covenant-transferee.controller.ts b/services/apps/alcs/src/portal/application-submission/covenant-transferee/covenant-transferee.controller.ts index e07f2bcb33..83d8441736 100644 --- a/services/apps/alcs/src/portal/application-submission/covenant-transferee/covenant-transferee.controller.ts +++ b/services/apps/alcs/src/portal/application-submission/covenant-transferee/covenant-transferee.controller.ts @@ -74,7 +74,6 @@ export class CovenantTransfereeController { const owner = await this.covenantTransfereeService.create( createDto, applicationSubmission, - req.user.entity, ); return this.mapper.mapAsync( diff --git a/services/apps/alcs/src/portal/application-submission/covenant-transferee/covenant-transferee.service.spec.ts b/services/apps/alcs/src/portal/application-submission/covenant-transferee/covenant-transferee.service.spec.ts index 2aedf9682f..dcab8537b1 100644 --- a/services/apps/alcs/src/portal/application-submission/covenant-transferee/covenant-transferee.service.spec.ts +++ b/services/apps/alcs/src/portal/application-submission/covenant-transferee/covenant-transferee.service.spec.ts @@ -76,7 +76,6 @@ describe('CovenantTransfereeService', () => { typeCode: '', }, new ApplicationSubmission(), - new User(), ); expect(mockRepo.save).toHaveBeenCalledTimes(1); diff --git a/services/apps/alcs/src/portal/application-submission/covenant-transferee/covenant-transferee.service.ts b/services/apps/alcs/src/portal/application-submission/covenant-transferee/covenant-transferee.service.ts index 266c147b14..d71f6fda3a 100644 --- a/services/apps/alcs/src/portal/application-submission/covenant-transferee/covenant-transferee.service.ts +++ b/services/apps/alcs/src/portal/application-submission/covenant-transferee/covenant-transferee.service.ts @@ -50,7 +50,6 @@ export class CovenantTransfereeService { async create( createDto: CovenantTransfereeCreateDto, applicationSubmission: ApplicationSubmission, - user: User, ) { const type = await this.typeRepository.findOneOrFail({ where: { @@ -119,14 +118,14 @@ export class CovenantTransfereeService { return await this.repository.save(existingOwner); } - async delete(owner: CovenantTransferee) { - return await this.repository.remove(owner); + async delete(transferee: CovenantTransferee) { + return await this.repository.remove(transferee); } - async getOwner(ownerUuid: string) { + async getOwner(transfereeUuid: string) { return await this.repository.findOneOrFail({ where: { - uuid: ownerUuid, + uuid: transfereeUuid, }, relations: { type: true, diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission-draft/notice-of-intent-submission-draft.service.spec.ts b/services/apps/alcs/src/portal/notice-of-intent-submission-draft/notice-of-intent-submission-draft.service.spec.ts index 64be70944d..39462d1bc0 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission-draft/notice-of-intent-submission-draft.service.spec.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission-draft/notice-of-intent-submission-draft.service.spec.ts @@ -1,9 +1,12 @@ import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; +import { create } from 'handlebars'; import { Repository } from 'typeorm'; import { NoticeOfIntentSubmissionStatusService } from '../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service'; import { User } from '../../user/user.entity'; +import { CovenantTransferee } from '../application-submission/covenant-transferee/covenant-transferee.entity'; +import { CovenantTransfereeService } from '../application-submission/covenant-transferee/covenant-transferee.service'; import { NoticeOfIntentOwnerService } from '../notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.service'; import { NoticeOfIntentParcelService } from '../notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.service'; import { NoticeOfIntentSubmission } from '../notice-of-intent-submission/notice-of-intent-submission.entity'; From ab8c0c76cf797fdbf3a6f681dba179756146e33f Mon Sep 17 00:00:00 2001 From: Liam Stoddard <lstodd@protonmail.com> Date: Thu, 2 Nov 2023 23:37:08 -0700 Subject: [PATCH 597/954] MR feedback --- .../applications/__init__.py | 27 ++------- .../applications/migrate_application.py | 28 +++++++++ .../applications/submissions/__init__.py | 16 +---- ...sions.py => migrate_application_status.py} | 2 +- .../application_status_base_insert.py | 1 - .../statuses/application_status_type_code.py | 35 ----------- .../application_command_parser.py | 58 ++----------------- .../menu/commands/applications.py | 55 ++++-------------- .../menu/commands/clean_all.py | 8 +-- .../menu/commands/import_all.py | 23 ++------ bin/migrate-oats-data/menu/menu.py | 10 +--- bin/migrate-oats-data/migrate.py | 17 +----- 12 files changed, 62 insertions(+), 218 deletions(-) create mode 100644 bin/migrate-oats-data/applications/migrate_application.py rename bin/migrate-oats-data/applications/submissions/{migrate_application_submissions.py => migrate_application_status.py} (94%) delete mode 100644 bin/migrate-oats-data/applications/submissions/statuses/application_status_type_code.py diff --git a/bin/migrate-oats-data/applications/__init__.py b/bin/migrate-oats-data/applications/__init__.py index 3184071a45..4e895bc490 100644 --- a/bin/migrate-oats-data/applications/__init__.py +++ b/bin/migrate-oats-data/applications/__init__.py @@ -1,25 +1,10 @@ -from .base_applications import * -from .app_prep import process_alcs_application_prep_fields -from .submissions import ( - process_alcs_app_submissions, - clean_application_submission, - init_application_statuses, - clean_application_submission_statuses, - process_alcs_application_in_progress_status, - process_alcs_application_received_by_alc_status, - process_alcs_application_submitted_to_alc_status, - process_alcs_application_submitted_to_alc_incomplete_status, - process_alcs_application_decision_released_status, - process_alcs_application_cancelled_status, - process_alcs_application_review_lfng_status, - process_alcs_application_wrong_lfng_status, - process_alcs_application_returned_incomplete_lfng_status, - process_alcs_application_submitted_lfng_status, - process_application_statuses, - clean_app_submissions, -) from .application_submission_status_email import ( process_application_submission_status_emails, clean_application_submission_status_emails, ) -from .base_applications import process_applications + +from .migrate_application import ( + process_application_etl, + clean_alcs_applications, + init_applications, +) diff --git a/bin/migrate-oats-data/applications/migrate_application.py b/bin/migrate-oats-data/applications/migrate_application.py new file mode 100644 index 0000000000..dc7194463b --- /dev/null +++ b/bin/migrate-oats-data/applications/migrate_application.py @@ -0,0 +1,28 @@ +from .submissions import ( + clean_app_submissions, + process_application_statuses, + process_alcs_app_submissions, +) +from .base_applications import process_applications, clean_applications +from .app_prep import process_alcs_application_prep_fields +from .application_submission_status_email import ( + process_application_submission_status_emails, + clean_application_submission_status_emails, +) + + +def process_application_etl(batch_size): + process_alcs_application_prep_fields(batch_size) + process_alcs_app_submissions(batch_size) + process_application_statuses(batch_size) + process_application_submission_status_emails() + + +def clean_alcs_applications(): + clean_application_submission_status_emails() + clean_app_submissions() + clean_applications() + + +def init_applications(batch_size): + process_applications(batch_size) diff --git a/bin/migrate-oats-data/applications/submissions/__init__.py b/bin/migrate-oats-data/applications/submissions/__init__.py index ed8c750deb..407b458a7c 100644 --- a/bin/migrate-oats-data/applications/submissions/__init__.py +++ b/bin/migrate-oats-data/applications/submissions/__init__.py @@ -1,19 +1,5 @@ from .app_submissions import process_alcs_app_submissions, clean_application_submission -from .statuses import ( - init_application_statuses, - clean_application_submission_statuses, - process_alcs_application_in_progress_status, - process_alcs_application_received_by_alc_status, - process_alcs_application_submitted_to_alc_status, - process_alcs_application_submitted_to_alc_incomplete_status, - process_alcs_application_decision_released_status, - process_alcs_application_cancelled_status, - process_alcs_application_review_lfng_status, - process_alcs_application_wrong_lfng_status, - process_alcs_application_returned_incomplete_lfng_status, - process_alcs_application_submitted_lfng_status, -) -from .migrate_application_submissions import ( +from .migrate_application_status import ( process_application_statuses, clean_app_submissions, ) diff --git a/bin/migrate-oats-data/applications/submissions/migrate_application_submissions.py b/bin/migrate-oats-data/applications/submissions/migrate_application_status.py similarity index 94% rename from bin/migrate-oats-data/applications/submissions/migrate_application_submissions.py rename to bin/migrate-oats-data/applications/submissions/migrate_application_status.py index 19c0a7c8dd..2633f9bcce 100644 --- a/bin/migrate-oats-data/applications/submissions/migrate_application_submissions.py +++ b/bin/migrate-oats-data/applications/submissions/migrate_application_status.py @@ -1,4 +1,4 @@ -from .app_submissions import process_alcs_app_submissions, clean_application_submission +from .app_submissions import clean_application_submission, process_alcs_app_submissions from .statuses import ( init_application_statuses, clean_application_submission_statuses, diff --git a/bin/migrate-oats-data/applications/submissions/statuses/application_status_base_insert.py b/bin/migrate-oats-data/applications/submissions/statuses/application_status_base_insert.py index 4b1ee2920e..480575a779 100644 --- a/bin/migrate-oats-data/applications/submissions/statuses/application_status_base_insert.py +++ b/bin/migrate-oats-data/applications/submissions/statuses/application_status_base_insert.py @@ -1,7 +1,6 @@ from common import OATS_ETL_USER, setup_and_get_logger, BATCH_UPLOAD_SIZE from db import inject_conn_pool from psycopg2.extras import RealDictCursor -from .application_status_type_code import * etl_name = "init_application_statuses" logger = setup_and_get_logger(etl_name) diff --git a/bin/migrate-oats-data/applications/submissions/statuses/application_status_type_code.py b/bin/migrate-oats-data/applications/submissions/statuses/application_status_type_code.py deleted file mode 100644 index 3cf9696563..0000000000 --- a/bin/migrate-oats-data/applications/submissions/statuses/application_status_type_code.py +++ /dev/null @@ -1,35 +0,0 @@ -def get_app_status_type(cursor): - query = f"""SELECT code from - alcs.application_submission_status_type - """ - cursor.execute(query) - status_rows = cursor.fetchall() - return status_rows - - -def get_app_status_count(cursor): - query = f"""SELECT count(*) from - alcs.application_submission_status_type - """ - cursor.execute(query) - count_rows = cursor.fetchall() - return count_rows - - -def make_rows(types, rows): - alr_id = "alr_application_id" - type_dict = {} - for row in rows: - for stat in types: - app_id = row[alr_id] - if app_id in type_dict: - type_dict[app_id].append( - {"status_type_code": stat["code"], "submission_uuid": row["uuid"]} - ) - - else: - type_dict[app_id] = [] - type_dict[app_id].append( - {"status_type_code": stat["code"], "submission_uuid": row["uuid"]} - ) - return type_dict diff --git a/bin/migrate-oats-data/menu/command_parser/application_command_parser.py b/bin/migrate-oats-data/menu/command_parser/application_command_parser.py index 20092fa0ff..9d57cbe356 100644 --- a/bin/migrate-oats-data/menu/command_parser/application_command_parser.py +++ b/bin/migrate-oats-data/menu/command_parser/application_command_parser.py @@ -12,58 +12,8 @@ def application_import_command_parser(import_batch_size, subparsers): ) -def app_prep_import_command_parser(import_batch_size, subparsers): - app_prep_import_command = subparsers.add_parser( - "app-prep-import", - help=f"Import App prep into ALCS (update applications table) in specified batch size: (default: {import_batch_size})", - ) - app_prep_import_command.add_argument( - "--batch-size", - type=int, - default=import_batch_size, - metavar="", - help=f"batch size (default: {import_batch_size})", - ) - - -def app_sub_import_command_parser(import_batch_size, subparsers): - app_sub_import_command = subparsers.add_parser( - "app-sub-import", - help=f"Import App submission into ALCS (update application_submission table) in specified batch size: (default: {import_batch_size})", - ) - app_sub_import_command.add_argument( - "--batch-size", - type=int, - default=import_batch_size, - metavar="", - help=f"batch size (default: {import_batch_size})", - ) - - -def app_status_import_command_parser(import_batch_size, subparsers): - app_status_import_command = subparsers.add_parser( - "app-status-import", - help=f"Import App submission statuses into ALCS (update application_submission_to_submission_status table) in specified batch size: (default: {import_batch_size})", - ) - app_status_import_command.add_argument( - "--batch-size", - type=int, - default=import_batch_size, - metavar="", - help=f"batch size (default: {import_batch_size})", - ) - - -def app_all_import_command_parser(import_batch_size, subparsers): - # This is to make development quicker as to not wait - app_all_import_command = subparsers.add_parser( - "app-all-import", - help=f"Import all non document application related tables in specified batch size: (default: {import_batch_size})", - ) - app_all_import_command.add_argument( - "--batch-size", - type=int, - default=import_batch_size, - metavar="", - help=f"batch size (default: {import_batch_size})", +def app_clean_command_parser(subparsers): + subparsers.add_parser( + "application-clean", + help="Clean Application imported data:", ) diff --git a/bin/migrate-oats-data/menu/commands/applications.py b/bin/migrate-oats-data/menu/commands/applications.py index f7ea68917f..d2d98bdaaa 100644 --- a/bin/migrate-oats-data/menu/commands/applications.py +++ b/bin/migrate-oats-data/menu/commands/applications.py @@ -1,28 +1,14 @@ from applications import ( - process_applications, - process_alcs_application_prep_fields, - process_application_statuses, - process_alcs_app_submissions, + process_application_etl, + clean_alcs_applications, + init_applications, ) -def app_prep_import(console, args): - console.log("Beginning OATS -> ALCS app-prep import process") - with console.status( - "[bold green]App prep import (applications table update in ALCS)...\n" - ) as status: - if args.batch_size: - import_batch_size = args.batch_size - - console.log(f"Processing app-prep import in batch size = {import_batch_size}") - - process_alcs_application_prep_fields(batch_size=import_batch_size) - - def application_import(console, args): console.log("Beginning OATS -> ALCS application import process") with console.status( - "[bold green]application import (application table update in ALCS)...\n" + "[bold green]application import (Application and application related table update in ALCS)...\n" ) as status: if args.batch_size: import_batch_size = args.batch_size @@ -31,32 +17,11 @@ def application_import(console, args): f"Processing applications import in batch size = {import_batch_size}" ) - process_applications(batch_size=import_batch_size) - - -def application_submission_import(console, args): - console.log("Beginning OATS -> ALCS app-sub import process") - with console.status( - "[bold green]App submission import (application_submission table update in ALCS)...\n" - ) as status: - if args.batch_size: - import_batch_size = args.batch_size - - console.log(f"Processing app-sub import in batch size = {import_batch_size}") - - process_alcs_app_submissions(batch_size=import_batch_size) - - -def application_status_import(console, args): - console.log("Beginning OATS -> ALCS app-status import process") - with console.status( - "[bold green]App submission status import (application_submission_to_submission_status table update in ALCS)...\n" - ) as status: - if args.batch_size: - import_batch_size = args.batch_size + init_applications(batch_size=import_batch_size) + process_application_etl(batch_size=import_batch_size) - console.log( - f"Processing application statuses import in batch size = {import_batch_size}" - ) - process_application_statuses(batch_size=import_batch_size) +def application_clean(console): + console.log("Beginning ALCS application clean") + with console.status("[bold green]Cleaning ALCS Applications...\n") as status: + clean_alcs_applications() diff --git a/bin/migrate-oats-data/menu/commands/clean_all.py b/bin/migrate-oats-data/menu/commands/clean_all.py index 8d84da8b38..4561f3b1e7 100644 --- a/bin/migrate-oats-data/menu/commands/clean_all.py +++ b/bin/migrate-oats-data/menu/commands/clean_all.py @@ -1,8 +1,5 @@ -from applications import clean_applications +from applications.migrate_application import clean_alcs_applications from noi.notice_of_intent_migration import clean_notice_of_intent -from applications.submissions import ( - clean_app_submissions, -) from applications.application_submission_status_email import ( clean_application_submission_status_emails, ) @@ -24,8 +21,7 @@ def clean_all(console, args): clean_application_documents() clean_noi_documents() clean_documents() - clean_app_submissions() - clean_applications() + clean_alcs_applications() clean_notice_of_intent() clean_application_submission_status_emails(), clean_notice_of_intent_submission_status_emails(), diff --git a/bin/migrate-oats-data/menu/commands/import_all.py b/bin/migrate-oats-data/menu/commands/import_all.py index e507e0988d..07bc9caa74 100644 --- a/bin/migrate-oats-data/menu/commands/import_all.py +++ b/bin/migrate-oats-data/menu/commands/import_all.py @@ -1,15 +1,8 @@ -from applications import ( - process_applications, - process_alcs_application_prep_fields, -) +from applications.migrate_application import process_application_etl, init_applications from noi.notice_of_intent_migration import ( init_notice_of_intents, process_notice_of_intent, ) -from applications.submissions import ( - process_application_statuses, - process_alcs_app_submissions, -) from applications.application_submission_status_email import ( process_application_submission_status_emails, ) @@ -37,8 +30,8 @@ def import_all(console, args): if args and args.batch_size: import_batch_size = args.batch_size - console.log("Batching applications:") - process_applications(batch_size=import_batch_size) + console.log("Init Applications:") + init_applications(batch_size=import_batch_size) console.log("Init NOIs:") init_notice_of_intents(batch_size=import_batch_size) @@ -55,14 +48,8 @@ def import_all(console, args): console.log("Processing ALCS NOI documents:") link_alcs_docs_to_noi_docs(batch_size=import_batch_size) - console.log("Processing application prep:") - process_alcs_application_prep_fields(batch_size=import_batch_size) - - console.log("Processing application submission:") - process_alcs_app_submissions(batch_size=import_batch_size) - - console.log("Processing application statuses:") - process_application_statuses(batch_size=import_batch_size) + console.log("Processing Applications:") + process_application_etl(batch_size=import_batch_size) console.log("Processing notice of intents") process_notice_of_intent(batch_size=import_batch_size) diff --git a/bin/migrate-oats-data/menu/menu.py b/bin/migrate-oats-data/menu/menu.py index 5243843330..72bfe9b886 100644 --- a/bin/migrate-oats-data/menu/menu.py +++ b/bin/migrate-oats-data/menu/menu.py @@ -1,10 +1,7 @@ import sys, argparse from .command_parser.application_command_parser import ( application_import_command_parser, - app_prep_import_command_parser, - app_sub_import_command_parser, - app_status_import_command_parser, - app_all_import_command_parser, + app_clean_command_parser, ) from .command_parser.notice_of_intent_command_parser import ( noi_import_command_parser, @@ -41,17 +38,14 @@ def setup_menu_args_parser(import_batch_size): # Add subcommands to parser subparsers = parser.add_subparsers(dest="command") application_import_command_parser(import_batch_size, subparsers) + app_clean_command_parser(subparsers) document_import_command_parser(import_batch_size, subparsers) application_document_import_command_parser(import_batch_size, subparsers) - app_prep_import_command_parser(import_batch_size, subparsers) noi_import_command_parser(import_batch_size, subparsers) noi_clean_command_parser(subparsers) document_noi_import_command_parser(import_batch_size, subparsers) noi_document_import_command_parser(import_batch_size, subparsers) _import_command_parser(subparsers) - app_sub_import_command_parser(import_batch_size, subparsers) - app_status_import_command_parser(import_batch_size, subparsers) - app_all_import_command_parser(import_batch_size, subparsers) subparsers.add_parser("clean", help="Clean all imported data") diff --git a/bin/migrate-oats-data/migrate.py b/bin/migrate-oats-data/migrate.py index 5eb6b71b1f..6f9cc074c1 100644 --- a/bin/migrate-oats-data/migrate.py +++ b/bin/migrate-oats-data/migrate.py @@ -10,14 +10,12 @@ clean_all, document_import, app_document_import, - app_prep_import, application_import, - application_submission_import, + application_clean, noi_document_import, notice_of_intent_import, notice_of_intent_clean, start_obfuscation, - application_status_import, ) from db import connection_pool from common import BATCH_UPLOAD_SIZE, setup_and_get_logger @@ -43,27 +41,18 @@ document_import(console, args) case "app-document-import": app_document_import(console, args) - case "app-prep-import": - app_prep_import(console, args) case "noi-import": notice_of_intent_import(console, args) case "noi-clean": notice_of_intent_clean(console) case "application-import": application_import(console, args) + case "application-clean": + application_clean(console) case "noi-document-import": noi_document_import(console, args) - case "app-sub-import": - application_submission_import(console, args) case "obfuscate": start_obfuscation(console) - case "app-status-import": - application_status_import(console, args) - case "app-all-import": - application_import(console, args) - app_prep_import(console, args) - application_submission_import(console, args) - application_status_import(console, args) finally: if connection_pool: From 342e0547f91de1f3e9d719b50a0bedeefba3a95d Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Fri, 3 Nov 2023 15:19:38 -0700 Subject: [PATCH 598/954] Add Second Used End Date field for PFRS * Add second use end date for PFRS applications * Done for both NOIs and PFRS --- alcs-frontend/src/app/app-routing.module.ts | 1 - alcs-frontend/src/app/app.module.ts | 9 +- .../application-details.component.spec.ts | 2 + .../pfrs-details/pfrs-details.component.html | 20 ++++- .../pfrs/pfrs.component.html | 12 ++- .../decision-component/pfrs/pfrs.component.ts | 6 +- .../decision-component.component.ts | 17 +++- .../pfrs-input/pfrs-input.component.html | 31 +++++-- .../decision-components.component.ts | 12 ++- .../proposal/proposal.component.scss | 14 ++-- .../proposal/soil/soil.component.html | 20 ++++- ...notice-of-intent-details.component.spec.ts | 2 + .../pfrs-details/pfrs-details.component.html | 20 ++++- .../pfrs/pfrs.component.html | 12 ++- .../decision-component.component.ts | 18 +++- .../pfrs-input/pfrs-input.component.html | 30 +++++-- .../decision-components.component.ts | 9 +- .../proposal/proposal.component.scss | 14 ++-- .../proposal/soil/soil.component.html | 20 ++++- .../application-submission.service.spec.ts | 2 + .../services/application/application.dto.ts | 4 + .../application-decision-v2.dto.ts | 7 +- .../decision/notice-of-intent-decision.dto.ts | 9 +- ...otice-of-intent-submission.service.spec.ts | 3 + .../notice-of-intent/notice-of-intent.dto.ts | 10 ++- .../pfrs-details/pfrs-details.component.html | 21 ++++- .../pfrs-proposal.component.html | 82 ++++++++++++++++--- .../pfrs-proposal/pfrs-proposal.component.ts | 29 ++++--- .../pfrs/pfrs-proposal.component.html | 82 ++++++++++++++++--- .../proposal/pfrs/pfrs-proposal.component.ts | 28 +++++-- .../pfrs-details/pfrs-details.component.html | 21 ++++- .../pfrs-details/pfrs-details.component.html | 16 +++- .../pfrs-details/pfrs-details.component.html | 16 +++- .../application-submission.dto.ts | 4 + .../notice-of-intent-submission.dto.ts | 4 + .../services/public/public-application.dto.ts | 2 + .../public/public-notice-of-intent.dto.ts | 2 + .../application-decision-component.dto.ts | 8 +- .../application-decision-component.entity.ts | 11 ++- .../application-decision-component.service.ts | 3 + .../application/application.controller.ts | 1 + .../src/alcs/application/application.dto.ts | 6 ++ .../alcs/application/application.entity.ts | 7 ++ ...notice-of-intent-decision-component.dto.ts | 8 +- ...ice-of-intent-decision-component.entity.ts | 9 +- ...ce-of-intent-decision-component.service.ts | 8 +- .../notice-of-intent/notice-of-intent.dto.ts | 7 +- .../notice-of-intent.entity.ts | 7 ++ .../notice-of-intent.service.ts | 5 ++ ...lication-decision-v2.automapper.profile.ts | 4 + .../application.automapper.profile.ts | 4 + ...e-of-intent-decision.automapper.profile.ts | 4 + .../notice-of-intent.automapper.profile.ts | 4 + .../application-submission.dto.ts | 14 ++++ .../application-submission.entity.ts | 14 ++++ .../application-submission.service.ts | 8 ++ .../notice-of-intent-submission.dto.ts | 14 ++++ .../notice-of-intent-submission.entity.ts | 14 ++++ ...otice-of-intent-submission.service.spec.ts | 2 +- .../notice-of-intent-submission.service.ts | 8 ++ .../application-decision.controller.spec.ts | 7 -- .../application-decision.controller.ts | 2 - .../application/public-application.dto.ts | 6 ++ .../public-notice-of-intent.dto.ts | 6 ++ .../1699034386231-add_fill_project_fields.ts | 35 ++++++++ ...9037990967-add_second_end_date_for_decs.ts | 79 ++++++++++++++++++ 66 files changed, 779 insertions(+), 137 deletions(-) create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1699034386231-add_fill_project_fields.ts create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1699037990967-add_second_end_date_for_decs.ts diff --git a/alcs-frontend/src/app/app-routing.module.ts b/alcs-frontend/src/app/app-routing.module.ts index ce5da50120..94d71b7f2f 100644 --- a/alcs-frontend/src/app/app-routing.module.ts +++ b/alcs-frontend/src/app/app-routing.module.ts @@ -106,7 +106,6 @@ const routes: Routes = [ imports: [ RouterModule.forRoot(routes, { preloadingStrategy: PreloadAllModules, - enableTracing: true, }), ], exports: [RouterModule], diff --git a/alcs-frontend/src/app/app.module.ts b/alcs-frontend/src/app/app.module.ts index a92968e50b..de3d0d8ec8 100644 --- a/alcs-frontend/src/app/app.module.ts +++ b/alcs-frontend/src/app/app.module.ts @@ -12,7 +12,6 @@ import { AuthorizationComponent } from './features/authorization/authorization.c import { NotFoundComponent } from './features/errors/not-found/not-found.component'; import { LoginComponent } from './features/login/login.component'; import { ProvisionComponent } from './features/provision/provision.component'; -import { SearchModule } from './features/search/search.module'; import { AuthInterceptorService } from './services/authentication/auth-interceptor.service'; import { TokenRefreshService } from './services/authentication/token-refresh.service'; import { ConfirmationDialogComponent } from './shared/confirmation-dialog/confirmation-dialog.component'; @@ -33,13 +32,7 @@ import { SharedModule } from './shared/shared.module'; NotificationsComponent, SearchBarComponent, ], - imports: [ - BrowserModule, - BrowserAnimationsModule, - SharedModule.forRoot(), - AppRoutingModule, - MomentDateModule, - ], + imports: [BrowserModule, BrowserAnimationsModule, SharedModule.forRoot(), AppRoutingModule, MomentDateModule], providers: [ { provide: HTTP_INTERCEPTORS, useClass: AuthInterceptorService, multi: true }, { provide: MAT_DIALOG_DEFAULT_OPTIONS, useValue: { panelClass: 'mat-dialog-override' } }, diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.spec.ts b/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.spec.ts index 1cc93143fb..5e51ee5931 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.spec.ts +++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.spec.ts @@ -52,6 +52,8 @@ describe('ApplicationDetailsComponent', () => { soilToPlaceVolume: null, soilToRemoveAverageDepth: null, soilToRemoveMaximumDepth: null, + fillProjectDurationAmount: null, + fillProjectDurationUnit: null, status: {} as ApplicationStatus, type: '', uuid: '', diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/pfrs-details/pfrs-details.component.html b/alcs-frontend/src/app/features/application/applicant-info/application-details/pfrs-details/pfrs-details.component.html index 160fd5efd1..4a8bd04ddb 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/application-details/pfrs-details/pfrs-details.component.html +++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/pfrs-details/pfrs-details.component.html @@ -14,7 +14,25 @@ <span>{{ _applicationSubmission.purpose }}</span> </div> - <div class="subheading2 grid-1">Project Duration</div> + <div class="subheading2 grid-1">Placement of Fill Project Duration</div> + <div class="grid-double"> + <div *ngIf="_applicationSubmission.fillProjectDurationAmount && _applicationSubmission.fillProjectDurationUnit"> + {{ _applicationSubmission.fillProjectDurationAmount }} + <ng-container [ngPlural]="_applicationSubmission.fillProjectDurationAmount"> + <ng-template ngPluralCase="=1"> + {{ _applicationSubmission.fillProjectDurationUnit.slice(0, -1) | titlecase }} + </ng-template> + <ng-template ngPluralCase="other"> + {{ _applicationSubmission.fillProjectDurationUnit | titlecase }} + </ng-template> + </ng-container> + </div> + <app-no-data + *ngIf="!_applicationSubmission.fillProjectDurationAmount || !_applicationSubmission.fillProjectDurationUnit" + ></app-no-data> + </div> + + <div class="subheading2 grid-1">Remove of Soil Project Duration</div> <div class="grid-double"> <div *ngIf="_applicationSubmission.soilProjectDurationAmount && _applicationSubmission.soilProjectDurationUnit"> {{ _applicationSubmission.soilProjectDurationAmount }} diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pfrs/pfrs.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pfrs/pfrs.component.html index 47ef06075b..e39fe73023 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pfrs/pfrs.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pfrs/pfrs.component.html @@ -1,6 +1,12 @@ <ng-content></ng-content> +<div></div> <div> - <div class="subheading2">Use End Date</div> + <div class="subheading2">Use End Date (Placement of Fill)</div> + {{ component.endDate2 | date }} + <app-no-data *ngIf="component.endDate2 === null || component.endDate2 === undefined"></app-no-data> +</div> +<div> + <div class="subheading2">Use End Date (Removal of Soil)</div> {{ component.endDate | date }} <app-no-data *ngIf="component.endDate === null || component.endDate === undefined"></app-no-data> </div> @@ -45,9 +51,7 @@ </td> </tr> <tr> - <td class="soil-table-label"> - Area - </td> + <td class="soil-table-label">Area</td> <td> <span *ngIf="component.soilToRemoveArea !== null && component.soilToRemoveArea !== undefined"> {{ component.soilToRemoveArea }} m<sup>2</sup></span diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pfrs/pfrs.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pfrs/pfrs.component.ts index 94882d40e7..02ad7403ce 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pfrs/pfrs.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pfrs/pfrs.component.ts @@ -1,5 +1,5 @@ -import { Component, EventEmitter, Input, Output } from '@angular/core'; -import { ApplicationDecisionComponentDto } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; +import { Component, Input } from '@angular/core'; +import { PfrsDecisionComponentDto } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; @Component({ selector: 'app-app-pfrs', @@ -7,5 +7,5 @@ import { ApplicationDecisionComponentDto } from '../../../../../../services/appl styleUrls: ['./pfrs.component.scss'], }) export class PfrsComponent { - @Input() component!: ApplicationDecisionComponentDto; + @Input() component!: PfrsDecisionComponentDto; } diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.ts index 3592a1be0e..fafb72f034 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.ts @@ -12,6 +12,7 @@ import { RosoDecisionComponentDto, SubdDecisionComponentDto, ExpiryDateDecisionComponentDto, + PfrsDecisionComponentDto, } from '../../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; import { ToastService } from '../../../../../../../services/toast/toast.service'; import { AG_CAP_OPTIONS, AG_CAP_SOURCE_OPTIONS } from '../../../../../../../shared/dto/ag-cap.types.dto'; @@ -51,6 +52,9 @@ export class DecisionComponentComponent implements OnInit { maximumDepthToPlace = new FormControl<number | null>(null, [Validators.required]); averageDepthToPlace = new FormControl<number | null>(null, [Validators.required]); + //pfrs + endDate2 = new FormControl<Date | null>(null, [Validators.required]); + // roso, pfrs soilTypeRemoved = new FormControl<string | null>(null, [Validators.required]); volumeToRemove = new FormControl<number | null>(null, [Validators.required]); @@ -108,8 +112,7 @@ export class DecisionComponentComponent implements OnInit { this.patchRosoFields(); break; case APPLICATION_DECISION_COMPONENT_TYPE.PFRS: - this.patchPofoFields(); - this.patchRosoFields(); + this.patchPfrsFields(); break; case APPLICATION_DECISION_COMPONENT_TYPE.NARU: this.patchNaruFields(); @@ -221,6 +224,13 @@ export class DecisionComponentComponent implements OnInit { this.expiryDate.setValue(this.data.expiryDate ? new Date(this.data.expiryDate) : null); } + private patchPfrsFields() { + this.patchPofoFields(); + this.patchRosoFields(); + this.form.addControl('endDate2', this.endDate2); + this.endDate2.setValue(this.data.endDate2 ? new Date(this.data.endDate2) : null); + } + private patchPofoFields() { this.form.addControl('endDate', this.endDate); this.form.addControl('fillTypeToPlace', this.fillTypeToPlace); @@ -313,9 +323,10 @@ export class DecisionComponentComponent implements OnInit { }; } - private getPfrsDataChange(): RosoDecisionComponentDto & PofoDecisionComponentDto { + private getPfrsDataChange(): PfrsDecisionComponentDto { return { endDate: this.endDate.value ? formatDateForApi(this.endDate.value) : null, + endDate2: this.endDate2.value ? formatDateForApi(this.endDate2.value) : null, soilTypeRemoved: this.soilTypeRemoved.value ?? null, soilToRemoveArea: this.areaToRemove.value ?? null, soilToRemoveVolume: this.volumeToRemove.value ?? null, diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/pfrs-input/pfrs-input.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/pfrs-input/pfrs-input.component.html index 626c578605..9d6349344d 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/pfrs-input/pfrs-input.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/pfrs-input/pfrs-input.component.html @@ -1,20 +1,33 @@ <form [formGroup]="form" class="pofo-component-form"> + <mat-form-field appearance="outline" class="row"> + <mat-label>ALR Area Impacted (ha)</mat-label> + <input + matInput + min="0.01" + mask="separator.2" + thousandSeparator="," + separatorLimit="9999999999" + formControlName="alrArea" + required + /> + </mat-form-field> + <div class="grid-2"> - <mat-form-field appearance="outline"> - <mat-label>ALR Area Impacted (ha)</mat-label> + <mat-form-field appearance="outline" class="date-picker"> + <mat-label>Use End Date (Placement of Fill)</mat-label> <input matInput - min="0.01" - mask="separator.2" - thousandSeparator="," - separatorLimit="9999999999" - formControlName="alrArea" - required + (click)="endDatePicker2.open()" + [matDatepicker]="endDatePicker2" + formControlName="endDate2" + name="date" /> + <mat-datepicker-toggle matSuffix [for]="endDatePicker2"></mat-datepicker-toggle> + <mat-datepicker #endDatePicker2 type="date"></mat-datepicker> </mat-form-field> <mat-form-field appearance="outline" class="date-picker"> - <mat-label>Use End Date</mat-label> + <mat-label>Use End Date (Removal of Soil)</mat-label> <input matInput (click)="endDatePicker.open()" diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-components.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-components.component.ts index a6cdc0d82b..356ce27b9c 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-components.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-components.component.ts @@ -81,9 +81,12 @@ export class DecisionComponentsComponent implements OnInit, OnDestroy, AfterView } onAddNewComponent(uiCode: string, typeCode: string) { + debugger; switch (uiCode) { case 'COPY': const component: ApplicationDecisionComponentDto = { + endDate: this.application.proposalEndDate, + endDate2: this.application.proposalEndDate2, applicationDecisionComponentTypeCode: typeCode, alrArea: this.application.alrArea, agCap: this.application.agCap, @@ -120,8 +123,7 @@ export class DecisionComponentsComponent implements OnInit, OnDestroy, AfterView } if (typeCode === APPLICATION_DECISION_COMPONENT_TYPE.PFRS) { - this.patchPofoFields(component); - this.patchRosoFields(component); + this.patchPfrsFields(component); } if (typeCode === APPLICATION_DECISION_COMPONENT_TYPE.NARU) { @@ -233,6 +235,12 @@ export class DecisionComponentsComponent implements OnInit, OnDestroy, AfterView component.expiryDate = this.application.proposalExpiryDate; } + private patchPfrsFields(component: ApplicationDecisionComponentDto) { + this.patchPofoFields(component); + this.patchRosoFields(component); + component.endDate2 = this.application.proposalEndDate2; + } + private patchPofoFields(component: ApplicationDecisionComponentDto) { component.endDate = this.application.proposalEndDate; component.soilFillTypeToPlace = this.application.submittedApplication?.soilFillTypeToPlace; diff --git a/alcs-frontend/src/app/features/application/proposal/proposal.component.scss b/alcs-frontend/src/app/features/application/proposal/proposal.component.scss index 102987e802..09ded1e684 100644 --- a/alcs-frontend/src/app/features/application/proposal/proposal.component.scss +++ b/alcs-frontend/src/app/features/application/proposal/proposal.component.scss @@ -2,12 +2,14 @@ h3 { margin-bottom: 24px !important; } -.input-table { - display: grid; - grid-template-columns: 1fr 1fr; - margin-top: 16px; - row-gap: 32px; - column-gap: 24px; +:host::ng-deep { + .input-table { + display: grid; + grid-template-columns: 1fr 1fr; + margin-top: 16px; + row-gap: 32px; + column-gap: 24px; + } } section { diff --git a/alcs-frontend/src/app/features/application/proposal/soil/soil.component.html b/alcs-frontend/src/app/features/application/proposal/soil/soil.component.html index f681faaec2..35d5722387 100644 --- a/alcs-frontend/src/app/features/application/proposal/soil/soil.component.html +++ b/alcs-frontend/src/app/features/application/proposal/soil/soil.component.html @@ -1,4 +1,4 @@ -<div> +<div *ngIf="submission?.typeCode !== 'PFRS'"> <div class="subheading2">Use End Date</div> <app-inline-datepicker [value]="application?.proposalEndDate" @@ -6,6 +6,24 @@ ></app-inline-datepicker> </div> +<div class="input-table"> + <div *ngIf="submission?.typeCode === 'PFRS'"> + <div class="subheading2">Use End Date (Placement of Fill)</div> + <app-inline-datepicker + [value]="application?.proposalEndDate2" + (save)="updateApplicationValue('proposalEndDate2', $event)" + ></app-inline-datepicker> + </div> + + <div *ngIf="submission?.typeCode === 'PFRS'"> + <div class="subheading2">Use End Date (Removal of Soil)</div> + <app-inline-datepicker + [value]="application?.proposalEndDate" + (save)="updateApplicationValue('proposalEndDate', $event)" + ></app-inline-datepicker> + </div> +</div> + <div *ngIf="submission?.soilFillTypeToPlace"> <div class="subheading2 header">Type, origin and quality of fill proposed to be placed.</div> {{ submission?.soilFillTypeToPlace }} diff --git a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/notice-of-intent-details.component.spec.ts b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/notice-of-intent-details.component.spec.ts index 8151e0a9ea..ef5e1665b5 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/notice-of-intent-details.component.spec.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/notice-of-intent-details.component.spec.ts @@ -107,6 +107,8 @@ describe('NoticeOfIntentDetailsComponent', () => { soilAlreadyPlacedAverageDepth: null, soilProjectDurationAmount: null, soilProjectDurationUnit: null, + fillProjectDurationUnit: null, + fillProjectDurationAmount: null, soilFillTypeToPlace: null, soilProposedStructures: [], }; diff --git a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/pfrs-details/pfrs-details.component.html b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/pfrs-details/pfrs-details.component.html index a34ba32991..b8aa3510cd 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/pfrs-details/pfrs-details.component.html +++ b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/pfrs-details/pfrs-details.component.html @@ -14,7 +14,25 @@ <span>{{ _noiSubmission.purpose }}</span> </div> - <div class="subheading2 grid-1">Project Duration</div> + <div class="subheading2 grid-1">Placement of Fill Project Duration</div> + <div class="grid-double"> + <div *ngIf="_noiSubmission.fillProjectDurationAmount && _noiSubmission.fillProjectDurationUnit"> + {{ _noiSubmission.fillProjectDurationAmount }} + <ng-container [ngPlural]="_noiSubmission.fillProjectDurationAmount"> + <ng-template ngPluralCase="=1"> + {{ _noiSubmission.fillProjectDurationUnit.slice(0, -1) | titlecase }} + </ng-template> + <ng-template ngPluralCase="other"> + {{ _noiSubmission.fillProjectDurationUnit | titlecase }} + </ng-template> + </ng-container> + </div> + <app-no-data + *ngIf="!_noiSubmission.fillProjectDurationAmount || !_noiSubmission.fillProjectDurationUnit" + ></app-no-data> + </div> + + <div class="subheading2 grid-1">Removal of Soil Project Duration</div> <div class="grid-double"> <div *ngIf="_noiSubmission.soilProjectDurationAmount && _noiSubmission.soilProjectDurationUnit"> {{ _noiSubmission.soilProjectDurationAmount }} diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/pfrs/pfrs.component.html b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/pfrs/pfrs.component.html index 47ef06075b..e39fe73023 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/pfrs/pfrs.component.html +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/pfrs/pfrs.component.html @@ -1,6 +1,12 @@ <ng-content></ng-content> +<div></div> <div> - <div class="subheading2">Use End Date</div> + <div class="subheading2">Use End Date (Placement of Fill)</div> + {{ component.endDate2 | date }} + <app-no-data *ngIf="component.endDate2 === null || component.endDate2 === undefined"></app-no-data> +</div> +<div> + <div class="subheading2">Use End Date (Removal of Soil)</div> {{ component.endDate | date }} <app-no-data *ngIf="component.endDate === null || component.endDate === undefined"></app-no-data> </div> @@ -45,9 +51,7 @@ </td> </tr> <tr> - <td class="soil-table-label"> - Area - </td> + <td class="soil-table-label">Area</td> <td> <span *ngIf="component.soilToRemoveArea !== null && component.soilToRemoveArea !== undefined"> {{ component.soilToRemoveArea }} m<sup>2</sup></span diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.ts b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.ts index 4d6e98e313..44ea906cce 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.ts @@ -5,6 +5,7 @@ import { NoticeOfIntentDecisionCodesDto, NoticeOfIntentDecisionComponentDto, NoticeOfIntentDecisionComponentTypeDto, + PfrsDecisionComponentDto, PofoDecisionComponentDto, RosoDecisionComponentDto, } from '../../../../../../../services/notice-of-intent/decision/notice-of-intent-decision.dto'; @@ -42,6 +43,9 @@ export class DecisionComponentComponent implements OnInit { maximumDepthToRemove = new FormControl<number | null>(null, [Validators.required]); averageDepthToRemove = new FormControl<number | null>(null, [Validators.required]); + //pfrs + endDate2 = new FormControl<Date | null>(null, [Validators.required]); + // general endDate = new FormControl<Date | null>(null, [Validators.required]); alrArea = new FormControl<number | null>(null, [Validators.required]); @@ -76,8 +80,7 @@ export class DecisionComponentComponent implements OnInit { this.patchRosoFields(); break; case NOI_DECISION_COMPONENT_TYPE.PFRS: - this.patchPofoFields(); - this.patchRosoFields(); + this.patchPfrsFields(); break; default: this.toastService.showErrorToast('Wrong decision component type'); @@ -137,6 +140,14 @@ export class DecisionComponentComponent implements OnInit { return dataChange; } + private patchPfrsFields() { + this.patchPofoFields(); + this.patchRosoFields(); + this.form.addControl('endDate2', this.endDate2); + + this.endDate2.setValue(this.data.endDate2 ? new Date(this.data.endDate2) : null); + } + private patchPofoFields() { this.form.addControl('endDate', this.endDate); this.form.addControl('fillTypeToPlace', this.fillTypeToPlace); @@ -191,9 +202,10 @@ export class DecisionComponentComponent implements OnInit { }; } - private getPfrsDataChange(): RosoDecisionComponentDto & PofoDecisionComponentDto { + private getPfrsDataChange(): PfrsDecisionComponentDto { return { endDate: this.endDate.value ? formatDateForApi(this.endDate.value) : null, + endDate2: this.endDate2.value ? formatDateForApi(this.endDate2.value) : null, soilTypeRemoved: this.soilTypeRemoved.value ?? null, soilToRemoveArea: this.areaToRemove.value ?? null, soilToRemoveVolume: this.volumeToRemove.value ?? null, diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/pfrs-input/pfrs-input.component.html b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/pfrs-input/pfrs-input.component.html index 678de0ed3e..c46cee3cd2 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/pfrs-input/pfrs-input.component.html +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/pfrs-input/pfrs-input.component.html @@ -1,20 +1,32 @@ <form [formGroup]="form" class="pofo-component-form"> + <mat-form-field class="row" appearance="outline"> + <mat-label>ALR Area Impacted (ha)</mat-label> + <input + matInput + min="0.01" + mask="separator.2" + thousandSeparator="," + separatorLimit="9999999999" + formControlName="alrArea" + required + /> + </mat-form-field> <div class="grid-2"> - <mat-form-field appearance="outline"> - <mat-label>ALR Area Impacted (ha)</mat-label> + <mat-form-field appearance="outline" class="date-picker"> + <mat-label>Use End Date (Placement of Fill)</mat-label> <input matInput - min="0.01" - mask="separator.2" - thousandSeparator="," - separatorLimit="9999999999" - formControlName="alrArea" - required + (click)="endDatePicker2.open()" + [matDatepicker]="endDatePicker2" + formControlName="endDate2" + name="date" /> + <mat-datepicker-toggle matSuffix [for]="endDatePicker2"></mat-datepicker-toggle> + <mat-datepicker #endDatePicker2 type="date"></mat-datepicker> </mat-form-field> <mat-form-field appearance="outline" class="date-picker"> - <mat-label>Use End Date</mat-label> + <mat-label>Use End Date (Removal of Soil)</mat-label> <input matInput (click)="endDatePicker.open()" diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-components.component.ts b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-components.component.ts index 259a47b70d..0c3d46eda1 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-components.component.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-components.component.ts @@ -113,8 +113,7 @@ export class DecisionComponentsComponent implements OnInit, OnDestroy, AfterView } if (typeCode === NOI_DECISION_COMPONENT_TYPE.PFRS) { - this.patchPofoFields(component); - this.patchRosoFields(component); + this.patchPfrsFields(component); } this.components.unshift(component); @@ -188,6 +187,12 @@ export class DecisionComponentsComponent implements OnInit, OnDestroy, AfterView this.updateComponentsMenuItems(); } + private patchPfrsFields(component: NoticeOfIntentDecisionComponentDto) { + this.patchRosoFields(component); + this.patchRosoFields(component); + component.endDate2 = this.noticeOfIntent.proposalEndDate2; + } + private patchPofoFields(component: NoticeOfIntentDecisionComponentDto) { component.endDate = this.noticeOfIntent.proposalEndDate; component.soilFillTypeToPlace = this.noticeOfIntentSubmission.soilFillTypeToPlace; diff --git a/alcs-frontend/src/app/features/notice-of-intent/proposal/proposal.component.scss b/alcs-frontend/src/app/features/notice-of-intent/proposal/proposal.component.scss index 102987e802..09ded1e684 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/proposal/proposal.component.scss +++ b/alcs-frontend/src/app/features/notice-of-intent/proposal/proposal.component.scss @@ -2,12 +2,14 @@ h3 { margin-bottom: 24px !important; } -.input-table { - display: grid; - grid-template-columns: 1fr 1fr; - margin-top: 16px; - row-gap: 32px; - column-gap: 24px; +:host::ng-deep { + .input-table { + display: grid; + grid-template-columns: 1fr 1fr; + margin-top: 16px; + row-gap: 32px; + column-gap: 24px; + } } section { diff --git a/alcs-frontend/src/app/features/notice-of-intent/proposal/soil/soil.component.html b/alcs-frontend/src/app/features/notice-of-intent/proposal/soil/soil.component.html index ade80649b7..09eadb8383 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/proposal/soil/soil.component.html +++ b/alcs-frontend/src/app/features/notice-of-intent/proposal/soil/soil.component.html @@ -1,4 +1,4 @@ -<div> +<div *ngIf="submission?.typeCode !== 'PFRS'"> <div class="subheading2">Use End Date</div> <app-inline-datepicker [value]="noticeOfIntent?.proposalEndDate" @@ -6,6 +6,24 @@ ></app-inline-datepicker> </div> +<div class="input-table"> + <div *ngIf="submission?.typeCode === 'PFRS'"> + <div class="subheading2">Use End Date (Placement of Fill)</div> + <app-inline-datepicker + [value]="noticeOfIntent?.proposalEndDate2" + (save)="updateValue('proposalEndDate2', $event)" + ></app-inline-datepicker> + </div> + + <div *ngIf="submission?.typeCode === 'PFRS'"> + <div class="subheading2">Use End Date (Removal of Soil)</div> + <app-inline-datepicker + [value]="noticeOfIntent?.proposalEndDate" + (save)="updateValue('proposalEndDate', $event)" + ></app-inline-datepicker> + </div> +</div> + <div *ngIf="submission?.soilFillTypeToPlace"> <div class="subheading2 header">Type, origin and quality of fill proposed to be placed.</div> {{ submission?.soilFillTypeToPlace }} diff --git a/alcs-frontend/src/app/services/application/application-submission/application-submission.service.spec.ts b/alcs-frontend/src/app/services/application/application-submission/application-submission.service.spec.ts index d106476ea7..25cafafd38 100644 --- a/alcs-frontend/src/app/services/application/application-submission/application-submission.service.spec.ts +++ b/alcs-frontend/src/app/services/application/application-submission/application-submission.service.spec.ts @@ -88,6 +88,8 @@ describe('ApplicationSubmissionService', () => { soilFollowUpIDs: null, soilProjectDurationAmount: null, soilProjectDurationUnit: null, + fillProjectDurationAmount: null, + fillProjectDurationUnit: null, soilReduceNegativeImpacts: null, soilToPlaceAverageDepth: null, soilToPlaceMaximumDepth: null, diff --git a/alcs-frontend/src/app/services/application/application.dto.ts b/alcs-frontend/src/app/services/application/application.dto.ts index 3dd7764955..048bc02f6f 100644 --- a/alcs-frontend/src/app/services/application/application.dto.ts +++ b/alcs-frontend/src/app/services/application/application.dto.ts @@ -182,6 +182,8 @@ export interface ApplicationSubmissionDto { soilAlreadyPlacedAverageDepth: number | null; soilProjectDurationAmount: number | null; soilProjectDurationUnit: string | null; + fillProjectDurationAmount: number | null; + fillProjectDurationUnit: string | null; soilFillTypeToPlace: string | null; soilAlternativeMeasures: string | null; soilIsExtractionOrMining: boolean | null; @@ -256,6 +258,7 @@ export interface ApplicationDto { nfuUseSubType?: string; inclExclApplicantType?: string; proposalEndDate?: number; + proposalEndDate2?: number; proposalExpiryDate?: number; legacyId?: string; } @@ -287,6 +290,7 @@ export interface UpdateApplicationDto { nfuUseType?: string; nfuUseSubType?: string; inclExclApplicantType?: string; + proposalEndDate2?: number; proposalEndDate?: number; proposalExpiryDate?: number; } diff --git a/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-v2.dto.ts b/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-v2.dto.ts index 46e408ee40..dd1c944915 100644 --- a/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-v2.dto.ts +++ b/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-v2.dto.ts @@ -140,6 +140,10 @@ export interface NaruDecisionComponentDto { naruSubtype?: NaruSubtypesDto | null; } +export interface PfrsDecisionComponentDto extends PofoDecisionComponentDto, RosoDecisionComponentDto { + endDate2?: number | null; +} + export interface PofoDecisionComponentDto { endDate?: number | null; soilFillTypeToPlace?: string | null; @@ -174,7 +178,8 @@ export interface ApplicationDecisionComponentDto RosoDecisionComponentDto, NaruDecisionComponentDto, SubdDecisionComponentDto, - InclExclDecisionComponentDto { + InclExclDecisionComponentDto, + PfrsDecisionComponentDto { uuid?: string; alrArea?: number | null; agCap?: string | null; diff --git a/alcs-frontend/src/app/services/notice-of-intent/decision/notice-of-intent-decision.dto.ts b/alcs-frontend/src/app/services/notice-of-intent/decision/notice-of-intent-decision.dto.ts index a5134b647f..a09ff9d1d3 100644 --- a/alcs-frontend/src/app/services/notice-of-intent/decision/notice-of-intent-decision.dto.ts +++ b/alcs-frontend/src/app/services/notice-of-intent/decision/notice-of-intent-decision.dto.ts @@ -122,7 +122,10 @@ export interface UpdateNoticeOfIntentDecisionComponentDto { soilToRemoveAverageDepth?: number | null; } -export interface NoticeOfIntentDecisionComponentDto extends PofoDecisionComponentDto, RosoDecisionComponentDto { +export interface NoticeOfIntentDecisionComponentDto + extends PofoDecisionComponentDto, + RosoDecisionComponentDto, + PfrsDecisionComponentDto { uuid?: string; alrArea?: number | null; agCap?: string | null; @@ -134,6 +137,10 @@ export interface NoticeOfIntentDecisionComponentDto extends PofoDecisionComponen noticeOfIntentDecisionComponentType?: NoticeOfIntentDecisionComponentTypeDto; } +export interface PfrsDecisionComponentDto extends PofoDecisionComponentDto, RosoDecisionComponentDto { + endDate2?: number | null; +} + export interface PofoDecisionComponentDto { endDate?: number | null; soilFillTypeToPlace?: string | null; diff --git a/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts b/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts index 8141055f06..109701f0d9 100644 --- a/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts +++ b/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts @@ -68,8 +68,11 @@ describe('NoticeOfIntentSubmissionService', () => { soilAlreadyPlacedMaximumDepth: null, soilAlreadyPlacedAverageDepth: null, soilProjectDurationAmount: null, + soilProjectDurationUnit: null, soilIsRemovingSoilForNewStructure: null, soilProposedStructures: [], + fillProjectDurationAmount: null, + fillProjectDurationUnit: null, }; beforeEach(() => { diff --git a/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent.dto.ts b/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent.dto.ts index 2b34a73007..42086498b2 100644 --- a/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent.dto.ts +++ b/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent.dto.ts @@ -58,6 +58,7 @@ export interface NoticeOfIntentDto { agCapConsultant?: string; staffObservations?: string; proposalEndDate?: number; + proposalEndDate2?: number; legacyId?: string; } @@ -81,6 +82,7 @@ export interface UpdateNoticeOfIntentDto { agCapConsultant?: string; staffObservations?: string; proposalEndDate?: number; + proposalEndDate2?: number; } export enum NOI_SUBMISSION_STATUS { @@ -151,7 +153,9 @@ export interface NoticeOfIntentSubmissionDto { soilAlreadyPlacedMaximumDepth: number | null; soilAlreadyPlacedAverageDepth: number | null; soilProjectDurationAmount: number | null; - soilProjectDurationUnit?: string | null; + soilProjectDurationUnit: string | null; + fillProjectDurationAmount: number | null; + fillProjectDurationUnit: string | null; soilFillTypeToPlace?: string | null; soilIsExtractionOrMining?: boolean; soilHasSubmittedNotice?: boolean; @@ -202,7 +206,9 @@ export interface NoticeOfIntentSubmissionDetailedDto extends NoticeOfIntentSubmi soilAlreadyPlacedMaximumDepth: number | null; soilAlreadyPlacedAverageDepth: number | null; soilProjectDurationAmount: number | null; - soilProjectDurationUnit?: string | null; + soilProjectDurationUnit: string | null; + fillProjectDurationAmount: number | null; + fillProjectDurationUnit: string | null; soilFillTypeToPlace?: string | null; soilIsExtractionOrMining?: boolean; soilHasSubmittedNotice?: boolean; diff --git a/portal-frontend/src/app/features/applications/application-details/pfrs-details/pfrs-details.component.html b/portal-frontend/src/app/features/applications/application-details/pfrs-details/pfrs-details.component.html index 5495d512b3..2f3556aeb1 100644 --- a/portal-frontend/src/app/features/applications/application-details/pfrs-details/pfrs-details.component.html +++ b/portal-frontend/src/app/features/applications/application-details/pfrs-details/pfrs-details.component.html @@ -21,7 +21,26 @@ <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.purpose"></app-no-data> </div> - <div class="subheading2 grid-1">Project Duration</div> + <div class="subheading2 grid-1">Placement of Fill Project Duration</div> + <div class="grid-double"> + <div *ngIf="_applicationSubmission.fillProjectDurationAmount && _applicationSubmission.fillProjectDurationUnit"> + {{ _applicationSubmission.fillProjectDurationAmount }} + <ng-container [ngPlural]="_applicationSubmission.fillProjectDurationAmount"> + <ng-template ngPluralCase="=1"> + {{ _applicationSubmission.fillProjectDurationUnit.slice(0, -1) | titlecase }} + </ng-template> + <ng-template ngPluralCase="other"> + {{ _applicationSubmission.fillProjectDurationUnit | titlecase }} + </ng-template> + </ng-container> + </div> + <app-no-data + [showRequired]="showErrors" + *ngIf="!_applicationSubmission.fillProjectDurationAmount || !_applicationSubmission.fillProjectDurationUnit" + ></app-no-data> + </div> + + <div class="subheading2 grid-1">Removal of Soil Project Duration</div> <div class="grid-double"> <div *ngIf="_applicationSubmission.soilProjectDurationAmount && _applicationSubmission.soilProjectDurationUnit"> {{ _applicationSubmission.soilProjectDurationAmount }} diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.html index 84636584c6..d420a8882d 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.html @@ -148,53 +148,111 @@ <h2>Proposal</h2> ></app-soil-table> </div> - <section> - <h4>Project Duration</h4> + <div class="full-row"> + <h4>Placement of Fill Project Duration</h4> + <div class="subtext">Estimated duration of the project</div> + <div class="form-row"> + <div> + <label for="fillProjectDurationUnit">Duration</label> + <div class="subtext">Days, Months, or Years</div> + <mat-form-field appearance="outline"> + <mat-select placeholder="Select one" id="fillProjectDurationUnit" formControlName="fillProjectDurationUnit"> + <mat-option value="days">Days</mat-option> + <mat-option value="months">Months</mat-option> + <mat-option value="years">Years</mat-option> + </mat-select> + </mat-form-field> + <div + *ngIf=" + fillProjectDurationUnit.invalid && (fillProjectDurationUnit.dirty || fillProjectDurationUnit.touched) + " + class="field-error" + > + <mat-icon>warning</mat-icon> + <div *ngIf="fillProjectDurationUnit.errors?.['required']">This field is required</div> + </div> + </div> + <div> + <label for="fillProjectDurationUnit">Length</label> + <div class="subtext">Decimals can be used - e.g. 3.5 months or 1.5 years</div> + <mat-form-field appearance="outline"> + <input + id="fillProjectDurationAmount" + mask="separator.2" + thousandSeparator="," + separatorLimit="9999999999" + min="0.01" + matInput + formControlName="fillProjectDurationAmount" + placeholder="Type length" + /> + </mat-form-field> + <div + *ngIf=" + fillProjectDurationAmount.invalid && + (fillProjectDurationAmount.dirty || fillProjectDurationAmount.touched) + " + class="field-error" + > + <mat-icon>warning</mat-icon> + <div *ngIf="fillProjectDurationAmount.errors?.['required']">This field is required</div> + </div> + </div> + </div> + </div> + + <div class="full-row"> + <h4>Removal of Soil Project Duration</h4> <div class="subtext">Estimated duration of the project</div> <div class="form-row"> <div> - <label for="projectDurationUnit">Duration</label> + <label for="soilProjectDurationUnit">Duration</label> <div class="subtext">Days, Months, or Years</div> <mat-form-field appearance="outline"> - <mat-select placeholder="Select one" id="projectDurationUnit" formControlName="projectDurationUnit"> + <mat-select placeholder="Select one" id="soilProjectDurationUnit" formControlName="soilProjectDurationUnit"> <mat-option value="days">Days</mat-option> <mat-option value="months">Months</mat-option> <mat-option value="years">Years</mat-option> </mat-select> </mat-form-field> <div - *ngIf="projectDurationUnit.invalid && (projectDurationUnit.dirty || projectDurationUnit.touched)" + *ngIf=" + soilProjectDurationUnit.invalid && (soilProjectDurationUnit.dirty || soilProjectDurationUnit.touched) + " class="field-error" > <mat-icon>warning</mat-icon> - <div *ngIf="projectDurationUnit.errors?.['required']">This field is required</div> + <div *ngIf="soilProjectDurationUnit.errors?.['required']">This field is required</div> </div> </div> <div> - <label for="projectDurationAmount">Length</label> + <label for="soilProjectDurationUnit">Length</label> <div class="subtext">Decimals can be used - e.g. 3.5 months or 1.5 years</div> <mat-form-field appearance="outline"> <input - id="projectDurationAmount" + id="soilProjectDurationAmount" mask="separator.2" thousandSeparator="," separatorLimit="9999999999" min="0.01" matInput - formControlName="projectDurationAmount" + formControlName="soilProjectDurationAmount" placeholder="Type length" /> </mat-form-field> <div - *ngIf="projectDurationAmount.invalid && (projectDurationAmount.dirty || projectDurationAmount.touched)" + *ngIf=" + soilProjectDurationAmount.invalid && + (soilProjectDurationAmount.dirty || soilProjectDurationAmount.touched) + " class="field-error" > <mat-icon>warning</mat-icon> - <div *ngIf="projectDurationAmount.errors?.['required']">This field is required</div> + <div *ngIf="soilProjectDurationAmount.errors?.['required']">This field is required</div> </div> </div> </div> - </section> + </div> <div class="full-row"> <label for="fillTypeToPlace">Describe the type, origin and quality of fill proposed to be placed.</label> diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.ts index 7eaba95cc3..c899933dfc 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.ts @@ -48,8 +48,10 @@ export class PfrsProposalComponent extends FilesStepComponent implements OnInit, purpose = new FormControl<string | null>(null, [Validators.required]); soilTypeRemoved = new FormControl<string | null>(null, [Validators.required]); reduceNegativeImpacts = new FormControl<string | null>(null, [Validators.required]); - projectDurationAmount = new FormControl<string | null>(null, [Validators.required]); - projectDurationUnit = new FormControl<string | null>(null, [Validators.required]); + soilProjectDurationAmount = new FormControl<string | null>(null, [Validators.required]); + soilProjectDurationUnit = new FormControl<string | null>(null, [Validators.required]); + fillProjectDurationAmount = new FormControl<string | null>(null, [Validators.required]); + fillProjectDurationUnit = new FormControl<string | null>(null, [Validators.required]); fillTypeToPlace = new FormControl<string | null>(null, [Validators.required]); alternativeMeasures = new FormControl<string | null>(null, [Validators.required]); isExtractionOrMining = new FormControl<string | null>(null, [Validators.required]); @@ -61,8 +63,10 @@ export class PfrsProposalComponent extends FilesStepComponent implements OnInit, purpose: this.purpose, soilTypeRemoved: this.soilTypeRemoved, reduceNegativeImpacts: this.reduceNegativeImpacts, - projectDurationAmount: this.projectDurationAmount, - projectDurationUnit: this.projectDurationUnit, + soilProjectDurationAmount: this.soilProjectDurationAmount, + soilProjectDurationUnit: this.soilProjectDurationUnit, + fillProjectDurationAmount: this.fillProjectDurationAmount, + fillProjectDurationUnit: this.fillProjectDurationUnit, fillTypeToPlace: this.fillTypeToPlace, alternativeMeasures: this.alternativeMeasures, isExtractionOrMining: this.isExtractionOrMining, @@ -78,7 +82,6 @@ export class PfrsProposalComponent extends FilesStepComponent implements OnInit, requiresNoticeOfWork = false; constructor( - private router: Router, private applicationService: ApplicationSubmissionService, applicationDocumentService: ApplicationDocumentService, dialog: MatDialog, @@ -143,8 +146,10 @@ export class PfrsProposalComponent extends FilesStepComponent implements OnInit, reduceNegativeImpacts: applicationSubmission.soilReduceNegativeImpacts, alternativeMeasures: applicationSubmission.soilAlternativeMeasures, fillTypeToPlace: applicationSubmission.soilFillTypeToPlace, - projectDurationAmount: applicationSubmission.soilProjectDurationAmount?.toString() ?? null, - projectDurationUnit: applicationSubmission.soilProjectDurationUnit, + soilProjectDurationAmount: applicationSubmission.soilProjectDurationAmount?.toString() ?? null, + soilProjectDurationUnit: applicationSubmission.soilProjectDurationUnit, + fillProjectDurationAmount: applicationSubmission.fillProjectDurationAmount?.toString() ?? null, + fillProjectDurationUnit: applicationSubmission.fillProjectDurationUnit, isExtractionOrMining: formatBooleanToString(applicationSubmission.soilIsExtractionOrMining), hasSubmittedNotice: formatBooleanToString(applicationSubmission.soilHasSubmittedNotice), }); @@ -220,10 +225,14 @@ export class PfrsProposalComponent extends FilesStepComponent implements OnInit, soilAlreadyPlacedArea: this.alreadyFilledTableData?.area ?? null, soilAlreadyPlacedMaximumDepth: this.alreadyFilledTableData?.maximumDepth ?? null, soilAlreadyPlacedAverageDepth: this.alreadyFilledTableData?.averageDepth ?? null, - soilProjectDurationAmount: this.projectDurationAmount.value - ? parseFloat(this.projectDurationAmount.value) + soilProjectDurationAmount: this.soilProjectDurationAmount.value + ? parseFloat(this.soilProjectDurationAmount.value) : null, - soilProjectDurationUnit: this.projectDurationUnit.value, + soilProjectDurationUnit: this.soilProjectDurationUnit.value, + fillProjectDurationAmount: this.fillProjectDurationAmount.value + ? parseFloat(this.fillProjectDurationAmount.value) + : null, + fillProjectDurationUnit: this.fillProjectDurationUnit.value, soilHasSubmittedNotice: parseStringToBoolean(this.hasSubmittedNotice.getRawValue()), soilIsExtractionOrMining: parseStringToBoolean(this.isExtractionOrMining.getRawValue()), }; diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pfrs/pfrs-proposal.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pfrs/pfrs-proposal.component.html index 87933696aa..39bf3c0f54 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pfrs/pfrs-proposal.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pfrs/pfrs-proposal.component.html @@ -205,53 +205,111 @@ <h2>Proposal</h2> ></app-soil-table> </div> - <section> - <h4>Project Duration</h4> + <div class="full-row"> + <h4>Placement of Fill Project Duration</h4> + <div class="subtext">Estimated duration of the project</div> + <div class="form-row"> + <div> + <label for="fillProjectDurationUnit">Duration</label> + <div class="subtext">Days, Months, or Years</div> + <mat-form-field appearance="outline"> + <mat-select placeholder="Select one" id="fillProjectDurationUnit" formControlName="fillProjectDurationUnit"> + <mat-option value="days">Days</mat-option> + <mat-option value="months">Months</mat-option> + <mat-option value="years">Years</mat-option> + </mat-select> + </mat-form-field> + <div + *ngIf=" + fillProjectDurationUnit.invalid && (fillProjectDurationUnit.dirty || fillProjectDurationUnit.touched) + " + class="field-error" + > + <mat-icon>warning</mat-icon> + <div *ngIf="fillProjectDurationUnit.errors?.['required']">This field is required</div> + </div> + </div> + <div> + <label for="fillProjectDurationUnit">Length</label> + <div class="subtext">Decimals can be used - e.g. 3.5 months or 1.5 years</div> + <mat-form-field appearance="outline"> + <input + id="fillProjectDurationAmount" + mask="separator.2" + thousandSeparator="," + separatorLimit="9999999999" + min="0.01" + matInput + formControlName="fillProjectDurationAmount" + placeholder="Type length" + /> + </mat-form-field> + <div + *ngIf=" + fillProjectDurationAmount.invalid && + (fillProjectDurationAmount.dirty || fillProjectDurationAmount.touched) + " + class="field-error" + > + <mat-icon>warning</mat-icon> + <div *ngIf="fillProjectDurationAmount.errors?.['required']">This field is required</div> + </div> + </div> + </div> + </div> + + <div class="full-row"> + <h4>Removal of Soil Project Duration</h4> <div class="subtext">Estimated duration of the project</div> <div class="form-row"> <div> - <label for="projectDurationUnit">Duration</label> + <label for="soilProjectDurationUnit">Duration</label> <div class="subtext">Days, Months, or Years</div> <mat-form-field appearance="outline"> - <mat-select placeholder="Select one" id="projectDurationUnit" [formControl]="projectDurationUnit"> + <mat-select placeholder="Select one" id="soilProjectDurationUnit" formControlName="soilProjectDurationUnit"> <mat-option value="days">Days</mat-option> <mat-option value="months">Months</mat-option> <mat-option value="years">Years</mat-option> </mat-select> </mat-form-field> <div - *ngIf="projectDurationUnit.invalid && (projectDurationUnit.dirty || projectDurationUnit.touched)" + *ngIf=" + soilProjectDurationUnit.invalid && (soilProjectDurationUnit.dirty || soilProjectDurationUnit.touched) + " class="field-error" > <mat-icon>warning</mat-icon> - <div *ngIf="projectDurationUnit.errors?.['required']">This field is required</div> + <div *ngIf="soilProjectDurationUnit.errors?.['required']">This field is required</div> </div> </div> <div> - <label for="projectDurationAmount">Length</label> + <label for="soilProjectDurationUnit">Length</label> <div class="subtext">Decimals can be used - e.g. 3.5 months or 1.5 years</div> <mat-form-field appearance="outline"> <input - id="projectDurationAmount" + id="soilProjectDurationAmount" mask="separator.2" thousandSeparator="," separatorLimit="9999999999" min="0.01" matInput - [formControl]="projectDurationAmount" + formControlName="soilProjectDurationAmount" placeholder="Type length" /> </mat-form-field> <div - *ngIf="projectDurationAmount.invalid && (projectDurationAmount.dirty || projectDurationAmount.touched)" + *ngIf=" + soilProjectDurationAmount.invalid && + (soilProjectDurationAmount.dirty || soilProjectDurationAmount.touched) + " class="field-error" > <mat-icon>warning</mat-icon> - <div *ngIf="projectDurationAmount.errors?.['required']">This field is required</div> + <div *ngIf="soilProjectDurationAmount.errors?.['required']">This field is required</div> </div> </div> </div> - </section> + </div> <div class="full-row"> <label class="subheading2" for="proposal-map">Proposal Map / Site Plan</label> diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pfrs/pfrs-proposal.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pfrs/pfrs-proposal.component.ts index 8e42630419..6c6c1d9bb7 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pfrs/pfrs-proposal.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pfrs/pfrs-proposal.component.ts @@ -49,8 +49,10 @@ export class PfrsProposalComponent extends FilesStepComponent implements OnInit, purpose = new FormControl<string | null>(null, [Validators.required]); soilTypeRemoved = new FormControl<string | null>(null, [Validators.required]); fillTypeToPlace = new FormControl<string | null>(null, [Validators.required]); - projectDurationAmount = new FormControl<string | null>(null, [Validators.required]); - projectDurationUnit = new FormControl<string | null>(null, [Validators.required]); + soilProjectDurationAmount = new FormControl<string | null>(null, [Validators.required]); + soilProjectDurationUnit = new FormControl<string | null>(null, [Validators.required]); + fillProjectDurationAmount = new FormControl<string | null>(null, [Validators.required]); + fillProjectDurationUnit = new FormControl<string | null>(null, [Validators.required]); areComponentsDirty = false; isAreaWideFilling = new FormControl<string | null>(null, [Validators.required]); isExtractionOrMining = new FormControl<string | null>(null, [Validators.required]); @@ -62,8 +64,10 @@ export class PfrsProposalComponent extends FilesStepComponent implements OnInit, purpose: this.purpose, soilTypeRemoved: this.soilTypeRemoved, fillTypeToPlace: this.fillTypeToPlace, - projectDurationAmount: this.projectDurationAmount, - projectDurationUnit: this.projectDurationUnit, + soilProjectDurationAmount: this.soilProjectDurationAmount, + soilProjectDurationUnit: this.soilProjectDurationUnit, + fillProjectDurationAmount: this.fillProjectDurationAmount, + fillProjectDurationUnit: this.fillProjectDurationUnit, isAreaWideFilling: this.isAreaWideFilling, isExtractionOrMining: this.isExtractionOrMining, hasSubmittedNotice: this.hasSubmittedNotice, @@ -141,8 +145,10 @@ export class PfrsProposalComponent extends FilesStepComponent implements OnInit, purpose: noiSubmission.purpose, soilTypeRemoved: noiSubmission.soilTypeRemoved, fillTypeToPlace: noiSubmission.soilFillTypeToPlace, - projectDurationAmount: noiSubmission.soilProjectDurationAmount?.toString() ?? null, - projectDurationUnit: noiSubmission.soilProjectDurationUnit, + soilProjectDurationAmount: noiSubmission.soilProjectDurationAmount?.toString() ?? null, + soilProjectDurationUnit: noiSubmission.soilProjectDurationUnit, + fillProjectDurationAmount: noiSubmission.fillProjectDurationAmount?.toString() ?? null, + fillProjectDurationUnit: noiSubmission.fillProjectDurationUnit, isAreaWideFilling: formatBooleanToString(noiSubmission.soilIsAreaWideFilling), isExtractionOrMining: formatBooleanToString(noiSubmission.soilIsExtractionOrMining), hasSubmittedNotice: formatBooleanToString(noiSubmission.soilHasSubmittedNotice), @@ -218,10 +224,14 @@ export class PfrsProposalComponent extends FilesStepComponent implements OnInit, soilAlreadyRemovedArea: this.alreadyRemovedTableData?.area ?? null, soilAlreadyRemovedMaximumDepth: this.alreadyRemovedTableData?.maximumDepth ?? null, soilAlreadyRemovedAverageDepth: this.alreadyRemovedTableData?.averageDepth ?? null, - soilProjectDurationAmount: this.projectDurationAmount.value - ? parseFloat(this.projectDurationAmount.value) + soilProjectDurationAmount: this.soilProjectDurationAmount.value + ? parseFloat(this.soilProjectDurationAmount.value) : null, - soilProjectDurationUnit: this.projectDurationUnit.value, + soilProjectDurationUnit: this.soilProjectDurationUnit.value, + fillProjectDurationAmount: this.fillProjectDurationAmount.value + ? parseFloat(this.fillProjectDurationAmount.value) + : null, + fillProjectDurationUnit: this.fillProjectDurationUnit.value, soilIsAreaWideFilling: parseStringToBoolean(isAreaWideFilling), soilIsExtractionOrMining: parseStringToBoolean(isExtractionOrMining), soilHasSubmittedNotice: parseStringToBoolean(hasSubmittedNotice), diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pfrs-details/pfrs-details.component.html b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pfrs-details/pfrs-details.component.html index 61d142213d..2f67f151ce 100644 --- a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pfrs-details/pfrs-details.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pfrs-details/pfrs-details.component.html @@ -33,7 +33,26 @@ <app-no-data [showRequired]="showErrors" *ngIf="!_noiSubmission.soilFillTypeToPlace"></app-no-data> </div> - <div class="subheading2 grid-1">Project Duration</div> + <div class="subheading2 grid-1">Placement of Fill Project Duration</div> + <div class="grid-double"> + <div *ngIf="_noiSubmission.fillProjectDurationAmount && _noiSubmission.fillProjectDurationUnit"> + {{ _noiSubmission.fillProjectDurationAmount }} + <ng-container [ngPlural]="_noiSubmission.fillProjectDurationAmount"> + <ng-template ngPluralCase="=1"> + {{ _noiSubmission.fillProjectDurationUnit.slice(0, -1) | titlecase }} + </ng-template> + <ng-template ngPluralCase="other"> + {{ _noiSubmission.fillProjectDurationUnit | titlecase }} + </ng-template> + </ng-container> + </div> + <app-no-data + [showRequired]="showErrors" + *ngIf="!_noiSubmission.fillProjectDurationAmount || !_noiSubmission.fillProjectDurationUnit" + ></app-no-data> + </div> + + <div class="subheading2 grid-1">Removal of Soil Project Duration</div> <div class="grid-double"> <div *ngIf="_noiSubmission.soilProjectDurationAmount && _noiSubmission.soilProjectDurationUnit"> {{ _noiSubmission.soilProjectDurationAmount }} diff --git a/portal-frontend/src/app/features/public/application/submission/pfrs-details/pfrs-details.component.html b/portal-frontend/src/app/features/public/application/submission/pfrs-details/pfrs-details.component.html index 71c70b13b9..c0f6733cff 100644 --- a/portal-frontend/src/app/features/public/application/submission/pfrs-details/pfrs-details.component.html +++ b/portal-frontend/src/app/features/public/application/submission/pfrs-details/pfrs-details.component.html @@ -130,7 +130,21 @@ </div> <div class="full-width"> - <span class="subheading1">Project Duration</span> + <span class="subheading1">Placement of Fill Project Duration</span> + </div> + <div class="subheading2 grid-1">Duration</div> + <div class="grid-double"> + {{ applicationSubmission.fillProjectDurationUnit }} + <app-no-data *ngIf="!applicationSubmission.fillProjectDurationUnit"></app-no-data> + </div> + <div class="subheading2 grid-1">Length</div> + <div class="grid-double"> + {{ applicationSubmission.fillProjectDurationAmount }} + <app-no-data *ngIf="!applicationSubmission.fillProjectDurationAmount"></app-no-data> + </div> + + <div class="full-width"> + <span class="subheading1">Removal of Soil Project Duration</span> </div> <div class="subheading2 grid-1">Duration</div> <div class="grid-double"> diff --git a/portal-frontend/src/app/features/public/notice-of-intent/submission/pfrs-details/pfrs-details.component.html b/portal-frontend/src/app/features/public/notice-of-intent/submission/pfrs-details/pfrs-details.component.html index 6694941059..3b0ee9f296 100644 --- a/portal-frontend/src/app/features/public/notice-of-intent/submission/pfrs-details/pfrs-details.component.html +++ b/portal-frontend/src/app/features/public/notice-of-intent/submission/pfrs-details/pfrs-details.component.html @@ -150,7 +150,21 @@ </div> <div class="full-width"> - <h4>Project Duration</h4> + <span class="subheading1">Placement of Fill Project Duration</span> + </div> + <div class="subheading2 grid-1">Duration</div> + <div class="grid-double"> + {{ noiSubmission.fillProjectDurationUnit }} + <app-no-data *ngIf="!noiSubmission.fillProjectDurationUnit"></app-no-data> + </div> + <div class="subheading2 grid-1">Length</div> + <div class="grid-double"> + {{ noiSubmission.fillProjectDurationAmount }} + <app-no-data *ngIf="!noiSubmission.fillProjectDurationAmount"></app-no-data> + </div> + + <div class="full-width"> + <span class="subheading1">Removal of Soil Project Duration</span> </div> <div class="subheading2 grid-1">Duration</div> <div class="grid-double"> diff --git a/portal-frontend/src/app/services/application-submission/application-submission.dto.ts b/portal-frontend/src/app/services/application-submission/application-submission.dto.ts index 2ec110b00d..4cd8a84584 100644 --- a/portal-frontend/src/app/services/application-submission/application-submission.dto.ts +++ b/portal-frontend/src/app/services/application-submission/application-submission.dto.ts @@ -124,6 +124,8 @@ export interface ApplicationSubmissionDetailedDto extends ApplicationSubmissionD soilAlreadyPlacedAverageDepth: number | null; soilProjectDurationAmount: number | null; soilProjectDurationUnit: string | null; + fillProjectDurationAmount: number | null; + fillProjectDurationUnit: string | null; soilFillTypeToPlace: string | null; soilAlternativeMeasures: string | null; soilIsExtractionOrMining: boolean; @@ -234,6 +236,8 @@ export interface ApplicationSubmissionUpdateDto { soilAlreadyPlacedAverageDepth?: number | null; soilProjectDurationAmount?: number | null; soilProjectDurationUnit?: string | null; + fillProjectDurationAmount?: number | null; + fillProjectDurationUnit?: string | null; soilFillTypeToPlace?: string | null; soilAlternativeMeasures?: string | null; soilIsExtractionOrMining?: boolean | null; diff --git a/portal-frontend/src/app/services/notice-of-intent-submission/notice-of-intent-submission.dto.ts b/portal-frontend/src/app/services/notice-of-intent-submission/notice-of-intent-submission.dto.ts index ea49d4c4cc..d329531f43 100644 --- a/portal-frontend/src/app/services/notice-of-intent-submission/notice-of-intent-submission.dto.ts +++ b/portal-frontend/src/app/services/notice-of-intent-submission/notice-of-intent-submission.dto.ts @@ -78,6 +78,8 @@ export interface NoticeOfIntentSubmissionDetailedDto extends NoticeOfIntentSubmi soilAlreadyPlacedAverageDepth: number | null; soilProjectDurationAmount: number | null; soilProjectDurationUnit: string | null; + fillProjectDurationAmount: number | null; + fillProjectDurationUnit: string | null; soilFillTypeToPlace: string | null; soilIsExtractionOrMining: boolean | null; soilIsAreaWideFilling: boolean | null; @@ -130,6 +132,8 @@ export interface NoticeOfIntentSubmissionUpdateDto { soilAlreadyPlacedAverageDepth?: number | null; soilProjectDurationAmount?: number | null; soilProjectDurationUnit?: string | null; + fillProjectDurationAmount?: number | null; + fillProjectDurationUnit?: string | null; soilFillTypeToPlace?: string | null; soilIsExtractionOrMining?: boolean | null; soilIsAreaWideFilling?: boolean | null; diff --git a/portal-frontend/src/app/services/public/public-application.dto.ts b/portal-frontend/src/app/services/public/public-application.dto.ts index 5456187032..3e70cb8a1d 100644 --- a/portal-frontend/src/app/services/public/public-application.dto.ts +++ b/portal-frontend/src/app/services/public/public-application.dto.ts @@ -91,6 +91,8 @@ export interface PublicApplicationSubmissionDto { soilAlreadyPlacedAverageDepth: number | null; soilProjectDurationAmount: number | null; soilProjectDurationUnit?: string | null; + fillProjectDurationAmount: number | null; + fillProjectDurationUnit: string | null; soilFillTypeToPlace?: string | null; soilAlternativeMeasures?: string | null; soilIsExtractionOrMining?: boolean; diff --git a/portal-frontend/src/app/services/public/public-notice-of-intent.dto.ts b/portal-frontend/src/app/services/public/public-notice-of-intent.dto.ts index 125285f4e5..6d3422c15e 100644 --- a/portal-frontend/src/app/services/public/public-notice-of-intent.dto.ts +++ b/portal-frontend/src/app/services/public/public-notice-of-intent.dto.ts @@ -61,6 +61,8 @@ export interface PublicNoticeOfIntentSubmissionDto { soilAlreadyPlacedAverageDepth: number | null; soilProjectDurationAmount: number | null; soilProjectDurationUnit?: string | null; + fillProjectDurationAmount: number | null; + fillProjectDurationUnit: string | null; soilFillTypeToPlace?: string | null; soilIsExtractionOrMining?: boolean; soilIsAreaWideFilling?: boolean; diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.dto.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.dto.ts index 0cd48a06f7..2046eee526 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.dto.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.dto.ts @@ -45,6 +45,10 @@ export class UpdateApplicationDecisionComponentDto { @IsNumber() endDate?: number; + @IsOptional() + @IsNumber() + endDate2?: number; + @IsOptional() @IsNumber() expiryDate?: number; @@ -133,10 +137,8 @@ export class ApplicationDecisionComponentDto { @AutoMap() nfuSubType?: string; - @AutoMap() endDate?: number; - - @AutoMap() + endDate2?: number; expiryDate?: number; @AutoMap() diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.entity.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.entity.ts index 0cbfd0ce42..e3333bf134 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.entity.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.entity.ts @@ -90,14 +90,21 @@ export class ApplicationDecisionComponent extends Base { @Column({ type: 'timestamptz', - comment: 'Components` end date', + comment: 'Components end date', nullable: true, }) endDate?: Date | null; @Column({ type: 'timestamptz', - comment: 'Components` expiry date', + comment: 'Components second end date (PFRS only)', + nullable: true, + }) + endDate2?: Date | null; + + @Column({ + type: 'timestamptz', + comment: 'Components expiry date', nullable: true, }) expiryDate?: Date | null; diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.service.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.service.ts index 979a69bf59..9daf1d4651 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.service.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.service.ts @@ -49,6 +49,9 @@ export class ApplicationDecisionComponentService { component.agCapSource = updateDto.agCapSource; component.agCapMap = updateDto.agCapMap; component.agCapConsultant = updateDto.agCapConsultant; + component.endDate2 = updateDto.endDate2 + ? new Date(updateDto.endDate2) + : null; this.patchNfuFields(component, updateDto); this.patchTurpFields(component, updateDto); diff --git a/services/apps/alcs/src/alcs/application/application.controller.ts b/services/apps/alcs/src/alcs/application/application.controller.ts index b5f4e86c38..3fd5ee8378 100644 --- a/services/apps/alcs/src/alcs/application/application.controller.ts +++ b/services/apps/alcs/src/alcs/application/application.controller.ts @@ -104,6 +104,7 @@ export class ApplicationController { agCapMap: updates.agCapMap, agCapSource: updates.agCapSource, proposalEndDate: formatIncomingDate(updates.proposalEndDate), + proposalEndDate2: formatIncomingDate(updates.proposalEndDate2), proposalExpiryDate: formatIncomingDate(updates.proposalExpiryDate), nfuUseSubType: updates.nfuUseSubType, nfuUseType: updates.nfuUseType, diff --git a/services/apps/alcs/src/alcs/application/application.dto.ts b/services/apps/alcs/src/alcs/application/application.dto.ts index 9bb99437b6..d8f3b466fd 100644 --- a/services/apps/alcs/src/alcs/application/application.dto.ts +++ b/services/apps/alcs/src/alcs/application/application.dto.ts @@ -155,6 +155,10 @@ export class UpdateApplicationDto { @IsNumber() proposalEndDate?: number; + @IsOptional() + @IsNumber() + proposalEndDate2?: number; + @IsOptional() @IsNumber() proposalExpiryDate?: number; @@ -256,6 +260,7 @@ export class ApplicationDto { legacyId?: string; proposalEndDate?: number; + proposalEndDate2?: number; proposalExpiryDate?: number; } @@ -283,6 +288,7 @@ export class ApplicationUpdateServiceDto { nfuUseSubType?: string; inclExclApplicantType?: string; proposalEndDate?: Date | null; + proposalEndDate2?: Date | null; proposalExpiryDate?: Date | null; staffObservations?: string | null; localGovernmentUuid?: string; diff --git a/services/apps/alcs/src/alcs/application/application.entity.ts b/services/apps/alcs/src/alcs/application/application.entity.ts index ed48cc5671..6b2e1a0792 100644 --- a/services/apps/alcs/src/alcs/application/application.entity.ts +++ b/services/apps/alcs/src/alcs/application/application.entity.ts @@ -240,6 +240,13 @@ export class Application extends Base { }) proposalEndDate?: Date | null; + @Column({ + type: 'timestamptz', + comment: 'The date at which the placement of fill ends (PFRS only)', + nullable: true, + }) + proposalEndDate2?: Date | null; + @Column({ type: 'timestamptz', comment: 'The date at which the proposal expires', diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-component/notice-of-intent-decision-component.dto.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-component/notice-of-intent-decision-component.dto.ts index 70ad3a57b8..ba8731d595 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-component/notice-of-intent-decision-component.dto.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-component/notice-of-intent-decision-component.dto.ts @@ -35,6 +35,10 @@ export class UpdateNoticeOfIntentDecisionComponentDto { @IsNumber() endDate?: number; + @IsOptional() + @IsNumber() + endDate2?: number; + @IsOptional() @IsNumber() expiryDate?: number; @@ -105,10 +109,8 @@ export class NoticeOfIntentDecisionComponentDto { @AutoMap() agCapConsultant?: string; - @AutoMap() endDate?: number; - - @AutoMap() + endDate2?: number; expiryDate?: number; @AutoMap() diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-component/notice-of-intent-decision-component.entity.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-component/notice-of-intent-decision-component.entity.ts index 46725fced2..0bc4f228ca 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-component/notice-of-intent-decision-component.entity.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-component/notice-of-intent-decision-component.entity.ts @@ -67,11 +67,18 @@ export class NoticeOfIntentDecisionComponent extends Base { @Column({ type: 'timestamptz', - comment: 'Components` end date', + comment: 'Components end date', nullable: true, }) endDate?: Date | null; + @Column({ + type: 'timestamptz', + comment: 'Components second end date (PFRS only)', + nullable: true, + }) + endDate2?: Date | null; + @Column({ type: 'timestamptz', comment: 'Components` expiry date', diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-component/notice-of-intent-decision-component.service.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-component/notice-of-intent-decision-component.service.ts index 6128ec1abf..a8aeffbb58 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-component/notice-of-intent-decision-component.service.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-component/notice-of-intent-decision-component.service.ts @@ -43,6 +43,12 @@ export class NoticeOfIntentDecisionComponentService { component.agCapSource = updateDto.agCapSource; component.agCapMap = updateDto.agCapMap; component.agCapConsultant = updateDto.agCapConsultant; + component.endDate = updateDto.endDate + ? new Date(updateDto.endDate) + : null; + component.endDate2 = updateDto.endDate2 + ? new Date(updateDto.endDate2) + : null; this.patchPofoFields(component, updateDto); this.patchRosoFields(component, updateDto); @@ -61,7 +67,6 @@ export class NoticeOfIntentDecisionComponentService { component: NoticeOfIntentDecisionComponent, updateDto: CreateNoticeOfIntentDecisionComponentDto, ) { - component.endDate = updateDto.endDate ? new Date(updateDto.endDate) : null; component.soilFillTypeToPlace = updateDto.soilFillTypeToPlace ?? null; component.soilToPlaceArea = updateDto.soilToPlaceArea ?? null; component.soilToPlaceVolume = updateDto.soilToPlaceVolume ?? null; @@ -75,7 +80,6 @@ export class NoticeOfIntentDecisionComponentService { component: NoticeOfIntentDecisionComponent, updateDto: CreateNoticeOfIntentDecisionComponentDto, ) { - component.endDate = updateDto.endDate ? new Date(updateDto.endDate) : null; component.soilTypeRemoved = updateDto.soilTypeRemoved ?? null; component.soilToRemoveVolume = updateDto.soilToRemoveVolume ?? null; component.soilToRemoveArea = updateDto.soilToRemoveArea ?? null; diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.dto.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.dto.ts index c8a6b3348b..6f0b689c30 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.dto.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.dto.ts @@ -127,7 +127,8 @@ export class NoticeOfIntentDto { staffObservations?: string; proposalEndDate?: number; - + proposalEndDate2?: number; + @AutoMap(() => String) legacyId?: string; } @@ -208,6 +209,10 @@ export class UpdateNoticeOfIntentDto { @IsOptional() @IsNumber() proposalEndDate?: number; + + @IsOptional() + @IsNumber() + proposalEndDate2?: number; } export class CreateNoticeOfIntentServiceDto { diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.entity.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.entity.ts index 3447b0ee98..1cbbd89056 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.entity.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.entity.ts @@ -213,6 +213,13 @@ export class NoticeOfIntent extends Base { }) proposalEndDate?: Date | null; + @Column({ + type: 'timestamptz', + comment: 'The date at which the placement of fill ends (PFRS only)', + nullable: true, + }) + proposalEndDate2?: Date | null; + @ManyToOne(() => NoticeOfIntentType, { nullable: false, }) diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.ts index faa3565956..44740de2b9 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.ts @@ -323,6 +323,11 @@ export class NoticeOfIntentService { noticeOfIntent.proposalEndDate, ); + noticeOfIntent.proposalEndDate2 = filterUndefined( + formatIncomingDate(updateDto.proposalEndDate2), + noticeOfIntent.proposalEndDate2, + ); + await this.repository.save(noticeOfIntent); await this.updateStatus(updateDto, noticeOfIntent); diff --git a/services/apps/alcs/src/common/automapper/application-decision-v2.automapper.profile.ts b/services/apps/alcs/src/common/automapper/application-decision-v2.automapper.profile.ts index 1be51e2f8c..4aaeeb6774 100644 --- a/services/apps/alcs/src/common/automapper/application-decision-v2.automapper.profile.ts +++ b/services/apps/alcs/src/common/automapper/application-decision-v2.automapper.profile.ts @@ -165,6 +165,10 @@ export class ApplicationDecisionProfile extends AutomapperProfile { (ad) => ad.endDate, mapFrom((a) => a.endDate?.getTime()), ), + forMember( + (ad) => ad.endDate2, + mapFrom((a) => a.endDate2?.getTime()), + ), forMember( (ad) => ad.expiryDate, mapFrom((a) => a.expiryDate?.getTime()), diff --git a/services/apps/alcs/src/common/automapper/application.automapper.profile.ts b/services/apps/alcs/src/common/automapper/application.automapper.profile.ts index 27c1632a43..f7936a44c1 100644 --- a/services/apps/alcs/src/common/automapper/application.automapper.profile.ts +++ b/services/apps/alcs/src/common/automapper/application.automapper.profile.ts @@ -79,6 +79,10 @@ export class ApplicationProfile extends AutomapperProfile { (a) => a.proposalEndDate, mapFrom((ad) => ad.proposalEndDate?.getTime()), ), + forMember( + (a) => a.proposalEndDate2, + mapFrom((ad) => ad.proposalEndDate2?.getTime()), + ), forMember( (a) => a.proposalExpiryDate, mapFrom((ad) => ad.proposalExpiryDate?.getTime()), diff --git a/services/apps/alcs/src/common/automapper/notice-of-intent-decision.automapper.profile.ts b/services/apps/alcs/src/common/automapper/notice-of-intent-decision.automapper.profile.ts index 0313b8b661..f043b41903 100644 --- a/services/apps/alcs/src/common/automapper/notice-of-intent-decision.automapper.profile.ts +++ b/services/apps/alcs/src/common/automapper/notice-of-intent-decision.automapper.profile.ts @@ -134,6 +134,10 @@ export class NoticeOfIntentDecisionProfile extends AutomapperProfile { (ad) => ad.endDate, mapFrom((a) => a.endDate?.getTime()), ), + forMember( + (ad) => ad.endDate2, + mapFrom((a) => a.endDate2?.getTime()), + ), forMember( (ad) => ad.expiryDate, mapFrom((a) => a.expiryDate?.getTime()), diff --git a/services/apps/alcs/src/common/automapper/notice-of-intent.automapper.profile.ts b/services/apps/alcs/src/common/automapper/notice-of-intent.automapper.profile.ts index 41c1976f81..ded383a8d1 100644 --- a/services/apps/alcs/src/common/automapper/notice-of-intent.automapper.profile.ts +++ b/services/apps/alcs/src/common/automapper/notice-of-intent.automapper.profile.ts @@ -64,6 +64,10 @@ export class NoticeOfIntentProfile extends AutomapperProfile { (a) => a.proposalEndDate, mapFrom((ad) => ad.proposalEndDate?.getTime()), ), + forMember( + (a) => a.proposalEndDate2, + mapFrom((ad) => ad.proposalEndDate2?.getTime()), + ), forMember( (a) => a.activeDays, mapFrom((_) => 0), diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.dto.ts b/services/apps/alcs/src/portal/application-submission/application-submission.dto.ts index 012980c84d..ff7bdc992f 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.dto.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.dto.ts @@ -223,6 +223,12 @@ export class ApplicationSubmissionDetailedDto extends ApplicationSubmissionDto { @AutoMap(() => String) soilProjectDurationUnit?: string | null; + @AutoMap(() => Number) + fillProjectDurationAmount: number | null; + + @AutoMap(() => String) + fillProjectDurationUnit: string | null; + @AutoMap(() => String) soilFillTypeToPlace?: string | null; @@ -593,6 +599,14 @@ export class ApplicationSubmissionUpdateDto { @IsOptional() soilProjectDurationUnit?: string | null; + @IsNumber() + @IsOptional() + fillProjectDurationAmount?: number | null; + + @IsString() + @IsOptional() + fillProjectDurationUnit?: string | null; + @IsString() @IsOptional() soilFillTypeToPlace?: string | null; diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts b/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts index bd7e3a30cc..ea842e9658 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts @@ -537,6 +537,20 @@ export class ApplicationSubmission extends Base { @Column({ type: 'text', nullable: true }) soilProjectDurationUnit: string | null; + @AutoMap(() => Number) + @Column({ + type: 'decimal', + nullable: true, + precision: 12, + scale: 2, + transformer: new ColumnNumericTransformer(), + }) + fillProjectDurationAmount: number | null; + + @AutoMap(() => String) + @Column({ type: 'text', nullable: true }) + fillProjectDurationUnit: string | null; + @AutoMap(() => String) @Column({ type: 'text', nullable: true }) soilFillTypeToPlace: string | null; diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.service.ts b/services/apps/alcs/src/portal/application-submission/application-submission.service.ts index bfcb57b644..0270367a78 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.service.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.service.ts @@ -886,6 +886,14 @@ export class ApplicationSubmissionService { updateDto.soilProjectDurationUnit, applicationSubmission.soilProjectDurationUnit, ); + applicationSubmission.fillProjectDurationUnit = filterUndefined( + updateDto.fillProjectDurationUnit, + applicationSubmission.fillProjectDurationUnit, + ); + applicationSubmission.fillProjectDurationAmount = filterUndefined( + updateDto.fillProjectDurationAmount, + applicationSubmission.fillProjectDurationAmount, + ); applicationSubmission.soilFillTypeToPlace = filterUndefined( updateDto.soilFillTypeToPlace, applicationSubmission.soilFillTypeToPlace, diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.dto.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.dto.ts index 8c95d3b75e..027c4187f8 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.dto.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.dto.ts @@ -140,6 +140,12 @@ export class NoticeOfIntentSubmissionDetailedDto extends NoticeOfIntentSubmissio @AutoMap(() => String) soilProjectDurationUnit?: string | null; + @AutoMap(() => Number) + fillProjectDurationAmount: number | null; + + @AutoMap(() => String) + fillProjectDurationUnit: string | null; + @AutoMap(() => String) soilFillTypeToPlace?: string | null; @@ -336,6 +342,14 @@ export class NoticeOfIntentSubmissionUpdateDto { @IsOptional() soilProjectDurationUnit?: string | null; + @IsNumber() + @IsOptional() + fillProjectDurationAmount?: number | null; + + @IsString() + @IsOptional() + fillProjectDurationUnit?: string | null; + @IsString() @IsOptional() soilFillTypeToPlace?: string | null; diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.entity.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.entity.ts index 5d3f4e4926..d4e8afe203 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.entity.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.entity.ts @@ -381,6 +381,20 @@ export class NoticeOfIntentSubmission extends Base { @Column({ type: 'text', nullable: true }) soilProjectDurationUnit: string | null; + @AutoMap(() => Number) + @Column({ + type: 'decimal', + nullable: true, + precision: 12, + scale: 2, + transformer: new ColumnNumericTransformer(), + }) + fillProjectDurationAmount: number | null; + + @AutoMap(() => String) + @Column({ type: 'text', nullable: true }) + fillProjectDurationUnit: string | null; + @AutoMap(() => String) @Column({ type: 'text', nullable: true }) soilFillTypeToPlace: string | null; diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts index ed59e3ae1e..d28f649e0f 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts @@ -4,7 +4,7 @@ import { AutomapperModule } from '@automapper/nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; -import { QueryBuilder, Repository, SelectQueryBuilder } from 'typeorm'; +import { Repository, SelectQueryBuilder } from 'typeorm'; import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; import { NoticeOfIntentDocument, diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts index 02b40bf445..7ab6dcd3a2 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts @@ -531,6 +531,14 @@ export class NoticeOfIntentSubmissionService { updateDto.soilProjectDurationUnit, noticeOfIntentSubmission.soilProjectDurationUnit, ); + noticeOfIntentSubmission.fillProjectDurationAmount = filterUndefined( + updateDto.fillProjectDurationAmount, + noticeOfIntentSubmission.fillProjectDurationAmount, + ); + noticeOfIntentSubmission.fillProjectDurationUnit = filterUndefined( + updateDto.fillProjectDurationUnit, + noticeOfIntentSubmission.fillProjectDurationUnit, + ); noticeOfIntentSubmission.soilFillTypeToPlace = filterUndefined( updateDto.soilFillTypeToPlace, noticeOfIntentSubmission.soilFillTypeToPlace, diff --git a/services/apps/alcs/src/portal/public/application/application-decision.controller.spec.ts b/services/apps/alcs/src/portal/public/application/application-decision.controller.spec.ts index 3e8c53f9fd..8b66de3fd8 100644 --- a/services/apps/alcs/src/portal/public/application/application-decision.controller.spec.ts +++ b/services/apps/alcs/src/portal/public/application/application-decision.controller.spec.ts @@ -7,16 +7,13 @@ import { mockKeyCloakProviders } from '../../../../test/mocks/mockTypes'; import { ApplicationDecisionV2Service } from '../../../alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service'; import { ApplicationDecision } from '../../../alcs/application-decision/application-decision.entity'; import { ApplicationDecisionProfile } from '../../../common/automapper/application-decision-v2.automapper.profile'; -import { ApplicationSubmissionService } from '../../application-submission/application-submission.service'; import { ApplicationDecisionController } from './application-decision.controller'; describe('ApplicationDecisionController', () => { let controller: ApplicationDecisionController; - let mockApplicationSubmissionService: DeepMocked<ApplicationSubmissionService>; let mockDecisionService: DeepMocked<ApplicationDecisionV2Service>; beforeEach(async () => { - mockApplicationSubmissionService = createMock(); mockDecisionService = createMock(); const module: TestingModule = await Test.createTestingModule({ @@ -28,10 +25,6 @@ describe('ApplicationDecisionController', () => { controllers: [ApplicationDecisionController], providers: [ ApplicationDecisionProfile, - { - provide: ApplicationSubmissionService, - useValue: mockApplicationSubmissionService, - }, { provide: ApplicationDecisionV2Service, useValue: mockDecisionService, diff --git a/services/apps/alcs/src/portal/public/application/application-decision.controller.ts b/services/apps/alcs/src/portal/public/application/application-decision.controller.ts index 939f50b993..ef2d73a47a 100644 --- a/services/apps/alcs/src/portal/public/application/application-decision.controller.ts +++ b/services/apps/alcs/src/portal/public/application/application-decision.controller.ts @@ -4,14 +4,12 @@ import { Controller, Get, Param } from '@nestjs/common'; import { Public } from 'nest-keycloak-connect'; import { ApplicationDecisionV2Service } from '../../../alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service'; import { ApplicationDecision } from '../../../alcs/application-decision/application-decision.entity'; -import { ApplicationSubmissionService } from '../../application-submission/application-submission.service'; import { ApplicationPortalDecisionDto } from './application-decision.dto'; @Public() @Controller('public/application/decision') export class ApplicationDecisionController { constructor( - private applicationSubmissionService: ApplicationSubmissionService, private decisionService: ApplicationDecisionV2Service, @InjectMapper() private mapper: Mapper, ) {} diff --git a/services/apps/alcs/src/portal/public/application/public-application.dto.ts b/services/apps/alcs/src/portal/public/application/public-application.dto.ts index c8ec4a89f6..17ee52f409 100644 --- a/services/apps/alcs/src/portal/public/application/public-application.dto.ts +++ b/services/apps/alcs/src/portal/public/application/public-application.dto.ts @@ -210,6 +210,12 @@ export class PublicApplicationSubmissionDto { @AutoMap(() => String) soilProjectDurationUnit?: string | null; + @AutoMap(() => Number) + fillProjectDurationAmount: number | null; + + @AutoMap(() => String) + fillProjectDurationUnit?: string | null; + @AutoMap(() => String) soilFillTypeToPlace?: string | null; diff --git a/services/apps/alcs/src/portal/public/notice-of-intent/public-notice-of-intent.dto.ts b/services/apps/alcs/src/portal/public/notice-of-intent/public-notice-of-intent.dto.ts index abf7d29d13..f7dce0d15d 100644 --- a/services/apps/alcs/src/portal/public/notice-of-intent/public-notice-of-intent.dto.ts +++ b/services/apps/alcs/src/portal/public/notice-of-intent/public-notice-of-intent.dto.ts @@ -139,6 +139,12 @@ export class PublicNoticeOfIntentSubmissionDto { @AutoMap(() => String) soilProjectDurationUnit?: string | null; + @AutoMap(() => Number) + fillProjectDurationAmount: number | null; + + @AutoMap(() => String) + fillProjectDurationUnit?: string | null; + @AutoMap(() => String) soilFillTypeToPlace?: string | null; diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1699034386231-add_fill_project_fields.ts b/services/apps/alcs/src/providers/typeorm/migrations/1699034386231-add_fill_project_fields.ts new file mode 100644 index 0000000000..4c3f05ee8d --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1699034386231-add_fill_project_fields.ts @@ -0,0 +1,35 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class addFillProjectFields1699034386231 implements MigrationInterface { + name = 'addFillProjectFields1699034386231'; + + public async up(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" ADD "fill_project_duration_amount" numeric(12,2)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" ADD "fill_project_duration_unit" text`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" ADD "fill_project_duration_amount" numeric(12,2)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" ADD "fill_project_duration_unit" text`, + ); + } + + public async down(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" DROP COLUMN "fill_project_duration_unit"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" DROP COLUMN "fill_project_duration_amount"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" DROP COLUMN "fill_project_duration_unit"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" DROP COLUMN "fill_project_duration_amount"`, + ); + } +} diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1699037990967-add_second_end_date_for_decs.ts b/services/apps/alcs/src/providers/typeorm/migrations/1699037990967-add_second_end_date_for_decs.ts new file mode 100644 index 0000000000..9fce76c814 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1699037990967-add_second_end_date_for_decs.ts @@ -0,0 +1,79 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class addSecondEndDateForDecs1699037990967 + implements MigrationInterface +{ + name = 'addSecondEndDateForDecs1699037990967'; + + public async up(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `ALTER TABLE "alcs"."application" ADD "proposal_end_date2" TIMESTAMP WITH TIME ZONE`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."application"."proposal_end_date2" IS 'The date at which the placement of fill ends (PFRS only)'`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_decision_component" ADD "end_date2" TIMESTAMP WITH TIME ZONE`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."application_decision_component"."end_date2" IS 'Components second end date (PFRS only)'`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent" ADD "proposal_end_date2" TIMESTAMP WITH TIME ZONE`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."notice_of_intent"."proposal_end_date2" IS 'The date at which the placement of fill ends (PFRS only)'`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_decision_component" ADD "end_date2" TIMESTAMP WITH TIME ZONE`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."notice_of_intent_decision_component"."end_date2" IS 'Components second end date (PFRS only)'`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."application_decision_component"."end_date" IS 'Components end date'`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."application_decision_component"."expiry_date" IS 'Components expiry date'`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."notice_of_intent_decision_component"."end_date" IS 'Components end date'`, + ); + } + + public async down(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."notice_of_intent_decision_component"."end_date" IS 'Components\` end date'`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."application_decision_component"."expiry_date" IS 'Components\` expiry date'`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."application_decision_component"."end_date" IS 'Components\` end date'`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."notice_of_intent_decision_component"."end_date2" IS 'Components second end date (PFRS only)'`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_decision_component" DROP COLUMN "end_date2"`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."notice_of_intent"."proposal_end_date2" IS 'The date at which the placement of fill ends (PFRS only)'`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent" DROP COLUMN "proposal_end_date2"`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."application_decision_component"."end_date2" IS 'Components second end date (PFRS only)'`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_decision_component" DROP COLUMN "end_date2"`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."application"."proposal_end_date2" IS 'The date at which the placement of fill ends (PFRS only)'`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application" DROP COLUMN "proposal_end_date2"`, + ); + } +} From 1ea79d755a5e5a0164e19622602619156a870cc2 Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Mon, 6 Nov 2023 09:24:00 -0800 Subject: [PATCH 599/954] Feature/alcs 1205 Parcel ETL (#1136) parcel ETL validation script --- bin/migrate-oats-data/common/__init__.py | 1 + .../common/date_time_helper.py | 15 ++ .../oats_to_alcs_ownership_type_codes.py | 12 ++ .../noi/notice_of_intent_migration.py | 8 + ..._of_intent_submission_adjacent_land_use.py | 23 ++- .../notice_of_intent_soil_fields.py | 10 +- .../parcels/__init__.py | 4 + .../parcels/notice_of_intent_parcel_insert.py | 162 ++++++++++++++++++ ...tice_of_intent_adjacent_land_use_count.sql | 9 +- .../notice_of_intent_parcels_insert.sql | 28 +++ .../notice_of_intent_parcels_insert_count.sql | 17 ++ ...ce_of_intent_parcels_insert_validation.sql | 68 ++++++++ .../notice_of_intent_soil_fields.sql | 29 ++-- .../notice-of-intent-parcel.entity.ts | 9 + ...01-add_oats_subject_property_id_to_alcs.ts | 25 +++ 15 files changed, 382 insertions(+), 38 deletions(-) create mode 100644 bin/migrate-oats-data/common/oats_to_alcs_ownership_type_codes.py create mode 100644 bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/__init__.py create mode 100644 bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/notice_of_intent_parcel_insert.py create mode 100644 bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/notice_of_intent_parcels_insert.sql create mode 100644 bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/notice_of_intent_parcels_insert_count.sql create mode 100644 bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/notice_of_intent_parcels_insert_validation.sql create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1699028330101-add_oats_subject_property_id_to_alcs.ts diff --git a/bin/migrate-oats-data/common/__init__.py b/bin/migrate-oats-data/common/__init__.py index 6cfcc67f1b..9c5e0712c3 100644 --- a/bin/migrate-oats-data/common/__init__.py +++ b/bin/migrate-oats-data/common/__init__.py @@ -8,3 +8,4 @@ from .date_time_helper import * from .oats_to_alcs_naru_code_enum import * from .oats_temp_tables import * +from .oats_to_alcs_ownership_type_codes import * diff --git a/bin/migrate-oats-data/common/date_time_helper.py b/bin/migrate-oats-data/common/date_time_helper.py index b7106444e3..b9fa85e9dd 100644 --- a/bin/migrate-oats-data/common/date_time_helper.py +++ b/bin/migrate-oats-data/common/date_time_helper.py @@ -20,6 +20,21 @@ def convert_timezone(date_str, timezone_str="America/Vancouver"): return formatted +def add_timezone_and_keep_date_part(date_str, timezone_str="America/Vancouver"): + # Convert the string to a datetime object if it's a string + if isinstance(date_str, str): + naive_dt = datetime.strptime(date_str, "%Y-%m-%d %H:%M:%S.%f") + else: + naive_dt = date_str + + local_tz = pytz.timezone(timezone_str) + aware_dt = local_tz.localize(naive_dt) + + # Format the string with the desired output + formatted = aware_dt.strftime("%Y-%m-%d %H:%M:%S.%f %z") + return formatted + + def set_time(date_str, hour=0, minute=0, second=0): # Replace the time of the given date if isinstance(date_str, str): diff --git a/bin/migrate-oats-data/common/oats_to_alcs_ownership_type_codes.py b/bin/migrate-oats-data/common/oats_to_alcs_ownership_type_codes.py new file mode 100644 index 0000000000..bc137cd65b --- /dev/null +++ b/bin/migrate-oats-data/common/oats_to_alcs_ownership_type_codes.py @@ -0,0 +1,12 @@ +from enum import Enum + + +class ALCSOwnershipType(Enum): + FeeSimple = "SMPL" + Crown = "CRWN" + + +class OatsToAlcsOwnershipType(Enum): + FEE = ALCSOwnershipType.FeeSimple.value + CROWN = ALCSOwnershipType.Crown.value + FIRST = ALCSOwnershipType.FeeSimple.value diff --git a/bin/migrate-oats-data/noi/notice_of_intent_migration.py b/bin/migrate-oats-data/noi/notice_of_intent_migration.py index 219746abde..feb9eb3e35 100644 --- a/bin/migrate-oats-data/noi/notice_of_intent_migration.py +++ b/bin/migrate-oats-data/noi/notice_of_intent_migration.py @@ -25,12 +25,18 @@ process_alcs_notice_of_intent_base_fields, ) +from .notice_of_intent_submissions.parcels import ( + init_notice_of_intent_parcels, + clean_parcels, +) + def init_notice_of_intent(batch_size): init_notice_of_intents(batch_size=batch_size) def clean_notice_of_intent(): + clean_parcels() clean_notice_of_intent_submission_statuses() clean_notice_of_intent_submissions() clean_notice_of_intents() @@ -66,5 +72,7 @@ def process_notice_of_intent(batch_size): process_alcs_notice_of_intent_decision_released_status() + init_notice_of_intent_parcels(batch_size) + # this script must be the last one process_notice_of_intent_submission_status_emails() diff --git a/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_adjacent_land_use/notice_of_intent_submission_adjacent_land_use.py b/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_adjacent_land_use/notice_of_intent_submission_adjacent_land_use.py index a0bcc8a3c8..2657a59557 100644 --- a/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_adjacent_land_use/notice_of_intent_submission_adjacent_land_use.py +++ b/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_adjacent_land_use/notice_of_intent_submission_adjacent_land_use.py @@ -38,7 +38,7 @@ def process_notice_of_intent_adjacent_land_use(conn=None, batch_size=BATCH_UPLOA failed_updates = 0 successful_updates_count = 0 - last_submission_id = 0 + last_land_use_id = 0 with open( "noi/sql/notice_of_intent_submission/adjacent_land_use/notice_of_intent_adjacent_land_use.sql", @@ -48,7 +48,7 @@ def process_notice_of_intent_adjacent_land_use(conn=None, batch_size=BATCH_UPLOA submission_sql = sql_file.read() while True: cursor.execute( - f"{submission_sql} WHERE oalu.alr_application_id > {last_submission_id} ORDER BY oalu.alr_application_id;" + f"{submission_sql} WHERE oalu.adjacent_land_use_id > {last_land_use_id} ORDER BY oalu.adjacent_land_use_id;" ) rows = cursor.fetchmany(batch_size) @@ -58,23 +58,24 @@ def process_notice_of_intent_adjacent_land_use(conn=None, batch_size=BATCH_UPLOA try: submissions_to_be_updated_count = len(rows) - (parsed_data, raw_data) = _update_notice_of_intent_submissions( + total_updated_items = _update_notice_of_intent_submissions( conn, batch_size, cursor, rows ) - successful_updates_count = successful_updates_count + len( - parsed_data + successful_updates_count = ( + successful_updates_count + total_updated_items ) - last_submission_id = dict(rows[-1])["alr_application_id"] + + last_land_use_id = dict(rows[-1])["adjacent_land_use_id"] logger.debug( - f"retrieved/updated items count: {submissions_to_be_updated_count}; total successfully processed submissions so far {successful_updates_count}; last update alr_application_id: {last_submission_id}" + f"retrieved/updated items count: {submissions_to_be_updated_count}; total successfully processed submissions so far {successful_updates_count}; last update alr_application_id: {last_land_use_id}" ) except Exception as err: logger.exception() conn.rollback() failed_updates = count_total - successful_updates_count - last_submission_id = last_submission_id + 1 + last_land_use_id = last_land_use_id + 1 logger.info( f"Finished {etl_name}: total amount of successfully processed adjacent land uses {successful_updates_count}, total failed updates {failed_updates}" @@ -101,7 +102,11 @@ def _update_notice_of_intent_submissions(conn, batch_size, cursor, rows): conn.commit() - return land_use_data, rows + total_items = 0 + for direction in land_use_data: + total_items += len(land_use_data[direction]) + + return total_items _land_use_update_queries = { diff --git a/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_soil_fields.py b/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_soil_fields.py index 994d0573b2..e6d97a7d02 100644 --- a/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_soil_fields.py +++ b/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_soil_fields.py @@ -35,7 +35,7 @@ def process_alcs_notice_of_intent_soil_fields(conn=None, batch_size=BATCH_UPLOAD failed_inserts = 0 successful_updates_count = 0 - last_application_id = 0 + last_soil_change_element_id = 0 with open( "noi/sql/notice_of_intent_submission/soil_fields/notice_of_intent_soil_fields.sql", @@ -45,7 +45,7 @@ def process_alcs_notice_of_intent_soil_fields(conn=None, batch_size=BATCH_UPLOAD application_sql = sql_file.read() while True: cursor.execute( - f"{application_sql} WHERE oaac.alr_application_id > {last_application_id} ORDER BY oaac.alr_application_id;" + f"{application_sql} WHERE osce.soil_change_element_id > {last_soil_change_element_id} ORDER BY osce.soil_change_element_id;" ) rows = cursor.fetchmany(batch_size) @@ -60,17 +60,17 @@ def process_alcs_notice_of_intent_soil_fields(conn=None, batch_size=BATCH_UPLOAD successful_updates_count = ( successful_updates_count + records_to_be_updated_count ) - last_application_id = dict(rows[-1])["alr_application_id"] + last_soil_change_element_id = dict(rows[-1])["soil_change_element_id"] logger.debug( - f"Retrieved/updated items count: {records_to_be_updated_count}; total successfully updated notice of intents so far {successful_updates_count}; last updated alr_application_id: {last_application_id}" + f"Retrieved/updated items count: {records_to_be_updated_count}; total successfully updated notice of intents so far {successful_updates_count}; last updated alr_application_id: {last_soil_change_element_id}" ) except Exception as err: # this is NOT going to be caused by actual data update failure. This code is only executed when the code error appears or connection to DB is lost logger.exception() conn.rollback() failed_inserts = count_total - successful_updates_count - last_application_id = last_application_id + 1 + last_soil_change_element_id = last_soil_change_element_id + 1 logger.info( f"Finished {etl_name}: total amount of successful updates {successful_updates_count}, total failed updates {failed_inserts}" diff --git a/bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/__init__.py b/bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/__init__.py new file mode 100644 index 0000000000..7a39bf7511 --- /dev/null +++ b/bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/__init__.py @@ -0,0 +1,4 @@ +from .notice_of_intent_parcel_insert import ( + init_notice_of_intent_parcels, + clean_parcels, +) diff --git a/bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/notice_of_intent_parcel_insert.py b/bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/notice_of_intent_parcel_insert.py new file mode 100644 index 0000000000..35be625254 --- /dev/null +++ b/bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/notice_of_intent_parcel_insert.py @@ -0,0 +1,162 @@ +from common import ( + setup_and_get_logger, + BATCH_UPLOAD_SIZE, + OATS_ETL_USER, + add_timezone_and_keep_date_part, + OatsToAlcsOwnershipType, +) +from db import inject_conn_pool +from psycopg2.extras import RealDictCursor + +etl_name = "init_notice_of_intent_parcels" +logger = setup_and_get_logger(etl_name) + + +@inject_conn_pool +def init_notice_of_intent_parcels(conn=None, batch_size=BATCH_UPLOAD_SIZE): + logger.info(f"Start {etl_name}") + + with conn.cursor(cursor_factory=RealDictCursor) as cursor: + with open( + "noi/sql/notice_of_intent_submission/parcels/notice_of_intent_parcels_insert_count.sql", + "r", + encoding="utf-8", + ) as sql_file: + count_query = sql_file.read() + cursor.execute(count_query) + count_total = dict(cursor.fetchone())["count"] + logger.info(f"Total Notice of Intents Parcels to insert: {count_total}") + + failed_inserts = 0 + successful_inserts_count = 0 + last_subject_property_id = 0 + + with open( + "noi/sql/notice_of_intent_submission/parcels/notice_of_intent_parcels_insert.sql", + "r", + encoding="utf-8", + ) as sql_file: + application_sql = sql_file.read() + while True: + cursor.execute( + f"{application_sql} WHERE osp.subject_property_id > {last_subject_property_id} ORDER BY osp.subject_property_id;" + ) + + rows = cursor.fetchmany(batch_size) + + if not rows: + break + try: + records_to_be_inserted_count = len(rows) + + _insert_records(conn, cursor, rows) + + successful_inserts_count = ( + successful_inserts_count + records_to_be_inserted_count + ) + + last_subject_property_id = dict(rows[-1])["subject_property_id"] + + logger.debug( + f"inserted items count: {records_to_be_inserted_count}; total successfully inserted notice of intent parcels so far {successful_inserts_count}; last inserted subject_property_id: {last_subject_property_id}" + ) + except Exception as err: + logger.exception(err) + conn.rollback() + failed_inserts = count_total - successful_inserts_count + last_subject_property_id = last_subject_property_id + 1 + + logger.info( + f"Finished {etl_name}: total amount of successful inserts {successful_inserts_count}, total failed inserts {failed_inserts}" + ) + + +def _insert_records(conn, cursor, rows): + number_of_rows_to_insert = len(rows) + + if number_of_rows_to_insert > 0: + insert_query = _compile_application_insert_query(number_of_rows_to_insert) + rows_to_insert = _prepare_data_to_insert(rows) + cursor.execute(insert_query, rows_to_insert) + conn.commit() + + +def _prepare_data_to_insert(rows): + row_without_last_element = [] + for row in rows: + mapped_row = _map_data(row) + row_without_last_element.append(tuple(mapped_row.values())) + + return row_without_last_element + + +def _map_data(row): + return { + "notice_of_intent_submission_uuid": row["notice_of_intent_submission_uuid"], + "audit_created_by": OATS_ETL_USER, + "is_confirmed_by_applicant": True, + "alr_area": row["alr_area"], + "civic_address": row["civic_address"], + "is_farm": row["farm_land_ind"], + "legal_description": row["legal_description"], + "map_area_hectares": row["area_size"], + "ownership_type_code": _map_ownership_type_code( + row["property_owner_type_code"] + ), + "pid": row["pid"], + "pin": row["pin"], + "purchased_date": _map_purchased_date(row["purchase_date"]), + "oats_subject_property_id": row["subject_property_id"], + } + + +def _map_ownership_type_code(ownership_type_code): + if ownership_type_code == OatsToAlcsOwnershipType.FEE.name: + return OatsToAlcsOwnershipType.FEE.value + if ownership_type_code == OatsToAlcsOwnershipType.CROWN.name: + return OatsToAlcsOwnershipType.CROWN.value + if ownership_type_code == OatsToAlcsOwnershipType.FIRST.name: + return OatsToAlcsOwnershipType.FIRST.value + + +def _map_purchased_date(purchased_date): + date = None + if purchased_date: + date = add_timezone_and_keep_date_part(purchased_date) + return date + + +def _compile_application_insert_query(number_of_rows_to_insert): + parcels_to_insert = ",".join(["%s"] * number_of_rows_to_insert) + return f""" + INSERT INTO alcs.notice_of_intent_parcel + ( + notice_of_intent_submission_uuid, + audit_created_by, + is_confirmed_by_applicant, + alr_area, + civic_address, + is_farm, + legal_description, + map_area_hectares, + ownership_type_code, + pid, + pin, + purchased_date, + oats_subject_property_id + ) + VALUES{parcels_to_insert} + ON CONFLICT DO NOTHING + """ + + +@inject_conn_pool +def clean_parcels(conn=None): + logger.info("Start notice of intent parcel cleaning") + with conn.cursor() as cursor: + cursor.execute( + "DELETE FROM alcs.notice_of_intent_parcel noip WHERE noip.audit_created_by = 'oats_etl'" + ) + logger.info(f"Deleted items count = {cursor.rowcount}") + conn.commit() + logger.info("Done notice of intent parcel cleaning") diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/adjacent_land_use/notice_of_intent_adjacent_land_use_count.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/adjacent_land_use/notice_of_intent_adjacent_land_use_count.sql index a54ae9f557..ab22207c05 100644 --- a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/adjacent_land_use/notice_of_intent_adjacent_land_use_count.sql +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/adjacent_land_use/notice_of_intent_adjacent_land_use_count.sql @@ -6,12 +6,7 @@ WITH nois_with_one_or_zero_component_only AS ( AND oaa.application_class_code = 'NOI' GROUP BY oaac.alr_application_id HAVING count(oaac.alr_application_id) < 2 -), -grouped_adjacent_land_uses_by_application_id AS ( - SELECT count(oalu.alr_application_id) - FROM oats.oats_adjacent_land_uses oalu - JOIN nois_with_one_or_zero_component_only ON oalu.alr_application_id = nois_with_one_or_zero_component_only.alr_application_id - GROUP BY oalu.alr_application_id ) SELECT count(*) -FROM grouped_adjacent_land_uses_by_application_id; \ No newline at end of file +FROM oats.oats_adjacent_land_uses oalu + JOIN nois_with_one_or_zero_component_only ON oalu.alr_application_id = nois_with_one_or_zero_component_only.alr_application_id \ No newline at end of file diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/notice_of_intent_parcels_insert.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/notice_of_intent_parcels_insert.sql new file mode 100644 index 0000000000..c35986d216 --- /dev/null +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/notice_of_intent_parcels_insert.sql @@ -0,0 +1,28 @@ +WITH parcels_to_insert AS ( + SELECT nois.uuid, + osp.subject_property_id + FROM alcs.notice_of_intent_submission nois + JOIN oats.oats_subject_properties osp ON osp.alr_application_id = nois.file_number::INTEGER +), +grouped_oats_property_interests_ids AS ( + SELECT MIN(property_owner_type_code) AS property_owner_type_code, + -- min will not affect anything since all property_owner_type_code are the same in scope of subject_property + subject_property_id + FROM oats.oats_property_interests opi + GROUP BY opi.subject_property_id +) +SELECT uuid AS notice_of_intent_submission_uuid, + osp.alr_area, + op.civic_address, + osp.farm_land_ind, + op.legal_description, + op.area_size, + op.pid, + op.pin, + osp.purchase_date, + gopi.property_owner_type_code, + osp.subject_property_id +FROM parcels_to_insert pti + JOIN oats.oats_subject_properties osp ON osp.subject_property_id = pti.subject_property_id + JOIN oats.oats_properties op ON op.property_id = osp.property_id + LEFT JOIN grouped_oats_property_interests_ids gopi ON gopi.subject_property_id = pti.subject_property_id \ No newline at end of file diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/notice_of_intent_parcels_insert_count.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/notice_of_intent_parcels_insert_count.sql new file mode 100644 index 0000000000..ad6388e25e --- /dev/null +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/notice_of_intent_parcels_insert_count.sql @@ -0,0 +1,17 @@ +WITH parcels_to_insert AS ( + SELECT nois.uuid, + osp.subject_property_id + FROM alcs.notice_of_intent_submission nois + JOIN oats.oats_subject_properties osp ON osp.alr_application_id = nois.file_number::INTEGER +), +grouped_oats_property_interests_ids AS ( + SELECT MIN(property_owner_type_code) AS property_owner_type_code, + subject_property_id + FROM oats.oats_property_interests opi + GROUP BY opi.subject_property_id +) +SELECT count(*) +FROM parcels_to_insert pti + JOIN oats.oats_subject_properties osp ON osp.subject_property_id = pti.subject_property_id + JOIN oats.oats_properties op ON op.property_id = osp.property_id + LEFT JOIN grouped_oats_property_interests_ids gopi ON gopi.subject_property_id = pti.subject_property_id; \ No newline at end of file diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/notice_of_intent_parcels_insert_validation.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/notice_of_intent_parcels_insert_validation.sql new file mode 100644 index 0000000000..254e6c9a09 --- /dev/null +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/notice_of_intent_parcels_insert_validation.sql @@ -0,0 +1,68 @@ +-- Total count of inserted parcels should match total count of parcels in oats +-- Get total count of parcels in ALCS +SELECT count(*) +FROM alcs.notice_of_intent_parcel noip; +-- Get total count of parcels in OATS +WITH noi_components_grouped AS ( + SELECT oaac.alr_application_id + FROM oats.oats_alr_appl_components oaac + JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id + WHERE oaa.application_class_code = 'NOI' + GROUP BY oaac.alr_application_id + HAVING count(oaac.alr_application_id) < 2 -- ignore notice of intents with multiple components +) +SELECT count(*) +FROM noi_components_grouped noig + JOIN oats.oats_subject_properties osp ON osp.alr_application_id = noig.alr_application_id; +-- return records that are different between OATS and ALCS +WITH parcels_to_insert AS ( + SELECT nois.uuid, + osp.subject_property_id + FROM alcs.notice_of_intent_submission nois + JOIN oats.oats_subject_properties osp ON osp.alr_application_id = nois.file_number::INTEGER +), +grouped_oats_property_interests_ids AS ( + SELECT MIN(property_owner_type_code) AS property_owner_type_code, + -- min will not affect anything since all property_owner_type_code are the same in scope of subject_property + subject_property_id + FROM oats.oats_property_interests opi + GROUP BY opi.subject_property_id +) --- compares parcel fields and returns mismatches. Since oats has a lot of bad data ignore all records prior the 1900s +SELECT noip.alr_area, + osp.alr_area, + noip.civic_address, + op.civic_address, + noip.is_farm, + osp.farm_land_ind, + noip.legal_description, + op.legal_description, + noip.map_area_hectares, + op.area_size, + noip.pid, + op.pid, + noip.pin, + op.pin, + noip.purchased_date AT TIME ZONE 'UTC', + osp.purchase_date, + noip.ownership_type_code, + gopi.property_owner_type_code, + noip.oats_subject_property_id, + osp.subject_property_id +FROM parcels_to_insert pti + JOIN oats.oats_subject_properties osp ON osp.subject_property_id = pti.subject_property_id + JOIN oats.oats_properties op ON op.property_id = osp.property_id + LEFT JOIN grouped_oats_property_interests_ids gopi ON gopi.subject_property_id = pti.subject_property_id + JOIN alcs.notice_of_intent_parcel noip ON noip.oats_subject_property_id = pti.subject_property_id +WHERE noip.alr_area != osp.alr_area + OR (noip.civic_address != op.civic_address) + OR (noip.is_farm != osp.farm_land_ind::bool) + OR (noip.legal_description != op.legal_description) + OR (noip.map_area_hectares != op.area_size) + OR (noip.pid != op.pid::text) + OR (noip.pin != op.pin::text) + OR ( + noip.purchased_date != osp.purchase_date AT TIME ZONE 'America/Vancouver' + ) + OR ( + noip.oats_subject_property_id != osp.subject_property_id + ); \ No newline at end of file diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/soil_fields/notice_of_intent_soil_fields.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/soil_fields/notice_of_intent_soil_fields.sql index c2eb9bd52b..820be8f911 100644 --- a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/soil_fields/notice_of_intent_soil_fields.sql +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/soil_fields/notice_of_intent_soil_fields.sql @@ -1,17 +1,12 @@ - - -SELECT -oaac.alr_application_id, -osce.soil_change_code, -osce.material_desc, -osce.material_origin_desc, -osce.volume, -osce.project_area , -osce."depth", -osce.project_duration -FROM - oats.oats_soil_change_elements osce -JOIN oats.oats_alr_appl_components oaac ON oaac.alr_appl_component_id = osce.alr_appl_component_id -JOIN alcs.notice_of_intent_submission nois ON nois.file_number = oaac.alr_application_id::text - - \ No newline at end of file +SELECT oaac.alr_application_id, + osce.soil_change_code, + osce.material_desc, + osce.material_origin_desc, + osce.volume, + osce.project_area, + osce."depth", + osce.project_duration, + osce.soil_change_element_id +FROM oats.oats_soil_change_elements osce + JOIN oats.oats_alr_appl_components oaac ON oaac.alr_appl_component_id = osce.alr_appl_component_id + JOIN alcs.notice_of_intent_submission nois ON nois.file_number = oaac.alr_application_id::text \ No newline at end of file diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.entity.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.entity.ts index 3215f14c90..147c80a5c1 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.entity.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.entity.ts @@ -144,4 +144,13 @@ export class NoticeOfIntentParcel extends Base { transformer: new ColumnNumericTransformer(), }) alrArea?: number | null; + + @Column({ + select: false, + nullable: true, + type: 'int8', + comment: + 'This column is NOT related to any functionality in ALCS. It is only used for ETL and backtracking of imported data from OATS. It links oats.oats_subject_properties to alcs.notice_of_intent_parcel.', + }) + oatsSubjectPropertyId: number; } diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1699028330101-add_oats_subject_property_id_to_alcs.ts b/services/apps/alcs/src/providers/typeorm/migrations/1699028330101-add_oats_subject_property_id_to_alcs.ts new file mode 100644 index 0000000000..9603878424 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1699028330101-add_oats_subject_property_id_to_alcs.ts @@ -0,0 +1,25 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class addOatsSubjectPropertyIdToAlcs1699028330101 + implements MigrationInterface +{ + name = 'addOatsSubjectPropertyIdToAlcs1699028330101'; + + public async up(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_parcel" ADD "oats_subject_property_id" bigint`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."notice_of_intent_parcel"."oats_subject_property_id" IS 'This column is NOT related to any functionality in ALCS. It is only used for ETL and backtracking of imported data from OATS. It links oats.oats_subject_properties to alcs.notice_of_intent_parcel.'`, + ); + } + + public async down(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."notice_of_intent_parcel"."oats_subject_property_id" IS 'This column is NOT related to any functionality in ALCS. It is only used for ETL and backtracking of imported data from OATS. It links oats.oats_subject_properties to alcs.notice_of_intent_parcel.'`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_parcel" DROP COLUMN "oats_subject_property_id"`, + ); + } +} From c388e3d131a137ef5a711229c83b8cc065fb9ce0 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Mon, 6 Nov 2023 09:29:26 -0800 Subject: [PATCH 600/954] Update Labels for Portal File Types --- .../search/file-type/file-type-data-source.service.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/portal-frontend/src/app/services/search/file-type/file-type-data-source.service.ts b/portal-frontend/src/app/services/search/file-type/file-type-data-source.service.ts index b67beabc26..c46d933724 100644 --- a/portal-frontend/src/app/services/search/file-type/file-type-data-source.service.ts +++ b/portal-frontend/src/app/services/search/file-type/file-type-data-source.service.ts @@ -39,13 +39,13 @@ const TREE_DATA: TreeNode[] = [ item: { label: 'Removal of Soil and Placement of Fill', value: 'PFRS' }, }, { - item: { label: 'Removal of Soil Only', value: 'ROSO' }, + item: { label: 'Removal of Soil', value: 'ROSO' }, }, { item: { label: 'Subdivision', value: 'SUBD' }, }, { - item: { label: 'Transportation, Utility, Trail Permits', value: 'TURP' }, + item: { label: 'Transportation, Utility, or Recreational Trail', value: 'TURP' }, }, { item: { label: 'Restrictive Covenant', value: 'COVE' }, From 9dc5fe1963b4ebe669ba629bc71aea3469d72722 Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Mon, 6 Nov 2023 09:59:30 -0800 Subject: [PATCH 601/954] Certificate of title import for noi (#1138) certificate of title import for noi --- .../noi/notice_of_intent_migration.py | 3 + .../parcels/__init__.py | 3 + .../notice_of_intent_certificate_of_title.py | 90 +++++++++++++++++++ .../notice_of_intent_certificate_of_title.sql | 15 ++++ ...e_of_intent_certificate_of_title_count.sql | 9 ++ ...intent_certificate_of_title_validation.sql | 33 +++++++ 6 files changed, 153 insertions(+) create mode 100644 bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/notice_of_intent_certificate_of_title.py create mode 100644 bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/certificate_of_title/notice_of_intent_certificate_of_title.sql create mode 100644 bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/certificate_of_title/notice_of_intent_certificate_of_title_count.sql create mode 100644 bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/certificate_of_title/notice_of_intent_certificate_of_title_validation.sql diff --git a/bin/migrate-oats-data/noi/notice_of_intent_migration.py b/bin/migrate-oats-data/noi/notice_of_intent_migration.py index feb9eb3e35..47ced0f7e8 100644 --- a/bin/migrate-oats-data/noi/notice_of_intent_migration.py +++ b/bin/migrate-oats-data/noi/notice_of_intent_migration.py @@ -28,6 +28,7 @@ from .notice_of_intent_submissions.parcels import ( init_notice_of_intent_parcels, clean_parcels, + process_notice_of_intent_certificate_of_title, ) @@ -74,5 +75,7 @@ def process_notice_of_intent(batch_size): init_notice_of_intent_parcels(batch_size) + process_notice_of_intent_certificate_of_title(batch_size) + # this script must be the last one process_notice_of_intent_submission_status_emails() diff --git a/bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/__init__.py b/bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/__init__.py index 7a39bf7511..86c09ad9fa 100644 --- a/bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/__init__.py +++ b/bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/__init__.py @@ -2,3 +2,6 @@ init_notice_of_intent_parcels, clean_parcels, ) +from .notice_of_intent_certificate_of_title import ( + process_notice_of_intent_certificate_of_title, +) diff --git a/bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/notice_of_intent_certificate_of_title.py b/bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/notice_of_intent_certificate_of_title.py new file mode 100644 index 0000000000..618ef224c9 --- /dev/null +++ b/bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/notice_of_intent_certificate_of_title.py @@ -0,0 +1,90 @@ +from common import ( + setup_and_get_logger, + BATCH_UPLOAD_SIZE, +) +from db import inject_conn_pool +from psycopg2.extras import RealDictCursor, execute_batch + +etl_name = "process_notice_of_intent_certificate_of_title" +logger = setup_and_get_logger(etl_name) + + +@inject_conn_pool +def process_notice_of_intent_certificate_of_title( + conn=None, batch_size=BATCH_UPLOAD_SIZE +): + logger.info(f"Start {etl_name}") + with conn.cursor(cursor_factory=RealDictCursor) as cursor: + with open( + "noi/sql/notice_of_intent_submission/parcels/certificate_of_title/notice_of_intent_certificate_of_title_count.sql", + "r", + encoding="utf-8", + ) as sql_file: + count_query = sql_file.read() + cursor.execute(count_query) + count_total = dict(cursor.fetchone())["count"] + logger.info(f"Total Notice of Intents data to update: {count_total}") + + failed_inserts = 0 + successful_updates_count = 0 + last_document_id = 0 + + with open( + "noi/sql/notice_of_intent_submission/parcels/certificate_of_title/notice_of_intent_certificate_of_title.sql", + "r", + encoding="utf-8", + ) as sql_file: + application_sql = sql_file.read() + while True: + cursor.execute( + f"{application_sql} AND od.document_id > {last_document_id} ORDER BY od.document_id;" + ) + + rows = cursor.fetchmany(batch_size) + + if not rows: + break + try: + records_to_be_updated_count = len(rows) + + _update_records(conn, batch_size, cursor, rows) + + successful_updates_count = ( + successful_updates_count + records_to_be_updated_count + ) + last_document_id = dict(rows[-1])["document_id"] + + logger.debug( + f"retrieved/updated items count: {records_to_be_updated_count}; total successfully updated notice of intents so far {successful_updates_count}; last updated alr_application_id: {last_document_id}" + ) + except Exception as err: + # this is NOT going to be caused by actual data update failure. This code is only executed when the code error appears or connection to DB is lost + logger.exception() + conn.rollback() + failed_inserts = count_total - successful_updates_count + last_document_id = last_document_id + 1 + + logger.info( + f"Finished {etl_name}: total amount of successful updates {successful_updates_count}, total failed updates {failed_inserts}" + ) + + +def _update_records(conn, batch_size, cursor, rows): + # parsed_data_list = _prepare_oats_data(rows) + + if len(rows) > 0: + execute_batch( + cursor, + _update_query, + rows, + page_size=batch_size, + ) + + conn.commit() + + +_update_query = """ + UPDATE alcs.notice_of_intent_parcel + SET certificate_of_title_uuid = %(document_uuid)s + WHERE oats_subject_property_id = %(subject_property_id)s +""" diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/certificate_of_title/notice_of_intent_certificate_of_title.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/certificate_of_title/notice_of_intent_certificate_of_title.sql new file mode 100644 index 0000000000..725755966e --- /dev/null +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/certificate_of_title/notice_of_intent_certificate_of_title.sql @@ -0,0 +1,15 @@ +SELECT od.document_id, + od.document_code, + odc.description, + osp.subject_property_id, + oaa.alr_application_id, + od.who_created, + noid.uuid AS document_uuid +FROM oats.oats_documents od + JOIN oats.oats_subject_properties osp ON osp.subject_property_id = od.subject_property_id + JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = osp.alr_application_id + JOIN oats.oats_document_codes odc ON odc.document_code = od.document_code + JOIN alcs.notice_of_intent_document noid ON noid.oats_document_id::bigint = od.document_id + JOIN alcs.notice_of_intent_parcel noip ON noip.oats_subject_property_id = osp.subject_property_id +WHERE od.document_code = 'CT' + AND oaa.application_class_code = 'NOI' \ No newline at end of file diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/certificate_of_title/notice_of_intent_certificate_of_title_count.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/certificate_of_title/notice_of_intent_certificate_of_title_count.sql new file mode 100644 index 0000000000..577601443b --- /dev/null +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/certificate_of_title/notice_of_intent_certificate_of_title_count.sql @@ -0,0 +1,9 @@ +SELECT count(*) +FROM oats.oats_documents od + JOIN oats.oats_subject_properties osp ON osp.subject_property_id = od.subject_property_id + JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = osp.alr_application_id + JOIN oats.oats_document_codes odc ON odc.document_code = od.document_code + JOIN alcs.notice_of_intent_document noid ON noid.oats_document_id::bigint = od.document_id + JOIN alcs.notice_of_intent_parcel noip ON noip.oats_subject_property_id = osp.subject_property_id +WHERE od.document_code = 'CT' + AND oaa.application_class_code = 'NOI'; \ No newline at end of file diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/certificate_of_title/notice_of_intent_certificate_of_title_validation.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/certificate_of_title/notice_of_intent_certificate_of_title_validation.sql new file mode 100644 index 0000000000..2c6774dadb --- /dev/null +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/certificate_of_title/notice_of_intent_certificate_of_title_validation.sql @@ -0,0 +1,33 @@ +WITH oats_cert_of_titles AS ( + SELECT od.document_id, + osp.subject_property_id, + oaa.alr_application_id + FROM oats.oats_documents od + JOIN oats.oats_subject_properties osp ON osp.subject_property_id = od.subject_property_id + JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = osp.alr_application_id + JOIN oats.oats_document_codes odc ON odc.document_code = od.document_code + WHERE od.document_code = 'CT' + AND oaa.application_class_code = 'NOI' +), +alcs_oats_certificate_of_titles AS ( + SELECT noip.oats_subject_property_id, + noid.oats_document_id + FROM alcs.notice_of_intent_parcel noip + JOIN alcs.notice_of_intent_document noid ON noid.uuid = noip.certificate_of_title_uuid +) +SELECT * +FROM alcs_oats_certificate_of_titles act + LEFT JOIN oats_cert_of_titles oct ON oct.subject_property_id = act.oats_subject_property_id +WHERE act.oats_document_id != oct.document_id::TEXT; +-- count certificates of title in oats linked to subject_properties +SELECT count(*) +FROM oats.oats_documents od + JOIN oats.oats_subject_properties osp ON osp.subject_property_id = od.subject_property_id + JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = osp.alr_application_id + JOIN oats.oats_document_codes odc ON odc.document_code = od.document_code +WHERE od.document_code = 'CT' + AND oaa.application_class_code = 'NOI'; +-- count certificate of titles linked in alcs +SELECT count(*) +FROM alcs.notice_of_intent_parcel noip + JOIN alcs.notice_of_intent_document noid ON noid.uuid = noip.certificate_of_title_uuid; \ No newline at end of file From 5abe54ca158d612ab1a92eeae16c0ce8fd28585e Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Mon, 6 Nov 2023 11:56:58 -0800 Subject: [PATCH 602/954] Increase Area Fields to 5 decimals * Adjust lots of fields from 2 -> 5 fields * Update inline number to accept varying number of decimals --- .../basic/basic.component.html | 1 + .../subd/subd.component.html | 1 + .../incl-excl-input.component.html | 2 +- .../naru-input/naru-input.component.html | 2 +- .../nfu-input/nfu-input.component.html | 2 +- .../pfrs-input/pfrs-input.component.html | 6 +- .../pofo-input/pofo-input.component.html | 4 +- .../roso-input/roso-input.component.html | 4 +- .../subd-input/subd-input.component.html | 2 +- .../parcel-prep/parcel-prep.component.html | 2 +- .../proposal/proposal.component.html | 2 +- .../basic/basic.component.html | 1 + .../pfrs-input/pfrs-input.component.html | 6 +- .../pofo-input/pofo-input.component.html | 4 +- .../roso-input/roso-input.component.html | 4 +- .../parcel-prep/parcel-prep.component.html | 2 +- .../proposal/proposal.component.html | 2 +- .../inline-number.component.html | 2 +- .../inline-number/inline-number.component.ts | 1 + .../lots-table/lots-table-form.component.html | 4 +- .../parcel-entry/parcel-entry.component.html | 2 +- .../excl-proposal.component.html | 2 +- .../incl-proposal.component.html | 2 +- .../naru-proposal.component.html | 6 +- .../nfu-proposal/nfu-proposal.component.html | 2 +- .../subd-proposal.component.html | 2 +- .../subd-proposal/subd-proposal.component.ts | 4 +- .../tur-proposal/tur-proposal.component.html | 2 +- .../additional-information.component.html | 2 +- .../parcel-entry/parcel-entry.component.html | 2 +- .../proposal/proposal.component.html | 2 +- .../soil-table/soil-table.component.html | 4 +- ...plication-decision-component-lot.entity.ts | 4 +- .../application-decision-component.entity.ts | 6 +- .../alcs/application/application.entity.ts | 2 +- .../notice-of-intent.entity.ts | 2 +- .../application-parcel.entity.ts | 2 +- .../application-submission.entity.ts | 22 ++- .../notice-of-intent-parcel.entity.ts | 2 +- .../notice-of-intent-submission.entity.ts | 8 +- .../notification-parcel.entity.ts | 1 - .../notification-submission.entity.ts | 2 +- .../1699297830036-add_more_precision.ts | 155 ++++++++++++++++++ 43 files changed, 224 insertions(+), 68 deletions(-) create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1699297830036-add_more_precision.ts diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/basic/basic.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/basic/basic.component.html index 995cbe4c53..40aae52ce4 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/basic/basic.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/basic/basic.component.html @@ -3,5 +3,6 @@ <app-inline-number [value]="component.alrArea?.toString()" (save)="onSaveAlrArea($event)" + [decimals]="5" ></app-inline-number> </div> diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/subd/subd.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/subd/subd.component.html index 525b2dba48..9078778b4d 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/subd/subd.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/subd/subd.component.html @@ -28,6 +28,7 @@ <app-inline-number (save)="onSaveAlrParcelArea(lot, $event)" [value]="lot.alrArea?.toString()" + [decimals]="5" ></app-inline-number> </div> </ng-container> diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/incl-excl-input/incl-excl-input.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/incl-excl-input/incl-excl-input.component.html index 5da41dfebd..3adf805cb7 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/incl-excl-input/incl-excl-input.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/incl-excl-input/incl-excl-input.component.html @@ -5,7 +5,7 @@ <input matInput min="0.01" - mask="separator.2" + mask="separator.5" thousandSeparator="," separatorLimit="9999999999" formControlName="alrArea" diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/naru-input/naru-input.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/naru-input/naru-input.component.html index a5939e3f04..8f3a316d60 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/naru-input/naru-input.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/naru-input/naru-input.component.html @@ -5,7 +5,7 @@ <input matInput min="0.01" - mask="separator.2" + mask="separator.5" thousandSeparator="," separatorLimit="9999999999" formControlName="alrArea" diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/nfu-input/nfu-input.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/nfu-input/nfu-input.component.html index 931f758cd4..7b3d214907 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/nfu-input/nfu-input.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/nfu-input/nfu-input.component.html @@ -5,7 +5,7 @@ <input matInput min="0.01" - mask="separator.2" + mask="separator.5" thousandSeparator="," separatorLimit="9999999999" formControlName="alrArea" diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/pfrs-input/pfrs-input.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/pfrs-input/pfrs-input.component.html index 9d6349344d..62db4dada3 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/pfrs-input/pfrs-input.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/pfrs-input/pfrs-input.component.html @@ -4,7 +4,7 @@ <input matInput min="0.01" - mask="separator.2" + mask="separator.5" thousandSeparator="," separatorLimit="9999999999" formControlName="alrArea" @@ -107,7 +107,7 @@ <mat-form-field appearance="outline" class="full-width"> <input min="0.01" - mask="separator.2" + mask="separator.5" thousandSeparator="," separatorLimit="9999999999" matInput @@ -120,7 +120,7 @@ <mat-form-field appearance="outline" class="full-width"> <input min="0.01" - mask="separator.2" + mask="separator.5" thousandSeparator="," separatorLimit="9999999999" matInput diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/pofo-input/pofo-input.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/pofo-input/pofo-input.component.html index 5f0138eda5..2df4251a17 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/pofo-input/pofo-input.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/pofo-input/pofo-input.component.html @@ -5,7 +5,7 @@ <input matInput min="0.01" - mask="separator.2" + mask="separator.5" thousandSeparator="," separatorLimit="9999999999" formControlName="alrArea" @@ -56,7 +56,7 @@ <input matInput min="0.01" - mask="separator.2" + mask="separator.5" thousandSeparator="," separatorLimit="9999999999" formControlName="areaToPlace" diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/roso-input/roso-input.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/roso-input/roso-input.component.html index 12da03f807..34b18cef74 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/roso-input/roso-input.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/roso-input/roso-input.component.html @@ -5,7 +5,7 @@ <input matInput min="0.01" - mask="separator.2" + mask="separator.5" thousandSeparator="," separatorLimit="9999999999" formControlName="alrArea" @@ -56,7 +56,7 @@ <input matInput min="0.01" - mask="separator.2" + mask="separator.5" thousandSeparator="," separatorLimit="9999999999" formControlName="areaToRemove" diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/subd-input/subd-input.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/subd-input/subd-input.component.html index fffb200739..2bac9ad60e 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/subd-input/subd-input.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/subd-input/subd-input.component.html @@ -5,7 +5,7 @@ <input matInput min="0.01" - mask="separator.2" + mask="separator.5" thousandSeparator="," separatorLimit="9999999999" formControlName="alrArea" diff --git a/alcs-frontend/src/app/features/application/proposal/parcel-prep/parcel-prep.component.html b/alcs-frontend/src/app/features/application/proposal/parcel-prep/parcel-prep.component.html index 91cfbd81db..8746b4d52f 100644 --- a/alcs-frontend/src/app/features/application/proposal/parcel-prep/parcel-prep.component.html +++ b/alcs-frontend/src/app/features/application/proposal/parcel-prep/parcel-prep.component.html @@ -36,7 +36,7 @@ <ng-container matColumnDef="alrArea"> <th mat-header-cell *matHeaderCellDef>ALR Area (ha)</th> <td mat-cell *matCellDef="let row"> - <app-inline-number [value]="row.alrArea" (save)="saveParcel(row.uuid, $event)"></app-inline-number> + <app-inline-number [value]="row.alrArea" (save)="saveParcel(row.uuid, $event)" [decimals]="5"></app-inline-number> </td> </ng-container> <ng-container matColumnDef="owners"> diff --git a/alcs-frontend/src/app/features/application/proposal/proposal.component.html b/alcs-frontend/src/app/features/application/proposal/proposal.component.html index ddd31928d3..873e9d5232 100644 --- a/alcs-frontend/src/app/features/application/proposal/proposal.component.html +++ b/alcs-frontend/src/app/features/application/proposal/proposal.component.html @@ -4,7 +4,7 @@ <h5>Proposal Components - {{ application?.type?.label }}</h5> <div class="input-table"> <div> <div class="subheading2">Proposal ALR Area Impacted (ha)</div> - <app-inline-number [value]="alrArea" (save)="onSaveAlrArea($event)"></app-inline-number> + <app-inline-number [value]="alrArea" (save)="onSaveAlrArea($event)" [decimals]="5"></app-inline-number> </div> <div> <div class="subheading2">Agricultural Capability</div> diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/basic/basic.component.html b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/basic/basic.component.html index 995cbe4c53..40aae52ce4 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/basic/basic.component.html +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/basic/basic.component.html @@ -3,5 +3,6 @@ <app-inline-number [value]="component.alrArea?.toString()" (save)="onSaveAlrArea($event)" + [decimals]="5" ></app-inline-number> </div> diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/pfrs-input/pfrs-input.component.html b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/pfrs-input/pfrs-input.component.html index c46cee3cd2..745b8f2303 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/pfrs-input/pfrs-input.component.html +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/pfrs-input/pfrs-input.component.html @@ -4,7 +4,7 @@ <input matInput min="0.01" - mask="separator.2" + mask="separator.5" thousandSeparator="," separatorLimit="9999999999" formControlName="alrArea" @@ -105,7 +105,7 @@ <mat-form-field appearance="outline" class="full-width"> <input min="0.01" - mask="separator.2" + mask="separator.5" thousandSeparator="," separatorLimit="9999999999" matInput @@ -118,7 +118,7 @@ <mat-form-field appearance="outline" class="full-width"> <input min="0.01" - mask="separator.2" + mask="separator.5" thousandSeparator="," separatorLimit="9999999999" matInput diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/pofo-input/pofo-input.component.html b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/pofo-input/pofo-input.component.html index 5f0138eda5..2df4251a17 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/pofo-input/pofo-input.component.html +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/pofo-input/pofo-input.component.html @@ -5,7 +5,7 @@ <input matInput min="0.01" - mask="separator.2" + mask="separator.5" thousandSeparator="," separatorLimit="9999999999" formControlName="alrArea" @@ -56,7 +56,7 @@ <input matInput min="0.01" - mask="separator.2" + mask="separator.5" thousandSeparator="," separatorLimit="9999999999" formControlName="areaToPlace" diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/roso-input/roso-input.component.html b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/roso-input/roso-input.component.html index db43104f4f..a1f3b2c9dd 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/roso-input/roso-input.component.html +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/roso-input/roso-input.component.html @@ -5,7 +5,7 @@ <input matInput min="0.01" - mask="separator.2" + mask="separator.5" thousandSeparator="," separatorLimit="9999999999" formControlName="alrArea" @@ -55,7 +55,7 @@ <input matInput min="0.01" - mask="separator.2" + mask="separator.5" thousandSeparator="," separatorLimit="9999999999" formControlName="areaToRemove" diff --git a/alcs-frontend/src/app/features/notice-of-intent/proposal/parcel-prep/parcel-prep.component.html b/alcs-frontend/src/app/features/notice-of-intent/proposal/parcel-prep/parcel-prep.component.html index 91cfbd81db..8746b4d52f 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/proposal/parcel-prep/parcel-prep.component.html +++ b/alcs-frontend/src/app/features/notice-of-intent/proposal/parcel-prep/parcel-prep.component.html @@ -36,7 +36,7 @@ <ng-container matColumnDef="alrArea"> <th mat-header-cell *matHeaderCellDef>ALR Area (ha)</th> <td mat-cell *matCellDef="let row"> - <app-inline-number [value]="row.alrArea" (save)="saveParcel(row.uuid, $event)"></app-inline-number> + <app-inline-number [value]="row.alrArea" (save)="saveParcel(row.uuid, $event)" [decimals]="5"></app-inline-number> </td> </ng-container> <ng-container matColumnDef="owners"> diff --git a/alcs-frontend/src/app/features/notice-of-intent/proposal/proposal.component.html b/alcs-frontend/src/app/features/notice-of-intent/proposal/proposal.component.html index f57ffd73e6..aeed51b1ba 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/proposal/proposal.component.html +++ b/alcs-frontend/src/app/features/notice-of-intent/proposal/proposal.component.html @@ -4,7 +4,7 @@ <h5>Proposal Components - {{ noticeOfIntent?.type?.label }}</h5> <div class="input-table"> <div> <div class="subheading2">Proposal ALR Area Impacted (ha)</div> - <app-inline-number [value]="alrArea" (save)="onSaveAlrArea($event)"></app-inline-number> + <app-inline-number [value]="alrArea" (save)="onSaveAlrArea($event)" [decimals]="5"></app-inline-number> </div> <div> <div class="subheading2">Agricultural Capability</div> diff --git a/alcs-frontend/src/app/shared/inline-editors/inline-number/inline-number.component.html b/alcs-frontend/src/app/shared/inline-editors/inline-number/inline-number.component.html index 4bee528645..be59ee3d2b 100644 --- a/alcs-frontend/src/app/shared/inline-editors/inline-number/inline-number.component.html +++ b/alcs-frontend/src/app/shared/inline-editors/inline-number/inline-number.component.html @@ -19,7 +19,7 @@ <input matInput class="editable" - mask="separator.2" + [mask]="'separator.' + decimals" thousandSeparator="," separatorLimit="99999999" name="value" diff --git a/alcs-frontend/src/app/shared/inline-editors/inline-number/inline-number.component.ts b/alcs-frontend/src/app/shared/inline-editors/inline-number/inline-number.component.ts index c3c7b68289..7f1849916f 100644 --- a/alcs-frontend/src/app/shared/inline-editors/inline-number/inline-number.component.ts +++ b/alcs-frontend/src/app/shared/inline-editors/inline-number/inline-number.component.ts @@ -8,6 +8,7 @@ import { AfterContentChecked, Component, ElementRef, EventEmitter, Input, Output export class InlineNumberComponent implements AfterContentChecked { @Input() value?: string | undefined; @Input() placeholder: string = 'Enter a value'; + @Input() decimals = 2; @Output() save = new EventEmitter<string | null>(); @ViewChild('editInput') textInput!: ElementRef; diff --git a/alcs-frontend/src/app/shared/lots-table/lots-table-form.component.html b/alcs-frontend/src/app/shared/lots-table/lots-table-form.component.html index 0807552a36..3f493df2de 100644 --- a/alcs-frontend/src/app/shared/lots-table/lots-table-form.component.html +++ b/alcs-frontend/src/app/shared/lots-table/lots-table-form.component.html @@ -44,7 +44,7 @@ type="text" matInput thousandSeparator="," - mask="separator.2" + mask="separator.5" separatorLimit="9999999999" min="0.01" formControlName="{{ i }}-lotSize" @@ -63,7 +63,7 @@ type="text" matInput thousandSeparator="," - mask="separator.2" + mask="separator.5" separatorLimit="9999999999" min="0.01" formControlName="{{ i }}-lotAlrArea" diff --git a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html index a0336bc05a..f9c929af45 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html @@ -87,7 +87,7 @@ <h5>Parcel Lookup</h5> <mat-form-field class="full-width-input" appearance="outline"> <input id="map-area" - mask="separator.2" + mask="separator.5" thousandSeparator="," separatorLimit="9999999999" matInput diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/excl-proposal/excl-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/excl-proposal/excl-proposal.component.html index 2e7f9aa9ef..69dda49794 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/excl-proposal/excl-proposal.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/excl-proposal/excl-proposal.component.html @@ -34,7 +34,7 @@ <h2>Proposal</h2> <mat-form-field appearance="outline"> <input id="hectares" - mask="separator.2" + mask="separator.5" thousandSeparator="," separatorLimit="9999999999" min="0.01" diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/incl-proposal/incl-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/incl-proposal/incl-proposal.component.html index 49c9476059..43aa27c9ed 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/incl-proposal/incl-proposal.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/incl-proposal/incl-proposal.component.html @@ -24,7 +24,7 @@ <h2>Proposal</h2> <mat-form-field appearance="outline"> <input id="hectares" - mask="separator.2" + mask="separator.5" thousandSeparator="," separatorLimit="9999999999" min="0.01" diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.html index d6a2e26ac1..06645074a7 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.html @@ -65,7 +65,7 @@ <h2>Proposal</h2> <mat-form-field appearance="outline"> <input id="floorArea" - mask="separator.2" + mask="separator.5" thousandSeparator="," separatorLimit="9999999999" min="0.01" @@ -167,7 +167,7 @@ <h2>Proposal</h2> <mat-form-field appearance="outline"> <input id="floorArea" - mask="separator.2" + mask="separator.5" thousandSeparator="," separatorLimit="9999999999" min="0.01" @@ -261,7 +261,7 @@ <h2>Proposal</h2> <mat-form-field appearance="outline"> <input id="floorArea" - mask="separator.2" + mask="separator.5" thousandSeparator="," separatorLimit="9999999999" min="0.01" diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/nfu-proposal/nfu-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/nfu-proposal/nfu-proposal.component.html index ec76b0445f..3f9443695b 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/nfu-proposal/nfu-proposal.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/nfu-proposal/nfu-proposal.component.html @@ -23,7 +23,7 @@ <h2>Proposal</h2> <mat-form-field appearance="outline"> <input id="hectares" - mask="separator.2" + mask="separator.5" thousandSeparator="," separatorLimit="9999999999" min="0.01" diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.html index 4cab25c489..64c90cf72c 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.html @@ -103,7 +103,7 @@ <h6>Documents needed for this step:</h6> type="text" matInput thousandSeparator="," - mask="separator.2" + mask="separator.5" separatorLimit="9999999999" min="0.01" required diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.ts index a37c35acea..4466365e89 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.ts @@ -197,7 +197,7 @@ export class SubdProposalComponent extends FilesStepComponent implements OnInit, private calculateLotSize() { this.totalAcres = this.proposedLots .reduce((total, lot) => total + (lot.size !== null ? parseFloat(lot.size) : 0), 0) - .toFixed(2); + .toFixed(5); } private async loadParcels(submissionUuid: string) { @@ -206,7 +206,7 @@ export class SubdProposalComponent extends FilesStepComponent implements OnInit, this.totalTargetAcres = parcels .filter((parcel) => parcel.parcelType === PARCEL_TYPE.APPLICATION) .reduce((total, parcel) => total + (parcel.mapAreaHectares ? parseFloat(parcel.mapAreaHectares) : 0), 0) - .toFixed(2); + .toFixed(5); } } } diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/tur-proposal/tur-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/tur-proposal/tur-proposal.component.html index d8ba820098..b72b2b6996 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/tur-proposal/tur-proposal.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/tur-proposal/tur-proposal.component.html @@ -125,7 +125,7 @@ <h6>Documents needed for this step:</h6> <mat-form-field appearance="outline"> <input [formControl]="totalCorridorArea" - mask="separator.2" + mask="separator.5" thousandSeparator="," separatorLimit="9999999999" min="0.01" diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component.html index 28f99416c2..e4f0a7136a 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component.html @@ -110,7 +110,7 @@ <h2>Additional Proposal Information</h2> type="text" matInput thousandSeparator="," - mask="separator.2" + mask="separator.5" separatorLimit="9999999999" min="0.01" placeholder="Type area" diff --git a/portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-entry/parcel-entry.component.html b/portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-entry/parcel-entry.component.html index b350bd7891..44247bd91f 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-entry/parcel-entry.component.html +++ b/portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-entry/parcel-entry.component.html @@ -87,7 +87,7 @@ <h5>Parcel Lookup</h5> <mat-form-field class="full-width-input" appearance="outline"> <input id="map-area" - mask="separator.2" + mask="separator.5" thousandSeparator="," separatorLimit="9999999999" matInput diff --git a/portal-frontend/src/app/features/notifications/edit-submission/proposal/proposal.component.html b/portal-frontend/src/app/features/notifications/edit-submission/proposal/proposal.component.html index 7755e9ffa9..4b484351cb 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/proposal/proposal.component.html +++ b/portal-frontend/src/app/features/notifications/edit-submission/proposal/proposal.component.html @@ -50,7 +50,7 @@ <h2>Purpose of SRW</h2> <mat-form-field appearance="outline"> <input [formControl]="totalArea" - mask="separator.2" + mask="separator.5" thousandSeparator="," separatorLimit="9999999999" min="0.01" diff --git a/portal-frontend/src/app/shared/soil-table/soil-table.component.html b/portal-frontend/src/app/shared/soil-table/soil-table.component.html index 4eb13745e2..557dad512c 100644 --- a/portal-frontend/src/app/shared/soil-table/soil-table.component.html +++ b/portal-frontend/src/app/shared/soil-table/soil-table.component.html @@ -69,7 +69,7 @@ <input min="0.01" id="area" - mask="separator.2" + mask="separator.5" thousandSeparator="," separatorLimit="9999999999" matInput @@ -88,7 +88,7 @@ <input min="0.01" id="area2" - mask="separator.2" + mask="separator.5" thousandSeparator="," separatorLimit="9999999999" matInput diff --git a/services/apps/alcs/src/alcs/application-decision/application-component-lot/application-decision-component-lot.entity.ts b/services/apps/alcs/src/alcs/application-decision/application-component-lot/application-decision-component-lot.entity.ts index a8b4b7cab3..9d8ba09d7c 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-component-lot/application-decision-component-lot.entity.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-component-lot/application-decision-component-lot.entity.ts @@ -39,7 +39,7 @@ export class ApplicationDecisionComponentLot extends Base { type: 'decimal', nullable: true, precision: 12, - scale: 2, + scale: 5, transformer: new ColumnNumericTransformer(), }) alrArea?: number | null; @@ -49,7 +49,7 @@ export class ApplicationDecisionComponentLot extends Base { type: 'decimal', nullable: true, precision: 12, - scale: 2, + scale: 5, transformer: new ColumnNumericTransformer(), }) size?: number | null; diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.entity.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.entity.ts index e3333bf134..4f418697e5 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.entity.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.entity.ts @@ -34,7 +34,7 @@ export class ApplicationDecisionComponent extends Base { type: 'decimal', nullable: true, precision: 12, - scale: 2, + scale: 5, transformer: new ColumnNumericTransformer(), comment: 'Area in hectares of ALR impacted by the decision component', }) @@ -128,7 +128,7 @@ export class ApplicationDecisionComponent extends Base { type: 'decimal', nullable: true, precision: 12, - scale: 2, + scale: 5, transformer: new ColumnNumericTransformer(), }) soilToPlaceArea: number | null; @@ -172,7 +172,7 @@ export class ApplicationDecisionComponent extends Base { type: 'decimal', nullable: true, precision: 12, - scale: 2, + scale: 5, transformer: new ColumnNumericTransformer(), }) soilToRemoveArea: number | null; diff --git a/services/apps/alcs/src/alcs/application/application.entity.ts b/services/apps/alcs/src/alcs/application/application.entity.ts index 6b2e1a0792..b5e4b09f6a 100644 --- a/services/apps/alcs/src/alcs/application/application.entity.ts +++ b/services/apps/alcs/src/alcs/application/application.entity.ts @@ -163,7 +163,7 @@ export class Application extends Base { type: 'decimal', nullable: true, precision: 12, - scale: 2, + scale: 5, transformer: new ColumnNumericTransformer(), comment: 'Area in hectares of ALR impacted by the proposal', }) diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.entity.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.entity.ts index 1cbbd89056..8f45386add 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.entity.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.entity.ts @@ -151,7 +151,7 @@ export class NoticeOfIntent extends Base { type: 'decimal', nullable: true, precision: 12, - scale: 2, + scale: 5, transformer: new ColumnNumericTransformer(), comment: 'Area in hectares of ALR impacted by the proposal', }) diff --git a/services/apps/alcs/src/portal/application-submission/application-parcel/application-parcel.entity.ts b/services/apps/alcs/src/portal/application-submission/application-parcel/application-parcel.entity.ts index 659d40f7ac..27b65f499b 100644 --- a/services/apps/alcs/src/portal/application-submission/application-parcel/application-parcel.entity.ts +++ b/services/apps/alcs/src/portal/application-submission/application-parcel/application-parcel.entity.ts @@ -150,7 +150,7 @@ export class ApplicationParcel extends Base { type: 'decimal', nullable: true, precision: 12, - scale: 2, + scale: 5, transformer: new ColumnNumericTransformer(), }) alrArea?: number | null; diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts b/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts index ea842e9658..3957da6856 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts @@ -13,10 +13,8 @@ import { ApplicationSubmissionToSubmissionStatus } from '../../alcs/application/ import { Base } from '../../common/entities/base.entity'; import { User } from '../../user/user.entity'; import { ColumnNumericTransformer } from '../../utils/column-numeric-transform'; -import { NotificationTransferee } from '../notification-submission/notification-transferee/notification-transferee.entity'; import { ApplicationOwner } from './application-owner/application-owner.entity'; import { ApplicationParcel } from './application-parcel/application-parcel.entity'; -import { CovenantTransferee } from './covenant-transferee/covenant-transferee.entity'; import { NaruSubtype } from './naru-subtype/naru-subtype.entity'; export class ProposedLot { @@ -211,7 +209,7 @@ export class ApplicationSubmission extends Base { type: 'decimal', nullable: true, precision: 12, - scale: 2, + scale: 5, transformer: new ColumnNumericTransformer(), }) nfuHectares: number | null; @@ -237,7 +235,7 @@ export class ApplicationSubmission extends Base { type: 'decimal', nullable: true, precision: 12, - scale: 2, + scale: 5, transformer: new ColumnNumericTransformer(), }) nfuTotalFillArea: number | null; @@ -312,7 +310,7 @@ export class ApplicationSubmission extends Base { type: 'decimal', nullable: true, precision: 12, - scale: 2, + scale: 5, transformer: new ColumnNumericTransformer(), }) turTotalCorridorArea: number | null; @@ -378,7 +376,7 @@ export class ApplicationSubmission extends Base { type: 'decimal', nullable: true, precision: 12, - scale: 2, + scale: 5, transformer: new ColumnNumericTransformer(), }) soilToRemoveArea: number | null; @@ -418,7 +416,7 @@ export class ApplicationSubmission extends Base { type: 'decimal', nullable: true, precision: 12, - scale: 2, + scale: 5, transformer: new ColumnNumericTransformer(), }) soilAlreadyRemovedArea: number | null; @@ -458,7 +456,7 @@ export class ApplicationSubmission extends Base { type: 'decimal', nullable: true, precision: 12, - scale: 2, + scale: 5, transformer: new ColumnNumericTransformer(), }) soilToPlaceArea: number | null; @@ -498,7 +496,7 @@ export class ApplicationSubmission extends Base { type: 'decimal', nullable: true, precision: 12, - scale: 2, + scale: 5, transformer: new ColumnNumericTransformer(), }) soilAlreadyPlacedArea: number | null; @@ -581,7 +579,7 @@ export class ApplicationSubmission extends Base { type: 'decimal', nullable: true, precision: 12, - scale: 2, + scale: 5, transformer: new ColumnNumericTransformer(), }) naruFloorArea: number | null; @@ -643,7 +641,7 @@ export class ApplicationSubmission extends Base { type: 'decimal', nullable: true, precision: 12, - scale: 2, + scale: 5, transformer: new ColumnNumericTransformer(), }) naruToPlaceArea: number | null; @@ -693,7 +691,7 @@ export class ApplicationSubmission extends Base { type: 'decimal', nullable: true, precision: 12, - scale: 2, + scale: 5, transformer: new ColumnNumericTransformer(), }) inclExclHectares: number | null; diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.entity.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.entity.ts index 147c80a5c1..d144381b70 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.entity.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.entity.ts @@ -140,7 +140,7 @@ export class NoticeOfIntentParcel extends Base { type: 'decimal', nullable: true, precision: 12, - scale: 2, + scale: 5, transformer: new ColumnNumericTransformer(), }) alrArea?: number | null; diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.entity.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.entity.ts index d4e8afe203..2c9cc13a39 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.entity.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.entity.ts @@ -222,7 +222,7 @@ export class NoticeOfIntentSubmission extends Base { type: 'decimal', nullable: true, precision: 12, - scale: 2, + scale: 5, transformer: new ColumnNumericTransformer(), }) soilToRemoveArea: number | null; @@ -262,7 +262,7 @@ export class NoticeOfIntentSubmission extends Base { type: 'decimal', nullable: true, precision: 12, - scale: 2, + scale: 5, transformer: new ColumnNumericTransformer(), }) soilAlreadyRemovedArea: number | null; @@ -302,7 +302,7 @@ export class NoticeOfIntentSubmission extends Base { type: 'decimal', nullable: true, precision: 12, - scale: 2, + scale: 5, transformer: new ColumnNumericTransformer(), }) soilToPlaceArea: number | null; @@ -342,7 +342,7 @@ export class NoticeOfIntentSubmission extends Base { type: 'decimal', nullable: true, precision: 12, - scale: 2, + scale: 5, transformer: new ColumnNumericTransformer(), }) soilAlreadyPlacedArea: number | null; diff --git a/services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.entity.ts b/services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.entity.ts index db3e0522f0..f54304c272 100644 --- a/services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.entity.ts +++ b/services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.entity.ts @@ -1,5 +1,4 @@ import { AutoMap } from '@automapper/classes'; -import { IsOptional, IsString } from 'class-validator'; import { Column, Entity, ManyToOne } from 'typeorm'; import { Base } from '../../../common/entities/base.entity'; import { ParcelOwnershipType } from '../../../common/entities/parcel-ownership-type/parcel-ownership-type.entity'; diff --git a/services/apps/alcs/src/portal/notification-submission/notification-submission.entity.ts b/services/apps/alcs/src/portal/notification-submission/notification-submission.entity.ts index b6c0744c04..243102a00b 100644 --- a/services/apps/alcs/src/portal/notification-submission/notification-submission.entity.ts +++ b/services/apps/alcs/src/portal/notification-submission/notification-submission.entity.ts @@ -72,7 +72,7 @@ export class NotificationSubmission extends Base { type: 'decimal', nullable: true, precision: 12, - scale: 2, + scale: 5, transformer: new ColumnNumericTransformer(), }) totalArea: number | null; diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1699297830036-add_more_precision.ts b/services/apps/alcs/src/providers/typeorm/migrations/1699297830036-add_more_precision.ts new file mode 100644 index 0000000000..0d39e62a22 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1699297830036-add_more_precision.ts @@ -0,0 +1,155 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class addMorePrecision1699297830036 implements MigrationInterface { + name = 'addMorePrecision1699297830036'; + + public async up(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `ALTER TABLE "alcs"."application" ALTER COLUMN "alr_area" TYPE numeric(12,5)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_decision_component_lot" ALTER COLUMN "alr_area" TYPE numeric(12,5)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_decision_component_lot" ALTER COLUMN "size" TYPE numeric(12,5)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_decision_component" ALTER COLUMN "alr_area" TYPE numeric(12,5)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_decision_component" ALTER COLUMN "soil_to_place_area" TYPE numeric(12,5)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_decision_component" ALTER COLUMN "soil_to_remove_area" TYPE numeric(12,5)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent" ALTER COLUMN "alr_area" TYPE numeric(12,5)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_parcel" ALTER COLUMN "alr_area" TYPE numeric(12,5)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" ALTER COLUMN "nfu_hectares" TYPE numeric(12,5)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" ALTER COLUMN "nfu_total_fill_area" TYPE numeric(12,5)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" ALTER COLUMN "tur_total_corridor_area" TYPE numeric(12,5)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" ALTER COLUMN "soil_to_remove_area" TYPE numeric(12,5)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" ALTER COLUMN "soil_already_removed_area" TYPE numeric(12,5)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" ALTER COLUMN "soil_to_place_area" TYPE numeric(12,5)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" ALTER COLUMN "soil_already_placed_area" TYPE numeric(12,5)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" ALTER COLUMN "naru_floor_area" TYPE numeric(12,5)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" ALTER COLUMN "naru_to_place_area" TYPE numeric(12,5)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" ALTER COLUMN "incl_excl_hectares" TYPE numeric(12,5)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_parcel" ALTER COLUMN "alr_area" TYPE numeric(12,5)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" ALTER COLUMN "soil_to_remove_area" TYPE numeric(12,5)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" ALTER COLUMN "soil_already_removed_area" TYPE numeric(12,5)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" ALTER COLUMN "soil_to_place_area" TYPE numeric(12,5)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" ALTER COLUMN "soil_already_placed_area" TYPE numeric(12,5)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notification_submission" ALTER COLUMN "total_area" TYPE numeric(12,5)`, + ); + } + + public async down(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `ALTER TABLE "alcs"."notification_submission" ALTER COLUMN "total_area" TYPE numeric(12,2)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" ALTER COLUMN "soil_already_placed_area" TYPE numeric(12,2)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" ALTER COLUMN "soil_to_place_area" TYPE numeric(12,2)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" ALTER COLUMN "soil_already_removed_area" TYPE numeric(12,2)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" ALTER COLUMN "soil_to_remove_area" TYPE numeric(12,2)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_parcel" ALTER COLUMN "alr_area" TYPE numeric(12,2)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" ALTER COLUMN "incl_excl_hectares" TYPE numeric(12,2)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" ALTER COLUMN "naru_to_place_area" TYPE numeric(12,2)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" ALTER COLUMN "naru_floor_area" TYPE numeric(12,2)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" ALTER COLUMN "soil_already_placed_area" TYPE numeric(12,2)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" ALTER COLUMN "soil_to_place_area" TYPE numeric(12,2)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" ALTER COLUMN "soil_already_removed_area" TYPE numeric(12,2)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" ALTER COLUMN "soil_to_remove_area" TYPE numeric(12,2)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" ALTER COLUMN "tur_total_corridor_area" TYPE numeric(12,2)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" ALTER COLUMN "nfu_total_fill_area" TYPE numeric(12,2)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" ALTER COLUMN "nfu_hectares" TYPE numeric(12,2)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_parcel" ALTER COLUMN "alr_area" TYPE numeric(12,2)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent" ALTER COLUMN "alr_area" TYPE numeric(12,2)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_decision_component" ALTER COLUMN "soil_to_remove_area" TYPE numeric(12,2)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_decision_component" ALTER COLUMN "soil_to_place_area" TYPE numeric(12,2)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_decision_component" ALTER COLUMN "alr_area" TYPE numeric(12,2)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_decision_component_lot" ALTER COLUMN "size" TYPE numeric(12,2)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_decision_component_lot" ALTER COLUMN "alr_area" TYPE numeric(12,2)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application" ALTER COLUMN "alr_area" TYPE numeric(12,2)`, + ); + } +} From 9380e8f2e888148ec41dfb8b33c39c39a6f1fbd3 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Thu, 2 Nov 2023 10:59:16 -0700 Subject: [PATCH 603/954] Upgrade Backend Packages * Ugrade NestJS and other packages * Fix Typeorm CLI * Remove Multitenant as it causes issues and we don't need it * Move from @automapper to automapper, the newly maintained fork --- .github/workflows/ci.yml | 8 +- .github/workflows/coverage.yml | 16 +- alcs-frontend/angular.json | 46 +- alcs-frontend/jest.config.js | 2 +- portal-frontend/angular.json | 31 +- portal-frontend/jest.config.js | 4 +- .../application-ceo-criterion.service.spec.ts | 4 +- ...application-decision-maker.service.spec.ts | 4 +- ...application-decision-maker.service.spec.ts | 4 +- .../admin/holiday/holiday.service.spec.ts | 4 +- .../noi-subtype/noi-subtype.service.spec.ts | 4 +- .../unarchive-card.service.spec.ts | 4 +- .../application-ceo-criterion.entity.ts | 2 +- ...-decision-component-lot.controller.spec.ts | 4 +- ...ation-decision-component-lot.controller.ts | 4 +- ...plication-decision-component-lot.entity.ts | 2 +- ...dition-to-component-lot.controller.spec.ts | 4 +- ...n-condition-to-component-lot.controller.ts | 4 +- ...ision-condition-to-component-lot.entity.ts | 2 +- ...mponent-to-condition-plan-number.entity.ts | 2 +- ...tion-decision-condition.controller.spec.ts | 4 +- ...plication-decision-condition.controller.ts | 4 +- .../application-decision-condition.dto.ts | 2 +- .../application-decision-condition.entity.ts | 2 +- .../application-decision-document.entity.ts | 2 +- .../decision-maker.dto.ts | 2 +- ...cation-decision-meeting.controller.spec.ts | 4 +- ...application-decision-meeting.controller.ts | 19 +- .../application-decision-meeting.dto.ts | 2 +- .../application-decision-meeting.entity.ts | 2 +- ...application-decision-v1.controller.spec.ts | 4 +- .../application-decision-v1.controller.ts | 14 +- .../application-decision-v1.service.spec.ts | 4 +- .../application-decision.dto.ts | 2 +- .../ceo-criterion/ceo-criterion.dto.ts | 2 +- ...application-decision-v2.controller.spec.ts | 4 +- .../application-decision-v2.controller.ts | 14 +- .../application-decision-v2.service.spec.ts | 4 +- .../application-decision.dto.ts | 2 +- .../ceo-criterion/ceo-criterion.dto.ts | 2 +- ...tion-decision-component.controller.spec.ts | 4 +- ...plication-decision-component.controller.ts | 4 +- .../application-decision-component.dto.ts | 2 +- .../application-decision-component.entity.ts | 2 +- .../application-decision.entity.ts | 2 +- ...pplication-modification.controller.spec.ts | 4 +- .../application-modification.dto.ts | 2 +- .../application-modification.entity.ts | 2 +- .../application-modification.service.spec.ts | 4 +- .../application-modification.service.ts | 9 +- ...ication-reconsideration.controller.spec.ts | 4 +- .../application-reconsideration.dto.ts | 2 +- .../application-reconsideration.entity.ts | 2 +- ...pplication-reconsideration.service.spec.ts | 4 +- .../application-reconsideration.service.ts | 4 +- .../application-document.controller.spec.ts | 4 +- .../application-document.controller.ts | 4 +- .../application-document.dto.ts | 2 +- .../application-document.entity.ts | 2 +- .../application-meeting.controller.spec.ts | 4 +- .../application-meeting.controller.ts | 9 +- .../application-meeting.dto.ts | 2 +- .../application-meeting.entity.ts | 2 +- .../application-parcel.controller.spec.ts | 4 +- .../application-parcel.controller.ts | 4 +- ...lication-submission-review.service.spec.ts | 4 +- .../application-submission-review.service.ts | 4 +- ...ation-submission-status.controller.spec.ts | 9 +- ...pplication-submission-status.controller.ts | 4 +- .../submission-status-type.entity.ts | 2 +- .../submission-status.dto.ts | 2 +- .../submission-status.entity.ts | 2 +- .../application-submission.controller.spec.ts | 4 +- .../application-submission.controller.ts | 4 +- .../application-submission.service.spec.ts | 4 +- .../application-submission.service.ts | 4 +- .../application.controller.spec.ts | 4 +- .../src/alcs/application/application.dto.ts | 2 +- .../alcs/application/application.entity.ts | 2 +- .../application/application.service.spec.ts | 4 +- .../alcs/application/application.service.ts | 4 +- .../src/alcs/board/board-status.entity.ts | 2 +- .../src/alcs/board/board.controller.spec.ts | 4 +- .../alcs/src/alcs/board/board.controller.ts | 19 +- .../apps/alcs/src/alcs/board/board.dto.ts | 2 +- .../apps/alcs/src/alcs/board/board.entity.ts | 2 +- .../card-status/card-status.service.spec.ts | 4 +- .../card-subtask-type.entity.ts | 2 +- .../card-subtask.controller.spec.ts | 4 +- .../card-subtask/card-subtask.controller.ts | 4 +- .../card/card-subtask/card-subtask.dto.ts | 2 +- .../alcs/card/card-type/card-type.entity.ts | 2 +- services/apps/alcs/src/alcs/card/card.dto.ts | 2 +- .../apps/alcs/src/alcs/card/card.entity.ts | 2 +- .../alcs/src/alcs/card/card.service.spec.ts | 4 +- .../apps/alcs/src/alcs/card/card.service.ts | 4 +- .../application-type/application-type.dto.ts | 2 +- .../application-type.entity.ts | 2 +- .../src/alcs/code/code.controller.spec.ts | 4 +- .../alcs/src/alcs/code/code.controller.ts | 4 +- .../alcs/comment/comment.controller.spec.ts | 4 +- .../src/alcs/comment/comment.controller.ts | 4 +- .../apps/alcs/src/alcs/comment/comment.dto.ts | 2 +- .../alcs/src/alcs/comment/comment.entity.ts | 2 +- .../comment/mention/comment-mention.dto.ts | 2 +- .../comment/mention/comment-mention.entity.ts | 2 +- .../commissioner.controller.spec.ts | 4 +- .../commissioner/commissioner.controller.ts | 4 +- .../src/alcs/commissioner/commissioner.dto.ts | 2 +- .../alcs/src/alcs/covenant/covenant.dto.ts | 2 +- .../alcs/covenant/covenant.service.spec.ts | 4 +- .../src/alcs/covenant/covenant.service.ts | 4 +- .../src/alcs/home/home.controller.spec.ts | 4 +- .../alcs/src/alcs/home/home.controller.ts | 54 +- .../local-government.controller.spec.ts | 4 +- .../local-government.entity.ts | 2 +- .../alcs/message/message.controller.spec.ts | 4 +- .../src/alcs/message/message.controller.ts | 4 +- .../alcs/src/alcs/message/message.entity.ts | 2 +- ...tent-decision-component.controller.spec.ts | 4 +- ...of-intent-decision-component.controller.ts | 4 +- ...notice-of-intent-decision-component.dto.ts | 2 +- ...ice-of-intent-decision-component.entity.ts | 2 +- ...tent-decision-condition.controller.spec.ts | 4 +- ...of-intent-decision-condition.controller.ts | 4 +- ...notice-of-intent-decision-condition.dto.ts | 2 +- ...ice-of-intent-decision-condition.entity.ts | 2 +- ...tice-of-intent-decision-document.entity.ts | 2 +- ...e-of-intent-decision-v1.controller.spec.ts | 4 +- ...notice-of-intent-decision-v1.controller.ts | 14 +- ...tice-of-intent-decision-v1.service.spec.ts | 4 +- ...e-of-intent-decision-v2.controller.spec.ts | 4 +- ...notice-of-intent-decision-v2.controller.ts | 4 +- ...tice-of-intent-decision-v2.service.spec.ts | 4 +- .../notice-of-intent-decision.dto.ts | 2 +- .../notice-of-intent-decision.entity.ts | 2 +- ...-of-intent-modification.controller.spec.ts | 4 +- .../notice-of-intent-modification.entity.ts | 2 +- ...ice-of-intent-modification.service.spec.ts | 4 +- .../notice-of-intent-modification.service.ts | 9 +- ...tice-of-intent-document.controller.spec.ts | 4 +- .../notice-of-intent-document.controller.ts | 9 +- .../notice-of-intent-document.dto.ts | 2 +- .../notice-of-intent-document.entity.ts | 2 +- ...otice-of-intent-meeting.controller.spec.ts | 4 +- .../notice-of-intent-meeting.controller.ts | 4 +- .../notice-of-intent-meeting.dto.ts | 2 +- .../notice-of-intent-meeting.entity.ts | 2 +- ...notice-of-intent-parcel.controller.spec.ts | 4 +- .../notice-of-intent-parcel.controller.ts | 9 +- .../notice-of-intent-status-type.entity.ts | 2 +- .../notice-of-intent-status.dto.ts | 2 +- .../notice-of-intent-status.entity.ts | 2 +- ...ntent-submission-status.controller.spec.ts | 9 +- ...-of-intent-submission-status.controller.ts | 4 +- ...otice-of-intent-submission.service.spec.ts | 4 +- .../notice-of-intent-submission.service.ts | 4 +- .../notice-of-intent-type.dto.ts | 2 +- .../notice-of-intent-type.entity.ts | 2 +- .../notice-of-intent.controller.spec.ts | 4 +- .../notice-of-intent.controller.ts | 14 +- .../notice-of-intent/notice-of-intent.dto.ts | 2 +- .../notice-of-intent.entity.ts | 2 +- .../notice-of-intent.service.spec.ts | 4 +- .../notice-of-intent.service.ts | 4 +- .../notification-document.controller.spec.ts | 4 +- .../notification-document.controller.ts | 4 +- .../notification-document.dto.ts | 2 +- .../notification-document.entity.ts | 2 +- .../notification-parcel.controller.spec.ts | 4 +- .../notification-parcel.controller.ts | 9 +- .../notification-status-type.entity.ts | 2 +- .../notification-status.dto.ts | 2 +- .../notification-status.entity.ts | 2 +- ...ation-submission-status.controller.spec.ts | 9 +- ...tification-submission-status.controller.ts | 4 +- .../notification-type.dto.ts | 2 +- .../notification-type.entity.ts | 2 +- .../notification.controller.spec.ts | 4 +- .../notification/notification.controller.ts | 14 +- .../src/alcs/notification/notification.dto.ts | 2 +- .../alcs/notification/notification.entity.ts | 2 +- .../notification/notification.service.spec.ts | 4 +- .../alcs/notification/notification.service.ts | 4 +- .../alcs-application.controller.spec.ts | 4 +- .../planning-review/planning-review.dto.ts | 2 +- .../planning-review.service.spec.ts | 4 +- .../planning-review.service.ts | 4 +- .../src/alcs/search/search.controller.spec.ts | 9 +- .../alcs/src/alcs/search/search.controller.ts | 21 +- .../staff-journal.controller.spec.ts | 4 +- .../staff-journal/staff-journal.controller.ts | 4 +- .../alcs/staff-journal/staff-journal.dto.ts | 2 +- .../staff-journal/staff-journal.entity.ts | 2 +- .../portal-auth-guard.service.ts | 11 +- .../authorization/roles-guard.service.ts | 9 +- ...lication-decision-v1.automapper.profile.ts | 4 +- ...lication-decision-v2.automapper.profile.ts | 4 +- .../application-owner.automapper.profile.ts | 4 +- .../application-parcel.automapper.profile.ts | 4 +- ...on-submission-review.automapper.profile.ts | 4 +- ...plication-submission.automapper.profile.ts | 4 +- .../application-subtask.automapper.profile.ts | 4 +- .../application.automapper.profile.ts | 4 +- .../automapper/board.automapper.profile.ts | 4 +- .../automapper/card.automapper.profile.ts | 4 +- .../automapper/comment.automapper.profile.ts | 4 +- .../commissioner.automapper.profile.ts | 4 +- .../automapper/covenant.automapper.profile.ts | 4 +- .../automapper/message.automapper.profile.ts | 4 +- .../modification.automapper.profile.ts | 4 +- ...e-of-intent-decision.automapper.profile.ts | 4 +- ...tice-of-intent-owner.automapper.profile.ts | 4 +- ...ice-of-intent-parcel.automapper.profile.ts | 4 +- ...of-intent-submission.automapper.profile.ts | 4 +- .../notice-of-intent.automapper.profile.ts | 4 +- .../notification-parcel.automapper.profile.ts | 4 +- ...ification-submission.automapper.profile.ts | 4 +- ...ification-transferee.automapper.profile.ts | 4 +- .../notification.automapper.profile.ts | 4 +- .../planning-meeting.automapper.profile.ts | 4 +- .../automapper/public.automapper.profile.ts | 4 +- .../reconsideration.automapper.profile.ts | 4 +- .../automapper/user.automapper.profile.ts | 4 +- .../apps/alcs/src/common/dtos/base.dto.ts | 2 +- .../src/common/entities/base.code.entity.ts | 2 +- .../alcs/src/common/entities/base.entity.ts | 2 +- .../alcs/src/document/document-code.entity.ts | 2 +- .../apps/alcs/src/document/document.dto.ts | 2 +- services/apps/alcs/src/main.module.ts | 6 +- .../application-document.controller.spec.ts | 4 +- .../application-document.controller.ts | 9 +- .../application-submission-review.dto.ts | 2 +- .../application-submission-review.entity.ts | 2 +- ...lication-submission-review.service.spec.ts | 4 +- .../application-submission-review.service.ts | 4 +- .../application-owner.controller.spec.ts | 4 +- .../application-owner.controller.ts | 4 +- .../application-owner.dto.ts | 2 +- .../application-owner.entity.ts | 2 +- .../application-parcel.controller.spec.ts | 4 +- .../application-parcel.controller.ts | 9 +- .../application-parcel.dto.ts | 2 +- .../application-parcel.entity.ts | 2 +- .../application-submission.controller.spec.ts | 4 +- .../application-submission.dto.ts | 2 +- .../application-submission.entity.ts | 2 +- .../application-submission.service.spec.ts | 4 +- .../application-submission.service.ts | 4 +- .../covenant-transferee.controller.spec.ts | 4 +- .../covenant-transferee.controller.ts | 4 +- .../covenant-transferee.dto.ts | 2 +- .../covenant-transferee.entity.ts | 2 +- .../src/portal/code/code.controller.spec.ts | 4 +- .../alcs/src/portal/code/code.controller.ts | 9 +- .../src/portal/inbox/inbox.controller.spec.ts | 4 +- .../alcs/src/portal/inbox/inbox.controller.ts | 4 +- ...tice-of-intent-document.controller.spec.ts | 4 +- .../notice-of-intent-document.controller.ts | 14 +- .../notice-of-intent-owner.controller.spec.ts | 4 +- .../notice-of-intent-owner.controller.ts | 4 +- .../notice-of-intent-owner.dto.ts | 2 +- .../notice-of-intent-owner.entity.ts | 2 +- ...notice-of-intent-parcel.controller.spec.ts | 4 +- .../notice-of-intent-parcel.controller.ts | 9 +- .../notice-of-intent-parcel.dto.ts | 2 +- .../notice-of-intent-parcel.entity.ts | 2 +- ...ce-of-intent-submission.controller.spec.ts | 4 +- .../notice-of-intent-submission.dto.ts | 2 +- .../notice-of-intent-submission.entity.ts | 2 +- ...otice-of-intent-submission.service.spec.ts | 4 +- .../notice-of-intent-submission.service.ts | 9 +- .../notification-document.controller.spec.ts | 4 +- .../notification-document.controller.ts | 9 +- .../notification-document.dto.ts | 2 +- .../notification-parcel.controller.spec.ts | 4 +- .../notification-parcel.controller.ts | 9 +- .../notification-parcel.dto.ts | 2 +- .../notification-parcel.entity.ts | 2 +- ...notification-submission.controller.spec.ts | 4 +- .../notification-submission.dto.ts | 2 +- .../notification-submission.entity.ts | 2 +- .../notification-submission.service.spec.ts | 4 +- .../notification-submission.service.ts | 9 +- ...notification-transferee.controller.spec.ts | 4 +- .../notification-transferee.controller.ts | 4 +- .../notification-transferee.dto.ts | 2 +- .../notification-transferee.entity.ts | 2 +- .../generate-review-document.service.spec.ts | 4 +- .../generate-review-document.service.ts | 4 +- .../application-decision.controller.spec.ts | 4 +- .../application-decision.controller.ts | 4 +- .../application/application-decision.dto.ts | 2 +- .../application/public-application.dto.ts | 2 +- .../public-application.service.spec.ts | 4 +- .../application/public-application.service.ts | 9 +- ...tice-of-intent-decision.controller.spec.ts | 4 +- .../notice-of-intent-decision.controller.ts | 4 +- .../notice-of-intent-decision.dto.ts | 2 +- .../public-notice-of-intent.dto.ts | 2 +- .../public-notice-of-intent.service.spec.ts | 4 +- .../public-notice-of-intent.service.ts | 24 +- .../notification/public-notification.dto.ts | 2 +- .../public-notification.service.spec.ts | 4 +- .../public-notification.service.ts | 14 +- .../apps/alcs/src/portal/public/public.dto.ts | 2 +- .../search/public-search.controller.spec.ts | 4 +- .../public/search/public-search.controller.ts | 14 +- .../status/public-status.controller.spec.ts | 4 +- .../public/status/public-status.controller.ts | 4 +- .../providers/email/email-status.entity.ts | 2 +- .../alcs/src/user/user.controller.spec.ts | 4 +- .../apps/alcs/src/user/user.controller.ts | 4 +- services/apps/alcs/src/user/user.dto.ts | 2 +- services/apps/alcs/src/user/user.entity.ts | 2 +- .../apps/alcs/src/user/user.service.spec.ts | 4 +- services/apps/alcs/src/user/user.service.ts | 4 +- services/nest-cli.json | 2 +- services/package-lock.json | 21166 +++++----------- services/package.json | 120 +- 320 files changed, 6679 insertions(+), 16034 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 46d0e0fd4c..eea562ddb8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,7 +20,7 @@ jobs: - uses: actions/setup-node@master with: node-version: ${{ matrix.node }} - - run: npm ci --legacy-peer-deps + - run: npm ci - run: npm run build - run: npm run test:ci test-portal-frontend: @@ -29,8 +29,8 @@ jobs: working-directory: portal-frontend strategy: matrix: - platform: [ ubuntu-latest ] - node: [ "18" ] + platform: [ubuntu-latest] + node: ["18"] name: Portal Frontend Tests - ${{ matrix.node }}/${{ matrix.platform }} runs-on: ${{ matrix.platform }} steps: @@ -48,7 +48,7 @@ jobs: strategy: matrix: platform: [ubuntu-latest] - node: ["18"] + node: ["20"] name: API Tests - ${{ matrix.node }}/${{ matrix.platform }} runs-on: ${{ matrix.platform }} steps: diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 2e19c7f900..4e09b9468f 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -11,7 +11,7 @@ jobs: strategy: matrix: platform: [ubuntu-latest] - node: ["18"] + node: ["20"] name: Coverage Report ALCS Frontend - ${{ matrix.node }}/${{ matrix.platform }} runs-on: ${{ matrix.platform }} steps: @@ -19,10 +19,10 @@ jobs: - uses: actions/setup-node@master with: node-version: ${{ matrix.node }} - - run: npm install --legacy-peer-deps + - run: npm install - run: npm run build - run: npm run test:cov - - if: matrix.node == '18' + - if: matrix.node == '20' uses: actions/upload-artifact@v3 with: name: coverage-alcs-frontend @@ -35,8 +35,8 @@ jobs: working-directory: portal-frontend strategy: matrix: - platform: [ ubuntu-latest ] - node: [ "18" ] + platform: [ubuntu-latest] + node: ["20"] name: Coverage Report Portal Frontend - ${{ matrix.node }}/${{ matrix.platform }} runs-on: ${{ matrix.platform }} steps: @@ -47,7 +47,7 @@ jobs: - run: npm install - run: npm run build - run: npm run test:cov - - if: matrix.node == '18' + - if: matrix.node == '20' uses: actions/upload-artifact@v3 with: name: coverage-portal-frontend @@ -61,7 +61,7 @@ jobs: strategy: matrix: platform: [ubuntu-latest] - node: ["18"] + node: ["20"] name: Coverage Report API - ${{ matrix.node }}/${{ matrix.platform }} runs-on: ${{ matrix.platform }} steps: @@ -72,7 +72,7 @@ jobs: - run: npm install - run: npm run build - run: npm run test:cov - - if: matrix.node == '18' + - if: matrix.node == '20' uses: actions/upload-artifact@v3 with: name: coverage-api diff --git a/alcs-frontend/angular.json b/alcs-frontend/angular.json index 7990efe86a..d215aa81e1 100644 --- a/alcs-frontend/angular.json +++ b/alcs-frontend/angular.json @@ -23,19 +23,10 @@ "polyfills": "src/polyfills.ts", "tsConfig": "tsconfig.app.json", "inlineStyleLanguage": "scss", - "assets": [ - "src/favicon.ico", - "src/assets", - "src/maintenance.html" - ], - "styles": [ - "./node_modules/@angular/material/prebuilt-themes/indigo-pink.css", - "src/styles.scss" - ], + "assets": ["src/favicon.ico", "src/assets", "src/maintenance.html"], + "styles": ["./node_modules/@angular/material/prebuilt-themes/indigo-pink.css", "src/styles.scss"], "stylePreprocessorOptions": { - "includePaths": [ - "node_modules" - ] + "includePaths": ["node_modules"] }, "scripts": [] }, @@ -99,31 +90,20 @@ "test": { "builder": "@angular-builders/jest:run", "options": { - "polyfills": [ - "src/polyfills.ts" - ], + "polyfills": ["src/polyfills.ts"], "tsConfig": "tsconfig.spec.json", - "inlineStyleLanguage": [ - "scss" - ], - "assets": [ - "src/favicon.ico", - "src/assets" - ], - "styles": [ - "./node_modules/@angular/material/prebuilt-themes/indigo-pink.css", - "src/styles.scss" - ], - "scripts": [] + "inlineStyleLanguage": ["scss"], + "assets": ["src/favicon.ico", "src/assets"], + "styles": ["./node_modules/@angular/material/prebuilt-themes/indigo-pink.css", "src/styles.scss"], + "scripts": [], + "detectOpenHandles": true, + "forceExit": true } }, "lint": { "builder": "@angular-eslint/builder:lint", "options": { - "lintFilePatterns": [ - "src/**/*.ts", - "src/**/*.html" - ] + "lintFilePatterns": ["src/**/*.ts", "src/**/*.html"] } } } @@ -131,8 +111,6 @@ }, "cli": { "analytics": "d29c8019-b84b-4fdc-9690-1ee8ea441897", - "schematicCollections": [ - "@angular-eslint/schematics" - ] + "schematicCollections": ["@angular-eslint/schematics"] } } diff --git a/alcs-frontend/jest.config.js b/alcs-frontend/jest.config.js index 33e9bbf9b3..042509cac6 100644 --- a/alcs-frontend/jest.config.js +++ b/alcs-frontend/jest.config.js @@ -1,7 +1,7 @@ module.exports = { preset: 'jest-preset-angular', moduleDirectories: ['node_modules', 'src'], - globalSetup: 'jest-preset-angular/global-setup', + reporters: [['github-actions', { silent: false }], 'summary'], coverageReporters: [ [ 'lcov', diff --git a/portal-frontend/angular.json b/portal-frontend/angular.json index d116b91829..f3564cd961 100644 --- a/portal-frontend/angular.json +++ b/portal-frontend/angular.json @@ -23,17 +23,10 @@ "polyfills": "src/polyfills.ts", "tsConfig": "tsconfig.app.json", "inlineStyleLanguage": "scss", - "assets": [ - "src/favicon.ico", - "src/assets" - ], - "styles": [ - "src/styles.scss" - ], + "assets": ["src/favicon.ico", "src/assets"], + "styles": ["src/styles.scss"], "stylePreprocessorOptions": { - "includePaths": [ - "node_modules" - ] + "includePaths": ["node_modules"] }, "scripts": [] }, @@ -99,23 +92,17 @@ "polyfills": ["src/polyfills.ts"], "tsConfig": "tsconfig.spec.json", "inlineStyleLanguage": ["scss"], - "assets": [ - "src/favicon.ico", - "src/assets" - ], - "styles": [ - "src/styles.scss" - ], - "scripts": [] + "assets": ["src/favicon.ico", "src/assets"], + "styles": ["src/styles.scss"], + "scripts": [], + "detectOpenHandles": true, + "forceExit": true } }, "lint": { "builder": "@angular-eslint/builder:lint", "options": { - "lintFilePatterns": [ - "src/**/*.ts", - "src/**/*.html" - ] + "lintFilePatterns": ["src/**/*.ts", "src/**/*.html"] } } } diff --git a/portal-frontend/jest.config.js b/portal-frontend/jest.config.js index 75d37948e7..4ac1a43fd1 100644 --- a/portal-frontend/jest.config.js +++ b/portal-frontend/jest.config.js @@ -1,8 +1,8 @@ module.exports = { preset: 'jest-preset-angular', moduleDirectories: ['node_modules', 'src'], - modulePathIgnorePatterns:['/test'], - globalSetup: 'jest-preset-angular/global-setup', + reporters: [['github-actions', { silent: false }], 'summary'], + modulePathIgnorePatterns: ['/test'], coverageReporters: [ [ 'lcov', diff --git a/services/apps/alcs/src/alcs/admin/application-ceo-criterion/application-ceo-criterion.service.spec.ts b/services/apps/alcs/src/alcs/admin/application-ceo-criterion/application-ceo-criterion.service.spec.ts index 200b250a45..c7b270587c 100644 --- a/services/apps/alcs/src/alcs/admin/application-ceo-criterion/application-ceo-criterion.service.spec.ts +++ b/services/apps/alcs/src/alcs/admin/application-ceo-criterion/application-ceo-criterion.service.spec.ts @@ -1,5 +1,5 @@ -import { classes } from '@automapper/classes'; -import { AutomapperModule } from '@automapper/nestjs'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; diff --git a/services/apps/alcs/src/alcs/admin/application-decision-condition-types/application-decision-maker.service.spec.ts b/services/apps/alcs/src/alcs/admin/application-decision-condition-types/application-decision-maker.service.spec.ts index ac68baa379..9b64984217 100644 --- a/services/apps/alcs/src/alcs/admin/application-decision-condition-types/application-decision-maker.service.spec.ts +++ b/services/apps/alcs/src/alcs/admin/application-decision-condition-types/application-decision-maker.service.spec.ts @@ -1,5 +1,5 @@ -import { classes } from '@automapper/classes'; -import { AutomapperModule } from '@automapper/nestjs'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; diff --git a/services/apps/alcs/src/alcs/admin/application-decision-maker/application-decision-maker.service.spec.ts b/services/apps/alcs/src/alcs/admin/application-decision-maker/application-decision-maker.service.spec.ts index ccf24a2d25..6f6886adf4 100644 --- a/services/apps/alcs/src/alcs/admin/application-decision-maker/application-decision-maker.service.spec.ts +++ b/services/apps/alcs/src/alcs/admin/application-decision-maker/application-decision-maker.service.spec.ts @@ -1,5 +1,5 @@ -import { classes } from '@automapper/classes'; -import { AutomapperModule } from '@automapper/nestjs'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; diff --git a/services/apps/alcs/src/alcs/admin/holiday/holiday.service.spec.ts b/services/apps/alcs/src/alcs/admin/holiday/holiday.service.spec.ts index 68d2dbcb92..ae4072be31 100644 --- a/services/apps/alcs/src/alcs/admin/holiday/holiday.service.spec.ts +++ b/services/apps/alcs/src/alcs/admin/holiday/holiday.service.spec.ts @@ -1,5 +1,5 @@ -import { classes } from '@automapper/classes'; -import { AutomapperModule } from '@automapper/nestjs'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; diff --git a/services/apps/alcs/src/alcs/admin/noi-subtype/noi-subtype.service.spec.ts b/services/apps/alcs/src/alcs/admin/noi-subtype/noi-subtype.service.spec.ts index f3d0f10653..92f058b401 100644 --- a/services/apps/alcs/src/alcs/admin/noi-subtype/noi-subtype.service.spec.ts +++ b/services/apps/alcs/src/alcs/admin/noi-subtype/noi-subtype.service.spec.ts @@ -1,5 +1,5 @@ -import { classes } from '@automapper/classes'; -import { AutomapperModule } from '@automapper/nestjs'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; diff --git a/services/apps/alcs/src/alcs/admin/unarchive-card/unarchive-card.service.spec.ts b/services/apps/alcs/src/alcs/admin/unarchive-card/unarchive-card.service.spec.ts index 8f786c06ef..c274ff5526 100644 --- a/services/apps/alcs/src/alcs/admin/unarchive-card/unarchive-card.service.spec.ts +++ b/services/apps/alcs/src/alcs/admin/unarchive-card/unarchive-card.service.spec.ts @@ -1,5 +1,5 @@ -import { classes } from '@automapper/classes'; -import { AutomapperModule } from '@automapper/nestjs'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { ApplicationService } from '../../application/application.service'; diff --git a/services/apps/alcs/src/alcs/application-decision/application-ceo-criterion/application-ceo-criterion.entity.ts b/services/apps/alcs/src/alcs/application-decision/application-ceo-criterion/application-ceo-criterion.entity.ts index a0e092df92..4f8c246223 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-ceo-criterion/application-ceo-criterion.entity.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-ceo-criterion/application-ceo-criterion.entity.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { Column, Entity } from 'typeorm'; import { BaseCodeEntity } from '../../../common/entities/base.code.entity'; diff --git a/services/apps/alcs/src/alcs/application-decision/application-component-lot/application-decision-component-lot.controller.spec.ts b/services/apps/alcs/src/alcs/application-decision/application-component-lot/application-decision-component-lot.controller.spec.ts index d5b3509c72..a17da556b9 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-component-lot/application-decision-component-lot.controller.spec.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-component-lot/application-decision-component-lot.controller.spec.ts @@ -1,5 +1,5 @@ -import { classes } from '@automapper/classes'; -import { AutomapperModule } from '@automapper/nestjs'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { ClsService } from 'nestjs-cls'; diff --git a/services/apps/alcs/src/alcs/application-decision/application-component-lot/application-decision-component-lot.controller.ts b/services/apps/alcs/src/alcs/application-decision/application-component-lot/application-decision-component-lot.controller.ts index 673f5e7582..9b683ab0f6 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-component-lot/application-decision-component-lot.controller.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-component-lot/application-decision-component-lot.controller.ts @@ -1,5 +1,5 @@ -import { Mapper } from '@automapper/core'; -import { InjectMapper } from '@automapper/nestjs'; +import { Mapper } from 'automapper-core'; +import { InjectMapper } from 'automapper-nestjs'; import { Body, Controller, Param, Patch } from '@nestjs/common'; import { ANY_AUTH_ROLE } from '../../../common/authorization/roles'; import { UserRoles } from '../../../common/authorization/roles.decorator'; diff --git a/services/apps/alcs/src/alcs/application-decision/application-component-lot/application-decision-component-lot.entity.ts b/services/apps/alcs/src/alcs/application-decision/application-component-lot/application-decision-component-lot.entity.ts index 9d8ba09d7c..caab7f42b3 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-component-lot/application-decision-component-lot.entity.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-component-lot/application-decision-component-lot.entity.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { Type } from 'class-transformer'; import { Column, Entity, ManyToMany, ManyToOne } from 'typeorm'; import { Base } from '../../../common/entities/base.entity'; diff --git a/services/apps/alcs/src/alcs/application-decision/application-condition-to-component-lot/application-condition-to-component-lot.controller.spec.ts b/services/apps/alcs/src/alcs/application-decision/application-condition-to-component-lot/application-condition-to-component-lot.controller.spec.ts index 464275aca8..50f320aa46 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-condition-to-component-lot/application-condition-to-component-lot.controller.spec.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-condition-to-component-lot/application-condition-to-component-lot.controller.spec.ts @@ -1,5 +1,5 @@ -import { classes } from '@automapper/classes'; -import { AutomapperModule } from '@automapper/nestjs'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { ClsService } from 'nestjs-cls'; diff --git a/services/apps/alcs/src/alcs/application-decision/application-condition-to-component-lot/application-condition-to-component-lot.controller.ts b/services/apps/alcs/src/alcs/application-decision/application-condition-to-component-lot/application-condition-to-component-lot.controller.ts index b945567a54..9794dcdf79 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-condition-to-component-lot/application-condition-to-component-lot.controller.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-condition-to-component-lot/application-condition-to-component-lot.controller.ts @@ -1,5 +1,5 @@ -import { Mapper } from '@automapper/core'; -import { InjectMapper } from '@automapper/nestjs'; +import { Mapper } from 'automapper-core'; +import { InjectMapper } from 'automapper-nestjs'; import { Body, Controller, Get, Param, Patch } from '@nestjs/common'; import { ANY_AUTH_ROLE } from '../../../common/authorization/roles'; import { UserRoles } from '../../../common/authorization/roles.decorator'; diff --git a/services/apps/alcs/src/alcs/application-decision/application-condition-to-component-lot/application-decision-condition-to-component-lot.entity.ts b/services/apps/alcs/src/alcs/application-decision/application-condition-to-component-lot/application-decision-condition-to-component-lot.entity.ts index 9c034b8a71..efa362131f 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-condition-to-component-lot/application-decision-condition-to-component-lot.entity.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-condition-to-component-lot/application-decision-condition-to-component-lot.entity.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { Column, Entity, ManyToOne } from 'typeorm'; import { Base } from '../../../common/entities/base.entity'; import { ApplicationDecisionComponentLot } from '../application-component-lot/application-decision-component-lot.entity'; diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-component-to-condition/application-decision-component-to-condition-plan-number.entity.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-component-to-condition/application-decision-component-to-condition-plan-number.entity.ts index 9bf4b6b3b3..7eeb6416ce 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-component-to-condition/application-decision-component-to-condition-plan-number.entity.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-component-to-condition/application-decision-component-to-condition-plan-number.entity.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { BaseEntity, Column, diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-condition/application-decision-condition.controller.spec.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-condition/application-decision-condition.controller.spec.ts index 2f56b6f470..99ea11ac4d 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-condition/application-decision-condition.controller.spec.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-condition/application-decision-condition.controller.spec.ts @@ -1,5 +1,5 @@ -import { classes } from '@automapper/classes'; -import { AutomapperModule } from '@automapper/nestjs'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { ClsService } from 'nestjs-cls'; diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-condition/application-decision-condition.controller.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-condition/application-decision-condition.controller.ts index d21d03ac91..46fd93014c 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-condition/application-decision-condition.controller.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-condition/application-decision-condition.controller.ts @@ -1,5 +1,5 @@ -import { Mapper } from '@automapper/core'; -import { InjectMapper } from '@automapper/nestjs'; +import { Mapper } from 'automapper-core'; +import { InjectMapper } from 'automapper-nestjs'; import { Body, Controller, Get, Param, Patch, UseGuards } from '@nestjs/common'; import { ApiOAuth2 } from '@nestjs/swagger'; import * as config from 'config'; diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-condition/application-decision-condition.dto.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-condition/application-decision-condition.dto.ts index 2314b9dffe..b51e0c8923 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-condition/application-decision-condition.dto.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-condition/application-decision-condition.dto.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { IsArray, IsBoolean, diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-condition/application-decision-condition.entity.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-condition/application-decision-condition.entity.ts index f9fe054b38..ed50de5884 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-condition/application-decision-condition.entity.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-condition/application-decision-condition.entity.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { Column, Entity, diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-document/application-decision-document.entity.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-document/application-decision-document.entity.ts index ab10dadb95..6737266c6e 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-document/application-decision-document.entity.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-document/application-decision-document.entity.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { Column, Entity, diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-maker/decision-maker.dto.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-maker/decision-maker.dto.ts index f60c4559e9..d7b426bd5f 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-maker/decision-maker.dto.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-maker/decision-maker.dto.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { IsBoolean } from 'class-validator'; import { Entity } from 'typeorm'; import { BaseCodeDto } from '../../../common/dtos/base.dto'; diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v1/application-decision-meeting/application-decision-meeting.controller.spec.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v1/application-decision-meeting/application-decision-meeting.controller.spec.ts index 6706ecfb85..07737eba43 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v1/application-decision-meeting/application-decision-meeting.controller.spec.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v1/application-decision-meeting/application-decision-meeting.controller.spec.ts @@ -1,5 +1,5 @@ -import { classes } from '@automapper/classes'; -import { AutomapperModule } from '@automapper/nestjs'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { ClsService } from 'nestjs-cls'; diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v1/application-decision-meeting/application-decision-meeting.controller.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v1/application-decision-meeting/application-decision-meeting.controller.ts index c2c46359d1..715bef31d4 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v1/application-decision-meeting/application-decision-meeting.controller.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v1/application-decision-meeting/application-decision-meeting.controller.ts @@ -1,5 +1,5 @@ -import { Mapper } from '@automapper/core'; -import { InjectMapper } from '@automapper/nestjs'; +import { Mapper } from 'automapper-core'; +import { InjectMapper } from 'automapper-nestjs'; import { Body, Controller, @@ -65,9 +65,8 @@ export class ApplicationDecisionMeetingController { async getAllForApplication( @Param('fileNumber') fileNumber, ): Promise<ApplicationDecisionMeetingDto[]> { - const meetings = await this.appDecisionMeetingService.getByAppFileNumber( - fileNumber, - ); + const meetings = + await this.appDecisionMeetingService.getByAppFileNumber(fileNumber); return this.mapper.mapArrayAsync( meetings, ApplicationDecisionMeeting, @@ -125,9 +124,8 @@ export class ApplicationDecisionMeetingController { ApplicationDecisionMeetingDto, ApplicationDecisionMeeting, ); - const updatedMeeting = await this.appDecisionMeetingService.createOrUpdate( - appDecEntity, - ); + const updatedMeeting = + await this.appDecisionMeetingService.createOrUpdate(appDecEntity); return this.mapper.map( updatedMeeting, ApplicationDecisionMeeting, @@ -161,9 +159,8 @@ export class ApplicationDecisionMeetingController { await this.appDecisionMeetingService.getUpcomingReconsiderationMeetings(); const reconIds = upcomingReconsiderationMeetings.map((a) => a.uuid); - const reconsiderations = await this.reconsiderationService.getMany( - reconIds, - ); + const reconsiderations = + await this.reconsiderationService.getMany(reconIds); return reconsiderations.map((recon): UpcomingMeetingDto => { const meetingDate = upcomingReconsiderationMeetings.find( (meeting) => meeting.uuid === recon.uuid, diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v1/application-decision-meeting/application-decision-meeting.dto.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v1/application-decision-meeting/application-decision-meeting.dto.ts index 789f36b782..c28eeee381 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v1/application-decision-meeting/application-decision-meeting.dto.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v1/application-decision-meeting/application-decision-meeting.dto.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { IsNumber, IsString } from 'class-validator'; import { UserDto } from '../../../../user/user.dto'; diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v1/application-decision-meeting/application-decision-meeting.entity.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v1/application-decision-meeting/application-decision-meeting.entity.ts index ec39e07962..9dbe5b9ebf 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v1/application-decision-meeting/application-decision-meeting.entity.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v1/application-decision-meeting/application-decision-meeting.entity.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { Column, Entity, ManyToOne } from 'typeorm'; import { Base } from '../../../../common/entities/base.entity'; import { Application } from '../../../application/application.entity'; diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v1/application-decision/application-decision-v1.controller.spec.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v1/application-decision/application-decision-v1.controller.spec.ts index 5133bf35b1..ed29924310 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v1/application-decision/application-decision-v1.controller.spec.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v1/application-decision/application-decision-v1.controller.spec.ts @@ -1,5 +1,5 @@ -import { classes } from '@automapper/classes'; -import { AutomapperModule } from '@automapper/nestjs'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { BadRequestException } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v1/application-decision/application-decision-v1.controller.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v1/application-decision/application-decision-v1.controller.ts index 0816790210..93fcaa467f 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v1/application-decision/application-decision-v1.controller.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v1/application-decision/application-decision-v1.controller.ts @@ -1,5 +1,5 @@ -import { Mapper } from '@automapper/core'; -import { InjectMapper } from '@automapper/nestjs'; +import { Mapper } from 'automapper-core'; +import { InjectMapper } from 'automapper-nestjs'; import { BadRequestException, Body, @@ -51,9 +51,8 @@ export class ApplicationDecisionV1Controller { async getByFileNumber( @Param('fileNumber') fileNumber, ): Promise<ApplicationDecisionDto[]> { - const decisions = await this.appDecisionService.getByAppFileNumber( - fileNumber, - ); + const decisions = + await this.appDecisionService.getByAppFileNumber(fileNumber); return await this.mapper.mapArrayAsync( decisions, ApplicationDecision, @@ -205,9 +204,8 @@ export class ApplicationDecisionV1Controller { @Param('uuid') decisionUuid: string, @Param('fileUuid') documentUuid: string, ) { - const downloadUrl = await this.appDecisionService.getDownloadUrl( - documentUuid, - ); + const downloadUrl = + await this.appDecisionService.getDownloadUrl(documentUuid); return { url: downloadUrl, }; diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v1/application-decision/application-decision-v1.service.spec.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v1/application-decision/application-decision-v1.service.spec.ts index 5adda2d753..f39d2f0a42 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v1/application-decision/application-decision-v1.service.spec.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v1/application-decision/application-decision-v1.service.spec.ts @@ -2,8 +2,8 @@ import { ServiceNotFoundException, ServiceValidationException, } from '@app/common/exceptions/base.exception'; -import { classes } from '@automapper/classes'; -import { AutomapperModule } from '@automapper/nestjs'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v1/application-decision/application-decision.dto.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v1/application-decision/application-decision.dto.ts index cadee846db..2deb7f96e6 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v1/application-decision/application-decision.dto.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v1/application-decision/application-decision.dto.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { IsBoolean, IsNumber, diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v1/application-decision/ceo-criterion/ceo-criterion.dto.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v1/application-decision/ceo-criterion/ceo-criterion.dto.ts index 6b5ef08179..8e6b398522 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v1/application-decision/ceo-criterion/ceo-criterion.dto.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v1/application-decision/ceo-criterion/ceo-criterion.dto.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { IsNumber } from 'class-validator'; import { BaseCodeDto } from '../../../../../common/dtos/base.dto'; diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.controller.spec.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.controller.spec.ts index b4d79689b8..5a7217b8d6 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.controller.spec.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.controller.spec.ts @@ -1,5 +1,5 @@ -import { classes } from '@automapper/classes'; -import { AutomapperModule } from '@automapper/nestjs'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { ClsService } from 'nestjs-cls'; diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.controller.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.controller.ts index 4afaf94e23..a38334f2e1 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.controller.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.controller.ts @@ -1,5 +1,5 @@ -import { Mapper } from '@automapper/core'; -import { InjectMapper } from '@automapper/nestjs'; +import { Mapper } from 'automapper-core'; +import { InjectMapper } from 'automapper-nestjs'; import { BadRequestException, Body, @@ -59,9 +59,8 @@ export class ApplicationDecisionV2Controller { async getByFileNumber( @Param('fileNumber') fileNumber, ): Promise<ApplicationDecisionDto[]> { - const decisions = await this.appDecisionService.getByAppFileNumber( - fileNumber, - ); + const decisions = + await this.appDecisionService.getByAppFileNumber(fileNumber); return await this.mapper.mapArrayAsync( decisions, @@ -245,9 +244,8 @@ export class ApplicationDecisionV2Controller { @Param('uuid') decisionUuid: string, @Param('fileUuid') documentUuid: string, ) { - const downloadUrl = await this.appDecisionService.getDownloadUrl( - documentUuid, - ); + const downloadUrl = + await this.appDecisionService.getDownloadUrl(documentUuid); return { url: downloadUrl, }; diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service.spec.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service.spec.ts index 1190d3c7fa..40905df625 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service.spec.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service.spec.ts @@ -2,8 +2,8 @@ import { ServiceNotFoundException, ServiceValidationException, } from '@app/common/exceptions/base.exception'; -import { classes } from '@automapper/classes'; -import { AutomapperModule } from '@automapper/nestjs'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision.dto.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision.dto.ts index 0b70ac4a3a..f3857de6fc 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision.dto.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision.dto.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { IsArray, IsBoolean, diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/ceo-criterion/ceo-criterion.dto.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/ceo-criterion/ceo-criterion.dto.ts index 6b5ef08179..8e6b398522 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/ceo-criterion/ceo-criterion.dto.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/ceo-criterion/ceo-criterion.dto.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { IsNumber } from 'class-validator'; import { BaseCodeDto } from '../../../../../common/dtos/base.dto'; diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.controller.spec.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.controller.spec.ts index 5515bec097..1e2906d8b2 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.controller.spec.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.controller.spec.ts @@ -1,5 +1,5 @@ -import { classes } from '@automapper/classes'; -import { AutomapperModule } from '@automapper/nestjs'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { ClsService } from 'nestjs-cls'; diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.controller.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.controller.ts index d9200b47d5..b1c99aa942 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.controller.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.controller.ts @@ -1,5 +1,5 @@ -import { Mapper } from '@automapper/core'; -import { InjectMapper } from '@automapper/nestjs'; +import { Mapper } from 'automapper-core'; +import { InjectMapper } from 'automapper-nestjs'; import { Body, Controller, Param, Patch } from '@nestjs/common'; import { ANY_AUTH_ROLE } from '../../../../../common/authorization/roles'; import { UserRoles } from '../../../../../common/authorization/roles.decorator'; diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.dto.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.dto.ts index 2046eee526..98ac12719f 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.dto.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.dto.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { IsArray, IsNumber, IsOptional, IsString } from 'class-validator'; import { BaseCodeDto } from '../../../../../common/dtos/base.dto'; import { NaruSubtypeDto } from '../../../../../portal/application-submission/application-submission.dto'; diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.entity.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.entity.ts index 4f418697e5..d8b675e749 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.entity.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.entity.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { Column, Entity, diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision.entity.ts b/services/apps/alcs/src/alcs/application-decision/application-decision.entity.ts index 5144af5cb8..cf3b4ec259 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision.entity.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision.entity.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { Column, CreateDateColumn, diff --git a/services/apps/alcs/src/alcs/application-decision/application-modification/application-modification.controller.spec.ts b/services/apps/alcs/src/alcs/application-decision/application-modification/application-modification.controller.spec.ts index d6adbdc870..3d9489fd70 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-modification/application-modification.controller.spec.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-modification/application-modification.controller.spec.ts @@ -1,5 +1,5 @@ -import { classes } from '@automapper/classes'; -import { AutomapperModule } from '@automapper/nestjs'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { ClsService } from 'nestjs-cls'; diff --git a/services/apps/alcs/src/alcs/application-decision/application-modification/application-modification.dto.ts b/services/apps/alcs/src/alcs/application-decision/application-modification/application-modification.dto.ts index 612486175e..dd9db30855 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-modification/application-modification.dto.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-modification/application-modification.dto.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { ArrayNotEmpty, IsArray, diff --git a/services/apps/alcs/src/alcs/application-decision/application-modification/application-modification.entity.ts b/services/apps/alcs/src/alcs/application-decision/application-modification/application-modification.entity.ts index ea94dfa352..2f8b6f3c4f 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-modification/application-modification.entity.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-modification/application-modification.entity.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { Type } from 'class-transformer'; import { Column, diff --git a/services/apps/alcs/src/alcs/application-decision/application-modification/application-modification.service.spec.ts b/services/apps/alcs/src/alcs/application-decision/application-modification/application-modification.service.spec.ts index 820fe0b118..d13cff36f5 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-modification/application-modification.service.spec.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-modification/application-modification.service.spec.ts @@ -1,6 +1,6 @@ import { ServiceNotFoundException } from '@app/common/exceptions/base.exception'; -import { classes } from '@automapper/classes'; -import { AutomapperModule } from '@automapper/nestjs'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; diff --git a/services/apps/alcs/src/alcs/application-decision/application-modification/application-modification.service.ts b/services/apps/alcs/src/alcs/application-decision/application-modification/application-modification.service.ts index f93bdd1be6..7d055f44c4 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-modification/application-modification.service.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-modification/application-modification.service.ts @@ -1,6 +1,6 @@ import { ServiceNotFoundException } from '@app/common/exceptions/base.exception'; -import { Mapper } from '@automapper/core'; -import { InjectMapper } from '@automapper/nestjs'; +import { Mapper } from 'automapper-core'; +import { InjectMapper } from 'automapper-nestjs'; import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { @@ -135,9 +135,8 @@ export class ApplicationModificationService { createDto.modifiesDecisionUuids, ); - const mockModifications = await this.modificationRepository.save( - modification, - ); + const mockModifications = + await this.modificationRepository.save(modification); return this.getByUuid(mockModifications.uuid); } diff --git a/services/apps/alcs/src/alcs/application-decision/application-reconsideration/application-reconsideration.controller.spec.ts b/services/apps/alcs/src/alcs/application-decision/application-reconsideration/application-reconsideration.controller.spec.ts index 6ae279c023..9e39619795 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-reconsideration/application-reconsideration.controller.spec.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-reconsideration/application-reconsideration.controller.spec.ts @@ -1,5 +1,5 @@ -import { classes } from '@automapper/classes'; -import { AutomapperModule } from '@automapper/nestjs'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { ClsService } from 'nestjs-cls'; diff --git a/services/apps/alcs/src/alcs/application-decision/application-reconsideration/application-reconsideration.dto.ts b/services/apps/alcs/src/alcs/application-decision/application-reconsideration/application-reconsideration.dto.ts index 8b5a38d686..04b5e2bc64 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-reconsideration/application-reconsideration.dto.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-reconsideration/application-reconsideration.dto.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { ArrayNotEmpty, IsArray, diff --git a/services/apps/alcs/src/alcs/application-decision/application-reconsideration/application-reconsideration.entity.ts b/services/apps/alcs/src/alcs/application-decision/application-reconsideration/application-reconsideration.entity.ts index 2c9cd5ce8b..187d731ee2 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-reconsideration/application-reconsideration.entity.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-reconsideration/application-reconsideration.entity.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { Type } from 'class-transformer'; import { Column, diff --git a/services/apps/alcs/src/alcs/application-decision/application-reconsideration/application-reconsideration.service.spec.ts b/services/apps/alcs/src/alcs/application-decision/application-reconsideration/application-reconsideration.service.spec.ts index 0156c6d2b5..181ae3505d 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-reconsideration/application-reconsideration.service.spec.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-reconsideration/application-reconsideration.service.spec.ts @@ -1,6 +1,6 @@ import { ServiceNotFoundException } from '@app/common/exceptions/base.exception'; -import { classes } from '@automapper/classes'; -import { AutomapperModule } from '@automapper/nestjs'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; diff --git a/services/apps/alcs/src/alcs/application-decision/application-reconsideration/application-reconsideration.service.ts b/services/apps/alcs/src/alcs/application-decision/application-reconsideration/application-reconsideration.service.ts index 31f65e595e..92f62b0342 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-reconsideration/application-reconsideration.service.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-reconsideration/application-reconsideration.service.ts @@ -1,6 +1,6 @@ import { ServiceNotFoundException } from '@app/common/exceptions/base.exception'; -import { Mapper } from '@automapper/core'; -import { InjectMapper } from '@automapper/nestjs'; +import { Mapper } from 'automapper-core'; +import { InjectMapper } from 'automapper-nestjs'; import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { diff --git a/services/apps/alcs/src/alcs/application/application-document/application-document.controller.spec.ts b/services/apps/alcs/src/alcs/application/application-document/application-document.controller.spec.ts index 5039e42203..a57281d884 100644 --- a/services/apps/alcs/src/alcs/application/application-document/application-document.controller.spec.ts +++ b/services/apps/alcs/src/alcs/application/application-document/application-document.controller.spec.ts @@ -1,5 +1,5 @@ -import { classes } from '@automapper/classes'; -import { AutomapperModule } from '@automapper/nestjs'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { BadRequestException } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; diff --git a/services/apps/alcs/src/alcs/application/application-document/application-document.controller.ts b/services/apps/alcs/src/alcs/application/application-document/application-document.controller.ts index 30b352d5c5..d9f3ffc3d8 100644 --- a/services/apps/alcs/src/alcs/application/application-document/application-document.controller.ts +++ b/services/apps/alcs/src/alcs/application/application-document/application-document.controller.ts @@ -1,5 +1,5 @@ -import { Mapper } from '@automapper/core'; -import { InjectMapper } from '@automapper/nestjs'; +import { Mapper } from 'automapper-core'; +import { InjectMapper } from 'automapper-nestjs'; import { BadRequestException, Body, diff --git a/services/apps/alcs/src/alcs/application/application-document/application-document.dto.ts b/services/apps/alcs/src/alcs/application/application-document/application-document.dto.ts index 0977c0f606..7f9e65e68b 100644 --- a/services/apps/alcs/src/alcs/application/application-document/application-document.dto.ts +++ b/services/apps/alcs/src/alcs/application/application-document/application-document.dto.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { DocumentTypeDto } from '../../../document/document.dto'; export class ApplicationDocumentDto { diff --git a/services/apps/alcs/src/alcs/application/application-document/application-document.entity.ts b/services/apps/alcs/src/alcs/application/application-document/application-document.entity.ts index f2e0e4c657..adaf0817b1 100644 --- a/services/apps/alcs/src/alcs/application/application-document/application-document.entity.ts +++ b/services/apps/alcs/src/alcs/application/application-document/application-document.entity.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { BaseEntity, Column, diff --git a/services/apps/alcs/src/alcs/application/application-meeting/application-meeting.controller.spec.ts b/services/apps/alcs/src/alcs/application/application-meeting/application-meeting.controller.spec.ts index b746033e5a..ccde8eb72a 100644 --- a/services/apps/alcs/src/alcs/application/application-meeting/application-meeting.controller.spec.ts +++ b/services/apps/alcs/src/alcs/application/application-meeting/application-meeting.controller.spec.ts @@ -1,5 +1,5 @@ -import { classes } from '@automapper/classes'; -import { AutomapperModule } from '@automapper/nestjs'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { ClsService } from 'nestjs-cls'; diff --git a/services/apps/alcs/src/alcs/application/application-meeting/application-meeting.controller.ts b/services/apps/alcs/src/alcs/application/application-meeting/application-meeting.controller.ts index 7d76c50116..aecc180437 100644 --- a/services/apps/alcs/src/alcs/application/application-meeting/application-meeting.controller.ts +++ b/services/apps/alcs/src/alcs/application/application-meeting/application-meeting.controller.ts @@ -1,6 +1,6 @@ import { ServiceNotFoundException } from '@app/common/exceptions/base.exception'; -import { Mapper } from '@automapper/core'; -import { InjectMapper } from '@automapper/nestjs'; +import { Mapper } from 'automapper-core'; +import { InjectMapper } from 'automapper-nestjs'; import { Body, Controller, @@ -51,9 +51,8 @@ export class ApplicationMeetingController { async getAllForApplication( @Param('fileNumber') fileNumber, ): Promise<ApplicationMeetingDto[]> { - const meetings = await this.appMeetingService.getByAppFileNumber( - fileNumber, - ); + const meetings = + await this.appMeetingService.getByAppFileNumber(fileNumber); return this.mapper.mapArrayAsync( meetings, diff --git a/services/apps/alcs/src/alcs/application/application-meeting/application-meeting.dto.ts b/services/apps/alcs/src/alcs/application/application-meeting/application-meeting.dto.ts index da78a124ce..de0a8d76a6 100644 --- a/services/apps/alcs/src/alcs/application/application-meeting/application-meeting.dto.ts +++ b/services/apps/alcs/src/alcs/application/application-meeting/application-meeting.dto.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { IsNumber, IsOptional, IsString } from 'class-validator'; import { ApplicationMeetingTypeDto } from '../../code/application-code/application-meeting-type/application-meeting-type.dto'; diff --git a/services/apps/alcs/src/alcs/application/application-meeting/application-meeting.entity.ts b/services/apps/alcs/src/alcs/application/application-meeting/application-meeting.entity.ts index 6909d94a9f..20cc8e38ae 100644 --- a/services/apps/alcs/src/alcs/application/application-meeting/application-meeting.entity.ts +++ b/services/apps/alcs/src/alcs/application/application-meeting/application-meeting.entity.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { Type } from 'class-transformer'; import { Column, Entity, JoinColumn, ManyToOne, OneToOne } from 'typeorm'; import { Base } from '../../../common/entities/base.entity'; diff --git a/services/apps/alcs/src/alcs/application/application-parcel/application-parcel.controller.spec.ts b/services/apps/alcs/src/alcs/application/application-parcel/application-parcel.controller.spec.ts index f196b0c069..1f1fc26857 100644 --- a/services/apps/alcs/src/alcs/application/application-parcel/application-parcel.controller.spec.ts +++ b/services/apps/alcs/src/alcs/application/application-parcel/application-parcel.controller.spec.ts @@ -1,5 +1,5 @@ -import { classes } from '@automapper/classes'; -import { AutomapperModule } from '@automapper/nestjs'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { ClsService } from 'nestjs-cls'; diff --git a/services/apps/alcs/src/alcs/application/application-parcel/application-parcel.controller.ts b/services/apps/alcs/src/alcs/application/application-parcel/application-parcel.controller.ts index 632dc4c510..32a76e8952 100644 --- a/services/apps/alcs/src/alcs/application/application-parcel/application-parcel.controller.ts +++ b/services/apps/alcs/src/alcs/application/application-parcel/application-parcel.controller.ts @@ -1,5 +1,5 @@ -import { Mapper } from '@automapper/core'; -import { InjectMapper } from '@automapper/nestjs'; +import { Mapper } from 'automapper-core'; +import { InjectMapper } from 'automapper-nestjs'; import { Body, Controller, Get, Param, Post, UseGuards } from '@nestjs/common'; import { ApiOAuth2 } from '@nestjs/swagger'; import * as config from 'config'; diff --git a/services/apps/alcs/src/alcs/application/application-submission-review/application-submission-review.service.spec.ts b/services/apps/alcs/src/alcs/application/application-submission-review/application-submission-review.service.spec.ts index e54cc931f5..7183f42b5d 100644 --- a/services/apps/alcs/src/alcs/application/application-submission-review/application-submission-review.service.spec.ts +++ b/services/apps/alcs/src/alcs/application/application-submission-review/application-submission-review.service.spec.ts @@ -1,5 +1,5 @@ -import { Mapper } from '@automapper/core'; -import { getMapperToken } from '@automapper/nestjs'; +import { Mapper } from 'automapper-core'; +import { getMapperToken } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; diff --git a/services/apps/alcs/src/alcs/application/application-submission-review/application-submission-review.service.ts b/services/apps/alcs/src/alcs/application/application-submission-review/application-submission-review.service.ts index 5a50f71119..5af533f6ab 100644 --- a/services/apps/alcs/src/alcs/application/application-submission-review/application-submission-review.service.ts +++ b/services/apps/alcs/src/alcs/application/application-submission-review/application-submission-review.service.ts @@ -1,5 +1,5 @@ -import { Mapper } from '@automapper/core'; -import { InjectMapper } from '@automapper/nestjs'; +import { Mapper } from 'automapper-core'; +import { InjectMapper } from 'automapper-nestjs'; import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; diff --git a/services/apps/alcs/src/alcs/application/application-submission-status/application-submission-status.controller.spec.ts b/services/apps/alcs/src/alcs/application/application-submission-status/application-submission-status.controller.spec.ts index 0a57bd3bfd..277226cdd5 100644 --- a/services/apps/alcs/src/alcs/application/application-submission-status/application-submission-status.controller.spec.ts +++ b/services/apps/alcs/src/alcs/application/application-submission-status/application-submission-status.controller.spec.ts @@ -1,5 +1,5 @@ -import { classes } from '@automapper/classes'; -import { AutomapperModule } from '@automapper/nestjs'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { ClsService } from 'nestjs-cls'; @@ -72,9 +72,8 @@ describe('ApplicationSubmissionStatusController', () => { new ApplicationSubmissionToSubmissionStatus(), ); - const result = await controller.getCurrentStatusByFileNumber( - fakeFileNumber, - ); + const result = + await controller.getCurrentStatusByFileNumber(fakeFileNumber); expect( mockApplicationSubmissionStatusService.getCurrentStatusByFileNumber, diff --git a/services/apps/alcs/src/alcs/application/application-submission-status/application-submission-status.controller.ts b/services/apps/alcs/src/alcs/application/application-submission-status/application-submission-status.controller.ts index 9556b5a140..675bbb8dfa 100644 --- a/services/apps/alcs/src/alcs/application/application-submission-status/application-submission-status.controller.ts +++ b/services/apps/alcs/src/alcs/application/application-submission-status/application-submission-status.controller.ts @@ -1,5 +1,5 @@ -import { Mapper } from '@automapper/core'; -import { InjectMapper } from '@automapper/nestjs'; +import { Mapper } from 'automapper-core'; +import { InjectMapper } from 'automapper-nestjs'; import { Controller, Get, Param } from '@nestjs/common'; import { ANY_AUTH_ROLE } from '../../../common/authorization/roles'; import { UserRoles } from '../../../common/authorization/roles.decorator'; diff --git a/services/apps/alcs/src/alcs/application/application-submission-status/submission-status-type.entity.ts b/services/apps/alcs/src/alcs/application/application-submission-status/submission-status-type.entity.ts index 5353e5074a..3ea5175efa 100644 --- a/services/apps/alcs/src/alcs/application/application-submission-status/submission-status-type.entity.ts +++ b/services/apps/alcs/src/alcs/application/application-submission-status/submission-status-type.entity.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { Column, Entity, OneToMany } from 'typeorm'; import { BaseCodeEntity } from '../../../common/entities/base.code.entity'; import { ApplicationSubmissionToSubmissionStatus } from './submission-status.entity'; diff --git a/services/apps/alcs/src/alcs/application/application-submission-status/submission-status.dto.ts b/services/apps/alcs/src/alcs/application/application-submission-status/submission-status.dto.ts index 5475b5cc99..19f7f2f88c 100644 --- a/services/apps/alcs/src/alcs/application/application-submission-status/submission-status.dto.ts +++ b/services/apps/alcs/src/alcs/application/application-submission-status/submission-status.dto.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { BaseCodeDto } from '../../../common/dtos/base.dto'; export enum SUBMISSION_STATUS { diff --git a/services/apps/alcs/src/alcs/application/application-submission-status/submission-status.entity.ts b/services/apps/alcs/src/alcs/application/application-submission-status/submission-status.entity.ts index 4af0f93fcd..dde1b09b3d 100644 --- a/services/apps/alcs/src/alcs/application/application-submission-status/submission-status.entity.ts +++ b/services/apps/alcs/src/alcs/application/application-submission-status/submission-status.entity.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { BaseEntity, Column, diff --git a/services/apps/alcs/src/alcs/application/application-submission/application-submission.controller.spec.ts b/services/apps/alcs/src/alcs/application/application-submission/application-submission.controller.spec.ts index e11d3c7ce1..af2a50ec23 100644 --- a/services/apps/alcs/src/alcs/application/application-submission/application-submission.controller.spec.ts +++ b/services/apps/alcs/src/alcs/application/application-submission/application-submission.controller.spec.ts @@ -1,5 +1,5 @@ -import { classes } from '@automapper/classes'; -import { AutomapperModule } from '@automapper/nestjs'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { ClsService } from 'nestjs-cls'; diff --git a/services/apps/alcs/src/alcs/application/application-submission/application-submission.controller.ts b/services/apps/alcs/src/alcs/application/application-submission/application-submission.controller.ts index 18b45da712..d9deb72994 100644 --- a/services/apps/alcs/src/alcs/application/application-submission/application-submission.controller.ts +++ b/services/apps/alcs/src/alcs/application/application-submission/application-submission.controller.ts @@ -1,5 +1,5 @@ -import { Mapper } from '@automapper/core'; -import { InjectMapper } from '@automapper/nestjs'; +import { Mapper } from 'automapper-core'; +import { InjectMapper } from 'automapper-nestjs'; import { Body, Controller, Get, Param, Patch, UseGuards } from '@nestjs/common'; import { ApiOAuth2 } from '@nestjs/swagger'; import * as config from 'config'; diff --git a/services/apps/alcs/src/alcs/application/application-submission/application-submission.service.spec.ts b/services/apps/alcs/src/alcs/application/application-submission/application-submission.service.spec.ts index 47ff6c355c..46d3742ad2 100644 --- a/services/apps/alcs/src/alcs/application/application-submission/application-submission.service.spec.ts +++ b/services/apps/alcs/src/alcs/application/application-submission/application-submission.service.spec.ts @@ -1,5 +1,5 @@ -import { classes } from '@automapper/classes'; -import { AutomapperModule } from '@automapper/nestjs'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; diff --git a/services/apps/alcs/src/alcs/application/application-submission/application-submission.service.ts b/services/apps/alcs/src/alcs/application/application-submission/application-submission.service.ts index f79976302c..4b10eebee0 100644 --- a/services/apps/alcs/src/alcs/application/application-submission/application-submission.service.ts +++ b/services/apps/alcs/src/alcs/application/application-submission/application-submission.service.ts @@ -1,5 +1,5 @@ -import { Mapper } from '@automapper/core'; -import { InjectMapper } from '@automapper/nestjs'; +import { Mapper } from 'automapper-core'; +import { InjectMapper } from 'automapper-nestjs'; import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; diff --git a/services/apps/alcs/src/alcs/application/application.controller.spec.ts b/services/apps/alcs/src/alcs/application/application.controller.spec.ts index 1ffc8030ee..647684a772 100644 --- a/services/apps/alcs/src/alcs/application/application.controller.spec.ts +++ b/services/apps/alcs/src/alcs/application/application.controller.spec.ts @@ -1,6 +1,6 @@ import { ConfigModule } from '@app/common/config/config.module'; -import { classes } from '@automapper/classes'; -import { AutomapperModule } from '@automapper/nestjs'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { ClsService } from 'nestjs-cls'; diff --git a/services/apps/alcs/src/alcs/application/application.dto.ts b/services/apps/alcs/src/alcs/application/application.dto.ts index d8f3b466fd..a1f67c6a25 100644 --- a/services/apps/alcs/src/alcs/application/application.dto.ts +++ b/services/apps/alcs/src/alcs/application/application.dto.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { Type } from 'class-transformer'; import { IsBoolean, diff --git a/services/apps/alcs/src/alcs/application/application.entity.ts b/services/apps/alcs/src/alcs/application/application.entity.ts index b5e4b09f6a..fefc600490 100644 --- a/services/apps/alcs/src/alcs/application/application.entity.ts +++ b/services/apps/alcs/src/alcs/application/application.entity.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { Type } from 'class-transformer'; import { Column, diff --git a/services/apps/alcs/src/alcs/application/application.service.spec.ts b/services/apps/alcs/src/alcs/application/application.service.spec.ts index 4b6151e879..b6f128df67 100644 --- a/services/apps/alcs/src/alcs/application/application.service.spec.ts +++ b/services/apps/alcs/src/alcs/application/application.service.spec.ts @@ -1,6 +1,6 @@ import { ServiceNotFoundException } from '@app/common/exceptions/base.exception'; -import { classes } from '@automapper/classes'; -import { AutomapperModule } from '@automapper/nestjs'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; diff --git a/services/apps/alcs/src/alcs/application/application.service.ts b/services/apps/alcs/src/alcs/application/application.service.ts index c050685b20..43a2007fec 100644 --- a/services/apps/alcs/src/alcs/application/application.service.ts +++ b/services/apps/alcs/src/alcs/application/application.service.ts @@ -2,8 +2,8 @@ import { ServiceNotFoundException, ServiceValidationException, } from '@app/common/exceptions/base.exception'; -import { Mapper } from '@automapper/core'; -import { InjectMapper } from '@automapper/nestjs'; +import { Mapper } from 'automapper-core'; +import { InjectMapper } from 'automapper-nestjs'; import { Injectable, Logger } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { diff --git a/services/apps/alcs/src/alcs/board/board-status.entity.ts b/services/apps/alcs/src/alcs/board/board-status.entity.ts index 9e7e4c3a57..1eac4bee80 100644 --- a/services/apps/alcs/src/alcs/board/board-status.entity.ts +++ b/services/apps/alcs/src/alcs/board/board-status.entity.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { Column, Entity, ManyToOne, Unique } from 'typeorm'; import { CardStatus } from '../card/card-status/card-status.entity'; import { Base } from '../../common/entities/base.entity'; diff --git a/services/apps/alcs/src/alcs/board/board.controller.spec.ts b/services/apps/alcs/src/alcs/board/board.controller.spec.ts index 4b820577ec..d776352754 100644 --- a/services/apps/alcs/src/alcs/board/board.controller.spec.ts +++ b/services/apps/alcs/src/alcs/board/board.controller.spec.ts @@ -1,5 +1,5 @@ -import { classes } from '@automapper/classes'; -import { AutomapperModule } from '@automapper/nestjs'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { ClsService } from 'nestjs-cls'; diff --git a/services/apps/alcs/src/alcs/board/board.controller.ts b/services/apps/alcs/src/alcs/board/board.controller.ts index 3c06aa14aa..b06ced459a 100644 --- a/services/apps/alcs/src/alcs/board/board.controller.ts +++ b/services/apps/alcs/src/alcs/board/board.controller.ts @@ -1,6 +1,6 @@ import { ServiceValidationException } from '@app/common/exceptions/base.exception'; -import { Mapper } from '@automapper/core'; -import { InjectMapper } from '@automapper/nestjs'; +import { Mapper } from 'automapper-core'; +import { InjectMapper } from 'automapper-nestjs'; import { Body, Controller, Get, Param, Post, UseGuards } from '@nestjs/common'; import { ApiOAuth2 } from '@nestjs/swagger'; import * as config from 'config'; @@ -105,17 +105,14 @@ export class BoardController { board: await this.autoMapper.mapAsync(board, Board, BoardDto), applications: await this.applicationService.mapToDtos(applications), reconsiderations: await this.reconsiderationService.mapToDtos(recons), - planningReviews: await this.planningReviewService.mapToDtos( - planningReviews, - ), + planningReviews: + await this.planningReviewService.mapToDtos(planningReviews), modifications: await this.appModificationService.mapToDtos(modifications), covenants: await this.covenantService.mapToDtos(covenants), - noticeOfIntents: await this.noticeOfIntentService.mapToDtos( - noticeOfIntents, - ), - noiModifications: await this.noiModificationService.mapToDtos( - noiModifications, - ), + noticeOfIntents: + await this.noticeOfIntentService.mapToDtos(noticeOfIntents), + noiModifications: + await this.noiModificationService.mapToDtos(noiModifications), notifications: await this.notificationService.mapToDtos(notifications), }; } diff --git a/services/apps/alcs/src/alcs/board/board.dto.ts b/services/apps/alcs/src/alcs/board/board.dto.ts index 1852f60048..422a13ce8e 100644 --- a/services/apps/alcs/src/alcs/board/board.dto.ts +++ b/services/apps/alcs/src/alcs/board/board.dto.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { IsArray, IsBoolean, IsString } from 'class-validator'; export enum BOARD_CODES { diff --git a/services/apps/alcs/src/alcs/board/board.entity.ts b/services/apps/alcs/src/alcs/board/board.entity.ts index 2b09bf6fe9..2d2c5e9987 100644 --- a/services/apps/alcs/src/alcs/board/board.entity.ts +++ b/services/apps/alcs/src/alcs/board/board.entity.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { Column, Entity, JoinTable, ManyToMany, OneToMany } from 'typeorm'; import { Base } from '../../common/entities/base.entity'; import { CardType } from '../card/card-type/card-type.entity'; diff --git a/services/apps/alcs/src/alcs/card/card-status/card-status.service.spec.ts b/services/apps/alcs/src/alcs/card/card-status/card-status.service.spec.ts index e91f407819..e7728502f5 100644 --- a/services/apps/alcs/src/alcs/card/card-status/card-status.service.spec.ts +++ b/services/apps/alcs/src/alcs/card/card-status/card-status.service.spec.ts @@ -1,5 +1,5 @@ -import { classes } from '@automapper/classes'; -import { AutomapperModule } from '@automapper/nestjs'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; diff --git a/services/apps/alcs/src/alcs/card/card-subtask/card-subtask-type/card-subtask-type.entity.ts b/services/apps/alcs/src/alcs/card/card-subtask/card-subtask-type/card-subtask-type.entity.ts index 4b4fa6056c..9481c5d4e0 100644 --- a/services/apps/alcs/src/alcs/card/card-subtask/card-subtask-type/card-subtask-type.entity.ts +++ b/services/apps/alcs/src/alcs/card/card-subtask/card-subtask-type/card-subtask-type.entity.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { Column, Entity } from 'typeorm'; import { BaseCodeEntity } from '../../../../common/entities/base.code.entity'; diff --git a/services/apps/alcs/src/alcs/card/card-subtask/card-subtask.controller.spec.ts b/services/apps/alcs/src/alcs/card/card-subtask/card-subtask.controller.spec.ts index c960bc9a3b..63ab585ae9 100644 --- a/services/apps/alcs/src/alcs/card/card-subtask/card-subtask.controller.spec.ts +++ b/services/apps/alcs/src/alcs/card/card-subtask/card-subtask.controller.spec.ts @@ -2,8 +2,8 @@ import { ServiceNotFoundException, ServiceValidationException, } from '@app/common/exceptions/base.exception'; -import { classes } from '@automapper/classes'; -import { AutomapperModule } from '@automapper/nestjs'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { ClsService } from 'nestjs-cls'; diff --git a/services/apps/alcs/src/alcs/card/card-subtask/card-subtask.controller.ts b/services/apps/alcs/src/alcs/card/card-subtask/card-subtask.controller.ts index f0d9ac338a..95bba01b07 100644 --- a/services/apps/alcs/src/alcs/card/card-subtask/card-subtask.controller.ts +++ b/services/apps/alcs/src/alcs/card/card-subtask/card-subtask.controller.ts @@ -2,8 +2,8 @@ import { ServiceNotFoundException, ServiceValidationException, } from '@app/common/exceptions/base.exception'; -import { Mapper } from '@automapper/core'; -import { InjectMapper } from '@automapper/nestjs'; +import { Mapper } from 'automapper-core'; +import { InjectMapper } from 'automapper-nestjs'; import { Body, Controller, diff --git a/services/apps/alcs/src/alcs/card/card-subtask/card-subtask.dto.ts b/services/apps/alcs/src/alcs/card/card-subtask/card-subtask.dto.ts index 77dcebdd37..de1449b8a4 100644 --- a/services/apps/alcs/src/alcs/card/card-subtask/card-subtask.dto.ts +++ b/services/apps/alcs/src/alcs/card/card-subtask/card-subtask.dto.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { IsOptional, IsUUID } from 'class-validator'; import { ApplicationTypeDto } from '../../code/application-code/application-type/application-type.dto'; import { AssigneeDto } from '../../../user/user.dto'; diff --git a/services/apps/alcs/src/alcs/card/card-type/card-type.entity.ts b/services/apps/alcs/src/alcs/card/card-type/card-type.entity.ts index ca7a9535bd..78330ac6aa 100644 --- a/services/apps/alcs/src/alcs/card/card-type/card-type.entity.ts +++ b/services/apps/alcs/src/alcs/card/card-type/card-type.entity.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { Column, Entity } from 'typeorm'; import { BaseCodeEntity } from '../../../common/entities/base.code.entity'; diff --git a/services/apps/alcs/src/alcs/card/card.dto.ts b/services/apps/alcs/src/alcs/card/card.dto.ts index 64460b7e21..816398d7f5 100644 --- a/services/apps/alcs/src/alcs/card/card.dto.ts +++ b/services/apps/alcs/src/alcs/card/card.dto.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { IsBoolean, IsNotEmpty, IsOptional, IsString } from 'class-validator'; import { AssigneeDto } from '../../user/user.dto'; import { MinimalBoardDto } from '../board/board.dto'; diff --git a/services/apps/alcs/src/alcs/card/card.entity.ts b/services/apps/alcs/src/alcs/card/card.entity.ts index 2d3ee89d90..52501f2ec3 100644 --- a/services/apps/alcs/src/alcs/card/card.entity.ts +++ b/services/apps/alcs/src/alcs/card/card.entity.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { Column, CreateDateColumn, diff --git a/services/apps/alcs/src/alcs/card/card.service.spec.ts b/services/apps/alcs/src/alcs/card/card.service.spec.ts index c7556c53db..4969138dab 100644 --- a/services/apps/alcs/src/alcs/card/card.service.spec.ts +++ b/services/apps/alcs/src/alcs/card/card.service.spec.ts @@ -1,7 +1,7 @@ import { CONFIG_TOKEN } from '@app/common/config/config.module'; import { ServiceValidationException } from '@app/common/exceptions/base.exception'; -import { classes } from '@automapper/classes'; -import { AutomapperModule } from '@automapper/nestjs'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; diff --git a/services/apps/alcs/src/alcs/card/card.service.ts b/services/apps/alcs/src/alcs/card/card.service.ts index 54e18617db..8eb90d78c4 100644 --- a/services/apps/alcs/src/alcs/card/card.service.ts +++ b/services/apps/alcs/src/alcs/card/card.service.ts @@ -1,7 +1,7 @@ import { CONFIG_TOKEN } from '@app/common/config/config.module'; import { ServiceValidationException } from '@app/common/exceptions/base.exception'; -import { Mapper } from '@automapper/core'; -import { InjectMapper } from '@automapper/nestjs'; +import { Mapper } from 'automapper-core'; +import { InjectMapper } from 'automapper-nestjs'; import { Inject, Injectable, Logger } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { IConfig } from 'config'; diff --git a/services/apps/alcs/src/alcs/code/application-code/application-type/application-type.dto.ts b/services/apps/alcs/src/alcs/code/application-code/application-type/application-type.dto.ts index 18f8168a71..067c46876f 100644 --- a/services/apps/alcs/src/alcs/code/application-code/application-type/application-type.dto.ts +++ b/services/apps/alcs/src/alcs/code/application-code/application-type/application-type.dto.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { BaseCodeDto } from '../../../../common/dtos/base.dto'; export class ApplicationTypeDto extends BaseCodeDto { diff --git a/services/apps/alcs/src/alcs/code/application-code/application-type/application-type.entity.ts b/services/apps/alcs/src/alcs/code/application-code/application-type/application-type.entity.ts index 92e31c05da..3cb5ebb404 100644 --- a/services/apps/alcs/src/alcs/code/application-code/application-type/application-type.entity.ts +++ b/services/apps/alcs/src/alcs/code/application-code/application-type/application-type.entity.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { Column, Entity } from 'typeorm'; import { BaseCodeEntity } from '../../../../common/entities/base.code.entity'; diff --git a/services/apps/alcs/src/alcs/code/code.controller.spec.ts b/services/apps/alcs/src/alcs/code/code.controller.spec.ts index b4bf710e6e..eca038262f 100644 --- a/services/apps/alcs/src/alcs/code/code.controller.spec.ts +++ b/services/apps/alcs/src/alcs/code/code.controller.spec.ts @@ -1,5 +1,5 @@ -import { classes } from '@automapper/classes'; -import { AutomapperModule } from '@automapper/nestjs'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { createMock } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { ClsService } from 'nestjs-cls'; diff --git a/services/apps/alcs/src/alcs/code/code.controller.ts b/services/apps/alcs/src/alcs/code/code.controller.ts index 9729be0e54..01b68675b5 100644 --- a/services/apps/alcs/src/alcs/code/code.controller.ts +++ b/services/apps/alcs/src/alcs/code/code.controller.ts @@ -1,5 +1,5 @@ -import { Mapper } from '@automapper/core'; -import { InjectMapper } from '@automapper/nestjs'; +import { Mapper } from 'automapper-core'; +import { InjectMapper } from 'automapper-nestjs'; import { Controller, Get, UseGuards } from '@nestjs/common'; import { ApiOAuth2 } from '@nestjs/swagger'; import * as config from 'config'; diff --git a/services/apps/alcs/src/alcs/comment/comment.controller.spec.ts b/services/apps/alcs/src/alcs/comment/comment.controller.spec.ts index 8244c111e5..64084dd8a6 100644 --- a/services/apps/alcs/src/alcs/comment/comment.controller.spec.ts +++ b/services/apps/alcs/src/alcs/comment/comment.controller.spec.ts @@ -1,5 +1,5 @@ -import { classes } from '@automapper/classes'; -import { AutomapperModule } from '@automapper/nestjs'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { ForbiddenException, NotFoundException } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; diff --git a/services/apps/alcs/src/alcs/comment/comment.controller.ts b/services/apps/alcs/src/alcs/comment/comment.controller.ts index f9bd900025..6f40bb1d31 100644 --- a/services/apps/alcs/src/alcs/comment/comment.controller.ts +++ b/services/apps/alcs/src/alcs/comment/comment.controller.ts @@ -1,5 +1,5 @@ -import { Mapper } from '@automapper/core'; -import { InjectMapper } from '@automapper/nestjs'; +import { Mapper } from 'automapper-core'; +import { InjectMapper } from 'automapper-nestjs'; import { Body, Controller, diff --git a/services/apps/alcs/src/alcs/comment/comment.dto.ts b/services/apps/alcs/src/alcs/comment/comment.dto.ts index e2d349b6fc..16c7d1664f 100644 --- a/services/apps/alcs/src/alcs/comment/comment.dto.ts +++ b/services/apps/alcs/src/alcs/comment/comment.dto.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { IsArray, IsNotEmpty, IsString } from 'class-validator'; import { CommentMentionDto } from './mention/comment-mention.dto'; diff --git a/services/apps/alcs/src/alcs/comment/comment.entity.ts b/services/apps/alcs/src/alcs/comment/comment.entity.ts index d14bbad1cc..867c1097a5 100644 --- a/services/apps/alcs/src/alcs/comment/comment.entity.ts +++ b/services/apps/alcs/src/alcs/comment/comment.entity.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { Column, CreateDateColumn, diff --git a/services/apps/alcs/src/alcs/comment/mention/comment-mention.dto.ts b/services/apps/alcs/src/alcs/comment/mention/comment-mention.dto.ts index 7f616192d1..eba740930c 100644 --- a/services/apps/alcs/src/alcs/comment/mention/comment-mention.dto.ts +++ b/services/apps/alcs/src/alcs/comment/mention/comment-mention.dto.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { IsString } from 'class-validator'; export class CommentMentionDto { diff --git a/services/apps/alcs/src/alcs/comment/mention/comment-mention.entity.ts b/services/apps/alcs/src/alcs/comment/mention/comment-mention.entity.ts index 00b8e987a0..afdebf4a78 100644 --- a/services/apps/alcs/src/alcs/comment/mention/comment-mention.entity.ts +++ b/services/apps/alcs/src/alcs/comment/mention/comment-mention.entity.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { Column, Entity, ManyToOne } from 'typeorm'; import { Base } from '../../../common/entities/base.entity'; import { User } from '../../../user/user.entity'; diff --git a/services/apps/alcs/src/alcs/commissioner/commissioner.controller.spec.ts b/services/apps/alcs/src/alcs/commissioner/commissioner.controller.spec.ts index b3d7e137ae..47b891e83a 100644 --- a/services/apps/alcs/src/alcs/commissioner/commissioner.controller.spec.ts +++ b/services/apps/alcs/src/alcs/commissioner/commissioner.controller.spec.ts @@ -1,5 +1,5 @@ -import { classes } from '@automapper/classes'; -import { AutomapperModule } from '@automapper/nestjs'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { ClsService } from 'nestjs-cls'; diff --git a/services/apps/alcs/src/alcs/commissioner/commissioner.controller.ts b/services/apps/alcs/src/alcs/commissioner/commissioner.controller.ts index 904fe15caf..825c5a8238 100644 --- a/services/apps/alcs/src/alcs/commissioner/commissioner.controller.ts +++ b/services/apps/alcs/src/alcs/commissioner/commissioner.controller.ts @@ -1,5 +1,5 @@ -import { Mapper } from '@automapper/core'; -import { InjectMapper } from '@automapper/nestjs'; +import { Mapper } from 'automapper-core'; +import { InjectMapper } from 'automapper-nestjs'; import { Controller, Get, Param, UseGuards } from '@nestjs/common'; import { ApiOAuth2 } from '@nestjs/swagger'; import * as config from 'config'; diff --git a/services/apps/alcs/src/alcs/commissioner/commissioner.dto.ts b/services/apps/alcs/src/alcs/commissioner/commissioner.dto.ts index 5ca3594a2c..bc900846b4 100644 --- a/services/apps/alcs/src/alcs/commissioner/commissioner.dto.ts +++ b/services/apps/alcs/src/alcs/commissioner/commissioner.dto.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { LocalGovernmentDto } from '../local-government/local-government.dto'; import { ApplicationRegionDto } from '../code/application-code/application-region/application-region.dto'; import { ApplicationTypeDto } from '../code/application-code/application-type/application-type.dto'; diff --git a/services/apps/alcs/src/alcs/covenant/covenant.dto.ts b/services/apps/alcs/src/alcs/covenant/covenant.dto.ts index d379c8d120..a2ff6f7272 100644 --- a/services/apps/alcs/src/alcs/covenant/covenant.dto.ts +++ b/services/apps/alcs/src/alcs/covenant/covenant.dto.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { IsNotEmpty, IsString } from 'class-validator'; import { LocalGovernmentDto } from '../local-government/local-government.dto'; import { CardDto } from '../card/card.dto'; diff --git a/services/apps/alcs/src/alcs/covenant/covenant.service.spec.ts b/services/apps/alcs/src/alcs/covenant/covenant.service.spec.ts index ebad4d63e1..a35f61d3d6 100644 --- a/services/apps/alcs/src/alcs/covenant/covenant.service.spec.ts +++ b/services/apps/alcs/src/alcs/covenant/covenant.service.spec.ts @@ -1,5 +1,5 @@ -import { classes } from '@automapper/classes'; -import { AutomapperModule } from '@automapper/nestjs'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; diff --git a/services/apps/alcs/src/alcs/covenant/covenant.service.ts b/services/apps/alcs/src/alcs/covenant/covenant.service.ts index c19167d1ce..6c19acf1e0 100644 --- a/services/apps/alcs/src/alcs/covenant/covenant.service.ts +++ b/services/apps/alcs/src/alcs/covenant/covenant.service.ts @@ -1,6 +1,6 @@ import { ServiceNotFoundException } from '@app/common/exceptions/base.exception'; -import { Mapper } from '@automapper/core'; -import { InjectMapper } from '@automapper/nestjs'; +import { Mapper } from 'automapper-core'; +import { InjectMapper } from 'automapper-nestjs'; import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { diff --git a/services/apps/alcs/src/alcs/home/home.controller.spec.ts b/services/apps/alcs/src/alcs/home/home.controller.spec.ts index 72670ba779..bcfe975b22 100644 --- a/services/apps/alcs/src/alcs/home/home.controller.spec.ts +++ b/services/apps/alcs/src/alcs/home/home.controller.spec.ts @@ -1,5 +1,5 @@ -import { classes } from '@automapper/classes'; -import { AutomapperModule } from '@automapper/nestjs'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { ClsService } from 'nestjs-cls'; diff --git a/services/apps/alcs/src/alcs/home/home.controller.ts b/services/apps/alcs/src/alcs/home/home.controller.ts index 234e8a9b5c..cdc1197bfc 100644 --- a/services/apps/alcs/src/alcs/home/home.controller.ts +++ b/services/apps/alcs/src/alcs/home/home.controller.ts @@ -1,5 +1,5 @@ -import { Mapper } from '@automapper/core'; -import { InjectMapper } from '@automapper/nestjs'; +import { Mapper } from 'automapper-core'; +import { InjectMapper } from 'automapper-nestjs'; import { Controller, Get, Param, Req, UseGuards } from '@nestjs/common'; import { ApiOAuth2 } from '@nestjs/swagger'; import * as config from 'config'; @@ -86,49 +86,40 @@ export class HomeController { }; if (userId) { - const applications = await this.applicationService.getMany( - assignedFindOptions, - ); - const reconsiderations = await this.reconsiderationService.getBy( - assignedFindOptions, - ); + const applications = + await this.applicationService.getMany(assignedFindOptions); + const reconsiderations = + await this.reconsiderationService.getBy(assignedFindOptions); - const planningReviews = await this.planningReviewService.getBy( - assignedFindOptions, - ); + const planningReviews = + await this.planningReviewService.getBy(assignedFindOptions); - const modifications = await this.modificationService.getBy( - assignedFindOptions, - ); + const modifications = + await this.modificationService.getBy(assignedFindOptions); const covenants = await this.covenantService.getBy(assignedFindOptions); - const noticeOfIntents = await this.noticeOfIntentService.getBy( - assignedFindOptions, - ); + const noticeOfIntents = + await this.noticeOfIntentService.getBy(assignedFindOptions); const noticeOfIntentModifications = await this.noticeOfIntentModificationService.getBy(assignedFindOptions); - const notifications = await this.notificationService.getBy( - assignedFindOptions, - ); + const notifications = + await this.notificationService.getBy(assignedFindOptions); const result = { - noticeOfIntents: await this.noticeOfIntentService.mapToDtos( - noticeOfIntents, - ), + noticeOfIntents: + await this.noticeOfIntentService.mapToDtos(noticeOfIntents), noticeOfIntentModifications: await this.noticeOfIntentModificationService.mapToDtos( noticeOfIntentModifications, ), applications: await this.applicationService.mapToDtos(applications), - reconsiderations: await this.reconsiderationService.mapToDtos( - reconsiderations, - ), - planningReviews: await this.planningReviewService.mapToDtos( - planningReviews, - ), + reconsiderations: + await this.reconsiderationService.mapToDtos(reconsiderations), + planningReviews: + await this.planningReviewService.mapToDtos(planningReviews), modifications: await this.modificationService.mapToDtos(modifications), covenants: await this.covenantService.mapToDtos(covenants), notifications: await this.notificationService.mapToDtos(notifications), @@ -246,9 +237,8 @@ export class HomeController { } private async mapApplicationsToDtos(applications: Application[]) { - const applicationTimes = await this.timeService.fetchActiveTimes( - applications, - ); + const applicationTimes = + await this.timeService.fetchActiveTimes(applications); const appPausedMap = await this.timeService.getPausedStatus(applications); const result: HomepageSubtaskDTO[] = []; diff --git a/services/apps/alcs/src/alcs/local-government/local-government.controller.spec.ts b/services/apps/alcs/src/alcs/local-government/local-government.controller.spec.ts index 33d5d787b8..69aaec7e3e 100644 --- a/services/apps/alcs/src/alcs/local-government/local-government.controller.spec.ts +++ b/services/apps/alcs/src/alcs/local-government/local-government.controller.spec.ts @@ -1,5 +1,5 @@ -import { classes } from '@automapper/classes'; -import { AutomapperModule } from '@automapper/nestjs'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { ClsService } from 'nestjs-cls'; diff --git a/services/apps/alcs/src/alcs/local-government/local-government.entity.ts b/services/apps/alcs/src/alcs/local-government/local-government.entity.ts index 11f31377f0..83b21bb024 100644 --- a/services/apps/alcs/src/alcs/local-government/local-government.entity.ts +++ b/services/apps/alcs/src/alcs/local-government/local-government.entity.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { Column, Entity, ManyToOne } from 'typeorm'; import { Base } from '../../common/entities/base.entity'; import { ApplicationRegion } from '../code/application-code/application-region/application-region.entity'; diff --git a/services/apps/alcs/src/alcs/message/message.controller.spec.ts b/services/apps/alcs/src/alcs/message/message.controller.spec.ts index 6d38e5b12c..c1c93631e5 100644 --- a/services/apps/alcs/src/alcs/message/message.controller.spec.ts +++ b/services/apps/alcs/src/alcs/message/message.controller.spec.ts @@ -1,5 +1,5 @@ -import { classes } from '@automapper/classes'; -import { AutomapperModule } from '@automapper/nestjs'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { ClsService } from 'nestjs-cls'; diff --git a/services/apps/alcs/src/alcs/message/message.controller.ts b/services/apps/alcs/src/alcs/message/message.controller.ts index 7ad91b30ee..6d9f8e8453 100644 --- a/services/apps/alcs/src/alcs/message/message.controller.ts +++ b/services/apps/alcs/src/alcs/message/message.controller.ts @@ -1,5 +1,5 @@ -import { Mapper } from '@automapper/core'; -import { InjectMapper } from '@automapper/nestjs'; +import { Mapper } from 'automapper-core'; +import { InjectMapper } from 'automapper-nestjs'; import { Controller, Get, diff --git a/services/apps/alcs/src/alcs/message/message.entity.ts b/services/apps/alcs/src/alcs/message/message.entity.ts index 98b5978724..a18c9fee28 100644 --- a/services/apps/alcs/src/alcs/message/message.entity.ts +++ b/services/apps/alcs/src/alcs/message/message.entity.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { Column, CreateDateColumn, diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-component/notice-of-intent-decision-component.controller.spec.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-component/notice-of-intent-decision-component.controller.spec.ts index 6418968627..4b1b8ffba7 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-component/notice-of-intent-decision-component.controller.spec.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-component/notice-of-intent-decision-component.controller.spec.ts @@ -1,5 +1,5 @@ -import { classes } from '@automapper/classes'; -import { AutomapperModule } from '@automapper/nestjs'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { ClsService } from 'nestjs-cls'; diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-component/notice-of-intent-decision-component.controller.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-component/notice-of-intent-decision-component.controller.ts index cbc8b7cf6d..19be678194 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-component/notice-of-intent-decision-component.controller.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-component/notice-of-intent-decision-component.controller.ts @@ -1,5 +1,5 @@ -import { Mapper } from '@automapper/core'; -import { InjectMapper } from '@automapper/nestjs'; +import { Mapper } from 'automapper-core'; +import { InjectMapper } from 'automapper-nestjs'; import { Body, Controller, Param, Patch } from '@nestjs/common'; import { ANY_AUTH_ROLE } from '../../../common/authorization/roles'; import { UserRoles } from '../../../common/authorization/roles.decorator'; diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-component/notice-of-intent-decision-component.dto.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-component/notice-of-intent-decision-component.dto.ts index ba8731d595..55b3233295 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-component/notice-of-intent-decision-component.dto.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-component/notice-of-intent-decision-component.dto.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { IsNumber, IsOptional, IsString } from 'class-validator'; import { BaseCodeDto } from '../../../common/dtos/base.dto'; diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-component/notice-of-intent-decision-component.entity.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-component/notice-of-intent-decision-component.entity.ts index 0bc4f228ca..2788f1d2f9 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-component/notice-of-intent-decision-component.entity.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-component/notice-of-intent-decision-component.entity.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { Column, Entity, Index, ManyToMany, ManyToOne } from 'typeorm'; import { Base } from '../../../common/entities/base.entity'; import { ColumnNumericTransformer } from '../../../utils/column-numeric-transform'; diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-condition/notice-of-intent-decision-condition.controller.spec.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-condition/notice-of-intent-decision-condition.controller.spec.ts index 338b655f1f..38dc41a574 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-condition/notice-of-intent-decision-condition.controller.spec.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-condition/notice-of-intent-decision-condition.controller.spec.ts @@ -1,5 +1,5 @@ -import { classes } from '@automapper/classes'; -import { AutomapperModule } from '@automapper/nestjs'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { ClsService } from 'nestjs-cls'; diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-condition/notice-of-intent-decision-condition.controller.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-condition/notice-of-intent-decision-condition.controller.ts index e2830c7b33..4b1cdf7787 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-condition/notice-of-intent-decision-condition.controller.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-condition/notice-of-intent-decision-condition.controller.ts @@ -1,5 +1,5 @@ -import { Mapper } from '@automapper/core'; -import { InjectMapper } from '@automapper/nestjs'; +import { Mapper } from 'automapper-core'; +import { InjectMapper } from 'automapper-nestjs'; import { Body, Controller, Param, Patch, UseGuards } from '@nestjs/common'; import { ApiOAuth2 } from '@nestjs/swagger'; import * as config from 'config'; diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-condition/notice-of-intent-decision-condition.dto.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-condition/notice-of-intent-decision-condition.dto.ts index 1cd1db72f5..424c04f52b 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-condition/notice-of-intent-decision-condition.dto.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-condition/notice-of-intent-decision-condition.dto.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { IsArray, IsBoolean, diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-condition/notice-of-intent-decision-condition.entity.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-condition/notice-of-intent-decision-condition.entity.ts index b40b90bf3e..565f71cc33 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-condition/notice-of-intent-decision-condition.entity.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-condition/notice-of-intent-decision-condition.entity.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { Column, Entity, JoinTable, ManyToMany, ManyToOne } from 'typeorm'; import { Base } from '../../../common/entities/base.entity'; import { ColumnNumericTransformer } from '../../../utils/column-numeric-transform'; diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-document/notice-of-intent-decision-document.entity.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-document/notice-of-intent-decision-document.entity.ts index e898845cc8..39601a4016 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-document/notice-of-intent-decision-document.entity.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-document/notice-of-intent-decision-document.entity.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { Column, Entity, diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v1/notice-of-intent-decision-v1.controller.spec.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v1/notice-of-intent-decision-v1.controller.spec.ts index 45398bf98a..9fa7529397 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v1/notice-of-intent-decision-v1.controller.spec.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v1/notice-of-intent-decision-v1.controller.spec.ts @@ -1,5 +1,5 @@ -import { classes } from '@automapper/classes'; -import { AutomapperModule } from '@automapper/nestjs'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { ClsService } from 'nestjs-cls'; diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v1/notice-of-intent-decision-v1.controller.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v1/notice-of-intent-decision-v1.controller.ts index 9b6f3e826d..28bfd13cd1 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v1/notice-of-intent-decision-v1.controller.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v1/notice-of-intent-decision-v1.controller.ts @@ -1,5 +1,5 @@ -import { Mapper } from '@automapper/core'; -import { InjectMapper } from '@automapper/nestjs'; +import { Mapper } from 'automapper-core'; +import { InjectMapper } from 'automapper-nestjs'; import { BadRequestException, Body, @@ -45,9 +45,8 @@ export class NoticeOfIntentDecisionV1Controller { async getByFileNumber( @Param('fileNumber') fileNumber, ): Promise<NoticeOfIntentDecisionDto[]> { - const decisions = await this.noticeOfIntentDecisionService.getByFileNumber( - fileNumber, - ); + const decisions = + await this.noticeOfIntentDecisionService.getByFileNumber(fileNumber); return await this.mapper.mapArrayAsync( decisions, NoticeOfIntentDecision, @@ -141,9 +140,8 @@ export class NoticeOfIntentDecisionV1Controller { @Param('uuid') decisionUuid: string, @Param('fileUuid') documentUuid: string, ) { - const downloadUrl = await this.noticeOfIntentDecisionService.getDownloadUrl( - documentUuid, - ); + const downloadUrl = + await this.noticeOfIntentDecisionService.getDownloadUrl(documentUuid); return { url: downloadUrl, }; diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v1/notice-of-intent-decision-v1.service.spec.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v1/notice-of-intent-decision-v1.service.spec.ts index d76567da3f..12c0cd6d07 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v1/notice-of-intent-decision-v1.service.spec.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v1/notice-of-intent-decision-v1.service.spec.ts @@ -2,8 +2,8 @@ import { ServiceNotFoundException, ServiceValidationException, } from '@app/common/exceptions/base.exception'; -import { classes } from '@automapper/classes'; -import { AutomapperModule } from '@automapper/nestjs'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.controller.spec.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.controller.spec.ts index 6d038e0a59..684889c5f7 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.controller.spec.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.controller.spec.ts @@ -1,5 +1,5 @@ -import { classes } from '@automapper/classes'; -import { AutomapperModule } from '@automapper/nestjs'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { ClsService } from 'nestjs-cls'; diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.controller.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.controller.ts index 2a2011266a..292976820e 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.controller.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.controller.ts @@ -1,5 +1,5 @@ -import { Mapper } from '@automapper/core'; -import { InjectMapper } from '@automapper/nestjs'; +import { Mapper } from 'automapper-core'; +import { InjectMapper } from 'automapper-nestjs'; import { BadRequestException, Body, diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.service.spec.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.service.spec.ts index e56330cab1..81ff57005f 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.service.spec.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.service.spec.ts @@ -2,8 +2,8 @@ import { ServiceNotFoundException, ServiceValidationException, } from '@app/common/exceptions/base.exception'; -import { classes } from '@automapper/classes'; -import { AutomapperModule } from '@automapper/nestjs'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.dto.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.dto.ts index e4aa06464d..31f7864203 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.dto.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.dto.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { IsArray, IsBoolean, diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.entity.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.entity.ts index 1bfcd38aa1..81937ab487 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.entity.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.entity.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { Column, CreateDateColumn, diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-modification/notice-of-intent-modification.controller.spec.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-modification/notice-of-intent-modification.controller.spec.ts index 0a730aaf3b..789c27e3bd 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-modification/notice-of-intent-modification.controller.spec.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-modification/notice-of-intent-modification.controller.spec.ts @@ -1,5 +1,5 @@ -import { classes } from '@automapper/classes'; -import { AutomapperModule } from '@automapper/nestjs'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { ClsService } from 'nestjs-cls'; diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-modification/notice-of-intent-modification.entity.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-modification/notice-of-intent-modification.entity.ts index 865d9288c8..1b6c463b4a 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-modification/notice-of-intent-modification.entity.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-modification/notice-of-intent-modification.entity.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { Type } from 'class-transformer'; import { Column, diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-modification/notice-of-intent-modification.service.spec.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-modification/notice-of-intent-modification.service.spec.ts index 1010972975..206c1f8fa5 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-modification/notice-of-intent-modification.service.spec.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-modification/notice-of-intent-modification.service.spec.ts @@ -1,6 +1,6 @@ import { ServiceNotFoundException } from '@app/common/exceptions/base.exception'; -import { classes } from '@automapper/classes'; -import { AutomapperModule } from '@automapper/nestjs'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-modification/notice-of-intent-modification.service.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-modification/notice-of-intent-modification.service.ts index b466e8185c..39eb816959 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-modification/notice-of-intent-modification.service.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-modification/notice-of-intent-modification.service.ts @@ -1,6 +1,6 @@ import { ServiceNotFoundException } from '@app/common/exceptions/base.exception'; -import { Mapper } from '@automapper/core'; -import { InjectMapper } from '@automapper/nestjs'; +import { Mapper } from 'automapper-core'; +import { InjectMapper } from 'automapper-nestjs'; import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { @@ -126,9 +126,8 @@ export class NoticeOfIntentModificationService { createDto.modifiesDecisionUuids, ); - const mockModifications = await this.modificationRepository.save( - modification, - ); + const mockModifications = + await this.modificationRepository.save(modification); return this.getByUuid(mockModifications.uuid); } diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.controller.spec.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.controller.spec.ts index 9a6fdfcc3e..8a57ec6c35 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.controller.spec.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.controller.spec.ts @@ -1,5 +1,5 @@ -import { classes } from '@automapper/classes'; -import { AutomapperModule } from '@automapper/nestjs'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { BadRequestException } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.controller.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.controller.ts index e1101d05e0..4508f10e95 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.controller.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.controller.ts @@ -1,5 +1,5 @@ -import { Mapper } from '@automapper/core'; -import { InjectMapper } from '@automapper/nestjs'; +import { Mapper } from 'automapper-core'; +import { InjectMapper } from 'automapper-nestjs'; import { BadRequestException, Controller, @@ -215,9 +215,8 @@ export class NoticeOfIntentDocumentController { @UserRoles(...ANY_AUTH_ROLE) async download(@Param('uuid') fileUuid: string) { const document = await this.noticeOfIntentDocumentService.get(fileUuid); - const url = await this.noticeOfIntentDocumentService.getDownloadUrl( - document, - ); + const url = + await this.noticeOfIntentDocumentService.getDownloadUrl(document); return { url, }; diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.dto.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.dto.ts index be125f404c..bf1fa6f3d6 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.dto.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.dto.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { DocumentTypeDto } from '../../../document/document.dto'; export class NoticeOfIntentDocumentDto { diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.entity.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.entity.ts index 36984f5f3d..2cdb7db666 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.entity.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.entity.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { BaseEntity, Column, diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-meeting/notice-of-intent-meeting.controller.spec.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-meeting/notice-of-intent-meeting.controller.spec.ts index d06047a6fc..ca534e8a1f 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-meeting/notice-of-intent-meeting.controller.spec.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-meeting/notice-of-intent-meeting.controller.spec.ts @@ -1,5 +1,5 @@ -import { classes } from '@automapper/classes'; -import { AutomapperModule } from '@automapper/nestjs'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { ClsService } from 'nestjs-cls'; diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-meeting/notice-of-intent-meeting.controller.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-meeting/notice-of-intent-meeting.controller.ts index 6c82c8202a..6f96e889df 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-meeting/notice-of-intent-meeting.controller.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-meeting/notice-of-intent-meeting.controller.ts @@ -1,5 +1,5 @@ -import { Mapper } from '@automapper/core'; -import { InjectMapper } from '@automapper/nestjs'; +import { Mapper } from 'automapper-core'; +import { InjectMapper } from 'automapper-nestjs'; import { Body, Controller, diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-meeting/notice-of-intent-meeting.dto.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-meeting/notice-of-intent-meeting.dto.ts index df0e621a7c..c499426e9f 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-meeting/notice-of-intent-meeting.dto.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-meeting/notice-of-intent-meeting.dto.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { IsNumber, IsOptional, IsString } from 'class-validator'; import { BaseCodeDto } from '../../../common/dtos/base.dto'; diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-meeting/notice-of-intent-meeting.entity.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-meeting/notice-of-intent-meeting.entity.ts index d7520c09dd..e13c050e2c 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-meeting/notice-of-intent-meeting.entity.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-meeting/notice-of-intent-meeting.entity.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { Column, Entity, ManyToOne } from 'typeorm'; import { Base } from '../../../common/entities/base.entity'; import { NoticeOfIntent } from '../notice-of-intent.entity'; diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-parcel/notice-of-intent-parcel.controller.spec.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-parcel/notice-of-intent-parcel.controller.spec.ts index 0ab1923602..1a96e0ec1b 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-parcel/notice-of-intent-parcel.controller.spec.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-parcel/notice-of-intent-parcel.controller.spec.ts @@ -1,5 +1,5 @@ -import { classes } from '@automapper/classes'; -import { AutomapperModule } from '@automapper/nestjs'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { ClsService } from 'nestjs-cls'; diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-parcel/notice-of-intent-parcel.controller.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-parcel/notice-of-intent-parcel.controller.ts index 763c149158..01f19fad3d 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-parcel/notice-of-intent-parcel.controller.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-parcel/notice-of-intent-parcel.controller.ts @@ -1,5 +1,5 @@ -import { Mapper } from '@automapper/core'; -import { InjectMapper } from '@automapper/nestjs'; +import { Mapper } from 'automapper-core'; +import { InjectMapper } from 'automapper-nestjs'; import { Body, Controller, Get, Param, Post, Req } from '@nestjs/common'; import { ANY_AUTH_ROLE } from '../../../common/authorization/roles'; import { UserRoles } from '../../../common/authorization/roles.decorator'; @@ -17,9 +17,8 @@ export class NoticeOfIntentParcelController { @UserRoles(...ANY_AUTH_ROLE) @Get('/:fileNumber') async get(@Param('fileNumber') fileNumber: string) { - const parcels = await this.applicationParcelService.fetchByFileId( - fileNumber, - ); + const parcels = + await this.applicationParcelService.fetchByFileId(fileNumber); return this.mapper.mapArray( parcels, diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status-type.entity.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status-type.entity.ts index 293016a4d0..533ca6018b 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status-type.entity.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status-type.entity.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { Column, Entity, OneToMany } from 'typeorm'; import { BaseCodeEntity } from '../../../common/entities/base.code.entity'; import { NoticeOfIntentSubmissionToSubmissionStatus } from './notice-of-intent-status.entity'; diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status.dto.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status.dto.ts index 9d19f5a948..bf06237ede 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status.dto.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status.dto.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { BaseCodeDto } from '../../../common/dtos/base.dto'; export enum NOI_SUBMISSION_STATUS { diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status.entity.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status.entity.ts index eb9c822590..87bd00dcbf 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status.entity.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status.entity.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { BaseEntity, Column, diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.controller.spec.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.controller.spec.ts index e8b908a840..25e19d0e84 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.controller.spec.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.controller.spec.ts @@ -1,5 +1,5 @@ -import { classes } from '@automapper/classes'; -import { AutomapperModule } from '@automapper/nestjs'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { ClsService } from 'nestjs-cls'; @@ -83,9 +83,8 @@ describe('NoticeOfIntentSubmissionStatusController', () => { new NoticeOfIntentSubmissionToSubmissionStatus(), ); - const result = await controller.getCurrentStatusByFileNumber( - fakeFileNumber, - ); + const result = + await controller.getCurrentStatusByFileNumber(fakeFileNumber); expect( mockNoticeOfIntentSubmissionStatusService.getCurrentStatusByFileNumber, diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.controller.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.controller.ts index 6ad45643f4..f19f9f3b6a 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.controller.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.controller.ts @@ -1,5 +1,5 @@ -import { Mapper } from '@automapper/core'; -import { InjectMapper } from '@automapper/nestjs'; +import { Mapper } from 'automapper-core'; +import { InjectMapper } from 'automapper-nestjs'; import { Controller, Get, Param } from '@nestjs/common'; import { ANY_AUTH_ROLE } from '../../../common/authorization/roles'; import { UserRoles } from '../../../common/authorization/roles.decorator'; diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts index 2e992ca778..17c07e16a8 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts @@ -1,5 +1,5 @@ -import { classes } from '@automapper/classes'; -import { AutomapperModule } from '@automapper/nestjs'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission/notice-of-intent-submission.service.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission/notice-of-intent-submission.service.ts index cfba2fb325..cc58c34c96 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission/notice-of-intent-submission.service.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission/notice-of-intent-submission.service.ts @@ -1,5 +1,5 @@ -import { Mapper } from '@automapper/core'; -import { InjectMapper } from '@automapper/nestjs'; +import { Mapper } from 'automapper-core'; +import { InjectMapper } from 'automapper-nestjs'; import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-type/notice-of-intent-type.dto.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-type/notice-of-intent-type.dto.ts index ee97b9c460..7c3227bde4 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-type/notice-of-intent-type.dto.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-type/notice-of-intent-type.dto.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { BaseCodeDto } from '../../../common/dtos/base.dto'; export class NoticeOfIntentTypeDto extends BaseCodeDto { diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-type/notice-of-intent-type.entity.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-type/notice-of-intent-type.entity.ts index a707e20281..ab5b07cb9d 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-type/notice-of-intent-type.entity.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-type/notice-of-intent-type.entity.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { Column, Entity } from 'typeorm'; import { BaseCodeEntity } from '../../../common/entities/base.code.entity'; diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.controller.spec.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.controller.spec.ts index 3287c9cf00..1b8ec920fd 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.controller.spec.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.controller.spec.ts @@ -1,5 +1,5 @@ -import { classes } from '@automapper/classes'; -import { AutomapperModule } from '@automapper/nestjs'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { ClsService } from 'nestjs-cls'; diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.controller.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.controller.ts index 116f223ec2..b80102d804 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.controller.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.controller.ts @@ -1,5 +1,5 @@ -import { Mapper } from '@automapper/core'; -import { InjectMapper } from '@automapper/nestjs'; +import { Mapper } from 'automapper-core'; +import { InjectMapper } from 'automapper-nestjs'; import { Body, Controller, Get, Param, Post, UseGuards } from '@nestjs/common'; import { ApiOAuth2 } from '@nestjs/swagger'; import * as config from 'config'; @@ -35,9 +35,8 @@ export class NoticeOfIntentController { @Get('/:fileNumber') @UserRoles(...ROLES_ALLOWED_BOARDS) async get(@Param('fileNumber') fileNumber: string) { - const noticeOfIntent = await this.noticeOfIntentService.getByFileNumber( - fileNumber, - ); + const noticeOfIntent = + await this.noticeOfIntentService.getByFileNumber(fileNumber); const mapped = await this.noticeOfIntentService.mapToDtos([noticeOfIntent]); return mapped[0]; } @@ -116,9 +115,8 @@ export class NoticeOfIntentController { @Get('/search/:fileNumber') @UserRoles(...ROLES_ALLOWED_APPLICATIONS) async search(@Param('fileNumber') fileNumber: string) { - const noticeOfIntents = await this.noticeOfIntentService.searchByFileNumber( - fileNumber, - ); + const noticeOfIntents = + await this.noticeOfIntentService.searchByFileNumber(fileNumber); return this.noticeOfIntentService.mapToDtos(noticeOfIntents); } } diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.dto.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.dto.ts index 6f0b689c30..513d2af76d 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.dto.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.dto.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { IsArray, IsBoolean, diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.entity.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.entity.ts index 8f45386add..1bf1a402f2 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.entity.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.entity.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { Type } from 'class-transformer'; import { Column, diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.spec.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.spec.ts index 7618a9baf0..33b166603e 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.spec.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.spec.ts @@ -1,5 +1,5 @@ -import { classes } from '@automapper/classes'; -import { AutomapperModule } from '@automapper/nestjs'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.ts index 44740de2b9..3cb2b8d98e 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.ts @@ -2,8 +2,8 @@ import { ServiceNotFoundException, ServiceValidationException, } from '@app/common/exceptions/base.exception'; -import { Mapper } from '@automapper/core'; -import { InjectMapper } from '@automapper/nestjs'; +import { Mapper } from 'automapper-core'; +import { InjectMapper } from 'automapper-nestjs'; import { Injectable, Logger } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { diff --git a/services/apps/alcs/src/alcs/notification/notification-document/notification-document.controller.spec.ts b/services/apps/alcs/src/alcs/notification/notification-document/notification-document.controller.spec.ts index 2636b080f8..fefe5dd46b 100644 --- a/services/apps/alcs/src/alcs/notification/notification-document/notification-document.controller.spec.ts +++ b/services/apps/alcs/src/alcs/notification/notification-document/notification-document.controller.spec.ts @@ -1,5 +1,5 @@ -import { classes } from '@automapper/classes'; -import { AutomapperModule } from '@automapper/nestjs'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { BadRequestException } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; diff --git a/services/apps/alcs/src/alcs/notification/notification-document/notification-document.controller.ts b/services/apps/alcs/src/alcs/notification/notification-document/notification-document.controller.ts index 1438b948f0..5795d534d6 100644 --- a/services/apps/alcs/src/alcs/notification/notification-document/notification-document.controller.ts +++ b/services/apps/alcs/src/alcs/notification/notification-document/notification-document.controller.ts @@ -1,5 +1,5 @@ -import { Mapper } from '@automapper/core'; -import { InjectMapper } from '@automapper/nestjs'; +import { Mapper } from 'automapper-core'; +import { InjectMapper } from 'automapper-nestjs'; import { BadRequestException, Controller, diff --git a/services/apps/alcs/src/alcs/notification/notification-document/notification-document.dto.ts b/services/apps/alcs/src/alcs/notification/notification-document/notification-document.dto.ts index 0ac94d8e01..61d0045946 100644 --- a/services/apps/alcs/src/alcs/notification/notification-document/notification-document.dto.ts +++ b/services/apps/alcs/src/alcs/notification/notification-document/notification-document.dto.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { DocumentTypeDto } from '../../../document/document.dto'; export class NotificationDocumentDto { diff --git a/services/apps/alcs/src/alcs/notification/notification-document/notification-document.entity.ts b/services/apps/alcs/src/alcs/notification/notification-document/notification-document.entity.ts index 22756af305..087c56a4f2 100644 --- a/services/apps/alcs/src/alcs/notification/notification-document/notification-document.entity.ts +++ b/services/apps/alcs/src/alcs/notification/notification-document/notification-document.entity.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { BaseEntity, Column, diff --git a/services/apps/alcs/src/alcs/notification/notification-parcel/notification-parcel.controller.spec.ts b/services/apps/alcs/src/alcs/notification/notification-parcel/notification-parcel.controller.spec.ts index e8f8e46dff..5f1b56df2e 100644 --- a/services/apps/alcs/src/alcs/notification/notification-parcel/notification-parcel.controller.spec.ts +++ b/services/apps/alcs/src/alcs/notification/notification-parcel/notification-parcel.controller.spec.ts @@ -1,5 +1,5 @@ -import { classes } from '@automapper/classes'; -import { AutomapperModule } from '@automapper/nestjs'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { ClsService } from 'nestjs-cls'; diff --git a/services/apps/alcs/src/alcs/notification/notification-parcel/notification-parcel.controller.ts b/services/apps/alcs/src/alcs/notification/notification-parcel/notification-parcel.controller.ts index f66ab48722..b36660f384 100644 --- a/services/apps/alcs/src/alcs/notification/notification-parcel/notification-parcel.controller.ts +++ b/services/apps/alcs/src/alcs/notification/notification-parcel/notification-parcel.controller.ts @@ -1,5 +1,5 @@ -import { Mapper } from '@automapper/core'; -import { InjectMapper } from '@automapper/nestjs'; +import { Mapper } from 'automapper-core'; +import { InjectMapper } from 'automapper-nestjs'; import { Controller, Get, Param } from '@nestjs/common'; import { ANY_AUTH_ROLE } from '../../../common/authorization/roles'; import { UserRoles } from '../../../common/authorization/roles.decorator'; @@ -17,9 +17,8 @@ export class NotificationParcelController { @UserRoles(...ANY_AUTH_ROLE) @Get('/:fileNumber') async get(@Param('fileNumber') fileNumber: string) { - const parcels = await this.notificationParcelService.fetchByFileId( - fileNumber, - ); + const parcels = + await this.notificationParcelService.fetchByFileId(fileNumber); return this.mapper.mapArray( parcels, diff --git a/services/apps/alcs/src/alcs/notification/notification-submission-status/notification-status-type.entity.ts b/services/apps/alcs/src/alcs/notification/notification-submission-status/notification-status-type.entity.ts index dea2524aa9..b713164001 100644 --- a/services/apps/alcs/src/alcs/notification/notification-submission-status/notification-status-type.entity.ts +++ b/services/apps/alcs/src/alcs/notification/notification-submission-status/notification-status-type.entity.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { Column, Entity, OneToMany } from 'typeorm'; import { BaseCodeEntity } from '../../../common/entities/base.code.entity'; import { NotificationSubmissionToSubmissionStatus } from './notification-status.entity'; diff --git a/services/apps/alcs/src/alcs/notification/notification-submission-status/notification-status.dto.ts b/services/apps/alcs/src/alcs/notification/notification-submission-status/notification-status.dto.ts index 79a2b17821..2dbe0b6b12 100644 --- a/services/apps/alcs/src/alcs/notification/notification-submission-status/notification-status.dto.ts +++ b/services/apps/alcs/src/alcs/notification/notification-submission-status/notification-status.dto.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { BaseCodeDto } from '../../../common/dtos/base.dto'; export enum NOTIFICATION_STATUS { diff --git a/services/apps/alcs/src/alcs/notification/notification-submission-status/notification-status.entity.ts b/services/apps/alcs/src/alcs/notification/notification-submission-status/notification-status.entity.ts index b21e291e41..006d8af6ad 100644 --- a/services/apps/alcs/src/alcs/notification/notification-submission-status/notification-status.entity.ts +++ b/services/apps/alcs/src/alcs/notification/notification-submission-status/notification-status.entity.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { BaseEntity, Column, diff --git a/services/apps/alcs/src/alcs/notification/notification-submission-status/notification-submission-status.controller.spec.ts b/services/apps/alcs/src/alcs/notification/notification-submission-status/notification-submission-status.controller.spec.ts index c066f98dfa..4cd4079fb1 100644 --- a/services/apps/alcs/src/alcs/notification/notification-submission-status/notification-submission-status.controller.spec.ts +++ b/services/apps/alcs/src/alcs/notification/notification-submission-status/notification-submission-status.controller.spec.ts @@ -1,5 +1,5 @@ -import { classes } from '@automapper/classes'; -import { AutomapperModule } from '@automapper/nestjs'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { ClsService } from 'nestjs-cls'; @@ -72,9 +72,8 @@ describe('NotificationSubmissionStatusController', () => { new NotificationSubmissionToSubmissionStatus(), ); - const result = await controller.getCurrentStatusByFileNumber( - fakeFileNumber, - ); + const result = + await controller.getCurrentStatusByFileNumber(fakeFileNumber); expect( mockNoticeOfIntentSubmissionStatusService.getCurrentStatusByFileNumber, diff --git a/services/apps/alcs/src/alcs/notification/notification-submission-status/notification-submission-status.controller.ts b/services/apps/alcs/src/alcs/notification/notification-submission-status/notification-submission-status.controller.ts index c4377149a4..de7b7191b3 100644 --- a/services/apps/alcs/src/alcs/notification/notification-submission-status/notification-submission-status.controller.ts +++ b/services/apps/alcs/src/alcs/notification/notification-submission-status/notification-submission-status.controller.ts @@ -1,5 +1,5 @@ -import { Mapper } from '@automapper/core'; -import { InjectMapper } from '@automapper/nestjs'; +import { Mapper } from 'automapper-core'; +import { InjectMapper } from 'automapper-nestjs'; import { Controller, Get, Param } from '@nestjs/common'; import { ANY_AUTH_ROLE } from '../../../common/authorization/roles'; import { UserRoles } from '../../../common/authorization/roles.decorator'; diff --git a/services/apps/alcs/src/alcs/notification/notification-type/notification-type.dto.ts b/services/apps/alcs/src/alcs/notification/notification-type/notification-type.dto.ts index cdb075dac1..a603c95ea3 100644 --- a/services/apps/alcs/src/alcs/notification/notification-type/notification-type.dto.ts +++ b/services/apps/alcs/src/alcs/notification/notification-type/notification-type.dto.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { BaseCodeDto } from '../../../common/dtos/base.dto'; export class NotificationTypeDto extends BaseCodeDto { diff --git a/services/apps/alcs/src/alcs/notification/notification-type/notification-type.entity.ts b/services/apps/alcs/src/alcs/notification/notification-type/notification-type.entity.ts index dc59607527..cb900a170f 100644 --- a/services/apps/alcs/src/alcs/notification/notification-type/notification-type.entity.ts +++ b/services/apps/alcs/src/alcs/notification/notification-type/notification-type.entity.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { Column, Entity } from 'typeorm'; import { BaseCodeEntity } from '../../../common/entities/base.code.entity'; diff --git a/services/apps/alcs/src/alcs/notification/notification.controller.spec.ts b/services/apps/alcs/src/alcs/notification/notification.controller.spec.ts index 10ad63a5ab..b8d00590b0 100644 --- a/services/apps/alcs/src/alcs/notification/notification.controller.spec.ts +++ b/services/apps/alcs/src/alcs/notification/notification.controller.spec.ts @@ -1,5 +1,5 @@ -import { classes } from '@automapper/classes'; -import { AutomapperModule } from '@automapper/nestjs'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { ClsService } from 'nestjs-cls'; diff --git a/services/apps/alcs/src/alcs/notification/notification.controller.ts b/services/apps/alcs/src/alcs/notification/notification.controller.ts index a766965345..b5cb797479 100644 --- a/services/apps/alcs/src/alcs/notification/notification.controller.ts +++ b/services/apps/alcs/src/alcs/notification/notification.controller.ts @@ -1,6 +1,6 @@ import { ServiceNotFoundException } from '@app/common/exceptions/base.exception'; -import { Mapper } from '@automapper/core'; -import { InjectMapper } from '@automapper/nestjs'; +import { Mapper } from 'automapper-core'; +import { InjectMapper } from 'automapper-nestjs'; import { Body, Controller, @@ -41,9 +41,8 @@ export class NotificationController { @Get('/:fileNumber') @UserRoles(...ROLES_ALLOWED_BOARDS) async get(@Param('fileNumber') fileNumber: string) { - const notification = await this.notificationService.getByFileNumber( - fileNumber, - ); + const notification = + await this.notificationService.getByFileNumber(fileNumber); const mapped = await this.notificationService.mapToDtos([notification]); return mapped[0]; } @@ -138,9 +137,8 @@ export class NotificationController { @Get('/search/:fileNumber') @UserRoles(...ROLES_ALLOWED_APPLICATIONS) async search(@Param('fileNumber') fileNumber: string) { - const noticeOfIntents = await this.notificationService.searchByFileNumber( - fileNumber, - ); + const noticeOfIntents = + await this.notificationService.searchByFileNumber(fileNumber); return this.notificationService.mapToDtos(noticeOfIntents); } } diff --git a/services/apps/alcs/src/alcs/notification/notification.dto.ts b/services/apps/alcs/src/alcs/notification/notification.dto.ts index 225039ddc8..95ac6dd44a 100644 --- a/services/apps/alcs/src/alcs/notification/notification.dto.ts +++ b/services/apps/alcs/src/alcs/notification/notification.dto.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { IsNumber, IsOptional, IsString, IsUUID } from 'class-validator'; import { CardDto } from '../card/card.dto'; import { ApplicationRegionDto } from '../code/application-code/application-region/application-region.dto'; diff --git a/services/apps/alcs/src/alcs/notification/notification.entity.ts b/services/apps/alcs/src/alcs/notification/notification.entity.ts index e18e856748..f54bc9c2c6 100644 --- a/services/apps/alcs/src/alcs/notification/notification.entity.ts +++ b/services/apps/alcs/src/alcs/notification/notification.entity.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { Type } from 'class-transformer'; import { Column, diff --git a/services/apps/alcs/src/alcs/notification/notification.service.spec.ts b/services/apps/alcs/src/alcs/notification/notification.service.spec.ts index dfe1e7a84d..5b05300e6b 100644 --- a/services/apps/alcs/src/alcs/notification/notification.service.spec.ts +++ b/services/apps/alcs/src/alcs/notification/notification.service.spec.ts @@ -1,5 +1,5 @@ -import { classes } from '@automapper/classes'; -import { AutomapperModule } from '@automapper/nestjs'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; diff --git a/services/apps/alcs/src/alcs/notification/notification.service.ts b/services/apps/alcs/src/alcs/notification/notification.service.ts index bbf746c425..e07ffe3716 100644 --- a/services/apps/alcs/src/alcs/notification/notification.service.ts +++ b/services/apps/alcs/src/alcs/notification/notification.service.ts @@ -2,8 +2,8 @@ import { ServiceNotFoundException, ServiceValidationException, } from '@app/common/exceptions/base.exception'; -import { Mapper } from '@automapper/core'; -import { InjectMapper } from '@automapper/nestjs'; +import { Mapper } from 'automapper-core'; +import { InjectMapper } from 'automapper-nestjs'; import { Injectable, Logger } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { diff --git a/services/apps/alcs/src/alcs/obsolete-application-grpc/alcs-application.controller.spec.ts b/services/apps/alcs/src/alcs/obsolete-application-grpc/alcs-application.controller.spec.ts index 8501f448f4..389077628a 100644 --- a/services/apps/alcs/src/alcs/obsolete-application-grpc/alcs-application.controller.spec.ts +++ b/services/apps/alcs/src/alcs/obsolete-application-grpc/alcs-application.controller.spec.ts @@ -1,5 +1,5 @@ -import { classes } from '@automapper/classes'; -import { AutomapperModule } from '@automapper/nestjs'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { ClsService } from 'nestjs-cls'; diff --git a/services/apps/alcs/src/alcs/planning-review/planning-review.dto.ts b/services/apps/alcs/src/alcs/planning-review/planning-review.dto.ts index 43c84b96eb..1bd1e97c8f 100644 --- a/services/apps/alcs/src/alcs/planning-review/planning-review.dto.ts +++ b/services/apps/alcs/src/alcs/planning-review/planning-review.dto.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { IsNotEmpty, IsString, MaxLength } from 'class-validator'; import { LocalGovernmentDto } from '../local-government/local-government.dto'; import { CardDto } from '../card/card.dto'; diff --git a/services/apps/alcs/src/alcs/planning-review/planning-review.service.spec.ts b/services/apps/alcs/src/alcs/planning-review/planning-review.service.spec.ts index 3c3aa9c93b..6e943f743e 100644 --- a/services/apps/alcs/src/alcs/planning-review/planning-review.service.spec.ts +++ b/services/apps/alcs/src/alcs/planning-review/planning-review.service.spec.ts @@ -1,5 +1,5 @@ -import { classes } from '@automapper/classes'; -import { AutomapperModule } from '@automapper/nestjs'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; diff --git a/services/apps/alcs/src/alcs/planning-review/planning-review.service.ts b/services/apps/alcs/src/alcs/planning-review/planning-review.service.ts index a7f759c470..5813fa5c7c 100644 --- a/services/apps/alcs/src/alcs/planning-review/planning-review.service.ts +++ b/services/apps/alcs/src/alcs/planning-review/planning-review.service.ts @@ -2,8 +2,8 @@ import { ServiceNotFoundException, ServiceValidationException, } from '@app/common/exceptions/base.exception'; -import { Mapper } from '@automapper/core'; -import { InjectMapper } from '@automapper/nestjs'; +import { Mapper } from 'automapper-core'; +import { InjectMapper } from 'automapper-nestjs'; import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { diff --git a/services/apps/alcs/src/alcs/search/search.controller.spec.ts b/services/apps/alcs/src/alcs/search/search.controller.spec.ts index 107d9ca82d..77a7c80b36 100644 --- a/services/apps/alcs/src/alcs/search/search.controller.spec.ts +++ b/services/apps/alcs/src/alcs/search/search.controller.spec.ts @@ -1,5 +1,5 @@ -import { classes } from '@automapper/classes'; -import { AutomapperModule } from '@automapper/nestjs'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { ClsService } from 'nestjs-cls'; @@ -238,9 +238,8 @@ describe('SearchController', () => { fileTypes: [], }; - const result = await controller.advancedSearchNonApplications( - mockSearchRequestDto, - ); + const result = + await controller.advancedSearchNonApplications(mockSearchRequestDto); expect( mockNonApplicationsAdvancedSearchService.searchNonApplications, diff --git a/services/apps/alcs/src/alcs/search/search.controller.ts b/services/apps/alcs/src/alcs/search/search.controller.ts index 8cbc5eb50b..2c21152a45 100644 --- a/services/apps/alcs/src/alcs/search/search.controller.ts +++ b/services/apps/alcs/src/alcs/search/search.controller.ts @@ -1,5 +1,5 @@ -import { Mapper } from '@automapper/core'; -import { InjectMapper } from '@automapper/nestjs'; +import { Mapper } from 'automapper-core'; +import { InjectMapper } from 'automapper-nestjs'; import { Body, Controller, Get, Param, Post, UseGuards } from '@nestjs/common'; import { ApiOAuth2 } from '@nestjs/swagger'; import * as config from 'config'; @@ -54,9 +54,8 @@ export class SearchController { async search(@Param('searchTerm') searchTerm) { const application = await this.searchService.getApplication(searchTerm); const noi = await this.searchService.getNoi(searchTerm); - const planningReview = await this.searchService.getPlanningReview( - searchTerm, - ); + const planningReview = + await this.searchService.getPlanningReview(searchTerm); const covenant = await this.searchService.getCovenant(searchTerm); const notification = await this.searchService.getNotification(searchTerm); @@ -159,9 +158,8 @@ export class SearchController { async advancedSearchApplications( @Body() searchDto: SearchRequestDto, ): Promise<AdvancedSearchResultDto<ApplicationSearchResultDto[]>> { - const applications = await this.applicationSearchService.searchApplications( - searchDto, - ); + const applications = + await this.applicationSearchService.searchApplications(searchDto); const mappedSearchResult = this.mapAdvancedSearchResults( applications, @@ -223,9 +221,8 @@ export class SearchController { async advancedSearchNotifications( @Body() searchDto: SearchRequestDto, ): Promise<AdvancedSearchResultDto<NotificationSearchResultDto[]>> { - const notifications = await this.notificationSearchService.search( - searchDto, - ); + const notifications = + await this.notificationSearchService.search(searchDto); const mappedSearchResult = this.mapAdvancedSearchResults( null, @@ -265,7 +262,7 @@ export class SearchController { ); } - const searchNoi = (searchDto.fileTypes.length > 0 ? noiTypeSpecified : true); + const searchNoi = searchDto.fileTypes.length > 0 ? noiTypeSpecified : true; const searchNonApplications = (searchDto.fileTypes.length > 0 ? nonApplicationTypeSpecified : true) && diff --git a/services/apps/alcs/src/alcs/staff-journal/staff-journal.controller.spec.ts b/services/apps/alcs/src/alcs/staff-journal/staff-journal.controller.spec.ts index c44cf467e5..2da95cd2dc 100644 --- a/services/apps/alcs/src/alcs/staff-journal/staff-journal.controller.spec.ts +++ b/services/apps/alcs/src/alcs/staff-journal/staff-journal.controller.spec.ts @@ -1,5 +1,5 @@ -import { classes } from '@automapper/classes'; -import { AutomapperModule } from '@automapper/nestjs'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { ForbiddenException } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; diff --git a/services/apps/alcs/src/alcs/staff-journal/staff-journal.controller.ts b/services/apps/alcs/src/alcs/staff-journal/staff-journal.controller.ts index 48840ba6fd..6053726a9b 100644 --- a/services/apps/alcs/src/alcs/staff-journal/staff-journal.controller.ts +++ b/services/apps/alcs/src/alcs/staff-journal/staff-journal.controller.ts @@ -1,5 +1,5 @@ -import { Mapper } from '@automapper/core'; -import { InjectMapper } from '@automapper/nestjs'; +import { Mapper } from 'automapper-core'; +import { InjectMapper } from 'automapper-nestjs'; import { Body, Controller, diff --git a/services/apps/alcs/src/alcs/staff-journal/staff-journal.dto.ts b/services/apps/alcs/src/alcs/staff-journal/staff-journal.dto.ts index 576a913025..60c42b0704 100644 --- a/services/apps/alcs/src/alcs/staff-journal/staff-journal.dto.ts +++ b/services/apps/alcs/src/alcs/staff-journal/staff-journal.dto.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { IsNotEmpty, IsString } from 'class-validator'; export class StaffJournalDto { diff --git a/services/apps/alcs/src/alcs/staff-journal/staff-journal.entity.ts b/services/apps/alcs/src/alcs/staff-journal/staff-journal.entity.ts index 1f0b24e65c..0dbf764297 100644 --- a/services/apps/alcs/src/alcs/staff-journal/staff-journal.entity.ts +++ b/services/apps/alcs/src/alcs/staff-journal/staff-journal.entity.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { Column, CreateDateColumn, Entity, Index, ManyToOne } from 'typeorm'; import { Base } from '../../common/entities/base.entity'; import { User } from '../../user/user.entity'; diff --git a/services/apps/alcs/src/common/authorization/portal-auth-guard.service.ts b/services/apps/alcs/src/common/authorization/portal-auth-guard.service.ts index 76e0751261..b828e0e7f9 100644 --- a/services/apps/alcs/src/common/authorization/portal-auth-guard.service.ts +++ b/services/apps/alcs/src/common/authorization/portal-auth-guard.service.ts @@ -11,10 +11,10 @@ import { KEYCLOAK_CONNECT_OPTIONS, KEYCLOAK_INSTANCE, KEYCLOAK_LOGGER, + KEYCLOAK_MULTITENANT_SERVICE, RoleGuard as KeyCloakRoleGuard, } from 'nest-keycloak-connect'; import { KeycloakConnectConfig } from 'nest-keycloak-connect/interface/keycloak-connect-options.interface'; -import { KeycloakMultiTenantService } from 'nest-keycloak-connect/services/keycloak-multitenant.service'; import { ClsService } from 'nestjs-cls'; import { BaseToken } from '../../../../alcs/src/common/authorization/authorization.service'; import { UserService } from '../../user/user.service'; @@ -25,13 +25,12 @@ export class PortalAuthGuard implements CanActivate { constructor( @Inject(KEYCLOAK_INSTANCE) - private singleTenant: Keycloak, + singleTenant: Keycloak, @Inject(KEYCLOAK_CONNECT_OPTIONS) private keycloakOpts: KeycloakConnectConfig, @Inject(KEYCLOAK_LOGGER) - private logger: Logger, - private multiTenant: KeycloakMultiTenantService, - private reflector: Reflector, + logger: Logger, + reflector: Reflector, private clsService: ClsService, private userService: UserService, ) { @@ -39,7 +38,7 @@ export class PortalAuthGuard implements CanActivate { singleTenant, keycloakOpts, logger, - multiTenant, + null!, reflector, ); } diff --git a/services/apps/alcs/src/common/authorization/roles-guard.service.ts b/services/apps/alcs/src/common/authorization/roles-guard.service.ts index 6a59fbc77d..3db140df64 100644 --- a/services/apps/alcs/src/common/authorization/roles-guard.service.ts +++ b/services/apps/alcs/src/common/authorization/roles-guard.service.ts @@ -11,10 +11,10 @@ import { KEYCLOAK_CONNECT_OPTIONS, KEYCLOAK_INSTANCE, KEYCLOAK_LOGGER, + KEYCLOAK_MULTITENANT_SERVICE, + KeycloakConnectConfig, RoleGuard as KeyCloakRoleGuard, } from 'nest-keycloak-connect'; -import { KeycloakConnectConfig } from 'nest-keycloak-connect/interface/keycloak-connect-options.interface'; -import { KeycloakMultiTenantService } from 'nest-keycloak-connect/services/keycloak-multitenant.service'; import { ClsService } from 'nestjs-cls'; import { UserGuids, UserService } from '../../user/user.service'; import { BaseToken } from './authorization.service'; @@ -26,12 +26,11 @@ export class RolesGuard implements CanActivate { constructor( @Inject(KEYCLOAK_INSTANCE) - private singleTenant: Keycloak, + singleTenant: Keycloak, @Inject(KEYCLOAK_CONNECT_OPTIONS) private keycloakOpts: KeycloakConnectConfig, @Inject(KEYCLOAK_LOGGER) private logger: Logger, - private multiTenant: KeycloakMultiTenantService, private reflector: Reflector, private cls: ClsService, private userService: UserService, @@ -40,7 +39,7 @@ export class RolesGuard implements CanActivate { singleTenant, keycloakOpts, logger, - multiTenant, + null!, reflector, ); } diff --git a/services/apps/alcs/src/common/automapper/application-decision-v1.automapper.profile.ts b/services/apps/alcs/src/common/automapper/application-decision-v1.automapper.profile.ts index a2954bb542..6cae24c7cf 100644 --- a/services/apps/alcs/src/common/automapper/application-decision-v1.automapper.profile.ts +++ b/services/apps/alcs/src/common/automapper/application-decision-v1.automapper.profile.ts @@ -1,5 +1,5 @@ -import { createMap, forMember, mapFrom, Mapper } from '@automapper/core'; -import { AutomapperProfile, InjectMapper } from '@automapper/nestjs'; +import { createMap, forMember, mapFrom, Mapper } from 'automapper-core'; +import { AutomapperProfile, InjectMapper } from 'automapper-nestjs'; import { Injectable } from '@nestjs/common'; import { ApplicationCeoCriterionCode } from '../../alcs/application-decision/application-ceo-criterion/application-ceo-criterion.entity'; diff --git a/services/apps/alcs/src/common/automapper/application-decision-v2.automapper.profile.ts b/services/apps/alcs/src/common/automapper/application-decision-v2.automapper.profile.ts index 4aaeeb6774..be847c5d04 100644 --- a/services/apps/alcs/src/common/automapper/application-decision-v2.automapper.profile.ts +++ b/services/apps/alcs/src/common/automapper/application-decision-v2.automapper.profile.ts @@ -1,5 +1,5 @@ -import { createMap, forMember, mapFrom, Mapper } from '@automapper/core'; -import { AutomapperProfile, InjectMapper } from '@automapper/nestjs'; +import { createMap, forMember, mapFrom, Mapper } from 'automapper-core'; +import { AutomapperProfile, InjectMapper } from 'automapper-nestjs'; import { Injectable } from '@nestjs/common'; import { ApplicationCeoCriterionCode } from '../../alcs/application-decision/application-ceo-criterion/application-ceo-criterion.entity'; import { ApplicationDecisionConditionType } from '../../alcs/application-decision/application-decision-condition/application-decision-condition-code.entity'; diff --git a/services/apps/alcs/src/common/automapper/application-owner.automapper.profile.ts b/services/apps/alcs/src/common/automapper/application-owner.automapper.profile.ts index 5b357761a8..b801e0409d 100644 --- a/services/apps/alcs/src/common/automapper/application-owner.automapper.profile.ts +++ b/services/apps/alcs/src/common/automapper/application-owner.automapper.profile.ts @@ -1,5 +1,5 @@ -import { createMap, forMember, mapFrom, Mapper } from '@automapper/core'; -import { AutomapperProfile, InjectMapper } from '@automapper/nestjs'; +import { createMap, forMember, mapFrom, Mapper } from 'automapper-core'; +import { AutomapperProfile, InjectMapper } from 'automapper-nestjs'; import { Injectable } from '@nestjs/common'; import { ApplicationDocumentDto } from '../../alcs/application/application-document/application-document.dto'; import { ApplicationDocument } from '../../alcs/application/application-document/application-document.entity'; diff --git a/services/apps/alcs/src/common/automapper/application-parcel.automapper.profile.ts b/services/apps/alcs/src/common/automapper/application-parcel.automapper.profile.ts index e013581ec1..0d707fc302 100644 --- a/services/apps/alcs/src/common/automapper/application-parcel.automapper.profile.ts +++ b/services/apps/alcs/src/common/automapper/application-parcel.automapper.profile.ts @@ -1,5 +1,5 @@ -import { createMap, forMember, mapFrom, Mapper } from '@automapper/core'; -import { AutomapperProfile, InjectMapper } from '@automapper/nestjs'; +import { createMap, forMember, mapFrom, Mapper } from 'automapper-core'; +import { AutomapperProfile, InjectMapper } from 'automapper-nestjs'; import { Injectable } from '@nestjs/common'; import { ApplicationDocumentDto } from '../../alcs/application/application-document/application-document.dto'; import { ApplicationDocument } from '../../alcs/application/application-document/application-document.entity'; diff --git a/services/apps/alcs/src/common/automapper/application-submission-review.automapper.profile.ts b/services/apps/alcs/src/common/automapper/application-submission-review.automapper.profile.ts index 6bff116370..e90faf5061 100644 --- a/services/apps/alcs/src/common/automapper/application-submission-review.automapper.profile.ts +++ b/services/apps/alcs/src/common/automapper/application-submission-review.automapper.profile.ts @@ -1,5 +1,5 @@ -import { createMap, Mapper } from '@automapper/core'; -import { AutomapperProfile, InjectMapper } from '@automapper/nestjs'; +import { createMap, Mapper } from 'automapper-core'; +import { AutomapperProfile, InjectMapper } from 'automapper-nestjs'; import { Injectable } from '@nestjs/common'; import { ApplicationSubmissionReviewDto } from '../../portal/application-submission-review/application-submission-review.dto'; import { ApplicationSubmissionReview } from '../../portal/application-submission-review/application-submission-review.entity'; diff --git a/services/apps/alcs/src/common/automapper/application-submission.automapper.profile.ts b/services/apps/alcs/src/common/automapper/application-submission.automapper.profile.ts index 7a98038f69..07a8cd6a6b 100644 --- a/services/apps/alcs/src/common/automapper/application-submission.automapper.profile.ts +++ b/services/apps/alcs/src/common/automapper/application-submission.automapper.profile.ts @@ -1,5 +1,5 @@ -import { createMap, forMember, mapFrom, Mapper } from '@automapper/core'; -import { AutomapperProfile, InjectMapper } from '@automapper/nestjs'; +import { createMap, forMember, mapFrom, Mapper } from 'automapper-core'; +import { AutomapperProfile, InjectMapper } from 'automapper-nestjs'; import { Injectable } from '@nestjs/common'; import { AlcsApplicationSubmissionDto } from '../../alcs/application/application.dto'; import { ApplicationSubmissionStatusType } from '../../alcs/application/application-submission-status/submission-status-type.entity'; diff --git a/services/apps/alcs/src/common/automapper/application-subtask.automapper.profile.ts b/services/apps/alcs/src/common/automapper/application-subtask.automapper.profile.ts index 53b65ee22a..199f126960 100644 --- a/services/apps/alcs/src/common/automapper/application-subtask.automapper.profile.ts +++ b/services/apps/alcs/src/common/automapper/application-subtask.automapper.profile.ts @@ -1,5 +1,5 @@ -import { createMap, forMember, mapFrom, Mapper } from '@automapper/core'; -import { AutomapperProfile, InjectMapper } from '@automapper/nestjs'; +import { createMap, forMember, mapFrom, Mapper } from 'automapper-core'; +import { AutomapperProfile, InjectMapper } from 'automapper-nestjs'; import { Injectable } from '@nestjs/common'; import { CardSubtaskType } from '../../alcs/card/card-subtask/card-subtask-type/card-subtask-type.entity'; import { diff --git a/services/apps/alcs/src/common/automapper/application.automapper.profile.ts b/services/apps/alcs/src/common/automapper/application.automapper.profile.ts index f7936a44c1..15845d027c 100644 --- a/services/apps/alcs/src/common/automapper/application.automapper.profile.ts +++ b/services/apps/alcs/src/common/automapper/application.automapper.profile.ts @@ -1,5 +1,5 @@ -import { createMap, forMember, mapFrom, Mapper } from '@automapper/core'; -import { AutomapperProfile, InjectMapper } from '@automapper/nestjs'; +import { createMap, forMember, mapFrom, Mapper } from 'automapper-core'; +import { AutomapperProfile, InjectMapper } from 'automapper-nestjs'; import { Injectable } from '@nestjs/common'; import { ApplicationDecisionMeetingDto } from '../../alcs/application-decision/application-decision-v1/application-decision-meeting/application-decision-meeting.dto'; diff --git a/services/apps/alcs/src/common/automapper/board.automapper.profile.ts b/services/apps/alcs/src/common/automapper/board.automapper.profile.ts index 396aaf7b67..2a2e3225d8 100644 --- a/services/apps/alcs/src/common/automapper/board.automapper.profile.ts +++ b/services/apps/alcs/src/common/automapper/board.automapper.profile.ts @@ -1,5 +1,5 @@ -import { createMap, forMember, mapFrom, Mapper } from '@automapper/core'; -import { AutomapperProfile, InjectMapper } from '@automapper/nestjs'; +import { createMap, forMember, mapFrom, Mapper } from 'automapper-core'; +import { AutomapperProfile, InjectMapper } from 'automapper-nestjs'; import { Injectable } from '@nestjs/common'; import { BoardStatus } from '../../alcs/board/board-status.entity'; import { diff --git a/services/apps/alcs/src/common/automapper/card.automapper.profile.ts b/services/apps/alcs/src/common/automapper/card.automapper.profile.ts index fbcabf6d84..3985db73b8 100644 --- a/services/apps/alcs/src/common/automapper/card.automapper.profile.ts +++ b/services/apps/alcs/src/common/automapper/card.automapper.profile.ts @@ -1,5 +1,5 @@ -import { createMap, forMember, mapFrom, Mapper } from '@automapper/core'; -import { AutomapperProfile, InjectMapper } from '@automapper/nestjs'; +import { createMap, forMember, mapFrom, Mapper } from 'automapper-core'; +import { AutomapperProfile, InjectMapper } from 'automapper-nestjs'; import { Injectable } from '@nestjs/common'; import { CardStatusDto, diff --git a/services/apps/alcs/src/common/automapper/comment.automapper.profile.ts b/services/apps/alcs/src/common/automapper/comment.automapper.profile.ts index ac19ce875d..4ee3d4a209 100644 --- a/services/apps/alcs/src/common/automapper/comment.automapper.profile.ts +++ b/services/apps/alcs/src/common/automapper/comment.automapper.profile.ts @@ -1,5 +1,5 @@ -import { createMap, forMember, mapFrom, Mapper } from '@automapper/core'; -import { AutomapperProfile, InjectMapper } from '@automapper/nestjs'; +import { createMap, forMember, mapFrom, Mapper } from 'automapper-core'; +import { AutomapperProfile, InjectMapper } from 'automapper-nestjs'; import { Injectable } from '@nestjs/common'; import { CommentDto } from '../../alcs/comment/comment.dto'; import { Comment } from '../../alcs/comment/comment.entity'; diff --git a/services/apps/alcs/src/common/automapper/commissioner.automapper.profile.ts b/services/apps/alcs/src/common/automapper/commissioner.automapper.profile.ts index 6c4348b8f1..9c8a2efe92 100644 --- a/services/apps/alcs/src/common/automapper/commissioner.automapper.profile.ts +++ b/services/apps/alcs/src/common/automapper/commissioner.automapper.profile.ts @@ -1,5 +1,5 @@ -import { createMap, Mapper } from '@automapper/core'; -import { AutomapperProfile, InjectMapper } from '@automapper/nestjs'; +import { createMap, Mapper } from 'automapper-core'; +import { AutomapperProfile, InjectMapper } from 'automapper-nestjs'; import { Injectable } from '@nestjs/common'; import { ApplicationDto } from '../../alcs/application/application.dto'; import { CommissionerApplicationDto } from '../../alcs/commissioner/commissioner.dto'; diff --git a/services/apps/alcs/src/common/automapper/covenant.automapper.profile.ts b/services/apps/alcs/src/common/automapper/covenant.automapper.profile.ts index 8f82d1f565..585c1ada3f 100644 --- a/services/apps/alcs/src/common/automapper/covenant.automapper.profile.ts +++ b/services/apps/alcs/src/common/automapper/covenant.automapper.profile.ts @@ -1,5 +1,5 @@ -import { createMap, Mapper } from '@automapper/core'; -import { AutomapperProfile, InjectMapper } from '@automapper/nestjs'; +import { createMap, Mapper } from 'automapper-core'; +import { AutomapperProfile, InjectMapper } from 'automapper-nestjs'; import { Injectable } from '@nestjs/common'; import { CovenantDto } from '../../alcs/covenant/covenant.dto'; import { Covenant } from '../../alcs/covenant/covenant.entity'; diff --git a/services/apps/alcs/src/common/automapper/message.automapper.profile.ts b/services/apps/alcs/src/common/automapper/message.automapper.profile.ts index 28ac30502b..fb11b01789 100644 --- a/services/apps/alcs/src/common/automapper/message.automapper.profile.ts +++ b/services/apps/alcs/src/common/automapper/message.automapper.profile.ts @@ -1,5 +1,5 @@ -import { createMap, forMember, mapFrom, Mapper } from '@automapper/core'; -import { AutomapperProfile, InjectMapper } from '@automapper/nestjs'; +import { createMap, forMember, mapFrom, Mapper } from 'automapper-core'; +import { AutomapperProfile, InjectMapper } from 'automapper-nestjs'; import { Injectable } from '@nestjs/common'; import { MessageDto } from '../../alcs/message/message.dto'; import { Message } from '../../alcs/message/message.entity'; diff --git a/services/apps/alcs/src/common/automapper/modification.automapper.profile.ts b/services/apps/alcs/src/common/automapper/modification.automapper.profile.ts index cee5e252ca..fcaddaf509 100644 --- a/services/apps/alcs/src/common/automapper/modification.automapper.profile.ts +++ b/services/apps/alcs/src/common/automapper/modification.automapper.profile.ts @@ -1,5 +1,5 @@ -import { createMap, forMember, mapFrom, Mapper } from '@automapper/core'; -import { AutomapperProfile, InjectMapper } from '@automapper/nestjs'; +import { createMap, forMember, mapFrom, Mapper } from 'automapper-core'; +import { AutomapperProfile, InjectMapper } from 'automapper-nestjs'; import { Injectable } from '@nestjs/common'; import { ApplicationDecisionMeetingDto } from '../../alcs/application-decision/application-decision-v1/application-decision-meeting/application-decision-meeting.dto'; import { ApplicationDecisionMeeting } from '../../alcs/application-decision/application-decision-v1/application-decision-meeting/application-decision-meeting.entity'; diff --git a/services/apps/alcs/src/common/automapper/notice-of-intent-decision.automapper.profile.ts b/services/apps/alcs/src/common/automapper/notice-of-intent-decision.automapper.profile.ts index f043b41903..4732d0fe5c 100644 --- a/services/apps/alcs/src/common/automapper/notice-of-intent-decision.automapper.profile.ts +++ b/services/apps/alcs/src/common/automapper/notice-of-intent-decision.automapper.profile.ts @@ -1,5 +1,5 @@ -import { createMap, forMember, mapFrom, Mapper } from '@automapper/core'; -import { AutomapperProfile, InjectMapper } from '@automapper/nestjs'; +import { createMap, forMember, mapFrom, Mapper } from 'automapper-core'; +import { AutomapperProfile, InjectMapper } from 'automapper-nestjs'; import { Injectable } from '@nestjs/common'; import { CardDto } from '../../alcs/card/card.dto'; import { Card } from '../../alcs/card/card.entity'; diff --git a/services/apps/alcs/src/common/automapper/notice-of-intent-owner.automapper.profile.ts b/services/apps/alcs/src/common/automapper/notice-of-intent-owner.automapper.profile.ts index ad4734b3fe..34421bcd46 100644 --- a/services/apps/alcs/src/common/automapper/notice-of-intent-owner.automapper.profile.ts +++ b/services/apps/alcs/src/common/automapper/notice-of-intent-owner.automapper.profile.ts @@ -1,5 +1,5 @@ -import { createMap, forMember, mapFrom, Mapper } from '@automapper/core'; -import { AutomapperProfile, InjectMapper } from '@automapper/nestjs'; +import { createMap, forMember, mapFrom, Mapper } from 'automapper-core'; +import { AutomapperProfile, InjectMapper } from 'automapper-nestjs'; import { Injectable } from '@nestjs/common'; import { NoticeOfIntentDocumentDto } from '../../alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.dto'; import { NoticeOfIntentDocument } from '../../alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.entity'; diff --git a/services/apps/alcs/src/common/automapper/notice-of-intent-parcel.automapper.profile.ts b/services/apps/alcs/src/common/automapper/notice-of-intent-parcel.automapper.profile.ts index 9ae88c39bc..448c74d3c8 100644 --- a/services/apps/alcs/src/common/automapper/notice-of-intent-parcel.automapper.profile.ts +++ b/services/apps/alcs/src/common/automapper/notice-of-intent-parcel.automapper.profile.ts @@ -1,5 +1,5 @@ -import { createMap, forMember, mapFrom, Mapper } from '@automapper/core'; -import { AutomapperProfile, InjectMapper } from '@automapper/nestjs'; +import { createMap, forMember, mapFrom, Mapper } from 'automapper-core'; +import { AutomapperProfile, InjectMapper } from 'automapper-nestjs'; import { Injectable } from '@nestjs/common'; import { NoticeOfIntentDocumentDto } from '../../alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.dto'; import { NoticeOfIntentDocument } from '../../alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.entity'; diff --git a/services/apps/alcs/src/common/automapper/notice-of-intent-submission.automapper.profile.ts b/services/apps/alcs/src/common/automapper/notice-of-intent-submission.automapper.profile.ts index e6d5527d23..96538d8276 100644 --- a/services/apps/alcs/src/common/automapper/notice-of-intent-submission.automapper.profile.ts +++ b/services/apps/alcs/src/common/automapper/notice-of-intent-submission.automapper.profile.ts @@ -1,5 +1,5 @@ -import { createMap, forMember, mapFrom, Mapper } from '@automapper/core'; -import { AutomapperProfile, InjectMapper } from '@automapper/nestjs'; +import { createMap, forMember, mapFrom, Mapper } from 'automapper-core'; +import { AutomapperProfile, InjectMapper } from 'automapper-nestjs'; import { Injectable } from '@nestjs/common'; import { NoticeOfIntentSubmissionStatusType } from '../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status-type.entity'; import { diff --git a/services/apps/alcs/src/common/automapper/notice-of-intent.automapper.profile.ts b/services/apps/alcs/src/common/automapper/notice-of-intent.automapper.profile.ts index ded383a8d1..7985c24c29 100644 --- a/services/apps/alcs/src/common/automapper/notice-of-intent.automapper.profile.ts +++ b/services/apps/alcs/src/common/automapper/notice-of-intent.automapper.profile.ts @@ -1,5 +1,5 @@ -import { createMap, forMember, mapFrom, Mapper } from '@automapper/core'; -import { AutomapperProfile, InjectMapper } from '@automapper/nestjs'; +import { createMap, forMember, mapFrom, Mapper } from 'automapper-core'; +import { AutomapperProfile, InjectMapper } from 'automapper-nestjs'; import { Injectable } from '@nestjs/common'; import { NoticeOfIntentTypeDto } from '../../alcs/notice-of-intent/notice-of-intent-type/notice-of-intent-type.dto'; import { NoticeOfIntentType } from '../../alcs/notice-of-intent/notice-of-intent-type/notice-of-intent-type.entity'; diff --git a/services/apps/alcs/src/common/automapper/notification-parcel.automapper.profile.ts b/services/apps/alcs/src/common/automapper/notification-parcel.automapper.profile.ts index e54b68e853..4b059294bf 100644 --- a/services/apps/alcs/src/common/automapper/notification-parcel.automapper.profile.ts +++ b/services/apps/alcs/src/common/automapper/notification-parcel.automapper.profile.ts @@ -1,5 +1,5 @@ -import { createMap, forMember, mapFrom, Mapper } from '@automapper/core'; -import { AutomapperProfile, InjectMapper } from '@automapper/nestjs'; +import { createMap, forMember, mapFrom, Mapper } from 'automapper-core'; +import { AutomapperProfile, InjectMapper } from 'automapper-nestjs'; import { Injectable } from '@nestjs/common'; import { NotificationParcelDto } from '../../portal/notification-submission/notification-parcel/notification-parcel.dto'; import { NotificationParcel } from '../../portal/notification-submission/notification-parcel/notification-parcel.entity'; diff --git a/services/apps/alcs/src/common/automapper/notification-submission.automapper.profile.ts b/services/apps/alcs/src/common/automapper/notification-submission.automapper.profile.ts index 1a8ab2cf73..38f924c01e 100644 --- a/services/apps/alcs/src/common/automapper/notification-submission.automapper.profile.ts +++ b/services/apps/alcs/src/common/automapper/notification-submission.automapper.profile.ts @@ -1,5 +1,5 @@ -import { createMap, forMember, mapFrom, Mapper } from '@automapper/core'; -import { AutomapperProfile, InjectMapper } from '@automapper/nestjs'; +import { createMap, forMember, mapFrom, Mapper } from 'automapper-core'; +import { AutomapperProfile, InjectMapper } from 'automapper-nestjs'; import { Injectable } from '@nestjs/common'; import { NotificationSubmissionStatusType } from '../../alcs/notification/notification-submission-status/notification-status-type.entity'; import { diff --git a/services/apps/alcs/src/common/automapper/notification-transferee.automapper.profile.ts b/services/apps/alcs/src/common/automapper/notification-transferee.automapper.profile.ts index 542db36397..b64fa28fe3 100644 --- a/services/apps/alcs/src/common/automapper/notification-transferee.automapper.profile.ts +++ b/services/apps/alcs/src/common/automapper/notification-transferee.automapper.profile.ts @@ -1,5 +1,5 @@ -import { createMap, forMember, mapFrom, Mapper } from '@automapper/core'; -import { AutomapperProfile, InjectMapper } from '@automapper/nestjs'; +import { createMap, forMember, mapFrom, Mapper } from 'automapper-core'; +import { AutomapperProfile, InjectMapper } from 'automapper-nestjs'; import { Injectable } from '@nestjs/common'; import { NotificationTransfereeDto } from '../../portal/notification-submission/notification-transferee/notification-transferee.dto'; import { NotificationTransferee } from '../../portal/notification-submission/notification-transferee/notification-transferee.entity'; diff --git a/services/apps/alcs/src/common/automapper/notification.automapper.profile.ts b/services/apps/alcs/src/common/automapper/notification.automapper.profile.ts index b9bce4509a..b1c5e898ee 100644 --- a/services/apps/alcs/src/common/automapper/notification.automapper.profile.ts +++ b/services/apps/alcs/src/common/automapper/notification.automapper.profile.ts @@ -1,5 +1,5 @@ -import { createMap, forMember, mapFrom, Mapper } from '@automapper/core'; -import { AutomapperProfile, InjectMapper } from '@automapper/nestjs'; +import { createMap, forMember, mapFrom, Mapper } from 'automapper-core'; +import { AutomapperProfile, InjectMapper } from 'automapper-nestjs'; import { Injectable } from '@nestjs/common'; import { NotificationDocumentDto } from '../../alcs/notification/notification-document/notification-document.dto'; import { NotificationDocument } from '../../alcs/notification/notification-document/notification-document.entity'; diff --git a/services/apps/alcs/src/common/automapper/planning-meeting.automapper.profile.ts b/services/apps/alcs/src/common/automapper/planning-meeting.automapper.profile.ts index f1b5fe0e38..c5f68bd4dd 100644 --- a/services/apps/alcs/src/common/automapper/planning-meeting.automapper.profile.ts +++ b/services/apps/alcs/src/common/automapper/planning-meeting.automapper.profile.ts @@ -1,5 +1,5 @@ -import { createMap, Mapper } from '@automapper/core'; -import { AutomapperProfile, InjectMapper } from '@automapper/nestjs'; +import { createMap, Mapper } from 'automapper-core'; +import { AutomapperProfile, InjectMapper } from 'automapper-nestjs'; import { Injectable } from '@nestjs/common'; import { PlanningReviewDto } from '../../alcs/planning-review/planning-review.dto'; import { PlanningReview } from '../../alcs/planning-review/planning-review.entity'; diff --git a/services/apps/alcs/src/common/automapper/public.automapper.profile.ts b/services/apps/alcs/src/common/automapper/public.automapper.profile.ts index 6b5699502a..6874f2cfb5 100644 --- a/services/apps/alcs/src/common/automapper/public.automapper.profile.ts +++ b/services/apps/alcs/src/common/automapper/public.automapper.profile.ts @@ -1,5 +1,5 @@ -import { createMap, forMember, mapFrom, Mapper } from '@automapper/core'; -import { AutomapperProfile, InjectMapper } from '@automapper/nestjs'; +import { createMap, forMember, mapFrom, Mapper } from 'automapper-core'; +import { AutomapperProfile, InjectMapper } from 'automapper-nestjs'; import { Injectable } from '@nestjs/common'; import { ApplicationDocument } from '../../alcs/application/application-document/application-document.entity'; import { NoticeOfIntentDocument } from '../../alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.entity'; diff --git a/services/apps/alcs/src/common/automapper/reconsideration.automapper.profile.ts b/services/apps/alcs/src/common/automapper/reconsideration.automapper.profile.ts index 32f8f64480..8833d711ef 100644 --- a/services/apps/alcs/src/common/automapper/reconsideration.automapper.profile.ts +++ b/services/apps/alcs/src/common/automapper/reconsideration.automapper.profile.ts @@ -1,5 +1,5 @@ -import { createMap, forMember, mapFrom, Mapper } from '@automapper/core'; -import { AutomapperProfile, InjectMapper } from '@automapper/nestjs'; +import { createMap, forMember, mapFrom, Mapper } from 'automapper-core'; +import { AutomapperProfile, InjectMapper } from 'automapper-nestjs'; import { Injectable } from '@nestjs/common'; import { ApplicationDecisionMeetingDto } from '../../alcs/application-decision/application-decision-v1/application-decision-meeting/application-decision-meeting.dto'; import { ApplicationDecisionMeeting } from '../../alcs/application-decision/application-decision-v1/application-decision-meeting/application-decision-meeting.entity'; diff --git a/services/apps/alcs/src/common/automapper/user.automapper.profile.ts b/services/apps/alcs/src/common/automapper/user.automapper.profile.ts index 38aed07ea9..60fe86fb83 100644 --- a/services/apps/alcs/src/common/automapper/user.automapper.profile.ts +++ b/services/apps/alcs/src/common/automapper/user.automapper.profile.ts @@ -1,5 +1,5 @@ -import { createMap, forMember, mapFrom, Mapper } from '@automapper/core'; -import { AutomapperProfile, InjectMapper } from '@automapper/nestjs'; +import { createMap, forMember, mapFrom, Mapper } from 'automapper-core'; +import { AutomapperProfile, InjectMapper } from 'automapper-nestjs'; import { Injectable } from '@nestjs/common'; import { AssigneeDto, diff --git a/services/apps/alcs/src/common/dtos/base.dto.ts b/services/apps/alcs/src/common/dtos/base.dto.ts index 809b55bb80..f6d8115e22 100644 --- a/services/apps/alcs/src/common/dtos/base.dto.ts +++ b/services/apps/alcs/src/common/dtos/base.dto.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { IsString, MaxLength, MinLength } from 'class-validator'; export abstract class BaseCodeDto { diff --git a/services/apps/alcs/src/common/entities/base.code.entity.ts b/services/apps/alcs/src/common/entities/base.code.entity.ts index 64aa90e403..d574d10a2f 100644 --- a/services/apps/alcs/src/common/entities/base.code.entity.ts +++ b/services/apps/alcs/src/common/entities/base.code.entity.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { Column, PrimaryColumn } from 'typeorm'; import { Auditable } from './audit.entity'; diff --git a/services/apps/alcs/src/common/entities/base.entity.ts b/services/apps/alcs/src/common/entities/base.entity.ts index 2673567917..985ccea795 100644 --- a/services/apps/alcs/src/common/entities/base.entity.ts +++ b/services/apps/alcs/src/common/entities/base.entity.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { PrimaryGeneratedColumn } from 'typeorm'; import { Auditable } from './audit.entity'; diff --git a/services/apps/alcs/src/document/document-code.entity.ts b/services/apps/alcs/src/document/document-code.entity.ts index 37765ecba3..697fe3632e 100644 --- a/services/apps/alcs/src/document/document-code.entity.ts +++ b/services/apps/alcs/src/document/document-code.entity.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { Column, Entity } from 'typeorm'; import { BaseCodeEntity } from '../common/entities/base.code.entity'; diff --git a/services/apps/alcs/src/document/document.dto.ts b/services/apps/alcs/src/document/document.dto.ts index 2745c0df6c..72d5204418 100644 --- a/services/apps/alcs/src/document/document.dto.ts +++ b/services/apps/alcs/src/document/document.dto.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { BaseCodeDto } from '../common/dtos/base.dto'; import { User } from '../user/user.entity'; diff --git a/services/apps/alcs/src/main.module.ts b/services/apps/alcs/src/main.module.ts index 44c4bd769d..aa4741e23f 100644 --- a/services/apps/alcs/src/main.module.ts +++ b/services/apps/alcs/src/main.module.ts @@ -1,7 +1,7 @@ import { ConfigModule } from '@app/common/config/config.module'; import { RedisModule } from '@app/common/redis/redis.module'; -import { classes } from '@automapper/classes'; -import { AutomapperModule } from '@automapper/nestjs'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { Module } from '@nestjs/common'; import { APP_FILTER, APP_GUARD } from '@nestjs/core'; import { TypeOrmModule } from '@nestjs/typeorm'; @@ -34,7 +34,7 @@ import { UserModule } from './user/user.module'; AutomapperModule.forRoot({ strategyInitializer: classes(), }), - ClsModule.register({ + ClsModule.forRoot({ global: true, middleware: { mount: true }, }), diff --git a/services/apps/alcs/src/portal/application-document/application-document.controller.spec.ts b/services/apps/alcs/src/portal/application-document/application-document.controller.spec.ts index 8d02d71735..e197636f0d 100644 --- a/services/apps/alcs/src/portal/application-document/application-document.controller.spec.ts +++ b/services/apps/alcs/src/portal/application-document/application-document.controller.spec.ts @@ -1,5 +1,5 @@ -import { classes } from '@automapper/classes'; -import { AutomapperModule } from '@automapper/nestjs'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { ClsService } from 'nestjs-cls'; diff --git a/services/apps/alcs/src/portal/application-document/application-document.controller.ts b/services/apps/alcs/src/portal/application-document/application-document.controller.ts index 0536150823..09394a6491 100644 --- a/services/apps/alcs/src/portal/application-document/application-document.controller.ts +++ b/services/apps/alcs/src/portal/application-document/application-document.controller.ts @@ -1,5 +1,5 @@ -import { Mapper } from '@automapper/core'; -import { InjectMapper } from '@automapper/nestjs'; +import { Mapper } from 'automapper-core'; +import { InjectMapper } from 'automapper-nestjs'; import { Body, Controller, @@ -90,9 +90,8 @@ export class ApplicationDocumentController { await this.applicationSubmissionService.canAccessDocument(document, user); if (canAccessDocument) { - const url = await this.applicationDocumentService.getDownloadUrl( - document, - ); + const url = + await this.applicationDocumentService.getDownloadUrl(document); return { url }; } diff --git a/services/apps/alcs/src/portal/application-submission-review/application-submission-review.dto.ts b/services/apps/alcs/src/portal/application-submission-review/application-submission-review.dto.ts index 30e28c677a..cbd503fac9 100644 --- a/services/apps/alcs/src/portal/application-submission-review/application-submission-review.dto.ts +++ b/services/apps/alcs/src/portal/application-submission-review/application-submission-review.dto.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { IsBoolean, IsOptional, IsString } from 'class-validator'; export class ApplicationSubmissionReviewDto { diff --git a/services/apps/alcs/src/portal/application-submission-review/application-submission-review.entity.ts b/services/apps/alcs/src/portal/application-submission-review/application-submission-review.entity.ts index 36aed50d29..9f33a3a52d 100644 --- a/services/apps/alcs/src/portal/application-submission-review/application-submission-review.entity.ts +++ b/services/apps/alcs/src/portal/application-submission-review/application-submission-review.entity.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { Column, Entity, JoinColumn, ManyToOne, OneToOne } from 'typeorm'; import { Application } from '../../alcs/application/application.entity'; import { Base } from '../../common/entities/base.entity'; diff --git a/services/apps/alcs/src/portal/application-submission-review/application-submission-review.service.spec.ts b/services/apps/alcs/src/portal/application-submission-review/application-submission-review.service.spec.ts index 332d184eb5..6332426089 100644 --- a/services/apps/alcs/src/portal/application-submission-review/application-submission-review.service.spec.ts +++ b/services/apps/alcs/src/portal/application-submission-review/application-submission-review.service.spec.ts @@ -1,6 +1,6 @@ import { BaseServiceException } from '@app/common/exceptions/base.exception'; -import { classes } from '@automapper/classes'; -import { AutomapperModule } from '@automapper/nestjs'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; diff --git a/services/apps/alcs/src/portal/application-submission-review/application-submission-review.service.ts b/services/apps/alcs/src/portal/application-submission-review/application-submission-review.service.ts index 512fa2d345..c9fd1f1724 100644 --- a/services/apps/alcs/src/portal/application-submission-review/application-submission-review.service.ts +++ b/services/apps/alcs/src/portal/application-submission-review/application-submission-review.service.ts @@ -2,8 +2,8 @@ import { BaseServiceException, ServiceNotFoundException, } from '@app/common/exceptions/base.exception'; -import { Mapper } from '@automapper/core'; -import { InjectMapper } from '@automapper/nestjs'; +import { Mapper } from 'automapper-core'; +import { InjectMapper } from 'automapper-nestjs'; import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; diff --git a/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.controller.spec.ts b/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.controller.spec.ts index d4decd8739..fe87f6cf95 100644 --- a/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.controller.spec.ts +++ b/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.controller.spec.ts @@ -1,5 +1,5 @@ -import { classes } from '@automapper/classes'; -import { AutomapperModule } from '@automapper/nestjs'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { BadRequestException } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; diff --git a/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.controller.ts b/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.controller.ts index 508340d81a..4028c29fc6 100644 --- a/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.controller.ts +++ b/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.controller.ts @@ -1,5 +1,5 @@ -import { Mapper } from '@automapper/core'; -import { InjectMapper } from '@automapper/nestjs'; +import { Mapper } from 'automapper-core'; +import { InjectMapper } from 'automapper-nestjs'; import { BadRequestException, Body, diff --git a/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.dto.ts b/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.dto.ts index 43b3bbf60a..7336adeb3a 100644 --- a/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.dto.ts +++ b/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.dto.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { IsNumber, IsOptional, diff --git a/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.entity.ts b/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.entity.ts index a24fec78da..e23e26edce 100644 --- a/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.entity.ts +++ b/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.entity.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { Column, Entity, JoinColumn, ManyToMany, ManyToOne } from 'typeorm'; import { ApplicationDocumentDto } from '../../../alcs/application/application-document/application-document.dto'; import { ApplicationDocument } from '../../../alcs/application/application-document/application-document.entity'; diff --git a/services/apps/alcs/src/portal/application-submission/application-parcel/application-parcel.controller.spec.ts b/services/apps/alcs/src/portal/application-submission/application-parcel/application-parcel.controller.spec.ts index 31f05671d5..390d1c68b1 100644 --- a/services/apps/alcs/src/portal/application-submission/application-parcel/application-parcel.controller.spec.ts +++ b/services/apps/alcs/src/portal/application-submission/application-parcel/application-parcel.controller.spec.ts @@ -1,5 +1,5 @@ -import { classes } from '@automapper/classes'; -import { AutomapperModule } from '@automapper/nestjs'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { ClsService } from 'nestjs-cls'; diff --git a/services/apps/alcs/src/portal/application-submission/application-parcel/application-parcel.controller.ts b/services/apps/alcs/src/portal/application-submission/application-parcel/application-parcel.controller.ts index a9f2a6050d..54194dd427 100644 --- a/services/apps/alcs/src/portal/application-submission/application-parcel/application-parcel.controller.ts +++ b/services/apps/alcs/src/portal/application-submission/application-parcel/application-parcel.controller.ts @@ -1,5 +1,5 @@ -import { Mapper } from '@automapper/core'; -import { InjectMapper } from '@automapper/nestjs'; +import { Mapper } from 'automapper-core'; +import { InjectMapper } from 'automapper-nestjs'; import { Body, Controller, @@ -51,9 +51,8 @@ export class ApplicationParcelController { async fetchByFileId( @Param('submissionUuid') submissionUuid: string, ): Promise<ApplicationParcelDto[] | undefined> { - const parcels = await this.parcelService.fetchByApplicationSubmissionUuid( - submissionUuid, - ); + const parcels = + await this.parcelService.fetchByApplicationSubmissionUuid(submissionUuid); return this.mapper.mapArrayAsync( parcels, ApplicationParcel, diff --git a/services/apps/alcs/src/portal/application-submission/application-parcel/application-parcel.dto.ts b/services/apps/alcs/src/portal/application-submission/application-parcel/application-parcel.dto.ts index f52e51f788..1c7db97284 100644 --- a/services/apps/alcs/src/portal/application-submission/application-parcel/application-parcel.dto.ts +++ b/services/apps/alcs/src/portal/application-submission/application-parcel/application-parcel.dto.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { IsArray, IsBoolean, diff --git a/services/apps/alcs/src/portal/application-submission/application-parcel/application-parcel.entity.ts b/services/apps/alcs/src/portal/application-submission/application-parcel/application-parcel.entity.ts index 27b65f499b..233ea08fd9 100644 --- a/services/apps/alcs/src/portal/application-submission/application-parcel/application-parcel.entity.ts +++ b/services/apps/alcs/src/portal/application-submission/application-parcel/application-parcel.entity.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { Column, Entity, diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.controller.spec.ts b/services/apps/alcs/src/portal/application-submission/application-submission.controller.spec.ts index 873b1254aa..eec9911dcf 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.controller.spec.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.controller.spec.ts @@ -1,5 +1,5 @@ -import { classes } from '@automapper/classes'; -import { AutomapperModule } from '@automapper/nestjs'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { BadRequestException } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.dto.ts b/services/apps/alcs/src/portal/application-submission/application-submission.dto.ts index ff7bdc992f..3d06c89e7d 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.dto.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.dto.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { IsArray, IsBoolean, diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts b/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts index 3957da6856..283f36a8d3 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { AfterLoad, Column, diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.service.spec.ts b/services/apps/alcs/src/portal/application-submission/application-submission.service.spec.ts index 625f92c155..8eb2f02e21 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.service.spec.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.service.spec.ts @@ -2,8 +2,8 @@ import { BaseServiceException, ServiceNotFoundException, } from '@app/common/exceptions/base.exception'; -import { classes } from '@automapper/classes'; -import { AutomapperModule } from '@automapper/nestjs'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.service.ts b/services/apps/alcs/src/portal/application-submission/application-submission.service.ts index 0270367a78..92d536f50d 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.service.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.service.ts @@ -2,8 +2,8 @@ import { BaseServiceException, ServiceNotFoundException, } from '@app/common/exceptions/base.exception'; -import { Mapper } from '@automapper/core'; -import { InjectMapper } from '@automapper/nestjs'; +import { Mapper } from 'automapper-core'; +import { InjectMapper } from 'automapper-nestjs'; import { forwardRef, Inject, Injectable, Logger } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { FindOptionsRelations, Repository } from 'typeorm'; diff --git a/services/apps/alcs/src/portal/application-submission/covenant-transferee/covenant-transferee.controller.spec.ts b/services/apps/alcs/src/portal/application-submission/covenant-transferee/covenant-transferee.controller.spec.ts index 53af45848e..7a81afa098 100644 --- a/services/apps/alcs/src/portal/application-submission/covenant-transferee/covenant-transferee.controller.spec.ts +++ b/services/apps/alcs/src/portal/application-submission/covenant-transferee/covenant-transferee.controller.spec.ts @@ -1,5 +1,5 @@ -import { classes } from '@automapper/classes'; -import { AutomapperModule } from '@automapper/nestjs'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { BadRequestException } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; diff --git a/services/apps/alcs/src/portal/application-submission/covenant-transferee/covenant-transferee.controller.ts b/services/apps/alcs/src/portal/application-submission/covenant-transferee/covenant-transferee.controller.ts index 83d8441736..cbad183851 100644 --- a/services/apps/alcs/src/portal/application-submission/covenant-transferee/covenant-transferee.controller.ts +++ b/services/apps/alcs/src/portal/application-submission/covenant-transferee/covenant-transferee.controller.ts @@ -1,5 +1,5 @@ -import { Mapper } from '@automapper/core'; -import { InjectMapper } from '@automapper/nestjs'; +import { Mapper } from 'automapper-core'; +import { InjectMapper } from 'automapper-nestjs'; import { BadRequestException, Body, diff --git a/services/apps/alcs/src/portal/application-submission/covenant-transferee/covenant-transferee.dto.ts b/services/apps/alcs/src/portal/application-submission/covenant-transferee/covenant-transferee.dto.ts index e377c4ea71..0425740071 100644 --- a/services/apps/alcs/src/portal/application-submission/covenant-transferee/covenant-transferee.dto.ts +++ b/services/apps/alcs/src/portal/application-submission/covenant-transferee/covenant-transferee.dto.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { IsOptional, IsString, Matches } from 'class-validator'; import { OwnerTypeDto } from '../../../common/owner-type/owner-type.entity'; import { emailRegex } from '../../../utils/email.helper'; diff --git a/services/apps/alcs/src/portal/application-submission/covenant-transferee/covenant-transferee.entity.ts b/services/apps/alcs/src/portal/application-submission/covenant-transferee/covenant-transferee.entity.ts index 55c549cc12..94d41c606d 100644 --- a/services/apps/alcs/src/portal/application-submission/covenant-transferee/covenant-transferee.entity.ts +++ b/services/apps/alcs/src/portal/application-submission/covenant-transferee/covenant-transferee.entity.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { Column, Entity, ManyToOne } from 'typeorm'; import { Base } from '../../../common/entities/base.entity'; import { OwnerType } from '../../../common/owner-type/owner-type.entity'; diff --git a/services/apps/alcs/src/portal/code/code.controller.spec.ts b/services/apps/alcs/src/portal/code/code.controller.spec.ts index fc700c5ee5..e155a40fec 100644 --- a/services/apps/alcs/src/portal/code/code.controller.spec.ts +++ b/services/apps/alcs/src/portal/code/code.controller.spec.ts @@ -1,5 +1,5 @@ -import { classes } from '@automapper/classes'; -import { AutomapperModule } from '@automapper/nestjs'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { ClsService } from 'nestjs-cls'; diff --git a/services/apps/alcs/src/portal/code/code.controller.ts b/services/apps/alcs/src/portal/code/code.controller.ts index 99550bb41f..d1e5a000d5 100644 --- a/services/apps/alcs/src/portal/code/code.controller.ts +++ b/services/apps/alcs/src/portal/code/code.controller.ts @@ -1,5 +1,5 @@ -import { Mapper } from '@automapper/core'; -import { InjectMapper } from '@automapper/nestjs'; +import { Mapper } from 'automapper-core'; +import { InjectMapper } from 'automapper-nestjs'; import { Controller, Get, Req } from '@nestjs/common'; import { Public } from 'nest-keycloak-connect'; import { ApplicationDecisionMakerCode } from '../../alcs/application-decision/application-decision-maker/application-decision-maker.entity'; @@ -92,9 +92,8 @@ export class CodeController { let bceidGuid; if (tokenHeader) { - const token = await this.authorizationService.decodeHeaderToken( - tokenHeader, - ); + const token = + await this.authorizationService.decodeHeaderToken(tokenHeader); bceidGuid = token ? token['bceid_business_guid'] : false; } diff --git a/services/apps/alcs/src/portal/inbox/inbox.controller.spec.ts b/services/apps/alcs/src/portal/inbox/inbox.controller.spec.ts index ad0e7b5ce1..f365f3e8f7 100644 --- a/services/apps/alcs/src/portal/inbox/inbox.controller.spec.ts +++ b/services/apps/alcs/src/portal/inbox/inbox.controller.spec.ts @@ -1,5 +1,5 @@ -import { classes } from '@automapper/classes'; -import { AutomapperModule } from '@automapper/nestjs'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { ClsService } from 'nestjs-cls'; diff --git a/services/apps/alcs/src/portal/inbox/inbox.controller.ts b/services/apps/alcs/src/portal/inbox/inbox.controller.ts index f722ba6786..5ef841b31c 100644 --- a/services/apps/alcs/src/portal/inbox/inbox.controller.ts +++ b/services/apps/alcs/src/portal/inbox/inbox.controller.ts @@ -1,5 +1,5 @@ -import { Mapper } from '@automapper/core'; -import { InjectMapper } from '@automapper/nestjs'; +import { Mapper } from 'automapper-core'; +import { InjectMapper } from 'automapper-nestjs'; import { Body, Controller, Get, Post, Req, UseGuards } from '@nestjs/common'; import { ApplicationSubmissionStatusService } from '../../alcs/application/application-submission-status/application-submission-status.service'; import { ApplicationSubmissionStatusType } from '../../alcs/application/application-submission-status/submission-status-type.entity'; diff --git a/services/apps/alcs/src/portal/notice-of-intent-document/notice-of-intent-document.controller.spec.ts b/services/apps/alcs/src/portal/notice-of-intent-document/notice-of-intent-document.controller.spec.ts index bbf7125067..3db7e7aec7 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-document/notice-of-intent-document.controller.spec.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-document/notice-of-intent-document.controller.spec.ts @@ -1,5 +1,5 @@ -import { classes } from '@automapper/classes'; -import { AutomapperModule } from '@automapper/nestjs'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { ClsService } from 'nestjs-cls'; diff --git a/services/apps/alcs/src/portal/notice-of-intent-document/notice-of-intent-document.controller.ts b/services/apps/alcs/src/portal/notice-of-intent-document/notice-of-intent-document.controller.ts index 24d35afc8c..720aabe6b6 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-document/notice-of-intent-document.controller.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-document/notice-of-intent-document.controller.ts @@ -1,5 +1,5 @@ -import { Mapper } from '@automapper/core'; -import { InjectMapper } from '@automapper/nestjs'; +import { Mapper } from 'automapper-core'; +import { InjectMapper } from 'automapper-nestjs'; import { Body, Controller, @@ -78,9 +78,8 @@ export class NoticeOfIntentDocumentController { ); if (canAccessDocument) { - const url = await this.noticeOfIntentDocumentService.getInlineUrl( - document, - ); + const url = + await this.noticeOfIntentDocumentService.getInlineUrl(document); return { url }; } @@ -99,9 +98,8 @@ export class NoticeOfIntentDocumentController { ); //Map from file number to uuid - const noticeOfIntentUuid = await this.noticeOfIntentService.getUuid( - fileNumber, - ); + const noticeOfIntentUuid = + await this.noticeOfIntentService.getUuid(fileNumber); const res = await this.noticeOfIntentDocumentService.updateDescriptionAndType( diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.controller.spec.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.controller.spec.ts index 6f733202c4..3b3e25ba82 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.controller.spec.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.controller.spec.ts @@ -1,5 +1,5 @@ -import { classes } from '@automapper/classes'; -import { AutomapperModule } from '@automapper/nestjs'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { BadRequestException } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.controller.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.controller.ts index 5ee792ba26..3a1ba449e3 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.controller.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.controller.ts @@ -1,5 +1,5 @@ -import { Mapper } from '@automapper/core'; -import { InjectMapper } from '@automapper/nestjs'; +import { Mapper } from 'automapper-core'; +import { InjectMapper } from 'automapper-nestjs'; import { BadRequestException, Body, diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.dto.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.dto.ts index 671de80829..a6a94cbc5c 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.dto.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.dto.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { IsNumber, IsOptional, diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.entity.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.entity.ts index 62ec03a981..952f159054 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.entity.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.entity.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { Column, Entity, JoinColumn, ManyToMany, ManyToOne } from 'typeorm'; import { NoticeOfIntentDocumentDto } from '../../../alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.dto'; import { NoticeOfIntentDocument } from '../../../alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.entity'; diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.controller.spec.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.controller.spec.ts index 3b62960e5a..60176a872f 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.controller.spec.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.controller.spec.ts @@ -1,5 +1,5 @@ -import { classes } from '@automapper/classes'; -import { AutomapperModule } from '@automapper/nestjs'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { ClsService } from 'nestjs-cls'; diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.controller.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.controller.ts index 1b0271bd8e..1e2dbba549 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.controller.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.controller.ts @@ -1,5 +1,5 @@ -import { Mapper } from '@automapper/core'; -import { InjectMapper } from '@automapper/nestjs'; +import { Mapper } from 'automapper-core'; +import { InjectMapper } from 'automapper-nestjs'; import { Body, Controller, @@ -49,9 +49,8 @@ export class NoticeOfIntentParcelController { async fetchByFileId( @Param('submissionUuid') submissionUuid: string, ): Promise<NoticeOfIntentParcelDto[] | undefined> { - const parcels = await this.parcelService.fetchByApplicationSubmissionUuid( - submissionUuid, - ); + const parcels = + await this.parcelService.fetchByApplicationSubmissionUuid(submissionUuid); return this.mapper.mapArrayAsync( parcels, NoticeOfIntentParcel, diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.dto.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.dto.ts index 77f20736f8..7df5bc6ca8 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.dto.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.dto.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { IsArray, IsBoolean, diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.entity.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.entity.ts index d144381b70..3e9ac7abbe 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.entity.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.entity.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { Column, Entity, diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.controller.spec.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.controller.spec.ts index 6a008bdf28..3712713701 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.controller.spec.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.controller.spec.ts @@ -1,5 +1,5 @@ -import { classes } from '@automapper/classes'; -import { AutomapperModule } from '@automapper/nestjs'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { BadRequestException } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.dto.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.dto.ts index 027c4187f8..7fd430fdaa 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.dto.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.dto.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { IsArray, IsBoolean, diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.entity.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.entity.ts index 2c9cc13a39..9cae12cac7 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.entity.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.entity.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { AfterLoad, Column, diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts index d28f649e0f..4408c939be 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts @@ -1,6 +1,6 @@ import { BaseServiceException } from '@app/common/exceptions/base.exception'; -import { classes } from '@automapper/classes'; -import { AutomapperModule } from '@automapper/nestjs'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts index 7ab6dcd3a2..18df0e3920 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts @@ -1,6 +1,6 @@ import { BaseServiceException } from '@app/common/exceptions/base.exception'; -import { Mapper } from '@automapper/core'; -import { InjectMapper } from '@automapper/nestjs'; +import { Mapper } from 'automapper-core'; +import { InjectMapper } from 'automapper-nestjs'; import { Injectable, Logger } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { @@ -90,9 +90,8 @@ export class NoticeOfIntentSubmissionService { createdBy, }); - const savedSubmission = await this.noticeOfIntentSubmissionRepository.save( - noiSubmission, - ); + const savedSubmission = + await this.noticeOfIntentSubmissionRepository.save(noiSubmission); await this.noticeOfIntentSubmissionStatusService.setInitialStatuses( savedSubmission.uuid, diff --git a/services/apps/alcs/src/portal/notification-document/notification-document.controller.spec.ts b/services/apps/alcs/src/portal/notification-document/notification-document.controller.spec.ts index 6db2f5afc4..2afbe33066 100644 --- a/services/apps/alcs/src/portal/notification-document/notification-document.controller.spec.ts +++ b/services/apps/alcs/src/portal/notification-document/notification-document.controller.spec.ts @@ -1,5 +1,5 @@ -import { classes } from '@automapper/classes'; -import { AutomapperModule } from '@automapper/nestjs'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { ClsService } from 'nestjs-cls'; diff --git a/services/apps/alcs/src/portal/notification-document/notification-document.controller.ts b/services/apps/alcs/src/portal/notification-document/notification-document.controller.ts index 27b3c8a1ab..54c990bb0a 100644 --- a/services/apps/alcs/src/portal/notification-document/notification-document.controller.ts +++ b/services/apps/alcs/src/portal/notification-document/notification-document.controller.ts @@ -1,5 +1,5 @@ -import { Mapper } from '@automapper/core'; -import { InjectMapper } from '@automapper/nestjs'; +import { Mapper } from 'automapper-core'; +import { InjectMapper } from 'automapper-nestjs'; import { Body, Controller, @@ -96,9 +96,8 @@ export class NotificationDocumentController { ); if (canAccessDocument) { - const url = await this.notificationDocumentService.getDownloadUrl( - document, - ); + const url = + await this.notificationDocumentService.getDownloadUrl(document); return { url }; } diff --git a/services/apps/alcs/src/portal/notification-document/notification-document.dto.ts b/services/apps/alcs/src/portal/notification-document/notification-document.dto.ts index 0fed402dee..02ab6fffcc 100644 --- a/services/apps/alcs/src/portal/notification-document/notification-document.dto.ts +++ b/services/apps/alcs/src/portal/notification-document/notification-document.dto.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { IsNumber, IsOptional, IsString, IsUUID } from 'class-validator'; import { DOCUMENT_TYPE } from '../../document/document-code.entity'; import { DOCUMENT_SOURCE } from '../../document/document.dto'; diff --git a/services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.controller.spec.ts b/services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.controller.spec.ts index 2061680d07..26dbe711f6 100644 --- a/services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.controller.spec.ts +++ b/services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.controller.spec.ts @@ -1,5 +1,5 @@ -import { classes } from '@automapper/classes'; -import { AutomapperModule } from '@automapper/nestjs'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { ClsService } from 'nestjs-cls'; diff --git a/services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.controller.ts b/services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.controller.ts index 94c8f4d285..b4e7dd39ea 100644 --- a/services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.controller.ts +++ b/services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.controller.ts @@ -1,5 +1,5 @@ -import { Mapper } from '@automapper/core'; -import { InjectMapper } from '@automapper/nestjs'; +import { Mapper } from 'automapper-core'; +import { InjectMapper } from 'automapper-nestjs'; import { Body, Controller, @@ -36,9 +36,8 @@ export class NotificationParcelController { async fetchByFileId( @Param('submissionUuid') submissionUuid: string, ): Promise<NotificationParcelDto[] | undefined> { - const parcels = await this.parcelService.fetchBySubmissionUuid( - submissionUuid, - ); + const parcels = + await this.parcelService.fetchBySubmissionUuid(submissionUuid); return this.mapper.mapArrayAsync( parcels, NotificationParcel, diff --git a/services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.dto.ts b/services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.dto.ts index 4a2a541c8b..6c85e6da7a 100644 --- a/services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.dto.ts +++ b/services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.dto.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { IsBoolean, IsNotEmpty, diff --git a/services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.entity.ts b/services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.entity.ts index f54304c272..7324aee811 100644 --- a/services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.entity.ts +++ b/services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.entity.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { Column, Entity, ManyToOne } from 'typeorm'; import { Base } from '../../../common/entities/base.entity'; import { ParcelOwnershipType } from '../../../common/entities/parcel-ownership-type/parcel-ownership-type.entity'; diff --git a/services/apps/alcs/src/portal/notification-submission/notification-submission.controller.spec.ts b/services/apps/alcs/src/portal/notification-submission/notification-submission.controller.spec.ts index 085e989cad..cebdc4fca2 100644 --- a/services/apps/alcs/src/portal/notification-submission/notification-submission.controller.spec.ts +++ b/services/apps/alcs/src/portal/notification-submission/notification-submission.controller.spec.ts @@ -1,5 +1,5 @@ -import { classes } from '@automapper/classes'; -import { AutomapperModule } from '@automapper/nestjs'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { BadRequestException } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; diff --git a/services/apps/alcs/src/portal/notification-submission/notification-submission.dto.ts b/services/apps/alcs/src/portal/notification-submission/notification-submission.dto.ts index 911534b67c..18f91c07ce 100644 --- a/services/apps/alcs/src/portal/notification-submission/notification-submission.dto.ts +++ b/services/apps/alcs/src/portal/notification-submission/notification-submission.dto.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { IsBoolean, IsNumber, diff --git a/services/apps/alcs/src/portal/notification-submission/notification-submission.entity.ts b/services/apps/alcs/src/portal/notification-submission/notification-submission.entity.ts index 243102a00b..de7d4155f1 100644 --- a/services/apps/alcs/src/portal/notification-submission/notification-submission.entity.ts +++ b/services/apps/alcs/src/portal/notification-submission/notification-submission.entity.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { AfterLoad, Column, diff --git a/services/apps/alcs/src/portal/notification-submission/notification-submission.service.spec.ts b/services/apps/alcs/src/portal/notification-submission/notification-submission.service.spec.ts index b9d41aef52..151ff6a12b 100644 --- a/services/apps/alcs/src/portal/notification-submission/notification-submission.service.spec.ts +++ b/services/apps/alcs/src/portal/notification-submission/notification-submission.service.spec.ts @@ -1,6 +1,6 @@ import { BaseServiceException } from '@app/common/exceptions/base.exception'; -import { classes } from '@automapper/classes'; -import { AutomapperModule } from '@automapper/nestjs'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; diff --git a/services/apps/alcs/src/portal/notification-submission/notification-submission.service.ts b/services/apps/alcs/src/portal/notification-submission/notification-submission.service.ts index 04e4666be3..e69108c141 100644 --- a/services/apps/alcs/src/portal/notification-submission/notification-submission.service.ts +++ b/services/apps/alcs/src/portal/notification-submission/notification-submission.service.ts @@ -1,6 +1,6 @@ import { BaseServiceException } from '@app/common/exceptions/base.exception'; -import { Mapper } from '@automapper/core'; -import { InjectMapper } from '@automapper/nestjs'; +import { Mapper } from 'automapper-core'; +import { InjectMapper } from 'automapper-nestjs'; import { Injectable, Logger } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import * as dayjs from 'dayjs'; @@ -87,9 +87,8 @@ export class NotificationSubmissionService { createdBy, }); - const savedSubmission = await this.notificationSubmissionRepository.save( - noiSubmission, - ); + const savedSubmission = + await this.notificationSubmissionRepository.save(noiSubmission); await this.notificationSubmissionStatusService.setInitialStatuses( savedSubmission.uuid, diff --git a/services/apps/alcs/src/portal/notification-submission/notification-transferee/notification-transferee.controller.spec.ts b/services/apps/alcs/src/portal/notification-submission/notification-transferee/notification-transferee.controller.spec.ts index 87fed7ade8..6b8e08a003 100644 --- a/services/apps/alcs/src/portal/notification-submission/notification-transferee/notification-transferee.controller.spec.ts +++ b/services/apps/alcs/src/portal/notification-submission/notification-transferee/notification-transferee.controller.spec.ts @@ -1,5 +1,5 @@ -import { classes } from '@automapper/classes'; -import { AutomapperModule } from '@automapper/nestjs'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { BadRequestException } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; diff --git a/services/apps/alcs/src/portal/notification-submission/notification-transferee/notification-transferee.controller.ts b/services/apps/alcs/src/portal/notification-submission/notification-transferee/notification-transferee.controller.ts index 43a68adba9..1b9046c781 100644 --- a/services/apps/alcs/src/portal/notification-submission/notification-transferee/notification-transferee.controller.ts +++ b/services/apps/alcs/src/portal/notification-submission/notification-transferee/notification-transferee.controller.ts @@ -1,5 +1,5 @@ -import { Mapper } from '@automapper/core'; -import { InjectMapper } from '@automapper/nestjs'; +import { Mapper } from 'automapper-core'; +import { InjectMapper } from 'automapper-nestjs'; import { BadRequestException, Body, diff --git a/services/apps/alcs/src/portal/notification-submission/notification-transferee/notification-transferee.dto.ts b/services/apps/alcs/src/portal/notification-submission/notification-transferee/notification-transferee.dto.ts index c6441130de..4bc40966bf 100644 --- a/services/apps/alcs/src/portal/notification-submission/notification-transferee/notification-transferee.dto.ts +++ b/services/apps/alcs/src/portal/notification-submission/notification-transferee/notification-transferee.dto.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { IsOptional, IsString, Matches } from 'class-validator'; import { OwnerTypeDto } from '../../../common/owner-type/owner-type.entity'; import { emailRegex } from '../../../utils/email.helper'; diff --git a/services/apps/alcs/src/portal/notification-submission/notification-transferee/notification-transferee.entity.ts b/services/apps/alcs/src/portal/notification-submission/notification-transferee/notification-transferee.entity.ts index 4913dd4981..7abcf172f6 100644 --- a/services/apps/alcs/src/portal/notification-submission/notification-transferee/notification-transferee.entity.ts +++ b/services/apps/alcs/src/portal/notification-submission/notification-transferee/notification-transferee.entity.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { Column, Entity, ManyToOne } from 'typeorm'; import { Base } from '../../../common/entities/base.entity'; import { OwnerType } from '../../../common/owner-type/owner-type.entity'; diff --git a/services/apps/alcs/src/portal/pdf-generation/generate-review-document.service.spec.ts b/services/apps/alcs/src/portal/pdf-generation/generate-review-document.service.spec.ts index 61f7cfb8ce..48a65e7d6b 100644 --- a/services/apps/alcs/src/portal/pdf-generation/generate-review-document.service.spec.ts +++ b/services/apps/alcs/src/portal/pdf-generation/generate-review-document.service.spec.ts @@ -1,6 +1,6 @@ import { CdogsService } from '@app/common/cdogs/cdogs.service'; -import { classes } from '@automapper/classes'; -import { AutomapperModule } from '@automapper/nestjs'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { LocalGovernment } from '../../alcs/local-government/local-government.entity'; diff --git a/services/apps/alcs/src/portal/pdf-generation/generate-review-document.service.ts b/services/apps/alcs/src/portal/pdf-generation/generate-review-document.service.ts index ab9b437617..f207ab4b63 100644 --- a/services/apps/alcs/src/portal/pdf-generation/generate-review-document.service.ts +++ b/services/apps/alcs/src/portal/pdf-generation/generate-review-document.service.ts @@ -1,6 +1,6 @@ import { CdogsService } from '@app/common/cdogs/cdogs.service'; -import { Mapper } from '@automapper/core'; -import { InjectMapper } from '@automapper/nestjs'; +import { Mapper } from 'automapper-core'; +import { InjectMapper } from 'automapper-nestjs'; import { forwardRef, HttpStatus, Inject, Injectable } from '@nestjs/common'; import * as config from 'config'; import * as dayjs from 'dayjs'; diff --git a/services/apps/alcs/src/portal/public/application/application-decision.controller.spec.ts b/services/apps/alcs/src/portal/public/application/application-decision.controller.spec.ts index 8b66de3fd8..f7286fcc25 100644 --- a/services/apps/alcs/src/portal/public/application/application-decision.controller.spec.ts +++ b/services/apps/alcs/src/portal/public/application/application-decision.controller.spec.ts @@ -1,5 +1,5 @@ -import { classes } from '@automapper/classes'; -import { AutomapperModule } from '@automapper/nestjs'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { ClsService } from 'nestjs-cls'; diff --git a/services/apps/alcs/src/portal/public/application/application-decision.controller.ts b/services/apps/alcs/src/portal/public/application/application-decision.controller.ts index ef2d73a47a..10e0fad520 100644 --- a/services/apps/alcs/src/portal/public/application/application-decision.controller.ts +++ b/services/apps/alcs/src/portal/public/application/application-decision.controller.ts @@ -1,5 +1,5 @@ -import { Mapper } from '@automapper/core'; -import { InjectMapper } from '@automapper/nestjs'; +import { Mapper } from 'automapper-core'; +import { InjectMapper } from 'automapper-nestjs'; import { Controller, Get, Param } from '@nestjs/common'; import { Public } from 'nest-keycloak-connect'; import { ApplicationDecisionV2Service } from '../../../alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service'; diff --git a/services/apps/alcs/src/portal/public/application/application-decision.dto.ts b/services/apps/alcs/src/portal/public/application/application-decision.dto.ts index d27156aa23..6393d1b17a 100644 --- a/services/apps/alcs/src/portal/public/application/application-decision.dto.ts +++ b/services/apps/alcs/src/portal/public/application/application-decision.dto.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { DecisionDocumentDto, LinkedResolutionDto, diff --git a/services/apps/alcs/src/portal/public/application/public-application.dto.ts b/services/apps/alcs/src/portal/public/application/public-application.dto.ts index 17ee52f409..8750c3c281 100644 --- a/services/apps/alcs/src/portal/public/application/public-application.dto.ts +++ b/services/apps/alcs/src/portal/public/application/public-application.dto.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { ApplicationStatusDto } from '../../../alcs/application/application-submission-status/submission-status.dto'; import { NaruSubtypeDto } from '../../application-submission/application-submission.dto'; import { ProposedLot } from '../../application-submission/application-submission.entity'; diff --git a/services/apps/alcs/src/portal/public/application/public-application.service.spec.ts b/services/apps/alcs/src/portal/public/application/public-application.service.spec.ts index a06559ce66..8da330e11c 100644 --- a/services/apps/alcs/src/portal/public/application/public-application.service.spec.ts +++ b/services/apps/alcs/src/portal/public/application/public-application.service.spec.ts @@ -1,6 +1,6 @@ import { ServiceNotFoundException } from '@app/common/exceptions/base.exception'; -import { classes } from '@automapper/classes'; -import { AutomapperModule } from '@automapper/nestjs'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { ApplicationDecisionV2Service } from '../../../alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service'; diff --git a/services/apps/alcs/src/portal/public/application/public-application.service.ts b/services/apps/alcs/src/portal/public/application/public-application.service.ts index 2da8905f07..7a276d5406 100644 --- a/services/apps/alcs/src/portal/public/application/public-application.service.ts +++ b/services/apps/alcs/src/portal/public/application/public-application.service.ts @@ -1,6 +1,6 @@ import { ServiceNotFoundException } from '@app/common/exceptions/base.exception'; -import { Mapper } from '@automapper/core'; -import { InjectMapper } from '@automapper/nestjs'; +import { Mapper } from 'automapper-core'; +import { InjectMapper } from 'automapper-nestjs'; import { Injectable } from '@nestjs/common'; import { ApplicationDecisionV2Service } from '../../../alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service'; import { ApplicationDecision } from '../../../alcs/application-decision/application-decision.entity'; @@ -96,9 +96,8 @@ export class PublicApplicationService { ); } - const decisions = await this.applicationDecisionService.getForPortal( - fileNumber, - ); + const decisions = + await this.applicationDecisionService.getForPortal(fileNumber); const mappedDecisions = this.mapper.mapArray( decisions, ApplicationDecision, diff --git a/services/apps/alcs/src/portal/public/notice-of-intent/notice-of-intent-decision.controller.spec.ts b/services/apps/alcs/src/portal/public/notice-of-intent/notice-of-intent-decision.controller.spec.ts index 88d95cdc0e..a8fc747905 100644 --- a/services/apps/alcs/src/portal/public/notice-of-intent/notice-of-intent-decision.controller.spec.ts +++ b/services/apps/alcs/src/portal/public/notice-of-intent/notice-of-intent-decision.controller.spec.ts @@ -1,5 +1,5 @@ -import { classes } from '@automapper/classes'; -import { AutomapperModule } from '@automapper/nestjs'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { ClsService } from 'nestjs-cls'; diff --git a/services/apps/alcs/src/portal/public/notice-of-intent/notice-of-intent-decision.controller.ts b/services/apps/alcs/src/portal/public/notice-of-intent/notice-of-intent-decision.controller.ts index c42f3e72f4..b4804f9fda 100644 --- a/services/apps/alcs/src/portal/public/notice-of-intent/notice-of-intent-decision.controller.ts +++ b/services/apps/alcs/src/portal/public/notice-of-intent/notice-of-intent-decision.controller.ts @@ -1,5 +1,5 @@ -import { Mapper } from '@automapper/core'; -import { InjectMapper } from '@automapper/nestjs'; +import { Mapper } from 'automapper-core'; +import { InjectMapper } from 'automapper-nestjs'; import { Controller, Get, Param } from '@nestjs/common'; import { Public } from 'nest-keycloak-connect'; import { NoticeOfIntentDecisionV2Service } from '../../../alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.service'; diff --git a/services/apps/alcs/src/portal/public/notice-of-intent/notice-of-intent-decision.dto.ts b/services/apps/alcs/src/portal/public/notice-of-intent/notice-of-intent-decision.dto.ts index 4be5dfd02e..c8f7796c71 100644 --- a/services/apps/alcs/src/portal/public/notice-of-intent/notice-of-intent-decision.dto.ts +++ b/services/apps/alcs/src/portal/public/notice-of-intent/notice-of-intent-decision.dto.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { LinkedResolutionDto } from '../../../alcs/application-decision/application-decision-v1/application-decision/application-decision.dto'; import { NoticeOfIntentDecisionDocumentDto, diff --git a/services/apps/alcs/src/portal/public/notice-of-intent/public-notice-of-intent.dto.ts b/services/apps/alcs/src/portal/public/notice-of-intent/public-notice-of-intent.dto.ts index f7dce0d15d..64af27cdf9 100644 --- a/services/apps/alcs/src/portal/public/notice-of-intent/public-notice-of-intent.dto.ts +++ b/services/apps/alcs/src/portal/public/notice-of-intent/public-notice-of-intent.dto.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { NoticeOfIntentStatusDto } from '../../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status.dto'; import { ProposedStructure } from '../../notice-of-intent-submission/notice-of-intent-submission.entity'; import { PublicOwnerDto } from '../public.dto'; diff --git a/services/apps/alcs/src/portal/public/notice-of-intent/public-notice-of-intent.service.spec.ts b/services/apps/alcs/src/portal/public/notice-of-intent/public-notice-of-intent.service.spec.ts index 5929249f5f..52e71c2b2c 100644 --- a/services/apps/alcs/src/portal/public/notice-of-intent/public-notice-of-intent.service.spec.ts +++ b/services/apps/alcs/src/portal/public/notice-of-intent/public-notice-of-intent.service.spec.ts @@ -1,6 +1,6 @@ import { ServiceNotFoundException } from '@app/common/exceptions/base.exception'; -import { classes } from '@automapper/classes'; -import { AutomapperModule } from '@automapper/nestjs'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { VISIBILITY_FLAG } from '../../../alcs/application/application-document/application-document.entity'; diff --git a/services/apps/alcs/src/portal/public/notice-of-intent/public-notice-of-intent.service.ts b/services/apps/alcs/src/portal/public/notice-of-intent/public-notice-of-intent.service.ts index da7617a8f3..c5c5e883a8 100644 --- a/services/apps/alcs/src/portal/public/notice-of-intent/public-notice-of-intent.service.ts +++ b/services/apps/alcs/src/portal/public/notice-of-intent/public-notice-of-intent.service.ts @@ -1,6 +1,6 @@ import { ServiceNotFoundException } from '@app/common/exceptions/base.exception'; -import { Mapper } from '@automapper/core'; -import { InjectMapper } from '@automapper/nestjs'; +import { Mapper } from 'automapper-core'; +import { InjectMapper } from 'automapper-nestjs'; import { Injectable } from '@nestjs/common'; import { VISIBILITY_FLAG } from '../../../alcs/application/application-document/application-document.entity'; import { NoticeOfIntentDecisionV2Service } from '../../../alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.service'; @@ -28,9 +28,8 @@ export class PublicNoticeOfIntentService { ) {} async getPublicData(fileNumber: string) { - const noticeOfIntent = await this.noticeOfIntentService.getByFileNumber( - fileNumber, - ); + const noticeOfIntent = + await this.noticeOfIntentService.getByFileNumber(fileNumber); //Easy way to check if its public if (!noticeOfIntent?.dateReceivedAllItems) { @@ -44,9 +43,8 @@ export class PublicNoticeOfIntentService { fileNumber, ); - const parcels = await this.noticeOfIntentParcelService.fetchByFileId( - fileNumber, - ); + const parcels = + await this.noticeOfIntentParcelService.fetchByFileId(fileNumber); const mappedParcels = this.mapper.mapArray( parcels, @@ -72,9 +70,8 @@ export class PublicNoticeOfIntentService { PublicDocumentDto, ); - const decisions = await this.noticeOfIntentDecisionV2Service.getForPortal( - fileNumber, - ); + const decisions = + await this.noticeOfIntentDecisionV2Service.getForPortal(fileNumber); const mappedDecisions = this.mapper.mapArray( decisions, NoticeOfIntentDecision, @@ -96,9 +93,8 @@ export class PublicNoticeOfIntentService { throw new ServiceNotFoundException('Failed to find document'); } - const url = await this.noticeOfIntentDocumentService.getDownloadUrl( - document, - ); + const url = + await this.noticeOfIntentDocumentService.getDownloadUrl(document); return { url, diff --git a/services/apps/alcs/src/portal/public/notification/public-notification.dto.ts b/services/apps/alcs/src/portal/public/notification/public-notification.dto.ts index f6d4508126..2c22a416e6 100644 --- a/services/apps/alcs/src/portal/public/notification/public-notification.dto.ts +++ b/services/apps/alcs/src/portal/public/notification/public-notification.dto.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { NotificationStatusDto } from '../../../alcs/notification/notification-submission-status/notification-status.dto'; import { PublicOwnerDto } from '../public.dto'; diff --git a/services/apps/alcs/src/portal/public/notification/public-notification.service.spec.ts b/services/apps/alcs/src/portal/public/notification/public-notification.service.spec.ts index 95c226977b..65040f023f 100644 --- a/services/apps/alcs/src/portal/public/notification/public-notification.service.spec.ts +++ b/services/apps/alcs/src/portal/public/notification/public-notification.service.spec.ts @@ -1,6 +1,6 @@ import { ServiceNotFoundException } from '@app/common/exceptions/base.exception'; -import { classes } from '@automapper/classes'; -import { AutomapperModule } from '@automapper/nestjs'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { VISIBILITY_FLAG } from '../../../alcs/application/application-document/application-document.entity'; diff --git a/services/apps/alcs/src/portal/public/notification/public-notification.service.ts b/services/apps/alcs/src/portal/public/notification/public-notification.service.ts index e261ca83a4..a7a9e1a119 100644 --- a/services/apps/alcs/src/portal/public/notification/public-notification.service.ts +++ b/services/apps/alcs/src/portal/public/notification/public-notification.service.ts @@ -1,6 +1,6 @@ import { ServiceNotFoundException } from '@app/common/exceptions/base.exception'; -import { Mapper } from '@automapper/core'; -import { InjectMapper } from '@automapper/nestjs'; +import { Mapper } from 'automapper-core'; +import { InjectMapper } from 'automapper-nestjs'; import { Injectable } from '@nestjs/common'; import { VISIBILITY_FLAG } from '../../../alcs/application/application-document/application-document.entity'; import { NotificationDocument } from '../../../alcs/notification/notification-document/notification-document.entity'; @@ -25,9 +25,8 @@ export class PublicNotificationService { ) {} async getPublicData(fileNumber: string) { - const notification = await this.notificationService.getByFileNumber( - fileNumber, - ); + const notification = + await this.notificationService.getByFileNumber(fileNumber); const submission = await this.notificationSubmissionService.getOrFailByFileNumber( @@ -44,9 +43,8 @@ export class PublicNotificationService { ); } - const parcels = await this.notificationParcelService.fetchByFileId( - fileNumber, - ); + const parcels = + await this.notificationParcelService.fetchByFileId(fileNumber); const mappedParcels = this.mapper.mapArray( parcels, diff --git a/services/apps/alcs/src/portal/public/public.dto.ts b/services/apps/alcs/src/portal/public/public.dto.ts index 2ebe64d785..46bcf7f7c1 100644 --- a/services/apps/alcs/src/portal/public/public.dto.ts +++ b/services/apps/alcs/src/portal/public/public.dto.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { OwnerTypeDto } from '../../common/owner-type/owner-type.entity'; import { DocumentTypeDto } from '../../document/document.dto'; import { ApplicationParcelOwnershipTypeDto } from '../application-submission/application-parcel/application-parcel.dto'; diff --git a/services/apps/alcs/src/portal/public/search/public-search.controller.spec.ts b/services/apps/alcs/src/portal/public/search/public-search.controller.spec.ts index 5b7cb0fb23..826e976a9d 100644 --- a/services/apps/alcs/src/portal/public/search/public-search.controller.spec.ts +++ b/services/apps/alcs/src/portal/public/search/public-search.controller.spec.ts @@ -1,5 +1,5 @@ -import { classes } from '@automapper/classes'; -import { AutomapperModule } from '@automapper/nestjs'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { ClsService } from 'nestjs-cls'; diff --git a/services/apps/alcs/src/portal/public/search/public-search.controller.ts b/services/apps/alcs/src/portal/public/search/public-search.controller.ts index d62a78e739..d551fad06b 100644 --- a/services/apps/alcs/src/portal/public/search/public-search.controller.ts +++ b/services/apps/alcs/src/portal/public/search/public-search.controller.ts @@ -1,5 +1,5 @@ -import { Mapper } from '@automapper/core'; -import { InjectMapper } from '@automapper/nestjs'; +import { Mapper } from 'automapper-core'; +import { InjectMapper } from 'automapper-nestjs'; import { Body, Controller, Post } from '@nestjs/common'; import { Public } from 'nest-keycloak-connect'; import { isStringSetAndNotEmpty } from '../../../utils/string-helper'; @@ -68,9 +68,8 @@ export class PublicSearchController { async searchApplications( @Body() searchDto: SearchRequestDto, ): Promise<AdvancedSearchResultDto<ApplicationSearchResultDto[]>> { - const applications = await this.applicationSearchService.searchApplications( - searchDto, - ); + const applications = + await this.applicationSearchService.searchApplications(searchDto); const mappedSearchResult = this.mapSearchResults(applications, null, null); @@ -103,9 +102,8 @@ export class PublicSearchController { async searchNotifications( @Body() searchDto: SearchRequestDto, ): Promise<AdvancedSearchResultDto<NotificationSearchResultDto[]>> { - const notifications = await this.notificationSearchService.search( - searchDto, - ); + const notifications = + await this.notificationSearchService.search(searchDto); const mappedSearchResult = this.mapSearchResults(null, null, notifications); diff --git a/services/apps/alcs/src/portal/public/status/public-status.controller.spec.ts b/services/apps/alcs/src/portal/public/status/public-status.controller.spec.ts index 65727aa03f..228474bd4b 100644 --- a/services/apps/alcs/src/portal/public/status/public-status.controller.spec.ts +++ b/services/apps/alcs/src/portal/public/status/public-status.controller.spec.ts @@ -1,5 +1,5 @@ -import { classes } from '@automapper/classes'; -import { AutomapperModule } from '@automapper/nestjs'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { ClsService } from 'nestjs-cls'; diff --git a/services/apps/alcs/src/portal/public/status/public-status.controller.ts b/services/apps/alcs/src/portal/public/status/public-status.controller.ts index a894333e62..a9f06d19e2 100644 --- a/services/apps/alcs/src/portal/public/status/public-status.controller.ts +++ b/services/apps/alcs/src/portal/public/status/public-status.controller.ts @@ -1,5 +1,5 @@ -import { Mapper } from '@automapper/core'; -import { InjectMapper } from '@automapper/nestjs'; +import { Mapper } from 'automapper-core'; +import { InjectMapper } from 'automapper-nestjs'; import { Controller, Get } from '@nestjs/common'; import { Public } from 'nest-keycloak-connect'; import { ApplicationSubmissionStatusService } from '../../../alcs/application/application-submission-status/application-submission-status.service'; diff --git a/services/apps/alcs/src/providers/email/email-status.entity.ts b/services/apps/alcs/src/providers/email/email-status.entity.ts index cfe8267298..086928fe56 100644 --- a/services/apps/alcs/src/providers/email/email-status.entity.ts +++ b/services/apps/alcs/src/providers/email/email-status.entity.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { BaseEntity, Column, diff --git a/services/apps/alcs/src/user/user.controller.spec.ts b/services/apps/alcs/src/user/user.controller.spec.ts index 5fdc849c28..c996b96c52 100644 --- a/services/apps/alcs/src/user/user.controller.spec.ts +++ b/services/apps/alcs/src/user/user.controller.spec.ts @@ -1,5 +1,5 @@ -import { classes } from '@automapper/classes'; -import { AutomapperModule } from '@automapper/nestjs'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { ClsService } from 'nestjs-cls'; diff --git a/services/apps/alcs/src/user/user.controller.ts b/services/apps/alcs/src/user/user.controller.ts index b82a71d37e..06d5073d88 100644 --- a/services/apps/alcs/src/user/user.controller.ts +++ b/services/apps/alcs/src/user/user.controller.ts @@ -1,5 +1,5 @@ -import { Mapper } from '@automapper/core'; -import { InjectMapper } from '@automapper/nestjs'; +import { Mapper } from 'automapper-core'; +import { InjectMapper } from 'automapper-nestjs'; import { Body, Controller, diff --git a/services/apps/alcs/src/user/user.dto.ts b/services/apps/alcs/src/user/user.dto.ts index 4330013a01..a49a9a176d 100644 --- a/services/apps/alcs/src/user/user.dto.ts +++ b/services/apps/alcs/src/user/user.dto.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { Type } from 'class-transformer'; import { IsDefined } from 'class-validator'; diff --git a/services/apps/alcs/src/user/user.entity.ts b/services/apps/alcs/src/user/user.entity.ts index e19f40b92a..b180269642 100644 --- a/services/apps/alcs/src/user/user.entity.ts +++ b/services/apps/alcs/src/user/user.entity.ts @@ -1,4 +1,4 @@ -import { AutoMap } from '@automapper/classes'; +import { AutoMap } from 'automapper-classes'; import { Column, Entity, Index, OneToMany } from 'typeorm'; import { Card } from '../alcs/card/card.entity'; import { CommentMention } from '../alcs/comment/mention/comment-mention.entity'; diff --git a/services/apps/alcs/src/user/user.service.spec.ts b/services/apps/alcs/src/user/user.service.spec.ts index 1ed6ce1dcb..475ad53d43 100644 --- a/services/apps/alcs/src/user/user.service.spec.ts +++ b/services/apps/alcs/src/user/user.service.spec.ts @@ -1,7 +1,7 @@ import { CONFIG_TOKEN } from '@app/common/config/config.module'; import { ServiceNotFoundException } from '@app/common/exceptions/base.exception'; -import { classes } from '@automapper/classes'; -import { AutomapperModule } from '@automapper/nestjs'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; diff --git a/services/apps/alcs/src/user/user.service.ts b/services/apps/alcs/src/user/user.service.ts index 3b3c58a364..f2343f4cbb 100644 --- a/services/apps/alcs/src/user/user.service.ts +++ b/services/apps/alcs/src/user/user.service.ts @@ -1,9 +1,9 @@ import { CONFIG_TOKEN } from '@app/common/config/config.module'; import { ServiceNotFoundException } from '@app/common/exceptions/base.exception'; -import { Mapper } from '@automapper/core'; -import { InjectMapper } from '@automapper/nestjs'; +import { Mapper } from 'automapper-core'; import { Inject, Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; +import { InjectMapper } from 'automapper-nestjs'; import { IConfig } from 'config'; import { Repository } from 'typeorm'; import { LocalGovernment } from '../alcs/local-government/local-government.entity'; diff --git a/services/nest-cli.json b/services/nest-cli.json index d8f838b61f..e9309ef050 100644 --- a/services/nest-cli.json +++ b/services/nest-cli.json @@ -3,7 +3,7 @@ "collection": "@nestjs/schematics", "sourceRoot": "apps/alcs/src", "compilerOptions": { - "plugins": ["@nestjs/swagger", "@automapper/classes/transformer-plugin"], + "plugins": ["@nestjs/swagger", "automapper-classes/transformer-plugin"], "assets": [ "common/envs/*", { diff --git a/services/package-lock.json b/services/package-lock.json index 297ed722a6..22b6a99352 100644 --- a/services/package-lock.json +++ b/services/package-lock.json @@ -1,7 +1,7 @@ { "name": "api", "version": "0.0.1", - "lockfileVersion": 2, + "lockfileVersion": 3, "requires": true, "packages": { "": { @@ -9,93 +9,102 @@ "version": "0.0.1", "license": "Apache-2.0", "dependencies": { - "@automapper/classes": "^8.7.7", - "@automapper/core": "^8.7.0", - "@automapper/nestjs": "^8.7.7", - "@aws-sdk/client-s3": "^3.264.0", - "@aws-sdk/s3-request-presigner": "^3.264.0", - "@fastify/cors": "^8.2.0", - "@fastify/helmet": "^10.1.0", - "@fastify/multipart": "^7.4.1", - "@fastify/static": "^6.8.0", + "@aws-sdk/client-s3": "^3.441.0", + "@aws-sdk/s3-request-presigner": "^3.441.0", + "@fastify/cors": "^8.4.1", + "@fastify/helmet": "^11.1.1", + "@fastify/multipart": "^8.0.0", + "@fastify/static": "^6.12.0", "@grpc/grpc-js": "^1.8.7", "@grpc/proto-loader": "^0.7.4", - "@nestjs/axios": "^0.1.1", + "@nestjs/axios": "^3.0.1", "@nestjs/bullmq": "^10.0.1", - "@nestjs/common": "^9.3.1", - "@nestjs/config": "^2.3.0", - "@nestjs/core": "^9.3.1", - "@nestjs/microservices": "^9.3.1", - "@nestjs/platform-fastify": "^9.3.1", - "@nestjs/swagger": "^6.1.4", - "@nestjs/typeorm": "^9.0.1", - "@types/clamscan": "^2.0.5", + "@nestjs/common": "^10.2.8", + "@nestjs/config": "^3.1.1", + "@nestjs/core": "^10.2.8", + "@nestjs/microservices": "^10.2.8", + "@nestjs/platform-fastify": "^10.2.8", + "@nestjs/swagger": "^7.1.14", + "@nestjs/typeorm": "^10.0.0", + "@types/clamscan": "^2.0.6", + "automapper-classes": "^8.7.11", + "automapper-core": "^8.7.11", + "automapper-nestjs": "^8.7.11", "clamscan": "^2.1.2", "class-transformer": "^0.5.1", "class-validator": "^0.14.0", "config": "^3.3.9", "csv-parser": "^3.0.0", - "dayjs": "^1.11.7", - "handlebars": "^4.7.7", - "keycloak-connect": "^18.0.2", - "mjml": "^4.13.0", - "nest-keycloak-connect": "^1.9.1", - "nestjs-cls": "^2.2.1", + "dayjs": "^1.11.10", + "handlebars": "^4.7.8", + "keycloak-connect": "^21.1.2", + "mjml": "^4.14.1", + "nest-keycloak-connect": "^1.9.2", + "nestjs-cls": "^3.6.0", "nestjs-grpc-reflection": "^0.0.18", - "nestjs-pino": "^3.1.2", - "nestjs-spelunker": "^1.1.3", - "node-jose": "^2.1.1", - "pg": "^8.9.0", - "redis": "^4.6.4", + "nestjs-pino": "^3.5.0", + "nestjs-spelunker": "^1.3.0", + "node-jose": "^2.2.0", + "pg": "^8.11.3", + "redis": "^4.6.10", "reflect-metadata": "^0.1.13", - "rimraf": "^3.0.2", - "rxjs": "^7.8.0", + "rimraf": "^5.0.5", + "rxjs": "^7.8.1", "source-map-support": "^0.5.21", - "ts-proto": "^1.139.0", + "ts-proto": "^1.163.0", "ts-protoc-gen": "^0.15.0", - "typeorm": "^0.3.11", + "typeorm": "^0.3.17", "typeorm-naming-strategies": "^4.1.0", - "uuid": "^8.3.2" + "uuid": "^9.0.1" }, "devDependencies": { "@golevelup/nestjs-testing": "^0.1.2", - "@nestjs/cli": "^9.1.9", - "@nestjs/schematics": "^9.0.4", - "@nestjs/testing": "^9.3.1", - "@types/config": "^0.0.41", - "@types/express": "^4.17.16", - "@types/jest": "28.1.4", - "@types/node": "^18.11.18", - "@types/node-jose": "^1.1.10", - "@types/source-map-support": "^0.5.6", - "@types/supertest": "^2.0.12", - "@types/uuid": "^8.3.4", - "@typescript-eslint/eslint-plugin": "^5.50.0", - "@typescript-eslint/parser": "^5.50.0", + "@nestjs/cli": "^10.2.1", + "@nestjs/schematics": "^10.0.3", + "@nestjs/testing": "^10.2.8", + "@types/config": "^3.3.2", + "@types/express": "^4.17.20", + "@types/jest": "^29.5.7", + "@types/node": "^20.8.10", + "@types/node-jose": "^1.1.12", + "@types/source-map-support": "^0.5.9", + "@types/supertest": "^2.0.15", + "@types/uuid": "^9.0.6", + "@typescript-eslint/eslint-plugin": "^6.9.1", + "@typescript-eslint/parser": "^6.9.1", "aws-sdk-client-mock": "^2.0.1", - "eslint": "^8.33.0", - "eslint-config-prettier": "^8.6.0", - "eslint-plugin-prettier": "^4.2.1", - "jest": "28.1.2", - "memfs": "^3.4.13", - "pino-pretty": "^8.1.0", - "prettier": "^2.8.3", + "eslint": "^8.52.0", + "eslint-config-prettier": "^9.0.0", + "eslint-plugin-prettier": "^5.0.1", + "jest": "^29.7.0", + "memfs": "^4.6.0", + "pino-pretty": "^10.2.3", + "prettier": "^3.0.3", "supertest": "^6.3.3", - "ts-jest": "28.0.5", - "ts-loader": "^9.4.2", + "ts-jest": "^29.1.1", + "ts-loader": "^9.5.0", "ts-node": "^10.9.1", - "tsconfig-paths": "4.0.0", - "typescript": "4.7.4", - "unionfs": "^4.4.0" + "tsconfig-paths": "^4.2.0", + "typescript": "^5.2.2", + "unionfs": "^4.5.1" + } + }, + "node_modules/@aashutoshrathi/word-wrap": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz", + "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==", + "dev": true, + "engines": { + "node": ">=0.10.0" } }, "node_modules/@ampproject/remapping": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz", - "integrity": "sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==", + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.1.tgz", + "integrity": "sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==", "dev": true, "dependencies": { - "@jridgewell/gen-mapping": "^0.1.0", + "@jridgewell/gen-mapping": "^0.3.0", "@jridgewell/trace-mapping": "^0.3.9" }, "engines": { @@ -103,19 +112,20 @@ } }, "node_modules/@angular-devkit/core": { - "version": "15.0.4", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-15.0.4.tgz", - "integrity": "sha512-4ITpRAevd652SxB+qNesIQ9qfbm7wT5UBU5kJOPPwGL77I21g8CQpkmV1n5VSacPvC9Zbz90feOWexf7w7JzcA==", + "version": "16.2.8", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-16.2.8.tgz", + "integrity": "sha512-PTGozYvh1Bin5lB15PwcXa26Ayd17bWGLS3H8Rs0s+04mUDvfNofmweaX1LgumWWy3nCUTDuwHxX10M3G0wE2g==", "dev": true, "dependencies": { - "ajv": "8.11.0", + "ajv": "8.12.0", "ajv-formats": "2.1.1", "jsonc-parser": "3.2.0", - "rxjs": "6.6.7", + "picomatch": "2.3.1", + "rxjs": "7.8.1", "source-map": "0.7.4" }, "engines": { - "node": "^14.20.0 || ^16.13.0 || >=18.10.0", + "node": "^16.14.0 || >=18.10.0", "npm": "^6.11.0 || ^7.5.6 || >=8.0.0", "yarn": ">= 1.13.0" }, @@ -128,50 +138,32 @@ } } }, - "node_modules/@angular-devkit/core/node_modules/rxjs": { - "version": "6.6.7", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", - "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", - "dev": true, - "dependencies": { - "tslib": "^1.9.0" - }, - "engines": { - "npm": ">=2.0.0" - } - }, - "node_modules/@angular-devkit/core/node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", - "dev": true - }, "node_modules/@angular-devkit/schematics": { - "version": "15.0.4", - "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-15.0.4.tgz", - "integrity": "sha512-/gXiLFS0+xFdx6wPoBpe/c6/K9I5edMpaASqPf4XheKtrsSvL+qTlIi3nsbfItzOiDXbaBmlbxGfkMHz/yg0Ig==", + "version": "16.2.8", + "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-16.2.8.tgz", + "integrity": "sha512-MBiKZOlR9/YMdflALr7/7w/BGAfo/BGTrlkqsIB6rDWV1dYiCgxI+033HsiNssLS6RQyCFx/e7JA2aBBzu9zEg==", "dev": true, "dependencies": { - "@angular-devkit/core": "15.0.4", + "@angular-devkit/core": "16.2.8", "jsonc-parser": "3.2.0", - "magic-string": "0.26.7", + "magic-string": "0.30.1", "ora": "5.4.1", - "rxjs": "6.6.7" + "rxjs": "7.8.1" }, "engines": { - "node": "^14.20.0 || ^16.13.0 || >=18.10.0", + "node": "^16.14.0 || >=18.10.0", "npm": "^6.11.0 || ^7.5.6 || >=8.0.0", "yarn": ">= 1.13.0" } }, "node_modules/@angular-devkit/schematics-cli": { - "version": "15.0.4", - "resolved": "https://registry.npmjs.org/@angular-devkit/schematics-cli/-/schematics-cli-15.0.4.tgz", - "integrity": "sha512-rEzkpjiQcJqCgbZ1Ns8jn1BL4724jcj+YFS7Qw5d4v6yQYA8iSLz12HDTH0TiNEv7u5S55fYuRz2QreI0QUT8A==", + "version": "16.2.8", + "resolved": "https://registry.npmjs.org/@angular-devkit/schematics-cli/-/schematics-cli-16.2.8.tgz", + "integrity": "sha512-EXURJCzWTVYCipiTT4vxQQOrF63asOUDbeOy3OtiSh7EwIUvxm3BPG6hquJqngEnI/N6bA75NJ1fBhU6Hrh7eA==", "dev": true, "dependencies": { - "@angular-devkit/core": "15.0.4", - "@angular-devkit/schematics": "15.0.4", + "@angular-devkit/core": "16.2.8", + "@angular-devkit/schematics": "16.2.8", "ansi-colors": "4.1.3", "inquirer": "8.2.4", "symbol-observable": "4.0.0", @@ -181,27 +173,11 @@ "schematics": "bin/schematics.js" }, "engines": { - "node": "^14.20.0 || ^16.13.0 || >=18.10.0", + "node": "^16.14.0 || >=18.10.0", "npm": "^6.11.0 || ^7.5.6 || >=8.0.0", "yarn": ">= 1.13.0" } }, - "node_modules/@angular-devkit/schematics-cli/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, "node_modules/@angular-devkit/schematics-cli/node_modules/inquirer": { "version": "8.2.4", "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-8.2.4.tgz", @@ -228,55 +204,21 @@ "node": ">=12.0.0" } }, - "node_modules/@angular-devkit/schematics/node_modules/rxjs": { - "version": "6.6.7", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", - "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", + "node_modules/@angular-devkit/schematics-cli/node_modules/wrap-ansi": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", "dev": true, "dependencies": { - "tslib": "^1.9.0" - }, - "engines": { - "npm": ">=2.0.0" - } - }, - "node_modules/@angular-devkit/schematics/node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", - "dev": true - }, - "node_modules/@automapper/classes": { - "version": "8.7.7", - "resolved": "https://registry.npmjs.org/@automapper/classes/-/classes-8.7.7.tgz", - "integrity": "sha512-FSbvt6QE8XnhKKQZA3kpKLuLrr9x1iW+lNYTrawVLjxQ05zsCGccLxe7moMNrg1wFAVAouQKupFgCGQ7XRjmJw==", - "engines": { - "node": ">=14.0.0" + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" }, - "peerDependencies": { - "@automapper/core": "8.7.7", - "reflect-metadata": "~0.1.13" - } - }, - "node_modules/@automapper/core": { - "version": "8.7.7", - "resolved": "https://registry.npmjs.org/@automapper/core/-/core-8.7.7.tgz", - "integrity": "sha512-YfpDJ/xqwUuC0S+BLNk81ZJfeL7CmjirUX/Gk9eQyx146DKvneBZgeZ9v5rDB51Ti14jTxVHis+5JuT7W/q0TA==", - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@automapper/nestjs": { - "version": "8.7.7", - "resolved": "https://registry.npmjs.org/@automapper/nestjs/-/nestjs-8.7.7.tgz", - "integrity": "sha512-9/uYY2cmN7SJjr2QxnfyXsteHrn/RHD+Dg0VMBflzK/e8Bh/KWyOve7+kaFixlUoyHe44aXs2LVaCslqt8wnhQ==", "engines": { - "node": ">=14.0.0" + "node": ">=10" }, - "peerDependencies": { - "@automapper/core": "8.7.7", - "@nestjs/common": "^7.0.0 || ^8.0.0 || ^9.0.0", - "@nestjs/core": "^7.0.0 || ^8.0.0 || ^9.0.0" + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" } }, "node_modules/@aws-crypto/crc32": { @@ -404,3431 +346,3701 @@ "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" }, - "node_modules/@aws-sdk/abort-controller": { - "version": "3.257.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/abort-controller/-/abort-controller-3.257.0.tgz", - "integrity": "sha512-ekWy391lOerS0ZECdhp/c+X7AToJIpfNrCPjuj3bKr+GMQYckGsYsdbm6AUD4sxBmfvuaQmVniSXWovaxwcFcQ==", - "dependencies": { - "@aws-sdk/types": "3.257.0", - "tslib": "^2.3.1" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@aws-sdk/chunked-blob-reader": { - "version": "3.188.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/chunked-blob-reader/-/chunked-blob-reader-3.188.0.tgz", - "integrity": "sha512-zkPRFZZPL3eH+kH86LDYYXImiClA1/sW60zYOjse9Pgka+eDJlvBN6hcYxwDEKjcwATYiSRR1aVQHcfCinlGXg==", - "dependencies": { - "tslib": "^2.3.1" - } - }, - "node_modules/@aws-sdk/chunked-blob-reader-native": { - "version": "3.208.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/chunked-blob-reader-native/-/chunked-blob-reader-native-3.208.0.tgz", - "integrity": "sha512-JeOZ95PW+fJ6bbuqPySYqLqHk1n4+4ueEEraJsiUrPBV0S1ZtyvOGHcnGztKUjr2PYNaiexmpWuvUve9K12HRA==", - "dependencies": { - "@aws-sdk/util-base64": "3.208.0", - "tslib": "^2.3.1" - } - }, "node_modules/@aws-sdk/client-s3": { - "version": "3.264.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.264.0.tgz", - "integrity": "sha512-YhpbK+vlqvhIpoBLl/e/qL2f7KOE8WZ2Wq/Nyj7/aGhSz9MRqXCOQ7HPeox6szym705JYC29jwHqvIEr3ybE2Q==", + "version": "3.441.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.441.0.tgz", + "integrity": "sha512-tJUhHk4Nvakw/q3IVI2oDFCu48DzuPCMu2G3n42JPyvmY0RvmtRjduduoG1lYIGgRKJu81/MFr9i8CGYNK+/5A==", "dependencies": { "@aws-crypto/sha1-browser": "3.0.0", "@aws-crypto/sha256-browser": "3.0.0", "@aws-crypto/sha256-js": "3.0.0", - "@aws-sdk/client-sts": "3.264.0", - "@aws-sdk/config-resolver": "3.259.0", - "@aws-sdk/credential-provider-node": "3.264.0", - "@aws-sdk/eventstream-serde-browser": "3.258.0", - "@aws-sdk/eventstream-serde-config-resolver": "3.257.0", - "@aws-sdk/eventstream-serde-node": "3.258.0", - "@aws-sdk/fetch-http-handler": "3.257.0", - "@aws-sdk/hash-blob-browser": "3.257.0", - "@aws-sdk/hash-node": "3.257.0", - "@aws-sdk/hash-stream-node": "3.257.0", - "@aws-sdk/invalid-dependency": "3.257.0", - "@aws-sdk/md5-js": "3.258.0", - "@aws-sdk/middleware-bucket-endpoint": "3.259.0", - "@aws-sdk/middleware-content-length": "3.257.0", - "@aws-sdk/middleware-endpoint": "3.264.0", - "@aws-sdk/middleware-expect-continue": "3.257.0", - "@aws-sdk/middleware-flexible-checksums": "3.259.0", - "@aws-sdk/middleware-host-header": "3.257.0", - "@aws-sdk/middleware-location-constraint": "3.257.0", - "@aws-sdk/middleware-logger": "3.257.0", - "@aws-sdk/middleware-recursion-detection": "3.257.0", - "@aws-sdk/middleware-retry": "3.259.0", - "@aws-sdk/middleware-sdk-s3": "3.257.0", - "@aws-sdk/middleware-serde": "3.257.0", - "@aws-sdk/middleware-signing": "3.257.0", - "@aws-sdk/middleware-ssec": "3.257.0", - "@aws-sdk/middleware-stack": "3.257.0", - "@aws-sdk/middleware-user-agent": "3.257.0", - "@aws-sdk/node-config-provider": "3.259.0", - "@aws-sdk/node-http-handler": "3.257.0", - "@aws-sdk/protocol-http": "3.257.0", - "@aws-sdk/signature-v4-multi-region": "3.264.0", - "@aws-sdk/smithy-client": "3.261.0", - "@aws-sdk/types": "3.257.0", - "@aws-sdk/url-parser": "3.257.0", - "@aws-sdk/util-base64": "3.208.0", - "@aws-sdk/util-body-length-browser": "3.188.0", - "@aws-sdk/util-body-length-node": "3.208.0", - "@aws-sdk/util-defaults-mode-browser": "3.261.0", - "@aws-sdk/util-defaults-mode-node": "3.261.0", - "@aws-sdk/util-endpoints": "3.257.0", - "@aws-sdk/util-retry": "3.257.0", - "@aws-sdk/util-stream-browser": "3.258.0", - "@aws-sdk/util-stream-node": "3.257.0", - "@aws-sdk/util-user-agent-browser": "3.257.0", - "@aws-sdk/util-user-agent-node": "3.259.0", - "@aws-sdk/util-utf8": "3.254.0", - "@aws-sdk/util-waiter": "3.257.0", - "@aws-sdk/xml-builder": "3.201.0", - "fast-xml-parser": "4.0.11", - "tslib": "^2.3.1" + "@aws-sdk/client-sts": "3.441.0", + "@aws-sdk/core": "3.441.0", + "@aws-sdk/credential-provider-node": "3.441.0", + "@aws-sdk/middleware-bucket-endpoint": "3.433.0", + "@aws-sdk/middleware-expect-continue": "3.433.0", + "@aws-sdk/middleware-flexible-checksums": "3.433.0", + "@aws-sdk/middleware-host-header": "3.433.0", + "@aws-sdk/middleware-location-constraint": "3.433.0", + "@aws-sdk/middleware-logger": "3.433.0", + "@aws-sdk/middleware-recursion-detection": "3.433.0", + "@aws-sdk/middleware-sdk-s3": "3.440.0", + "@aws-sdk/middleware-signing": "3.433.0", + "@aws-sdk/middleware-ssec": "3.433.0", + "@aws-sdk/middleware-user-agent": "3.438.0", + "@aws-sdk/region-config-resolver": "3.433.0", + "@aws-sdk/signature-v4-multi-region": "3.437.0", + "@aws-sdk/types": "3.433.0", + "@aws-sdk/util-endpoints": "3.438.0", + "@aws-sdk/util-user-agent-browser": "3.433.0", + "@aws-sdk/util-user-agent-node": "3.437.0", + "@aws-sdk/xml-builder": "3.310.0", + "@smithy/config-resolver": "^2.0.16", + "@smithy/eventstream-serde-browser": "^2.0.12", + "@smithy/eventstream-serde-config-resolver": "^2.0.12", + "@smithy/eventstream-serde-node": "^2.0.12", + "@smithy/fetch-http-handler": "^2.2.4", + "@smithy/hash-blob-browser": "^2.0.12", + "@smithy/hash-node": "^2.0.12", + "@smithy/hash-stream-node": "^2.0.12", + "@smithy/invalid-dependency": "^2.0.12", + "@smithy/md5-js": "^2.0.12", + "@smithy/middleware-content-length": "^2.0.14", + "@smithy/middleware-endpoint": "^2.1.3", + "@smithy/middleware-retry": "^2.0.18", + "@smithy/middleware-serde": "^2.0.12", + "@smithy/middleware-stack": "^2.0.6", + "@smithy/node-config-provider": "^2.1.3", + "@smithy/node-http-handler": "^2.1.8", + "@smithy/protocol-http": "^3.0.8", + "@smithy/smithy-client": "^2.1.12", + "@smithy/types": "^2.4.0", + "@smithy/url-parser": "^2.0.12", + "@smithy/util-base64": "^2.0.0", + "@smithy/util-body-length-browser": "^2.0.0", + "@smithy/util-body-length-node": "^2.1.0", + "@smithy/util-defaults-mode-browser": "^2.0.16", + "@smithy/util-defaults-mode-node": "^2.0.21", + "@smithy/util-endpoints": "^1.0.2", + "@smithy/util-retry": "^2.0.5", + "@smithy/util-stream": "^2.0.17", + "@smithy/util-utf8": "^2.0.0", + "@smithy/util-waiter": "^2.0.12", + "fast-xml-parser": "4.2.5", + "tslib": "^2.5.0" }, "engines": { "node": ">=14.0.0" } }, "node_modules/@aws-sdk/client-sso": { - "version": "3.264.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.264.0.tgz", - "integrity": "sha512-p+7sYpRcdv9omnnsPhD/vOFuZ1SpfV62ZgistBK/RDsQg2W9SIWQRW1KPt7gOCQ0nwp4efntw4Sle0LjS7ykxg==", - "dependencies": { - "@aws-crypto/sha256-browser": "3.0.0", - "@aws-crypto/sha256-js": "3.0.0", - "@aws-sdk/config-resolver": "3.259.0", - "@aws-sdk/fetch-http-handler": "3.257.0", - "@aws-sdk/hash-node": "3.257.0", - "@aws-sdk/invalid-dependency": "3.257.0", - "@aws-sdk/middleware-content-length": "3.257.0", - "@aws-sdk/middleware-endpoint": "3.264.0", - "@aws-sdk/middleware-host-header": "3.257.0", - "@aws-sdk/middleware-logger": "3.257.0", - "@aws-sdk/middleware-recursion-detection": "3.257.0", - "@aws-sdk/middleware-retry": "3.259.0", - "@aws-sdk/middleware-serde": "3.257.0", - "@aws-sdk/middleware-stack": "3.257.0", - "@aws-sdk/middleware-user-agent": "3.257.0", - "@aws-sdk/node-config-provider": "3.259.0", - "@aws-sdk/node-http-handler": "3.257.0", - "@aws-sdk/protocol-http": "3.257.0", - "@aws-sdk/smithy-client": "3.261.0", - "@aws-sdk/types": "3.257.0", - "@aws-sdk/url-parser": "3.257.0", - "@aws-sdk/util-base64": "3.208.0", - "@aws-sdk/util-body-length-browser": "3.188.0", - "@aws-sdk/util-body-length-node": "3.208.0", - "@aws-sdk/util-defaults-mode-browser": "3.261.0", - "@aws-sdk/util-defaults-mode-node": "3.261.0", - "@aws-sdk/util-endpoints": "3.257.0", - "@aws-sdk/util-retry": "3.257.0", - "@aws-sdk/util-user-agent-browser": "3.257.0", - "@aws-sdk/util-user-agent-node": "3.259.0", - "@aws-sdk/util-utf8": "3.254.0", - "tslib": "^2.3.1" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@aws-sdk/client-sso-oidc": { - "version": "3.264.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.264.0.tgz", - "integrity": "sha512-82hGEbfsD4lBGIF1q8o82jTNSgBCcBpfFsvA+ltZf0bh4ChIWOi4vVvg8G+zVQN1mm/Rj8vWYO/D0tNF8OSyWw==", + "version": "3.441.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.441.0.tgz", + "integrity": "sha512-gndGymu4cEIN7WWhQ67RO0JMda09EGBlay2L8IKCHBK/65Y34FHUX1tCNbO2qezEzsi6BPW5o2n53Rd9QqpHUw==", "dependencies": { "@aws-crypto/sha256-browser": "3.0.0", "@aws-crypto/sha256-js": "3.0.0", - "@aws-sdk/config-resolver": "3.259.0", - "@aws-sdk/fetch-http-handler": "3.257.0", - "@aws-sdk/hash-node": "3.257.0", - "@aws-sdk/invalid-dependency": "3.257.0", - "@aws-sdk/middleware-content-length": "3.257.0", - "@aws-sdk/middleware-endpoint": "3.264.0", - "@aws-sdk/middleware-host-header": "3.257.0", - "@aws-sdk/middleware-logger": "3.257.0", - "@aws-sdk/middleware-recursion-detection": "3.257.0", - "@aws-sdk/middleware-retry": "3.259.0", - "@aws-sdk/middleware-serde": "3.257.0", - "@aws-sdk/middleware-stack": "3.257.0", - "@aws-sdk/middleware-user-agent": "3.257.0", - "@aws-sdk/node-config-provider": "3.259.0", - "@aws-sdk/node-http-handler": "3.257.0", - "@aws-sdk/protocol-http": "3.257.0", - "@aws-sdk/smithy-client": "3.261.0", - "@aws-sdk/types": "3.257.0", - "@aws-sdk/url-parser": "3.257.0", - "@aws-sdk/util-base64": "3.208.0", - "@aws-sdk/util-body-length-browser": "3.188.0", - "@aws-sdk/util-body-length-node": "3.208.0", - "@aws-sdk/util-defaults-mode-browser": "3.261.0", - "@aws-sdk/util-defaults-mode-node": "3.261.0", - "@aws-sdk/util-endpoints": "3.257.0", - "@aws-sdk/util-retry": "3.257.0", - "@aws-sdk/util-user-agent-browser": "3.257.0", - "@aws-sdk/util-user-agent-node": "3.259.0", - "@aws-sdk/util-utf8": "3.254.0", - "tslib": "^2.3.1" + "@aws-sdk/core": "3.441.0", + "@aws-sdk/middleware-host-header": "3.433.0", + "@aws-sdk/middleware-logger": "3.433.0", + "@aws-sdk/middleware-recursion-detection": "3.433.0", + "@aws-sdk/middleware-user-agent": "3.438.0", + "@aws-sdk/region-config-resolver": "3.433.0", + "@aws-sdk/types": "3.433.0", + "@aws-sdk/util-endpoints": "3.438.0", + "@aws-sdk/util-user-agent-browser": "3.433.0", + "@aws-sdk/util-user-agent-node": "3.437.0", + "@smithy/config-resolver": "^2.0.16", + "@smithy/fetch-http-handler": "^2.2.4", + "@smithy/hash-node": "^2.0.12", + "@smithy/invalid-dependency": "^2.0.12", + "@smithy/middleware-content-length": "^2.0.14", + "@smithy/middleware-endpoint": "^2.1.3", + "@smithy/middleware-retry": "^2.0.18", + "@smithy/middleware-serde": "^2.0.12", + "@smithy/middleware-stack": "^2.0.6", + "@smithy/node-config-provider": "^2.1.3", + "@smithy/node-http-handler": "^2.1.8", + "@smithy/protocol-http": "^3.0.8", + "@smithy/smithy-client": "^2.1.12", + "@smithy/types": "^2.4.0", + "@smithy/url-parser": "^2.0.12", + "@smithy/util-base64": "^2.0.0", + "@smithy/util-body-length-browser": "^2.0.0", + "@smithy/util-body-length-node": "^2.1.0", + "@smithy/util-defaults-mode-browser": "^2.0.16", + "@smithy/util-defaults-mode-node": "^2.0.21", + "@smithy/util-endpoints": "^1.0.2", + "@smithy/util-retry": "^2.0.5", + "@smithy/util-utf8": "^2.0.0", + "tslib": "^2.5.0" }, "engines": { "node": ">=14.0.0" } }, "node_modules/@aws-sdk/client-sts": { - "version": "3.264.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.264.0.tgz", - "integrity": "sha512-sco1jREkDdds4Z3V19Vlu/YpBHSzeEt1KFqOPnbjFw7pSakRNzpyWmLLxOwWjwgGKt6pSF3Aw0ZOMYsAUDc5qQ==", + "version": "3.441.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.441.0.tgz", + "integrity": "sha512-GL0Cw2v7XL1cn0T+Sk5VHLlgBJoUdMsysXsHa1mFdk0l6XHMAAnwXVXiNnjmoDSPrG0psz7dL2AKzPVRXbIUjA==", "dependencies": { "@aws-crypto/sha256-browser": "3.0.0", "@aws-crypto/sha256-js": "3.0.0", - "@aws-sdk/config-resolver": "3.259.0", - "@aws-sdk/credential-provider-node": "3.264.0", - "@aws-sdk/fetch-http-handler": "3.257.0", - "@aws-sdk/hash-node": "3.257.0", - "@aws-sdk/invalid-dependency": "3.257.0", - "@aws-sdk/middleware-content-length": "3.257.0", - "@aws-sdk/middleware-endpoint": "3.264.0", - "@aws-sdk/middleware-host-header": "3.257.0", - "@aws-sdk/middleware-logger": "3.257.0", - "@aws-sdk/middleware-recursion-detection": "3.257.0", - "@aws-sdk/middleware-retry": "3.259.0", - "@aws-sdk/middleware-sdk-sts": "3.257.0", - "@aws-sdk/middleware-serde": "3.257.0", - "@aws-sdk/middleware-signing": "3.257.0", - "@aws-sdk/middleware-stack": "3.257.0", - "@aws-sdk/middleware-user-agent": "3.257.0", - "@aws-sdk/node-config-provider": "3.259.0", - "@aws-sdk/node-http-handler": "3.257.0", - "@aws-sdk/protocol-http": "3.257.0", - "@aws-sdk/smithy-client": "3.261.0", - "@aws-sdk/types": "3.257.0", - "@aws-sdk/url-parser": "3.257.0", - "@aws-sdk/util-base64": "3.208.0", - "@aws-sdk/util-body-length-browser": "3.188.0", - "@aws-sdk/util-body-length-node": "3.208.0", - "@aws-sdk/util-defaults-mode-browser": "3.261.0", - "@aws-sdk/util-defaults-mode-node": "3.261.0", - "@aws-sdk/util-endpoints": "3.257.0", - "@aws-sdk/util-retry": "3.257.0", - "@aws-sdk/util-user-agent-browser": "3.257.0", - "@aws-sdk/util-user-agent-node": "3.259.0", - "@aws-sdk/util-utf8": "3.254.0", - "fast-xml-parser": "4.0.11", - "tslib": "^2.3.1" + "@aws-sdk/core": "3.441.0", + "@aws-sdk/credential-provider-node": "3.441.0", + "@aws-sdk/middleware-host-header": "3.433.0", + "@aws-sdk/middleware-logger": "3.433.0", + "@aws-sdk/middleware-recursion-detection": "3.433.0", + "@aws-sdk/middleware-sdk-sts": "3.433.0", + "@aws-sdk/middleware-signing": "3.433.0", + "@aws-sdk/middleware-user-agent": "3.438.0", + "@aws-sdk/region-config-resolver": "3.433.0", + "@aws-sdk/types": "3.433.0", + "@aws-sdk/util-endpoints": "3.438.0", + "@aws-sdk/util-user-agent-browser": "3.433.0", + "@aws-sdk/util-user-agent-node": "3.437.0", + "@smithy/config-resolver": "^2.0.16", + "@smithy/fetch-http-handler": "^2.2.4", + "@smithy/hash-node": "^2.0.12", + "@smithy/invalid-dependency": "^2.0.12", + "@smithy/middleware-content-length": "^2.0.14", + "@smithy/middleware-endpoint": "^2.1.3", + "@smithy/middleware-retry": "^2.0.18", + "@smithy/middleware-serde": "^2.0.12", + "@smithy/middleware-stack": "^2.0.6", + "@smithy/node-config-provider": "^2.1.3", + "@smithy/node-http-handler": "^2.1.8", + "@smithy/protocol-http": "^3.0.8", + "@smithy/smithy-client": "^2.1.12", + "@smithy/types": "^2.4.0", + "@smithy/url-parser": "^2.0.12", + "@smithy/util-base64": "^2.0.0", + "@smithy/util-body-length-browser": "^2.0.0", + "@smithy/util-body-length-node": "^2.1.0", + "@smithy/util-defaults-mode-browser": "^2.0.16", + "@smithy/util-defaults-mode-node": "^2.0.21", + "@smithy/util-endpoints": "^1.0.2", + "@smithy/util-retry": "^2.0.5", + "@smithy/util-utf8": "^2.0.0", + "fast-xml-parser": "4.2.5", + "tslib": "^2.5.0" }, "engines": { "node": ">=14.0.0" } }, - "node_modules/@aws-sdk/config-resolver": { - "version": "3.259.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/config-resolver/-/config-resolver-3.259.0.tgz", - "integrity": "sha512-gViMRsc4Ye6+nzJ0OYTZIT8m4glIAdtugN2Sr/t6P2iJW5X0bSL/EcbcHBgsve1lHjeGPeyzVkT7UnyGOZ5Z/A==", + "node_modules/@aws-sdk/core": { + "version": "3.441.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.441.0.tgz", + "integrity": "sha512-gV0eQwR0VnSPUYAbgDkbBtfXbSpZgl/K6UB13DP1IFFjQYbF/BxYwvcQe4jHoPOBifSgjEbl8MfOOeIyI7k9vg==", "dependencies": { - "@aws-sdk/signature-v4": "3.257.0", - "@aws-sdk/types": "3.257.0", - "@aws-sdk/util-config-provider": "3.208.0", - "@aws-sdk/util-middleware": "3.257.0", - "tslib": "^2.3.1" + "@smithy/smithy-client": "^2.1.12" }, "engines": { "node": ">=14.0.0" } }, "node_modules/@aws-sdk/credential-provider-env": { - "version": "3.257.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.257.0.tgz", - "integrity": "sha512-GsmBi5Di6hk1JAi1iB6/LCY8o+GmlCvJoB7wuoVmXI3VxRVwptUVjuj8EtJbIrVGrF9dSuIRPCzUoSuzEzYGlg==", - "dependencies": { - "@aws-sdk/property-provider": "3.257.0", - "@aws-sdk/types": "3.257.0", - "tslib": "^2.3.1" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@aws-sdk/credential-provider-imds": { - "version": "3.259.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-imds/-/credential-provider-imds-3.259.0.tgz", - "integrity": "sha512-yCxoYWZAaDrCUEWxRfrpB0Mp1cFgJEMYW8T6GIb/+DQ5QLpZmorgaVD/j90QXupqFrR5tlxwuskBIkdD2E9YNg==", + "version": "3.433.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.433.0.tgz", + "integrity": "sha512-Vl7Qz5qYyxBurMn6hfSiNJeUHSqfVUlMt0C1Bds3tCkl3IzecRWwyBOlxtxO3VCrgVeW3HqswLzCvhAFzPH6nQ==", "dependencies": { - "@aws-sdk/node-config-provider": "3.259.0", - "@aws-sdk/property-provider": "3.257.0", - "@aws-sdk/types": "3.257.0", - "@aws-sdk/url-parser": "3.257.0", - "tslib": "^2.3.1" + "@aws-sdk/types": "3.433.0", + "@smithy/property-provider": "^2.0.0", + "@smithy/types": "^2.4.0", + "tslib": "^2.5.0" }, "engines": { "node": ">=14.0.0" } }, "node_modules/@aws-sdk/credential-provider-ini": { - "version": "3.264.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.264.0.tgz", - "integrity": "sha512-UU5NNlfn+Go+5PLBzyTH1YE3r/pgykpE4QYFon87sCnEQnQH9xmlRTW1f1cBSQ9kivbFZd2/C2X3qhB3fe2JfA==", - "dependencies": { - "@aws-sdk/credential-provider-env": "3.257.0", - "@aws-sdk/credential-provider-imds": "3.259.0", - "@aws-sdk/credential-provider-process": "3.257.0", - "@aws-sdk/credential-provider-sso": "3.264.0", - "@aws-sdk/credential-provider-web-identity": "3.257.0", - "@aws-sdk/property-provider": "3.257.0", - "@aws-sdk/shared-ini-file-loader": "3.257.0", - "@aws-sdk/types": "3.257.0", - "tslib": "^2.3.1" + "version": "3.441.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.441.0.tgz", + "integrity": "sha512-SQipQYxYqDUuSOfIhDmaTdwPTcndGQotGZXWJl56mMWqAhU8MkwjK+oMf3VgRt/umJC0QwUCF5HUHIj7gSB1JA==", + "dependencies": { + "@aws-sdk/credential-provider-env": "3.433.0", + "@aws-sdk/credential-provider-process": "3.433.0", + "@aws-sdk/credential-provider-sso": "3.441.0", + "@aws-sdk/credential-provider-web-identity": "3.433.0", + "@aws-sdk/types": "3.433.0", + "@smithy/credential-provider-imds": "^2.0.0", + "@smithy/property-provider": "^2.0.0", + "@smithy/shared-ini-file-loader": "^2.0.6", + "@smithy/types": "^2.4.0", + "tslib": "^2.5.0" }, "engines": { "node": ">=14.0.0" } }, "node_modules/@aws-sdk/credential-provider-node": { - "version": "3.264.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.264.0.tgz", - "integrity": "sha512-DPzL7oawcILs5Mduim9Z8SVeJaUpaDRVbUIrBHsMBu+N7Zuqtzr+0ckHc1bEi3iYq2QUCk5pH5vpQaZYkMlbtw==", - "dependencies": { - "@aws-sdk/credential-provider-env": "3.257.0", - "@aws-sdk/credential-provider-imds": "3.259.0", - "@aws-sdk/credential-provider-ini": "3.264.0", - "@aws-sdk/credential-provider-process": "3.257.0", - "@aws-sdk/credential-provider-sso": "3.264.0", - "@aws-sdk/credential-provider-web-identity": "3.257.0", - "@aws-sdk/property-provider": "3.257.0", - "@aws-sdk/shared-ini-file-loader": "3.257.0", - "@aws-sdk/types": "3.257.0", - "tslib": "^2.3.1" + "version": "3.441.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.441.0.tgz", + "integrity": "sha512-WB9p37yHq6fGJt6Vll29ijHbkh9VDbPM/n5ns73bTAgFD7R0ht5kPmdmHGQA6m3RKjcHLPbymQ3lXykkMwWf/Q==", + "dependencies": { + "@aws-sdk/credential-provider-env": "3.433.0", + "@aws-sdk/credential-provider-ini": "3.441.0", + "@aws-sdk/credential-provider-process": "3.433.0", + "@aws-sdk/credential-provider-sso": "3.441.0", + "@aws-sdk/credential-provider-web-identity": "3.433.0", + "@aws-sdk/types": "3.433.0", + "@smithy/credential-provider-imds": "^2.0.0", + "@smithy/property-provider": "^2.0.0", + "@smithy/shared-ini-file-loader": "^2.0.6", + "@smithy/types": "^2.4.0", + "tslib": "^2.5.0" }, "engines": { "node": ">=14.0.0" } }, "node_modules/@aws-sdk/credential-provider-process": { - "version": "3.257.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.257.0.tgz", - "integrity": "sha512-xK8uYeNXaclaBCGrLi4z2pxPRngqLf5BM5jg2fn57zqvlL9V5gJF972FehrVBL0bfp1/laG0ZJtD2K2sapyWAw==", + "version": "3.433.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.433.0.tgz", + "integrity": "sha512-W7FcGlQjio9Y/PepcZGRyl5Bpwb0uWU7qIUCh+u4+q2mW4D5ZngXg8V/opL9/I/p4tUH9VXZLyLGwyBSkdhL+A==", "dependencies": { - "@aws-sdk/property-provider": "3.257.0", - "@aws-sdk/shared-ini-file-loader": "3.257.0", - "@aws-sdk/types": "3.257.0", - "tslib": "^2.3.1" + "@aws-sdk/types": "3.433.0", + "@smithy/property-provider": "^2.0.0", + "@smithy/shared-ini-file-loader": "^2.0.6", + "@smithy/types": "^2.4.0", + "tslib": "^2.5.0" }, "engines": { "node": ">=14.0.0" } }, "node_modules/@aws-sdk/credential-provider-sso": { - "version": "3.264.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.264.0.tgz", - "integrity": "sha512-CJuAlqIIJap6LXoqimvEAnYZ7Kb5pTbiS3e+aY+fajO3OPujmQpHuiY8kOmscjwZ4ErJdEskivcTGwXph0dPZQ==", - "dependencies": { - "@aws-sdk/client-sso": "3.264.0", - "@aws-sdk/property-provider": "3.257.0", - "@aws-sdk/shared-ini-file-loader": "3.257.0", - "@aws-sdk/token-providers": "3.264.0", - "@aws-sdk/types": "3.257.0", - "tslib": "^2.3.1" + "version": "3.441.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.441.0.tgz", + "integrity": "sha512-pTg16G+62mWCE8yGKuQnEBqPdpG5g71remf2jUqXaI1c7GCzbnkQDV9eD4DaAGOvzIs0wo9zAQnS2kVDPFlCYA==", + "dependencies": { + "@aws-sdk/client-sso": "3.441.0", + "@aws-sdk/token-providers": "3.438.0", + "@aws-sdk/types": "3.433.0", + "@smithy/property-provider": "^2.0.0", + "@smithy/shared-ini-file-loader": "^2.0.6", + "@smithy/types": "^2.4.0", + "tslib": "^2.5.0" }, "engines": { "node": ">=14.0.0" } }, "node_modules/@aws-sdk/credential-provider-web-identity": { - "version": "3.257.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.257.0.tgz", - "integrity": "sha512-Cm0uvRv4JuIbD0Kp3W0J/vwjADIyCx8HoZi5yg+QIi5nilocuTQ3ajvLeuPVSvFvdy+yaxSc5FxNXquWt7Mngw==", + "version": "3.433.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.433.0.tgz", + "integrity": "sha512-RlwjP1I5wO+aPpwyCp23Mk8nmRbRL33hqRASy73c4JA2z2YiRua+ryt6MalIxehhwQU6xvXUKulJnPG9VaMFZg==", "dependencies": { - "@aws-sdk/property-provider": "3.257.0", - "@aws-sdk/types": "3.257.0", - "tslib": "^2.3.1" + "@aws-sdk/types": "3.433.0", + "@smithy/property-provider": "^2.0.0", + "@smithy/types": "^2.4.0", + "tslib": "^2.5.0" }, "engines": { "node": ">=14.0.0" } }, - "node_modules/@aws-sdk/eventstream-codec": { - "version": "3.258.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/eventstream-codec/-/eventstream-codec-3.258.0.tgz", - "integrity": "sha512-DTd6aggICXOH74tBQEliwLbeoXRbQ3uROBWYl7DdrbAemzHACDFzPCXXa9MTJMZcq3Tva8/E/3bv1fXuU/xkAA==", - "dependencies": { - "@aws-crypto/crc32": "3.0.0", - "@aws-sdk/types": "3.257.0", - "@aws-sdk/util-hex-encoding": "3.201.0", - "tslib": "^2.3.1" - } - }, - "node_modules/@aws-sdk/eventstream-serde-browser": { - "version": "3.258.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/eventstream-serde-browser/-/eventstream-serde-browser-3.258.0.tgz", - "integrity": "sha512-bRcNxDrBFd0UsrLh88kwpvGDHjVupZP3gPJ5b7wseCuuWJzp56/7hNI97IywgARta91rcaf4K147VxFkSNaVlw==", + "node_modules/@aws-sdk/middleware-bucket-endpoint": { + "version": "3.433.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-bucket-endpoint/-/middleware-bucket-endpoint-3.433.0.tgz", + "integrity": "sha512-Lk1xIu2tWTRa1zDw5hCF1RrpWQYSodUhrS/q3oKz8IAoFqEy+lNaD5jx+fycuZb5EkE4IzWysT+8wVkd0mAnOg==", "dependencies": { - "@aws-sdk/eventstream-serde-universal": "3.258.0", - "@aws-sdk/types": "3.257.0", - "tslib": "^2.3.1" + "@aws-sdk/types": "3.433.0", + "@aws-sdk/util-arn-parser": "3.310.0", + "@smithy/node-config-provider": "^2.1.3", + "@smithy/protocol-http": "^3.0.8", + "@smithy/types": "^2.4.0", + "@smithy/util-config-provider": "^2.0.0", + "tslib": "^2.5.0" }, "engines": { "node": ">=14.0.0" } }, - "node_modules/@aws-sdk/eventstream-serde-config-resolver": { - "version": "3.257.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/eventstream-serde-config-resolver/-/eventstream-serde-config-resolver-3.257.0.tgz", - "integrity": "sha512-YbUETgkcFqPJmwcBozHbx3Xloh7mPk9SunNB+Ndy8egwV3L/jNZnEzZnPOtWbD10AXSuJvSbGQ8+l4FblRqZqw==", + "node_modules/@aws-sdk/middleware-expect-continue": { + "version": "3.433.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-expect-continue/-/middleware-expect-continue-3.433.0.tgz", + "integrity": "sha512-Uq2rPIsjz0CR2sulM/HyYr5WiqiefrSRLdwUZuA7opxFSfE808w5DBWSprHxbH3rbDSQR4nFiOiVYIH8Eth7nA==", "dependencies": { - "@aws-sdk/types": "3.257.0", - "tslib": "^2.3.1" + "@aws-sdk/types": "3.433.0", + "@smithy/protocol-http": "^3.0.8", + "@smithy/types": "^2.4.0", + "tslib": "^2.5.0" }, "engines": { "node": ">=14.0.0" } }, - "node_modules/@aws-sdk/eventstream-serde-node": { - "version": "3.258.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/eventstream-serde-node/-/eventstream-serde-node-3.258.0.tgz", - "integrity": "sha512-KvuitKB3fK1ZjWcB+U6d8JNv0WJtE1zvW5DXI/OabzaIR4i/LNis7469EwTsEkTqG3mV3wUa6cBA6kBSJWTVeA==", + "node_modules/@aws-sdk/middleware-flexible-checksums": { + "version": "3.433.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-flexible-checksums/-/middleware-flexible-checksums-3.433.0.tgz", + "integrity": "sha512-Ptssx373+I7EzFUWjp/i/YiNFt6I6sDuRHz6DOUR9nmmRTlHHqmdcBXlJL2d9wwFxoBRCN8/PXGsTc/DJ4c95Q==", "dependencies": { - "@aws-sdk/eventstream-serde-universal": "3.258.0", - "@aws-sdk/types": "3.257.0", - "tslib": "^2.3.1" + "@aws-crypto/crc32": "3.0.0", + "@aws-crypto/crc32c": "3.0.0", + "@aws-sdk/types": "3.433.0", + "@smithy/is-array-buffer": "^2.0.0", + "@smithy/protocol-http": "^3.0.8", + "@smithy/types": "^2.4.0", + "@smithy/util-utf8": "^2.0.0", + "tslib": "^2.5.0" }, "engines": { "node": ">=14.0.0" } }, - "node_modules/@aws-sdk/eventstream-serde-universal": { - "version": "3.258.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/eventstream-serde-universal/-/eventstream-serde-universal-3.258.0.tgz", - "integrity": "sha512-woHNrBp8YSIaf3mcRJA0SyKFnjeLX2fRudLZq9wd555Zz/U7f45AuZOpXlU66tIZiYJI1xm32VRSIYfpIwXI+A==", + "node_modules/@aws-sdk/middleware-host-header": { + "version": "3.433.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.433.0.tgz", + "integrity": "sha512-mBTq3UWv1UzeHG+OfUQ2MB/5GEkt5LTKFaUqzL7ESwzW8XtpBgXnjZvIwu3Vcd3sEetMwijwaGiJhY0ae/YyaA==", "dependencies": { - "@aws-sdk/eventstream-codec": "3.258.0", - "@aws-sdk/types": "3.257.0", - "tslib": "^2.3.1" + "@aws-sdk/types": "3.433.0", + "@smithy/protocol-http": "^3.0.8", + "@smithy/types": "^2.4.0", + "tslib": "^2.5.0" }, "engines": { "node": ">=14.0.0" } }, - "node_modules/@aws-sdk/fetch-http-handler": { - "version": "3.257.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/fetch-http-handler/-/fetch-http-handler-3.257.0.tgz", - "integrity": "sha512-zOF+RzQ+wfF7tq7tGUdPcqUTh3+k2f8KCVJE07A8kCopVq4nBu4NH6Eq29Tjpwdya3YlKvE+kFssuQRRRRex+Q==", - "dependencies": { - "@aws-sdk/protocol-http": "3.257.0", - "@aws-sdk/querystring-builder": "3.257.0", - "@aws-sdk/types": "3.257.0", - "@aws-sdk/util-base64": "3.208.0", - "tslib": "^2.3.1" - } - }, - "node_modules/@aws-sdk/hash-blob-browser": { - "version": "3.257.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/hash-blob-browser/-/hash-blob-browser-3.257.0.tgz", - "integrity": "sha512-3Nrcci3pCCc0ZILMGa/oUMq9le6nhvgCoVxFy5skYs/mQu4QnA8HcK0u4bTueW41rBj0ZW6BHLk/2SmigIkjCQ==", - "dependencies": { - "@aws-sdk/chunked-blob-reader": "3.188.0", - "@aws-sdk/chunked-blob-reader-native": "3.208.0", - "@aws-sdk/types": "3.257.0", - "tslib": "^2.3.1" - } - }, - "node_modules/@aws-sdk/hash-node": { - "version": "3.257.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/hash-node/-/hash-node-3.257.0.tgz", - "integrity": "sha512-W/USUuea5Ep3OJ2U7Ve8/5KN1YsDun2WzOFUxc1PyxXP5pW6OgC15/op0e+bmWPG851clvp5S8ZuroUr3aKi3Q==", + "node_modules/@aws-sdk/middleware-location-constraint": { + "version": "3.433.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-location-constraint/-/middleware-location-constraint-3.433.0.tgz", + "integrity": "sha512-2YD860TGntwZifIUbxm+lFnNJJhByR/RB/+fV1I8oGKg+XX2rZU+94pRfHXRywoZKlCA0L+LGDA1I56jxrB9sw==", "dependencies": { - "@aws-sdk/types": "3.257.0", - "@aws-sdk/util-buffer-from": "3.208.0", - "@aws-sdk/util-utf8": "3.254.0", - "tslib": "^2.3.1" + "@aws-sdk/types": "3.433.0", + "@smithy/types": "^2.4.0", + "tslib": "^2.5.0" }, "engines": { "node": ">=14.0.0" } }, - "node_modules/@aws-sdk/hash-stream-node": { - "version": "3.257.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/hash-stream-node/-/hash-stream-node-3.257.0.tgz", - "integrity": "sha512-A24+EI0sO+IYO78sQPY4vVx7vzToc6XAobQqowmBJ6GXXILK72d3MR3NVbm0lmcS4Dh6MVZEFQD/DCyKvj2C7g==", + "node_modules/@aws-sdk/middleware-logger": { + "version": "3.433.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.433.0.tgz", + "integrity": "sha512-We346Fb5xGonTGVZC9Nvqtnqy74VJzYuTLLiuuftA5sbNzftBDy/22QCfvYSTOAl3bvif+dkDUzQY2ihc5PwOQ==", "dependencies": { - "@aws-sdk/types": "3.257.0", - "@aws-sdk/util-utf8": "3.254.0", - "tslib": "^2.3.1" + "@aws-sdk/types": "3.433.0", + "@smithy/types": "^2.4.0", + "tslib": "^2.5.0" }, "engines": { "node": ">=14.0.0" } }, - "node_modules/@aws-sdk/invalid-dependency": { - "version": "3.257.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/invalid-dependency/-/invalid-dependency-3.257.0.tgz", - "integrity": "sha512-T68SAPRNMEhpke0wlxURgogL7q0B8dfqZsSeS20BVR/lksJxLse9+pbmCDxiu1RrXoEIsEwl5rbLN+Hw8BFFYw==", - "dependencies": { - "@aws-sdk/types": "3.257.0", - "tslib": "^2.3.1" - } - }, - "node_modules/@aws-sdk/is-array-buffer": { - "version": "3.201.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/is-array-buffer/-/is-array-buffer-3.201.0.tgz", - "integrity": "sha512-UPez5qLh3dNgt0DYnPD/q0mVJY84rA17QE26hVNOW3fAji8W2wrwrxdacWOxyXvlxWsVRcKmr+lay1MDqpAMfg==", + "node_modules/@aws-sdk/middleware-recursion-detection": { + "version": "3.433.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.433.0.tgz", + "integrity": "sha512-HEvYC9PQlWY/ccUYtLvAlwwf1iCif2TSAmLNr3YTBRVa98x6jKL0hlCrHWYklFeqOGSKy6XhE+NGJMUII0/HaQ==", "dependencies": { - "tslib": "^2.3.1" + "@aws-sdk/types": "3.433.0", + "@smithy/protocol-http": "^3.0.8", + "@smithy/types": "^2.4.0", + "tslib": "^2.5.0" }, "engines": { "node": ">=14.0.0" } }, - "node_modules/@aws-sdk/md5-js": { - "version": "3.258.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/md5-js/-/md5-js-3.258.0.tgz", - "integrity": "sha512-aLdZ43sEiT68p7YYPHwKsWU1WDC8Wf8UQfb4pzbvhYNgr5VxN46AtbWTKxLAqK2adKS4FnbyX2i66fINg2dHdw==", - "dependencies": { - "@aws-sdk/types": "3.257.0", - "@aws-sdk/util-utf8": "3.254.0", - "tslib": "^2.3.1" - } - }, - "node_modules/@aws-sdk/middleware-bucket-endpoint": { - "version": "3.259.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-bucket-endpoint/-/middleware-bucket-endpoint-3.259.0.tgz", - "integrity": "sha512-eY4Bf7ZeiYK2c2XQ5IU0TDneEYSnZbaFk+ysgAkNmGoLKBhybXiKy7Dh8djB3uXeNtsZ+fZaazWmsU2kxf6Ntg==", + "node_modules/@aws-sdk/middleware-sdk-s3": { + "version": "3.440.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.440.0.tgz", + "integrity": "sha512-DVTSr+82Z8jR9xTwDN3YHzxX7qvi0n96V92OfxvSRDq2BldCEx/KEL1orUZjw97SAXhINOlUWjRR7j4HpwWQtQ==", "dependencies": { - "@aws-sdk/protocol-http": "3.257.0", - "@aws-sdk/types": "3.257.0", - "@aws-sdk/util-arn-parser": "3.208.0", - "@aws-sdk/util-config-provider": "3.208.0", - "tslib": "^2.3.1" + "@aws-sdk/types": "3.433.0", + "@aws-sdk/util-arn-parser": "3.310.0", + "@smithy/protocol-http": "^3.0.8", + "@smithy/smithy-client": "^2.1.12", + "@smithy/types": "^2.4.0", + "tslib": "^2.5.0" }, "engines": { "node": ">=14.0.0" } }, - "node_modules/@aws-sdk/middleware-content-length": { - "version": "3.257.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-content-length/-/middleware-content-length-3.257.0.tgz", - "integrity": "sha512-yiawbV2azm6QnMY1L2ypG8PDRdjOcEIvFmT0T7y0F49rfbKJOu21j1ONAoCkLrINK6kMqcD5JSQLVCoURxiTxQ==", + "node_modules/@aws-sdk/middleware-sdk-sts": { + "version": "3.433.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-sdk-sts/-/middleware-sdk-sts-3.433.0.tgz", + "integrity": "sha512-ORYbJnBejUyonFl5FwIqhvI3Cq6sAp9j+JpkKZtFNma9tFPdrhmYgfCeNH32H/wGTQV/tUoQ3luh0gA4cuk6DA==", "dependencies": { - "@aws-sdk/protocol-http": "3.257.0", - "@aws-sdk/types": "3.257.0", - "tslib": "^2.3.1" + "@aws-sdk/middleware-signing": "3.433.0", + "@aws-sdk/types": "3.433.0", + "@smithy/types": "^2.4.0", + "tslib": "^2.5.0" }, "engines": { "node": ">=14.0.0" } }, - "node_modules/@aws-sdk/middleware-endpoint": { - "version": "3.264.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-endpoint/-/middleware-endpoint-3.264.0.tgz", - "integrity": "sha512-H9JEAug3Oo3IA2wZIplVVF6NtauCIjICXWgbNbA8Im+I2KPe0jWtOdtQv4U+tqHe9T4zIixaCM3gjUBld+FoOA==", + "node_modules/@aws-sdk/middleware-signing": { + "version": "3.433.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-signing/-/middleware-signing-3.433.0.tgz", + "integrity": "sha512-jxPvt59NZo/epMNLNTu47ikmP8v0q217I6bQFGJG7JVFnfl36zDktMwGw+0xZR80qiK47/2BWrNpta61Zd2FxQ==", "dependencies": { - "@aws-sdk/middleware-serde": "3.257.0", - "@aws-sdk/protocol-http": "3.257.0", - "@aws-sdk/signature-v4": "3.257.0", - "@aws-sdk/types": "3.257.0", - "@aws-sdk/url-parser": "3.257.0", - "@aws-sdk/util-config-provider": "3.208.0", - "@aws-sdk/util-middleware": "3.257.0", - "tslib": "^2.3.1" + "@aws-sdk/types": "3.433.0", + "@smithy/property-provider": "^2.0.0", + "@smithy/protocol-http": "^3.0.8", + "@smithy/signature-v4": "^2.0.0", + "@smithy/types": "^2.4.0", + "@smithy/util-middleware": "^2.0.5", + "tslib": "^2.5.0" }, "engines": { "node": ">=14.0.0" } }, - "node_modules/@aws-sdk/middleware-expect-continue": { - "version": "3.257.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-expect-continue/-/middleware-expect-continue-3.257.0.tgz", - "integrity": "sha512-7HSRA2Ta0fTq9Ewznp6fYG7CYOoqr5TeqEhKL1HyFb5i6YmsCiz88JKNJTllD5O7uFcd7Td/fJ66pK4JttfaaQ==", + "node_modules/@aws-sdk/middleware-ssec": { + "version": "3.433.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-ssec/-/middleware-ssec-3.433.0.tgz", + "integrity": "sha512-2AMaPx0kYfCiekxoL7aqFqSSoA9du+yI4zefpQNLr+1cZOerYiDxdsZ4mbqStR1CVFaX6U6hrYokXzjInsvETw==", "dependencies": { - "@aws-sdk/protocol-http": "3.257.0", - "@aws-sdk/types": "3.257.0", - "tslib": "^2.3.1" + "@aws-sdk/types": "3.433.0", + "@smithy/types": "^2.4.0", + "tslib": "^2.5.0" }, "engines": { "node": ">=14.0.0" } }, - "node_modules/@aws-sdk/middleware-flexible-checksums": { - "version": "3.259.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-flexible-checksums/-/middleware-flexible-checksums-3.259.0.tgz", - "integrity": "sha512-DwY3+cWaONvzJSVYQncfX+ZnoPnLVA7LfgR0mrgcvVZJFrqCr1lJeUmJOmE2/kcOQefPfSbKB/L4BP6vg2EUMQ==", + "node_modules/@aws-sdk/middleware-user-agent": { + "version": "3.438.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.438.0.tgz", + "integrity": "sha512-a+xHT1wOxT6EA6YyLmrfaroKWOkwwyiktUfXKM0FsUutGzNi4fKhb5NZ2al58NsXzHgHFrasSDp+Lqbd/X2cEw==", "dependencies": { - "@aws-crypto/crc32": "3.0.0", - "@aws-crypto/crc32c": "3.0.0", - "@aws-sdk/is-array-buffer": "3.201.0", - "@aws-sdk/protocol-http": "3.257.0", - "@aws-sdk/types": "3.257.0", - "@aws-sdk/util-utf8": "3.254.0", - "tslib": "^2.3.1" + "@aws-sdk/types": "3.433.0", + "@aws-sdk/util-endpoints": "3.438.0", + "@smithy/protocol-http": "^3.0.8", + "@smithy/types": "^2.4.0", + "tslib": "^2.5.0" }, "engines": { "node": ">=14.0.0" } }, - "node_modules/@aws-sdk/middleware-host-header": { - "version": "3.257.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.257.0.tgz", - "integrity": "sha512-gEi9AJdJfRfU8Qr6HK1hfhxTzyV3Giq4B/h7um99hIFAT/GCg9xiPvAOKPo6UeuiKEv3b7RpSL4s6cBvnJMJBA==", + "node_modules/@aws-sdk/region-config-resolver": { + "version": "3.433.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.433.0.tgz", + "integrity": "sha512-xpjRjCZW+CDFdcMmmhIYg81ST5UAnJh61IHziQEk0FXONrg4kjyYPZAOjEdzXQ+HxJQuGQLKPhRdzxmQnbX7pg==", "dependencies": { - "@aws-sdk/protocol-http": "3.257.0", - "@aws-sdk/types": "3.257.0", - "tslib": "^2.3.1" + "@smithy/node-config-provider": "^2.1.3", + "@smithy/types": "^2.4.0", + "@smithy/util-config-provider": "^2.0.0", + "@smithy/util-middleware": "^2.0.5", + "tslib": "^2.5.0" }, "engines": { "node": ">=14.0.0" } }, - "node_modules/@aws-sdk/middleware-location-constraint": { - "version": "3.257.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-location-constraint/-/middleware-location-constraint-3.257.0.tgz", - "integrity": "sha512-pmm5rJR5aatXG0kC0KPBxkgoNn/ePcyVIYHGMEuJXRJm3ENy569QAH9UZeMFjprp3uuAbkqItQbY3MP8TYvuYA==", + "node_modules/@aws-sdk/s3-request-presigner": { + "version": "3.441.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/s3-request-presigner/-/s3-request-presigner-3.441.0.tgz", + "integrity": "sha512-EUVsmy92imURMLoA/MX+PL1SIONQ8YSi424BHJA6xGEoaqvQiaVKlv8jJfCqJ6qQ8oLiCLe2hOBSBTY1XZiy/g==", "dependencies": { - "@aws-sdk/types": "3.257.0", - "tslib": "^2.3.1" + "@aws-sdk/signature-v4-multi-region": "3.437.0", + "@aws-sdk/types": "3.433.0", + "@aws-sdk/util-format-url": "3.433.0", + "@smithy/middleware-endpoint": "^2.1.3", + "@smithy/protocol-http": "^3.0.8", + "@smithy/smithy-client": "^2.1.12", + "@smithy/types": "^2.4.0", + "tslib": "^2.5.0" }, "engines": { "node": ">=14.0.0" } }, - "node_modules/@aws-sdk/middleware-logger": { - "version": "3.257.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.257.0.tgz", - "integrity": "sha512-8RDXW/VbMKBsXDfcCLmROZcWKyrekyiPa3J1aIaBy0tq9o4xpGoXw/lwwIrNVvISAFslb57rteup34bfn6ta6w==", + "node_modules/@aws-sdk/signature-v4-multi-region": { + "version": "3.437.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.437.0.tgz", + "integrity": "sha512-MmrqudssOs87JgVg7HGVdvJws/t4kcOrJJd+975ki+DPeSoyK2U4zBDfDkJ+n0tFuZBs3sLwLh0QXE7BV28rRA==", "dependencies": { - "@aws-sdk/types": "3.257.0", - "tslib": "^2.3.1" + "@aws-sdk/types": "3.433.0", + "@smithy/protocol-http": "^3.0.8", + "@smithy/signature-v4": "^2.0.0", + "@smithy/types": "^2.4.0", + "tslib": "^2.5.0" }, "engines": { "node": ">=14.0.0" } }, - "node_modules/@aws-sdk/middleware-recursion-detection": { - "version": "3.257.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.257.0.tgz", - "integrity": "sha512-rUCih6zHh8k9Edf5N5Er4s508FYbwLM0MWTD2axzlj9TjLqEQ9OKED3wHaLffXSDzodd3oTAfJCLPbWQyoZ3ZQ==", + "node_modules/@aws-sdk/token-providers": { + "version": "3.438.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.438.0.tgz", + "integrity": "sha512-G2fUfTtU6/1ayYRMu0Pd9Ln4qYSvwJOWCqJMdkDgvXSwdgcOSOLsnAIk1AHGJDAvgLikdCzuyOsdJiexr9Vnww==", "dependencies": { - "@aws-sdk/protocol-http": "3.257.0", - "@aws-sdk/types": "3.257.0", - "tslib": "^2.3.1" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@aws-sdk/middleware-retry": { - "version": "3.259.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-retry/-/middleware-retry-3.259.0.tgz", - "integrity": "sha512-pVh1g8e84MAi7eVtWLiiiCtn82LzxOP7+LxTRHatmgIeN22yGQBZILliPDJypUPvDYlwxI1ekiK+oPTcte0Uww==", - "dependencies": { - "@aws-sdk/protocol-http": "3.257.0", - "@aws-sdk/service-error-classification": "3.257.0", - "@aws-sdk/types": "3.257.0", - "@aws-sdk/util-middleware": "3.257.0", - "@aws-sdk/util-retry": "3.257.0", - "tslib": "^2.3.1", - "uuid": "^8.3.2" + "@aws-crypto/sha256-browser": "3.0.0", + "@aws-crypto/sha256-js": "3.0.0", + "@aws-sdk/middleware-host-header": "3.433.0", + "@aws-sdk/middleware-logger": "3.433.0", + "@aws-sdk/middleware-recursion-detection": "3.433.0", + "@aws-sdk/middleware-user-agent": "3.438.0", + "@aws-sdk/region-config-resolver": "3.433.0", + "@aws-sdk/types": "3.433.0", + "@aws-sdk/util-endpoints": "3.438.0", + "@aws-sdk/util-user-agent-browser": "3.433.0", + "@aws-sdk/util-user-agent-node": "3.437.0", + "@smithy/config-resolver": "^2.0.16", + "@smithy/fetch-http-handler": "^2.2.4", + "@smithy/hash-node": "^2.0.12", + "@smithy/invalid-dependency": "^2.0.12", + "@smithy/middleware-content-length": "^2.0.14", + "@smithy/middleware-endpoint": "^2.1.3", + "@smithy/middleware-retry": "^2.0.18", + "@smithy/middleware-serde": "^2.0.12", + "@smithy/middleware-stack": "^2.0.6", + "@smithy/node-config-provider": "^2.1.3", + "@smithy/node-http-handler": "^2.1.8", + "@smithy/property-provider": "^2.0.0", + "@smithy/protocol-http": "^3.0.8", + "@smithy/shared-ini-file-loader": "^2.0.6", + "@smithy/smithy-client": "^2.1.12", + "@smithy/types": "^2.4.0", + "@smithy/url-parser": "^2.0.12", + "@smithy/util-base64": "^2.0.0", + "@smithy/util-body-length-browser": "^2.0.0", + "@smithy/util-body-length-node": "^2.1.0", + "@smithy/util-defaults-mode-browser": "^2.0.16", + "@smithy/util-defaults-mode-node": "^2.0.21", + "@smithy/util-endpoints": "^1.0.2", + "@smithy/util-retry": "^2.0.5", + "@smithy/util-utf8": "^2.0.0", + "tslib": "^2.5.0" }, "engines": { "node": ">=14.0.0" } }, - "node_modules/@aws-sdk/middleware-sdk-s3": { - "version": "3.257.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.257.0.tgz", - "integrity": "sha512-l9KRlUgsDKV1MB3zfttX/syhIBsG5Z3VVslz6EW09eSqZVreCudW3TMdyeLemup57xC2veEpkgVj8igiXd/LVQ==", + "node_modules/@aws-sdk/types": { + "version": "3.433.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.433.0.tgz", + "integrity": "sha512-0jEE2mSrNDd8VGFjTc1otYrwYPIkzZJEIK90ZxisKvQ/EURGBhNzWn7ejWB9XCMFT6XumYLBR0V9qq5UPisWtA==", "dependencies": { - "@aws-sdk/protocol-http": "3.257.0", - "@aws-sdk/types": "3.257.0", - "@aws-sdk/util-arn-parser": "3.208.0", - "tslib": "^2.3.1" + "@smithy/types": "^2.4.0", + "tslib": "^2.5.0" }, "engines": { "node": ">=14.0.0" } }, - "node_modules/@aws-sdk/middleware-sdk-sts": { - "version": "3.257.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-sdk-sts/-/middleware-sdk-sts-3.257.0.tgz", - "integrity": "sha512-d6IJCLRi3O2tm4AFK60WNhIwmMmspj1WzKR1q1TaoPzoREPG2xg+Am18wZBRkCyYuRPPrbizmkvAmAJiUolMAw==", - "dependencies": { - "@aws-sdk/middleware-signing": "3.257.0", - "@aws-sdk/property-provider": "3.257.0", - "@aws-sdk/protocol-http": "3.257.0", - "@aws-sdk/signature-v4": "3.257.0", - "@aws-sdk/types": "3.257.0", - "tslib": "^2.3.1" + "node_modules/@aws-sdk/util-arn-parser": { + "version": "3.310.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-arn-parser/-/util-arn-parser-3.310.0.tgz", + "integrity": "sha512-jL8509owp/xB9+Or0pvn3Fe+b94qfklc2yPowZZIFAkFcCSIdkIglz18cPDWnYAcy9JGewpMS1COXKIUhZkJsA==", + "dependencies": { + "tslib": "^2.5.0" }, "engines": { "node": ">=14.0.0" } }, - "node_modules/@aws-sdk/middleware-serde": { - "version": "3.257.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-serde/-/middleware-serde-3.257.0.tgz", - "integrity": "sha512-/JasfXPWFq24mnCrx9fxW/ISBSp07RJwhsF14qzm8Qy3Z0z470C+QRM6otTwAkYuuVt1wuLjja5agq3Jtzq7dQ==", + "node_modules/@aws-sdk/util-endpoints": { + "version": "3.438.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.438.0.tgz", + "integrity": "sha512-6VyPTq1kN3GWxwFt5DdZfOsr6cJZPLjWh0troY/0uUv3hK74C9o3Y0Xf/z8UAUvQFkVqZse12O0/BgPVMImvfA==", "dependencies": { - "@aws-sdk/types": "3.257.0", - "tslib": "^2.3.1" + "@aws-sdk/types": "3.433.0", + "@smithy/util-endpoints": "^1.0.2", + "tslib": "^2.5.0" }, "engines": { "node": ">=14.0.0" } }, - "node_modules/@aws-sdk/middleware-signing": { - "version": "3.257.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-signing/-/middleware-signing-3.257.0.tgz", - "integrity": "sha512-hCH3D83LHmm6nqmtNrGTWZCVjsQXrGHIXbd17/qrw7aPFvcAhsiiCncGFP+XsUXEKa2ZqcSNMUyPrx69ofNRZQ==", - "dependencies": { - "@aws-sdk/property-provider": "3.257.0", - "@aws-sdk/protocol-http": "3.257.0", - "@aws-sdk/signature-v4": "3.257.0", - "@aws-sdk/types": "3.257.0", - "@aws-sdk/util-middleware": "3.257.0", - "tslib": "^2.3.1" + "node_modules/@aws-sdk/util-format-url": { + "version": "3.433.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-format-url/-/util-format-url-3.433.0.tgz", + "integrity": "sha512-Z6T7I4hELoQ4eeIuKIKx+52B9bc3SCPhjgMcFAFQeesjmHAr0drHyoGNJIat6ckvgI6zzFaeaBZTvWDA2hyDkA==", + "dependencies": { + "@aws-sdk/types": "3.433.0", + "@smithy/querystring-builder": "^2.0.12", + "@smithy/types": "^2.4.0", + "tslib": "^2.5.0" }, "engines": { "node": ">=14.0.0" } }, - "node_modules/@aws-sdk/middleware-ssec": { - "version": "3.257.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-ssec/-/middleware-ssec-3.257.0.tgz", - "integrity": "sha512-YcZrKeZk/0bsFvnTqp2rcF+6BSmeLTA65ZtyNNP2hh7Imaxg3kAQcueOJBeK4YP/5nU7a1mtt/4Q8BqbIjc41g==", + "node_modules/@aws-sdk/util-locate-window": { + "version": "3.310.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-locate-window/-/util-locate-window-3.310.0.tgz", + "integrity": "sha512-qo2t/vBTnoXpjKxlsC2e1gBrRm80M3bId27r0BRB2VniSSe7bL1mmzM+/HFtujm0iAxtPM+aLEflLJlJeDPg0w==", "dependencies": { - "@aws-sdk/types": "3.257.0", - "tslib": "^2.3.1" + "tslib": "^2.5.0" }, "engines": { "node": ">=14.0.0" } }, - "node_modules/@aws-sdk/middleware-stack": { - "version": "3.257.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-stack/-/middleware-stack-3.257.0.tgz", - "integrity": "sha512-awg2F0SvwACBaw4HIObK8pQGfSqAc4Vy+YFzWSfZNVC35oRO6RsRdKHVU99lRC0LrT2Ptmfghl2DMPSrRDbvlQ==", + "node_modules/@aws-sdk/util-user-agent-browser": { + "version": "3.433.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.433.0.tgz", + "integrity": "sha512-2Cf/Lwvxbt5RXvWFXrFr49vXv0IddiUwrZoAiwhDYxvsh+BMnh+NUFot+ZQaTrk/8IPZVDeLPWZRdVy00iaVXQ==", "dependencies": { - "tslib": "^2.3.1" - }, - "engines": { - "node": ">=14.0.0" + "@aws-sdk/types": "3.433.0", + "@smithy/types": "^2.4.0", + "bowser": "^2.11.0", + "tslib": "^2.5.0" } }, - "node_modules/@aws-sdk/middleware-user-agent": { - "version": "3.257.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.257.0.tgz", - "integrity": "sha512-37rt75LZyD0UWpbcFuxEGqwF3DZKSixQPl7AsDe6q3KtrO5gGQB+diH5vbY0txNNYyv5IK9WMwvY73mVmoWRmw==", + "node_modules/@aws-sdk/util-user-agent-node": { + "version": "3.437.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.437.0.tgz", + "integrity": "sha512-JVEcvWaniamtYVPem4UthtCNoTBCfFTwYj7Y3CrWZ2Qic4TqrwLkAfaBGtI2TGrhIClVr77uzLI6exqMTN7orA==", "dependencies": { - "@aws-sdk/protocol-http": "3.257.0", - "@aws-sdk/types": "3.257.0", - "tslib": "^2.3.1" + "@aws-sdk/types": "3.433.0", + "@smithy/node-config-provider": "^2.1.3", + "@smithy/types": "^2.4.0", + "tslib": "^2.5.0" }, "engines": { "node": ">=14.0.0" + }, + "peerDependencies": { + "aws-crt": ">=1.0.0" + }, + "peerDependenciesMeta": { + "aws-crt": { + "optional": true + } } }, - "node_modules/@aws-sdk/node-config-provider": { + "node_modules/@aws-sdk/util-utf8-browser": { "version": "3.259.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/node-config-provider/-/node-config-provider-3.259.0.tgz", - "integrity": "sha512-DUOqr71oonBvM6yKPdhDBmraqgXHCFrVWFw7hc5ZNxL2wS/EsbKfGPJp+C+SUgpn1upIWPNnh/bNoLAbBkcLsA==", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-utf8-browser/-/util-utf8-browser-3.259.0.tgz", + "integrity": "sha512-UvFa/vR+e19XookZF8RzFZBrw2EUkQWxiBW0yYQAhvk3C+QVGl0H3ouca8LDBlBfQKXwmW3huo/59H8rwb1wJw==", "dependencies": { - "@aws-sdk/property-provider": "3.257.0", - "@aws-sdk/shared-ini-file-loader": "3.257.0", - "@aws-sdk/types": "3.257.0", "tslib": "^2.3.1" - }, - "engines": { - "node": ">=14.0.0" } }, - "node_modules/@aws-sdk/node-http-handler": { - "version": "3.257.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/node-http-handler/-/node-http-handler-3.257.0.tgz", - "integrity": "sha512-8KnWHVVwaGKyTlkTU9BSOAiSovNDoagxemU2l10QqBbzUCVpljCUMUkABEGRJ1yoQCl6DJ7RtNkAyZ8Ne/E15A==", + "node_modules/@aws-sdk/xml-builder": { + "version": "3.310.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/xml-builder/-/xml-builder-3.310.0.tgz", + "integrity": "sha512-TqELu4mOuSIKQCqj63fGVs86Yh+vBx5nHRpWKNUNhB2nPTpfbziTs5c1X358be3peVWA4wPxW7Nt53KIg1tnNw==", "dependencies": { - "@aws-sdk/abort-controller": "3.257.0", - "@aws-sdk/protocol-http": "3.257.0", - "@aws-sdk/querystring-builder": "3.257.0", - "@aws-sdk/types": "3.257.0", - "tslib": "^2.3.1" + "tslib": "^2.5.0" }, "engines": { "node": ">=14.0.0" } }, - "node_modules/@aws-sdk/property-provider": { - "version": "3.257.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/property-provider/-/property-provider-3.257.0.tgz", - "integrity": "sha512-3rUbRAcF0GZ5PhDiXhS4yREfZ5hOEtvYEa9S/19OdM5eoypOaLU5XnFcCKfnccSP8SkdgpJujzxOMRWNWadlAQ==", + "node_modules/@babel/code-frame": { + "version": "7.22.13", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz", + "integrity": "sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==", + "dev": true, "dependencies": { - "@aws-sdk/types": "3.257.0", - "tslib": "^2.3.1" + "@babel/highlight": "^7.22.13", + "chalk": "^2.4.2" }, "engines": { - "node": ">=14.0.0" + "node": ">=6.9.0" } }, - "node_modules/@aws-sdk/protocol-http": { - "version": "3.257.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/protocol-http/-/protocol-http-3.257.0.tgz", - "integrity": "sha512-xt7LGOgZIvbLS3418AYQLacOqx+mo5j4mPiIMz7f6AaUg+/fBUgESVsncKDqxbEJVwwCXSka8Ca0cntJmoeMSw==", + "node_modules/@babel/code-frame/node_modules/ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, "dependencies": { - "@aws-sdk/types": "3.257.0", - "tslib": "^2.3.1" + "color-convert": "^1.9.0" }, "engines": { - "node": ">=14.0.0" + "node": ">=4" } }, - "node_modules/@aws-sdk/querystring-builder": { - "version": "3.257.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/querystring-builder/-/querystring-builder-3.257.0.tgz", - "integrity": "sha512-mZHWLP7XIkzx1GIXO5WfX/iJ+aY9TWs02RE9FkdL2+by0HEMR65L3brQTbU1mIBJ7BjaPwYH24dljUOSABX7yg==", + "node_modules/@babel/code-frame/node_modules/chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "dev": true, "dependencies": { - "@aws-sdk/types": "3.257.0", - "@aws-sdk/util-uri-escape": "3.201.0", - "tslib": "^2.3.1" + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" }, "engines": { - "node": ">=14.0.0" + "node": ">=4" } }, - "node_modules/@aws-sdk/querystring-parser": { - "version": "3.257.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/querystring-parser/-/querystring-parser-3.257.0.tgz", - "integrity": "sha512-UDrE1dEwWrWT8dG2VCrGYrPxCWOkZ1fPTPkjpkR4KZEdQDZBqU5gYZF2xPj8Nz7pjQVHFuW2wFm3XYEk56GEjg==", + "node_modules/@babel/code-frame/node_modules/color-convert": { + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", + "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "dev": true, "dependencies": { - "@aws-sdk/types": "3.257.0", - "tslib": "^2.3.1" - }, - "engines": { - "node": ">=14.0.0" + "color-name": "1.1.3" } }, - "node_modules/@aws-sdk/s3-request-presigner": { - "version": "3.264.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/s3-request-presigner/-/s3-request-presigner-3.264.0.tgz", - "integrity": "sha512-8DNVV4tO6xkmoUA6n8iCgRC9adL8e3aphSXNykA2jWricTaR1/NtD9+5uYeklQbEh4EVisaQJJldOMlbB2GtXQ==", - "dependencies": { - "@aws-sdk/middleware-endpoint": "3.264.0", - "@aws-sdk/middleware-sdk-s3": "3.257.0", - "@aws-sdk/protocol-http": "3.257.0", - "@aws-sdk/signature-v4-multi-region": "3.264.0", - "@aws-sdk/smithy-client": "3.261.0", - "@aws-sdk/types": "3.257.0", - "@aws-sdk/util-create-request": "3.261.0", - "@aws-sdk/util-format-url": "3.257.0", - "tslib": "^2.3.1" - }, + "node_modules/@babel/code-frame/node_modules/color-name": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", + "dev": true + }, + "node_modules/@babel/code-frame/node_modules/escape-string-regexp": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", + "dev": true, "engines": { - "node": ">=14.0.0" + "node": ">=0.8.0" } }, - "node_modules/@aws-sdk/service-error-classification": { - "version": "3.257.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/service-error-classification/-/service-error-classification-3.257.0.tgz", - "integrity": "sha512-FAyR0XsueGkkqDtkP03cTJQk52NdQ9sZelLynmmlGPUP75LApRPvFe1riKrou6+LsDbwVNVffj6mbDfIcOhaOw==", + "node_modules/@babel/code-frame/node_modules/has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", + "dev": true, "engines": { - "node": ">=14.0.0" + "node": ">=4" } }, - "node_modules/@aws-sdk/shared-ini-file-loader": { - "version": "3.257.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/shared-ini-file-loader/-/shared-ini-file-loader-3.257.0.tgz", - "integrity": "sha512-HNjC1+Wx3xHiJc+CP14GhIdVhfQGSjroAsWseRxAhONocA9Fl1ZX4hx7+sA5c9nOoMVOovi6ivJ/6lCRPTDRrQ==", + "node_modules/@babel/code-frame/node_modules/supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dev": true, "dependencies": { - "@aws-sdk/types": "3.257.0", - "tslib": "^2.3.1" + "has-flag": "^3.0.0" }, "engines": { - "node": ">=14.0.0" + "node": ">=4" } }, - "node_modules/@aws-sdk/signature-v4": { - "version": "3.257.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/signature-v4/-/signature-v4-3.257.0.tgz", - "integrity": "sha512-aLQQN59X/D0+ShzPD3Anj5ntdMA/RFeNLOUCDyDvremViGi6yxUS98usQ/8bG5Rq0sW2GGMdbFUFmrDvqdiqEQ==", - "dependencies": { - "@aws-sdk/is-array-buffer": "3.201.0", - "@aws-sdk/types": "3.257.0", - "@aws-sdk/util-hex-encoding": "3.201.0", - "@aws-sdk/util-middleware": "3.257.0", - "@aws-sdk/util-uri-escape": "3.201.0", - "@aws-sdk/util-utf8": "3.254.0", - "tslib": "^2.3.1" - }, + "node_modules/@babel/compat-data": { + "version": "7.23.2", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.23.2.tgz", + "integrity": "sha512-0S9TQMmDHlqAZ2ITT95irXKfxN9bncq8ZCoJhun3nHL/lLUxd2NKBJYoNGWH7S0hz6fRQwWlAWn/ILM0C70KZQ==", + "dev": true, "engines": { - "node": ">=14.0.0" + "node": ">=6.9.0" } }, - "node_modules/@aws-sdk/signature-v4-multi-region": { - "version": "3.264.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.264.0.tgz", - "integrity": "sha512-45rNJeC245g2HtDlxlcgNhB9YU0PcWXGNOLOiMWq3cSMNsaKJoTD1tLdBke2VjW7Hz7QBCWLCRAftHatnWcdyg==", - "dependencies": { - "@aws-sdk/protocol-http": "3.257.0", - "@aws-sdk/signature-v4": "3.257.0", - "@aws-sdk/types": "3.257.0", - "@aws-sdk/util-arn-parser": "3.208.0", - "tslib": "^2.3.1" + "node_modules/@babel/core": { + "version": "7.23.2", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.2.tgz", + "integrity": "sha512-n7s51eWdaWZ3vGT2tD4T7J6eJs3QoBXydv7vkUM06Bf1cbVD2Kc2UrkzhiQwobfV7NwOnQXYL7UBJ5VPU+RGoQ==", + "dev": true, + "dependencies": { + "@ampproject/remapping": "^2.2.0", + "@babel/code-frame": "^7.22.13", + "@babel/generator": "^7.23.0", + "@babel/helper-compilation-targets": "^7.22.15", + "@babel/helper-module-transforms": "^7.23.0", + "@babel/helpers": "^7.23.2", + "@babel/parser": "^7.23.0", + "@babel/template": "^7.22.15", + "@babel/traverse": "^7.23.2", + "@babel/types": "^7.23.0", + "convert-source-map": "^2.0.0", + "debug": "^4.1.0", + "gensync": "^1.0.0-beta.2", + "json5": "^2.2.3", + "semver": "^6.3.1" }, "engines": { - "node": ">=14.0.0" - }, - "peerDependencies": { - "@aws-sdk/signature-v4-crt": "^3.118.0" + "node": ">=6.9.0" }, - "peerDependenciesMeta": { - "@aws-sdk/signature-v4-crt": { - "optional": true - } + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/babel" } }, - "node_modules/@aws-sdk/smithy-client": { - "version": "3.261.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/smithy-client/-/smithy-client-3.261.0.tgz", - "integrity": "sha512-j8XQEa3caZUVFVZfhJjaskw80O/tB+IXu84HMN44N7UkXaCFHirUsNjTDztJhnVXf/gKXzIqUqprfRnOvwLtIg==", - "dependencies": { - "@aws-sdk/middleware-stack": "3.257.0", - "@aws-sdk/types": "3.257.0", - "tslib": "^2.3.1" - }, - "engines": { - "node": ">=14.0.0" + "node_modules/@babel/core/node_modules/semver": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "dev": true, + "bin": { + "semver": "bin/semver.js" } }, - "node_modules/@aws-sdk/token-providers": { - "version": "3.264.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.264.0.tgz", - "integrity": "sha512-1N54FCdBJRqrwFWHUoDpGI0rKhI29Or9ZwGjjcBzKzLhz5sEF/DEhuID7h1/KKEkXdQ0+lmXOFGMMrahrMpOow==", - "dependencies": { - "@aws-sdk/client-sso-oidc": "3.264.0", - "@aws-sdk/property-provider": "3.257.0", - "@aws-sdk/shared-ini-file-loader": "3.257.0", - "@aws-sdk/types": "3.257.0", - "tslib": "^2.3.1" + "node_modules/@babel/generator": { + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.0.tgz", + "integrity": "sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==", + "dev": true, + "dependencies": { + "@babel/types": "^7.23.0", + "@jridgewell/gen-mapping": "^0.3.2", + "@jridgewell/trace-mapping": "^0.3.17", + "jsesc": "^2.5.1" }, "engines": { - "node": ">=14.0.0" + "node": ">=6.9.0" } }, - "node_modules/@aws-sdk/types": { - "version": "3.257.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.257.0.tgz", - "integrity": "sha512-LmqXuBQBGeaGi/3Rp7XiEX1B5IPO2UUfBVvu0wwGqVsmstT0SbOVDZGPmxygACbm64n+PRx3uTSDefRfoiWYZg==", + "node_modules/@babel/helper-compilation-targets": { + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.15.tgz", + "integrity": "sha512-y6EEzULok0Qvz8yyLkCvVX+02ic+By2UdOhylwUOvOn9dvYc9mKICJuuU1n1XBI02YWsNsnrY1kc6DVbjcXbtw==", + "dev": true, "dependencies": { - "tslib": "^2.3.1" + "@babel/compat-data": "^7.22.9", + "@babel/helper-validator-option": "^7.22.15", + "browserslist": "^4.21.9", + "lru-cache": "^5.1.1", + "semver": "^6.3.1" }, "engines": { - "node": ">=14.0.0" + "node": ">=6.9.0" } }, - "node_modules/@aws-sdk/url-parser": { - "version": "3.257.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/url-parser/-/url-parser-3.257.0.tgz", - "integrity": "sha512-Qe/AcFe/NFZHa6cN2afXEQn9ehXxh57dWGdRjfjd2lQqNV4WW1R2pl2Tm1ZJ1dwuCNLJi4NHLMk8lrD3QQ8rdg==", - "dependencies": { - "@aws-sdk/querystring-parser": "3.257.0", - "@aws-sdk/types": "3.257.0", - "tslib": "^2.3.1" + "node_modules/@babel/helper-compilation-targets/node_modules/semver": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "dev": true, + "bin": { + "semver": "bin/semver.js" } }, - "node_modules/@aws-sdk/util-arn-parser": { - "version": "3.208.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-arn-parser/-/util-arn-parser-3.208.0.tgz", - "integrity": "sha512-QV4af+kscova9dv4VuHOgH8wEr/IIYHDGcnyVtkUEqahCejWr1Kuk+SBK0xMwnZY5LSycOtQ8aeqHOn9qOjZtA==", - "dependencies": { - "tslib": "^2.3.1" - }, + "node_modules/@babel/helper-environment-visitor": { + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz", + "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==", + "dev": true, "engines": { - "node": ">=14.0.0" + "node": ">=6.9.0" } }, - "node_modules/@aws-sdk/util-base64": { - "version": "3.208.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-base64/-/util-base64-3.208.0.tgz", - "integrity": "sha512-PQniZph5A6N7uuEOQi+1hnMz/FSOK/8kMFyFO+4DgA1dZ5pcKcn5wiFwHkcTb/BsgVqQa3Jx0VHNnvhlS8JyTg==", + "node_modules/@babel/helper-function-name": { + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz", + "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==", + "dev": true, "dependencies": { - "@aws-sdk/util-buffer-from": "3.208.0", - "tslib": "^2.3.1" + "@babel/template": "^7.22.15", + "@babel/types": "^7.23.0" }, "engines": { - "node": ">=14.0.0" + "node": ">=6.9.0" } }, - "node_modules/@aws-sdk/util-body-length-browser": { - "version": "3.188.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-body-length-browser/-/util-body-length-browser-3.188.0.tgz", - "integrity": "sha512-8VpnwFWXhnZ/iRSl9mTf+VKOX9wDE8QtN4bj9pBfxwf90H1X7E8T6NkiZD3k+HubYf2J94e7DbeHs7fuCPW5Qg==", + "node_modules/@babel/helper-hoist-variables": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz", + "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==", + "dev": true, "dependencies": { - "tslib": "^2.3.1" + "@babel/types": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" } }, - "node_modules/@aws-sdk/util-body-length-node": { - "version": "3.208.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-body-length-node/-/util-body-length-node-3.208.0.tgz", - "integrity": "sha512-3zj50e5g7t/MQf53SsuuSf0hEELzMtD8RX8C76f12OSRo2Bca4FLLYHe0TZbxcfQHom8/hOaeZEyTyMogMglqg==", + "node_modules/@babel/helper-module-imports": { + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz", + "integrity": "sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==", + "dev": true, "dependencies": { - "tslib": "^2.3.1" + "@babel/types": "^7.22.15" }, "engines": { - "node": ">=14.0.0" + "node": ">=6.9.0" } }, - "node_modules/@aws-sdk/util-buffer-from": { - "version": "3.208.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-buffer-from/-/util-buffer-from-3.208.0.tgz", - "integrity": "sha512-7L0XUixNEFcLUGPeBF35enCvB9Xl+K6SQsmbrPk1P3mlV9mguWSDQqbOBwY1Ir0OVbD6H/ZOQU7hI/9RtRI0Zw==", + "node_modules/@babel/helper-module-transforms": { + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.23.0.tgz", + "integrity": "sha512-WhDWw1tdrlT0gMgUJSlX0IQvoO1eN279zrAUbVB+KpV2c3Tylz8+GnKOLllCS6Z/iZQEyVYxhZVUdPTqs2YYPw==", + "dev": true, "dependencies": { - "@aws-sdk/is-array-buffer": "3.201.0", - "tslib": "^2.3.1" + "@babel/helper-environment-visitor": "^7.22.20", + "@babel/helper-module-imports": "^7.22.15", + "@babel/helper-simple-access": "^7.22.5", + "@babel/helper-split-export-declaration": "^7.22.6", + "@babel/helper-validator-identifier": "^7.22.20" }, "engines": { - "node": ">=14.0.0" + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0" } }, - "node_modules/@aws-sdk/util-config-provider": { - "version": "3.208.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-config-provider/-/util-config-provider-3.208.0.tgz", - "integrity": "sha512-DSRqwrERUsT34ug+anlMBIFooBEGwM8GejC7q00Y/9IPrQy50KnG5PW2NiTjuLKNi7pdEOlwTSEocJE15eDZIg==", - "dependencies": { - "tslib": "^2.3.1" - }, + "node_modules/@babel/helper-plugin-utils": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz", + "integrity": "sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==", + "dev": true, "engines": { - "node": ">=14.0.0" + "node": ">=6.9.0" } }, - "node_modules/@aws-sdk/util-create-request": { - "version": "3.261.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-create-request/-/util-create-request-3.261.0.tgz", - "integrity": "sha512-ZpTO76BBDdwE88pwYkAU816u34oOMXbJXoqVTw+EjLKOroCQYgJAu5VcGZ/vYFZ9zdLABQhqQZ1Cxag/w8sxLw==", + "node_modules/@babel/helper-simple-access": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz", + "integrity": "sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==", + "dev": true, "dependencies": { - "@aws-sdk/middleware-stack": "3.257.0", - "@aws-sdk/smithy-client": "3.261.0", - "@aws-sdk/types": "3.257.0", - "tslib": "^2.3.1" + "@babel/types": "^7.22.5" }, "engines": { - "node": ">=14.0.0" + "node": ">=6.9.0" } }, - "node_modules/@aws-sdk/util-defaults-mode-browser": { - "version": "3.261.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-defaults-mode-browser/-/util-defaults-mode-browser-3.261.0.tgz", - "integrity": "sha512-lX3X1NfzQVV6cakepGV24uRcqevlDnQ8VgaCV8dhnw1FVThueFigyoFaUA02+uRXbV9KIbNWkEvweNtm2wvyDw==", + "node_modules/@babel/helper-split-export-declaration": { + "version": "7.22.6", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz", + "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==", + "dev": true, "dependencies": { - "@aws-sdk/property-provider": "3.257.0", - "@aws-sdk/types": "3.257.0", - "bowser": "^2.11.0", - "tslib": "^2.3.1" + "@babel/types": "^7.22.5" }, "engines": { - "node": ">= 10.0.0" + "node": ">=6.9.0" } }, - "node_modules/@aws-sdk/util-defaults-mode-node": { - "version": "3.261.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-defaults-mode-node/-/util-defaults-mode-node-3.261.0.tgz", - "integrity": "sha512-4AK6yu4bOmHSocUdbGoEHbNXB09UA58ON2HBHY4NxMBuFBAd9XB2tYiyhce+Cm+o+lHbS8oQnw0VZw16WMzzew==", - "dependencies": { - "@aws-sdk/config-resolver": "3.259.0", - "@aws-sdk/credential-provider-imds": "3.259.0", - "@aws-sdk/node-config-provider": "3.259.0", - "@aws-sdk/property-provider": "3.257.0", - "@aws-sdk/types": "3.257.0", - "tslib": "^2.3.1" - }, + "node_modules/@babel/helper-string-parser": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz", + "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==", + "dev": true, "engines": { - "node": ">= 10.0.0" + "node": ">=6.9.0" } }, - "node_modules/@aws-sdk/util-endpoints": { - "version": "3.257.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.257.0.tgz", - "integrity": "sha512-3bvmRn5XGYzPPWjLuvHBKdJOb+fijnb8Ungu9bfXnTYFsng/ndHUWeHC22O/p8w3OWoRYUIMaZHxdxe27BFozg==", - "dependencies": { - "@aws-sdk/types": "3.257.0", - "tslib": "^2.3.1" - }, + "node_modules/@babel/helper-validator-identifier": { + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz", + "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==", + "dev": true, "engines": { - "node": ">=14.0.0" + "node": ">=6.9.0" } }, - "node_modules/@aws-sdk/util-format-url": { - "version": "3.257.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-format-url/-/util-format-url-3.257.0.tgz", - "integrity": "sha512-Q/c1BLoEZLvnjagAE0nQryhQlFoC/a8ZrXJn4XljWPeFcFAVLpCoSzcTbQM1N4oQvDIgMvl5gBeGzp0BiW30QA==", - "dependencies": { - "@aws-sdk/querystring-builder": "3.257.0", - "@aws-sdk/types": "3.257.0", - "tslib": "^2.3.1" - }, + "node_modules/@babel/helper-validator-option": { + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.22.15.tgz", + "integrity": "sha512-bMn7RmyFjY/mdECUbgn9eoSY4vqvacUnS9i9vGAGttgFWesO6B4CYWA7XlpbWgBt71iv/hfbPlynohStqnu5hA==", + "dev": true, "engines": { - "node": ">=14.0.0" + "node": ">=6.9.0" } }, - "node_modules/@aws-sdk/util-hex-encoding": { - "version": "3.201.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-hex-encoding/-/util-hex-encoding-3.201.0.tgz", - "integrity": "sha512-7t1vR1pVxKx0motd3X9rI3m/xNp78p3sHtP5yo4NP4ARpxyJ0fokBomY8ScaH2D/B+U5o9ARxldJUdMqyBlJcA==", + "node_modules/@babel/helpers": { + "version": "7.23.2", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.2.tgz", + "integrity": "sha512-lzchcp8SjTSVe/fPmLwtWVBFC7+Tbn8LGHDVfDp9JGxpAY5opSaEFgt8UQvrnECWOTdji2mOWMz1rOhkHscmGQ==", + "dev": true, "dependencies": { - "tslib": "^2.3.1" + "@babel/template": "^7.22.15", + "@babel/traverse": "^7.23.2", + "@babel/types": "^7.23.0" }, "engines": { - "node": ">=14.0.0" + "node": ">=6.9.0" } }, - "node_modules/@aws-sdk/util-locate-window": { - "version": "3.208.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-locate-window/-/util-locate-window-3.208.0.tgz", - "integrity": "sha512-iua1A2+P7JJEDHVgvXrRJSvsnzG7stYSGQnBVphIUlemwl6nN5D+QrgbjECtrbxRz8asYFHSzhdhECqN+tFiBg==", + "node_modules/@babel/highlight": { + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.20.tgz", + "integrity": "sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==", + "dev": true, "dependencies": { - "tslib": "^2.3.1" + "@babel/helper-validator-identifier": "^7.22.20", + "chalk": "^2.4.2", + "js-tokens": "^4.0.0" }, "engines": { - "node": ">=14.0.0" + "node": ">=6.9.0" } }, - "node_modules/@aws-sdk/util-middleware": { - "version": "3.257.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-middleware/-/util-middleware-3.257.0.tgz", - "integrity": "sha512-F9ieon8B8eGVs5tyZtAIG3DZEObDvujkspho0qRbUTHUosM0ylJLsMU800fmC/uRHLRrZvb/RSp59+kNDwSAMw==", + "node_modules/@babel/highlight/node_modules/ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, "dependencies": { - "tslib": "^2.3.1" + "color-convert": "^1.9.0" }, "engines": { - "node": ">=14.0.0" + "node": ">=4" } }, - "node_modules/@aws-sdk/util-retry": { - "version": "3.257.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-retry/-/util-retry-3.257.0.tgz", - "integrity": "sha512-l9TOsOAYtZxwW3q5fQKW4rsD9t2HVaBfQ4zBamHkNTfB4vBVvCnz4oxkvSvA2MlxCA6am+K1K/oj917Tpqk53g==", + "node_modules/@babel/highlight/node_modules/chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "dev": true, "dependencies": { - "@aws-sdk/service-error-classification": "3.257.0", - "tslib": "^2.3.1" + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" }, "engines": { - "node": ">= 14.0.0" + "node": ">=4" } }, - "node_modules/@aws-sdk/util-stream-browser": { - "version": "3.258.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-stream-browser/-/util-stream-browser-3.258.0.tgz", - "integrity": "sha512-MCAxHL3Hz/+eU4LZk0ZbLWAIUueH/jHpSbrloxZ3Dil2RL3w6NSJd5gE8zS7gs1B/eMcE600Brf5xSDR8kA5HA==", + "node_modules/@babel/highlight/node_modules/color-convert": { + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", + "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "dev": true, "dependencies": { - "@aws-sdk/fetch-http-handler": "3.257.0", - "@aws-sdk/types": "3.257.0", - "@aws-sdk/util-base64": "3.208.0", - "@aws-sdk/util-hex-encoding": "3.201.0", - "@aws-sdk/util-utf8": "3.254.0", - "tslib": "^2.3.1" + "color-name": "1.1.3" } }, - "node_modules/@aws-sdk/util-stream-node": { - "version": "3.257.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-stream-node/-/util-stream-node-3.257.0.tgz", - "integrity": "sha512-UlLEerQCNejNulYmGXm/4X463n8n21foA2d6kgJ4AUSMWWhoRBjfwrM4gI7tA30zh9U81d6xbUtoOQTqKVtMTw==", - "dependencies": { - "@aws-sdk/node-http-handler": "3.257.0", - "@aws-sdk/types": "3.257.0", - "@aws-sdk/util-buffer-from": "3.208.0", - "tslib": "^2.3.1" - }, - "engines": { - "node": ">=14.0.0" - } + "node_modules/@babel/highlight/node_modules/color-name": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", + "dev": true }, - "node_modules/@aws-sdk/util-uri-escape": { - "version": "3.201.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-uri-escape/-/util-uri-escape-3.201.0.tgz", - "integrity": "sha512-TeTWbGx4LU2c5rx0obHeDFeO9HvwYwQtMh1yniBz00pQb6Qt6YVOETVQikRZ+XRQwEyCg/dA375UplIpiy54mA==", - "dependencies": { - "tslib": "^2.3.1" - }, + "node_modules/@babel/highlight/node_modules/escape-string-regexp": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", + "dev": true, "engines": { - "node": ">=14.0.0" + "node": ">=0.8.0" } }, - "node_modules/@aws-sdk/util-user-agent-browser": { - "version": "3.257.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.257.0.tgz", - "integrity": "sha512-YdavWK6/8Cw6mypEgysGGX/dT9p9qnzFbnN5PQsUY+JJk2Nx8fKFydjGiQ+6rWPeW17RAv9mmbboh9uPVWxVlw==", - "dependencies": { - "@aws-sdk/types": "3.257.0", - "bowser": "^2.11.0", - "tslib": "^2.3.1" + "node_modules/@babel/highlight/node_modules/has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", + "dev": true, + "engines": { + "node": ">=4" } }, - "node_modules/@aws-sdk/util-user-agent-node": { - "version": "3.259.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.259.0.tgz", - "integrity": "sha512-R0VTmNs+ySDDebU98BUbsLyeIM5YmAEr9esPpy15XfSy3AWmAeru8nLlztdaLilHZzLIDzvM2t7NGk/FzZFCvA==", + "node_modules/@babel/highlight/node_modules/supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dev": true, "dependencies": { - "@aws-sdk/node-config-provider": "3.259.0", - "@aws-sdk/types": "3.257.0", - "tslib": "^2.3.1" + "has-flag": "^3.0.0" }, "engines": { - "node": ">=14.0.0" - }, - "peerDependencies": { - "aws-crt": ">=1.0.0" - }, - "peerDependenciesMeta": { - "aws-crt": { - "optional": true - } + "node": ">=4" } }, - "node_modules/@aws-sdk/util-utf8": { - "version": "3.254.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-utf8/-/util-utf8-3.254.0.tgz", - "integrity": "sha512-14Kso/eIt5/qfIBmhEL9L1IfyUqswjSTqO2mY7KOzUZ9SZbwn3rpxmtkhmATkRjD7XIlLKaxBkI7tU9Zjzj8Kw==", - "dependencies": { - "@aws-sdk/util-buffer-from": "3.208.0", - "tslib": "^2.3.1" + "node_modules/@babel/parser": { + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.0.tgz", + "integrity": "sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==", + "dev": true, + "bin": { + "parser": "bin/babel-parser.js" }, "engines": { - "node": ">=14.0.0" + "node": ">=6.0.0" } }, - "node_modules/@aws-sdk/util-utf8-browser": { - "version": "3.259.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-utf8-browser/-/util-utf8-browser-3.259.0.tgz", - "integrity": "sha512-UvFa/vR+e19XookZF8RzFZBrw2EUkQWxiBW0yYQAhvk3C+QVGl0H3ouca8LDBlBfQKXwmW3huo/59H8rwb1wJw==", - "dependencies": { - "tslib": "^2.3.1" + "node_modules/@babel/plugin-syntax-async-generators": { + "version": "7.8.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz", + "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.8.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/@aws-sdk/util-waiter": { - "version": "3.257.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-waiter/-/util-waiter-3.257.0.tgz", - "integrity": "sha512-Fr6of3EDOcXVDs5534o7VsJMXdybB0uLy2LzeFAVSwGOY3geKhIquBAiUDqCVu9B+iTldrC0rQ9NIM7ZSpPG8w==", + "node_modules/@babel/plugin-syntax-bigint": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz", + "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==", + "dev": true, "dependencies": { - "@aws-sdk/abort-controller": "3.257.0", - "@aws-sdk/types": "3.257.0", - "tslib": "^2.3.1" + "@babel/helper-plugin-utils": "^7.8.0" }, - "engines": { - "node": ">=14.0.0" + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/@aws-sdk/xml-builder": { - "version": "3.201.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/xml-builder/-/xml-builder-3.201.0.tgz", - "integrity": "sha512-brRdB1wwMgjWEnOQsv7zSUhIQuh7DEicrfslAqHop4S4FtSI3GQAShpQqgOpMTNFYcpaWKmE/Y1MJmNY7xLCnw==", + "node_modules/@babel/plugin-syntax-class-properties": { + "version": "7.12.13", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz", + "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==", + "dev": true, "dependencies": { - "tslib": "^2.3.1" + "@babel/helper-plugin-utils": "^7.12.13" }, - "engines": { - "node": ">=14.0.0" + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/code-frame": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz", - "integrity": "sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==", + "node_modules/@babel/plugin-syntax-import-meta": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz", + "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==", "dev": true, "dependencies": { - "@babel/highlight": "^7.18.6" + "@babel/helper-plugin-utils": "^7.10.4" }, - "engines": { - "node": ">=6.9.0" + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/compat-data": { - "version": "7.20.14", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.20.14.tgz", - "integrity": "sha512-0YpKHD6ImkWMEINCyDAD0HLLUH/lPCefG8ld9it8DJB2wnApraKuhgYTvTY1z7UFIfBTGy5LwncZ+5HWWGbhFw==", + "node_modules/@babel/plugin-syntax-json-strings": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz", + "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==", "dev": true, - "engines": { - "node": ">=6.9.0" + "dependencies": { + "@babel/helper-plugin-utils": "^7.8.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/core": { - "version": "7.20.12", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.20.12.tgz", - "integrity": "sha512-XsMfHovsUYHFMdrIHkZphTN/2Hzzi78R08NuHfDBehym2VsPDL6Zn/JAD/JQdnRvbSsbQc4mVaU1m6JgtTEElg==", + "node_modules/@babel/plugin-syntax-jsx": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.22.5.tgz", + "integrity": "sha512-gvyP4hZrgrs/wWMaocvxZ44Hw0b3W8Pe+cMxc8V1ULQ07oh8VNbIRaoD1LRZVTvD+0nieDKjfgKg89sD7rrKrg==", "dev": true, "dependencies": { - "@ampproject/remapping": "^2.1.0", - "@babel/code-frame": "^7.18.6", - "@babel/generator": "^7.20.7", - "@babel/helper-compilation-targets": "^7.20.7", - "@babel/helper-module-transforms": "^7.20.11", - "@babel/helpers": "^7.20.7", - "@babel/parser": "^7.20.7", - "@babel/template": "^7.20.7", - "@babel/traverse": "^7.20.12", - "@babel/types": "^7.20.7", - "convert-source-map": "^1.7.0", - "debug": "^4.1.0", - "gensync": "^1.0.0-beta.2", - "json5": "^2.2.2", - "semver": "^6.3.0" + "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { "node": ">=6.9.0" }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/babel" + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/core/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "node_modules/@babel/plugin-syntax-logical-assignment-operators": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz", + "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==", "dev": true, - "bin": { - "semver": "bin/semver.js" + "dependencies": { + "@babel/helper-plugin-utils": "^7.10.4" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/generator": { - "version": "7.20.14", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.20.14.tgz", - "integrity": "sha512-AEmuXHdcD3A52HHXxaTmYlb8q/xMEhoRP67B3T4Oq7lbmSoqroMZzjnGj3+i1io3pdnF8iBYVu4Ilj+c4hBxYg==", + "node_modules/@babel/plugin-syntax-nullish-coalescing-operator": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz", + "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==", "dev": true, "dependencies": { - "@babel/types": "^7.20.7", - "@jridgewell/gen-mapping": "^0.3.2", - "jsesc": "^2.5.1" + "@babel/helper-plugin-utils": "^7.8.0" }, - "engines": { - "node": ">=6.9.0" + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/generator/node_modules/@jridgewell/gen-mapping": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz", - "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==", + "node_modules/@babel/plugin-syntax-numeric-separator": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz", + "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==", "dev": true, "dependencies": { - "@jridgewell/set-array": "^1.0.1", - "@jridgewell/sourcemap-codec": "^1.4.10", - "@jridgewell/trace-mapping": "^0.3.9" + "@babel/helper-plugin-utils": "^7.10.4" }, - "engines": { - "node": ">=6.0.0" + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/helper-compilation-targets": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.7.tgz", - "integrity": "sha512-4tGORmfQcrc+bvrjb5y3dG9Mx1IOZjsHqQVUz7XCNHO+iTmqxWnVg3KRygjGmpRLJGdQSKuvFinbIb0CnZwHAQ==", + "node_modules/@babel/plugin-syntax-object-rest-spread": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz", + "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==", "dev": true, "dependencies": { - "@babel/compat-data": "^7.20.5", - "@babel/helper-validator-option": "^7.18.6", - "browserslist": "^4.21.3", - "lru-cache": "^5.1.1", - "semver": "^6.3.0" - }, - "engines": { - "node": ">=6.9.0" + "@babel/helper-plugin-utils": "^7.8.0" }, "peerDependencies": { - "@babel/core": "^7.0.0" + "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/helper-compilation-targets/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "node_modules/@babel/plugin-syntax-optional-catch-binding": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz", + "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==", "dev": true, - "bin": { - "semver": "bin/semver.js" + "dependencies": { + "@babel/helper-plugin-utils": "^7.8.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/helper-environment-visitor": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz", - "integrity": "sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==", + "node_modules/@babel/plugin-syntax-optional-chaining": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz", + "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==", "dev": true, - "engines": { - "node": ">=6.9.0" + "dependencies": { + "@babel/helper-plugin-utils": "^7.8.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/helper-function-name": { - "version": "7.19.0", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz", - "integrity": "sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==", + "node_modules/@babel/plugin-syntax-top-level-await": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz", + "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==", "dev": true, "dependencies": { - "@babel/template": "^7.18.10", - "@babel/types": "^7.19.0" + "@babel/helper-plugin-utils": "^7.14.5" }, "engines": { "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/helper-hoist-variables": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz", - "integrity": "sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==", + "node_modules/@babel/plugin-syntax-typescript": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.22.5.tgz", + "integrity": "sha512-1mS2o03i7t1c6VzH6fdQ3OA8tcEIxwG18zIPRp+UY1Ihv6W+XZzBCVxExF9upussPXJ0xE9XRHwMoNs1ep/nRQ==", "dev": true, "dependencies": { - "@babel/types": "^7.18.6" + "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/helper-module-imports": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz", - "integrity": "sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==", - "dev": true, + "node_modules/@babel/runtime": { + "version": "7.23.2", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.23.2.tgz", + "integrity": "sha512-mM8eg4yl5D6i3lu2QKPuPH4FArvJ8KhTofbE7jwMUv9KX5mBvwPAqnV3MlyBNqdp9RyRKP6Yck8TrfYrPvX3bg==", "dependencies": { - "@babel/types": "^7.18.6" + "regenerator-runtime": "^0.14.0" }, "engines": { "node": ">=6.9.0" } }, - "node_modules/@babel/helper-module-transforms": { - "version": "7.20.11", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.20.11.tgz", - "integrity": "sha512-uRy78kN4psmji1s2QtbtcCSaj/LILFDp0f/ymhpQH5QY3nljUZCaNWz9X1dEj/8MBdBEFECs7yRhKn8i7NjZgg==", - "dev": true, - "dependencies": { - "@babel/helper-environment-visitor": "^7.18.9", - "@babel/helper-module-imports": "^7.18.6", - "@babel/helper-simple-access": "^7.20.2", - "@babel/helper-split-export-declaration": "^7.18.6", - "@babel/helper-validator-identifier": "^7.19.1", - "@babel/template": "^7.20.7", - "@babel/traverse": "^7.20.10", - "@babel/types": "^7.20.7" + "node_modules/@babel/template": { + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz", + "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==", + "dev": true, + "dependencies": { + "@babel/code-frame": "^7.22.13", + "@babel/parser": "^7.22.15", + "@babel/types": "^7.22.15" }, "engines": { "node": ">=6.9.0" } }, - "node_modules/@babel/helper-plugin-utils": { - "version": "7.20.2", - "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz", - "integrity": "sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ==", - "dev": true, + "node_modules/@babel/traverse": { + "version": "7.23.2", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.2.tgz", + "integrity": "sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==", + "dev": true, + "dependencies": { + "@babel/code-frame": "^7.22.13", + "@babel/generator": "^7.23.0", + "@babel/helper-environment-visitor": "^7.22.20", + "@babel/helper-function-name": "^7.23.0", + "@babel/helper-hoist-variables": "^7.22.5", + "@babel/helper-split-export-declaration": "^7.22.6", + "@babel/parser": "^7.23.0", + "@babel/types": "^7.23.0", + "debug": "^4.1.0", + "globals": "^11.1.0" + }, "engines": { "node": ">=6.9.0" } }, - "node_modules/@babel/helper-simple-access": { - "version": "7.20.2", - "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz", - "integrity": "sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA==", + "node_modules/@babel/traverse/node_modules/globals": { + "version": "11.12.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", + "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", "dev": true, - "dependencies": { - "@babel/types": "^7.20.2" - }, "engines": { - "node": ">=6.9.0" + "node": ">=4" } }, - "node_modules/@babel/helper-split-export-declaration": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz", - "integrity": "sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==", + "node_modules/@babel/types": { + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.0.tgz", + "integrity": "sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==", "dev": true, "dependencies": { - "@babel/types": "^7.18.6" + "@babel/helper-string-parser": "^7.22.5", + "@babel/helper-validator-identifier": "^7.22.20", + "to-fast-properties": "^2.0.0" }, "engines": { "node": ">=6.9.0" } }, - "node_modules/@babel/helper-string-parser": { - "version": "7.19.4", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz", - "integrity": "sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==", + "node_modules/@bcoe/v8-coverage": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz", + "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==", + "dev": true + }, + "node_modules/@colors/colors": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz", + "integrity": "sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==", "dev": true, + "optional": true, "engines": { - "node": ">=6.9.0" + "node": ">=0.1.90" } }, - "node_modules/@babel/helper-validator-identifier": { - "version": "7.19.1", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz", - "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==", - "dev": true, + "node_modules/@cspotcode/source-map-support": { + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz", + "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==", + "devOptional": true, + "dependencies": { + "@jridgewell/trace-mapping": "0.3.9" + }, "engines": { - "node": ">=6.9.0" + "node": ">=12" } }, - "node_modules/@babel/helper-validator-option": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz", - "integrity": "sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==", - "dev": true, - "engines": { - "node": ">=6.9.0" + "node_modules/@cspotcode/source-map-support/node_modules/@jridgewell/trace-mapping": { + "version": "0.3.9", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz", + "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==", + "devOptional": true, + "dependencies": { + "@jridgewell/resolve-uri": "^3.0.3", + "@jridgewell/sourcemap-codec": "^1.4.10" } }, - "node_modules/@babel/helpers": { - "version": "7.20.13", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.20.13.tgz", - "integrity": "sha512-nzJ0DWCL3gB5RCXbUO3KIMMsBY2Eqbx8mBpKGE/02PgyRQFcPQLbkQ1vyy596mZLaP+dAfD+R4ckASzNVmW3jg==", + "node_modules/@eslint-community/eslint-utils": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz", + "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==", "dev": true, "dependencies": { - "@babel/template": "^7.20.7", - "@babel/traverse": "^7.20.13", - "@babel/types": "^7.20.7" + "eslint-visitor-keys": "^3.3.0" }, "engines": { - "node": ">=6.9.0" + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "peerDependencies": { + "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0" } }, - "node_modules/@babel/highlight": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz", - "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==", + "node_modules/@eslint-community/regexpp": { + "version": "4.10.0", + "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.10.0.tgz", + "integrity": "sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==", "dev": true, - "dependencies": { - "@babel/helper-validator-identifier": "^7.18.6", - "chalk": "^2.0.0", - "js-tokens": "^4.0.0" - }, "engines": { - "node": ">=6.9.0" + "node": "^12.0.0 || ^14.0.0 || >=16.0.0" } }, - "node_modules/@babel/highlight/node_modules/ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "node_modules/@eslint/eslintrc": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.2.tgz", + "integrity": "sha512-+wvgpDsrB1YqAMdEUCcnTlpfVBH7Vqn6A/NT3D8WVXFIaKMlErPIZT3oCIAVCOtarRpMtelZLqJeU3t7WY6X6g==", "dev": true, "dependencies": { - "color-convert": "^1.9.0" + "ajv": "^6.12.4", + "debug": "^4.3.2", + "espree": "^9.6.0", + "globals": "^13.19.0", + "ignore": "^5.2.0", + "import-fresh": "^3.2.1", + "js-yaml": "^4.1.0", + "minimatch": "^3.1.2", + "strip-json-comments": "^3.1.1" }, "engines": { - "node": ">=4" + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" } }, - "node_modules/@babel/highlight/node_modules/chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "node_modules/@eslint/eslintrc/node_modules/ajv": { + "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", "dev": true, "dependencies": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" }, - "engines": { - "node": ">=4" - } - }, - "node_modules/@babel/highlight/node_modules/color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, - "dependencies": { - "color-name": "1.1.3" + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" } }, - "node_modules/@babel/highlight/node_modules/color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", + "node_modules/@eslint/eslintrc/node_modules/json-schema-traverse": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", "dev": true }, - "node_modules/@babel/highlight/node_modules/escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", + "node_modules/@eslint/js": { + "version": "8.52.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.52.0.tgz", + "integrity": "sha512-mjZVbpaeMZludF2fsWLD0Z9gCref1Tk4i9+wddjRvpUNqqcndPkBD09N/Mapey0b3jaXbLm2kICwFv2E64QinA==", "dev": true, "engines": { - "node": ">=0.8.0" + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" } }, - "node_modules/@babel/highlight/node_modules/has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", - "dev": true, + "node_modules/@fastify/accept-negotiator": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@fastify/accept-negotiator/-/accept-negotiator-1.1.0.tgz", + "integrity": "sha512-OIHZrb2ImZ7XG85HXOONLcJWGosv7sIvM2ifAPQVhg9Lv7qdmMBNVaai4QTdyuaqbKM5eO6sLSQOYI7wEQeCJQ==", "engines": { - "node": ">=4" + "node": ">=14" } }, - "node_modules/@babel/highlight/node_modules/supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, + "node_modules/@fastify/ajv-compiler": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/@fastify/ajv-compiler/-/ajv-compiler-3.5.0.tgz", + "integrity": "sha512-ebbEtlI7dxXF5ziNdr05mOY8NnDiPB1XvAlLHctRt/Rc+C3LCOVW5imUVX+mhvUhnNzmPBHewUkOFgGlCxgdAA==", "dependencies": { - "has-flag": "^3.0.0" - }, - "engines": { - "node": ">=4" + "ajv": "^8.11.0", + "ajv-formats": "^2.1.1", + "fast-uri": "^2.0.0" } }, - "node_modules/@babel/parser": { - "version": "7.20.15", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.20.15.tgz", - "integrity": "sha512-DI4a1oZuf8wC+oAJA9RW6ga3Zbe8RZFt7kD9i4qAspz3I/yHet1VvC3DiSy/fsUvv5pvJuNPh0LPOdCcqinDPg==", - "dev": true, - "bin": { - "parser": "bin/babel-parser.js" + "node_modules/@fastify/busboy": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@fastify/busboy/-/busboy-1.2.1.tgz", + "integrity": "sha512-7PQA7EH43S0CxcOa9OeAnaeA0oQ+e/DHNPZwSQM9CQHW76jle5+OvLdibRp/Aafs9KXbLhxyjOTkRjWUbQEd3Q==", + "dependencies": { + "text-decoding": "^1.0.0" }, "engines": { - "node": ">=6.0.0" + "node": ">=14" } }, - "node_modules/@babel/plugin-syntax-async-generators": { - "version": "7.8.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz", - "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==", - "dev": true, + "node_modules/@fastify/cors": { + "version": "8.4.1", + "resolved": "https://registry.npmjs.org/@fastify/cors/-/cors-8.4.1.tgz", + "integrity": "sha512-iYQJtrY3pFiDS5mo5zRaudzg2OcUdJ96PD6xfkKOOEilly5nnrFZx/W6Sce2T79xxlEn2qpU3t5+qS2phS369w==", "dependencies": { - "@babel/helper-plugin-utils": "^7.8.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" + "fastify-plugin": "^4.0.0", + "mnemonist": "0.39.5" } }, - "node_modules/@babel/plugin-syntax-bigint": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz", - "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==", - "dev": true, + "node_modules/@fastify/deepmerge": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/@fastify/deepmerge/-/deepmerge-1.3.0.tgz", + "integrity": "sha512-J8TOSBq3SoZbDhM9+R/u77hP93gz/rajSA+K2kGyijPpORPWUXHUpTaleoj+92As0S9uPRP7Oi8IqMf0u+ro6A==" + }, + "node_modules/@fastify/error": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/@fastify/error/-/error-3.4.0.tgz", + "integrity": "sha512-e/mafFwbK3MNqxUcFBLgHhgxsF8UT1m8aj0dAlqEa2nJEgPsRtpHTZ3ObgrgkZ2M1eJHPTwgyUl/tXkvabsZdQ==" + }, + "node_modules/@fastify/fast-json-stringify-compiler": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/@fastify/fast-json-stringify-compiler/-/fast-json-stringify-compiler-4.3.0.tgz", + "integrity": "sha512-aZAXGYo6m22Fk1zZzEUKBvut/CIIQe/BapEORnxiD5Qr0kPHqqI69NtEMCme74h+at72sPhbkb4ZrLd1W3KRLA==", "dependencies": { - "@babel/helper-plugin-utils": "^7.8.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" + "fast-json-stringify": "^5.7.0" } }, - "node_modules/@babel/plugin-syntax-class-properties": { - "version": "7.12.13", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz", - "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==", - "dev": true, + "node_modules/@fastify/formbody": { + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/@fastify/formbody/-/formbody-7.4.0.tgz", + "integrity": "sha512-H3C6h1GN56/SMrZS8N2vCT2cZr7mIHzBHzOBa5OPpjfB/D6FzP9mMpE02ZzrFX0ANeh0BAJdoXKOF2e7IbV+Og==", "dependencies": { - "@babel/helper-plugin-utils": "^7.12.13" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" + "fast-querystring": "^1.0.0", + "fastify-plugin": "^4.0.0" } }, - "node_modules/@babel/plugin-syntax-import-meta": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz", - "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==", - "dev": true, + "node_modules/@fastify/helmet": { + "version": "11.1.1", + "resolved": "https://registry.npmjs.org/@fastify/helmet/-/helmet-11.1.1.tgz", + "integrity": "sha512-pjJxjk6SLEimITWadtYIXt6wBMfFC1I6OQyH/jYVCqSAn36sgAIFjeNiibHtifjCd+e25442pObis3Rjtame6A==", "dependencies": { - "@babel/helper-plugin-utils": "^7.10.4" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" + "fastify-plugin": "^4.2.1", + "helmet": "^7.0.0" } }, - "node_modules/@babel/plugin-syntax-json-strings": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz", - "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==", - "dev": true, + "node_modules/@fastify/middie": { + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/@fastify/middie/-/middie-8.3.0.tgz", + "integrity": "sha512-h+zBxCzMlkEkh4fM7pZaSGzqS7P9M0Z6rXnWPdUEPfe7x1BCj++wEk/pQ5jpyYY4pF8AknFqb77n7uwh8HdxEA==", "dependencies": { - "@babel/helper-plugin-utils": "^7.8.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" + "@fastify/error": "^3.2.0", + "fastify-plugin": "^4.0.0", + "path-to-regexp": "^6.1.0", + "reusify": "^1.0.4" } }, - "node_modules/@babel/plugin-syntax-logical-assignment-operators": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz", - "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==", - "dev": true, + "node_modules/@fastify/middie/node_modules/path-to-regexp": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.2.1.tgz", + "integrity": "sha512-JLyh7xT1kizaEvcaXOQwOc2/Yhw6KZOvPf1S8401UyLk86CU79LN3vl7ztXGm/pZ+YjoyAJ4rxmHwbkBXJX+yw==" + }, + "node_modules/@fastify/multipart": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@fastify/multipart/-/multipart-8.0.0.tgz", + "integrity": "sha512-xaH1pGIqYnIJjYs5qG6ryhPSFnWuJIfSXYqEUtzmcyREkMk0SwONd2y+SZ9JXfDmETAC/Ogtc/SRbz+AjZhCkw==", "dependencies": { - "@babel/helper-plugin-utils": "^7.10.4" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" + "@fastify/busboy": "^1.0.0", + "@fastify/deepmerge": "^1.0.0", + "@fastify/error": "^3.0.0", + "@fastify/swagger": "^8.3.1", + "@fastify/swagger-ui": "^1.8.0", + "fastify-plugin": "^4.0.0", + "secure-json-parse": "^2.4.0", + "stream-wormhole": "^1.1.0" } }, - "node_modules/@babel/plugin-syntax-nullish-coalescing-operator": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz", - "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==", - "dev": true, + "node_modules/@fastify/send": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/@fastify/send/-/send-2.1.0.tgz", + "integrity": "sha512-yNYiY6sDkexoJR0D8IDy3aRP3+L4wdqCpvx5WP+VtEU58sn7USmKynBzDQex5X42Zzvw2gNzzYgP90UfWShLFA==", "dependencies": { - "@babel/helper-plugin-utils": "^7.8.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" + "@lukeed/ms": "^2.0.1", + "escape-html": "~1.0.3", + "fast-decode-uri-component": "^1.0.1", + "http-errors": "2.0.0", + "mime": "^3.0.0" } }, - "node_modules/@babel/plugin-syntax-numeric-separator": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz", - "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==", - "dev": true, + "node_modules/@fastify/static": { + "version": "6.12.0", + "resolved": "https://registry.npmjs.org/@fastify/static/-/static-6.12.0.tgz", + "integrity": "sha512-KK1B84E6QD/FcQWxDI2aiUCwHxMJBI1KeCUzm1BwYpPY1b742+jeKruGHP2uOluuM6OkBPI8CIANrXcCRtC2oQ==", "dependencies": { - "@babel/helper-plugin-utils": "^7.10.4" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" + "@fastify/accept-negotiator": "^1.0.0", + "@fastify/send": "^2.0.0", + "content-disposition": "^0.5.3", + "fastify-plugin": "^4.0.0", + "glob": "^8.0.1", + "p-limit": "^3.1.0" } }, - "node_modules/@babel/plugin-syntax-object-rest-spread": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz", - "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==", - "dev": true, + "node_modules/@fastify/swagger": { + "version": "8.12.0", + "resolved": "https://registry.npmjs.org/@fastify/swagger/-/swagger-8.12.0.tgz", + "integrity": "sha512-IMRc0xYuzRvtFDMuaWHyVbvM7CuAi0g3o2jaVgLDvETXPrXWAMWsHYR5niIdWBDPgGUq+soHkag1DKXyhPDB0w==", "dependencies": { - "@babel/helper-plugin-utils": "^7.8.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" + "fastify-plugin": "^4.0.0", + "json-schema-resolver": "^2.0.0", + "openapi-types": "^12.0.0", + "rfdc": "^1.3.0", + "yaml": "^2.2.2" } }, - "node_modules/@babel/plugin-syntax-optional-catch-binding": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz", - "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==", - "dev": true, + "node_modules/@fastify/swagger-ui": { + "version": "1.10.1", + "resolved": "https://registry.npmjs.org/@fastify/swagger-ui/-/swagger-ui-1.10.1.tgz", + "integrity": "sha512-u3EJqNKvVr3X+6jY5i6pbs6/tXCrSlqc2Y+PVjnHBTOGh/d36uHMz+z4jPFy9gie2my6iHUrAdM8itlVmoUjog==", "dependencies": { - "@babel/helper-plugin-utils": "^7.8.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" + "@fastify/static": "^6.0.0", + "fastify-plugin": "^4.0.0", + "openapi-types": "^12.0.2", + "rfdc": "^1.3.0", + "yaml": "^2.2.2" } }, - "node_modules/@babel/plugin-syntax-optional-chaining": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz", - "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==", - "dev": true, + "node_modules/@golevelup/nestjs-testing": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/@golevelup/nestjs-testing/-/nestjs-testing-0.1.2.tgz", + "integrity": "sha512-7TOpI6E86GBE93DJoCqavOfycAMPjnZDfcpdBrm/aWUoR/oDxHjhTr1R8NGVY4+iHY5wDwEXG7mcDkDEWQznfQ==", + "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.", + "dev": true + }, + "node_modules/@grpc/grpc-js": { + "version": "1.9.9", + "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.9.9.tgz", + "integrity": "sha512-vQ1qwi/Kiyprt+uhb1+rHMpyk4CVRMTGNUGGPRGS7pLNfWkdCHrGEnT6T3/JyC2VZgoOX/X1KwdoU0WYQAeYcQ==", "dependencies": { - "@babel/helper-plugin-utils": "^7.8.0" + "@grpc/proto-loader": "^0.7.8", + "@types/node": ">=12.12.47" }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" + "engines": { + "node": "^8.13.0 || >=10.10.0" } }, - "node_modules/@babel/plugin-syntax-top-level-await": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz", - "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==", - "dev": true, + "node_modules/@grpc/proto-loader": { + "version": "0.7.10", + "resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.7.10.tgz", + "integrity": "sha512-CAqDfoaQ8ykFd9zqBDn4k6iWT9loLAlc2ETmDFS9JCD70gDcnA4L3AFEo2iV7KyAtAAHFW9ftq1Fz+Vsgq80RQ==", "dependencies": { - "@babel/helper-plugin-utils": "^7.14.5" + "lodash.camelcase": "^4.3.0", + "long": "^5.0.0", + "protobufjs": "^7.2.4", + "yargs": "^17.7.2" + }, + "bin": { + "proto-loader-gen-types": "build/bin/proto-loader-gen-types.js" }, "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" + "node": ">=6" } }, - "node_modules/@babel/plugin-syntax-typescript": { - "version": "7.20.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.20.0.tgz", - "integrity": "sha512-rd9TkG+u1CExzS4SM1BlMEhMXwFLKVjOAFFCDx9PbX5ycJWDoWMcwdJH9RhkPu1dOgn5TrxLot/Gx6lWFuAUNQ==", + "node_modules/@humanwhocodes/config-array": { + "version": "0.11.13", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.13.tgz", + "integrity": "sha512-JSBDMiDKSzQVngfRjOdFXgFfklaXI4K9nLF49Auh21lmBWRLIK3+xTErTWD4KU54pb6coM6ESE7Awz/FNU3zgQ==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.19.0" + "@humanwhocodes/object-schema": "^2.0.1", + "debug": "^4.1.1", + "minimatch": "^3.0.5" }, "engines": { - "node": ">=6.9.0" + "node": ">=10.10.0" + } + }, + "node_modules/@humanwhocodes/module-importer": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", + "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", + "dev": true, + "engines": { + "node": ">=12.22" }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" + "funding": { + "type": "github", + "url": "https://github.com/sponsors/nzakas" } }, - "node_modules/@babel/runtime": { - "version": "7.21.0", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.21.0.tgz", - "integrity": "sha512-xwII0//EObnq89Ji5AKYQaRYiW/nZ3llSv29d49IuxPhKbtJoLP+9QUUZ4nVragQVtaVGeZrpB+ZtG/Pdy/POw==", + "node_modules/@humanwhocodes/object-schema": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.1.tgz", + "integrity": "sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw==", + "dev": true + }, + "node_modules/@ioredis/commands": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@ioredis/commands/-/commands-1.2.0.tgz", + "integrity": "sha512-Sx1pU8EM64o2BrqNpEO1CNLtKQwyhuXuqyfH7oGKCk+1a33d2r5saW8zNwm3j6BTExtjrv2BxTgzzkMwts6vGg==", + "peer": true + }, + "node_modules/@isaacs/cliui": { + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", + "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==", "dependencies": { - "regenerator-runtime": "^0.13.11" + "string-width": "^5.1.2", + "string-width-cjs": "npm:string-width@^4.2.0", + "strip-ansi": "^7.0.1", + "strip-ansi-cjs": "npm:strip-ansi@^6.0.1", + "wrap-ansi": "^8.1.0", + "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0" }, "engines": { - "node": ">=6.9.0" + "node": ">=12" } }, - "node_modules/@babel/template": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.20.7.tgz", - "integrity": "sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw==", - "dev": true, + "node_modules/@isaacs/cliui/node_modules/ansi-regex": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", + "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-regex?sponsor=1" + } + }, + "node_modules/@isaacs/cliui/node_modules/ansi-styles": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", + "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/@isaacs/cliui/node_modules/emoji-regex": { + "version": "9.2.2", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", + "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==" + }, + "node_modules/@isaacs/cliui/node_modules/string-width": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", + "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", "dependencies": { - "@babel/code-frame": "^7.18.6", - "@babel/parser": "^7.20.7", - "@babel/types": "^7.20.7" + "eastasianwidth": "^0.2.0", + "emoji-regex": "^9.2.2", + "strip-ansi": "^7.0.1" }, "engines": { - "node": ">=6.9.0" + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/@babel/traverse": { - "version": "7.20.13", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.20.13.tgz", - "integrity": "sha512-kMJXfF0T6DIS9E8cgdLCSAL+cuCK+YEZHWiLK0SXpTo8YRj5lpJu3CDNKiIBCne4m9hhTIqUg6SYTAI39tAiVQ==", - "dev": true, - "dependencies": { - "@babel/code-frame": "^7.18.6", - "@babel/generator": "^7.20.7", - "@babel/helper-environment-visitor": "^7.18.9", - "@babel/helper-function-name": "^7.19.0", - "@babel/helper-hoist-variables": "^7.18.6", - "@babel/helper-split-export-declaration": "^7.18.6", - "@babel/parser": "^7.20.13", - "@babel/types": "^7.20.7", - "debug": "^4.1.0", - "globals": "^11.1.0" + "node_modules/@isaacs/cliui/node_modules/strip-ansi": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", + "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", + "dependencies": { + "ansi-regex": "^6.0.1" }, "engines": { - "node": ">=6.9.0" + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/strip-ansi?sponsor=1" } }, - "node_modules/@babel/traverse/node_modules/globals": { - "version": "11.12.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", - "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", - "dev": true, + "node_modules/@isaacs/cliui/node_modules/wrap-ansi": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", + "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", + "dependencies": { + "ansi-styles": "^6.1.0", + "string-width": "^5.0.1", + "strip-ansi": "^7.0.1" + }, "engines": { - "node": ">=4" + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" } }, - "node_modules/@babel/types": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.20.7.tgz", - "integrity": "sha512-69OnhBxSSgK0OzTJai4kyPDiKTIe3j+ctaHdIGVbRahTLAT7L3R9oeXHC2aVSuGYt3cVnoAMDmOCgJ2yaiLMvg==", + "node_modules/@istanbuljs/load-nyc-config": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz", + "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==", "dev": true, "dependencies": { - "@babel/helper-string-parser": "^7.19.4", - "@babel/helper-validator-identifier": "^7.19.1", - "to-fast-properties": "^2.0.0" + "camelcase": "^5.3.1", + "find-up": "^4.1.0", + "get-package-type": "^0.1.0", + "js-yaml": "^3.13.1", + "resolve-from": "^5.0.0" }, "engines": { - "node": ">=6.9.0" + "node": ">=8" } }, - "node_modules/@bcoe/v8-coverage": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz", - "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==", - "dev": true + "node_modules/@istanbuljs/load-nyc-config/node_modules/argparse": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", + "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", + "dev": true, + "dependencies": { + "sprintf-js": "~1.0.2" + } }, - "node_modules/@colors/colors": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz", - "integrity": "sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==", + "node_modules/@istanbuljs/load-nyc-config/node_modules/find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", "dev": true, - "optional": true, + "dependencies": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + }, "engines": { - "node": ">=0.1.90" + "node": ">=8" } }, - "node_modules/@cspotcode/source-map-support": { - "version": "0.8.1", - "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz", - "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==", - "devOptional": true, + "node_modules/@istanbuljs/load-nyc-config/node_modules/js-yaml": { + "version": "3.14.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", + "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", + "dev": true, "dependencies": { - "@jridgewell/trace-mapping": "0.3.9" + "argparse": "^1.0.7", + "esprima": "^4.0.0" }, - "engines": { - "node": ">=12" + "bin": { + "js-yaml": "bin/js-yaml.js" } }, - "node_modules/@cspotcode/source-map-support/node_modules/@jridgewell/trace-mapping": { - "version": "0.3.9", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz", - "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==", - "devOptional": true, + "node_modules/@istanbuljs/load-nyc-config/node_modules/locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "dev": true, "dependencies": { - "@jridgewell/resolve-uri": "^3.0.3", - "@jridgewell/sourcemap-codec": "^1.4.10" + "p-locate": "^4.1.0" + }, + "engines": { + "node": ">=8" } }, - "node_modules/@eslint/eslintrc": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.4.1.tgz", - "integrity": "sha512-XXrH9Uarn0stsyldqDYq8r++mROmWRI1xKMXa640Bb//SY1+ECYX6VzT6Lcx5frD0V30XieqJ0oX9I2Xj5aoMA==", + "node_modules/@istanbuljs/load-nyc-config/node_modules/p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", "dev": true, "dependencies": { - "ajv": "^6.12.4", - "debug": "^4.3.2", - "espree": "^9.4.0", - "globals": "^13.19.0", - "ignore": "^5.2.0", - "import-fresh": "^3.2.1", - "js-yaml": "^4.1.0", - "minimatch": "^3.1.2", - "strip-json-comments": "^3.1.1" + "p-try": "^2.0.0" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": ">=6" }, "funding": { - "url": "https://opencollective.com/eslint" + "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/@eslint/eslintrc/node_modules/ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "node_modules/@istanbuljs/load-nyc-config/node_modules/p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", "dev": true, "dependencies": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" + "p-limit": "^2.2.0" }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/epoberezkin" + "engines": { + "node": ">=8" } }, - "node_modules/@eslint/eslintrc/node_modules/json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true - }, - "node_modules/@fastify/accept-negotiator": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@fastify/accept-negotiator/-/accept-negotiator-1.1.0.tgz", - "integrity": "sha512-OIHZrb2ImZ7XG85HXOONLcJWGosv7sIvM2ifAPQVhg9Lv7qdmMBNVaai4QTdyuaqbKM5eO6sLSQOYI7wEQeCJQ==", + "node_modules/@istanbuljs/load-nyc-config/node_modules/resolve-from": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", + "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", + "dev": true, "engines": { - "node": ">=14" + "node": ">=8" } }, - "node_modules/@fastify/ajv-compiler": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/@fastify/ajv-compiler/-/ajv-compiler-3.5.0.tgz", - "integrity": "sha512-ebbEtlI7dxXF5ziNdr05mOY8NnDiPB1XvAlLHctRt/Rc+C3LCOVW5imUVX+mhvUhnNzmPBHewUkOFgGlCxgdAA==", - "dependencies": { - "ajv": "^8.11.0", - "ajv-formats": "^2.1.1", - "fast-uri": "^2.0.0" + "node_modules/@istanbuljs/schema": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz", + "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==", + "dev": true, + "engines": { + "node": ">=8" } }, - "node_modules/@fastify/busboy": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@fastify/busboy/-/busboy-1.2.1.tgz", - "integrity": "sha512-7PQA7EH43S0CxcOa9OeAnaeA0oQ+e/DHNPZwSQM9CQHW76jle5+OvLdibRp/Aafs9KXbLhxyjOTkRjWUbQEd3Q==", + "node_modules/@jest/console": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/console/-/console-29.7.0.tgz", + "integrity": "sha512-5Ni4CU7XHQi32IJ398EEP4RrB8eV09sXP2ROqD4bksHrnTree52PsxvX8tpL8LvTZ3pFzXyPbNQReSN41CAhOg==", + "dev": true, "dependencies": { - "text-decoding": "^1.0.0" + "@jest/types": "^29.6.3", + "@types/node": "*", + "chalk": "^4.0.0", + "jest-message-util": "^29.7.0", + "jest-util": "^29.7.0", + "slash": "^3.0.0" }, "engines": { - "node": ">=14" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/@fastify/cors": { - "version": "8.2.0", - "resolved": "https://registry.npmjs.org/@fastify/cors/-/cors-8.2.0.tgz", - "integrity": "sha512-qDgwpmg6C4D0D3nh8MTMuRXWyEwPnDZDBODaJv90FP2o9ukbahJByW4FtrM5Bpod5KbTf1oIExBmpItbUTQmHg==", + "node_modules/@jest/core": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/core/-/core-29.7.0.tgz", + "integrity": "sha512-n7aeXWKMnGtDA48y8TLWJPJmLmmZ642Ceo78cYWEpiD7FzDgmNDV/GCVRorPABdXLJZ/9wzzgZAlHjXjxDHGsg==", + "dev": true, "dependencies": { - "fastify-plugin": "^4.0.0", - "mnemonist": "0.39.5" - } - }, - "node_modules/@fastify/deepmerge": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@fastify/deepmerge/-/deepmerge-1.3.0.tgz", - "integrity": "sha512-J8TOSBq3SoZbDhM9+R/u77hP93gz/rajSA+K2kGyijPpORPWUXHUpTaleoj+92As0S9uPRP7Oi8IqMf0u+ro6A==" - }, - "node_modules/@fastify/error": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/@fastify/error/-/error-3.2.0.tgz", - "integrity": "sha512-KAfcLa+CnknwVi5fWogrLXgidLic+GXnLjijXdpl8pvkvbXU5BGa37iZO9FGvsh9ZL4y+oFi5cbHBm5UOG+dmQ==" - }, - "node_modules/@fastify/fast-json-stringify-compiler": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/@fastify/fast-json-stringify-compiler/-/fast-json-stringify-compiler-4.2.0.tgz", - "integrity": "sha512-ypZynRvXA3dibfPykQN3RB5wBdEUgSGgny8Qc6k163wYPLD4mEGEDkACp+00YmqkGvIm8D/xYoHajwyEdWD/eg==", - "dependencies": { - "fast-json-stringify": "^5.0.0" - } - }, - "node_modules/@fastify/formbody": { - "version": "7.4.0", - "resolved": "https://registry.npmjs.org/@fastify/formbody/-/formbody-7.4.0.tgz", - "integrity": "sha512-H3C6h1GN56/SMrZS8N2vCT2cZr7mIHzBHzOBa5OPpjfB/D6FzP9mMpE02ZzrFX0ANeh0BAJdoXKOF2e7IbV+Og==", - "dependencies": { - "fast-querystring": "^1.0.0", - "fastify-plugin": "^4.0.0" - } - }, - "node_modules/@fastify/helmet": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/@fastify/helmet/-/helmet-10.1.0.tgz", - "integrity": "sha512-v7QJPYf1uVcCwzyHzkDGcHTqDPscXj/61JKxOdvczyDPAKTxSeb9Sc2OBActXaj7zUELiAdgnkKkzNwmCNzBLQ==", - "dependencies": { - "fastify-plugin": "^4.2.1", - "helmet": "^6.0.0" - } - }, - "node_modules/@fastify/middie": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/@fastify/middie/-/middie-8.1.0.tgz", - "integrity": "sha512-VvUCLfKx2j6KSnh8puT8QW7d5YNzi2fD/4HcFvRQ3a7sHlCo+qtfX2fqzFvNqnMVbNft7GX1JL5if/riUiXsyg==", - "dependencies": { - "fastify-plugin": "^4.0.0", - "path-to-regexp": "^6.1.0", - "reusify": "^1.0.4" + "@jest/console": "^29.7.0", + "@jest/reporters": "^29.7.0", + "@jest/test-result": "^29.7.0", + "@jest/transform": "^29.7.0", + "@jest/types": "^29.6.3", + "@types/node": "*", + "ansi-escapes": "^4.2.1", + "chalk": "^4.0.0", + "ci-info": "^3.2.0", + "exit": "^0.1.2", + "graceful-fs": "^4.2.9", + "jest-changed-files": "^29.7.0", + "jest-config": "^29.7.0", + "jest-haste-map": "^29.7.0", + "jest-message-util": "^29.7.0", + "jest-regex-util": "^29.6.3", + "jest-resolve": "^29.7.0", + "jest-resolve-dependencies": "^29.7.0", + "jest-runner": "^29.7.0", + "jest-runtime": "^29.7.0", + "jest-snapshot": "^29.7.0", + "jest-util": "^29.7.0", + "jest-validate": "^29.7.0", + "jest-watcher": "^29.7.0", + "micromatch": "^4.0.4", + "pretty-format": "^29.7.0", + "slash": "^3.0.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + }, + "peerDependencies": { + "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0" + }, + "peerDependenciesMeta": { + "node-notifier": { + "optional": true + } } }, - "node_modules/@fastify/middie/node_modules/path-to-regexp": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.2.1.tgz", - "integrity": "sha512-JLyh7xT1kizaEvcaXOQwOc2/Yhw6KZOvPf1S8401UyLk86CU79LN3vl7ztXGm/pZ+YjoyAJ4rxmHwbkBXJX+yw==" - }, - "node_modules/@fastify/multipart": { - "version": "7.4.1", - "resolved": "https://registry.npmjs.org/@fastify/multipart/-/multipart-7.4.1.tgz", - "integrity": "sha512-PgBJIg/1krx1nWIXGZSUFQMPHXeFv559TmpaswzmNkK6V/yn1xi4nkATqBetv7s5XbXhxzc75uaJgXWdUefxvQ==", + "node_modules/@jest/environment": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.7.0.tgz", + "integrity": "sha512-aQIfHDq33ExsN4jP1NWGXhxgQ/wixs60gDiKO+XVMd8Mn0NWPWgc34ZQDTb2jKaUWQ7MuwoitXAsN2XVXNMpAw==", + "dev": true, "dependencies": { - "@fastify/busboy": "^1.0.0", - "@fastify/deepmerge": "^1.0.0", - "@fastify/error": "^3.0.0", - "end-of-stream": "^1.4.4", - "fastify-plugin": "^4.0.0", - "hexoid": "^1.0.0", - "secure-json-parse": "^2.4.0", - "stream-wormhole": "^1.1.0" + "@jest/fake-timers": "^29.7.0", + "@jest/types": "^29.6.3", + "@types/node": "*", + "jest-mock": "^29.7.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/@fastify/send": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@fastify/send/-/send-2.0.1.tgz", - "integrity": "sha512-8jdouu0o5d0FMq1+zCKeKXc1tmOQ5tTGYdQP3MpyF9+WWrZT1KCBdh6hvoEYxOm3oJG/akdE9BpehLiJgYRvGw==", + "node_modules/@jest/expect": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.7.0.tgz", + "integrity": "sha512-8uMeAMycttpva3P1lBHB8VciS9V0XAr3GymPpipdyQXbBcuhkLQOSe8E/p92RyAdToS6ZD1tFkX+CkhoECE0dQ==", + "dev": true, "dependencies": { - "@lukeed/ms": "^2.0.1", - "escape-html": "~1.0.3", - "fast-decode-uri-component": "^1.0.1", - "http-errors": "2.0.0", - "mime": "^3.0.0" + "expect": "^29.7.0", + "jest-snapshot": "^29.7.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/@fastify/static": { - "version": "6.8.0", - "resolved": "https://registry.npmjs.org/@fastify/static/-/static-6.8.0.tgz", - "integrity": "sha512-MNQp7KM0NIC+722OPN3MholnfvM+Vg2ao4OwbWWNJhAJEWOKGe4fJsEjIh3OkN0z5ymhklc7EXGCG0zDaIU5ZQ==", + "node_modules/@jest/expect-utils": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.7.0.tgz", + "integrity": "sha512-GlsNBWiFQFCVi9QVSx7f5AgMeLxe9YCCs5PuP2O2LdjDAA8Jh9eX7lA1Jq/xdXw3Wb3hyvlFNfZIfcRetSzYcA==", + "dev": true, "dependencies": { - "@fastify/accept-negotiator": "^1.0.0", - "@fastify/send": "^2.0.0", - "content-disposition": "^0.5.3", - "fastify-plugin": "^4.0.0", - "glob": "^8.0.1", - "p-limit": "^3.1.0", - "readable-stream": "^4.0.0" + "jest-get-type": "^29.6.3" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/@golevelup/nestjs-testing": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/@golevelup/nestjs-testing/-/nestjs-testing-0.1.2.tgz", - "integrity": "sha512-7TOpI6E86GBE93DJoCqavOfycAMPjnZDfcpdBrm/aWUoR/oDxHjhTr1R8NGVY4+iHY5wDwEXG7mcDkDEWQznfQ==", - "dev": true - }, - "node_modules/@grpc/grpc-js": { - "version": "1.8.7", - "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.8.7.tgz", - "integrity": "sha512-dRAWjRFN1Zy9mzPNLkFFIWT8T6C9euwluzCHZUKuhC+Bk3MayNPcpgDRyG+sg+n2sitEUySKxUynirVpu9ItKw==", + "node_modules/@jest/fake-timers": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.7.0.tgz", + "integrity": "sha512-q4DH1Ha4TTFPdxLsqDXK1d3+ioSL7yL5oCMJZgDYm6i+6CygW5E5xVr/D1HdsGxjt1ZWSfUAs9OxSB/BNelWrQ==", + "dev": true, "dependencies": { - "@grpc/proto-loader": "^0.7.0", - "@types/node": ">=12.12.47" + "@jest/types": "^29.6.3", + "@sinonjs/fake-timers": "^10.0.2", + "@types/node": "*", + "jest-message-util": "^29.7.0", + "jest-mock": "^29.7.0", + "jest-util": "^29.7.0" }, "engines": { - "node": "^8.13.0 || >=10.10.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/@grpc/proto-loader": { - "version": "0.7.4", - "resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.7.4.tgz", - "integrity": "sha512-MnWjkGwqQ3W8fx94/c1CwqLsNmHHv2t0CFn+9++6+cDphC1lolpg9M2OU0iebIjK//pBNX9e94ho+gjx6vz39w==", + "node_modules/@jest/globals": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.7.0.tgz", + "integrity": "sha512-mpiz3dutLbkW2MNFubUGUEVLkTGiqW6yLVTA+JbP6fI6J5iL9Y0Nlg8k95pcF8ctKwCS7WVxteBs29hhfAotzQ==", + "dev": true, "dependencies": { - "@types/long": "^4.0.1", - "lodash.camelcase": "^4.3.0", - "long": "^4.0.0", - "protobufjs": "^7.0.0", - "yargs": "^16.2.0" - }, - "bin": { - "proto-loader-gen-types": "build/bin/proto-loader-gen-types.js" + "@jest/environment": "^29.7.0", + "@jest/expect": "^29.7.0", + "@jest/types": "^29.6.3", + "jest-mock": "^29.7.0" }, "engines": { - "node": ">=6" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/@humanwhocodes/config-array": { - "version": "0.11.8", - "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.8.tgz", - "integrity": "sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g==", + "node_modules/@jest/reporters": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.7.0.tgz", + "integrity": "sha512-DApq0KJbJOEzAFYjHADNNxAE3KbhxQB1y5Kplb5Waqw6zVbuWatSnMjE5gs8FUgEPmNsnZA3NCWl9NG0ia04Pg==", "dev": true, "dependencies": { - "@humanwhocodes/object-schema": "^1.2.1", - "debug": "^4.1.1", - "minimatch": "^3.0.5" + "@bcoe/v8-coverage": "^0.2.3", + "@jest/console": "^29.7.0", + "@jest/test-result": "^29.7.0", + "@jest/transform": "^29.7.0", + "@jest/types": "^29.6.3", + "@jridgewell/trace-mapping": "^0.3.18", + "@types/node": "*", + "chalk": "^4.0.0", + "collect-v8-coverage": "^1.0.0", + "exit": "^0.1.2", + "glob": "^7.1.3", + "graceful-fs": "^4.2.9", + "istanbul-lib-coverage": "^3.0.0", + "istanbul-lib-instrument": "^6.0.0", + "istanbul-lib-report": "^3.0.0", + "istanbul-lib-source-maps": "^4.0.0", + "istanbul-reports": "^3.1.3", + "jest-message-util": "^29.7.0", + "jest-util": "^29.7.0", + "jest-worker": "^29.7.0", + "slash": "^3.0.0", + "string-length": "^4.0.1", + "strip-ansi": "^6.0.0", + "v8-to-istanbul": "^9.0.1" }, "engines": { - "node": ">=10.10.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + }, + "peerDependencies": { + "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0" + }, + "peerDependenciesMeta": { + "node-notifier": { + "optional": true + } } }, - "node_modules/@humanwhocodes/module-importer": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", - "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", + "node_modules/@jest/reporters/node_modules/glob": { + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", "dev": true, + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.1.1", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, "engines": { - "node": ">=12.22" + "node": "*" }, "funding": { - "type": "github", - "url": "https://github.com/sponsors/nzakas" + "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/@humanwhocodes/object-schema": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz", - "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==", - "dev": true - }, - "node_modules/@ioredis/commands": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@ioredis/commands/-/commands-1.2.0.tgz", - "integrity": "sha512-Sx1pU8EM64o2BrqNpEO1CNLtKQwyhuXuqyfH7oGKCk+1a33d2r5saW8zNwm3j6BTExtjrv2BxTgzzkMwts6vGg==", - "peer": true - }, - "node_modules/@istanbuljs/load-nyc-config": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz", - "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==", + "node_modules/@jest/schemas": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", + "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==", "dev": true, "dependencies": { - "camelcase": "^5.3.1", - "find-up": "^4.1.0", - "get-package-type": "^0.1.0", - "js-yaml": "^3.13.1", - "resolve-from": "^5.0.0" + "@sinclair/typebox": "^0.27.8" }, "engines": { - "node": ">=8" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/@istanbuljs/load-nyc-config/node_modules/argparse": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", - "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", + "node_modules/@jest/source-map": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-29.6.3.tgz", + "integrity": "sha512-MHjT95QuipcPrpLM+8JMSzFx6eHp5Bm+4XeFDJlwsvVBjmKNiIAvasGK2fxz2WbGRlnvqehFbh07MMa7n3YJnw==", "dev": true, "dependencies": { - "sprintf-js": "~1.0.2" + "@jridgewell/trace-mapping": "^0.3.18", + "callsites": "^3.0.0", + "graceful-fs": "^4.2.9" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/@istanbuljs/load-nyc-config/node_modules/find-up": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", - "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "node_modules/@jest/test-result": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.7.0.tgz", + "integrity": "sha512-Fdx+tv6x1zlkJPcWXmMDAG2HBnaR9XPSd5aDWQVsfrZmLVT3lU1cwyxLgRmXR9yrq4NBoEm9BMsfgFzTQAbJYA==", "dev": true, "dependencies": { - "locate-path": "^5.0.0", - "path-exists": "^4.0.0" + "@jest/console": "^29.7.0", + "@jest/types": "^29.6.3", + "@types/istanbul-lib-coverage": "^2.0.0", + "collect-v8-coverage": "^1.0.0" }, "engines": { - "node": ">=8" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/@istanbuljs/load-nyc-config/node_modules/js-yaml": { - "version": "3.14.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", - "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", + "node_modules/@jest/test-sequencer": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.7.0.tgz", + "integrity": "sha512-GQwJ5WZVrKnOJuiYiAF52UNUJXgTZx1NHjFSEB0qEMmSZKAkdMoIzw/Cj6x6NF4AvV23AUqDpFzQkN/eYCYTxw==", "dev": true, "dependencies": { - "argparse": "^1.0.7", - "esprima": "^4.0.0" + "@jest/test-result": "^29.7.0", + "graceful-fs": "^4.2.9", + "jest-haste-map": "^29.7.0", + "slash": "^3.0.0" }, - "bin": { - "js-yaml": "bin/js-yaml.js" + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/@istanbuljs/load-nyc-config/node_modules/locate-path": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", - "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "node_modules/@jest/transform": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.7.0.tgz", + "integrity": "sha512-ok/BTPFzFKVMwO5eOHRrvnBVHdRy9IrsrW1GpMaQ9MCnilNLXQKmAX8s1YXDFaai9xJpac2ySzV0YeRRECr2Vw==", "dev": true, "dependencies": { - "p-locate": "^4.1.0" + "@babel/core": "^7.11.6", + "@jest/types": "^29.6.3", + "@jridgewell/trace-mapping": "^0.3.18", + "babel-plugin-istanbul": "^6.1.1", + "chalk": "^4.0.0", + "convert-source-map": "^2.0.0", + "fast-json-stable-stringify": "^2.1.0", + "graceful-fs": "^4.2.9", + "jest-haste-map": "^29.7.0", + "jest-regex-util": "^29.6.3", + "jest-util": "^29.7.0", + "micromatch": "^4.0.4", + "pirates": "^4.0.4", + "slash": "^3.0.0", + "write-file-atomic": "^4.0.2" }, "engines": { - "node": ">=8" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/@istanbuljs/load-nyc-config/node_modules/p-limit": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "node_modules/@jest/types": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", + "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", "dev": true, "dependencies": { - "p-try": "^2.0.0" + "@jest/schemas": "^29.6.3", + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^3.0.0", + "@types/node": "*", + "@types/yargs": "^17.0.8", + "chalk": "^4.0.0" }, "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/@istanbuljs/load-nyc-config/node_modules/p-locate": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", - "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "node_modules/@jridgewell/gen-mapping": { + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz", + "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==", "dev": true, "dependencies": { - "p-limit": "^2.2.0" + "@jridgewell/set-array": "^1.0.1", + "@jridgewell/sourcemap-codec": "^1.4.10", + "@jridgewell/trace-mapping": "^0.3.9" }, "engines": { - "node": ">=8" + "node": ">=6.0.0" } }, - "node_modules/@istanbuljs/load-nyc-config/node_modules/resolve-from": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", - "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", - "dev": true, - "engines": { - "node": ">=8" + "node_modules/@jridgewell/resolve-uri": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz", + "integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==", + "devOptional": true, + "engines": { + "node": ">=6.0.0" } }, - "node_modules/@istanbuljs/schema": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz", - "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==", + "node_modules/@jridgewell/set-array": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz", + "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==", "dev": true, "engines": { - "node": ">=8" + "node": ">=6.0.0" } }, - "node_modules/@jest/console": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/console/-/console-28.1.3.tgz", - "integrity": "sha512-QPAkP5EwKdK/bxIr6C1I4Vs0rm2nHiANzj/Z5X2JQkrZo6IqvC4ldZ9K95tF0HdidhA8Bo6egxSzUFPYKcEXLw==", + "node_modules/@jridgewell/source-map": { + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.5.tgz", + "integrity": "sha512-UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ==", "dev": true, "dependencies": { - "@jest/types": "^28.1.3", - "@types/node": "*", - "chalk": "^4.0.0", - "jest-message-util": "^28.1.3", - "jest-util": "^28.1.3", - "slash": "^3.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "@jridgewell/gen-mapping": "^0.3.0", + "@jridgewell/trace-mapping": "^0.3.9" } }, - "node_modules/@jest/console/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "node_modules/@jridgewell/sourcemap-codec": { + "version": "1.4.15", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz", + "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==", + "devOptional": true + }, + "node_modules/@jridgewell/trace-mapping": { + "version": "0.3.20", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.20.tgz", + "integrity": "sha512-R8LcPeWZol2zR8mmH3JeKQ6QRCFb7XgUhV9ZlGhHLGyg4wpPiPZNQOOWhFZhxKw8u//yTbNGI42Bx/3paXEQ+Q==", "dev": true, "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, + "@jridgewell/resolve-uri": "^3.1.0", + "@jridgewell/sourcemap-codec": "^1.4.14" + } + }, + "node_modules/@lukeed/csprng": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@lukeed/csprng/-/csprng-1.1.0.tgz", + "integrity": "sha512-Z7C/xXCiGWsg0KuKsHTKJxbWhpI3Vs5GwLfOean7MGyVFGqdRgBbAjOCh6u4bbjPc/8MJ2pZmK/0DLdCbivLDA==", "engines": { - "node": ">=10" + "node": ">=8" + } + }, + "node_modules/@lukeed/ms": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@lukeed/ms/-/ms-2.0.1.tgz", + "integrity": "sha512-Xs/4RZltsAL7pkvaNStUQt7netTkyxrS0K+RILcVr3TRMS/ToOg4I6uNfhB9SlGsnWBym4U+EaXq0f0cEMNkHA==", + "engines": { + "node": ">=8" + } + }, + "node_modules/@msgpackr-extract/msgpackr-extract-darwin-arm64": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-arm64/-/msgpackr-extract-darwin-arm64-3.0.2.tgz", + "integrity": "sha512-9bfjwDxIDWmmOKusUcqdS4Rw+SETlp9Dy39Xui9BEGEk19dDwH0jhipwFzEff/pFg95NKymc6TOTbRKcWeRqyQ==", + "cpu": [ + "arm64" + ], + "optional": true, + "os": [ + "darwin" + ], + "peer": true + }, + "node_modules/@msgpackr-extract/msgpackr-extract-darwin-x64": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-x64/-/msgpackr-extract-darwin-x64-3.0.2.tgz", + "integrity": "sha512-lwriRAHm1Yg4iDf23Oxm9n/t5Zpw1lVnxYU3HnJPTi2lJRkKTrps1KVgvL6m7WvmhYVt/FIsssWay+k45QHeuw==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "darwin" + ], + "peer": true + }, + "node_modules/@msgpackr-extract/msgpackr-extract-linux-arm": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm/-/msgpackr-extract-linux-arm-3.0.2.tgz", + "integrity": "sha512-MOI9Dlfrpi2Cuc7i5dXdxPbFIgbDBGgKR5F2yWEa6FVEtSWncfVNKW5AKjImAQ6CZlBK9tympdsZJ2xThBiWWA==", + "cpu": [ + "arm" + ], + "optional": true, + "os": [ + "linux" + ], + "peer": true + }, + "node_modules/@msgpackr-extract/msgpackr-extract-linux-arm64": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm64/-/msgpackr-extract-linux-arm64-3.0.2.tgz", + "integrity": "sha512-FU20Bo66/f7He9Fp9sP2zaJ1Q8L9uLPZQDub/WlUip78JlPeMbVL8546HbZfcW9LNciEXc8d+tThSJjSC+tmsg==", + "cpu": [ + "arm64" + ], + "optional": true, + "os": [ + "linux" + ], + "peer": true + }, + "node_modules/@msgpackr-extract/msgpackr-extract-linux-x64": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-x64/-/msgpackr-extract-linux-x64-3.0.2.tgz", + "integrity": "sha512-gsWNDCklNy7Ajk0vBBf9jEx04RUxuDQfBse918Ww+Qb9HCPoGzS+XJTLe96iN3BVK7grnLiYghP/M4L8VsaHeA==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "linux" + ], + "peer": true + }, + "node_modules/@msgpackr-extract/msgpackr-extract-win32-x64": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-win32-x64/-/msgpackr-extract-win32-x64-3.0.2.tgz", + "integrity": "sha512-O+6Gs8UeDbyFpbSh2CPEz/UOrrdWPTBYNblZK5CxxLisYt4kGX3Sc+czffFonyjiGSq3jWLwJS/CCJc7tBr4sQ==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "win32" + ], + "peer": true + }, + "node_modules/@nestjs/axios": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@nestjs/axios/-/axios-3.0.1.tgz", + "integrity": "sha512-VlOZhAGDmOoFdsmewn8AyClAdGpKXQQaY1+3PGB+g6ceurGIdTxZgRX3VXc1T6Zs60PedWjg3A82TDOB05mrzQ==", + "peerDependencies": { + "@nestjs/common": "^7.0.0 || ^8.0.0 || ^9.0.0 || ^10.0.0", + "axios": "^1.3.1", + "reflect-metadata": "^0.1.12", + "rxjs": "^6.0.0 || ^7.0.0" + } + }, + "node_modules/@nestjs/bull-shared": { + "version": "10.0.1", + "resolved": "https://registry.npmjs.org/@nestjs/bull-shared/-/bull-shared-10.0.1.tgz", + "integrity": "sha512-8Td36l2i5x9+iQWjPB5Bd5+6u5Eangb5DclNcwrdwKqvd28xE92MSW97P4JV52C2kxrTjZwx8ck/wObAwtpQPw==", + "dependencies": { + "tslib": "2.6.0" }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" + "peerDependencies": { + "@nestjs/common": "^8.0.0 || ^9.0.0 || ^10.0.0", + "@nestjs/core": "^8.0.0 || ^9.0.0 || ^10.0.0" } }, - "node_modules/@jest/core": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/core/-/core-28.1.3.tgz", - "integrity": "sha512-CIKBrlaKOzA7YG19BEqCw3SLIsEwjZkeJzf5bdooVnW4bH5cktqe3JX+G2YV1aK5vP8N9na1IGWFzYaTp6k6NA==", + "node_modules/@nestjs/bull-shared/node_modules/tslib": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.0.tgz", + "integrity": "sha512-7At1WUettjcSRHXCyYtTselblcHl9PJFFVKiCAy/bY97+BPZXSQ2wbq0P9s8tK2G7dFQfNnlJnPAiArVBVBsfA==" + }, + "node_modules/@nestjs/bullmq": { + "version": "10.0.1", + "resolved": "https://registry.npmjs.org/@nestjs/bullmq/-/bullmq-10.0.1.tgz", + "integrity": "sha512-YJtfJXfnQinN7OvGx/Qd6jlQFu56zVnI1SppftSS7gkthB2CbJQAjkrfCEPDjp11wbPptBhUnatIL2N+nH/3kA==", + "dependencies": { + "@nestjs/bull-shared": "^10.0.1", + "tslib": "2.6.0" + }, + "peerDependencies": { + "@nestjs/common": "^8.0.0 || ^9.0.0 || ^10.0.0", + "@nestjs/core": "^8.0.0 || ^9.0.0 || ^10.0.0", + "bullmq": "^3.0.0 || ^4.0.0" + } + }, + "node_modules/@nestjs/bullmq/node_modules/tslib": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.0.tgz", + "integrity": "sha512-7At1WUettjcSRHXCyYtTselblcHl9PJFFVKiCAy/bY97+BPZXSQ2wbq0P9s8tK2G7dFQfNnlJnPAiArVBVBsfA==" + }, + "node_modules/@nestjs/cli": { + "version": "10.2.1", + "resolved": "https://registry.npmjs.org/@nestjs/cli/-/cli-10.2.1.tgz", + "integrity": "sha512-CAJAQwmxFZfB3RTvqz/eaXXWpyU+mZ4QSqfBYzjneTsPgF+uyOAW3yQpaLNn9Dfcv39R9UxSuAhayv6yuFd+Jg==", "dev": true, "dependencies": { - "@jest/console": "^28.1.3", - "@jest/reporters": "^28.1.3", - "@jest/test-result": "^28.1.3", - "@jest/transform": "^28.1.3", - "@jest/types": "^28.1.3", - "@types/node": "*", - "ansi-escapes": "^4.2.1", - "chalk": "^4.0.0", - "ci-info": "^3.2.0", - "exit": "^0.1.2", - "graceful-fs": "^4.2.9", - "jest-changed-files": "^28.1.3", - "jest-config": "^28.1.3", - "jest-haste-map": "^28.1.3", - "jest-message-util": "^28.1.3", - "jest-regex-util": "^28.0.2", - "jest-resolve": "^28.1.3", - "jest-resolve-dependencies": "^28.1.3", - "jest-runner": "^28.1.3", - "jest-runtime": "^28.1.3", - "jest-snapshot": "^28.1.3", - "jest-util": "^28.1.3", - "jest-validate": "^28.1.3", - "jest-watcher": "^28.1.3", - "micromatch": "^4.0.4", - "pretty-format": "^28.1.3", - "rimraf": "^3.0.0", - "slash": "^3.0.0", - "strip-ansi": "^6.0.0" + "@angular-devkit/core": "16.2.8", + "@angular-devkit/schematics": "16.2.8", + "@angular-devkit/schematics-cli": "16.2.8", + "@nestjs/schematics": "^10.0.1", + "chalk": "4.1.2", + "chokidar": "3.5.3", + "cli-table3": "0.6.3", + "commander": "4.1.1", + "fork-ts-checker-webpack-plugin": "9.0.2", + "glob": "10.3.10", + "inquirer": "8.2.6", + "node-emoji": "1.11.0", + "ora": "5.4.1", + "os-name": "4.0.1", + "rimraf": "4.4.1", + "shelljs": "0.8.5", + "source-map-support": "0.5.21", + "tree-kill": "1.2.2", + "tsconfig-paths": "4.2.0", + "tsconfig-paths-webpack-plugin": "4.1.0", + "typescript": "5.2.2", + "webpack": "5.89.0", + "webpack-node-externals": "3.0.0" + }, + "bin": { + "nest": "bin/nest.js" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": ">= 16.14" }, "peerDependencies": { - "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0" + "@swc/cli": "^0.1.62", + "@swc/core": "^1.3.62" }, "peerDependenciesMeta": { - "node-notifier": { + "@swc/cli": { + "optional": true + }, + "@swc/core": { "optional": true } } }, - "node_modules/@jest/core/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "node_modules/@nestjs/cli/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", "dev": true, "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" + "balanced-match": "^1.0.0" + } + }, + "node_modules/@nestjs/cli/node_modules/glob": { + "version": "10.3.10", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz", + "integrity": "sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==", + "dev": true, + "dependencies": { + "foreground-child": "^3.1.0", + "jackspeak": "^2.3.5", + "minimatch": "^9.0.1", + "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0", + "path-scurry": "^1.10.1" + }, + "bin": { + "glob": "dist/esm/bin.mjs" }, "engines": { - "node": ">=10" + "node": ">=16 || 14 >=14.17" }, "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" + "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/@jest/environment": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-28.1.3.tgz", - "integrity": "sha512-1bf40cMFTEkKyEf585R9Iz1WayDjHoHqvts0XFYEqyKM3cFWDpeMoqKKTAF9LSYQModPUlh8FKptoM2YcMWAXA==", + "node_modules/@nestjs/cli/node_modules/minimatch": { + "version": "9.0.3", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", + "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==", "dev": true, "dependencies": { - "@jest/fake-timers": "^28.1.3", - "@jest/types": "^28.1.3", - "@types/node": "*", - "jest-mock": "^28.1.3" + "brace-expansion": "^2.0.1" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/@jest/expect": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-28.1.3.tgz", - "integrity": "sha512-lzc8CpUbSoE4dqT0U+g1qODQjBRHPpCPXissXD4mS9+sWQdmmpeJ9zSH1rS1HEkrsMN0fb7nKrJ9giAR1d3wBw==", + "node_modules/@nestjs/cli/node_modules/rimraf": { + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-4.4.1.tgz", + "integrity": "sha512-Gk8NlF062+T9CqNGn6h4tls3k6T1+/nXdOcSZVikNVtlRdYpA7wRJJMoXmuvOnLW844rPjdQ7JgXCYM6PPC/og==", "dev": true, "dependencies": { - "expect": "^28.1.3", - "jest-snapshot": "^28.1.3" + "glob": "^9.2.0" + }, + "bin": { + "rimraf": "dist/cjs/src/bin.js" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/@jest/expect-utils": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-28.1.3.tgz", - "integrity": "sha512-wvbi9LUrHJLn3NlDW6wF2hvIMtd4JUl2QNVrjq+IBSHirgfrR3o9RnVtxzdEGO2n9JyIWwHnLfby5KzqBGg2YA==", + "node_modules/@nestjs/cli/node_modules/rimraf/node_modules/glob": { + "version": "9.3.5", + "resolved": "https://registry.npmjs.org/glob/-/glob-9.3.5.tgz", + "integrity": "sha512-e1LleDykUz2Iu+MTYdkSsuWX8lvAjAcs0Xef0lNIu0S2wOAzuTxCJtcd9S3cijlwYF18EsU3rzb8jPVobxDh9Q==", "dev": true, "dependencies": { - "jest-get-type": "^28.0.2" + "fs.realpath": "^1.0.0", + "minimatch": "^8.0.2", + "minipass": "^4.2.4", + "path-scurry": "^1.6.1" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/@jest/fake-timers": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-28.1.3.tgz", - "integrity": "sha512-D/wOkL2POHv52h+ok5Oj/1gOG9HSywdoPtFsRCUmlCILXNn5eIWmcnd3DIiWlJnpGvQtmajqBP95Ei0EimxfLw==", + "node_modules/@nestjs/cli/node_modules/rimraf/node_modules/minimatch": { + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-8.0.4.tgz", + "integrity": "sha512-W0Wvr9HyFXZRGIDgCicunpQ299OKXs9RgZfaukz4qAW/pJhcpUfupc9c+OObPOFueNy8VSrZgEmDtk6Kh4WzDA==", "dev": true, "dependencies": { - "@jest/types": "^28.1.3", - "@sinonjs/fake-timers": "^9.1.2", - "@types/node": "*", - "jest-message-util": "^28.1.3", - "jest-mock": "^28.1.3", - "jest-util": "^28.1.3" + "brace-expansion": "^2.0.1" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/@jest/globals": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-28.1.3.tgz", - "integrity": "sha512-XFU4P4phyryCXu1pbcqMO0GSQcYe1IsalYCDzRNyhetyeyxMcIxa11qPNDpVNLeretItNqEmYYQn1UYz/5x1NA==", + "node_modules/@nestjs/cli/node_modules/rimraf/node_modules/minipass": { + "version": "4.2.8", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-4.2.8.tgz", + "integrity": "sha512-fNzuVyifolSLFL4NzpF+wEF4qrgqaaKX0haXPQEdQ7NKAN+WecoKMHV09YcuL/DHxrUsYQOK3MiuDf7Ip2OXfQ==", "dev": true, - "dependencies": { - "@jest/environment": "^28.1.3", - "@jest/expect": "^28.1.3", - "@jest/types": "^28.1.3" - }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": ">=8" } }, - "node_modules/@jest/reporters": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-28.1.3.tgz", - "integrity": "sha512-JuAy7wkxQZVNU/V6g9xKzCGC5LVXx9FDcABKsSXp5MiKPEE2144a/vXTEDoyzjUpZKfVwp08Wqg5A4WfTMAzjg==", - "dev": true, + "node_modules/@nestjs/common": { + "version": "10.2.8", + "resolved": "https://registry.npmjs.org/@nestjs/common/-/common-10.2.8.tgz", + "integrity": "sha512-rmpwcdvq2IWMmsUVP8rsdKub6uDWk7dwCYo0aif50JTwcvcxzaP3iKVFKoSgvp0RKYu8h15+/AEOfaInmPpl0Q==", "dependencies": { - "@bcoe/v8-coverage": "^0.2.3", - "@jest/console": "^28.1.3", - "@jest/test-result": "^28.1.3", - "@jest/transform": "^28.1.3", - "@jest/types": "^28.1.3", - "@jridgewell/trace-mapping": "^0.3.13", - "@types/node": "*", - "chalk": "^4.0.0", - "collect-v8-coverage": "^1.0.0", - "exit": "^0.1.2", - "glob": "^7.1.3", - "graceful-fs": "^4.2.9", - "istanbul-lib-coverage": "^3.0.0", - "istanbul-lib-instrument": "^5.1.0", - "istanbul-lib-report": "^3.0.0", - "istanbul-lib-source-maps": "^4.0.0", - "istanbul-reports": "^3.1.3", - "jest-message-util": "^28.1.3", - "jest-util": "^28.1.3", - "jest-worker": "^28.1.3", - "slash": "^3.0.0", - "string-length": "^4.0.1", - "strip-ansi": "^6.0.0", - "terminal-link": "^2.0.0", - "v8-to-istanbul": "^9.0.1" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "iterare": "1.2.1", + "tslib": "2.6.2", + "uid": "2.0.2" }, - "peerDependencies": { - "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0" + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/nest" + }, + "peerDependencies": { + "class-transformer": "*", + "class-validator": "*", + "reflect-metadata": "^0.1.12", + "rxjs": "^7.1.0" }, "peerDependenciesMeta": { - "node-notifier": { + "class-transformer": { + "optional": true + }, + "class-validator": { "optional": true } } }, - "node_modules/@jest/reporters/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, + "node_modules/@nestjs/config": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/@nestjs/config/-/config-3.1.1.tgz", + "integrity": "sha512-qu5QlNiJdqQtOsnB6lx4JCXPQ96jkKUsOGd+JXfXwqJqZcOSAq6heNFg0opW4pq4J/VZoNwoo87TNnx9wthnqQ==", "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" + "dotenv": "16.3.1", + "dotenv-expand": "10.0.0", + "lodash": "4.17.21", + "uuid": "9.0.0" }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" + "peerDependencies": { + "@nestjs/common": "^8.0.0 || ^9.0.0 || ^10.0.0", + "reflect-metadata": "^0.1.13" } }, - "node_modules/@jest/reporters/node_modules/glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "dev": true, + "node_modules/@nestjs/config/node_modules/uuid": { + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.0.tgz", + "integrity": "sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==", + "bin": { + "uuid": "dist/bin/uuid" + } + }, + "node_modules/@nestjs/core": { + "version": "10.2.8", + "resolved": "https://registry.npmjs.org/@nestjs/core/-/core-10.2.8.tgz", + "integrity": "sha512-9+MZ2s8ixfY9Bl/M9ofChiyYymcwdK9ZWNH4GDMF7Am7XRAQ1oqde6MYGG05rhQwiVXuTwaYLlXciJKfsrg5qg==", + "hasInstallScript": true, "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" + "@nuxtjs/opencollective": "0.3.2", + "fast-safe-stringify": "2.1.1", + "iterare": "1.2.1", + "path-to-regexp": "3.2.0", + "tslib": "2.6.2", + "uid": "2.0.2" }, "funding": { - "url": "https://github.com/sponsors/isaacs" + "type": "opencollective", + "url": "https://opencollective.com/nest" + }, + "peerDependencies": { + "@nestjs/common": "^10.0.0", + "@nestjs/microservices": "^10.0.0", + "@nestjs/platform-express": "^10.0.0", + "@nestjs/websockets": "^10.0.0", + "reflect-metadata": "^0.1.12", + "rxjs": "^7.1.0" + }, + "peerDependenciesMeta": { + "@nestjs/microservices": { + "optional": true + }, + "@nestjs/platform-express": { + "optional": true + }, + "@nestjs/websockets": { + "optional": true + } } }, - "node_modules/@jest/schemas": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz", - "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==", - "dev": true, - "dependencies": { - "@sinclair/typebox": "^0.24.1" + "node_modules/@nestjs/mapped-types": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/@nestjs/mapped-types/-/mapped-types-2.0.2.tgz", + "integrity": "sha512-V0izw6tWs6fTp9+KiiPUbGHWALy563Frn8X6Bm87ANLRuE46iuBMD5acKBDP5lKL/75QFvrzSJT7HkCbB0jTpg==", + "peerDependencies": { + "@nestjs/common": "^8.0.0 || ^9.0.0 || ^10.0.0", + "class-transformer": "^0.4.0 || ^0.5.0", + "class-validator": "^0.13.0 || ^0.14.0", + "reflect-metadata": "^0.1.12" }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "peerDependenciesMeta": { + "class-transformer": { + "optional": true + }, + "class-validator": { + "optional": true + } } }, - "node_modules/@jest/source-map": { - "version": "28.1.2", - "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-28.1.2.tgz", - "integrity": "sha512-cV8Lx3BeStJb8ipPHnqVw/IM2VCMWO3crWZzYodSIkxXnRcXJipCdx1JCK0K5MsJJouZQTH73mzf4vgxRaH9ww==", - "dev": true, + "node_modules/@nestjs/microservices": { + "version": "10.2.8", + "resolved": "https://registry.npmjs.org/@nestjs/microservices/-/microservices-10.2.8.tgz", + "integrity": "sha512-zfrD7hgN3ygrjicASQUVdnsh3V7vTmhZfttZ7ZNjihwqEoweJFgWmqKkpAfbCrIP7z19gT4JQ8hO4W0Alwdt0w==", "dependencies": { - "@jridgewell/trace-mapping": "^0.3.13", - "callsites": "^3.0.0", - "graceful-fs": "^4.2.9" + "iterare": "1.2.1", + "tslib": "2.6.2" }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/nest" + }, + "peerDependencies": { + "@grpc/grpc-js": "*", + "@nestjs/common": "^10.0.0", + "@nestjs/core": "^10.0.0", + "@nestjs/websockets": "^10.0.0", + "amqp-connection-manager": "*", + "amqplib": "*", + "cache-manager": "*", + "ioredis": "*", + "kafkajs": "*", + "mqtt": "*", + "nats": "*", + "reflect-metadata": "^0.1.12", + "rxjs": "^7.1.0" + }, + "peerDependenciesMeta": { + "@grpc/grpc-js": { + "optional": true + }, + "@nestjs/websockets": { + "optional": true + }, + "amqp-connection-manager": { + "optional": true + }, + "amqplib": { + "optional": true + }, + "cache-manager": { + "optional": true + }, + "ioredis": { + "optional": true + }, + "kafkajs": { + "optional": true + }, + "mqtt": { + "optional": true + }, + "nats": { + "optional": true + } } }, - "node_modules/@jest/test-result": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-28.1.3.tgz", - "integrity": "sha512-kZAkxnSE+FqE8YjW8gNuoVkkC9I7S1qmenl8sGcDOLropASP+BkcGKwhXoyqQuGOGeYY0y/ixjrd/iERpEXHNg==", - "dev": true, + "node_modules/@nestjs/platform-fastify": { + "version": "10.2.8", + "resolved": "https://registry.npmjs.org/@nestjs/platform-fastify/-/platform-fastify-10.2.8.tgz", + "integrity": "sha512-ZeqIHeGLD7YgJ22K9AkyjcFv/yH/LH+HmujukBq/yDLFlJuurKCgbDPfL0PHq0RRMZu5CeB0dhs8+qihw96yjA==", "dependencies": { - "@jest/console": "^28.1.3", - "@jest/types": "^28.1.3", - "@types/istanbul-lib-coverage": "^2.0.0", - "collect-v8-coverage": "^1.0.0" + "@fastify/cors": "8.4.0", + "@fastify/formbody": "7.4.0", + "@fastify/middie": "8.3.0", + "fastify": "4.24.3", + "light-my-request": "5.11.0", + "path-to-regexp": "3.2.0", + "tslib": "2.6.2" }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/nest" + }, + "peerDependencies": { + "@fastify/static": "^6.0.0", + "@fastify/view": "^7.0.0 || ^8.0.0", + "@nestjs/common": "^10.0.0", + "@nestjs/core": "^10.0.0" + }, + "peerDependenciesMeta": { + "@fastify/static": { + "optional": true + }, + "@fastify/view": { + "optional": true + } } }, - "node_modules/@jest/test-sequencer": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-28.1.3.tgz", - "integrity": "sha512-NIMPEqqa59MWnDi1kvXXpYbqsfQmSJsIbnd85mdVGkiDfQ9WQQTXOLsvISUfonmnBT+w85WEgneCigEEdHDFxw==", - "dev": true, + "node_modules/@nestjs/platform-fastify/node_modules/@fastify/cors": { + "version": "8.4.0", + "resolved": "https://registry.npmjs.org/@fastify/cors/-/cors-8.4.0.tgz", + "integrity": "sha512-MlVvMTenltToByTpLwlWtO+7dQ3l2J+1OpmGrx9JpSNWo1d+dhfNCOi23zHhxdFhtpDzfwGwCsKu9DTeG7k7nQ==", "dependencies": { - "@jest/test-result": "^28.1.3", - "graceful-fs": "^4.2.9", - "jest-haste-map": "^28.1.3", - "slash": "^3.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "fastify-plugin": "^4.0.0", + "mnemonist": "0.39.5" } }, - "node_modules/@jest/transform": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-28.1.3.tgz", - "integrity": "sha512-u5dT5di+oFI6hfcLOHGTAfmUxFRrjK+vnaP0kkVow9Md/M7V/MxqQMOz/VV25UZO8pzeA9PjfTpOu6BDuwSPQA==", + "node_modules/@nestjs/schematics": { + "version": "10.0.3", + "resolved": "https://registry.npmjs.org/@nestjs/schematics/-/schematics-10.0.3.tgz", + "integrity": "sha512-2BRujK0GqGQ7j1Zpz+obVfskDnnOeVKt5aXoSaVngKo8Oczy8uYCY+R547TQB+Kf35epdfFER2pVnQrX3/It5A==", "dev": true, "dependencies": { - "@babel/core": "^7.11.6", - "@jest/types": "^28.1.3", - "@jridgewell/trace-mapping": "^0.3.13", - "babel-plugin-istanbul": "^6.1.1", - "chalk": "^4.0.0", - "convert-source-map": "^1.4.0", - "fast-json-stable-stringify": "^2.0.0", - "graceful-fs": "^4.2.9", - "jest-haste-map": "^28.1.3", - "jest-regex-util": "^28.0.2", - "jest-util": "^28.1.3", - "micromatch": "^4.0.4", - "pirates": "^4.0.4", - "slash": "^3.0.0", - "write-file-atomic": "^4.0.1" + "@angular-devkit/core": "16.2.8", + "@angular-devkit/schematics": "16.2.8", + "comment-json": "4.2.3", + "jsonc-parser": "3.2.0", + "pluralize": "8.0.0" }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "peerDependencies": { + "typescript": ">=4.8.2" } }, - "node_modules/@jest/transform/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, + "node_modules/@nestjs/swagger": { + "version": "7.1.14", + "resolved": "https://registry.npmjs.org/@nestjs/swagger/-/swagger-7.1.14.tgz", + "integrity": "sha512-2Ol4S6qHeYVVmkshkWBM8E/qkmEqEOUj2QIewr0jLSyo30H7f3v81pJyks6pTLy4PK0LGUXojMvIfFIE3mmGQQ==", "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" + "@nestjs/mapped-types": "2.0.2", + "js-yaml": "4.1.0", + "lodash": "4.17.21", + "path-to-regexp": "3.2.0", + "swagger-ui-dist": "5.9.0" }, - "engines": { - "node": ">=10" + "peerDependencies": { + "@fastify/static": "^6.0.0", + "@nestjs/common": "^9.0.0 || ^10.0.0", + "@nestjs/core": "^9.0.0 || ^10.0.0", + "class-transformer": "*", + "class-validator": "*", + "reflect-metadata": "^0.1.12" }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" + "peerDependenciesMeta": { + "@fastify/static": { + "optional": true + }, + "class-transformer": { + "optional": true + }, + "class-validator": { + "optional": true + } } }, - "node_modules/@jest/types": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz", - "integrity": "sha512-RyjiyMUZrKz/c+zlMFO1pm70DcIlST8AeWTkoUdZevew44wcNZQHsEVOiCVtgVnlFFD82FPaXycys58cf2muVQ==", + "node_modules/@nestjs/testing": { + "version": "10.2.8", + "resolved": "https://registry.npmjs.org/@nestjs/testing/-/testing-10.2.8.tgz", + "integrity": "sha512-9Kj5IQhM67/nj/MT6Wi2OmWr5YQnCMptwKVFrX1TDaikpY12196v7frk0jVjdT7wms7rV07GZle9I2z0aSjqtQ==", "dev": true, "dependencies": { - "@jest/schemas": "^28.1.3", - "@types/istanbul-lib-coverage": "^2.0.0", - "@types/istanbul-reports": "^3.0.0", - "@types/node": "*", - "@types/yargs": "^17.0.8", - "chalk": "^4.0.0" + "tslib": "2.6.2" }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/@jest/types/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/nest" }, - "engines": { - "node": ">=10" + "peerDependencies": { + "@nestjs/common": "^10.0.0", + "@nestjs/core": "^10.0.0", + "@nestjs/microservices": "^10.0.0", + "@nestjs/platform-express": "^10.0.0" }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" + "peerDependenciesMeta": { + "@nestjs/microservices": { + "optional": true + }, + "@nestjs/platform-express": { + "optional": true + } } }, - "node_modules/@jridgewell/gen-mapping": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz", - "integrity": "sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==", - "dev": true, + "node_modules/@nestjs/typeorm": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/@nestjs/typeorm/-/typeorm-10.0.0.tgz", + "integrity": "sha512-WQU4HCDTz4UavsFzvGUKDHqi0MO5K47yFoPXdmh+Z/hCNO7SHCMmV9jLiLukM8n5nKUqJ3jDqiljkWBcZPdCtA==", "dependencies": { - "@jridgewell/set-array": "^1.0.0", - "@jridgewell/sourcemap-codec": "^1.4.10" + "uuid": "9.0.0" }, - "engines": { - "node": ">=6.0.0" + "peerDependencies": { + "@nestjs/common": "^8.0.0 || ^9.0.0 || ^10.0.0", + "@nestjs/core": "^8.0.0 || ^9.0.0 || ^10.0.0", + "reflect-metadata": "^0.1.13", + "rxjs": "^7.2.0", + "typeorm": "^0.3.0" } }, - "node_modules/@jridgewell/resolve-uri": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz", - "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==", - "devOptional": true, + "node_modules/@nestjs/typeorm/node_modules/uuid": { + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.0.tgz", + "integrity": "sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==", + "bin": { + "uuid": "dist/bin/uuid" + } + }, + "node_modules/@nodelib/fs.scandir": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", + "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", + "dev": true, + "dependencies": { + "@nodelib/fs.stat": "2.0.5", + "run-parallel": "^1.1.9" + }, "engines": { - "node": ">=6.0.0" + "node": ">= 8" } }, - "node_modules/@jridgewell/set-array": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz", - "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==", + "node_modules/@nodelib/fs.stat": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", + "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", "dev": true, "engines": { - "node": ">=6.0.0" + "node": ">= 8" } }, - "node_modules/@jridgewell/source-map": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.2.tgz", - "integrity": "sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==", + "node_modules/@nodelib/fs.walk": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", + "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", "dev": true, "dependencies": { - "@jridgewell/gen-mapping": "^0.3.0", - "@jridgewell/trace-mapping": "^0.3.9" + "@nodelib/fs.scandir": "2.1.5", + "fastq": "^1.6.0" + }, + "engines": { + "node": ">= 8" } }, - "node_modules/@jridgewell/source-map/node_modules/@jridgewell/gen-mapping": { + "node_modules/@nuxtjs/opencollective": { "version": "0.3.2", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz", - "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==", - "dev": true, + "resolved": "https://registry.npmjs.org/@nuxtjs/opencollective/-/opencollective-0.3.2.tgz", + "integrity": "sha512-um0xL3fO7Mf4fDxcqx9KryrB7zgRM5JSlvGN5AGkP6JLM5XEKyjeAiPbNxdXVXQ16isuAhYpvP88NgL2BGd6aA==", "dependencies": { - "@jridgewell/set-array": "^1.0.1", - "@jridgewell/sourcemap-codec": "^1.4.10", - "@jridgewell/trace-mapping": "^0.3.9" + "chalk": "^4.1.0", + "consola": "^2.15.0", + "node-fetch": "^2.6.1" + }, + "bin": { + "opencollective": "bin/opencollective.js" }, "engines": { - "node": ">=6.0.0" + "node": ">=8.0.0", + "npm": ">=5.0.0" } }, - "node_modules/@jridgewell/sourcemap-codec": { - "version": "1.4.14", - "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz", - "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==", - "devOptional": true + "node_modules/@ogma/common": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@ogma/common/-/common-1.2.0.tgz", + "integrity": "sha512-y2GHkT4t3B9CoI7ELfgZXeMHiiOC/X4XvdeqYLbP5A3keop7fANzjd5pQdtyYQvdQ0lPzcHJiMvOGkIINZHZHQ==" }, - "node_modules/@jridgewell/trace-mapping": { - "version": "0.3.17", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz", - "integrity": "sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==", - "dev": true, + "node_modules/@ogma/styler": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@ogma/styler/-/styler-1.1.0.tgz", + "integrity": "sha512-OtwJ8Ump3sKEAv2DIUi+R2G2Y5v3cEzqRO/sH11MTWikAhac31GZR/xzU+3BoPRT0u8oIob7N5dtOKTdPhqq3w==", "dependencies": { - "@jridgewell/resolve-uri": "3.1.0", - "@jridgewell/sourcemap-codec": "1.4.14" + "@ogma/common": "^1.1.1" } }, - "node_modules/@lukeed/csprng": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@lukeed/csprng/-/csprng-1.0.1.tgz", - "integrity": "sha512-uSvJdwQU5nK+Vdf6zxcWAY2A8r7uqe+gePwLWzJ+fsQehq18pc0I2hJKwypZ2aLM90+Er9u1xn4iLJPZ+xlL4g==", + "node_modules/@one-ini/wasm": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/@one-ini/wasm/-/wasm-0.1.1.tgz", + "integrity": "sha512-XuySG1E38YScSJoMlqovLru4KTUNSjgVTIjyh7qMX6aNN5HY5Ct5LhRJdxO79JtTzKfzV/bnWpz+zquYrISsvw==" + }, + "node_modules/@pkgjs/parseargs": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", + "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==", + "optional": true, "engines": { - "node": ">=8" + "node": ">=14" } }, - "node_modules/@lukeed/ms": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@lukeed/ms/-/ms-2.0.1.tgz", - "integrity": "sha512-Xs/4RZltsAL7pkvaNStUQt7netTkyxrS0K+RILcVr3TRMS/ToOg4I6uNfhB9SlGsnWBym4U+EaXq0f0cEMNkHA==", + "node_modules/@pkgr/utils": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/@pkgr/utils/-/utils-2.4.2.tgz", + "integrity": "sha512-POgTXhjrTfbTV63DiFXav4lBHiICLKKwDeaKn9Nphwj7WH6m0hMMCaJkMyRWjgtPFyRKRVoMXXjczsTQRDEhYw==", + "dev": true, + "dependencies": { + "cross-spawn": "^7.0.3", + "fast-glob": "^3.3.0", + "is-glob": "^4.0.3", + "open": "^9.1.0", + "picocolors": "^1.0.0", + "tslib": "^2.6.0" + }, "engines": { - "node": ">=8" + "node": "^12.20.0 || ^14.18.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/unts" } }, - "node_modules/@msgpackr-extract/msgpackr-extract-darwin-arm64": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-arm64/-/msgpackr-extract-darwin-arm64-3.0.0.tgz", - "integrity": "sha512-5qpnNHUyyEj9H3sm/4Um/bnx1lrQGhe8iqry/1d+cQYCRd/gzYA0YLeq0ezlk4hKx4vO+dsEsNyeowqRqslwQA==", - "cpu": [ - "arm64" - ], - "optional": true, - "os": [ - "darwin" - ], - "peer": true + "node_modules/@protobufjs/aspromise": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz", + "integrity": "sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ==" }, - "node_modules/@msgpackr-extract/msgpackr-extract-darwin-x64": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-x64/-/msgpackr-extract-darwin-x64-3.0.0.tgz", - "integrity": "sha512-ZphTFFd6SFweNAMKD+QJCrWpgkjf4qBuHltiMkKkD6FFrB3NOTRVmetAGTkJ57pa+s6J0yCH06LujWB9rZe94g==", - "cpu": [ - "x64" - ], - "optional": true, - "os": [ - "darwin" - ], - "peer": true + "node_modules/@protobufjs/base64": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@protobufjs/base64/-/base64-1.1.2.tgz", + "integrity": "sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg==" }, - "node_modules/@msgpackr-extract/msgpackr-extract-linux-arm": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm/-/msgpackr-extract-linux-arm-3.0.0.tgz", - "integrity": "sha512-ztKVV1dO/sSZyGse0PBCq3Pk1PkYjsA/dsEWE7lfrGoAK3i9HpS2o7XjGQ7V4va6nX+xPPOiuYpQwa4Bi6vlww==", - "cpu": [ - "arm" - ], - "optional": true, - "os": [ - "linux" - ], - "peer": true + "node_modules/@protobufjs/codegen": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.4.tgz", + "integrity": "sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg==" }, - "node_modules/@msgpackr-extract/msgpackr-extract-linux-arm64": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm64/-/msgpackr-extract-linux-arm64-3.0.0.tgz", - "integrity": "sha512-NEX6hdSvP4BmVyegaIbrGxvHzHvTzzsPaxXCsUt0mbLbPpEftsvNwaEVKOowXnLoeuGeD4MaqSwL3BUK2elsUA==", - "cpu": [ - "arm64" - ], - "optional": true, - "os": [ - "linux" - ], - "peer": true + "node_modules/@protobufjs/eventemitter": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz", + "integrity": "sha512-j9ednRT81vYJ9OfVuXG6ERSTdEL1xVsNgqpkxMsbIabzSo3goCjDIveeGv5d03om39ML71RdmrGNjG5SReBP/Q==" }, - "node_modules/@msgpackr-extract/msgpackr-extract-linux-x64": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-x64/-/msgpackr-extract-linux-x64-3.0.0.tgz", - "integrity": "sha512-9uvdAkZMOPCY7SPRxZLW8XGqBOVNVEhqlgffenN8shA1XR9FWVsSM13nr/oHtNgXg6iVyML7RwWPyqUeThlwxg==", - "cpu": [ - "x64" - ], - "optional": true, - "os": [ - "linux" - ], - "peer": true + "node_modules/@protobufjs/fetch": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz", + "integrity": "sha512-lljVXpqXebpsijW71PZaCYeIcE5on1w5DlQy5WH6GLbFryLUrBD4932W/E2BSpfRJWseIL4v/KPgBFxDOIdKpQ==", + "dependencies": { + "@protobufjs/aspromise": "^1.1.1", + "@protobufjs/inquire": "^1.1.0" + } }, - "node_modules/@msgpackr-extract/msgpackr-extract-win32-x64": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-win32-x64/-/msgpackr-extract-win32-x64-3.0.0.tgz", - "integrity": "sha512-Wg0+9615kHKlr9iLVcG5I+/CHnf6w3x5UADRv8Ad16yA0Bu5l9eVOROjV7aHPG6uC8ZPFIVVaoSjDChD+Y0pzg==", - "cpu": [ - "x64" - ], - "optional": true, - "os": [ - "win32" - ], - "peer": true + "node_modules/@protobufjs/float": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@protobufjs/float/-/float-1.0.2.tgz", + "integrity": "sha512-Ddb+kVXlXst9d+R9PfTIxh1EdNkgoRe5tOX6t01f1lYWOvJnSPDBlG241QLzcyPdoNTsblLUdujGSE4RzrTZGQ==" }, - "node_modules/@nestjs/axios": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/@nestjs/axios/-/axios-0.1.1.tgz", - "integrity": "sha512-rLEq6yfho2CZyOcxP+P4Q3FjkNuiiHDyzj3Cr9i4Kdn3Ng09ygtOB4++jjXPREc6650pOFfzNtw18QH7bfLnQA==", - "dependencies": { - "axios": "1.2.1" - }, + "node_modules/@protobufjs/inquire": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/inquire/-/inquire-1.1.0.tgz", + "integrity": "sha512-kdSefcPdruJiFMVSbn801t4vFK7KB/5gd2fYvrxhuJYg8ILrmn9SKSX2tZdV6V+ksulWqS7aXjBcRXl3wHoD9Q==" + }, + "node_modules/@protobufjs/path": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz", + "integrity": "sha512-6JOcJ5Tm08dOHAbdR3GrvP+yUUfkjG5ePsHYczMFLq3ZmMkAD98cDgcT2iA1lJ9NVwFd4tH/iSSoe44YWkltEA==" + }, + "node_modules/@protobufjs/pool": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/pool/-/pool-1.1.0.tgz", + "integrity": "sha512-0kELaGSIDBKvcgS4zkjz1PeddatrjYcmMWOlAuAPwAeccUrPHdUqo/J6LiymHHEiJT5NrF1UVwxY14f+fy4WQw==" + }, + "node_modules/@protobufjs/utf8": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz", + "integrity": "sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==" + }, + "node_modules/@redis/bloom": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@redis/bloom/-/bloom-1.2.0.tgz", + "integrity": "sha512-HG2DFjYKbpNmVXsa0keLHp/3leGJz1mjh09f2RLGGLQZzSHpkmZWuwJbAvo3QcRY8p80m5+ZdXZdYOSBLlp7Cg==", "peerDependencies": { - "@nestjs/common": "^7.0.0 || ^8.0.0 || ^9.0.0", - "reflect-metadata": "^0.1.12", - "rxjs": "^6.0.0 || ^7.0.0" + "@redis/client": "^1.0.0" } }, - "node_modules/@nestjs/bullmq": { - "version": "10.0.1", - "resolved": "https://registry.npmjs.org/@nestjs/bullmq/-/bullmq-10.0.1.tgz", - "integrity": "sha512-YJtfJXfnQinN7OvGx/Qd6jlQFu56zVnI1SppftSS7gkthB2CbJQAjkrfCEPDjp11wbPptBhUnatIL2N+nH/3kA==", + "node_modules/@redis/client": { + "version": "1.5.11", + "resolved": "https://registry.npmjs.org/@redis/client/-/client-1.5.11.tgz", + "integrity": "sha512-cV7yHcOAtNQ5x/yQl7Yw1xf53kO0FNDTdDU6bFIMbW6ljB7U7ns0YRM+QIkpoqTAt6zK5k9Fq0QWlUbLcq9AvA==", "dependencies": { - "@nestjs/bull-shared": "^10.0.1", - "tslib": "2.6.0" + "cluster-key-slot": "1.1.2", + "generic-pool": "3.9.0", + "yallist": "4.0.0" }, + "engines": { + "node": ">=14" + } + }, + "node_modules/@redis/client/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" + }, + "node_modules/@redis/graph": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@redis/graph/-/graph-1.1.0.tgz", + "integrity": "sha512-16yZWngxyXPd+MJxeSr0dqh2AIOi8j9yXKcKCwVaKDbH3HTuETpDVPcLujhFYVPtYrngSco31BUcSa9TH31Gqg==", "peerDependencies": { - "@nestjs/common": "^8.0.0 || ^9.0.0 || ^10.0.0", - "@nestjs/core": "^8.0.0 || ^9.0.0 || ^10.0.0", - "bullmq": "^3.0.0 || ^4.0.0" + "@redis/client": "^1.0.0" } }, - "node_modules/@nestjs/bullmq/node_modules/@nestjs/bull-shared": { - "version": "10.0.1", - "resolved": "https://registry.npmjs.org/@nestjs/bull-shared/-/bull-shared-10.0.1.tgz", - "integrity": "sha512-8Td36l2i5x9+iQWjPB5Bd5+6u5Eangb5DclNcwrdwKqvd28xE92MSW97P4JV52C2kxrTjZwx8ck/wObAwtpQPw==", - "dependencies": { - "tslib": "2.6.0" - }, + "node_modules/@redis/json": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/@redis/json/-/json-1.0.6.tgz", + "integrity": "sha512-rcZO3bfQbm2zPRpqo82XbW8zg4G/w4W3tI7X8Mqleq9goQjAGLL7q/1n1ZX4dXEAmORVZ4s1+uKLaUOg7LrUhw==", "peerDependencies": { - "@nestjs/common": "^8.0.0 || ^9.0.0 || ^10.0.0", - "@nestjs/core": "^8.0.0 || ^9.0.0 || ^10.0.0" + "@redis/client": "^1.0.0" } }, - "node_modules/@nestjs/cli": { - "version": "9.1.9", - "resolved": "https://registry.npmjs.org/@nestjs/cli/-/cli-9.1.9.tgz", - "integrity": "sha512-oRiJArvQcYUJRO0jRWG99KkXuw+HafSnlfWcO4028gTDb4IanRwbl6fw4mELTEAaXAwDGOcuk8R0QY8H3muyiQ==", - "dev": true, - "dependencies": { - "@angular-devkit/core": "15.0.4", - "@angular-devkit/schematics": "15.0.4", - "@angular-devkit/schematics-cli": "15.0.4", - "@nestjs/schematics": "^9.0.0", - "chalk": "3.0.0", - "chokidar": "3.5.3", - "cli-table3": "0.6.3", - "commander": "4.1.1", - "fork-ts-checker-webpack-plugin": "7.2.14", - "inquirer": "7.3.3", - "node-emoji": "1.11.0", - "ora": "5.4.1", - "os-name": "4.0.1", - "rimraf": "3.0.2", - "shelljs": "0.8.5", - "source-map-support": "0.5.21", - "tree-kill": "1.2.2", - "tsconfig-paths": "4.1.1", - "tsconfig-paths-webpack-plugin": "4.0.0", - "typescript": "4.9.4", - "webpack": "5.75.0", - "webpack-node-externals": "3.0.0" - }, - "bin": { - "nest": "bin/nest.js" - }, - "engines": { - "node": ">= 12.9.0" + "node_modules/@redis/search": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/@redis/search/-/search-1.1.5.tgz", + "integrity": "sha512-hPP8w7GfGsbtYEJdn4n7nXa6xt6hVZnnDktKW4ArMaFQ/m/aR7eFvsLQmG/mn1Upq99btPJk+F27IQ2dYpCoUg==", + "peerDependencies": { + "@redis/client": "^1.0.0" + } + }, + "node_modules/@redis/time-series": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/@redis/time-series/-/time-series-1.0.5.tgz", + "integrity": "sha512-IFjIgTusQym2B5IZJG3XKr5llka7ey84fw/NOYqESP5WUfQs9zz1ww/9+qoz4ka/S6KcGBodzlCeZ5UImKbscg==", + "peerDependencies": { + "@redis/client": "^1.0.0" } }, - "node_modules/@nestjs/cli/node_modules/strip-bom": { + "node_modules/@sinclair/typebox": { + "version": "0.27.8", + "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", + "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==", + "dev": true + }, + "node_modules/@sinonjs/commons": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", - "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==", + "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.0.tgz", + "integrity": "sha512-jXBtWAF4vmdNmZgD5FoKsVLv3rPgDnLgPbU84LIJ3otV44vJlDRokVng5v8NFJdCf/da9legHcKaRuZs4L7faA==", "dev": true, - "engines": { - "node": ">=4" + "dependencies": { + "type-detect": "4.0.8" } }, - "node_modules/@nestjs/cli/node_modules/tsconfig-paths": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-4.1.1.tgz", - "integrity": "sha512-VgPrtLKpRgEAJsMj5Q/I/mXouC6A/7eJ/X4Nuk6o0cRPwBtznYxTCU4FodbexbzH9somBPEXYi0ZkUViUpJ21Q==", + "node_modules/@sinonjs/fake-timers": { + "version": "10.3.0", + "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-10.3.0.tgz", + "integrity": "sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA==", "dev": true, "dependencies": { - "json5": "^2.2.1", - "minimist": "^1.2.6", - "strip-bom": "^3.0.0" - }, - "engines": { - "node": ">=6" + "@sinonjs/commons": "^3.0.0" } }, - "node_modules/@nestjs/cli/node_modules/typescript": { - "version": "4.9.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.4.tgz", - "integrity": "sha512-Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg==", + "node_modules/@sinonjs/samsam": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-7.0.1.tgz", + "integrity": "sha512-zsAk2Jkiq89mhZovB2LLOdTCxJF4hqqTToGP0ASWlhp4I1hqOjcfmZGafXntCN7MDC6yySH0mFHrYtHceOeLmw==", "dev": true, - "bin": { - "tsc": "bin/tsc", - "tsserver": "bin/tsserver" - }, - "engines": { - "node": ">=4.2.0" + "dependencies": { + "@sinonjs/commons": "^2.0.0", + "lodash.get": "^4.4.2", + "type-detect": "^4.0.8" } }, - "node_modules/@nestjs/common": { - "version": "9.3.1", - "resolved": "https://registry.npmjs.org/@nestjs/common/-/common-9.3.1.tgz", - "integrity": "sha512-T14G3xjIXmEkxMcHcwh/eJwodF2owhYIT0ZA8u6UCNCEQg+391TXA7xTynUuR5Fl2EJPYTKF0g89XSFOW7NS2Q==", + "node_modules/@sinonjs/samsam/node_modules/@sinonjs/commons": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-2.0.0.tgz", + "integrity": "sha512-uLa0j859mMrg2slwQYdO/AkrOfmH+X6LTVmNTS9CqexuE2IvVORIkSpJLqePAbEnKJ77aMmCwr1NUZ57120Xcg==", + "dev": true, "dependencies": { - "iterare": "1.2.1", - "tslib": "2.4.1", - "uid": "2.0.1" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/nest" - }, - "peerDependencies": { - "cache-manager": "<=5", - "class-transformer": "*", - "class-validator": "*", - "reflect-metadata": "^0.1.12", - "rxjs": "^7.1.0" - }, - "peerDependenciesMeta": { - "cache-manager": { - "optional": true - }, - "class-transformer": { - "optional": true - }, - "class-validator": { - "optional": true - } + "type-detect": "4.0.8" } }, - "node_modules/@nestjs/common/node_modules/tslib": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz", - "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==" + "node_modules/@sinonjs/text-encoding": { + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/@sinonjs/text-encoding/-/text-encoding-0.7.2.tgz", + "integrity": "sha512-sXXKG+uL9IrKqViTtao2Ws6dy0znu9sOaP1di/jKGW1M6VssO8vlpXCQcpZ+jisQ1tTFAC5Jo/EOzFbggBagFQ==", + "dev": true }, - "node_modules/@nestjs/config": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@nestjs/config/-/config-2.3.0.tgz", - "integrity": "sha512-VSAqoIagIrc0A3apaqC2O3a8VtQ+asw8xILmxvjK/eHW9m1rmhJ5NqkGf7m+uSv3Yxini4bzyb74Mk62+tB/cA==", + "node_modules/@smithy/abort-controller": { + "version": "2.0.12", + "resolved": "https://registry.npmjs.org/@smithy/abort-controller/-/abort-controller-2.0.12.tgz", + "integrity": "sha512-YIJyefe1mi3GxKdZxEBEuzYOeQ9xpYfqnFmWzojCssRAuR7ycxwpoRQgp965vuW426xUAQhCV5rCaWElQ7XsaA==", "dependencies": { - "dotenv": "16.0.3", - "dotenv-expand": "10.0.0", - "lodash": "4.17.21", - "uuid": "9.0.0" + "@smithy/types": "^2.4.0", + "tslib": "^2.5.0" }, - "peerDependencies": { - "@nestjs/common": "^7.0.0 || ^8.0.0 || ^9.0.0", - "reflect-metadata": "^0.1.13", - "rxjs": "^6.0.0 || ^7.2.0" + "engines": { + "node": ">=14.0.0" } }, - "node_modules/@nestjs/config/node_modules/uuid": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.0.tgz", - "integrity": "sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==", - "bin": { - "uuid": "dist/bin/uuid" + "node_modules/@smithy/chunked-blob-reader": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@smithy/chunked-blob-reader/-/chunked-blob-reader-2.0.0.tgz", + "integrity": "sha512-k+J4GHJsMSAIQPChGBrjEmGS+WbPonCXesoqP9fynIqjn7rdOThdH8FAeCmokP9mxTYKQAKoHCLPzNlm6gh7Wg==", + "dependencies": { + "tslib": "^2.5.0" } }, - "node_modules/@nestjs/core": { - "version": "9.3.1", - "resolved": "https://registry.npmjs.org/@nestjs/core/-/core-9.3.1.tgz", - "integrity": "sha512-hLVfImzHu1vdcViEhIRnm7x3EBk+YiV7XVTJNz6n2Ly8a6t7IFBoJkGrZkE8ZTytnfbJZO0Vtp54ZBllxx3MwA==", - "hasInstallScript": true, + "node_modules/@smithy/chunked-blob-reader-native": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@smithy/chunked-blob-reader-native/-/chunked-blob-reader-native-2.0.0.tgz", + "integrity": "sha512-HM8V2Rp1y8+1343tkZUKZllFhEQPNmpNdgFAncbTsxkZ18/gqjk23XXv3qGyXWp412f3o43ZZ1UZHVcHrpRnCQ==", "dependencies": { - "@nuxtjs/opencollective": "0.3.2", - "fast-safe-stringify": "2.1.1", - "iterare": "1.2.1", - "object-hash": "3.0.0", - "path-to-regexp": "3.2.0", - "tslib": "2.4.1", - "uuid": "9.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/nest" - }, - "peerDependencies": { - "@nestjs/common": "^9.0.0", - "@nestjs/microservices": "^9.0.0", - "@nestjs/platform-express": "^9.0.0", - "@nestjs/websockets": "^9.0.0", - "reflect-metadata": "^0.1.12", - "rxjs": "^7.1.0" + "@smithy/util-base64": "^2.0.0", + "tslib": "^2.5.0" + } + }, + "node_modules/@smithy/config-resolver": { + "version": "2.0.16", + "resolved": "https://registry.npmjs.org/@smithy/config-resolver/-/config-resolver-2.0.16.tgz", + "integrity": "sha512-1k+FWHQDt2pfpXhJsOmNMmlAZ3NUQ98X5tYsjQhVGq+0X6cOBMhfh6Igd0IX3Ut6lEO6DQAdPMI/blNr3JZfMQ==", + "dependencies": { + "@smithy/node-config-provider": "^2.1.3", + "@smithy/types": "^2.4.0", + "@smithy/util-config-provider": "^2.0.0", + "@smithy/util-middleware": "^2.0.5", + "tslib": "^2.5.0" }, - "peerDependenciesMeta": { - "@nestjs/microservices": { - "optional": true - }, - "@nestjs/platform-express": { - "optional": true - }, - "@nestjs/websockets": { - "optional": true - } + "engines": { + "node": ">=14.0.0" } }, - "node_modules/@nestjs/core/node_modules/tslib": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz", - "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==" + "node_modules/@smithy/credential-provider-imds": { + "version": "2.0.18", + "resolved": "https://registry.npmjs.org/@smithy/credential-provider-imds/-/credential-provider-imds-2.0.18.tgz", + "integrity": "sha512-QnPBi6D2zj6AHJdUTo5zXmk8vwHJ2bNevhcVned1y+TZz/OI5cizz5DsYNkqFUIDn8tBuEyKNgbmKVNhBbuY3g==", + "dependencies": { + "@smithy/node-config-provider": "^2.1.3", + "@smithy/property-provider": "^2.0.13", + "@smithy/types": "^2.4.0", + "@smithy/url-parser": "^2.0.12", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" + } }, - "node_modules/@nestjs/core/node_modules/uuid": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.0.tgz", - "integrity": "sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==", - "bin": { - "uuid": "dist/bin/uuid" + "node_modules/@smithy/eventstream-codec": { + "version": "2.0.12", + "resolved": "https://registry.npmjs.org/@smithy/eventstream-codec/-/eventstream-codec-2.0.12.tgz", + "integrity": "sha512-ZZQLzHBJkbiAAdj2C5K+lBlYp/XJ+eH2uy+jgJgYIFW/o5AM59Hlj7zyI44/ZTDIQWmBxb3EFv/c5t44V8/g8A==", + "dependencies": { + "@aws-crypto/crc32": "3.0.0", + "@smithy/types": "^2.4.0", + "@smithy/util-hex-encoding": "^2.0.0", + "tslib": "^2.5.0" } }, - "node_modules/@nestjs/microservices": { - "version": "9.3.1", - "resolved": "https://registry.npmjs.org/@nestjs/microservices/-/microservices-9.3.1.tgz", - "integrity": "sha512-JyEcHuAoip5s5TSX27KGNJCPPUo7rwlGSYhVSL0lOpx9qfnIQbBk3mjyoOHCweRXlzYSIyG+7CRpRORtFhuynA==", + "node_modules/@smithy/eventstream-serde-browser": { + "version": "2.0.12", + "resolved": "https://registry.npmjs.org/@smithy/eventstream-serde-browser/-/eventstream-serde-browser-2.0.12.tgz", + "integrity": "sha512-0pi8QlU/pwutNshoeJcbKR1p7Ie5STd8UFAMX5xhSoSJjNlxIv/OsHbF023jscMRN2Prrqd6ToGgdCnsZVQjvg==", "dependencies": { - "iterare": "1.2.1", - "tslib": "2.4.1" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/nest" - }, - "peerDependencies": { - "@grpc/grpc-js": "*", - "@nestjs/common": "^9.0.0", - "@nestjs/core": "^9.0.0", - "@nestjs/websockets": "^9.0.0", - "amqp-connection-manager": "*", - "amqplib": "*", - "cache-manager": "*", - "ioredis": "*", - "kafkajs": "*", - "mqtt": "*", - "nats": "*", - "reflect-metadata": "^0.1.12", - "rxjs": "^7.1.0" + "@smithy/eventstream-serde-universal": "^2.0.12", + "@smithy/types": "^2.4.0", + "tslib": "^2.5.0" }, - "peerDependenciesMeta": { - "@grpc/grpc-js": { - "optional": true - }, - "@nestjs/websockets": { - "optional": true - }, - "amqp-connection-manager": { - "optional": true - }, - "amqplib": { - "optional": true - }, - "cache-manager": { - "optional": true - }, - "ioredis": { - "optional": true - }, - "kafkajs": { - "optional": true - }, - "mqtt": { - "optional": true - }, - "nats": { - "optional": true - } + "engines": { + "node": ">=14.0.0" } }, - "node_modules/@nestjs/microservices/node_modules/tslib": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz", - "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==" - }, - "node_modules/@nestjs/platform-fastify": { - "version": "9.3.1", - "resolved": "https://registry.npmjs.org/@nestjs/platform-fastify/-/platform-fastify-9.3.1.tgz", - "integrity": "sha512-k7byfRo/0JC0v8DDHYTrTpYjGNjtM7kGUopFyX8ArdftGcvpNDp3pnp3KlsNT2ex1SNpFMP6pByxglTHtfsvxg==", + "node_modules/@smithy/eventstream-serde-config-resolver": { + "version": "2.0.12", + "resolved": "https://registry.npmjs.org/@smithy/eventstream-serde-config-resolver/-/eventstream-serde-config-resolver-2.0.12.tgz", + "integrity": "sha512-I0XfwQkIX3gAnbrU5rLMkBSjTM9DHttdbLwf12CXmj7SSI5dT87PxtKLRrZGanaCMbdf2yCep+MW5/4M7IbvQA==", "dependencies": { - "@fastify/cors": "8.2.0", - "@fastify/formbody": "7.4.0", - "@fastify/middie": "8.1.0", - "fastify": "4.12.0", - "light-my-request": "5.8.0", - "path-to-regexp": "3.2.0", - "tslib": "2.4.1" + "@smithy/types": "^2.4.0", + "tslib": "^2.5.0" }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/nest" + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/eventstream-serde-node": { + "version": "2.0.12", + "resolved": "https://registry.npmjs.org/@smithy/eventstream-serde-node/-/eventstream-serde-node-2.0.12.tgz", + "integrity": "sha512-vf1vMHGOkG3uqN9x1zKOhnvW/XgvhJXWqjV6zZiT2FMjlEayugQ1mzpSqr7uf89+BzjTzuZKERmOsEAmewLbxw==", + "dependencies": { + "@smithy/eventstream-serde-universal": "^2.0.12", + "@smithy/types": "^2.4.0", + "tslib": "^2.5.0" }, - "peerDependencies": { - "@fastify/static": "^6.0.0", - "@fastify/view": "^7.0.0", - "@nestjs/common": "^9.0.0", - "@nestjs/core": "^9.0.0" + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/eventstream-serde-universal": { + "version": "2.0.12", + "resolved": "https://registry.npmjs.org/@smithy/eventstream-serde-universal/-/eventstream-serde-universal-2.0.12.tgz", + "integrity": "sha512-xZ3ZNpCxIND+q+UCy7y1n1/5VQEYicgSTNCcPqsKawX+Vd+6OcFX7gUHMyPzL8cZr+GdmJuxNleqHlH4giK2tw==", + "dependencies": { + "@smithy/eventstream-codec": "^2.0.12", + "@smithy/types": "^2.4.0", + "tslib": "^2.5.0" }, - "peerDependenciesMeta": { - "@fastify/static": { - "optional": true - }, - "@fastify/view": { - "optional": true - } + "engines": { + "node": ">=14.0.0" } }, - "node_modules/@nestjs/platform-fastify/node_modules/tslib": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz", - "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==" + "node_modules/@smithy/fetch-http-handler": { + "version": "2.2.4", + "resolved": "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-2.2.4.tgz", + "integrity": "sha512-gIPRFEGi+c6V52eauGKrjDzPWF2Cu7Z1r5F8A3j2wcwz25sPG/t8kjsbEhli/tS/2zJp/ybCZXe4j4ro3yv/HA==", + "dependencies": { + "@smithy/protocol-http": "^3.0.8", + "@smithy/querystring-builder": "^2.0.12", + "@smithy/types": "^2.4.0", + "@smithy/util-base64": "^2.0.0", + "tslib": "^2.5.0" + } }, - "node_modules/@nestjs/schematics": { - "version": "9.0.4", - "resolved": "https://registry.npmjs.org/@nestjs/schematics/-/schematics-9.0.4.tgz", - "integrity": "sha512-egurCfAc4e5i1r2TmeAF0UrOKejFmT5oTdv4b7HcOVPupc3QGU7CbEfGleL3mkM5AjrixTQeMxU9bJ00ttAbGg==", - "dev": true, + "node_modules/@smithy/hash-blob-browser": { + "version": "2.0.12", + "resolved": "https://registry.npmjs.org/@smithy/hash-blob-browser/-/hash-blob-browser-2.0.12.tgz", + "integrity": "sha512-riLnV16f27yyePX8UF0deRHAeccUK8SrOxyTykSTrnVkgS3DsjNapZtTbd8OGNKEbI60Ncdb5GwN3rHZudXvog==", "dependencies": { - "@angular-devkit/core": "15.0.4", - "@angular-devkit/schematics": "15.0.4", - "fs-extra": "11.1.0", - "jsonc-parser": "3.2.0", - "pluralize": "8.0.0" + "@smithy/chunked-blob-reader": "^2.0.0", + "@smithy/chunked-blob-reader-native": "^2.0.0", + "@smithy/types": "^2.4.0", + "tslib": "^2.5.0" + } + }, + "node_modules/@smithy/hash-node": { + "version": "2.0.12", + "resolved": "https://registry.npmjs.org/@smithy/hash-node/-/hash-node-2.0.12.tgz", + "integrity": "sha512-fDZnTr5j9t5qcbeJ037aMZXxMka13Znqwrgy3PAqYj6Dm3XHXHftTH3q+NWgayUxl1992GFtQt1RuEzRMy3NnQ==", + "dependencies": { + "@smithy/types": "^2.4.0", + "@smithy/util-buffer-from": "^2.0.0", + "@smithy/util-utf8": "^2.0.0", + "tslib": "^2.5.0" }, - "peerDependencies": { - "typescript": "^4.3.5" + "engines": { + "node": ">=14.0.0" } }, - "node_modules/@nestjs/swagger": { - "version": "6.1.4", - "resolved": "https://registry.npmjs.org/@nestjs/swagger/-/swagger-6.1.4.tgz", - "integrity": "sha512-kE8VjR+NaoKqxg8XqM/YYfALScPh4AcoR8Wywga8/OxHsTHY+MKxqvTpWp7IhCUWSA6xT8nQUpcC9Rt7C+r7Hw==", + "node_modules/@smithy/hash-stream-node": { + "version": "2.0.12", + "resolved": "https://registry.npmjs.org/@smithy/hash-stream-node/-/hash-stream-node-2.0.12.tgz", + "integrity": "sha512-x/DrSynPKrW0k00q7aZ/vy531a3mRw79mOajHp+cIF0TrA1SqEMFoy/B8X0XtoAtlJWt/vvgeDNqt/KAeaAqMw==", "dependencies": { - "@nestjs/mapped-types": "1.2.0", - "js-yaml": "4.1.0", - "lodash": "4.17.21", - "path-to-regexp": "3.2.0", - "swagger-ui-dist": "4.15.5" + "@smithy/types": "^2.4.0", + "@smithy/util-utf8": "^2.0.0", + "tslib": "^2.5.0" }, - "peerDependencies": { - "@fastify/static": "^6.0.0", - "@nestjs/common": "^9.0.0", - "@nestjs/core": "^9.0.0", - "class-transformer": "*", - "class-validator": "*", - "reflect-metadata": "^0.1.12" - }, - "peerDependenciesMeta": { - "@fastify/static": { - "optional": true - }, - "class-transformer": { - "optional": true - }, - "class-validator": { - "optional": true - } + "engines": { + "node": ">=14.0.0" } }, - "node_modules/@nestjs/swagger/node_modules/@nestjs/mapped-types": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@nestjs/mapped-types/-/mapped-types-1.2.0.tgz", - "integrity": "sha512-NTFwPZkQWsArQH8QSyFWGZvJ08gR+R4TofglqZoihn/vU+ktHEJjMqsIsADwb7XD97DhiD+TVv5ac+jG33BHrg==", - "peerDependencies": { - "@nestjs/common": "^7.0.8 || ^8.0.0 || ^9.0.0", - "class-transformer": "^0.2.0 || ^0.3.0 || ^0.4.0 || ^0.5.0", - "class-validator": "^0.11.1 || ^0.12.0 || ^0.13.0", - "reflect-metadata": "^0.1.12" - }, - "peerDependenciesMeta": { - "class-transformer": { - "optional": true - }, - "class-validator": { - "optional": true - } + "node_modules/@smithy/invalid-dependency": { + "version": "2.0.12", + "resolved": "https://registry.npmjs.org/@smithy/invalid-dependency/-/invalid-dependency-2.0.12.tgz", + "integrity": "sha512-p5Y+iMHV3SoEpy3VSR7mifbreHQwVSvHSAz/m4GdoXfOzKzaYC8hYv10Ks7Deblkf7lhas8U+lAp9ThbBM+ZXA==", + "dependencies": { + "@smithy/types": "^2.4.0", + "tslib": "^2.5.0" } }, - "node_modules/@nestjs/testing": { - "version": "9.3.1", - "resolved": "https://registry.npmjs.org/@nestjs/testing/-/testing-9.3.1.tgz", - "integrity": "sha512-jjsmfd9h0E8bWTSWMm+QD1P8T8ElHufTJ2tDbi0q9U8JR5QoJ9KLcVTYZVPciXpwPxIiZ+qFEjrY1/irvPHDug==", - "dev": true, + "node_modules/@smithy/is-array-buffer": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-2.0.0.tgz", + "integrity": "sha512-z3PjFjMyZNI98JFRJi/U0nGoLWMSJlDjAW4QUX2WNZLas5C0CmVV6LJ01JI0k90l7FvpmixjWxPFmENSClQ7ug==", "dependencies": { - "tslib": "2.4.1" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/nest" - }, - "peerDependencies": { - "@nestjs/common": "^9.0.0", - "@nestjs/core": "^9.0.0", - "@nestjs/microservices": "^9.0.0", - "@nestjs/platform-express": "^9.0.0" + "tslib": "^2.5.0" }, - "peerDependenciesMeta": { - "@nestjs/microservices": { - "optional": true - }, - "@nestjs/platform-express": { - "optional": true - } + "engines": { + "node": ">=14.0.0" } }, - "node_modules/@nestjs/testing/node_modules/tslib": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz", - "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==", - "dev": true + "node_modules/@smithy/md5-js": { + "version": "2.0.12", + "resolved": "https://registry.npmjs.org/@smithy/md5-js/-/md5-js-2.0.12.tgz", + "integrity": "sha512-OgDt+Xnrw+W5z3MSl5KZZzebqmXrYl9UdbCiBYnnjErmNywwSjV6QB/Oic3/7hnsPniSU81n7Rvlhz2kH4EREQ==", + "dependencies": { + "@smithy/types": "^2.4.0", + "@smithy/util-utf8": "^2.0.0", + "tslib": "^2.5.0" + } }, - "node_modules/@nestjs/typeorm": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/@nestjs/typeorm/-/typeorm-9.0.1.tgz", - "integrity": "sha512-A2BgLIPsMtmMI0bPKEf4bmzgFPsnvHqNBx3KkvaJ7hJrBQy0OqYOb+Rr06ifblKWDWS2tUPNrAFQbZjtk3PI+g==", + "node_modules/@smithy/middleware-content-length": { + "version": "2.0.14", + "resolved": "https://registry.npmjs.org/@smithy/middleware-content-length/-/middleware-content-length-2.0.14.tgz", + "integrity": "sha512-poUNgKTw9XwPXfX9nEHpVgrMNVpaSMZbshqvPxFVoalF4wp6kRzYKOfdesSVectlQ51VtigoLfbXcdyPwvxgTg==", "dependencies": { - "uuid": "8.3.2" + "@smithy/protocol-http": "^3.0.8", + "@smithy/types": "^2.4.0", + "tslib": "^2.5.0" }, - "peerDependencies": { - "@nestjs/common": "^8.0.0 || ^9.0.0", - "@nestjs/core": "^8.0.0 || ^9.0.0", - "reflect-metadata": "^0.1.13", - "rxjs": "^7.2.0", - "typeorm": "^0.3.0" + "engines": { + "node": ">=14.0.0" } }, - "node_modules/@nodelib/fs.scandir": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", - "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", - "dev": true, + "node_modules/@smithy/middleware-endpoint": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-2.1.3.tgz", + "integrity": "sha512-ZrQ0/YX6hNVTxqMEHtEaDbDv6pNeEji/a5Vk3HuFC5R3ZY8lfoATyxmOGxBVYnF3NUvZLNC7umEv1WzWGWvCGQ==", "dependencies": { - "@nodelib/fs.stat": "2.0.5", - "run-parallel": "^1.1.9" + "@smithy/middleware-serde": "^2.0.12", + "@smithy/node-config-provider": "^2.1.3", + "@smithy/shared-ini-file-loader": "^2.2.2", + "@smithy/types": "^2.4.0", + "@smithy/url-parser": "^2.0.12", + "@smithy/util-middleware": "^2.0.5", + "tslib": "^2.5.0" }, "engines": { - "node": ">= 8" + "node": ">=14.0.0" } }, - "node_modules/@nodelib/fs.stat": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", - "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", - "dev": true, + "node_modules/@smithy/middleware-retry": { + "version": "2.0.18", + "resolved": "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-2.0.18.tgz", + "integrity": "sha512-VyrHQRldGSb3v9oFOB5yPxmLT7U2sQic2ytylOnYlnsmVOLlFIaI6sW22c+w2675yq+XZ6HOuzV7x2OBYCWRNA==", + "dependencies": { + "@smithy/node-config-provider": "^2.1.3", + "@smithy/protocol-http": "^3.0.8", + "@smithy/service-error-classification": "^2.0.5", + "@smithy/types": "^2.4.0", + "@smithy/util-middleware": "^2.0.5", + "@smithy/util-retry": "^2.0.5", + "tslib": "^2.5.0", + "uuid": "^8.3.2" + }, "engines": { - "node": ">= 8" + "node": ">=14.0.0" } }, - "node_modules/@nodelib/fs.walk": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", - "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", - "dev": true, + "node_modules/@smithy/middleware-retry/node_modules/uuid": { + "version": "8.3.2", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", + "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==", + "bin": { + "uuid": "dist/bin/uuid" + } + }, + "node_modules/@smithy/middleware-serde": { + "version": "2.0.12", + "resolved": "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-2.0.12.tgz", + "integrity": "sha512-IBeco157lIScecq2Z+n0gq56i4MTnfKxS7rbfrAORveDJgnbBAaEQgYqMqp/cYqKrpvEXcyTjwKHrBjCCIZh2A==", "dependencies": { - "@nodelib/fs.scandir": "2.1.5", - "fastq": "^1.6.0" + "@smithy/types": "^2.4.0", + "tslib": "^2.5.0" }, "engines": { - "node": ">= 8" + "node": ">=14.0.0" } }, - "node_modules/@nuxtjs/opencollective": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/@nuxtjs/opencollective/-/opencollective-0.3.2.tgz", - "integrity": "sha512-um0xL3fO7Mf4fDxcqx9KryrB7zgRM5JSlvGN5AGkP6JLM5XEKyjeAiPbNxdXVXQ16isuAhYpvP88NgL2BGd6aA==", + "node_modules/@smithy/middleware-stack": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/@smithy/middleware-stack/-/middleware-stack-2.0.6.tgz", + "integrity": "sha512-YSvNZeOKWLJ0M/ycxwDIe2Ztkp6Qixmcml1ggsSv2fdHKGkBPhGrX5tMzPGMI1yyx55UEYBi2OB4s+RriXX48A==", "dependencies": { - "chalk": "^4.1.0", - "consola": "^2.15.0", - "node-fetch": "^2.6.1" + "@smithy/types": "^2.4.0", + "tslib": "^2.5.0" }, - "bin": { - "opencollective": "bin/opencollective.js" + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/node-config-provider": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-2.1.3.tgz", + "integrity": "sha512-J6lXvRHGVnSX3n1PYi+e1L5HN73DkkJpUviV3Ebf+8wSaIjAf+eVNbzyvh/S5EQz7nf4KVfwbD5vdoZMAthAEQ==", + "dependencies": { + "@smithy/property-provider": "^2.0.13", + "@smithy/shared-ini-file-loader": "^2.2.2", + "@smithy/types": "^2.4.0", + "tslib": "^2.5.0" }, "engines": { - "node": ">=8.0.0", - "npm": ">=5.0.0" + "node": ">=14.0.0" } }, - "node_modules/@nuxtjs/opencollective/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "node_modules/@smithy/node-http-handler": { + "version": "2.1.8", + "resolved": "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-2.1.8.tgz", + "integrity": "sha512-KZylM7Wff/So5SmCiwg2kQNXJ+RXgz34wkxS7WNwIUXuZrZZpY/jKJCK+ZaGyuESDu3TxcaY+zeYGJmnFKbQsA==", "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" + "@smithy/abort-controller": "^2.0.12", + "@smithy/protocol-http": "^3.0.8", + "@smithy/querystring-builder": "^2.0.12", + "@smithy/types": "^2.4.0", + "tslib": "^2.5.0" }, "engines": { - "node": ">=10" + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/property-provider": { + "version": "2.0.13", + "resolved": "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-2.0.13.tgz", + "integrity": "sha512-VJqUf2CbsQX6uUiC5dUPuoEATuFjkbkW3lJHbRnpk9EDC9X+iKqhfTK+WP+lve5EQ9TcCI1Q6R7hrg41FyC54w==", + "dependencies": { + "@smithy/types": "^2.4.0", + "tslib": "^2.5.0" }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" + "engines": { + "node": ">=14.0.0" } }, - "node_modules/@ogma/common": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@ogma/common/-/common-1.0.0.tgz", - "integrity": "sha512-IXvSnXbXccpxJR+UbN2fxp30R/44VFpx/T0ungb1PMwLa9BLmtbeQIXqc9TR11gRaDNY0e78tqVckau8oyXK0A==" + "node_modules/@smithy/protocol-http": { + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-3.0.8.tgz", + "integrity": "sha512-SHJvYeWq8q0FK8xHk+xjV9dzDUDjFMT+G1pZbV+XB6OVoac/FSVshlMNPeUJ8AmSkcDKHRu5vASnRqZHgD3qhw==", + "dependencies": { + "@smithy/types": "^2.4.0", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" + } }, - "node_modules/@ogma/styler": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@ogma/styler/-/styler-1.0.0.tgz", - "integrity": "sha512-Twtijg2eUS4HEPyic0FEpkdJgRtLSvVow/3gmLsMkyU+GhSm80PnRlc6q1N1rmf1EQhuwGZLKhS30sYIuFV38A==", + "node_modules/@smithy/querystring-builder": { + "version": "2.0.12", + "resolved": "https://registry.npmjs.org/@smithy/querystring-builder/-/querystring-builder-2.0.12.tgz", + "integrity": "sha512-cDbF07IuCjiN8CdGvPzfJjXIrmDSelScRfyJYrYBNBbKl2+k7QD/KqiHhtRyEKgID5mmEVrV6KE6L/iPJ98sFw==", "dependencies": { - "@ogma/common": "1.0.0" + "@smithy/types": "^2.4.0", + "@smithy/util-uri-escape": "^2.0.0", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" } }, - "node_modules/@protobufjs/aspromise": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz", - "integrity": "sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ==" + "node_modules/@smithy/querystring-parser": { + "version": "2.0.12", + "resolved": "https://registry.npmjs.org/@smithy/querystring-parser/-/querystring-parser-2.0.12.tgz", + "integrity": "sha512-fytyTcXaMzPBuNtPlhj5v6dbl4bJAnwKZFyyItAGt4Tgm9HFPZNo7a9r1SKPr/qdxUEBzvL9Rh+B9SkTX3kFxg==", + "dependencies": { + "@smithy/types": "^2.4.0", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" + } }, - "node_modules/@protobufjs/base64": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@protobufjs/base64/-/base64-1.1.2.tgz", - "integrity": "sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg==" + "node_modules/@smithy/service-error-classification": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@smithy/service-error-classification/-/service-error-classification-2.0.5.tgz", + "integrity": "sha512-M0SeJnEgD2ywJyV99Fb1yKFzmxDe9JfpJiYTVSRMyRLc467BPU0qsuuDPzMCdB1mU8M8u1rVOdkqdoyFN8UFTw==", + "dependencies": { + "@smithy/types": "^2.4.0" + }, + "engines": { + "node": ">=14.0.0" + } }, - "node_modules/@protobufjs/codegen": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.4.tgz", - "integrity": "sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg==" + "node_modules/@smithy/shared-ini-file-loader": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-2.2.2.tgz", + "integrity": "sha512-noyQUPn7b1M8uB0GEXc/Zyxq+5K2b7aaqWnLp+hgJ7+xu/FCvtyWy5eWLDjQEsHnAet2IZhS5QF8872OR69uNg==", + "dependencies": { + "@smithy/types": "^2.4.0", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" + } }, - "node_modules/@protobufjs/eventemitter": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz", - "integrity": "sha512-j9ednRT81vYJ9OfVuXG6ERSTdEL1xVsNgqpkxMsbIabzSo3goCjDIveeGv5d03om39ML71RdmrGNjG5SReBP/Q==" + "node_modules/@smithy/signature-v4": { + "version": "2.0.12", + "resolved": "https://registry.npmjs.org/@smithy/signature-v4/-/signature-v4-2.0.12.tgz", + "integrity": "sha512-6Kc2lCZEVmb1nNYngyNbWpq0d82OZwITH11SW/Q0U6PX5fH7B2cIcFe7o6eGEFPkTZTP8itTzmYiGcECL0D0Lw==", + "dependencies": { + "@smithy/eventstream-codec": "^2.0.12", + "@smithy/is-array-buffer": "^2.0.0", + "@smithy/types": "^2.4.0", + "@smithy/util-hex-encoding": "^2.0.0", + "@smithy/util-middleware": "^2.0.5", + "@smithy/util-uri-escape": "^2.0.0", + "@smithy/util-utf8": "^2.0.0", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" + } }, - "node_modules/@protobufjs/fetch": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz", - "integrity": "sha512-lljVXpqXebpsijW71PZaCYeIcE5on1w5DlQy5WH6GLbFryLUrBD4932W/E2BSpfRJWseIL4v/KPgBFxDOIdKpQ==", + "node_modules/@smithy/smithy-client": { + "version": "2.1.12", + "resolved": "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-2.1.12.tgz", + "integrity": "sha512-XXqhridfkKnpj+lt8vM6HRlZbqUAqBjVC74JIi13F/AYQd/zTj9SOyGfxnbp4mjY9q28LityxIuV8CTinr9r5w==", "dependencies": { - "@protobufjs/aspromise": "^1.1.1", - "@protobufjs/inquire": "^1.1.0" + "@smithy/middleware-stack": "^2.0.6", + "@smithy/types": "^2.4.0", + "@smithy/util-stream": "^2.0.17", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" } }, - "node_modules/@protobufjs/float": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@protobufjs/float/-/float-1.0.2.tgz", - "integrity": "sha512-Ddb+kVXlXst9d+R9PfTIxh1EdNkgoRe5tOX6t01f1lYWOvJnSPDBlG241QLzcyPdoNTsblLUdujGSE4RzrTZGQ==" + "node_modules/@smithy/types": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/@smithy/types/-/types-2.4.0.tgz", + "integrity": "sha512-iH1Xz68FWlmBJ9vvYeHifVMWJf82ONx+OybPW8ZGf5wnEv2S0UXcU4zwlwJkRXuLKpcSLHrraHbn2ucdVXLb4g==", + "dependencies": { + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" + } }, - "node_modules/@protobufjs/inquire": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@protobufjs/inquire/-/inquire-1.1.0.tgz", - "integrity": "sha512-kdSefcPdruJiFMVSbn801t4vFK7KB/5gd2fYvrxhuJYg8ILrmn9SKSX2tZdV6V+ksulWqS7aXjBcRXl3wHoD9Q==" + "node_modules/@smithy/url-parser": { + "version": "2.0.12", + "resolved": "https://registry.npmjs.org/@smithy/url-parser/-/url-parser-2.0.12.tgz", + "integrity": "sha512-qgkW2mZqRvlNUcBkxYB/gYacRaAdck77Dk3/g2iw0S9F0EYthIS3loGfly8AwoWpIvHKhkTsCXXQfzksgZ4zIA==", + "dependencies": { + "@smithy/querystring-parser": "^2.0.12", + "@smithy/types": "^2.4.0", + "tslib": "^2.5.0" + } }, - "node_modules/@protobufjs/path": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz", - "integrity": "sha512-6JOcJ5Tm08dOHAbdR3GrvP+yUUfkjG5ePsHYczMFLq3ZmMkAD98cDgcT2iA1lJ9NVwFd4tH/iSSoe44YWkltEA==" + "node_modules/@smithy/util-base64": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@smithy/util-base64/-/util-base64-2.0.0.tgz", + "integrity": "sha512-Zb1E4xx+m5Lud8bbeYi5FkcMJMnn+1WUnJF3qD7rAdXpaL7UjkFQLdmW5fHadoKbdHpwH9vSR8EyTJFHJs++tA==", + "dependencies": { + "@smithy/util-buffer-from": "^2.0.0", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" + } }, - "node_modules/@protobufjs/pool": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@protobufjs/pool/-/pool-1.1.0.tgz", - "integrity": "sha512-0kELaGSIDBKvcgS4zkjz1PeddatrjYcmMWOlAuAPwAeccUrPHdUqo/J6LiymHHEiJT5NrF1UVwxY14f+fy4WQw==" + "node_modules/@smithy/util-body-length-browser": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@smithy/util-body-length-browser/-/util-body-length-browser-2.0.0.tgz", + "integrity": "sha512-JdDuS4ircJt+FDnaQj88TzZY3+njZ6O+D3uakS32f2VNnDo3vyEuNdBOh/oFd8Df1zSZOuH1HEChk2AOYDezZg==", + "dependencies": { + "tslib": "^2.5.0" + } }, - "node_modules/@protobufjs/utf8": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz", - "integrity": "sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==" + "node_modules/@smithy/util-body-length-node": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/@smithy/util-body-length-node/-/util-body-length-node-2.1.0.tgz", + "integrity": "sha512-/li0/kj/y3fQ3vyzn36NTLGmUwAICb7Jbe/CsWCktW363gh1MOcpEcSO3mJ344Gv2dqz8YJCLQpb6hju/0qOWw==", + "dependencies": { + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" + } }, - "node_modules/@redis/bloom": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@redis/bloom/-/bloom-1.2.0.tgz", - "integrity": "sha512-HG2DFjYKbpNmVXsa0keLHp/3leGJz1mjh09f2RLGGLQZzSHpkmZWuwJbAvo3QcRY8p80m5+ZdXZdYOSBLlp7Cg==", - "peerDependencies": { - "@redis/client": "^1.0.0" + "node_modules/@smithy/util-buffer-from": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-2.0.0.tgz", + "integrity": "sha512-/YNnLoHsR+4W4Vf2wL5lGv0ksg8Bmk3GEGxn2vEQt52AQaPSCuaO5PM5VM7lP1K9qHRKHwrPGktqVoAHKWHxzw==", + "dependencies": { + "@smithy/is-array-buffer": "^2.0.0", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" } }, - "node_modules/@redis/client": { - "version": "1.5.5", - "resolved": "https://registry.npmjs.org/@redis/client/-/client-1.5.5.tgz", - "integrity": "sha512-fuMnpDYSjT5JXR9rrCW1YWA4L8N/9/uS4ImT3ZEC/hcaQRI1D/9FvwjriRj1UvepIgzZXthFVKMNRzP/LNL7BQ==", + "node_modules/@smithy/util-config-provider": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@smithy/util-config-provider/-/util-config-provider-2.0.0.tgz", + "integrity": "sha512-xCQ6UapcIWKxXHEU4Mcs2s7LcFQRiU3XEluM2WcCjjBtQkUN71Tb+ydGmJFPxMUrW/GWMgQEEGipLym4XG0jZg==", "dependencies": { - "cluster-key-slot": "1.1.2", - "generic-pool": "3.9.0", - "yallist": "4.0.0" + "tslib": "^2.5.0" }, "engines": { - "node": ">=14" + "node": ">=14.0.0" } }, - "node_modules/@redis/client/node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" - }, - "node_modules/@redis/graph": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@redis/graph/-/graph-1.1.0.tgz", - "integrity": "sha512-16yZWngxyXPd+MJxeSr0dqh2AIOi8j9yXKcKCwVaKDbH3HTuETpDVPcLujhFYVPtYrngSco31BUcSa9TH31Gqg==", - "peerDependencies": { - "@redis/client": "^1.0.0" + "node_modules/@smithy/util-defaults-mode-browser": { + "version": "2.0.16", + "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-2.0.16.tgz", + "integrity": "sha512-Uv5Cu8nVkuvLn0puX+R9zWbSNpLIR3AxUlPoLJ7hC5lvir8B2WVqVEkJLwtixKAncVLasnTVjPDCidtAUTGEQw==", + "dependencies": { + "@smithy/property-provider": "^2.0.13", + "@smithy/smithy-client": "^2.1.12", + "@smithy/types": "^2.4.0", + "bowser": "^2.11.0", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">= 10.0.0" } }, - "node_modules/@redis/json": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/@redis/json/-/json-1.0.4.tgz", - "integrity": "sha512-LUZE2Gdrhg0Rx7AN+cZkb1e6HjoSKaeeW8rYnt89Tly13GBI5eP4CwDVr+MY8BAYfCg4/N15OUrtLoona9uSgw==", - "peerDependencies": { - "@redis/client": "^1.0.0" + "node_modules/@smithy/util-defaults-mode-node": { + "version": "2.0.21", + "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-2.0.21.tgz", + "integrity": "sha512-cUEsttVZ79B7Al2rWK2FW03HBpD9LyuqFtm+1qFty5u9sHSdesr215gS2Ln53fTopNiPgeXpdoM3IgjvIO0rJw==", + "dependencies": { + "@smithy/config-resolver": "^2.0.16", + "@smithy/credential-provider-imds": "^2.0.18", + "@smithy/node-config-provider": "^2.1.3", + "@smithy/property-provider": "^2.0.13", + "@smithy/smithy-client": "^2.1.12", + "@smithy/types": "^2.4.0", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">= 10.0.0" } }, - "node_modules/@redis/search": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@redis/search/-/search-1.1.1.tgz", - "integrity": "sha512-pqCXTc5e7wJJgUuJiC3hBgfoFRoPxYzwn0BEfKgejTM7M/9zP3IpUcqcjgfp8hF+LoV8rHZzcNTz7V+pEIY7LQ==", - "peerDependencies": { - "@redis/client": "^1.0.0" + "node_modules/@smithy/util-endpoints": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@smithy/util-endpoints/-/util-endpoints-1.0.2.tgz", + "integrity": "sha512-QEdq+sP68IJHAMVB2ugKVVZEWeKQtZLuf+akHzc8eTVElsZ2ZdVLWC6Cp+uKjJ/t4yOj1qu6ZzyxJQEQ8jdEjg==", + "dependencies": { + "@smithy/node-config-provider": "^2.1.3", + "@smithy/types": "^2.4.0", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">= 14.0.0" } }, - "node_modules/@redis/time-series": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/@redis/time-series/-/time-series-1.0.4.tgz", - "integrity": "sha512-ThUIgo2U/g7cCuZavucQTQzA9g9JbDDY2f64u3AbAoz/8vE2lt2U37LamDUVChhaDA3IRT9R6VvJwqnUfTJzng==", - "peerDependencies": { - "@redis/client": "^1.0.0" + "node_modules/@smithy/util-hex-encoding": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@smithy/util-hex-encoding/-/util-hex-encoding-2.0.0.tgz", + "integrity": "sha512-c5xY+NUnFqG6d7HFh1IFfrm3mGl29lC+vF+geHv4ToiuJCBmIfzx6IeHLg+OgRdPFKDXIw6pvi+p3CsscaMcMA==", + "dependencies": { + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" } }, - "node_modules/@sinclair/typebox": { - "version": "0.24.51", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz", - "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==", - "dev": true + "node_modules/@smithy/util-middleware": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@smithy/util-middleware/-/util-middleware-2.0.5.tgz", + "integrity": "sha512-1lyT3TcaMJQe+OFfVI+TlomDkPuVzb27NZYdYtmSTltVmLaUjdCyt4KE+OH1CnhZKsz4/cdCL420Lg9UH5Z2Mw==", + "dependencies": { + "@smithy/types": "^2.4.0", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" + } }, - "node_modules/@sinonjs/commons": { - "version": "1.8.6", - "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.6.tgz", - "integrity": "sha512-Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ==", - "dev": true, + "node_modules/@smithy/util-retry": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@smithy/util-retry/-/util-retry-2.0.5.tgz", + "integrity": "sha512-x3t1+MQAJ6QONk3GTbJNcugCFDVJ+Bkro5YqQQK1EyVesajNDqxFtCx9WdOFNGm/Cbm7tUdwVEmfKQOJoU2Vtw==", "dependencies": { - "type-detect": "4.0.8" + "@smithy/service-error-classification": "^2.0.5", + "@smithy/types": "^2.4.0", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">= 14.0.0" } }, - "node_modules/@sinonjs/fake-timers": { - "version": "9.1.2", - "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-9.1.2.tgz", - "integrity": "sha512-BPS4ynJW/o92PUR4wgriz2Ud5gpST5vz6GQfMixEDK0Z8ZCUv2M7SkBLykH56T++Xs+8ln9zTGbOvNGIe02/jw==", - "dev": true, + "node_modules/@smithy/util-stream": { + "version": "2.0.17", + "resolved": "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-2.0.17.tgz", + "integrity": "sha512-fP/ZQ27rRvHsqItds8yB7jerwMpZFTL3QqbQbidUiG0+mttMoKdP0ZqnvM8UK5q0/dfc3/pN7g4XKPXOU7oRWw==", "dependencies": { - "@sinonjs/commons": "^1.7.0" + "@smithy/fetch-http-handler": "^2.2.4", + "@smithy/node-http-handler": "^2.1.8", + "@smithy/types": "^2.4.0", + "@smithy/util-base64": "^2.0.0", + "@smithy/util-buffer-from": "^2.0.0", + "@smithy/util-hex-encoding": "^2.0.0", + "@smithy/util-utf8": "^2.0.0", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" } }, - "node_modules/@sinonjs/samsam": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-7.0.1.tgz", - "integrity": "sha512-zsAk2Jkiq89mhZovB2LLOdTCxJF4hqqTToGP0ASWlhp4I1hqOjcfmZGafXntCN7MDC6yySH0mFHrYtHceOeLmw==", - "dev": true, + "node_modules/@smithy/util-uri-escape": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@smithy/util-uri-escape/-/util-uri-escape-2.0.0.tgz", + "integrity": "sha512-ebkxsqinSdEooQduuk9CbKcI+wheijxEb3utGXkCoYQkJnwTnLbH1JXGimJtUkQwNQbsbuYwG2+aFVyZf5TLaw==", "dependencies": { - "@sinonjs/commons": "^2.0.0", - "lodash.get": "^4.4.2", - "type-detect": "^4.0.8" + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" } }, - "node_modules/@sinonjs/samsam/node_modules/@sinonjs/commons": { + "node_modules/@smithy/util-utf8": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-2.0.0.tgz", - "integrity": "sha512-uLa0j859mMrg2slwQYdO/AkrOfmH+X6LTVmNTS9CqexuE2IvVORIkSpJLqePAbEnKJ77aMmCwr1NUZ57120Xcg==", - "dev": true, + "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-2.0.0.tgz", + "integrity": "sha512-rctU1VkziY84n5OXe3bPNpKR001ZCME2JCaBBFgtiM2hfKbHFudc/BkMuPab8hRbLd0j3vbnBTTZ1igBf0wgiQ==", "dependencies": { - "type-detect": "4.0.8" + "@smithy/util-buffer-from": "^2.0.0", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" } }, - "node_modules/@sinonjs/text-encoding": { - "version": "0.7.2", - "resolved": "https://registry.npmjs.org/@sinonjs/text-encoding/-/text-encoding-0.7.2.tgz", - "integrity": "sha512-sXXKG+uL9IrKqViTtao2Ws6dy0znu9sOaP1di/jKGW1M6VssO8vlpXCQcpZ+jisQ1tTFAC5Jo/EOzFbggBagFQ==", - "dev": true + "node_modules/@smithy/util-waiter": { + "version": "2.0.12", + "resolved": "https://registry.npmjs.org/@smithy/util-waiter/-/util-waiter-2.0.12.tgz", + "integrity": "sha512-3sENmyVa1NnOPoiT2NCApPmu7ukP7S/v7kL9IxNmnygkDldn7/yK0TP42oPJLwB2k3mospNsSePIlqdXEUyPHA==", + "dependencies": { + "@smithy/abort-controller": "^2.0.12", + "@smithy/types": "^2.4.0", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" + } }, "node_modules/@sqltools/formatter": { "version": "1.2.5", @@ -3836,9 +4048,9 @@ "integrity": "sha512-Uy0+khmZqUrUGm5dmMqVlnvufZRSK0FbYzVgp0UMstm+F5+W2/jnEEQyc9vo1ZR/E5ZI/B1WjjoTqBqwJL6Krw==" }, "node_modules/@testim/chrome-version": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/@testim/chrome-version/-/chrome-version-1.1.3.tgz", - "integrity": "sha512-g697J3WxV/Zytemz8aTuKjTGYtta9+02kva3C1xc7KXB8GdbfE1akGJIsZLyY/FSh2QrnE+fiB7vmWU3XNcb6A==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/@testim/chrome-version/-/chrome-version-1.1.4.tgz", + "integrity": "sha512-kIhULpw9TrGYnHp/8VfdcneIcxKnLixmADtukQRtJUmsVlMg0niMkwV0xZmi8hqa57xqilIHjWFA0GKvEjVU5g==", "optional": true }, "node_modules/@tsconfig/node10": { @@ -3860,15 +4072,15 @@ "devOptional": true }, "node_modules/@tsconfig/node16": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.3.tgz", - "integrity": "sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.4.tgz", + "integrity": "sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==", "devOptional": true }, "node_modules/@types/babel__core": { - "version": "7.20.0", - "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.0.tgz", - "integrity": "sha512-+n8dL/9GWblDO0iU6eZAwEIJVr5DWigtle+Q6HLOrh/pdbXOhOtqzq8VPPE2zvNJzSKY4vH/z3iT3tn0A3ypiQ==", + "version": "7.20.3", + "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.3.tgz", + "integrity": "sha512-54fjTSeSHwfan8AyHWrKbfBWiEUrNTZsUwPTDSNaaP1QDQIZbeNUg3a59E9D+375MzUw/x1vx2/0F5LBz+AeYA==", "dev": true, "dependencies": { "@babel/parser": "^7.20.7", @@ -3879,18 +4091,18 @@ } }, "node_modules/@types/babel__generator": { - "version": "7.6.4", - "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.4.tgz", - "integrity": "sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==", + "version": "7.6.6", + "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.6.tgz", + "integrity": "sha512-66BXMKb/sUWbMdBNdMvajU7i/44RkrA3z/Yt1c7R5xejt8qh84iU54yUWCtm0QwGJlDcf/gg4zd/x4mpLAlb/w==", "dev": true, "dependencies": { "@babel/types": "^7.0.0" } }, "node_modules/@types/babel__template": { - "version": "7.4.1", - "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.1.tgz", - "integrity": "sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==", + "version": "7.4.3", + "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.3.tgz", + "integrity": "sha512-ciwyCLeuRfxboZ4isgdNZi/tkt06m8Tw6uGbBSBgWrnnZGNXiEyM27xc/PjXGQLqlZ6ylbgHMnm7ccF9tCkOeQ==", "dev": true, "dependencies": { "@babel/parser": "^7.1.0", @@ -3898,18 +4110,18 @@ } }, "node_modules/@types/babel__traverse": { - "version": "7.18.3", - "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.18.3.tgz", - "integrity": "sha512-1kbcJ40lLB7MHsj39U4Sh1uTd2E7rLEa79kmDpI6cy+XiXsteB3POdQomoq4FxszMrO3ZYchkhYJw7A2862b3w==", + "version": "7.20.3", + "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.3.tgz", + "integrity": "sha512-Lsh766rGEFbaxMIDH7Qa+Yha8cMVI3qAK6CHt3OR0YfxOIn5Z54iHiyDRycHrBqeIiqGa20Kpsv1cavfBKkRSw==", "dev": true, "dependencies": { - "@babel/types": "^7.3.0" + "@babel/types": "^7.20.7" } }, "node_modules/@types/body-parser": { - "version": "1.19.2", - "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.2.tgz", - "integrity": "sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==", + "version": "1.19.4", + "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.4.tgz", + "integrity": "sha512-N7UDG0/xiPQa2D/XrVJXjkWbpqHCd2sBaB32ggRF2l83RhPfamgKGF8gwwqyksS95qUS5ZYF9aF+lLPRlwI2UA==", "dev": true, "dependencies": { "@types/connect": "*", @@ -3917,9 +4129,9 @@ } }, "node_modules/@types/clamscan": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/@types/clamscan/-/clamscan-2.0.5.tgz", - "integrity": "sha512-bFqdscswqBia3yKEJZVVWELOVvWKHUR1dCmH4xshYwu0T9YSfZd35Q8Z9jYW0ygxqGlHjLXMb2/7C6CJITbDgg==", + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/@types/clamscan/-/clamscan-2.0.6.tgz", + "integrity": "sha512-8Tm9yQq2c3c/jnOf3E49Py8P9m32Ug7ZKR/owtIlxe25EFcGygSs1/gIFFFzBre4bJIkfUQ/Kfx3CUGUyZKBGw==", "dependencies": { "@types/node": "*", "axios": "^0.24.0" @@ -3934,30 +4146,30 @@ } }, "node_modules/@types/config": { - "version": "0.0.41", - "resolved": "https://registry.npmjs.org/@types/config/-/config-0.0.41.tgz", - "integrity": "sha512-HjXUmIld0gwvyG8MU/17QtLzOyuMX4jbGuijmS9sWsob5xxgZ/hY9cbRCaHIHqTQ3HMLhwS3F8uXq3Bt9zgzHA==", + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/@types/config/-/config-3.3.2.tgz", + "integrity": "sha512-NAxsgr73BakGnfpHq5eKmtba/x+JyPcZmSa0DzCTdR4JCxeSC+KpwSQuOMGvACs7axkjGqi44/zYRkhiX7aDew==", "dev": true }, "node_modules/@types/connect": { - "version": "3.4.35", - "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.35.tgz", - "integrity": "sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==", + "version": "3.4.37", + "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.37.tgz", + "integrity": "sha512-zBUSRqkfZ59OcwXon4HVxhx5oWCJmc0OtBTK05M+p0dYjgN6iTwIL2T/WbsQZrEsdnwaF9cWQ+azOnpPvIqY3Q==", "dev": true, "dependencies": { "@types/node": "*" } }, "node_modules/@types/cookiejar": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/@types/cookiejar/-/cookiejar-2.1.2.tgz", - "integrity": "sha512-t73xJJrvdTjXrn4jLS9VSGRbz0nUY3cl2DMGDU48lKl+HR9dbbjW2A9r3g40VA++mQpy6uuHg33gy7du2BKpog==", + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/@types/cookiejar/-/cookiejar-2.1.3.tgz", + "integrity": "sha512-LZ8SD3LpNmLMDLkG2oCBjZg+ETnx6XdCjydUE0HwojDmnDfDUnhMKKbtth1TZh+hzcqb03azrYWoXLS8sMXdqg==", "dev": true }, "node_modules/@types/eslint": { - "version": "8.21.0", - "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.21.0.tgz", - "integrity": "sha512-35EhHNOXgxnUgh4XCJsGhE7zdlDhYDN/aMG6UbkByCFFNgQ7b3U+uVoqBpicFydR8JEfgdjCF7SJ7MiJfzuiTA==", + "version": "8.44.6", + "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.44.6.tgz", + "integrity": "sha512-P6bY56TVmX8y9J87jHNgQh43h6VVU+6H7oN7hgvivV81K2XY8qJZ5vqPy/HdUoVIelii2kChYVzQanlswPWVFw==", "dev": true, "dependencies": { "@types/estree": "*", @@ -3965,9 +4177,9 @@ } }, "node_modules/@types/eslint-scope": { - "version": "3.7.4", - "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.4.tgz", - "integrity": "sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==", + "version": "3.7.6", + "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.6.tgz", + "integrity": "sha512-zfM4ipmxVKWdxtDaJ3MP3pBurDXOCoyjvlpE3u6Qzrmw4BPbfm4/ambIeTk/r/J0iq/+2/xp0Fmt+gFvXJY2PQ==", "dev": true, "dependencies": { "@types/eslint": "*", @@ -3975,172 +4187,171 @@ } }, "node_modules/@types/estree": { - "version": "0.0.51", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.51.tgz", - "integrity": "sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.4.tgz", + "integrity": "sha512-2JwWnHK9H+wUZNorf2Zr6ves96WHoWDJIftkcxPKsS7Djta6Zu519LarhRNljPXkpsZR2ZMwNCPeW7omW07BJw==", "dev": true }, "node_modules/@types/express": { - "version": "4.17.16", - "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.16.tgz", - "integrity": "sha512-LkKpqRZ7zqXJuvoELakaFYuETHjZkSol8EV6cNnyishutDBCCdv6+dsKPbKkCcIk57qRphOLY5sEgClw1bO3gA==", + "version": "4.17.20", + "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.20.tgz", + "integrity": "sha512-rOaqlkgEvOW495xErXMsmyX3WKBInbhG5eqojXYi3cGUaLoRDlXa5d52fkfWZT963AZ3v2eZ4MbKE6WpDAGVsw==", "dev": true, "dependencies": { "@types/body-parser": "*", - "@types/express-serve-static-core": "^4.17.31", + "@types/express-serve-static-core": "^4.17.33", "@types/qs": "*", "@types/serve-static": "*" } }, "node_modules/@types/express-serve-static-core": { - "version": "4.17.33", - "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.33.tgz", - "integrity": "sha512-TPBqmR/HRYI3eC2E5hmiivIzv+bidAfXofM+sbonAGvyDhySGw9/PQZFt2BLOrjUUR++4eJVpx6KnLQK1Fk9tA==", + "version": "4.17.39", + "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.39.tgz", + "integrity": "sha512-BiEUfAiGCOllomsRAZOiMFP7LAnrifHpt56pc4Z7l9K6ACyN06Ns1JLMBxwkfLOjJRlSf06NwWsT7yzfpaVpyQ==", "dev": true, "dependencies": { "@types/node": "*", "@types/qs": "*", - "@types/range-parser": "*" + "@types/range-parser": "*", + "@types/send": "*" } }, "node_modules/@types/graceful-fs": { - "version": "4.1.6", - "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.6.tgz", - "integrity": "sha512-Sig0SNORX9fdW+bQuTEovKj3uHcUL6LQKbCrrqb1X7J6/ReAbhCXRAhc+SMejhLELFj2QcyuxmUooZ4bt5ReSw==", + "version": "4.1.8", + "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.8.tgz", + "integrity": "sha512-NhRH7YzWq8WiNKVavKPBmtLYZHxNY19Hh+az28O/phfp68CF45pMFud+ZzJ8ewnxnC5smIdF3dqFeiSUQ5I+pw==", "dev": true, "dependencies": { "@types/node": "*" } }, + "node_modules/@types/http-errors": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.3.tgz", + "integrity": "sha512-pP0P/9BnCj1OVvQR2lF41EkDG/lWWnDyA203b/4Fmi2eTyORnBtcDoKDwjWQthELrBvWkMOrvSOnZ8OVlW6tXA==", + "dev": true + }, "node_modules/@types/istanbul-lib-coverage": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz", - "integrity": "sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.5.tgz", + "integrity": "sha512-zONci81DZYCZjiLe0r6equvZut0b+dBRPBN5kBDjsONnutYNtJMoWQ9uR2RkL1gLG9NMTzvf+29e5RFfPbeKhQ==", "dev": true }, "node_modules/@types/istanbul-lib-report": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz", - "integrity": "sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.2.tgz", + "integrity": "sha512-8toY6FgdltSdONav1XtUHl4LN1yTmLza+EuDazb/fEmRNCwjyqNVIQWs2IfC74IqjHkREs/nQ2FWq5kZU9IC0w==", "dev": true, "dependencies": { "@types/istanbul-lib-coverage": "*" } }, "node_modules/@types/istanbul-reports": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz", - "integrity": "sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.3.tgz", + "integrity": "sha512-1nESsePMBlf0RPRffLZi5ujYh7IH1BWL4y9pr+Bn3cJBdxz+RTP8bUFljLz9HvzhhOSWKdyBZ4DIivdL6rvgZg==", "dev": true, "dependencies": { "@types/istanbul-lib-report": "*" } }, "node_modules/@types/jest": { - "version": "28.1.4", - "resolved": "https://registry.npmjs.org/@types/jest/-/jest-28.1.4.tgz", - "integrity": "sha512-telv6G5N7zRJiLcI3Rs3o+ipZ28EnE+7EvF0pSrt2pZOMnAVI/f+6/LucDxOvcBcTeTL3JMF744BbVQAVBUQRA==", + "version": "29.5.7", + "resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.7.tgz", + "integrity": "sha512-HLyetab6KVPSiF+7pFcUyMeLsx25LDNDemw9mGsJBkai/oouwrjTycocSDYopMEwFhN2Y4s9oPyOCZNofgSt2g==", "dev": true, "dependencies": { - "jest-matcher-utils": "^28.0.0", - "pretty-format": "^28.0.0" + "expect": "^29.0.0", + "pretty-format": "^29.0.0" } }, "node_modules/@types/json-schema": { - "version": "7.0.11", - "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz", - "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==", + "version": "7.0.14", + "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.14.tgz", + "integrity": "sha512-U3PUjAudAdJBeC2pgN8uTIKgxrb4nlDF3SF0++EldXQvQBGkpFZMSnwQiIoDU77tv45VgNkl/L4ouD+rEomujw==", "dev": true }, - "node_modules/@types/long": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/@types/long/-/long-4.0.2.tgz", - "integrity": "sha512-MqTGEo5bj5t157U6fA/BiDynNkn0YknVdh48CMPkTSpFTVmvao5UQmm7uEF6xBEo7qIMAlY/JSleYaE6VOdpaA==" - }, "node_modules/@types/mime": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/@types/mime/-/mime-3.0.1.tgz", - "integrity": "sha512-Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA==", + "version": "1.3.4", + "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.4.tgz", + "integrity": "sha512-1Gjee59G25MrQGk8bsNvC6fxNiRgUlGn2wlhGf95a59DrprnnHk80FIMMFG9XHMdrfsuA119ht06QPDXA1Z7tw==", "dev": true }, "node_modules/@types/node": { - "version": "18.11.18", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.18.tgz", - "integrity": "sha512-DHQpWGjyQKSHj3ebjFI/wRKcqQcdR+MoFBygntYOZytCqNfkd2ZC4ARDJ2DQqhjH5p85Nnd3jhUJIXrszFX/JA==" + "version": "20.8.10", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.8.10.tgz", + "integrity": "sha512-TlgT8JntpcbmKUFzjhsyhGfP2fsiz1Mv56im6enJ905xG1DAYesxJaeSbGqQmAw8OWPdhyJGhGSQGKRNJ45u9w==", + "dependencies": { + "undici-types": "~5.26.4" + } }, "node_modules/@types/node-jose": { - "version": "1.1.10", - "resolved": "https://registry.npmjs.org/@types/node-jose/-/node-jose-1.1.10.tgz", - "integrity": "sha512-7L0ucJTugW4x/sYpQ+c5IudAwr0pFuxDVnZLpHKWpff7p1lVa3wTuNvnrzFBNeLojE+UY0cVCwNGXLxXsMIrzw==", + "version": "1.1.12", + "resolved": "https://registry.npmjs.org/@types/node-jose/-/node-jose-1.1.12.tgz", + "integrity": "sha512-HtSXbirRMuONr/KSNtBgh631xCt/t3lPz0geQ4pe/FA+yu06TUrJrXEU5y8nJFHNy8KhiZrq6OVlqXD1AtT/dQ==", "dev": true, "dependencies": { "@types/node": "*" } }, - "node_modules/@types/object-hash": { - "version": "1.3.4", - "resolved": "https://registry.npmjs.org/@types/object-hash/-/object-hash-1.3.4.tgz", - "integrity": "sha512-xFdpkAkikBgqBdG9vIlsqffDV8GpvnPEzs0IUtr1v3BEB97ijsFQ4RXVbUZwjFThhB4MDSTUfvmxUD5PGx0wXA==" - }, - "node_modules/@types/parse-json": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz", - "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==", - "dev": true - }, - "node_modules/@types/prettier": { - "version": "2.7.2", - "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.7.2.tgz", - "integrity": "sha512-KufADq8uQqo1pYKVIYzfKbJfBAc0sOeXqGbFaSpv8MRmC/zXgowNZmFcbngndGk922QDmOASEXUZCaY48gs4cg==", - "dev": true - }, "node_modules/@types/qs": { - "version": "6.9.7", - "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.7.tgz", - "integrity": "sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==", + "version": "6.9.9", + "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.9.tgz", + "integrity": "sha512-wYLxw35euwqGvTDx6zfY1vokBFnsK0HNrzc6xNHchxfO2hpuRg74GbkEW7e3sSmPvj0TjCDT1VCa6OtHXnubsg==", "dev": true }, "node_modules/@types/range-parser": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.4.tgz", - "integrity": "sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==", + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.6.tgz", + "integrity": "sha512-+0autS93xyXizIYiyL02FCY8N+KkKPhILhcUSA276HxzreZ16kl+cmwvV2qAM/PuCCwPXzOXOWhiPcw20uSFcA==", "dev": true }, "node_modules/@types/semver": { - "version": "7.3.13", - "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.3.13.tgz", - "integrity": "sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-MMzuxN3GdFwskAnb6fz0orFvhfqi752yjaXylr0Rp4oDg5H0Zn1IuyRhDVvYOwAXoJirx2xuS16I3WjxnAIHiQ==", "dev": true }, + "node_modules/@types/send": { + "version": "0.17.3", + "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.3.tgz", + "integrity": "sha512-/7fKxvKUoETxjFUsuFlPB9YndePpxxRAOfGC/yJdc9kTjTeP5kRCTzfnE8kPUKCeyiyIZu0YQ76s50hCedI1ug==", + "dev": true, + "dependencies": { + "@types/mime": "^1", + "@types/node": "*" + } + }, "node_modules/@types/serve-static": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.0.tgz", - "integrity": "sha512-z5xyF6uh8CbjAu9760KDKsH2FcDxZ2tFCsA4HIMWE6IkiYMXfVoa+4f9KX+FN0ZLsaMw1WNG2ETLA6N+/YA+cg==", + "version": "1.15.4", + "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.4.tgz", + "integrity": "sha512-aqqNfs1XTF0HDrFdlY//+SGUxmdSUbjeRXb5iaZc3x0/vMbYmdw9qvOgHWOyyLFxSSRnUuP5+724zBgfw8/WAw==", "dev": true, "dependencies": { + "@types/http-errors": "*", "@types/mime": "*", "@types/node": "*" } }, "node_modules/@types/sinon": { - "version": "10.0.13", - "resolved": "https://registry.npmjs.org/@types/sinon/-/sinon-10.0.13.tgz", - "integrity": "sha512-UVjDqJblVNQYvVNUsj0PuYYw0ELRmgt1Nt5Vk0pT5f16ROGfcKJY8o1HVuMOJOpD727RrGB9EGvoaTQE5tgxZQ==", + "version": "10.0.20", + "resolved": "https://registry.npmjs.org/@types/sinon/-/sinon-10.0.20.tgz", + "integrity": "sha512-2APKKruFNCAZgx3daAyACGzWuJ028VVCUDk6o2rw/Z4PXT0ogwdV4KUegW0MwVs0Zu59auPXbbuBJHF12Sx1Eg==", "dev": true, "dependencies": { "@types/sinonjs__fake-timers": "*" } }, "node_modules/@types/sinonjs__fake-timers": { - "version": "8.1.2", - "resolved": "https://registry.npmjs.org/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-8.1.2.tgz", - "integrity": "sha512-9GcLXF0/v3t80caGs5p2rRfkB+a8VBGLJZVih6CNFkx8IZ994wiKKLSRs9nuFwk1HevWs/1mnUmkApGrSGsShA==", + "version": "8.1.4", + "resolved": "https://registry.npmjs.org/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-8.1.4.tgz", + "integrity": "sha512-GDV68H0mBSN449sa5HEj51E0wfpVQb8xNSMzxf/PrypMFcLTMwJMOM/cgXiv71Mq5drkOQmUGvL1okOZcu6RrQ==", "dev": true }, "node_modules/@types/source-map-support": { - "version": "0.5.6", - "resolved": "https://registry.npmjs.org/@types/source-map-support/-/source-map-support-0.5.6.tgz", - "integrity": "sha512-b2nJ9YyXmkhGaa2b8VLM0kJ04xxwNyijcq12/kDoomCt43qbHBeK2SLNJ9iJmETaAj+bKUT05PQUu3Q66GvLhQ==", + "version": "0.5.9", + "resolved": "https://registry.npmjs.org/@types/source-map-support/-/source-map-support-0.5.9.tgz", + "integrity": "sha512-91Jf4LyPAObBTFbpW3bSDK1ncdwXohvlBmzffSj7/44SY+1mD/HhesdfspCMxPIJwllgN2G4eVFatGs4Zw/lnw==", "dev": true, "dependencies": { "source-map": "^0.6.0" @@ -4156,15 +4367,15 @@ } }, "node_modules/@types/stack-utils": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.1.tgz", - "integrity": "sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.2.tgz", + "integrity": "sha512-g7CK9nHdwjK2n0ymT2CW698FuWJRIx+RP6embAzZ2Qi8/ilIrA1Imt2LVSeHUzKvpoi7BhmmQcXz95eS0f2JXw==", "dev": true }, "node_modules/@types/superagent": { - "version": "4.1.16", - "resolved": "https://registry.npmjs.org/@types/superagent/-/superagent-4.1.16.tgz", - "integrity": "sha512-tLfnlJf6A5mB6ddqF159GqcDizfzbMUB1/DeT59/wBNqzRTNNKsaw79A/1TZ84X+f/EwWH8FeuSkjlCLyqS/zQ==", + "version": "4.1.20", + "resolved": "https://registry.npmjs.org/@types/superagent/-/superagent-4.1.20.tgz", + "integrity": "sha512-GfpwJgYSr3yO+nArFkmyqv3i0vZavyEG5xPd/o95RwpKYpsOKJYI5XLdxLpdRbZI3YiGKKdIOFIf/jlP7A0Jxg==", "dev": true, "dependencies": { "@types/cookiejar": "*", @@ -4172,76 +4383,77 @@ } }, "node_modules/@types/supertest": { - "version": "2.0.12", - "resolved": "https://registry.npmjs.org/@types/supertest/-/supertest-2.0.12.tgz", - "integrity": "sha512-X3HPWTwXRerBZS7Mo1k6vMVR1Z6zmJcDVn5O/31whe0tnjE4te6ZJSJGq1RiqHPjzPdMTfjCFogDJmwng9xHaQ==", + "version": "2.0.15", + "resolved": "https://registry.npmjs.org/@types/supertest/-/supertest-2.0.15.tgz", + "integrity": "sha512-jUCZZ/TMcpGzoSaed9Gjr8HCf3HehExdibyw3OHHEL1als1KmyzcOZZH4MjbObI8TkWsEr7bc7gsW0WTDni+qQ==", "dev": true, "dependencies": { "@types/superagent": "*" } }, "node_modules/@types/uuid": { - "version": "8.3.4", - "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-8.3.4.tgz", - "integrity": "sha512-c/I8ZRb51j+pYGAu5CrFMRxqZ2ke4y2grEBO5AUjgSkSk+qT2Ea+OdWElz/OiMf5MNpn2b17kuVBwZLQJXzihw==", + "version": "9.0.6", + "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-9.0.6.tgz", + "integrity": "sha512-BT2Krtx4xaO6iwzwMFUYvWBWkV2pr37zD68Vmp1CDV196MzczBRxuEpD6Pr395HAgebC/co7hOphs53r8V7jew==", "dev": true }, "node_modules/@types/validator": { - "version": "13.7.11", - "resolved": "https://registry.npmjs.org/@types/validator/-/validator-13.7.11.tgz", - "integrity": "sha512-WqTos+CnAKN64YwyBMhgUYhb5VsTNKwUY6AuzG5qu9/pFZJar/RJFMZBXwX7VS+uzYi+lIAr3WkvuWqEI9F2eg==" + "version": "13.11.5", + "resolved": "https://registry.npmjs.org/@types/validator/-/validator-13.11.5.tgz", + "integrity": "sha512-xW4qsT4UIYILu+7ZrBnfQdBYniZrMLYYK3wN9M/NdeIHgBN5pZI2/8Q7UfdWIcr5RLJv/OGENsx91JIpUUoC7Q==" }, "node_modules/@types/yargs": { - "version": "17.0.22", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.22.tgz", - "integrity": "sha512-pet5WJ9U8yPVRhkwuEIp5ktAeAqRZOq4UdAyWLWzxbtpyXnzbtLdKiXAjJzi/KLmPGS9wk86lUFWZFN6sISo4g==", + "version": "17.0.29", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.29.tgz", + "integrity": "sha512-nacjqA3ee9zRF/++a3FUY1suHTFKZeHba2n8WeDw9cCVdmzmHpIxyzOJBcpHvvEmS8E9KqWlSnWHUkOrkhWcvA==", "dev": true, "dependencies": { "@types/yargs-parser": "*" } }, "node_modules/@types/yargs-parser": { - "version": "21.0.0", - "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.0.tgz", - "integrity": "sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==", + "version": "21.0.2", + "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.2.tgz", + "integrity": "sha512-5qcvofLPbfjmBfKaLfj/+f+Sbd6pN4zl7w7VSVI5uz7m9QZTuB2aZAa2uo1wHFBNN2x6g/SoTkXmd8mQnQF2Cw==", "dev": true }, "node_modules/@types/yauzl": { - "version": "2.10.0", - "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.0.tgz", - "integrity": "sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==", + "version": "2.10.2", + "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.2.tgz", + "integrity": "sha512-Km7XAtUIduROw7QPgvcft0lIupeG8a8rdKL8RiSyKvlE7dYY31fEn41HVuQsRFDuROA8tA4K2UVL+WdfFmErBA==", "optional": true, "dependencies": { "@types/node": "*" } }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "5.50.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.50.0.tgz", - "integrity": "sha512-vwksQWSFZiUhgq3Kv7o1Jcj0DUNylwnIlGvKvLLYsq8pAWha6/WCnXUeaSoNNha/K7QSf2+jvmkxggC1u3pIwQ==", + "version": "6.9.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.9.1.tgz", + "integrity": "sha512-w0tiiRc9I4S5XSXXrMHOWgHgxbrBn1Ro+PmiYhSg2ZVdxrAJtQgzU5o2m1BfP6UOn7Vxcc6152vFjQfmZR4xEg==", "dev": true, "dependencies": { - "@typescript-eslint/scope-manager": "5.50.0", - "@typescript-eslint/type-utils": "5.50.0", - "@typescript-eslint/utils": "5.50.0", + "@eslint-community/regexpp": "^4.5.1", + "@typescript-eslint/scope-manager": "6.9.1", + "@typescript-eslint/type-utils": "6.9.1", + "@typescript-eslint/utils": "6.9.1", + "@typescript-eslint/visitor-keys": "6.9.1", "debug": "^4.3.4", - "grapheme-splitter": "^1.0.4", - "ignore": "^5.2.0", - "natural-compare-lite": "^1.4.0", - "regexpp": "^3.2.0", - "semver": "^7.3.7", - "tsutils": "^3.21.0" + "graphemer": "^1.4.0", + "ignore": "^5.2.4", + "natural-compare": "^1.4.0", + "semver": "^7.5.4", + "ts-api-utils": "^1.0.1" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^16.0.0 || >=18.0.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "@typescript-eslint/parser": "^5.0.0", - "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" + "@typescript-eslint/parser": "^6.0.0 || ^6.0.0-alpha", + "eslint": "^7.0.0 || ^8.0.0" }, "peerDependenciesMeta": { "typescript": { @@ -4250,25 +4462,26 @@ } }, "node_modules/@typescript-eslint/parser": { - "version": "5.50.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.50.0.tgz", - "integrity": "sha512-KCcSyNaogUDftK2G9RXfQyOCt51uB5yqC6pkUYqhYh8Kgt+DwR5M0EwEAxGPy/+DH6hnmKeGsNhiZRQxjH71uQ==", + "version": "6.9.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.9.1.tgz", + "integrity": "sha512-C7AK2wn43GSaCUZ9do6Ksgi2g3mwFkMO3Cis96kzmgudoVaKyt62yNzJOktP0HDLb/iO2O0n2lBOzJgr6Q/cyg==", "dev": true, "dependencies": { - "@typescript-eslint/scope-manager": "5.50.0", - "@typescript-eslint/types": "5.50.0", - "@typescript-eslint/typescript-estree": "5.50.0", + "@typescript-eslint/scope-manager": "6.9.1", + "@typescript-eslint/types": "6.9.1", + "@typescript-eslint/typescript-estree": "6.9.1", + "@typescript-eslint/visitor-keys": "6.9.1", "debug": "^4.3.4" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^16.0.0 || >=18.0.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" + "eslint": "^7.0.0 || ^8.0.0" }, "peerDependenciesMeta": { "typescript": { @@ -4277,16 +4490,16 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "5.50.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.50.0.tgz", - "integrity": "sha512-rt03kaX+iZrhssaT974BCmoUikYtZI24Vp/kwTSy841XhiYShlqoshRFDvN1FKKvU2S3gK+kcBW1EA7kNUrogg==", + "version": "6.9.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.9.1.tgz", + "integrity": "sha512-38IxvKB6NAne3g/+MyXMs2Cda/Sz+CEpmm+KLGEM8hx/CvnSRuw51i8ukfwB/B/sESdeTGet1NH1Wj7I0YXswg==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.50.0", - "@typescript-eslint/visitor-keys": "5.50.0" + "@typescript-eslint/types": "6.9.1", + "@typescript-eslint/visitor-keys": "6.9.1" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^16.0.0 || >=18.0.0" }, "funding": { "type": "opencollective", @@ -4294,25 +4507,25 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "5.50.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.50.0.tgz", - "integrity": "sha512-dcnXfZ6OGrNCO7E5UY/i0ktHb7Yx1fV6fnQGGrlnfDhilcs6n19eIRcvLBqx6OQkrPaFlDPk3OJ0WlzQfrV0bQ==", + "version": "6.9.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.9.1.tgz", + "integrity": "sha512-eh2oHaUKCK58qIeYp19F5V5TbpM52680sB4zNSz29VBQPTWIlE/hCj5P5B1AChxECe/fmZlspAWFuRniep1Skg==", "dev": true, "dependencies": { - "@typescript-eslint/typescript-estree": "5.50.0", - "@typescript-eslint/utils": "5.50.0", + "@typescript-eslint/typescript-estree": "6.9.1", + "@typescript-eslint/utils": "6.9.1", "debug": "^4.3.4", - "tsutils": "^3.21.0" + "ts-api-utils": "^1.0.1" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^16.0.0 || >=18.0.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "eslint": "*" + "eslint": "^7.0.0 || ^8.0.0" }, "peerDependenciesMeta": { "typescript": { @@ -4321,12 +4534,12 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "5.50.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.50.0.tgz", - "integrity": "sha512-atruOuJpir4OtyNdKahiHZobPKFvZnBnfDiyEaBf6d9vy9visE7gDjlmhl+y29uxZ2ZDgvXijcungGFjGGex7w==", + "version": "6.9.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.9.1.tgz", + "integrity": "sha512-BUGslGOb14zUHOUmDB2FfT6SI1CcZEJYfF3qFwBeUrU6srJfzANonwRYHDpLBuzbq3HaoF2XL2hcr01c8f8OaQ==", "dev": true, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^16.0.0 || >=18.0.0" }, "funding": { "type": "opencollective", @@ -4334,21 +4547,21 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "5.50.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.50.0.tgz", - "integrity": "sha512-Gq4zapso+OtIZlv8YNAStFtT6d05zyVCK7Fx3h5inlLBx2hWuc/0465C2mg/EQDDU2LKe52+/jN4f0g9bd+kow==", + "version": "6.9.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.9.1.tgz", + "integrity": "sha512-U+mUylTHfcqeO7mLWVQ5W/tMLXqVpRv61wm9ZtfE5egz7gtnmqVIw9ryh0mgIlkKk9rZLY3UHygsBSdB9/ftyw==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.50.0", - "@typescript-eslint/visitor-keys": "5.50.0", + "@typescript-eslint/types": "6.9.1", + "@typescript-eslint/visitor-keys": "6.9.1", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", - "semver": "^7.3.7", - "tsutils": "^3.21.0" + "semver": "^7.5.4", + "ts-api-utils": "^1.0.1" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^16.0.0 || >=18.0.0" }, "funding": { "type": "opencollective", @@ -4361,191 +4574,196 @@ } }, "node_modules/@typescript-eslint/utils": { - "version": "5.50.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.50.0.tgz", - "integrity": "sha512-v/AnUFImmh8G4PH0NDkf6wA8hujNNcrwtecqW4vtQ1UOSNBaZl49zP1SHoZ/06e+UiwzHpgb5zP5+hwlYYWYAw==", + "version": "6.9.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.9.1.tgz", + "integrity": "sha512-L1T0A5nFdQrMVunpZgzqPL6y2wVreSyHhKGZryS6jrEN7bD9NplVAyMryUhXsQ4TWLnZmxc2ekar/lSGIlprCA==", "dev": true, "dependencies": { - "@types/json-schema": "^7.0.9", - "@types/semver": "^7.3.12", - "@typescript-eslint/scope-manager": "5.50.0", - "@typescript-eslint/types": "5.50.0", - "@typescript-eslint/typescript-estree": "5.50.0", - "eslint-scope": "^5.1.1", - "eslint-utils": "^3.0.0", - "semver": "^7.3.7" + "@eslint-community/eslint-utils": "^4.4.0", + "@types/json-schema": "^7.0.12", + "@types/semver": "^7.5.0", + "@typescript-eslint/scope-manager": "6.9.1", + "@typescript-eslint/types": "6.9.1", + "@typescript-eslint/typescript-estree": "6.9.1", + "semver": "^7.5.4" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^16.0.0 || >=18.0.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" + "eslint": "^7.0.0 || ^8.0.0" } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "5.50.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.50.0.tgz", - "integrity": "sha512-cdMeD9HGu6EXIeGOh2yVW6oGf9wq8asBgZx7nsR/D36gTfQ0odE5kcRYe5M81vjEFAcPeugXrHg78Imu55F6gg==", + "version": "6.9.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.9.1.tgz", + "integrity": "sha512-MUaPUe/QRLEffARsmNfmpghuQkW436DvESW+h+M52w0coICHRfD6Np9/K6PdACwnrq1HmuLl+cSPZaJmeVPkSw==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.50.0", - "eslint-visitor-keys": "^3.3.0" + "@typescript-eslint/types": "6.9.1", + "eslint-visitor-keys": "^3.4.1" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^16.0.0 || >=18.0.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/typescript-eslint" } }, + "node_modules/@ungap/structured-clone": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz", + "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==", + "dev": true + }, "node_modules/@webassemblyjs/ast": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz", - "integrity": "sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.6.tgz", + "integrity": "sha512-IN1xI7PwOvLPgjcf180gC1bqn3q/QaOCwYUahIOhbYUu8KA/3tw2RT/T0Gidi1l7Hhj5D/INhJxiICObqpMu4Q==", "dev": true, "dependencies": { - "@webassemblyjs/helper-numbers": "1.11.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.1" + "@webassemblyjs/helper-numbers": "1.11.6", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6" } }, "node_modules/@webassemblyjs/floating-point-hex-parser": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz", - "integrity": "sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz", + "integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==", "dev": true }, "node_modules/@webassemblyjs/helper-api-error": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz", - "integrity": "sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz", + "integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==", "dev": true }, "node_modules/@webassemblyjs/helper-buffer": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz", - "integrity": "sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.6.tgz", + "integrity": "sha512-z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA==", "dev": true }, "node_modules/@webassemblyjs/helper-numbers": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz", - "integrity": "sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz", + "integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==", "dev": true, "dependencies": { - "@webassemblyjs/floating-point-hex-parser": "1.11.1", - "@webassemblyjs/helper-api-error": "1.11.1", + "@webassemblyjs/floating-point-hex-parser": "1.11.6", + "@webassemblyjs/helper-api-error": "1.11.6", "@xtuc/long": "4.2.2" } }, "node_modules/@webassemblyjs/helper-wasm-bytecode": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz", - "integrity": "sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz", + "integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==", "dev": true }, "node_modules/@webassemblyjs/helper-wasm-section": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz", - "integrity": "sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.6.tgz", + "integrity": "sha512-LPpZbSOwTpEC2cgn4hTydySy1Ke+XEu+ETXuoyvuyezHO3Kjdu90KK95Sh9xTbmjrCsUwvWwCOQQNta37VrS9g==", "dev": true, "dependencies": { - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/helper-buffer": "1.11.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.1", - "@webassemblyjs/wasm-gen": "1.11.1" + "@webassemblyjs/ast": "1.11.6", + "@webassemblyjs/helper-buffer": "1.11.6", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6", + "@webassemblyjs/wasm-gen": "1.11.6" } }, "node_modules/@webassemblyjs/ieee754": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz", - "integrity": "sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz", + "integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==", "dev": true, "dependencies": { "@xtuc/ieee754": "^1.2.0" } }, "node_modules/@webassemblyjs/leb128": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.1.tgz", - "integrity": "sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.6.tgz", + "integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==", "dev": true, "dependencies": { "@xtuc/long": "4.2.2" } }, "node_modules/@webassemblyjs/utf8": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.1.tgz", - "integrity": "sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz", + "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==", "dev": true }, "node_modules/@webassemblyjs/wasm-edit": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz", - "integrity": "sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.6.tgz", + "integrity": "sha512-Ybn2I6fnfIGuCR+Faaz7YcvtBKxvoLV3Lebn1tM4o/IAJzmi9AWYIPWpyBfU8cC+JxAO57bk4+zdsTjJR+VTOw==", "dev": true, "dependencies": { - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/helper-buffer": "1.11.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.1", - "@webassemblyjs/helper-wasm-section": "1.11.1", - "@webassemblyjs/wasm-gen": "1.11.1", - "@webassemblyjs/wasm-opt": "1.11.1", - "@webassemblyjs/wasm-parser": "1.11.1", - "@webassemblyjs/wast-printer": "1.11.1" + "@webassemblyjs/ast": "1.11.6", + "@webassemblyjs/helper-buffer": "1.11.6", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6", + "@webassemblyjs/helper-wasm-section": "1.11.6", + "@webassemblyjs/wasm-gen": "1.11.6", + "@webassemblyjs/wasm-opt": "1.11.6", + "@webassemblyjs/wasm-parser": "1.11.6", + "@webassemblyjs/wast-printer": "1.11.6" } }, "node_modules/@webassemblyjs/wasm-gen": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz", - "integrity": "sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.6.tgz", + "integrity": "sha512-3XOqkZP/y6B4F0PBAXvI1/bky7GryoogUtfwExeP/v7Nzwo1QLcq5oQmpKlftZLbT+ERUOAZVQjuNVak6UXjPA==", "dev": true, "dependencies": { - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.1", - "@webassemblyjs/ieee754": "1.11.1", - "@webassemblyjs/leb128": "1.11.1", - "@webassemblyjs/utf8": "1.11.1" + "@webassemblyjs/ast": "1.11.6", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6", + "@webassemblyjs/ieee754": "1.11.6", + "@webassemblyjs/leb128": "1.11.6", + "@webassemblyjs/utf8": "1.11.6" } }, "node_modules/@webassemblyjs/wasm-opt": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz", - "integrity": "sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.6.tgz", + "integrity": "sha512-cOrKuLRE7PCe6AsOVl7WasYf3wbSo4CeOk6PkrjS7g57MFfVUF9u6ysQBBODX0LdgSvQqRiGz3CXvIDKcPNy4g==", "dev": true, "dependencies": { - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/helper-buffer": "1.11.1", - "@webassemblyjs/wasm-gen": "1.11.1", - "@webassemblyjs/wasm-parser": "1.11.1" + "@webassemblyjs/ast": "1.11.6", + "@webassemblyjs/helper-buffer": "1.11.6", + "@webassemblyjs/wasm-gen": "1.11.6", + "@webassemblyjs/wasm-parser": "1.11.6" } }, "node_modules/@webassemblyjs/wasm-parser": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz", - "integrity": "sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.6.tgz", + "integrity": "sha512-6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ==", "dev": true, "dependencies": { - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/helper-api-error": "1.11.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.1", - "@webassemblyjs/ieee754": "1.11.1", - "@webassemblyjs/leb128": "1.11.1", - "@webassemblyjs/utf8": "1.11.1" + "@webassemblyjs/ast": "1.11.6", + "@webassemblyjs/helper-api-error": "1.11.6", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6", + "@webassemblyjs/ieee754": "1.11.6", + "@webassemblyjs/leb128": "1.11.6", + "@webassemblyjs/utf8": "1.11.6" } }, "node_modules/@webassemblyjs/wast-printer": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz", - "integrity": "sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.6.tgz", + "integrity": "sha512-JM7AhRcE+yW2GWYaKeHL5vt4xqee5N2WcezptmgyhNS+ScggqcT1OtXykhAb13Sn5Yas0j2uv9tHgrjwvzAP4A==", "dev": true, "dependencies": { - "@webassemblyjs/ast": "1.11.1", + "@webassemblyjs/ast": "1.11.6", "@xtuc/long": "4.2.2" } }, @@ -4583,9 +4801,9 @@ "integrity": "sha512-2BjRTZxTPvheOvGbBslFSYOUkr+SjPtOnrLP33f+VIWLzezQpZcqVg7ja3L4dBXmzzgwT+a029jRx5PCi3JuiA==" }, "node_modules/acorn": { - "version": "8.8.2", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz", - "integrity": "sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==", + "version": "8.11.2", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.2.tgz", + "integrity": "sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w==", "devOptional": true, "bin": { "acorn": "bin/acorn" @@ -4595,9 +4813,9 @@ } }, "node_modules/acorn-import-assertions": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz", - "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz", + "integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==", "dev": true, "peerDependencies": { "acorn": "^8" @@ -4613,9 +4831,9 @@ } }, "node_modules/acorn-walk": { - "version": "8.2.0", - "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz", - "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==", + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.0.tgz", + "integrity": "sha512-FS7hV565M5l1R08MXqo8odwMTB02C2UqzB17RVgu9EyuYFBqJZ3/ZY97sQD5FewVu1UyDFc1yztUDrAwT0EypA==", "devOptional": true, "engines": { "node": ">=0.4.0" @@ -4634,9 +4852,9 @@ } }, "node_modules/ajv": { - "version": "8.11.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz", - "integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==", + "version": "8.12.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz", + "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==", "dependencies": { "fast-deep-equal": "^3.1.1", "json-schema-traverse": "^1.0.0", @@ -4752,16 +4970,22 @@ "integrity": "sha512-Xg+9RwCg/0p32teKdGMPTPnVXKD0w3DfHnFTficozsAgsvq2XenPJq/MYpzzQ/v8zrOyJn6Ds39VA4JIDwFfqw==" }, "node_modules/arg": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz", - "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==", - "devOptional": true + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/arg/-/arg-5.0.2.tgz", + "integrity": "sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==", + "dev": true }, "node_modules/argparse": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==" }, + "node_modules/array-timsort": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/array-timsort/-/array-timsort-1.0.3.tgz", + "integrity": "sha512-/+3GRL7dDAGEfM6TseQk/U+mi18TU2Ms9I3UlLdUMhz2hbvGNTKdj9xniwXfUqgYhHxRx0+8UnKkvlNwVU+cWQ==", + "dev": true + }, "node_modules/array-union": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", @@ -4801,10 +5025,43 @@ "node": ">=8.0.0" } }, + "node_modules/automapper-classes": { + "version": "8.7.11", + "resolved": "https://registry.npmjs.org/automapper-classes/-/automapper-classes-8.7.11.tgz", + "integrity": "sha512-FCmSIJzuzZEh0imZ5wm5J6uyODIQPX93DSjZ7qj2GvvwJPcJ3jkt3zG6urNegSgnVs8ujDC27LrGtUL8Hv729A==", + "engines": { + "node": ">=16.0.0" + }, + "peerDependencies": { + "automapper-core": "8.7.11", + "reflect-metadata": "~0.1.13" + } + }, + "node_modules/automapper-core": { + "version": "8.7.11", + "resolved": "https://registry.npmjs.org/automapper-core/-/automapper-core-8.7.11.tgz", + "integrity": "sha512-CY4t9YvFD/zG9/k3fO/1IgGw7+T17wLJGbPEVKzDQ5PfPUu37cWTFV5Fb0T+kmUi3DVxlc6uZ7/5Mrd0l4fWfQ==", + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/automapper-nestjs": { + "version": "8.7.11", + "resolved": "https://registry.npmjs.org/automapper-nestjs/-/automapper-nestjs-8.7.11.tgz", + "integrity": "sha512-fy6pzwu8AvMeuCFfyO7iAle9PKL6T0z/6STn2C32HkB0MhtNLm4F/qpKHv6xMtvUSkoSNs/ne18JRCjRfIUWng==", + "engines": { + "node": ">=16.0.0" + }, + "peerDependencies": { + "@nestjs/common": "^7.0.0 || ^8.0.0 || ^9.0.0 || ^10.0.0", + "@nestjs/core": "^7.0.0 || ^8.0.0 || ^9.0.0 || ^10.0.0", + "automapper-core": "8.7.11" + } + }, "node_modules/avvio": { - "version": "8.2.0", - "resolved": "https://registry.npmjs.org/avvio/-/avvio-8.2.0.tgz", - "integrity": "sha512-bbCQdg7bpEv6kGH41RO/3B2/GMMmJSo2iBK+X8AWN9mujtfUipMDfIjsgHCfpnKqoGEQrrmCDKSa5OQ19+fDmg==", + "version": "8.2.1", + "resolved": "https://registry.npmjs.org/avvio/-/avvio-8.2.1.tgz", + "integrity": "sha512-TAlMYvOuwGyLK3PfBb5WKBXZmXz2fVCgv23d6zZFdle/q3gPjmxBaeuC0pY0Dzs5PWMSgfqqEZkrye19GlDTgw==", "dependencies": { "archy": "^1.0.0", "debug": "^4.0.0", @@ -4812,9 +5069,9 @@ } }, "node_modules/aws-sdk-client-mock": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/aws-sdk-client-mock/-/aws-sdk-client-mock-2.0.1.tgz", - "integrity": "sha512-Ib/AnI8ZdoIxOBbKSs28TUwJb7FI/AYVYn48PcXx6guk5fBs4GZJJEc+Ci9aImRtVmgO6jHN/6Etz17fr6j3qw==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/aws-sdk-client-mock/-/aws-sdk-client-mock-2.2.0.tgz", + "integrity": "sha512-Kq2N+6gHRDedbrgTA0NMMfyN1XDWEA5Kbpm9/M/cenSxoNjfvQBOtBawI1lQe5h4UziLl///E7u17K9PBoHEKA==", "dev": true, "dependencies": { "@types/sinon": "^10.0.10", @@ -4823,9 +5080,9 @@ } }, "node_modules/axios": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.2.1.tgz", - "integrity": "sha512-I88cFiGu9ryt/tfVEi4kX2SITsvDddTajXTOFmt2uK1ZVA8LytjtdeyefdQWEf5PU8w+4SSJDoYnggflB5tW4A==", + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.0.tgz", + "integrity": "sha512-EZ1DYihju9pwVB+jg67ogm+Tmqc6JmhamRN6I4Zt8DfZu5lbcQGw3ozH9lFejSJgs/ibaef3A9PMXPLeefFGJg==", "dependencies": { "follow-redirects": "^1.15.0", "form-data": "^4.0.0", @@ -4833,42 +5090,26 @@ } }, "node_modules/babel-jest": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-28.1.3.tgz", - "integrity": "sha512-epUaPOEWMk3cWX0M/sPvCHHCe9fMFAa/9hXEgKP8nFfNl/jlGkE9ucq9NqkZGXLDduCJYS0UvSlPUwC0S+rH6Q==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.7.0.tgz", + "integrity": "sha512-BrvGY3xZSwEcCzKvKsCi2GgHqDqsYkOP4/by5xCgIwGXQxIEh+8ew3gmrE1y7XRR6LHZIj6yLYnUi/mm2KXKBg==", "dev": true, "dependencies": { - "@jest/transform": "^28.1.3", + "@jest/transform": "^29.7.0", "@types/babel__core": "^7.1.14", "babel-plugin-istanbul": "^6.1.1", - "babel-preset-jest": "^28.1.3", + "babel-preset-jest": "^29.6.3", "chalk": "^4.0.0", "graceful-fs": "^4.2.9", "slash": "^3.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" }, "peerDependencies": { "@babel/core": "^7.8.0" } }, - "node_modules/babel-jest/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, "node_modules/babel-plugin-istanbul": { "version": "6.1.1", "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz", @@ -4885,10 +5126,35 @@ "node": ">=8" } }, + "node_modules/babel-plugin-istanbul/node_modules/istanbul-lib-instrument": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz", + "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==", + "dev": true, + "dependencies": { + "@babel/core": "^7.12.3", + "@babel/parser": "^7.14.7", + "@istanbuljs/schema": "^0.1.2", + "istanbul-lib-coverage": "^3.2.0", + "semver": "^6.3.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/babel-plugin-istanbul/node_modules/semver": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "dev": true, + "bin": { + "semver": "bin/semver.js" + } + }, "node_modules/babel-plugin-jest-hoist": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-28.1.3.tgz", - "integrity": "sha512-Ys3tUKAmfnkRUpPdpa98eYrAR0nV+sSFUZZEGuQ2EbFd1y4SOLtD5QDNHAq+bb9a+bbXvYQC4b+ID/THIMcU6Q==", + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.6.3.tgz", + "integrity": "sha512-ESAc/RJvGTFEzRwOTT4+lNDk/GNHMkKbNzsvT0qKRfDyyYTskxB5rnU2njIDYVxXCBHHEI1c0YwHob3WaYujOg==", "dev": true, "dependencies": { "@babel/template": "^7.3.3", @@ -4897,7 +5163,7 @@ "@types/babel__traverse": "^7.0.6" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/babel-preset-current-node-syntax": { @@ -4924,16 +5190,16 @@ } }, "node_modules/babel-preset-jest": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-28.1.3.tgz", - "integrity": "sha512-L+fupJvlWAHbQfn74coNX3zf60LXMJsezNvvx8eIh7iOR1luJ1poxYgQk1F8PYtNq/6QODDHCqsSnTFSWC491A==", + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-29.6.3.tgz", + "integrity": "sha512-0B3bhxR6snWXJZtR/RliHTDPRgn1sNHOR0yVtq/IiQFyuOVjFS+wuio/R4gSNkyYmKmJB4wGZv2NZanmKmTnNA==", "dev": true, "dependencies": { - "babel-plugin-jest-hoist": "^28.1.3", + "babel-plugin-jest-hoist": "^29.6.3", "babel-preset-current-node-syntax": "^1.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" }, "peerDependencies": { "@babel/core": "^7.0.0" @@ -4971,6 +5237,15 @@ "node": ">=6.0.0" } }, + "node_modules/big-integer": { + "version": "1.6.51", + "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.51.tgz", + "integrity": "sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg==", + "dev": true, + "engines": { + "node": ">=0.6" + } + }, "node_modules/binary-extensions": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", @@ -5014,20 +5289,6 @@ "ieee754": "^1.1.13" } }, - "node_modules/bl/node_modules/readable-stream": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", - "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", - "dev": true, - "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - }, - "engines": { - "node": ">= 6" - } - }, "node_modules/bn.js": { "version": "4.12.0", "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", @@ -5043,6 +5304,18 @@ "resolved": "https://registry.npmjs.org/bowser/-/bowser-2.11.0.tgz", "integrity": "sha512-AlcaJBi/pqqJBIQ8U9Mcpc9i8Aqxn88Skv5d+xBX006BY5u8N3mGLHa5Lgppa7L/HfwgwLgZ6NYs+Ag6uUmJRA==" }, + "node_modules/bplist-parser": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.2.0.tgz", + "integrity": "sha512-z0M+byMThzQmD9NILRniCUXYsYpjwnlO8N5uCFaCqIOpqRsJCrQL9NK3JsD67CN5a08nF5oIL2bD6loTdHOuKw==", + "dev": true, + "dependencies": { + "big-integer": "^1.6.44" + }, + "engines": { + "node": ">= 5.10.0" + } + }, "node_modules/brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", @@ -5069,9 +5342,9 @@ "integrity": "sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w==" }, "node_modules/browserslist": { - "version": "4.21.5", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.5.tgz", - "integrity": "sha512-tUkiguQGW7S3IhB7N+c2MV/HZPSCPAAiYBZXLsBhFB/PCy6ZKKsZrmBayHV9fdGV/ARIfJ14NkxKzRDjvp7L6w==", + "version": "4.22.1", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.22.1.tgz", + "integrity": "sha512-FEVc202+2iuClEhZhrWy6ZiAcRLvNMyYcxZ8raemul1DYVOVdFsbqckWLdsixQZCpJlwe77Z3UTalE7jsjnKfQ==", "dev": true, "funding": [ { @@ -5081,13 +5354,17 @@ { "type": "tidelift", "url": "https://tidelift.com/funding/github/npm/browserslist" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" } ], "dependencies": { - "caniuse-lite": "^1.0.30001449", - "electron-to-chromium": "^1.4.284", - "node-releases": "^2.0.8", - "update-browserslist-db": "^1.0.10" + "caniuse-lite": "^1.0.30001541", + "electron-to-chromium": "^1.4.535", + "node-releases": "^2.0.13", + "update-browserslist-db": "^1.0.13" }, "bin": { "browserslist": "cli.js" @@ -5163,9 +5440,9 @@ } }, "node_modules/bullmq": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/bullmq/-/bullmq-4.11.0.tgz", - "integrity": "sha512-e6/CtKHieEplmoP0NE/oty2xmuXGAoHWlpy//hYexljwM14Ff2Gqr4eLscYIdWm3W0OyxWwjjJUPXaOf5BYYvQ==", + "version": "4.12.7", + "resolved": "https://registry.npmjs.org/bullmq/-/bullmq-4.12.7.tgz", + "integrity": "sha512-wigDuI8dyzY1jaUZLrwMp0L7t2glp0eErnRCYlVwi56DUWYSrzrOB3Vz8SaAmpc3Ro5dS4mBwt7RDJG3jiuJKA==", "peer": true, "dependencies": { "cron-parser": "^4.6.0", @@ -5179,27 +5456,30 @@ "uuid": "^9.0.0" } }, - "node_modules/bullmq/node_modules/uuid": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz", - "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==", - "funding": [ - "https://github.com/sponsors/broofa", - "https://github.com/sponsors/ctavan" - ], - "peer": true, - "bin": { - "uuid": "dist/bin/uuid" + "node_modules/bundle-name": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/bundle-name/-/bundle-name-3.0.0.tgz", + "integrity": "sha512-PKA4BeSvBpQKQ8iPOGCSiell+N8P+Tf1DlwqmYhpe2gAhKPHn8EYOxVT+ShuGmhg8lN8XiSlS80yiExKXrURlw==", + "dev": true, + "dependencies": { + "run-applescript": "^5.0.0" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/call-bind": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", - "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.5.tgz", + "integrity": "sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ==", "dev": true, "dependencies": { - "function-bind": "^1.1.1", - "get-intrinsic": "^1.0.2" + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.1", + "set-function-length": "^1.1.1" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -5233,9 +5513,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001450", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001450.tgz", - "integrity": "sha512-qMBmvmQmFXaSxexkjjfMvD5rnDL0+m+dUMZKoDYsGG8iZN29RuYh9eRoMvKsT6uMAWlyUUGDEQGJJYjzCIO9ew==", + "version": "1.0.30001559", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001559.tgz", + "integrity": "sha512-cPiMKZgqgkg5LY3/ntGeLFUpi6tzddBNS58A4tnTgQw1zON7u2sZMU7SzOeVH4tj20++9ggL+V6FDOFMTaFFYA==", "dev": true, "funding": [ { @@ -5245,13 +5525,17 @@ { "type": "tidelift", "url": "https://tidelift.com/funding/github/npm/caniuse-lite" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" } ] }, "node_modules/case-anything": { - "version": "2.1.10", - "resolved": "https://registry.npmjs.org/case-anything/-/case-anything-2.1.10.tgz", - "integrity": "sha512-JczJwVrCP0jPKh05McyVsuOg6AYosrB9XWZKbQzXeDAm2ClE/PJE/BcrrQrVyGYH7Jg8V/LDupmyL4kFlVsVFQ==", + "version": "2.1.13", + "resolved": "https://registry.npmjs.org/case-anything/-/case-anything-2.1.13.tgz", + "integrity": "sha512-zlOQ80VrQ2Ue+ymH5OuM/DlDq64mEm+B9UTdHULv5osUMD6HalNTblf2b1u/m6QecjsnOkBpqVZ+XPwIVsy7Ng==", "engines": { "node": ">=12.13" }, @@ -5260,16 +5544,18 @@ } }, "node_modules/chalk": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", - "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", - "dev": true, + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" }, "engines": { - "node": ">=8" + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" } }, "node_modules/char-regex": { @@ -5288,17 +5574,17 @@ "dev": true }, "node_modules/cheerio": { - "version": "1.0.0-rc.10", - "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.10.tgz", - "integrity": "sha512-g0J0q/O6mW8z5zxQ3A8E8J1hUgp4SMOvEoW/x84OwyHKe/Zccz83PVT4y5Crcr530FV6NgmKI1qvGTKVl9XXVw==", + "version": "1.0.0-rc.12", + "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.12.tgz", + "integrity": "sha512-VqR8m68vM46BNnuZ5NtnGBKIE/DfN0cRIzg9n40EIq9NOv90ayxLBXA8fXC5gquFRGJSTRqBq25Jt2ECLR431Q==", "dependencies": { - "cheerio-select": "^1.5.0", - "dom-serializer": "^1.3.2", - "domhandler": "^4.2.0", - "htmlparser2": "^6.1.0", - "parse5": "^6.0.1", - "parse5-htmlparser2-tree-adapter": "^6.0.1", - "tslib": "^2.2.0" + "cheerio-select": "^2.1.0", + "dom-serializer": "^2.0.0", + "domhandler": "^5.0.3", + "domutils": "^3.0.1", + "htmlparser2": "^8.0.1", + "parse5": "^7.0.0", + "parse5-htmlparser2-tree-adapter": "^7.0.0" }, "engines": { "node": ">= 6" @@ -5308,25 +5594,21 @@ } }, "node_modules/cheerio-select": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/cheerio-select/-/cheerio-select-1.6.0.tgz", - "integrity": "sha512-eq0GdBvxVFbqWgmCm7M3XGs1I8oLy/nExUnh6oLqmBditPO9AqQJrkslDpMun/hZ0yyTs8L0m85OHp4ho6Qm9g==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/cheerio-select/-/cheerio-select-2.1.0.tgz", + "integrity": "sha512-9v9kG0LvzrlcungtnJtpGNxY+fzECQKhK4EGJX2vByejiMX84MFNQw4UxPJl3bFbTMw+Dfs37XaIkCwTZfLh4g==", "dependencies": { - "css-select": "^4.3.0", - "css-what": "^6.0.1", - "domelementtype": "^2.2.0", - "domhandler": "^4.3.1", - "domutils": "^2.8.0" + "boolbase": "^1.0.0", + "css-select": "^5.1.0", + "css-what": "^6.1.0", + "domelementtype": "^2.3.0", + "domhandler": "^5.0.3", + "domutils": "^3.0.1" }, "funding": { "url": "https://github.com/sponsors/fb55" } }, - "node_modules/cheerio/node_modules/parse5": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz", - "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==" - }, "node_modules/chokidar": { "version": "3.5.3", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz", @@ -5363,15 +5645,15 @@ } }, "node_modules/chromedriver": { - "version": "109.0.0", - "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-109.0.0.tgz", - "integrity": "sha512-jdmBq11IUwfThLFiygGTZ89qbROSQI4bICQjvOVQy2Bqr1LwC+MFkhwyZp3YG99eehQbZuTlQmmfCZBfpewTNA==", + "version": "119.0.0", + "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-119.0.0.tgz", + "integrity": "sha512-3TmabGT7xg57/Jbsg6B/Kqk3HaSbCP1ZHkR5zNft5vT/IWKjZCAGTH9waMI+i5KHSEiMH0zOw/WF98l+1Npkpw==", "hasInstallScript": true, "optional": true, "dependencies": { "@testim/chrome-version": "^1.1.3", - "axios": "^1.2.1", - "compare-versions": "^5.0.1", + "axios": "^1.4.0", + "compare-versions": "^6.0.0", "extract-zip": "^2.0.1", "https-proxy-agent": "^5.0.1", "proxy-from-env": "^1.1.0", @@ -5381,13 +5663,13 @@ "chromedriver": "bin/chromedriver" }, "engines": { - "node": ">=14" + "node": ">=18" } }, "node_modules/ci-info": { - "version": "3.7.1", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.7.1.tgz", - "integrity": "sha512-4jYS4MOAaCIStSRwiuxc4B8MYhIe676yO1sYGzARnjXkWpmzZMMYxY6zu8WYWDhSuth5zhrQ1rhNSibyyvv4/w==", + "version": "3.9.0", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", + "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==", "dev": true, "funding": [ { @@ -5400,9 +5682,9 @@ } }, "node_modules/cjs-module-lexer": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz", - "integrity": "sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA==", + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.3.tgz", + "integrity": "sha512-0TNiGstbQmCFwt4akjjBg5pLRTSyj/PkWQ1ZoO2zntmg9yLqSRxwEa4iCfQLGjqhiqBfOJa7W/E8wfGrTDmlZQ==", "dev": true }, "node_modules/clamscan": { @@ -5479,25 +5761,79 @@ "npm": ">=5.0.0" } }, - "node_modules/cli-highlight/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "node_modules/cli-highlight/node_modules/cliui": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", + "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^7.0.0" + } + }, + "node_modules/cli-highlight/node_modules/parse5": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.1.tgz", + "integrity": "sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==" + }, + "node_modules/cli-highlight/node_modules/parse5-htmlparser2-tree-adapter": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz", + "integrity": "sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA==", + "dependencies": { + "parse5": "^6.0.1" + } + }, + "node_modules/cli-highlight/node_modules/parse5-htmlparser2-tree-adapter/node_modules/parse5": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz", + "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==" + }, + "node_modules/cli-highlight/node_modules/wrap-ansi": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" }, "engines": { "node": ">=10" }, "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/cli-highlight/node_modules/yargs": { + "version": "16.2.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", + "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", + "dependencies": { + "cliui": "^7.0.2", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", + "require-directory": "^2.1.1", + "string-width": "^4.2.0", + "y18n": "^5.0.5", + "yargs-parser": "^20.2.2" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/cli-highlight/node_modules/yargs-parser": { + "version": "20.2.9", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", + "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", + "engines": { + "node": ">=10" } }, "node_modules/cli-spinners": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.7.0.tgz", - "integrity": "sha512-qu3pN8Y3qHNgE2AFweciB1IfMnmZ/fsNTEE+NOFjmGB2F/7rLhnhzppvpCnN4FovtP26k8lHyy9ptEbNwWFLzw==", + "version": "2.9.1", + "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.9.1.tgz", + "integrity": "sha512-jHgecW0pxkonBJdrKsqxgRX9AcG+u/5k0Q7WPDfi8AogLAdwxEkyYYNWwZ5GvVFoFx2uiY1eNcSK00fh+1+FyQ==", "dev": true, "engines": { "node": ">=6" @@ -5531,13 +5867,32 @@ } }, "node_modules/cliui": { - "version": "7.0.4", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", - "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", + "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", "dependencies": { "string-width": "^4.2.0", - "strip-ansi": "^6.0.0", + "strip-ansi": "^6.0.1", "wrap-ansi": "^7.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/cliui/node_modules/wrap-ansi": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" } }, "node_modules/clone": { @@ -5568,9 +5923,9 @@ } }, "node_modules/collect-v8-coverage": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz", - "integrity": "sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz", + "integrity": "sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q==", "dev": true }, "node_modules/color-convert": { @@ -5590,9 +5945,9 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" }, "node_modules/colorette": { - "version": "2.0.19", - "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.19.tgz", - "integrity": "sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ==", + "version": "2.0.20", + "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz", + "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==", "dev": true }, "node_modules/combined-stream": { @@ -5615,10 +5970,26 @@ "node": ">= 6" } }, + "node_modules/comment-json": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/comment-json/-/comment-json-4.2.3.tgz", + "integrity": "sha512-SsxdiOf064DWoZLH799Ata6u7iV658A11PlWtZATDlXPpKGJnbJZ5Z24ybixAi+LUUqJ/GKowAejtC5GFUG7Tw==", + "dev": true, + "dependencies": { + "array-timsort": "^1.0.3", + "core-util-is": "^1.0.3", + "esprima": "^4.0.1", + "has-own-prop": "^2.0.0", + "repeat-string": "^1.6.1" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/compare-versions": { - "version": "5.0.3", - "resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-5.0.3.tgz", - "integrity": "sha512-4UZlZP8Z99MGEY+Ovg/uJxJuvoXuN4M6B3hKaiackiHrgzQFEe3diJi1mf1PNHbFujM7FvLrK2bpgIaImbtZ1A==", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-6.1.0.tgz", + "integrity": "sha512-LNZQXhqUvqUTotpZ00qLSaify3b4VFD588aRr8MKFw4CMUr98ytzCW5wDH5qx/DEY5kCDXcbcRuCqL0szEf2tg==", "optional": true }, "node_modules/component-emitter": { @@ -5669,9 +6040,9 @@ } }, "node_modules/convert-source-map": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz", - "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", + "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", "dev": true }, "node_modules/cookie": { @@ -5688,20 +6059,57 @@ "integrity": "sha512-LDx6oHrK+PhzLKJU9j5S7/Y3jM/mUHvD/DeI1WQmJn652iPC5Y4TBzC9l+5OMOXlyTTA+SmVUPm0HQUwpD5Jqw==", "dev": true }, + "node_modules/core-util-is": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz", + "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==", + "dev": true + }, "node_modules/cosmiconfig": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.1.0.tgz", - "integrity": "sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==", + "version": "8.3.6", + "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.3.6.tgz", + "integrity": "sha512-kcZ6+W5QzcJ3P1Mt+83OUv/oHFqZHIx8DuxG6eZ5RGMERoLqp4BuGjhHLYGK+Kf5XVkQvqBSmAy/nGWN3qDgEA==", "dev": true, "dependencies": { - "@types/parse-json": "^4.0.0", - "import-fresh": "^3.2.1", - "parse-json": "^5.0.0", - "path-type": "^4.0.0", - "yaml": "^1.10.0" + "import-fresh": "^3.3.0", + "js-yaml": "^4.1.0", + "parse-json": "^5.2.0", + "path-type": "^4.0.0" }, "engines": { - "node": ">=10" + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/d-fischer" + }, + "peerDependencies": { + "typescript": ">=4.9.5" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/create-jest": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/create-jest/-/create-jest-29.7.0.tgz", + "integrity": "sha512-Adz2bdH0Vq3F53KEMJOoftQFutWCukm6J24wbPWRO4k1kMY7gS7ds/uoJkNuV8wDCtWWnuwGcJwpWcih+zEW1Q==", + "dev": true, + "dependencies": { + "@jest/types": "^29.6.3", + "chalk": "^4.0.0", + "exit": "^0.1.2", + "graceful-fs": "^4.2.9", + "jest-config": "^29.7.0", + "jest-util": "^29.7.0", + "prompts": "^2.0.1" + }, + "bin": { + "create-jest": "bin/create-jest.js" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/create-require": { @@ -5711,9 +6119,9 @@ "devOptional": true }, "node_modules/cron-parser": { - "version": "4.7.1", - "resolved": "https://registry.npmjs.org/cron-parser/-/cron-parser-4.7.1.tgz", - "integrity": "sha512-WguFaoQ0hQ61SgsCZLHUcNbAvlK0lypKXu62ARguefYmjzaOXIVRNrAmyXzabTwUn4sQvQLkk6bjH+ipGfw8bA==", + "version": "4.9.0", + "resolved": "https://registry.npmjs.org/cron-parser/-/cron-parser-4.9.0.tgz", + "integrity": "sha512-p0SaNjrHOnQeR8/VnfGbmg9te2kfyYSQ7Sc/j/6DtPL3JQvKxmjO9TSjNFpujqV3vEYYBvNNvXSxzyksBWAx1Q==", "peer": true, "dependencies": { "luxon": "^3.2.1" @@ -5726,7 +6134,6 @@ "version": "7.0.3", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", - "dev": true, "dependencies": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", @@ -5737,14 +6144,14 @@ } }, "node_modules/css-select": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz", - "integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/css-select/-/css-select-5.1.0.tgz", + "integrity": "sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg==", "dependencies": { "boolbase": "^1.0.0", - "css-what": "^6.0.1", - "domhandler": "^4.3.1", - "domutils": "^2.8.0", + "css-what": "^6.1.0", + "domhandler": "^5.0.2", + "domutils": "^3.0.1", "nth-check": "^2.0.1" }, "funding": { @@ -5776,15 +6183,13 @@ "node": ">= 10" } }, - "node_modules/dataloader": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/dataloader/-/dataloader-1.4.0.tgz", - "integrity": "sha512-68s5jYdlvasItOJnCuI2Q9s4q98g0pCyL3HrcKJu8KNugUl8ahgmZYg38ysLTgQjjXX3H8CJLkAvWrclWfcalw==" - }, "node_modules/date-fns": { - "version": "2.29.3", - "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.29.3.tgz", - "integrity": "sha512-dDCnyH2WnnKusqvZZ6+jA1O51Ibt8ZMRNkDZdyAyK4YfbDwa/cEmuztzG5pk6hqlp9aSBPYcjOlktquahGwGeA==", + "version": "2.30.0", + "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.30.0.tgz", + "integrity": "sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==", + "dependencies": { + "@babel/runtime": "^7.21.0" + }, "engines": { "node": ">=0.11" }, @@ -5803,9 +6208,9 @@ } }, "node_modules/dayjs": { - "version": "1.11.7", - "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.7.tgz", - "integrity": "sha512-+Yw9U6YO5TQohxLcIkrXBeY73WP3ejHWVvx8XCk3gxvQDCTEmS48ZrSZCKciI7Bhl/uCMyxYtE9UqRILmFphkQ==" + "version": "1.11.10", + "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.10.tgz", + "integrity": "sha512-vjAczensTgRcqDERK0SR2XMwsF/tSvnvlv6VcF2GIhg6Sx4yOIt/irsr1RDJsKiIyBzJDpCoXiWWq28MqH2cnQ==" }, "node_modules/debug": { "version": "4.3.4", @@ -5824,10 +6229,18 @@ } }, "node_modules/dedent": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz", - "integrity": "sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==", - "dev": true + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.5.1.tgz", + "integrity": "sha512-+LxW+KLWxu3HW3M2w2ympwtqPrqYRzU8fqi6Fhd18fBALe15blJPI/I4+UHveMVG6lJqB4JNd4UG0S5cnVHwIg==", + "dev": true, + "peerDependencies": { + "babel-plugin-macros": "^3.1.0" + }, + "peerDependenciesMeta": { + "babel-plugin-macros": { + "optional": true + } + } }, "node_modules/deep-is": { "version": "0.1.4", @@ -5836,75 +6249,245 @@ "devOptional": true }, "node_modules/deepmerge": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.0.tgz", - "integrity": "sha512-z2wJZXrmeHdvYJp/Ux55wIjqo81G5Bp4c+oELTW+7ar6SogWHajt5a9gO3s3IDaGSAXjDk0vlQKN3rms8ab3og==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz", + "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==", "dev": true, "engines": { "node": ">=0.10.0" } }, - "node_modules/defaults": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.4.tgz", - "integrity": "sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==", + "node_modules/default-browser": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/default-browser/-/default-browser-4.0.0.tgz", + "integrity": "sha512-wX5pXO1+BrhMkSbROFsyxUm0i/cJEScyNhA4PPxc41ICuv05ZZB/MX28s8aZx6xjmatvebIapF6hLEKEcpneUA==", "dev": true, "dependencies": { - "clone": "^1.0.2" + "bundle-name": "^3.0.0", + "default-browser-id": "^3.0.0", + "execa": "^7.1.1", + "titleize": "^3.0.0" + }, + "engines": { + "node": ">=14.16" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/delayed-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", - "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", + "node_modules/default-browser-id": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/default-browser-id/-/default-browser-id-3.0.0.tgz", + "integrity": "sha512-OZ1y3y0SqSICtE8DE4S8YOE9UZOJ8wO16fKWVP5J1Qz42kV9jcnMVFrEE/noXb/ss3Q4pZIH79kxofzyNNtUNA==", + "dev": true, + "dependencies": { + "bplist-parser": "^0.2.0", + "untildify": "^4.0.0" + }, "engines": { - "node": ">=0.4.0" + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/denque": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/denque/-/denque-2.1.0.tgz", - "integrity": "sha512-HVQE3AAb/pxF8fQAoiqpvg9i3evqug3hoiwakOyZAwJm+6vZehbkYXZ0l4JxS+I3QxM97v5aaRNhj8v5oBhekw==", - "peer": true, + "node_modules/default-browser/node_modules/execa": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-7.2.0.tgz", + "integrity": "sha512-UduyVP7TLB5IcAQl+OzLyLcS/l32W/GLg+AhHJ+ow40FOk2U3SAllPwR44v4vmdFwIWqpdwxxpQbF1n5ta9seA==", + "dev": true, + "dependencies": { + "cross-spawn": "^7.0.3", + "get-stream": "^6.0.1", + "human-signals": "^4.3.0", + "is-stream": "^3.0.0", + "merge-stream": "^2.0.0", + "npm-run-path": "^5.1.0", + "onetime": "^6.0.0", + "signal-exit": "^3.0.7", + "strip-final-newline": "^3.0.0" + }, "engines": { - "node": ">=0.10" + "node": "^14.18.0 || ^16.14.0 || >=18.0.0" + }, + "funding": { + "url": "https://github.com/sindresorhus/execa?sponsor=1" } }, - "node_modules/depd": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", - "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", + "node_modules/default-browser/node_modules/human-signals": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-4.3.1.tgz", + "integrity": "sha512-nZXjEF2nbo7lIw3mgYjItAfgQXog3OjJogSbKa2CQIIvSGWcKgeJnQlNXip6NglNzYH45nSRiEVimMvYL8DDqQ==", + "dev": true, "engines": { - "node": ">= 0.8" + "node": ">=14.18.0" } }, - "node_modules/detect-libc": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz", - "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==", - "bin": { - "detect-libc": "bin/detect-libc.js" - }, + "node_modules/default-browser/node_modules/is-stream": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-3.0.0.tgz", + "integrity": "sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==", + "dev": true, "engines": { - "node": ">=0.10" + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/detect-newline": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz", - "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==", + "node_modules/default-browser/node_modules/mimic-fn": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-4.0.0.tgz", + "integrity": "sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==", "dev": true, "engines": { - "node": ">=8" + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/detect-node": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.0.4.tgz", - "integrity": "sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==" + "node_modules/default-browser/node_modules/npm-run-path": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.1.0.tgz", + "integrity": "sha512-sJOdmRGrY2sjNTRMbSvluQqg+8X7ZK61yvzBEIDhz4f8z1TZFYABsqjjCBd/0PUNE9M6QDgHJXQkGUEm7Q+l9Q==", + "dev": true, + "dependencies": { + "path-key": "^4.0.0" + }, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/default-browser/node_modules/onetime": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-6.0.0.tgz", + "integrity": "sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==", + "dev": true, + "dependencies": { + "mimic-fn": "^4.0.0" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/default-browser/node_modules/path-key": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-4.0.0.tgz", + "integrity": "sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/default-browser/node_modules/strip-final-newline": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-3.0.0.tgz", + "integrity": "sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/defaults": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.4.tgz", + "integrity": "sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==", + "dev": true, + "dependencies": { + "clone": "^1.0.2" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/define-data-property": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.1.tgz", + "integrity": "sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==", + "dev": true, + "dependencies": { + "get-intrinsic": "^1.2.1", + "gopd": "^1.0.1", + "has-property-descriptors": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/define-lazy-prop": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-3.0.0.tgz", + "integrity": "sha512-N+MeXYoqr3pOgn8xfyRPREN7gHakLYjhsHhWGT3fWAiL4IkAt0iDw14QiiEm2bE30c5XX5q0FtAA3CK5f9/BUg==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/denque": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/denque/-/denque-2.1.0.tgz", + "integrity": "sha512-HVQE3AAb/pxF8fQAoiqpvg9i3evqug3hoiwakOyZAwJm+6vZehbkYXZ0l4JxS+I3QxM97v5aaRNhj8v5oBhekw==", + "peer": true, + "engines": { + "node": ">=0.10" + } + }, + "node_modules/depd": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", + "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/detect-libc": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz", + "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==", + "bin": { + "detect-libc": "bin/detect-libc.js" + }, + "engines": { + "node": ">=0.10" + } + }, + "node_modules/detect-newline": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz", + "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/detect-node": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz", + "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==" }, "node_modules/dezalgo": { "version": "1.0.4", @@ -5926,12 +6509,12 @@ } }, "node_modules/diff-sequences": { - "version": "28.1.1", - "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-28.1.1.tgz", - "integrity": "sha512-FU0iFaH/E23a+a718l8Qa/19bF9p06kgE0KipMOMadwa3SjnaElKzPaUC0vnibs6/B/9ni97s61mcejk8W1fQw==", + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz", + "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==", "dev": true, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/dir-glob": { @@ -5959,13 +6542,13 @@ } }, "node_modules/dom-serializer": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz", - "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz", + "integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==", "dependencies": { - "domelementtype": "^2.0.1", - "domhandler": "^4.2.0", - "entities": "^2.0.0" + "domelementtype": "^2.3.0", + "domhandler": "^5.0.2", + "entities": "^4.2.0" }, "funding": { "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1" @@ -5983,11 +6566,11 @@ ] }, "node_modules/domhandler": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz", - "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==", + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz", + "integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==", "dependencies": { - "domelementtype": "^2.2.0" + "domelementtype": "^2.3.0" }, "engines": { "node": ">= 4" @@ -5997,24 +6580,27 @@ } }, "node_modules/domutils": { - "version": "2.8.0", - "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz", - "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.1.0.tgz", + "integrity": "sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==", "dependencies": { - "dom-serializer": "^1.0.1", - "domelementtype": "^2.2.0", - "domhandler": "^4.2.0" + "dom-serializer": "^2.0.0", + "domelementtype": "^2.3.0", + "domhandler": "^5.0.3" }, "funding": { "url": "https://github.com/fb55/domutils?sponsor=1" } }, "node_modules/dotenv": { - "version": "16.0.3", - "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.0.3.tgz", - "integrity": "sha512-7GO6HghkA5fYG9TYnNxi14/7K9f5occMlp3zXAuSxn7CKCxt9xbNWG7yF8hTCSUchlfWSe3uLmlPfigevRItzQ==", + "version": "16.3.1", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.3.1.tgz", + "integrity": "sha512-IPzF4w4/Rd94bA9imS68tZBaYyBWSCE47V1RGuMrB94iyTOIEwRmVL2x/4An+6mETpLrKJ5hQkB8W4kFAadeIQ==", "engines": { "node": ">=12" + }, + "funding": { + "url": "https://github.com/motdotla/dotenv?sponsor=1" } }, "node_modules/dotenv-expand": { @@ -6026,58 +6612,69 @@ } }, "node_modules/dprint-node": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/dprint-node/-/dprint-node-1.0.7.tgz", - "integrity": "sha512-NTZOW9A7ipb0n7z7nC3wftvsbceircwVHSgzobJsEQa+7RnOMbhrfX5IflA6CtC4GA63DSAiHYXa4JKEy9F7cA==", + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/dprint-node/-/dprint-node-1.0.8.tgz", + "integrity": "sha512-iVKnUtYfGrYcW1ZAlfR/F59cUVL8QIhWoBJoSjkkdua/dkWIgjZfiLMeTjiB06X0ZLkQ0M2C1VbUj/CxkIf1zg==", "dependencies": { "detect-libc": "^1.0.3" } }, + "node_modules/eastasianwidth": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", + "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==" + }, "node_modules/editorconfig": { - "version": "0.15.3", - "resolved": "https://registry.npmjs.org/editorconfig/-/editorconfig-0.15.3.tgz", - "integrity": "sha512-M9wIMFx96vq0R4F+gRpY3o2exzb8hEj/n9S8unZtHSvYjibBp/iMufSzvmOcV/laG0ZtuTVGtiJggPOSW2r93g==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/editorconfig/-/editorconfig-1.0.4.tgz", + "integrity": "sha512-L9Qe08KWTlqYMVvMcTIvMAdl1cDUubzRNYL+WfA4bLDMHe4nemKkpmYzkznE1FwLKu0EEmy6obgQKzMJrg4x9Q==", "dependencies": { - "commander": "^2.19.0", - "lru-cache": "^4.1.5", - "semver": "^5.6.0", - "sigmund": "^1.0.1" + "@one-ini/wasm": "0.1.1", + "commander": "^10.0.0", + "minimatch": "9.0.1", + "semver": "^7.5.3" }, "bin": { "editorconfig": "bin/editorconfig" + }, + "engines": { + "node": ">=14" } }, - "node_modules/editorconfig/node_modules/commander": { - "version": "2.20.3", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", - "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==" - }, - "node_modules/editorconfig/node_modules/lru-cache": { - "version": "4.1.5", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz", - "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==", + "node_modules/editorconfig/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", "dependencies": { - "pseudomap": "^1.0.2", - "yallist": "^2.1.2" + "balanced-match": "^1.0.0" } }, - "node_modules/editorconfig/node_modules/semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", - "bin": { - "semver": "bin/semver" + "node_modules/editorconfig/node_modules/commander": { + "version": "10.0.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz", + "integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==", + "engines": { + "node": ">=14" } }, - "node_modules/editorconfig/node_modules/yallist": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", - "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==" + "node_modules/editorconfig/node_modules/minimatch": { + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.1.tgz", + "integrity": "sha512-0jWhJpD/MdhPXwPuiRkCbfYfSKp2qnn2eOc279qI7f+osl/l+prKSrvhg157zSYvx/1nmgn2NqdT6k2Z7zSH9w==", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } }, "node_modules/electron-to-chromium": { - "version": "1.4.284", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz", - "integrity": "sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==", + "version": "1.4.574", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.574.tgz", + "integrity": "sha512-bg1m8L0n02xRzx4LsTTMbBPiUd9yIR+74iPtS/Ao65CuXvhVZHP0ym1kSdDG3yHFDXqHQQBKujlN1AQ8qZnyFg==", "dev": true }, "node_modules/elliptic": { @@ -6095,9 +6692,9 @@ } }, "node_modules/emittery": { - "version": "0.10.2", - "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.10.2.tgz", - "integrity": "sha512-aITqOwnLanpHLNXZJENbOgjUBeHocD+xsSJmNrjovKBW5HbSpW3d1pEls7GFQPUWXiwG9+0P4GtHfEqC/4M0Iw==", + "version": "0.13.1", + "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.13.1.tgz", + "integrity": "sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==", "dev": true, "engines": { "node": ">=12" @@ -6115,14 +6712,15 @@ "version": "1.4.4", "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", + "devOptional": true, "dependencies": { "once": "^1.4.0" } }, "node_modules/enhanced-resolve": { - "version": "5.12.0", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz", - "integrity": "sha512-QHTXI/sZQmko1cbDoNAa3mJ5qhWUUNAq3vR0/YiD379fWQrcfuoX1+HW2S0MTt7XmoPLapdaDKUtelUSPic7hQ==", + "version": "5.15.0", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz", + "integrity": "sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==", "dev": true, "dependencies": { "graceful-fs": "^4.2.4", @@ -6133,9 +6731,12 @@ } }, "node_modules/entities": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz", - "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==", + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", + "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==", + "engines": { + "node": ">=0.12" + }, "funding": { "url": "https://github.com/fb55/entities?sponsor=1" } @@ -6150,9 +6751,9 @@ } }, "node_modules/es-module-lexer": { - "version": "0.9.3", - "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz", - "integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.3.1.tgz", + "integrity": "sha512-JUFAyicQV9mXc3YRxPnDlrfBKpqt6hUYzz9/boprUJHs4e4KVr3XwOF70doO6gwXUor6EWZJAyWAfKki84t20Q==", "dev": true }, "node_modules/es6-promise": { @@ -6197,49 +6798,48 @@ } }, "node_modules/eslint": { - "version": "8.33.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.33.0.tgz", - "integrity": "sha512-WjOpFQgKK8VrCnAtl8We0SUOy/oVZ5NHykyMiagV1M9r8IFpIJX7DduK6n1mpfhlG7T1NLWm2SuD8QB7KFySaA==", + "version": "8.52.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.52.0.tgz", + "integrity": "sha512-zh/JHnaixqHZsolRB/w9/02akBk9EPrOs9JwcTP2ek7yL5bVvXuRariiaAjjoJ5DvuwQ1WAE/HsMz+w17YgBCg==", "dev": true, "dependencies": { - "@eslint/eslintrc": "^1.4.1", - "@humanwhocodes/config-array": "^0.11.8", + "@eslint-community/eslint-utils": "^4.2.0", + "@eslint-community/regexpp": "^4.6.1", + "@eslint/eslintrc": "^2.1.2", + "@eslint/js": "8.52.0", + "@humanwhocodes/config-array": "^0.11.13", "@humanwhocodes/module-importer": "^1.0.1", "@nodelib/fs.walk": "^1.2.8", - "ajv": "^6.10.0", + "@ungap/structured-clone": "^1.2.0", + "ajv": "^6.12.4", "chalk": "^4.0.0", "cross-spawn": "^7.0.2", "debug": "^4.3.2", "doctrine": "^3.0.0", "escape-string-regexp": "^4.0.0", - "eslint-scope": "^7.1.1", - "eslint-utils": "^3.0.0", - "eslint-visitor-keys": "^3.3.0", - "espree": "^9.4.0", - "esquery": "^1.4.0", + "eslint-scope": "^7.2.2", + "eslint-visitor-keys": "^3.4.3", + "espree": "^9.6.1", + "esquery": "^1.4.2", "esutils": "^2.0.2", "fast-deep-equal": "^3.1.3", "file-entry-cache": "^6.0.1", "find-up": "^5.0.0", "glob-parent": "^6.0.2", "globals": "^13.19.0", - "grapheme-splitter": "^1.0.4", + "graphemer": "^1.4.0", "ignore": "^5.2.0", - "import-fresh": "^3.0.0", "imurmurhash": "^0.1.4", "is-glob": "^4.0.0", "is-path-inside": "^3.0.3", - "js-sdsl": "^4.1.4", "js-yaml": "^4.1.0", "json-stable-stringify-without-jsonify": "^1.0.1", "levn": "^0.4.1", "lodash.merge": "^4.6.2", "minimatch": "^3.1.2", "natural-compare": "^1.4.0", - "optionator": "^0.9.1", - "regexpp": "^3.2.0", + "optionator": "^0.9.3", "strip-ansi": "^6.0.1", - "strip-json-comments": "^3.1.0", "text-table": "^0.2.0" }, "bin": { @@ -6253,9 +6853,9 @@ } }, "node_modules/eslint-config-prettier": { - "version": "8.6.0", - "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.6.0.tgz", - "integrity": "sha512-bAF0eLpLVqP5oEVUFKpMA+NnRFICwn9X8B5jrR9FcqnYBuPbqWEjTEspPWMj5ye6czoSLDweCzSo3Ko7gGrZaA==", + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-9.0.0.tgz", + "integrity": "sha512-IcJsTkJae2S35pRsRAwoCE+925rJJStOdkKnLVgtE+tEpqU0EVVM7OqrwxqgptKdX29NUwC82I5pXsGFIgSevw==", "dev": true, "bin": { "eslint-config-prettier": "bin/cli.js" @@ -6265,73 +6865,60 @@ } }, "node_modules/eslint-plugin-prettier": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-4.2.1.tgz", - "integrity": "sha512-f/0rXLXUt0oFYs8ra4w49wYZBG5GKZpAYsJSm6rnYL5uVDjd+zowwMwVZHnAjf4edNrKpCDYfXDgmRE/Ak7QyQ==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.0.1.tgz", + "integrity": "sha512-m3u5RnR56asrwV/lDC4GHorlW75DsFfmUcjfCYylTUs85dBRnB7VM6xG8eCMJdeDRnppzmxZVf1GEPJvl1JmNg==", "dev": true, "dependencies": { - "prettier-linter-helpers": "^1.0.0" + "prettier-linter-helpers": "^1.0.0", + "synckit": "^0.8.5" }, "engines": { - "node": ">=12.0.0" + "node": "^14.18.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/prettier" }, "peerDependencies": { - "eslint": ">=7.28.0", - "prettier": ">=2.0.0" + "@types/eslint": ">=8.0.0", + "eslint": ">=8.0.0", + "prettier": ">=3.0.0" }, "peerDependenciesMeta": { + "@types/eslint": { + "optional": true + }, "eslint-config-prettier": { "optional": true } } }, "node_modules/eslint-scope": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", - "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", + "version": "7.2.2", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz", + "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==", "dev": true, "dependencies": { "esrecurse": "^4.3.0", - "estraverse": "^4.1.1" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/eslint-utils": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz", - "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==", - "dev": true, - "dependencies": { - "eslint-visitor-keys": "^2.0.0" + "estraverse": "^5.2.0" }, "engines": { - "node": "^10.0.0 || ^12.0.0 || >= 14.0.0" + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" }, "funding": { - "url": "https://github.com/sponsors/mysticatea" - }, - "peerDependencies": { - "eslint": ">=5" - } - }, - "node_modules/eslint-utils/node_modules/eslint-visitor-keys": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz", - "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==", - "dev": true, - "engines": { - "node": ">=10" + "url": "https://opencollective.com/eslint" } }, "node_modules/eslint-visitor-keys": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz", - "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==", + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", + "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" } }, "node_modules/eslint/node_modules/ajv": { @@ -6350,44 +6937,6 @@ "url": "https://github.com/sponsors/epoberezkin" } }, - "node_modules/eslint/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, - "node_modules/eslint/node_modules/eslint-scope": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz", - "integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==", - "dev": true, - "dependencies": { - "esrecurse": "^4.3.0", - "estraverse": "^5.2.0" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - } - }, - "node_modules/eslint/node_modules/estraverse": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", - "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", - "dev": true, - "engines": { - "node": ">=4.0" - } - }, "node_modules/eslint/node_modules/glob-parent": { "version": "6.0.2", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", @@ -6407,14 +6956,14 @@ "dev": true }, "node_modules/espree": { - "version": "9.4.1", - "resolved": "https://registry.npmjs.org/espree/-/espree-9.4.1.tgz", - "integrity": "sha512-XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg==", + "version": "9.6.1", + "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz", + "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==", "dev": true, "dependencies": { - "acorn": "^8.8.0", + "acorn": "^8.9.0", "acorn-jsx": "^5.3.2", - "eslint-visitor-keys": "^3.3.0" + "eslint-visitor-keys": "^3.4.1" }, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -6437,9 +6986,9 @@ } }, "node_modules/esquery": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz", - "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz", + "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==", "dev": true, "dependencies": { "estraverse": "^5.1.0" @@ -6448,15 +6997,6 @@ "node": ">=0.10" } }, - "node_modules/esquery/node_modules/estraverse": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", - "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", - "dev": true, - "engines": { - "node": ">=4.0" - } - }, "node_modules/esrecurse": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", @@ -6469,7 +7009,7 @@ "node": ">=4.0" } }, - "node_modules/esrecurse/node_modules/estraverse": { + "node_modules/estraverse": { "version": "5.3.0", "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", @@ -6478,15 +7018,6 @@ "node": ">=4.0" } }, - "node_modules/estraverse": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", - "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", - "dev": true, - "engines": { - "node": ">=4.0" - } - }, "node_modules/esutils": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", @@ -6545,19 +7076,19 @@ } }, "node_modules/expect": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/expect/-/expect-28.1.3.tgz", - "integrity": "sha512-eEh0xn8HlsuOBxFgIss+2mX85VAS4Qy3OSkjV7rlBWljtA4oWH37glVGyOZSZvErDT/yBywZdPGwCXuTvSG85g==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/expect/-/expect-29.7.0.tgz", + "integrity": "sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==", "dev": true, "dependencies": { - "@jest/expect-utils": "^28.1.3", - "jest-get-type": "^28.0.2", - "jest-matcher-utils": "^28.1.3", - "jest-message-util": "^28.1.3", - "jest-util": "^28.1.3" + "@jest/expect-utils": "^29.7.0", + "jest-get-type": "^29.6.3", + "jest-matcher-utils": "^29.7.0", + "jest-message-util": "^29.7.0", + "jest-util": "^29.7.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/external-editor": { @@ -6610,14 +7141,14 @@ } }, "node_modules/fast-content-type-parse": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fast-content-type-parse/-/fast-content-type-parse-1.0.0.tgz", - "integrity": "sha512-Xbc4XcysUXcsP5aHUU7Nq3OwvHq97C+WnbkeIefpeYLX+ryzFJlU6OStFJhs6Ol0LkUGpcK+wL0JwfM+FCU5IA==" + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/fast-content-type-parse/-/fast-content-type-parse-1.1.0.tgz", + "integrity": "sha512-fBHHqSTFLVnR61C+gltJuE5GkVQMV0S2nqUO8TJ+5Z3qAKG8vAx4FKai1s5jq/inV1+sREynIWSuQ6HgoSXpDQ==" }, "node_modules/fast-copy": { - "version": "2.1.7", - "resolved": "https://registry.npmjs.org/fast-copy/-/fast-copy-2.1.7.tgz", - "integrity": "sha512-ozrGwyuCTAy7YgFCua8rmqmytECYk/JYAMXcswOcm0qvGoE3tPb7ivBeIHTOK2DiapBhDZgacIhzhQIKU5TCfA==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/fast-copy/-/fast-copy-3.0.1.tgz", + "integrity": "sha512-Knr7NOtK3HWRYGtHoJrjkaWepqT8thIVGAwt0p0aUs1zqkAzXZV4vo9fFNwyb5fcqK1GKYFYxldQdIDVKhUAfA==", "dev": true }, "node_modules/fast-decode-uri-component": { @@ -6631,15 +7162,15 @@ "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" }, "node_modules/fast-diff": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.2.0.tgz", - "integrity": "sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.3.0.tgz", + "integrity": "sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==", "dev": true }, "node_modules/fast-glob": { - "version": "3.2.12", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz", - "integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==", + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.1.tgz", + "integrity": "sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==", "dev": true, "dependencies": { "@nodelib/fs.stat": "^2.0.2", @@ -6659,15 +7190,16 @@ "dev": true }, "node_modules/fast-json-stringify": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/fast-json-stringify/-/fast-json-stringify-5.5.0.tgz", - "integrity": "sha512-rmw2Z8/mLkND8zI+3KTYIkNPEoF5v6GqDP/o+g7H3vjdWjBwuKpgAYFHIzL6ORRB+iqDjjtJnLIW9Mzxn5szOA==", + "version": "5.9.0", + "resolved": "https://registry.npmjs.org/fast-json-stringify/-/fast-json-stringify-5.9.0.tgz", + "integrity": "sha512-hXu5mchOrV7r1wzY2na0VEJZbb2gUAv5Mrlnq1QvdhZHt8k3pYnwZ6YEVbasbvPc1Ki+FyeTRJW8yDN9jN40yQ==", "dependencies": { "@fastify/deepmerge": "^1.0.0", "ajv": "^8.10.0", "ajv-formats": "^2.1.1", "fast-deep-equal": "^3.1.3", "fast-uri": "^2.1.0", + "json-schema-ref-resolver": "^1.0.1", "rfdc": "^1.2.0" } }, @@ -6678,17 +7210,17 @@ "dev": true }, "node_modules/fast-querystring": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/fast-querystring/-/fast-querystring-1.1.0.tgz", - "integrity": "sha512-LWkjBCZlxjnSanuPpZ6mHswjy8hQv3VcPJsQB3ltUF2zjvrycr0leP3TSTEEfvQ1WEMSRl5YNsGqaft9bjLqEw==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/fast-querystring/-/fast-querystring-1.1.2.tgz", + "integrity": "sha512-g6KuKWmFXc0fID8WWH0jit4g0AGBoJhCkJMb1RmbsSEUNvQ+ZC8D6CUZ+GtF8nMzSPXnhiePyyqqipzNNEnHjg==", "dependencies": { "fast-decode-uri-component": "^1.0.1" } }, "node_modules/fast-redact": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/fast-redact/-/fast-redact-3.1.2.tgz", - "integrity": "sha512-+0em+Iya9fKGfEQGcd62Yv6onjBmmhV1uh86XVfOU8VwAe6kaFdQCWI9s0/Nnugx5Vd9tdbZ7e6gE2tR9dzXdw==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/fast-redact/-/fast-redact-3.3.0.tgz", + "integrity": "sha512-6T5V1QK1u4oF+ATxs1lWUmlEk6P2T9HqJG3e2DnHOdVgZy2rFJBoEnrIedcTXlkAHU/zKC+7KETJ+KGGKwxgMQ==", "engines": { "node": ">=6" } @@ -6699,51 +7231,58 @@ "integrity": "sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==" }, "node_modules/fast-uri": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-2.2.0.tgz", - "integrity": "sha512-cIusKBIt/R/oI6z/1nyfe2FvGKVTohVRfvkOhvx0nCEW+xf5NoCXjAHcWp93uOUBchzYcsvPlrapAdX1uW+YGg==" + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-2.3.0.tgz", + "integrity": "sha512-eel5UKGn369gGEWOqBShmFJWfq/xSJvsgDzgLYC845GneayWvXBf0lJCBn5qTABfewy1ZDPoaR5OZCP+kssfuw==" }, "node_modules/fast-xml-parser": { - "version": "4.0.11", - "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.0.11.tgz", - "integrity": "sha512-4aUg3aNRR/WjQAcpceODG1C3x3lFANXRo8+1biqfieHmg9pyMt7qB4lQV/Ta6sJCTbA5vfD8fnA8S54JATiFUA==", + "version": "4.2.5", + "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.2.5.tgz", + "integrity": "sha512-B9/wizE4WngqQftFPmdaMYlXoJlJOYxGQOanC77fq9k8+Z0v5dDSVh+3glErdIROP//s/jgb7ZuxKfB8nVyo0g==", + "funding": [ + { + "type": "paypal", + "url": "https://paypal.me/naturalintelligence" + }, + { + "type": "github", + "url": "https://github.com/sponsors/NaturalIntelligence" + } + ], "dependencies": { "strnum": "^1.0.5" }, "bin": { "fxparser": "src/cli/cli.js" - }, - "funding": { - "type": "paypal", - "url": "https://paypal.me/naturalintelligence" } }, "node_modules/fastify": { - "version": "4.12.0", - "resolved": "https://registry.npmjs.org/fastify/-/fastify-4.12.0.tgz", - "integrity": "sha512-Hh2GCsOCqnOuewWSvqXlpq5V/9VA+/JkVoooQWUhrU6gryO9+/UGOoF/dprGcKSDxkM/9TkMXSffYp8eA/YhYQ==", + "version": "4.24.3", + "resolved": "https://registry.npmjs.org/fastify/-/fastify-4.24.3.tgz", + "integrity": "sha512-6HHJ+R2x2LS3y1PqxnwEIjOTZxFl+8h4kSC/TuDPXtA+v2JnV9yEtOsNSKK1RMD7sIR2y1ZsA4BEFaid/cK5pg==", "dependencies": { - "@fastify/ajv-compiler": "^3.3.1", - "@fastify/error": "^3.0.0", - "@fastify/fast-json-stringify-compiler": "^4.1.0", + "@fastify/ajv-compiler": "^3.5.0", + "@fastify/error": "^3.4.0", + "@fastify/fast-json-stringify-compiler": "^4.3.0", "abstract-logging": "^2.0.1", - "avvio": "^8.2.0", - "fast-content-type-parse": "^1.0.0", - "find-my-way": "^7.3.0", - "light-my-request": "^5.6.1", - "pino": "^8.5.0", - "process-warning": "^2.0.0", + "avvio": "^8.2.1", + "fast-content-type-parse": "^1.1.0", + "fast-json-stringify": "^5.8.0", + "find-my-way": "^7.7.0", + "light-my-request": "^5.11.0", + "pino": "^8.16.0", + "process-warning": "^2.2.0", "proxy-addr": "^2.0.7", "rfdc": "^1.3.0", - "secure-json-parse": "^2.5.0", - "semver": "^7.3.7", - "tiny-lru": "^10.0.0" + "secure-json-parse": "^2.7.0", + "semver": "^7.5.4", + "toad-cache": "^3.3.0" } }, "node_modules/fastify-plugin": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/fastify-plugin/-/fastify-plugin-4.5.0.tgz", - "integrity": "sha512-79ak0JxddO0utAXAQ5ccKhvs6vX2MGyHHMMsmZkBANrq3hXc1CHzvNPHOcvTsVMEPl5I+NT+RO4YKMGehOfSIg==" + "version": "4.5.1", + "resolved": "https://registry.npmjs.org/fastify-plugin/-/fastify-plugin-4.5.1.tgz", + "integrity": "sha512-stRHYGeuqpEZTL1Ef0Ovr2ltazUT9g844X5z/zEBFLG8RYlpDiOCIG+ATvYEp+/zmc7sN29mcIMp8gvYplYPIQ==" }, "node_modules/fastq": { "version": "1.15.0", @@ -6819,9 +7358,9 @@ } }, "node_modules/find-my-way": { - "version": "7.4.0", - "resolved": "https://registry.npmjs.org/find-my-way/-/find-my-way-7.4.0.tgz", - "integrity": "sha512-JFT7eURLU5FumlZ3VBGnveId82cZz7UR7OUu+THQJOwdQXxmS/g8v0KLoFhv97HreycOrmAbqjXD/4VG2j0uMQ==", + "version": "7.7.0", + "resolved": "https://registry.npmjs.org/find-my-way/-/find-my-way-7.7.0.tgz", + "integrity": "sha512-+SrHpvQ52Q6W9f3wJoJBbAQULJuNEEQwBvlvYwACDhBTLOTMiQ0HYWh4+vC3OivGP2ENcTI1oKlFA2OepJNjhQ==", "dependencies": { "fast-deep-equal": "^3.1.3", "fast-querystring": "^1.0.0", @@ -6848,28 +7387,64 @@ } }, "node_modules/flat-cache": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz", - "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.1.1.tgz", + "integrity": "sha512-/qM2b3LUIaIgviBQovTLvijfyOQXPtSRnRK26ksj2J7rzPIecePUIpJsZ4T02Qg+xiAEKIs5K8dsHEd+VaKa/Q==", "dev": true, "dependencies": { - "flatted": "^3.1.0", + "flatted": "^3.2.9", + "keyv": "^4.5.3", "rimraf": "^3.0.2" }, "engines": { - "node": "^10.12.0 || >=12.0.0" + "node": ">=12.0.0" + } + }, + "node_modules/flat-cache/node_modules/glob": { + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "dev": true, + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.1.1", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/flat-cache/node_modules/rimraf": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "dev": true, + "dependencies": { + "glob": "^7.1.3" + }, + "bin": { + "rimraf": "bin.js" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" } }, "node_modules/flatted": { - "version": "3.2.7", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz", - "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==", + "version": "3.2.9", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.9.tgz", + "integrity": "sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==", "dev": true }, "node_modules/follow-redirects": { - "version": "1.15.2", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz", - "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==", + "version": "1.15.3", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.3.tgz", + "integrity": "sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q==", "funding": [ { "type": "individual", @@ -6885,16 +7460,42 @@ } } }, + "node_modules/foreground-child": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz", + "integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==", + "dependencies": { + "cross-spawn": "^7.0.0", + "signal-exit": "^4.0.1" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/foreground-child/node_modules/signal-exit": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", + "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, "node_modules/fork-ts-checker-webpack-plugin": { - "version": "7.2.14", - "resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-7.2.14.tgz", - "integrity": "sha512-Tg2feh/n8k486KX0EbXVUfJj3j0xnnbKYTJw0fnIb2QdV0+lblOYZSal5ed9hARoWVwKeOC7sYE2EakSRLo5ZA==", + "version": "9.0.2", + "resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-9.0.2.tgz", + "integrity": "sha512-Uochze2R8peoN1XqlSi/rGUkDQpRogtLFocP9+PGu68zk1BDAKXfdeCdyVZpgTk8V8WFVQXdEz426VKjXLO1Gg==", "dev": true, "dependencies": { "@babel/code-frame": "^7.16.7", "chalk": "^4.1.2", "chokidar": "^3.5.3", - "cosmiconfig": "^7.0.1", + "cosmiconfig": "^8.2.0", "deepmerge": "^4.2.2", "fs-extra": "^10.0.0", "memfs": "^3.4.1", @@ -6910,43 +7511,19 @@ }, "peerDependencies": { "typescript": ">3.6.0", - "vue-template-compiler": "*", "webpack": "^5.11.0" - }, - "peerDependenciesMeta": { - "vue-template-compiler": { - "optional": true - } - } - }, - "node_modules/fork-ts-checker-webpack-plugin/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" } }, - "node_modules/fork-ts-checker-webpack-plugin/node_modules/fs-extra": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", - "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", + "node_modules/fork-ts-checker-webpack-plugin/node_modules/memfs": { + "version": "3.5.3", + "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.5.3.tgz", + "integrity": "sha512-UERzLsxzllchadvbPs5aolHh65ISpKpM+ccLbOJ8/vvpBKmAWf+la7dXFy7Mr0ySHbdHrFv5kGFCUHHe6GFEmw==", "dev": true, "dependencies": { - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" + "fs-monkey": "^1.0.4" }, "engines": { - "node": ">=12" + "node": ">= 4.0.0" } }, "node_modules/form-data": { @@ -6986,9 +7563,9 @@ } }, "node_modules/fs-extra": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.0.tgz", - "integrity": "sha512-0rcTq621PD5jM/e0a3EJoGC/1TC5ZBCERW82LQuwfGnCa1V8w7dpYH1yNu+SLb6E5dkeCBzKEyLGlFrnr+dUyw==", + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", + "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", "dev": true, "dependencies": { "graceful-fs": "^4.2.0", @@ -6996,13 +7573,13 @@ "universalify": "^2.0.0" }, "engines": { - "node": ">=14.14" + "node": ">=12" } }, "node_modules/fs-monkey": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.3.tgz", - "integrity": "sha512-cybjIfiiE+pTWicSCLFHSrXZ6EilF30oh91FDP9S2B051prEa7QWfrVTQm10/dDpswBDXZugPa1Ogu8Yh+HV0Q==", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.5.tgz", + "integrity": "sha512-8uMbBjrhzW76TYgEV27Y5E//W2f/lTFmx78P2w19FZSxarhI/798APGQyuGCwmkNxgwGRhrLfvWyLBvNtuOmew==", "dev": true }, "node_modules/fs.realpath": { @@ -7011,9 +7588,9 @@ "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==" }, "node_modules/fsevents": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", - "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", + "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", "hasInstallScript": true, "optional": true, "os": [ @@ -7024,10 +7601,13 @@ } }, "node_modules/function-bind": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", - "dev": true + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", + "dev": true, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } }, "node_modules/generic-pool": { "version": "3.9.0", @@ -7055,14 +7635,15 @@ } }, "node_modules/get-intrinsic": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.0.tgz", - "integrity": "sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q==", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.2.tgz", + "integrity": "sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==", "dev": true, "dependencies": { - "function-bind": "^1.1.1", - "has": "^1.0.3", - "has-symbols": "^1.0.3" + "function-bind": "^1.1.2", + "has-proto": "^1.0.1", + "has-symbols": "^1.0.3", + "hasown": "^2.0.0" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -7144,9 +7725,9 @@ } }, "node_modules/globals": { - "version": "13.20.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz", - "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==", + "version": "13.23.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.23.0.tgz", + "integrity": "sha512-XAmF0RjlrjY23MA51q3HltdlGxUpXPvg0GioKiD9X6HD28iMjo2dKC8Vqwm7lne4GNr78+RHTfliktR6ZH09wA==", "dev": true, "dependencies": { "type-fest": "^0.20.2" @@ -7183,25 +7764,37 @@ "resolved": "https://registry.npmjs.org/google-protobuf/-/google-protobuf-3.21.2.tgz", "integrity": "sha512-3MSOYFO5U9mPGikIYCzK0SaThypfGgS6bHqrUGXG3DPHCrb+txNqeEcns1W0lkGfk0rCyNXm7xB9rMxnCiZOoA==" }, + "node_modules/gopd": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", + "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==", + "dev": true, + "dependencies": { + "get-intrinsic": "^1.1.3" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/graceful-fs": { - "version": "4.2.10", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", - "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", + "version": "4.2.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", + "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", "dev": true }, - "node_modules/grapheme-splitter": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz", - "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==", + "node_modules/graphemer": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz", + "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", "dev": true }, "node_modules/handlebars": { - "version": "4.7.7", - "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.7.tgz", - "integrity": "sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA==", + "version": "4.7.8", + "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.8.tgz", + "integrity": "sha512-vafaFqs8MZkRrSX7sFVUdo3ap/eNiLnb4IakshzvP56X5Nr1iGKAIqdX6tMlm6HcNRIkr6AxO5jFEoJzzpT8aQ==", "dependencies": { "minimist": "^1.2.5", - "neo-async": "^2.6.0", + "neo-async": "^2.6.2", "source-map": "^0.6.1", "wordwrap": "^1.0.0" }, @@ -7223,18 +7816,6 @@ "node": ">=0.10.0" } }, - "node_modules/has": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", - "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", - "dev": true, - "dependencies": { - "function-bind": "^1.1.1" - }, - "engines": { - "node": ">= 0.4.0" - } - }, "node_modules/has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", @@ -7243,6 +7824,39 @@ "node": ">=8" } }, + "node_modules/has-own-prop": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/has-own-prop/-/has-own-prop-2.0.0.tgz", + "integrity": "sha512-Pq0h+hvsVm6dDEa8x82GnLSYHOzNDt7f0ddFa3FqcQlgzEiptPqL+XrOJNavjOzSYiYWIrgeVYYgGlLmnxwilQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/has-property-descriptors": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.1.tgz", + "integrity": "sha512-VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg==", + "dev": true, + "dependencies": { + "get-intrinsic": "^1.2.2" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-proto": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz", + "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==", + "dev": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/has-symbols": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", @@ -7264,6 +7878,18 @@ "minimalistic-assert": "^1.0.1" } }, + "node_modules/hasown": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.0.tgz", + "integrity": "sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==", + "dev": true, + "dependencies": { + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/he": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", @@ -7273,11 +7899,11 @@ } }, "node_modules/helmet": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/helmet/-/helmet-6.0.1.tgz", - "integrity": "sha512-8wo+VdQhTMVBMCITYZaGTbE4lvlthelPYSvoyNvk4RECTmrVjMerp9RfUOQXZWLvCcAn1pKj7ZRxK4lI9Alrcw==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/helmet/-/helmet-7.0.0.tgz", + "integrity": "sha512-MsIgYmdBh460ZZ8cJC81q4XJknjG567wzEmv46WOBblDb6TUd3z8/GhgmsM9pn8g2B80tAJ4m5/d3Bi1KrSUBQ==", "engines": { - "node": ">=14.0.0" + "node": ">=16.0.0" } }, "node_modules/help-me": { @@ -7290,24 +7916,11 @@ "readable-stream": "^3.6.0" } }, - "node_modules/help-me/node_modules/readable-stream": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", - "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", - "dev": true, - "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - }, - "engines": { - "node": ">= 6" - } - }, "node_modules/hexoid": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/hexoid/-/hexoid-1.0.0.tgz", "integrity": "sha512-QFLV0taWQOZtvIRIAdBChesmogZrtuXvVWsFHZTk2SU+anspqZ2vMnoLg7IE1+Uk16N19APic1BuF8bC8c2m5g==", + "dev": true, "engines": { "node": ">=8" } @@ -7362,9 +7975,9 @@ "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==" }, "node_modules/htmlparser2": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz", - "integrity": "sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==", + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-8.0.2.tgz", + "integrity": "sha512-GYdjWKDkbRLkZ5geuHs5NY1puJ+PXwP7+fHPRz06Eirsb9ugf6d8kkXav6ADhcODhFFPMIXyxkxSuMf3D6NCFA==", "funding": [ "https://github.com/fb55/htmlparser2?sponsor=1", { @@ -7373,10 +7986,10 @@ } ], "dependencies": { - "domelementtype": "^2.0.1", - "domhandler": "^4.0.0", - "domutils": "^2.5.2", - "entities": "^2.0.0" + "domelementtype": "^2.3.0", + "domhandler": "^5.0.3", + "domutils": "^3.0.1", + "entities": "^4.4.0" } }, "node_modules/http-errors": { @@ -7416,6 +8029,15 @@ "node": ">=10.17.0" } }, + "node_modules/hyperdyperid": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/hyperdyperid/-/hyperdyperid-1.2.0.tgz", + "integrity": "sha512-Y93lCzHYgGWdrJ66yIktxiaGULYc6oGiABxhcO5AufBeOyoIdZF7bIfLaOrbM0iGIOXQQgxxRrFEnb+Y6w1n4A==", + "dev": true, + "engines": { + "node": ">=10.18" + } + }, "node_modules/iconv-lite": { "version": "0.4.24", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", @@ -7520,63 +8142,31 @@ "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==" }, "node_modules/inquirer": { - "version": "7.3.3", - "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.3.3.tgz", - "integrity": "sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==", + "version": "8.2.6", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-8.2.6.tgz", + "integrity": "sha512-M1WuAmb7pn9zdFRtQYk26ZBoY043Sse0wVDdk4Bppr+JOXyQYybdtvK+l9wUibhtjdjvtoiNy8tk+EgsYIUqKg==", "dev": true, "dependencies": { "ansi-escapes": "^4.2.1", - "chalk": "^4.1.0", + "chalk": "^4.1.1", "cli-cursor": "^3.1.0", "cli-width": "^3.0.0", "external-editor": "^3.0.3", "figures": "^3.0.0", - "lodash": "^4.17.19", + "lodash": "^4.17.21", "mute-stream": "0.0.8", + "ora": "^5.4.1", "run-async": "^2.4.0", - "rxjs": "^6.6.0", + "rxjs": "^7.5.5", "string-width": "^4.1.0", "strip-ansi": "^6.0.0", - "through": "^2.3.6" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/inquirer/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, - "node_modules/inquirer/node_modules/rxjs": { - "version": "6.6.7", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", - "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", - "dev": true, - "dependencies": { - "tslib": "^1.9.0" + "through": "^2.3.6", + "wrap-ansi": "^6.0.1" }, "engines": { - "npm": ">=2.0.0" + "node": ">=12.0.0" } }, - "node_modules/inquirer/node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", - "dev": true - }, "node_modules/interpret": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz", @@ -7645,26 +8235,41 @@ } }, "node_modules/is-core-module": { - "version": "2.11.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz", - "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==", + "version": "2.13.1", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz", + "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==", "dev": true, "dependencies": { - "has": "^1.0.3" + "hasown": "^2.0.0" }, "funding": { "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/is-extglob": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-fullwidth-code-point": { + "node_modules/is-docker": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-3.0.0.tgz", + "integrity": "sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ==", + "dev": true, + "bin": { + "is-docker": "cli.js" + }, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-fullwidth-code-point": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", @@ -7692,6 +8297,24 @@ "node": ">=0.10.0" } }, + "node_modules/is-inside-container": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-inside-container/-/is-inside-container-1.0.0.tgz", + "integrity": "sha512-KIYLCCJghfHZxqjYBE7rEy0OBuTd5xCHS7tHVgvCLkx7StIoaxwNW3hCALgEUjFfeRk+MG/Qxmp/vtETEF3tRA==", + "dev": true, + "dependencies": { + "is-docker": "^3.0.0" + }, + "bin": { + "is-inside-container": "cli.js" + }, + "engines": { + "node": ">=14.16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/is-interactive": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz", @@ -7748,6 +8371,33 @@ "integrity": "sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==", "optional": true }, + "node_modules/is-wsl": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz", + "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==", + "dev": true, + "dependencies": { + "is-docker": "^2.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/is-wsl/node_modules/is-docker": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz", + "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==", + "dev": true, + "bin": { + "is-docker": "cli.js" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/is2": { "version": "2.0.9", "resolved": "https://registry.npmjs.org/is2/-/is2-2.0.9.tgz", @@ -7771,8 +8421,7 @@ "node_modules/isexe": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", - "dev": true + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==" }, "node_modules/istanbul-lib-coverage": { "version": "3.2.0", @@ -7784,42 +8433,33 @@ } }, "node_modules/istanbul-lib-instrument": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz", - "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.1.tgz", + "integrity": "sha512-EAMEJBsYuyyztxMxW3g7ugGPkrZsV57v0Hmv3mm1uQsmB+QnZuepg731CRaIgeUVSdmsTngOkSnauNF8p7FIhA==", "dev": true, "dependencies": { "@babel/core": "^7.12.3", "@babel/parser": "^7.14.7", "@istanbuljs/schema": "^0.1.2", "istanbul-lib-coverage": "^3.2.0", - "semver": "^6.3.0" + "semver": "^7.5.4" }, "engines": { - "node": ">=8" - } - }, - "node_modules/istanbul-lib-instrument/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true, - "bin": { - "semver": "bin/semver.js" + "node": ">=10" } }, "node_modules/istanbul-lib-report": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz", - "integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz", + "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==", "dev": true, "dependencies": { "istanbul-lib-coverage": "^3.0.0", - "make-dir": "^3.0.0", + "make-dir": "^4.0.0", "supports-color": "^7.1.0" }, "engines": { - "node": ">=8" + "node": ">=10" } }, "node_modules/istanbul-lib-source-maps": { @@ -7846,9 +8486,9 @@ } }, "node_modules/istanbul-reports": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.5.tgz", - "integrity": "sha512-nUsEMa9pBt/NOHqbcbeJEgqIlY/K7rVWUX6Lql2orY5e9roQOthbR3vtY4zzf2orPELg80fnxxk9zUyPlgwD1w==", + "version": "3.1.6", + "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.6.tgz", + "integrity": "sha512-TLgnMkKg3iTDsQ9PbPTdpfAK2DzjF9mqUG7RMgcQl8oFjad8ob4laGxv5XV5U9MAfx8D6tSJiUyuAwzLicaxlg==", "dev": true, "dependencies": { "html-escaper": "^2.0.0", @@ -7866,22 +8506,39 @@ "node": ">=6" } }, + "node_modules/jackspeak": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.6.tgz", + "integrity": "sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==", + "dependencies": { + "@isaacs/cliui": "^8.0.2" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + }, + "optionalDependencies": { + "@pkgjs/parseargs": "^0.11.0" + } + }, "node_modules/jest": { - "version": "28.1.2", - "resolved": "https://registry.npmjs.org/jest/-/jest-28.1.2.tgz", - "integrity": "sha512-Tuf05DwLeCh2cfWCQbcz9UxldoDyiR1E9Igaei5khjonKncYdc6LDfynKCEWozK0oLE3GD+xKAo2u8x/0s6GOg==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest/-/jest-29.7.0.tgz", + "integrity": "sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==", "dev": true, "dependencies": { - "@jest/core": "^28.1.2", - "@jest/types": "^28.1.1", + "@jest/core": "^29.7.0", + "@jest/types": "^29.6.3", "import-local": "^3.0.2", - "jest-cli": "^28.1.2" + "jest-cli": "^29.7.0" }, "bin": { "jest": "bin/jest.js" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" }, "peerDependencies": { "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0" @@ -7893,88 +8550,73 @@ } }, "node_modules/jest-changed-files": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-28.1.3.tgz", - "integrity": "sha512-esaOfUWJXk2nfZt9SPyC8gA1kNfdKLkQWyzsMlqq8msYSlNKfmZxfRgZn4Cd4MGVUF+7v6dBs0d5TOAKa7iIiA==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.7.0.tgz", + "integrity": "sha512-fEArFiwf1BpQ+4bXSprcDc3/x4HSzL4al2tozwVpDFpsxALjLYdyiIK4e5Vz66GQJIbXJ82+35PtysofptNX2w==", "dev": true, "dependencies": { "execa": "^5.0.0", + "jest-util": "^29.7.0", "p-limit": "^3.1.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-circus": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-28.1.3.tgz", - "integrity": "sha512-cZ+eS5zc79MBwt+IhQhiEp0OeBddpc1n8MBo1nMB8A7oPMKEO+Sre+wHaLJexQUj9Ya/8NOBY0RESUgYjB6fow==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.7.0.tgz", + "integrity": "sha512-3E1nCMgipcTkCocFwM90XXQab9bS+GMsjdpmPrlelaxwD93Ad8iVEjX/vvHPdLPnFf+L40u+5+iutRdA1N9myw==", "dev": true, "dependencies": { - "@jest/environment": "^28.1.3", - "@jest/expect": "^28.1.3", - "@jest/test-result": "^28.1.3", - "@jest/types": "^28.1.3", + "@jest/environment": "^29.7.0", + "@jest/expect": "^29.7.0", + "@jest/test-result": "^29.7.0", + "@jest/types": "^29.6.3", "@types/node": "*", "chalk": "^4.0.0", "co": "^4.6.0", - "dedent": "^0.7.0", + "dedent": "^1.0.0", "is-generator-fn": "^2.0.0", - "jest-each": "^28.1.3", - "jest-matcher-utils": "^28.1.3", - "jest-message-util": "^28.1.3", - "jest-runtime": "^28.1.3", - "jest-snapshot": "^28.1.3", - "jest-util": "^28.1.3", + "jest-each": "^29.7.0", + "jest-matcher-utils": "^29.7.0", + "jest-message-util": "^29.7.0", + "jest-runtime": "^29.7.0", + "jest-snapshot": "^29.7.0", + "jest-util": "^29.7.0", "p-limit": "^3.1.0", - "pretty-format": "^28.1.3", + "pretty-format": "^29.7.0", + "pure-rand": "^6.0.0", "slash": "^3.0.0", "stack-utils": "^2.0.3" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/jest-circus/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-cli": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-28.1.3.tgz", - "integrity": "sha512-roY3kvrv57Azn1yPgdTebPAXvdR2xfezaKKYzVxZ6It/5NCxzJym6tUI5P1zkdWhfUYkxEI9uZWcQdaFLo8mJQ==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.7.0.tgz", + "integrity": "sha512-OVVobw2IubN/GSYsxETi+gOe7Ka59EFMR/twOU3Jb2GnKKeMGJB5SGUUrEz3SFVmJASUdZUzy83sLNNQ2gZslg==", "dev": true, "dependencies": { - "@jest/core": "^28.1.3", - "@jest/test-result": "^28.1.3", - "@jest/types": "^28.1.3", + "@jest/core": "^29.7.0", + "@jest/test-result": "^29.7.0", + "@jest/types": "^29.6.3", "chalk": "^4.0.0", + "create-jest": "^29.7.0", "exit": "^0.1.2", - "graceful-fs": "^4.2.9", "import-local": "^3.0.2", - "jest-config": "^28.1.3", - "jest-util": "^28.1.3", - "jest-validate": "^28.1.3", - "prompts": "^2.0.1", + "jest-config": "^29.7.0", + "jest-util": "^29.7.0", + "jest-validate": "^29.7.0", "yargs": "^17.3.1" }, "bin": { "jest": "bin/jest.js" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" }, "peerDependencies": { "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0" @@ -7985,85 +8627,37 @@ } } }, - "node_modules/jest-cli/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, - "node_modules/jest-cli/node_modules/cliui": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", - "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", - "dev": true, - "dependencies": { - "string-width": "^4.2.0", - "strip-ansi": "^6.0.1", - "wrap-ansi": "^7.0.0" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/jest-cli/node_modules/yargs": { - "version": "17.6.2", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.6.2.tgz", - "integrity": "sha512-1/9UrdHjDZc0eOU0HxOHoS78C69UD3JRMvzlJ7S79S2nTaWRA/whGCTV8o9e/N/1Va9YIV7Q4sOxD8VV4pCWOw==", - "dev": true, - "dependencies": { - "cliui": "^8.0.1", - "escalade": "^3.1.1", - "get-caller-file": "^2.0.5", - "require-directory": "^2.1.1", - "string-width": "^4.2.3", - "y18n": "^5.0.5", - "yargs-parser": "^21.1.1" - }, - "engines": { - "node": ">=12" - } - }, "node_modules/jest-config": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-28.1.3.tgz", - "integrity": "sha512-MG3INjByJ0J4AsNBm7T3hsuxKQqFIiRo/AUqb1q9LRKI5UU6Aar9JHbr9Ivn1TVwfUD9KirRoM/T6u8XlcQPHQ==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.7.0.tgz", + "integrity": "sha512-uXbpfeQ7R6TZBqI3/TxCU4q4ttk3u0PJeC+E0zbfSoSjq6bJ7buBPxzQPL0ifrkY4DNu4JUdk0ImlBUYi840eQ==", "dev": true, "dependencies": { "@babel/core": "^7.11.6", - "@jest/test-sequencer": "^28.1.3", - "@jest/types": "^28.1.3", - "babel-jest": "^28.1.3", + "@jest/test-sequencer": "^29.7.0", + "@jest/types": "^29.6.3", + "babel-jest": "^29.7.0", "chalk": "^4.0.0", "ci-info": "^3.2.0", "deepmerge": "^4.2.2", "glob": "^7.1.3", "graceful-fs": "^4.2.9", - "jest-circus": "^28.1.3", - "jest-environment-node": "^28.1.3", - "jest-get-type": "^28.0.2", - "jest-regex-util": "^28.0.2", - "jest-resolve": "^28.1.3", - "jest-runner": "^28.1.3", - "jest-util": "^28.1.3", - "jest-validate": "^28.1.3", + "jest-circus": "^29.7.0", + "jest-environment-node": "^29.7.0", + "jest-get-type": "^29.6.3", + "jest-regex-util": "^29.6.3", + "jest-resolve": "^29.7.0", + "jest-runner": "^29.7.0", + "jest-util": "^29.7.0", + "jest-validate": "^29.7.0", "micromatch": "^4.0.4", "parse-json": "^5.2.0", - "pretty-format": "^28.1.3", + "pretty-format": "^29.7.0", "slash": "^3.0.0", "strip-json-comments": "^3.1.1" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" }, "peerDependencies": { "@types/node": "*", @@ -8078,22 +8672,6 @@ } } }, - "node_modules/jest-config/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, "node_modules/jest-config/node_modules/glob": { "version": "7.2.3", "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", @@ -8115,222 +8693,159 @@ } }, "node_modules/jest-diff": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-28.1.3.tgz", - "integrity": "sha512-8RqP1B/OXzjjTWkqMX67iqgwBVJRgCyKD3L9nq+6ZqJMdvjE8RgHktqZ6jNrkdMT+dJuYNI3rhQpxaz7drJHfw==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz", + "integrity": "sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==", "dev": true, "dependencies": { "chalk": "^4.0.0", - "diff-sequences": "^28.1.1", - "jest-get-type": "^28.0.2", - "pretty-format": "^28.1.3" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/jest-diff/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" + "diff-sequences": "^29.6.3", + "jest-get-type": "^29.6.3", + "pretty-format": "^29.7.0" }, "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-docblock": { - "version": "28.1.1", - "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-28.1.1.tgz", - "integrity": "sha512-3wayBVNiOYx0cwAbl9rwm5kKFP8yHH3d/fkEaL02NPTkDojPtheGB7HZSFY4wzX+DxyrvhXz0KSCVksmCknCuA==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-29.7.0.tgz", + "integrity": "sha512-q617Auw3A612guyaFgsbFeYpNP5t2aoUNLwBUbc/0kD1R4t9ixDbyFTHd1nok4epoVFpr7PmeWHrhvuV3XaJ4g==", "dev": true, "dependencies": { "detect-newline": "^3.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-each": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-28.1.3.tgz", - "integrity": "sha512-arT1z4sg2yABU5uogObVPvSlSMQlDA48owx07BDPAiasW0yYpYHYOo4HHLz9q0BVzDVU4hILFjzJw0So9aCL/g==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.7.0.tgz", + "integrity": "sha512-gns+Er14+ZrEoC5fhOfYCY1LOHHr0TI+rQUHZS8Ttw2l7gl+80eHc/gFf2Ktkw0+SIACDTeWvpFcv3B04VembQ==", "dev": true, "dependencies": { - "@jest/types": "^28.1.3", + "@jest/types": "^29.6.3", "chalk": "^4.0.0", - "jest-get-type": "^28.0.2", - "jest-util": "^28.1.3", - "pretty-format": "^28.1.3" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/jest-each/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" + "jest-get-type": "^29.6.3", + "jest-util": "^29.7.0", + "pretty-format": "^29.7.0" }, "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-environment-node": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-28.1.3.tgz", - "integrity": "sha512-ugP6XOhEpjAEhGYvp5Xj989ns5cB1K6ZdjBYuS30umT4CQEETaxSiPcZ/E1kFktX4GkrcM4qu07IIlDYX1gp+A==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.7.0.tgz", + "integrity": "sha512-DOSwCRqXirTOyheM+4d5YZOrWcdu0LNZ87ewUoywbcb2XR4wKgqiG8vNeYwhjFMbEkfju7wx2GYH0P2gevGvFw==", "dev": true, "dependencies": { - "@jest/environment": "^28.1.3", - "@jest/fake-timers": "^28.1.3", - "@jest/types": "^28.1.3", + "@jest/environment": "^29.7.0", + "@jest/fake-timers": "^29.7.0", + "@jest/types": "^29.6.3", "@types/node": "*", - "jest-mock": "^28.1.3", - "jest-util": "^28.1.3" + "jest-mock": "^29.7.0", + "jest-util": "^29.7.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-get-type": { - "version": "28.0.2", - "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-28.0.2.tgz", - "integrity": "sha512-ioj2w9/DxSYHfOm5lJKCdcAmPJzQXmbM/Url3rhlghrPvT3tt+7a/+oXc9azkKmLvoiXjtV83bEWqi+vs5nlPA==", + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz", + "integrity": "sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==", "dev": true, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-haste-map": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-28.1.3.tgz", - "integrity": "sha512-3S+RQWDXccXDKSWnkHa/dPwt+2qwA8CJzR61w3FoYCvoo3Pn8tvGcysmMF0Bj0EX5RYvAI2EIvC57OmotfdtKA==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.7.0.tgz", + "integrity": "sha512-fP8u2pyfqx0K1rGn1R9pyE0/KTn+G7PxktWidOBTqFPLYX0b9ksaMFkhK5vrS3DVun09pckLdlx90QthlW7AmA==", "dev": true, "dependencies": { - "@jest/types": "^28.1.3", + "@jest/types": "^29.6.3", "@types/graceful-fs": "^4.1.3", "@types/node": "*", "anymatch": "^3.0.3", "fb-watchman": "^2.0.0", "graceful-fs": "^4.2.9", - "jest-regex-util": "^28.0.2", - "jest-util": "^28.1.3", - "jest-worker": "^28.1.3", + "jest-regex-util": "^29.6.3", + "jest-util": "^29.7.0", + "jest-worker": "^29.7.0", "micromatch": "^4.0.4", "walker": "^1.0.8" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" }, "optionalDependencies": { "fsevents": "^2.3.2" } }, "node_modules/jest-leak-detector": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-28.1.3.tgz", - "integrity": "sha512-WFVJhnQsiKtDEo5lG2mM0v40QWnBM+zMdHHyJs8AWZ7J0QZJS59MsyKeJHWhpBZBH32S48FOVvGyOFT1h0DlqA==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.7.0.tgz", + "integrity": "sha512-kYA8IJcSYtST2BY9I+SMC32nDpBT3J2NvWJx8+JCuCdl/CR1I4EKUJROiP8XtCcxqgTTBGJNdbB1A8XRKbTetw==", "dev": true, "dependencies": { - "jest-get-type": "^28.0.2", - "pretty-format": "^28.1.3" + "jest-get-type": "^29.6.3", + "pretty-format": "^29.7.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-matcher-utils": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-28.1.3.tgz", - "integrity": "sha512-kQeJ7qHemKfbzKoGjHHrRKH6atgxMk8Enkk2iPQ3XwO6oE/KYD8lMYOziCkeSB9G4adPM4nR1DE8Tf5JeWH6Bw==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.7.0.tgz", + "integrity": "sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==", "dev": true, "dependencies": { "chalk": "^4.0.0", - "jest-diff": "^28.1.3", - "jest-get-type": "^28.0.2", - "pretty-format": "^28.1.3" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/jest-matcher-utils/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" + "jest-diff": "^29.7.0", + "jest-get-type": "^29.6.3", + "pretty-format": "^29.7.0" }, "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-message-util": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-28.1.3.tgz", - "integrity": "sha512-PFdn9Iewbt575zKPf1286Ht9EPoJmYT7P0kY+RibeYZ2XtOr53pDLEFoTWXbd1h4JiGiWpTBC84fc8xMXQMb7g==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.7.0.tgz", + "integrity": "sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==", "dev": true, "dependencies": { "@babel/code-frame": "^7.12.13", - "@jest/types": "^28.1.3", + "@jest/types": "^29.6.3", "@types/stack-utils": "^2.0.0", "chalk": "^4.0.0", "graceful-fs": "^4.2.9", "micromatch": "^4.0.4", - "pretty-format": "^28.1.3", + "pretty-format": "^29.7.0", "slash": "^3.0.0", "stack-utils": "^2.0.3" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/jest-message-util/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-mock": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-28.1.3.tgz", - "integrity": "sha512-o3J2jr6dMMWYVH4Lh/NKmDXdosrsJgi4AviS8oXLujcjpCMBb1FMsblDnOXKZKfSiHLxYub1eS0IHuRXsio9eA==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.7.0.tgz", + "integrity": "sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw==", "dev": true, "dependencies": { - "@jest/types": "^28.1.3", - "@types/node": "*" + "@jest/types": "^29.6.3", + "@types/node": "*", + "jest-util": "^29.7.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-pnp-resolver": { @@ -8351,109 +8866,77 @@ } }, "node_modules/jest-regex-util": { - "version": "28.0.2", - "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-28.0.2.tgz", - "integrity": "sha512-4s0IgyNIy0y9FK+cjoVYoxamT7Zeo7MhzqRGx7YDYmaQn1wucY9rotiGkBzzcMXTtjrCAP/f7f+E0F7+fxPNdw==", + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.6.3.tgz", + "integrity": "sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==", "dev": true, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-resolve": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-28.1.3.tgz", - "integrity": "sha512-Z1W3tTjE6QaNI90qo/BJpfnvpxtaFTFw5CDgwpyE/Kz8U/06N1Hjf4ia9quUhCh39qIGWF1ZuxFiBiJQwSEYKQ==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.7.0.tgz", + "integrity": "sha512-IOVhZSrg+UvVAshDSDtHyFCCBUl/Q3AAJv8iZ6ZjnZ74xzvwuzLXid9IIIPgTnY62SJjfuupMKZsZQRsCvxEgA==", "dev": true, "dependencies": { "chalk": "^4.0.0", "graceful-fs": "^4.2.9", - "jest-haste-map": "^28.1.3", + "jest-haste-map": "^29.7.0", "jest-pnp-resolver": "^1.2.2", - "jest-util": "^28.1.3", - "jest-validate": "^28.1.3", + "jest-util": "^29.7.0", + "jest-validate": "^29.7.0", "resolve": "^1.20.0", - "resolve.exports": "^1.1.0", + "resolve.exports": "^2.0.0", "slash": "^3.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-resolve-dependencies": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-28.1.3.tgz", - "integrity": "sha512-qa0QO2Q0XzQoNPouMbCc7Bvtsem8eQgVPNkwn9LnS+R2n8DaVDPL/U1gngC0LTl1RYXJU0uJa2BMC2DbTfFrHA==", - "dev": true, - "dependencies": { - "jest-regex-util": "^28.0.2", - "jest-snapshot": "^28.1.3" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/jest-resolve/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.7.0.tgz", + "integrity": "sha512-un0zD/6qxJ+S0et7WxeI3H5XSe9lTBBR7bOHCHXkKR6luG5mwDDlIzVQ0V5cZCuoTgEdcdwzTghYkTWfubi+nA==", "dev": true, "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" + "jest-regex-util": "^29.6.3", + "jest-snapshot": "^29.7.0" }, "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-runner": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-28.1.3.tgz", - "integrity": "sha512-GkMw4D/0USd62OVO0oEgjn23TM+YJa2U2Wu5zz9xsQB1MxWKDOlrnykPxnMsN0tnJllfLPinHTka61u0QhaxBA==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.7.0.tgz", + "integrity": "sha512-fsc4N6cPCAahybGBfTRcq5wFR6fpLznMg47sY5aDpsoejOcVYFb07AHuSnR0liMcPTgBsA3ZJL6kFOjPdoNipQ==", "dev": true, "dependencies": { - "@jest/console": "^28.1.3", - "@jest/environment": "^28.1.3", - "@jest/test-result": "^28.1.3", - "@jest/transform": "^28.1.3", - "@jest/types": "^28.1.3", + "@jest/console": "^29.7.0", + "@jest/environment": "^29.7.0", + "@jest/test-result": "^29.7.0", + "@jest/transform": "^29.7.0", + "@jest/types": "^29.6.3", "@types/node": "*", "chalk": "^4.0.0", - "emittery": "^0.10.2", + "emittery": "^0.13.1", "graceful-fs": "^4.2.9", - "jest-docblock": "^28.1.1", - "jest-environment-node": "^28.1.3", - "jest-haste-map": "^28.1.3", - "jest-leak-detector": "^28.1.3", - "jest-message-util": "^28.1.3", - "jest-resolve": "^28.1.3", - "jest-runtime": "^28.1.3", - "jest-util": "^28.1.3", - "jest-watcher": "^28.1.3", - "jest-worker": "^28.1.3", + "jest-docblock": "^29.7.0", + "jest-environment-node": "^29.7.0", + "jest-haste-map": "^29.7.0", + "jest-leak-detector": "^29.7.0", + "jest-message-util": "^29.7.0", + "jest-resolve": "^29.7.0", + "jest-runtime": "^29.7.0", + "jest-util": "^29.7.0", + "jest-watcher": "^29.7.0", + "jest-worker": "^29.7.0", "p-limit": "^3.1.0", "source-map-support": "0.5.13" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/jest-runner/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-runner/node_modules/source-map": { @@ -8476,58 +8959,42 @@ } }, "node_modules/jest-runtime": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-28.1.3.tgz", - "integrity": "sha512-NU+881ScBQQLc1JHG5eJGU7Ui3kLKrmwCPPtYsJtBykixrM2OhVQlpMmFWJjMyDfdkGgBMNjXCGB/ebzsgNGQw==", - "dev": true, - "dependencies": { - "@jest/environment": "^28.1.3", - "@jest/fake-timers": "^28.1.3", - "@jest/globals": "^28.1.3", - "@jest/source-map": "^28.1.2", - "@jest/test-result": "^28.1.3", - "@jest/transform": "^28.1.3", - "@jest/types": "^28.1.3", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.7.0.tgz", + "integrity": "sha512-gUnLjgwdGqW7B4LvOIkbKs9WGbn+QLqRQQ9juC6HndeDiezIwhDP+mhMwHWCEcfQ5RUXa6OPnFF8BJh5xegwwQ==", + "dev": true, + "dependencies": { + "@jest/environment": "^29.7.0", + "@jest/fake-timers": "^29.7.0", + "@jest/globals": "^29.7.0", + "@jest/source-map": "^29.6.3", + "@jest/test-result": "^29.7.0", + "@jest/transform": "^29.7.0", + "@jest/types": "^29.6.3", + "@types/node": "*", "chalk": "^4.0.0", "cjs-module-lexer": "^1.0.0", "collect-v8-coverage": "^1.0.0", - "execa": "^5.0.0", "glob": "^7.1.3", "graceful-fs": "^4.2.9", - "jest-haste-map": "^28.1.3", - "jest-message-util": "^28.1.3", - "jest-mock": "^28.1.3", - "jest-regex-util": "^28.0.2", - "jest-resolve": "^28.1.3", - "jest-snapshot": "^28.1.3", - "jest-util": "^28.1.3", + "jest-haste-map": "^29.7.0", + "jest-message-util": "^29.7.0", + "jest-mock": "^29.7.0", + "jest-regex-util": "^29.6.3", + "jest-resolve": "^29.7.0", + "jest-snapshot": "^29.7.0", + "jest-util": "^29.7.0", "slash": "^3.0.0", "strip-bom": "^4.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/jest-runtime/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, - "node_modules/jest-runtime/node_modules/glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "node_modules/jest-runtime/node_modules/glob": { + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", "dev": true, "dependencies": { "fs.realpath": "^1.0.0", @@ -8545,62 +9012,43 @@ } }, "node_modules/jest-snapshot": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-28.1.3.tgz", - "integrity": "sha512-4lzMgtiNlc3DU/8lZfmqxN3AYD6GGLbl+72rdBpXvcV+whX7mDrREzkPdp2RnmfIiWBg1YbuFSkXduF2JcafJg==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.7.0.tgz", + "integrity": "sha512-Rm0BMWtxBcioHr1/OX5YCP8Uov4riHvKPknOGs804Zg9JGZgmIBkbtlxJC/7Z4msKYVbIJtfU+tKb8xlYNfdkw==", "dev": true, "dependencies": { "@babel/core": "^7.11.6", "@babel/generator": "^7.7.2", + "@babel/plugin-syntax-jsx": "^7.7.2", "@babel/plugin-syntax-typescript": "^7.7.2", - "@babel/traverse": "^7.7.2", "@babel/types": "^7.3.3", - "@jest/expect-utils": "^28.1.3", - "@jest/transform": "^28.1.3", - "@jest/types": "^28.1.3", - "@types/babel__traverse": "^7.0.6", - "@types/prettier": "^2.1.5", + "@jest/expect-utils": "^29.7.0", + "@jest/transform": "^29.7.0", + "@jest/types": "^29.6.3", "babel-preset-current-node-syntax": "^1.0.0", "chalk": "^4.0.0", - "expect": "^28.1.3", + "expect": "^29.7.0", "graceful-fs": "^4.2.9", - "jest-diff": "^28.1.3", - "jest-get-type": "^28.0.2", - "jest-haste-map": "^28.1.3", - "jest-matcher-utils": "^28.1.3", - "jest-message-util": "^28.1.3", - "jest-util": "^28.1.3", + "jest-diff": "^29.7.0", + "jest-get-type": "^29.6.3", + "jest-matcher-utils": "^29.7.0", + "jest-message-util": "^29.7.0", + "jest-util": "^29.7.0", "natural-compare": "^1.4.0", - "pretty-format": "^28.1.3", - "semver": "^7.3.5" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/jest-snapshot/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" + "pretty-format": "^29.7.0", + "semver": "^7.5.3" }, "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-util": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-28.1.3.tgz", - "integrity": "sha512-XdqfpHwpcSRko/C35uLYFM2emRAltIIKZiJ9eAmhjsj0CqZMa0p1ib0R5fWIqGhn1a103DebTbpqIaP1qCQ6tQ==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz", + "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==", "dev": true, "dependencies": { - "@jest/types": "^28.1.3", + "@jest/types": "^29.6.3", "@types/node": "*", "chalk": "^4.0.0", "ci-info": "^3.2.0", @@ -8608,40 +9056,24 @@ "picomatch": "^2.2.3" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/jest-util/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-validate": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-28.1.3.tgz", - "integrity": "sha512-SZbOGBWEsaTxBGCOpsRWlXlvNkvTkY0XxRfh7zYmvd8uL5Qzyg0CHAXiXKROflh801quA6+/DsT4ODDthOC/OA==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.7.0.tgz", + "integrity": "sha512-ZB7wHqaRGVw/9hST/OuFUReG7M8vKeq0/J2egIGLdvjHCmYqGARhzXmtgi+gVeZ5uXFF219aOc3Ls2yLg27tkw==", "dev": true, "dependencies": { - "@jest/types": "^28.1.3", + "@jest/types": "^29.6.3", "camelcase": "^6.2.0", "chalk": "^4.0.0", - "jest-get-type": "^28.0.2", + "jest-get-type": "^29.6.3", "leven": "^3.1.0", - "pretty-format": "^28.1.3" + "pretty-format": "^29.7.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-validate/node_modules/camelcase": { @@ -8656,69 +9088,38 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/jest-validate/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, "node_modules/jest-watcher": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-28.1.3.tgz", - "integrity": "sha512-t4qcqj9hze+jviFPUN3YAtAEeFnr/azITXQEMARf5cMwKY2SMBRnCQTXLixTl20OR6mLh9KLMrgVJgJISym+1g==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.7.0.tgz", + "integrity": "sha512-49Fg7WXkU3Vl2h6LbLtMQ/HyB6rXSIX7SqvBLQmssRBGN9I0PNvPmAmCWSOY6SOvrjhI/F7/bGAv9RtnsPA03g==", "dev": true, "dependencies": { - "@jest/test-result": "^28.1.3", - "@jest/types": "^28.1.3", + "@jest/test-result": "^29.7.0", + "@jest/types": "^29.6.3", "@types/node": "*", "ansi-escapes": "^4.2.1", "chalk": "^4.0.0", - "emittery": "^0.10.2", - "jest-util": "^28.1.3", + "emittery": "^0.13.1", + "jest-util": "^29.7.0", "string-length": "^4.0.1" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/jest-watcher/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-worker": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-28.1.3.tgz", - "integrity": "sha512-CqRA220YV/6jCo8VWvAt1KKx6eek1VIHMPeLEbpcfSfkEeWyBNppynM/o6q+Wmw+sOhos2ml34wZbSX3G13//g==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.7.0.tgz", + "integrity": "sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==", "dev": true, "dependencies": { "@types/node": "*", + "jest-util": "^29.7.0", "merge-stream": "^2.0.0", "supports-color": "^8.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-worker/node_modules/supports-color": { @@ -8746,13 +9147,13 @@ } }, "node_modules/js-beautify": { - "version": "1.14.7", - "resolved": "https://registry.npmjs.org/js-beautify/-/js-beautify-1.14.7.tgz", - "integrity": "sha512-5SOX1KXPFKx+5f6ZrPsIPEY7NwKeQz47n3jm2i+XeHx9MoRsfQenlOP13FQhWvg8JRS0+XLO6XYUQ2GX+q+T9A==", + "version": "1.14.9", + "resolved": "https://registry.npmjs.org/js-beautify/-/js-beautify-1.14.9.tgz", + "integrity": "sha512-coM7xq1syLcMyuVGyToxcj2AlzhkDjmfklL8r0JgJ7A76wyGMpJ1oA35mr4APdYNO/o/4YY8H54NQIJzhMbhBg==", "dependencies": { "config-chain": "^1.1.13", - "editorconfig": "^0.15.3", - "glob": "^8.0.3", + "editorconfig": "^1.0.3", + "glob": "^8.1.0", "nopt": "^6.0.0" }, "bin": { @@ -8761,17 +9162,7 @@ "js-beautify": "js/bin/js-beautify.js" }, "engines": { - "node": ">=10" - } - }, - "node_modules/js-sdsl": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.3.0.tgz", - "integrity": "sha512-mifzlm2+5nZ+lEcLJMoBK0/IH/bDg8XnJfd/Wq6IP+xoCjLZsTOnV2QpxlVbX9bMnkl5PdEjNtBJ9Cj1NjifhQ==", - "dev": true, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/js-sdsl" + "node": ">=12" } }, "node_modules/js-tokens": { @@ -8803,12 +9194,73 @@ "node": ">=4" } }, + "node_modules/json-buffer": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", + "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", + "dev": true + }, + "node_modules/json-joy": { + "version": "9.7.0", + "resolved": "https://registry.npmjs.org/json-joy/-/json-joy-9.7.0.tgz", + "integrity": "sha512-TcIkX4xLWgzM+/jIJrfk/1wEXGxRYPBMHRENVZKuDQzOf3Cl+WvI4ykHwobddWhbpI7OLN2IBXwmFv7WTYO5AA==", + "dev": true, + "dependencies": { + "arg": "^5.0.2", + "hyperdyperid": "^1.2.0" + }, + "bin": { + "jj": "bin/jj.js", + "json-pack": "bin/json-pack.js", + "json-pack-test": "bin/json-pack-test.js", + "json-patch": "bin/json-patch.js", + "json-patch-test": "bin/json-patch-test.js", + "json-pointer": "bin/json-pointer.js", + "json-pointer-test": "bin/json-pointer-test.js", + "json-unpack": "bin/json-unpack.js" + }, + "engines": { + "node": ">=10.0" + }, + "funding": { + "url": "https://github.com/sponsors/streamich" + }, + "peerDependencies": { + "quill-delta": "^5", + "rxjs": "7", + "tslib": "2" + } + }, "node_modules/json-parse-even-better-errors": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", "dev": true }, + "node_modules/json-schema-ref-resolver": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json-schema-ref-resolver/-/json-schema-ref-resolver-1.0.1.tgz", + "integrity": "sha512-EJAj1pgHc1hxF6vo2Z3s69fMjO1INq6eGHXZ8Z6wCQeldCuwxGK9Sxf4/cScGn3FZubCVUehfWtcDM/PLteCQw==", + "dependencies": { + "fast-deep-equal": "^3.1.3" + } + }, + "node_modules/json-schema-resolver": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/json-schema-resolver/-/json-schema-resolver-2.0.0.tgz", + "integrity": "sha512-pJ4XLQP4Q9HTxl6RVDLJ8Cyh1uitSs0CzDBAz1uoJ4sRD/Bk7cFSXL1FUXDW3zJ7YnfliJx6eu8Jn283bpZ4Yg==", + "dependencies": { + "debug": "^4.1.1", + "rfdc": "^1.1.4", + "uri-js": "^4.2.2" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/Eomm/json-schema-resolver?sponsor=1" + } + }, "node_modules/json-schema-traverse": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", @@ -8850,15 +9302,15 @@ } }, "node_modules/juice": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/juice/-/juice-7.0.0.tgz", - "integrity": "sha512-AjKQX31KKN+uJs+zaf+GW8mBO/f/0NqSh2moTMyvwBY+4/lXIYTU8D8I2h6BAV3Xnz6GGsbalUyFqbYMe+Vh+Q==", + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/juice/-/juice-9.1.0.tgz", + "integrity": "sha512-odblShmPrUoHUwRuC8EmLji5bPP2MLO1GL+gt4XU3tT2ECmbSrrMjtMQaqg3wgMFP2zvUzdPZGfxc5Trk3Z+fQ==", "dependencies": { - "cheerio": "^1.0.0-rc.3", - "commander": "^5.1.0", + "cheerio": "^1.0.0-rc.12", + "commander": "^6.1.0", "mensch": "^0.3.4", "slick": "^1.12.2", - "web-resource-inliner": "^5.0.0" + "web-resource-inliner": "^6.0.1" }, "bin": { "juice": "bin/juice" @@ -8868,9 +9320,9 @@ } }, "node_modules/juice/node_modules/commander": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz", - "integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==", + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz", + "integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==", "engines": { "node": ">= 6" } @@ -8892,20 +9344,29 @@ } }, "node_modules/keycloak-connect": { - "version": "18.0.2", - "resolved": "https://registry.npmjs.org/keycloak-connect/-/keycloak-connect-18.0.2.tgz", - "integrity": "sha512-FH7XgkPDPDIdIYkPpfp2S3++pJU+roprLDqmbptl6rZHP8DYzCdI/5DdC/hLFCVVhLhEzxMBtZGoqqnZ4icYww==", + "version": "21.1.2", + "resolved": "https://registry.npmjs.org/keycloak-connect/-/keycloak-connect-21.1.2.tgz", + "integrity": "sha512-ydRauaPu3lIlug1xlweAkV4N0InYf8QhkeWz0jzmjEyuPD88DHkGSQ5NcGyySAhMPPvKHISj1dty1Zs2uVu+EQ==", "deprecated": "This package is deprecated and will be removed in the future. We will shortly provide more details on removal date, and recommended alternatives.", "dependencies": { "jwk-to-pem": "^2.0.0" }, "engines": { - "node": ">=12" + "node": ">=14" }, "optionalDependencies": { "chromedriver": "latest" } }, + "node_modules/keyv": { + "version": "4.5.4", + "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", + "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", + "dev": true, + "dependencies": { + "json-buffer": "3.0.1" + } + }, "node_modules/kleur": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz", @@ -8938,14 +9399,14 @@ } }, "node_modules/libphonenumber-js": { - "version": "1.10.19", - "resolved": "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.10.19.tgz", - "integrity": "sha512-MDZ1zLIkfSDZV5xBta3nuvbEOlsnKCPe4z5r3hyup/AXveevkl9A1eSWmLhd2FX4k7pJDe4MrLeQsux0HI/VWg==" + "version": "1.10.49", + "resolved": "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.10.49.tgz", + "integrity": "sha512-gvLtyC3tIuqfPzjvYLH9BmVdqzGDiSi4VjtWe2fAgSdBf0yt8yPmbNnRIHNbR5IdtVkm0ayGuzwQKTWmU0hdjQ==" }, "node_modules/light-my-request": { - "version": "5.8.0", - "resolved": "https://registry.npmjs.org/light-my-request/-/light-my-request-5.8.0.tgz", - "integrity": "sha512-4BtD5C+VmyTpzlDPCZbsatZMJVgUIciSOwYhJDCbLffPZ35KoDkDj4zubLeHDEb35b4kkPeEv5imbh+RJxK/Pg==", + "version": "5.11.0", + "resolved": "https://registry.npmjs.org/light-my-request/-/light-my-request-5.11.0.tgz", + "integrity": "sha512-qkFCeloXCOMpmEdZ/MV91P8AT4fjwFXWaAFz3lUeStM8RcoM1ks4J/F8r1b3r6y/H4u3ACEJ1T+Gv5bopj7oDA==", "dependencies": { "cookie": "^0.5.0", "process-warning": "^2.0.0", @@ -8992,6 +9453,13 @@ "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz", "integrity": "sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==" }, + "node_modules/lodash.clonedeep": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz", + "integrity": "sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==", + "dev": true, + "peer": true + }, "node_modules/lodash.defaults": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz", @@ -9010,6 +9478,13 @@ "integrity": "sha512-chi4NHZlZqZD18a0imDHnZPrDeBbTtVN7GXMwuGdRH9qotxAjYs3aVLKc7zNOG9eddR5Ksd8rvFEBc9SsggPpg==", "peer": true }, + "node_modules/lodash.isequal": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz", + "integrity": "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==", + "dev": true, + "peer": true + }, "node_modules/lodash.memoize": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz", @@ -9038,26 +9513,10 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/log-symbols/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, "node_modules/long": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/long/-/long-4.0.0.tgz", - "integrity": "sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==" + "version": "5.2.3", + "resolved": "https://registry.npmjs.org/long/-/long-5.2.3.tgz", + "integrity": "sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q==" }, "node_modules/lower-case": { "version": "1.1.4", @@ -9074,18 +9533,18 @@ } }, "node_modules/luxon": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.2.1.tgz", - "integrity": "sha512-QrwPArQCNLAKGO/C+ZIilgIuDnEnKx5QYODdDtbFaxzsbZcc/a7WFq7MhsVYgRlwawLtvOUESTlfJ+hc/USqPg==", + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.4.3.tgz", + "integrity": "sha512-tFWBiv3h7z+T/tDaoxA8rqTxy1CHV6gHS//QdaH4pulbq/JuBSGgQspQQqcgnwdAx6pNI7cmvz5Sv/addzHmUg==", "peer": true, "engines": { "node": ">=12" } }, "node_modules/macos-release": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/macos-release/-/macos-release-2.5.0.tgz", - "integrity": "sha512-EIgv+QZ9r+814gjJj0Bt5vSLJLzswGmSUbUpbi9AIr/fsN2IWFBl2NucV9PAiek+U1STK468tEkxmVYUtuAN3g==", + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/macos-release/-/macos-release-2.5.1.tgz", + "integrity": "sha512-DXqXhEM7gW59OjZO8NIjBCz9AQ1BEMrfiOAl4AYByHCtVHRF4KoGNO8mqQeM8lRCtQe/UnJ4imO/d2HdkKsd+A==", "dev": true, "engines": { "node": ">=6" @@ -9095,41 +9554,32 @@ } }, "node_modules/magic-string": { - "version": "0.26.7", - "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.26.7.tgz", - "integrity": "sha512-hX9XH3ziStPoPhJxLq1syWuZMxbDvGNbVchfrdCtanC7D13888bMFow61x8axrx+GfHLtVeAx2kxL7tTGRl+Ow==", + "version": "0.30.1", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.1.tgz", + "integrity": "sha512-mbVKXPmS0z0G4XqFDCTllmDQ6coZzn94aMlb0o/A4HEHJCKcanlDZwYJgwnkmgD3jyWhUgj9VsPrfd972yPffA==", "dev": true, "dependencies": { - "sourcemap-codec": "^1.4.8" + "@jridgewell/sourcemap-codec": "^1.4.15" }, "engines": { "node": ">=12" } }, "node_modules/make-dir": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", - "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz", + "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==", "dev": true, "dependencies": { - "semver": "^6.0.0" + "semver": "^7.5.3" }, "engines": { - "node": ">=8" + "node": ">=10" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/make-dir/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true, - "bin": { - "semver": "bin/semver.js" - } - }, "node_modules/make-error": { "version": "1.3.6", "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz", @@ -9146,15 +9596,23 @@ } }, "node_modules/memfs": { - "version": "3.4.13", - "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.4.13.tgz", - "integrity": "sha512-omTM41g3Skpvx5dSYeZIbXKcXoAVc/AoMNwn9TKx++L/gaen/+4TTttmu8ZSch5vfVJ8uJvGbroTsIlslRg6lg==", + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/memfs/-/memfs-4.6.0.tgz", + "integrity": "sha512-I6mhA1//KEZfKRQT9LujyW6lRbX7RkC24xKododIDO3AGShcaFAMKElv1yFGWX8fD4UaSiwasr3NeQ5TdtHY1A==", "dev": true, "dependencies": { - "fs-monkey": "^1.0.3" + "json-joy": "^9.2.0", + "thingies": "^1.11.1" }, "engines": { "node": ">= 4.0.0" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/streamich" + }, + "peerDependencies": { + "tslib": "2" } }, "node_modules/mensch": { @@ -9260,23 +9718,31 @@ } }, "node_modules/minimist": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz", - "integrity": "sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==", + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", + "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", "funding": { "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/minipass": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz", + "integrity": "sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==", + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, "node_modules/mjml": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/mjml/-/mjml-4.13.0.tgz", - "integrity": "sha512-OnFKESouLshz8DPFSb6M/dE8GkhiJnoy6LAam5TiLA1anAj24yQ2ZH388LtQoEkvTisqwiTmc9ejDh5ctnFaJQ==", + "version": "4.14.1", + "resolved": "https://registry.npmjs.org/mjml/-/mjml-4.14.1.tgz", + "integrity": "sha512-f/wnWWIVbeb/ge3ff7c/KYYizI13QbGIp03odwwkCThsJsacw4gpZZAU7V4gXY3HxSXP2/q3jxOfaHVbkfNpOQ==", "dependencies": { "@babel/runtime": "^7.14.6", - "mjml-cli": "4.13.0", - "mjml-core": "4.13.0", - "mjml-migrate": "4.13.0", - "mjml-preset-core": "4.13.0", + "mjml-cli": "4.14.1", + "mjml-core": "4.14.1", + "mjml-migrate": "4.14.1", + "mjml-preset-core": "4.14.1", "mjml-validator": "4.13.0" }, "bin": { @@ -9284,49 +9750,49 @@ } }, "node_modules/mjml-accordion": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/mjml-accordion/-/mjml-accordion-4.13.0.tgz", - "integrity": "sha512-E3yihZW5Oq2p+sWOcr8kWeRTROmiTYOGxB4IOxW/jTycdY07N3FX3e6vuh7Fv3rryHEUaydUQYto3ICVyctI7w==", + "version": "4.14.1", + "resolved": "https://registry.npmjs.org/mjml-accordion/-/mjml-accordion-4.14.1.tgz", + "integrity": "sha512-dpNXyjnhYwhM75JSjD4wFUa9JgHm86M2pa0CoTzdv1zOQz67ilc4BoK5mc2S0gOjJpjBShM5eOJuCyVIuAPC6w==", "dependencies": { "@babel/runtime": "^7.14.6", "lodash": "^4.17.21", - "mjml-core": "4.13.0" + "mjml-core": "4.14.1" } }, "node_modules/mjml-body": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/mjml-body/-/mjml-body-4.13.0.tgz", - "integrity": "sha512-S4HgwAuO9dEsyX9sr6WBf9/xr+H2ASVaLn22aurJm1S2Lvc1wifLPYBQgFmNdCjaesTCNtOMUDpG+Rbnavyaqg==", + "version": "4.14.1", + "resolved": "https://registry.npmjs.org/mjml-body/-/mjml-body-4.14.1.tgz", + "integrity": "sha512-YpXcK3o2o1U+fhI8f60xahrhXuHmav6BZez9vIN3ZEJOxPFSr+qgr1cT2iyFz50L5+ZsLIVj2ZY+ALQjdsg8ig==", "dependencies": { "@babel/runtime": "^7.14.6", "lodash": "^4.17.21", - "mjml-core": "4.13.0" + "mjml-core": "4.14.1" } }, "node_modules/mjml-button": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/mjml-button/-/mjml-button-4.13.0.tgz", - "integrity": "sha512-3y8IAHCCxh7ESHh1aOOqobZKUgyNxOKAGQ9TlJoyaLpsKUFzkN8nmrD0KXF0ADSuzvhMZ1CdRIJuZ5mjv2TwWQ==", + "version": "4.14.1", + "resolved": "https://registry.npmjs.org/mjml-button/-/mjml-button-4.14.1.tgz", + "integrity": "sha512-V1Tl1vQ3lXYvvqHJHvGcc8URr7V1l/ZOsv7iLV4QRrh7kjKBXaRS7uUJtz6/PzEbNsGQCiNtXrODqcijLWlgaw==", "dependencies": { "@babel/runtime": "^7.14.6", "lodash": "^4.17.21", - "mjml-core": "4.13.0" + "mjml-core": "4.14.1" } }, "node_modules/mjml-carousel": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/mjml-carousel/-/mjml-carousel-4.13.0.tgz", - "integrity": "sha512-ORSY5bEYlMlrWSIKI/lN0Tz3uGltWAjG8DQl2Yr3pwjwOaIzGE+kozrDf+T9xItfiIIbvKajef1dg7B7XgP0zg==", + "version": "4.14.1", + "resolved": "https://registry.npmjs.org/mjml-carousel/-/mjml-carousel-4.14.1.tgz", + "integrity": "sha512-Ku3MUWPk/TwHxVgKEUtzspy/ePaWtN/3z6/qvNik0KIn0ZUIZ4zvR2JtaVL5nd30LHSmUaNj30XMPkCjYiKkFA==", "dependencies": { "@babel/runtime": "^7.14.6", "lodash": "^4.17.21", - "mjml-core": "4.13.0" + "mjml-core": "4.14.1" } }, "node_modules/mjml-cli": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/mjml-cli/-/mjml-cli-4.13.0.tgz", - "integrity": "sha512-kAZxpH0QqlTF/CcLzELgKw1ljKRxrmWJ310CJQhbPAxHvwQ/nIb+q82U+zRJAelRPPKjnOb+hSrMRqTgk9rH3w==", + "version": "4.14.1", + "resolved": "https://registry.npmjs.org/mjml-cli/-/mjml-cli-4.14.1.tgz", + "integrity": "sha512-Gy6MnSygFXs0U1qOXTHqBg2vZX2VL/fAacgQzD4MHq4OuybWaTNSzXRwxBXYCxT3IJB874n2Q0Mxp+Xka+tnZg==", "dependencies": { "@babel/runtime": "^7.14.6", "chokidar": "^3.0.0", @@ -9334,9 +9800,9 @@ "html-minifier": "^4.0.0", "js-beautify": "^1.6.14", "lodash": "^4.17.21", - "mjml-core": "4.13.0", - "mjml-migrate": "4.13.0", - "mjml-parser-xml": "4.13.0", + "mjml-core": "4.14.1", + "mjml-migrate": "4.14.1", + "mjml-parser-xml": "4.14.1", "mjml-validator": "4.13.0", "yargs": "^16.1.0" }, @@ -9344,6 +9810,16 @@ "mjml-cli": "bin/mjml" } }, + "node_modules/mjml-cli/node_modules/cliui": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", + "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", + "dependencies": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^7.0.0" + } + }, "node_modules/mjml-cli/node_modules/glob": { "version": "7.2.3", "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", @@ -9363,306 +9839,378 @@ "url": "https://github.com/sponsors/isaacs" } }, + "node_modules/mjml-cli/node_modules/wrap-ansi": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/mjml-cli/node_modules/yargs": { + "version": "16.2.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", + "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", + "dependencies": { + "cliui": "^7.0.2", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", + "require-directory": "^2.1.1", + "string-width": "^4.2.0", + "y18n": "^5.0.5", + "yargs-parser": "^20.2.2" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/mjml-cli/node_modules/yargs-parser": { + "version": "20.2.9", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", + "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", + "engines": { + "node": ">=10" + } + }, "node_modules/mjml-column": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/mjml-column/-/mjml-column-4.13.0.tgz", - "integrity": "sha512-O8FrWKK/bCy9XpKxrKRYWNdgWNaVd4TK4RqMeVI/I70IbnYnc1uf15jnsPMxCBSbT+NyXyk8k7fn099797uwpw==", + "version": "4.14.1", + "resolved": "https://registry.npmjs.org/mjml-column/-/mjml-column-4.14.1.tgz", + "integrity": "sha512-iixVCIX1YJtpQuwG2WbDr7FqofQrlTtGQ4+YAZXGiLThs0En3xNIJFQX9xJ8sgLEGGltyooHiNICBRlzSp9fDg==", "dependencies": { "@babel/runtime": "^7.14.6", "lodash": "^4.17.21", - "mjml-core": "4.13.0" + "mjml-core": "4.14.1" } }, "node_modules/mjml-core": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/mjml-core/-/mjml-core-4.13.0.tgz", - "integrity": "sha512-kU5AoVTlZaXR/EDi3ix66xpzUe+kScYus71lBH/wo/B+LZW70GHE1AYWtsog5oJp1MuTHpMFTNuBD/wePeEgWg==", + "version": "4.14.1", + "resolved": "https://registry.npmjs.org/mjml-core/-/mjml-core-4.14.1.tgz", + "integrity": "sha512-di88rSfX+8r4r+cEqlQCO7CRM4mYZrfe2wSCu2je38i+ujjkLpF72cgLnjBlSG5aOUCZgYvlsZ85stqIz9LQfA==", "dependencies": { "@babel/runtime": "^7.14.6", - "cheerio": "1.0.0-rc.10", - "detect-node": "2.0.4", + "cheerio": "1.0.0-rc.12", + "detect-node": "^2.0.4", "html-minifier": "^4.0.0", "js-beautify": "^1.6.14", - "juice": "^7.0.0", + "juice": "^9.0.0", "lodash": "^4.17.21", - "mjml-migrate": "4.13.0", - "mjml-parser-xml": "4.13.0", + "mjml-migrate": "4.14.1", + "mjml-parser-xml": "4.14.1", "mjml-validator": "4.13.0" } }, "node_modules/mjml-divider": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/mjml-divider/-/mjml-divider-4.13.0.tgz", - "integrity": "sha512-ooPCwfmxEC+wJduqObYezMp7W5UCHjL9Y1LPB5FGna2FrOejgfd6Ix3ij8Wrmycmlol7E2N4D7c5NDH5DbRCJg==", + "version": "4.14.1", + "resolved": "https://registry.npmjs.org/mjml-divider/-/mjml-divider-4.14.1.tgz", + "integrity": "sha512-agqWY0aW2xaMiUOhYKDvcAAfOLalpbbtjKZAl1vWmNkURaoK4L7MgDilKHSJDFUlHGm2ZOArTrq8i6K0iyThBQ==", "dependencies": { "@babel/runtime": "^7.14.6", "lodash": "^4.17.21", - "mjml-core": "4.13.0" + "mjml-core": "4.14.1" } }, "node_modules/mjml-group": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/mjml-group/-/mjml-group-4.13.0.tgz", - "integrity": "sha512-U7E8m8aaoAE/dMqjqXPjjrKcwO36B4cquAy9ASldECrIZJBcpFYO6eYf5yLXrNCUM2P0id8pgVjrUq23s00L7Q==", + "version": "4.14.1", + "resolved": "https://registry.npmjs.org/mjml-group/-/mjml-group-4.14.1.tgz", + "integrity": "sha512-dJt5batgEJ7wxlxzqOfHOI94ABX+8DZBvAlHuddYO4CsLFHYv6XRIArLAMMnAKU76r6p3X8JxYeOjKZXdv49kg==", "dependencies": { "@babel/runtime": "^7.14.6", "lodash": "^4.17.21", - "mjml-core": "4.13.0" + "mjml-core": "4.14.1" } }, "node_modules/mjml-head": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/mjml-head/-/mjml-head-4.13.0.tgz", - "integrity": "sha512-sL2qQuoVALXBCiemu4DPo9geDr8DuUdXVJxm+4nd6k5jpLCfSDmFlNhgSsLPzsYn7VEac3/sxsjLtomQ+6/BHg==", + "version": "4.14.1", + "resolved": "https://registry.npmjs.org/mjml-head/-/mjml-head-4.14.1.tgz", + "integrity": "sha512-KoCbtSeTAhx05Ugn9TB2UYt5sQinSCb7RGRer5iPQ3CrXj8hT5B5Svn6qvf/GACPkWl4auExHQh+XgLB+r3OEA==", "dependencies": { "@babel/runtime": "^7.14.6", "lodash": "^4.17.21", - "mjml-core": "4.13.0" + "mjml-core": "4.14.1" } }, "node_modules/mjml-head-attributes": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/mjml-head-attributes/-/mjml-head-attributes-4.13.0.tgz", - "integrity": "sha512-haggCafno+0lQylxJStkINCVCPMwfTpwE6yjCHeGOpQl/TkoNmjNkDr7DEEbNTZbt4Ekg070lQFn7clDy38EoA==", + "version": "4.14.1", + "resolved": "https://registry.npmjs.org/mjml-head-attributes/-/mjml-head-attributes-4.14.1.tgz", + "integrity": "sha512-XdUNOp2csK28kBDSistInOyzWNwmu5HDNr4y1Z7vSQ1PfkmiuS6jWG7jHUjdoMhs27e6Leuyyc6a8gWSpqSWrg==", "dependencies": { "@babel/runtime": "^7.14.6", "lodash": "^4.17.21", - "mjml-core": "4.13.0" + "mjml-core": "4.14.1" } }, "node_modules/mjml-head-breakpoint": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/mjml-head-breakpoint/-/mjml-head-breakpoint-4.13.0.tgz", - "integrity": "sha512-D2iPDeUKQK1+rYSNa2HGOvgfPxZhNyndTG0iBEb/FxdGge2hbeDCZEN0mwDYE3wWB+qSBqlCuMI+Vr4pEjZbKg==", + "version": "4.14.1", + "resolved": "https://registry.npmjs.org/mjml-head-breakpoint/-/mjml-head-breakpoint-4.14.1.tgz", + "integrity": "sha512-Qw9l/W/I5Z9p7I4ShgnEpAL9if4472ejcznbBnp+4Gq+sZoPa7iYoEPsa9UCGutlaCh3N3tIi2qKhl9qD8DFxA==", "dependencies": { "@babel/runtime": "^7.14.6", "lodash": "^4.17.21", - "mjml-core": "4.13.0" + "mjml-core": "4.14.1" } }, "node_modules/mjml-head-font": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/mjml-head-font/-/mjml-head-font-4.13.0.tgz", - "integrity": "sha512-mYn8aWnbrEap5vX2b4662hkUv6WifcYzYn++Yi6OHrJQi55LpzcU+myAGpfQEXXrpU8vGwExMTFKsJq5n2Kaow==", + "version": "4.14.1", + "resolved": "https://registry.npmjs.org/mjml-head-font/-/mjml-head-font-4.14.1.tgz", + "integrity": "sha512-oBYm1gaOdEMjE5BoZouRRD4lCNZ1jcpz92NR/F7xDyMaKCGN6T/+r4S5dq1gOLm9zWqClRHaECdFJNEmrDpZqA==", "dependencies": { "@babel/runtime": "^7.14.6", "lodash": "^4.17.21", - "mjml-core": "4.13.0" + "mjml-core": "4.14.1" } }, "node_modules/mjml-head-html-attributes": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/mjml-head-html-attributes/-/mjml-head-html-attributes-4.13.0.tgz", - "integrity": "sha512-m30Oro297+18Zou/1qYjagtmCOWtYXeoS38OABQ5zOSzMItE3TcZI9JNcOueIIWIyFCETe8StrTAKcQ2GHwsDw==", + "version": "4.14.1", + "resolved": "https://registry.npmjs.org/mjml-head-html-attributes/-/mjml-head-html-attributes-4.14.1.tgz", + "integrity": "sha512-vlJsJc1Sm4Ml2XvLmp01zsdmWmzm6+jNCO7X3eYi9ngEh8LjMCLIQOncnOgjqm9uGpQu2EgUhwvYFZP2luJOVg==", "dependencies": { "@babel/runtime": "^7.14.6", "lodash": "^4.17.21", - "mjml-core": "4.13.0" + "mjml-core": "4.14.1" } }, "node_modules/mjml-head-preview": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/mjml-head-preview/-/mjml-head-preview-4.13.0.tgz", - "integrity": "sha512-v0K/NocjFCbaoF/0IMVNmiqov91HxqT07vNTEl0Bt9lKFrTKVC01m1S4K7AB78T/bEeJ/HwmNjr1+TMtVNGGow==", + "version": "4.14.1", + "resolved": "https://registry.npmjs.org/mjml-head-preview/-/mjml-head-preview-4.14.1.tgz", + "integrity": "sha512-89gQtt3fhl2dkYpHLF5HDQXz/RLpzecU6wmAIT7Dz6etjLGE1dgq2Ay6Bu/OeHjDcT1gbM131zvBwuXw8OydNw==", "dependencies": { "@babel/runtime": "^7.14.6", "lodash": "^4.17.21", - "mjml-core": "4.13.0" + "mjml-core": "4.14.1" } }, "node_modules/mjml-head-style": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/mjml-head-style/-/mjml-head-style-4.13.0.tgz", - "integrity": "sha512-tBa33GL9Atn5bAM2UwE+uxv4rI29WgX/e5lXX+5GWlsb4thmiN6rxpFTNqBqWbBNRbZk4UEZF78M7Da8xC1ZGQ==", + "version": "4.14.1", + "resolved": "https://registry.npmjs.org/mjml-head-style/-/mjml-head-style-4.14.1.tgz", + "integrity": "sha512-XryOuf32EDuUCBT2k99C1+H87IOM919oY6IqxKFJCDkmsbywKIum7ibhweJdcxiYGONKTC6xjuibGD3fQTTYNQ==", "dependencies": { "@babel/runtime": "^7.14.6", "lodash": "^4.17.21", - "mjml-core": "4.13.0" + "mjml-core": "4.14.1" } }, "node_modules/mjml-head-title": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/mjml-head-title/-/mjml-head-title-4.13.0.tgz", - "integrity": "sha512-Mq0bjuZXJlwxfVcjuYihQcigZSDTKeQaG3nORR1D0jsOH2BXU4XgUK1UOcTXn2qCBIfRoIMq7rfzYs+L0CRhdw==", + "version": "4.14.1", + "resolved": "https://registry.npmjs.org/mjml-head-title/-/mjml-head-title-4.14.1.tgz", + "integrity": "sha512-aIfpmlQdf1eJZSSrFodmlC4g5GudBti2eMyG42M7/3NeLM6anEWoe+UkF/6OG4Zy0tCQ40BDJ5iBZlMsjQICzw==", "dependencies": { "@babel/runtime": "^7.14.6", "lodash": "^4.17.21", - "mjml-core": "4.13.0" + "mjml-core": "4.14.1" } }, "node_modules/mjml-hero": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/mjml-hero/-/mjml-hero-4.13.0.tgz", - "integrity": "sha512-aWEOScdrhyjwdKBWG4XQaElRHP8LU5PtktkpMeBXa4yxrxNs25qRnDqMNkjSrnnmFKWZmQ166tfboY6RBNf0UA==", + "version": "4.14.1", + "resolved": "https://registry.npmjs.org/mjml-hero/-/mjml-hero-4.14.1.tgz", + "integrity": "sha512-TQJ3yfjrKYGkdEWjHLHhL99u/meKFYgnfJvlo9xeBvRjSM696jIjdqaPHaunfw4CP6d2OpCIMuacgOsvqQMWOA==", "dependencies": { "@babel/runtime": "^7.14.6", "lodash": "^4.17.21", - "mjml-core": "4.13.0" + "mjml-core": "4.14.1" } }, "node_modules/mjml-image": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/mjml-image/-/mjml-image-4.13.0.tgz", - "integrity": "sha512-agMmm2wRZTIrKwrUnYFlnAbtrKYSP0R2en+Vf92HPspAwmaw3/AeOW/QxmSiMhfGf+xsEJyzVvR/nd33jbT3sg==", + "version": "4.14.1", + "resolved": "https://registry.npmjs.org/mjml-image/-/mjml-image-4.14.1.tgz", + "integrity": "sha512-jfKLPHXuFq83okwlNM1Um/AEWeVDgs2JXIOsWp2TtvXosnRvGGMzA5stKLYdy1x6UfKF4c1ovpMS162aYGp+xQ==", "dependencies": { "@babel/runtime": "^7.14.6", "lodash": "^4.17.21", - "mjml-core": "4.13.0" + "mjml-core": "4.14.1" } }, "node_modules/mjml-migrate": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/mjml-migrate/-/mjml-migrate-4.13.0.tgz", - "integrity": "sha512-I1euHiAyNpaz+B5vH+Z4T+hg/YtI5p3PqQ3/zTLv8gi24V6BILjTaftWhH5+3R/gQkQhH0NUaWNnRmds+Mq5DQ==", + "version": "4.14.1", + "resolved": "https://registry.npmjs.org/mjml-migrate/-/mjml-migrate-4.14.1.tgz", + "integrity": "sha512-d+9HKQOhZi3ZFAaFSDdjzJX9eDQGjMf3BArLWNm2okC4ZgfJSpOc77kgCyFV8ugvwc8fFegPnSV60Jl4xtvK2A==", "dependencies": { "@babel/runtime": "^7.14.6", "js-beautify": "^1.6.14", "lodash": "^4.17.21", - "mjml-core": "4.13.0", - "mjml-parser-xml": "4.13.0", + "mjml-core": "4.14.1", + "mjml-parser-xml": "4.14.1", "yargs": "^16.1.0" }, "bin": { "migrate": "lib/cli.js" } }, - "node_modules/mjml-navbar": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/mjml-navbar/-/mjml-navbar-4.13.0.tgz", - "integrity": "sha512-0Oqyyk+OdtXfsjswRb/7Ql1UOjN4MbqFPKoyltJqtj+11MRpF5+Wjd74Dj9H7l81GFwkIB9OaP+ZMiD+TPECgg==", + "node_modules/mjml-migrate/node_modules/cliui": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", + "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", "dependencies": { - "@babel/runtime": "^7.14.6", - "lodash": "^4.17.21", - "mjml-core": "4.13.0" + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^7.0.0" } }, - "node_modules/mjml-parser-xml": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/mjml-parser-xml/-/mjml-parser-xml-4.13.0.tgz", - "integrity": "sha512-phljtI8DaW++q0aybR/Ykv9zCyP/jCFypxVNo26r2IQo//VYXyc7JuLZZT8N/LAI8lZcwbTVxQPBzJTmZ5IfwQ==", + "node_modules/mjml-migrate/node_modules/wrap-ansi": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", "dependencies": { - "@babel/runtime": "^7.14.6", - "detect-node": "2.0.4", - "htmlparser2": "^4.1.0", - "lodash": "^4.17.15" - } - }, - "node_modules/mjml-parser-xml/node_modules/domhandler": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-3.3.0.tgz", - "integrity": "sha512-J1C5rIANUbuYK+FuFL98650rihynUOEzRLxW+90bKZRWB6A1X1Tf82GxR1qAWLyfNPRvjqfip3Q5tdYlmAa9lA==", - "dependencies": { - "domelementtype": "^2.0.1" + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" }, "engines": { - "node": ">= 4" + "node": ">=10" }, "funding": { - "url": "https://github.com/fb55/domhandler?sponsor=1" + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" } }, - "node_modules/mjml-parser-xml/node_modules/htmlparser2": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-4.1.0.tgz", - "integrity": "sha512-4zDq1a1zhE4gQso/c5LP1OtrhYTncXNSpvJYtWJBtXAETPlMfi3IFNjGuQbYLuVY4ZR0QMqRVvo4Pdy9KLyP8Q==", + "node_modules/mjml-migrate/node_modules/yargs": { + "version": "16.2.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", + "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", "dependencies": { - "domelementtype": "^2.0.1", - "domhandler": "^3.0.0", - "domutils": "^2.0.0", - "entities": "^2.0.0" + "cliui": "^7.0.2", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", + "require-directory": "^2.1.1", + "string-width": "^4.2.0", + "y18n": "^5.0.5", + "yargs-parser": "^20.2.2" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/mjml-migrate/node_modules/yargs-parser": { + "version": "20.2.9", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", + "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", + "engines": { + "node": ">=10" + } + }, + "node_modules/mjml-navbar": { + "version": "4.14.1", + "resolved": "https://registry.npmjs.org/mjml-navbar/-/mjml-navbar-4.14.1.tgz", + "integrity": "sha512-rNy1Kw8CR3WQ+M55PFBAUDz2VEOjz+sk06OFnsnmNjoMVCjo1EV7OFLDAkmxAwqkC8h4zQWEOFY0MBqqoAg7+A==", + "dependencies": { + "@babel/runtime": "^7.14.6", + "lodash": "^4.17.21", + "mjml-core": "4.14.1" + } + }, + "node_modules/mjml-parser-xml": { + "version": "4.14.1", + "resolved": "https://registry.npmjs.org/mjml-parser-xml/-/mjml-parser-xml-4.14.1.tgz", + "integrity": "sha512-9WQVeukbXfq9DUcZ8wOsHC6BTdhaVwTAJDYMIQglXLwKwN7I4pTCguDDHy5d0kbbzK5OCVxCdZe+bfVI6XANOQ==", + "dependencies": { + "@babel/runtime": "^7.14.6", + "detect-node": "2.0.4", + "htmlparser2": "^8.0.1", + "lodash": "^4.17.15" } }, + "node_modules/mjml-parser-xml/node_modules/detect-node": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.0.4.tgz", + "integrity": "sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==" + }, "node_modules/mjml-preset-core": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/mjml-preset-core/-/mjml-preset-core-4.13.0.tgz", - "integrity": "sha512-gxzYaKkvUrHuzT1oqjEPSDtdmgEnN99Hf5f1r2CR5aMOB1x66EA3T8ATvF1o7qrBTVV4KMVlQem3IubMSYJZRw==", + "version": "4.14.1", + "resolved": "https://registry.npmjs.org/mjml-preset-core/-/mjml-preset-core-4.14.1.tgz", + "integrity": "sha512-uUCqK9Z9d39rwB/+JDV2KWSZGB46W7rPQpc9Xnw1DRP7wD7qAfJwK6AZFCwfTgWdSxw0PwquVNcrUS9yBa9uhw==", "dependencies": { "@babel/runtime": "^7.14.6", - "mjml-accordion": "4.13.0", - "mjml-body": "4.13.0", - "mjml-button": "4.13.0", - "mjml-carousel": "4.13.0", - "mjml-column": "4.13.0", - "mjml-divider": "4.13.0", - "mjml-group": "4.13.0", - "mjml-head": "4.13.0", - "mjml-head-attributes": "4.13.0", - "mjml-head-breakpoint": "4.13.0", - "mjml-head-font": "4.13.0", - "mjml-head-html-attributes": "4.13.0", - "mjml-head-preview": "4.13.0", - "mjml-head-style": "4.13.0", - "mjml-head-title": "4.13.0", - "mjml-hero": "4.13.0", - "mjml-image": "4.13.0", - "mjml-navbar": "4.13.0", - "mjml-raw": "4.13.0", - "mjml-section": "4.13.0", - "mjml-social": "4.13.0", - "mjml-spacer": "4.13.0", - "mjml-table": "4.13.0", - "mjml-text": "4.13.0", - "mjml-wrapper": "4.13.0" + "mjml-accordion": "4.14.1", + "mjml-body": "4.14.1", + "mjml-button": "4.14.1", + "mjml-carousel": "4.14.1", + "mjml-column": "4.14.1", + "mjml-divider": "4.14.1", + "mjml-group": "4.14.1", + "mjml-head": "4.14.1", + "mjml-head-attributes": "4.14.1", + "mjml-head-breakpoint": "4.14.1", + "mjml-head-font": "4.14.1", + "mjml-head-html-attributes": "4.14.1", + "mjml-head-preview": "4.14.1", + "mjml-head-style": "4.14.1", + "mjml-head-title": "4.14.1", + "mjml-hero": "4.14.1", + "mjml-image": "4.14.1", + "mjml-navbar": "4.14.1", + "mjml-raw": "4.14.1", + "mjml-section": "4.14.1", + "mjml-social": "4.14.1", + "mjml-spacer": "4.14.1", + "mjml-table": "4.14.1", + "mjml-text": "4.14.1", + "mjml-wrapper": "4.14.1" } }, "node_modules/mjml-raw": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/mjml-raw/-/mjml-raw-4.13.0.tgz", - "integrity": "sha512-JbBYxwX1a/zbqnCrlDCRNqov2xqUrMCaEdTHfqE2athj479aQXvLKFM20LilTMaClp/dR0yfvFLfFVrC5ej4FQ==", + "version": "4.14.1", + "resolved": "https://registry.npmjs.org/mjml-raw/-/mjml-raw-4.14.1.tgz", + "integrity": "sha512-9+4wzoXnCtfV6QPmjfJkZ50hxFB4Z8QZnl2Ac0D1Cn3dUF46UkmO5NLMu7UDIlm5DdFyycZrMOwvZS4wv9ksPw==", "dependencies": { "@babel/runtime": "^7.14.6", "lodash": "^4.17.21", - "mjml-core": "4.13.0" + "mjml-core": "4.14.1" } }, "node_modules/mjml-section": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/mjml-section/-/mjml-section-4.13.0.tgz", - "integrity": "sha512-BLcqlhavtRakKtzDQPLv6Ae4Jt4imYWq/P0jo+Sjk7tP4QifgVA2KEQOirPK5ZUqw/lvK7Afhcths5rXZ2ItnQ==", + "version": "4.14.1", + "resolved": "https://registry.npmjs.org/mjml-section/-/mjml-section-4.14.1.tgz", + "integrity": "sha512-Ik5pTUhpT3DOfB3hEmAWp8rZ0ilWtIivnL8XdUJRfgYE9D+MCRn+reIO+DAoJHxiQoI6gyeKkIP4B9OrQ7cHQw==", "dependencies": { "@babel/runtime": "^7.14.6", "lodash": "^4.17.21", - "mjml-core": "4.13.0" + "mjml-core": "4.14.1" } }, "node_modules/mjml-social": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/mjml-social/-/mjml-social-4.13.0.tgz", - "integrity": "sha512-zL2a7Wwsk8OXF0Bqu+1B3La1UPwdTMcEXptO8zdh2V5LL6Xb7Gfyvx6w0CmmBtG5IjyCtqaKy5wtrcpG9Hvjfg==", + "version": "4.14.1", + "resolved": "https://registry.npmjs.org/mjml-social/-/mjml-social-4.14.1.tgz", + "integrity": "sha512-G44aOZXgZHukirjkeQWTTV36UywtE2YvSwWGNfo/8d+k5JdJJhCIrlwaahyKEAyH63G1B0Zt8b2lEWx0jigYUw==", "dependencies": { "@babel/runtime": "^7.14.6", "lodash": "^4.17.21", - "mjml-core": "4.13.0" + "mjml-core": "4.14.1" } }, "node_modules/mjml-spacer": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/mjml-spacer/-/mjml-spacer-4.13.0.tgz", - "integrity": "sha512-Acw4QJ0MJ38W4IewXuMX7hLaW1BZaln+gEEuTfrv0xwPdTxX1ILqz4r+s9mYMxYkIDLWMCjBvXyQK6aWlid13A==", + "version": "4.14.1", + "resolved": "https://registry.npmjs.org/mjml-spacer/-/mjml-spacer-4.14.1.tgz", + "integrity": "sha512-5SfQCXTd3JBgRH1pUy6NVZ0lXBiRqFJPVHBdtC3OFvUS3q1w16eaAXlIUWMKTfy8CKhQrCiE6m65kc662ZpYxA==", "dependencies": { "@babel/runtime": "^7.14.6", "lodash": "^4.17.21", - "mjml-core": "4.13.0" + "mjml-core": "4.14.1" } }, "node_modules/mjml-table": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/mjml-table/-/mjml-table-4.13.0.tgz", - "integrity": "sha512-UAWPVMaGReQhf776DFdiwdcJTIHTek3zzQ1pb+E7VlypEYgIpFvdUJ39UIiiflhqtdBATmHwKBOtePwU0MzFMg==", + "version": "4.14.1", + "resolved": "https://registry.npmjs.org/mjml-table/-/mjml-table-4.14.1.tgz", + "integrity": "sha512-aVBdX3WpyKVGh/PZNn2KgRem+PQhWlvnD00DKxDejRBsBSKYSwZ0t3EfFvZOoJ9DzfHsN0dHuwd6Z18Ps44NFQ==", "dependencies": { "@babel/runtime": "^7.14.6", "lodash": "^4.17.21", - "mjml-core": "4.13.0" + "mjml-core": "4.14.1" } }, "node_modules/mjml-text": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/mjml-text/-/mjml-text-4.13.0.tgz", - "integrity": "sha512-uDuraaQFdu+6xfuigCimbeznnOnJfwRdcCL1lTBTusTuEvW/5Va6m2D3mnMeEpl+bp4+cxesXIz9st6A9pcg5A==", + "version": "4.14.1", + "resolved": "https://registry.npmjs.org/mjml-text/-/mjml-text-4.14.1.tgz", + "integrity": "sha512-yZuvf5z6qUxEo5CqOhCUltJlR6oySKVcQNHwoV5sneMaKdmBiaU4VDnlYFera9gMD9o3KBHIX6kUg7EHnCwBRQ==", "dependencies": { "@babel/runtime": "^7.14.6", "lodash": "^4.17.21", - "mjml-core": "4.13.0" + "mjml-core": "4.14.1" } }, "node_modules/mjml-validator": { @@ -9674,25 +10222,28 @@ } }, "node_modules/mjml-wrapper": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/mjml-wrapper/-/mjml-wrapper-4.13.0.tgz", - "integrity": "sha512-p/44JvHg04rAFR7QDImg8nZucEokIjFH6KJMHxsO0frJtLZ+IuakctzlZAADHsqiR52BwocDsXSa+o9SE2l6Ng==", + "version": "4.14.1", + "resolved": "https://registry.npmjs.org/mjml-wrapper/-/mjml-wrapper-4.14.1.tgz", + "integrity": "sha512-aA5Xlq6d0hZ5LY+RvSaBqmVcLkvPvdhyAv3vQf3G41Gfhel4oIPmkLnVpHselWhV14A0KwIOIAKVxHtSAxyOTQ==", "dependencies": { "@babel/runtime": "^7.14.6", "lodash": "^4.17.21", - "mjml-core": "4.13.0", - "mjml-section": "4.13.0" + "mjml-core": "4.14.1", + "mjml-section": "4.14.1" } }, "node_modules/mkdirp": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", - "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", + "version": "2.1.6", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-2.1.6.tgz", + "integrity": "sha512-+hEnITedc8LAtIP9u3HJDFIdcLV2vXP33sqLLIzkv1Db1zO/1OxbvYf0Y1OC/S/Qo5dxHXepofhmxL02PsKe+A==", "bin": { - "mkdirp": "bin/cmd.js" + "mkdirp": "dist/cjs/src/bin.js" }, "engines": { "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" } }, "node_modules/mnemonist": { @@ -9709,18 +10260,18 @@ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, "node_modules/msgpackr": { - "version": "1.8.3", - "resolved": "https://registry.npmjs.org/msgpackr/-/msgpackr-1.8.3.tgz", - "integrity": "sha512-m2JefwcKNzoHYXkH/5jzHRxAw7XLWsAdvu0FOJ+OLwwozwOV/J6UA62iLkfIMbg7G8+dIuRwgg6oz+QoQ4YkoA==", + "version": "1.9.9", + "resolved": "https://registry.npmjs.org/msgpackr/-/msgpackr-1.9.9.tgz", + "integrity": "sha512-sbn6mioS2w0lq1O6PpGtsv6Gy8roWM+o3o4Sqjd6DudrL/nOugY+KyJUimoWzHnf9OkO0T6broHFnYE/R05t9A==", "peer": true, "optionalDependencies": { - "msgpackr-extract": "^3.0.0" + "msgpackr-extract": "^3.0.2" } }, "node_modules/msgpackr-extract": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/msgpackr-extract/-/msgpackr-extract-3.0.0.tgz", - "integrity": "sha512-oy6KCk1+X4Bn5m6Ycq5N1EWl9npqG/cLrE8ga8NX7ZqfqYUUBS08beCQaGq80fjbKBySur0E6x//yZjzNJDt3A==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/msgpackr-extract/-/msgpackr-extract-3.0.2.tgz", + "integrity": "sha512-SdzXp4kD/Qf8agZ9+iTu6eql0m3kWm1A2y1hkpTeVNENutaB0BwHlSvAIaMxwntmRUAUjon2V4L8Z/njd0Ct8A==", "hasInstallScript": true, "optional": true, "peer": true, @@ -9731,12 +10282,12 @@ "download-msgpackr-prebuilds": "bin/download-prebuilds.js" }, "optionalDependencies": { - "@msgpackr-extract/msgpackr-extract-darwin-arm64": "3.0.0", - "@msgpackr-extract/msgpackr-extract-darwin-x64": "3.0.0", - "@msgpackr-extract/msgpackr-extract-linux-arm": "3.0.0", - "@msgpackr-extract/msgpackr-extract-linux-arm64": "3.0.0", - "@msgpackr-extract/msgpackr-extract-linux-x64": "3.0.0", - "@msgpackr-extract/msgpackr-extract-win32-x64": "3.0.0" + "@msgpackr-extract/msgpackr-extract-darwin-arm64": "3.0.2", + "@msgpackr-extract/msgpackr-extract-darwin-x64": "3.0.2", + "@msgpackr-extract/msgpackr-extract-linux-arm": "3.0.2", + "@msgpackr-extract/msgpackr-extract-linux-arm64": "3.0.2", + "@msgpackr-extract/msgpackr-extract-linux-x64": "3.0.2", + "@msgpackr-extract/msgpackr-extract-win32-x64": "3.0.2" } }, "node_modules/mute-stream": { @@ -9761,26 +10312,20 @@ "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", "dev": true }, - "node_modules/natural-compare-lite": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz", - "integrity": "sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==", - "dev": true - }, "node_modules/neo-async": { "version": "2.6.2", "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz", "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==" }, "node_modules/nest-keycloak-connect": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/nest-keycloak-connect/-/nest-keycloak-connect-1.9.1.tgz", - "integrity": "sha512-IZPq2zEm3MwjX3IqOS607cJMOomF6vg+uKI8D0AipPVN7JzX55Q4B8/3h+OfJWzcfAnpgpeDvkufY/9f4wZUxw==", + "version": "1.9.2", + "resolved": "https://registry.npmjs.org/nest-keycloak-connect/-/nest-keycloak-connect-1.9.2.tgz", + "integrity": "sha512-O3dq2PL2AVk9zohMgAFL8IfFzpS6wvr24m30rit6eg34nmAI/zJIkfvVjmd/KSZ1Z685ADlI3GCOeHe7CArizA==", "peerDependencies": { - "@nestjs/common": ">=6.0.0 <10.0.0", - "@nestjs/core": ">=6.0.0 <10.0.0", + "@nestjs/common": ">=6.0.0 <11.0.0", + "@nestjs/core": ">=6.0.0 <11.0.0", "@nestjs/graphql": ">=6", - "keycloak-connect": ">=10.0.0 <21.0.0" + "keycloak-connect": ">=10.0.0 <22.0.0" }, "peerDependenciesMeta": { "@nestjs/graphql": { @@ -9789,15 +10334,17 @@ } }, "node_modules/nestjs-cls": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/nestjs-cls/-/nestjs-cls-2.2.1.tgz", - "integrity": "sha512-UG6gvsRk7m+0k0wnq8YeiJJ8oy00t9Zrvd0q/p/fCFt5GBL5ZGce/CRE1L9ZQqw6BiV8GwgkcSSVrsH9z3rMSQ==", + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/nestjs-cls/-/nestjs-cls-3.6.0.tgz", + "integrity": "sha512-hAu8Pyhl0okB7LgQFoxP8kq26izBh0UCnDLfE2Ze9eJAz2A8XdFkBNIVca868T1Yf8bsLzvfsKPTxCQZ0hTMDQ==", "engines": { "node": ">=12.17.0" }, "peerDependencies": { - "@nestjs/common": "> 7.0.0 < 10", - "@nestjs/core": "> 7.0.0 < 10" + "@nestjs/common": "> 7.0.0 < 11", + "@nestjs/core": "> 7.0.0 < 11", + "reflect-metadata": "*", + "rxjs": ">= 7" } }, "node_modules/nestjs-grpc-reflection": { @@ -9820,22 +10367,22 @@ } }, "node_modules/nestjs-pino": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/nestjs-pino/-/nestjs-pino-3.1.2.tgz", - "integrity": "sha512-Rxt9v/OlHwurE2GPyBlHVjzCLCnxIPxGa+Esligij412zEcqqB6kka5MhKAk3l61u1jyTLx3Mzol+HQrR6/f9w==", + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/nestjs-pino/-/nestjs-pino-3.5.0.tgz", + "integrity": "sha512-IWJ3dzLVjg5istcd3Cz3rVO+gmvabfVAT1YmQgzL1HnC2hkc0H6qA6k6SZ7OIwQfewuRejYfPu3TlkxwRrqxHQ==", "hasInstallScript": true, "engines": { "node": ">= 14" }, "peerDependencies": { - "@nestjs/common": "^8.0.0 || ^9.0.0", + "@nestjs/common": "^8.0.0 || ^9.0.0 || ^10.0.0", "pino-http": "^6.4.0 || ^7.0.0 || ^8.0.0" } }, "node_modules/nestjs-spelunker": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/nestjs-spelunker/-/nestjs-spelunker-1.1.3.tgz", - "integrity": "sha512-zykE4PRqV/jf0UkgjW6KQC7Zrvgj87MbF9T+9jZs74R4Z/zaYwNlMIMHy3hmS8r6okhGIz7PAF0I2JBYR6HXeA==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/nestjs-spelunker/-/nestjs-spelunker-1.3.0.tgz", + "integrity": "sha512-VK6s1ABmsN50/8PTYb9Qxezpttwi8kWbCb2Tcyd42ayaGDObjRrhD51Y/2jCixNRvxrAo4eMA4ck8XcD4nAP+A==", "dependencies": { "@ogma/styler": "^1.0.0" }, @@ -9846,9 +10393,9 @@ } }, "node_modules/nise": { - "version": "5.1.4", - "resolved": "https://registry.npmjs.org/nise/-/nise-5.1.4.tgz", - "integrity": "sha512-8+Ib8rRJ4L0o3kfmyVCL7gzrohyDe0cMFTBa2d364yIrEGMEoetznKJx899YxjybU6bL9SQkYPSBBs1gyYs8Xg==", + "version": "5.1.5", + "resolved": "https://registry.npmjs.org/nise/-/nise-5.1.5.tgz", + "integrity": "sha512-VJuPIfUFaXNRzETTQEEItTOP8Y171ijr+JLq42wHes3DiryR8vT+1TXQW/Rx8JNUhyYYWyIvjXTU6dOhJcs9Nw==", "dev": true, "dependencies": { "@sinonjs/commons": "^2.0.0", @@ -9867,15 +10414,6 @@ "type-detect": "4.0.8" } }, - "node_modules/nise/node_modules/@sinonjs/fake-timers": { - "version": "10.0.2", - "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-10.0.2.tgz", - "integrity": "sha512-SwUDyjWnah1AaNl7kxsa7cfLhlTYoiyhDAIgyh+El30YvXs/o7OLXpYH88Zdhyx9JExKrmHDJ+10bwIcY80Jmw==", - "dev": true, - "dependencies": { - "@sinonjs/commons": "^2.0.0" - } - }, "node_modules/nise/node_modules/path-to-regexp": { "version": "1.8.0", "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.8.0.tgz", @@ -9908,9 +10446,9 @@ } }, "node_modules/node-fetch": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.9.tgz", - "integrity": "sha512-DJm/CJkZkRjKKj4Zi4BsKVZh3ValV5IR5s7LVZnW+6YMh0W1BfNA8XSs6DLMGYlId5F3KnA70uu2qepcR08Qqg==", + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", + "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", "dependencies": { "whatwg-url": "^5.0.0" }, @@ -9953,9 +10491,9 @@ "dev": true }, "node_modules/node-jose": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/node-jose/-/node-jose-2.1.1.tgz", - "integrity": "sha512-19nyuUGShNmFmVTeqDfP6ZJCiikbcjI0Pw2kykBCH7rl8AZgSiDZK2Ww8EDaMrOSbRg6IlfIMhI5ZvCklmOhzg==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/node-jose/-/node-jose-2.2.0.tgz", + "integrity": "sha512-XPCvJRr94SjLrSIm4pbYHKLEaOsDvJCpyFw/6V/KK/IXmyZ6SFBzAUDO9HQf4DB/nTEFcRGH87mNciOP23kFjw==", "dependencies": { "base64url": "^3.0.1", "buffer": "^6.0.3", @@ -9965,18 +10503,13 @@ "node-forge": "^1.2.1", "pako": "^2.0.4", "process": "^0.11.10", - "uuid": "^8.3.2" + "uuid": "^9.0.0" } }, - "node_modules/node-jose/node_modules/long": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/long/-/long-5.2.1.tgz", - "integrity": "sha512-GKSNGeNAtw8IryjjkhZxuKB3JzlcLTwjtiQCHKvqQet81I93kXslhDQruGI/QsddO83mcDToBVy7GqGS/zYf/A==" - }, "node_modules/node-releases": { - "version": "2.0.9", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.9.tgz", - "integrity": "sha512-2xfmOrRkGogbTK9R6Leda0DGiXeY3p2NJpy4+gNCffdUvV6mdEJnaDEic1i3Ec2djAo8jWYoJMR5PB0MSMpxUA==", + "version": "2.0.13", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.13.tgz", + "integrity": "sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==", "dev": true }, "node_modules/nopt": { @@ -10032,18 +10565,10 @@ "node": ">=0.10.0" } }, - "node_modules/object-hash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz", - "integrity": "sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==", - "engines": { - "node": ">= 6" - } - }, "node_modules/object-inspect": { - "version": "1.12.3", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz", - "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==", + "version": "1.13.1", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz", + "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==", "dev": true, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -10055,9 +10580,12 @@ "integrity": "sha512-lgHwxlxV1qIg1Eap7LgIeoBWIMFibOjbrYPIPJZcI1mmGAI2m3lNYpK12Y+GBdPQ0U1hRwSord7GIaawz962qQ==" }, "node_modules/on-exit-leak-free": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/on-exit-leak-free/-/on-exit-leak-free-2.1.0.tgz", - "integrity": "sha512-VuCaZZAjReZ3vUwgOB8LxAosIurDiAW0s13rI1YwmaP++jvcxP77AWoQvenZebpCA2m8WC1/EosPYPMjnRAp/w==" + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/on-exit-leak-free/-/on-exit-leak-free-2.1.2.tgz", + "integrity": "sha512-0eJJY6hXLGf1udHwfNftBqH+g73EU4B504nZeKpz1sYRKafAghwxEJunB2O7rDZkL4PGfsMVnTXZ2EjibbqcsA==", + "engines": { + "node": ">=14.0.0" + } }, "node_modules/once": { "version": "1.4.0", @@ -10082,18 +10610,41 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/open": { + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/open/-/open-9.1.0.tgz", + "integrity": "sha512-OS+QTnw1/4vrf+9hh1jc1jnYjzSG4ttTBB8UxOwAnInG3Uo4ssetzC1ihqaIHjLJnA5GGlRl6QlZXOTQhRBUvg==", + "dev": true, + "dependencies": { + "default-browser": "^4.0.0", + "define-lazy-prop": "^3.0.0", + "is-inside-container": "^1.0.0", + "is-wsl": "^2.2.0" + }, + "engines": { + "node": ">=14.16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/openapi-types": { + "version": "12.1.3", + "resolved": "https://registry.npmjs.org/openapi-types/-/openapi-types-12.1.3.tgz", + "integrity": "sha512-N4YtSYJqghVu4iek2ZUvcN/0aqH1kRDuNqzcycDxhOUpg7GdvLa2F3DgS6yBNhInhv2r/6I0Flkn7CqL8+nIcw==" + }, "node_modules/optionator": { - "version": "0.9.1", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz", - "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==", + "version": "0.9.3", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz", + "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==", "dev": true, "dependencies": { + "@aashutoshrathi/word-wrap": "^1.2.3", "deep-is": "^0.1.3", "fast-levenshtein": "^2.0.6", "levn": "^0.4.1", "prelude-ls": "^1.2.1", - "type-check": "^0.4.0", - "word-wrap": "^1.2.3" + "type-check": "^0.4.0" }, "engines": { "node": ">= 0.8.0" @@ -10122,22 +10673,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/ora/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, "node_modules/os-name": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/os-name/-/os-name-4.0.1.tgz", @@ -10250,23 +10785,28 @@ } }, "node_modules/parse5": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.1.tgz", - "integrity": "sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==" + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.1.2.tgz", + "integrity": "sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==", + "dependencies": { + "entities": "^4.4.0" + }, + "funding": { + "url": "https://github.com/inikulin/parse5?sponsor=1" + } }, "node_modules/parse5-htmlparser2-tree-adapter": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz", - "integrity": "sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-7.0.0.tgz", + "integrity": "sha512-B77tOZrqqfUfnVcOrUvfdLbz4pu4RopLD/4vmu3HUPswwTA8OH0EMW9BlWR2B0RCoiZRAHEUu7IxeP1Pd1UU+g==", "dependencies": { - "parse5": "^6.0.1" + "domhandler": "^5.0.2", + "parse5": "^7.0.0" + }, + "funding": { + "url": "https://github.com/inikulin/parse5?sponsor=1" } }, - "node_modules/parse5-htmlparser2-tree-adapter/node_modules/parse5": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz", - "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==" - }, "node_modules/path-exists": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", @@ -10288,7 +10828,6 @@ "version": "3.1.1", "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", - "dev": true, "engines": { "node": ">=8" } @@ -10299,6 +10838,29 @@ "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", "dev": true }, + "node_modules/path-scurry": { + "version": "1.10.1", + "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.10.1.tgz", + "integrity": "sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ==", + "dependencies": { + "lru-cache": "^9.1.1 || ^10.0.0", + "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/path-scurry/node_modules/lru-cache": { + "version": "10.0.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.0.1.tgz", + "integrity": "sha512-IJ4uwUTi2qCccrioU6g9g/5rvvVl13bsdczUUcqbciD9iLr095yj8DQKdObriEvuNSx325N1rV1O0sJFszx75g==", + "engines": { + "node": "14 || >=16.14" + } + }, "node_modules/path-to-regexp": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-3.2.0.tgz", @@ -10320,14 +10882,14 @@ "optional": true }, "node_modules/pg": { - "version": "8.9.0", - "resolved": "https://registry.npmjs.org/pg/-/pg-8.9.0.tgz", - "integrity": "sha512-ZJM+qkEbtOHRuXjmvBtOgNOXOtLSbxiMiUVMgE4rV6Zwocy03RicCVvDXgx8l4Biwo8/qORUnEqn2fdQzV7KCg==", + "version": "8.11.3", + "resolved": "https://registry.npmjs.org/pg/-/pg-8.11.3.tgz", + "integrity": "sha512-+9iuvG8QfaaUrrph+kpF24cXkH1YOOUeArRNYIxq1viYHZagBxrTno7cecY1Fa44tJeZvaoG+Djpkc3JwehN5g==", "dependencies": { "buffer-writer": "2.0.0", "packet-reader": "1.0.0", - "pg-connection-string": "^2.5.0", - "pg-pool": "^3.5.2", + "pg-connection-string": "^2.6.2", + "pg-pool": "^3.6.1", "pg-protocol": "^1.6.0", "pg-types": "^2.1.0", "pgpass": "1.x" @@ -10335,6 +10897,9 @@ "engines": { "node": ">= 8.0.0" }, + "optionalDependencies": { + "pg-cloudflare": "^1.1.1" + }, "peerDependencies": { "pg-native": ">=3.0.1" }, @@ -10344,10 +10909,16 @@ } } }, + "node_modules/pg-cloudflare": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/pg-cloudflare/-/pg-cloudflare-1.1.1.tgz", + "integrity": "sha512-xWPagP/4B6BgFO+EKz3JONXv3YDgvkbVrGw2mTo3D6tVDQRh1e7cqVGvyR3BE+eQgAvx1XhW/iEASj4/jCWl3Q==", + "optional": true + }, "node_modules/pg-connection-string": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.5.0.tgz", - "integrity": "sha512-r5o/V/ORTA6TmUnyWZR9nCj1klXCO2CEKNRlVuJptZe85QuhFayC7WeMic7ndayT5IRIR0S0xFxFi2ousartlQ==" + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.6.2.tgz", + "integrity": "sha512-ch6OwaeaPYcova4kKZ15sbJ2hKb/VP48ZD2gE7i1J+L4MspCtBMAx8nMgz7bksc7IojCIIWuEhHibSMFH8m8oA==" }, "node_modules/pg-int8": { "version": "1.0.1", @@ -10358,9 +10929,9 @@ } }, "node_modules/pg-pool": { - "version": "3.5.2", - "resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-3.5.2.tgz", - "integrity": "sha512-His3Fh17Z4eg7oANLob6ZvH8xIVen3phEZh2QuyrIl4dQSDVEabNducv6ysROKpDNPSD+12tONZVWfSgMvDD9w==", + "version": "3.6.1", + "resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-3.6.1.tgz", + "integrity": "sha512-jizsIzhkIitxCGfPRzJn1ZdcosIt3pz9Sh3V01fm1vZnbnCMgmGl5wvGGdNN2EL9Rmb0EcFoCkixH4Pu+sP9Og==", "peerDependencies": { "pg": ">=8.0" } @@ -10411,20 +10982,20 @@ } }, "node_modules/pino": { - "version": "8.8.0", - "resolved": "https://registry.npmjs.org/pino/-/pino-8.8.0.tgz", - "integrity": "sha512-cF8iGYeu2ODg2gIwgAHcPrtR63ILJz3f7gkogaHC/TXVVXxZgInmNYiIpDYEwgEkxZti2Se6P2W2DxlBIZe6eQ==", + "version": "8.16.1", + "resolved": "https://registry.npmjs.org/pino/-/pino-8.16.1.tgz", + "integrity": "sha512-3bKsVhBmgPjGV9pyn4fO/8RtoVDR8ssW1ev819FsRXlRNgW8gR/9Kx+gCK4UPWd4JjrRDLWpzd/pb1AyWm3MGA==", "dependencies": { "atomic-sleep": "^1.0.0", "fast-redact": "^3.1.1", "on-exit-leak-free": "^2.1.0", - "pino-abstract-transport": "v1.0.0", + "pino-abstract-transport": "v1.1.0", "pino-std-serializers": "^6.0.0", "process-warning": "^2.0.0", "quick-format-unescaped": "^4.0.3", "real-require": "^0.2.0", "safe-stable-stringify": "^2.3.1", - "sonic-boom": "^3.1.0", + "sonic-boom": "^3.7.0", "thread-stream": "^2.0.0" }, "bin": { @@ -10432,18 +11003,33 @@ } }, "node_modules/pino-abstract-transport": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/pino-abstract-transport/-/pino-abstract-transport-1.0.0.tgz", - "integrity": "sha512-c7vo5OpW4wIS42hUVcT5REsL8ZljsUfBjqV/e2sFxmFEFZiq1XLUp5EYLtuDH6PEHq9W1egWqRbnLUP5FuZmOA==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/pino-abstract-transport/-/pino-abstract-transport-1.1.0.tgz", + "integrity": "sha512-lsleG3/2a/JIWUtf9Q5gUNErBqwIu1tUKTT3dUzaf5DySw9ra1wcqKjJjLX1VTY64Wk1eEOYsVGSaGfCK85ekA==", "dependencies": { "readable-stream": "^4.0.0", "split2": "^4.0.0" } }, + "node_modules/pino-abstract-transport/node_modules/readable-stream": { + "version": "4.4.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.4.2.tgz", + "integrity": "sha512-Lk/fICSyIhodxy1IDK2HazkeGjSmezAWX2egdtJnYhtzKEsBPJowlI6F6LPb5tqIQILrMbx22S5o3GuJavPusA==", + "dependencies": { + "abort-controller": "^3.0.0", + "buffer": "^6.0.3", + "events": "^3.3.0", + "process": "^0.11.10", + "string_decoder": "^1.3.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + } + }, "node_modules/pino-http": { - "version": "8.3.2", - "resolved": "https://registry.npmjs.org/pino-http/-/pino-http-8.3.2.tgz", - "integrity": "sha512-L6cQxP+d3IT2l7hCrlLOtvSFIYAX8iEAlGto7ahvVWumiiQ4aDCN23rmYGoImKGvBCyZpK07eHKtmuVq5L5SFQ==", + "version": "8.5.1", + "resolved": "https://registry.npmjs.org/pino-http/-/pino-http-8.5.1.tgz", + "integrity": "sha512-T/3d9YHKBYpv/QHjNy73P5BNYYkRrC2/D6CxKMecG4fKFLN+B2iC6LsKYzGRTRV+Ld3fjxFC1ca4TUGbPdzk+Q==", "peer": true, "dependencies": { "get-caller-file": "^2.0.5", @@ -10453,19 +11039,19 @@ } }, "node_modules/pino-pretty": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/pino-pretty/-/pino-pretty-8.1.0.tgz", - "integrity": "sha512-oKfI8qKXR2a3haHs/X8iB6QSnWLqoOGAjwxIAXem4+XOGIGNw7IKpozId1uE7j89Rj46HIfWnGbAgmQmr8+yRw==", + "version": "10.2.3", + "resolved": "https://registry.npmjs.org/pino-pretty/-/pino-pretty-10.2.3.tgz", + "integrity": "sha512-4jfIUc8TC1GPUfDyMSlW1STeORqkoxec71yhxIpLDQapUu8WOuoz2TTCoidrIssyz78LZC69whBMPIKCMbi3cw==", "dev": true, "dependencies": { "colorette": "^2.0.7", "dateformat": "^4.6.3", - "fast-copy": "^2.1.1", + "fast-copy": "^3.0.0", "fast-safe-stringify": "^2.1.1", "help-me": "^4.0.1", "joycon": "^3.1.1", "minimist": "^1.2.6", - "on-exit-leak-free": "^1.0.0", + "on-exit-leak-free": "^2.1.0", "pino-abstract-transport": "^1.0.0", "pump": "^3.0.0", "readable-stream": "^4.0.0", @@ -10477,21 +11063,31 @@ "pino-pretty": "bin.js" } }, - "node_modules/pino-pretty/node_modules/on-exit-leak-free": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/on-exit-leak-free/-/on-exit-leak-free-1.0.0.tgz", - "integrity": "sha512-Ve8ubhrXRdnuCJ5bQSQpP3uaV43K1PMcOfSRC1pqHgRZommXCgsXwh08jVC5NpjwScE23BPDwDvVg4cov3mwjw==", - "dev": true + "node_modules/pino-pretty/node_modules/readable-stream": { + "version": "4.4.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.4.2.tgz", + "integrity": "sha512-Lk/fICSyIhodxy1IDK2HazkeGjSmezAWX2egdtJnYhtzKEsBPJowlI6F6LPb5tqIQILrMbx22S5o3GuJavPusA==", + "dev": true, + "dependencies": { + "abort-controller": "^3.0.0", + "buffer": "^6.0.3", + "events": "^3.3.0", + "process": "^0.11.10", + "string_decoder": "^1.3.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + } }, "node_modules/pino-std-serializers": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/pino-std-serializers/-/pino-std-serializers-6.1.0.tgz", - "integrity": "sha512-KO0m2f1HkrPe9S0ldjx7za9BJjeHqBku5Ch8JyxETxT8dEFGz1PwgrHaOQupVYitpzbFSYm7nnljxD8dik2c+g==" + "version": "6.2.2", + "resolved": "https://registry.npmjs.org/pino-std-serializers/-/pino-std-serializers-6.2.2.tgz", + "integrity": "sha512-cHjPPsE+vhj/tnhCy/wiMh3M3z3h/j15zHQX+S9GkTBgqJuTuJzYJ4gUyACLhDaJ7kk9ba9iRDmbH2tJU03OiA==" }, "node_modules/pirates": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.5.tgz", - "integrity": "sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ==", + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz", + "integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==", "dev": true, "engines": { "node": ">= 6" @@ -10615,15 +11211,15 @@ } }, "node_modules/prettier": { - "version": "2.8.3", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.3.tgz", - "integrity": "sha512-tJ/oJ4amDihPoufT5sM0Z1SKEuKay8LfVAMlbbhnnkvt6BUserZylqo2PN+p9KeljLr0OHa2rXHU1T8reeoTrw==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.0.3.tgz", + "integrity": "sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg==", "dev": true, "bin": { - "prettier": "bin-prettier.js" + "prettier": "bin/prettier.cjs" }, "engines": { - "node": ">=10.13.0" + "node": ">=14" }, "funding": { "url": "https://github.com/prettier/prettier?sponsor=1" @@ -10642,18 +11238,17 @@ } }, "node_modules/pretty-format": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz", - "integrity": "sha512-8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz", + "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==", "dev": true, "dependencies": { - "@jest/schemas": "^28.1.3", - "ansi-regex": "^5.0.1", + "@jest/schemas": "^29.6.3", "ansi-styles": "^5.0.0", "react-is": "^18.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/pretty-format/node_modules/ansi-styles": { @@ -10677,9 +11272,9 @@ } }, "node_modules/process-warning": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/process-warning/-/process-warning-2.1.0.tgz", - "integrity": "sha512-9C20RLxrZU/rFnxWncDkuF6O999NdIf3E1ws4B0ZeY3sRVPzWBMsYDE2lxjxhiXxg464cQTgKUGm8/i6y2YGXg==" + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/process-warning/-/process-warning-2.3.0.tgz", + "integrity": "sha512-N6mp1+2jpQr3oCFMz6SeHRGbv6Slb20bRhj4v3xR99HqNToAcOe1MFOp4tytyzOfJn+QtN8Rf7U/h2KAn4kC6g==" }, "node_modules/prompts": { "version": "2.4.2", @@ -10700,9 +11295,9 @@ "integrity": "sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==" }, "node_modules/protobufjs": { - "version": "7.2.1", - "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.2.1.tgz", - "integrity": "sha512-L3pCItypTnPK27+CS8nuhZMYtsY+i8dqdq2vZsYHlG17CnWp1DWPQ/sos0vOKrj1fHEAzo3GBqSHLaeZyKUCDA==", + "version": "7.2.5", + "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.2.5.tgz", + "integrity": "sha512-gGXRSXvxQ7UiPgfw8gevrfRWcTlSbOFg+p/N+JVJEK5VhueL2miT6qTymqAmjr1Q5WbOCyJbyrk6JfWKwlFn6A==", "hasInstallScript": true, "dependencies": { "@protobufjs/aspromise": "^1.1.2", @@ -10722,11 +11317,6 @@ "node": ">=12.0.0" } }, - "node_modules/protobufjs/node_modules/long": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/long/-/long-5.2.1.tgz", - "integrity": "sha512-GKSNGeNAtw8IryjjkhZxuKB3JzlcLTwjtiQCHKvqQet81I93kXslhDQruGI/QsddO83mcDToBVy7GqGS/zYf/A==" - }, "node_modules/proxy-addr": { "version": "2.0.7", "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", @@ -10744,11 +11334,6 @@ "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" }, - "node_modules/pseudomap": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", - "integrity": "sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==" - }, "node_modules/pump": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", @@ -10760,17 +11345,33 @@ } }, "node_modules/punycode": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz", - "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==", + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", + "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", "engines": { "node": ">=6" } }, + "node_modules/pure-rand": { + "version": "6.0.4", + "resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-6.0.4.tgz", + "integrity": "sha512-LA0Y9kxMYv47GIPJy6MI84fqTd2HmYZI83W/kM/SkKfDlajnZYfmXFTxkbY+xSBPkLJxltMa9hIkmdc29eguMA==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://github.com/sponsors/dubzzz" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/fast-check" + } + ] + }, "node_modules/qs": { - "version": "6.11.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz", - "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==", + "version": "6.11.2", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.2.tgz", + "integrity": "sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA==", "dev": true, "dependencies": { "side-channel": "^1.0.4" @@ -10807,6 +11408,21 @@ "resolved": "https://registry.npmjs.org/quick-format-unescaped/-/quick-format-unescaped-4.0.4.tgz", "integrity": "sha512-tYC1Q1hgyRuHgloV/YXs2w15unPVh8qfu/qCTfhTYamaw7fyhumKa2yGpdSo87vY32rIclj+4fWYQXUMs9EHvg==" }, + "node_modules/quill-delta": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/quill-delta/-/quill-delta-5.1.0.tgz", + "integrity": "sha512-X74oCeRI4/p0ucjb5Ma8adTXd9Scumz367kkMK5V/IatcX6A0vlgLgKbzXWy5nZmCGeNJm2oQX0d2Eqj+ZIlCA==", + "dev": true, + "peer": true, + "dependencies": { + "fast-diff": "^1.3.0", + "lodash.clonedeep": "^4.5.0", + "lodash.isequal": "^4.5.0" + }, + "engines": { + "node": ">= 12.0.0" + } + }, "node_modules/randombytes": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", @@ -10823,17 +11439,17 @@ "dev": true }, "node_modules/readable-stream": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.3.0.tgz", - "integrity": "sha512-MuEnA0lbSi7JS8XM+WNJlWZkHAAdm7gETHdFK//Q/mChGyj2akEFtdLZh32jSdkWGbRwCW9pn6g3LWDdDeZnBQ==", + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", + "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", + "dev": true, "dependencies": { - "abort-controller": "^3.0.0", - "buffer": "^6.0.3", - "events": "^3.3.0", - "process": "^0.11.10" + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": ">= 6" } }, "node_modules/readdirp": { @@ -10868,16 +11484,16 @@ } }, "node_modules/redis": { - "version": "4.6.4", - "resolved": "https://registry.npmjs.org/redis/-/redis-4.6.4.tgz", - "integrity": "sha512-wi2tgDdQ+Q8q+PR5FLRx4QvDiWaA+PoJbrzsyFqlClN5R4LplHqN3scs/aGjE//mbz++W19SgxiEnQ27jnCRaA==", + "version": "4.6.10", + "resolved": "https://registry.npmjs.org/redis/-/redis-4.6.10.tgz", + "integrity": "sha512-mmbyhuKgDiJ5TWUhiKhBssz+mjsuSI/lSZNPI9QvZOYzWvYGejtb+W3RlDDf8LD6Bdl5/mZeG8O1feUGhXTxEg==", "dependencies": { "@redis/bloom": "1.2.0", - "@redis/client": "1.5.5", + "@redis/client": "1.5.11", "@redis/graph": "1.1.0", - "@redis/json": "1.0.4", - "@redis/search": "1.1.1", - "@redis/time-series": "1.0.4" + "@redis/json": "1.0.6", + "@redis/search": "1.1.5", + "@redis/time-series": "1.0.5" } }, "node_modules/redis-errors": { @@ -10907,21 +11523,9 @@ "integrity": "sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg==" }, "node_modules/regenerator-runtime": { - "version": "0.13.11", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz", - "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==" - }, - "node_modules/regexpp": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz", - "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==", - "dev": true, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/mysticatea" - } + "version": "0.14.0", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz", + "integrity": "sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA==" }, "node_modules/relateurl": { "version": "0.2.7", @@ -10931,6 +11535,15 @@ "node": ">= 0.10" } }, + "node_modules/repeat-string": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", + "integrity": "sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==", + "dev": true, + "engines": { + "node": ">=0.10" + } + }, "node_modules/require-directory": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", @@ -10948,12 +11561,12 @@ } }, "node_modules/resolve": { - "version": "1.22.1", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz", - "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==", + "version": "1.22.8", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz", + "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==", "dev": true, "dependencies": { - "is-core-module": "^2.9.0", + "is-core-module": "^2.13.0", "path-parse": "^1.0.7", "supports-preserve-symlinks-flag": "^1.0.0" }, @@ -10995,9 +11608,9 @@ } }, "node_modules/resolve.exports": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-1.1.1.tgz", - "integrity": "sha512-/NtpHNDN7jWhAaQ9BvBUYZ6YTXsRBgfqWFWP7BZBaoMJO/I3G5OFzvTuWNlZC3aPjins1F+TNrLKsGbH4rfsRQ==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.2.tgz", + "integrity": "sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg==", "dev": true, "engines": { "node": ">=10" @@ -11039,38 +11652,80 @@ "integrity": "sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==" }, "node_modules/rimraf": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "version": "5.0.5", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-5.0.5.tgz", + "integrity": "sha512-CqDakW+hMe/Bz202FPEymy68P+G50RfMQK+Qo5YUqc9SPipvbGjCGKd0RSKEelbsfQuw3g5NZDSrlZZAJurH1A==", "dependencies": { - "glob": "^7.1.3" + "glob": "^10.3.7" }, "bin": { - "rimraf": "bin.js" + "rimraf": "dist/esm/bin.mjs" }, - "funding": { + "engines": { + "node": ">=14" + }, + "funding": { "url": "https://github.com/sponsors/isaacs" } }, + "node_modules/rimraf/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, "node_modules/rimraf/node_modules/glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "version": "10.3.10", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz", + "integrity": "sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==", "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" + "foreground-child": "^3.1.0", + "jackspeak": "^2.3.5", + "minimatch": "^9.0.1", + "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0", + "path-scurry": "^1.10.1" + }, + "bin": { + "glob": "dist/esm/bin.mjs" }, "engines": { - "node": "*" + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/rimraf/node_modules/minimatch": { + "version": "9.0.3", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", + "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=16 || 14 >=14.17" }, "funding": { "url": "https://github.com/sponsors/isaacs" } }, + "node_modules/run-applescript": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/run-applescript/-/run-applescript-5.0.0.tgz", + "integrity": "sha512-XcT5rBksx1QdIhlFOCtgZkB99ZEouFZ1E2Kc2LHqNW13U3/74YGdkQRmThTwxy4QIyookibDKYZOPqX//6BlAg==", + "dev": true, + "dependencies": { + "execa": "^5.0.0" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/run-async": { "version": "2.4.1", "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz", @@ -11104,9 +11759,9 @@ } }, "node_modules/rxjs": { - "version": "7.8.0", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.0.tgz", - "integrity": "sha512-F2+gxDshqmIub1KdvZkaEfGDwLNpPvk9Fs6LD/MyQxNgMds/WH9OdDDXOmxUZpME+iSK3rQCctkL0DYyytUqMg==", + "version": "7.8.1", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz", + "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==", "dependencies": { "tslib": "^2.1.0" } @@ -11139,9 +11794,9 @@ } }, "node_modules/safe-stable-stringify": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.4.2.tgz", - "integrity": "sha512-gMxvPJYhP0O9n2pvcfYfIuYgbledAOJFcqRThtPRmjscaipiwcwPPKLytpVzMkG2HAN87Qmo2d4PtGiri1dSLA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.4.3.tgz", + "integrity": "sha512-e2bDA2WJT0wxseVd4lsDP4+3ONX6HpMXQa1ZhFQ7SU+GjvORCmShbCMltrtIDfkYhVHrOcPtj+KhmDBdPdZD1g==", "engines": { "node": ">=10" } @@ -11151,15 +11806,10 @@ "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" }, - "node_modules/sax": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", - "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==" - }, "node_modules/schema-utils": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz", - "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz", + "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==", "dev": true, "dependencies": { "@types/json-schema": "^7.0.8", @@ -11250,9 +11900,24 @@ } }, "node_modules/set-cookie-parser": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-2.5.1.tgz", - "integrity": "sha512-1jeBGaKNGdEq4FgIrORu/N570dwoPYio8lSoYLWmX7sQ//0JY08Xh9o5pBcgmHQ/MbsYp/aZnOe1s1lIsbLprQ==" + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-2.6.0.tgz", + "integrity": "sha512-RVnVQxTXuerk653XfuliOxBP81Sf0+qfQE73LIYKcyMYHG94AuH0kgrQpRDuTZnSmjpysHmzxJXKNfa6PjFhyQ==" + }, + "node_modules/set-function-length": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.1.1.tgz", + "integrity": "sha512-VoaqjbBJKiWtg4yRcKBQ7g7wnGnLV3M8oLvVWwOk2PdYY6PEFegR1vezXR0tw6fZGF9csVakIRjrJiy2veSBFQ==", + "dev": true, + "dependencies": { + "define-data-property": "^1.1.1", + "get-intrinsic": "^1.2.1", + "gopd": "^1.0.1", + "has-property-descriptors": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + } }, "node_modules/setprototypeof": { "version": "1.2.0", @@ -11275,7 +11940,6 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", - "dev": true, "dependencies": { "shebang-regex": "^3.0.0" }, @@ -11287,7 +11951,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", - "dev": true, "engines": { "node": ">=8" } @@ -11343,11 +12006,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/sigmund": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz", - "integrity": "sha512-fCvEXfh6NWpm+YSuY2bpXb/VIihqWA6hLsgboC+0nl71Q7N7o2eaCW8mJa/NLvQhs6jpd3VZV4UiUQlV6+lc8g==" - }, "node_modules/signal-exit": { "version": "3.0.7", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", @@ -11358,6 +12016,7 @@ "version": "14.0.2", "resolved": "https://registry.npmjs.org/sinon/-/sinon-14.0.2.tgz", "integrity": "sha512-PDpV0ZI3ZCS3pEqx0vpNp6kzPhHrLx72wA0G+ZLaaJjLIYeE0n8INlgaohKuGy7hP0as5tbUd23QWu5U233t+w==", + "deprecated": "16.1.1", "dev": true, "dependencies": { "@sinonjs/commons": "^2.0.0", @@ -11381,6 +12040,24 @@ "type-detect": "4.0.8" } }, + "node_modules/sinon/node_modules/@sinonjs/fake-timers": { + "version": "9.1.2", + "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-9.1.2.tgz", + "integrity": "sha512-BPS4ynJW/o92PUR4wgriz2Ud5gpST5vz6GQfMixEDK0Z8ZCUv2M7SkBLykH56T++Xs+8ln9zTGbOvNGIe02/jw==", + "dev": true, + "dependencies": { + "@sinonjs/commons": "^1.7.0" + } + }, + "node_modules/sinon/node_modules/@sinonjs/fake-timers/node_modules/@sinonjs/commons": { + "version": "1.8.6", + "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.6.tgz", + "integrity": "sha512-Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ==", + "dev": true, + "dependencies": { + "type-detect": "4.0.8" + } + }, "node_modules/sisteransi": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz", @@ -11405,9 +12082,9 @@ } }, "node_modules/sonic-boom": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/sonic-boom/-/sonic-boom-3.2.1.tgz", - "integrity": "sha512-iITeTHxy3B9FGu8aVdiDXUVAcHMF9Ss0cCsAOo2HfCrmVGT3/DT5oYaeu0M/YKZDlKTvChEyPq0zI9Hf33EX6A==", + "version": "3.7.0", + "resolved": "https://registry.npmjs.org/sonic-boom/-/sonic-boom-3.7.0.tgz", + "integrity": "sha512-IudtNvSqA/ObjN97tfgNmOKyDOs4dNcg4cUUsHDebqsgb8wGBBwb31LIgShNO8fye0dFI52X1+tFoKKI6Rq1Gg==", "dependencies": { "atomic-sleep": "^1.0.0" } @@ -11438,17 +12115,10 @@ "node": ">=0.10.0" } }, - "node_modules/sourcemap-codec": { - "version": "1.4.8", - "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz", - "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==", - "deprecated": "Please use @jridgewell/sourcemap-codec instead", - "dev": true - }, "node_modules/split2": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/split2/-/split2-4.1.0.tgz", - "integrity": "sha512-VBiJxFkxiXRlUIeyMQi8s4hgvKCSjtknJv/LVYbrgALPwf5zSKmEwV9Lst25AkvMDnvxODugjdl6KZgwKM1WYQ==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/split2/-/split2-4.2.0.tgz", + "integrity": "sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg==", "engines": { "node": ">= 10.x" } @@ -11506,7 +12176,6 @@ "version": "1.3.0", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", - "dev": true, "dependencies": { "safe-buffer": "~5.2.0" } @@ -11537,6 +12206,20 @@ "node": ">=8" } }, + "node_modules/string-width-cjs": { + "name": "string-width", + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/strip-ansi": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", @@ -11548,6 +12231,18 @@ "node": ">=8" } }, + "node_modules/strip-ansi-cjs": { + "name": "strip-ansi", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/strip-bom": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz", @@ -11584,9 +12279,9 @@ "integrity": "sha512-J8bbNyKKXl5qYcR36TIO8W3mVGVHrmmxsd5PAItGkmyzwJvybiw2IVq5nqd0i4LSNSkB/sx9VHllbfFdr9k1JA==" }, "node_modules/superagent": { - "version": "8.0.9", - "resolved": "https://registry.npmjs.org/superagent/-/superagent-8.0.9.tgz", - "integrity": "sha512-4C7Bh5pyHTvU33KpZgwrNKh/VQnvgtCSqPRfJAUdmrtSYePVzVg4E4OzsrbkhJj9O7SO6Bnv75K/F8XVZT8YHA==", + "version": "8.1.2", + "resolved": "https://registry.npmjs.org/superagent/-/superagent-8.1.2.tgz", + "integrity": "sha512-6WTxW1EB6yCxV5VFOIPQruWGHqc3yI7hEmZK6h+pyk69Lk/Ut7rLUY6W/ONF2MjBuGjvmMiIpsrVJ2vjrHlslA==", "dev": true, "dependencies": { "component-emitter": "^1.3.0", @@ -11640,19 +12335,6 @@ "node": ">=8" } }, - "node_modules/supports-hyperlinks": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.3.0.tgz", - "integrity": "sha512-RpsAZlpWcDwOPQA22aCH4J0t7L8JmAvsCxfOSEwm7cQs3LshN36QaTkwd70DnBOXDWGssw2eUoc8CaRWT0XunA==", - "dev": true, - "dependencies": { - "has-flag": "^4.0.0", - "supports-color": "^7.0.0" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/supports-preserve-symlinks-flag": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", @@ -11666,9 +12348,9 @@ } }, "node_modules/swagger-ui-dist": { - "version": "4.15.5", - "resolved": "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-4.15.5.tgz", - "integrity": "sha512-V3eIa28lwB6gg7/wfNvAbjwJYmDXy1Jo1POjyTzlB6wPcHiGlRxq39TSjYGVjQrUSAzpv+a7nzp7mDxgNy57xA==" + "version": "5.9.0", + "resolved": "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-5.9.0.tgz", + "integrity": "sha512-NUHSYoe5XRTk/Are8jPJ6phzBh3l9l33nEyXosM17QInoV95/jng8+PuSGtbD407QoPf93MH3Bkh773OgesJpA==" }, "node_modules/symbol-observable": { "version": "4.0.0", @@ -11679,6 +12361,22 @@ "node": ">=0.10" } }, + "node_modules/synckit": { + "version": "0.8.5", + "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.8.5.tgz", + "integrity": "sha512-L1dapNV6vu2s/4Sputv8xGsCdAVlb5nRDMFU/E27D44l5U6cw1g0dGd45uLc+OXjNMmF4ntiMdCimzcjFKQI8Q==", + "dev": true, + "dependencies": { + "@pkgr/utils": "^2.3.1", + "tslib": "^2.5.0" + }, + "engines": { + "node": "^14.18.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/unts" + } + }, "node_modules/tapable": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz", @@ -11715,30 +12413,14 @@ } } }, - "node_modules/terminal-link": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/terminal-link/-/terminal-link-2.1.1.tgz", - "integrity": "sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==", - "dev": true, - "dependencies": { - "ansi-escapes": "^4.2.1", - "supports-hyperlinks": "^2.0.0" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/terser": { - "version": "5.16.2", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.16.2.tgz", - "integrity": "sha512-JKuM+KvvWVqT7muHVyrwv7FVRPnmHDwF6XwoIxdbF5Witi0vu99RYpxDexpJndXt3jbZZmmWr2/mQa6HvSNdSg==", + "version": "5.24.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.24.0.tgz", + "integrity": "sha512-ZpGR4Hy3+wBEzVEnHvstMvqpD/nABNelQn/z2r0fjVWGQsN3bpOLzQlqDxmb4CDZnXq5lpjnQ+mHQLAOpfM5iw==", "dev": true, "dependencies": { - "@jridgewell/source-map": "^0.3.2", - "acorn": "^8.5.0", + "@jridgewell/source-map": "^0.3.3", + "acorn": "^8.8.2", "commander": "^2.20.0", "source-map-support": "~0.5.20" }, @@ -11750,16 +12432,16 @@ } }, "node_modules/terser-webpack-plugin": { - "version": "5.3.6", - "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.6.tgz", - "integrity": "sha512-kfLFk+PoLUQIbLmB1+PZDMRSZS99Mp+/MHqDNmMA6tOItzRt+Npe3E+fsMs5mfcM0wCtrrdU387UnV+vnSffXQ==", + "version": "5.3.9", + "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.9.tgz", + "integrity": "sha512-ZuXsqE07EcggTWQjXUj+Aot/OMcD0bMKGgF63f7UxYcu5/AJF53aIpK1YoP5xR9l6s/Hy2b+t1AM0bLNPRuhwA==", "dev": true, "dependencies": { - "@jridgewell/trace-mapping": "^0.3.14", + "@jridgewell/trace-mapping": "^0.3.17", "jest-worker": "^27.4.5", "schema-utils": "^3.1.1", - "serialize-javascript": "^6.0.0", - "terser": "^5.14.1" + "serialize-javascript": "^6.0.1", + "terser": "^5.16.8" }, "engines": { "node": ">= 10.13.0" @@ -11882,10 +12564,22 @@ "node": ">=0.8" } }, + "node_modules/thingies": { + "version": "1.12.0", + "resolved": "https://registry.npmjs.org/thingies/-/thingies-1.12.0.tgz", + "integrity": "sha512-AiGqfYC1jLmJagbzQGuoZRM48JPsr9yB734a7K6wzr34NMhjUPrWSQrkF7ZBybf3yCerCL2Gcr02kMv4NmaZfA==", + "dev": true, + "engines": { + "node": ">=10.18" + }, + "peerDependencies": { + "tslib": "^2" + } + }, "node_modules/thread-stream": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/thread-stream/-/thread-stream-2.3.0.tgz", - "integrity": "sha512-kaDqm1DET9pp3NXwR8382WHbnpXnRkN9xGN9dQt3B2+dmXiW8X1SOwmFOxAErEQ47ObhZ96J6yhZNXuyCOL7KA==", + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/thread-stream/-/thread-stream-2.4.1.tgz", + "integrity": "sha512-d/Ex2iWd1whipbT681JmTINKw0ZwOUBZm7+Gjs64DHuX34mmw8vJL2bFAaNacaW72zYiTJxSHi5abUuOi5nsfg==", "dependencies": { "real-require": "^0.2.0" } @@ -11896,12 +12590,16 @@ "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==", "dev": true }, - "node_modules/tiny-lru": { - "version": "10.0.1", - "resolved": "https://registry.npmjs.org/tiny-lru/-/tiny-lru-10.0.1.tgz", - "integrity": "sha512-Vst+6kEsWvb17Zpz14sRJV/f8bUWKhqm6Dc+v08iShmIJ/WxqWytHzCTd6m88pS33rE2zpX34TRmOpAJPloNCA==", + "node_modules/titleize": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/titleize/-/titleize-3.0.0.tgz", + "integrity": "sha512-KxVu8EYHDPBdUYdKZdKtU2aj2XfEx9AfjXxE/Aj0vT06w2icA09Vus1rh6eSu1y01akYg6BjIK/hxyLJINoMLQ==", + "dev": true, "engines": { - "node": ">=6" + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/tmp": { @@ -11942,6 +12640,14 @@ "node": ">=8.0" } }, + "node_modules/toad-cache": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/toad-cache/-/toad-cache-3.3.0.tgz", + "integrity": "sha512-3oDzcogWGHZdkwrHyvJVpPjA7oNzY6ENOV3PsWJY9XYPZ6INo94Yd47s5may1U+nleBPwDhrRiTPMIvKaa3MQg==", + "engines": { + "node": ">=12" + } + }, "node_modules/toidentifier": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", @@ -11964,42 +12670,58 @@ "tree-kill": "cli.js" } }, + "node_modules/ts-api-utils": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.0.3.tgz", + "integrity": "sha512-wNMeqtMz5NtwpT/UZGY5alT+VoKdSsOOP/kqHFcUW1P/VRhH2wJ48+DN2WwUliNbQ976ETwDL0Ifd2VVvgonvg==", + "dev": true, + "engines": { + "node": ">=16.13.0" + }, + "peerDependencies": { + "typescript": ">=4.2.0" + } + }, "node_modules/ts-case-convert": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/ts-case-convert/-/ts-case-convert-2.0.2.tgz", "integrity": "sha512-vdKfx1VAdpvEBOBv5OpVu5ZFqRg9HdTI4sYt6qqMeICBeNyXvitrarCnFWNDAki51IKwCyx+ZssY46Q9jH5otA==" }, "node_modules/ts-jest": { - "version": "28.0.5", - "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-28.0.5.tgz", - "integrity": "sha512-Sx9FyP9pCY7pUzQpy4FgRZf2bhHY3za576HMKJFs+OnQ9jS96Du5vNsDKkyedQkik+sEabbKAnCliv9BEsHZgQ==", + "version": "29.1.1", + "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.1.1.tgz", + "integrity": "sha512-D6xjnnbP17cC85nliwGiL+tpoKN0StpgE0TeOjXQTU6MVCfsB4v7aW05CgQ/1OywGb0x/oy9hHFnN+sczTiRaA==", "dev": true, "dependencies": { "bs-logger": "0.x", "fast-json-stable-stringify": "2.x", - "jest-util": "^28.0.0", - "json5": "^2.2.1", + "jest-util": "^29.0.0", + "json5": "^2.2.3", "lodash.memoize": "4.x", "make-error": "1.x", - "semver": "7.x", + "semver": "^7.5.3", "yargs-parser": "^21.0.1" }, "bin": { "ts-jest": "cli.js" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" }, "peerDependencies": { "@babel/core": ">=7.0.0-beta.0 <8", - "babel-jest": "^28.0.0", - "jest": "^28.0.0", - "typescript": ">=4.3" + "@jest/types": "^29.0.0", + "babel-jest": "^29.0.0", + "jest": "^29.0.0", + "typescript": ">=4.3 <6" }, "peerDependenciesMeta": { "@babel/core": { "optional": true }, + "@jest/types": { + "optional": true + }, "babel-jest": { "optional": true }, @@ -12009,15 +12731,16 @@ } }, "node_modules/ts-loader": { - "version": "9.4.2", - "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-9.4.2.tgz", - "integrity": "sha512-OmlC4WVmFv5I0PpaxYb+qGeGOdm5giHU7HwDDUjw59emP2UYMHy9fFSDcYgSNoH8sXcj4hGCSEhlDZ9ULeDraA==", + "version": "9.5.0", + "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-9.5.0.tgz", + "integrity": "sha512-LLlB/pkB4q9mW2yLdFMnK3dEHbrBjeZTYguaaIfusyojBgAGf5kF+O6KcWqiGzWqHk0LBsoolrp4VftEURhybg==", "dev": true, "dependencies": { "chalk": "^4.1.0", "enhanced-resolve": "^5.0.0", "micromatch": "^4.0.0", - "semver": "^7.3.4" + "semver": "^7.3.4", + "source-map": "^0.7.4" }, "engines": { "node": ">=12.0.0" @@ -12027,22 +12750,6 @@ "webpack": "^5.0.0" } }, - "node_modules/ts-loader/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, "node_modules/ts-node": { "version": "10.9.1", "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.1.tgz", @@ -12086,6 +12793,12 @@ } } }, + "node_modules/ts-node/node_modules/arg": { + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz", + "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==", + "devOptional": true + }, "node_modules/ts-node/node_modules/diff": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", @@ -12096,95 +12809,34 @@ } }, "node_modules/ts-poet": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/ts-poet/-/ts-poet-6.3.0.tgz", - "integrity": "sha512-RjS37SnXMa9En8xvQf//+rvNNNCB7x2TKP/ZfsiQFidtfN3A6FYgPDESe4r7YA3F663XO2ozx+2buQItGOLMxg==", + "version": "6.6.0", + "resolved": "https://registry.npmjs.org/ts-poet/-/ts-poet-6.6.0.tgz", + "integrity": "sha512-4vEH/wkhcjRPFOdBwIh9ItO6jOoumVLRF4aABDX5JSNEubSqwOulihxQPqai+OkuygJm3WYMInxXQX4QwVNMuw==", "dependencies": { "dprint-node": "^1.0.7" } }, "node_modules/ts-proto": { - "version": "1.139.0", - "resolved": "https://registry.npmjs.org/ts-proto/-/ts-proto-1.139.0.tgz", - "integrity": "sha512-DXfRVbsEnzan/tpb7RxuJOgjhzwuxDsyXbYSnF8JHCIDcJ/JxeqeUyDUVICFGmgqrsPcnjn5t3iqOUZRNRm9tg==", - "dependencies": { - "@types/object-hash": "^1.3.0", - "case-anything": "^2.1.10", - "dataloader": "^1.4.0", - "object-hash": "^1.3.1", - "protobufjs": "^6.11.3", - "ts-poet": "^6.2.0", - "ts-proto-descriptors": "1.7.1" + "version": "1.163.0", + "resolved": "https://registry.npmjs.org/ts-proto/-/ts-proto-1.163.0.tgz", + "integrity": "sha512-jpC4oA86NkN015R2YHGj9bhOJEYOuop4JddmADixRxBcBBcfCgkh7mhxA10BWrmk3/oyczI3T//UNK4x3P9/Sw==", + "dependencies": { + "case-anything": "^2.1.13", + "protobufjs": "^7.2.4", + "ts-poet": "^6.5.0", + "ts-proto-descriptors": "1.15.0" }, "bin": { "protoc-gen-ts_proto": "protoc-gen-ts_proto" } }, "node_modules/ts-proto-descriptors": { - "version": "1.7.1", - "resolved": "https://registry.npmjs.org/ts-proto-descriptors/-/ts-proto-descriptors-1.7.1.tgz", - "integrity": "sha512-oIKUh3K4Xts4v29USGLfUG+2mEk32MsqpgZAOUyUlkrcIdv34yE+k2oZ2Nzngm6cV/JgFdOxRCqeyvmWHuYAyw==", - "dependencies": { - "long": "^4.0.0", - "protobufjs": "^6.8.8" - } - }, - "node_modules/ts-proto-descriptors/node_modules/protobufjs": { - "version": "6.11.3", - "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.11.3.tgz", - "integrity": "sha512-xL96WDdCZYdU7Slin569tFX712BxsxslWwAfAhCYjQKGTq7dAU91Lomy6nLLhh/dyGhk/YH4TwTSRxTzhuHyZg==", - "hasInstallScript": true, - "dependencies": { - "@protobufjs/aspromise": "^1.1.2", - "@protobufjs/base64": "^1.1.2", - "@protobufjs/codegen": "^2.0.4", - "@protobufjs/eventemitter": "^1.1.0", - "@protobufjs/fetch": "^1.1.0", - "@protobufjs/float": "^1.0.2", - "@protobufjs/inquire": "^1.1.0", - "@protobufjs/path": "^1.1.2", - "@protobufjs/pool": "^1.1.0", - "@protobufjs/utf8": "^1.1.0", - "@types/long": "^4.0.1", - "@types/node": ">=13.7.0", - "long": "^4.0.0" - }, - "bin": { - "pbjs": "bin/pbjs", - "pbts": "bin/pbts" - } - }, - "node_modules/ts-proto/node_modules/object-hash": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-1.3.1.tgz", - "integrity": "sha512-OSuu/pU4ENM9kmREg0BdNrUDIl1heYa4mBZacJc+vVWz4GtAwu7jO8s4AIt2aGRUTqxykpWzI3Oqnsm13tTMDA==", - "engines": { - "node": ">= 0.10.0" - } - }, - "node_modules/ts-proto/node_modules/protobufjs": { - "version": "6.11.3", - "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.11.3.tgz", - "integrity": "sha512-xL96WDdCZYdU7Slin569tFX712BxsxslWwAfAhCYjQKGTq7dAU91Lomy6nLLhh/dyGhk/YH4TwTSRxTzhuHyZg==", - "hasInstallScript": true, + "version": "1.15.0", + "resolved": "https://registry.npmjs.org/ts-proto-descriptors/-/ts-proto-descriptors-1.15.0.tgz", + "integrity": "sha512-TYyJ7+H+7Jsqawdv+mfsEpZPTIj9siDHS6EMCzG/z3b/PZiphsX+mWtqFfFVe5/N0Th6V3elK9lQqjnrgTOfrg==", "dependencies": { - "@protobufjs/aspromise": "^1.1.2", - "@protobufjs/base64": "^1.1.2", - "@protobufjs/codegen": "^2.0.4", - "@protobufjs/eventemitter": "^1.1.0", - "@protobufjs/fetch": "^1.1.0", - "@protobufjs/float": "^1.0.2", - "@protobufjs/inquire": "^1.1.0", - "@protobufjs/path": "^1.1.2", - "@protobufjs/pool": "^1.1.0", - "@protobufjs/utf8": "^1.1.0", - "@types/long": "^4.0.1", - "@types/node": ">=13.7.0", - "long": "^4.0.0" - }, - "bin": { - "pbjs": "bin/pbjs", - "pbts": "bin/pbts" + "long": "^5.2.3", + "protobufjs": "^7.2.4" } }, "node_modules/ts-protoc-gen": { @@ -12199,46 +12851,33 @@ } }, "node_modules/tsconfig-paths": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-4.0.0.tgz", - "integrity": "sha512-SLBg2GBKlR6bVtMgJJlud/o3waplKtL7skmLkExomIiaAtLGtVsoXIqP3SYdjbcH9lq/KVv7pMZeCBpLYOit6Q==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-4.2.0.tgz", + "integrity": "sha512-NoZ4roiN7LnbKn9QqE1amc9DJfzvZXxF4xDavcOWt1BPkdx+m+0gJuPM+S0vCe7zTJMYUP0R8pO2XMr+Y8oLIg==", "dev": true, "dependencies": { - "json5": "^2.2.1", + "json5": "^2.2.2", "minimist": "^1.2.6", "strip-bom": "^3.0.0" + }, + "engines": { + "node": ">=6" } }, "node_modules/tsconfig-paths-webpack-plugin": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/tsconfig-paths-webpack-plugin/-/tsconfig-paths-webpack-plugin-4.0.0.tgz", - "integrity": "sha512-fw/7265mIWukrSHd0i+wSwx64kYUSAKPfxRDksjKIYTxSAp9W9/xcZVBF4Kl0eqQd5eBpAQ/oQrc5RyM/0c1GQ==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/tsconfig-paths-webpack-plugin/-/tsconfig-paths-webpack-plugin-4.1.0.tgz", + "integrity": "sha512-xWFISjviPydmtmgeUAuXp4N1fky+VCtfhOkDUFIv5ea7p4wuTomI4QTrXvFBX2S4jZsmyTSrStQl+E+4w+RzxA==", "dev": true, "dependencies": { "chalk": "^4.1.0", "enhanced-resolve": "^5.7.0", - "tsconfig-paths": "^4.0.0" + "tsconfig-paths": "^4.1.2" }, "engines": { "node": ">=10.13.0" } }, - "node_modules/tsconfig-paths-webpack-plugin/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, "node_modules/tsconfig-paths/node_modules/strip-bom": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", @@ -12249,30 +12888,9 @@ } }, "node_modules/tslib": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.0.tgz", - "integrity": "sha512-7At1WUettjcSRHXCyYtTselblcHl9PJFFVKiCAy/bY97+BPZXSQ2wbq0P9s8tK2G7dFQfNnlJnPAiArVBVBsfA==" - }, - "node_modules/tsutils": { - "version": "3.21.0", - "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz", - "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==", - "dev": true, - "dependencies": { - "tslib": "^1.8.1" - }, - "engines": { - "node": ">= 6" - }, - "peerDependencies": { - "typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta" - } - }, - "node_modules/tsutils/node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", - "dev": true + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" }, "node_modules/type-check": { "version": "0.4.0", @@ -12308,27 +12926,25 @@ } }, "node_modules/typeorm": { - "version": "0.3.11", - "resolved": "https://registry.npmjs.org/typeorm/-/typeorm-0.3.11.tgz", - "integrity": "sha512-pzdOyWbVuz/z8Ww6gqvBW4nylsM0KLdUCDExr2gR20/x1khGSVxQkjNV/3YqliG90jrWzrknYbYscpk8yxFJVg==", + "version": "0.3.17", + "resolved": "https://registry.npmjs.org/typeorm/-/typeorm-0.3.17.tgz", + "integrity": "sha512-UDjUEwIQalO9tWw9O2A4GU+sT3oyoUXheHJy4ft+RFdnRdQctdQ34L9SqE2p7LdwzafHx1maxT+bqXON+Qnmig==", "dependencies": { - "@sqltools/formatter": "^1.2.2", - "app-root-path": "^3.0.0", + "@sqltools/formatter": "^1.2.5", + "app-root-path": "^3.1.0", "buffer": "^6.0.3", - "chalk": "^4.1.0", + "chalk": "^4.1.2", "cli-highlight": "^2.1.11", - "date-fns": "^2.28.0", - "debug": "^4.3.3", - "dotenv": "^16.0.0", - "glob": "^7.2.0", - "js-yaml": "^4.1.0", - "mkdirp": "^1.0.4", + "date-fns": "^2.29.3", + "debug": "^4.3.4", + "dotenv": "^16.0.3", + "glob": "^8.1.0", + "mkdirp": "^2.1.3", "reflect-metadata": "^0.1.13", "sha.js": "^2.4.11", - "tslib": "^2.3.1", - "uuid": "^8.3.2", - "xml2js": "^0.4.23", - "yargs": "^17.3.1" + "tslib": "^2.5.0", + "uuid": "^9.0.0", + "yargs": "^17.6.2" }, "bin": { "typeorm": "cli.js", @@ -12347,9 +12963,9 @@ "better-sqlite3": "^7.1.2 || ^8.0.0", "hdb-pool": "^0.1.6", "ioredis": "^5.0.4", - "mongodb": "^3.6.0", - "mssql": "^7.3.0", - "mysql2": "^2.2.5", + "mongodb": "^5.2.0", + "mssql": "^9.1.1", + "mysql2": "^2.2.5 || ^3.0.1", "oracledb": "^5.1.0", "pg": "^8.5.1", "pg-native": "^3.0.0", @@ -12407,10318 +13023,355 @@ "optional": true }, "ts-node": { - "optional": true - }, - "typeorm-aurora-data-api-driver": { - "optional": true - } - } - }, - "node_modules/typeorm-naming-strategies": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/typeorm-naming-strategies/-/typeorm-naming-strategies-4.1.0.tgz", - "integrity": "sha512-vPekJXzZOTZrdDvTl1YoM+w+sUIfQHG4kZTpbFYoTsufyv9NIBRe4Q+PdzhEAFA2std3D9LZHEb1EjE9zhRpiQ==", - "peerDependencies": { - "typeorm": "^0.2.0 || ^0.3.0" - } - }, - "node_modules/typeorm/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, - "node_modules/typeorm/node_modules/cliui": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", - "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", - "dependencies": { - "string-width": "^4.2.0", - "strip-ansi": "^6.0.1", - "wrap-ansi": "^7.0.0" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/typeorm/node_modules/glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/typeorm/node_modules/yargs": { - "version": "17.6.2", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.6.2.tgz", - "integrity": "sha512-1/9UrdHjDZc0eOU0HxOHoS78C69UD3JRMvzlJ7S79S2nTaWRA/whGCTV8o9e/N/1Va9YIV7Q4sOxD8VV4pCWOw==", - "dependencies": { - "cliui": "^8.0.1", - "escalade": "^3.1.1", - "get-caller-file": "^2.0.5", - "require-directory": "^2.1.1", - "string-width": "^4.2.3", - "y18n": "^5.0.5", - "yargs-parser": "^21.1.1" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/typescript": { - "version": "4.7.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.7.4.tgz", - "integrity": "sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ==", - "devOptional": true, - "bin": { - "tsc": "bin/tsc", - "tsserver": "bin/tsserver" - }, - "engines": { - "node": ">=4.2.0" - } - }, - "node_modules/uglify-js": { - "version": "3.17.4", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.4.tgz", - "integrity": "sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==", - "bin": { - "uglifyjs": "bin/uglifyjs" - }, - "engines": { - "node": ">=0.8.0" - } - }, - "node_modules/uid": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/uid/-/uid-2.0.1.tgz", - "integrity": "sha512-PF+1AnZgycpAIEmNtjxGBVmKbZAQguaa4pBUq6KNaGEcpzZ2klCNZLM34tsjp76maN00TttiiUf6zkIBpJQm2A==", - "dependencies": { - "@lukeed/csprng": "^1.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/unionfs": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/unionfs/-/unionfs-4.4.0.tgz", - "integrity": "sha512-N+TuJHJ3PjmzIRCE1d2N3VN4qg/P78eh/nxzwHnzpg3W2Mvf8Wvi7J1mvv6eNkb8neUeSdFSQsKna0eXVyF4+w==", - "dev": true, - "dependencies": { - "fs-monkey": "^1.0.0" - } - }, - "node_modules/universalify": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", - "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==", - "dev": true, - "engines": { - "node": ">= 10.0.0" - } - }, - "node_modules/update-browserslist-db": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz", - "integrity": "sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==", - "dev": true, - "funding": [ - { - "type": "opencollective", - "url": "https://opencollective.com/browserslist" - }, - { - "type": "tidelift", - "url": "https://tidelift.com/funding/github/npm/browserslist" - } - ], - "dependencies": { - "escalade": "^3.1.1", - "picocolors": "^1.0.0" - }, - "bin": { - "browserslist-lint": "cli.js" - }, - "peerDependencies": { - "browserslist": ">= 4.21.0" - } - }, - "node_modules/upper-case": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz", - "integrity": "sha512-WRbjgmYzgXkCV7zNVpy5YgrHgbBv126rMALQQMrmzOVC4GM2waQ9x7xtm8VU+1yF2kWyPzI9zbZ48n4vSxwfSA==" - }, - "node_modules/uri-js": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", - "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", - "dependencies": { - "punycode": "^2.1.0" - } - }, - "node_modules/util-deprecate": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", - "dev": true - }, - "node_modules/uuid": { - "version": "8.3.2", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", - "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==", - "bin": { - "uuid": "dist/bin/uuid" - } - }, - "node_modules/v8-compile-cache-lib": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz", - "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==", - "devOptional": true - }, - "node_modules/v8-to-istanbul": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.0.1.tgz", - "integrity": "sha512-74Y4LqY74kLE6IFyIjPtkSTWzUZmj8tdHT9Ii/26dvQ6K9Dl2NbEfj0XgU2sHCtKgt5VupqhlO/5aWuqS+IY1w==", - "dev": true, - "dependencies": { - "@jridgewell/trace-mapping": "^0.3.12", - "@types/istanbul-lib-coverage": "^2.0.1", - "convert-source-map": "^1.6.0" - }, - "engines": { - "node": ">=10.12.0" - } - }, - "node_modules/valid-data-url": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/valid-data-url/-/valid-data-url-3.0.1.tgz", - "integrity": "sha512-jOWVmzVceKlVVdwjNSenT4PbGghU0SBIizAev8ofZVgivk/TVHXSbNL8LP6M3spZvkR9/QolkyJavGSX5Cs0UA==", - "engines": { - "node": ">=10" - } - }, - "node_modules/validator": { - "version": "13.9.0", - "resolved": "https://registry.npmjs.org/validator/-/validator-13.9.0.tgz", - "integrity": "sha512-B+dGG8U3fdtM0/aNK4/X8CXq/EcxU2WPrPEkJGslb47qyHsxmbggTWK0yEA4qnYVNF+nxNlN88o14hIcPmSIEA==", - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/walker": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz", - "integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==", - "dev": true, - "dependencies": { - "makeerror": "1.0.12" - } - }, - "node_modules/watchpack": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz", - "integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==", - "dev": true, - "dependencies": { - "glob-to-regexp": "^0.4.1", - "graceful-fs": "^4.1.2" - }, - "engines": { - "node": ">=10.13.0" - } - }, - "node_modules/wcwidth": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz", - "integrity": "sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==", - "dev": true, - "dependencies": { - "defaults": "^1.0.3" - } - }, - "node_modules/web-resource-inliner": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/web-resource-inliner/-/web-resource-inliner-5.0.0.tgz", - "integrity": "sha512-AIihwH+ZmdHfkJm7BjSXiEClVt4zUFqX4YlFAzjL13wLtDuUneSaFvDBTbdYRecs35SiU7iNKbMnN+++wVfb6A==", - "dependencies": { - "ansi-colors": "^4.1.1", - "escape-goat": "^3.0.0", - "htmlparser2": "^4.0.0", - "mime": "^2.4.6", - "node-fetch": "^2.6.0", - "valid-data-url": "^3.0.0" - }, - "engines": { - "node": ">=10.0.0" - } - }, - "node_modules/web-resource-inliner/node_modules/domhandler": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-3.3.0.tgz", - "integrity": "sha512-J1C5rIANUbuYK+FuFL98650rihynUOEzRLxW+90bKZRWB6A1X1Tf82GxR1qAWLyfNPRvjqfip3Q5tdYlmAa9lA==", - "dependencies": { - "domelementtype": "^2.0.1" - }, - "engines": { - "node": ">= 4" - }, - "funding": { - "url": "https://github.com/fb55/domhandler?sponsor=1" - } - }, - "node_modules/web-resource-inliner/node_modules/htmlparser2": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-4.1.0.tgz", - "integrity": "sha512-4zDq1a1zhE4gQso/c5LP1OtrhYTncXNSpvJYtWJBtXAETPlMfi3IFNjGuQbYLuVY4ZR0QMqRVvo4Pdy9KLyP8Q==", - "dependencies": { - "domelementtype": "^2.0.1", - "domhandler": "^3.0.0", - "domutils": "^2.0.0", - "entities": "^2.0.0" - } - }, - "node_modules/web-resource-inliner/node_modules/mime": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz", - "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==", - "bin": { - "mime": "cli.js" - }, - "engines": { - "node": ">=4.0.0" - } - }, - "node_modules/webidl-conversions": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", - "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" - }, - "node_modules/webpack": { - "version": "5.75.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.75.0.tgz", - "integrity": "sha512-piaIaoVJlqMsPtX/+3KTTO6jfvrSYgauFVdt8cr9LTHKmcq/AMd4mhzsiP7ZF/PGRNPGA8336jldh9l2Kt2ogQ==", - "dev": true, - "dependencies": { - "@types/eslint-scope": "^3.7.3", - "@types/estree": "^0.0.51", - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/wasm-edit": "1.11.1", - "@webassemblyjs/wasm-parser": "1.11.1", - "acorn": "^8.7.1", - "acorn-import-assertions": "^1.7.6", - "browserslist": "^4.14.5", - "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^5.10.0", - "es-module-lexer": "^0.9.0", - "eslint-scope": "5.1.1", - "events": "^3.2.0", - "glob-to-regexp": "^0.4.1", - "graceful-fs": "^4.2.9", - "json-parse-even-better-errors": "^2.3.1", - "loader-runner": "^4.2.0", - "mime-types": "^2.1.27", - "neo-async": "^2.6.2", - "schema-utils": "^3.1.0", - "tapable": "^2.1.1", - "terser-webpack-plugin": "^5.1.3", - "watchpack": "^2.4.0", - "webpack-sources": "^3.2.3" - }, - "bin": { - "webpack": "bin/webpack.js" - }, - "engines": { - "node": ">=10.13.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/webpack" - }, - "peerDependenciesMeta": { - "webpack-cli": { - "optional": true - } - } - }, - "node_modules/webpack-node-externals": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/webpack-node-externals/-/webpack-node-externals-3.0.0.tgz", - "integrity": "sha512-LnL6Z3GGDPht/AigwRh2dvL9PQPFQ8skEpVrWZXLWBYmqcaojHNN0onvHzie6rq7EWKrrBfPYqNEzTJgiwEQDQ==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/webpack-sources": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz", - "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==", - "dev": true, - "engines": { - "node": ">=10.13.0" - } - }, - "node_modules/whatwg-url": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", - "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", - "dependencies": { - "tr46": "~0.0.3", - "webidl-conversions": "^3.0.0" - } - }, - "node_modules/which": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", - "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", - "dev": true, - "dependencies": { - "isexe": "^2.0.0" - }, - "bin": { - "node-which": "bin/node-which" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/windows-release": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/windows-release/-/windows-release-4.0.0.tgz", - "integrity": "sha512-OxmV4wzDKB1x7AZaZgXMVsdJ1qER1ed83ZrTYd5Bwq2HfJVg3DJS8nqlAG4sMoJ7mu8cuRmLEYyU13BKwctRAg==", - "dev": true, - "dependencies": { - "execa": "^4.0.2" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/windows-release/node_modules/execa": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz", - "integrity": "sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==", - "dev": true, - "dependencies": { - "cross-spawn": "^7.0.0", - "get-stream": "^5.0.0", - "human-signals": "^1.1.1", - "is-stream": "^2.0.0", - "merge-stream": "^2.0.0", - "npm-run-path": "^4.0.0", - "onetime": "^5.1.0", - "signal-exit": "^3.0.2", - "strip-final-newline": "^2.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sindresorhus/execa?sponsor=1" - } - }, - "node_modules/windows-release/node_modules/get-stream": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", - "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", - "dev": true, - "dependencies": { - "pump": "^3.0.0" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/windows-release/node_modules/human-signals": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz", - "integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==", - "dev": true, - "engines": { - "node": ">=8.12.0" - } - }, - "node_modules/word-wrap": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", - "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/wordwrap": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", - "integrity": "sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==" - }, - "node_modules/wrap-ansi": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", - "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", - "dependencies": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/wrap-ansi?sponsor=1" - } - }, - "node_modules/wrappy": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==" - }, - "node_modules/write-file-atomic": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz", - "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==", - "dev": true, - "dependencies": { - "imurmurhash": "^0.1.4", - "signal-exit": "^3.0.7" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/xml2js": { - "version": "0.4.23", - "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz", - "integrity": "sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==", - "dependencies": { - "sax": ">=0.6.0", - "xmlbuilder": "~11.0.0" - }, - "engines": { - "node": ">=4.0.0" - } - }, - "node_modules/xmlbuilder": { - "version": "11.0.1", - "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz", - "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==", - "engines": { - "node": ">=4.0" - } - }, - "node_modules/xtend": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", - "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==", - "engines": { - "node": ">=0.4" - } - }, - "node_modules/y18n": { - "version": "5.0.8", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", - "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", - "engines": { - "node": ">=10" - } - }, - "node_modules/yallist": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", - "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", - "dev": true - }, - "node_modules/yaml": { - "version": "1.10.2", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz", - "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==", - "dev": true, - "engines": { - "node": ">= 6" - } - }, - "node_modules/yargs": { - "version": "16.2.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", - "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", - "dependencies": { - "cliui": "^7.0.2", - "escalade": "^3.1.1", - "get-caller-file": "^2.0.5", - "require-directory": "^2.1.1", - "string-width": "^4.2.0", - "y18n": "^5.0.5", - "yargs-parser": "^20.2.2" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/yargs-parser": { - "version": "21.1.1", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", - "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", - "engines": { - "node": ">=12" - } - }, - "node_modules/yargs/node_modules/yargs-parser": { - "version": "20.2.9", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", - "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", - "engines": { - "node": ">=10" - } - }, - "node_modules/yauzl": { - "version": "2.10.0", - "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz", - "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==", - "optional": true, - "dependencies": { - "buffer-crc32": "~0.2.3", - "fd-slicer": "~1.1.0" - } - }, - "node_modules/yn": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz", - "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==", - "devOptional": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/yocto-queue": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", - "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - } - }, - "dependencies": { - "@ampproject/remapping": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz", - "integrity": "sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==", - "dev": true, - "requires": { - "@jridgewell/gen-mapping": "^0.1.0", - "@jridgewell/trace-mapping": "^0.3.9" - } - }, - "@angular-devkit/core": { - "version": "15.0.4", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-15.0.4.tgz", - "integrity": "sha512-4ITpRAevd652SxB+qNesIQ9qfbm7wT5UBU5kJOPPwGL77I21g8CQpkmV1n5VSacPvC9Zbz90feOWexf7w7JzcA==", - "dev": true, - "requires": { - "ajv": "8.11.0", - "ajv-formats": "2.1.1", - "jsonc-parser": "3.2.0", - "rxjs": "6.6.7", - "source-map": "0.7.4" - }, - "dependencies": { - "rxjs": { - "version": "6.6.7", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", - "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", - "dev": true, - "requires": { - "tslib": "^1.9.0" - } - }, - "tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", - "dev": true - } - } - }, - "@angular-devkit/schematics": { - "version": "15.0.4", - "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-15.0.4.tgz", - "integrity": "sha512-/gXiLFS0+xFdx6wPoBpe/c6/K9I5edMpaASqPf4XheKtrsSvL+qTlIi3nsbfItzOiDXbaBmlbxGfkMHz/yg0Ig==", - "dev": true, - "requires": { - "@angular-devkit/core": "15.0.4", - "jsonc-parser": "3.2.0", - "magic-string": "0.26.7", - "ora": "5.4.1", - "rxjs": "6.6.7" - }, - "dependencies": { - "rxjs": { - "version": "6.6.7", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", - "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", - "dev": true, - "requires": { - "tslib": "^1.9.0" - } - }, - "tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", - "dev": true - } - } - }, - "@angular-devkit/schematics-cli": { - "version": "15.0.4", - "resolved": "https://registry.npmjs.org/@angular-devkit/schematics-cli/-/schematics-cli-15.0.4.tgz", - "integrity": "sha512-rEzkpjiQcJqCgbZ1Ns8jn1BL4724jcj+YFS7Qw5d4v6yQYA8iSLz12HDTH0TiNEv7u5S55fYuRz2QreI0QUT8A==", - "dev": true, - "requires": { - "@angular-devkit/core": "15.0.4", - "@angular-devkit/schematics": "15.0.4", - "ansi-colors": "4.1.3", - "inquirer": "8.2.4", - "symbol-observable": "4.0.0", - "yargs-parser": "21.1.1" - }, - "dependencies": { - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "inquirer": { - "version": "8.2.4", - "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-8.2.4.tgz", - "integrity": "sha512-nn4F01dxU8VeKfq192IjLsxu0/OmMZ4Lg3xKAns148rCaXP6ntAoEkVYZThWjwON8AlzdZZi6oqnhNbxUG9hVg==", - "dev": true, - "requires": { - "ansi-escapes": "^4.2.1", - "chalk": "^4.1.1", - "cli-cursor": "^3.1.0", - "cli-width": "^3.0.0", - "external-editor": "^3.0.3", - "figures": "^3.0.0", - "lodash": "^4.17.21", - "mute-stream": "0.0.8", - "ora": "^5.4.1", - "run-async": "^2.4.0", - "rxjs": "^7.5.5", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0", - "through": "^2.3.6", - "wrap-ansi": "^7.0.0" - } - } - } - }, - "@automapper/classes": { - "version": "8.7.7", - "resolved": "https://registry.npmjs.org/@automapper/classes/-/classes-8.7.7.tgz", - "integrity": "sha512-FSbvt6QE8XnhKKQZA3kpKLuLrr9x1iW+lNYTrawVLjxQ05zsCGccLxe7moMNrg1wFAVAouQKupFgCGQ7XRjmJw==", - "requires": {} - }, - "@automapper/core": { - "version": "8.7.7", - "resolved": "https://registry.npmjs.org/@automapper/core/-/core-8.7.7.tgz", - "integrity": "sha512-YfpDJ/xqwUuC0S+BLNk81ZJfeL7CmjirUX/Gk9eQyx146DKvneBZgeZ9v5rDB51Ti14jTxVHis+5JuT7W/q0TA==" - }, - "@automapper/nestjs": { - "version": "8.7.7", - "resolved": "https://registry.npmjs.org/@automapper/nestjs/-/nestjs-8.7.7.tgz", - "integrity": "sha512-9/uYY2cmN7SJjr2QxnfyXsteHrn/RHD+Dg0VMBflzK/e8Bh/KWyOve7+kaFixlUoyHe44aXs2LVaCslqt8wnhQ==", - "requires": {} - }, - "@aws-crypto/crc32": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@aws-crypto/crc32/-/crc32-3.0.0.tgz", - "integrity": "sha512-IzSgsrxUcsrejQbPVilIKy16kAT52EwB6zSaI+M3xxIhKh5+aldEyvI+z6erM7TCLB2BJsFrtHjp6/4/sr+3dA==", - "requires": { - "@aws-crypto/util": "^3.0.0", - "@aws-sdk/types": "^3.222.0", - "tslib": "^1.11.1" - }, - "dependencies": { - "tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" - } - } - }, - "@aws-crypto/crc32c": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@aws-crypto/crc32c/-/crc32c-3.0.0.tgz", - "integrity": "sha512-ENNPPManmnVJ4BTXlOjAgD7URidbAznURqD0KvfREyc4o20DPYdEldU1f5cQ7Jbj0CJJSPaMIk/9ZshdB3210w==", - "requires": { - "@aws-crypto/util": "^3.0.0", - "@aws-sdk/types": "^3.222.0", - "tslib": "^1.11.1" - }, - "dependencies": { - "tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" - } - } - }, - "@aws-crypto/ie11-detection": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@aws-crypto/ie11-detection/-/ie11-detection-3.0.0.tgz", - "integrity": "sha512-341lBBkiY1DfDNKai/wXM3aujNBkXR7tq1URPQDL9wi3AUbI80NR74uF1TXHMm7po1AcnFk8iu2S2IeU/+/A+Q==", - "requires": { - "tslib": "^1.11.1" - }, - "dependencies": { - "tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" - } - } - }, - "@aws-crypto/sha1-browser": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@aws-crypto/sha1-browser/-/sha1-browser-3.0.0.tgz", - "integrity": "sha512-NJth5c997GLHs6nOYTzFKTbYdMNA6/1XlKVgnZoaZcQ7z7UJlOgj2JdbHE8tiYLS3fzXNCguct77SPGat2raSw==", - "requires": { - "@aws-crypto/ie11-detection": "^3.0.0", - "@aws-crypto/supports-web-crypto": "^3.0.0", - "@aws-crypto/util": "^3.0.0", - "@aws-sdk/types": "^3.222.0", - "@aws-sdk/util-locate-window": "^3.0.0", - "@aws-sdk/util-utf8-browser": "^3.0.0", - "tslib": "^1.11.1" - }, - "dependencies": { - "tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" - } - } - }, - "@aws-crypto/sha256-browser": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@aws-crypto/sha256-browser/-/sha256-browser-3.0.0.tgz", - "integrity": "sha512-8VLmW2B+gjFbU5uMeqtQM6Nj0/F1bro80xQXCW6CQBWgosFWXTx77aeOF5CAIAmbOK64SdMBJdNr6J41yP5mvQ==", - "requires": { - "@aws-crypto/ie11-detection": "^3.0.0", - "@aws-crypto/sha256-js": "^3.0.0", - "@aws-crypto/supports-web-crypto": "^3.0.0", - "@aws-crypto/util": "^3.0.0", - "@aws-sdk/types": "^3.222.0", - "@aws-sdk/util-locate-window": "^3.0.0", - "@aws-sdk/util-utf8-browser": "^3.0.0", - "tslib": "^1.11.1" - }, - "dependencies": { - "tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" - } - } - }, - "@aws-crypto/sha256-js": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@aws-crypto/sha256-js/-/sha256-js-3.0.0.tgz", - "integrity": "sha512-PnNN7os0+yd1XvXAy23CFOmTbMaDxgxXtTKHybrJ39Y8kGzBATgBFibWJKH6BhytLI/Zyszs87xCOBNyBig6vQ==", - "requires": { - "@aws-crypto/util": "^3.0.0", - "@aws-sdk/types": "^3.222.0", - "tslib": "^1.11.1" - }, - "dependencies": { - "tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" - } - } - }, - "@aws-crypto/supports-web-crypto": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@aws-crypto/supports-web-crypto/-/supports-web-crypto-3.0.0.tgz", - "integrity": "sha512-06hBdMwUAb2WFTuGG73LSC0wfPu93xWwo5vL2et9eymgmu3Id5vFAHBbajVWiGhPO37qcsdCap/FqXvJGJWPIg==", - "requires": { - "tslib": "^1.11.1" - }, - "dependencies": { - "tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" - } - } - }, - "@aws-crypto/util": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@aws-crypto/util/-/util-3.0.0.tgz", - "integrity": "sha512-2OJlpeJpCR48CC8r+uKVChzs9Iungj9wkZrl8Z041DWEWvyIHILYKCPNzJghKsivj+S3mLo6BVc7mBNzdxA46w==", - "requires": { - "@aws-sdk/types": "^3.222.0", - "@aws-sdk/util-utf8-browser": "^3.0.0", - "tslib": "^1.11.1" - }, - "dependencies": { - "tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" - } - } - }, - "@aws-sdk/abort-controller": { - "version": "3.257.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/abort-controller/-/abort-controller-3.257.0.tgz", - "integrity": "sha512-ekWy391lOerS0ZECdhp/c+X7AToJIpfNrCPjuj3bKr+GMQYckGsYsdbm6AUD4sxBmfvuaQmVniSXWovaxwcFcQ==", - "requires": { - "@aws-sdk/types": "3.257.0", - "tslib": "^2.3.1" - } - }, - "@aws-sdk/chunked-blob-reader": { - "version": "3.188.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/chunked-blob-reader/-/chunked-blob-reader-3.188.0.tgz", - "integrity": "sha512-zkPRFZZPL3eH+kH86LDYYXImiClA1/sW60zYOjse9Pgka+eDJlvBN6hcYxwDEKjcwATYiSRR1aVQHcfCinlGXg==", - "requires": { - "tslib": "^2.3.1" - } - }, - "@aws-sdk/chunked-blob-reader-native": { - "version": "3.208.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/chunked-blob-reader-native/-/chunked-blob-reader-native-3.208.0.tgz", - "integrity": "sha512-JeOZ95PW+fJ6bbuqPySYqLqHk1n4+4ueEEraJsiUrPBV0S1ZtyvOGHcnGztKUjr2PYNaiexmpWuvUve9K12HRA==", - "requires": { - "@aws-sdk/util-base64": "3.208.0", - "tslib": "^2.3.1" - } - }, - "@aws-sdk/client-s3": { - "version": "3.264.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.264.0.tgz", - "integrity": "sha512-YhpbK+vlqvhIpoBLl/e/qL2f7KOE8WZ2Wq/Nyj7/aGhSz9MRqXCOQ7HPeox6szym705JYC29jwHqvIEr3ybE2Q==", - "requires": { - "@aws-crypto/sha1-browser": "3.0.0", - "@aws-crypto/sha256-browser": "3.0.0", - "@aws-crypto/sha256-js": "3.0.0", - "@aws-sdk/client-sts": "3.264.0", - "@aws-sdk/config-resolver": "3.259.0", - "@aws-sdk/credential-provider-node": "3.264.0", - "@aws-sdk/eventstream-serde-browser": "3.258.0", - "@aws-sdk/eventstream-serde-config-resolver": "3.257.0", - "@aws-sdk/eventstream-serde-node": "3.258.0", - "@aws-sdk/fetch-http-handler": "3.257.0", - "@aws-sdk/hash-blob-browser": "3.257.0", - "@aws-sdk/hash-node": "3.257.0", - "@aws-sdk/hash-stream-node": "3.257.0", - "@aws-sdk/invalid-dependency": "3.257.0", - "@aws-sdk/md5-js": "3.258.0", - "@aws-sdk/middleware-bucket-endpoint": "3.259.0", - "@aws-sdk/middleware-content-length": "3.257.0", - "@aws-sdk/middleware-endpoint": "3.264.0", - "@aws-sdk/middleware-expect-continue": "3.257.0", - "@aws-sdk/middleware-flexible-checksums": "3.259.0", - "@aws-sdk/middleware-host-header": "3.257.0", - "@aws-sdk/middleware-location-constraint": "3.257.0", - "@aws-sdk/middleware-logger": "3.257.0", - "@aws-sdk/middleware-recursion-detection": "3.257.0", - "@aws-sdk/middleware-retry": "3.259.0", - "@aws-sdk/middleware-sdk-s3": "3.257.0", - "@aws-sdk/middleware-serde": "3.257.0", - "@aws-sdk/middleware-signing": "3.257.0", - "@aws-sdk/middleware-ssec": "3.257.0", - "@aws-sdk/middleware-stack": "3.257.0", - "@aws-sdk/middleware-user-agent": "3.257.0", - "@aws-sdk/node-config-provider": "3.259.0", - "@aws-sdk/node-http-handler": "3.257.0", - "@aws-sdk/protocol-http": "3.257.0", - "@aws-sdk/signature-v4-multi-region": "3.264.0", - "@aws-sdk/smithy-client": "3.261.0", - "@aws-sdk/types": "3.257.0", - "@aws-sdk/url-parser": "3.257.0", - "@aws-sdk/util-base64": "3.208.0", - "@aws-sdk/util-body-length-browser": "3.188.0", - "@aws-sdk/util-body-length-node": "3.208.0", - "@aws-sdk/util-defaults-mode-browser": "3.261.0", - "@aws-sdk/util-defaults-mode-node": "3.261.0", - "@aws-sdk/util-endpoints": "3.257.0", - "@aws-sdk/util-retry": "3.257.0", - "@aws-sdk/util-stream-browser": "3.258.0", - "@aws-sdk/util-stream-node": "3.257.0", - "@aws-sdk/util-user-agent-browser": "3.257.0", - "@aws-sdk/util-user-agent-node": "3.259.0", - "@aws-sdk/util-utf8": "3.254.0", - "@aws-sdk/util-waiter": "3.257.0", - "@aws-sdk/xml-builder": "3.201.0", - "fast-xml-parser": "4.0.11", - "tslib": "^2.3.1" - } - }, - "@aws-sdk/client-sso": { - "version": "3.264.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.264.0.tgz", - "integrity": "sha512-p+7sYpRcdv9omnnsPhD/vOFuZ1SpfV62ZgistBK/RDsQg2W9SIWQRW1KPt7gOCQ0nwp4efntw4Sle0LjS7ykxg==", - "requires": { - "@aws-crypto/sha256-browser": "3.0.0", - "@aws-crypto/sha256-js": "3.0.0", - "@aws-sdk/config-resolver": "3.259.0", - "@aws-sdk/fetch-http-handler": "3.257.0", - "@aws-sdk/hash-node": "3.257.0", - "@aws-sdk/invalid-dependency": "3.257.0", - "@aws-sdk/middleware-content-length": "3.257.0", - "@aws-sdk/middleware-endpoint": "3.264.0", - "@aws-sdk/middleware-host-header": "3.257.0", - "@aws-sdk/middleware-logger": "3.257.0", - "@aws-sdk/middleware-recursion-detection": "3.257.0", - "@aws-sdk/middleware-retry": "3.259.0", - "@aws-sdk/middleware-serde": "3.257.0", - "@aws-sdk/middleware-stack": "3.257.0", - "@aws-sdk/middleware-user-agent": "3.257.0", - "@aws-sdk/node-config-provider": "3.259.0", - "@aws-sdk/node-http-handler": "3.257.0", - "@aws-sdk/protocol-http": "3.257.0", - "@aws-sdk/smithy-client": "3.261.0", - "@aws-sdk/types": "3.257.0", - "@aws-sdk/url-parser": "3.257.0", - "@aws-sdk/util-base64": "3.208.0", - "@aws-sdk/util-body-length-browser": "3.188.0", - "@aws-sdk/util-body-length-node": "3.208.0", - "@aws-sdk/util-defaults-mode-browser": "3.261.0", - "@aws-sdk/util-defaults-mode-node": "3.261.0", - "@aws-sdk/util-endpoints": "3.257.0", - "@aws-sdk/util-retry": "3.257.0", - "@aws-sdk/util-user-agent-browser": "3.257.0", - "@aws-sdk/util-user-agent-node": "3.259.0", - "@aws-sdk/util-utf8": "3.254.0", - "tslib": "^2.3.1" - } - }, - "@aws-sdk/client-sso-oidc": { - "version": "3.264.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.264.0.tgz", - "integrity": "sha512-82hGEbfsD4lBGIF1q8o82jTNSgBCcBpfFsvA+ltZf0bh4ChIWOi4vVvg8G+zVQN1mm/Rj8vWYO/D0tNF8OSyWw==", - "requires": { - "@aws-crypto/sha256-browser": "3.0.0", - "@aws-crypto/sha256-js": "3.0.0", - "@aws-sdk/config-resolver": "3.259.0", - "@aws-sdk/fetch-http-handler": "3.257.0", - "@aws-sdk/hash-node": "3.257.0", - "@aws-sdk/invalid-dependency": "3.257.0", - "@aws-sdk/middleware-content-length": "3.257.0", - "@aws-sdk/middleware-endpoint": "3.264.0", - "@aws-sdk/middleware-host-header": "3.257.0", - "@aws-sdk/middleware-logger": "3.257.0", - "@aws-sdk/middleware-recursion-detection": "3.257.0", - "@aws-sdk/middleware-retry": "3.259.0", - "@aws-sdk/middleware-serde": "3.257.0", - "@aws-sdk/middleware-stack": "3.257.0", - "@aws-sdk/middleware-user-agent": "3.257.0", - "@aws-sdk/node-config-provider": "3.259.0", - "@aws-sdk/node-http-handler": "3.257.0", - "@aws-sdk/protocol-http": "3.257.0", - "@aws-sdk/smithy-client": "3.261.0", - "@aws-sdk/types": "3.257.0", - "@aws-sdk/url-parser": "3.257.0", - "@aws-sdk/util-base64": "3.208.0", - "@aws-sdk/util-body-length-browser": "3.188.0", - "@aws-sdk/util-body-length-node": "3.208.0", - "@aws-sdk/util-defaults-mode-browser": "3.261.0", - "@aws-sdk/util-defaults-mode-node": "3.261.0", - "@aws-sdk/util-endpoints": "3.257.0", - "@aws-sdk/util-retry": "3.257.0", - "@aws-sdk/util-user-agent-browser": "3.257.0", - "@aws-sdk/util-user-agent-node": "3.259.0", - "@aws-sdk/util-utf8": "3.254.0", - "tslib": "^2.3.1" - } - }, - "@aws-sdk/client-sts": { - "version": "3.264.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.264.0.tgz", - "integrity": "sha512-sco1jREkDdds4Z3V19Vlu/YpBHSzeEt1KFqOPnbjFw7pSakRNzpyWmLLxOwWjwgGKt6pSF3Aw0ZOMYsAUDc5qQ==", - "requires": { - "@aws-crypto/sha256-browser": "3.0.0", - "@aws-crypto/sha256-js": "3.0.0", - "@aws-sdk/config-resolver": "3.259.0", - "@aws-sdk/credential-provider-node": "3.264.0", - "@aws-sdk/fetch-http-handler": "3.257.0", - "@aws-sdk/hash-node": "3.257.0", - "@aws-sdk/invalid-dependency": "3.257.0", - "@aws-sdk/middleware-content-length": "3.257.0", - "@aws-sdk/middleware-endpoint": "3.264.0", - "@aws-sdk/middleware-host-header": "3.257.0", - "@aws-sdk/middleware-logger": "3.257.0", - "@aws-sdk/middleware-recursion-detection": "3.257.0", - "@aws-sdk/middleware-retry": "3.259.0", - "@aws-sdk/middleware-sdk-sts": "3.257.0", - "@aws-sdk/middleware-serde": "3.257.0", - "@aws-sdk/middleware-signing": "3.257.0", - "@aws-sdk/middleware-stack": "3.257.0", - "@aws-sdk/middleware-user-agent": "3.257.0", - "@aws-sdk/node-config-provider": "3.259.0", - "@aws-sdk/node-http-handler": "3.257.0", - "@aws-sdk/protocol-http": "3.257.0", - "@aws-sdk/smithy-client": "3.261.0", - "@aws-sdk/types": "3.257.0", - "@aws-sdk/url-parser": "3.257.0", - "@aws-sdk/util-base64": "3.208.0", - "@aws-sdk/util-body-length-browser": "3.188.0", - "@aws-sdk/util-body-length-node": "3.208.0", - "@aws-sdk/util-defaults-mode-browser": "3.261.0", - "@aws-sdk/util-defaults-mode-node": "3.261.0", - "@aws-sdk/util-endpoints": "3.257.0", - "@aws-sdk/util-retry": "3.257.0", - "@aws-sdk/util-user-agent-browser": "3.257.0", - "@aws-sdk/util-user-agent-node": "3.259.0", - "@aws-sdk/util-utf8": "3.254.0", - "fast-xml-parser": "4.0.11", - "tslib": "^2.3.1" - } - }, - "@aws-sdk/config-resolver": { - "version": "3.259.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/config-resolver/-/config-resolver-3.259.0.tgz", - "integrity": "sha512-gViMRsc4Ye6+nzJ0OYTZIT8m4glIAdtugN2Sr/t6P2iJW5X0bSL/EcbcHBgsve1lHjeGPeyzVkT7UnyGOZ5Z/A==", - "requires": { - "@aws-sdk/signature-v4": "3.257.0", - "@aws-sdk/types": "3.257.0", - "@aws-sdk/util-config-provider": "3.208.0", - "@aws-sdk/util-middleware": "3.257.0", - "tslib": "^2.3.1" - } - }, - "@aws-sdk/credential-provider-env": { - "version": "3.257.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.257.0.tgz", - "integrity": "sha512-GsmBi5Di6hk1JAi1iB6/LCY8o+GmlCvJoB7wuoVmXI3VxRVwptUVjuj8EtJbIrVGrF9dSuIRPCzUoSuzEzYGlg==", - "requires": { - "@aws-sdk/property-provider": "3.257.0", - "@aws-sdk/types": "3.257.0", - "tslib": "^2.3.1" - } - }, - "@aws-sdk/credential-provider-imds": { - "version": "3.259.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-imds/-/credential-provider-imds-3.259.0.tgz", - "integrity": "sha512-yCxoYWZAaDrCUEWxRfrpB0Mp1cFgJEMYW8T6GIb/+DQ5QLpZmorgaVD/j90QXupqFrR5tlxwuskBIkdD2E9YNg==", - "requires": { - "@aws-sdk/node-config-provider": "3.259.0", - "@aws-sdk/property-provider": "3.257.0", - "@aws-sdk/types": "3.257.0", - "@aws-sdk/url-parser": "3.257.0", - "tslib": "^2.3.1" - } - }, - "@aws-sdk/credential-provider-ini": { - "version": "3.264.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.264.0.tgz", - "integrity": "sha512-UU5NNlfn+Go+5PLBzyTH1YE3r/pgykpE4QYFon87sCnEQnQH9xmlRTW1f1cBSQ9kivbFZd2/C2X3qhB3fe2JfA==", - "requires": { - "@aws-sdk/credential-provider-env": "3.257.0", - "@aws-sdk/credential-provider-imds": "3.259.0", - "@aws-sdk/credential-provider-process": "3.257.0", - "@aws-sdk/credential-provider-sso": "3.264.0", - "@aws-sdk/credential-provider-web-identity": "3.257.0", - "@aws-sdk/property-provider": "3.257.0", - "@aws-sdk/shared-ini-file-loader": "3.257.0", - "@aws-sdk/types": "3.257.0", - "tslib": "^2.3.1" - } - }, - "@aws-sdk/credential-provider-node": { - "version": "3.264.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.264.0.tgz", - "integrity": "sha512-DPzL7oawcILs5Mduim9Z8SVeJaUpaDRVbUIrBHsMBu+N7Zuqtzr+0ckHc1bEi3iYq2QUCk5pH5vpQaZYkMlbtw==", - "requires": { - "@aws-sdk/credential-provider-env": "3.257.0", - "@aws-sdk/credential-provider-imds": "3.259.0", - "@aws-sdk/credential-provider-ini": "3.264.0", - "@aws-sdk/credential-provider-process": "3.257.0", - "@aws-sdk/credential-provider-sso": "3.264.0", - "@aws-sdk/credential-provider-web-identity": "3.257.0", - "@aws-sdk/property-provider": "3.257.0", - "@aws-sdk/shared-ini-file-loader": "3.257.0", - "@aws-sdk/types": "3.257.0", - "tslib": "^2.3.1" - } - }, - "@aws-sdk/credential-provider-process": { - "version": "3.257.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.257.0.tgz", - "integrity": "sha512-xK8uYeNXaclaBCGrLi4z2pxPRngqLf5BM5jg2fn57zqvlL9V5gJF972FehrVBL0bfp1/laG0ZJtD2K2sapyWAw==", - "requires": { - "@aws-sdk/property-provider": "3.257.0", - "@aws-sdk/shared-ini-file-loader": "3.257.0", - "@aws-sdk/types": "3.257.0", - "tslib": "^2.3.1" - } - }, - "@aws-sdk/credential-provider-sso": { - "version": "3.264.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.264.0.tgz", - "integrity": "sha512-CJuAlqIIJap6LXoqimvEAnYZ7Kb5pTbiS3e+aY+fajO3OPujmQpHuiY8kOmscjwZ4ErJdEskivcTGwXph0dPZQ==", - "requires": { - "@aws-sdk/client-sso": "3.264.0", - "@aws-sdk/property-provider": "3.257.0", - "@aws-sdk/shared-ini-file-loader": "3.257.0", - "@aws-sdk/token-providers": "3.264.0", - "@aws-sdk/types": "3.257.0", - "tslib": "^2.3.1" - } - }, - "@aws-sdk/credential-provider-web-identity": { - "version": "3.257.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.257.0.tgz", - "integrity": "sha512-Cm0uvRv4JuIbD0Kp3W0J/vwjADIyCx8HoZi5yg+QIi5nilocuTQ3ajvLeuPVSvFvdy+yaxSc5FxNXquWt7Mngw==", - "requires": { - "@aws-sdk/property-provider": "3.257.0", - "@aws-sdk/types": "3.257.0", - "tslib": "^2.3.1" - } - }, - "@aws-sdk/eventstream-codec": { - "version": "3.258.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/eventstream-codec/-/eventstream-codec-3.258.0.tgz", - "integrity": "sha512-DTd6aggICXOH74tBQEliwLbeoXRbQ3uROBWYl7DdrbAemzHACDFzPCXXa9MTJMZcq3Tva8/E/3bv1fXuU/xkAA==", - "requires": { - "@aws-crypto/crc32": "3.0.0", - "@aws-sdk/types": "3.257.0", - "@aws-sdk/util-hex-encoding": "3.201.0", - "tslib": "^2.3.1" - } - }, - "@aws-sdk/eventstream-serde-browser": { - "version": "3.258.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/eventstream-serde-browser/-/eventstream-serde-browser-3.258.0.tgz", - "integrity": "sha512-bRcNxDrBFd0UsrLh88kwpvGDHjVupZP3gPJ5b7wseCuuWJzp56/7hNI97IywgARta91rcaf4K147VxFkSNaVlw==", - "requires": { - "@aws-sdk/eventstream-serde-universal": "3.258.0", - "@aws-sdk/types": "3.257.0", - "tslib": "^2.3.1" - } - }, - "@aws-sdk/eventstream-serde-config-resolver": { - "version": "3.257.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/eventstream-serde-config-resolver/-/eventstream-serde-config-resolver-3.257.0.tgz", - "integrity": "sha512-YbUETgkcFqPJmwcBozHbx3Xloh7mPk9SunNB+Ndy8egwV3L/jNZnEzZnPOtWbD10AXSuJvSbGQ8+l4FblRqZqw==", - "requires": { - "@aws-sdk/types": "3.257.0", - "tslib": "^2.3.1" - } - }, - "@aws-sdk/eventstream-serde-node": { - "version": "3.258.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/eventstream-serde-node/-/eventstream-serde-node-3.258.0.tgz", - "integrity": "sha512-KvuitKB3fK1ZjWcB+U6d8JNv0WJtE1zvW5DXI/OabzaIR4i/LNis7469EwTsEkTqG3mV3wUa6cBA6kBSJWTVeA==", - "requires": { - "@aws-sdk/eventstream-serde-universal": "3.258.0", - "@aws-sdk/types": "3.257.0", - "tslib": "^2.3.1" - } - }, - "@aws-sdk/eventstream-serde-universal": { - "version": "3.258.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/eventstream-serde-universal/-/eventstream-serde-universal-3.258.0.tgz", - "integrity": "sha512-woHNrBp8YSIaf3mcRJA0SyKFnjeLX2fRudLZq9wd555Zz/U7f45AuZOpXlU66tIZiYJI1xm32VRSIYfpIwXI+A==", - "requires": { - "@aws-sdk/eventstream-codec": "3.258.0", - "@aws-sdk/types": "3.257.0", - "tslib": "^2.3.1" - } - }, - "@aws-sdk/fetch-http-handler": { - "version": "3.257.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/fetch-http-handler/-/fetch-http-handler-3.257.0.tgz", - "integrity": "sha512-zOF+RzQ+wfF7tq7tGUdPcqUTh3+k2f8KCVJE07A8kCopVq4nBu4NH6Eq29Tjpwdya3YlKvE+kFssuQRRRRex+Q==", - "requires": { - "@aws-sdk/protocol-http": "3.257.0", - "@aws-sdk/querystring-builder": "3.257.0", - "@aws-sdk/types": "3.257.0", - "@aws-sdk/util-base64": "3.208.0", - "tslib": "^2.3.1" - } - }, - "@aws-sdk/hash-blob-browser": { - "version": "3.257.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/hash-blob-browser/-/hash-blob-browser-3.257.0.tgz", - "integrity": "sha512-3Nrcci3pCCc0ZILMGa/oUMq9le6nhvgCoVxFy5skYs/mQu4QnA8HcK0u4bTueW41rBj0ZW6BHLk/2SmigIkjCQ==", - "requires": { - "@aws-sdk/chunked-blob-reader": "3.188.0", - "@aws-sdk/chunked-blob-reader-native": "3.208.0", - "@aws-sdk/types": "3.257.0", - "tslib": "^2.3.1" - } - }, - "@aws-sdk/hash-node": { - "version": "3.257.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/hash-node/-/hash-node-3.257.0.tgz", - "integrity": "sha512-W/USUuea5Ep3OJ2U7Ve8/5KN1YsDun2WzOFUxc1PyxXP5pW6OgC15/op0e+bmWPG851clvp5S8ZuroUr3aKi3Q==", - "requires": { - "@aws-sdk/types": "3.257.0", - "@aws-sdk/util-buffer-from": "3.208.0", - "@aws-sdk/util-utf8": "3.254.0", - "tslib": "^2.3.1" - } - }, - "@aws-sdk/hash-stream-node": { - "version": "3.257.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/hash-stream-node/-/hash-stream-node-3.257.0.tgz", - "integrity": "sha512-A24+EI0sO+IYO78sQPY4vVx7vzToc6XAobQqowmBJ6GXXILK72d3MR3NVbm0lmcS4Dh6MVZEFQD/DCyKvj2C7g==", - "requires": { - "@aws-sdk/types": "3.257.0", - "@aws-sdk/util-utf8": "3.254.0", - "tslib": "^2.3.1" - } - }, - "@aws-sdk/invalid-dependency": { - "version": "3.257.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/invalid-dependency/-/invalid-dependency-3.257.0.tgz", - "integrity": "sha512-T68SAPRNMEhpke0wlxURgogL7q0B8dfqZsSeS20BVR/lksJxLse9+pbmCDxiu1RrXoEIsEwl5rbLN+Hw8BFFYw==", - "requires": { - "@aws-sdk/types": "3.257.0", - "tslib": "^2.3.1" - } - }, - "@aws-sdk/is-array-buffer": { - "version": "3.201.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/is-array-buffer/-/is-array-buffer-3.201.0.tgz", - "integrity": "sha512-UPez5qLh3dNgt0DYnPD/q0mVJY84rA17QE26hVNOW3fAji8W2wrwrxdacWOxyXvlxWsVRcKmr+lay1MDqpAMfg==", - "requires": { - "tslib": "^2.3.1" - } - }, - "@aws-sdk/md5-js": { - "version": "3.258.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/md5-js/-/md5-js-3.258.0.tgz", - "integrity": "sha512-aLdZ43sEiT68p7YYPHwKsWU1WDC8Wf8UQfb4pzbvhYNgr5VxN46AtbWTKxLAqK2adKS4FnbyX2i66fINg2dHdw==", - "requires": { - "@aws-sdk/types": "3.257.0", - "@aws-sdk/util-utf8": "3.254.0", - "tslib": "^2.3.1" - } - }, - "@aws-sdk/middleware-bucket-endpoint": { - "version": "3.259.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-bucket-endpoint/-/middleware-bucket-endpoint-3.259.0.tgz", - "integrity": "sha512-eY4Bf7ZeiYK2c2XQ5IU0TDneEYSnZbaFk+ysgAkNmGoLKBhybXiKy7Dh8djB3uXeNtsZ+fZaazWmsU2kxf6Ntg==", - "requires": { - "@aws-sdk/protocol-http": "3.257.0", - "@aws-sdk/types": "3.257.0", - "@aws-sdk/util-arn-parser": "3.208.0", - "@aws-sdk/util-config-provider": "3.208.0", - "tslib": "^2.3.1" - } - }, - "@aws-sdk/middleware-content-length": { - "version": "3.257.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-content-length/-/middleware-content-length-3.257.0.tgz", - "integrity": "sha512-yiawbV2azm6QnMY1L2ypG8PDRdjOcEIvFmT0T7y0F49rfbKJOu21j1ONAoCkLrINK6kMqcD5JSQLVCoURxiTxQ==", - "requires": { - "@aws-sdk/protocol-http": "3.257.0", - "@aws-sdk/types": "3.257.0", - "tslib": "^2.3.1" - } - }, - "@aws-sdk/middleware-endpoint": { - "version": "3.264.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-endpoint/-/middleware-endpoint-3.264.0.tgz", - "integrity": "sha512-H9JEAug3Oo3IA2wZIplVVF6NtauCIjICXWgbNbA8Im+I2KPe0jWtOdtQv4U+tqHe9T4zIixaCM3gjUBld+FoOA==", - "requires": { - "@aws-sdk/middleware-serde": "3.257.0", - "@aws-sdk/protocol-http": "3.257.0", - "@aws-sdk/signature-v4": "3.257.0", - "@aws-sdk/types": "3.257.0", - "@aws-sdk/url-parser": "3.257.0", - "@aws-sdk/util-config-provider": "3.208.0", - "@aws-sdk/util-middleware": "3.257.0", - "tslib": "^2.3.1" - } - }, - "@aws-sdk/middleware-expect-continue": { - "version": "3.257.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-expect-continue/-/middleware-expect-continue-3.257.0.tgz", - "integrity": "sha512-7HSRA2Ta0fTq9Ewznp6fYG7CYOoqr5TeqEhKL1HyFb5i6YmsCiz88JKNJTllD5O7uFcd7Td/fJ66pK4JttfaaQ==", - "requires": { - "@aws-sdk/protocol-http": "3.257.0", - "@aws-sdk/types": "3.257.0", - "tslib": "^2.3.1" - } - }, - "@aws-sdk/middleware-flexible-checksums": { - "version": "3.259.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-flexible-checksums/-/middleware-flexible-checksums-3.259.0.tgz", - "integrity": "sha512-DwY3+cWaONvzJSVYQncfX+ZnoPnLVA7LfgR0mrgcvVZJFrqCr1lJeUmJOmE2/kcOQefPfSbKB/L4BP6vg2EUMQ==", - "requires": { - "@aws-crypto/crc32": "3.0.0", - "@aws-crypto/crc32c": "3.0.0", - "@aws-sdk/is-array-buffer": "3.201.0", - "@aws-sdk/protocol-http": "3.257.0", - "@aws-sdk/types": "3.257.0", - "@aws-sdk/util-utf8": "3.254.0", - "tslib": "^2.3.1" - } - }, - "@aws-sdk/middleware-host-header": { - "version": "3.257.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.257.0.tgz", - "integrity": "sha512-gEi9AJdJfRfU8Qr6HK1hfhxTzyV3Giq4B/h7um99hIFAT/GCg9xiPvAOKPo6UeuiKEv3b7RpSL4s6cBvnJMJBA==", - "requires": { - "@aws-sdk/protocol-http": "3.257.0", - "@aws-sdk/types": "3.257.0", - "tslib": "^2.3.1" - } - }, - "@aws-sdk/middleware-location-constraint": { - "version": "3.257.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-location-constraint/-/middleware-location-constraint-3.257.0.tgz", - "integrity": "sha512-pmm5rJR5aatXG0kC0KPBxkgoNn/ePcyVIYHGMEuJXRJm3ENy569QAH9UZeMFjprp3uuAbkqItQbY3MP8TYvuYA==", - "requires": { - "@aws-sdk/types": "3.257.0", - "tslib": "^2.3.1" - } - }, - "@aws-sdk/middleware-logger": { - "version": "3.257.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.257.0.tgz", - "integrity": "sha512-8RDXW/VbMKBsXDfcCLmROZcWKyrekyiPa3J1aIaBy0tq9o4xpGoXw/lwwIrNVvISAFslb57rteup34bfn6ta6w==", - "requires": { - "@aws-sdk/types": "3.257.0", - "tslib": "^2.3.1" - } - }, - "@aws-sdk/middleware-recursion-detection": { - "version": "3.257.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.257.0.tgz", - "integrity": "sha512-rUCih6zHh8k9Edf5N5Er4s508FYbwLM0MWTD2axzlj9TjLqEQ9OKED3wHaLffXSDzodd3oTAfJCLPbWQyoZ3ZQ==", - "requires": { - "@aws-sdk/protocol-http": "3.257.0", - "@aws-sdk/types": "3.257.0", - "tslib": "^2.3.1" - } - }, - "@aws-sdk/middleware-retry": { - "version": "3.259.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-retry/-/middleware-retry-3.259.0.tgz", - "integrity": "sha512-pVh1g8e84MAi7eVtWLiiiCtn82LzxOP7+LxTRHatmgIeN22yGQBZILliPDJypUPvDYlwxI1ekiK+oPTcte0Uww==", - "requires": { - "@aws-sdk/protocol-http": "3.257.0", - "@aws-sdk/service-error-classification": "3.257.0", - "@aws-sdk/types": "3.257.0", - "@aws-sdk/util-middleware": "3.257.0", - "@aws-sdk/util-retry": "3.257.0", - "tslib": "^2.3.1", - "uuid": "^8.3.2" - } - }, - "@aws-sdk/middleware-sdk-s3": { - "version": "3.257.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.257.0.tgz", - "integrity": "sha512-l9KRlUgsDKV1MB3zfttX/syhIBsG5Z3VVslz6EW09eSqZVreCudW3TMdyeLemup57xC2veEpkgVj8igiXd/LVQ==", - "requires": { - "@aws-sdk/protocol-http": "3.257.0", - "@aws-sdk/types": "3.257.0", - "@aws-sdk/util-arn-parser": "3.208.0", - "tslib": "^2.3.1" - } - }, - "@aws-sdk/middleware-sdk-sts": { - "version": "3.257.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-sdk-sts/-/middleware-sdk-sts-3.257.0.tgz", - "integrity": "sha512-d6IJCLRi3O2tm4AFK60WNhIwmMmspj1WzKR1q1TaoPzoREPG2xg+Am18wZBRkCyYuRPPrbizmkvAmAJiUolMAw==", - "requires": { - "@aws-sdk/middleware-signing": "3.257.0", - "@aws-sdk/property-provider": "3.257.0", - "@aws-sdk/protocol-http": "3.257.0", - "@aws-sdk/signature-v4": "3.257.0", - "@aws-sdk/types": "3.257.0", - "tslib": "^2.3.1" - } - }, - "@aws-sdk/middleware-serde": { - "version": "3.257.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-serde/-/middleware-serde-3.257.0.tgz", - "integrity": "sha512-/JasfXPWFq24mnCrx9fxW/ISBSp07RJwhsF14qzm8Qy3Z0z470C+QRM6otTwAkYuuVt1wuLjja5agq3Jtzq7dQ==", - "requires": { - "@aws-sdk/types": "3.257.0", - "tslib": "^2.3.1" - } - }, - "@aws-sdk/middleware-signing": { - "version": "3.257.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-signing/-/middleware-signing-3.257.0.tgz", - "integrity": "sha512-hCH3D83LHmm6nqmtNrGTWZCVjsQXrGHIXbd17/qrw7aPFvcAhsiiCncGFP+XsUXEKa2ZqcSNMUyPrx69ofNRZQ==", - "requires": { - "@aws-sdk/property-provider": "3.257.0", - "@aws-sdk/protocol-http": "3.257.0", - "@aws-sdk/signature-v4": "3.257.0", - "@aws-sdk/types": "3.257.0", - "@aws-sdk/util-middleware": "3.257.0", - "tslib": "^2.3.1" - } - }, - "@aws-sdk/middleware-ssec": { - "version": "3.257.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-ssec/-/middleware-ssec-3.257.0.tgz", - "integrity": "sha512-YcZrKeZk/0bsFvnTqp2rcF+6BSmeLTA65ZtyNNP2hh7Imaxg3kAQcueOJBeK4YP/5nU7a1mtt/4Q8BqbIjc41g==", - "requires": { - "@aws-sdk/types": "3.257.0", - "tslib": "^2.3.1" - } - }, - "@aws-sdk/middleware-stack": { - "version": "3.257.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-stack/-/middleware-stack-3.257.0.tgz", - "integrity": "sha512-awg2F0SvwACBaw4HIObK8pQGfSqAc4Vy+YFzWSfZNVC35oRO6RsRdKHVU99lRC0LrT2Ptmfghl2DMPSrRDbvlQ==", - "requires": { - "tslib": "^2.3.1" - } - }, - "@aws-sdk/middleware-user-agent": { - "version": "3.257.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.257.0.tgz", - "integrity": "sha512-37rt75LZyD0UWpbcFuxEGqwF3DZKSixQPl7AsDe6q3KtrO5gGQB+diH5vbY0txNNYyv5IK9WMwvY73mVmoWRmw==", - "requires": { - "@aws-sdk/protocol-http": "3.257.0", - "@aws-sdk/types": "3.257.0", - "tslib": "^2.3.1" - } - }, - "@aws-sdk/node-config-provider": { - "version": "3.259.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/node-config-provider/-/node-config-provider-3.259.0.tgz", - "integrity": "sha512-DUOqr71oonBvM6yKPdhDBmraqgXHCFrVWFw7hc5ZNxL2wS/EsbKfGPJp+C+SUgpn1upIWPNnh/bNoLAbBkcLsA==", - "requires": { - "@aws-sdk/property-provider": "3.257.0", - "@aws-sdk/shared-ini-file-loader": "3.257.0", - "@aws-sdk/types": "3.257.0", - "tslib": "^2.3.1" - } - }, - "@aws-sdk/node-http-handler": { - "version": "3.257.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/node-http-handler/-/node-http-handler-3.257.0.tgz", - "integrity": "sha512-8KnWHVVwaGKyTlkTU9BSOAiSovNDoagxemU2l10QqBbzUCVpljCUMUkABEGRJ1yoQCl6DJ7RtNkAyZ8Ne/E15A==", - "requires": { - "@aws-sdk/abort-controller": "3.257.0", - "@aws-sdk/protocol-http": "3.257.0", - "@aws-sdk/querystring-builder": "3.257.0", - "@aws-sdk/types": "3.257.0", - "tslib": "^2.3.1" - } - }, - "@aws-sdk/property-provider": { - "version": "3.257.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/property-provider/-/property-provider-3.257.0.tgz", - "integrity": "sha512-3rUbRAcF0GZ5PhDiXhS4yREfZ5hOEtvYEa9S/19OdM5eoypOaLU5XnFcCKfnccSP8SkdgpJujzxOMRWNWadlAQ==", - "requires": { - "@aws-sdk/types": "3.257.0", - "tslib": "^2.3.1" - } - }, - "@aws-sdk/protocol-http": { - "version": "3.257.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/protocol-http/-/protocol-http-3.257.0.tgz", - "integrity": "sha512-xt7LGOgZIvbLS3418AYQLacOqx+mo5j4mPiIMz7f6AaUg+/fBUgESVsncKDqxbEJVwwCXSka8Ca0cntJmoeMSw==", - "requires": { - "@aws-sdk/types": "3.257.0", - "tslib": "^2.3.1" - } - }, - "@aws-sdk/querystring-builder": { - "version": "3.257.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/querystring-builder/-/querystring-builder-3.257.0.tgz", - "integrity": "sha512-mZHWLP7XIkzx1GIXO5WfX/iJ+aY9TWs02RE9FkdL2+by0HEMR65L3brQTbU1mIBJ7BjaPwYH24dljUOSABX7yg==", - "requires": { - "@aws-sdk/types": "3.257.0", - "@aws-sdk/util-uri-escape": "3.201.0", - "tslib": "^2.3.1" - } - }, - "@aws-sdk/querystring-parser": { - "version": "3.257.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/querystring-parser/-/querystring-parser-3.257.0.tgz", - "integrity": "sha512-UDrE1dEwWrWT8dG2VCrGYrPxCWOkZ1fPTPkjpkR4KZEdQDZBqU5gYZF2xPj8Nz7pjQVHFuW2wFm3XYEk56GEjg==", - "requires": { - "@aws-sdk/types": "3.257.0", - "tslib": "^2.3.1" - } - }, - "@aws-sdk/s3-request-presigner": { - "version": "3.264.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/s3-request-presigner/-/s3-request-presigner-3.264.0.tgz", - "integrity": "sha512-8DNVV4tO6xkmoUA6n8iCgRC9adL8e3aphSXNykA2jWricTaR1/NtD9+5uYeklQbEh4EVisaQJJldOMlbB2GtXQ==", - "requires": { - "@aws-sdk/middleware-endpoint": "3.264.0", - "@aws-sdk/middleware-sdk-s3": "3.257.0", - "@aws-sdk/protocol-http": "3.257.0", - "@aws-sdk/signature-v4-multi-region": "3.264.0", - "@aws-sdk/smithy-client": "3.261.0", - "@aws-sdk/types": "3.257.0", - "@aws-sdk/util-create-request": "3.261.0", - "@aws-sdk/util-format-url": "3.257.0", - "tslib": "^2.3.1" - } - }, - "@aws-sdk/service-error-classification": { - "version": "3.257.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/service-error-classification/-/service-error-classification-3.257.0.tgz", - "integrity": "sha512-FAyR0XsueGkkqDtkP03cTJQk52NdQ9sZelLynmmlGPUP75LApRPvFe1riKrou6+LsDbwVNVffj6mbDfIcOhaOw==" - }, - "@aws-sdk/shared-ini-file-loader": { - "version": "3.257.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/shared-ini-file-loader/-/shared-ini-file-loader-3.257.0.tgz", - "integrity": "sha512-HNjC1+Wx3xHiJc+CP14GhIdVhfQGSjroAsWseRxAhONocA9Fl1ZX4hx7+sA5c9nOoMVOovi6ivJ/6lCRPTDRrQ==", - "requires": { - "@aws-sdk/types": "3.257.0", - "tslib": "^2.3.1" - } - }, - "@aws-sdk/signature-v4": { - "version": "3.257.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/signature-v4/-/signature-v4-3.257.0.tgz", - "integrity": "sha512-aLQQN59X/D0+ShzPD3Anj5ntdMA/RFeNLOUCDyDvremViGi6yxUS98usQ/8bG5Rq0sW2GGMdbFUFmrDvqdiqEQ==", - "requires": { - "@aws-sdk/is-array-buffer": "3.201.0", - "@aws-sdk/types": "3.257.0", - "@aws-sdk/util-hex-encoding": "3.201.0", - "@aws-sdk/util-middleware": "3.257.0", - "@aws-sdk/util-uri-escape": "3.201.0", - "@aws-sdk/util-utf8": "3.254.0", - "tslib": "^2.3.1" - } - }, - "@aws-sdk/signature-v4-multi-region": { - "version": "3.264.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.264.0.tgz", - "integrity": "sha512-45rNJeC245g2HtDlxlcgNhB9YU0PcWXGNOLOiMWq3cSMNsaKJoTD1tLdBke2VjW7Hz7QBCWLCRAftHatnWcdyg==", - "requires": { - "@aws-sdk/protocol-http": "3.257.0", - "@aws-sdk/signature-v4": "3.257.0", - "@aws-sdk/types": "3.257.0", - "@aws-sdk/util-arn-parser": "3.208.0", - "tslib": "^2.3.1" - } - }, - "@aws-sdk/smithy-client": { - "version": "3.261.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/smithy-client/-/smithy-client-3.261.0.tgz", - "integrity": "sha512-j8XQEa3caZUVFVZfhJjaskw80O/tB+IXu84HMN44N7UkXaCFHirUsNjTDztJhnVXf/gKXzIqUqprfRnOvwLtIg==", - "requires": { - "@aws-sdk/middleware-stack": "3.257.0", - "@aws-sdk/types": "3.257.0", - "tslib": "^2.3.1" - } - }, - "@aws-sdk/token-providers": { - "version": "3.264.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.264.0.tgz", - "integrity": "sha512-1N54FCdBJRqrwFWHUoDpGI0rKhI29Or9ZwGjjcBzKzLhz5sEF/DEhuID7h1/KKEkXdQ0+lmXOFGMMrahrMpOow==", - "requires": { - "@aws-sdk/client-sso-oidc": "3.264.0", - "@aws-sdk/property-provider": "3.257.0", - "@aws-sdk/shared-ini-file-loader": "3.257.0", - "@aws-sdk/types": "3.257.0", - "tslib": "^2.3.1" - } - }, - "@aws-sdk/types": { - "version": "3.257.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.257.0.tgz", - "integrity": "sha512-LmqXuBQBGeaGi/3Rp7XiEX1B5IPO2UUfBVvu0wwGqVsmstT0SbOVDZGPmxygACbm64n+PRx3uTSDefRfoiWYZg==", - "requires": { - "tslib": "^2.3.1" - } - }, - "@aws-sdk/url-parser": { - "version": "3.257.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/url-parser/-/url-parser-3.257.0.tgz", - "integrity": "sha512-Qe/AcFe/NFZHa6cN2afXEQn9ehXxh57dWGdRjfjd2lQqNV4WW1R2pl2Tm1ZJ1dwuCNLJi4NHLMk8lrD3QQ8rdg==", - "requires": { - "@aws-sdk/querystring-parser": "3.257.0", - "@aws-sdk/types": "3.257.0", - "tslib": "^2.3.1" - } - }, - "@aws-sdk/util-arn-parser": { - "version": "3.208.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-arn-parser/-/util-arn-parser-3.208.0.tgz", - "integrity": "sha512-QV4af+kscova9dv4VuHOgH8wEr/IIYHDGcnyVtkUEqahCejWr1Kuk+SBK0xMwnZY5LSycOtQ8aeqHOn9qOjZtA==", - "requires": { - "tslib": "^2.3.1" - } - }, - "@aws-sdk/util-base64": { - "version": "3.208.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-base64/-/util-base64-3.208.0.tgz", - "integrity": "sha512-PQniZph5A6N7uuEOQi+1hnMz/FSOK/8kMFyFO+4DgA1dZ5pcKcn5wiFwHkcTb/BsgVqQa3Jx0VHNnvhlS8JyTg==", - "requires": { - "@aws-sdk/util-buffer-from": "3.208.0", - "tslib": "^2.3.1" - } - }, - "@aws-sdk/util-body-length-browser": { - "version": "3.188.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-body-length-browser/-/util-body-length-browser-3.188.0.tgz", - "integrity": "sha512-8VpnwFWXhnZ/iRSl9mTf+VKOX9wDE8QtN4bj9pBfxwf90H1X7E8T6NkiZD3k+HubYf2J94e7DbeHs7fuCPW5Qg==", - "requires": { - "tslib": "^2.3.1" - } - }, - "@aws-sdk/util-body-length-node": { - "version": "3.208.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-body-length-node/-/util-body-length-node-3.208.0.tgz", - "integrity": "sha512-3zj50e5g7t/MQf53SsuuSf0hEELzMtD8RX8C76f12OSRo2Bca4FLLYHe0TZbxcfQHom8/hOaeZEyTyMogMglqg==", - "requires": { - "tslib": "^2.3.1" - } - }, - "@aws-sdk/util-buffer-from": { - "version": "3.208.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-buffer-from/-/util-buffer-from-3.208.0.tgz", - "integrity": "sha512-7L0XUixNEFcLUGPeBF35enCvB9Xl+K6SQsmbrPk1P3mlV9mguWSDQqbOBwY1Ir0OVbD6H/ZOQU7hI/9RtRI0Zw==", - "requires": { - "@aws-sdk/is-array-buffer": "3.201.0", - "tslib": "^2.3.1" - } - }, - "@aws-sdk/util-config-provider": { - "version": "3.208.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-config-provider/-/util-config-provider-3.208.0.tgz", - "integrity": "sha512-DSRqwrERUsT34ug+anlMBIFooBEGwM8GejC7q00Y/9IPrQy50KnG5PW2NiTjuLKNi7pdEOlwTSEocJE15eDZIg==", - "requires": { - "tslib": "^2.3.1" - } - }, - "@aws-sdk/util-create-request": { - "version": "3.261.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-create-request/-/util-create-request-3.261.0.tgz", - "integrity": "sha512-ZpTO76BBDdwE88pwYkAU816u34oOMXbJXoqVTw+EjLKOroCQYgJAu5VcGZ/vYFZ9zdLABQhqQZ1Cxag/w8sxLw==", - "requires": { - "@aws-sdk/middleware-stack": "3.257.0", - "@aws-sdk/smithy-client": "3.261.0", - "@aws-sdk/types": "3.257.0", - "tslib": "^2.3.1" - } - }, - "@aws-sdk/util-defaults-mode-browser": { - "version": "3.261.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-defaults-mode-browser/-/util-defaults-mode-browser-3.261.0.tgz", - "integrity": "sha512-lX3X1NfzQVV6cakepGV24uRcqevlDnQ8VgaCV8dhnw1FVThueFigyoFaUA02+uRXbV9KIbNWkEvweNtm2wvyDw==", - "requires": { - "@aws-sdk/property-provider": "3.257.0", - "@aws-sdk/types": "3.257.0", - "bowser": "^2.11.0", - "tslib": "^2.3.1" - } - }, - "@aws-sdk/util-defaults-mode-node": { - "version": "3.261.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-defaults-mode-node/-/util-defaults-mode-node-3.261.0.tgz", - "integrity": "sha512-4AK6yu4bOmHSocUdbGoEHbNXB09UA58ON2HBHY4NxMBuFBAd9XB2tYiyhce+Cm+o+lHbS8oQnw0VZw16WMzzew==", - "requires": { - "@aws-sdk/config-resolver": "3.259.0", - "@aws-sdk/credential-provider-imds": "3.259.0", - "@aws-sdk/node-config-provider": "3.259.0", - "@aws-sdk/property-provider": "3.257.0", - "@aws-sdk/types": "3.257.0", - "tslib": "^2.3.1" - } - }, - "@aws-sdk/util-endpoints": { - "version": "3.257.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.257.0.tgz", - "integrity": "sha512-3bvmRn5XGYzPPWjLuvHBKdJOb+fijnb8Ungu9bfXnTYFsng/ndHUWeHC22O/p8w3OWoRYUIMaZHxdxe27BFozg==", - "requires": { - "@aws-sdk/types": "3.257.0", - "tslib": "^2.3.1" - } - }, - "@aws-sdk/util-format-url": { - "version": "3.257.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-format-url/-/util-format-url-3.257.0.tgz", - "integrity": "sha512-Q/c1BLoEZLvnjagAE0nQryhQlFoC/a8ZrXJn4XljWPeFcFAVLpCoSzcTbQM1N4oQvDIgMvl5gBeGzp0BiW30QA==", - "requires": { - "@aws-sdk/querystring-builder": "3.257.0", - "@aws-sdk/types": "3.257.0", - "tslib": "^2.3.1" - } - }, - "@aws-sdk/util-hex-encoding": { - "version": "3.201.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-hex-encoding/-/util-hex-encoding-3.201.0.tgz", - "integrity": "sha512-7t1vR1pVxKx0motd3X9rI3m/xNp78p3sHtP5yo4NP4ARpxyJ0fokBomY8ScaH2D/B+U5o9ARxldJUdMqyBlJcA==", - "requires": { - "tslib": "^2.3.1" - } - }, - "@aws-sdk/util-locate-window": { - "version": "3.208.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-locate-window/-/util-locate-window-3.208.0.tgz", - "integrity": "sha512-iua1A2+P7JJEDHVgvXrRJSvsnzG7stYSGQnBVphIUlemwl6nN5D+QrgbjECtrbxRz8asYFHSzhdhECqN+tFiBg==", - "requires": { - "tslib": "^2.3.1" - } - }, - "@aws-sdk/util-middleware": { - "version": "3.257.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-middleware/-/util-middleware-3.257.0.tgz", - "integrity": "sha512-F9ieon8B8eGVs5tyZtAIG3DZEObDvujkspho0qRbUTHUosM0ylJLsMU800fmC/uRHLRrZvb/RSp59+kNDwSAMw==", - "requires": { - "tslib": "^2.3.1" - } - }, - "@aws-sdk/util-retry": { - "version": "3.257.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-retry/-/util-retry-3.257.0.tgz", - "integrity": "sha512-l9TOsOAYtZxwW3q5fQKW4rsD9t2HVaBfQ4zBamHkNTfB4vBVvCnz4oxkvSvA2MlxCA6am+K1K/oj917Tpqk53g==", - "requires": { - "@aws-sdk/service-error-classification": "3.257.0", - "tslib": "^2.3.1" - } - }, - "@aws-sdk/util-stream-browser": { - "version": "3.258.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-stream-browser/-/util-stream-browser-3.258.0.tgz", - "integrity": "sha512-MCAxHL3Hz/+eU4LZk0ZbLWAIUueH/jHpSbrloxZ3Dil2RL3w6NSJd5gE8zS7gs1B/eMcE600Brf5xSDR8kA5HA==", - "requires": { - "@aws-sdk/fetch-http-handler": "3.257.0", - "@aws-sdk/types": "3.257.0", - "@aws-sdk/util-base64": "3.208.0", - "@aws-sdk/util-hex-encoding": "3.201.0", - "@aws-sdk/util-utf8": "3.254.0", - "tslib": "^2.3.1" - } - }, - "@aws-sdk/util-stream-node": { - "version": "3.257.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-stream-node/-/util-stream-node-3.257.0.tgz", - "integrity": "sha512-UlLEerQCNejNulYmGXm/4X463n8n21foA2d6kgJ4AUSMWWhoRBjfwrM4gI7tA30zh9U81d6xbUtoOQTqKVtMTw==", - "requires": { - "@aws-sdk/node-http-handler": "3.257.0", - "@aws-sdk/types": "3.257.0", - "@aws-sdk/util-buffer-from": "3.208.0", - "tslib": "^2.3.1" - } - }, - "@aws-sdk/util-uri-escape": { - "version": "3.201.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-uri-escape/-/util-uri-escape-3.201.0.tgz", - "integrity": "sha512-TeTWbGx4LU2c5rx0obHeDFeO9HvwYwQtMh1yniBz00pQb6Qt6YVOETVQikRZ+XRQwEyCg/dA375UplIpiy54mA==", - "requires": { - "tslib": "^2.3.1" - } - }, - "@aws-sdk/util-user-agent-browser": { - "version": "3.257.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.257.0.tgz", - "integrity": "sha512-YdavWK6/8Cw6mypEgysGGX/dT9p9qnzFbnN5PQsUY+JJk2Nx8fKFydjGiQ+6rWPeW17RAv9mmbboh9uPVWxVlw==", - "requires": { - "@aws-sdk/types": "3.257.0", - "bowser": "^2.11.0", - "tslib": "^2.3.1" - } - }, - "@aws-sdk/util-user-agent-node": { - "version": "3.259.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.259.0.tgz", - "integrity": "sha512-R0VTmNs+ySDDebU98BUbsLyeIM5YmAEr9esPpy15XfSy3AWmAeru8nLlztdaLilHZzLIDzvM2t7NGk/FzZFCvA==", - "requires": { - "@aws-sdk/node-config-provider": "3.259.0", - "@aws-sdk/types": "3.257.0", - "tslib": "^2.3.1" - } - }, - "@aws-sdk/util-utf8": { - "version": "3.254.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-utf8/-/util-utf8-3.254.0.tgz", - "integrity": "sha512-14Kso/eIt5/qfIBmhEL9L1IfyUqswjSTqO2mY7KOzUZ9SZbwn3rpxmtkhmATkRjD7XIlLKaxBkI7tU9Zjzj8Kw==", - "requires": { - "@aws-sdk/util-buffer-from": "3.208.0", - "tslib": "^2.3.1" - } - }, - "@aws-sdk/util-utf8-browser": { - "version": "3.259.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-utf8-browser/-/util-utf8-browser-3.259.0.tgz", - "integrity": "sha512-UvFa/vR+e19XookZF8RzFZBrw2EUkQWxiBW0yYQAhvk3C+QVGl0H3ouca8LDBlBfQKXwmW3huo/59H8rwb1wJw==", - "requires": { - "tslib": "^2.3.1" - } - }, - "@aws-sdk/util-waiter": { - "version": "3.257.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-waiter/-/util-waiter-3.257.0.tgz", - "integrity": "sha512-Fr6of3EDOcXVDs5534o7VsJMXdybB0uLy2LzeFAVSwGOY3geKhIquBAiUDqCVu9B+iTldrC0rQ9NIM7ZSpPG8w==", - "requires": { - "@aws-sdk/abort-controller": "3.257.0", - "@aws-sdk/types": "3.257.0", - "tslib": "^2.3.1" - } - }, - "@aws-sdk/xml-builder": { - "version": "3.201.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/xml-builder/-/xml-builder-3.201.0.tgz", - "integrity": "sha512-brRdB1wwMgjWEnOQsv7zSUhIQuh7DEicrfslAqHop4S4FtSI3GQAShpQqgOpMTNFYcpaWKmE/Y1MJmNY7xLCnw==", - "requires": { - "tslib": "^2.3.1" - } - }, - "@babel/code-frame": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz", - "integrity": "sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==", - "dev": true, - "requires": { - "@babel/highlight": "^7.18.6" - } - }, - "@babel/compat-data": { - "version": "7.20.14", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.20.14.tgz", - "integrity": "sha512-0YpKHD6ImkWMEINCyDAD0HLLUH/lPCefG8ld9it8DJB2wnApraKuhgYTvTY1z7UFIfBTGy5LwncZ+5HWWGbhFw==", - "dev": true - }, - "@babel/core": { - "version": "7.20.12", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.20.12.tgz", - "integrity": "sha512-XsMfHovsUYHFMdrIHkZphTN/2Hzzi78R08NuHfDBehym2VsPDL6Zn/JAD/JQdnRvbSsbQc4mVaU1m6JgtTEElg==", - "dev": true, - "requires": { - "@ampproject/remapping": "^2.1.0", - "@babel/code-frame": "^7.18.6", - "@babel/generator": "^7.20.7", - "@babel/helper-compilation-targets": "^7.20.7", - "@babel/helper-module-transforms": "^7.20.11", - "@babel/helpers": "^7.20.7", - "@babel/parser": "^7.20.7", - "@babel/template": "^7.20.7", - "@babel/traverse": "^7.20.12", - "@babel/types": "^7.20.7", - "convert-source-map": "^1.7.0", - "debug": "^4.1.0", - "gensync": "^1.0.0-beta.2", - "json5": "^2.2.2", - "semver": "^6.3.0" - }, - "dependencies": { - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true - } - } - }, - "@babel/generator": { - "version": "7.20.14", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.20.14.tgz", - "integrity": "sha512-AEmuXHdcD3A52HHXxaTmYlb8q/xMEhoRP67B3T4Oq7lbmSoqroMZzjnGj3+i1io3pdnF8iBYVu4Ilj+c4hBxYg==", - "dev": true, - "requires": { - "@babel/types": "^7.20.7", - "@jridgewell/gen-mapping": "^0.3.2", - "jsesc": "^2.5.1" - }, - "dependencies": { - "@jridgewell/gen-mapping": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz", - "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==", - "dev": true, - "requires": { - "@jridgewell/set-array": "^1.0.1", - "@jridgewell/sourcemap-codec": "^1.4.10", - "@jridgewell/trace-mapping": "^0.3.9" - } - } - } - }, - "@babel/helper-compilation-targets": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.7.tgz", - "integrity": "sha512-4tGORmfQcrc+bvrjb5y3dG9Mx1IOZjsHqQVUz7XCNHO+iTmqxWnVg3KRygjGmpRLJGdQSKuvFinbIb0CnZwHAQ==", - "dev": true, - "requires": { - "@babel/compat-data": "^7.20.5", - "@babel/helper-validator-option": "^7.18.6", - "browserslist": "^4.21.3", - "lru-cache": "^5.1.1", - "semver": "^6.3.0" - }, - "dependencies": { - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true - } - } - }, - "@babel/helper-environment-visitor": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz", - "integrity": "sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==", - "dev": true - }, - "@babel/helper-function-name": { - "version": "7.19.0", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz", - "integrity": "sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==", - "dev": true, - "requires": { - "@babel/template": "^7.18.10", - "@babel/types": "^7.19.0" - } - }, - "@babel/helper-hoist-variables": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz", - "integrity": "sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==", - "dev": true, - "requires": { - "@babel/types": "^7.18.6" - } - }, - "@babel/helper-module-imports": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz", - "integrity": "sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==", - "dev": true, - "requires": { - "@babel/types": "^7.18.6" - } - }, - "@babel/helper-module-transforms": { - "version": "7.20.11", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.20.11.tgz", - "integrity": "sha512-uRy78kN4psmji1s2QtbtcCSaj/LILFDp0f/ymhpQH5QY3nljUZCaNWz9X1dEj/8MBdBEFECs7yRhKn8i7NjZgg==", - "dev": true, - "requires": { - "@babel/helper-environment-visitor": "^7.18.9", - "@babel/helper-module-imports": "^7.18.6", - "@babel/helper-simple-access": "^7.20.2", - "@babel/helper-split-export-declaration": "^7.18.6", - "@babel/helper-validator-identifier": "^7.19.1", - "@babel/template": "^7.20.7", - "@babel/traverse": "^7.20.10", - "@babel/types": "^7.20.7" - } - }, - "@babel/helper-plugin-utils": { - "version": "7.20.2", - "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz", - "integrity": "sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ==", - "dev": true - }, - "@babel/helper-simple-access": { - "version": "7.20.2", - "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz", - "integrity": "sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA==", - "dev": true, - "requires": { - "@babel/types": "^7.20.2" - } - }, - "@babel/helper-split-export-declaration": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz", - "integrity": "sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==", - "dev": true, - "requires": { - "@babel/types": "^7.18.6" - } - }, - "@babel/helper-string-parser": { - "version": "7.19.4", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz", - "integrity": "sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==", - "dev": true - }, - "@babel/helper-validator-identifier": { - "version": "7.19.1", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz", - "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==", - "dev": true - }, - "@babel/helper-validator-option": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz", - "integrity": "sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==", - "dev": true - }, - "@babel/helpers": { - "version": "7.20.13", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.20.13.tgz", - "integrity": "sha512-nzJ0DWCL3gB5RCXbUO3KIMMsBY2Eqbx8mBpKGE/02PgyRQFcPQLbkQ1vyy596mZLaP+dAfD+R4ckASzNVmW3jg==", - "dev": true, - "requires": { - "@babel/template": "^7.20.7", - "@babel/traverse": "^7.20.13", - "@babel/types": "^7.20.7" - } - }, - "@babel/highlight": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz", - "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==", - "dev": true, - "requires": { - "@babel/helper-validator-identifier": "^7.18.6", - "chalk": "^2.0.0", - "js-tokens": "^4.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "requires": { - "color-convert": "^1.9.0" - } - }, - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - } - }, - "color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, - "requires": { - "color-name": "1.1.3" - } - }, - "color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", - "dev": true - }, - "escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", - "dev": true - }, - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", - "dev": true - }, - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } - } - }, - "@babel/parser": { - "version": "7.20.15", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.20.15.tgz", - "integrity": "sha512-DI4a1oZuf8wC+oAJA9RW6ga3Zbe8RZFt7kD9i4qAspz3I/yHet1VvC3DiSy/fsUvv5pvJuNPh0LPOdCcqinDPg==", - "dev": true - }, - "@babel/plugin-syntax-async-generators": { - "version": "7.8.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz", - "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.8.0" - } - }, - "@babel/plugin-syntax-bigint": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz", - "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.8.0" - } - }, - "@babel/plugin-syntax-class-properties": { - "version": "7.12.13", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz", - "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.12.13" - } - }, - "@babel/plugin-syntax-import-meta": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz", - "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.10.4" - } - }, - "@babel/plugin-syntax-json-strings": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz", - "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.8.0" - } - }, - "@babel/plugin-syntax-logical-assignment-operators": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz", - "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.10.4" - } - }, - "@babel/plugin-syntax-nullish-coalescing-operator": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz", - "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.8.0" - } - }, - "@babel/plugin-syntax-numeric-separator": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz", - "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.10.4" - } - }, - "@babel/plugin-syntax-object-rest-spread": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz", - "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.8.0" - } - }, - "@babel/plugin-syntax-optional-catch-binding": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz", - "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.8.0" - } - }, - "@babel/plugin-syntax-optional-chaining": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz", - "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.8.0" - } - }, - "@babel/plugin-syntax-top-level-await": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz", - "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.14.5" - } - }, - "@babel/plugin-syntax-typescript": { - "version": "7.20.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.20.0.tgz", - "integrity": "sha512-rd9TkG+u1CExzS4SM1BlMEhMXwFLKVjOAFFCDx9PbX5ycJWDoWMcwdJH9RhkPu1dOgn5TrxLot/Gx6lWFuAUNQ==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.19.0" - } - }, - "@babel/runtime": { - "version": "7.21.0", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.21.0.tgz", - "integrity": "sha512-xwII0//EObnq89Ji5AKYQaRYiW/nZ3llSv29d49IuxPhKbtJoLP+9QUUZ4nVragQVtaVGeZrpB+ZtG/Pdy/POw==", - "requires": { - "regenerator-runtime": "^0.13.11" - } - }, - "@babel/template": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.20.7.tgz", - "integrity": "sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.18.6", - "@babel/parser": "^7.20.7", - "@babel/types": "^7.20.7" - } - }, - "@babel/traverse": { - "version": "7.20.13", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.20.13.tgz", - "integrity": "sha512-kMJXfF0T6DIS9E8cgdLCSAL+cuCK+YEZHWiLK0SXpTo8YRj5lpJu3CDNKiIBCne4m9hhTIqUg6SYTAI39tAiVQ==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.18.6", - "@babel/generator": "^7.20.7", - "@babel/helper-environment-visitor": "^7.18.9", - "@babel/helper-function-name": "^7.19.0", - "@babel/helper-hoist-variables": "^7.18.6", - "@babel/helper-split-export-declaration": "^7.18.6", - "@babel/parser": "^7.20.13", - "@babel/types": "^7.20.7", - "debug": "^4.1.0", - "globals": "^11.1.0" - }, - "dependencies": { - "globals": { - "version": "11.12.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", - "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", - "dev": true - } - } - }, - "@babel/types": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.20.7.tgz", - "integrity": "sha512-69OnhBxSSgK0OzTJai4kyPDiKTIe3j+ctaHdIGVbRahTLAT7L3R9oeXHC2aVSuGYt3cVnoAMDmOCgJ2yaiLMvg==", - "dev": true, - "requires": { - "@babel/helper-string-parser": "^7.19.4", - "@babel/helper-validator-identifier": "^7.19.1", - "to-fast-properties": "^2.0.0" - } - }, - "@bcoe/v8-coverage": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz", - "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==", - "dev": true - }, - "@colors/colors": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz", - "integrity": "sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==", - "dev": true, - "optional": true - }, - "@cspotcode/source-map-support": { - "version": "0.8.1", - "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz", - "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==", - "devOptional": true, - "requires": { - "@jridgewell/trace-mapping": "0.3.9" - }, - "dependencies": { - "@jridgewell/trace-mapping": { - "version": "0.3.9", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz", - "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==", - "devOptional": true, - "requires": { - "@jridgewell/resolve-uri": "^3.0.3", - "@jridgewell/sourcemap-codec": "^1.4.10" - } - } - } - }, - "@eslint/eslintrc": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.4.1.tgz", - "integrity": "sha512-XXrH9Uarn0stsyldqDYq8r++mROmWRI1xKMXa640Bb//SY1+ECYX6VzT6Lcx5frD0V30XieqJ0oX9I2Xj5aoMA==", - "dev": true, - "requires": { - "ajv": "^6.12.4", - "debug": "^4.3.2", - "espree": "^9.4.0", - "globals": "^13.19.0", - "ignore": "^5.2.0", - "import-fresh": "^3.2.1", - "js-yaml": "^4.1.0", - "minimatch": "^3.1.2", - "strip-json-comments": "^3.1.1" - }, - "dependencies": { - "ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", - "dev": true, - "requires": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - } - }, - "json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true - } - } - }, - "@fastify/accept-negotiator": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@fastify/accept-negotiator/-/accept-negotiator-1.1.0.tgz", - "integrity": "sha512-OIHZrb2ImZ7XG85HXOONLcJWGosv7sIvM2ifAPQVhg9Lv7qdmMBNVaai4QTdyuaqbKM5eO6sLSQOYI7wEQeCJQ==" - }, - "@fastify/ajv-compiler": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/@fastify/ajv-compiler/-/ajv-compiler-3.5.0.tgz", - "integrity": "sha512-ebbEtlI7dxXF5ziNdr05mOY8NnDiPB1XvAlLHctRt/Rc+C3LCOVW5imUVX+mhvUhnNzmPBHewUkOFgGlCxgdAA==", - "requires": { - "ajv": "^8.11.0", - "ajv-formats": "^2.1.1", - "fast-uri": "^2.0.0" - } - }, - "@fastify/busboy": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@fastify/busboy/-/busboy-1.2.1.tgz", - "integrity": "sha512-7PQA7EH43S0CxcOa9OeAnaeA0oQ+e/DHNPZwSQM9CQHW76jle5+OvLdibRp/Aafs9KXbLhxyjOTkRjWUbQEd3Q==", - "requires": { - "text-decoding": "^1.0.0" - } - }, - "@fastify/cors": { - "version": "8.2.0", - "resolved": "https://registry.npmjs.org/@fastify/cors/-/cors-8.2.0.tgz", - "integrity": "sha512-qDgwpmg6C4D0D3nh8MTMuRXWyEwPnDZDBODaJv90FP2o9ukbahJByW4FtrM5Bpod5KbTf1oIExBmpItbUTQmHg==", - "requires": { - "fastify-plugin": "^4.0.0", - "mnemonist": "0.39.5" - } - }, - "@fastify/deepmerge": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@fastify/deepmerge/-/deepmerge-1.3.0.tgz", - "integrity": "sha512-J8TOSBq3SoZbDhM9+R/u77hP93gz/rajSA+K2kGyijPpORPWUXHUpTaleoj+92As0S9uPRP7Oi8IqMf0u+ro6A==" - }, - "@fastify/error": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/@fastify/error/-/error-3.2.0.tgz", - "integrity": "sha512-KAfcLa+CnknwVi5fWogrLXgidLic+GXnLjijXdpl8pvkvbXU5BGa37iZO9FGvsh9ZL4y+oFi5cbHBm5UOG+dmQ==" - }, - "@fastify/fast-json-stringify-compiler": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/@fastify/fast-json-stringify-compiler/-/fast-json-stringify-compiler-4.2.0.tgz", - "integrity": "sha512-ypZynRvXA3dibfPykQN3RB5wBdEUgSGgny8Qc6k163wYPLD4mEGEDkACp+00YmqkGvIm8D/xYoHajwyEdWD/eg==", - "requires": { - "fast-json-stringify": "^5.0.0" - } - }, - "@fastify/formbody": { - "version": "7.4.0", - "resolved": "https://registry.npmjs.org/@fastify/formbody/-/formbody-7.4.0.tgz", - "integrity": "sha512-H3C6h1GN56/SMrZS8N2vCT2cZr7mIHzBHzOBa5OPpjfB/D6FzP9mMpE02ZzrFX0ANeh0BAJdoXKOF2e7IbV+Og==", - "requires": { - "fast-querystring": "^1.0.0", - "fastify-plugin": "^4.0.0" - } - }, - "@fastify/helmet": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/@fastify/helmet/-/helmet-10.1.0.tgz", - "integrity": "sha512-v7QJPYf1uVcCwzyHzkDGcHTqDPscXj/61JKxOdvczyDPAKTxSeb9Sc2OBActXaj7zUELiAdgnkKkzNwmCNzBLQ==", - "requires": { - "fastify-plugin": "^4.2.1", - "helmet": "^6.0.0" - } - }, - "@fastify/middie": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/@fastify/middie/-/middie-8.1.0.tgz", - "integrity": "sha512-VvUCLfKx2j6KSnh8puT8QW7d5YNzi2fD/4HcFvRQ3a7sHlCo+qtfX2fqzFvNqnMVbNft7GX1JL5if/riUiXsyg==", - "requires": { - "fastify-plugin": "^4.0.0", - "path-to-regexp": "^6.1.0", - "reusify": "^1.0.4" - }, - "dependencies": { - "path-to-regexp": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.2.1.tgz", - "integrity": "sha512-JLyh7xT1kizaEvcaXOQwOc2/Yhw6KZOvPf1S8401UyLk86CU79LN3vl7ztXGm/pZ+YjoyAJ4rxmHwbkBXJX+yw==" - } - } - }, - "@fastify/multipart": { - "version": "7.4.1", - "resolved": "https://registry.npmjs.org/@fastify/multipart/-/multipart-7.4.1.tgz", - "integrity": "sha512-PgBJIg/1krx1nWIXGZSUFQMPHXeFv559TmpaswzmNkK6V/yn1xi4nkATqBetv7s5XbXhxzc75uaJgXWdUefxvQ==", - "requires": { - "@fastify/busboy": "^1.0.0", - "@fastify/deepmerge": "^1.0.0", - "@fastify/error": "^3.0.0", - "end-of-stream": "^1.4.4", - "fastify-plugin": "^4.0.0", - "hexoid": "^1.0.0", - "secure-json-parse": "^2.4.0", - "stream-wormhole": "^1.1.0" - } - }, - "@fastify/send": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@fastify/send/-/send-2.0.1.tgz", - "integrity": "sha512-8jdouu0o5d0FMq1+zCKeKXc1tmOQ5tTGYdQP3MpyF9+WWrZT1KCBdh6hvoEYxOm3oJG/akdE9BpehLiJgYRvGw==", - "requires": { - "@lukeed/ms": "^2.0.1", - "escape-html": "~1.0.3", - "fast-decode-uri-component": "^1.0.1", - "http-errors": "2.0.0", - "mime": "^3.0.0" - } - }, - "@fastify/static": { - "version": "6.8.0", - "resolved": "https://registry.npmjs.org/@fastify/static/-/static-6.8.0.tgz", - "integrity": "sha512-MNQp7KM0NIC+722OPN3MholnfvM+Vg2ao4OwbWWNJhAJEWOKGe4fJsEjIh3OkN0z5ymhklc7EXGCG0zDaIU5ZQ==", - "requires": { - "@fastify/accept-negotiator": "^1.0.0", - "@fastify/send": "^2.0.0", - "content-disposition": "^0.5.3", - "fastify-plugin": "^4.0.0", - "glob": "^8.0.1", - "p-limit": "^3.1.0", - "readable-stream": "^4.0.0" - } - }, - "@golevelup/nestjs-testing": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/@golevelup/nestjs-testing/-/nestjs-testing-0.1.2.tgz", - "integrity": "sha512-7TOpI6E86GBE93DJoCqavOfycAMPjnZDfcpdBrm/aWUoR/oDxHjhTr1R8NGVY4+iHY5wDwEXG7mcDkDEWQznfQ==", - "dev": true - }, - "@grpc/grpc-js": { - "version": "1.8.7", - "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.8.7.tgz", - "integrity": "sha512-dRAWjRFN1Zy9mzPNLkFFIWT8T6C9euwluzCHZUKuhC+Bk3MayNPcpgDRyG+sg+n2sitEUySKxUynirVpu9ItKw==", - "requires": { - "@grpc/proto-loader": "^0.7.0", - "@types/node": ">=12.12.47" - } - }, - "@grpc/proto-loader": { - "version": "0.7.4", - "resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.7.4.tgz", - "integrity": "sha512-MnWjkGwqQ3W8fx94/c1CwqLsNmHHv2t0CFn+9++6+cDphC1lolpg9M2OU0iebIjK//pBNX9e94ho+gjx6vz39w==", - "requires": { - "@types/long": "^4.0.1", - "lodash.camelcase": "^4.3.0", - "long": "^4.0.0", - "protobufjs": "^7.0.0", - "yargs": "^16.2.0" - } - }, - "@humanwhocodes/config-array": { - "version": "0.11.8", - "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.8.tgz", - "integrity": "sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g==", - "dev": true, - "requires": { - "@humanwhocodes/object-schema": "^1.2.1", - "debug": "^4.1.1", - "minimatch": "^3.0.5" - } - }, - "@humanwhocodes/module-importer": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", - "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", - "dev": true - }, - "@humanwhocodes/object-schema": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz", - "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==", - "dev": true - }, - "@ioredis/commands": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@ioredis/commands/-/commands-1.2.0.tgz", - "integrity": "sha512-Sx1pU8EM64o2BrqNpEO1CNLtKQwyhuXuqyfH7oGKCk+1a33d2r5saW8zNwm3j6BTExtjrv2BxTgzzkMwts6vGg==", - "peer": true - }, - "@istanbuljs/load-nyc-config": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz", - "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==", - "dev": true, - "requires": { - "camelcase": "^5.3.1", - "find-up": "^4.1.0", - "get-package-type": "^0.1.0", - "js-yaml": "^3.13.1", - "resolve-from": "^5.0.0" - }, - "dependencies": { - "argparse": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", - "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", - "dev": true, - "requires": { - "sprintf-js": "~1.0.2" - } - }, - "find-up": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", - "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", - "dev": true, - "requires": { - "locate-path": "^5.0.0", - "path-exists": "^4.0.0" - } - }, - "js-yaml": { - "version": "3.14.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", - "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", - "dev": true, - "requires": { - "argparse": "^1.0.7", - "esprima": "^4.0.0" - } - }, - "locate-path": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", - "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", - "dev": true, - "requires": { - "p-locate": "^4.1.0" - } - }, - "p-limit": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", - "dev": true, - "requires": { - "p-try": "^2.0.0" - } - }, - "p-locate": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", - "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", - "dev": true, - "requires": { - "p-limit": "^2.2.0" - } - }, - "resolve-from": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", - "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", - "dev": true - } - } - }, - "@istanbuljs/schema": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz", - "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==", - "dev": true - }, - "@jest/console": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/console/-/console-28.1.3.tgz", - "integrity": "sha512-QPAkP5EwKdK/bxIr6C1I4Vs0rm2nHiANzj/Z5X2JQkrZo6IqvC4ldZ9K95tF0HdidhA8Bo6egxSzUFPYKcEXLw==", - "dev": true, - "requires": { - "@jest/types": "^28.1.3", - "@types/node": "*", - "chalk": "^4.0.0", - "jest-message-util": "^28.1.3", - "jest-util": "^28.1.3", - "slash": "^3.0.0" - }, - "dependencies": { - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - } - } - }, - "@jest/core": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/core/-/core-28.1.3.tgz", - "integrity": "sha512-CIKBrlaKOzA7YG19BEqCw3SLIsEwjZkeJzf5bdooVnW4bH5cktqe3JX+G2YV1aK5vP8N9na1IGWFzYaTp6k6NA==", - "dev": true, - "requires": { - "@jest/console": "^28.1.3", - "@jest/reporters": "^28.1.3", - "@jest/test-result": "^28.1.3", - "@jest/transform": "^28.1.3", - "@jest/types": "^28.1.3", - "@types/node": "*", - "ansi-escapes": "^4.2.1", - "chalk": "^4.0.0", - "ci-info": "^3.2.0", - "exit": "^0.1.2", - "graceful-fs": "^4.2.9", - "jest-changed-files": "^28.1.3", - "jest-config": "^28.1.3", - "jest-haste-map": "^28.1.3", - "jest-message-util": "^28.1.3", - "jest-regex-util": "^28.0.2", - "jest-resolve": "^28.1.3", - "jest-resolve-dependencies": "^28.1.3", - "jest-runner": "^28.1.3", - "jest-runtime": "^28.1.3", - "jest-snapshot": "^28.1.3", - "jest-util": "^28.1.3", - "jest-validate": "^28.1.3", - "jest-watcher": "^28.1.3", - "micromatch": "^4.0.4", - "pretty-format": "^28.1.3", - "rimraf": "^3.0.0", - "slash": "^3.0.0", - "strip-ansi": "^6.0.0" - }, - "dependencies": { - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - } - } - }, - "@jest/environment": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-28.1.3.tgz", - "integrity": "sha512-1bf40cMFTEkKyEf585R9Iz1WayDjHoHqvts0XFYEqyKM3cFWDpeMoqKKTAF9LSYQModPUlh8FKptoM2YcMWAXA==", - "dev": true, - "requires": { - "@jest/fake-timers": "^28.1.3", - "@jest/types": "^28.1.3", - "@types/node": "*", - "jest-mock": "^28.1.3" - } - }, - "@jest/expect": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-28.1.3.tgz", - "integrity": "sha512-lzc8CpUbSoE4dqT0U+g1qODQjBRHPpCPXissXD4mS9+sWQdmmpeJ9zSH1rS1HEkrsMN0fb7nKrJ9giAR1d3wBw==", - "dev": true, - "requires": { - "expect": "^28.1.3", - "jest-snapshot": "^28.1.3" - } - }, - "@jest/expect-utils": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-28.1.3.tgz", - "integrity": "sha512-wvbi9LUrHJLn3NlDW6wF2hvIMtd4JUl2QNVrjq+IBSHirgfrR3o9RnVtxzdEGO2n9JyIWwHnLfby5KzqBGg2YA==", - "dev": true, - "requires": { - "jest-get-type": "^28.0.2" - } - }, - "@jest/fake-timers": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-28.1.3.tgz", - "integrity": "sha512-D/wOkL2POHv52h+ok5Oj/1gOG9HSywdoPtFsRCUmlCILXNn5eIWmcnd3DIiWlJnpGvQtmajqBP95Ei0EimxfLw==", - "dev": true, - "requires": { - "@jest/types": "^28.1.3", - "@sinonjs/fake-timers": "^9.1.2", - "@types/node": "*", - "jest-message-util": "^28.1.3", - "jest-mock": "^28.1.3", - "jest-util": "^28.1.3" - } - }, - "@jest/globals": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-28.1.3.tgz", - "integrity": "sha512-XFU4P4phyryCXu1pbcqMO0GSQcYe1IsalYCDzRNyhetyeyxMcIxa11qPNDpVNLeretItNqEmYYQn1UYz/5x1NA==", - "dev": true, - "requires": { - "@jest/environment": "^28.1.3", - "@jest/expect": "^28.1.3", - "@jest/types": "^28.1.3" - } - }, - "@jest/reporters": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-28.1.3.tgz", - "integrity": "sha512-JuAy7wkxQZVNU/V6g9xKzCGC5LVXx9FDcABKsSXp5MiKPEE2144a/vXTEDoyzjUpZKfVwp08Wqg5A4WfTMAzjg==", - "dev": true, - "requires": { - "@bcoe/v8-coverage": "^0.2.3", - "@jest/console": "^28.1.3", - "@jest/test-result": "^28.1.3", - "@jest/transform": "^28.1.3", - "@jest/types": "^28.1.3", - "@jridgewell/trace-mapping": "^0.3.13", - "@types/node": "*", - "chalk": "^4.0.0", - "collect-v8-coverage": "^1.0.0", - "exit": "^0.1.2", - "glob": "^7.1.3", - "graceful-fs": "^4.2.9", - "istanbul-lib-coverage": "^3.0.0", - "istanbul-lib-instrument": "^5.1.0", - "istanbul-lib-report": "^3.0.0", - "istanbul-lib-source-maps": "^4.0.0", - "istanbul-reports": "^3.1.3", - "jest-message-util": "^28.1.3", - "jest-util": "^28.1.3", - "jest-worker": "^28.1.3", - "slash": "^3.0.0", - "string-length": "^4.0.1", - "strip-ansi": "^6.0.0", - "terminal-link": "^2.0.0", - "v8-to-istanbul": "^9.0.1" - }, - "dependencies": { - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "dev": true, - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - } - } - }, - "@jest/schemas": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz", - "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==", - "dev": true, - "requires": { - "@sinclair/typebox": "^0.24.1" - } - }, - "@jest/source-map": { - "version": "28.1.2", - "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-28.1.2.tgz", - "integrity": "sha512-cV8Lx3BeStJb8ipPHnqVw/IM2VCMWO3crWZzYodSIkxXnRcXJipCdx1JCK0K5MsJJouZQTH73mzf4vgxRaH9ww==", - "dev": true, - "requires": { - "@jridgewell/trace-mapping": "^0.3.13", - "callsites": "^3.0.0", - "graceful-fs": "^4.2.9" - } - }, - "@jest/test-result": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-28.1.3.tgz", - "integrity": "sha512-kZAkxnSE+FqE8YjW8gNuoVkkC9I7S1qmenl8sGcDOLropASP+BkcGKwhXoyqQuGOGeYY0y/ixjrd/iERpEXHNg==", - "dev": true, - "requires": { - "@jest/console": "^28.1.3", - "@jest/types": "^28.1.3", - "@types/istanbul-lib-coverage": "^2.0.0", - "collect-v8-coverage": "^1.0.0" - } - }, - "@jest/test-sequencer": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-28.1.3.tgz", - "integrity": "sha512-NIMPEqqa59MWnDi1kvXXpYbqsfQmSJsIbnd85mdVGkiDfQ9WQQTXOLsvISUfonmnBT+w85WEgneCigEEdHDFxw==", - "dev": true, - "requires": { - "@jest/test-result": "^28.1.3", - "graceful-fs": "^4.2.9", - "jest-haste-map": "^28.1.3", - "slash": "^3.0.0" - } - }, - "@jest/transform": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-28.1.3.tgz", - "integrity": "sha512-u5dT5di+oFI6hfcLOHGTAfmUxFRrjK+vnaP0kkVow9Md/M7V/MxqQMOz/VV25UZO8pzeA9PjfTpOu6BDuwSPQA==", - "dev": true, - "requires": { - "@babel/core": "^7.11.6", - "@jest/types": "^28.1.3", - "@jridgewell/trace-mapping": "^0.3.13", - "babel-plugin-istanbul": "^6.1.1", - "chalk": "^4.0.0", - "convert-source-map": "^1.4.0", - "fast-json-stable-stringify": "^2.0.0", - "graceful-fs": "^4.2.9", - "jest-haste-map": "^28.1.3", - "jest-regex-util": "^28.0.2", - "jest-util": "^28.1.3", - "micromatch": "^4.0.4", - "pirates": "^4.0.4", - "slash": "^3.0.0", - "write-file-atomic": "^4.0.1" - }, - "dependencies": { - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - } - } - }, - "@jest/types": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz", - "integrity": "sha512-RyjiyMUZrKz/c+zlMFO1pm70DcIlST8AeWTkoUdZevew44wcNZQHsEVOiCVtgVnlFFD82FPaXycys58cf2muVQ==", - "dev": true, - "requires": { - "@jest/schemas": "^28.1.3", - "@types/istanbul-lib-coverage": "^2.0.0", - "@types/istanbul-reports": "^3.0.0", - "@types/node": "*", - "@types/yargs": "^17.0.8", - "chalk": "^4.0.0" - }, - "dependencies": { - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - } - } - }, - "@jridgewell/gen-mapping": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz", - "integrity": "sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==", - "dev": true, - "requires": { - "@jridgewell/set-array": "^1.0.0", - "@jridgewell/sourcemap-codec": "^1.4.10" - } - }, - "@jridgewell/resolve-uri": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz", - "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==", - "devOptional": true - }, - "@jridgewell/set-array": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz", - "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==", - "dev": true - }, - "@jridgewell/source-map": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.2.tgz", - "integrity": "sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==", - "dev": true, - "requires": { - "@jridgewell/gen-mapping": "^0.3.0", - "@jridgewell/trace-mapping": "^0.3.9" - }, - "dependencies": { - "@jridgewell/gen-mapping": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz", - "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==", - "dev": true, - "requires": { - "@jridgewell/set-array": "^1.0.1", - "@jridgewell/sourcemap-codec": "^1.4.10", - "@jridgewell/trace-mapping": "^0.3.9" - } - } - } - }, - "@jridgewell/sourcemap-codec": { - "version": "1.4.14", - "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz", - "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==", - "devOptional": true - }, - "@jridgewell/trace-mapping": { - "version": "0.3.17", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz", - "integrity": "sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==", - "dev": true, - "requires": { - "@jridgewell/resolve-uri": "3.1.0", - "@jridgewell/sourcemap-codec": "1.4.14" - } - }, - "@lukeed/csprng": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@lukeed/csprng/-/csprng-1.0.1.tgz", - "integrity": "sha512-uSvJdwQU5nK+Vdf6zxcWAY2A8r7uqe+gePwLWzJ+fsQehq18pc0I2hJKwypZ2aLM90+Er9u1xn4iLJPZ+xlL4g==" - }, - "@lukeed/ms": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@lukeed/ms/-/ms-2.0.1.tgz", - "integrity": "sha512-Xs/4RZltsAL7pkvaNStUQt7netTkyxrS0K+RILcVr3TRMS/ToOg4I6uNfhB9SlGsnWBym4U+EaXq0f0cEMNkHA==" - }, - "@msgpackr-extract/msgpackr-extract-darwin-arm64": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-arm64/-/msgpackr-extract-darwin-arm64-3.0.0.tgz", - "integrity": "sha512-5qpnNHUyyEj9H3sm/4Um/bnx1lrQGhe8iqry/1d+cQYCRd/gzYA0YLeq0ezlk4hKx4vO+dsEsNyeowqRqslwQA==", - "optional": true, - "peer": true - }, - "@msgpackr-extract/msgpackr-extract-darwin-x64": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-x64/-/msgpackr-extract-darwin-x64-3.0.0.tgz", - "integrity": "sha512-ZphTFFd6SFweNAMKD+QJCrWpgkjf4qBuHltiMkKkD6FFrB3NOTRVmetAGTkJ57pa+s6J0yCH06LujWB9rZe94g==", - "optional": true, - "peer": true - }, - "@msgpackr-extract/msgpackr-extract-linux-arm": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm/-/msgpackr-extract-linux-arm-3.0.0.tgz", - "integrity": "sha512-ztKVV1dO/sSZyGse0PBCq3Pk1PkYjsA/dsEWE7lfrGoAK3i9HpS2o7XjGQ7V4va6nX+xPPOiuYpQwa4Bi6vlww==", - "optional": true, - "peer": true - }, - "@msgpackr-extract/msgpackr-extract-linux-arm64": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm64/-/msgpackr-extract-linux-arm64-3.0.0.tgz", - "integrity": "sha512-NEX6hdSvP4BmVyegaIbrGxvHzHvTzzsPaxXCsUt0mbLbPpEftsvNwaEVKOowXnLoeuGeD4MaqSwL3BUK2elsUA==", - "optional": true, - "peer": true - }, - "@msgpackr-extract/msgpackr-extract-linux-x64": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-x64/-/msgpackr-extract-linux-x64-3.0.0.tgz", - "integrity": "sha512-9uvdAkZMOPCY7SPRxZLW8XGqBOVNVEhqlgffenN8shA1XR9FWVsSM13nr/oHtNgXg6iVyML7RwWPyqUeThlwxg==", - "optional": true, - "peer": true - }, - "@msgpackr-extract/msgpackr-extract-win32-x64": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-win32-x64/-/msgpackr-extract-win32-x64-3.0.0.tgz", - "integrity": "sha512-Wg0+9615kHKlr9iLVcG5I+/CHnf6w3x5UADRv8Ad16yA0Bu5l9eVOROjV7aHPG6uC8ZPFIVVaoSjDChD+Y0pzg==", - "optional": true, - "peer": true - }, - "@nestjs/axios": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/@nestjs/axios/-/axios-0.1.1.tgz", - "integrity": "sha512-rLEq6yfho2CZyOcxP+P4Q3FjkNuiiHDyzj3Cr9i4Kdn3Ng09ygtOB4++jjXPREc6650pOFfzNtw18QH7bfLnQA==", - "requires": { - "axios": "1.2.1" - } - }, - "@nestjs/bullmq": { - "version": "10.0.1", - "resolved": "https://registry.npmjs.org/@nestjs/bullmq/-/bullmq-10.0.1.tgz", - "integrity": "sha512-YJtfJXfnQinN7OvGx/Qd6jlQFu56zVnI1SppftSS7gkthB2CbJQAjkrfCEPDjp11wbPptBhUnatIL2N+nH/3kA==", - "requires": { - "@nestjs/bull-shared": "^10.0.1", - "tslib": "2.6.0" - }, - "dependencies": { - "@nestjs/bull-shared": { - "version": "10.0.1", - "resolved": "https://registry.npmjs.org/@nestjs/bull-shared/-/bull-shared-10.0.1.tgz", - "integrity": "sha512-8Td36l2i5x9+iQWjPB5Bd5+6u5Eangb5DclNcwrdwKqvd28xE92MSW97P4JV52C2kxrTjZwx8ck/wObAwtpQPw==", - "requires": { - "tslib": "2.6.0" - } - } - } - }, - "@nestjs/cli": { - "version": "9.1.9", - "resolved": "https://registry.npmjs.org/@nestjs/cli/-/cli-9.1.9.tgz", - "integrity": "sha512-oRiJArvQcYUJRO0jRWG99KkXuw+HafSnlfWcO4028gTDb4IanRwbl6fw4mELTEAaXAwDGOcuk8R0QY8H3muyiQ==", - "dev": true, - "requires": { - "@angular-devkit/core": "15.0.4", - "@angular-devkit/schematics": "15.0.4", - "@angular-devkit/schematics-cli": "15.0.4", - "@nestjs/schematics": "^9.0.0", - "chalk": "3.0.0", - "chokidar": "3.5.3", - "cli-table3": "0.6.3", - "commander": "4.1.1", - "fork-ts-checker-webpack-plugin": "7.2.14", - "inquirer": "7.3.3", - "node-emoji": "1.11.0", - "ora": "5.4.1", - "os-name": "4.0.1", - "rimraf": "3.0.2", - "shelljs": "0.8.5", - "source-map-support": "0.5.21", - "tree-kill": "1.2.2", - "tsconfig-paths": "4.1.1", - "tsconfig-paths-webpack-plugin": "4.0.0", - "typescript": "4.9.4", - "webpack": "5.75.0", - "webpack-node-externals": "3.0.0" - }, - "dependencies": { - "strip-bom": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", - "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==", - "dev": true - }, - "tsconfig-paths": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-4.1.1.tgz", - "integrity": "sha512-VgPrtLKpRgEAJsMj5Q/I/mXouC6A/7eJ/X4Nuk6o0cRPwBtznYxTCU4FodbexbzH9somBPEXYi0ZkUViUpJ21Q==", - "dev": true, - "requires": { - "json5": "^2.2.1", - "minimist": "^1.2.6", - "strip-bom": "^3.0.0" - } - }, - "typescript": { - "version": "4.9.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.4.tgz", - "integrity": "sha512-Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg==", - "dev": true - } - } - }, - "@nestjs/common": { - "version": "9.3.1", - "resolved": "https://registry.npmjs.org/@nestjs/common/-/common-9.3.1.tgz", - "integrity": "sha512-T14G3xjIXmEkxMcHcwh/eJwodF2owhYIT0ZA8u6UCNCEQg+391TXA7xTynUuR5Fl2EJPYTKF0g89XSFOW7NS2Q==", - "requires": { - "iterare": "1.2.1", - "tslib": "2.4.1", - "uid": "2.0.1" - }, - "dependencies": { - "tslib": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz", - "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==" - } - } - }, - "@nestjs/config": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@nestjs/config/-/config-2.3.0.tgz", - "integrity": "sha512-VSAqoIagIrc0A3apaqC2O3a8VtQ+asw8xILmxvjK/eHW9m1rmhJ5NqkGf7m+uSv3Yxini4bzyb74Mk62+tB/cA==", - "requires": { - "dotenv": "16.0.3", - "dotenv-expand": "10.0.0", - "lodash": "4.17.21", - "uuid": "9.0.0" - }, - "dependencies": { - "uuid": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.0.tgz", - "integrity": "sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==" - } - } - }, - "@nestjs/core": { - "version": "9.3.1", - "resolved": "https://registry.npmjs.org/@nestjs/core/-/core-9.3.1.tgz", - "integrity": "sha512-hLVfImzHu1vdcViEhIRnm7x3EBk+YiV7XVTJNz6n2Ly8a6t7IFBoJkGrZkE8ZTytnfbJZO0Vtp54ZBllxx3MwA==", - "requires": { - "@nuxtjs/opencollective": "0.3.2", - "fast-safe-stringify": "2.1.1", - "iterare": "1.2.1", - "object-hash": "3.0.0", - "path-to-regexp": "3.2.0", - "tslib": "2.4.1", - "uuid": "9.0.0" - }, - "dependencies": { - "tslib": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz", - "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==" - }, - "uuid": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.0.tgz", - "integrity": "sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==" - } - } - }, - "@nestjs/microservices": { - "version": "9.3.1", - "resolved": "https://registry.npmjs.org/@nestjs/microservices/-/microservices-9.3.1.tgz", - "integrity": "sha512-JyEcHuAoip5s5TSX27KGNJCPPUo7rwlGSYhVSL0lOpx9qfnIQbBk3mjyoOHCweRXlzYSIyG+7CRpRORtFhuynA==", - "requires": { - "iterare": "1.2.1", - "tslib": "2.4.1" - }, - "dependencies": { - "tslib": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz", - "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==" - } - } - }, - "@nestjs/platform-fastify": { - "version": "9.3.1", - "resolved": "https://registry.npmjs.org/@nestjs/platform-fastify/-/platform-fastify-9.3.1.tgz", - "integrity": "sha512-k7byfRo/0JC0v8DDHYTrTpYjGNjtM7kGUopFyX8ArdftGcvpNDp3pnp3KlsNT2ex1SNpFMP6pByxglTHtfsvxg==", - "requires": { - "@fastify/cors": "8.2.0", - "@fastify/formbody": "7.4.0", - "@fastify/middie": "8.1.0", - "fastify": "4.12.0", - "light-my-request": "5.8.0", - "path-to-regexp": "3.2.0", - "tslib": "2.4.1" - }, - "dependencies": { - "tslib": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz", - "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==" - } - } - }, - "@nestjs/schematics": { - "version": "9.0.4", - "resolved": "https://registry.npmjs.org/@nestjs/schematics/-/schematics-9.0.4.tgz", - "integrity": "sha512-egurCfAc4e5i1r2TmeAF0UrOKejFmT5oTdv4b7HcOVPupc3QGU7CbEfGleL3mkM5AjrixTQeMxU9bJ00ttAbGg==", - "dev": true, - "requires": { - "@angular-devkit/core": "15.0.4", - "@angular-devkit/schematics": "15.0.4", - "fs-extra": "11.1.0", - "jsonc-parser": "3.2.0", - "pluralize": "8.0.0" - } - }, - "@nestjs/swagger": { - "version": "6.1.4", - "resolved": "https://registry.npmjs.org/@nestjs/swagger/-/swagger-6.1.4.tgz", - "integrity": "sha512-kE8VjR+NaoKqxg8XqM/YYfALScPh4AcoR8Wywga8/OxHsTHY+MKxqvTpWp7IhCUWSA6xT8nQUpcC9Rt7C+r7Hw==", - "requires": { - "@nestjs/mapped-types": "1.2.0", - "js-yaml": "4.1.0", - "lodash": "4.17.21", - "path-to-regexp": "3.2.0", - "swagger-ui-dist": "4.15.5" - }, - "dependencies": { - "@nestjs/mapped-types": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@nestjs/mapped-types/-/mapped-types-1.2.0.tgz", - "integrity": "sha512-NTFwPZkQWsArQH8QSyFWGZvJ08gR+R4TofglqZoihn/vU+ktHEJjMqsIsADwb7XD97DhiD+TVv5ac+jG33BHrg==", - "requires": {} - } - } - }, - "@nestjs/testing": { - "version": "9.3.1", - "resolved": "https://registry.npmjs.org/@nestjs/testing/-/testing-9.3.1.tgz", - "integrity": "sha512-jjsmfd9h0E8bWTSWMm+QD1P8T8ElHufTJ2tDbi0q9U8JR5QoJ9KLcVTYZVPciXpwPxIiZ+qFEjrY1/irvPHDug==", - "dev": true, - "requires": { - "tslib": "2.4.1" - }, - "dependencies": { - "tslib": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz", - "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==", - "dev": true - } - } - }, - "@nestjs/typeorm": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/@nestjs/typeorm/-/typeorm-9.0.1.tgz", - "integrity": "sha512-A2BgLIPsMtmMI0bPKEf4bmzgFPsnvHqNBx3KkvaJ7hJrBQy0OqYOb+Rr06ifblKWDWS2tUPNrAFQbZjtk3PI+g==", - "requires": { - "uuid": "8.3.2" - } - }, - "@nodelib/fs.scandir": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", - "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", - "dev": true, - "requires": { - "@nodelib/fs.stat": "2.0.5", - "run-parallel": "^1.1.9" - } - }, - "@nodelib/fs.stat": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", - "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", - "dev": true - }, - "@nodelib/fs.walk": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", - "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", - "dev": true, - "requires": { - "@nodelib/fs.scandir": "2.1.5", - "fastq": "^1.6.0" - } - }, - "@nuxtjs/opencollective": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/@nuxtjs/opencollective/-/opencollective-0.3.2.tgz", - "integrity": "sha512-um0xL3fO7Mf4fDxcqx9KryrB7zgRM5JSlvGN5AGkP6JLM5XEKyjeAiPbNxdXVXQ16isuAhYpvP88NgL2BGd6aA==", - "requires": { - "chalk": "^4.1.0", - "consola": "^2.15.0", - "node-fetch": "^2.6.1" - }, - "dependencies": { - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - } - } - }, - "@ogma/common": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@ogma/common/-/common-1.0.0.tgz", - "integrity": "sha512-IXvSnXbXccpxJR+UbN2fxp30R/44VFpx/T0ungb1PMwLa9BLmtbeQIXqc9TR11gRaDNY0e78tqVckau8oyXK0A==" - }, - "@ogma/styler": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@ogma/styler/-/styler-1.0.0.tgz", - "integrity": "sha512-Twtijg2eUS4HEPyic0FEpkdJgRtLSvVow/3gmLsMkyU+GhSm80PnRlc6q1N1rmf1EQhuwGZLKhS30sYIuFV38A==", - "requires": { - "@ogma/common": "1.0.0" - } - }, - "@protobufjs/aspromise": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz", - "integrity": "sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ==" - }, - "@protobufjs/base64": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@protobufjs/base64/-/base64-1.1.2.tgz", - "integrity": "sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg==" - }, - "@protobufjs/codegen": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.4.tgz", - "integrity": "sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg==" - }, - "@protobufjs/eventemitter": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz", - "integrity": "sha512-j9ednRT81vYJ9OfVuXG6ERSTdEL1xVsNgqpkxMsbIabzSo3goCjDIveeGv5d03om39ML71RdmrGNjG5SReBP/Q==" - }, - "@protobufjs/fetch": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz", - "integrity": "sha512-lljVXpqXebpsijW71PZaCYeIcE5on1w5DlQy5WH6GLbFryLUrBD4932W/E2BSpfRJWseIL4v/KPgBFxDOIdKpQ==", - "requires": { - "@protobufjs/aspromise": "^1.1.1", - "@protobufjs/inquire": "^1.1.0" - } - }, - "@protobufjs/float": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@protobufjs/float/-/float-1.0.2.tgz", - "integrity": "sha512-Ddb+kVXlXst9d+R9PfTIxh1EdNkgoRe5tOX6t01f1lYWOvJnSPDBlG241QLzcyPdoNTsblLUdujGSE4RzrTZGQ==" - }, - "@protobufjs/inquire": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@protobufjs/inquire/-/inquire-1.1.0.tgz", - "integrity": "sha512-kdSefcPdruJiFMVSbn801t4vFK7KB/5gd2fYvrxhuJYg8ILrmn9SKSX2tZdV6V+ksulWqS7aXjBcRXl3wHoD9Q==" - }, - "@protobufjs/path": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz", - "integrity": "sha512-6JOcJ5Tm08dOHAbdR3GrvP+yUUfkjG5ePsHYczMFLq3ZmMkAD98cDgcT2iA1lJ9NVwFd4tH/iSSoe44YWkltEA==" - }, - "@protobufjs/pool": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@protobufjs/pool/-/pool-1.1.0.tgz", - "integrity": "sha512-0kELaGSIDBKvcgS4zkjz1PeddatrjYcmMWOlAuAPwAeccUrPHdUqo/J6LiymHHEiJT5NrF1UVwxY14f+fy4WQw==" - }, - "@protobufjs/utf8": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz", - "integrity": "sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==" - }, - "@redis/bloom": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@redis/bloom/-/bloom-1.2.0.tgz", - "integrity": "sha512-HG2DFjYKbpNmVXsa0keLHp/3leGJz1mjh09f2RLGGLQZzSHpkmZWuwJbAvo3QcRY8p80m5+ZdXZdYOSBLlp7Cg==", - "requires": {} - }, - "@redis/client": { - "version": "1.5.5", - "resolved": "https://registry.npmjs.org/@redis/client/-/client-1.5.5.tgz", - "integrity": "sha512-fuMnpDYSjT5JXR9rrCW1YWA4L8N/9/uS4ImT3ZEC/hcaQRI1D/9FvwjriRj1UvepIgzZXthFVKMNRzP/LNL7BQ==", - "requires": { - "cluster-key-slot": "1.1.2", - "generic-pool": "3.9.0", - "yallist": "4.0.0" - }, - "dependencies": { - "yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" - } - } - }, - "@redis/graph": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@redis/graph/-/graph-1.1.0.tgz", - "integrity": "sha512-16yZWngxyXPd+MJxeSr0dqh2AIOi8j9yXKcKCwVaKDbH3HTuETpDVPcLujhFYVPtYrngSco31BUcSa9TH31Gqg==", - "requires": {} - }, - "@redis/json": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/@redis/json/-/json-1.0.4.tgz", - "integrity": "sha512-LUZE2Gdrhg0Rx7AN+cZkb1e6HjoSKaeeW8rYnt89Tly13GBI5eP4CwDVr+MY8BAYfCg4/N15OUrtLoona9uSgw==", - "requires": {} - }, - "@redis/search": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@redis/search/-/search-1.1.1.tgz", - "integrity": "sha512-pqCXTc5e7wJJgUuJiC3hBgfoFRoPxYzwn0BEfKgejTM7M/9zP3IpUcqcjgfp8hF+LoV8rHZzcNTz7V+pEIY7LQ==", - "requires": {} - }, - "@redis/time-series": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/@redis/time-series/-/time-series-1.0.4.tgz", - "integrity": "sha512-ThUIgo2U/g7cCuZavucQTQzA9g9JbDDY2f64u3AbAoz/8vE2lt2U37LamDUVChhaDA3IRT9R6VvJwqnUfTJzng==", - "requires": {} - }, - "@sinclair/typebox": { - "version": "0.24.51", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz", - "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==", - "dev": true - }, - "@sinonjs/commons": { - "version": "1.8.6", - "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.6.tgz", - "integrity": "sha512-Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ==", - "dev": true, - "requires": { - "type-detect": "4.0.8" - } - }, - "@sinonjs/fake-timers": { - "version": "9.1.2", - "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-9.1.2.tgz", - "integrity": "sha512-BPS4ynJW/o92PUR4wgriz2Ud5gpST5vz6GQfMixEDK0Z8ZCUv2M7SkBLykH56T++Xs+8ln9zTGbOvNGIe02/jw==", - "dev": true, - "requires": { - "@sinonjs/commons": "^1.7.0" - } - }, - "@sinonjs/samsam": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-7.0.1.tgz", - "integrity": "sha512-zsAk2Jkiq89mhZovB2LLOdTCxJF4hqqTToGP0ASWlhp4I1hqOjcfmZGafXntCN7MDC6yySH0mFHrYtHceOeLmw==", - "dev": true, - "requires": { - "@sinonjs/commons": "^2.0.0", - "lodash.get": "^4.4.2", - "type-detect": "^4.0.8" - }, - "dependencies": { - "@sinonjs/commons": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-2.0.0.tgz", - "integrity": "sha512-uLa0j859mMrg2slwQYdO/AkrOfmH+X6LTVmNTS9CqexuE2IvVORIkSpJLqePAbEnKJ77aMmCwr1NUZ57120Xcg==", - "dev": true, - "requires": { - "type-detect": "4.0.8" - } - } - } - }, - "@sinonjs/text-encoding": { - "version": "0.7.2", - "resolved": "https://registry.npmjs.org/@sinonjs/text-encoding/-/text-encoding-0.7.2.tgz", - "integrity": "sha512-sXXKG+uL9IrKqViTtao2Ws6dy0znu9sOaP1di/jKGW1M6VssO8vlpXCQcpZ+jisQ1tTFAC5Jo/EOzFbggBagFQ==", - "dev": true - }, - "@sqltools/formatter": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/@sqltools/formatter/-/formatter-1.2.5.tgz", - "integrity": "sha512-Uy0+khmZqUrUGm5dmMqVlnvufZRSK0FbYzVgp0UMstm+F5+W2/jnEEQyc9vo1ZR/E5ZI/B1WjjoTqBqwJL6Krw==" - }, - "@testim/chrome-version": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/@testim/chrome-version/-/chrome-version-1.1.3.tgz", - "integrity": "sha512-g697J3WxV/Zytemz8aTuKjTGYtta9+02kva3C1xc7KXB8GdbfE1akGJIsZLyY/FSh2QrnE+fiB7vmWU3XNcb6A==", - "optional": true - }, - "@tsconfig/node10": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.9.tgz", - "integrity": "sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA==", - "devOptional": true - }, - "@tsconfig/node12": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz", - "integrity": "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==", - "devOptional": true - }, - "@tsconfig/node14": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz", - "integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==", - "devOptional": true - }, - "@tsconfig/node16": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.3.tgz", - "integrity": "sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ==", - "devOptional": true - }, - "@types/babel__core": { - "version": "7.20.0", - "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.0.tgz", - "integrity": "sha512-+n8dL/9GWblDO0iU6eZAwEIJVr5DWigtle+Q6HLOrh/pdbXOhOtqzq8VPPE2zvNJzSKY4vH/z3iT3tn0A3ypiQ==", - "dev": true, - "requires": { - "@babel/parser": "^7.20.7", - "@babel/types": "^7.20.7", - "@types/babel__generator": "*", - "@types/babel__template": "*", - "@types/babel__traverse": "*" - } - }, - "@types/babel__generator": { - "version": "7.6.4", - "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.4.tgz", - "integrity": "sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==", - "dev": true, - "requires": { - "@babel/types": "^7.0.0" - } - }, - "@types/babel__template": { - "version": "7.4.1", - "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.1.tgz", - "integrity": "sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==", - "dev": true, - "requires": { - "@babel/parser": "^7.1.0", - "@babel/types": "^7.0.0" - } - }, - "@types/babel__traverse": { - "version": "7.18.3", - "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.18.3.tgz", - "integrity": "sha512-1kbcJ40lLB7MHsj39U4Sh1uTd2E7rLEa79kmDpI6cy+XiXsteB3POdQomoq4FxszMrO3ZYchkhYJw7A2862b3w==", - "dev": true, - "requires": { - "@babel/types": "^7.3.0" - } - }, - "@types/body-parser": { - "version": "1.19.2", - "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.2.tgz", - "integrity": "sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==", - "dev": true, - "requires": { - "@types/connect": "*", - "@types/node": "*" - } - }, - "@types/clamscan": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/@types/clamscan/-/clamscan-2.0.5.tgz", - "integrity": "sha512-bFqdscswqBia3yKEJZVVWELOVvWKHUR1dCmH4xshYwu0T9YSfZd35Q8Z9jYW0ygxqGlHjLXMb2/7C6CJITbDgg==", - "requires": { - "@types/node": "*", - "axios": "^0.24.0" - }, - "dependencies": { - "axios": { - "version": "0.24.0", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.24.0.tgz", - "integrity": "sha512-Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA==", - "requires": { - "follow-redirects": "^1.14.4" - } - } - } - }, - "@types/config": { - "version": "0.0.41", - "resolved": "https://registry.npmjs.org/@types/config/-/config-0.0.41.tgz", - "integrity": "sha512-HjXUmIld0gwvyG8MU/17QtLzOyuMX4jbGuijmS9sWsob5xxgZ/hY9cbRCaHIHqTQ3HMLhwS3F8uXq3Bt9zgzHA==", - "dev": true - }, - "@types/connect": { - "version": "3.4.35", - "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.35.tgz", - "integrity": "sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==", - "dev": true, - "requires": { - "@types/node": "*" - } - }, - "@types/cookiejar": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/@types/cookiejar/-/cookiejar-2.1.2.tgz", - "integrity": "sha512-t73xJJrvdTjXrn4jLS9VSGRbz0nUY3cl2DMGDU48lKl+HR9dbbjW2A9r3g40VA++mQpy6uuHg33gy7du2BKpog==", - "dev": true - }, - "@types/eslint": { - "version": "8.21.0", - "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.21.0.tgz", - "integrity": "sha512-35EhHNOXgxnUgh4XCJsGhE7zdlDhYDN/aMG6UbkByCFFNgQ7b3U+uVoqBpicFydR8JEfgdjCF7SJ7MiJfzuiTA==", - "dev": true, - "requires": { - "@types/estree": "*", - "@types/json-schema": "*" - } - }, - "@types/eslint-scope": { - "version": "3.7.4", - "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.4.tgz", - "integrity": "sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==", - "dev": true, - "requires": { - "@types/eslint": "*", - "@types/estree": "*" - } - }, - "@types/estree": { - "version": "0.0.51", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.51.tgz", - "integrity": "sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==", - "dev": true - }, - "@types/express": { - "version": "4.17.16", - "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.16.tgz", - "integrity": "sha512-LkKpqRZ7zqXJuvoELakaFYuETHjZkSol8EV6cNnyishutDBCCdv6+dsKPbKkCcIk57qRphOLY5sEgClw1bO3gA==", - "dev": true, - "requires": { - "@types/body-parser": "*", - "@types/express-serve-static-core": "^4.17.31", - "@types/qs": "*", - "@types/serve-static": "*" - } - }, - "@types/express-serve-static-core": { - "version": "4.17.33", - "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.33.tgz", - "integrity": "sha512-TPBqmR/HRYI3eC2E5hmiivIzv+bidAfXofM+sbonAGvyDhySGw9/PQZFt2BLOrjUUR++4eJVpx6KnLQK1Fk9tA==", - "dev": true, - "requires": { - "@types/node": "*", - "@types/qs": "*", - "@types/range-parser": "*" - } - }, - "@types/graceful-fs": { - "version": "4.1.6", - "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.6.tgz", - "integrity": "sha512-Sig0SNORX9fdW+bQuTEovKj3uHcUL6LQKbCrrqb1X7J6/ReAbhCXRAhc+SMejhLELFj2QcyuxmUooZ4bt5ReSw==", - "dev": true, - "requires": { - "@types/node": "*" - } - }, - "@types/istanbul-lib-coverage": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz", - "integrity": "sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g==", - "dev": true - }, - "@types/istanbul-lib-report": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz", - "integrity": "sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==", - "dev": true, - "requires": { - "@types/istanbul-lib-coverage": "*" - } - }, - "@types/istanbul-reports": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz", - "integrity": "sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==", - "dev": true, - "requires": { - "@types/istanbul-lib-report": "*" - } - }, - "@types/jest": { - "version": "28.1.4", - "resolved": "https://registry.npmjs.org/@types/jest/-/jest-28.1.4.tgz", - "integrity": "sha512-telv6G5N7zRJiLcI3Rs3o+ipZ28EnE+7EvF0pSrt2pZOMnAVI/f+6/LucDxOvcBcTeTL3JMF744BbVQAVBUQRA==", - "dev": true, - "requires": { - "jest-matcher-utils": "^28.0.0", - "pretty-format": "^28.0.0" - } - }, - "@types/json-schema": { - "version": "7.0.11", - "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz", - "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==", - "dev": true - }, - "@types/long": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/@types/long/-/long-4.0.2.tgz", - "integrity": "sha512-MqTGEo5bj5t157U6fA/BiDynNkn0YknVdh48CMPkTSpFTVmvao5UQmm7uEF6xBEo7qIMAlY/JSleYaE6VOdpaA==" - }, - "@types/mime": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/@types/mime/-/mime-3.0.1.tgz", - "integrity": "sha512-Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA==", - "dev": true - }, - "@types/node": { - "version": "18.11.18", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.18.tgz", - "integrity": "sha512-DHQpWGjyQKSHj3ebjFI/wRKcqQcdR+MoFBygntYOZytCqNfkd2ZC4ARDJ2DQqhjH5p85Nnd3jhUJIXrszFX/JA==" - }, - "@types/node-jose": { - "version": "1.1.10", - "resolved": "https://registry.npmjs.org/@types/node-jose/-/node-jose-1.1.10.tgz", - "integrity": "sha512-7L0ucJTugW4x/sYpQ+c5IudAwr0pFuxDVnZLpHKWpff7p1lVa3wTuNvnrzFBNeLojE+UY0cVCwNGXLxXsMIrzw==", - "dev": true, - "requires": { - "@types/node": "*" - } - }, - "@types/object-hash": { - "version": "1.3.4", - "resolved": "https://registry.npmjs.org/@types/object-hash/-/object-hash-1.3.4.tgz", - "integrity": "sha512-xFdpkAkikBgqBdG9vIlsqffDV8GpvnPEzs0IUtr1v3BEB97ijsFQ4RXVbUZwjFThhB4MDSTUfvmxUD5PGx0wXA==" - }, - "@types/parse-json": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz", - "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==", - "dev": true - }, - "@types/prettier": { - "version": "2.7.2", - "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.7.2.tgz", - "integrity": "sha512-KufADq8uQqo1pYKVIYzfKbJfBAc0sOeXqGbFaSpv8MRmC/zXgowNZmFcbngndGk922QDmOASEXUZCaY48gs4cg==", - "dev": true - }, - "@types/qs": { - "version": "6.9.7", - "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.7.tgz", - "integrity": "sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==", - "dev": true - }, - "@types/range-parser": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.4.tgz", - "integrity": "sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==", - "dev": true - }, - "@types/semver": { - "version": "7.3.13", - "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.3.13.tgz", - "integrity": "sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw==", - "dev": true - }, - "@types/serve-static": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.0.tgz", - "integrity": "sha512-z5xyF6uh8CbjAu9760KDKsH2FcDxZ2tFCsA4HIMWE6IkiYMXfVoa+4f9KX+FN0ZLsaMw1WNG2ETLA6N+/YA+cg==", - "dev": true, - "requires": { - "@types/mime": "*", - "@types/node": "*" - } - }, - "@types/sinon": { - "version": "10.0.13", - "resolved": "https://registry.npmjs.org/@types/sinon/-/sinon-10.0.13.tgz", - "integrity": "sha512-UVjDqJblVNQYvVNUsj0PuYYw0ELRmgt1Nt5Vk0pT5f16ROGfcKJY8o1HVuMOJOpD727RrGB9EGvoaTQE5tgxZQ==", - "dev": true, - "requires": { - "@types/sinonjs__fake-timers": "*" - } - }, - "@types/sinonjs__fake-timers": { - "version": "8.1.2", - "resolved": "https://registry.npmjs.org/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-8.1.2.tgz", - "integrity": "sha512-9GcLXF0/v3t80caGs5p2rRfkB+a8VBGLJZVih6CNFkx8IZ994wiKKLSRs9nuFwk1HevWs/1mnUmkApGrSGsShA==", - "dev": true - }, - "@types/source-map-support": { - "version": "0.5.6", - "resolved": "https://registry.npmjs.org/@types/source-map-support/-/source-map-support-0.5.6.tgz", - "integrity": "sha512-b2nJ9YyXmkhGaa2b8VLM0kJ04xxwNyijcq12/kDoomCt43qbHBeK2SLNJ9iJmETaAj+bKUT05PQUu3Q66GvLhQ==", - "dev": true, - "requires": { - "source-map": "^0.6.0" - }, - "dependencies": { - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - } - } - }, - "@types/stack-utils": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.1.tgz", - "integrity": "sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==", - "dev": true - }, - "@types/superagent": { - "version": "4.1.16", - "resolved": "https://registry.npmjs.org/@types/superagent/-/superagent-4.1.16.tgz", - "integrity": "sha512-tLfnlJf6A5mB6ddqF159GqcDizfzbMUB1/DeT59/wBNqzRTNNKsaw79A/1TZ84X+f/EwWH8FeuSkjlCLyqS/zQ==", - "dev": true, - "requires": { - "@types/cookiejar": "*", - "@types/node": "*" - } - }, - "@types/supertest": { - "version": "2.0.12", - "resolved": "https://registry.npmjs.org/@types/supertest/-/supertest-2.0.12.tgz", - "integrity": "sha512-X3HPWTwXRerBZS7Mo1k6vMVR1Z6zmJcDVn5O/31whe0tnjE4te6ZJSJGq1RiqHPjzPdMTfjCFogDJmwng9xHaQ==", - "dev": true, - "requires": { - "@types/superagent": "*" - } - }, - "@types/uuid": { - "version": "8.3.4", - "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-8.3.4.tgz", - "integrity": "sha512-c/I8ZRb51j+pYGAu5CrFMRxqZ2ke4y2grEBO5AUjgSkSk+qT2Ea+OdWElz/OiMf5MNpn2b17kuVBwZLQJXzihw==", - "dev": true - }, - "@types/validator": { - "version": "13.7.11", - "resolved": "https://registry.npmjs.org/@types/validator/-/validator-13.7.11.tgz", - "integrity": "sha512-WqTos+CnAKN64YwyBMhgUYhb5VsTNKwUY6AuzG5qu9/pFZJar/RJFMZBXwX7VS+uzYi+lIAr3WkvuWqEI9F2eg==" - }, - "@types/yargs": { - "version": "17.0.22", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.22.tgz", - "integrity": "sha512-pet5WJ9U8yPVRhkwuEIp5ktAeAqRZOq4UdAyWLWzxbtpyXnzbtLdKiXAjJzi/KLmPGS9wk86lUFWZFN6sISo4g==", - "dev": true, - "requires": { - "@types/yargs-parser": "*" - } - }, - "@types/yargs-parser": { - "version": "21.0.0", - "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.0.tgz", - "integrity": "sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==", - "dev": true - }, - "@types/yauzl": { - "version": "2.10.0", - "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.0.tgz", - "integrity": "sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==", - "optional": true, - "requires": { - "@types/node": "*" - } - }, - "@typescript-eslint/eslint-plugin": { - "version": "5.50.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.50.0.tgz", - "integrity": "sha512-vwksQWSFZiUhgq3Kv7o1Jcj0DUNylwnIlGvKvLLYsq8pAWha6/WCnXUeaSoNNha/K7QSf2+jvmkxggC1u3pIwQ==", - "dev": true, - "requires": { - "@typescript-eslint/scope-manager": "5.50.0", - "@typescript-eslint/type-utils": "5.50.0", - "@typescript-eslint/utils": "5.50.0", - "debug": "^4.3.4", - "grapheme-splitter": "^1.0.4", - "ignore": "^5.2.0", - "natural-compare-lite": "^1.4.0", - "regexpp": "^3.2.0", - "semver": "^7.3.7", - "tsutils": "^3.21.0" - } - }, - "@typescript-eslint/parser": { - "version": "5.50.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.50.0.tgz", - "integrity": "sha512-KCcSyNaogUDftK2G9RXfQyOCt51uB5yqC6pkUYqhYh8Kgt+DwR5M0EwEAxGPy/+DH6hnmKeGsNhiZRQxjH71uQ==", - "dev": true, - "requires": { - "@typescript-eslint/scope-manager": "5.50.0", - "@typescript-eslint/types": "5.50.0", - "@typescript-eslint/typescript-estree": "5.50.0", - "debug": "^4.3.4" - } - }, - "@typescript-eslint/scope-manager": { - "version": "5.50.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.50.0.tgz", - "integrity": "sha512-rt03kaX+iZrhssaT974BCmoUikYtZI24Vp/kwTSy841XhiYShlqoshRFDvN1FKKvU2S3gK+kcBW1EA7kNUrogg==", - "dev": true, - "requires": { - "@typescript-eslint/types": "5.50.0", - "@typescript-eslint/visitor-keys": "5.50.0" - } - }, - "@typescript-eslint/type-utils": { - "version": "5.50.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.50.0.tgz", - "integrity": "sha512-dcnXfZ6OGrNCO7E5UY/i0ktHb7Yx1fV6fnQGGrlnfDhilcs6n19eIRcvLBqx6OQkrPaFlDPk3OJ0WlzQfrV0bQ==", - "dev": true, - "requires": { - "@typescript-eslint/typescript-estree": "5.50.0", - "@typescript-eslint/utils": "5.50.0", - "debug": "^4.3.4", - "tsutils": "^3.21.0" - } - }, - "@typescript-eslint/types": { - "version": "5.50.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.50.0.tgz", - "integrity": "sha512-atruOuJpir4OtyNdKahiHZobPKFvZnBnfDiyEaBf6d9vy9visE7gDjlmhl+y29uxZ2ZDgvXijcungGFjGGex7w==", - "dev": true - }, - "@typescript-eslint/typescript-estree": { - "version": "5.50.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.50.0.tgz", - "integrity": "sha512-Gq4zapso+OtIZlv8YNAStFtT6d05zyVCK7Fx3h5inlLBx2hWuc/0465C2mg/EQDDU2LKe52+/jN4f0g9bd+kow==", - "dev": true, - "requires": { - "@typescript-eslint/types": "5.50.0", - "@typescript-eslint/visitor-keys": "5.50.0", - "debug": "^4.3.4", - "globby": "^11.1.0", - "is-glob": "^4.0.3", - "semver": "^7.3.7", - "tsutils": "^3.21.0" - } - }, - "@typescript-eslint/utils": { - "version": "5.50.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.50.0.tgz", - "integrity": "sha512-v/AnUFImmh8G4PH0NDkf6wA8hujNNcrwtecqW4vtQ1UOSNBaZl49zP1SHoZ/06e+UiwzHpgb5zP5+hwlYYWYAw==", - "dev": true, - "requires": { - "@types/json-schema": "^7.0.9", - "@types/semver": "^7.3.12", - "@typescript-eslint/scope-manager": "5.50.0", - "@typescript-eslint/types": "5.50.0", - "@typescript-eslint/typescript-estree": "5.50.0", - "eslint-scope": "^5.1.1", - "eslint-utils": "^3.0.0", - "semver": "^7.3.7" - } - }, - "@typescript-eslint/visitor-keys": { - "version": "5.50.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.50.0.tgz", - "integrity": "sha512-cdMeD9HGu6EXIeGOh2yVW6oGf9wq8asBgZx7nsR/D36gTfQ0odE5kcRYe5M81vjEFAcPeugXrHg78Imu55F6gg==", - "dev": true, - "requires": { - "@typescript-eslint/types": "5.50.0", - "eslint-visitor-keys": "^3.3.0" - } - }, - "@webassemblyjs/ast": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz", - "integrity": "sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==", - "dev": true, - "requires": { - "@webassemblyjs/helper-numbers": "1.11.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.1" - } - }, - "@webassemblyjs/floating-point-hex-parser": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz", - "integrity": "sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==", - "dev": true - }, - "@webassemblyjs/helper-api-error": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz", - "integrity": "sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==", - "dev": true - }, - "@webassemblyjs/helper-buffer": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz", - "integrity": "sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==", - "dev": true - }, - "@webassemblyjs/helper-numbers": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz", - "integrity": "sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==", - "dev": true, - "requires": { - "@webassemblyjs/floating-point-hex-parser": "1.11.1", - "@webassemblyjs/helper-api-error": "1.11.1", - "@xtuc/long": "4.2.2" - } - }, - "@webassemblyjs/helper-wasm-bytecode": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz", - "integrity": "sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==", - "dev": true - }, - "@webassemblyjs/helper-wasm-section": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz", - "integrity": "sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==", - "dev": true, - "requires": { - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/helper-buffer": "1.11.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.1", - "@webassemblyjs/wasm-gen": "1.11.1" - } - }, - "@webassemblyjs/ieee754": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz", - "integrity": "sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==", - "dev": true, - "requires": { - "@xtuc/ieee754": "^1.2.0" - } - }, - "@webassemblyjs/leb128": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.1.tgz", - "integrity": "sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==", - "dev": true, - "requires": { - "@xtuc/long": "4.2.2" - } - }, - "@webassemblyjs/utf8": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.1.tgz", - "integrity": "sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==", - "dev": true - }, - "@webassemblyjs/wasm-edit": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz", - "integrity": "sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==", - "dev": true, - "requires": { - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/helper-buffer": "1.11.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.1", - "@webassemblyjs/helper-wasm-section": "1.11.1", - "@webassemblyjs/wasm-gen": "1.11.1", - "@webassemblyjs/wasm-opt": "1.11.1", - "@webassemblyjs/wasm-parser": "1.11.1", - "@webassemblyjs/wast-printer": "1.11.1" - } - }, - "@webassemblyjs/wasm-gen": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz", - "integrity": "sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==", - "dev": true, - "requires": { - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.1", - "@webassemblyjs/ieee754": "1.11.1", - "@webassemblyjs/leb128": "1.11.1", - "@webassemblyjs/utf8": "1.11.1" - } - }, - "@webassemblyjs/wasm-opt": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz", - "integrity": "sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==", - "dev": true, - "requires": { - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/helper-buffer": "1.11.1", - "@webassemblyjs/wasm-gen": "1.11.1", - "@webassemblyjs/wasm-parser": "1.11.1" - } - }, - "@webassemblyjs/wasm-parser": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz", - "integrity": "sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==", - "dev": true, - "requires": { - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/helper-api-error": "1.11.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.1", - "@webassemblyjs/ieee754": "1.11.1", - "@webassemblyjs/leb128": "1.11.1", - "@webassemblyjs/utf8": "1.11.1" - } - }, - "@webassemblyjs/wast-printer": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz", - "integrity": "sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==", - "dev": true, - "requires": { - "@webassemblyjs/ast": "1.11.1", - "@xtuc/long": "4.2.2" - } - }, - "@xtuc/ieee754": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz", - "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==", - "dev": true - }, - "@xtuc/long": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz", - "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==", - "dev": true - }, - "abbrev": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", - "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==" - }, - "abort-controller": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz", - "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==", - "requires": { - "event-target-shim": "^5.0.0" - } - }, - "abstract-logging": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/abstract-logging/-/abstract-logging-2.0.1.tgz", - "integrity": "sha512-2BjRTZxTPvheOvGbBslFSYOUkr+SjPtOnrLP33f+VIWLzezQpZcqVg7ja3L4dBXmzzgwT+a029jRx5PCi3JuiA==" - }, - "acorn": { - "version": "8.8.2", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz", - "integrity": "sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==", - "devOptional": true - }, - "acorn-import-assertions": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz", - "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==", - "dev": true, - "requires": {} - }, - "acorn-jsx": { - "version": "5.3.2", - "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", - "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", - "dev": true, - "requires": {} - }, - "acorn-walk": { - "version": "8.2.0", - "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz", - "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==", - "devOptional": true - }, - "agent-base": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", - "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", - "optional": true, - "requires": { - "debug": "4" - } - }, - "ajv": { - "version": "8.11.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz", - "integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==", - "requires": { - "fast-deep-equal": "^3.1.1", - "json-schema-traverse": "^1.0.0", - "require-from-string": "^2.0.2", - "uri-js": "^4.2.2" - } - }, - "ajv-formats": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz", - "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==", - "requires": { - "ajv": "^8.0.0" - } - }, - "ansi-colors": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz", - "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==" - }, - "ansi-escapes": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz", - "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==", - "dev": true, - "requires": { - "type-fest": "^0.21.3" - }, - "dependencies": { - "type-fest": { - "version": "0.21.3", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz", - "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==", - "dev": true - } - } - }, - "ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==" - }, - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "requires": { - "color-convert": "^2.0.1" - } - }, - "any-promise": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz", - "integrity": "sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==" - }, - "anymatch": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", - "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", - "requires": { - "normalize-path": "^3.0.0", - "picomatch": "^2.0.4" - } - }, - "app-root-path": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/app-root-path/-/app-root-path-3.1.0.tgz", - "integrity": "sha512-biN3PwB2gUtjaYy/isrU3aNWI5w+fAfvHkSvCKeQGxhmYpwKFUxudR3Yya+KqVRHBmEDYh+/lTozYCFbmzX4nA==" - }, - "archy": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz", - "integrity": "sha512-Xg+9RwCg/0p32teKdGMPTPnVXKD0w3DfHnFTficozsAgsvq2XenPJq/MYpzzQ/v8zrOyJn6Ds39VA4JIDwFfqw==" - }, - "arg": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz", - "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==", - "devOptional": true - }, - "argparse": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", - "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==" - }, - "array-union": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", - "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", - "dev": true - }, - "asap": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz", - "integrity": "sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==", - "dev": true - }, - "asn1.js": { - "version": "5.4.1", - "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz", - "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==", - "requires": { - "bn.js": "^4.0.0", - "inherits": "^2.0.1", - "minimalistic-assert": "^1.0.0", - "safer-buffer": "^2.1.0" - } - }, - "asynckit": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" - }, - "atomic-sleep": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/atomic-sleep/-/atomic-sleep-1.0.0.tgz", - "integrity": "sha512-kNOjDqAh7px0XWNI+4QbzoiR/nTkHAWNud2uvnJquD1/x5a7EQZMJT0AczqK0Qn67oY/TTQ1LbUKajZpp3I9tQ==" - }, - "avvio": { - "version": "8.2.0", - "resolved": "https://registry.npmjs.org/avvio/-/avvio-8.2.0.tgz", - "integrity": "sha512-bbCQdg7bpEv6kGH41RO/3B2/GMMmJSo2iBK+X8AWN9mujtfUipMDfIjsgHCfpnKqoGEQrrmCDKSa5OQ19+fDmg==", - "requires": { - "archy": "^1.0.0", - "debug": "^4.0.0", - "fastq": "^1.6.1" - } - }, - "aws-sdk-client-mock": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/aws-sdk-client-mock/-/aws-sdk-client-mock-2.0.1.tgz", - "integrity": "sha512-Ib/AnI8ZdoIxOBbKSs28TUwJb7FI/AYVYn48PcXx6guk5fBs4GZJJEc+Ci9aImRtVmgO6jHN/6Etz17fr6j3qw==", - "dev": true, - "requires": { - "@types/sinon": "^10.0.10", - "sinon": "^14.0.2", - "tslib": "^2.1.0" - } - }, - "axios": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.2.1.tgz", - "integrity": "sha512-I88cFiGu9ryt/tfVEi4kX2SITsvDddTajXTOFmt2uK1ZVA8LytjtdeyefdQWEf5PU8w+4SSJDoYnggflB5tW4A==", - "requires": { - "follow-redirects": "^1.15.0", - "form-data": "^4.0.0", - "proxy-from-env": "^1.1.0" - } - }, - "babel-jest": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-28.1.3.tgz", - "integrity": "sha512-epUaPOEWMk3cWX0M/sPvCHHCe9fMFAa/9hXEgKP8nFfNl/jlGkE9ucq9NqkZGXLDduCJYS0UvSlPUwC0S+rH6Q==", - "dev": true, - "requires": { - "@jest/transform": "^28.1.3", - "@types/babel__core": "^7.1.14", - "babel-plugin-istanbul": "^6.1.1", - "babel-preset-jest": "^28.1.3", - "chalk": "^4.0.0", - "graceful-fs": "^4.2.9", - "slash": "^3.0.0" - }, - "dependencies": { - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - } - } - }, - "babel-plugin-istanbul": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz", - "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.0.0", - "@istanbuljs/load-nyc-config": "^1.0.0", - "@istanbuljs/schema": "^0.1.2", - "istanbul-lib-instrument": "^5.0.4", - "test-exclude": "^6.0.0" - } - }, - "babel-plugin-jest-hoist": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-28.1.3.tgz", - "integrity": "sha512-Ys3tUKAmfnkRUpPdpa98eYrAR0nV+sSFUZZEGuQ2EbFd1y4SOLtD5QDNHAq+bb9a+bbXvYQC4b+ID/THIMcU6Q==", - "dev": true, - "requires": { - "@babel/template": "^7.3.3", - "@babel/types": "^7.3.3", - "@types/babel__core": "^7.1.14", - "@types/babel__traverse": "^7.0.6" - } - }, - "babel-preset-current-node-syntax": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz", - "integrity": "sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==", - "dev": true, - "requires": { - "@babel/plugin-syntax-async-generators": "^7.8.4", - "@babel/plugin-syntax-bigint": "^7.8.3", - "@babel/plugin-syntax-class-properties": "^7.8.3", - "@babel/plugin-syntax-import-meta": "^7.8.3", - "@babel/plugin-syntax-json-strings": "^7.8.3", - "@babel/plugin-syntax-logical-assignment-operators": "^7.8.3", - "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3", - "@babel/plugin-syntax-numeric-separator": "^7.8.3", - "@babel/plugin-syntax-object-rest-spread": "^7.8.3", - "@babel/plugin-syntax-optional-catch-binding": "^7.8.3", - "@babel/plugin-syntax-optional-chaining": "^7.8.3", - "@babel/plugin-syntax-top-level-await": "^7.8.3" - } - }, - "babel-preset-jest": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-28.1.3.tgz", - "integrity": "sha512-L+fupJvlWAHbQfn74coNX3zf60LXMJsezNvvx8eIh7iOR1luJ1poxYgQk1F8PYtNq/6QODDHCqsSnTFSWC491A==", - "dev": true, - "requires": { - "babel-plugin-jest-hoist": "^28.1.3", - "babel-preset-current-node-syntax": "^1.0.0" - } - }, - "balanced-match": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" - }, - "base64-js": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", - "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==" - }, - "base64url": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/base64url/-/base64url-3.0.1.tgz", - "integrity": "sha512-ir1UPr3dkwexU7FdV8qBBbNDRUhMmIekYMFZfi+C/sLNnRESKPl23nB9b2pltqfOQNnGzsDdId90AEtG5tCx4A==" - }, - "binary-extensions": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", - "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==" - }, - "bl": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", - "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==", - "dev": true, - "requires": { - "buffer": "^5.5.0", - "inherits": "^2.0.4", - "readable-stream": "^3.4.0" - }, - "dependencies": { - "buffer": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", - "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", - "dev": true, - "requires": { - "base64-js": "^1.3.1", - "ieee754": "^1.1.13" - } - }, - "readable-stream": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", - "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", - "dev": true, - "requires": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - } - } - } - }, - "bn.js": { - "version": "4.12.0", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", - "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==" - }, - "boolbase": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", - "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==" - }, - "bowser": { - "version": "2.11.0", - "resolved": "https://registry.npmjs.org/bowser/-/bowser-2.11.0.tgz", - "integrity": "sha512-AlcaJBi/pqqJBIQ8U9Mcpc9i8Aqxn88Skv5d+xBX006BY5u8N3mGLHa5Lgppa7L/HfwgwLgZ6NYs+Ag6uUmJRA==" - }, - "brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", - "requires": { - "fill-range": "^7.0.1" - } - }, - "brorand": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz", - "integrity": "sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w==" - }, - "browserslist": { - "version": "4.21.5", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.5.tgz", - "integrity": "sha512-tUkiguQGW7S3IhB7N+c2MV/HZPSCPAAiYBZXLsBhFB/PCy6ZKKsZrmBayHV9fdGV/ARIfJ14NkxKzRDjvp7L6w==", - "dev": true, - "requires": { - "caniuse-lite": "^1.0.30001449", - "electron-to-chromium": "^1.4.284", - "node-releases": "^2.0.8", - "update-browserslist-db": "^1.0.10" - } - }, - "bs-logger": { - "version": "0.2.6", - "resolved": "https://registry.npmjs.org/bs-logger/-/bs-logger-0.2.6.tgz", - "integrity": "sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==", - "dev": true, - "requires": { - "fast-json-stable-stringify": "2.x" - } - }, - "bser": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz", - "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==", - "dev": true, - "requires": { - "node-int64": "^0.4.0" - } - }, - "buffer": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz", - "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==", - "requires": { - "base64-js": "^1.3.1", - "ieee754": "^1.2.1" - } - }, - "buffer-crc32": { - "version": "0.2.13", - "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz", - "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==", - "optional": true - }, - "buffer-from": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", - "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==" - }, - "buffer-writer": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/buffer-writer/-/buffer-writer-2.0.0.tgz", - "integrity": "sha512-a7ZpuTZU1TRtnwyCNW3I5dc0wWNC3VR9S++Ewyk2HHZdrO3CQJqSpd+95Us590V6AL7JqUAH2IwZ/398PmNFgw==" - }, - "bullmq": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/bullmq/-/bullmq-4.11.0.tgz", - "integrity": "sha512-e6/CtKHieEplmoP0NE/oty2xmuXGAoHWlpy//hYexljwM14Ff2Gqr4eLscYIdWm3W0OyxWwjjJUPXaOf5BYYvQ==", - "peer": true, - "requires": { - "cron-parser": "^4.6.0", - "glob": "^8.0.3", - "ioredis": "^5.3.2", - "lodash": "^4.17.21", - "msgpackr": "^1.6.2", - "node-abort-controller": "^3.1.1", - "semver": "^7.5.4", - "tslib": "^2.0.0", - "uuid": "^9.0.0" - }, - "dependencies": { - "uuid": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz", - "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==", - "peer": true - } - } - }, - "call-bind": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", - "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", - "dev": true, - "requires": { - "function-bind": "^1.1.1", - "get-intrinsic": "^1.0.2" - } - }, - "callsites": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", - "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", - "dev": true - }, - "camel-case": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz", - "integrity": "sha512-+MbKztAYHXPr1jNTSKQF52VpcFjwY5RkR7fxksV8Doo4KAYc5Fl4UJRgthBbTmEx8C54DqahhbLJkDwjI3PI/w==", - "requires": { - "no-case": "^2.2.0", - "upper-case": "^1.1.1" - } - }, - "camelcase": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", - "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", - "dev": true - }, - "caniuse-lite": { - "version": "1.0.30001450", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001450.tgz", - "integrity": "sha512-qMBmvmQmFXaSxexkjjfMvD5rnDL0+m+dUMZKoDYsGG8iZN29RuYh9eRoMvKsT6uMAWlyUUGDEQGJJYjzCIO9ew==", - "dev": true - }, - "case-anything": { - "version": "2.1.10", - "resolved": "https://registry.npmjs.org/case-anything/-/case-anything-2.1.10.tgz", - "integrity": "sha512-JczJwVrCP0jPKh05McyVsuOg6AYosrB9XWZKbQzXeDAm2ClE/PJE/BcrrQrVyGYH7Jg8V/LDupmyL4kFlVsVFQ==" - }, - "chalk": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", - "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "char-regex": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz", - "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==", - "dev": true - }, - "chardet": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz", - "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==", - "dev": true - }, - "cheerio": { - "version": "1.0.0-rc.10", - "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.10.tgz", - "integrity": "sha512-g0J0q/O6mW8z5zxQ3A8E8J1hUgp4SMOvEoW/x84OwyHKe/Zccz83PVT4y5Crcr530FV6NgmKI1qvGTKVl9XXVw==", - "requires": { - "cheerio-select": "^1.5.0", - "dom-serializer": "^1.3.2", - "domhandler": "^4.2.0", - "htmlparser2": "^6.1.0", - "parse5": "^6.0.1", - "parse5-htmlparser2-tree-adapter": "^6.0.1", - "tslib": "^2.2.0" - }, - "dependencies": { - "parse5": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz", - "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==" - } - } - }, - "cheerio-select": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/cheerio-select/-/cheerio-select-1.6.0.tgz", - "integrity": "sha512-eq0GdBvxVFbqWgmCm7M3XGs1I8oLy/nExUnh6oLqmBditPO9AqQJrkslDpMun/hZ0yyTs8L0m85OHp4ho6Qm9g==", - "requires": { - "css-select": "^4.3.0", - "css-what": "^6.0.1", - "domelementtype": "^2.2.0", - "domhandler": "^4.3.1", - "domutils": "^2.8.0" - } - }, - "chokidar": { - "version": "3.5.3", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz", - "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==", - "requires": { - "anymatch": "~3.1.2", - "braces": "~3.0.2", - "fsevents": "~2.3.2", - "glob-parent": "~5.1.2", - "is-binary-path": "~2.1.0", - "is-glob": "~4.0.1", - "normalize-path": "~3.0.0", - "readdirp": "~3.6.0" - } - }, - "chrome-trace-event": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz", - "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==", - "dev": true - }, - "chromedriver": { - "version": "109.0.0", - "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-109.0.0.tgz", - "integrity": "sha512-jdmBq11IUwfThLFiygGTZ89qbROSQI4bICQjvOVQy2Bqr1LwC+MFkhwyZp3YG99eehQbZuTlQmmfCZBfpewTNA==", - "optional": true, - "requires": { - "@testim/chrome-version": "^1.1.3", - "axios": "^1.2.1", - "compare-versions": "^5.0.1", - "extract-zip": "^2.0.1", - "https-proxy-agent": "^5.0.1", - "proxy-from-env": "^1.1.0", - "tcp-port-used": "^1.0.1" - } - }, - "ci-info": { - "version": "3.7.1", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.7.1.tgz", - "integrity": "sha512-4jYS4MOAaCIStSRwiuxc4B8MYhIe676yO1sYGzARnjXkWpmzZMMYxY6zu8WYWDhSuth5zhrQ1rhNSibyyvv4/w==", - "dev": true - }, - "cjs-module-lexer": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz", - "integrity": "sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA==", - "dev": true - }, - "clamscan": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/clamscan/-/clamscan-2.1.2.tgz", - "integrity": "sha512-pcovgLHcrg3l/mI51Kuk0kN++07pSZdBTskISw0UFvsm8UXda8oNCm0eLeODxFg85Mz+k+TtSS9+XPlriJ8/Fg==" - }, - "class-transformer": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/class-transformer/-/class-transformer-0.5.1.tgz", - "integrity": "sha512-SQa1Ws6hUbfC98vKGxZH3KFY0Y1lm5Zm0SY8XX9zbK7FJCyVEac3ATW0RIpwzW+oOfmHE5PMPufDG9hCfoEOMw==" - }, - "class-validator": { - "version": "0.14.0", - "resolved": "https://registry.npmjs.org/class-validator/-/class-validator-0.14.0.tgz", - "integrity": "sha512-ct3ltplN8I9fOwUd8GrP8UQixwff129BkEtuWDKL5W45cQuLd19xqmTLu5ge78YDm/fdje6FMt0hGOhl0lii3A==", - "requires": { - "@types/validator": "^13.7.10", - "libphonenumber-js": "^1.10.14", - "validator": "^13.7.0" - } - }, - "clean-css": { - "version": "4.2.4", - "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.4.tgz", - "integrity": "sha512-EJUDT7nDVFDvaQgAo2G/PJvxmp1o/c6iXLbswsBbUFXi1Nr+AjA2cKmfbKDMjMvzEe75g3P6JkaDDAKk96A85A==", - "requires": { - "source-map": "~0.6.0" - }, - "dependencies": { - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" - } - } - }, - "cli-cursor": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz", - "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==", - "dev": true, - "requires": { - "restore-cursor": "^3.1.0" - } - }, - "cli-highlight": { - "version": "2.1.11", - "resolved": "https://registry.npmjs.org/cli-highlight/-/cli-highlight-2.1.11.tgz", - "integrity": "sha512-9KDcoEVwyUXrjcJNvHD0NFc/hiwe/WPVYIleQh2O1N2Zro5gWJZ/K+3DGn8w8P/F6FxOgzyC5bxDyHIgCSPhGg==", - "requires": { - "chalk": "^4.0.0", - "highlight.js": "^10.7.1", - "mz": "^2.4.0", - "parse5": "^5.1.1", - "parse5-htmlparser2-tree-adapter": "^6.0.0", - "yargs": "^16.0.0" - }, - "dependencies": { - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - } - } - }, - "cli-spinners": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.7.0.tgz", - "integrity": "sha512-qu3pN8Y3qHNgE2AFweciB1IfMnmZ/fsNTEE+NOFjmGB2F/7rLhnhzppvpCnN4FovtP26k8lHyy9ptEbNwWFLzw==", - "dev": true - }, - "cli-table3": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/cli-table3/-/cli-table3-0.6.3.tgz", - "integrity": "sha512-w5Jac5SykAeZJKntOxJCrm63Eg5/4dhMWIcuTbo9rpE+brgaSZo0RuNJZeOyMgsUdhDeojvgyQLmjI+K50ZGyg==", - "dev": true, - "requires": { - "@colors/colors": "1.5.0", - "string-width": "^4.2.0" - } - }, - "cli-width": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz", - "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==", - "dev": true - }, - "cliui": { - "version": "7.0.4", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", - "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", - "requires": { - "string-width": "^4.2.0", - "strip-ansi": "^6.0.0", - "wrap-ansi": "^7.0.0" - } - }, - "clone": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz", - "integrity": "sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==", - "dev": true - }, - "cluster-key-slot": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/cluster-key-slot/-/cluster-key-slot-1.1.2.tgz", - "integrity": "sha512-RMr0FhtfXemyinomL4hrWcYJxmX6deFdCxpJzhDttxgO1+bcCnkk+9drydLVDmAMG7NE6aN/fl4F7ucU/90gAA==" - }, - "co": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", - "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==", - "dev": true - }, - "collect-v8-coverage": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz", - "integrity": "sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==", - "dev": true - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" - }, - "colorette": { - "version": "2.0.19", - "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.19.tgz", - "integrity": "sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ==", - "dev": true - }, - "combined-stream": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", - "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", - "requires": { - "delayed-stream": "~1.0.0" - } - }, - "commander": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz", - "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==", - "dev": true - }, - "compare-versions": { - "version": "5.0.3", - "resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-5.0.3.tgz", - "integrity": "sha512-4UZlZP8Z99MGEY+Ovg/uJxJuvoXuN4M6B3hKaiackiHrgzQFEe3diJi1mf1PNHbFujM7FvLrK2bpgIaImbtZ1A==", - "optional": true - }, - "component-emitter": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz", - "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==", - "dev": true - }, - "concat-map": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==" - }, - "config": { - "version": "3.3.9", - "resolved": "https://registry.npmjs.org/config/-/config-3.3.9.tgz", - "integrity": "sha512-G17nfe+cY7kR0wVpc49NCYvNtelm/pPy8czHoFkAgtV1lkmcp7DHtWCdDu+C9Z7gb2WVqa9Tm3uF9aKaPbCfhg==", - "requires": { - "json5": "^2.2.3" - } - }, - "config-chain": { - "version": "1.1.13", - "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.13.tgz", - "integrity": "sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==", - "requires": { - "ini": "^1.3.4", - "proto-list": "~1.2.1" - } - }, - "consola": { - "version": "2.15.3", - "resolved": "https://registry.npmjs.org/consola/-/consola-2.15.3.tgz", - "integrity": "sha512-9vAdYbHj6x2fLKC4+oPH0kFzY/orMZyG2Aj+kNylHxKGJ/Ed4dpNyAQYwJOdqO4zdM7XpVHmyejQDcQHrnuXbw==" - }, - "content-disposition": { - "version": "0.5.4", - "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz", - "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==", - "requires": { - "safe-buffer": "5.2.1" - } - }, - "convert-source-map": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz", - "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==", - "dev": true - }, - "cookie": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz", - "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==" - }, - "cookiejar": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.4.tgz", - "integrity": "sha512-LDx6oHrK+PhzLKJU9j5S7/Y3jM/mUHvD/DeI1WQmJn652iPC5Y4TBzC9l+5OMOXlyTTA+SmVUPm0HQUwpD5Jqw==", - "dev": true - }, - "cosmiconfig": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.1.0.tgz", - "integrity": "sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==", - "dev": true, - "requires": { - "@types/parse-json": "^4.0.0", - "import-fresh": "^3.2.1", - "parse-json": "^5.0.0", - "path-type": "^4.0.0", - "yaml": "^1.10.0" - } - }, - "create-require": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz", - "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==", - "devOptional": true - }, - "cron-parser": { - "version": "4.7.1", - "resolved": "https://registry.npmjs.org/cron-parser/-/cron-parser-4.7.1.tgz", - "integrity": "sha512-WguFaoQ0hQ61SgsCZLHUcNbAvlK0lypKXu62ARguefYmjzaOXIVRNrAmyXzabTwUn4sQvQLkk6bjH+ipGfw8bA==", - "peer": true, - "requires": { - "luxon": "^3.2.1" - } - }, - "cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", - "dev": true, - "requires": { - "path-key": "^3.1.0", - "shebang-command": "^2.0.0", - "which": "^2.0.1" - } - }, - "css-select": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz", - "integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==", - "requires": { - "boolbase": "^1.0.0", - "css-what": "^6.0.1", - "domhandler": "^4.3.1", - "domutils": "^2.8.0", - "nth-check": "^2.0.1" - } - }, - "css-what": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz", - "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==" - }, - "csv-parser": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/csv-parser/-/csv-parser-3.0.0.tgz", - "integrity": "sha512-s6OYSXAK3IdKqYO33y09jhypG/bSDHPuyCme/IdEHfWpLf/jKcpitVFyOC6UemgGk8v7Q5u2XE0vvwmanxhGlQ==", - "requires": { - "minimist": "^1.2.0" - } - }, - "dataloader": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/dataloader/-/dataloader-1.4.0.tgz", - "integrity": "sha512-68s5jYdlvasItOJnCuI2Q9s4q98g0pCyL3HrcKJu8KNugUl8ahgmZYg38ysLTgQjjXX3H8CJLkAvWrclWfcalw==" - }, - "date-fns": { - "version": "2.29.3", - "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.29.3.tgz", - "integrity": "sha512-dDCnyH2WnnKusqvZZ6+jA1O51Ibt8ZMRNkDZdyAyK4YfbDwa/cEmuztzG5pk6hqlp9aSBPYcjOlktquahGwGeA==" - }, - "dateformat": { - "version": "4.6.3", - "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-4.6.3.tgz", - "integrity": "sha512-2P0p0pFGzHS5EMnhdxQi7aJN+iMheud0UhG4dlE1DLAlvL8JHjJJTX/CSm4JXwV0Ka5nGk3zC5mcb5bUQUxxMA==", - "dev": true - }, - "dayjs": { - "version": "1.11.7", - "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.7.tgz", - "integrity": "sha512-+Yw9U6YO5TQohxLcIkrXBeY73WP3ejHWVvx8XCk3gxvQDCTEmS48ZrSZCKciI7Bhl/uCMyxYtE9UqRILmFphkQ==" - }, - "debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "requires": { - "ms": "2.1.2" - } - }, - "dedent": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz", - "integrity": "sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==", - "dev": true - }, - "deep-is": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", - "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", - "devOptional": true - }, - "deepmerge": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.0.tgz", - "integrity": "sha512-z2wJZXrmeHdvYJp/Ux55wIjqo81G5Bp4c+oELTW+7ar6SogWHajt5a9gO3s3IDaGSAXjDk0vlQKN3rms8ab3og==", - "dev": true - }, - "defaults": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.4.tgz", - "integrity": "sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==", - "dev": true, - "requires": { - "clone": "^1.0.2" - } - }, - "delayed-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", - "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==" - }, - "denque": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/denque/-/denque-2.1.0.tgz", - "integrity": "sha512-HVQE3AAb/pxF8fQAoiqpvg9i3evqug3hoiwakOyZAwJm+6vZehbkYXZ0l4JxS+I3QxM97v5aaRNhj8v5oBhekw==", - "peer": true - }, - "depd": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", - "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==" - }, - "detect-libc": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz", - "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==" - }, - "detect-newline": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz", - "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==", - "dev": true - }, - "detect-node": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.0.4.tgz", - "integrity": "sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==" - }, - "dezalgo": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.4.tgz", - "integrity": "sha512-rXSP0bf+5n0Qonsb+SVVfNfIsimO4HEtmnIpPHY8Q1UCzKlQrDMfdobr8nJOOsRgWCyMRqeSBQzmWUMq7zvVig==", - "dev": true, - "requires": { - "asap": "^2.0.0", - "wrappy": "1" - } - }, - "diff": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/diff/-/diff-5.1.0.tgz", - "integrity": "sha512-D+mk+qE8VC/PAUrlAU34N+VfXev0ghe5ywmpqrawphmVZc1bEfn56uo9qpyGp1p4xpzOHkSW4ztBd6L7Xx4ACw==", - "dev": true - }, - "diff-sequences": { - "version": "28.1.1", - "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-28.1.1.tgz", - "integrity": "sha512-FU0iFaH/E23a+a718l8Qa/19bF9p06kgE0KipMOMadwa3SjnaElKzPaUC0vnibs6/B/9ni97s61mcejk8W1fQw==", - "dev": true - }, - "dir-glob": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", - "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", - "dev": true, - "requires": { - "path-type": "^4.0.0" - } - }, - "doctrine": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", - "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", - "dev": true, - "requires": { - "esutils": "^2.0.2" - } - }, - "dom-serializer": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz", - "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==", - "requires": { - "domelementtype": "^2.0.1", - "domhandler": "^4.2.0", - "entities": "^2.0.0" - } - }, - "domelementtype": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz", - "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==" - }, - "domhandler": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz", - "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==", - "requires": { - "domelementtype": "^2.2.0" - } - }, - "domutils": { - "version": "2.8.0", - "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz", - "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==", - "requires": { - "dom-serializer": "^1.0.1", - "domelementtype": "^2.2.0", - "domhandler": "^4.2.0" - } - }, - "dotenv": { - "version": "16.0.3", - "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.0.3.tgz", - "integrity": "sha512-7GO6HghkA5fYG9TYnNxi14/7K9f5occMlp3zXAuSxn7CKCxt9xbNWG7yF8hTCSUchlfWSe3uLmlPfigevRItzQ==" - }, - "dotenv-expand": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-10.0.0.tgz", - "integrity": "sha512-GopVGCpVS1UKH75VKHGuQFqS1Gusej0z4FyQkPdwjil2gNIv+LNsqBlboOzpJFZKVT95GkCyWJbBSdFEFUWI2A==" - }, - "dprint-node": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/dprint-node/-/dprint-node-1.0.7.tgz", - "integrity": "sha512-NTZOW9A7ipb0n7z7nC3wftvsbceircwVHSgzobJsEQa+7RnOMbhrfX5IflA6CtC4GA63DSAiHYXa4JKEy9F7cA==", - "requires": { - "detect-libc": "^1.0.3" - } - }, - "editorconfig": { - "version": "0.15.3", - "resolved": "https://registry.npmjs.org/editorconfig/-/editorconfig-0.15.3.tgz", - "integrity": "sha512-M9wIMFx96vq0R4F+gRpY3o2exzb8hEj/n9S8unZtHSvYjibBp/iMufSzvmOcV/laG0ZtuTVGtiJggPOSW2r93g==", - "requires": { - "commander": "^2.19.0", - "lru-cache": "^4.1.5", - "semver": "^5.6.0", - "sigmund": "^1.0.1" - }, - "dependencies": { - "commander": { - "version": "2.20.3", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", - "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==" - }, - "lru-cache": { - "version": "4.1.5", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz", - "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==", - "requires": { - "pseudomap": "^1.0.2", - "yallist": "^2.1.2" - } - }, - "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" - }, - "yallist": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", - "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==" - } - } - }, - "electron-to-chromium": { - "version": "1.4.284", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz", - "integrity": "sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==", - "dev": true - }, - "elliptic": { - "version": "6.5.4", - "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz", - "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==", - "requires": { - "bn.js": "^4.11.9", - "brorand": "^1.1.0", - "hash.js": "^1.0.0", - "hmac-drbg": "^1.0.1", - "inherits": "^2.0.4", - "minimalistic-assert": "^1.0.1", - "minimalistic-crypto-utils": "^1.0.1" - } - }, - "emittery": { - "version": "0.10.2", - "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.10.2.tgz", - "integrity": "sha512-aITqOwnLanpHLNXZJENbOgjUBeHocD+xsSJmNrjovKBW5HbSpW3d1pEls7GFQPUWXiwG9+0P4GtHfEqC/4M0Iw==", - "dev": true - }, - "emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" - }, - "end-of-stream": { - "version": "1.4.4", - "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", - "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", - "requires": { - "once": "^1.4.0" - } - }, - "enhanced-resolve": { - "version": "5.12.0", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz", - "integrity": "sha512-QHTXI/sZQmko1cbDoNAa3mJ5qhWUUNAq3vR0/YiD379fWQrcfuoX1+HW2S0MTt7XmoPLapdaDKUtelUSPic7hQ==", - "dev": true, - "requires": { - "graceful-fs": "^4.2.4", - "tapable": "^2.2.0" - } - }, - "entities": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz", - "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==" - }, - "error-ex": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", - "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", - "dev": true, - "requires": { - "is-arrayish": "^0.2.1" - } - }, - "es-module-lexer": { - "version": "0.9.3", - "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz", - "integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==", - "dev": true - }, - "es6-promise": { - "version": "4.2.8", - "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz", - "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==" - }, - "escalade": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", - "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==" - }, - "escape-goat": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/escape-goat/-/escape-goat-3.0.0.tgz", - "integrity": "sha512-w3PwNZJwRxlp47QGzhuEBldEqVHHhh8/tIPcl6ecf2Bou99cdAt0knihBV0Ecc7CGxYduXVBDheH1K2oADRlvw==" - }, - "escape-html": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", - "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==" - }, - "escape-string-regexp": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", - "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", - "dev": true - }, - "eslint": { - "version": "8.33.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.33.0.tgz", - "integrity": "sha512-WjOpFQgKK8VrCnAtl8We0SUOy/oVZ5NHykyMiagV1M9r8IFpIJX7DduK6n1mpfhlG7T1NLWm2SuD8QB7KFySaA==", - "dev": true, - "requires": { - "@eslint/eslintrc": "^1.4.1", - "@humanwhocodes/config-array": "^0.11.8", - "@humanwhocodes/module-importer": "^1.0.1", - "@nodelib/fs.walk": "^1.2.8", - "ajv": "^6.10.0", - "chalk": "^4.0.0", - "cross-spawn": "^7.0.2", - "debug": "^4.3.2", - "doctrine": "^3.0.0", - "escape-string-regexp": "^4.0.0", - "eslint-scope": "^7.1.1", - "eslint-utils": "^3.0.0", - "eslint-visitor-keys": "^3.3.0", - "espree": "^9.4.0", - "esquery": "^1.4.0", - "esutils": "^2.0.2", - "fast-deep-equal": "^3.1.3", - "file-entry-cache": "^6.0.1", - "find-up": "^5.0.0", - "glob-parent": "^6.0.2", - "globals": "^13.19.0", - "grapheme-splitter": "^1.0.4", - "ignore": "^5.2.0", - "import-fresh": "^3.0.0", - "imurmurhash": "^0.1.4", - "is-glob": "^4.0.0", - "is-path-inside": "^3.0.3", - "js-sdsl": "^4.1.4", - "js-yaml": "^4.1.0", - "json-stable-stringify-without-jsonify": "^1.0.1", - "levn": "^0.4.1", - "lodash.merge": "^4.6.2", - "minimatch": "^3.1.2", - "natural-compare": "^1.4.0", - "optionator": "^0.9.1", - "regexpp": "^3.2.0", - "strip-ansi": "^6.0.1", - "strip-json-comments": "^3.1.0", - "text-table": "^0.2.0" - }, - "dependencies": { - "ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", - "dev": true, - "requires": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - } - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "eslint-scope": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz", - "integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==", - "dev": true, - "requires": { - "esrecurse": "^4.3.0", - "estraverse": "^5.2.0" - } - }, - "estraverse": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", - "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", - "dev": true - }, - "glob-parent": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", - "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", - "dev": true, - "requires": { - "is-glob": "^4.0.3" - } - }, - "json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true - } - } - }, - "eslint-config-prettier": { - "version": "8.6.0", - "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.6.0.tgz", - "integrity": "sha512-bAF0eLpLVqP5oEVUFKpMA+NnRFICwn9X8B5jrR9FcqnYBuPbqWEjTEspPWMj5ye6czoSLDweCzSo3Ko7gGrZaA==", - "dev": true, - "requires": {} - }, - "eslint-plugin-prettier": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-4.2.1.tgz", - "integrity": "sha512-f/0rXLXUt0oFYs8ra4w49wYZBG5GKZpAYsJSm6rnYL5uVDjd+zowwMwVZHnAjf4edNrKpCDYfXDgmRE/Ak7QyQ==", - "dev": true, - "requires": { - "prettier-linter-helpers": "^1.0.0" - } - }, - "eslint-scope": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", - "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", - "dev": true, - "requires": { - "esrecurse": "^4.3.0", - "estraverse": "^4.1.1" - } - }, - "eslint-utils": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz", - "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==", - "dev": true, - "requires": { - "eslint-visitor-keys": "^2.0.0" - }, - "dependencies": { - "eslint-visitor-keys": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz", - "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==", - "dev": true - } - } - }, - "eslint-visitor-keys": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz", - "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==", - "dev": true - }, - "espree": { - "version": "9.4.1", - "resolved": "https://registry.npmjs.org/espree/-/espree-9.4.1.tgz", - "integrity": "sha512-XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg==", - "dev": true, - "requires": { - "acorn": "^8.8.0", - "acorn-jsx": "^5.3.2", - "eslint-visitor-keys": "^3.3.0" - } - }, - "esprima": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", - "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", - "dev": true - }, - "esquery": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz", - "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==", - "dev": true, - "requires": { - "estraverse": "^5.1.0" - }, - "dependencies": { - "estraverse": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", - "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", - "dev": true - } - } - }, - "esrecurse": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", - "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", - "dev": true, - "requires": { - "estraverse": "^5.2.0" - }, - "dependencies": { - "estraverse": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", - "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", - "dev": true - } - } - }, - "estraverse": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", - "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", - "dev": true - }, - "esutils": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", - "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", - "dev": true - }, - "event-target-shim": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz", - "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==" - }, - "events": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz", - "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==" - }, - "execa": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz", - "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==", - "dev": true, - "requires": { - "cross-spawn": "^7.0.3", - "get-stream": "^6.0.0", - "human-signals": "^2.1.0", - "is-stream": "^2.0.0", - "merge-stream": "^2.0.0", - "npm-run-path": "^4.0.1", - "onetime": "^5.1.2", - "signal-exit": "^3.0.3", - "strip-final-newline": "^2.0.0" - } - }, - "exit": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz", - "integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==", - "dev": true - }, - "expect": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/expect/-/expect-28.1.3.tgz", - "integrity": "sha512-eEh0xn8HlsuOBxFgIss+2mX85VAS4Qy3OSkjV7rlBWljtA4oWH37glVGyOZSZvErDT/yBywZdPGwCXuTvSG85g==", - "dev": true, - "requires": { - "@jest/expect-utils": "^28.1.3", - "jest-get-type": "^28.0.2", - "jest-matcher-utils": "^28.1.3", - "jest-message-util": "^28.1.3", - "jest-util": "^28.1.3" - } - }, - "external-editor": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz", - "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==", - "dev": true, - "requires": { - "chardet": "^0.7.0", - "iconv-lite": "^0.4.24", - "tmp": "^0.0.33" - } - }, - "extract-zip": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz", - "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==", - "optional": true, - "requires": { - "@types/yauzl": "^2.9.1", - "debug": "^4.1.1", - "get-stream": "^5.1.0", - "yauzl": "^2.10.0" - }, - "dependencies": { - "get-stream": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", - "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", - "optional": true, - "requires": { - "pump": "^3.0.0" - } - } - } - }, - "fast-content-type-parse": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fast-content-type-parse/-/fast-content-type-parse-1.0.0.tgz", - "integrity": "sha512-Xbc4XcysUXcsP5aHUU7Nq3OwvHq97C+WnbkeIefpeYLX+ryzFJlU6OStFJhs6Ol0LkUGpcK+wL0JwfM+FCU5IA==" - }, - "fast-copy": { - "version": "2.1.7", - "resolved": "https://registry.npmjs.org/fast-copy/-/fast-copy-2.1.7.tgz", - "integrity": "sha512-ozrGwyuCTAy7YgFCua8rmqmytECYk/JYAMXcswOcm0qvGoE3tPb7ivBeIHTOK2DiapBhDZgacIhzhQIKU5TCfA==", - "dev": true - }, - "fast-decode-uri-component": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/fast-decode-uri-component/-/fast-decode-uri-component-1.0.1.tgz", - "integrity": "sha512-WKgKWg5eUxvRZGwW8FvfbaH7AXSh2cL+3j5fMGzUMCxWBJ3dV3a7Wz8y2f/uQ0e3B6WmodD3oS54jTQ9HVTIIg==" - }, - "fast-deep-equal": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", - "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" - }, - "fast-diff": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.2.0.tgz", - "integrity": "sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==", - "dev": true - }, - "fast-glob": { - "version": "3.2.12", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz", - "integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==", - "dev": true, - "requires": { - "@nodelib/fs.stat": "^2.0.2", - "@nodelib/fs.walk": "^1.2.3", - "glob-parent": "^5.1.2", - "merge2": "^1.3.0", - "micromatch": "^4.0.4" - } - }, - "fast-json-stable-stringify": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", - "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", - "dev": true - }, - "fast-json-stringify": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/fast-json-stringify/-/fast-json-stringify-5.5.0.tgz", - "integrity": "sha512-rmw2Z8/mLkND8zI+3KTYIkNPEoF5v6GqDP/o+g7H3vjdWjBwuKpgAYFHIzL6ORRB+iqDjjtJnLIW9Mzxn5szOA==", - "requires": { - "@fastify/deepmerge": "^1.0.0", - "ajv": "^8.10.0", - "ajv-formats": "^2.1.1", - "fast-deep-equal": "^3.1.3", - "fast-uri": "^2.1.0", - "rfdc": "^1.2.0" - } - }, - "fast-levenshtein": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", - "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", - "dev": true - }, - "fast-querystring": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/fast-querystring/-/fast-querystring-1.1.0.tgz", - "integrity": "sha512-LWkjBCZlxjnSanuPpZ6mHswjy8hQv3VcPJsQB3ltUF2zjvrycr0leP3TSTEEfvQ1WEMSRl5YNsGqaft9bjLqEw==", - "requires": { - "fast-decode-uri-component": "^1.0.1" - } - }, - "fast-redact": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/fast-redact/-/fast-redact-3.1.2.tgz", - "integrity": "sha512-+0em+Iya9fKGfEQGcd62Yv6onjBmmhV1uh86XVfOU8VwAe6kaFdQCWI9s0/Nnugx5Vd9tdbZ7e6gE2tR9dzXdw==" - }, - "fast-safe-stringify": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz", - "integrity": "sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==" - }, - "fast-uri": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-2.2.0.tgz", - "integrity": "sha512-cIusKBIt/R/oI6z/1nyfe2FvGKVTohVRfvkOhvx0nCEW+xf5NoCXjAHcWp93uOUBchzYcsvPlrapAdX1uW+YGg==" - }, - "fast-xml-parser": { - "version": "4.0.11", - "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.0.11.tgz", - "integrity": "sha512-4aUg3aNRR/WjQAcpceODG1C3x3lFANXRo8+1biqfieHmg9pyMt7qB4lQV/Ta6sJCTbA5vfD8fnA8S54JATiFUA==", - "requires": { - "strnum": "^1.0.5" - } - }, - "fastify": { - "version": "4.12.0", - "resolved": "https://registry.npmjs.org/fastify/-/fastify-4.12.0.tgz", - "integrity": "sha512-Hh2GCsOCqnOuewWSvqXlpq5V/9VA+/JkVoooQWUhrU6gryO9+/UGOoF/dprGcKSDxkM/9TkMXSffYp8eA/YhYQ==", - "requires": { - "@fastify/ajv-compiler": "^3.3.1", - "@fastify/error": "^3.0.0", - "@fastify/fast-json-stringify-compiler": "^4.1.0", - "abstract-logging": "^2.0.1", - "avvio": "^8.2.0", - "fast-content-type-parse": "^1.0.0", - "find-my-way": "^7.3.0", - "light-my-request": "^5.6.1", - "pino": "^8.5.0", - "process-warning": "^2.0.0", - "proxy-addr": "^2.0.7", - "rfdc": "^1.3.0", - "secure-json-parse": "^2.5.0", - "semver": "^7.3.7", - "tiny-lru": "^10.0.0" - } - }, - "fastify-plugin": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/fastify-plugin/-/fastify-plugin-4.5.0.tgz", - "integrity": "sha512-79ak0JxddO0utAXAQ5ccKhvs6vX2MGyHHMMsmZkBANrq3hXc1CHzvNPHOcvTsVMEPl5I+NT+RO4YKMGehOfSIg==" - }, - "fastq": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz", - "integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==", - "requires": { - "reusify": "^1.0.4" - } - }, - "fb-watchman": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz", - "integrity": "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==", - "dev": true, - "requires": { - "bser": "2.1.1" - } - }, - "fd-slicer": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz", - "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==", - "optional": true, - "requires": { - "pend": "~1.2.0" - } - }, - "figures": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz", - "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==", - "dev": true, - "requires": { - "escape-string-regexp": "^1.0.5" - }, - "dependencies": { - "escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", - "dev": true - } - } - }, - "file-entry-cache": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", - "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", - "dev": true, - "requires": { - "flat-cache": "^3.0.4" - } - }, - "fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", - "requires": { - "to-regex-range": "^5.0.1" - } - }, - "find-my-way": { - "version": "7.4.0", - "resolved": "https://registry.npmjs.org/find-my-way/-/find-my-way-7.4.0.tgz", - "integrity": "sha512-JFT7eURLU5FumlZ3VBGnveId82cZz7UR7OUu+THQJOwdQXxmS/g8v0KLoFhv97HreycOrmAbqjXD/4VG2j0uMQ==", - "requires": { - "fast-deep-equal": "^3.1.3", - "fast-querystring": "^1.0.0", - "safe-regex2": "^2.0.0" - } - }, - "find-up": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", - "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", - "dev": true, - "requires": { - "locate-path": "^6.0.0", - "path-exists": "^4.0.0" - } - }, - "flat-cache": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz", - "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==", - "dev": true, - "requires": { - "flatted": "^3.1.0", - "rimraf": "^3.0.2" - } - }, - "flatted": { - "version": "3.2.7", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz", - "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==", - "dev": true - }, - "follow-redirects": { - "version": "1.15.2", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz", - "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==" - }, - "fork-ts-checker-webpack-plugin": { - "version": "7.2.14", - "resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-7.2.14.tgz", - "integrity": "sha512-Tg2feh/n8k486KX0EbXVUfJj3j0xnnbKYTJw0fnIb2QdV0+lblOYZSal5ed9hARoWVwKeOC7sYE2EakSRLo5ZA==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.16.7", - "chalk": "^4.1.2", - "chokidar": "^3.5.3", - "cosmiconfig": "^7.0.1", - "deepmerge": "^4.2.2", - "fs-extra": "^10.0.0", - "memfs": "^3.4.1", - "minimatch": "^3.0.4", - "node-abort-controller": "^3.0.1", - "schema-utils": "^3.1.1", - "semver": "^7.3.5", - "tapable": "^2.2.1" - }, - "dependencies": { - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "fs-extra": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", - "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", - "dev": true, - "requires": { - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - } - } - } - }, - "form-data": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", - "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", - "requires": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.8", - "mime-types": "^2.1.12" - } - }, - "formidable": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/formidable/-/formidable-2.1.2.tgz", - "integrity": "sha512-CM3GuJ57US06mlpQ47YcunuUZ9jpm8Vx+P2CGt2j7HpgkKZO/DJYQ0Bobim8G6PFQmK5lOqOOdUXboU+h73A4g==", - "dev": true, - "requires": { - "dezalgo": "^1.0.4", - "hexoid": "^1.0.0", - "once": "^1.4.0", - "qs": "^6.11.0" - } - }, - "forwarded": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", - "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==" - }, - "fs-extra": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.0.tgz", - "integrity": "sha512-0rcTq621PD5jM/e0a3EJoGC/1TC5ZBCERW82LQuwfGnCa1V8w7dpYH1yNu+SLb6E5dkeCBzKEyLGlFrnr+dUyw==", - "dev": true, - "requires": { - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - } - }, - "fs-monkey": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.3.tgz", - "integrity": "sha512-cybjIfiiE+pTWicSCLFHSrXZ6EilF30oh91FDP9S2B051prEa7QWfrVTQm10/dDpswBDXZugPa1Ogu8Yh+HV0Q==", - "dev": true - }, - "fs.realpath": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==" - }, - "fsevents": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", - "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", - "optional": true - }, - "function-bind": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", - "dev": true - }, - "generic-pool": { - "version": "3.9.0", - "resolved": "https://registry.npmjs.org/generic-pool/-/generic-pool-3.9.0.tgz", - "integrity": "sha512-hymDOu5B53XvN4QT9dBmZxPX4CWhBPPLguTZ9MMFeFa/Kg0xWVfylOVNlJji/E7yTZWFd/q9GO5TxDLq156D7g==" - }, - "gensync": { - "version": "1.0.0-beta.2", - "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", - "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==", - "dev": true - }, - "get-caller-file": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", - "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==" - }, - "get-intrinsic": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.0.tgz", - "integrity": "sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q==", - "dev": true, - "requires": { - "function-bind": "^1.1.1", - "has": "^1.0.3", - "has-symbols": "^1.0.3" - } - }, - "get-package-type": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz", - "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==", - "dev": true - }, - "get-stream": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", - "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", - "dev": true - }, - "glob": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", - "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^5.0.1", - "once": "^1.3.0" - }, - "dependencies": { - "brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", - "requires": { - "balanced-match": "^1.0.0" - } - }, - "minimatch": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", - "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", - "requires": { - "brace-expansion": "^2.0.1" - } - } - } - }, - "glob-parent": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", - "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", - "requires": { - "is-glob": "^4.0.1" - } - }, - "glob-to-regexp": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz", - "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==", - "dev": true - }, - "globals": { - "version": "13.20.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz", - "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==", - "dev": true, - "requires": { - "type-fest": "^0.20.2" - } - }, - "globby": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", - "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==", - "dev": true, - "requires": { - "array-union": "^2.1.0", - "dir-glob": "^3.0.1", - "fast-glob": "^3.2.9", - "ignore": "^5.2.0", - "merge2": "^1.4.1", - "slash": "^3.0.0" - } - }, - "google-protobuf": { - "version": "3.21.2", - "resolved": "https://registry.npmjs.org/google-protobuf/-/google-protobuf-3.21.2.tgz", - "integrity": "sha512-3MSOYFO5U9mPGikIYCzK0SaThypfGgS6bHqrUGXG3DPHCrb+txNqeEcns1W0lkGfk0rCyNXm7xB9rMxnCiZOoA==" - }, - "graceful-fs": { - "version": "4.2.10", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", - "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", - "dev": true - }, - "grapheme-splitter": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz", - "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==", - "dev": true - }, - "handlebars": { - "version": "4.7.7", - "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.7.tgz", - "integrity": "sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA==", - "requires": { - "minimist": "^1.2.5", - "neo-async": "^2.6.0", - "source-map": "^0.6.1", - "uglify-js": "^3.1.4", - "wordwrap": "^1.0.0" - }, - "dependencies": { - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" - } - } - }, - "has": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", - "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", - "dev": true, - "requires": { - "function-bind": "^1.1.1" - } - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" - }, - "has-symbols": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", - "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", - "dev": true - }, - "hash.js": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz", - "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==", - "requires": { - "inherits": "^2.0.3", - "minimalistic-assert": "^1.0.1" - } - }, - "he": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", - "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==" - }, - "helmet": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/helmet/-/helmet-6.0.1.tgz", - "integrity": "sha512-8wo+VdQhTMVBMCITYZaGTbE4lvlthelPYSvoyNvk4RECTmrVjMerp9RfUOQXZWLvCcAn1pKj7ZRxK4lI9Alrcw==" - }, - "help-me": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/help-me/-/help-me-4.2.0.tgz", - "integrity": "sha512-TAOnTB8Tz5Dw8penUuzHVrKNKlCIbwwbHnXraNJxPwf8LRtE2HlM84RYuezMFcwOJmoYOCWVDyJ8TQGxn9PgxA==", - "dev": true, - "requires": { - "glob": "^8.0.0", - "readable-stream": "^3.6.0" - }, - "dependencies": { - "readable-stream": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", - "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", - "dev": true, - "requires": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - } - } - } - }, - "hexoid": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/hexoid/-/hexoid-1.0.0.tgz", - "integrity": "sha512-QFLV0taWQOZtvIRIAdBChesmogZrtuXvVWsFHZTk2SU+anspqZ2vMnoLg7IE1+Uk16N19APic1BuF8bC8c2m5g==" - }, - "highlight.js": { - "version": "10.7.3", - "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.7.3.tgz", - "integrity": "sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A==" - }, - "hmac-drbg": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz", - "integrity": "sha512-Tti3gMqLdZfhOQY1Mzf/AanLiqh1WTiJgEj26ZuYQ9fbkLomzGchCws4FyrSd4VkpBfiNhaE1On+lOz894jvXg==", - "requires": { - "hash.js": "^1.0.3", - "minimalistic-assert": "^1.0.0", - "minimalistic-crypto-utils": "^1.0.1" - } - }, - "html-escaper": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz", - "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==", - "dev": true - }, - "html-minifier": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-4.0.0.tgz", - "integrity": "sha512-aoGxanpFPLg7MkIl/DDFYtb0iWz7jMFGqFhvEDZga6/4QTjneiD8I/NXL1x5aaoCp7FSIT6h/OhykDdPsbtMig==", - "requires": { - "camel-case": "^3.0.0", - "clean-css": "^4.2.1", - "commander": "^2.19.0", - "he": "^1.2.0", - "param-case": "^2.1.1", - "relateurl": "^0.2.7", - "uglify-js": "^3.5.1" - }, - "dependencies": { - "commander": { - "version": "2.20.3", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", - "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==" - } - } - }, - "htmlparser2": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz", - "integrity": "sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==", - "requires": { - "domelementtype": "^2.0.1", - "domhandler": "^4.0.0", - "domutils": "^2.5.2", - "entities": "^2.0.0" - } - }, - "http-errors": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz", - "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==", - "requires": { - "depd": "2.0.0", - "inherits": "2.0.4", - "setprototypeof": "1.2.0", - "statuses": "2.0.1", - "toidentifier": "1.0.1" - } - }, - "https-proxy-agent": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", - "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", - "optional": true, - "requires": { - "agent-base": "6", - "debug": "4" - } - }, - "human-signals": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz", - "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==", - "dev": true - }, - "iconv-lite": { - "version": "0.4.24", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", - "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", - "dev": true, - "requires": { - "safer-buffer": ">= 2.1.2 < 3" - } - }, - "ieee754": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", - "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==" - }, - "ignore": { - "version": "5.2.4", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz", - "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==", - "dev": true - }, - "import-fresh": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", - "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", - "dev": true, - "requires": { - "parent-module": "^1.0.0", - "resolve-from": "^4.0.0" - } - }, - "import-local": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz", - "integrity": "sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==", - "dev": true, - "requires": { - "pkg-dir": "^4.2.0", - "resolve-cwd": "^3.0.0" - } - }, - "imurmurhash": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", - "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", - "dev": true - }, - "inflight": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", - "requires": { - "once": "^1.3.0", - "wrappy": "1" - } - }, - "inherits": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" - }, - "ini": { - "version": "1.3.8", - "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", - "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==" - }, - "inquirer": { - "version": "7.3.3", - "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.3.3.tgz", - "integrity": "sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==", - "dev": true, - "requires": { - "ansi-escapes": "^4.2.1", - "chalk": "^4.1.0", - "cli-cursor": "^3.1.0", - "cli-width": "^3.0.0", - "external-editor": "^3.0.3", - "figures": "^3.0.0", - "lodash": "^4.17.19", - "mute-stream": "0.0.8", - "run-async": "^2.4.0", - "rxjs": "^6.6.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0", - "through": "^2.3.6" - }, - "dependencies": { - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "rxjs": { - "version": "6.6.7", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", - "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", - "dev": true, - "requires": { - "tslib": "^1.9.0" - } - }, - "tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", - "dev": true - } - } - }, - "interpret": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz", - "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==", - "dev": true - }, - "ioredis": { - "version": "5.3.2", - "resolved": "https://registry.npmjs.org/ioredis/-/ioredis-5.3.2.tgz", - "integrity": "sha512-1DKMMzlIHM02eBBVOFQ1+AolGjs6+xEcM4PDL7NqOS6szq7H9jSaEkIUH6/a5Hl241LzW6JLSiAbNvTQjUupUA==", - "peer": true, - "requires": { - "@ioredis/commands": "^1.1.1", - "cluster-key-slot": "^1.1.0", - "debug": "^4.3.4", - "denque": "^2.1.0", - "lodash.defaults": "^4.2.0", - "lodash.isarguments": "^3.1.0", - "redis-errors": "^1.2.0", - "redis-parser": "^3.0.0", - "standard-as-callback": "^2.1.0" - } - }, - "ip-regex": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-4.3.0.tgz", - "integrity": "sha512-B9ZWJxHHOHUhUjCPrMpLD4xEq35bUTClHM1S6CBU5ixQnkZmwipwgc96vAd7AAGM9TGHvJR+Uss+/Ak6UphK+Q==", - "optional": true - }, - "ipaddr.js": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", - "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==" - }, - "is-arrayish": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", - "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==", - "dev": true - }, - "is-binary-path": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", - "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", - "requires": { - "binary-extensions": "^2.0.0" - } - }, - "is-core-module": { - "version": "2.11.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz", - "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==", - "dev": true, - "requires": { - "has": "^1.0.3" - } - }, - "is-extglob": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==" - }, - "is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==" - }, - "is-generator-fn": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz", - "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==", - "dev": true - }, - "is-glob": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", - "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", - "requires": { - "is-extglob": "^2.1.1" - } - }, - "is-interactive": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz", - "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==", - "dev": true - }, - "is-number": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", - "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==" - }, - "is-path-inside": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", - "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", - "dev": true - }, - "is-stream": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", - "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", - "dev": true - }, - "is-unicode-supported": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz", - "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==", - "dev": true - }, - "is-url": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/is-url/-/is-url-1.2.4.tgz", - "integrity": "sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==", - "optional": true - }, - "is2": { - "version": "2.0.9", - "resolved": "https://registry.npmjs.org/is2/-/is2-2.0.9.tgz", - "integrity": "sha512-rZkHeBn9Zzq52sd9IUIV3a5mfwBY+o2HePMh0wkGBM4z4qjvy2GwVxQ6nNXSfw6MmVP6gf1QIlWjiOavhM3x5g==", - "optional": true, - "requires": { - "deep-is": "^0.1.3", - "ip-regex": "^4.1.0", - "is-url": "^1.2.4" - } - }, - "isarray": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==", - "dev": true - }, - "isexe": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", - "dev": true - }, - "istanbul-lib-coverage": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz", - "integrity": "sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==", - "dev": true - }, - "istanbul-lib-instrument": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz", - "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==", - "dev": true, - "requires": { - "@babel/core": "^7.12.3", - "@babel/parser": "^7.14.7", - "@istanbuljs/schema": "^0.1.2", - "istanbul-lib-coverage": "^3.2.0", - "semver": "^6.3.0" - }, - "dependencies": { - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true - } - } - }, - "istanbul-lib-report": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz", - "integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==", - "dev": true, - "requires": { - "istanbul-lib-coverage": "^3.0.0", - "make-dir": "^3.0.0", - "supports-color": "^7.1.0" - } - }, - "istanbul-lib-source-maps": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz", - "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==", - "dev": true, - "requires": { - "debug": "^4.1.1", - "istanbul-lib-coverage": "^3.0.0", - "source-map": "^0.6.1" - }, - "dependencies": { - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - } - } - }, - "istanbul-reports": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.5.tgz", - "integrity": "sha512-nUsEMa9pBt/NOHqbcbeJEgqIlY/K7rVWUX6Lql2orY5e9roQOthbR3vtY4zzf2orPELg80fnxxk9zUyPlgwD1w==", - "dev": true, - "requires": { - "html-escaper": "^2.0.0", - "istanbul-lib-report": "^3.0.0" - } - }, - "iterare": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/iterare/-/iterare-1.2.1.tgz", - "integrity": "sha512-RKYVTCjAnRthyJes037NX/IiqeidgN1xc3j1RjFfECFp28A1GVwK9nA+i0rJPaHqSZwygLzRnFlzUuHFoWWy+Q==" - }, - "jest": { - "version": "28.1.2", - "resolved": "https://registry.npmjs.org/jest/-/jest-28.1.2.tgz", - "integrity": "sha512-Tuf05DwLeCh2cfWCQbcz9UxldoDyiR1E9Igaei5khjonKncYdc6LDfynKCEWozK0oLE3GD+xKAo2u8x/0s6GOg==", - "dev": true, - "requires": { - "@jest/core": "^28.1.2", - "@jest/types": "^28.1.1", - "import-local": "^3.0.2", - "jest-cli": "^28.1.2" - } - }, - "jest-changed-files": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-28.1.3.tgz", - "integrity": "sha512-esaOfUWJXk2nfZt9SPyC8gA1kNfdKLkQWyzsMlqq8msYSlNKfmZxfRgZn4Cd4MGVUF+7v6dBs0d5TOAKa7iIiA==", - "dev": true, - "requires": { - "execa": "^5.0.0", - "p-limit": "^3.1.0" - } - }, - "jest-circus": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-28.1.3.tgz", - "integrity": "sha512-cZ+eS5zc79MBwt+IhQhiEp0OeBddpc1n8MBo1nMB8A7oPMKEO+Sre+wHaLJexQUj9Ya/8NOBY0RESUgYjB6fow==", - "dev": true, - "requires": { - "@jest/environment": "^28.1.3", - "@jest/expect": "^28.1.3", - "@jest/test-result": "^28.1.3", - "@jest/types": "^28.1.3", - "@types/node": "*", - "chalk": "^4.0.0", - "co": "^4.6.0", - "dedent": "^0.7.0", - "is-generator-fn": "^2.0.0", - "jest-each": "^28.1.3", - "jest-matcher-utils": "^28.1.3", - "jest-message-util": "^28.1.3", - "jest-runtime": "^28.1.3", - "jest-snapshot": "^28.1.3", - "jest-util": "^28.1.3", - "p-limit": "^3.1.0", - "pretty-format": "^28.1.3", - "slash": "^3.0.0", - "stack-utils": "^2.0.3" - }, - "dependencies": { - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - } - } - }, - "jest-cli": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-28.1.3.tgz", - "integrity": "sha512-roY3kvrv57Azn1yPgdTebPAXvdR2xfezaKKYzVxZ6It/5NCxzJym6tUI5P1zkdWhfUYkxEI9uZWcQdaFLo8mJQ==", - "dev": true, - "requires": { - "@jest/core": "^28.1.3", - "@jest/test-result": "^28.1.3", - "@jest/types": "^28.1.3", - "chalk": "^4.0.0", - "exit": "^0.1.2", - "graceful-fs": "^4.2.9", - "import-local": "^3.0.2", - "jest-config": "^28.1.3", - "jest-util": "^28.1.3", - "jest-validate": "^28.1.3", - "prompts": "^2.0.1", - "yargs": "^17.3.1" - }, - "dependencies": { - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "cliui": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", - "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", - "dev": true, - "requires": { - "string-width": "^4.2.0", - "strip-ansi": "^6.0.1", - "wrap-ansi": "^7.0.0" - } - }, - "yargs": { - "version": "17.6.2", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.6.2.tgz", - "integrity": "sha512-1/9UrdHjDZc0eOU0HxOHoS78C69UD3JRMvzlJ7S79S2nTaWRA/whGCTV8o9e/N/1Va9YIV7Q4sOxD8VV4pCWOw==", - "dev": true, - "requires": { - "cliui": "^8.0.1", - "escalade": "^3.1.1", - "get-caller-file": "^2.0.5", - "require-directory": "^2.1.1", - "string-width": "^4.2.3", - "y18n": "^5.0.5", - "yargs-parser": "^21.1.1" - } - } - } - }, - "jest-config": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-28.1.3.tgz", - "integrity": "sha512-MG3INjByJ0J4AsNBm7T3hsuxKQqFIiRo/AUqb1q9LRKI5UU6Aar9JHbr9Ivn1TVwfUD9KirRoM/T6u8XlcQPHQ==", - "dev": true, - "requires": { - "@babel/core": "^7.11.6", - "@jest/test-sequencer": "^28.1.3", - "@jest/types": "^28.1.3", - "babel-jest": "^28.1.3", - "chalk": "^4.0.0", - "ci-info": "^3.2.0", - "deepmerge": "^4.2.2", - "glob": "^7.1.3", - "graceful-fs": "^4.2.9", - "jest-circus": "^28.1.3", - "jest-environment-node": "^28.1.3", - "jest-get-type": "^28.0.2", - "jest-regex-util": "^28.0.2", - "jest-resolve": "^28.1.3", - "jest-runner": "^28.1.3", - "jest-util": "^28.1.3", - "jest-validate": "^28.1.3", - "micromatch": "^4.0.4", - "parse-json": "^5.2.0", - "pretty-format": "^28.1.3", - "slash": "^3.0.0", - "strip-json-comments": "^3.1.1" - }, - "dependencies": { - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "dev": true, - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - } - } - }, - "jest-diff": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-28.1.3.tgz", - "integrity": "sha512-8RqP1B/OXzjjTWkqMX67iqgwBVJRgCyKD3L9nq+6ZqJMdvjE8RgHktqZ6jNrkdMT+dJuYNI3rhQpxaz7drJHfw==", - "dev": true, - "requires": { - "chalk": "^4.0.0", - "diff-sequences": "^28.1.1", - "jest-get-type": "^28.0.2", - "pretty-format": "^28.1.3" - }, - "dependencies": { - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - } - } - }, - "jest-docblock": { - "version": "28.1.1", - "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-28.1.1.tgz", - "integrity": "sha512-3wayBVNiOYx0cwAbl9rwm5kKFP8yHH3d/fkEaL02NPTkDojPtheGB7HZSFY4wzX+DxyrvhXz0KSCVksmCknCuA==", - "dev": true, - "requires": { - "detect-newline": "^3.0.0" - } - }, - "jest-each": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-28.1.3.tgz", - "integrity": "sha512-arT1z4sg2yABU5uogObVPvSlSMQlDA48owx07BDPAiasW0yYpYHYOo4HHLz9q0BVzDVU4hILFjzJw0So9aCL/g==", - "dev": true, - "requires": { - "@jest/types": "^28.1.3", - "chalk": "^4.0.0", - "jest-get-type": "^28.0.2", - "jest-util": "^28.1.3", - "pretty-format": "^28.1.3" - }, - "dependencies": { - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - } - } - }, - "jest-environment-node": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-28.1.3.tgz", - "integrity": "sha512-ugP6XOhEpjAEhGYvp5Xj989ns5cB1K6ZdjBYuS30umT4CQEETaxSiPcZ/E1kFktX4GkrcM4qu07IIlDYX1gp+A==", - "dev": true, - "requires": { - "@jest/environment": "^28.1.3", - "@jest/fake-timers": "^28.1.3", - "@jest/types": "^28.1.3", - "@types/node": "*", - "jest-mock": "^28.1.3", - "jest-util": "^28.1.3" - } - }, - "jest-get-type": { - "version": "28.0.2", - "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-28.0.2.tgz", - "integrity": "sha512-ioj2w9/DxSYHfOm5lJKCdcAmPJzQXmbM/Url3rhlghrPvT3tt+7a/+oXc9azkKmLvoiXjtV83bEWqi+vs5nlPA==", - "dev": true - }, - "jest-haste-map": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-28.1.3.tgz", - "integrity": "sha512-3S+RQWDXccXDKSWnkHa/dPwt+2qwA8CJzR61w3FoYCvoo3Pn8tvGcysmMF0Bj0EX5RYvAI2EIvC57OmotfdtKA==", - "dev": true, - "requires": { - "@jest/types": "^28.1.3", - "@types/graceful-fs": "^4.1.3", - "@types/node": "*", - "anymatch": "^3.0.3", - "fb-watchman": "^2.0.0", - "fsevents": "^2.3.2", - "graceful-fs": "^4.2.9", - "jest-regex-util": "^28.0.2", - "jest-util": "^28.1.3", - "jest-worker": "^28.1.3", - "micromatch": "^4.0.4", - "walker": "^1.0.8" - } - }, - "jest-leak-detector": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-28.1.3.tgz", - "integrity": "sha512-WFVJhnQsiKtDEo5lG2mM0v40QWnBM+zMdHHyJs8AWZ7J0QZJS59MsyKeJHWhpBZBH32S48FOVvGyOFT1h0DlqA==", - "dev": true, - "requires": { - "jest-get-type": "^28.0.2", - "pretty-format": "^28.1.3" - } - }, - "jest-matcher-utils": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-28.1.3.tgz", - "integrity": "sha512-kQeJ7qHemKfbzKoGjHHrRKH6atgxMk8Enkk2iPQ3XwO6oE/KYD8lMYOziCkeSB9G4adPM4nR1DE8Tf5JeWH6Bw==", - "dev": true, - "requires": { - "chalk": "^4.0.0", - "jest-diff": "^28.1.3", - "jest-get-type": "^28.0.2", - "pretty-format": "^28.1.3" - }, - "dependencies": { - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - } - } - }, - "jest-message-util": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-28.1.3.tgz", - "integrity": "sha512-PFdn9Iewbt575zKPf1286Ht9EPoJmYT7P0kY+RibeYZ2XtOr53pDLEFoTWXbd1h4JiGiWpTBC84fc8xMXQMb7g==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.12.13", - "@jest/types": "^28.1.3", - "@types/stack-utils": "^2.0.0", - "chalk": "^4.0.0", - "graceful-fs": "^4.2.9", - "micromatch": "^4.0.4", - "pretty-format": "^28.1.3", - "slash": "^3.0.0", - "stack-utils": "^2.0.3" - }, - "dependencies": { - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - } - } - }, - "jest-mock": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-28.1.3.tgz", - "integrity": "sha512-o3J2jr6dMMWYVH4Lh/NKmDXdosrsJgi4AviS8oXLujcjpCMBb1FMsblDnOXKZKfSiHLxYub1eS0IHuRXsio9eA==", - "dev": true, - "requires": { - "@jest/types": "^28.1.3", - "@types/node": "*" - } - }, - "jest-pnp-resolver": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz", - "integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==", - "dev": true, - "requires": {} - }, - "jest-regex-util": { - "version": "28.0.2", - "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-28.0.2.tgz", - "integrity": "sha512-4s0IgyNIy0y9FK+cjoVYoxamT7Zeo7MhzqRGx7YDYmaQn1wucY9rotiGkBzzcMXTtjrCAP/f7f+E0F7+fxPNdw==", - "dev": true - }, - "jest-resolve": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-28.1.3.tgz", - "integrity": "sha512-Z1W3tTjE6QaNI90qo/BJpfnvpxtaFTFw5CDgwpyE/Kz8U/06N1Hjf4ia9quUhCh39qIGWF1ZuxFiBiJQwSEYKQ==", - "dev": true, - "requires": { - "chalk": "^4.0.0", - "graceful-fs": "^4.2.9", - "jest-haste-map": "^28.1.3", - "jest-pnp-resolver": "^1.2.2", - "jest-util": "^28.1.3", - "jest-validate": "^28.1.3", - "resolve": "^1.20.0", - "resolve.exports": "^1.1.0", - "slash": "^3.0.0" - }, - "dependencies": { - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - } - } - }, - "jest-resolve-dependencies": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-28.1.3.tgz", - "integrity": "sha512-qa0QO2Q0XzQoNPouMbCc7Bvtsem8eQgVPNkwn9LnS+R2n8DaVDPL/U1gngC0LTl1RYXJU0uJa2BMC2DbTfFrHA==", - "dev": true, - "requires": { - "jest-regex-util": "^28.0.2", - "jest-snapshot": "^28.1.3" - } - }, - "jest-runner": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-28.1.3.tgz", - "integrity": "sha512-GkMw4D/0USd62OVO0oEgjn23TM+YJa2U2Wu5zz9xsQB1MxWKDOlrnykPxnMsN0tnJllfLPinHTka61u0QhaxBA==", - "dev": true, - "requires": { - "@jest/console": "^28.1.3", - "@jest/environment": "^28.1.3", - "@jest/test-result": "^28.1.3", - "@jest/transform": "^28.1.3", - "@jest/types": "^28.1.3", - "@types/node": "*", - "chalk": "^4.0.0", - "emittery": "^0.10.2", - "graceful-fs": "^4.2.9", - "jest-docblock": "^28.1.1", - "jest-environment-node": "^28.1.3", - "jest-haste-map": "^28.1.3", - "jest-leak-detector": "^28.1.3", - "jest-message-util": "^28.1.3", - "jest-resolve": "^28.1.3", - "jest-runtime": "^28.1.3", - "jest-util": "^28.1.3", - "jest-watcher": "^28.1.3", - "jest-worker": "^28.1.3", - "p-limit": "^3.1.0", - "source-map-support": "0.5.13" - }, - "dependencies": { - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - }, - "source-map-support": { - "version": "0.5.13", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz", - "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==", - "dev": true, - "requires": { - "buffer-from": "^1.0.0", - "source-map": "^0.6.0" - } - } - } - }, - "jest-runtime": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-28.1.3.tgz", - "integrity": "sha512-NU+881ScBQQLc1JHG5eJGU7Ui3kLKrmwCPPtYsJtBykixrM2OhVQlpMmFWJjMyDfdkGgBMNjXCGB/ebzsgNGQw==", - "dev": true, - "requires": { - "@jest/environment": "^28.1.3", - "@jest/fake-timers": "^28.1.3", - "@jest/globals": "^28.1.3", - "@jest/source-map": "^28.1.2", - "@jest/test-result": "^28.1.3", - "@jest/transform": "^28.1.3", - "@jest/types": "^28.1.3", - "chalk": "^4.0.0", - "cjs-module-lexer": "^1.0.0", - "collect-v8-coverage": "^1.0.0", - "execa": "^5.0.0", - "glob": "^7.1.3", - "graceful-fs": "^4.2.9", - "jest-haste-map": "^28.1.3", - "jest-message-util": "^28.1.3", - "jest-mock": "^28.1.3", - "jest-regex-util": "^28.0.2", - "jest-resolve": "^28.1.3", - "jest-snapshot": "^28.1.3", - "jest-util": "^28.1.3", - "slash": "^3.0.0", - "strip-bom": "^4.0.0" - }, - "dependencies": { - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "dev": true, - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - } - } - }, - "jest-snapshot": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-28.1.3.tgz", - "integrity": "sha512-4lzMgtiNlc3DU/8lZfmqxN3AYD6GGLbl+72rdBpXvcV+whX7mDrREzkPdp2RnmfIiWBg1YbuFSkXduF2JcafJg==", - "dev": true, - "requires": { - "@babel/core": "^7.11.6", - "@babel/generator": "^7.7.2", - "@babel/plugin-syntax-typescript": "^7.7.2", - "@babel/traverse": "^7.7.2", - "@babel/types": "^7.3.3", - "@jest/expect-utils": "^28.1.3", - "@jest/transform": "^28.1.3", - "@jest/types": "^28.1.3", - "@types/babel__traverse": "^7.0.6", - "@types/prettier": "^2.1.5", - "babel-preset-current-node-syntax": "^1.0.0", - "chalk": "^4.0.0", - "expect": "^28.1.3", - "graceful-fs": "^4.2.9", - "jest-diff": "^28.1.3", - "jest-get-type": "^28.0.2", - "jest-haste-map": "^28.1.3", - "jest-matcher-utils": "^28.1.3", - "jest-message-util": "^28.1.3", - "jest-util": "^28.1.3", - "natural-compare": "^1.4.0", - "pretty-format": "^28.1.3", - "semver": "^7.3.5" - }, - "dependencies": { - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - } - } - }, - "jest-util": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-28.1.3.tgz", - "integrity": "sha512-XdqfpHwpcSRko/C35uLYFM2emRAltIIKZiJ9eAmhjsj0CqZMa0p1ib0R5fWIqGhn1a103DebTbpqIaP1qCQ6tQ==", - "dev": true, - "requires": { - "@jest/types": "^28.1.3", - "@types/node": "*", - "chalk": "^4.0.0", - "ci-info": "^3.2.0", - "graceful-fs": "^4.2.9", - "picomatch": "^2.2.3" - }, - "dependencies": { - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - } - } - }, - "jest-validate": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-28.1.3.tgz", - "integrity": "sha512-SZbOGBWEsaTxBGCOpsRWlXlvNkvTkY0XxRfh7zYmvd8uL5Qzyg0CHAXiXKROflh801quA6+/DsT4ODDthOC/OA==", - "dev": true, - "requires": { - "@jest/types": "^28.1.3", - "camelcase": "^6.2.0", - "chalk": "^4.0.0", - "jest-get-type": "^28.0.2", - "leven": "^3.1.0", - "pretty-format": "^28.1.3" - }, - "dependencies": { - "camelcase": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz", - "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==", - "dev": true - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - } - } - }, - "jest-watcher": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-28.1.3.tgz", - "integrity": "sha512-t4qcqj9hze+jviFPUN3YAtAEeFnr/azITXQEMARf5cMwKY2SMBRnCQTXLixTl20OR6mLh9KLMrgVJgJISym+1g==", - "dev": true, - "requires": { - "@jest/test-result": "^28.1.3", - "@jest/types": "^28.1.3", - "@types/node": "*", - "ansi-escapes": "^4.2.1", - "chalk": "^4.0.0", - "emittery": "^0.10.2", - "jest-util": "^28.1.3", - "string-length": "^4.0.1" - }, - "dependencies": { - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - } - } - }, - "jest-worker": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-28.1.3.tgz", - "integrity": "sha512-CqRA220YV/6jCo8VWvAt1KKx6eek1VIHMPeLEbpcfSfkEeWyBNppynM/o6q+Wmw+sOhos2ml34wZbSX3G13//g==", - "dev": true, - "requires": { - "@types/node": "*", - "merge-stream": "^2.0.0", - "supports-color": "^8.0.0" - }, - "dependencies": { - "supports-color": { - "version": "8.1.1", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", - "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "joycon": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/joycon/-/joycon-3.1.1.tgz", - "integrity": "sha512-34wB/Y7MW7bzjKRjUKTa46I2Z7eV62Rkhva+KkopW7Qvv/OSWBqvkSY7vusOPrNuZcUG3tApvdVgNB8POj3SPw==", - "dev": true - }, - "js-beautify": { - "version": "1.14.7", - "resolved": "https://registry.npmjs.org/js-beautify/-/js-beautify-1.14.7.tgz", - "integrity": "sha512-5SOX1KXPFKx+5f6ZrPsIPEY7NwKeQz47n3jm2i+XeHx9MoRsfQenlOP13FQhWvg8JRS0+XLO6XYUQ2GX+q+T9A==", - "requires": { - "config-chain": "^1.1.13", - "editorconfig": "^0.15.3", - "glob": "^8.0.3", - "nopt": "^6.0.0" - } - }, - "js-sdsl": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.3.0.tgz", - "integrity": "sha512-mifzlm2+5nZ+lEcLJMoBK0/IH/bDg8XnJfd/Wq6IP+xoCjLZsTOnV2QpxlVbX9bMnkl5PdEjNtBJ9Cj1NjifhQ==", - "dev": true - }, - "js-tokens": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", - "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", - "dev": true - }, - "js-yaml": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", - "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", - "requires": { - "argparse": "^2.0.1" - } - }, - "jsesc": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", - "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", - "dev": true - }, - "json-parse-even-better-errors": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", - "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", - "dev": true - }, - "json-schema-traverse": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", - "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==" - }, - "json-stable-stringify-without-jsonify": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", - "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==", - "dev": true - }, - "json5": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", - "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==" - }, - "jsonc-parser": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz", - "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==", - "dev": true - }, - "jsonfile": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", - "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", - "dev": true, - "requires": { - "graceful-fs": "^4.1.6", - "universalify": "^2.0.0" - } - }, - "juice": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/juice/-/juice-7.0.0.tgz", - "integrity": "sha512-AjKQX31KKN+uJs+zaf+GW8mBO/f/0NqSh2moTMyvwBY+4/lXIYTU8D8I2h6BAV3Xnz6GGsbalUyFqbYMe+Vh+Q==", - "requires": { - "cheerio": "^1.0.0-rc.3", - "commander": "^5.1.0", - "mensch": "^0.3.4", - "slick": "^1.12.2", - "web-resource-inliner": "^5.0.0" - }, - "dependencies": { - "commander": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz", - "integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==" - } - } - }, - "just-extend": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/just-extend/-/just-extend-4.2.1.tgz", - "integrity": "sha512-g3UB796vUFIY90VIv/WX3L2c8CS2MdWUww3CNrYmqza1Fg0DURc2K/O4YrnklBdQarSJ/y8JnJYDGc+1iumQjg==", - "dev": true - }, - "jwk-to-pem": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/jwk-to-pem/-/jwk-to-pem-2.0.5.tgz", - "integrity": "sha512-L90jwellhO8jRKYwbssU9ifaMVqajzj3fpRjDKcsDzrslU9syRbFqfkXtT4B89HYAap+xsxNcxgBSB09ig+a7A==", - "requires": { - "asn1.js": "^5.3.0", - "elliptic": "^6.5.4", - "safe-buffer": "^5.0.1" - } - }, - "keycloak-connect": { - "version": "18.0.2", - "resolved": "https://registry.npmjs.org/keycloak-connect/-/keycloak-connect-18.0.2.tgz", - "integrity": "sha512-FH7XgkPDPDIdIYkPpfp2S3++pJU+roprLDqmbptl6rZHP8DYzCdI/5DdC/hLFCVVhLhEzxMBtZGoqqnZ4icYww==", - "requires": { - "chromedriver": "latest", - "jwk-to-pem": "^2.0.0" - } - }, - "kleur": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz", - "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==", - "dev": true - }, - "leven": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz", - "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==", - "dev": true - }, - "levn": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", - "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", - "dev": true, - "requires": { - "prelude-ls": "^1.2.1", - "type-check": "~0.4.0" - } - }, - "libphonenumber-js": { - "version": "1.10.19", - "resolved": "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.10.19.tgz", - "integrity": "sha512-MDZ1zLIkfSDZV5xBta3nuvbEOlsnKCPe4z5r3hyup/AXveevkl9A1eSWmLhd2FX4k7pJDe4MrLeQsux0HI/VWg==" - }, - "light-my-request": { - "version": "5.8.0", - "resolved": "https://registry.npmjs.org/light-my-request/-/light-my-request-5.8.0.tgz", - "integrity": "sha512-4BtD5C+VmyTpzlDPCZbsatZMJVgUIciSOwYhJDCbLffPZ35KoDkDj4zubLeHDEb35b4kkPeEv5imbh+RJxK/Pg==", - "requires": { - "cookie": "^0.5.0", - "process-warning": "^2.0.0", - "set-cookie-parser": "^2.4.1" - } - }, - "lines-and-columns": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", - "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==", - "dev": true - }, - "loader-runner": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz", - "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==", - "dev": true - }, - "locate-path": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", - "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", - "dev": true, - "requires": { - "p-locate": "^5.0.0" - } - }, - "lodash": { - "version": "4.17.21", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" - }, - "lodash.camelcase": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz", - "integrity": "sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==" - }, - "lodash.defaults": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz", - "integrity": "sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==", - "peer": true - }, - "lodash.get": { - "version": "4.4.2", - "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz", - "integrity": "sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==", - "dev": true - }, - "lodash.isarguments": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz", - "integrity": "sha512-chi4NHZlZqZD18a0imDHnZPrDeBbTtVN7GXMwuGdRH9qotxAjYs3aVLKc7zNOG9eddR5Ksd8rvFEBc9SsggPpg==", - "peer": true - }, - "lodash.memoize": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz", - "integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==", - "dev": true - }, - "lodash.merge": { - "version": "4.6.2", - "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", - "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", - "dev": true - }, - "log-symbols": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz", - "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==", - "dev": true, - "requires": { - "chalk": "^4.1.0", - "is-unicode-supported": "^0.1.0" - }, - "dependencies": { - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - } - } - }, - "long": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/long/-/long-4.0.0.tgz", - "integrity": "sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==" - }, - "lower-case": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz", - "integrity": "sha512-2Fgx1Ycm599x+WGpIYwJOvsjmXFzTSc34IwDWALRA/8AopUKAVPwfJ+h5+f85BCp0PWmmJcWzEpxOpoXycMpdA==" - }, - "lru-cache": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", - "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", - "dev": true, - "requires": { - "yallist": "^3.0.2" - } - }, - "luxon": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.2.1.tgz", - "integrity": "sha512-QrwPArQCNLAKGO/C+ZIilgIuDnEnKx5QYODdDtbFaxzsbZcc/a7WFq7MhsVYgRlwawLtvOUESTlfJ+hc/USqPg==", - "peer": true - }, - "macos-release": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/macos-release/-/macos-release-2.5.0.tgz", - "integrity": "sha512-EIgv+QZ9r+814gjJj0Bt5vSLJLzswGmSUbUpbi9AIr/fsN2IWFBl2NucV9PAiek+U1STK468tEkxmVYUtuAN3g==", - "dev": true - }, - "magic-string": { - "version": "0.26.7", - "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.26.7.tgz", - "integrity": "sha512-hX9XH3ziStPoPhJxLq1syWuZMxbDvGNbVchfrdCtanC7D13888bMFow61x8axrx+GfHLtVeAx2kxL7tTGRl+Ow==", - "dev": true, - "requires": { - "sourcemap-codec": "^1.4.8" - } - }, - "make-dir": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", - "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", - "dev": true, - "requires": { - "semver": "^6.0.0" - }, - "dependencies": { - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true - } - } - }, - "make-error": { - "version": "1.3.6", - "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz", - "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==", - "devOptional": true - }, - "makeerror": { - "version": "1.0.12", - "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz", - "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==", - "dev": true, - "requires": { - "tmpl": "1.0.5" - } - }, - "memfs": { - "version": "3.4.13", - "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.4.13.tgz", - "integrity": "sha512-omTM41g3Skpvx5dSYeZIbXKcXoAVc/AoMNwn9TKx++L/gaen/+4TTttmu8ZSch5vfVJ8uJvGbroTsIlslRg6lg==", - "dev": true, - "requires": { - "fs-monkey": "^1.0.3" - } - }, - "mensch": { - "version": "0.3.4", - "resolved": "https://registry.npmjs.org/mensch/-/mensch-0.3.4.tgz", - "integrity": "sha512-IAeFvcOnV9V0Yk+bFhYR07O3yNina9ANIN5MoXBKYJ/RLYPurd2d0yw14MDhpr9/momp0WofT1bPUh3hkzdi/g==" - }, - "merge-stream": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", - "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", - "dev": true - }, - "merge2": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", - "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", - "dev": true - }, - "methods": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", - "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==", - "dev": true - }, - "micromatch": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", - "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", - "dev": true, - "requires": { - "braces": "^3.0.2", - "picomatch": "^2.3.1" - } - }, - "mime": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/mime/-/mime-3.0.0.tgz", - "integrity": "sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A==" - }, - "mime-db": { - "version": "1.52.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", - "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==" - }, - "mime-types": { - "version": "2.1.35", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", - "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", - "requires": { - "mime-db": "1.52.0" - } - }, - "mimic-fn": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", - "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", - "dev": true - }, - "minimalistic-assert": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz", - "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==" - }, - "minimalistic-crypto-utils": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz", - "integrity": "sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg==" - }, - "minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "requires": { - "brace-expansion": "^1.1.7" - } - }, - "minimist": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz", - "integrity": "sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==" - }, - "mjml": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/mjml/-/mjml-4.13.0.tgz", - "integrity": "sha512-OnFKESouLshz8DPFSb6M/dE8GkhiJnoy6LAam5TiLA1anAj24yQ2ZH388LtQoEkvTisqwiTmc9ejDh5ctnFaJQ==", - "requires": { - "@babel/runtime": "^7.14.6", - "mjml-cli": "4.13.0", - "mjml-core": "4.13.0", - "mjml-migrate": "4.13.0", - "mjml-preset-core": "4.13.0", - "mjml-validator": "4.13.0" - } - }, - "mjml-accordion": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/mjml-accordion/-/mjml-accordion-4.13.0.tgz", - "integrity": "sha512-E3yihZW5Oq2p+sWOcr8kWeRTROmiTYOGxB4IOxW/jTycdY07N3FX3e6vuh7Fv3rryHEUaydUQYto3ICVyctI7w==", - "requires": { - "@babel/runtime": "^7.14.6", - "lodash": "^4.17.21", - "mjml-core": "4.13.0" - } - }, - "mjml-body": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/mjml-body/-/mjml-body-4.13.0.tgz", - "integrity": "sha512-S4HgwAuO9dEsyX9sr6WBf9/xr+H2ASVaLn22aurJm1S2Lvc1wifLPYBQgFmNdCjaesTCNtOMUDpG+Rbnavyaqg==", - "requires": { - "@babel/runtime": "^7.14.6", - "lodash": "^4.17.21", - "mjml-core": "4.13.0" - } - }, - "mjml-button": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/mjml-button/-/mjml-button-4.13.0.tgz", - "integrity": "sha512-3y8IAHCCxh7ESHh1aOOqobZKUgyNxOKAGQ9TlJoyaLpsKUFzkN8nmrD0KXF0ADSuzvhMZ1CdRIJuZ5mjv2TwWQ==", - "requires": { - "@babel/runtime": "^7.14.6", - "lodash": "^4.17.21", - "mjml-core": "4.13.0" - } - }, - "mjml-carousel": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/mjml-carousel/-/mjml-carousel-4.13.0.tgz", - "integrity": "sha512-ORSY5bEYlMlrWSIKI/lN0Tz3uGltWAjG8DQl2Yr3pwjwOaIzGE+kozrDf+T9xItfiIIbvKajef1dg7B7XgP0zg==", - "requires": { - "@babel/runtime": "^7.14.6", - "lodash": "^4.17.21", - "mjml-core": "4.13.0" - } - }, - "mjml-cli": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/mjml-cli/-/mjml-cli-4.13.0.tgz", - "integrity": "sha512-kAZxpH0QqlTF/CcLzELgKw1ljKRxrmWJ310CJQhbPAxHvwQ/nIb+q82U+zRJAelRPPKjnOb+hSrMRqTgk9rH3w==", - "requires": { - "@babel/runtime": "^7.14.6", - "chokidar": "^3.0.0", - "glob": "^7.1.1", - "html-minifier": "^4.0.0", - "js-beautify": "^1.6.14", - "lodash": "^4.17.21", - "mjml-core": "4.13.0", - "mjml-migrate": "4.13.0", - "mjml-parser-xml": "4.13.0", - "mjml-validator": "4.13.0", - "yargs": "^16.1.0" - }, - "dependencies": { - "glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - } - } - }, - "mjml-column": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/mjml-column/-/mjml-column-4.13.0.tgz", - "integrity": "sha512-O8FrWKK/bCy9XpKxrKRYWNdgWNaVd4TK4RqMeVI/I70IbnYnc1uf15jnsPMxCBSbT+NyXyk8k7fn099797uwpw==", - "requires": { - "@babel/runtime": "^7.14.6", - "lodash": "^4.17.21", - "mjml-core": "4.13.0" - } - }, - "mjml-core": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/mjml-core/-/mjml-core-4.13.0.tgz", - "integrity": "sha512-kU5AoVTlZaXR/EDi3ix66xpzUe+kScYus71lBH/wo/B+LZW70GHE1AYWtsog5oJp1MuTHpMFTNuBD/wePeEgWg==", - "requires": { - "@babel/runtime": "^7.14.6", - "cheerio": "1.0.0-rc.10", - "detect-node": "2.0.4", - "html-minifier": "^4.0.0", - "js-beautify": "^1.6.14", - "juice": "^7.0.0", - "lodash": "^4.17.21", - "mjml-migrate": "4.13.0", - "mjml-parser-xml": "4.13.0", - "mjml-validator": "4.13.0" - } - }, - "mjml-divider": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/mjml-divider/-/mjml-divider-4.13.0.tgz", - "integrity": "sha512-ooPCwfmxEC+wJduqObYezMp7W5UCHjL9Y1LPB5FGna2FrOejgfd6Ix3ij8Wrmycmlol7E2N4D7c5NDH5DbRCJg==", - "requires": { - "@babel/runtime": "^7.14.6", - "lodash": "^4.17.21", - "mjml-core": "4.13.0" - } - }, - "mjml-group": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/mjml-group/-/mjml-group-4.13.0.tgz", - "integrity": "sha512-U7E8m8aaoAE/dMqjqXPjjrKcwO36B4cquAy9ASldECrIZJBcpFYO6eYf5yLXrNCUM2P0id8pgVjrUq23s00L7Q==", - "requires": { - "@babel/runtime": "^7.14.6", - "lodash": "^4.17.21", - "mjml-core": "4.13.0" - } - }, - "mjml-head": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/mjml-head/-/mjml-head-4.13.0.tgz", - "integrity": "sha512-sL2qQuoVALXBCiemu4DPo9geDr8DuUdXVJxm+4nd6k5jpLCfSDmFlNhgSsLPzsYn7VEac3/sxsjLtomQ+6/BHg==", - "requires": { - "@babel/runtime": "^7.14.6", - "lodash": "^4.17.21", - "mjml-core": "4.13.0" - } - }, - "mjml-head-attributes": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/mjml-head-attributes/-/mjml-head-attributes-4.13.0.tgz", - "integrity": "sha512-haggCafno+0lQylxJStkINCVCPMwfTpwE6yjCHeGOpQl/TkoNmjNkDr7DEEbNTZbt4Ekg070lQFn7clDy38EoA==", - "requires": { - "@babel/runtime": "^7.14.6", - "lodash": "^4.17.21", - "mjml-core": "4.13.0" - } - }, - "mjml-head-breakpoint": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/mjml-head-breakpoint/-/mjml-head-breakpoint-4.13.0.tgz", - "integrity": "sha512-D2iPDeUKQK1+rYSNa2HGOvgfPxZhNyndTG0iBEb/FxdGge2hbeDCZEN0mwDYE3wWB+qSBqlCuMI+Vr4pEjZbKg==", - "requires": { - "@babel/runtime": "^7.14.6", - "lodash": "^4.17.21", - "mjml-core": "4.13.0" - } - }, - "mjml-head-font": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/mjml-head-font/-/mjml-head-font-4.13.0.tgz", - "integrity": "sha512-mYn8aWnbrEap5vX2b4662hkUv6WifcYzYn++Yi6OHrJQi55LpzcU+myAGpfQEXXrpU8vGwExMTFKsJq5n2Kaow==", - "requires": { - "@babel/runtime": "^7.14.6", - "lodash": "^4.17.21", - "mjml-core": "4.13.0" - } - }, - "mjml-head-html-attributes": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/mjml-head-html-attributes/-/mjml-head-html-attributes-4.13.0.tgz", - "integrity": "sha512-m30Oro297+18Zou/1qYjagtmCOWtYXeoS38OABQ5zOSzMItE3TcZI9JNcOueIIWIyFCETe8StrTAKcQ2GHwsDw==", - "requires": { - "@babel/runtime": "^7.14.6", - "lodash": "^4.17.21", - "mjml-core": "4.13.0" - } - }, - "mjml-head-preview": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/mjml-head-preview/-/mjml-head-preview-4.13.0.tgz", - "integrity": "sha512-v0K/NocjFCbaoF/0IMVNmiqov91HxqT07vNTEl0Bt9lKFrTKVC01m1S4K7AB78T/bEeJ/HwmNjr1+TMtVNGGow==", - "requires": { - "@babel/runtime": "^7.14.6", - "lodash": "^4.17.21", - "mjml-core": "4.13.0" - } - }, - "mjml-head-style": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/mjml-head-style/-/mjml-head-style-4.13.0.tgz", - "integrity": "sha512-tBa33GL9Atn5bAM2UwE+uxv4rI29WgX/e5lXX+5GWlsb4thmiN6rxpFTNqBqWbBNRbZk4UEZF78M7Da8xC1ZGQ==", - "requires": { - "@babel/runtime": "^7.14.6", - "lodash": "^4.17.21", - "mjml-core": "4.13.0" - } - }, - "mjml-head-title": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/mjml-head-title/-/mjml-head-title-4.13.0.tgz", - "integrity": "sha512-Mq0bjuZXJlwxfVcjuYihQcigZSDTKeQaG3nORR1D0jsOH2BXU4XgUK1UOcTXn2qCBIfRoIMq7rfzYs+L0CRhdw==", - "requires": { - "@babel/runtime": "^7.14.6", - "lodash": "^4.17.21", - "mjml-core": "4.13.0" - } - }, - "mjml-hero": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/mjml-hero/-/mjml-hero-4.13.0.tgz", - "integrity": "sha512-aWEOScdrhyjwdKBWG4XQaElRHP8LU5PtktkpMeBXa4yxrxNs25qRnDqMNkjSrnnmFKWZmQ166tfboY6RBNf0UA==", - "requires": { - "@babel/runtime": "^7.14.6", - "lodash": "^4.17.21", - "mjml-core": "4.13.0" - } - }, - "mjml-image": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/mjml-image/-/mjml-image-4.13.0.tgz", - "integrity": "sha512-agMmm2wRZTIrKwrUnYFlnAbtrKYSP0R2en+Vf92HPspAwmaw3/AeOW/QxmSiMhfGf+xsEJyzVvR/nd33jbT3sg==", - "requires": { - "@babel/runtime": "^7.14.6", - "lodash": "^4.17.21", - "mjml-core": "4.13.0" - } - }, - "mjml-migrate": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/mjml-migrate/-/mjml-migrate-4.13.0.tgz", - "integrity": "sha512-I1euHiAyNpaz+B5vH+Z4T+hg/YtI5p3PqQ3/zTLv8gi24V6BILjTaftWhH5+3R/gQkQhH0NUaWNnRmds+Mq5DQ==", - "requires": { - "@babel/runtime": "^7.14.6", - "js-beautify": "^1.6.14", - "lodash": "^4.17.21", - "mjml-core": "4.13.0", - "mjml-parser-xml": "4.13.0", - "yargs": "^16.1.0" - } - }, - "mjml-navbar": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/mjml-navbar/-/mjml-navbar-4.13.0.tgz", - "integrity": "sha512-0Oqyyk+OdtXfsjswRb/7Ql1UOjN4MbqFPKoyltJqtj+11MRpF5+Wjd74Dj9H7l81GFwkIB9OaP+ZMiD+TPECgg==", - "requires": { - "@babel/runtime": "^7.14.6", - "lodash": "^4.17.21", - "mjml-core": "4.13.0" - } - }, - "mjml-parser-xml": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/mjml-parser-xml/-/mjml-parser-xml-4.13.0.tgz", - "integrity": "sha512-phljtI8DaW++q0aybR/Ykv9zCyP/jCFypxVNo26r2IQo//VYXyc7JuLZZT8N/LAI8lZcwbTVxQPBzJTmZ5IfwQ==", - "requires": { - "@babel/runtime": "^7.14.6", - "detect-node": "2.0.4", - "htmlparser2": "^4.1.0", - "lodash": "^4.17.15" - }, - "dependencies": { - "domhandler": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-3.3.0.tgz", - "integrity": "sha512-J1C5rIANUbuYK+FuFL98650rihynUOEzRLxW+90bKZRWB6A1X1Tf82GxR1qAWLyfNPRvjqfip3Q5tdYlmAa9lA==", - "requires": { - "domelementtype": "^2.0.1" - } - }, - "htmlparser2": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-4.1.0.tgz", - "integrity": "sha512-4zDq1a1zhE4gQso/c5LP1OtrhYTncXNSpvJYtWJBtXAETPlMfi3IFNjGuQbYLuVY4ZR0QMqRVvo4Pdy9KLyP8Q==", - "requires": { - "domelementtype": "^2.0.1", - "domhandler": "^3.0.0", - "domutils": "^2.0.0", - "entities": "^2.0.0" - } - } - } - }, - "mjml-preset-core": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/mjml-preset-core/-/mjml-preset-core-4.13.0.tgz", - "integrity": "sha512-gxzYaKkvUrHuzT1oqjEPSDtdmgEnN99Hf5f1r2CR5aMOB1x66EA3T8ATvF1o7qrBTVV4KMVlQem3IubMSYJZRw==", - "requires": { - "@babel/runtime": "^7.14.6", - "mjml-accordion": "4.13.0", - "mjml-body": "4.13.0", - "mjml-button": "4.13.0", - "mjml-carousel": "4.13.0", - "mjml-column": "4.13.0", - "mjml-divider": "4.13.0", - "mjml-group": "4.13.0", - "mjml-head": "4.13.0", - "mjml-head-attributes": "4.13.0", - "mjml-head-breakpoint": "4.13.0", - "mjml-head-font": "4.13.0", - "mjml-head-html-attributes": "4.13.0", - "mjml-head-preview": "4.13.0", - "mjml-head-style": "4.13.0", - "mjml-head-title": "4.13.0", - "mjml-hero": "4.13.0", - "mjml-image": "4.13.0", - "mjml-navbar": "4.13.0", - "mjml-raw": "4.13.0", - "mjml-section": "4.13.0", - "mjml-social": "4.13.0", - "mjml-spacer": "4.13.0", - "mjml-table": "4.13.0", - "mjml-text": "4.13.0", - "mjml-wrapper": "4.13.0" - } - }, - "mjml-raw": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/mjml-raw/-/mjml-raw-4.13.0.tgz", - "integrity": "sha512-JbBYxwX1a/zbqnCrlDCRNqov2xqUrMCaEdTHfqE2athj479aQXvLKFM20LilTMaClp/dR0yfvFLfFVrC5ej4FQ==", - "requires": { - "@babel/runtime": "^7.14.6", - "lodash": "^4.17.21", - "mjml-core": "4.13.0" - } - }, - "mjml-section": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/mjml-section/-/mjml-section-4.13.0.tgz", - "integrity": "sha512-BLcqlhavtRakKtzDQPLv6Ae4Jt4imYWq/P0jo+Sjk7tP4QifgVA2KEQOirPK5ZUqw/lvK7Afhcths5rXZ2ItnQ==", - "requires": { - "@babel/runtime": "^7.14.6", - "lodash": "^4.17.21", - "mjml-core": "4.13.0" - } - }, - "mjml-social": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/mjml-social/-/mjml-social-4.13.0.tgz", - "integrity": "sha512-zL2a7Wwsk8OXF0Bqu+1B3La1UPwdTMcEXptO8zdh2V5LL6Xb7Gfyvx6w0CmmBtG5IjyCtqaKy5wtrcpG9Hvjfg==", - "requires": { - "@babel/runtime": "^7.14.6", - "lodash": "^4.17.21", - "mjml-core": "4.13.0" - } - }, - "mjml-spacer": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/mjml-spacer/-/mjml-spacer-4.13.0.tgz", - "integrity": "sha512-Acw4QJ0MJ38W4IewXuMX7hLaW1BZaln+gEEuTfrv0xwPdTxX1ILqz4r+s9mYMxYkIDLWMCjBvXyQK6aWlid13A==", - "requires": { - "@babel/runtime": "^7.14.6", - "lodash": "^4.17.21", - "mjml-core": "4.13.0" - } - }, - "mjml-table": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/mjml-table/-/mjml-table-4.13.0.tgz", - "integrity": "sha512-UAWPVMaGReQhf776DFdiwdcJTIHTek3zzQ1pb+E7VlypEYgIpFvdUJ39UIiiflhqtdBATmHwKBOtePwU0MzFMg==", - "requires": { - "@babel/runtime": "^7.14.6", - "lodash": "^4.17.21", - "mjml-core": "4.13.0" - } - }, - "mjml-text": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/mjml-text/-/mjml-text-4.13.0.tgz", - "integrity": "sha512-uDuraaQFdu+6xfuigCimbeznnOnJfwRdcCL1lTBTusTuEvW/5Va6m2D3mnMeEpl+bp4+cxesXIz9st6A9pcg5A==", - "requires": { - "@babel/runtime": "^7.14.6", - "lodash": "^4.17.21", - "mjml-core": "4.13.0" - } - }, - "mjml-validator": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/mjml-validator/-/mjml-validator-4.13.0.tgz", - "integrity": "sha512-uURYfyQYtHJ6Qz/1A7/+E9ezfcoISoLZhYK3olsxKRViwaA2Mm8gy/J3yggZXnsUXWUns7Qymycm5LglLEIiQg==", - "requires": { - "@babel/runtime": "^7.14.6" - } - }, - "mjml-wrapper": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/mjml-wrapper/-/mjml-wrapper-4.13.0.tgz", - "integrity": "sha512-p/44JvHg04rAFR7QDImg8nZucEokIjFH6KJMHxsO0frJtLZ+IuakctzlZAADHsqiR52BwocDsXSa+o9SE2l6Ng==", - "requires": { - "@babel/runtime": "^7.14.6", - "lodash": "^4.17.21", - "mjml-core": "4.13.0", - "mjml-section": "4.13.0" - } - }, - "mkdirp": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", - "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==" - }, - "mnemonist": { - "version": "0.39.5", - "resolved": "https://registry.npmjs.org/mnemonist/-/mnemonist-0.39.5.tgz", - "integrity": "sha512-FPUtkhtJ0efmEFGpU14x7jGbTB+s18LrzRL2KgoWz9YvcY3cPomz8tih01GbHwnGk/OmkOKfqd/RAQoc8Lm7DQ==", - "requires": { - "obliterator": "^2.0.1" - } - }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" - }, - "msgpackr": { - "version": "1.8.3", - "resolved": "https://registry.npmjs.org/msgpackr/-/msgpackr-1.8.3.tgz", - "integrity": "sha512-m2JefwcKNzoHYXkH/5jzHRxAw7XLWsAdvu0FOJ+OLwwozwOV/J6UA62iLkfIMbg7G8+dIuRwgg6oz+QoQ4YkoA==", - "peer": true, - "requires": { - "msgpackr-extract": "^3.0.0" - } - }, - "msgpackr-extract": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/msgpackr-extract/-/msgpackr-extract-3.0.0.tgz", - "integrity": "sha512-oy6KCk1+X4Bn5m6Ycq5N1EWl9npqG/cLrE8ga8NX7ZqfqYUUBS08beCQaGq80fjbKBySur0E6x//yZjzNJDt3A==", - "optional": true, - "peer": true, - "requires": { - "@msgpackr-extract/msgpackr-extract-darwin-arm64": "3.0.0", - "@msgpackr-extract/msgpackr-extract-darwin-x64": "3.0.0", - "@msgpackr-extract/msgpackr-extract-linux-arm": "3.0.0", - "@msgpackr-extract/msgpackr-extract-linux-arm64": "3.0.0", - "@msgpackr-extract/msgpackr-extract-linux-x64": "3.0.0", - "@msgpackr-extract/msgpackr-extract-win32-x64": "3.0.0", - "node-gyp-build-optional-packages": "5.0.7" - } - }, - "mute-stream": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz", - "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==", - "dev": true - }, - "mz": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz", - "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==", - "requires": { - "any-promise": "^1.0.0", - "object-assign": "^4.0.1", - "thenify-all": "^1.0.0" - } - }, - "natural-compare": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", - "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", - "dev": true - }, - "natural-compare-lite": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz", - "integrity": "sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==", - "dev": true - }, - "neo-async": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz", - "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==" - }, - "nest-keycloak-connect": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/nest-keycloak-connect/-/nest-keycloak-connect-1.9.1.tgz", - "integrity": "sha512-IZPq2zEm3MwjX3IqOS607cJMOomF6vg+uKI8D0AipPVN7JzX55Q4B8/3h+OfJWzcfAnpgpeDvkufY/9f4wZUxw==", - "requires": {} - }, - "nestjs-cls": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/nestjs-cls/-/nestjs-cls-2.2.1.tgz", - "integrity": "sha512-UG6gvsRk7m+0k0wnq8YeiJJ8oy00t9Zrvd0q/p/fCFt5GBL5ZGce/CRE1L9ZQqw6BiV8GwgkcSSVrsH9z3rMSQ==", - "requires": {} - }, - "nestjs-grpc-reflection": { - "version": "0.0.18", - "resolved": "https://registry.npmjs.org/nestjs-grpc-reflection/-/nestjs-grpc-reflection-0.0.18.tgz", - "integrity": "sha512-l3JsOqqHPSfJIEjW8s8wNVnsk9apPSH3al0kHQFpHJysOJdBPzyoXjbLNAr8aYHIabG3IPUl3Q2emKRpj5aTfA==", - "requires": { - "google-protobuf": "^3.21.0", - "protobufjs": "^7.0.0", - "reflect-metadata": "^0.1.13", - "rxjs": "^7.5.6", - "ts-case-convert": "^2.0.2" - } - }, - "nestjs-pino": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/nestjs-pino/-/nestjs-pino-3.1.2.tgz", - "integrity": "sha512-Rxt9v/OlHwurE2GPyBlHVjzCLCnxIPxGa+Esligij412zEcqqB6kka5MhKAk3l61u1jyTLx3Mzol+HQrR6/f9w==", - "requires": {} - }, - "nestjs-spelunker": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/nestjs-spelunker/-/nestjs-spelunker-1.1.3.tgz", - "integrity": "sha512-zykE4PRqV/jf0UkgjW6KQC7Zrvgj87MbF9T+9jZs74R4Z/zaYwNlMIMHy3hmS8r6okhGIz7PAF0I2JBYR6HXeA==", - "requires": { - "@ogma/styler": "^1.0.0" - } - }, - "nise": { - "version": "5.1.4", - "resolved": "https://registry.npmjs.org/nise/-/nise-5.1.4.tgz", - "integrity": "sha512-8+Ib8rRJ4L0o3kfmyVCL7gzrohyDe0cMFTBa2d364yIrEGMEoetznKJx899YxjybU6bL9SQkYPSBBs1gyYs8Xg==", - "dev": true, - "requires": { - "@sinonjs/commons": "^2.0.0", - "@sinonjs/fake-timers": "^10.0.2", - "@sinonjs/text-encoding": "^0.7.1", - "just-extend": "^4.0.2", - "path-to-regexp": "^1.7.0" - }, - "dependencies": { - "@sinonjs/commons": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-2.0.0.tgz", - "integrity": "sha512-uLa0j859mMrg2slwQYdO/AkrOfmH+X6LTVmNTS9CqexuE2IvVORIkSpJLqePAbEnKJ77aMmCwr1NUZ57120Xcg==", - "dev": true, - "requires": { - "type-detect": "4.0.8" - } - }, - "@sinonjs/fake-timers": { - "version": "10.0.2", - "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-10.0.2.tgz", - "integrity": "sha512-SwUDyjWnah1AaNl7kxsa7cfLhlTYoiyhDAIgyh+El30YvXs/o7OLXpYH88Zdhyx9JExKrmHDJ+10bwIcY80Jmw==", - "dev": true, - "requires": { - "@sinonjs/commons": "^2.0.0" - } - }, - "path-to-regexp": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.8.0.tgz", - "integrity": "sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==", - "dev": true, - "requires": { - "isarray": "0.0.1" - } - } - } - }, - "no-case": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz", - "integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==", - "requires": { - "lower-case": "^1.1.1" - } - }, - "node-abort-controller": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/node-abort-controller/-/node-abort-controller-3.1.1.tgz", - "integrity": "sha512-AGK2yQKIjRuqnc6VkX2Xj5d+QW8xZ87pa1UK6yA6ouUyuxfHuMP6umE5QK7UmTeOAymo+Zx1Fxiuw9rVx8taHQ==" - }, - "node-emoji": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/node-emoji/-/node-emoji-1.11.0.tgz", - "integrity": "sha512-wo2DpQkQp7Sjm2A0cq+sN7EHKO6Sl0ctXeBdFZrL9T9+UywORbufTcTZxom8YqpLQt/FqNMUkOpkZrJVYSKD3A==", - "dev": true, - "requires": { - "lodash": "^4.17.21" - } - }, - "node-fetch": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.9.tgz", - "integrity": "sha512-DJm/CJkZkRjKKj4Zi4BsKVZh3ValV5IR5s7LVZnW+6YMh0W1BfNA8XSs6DLMGYlId5F3KnA70uu2qepcR08Qqg==", - "requires": { - "whatwg-url": "^5.0.0" - } - }, - "node-forge": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz", - "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==" - }, - "node-gyp-build-optional-packages": { - "version": "5.0.7", - "resolved": "https://registry.npmjs.org/node-gyp-build-optional-packages/-/node-gyp-build-optional-packages-5.0.7.tgz", - "integrity": "sha512-YlCCc6Wffkx0kHkmam79GKvDQ6x+QZkMjFGrIMxgFNILFvGSbCp2fCBC55pGTT9gVaz8Na5CLmxt/urtzRv36w==", - "optional": true, - "peer": true - }, - "node-int64": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz", - "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==", - "dev": true - }, - "node-jose": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/node-jose/-/node-jose-2.1.1.tgz", - "integrity": "sha512-19nyuUGShNmFmVTeqDfP6ZJCiikbcjI0Pw2kykBCH7rl8AZgSiDZK2Ww8EDaMrOSbRg6IlfIMhI5ZvCklmOhzg==", - "requires": { - "base64url": "^3.0.1", - "buffer": "^6.0.3", - "es6-promise": "^4.2.8", - "lodash": "^4.17.21", - "long": "^5.2.0", - "node-forge": "^1.2.1", - "pako": "^2.0.4", - "process": "^0.11.10", - "uuid": "^8.3.2" - }, - "dependencies": { - "long": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/long/-/long-5.2.1.tgz", - "integrity": "sha512-GKSNGeNAtw8IryjjkhZxuKB3JzlcLTwjtiQCHKvqQet81I93kXslhDQruGI/QsddO83mcDToBVy7GqGS/zYf/A==" - } - } - }, - "node-releases": { - "version": "2.0.9", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.9.tgz", - "integrity": "sha512-2xfmOrRkGogbTK9R6Leda0DGiXeY3p2NJpy4+gNCffdUvV6mdEJnaDEic1i3Ec2djAo8jWYoJMR5PB0MSMpxUA==", - "dev": true - }, - "nopt": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-6.0.0.tgz", - "integrity": "sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g==", - "requires": { - "abbrev": "^1.0.0" - } - }, - "normalize-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", - "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==" - }, - "npm-run-path": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", - "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", - "dev": true, - "requires": { - "path-key": "^3.0.0" - } - }, - "nth-check": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz", - "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==", - "requires": { - "boolbase": "^1.0.0" - } - }, - "object-assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==" - }, - "object-hash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz", - "integrity": "sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==" - }, - "object-inspect": { - "version": "1.12.3", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz", - "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==", - "dev": true - }, - "obliterator": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/obliterator/-/obliterator-2.0.4.tgz", - "integrity": "sha512-lgHwxlxV1qIg1Eap7LgIeoBWIMFibOjbrYPIPJZcI1mmGAI2m3lNYpK12Y+GBdPQ0U1hRwSord7GIaawz962qQ==" - }, - "on-exit-leak-free": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/on-exit-leak-free/-/on-exit-leak-free-2.1.0.tgz", - "integrity": "sha512-VuCaZZAjReZ3vUwgOB8LxAosIurDiAW0s13rI1YwmaP++jvcxP77AWoQvenZebpCA2m8WC1/EosPYPMjnRAp/w==" - }, - "once": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", - "requires": { - "wrappy": "1" - } - }, - "onetime": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", - "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", - "dev": true, - "requires": { - "mimic-fn": "^2.1.0" - } - }, - "optionator": { - "version": "0.9.1", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz", - "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==", - "dev": true, - "requires": { - "deep-is": "^0.1.3", - "fast-levenshtein": "^2.0.6", - "levn": "^0.4.1", - "prelude-ls": "^1.2.1", - "type-check": "^0.4.0", - "word-wrap": "^1.2.3" - } - }, - "ora": { - "version": "5.4.1", - "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz", - "integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==", - "dev": true, - "requires": { - "bl": "^4.1.0", - "chalk": "^4.1.0", - "cli-cursor": "^3.1.0", - "cli-spinners": "^2.5.0", - "is-interactive": "^1.0.0", - "is-unicode-supported": "^0.1.0", - "log-symbols": "^4.1.0", - "strip-ansi": "^6.0.0", - "wcwidth": "^1.0.1" - }, - "dependencies": { - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - } - } - }, - "os-name": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/os-name/-/os-name-4.0.1.tgz", - "integrity": "sha512-xl9MAoU97MH1Xt5K9ERft2YfCAoaO6msy1OBA0ozxEC0x0TmIoE6K3QvgJMMZA9yKGLmHXNY/YZoDbiGDj4zYw==", - "dev": true, - "requires": { - "macos-release": "^2.5.0", - "windows-release": "^4.0.0" - } - }, - "os-tmpdir": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", - "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==", - "dev": true - }, - "p-limit": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", - "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", - "requires": { - "yocto-queue": "^0.1.0" - } - }, - "p-locate": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", - "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", - "dev": true, - "requires": { - "p-limit": "^3.0.2" - } - }, - "p-try": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", - "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", - "dev": true - }, - "packet-reader": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/packet-reader/-/packet-reader-1.0.0.tgz", - "integrity": "sha512-HAKu/fG3HpHFO0AA8WE8q2g+gBJaZ9MG7fcKk+IJPLTGAD6Psw4443l+9DGRbOIh3/aXr7Phy0TjilYivJo5XQ==" - }, - "pako": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/pako/-/pako-2.1.0.tgz", - "integrity": "sha512-w+eufiZ1WuJYgPXbV/PO3NCMEc3xqylkKHzp8bxp1uW4qaSNQUkwmLLEc3kKsfz8lpV1F8Ht3U1Cm+9Srog2ug==" - }, - "param-case": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/param-case/-/param-case-2.1.1.tgz", - "integrity": "sha512-eQE845L6ot89sk2N8liD8HAuH4ca6Vvr7VWAWwt7+kvvG5aBcPmmphQ68JsEG2qa9n1TykS2DLeMt363AAH8/w==", - "requires": { - "no-case": "^2.2.0" - } - }, - "parent-module": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", - "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", - "dev": true, - "requires": { - "callsites": "^3.0.0" - } - }, - "parse-json": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", - "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.0.0", - "error-ex": "^1.3.1", - "json-parse-even-better-errors": "^2.3.0", - "lines-and-columns": "^1.1.6" - } - }, - "parse5": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.1.tgz", - "integrity": "sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==" - }, - "parse5-htmlparser2-tree-adapter": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz", - "integrity": "sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA==", - "requires": { - "parse5": "^6.0.1" - }, - "dependencies": { - "parse5": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz", - "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==" - } - } - }, - "path-exists": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", - "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", - "dev": true - }, - "path-is-absolute": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==" - }, - "path-key": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", - "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", - "dev": true - }, - "path-parse": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", - "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", - "dev": true - }, - "path-to-regexp": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-3.2.0.tgz", - "integrity": "sha512-jczvQbCUS7XmS7o+y1aEO9OBVFeZBQ1MDSEqmO7xSoPgOPoowY/SxLpZ6Vh97/8qHZOteiCKb7gkG9gA2ZUxJA==" - }, - "path-type": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", - "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", - "dev": true - }, - "pend": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz", - "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==", - "optional": true - }, - "pg": { - "version": "8.9.0", - "resolved": "https://registry.npmjs.org/pg/-/pg-8.9.0.tgz", - "integrity": "sha512-ZJM+qkEbtOHRuXjmvBtOgNOXOtLSbxiMiUVMgE4rV6Zwocy03RicCVvDXgx8l4Biwo8/qORUnEqn2fdQzV7KCg==", - "requires": { - "buffer-writer": "2.0.0", - "packet-reader": "1.0.0", - "pg-connection-string": "^2.5.0", - "pg-pool": "^3.5.2", - "pg-protocol": "^1.6.0", - "pg-types": "^2.1.0", - "pgpass": "1.x" - } - }, - "pg-connection-string": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.5.0.tgz", - "integrity": "sha512-r5o/V/ORTA6TmUnyWZR9nCj1klXCO2CEKNRlVuJptZe85QuhFayC7WeMic7ndayT5IRIR0S0xFxFi2ousartlQ==" - }, - "pg-int8": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/pg-int8/-/pg-int8-1.0.1.tgz", - "integrity": "sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw==" - }, - "pg-pool": { - "version": "3.5.2", - "resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-3.5.2.tgz", - "integrity": "sha512-His3Fh17Z4eg7oANLob6ZvH8xIVen3phEZh2QuyrIl4dQSDVEabNducv6ysROKpDNPSD+12tONZVWfSgMvDD9w==", - "requires": {} - }, - "pg-protocol": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.6.0.tgz", - "integrity": "sha512-M+PDm637OY5WM307051+bsDia5Xej6d9IR4GwJse1qA1DIhiKlksvrneZOYQq42OM+spubpcNYEo2FcKQrDk+Q==" - }, - "pg-types": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/pg-types/-/pg-types-2.2.0.tgz", - "integrity": "sha512-qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA==", - "requires": { - "pg-int8": "1.0.1", - "postgres-array": "~2.0.0", - "postgres-bytea": "~1.0.0", - "postgres-date": "~1.0.4", - "postgres-interval": "^1.1.0" - } - }, - "pgpass": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/pgpass/-/pgpass-1.0.5.tgz", - "integrity": "sha512-FdW9r/jQZhSeohs1Z3sI1yxFQNFvMcnmfuj4WBMUTxOrAyLMaTcE1aAMBiTlbMNaXvBCQuVi0R7hd8udDSP7ug==", - "requires": { - "split2": "^4.1.0" - } - }, - "picocolors": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", - "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==", - "dev": true - }, - "picomatch": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", - "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==" - }, - "pino": { - "version": "8.8.0", - "resolved": "https://registry.npmjs.org/pino/-/pino-8.8.0.tgz", - "integrity": "sha512-cF8iGYeu2ODg2gIwgAHcPrtR63ILJz3f7gkogaHC/TXVVXxZgInmNYiIpDYEwgEkxZti2Se6P2W2DxlBIZe6eQ==", - "requires": { - "atomic-sleep": "^1.0.0", - "fast-redact": "^3.1.1", - "on-exit-leak-free": "^2.1.0", - "pino-abstract-transport": "v1.0.0", - "pino-std-serializers": "^6.0.0", - "process-warning": "^2.0.0", - "quick-format-unescaped": "^4.0.3", - "real-require": "^0.2.0", - "safe-stable-stringify": "^2.3.1", - "sonic-boom": "^3.1.0", - "thread-stream": "^2.0.0" - } - }, - "pino-abstract-transport": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/pino-abstract-transport/-/pino-abstract-transport-1.0.0.tgz", - "integrity": "sha512-c7vo5OpW4wIS42hUVcT5REsL8ZljsUfBjqV/e2sFxmFEFZiq1XLUp5EYLtuDH6PEHq9W1egWqRbnLUP5FuZmOA==", - "requires": { - "readable-stream": "^4.0.0", - "split2": "^4.0.0" - } - }, - "pino-http": { - "version": "8.3.2", - "resolved": "https://registry.npmjs.org/pino-http/-/pino-http-8.3.2.tgz", - "integrity": "sha512-L6cQxP+d3IT2l7hCrlLOtvSFIYAX8iEAlGto7ahvVWumiiQ4aDCN23rmYGoImKGvBCyZpK07eHKtmuVq5L5SFQ==", - "peer": true, - "requires": { - "get-caller-file": "^2.0.5", - "pino": "^8.0.0", - "pino-std-serializers": "^6.0.0", - "process-warning": "^2.0.0" - } - }, - "pino-pretty": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/pino-pretty/-/pino-pretty-8.1.0.tgz", - "integrity": "sha512-oKfI8qKXR2a3haHs/X8iB6QSnWLqoOGAjwxIAXem4+XOGIGNw7IKpozId1uE7j89Rj46HIfWnGbAgmQmr8+yRw==", - "dev": true, - "requires": { - "colorette": "^2.0.7", - "dateformat": "^4.6.3", - "fast-copy": "^2.1.1", - "fast-safe-stringify": "^2.1.1", - "help-me": "^4.0.1", - "joycon": "^3.1.1", - "minimist": "^1.2.6", - "on-exit-leak-free": "^1.0.0", - "pino-abstract-transport": "^1.0.0", - "pump": "^3.0.0", - "readable-stream": "^4.0.0", - "secure-json-parse": "^2.4.0", - "sonic-boom": "^3.0.0", - "strip-json-comments": "^3.1.1" - }, - "dependencies": { - "on-exit-leak-free": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/on-exit-leak-free/-/on-exit-leak-free-1.0.0.tgz", - "integrity": "sha512-Ve8ubhrXRdnuCJ5bQSQpP3uaV43K1PMcOfSRC1pqHgRZommXCgsXwh08jVC5NpjwScE23BPDwDvVg4cov3mwjw==", - "dev": true - } - } - }, - "pino-std-serializers": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/pino-std-serializers/-/pino-std-serializers-6.1.0.tgz", - "integrity": "sha512-KO0m2f1HkrPe9S0ldjx7za9BJjeHqBku5Ch8JyxETxT8dEFGz1PwgrHaOQupVYitpzbFSYm7nnljxD8dik2c+g==" - }, - "pirates": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.5.tgz", - "integrity": "sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ==", - "dev": true - }, - "pkg-dir": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", - "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", - "dev": true, - "requires": { - "find-up": "^4.0.0" - }, - "dependencies": { - "find-up": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", - "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", - "dev": true, - "requires": { - "locate-path": "^5.0.0", - "path-exists": "^4.0.0" - } - }, - "locate-path": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", - "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", - "dev": true, - "requires": { - "p-locate": "^4.1.0" - } - }, - "p-limit": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", - "dev": true, - "requires": { - "p-try": "^2.0.0" - } - }, - "p-locate": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", - "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", - "dev": true, - "requires": { - "p-limit": "^2.2.0" - } - } - } - }, - "pluralize": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-8.0.0.tgz", - "integrity": "sha512-Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA==", - "dev": true - }, - "postgres-array": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/postgres-array/-/postgres-array-2.0.0.tgz", - "integrity": "sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA==" - }, - "postgres-bytea": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/postgres-bytea/-/postgres-bytea-1.0.0.tgz", - "integrity": "sha512-xy3pmLuQqRBZBXDULy7KbaitYqLcmxigw14Q5sj8QBVLqEwXfeybIKVWiqAXTlcvdvb0+xkOtDbfQMOf4lST1w==" - }, - "postgres-date": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/postgres-date/-/postgres-date-1.0.7.tgz", - "integrity": "sha512-suDmjLVQg78nMK2UZ454hAG+OAW+HQPZ6n++TNDUX+L0+uUlLywnoxJKDou51Zm+zTCjrCl0Nq6J9C5hP9vK/Q==" - }, - "postgres-interval": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/postgres-interval/-/postgres-interval-1.2.0.tgz", - "integrity": "sha512-9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ==", - "requires": { - "xtend": "^4.0.0" - } - }, - "prelude-ls": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", - "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", - "dev": true - }, - "prettier": { - "version": "2.8.3", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.3.tgz", - "integrity": "sha512-tJ/oJ4amDihPoufT5sM0Z1SKEuKay8LfVAMlbbhnnkvt6BUserZylqo2PN+p9KeljLr0OHa2rXHU1T8reeoTrw==", - "dev": true - }, - "prettier-linter-helpers": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz", - "integrity": "sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==", - "dev": true, - "requires": { - "fast-diff": "^1.1.2" - } - }, - "pretty-format": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz", - "integrity": "sha512-8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q==", - "dev": true, - "requires": { - "@jest/schemas": "^28.1.3", - "ansi-regex": "^5.0.1", - "ansi-styles": "^5.0.0", - "react-is": "^18.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", - "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", - "dev": true - } - } - }, - "process": { - "version": "0.11.10", - "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", - "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==" - }, - "process-warning": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/process-warning/-/process-warning-2.1.0.tgz", - "integrity": "sha512-9C20RLxrZU/rFnxWncDkuF6O999NdIf3E1ws4B0ZeY3sRVPzWBMsYDE2lxjxhiXxg464cQTgKUGm8/i6y2YGXg==" - }, - "prompts": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz", - "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==", - "dev": true, - "requires": { - "kleur": "^3.0.3", - "sisteransi": "^1.0.5" - } - }, - "proto-list": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz", - "integrity": "sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==" - }, - "protobufjs": { - "version": "7.2.1", - "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.2.1.tgz", - "integrity": "sha512-L3pCItypTnPK27+CS8nuhZMYtsY+i8dqdq2vZsYHlG17CnWp1DWPQ/sos0vOKrj1fHEAzo3GBqSHLaeZyKUCDA==", - "requires": { - "@protobufjs/aspromise": "^1.1.2", - "@protobufjs/base64": "^1.1.2", - "@protobufjs/codegen": "^2.0.4", - "@protobufjs/eventemitter": "^1.1.0", - "@protobufjs/fetch": "^1.1.0", - "@protobufjs/float": "^1.0.2", - "@protobufjs/inquire": "^1.1.0", - "@protobufjs/path": "^1.1.2", - "@protobufjs/pool": "^1.1.0", - "@protobufjs/utf8": "^1.1.0", - "@types/node": ">=13.7.0", - "long": "^5.0.0" - }, - "dependencies": { - "long": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/long/-/long-5.2.1.tgz", - "integrity": "sha512-GKSNGeNAtw8IryjjkhZxuKB3JzlcLTwjtiQCHKvqQet81I93kXslhDQruGI/QsddO83mcDToBVy7GqGS/zYf/A==" - } - } - }, - "proxy-addr": { - "version": "2.0.7", - "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", - "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==", - "requires": { - "forwarded": "0.2.0", - "ipaddr.js": "1.9.1" - } - }, - "proxy-from-env": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", - "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" - }, - "pseudomap": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", - "integrity": "sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==" - }, - "pump": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", - "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", - "devOptional": true, - "requires": { - "end-of-stream": "^1.1.0", - "once": "^1.3.1" - } - }, - "punycode": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz", - "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==" - }, - "qs": { - "version": "6.11.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz", - "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==", - "dev": true, - "requires": { - "side-channel": "^1.0.4" - } - }, - "queue-microtask": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", - "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", - "dev": true - }, - "quick-format-unescaped": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/quick-format-unescaped/-/quick-format-unescaped-4.0.4.tgz", - "integrity": "sha512-tYC1Q1hgyRuHgloV/YXs2w15unPVh8qfu/qCTfhTYamaw7fyhumKa2yGpdSo87vY32rIclj+4fWYQXUMs9EHvg==" - }, - "randombytes": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", - "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==", - "dev": true, - "requires": { - "safe-buffer": "^5.1.0" - } - }, - "react-is": { - "version": "18.2.0", - "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz", - "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==", - "dev": true - }, - "readable-stream": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.3.0.tgz", - "integrity": "sha512-MuEnA0lbSi7JS8XM+WNJlWZkHAAdm7gETHdFK//Q/mChGyj2akEFtdLZh32jSdkWGbRwCW9pn6g3LWDdDeZnBQ==", - "requires": { - "abort-controller": "^3.0.0", - "buffer": "^6.0.3", - "events": "^3.3.0", - "process": "^0.11.10" - } - }, - "readdirp": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", - "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", - "requires": { - "picomatch": "^2.2.1" - } - }, - "real-require": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/real-require/-/real-require-0.2.0.tgz", - "integrity": "sha512-57frrGM/OCTLqLOAh0mhVA9VBMHd+9U7Zb2THMGdBUoZVOtGbJzjxsYGDJ3A9AYYCP4hn6y1TVbaOfzWtm5GFg==" - }, - "rechoir": { - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz", - "integrity": "sha512-HFM8rkZ+i3zrV+4LQjwQ0W+ez98pApMGM3HUrN04j3CqzPOzl9nmP15Y8YXNm8QHGv/eacOVEjqhmWpkRV0NAw==", - "dev": true, - "requires": { - "resolve": "^1.1.6" - } - }, - "redis": { - "version": "4.6.4", - "resolved": "https://registry.npmjs.org/redis/-/redis-4.6.4.tgz", - "integrity": "sha512-wi2tgDdQ+Q8q+PR5FLRx4QvDiWaA+PoJbrzsyFqlClN5R4LplHqN3scs/aGjE//mbz++W19SgxiEnQ27jnCRaA==", - "requires": { - "@redis/bloom": "1.2.0", - "@redis/client": "1.5.5", - "@redis/graph": "1.1.0", - "@redis/json": "1.0.4", - "@redis/search": "1.1.1", - "@redis/time-series": "1.0.4" - } - }, - "redis-errors": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/redis-errors/-/redis-errors-1.2.0.tgz", - "integrity": "sha512-1qny3OExCf0UvUV/5wpYKf2YwPcOqXzkwKKSmKHiE6ZMQs5heeE/c8eXK+PNllPvmjgAbfnsbpkGZWy8cBpn9w==", - "peer": true - }, - "redis-parser": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/redis-parser/-/redis-parser-3.0.0.tgz", - "integrity": "sha512-DJnGAeenTdpMEH6uAJRK/uiyEIH9WVsUmoLwzudwGJUwZPp80PDBWPHXSAGNPwNvIXAbe7MSUB1zQFugFml66A==", - "peer": true, - "requires": { - "redis-errors": "^1.0.0" - } - }, - "reflect-metadata": { - "version": "0.1.13", - "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.13.tgz", - "integrity": "sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg==" - }, - "regenerator-runtime": { - "version": "0.13.11", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz", - "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==" - }, - "regexpp": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz", - "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==", - "dev": true - }, - "relateurl": { - "version": "0.2.7", - "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz", - "integrity": "sha512-G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog==" - }, - "require-directory": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", - "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==" - }, - "require-from-string": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", - "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==" - }, - "resolve": { - "version": "1.22.1", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz", - "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==", - "dev": true, - "requires": { - "is-core-module": "^2.9.0", - "path-parse": "^1.0.7", - "supports-preserve-symlinks-flag": "^1.0.0" - } - }, - "resolve-cwd": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz", - "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==", - "dev": true, - "requires": { - "resolve-from": "^5.0.0" - }, - "dependencies": { - "resolve-from": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", - "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", - "dev": true - } - } - }, - "resolve-from": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", - "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", - "dev": true - }, - "resolve.exports": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-1.1.1.tgz", - "integrity": "sha512-/NtpHNDN7jWhAaQ9BvBUYZ6YTXsRBgfqWFWP7BZBaoMJO/I3G5OFzvTuWNlZC3aPjins1F+TNrLKsGbH4rfsRQ==", - "dev": true - }, - "restore-cursor": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", - "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==", - "dev": true, - "requires": { - "onetime": "^5.1.0", - "signal-exit": "^3.0.2" - } - }, - "ret": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/ret/-/ret-0.2.2.tgz", - "integrity": "sha512-M0b3YWQs7R3Z917WRQy1HHA7Ba7D8hvZg6UE5mLykJxQVE2ju0IXbGlaHPPlkY+WN7wFP+wUMXmBFA0aV6vYGQ==" - }, - "reusify": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", - "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==" - }, - "rfdc": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.3.0.tgz", - "integrity": "sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==" - }, - "rimraf": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", - "requires": { - "glob": "^7.1.3" - }, - "dependencies": { - "glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - } - } - }, - "run-async": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz", - "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==", - "dev": true - }, - "run-parallel": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", - "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", - "dev": true, - "requires": { - "queue-microtask": "^1.2.2" - } - }, - "rxjs": { - "version": "7.8.0", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.0.tgz", - "integrity": "sha512-F2+gxDshqmIub1KdvZkaEfGDwLNpPvk9Fs6LD/MyQxNgMds/WH9OdDDXOmxUZpME+iSK3rQCctkL0DYyytUqMg==", - "requires": { - "tslib": "^2.1.0" - } - }, - "safe-buffer": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==" - }, - "safe-regex2": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/safe-regex2/-/safe-regex2-2.0.0.tgz", - "integrity": "sha512-PaUSFsUaNNuKwkBijoAPHAK6/eM6VirvyPWlZ7BAQy4D+hCvh4B6lIG+nPdhbFfIbP+gTGBcrdsOaUs0F+ZBOQ==", - "requires": { - "ret": "~0.2.0" - } - }, - "safe-stable-stringify": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.4.2.tgz", - "integrity": "sha512-gMxvPJYhP0O9n2pvcfYfIuYgbledAOJFcqRThtPRmjscaipiwcwPPKLytpVzMkG2HAN87Qmo2d4PtGiri1dSLA==" - }, - "safer-buffer": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" - }, - "sax": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", - "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==" - }, - "schema-utils": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz", - "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==", - "dev": true, - "requires": { - "@types/json-schema": "^7.0.8", - "ajv": "^6.12.5", - "ajv-keywords": "^3.5.2" - }, - "dependencies": { - "ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", - "dev": true, - "requires": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - } - }, - "ajv-keywords": { - "version": "3.5.2", - "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", - "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", - "dev": true, - "requires": {} - }, - "json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true - } - } - }, - "secure-json-parse": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/secure-json-parse/-/secure-json-parse-2.7.0.tgz", - "integrity": "sha512-6aU+Rwsezw7VR8/nyvKTx8QpWH9FrcYiXXlqC4z5d5XQBDRqtbfsRjnwGyqbi3gddNtWHuEk9OANUotL26qKUw==" - }, - "semver": { - "version": "7.5.4", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", - "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", - "requires": { - "lru-cache": "^6.0.0" - }, - "dependencies": { - "lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "requires": { - "yallist": "^4.0.0" - } - }, - "yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" - } - } - }, - "serialize-javascript": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.1.tgz", - "integrity": "sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==", - "dev": true, - "requires": { - "randombytes": "^2.1.0" - } - }, - "set-cookie-parser": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-2.5.1.tgz", - "integrity": "sha512-1jeBGaKNGdEq4FgIrORu/N570dwoPYio8lSoYLWmX7sQ//0JY08Xh9o5pBcgmHQ/MbsYp/aZnOe1s1lIsbLprQ==" - }, - "setprototypeof": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", - "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==" - }, - "sha.js": { - "version": "2.4.11", - "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz", - "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==", - "requires": { - "inherits": "^2.0.1", - "safe-buffer": "^5.0.1" - } - }, - "shebang-command": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", - "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", - "dev": true, - "requires": { - "shebang-regex": "^3.0.0" - } - }, - "shebang-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", - "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", - "dev": true - }, - "shelljs": { - "version": "0.8.5", - "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.5.tgz", - "integrity": "sha512-TiwcRcrkhHvbrZbnRcFYMLl30Dfov3HKqzp5tO5b4pt6G/SezKcYhmDg15zXVBswHmctSAQKznqNW2LO5tTDow==", - "dev": true, - "requires": { - "glob": "^7.0.0", - "interpret": "^1.0.0", - "rechoir": "^0.6.2" - }, - "dependencies": { - "glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "dev": true, - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - } - } - }, - "side-channel": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", - "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==", - "dev": true, - "requires": { - "call-bind": "^1.0.0", - "get-intrinsic": "^1.0.2", - "object-inspect": "^1.9.0" - } - }, - "sigmund": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz", - "integrity": "sha512-fCvEXfh6NWpm+YSuY2bpXb/VIihqWA6hLsgboC+0nl71Q7N7o2eaCW8mJa/NLvQhs6jpd3VZV4UiUQlV6+lc8g==" - }, - "signal-exit": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", - "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", - "dev": true - }, - "sinon": { - "version": "14.0.2", - "resolved": "https://registry.npmjs.org/sinon/-/sinon-14.0.2.tgz", - "integrity": "sha512-PDpV0ZI3ZCS3pEqx0vpNp6kzPhHrLx72wA0G+ZLaaJjLIYeE0n8INlgaohKuGy7hP0as5tbUd23QWu5U233t+w==", - "dev": true, - "requires": { - "@sinonjs/commons": "^2.0.0", - "@sinonjs/fake-timers": "^9.1.2", - "@sinonjs/samsam": "^7.0.1", - "diff": "^5.0.0", - "nise": "^5.1.2", - "supports-color": "^7.2.0" - }, - "dependencies": { - "@sinonjs/commons": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-2.0.0.tgz", - "integrity": "sha512-uLa0j859mMrg2slwQYdO/AkrOfmH+X6LTVmNTS9CqexuE2IvVORIkSpJLqePAbEnKJ77aMmCwr1NUZ57120Xcg==", - "dev": true, - "requires": { - "type-detect": "4.0.8" - } - } - } - }, - "sisteransi": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz", - "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==", - "dev": true - }, - "slash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", - "dev": true - }, - "slick": { - "version": "1.12.2", - "resolved": "https://registry.npmjs.org/slick/-/slick-1.12.2.tgz", - "integrity": "sha512-4qdtOGcBjral6YIBCWJ0ljFSKNLz9KkhbWtuGvUyRowl1kxfuE1x/Z/aJcaiilpb3do9bl5K7/1h9XC5wWpY/A==" - }, - "sonic-boom": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/sonic-boom/-/sonic-boom-3.2.1.tgz", - "integrity": "sha512-iITeTHxy3B9FGu8aVdiDXUVAcHMF9Ss0cCsAOo2HfCrmVGT3/DT5oYaeu0M/YKZDlKTvChEyPq0zI9Hf33EX6A==", - "requires": { - "atomic-sleep": "^1.0.0" - } - }, - "source-map": { - "version": "0.7.4", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz", - "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==", - "dev": true - }, - "source-map-support": { - "version": "0.5.21", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", - "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", - "requires": { - "buffer-from": "^1.0.0", - "source-map": "^0.6.0" - }, - "dependencies": { - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" - } - } - }, - "sourcemap-codec": { - "version": "1.4.8", - "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz", - "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==", - "dev": true - }, - "split2": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/split2/-/split2-4.1.0.tgz", - "integrity": "sha512-VBiJxFkxiXRlUIeyMQi8s4hgvKCSjtknJv/LVYbrgALPwf5zSKmEwV9Lst25AkvMDnvxODugjdl6KZgwKM1WYQ==" - }, - "sprintf-js": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==", - "dev": true - }, - "stack-utils": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz", - "integrity": "sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==", - "dev": true, - "requires": { - "escape-string-regexp": "^2.0.0" - }, - "dependencies": { - "escape-string-regexp": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz", - "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==", - "dev": true - } - } - }, - "standard-as-callback": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/standard-as-callback/-/standard-as-callback-2.1.0.tgz", - "integrity": "sha512-qoRRSyROncaz1z0mvYqIE4lCd9p2R90i6GxW3uZv5ucSu8tU7B5HXUP1gG8pVZsYNVaXjk8ClXHPttLyxAL48A==", - "peer": true - }, - "statuses": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", - "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==" - }, - "stream-wormhole": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/stream-wormhole/-/stream-wormhole-1.1.0.tgz", - "integrity": "sha512-gHFfL3px0Kctd6Po0M8TzEvt3De/xu6cnRrjlfYNhwbhLPLwigI2t1nc6jrzNuaYg5C4YF78PPFuQPzRiqn9ew==" - }, - "string_decoder": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", - "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", - "dev": true, - "requires": { - "safe-buffer": "~5.2.0" - } - }, - "string-length": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz", - "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==", - "dev": true, - "requires": { - "char-regex": "^1.0.2", - "strip-ansi": "^6.0.0" - } - }, - "string-width": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "requires": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - } - }, - "strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "requires": { - "ansi-regex": "^5.0.1" - } - }, - "strip-bom": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz", - "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==", - "dev": true - }, - "strip-final-newline": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", - "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==", - "dev": true - }, - "strip-json-comments": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", - "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", - "dev": true - }, - "strnum": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/strnum/-/strnum-1.0.5.tgz", - "integrity": "sha512-J8bbNyKKXl5qYcR36TIO8W3mVGVHrmmxsd5PAItGkmyzwJvybiw2IVq5nqd0i4LSNSkB/sx9VHllbfFdr9k1JA==" - }, - "superagent": { - "version": "8.0.9", - "resolved": "https://registry.npmjs.org/superagent/-/superagent-8.0.9.tgz", - "integrity": "sha512-4C7Bh5pyHTvU33KpZgwrNKh/VQnvgtCSqPRfJAUdmrtSYePVzVg4E4OzsrbkhJj9O7SO6Bnv75K/F8XVZT8YHA==", - "dev": true, - "requires": { - "component-emitter": "^1.3.0", - "cookiejar": "^2.1.4", - "debug": "^4.3.4", - "fast-safe-stringify": "^2.1.1", - "form-data": "^4.0.0", - "formidable": "^2.1.2", - "methods": "^1.1.2", - "mime": "2.6.0", - "qs": "^6.11.0", - "semver": "^7.3.8" - }, - "dependencies": { - "mime": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz", - "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==", - "dev": true - } - } - }, - "supertest": { - "version": "6.3.3", - "resolved": "https://registry.npmjs.org/supertest/-/supertest-6.3.3.tgz", - "integrity": "sha512-EMCG6G8gDu5qEqRQ3JjjPs6+FYT1a7Hv5ApHvtSghmOFJYtsU5S+pSb6Y2EUeCEY3CmEL3mmQ8YWlPOzQomabA==", - "dev": true, - "requires": { - "methods": "^1.1.2", - "superagent": "^8.0.5" - } - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "requires": { - "has-flag": "^4.0.0" - } - }, - "supports-hyperlinks": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.3.0.tgz", - "integrity": "sha512-RpsAZlpWcDwOPQA22aCH4J0t7L8JmAvsCxfOSEwm7cQs3LshN36QaTkwd70DnBOXDWGssw2eUoc8CaRWT0XunA==", - "dev": true, - "requires": { - "has-flag": "^4.0.0", - "supports-color": "^7.0.0" - } - }, - "supports-preserve-symlinks-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", - "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", - "dev": true - }, - "swagger-ui-dist": { - "version": "4.15.5", - "resolved": "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-4.15.5.tgz", - "integrity": "sha512-V3eIa28lwB6gg7/wfNvAbjwJYmDXy1Jo1POjyTzlB6wPcHiGlRxq39TSjYGVjQrUSAzpv+a7nzp7mDxgNy57xA==" - }, - "symbol-observable": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-4.0.0.tgz", - "integrity": "sha512-b19dMThMV4HVFynSAM1++gBHAbk2Tc/osgLIBZMKsyqh34jb2e8Os7T6ZW/Bt3pJFdBTd2JwAnAAEQV7rSNvcQ==", - "dev": true - }, - "tapable": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz", - "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==", - "dev": true - }, - "tcp-port-used": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/tcp-port-used/-/tcp-port-used-1.0.2.tgz", - "integrity": "sha512-l7ar8lLUD3XS1V2lfoJlCBaeoaWo/2xfYt81hM7VlvR4RrMVFqfmzfhLVk40hAb368uitje5gPtBRL1m/DGvLA==", - "optional": true, - "requires": { - "debug": "4.3.1", - "is2": "^2.0.6" - }, - "dependencies": { - "debug": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", - "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", - "optional": true, - "requires": { - "ms": "2.1.2" - } - } - } - }, - "terminal-link": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/terminal-link/-/terminal-link-2.1.1.tgz", - "integrity": "sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==", - "dev": true, - "requires": { - "ansi-escapes": "^4.2.1", - "supports-hyperlinks": "^2.0.0" - } - }, - "terser": { - "version": "5.16.2", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.16.2.tgz", - "integrity": "sha512-JKuM+KvvWVqT7muHVyrwv7FVRPnmHDwF6XwoIxdbF5Witi0vu99RYpxDexpJndXt3jbZZmmWr2/mQa6HvSNdSg==", - "dev": true, - "requires": { - "@jridgewell/source-map": "^0.3.2", - "acorn": "^8.5.0", - "commander": "^2.20.0", - "source-map-support": "~0.5.20" - }, - "dependencies": { - "commander": { - "version": "2.20.3", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", - "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", - "dev": true - } - } - }, - "terser-webpack-plugin": { - "version": "5.3.6", - "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.6.tgz", - "integrity": "sha512-kfLFk+PoLUQIbLmB1+PZDMRSZS99Mp+/MHqDNmMA6tOItzRt+Npe3E+fsMs5mfcM0wCtrrdU387UnV+vnSffXQ==", - "dev": true, - "requires": { - "@jridgewell/trace-mapping": "^0.3.14", - "jest-worker": "^27.4.5", - "schema-utils": "^3.1.1", - "serialize-javascript": "^6.0.0", - "terser": "^5.14.1" - }, - "dependencies": { - "jest-worker": { - "version": "27.5.1", - "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz", - "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==", - "dev": true, - "requires": { - "@types/node": "*", - "merge-stream": "^2.0.0", - "supports-color": "^8.0.0" - } - }, - "supports-color": { - "version": "8.1.1", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", - "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "test-exclude": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz", - "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==", - "dev": true, - "requires": { - "@istanbuljs/schema": "^0.1.2", - "glob": "^7.1.4", - "minimatch": "^3.0.4" - }, - "dependencies": { - "glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "dev": true, - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - } - } - }, - "text-decoding": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/text-decoding/-/text-decoding-1.0.0.tgz", - "integrity": "sha512-/0TJD42KDnVwKmDK6jj3xP7E2MG7SHAOG4tyTgyUCRPdHwvkquYNLEQltmdMa3owq3TkddCVcTsoctJI8VQNKA==" - }, - "text-table": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", - "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", - "dev": true - }, - "thenify": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz", - "integrity": "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==", - "requires": { - "any-promise": "^1.0.0" - } - }, - "thenify-all": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz", - "integrity": "sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==", - "requires": { - "thenify": ">= 3.1.0 < 4" - } - }, - "thread-stream": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/thread-stream/-/thread-stream-2.3.0.tgz", - "integrity": "sha512-kaDqm1DET9pp3NXwR8382WHbnpXnRkN9xGN9dQt3B2+dmXiW8X1SOwmFOxAErEQ47ObhZ96J6yhZNXuyCOL7KA==", - "requires": { - "real-require": "^0.2.0" - } - }, - "through": { - "version": "2.3.8", - "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", - "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==", - "dev": true - }, - "tiny-lru": { - "version": "10.0.1", - "resolved": "https://registry.npmjs.org/tiny-lru/-/tiny-lru-10.0.1.tgz", - "integrity": "sha512-Vst+6kEsWvb17Zpz14sRJV/f8bUWKhqm6Dc+v08iShmIJ/WxqWytHzCTd6m88pS33rE2zpX34TRmOpAJPloNCA==" - }, - "tmp": { - "version": "0.0.33", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", - "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", - "dev": true, - "requires": { - "os-tmpdir": "~1.0.2" - } - }, - "tmpl": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz", - "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==", - "dev": true - }, - "to-fast-properties": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", - "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==", - "dev": true - }, - "to-regex-range": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", - "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", - "requires": { - "is-number": "^7.0.0" - } - }, - "toidentifier": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", - "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==" - }, - "tr46": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", - "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" - }, - "tree-kill": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz", - "integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==", - "dev": true - }, - "ts-case-convert": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/ts-case-convert/-/ts-case-convert-2.0.2.tgz", - "integrity": "sha512-vdKfx1VAdpvEBOBv5OpVu5ZFqRg9HdTI4sYt6qqMeICBeNyXvitrarCnFWNDAki51IKwCyx+ZssY46Q9jH5otA==" - }, - "ts-jest": { - "version": "28.0.5", - "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-28.0.5.tgz", - "integrity": "sha512-Sx9FyP9pCY7pUzQpy4FgRZf2bhHY3za576HMKJFs+OnQ9jS96Du5vNsDKkyedQkik+sEabbKAnCliv9BEsHZgQ==", - "dev": true, - "requires": { - "bs-logger": "0.x", - "fast-json-stable-stringify": "2.x", - "jest-util": "^28.0.0", - "json5": "^2.2.1", - "lodash.memoize": "4.x", - "make-error": "1.x", - "semver": "7.x", - "yargs-parser": "^21.0.1" - } - }, - "ts-loader": { - "version": "9.4.2", - "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-9.4.2.tgz", - "integrity": "sha512-OmlC4WVmFv5I0PpaxYb+qGeGOdm5giHU7HwDDUjw59emP2UYMHy9fFSDcYgSNoH8sXcj4hGCSEhlDZ9ULeDraA==", - "dev": true, - "requires": { - "chalk": "^4.1.0", - "enhanced-resolve": "^5.0.0", - "micromatch": "^4.0.0", - "semver": "^7.3.4" - }, - "dependencies": { - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - } - } - }, - "ts-node": { - "version": "10.9.1", - "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.1.tgz", - "integrity": "sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==", - "devOptional": true, - "requires": { - "@cspotcode/source-map-support": "^0.8.0", - "@tsconfig/node10": "^1.0.7", - "@tsconfig/node12": "^1.0.7", - "@tsconfig/node14": "^1.0.0", - "@tsconfig/node16": "^1.0.2", - "acorn": "^8.4.1", - "acorn-walk": "^8.1.1", - "arg": "^4.1.0", - "create-require": "^1.1.0", - "diff": "^4.0.1", - "make-error": "^1.1.1", - "v8-compile-cache-lib": "^3.0.1", - "yn": "3.1.1" - }, - "dependencies": { - "diff": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", - "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==", - "devOptional": true - } - } - }, - "ts-poet": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/ts-poet/-/ts-poet-6.3.0.tgz", - "integrity": "sha512-RjS37SnXMa9En8xvQf//+rvNNNCB7x2TKP/ZfsiQFidtfN3A6FYgPDESe4r7YA3F663XO2ozx+2buQItGOLMxg==", - "requires": { - "dprint-node": "^1.0.7" - } - }, - "ts-proto": { - "version": "1.139.0", - "resolved": "https://registry.npmjs.org/ts-proto/-/ts-proto-1.139.0.tgz", - "integrity": "sha512-DXfRVbsEnzan/tpb7RxuJOgjhzwuxDsyXbYSnF8JHCIDcJ/JxeqeUyDUVICFGmgqrsPcnjn5t3iqOUZRNRm9tg==", - "requires": { - "@types/object-hash": "^1.3.0", - "case-anything": "^2.1.10", - "dataloader": "^1.4.0", - "object-hash": "^1.3.1", - "protobufjs": "^6.11.3", - "ts-poet": "^6.2.0", - "ts-proto-descriptors": "1.7.1" - }, - "dependencies": { - "object-hash": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-1.3.1.tgz", - "integrity": "sha512-OSuu/pU4ENM9kmREg0BdNrUDIl1heYa4mBZacJc+vVWz4GtAwu7jO8s4AIt2aGRUTqxykpWzI3Oqnsm13tTMDA==" + "optional": true }, - "protobufjs": { - "version": "6.11.3", - "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.11.3.tgz", - "integrity": "sha512-xL96WDdCZYdU7Slin569tFX712BxsxslWwAfAhCYjQKGTq7dAU91Lomy6nLLhh/dyGhk/YH4TwTSRxTzhuHyZg==", - "requires": { - "@protobufjs/aspromise": "^1.1.2", - "@protobufjs/base64": "^1.1.2", - "@protobufjs/codegen": "^2.0.4", - "@protobufjs/eventemitter": "^1.1.0", - "@protobufjs/fetch": "^1.1.0", - "@protobufjs/float": "^1.0.2", - "@protobufjs/inquire": "^1.1.0", - "@protobufjs/path": "^1.1.2", - "@protobufjs/pool": "^1.1.0", - "@protobufjs/utf8": "^1.1.0", - "@types/long": "^4.0.1", - "@types/node": ">=13.7.0", - "long": "^4.0.0" - } - } - } - }, - "ts-proto-descriptors": { - "version": "1.7.1", - "resolved": "https://registry.npmjs.org/ts-proto-descriptors/-/ts-proto-descriptors-1.7.1.tgz", - "integrity": "sha512-oIKUh3K4Xts4v29USGLfUG+2mEk32MsqpgZAOUyUlkrcIdv34yE+k2oZ2Nzngm6cV/JgFdOxRCqeyvmWHuYAyw==", - "requires": { - "long": "^4.0.0", - "protobufjs": "^6.8.8" - }, - "dependencies": { - "protobufjs": { - "version": "6.11.3", - "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.11.3.tgz", - "integrity": "sha512-xL96WDdCZYdU7Slin569tFX712BxsxslWwAfAhCYjQKGTq7dAU91Lomy6nLLhh/dyGhk/YH4TwTSRxTzhuHyZg==", - "requires": { - "@protobufjs/aspromise": "^1.1.2", - "@protobufjs/base64": "^1.1.2", - "@protobufjs/codegen": "^2.0.4", - "@protobufjs/eventemitter": "^1.1.0", - "@protobufjs/fetch": "^1.1.0", - "@protobufjs/float": "^1.0.2", - "@protobufjs/inquire": "^1.1.0", - "@protobufjs/path": "^1.1.2", - "@protobufjs/pool": "^1.1.0", - "@protobufjs/utf8": "^1.1.0", - "@types/long": "^4.0.1", - "@types/node": ">=13.7.0", - "long": "^4.0.0" - } + "typeorm-aurora-data-api-driver": { + "optional": true } } }, - "ts-protoc-gen": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/ts-protoc-gen/-/ts-protoc-gen-0.15.0.tgz", - "integrity": "sha512-TycnzEyrdVDlATJ3bWFTtra3SCiEP0W0vySXReAuEygXCUr1j2uaVyL0DhzjwuUdQoW5oXPwk6oZWeA0955V+g==", - "requires": { - "google-protobuf": "^3.15.5" + "node_modules/typeorm-naming-strategies": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/typeorm-naming-strategies/-/typeorm-naming-strategies-4.1.0.tgz", + "integrity": "sha512-vPekJXzZOTZrdDvTl1YoM+w+sUIfQHG4kZTpbFYoTsufyv9NIBRe4Q+PdzhEAFA2std3D9LZHEb1EjE9zhRpiQ==", + "peerDependencies": { + "typeorm": "^0.2.0 || ^0.3.0" } }, - "tsconfig-paths": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-4.0.0.tgz", - "integrity": "sha512-SLBg2GBKlR6bVtMgJJlud/o3waplKtL7skmLkExomIiaAtLGtVsoXIqP3SYdjbcH9lq/KVv7pMZeCBpLYOit6Q==", - "dev": true, - "requires": { - "json5": "^2.2.1", - "minimist": "^1.2.6", - "strip-bom": "^3.0.0" + "node_modules/typescript": { + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz", + "integrity": "sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==", + "devOptional": true, + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" }, - "dependencies": { - "strip-bom": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", - "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==", - "dev": true - } - } - }, - "tsconfig-paths-webpack-plugin": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/tsconfig-paths-webpack-plugin/-/tsconfig-paths-webpack-plugin-4.0.0.tgz", - "integrity": "sha512-fw/7265mIWukrSHd0i+wSwx64kYUSAKPfxRDksjKIYTxSAp9W9/xcZVBF4Kl0eqQd5eBpAQ/oQrc5RyM/0c1GQ==", - "dev": true, - "requires": { - "chalk": "^4.1.0", - "enhanced-resolve": "^5.7.0", - "tsconfig-paths": "^4.0.0" - }, - "dependencies": { - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - } + "engines": { + "node": ">=14.17" } }, - "tslib": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.0.tgz", - "integrity": "sha512-7At1WUettjcSRHXCyYtTselblcHl9PJFFVKiCAy/bY97+BPZXSQ2wbq0P9s8tK2G7dFQfNnlJnPAiArVBVBsfA==" - }, - "tsutils": { - "version": "3.21.0", - "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz", - "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==", - "dev": true, - "requires": { - "tslib": "^1.8.1" + "node_modules/uglify-js": { + "version": "3.17.4", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.4.tgz", + "integrity": "sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==", + "bin": { + "uglifyjs": "bin/uglifyjs" }, - "dependencies": { - "tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", - "dev": true - } + "engines": { + "node": ">=0.8.0" } }, - "type-check": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", - "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", - "dev": true, - "requires": { - "prelude-ls": "^1.2.1" + "node_modules/uid": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/uid/-/uid-2.0.2.tgz", + "integrity": "sha512-u3xV3X7uzvi5b1MncmZo3i2Aw222Zk1keqLA1YkHldREkAhAqi65wuPfe7lHx8H/Wzy+8CE7S7uS3jekIM5s8g==", + "dependencies": { + "@lukeed/csprng": "^1.0.0" + }, + "engines": { + "node": ">=8" } }, - "type-detect": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", - "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==", - "dev": true - }, - "type-fest": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", - "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", - "dev": true + "node_modules/undici-types": { + "version": "5.26.5", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", + "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==" }, - "typeorm": { - "version": "0.3.11", - "resolved": "https://registry.npmjs.org/typeorm/-/typeorm-0.3.11.tgz", - "integrity": "sha512-pzdOyWbVuz/z8Ww6gqvBW4nylsM0KLdUCDExr2gR20/x1khGSVxQkjNV/3YqliG90jrWzrknYbYscpk8yxFJVg==", - "requires": { - "@sqltools/formatter": "^1.2.2", - "app-root-path": "^3.0.0", - "buffer": "^6.0.3", - "chalk": "^4.1.0", - "cli-highlight": "^2.1.11", - "date-fns": "^2.28.0", - "debug": "^4.3.3", - "dotenv": "^16.0.0", - "glob": "^7.2.0", - "js-yaml": "^4.1.0", - "mkdirp": "^1.0.4", - "reflect-metadata": "^0.1.13", - "sha.js": "^2.4.11", - "tslib": "^2.3.1", - "uuid": "^8.3.2", - "xml2js": "^0.4.23", - "yargs": "^17.3.1" - }, + "node_modules/unionfs": { + "version": "4.5.1", + "resolved": "https://registry.npmjs.org/unionfs/-/unionfs-4.5.1.tgz", + "integrity": "sha512-hn8pzkh0/80mpsIT/YBJKa4+BF/9pNh0IgysBi0CjL95Uok8Hus69TNfgeJckoUNwfTpBq26+F7edO1oBINaIw==", + "dev": true, "dependencies": { - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "cliui": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", - "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", - "requires": { - "string-width": "^4.2.0", - "strip-ansi": "^6.0.1", - "wrap-ansi": "^7.0.0" - } - }, - "glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, - "yargs": { - "version": "17.6.2", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.6.2.tgz", - "integrity": "sha512-1/9UrdHjDZc0eOU0HxOHoS78C69UD3JRMvzlJ7S79S2nTaWRA/whGCTV8o9e/N/1Va9YIV7Q4sOxD8VV4pCWOw==", - "requires": { - "cliui": "^8.0.1", - "escalade": "^3.1.1", - "get-caller-file": "^2.0.5", - "require-directory": "^2.1.1", - "string-width": "^4.2.3", - "y18n": "^5.0.5", - "yargs-parser": "^21.1.1" - } - } + "fs-monkey": "^1.0.0" } }, - "typeorm-naming-strategies": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/typeorm-naming-strategies/-/typeorm-naming-strategies-4.1.0.tgz", - "integrity": "sha512-vPekJXzZOTZrdDvTl1YoM+w+sUIfQHG4kZTpbFYoTsufyv9NIBRe4Q+PdzhEAFA2std3D9LZHEb1EjE9zhRpiQ==", - "requires": {} - }, - "typescript": { - "version": "4.7.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.7.4.tgz", - "integrity": "sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ==", - "devOptional": true - }, - "uglify-js": { - "version": "3.17.4", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.4.tgz", - "integrity": "sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==" - }, - "uid": { + "node_modules/universalify": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/uid/-/uid-2.0.1.tgz", - "integrity": "sha512-PF+1AnZgycpAIEmNtjxGBVmKbZAQguaa4pBUq6KNaGEcpzZ2klCNZLM34tsjp76maN00TttiiUf6zkIBpJQm2A==", - "requires": { - "@lukeed/csprng": "^1.0.0" + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", + "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", + "dev": true, + "engines": { + "node": ">= 10.0.0" } }, - "unionfs": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/unionfs/-/unionfs-4.4.0.tgz", - "integrity": "sha512-N+TuJHJ3PjmzIRCE1d2N3VN4qg/P78eh/nxzwHnzpg3W2Mvf8Wvi7J1mvv6eNkb8neUeSdFSQsKna0eXVyF4+w==", + "node_modules/untildify": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/untildify/-/untildify-4.0.0.tgz", + "integrity": "sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==", "dev": true, - "requires": { - "fs-monkey": "^1.0.0" + "engines": { + "node": ">=8" } }, - "universalify": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", - "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==", - "dev": true - }, - "update-browserslist-db": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz", - "integrity": "sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==", + "node_modules/update-browserslist-db": { + "version": "1.0.13", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz", + "integrity": "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==", "dev": true, - "requires": { + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/browserslist" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "dependencies": { "escalade": "^3.1.1", "picocolors": "^1.0.0" + }, + "bin": { + "update-browserslist-db": "cli.js" + }, + "peerDependencies": { + "browserslist": ">= 4.21.0" } }, - "upper-case": { + "node_modules/upper-case": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz", "integrity": "sha512-WRbjgmYzgXkCV7zNVpy5YgrHgbBv126rMALQQMrmzOVC4GM2waQ9x7xtm8VU+1yF2kWyPzI9zbZ48n4vSxwfSA==" }, - "uri-js": { + "node_modules/uri-js": { "version": "4.4.1", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", - "requires": { + "dependencies": { "punycode": "^2.1.0" } }, - "util-deprecate": { + "node_modules/util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", "dev": true }, - "uuid": { - "version": "8.3.2", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", - "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==" + "node_modules/uuid": { + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz", + "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==", + "funding": [ + "https://github.com/sponsors/broofa", + "https://github.com/sponsors/ctavan" + ], + "bin": { + "uuid": "dist/bin/uuid" + } }, - "v8-compile-cache-lib": { + "node_modules/v8-compile-cache-lib": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz", "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==", "devOptional": true }, - "v8-to-istanbul": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.0.1.tgz", - "integrity": "sha512-74Y4LqY74kLE6IFyIjPtkSTWzUZmj8tdHT9Ii/26dvQ6K9Dl2NbEfj0XgU2sHCtKgt5VupqhlO/5aWuqS+IY1w==", + "node_modules/v8-to-istanbul": { + "version": "9.1.3", + "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.1.3.tgz", + "integrity": "sha512-9lDD+EVI2fjFsMWXc6dy5JJzBsVTcQ2fVkfBvncZ6xJWG9wtBhOldG+mHkSL0+V1K/xgZz0JDO5UT5hFwHUghg==", "dev": true, - "requires": { + "dependencies": { "@jridgewell/trace-mapping": "^0.3.12", "@types/istanbul-lib-coverage": "^2.0.1", - "convert-source-map": "^1.6.0" + "convert-source-map": "^2.0.0" + }, + "engines": { + "node": ">=10.12.0" } }, - "valid-data-url": { + "node_modules/valid-data-url": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/valid-data-url/-/valid-data-url-3.0.1.tgz", - "integrity": "sha512-jOWVmzVceKlVVdwjNSenT4PbGghU0SBIizAev8ofZVgivk/TVHXSbNL8LP6M3spZvkR9/QolkyJavGSX5Cs0UA==" + "integrity": "sha512-jOWVmzVceKlVVdwjNSenT4PbGghU0SBIizAev8ofZVgivk/TVHXSbNL8LP6M3spZvkR9/QolkyJavGSX5Cs0UA==", + "engines": { + "node": ">=10" + } + }, + "node_modules/validator": { + "version": "13.11.0", + "resolved": "https://registry.npmjs.org/validator/-/validator-13.11.0.tgz", + "integrity": "sha512-Ii+sehpSfZy+At5nPdnyMhx78fEoPDkR2XW/zimHEL3MyGJQOCQ7WeP20jPYRz7ZCpcKLB21NxuXHF3bxjStBQ==", + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/walker": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz", + "integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==", + "dev": true, + "dependencies": { + "makeerror": "1.0.12" + } + }, + "node_modules/watchpack": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz", + "integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==", + "dev": true, + "dependencies": { + "glob-to-regexp": "^0.4.1", + "graceful-fs": "^4.1.2" + }, + "engines": { + "node": ">=10.13.0" + } + }, + "node_modules/wcwidth": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz", + "integrity": "sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==", + "dev": true, + "dependencies": { + "defaults": "^1.0.3" + } + }, + "node_modules/web-resource-inliner": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/web-resource-inliner/-/web-resource-inliner-6.0.1.tgz", + "integrity": "sha512-kfqDxt5dTB1JhqsCUQVFDj0rmY+4HLwGQIsLPbyrsN9y9WV/1oFDSx3BQ4GfCv9X+jVeQ7rouTqwK53rA/7t8A==", + "dependencies": { + "ansi-colors": "^4.1.1", + "escape-goat": "^3.0.0", + "htmlparser2": "^5.0.0", + "mime": "^2.4.6", + "node-fetch": "^2.6.0", + "valid-data-url": "^3.0.0" + }, + "engines": { + "node": ">=10.0.0" + } + }, + "node_modules/web-resource-inliner/node_modules/dom-serializer": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz", + "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==", + "dependencies": { + "domelementtype": "^2.0.1", + "domhandler": "^4.2.0", + "entities": "^2.0.0" + }, + "funding": { + "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1" + } + }, + "node_modules/web-resource-inliner/node_modules/dom-serializer/node_modules/domhandler": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz", + "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==", + "dependencies": { + "domelementtype": "^2.2.0" + }, + "engines": { + "node": ">= 4" + }, + "funding": { + "url": "https://github.com/fb55/domhandler?sponsor=1" + } + }, + "node_modules/web-resource-inliner/node_modules/domhandler": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-3.3.0.tgz", + "integrity": "sha512-J1C5rIANUbuYK+FuFL98650rihynUOEzRLxW+90bKZRWB6A1X1Tf82GxR1qAWLyfNPRvjqfip3Q5tdYlmAa9lA==", + "dependencies": { + "domelementtype": "^2.0.1" + }, + "engines": { + "node": ">= 4" + }, + "funding": { + "url": "https://github.com/fb55/domhandler?sponsor=1" + } }, - "validator": { - "version": "13.9.0", - "resolved": "https://registry.npmjs.org/validator/-/validator-13.9.0.tgz", - "integrity": "sha512-B+dGG8U3fdtM0/aNK4/X8CXq/EcxU2WPrPEkJGslb47qyHsxmbggTWK0yEA4qnYVNF+nxNlN88o14hIcPmSIEA==" + "node_modules/web-resource-inliner/node_modules/domutils": { + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz", + "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==", + "dependencies": { + "dom-serializer": "^1.0.1", + "domelementtype": "^2.2.0", + "domhandler": "^4.2.0" + }, + "funding": { + "url": "https://github.com/fb55/domutils?sponsor=1" + } }, - "walker": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz", - "integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==", - "dev": true, - "requires": { - "makeerror": "1.0.12" + "node_modules/web-resource-inliner/node_modules/domutils/node_modules/domhandler": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz", + "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==", + "dependencies": { + "domelementtype": "^2.2.0" + }, + "engines": { + "node": ">= 4" + }, + "funding": { + "url": "https://github.com/fb55/domhandler?sponsor=1" } }, - "watchpack": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz", - "integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==", - "dev": true, - "requires": { - "glob-to-regexp": "^0.4.1", - "graceful-fs": "^4.1.2" + "node_modules/web-resource-inliner/node_modules/entities": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz", + "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==", + "funding": { + "url": "https://github.com/fb55/entities?sponsor=1" } }, - "wcwidth": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz", - "integrity": "sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==", - "dev": true, - "requires": { - "defaults": "^1.0.3" + "node_modules/web-resource-inliner/node_modules/htmlparser2": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-5.0.1.tgz", + "integrity": "sha512-vKZZra6CSe9qsJzh0BjBGXo8dvzNsq/oGvsjfRdOrrryfeD9UOBEEQdeoqCRmKZchF5h2zOBMQ6YuQ0uRUmdbQ==", + "dependencies": { + "domelementtype": "^2.0.1", + "domhandler": "^3.3.0", + "domutils": "^2.4.2", + "entities": "^2.0.0" + }, + "funding": { + "url": "https://github.com/fb55/htmlparser2?sponsor=1" } }, - "web-resource-inliner": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/web-resource-inliner/-/web-resource-inliner-5.0.0.tgz", - "integrity": "sha512-AIihwH+ZmdHfkJm7BjSXiEClVt4zUFqX4YlFAzjL13wLtDuUneSaFvDBTbdYRecs35SiU7iNKbMnN+++wVfb6A==", - "requires": { - "ansi-colors": "^4.1.1", - "escape-goat": "^3.0.0", - "htmlparser2": "^4.0.0", - "mime": "^2.4.6", - "node-fetch": "^2.6.0", - "valid-data-url": "^3.0.0" + "node_modules/web-resource-inliner/node_modules/mime": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz", + "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==", + "bin": { + "mime": "cli.js" }, - "dependencies": { - "domhandler": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-3.3.0.tgz", - "integrity": "sha512-J1C5rIANUbuYK+FuFL98650rihynUOEzRLxW+90bKZRWB6A1X1Tf82GxR1qAWLyfNPRvjqfip3Q5tdYlmAa9lA==", - "requires": { - "domelementtype": "^2.0.1" - } - }, - "htmlparser2": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-4.1.0.tgz", - "integrity": "sha512-4zDq1a1zhE4gQso/c5LP1OtrhYTncXNSpvJYtWJBtXAETPlMfi3IFNjGuQbYLuVY4ZR0QMqRVvo4Pdy9KLyP8Q==", - "requires": { - "domelementtype": "^2.0.1", - "domhandler": "^3.0.0", - "domutils": "^2.0.0", - "entities": "^2.0.0" - } - }, - "mime": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz", - "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==" - } + "engines": { + "node": ">=4.0.0" } }, - "webidl-conversions": { + "node_modules/webidl-conversions": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" }, - "webpack": { - "version": "5.75.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.75.0.tgz", - "integrity": "sha512-piaIaoVJlqMsPtX/+3KTTO6jfvrSYgauFVdt8cr9LTHKmcq/AMd4mhzsiP7ZF/PGRNPGA8336jldh9l2Kt2ogQ==", + "node_modules/webpack": { + "version": "5.89.0", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.89.0.tgz", + "integrity": "sha512-qyfIC10pOr70V+jkmud8tMfajraGCZMBWJtrmuBymQKCrLTRejBI8STDp1MCyZu/QTdZSeacCQYpYNQVOzX5kw==", "dev": true, - "requires": { + "dependencies": { "@types/eslint-scope": "^3.7.3", - "@types/estree": "^0.0.51", - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/wasm-edit": "1.11.1", - "@webassemblyjs/wasm-parser": "1.11.1", + "@types/estree": "^1.0.0", + "@webassemblyjs/ast": "^1.11.5", + "@webassemblyjs/wasm-edit": "^1.11.5", + "@webassemblyjs/wasm-parser": "^1.11.5", "acorn": "^8.7.1", - "acorn-import-assertions": "^1.7.6", + "acorn-import-assertions": "^1.9.0", "browserslist": "^4.14.5", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^5.10.0", - "es-module-lexer": "^0.9.0", + "enhanced-resolve": "^5.15.0", + "es-module-lexer": "^1.2.1", "eslint-scope": "5.1.1", "events": "^3.2.0", "glob-to-regexp": "^0.4.1", @@ -22727,204 +13380,291 @@ "loader-runner": "^4.2.0", "mime-types": "^2.1.27", "neo-async": "^2.6.2", - "schema-utils": "^3.1.0", + "schema-utils": "^3.2.0", "tapable": "^2.1.1", - "terser-webpack-plugin": "^5.1.3", + "terser-webpack-plugin": "^5.3.7", "watchpack": "^2.4.0", "webpack-sources": "^3.2.3" + }, + "bin": { + "webpack": "bin/webpack.js" + }, + "engines": { + "node": ">=10.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, + "peerDependenciesMeta": { + "webpack-cli": { + "optional": true + } } }, - "webpack-node-externals": { + "node_modules/webpack-node-externals": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/webpack-node-externals/-/webpack-node-externals-3.0.0.tgz", "integrity": "sha512-LnL6Z3GGDPht/AigwRh2dvL9PQPFQ8skEpVrWZXLWBYmqcaojHNN0onvHzie6rq7EWKrrBfPYqNEzTJgiwEQDQ==", - "dev": true + "dev": true, + "engines": { + "node": ">=6" + } }, - "webpack-sources": { + "node_modules/webpack-sources": { "version": "3.2.3", "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz", "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==", - "dev": true + "dev": true, + "engines": { + "node": ">=10.13.0" + } + }, + "node_modules/webpack/node_modules/eslint-scope": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", + "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", + "dev": true, + "dependencies": { + "esrecurse": "^4.3.0", + "estraverse": "^4.1.1" + }, + "engines": { + "node": ">=8.0.0" + } + }, + "node_modules/webpack/node_modules/estraverse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", + "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", + "dev": true, + "engines": { + "node": ">=4.0" + } }, - "whatwg-url": { + "node_modules/whatwg-url": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", - "requires": { + "dependencies": { "tr46": "~0.0.3", "webidl-conversions": "^3.0.0" } }, - "which": { + "node_modules/which": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", - "dev": true, - "requires": { + "dependencies": { "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/node-which" + }, + "engines": { + "node": ">= 8" } }, - "windows-release": { + "node_modules/windows-release": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/windows-release/-/windows-release-4.0.0.tgz", "integrity": "sha512-OxmV4wzDKB1x7AZaZgXMVsdJ1qER1ed83ZrTYd5Bwq2HfJVg3DJS8nqlAG4sMoJ7mu8cuRmLEYyU13BKwctRAg==", "dev": true, - "requires": { + "dependencies": { "execa": "^4.0.2" }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/windows-release/node_modules/execa": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz", + "integrity": "sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==", + "dev": true, + "dependencies": { + "cross-spawn": "^7.0.0", + "get-stream": "^5.0.0", + "human-signals": "^1.1.1", + "is-stream": "^2.0.0", + "merge-stream": "^2.0.0", + "npm-run-path": "^4.0.0", + "onetime": "^5.1.0", + "signal-exit": "^3.0.2", + "strip-final-newline": "^2.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sindresorhus/execa?sponsor=1" + } + }, + "node_modules/windows-release/node_modules/get-stream": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", + "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", + "dev": true, "dependencies": { - "execa": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz", - "integrity": "sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==", - "dev": true, - "requires": { - "cross-spawn": "^7.0.0", - "get-stream": "^5.0.0", - "human-signals": "^1.1.1", - "is-stream": "^2.0.0", - "merge-stream": "^2.0.0", - "npm-run-path": "^4.0.0", - "onetime": "^5.1.0", - "signal-exit": "^3.0.2", - "strip-final-newline": "^2.0.0" - } - }, - "get-stream": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", - "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", - "dev": true, - "requires": { - "pump": "^3.0.0" - } - }, - "human-signals": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz", - "integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==", - "dev": true - } + "pump": "^3.0.0" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, - "word-wrap": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", - "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==", - "dev": true + "node_modules/windows-release/node_modules/human-signals": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz", + "integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==", + "dev": true, + "engines": { + "node": ">=8.12.0" + } }, - "wordwrap": { + "node_modules/wordwrap": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", "integrity": "sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==" }, - "wrap-ansi": { + "node_modules/wrap-ansi": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", + "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/wrap-ansi-cjs": { + "name": "wrap-ansi", "version": "7.0.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", - "requires": { + "dependencies": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" } }, - "wrappy": { + "node_modules/wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==" }, - "write-file-atomic": { + "node_modules/write-file-atomic": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz", "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==", "dev": true, - "requires": { + "dependencies": { "imurmurhash": "^0.1.4", "signal-exit": "^3.0.7" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" } }, - "xml2js": { - "version": "0.4.23", - "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz", - "integrity": "sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==", - "requires": { - "sax": ">=0.6.0", - "xmlbuilder": "~11.0.0" - } - }, - "xmlbuilder": { - "version": "11.0.1", - "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz", - "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==" - }, - "xtend": { + "node_modules/xtend": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", - "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==" + "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==", + "engines": { + "node": ">=0.4" + } }, - "y18n": { + "node_modules/y18n": { "version": "5.0.8", "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", - "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==" + "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", + "engines": { + "node": ">=10" + } }, - "yallist": { + "node_modules/yallist": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", "dev": true }, - "yaml": { - "version": "1.10.2", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz", - "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==", - "dev": true + "node_modules/yaml": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.3.tgz", + "integrity": "sha512-zw0VAJxgeZ6+++/su5AFoqBbZbrEakwu+X0M5HmcwUiBL7AzcuPKjj5we4xfQLp78LkEMpD0cOnUhmgOVy3KdQ==", + "engines": { + "node": ">= 14" + } }, - "yargs": { - "version": "16.2.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", - "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", - "requires": { - "cliui": "^7.0.2", + "node_modules/yargs": { + "version": "17.7.2", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", + "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==", + "dependencies": { + "cliui": "^8.0.1", "escalade": "^3.1.1", "get-caller-file": "^2.0.5", "require-directory": "^2.1.1", - "string-width": "^4.2.0", + "string-width": "^4.2.3", "y18n": "^5.0.5", - "yargs-parser": "^20.2.2" + "yargs-parser": "^21.1.1" }, - "dependencies": { - "yargs-parser": { - "version": "20.2.9", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", - "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==" - } + "engines": { + "node": ">=12" } }, - "yargs-parser": { + "node_modules/yargs-parser": { "version": "21.1.1", "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", - "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==" + "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", + "engines": { + "node": ">=12" + } }, - "yauzl": { + "node_modules/yauzl": { "version": "2.10.0", "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz", "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==", "optional": true, - "requires": { + "dependencies": { "buffer-crc32": "~0.2.3", "fd-slicer": "~1.1.0" } }, - "yn": { + "node_modules/yn": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz", "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==", - "devOptional": true + "devOptional": true, + "engines": { + "node": ">=6" + } }, - "yocto-queue": { + "node_modules/yocto-queue": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", - "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==" + "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } } } } diff --git a/services/package.json b/services/package.json index 2ca98fea5e..9a2ed7ec33 100644 --- a/services/package.json +++ b/services/package.json @@ -21,91 +21,91 @@ "alcs:start:prod": "node dist/apps/alcs/main TZ=UTC", "alcs:import": "nest start alcs TZ=UTC -- import", "alcs:graph": "nest start TZ=UTC -- graph", - "alcs:typeorm": "typeorm-ts-node-esm -d apps/alcs/src/providers/typeorm/datasource.cli.orm.config.ts", + "alcs:typeorm": "ts-node -r tsconfig-paths/register ./node_modules/typeorm/cli.js -d apps/alcs/src/providers/typeorm/datasource.cli.orm.config.ts", "alcs:typeorm:cli": "node --require ts-node/register ./node_modules/typeorm/cli.js", "alcs:migration:generate": "npm run alcs:typeorm -- migration:generate apps/alcs/src/providers/typeorm/migrations/$npm_config_name", "alcs:migration:create": "npm run alcs:typeorm:cli migration:create apps/alcs/src/providers/typeorm/migrations/$npm_config_name", "alcs:migration:run": "npm run alcs:typeorm migration:run" }, "dependencies": { - "@automapper/classes": "^8.7.7", - "@automapper/core": "^8.7.0", - "@automapper/nestjs": "^8.7.7", - "@aws-sdk/client-s3": "^3.264.0", - "@aws-sdk/s3-request-presigner": "^3.264.0", - "@fastify/cors": "^8.2.0", - "@fastify/helmet": "^10.1.0", - "@fastify/multipart": "^7.4.1", - "@fastify/static": "^6.8.0", + "@aws-sdk/client-s3": "^3.441.0", + "@aws-sdk/s3-request-presigner": "^3.441.0", + "@fastify/cors": "^8.4.1", + "@fastify/helmet": "^11.1.1", + "@fastify/multipart": "^8.0.0", + "@fastify/static": "^6.12.0", "@grpc/grpc-js": "^1.8.7", "@grpc/proto-loader": "^0.7.4", - "@nestjs/axios": "^0.1.1", + "@nestjs/axios": "^3.0.1", "@nestjs/bullmq": "^10.0.1", - "@nestjs/common": "^9.3.1", - "@nestjs/config": "^2.3.0", - "@nestjs/core": "^9.3.1", - "@nestjs/microservices": "^9.3.1", - "@nestjs/platform-fastify": "^9.3.1", - "@nestjs/swagger": "^6.1.4", - "@nestjs/typeorm": "^9.0.1", - "@types/clamscan": "^2.0.5", + "@nestjs/common": "^10.2.8", + "@nestjs/config": "^3.1.1", + "@nestjs/core": "^10.2.8", + "@nestjs/microservices": "^10.2.8", + "@nestjs/platform-fastify": "^10.2.8", + "@nestjs/swagger": "^7.1.14", + "@nestjs/typeorm": "^10.0.0", + "@types/clamscan": "^2.0.6", + "automapper-classes": "^8.7.11", + "automapper-core": "^8.7.11", + "automapper-nestjs": "^8.7.11", "clamscan": "^2.1.2", "class-transformer": "^0.5.1", "class-validator": "^0.14.0", "config": "^3.3.9", "csv-parser": "^3.0.0", - "dayjs": "^1.11.7", - "handlebars": "^4.7.7", - "keycloak-connect": "^18.0.2", - "mjml": "^4.13.0", - "nest-keycloak-connect": "^1.9.1", - "nestjs-cls": "^2.2.1", + "dayjs": "^1.11.10", + "handlebars": "^4.7.8", + "keycloak-connect": "^21.1.2", + "mjml": "^4.14.1", + "nest-keycloak-connect": "^1.9.2", + "nestjs-cls": "^3.6.0", "nestjs-grpc-reflection": "^0.0.18", - "nestjs-pino": "^3.1.2", - "nestjs-spelunker": "^1.1.3", - "node-jose": "^2.1.1", - "pg": "^8.9.0", - "redis": "^4.6.4", + "nestjs-pino": "^3.5.0", + "nestjs-spelunker": "^1.3.0", + "node-jose": "^2.2.0", + "pg": "^8.11.3", + "redis": "^4.6.10", "reflect-metadata": "^0.1.13", - "rimraf": "^3.0.2", - "rxjs": "^7.8.0", + "rimraf": "^5.0.5", + "rxjs": "^7.8.1", "source-map-support": "^0.5.21", - "ts-proto": "^1.139.0", + "ts-proto": "^1.163.0", "ts-protoc-gen": "^0.15.0", - "typeorm": "^0.3.11", + "typeorm": "^0.3.17", "typeorm-naming-strategies": "^4.1.0", - "uuid": "^8.3.2" + "uuid": "^9.0.1" }, "devDependencies": { "@golevelup/nestjs-testing": "^0.1.2", - "@nestjs/cli": "^9.1.9", - "@nestjs/schematics": "^9.0.4", - "@nestjs/testing": "^9.3.1", - "@types/config": "^0.0.41", - "@types/express": "^4.17.16", - "@types/jest": "28.1.4", - "@types/node": "^18.11.18", - "@types/node-jose": "^1.1.10", - "@types/source-map-support": "^0.5.6", - "@types/supertest": "^2.0.12", - "@types/uuid": "^8.3.4", - "@typescript-eslint/eslint-plugin": "^5.50.0", - "@typescript-eslint/parser": "^5.50.0", + "@nestjs/cli": "^10.2.1", + "@nestjs/schematics": "^10.0.3", + "@nestjs/testing": "^10.2.8", + "@types/config": "^3.3.2", + "@types/express": "^4.17.20", + "@types/jest": "^29.5.7", + "@types/node": "^20.8.10", + "@types/node-jose": "^1.1.12", + "@types/source-map-support": "^0.5.9", + "@types/supertest": "^2.0.15", + "@types/uuid": "^9.0.6", + "@typescript-eslint/eslint-plugin": "^6.9.1", + "@typescript-eslint/parser": "^6.9.1", "aws-sdk-client-mock": "^2.0.1", - "eslint": "^8.33.0", - "eslint-config-prettier": "^8.6.0", - "eslint-plugin-prettier": "^4.2.1", - "jest": "28.1.2", - "memfs": "^3.4.13", - "pino-pretty": "^8.1.0", - "prettier": "^2.8.3", + "eslint": "^8.52.0", + "eslint-config-prettier": "^9.0.0", + "eslint-plugin-prettier": "^5.0.1", + "jest": "^29.7.0", + "memfs": "^4.6.0", + "pino-pretty": "^10.2.3", + "prettier": "^3.0.3", "supertest": "^6.3.3", - "ts-jest": "28.0.5", - "ts-loader": "^9.4.2", + "ts-jest": "^29.1.1", + "ts-loader": "^9.5.0", "ts-node": "^10.9.1", - "tsconfig-paths": "4.0.0", - "typescript": "4.7.4", - "unionfs": "^4.4.0" + "tsconfig-paths": "^4.2.0", + "typescript": "^5.2.2", + "unionfs": "^4.5.1" }, "jest": { "moduleFileExtensions": [ From 8ecf023c78af83d96f8705b7879d501cc2c554c9 Mon Sep 17 00:00:00 2001 From: Liam Stoddard <lstodd@protonmail.com> Date: Mon, 6 Nov 2023 16:34:23 -0800 Subject: [PATCH 604/954] inital commit --- .../submissions/parcels/__init__.py | 2 + .../application_certificate_of_title.py | 88 ++++++++++ .../parcels/application_parcel_insert.py | 162 ++++++++++++++++++ .../application_certificate_of_title.sql | 15 ++ ...application_certificate_of_title_count.sql | 9 + .../parcels/application_parcels_insert.sql | 28 +++ .../application_parcels_insert_count.sql | 17 ++ 7 files changed, 321 insertions(+) create mode 100644 bin/migrate-oats-data/applications/submissions/parcels/__init__.py create mode 100644 bin/migrate-oats-data/applications/submissions/parcels/application_certificate_of_title.py create mode 100644 bin/migrate-oats-data/applications/submissions/parcels/application_parcel_insert.py create mode 100644 bin/migrate-oats-data/applications/submissions/sql/parcels/application_certificate_of_title.sql create mode 100644 bin/migrate-oats-data/applications/submissions/sql/parcels/application_certificate_of_title_count.sql create mode 100644 bin/migrate-oats-data/applications/submissions/sql/parcels/application_parcels_insert.sql create mode 100644 bin/migrate-oats-data/applications/submissions/sql/parcels/application_parcels_insert_count.sql diff --git a/bin/migrate-oats-data/applications/submissions/parcels/__init__.py b/bin/migrate-oats-data/applications/submissions/parcels/__init__.py new file mode 100644 index 0000000000..f62cc3cb63 --- /dev/null +++ b/bin/migrate-oats-data/applications/submissions/parcels/__init__.py @@ -0,0 +1,2 @@ +from .application_certificate_of_title import process_application_certificate_of_title +from .application_parcel_insert import init_application_parcels, clean_parcels diff --git a/bin/migrate-oats-data/applications/submissions/parcels/application_certificate_of_title.py b/bin/migrate-oats-data/applications/submissions/parcels/application_certificate_of_title.py new file mode 100644 index 0000000000..2335fb4975 --- /dev/null +++ b/bin/migrate-oats-data/applications/submissions/parcels/application_certificate_of_title.py @@ -0,0 +1,88 @@ +from common import ( + setup_and_get_logger, + BATCH_UPLOAD_SIZE, +) +from db import inject_conn_pool +from psycopg2.extras import RealDictCursor, execute_batch + +etl_name = "process_application_certificate_of_title" +logger = setup_and_get_logger(etl_name) + + +@inject_conn_pool +def process_application_certificate_of_title(conn=None, batch_size=BATCH_UPLOAD_SIZE): + logger.info(f"Start {etl_name}") + with conn.cursor(cursor_factory=RealDictCursor) as cursor: + with open( + "applications/submissions/sql/parcels/application_certificate_of_title_count.sql", + "r", + encoding="utf-8", + ) as sql_file: + count_query = sql_file.read() + cursor.execute(count_query) + count_total = dict(cursor.fetchone())["count"] + logger.info(f"Total Application data to update: {count_total}") + + failed_inserts = 0 + successful_updates_count = 0 + last_document_id = 0 + + with open( + "applications/submissions/sql/parcels/application_certificate_of_title.sql", + "r", + encoding="utf-8", + ) as sql_file: + application_sql = sql_file.read() + while True: + cursor.execute( + f"{application_sql} AND od.document_id > {last_document_id} ORDER BY od.document_id;" + ) + + rows = cursor.fetchmany(batch_size) + + if not rows: + break + try: + records_to_be_updated_count = len(rows) + + _update_records(conn, batch_size, cursor, rows) + + successful_updates_count = ( + successful_updates_count + records_to_be_updated_count + ) + last_document_id = dict(rows[-1])["document_id"] + + logger.debug( + f"retrieved/updated items count: {records_to_be_updated_count}; total successfully updated applications so far {successful_updates_count}; last updated alr_application_id: {last_document_id}" + ) + except Exception as err: + # this is NOT going to be caused by actual data update failure. This code is only executed when the code error appears or connection to DB is lost + logger.exception() + conn.rollback() + failed_inserts = count_total - successful_updates_count + last_document_id = last_document_id + 1 + + logger.info( + f"Finished {etl_name}: total amount of successful updates {successful_updates_count}, total failed updates {failed_inserts}" + ) + + +def _update_records(conn, batch_size, cursor, rows): + # parsed_data_list = _prepare_oats_data(rows) + + if len(rows) > 0: + execute_batch( + cursor, + _update_query, + rows, + page_size=batch_size, + ) + + conn.commit() + + +_update_query = """ + UPDATE alcs.application_parcel + SET certificate_of_title_uuid = %(document_uuid)s + WHERE oats_subject_property_id = %(subject_property_id)s +""" diff --git a/bin/migrate-oats-data/applications/submissions/parcels/application_parcel_insert.py b/bin/migrate-oats-data/applications/submissions/parcels/application_parcel_insert.py new file mode 100644 index 0000000000..18e3baa21c --- /dev/null +++ b/bin/migrate-oats-data/applications/submissions/parcels/application_parcel_insert.py @@ -0,0 +1,162 @@ +from common import ( + setup_and_get_logger, + BATCH_UPLOAD_SIZE, + OATS_ETL_USER, + add_timezone_and_keep_date_part, + OatsToAlcsOwnershipType, +) +from db import inject_conn_pool +from psycopg2.extras import RealDictCursor + +etl_name = "init_application_parcels" +logger = setup_and_get_logger(etl_name) + + +@inject_conn_pool +def init_application_parcels(conn=None, batch_size=BATCH_UPLOAD_SIZE): + logger.info(f"Start {etl_name}") + + with conn.cursor(cursor_factory=RealDictCursor) as cursor: + with open( + "applications/submissions/sql/parcels/application_parcels_insert_count.sql", + "r", + encoding="utf-8", + ) as sql_file: + count_query = sql_file.read() + cursor.execute(count_query) + count_total = dict(cursor.fetchone())["count"] + logger.info(f"Total Applications Parcels to insert: {count_total}") + + failed_inserts = 0 + successful_inserts_count = 0 + last_subject_property_id = 0 + + with open( + "applications/submissions/sql/parcels/application_parcels_insert_count.sql", + "r", + encoding="utf-8", + ) as sql_file: + application_sql = sql_file.read() + while True: + cursor.execute( + f"{application_sql} WHERE osp.subject_property_id > {last_subject_property_id} ORDER BY osp.subject_property_id;" + ) + + rows = cursor.fetchmany(batch_size) + + if not rows: + break + try: + records_to_be_inserted_count = len(rows) + + _insert_records(conn, cursor, rows) + + successful_inserts_count = ( + successful_inserts_count + records_to_be_inserted_count + ) + + last_subject_property_id = dict(rows[-1])["subject_property_id"] + + logger.debug( + f"inserted items count: {records_to_be_inserted_count}; total successfully inserted application parcels so far {successful_inserts_count}; last inserted subject_property_id: {last_subject_property_id}" + ) + except Exception as err: + logger.exception(err) + conn.rollback() + failed_inserts = count_total - successful_inserts_count + last_subject_property_id = last_subject_property_id + 1 + + logger.info( + f"Finished {etl_name}: total amount of successful inserts {successful_inserts_count}, total failed inserts {failed_inserts}" + ) + + +def _insert_records(conn, cursor, rows): + number_of_rows_to_insert = len(rows) + + if number_of_rows_to_insert > 0: + insert_query = _compile_application_insert_query(number_of_rows_to_insert) + rows_to_insert = _prepare_data_to_insert(rows) + cursor.execute(insert_query, rows_to_insert) + conn.commit() + + +def _prepare_data_to_insert(rows): + row_without_last_element = [] + for row in rows: + mapped_row = _map_data(row) + row_without_last_element.append(tuple(mapped_row.values())) + + return row_without_last_element + + +def _map_data(row): + return { + "application_submission_uuid": row["application_submission_uuid"], + "audit_created_by": OATS_ETL_USER, + "is_confirmed_by_applicant": True, + "alr_area": row["alr_area"], + "civic_address": row["civic_address"], + "is_farm": row["farm_land_ind"], + "legal_description": row["legal_description"], + "map_area_hectares": row["area_size"], + "ownership_type_code": _map_ownership_type_code( + row["property_owner_type_code"] + ), + "pid": row["pid"], + "pin": row["pin"], + "purchased_date": _map_purchased_date(row["purchase_date"]), + "oats_subject_property_id": row["subject_property_id"], + } + + +def _map_ownership_type_code(ownership_type_code): + if ownership_type_code == OatsToAlcsOwnershipType.FEE.name: + return OatsToAlcsOwnershipType.FEE.value + if ownership_type_code == OatsToAlcsOwnershipType.CROWN.name: + return OatsToAlcsOwnershipType.CROWN.value + if ownership_type_code == OatsToAlcsOwnershipType.FIRST.name: + return OatsToAlcsOwnershipType.FIRST.value + + +def _map_purchased_date(purchased_date): + date = None + if purchased_date: + date = add_timezone_and_keep_date_part(purchased_date) + return date + + +def _compile_application_insert_query(number_of_rows_to_insert): + parcels_to_insert = ",".join(["%s"] * number_of_rows_to_insert) + return f""" + INSERT INTO alcs.application_parcel + ( + application_submission_uuid, + audit_created_by, + is_confirmed_by_applicant, + alr_area, + civic_address, + is_farm, + legal_description, + map_area_hectares, + ownership_type_code, + pid, + pin, + purchased_date, + oats_subject_property_id + ) + VALUES{parcels_to_insert} + ON CONFLICT DO NOTHING + """ + + +@inject_conn_pool +def clean_parcels(conn=None): + logger.info("Start application parcel cleaning") + with conn.cursor() as cursor: + cursor.execute( + "DELETE FROM alcs.application_parcel appp WHERE appp.audit_created_by = 'oats_etl'" + ) + logger.info(f"Deleted items count = {cursor.rowcount}") + conn.commit() + logger.info("Done application parcel cleaning") diff --git a/bin/migrate-oats-data/applications/submissions/sql/parcels/application_certificate_of_title.sql b/bin/migrate-oats-data/applications/submissions/sql/parcels/application_certificate_of_title.sql new file mode 100644 index 0000000000..7308b49d30 --- /dev/null +++ b/bin/migrate-oats-data/applications/submissions/sql/parcels/application_certificate_of_title.sql @@ -0,0 +1,15 @@ +SELECT od.document_id, + od.document_code, + odc.description, + osp.subject_property_id, + oaa.alr_application_id, + od.who_created, + appd.uuid AS document_uuid +FROM oats.oats_documents od + JOIN oats.oats_subject_properties osp ON osp.subject_property_id = od.subject_property_id + JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = osp.alr_application_id + JOIN oats.oats_document_codes odc ON odc.document_code = od.document_code + JOIN alcs.application_document appd ON appd.oats_document_id::bigint = od.document_id + JOIN alcs.application_parcel appp ON appp.oats_subject_property_id = osp.subject_property_id +WHERE od.document_code = 'CT' + AND oaa.application_class_code IN ('LOA', 'BLK') \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/submissions/sql/parcels/application_certificate_of_title_count.sql b/bin/migrate-oats-data/applications/submissions/sql/parcels/application_certificate_of_title_count.sql new file mode 100644 index 0000000000..f1db5bc229 --- /dev/null +++ b/bin/migrate-oats-data/applications/submissions/sql/parcels/application_certificate_of_title_count.sql @@ -0,0 +1,9 @@ +SELECT count(*) +FROM oats.oats_documents od + JOIN oats.oats_subject_properties osp ON osp.subject_property_id = od.subject_property_id + JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = osp.alr_application_id + JOIN oats.oats_document_codes odc ON odc.document_code = od.document_code + JOIN alcs.application_document appd ON appd.oats_document_id::bigint = od.document_id + JOIN alcs.application_parcel appp ON appp.oats_subject_property_id = osp.subject_property_id +WHERE od.document_code = 'CT' + AND oaa.application_class_code IN ('LOA', 'BLK'); \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/submissions/sql/parcels/application_parcels_insert.sql b/bin/migrate-oats-data/applications/submissions/sql/parcels/application_parcels_insert.sql new file mode 100644 index 0000000000..94172e91dd --- /dev/null +++ b/bin/migrate-oats-data/applications/submissions/sql/parcels/application_parcels_insert.sql @@ -0,0 +1,28 @@ +WITH parcels_to_insert AS ( + SELECT apps.uuid, + osp.subject_property_id + FROM alcs.application_submission apps + JOIN oats.oats_subject_properties osp ON osp.alr_application_id = apps.file_number::INTEGER +), +grouped_oats_property_interests_ids AS ( + SELECT MIN(property_owner_type_code) AS property_owner_type_code, + -- min will not affect anything since all property_owner_type_code are the same in scope of subject_property + subject_property_id + FROM oats.oats_property_interests opi + GROUP BY opi.subject_property_id +) +SELECT uuid AS application_submission_uuid, + osp.alr_area, + op.civic_address, + osp.farm_land_ind, + op.legal_description, + op.area_size, + op.pid, + op.pin, + osp.purchase_date, + gopi.property_owner_type_code, + osp.subject_property_id +FROM parcels_to_insert pti + JOIN oats.oats_subject_properties osp ON osp.subject_property_id = pti.subject_property_id + JOIN oats.oats_properties op ON op.property_id = osp.property_id + LEFT JOIN grouped_oats_property_interests_ids gopi ON gopi.subject_property_id = pti.subject_property_id \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/submissions/sql/parcels/application_parcels_insert_count.sql b/bin/migrate-oats-data/applications/submissions/sql/parcels/application_parcels_insert_count.sql new file mode 100644 index 0000000000..d697d860ec --- /dev/null +++ b/bin/migrate-oats-data/applications/submissions/sql/parcels/application_parcels_insert_count.sql @@ -0,0 +1,17 @@ +WITH parcels_to_insert AS ( + SELECT apps.uuid, + osp.subject_property_id + FROM alcs.application_submission apps + JOIN oats.oats_subject_properties osp ON osp.alr_application_id = apps.file_number::INTEGER +), +grouped_oats_property_interests_ids AS ( + SELECT MIN(property_owner_type_code) AS property_owner_type_code, + subject_property_id + FROM oats.oats_property_interests opi + GROUP BY opi.subject_property_id +) +SELECT count(*) +FROM parcels_to_insert pti + JOIN oats.oats_subject_properties osp ON osp.subject_property_id = pti.subject_property_id + JOIN oats.oats_properties op ON op.property_id = osp.property_id + LEFT JOIN grouped_oats_property_interests_ids gopi ON gopi.subject_property_id = pti.subject_property_id; \ No newline at end of file From 53e906ae51f0eafa451960ff7b28fc771dc44a6f Mon Sep 17 00:00:00 2001 From: Liam Stoddard <lstodd@protonmail.com> Date: Mon, 6 Nov 2023 17:11:55 -0800 Subject: [PATCH 605/954] migration files --- .../application-parcel.entity.ts | 9 ++++++++ ...application_subject_property_id_to_alcs.ts | 23 +++++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1699317537062-add_oats_application_subject_property_id_to_alcs.ts diff --git a/services/apps/alcs/src/portal/application-submission/application-parcel/application-parcel.entity.ts b/services/apps/alcs/src/portal/application-submission/application-parcel/application-parcel.entity.ts index 27b65f499b..cb5fe00930 100644 --- a/services/apps/alcs/src/portal/application-submission/application-parcel/application-parcel.entity.ts +++ b/services/apps/alcs/src/portal/application-submission/application-parcel/application-parcel.entity.ts @@ -154,4 +154,13 @@ export class ApplicationParcel extends Base { transformer: new ColumnNumericTransformer(), }) alrArea?: number | null; + + @Column({ + select: false, + nullable: true, + type: 'int8', + comment: + 'This column is NOT related to any functionality in ALCS. It is only used for ETL and backtracking of imported data from OATS. It links oats.oats_subject_properties to alcs.application_parcel.', + }) + oatsSubjectPropertyId: number; } diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1699317537062-add_oats_application_subject_property_id_to_alcs.ts b/services/apps/alcs/src/providers/typeorm/migrations/1699317537062-add_oats_application_subject_property_id_to_alcs.ts new file mode 100644 index 0000000000..c934ecd5da --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1699317537062-add_oats_application_subject_property_id_to_alcs.ts @@ -0,0 +1,23 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class addOatsApplicationSubjectPropertyIdToAlcs1699317537062 + implements MigrationInterface +{ + public async up(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `ALTER TABLE "alcs"."application_parcel" ADD "oats_subject_property_id" bigint`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."application_parcel"."oats_subject_property_id" IS 'This column is NOT related to any functionality in ALCS. It is only used for ETL and backtracking of imported data from OATS. It links oats.oats_subject_properties to alcs.application_parcel.'`, + ); + } + + public async down(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."application_parcel"."oats_subject_property_id" IS 'This column is NOT related to any functionality in ALCS. It is only used for ETL and backtracking of imported data from OATS. It links oats.oats_subject_properties to alcs.application_parcel.'`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_parcel" DROP COLUMN "oats_subject_property_id"`, + ); + } +} From 43e48e95639f920c4473c1932a15f83a37225c76 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Tue, 7 Nov 2023 10:06:05 -0800 Subject: [PATCH 606/954] Increase Precision to allow for the extra decimals * Mistake yesterday, need to increase both scale and precision to store more digits --- ...plication-decision-component-lot.entity.ts | 4 +- .../application-decision-component.entity.ts | 6 +- .../notice-of-intent.entity.ts | 2 +- .../application-parcel.entity.ts | 2 +- .../application-submission.entity.ts | 20 +-- .../notice-of-intent-parcel.entity.ts | 2 +- .../notice-of-intent-submission.entity.ts | 8 +- .../notification-submission.entity.ts | 2 +- .../1699380056668-increase_precision.ts | 155 ++++++++++++++++++ 9 files changed, 178 insertions(+), 23 deletions(-) create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1699380056668-increase_precision.ts diff --git a/services/apps/alcs/src/alcs/application-decision/application-component-lot/application-decision-component-lot.entity.ts b/services/apps/alcs/src/alcs/application-decision/application-component-lot/application-decision-component-lot.entity.ts index caab7f42b3..948d200611 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-component-lot/application-decision-component-lot.entity.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-component-lot/application-decision-component-lot.entity.ts @@ -38,7 +38,7 @@ export class ApplicationDecisionComponentLot extends Base { @Column({ type: 'decimal', nullable: true, - precision: 12, + precision: 15, scale: 5, transformer: new ColumnNumericTransformer(), }) @@ -48,7 +48,7 @@ export class ApplicationDecisionComponentLot extends Base { @Column({ type: 'decimal', nullable: true, - precision: 12, + precision: 15, scale: 5, transformer: new ColumnNumericTransformer(), }) diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.entity.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.entity.ts index d8b675e749..33ef8e7d1d 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.entity.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.entity.ts @@ -33,7 +33,7 @@ export class ApplicationDecisionComponent extends Base { @Column({ type: 'decimal', nullable: true, - precision: 12, + precision: 15, scale: 5, transformer: new ColumnNumericTransformer(), comment: 'Area in hectares of ALR impacted by the decision component', @@ -127,7 +127,7 @@ export class ApplicationDecisionComponent extends Base { @Column({ type: 'decimal', nullable: true, - precision: 12, + precision: 15, scale: 5, transformer: new ColumnNumericTransformer(), }) @@ -171,7 +171,7 @@ export class ApplicationDecisionComponent extends Base { @Column({ type: 'decimal', nullable: true, - precision: 12, + precision: 15, scale: 5, transformer: new ColumnNumericTransformer(), }) diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.entity.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.entity.ts index 1bf1a402f2..1ce25e0f82 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.entity.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.entity.ts @@ -150,7 +150,7 @@ export class NoticeOfIntent extends Base { @Column({ type: 'decimal', nullable: true, - precision: 12, + precision: 15, scale: 5, transformer: new ColumnNumericTransformer(), comment: 'Area in hectares of ALR impacted by the proposal', diff --git a/services/apps/alcs/src/portal/application-submission/application-parcel/application-parcel.entity.ts b/services/apps/alcs/src/portal/application-submission/application-parcel/application-parcel.entity.ts index 233ea08fd9..51160378e9 100644 --- a/services/apps/alcs/src/portal/application-submission/application-parcel/application-parcel.entity.ts +++ b/services/apps/alcs/src/portal/application-submission/application-parcel/application-parcel.entity.ts @@ -149,7 +149,7 @@ export class ApplicationParcel extends Base { @Column({ type: 'decimal', nullable: true, - precision: 12, + precision: 15, scale: 5, transformer: new ColumnNumericTransformer(), }) diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts b/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts index 283f36a8d3..ca004f4813 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts @@ -208,7 +208,7 @@ export class ApplicationSubmission extends Base { @Column({ type: 'decimal', nullable: true, - precision: 12, + precision: 15, scale: 5, transformer: new ColumnNumericTransformer(), }) @@ -234,7 +234,7 @@ export class ApplicationSubmission extends Base { @Column({ type: 'decimal', nullable: true, - precision: 12, + precision: 15, scale: 5, transformer: new ColumnNumericTransformer(), }) @@ -309,7 +309,7 @@ export class ApplicationSubmission extends Base { @Column({ type: 'decimal', nullable: true, - precision: 12, + precision: 15, scale: 5, transformer: new ColumnNumericTransformer(), }) @@ -375,7 +375,7 @@ export class ApplicationSubmission extends Base { @Column({ type: 'decimal', nullable: true, - precision: 12, + precision: 15, scale: 5, transformer: new ColumnNumericTransformer(), }) @@ -415,7 +415,7 @@ export class ApplicationSubmission extends Base { @Column({ type: 'decimal', nullable: true, - precision: 12, + precision: 15, scale: 5, transformer: new ColumnNumericTransformer(), }) @@ -455,7 +455,7 @@ export class ApplicationSubmission extends Base { @Column({ type: 'decimal', nullable: true, - precision: 12, + precision: 15, scale: 5, transformer: new ColumnNumericTransformer(), }) @@ -495,7 +495,7 @@ export class ApplicationSubmission extends Base { @Column({ type: 'decimal', nullable: true, - precision: 12, + precision: 15, scale: 5, transformer: new ColumnNumericTransformer(), }) @@ -578,7 +578,7 @@ export class ApplicationSubmission extends Base { @Column({ type: 'decimal', nullable: true, - precision: 12, + precision: 15, scale: 5, transformer: new ColumnNumericTransformer(), }) @@ -640,7 +640,7 @@ export class ApplicationSubmission extends Base { @Column({ type: 'decimal', nullable: true, - precision: 12, + precision: 15, scale: 5, transformer: new ColumnNumericTransformer(), }) @@ -690,7 +690,7 @@ export class ApplicationSubmission extends Base { @Column({ type: 'decimal', nullable: true, - precision: 12, + precision: 15, scale: 5, transformer: new ColumnNumericTransformer(), }) diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.entity.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.entity.ts index 3e9ac7abbe..1357c1364a 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.entity.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.entity.ts @@ -139,7 +139,7 @@ export class NoticeOfIntentParcel extends Base { @Column({ type: 'decimal', nullable: true, - precision: 12, + precision: 15, scale: 5, transformer: new ColumnNumericTransformer(), }) diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.entity.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.entity.ts index 9cae12cac7..e26d5939ce 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.entity.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.entity.ts @@ -221,7 +221,7 @@ export class NoticeOfIntentSubmission extends Base { @Column({ type: 'decimal', nullable: true, - precision: 12, + precision: 15, scale: 5, transformer: new ColumnNumericTransformer(), }) @@ -261,7 +261,7 @@ export class NoticeOfIntentSubmission extends Base { @Column({ type: 'decimal', nullable: true, - precision: 12, + precision: 15, scale: 5, transformer: new ColumnNumericTransformer(), }) @@ -301,7 +301,7 @@ export class NoticeOfIntentSubmission extends Base { @Column({ type: 'decimal', nullable: true, - precision: 12, + precision: 15, scale: 5, transformer: new ColumnNumericTransformer(), }) @@ -341,7 +341,7 @@ export class NoticeOfIntentSubmission extends Base { @Column({ type: 'decimal', nullable: true, - precision: 12, + precision: 15, scale: 5, transformer: new ColumnNumericTransformer(), }) diff --git a/services/apps/alcs/src/portal/notification-submission/notification-submission.entity.ts b/services/apps/alcs/src/portal/notification-submission/notification-submission.entity.ts index de7d4155f1..c8f6a9d2bd 100644 --- a/services/apps/alcs/src/portal/notification-submission/notification-submission.entity.ts +++ b/services/apps/alcs/src/portal/notification-submission/notification-submission.entity.ts @@ -71,7 +71,7 @@ export class NotificationSubmission extends Base { @Column({ type: 'decimal', nullable: true, - precision: 12, + precision: 15, scale: 5, transformer: new ColumnNumericTransformer(), }) diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1699380056668-increase_precision.ts b/services/apps/alcs/src/providers/typeorm/migrations/1699380056668-increase_precision.ts new file mode 100644 index 0000000000..da84e52259 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1699380056668-increase_precision.ts @@ -0,0 +1,155 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class IncreasePrecision1699380056668 implements MigrationInterface { + name = 'IncreasePrecision1699380056668'; + + public async up(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `ALTER TABLE "alcs"."application_decision_component_lot" ALTER COLUMN "alr_area" TYPE numeric(15,5)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_decision_component_lot" ALTER COLUMN "size" TYPE numeric(15,5)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_decision_component" ALTER COLUMN "alr_area" TYPE numeric(15,5)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_decision_component" ALTER COLUMN "soil_to_place_area" TYPE numeric(15,5)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_decision_component" ALTER COLUMN "soil_to_remove_area" TYPE numeric(15,5)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application" ALTER COLUMN "alr_area" TYPE numeric(15,5)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent" ALTER COLUMN "alr_area" TYPE numeric(15,5)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_parcel" ALTER COLUMN "alr_area" TYPE numeric(15,5)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" ALTER COLUMN "nfu_hectares" TYPE numeric(15,5)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" ALTER COLUMN "nfu_total_fill_area" TYPE numeric(15,5)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" ALTER COLUMN "tur_total_corridor_area" TYPE numeric(15,5)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" ALTER COLUMN "soil_to_remove_area" TYPE numeric(15,5)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" ALTER COLUMN "soil_already_removed_area" TYPE numeric(15,5)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" ALTER COLUMN "soil_to_place_area" TYPE numeric(15,5)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" ALTER COLUMN "soil_already_placed_area" TYPE numeric(15,5)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" ALTER COLUMN "naru_floor_area" TYPE numeric(15,5)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" ALTER COLUMN "naru_to_place_area" TYPE numeric(15,5)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" ALTER COLUMN "incl_excl_hectares" TYPE numeric(15,5)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notification_submission" ALTER COLUMN "total_area" TYPE numeric(15,5)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_parcel" ALTER COLUMN "alr_area" TYPE numeric(15,5)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" ALTER COLUMN "soil_to_remove_area" TYPE numeric(15,5)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" ALTER COLUMN "soil_already_removed_area" TYPE numeric(15,5)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" ALTER COLUMN "soil_to_place_area" TYPE numeric(15,5)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" ALTER COLUMN "soil_already_placed_area" TYPE numeric(15,5)`, + ); + } + + public async down(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" ALTER COLUMN "soil_already_placed_area" TYPE numeric(12,5)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" ALTER COLUMN "soil_to_place_area" TYPE numeric(12,5)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" ALTER COLUMN "soil_already_removed_area" TYPE numeric(12,5)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" ALTER COLUMN "soil_to_remove_area" TYPE numeric(12,5)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_parcel" ALTER COLUMN "alr_area" TYPE numeric(12,5)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notification_submission" ALTER COLUMN "total_area" TYPE numeric(12,5)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" ALTER COLUMN "incl_excl_hectares" TYPE numeric(12,5)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" ALTER COLUMN "naru_to_place_area" TYPE numeric(12,5)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" ALTER COLUMN "naru_floor_area" TYPE numeric(12,5)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" ALTER COLUMN "soil_already_placed_area" TYPE numeric(12,5)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" ALTER COLUMN "soil_to_place_area" TYPE numeric(12,5)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" ALTER COLUMN "soil_already_removed_area" TYPE numeric(12,5)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" ALTER COLUMN "soil_to_remove_area" TYPE numeric(12,5)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" ALTER COLUMN "tur_total_corridor_area" TYPE numeric(12,5)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" ALTER COLUMN "nfu_total_fill_area" TYPE numeric(12,5)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" ALTER COLUMN "nfu_hectares" TYPE numeric(12,5)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_parcel" ALTER COLUMN "alr_area" TYPE numeric(12,5)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent" ALTER COLUMN "alr_area" TYPE numeric(12,5)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application" ALTER COLUMN "alr_area" TYPE numeric(12,5)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_decision_component" ALTER COLUMN "soil_to_remove_area" TYPE numeric(12,5)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_decision_component" ALTER COLUMN "soil_to_place_area" TYPE numeric(12,5)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_decision_component" ALTER COLUMN "alr_area" TYPE numeric(12,5)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_decision_component_lot" ALTER COLUMN "size" TYPE numeric(12,5)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_decision_component_lot" ALTER COLUMN "alr_area" TYPE numeric(12,5)`, + ); + } +} From 95afb68e64c11f8fadf864c529bf72d9f1d74ed3 Mon Sep 17 00:00:00 2001 From: Liam Stoddard <lstodd@protonmail.com> Date: Tue, 7 Nov 2023 11:20:10 -0800 Subject: [PATCH 607/954] encountering db issues --- bin/migrate-oats-data/applications/migrate_application.py | 4 ++++ bin/migrate-oats-data/applications/submissions/__init__.py | 2 ++ .../applications/submissions/migrate_application_parcels.py | 6 ++++++ .../submissions/parcels/application_parcel_insert.py | 2 +- 4 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 bin/migrate-oats-data/applications/submissions/migrate_application_parcels.py diff --git a/bin/migrate-oats-data/applications/migrate_application.py b/bin/migrate-oats-data/applications/migrate_application.py index dc7194463b..cd5be82f9d 100644 --- a/bin/migrate-oats-data/applications/migrate_application.py +++ b/bin/migrate-oats-data/applications/migrate_application.py @@ -2,6 +2,8 @@ clean_app_submissions, process_application_statuses, process_alcs_app_submissions, + clean_parcels, + process_application_parcels, ) from .base_applications import process_applications, clean_applications from .app_prep import process_alcs_application_prep_fields @@ -15,11 +17,13 @@ def process_application_etl(batch_size): process_alcs_application_prep_fields(batch_size) process_alcs_app_submissions(batch_size) process_application_statuses(batch_size) + process_application_parcels(batch_size) process_application_submission_status_emails() def clean_alcs_applications(): clean_application_submission_status_emails() + # clean_parcels() clean_app_submissions() clean_applications() diff --git a/bin/migrate-oats-data/applications/submissions/__init__.py b/bin/migrate-oats-data/applications/submissions/__init__.py index 407b458a7c..84e2e834f5 100644 --- a/bin/migrate-oats-data/applications/submissions/__init__.py +++ b/bin/migrate-oats-data/applications/submissions/__init__.py @@ -3,3 +3,5 @@ process_application_statuses, clean_app_submissions, ) +from .parcels import clean_parcels +from .migrate_application_parcels import process_application_parcels diff --git a/bin/migrate-oats-data/applications/submissions/migrate_application_parcels.py b/bin/migrate-oats-data/applications/submissions/migrate_application_parcels.py new file mode 100644 index 0000000000..28b3cc10a5 --- /dev/null +++ b/bin/migrate-oats-data/applications/submissions/migrate_application_parcels.py @@ -0,0 +1,6 @@ +from .parcels import init_application_parcels, process_application_certificate_of_title + + +def process_application_parcels(batch_size): + init_application_parcels(batch_size) + process_application_certificate_of_title(batch_size) diff --git a/bin/migrate-oats-data/applications/submissions/parcels/application_parcel_insert.py b/bin/migrate-oats-data/applications/submissions/parcels/application_parcel_insert.py index 18e3baa21c..88c3e5d8f3 100644 --- a/bin/migrate-oats-data/applications/submissions/parcels/application_parcel_insert.py +++ b/bin/migrate-oats-data/applications/submissions/parcels/application_parcel_insert.py @@ -32,7 +32,7 @@ def init_application_parcels(conn=None, batch_size=BATCH_UPLOAD_SIZE): last_subject_property_id = 0 with open( - "applications/submissions/sql/parcels/application_parcels_insert_count.sql", + "applications/submissions/sql/parcels/application_parcels_insert.sql", "r", encoding="utf-8", ) as sql_file: From 3cd8f7df1f0b0b15347b62659c49b483d1e4a744 Mon Sep 17 00:00:00 2001 From: Liam Stoddard <lstodd@protonmail.com> Date: Tue, 7 Nov 2023 12:18:43 -0800 Subject: [PATCH 608/954] resolved db clean issue, added validation --- .../applications/migrate_application.py | 6 +- ...cation_certificate_of_title_validation.sql | 33 +++++++++ .../application_parcels_insert_validation.sql | 68 +++++++++++++++++++ .../menu/commands/clean_all.py | 7 +- 4 files changed, 112 insertions(+), 2 deletions(-) create mode 100644 bin/migrate-oats-data/applications/submissions/sql/parcels/validation/application_certificate_of_title_validation.sql create mode 100644 bin/migrate-oats-data/applications/submissions/sql/parcels/validation/application_parcels_insert_validation.sql diff --git a/bin/migrate-oats-data/applications/migrate_application.py b/bin/migrate-oats-data/applications/migrate_application.py index cd5be82f9d..ad384a5988 100644 --- a/bin/migrate-oats-data/applications/migrate_application.py +++ b/bin/migrate-oats-data/applications/migrate_application.py @@ -23,10 +23,14 @@ def process_application_etl(batch_size): def clean_alcs_applications(): clean_application_submission_status_emails() - # clean_parcels() + clean_parcels() clean_app_submissions() clean_applications() def init_applications(batch_size): process_applications(batch_size) + + +def clean_application_parcels(): + clean_parcels() diff --git a/bin/migrate-oats-data/applications/submissions/sql/parcels/validation/application_certificate_of_title_validation.sql b/bin/migrate-oats-data/applications/submissions/sql/parcels/validation/application_certificate_of_title_validation.sql new file mode 100644 index 0000000000..e9af9e535e --- /dev/null +++ b/bin/migrate-oats-data/applications/submissions/sql/parcels/validation/application_certificate_of_title_validation.sql @@ -0,0 +1,33 @@ +WITH oats_cert_of_titles AS ( + SELECT od.document_id, + osp.subject_property_id, + oaa.alr_application_id + FROM oats.oats_documents od + JOIN oats.oats_subject_properties osp ON osp.subject_property_id = od.subject_property_id + JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = osp.alr_application_id + JOIN oats.oats_document_codes odc ON odc.document_code = od.document_code + WHERE od.document_code = 'CT' + AND oaa.application_class_code IN ('LOA', 'BLK') +), +alcs_oats_certificate_of_titles AS ( + SELECT appp.oats_subject_property_id, + appd.oats_document_id + FROM alcs.application_parcel appp + JOIN alcs.application_document appd ON appd.uuid = appp.certificate_of_title_uuid +) +SELECT * +FROM alcs_oats_certificate_of_titles act + LEFT JOIN oats_cert_of_titles oct ON oct.subject_property_id = act.oats_subject_property_id +WHERE act.oats_document_id != oct.document_id::TEXT; +-- count certificates of title in oats linked to subject_properties +SELECT count(*) +FROM oats.oats_documents od + JOIN oats.oats_subject_properties osp ON osp.subject_property_id = od.subject_property_id + JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = osp.alr_application_id + JOIN oats.oats_document_codes odc ON odc.document_code = od.document_code +WHERE od.document_code = 'CT' + AND oaa.application_class_code IN ('LOA', 'BLK'); +-- count certificate of titles linked in alcs +SELECT count(*) +FROM alcs.application_parcel appp + JOIN alcs.application_document appd ON appd.uuid = appp.certificate_of_title_uuid; \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/submissions/sql/parcels/validation/application_parcels_insert_validation.sql b/bin/migrate-oats-data/applications/submissions/sql/parcels/validation/application_parcels_insert_validation.sql new file mode 100644 index 0000000000..ac8184f269 --- /dev/null +++ b/bin/migrate-oats-data/applications/submissions/sql/parcels/validation/application_parcels_insert_validation.sql @@ -0,0 +1,68 @@ +-- Total count of inserted parcels should match total count of parcels in oats +-- Get total count of parcels in ALCS +SELECT count(*) +FROM alcs.application_parcel appp; +-- Get total count of parcels in OATS +WITH app_components_grouped AS ( + SELECT oaac.alr_application_id + FROM oats.oats_alr_appl_components oaac + JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id + WHERE oaa.application_class_code IN ('LOA', 'BLK') + GROUP BY oaac.alr_application_id + HAVING count(oaac.alr_application_id) < 2 -- ignore applications with multiple components +) +SELECT count(*) +FROM app_components_grouped appg + JOIN oats.oats_subject_properties osp ON osp.alr_application_id = appg.alr_application_id; +-- return records that are different between OATS and ALCS +WITH parcels_to_insert AS ( + SELECT apps.uuid, + osp.subject_property_id + FROM alcs.application_submission apps + JOIN oats.oats_subject_properties osp ON osp.alr_application_id = apps.file_number::INTEGER +), +grouped_oats_property_interests_ids AS ( + SELECT MIN(property_owner_type_code) AS property_owner_type_code, + -- min will not affect anything since all property_owner_type_code are the same in scope of subject_property + subject_property_id + FROM oats.oats_property_interests opi + GROUP BY opi.subject_property_id +) --- compares parcel fields and returns mismatches. Since oats has a lot of bad data ignore all records prior the 1900s +SELECT appp.alr_area, + osp.alr_area, + appp.civic_address, + op.civic_address, + appp.is_farm, + osp.farm_land_ind, + appp.legal_description, + op.legal_description, + appp.map_area_hectares, + op.area_size, + appp.pid, + op.pid, + appp.pin, + op.pin, + appp.purchased_date AT TIME ZONE 'UTC', + osp.purchase_date, + appp.ownership_type_code, + gopi.property_owner_type_code, + appp.oats_subject_property_id, + osp.subject_property_id +FROM parcels_to_insert pti + JOIN oats.oats_subject_properties osp ON osp.subject_property_id = pti.subject_property_id + JOIN oats.oats_properties op ON op.property_id = osp.property_id + LEFT JOIN grouped_oats_property_interests_ids gopi ON gopi.subject_property_id = pti.subject_property_id + JOIN alcs.application_parcel appp ON appp.oats_subject_property_id = pti.subject_property_id +WHERE appp.alr_area != osp.alr_area + OR (appp.civic_address != op.civic_address) + OR (appp.is_farm != osp.farm_land_ind::bool) + OR (appp.legal_description != op.legal_description) + OR (appp.map_area_hectares != op.area_size) + OR (appp.pid != op.pid::text) + OR (appp.pin != op.pin::text) + OR ( + appp.purchased_date != osp.purchase_date AT TIME ZONE 'America/Vancouver' + ) + OR ( + appp.oats_subject_property_id != osp.subject_property_id + ); \ No newline at end of file diff --git a/bin/migrate-oats-data/menu/commands/clean_all.py b/bin/migrate-oats-data/menu/commands/clean_all.py index 4561f3b1e7..bef7ec9c35 100644 --- a/bin/migrate-oats-data/menu/commands/clean_all.py +++ b/bin/migrate-oats-data/menu/commands/clean_all.py @@ -1,4 +1,7 @@ -from applications.migrate_application import clean_alcs_applications +from applications.migrate_application import ( + clean_alcs_applications, + clean_application_parcels, +) from noi.notice_of_intent_migration import clean_notice_of_intent from applications.application_submission_status_email import ( clean_application_submission_status_emails, @@ -18,6 +21,8 @@ def clean_all(console, args): console.log("Cleaning data:") # this will be enabled once application import is ready + # application parcels need to be cleaned before application documents + clean_application_parcels() clean_application_documents() clean_noi_documents() clean_documents() From 4ebb9ee928508d7ddaf72caa21707fea84f66aa5 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Tue, 7 Nov 2023 16:15:01 -0800 Subject: [PATCH 609/954] Add Test Output Back * Added reporters which accidentally broke reporting on local environments * Remove unused service --- alcs-frontend/jest.config.js | 1 - portal-frontend/jest.config.js | 1 - .../search/public-search.controller.spec.ts | 14 +-- .../public/search/public-search.module.ts | 2 - .../search/public-search.service.spec.ts | 115 ------------------ .../public/search/public-search.service.ts | 52 -------- 6 files changed, 2 insertions(+), 183 deletions(-) delete mode 100644 services/apps/alcs/src/portal/public/search/public-search.service.spec.ts delete mode 100644 services/apps/alcs/src/portal/public/search/public-search.service.ts diff --git a/alcs-frontend/jest.config.js b/alcs-frontend/jest.config.js index 042509cac6..69ca77b171 100644 --- a/alcs-frontend/jest.config.js +++ b/alcs-frontend/jest.config.js @@ -1,7 +1,6 @@ module.exports = { preset: 'jest-preset-angular', moduleDirectories: ['node_modules', 'src'], - reporters: [['github-actions', { silent: false }], 'summary'], coverageReporters: [ [ 'lcov', diff --git a/portal-frontend/jest.config.js b/portal-frontend/jest.config.js index 4ac1a43fd1..cedaf35977 100644 --- a/portal-frontend/jest.config.js +++ b/portal-frontend/jest.config.js @@ -1,7 +1,6 @@ module.exports = { preset: 'jest-preset-angular', moduleDirectories: ['node_modules', 'src'], - reporters: [['github-actions', { silent: false }], 'summary'], modulePathIgnorePatterns: ['/test'], coverageReporters: [ [ diff --git a/services/apps/alcs/src/portal/public/search/public-search.controller.spec.ts b/services/apps/alcs/src/portal/public/search/public-search.controller.spec.ts index 826e976a9d..f2a31538cc 100644 --- a/services/apps/alcs/src/portal/public/search/public-search.controller.spec.ts +++ b/services/apps/alcs/src/portal/public/search/public-search.controller.spec.ts @@ -1,28 +1,22 @@ -import { classes } from 'automapper-classes'; -import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { ClsService } from 'nestjs-cls'; import { mockKeyCloakProviders } from '../../../../test/mocks/mockTypes'; -import { Application } from '../../../alcs/application/application.entity'; -import { NoticeOfIntent } from '../../../alcs/notice-of-intent/notice-of-intent.entity'; -import { Notification } from '../../../alcs/notification/notification.entity'; import { PublicApplicationSearchService } from './application/public-application-search.service'; import { PublicNoticeOfIntentSearchService } from './notice-of-intent/public-notice-of-intent-search.service'; import { PublicNotificationSearchService } from './notification/public-notification-search.service'; import { PublicSearchController } from './public-search.controller'; import { SearchRequestDto } from './public-search.dto'; -import { PublicSearchService } from './public-search.service'; describe('PublicSearchController', () => { let controller: PublicSearchController; - let mockSearchService: DeepMocked<PublicSearchService>; let mockNOIPublicSearchService: DeepMocked<PublicNoticeOfIntentSearchService>; let mockAppPublicSearchService: DeepMocked<PublicApplicationSearchService>; let mockNotiPublicSearchService: DeepMocked<PublicNotificationSearchService>; beforeEach(async () => { - mockSearchService = createMock(); mockNOIPublicSearchService = createMock(); mockAppPublicSearchService = createMock(); mockNotiPublicSearchService = createMock(); @@ -57,10 +51,6 @@ describe('PublicSearchController', () => { controller = module.get<PublicSearchController>(PublicSearchController); - mockSearchService.getApplication.mockResolvedValue(new Application()); - mockSearchService.getNoi.mockResolvedValue(new NoticeOfIntent()); - mockSearchService.getNotification.mockResolvedValue(new Notification()); - mockNOIPublicSearchService.searchNoticeOfIntents.mockResolvedValue({ data: [], total: 0, diff --git a/services/apps/alcs/src/portal/public/search/public-search.module.ts b/services/apps/alcs/src/portal/public/search/public-search.module.ts index 25d05f80b2..46134e8250 100644 --- a/services/apps/alcs/src/portal/public/search/public-search.module.ts +++ b/services/apps/alcs/src/portal/public/search/public-search.module.ts @@ -12,7 +12,6 @@ import { PublicNoticeOfIntentSubmissionSearchView } from './notice-of-intent/pub import { PublicNotificationSearchService } from './notification/public-notification-search.service'; import { PublicNotificationSubmissionSearchView } from './notification/public-notification-search-view.entity'; import { PublicSearchController } from './public-search.controller'; -import { PublicSearchService } from './public-search.service'; @Module({ imports: [ @@ -27,7 +26,6 @@ import { PublicSearchService } from './public-search.service'; ]), ], providers: [ - PublicSearchService, ApplicationProfile, PublicApplicationSearchService, PublicNoticeOfIntentSearchService, diff --git a/services/apps/alcs/src/portal/public/search/public-search.service.spec.ts b/services/apps/alcs/src/portal/public/search/public-search.service.spec.ts deleted file mode 100644 index 20e747ad8c..0000000000 --- a/services/apps/alcs/src/portal/public/search/public-search.service.spec.ts +++ /dev/null @@ -1,115 +0,0 @@ -import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; -import { Test, TestingModule } from '@nestjs/testing'; -import { getRepositoryToken } from '@nestjs/typeorm'; -import { Repository } from 'typeorm'; -import { Application } from '../../../alcs/application/application.entity'; -import { LocalGovernment } from '../../../alcs/local-government/local-government.entity'; -import { NoticeOfIntent } from '../../../alcs/notice-of-intent/notice-of-intent.entity'; -import { PublicApplicationSubmissionSearchView } from './application/public-application-search-view.entity'; -import { PublicSearchService } from './public-search.service'; -import { Notification } from '../../../alcs/notification/notification.entity'; - -describe('PublicSearchService', () => { - let service: PublicSearchService; - let mockApplicationRepository: DeepMocked<Repository<Application>>; - let mockNoiRepository: DeepMocked<Repository<NoticeOfIntent>>; - let mockApplicationSubmissionSearchView: DeepMocked< - Repository<PublicApplicationSubmissionSearchView> - >; - let mockLocalGovernment: DeepMocked<Repository<LocalGovernment>>; - let mockNotificationRepository: DeepMocked<Repository<Notification>>; - - const fakeFileNumber = 'fake'; - - beforeEach(async () => { - mockApplicationRepository = createMock(); - mockNoiRepository = createMock(); - mockApplicationSubmissionSearchView = createMock(); - mockLocalGovernment = createMock(); - mockNotificationRepository = createMock(); - - const module: TestingModule = await Test.createTestingModule({ - providers: [ - PublicSearchService, - { - provide: getRepositoryToken(Application), - useValue: mockApplicationRepository, - }, - { - provide: getRepositoryToken(NoticeOfIntent), - useValue: mockNoiRepository, - }, - { - provide: getRepositoryToken(Notification), - useValue: mockNotificationRepository, - }, - { - provide: getRepositoryToken(PublicApplicationSubmissionSearchView), - useValue: mockApplicationSubmissionSearchView, - }, - { - provide: getRepositoryToken(LocalGovernment), - useValue: mockLocalGovernment, - }, - ], - }).compile(); - - service = module.get<PublicSearchService>(PublicSearchService); - }); - - it('should be defined', () => { - expect(service).toBeDefined(); - }); - - it('should call repository to get notice of intent', async () => { - mockNoiRepository.findOne.mockResolvedValue(new NoticeOfIntent()); - - const result = await service.getNoi('fake'); - - expect(mockNoiRepository.findOne).toBeCalledTimes(1); - expect(mockNoiRepository.findOne).toBeCalledWith({ - where: { - fileNumber: fakeFileNumber, - }, - relations: { - localGovernment: true, - }, - }); - expect(result).toBeDefined(); - }); - - it('should call repository to get application', async () => { - mockApplicationRepository.findOne.mockResolvedValue(new Application()); - - const result = await service.getApplication('fake'); - - expect(mockApplicationRepository.findOne).toBeCalledTimes(1); - expect(mockApplicationRepository.findOne).toBeCalledWith({ - where: { - fileNumber: fakeFileNumber, - }, - relations: { - localGovernment: true, - type: true, - }, - }); - expect(result).toBeDefined(); - }); - - it('should call repository to get notification', async () => { - mockNotificationRepository.findOne.mockResolvedValue(new Notification()); - - const result = await service.getNotification('fake'); - - expect(mockNotificationRepository.findOne).toBeCalledTimes(1); - expect(mockNotificationRepository.findOne).toBeCalledWith({ - where: { - fileNumber: fakeFileNumber, - }, - relations: { - localGovernment: true, - }, - }); - expect(result).toBeDefined(); - }); -}); diff --git a/services/apps/alcs/src/portal/public/search/public-search.service.ts b/services/apps/alcs/src/portal/public/search/public-search.service.ts deleted file mode 100644 index 0b9ae87c93..0000000000 --- a/services/apps/alcs/src/portal/public/search/public-search.service.ts +++ /dev/null @@ -1,52 +0,0 @@ -import { Injectable } from '@nestjs/common'; -import { InjectRepository } from '@nestjs/typeorm'; -import { Repository } from 'typeorm'; -import { Application } from '../../../alcs/application/application.entity'; -import { NoticeOfIntent } from '../../../alcs/notice-of-intent/notice-of-intent.entity'; -import { Notification } from '../../../alcs/notification/notification.entity'; - -@Injectable() -export class PublicSearchService { - constructor( - @InjectRepository(Application) - private applicationRepository: Repository<Application>, - @InjectRepository(NoticeOfIntent) - private noiRepository: Repository<NoticeOfIntent>, - @InjectRepository(Notification) - private notificationRepository: Repository<Notification>, - ) {} - - async getApplication(fileNumber: string) { - return await this.applicationRepository.findOne({ - where: { - fileNumber, - }, - relations: { - localGovernment: true, - type: true, - }, - }); - } - - async getNoi(fileNumber: string) { - return await this.noiRepository.findOne({ - where: { - fileNumber, - }, - relations: { - localGovernment: true, - }, - }); - } - - async getNotification(fileNumber: string) { - return await this.notificationRepository.findOne({ - where: { - fileNumber, - }, - relations: { - localGovernment: true, - }, - }); - } -} From ea0d3239f0160860cc22e0419b605e525810aa0b Mon Sep 17 00:00:00 2001 From: Mekhti <mekhti.huseinov.ssi@gmail.com> Date: Tue, 7 Nov 2023 17:52:11 -0800 Subject: [PATCH 610/954] wip owners in noi --- .../parcels/owners/__init__.py | 1 + .../parcels/owners/notice_of_intent_owners.py | 136 ++++++++++++++++++ .../parcels/owners/notice_of_intent_owner.sql | 21 +++ .../owners/notice_of_intent_owner_count.sql | 7 + .../notice-of-intent-owner.entity.ts | 9 ++ .../typeorm/1699386421738-migrations.ts | 23 +++ 6 files changed, 197 insertions(+) create mode 100644 bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/owners/__init__.py create mode 100644 bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/owners/notice_of_intent_owners.py create mode 100644 bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/owners/notice_of_intent_owner.sql create mode 100644 bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/owners/notice_of_intent_owner_count.sql create mode 100644 services/apps/alcs/src/providers/typeorm/1699386421738-migrations.ts diff --git a/bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/owners/__init__.py b/bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/owners/__init__.py new file mode 100644 index 0000000000..c5e8e293e1 --- /dev/null +++ b/bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/owners/__init__.py @@ -0,0 +1 @@ +from .notice_of_intent_owners import process_notice_of_intent_parcel_owners diff --git a/bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/owners/notice_of_intent_owners.py b/bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/owners/notice_of_intent_owners.py new file mode 100644 index 0000000000..69b1078f4c --- /dev/null +++ b/bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/owners/notice_of_intent_owners.py @@ -0,0 +1,136 @@ +from common import setup_and_get_logger, BATCH_UPLOAD_SIZE, OATS_ETL_USER +from db import inject_conn_pool +from psycopg2.extras import RealDictCursor + +etl_name = "process_notice_of_intent_parcel_owners" +logger = setup_and_get_logger(etl_name) + + +@inject_conn_pool +def process_notice_of_intent_parcel_owners(conn=None, batch_size=BATCH_UPLOAD_SIZE): + logger.info(f"Start {etl_name}") + with conn.cursor(cursor_factory=RealDictCursor) as cursor: + with open( + "noi/sql/notice_of_intent_submission/parcels/owners/notice_of_intent_owner_count.sql", + "r", + encoding="utf-8", + ) as sql_file: + count_query = sql_file.read() + cursor.execute(count_query) + count_total = dict(cursor.fetchone())["count"] + logger.info(f"Total Notice of Intents data to insert: {count_total}") + + failed_inserts = 0 + successful_updates_count = 0 + last_subject_property = 0 + last_person_organization_id = 0 + + with open( + "noi/sql/notice_of_intent_submission/parcels/owners/notice_of_intent_owner.sql", + "r", + encoding="utf-8", + ) as sql_file: + application_sql = sql_file.read() + while True: + cursor.execute( + f"{application_sql} WHERE osp.subject_property_id > {last_subject_property} AND opo.person_organization_id > {last_person_organization_id} ORDER BY osp.subject_property_id, opo.person_organization_id;" + ) + + rows = cursor.fetchmany(batch_size) + + if not rows: + break + try: + records_to_be_updated_count = len(rows) + + _insert_records(conn, cursor, rows) + + successful_updates_count = ( + successful_updates_count + records_to_be_updated_count + ) + last_subject_property = dict(rows[-1])["subject_property_id"] + last_person_organization_id = dict(rows[-1])[ + "person_organization_id" + ] + + logger.debug( + f"retrieved/updated items count: {records_to_be_updated_count}; total successfully updated notice of intents so far {successful_updates_count}; last updated {last_subject_property} {last_person_organization_id}" + ) + except Exception as err: + logger.exception(err) + conn.rollback() + failed_inserts = count_total - successful_updates_count + last_person_organization_id = last_person_organization_id + 1 + + logger.info( + f"Finished {etl_name}: total amount of successful updates {successful_updates_count}, total failed updates {failed_inserts}" + ) + + +def _insert_records(conn, cursor, rows): + number_of_rows_to_insert = len(rows) + + if number_of_rows_to_insert > 0: + insert_query = _compile_owner_insert_query(number_of_rows_to_insert) + rows_to_insert = _prepare_data_to_insert(rows) + cursor.execute(insert_query, rows_to_insert) + conn.commit() + + +def _compile_owner_insert_query(number_of_rows_to_insert): + owners_to_insert = ",".join(["%s"] * number_of_rows_to_insert) + return f""" + INSERT INTO alcs.notice_of_intent_owner( + first_name, + last_name, + organization_name, + notice_of_intent_submission_uuid, + email, + phone_number, + type_code, + oats_person_organization_id, + audit_created_by + ) + VALUES{owners_to_insert} + ON CONFLICT DO NOTHING + """ + + +def _prepare_data_to_insert(rows): + row_without_last_element = [] + for row in rows: + mapped_row = _map_data(row) + row_without_last_element.append(tuple(mapped_row.values())) + + return row_without_last_element + + +def _map_data(row): + return { + "first_name": row["first_name"], + "last_name": row["last_name"], + "organization_name": row["organization_name"], + "notice_of_intent_submission_uuid": row["notice_of_intent_submission_uuid"], + "email": row["email_address"], + "phone_number": row.get("phone_number", "cell_phone_number", None), + "type_code": _map_owner_type(row), + "oats_person_organization_id": row["person_organization_id"], + "audit_created_by": OATS_ETL_USER, + } + + +def _map_owner_type(owner_record): + if owner_record["ownership_type_code"] == "SMPL": + if owner_record["person_id"] and not owner_record["organization_id"]: + return "INDV" + elif owner_record["organization_id"]: + return "ORGZ" + elif owner_record["ownership_type_code"] == "CRWN": + return "CRWN" + + +# _parcel_owner_insert_query = f"""" +# INSERT INTO alcs.notice_of_intent_parcel_owners_notice_of_intent_owner(notice_of_intent_parcel_uuid, notice_of_intent_owner_uuid) +# VALUES{values} +# ON CONFLICT DO NOTHING +# """ diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/owners/notice_of_intent_owner.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/owners/notice_of_intent_owner.sql new file mode 100644 index 0000000000..26d43bd4a9 --- /dev/null +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/owners/notice_of_intent_owner.sql @@ -0,0 +1,21 @@ +-- retrieve owners per parcel +SELECT osp.subject_property_id, + opo.person_organization_id, + op.person_id, + op.first_name, + op.last_name, + oo.organization_id, + oo.organization_name, + opo.phone_number, + opo.cell_phone_number, + opo.email_address, + noip.ownership_type_code, + opi.prin_type, + opi.active_ind, + noip.notice_of_intent_submission_uuid +FROM oats.OATS_PROPERTY_INTERESTS opi + JOIN oats.OATS_SUBJECT_PROPERTIES osp ON osp.SUBJECT_PROPERTY_ID = opi.SUBJECT_PROPERTY_ID + JOIN alcs.notice_of_intent_parcel noip ON noip.oats_subject_property_id = osp.subject_property_id -- ensure GET records only for parcels imported into ALCS + JOIN oats.OATS_PERSON_ORGANIZATIONS opo ON opo.PERSON_ORGANIZATION_ID = opi.PERSON_ORGANIZATION_ID + LEFT JOIN oats.OATS_PERSONS op ON op.PERSON_ID = opo.PERSON_ID + LEFT JOIN oats.oats_organizations oo ON oo.organization_id = opo.organization_id -- ORDER BY osp.subject_property_id, opo.person_organization_id \ No newline at end of file diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/owners/notice_of_intent_owner_count.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/owners/notice_of_intent_owner_count.sql new file mode 100644 index 0000000000..75e28f566c --- /dev/null +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/owners/notice_of_intent_owner_count.sql @@ -0,0 +1,7 @@ +SELECT count(*) +FROM oats.OATS_PROPERTY_INTERESTS opi + JOIN oats.OATS_SUBJECT_PROPERTIES osp ON osp.SUBJECT_PROPERTY_ID = opi.SUBJECT_PROPERTY_ID + JOIN alcs.notice_of_intent_parcel noip ON noip.oats_subject_property_id = osp.subject_property_id -- ensure GET records only for parcels imported into ALCS + JOIN oats.OATS_PERSON_ORGANIZATIONS opo ON opo.PERSON_ORGANIZATION_ID = opi.PERSON_ORGANIZATION_ID + LEFT JOIN oats.OATS_PERSONS op ON op.PERSON_ID = opo.PERSON_ID + LEFT JOIN oats.oats_organizations oo ON oo.organization_id = opo.organization_id; \ No newline at end of file diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.entity.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.entity.ts index 952f159054..2ecd9526fa 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.entity.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.entity.ts @@ -51,6 +51,15 @@ export class NoticeOfIntentOwner extends Base { }) email?: string | null; + @Column({ + select: false, + nullable: true, + type: 'int8', + comment: + 'This column is NOT related to any functionality in ALCS. It is only used for ETL and backtracking of imported data from OATS. It links oats.oats_person_organization to alcs.notice_of_intent_owner. Note that this id is unique only in scope of parcel.', + }) + oatsPersonOrganizationId: number; + @AutoMap(() => NoticeOfIntentDocumentDto) @ManyToOne(() => NoticeOfIntentDocument, { onDelete: 'SET NULL', diff --git a/services/apps/alcs/src/providers/typeorm/1699386421738-migrations.ts b/services/apps/alcs/src/providers/typeorm/1699386421738-migrations.ts new file mode 100644 index 0000000000..f9111edf02 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/1699386421738-migrations.ts @@ -0,0 +1,23 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class Migrations1699386421738 implements MigrationInterface { + name = 'Migrations1699386421738'; + + public async up(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_owner" ADD "oats_person_organization_id" bigint`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."notice_of_intent_owner"."oats_person_organization_id" IS 'This column is NOT related to any functionality in ALCS. It is only used for ETL and backtracking of imported data from OATS. It links oats.oats_person_organization to alcs.notice_of_intent_owner. Note that this id is unique only in scope of parcel.'`, + ); + } + + public async down(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."notice_of_intent_owner"."oats_person_organization_id" IS 'This column is NOT related to any functionality in ALCS. It is only used for ETL and backtracking of imported data from OATS. It links oats.oats_person_organization to alcs.notice_of_intent_owner. Note that this id is unique only in scope of parcel.'`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_owner" DROP COLUMN "oats_person_organization_id"`, + ); + } +} From c42f7852b221917b66a30bf93f61a0ece28c0a42 Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Wed, 8 Nov 2023 09:02:18 -0800 Subject: [PATCH 611/954] switch from covert time to add time zone (#1144) --- .../submissions/statuses/application_status_cancelled.py | 9 +++++++-- .../statuses/application_status_in_progress.py | 9 +++++++-- .../application_status_returned_incomplete_lfng.py | 9 +++++++-- .../statuses/application_status_review_lfng.py | 9 +++++++-- .../statuses/application_status_submitted_alc.py | 9 +++++++-- .../application_status_submitted_incomplete_alc.py | 9 +++++++-- .../statuses/application_status_submitted_lfng.py | 9 +++++++-- .../statuses/application_status_wrong_lfng.py | 9 +++++++-- .../statuses/notice_of_intent_status_cancelled.py | 9 +++++++-- .../statuses/notice_of_intent_status_in_progress.py | 9 +++++++-- .../statuses/notice_of_intent_status_submitted_to_alc.py | 9 +++++++-- ...otice_of_intent_status_submitted_to_alc_incomplete.py | 9 +++++++-- 12 files changed, 84 insertions(+), 24 deletions(-) diff --git a/bin/migrate-oats-data/applications/submissions/statuses/application_status_cancelled.py b/bin/migrate-oats-data/applications/submissions/statuses/application_status_cancelled.py index 19762b5a4d..bc35fa5089 100644 --- a/bin/migrate-oats-data/applications/submissions/statuses/application_status_cancelled.py +++ b/bin/migrate-oats-data/applications/submissions/statuses/application_status_cancelled.py @@ -1,4 +1,9 @@ -from common import BATCH_UPLOAD_SIZE, setup_and_get_logger, convert_timezone, set_time +from common import ( + BATCH_UPLOAD_SIZE, + setup_and_get_logger, + add_timezone_and_keep_date_part, + set_time, +) from db import inject_conn_pool from psycopg2.extras import RealDictCursor, execute_batch @@ -109,7 +114,7 @@ def _map_fields(data): status_effective_date = data["min_date"] if status_effective_date: - date = convert_timezone(status_effective_date, "US/Pacific") + date = add_timezone_and_keep_date_part(status_effective_date) data["date"] = set_time(date) return data diff --git a/bin/migrate-oats-data/applications/submissions/statuses/application_status_in_progress.py b/bin/migrate-oats-data/applications/submissions/statuses/application_status_in_progress.py index 50de5d954a..4dabda93df 100644 --- a/bin/migrate-oats-data/applications/submissions/statuses/application_status_in_progress.py +++ b/bin/migrate-oats-data/applications/submissions/statuses/application_status_in_progress.py @@ -1,4 +1,9 @@ -from common import BATCH_UPLOAD_SIZE, setup_and_get_logger, convert_timezone, set_time +from common import ( + BATCH_UPLOAD_SIZE, + setup_and_get_logger, + add_timezone_and_keep_date_part, + set_time, +) from db import inject_conn_pool from psycopg2.extras import RealDictCursor, execute_batch @@ -117,7 +122,7 @@ def _map_fields(data): status_effective_date = data["when_created"] if status_effective_date: - date = convert_timezone(status_effective_date, "US/Pacific") + date = add_timezone_and_keep_date_part(status_effective_date) data["date"] = set_time(date) return data diff --git a/bin/migrate-oats-data/applications/submissions/statuses/application_status_returned_incomplete_lfng.py b/bin/migrate-oats-data/applications/submissions/statuses/application_status_returned_incomplete_lfng.py index cb0f08d12b..b46481a8a2 100644 --- a/bin/migrate-oats-data/applications/submissions/statuses/application_status_returned_incomplete_lfng.py +++ b/bin/migrate-oats-data/applications/submissions/statuses/application_status_returned_incomplete_lfng.py @@ -1,4 +1,9 @@ -from common import BATCH_UPLOAD_SIZE, setup_and_get_logger, convert_timezone, set_time +from common import ( + BATCH_UPLOAD_SIZE, + setup_and_get_logger, + add_timezone_and_keep_date_part, + set_time, +) from db import inject_conn_pool from psycopg2.extras import RealDictCursor, execute_batch @@ -111,7 +116,7 @@ def _map_fields(data): status_effective_date = data["max_date"] if status_effective_date: - date = convert_timezone(status_effective_date, "US/Pacific") + date = add_timezone_and_keep_date_part(status_effective_date) data["date"] = set_time(date) return data diff --git a/bin/migrate-oats-data/applications/submissions/statuses/application_status_review_lfng.py b/bin/migrate-oats-data/applications/submissions/statuses/application_status_review_lfng.py index ab3941cf44..e5ddc5ea2d 100644 --- a/bin/migrate-oats-data/applications/submissions/statuses/application_status_review_lfng.py +++ b/bin/migrate-oats-data/applications/submissions/statuses/application_status_review_lfng.py @@ -1,4 +1,9 @@ -from common import BATCH_UPLOAD_SIZE, setup_and_get_logger, convert_timezone, set_time +from common import ( + BATCH_UPLOAD_SIZE, + setup_and_get_logger, + add_timezone_and_keep_date_part, + set_time, +) from db import inject_conn_pool from psycopg2.extras import RealDictCursor, execute_batch @@ -111,7 +116,7 @@ def _map_fields(data): status_effective_date = data["max_date"] if status_effective_date: - date = convert_timezone(status_effective_date, "US/Pacific") + date = add_timezone_and_keep_date_part(status_effective_date) data["date"] = set_time(date) return data diff --git a/bin/migrate-oats-data/applications/submissions/statuses/application_status_submitted_alc.py b/bin/migrate-oats-data/applications/submissions/statuses/application_status_submitted_alc.py index 8201fc8acd..8ba04ef8c3 100644 --- a/bin/migrate-oats-data/applications/submissions/statuses/application_status_submitted_alc.py +++ b/bin/migrate-oats-data/applications/submissions/statuses/application_status_submitted_alc.py @@ -1,4 +1,9 @@ -from common import BATCH_UPLOAD_SIZE, setup_and_get_logger, convert_timezone, set_time +from common import ( + BATCH_UPLOAD_SIZE, + setup_and_get_logger, + add_timezone_and_keep_date_part, + set_time, +) from db import inject_conn_pool from psycopg2.extras import RealDictCursor, execute_batch @@ -109,7 +114,7 @@ def _map_fields(data): if data and data["submitted_to_alc_date"]: status_effective_date = data["submitted_to_alc_date"] if status_effective_date: - date = convert_timezone(status_effective_date, "US/Pacific") + date = add_timezone_and_keep_date_part(status_effective_date) data["date"] = set_time(date) return data diff --git a/bin/migrate-oats-data/applications/submissions/statuses/application_status_submitted_incomplete_alc.py b/bin/migrate-oats-data/applications/submissions/statuses/application_status_submitted_incomplete_alc.py index bf3e4f32f2..3bcfdc83bd 100644 --- a/bin/migrate-oats-data/applications/submissions/statuses/application_status_submitted_incomplete_alc.py +++ b/bin/migrate-oats-data/applications/submissions/statuses/application_status_submitted_incomplete_alc.py @@ -1,4 +1,9 @@ -from common import BATCH_UPLOAD_SIZE, setup_and_get_logger, convert_timezone, set_time +from common import ( + BATCH_UPLOAD_SIZE, + setup_and_get_logger, + add_timezone_and_keep_date_part, + set_time, +) from db import inject_conn_pool from psycopg2.extras import RealDictCursor, execute_batch @@ -110,7 +115,7 @@ def _map_fields(data): if data and data["completion_date"]: status_effective_date = data["completion_date"] if status_effective_date: - date = convert_timezone(status_effective_date, "US/Pacific") + date = add_timezone_and_keep_date_part(status_effective_date) data["date"] = set_time(date) return data diff --git a/bin/migrate-oats-data/applications/submissions/statuses/application_status_submitted_lfng.py b/bin/migrate-oats-data/applications/submissions/statuses/application_status_submitted_lfng.py index ffd3cef979..2fe5bd548a 100644 --- a/bin/migrate-oats-data/applications/submissions/statuses/application_status_submitted_lfng.py +++ b/bin/migrate-oats-data/applications/submissions/statuses/application_status_submitted_lfng.py @@ -1,4 +1,9 @@ -from common import BATCH_UPLOAD_SIZE, setup_and_get_logger, convert_timezone, set_time +from common import ( + BATCH_UPLOAD_SIZE, + setup_and_get_logger, + add_timezone_and_keep_date_part, + set_time, +) from db import inject_conn_pool from psycopg2.extras import RealDictCursor, execute_batch @@ -111,7 +116,7 @@ def _map_fields(data): status_effective_date = data["max_date"] if status_effective_date: - date = convert_timezone(status_effective_date, "US/Pacific") + date = add_timezone_and_keep_date_part(status_effective_date) data["date"] = set_time(date) return data diff --git a/bin/migrate-oats-data/applications/submissions/statuses/application_status_wrong_lfng.py b/bin/migrate-oats-data/applications/submissions/statuses/application_status_wrong_lfng.py index c8583ae185..07bb07eb3f 100644 --- a/bin/migrate-oats-data/applications/submissions/statuses/application_status_wrong_lfng.py +++ b/bin/migrate-oats-data/applications/submissions/statuses/application_status_wrong_lfng.py @@ -1,4 +1,9 @@ -from common import BATCH_UPLOAD_SIZE, setup_and_get_logger, convert_timezone, set_time +from common import ( + BATCH_UPLOAD_SIZE, + setup_and_get_logger, + add_timezone_and_keep_date_part, + set_time, +) from db import inject_conn_pool from psycopg2.extras import RealDictCursor, execute_batch @@ -109,7 +114,7 @@ def _map_fields(data): status_effective_date = data["max_date"] if status_effective_date: - date = convert_timezone(status_effective_date, "US/Pacific") + date = add_timezone_and_keep_date_part(status_effective_date) data["date"] = set_time(date) return data diff --git a/bin/migrate-oats-data/noi/notice_of_intent_submissions/statuses/notice_of_intent_status_cancelled.py b/bin/migrate-oats-data/noi/notice_of_intent_submissions/statuses/notice_of_intent_status_cancelled.py index c6ddb9255e..f3bd463081 100644 --- a/bin/migrate-oats-data/noi/notice_of_intent_submissions/statuses/notice_of_intent_status_cancelled.py +++ b/bin/migrate-oats-data/noi/notice_of_intent_submissions/statuses/notice_of_intent_status_cancelled.py @@ -1,4 +1,9 @@ -from common import BATCH_UPLOAD_SIZE, setup_and_get_logger, convert_timezone, set_time +from common import ( + BATCH_UPLOAD_SIZE, + setup_and_get_logger, + add_timezone_and_keep_date_part, + set_time, +) from db import inject_conn_pool from psycopg2.extras import RealDictCursor, execute_batch @@ -111,7 +116,7 @@ def _map_fields(data): status_effective_date = data["min_date"] if status_effective_date: - date = convert_timezone(status_effective_date, "US/Pacific") + date = add_timezone_and_keep_date_part(status_effective_date) data["date"] = set_time(date) return data diff --git a/bin/migrate-oats-data/noi/notice_of_intent_submissions/statuses/notice_of_intent_status_in_progress.py b/bin/migrate-oats-data/noi/notice_of_intent_submissions/statuses/notice_of_intent_status_in_progress.py index c9b0ae5ccf..b298d7c8ec 100644 --- a/bin/migrate-oats-data/noi/notice_of_intent_submissions/statuses/notice_of_intent_status_in_progress.py +++ b/bin/migrate-oats-data/noi/notice_of_intent_submissions/statuses/notice_of_intent_status_in_progress.py @@ -1,4 +1,9 @@ -from common import BATCH_UPLOAD_SIZE, setup_and_get_logger, convert_timezone, set_time +from common import ( + BATCH_UPLOAD_SIZE, + setup_and_get_logger, + add_timezone_and_keep_date_part, + set_time, +) from db import inject_conn_pool from psycopg2.extras import RealDictCursor, execute_batch @@ -117,7 +122,7 @@ def _map_fields(data): status_effective_date = data["when_created"] if status_effective_date: - date = convert_timezone(status_effective_date, "US/Pacific") + date = add_timezone_and_keep_date_part(status_effective_date) data["date"] = set_time(date) return data diff --git a/bin/migrate-oats-data/noi/notice_of_intent_submissions/statuses/notice_of_intent_status_submitted_to_alc.py b/bin/migrate-oats-data/noi/notice_of_intent_submissions/statuses/notice_of_intent_status_submitted_to_alc.py index 71ad85ae91..c4aaab37a0 100644 --- a/bin/migrate-oats-data/noi/notice_of_intent_submissions/statuses/notice_of_intent_status_submitted_to_alc.py +++ b/bin/migrate-oats-data/noi/notice_of_intent_submissions/statuses/notice_of_intent_status_submitted_to_alc.py @@ -1,4 +1,9 @@ -from common import BATCH_UPLOAD_SIZE, setup_and_get_logger, convert_timezone, set_time +from common import ( + BATCH_UPLOAD_SIZE, + setup_and_get_logger, + add_timezone_and_keep_date_part, + set_time, +) from db import inject_conn_pool from psycopg2.extras import RealDictCursor, execute_batch @@ -110,7 +115,7 @@ def _map_fields(data): if data and data["submitted_to_alc_date"]: status_effective_date = data["submitted_to_alc_date"] if status_effective_date: - date = convert_timezone(status_effective_date, "US/Pacific") + date = add_timezone_and_keep_date_part(status_effective_date) data["date"] = set_time(date) return data diff --git a/bin/migrate-oats-data/noi/notice_of_intent_submissions/statuses/notice_of_intent_status_submitted_to_alc_incomplete.py b/bin/migrate-oats-data/noi/notice_of_intent_submissions/statuses/notice_of_intent_status_submitted_to_alc_incomplete.py index e98156aaeb..99b2e5c641 100644 --- a/bin/migrate-oats-data/noi/notice_of_intent_submissions/statuses/notice_of_intent_status_submitted_to_alc_incomplete.py +++ b/bin/migrate-oats-data/noi/notice_of_intent_submissions/statuses/notice_of_intent_status_submitted_to_alc_incomplete.py @@ -1,4 +1,9 @@ -from common import BATCH_UPLOAD_SIZE, setup_and_get_logger, convert_timezone, set_time +from common import ( + BATCH_UPLOAD_SIZE, + setup_and_get_logger, + add_timezone_and_keep_date_part, + set_time, +) from db import inject_conn_pool from psycopg2.extras import RealDictCursor, execute_batch @@ -110,7 +115,7 @@ def _map_fields(data): if data and data["completion_date"]: status_effective_date = data["completion_date"] if status_effective_date: - date = convert_timezone(status_effective_date, "US/Pacific") + date = add_timezone_and_keep_date_part(status_effective_date) data["date"] = set_time(date) return data From 8b5703f85c0ae297579e9957a4fd8313bf0b5b60 Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Wed, 8 Nov 2023 12:08:31 -0800 Subject: [PATCH 612/954] Decision outcome applications,noi public search --- .../application-search-table.component.html | 7 +++ .../application-search-table.component.ts | 7 ++- ...tice-of-intent-search-table.component.html | 7 +++ ...notice-of-intent-search-table.component.ts | 6 ++- .../search/public-search.component.html | 11 +++- .../public/search/public-search.component.ts | 16 ++++++ .../src/app/services/search/search.dto.ts | 2 + .../apps/alcs/src/alcs/search/search.dto.ts | 1 + .../public-application-search-view.entity.ts | 8 ++- .../public-application-search.service.ts | 7 +++ ...lic-notice-of-intent-search-view.entity.ts | 9 +++- .../public-notice-of-intent-search.service.ts | 7 +++ .../public/search/public-search.controller.ts | 4 ++ .../portal/public/search/public-search.dto.ts | 5 ++ ...1699394945369-add_outcome_public_search.ts | 51 +++++++++++++++++++ ...461885734-add_outcome_public_search_noi.ts | 16 ++++++ 16 files changed, 159 insertions(+), 5 deletions(-) create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1699394945369-add_outcome_public_search.ts create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1699461885734-add_outcome_public_search_noi.ts diff --git a/portal-frontend/src/app/features/public/search/application-search-table/application-search-table.component.html b/portal-frontend/src/app/features/public/search/application-search-table/application-search-table.component.html index 251efa1ad2..0fa3b6d633 100644 --- a/portal-frontend/src/app/features/public/search/application-search-table/application-search-table.component.html +++ b/portal-frontend/src/app/features/public/search/application-search-table/application-search-table.component.html @@ -43,6 +43,13 @@ </td> </ng-container> + <ng-container matColumnDef="outcome"> + <th class="type-cell" mat-header-cell *matHeaderCellDef mat-sort-header>Outcome</th> + <td mat-cell *matCellDef="let element"> + {{ outcomeMapping[element.outcome] | emptyColumn }} + </td> + </ng-container> + <ng-container matColumnDef="lastUpdate"> <th mat-header-cell *matHeaderCellDef mat-sort-header>Last Update</th> <td mat-cell *matCellDef="let element"> diff --git a/portal-frontend/src/app/features/public/search/application-search-table/application-search-table.component.ts b/portal-frontend/src/app/features/public/search/application-search-table/application-search-table.component.ts index f27ff2e611..7222652e79 100644 --- a/portal-frontend/src/app/features/public/search/application-search-table/application-search-table.component.ts +++ b/portal-frontend/src/app/features/public/search/application-search-table/application-search-table.component.ts @@ -36,7 +36,12 @@ export class ApplicationSearchTableComponent implements OnDestroy { @Input() statuses: ApplicationStatusDto[] = []; @Output() tableChange = new EventEmitter<TableChange>(); - displayedColumns = ['fileId', 'ownerName', 'type', 'portalStatus', 'lastUpdate', 'government']; + displayedColumns = ['fileId', 'ownerName', 'type', 'portalStatus', 'outcome', 'lastUpdate', 'government']; + outcomeMapping: {[code:string] : string } = { + 'APPR': "Approved", + 'REFU': "Refused", + 'RESC': "Rescinded", + } dataSource = new MatTableDataSource<SearchResult>(); pageIndex = 0; itemsPerPage = 20; diff --git a/portal-frontend/src/app/features/public/search/notice-of-intent-search-table/notice-of-intent-search-table.component.html b/portal-frontend/src/app/features/public/search/notice-of-intent-search-table/notice-of-intent-search-table.component.html index e668f63da1..5d8a294e30 100644 --- a/portal-frontend/src/app/features/public/search/notice-of-intent-search-table/notice-of-intent-search-table.component.html +++ b/portal-frontend/src/app/features/public/search/notice-of-intent-search-table/notice-of-intent-search-table.component.html @@ -42,6 +42,13 @@ </div> </td> </ng-container> + + <ng-container matColumnDef="outcome"> + <th class="type-cell" mat-header-cell *matHeaderCellDef mat-sort-header>Outcome</th> + <td mat-cell *matCellDef="let element"> + {{ outcomeMapping[element.outcome] | emptyColumn }} + </td> + </ng-container> <ng-container matColumnDef="lastUpdate"> <th mat-header-cell *matHeaderCellDef mat-sort-header>Last Update</th> diff --git a/portal-frontend/src/app/features/public/search/notice-of-intent-search-table/notice-of-intent-search-table.component.ts b/portal-frontend/src/app/features/public/search/notice-of-intent-search-table/notice-of-intent-search-table.component.ts index 6c79df48fd..b3636aae0a 100644 --- a/portal-frontend/src/app/features/public/search/notice-of-intent-search-table/notice-of-intent-search-table.component.ts +++ b/portal-frontend/src/app/features/public/search/notice-of-intent-search-table/notice-of-intent-search-table.component.ts @@ -34,7 +34,11 @@ export class NoticeOfIntentSearchTableComponent implements OnDestroy { @Input() statuses: ApplicationStatusDto[] = []; @Output() tableChange = new EventEmitter<TableChange>(); - displayedColumns = ['fileId', 'ownerName', 'type', 'portalStatus', 'lastUpdate', 'government']; + displayedColumns = ['fileId', 'ownerName', 'type', 'portalStatus', 'outcome', 'lastUpdate', 'government']; + outcomeMapping: {[code:string] : string } = { + 'APPR': "Approved", + 'ONTP': "Ordered not to Proceed (NOI)", + } dataSource = new MatTableDataSource<SearchResult>(); pageIndex = 0; itemsPerPage = 20; diff --git a/portal-frontend/src/app/features/public/search/public-search.component.html b/portal-frontend/src/app/features/public/search/public-search.component.html index d0280e82d5..6d34e942c0 100644 --- a/portal-frontend/src/app/features/public/search/public-search.component.html +++ b/portal-frontend/src/app/features/public/search/public-search.component.html @@ -71,7 +71,16 @@ <h3>Search by one or more of the following fields:</h3> </mat-select> </mat-form-field> </div> - <div><label for="status">Decision Outcome</label>//TODO: Decision Outcome</div> + <div> + <label for="decision">Decision Outcome</label> + <mat-form-field appearance="outline"> + <mat-select multiple="true" id="decision" [formControl]="portalDecisionOutcomeControl"> + <mat-option *ngFor="let decision of DECISION_MAP" [value]="decision[1]"> + {{ decision[0] }} + </mat-option> + </mat-select> + </mat-form-field> + </div> <div> <label for="status">Decision Maker</label> <mat-form-field appearance="outline"> diff --git a/portal-frontend/src/app/features/public/search/public-search.component.ts b/portal-frontend/src/app/features/public/search/public-search.component.ts index 2bda1e44cf..882f06ec5f 100644 --- a/portal-frontend/src/app/features/public/search/public-search.component.ts +++ b/portal-frontend/src/app/features/public/search/public-search.component.ts @@ -30,6 +30,13 @@ const STATUS_MAP = { 'ALC Response Sent (SRW only)': 'ALCR', }; +const DECISION_MAP = { + 'Approved': 'APPR', + 'Refused': 'REFU', + 'Rescinded': 'RESC', + 'Ordered not to Proceed (NOI)': 'ONTP', +}; + const SEARCH_SESSION_STORAGE_KEY = 'search'; @Component({ @@ -53,6 +60,7 @@ export class PublicSearchComponent implements OnInit, OnDestroy { notifications: NotificationSearchResultDto[] = []; notificationTotal = 0; + outcome = ''; pageIndex = 0; itemsPerPage = 20; @@ -61,6 +69,7 @@ export class PublicSearchComponent implements OnInit, OnDestroy { localGovernmentControl = new FormControl<string | undefined>(undefined); portalStatusControl = new FormControl<string[]>([]); + portalDecisionOutcomeControl = new FormControl<string[]>([]); componentTypeControl = new FormControl<string[] | undefined>(undefined); pidControl = new FormControl<string | undefined>(undefined); nameControl = new FormControl<string | undefined>(undefined); @@ -71,6 +80,7 @@ export class PublicSearchComponent implements OnInit, OnDestroy { pid: this.pidControl, civicAddress: this.civicAddressControl, portalStatus: this.portalStatusControl, + portalDecisionOutcome: this.portalDecisionOutcomeControl, componentType: this.componentTypeControl, government: this.localGovernmentControl, decisionMaker: new FormControl<string | undefined>(undefined), @@ -90,6 +100,7 @@ export class PublicSearchComponent implements OnInit, OnDestroy { searchResultsHidden = true; decisionMakers: DecisionMakerDto[] = []; STATUS_MAP = Object.entries(STATUS_MAP); + DECISION_MAP = Object.entries(DECISION_MAP); isMobile = false; isLoading = false; today = new Date(); @@ -244,6 +255,7 @@ export class PublicSearchComponent implements OnInit, OnDestroy { fileNumber: this.formatStringSearchParam(searchControls.fileNumber.value), name: this.formatStringSearchParam(searchControls.name.value), civicAddress: this.formatStringSearchParam(searchControls.civicAddress.value), + decisionOutcome: searchControls.portalDecisionOutcome.value ?? undefined, pid: this.formatStringSearchParam(searchControls.pid.value), portalStatusCodes: searchControls.portalStatus.value ?? undefined, governmentName: this.formatStringSearchParam(searchControls.government.value), @@ -366,6 +378,7 @@ export class PublicSearchComponent implements OnInit, OnDestroy { totalApplications: 0, totalNoticeOfIntents: 0, totalNotifications: 0, + outcome: '' }; } @@ -377,6 +390,7 @@ export class PublicSearchComponent implements OnInit, OnDestroy { this.notifications = searchResult.notifications; this.notificationTotal = searchResult.totalNotifications; + this.outcome = searchResult.outcome; } private setActiveTab() { @@ -424,6 +438,7 @@ export class PublicSearchComponent implements OnInit, OnDestroy { civicAddress, government, portalStatus, + portalDecisionOutcome } = this.searchForm.controls; decisionMaker.setValue(storedSearch.decisionMakerCode); @@ -434,6 +449,7 @@ export class PublicSearchComponent implements OnInit, OnDestroy { civicAddress.setValue(storedSearch.civicAddress); government.setValue(storedSearch.governmentName); portalStatus.setValue(storedSearch.portalStatusCodes ?? null); + portalDecisionOutcome.setValue(storedSearch.decisionOutcome ?? null) if (storedSearch.dateDecidedTo) { dateDecidedTo.setValue(new Date(storedSearch.dateDecidedTo)); diff --git a/portal-frontend/src/app/services/search/search.dto.ts b/portal-frontend/src/app/services/search/search.dto.ts index 3c4638d7b1..218dd2a3bc 100644 --- a/portal-frontend/src/app/services/search/search.dto.ts +++ b/portal-frontend/src/app/services/search/search.dto.ts @@ -23,6 +23,7 @@ export interface SearchResponseDto { totalApplications: number; totalNoticeOfIntents: number; totalNotifications: number; + outcome: string; } export interface AdvancedSearchEntityResponseDto<T> { @@ -49,4 +50,5 @@ export interface SearchRequestDto extends PagingRequestDto { dateDecidedFrom?: number; dateDecidedTo?: number; fileTypes: string[]; + decisionOutcome?: string[]; } diff --git a/services/apps/alcs/src/alcs/search/search.dto.ts b/services/apps/alcs/src/alcs/search/search.dto.ts index e169a54787..8bd5119cac 100644 --- a/services/apps/alcs/src/alcs/search/search.dto.ts +++ b/services/apps/alcs/src/alcs/search/search.dto.ts @@ -16,6 +16,7 @@ export class SearchResultDto { fileNumber: string; boardCode?: string; label?: ApplicationTypeDto; + outcome?: string } export type SearchEntityClass = 'APP' | 'NOI' | 'PLAN' | 'COV' | 'NOTI'; diff --git a/services/apps/alcs/src/portal/public/search/application/public-application-search-view.entity.ts b/services/apps/alcs/src/portal/public/search/application/public-application-search-view.entity.ts index bb88bc3a8c..23f1dd97c6 100644 --- a/services/apps/alcs/src/portal/public/search/application/public-application-search-view.entity.ts +++ b/services/apps/alcs/src/portal/public/search/application/public-application-search-view.entity.ts @@ -26,6 +26,7 @@ import { LinkedStatusType } from '../public-search.dto'; .addSelect('app_sub.type_code', 'application_type_code') .addSelect('app.date_submitted_to_alc', 'date_submitted_to_alc') .addSelect('app.decision_date', 'decision_date') + .addSelect('decision_date.outcome', 'outcome') .addSelect('app.uuid', 'application_uuid') .addSelect('app.region_code', 'application_region_code') .addSelect( @@ -63,8 +64,10 @@ import { LinkedStatusType } from '../public-search.dto'; qb .from(ApplicationDecision, 'decision_date') .select('MAX("date")', 'date') + .addSelect('outcome_code', 'outcome') .addSelect('application_uuid', 'application_uuid') - .groupBy('application_uuid'), + .groupBy('application_uuid') + .addGroupBy('outcome'), 'decision_date', 'decision_date."application_uuid" = app.uuid', ) @@ -114,6 +117,9 @@ export class PublicApplicationSubmissionSearchView { @ViewColumn() decisionDate: Date | null; + @ViewColumn() + outcome: string | null; + @ManyToOne(() => ApplicationType, { nullable: false, }) diff --git a/services/apps/alcs/src/portal/public/search/application/public-application-search.service.ts b/services/apps/alcs/src/portal/public/search/application/public-application-search.service.ts index 891b430f2e..2a7b8f7a32 100644 --- a/services/apps/alcs/src/portal/public/search/application/public-application-search.service.ts +++ b/services/apps/alcs/src/portal/public/search/application/public-application-search.service.ts @@ -84,6 +84,7 @@ export class PublicApplicationSearchService { , "appSearch"."local_government_name" , "appSearch"."application_type_code" , "appSearch"."status" + , "appSearch"."outcome" , "appSearch"."date_submitted_to_alc" , "appSearch"."decision_date" , "appSearch"."last_update" @@ -123,6 +124,12 @@ export class PublicApplicationSearchService { ); } + if (searchDto.decisionOutcome && searchDto.decisionOutcome.length > 0) { + query.andWhere('appSearch.outcome IN(:...outcomes)', { + outcomes: searchDto.decisionOutcome, + }); + } + if (searchDto.governmentName) { const government = await this.governmentRepository.findOneByOrFail({ name: searchDto.governmentName, diff --git a/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search-view.entity.ts b/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search-view.entity.ts index 303d333caf..8f730e589f 100644 --- a/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search-view.entity.ts +++ b/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search-view.entity.ts @@ -26,6 +26,7 @@ import { LinkedStatusType } from '../public-search.dto'; .addSelect('noi_sub.type_code', 'notice_of_intent_type_code') .addSelect('noi.date_submitted_to_alc', 'date_submitted_to_alc') .addSelect('noi.decision_date', 'decision_date') + .addSelect('decision_date.outcome', 'outcome') .addSelect('noi.uuid', 'notice_of_intent_uuid') .addSelect('noi.region_code', 'notice_of_intent_region_code') .addSelect( @@ -63,8 +64,10 @@ import { LinkedStatusType } from '../public-search.dto'; qb .from(NoticeOfIntentDecision, 'decision_date') .select('MAX("date")', 'date') + .addSelect('outcome_code', 'outcome') .addSelect('notice_of_intent_uuid', 'notice_of_intent_uuid') - .groupBy('notice_of_intent_uuid'), + .groupBy('notice_of_intent_uuid') + .addGroupBy('outcome'), 'decision_date', 'decision_date."notice_of_intent_uuid" = noi.uuid', ) @@ -114,6 +117,10 @@ export class PublicNoticeOfIntentSubmissionSearchView { @ViewColumn() decisionDate: Date | null; + + @ViewColumn() + outcome: string | null; + @ManyToOne(() => NoticeOfIntentType, { nullable: false, }) diff --git a/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search.service.ts b/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search.service.ts index 5195b69af1..26d5bcb8a3 100644 --- a/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search.service.ts +++ b/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search.service.ts @@ -88,6 +88,7 @@ export class PublicNoticeOfIntentSearchService { , "noiSearch"."status" , "noiSearch"."date_submitted_to_alc" , "noiSearch"."decision_date" + , "noiSearch"."outcome" , "noiSearch"."last_update" , "noticeOfIntentType"."audit_deleted_date_at" , "noticeOfIntentType"."audit_created_at" @@ -135,6 +136,12 @@ export class PublicNoticeOfIntentSearchService { ); } + if (searchDto.decisionOutcome && searchDto.decisionOutcome.length > 0) { + query.andWhere('noiSearch.outcome IN(:...outcomes)', { + outcomes: searchDto.decisionOutcome, + }); + } + if (searchDto.regionCodes && searchDto.regionCodes.length > 0) { query.andWhere('noiSearch.notice_of_intent_region_code IN(:...regions)', { regions: searchDto.regionCodes, diff --git a/services/apps/alcs/src/portal/public/search/public-search.controller.ts b/services/apps/alcs/src/portal/public/search/public-search.controller.ts index d62a78e739..53fbdaba58 100644 --- a/services/apps/alcs/src/portal/public/search/public-search.controller.ts +++ b/services/apps/alcs/src/portal/public/search/public-search.controller.ts @@ -145,6 +145,7 @@ export class PublicSearchController { !searchDto.dateDecidedFrom && !searchDto.dateDecidedTo && !searchDto.decisionMakerCode && + !searchDto.decisionOutcome && !isStringSetAndNotEmpty(searchDto.civicAddress); return { @@ -217,6 +218,7 @@ export class PublicSearchController { ownerName: application.applicant, class: 'APP', status: application.status.status_type_code, + outcome: application.outcome }; } @@ -233,6 +235,7 @@ export class PublicSearchController { ownerName: noi.applicant, class: 'NOI', status: noi.status.status_type_code, + outcome: noi.outcome }; } @@ -249,6 +252,7 @@ export class PublicSearchController { ownerName: notification.applicant, class: 'NOTI', status: notification.status.status_type_code, + outcome: null }; } } diff --git a/services/apps/alcs/src/portal/public/search/public-search.dto.ts b/services/apps/alcs/src/portal/public/search/public-search.dto.ts index 34473e6b89..aff7534588 100644 --- a/services/apps/alcs/src/portal/public/search/public-search.dto.ts +++ b/services/apps/alcs/src/portal/public/search/public-search.dto.ts @@ -19,6 +19,7 @@ export class BaseSearchResultDto { status: string; dateSubmitted?: number; lastUpdate?: number; + outcome: string | null; class: SearchEntityClass; } @@ -78,6 +79,10 @@ export class SearchRequestDto extends PagingRequestDto { @IsOptional() portalStatusCodes?: string[]; + @IsArray() + @IsOptional() + decisionOutcome?: string[]; + @IsString() @IsOptional() governmentName?: string; diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1699394945369-add_outcome_public_search.ts b/services/apps/alcs/src/providers/typeorm/migrations/1699394945369-add_outcome_public_search.ts new file mode 100644 index 0000000000..7fb815b9cc --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1699394945369-add_outcome_public_search.ts @@ -0,0 +1,51 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class addOutcomePublicSearch1699031687624 implements MigrationInterface { + name = 'addOutcomePublicSearch1699031687624'; + + public async up(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, + ['VIEW', 'public_application_submission_search_view', 'alcs'], + ); + await queryRunner.query( + `DROP VIEW "alcs"."public_application_submission_search_view"`, + ); + await queryRunner.query( + `CREATE VIEW "alcs"."public_application_submission_search_view" AS SELECT "app_sub"."uuid" AS "uuid", "app_sub"."applicant" AS "applicant", "app"."uuid" AS "application_uuid", "applicationType"."audit_deleted_date_at" AS "applicationType_audit_deleted_date_at", "applicationType"."audit_created_at" AS "applicationType_audit_created_at", "applicationType"."audit_updated_at" AS "applicationType_audit_updated_at", "applicationType"."audit_created_by" AS "applicationType_audit_created_by", "applicationType"."audit_updated_by" AS "applicationType_audit_updated_by", "applicationType"."label" AS "applicationType_label", "applicationType"."code" AS "applicationType_code", "applicationType"."description" AS "applicationType_description", "applicationType"."short_label" AS "applicationType_short_label", "applicationType"."background_color" AS "applicationType_background_color", "applicationType"."text_color" AS "applicationType_text_color", "applicationType"."html_description" AS "applicationType_html_description", "applicationType"."portal_label" AS "applicationType_portal_label", "applicationType"."portal_order" AS "applicationType_portal_order", "applicationType"."requires_government_review" AS "applicationType_requires_government_review", "localGovernment"."name" AS "local_government_name", "app_sub"."file_number" AS "file_number", "app_sub"."local_government_uuid" AS "local_government_uuid", "app_sub"."type_code" AS "application_type_code", "app"."date_submitted_to_alc" AS "date_submitted_to_alc", "app"."decision_date" AS "decision_date", decision_date.outcome AS "outcome", "app"."region_code" AS "application_region_code", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid") AS "status" FROM "alcs"."application_submission" "app_sub" INNER JOIN "alcs"."application" "app" ON "app"."file_number" = "app_sub"."file_number" AND "app"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."application_type" "applicationType" ON "app_sub"."type_code" = "applicationType"."code" AND "applicationType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "app_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."application_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "app_sub"."uuid" LEFT JOIN (SELECT MAX("date") AS "date", outcome_code AS "outcome", application_uuid AS "application_uuid" FROM "alcs"."application_decision" "decision_date" WHERE "decision_date"."audit_deleted_date_at" IS NULL GROUP BY application_uuid, outcome) "decision_date" ON decision_date."application_uuid" = "app"."uuid" WHERE ( "app_sub"."is_draft" = FALSE AND ("app"."date_received_all_items" IS NOT NULL AND "app"."date_received_all_items" <= NOW()) AND alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid")->>'status_type_code' != 'CNCL' ) AND ( "app_sub"."audit_deleted_date_at" IS NULL )`, + ); + await queryRunner.query( + `INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, + [ + 'alcs', + 'VIEW', + 'public_application_submission_search_view', + 'SELECT "app_sub"."uuid" AS "uuid", "app_sub"."applicant" AS "applicant", "app"."uuid" AS "application_uuid", "applicationType"."audit_deleted_date_at" AS "applicationType_audit_deleted_date_at", "applicationType"."audit_created_at" AS "applicationType_audit_created_at", "applicationType"."audit_updated_at" AS "applicationType_audit_updated_at", "applicationType"."audit_created_by" AS "applicationType_audit_created_by", "applicationType"."audit_updated_by" AS "applicationType_audit_updated_by", "applicationType"."label" AS "applicationType_label", "applicationType"."code" AS "applicationType_code", "applicationType"."description" AS "applicationType_description", "applicationType"."short_label" AS "applicationType_short_label", "applicationType"."background_color" AS "applicationType_background_color", "applicationType"."text_color" AS "applicationType_text_color", "applicationType"."html_description" AS "applicationType_html_description", "applicationType"."portal_label" AS "applicationType_portal_label", "applicationType"."portal_order" AS "applicationType_portal_order", "applicationType"."requires_government_review" AS "applicationType_requires_government_review", "localGovernment"."name" AS "local_government_name", "app_sub"."file_number" AS "file_number", "app_sub"."local_government_uuid" AS "local_government_uuid", "app_sub"."type_code" AS "application_type_code", "app"."date_submitted_to_alc" AS "date_submitted_to_alc", "app"."decision_date" AS "decision_date", decision_date.outcome AS "outcome", "app"."region_code" AS "application_region_code", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid") AS "status" FROM "alcs"."application_submission" "app_sub" INNER JOIN "alcs"."application" "app" ON "app"."file_number" = "app_sub"."file_number" AND "app"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."application_type" "applicationType" ON "app_sub"."type_code" = "applicationType"."code" AND "applicationType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "app_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."application_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "app_sub"."uuid" LEFT JOIN (SELECT MAX("date") AS "date", outcome_code AS "outcome", application_uuid AS "application_uuid" FROM "alcs"."application_decision" "decision_date" WHERE "decision_date"."audit_deleted_date_at" IS NULL GROUP BY application_uuid, outcome) "decision_date" ON decision_date."application_uuid" = "app"."uuid" WHERE ( "app_sub"."is_draft" = FALSE AND ("app"."date_received_all_items" IS NOT NULL AND "app"."date_received_all_items" <= NOW()) AND alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid")->>\'status_type_code\' != \'CNCL\' ) AND ( "app_sub"."audit_deleted_date_at" IS NULL )', + ], + ); + } + + public async down(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, + ['VIEW', 'public_application_submission_search_view', 'alcs'], + ); + await queryRunner.query( + `DROP VIEW "alcs"."public_application_submission_search_view"`, + ); + await queryRunner.query( + `CREATE VIEW "alcs"."public_application_submission_search_view" AS SELECT "app_sub"."uuid" AS "uuid", "app_sub"."applicant" AS "applicant", "app"."uuid" AS "application_uuid", "applicationType"."audit_deleted_date_at" AS "applicationType_audit_deleted_date_at", "applicationType"."audit_created_at" AS "applicationType_audit_created_at", "applicationType"."audit_updated_at" AS "applicationType_audit_updated_at", "applicationType"."audit_created_by" AS "applicationType_audit_created_by", "applicationType"."audit_updated_by" AS "applicationType_audit_updated_by", "applicationType"."label" AS "applicationType_label", "applicationType"."code" AS "applicationType_code", "applicationType"."description" AS "applicationType_description", "applicationType"."short_label" AS "applicationType_short_label", "applicationType"."background_color" AS "applicationType_background_color", "applicationType"."text_color" AS "applicationType_text_color", "applicationType"."html_description" AS "applicationType_html_description", "applicationType"."portal_label" AS "applicationType_portal_label", "applicationType"."portal_order" AS "applicationType_portal_order", "applicationType"."requires_government_review" AS "applicationType_requires_government_review", "localGovernment"."name" AS "local_government_name", "app_sub"."file_number" AS "file_number", "app_sub"."local_government_uuid" AS "local_government_uuid", "app_sub"."type_code" AS "application_type_code", "app"."date_submitted_to_alc" AS "date_submitted_to_alc", "app"."decision_date" AS "decision_date", "app"."region_code" AS "application_region_code", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid") AS "status" FROM "alcs"."application_submission" "app_sub" INNER JOIN "alcs"."application" "app" ON "app"."file_number" = "app_sub"."file_number" AND "app"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."application_type" "applicationType" ON "app_sub"."type_code" = "applicationType"."code" AND "applicationType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "app_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."application_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "app_sub"."uuid" LEFT JOIN (SELECT MAX("date") AS "date", outcome_code AS "outcome", application_uuid AS "application_uuid" FROM "alcs"."application_decision" "decision_date" WHERE "decision_date"."audit_deleted_date_at" IS NULL GROUP BY application_uuid, outcome) "decision_date" ON decision_date."application_uuid" = "app"."uuid" WHERE ( "app_sub"."is_draft" = FALSE AND ("app"."date_received_all_items" IS NOT NULL AND "app"."date_received_all_items" <= NOW()) AND alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid")->>'status_type_code' != 'CNCL' ) AND ( "app_sub"."audit_deleted_date_at" IS NULL )`, + ); + await queryRunner.query( + `INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, + [ + 'alcs', + 'VIEW', + 'public_application_submission_search_view', + 'SELECT "app_sub"."uuid" AS "uuid", "app_sub"."applicant" AS "applicant", "app"."uuid" AS "application_uuid", "applicationType"."audit_deleted_date_at" AS "applicationType_audit_deleted_date_at", "applicationType"."audit_created_at" AS "applicationType_audit_created_at", "applicationType"."audit_updated_at" AS "applicationType_audit_updated_at", "applicationType"."audit_created_by" AS "applicationType_audit_created_by", "applicationType"."audit_updated_by" AS "applicationType_audit_updated_by", "applicationType"."label" AS "applicationType_label", "applicationType"."code" AS "applicationType_code", "applicationType"."description" AS "applicationType_description", "applicationType"."short_label" AS "applicationType_short_label", "applicationType"."background_color" AS "applicationType_background_color", "applicationType"."text_color" AS "applicationType_text_color", "applicationType"."html_description" AS "applicationType_html_description", "applicationType"."portal_label" AS "applicationType_portal_label", "applicationType"."portal_order" AS "applicationType_portal_order", "applicationType"."requires_government_review" AS "applicationType_requires_government_review", "localGovernment"."name" AS "local_government_name", "app_sub"."file_number" AS "file_number", "app_sub"."local_government_uuid" AS "local_government_uuid", "app_sub"."type_code" AS "application_type_code", "app"."date_submitted_to_alc" AS "date_submitted_to_alc", "app"."decision_date" AS "decision_date", "app"."region_code" AS "application_region_code", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid") AS "status" FROM "alcs"."application_submission" "app_sub" INNER JOIN "alcs"."application" "app" ON "app"."file_number" = "app_sub"."file_number" AND "app"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."application_type" "applicationType" ON "app_sub"."type_code" = "applicationType"."code" AND "applicationType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "app_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."application_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "app_sub"."uuid" LEFT JOIN (SELECT MAX("date") AS "date", outcome_code AS "outcome", application_uuid AS "application_uuid" FROM "alcs"."application_decision" "decision_date" WHERE "decision_date"."audit_deleted_date_at" IS NULL GROUP BY application_uuid, outcome) "decision_date" ON decision_date."application_uuid" = "app"."uuid" WHERE ( "app_sub"."is_draft" = FALSE AND ("app"."date_received_all_items" IS NOT NULL AND "app"."date_received_all_items" <= NOW()) AND alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid")->>\'status_type_code\' != \'CNCL\' ) AND ( "app_sub"."audit_deleted_date_at" IS NULL )', + ], + ); + } +} + + diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1699461885734-add_outcome_public_search_noi.ts b/services/apps/alcs/src/providers/typeorm/migrations/1699461885734-add_outcome_public_search_noi.ts new file mode 100644 index 0000000000..27e851148e --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1699461885734-add_outcome_public_search_noi.ts @@ -0,0 +1,16 @@ +import { MigrationInterface, QueryRunner } from "typeorm"; + +export class addOutcomePublicSearchNoi1699461885734 implements MigrationInterface { + name = 'addOutcomePublicSearchNoi1699461885734' + + public async up(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query(`CREATE VIEW "alcs"."public_notice_of_intent_submission_search_view" AS SELECT "noi_sub"."uuid" AS "uuid", "noi_sub"."applicant" AS "applicant", "noi"."uuid" AS "notice_of_intent_uuid", "noticeOfIntentType"."audit_deleted_date_at" AS "noticeOfIntentType_audit_deleted_date_at", "noticeOfIntentType"."audit_created_at" AS "noticeOfIntentType_audit_created_at", "noticeOfIntentType"."audit_updated_at" AS "noticeOfIntentType_audit_updated_at", "noticeOfIntentType"."audit_created_by" AS "noticeOfIntentType_audit_created_by", "noticeOfIntentType"."audit_updated_by" AS "noticeOfIntentType_audit_updated_by", "noticeOfIntentType"."label" AS "noticeOfIntentType_label", "noticeOfIntentType"."code" AS "noticeOfIntentType_code", "noticeOfIntentType"."description" AS "noticeOfIntentType_description", "noticeOfIntentType"."short_label" AS "noticeOfIntentType_short_label", "noticeOfIntentType"."background_color" AS "noticeOfIntentType_background_color", "noticeOfIntentType"."text_color" AS "noticeOfIntentType_text_color", "noticeOfIntentType"."html_description" AS "noticeOfIntentType_html_description", "noticeOfIntentType"."portal_label" AS "noticeOfIntentType_portal_label", "localGovernment"."name" AS "local_government_name", "noi_sub"."file_number" AS "file_number", "noi_sub"."local_government_uuid" AS "local_government_uuid", "noi_sub"."type_code" AS "notice_of_intent_type_code", "noi"."date_submitted_to_alc" AS "date_submitted_to_alc", "noi"."decision_date" AS "decision_date", decision_date.outcome AS "outcome", "noi"."region_code" AS "notice_of_intent_region_code", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid") AS "status" FROM "alcs"."notice_of_intent_submission" "noi_sub" INNER JOIN "alcs"."notice_of_intent" "noi" ON "noi"."file_number" = "noi_sub"."file_number" AND "noi"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."notice_of_intent_type" "noticeOfIntentType" ON "noi_sub"."type_code" = "noticeOfIntentType"."code" AND "noticeOfIntentType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "noi_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."notice_of_intent_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "noi_sub"."uuid" LEFT JOIN (SELECT MAX("date") AS "date", outcome_code AS "outcome", notice_of_intent_uuid AS "notice_of_intent_uuid" FROM "alcs"."notice_of_intent_decision" "decision_date" WHERE "decision_date"."audit_deleted_date_at" IS NULL GROUP BY notice_of_intent_uuid, outcome) "decision_date" ON decision_date."notice_of_intent_uuid" = "noi"."uuid" WHERE ( "noi_sub"."is_draft" = FALSE AND ("noi"."date_received_all_items" IS NOT NULL AND "noi"."date_received_all_items" <= NOW()) AND alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid")->>'status_type_code' != 'CNCL' ) AND ( "noi_sub"."audit_deleted_date_at" IS NULL )`); + await queryRunner.query(`INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, ["alcs","VIEW","public_notice_of_intent_submission_search_view","SELECT \"noi_sub\".\"uuid\" AS \"uuid\", \"noi_sub\".\"applicant\" AS \"applicant\", \"noi\".\"uuid\" AS \"notice_of_intent_uuid\", \"noticeOfIntentType\".\"audit_deleted_date_at\" AS \"noticeOfIntentType_audit_deleted_date_at\", \"noticeOfIntentType\".\"audit_created_at\" AS \"noticeOfIntentType_audit_created_at\", \"noticeOfIntentType\".\"audit_updated_at\" AS \"noticeOfIntentType_audit_updated_at\", \"noticeOfIntentType\".\"audit_created_by\" AS \"noticeOfIntentType_audit_created_by\", \"noticeOfIntentType\".\"audit_updated_by\" AS \"noticeOfIntentType_audit_updated_by\", \"noticeOfIntentType\".\"label\" AS \"noticeOfIntentType_label\", \"noticeOfIntentType\".\"code\" AS \"noticeOfIntentType_code\", \"noticeOfIntentType\".\"description\" AS \"noticeOfIntentType_description\", \"noticeOfIntentType\".\"short_label\" AS \"noticeOfIntentType_short_label\", \"noticeOfIntentType\".\"background_color\" AS \"noticeOfIntentType_background_color\", \"noticeOfIntentType\".\"text_color\" AS \"noticeOfIntentType_text_color\", \"noticeOfIntentType\".\"html_description\" AS \"noticeOfIntentType_html_description\", \"noticeOfIntentType\".\"portal_label\" AS \"noticeOfIntentType_portal_label\", \"localGovernment\".\"name\" AS \"local_government_name\", \"noi_sub\".\"file_number\" AS \"file_number\", \"noi_sub\".\"local_government_uuid\" AS \"local_government_uuid\", \"noi_sub\".\"type_code\" AS \"notice_of_intent_type_code\", \"noi\".\"date_submitted_to_alc\" AS \"date_submitted_to_alc\", \"noi\".\"decision_date\" AS \"decision_date\", decision_date.outcome AS \"outcome\", \"noi\".\"region_code\" AS \"notice_of_intent_region_code\", GREATEST(status_link.effective_date, decision_date.date) AS \"last_update\", alcs.get_current_status_for_notice_of_intent_submission_by_uuid(\"noi_sub\".\"uuid\") AS \"status\" FROM \"alcs\".\"notice_of_intent_submission\" \"noi_sub\" INNER JOIN \"alcs\".\"notice_of_intent\" \"noi\" ON \"noi\".\"file_number\" = \"noi_sub\".\"file_number\" AND \"noi\".\"audit_deleted_date_at\" IS NULL INNER JOIN \"alcs\".\"notice_of_intent_type\" \"noticeOfIntentType\" ON \"noi_sub\".\"type_code\" = \"noticeOfIntentType\".\"code\" AND \"noticeOfIntentType\".\"audit_deleted_date_at\" IS NULL LEFT JOIN \"alcs\".\"local_government\" \"localGovernment\" ON \"noi_sub\".\"local_government_uuid\" = \"localGovernment\".\"uuid\" AND \"localGovernment\".\"audit_deleted_date_at\" IS NULL LEFT JOIN (SELECT MAX(\"effective_date\") AS \"effective_date\", submission_uuid AS \"submission_uuid\" FROM \"alcs\".\"notice_of_intent_submission_to_submission_status\" \"status_link\" GROUP BY submission_uuid) \"status_link\" ON status_link.\"submission_uuid\" = \"noi_sub\".\"uuid\" LEFT JOIN (SELECT MAX(\"date\") AS \"date\", outcome_code AS \"outcome\", notice_of_intent_uuid AS \"notice_of_intent_uuid\" FROM \"alcs\".\"notice_of_intent_decision\" \"decision_date\" WHERE \"decision_date\".\"audit_deleted_date_at\" IS NULL GROUP BY notice_of_intent_uuid, outcome) \"decision_date\" ON decision_date.\"notice_of_intent_uuid\" = \"noi\".\"uuid\" WHERE ( \"noi_sub\".\"is_draft\" = FALSE AND (\"noi\".\"date_received_all_items\" IS NOT NULL AND \"noi\".\"date_received_all_items\" <= NOW()) AND alcs.get_current_status_for_notice_of_intent_submission_by_uuid(\"noi_sub\".\"uuid\")->>'status_type_code' != 'CNCL' ) AND ( \"noi_sub\".\"audit_deleted_date_at\" IS NULL )"]); + } + + public async down(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query(`DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, ["VIEW","public_notice_of_intent_submission_search_view","alcs"]); + await queryRunner.query(`DROP VIEW "alcs"."public_notice_of_intent_submission_search_view"`); + } + +} From 462862b8feea1839479c680082957091672b4830 Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Wed, 8 Nov 2023 13:01:30 -0800 Subject: [PATCH 613/954] filter out parcels based on the alr_indicator, use bigint instead of integer (#1146) --- .../submissions/sql/parcels/application_parcels_insert.sql | 3 ++- .../sql/parcels/application_parcels_insert_count.sql | 2 +- .../validation/application_parcels_insert_validation.sql | 2 +- .../parcels/notice_of_intent_parcels_insert.sql | 3 ++- .../parcels/notice_of_intent_parcels_insert_count.sql | 2 +- .../parcels/notice_of_intent_parcels_insert_validation.sql | 2 +- 6 files changed, 8 insertions(+), 6 deletions(-) diff --git a/bin/migrate-oats-data/applications/submissions/sql/parcels/application_parcels_insert.sql b/bin/migrate-oats-data/applications/submissions/sql/parcels/application_parcels_insert.sql index 94172e91dd..8d041179cf 100644 --- a/bin/migrate-oats-data/applications/submissions/sql/parcels/application_parcels_insert.sql +++ b/bin/migrate-oats-data/applications/submissions/sql/parcels/application_parcels_insert.sql @@ -2,7 +2,8 @@ WITH parcels_to_insert AS ( SELECT apps.uuid, osp.subject_property_id FROM alcs.application_submission apps - JOIN oats.oats_subject_properties osp ON osp.alr_application_id = apps.file_number::INTEGER + JOIN oats.oats_subject_properties osp ON osp.alr_application_id = apps.file_number::bigint + WHERE osp.alr_application_land_ind = 'Y' -- ensure that only parcels in ALR are transferred ), grouped_oats_property_interests_ids AS ( SELECT MIN(property_owner_type_code) AS property_owner_type_code, diff --git a/bin/migrate-oats-data/applications/submissions/sql/parcels/application_parcels_insert_count.sql b/bin/migrate-oats-data/applications/submissions/sql/parcels/application_parcels_insert_count.sql index d697d860ec..1985b073eb 100644 --- a/bin/migrate-oats-data/applications/submissions/sql/parcels/application_parcels_insert_count.sql +++ b/bin/migrate-oats-data/applications/submissions/sql/parcels/application_parcels_insert_count.sql @@ -2,7 +2,7 @@ WITH parcels_to_insert AS ( SELECT apps.uuid, osp.subject_property_id FROM alcs.application_submission apps - JOIN oats.oats_subject_properties osp ON osp.alr_application_id = apps.file_number::INTEGER + JOIN oats.oats_subject_properties osp ON osp.alr_application_id = apps.file_number::bigint ), grouped_oats_property_interests_ids AS ( SELECT MIN(property_owner_type_code) AS property_owner_type_code, diff --git a/bin/migrate-oats-data/applications/submissions/sql/parcels/validation/application_parcels_insert_validation.sql b/bin/migrate-oats-data/applications/submissions/sql/parcels/validation/application_parcels_insert_validation.sql index ac8184f269..b72c3e12cf 100644 --- a/bin/migrate-oats-data/applications/submissions/sql/parcels/validation/application_parcels_insert_validation.sql +++ b/bin/migrate-oats-data/applications/submissions/sql/parcels/validation/application_parcels_insert_validation.sql @@ -19,7 +19,7 @@ WITH parcels_to_insert AS ( SELECT apps.uuid, osp.subject_property_id FROM alcs.application_submission apps - JOIN oats.oats_subject_properties osp ON osp.alr_application_id = apps.file_number::INTEGER + JOIN oats.oats_subject_properties osp ON osp.alr_application_id = apps.file_number::bigint ), grouped_oats_property_interests_ids AS ( SELECT MIN(property_owner_type_code) AS property_owner_type_code, diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/notice_of_intent_parcels_insert.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/notice_of_intent_parcels_insert.sql index c35986d216..999f6cd68b 100644 --- a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/notice_of_intent_parcels_insert.sql +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/notice_of_intent_parcels_insert.sql @@ -2,7 +2,8 @@ WITH parcels_to_insert AS ( SELECT nois.uuid, osp.subject_property_id FROM alcs.notice_of_intent_submission nois - JOIN oats.oats_subject_properties osp ON osp.alr_application_id = nois.file_number::INTEGER + JOIN oats.oats_subject_properties osp ON osp.alr_application_id = nois.file_number::bigint + WHERE osp.alr_application_land_ind = 'Y' -- ensure that only parcels in ALR are transferred ), grouped_oats_property_interests_ids AS ( SELECT MIN(property_owner_type_code) AS property_owner_type_code, diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/notice_of_intent_parcels_insert_count.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/notice_of_intent_parcels_insert_count.sql index ad6388e25e..7b69e160a9 100644 --- a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/notice_of_intent_parcels_insert_count.sql +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/notice_of_intent_parcels_insert_count.sql @@ -2,7 +2,7 @@ WITH parcels_to_insert AS ( SELECT nois.uuid, osp.subject_property_id FROM alcs.notice_of_intent_submission nois - JOIN oats.oats_subject_properties osp ON osp.alr_application_id = nois.file_number::INTEGER + JOIN oats.oats_subject_properties osp ON osp.alr_application_id = nois.file_number::bigint ), grouped_oats_property_interests_ids AS ( SELECT MIN(property_owner_type_code) AS property_owner_type_code, diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/notice_of_intent_parcels_insert_validation.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/notice_of_intent_parcels_insert_validation.sql index 254e6c9a09..ea743c22c3 100644 --- a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/notice_of_intent_parcels_insert_validation.sql +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/notice_of_intent_parcels_insert_validation.sql @@ -19,7 +19,7 @@ WITH parcels_to_insert AS ( SELECT nois.uuid, osp.subject_property_id FROM alcs.notice_of_intent_submission nois - JOIN oats.oats_subject_properties osp ON osp.alr_application_id = nois.file_number::INTEGER + JOIN oats.oats_subject_properties osp ON osp.alr_application_id = nois.file_number::bigint ), grouped_oats_property_interests_ids AS ( SELECT MIN(property_owner_type_code) AS property_owner_type_code, From 2af63409d839dbd88437865ed10edca3d891b706 Mon Sep 17 00:00:00 2001 From: Mekhti <mekhti.huseinov.ssi@gmail.com> Date: Wed, 8 Nov 2023 15:43:05 -0800 Subject: [PATCH 614/954] wip owners, added owner type mapping --- bin/migrate-oats-data/common/__init__.py | 2 +- ...e_codes.py => oats_to_alcs_parcel_enum.py} | 6 +++++ .../noi/notice_of_intent_migration.py | 6 +++++ .../parcels/owners/notice_of_intent_owners.py | 26 ++++++++++++++----- 4 files changed, 32 insertions(+), 8 deletions(-) rename bin/migrate-oats-data/common/{oats_to_alcs_ownership_type_codes.py => oats_to_alcs_parcel_enum.py} (76%) diff --git a/bin/migrate-oats-data/common/__init__.py b/bin/migrate-oats-data/common/__init__.py index 9c5e0712c3..744dcfc2c7 100644 --- a/bin/migrate-oats-data/common/__init__.py +++ b/bin/migrate-oats-data/common/__init__.py @@ -8,4 +8,4 @@ from .date_time_helper import * from .oats_to_alcs_naru_code_enum import * from .oats_temp_tables import * -from .oats_to_alcs_ownership_type_codes import * +from .oats_to_alcs_parcel_enum import * diff --git a/bin/migrate-oats-data/common/oats_to_alcs_ownership_type_codes.py b/bin/migrate-oats-data/common/oats_to_alcs_parcel_enum.py similarity index 76% rename from bin/migrate-oats-data/common/oats_to_alcs_ownership_type_codes.py rename to bin/migrate-oats-data/common/oats_to_alcs_parcel_enum.py index bc137cd65b..bb7d4c32ed 100644 --- a/bin/migrate-oats-data/common/oats_to_alcs_ownership_type_codes.py +++ b/bin/migrate-oats-data/common/oats_to_alcs_parcel_enum.py @@ -10,3 +10,9 @@ class OatsToAlcsOwnershipType(Enum): FEE = ALCSOwnershipType.FeeSimple.value CROWN = ALCSOwnershipType.Crown.value FIRST = ALCSOwnershipType.FeeSimple.value + + +class ALCSOwnerType(Enum): + INDV = "INDV" + ORGZ = "ORGZ" + CRWN = "CRWN" diff --git a/bin/migrate-oats-data/noi/notice_of_intent_migration.py b/bin/migrate-oats-data/noi/notice_of_intent_migration.py index 47ced0f7e8..1453edba9f 100644 --- a/bin/migrate-oats-data/noi/notice_of_intent_migration.py +++ b/bin/migrate-oats-data/noi/notice_of_intent_migration.py @@ -31,6 +31,10 @@ process_notice_of_intent_certificate_of_title, ) +from .notice_of_intent_submissions.parcels.owners import ( + process_notice_of_intent_parcel_owners, +) + def init_notice_of_intent(batch_size): init_notice_of_intents(batch_size=batch_size) @@ -77,5 +81,7 @@ def process_notice_of_intent(batch_size): process_notice_of_intent_certificate_of_title(batch_size) + process_notice_of_intent_parcel_owners(batch_size) + # this script must be the last one process_notice_of_intent_submission_status_emails() diff --git a/bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/owners/notice_of_intent_owners.py b/bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/owners/notice_of_intent_owners.py index 69b1078f4c..7dcd0390fd 100644 --- a/bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/owners/notice_of_intent_owners.py +++ b/bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/owners/notice_of_intent_owners.py @@ -1,4 +1,10 @@ -from common import setup_and_get_logger, BATCH_UPLOAD_SIZE, OATS_ETL_USER +from common import ( + setup_and_get_logger, + BATCH_UPLOAD_SIZE, + OATS_ETL_USER, + ALCSOwnershipType, + ALCSOwnerType, +) from db import inject_conn_pool from psycopg2.extras import RealDictCursor @@ -107,7 +113,7 @@ def _prepare_data_to_insert(rows): def _map_data(row): return { - "first_name": row["first_name"], + "first_name": _get_name(row), "last_name": row["last_name"], "organization_name": row["organization_name"], "notice_of_intent_submission_uuid": row["notice_of_intent_submission_uuid"], @@ -119,14 +125,20 @@ def _map_data(row): } +def _get_name(row): + first_name = row.get("first_name", "") + middle_name = row.get("middle_name", "") + return f"{first_name} {middle_name}".strip() + + def _map_owner_type(owner_record): - if owner_record["ownership_type_code"] == "SMPL": + if owner_record["ownership_type_code"] == ALCSOwnershipType.FeeSimple.value: if owner_record["person_id"] and not owner_record["organization_id"]: - return "INDV" + return ALCSOwnerType.INDV.value elif owner_record["organization_id"]: - return "ORGZ" - elif owner_record["ownership_type_code"] == "CRWN": - return "CRWN" + return ALCSOwnerType.ORGZ.value + elif owner_record["ownership_type_code"] == ALCSOwnershipType.Crown.value: + return ALCSOwnerType.CRWN.value # _parcel_owner_insert_query = f"""" From ac91bdee54362d59a49ef3442833ca98f91a1a2c Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Wed, 8 Nov 2023 14:44:37 -0800 Subject: [PATCH 615/954] DevOps Updates * Remove env so we don't print all our secrets * Update services docker file to load secrets --- services/Dockerfile | 5 +++++ services/migrate.sh | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/services/Dockerfile b/services/Dockerfile index b636f713f8..040ba3d09d 100644 --- a/services/Dockerfile +++ b/services/Dockerfile @@ -60,4 +60,9 @@ COPY ./config/ /opt/app-root/config/ COPY ./local-certificates /opt/app-root/local-certificates COPY ./templates/ /opt/app-root/templates/ +# Create Empty Config File if not Exists +RUN mkdir -p /vault/secrets +RUN touch /vault/secrets/config +RUN . /vault/secrets/config + CMD [ "node", "dist/main.js" ] \ No newline at end of file diff --git a/services/migrate.sh b/services/migrate.sh index ffbf0e0609..7550eb3763 100755 --- a/services/migrate.sh +++ b/services/migrate.sh @@ -1,4 +1,3 @@ #!/bin/sh -env echo "Beginning migration..." node --require ts-node/register ./node_modules/typeorm/cli.js migration:run -d ./apps/${NEST_APP}/src/providers/typeorm/datasource.cli.orm.config.ts \ No newline at end of file From d517aa2c1b28d6963c077b1b1c99ae45bb29cb17 Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Wed, 8 Nov 2023 17:35:00 -0800 Subject: [PATCH 616/954] =?UTF-8?q?update=20parcel=20validation=20scripts?= =?UTF-8?q?=20to=20respect=20alr=5Fapplication=5Fland=5Find;=E2=80=A6=20(#?= =?UTF-8?q?1148)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * update parcel validation scripts to respect alr_application_land_ind; compare only date part of dates * applied same requirements to certificate of title --- .../application_parcels_insert_count.sql | 1 + ...cation_certificate_of_title_validation.sql | 30 +++++++++++++---- .../application_parcels_insert_validation.sql | 32 +++++++++++++++++-- ...intent_certificate_of_title_validation.sql | 30 +++++++++++++---- .../notice_of_intent_parcels_insert_count.sql | 1 + ...ce_of_intent_parcels_insert_validation.sql | 23 ++++++++++--- 6 files changed, 97 insertions(+), 20 deletions(-) diff --git a/bin/migrate-oats-data/applications/submissions/sql/parcels/application_parcels_insert_count.sql b/bin/migrate-oats-data/applications/submissions/sql/parcels/application_parcels_insert_count.sql index 1985b073eb..c7ecaec4fc 100644 --- a/bin/migrate-oats-data/applications/submissions/sql/parcels/application_parcels_insert_count.sql +++ b/bin/migrate-oats-data/applications/submissions/sql/parcels/application_parcels_insert_count.sql @@ -3,6 +3,7 @@ WITH parcels_to_insert AS ( osp.subject_property_id FROM alcs.application_submission apps JOIN oats.oats_subject_properties osp ON osp.alr_application_id = apps.file_number::bigint + WHERE osp.alr_application_land_ind = 'Y' -- ensure that only parcels in ALR are transferred ), grouped_oats_property_interests_ids AS ( SELECT MIN(property_owner_type_code) AS property_owner_type_code, diff --git a/bin/migrate-oats-data/applications/submissions/sql/parcels/validation/application_certificate_of_title_validation.sql b/bin/migrate-oats-data/applications/submissions/sql/parcels/validation/application_certificate_of_title_validation.sql index e9af9e535e..66ad79f64d 100644 --- a/bin/migrate-oats-data/applications/submissions/sql/parcels/validation/application_certificate_of_title_validation.sql +++ b/bin/migrate-oats-data/applications/submissions/sql/parcels/validation/application_certificate_of_title_validation.sql @@ -1,13 +1,22 @@ -WITH oats_cert_of_titles AS ( +WITH applications_with_one_or_zero_component_only AS ( + SELECT oaac.alr_application_id, + max(oaac.alr_appl_component_id) AS alr_appl_component_id -- this IS NOT going TO effect the query since count < 2 + FROM oats.oats_alr_appl_components oaac + JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id + AND oaa.application_class_code IN ('LOA', 'BLK') + GROUP BY oaac.alr_application_id + HAVING count(oaac.alr_application_id) < 2 +), +oats_cert_of_titles AS ( SELECT od.document_id, osp.subject_property_id, oaa.alr_application_id FROM oats.oats_documents od JOIN oats.oats_subject_properties osp ON osp.subject_property_id = od.subject_property_id - JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = osp.alr_application_id + AND osp.alr_application_land_ind = 'Y' + JOIN applications_with_one_or_zero_component_only oaa ON oaa.alr_application_id = osp.alr_application_id JOIN oats.oats_document_codes odc ON odc.document_code = od.document_code WHERE od.document_code = 'CT' - AND oaa.application_class_code IN ('LOA', 'BLK') ), alcs_oats_certificate_of_titles AS ( SELECT appp.oats_subject_property_id, @@ -20,13 +29,22 @@ FROM alcs_oats_certificate_of_titles act LEFT JOIN oats_cert_of_titles oct ON oct.subject_property_id = act.oats_subject_property_id WHERE act.oats_document_id != oct.document_id::TEXT; -- count certificates of title in oats linked to subject_properties +WITH nois_with_one_or_zero_component_only AS ( + SELECT oaac.alr_application_id, + max(oaac.alr_appl_component_id) AS alr_appl_component_id -- this IS NOT going TO effect the query since count < 2 + FROM oats.oats_alr_appl_components oaac + JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id + AND oaa.application_class_code IN ('LOA', 'BLK') + GROUP BY oaac.alr_application_id + HAVING count(oaac.alr_application_id) < 2 +) SELECT count(*) FROM oats.oats_documents od JOIN oats.oats_subject_properties osp ON osp.subject_property_id = od.subject_property_id - JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = osp.alr_application_id + AND osp.alr_application_land_ind = 'Y' + JOIN nois_with_one_or_zero_component_only oaa ON oaa.alr_application_id = osp.alr_application_id JOIN oats.oats_document_codes odc ON odc.document_code = od.document_code -WHERE od.document_code = 'CT' - AND oaa.application_class_code IN ('LOA', 'BLK'); +WHERE od.document_code = 'CT'; -- count certificate of titles linked in alcs SELECT count(*) FROM alcs.application_parcel appp diff --git a/bin/migrate-oats-data/applications/submissions/sql/parcels/validation/application_parcels_insert_validation.sql b/bin/migrate-oats-data/applications/submissions/sql/parcels/validation/application_parcels_insert_validation.sql index b72c3e12cf..045d458299 100644 --- a/bin/migrate-oats-data/applications/submissions/sql/parcels/validation/application_parcels_insert_validation.sql +++ b/bin/migrate-oats-data/applications/submissions/sql/parcels/validation/application_parcels_insert_validation.sql @@ -13,7 +13,8 @@ WITH app_components_grouped AS ( ) SELECT count(*) FROM app_components_grouped appg - JOIN oats.oats_subject_properties osp ON osp.alr_application_id = appg.alr_application_id; + JOIN oats.oats_subject_properties osp ON osp.alr_application_id = appg.alr_application_id + AND osp.alr_application_land_ind = 'Y'; -- return records that are different between OATS and ALCS WITH parcels_to_insert AS ( SELECT apps.uuid, @@ -28,6 +29,19 @@ grouped_oats_property_interests_ids AS ( FROM oats.oats_property_interests opi GROUP BY opi.subject_property_id ) --- compares parcel fields and returns mismatches. Since oats has a lot of bad data ignore all records prior the 1900s +WITH parcels_to_insert AS ( + SELECT apps.uuid, + osp.subject_property_id + FROM alcs.application_submission apps + JOIN oats.oats_subject_properties osp ON osp.alr_application_id = apps.file_number::bigint +), +grouped_oats_property_interests_ids AS ( + SELECT MIN(property_owner_type_code) AS property_owner_type_code, + -- min will not affect anything since all property_owner_type_code are the same in scope of subject_property + subject_property_id + FROM oats.oats_property_interests opi + GROUP BY opi.subject_property_id +) --- compares parcel fields and returns mismatches. Since oats has a lot of bad data ignore all records prior the 1900s SELECT appp.alr_area, osp.alr_area, appp.civic_address, @@ -42,8 +56,16 @@ SELECT appp.alr_area, op.pid, appp.pin, op.pin, - appp.purchased_date AT TIME ZONE 'UTC', + appp.purchased_date, osp.purchase_date, + Date( + appp.purchased_date AT TIME ZONE 'America/Vancouver' + ) AS alcs_date, + -- GET ONLY the date part + Date( + osp.purchase_date AT TIME ZONE 'America/Vancouver' + ) AS oats_date, + -- GET ONLY the date part appp.ownership_type_code, gopi.property_owner_type_code, appp.oats_subject_property_id, @@ -61,7 +83,11 @@ WHERE appp.alr_area != osp.alr_area OR (appp.pid != op.pid::text) OR (appp.pin != op.pin::text) OR ( - appp.purchased_date != osp.purchase_date AT TIME ZONE 'America/Vancouver' + Date( + appp.purchased_date AT TIME ZONE 'America/Vancouver' + ) != Date( + osp.purchase_date AT TIME ZONE 'America/Vancouver' + ) ) OR ( appp.oats_subject_property_id != osp.subject_property_id diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/certificate_of_title/notice_of_intent_certificate_of_title_validation.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/certificate_of_title/notice_of_intent_certificate_of_title_validation.sql index 2c6774dadb..f7d73b7d1b 100644 --- a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/certificate_of_title/notice_of_intent_certificate_of_title_validation.sql +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/certificate_of_title/notice_of_intent_certificate_of_title_validation.sql @@ -1,13 +1,22 @@ -WITH oats_cert_of_titles AS ( +WITH nois_with_one_or_zero_component_only AS ( + SELECT oaac.alr_application_id, + max(oaac.alr_appl_component_id) AS alr_appl_component_id -- this IS NOT going TO effect the query since count < 2 + FROM oats.oats_alr_appl_components oaac + JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id + AND oaa.application_class_code = 'NOI' + GROUP BY oaac.alr_application_id + HAVING count(oaac.alr_application_id) < 2 +), +oats_cert_of_titles AS ( SELECT od.document_id, osp.subject_property_id, oaa.alr_application_id FROM oats.oats_documents od JOIN oats.oats_subject_properties osp ON osp.subject_property_id = od.subject_property_id - JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = osp.alr_application_id + AND osp.alr_application_land_ind = 'Y' + JOIN nois_with_one_or_zero_component_only oaa ON oaa.alr_application_id = osp.alr_application_id JOIN oats.oats_document_codes odc ON odc.document_code = od.document_code WHERE od.document_code = 'CT' - AND oaa.application_class_code = 'NOI' ), alcs_oats_certificate_of_titles AS ( SELECT noip.oats_subject_property_id, @@ -20,13 +29,22 @@ FROM alcs_oats_certificate_of_titles act LEFT JOIN oats_cert_of_titles oct ON oct.subject_property_id = act.oats_subject_property_id WHERE act.oats_document_id != oct.document_id::TEXT; -- count certificates of title in oats linked to subject_properties +WITH nois_with_one_or_zero_component_only AS ( + SELECT oaac.alr_application_id, + max(oaac.alr_appl_component_id) AS alr_appl_component_id -- this IS NOT going TO effect the query since count < 2 + FROM oats.oats_alr_appl_components oaac + JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id + AND oaa.application_class_code = 'NOI' + GROUP BY oaac.alr_application_id + HAVING count(oaac.alr_application_id) < 2 +) SELECT count(*) FROM oats.oats_documents od JOIN oats.oats_subject_properties osp ON osp.subject_property_id = od.subject_property_id - JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = osp.alr_application_id + AND osp.alr_application_land_ind = 'Y' + JOIN nois_with_one_or_zero_component_only oaa ON oaa.alr_application_id = osp.alr_application_id JOIN oats.oats_document_codes odc ON odc.document_code = od.document_code -WHERE od.document_code = 'CT' - AND oaa.application_class_code = 'NOI'; +WHERE od.document_code = 'CT'; -- count certificate of titles linked in alcs SELECT count(*) FROM alcs.notice_of_intent_parcel noip diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/notice_of_intent_parcels_insert_count.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/notice_of_intent_parcels_insert_count.sql index 7b69e160a9..fa0a360c74 100644 --- a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/notice_of_intent_parcels_insert_count.sql +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/notice_of_intent_parcels_insert_count.sql @@ -3,6 +3,7 @@ WITH parcels_to_insert AS ( osp.subject_property_id FROM alcs.notice_of_intent_submission nois JOIN oats.oats_subject_properties osp ON osp.alr_application_id = nois.file_number::bigint + AND osp.alr_application_land_ind = 'Y' ), grouped_oats_property_interests_ids AS ( SELECT MIN(property_owner_type_code) AS property_owner_type_code, diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/notice_of_intent_parcels_insert_validation.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/notice_of_intent_parcels_insert_validation.sql index ea743c22c3..c954444f0a 100644 --- a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/notice_of_intent_parcels_insert_validation.sql +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/notice_of_intent_parcels_insert_validation.sql @@ -1,5 +1,3 @@ --- Total count of inserted parcels should match total count of parcels in oats --- Get total count of parcels in ALCS SELECT count(*) FROM alcs.notice_of_intent_parcel noip; -- Get total count of parcels in OATS @@ -13,13 +11,16 @@ WITH noi_components_grouped AS ( ) SELECT count(*) FROM noi_components_grouped noig - JOIN oats.oats_subject_properties osp ON osp.alr_application_id = noig.alr_application_id; + JOIN oats.oats_subject_properties osp ON osp.alr_application_id = noig.alr_application_id + AND osp.alr_application_land_ind = 'Y'; +; -- return records that are different between OATS and ALCS WITH parcels_to_insert AS ( SELECT nois.uuid, osp.subject_property_id FROM alcs.notice_of_intent_submission nois JOIN oats.oats_subject_properties osp ON osp.alr_application_id = nois.file_number::bigint + AND osp.alr_application_land_ind = 'Y' ), grouped_oats_property_interests_ids AS ( SELECT MIN(property_owner_type_code) AS property_owner_type_code, @@ -42,8 +43,16 @@ SELECT noip.alr_area, op.pid, noip.pin, op.pin, - noip.purchased_date AT TIME ZONE 'UTC', + noip.purchased_date, osp.purchase_date, + Date( + noip.purchased_date AT TIME ZONE 'America/Vancouver' + ) AS alcs_date, + -- GET ONLY the date part + Date( + osp.purchase_date AT TIME ZONE 'America/Vancouver' + ) AS oats_date, + -- GET ONLY the date part noip.ownership_type_code, gopi.property_owner_type_code, noip.oats_subject_property_id, @@ -61,7 +70,11 @@ WHERE noip.alr_area != osp.alr_area OR (noip.pid != op.pid::text) OR (noip.pin != op.pin::text) OR ( - noip.purchased_date != osp.purchase_date AT TIME ZONE 'America/Vancouver' + Date( + noip.purchased_date AT TIME ZONE 'America/Vancouver' + ) != Date( + osp.purchase_date AT TIME ZONE 'America/Vancouver' + ) ) OR ( noip.oats_subject_property_id != osp.subject_property_id From 7f273770530e0a8a8ae858dcb21230f6c3b3b84a Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Thu, 9 Nov 2023 09:07:10 -0800 Subject: [PATCH 617/954] styling fixes --- .../naru-details/naru-details.component.html | 5 +- .../naru-details/naru-details.component.scss | 6 +- .../nfu-details/nfu-details.component.html | 59 ++++++++++--------- .../nfu-details/nfu-details.component.scss | 4 +- .../pofo-details/pofo-details.component.html | 5 +- .../roso-details/roso-details.component.html | 5 +- .../subd-details/subd-details.component.scss | 2 +- .../pofo-details/pofo-details.component.html | 5 +- .../roso-details/roso-details.component.html | 5 +- 9 files changed, 48 insertions(+), 48 deletions(-) diff --git a/portal-frontend/src/app/features/public/application/submission/naru-details/naru-details.component.html b/portal-frontend/src/app/features/public/application/submission/naru-details/naru-details.component.html index f2236d1664..19397070d6 100644 --- a/portal-frontend/src/app/features/public/application/submission/naru-details/naru-details.component.html +++ b/portal-frontend/src/app/features/public/application/submission/naru-details/naru-details.component.html @@ -195,9 +195,8 @@ ></app-no-data> </div> - <div class="full-width"> - <span class="subheading1">Project Duration</span> - </div> + <div class="grid-1"></div> + <div class="subheading2 grid-double">Project Duration</div> <div class="subheading2 grid-1">Duration</div> <div class="grid-double"> {{ applicationSubmission.naruProjectDurationUnit }} diff --git a/portal-frontend/src/app/features/public/application/submission/naru-details/naru-details.component.scss b/portal-frontend/src/app/features/public/application/submission/naru-details/naru-details.component.scss index b2b6b90127..75917bf09c 100644 --- a/portal-frontend/src/app/features/public/application/submission/naru-details/naru-details.component.scss +++ b/portal-frontend/src/app/features/public/application/submission/naru-details/naru-details.component.scss @@ -1,7 +1,9 @@ +@use '../../../../../../styles/functions' as *; + .soil-table { display: grid; grid-template-columns: max-content max-content; overflow-x: auto; - grid-column-gap: 36px; - grid-row-gap: 12px; + grid-column-gap: rem(36); + grid-row-gap: rem(12); } diff --git a/portal-frontend/src/app/features/public/application/submission/nfu-details/nfu-details.component.html b/portal-frontend/src/app/features/public/application/submission/nfu-details/nfu-details.component.html index 504b5a76c5..0839a99585 100644 --- a/portal-frontend/src/app/features/public/application/submission/nfu-details/nfu-details.component.html +++ b/portal-frontend/src/app/features/public/application/submission/nfu-details/nfu-details.component.html @@ -52,36 +52,39 @@ <h4>Soil and Fill Components</h4> {{ applicationSubmission.nfuFillOriginDescription }} <app-no-data *ngIf="!applicationSubmission.nfuFillOriginDescription"></app-no-data> </div> - <div class="subheading1 full-width">Fill to be Placed</div> - <div class="full-width soil-table"> - <div class="grid-1"><strong>Volume</strong></div> - <div class="grid-2"> - {{ applicationSubmission.nfuFillVolume }} - <span *ngIf="applicationSubmission.nfuFillVolume !== null">m<sup>3</sup></span> - <app-no-data *ngIf="applicationSubmission.nfuFillVolume === null"></app-no-data> - </div> - <div class="grid-1"><strong>Area</strong></div> - <div class="grid-2"> - {{ applicationSubmission.nfuTotalFillArea }} - <span *ngIf="applicationSubmission.nfuTotalFillArea !== null">m<sup>2</sup></span> - <app-no-data *ngIf="applicationSubmission.nfuTotalFillArea === null"></app-no-data> - </div> - <div class="grid-1"><strong>Maximum Depth</strong></div> - <div class="grid-2"> - {{ applicationSubmission.nfuMaxFillDepth }} - <span *ngIf="applicationSubmission.nfuMaxFillDepth !== null">m</span> - <app-no-data *ngIf="applicationSubmission.nfuMaxFillDepth === null"></app-no-data> - </div> - <div class="grid-1"><strong>Average Depth</strong></div> - <div class="grid-2"> - {{ applicationSubmission.nfuAverageFillDepth }} - <span *ngIf="applicationSubmission.nfuAverageFillDepth !== null">m</span> - <app-no-data *ngIf="applicationSubmission.nfuAverageFillDepth === null"></app-no-data> - </div> + <div class="grid-1"></div> + <div class="subheading2 grid-double">Fill to be Placed</div> + + <div class="subheading2 grid-1">Volume</div> + <div class="grid-double"> + {{ applicationSubmission.nfuFillVolume }} + <span *ngIf="applicationSubmission.nfuFillVolume !== null">m<sup>3</sup></span> + <app-no-data *ngIf="applicationSubmission.nfuFillVolume === null"></app-no-data> </div> - <div class="full-width"> - <span class="subheading1">Project Duration</span> + <div class="subheading2 grid-1">Area</div> + <div class="grid-double"> + {{ applicationSubmission.nfuTotalFillArea }} + <span *ngIf="applicationSubmission.nfuTotalFillArea !== null">m<sup>2</sup></span> + <app-no-data *ngIf="applicationSubmission.nfuTotalFillArea === null"></app-no-data> + </div> + <div class="subheading2 grid-1">Maximum Depth</div> + <div class="grid-double"> + {{ applicationSubmission.nfuMaxFillDepth }} + <span *ngIf="applicationSubmission.nfuMaxFillDepth !== null">m</span> + <app-no-data + *ngIf="applicationSubmission.nfuMaxFillDepth === null" + ></app-no-data> + </div> + <div class="subheading2 grid-1">Average Depth</div> + <div class="grid-double"> + {{ applicationSubmission.nfuAverageFillDepth }} + <span *ngIf="applicationSubmission.nfuAverageFillDepth !== null">m</span> + <app-no-data + *ngIf="applicationSubmission.nfuAverageFillDepth === null" + ></app-no-data> </div> + <div class="grid-1"></div> + <div class="subheading2 grid-double">Project Duration</div> <div class="subheading2 grid-1">Duration</div> <div class="grid-double"> {{ applicationSubmission.nfuProjectDurationUnit }} diff --git a/portal-frontend/src/app/features/public/application/submission/nfu-details/nfu-details.component.scss b/portal-frontend/src/app/features/public/application/submission/nfu-details/nfu-details.component.scss index 27b6f028ba..3ffe1603d5 100644 --- a/portal-frontend/src/app/features/public/application/submission/nfu-details/nfu-details.component.scss +++ b/portal-frontend/src/app/features/public/application/submission/nfu-details/nfu-details.component.scss @@ -8,11 +8,11 @@ grid-template-columns: max-content max-content max-content; @media screen and (min-width: $tabletBreakpoint) { - grid-template-columns: 0.55fr 1fr 1fr; + grid-template-columns: 0.55fr 1fr; } @media screen and (min-width: $midBreakpoint) { - grid-template-columns: 0.95fr 1fr 2fr; + grid-template-columns: 0.95fr 1fr; grid-column-gap: rem(16); } diff --git a/portal-frontend/src/app/features/public/application/submission/pofo-details/pofo-details.component.html b/portal-frontend/src/app/features/public/application/submission/pofo-details/pofo-details.component.html index 37b284d75b..a6e929b5fe 100644 --- a/portal-frontend/src/app/features/public/application/submission/pofo-details/pofo-details.component.html +++ b/portal-frontend/src/app/features/public/application/submission/pofo-details/pofo-details.component.html @@ -77,9 +77,8 @@ </div> </div> - <div class="full-width"> - <span class="subheading1">Project Duration</span> - </div> + <div class="grid-1"></div> + <div class="subheading2 grid-double">Project Duration</div> <div class="subheading2 grid-1">Duration</div> <div class="grid-double"> {{ applicationSubmission.soilProjectDurationUnit }} diff --git a/portal-frontend/src/app/features/public/application/submission/roso-details/roso-details.component.html b/portal-frontend/src/app/features/public/application/submission/roso-details/roso-details.component.html index 2856ebcfb2..a044f353e7 100644 --- a/portal-frontend/src/app/features/public/application/submission/roso-details/roso-details.component.html +++ b/portal-frontend/src/app/features/public/application/submission/roso-details/roso-details.component.html @@ -76,9 +76,8 @@ </div> </div> - <div class="full-width"> - <span class="subheading1">Project Duration</span> - </div> + <div class="grid-1"></div> + <div class="subheading2 grid-double">Project Duration</div> <div class="subheading2 grid-1">Duration</div> <div class="grid-double"> {{ applicationSubmission.soilProjectDurationUnit }} diff --git a/portal-frontend/src/app/features/public/application/submission/subd-details/subd-details.component.scss b/portal-frontend/src/app/features/public/application/submission/subd-details/subd-details.component.scss index 44d2821c88..340eef7f03 100644 --- a/portal-frontend/src/app/features/public/application/submission/subd-details/subd-details.component.scss +++ b/portal-frontend/src/app/features/public/application/submission/subd-details/subd-details.component.scss @@ -1,4 +1,4 @@ -@use '../../../../../../styles/functions.scss' as *; +@use '../../../../../../styles/functions' as *; .parcel-table { display: grid; diff --git a/portal-frontend/src/app/features/public/notice-of-intent/submission/pofo-details/pofo-details.component.html b/portal-frontend/src/app/features/public/notice-of-intent/submission/pofo-details/pofo-details.component.html index 242abeb87b..491d13b233 100644 --- a/portal-frontend/src/app/features/public/notice-of-intent/submission/pofo-details/pofo-details.component.html +++ b/portal-frontend/src/app/features/public/notice-of-intent/submission/pofo-details/pofo-details.component.html @@ -84,9 +84,8 @@ <app-no-data *ngIf="noiSubmission.soilAlreadyPlacedAverageDepth === null"></app-no-data> </div> - <div class="full-width"> - <h4>Project Duration</h4> - </div> + <div class="grid-1"></div> + <div class="subheading2 grid-double">Project Duration</div> <div class="subheading2 grid-1">Duration</div> <div class="grid-double"> {{ noiSubmission.soilProjectDurationUnit }} diff --git a/portal-frontend/src/app/features/public/notice-of-intent/submission/roso-details/roso-details.component.html b/portal-frontend/src/app/features/public/notice-of-intent/submission/roso-details/roso-details.component.html index 19527d6a22..9ff67519af 100644 --- a/portal-frontend/src/app/features/public/notice-of-intent/submission/roso-details/roso-details.component.html +++ b/portal-frontend/src/app/features/public/notice-of-intent/submission/roso-details/roso-details.component.html @@ -84,9 +84,8 @@ <app-no-data *ngIf="noiSubmission.soilAlreadyRemovedAverageDepth === null"></app-no-data> </div> - <div class="full-width"> - <h4>Project Duration</h4> - </div> + <div class="grid-1"></div> + <div class="subheading2 grid-double">Project Duration</div> <div class="subheading2 grid-1">Duration</div> <div class="grid-double"> {{ noiSubmission.soilProjectDurationUnit }} From f041dc454f1b3ab43fc3eadf649feeae56dca272 Mon Sep 17 00:00:00 2001 From: Liam Stoddard <lstodd@protonmail.com> Date: Thu, 9 Nov 2023 10:12:41 -0800 Subject: [PATCH 618/954] populating fill duration column for applications --- .../applications/submissions/data_insert/insert_query.py | 6 +++++- .../submissions/data_insert/submap/soil_elements.py | 2 -- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/bin/migrate-oats-data/applications/submissions/data_insert/insert_query.py b/bin/migrate-oats-data/applications/submissions/data_insert/insert_query.py index 4d5ff0d532..c1cc12d680 100644 --- a/bin/migrate-oats-data/applications/submissions/data_insert/insert_query.py +++ b/bin/migrate-oats-data/applications/submissions/data_insert/insert_query.py @@ -252,7 +252,9 @@ def get_insert_query_for_soil(): soil_to_remove_maximum_depth, soil_to_remove_average_depth, soil_project_duration_amount, + fill_project_duration_amount, soil_project_duration_unit, + fill_project_duration_unit, soil_fill_type_to_place, soil_alternative_measures, soil_to_place_volume, @@ -268,8 +270,10 @@ def get_insert_query_for_soil(): %(remove_area)s, %(max_remove_depth)s, %(max_remove_depth)s, - %(duration)s, + %(remove_duration)s, + %(fill_duration)s, %(remove_duration_unit)s, + %(fill_duration_unit)s, %(fill_type)s, %(alternative_measures_desc)s, %(total_fill)s, diff --git a/bin/migrate-oats-data/applications/submissions/data_insert/submap/soil_elements.py b/bin/migrate-oats-data/applications/submissions/data_insert/submap/soil_elements.py index e23af5fdd6..a18622fb9f 100644 --- a/bin/migrate-oats-data/applications/submissions/data_insert/submap/soil_elements.py +++ b/bin/migrate-oats-data/applications/submissions/data_insert/submap/soil_elements.py @@ -140,7 +140,6 @@ def dict_fill_insert(soil_dict, app_component_id, row): soil_dict[app_component_id]["total_fill"] = row[SoilProperties.VOLUME] soil_dict[app_component_id]["max_fill_depth"] = row[SoilProperties.DEPTH] soil_dict[app_component_id]["fill_duration"] = row[SoilProperties.DURATION] - soil_dict[app_component_id]["duration"] = row[SoilProperties.DURATION] soil_dict[app_component_id]["fill_area"] = row[SoilProperties.AREA] soil_dict[app_component_id]["import_fill"] = True soil_dict[app_component_id]["alternative_measures_desc"] = row[ @@ -156,7 +155,6 @@ def dict_rmv_insert(soil_dict, app_component_id, row): soil_dict[app_component_id]["max_remove_depth"] = row[SoilProperties.DEPTH] soil_dict[app_component_id]["total_remove"] = row[SoilProperties.VOLUME] soil_dict[app_component_id]["remove_duration"] = row[SoilProperties.DURATION] - soil_dict[app_component_id]["duration"] = row[SoilProperties.DURATION] soil_dict[app_component_id]["remove_area"] = row[SoilProperties.AREA] soil_dict[app_component_id][SoilAction.RMV.name] = True return From cffec3ef1d7a09c3a88b644275535b336f6c8463 Mon Sep 17 00:00:00 2001 From: Mekhti <mekhti.huseinov.ssi@gmail.com> Date: Thu, 9 Nov 2023 10:21:52 -0800 Subject: [PATCH 619/954] init notice of intent owners --- .../noi/notice_of_intent_migration.py | 6 ++-- .../parcels/owners/__init__.py | 5 ++- .../parcels/owners/notice_of_intent_owners.py | 32 +++++++++++++------ .../parcels/owners/notice_of_intent_owner.sql | 3 +- ...ts_person_organization_id_to_noi_owner.ts} | 6 ++-- 5 files changed, 36 insertions(+), 16 deletions(-) rename services/apps/alcs/src/providers/typeorm/{1699386421738-migrations.ts => migrations/1699547676891-add_oats_person_organization_id_to_noi_owner.ts} (88%) diff --git a/bin/migrate-oats-data/noi/notice_of_intent_migration.py b/bin/migrate-oats-data/noi/notice_of_intent_migration.py index 1453edba9f..e600ae7bbb 100644 --- a/bin/migrate-oats-data/noi/notice_of_intent_migration.py +++ b/bin/migrate-oats-data/noi/notice_of_intent_migration.py @@ -32,7 +32,8 @@ ) from .notice_of_intent_submissions.parcels.owners import ( - process_notice_of_intent_parcel_owners, + init_notice_of_intent_parcel_owners, + clean_owners, ) @@ -41,6 +42,7 @@ def init_notice_of_intent(batch_size): def clean_notice_of_intent(): + clean_owners() clean_parcels() clean_notice_of_intent_submission_statuses() clean_notice_of_intent_submissions() @@ -81,7 +83,7 @@ def process_notice_of_intent(batch_size): process_notice_of_intent_certificate_of_title(batch_size) - process_notice_of_intent_parcel_owners(batch_size) + init_notice_of_intent_parcel_owners(batch_size) # this script must be the last one process_notice_of_intent_submission_status_emails() diff --git a/bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/owners/__init__.py b/bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/owners/__init__.py index c5e8e293e1..2750095bf1 100644 --- a/bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/owners/__init__.py +++ b/bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/owners/__init__.py @@ -1 +1,4 @@ -from .notice_of_intent_owners import process_notice_of_intent_parcel_owners +from .notice_of_intent_owners import ( + init_notice_of_intent_parcel_owners, + clean_owners, +) diff --git a/bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/owners/notice_of_intent_owners.py b/bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/owners/notice_of_intent_owners.py index 7dcd0390fd..f97f48ff8a 100644 --- a/bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/owners/notice_of_intent_owners.py +++ b/bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/owners/notice_of_intent_owners.py @@ -13,7 +13,7 @@ @inject_conn_pool -def process_notice_of_intent_parcel_owners(conn=None, batch_size=BATCH_UPLOAD_SIZE): +def init_notice_of_intent_parcel_owners(conn=None, batch_size=BATCH_UPLOAD_SIZE): logger.info(f"Start {etl_name}") with conn.cursor(cursor_factory=RealDictCursor) as cursor: with open( @@ -47,20 +47,20 @@ def process_notice_of_intent_parcel_owners(conn=None, batch_size=BATCH_UPLOAD_SI if not rows: break try: - records_to_be_updated_count = len(rows) + records_to_be_inserted_count = len(rows) _insert_records(conn, cursor, rows) successful_updates_count = ( - successful_updates_count + records_to_be_updated_count + successful_updates_count + records_to_be_inserted_count ) - last_subject_property = dict(rows[-1])["subject_property_id"] - last_person_organization_id = dict(rows[-1])[ - "person_organization_id" - ] + + last_record = dict(rows[-1]) + last_subject_property = last_record["subject_property_id"] + last_person_organization_id = last_record["person_organization_id"] logger.debug( - f"retrieved/updated items count: {records_to_be_updated_count}; total successfully updated notice of intents so far {successful_updates_count}; last updated {last_subject_property} {last_person_organization_id}" + f"retrieved/updated items count: {records_to_be_inserted_count}; total successfully updated notice of intents so far {successful_updates_count}; last updated {last_subject_property} {last_person_organization_id}" ) except Exception as err: logger.exception(err) @@ -98,7 +98,7 @@ def _compile_owner_insert_query(number_of_rows_to_insert): audit_created_by ) VALUES{owners_to_insert} - ON CONFLICT DO NOTHING + ON CONFLICT DO NOTHING; """ @@ -118,7 +118,7 @@ def _map_data(row): "organization_name": row["organization_name"], "notice_of_intent_submission_uuid": row["notice_of_intent_submission_uuid"], "email": row["email_address"], - "phone_number": row.get("phone_number", "cell_phone_number", None), + "phone_number": row.get("phone_number", "cell_phone_number"), "type_code": _map_owner_type(row), "oats_person_organization_id": row["person_organization_id"], "audit_created_by": OATS_ETL_USER, @@ -141,6 +141,18 @@ def _map_owner_type(owner_record): return ALCSOwnerType.CRWN.value +@inject_conn_pool +def clean_owners(conn=None): + logger.info("Start notice of intent owner cleaning") + with conn.cursor() as cursor: + cursor.execute( + "DELETE FROM alcs.notice_of_intent_owner noio WHERE noio.audit_created_by = 'oats_etl'" + ) + logger.info(f"Deleted items count = {cursor.rowcount}") + conn.commit() + logger.info("Done notice of intent owner cleaning") + + # _parcel_owner_insert_query = f"""" # INSERT INTO alcs.notice_of_intent_parcel_owners_notice_of_intent_owner(notice_of_intent_parcel_uuid, notice_of_intent_owner_uuid) # VALUES{values} diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/owners/notice_of_intent_owner.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/owners/notice_of_intent_owner.sql index 26d43bd4a9..d11b653b32 100644 --- a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/owners/notice_of_intent_owner.sql +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/owners/notice_of_intent_owner.sql @@ -4,6 +4,7 @@ SELECT osp.subject_property_id, op.person_id, op.first_name, op.last_name, + op.middle_name, oo.organization_id, oo.organization_name, opo.phone_number, @@ -18,4 +19,4 @@ FROM oats.OATS_PROPERTY_INTERESTS opi JOIN alcs.notice_of_intent_parcel noip ON noip.oats_subject_property_id = osp.subject_property_id -- ensure GET records only for parcels imported into ALCS JOIN oats.OATS_PERSON_ORGANIZATIONS opo ON opo.PERSON_ORGANIZATION_ID = opi.PERSON_ORGANIZATION_ID LEFT JOIN oats.OATS_PERSONS op ON op.PERSON_ID = opo.PERSON_ID - LEFT JOIN oats.oats_organizations oo ON oo.organization_id = opo.organization_id -- ORDER BY osp.subject_property_id, opo.person_organization_id \ No newline at end of file + LEFT JOIN oats.oats_organizations oo ON oo.organization_id = opo.organization_id \ No newline at end of file diff --git a/services/apps/alcs/src/providers/typeorm/1699386421738-migrations.ts b/services/apps/alcs/src/providers/typeorm/migrations/1699547676891-add_oats_person_organization_id_to_noi_owner.ts similarity index 88% rename from services/apps/alcs/src/providers/typeorm/1699386421738-migrations.ts rename to services/apps/alcs/src/providers/typeorm/migrations/1699547676891-add_oats_person_organization_id_to_noi_owner.ts index f9111edf02..bbf3c8bb50 100644 --- a/services/apps/alcs/src/providers/typeorm/1699386421738-migrations.ts +++ b/services/apps/alcs/src/providers/typeorm/migrations/1699547676891-add_oats_person_organization_id_to_noi_owner.ts @@ -1,7 +1,9 @@ import { MigrationInterface, QueryRunner } from 'typeorm'; -export class Migrations1699386421738 implements MigrationInterface { - name = 'Migrations1699386421738'; +export class AddOatsPersonOrganizationIdToNoiOwner1699547676891 + implements MigrationInterface +{ + name = 'AddOatsPersonOrganizationIdToNoiOwner1699547676891'; public async up(queryRunner: QueryRunner): Promise<void> { await queryRunner.query( From 946aacfb4c785df7107c76338a37967ecbfea5d9 Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Thu, 9 Nov 2023 10:46:30 -0800 Subject: [PATCH 620/954] fixes --- .../application-search-table.component.ts | 2 +- .../notice-of-intent-search-table.component.ts | 2 +- services/apps/alcs/src/alcs/search/search.dto.ts | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/portal-frontend/src/app/features/public/search/application-search-table/application-search-table.component.ts b/portal-frontend/src/app/features/public/search/application-search-table/application-search-table.component.ts index 7222652e79..ee12d3f1d3 100644 --- a/portal-frontend/src/app/features/public/search/application-search-table/application-search-table.component.ts +++ b/portal-frontend/src/app/features/public/search/application-search-table/application-search-table.component.ts @@ -37,7 +37,7 @@ export class ApplicationSearchTableComponent implements OnDestroy { @Output() tableChange = new EventEmitter<TableChange>(); displayedColumns = ['fileId', 'ownerName', 'type', 'portalStatus', 'outcome', 'lastUpdate', 'government']; - outcomeMapping: {[code:string] : string } = { + outcomeMapping: Record<string, string> = { 'APPR': "Approved", 'REFU': "Refused", 'RESC': "Rescinded", diff --git a/portal-frontend/src/app/features/public/search/notice-of-intent-search-table/notice-of-intent-search-table.component.ts b/portal-frontend/src/app/features/public/search/notice-of-intent-search-table/notice-of-intent-search-table.component.ts index b3636aae0a..fe343c1e0b 100644 --- a/portal-frontend/src/app/features/public/search/notice-of-intent-search-table/notice-of-intent-search-table.component.ts +++ b/portal-frontend/src/app/features/public/search/notice-of-intent-search-table/notice-of-intent-search-table.component.ts @@ -35,7 +35,7 @@ export class NoticeOfIntentSearchTableComponent implements OnDestroy { @Output() tableChange = new EventEmitter<TableChange>(); displayedColumns = ['fileId', 'ownerName', 'type', 'portalStatus', 'outcome', 'lastUpdate', 'government']; - outcomeMapping: {[code:string] : string } = { + outcomeMapping: Record<string, string> = { 'APPR': "Approved", 'ONTP': "Ordered not to Proceed (NOI)", } diff --git a/services/apps/alcs/src/alcs/search/search.dto.ts b/services/apps/alcs/src/alcs/search/search.dto.ts index 8bd5119cac..e169a54787 100644 --- a/services/apps/alcs/src/alcs/search/search.dto.ts +++ b/services/apps/alcs/src/alcs/search/search.dto.ts @@ -16,7 +16,6 @@ export class SearchResultDto { fileNumber: string; boardCode?: string; label?: ApplicationTypeDto; - outcome?: string } export type SearchEntityClass = 'APP' | 'NOI' | 'PLAN' | 'COV' | 'NOTI'; From 5a83236fcb0ab5d5082e9c514834945f8d4a1d9c Mon Sep 17 00:00:00 2001 From: "to. sandra" <76515860+sandratoh@users.noreply.github.com> Date: Thu, 9 Nov 2023 10:47:21 -0800 Subject: [PATCH 621/954] Resolve portal accessibility errors and alerts (#1149) * Improve accessibility in home page, create modal, and file upload * Resolve broken aria-menu accessibility error * Resolve accessibility errors and warnings for parcel, incl, and excl * Increase color contrast * Improve all application type form and contrast accessibility * Update noi and srw form accessibility * Reorganize headings in public and applicant view --- .../src/assets/icons/priority_high_red.svg | 4 +-- alcs-frontend/src/styles/colors.scss | 2 +- .../application-details.component.html | 1 + .../application-details.component.scss | 4 +++ ...nge-application-type-dialog.component.html | 8 +---- .../land-use/land-use.component.html | 12 ++++--- .../other-attachments.component.html | 1 + .../other-attachments.component.scss | 2 +- .../parcel-details.component.html | 4 +-- .../parcel-entry/parcel-entry.component.html | 10 +++--- .../primary-contact.component.html | 2 +- .../cove-proposal.component.html | 6 ++-- .../cove-proposal.component.scss | 5 +-- .../transferee-dialog.component.html | 4 +-- .../excl-proposal.component.html | 16 +++++----- .../incl-proposal.component.html | 13 ++++---- .../naru-proposal.component.html | 12 +++---- .../nfu-proposal/nfu-proposal.component.html | 8 ++--- .../pfrs-proposal.component.html | 32 +++++++++---------- .../pofo-proposal.component.html | 25 ++++++++------- .../roso-proposal.component.html | 18 +++++------ .../subd-proposal.component.html | 15 +++++---- .../tur-proposal/tur-proposal.component.html | 6 ++-- .../alc-review/alc-review.component.html | 2 +- .../lfng-review/lfng-review.component.html | 2 +- ...view-application-submission.component.html | 2 +- .../create-submission-dialog.component.html | 9 +----- .../features/home/inbox/inbox.component.html | 25 ++++++++------- .../features/home/inbox/inbox.component.scss | 13 ++++++++ .../additional-information.component.html | 7 ++-- .../change-noi-type-dialog.component.html | 8 +---- .../land-use/land-use.component.html | 12 ++++--- .../other-attachments.component.html | 1 + .../other-attachments.component.scss | 2 +- .../parcels/parcel-details.component.html | 2 +- .../parcel-entry/parcel-entry.component.html | 8 ++--- .../primary-contact.component.html | 2 +- .../pfrs/pfrs-proposal.component.html | 32 ++++++++++--------- .../pofo/pofo-proposal.component.html | 20 ++++++------ .../roso/roso-proposal.component.html | 28 ++++++++-------- .../notice-of-intent-details.component.html | 21 ++++-------- .../notice-of-intent-details.component.scss | 4 +++ .../alc-review/alc-review.component.html | 2 +- ...notice-of-intent-submission.component.html | 2 +- .../other-attachments.component.html | 1 + .../other-attachments.component.scss | 2 +- .../parcel-entry/parcel-entry.component.html | 5 ++- .../proposal/proposal.component.html | 6 ++-- .../proposal/proposal.component.scss | 2 +- .../transferee-dialog.component.html | 12 +++---- .../transferees/transferees.component.scss | 5 +-- .../notification-details.component.html | 1 + .../notification-details.component.scss | 4 +++ ...iew-notification-submission.component.html | 2 +- .../alc-review/alc-review.component.html | 2 +- .../lfng-review/lfng-review.component.html | 2 +- .../public-application.component.html | 2 +- .../alc-review/alc-review.component.html | 2 +- .../public-notice-of-intent.component.html | 2 +- .../alc-review/alc-review.component.html | 2 +- .../public-notification.component.html | 2 +- .../search/public-search.component.html | 18 +++++------ .../file-drag-drop.component.html | 2 +- .../file-drag-drop.component.scss | 2 +- .../app/shared/header/header.component.html | 12 ++----- .../app/shared/header/header.component.scss | 14 ++++++++ .../src/app/shared/header/header.component.ts | 5 +++ .../owner-dialog/owner-dialog.component.html | 4 +-- .../parcel-owners.component.html | 5 --- .../parcel-owners.component.scss | 2 +- .../parcel-owners/parcel-owners.component.ts | 2 +- .../soil-table/soil-table.component.html | 20 +++++++----- .../shared/soil-table/soil-table.component.ts | 8 ++++- portal-frontend/src/styles/colors.scss | 2 +- portal-frontend/src/styles/form-controls.scss | 19 ++--------- 75 files changed, 301 insertions(+), 282 deletions(-) diff --git a/alcs-frontend/src/assets/icons/priority_high_red.svg b/alcs-frontend/src/assets/icons/priority_high_red.svg index 7caae2c900..b886d8383a 100644 --- a/alcs-frontend/src/assets/icons/priority_high_red.svg +++ b/alcs-frontend/src/assets/icons/priority_high_red.svg @@ -1,7 +1,7 @@ <svg width="3" height="14" viewBox="0 0 3 14" fill="none" xmlns="http://www.w3.org/2000/svg"> <g clip-path="url(#clip0_23_1302)"> -<path d="M1.5 13.5C2.32843 13.5 3 12.8284 3 12C3 11.1716 2.32843 10.5 1.5 10.5C0.671573 10.5 0 11.1716 0 12C0 12.8284 0.671573 13.5 1.5 13.5Z" fill="#D8292F"/> -<path d="M0 0H3V9H0V0Z" fill="#D8292F"/> +<path d="M1.5 13.5C2.32843 13.5 3 12.8284 3 12C3 11.1716 2.32843 10.5 1.5 10.5C0.671573 10.5 0 11.1716 0 12C0 12.8284 0.671573 13.5 1.5 13.5Z" fill="#C6242A"/> +<path d="M0 0H3V9H0V0Z" fill="#C6242A"/> </g> <defs> <clipPath id="clip0_23_1302"> diff --git a/alcs-frontend/src/styles/colors.scss b/alcs-frontend/src/styles/colors.scss index bc582f7536..31e2b8a612 100644 --- a/alcs-frontend/src/styles/colors.scss +++ b/alcs-frontend/src/styles/colors.scss @@ -19,7 +19,7 @@ $link-color: #1a5a96; $bg-color: #f5f7e7; -$error-color: #d8292f; +$error-color: #c6242a; $success-color: #2e8540; $warning-color: #fcba19; diff --git a/portal-frontend/src/app/features/applications/application-details/application-details.component.html b/portal-frontend/src/app/features/applications/application-details/application-details.component.html index 8b4402e4e6..6541fce08a 100644 --- a/portal-frontend/src/app/features/applications/application-details/application-details.component.html +++ b/portal-frontend/src/app/features/applications/application-details/application-details.component.html @@ -1,3 +1,4 @@ +<h2 *ngIf="showEdit" class="page-title">Review & Submit</h2> <section> <app-parcel [draftMode]="draftMode" diff --git a/portal-frontend/src/app/features/applications/application-details/application-details.component.scss b/portal-frontend/src/app/features/applications/application-details/application-details.component.scss index 8c860798c8..36c2670f5e 100644 --- a/portal-frontend/src/app/features/applications/application-details/application-details.component.scss +++ b/portal-frontend/src/app/features/applications/application-details/application-details.component.scss @@ -2,6 +2,10 @@ @use '../../../../styles/colors'; :host::ng-deep { + .page-title { + margin: rem(16) 0 !important; + } + .multiple-documents { a { display: block; diff --git a/portal-frontend/src/app/features/applications/edit-submission/change-application-type-dialog/change-application-type-dialog.component.html b/portal-frontend/src/app/features/applications/edit-submission/change-application-type-dialog/change-application-type-dialog.component.html index c97802e305..f15c960c87 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/change-application-type-dialog/change-application-type-dialog.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/change-application-type-dialog/change-application-type-dialog.component.html @@ -15,13 +15,7 @@ <h4>Change Application Type</h4> <div [ngClass]="{ 'display-none': stepIdx !== applicationTypeStep }"> <div class="step-description">Select an option to learn more about the application type.</div> - <mat-radio-group - class="app-type-radio-group" - aria-labelledby="radio-label" - (change)="onAppTypeSelected($event)" - color="primary" - required - > + <mat-radio-group class="app-type-radio-group" (change)="onAppTypeSelected($event)" color="primary" required> <mat-radio-button *ngFor="let appType of applicationTypes" [value]="appType.code" class="radio-option"> {{ appType.portalLabel }} </mat-radio-button> diff --git a/portal-frontend/src/app/features/applications/edit-submission/land-use/land-use.component.html b/portal-frontend/src/app/features/applications/edit-submission/land-use/land-use.component.html index 238a51bf8c..6bde767ad1 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/land-use/land-use.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/land-use/land-use.component.html @@ -122,7 +122,7 @@ <h5>Choose and describe neighbouring land uses.</h5> <div class="subtext">Choose the main land use type from the drop-down and describe the specific activities.</div> <div class="form-row"> <div class="full-row"> - <label for="northLandUseType">North</label> + <mat-label for="northLandUseType">North</mat-label> <div class="land-use-type-wrapper"> <div class="land-use-type"> <mat-form-field appearance="outline"> @@ -147,6 +147,7 @@ <h5>Choose and describe neighbouring land uses.</h5> placeholder="Specific Activity" matInput formControlName="northLandUseTypeDescription" + aria-label="North land use type description" /> </mat-form-field> <div @@ -164,7 +165,7 @@ <h5>Choose and describe neighbouring land uses.</h5> </div> <div class="full-row"> - <label for="eastLandUseType">East</label> + <mat-label for="eastLandUseType">East</mat-label> <div class="land-use-type-wrapper"> <div class="land-use-type"> <mat-form-field appearance="outline"> @@ -189,6 +190,7 @@ <h5>Choose and describe neighbouring land uses.</h5> placeholder="Specific Activity" matInput formControlName="eastLandUseTypeDescription" + aria-label="East land use type description" /> </mat-form-field> <div @@ -206,7 +208,7 @@ <h5>Choose and describe neighbouring land uses.</h5> </div> <div class="full-row"> - <label for="southLandUseType">South</label> + <mat-label for="southLandUseType">South</mat-label> <div class="land-use-type-wrapper"> <div class="land-use-type"> <mat-form-field appearance="outline"> @@ -231,6 +233,7 @@ <h5>Choose and describe neighbouring land uses.</h5> placeholder="Specific Activity" matInput formControlName="southLandUseTypeDescription" + aria-label="South land use type description" /> </mat-form-field> <div @@ -248,7 +251,7 @@ <h5>Choose and describe neighbouring land uses.</h5> </div> <div class="full-row"> - <label for="westLandUseType">West</label> + <mat-label for="westLandUseType">West</mat-label> <div class="land-use-type-wrapper"> <div class="land-use-type"> <mat-form-field appearance="outline"> @@ -273,6 +276,7 @@ <h5>Choose and describe neighbouring land uses.</h5> placeholder="Specific Activity" matInput formControlName="westLandUseTypeDescription" + aria-label="West land use type description" /> </mat-form-field> <div diff --git a/portal-frontend/src/app/features/applications/edit-submission/other-attachments/other-attachments.component.html b/portal-frontend/src/app/features/applications/edit-submission/other-attachments/other-attachments.component.html index d35d151771..8f3399724d 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/other-attachments/other-attachments.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/other-attachments/other-attachments.component.html @@ -51,6 +51,7 @@ <h2>Optional Attachments</h2> type="text" matInput placeholder="Type description" + aria-label="Attachment description" /> </mat-form-field> <div diff --git a/portal-frontend/src/app/features/applications/edit-submission/other-attachments/other-attachments.component.scss b/portal-frontend/src/app/features/applications/edit-submission/other-attachments/other-attachments.component.scss index 2de86abf6e..abca50e46d 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/other-attachments/other-attachments.component.scss +++ b/portal-frontend/src/app/features/applications/edit-submission/other-attachments/other-attachments.component.scss @@ -33,6 +33,6 @@ h4 { .no-data-text { text-align: center; - color: colors.$grey; + color: colors.$grey-dark; padding-top: rem(12); } diff --git a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-details.component.html b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-details.component.html index daecc95fc0..6abf7b181a 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-details.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-details.component.html @@ -1,6 +1,6 @@ <div> <div class="step-description"> - <h3>Identify Parcels Under Application</h3> + <h2>Identify Parcels Under Application</h2> <p>Provide parcel identification and registered ownership information for each parcel under application.</p> <p>*All fields are required unless stated optional.</p> <div class="step-documents"> @@ -23,7 +23,7 @@ <h6>Documents needed for this step:</h6> </mat-expansion-panel-header> <app-parcel-entry - [isDraft]='draftMode' + [isDraft]="draftMode" [parcel]="parcel" [$owners]="$owners" [fileId]="fileId" diff --git a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html index f9c929af45..44347c0ae3 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html @@ -1,6 +1,6 @@ <form [formGroup]="parcelForm" (keydown.enter)="$event.preventDefault()"> <div class="type"> - <label>Select ownership type:</label> + <mat-label for="parcelType">Select ownership type:</mat-label> <div class="warning"> The answer to the following question will change the rest of the application form. Do not change this answer once selected. @@ -147,7 +147,7 @@ <h5>Parcel Lookup</h5> </div> <div> - <label for="isFarm">Farm Classification</label> + <mat-label for="isFarm">Farm Classification</mat-label> <div class="subtext"> As determined by <a class="subtext" href="https://www.bcassessment.ca/" target="_blank" rel="noreferrer">BC Assessment</a> @@ -183,7 +183,7 @@ <h5>Parcel Lookup</h5> </div> <div class="section" *ngIf="enableCertificateOfTitleUpload"> - <label for="certificate-of-title-upload">Upload Certificate of Title</label> + <mat-label for="certificate-of-title-upload">Upload Certificate of Title</mat-label> <div class="subtext"> Visit <a href="https://ltsa.ca/property-owners/how-can-i/search-for-a-title/" target="_blank">BC Land Title & Survey</a> @@ -273,9 +273,7 @@ <h6>Owner Information</h6> </div> </ng-container> <ng-container *ngIf="isCrownLand"> - <div> - <label for="crown-owner-type">Select owner:</label> - </div> + <mat-label for="crown-owner-type">Select owner:</mat-label> <mat-radio-group formControlName="crownLandOwnerType" class="crown-owner-type" diff --git a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html index f385dd329a..d78b355212 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html @@ -116,7 +116,7 @@ <h4>Primary Contact Information</h4> </div> </div> <div> - <label for="firstName">Email</label> + <label for="email">Email</label> <mat-form-field appearance="outline"> <input id="email" type="email" matInput placeholder="Enter Email" formControlName="email" /> </mat-form-field> diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/cove-proposal/cove-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/cove-proposal/cove-proposal.component.html index 09e3d84ca0..65f47ab6ba 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/cove-proposal/cove-proposal.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/cove-proposal/cove-proposal.component.html @@ -153,7 +153,7 @@ <h2>Proposal</h2> <div class="subtext">Characters left: {{ 4000 - purposeText.textLength }}</div> </div> <div class="full-row"> - <label class="subheading2" for="proposal-map">Proposal Map / Site Plan</label> + <mat-label class="subheading2" for="proposal-map">Proposal Map / Site Plan</mat-label> <div class="subtext">A visual representation of your proposal.</div> <app-file-drag-drop id="proposal-map" @@ -167,7 +167,7 @@ <h2>Proposal</h2> ></app-file-drag-drop> </div> <div class="full-row"> - <label for="hasDraftCopy"> Do you have a draft copy of the covenant? </label> + <mat-label for="hasDraftCopy"> Do you have a draft copy of the covenant? </mat-label> <div class="subtext">If yes, please attach the Draft in the section below.</div> <div> <mat-button-toggle-group @@ -196,7 +196,7 @@ <h2>Proposal</h2> </div> </div> <div class="full-row"> - <label class="subheading2" for="proposal-map">Draft Covenant</label> + <mat-label class="subheading2" for="draftCovenant">Draft Covenant</mat-label> <div class="subtext">A visual representation of your proposal.</div> <app-file-drag-drop id="draftCovenant" diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/cove-proposal/cove-proposal.component.scss b/portal-frontend/src/app/features/applications/edit-submission/proposal/cove-proposal/cove-proposal.component.scss index bd13f86821..e9241c762a 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/cove-proposal/cove-proposal.component.scss +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/cove-proposal/cove-proposal.component.scss @@ -2,7 +2,7 @@ @use '../../../../../../styles/colors'; .no-data { - color: colors.$grey; + color: colors.$grey-dark; text-align: center; padding: rem(8); } @@ -31,7 +31,8 @@ flex-direction: column; align-items: start; - div, button { + div, + button { margin-top: rem(4); width: 100%; } diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/cove-proposal/transferee-dialog/transferee-dialog.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/cove-proposal/transferee-dialog/transferee-dialog.component.html index a2e4d42e9b..ae8b25cfcf 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/cove-proposal/transferee-dialog/transferee-dialog.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/cove-proposal/transferee-dialog/transferee-dialog.component.html @@ -6,7 +6,7 @@ <h3 *ngIf="isEdit">Edit Transferee</h3> <form [formGroup]="form"> <div class="form-row"> <div class="full-row"> - <label for="type">Transferee Type</label> + <mat-label for="type">Transferee Type</mat-label> <mat-button-toggle-group (change)="onChangeType($event)" class="input" id="type" formControlName="type"> <mat-button-toggle color="primary" [value]="OWNER_TYPE.INDIVIDUAL">Individual</mat-button-toggle> <mat-button-toggle color="primary" [value]="OWNER_TYPE.ORGANIZATION">Organization</mat-button-toggle> @@ -64,7 +64,7 @@ <h5 class="full-row" *ngIf="type.getRawValue() === OWNER_TYPE.ORGANIZATION">Orga </div> </div> <div> - <label for="firstName">Email</label> + <label for="email">Email</label> <mat-form-field appearance="outline"> <input id="email" type="email" matInput placeholder="Enter Email" formControlName="email" /> </mat-form-field> diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/excl-proposal/excl-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/excl-proposal/excl-proposal.component.html index 69dda49794..3f5b5d9ea5 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/excl-proposal/excl-proposal.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/excl-proposal/excl-proposal.component.html @@ -19,13 +19,13 @@ <h2>Proposal</h2> <form [formGroup]="form"> <div class="form-row"> <div class="full-row"> - <label for="hectares">The governmental or prescribed public body that is applying to exclude land:</label> + <label for="prescribedBody">The governmental or prescribed public body that is applying to exclude land:</label> <div class="subtext"> Note: To change this selection, you will need to use the 'Change Application Type' button at the top right of the form. </div> <mat-form-field appearance="outline"> - <input matInput [value]="prescribedBody ?? ''" disabled /> + <input matInput [value]="prescribedBody ?? ''" disabled id="prescribedBody" /> </mat-form-field> </div> <div> @@ -50,10 +50,10 @@ <h2>Proposal</h2> </div> </div> <div class="full-row"> - <label for="share-property"> + <mat-label for="share-property"> Does any land under application share a common property line with land in another Local or First Nation Government? - </label> + </mat-label> <div class="subtext"> If any property under application shares a common boundary with a neighbouring Local or First Nation Government, then that government must be notified of the application and given the opportunity to comment. @@ -116,7 +116,7 @@ <h2>Proposal</h2> </div> </div> <div class="full-row"> - <label class="subheading2" for="proposal-map">Proposal Map / Site Plan</label> + <mat-label class="subheading2" for="proposal-map">Proposal Map / Site Plan</mat-label> <div class="subtext">A visual representation of your proposal.</div> <app-file-drag-drop id="proposal-map" @@ -149,7 +149,7 @@ <h3>Notification and Public Hearing Requirements</h3> <form> <div class="form-row"> <div class="full-row"> - <label class="subheading2" for="advertising">Notice of Public Hearing (Advertisement)</label> + <mat-label class="subheading2" for="advertising">Notice of Public Hearing (Advertisement)</mat-label> <div class="subtext"> Proof that notice of the application was provided in a form and manner acceptable to the Commission </div> @@ -166,7 +166,7 @@ <h3>Notification and Public Hearing Requirements</h3> ></app-file-drag-drop> </div> <div class="full-row"> - <label class="subheading2" for="signage">Proof of Signage</label> + <mat-label class="subheading2" for="signage">Proof of Signage</mat-label> <div class="subtext"> Proof that a sign, in a form and manner acceptable to the Commission, was posted on the land that is the subject of the application @@ -184,7 +184,7 @@ <h3>Notification and Public Hearing Requirements</h3> ></app-file-drag-drop> </div> <div class="full-row"> - <label class="subheading2" for="report">Report of Public Hearing</label> + <mat-label class="subheading2" for="report">Report of Public Hearing</mat-label> <div class="subtext">Public hearing report and any other public comments received</div> <app-file-drag-drop id="report" diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/incl-proposal/incl-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/incl-proposal/incl-proposal.component.html index 43aa27c9ed..de7fb74560 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/incl-proposal/incl-proposal.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/incl-proposal/incl-proposal.component.html @@ -107,7 +107,7 @@ <h2>Proposal</h2> <div class="subtext">Characters left: {{ 4000 - improvementsText.textLength }}</div> </div> <div class="full-row"> - <label class="subheading2" for="proposal-map">Proposal Map / Site Plan</label> + <mat-label class="subheading2" for="proposal-map">Proposal Map / Site Plan</mat-label> <div class="subtext">A visual representation of your proposal.</div> <app-file-drag-drop id="proposal-map" @@ -121,8 +121,9 @@ <h2>Proposal</h2> ></app-file-drag-drop> </div> <div class="full-row" *ngIf="showGovernmentQuestions"> - <label for="isFarm" - >Is the {{ governmentName }} the registered land owner of all parcels under this inclusion application?</label + <mat-label for="isFarm" + >Is the {{ governmentName }} the registered land owner of all parcels under this inclusion + application?</mat-label > <div class="subtext"> The ALR General Regulation does not require the {{ governmentName }} to complete a public hearing if all @@ -185,7 +186,7 @@ <h3>Notification and Public Hearing Requirements</h3> <form> <div class="form-row"> <div class="full-row"> - <label class="subheading2" for="advertising">Notice of Public Hearing (Advertisement)</label> + <mat-label class="subheading2" for="advertising">Notice of Public Hearing (Advertisement)</mat-label> <div class="subtext"> Proof that notice of the application was provided in a form and manner acceptable to the Commission </div> @@ -203,7 +204,7 @@ <h3>Notification and Public Hearing Requirements</h3> ></app-file-drag-drop> </div> <div class="full-row"> - <label class="subheading2" for="signage">Proof of Signage</label> + <mat-label class="subheading2" for="signage">Proof of Signage</mat-label> <div class="subtext"> Proof that a sign, in a form and manner acceptable to the Commission, was posted on the land that is the subject of the application @@ -222,7 +223,7 @@ <h3>Notification and Public Hearing Requirements</h3> ></app-file-drag-drop> </div> <div class="full-row"> - <label class="subheading2" for="report">Report of Public Hearing</label> + <mat-label class="subheading2" for="report">Report of Public Hearing</mat-label> <div class="subtext">Public hearing report and any other public comments received</div> <app-file-drag-drop id="report" diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.html index 06645074a7..67b9c0ee3d 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.html @@ -19,7 +19,7 @@ <h2>Proposal</h2> <form [formGroup]="form"> <div class="form-row"> <div class="full-row"> - <label for="subtype"><h5>Select a Sub-Type for your Non-Adhering Residential Use application</h5></label> + <mat-label for="subtype"><h5>Select a Sub-Type for your Non-Adhering Residential Use application</h5></mat-label> <mat-radio-group class="radio-group" id="subtype" @@ -426,7 +426,7 @@ <h2>Proposal</h2> </div> <div class="full-row"> - <label class="subheading2" for="proposal-map">Proposal Map / Site Plan</label> + <mat-label class="subheading2" for="proposal-map">Proposal Map / Site Plan</mat-label> <div class="subtext">A visual representation of your proposal.</div> <app-file-drag-drop id="proposal-map" @@ -436,14 +436,14 @@ <h2>Proposal</h2> (openFile)="openFile($event)" [showErrors]="showErrors" [isRequired]="true" - [showVirusError]='showProposalMapVirus' + [showVirusError]="showProposalMapVirus" ></app-file-drag-drop> </div> <div class="full-row"> - <label for="will-import-fill"> + <mat-label for="will-import-fill"> Do you need to import any fill to construct or conduct the proposed non-adhering residential use? - </label> + </mat-label> <div class="subtext">Fill is any material brought onto the property, including gravel for construction.</div> <mat-button-toggle-group (change)="onChangeFill($event.value)" @@ -520,7 +520,7 @@ <h4>Project Duration</h4> <div class="subtext">Estimated duration of the project</div> <div class="form-row"> <div> - <label for="projectDurationUnit">Duration</label> + <mat-label for="projectDurationUnit">Duration</mat-label> <div class="subtext">Days, Months, or Years</div> <mat-form-field appearance="outline"> <mat-select placeholder="Select one" id="projectDurationUnit" formControlName="projectDurationUnit"> diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/nfu-proposal/nfu-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/nfu-proposal/nfu-proposal.component.html index 3f9443695b..89cc5a3fdd 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/nfu-proposal/nfu-proposal.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/nfu-proposal/nfu-proposal.component.html @@ -102,7 +102,7 @@ <h2>Proposal</h2> <div class="subtext">Characters left: {{ 4000 - agricultureSupportText.textLength }}</div> </div> <div class="full-row"> - <label class="subheading2" for="proposal-map">Proposal Map / Site Plan</label> + <mat-label class="subheading2" for="proposal-map">Proposal Map / Site Plan</mat-label> <div class="subtext">A visual representation of your proposal.</div> <app-file-drag-drop id="proposal-map" @@ -116,9 +116,9 @@ <h2>Proposal</h2> ></app-file-drag-drop> </div> <div class="full-row"> - <label for="will-import-fill"> + <mat-label for="will-import-fill"> Do you need to import any fill to construct or conduct the proposed Non-farm use? - </label> + </mat-label> <div class="subtext">Fill is any material brought onto the property, including gravel for construction.</div> <mat-button-toggle-group (change)="onChangeFill($event.value)" @@ -206,7 +206,7 @@ <h4>Project Duration</h4> <div class="subtext">Estimated duration of the project</div> <div class="form-row"> <div> - <label for="projectDurationUnit">Duration</label> + <mat-label for="projectDurationUnit">Duration</mat-label> <div class="subtext">Days, Months, or Years</div> <mat-form-field appearance="outline"> <mat-select placeholder="Select one" id="projectDurationUnit" formControlName="projectDurationUnit"> diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.html index d420a8882d..2614bf90e7 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.html @@ -18,16 +18,16 @@ <h2>Proposal</h2> </a> </li> <li> - <a href="TODO" target="_blank">FIXME: Removal of Soil</a> + <a href="TODO" target="_blank">FIXME: Removal of Soil & Placement of Fill</a> </li> </ul> </app-warning-banner> <form [formGroup]="form"> <div class="form-row"> <div class="full-row"> - <label for="noi-follow-up"> + <mat-label for="noi-follow-up"> Has the ALC previously received an application or Notice of Intent for this proposal? - </label> + </mat-label> <div class="subtext">If yes, provide the ALC Application or Notice of Intent ID in the field below</div> <div> <mat-button-toggle-group @@ -90,7 +90,7 @@ <h2>Proposal</h2> </div> </div> <div class="full-row"> - <label>Proposal Dimensions</label> + <mat-label>Proposal Dimensions</mat-label> <div class="subtext"> Please provide accurate numbers that align with your cross sections, reclamation plan, and site plan. The Commission will consider your proposal dimensions when determining the potential impact it will have on the @@ -120,9 +120,9 @@ <h2>Proposal</h2> ></app-soil-table> </div> <div class="full-row"> - <label + <mat-label >Of the proposed totals provided above, please input the dimensions of soil that has already been - removed.</label + removed.</mat-label > <div class="subtext">If no proposed soil has already been removed, please leave 0 in the fields below</div> <app-soil-table @@ -206,7 +206,7 @@ <h4>Removal of Soil Project Duration</h4> <div class="subtext">Estimated duration of the project</div> <div class="form-row"> <div> - <label for="soilProjectDurationUnit">Duration</label> + <mat-label for="soilProjectDurationUnit">Duration</mat-label> <div class="subtext">Days, Months, or Years</div> <mat-form-field appearance="outline"> <mat-select placeholder="Select one" id="soilProjectDurationUnit" formControlName="soilProjectDurationUnit"> @@ -356,7 +356,7 @@ <h4>Removal of Soil Project Duration</h4> <div class="subtext">Characters left: {{ 4000 - reduceNegativeImpactsText.textLength }}</div> </div> <div class="full-row"> - <label class="subheading2" for="proposal-map">Proposal Map / Site Plan</label> + <mat-label class="subheading2" for="proposal-map">Proposal Map / Site Plan</mat-label> <div class="subtext">A visual representation of your proposal.</div> <app-file-drag-drop id="proposal-map" @@ -370,10 +370,10 @@ <h4>Removal of Soil Project Duration</h4> ></app-file-drag-drop> </div> <div class="full-row"> - <label class="subheading2" for="cross-section">Cross Sections</label> + <mat-label class="subheading2" for="cross-section">Cross Sections</mat-label> <div class="subtext">Include North-South and East-West cross sections</div> <app-info-banner> - Please refer to <a>FIXME: Removal of Soil</a> on the ALC website for more information + Please refer to <a>FIXME: Removal of Soil & Placement of Fill</a> on the ALC website for more information </app-info-banner> <app-file-drag-drop id="cross-section" @@ -388,13 +388,13 @@ <h4>Removal of Soil Project Duration</h4> ></app-file-drag-drop> </div> <div class="full-row"> - <label class="subheading2" for="reclamation-plan">Reclamation Plan</label> + <mat-label class="subheading2" for="reclamation-plan">Reclamation Plan</mat-label> <div class="subtext"> The Reclamation Plan should be completed by a qualified Professional Agrologist and contain the area's agricultural capability assessment. </div> <app-info-banner> - Please refer to <a>FIXME: Removal of Soil</a> on the ALC website for more information + Please refer to <a>FIXME: Removal of Soil & Placement of Fill</a> on the ALC website for more information </app-info-banner> <app-file-drag-drop id="reclamation-plan" @@ -410,7 +410,7 @@ <h4>Removal of Soil Project Duration</h4> </div> <div class="full-row"> - <label for="isExtractionOrMining">Is your proposal for aggregate extraction or placer mining?</label> + <mat-label for="isExtractionOrMining">Is your proposal for aggregate extraction or placer mining?</mat-label> <div> <mat-button-toggle-group class="input" @@ -441,9 +441,9 @@ <h4>Removal of Soil Project Duration</h4> </div> <div class="full-row"> - <label for="isExtractionOrMining"> + <mat-label for="hasSubmittedNotice"> Have you submitted a Notice of Work to the Ministry of Energy, Mines and Low Carbon Innovation (EMLI)? - </label> + </mat-label> <div class="subtext">If yes, please attach the Notice of Work in the section below.</div> <div> <mat-button-toggle-group @@ -473,7 +473,7 @@ <h4>Removal of Soil Project Duration</h4> </div> <div class="full-row"> - <label class="subheading2" for="noticeOfWork">Notice of Work</label> + <mat-label class="subheading2" for="noticeOfWork">Notice of Work</mat-label> <app-info-banner> Please refer to <a>FIXME: Removal of Soil</a> on the ALC website for more information </app-info-banner> diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.html index d42b16e59a..d0cc372080 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.html @@ -18,16 +18,16 @@ <h2>Proposal</h2> </a> </li> <li> - <a href="TODO" target="_blank">FIXME: Removal of Soil</a> + <a href="TODO" target="_blank">FIXME: Placement of Fill</a> </li> </ul> </app-warning-banner> <form [formGroup]="form"> <div class="form-row"> <div class="full-row"> - <label for="noi-follow-up"> + <mat-label for="noi-follow-up"> Has the ALC previously received an application or Notice of Intent for this proposal? - </label> + </mat-label> <div class="subtext">If yes, provide the ALC Application or Notice of Intent ID in the field below</div> <div> <mat-button-toggle-group @@ -89,7 +89,7 @@ <h2>Proposal</h2> <div class="subtext">Characters left: {{ 4000 - purposeText.textLength }}</div> </div> <div class="full-row"> - <label>Proposal Dimensions</label> + <mat-label>Proposal Dimensions</mat-label> <div class="subtext"> Please provide accurate numbers that align with your cross sections, reclamation plan, and site plan. The Commission will consider your proposal dimensions when determining the potential impact it will have on the @@ -103,8 +103,9 @@ <h2>Proposal</h2> ></app-soil-table> </div> <div class="full-row"> - <label - >Of the proposed totals provided above, please input the dimensions of fill that has already been place.</label + <mat-label + >Of the proposed totals provided above, please input the dimensions of fill that has already been + place.</mat-label > <div class="subtext">If no proposed fill has already been placed, please leave 0 in the fields below</div> <app-soil-table @@ -119,7 +120,7 @@ <h4>Project Duration</h4> <div class="subtext">Estimated duration of the project</div> <div class="form-row"> <div> - <label for="projectDurationUnit">Duration</label> + <mat-label for="projectDurationUnit">Duration</mat-label> <div class="subtext">Days, Months, or Years</div> <mat-form-field appearance="outline"> <mat-select placeholder="Select one" id="projectDurationUnit" formControlName="projectDurationUnit"> @@ -244,7 +245,7 @@ <h4>Project Duration</h4> <div class="subtext">Characters left: {{ 4000 - reduceNegativeImpactsText.textLength }}</div> </div> <div class="full-row"> - <label class="subheading2" for="proposal-map">Proposal Map / Site Plan</label> + <mat-label class="subheading2" for="proposal-map">Proposal Map / Site Plan</mat-label> <div class="subtext">A visual representation of your proposal.</div> <app-file-drag-drop id="proposal-map" @@ -258,10 +259,10 @@ <h4>Project Duration</h4> ></app-file-drag-drop> </div> <div class="full-row"> - <label class="subheading2" for="cross-section">Cross Sections</label> + <mat-label class="subheading2" for="cross-section">Cross Sections</mat-label> <div class="subtext">Include North-South and East-West cross sections</div> <app-info-banner> - Please refer to <a>FIXME: Removal of Soil</a> on the ALC website for more information + Please refer to <a>FIXME: Placement of Fill</a> on the ALC website for more information </app-info-banner> <app-file-drag-drop id="cross-section" @@ -276,13 +277,13 @@ <h4>Project Duration</h4> ></app-file-drag-drop> </div> <div class="full-row"> - <label class="subheading2" for="reclamation-plan">Reclamation Plan</label> + <mat-label class="subheading2" for="reclamation-plan">Reclamation Plan</mat-label> <div class="subtext"> The Reclamation Plan should be completed by a qualified Professional Agrologist and contain the area's agricultural capability assessment. </div> <app-info-banner> - Please refer to <a>FIXME: Removal of Soil</a> on the ALC website for more information + Please refer to <a>FIXME: Placement of Fill</a> on the ALC website for more information </app-info-banner> <app-file-drag-drop id="reclamation-plan" diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.html index 07d09701f6..f147af8fa3 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.html @@ -25,9 +25,9 @@ <h2>Proposal</h2> <form [formGroup]="form"> <div class="form-row"> <div class="full-row"> - <label for="noi-follow-up"> + <mat-label for="noi-follow-up"> Has the ALC previously received an application or Notice of Intent for this proposal? - </label> + </mat-label> <div class="subtext">If yes, provide the ALC Application or Notice of Intent ID in the field below</div> <div> <mat-button-toggle-group @@ -90,7 +90,7 @@ <h2>Proposal</h2> <div class="subtext">Characters left: {{ 4000 - purposeText.textLength }}</div> </div> <div class="full-row"> - <label>Proposal Dimensions</label> + <mat-label>Proposal Dimensions</mat-label> <div class="subtext"> Please provide accurate numbers that align with your cross sections, reclamation plan, and site plan. The Commission will consider your proposal dimensions when determining the potential impact it will have on the @@ -104,9 +104,9 @@ <h2>Proposal</h2> ></app-soil-table> </div> <div class="full-row"> - <label + <mat-label >Of the proposed totals provided above, please input the dimensions of soil that has already been - removed.</label + removed.</mat-label > <div class="subtext">If no proposed soil has already been removed, please leave 0 in the fields below</div> <app-soil-table @@ -121,7 +121,7 @@ <h4>Project Duration</h4> <div class="subtext">Estimated duration of the project</div> <div class="form-row"> <div> - <label for="projectDurationUnit">Duration</label> + <mat-label for="projectDurationUnit">Duration</mat-label> <div class="subtext">Days, Months, or Years</div> <mat-form-field appearance="outline"> <mat-select placeholder="Select one" id="projectDurationUnit" formControlName="projectDurationUnit"> @@ -215,7 +215,7 @@ <h4>Project Duration</h4> </div> <div class="full-row"> - <label class="subheading2" for="proposal-map">Proposal Map / Site Plan</label> + <mat-label class="subheading2" for="proposal-map">Proposal Map / Site Plan</mat-label> <div class="subtext">A visual representation of your proposal.</div> <app-file-drag-drop id="proposal-map" @@ -229,7 +229,7 @@ <h4>Project Duration</h4> ></app-file-drag-drop> </div> <div class="full-row"> - <label class="subheading2" for="cross-section">Cross Sections</label> + <mat-label class="subheading2" for="cross-section">Cross Sections</mat-label> <div class="subtext">Include North-South and East-West cross sections</div> <app-info-banner> Please refer to <a>FIXME: Removal of Soil</a> on the ALC website for more information @@ -247,7 +247,7 @@ <h4>Project Duration</h4> ></app-file-drag-drop> </div> <div class="full-row"> - <label class="subheading2" for="reclamation-plan">Reclamation Plan</label> + <mat-label class="subheading2" for="reclamation-plan">Reclamation Plan</mat-label> <div class="subtext"> The Reclamation Plan should be completed by a qualified Professional Agrologist and contain the area's agricultural capability assessment. diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.html index 64c90cf72c..f4bd8890db 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.html @@ -32,11 +32,11 @@ <h6>Documents needed for this step:</h6> <form [formGroup]="form"> <div class="form-row"> <div class="full-row"> - <label for="purpose">Total area of the parcels added on Step 1: {{ totalTargetAcres }} (ha)</label> + <span class="subheading2">Total area of the parcels added on Step 1: {{ totalTargetAcres }} (ha)</span> <div class="subtext">Total area of the parcels must equal total area of the proposed lots</div> </div> <div class="full-row"> - <label for="purpose">Total number of lots proposed</label> + <label for="lotsProposed">Total number of lots proposed</label> <div class="subtext">You must include any road dedications as additional lot(s) in the field below</div> <mat-form-field appearance="outline"> <input @@ -61,7 +61,7 @@ <h6>Documents needed for this step:</h6> </div> <div class="full-row"> <form [formGroup]="lotsForm"> - <label for="purpose">Enter your proposed lot areas (ha)</label> + <mat-label>Enter your proposed lot areas (ha)</mat-label> <table class="proposed-lots" mat-table [dataSource]="lotsSource"> <ng-container matColumnDef="index"> <th mat-header-cell *matHeaderCellDef>#</th> @@ -110,6 +110,7 @@ <h6>Documents needed for this step:</h6> placeholder="Type size in hectares" [formControlName]="i + '-size'" (change)="onChangeLotSize(i, $event)" + aria-label="Size in hectares" /> <span *ngIf="element.size" matTextSuffix>ha</span> </mat-form-field> @@ -207,7 +208,7 @@ <h6>Documents needed for this step:</h6> <div class="subtext">Characters left: {{ 4000 - agriculturalSupportText.textLength }}</div> </div> <div class="full-row"> - <label class="subheading2" for="proposal-map">Proposal Map / Site Plan</label> + <mat-label class="subheading2" for="proposal-map">Proposal Map / Site Plan</mat-label> <div class="subtext">A visual representation of your proposal.</div> <app-file-drag-drop id="proposal-map" @@ -221,9 +222,9 @@ <h6>Documents needed for this step:</h6> ></app-file-drag-drop> </div> <div class="full-row"> - <label class="subheading2" for="home-site-severance" + <mat-label class="subheading2" for="home-site-severance" >Are you applying for subdivision pursuant to the ALC Homesite Severance Policy? - </label> + </mat-label> <div class="subtext"> If yes, you are required to submit proof of property ownership prior to December 21, 1972 and proof of continued occupancy since December 21, 1972 @@ -251,7 +252,7 @@ <h6>Documents needed for this step:</h6> </mat-button-toggle-group> </div> <div class="full-row"> - <label class="subheading2" for="ownership">Proof of Homesite Severance Qualification</label> + <mat-label class="subheading2" for="ownership">Proof of Homesite Severance Qualification</mat-label> <div class="subtext"> Please submit proof of property ownership prior to December 21, 1972 <strong>and</strong> proof of continued occupancy since December 21, 1972. diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/tur-proposal/tur-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/tur-proposal/tur-proposal.component.html index b72b2b6996..33c734af74 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/tur-proposal/tur-proposal.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/tur-proposal/tur-proposal.component.html @@ -101,7 +101,7 @@ <h6>Documents needed for this step:</h6> <div class="subtext">Characters left: {{ 4000 - reduceNegativeImpactsText.textLength }}</div> </div> <div class="full-row"> - <label for="negative-impact">Could this proposal be accommodated on lands outside of the ALR?</label> + <label for="outside-lands">Could this proposal be accommodated on lands outside of the ALR?</label> <div class="subtext">Please justify why the proposal cannot be carried out on lands outside the ALR.</div> <mat-form-field appearance="outline"> <textarea @@ -163,7 +163,7 @@ <h6>Documents needed for this step:</h6> </form> <div> <div class="section"> - <label class="subheading2" for="proof-of-serving">Proof of Serving Notice</label> + <mat-label class="subheading2" for="proof-of-serving">Proof of Serving Notice</mat-label> <div class="subtext">Proof that all affected property owners with land in the ALR were notified as required.</div> <app-file-drag-drop id="proof-of-serving" @@ -177,7 +177,7 @@ <h6>Documents needed for this step:</h6> ></app-file-drag-drop> </div> <div class="section"> - <label class="subheading2" for="proposal-map">Proposal Map / Sketch Plan</label> + <mat-label class="subheading2" for="proposal-map">Proposal Map / Sketch Plan</mat-label> <app-file-drag-drop id="proposal-map" [uploadedFiles]="proposalMap" diff --git a/portal-frontend/src/app/features/applications/view-submission/alc-review/alc-review.component.html b/portal-frontend/src/app/features/applications/view-submission/alc-review/alc-review.component.html index 4ea1d813f6..987b7f6981 100644 --- a/portal-frontend/src/app/features/applications/view-submission/alc-review/alc-review.component.html +++ b/portal-frontend/src/app/features/applications/view-submission/alc-review/alc-review.component.html @@ -1,6 +1,6 @@ <div *ngIf="application"> <div class="header"> - <h3>ALC Review and Decision</h3> + <h2>ALC Review and Decision</h2> <div> <button [routerLink]="'/application/' + application.fileNumber + '/edit'" diff --git a/portal-frontend/src/app/features/applications/view-submission/lfng-review/lfng-review.component.html b/portal-frontend/src/app/features/applications/view-submission/lfng-review/lfng-review.component.html index 2ae5a57c31..79477e1628 100644 --- a/portal-frontend/src/app/features/applications/view-submission/lfng-review/lfng-review.component.html +++ b/portal-frontend/src/app/features/applications/view-submission/lfng-review/lfng-review.component.html @@ -1,6 +1,6 @@ <div *ngIf="application"> <div class="header"> - <h3>Local/First Nation Gov Review</h3> + <h2>Local/First Nation Gov Review</h2> <div class="btns-wrapper"> <button *ngIf="application.canEdit || application.canReview" diff --git a/portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.html b/portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.html index 99106a1479..71d72cd504 100644 --- a/portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.html +++ b/portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.html @@ -36,7 +36,7 @@ <h4 *ngIf="application">Application ID: {{ application.fileNumber }}</h4> <div *ngIf="application" class="content"> <section> <div class="header"> - <h3>Applicant Submission</h3> + <h2>Applicant Submission</h2> <div class="btns-wrapper"> <button *ngIf="application.canEdit || application.canReview" diff --git a/portal-frontend/src/app/features/create-submission-dialog/create-submission-dialog.component.html b/portal-frontend/src/app/features/create-submission-dialog/create-submission-dialog.component.html index 2c1e2058cf..0581e52eac 100644 --- a/portal-frontend/src/app/features/create-submission-dialog/create-submission-dialog.component.html +++ b/portal-frontend/src/app/features/create-submission-dialog/create-submission-dialog.component.html @@ -49,7 +49,6 @@ <h4 *ngIf="currentStep === steps.prescribedBody"> <mat-radio-group [value]="selectedAppType?.code" class="app-type-radio-group" - aria-labelledby="radio-label" (change)="onAppTypeSelected($event)" color="primary" required @@ -77,13 +76,7 @@ <h4 *ngIf="currentStep === steps.prescribedBody"> <ng-container *ngIf="currentStep === steps.noticeOfIntentType"> <div class="step-description">Select an option to learn more about the notice of intent type.</div> <div class="step-noi-type"> - <mat-radio-group - class="app-type-radio-group" - aria-labelledby="radio-label" - (change)="onNoiTypeSelected($event)" - color="primary" - required - > + <mat-radio-group class="app-type-radio-group" (change)="onNoiTypeSelected($event)" color="primary" required> <mat-radio-button *ngFor="let type of noticeOfIntentTypes" class="radio-option" [value]="type.code"> {{ type.portalLabel }} </mat-radio-button> diff --git a/portal-frontend/src/app/features/home/inbox/inbox.component.html b/portal-frontend/src/app/features/home/inbox/inbox.component.html index 93146cebaf..bacc090743 100644 --- a/portal-frontend/src/app/features/home/inbox/inbox.component.html +++ b/portal-frontend/src/app/features/home/inbox/inbox.component.html @@ -1,22 +1,23 @@ <section> <form class="content" [formGroup]="searchForm" (ngSubmit)="onSubmit()"> <mat-form-field class="full-width" appearance="outline"> - <input placeholder="Search Inbox by File ID" mask="0*" id="fileNumber" matInput formControlName="fileNumber" /> + <input + placeholder="Search Inbox by File ID" + mask="0*" + id="fileNumber" + matInput + formControlName="fileNumber" + aria-label="search" + /> </mat-form-field> - <div class="right search-toggle"> - <a *ngIf="!panel.expanded" class="right" (click)="panel.toggle()" - >More search options<mat-icon>expand_more</mat-icon></a - > - <a *ngIf="panel.expanded" class="right" (click)="panel.toggle()" - >Less search options<mat-icon>expand_less</mat-icon></a - > - </div> - <mat-expansion-panel #panel> + <mat-expansion-panel-header class="search-toggle"> + <mat-panel-title>{{ panel.expanded ? 'Less' : 'More' }} Search Options </mat-panel-title> + </mat-expansion-panel-header> <div class="search-form"> <div *ngIf="profile && (profile.isFirstNationGovernment || profile.isLocalGovernment)"> - <label for="filterBy">Filter By</label> + <mat-label for="filterBy">Filter By</mat-label> <mat-form-field appearance="outline"> <mat-select id="filterBy" formControlName="filterBy"> <mat-option value="created">Created By {{ profile.government }}</mat-option> @@ -73,7 +74,7 @@ /> </div> <div> - <label for="status">Status</label> + <mat-label for="status">Status</mat-label> <mat-form-field appearance="outline"> <mat-select multiple="true" id="status" [formControl]="portalStatusControl"> <mat-option *ngFor="let status of allStatuses" [value]="status.code"> diff --git a/portal-frontend/src/app/features/home/inbox/inbox.component.scss b/portal-frontend/src/app/features/home/inbox/inbox.component.scss index d87773c8fc..ea82628c1a 100644 --- a/portal-frontend/src/app/features/home/inbox/inbox.component.scss +++ b/portal-frontend/src/app/features/home/inbox/inbox.component.scss @@ -32,6 +32,19 @@ a { .mat-expansion-panel { box-shadow: none; } + + .mat-expansion-panel-header-title { + color: colors.$link-color; + flex-direction: row-reverse; + } + + .mat-expansion-indicator { + display: flex; + + &::after { + color: colors.$link-color; + } + } } .search-form { diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component.html index e4f0a7136a..70b4f6ce4c 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component.html @@ -26,7 +26,7 @@ <h2>Additional Proposal Information</h2> <form [formGroup]="form"> <div class="form-row"> <div class="full-row"> - <label for="is-new-structure"> {{ firstQuestion }}</label> + <mat-label for="is-new-structure"> {{ firstQuestion }}</mat-label> <div class="subtext">This can include farm buildings, residences, or accessory buildings.</div> <div> <mat-button-toggle-group @@ -67,7 +67,7 @@ <h2>Additional Proposal Information</h2> <div class="form-row"> <div class="full-row"> <form [formGroup]="structuresForm"> - <label>Provide the total floor area (m<sup>2</sup>) of the proposed structure(s) </label> + <mat-label>Provide the total floor area (m<sup>2</sup>) of the proposed structure(s) </mat-label> <table mat-table [dataSource]="structuresSource"> <ng-container matColumnDef="index"> <th mat-header-cell *matHeaderCellDef>#</th> @@ -115,6 +115,7 @@ <h2>Additional Proposal Information</h2> min="0.01" placeholder="Type area" [formControlName]="i + '-area'" + attr.aria-label="{{ i + '-area' }}" /> <span matTextSuffix>m<sup>2</sup></span> </mat-form-field> @@ -301,7 +302,7 @@ <h2>Additional Proposal Information</h2> </div> <div class="full-row"> - <label class="subheading2" for="detailed-building-plans">Detailed Building Plan(s)</label> + <mat-label class="subheading2" for="detailed-building-plans">Detailed Building Plan(s)</mat-label> <div class="subtext"> Building plans must be the most up to date, current version and should include (1) the total floor area of all levels and the intended use; and (2) interior and exterior views diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/change-noi-type-dialog/change-noi-type-dialog.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/change-noi-type-dialog/change-noi-type-dialog.component.html index e9c78cdc0f..60592892dc 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/change-noi-type-dialog/change-noi-type-dialog.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/change-noi-type-dialog/change-noi-type-dialog.component.html @@ -15,13 +15,7 @@ <h4>Change NOI Type</h4> <div [ngClass]="{ 'display-none': stepIdx !== applicationTypeStep }"> <div class="step-description">Select an option to learn more about the notice of intent type.</div> - <mat-radio-group - class="app-type-radio-group" - aria-labelledby="radio-label" - (change)="onTypeSelected($event)" - color="primary" - required - > + <mat-radio-group class="app-type-radio-group" (change)="onTypeSelected($event)" color="primary" required> <mat-radio-button *ngFor="let appType of noiTypes" [value]="appType.code" class="radio-option"> {{ appType.portalLabel }} </mat-radio-button> diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/land-use/land-use.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/land-use/land-use.component.html index e47b1f85f3..92251939e7 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/land-use/land-use.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/land-use/land-use.component.html @@ -122,7 +122,7 @@ <h5>Choose and describe neighbouring land uses.</h5> <div class="subtext">Choose the main land use type from the drop-down and describe the specific activities.</div> <div class="form-row"> <div class="full-row"> - <label for="northLandUseType">North</label> + <mat-label for="northLandUseType">North</mat-label> <div class="land-use-type-wrapper"> <div class="land-use-type"> <mat-form-field appearance="outline"> @@ -147,6 +147,7 @@ <h5>Choose and describe neighbouring land uses.</h5> placeholder="Specific Activity" matInput formControlName="northLandUseTypeDescription" + aria-label="North land use type description" /> </mat-form-field> <div @@ -164,7 +165,7 @@ <h5>Choose and describe neighbouring land uses.</h5> </div> <div class="full-row"> - <label for="eastLandUseType">East</label> + <mat-label for="eastLandUseType">East</mat-label> <div class="land-use-type-wrapper"> <div class="land-use-type"> <mat-form-field appearance="outline"> @@ -189,6 +190,7 @@ <h5>Choose and describe neighbouring land uses.</h5> placeholder="Specific Activity" matInput formControlName="eastLandUseTypeDescription" + aria-label="East land use type description" /> </mat-form-field> <div @@ -206,7 +208,7 @@ <h5>Choose and describe neighbouring land uses.</h5> </div> <div class="full-row"> - <label for="southLandUseType">South</label> + <mat-label for="southLandUseType">South</mat-label> <div class="land-use-type-wrapper"> <div class="land-use-type"> <mat-form-field appearance="outline"> @@ -231,6 +233,7 @@ <h5>Choose and describe neighbouring land uses.</h5> placeholder="Specific Activity" matInput formControlName="southLandUseTypeDescription" + aria-label="South land use type description" /> </mat-form-field> <div @@ -248,7 +251,7 @@ <h5>Choose and describe neighbouring land uses.</h5> </div> <div class="full-row"> - <label for="westLandUseType">West</label> + <mat-label for="westLandUseType">West</mat-label> <div class="land-use-type-wrapper"> <div class="land-use-type"> <mat-form-field appearance="outline"> @@ -273,6 +276,7 @@ <h5>Choose and describe neighbouring land uses.</h5> placeholder="Specific Activity" matInput formControlName="westLandUseTypeDescription" + aria-label="West land use type description" /> </mat-form-field> <div diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/other-attachments/other-attachments.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/other-attachments/other-attachments.component.html index cf83c25320..193d74cd18 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/other-attachments/other-attachments.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/other-attachments/other-attachments.component.html @@ -51,6 +51,7 @@ <h2>Optional Attachments</h2> type="text" matInput placeholder="Type description" + aria-label="Attachment description" /> </mat-form-field> <div diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/other-attachments/other-attachments.component.scss b/portal-frontend/src/app/features/notice-of-intents/edit-submission/other-attachments/other-attachments.component.scss index 2de86abf6e..abca50e46d 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/other-attachments/other-attachments.component.scss +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/other-attachments/other-attachments.component.scss @@ -33,6 +33,6 @@ h4 { .no-data-text { text-align: center; - color: colors.$grey; + color: colors.$grey-dark; padding-top: rem(12); } diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-details.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-details.component.html index b2b1ca3ae7..d8cbefcb0f 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-details.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-details.component.html @@ -1,6 +1,6 @@ <div> <div class="step-description"> - <h3>Identify Parcels Under Notice of Intent</h3> + <h2>Identify Parcels Under Notice of Intent</h2> <p>Provide parcel identification and registered ownership information for each parcel.</p> <p>*All fields are required unless stated optional.</p> <div class="step-documents"> diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.html index b9b1b626c8..ec07417739 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.html @@ -1,6 +1,6 @@ <form [formGroup]="parcelForm" (keydown.enter)="$event.preventDefault()"> <div class="type"> - <label>Select ownership type:</label> + <mat-label for="parcelType">Select ownership type:</mat-label> <div class="warning"> The answer to the following question will change the rest of the notice of intent form. Do not change this answer once selected. @@ -147,7 +147,7 @@ <h5>Parcel Lookup</h5> </div> <div> - <label for="isFarm">Farm Classification</label> + <mat-label for="isFarm">Farm Classification</mat-label> <div class="subtext"> As determined by <a class="subtext" href="https://www.bcassessment.ca/" target="_blank" rel="noreferrer">BC Assessment</a> @@ -183,7 +183,7 @@ <h5>Parcel Lookup</h5> </div> <div class="section" *ngIf="enableCertificateOfTitleUpload"> - <label for="certificate-of-title-upload">Upload Certificate of Title</label> + <mat-label for="certificate-of-title-upload">Upload Certificate of Title</mat-label> <div class="subtext"> Visit <a class="subtext" href="https://ltsa.ca/property-owners/how-can-i/search-for-a-title/" target="_blank" @@ -276,7 +276,7 @@ <h6>Owner Information</h6> </ng-container> <ng-container *ngIf="isCrownLand"> <div> - <label for="crown-owner-type">Select owner:</label> + <mat-label for="crown-owner-type">Select owner:</mat-label> </div> <mat-radio-group formControlName="crownLandOwnerType" diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html index cc970fde84..77ff44fd0f 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html @@ -116,7 +116,7 @@ <h4>Primary Contact Information</h4> </div> </div> <div> - <label for="firstName">Email</label> + <label for="email">Email</label> <mat-form-field appearance="outline"> <input id="email" type="email" matInput placeholder="Enter Email" formControlName="email" /> </mat-form-field> diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pfrs/pfrs-proposal.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pfrs/pfrs-proposal.component.html index 39bf3c0f54..15ffba8151 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pfrs/pfrs-proposal.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pfrs/pfrs-proposal.component.html @@ -18,16 +18,16 @@ <h2>Proposal</h2> </a> </li> <li> - <a href="TODO" target="_blank">FIXME: Placement of Fill</a> + <a href="TODO" target="_blank">FIXME: Removal of Soil & Placement of Fill</a> </li> </ul> </app-warning-banner> <form [formGroup]="form"> <div class="form-row"> <div class="full-row"> - <label for="noi-follow-up"> + <mat-label for="noi-follow-up"> Has the ALC previously received an application or Notice of Intent for this proposal? - </label> + </mat-label> <div class="subtext">If yes, provide the ALC Application or Notice of Intent ID in the field below</div> <div> <mat-button-toggle-group @@ -147,7 +147,7 @@ <h2>Proposal</h2> </div> <div class="full-row"> - <label>Proposal Dimensions</label> + <mat-label>Proposal Dimensions</mat-label> <div class="subtext"> Please provide accurate numbers that align with your cross sections, reclamation plan, and site plan. The Commission will consider your proposal dimensions when determining the potential impact it will have on the @@ -177,9 +177,9 @@ <h2>Proposal</h2> ></app-soil-table> </div> <div class="full-row"> - <label + <mat-label >Of the proposed totals provided above, please input the dimensions of soil that has already been - removed.</label + removed.</mat-label > <div class="subtext">If no proposed soil has already been removed, please leave 0 in the fields below</div> <app-soil-table @@ -263,7 +263,7 @@ <h4>Removal of Soil Project Duration</h4> <div class="subtext">Estimated duration of the project</div> <div class="form-row"> <div> - <label for="soilProjectDurationUnit">Duration</label> + <mat-label for="soilProjectDurationUnit">Duration</mat-label> <div class="subtext">Days, Months, or Years</div> <mat-form-field appearance="outline"> <mat-select placeholder="Select one" id="soilProjectDurationUnit" formControlName="soilProjectDurationUnit"> @@ -312,7 +312,7 @@ <h4>Removal of Soil Project Duration</h4> </div> <div class="full-row"> - <label class="subheading2" for="proposal-map">Proposal Map / Site Plan</label> + <mat-label class="subheading2" for="proposal-map">Proposal Map / Site Plan</mat-label> <div class="subtext">A visual representation of your proposal.</div> <app-file-drag-drop id="proposal-map" @@ -327,7 +327,7 @@ <h4>Removal of Soil Project Duration</h4> </div> <div class="full-row"> - <label for="noi-area-wide-filling"> Is your proposal for area-wide filling? </label> + <mat-label for="noi-area-wide-filling"> Is your proposal for area-wide filling? </mat-label> <div> <mat-button-toggle-group class="input" @@ -356,7 +356,9 @@ <h4>Removal of Soil Project Duration</h4> </div> <div class="full-row"> - <label for="noi-extraction-or-mining"> Is your proposal for aggregate extraction or placer mining? </label> + <mat-label for="noi-extraction-or-mining"> + Is your proposal for aggregate extraction or placer mining? + </mat-label> <div> <mat-button-toggle-group class="input" @@ -387,7 +389,7 @@ <h4>Removal of Soil Project Duration</h4> </div> <div class="full-row"> - <label class="subheading2" for="cross-section">Cross Sections</label> + <mat-label class="subheading2" for="cross-section">Cross Sections</mat-label> <div class="subtext">Include North-South and East-West cross sections</div> <app-info-banner> Please refer to <a>FIXME: Removal of Soil</a> on the ALC website for more information @@ -406,7 +408,7 @@ <h4>Removal of Soil Project Duration</h4> ></app-file-drag-drop> </div> <div class="full-row"> - <label class="subheading2" for="reclamation-plan">Reclamation Plan</label> + <mat-label class="subheading2" for="reclamation-plan">Reclamation Plan</mat-label> <div class="subtext"> The Reclamation Plan should be completed by a qualified Professional Agrologist and contain the area's agricultural capability assessment. @@ -429,9 +431,9 @@ <h4>Removal of Soil Project Duration</h4> </div> <div class="full-row"> - <label for="hasSubmittedNotice"> + <mat-label for="hasSubmittedNotice"> Have you submitted a Notice of Work to the Ministry of Energy, Mines and Low Carbon Innovation (EMLI)? - </label> + </mat-label> <div class="subtext">If yes, please attach the Notice of Work in the section below.</div> <div> <mat-button-toggle-group @@ -461,7 +463,7 @@ <h4>Removal of Soil Project Duration</h4> </div> <div class="full-row"> - <label class="subheading2" for="noticeOfWork">Notice of Work</label> + <mat-label class="subheading2" for="noticeOfWork">Notice of Work</mat-label> <app-info-banner> Please refer to <a>FIXME: Removal of Soil</a> on the ALC website for more information </app-info-banner> diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pofo/pofo-proposal.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pofo/pofo-proposal.component.html index 1cdeaeee88..219e2ec669 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pofo/pofo-proposal.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pofo/pofo-proposal.component.html @@ -25,9 +25,9 @@ <h2>Proposal</h2> <form [formGroup]="form"> <div class="form-row"> <div class="full-row"> - <label for="noi-follow-up"> + <mat-label for="noi-follow-up"> Has the ALC previously received an application or Notice of Intent for this proposal? - </label> + </mat-label> <div class="subtext">If yes, provide the ALC Application or Notice of Intent ID in the field below</div> <div> <mat-button-toggle-group @@ -127,7 +127,7 @@ <h2>Proposal</h2> <div class="subtext">Characters left: {{ 4000 - soilTypeRemovedText.textLength }}</div> </div> <div class="full-row"> - <label>Proposal Dimensions</label> + <mat-label>Proposal Dimensions</mat-label> <div class="subtext"> The Commission will consider your proposal dimensions when determining the potential impact it will have on the agricultural capability of the land. @@ -140,7 +140,9 @@ <h2>Proposal</h2> ></app-soil-table> </div> <div class="full-row"> - <label> Of the proposed totals indicated above, please provide the dimensions of soil if already placed. </label> + <mat-label> + Of the proposed totals indicated above, please provide the dimensions of soil if already placed. + </mat-label> <div class="subtext">If no proposed material has already been placed, please leave 0 in the fields below</div> <app-soil-table tableHeader="Fill already placed" @@ -154,7 +156,7 @@ <h4>Project Duration</h4> <div class="subtext">Estimated duration of the project</div> <div class="form-row"> <div> - <label for="projectDurationUnit">Duration</label> + <mat-label for="projectDurationUnit">Duration</mat-label> <div class="subtext">Days, Months, or Years</div> <mat-form-field appearance="outline"> <mat-select placeholder="Select one" id="projectDurationUnit" [formControl]="projectDurationUnit"> @@ -198,7 +200,7 @@ <h4>Project Duration</h4> </section> <div class="full-row"> - <label class="subheading2" for="proposal-map">Proposal Map / Site Plan</label> + <mat-label class="subheading2" for="proposal-map">Proposal Map / Site Plan</mat-label> <div class="subtext">A visual representation of your proposal.</div> <app-file-drag-drop id="proposal-map" @@ -213,7 +215,7 @@ <h4>Project Duration</h4> </div> <div class="full-row"> - <label for="noi-follow-up"> Is your proposal for area-wide filling? </label> + <mat-label for="noi-extraction-or-mining"> Is your proposal for area-wide filling? </mat-label> <div> <mat-button-toggle-group class="input" @@ -242,7 +244,7 @@ <h4>Project Duration</h4> </div> <div class="full-row"> - <label class="subheading2" for="cross-section">Cross Sections</label> + <mat-label class="subheading2" for="cross-section">Cross Sections</mat-label> <div class="subtext">Include North-South and East-West cross sections</div> <app-info-banner> Please refer to <a>FIXME: Removal of Soil</a> on the ALC website for more information @@ -261,7 +263,7 @@ <h4>Project Duration</h4> ></app-file-drag-drop> </div> <div class="full-row"> - <label class="subheading2" for="reclamation-plan">Reclamation Plan</label> + <mat-label class="subheading2" for="reclamation-plan">Reclamation Plan</mat-label> <div class="subtext"> The Reclamation Plan should be completed by a qualified Professional Agrologist and contain the area's agricultural capability assessment. diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.html index ed881b037a..aff80ecc62 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.html @@ -25,9 +25,9 @@ <h2>Proposal</h2> <form [formGroup]="form"> <div class="form-row"> <div class="full-row"> - <label for="noi-follow-up"> + <mat-label for="noi-follow-up"> Has the ALC previously received an application or Notice of Intent for this proposal? - </label> + </mat-label> <div class="subtext">If yes, provide the ALC Application or Notice of Intent ID in the field below</div> <div> <mat-button-toggle-group @@ -110,7 +110,7 @@ <h2>Proposal</h2> <div class="subtext">Characters left: {{ 4000 - soilTypeRemovedText.textLength }}</div> </div> <div class="full-row"> - <label>Proposal Dimensions</label> + <mat-label>Proposal Dimensions</mat-label> <div class="subtext"> Please provide accurate numbers that align with your cross sections, reclamation plan, and site plan. The Commission will consider your proposal dimensions when determining the potential impact it will have on the @@ -124,9 +124,9 @@ <h2>Proposal</h2> ></app-soil-table> </div> <div class="full-row"> - <label + <mat-label >Of the proposed totals provided above, please input the dimensions of soil that has already been - removed.</label + removed.</mat-label > <div class="subtext">If no proposed soil has already been removed, please leave 0 in the fields below</div> <app-soil-table @@ -141,7 +141,7 @@ <h4>Project Duration</h4> <div class="subtext">Estimated duration of the project</div> <div class="form-row"> <div> - <label for="projectDurationUnit">Duration</label> + <mat-label for="projectDurationUnit">Duration</mat-label> <div class="subtext">Days, Months, or Years</div> <mat-form-field appearance="outline"> <mat-select placeholder="Select one" id="projectDurationUnit" formControlName="projectDurationUnit"> @@ -185,7 +185,7 @@ <h4>Project Duration</h4> </section> <div class="full-row"> - <label class="subheading2" for="proposal-map">Proposal Map / Site Plan</label> + <mat-label class="subheading2" for="proposal-map">Proposal Map / Site Plan</mat-label> <div class="subtext">A visual representation of your proposal.</div> <app-file-drag-drop id="proposal-map" @@ -200,7 +200,9 @@ <h4>Project Duration</h4> </div> <div class="full-row"> - <label for="noi-follow-up"> Is your proposal for aggregate extraction or placer mining? </label> + <mat-label for="noi-extraction-or-mining"> + Is your proposal for aggregate extraction or placer mining? + </mat-label> <div> <mat-button-toggle-group class="input" @@ -231,7 +233,7 @@ <h4>Project Duration</h4> </div> <div class="full-row"> - <label class="subheading2" for="cross-section">Cross Sections</label> + <mat-label class="subheading2" for="cross-section">Cross Sections</mat-label> <div class="subtext">Include North-South and East-West cross sections</div> <app-info-banner> Please refer to <a>FIXME: Removal of Soil</a> on the ALC website for more information @@ -250,7 +252,7 @@ <h4>Project Duration</h4> ></app-file-drag-drop> </div> <div class="full-row"> - <label class="subheading2" for="reclamation-plan">Reclamation Plan</label> + <mat-label class="subheading2" for="reclamation-plan">Reclamation Plan</mat-label> <div class="subtext"> The Reclamation Plan should be completed by a qualified Professional Agrologist and contain the area's agricultural capability assessment. @@ -273,9 +275,9 @@ <h4>Project Duration</h4> </div> <div class="full-row"> - <label for="hasSubmittedNotice"> + <mat-label for="hasSubmittedNotice"> Have you submitted a Notice of Work to the Ministry of Energy, Mines and Low Carbon Innovation (EMLI)? - </label> + </mat-label> <div class="subtext">If yes, please attach the Notice of Work in the section below.</div> <div> <mat-button-toggle-group @@ -305,7 +307,7 @@ <h4>Project Duration</h4> </div> <div class="full-row"> - <label class="subheading2" for="noticeOfWork">Notice of Work</label> + <mat-label class="subheading2" for="noticeOfWork">Notice of Work</mat-label> <app-info-banner> Please refer to <a>FIXME: Removal of Soil</a> on the ALC website for more information </app-info-banner> diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.html b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.html index 8b3ca6786e..4226a9c871 100644 --- a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.html @@ -1,3 +1,4 @@ +<h2 *ngIf="showEdit" class="page-title">Review & Submit</h2> <section> <app-parcel [draftMode]="draftMode" @@ -76,9 +77,7 @@ <h3>2. Primary Contact</h3> <section> <h3>3. Government</h3> <div *ngIf="noiSubmission" class="review-table"> - <div class="subheading2 grid-1"> - Local or First Nation Government - </div> + <div class="subheading2 grid-1">Local or First Nation Government</div> <div class="grid-double"> {{ localGovernment?.name }} <app-no-data [showRequired]="showErrors" *ngIf="!localGovernment"></app-no-data> @@ -100,16 +99,12 @@ <h3>4. Land Use</h3> <div class="full-width"> <h4>Land Use of Parcel(s) under Notice of Intent</h4> </div> - <div class="subheading2 grid-1"> - Describe all agriculture that currently takes place on the parcel(s). - </div> + <div class="subheading2 grid-1">Describe all agriculture that currently takes place on the parcel(s).</div> <div class="grid-double"> {{ noiSubmission.parcelsAgricultureDescription }} <app-no-data [showRequired]="showErrors" *ngIf="!noiSubmission.parcelsAgricultureDescription"></app-no-data> </div> - <div class="subheading2 grid-1"> - Describe all agricultural improvements made to the parcel(s). - </div> + <div class="subheading2 grid-1">Describe all agricultural improvements made to the parcel(s).</div> <div class="grid-double"> {{ noiSubmission.parcelsAgricultureImprovementDescription }} <app-no-data @@ -117,17 +112,13 @@ <h4>Land Use of Parcel(s) under Notice of Intent</h4> *ngIf="!noiSubmission.parcelsAgricultureImprovementDescription" ></app-no-data> </div> - <div class="subheading2 grid-1"> - Describe all other uses that currently take place on the parcel(s). - </div> + <div class="subheading2 grid-1">Describe all other uses that currently take place on the parcel(s).</div> <div class="grid-double"> {{ noiSubmission.parcelsNonAgricultureUseDescription }} <app-no-data [showRequired]="showErrors" *ngIf="!noiSubmission.parcelsNonAgricultureUseDescription"></app-no-data> </div> <div class="full-width"> - <h4> - Land Use of Adjacent Parcels - </h4> + <h4>Land Use of Adjacent Parcels</h4> </div> <div class="adjacent-parcels full-width"> <div class="grid-1 subheading2"></div> diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.scss b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.scss index 8c860798c8..36c2670f5e 100644 --- a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.scss +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.scss @@ -2,6 +2,10 @@ @use '../../../../styles/colors'; :host::ng-deep { + .page-title { + margin: rem(16) 0 !important; + } + .multiple-documents { a { display: block; diff --git a/portal-frontend/src/app/features/notice-of-intents/view-submission/alc-review/alc-review.component.html b/portal-frontend/src/app/features/notice-of-intents/view-submission/alc-review/alc-review.component.html index 62ad509a57..9a520595ea 100644 --- a/portal-frontend/src/app/features/notice-of-intents/view-submission/alc-review/alc-review.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/view-submission/alc-review/alc-review.component.html @@ -1,6 +1,6 @@ <div *ngIf="noiSubmission"> <div class="header"> - <h3>ALC Review and Decision</h3> + <h2>ALC Review and Decision</h2> <div> <button [routerLink]="'/notice-of-intent/' + noiSubmission.fileNumber + '/edit'" diff --git a/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.html b/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.html index 4f5f1b97f0..17d5ab5af7 100644 --- a/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.html @@ -36,7 +36,7 @@ <h4 *ngIf="submission">NOI ID: {{ submission.fileNumber }}</h4> <div *ngIf="submission" class="content"> <section> <div class="header"> - <h3>Applicant Submission</h3> + <h2>Applicant Submission</h2> <div class="btns-wrapper"> <button *ngIf="submission.canEdit" mat-stroked-button color="warn" (click)="onCancel(submission.uuid)"> Cancel NOI diff --git a/portal-frontend/src/app/features/notifications/edit-submission/other-attachments/other-attachments.component.html b/portal-frontend/src/app/features/notifications/edit-submission/other-attachments/other-attachments.component.html index 2d7a89ee1b..648f52492f 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/other-attachments/other-attachments.component.html +++ b/portal-frontend/src/app/features/notifications/edit-submission/other-attachments/other-attachments.component.html @@ -56,6 +56,7 @@ <h2>Optional Attachments</h2> type="text" matInput placeholder="Type description" + aria-label="Attachment description" /> </mat-form-field> <div diff --git a/portal-frontend/src/app/features/notifications/edit-submission/other-attachments/other-attachments.component.scss b/portal-frontend/src/app/features/notifications/edit-submission/other-attachments/other-attachments.component.scss index 2de86abf6e..abca50e46d 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/other-attachments/other-attachments.component.scss +++ b/portal-frontend/src/app/features/notifications/edit-submission/other-attachments/other-attachments.component.scss @@ -33,6 +33,6 @@ h4 { .no-data-text { text-align: center; - color: colors.$grey; + color: colors.$grey-dark; padding-top: rem(12); } diff --git a/portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-entry/parcel-entry.component.html b/portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-entry/parcel-entry.component.html index 44247bd91f..9f1b6422a5 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-entry/parcel-entry.component.html +++ b/portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-entry/parcel-entry.component.html @@ -1,9 +1,8 @@ <form [formGroup]="parcelForm" (keydown.enter)="$event.preventDefault()"> <div class="type"> - <label>Select ownership type:</label> + <mat-label>Select ownership type:</mat-label> <div class="subtext"> - The answer to the following question will change the rest of the form. Do not change this answer - once selected. + The answer to the following question will change the rest of the form. Do not change this answer once selected. </div> <mat-button-toggle-group class="input" diff --git a/portal-frontend/src/app/features/notifications/edit-submission/proposal/proposal.component.html b/portal-frontend/src/app/features/notifications/edit-submission/proposal/proposal.component.html index 4b484351cb..72b7d61af2 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/proposal/proposal.component.html +++ b/portal-frontend/src/app/features/notifications/edit-submission/proposal/proposal.component.html @@ -67,7 +67,7 @@ <h2>Purpose of SRW</h2> </div> <div class="full-row"> - <label class="subheading2" for="proposal-map">Upload Terms of the SRW</label> + <mat-label class="subheading2" for="proposal-map">Upload Terms of the SRW</mat-label> <div class="subtext">The signed and finalized terms that are to be included in the SRW package to LTSA</div> <app-file-drag-drop id="proposal-map" @@ -82,7 +82,7 @@ <h2>Purpose of SRW</h2> </div> <div class="full-row"> - <label for="hasSurveyPlan"> Is there a survey plan associated with the SRW? </label> + <mat-label for="hasSurveyPlan"> Is there a survey plan associated with the SRW? </mat-label> <div> <mat-button-toggle-group class="input" @@ -111,7 +111,7 @@ <h2>Purpose of SRW</h2> </div> <div class="full-row"> - <label class="subheading2" for="surveyPlans">Upload Survey Plan(s)</label> + <mat-label class="subheading2" for="surveyPlans">Upload Survey Plan(s)</mat-label> <app-file-drag-drop id="surveyPlans" [uploadedFiles]="[]" diff --git a/portal-frontend/src/app/features/notifications/edit-submission/proposal/proposal.component.scss b/portal-frontend/src/app/features/notifications/edit-submission/proposal/proposal.component.scss index b2d7bdf81a..fc73792349 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/proposal/proposal.component.scss +++ b/portal-frontend/src/app/features/notifications/edit-submission/proposal/proposal.component.scss @@ -6,7 +6,7 @@ section { } .no-data-text { - color: colors.$grey; + color: colors.$grey-dark; text-align: center; padding-top: rem(16); } diff --git a/portal-frontend/src/app/features/notifications/edit-submission/transferees/transferee-dialog/transferee-dialog.component.html b/portal-frontend/src/app/features/notifications/edit-submission/transferees/transferee-dialog/transferee-dialog.component.html index 0beef716cc..e026d2f35f 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/transferees/transferee-dialog/transferee-dialog.component.html +++ b/portal-frontend/src/app/features/notifications/edit-submission/transferees/transferee-dialog/transferee-dialog.component.html @@ -6,7 +6,7 @@ <h3 *ngIf="isEdit">Edit Transferee</h3> <form [formGroup]="form"> <div class="form-row"> <div class="full-row"> - <label for="type">Transferee Type</label> + <mat-label for="type">Transferee Type</mat-label> <mat-button-toggle-group (change)="onChangeType($event)" class="input" id="type" formControlName="type"> <mat-button-toggle color="primary" [value]="OWNER_TYPE.INDIVIDUAL">Individual</mat-button-toggle> <mat-button-toggle color="primary" [value]="OWNER_TYPE.ORGANIZATION">Organization</mat-button-toggle> @@ -64,7 +64,7 @@ <h5 class="full-row" *ngIf="type.getRawValue() === OWNER_TYPE.ORGANIZATION">Orga </div> </div> <div> - <label for="firstName">Email</label> + <label for="email">Email</label> <mat-form-field appearance="outline"> <input id="email" type="email" matInput placeholder="Enter Email" formControlName="email" /> </mat-form-field> @@ -79,10 +79,6 @@ <h5 class="full-row" *ngIf="type.getRawValue() === OWNER_TYPE.ORGANIZATION">Orga </div> <div mat-dialog-actions class="actions"> <button mat-stroked-button color="primary" (click)="onClose()">Cancel</button> - <button mat-flat-button color="primary" [disabled]="isLoading" *ngIf="!isEdit" (click)="onCreate()"> - Add - </button> - <button mat-flat-button color="primary" [disabled]="isLoading" *ngIf="isEdit" (click)="onSave()"> - Save - </button> + <button mat-flat-button color="primary" [disabled]="isLoading" *ngIf="!isEdit" (click)="onCreate()">Add</button> + <button mat-flat-button color="primary" [disabled]="isLoading" *ngIf="isEdit" (click)="onSave()">Save</button> </div> diff --git a/portal-frontend/src/app/features/notifications/edit-submission/transferees/transferees.component.scss b/portal-frontend/src/app/features/notifications/edit-submission/transferees/transferees.component.scss index a72b0238a5..ad4a6d8656 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/transferees/transferees.component.scss +++ b/portal-frontend/src/app/features/notifications/edit-submission/transferees/transferees.component.scss @@ -2,7 +2,7 @@ @use '../../../../../styles/colors'; .no-data { - color: colors.$grey; + color: colors.$grey-dark; text-align: center; padding: rem(8); } @@ -31,7 +31,8 @@ flex-direction: column; align-items: start; - div, button { + div, + button { margin-top: rem(4); width: 100%; } diff --git a/portal-frontend/src/app/features/notifications/notification-details/notification-details.component.html b/portal-frontend/src/app/features/notifications/notification-details/notification-details.component.html index 5eea27252e..4f79cc8ae3 100644 --- a/portal-frontend/src/app/features/notifications/notification-details/notification-details.component.html +++ b/portal-frontend/src/app/features/notifications/notification-details/notification-details.component.html @@ -1,3 +1,4 @@ +<h2 *ngIf="showEdit" class="page-title">Review & Submit</h2> <section> <app-parcel [$notificationSubmission]="$notificationSubmission" diff --git a/portal-frontend/src/app/features/notifications/notification-details/notification-details.component.scss b/portal-frontend/src/app/features/notifications/notification-details/notification-details.component.scss index 020b236421..fc9e0d249d 100644 --- a/portal-frontend/src/app/features/notifications/notification-details/notification-details.component.scss +++ b/portal-frontend/src/app/features/notifications/notification-details/notification-details.component.scss @@ -2,6 +2,10 @@ @use '../../../../styles/colors'; :host::ng-deep { + .page-title { + margin: rem(16) 0 !important; + } + .view-grid-item { display: grid; grid-template-columns: minmax(rem(100), 0.5fr) 1fr; diff --git a/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.html b/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.html index f8f2428568..0a426e24e8 100644 --- a/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.html +++ b/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.html @@ -36,7 +36,7 @@ <h4 *ngIf="submission">Notification ID: {{ submission.fileNumber }}</h4> <div *ngIf="submission" class="content"> <section> <div class="header"> - <h3>Applicant Submission</h3> + <h2>Applicant Submission</h2> <div class="btns-wrapper"> <button *ngIf="submission.canEdit" mat-stroked-button color="warn" (click)="onCancel(submission.uuid)"> Cancel SRW diff --git a/portal-frontend/src/app/features/public/application/alc-review/alc-review.component.html b/portal-frontend/src/app/features/public/application/alc-review/alc-review.component.html index 58b4bc539e..e45195d31a 100644 --- a/portal-frontend/src/app/features/public/application/alc-review/alc-review.component.html +++ b/portal-frontend/src/app/features/public/application/alc-review/alc-review.component.html @@ -1,6 +1,6 @@ <div *ngIf="applicationSubmission"> <div class="header"> - <h3>ALC Review and Decision</h3> + <h2>ALC Review and Decision</h2> </div> <div> <app-public-decisions [applicationDecisions]="applicationDecisions"></app-public-decisions> diff --git a/portal-frontend/src/app/features/public/application/lfng-review/lfng-review.component.html b/portal-frontend/src/app/features/public/application/lfng-review/lfng-review.component.html index e3cd36db5a..82be39e6a5 100644 --- a/portal-frontend/src/app/features/public/application/lfng-review/lfng-review.component.html +++ b/portal-frontend/src/app/features/public/application/lfng-review/lfng-review.component.html @@ -1,6 +1,6 @@ <div *ngIf="applicationSubmission"> <div class="header"> - <h3>Local/First Nation Gov Review</h3> + <h2>Local/First Nation Gov Review</h2> </div> <div *ngIf="!applicationReview" class="warning"> <mat-icon>info</mat-icon>Application not subject to Local/First Nation Government review. diff --git a/portal-frontend/src/app/features/public/application/public-application.component.html b/portal-frontend/src/app/features/public/application/public-application.component.html index 17488ded75..4d17562e28 100644 --- a/portal-frontend/src/app/features/public/application/public-application.component.html +++ b/portal-frontend/src/app/features/public/application/public-application.component.html @@ -39,7 +39,7 @@ <h4 *ngIf="submission">Application ID: {{ submission.fileNumber }}</h4> <div *ngIf="submission" class="content"> <section> <div class="header"> - <h3>Applicant Submission</h3> + <h2>Applicant Submission</h2> </div> <app-public-app-submission-details [applicationDocuments]="documents" diff --git a/portal-frontend/src/app/features/public/notice-of-intent/alc-review/alc-review.component.html b/portal-frontend/src/app/features/public/notice-of-intent/alc-review/alc-review.component.html index 56c175af02..3eb48d7d9f 100644 --- a/portal-frontend/src/app/features/public/notice-of-intent/alc-review/alc-review.component.html +++ b/portal-frontend/src/app/features/public/notice-of-intent/alc-review/alc-review.component.html @@ -1,6 +1,6 @@ <div *ngIf="submission"> <div class="header"> - <h3>ALC Review and Decision</h3> + <h2>ALC Review and Decision</h2> </div> <div> <app-public-decisions [decisions]="decisions"></app-public-decisions> diff --git a/portal-frontend/src/app/features/public/notice-of-intent/public-notice-of-intent.component.html b/portal-frontend/src/app/features/public/notice-of-intent/public-notice-of-intent.component.html index a3b75fdfef..c70cc4905d 100644 --- a/portal-frontend/src/app/features/public/notice-of-intent/public-notice-of-intent.component.html +++ b/portal-frontend/src/app/features/public/notice-of-intent/public-notice-of-intent.component.html @@ -39,7 +39,7 @@ <h4 *ngIf="submission">Notice of Intent ID: {{ submission.fileNumber }}</h4> <div *ngIf="submission" class="content"> <section> <div class="header"> - <h3>Applicant Submission</h3> + <h2>Applicant Submission</h2> </div> <app-public-app-submission-details [documents]="documents" [submission]="submission" [parcels]="parcels"> </app-public-app-submission-details> diff --git a/portal-frontend/src/app/features/public/notification/alc-review/alc-review.component.html b/portal-frontend/src/app/features/public/notification/alc-review/alc-review.component.html index 3abb9f0a93..bc3633f49f 100644 --- a/portal-frontend/src/app/features/public/notification/alc-review/alc-review.component.html +++ b/portal-frontend/src/app/features/public/notification/alc-review/alc-review.component.html @@ -1,6 +1,6 @@ <div> <div class="header"> - <h3>ALC Review and Decision</h3> + <h2>ALC Review and Decision</h2> </div> <div> <app-submission-documents [submission]="submission" [documents]="documents"></app-submission-documents> diff --git a/portal-frontend/src/app/features/public/notification/public-notification.component.html b/portal-frontend/src/app/features/public/notification/public-notification.component.html index b765991cc0..a3c7d72e8f 100644 --- a/portal-frontend/src/app/features/public/notification/public-notification.component.html +++ b/portal-frontend/src/app/features/public/notification/public-notification.component.html @@ -39,7 +39,7 @@ <h4 *ngIf="submission">Notification ID: {{ submission.fileNumber }}</h4> <div *ngIf="submission" class="content"> <section> <div class="header"> - <h3>Applicant Submission</h3> + <h2>Applicant Submission</h2> </div> <app-public-app-submission-details [documents]="documents" [submission]="submission" [parcels]="parcels"> </app-public-app-submission-details> diff --git a/portal-frontend/src/app/features/public/search/public-search.component.html b/portal-frontend/src/app/features/public/search/public-search.component.html index d0280e82d5..dbfb74a8c7 100644 --- a/portal-frontend/src/app/features/public/search/public-search.component.html +++ b/portal-frontend/src/app/features/public/search/public-search.component.html @@ -46,7 +46,7 @@ <h3>Search by one or more of the following fields:</h3> </div> </div> <div> - <label for="civicAddress">Local/First Nation Government</label> + <label for="government">Local/First Nation Government</label> <mat-form-field appearance="outline"> <input (blur)="onBlur()" @@ -64,16 +64,16 @@ <h3>Search by one or more of the following fields:</h3> </mat-form-field> </div> <div> - <label for="status">Region</label> + <mat-label for="region">Region</mat-label> <mat-form-field appearance="outline"> <mat-select multiple="true" id="region" formControlName="region"> <mat-option *ngFor="let region of regions" [value]="region.code">{{ region.label }}</mat-option> </mat-select> </mat-form-field> </div> - <div><label for="status">Decision Outcome</label>//TODO: Decision Outcome</div> + <div><label for="decisionOutcome">Decision Outcome</label>//TODO: Decision Outcome</div> <div> - <label for="status">Decision Maker</label> + <mat-label for="decisionMaker">Decision Maker</mat-label> <mat-form-field appearance="outline"> <mat-select id="decisionMaker" formControlName="decisionMaker"> <mat-option *ngFor="let decisionMaker of decisionMakers" [value]="decisionMaker.code">{{ @@ -91,7 +91,7 @@ <h3>Search by one or more of the following fields:</h3> /> </div> <div> - <label for="status">Status</label> + <mat-label for="status">Status</mat-label> <mat-form-field appearance="outline"> <mat-select multiple="true" id="status" [formControl]="portalStatusControl"> <mat-option *ngFor="let status of STATUS_MAP" [value]="status[1]"> @@ -101,11 +101,11 @@ <h3>Search by one or more of the following fields:</h3> </mat-form-field> </div> <div class="full-width"> - <label for="status">Decision Dates</label> + <mat-label for="decisionDates">Decision Dates</mat-label> <mat-form-field appearance="outline"> <mat-date-range-input [max]="today" [rangePicker]="decisionDatePicker"> - <input matStartDate formControlName="dateDecidedFrom" /> - <input matEndDate formControlName="dateDecidedTo" /> + <input matStartDate formControlName="dateDecidedFrom" aria-label="date-decided-from" /> + <input matEndDate formControlName="dateDecidedTo" aria-label="date-decided-to" /> </mat-date-range-input> <mat-datepicker-toggle matIconSuffix [for]="decisionDatePicker"></mat-datepicker-toggle> <mat-date-range-picker #decisionDatePicker></mat-date-range-picker @@ -123,7 +123,7 @@ <h3>Search by one or more of the following fields:</h3> <mat-spinner></mat-spinner> </div> <div class="search-fields-wrapper search-result-wrapper" *ngIf="!searchResultsHidden"> - <h2 class="search-title">Search Results</h2> + <h3 class="search-title">Search Results</h3> <div *ngIf="isLoading && !searchResultsHidden" class="center"> <mat-spinner></mat-spinner> </div> diff --git a/portal-frontend/src/app/shared/file-drag-drop/file-drag-drop.component.html b/portal-frontend/src/app/shared/file-drag-drop/file-drag-drop.component.html index 547574361f..13e51ac7ba 100644 --- a/portal-frontend/src/app/shared/file-drag-drop/file-drag-drop.component.html +++ b/portal-frontend/src/app/shared/file-drag-drop/file-drag-drop.component.html @@ -1,4 +1,4 @@ -<input type="file" class="file-input" (change)="fileSelected($event)" #fileUpload /> +<input type="file" class="file-input" (change)="fileSelected($event)" #fileUpload aria-label="upload" /> <div *ngIf="uploadedFiles"> <ng-container *ngFor="let file of uploadedFiles"> <div diff --git a/portal-frontend/src/app/shared/file-drag-drop/file-drag-drop.component.scss b/portal-frontend/src/app/shared/file-drag-drop/file-drag-drop.component.scss index 5736e22298..8c1aa994a1 100644 --- a/portal-frontend/src/app/shared/file-drag-drop/file-drag-drop.component.scss +++ b/portal-frontend/src/app/shared/file-drag-drop/file-drag-drop.component.scss @@ -37,7 +37,7 @@ a { .icon { font-size: 3rem; - color: colors.$grey; + color: colors.$grey-dark; } .drag-text { diff --git a/portal-frontend/src/app/shared/header/header.component.html b/portal-frontend/src/app/shared/header/header.component.html index 6de2cd7ca1..510df05dc2 100644 --- a/portal-frontend/src/app/shared/header/header.component.html +++ b/portal-frontend/src/app/shared/header/header.component.html @@ -25,20 +25,14 @@ <h5 class="center"> </div> <div *ngIf="isAuthenticated && !isOnPublicPage" class="controls"> - <button - mat-button - color="primary" - [class.open]="menuTrigger.menuOpen" - #menuTrigger="matMenuTrigger" - [matMenuTriggerFor]="userMenu" - > + <button mat-button color="primary" class="user-menu-button" (click)="onUserMenuToggle()"> <div class="center">{{ user?.name }} <mat-icon> arrow_drop_down </mat-icon></div> </button> - <mat-menu class="user-menu" #userMenu="matMenu"> + <ul *ngIf="isUserMenuOpen" class="user-menu mat-elevation-z8"> <div class="item">User ID: {{ user?.bceidUserName }}</div> <div class="item">Business: {{ user?.government || user?.businessName }}</div> <div class="item">Type: {{ user?.businessName ? 'BCeID Business' : 'BCeID Basic' }}</div> - </mat-menu> + </ul> <button class="logout-btn" (click)="onLogout()" mat-stroked-button color="primary">Log Out</button> </div> diff --git a/portal-frontend/src/app/shared/header/header.component.scss b/portal-frontend/src/app/shared/header/header.component.scss index 9e6ff19d22..73be56498a 100644 --- a/portal-frontend/src/app/shared/header/header.component.scss +++ b/portal-frontend/src/app/shared/header/header.component.scss @@ -2,8 +2,18 @@ @use '../../../styles/colors' as colors; ::ng-deep { + .user-menu-button { + position: relative; + } + .user-menu { max-width: unset !important; + border-radius: rem(4); + position: absolute; + margin: 0; + padding: rem(8) 0; + background-color: colors.$white; + z-index: 2; } } @@ -124,6 +134,10 @@ header { .title-wrapper { margin: rem(18) rem(80) !important; } + + .user-menu { + margin-left: rem(4); + } } } diff --git a/portal-frontend/src/app/shared/header/header.component.ts b/portal-frontend/src/app/shared/header/header.component.ts index 385eb080ef..fb63ebacd8 100644 --- a/portal-frontend/src/app/shared/header/header.component.ts +++ b/portal-frontend/src/app/shared/header/header.component.ts @@ -14,6 +14,7 @@ export class HeaderComponent implements OnInit, OnDestroy { isAuthenticated = false; isMenuOpen = false; isOnPublicPage = false; + isUserMenuOpen = false; title = 'Provincial Agricultural Land Commission Portal'; user: UserDto | undefined; @@ -59,6 +60,10 @@ export class HeaderComponent implements OnInit, OnDestroy { footer?.classList.toggle(hidden); } + async onUserMenuToggle() { + this.isUserMenuOpen = !this.isUserMenuOpen; + } + async onMenuClicked(url: string) { this.isMenuOpen = false; await this.router.navigate([url]); diff --git a/portal-frontend/src/app/shared/owner-dialogs/owner-dialog/owner-dialog.component.html b/portal-frontend/src/app/shared/owner-dialogs/owner-dialog/owner-dialog.component.html index c15fd4ed47..ae366b2f71 100644 --- a/portal-frontend/src/app/shared/owner-dialogs/owner-dialog/owner-dialog.component.html +++ b/portal-frontend/src/app/shared/owner-dialogs/owner-dialog/owner-dialog.component.html @@ -6,7 +6,7 @@ <h2 *ngIf="isEdit">Edit Owner</h2> <form [formGroup]="form"> <div class="form-row"> <div class="full-row"> - <label for="type">Owner Type</label> + <mat-label for="type">Owner Type</mat-label> <mat-button-toggle-group (change)="onChangeType($event)" class="input" id="type" formControlName="type"> <mat-button-toggle [value]="OWNER_TYPE.INDIVIDUAL">Individual</mat-button-toggle> <mat-button-toggle [value]="OWNER_TYPE.ORGANIZATION">Organization</mat-button-toggle> @@ -88,7 +88,7 @@ <h4 class="full-row" *ngIf="type.getRawValue() === OWNER_TYPE.ORGANIZATION">Orga </div> </div> <div> - <label for="firstName">Email</label> + <label for="email">Email</label> <mat-form-field appearance="outline"> <input id="email" type="email" matInput placeholder="Enter Email" formControlName="email" /> </mat-form-field> diff --git a/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.html b/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.html index 0041cf444a..aee1ab6652 100644 --- a/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.html +++ b/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.html @@ -5,11 +5,6 @@ <td mat-cell [hidden]="isCrown" *matCellDef="let element">{{ element.type.label }}</td> </ng-container> - <ng-container matColumnDef="position"> - <th mat-header-cell *matHeaderCellDef></th> - <td mat-cell *matCellDef="let element">{{ element.position }}</td> - </ng-container> - <ng-container matColumnDef="displayName"> <th mat-header-cell *matHeaderCellDef>Full Name</th> <td mat-cell *matCellDef="let element">{{ element.displayName }}</td> diff --git a/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.scss b/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.scss index bea80e08ec..82fd102c0d 100644 --- a/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.scss +++ b/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.scss @@ -9,6 +9,6 @@ .no-data-text { text-align: center; - color: colors.$grey; + color: colors.$grey-dark; padding-top: rem(12); } diff --git a/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.ts b/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.ts index 2d99ada35f..e0e3dd05fd 100644 --- a/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.ts +++ b/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.ts @@ -55,7 +55,7 @@ export class ParcelOwnersComponent { @Input() isShowAllOwners = false; _disabled = false; - displayedColumns = ['type', 'position', 'displayName', 'organizationName', 'phone', 'email', 'actions']; + displayedColumns = ['type', 'displayName', 'organizationName', 'phone', 'email', 'actions']; constructor(private dialog: MatDialog, private confDialogService: ConfirmationDialogService) {} diff --git a/portal-frontend/src/app/shared/soil-table/soil-table.component.html b/portal-frontend/src/app/shared/soil-table/soil-table.component.html index 557dad512c..56ba63f4b4 100644 --- a/portal-frontend/src/app/shared/soil-table/soil-table.component.html +++ b/portal-frontend/src/app/shared/soil-table/soil-table.component.html @@ -20,13 +20,13 @@ </div> <div class="label"> - <label for="volume">Volume</label> + <label for="{{ 'volume' + idSuffix }}">Volume</label> </div> <div> <mat-form-field appearance="outline"> <input min="0.01" - id="volume" + id="{{ 'volume' + idSuffix }}" mask="separator.2" thousandSeparator="," separatorLimit="9999999999" @@ -46,6 +46,7 @@ <input min="0.01" id="volume2" + attr.aria-label="{{ 'volume' + idSuffix2 }}" mask="separator.2" thousandSeparator="," separatorLimit="9999999999" @@ -62,13 +63,13 @@ </div> <div class="label"> - <label for="area">Area</label> + <label for="{{ 'area' + idSuffix }}">Area</label> </div> <div> <mat-form-field appearance="outline"> <input min="0.01" - id="area" + id="{{ 'area' + idSuffix }}" mask="separator.5" thousandSeparator="," separatorLimit="9999999999" @@ -88,6 +89,7 @@ <input min="0.01" id="area2" + attr.aria-label="{{ 'area' + idSuffix2 }}" mask="separator.5" thousandSeparator="," separatorLimit="9999999999" @@ -104,13 +106,13 @@ </div> <div class="label"> - <label for="volume">Maximum Depth</label> + <label for="{{ 'maximumDepth' + idSuffix }}">Maximum Depth</label> </div> <div> <mat-form-field appearance="outline"> <input min="0.01" - id="maximumDepth" + id="{{ 'maximumDepth' + idSuffix }}" mask="separator.2" thousandSeparator="," separatorLimit="9999999999" @@ -130,6 +132,7 @@ <input min="0.01" id="maximumDepth2" + attr.aria-label="{{ 'maximumDepth' + idSuffix2 }}" mask="separator.2" thousandSeparator="," separatorLimit="9999999999" @@ -146,13 +149,13 @@ </div> <div class="label"> - <label for="volume">Average Depth</label> + <label for="{{ 'averageDepth' + idSuffix }}">Average Depth</label> </div> <div> <mat-form-field appearance="outline"> <input min="0.01" - id="averageDepth" + id="{{ 'averageDepth' + idSuffix }}" mask="separator.2" thousandSeparator="," separatorLimit="9999999999" @@ -172,6 +175,7 @@ <input min="0.01" id="averageDepth2" + attr.aria-label="{{ 'averageDepth' + idSuffix2 }}" mask="separator.2" thousandSeparator="," separatorLimit="9999999999" diff --git a/portal-frontend/src/app/shared/soil-table/soil-table.component.ts b/portal-frontend/src/app/shared/soil-table/soil-table.component.ts index dcaf6f7563..91365a6251 100644 --- a/portal-frontend/src/app/shared/soil-table/soil-table.component.ts +++ b/portal-frontend/src/app/shared/soil-table/soil-table.component.ts @@ -23,6 +23,9 @@ export class SoilTableComponent implements OnInit, OnChanges { @Output() dataChange = new EventEmitter<SoilTableData>(); @Output() data2Change = new EventEmitter<SoilTableData>(); + idSuffix?: string; + idSuffix2?: string | undefined; + volume = new FormControl<string | null>(null, [Validators.required]); area = new FormControl<string | null>(null, [Validators.required]); maximumDepth = new FormControl<string | null>(null, [Validators.required]); @@ -74,6 +77,9 @@ export class SoilTableComponent implements OnInit, OnChanges { averageDepth: this.averageDepth2.value !== null ? parseFloat(this.averageDepth2.value) : undefined, }); }); + + this.idSuffix = '-' + this.tableHeader.replace(/\s/g, '-').toLowerCase(); + this.idSuffix2 = '-' + this.tableHeader2?.replace(/\s/g, '-').toLowerCase(); } ngOnChanges(changes: SimpleChanges): void { @@ -89,6 +95,6 @@ export class SoilTableComponent implements OnInit, OnChanges { onInputFocus(event: Event) { const inputElement = event.target as HTMLInputElement; - inputElement.select() + inputElement.select(); } } diff --git a/portal-frontend/src/styles/colors.scss b/portal-frontend/src/styles/colors.scss index c3690ec1a0..993b330b00 100644 --- a/portal-frontend/src/styles/colors.scss +++ b/portal-frontend/src/styles/colors.scss @@ -20,6 +20,6 @@ $grey-dark: #565656; $grey-light: #efefef; $link-color: #1a5a96; -$error-color: #d8292f; +$error-color: #c6242a; $success-color: #2e8540; $warning-color: #fcba19; diff --git a/portal-frontend/src/styles/form-controls.scss b/portal-frontend/src/styles/form-controls.scss index 9d82bb82db..87688c3f41 100644 --- a/portal-frontend/src/styles/form-controls.scss +++ b/portal-frontend/src/styles/form-controls.scss @@ -93,26 +93,11 @@ mat-form-field.mat-form-field-disabled { } form { - label { + label, + mat-label { font-weight: 700; font-size: rem(13) !important; - &:has(+ .mat-form-field-disabled) { - color: colors.$grey; - } - - &:has(+ div ~ mat-form-field.mat-form-field-disabled) { - color: colors.$grey; - } - - &:has(+ mat-button-toggle-group mat-button-toggle.mat-button-toggle-disabled) { - color: colors.$grey; - } - - &:has(+ div ~ mat-button-toggle-group mat-button-toggle.mat-button-toggle-disabled) { - color: colors.$grey; - } - @media screen and (min-width: $tabletBreakpoint) { & { font-size: rem(16) !important; From e839980f3af9a57f30847aa91485f9750014426d Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Thu, 9 Nov 2023 10:30:01 -0800 Subject: [PATCH 622/954] Covenant Bug Fixes * Allow ALCS users to delete files from portal * Hide vertical scrollbar --- .../cove-details/cove-details.component.scss | 1 + .../cove-details/cove-details.component.scss | 1 + .../submission/cove-details/cove-details.component.scss | 1 + .../application-submission.service.spec.ts | 2 ++ .../application-submission.service.ts | 7 +++++++ .../notice-of-intent-submission.service.spec.ts | 2 ++ .../notice-of-intent-submission.service.ts | 7 +++++++ 7 files changed, 21 insertions(+) diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/cove-details/cove-details.component.scss b/alcs-frontend/src/app/features/application/applicant-info/application-details/cove-details/cove-details.component.scss index 6ae03fd94e..ee94070123 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/application-details/cove-details/cove-details.component.scss +++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/cove-details/cove-details.component.scss @@ -6,4 +6,5 @@ grid-column-gap: 36px; grid-row-gap: 12px; margin-bottom: 12px; + overflow-y: hidden; } diff --git a/portal-frontend/src/app/features/applications/application-details/cove-details/cove-details.component.scss b/portal-frontend/src/app/features/applications/application-details/cove-details/cove-details.component.scss index a2993dd182..8873c2183e 100644 --- a/portal-frontend/src/app/features/applications/application-details/cove-details/cove-details.component.scss +++ b/portal-frontend/src/app/features/applications/application-details/cove-details/cove-details.component.scss @@ -8,4 +8,5 @@ grid-column-gap: rem(36); grid-row-gap: rem(12); margin-bottom: rem(12); + overflow-y: hidden; } diff --git a/portal-frontend/src/app/features/public/application/submission/cove-details/cove-details.component.scss b/portal-frontend/src/app/features/public/application/submission/cove-details/cove-details.component.scss index d1f221301c..3c6d77658f 100644 --- a/portal-frontend/src/app/features/public/application/submission/cove-details/cove-details.component.scss +++ b/portal-frontend/src/app/features/public/application/submission/cove-details/cove-details.component.scss @@ -9,4 +9,5 @@ grid-column-gap: rem(36); grid-row-gap: rem(12); margin-bottom: rem(12); + overflow-y: hidden; } diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.service.spec.ts b/services/apps/alcs/src/portal/application-submission/application-submission.service.spec.ts index 8eb2f02e21..8dbeb1a57c 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.service.spec.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.service.spec.ts @@ -706,6 +706,7 @@ describe('ApplicationSubmissionService', () => { new ApplicationDocument({}), new User({ uuid: 'user_uuid', + clientRoles: [], }), ); @@ -721,6 +722,7 @@ describe('ApplicationSubmissionService', () => { new ApplicationDocument({}), new User({ uuid: 'NOT_user_uuid', + clientRoles: [], }), ); diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.service.ts b/services/apps/alcs/src/portal/application-submission/application-submission.service.ts index 92d536f50d..158054d176 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.service.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.service.ts @@ -1078,6 +1078,13 @@ export class ApplicationSubmissionService { } async canDeleteDocument(document: ApplicationDocument, user: User) { + const overlappingRoles = ROLES_ALLOWED_APPLICATIONS.filter((value) => + user.clientRoles!.includes(value), + ); + if (overlappingRoles.length > 0) { + return true; + } + const documentFlags = await this.getDocumentFlags(document); const isOwner = user.uuid === documentFlags.ownerUuid; diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts index 4408c939be..ab2c5b609c 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts @@ -499,6 +499,7 @@ describe('NoticeOfIntentSubmissionService', () => { new NoticeOfIntentDocument({}), new User({ uuid: 'user_uuid', + clientRoles: [], }), ); @@ -514,6 +515,7 @@ describe('NoticeOfIntentSubmissionService', () => { new NoticeOfIntentDocument({}), new User({ uuid: 'NOT_user_uuid', + clientRoles: [], }), ); diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts index 18df0e3920..3db3992421 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts @@ -611,6 +611,13 @@ export class NoticeOfIntentSubmissionService { } async canDeleteDocument(document: NoticeOfIntentDocument, user: User) { + const overlappingRoles = ROLES_ALLOWED_APPLICATIONS.filter((value) => + user.clientRoles!.includes(value), + ); + if (overlappingRoles.length > 0) { + return true; + } + const documentFlags = await this.getDocumentFlags(document); const isOwner = user.uuid === documentFlags.ownerUuid; From 5d46ecf88938fbbb9809b004b8eaef269b405fb6 Mon Sep 17 00:00:00 2001 From: Liam Stoddard <lstodd@protonmail.com> Date: Thu, 9 Nov 2023 10:59:27 -0800 Subject: [PATCH 623/954] noi fill project population --- .../notice_of_intent_soil_fields.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_soil_fields.py b/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_soil_fields.py index e6d97a7d02..3050676071 100644 --- a/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_soil_fields.py +++ b/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_soil_fields.py @@ -60,7 +60,9 @@ def process_alcs_notice_of_intent_soil_fields(conn=None, batch_size=BATCH_UPLOAD successful_updates_count = ( successful_updates_count + records_to_be_updated_count ) - last_soil_change_element_id = dict(rows[-1])["soil_change_element_id"] + last_soil_change_element_id = dict(rows[-1])[ + "soil_change_element_id" + ] logger.debug( f"Retrieved/updated items count: {records_to_be_updated_count}; total successfully updated notice of intents so far {successful_updates_count}; last updated alr_application_id: {last_soil_change_element_id}" @@ -106,8 +108,8 @@ def _update_fee_fields_records(conn, batch_size, cursor, rows): , soil_to_place_maximum_depth = %(depth)s , soil_to_place_average_depth = %(depth)s , soil_fill_type_to_place = %(type)s - , soil_project_duration_amount = %(project_duration)s - , soil_project_duration_unit = CASE WHEN %(project_duration)s is NOT NULL THEN 'months' ELSE NULL END + , fill_project_duration_amount = %(project_duration)s + , fill_project_duration_unit = CASE WHEN %(project_duration)s is NOT NULL THEN 'months' ELSE NULL END , soil_already_placed_volume = 0 , soil_already_placed_area = 0 , soil_already_placed_maximum_depth = 0 From e20e432cd6cca3e0445a569591a4c137c2bef13e Mon Sep 17 00:00:00 2001 From: Mekhti <mekhti.huseinov.ssi@gmail.com> Date: Thu, 9 Nov 2023 15:47:17 -0800 Subject: [PATCH 624/954] link owners to parcels --- .../noi/notice_of_intent_migration.py | 5 + .../parcels/owners/__init__.py | 5 + .../parcels/owners/notice_of_intent_owners.py | 6 +- .../owners/notice_of_intent_parcel_owners.py | 131 ++++++++++++++++++ .../notice_of_intent_parcel_owner_linking.sql | 12 ++ ...e_of_intent_parcel_owner_linking_count.sql | 8 ++ 6 files changed, 164 insertions(+), 3 deletions(-) create mode 100644 bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/owners/notice_of_intent_parcel_owners.py create mode 100644 bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/owners/notice_of_intent_parcel_owner_linking.sql create mode 100644 bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/owners/notice_of_intent_parcel_owner_linking_count.sql diff --git a/bin/migrate-oats-data/noi/notice_of_intent_migration.py b/bin/migrate-oats-data/noi/notice_of_intent_migration.py index e600ae7bbb..1bc654afe0 100644 --- a/bin/migrate-oats-data/noi/notice_of_intent_migration.py +++ b/bin/migrate-oats-data/noi/notice_of_intent_migration.py @@ -34,6 +34,8 @@ from .notice_of_intent_submissions.parcels.owners import ( init_notice_of_intent_parcel_owners, clean_owners, + link_notice_of_intent_owners_to_parcels, + clean_parcel_owners, ) @@ -42,6 +44,7 @@ def init_notice_of_intent(batch_size): def clean_notice_of_intent(): + clean_parcel_owners() clean_owners() clean_parcels() clean_notice_of_intent_submission_statuses() @@ -85,5 +88,7 @@ def process_notice_of_intent(batch_size): init_notice_of_intent_parcel_owners(batch_size) + link_notice_of_intent_owners_to_parcels(batch_size) + # this script must be the last one process_notice_of_intent_submission_status_emails() diff --git a/bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/owners/__init__.py b/bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/owners/__init__.py index 2750095bf1..edeb3c57de 100644 --- a/bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/owners/__init__.py +++ b/bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/owners/__init__.py @@ -2,3 +2,8 @@ init_notice_of_intent_parcel_owners, clean_owners, ) + +from .notice_of_intent_parcel_owners import ( + link_notice_of_intent_owners_to_parcels, + clean_parcel_owners, +) diff --git a/bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/owners/notice_of_intent_owners.py b/bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/owners/notice_of_intent_owners.py index f97f48ff8a..69383930e5 100644 --- a/bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/owners/notice_of_intent_owners.py +++ b/bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/owners/notice_of_intent_owners.py @@ -60,7 +60,7 @@ def init_notice_of_intent_parcel_owners(conn=None, batch_size=BATCH_UPLOAD_SIZE) last_person_organization_id = last_record["person_organization_id"] logger.debug( - f"retrieved/updated items count: {records_to_be_inserted_count}; total successfully updated notice of intents so far {successful_updates_count}; last updated {last_subject_property} {last_person_organization_id}" + f"retrieved/updated items count: {records_to_be_inserted_count}; total successfully insert notice of intents owners so far {successful_updates_count}; last updated {last_subject_property} {last_person_organization_id}" ) except Exception as err: logger.exception(err) @@ -69,7 +69,7 @@ def init_notice_of_intent_parcel_owners(conn=None, batch_size=BATCH_UPLOAD_SIZE) last_person_organization_id = last_person_organization_id + 1 logger.info( - f"Finished {etl_name}: total amount of successful updates {successful_updates_count}, total failed updates {failed_inserts}" + f"Finished {etl_name}: total amount of successful inserts {successful_updates_count}, total failed inserts {failed_inserts}" ) @@ -146,7 +146,7 @@ def clean_owners(conn=None): logger.info("Start notice of intent owner cleaning") with conn.cursor() as cursor: cursor.execute( - "DELETE FROM alcs.notice_of_intent_owner noio WHERE noio.audit_created_by = 'oats_etl'" + f"DELETE FROM alcs.notice_of_intent_owner noio WHERE noio.audit_created_by = '{OATS_ETL_USER}'" ) logger.info(f"Deleted items count = {cursor.rowcount}") conn.commit() diff --git a/bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/owners/notice_of_intent_parcel_owners.py b/bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/owners/notice_of_intent_parcel_owners.py new file mode 100644 index 0000000000..ce7136c2cb --- /dev/null +++ b/bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/owners/notice_of_intent_parcel_owners.py @@ -0,0 +1,131 @@ +from common import ( + setup_and_get_logger, + BATCH_UPLOAD_SIZE, + OATS_ETL_USER, +) +from db import inject_conn_pool +from psycopg2.extras import RealDictCursor + +etl_name = "link_notice_of_intent_owners_to_parcels" +logger = setup_and_get_logger(etl_name) + + +@inject_conn_pool +def link_notice_of_intent_owners_to_parcels(conn=None, batch_size=BATCH_UPLOAD_SIZE): + logger.info(f"Start {etl_name}") + with conn.cursor(cursor_factory=RealDictCursor) as cursor: + with open( + "noi/sql/notice_of_intent_submission/parcels/owners/notice_of_intent_parcel_owner_linking_count.sql", + "r", + encoding="utf-8", + ) as sql_file: + count_query = sql_file.read() + cursor.execute(count_query) + count_total = dict(cursor.fetchone())["count"] + logger.info(f"Total Notice of Intents data to insert: {count_total}") + + failed_inserts = 0 + successful_inserts_count = 0 + last_parcel_uuid = "00000000-0000-0000-0000-000000000000" + last_owner_uuid = "00000000-0000-0000-0000-000000000000" + + with open( + "noi/sql/notice_of_intent_submission/parcels/owners/notice_of_intent_parcel_owner_linking.sql", + "r", + encoding="utf-8", + ) as sql_file: + application_sql = sql_file.read() + while True: + cursor.execute( + f"{application_sql} AND noip.\"uuid\" > '{last_parcel_uuid}' AND noio.\"uuid\" > '{last_owner_uuid}' ORDER BY parcel_uuid, owner_uuid;" + ) + + rows = cursor.fetchmany(batch_size) + + if not rows: + break + try: + records_to_be_inserted_count = len(rows) + + _insert_records(conn, cursor, rows) + + successful_inserts_count = ( + successful_inserts_count + records_to_be_inserted_count + ) + + last_record = dict(rows[-1]) + last_parcel_uuid = last_record["parcel_uuid"] + last_owner_uuid = last_record["owner_uuid"] + + logger.debug( + f"retrieved/updated items count: {records_to_be_inserted_count}; total successfully inserted notice of intents parcel_owners so far {successful_inserts_count}; last inserted {last_parcel_uuid} {last_owner_uuid}" + ) + except Exception as err: + logger.exception(err) + conn.rollback() + failed_inserts = count_total - successful_inserts_count + last_owner_uuid = last_owner_uuid + 1 + + logger.info( + f"Finished {etl_name}: total amount of successful inserts {successful_inserts_count}, total failed inserts {failed_inserts}" + ) + + +def _insert_records(conn, cursor, rows): + number_of_rows_to_insert = len(rows) + + if number_of_rows_to_insert > 0: + insert_query = _compile_parcel_owner_insert_query(number_of_rows_to_insert) + rows_to_insert = _prepare_data_to_insert(rows) + cursor.execute(insert_query, rows_to_insert) + conn.commit() + + +def _compile_parcel_owner_insert_query(number_of_rows_to_insert): + owners_to_insert = ",".join(["%s"] * number_of_rows_to_insert) + return f""" + INSERT INTO alcs.notice_of_intent_parcel_owners_notice_of_intent_owner(notice_of_intent_parcel_uuid, notice_of_intent_owner_uuid) + VALUES{owners_to_insert} + ON CONFLICT DO NOTHING; + """ + + +def _prepare_data_to_insert(rows): + row_without_last_element = [] + for row in rows: + mapped_row = _map_data(row) + row_without_last_element.append(tuple(mapped_row.values())) + + return row_without_last_element + + +def _map_data(row): + return { + "notice_of_intent_parcel_uuid": row["parcel_uuid"], + "notice_of_intent_owner_uuid": row["owner_uuid"], + } + + +@inject_conn_pool +def clean_parcel_owners(conn=None): + logger.info("Start notice of intent parcel to owner cleaning") + with conn.cursor() as cursor: + cursor.execute( + f""" + DELETE FROM alcs.notice_of_intent_parcel_owners_notice_of_intent_owner AS noipo + USING alcs.notice_of_intent_parcel noip + WHERE noip."uuid" = noipo.notice_of_intent_parcel_uuid AND noip.audit_created_by = '{OATS_ETL_USER}';""" + ) + conn.commit() + deleted_items_total = cursor.rowcount + cursor.execute( + f""" + DELETE FROM alcs.notice_of_intent_parcel_owners_notice_of_intent_owner AS noipo + USING alcs.notice_of_intent_owner noio + WHERE noio."uuid" = noipo.notice_of_intent_parcel_uuid AND noio.audit_created_by = '{OATS_ETL_USER}';""" + ) + conn.commit() + deleted_items_total += cursor.rowcount + logger.info(f"Deleted items count = {deleted_items_total}") + + logger.info("Done notice of intent owner cleaning") diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/owners/notice_of_intent_parcel_owner_linking.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/owners/notice_of_intent_parcel_owner_linking.sql new file mode 100644 index 0000000000..6bf2a22067 --- /dev/null +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/owners/notice_of_intent_parcel_owner_linking.sql @@ -0,0 +1,12 @@ +SELECT nois.file_number, + noip."uuid" AS parcel_uuid, + noip.oats_subject_property_id, + noio."uuid" AS owner_uuid, + noio.oats_person_organization_id +FROM oats.OATS_PROPERTY_INTERESTS opi + JOIN oats.OATS_SUBJECT_PROPERTIES osp ON osp.SUBJECT_PROPERTY_ID = opi.SUBJECT_PROPERTY_ID + JOIN alcs.notice_of_intent_parcel noip ON noip.oats_subject_property_id = osp.subject_property_id + JOIN alcs.notice_of_intent_owner noio ON noio.oats_person_organization_id = opi.PERSON_ORGANIZATION_ID + LEFT JOIN alcs.notice_of_intent_submission nois ON nois."uuid" = noip.notice_of_intent_submission_uuid +WHERE noip.audit_created_by = 'oats_etl' + AND noio.audit_created_by = 'oats_etl' \ No newline at end of file diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/owners/notice_of_intent_parcel_owner_linking_count.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/owners/notice_of_intent_parcel_owner_linking_count.sql new file mode 100644 index 0000000000..1e78d52777 --- /dev/null +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/owners/notice_of_intent_parcel_owner_linking_count.sql @@ -0,0 +1,8 @@ +SELECT count(*) +FROM oats.OATS_PROPERTY_INTERESTS opi + JOIN oats.OATS_SUBJECT_PROPERTIES osp ON osp.SUBJECT_PROPERTY_ID = opi.SUBJECT_PROPERTY_ID + JOIN alcs.notice_of_intent_parcel noip ON noip.oats_subject_property_id = osp.subject_property_id + JOIN alcs.notice_of_intent_owner noio ON noio.oats_person_organization_id = opi.PERSON_ORGANIZATION_ID + LEFT JOIN alcs.notice_of_intent_submission nois ON nois."uuid" = noip.notice_of_intent_submission_uuid +WHERE noip.audit_created_by = 'oats_etl' + AND noio.audit_created_by = 'oats_etl' \ No newline at end of file From 9a86d2f92843c15a6e73dea772e39f52201a2346 Mon Sep 17 00:00:00 2001 From: Mekhti <mekhti.huseinov.ssi@gmail.com> Date: Thu, 9 Nov 2023 15:48:45 -0800 Subject: [PATCH 625/954] remove redundant comment --- .../parcels/owners/notice_of_intent_owners.py | 7 ------- 1 file changed, 7 deletions(-) diff --git a/bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/owners/notice_of_intent_owners.py b/bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/owners/notice_of_intent_owners.py index 69383930e5..550d9e8236 100644 --- a/bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/owners/notice_of_intent_owners.py +++ b/bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/owners/notice_of_intent_owners.py @@ -151,10 +151,3 @@ def clean_owners(conn=None): logger.info(f"Deleted items count = {cursor.rowcount}") conn.commit() logger.info("Done notice of intent owner cleaning") - - -# _parcel_owner_insert_query = f"""" -# INSERT INTO alcs.notice_of_intent_parcel_owners_notice_of_intent_owner(notice_of_intent_parcel_uuid, notice_of_intent_owner_uuid) -# VALUES{values} -# ON CONFLICT DO NOTHING -# """ From 9c2eb265eeb6c4c81e098d39af6a247fc3e63e91 Mon Sep 17 00:00:00 2001 From: Mekhti <mekhti.huseinov.ssi@gmail.com> Date: Fri, 10 Nov 2023 09:17:50 -0800 Subject: [PATCH 626/954] query to return reused person_org_ids --- ...er_return_reused_person_org_id_in_oats.sql | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/owners/notice_of_intent_owner_return_reused_person_org_id_in_oats.sql diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/owners/notice_of_intent_owner_return_reused_person_org_id_in_oats.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/owners/notice_of_intent_owner_return_reused_person_org_id_in_oats.sql new file mode 100644 index 0000000000..558de2c7e8 --- /dev/null +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/owners/notice_of_intent_owner_return_reused_person_org_id_in_oats.sql @@ -0,0 +1,42 @@ +-- finds and returns person_organization_ids reused in alr_applications of class NOI +WITH oats_joined_with_alcs_owners_with_parcels AS ( + SELECT noip.oats_subject_property_id, + opo.person_organization_id + FROM oats.OATS_SUBJECT_PROPERTIES osp + LEFT JOIN oats.OATS_PROPERTY_INTERESTS opi ON osp.SUBJECT_PROPERTY_ID = opi.SUBJECT_PROPERTY_ID + JOIN alcs.notice_of_intent_parcel noip ON noip.oats_subject_property_id = osp.subject_property_id + LEFT JOIN oats.OATS_PERSON_ORGANIZATIONS opo ON opo.PERSON_ORGANIZATION_ID = opi.PERSON_ORGANIZATION_ID + WHERE opi.person_organization_id IS NOT NULL + AND opo.person_organization_id IS NOT NULL + GROUP BY noip.oats_subject_property_id, + opo.person_organization_id + ORDER BY oats_subject_property_id, + person_organization_id +), +person_organization_ids_with_count AS ( + SELECT count(*), + oatsp.person_organization_id + FROM oats_joined_with_alcs_owners_with_parcels oatsp + LEFT JOIN alcs.notice_of_intent_owner noio ON noio.oats_person_organization_id = oatsp.person_organization_id + GROUP BY oatsp.person_organization_id + HAVING count(*) > 1 + ORDER BY count(*) DESC +), +oats_owners_with_parcels AS ( + SELECT opo.person_organization_id + FROM oats.OATS_SUBJECT_PROPERTIES osp + LEFT JOIN oats.OATS_PROPERTY_INTERESTS opi ON osp.SUBJECT_PROPERTY_ID = opi.SUBJECT_PROPERTY_ID + LEFT JOIN oats.OATS_PERSON_ORGANIZATIONS opo ON opo.PERSON_ORGANIZATION_ID = opi.PERSON_ORGANIZATION_ID + WHERE opi.person_organization_id IS NOT NULL + AND opo.person_organization_id IS NOT NULL + GROUP BY opo.person_organization_id + ORDER BY person_organization_id +) +SELECT count(*), + oatsp.person_organization_id +FROM oats_owners_with_parcels oatsp + LEFT JOIN alcs.notice_of_intent_owner noio ON noio.oats_person_organization_id = oatsp.person_organization_id + JOIN person_organization_ids_with_count poidc ON poidc.person_organization_id = oatsp.person_organization_id +GROUP BY oatsp.person_organization_id +HAVING power(count(*), 2) != max(poidc."count") -- this will provide all person_organization_ids reused for multiple alr_application_ids of class NOI. max will not affect anything since it is only 1 record per person_organization_id +ORDER BY count(*) DESC; \ No newline at end of file From c1673541f910970e82a7d62754c58e98cd4dfbe8 Mon Sep 17 00:00:00 2001 From: Liam Stoddard <lstodd@protonmail.com> Date: Fri, 10 Nov 2023 13:00:51 -0800 Subject: [PATCH 627/954] fixing insert to only do fill for PFRS --- .../submissions/data_insert/data_prep.py | 7 +- .../submissions/data_insert/insert_query.py | 55 ++++++++++- .../data_insert/submap/soil_elements.py | 8 +- .../noi/notice_of_intent_migration.py | 8 +- .../notice_of_intent_submissions/__init__.py | 3 + .../notice_of_intent_fill_fields_update.py | 93 +++++++++++++++++++ .../notice_of_intent_soil_fields_update.sql | 9 ++ ...ice_of_intent_soil_fields_update_count.sql | 8 ++ 8 files changed, 180 insertions(+), 11 deletions(-) create mode 100644 bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_fill_fields_update.py create mode 100644 bin/migrate-oats-data/noi/sql/notice_of_intent_submission/soil_fields/notice_of_intent_soil_fields_update.sql create mode 100644 bin/migrate-oats-data/noi/sql/notice_of_intent_submission/soil_fields/notice_of_intent_soil_fields_update_count.sql diff --git a/bin/migrate-oats-data/applications/submissions/data_insert/data_prep.py b/bin/migrate-oats-data/applications/submissions/data_insert/data_prep.py index d0d0fb5bf0..34bda09b44 100644 --- a/bin/migrate-oats-data/applications/submissions/data_insert/data_prep.py +++ b/bin/migrate-oats-data/applications/submissions/data_insert/data_prep.py @@ -45,6 +45,7 @@ def prepare_app_sub_data(app_sub_raw_data_list, direction_data, subdiv_data, soi tur_data_list = [] subd_data_list = [] soil_data_list = [] + pfrs_data_list = [] other_data_list = [] for row in app_sub_raw_data_list: @@ -75,11 +76,12 @@ def prepare_app_sub_data(app_sub_raw_data_list, direction_data, subdiv_data, soi elif data["alr_change_code"] == ALRChangeCode.SDV.value: subd_data_list.append(data) elif ( - data["alr_change_code"] == ALRChangeCode.SCH.value - or data["alr_change_code"] == ALRChangeCode.EXT.value + data["alr_change_code"] == ALRChangeCode.EXT.value or data["alr_change_code"] == ALRChangeCode.FILL.value ): soil_data_list.append(data) + elif data["alr_change_code"] == ALRChangeCode.SCH.value: + pfrs_data_list.append(data) else: other_data_list.append(data) @@ -91,6 +93,7 @@ def prepare_app_sub_data(app_sub_raw_data_list, direction_data, subdiv_data, soi tur_data_list, subd_data_list, soil_data_list, + pfrs_data_list, ) diff --git a/bin/migrate-oats-data/applications/submissions/data_insert/insert_query.py b/bin/migrate-oats-data/applications/submissions/data_insert/insert_query.py index c1cc12d680..6793b1c9f2 100644 --- a/bin/migrate-oats-data/applications/submissions/data_insert/insert_query.py +++ b/bin/migrate-oats-data/applications/submissions/data_insert/insert_query.py @@ -28,6 +28,7 @@ def insert_app_sub_records( tur_data_list, subd_data_list, soil_data_list, + pfrs_data_list, ) = prepare_app_sub_data(rows, direction_data, subdiv_data, soil_data) if len(nfu_data_list) > 0: @@ -78,6 +79,14 @@ def insert_app_sub_records( page_size=batch_size, ) + if len(pfrs_data_list) > 0: + execute_batch( + cursor, + get_insert_query_for_pfrs(), + pfrs_data_list, + page_size=batch_size, + ) + if len(other_data_list) > 0: execute_batch( cursor, @@ -159,7 +168,7 @@ def get_insert_query_for_nfu(): %(fill_duration)s, %(fill_type)s, %(fill_origin)s, - %(fill_duration_unit)s, + %(duration_unit)s, %(fill_area)s, %(support_desc)s """ @@ -194,7 +203,7 @@ def get_insert_query_for_naru(): %(fill_duration)s, %(fill_type)s, %(fill_origin)s, - %(fill_duration_unit)s, + %(duration_unit)s, %(fill_area)s, %(rsdntl_use_type_code)s, %(infra_desc)s, @@ -245,6 +254,44 @@ def get_insert_query_for_tur(): def get_insert_query_for_soil(): + unique_fields = """, soil_type_removed, + soil_reduce_negative_impacts, + soil_to_remove_volume, + soil_to_remove_area, + soil_to_remove_maximum_depth, + soil_to_remove_average_depth, + soil_project_duration_amount, + soil_project_duration_unit, + soil_fill_type_to_place, + soil_alternative_measures, + soil_to_place_volume, + soil_to_place_area, + soil_to_place_maximum_depth, + soil_to_place_average_depth, + soil_is_follow_up, + soil_follow_up_ids + """ + unique_values = """, %(remove_type)s, + %(impact_reduction_desc)s, + %(total_remove)s, + %(remove_area)s, + %(max_remove_depth)s, + %(max_remove_depth)s, + %(duration)s, + %(duration_unit)s, + %(fill_type)s, + %(alternative_measures_desc)s, + %(total_fill)s, + %(fill_area)s, + %(max_fill_depth)s, + %(max_fill_depth)s, + %(followup_noi_ind)s, + %(followup_noi_number)s + """ + return get_insert_query(unique_fields, unique_values) + + +def get_insert_query_for_pfrs(): unique_fields = """, soil_type_removed, soil_reduce_negative_impacts, soil_to_remove_volume, @@ -272,8 +319,8 @@ def get_insert_query_for_soil(): %(max_remove_depth)s, %(remove_duration)s, %(fill_duration)s, - %(remove_duration_unit)s, - %(fill_duration_unit)s, + %(duration_unit)s, + %(duration_unit)s, %(fill_type)s, %(alternative_measures_desc)s, %(total_fill)s, diff --git a/bin/migrate-oats-data/applications/submissions/data_insert/submap/soil_elements.py b/bin/migrate-oats-data/applications/submissions/data_insert/submap/soil_elements.py index a18622fb9f..7dacf968b4 100644 --- a/bin/migrate-oats-data/applications/submissions/data_insert/submap/soil_elements.py +++ b/bin/migrate-oats-data/applications/submissions/data_insert/submap/soil_elements.py @@ -85,8 +85,7 @@ def map_soil_data(data, soil_data): data["import_fill"] = soil_data.get(data[app_component_id], {}).get( "import_fill", None ) - data["fill_duration_unit"] = "months" - data["remove_duration_unit"] = "months" + data["duration_unit"] = "months" data["remove_type"] = soil_data.get(data[app_component_id], {}).get( "remove_type", None ) @@ -128,8 +127,7 @@ def add_soil_field(data): data["remove_duration"] = None data["duration"] = None data["remove_area"] = None - data["fill_duration_unit"] = None - data["remove_duration_unit"] = None + data["duration_unit"] = None data["alternative_measures_desc"] = None return data @@ -140,6 +138,7 @@ def dict_fill_insert(soil_dict, app_component_id, row): soil_dict[app_component_id]["total_fill"] = row[SoilProperties.VOLUME] soil_dict[app_component_id]["max_fill_depth"] = row[SoilProperties.DEPTH] soil_dict[app_component_id]["fill_duration"] = row[SoilProperties.DURATION] + soil_dict[app_component_id]["duration"] = row[SoilProperties.DURATION] soil_dict[app_component_id]["fill_area"] = row[SoilProperties.AREA] soil_dict[app_component_id]["import_fill"] = True soil_dict[app_component_id]["alternative_measures_desc"] = row[ @@ -155,6 +154,7 @@ def dict_rmv_insert(soil_dict, app_component_id, row): soil_dict[app_component_id]["max_remove_depth"] = row[SoilProperties.DEPTH] soil_dict[app_component_id]["total_remove"] = row[SoilProperties.VOLUME] soil_dict[app_component_id]["remove_duration"] = row[SoilProperties.DURATION] + soil_dict[app_component_id]["duration"] = row[SoilProperties.DURATION] soil_dict[app_component_id]["remove_area"] = row[SoilProperties.AREA] soil_dict[app_component_id][SoilAction.RMV.name] = True return diff --git a/bin/migrate-oats-data/noi/notice_of_intent_migration.py b/bin/migrate-oats-data/noi/notice_of_intent_migration.py index 47ced0f7e8..b0335b7545 100644 --- a/bin/migrate-oats-data/noi/notice_of_intent_migration.py +++ b/bin/migrate-oats-data/noi/notice_of_intent_migration.py @@ -17,6 +17,7 @@ process_alcs_notice_of_intent_received_by_alc_status, process_alcs_notice_of_intent_decision_released_status, process_alcs_notice_of_intent_cancelled_status, + update_alcs_notice_of_intent_soil_fill_fields, ) from .oats_to_alcs_notice_of_intent_table_etl.notice_of_intent_decision_date import ( process_alcs_notice_of_intent_decision_date, @@ -43,6 +44,11 @@ def clean_notice_of_intent(): clean_notice_of_intents() +def process_notice_of_intent_soil(batch_size): + process_alcs_notice_of_intent_soil_fields(batch_size) + update_alcs_notice_of_intent_soil_fill_fields(batch_size) + + def process_notice_of_intent(batch_size): # place the rest notice of intent processing functions here process_alcs_notice_of_intent_base_fields(batch_size) @@ -55,7 +61,7 @@ def process_notice_of_intent(batch_size): process_notice_of_intent_empty_adjacent_land_use() - process_alcs_notice_of_intent_soil_fields(batch_size) + process_notice_of_intent_soil(batch_size) process_alcs_notice_of_intent_proposal_fields(batch_size) diff --git a/bin/migrate-oats-data/noi/notice_of_intent_submissions/__init__.py b/bin/migrate-oats-data/noi/notice_of_intent_submissions/__init__.py index a9e38c15a9..d9f9c627e9 100644 --- a/bin/migrate-oats-data/noi/notice_of_intent_submissions/__init__.py +++ b/bin/migrate-oats-data/noi/notice_of_intent_submissions/__init__.py @@ -37,3 +37,6 @@ from .statuses.notice_of_intent_status_cancelled import ( process_alcs_notice_of_intent_cancelled_status, ) +from .notice_of_intent_fill_fields_update import ( + update_alcs_notice_of_intent_soil_fill_fields, +) diff --git a/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_fill_fields_update.py b/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_fill_fields_update.py new file mode 100644 index 0000000000..5b141d6ccb --- /dev/null +++ b/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_fill_fields_update.py @@ -0,0 +1,93 @@ +from common import ( + setup_and_get_logger, + BATCH_UPLOAD_SIZE, +) +from db import inject_conn_pool +from psycopg2.extras import RealDictCursor, execute_batch + +etl_name = "update_alcs_notice_of_intent_soil_fill_fields" +logger = setup_and_get_logger(etl_name) + + +@inject_conn_pool +def update_alcs_notice_of_intent_soil_fill_fields( + conn=None, batch_size=BATCH_UPLOAD_SIZE +): + logger.info(f"Start {etl_name}") + with conn.cursor(cursor_factory=RealDictCursor) as cursor: + with open( + "noi/sql/notice_of_intent_submission/soil_fields/notice_of_intent_soil_fields_update_count.sql", + "r", + encoding="utf-8", + ) as sql_file: + count_query = sql_file.read() + cursor.execute(count_query) + count_total = dict(cursor.fetchone())["count"] + logger.info(f"Total Notice of Intents data to update: {count_total}") + + failed_inserts = 0 + successful_updates_count = 0 + last_document_id = 0 + + with open( + "noi/sql/notice_of_intent_submission/soil_fields/notice_of_intent_soil_fields_update.sql", + "r", + encoding="utf-8", + ) as sql_file: + application_sql = sql_file.read() + while True: + cursor.execute( + f"{application_sql} AND nois.file_number::INTEGER > {last_document_id} ORDER BY nois.file_number::INTEGER;" + ) + + rows = cursor.fetchmany(batch_size) + + if not rows: + break + try: + records_to_be_updated_count = len(rows) + + _update_records(conn, batch_size, cursor, rows) + + successful_updates_count = ( + successful_updates_count + records_to_be_updated_count + ) + last_document_id = dict(rows[-1])["file_id"] + + logger.debug( + f"retrieved/updated items count: {records_to_be_updated_count}; total successfully updated notice of intents so far {successful_updates_count}; last updated alr_application_id: {last_document_id}" + ) + except Exception as err: + # this is NOT going to be caused by actual data update failure. This code is only executed when the code error appears or connection to DB is lost + logger.exception() + conn.rollback() + failed_inserts = count_total - successful_updates_count + last_document_id = last_document_id + 1 + + logger.info( + f"Finished {etl_name}: total amount of successful updates {successful_updates_count}, total failed updates {failed_inserts}" + ) + + +def _update_records(conn, batch_size, cursor, rows): + # parsed_data_list = _prepare_oats_data(rows) + + if len(rows) > 0: + execute_batch( + cursor, + _update_query, + rows, + page_size=batch_size, + ) + + conn.commit() + + +_update_query = """ + UPDATE alcs.notice_of_intent_submission + SET soil_project_duration_amount = %(fill_project_duration_amount)s, + soil_project_duration_unit = %(fill_project_duration_unit)s, + fill_project_duration_amount = NULL, + fill_project_duration_unit = NULL + WHERE file_number = %(file_number)s +""" diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/soil_fields/notice_of_intent_soil_fields_update.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/soil_fields/notice_of_intent_soil_fields_update.sql new file mode 100644 index 0000000000..a433a9b94f --- /dev/null +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/soil_fields/notice_of_intent_soil_fields_update.sql @@ -0,0 +1,9 @@ +SELECT + nois.fill_project_duration_unit, + nois.fill_project_duration_amount, + nois.file_number, + nois.file_number::INTEGER AS file_id +FROM + alcs.notice_of_intent_submission nois +WHERE + nois.type_code IN ('POFO', 'ROSO') AND nois.audit_created_by = 'oats_etl' AND nois.fill_project_duration_amount IS NOT NULL \ No newline at end of file diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/soil_fields/notice_of_intent_soil_fields_update_count.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/soil_fields/notice_of_intent_soil_fields_update_count.sql new file mode 100644 index 0000000000..b2db503d14 --- /dev/null +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/soil_fields/notice_of_intent_soil_fields_update_count.sql @@ -0,0 +1,8 @@ +SELECT + count(*) +FROM + alcs.notice_of_intent_submission nois +WHERE + nois.type_code IN ('POFO', 'ROSO') + AND nois.fill_project_duration_amount IS NOT NULL + AND nois.audit_created_by = 'oats_etl' \ No newline at end of file From 965ef3cbf7acb268029153d6f0392ddce8a927c7 Mon Sep 17 00:00:00 2001 From: Liam Stoddard <lstodd@protonmail.com> Date: Fri, 10 Nov 2023 13:37:34 -0800 Subject: [PATCH 628/954] MR feedback --- .../notice_of_intent_fill_fields_update.py | 2 +- .../soil_fields/notice_of_intent_soil_fields_update.sql | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_fill_fields_update.py b/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_fill_fields_update.py index 5b141d6ccb..80388803f5 100644 --- a/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_fill_fields_update.py +++ b/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_fill_fields_update.py @@ -37,7 +37,7 @@ def update_alcs_notice_of_intent_soil_fill_fields( application_sql = sql_file.read() while True: cursor.execute( - f"{application_sql} AND nois.file_number::INTEGER > {last_document_id} ORDER BY nois.file_number::INTEGER;" + f"{application_sql} AND nois.file_number::BIGINT > {last_document_id} ORDER BY nois.file_number::BIGINT;" ) rows = cursor.fetchmany(batch_size) diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/soil_fields/notice_of_intent_soil_fields_update.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/soil_fields/notice_of_intent_soil_fields_update.sql index a433a9b94f..656953c59a 100644 --- a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/soil_fields/notice_of_intent_soil_fields_update.sql +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/soil_fields/notice_of_intent_soil_fields_update.sql @@ -2,7 +2,7 @@ SELECT nois.fill_project_duration_unit, nois.fill_project_duration_amount, nois.file_number, - nois.file_number::INTEGER AS file_id + nois.file_number::BIGINT AS file_id FROM alcs.notice_of_intent_submission nois WHERE From c09f3d3a27cff09d119eb213d1feacfd4eae4a41 Mon Sep 17 00:00:00 2001 From: Liam Stoddard <lstodd@protonmail.com> Date: Fri, 10 Nov 2023 15:02:13 -0800 Subject: [PATCH 629/954] removed comment --- .../notice_of_intent_fill_fields_update.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_fill_fields_update.py b/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_fill_fields_update.py index 80388803f5..fcb7775482 100644 --- a/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_fill_fields_update.py +++ b/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_fill_fields_update.py @@ -70,8 +70,6 @@ def update_alcs_notice_of_intent_soil_fill_fields( def _update_records(conn, batch_size, cursor, rows): - # parsed_data_list = _prepare_oats_data(rows) - if len(rows) > 0: execute_batch( cursor, From 12b87515c9eb40b7af06828bb0c2581032523f33 Mon Sep 17 00:00:00 2001 From: Mekhti <mekhti.huseinov.ssi@gmail.com> Date: Fri, 10 Nov 2023 15:41:16 -0800 Subject: [PATCH 630/954] populate primary contact for noi --- .../common/oats_to_alcs_parcel_enum.py | 1 + .../noi/notice_of_intent_migration.py | 11 ++ .../parcels/primary_contacts/__init__.py | 8 + .../notice_of_intent_primary_contact.py | 139 ++++++++++++++++++ ...ce_of_intent_submission_primary_contact.py | 98 ++++++++++++ .../notice_of_intent_primary_contact.sql | 47 ++++++ ...notice_of_intent_primary_contact_count.sql | 33 +++++ ...e_of_intent_submission_primary_contact.sql | 6 + ...ntent_submission_primary_contact_count.sql | 4 + .../notice-of-intent-owner.entity.ts | 9 ++ ...ication_party_to_notice_of_intent_owner.ts | 25 ++++ 11 files changed, 381 insertions(+) create mode 100644 bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/primary_contacts/__init__.py create mode 100644 bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/primary_contacts/notice_of_intent_primary_contact.py create mode 100644 bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/primary_contacts/notice_of_intent_submission_primary_contact.py create mode 100644 bin/migrate-oats-data/noi/sql/notice_of_intent_submission/primary_contact/notice_of_intent_primary_contact.sql create mode 100644 bin/migrate-oats-data/noi/sql/notice_of_intent_submission/primary_contact/notice_of_intent_primary_contact_count.sql create mode 100644 bin/migrate-oats-data/noi/sql/notice_of_intent_submission/primary_contact/notice_of_intent_submission_primary_contact.sql create mode 100644 bin/migrate-oats-data/noi/sql/notice_of_intent_submission/primary_contact/notice_of_intent_submission_primary_contact_count.sql create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1699655237243-add_oats_alr_application_party_to_notice_of_intent_owner.ts diff --git a/bin/migrate-oats-data/common/oats_to_alcs_parcel_enum.py b/bin/migrate-oats-data/common/oats_to_alcs_parcel_enum.py index bb7d4c32ed..cdaddfe246 100644 --- a/bin/migrate-oats-data/common/oats_to_alcs_parcel_enum.py +++ b/bin/migrate-oats-data/common/oats_to_alcs_parcel_enum.py @@ -16,3 +16,4 @@ class ALCSOwnerType(Enum): INDV = "INDV" ORGZ = "ORGZ" CRWN = "CRWN" + AGEN = "AGEN" diff --git a/bin/migrate-oats-data/noi/notice_of_intent_migration.py b/bin/migrate-oats-data/noi/notice_of_intent_migration.py index 1bc654afe0..8cbbcdf674 100644 --- a/bin/migrate-oats-data/noi/notice_of_intent_migration.py +++ b/bin/migrate-oats-data/noi/notice_of_intent_migration.py @@ -38,12 +38,19 @@ clean_parcel_owners, ) +from .notice_of_intent_submissions.parcels.primary_contacts import ( + init_notice_of_intent_primary_contacts, + clean_primary_contacts, + link_notice_of_intent_owners_to_parcels, +) + def init_notice_of_intent(batch_size): init_notice_of_intents(batch_size=batch_size) def clean_notice_of_intent(): + clean_primary_contacts() clean_parcel_owners() clean_owners() clean_parcels() @@ -90,5 +97,9 @@ def process_notice_of_intent(batch_size): link_notice_of_intent_owners_to_parcels(batch_size) + init_notice_of_intent_primary_contacts(batch_size) + + link_notice_of_intent_owners_to_parcels(batch_size) + # this script must be the last one process_notice_of_intent_submission_status_emails() diff --git a/bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/primary_contacts/__init__.py b/bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/primary_contacts/__init__.py new file mode 100644 index 0000000000..8214822c28 --- /dev/null +++ b/bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/primary_contacts/__init__.py @@ -0,0 +1,8 @@ +from .notice_of_intent_primary_contact import ( + init_notice_of_intent_primary_contacts, + clean_primary_contacts, +) + +from .notice_of_intent_submission_primary_contact import ( + link_notice_of_intent_owners_to_parcels, +) diff --git a/bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/primary_contacts/notice_of_intent_primary_contact.py b/bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/primary_contacts/notice_of_intent_primary_contact.py new file mode 100644 index 0000000000..38bf7da87d --- /dev/null +++ b/bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/primary_contacts/notice_of_intent_primary_contact.py @@ -0,0 +1,139 @@ +from common import ( + setup_and_get_logger, + BATCH_UPLOAD_SIZE, + OATS_ETL_USER, + ALCSOwnerType, +) +from db import inject_conn_pool +from psycopg2.extras import RealDictCursor + +etl_name = "init_notice_of_intent_primary_contacts" +logger = setup_and_get_logger(etl_name) + + +@inject_conn_pool +def init_notice_of_intent_primary_contacts(conn=None, batch_size=BATCH_UPLOAD_SIZE): + logger.info(f"Start {etl_name}") + with conn.cursor(cursor_factory=RealDictCursor) as cursor: + with open( + "noi/sql/notice_of_intent_submission/primary_contact/notice_of_intent_primary_contact_count.sql", + "r", + encoding="utf-8", + ) as sql_file: + count_query = sql_file.read() + cursor.execute(count_query) + count_total = dict(cursor.fetchone())["count"] + logger.info(f"Total Notice of Intents data to insert: {count_total}") + + failed_inserts = 0 + successful_updates_count = 0 + last_file_number = 0 + + with open( + "noi/sql/notice_of_intent_submission/primary_contact/notice_of_intent_primary_contact.sql", + "r", + encoding="utf-8", + ) as sql_file: + application_sql = sql_file.read() + while True: + cursor.execute( + f"{application_sql} AND alr_application_id > {last_file_number} ORDER BY alr_application_id;" + ) + + rows = cursor.fetchmany(batch_size) + + if not rows: + break + try: + records_to_be_inserted_count = len(rows) + + _insert_records(conn, cursor, rows) + + successful_updates_count = ( + successful_updates_count + records_to_be_inserted_count + ) + + last_file_number = dict(rows[-1])["alr_application_id"] + + logger.debug( + f"retrieved/updated items count: {records_to_be_inserted_count}; total successfully insert notice of intents owners so far {successful_updates_count}; last updated {last_file_number}" + ) + except Exception as err: + logger.exception(err) + conn.rollback() + failed_inserts = count_total - successful_updates_count + last_file_number += 1 + + logger.info( + f"Finished {etl_name}: total amount of successful inserts {successful_updates_count}, total failed inserts {failed_inserts}" + ) + + +def _insert_records(conn, cursor, rows): + number_of_rows_to_insert = len(rows) + + if number_of_rows_to_insert > 0: + insert_query = _compile_owner_insert_query(number_of_rows_to_insert) + rows_to_insert = _prepare_data_to_insert(rows) + cursor.execute(insert_query, rows_to_insert) + conn.commit() + + +def _compile_owner_insert_query(number_of_rows_to_insert): + owners_to_insert = ",".join(["%s"] * number_of_rows_to_insert) + return f""" + INSERT INTO alcs.notice_of_intent_owner( + first_name, + last_name, + organization_name, + notice_of_intent_submission_uuid, + email, + phone_number, + type_code, + oats_application_party_id, + audit_created_by + ) + VALUES{owners_to_insert} + ON CONFLICT DO NOTHING; + """ + + +def _prepare_data_to_insert(rows): + row_without_last_element = [] + for row in rows: + mapped_row = _map_data(row) + row_without_last_element.append(tuple(mapped_row.values())) + + return row_without_last_element + + +def _map_data(row): + return { + "first_name": _get_name(row), + "last_name": row["last_name"], + "organization_name": row["organization_name"], + "notice_of_intent_submission_uuid": row["notice_of_intent_submission_uuid"], + "email": row["email_address"], + "phone_number": row.get("phone_number", "cell_phone_number"), + "type_code": ALCSOwnerType.AGEN.value, + "oats_application_party_id": row["alr_application_party_id"], + "audit_created_by": OATS_ETL_USER, + } + + +def _get_name(row): + first_name = row.get("first_name", "") + middle_name = row.get("middle_name", "") + return f"{first_name} {middle_name}".strip() + + +@inject_conn_pool +def clean_primary_contacts(conn=None): + logger.info("Start notice of intent primary contact cleaning") + with conn.cursor() as cursor: + cursor.execute( + f"UPDATE alcs.notice_of_intent_submission SET primary_contact_owner_uuid = NULL WHERE audit_created_by = '{OATS_ETL_USER}'" + ) + logger.info(f"Unassigned items count = {cursor.rowcount}") + conn.commit() + logger.info("Done notice of intent primary contact cleaning") diff --git a/bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/primary_contacts/notice_of_intent_submission_primary_contact.py b/bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/primary_contacts/notice_of_intent_submission_primary_contact.py new file mode 100644 index 0000000000..01c38fe540 --- /dev/null +++ b/bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/primary_contacts/notice_of_intent_submission_primary_contact.py @@ -0,0 +1,98 @@ +from common import ( + setup_and_get_logger, + BATCH_UPLOAD_SIZE, +) +from db import inject_conn_pool +from psycopg2.extras import RealDictCursor, execute_batch + +etl_name = "link_notice_of_intent_owners_to_parcels" +logger = setup_and_get_logger(etl_name) + + +@inject_conn_pool +def link_notice_of_intent_owners_to_parcels(conn=None, batch_size=BATCH_UPLOAD_SIZE): + logger.info(f"Start {etl_name}") + with conn.cursor(cursor_factory=RealDictCursor) as cursor: + with open( + "noi/sql/notice_of_intent_submission/primary_contact/notice_of_intent_submission_primary_contact_count.sql", + "r", + encoding="utf-8", + ) as sql_file: + count_query = sql_file.read() + cursor.execute(count_query) + count_total = dict(cursor.fetchone())["count"] + logger.info(f"Total Notice of Intents data to update: {count_total}") + + failed_updates = 0 + successful_updates_count = 0 + last_file_number = 0 + + with open( + "noi/sql/notice_of_intent_submission/primary_contact/notice_of_intent_submission_primary_contact.sql", + "r", + encoding="utf-8", + ) as sql_file: + application_sql = sql_file.read() + while True: + cursor.execute( + f"{application_sql} WHERE nois.file_number::bigint > '{last_file_number}' ORDER BY nois.file_number::bigint;" + ) + + rows = cursor.fetchmany(batch_size) + + if not rows: + break + try: + records_to_be_updated_count = len(rows) + + _update_records(conn, batch_size, cursor, rows) + + successful_updates_count = ( + successful_updates_count + records_to_be_updated_count + ) + + last_record = dict(rows[-1]) + last_file_number = last_record["file_number"] + + logger.debug( + f"retrieved/updated items count: {records_to_be_updated_count}; total successfully set notice of intents primary contacts so far {successful_updates_count}; last set {last_file_number}" + ) + except Exception as err: + logger.exception(err) + conn.rollback() + failed_updates = count_total - successful_updates_count + last_file_number = last_file_number + 1 + + logger.info( + f"Finished {etl_name}: total amount of successful updates {successful_updates_count}, total failed updates {failed_updates}" + ) + + +def _update_records(conn, batch_size, cursor, rows): + parsed_data_list = _prepare_oats_data(rows) + + if len(parsed_data_list) > 0: + execute_batch( + cursor, + _update_query, + parsed_data_list, + page_size=batch_size, + ) + + conn.commit() + + +_update_query = """ + UPDATE alcs.notice_of_intent_submission + SET + primary_contact_owner_uuid = %(owner_uuid)s + WHERE + alcs.notice_of_intent_submission.file_number = %(file_number)s::TEXT +""" + + +def _prepare_oats_data(row_data_list): + data_list = [] + for row in row_data_list: + data_list.append(dict(row)) + return data_list diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/primary_contact/notice_of_intent_primary_contact.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/primary_contact/notice_of_intent_primary_contact.sql new file mode 100644 index 0000000000..a36c73d6c3 --- /dev/null +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/primary_contact/notice_of_intent_primary_contact.sql @@ -0,0 +1,47 @@ +WITH ordered_parties AS ( + SELECT oaap.ALR_APPLICATION_ID, + oaap.person_organization_id, + op.person_id, + op.first_name, + op.last_name, + oo.organization_id, + oo.organization_name, + opo.phone_number, + opo.cell_phone_number, + opo.email_address, + oaap.alr_appl_role_code, + oaap.expiry_date, + oaap.alr_application_party_id, + ROW_NUMBER() OVER ( + PARTITION BY oaap.ALR_APPLICATION_ID + ORDER BY CASE + WHEN oaap.expiry_date > CURRENT_DATE THEN 1 + WHEN oaap.expiry_date IS NULL THEN 2 + ELSE 3 + END, + oaap.expiry_date DESC, + oaap.person_organization_id + ) row_num + FROM oats.oats_alr_application_parties oaap + JOIN oats.oats_person_organizations opo ON oaap.person_organization_id = opo.person_organization_id + LEFT JOIN oats.oats_persons op ON opo.PERSON_ID = op.person_id + LEFT JOIN oats.oats_organizations oo ON oo.organization_id = opo.organization_id + WHERE oaap.alr_appl_role_code <> 'LG' +) +SELECT alr_application_id, + person_organization_id, + person_id, + first_name, + last_name, + organization_id, + organization_name, + phone_number, + cell_phone_number, + email_address, + alr_appl_role_code, + "expiry_date", + nois."uuid" as notice_of_intent_submission_uuid, + alr_application_party_id +FROM ordered_parties + JOIN alcs.notice_of_intent_submission nois ON nois.file_number::bigint = ALR_APPLICATION_ID +WHERE row_num = 1 \ No newline at end of file diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/primary_contact/notice_of_intent_primary_contact_count.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/primary_contact/notice_of_intent_primary_contact_count.sql new file mode 100644 index 0000000000..11f45068ce --- /dev/null +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/primary_contact/notice_of_intent_primary_contact_count.sql @@ -0,0 +1,33 @@ +WITH ordered_parties AS ( + SELECT oaap.ALR_APPLICATION_ID, + oaap.person_organization_id, + op.person_id, + op.first_name, + op.last_name, + oo.organization_id, + oo.organization_name, + opo.phone_number, + opo.cell_phone_number, + opo.email_address, + oaap.alr_appl_role_code, + oaap.expiry_date, + ROW_NUMBER() OVER ( + PARTITION BY oaap.ALR_APPLICATION_ID + ORDER BY CASE + WHEN oaap.expiry_date > CURRENT_DATE THEN 1 + WHEN oaap.expiry_date IS NULL THEN 2 + ELSE 3 + END, + oaap.expiry_date DESC, + oaap.person_organization_id + ) row_num + FROM oats.oats_alr_application_parties oaap + JOIN oats.oats_person_organizations opo ON oaap.person_organization_id = opo.person_organization_id + LEFT JOIN oats.oats_persons op ON opo.PERSON_ID = op.person_id + LEFT JOIN oats.oats_organizations oo ON oo.organization_id = opo.organization_id + WHERE oaap.alr_appl_role_code <> 'LG' +) +SELECT count(*) +FROM ordered_parties + JOIN alcs.notice_of_intent_submission nois ON nois.file_number::bigint = ALR_APPLICATION_ID +WHERE row_num = 1; \ No newline at end of file diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/primary_contact/notice_of_intent_submission_primary_contact.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/primary_contact/notice_of_intent_submission_primary_contact.sql new file mode 100644 index 0000000000..350fa29d5f --- /dev/null +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/primary_contact/notice_of_intent_submission_primary_contact.sql @@ -0,0 +1,6 @@ +SELECT nois."uuid" AS submission_uuid, + noio."uuid" AS owner_uuid, + nois.file_number::bigint +FROM oats.oats_alr_application_parties oaap + JOIN alcs.notice_of_intent_submission nois ON nois.file_number::bigint = oaap.alr_application_id + JOIN alcs.notice_of_intent_owner noio ON noio.oats_application_party_id = oaap.alr_application_party_id \ No newline at end of file diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/primary_contact/notice_of_intent_submission_primary_contact_count.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/primary_contact/notice_of_intent_submission_primary_contact_count.sql new file mode 100644 index 0000000000..877ae0c304 --- /dev/null +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/primary_contact/notice_of_intent_submission_primary_contact_count.sql @@ -0,0 +1,4 @@ +SELECT count(*) +FROM oats.oats_alr_application_parties oaap + JOIN alcs.notice_of_intent_submission nois ON nois.file_number::bigint = oaap.alr_application_id + JOIN alcs.notice_of_intent_owner noio ON noio.oats_application_party_id = oaap.alr_application_party_id; \ No newline at end of file diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.entity.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.entity.ts index 2ecd9526fa..e153bee759 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.entity.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.entity.ts @@ -60,6 +60,15 @@ export class NoticeOfIntentOwner extends Base { }) oatsPersonOrganizationId: number; + @Column({ + select: false, + nullable: true, + type: 'int8', + comment: + 'This column is NOT related to any functionality in ALCS. It is only used for ETL and backtracking of imported data from OATS. It links oats.oats_alr_application_parties to alcs.notice_of_intent_owner.', + }) + oatsApplicationPartyId: number; + @AutoMap(() => NoticeOfIntentDocumentDto) @ManyToOne(() => NoticeOfIntentDocument, { onDelete: 'SET NULL', diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1699655237243-add_oats_alr_application_party_to_notice_of_intent_owner.ts b/services/apps/alcs/src/providers/typeorm/migrations/1699655237243-add_oats_alr_application_party_to_notice_of_intent_owner.ts new file mode 100644 index 0000000000..57f17e2ca4 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1699655237243-add_oats_alr_application_party_to_notice_of_intent_owner.ts @@ -0,0 +1,25 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class AddOatsAlrApplicationPartyToNoticeOfIntentOwner1699655237243 + implements MigrationInterface +{ + name = 'AddOatsAlrApplicationPartyToNoticeOfIntentOwner1699655237243'; + + public async up(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_owner" ADD "oats_application_party_id" bigint`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."notice_of_intent_owner"."oats_application_party_id" IS 'This column is NOT related to any functionality in ALCS. It is only used for ETL and backtracking of imported data from OATS. It links oats.oats_alr_application_parties to alcs.notice_of_intent_owner.'`, + ); + } + + public async down(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."notice_of_intent_owner"."oats_application_party_id" IS 'This column is NOT related to any functionality in ALCS. It is only used for ETL and backtracking of imported data from OATS. It links oats.oats_alr_application_parties to alcs.notice_of_intent_owner.'`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_owner" DROP COLUMN "oats_application_party_id"`, + ); + } +} From c101fee6e58d013f38dfc6e7b0e759ac9eae6918 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Thu, 9 Nov 2023 16:27:51 -0800 Subject: [PATCH 631/954] Add Return to L/FNG feature --- .../application/application.module.ts | 2 + .../lfng-info/lfng-info.component.html | 18 ++++++- .../lfng-info/lfng-info.component.spec.ts | 5 ++ .../lfng-info/lfng-info.component.ts | 31 ++++++++++- .../return-application-dialog.component.html | 39 ++++++++++++++ .../return-application-dialog.component.scss | 45 ++++++++++++++++ ...eturn-application-dialog.component.spec.ts | 40 ++++++++++++++ .../return-application-dialog.component.ts | 44 ++++++++++++++++ .../application-submission.service.ts | 20 ++++++- ...view-application-submission.component.html | 5 +- .../application-submission.dto.ts | 1 + .../submission-status.dto.ts | 1 + .../application-submission.controller.spec.ts | 52 ++++++++++++++++++- .../application-submission.controller.ts | 49 ++++++++++++++++- .../application-submission.dto.ts | 6 ++- .../application-submission.service.ts | 4 ++ ...ation-submission-review.controller.spec.ts | 2 +- ...pplication-submission-review.controller.ts | 13 ++++- .../application-submission.entity.ts | 9 ++++ .../application-submission.service.ts | 2 + .../migrations/1699559177504-add_comments.ts | 41 +++++++++++++++ 21 files changed, 416 insertions(+), 13 deletions(-) create mode 100644 alcs-frontend/src/app/features/application/lfng-info/return-application-dialog/return-application-dialog.component.html create mode 100644 alcs-frontend/src/app/features/application/lfng-info/return-application-dialog/return-application-dialog.component.scss create mode 100644 alcs-frontend/src/app/features/application/lfng-info/return-application-dialog/return-application-dialog.component.spec.ts create mode 100644 alcs-frontend/src/app/features/application/lfng-info/return-application-dialog/return-application-dialog.component.ts create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1699559177504-add_comments.ts diff --git a/alcs-frontend/src/app/features/application/application.module.ts b/alcs-frontend/src/app/features/application/application.module.ts index 829b1b8818..c04231f087 100644 --- a/alcs-frontend/src/app/features/application/application.module.ts +++ b/alcs-frontend/src/app/features/application/application.module.ts @@ -17,6 +17,7 @@ import { InfoRequestsComponent } from './info-requests/info-requests.component'; import { InfoRequestDialogComponent } from './info-requests/info-rquest-dialog/info-request-dialog.component'; import { IntakeComponent } from './intake/intake.component'; import { LfngInfoComponent } from './lfng-info/lfng-info.component'; +import { ReturnApplicationDialogComponent } from './lfng-info/return-application-dialog/return-application-dialog.component'; import { OverviewComponent } from './overview/overview.component'; import { UncancelApplicationDialogComponent } from './overview/uncancel-application-dialog/uncancel-application-dialog.component'; import { EditModificationDialogComponent } from './post-decision/edit-modification-dialog/edit-modification-dialog.component'; @@ -78,6 +79,7 @@ const routes: Routes = [ InclProposalComponent, ParcelPrepComponent, UncancelApplicationDialogComponent, + ReturnApplicationDialogComponent, ], imports: [SharedModule, RouterModule.forChild(routes), ApplicationDetailsModule, DecisionModule], }) diff --git a/alcs-frontend/src/app/features/application/lfng-info/lfng-info.component.html b/alcs-frontend/src/app/features/application/lfng-info/lfng-info.component.html index cf4524270b..f77d73a4fe 100644 --- a/alcs-frontend/src/app/features/application/lfng-info/lfng-info.component.html +++ b/alcs-frontend/src/app/features/application/lfng-info/lfng-info.component.html @@ -1,4 +1,20 @@ -<h3>L/FNG Info</h3> +<div class="split"> + <h3>L/FNG Info</h3> + <div + matTooltip="Only enabled when Portal status is 'Submitted to ALC' or 'L/FNG Refused to Forward'." + [matTooltipDisabled]="canReturnToGovernment" + > + <button + *ngIf="hasGovernmentReview" + [disabled]="!canReturnToGovernment" + mat-stroked-button + color="primary" + (click)="returnToLfng()" + > + Return to L/FNG + </button> + </div> +</div> <section> <div *ngIf="!requiresReview" class="warning"> <mat-icon>info</mat-icon>Application not subjected to Local/First Nation Government Review. diff --git a/alcs-frontend/src/app/features/application/lfng-info/lfng-info.component.spec.ts b/alcs-frontend/src/app/features/application/lfng-info/lfng-info.component.spec.ts index b36dcd3984..6f1253dfc8 100644 --- a/alcs-frontend/src/app/features/application/lfng-info/lfng-info.component.spec.ts +++ b/alcs-frontend/src/app/features/application/lfng-info/lfng-info.component.spec.ts @@ -1,5 +1,6 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { MatDialog } from '@angular/material/dialog'; import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { BehaviorSubject } from 'rxjs'; import { ApplicationDetailService } from '../../../services/application/application-detail.service'; @@ -44,6 +45,10 @@ describe('LfngInfoComponent', () => { provide: ApplicationReviewService, useValue: mockApplicationReviewService, }, + { + provide: MatDialog, + useValue: {}, + }, ], schemas: [NO_ERRORS_SCHEMA], }).compileComponents(); diff --git a/alcs-frontend/src/app/features/application/lfng-info/lfng-info.component.ts b/alcs-frontend/src/app/features/application/lfng-info/lfng-info.component.ts index 4bb7976feb..15b22e65ad 100644 --- a/alcs-frontend/src/app/features/application/lfng-info/lfng-info.component.ts +++ b/alcs-frontend/src/app/features/application/lfng-info/lfng-info.component.ts @@ -1,4 +1,5 @@ import { Component, OnInit } from '@angular/core'; +import { MatDialog } from '@angular/material/dialog'; import { ApplicationDetailService } from '../../../services/application/application-detail.service'; import { ApplicationDocumentDto } from '../../../services/application/application-document/application-document.dto'; import { ApplicationDocumentService } from '../../../services/application/application-document/application-document.service'; @@ -10,6 +11,7 @@ import { } from '../../../services/application/application.dto'; import { ApplicationSubmissionService } from '../../../services/application/application-submission/application-submission.service'; import { DOCUMENT_TYPE } from '../../../shared/document/document.dto'; +import { ReturnApplicationDialogComponent } from './return-application-dialog/return-application-dialog.component'; @Component({ selector: 'app-lfng-info', @@ -27,12 +29,15 @@ export class LfngInfoComponent implements OnInit { isFirstNationGovernment = false; hasCompletedStepsBeforeResolution = false; hasCompletedStepsBeforeDocuments = false; + hasGovernmentReview = false; + canReturnToGovernment = false; constructor( private applicationDetailService: ApplicationDetailService, private applicationSubmissionService: ApplicationSubmissionService, private applicationDocumentService: ApplicationDocumentService, - private applicationReviewService: ApplicationReviewService + private applicationReviewService: ApplicationReviewService, + private dialog: MatDialog, ) {} ngOnInit(): void { @@ -42,8 +47,13 @@ export class LfngInfoComponent implements OnInit { this.applicationReview = await this.applicationReviewService.fetchReview(application.fileNumber); this.submission = await this.applicationSubmissionService.fetchSubmission(application.fileNumber); this.showComment = [SUBMISSION_STATUS.WRONG_GOV, SUBMISSION_STATUS.INCOMPLETE].includes( - this.submission?.status.code + this.submission?.status.code, ); + this.hasGovernmentReview = application.type.requiresGovernmentReview && !!this.applicationReview; + this.canReturnToGovernment = [ + SUBMISSION_STATUS.SUBMITTED_TO_ALC, + SUBMISSION_STATUS.REFUSED_TO_FORWARD_LG, + ].includes(this.submission?.status.code); this.loadDocuments(application.fileNumber); this.isFirstNationGovernment = !!application.localGovernment?.isFirstNation; @@ -76,4 +86,21 @@ export class LfngInfoComponent implements OnInit { this.staffReport = documents.find((doc) => doc.type?.code === DOCUMENT_TYPE.STAFF_REPORT); this.otherAttachments = documents.filter((doc) => doc.type?.code === DOCUMENT_TYPE.OTHER); } + + async returnToLfng() { + if (this.submission) { + this.dialog + .open(ReturnApplicationDialogComponent, { + data: { + fileNumber: this.submission.fileNumber, + }, + }) + .beforeClosed() + .subscribe((didUpdate) => { + if (didUpdate && this.submission) { + this.applicationDetailService.loadApplication(this.submission?.fileNumber); + } + }); + } + } } diff --git a/alcs-frontend/src/app/features/application/lfng-info/return-application-dialog/return-application-dialog.component.html b/alcs-frontend/src/app/features/application/lfng-info/return-application-dialog/return-application-dialog.component.html new file mode 100644 index 0000000000..a30c6468c0 --- /dev/null +++ b/alcs-frontend/src/app/features/application/lfng-info/return-application-dialog/return-application-dialog.component.html @@ -0,0 +1,39 @@ +<div mat-dialog-title> + <h4>Reason for Return</h4> +</div> +<div mat-dialog-content class="return-application-modal"> + <div *ngIf="stepIdx === commentStep"> + <div class="step-body"> + <label class="subheading2" for="comment">Comment for L/FNG</label> + <div> + <textarea + [(ngModel)]="commentForLfng" + #comment + maxlength="4000" + id="comment" + matInput + class="comment-input" + placeholder="Type comment" + ></textarea> + </div> + <span class="subtext">Characters left: {{ 4000 - comment.textLength }}</span> + </div> + + <div class="step-controls"> + <button mat-stroked-button color="primary" [mat-dialog-close]="false">cancel</button> + <button mat-flat-button color="primary" [disabled]="!commentForLfng" (click)="next()">next</button> + </div> + </div> + + <div *ngIf="stepIdx === confirmationStep"> + <div class="step-body"> + Once returned, ALCS will have limited functionality while this application is with the local/first nation + government. Auto-emails will be sent to the applicant and local/first nation government. + </div> + + <div class="step-controls"> + <button mat-stroked-button color="primary" (click)="back()">back</button> + <button mat-flat-button color="primary" (click)="onSubmit()">confirm</button> + </div> + </div> +</div> diff --git a/alcs-frontend/src/app/features/application/lfng-info/return-application-dialog/return-application-dialog.component.scss b/alcs-frontend/src/app/features/application/lfng-info/return-application-dialog/return-application-dialog.component.scss new file mode 100644 index 0000000000..261b090287 --- /dev/null +++ b/alcs-frontend/src/app/features/application/lfng-info/return-application-dialog/return-application-dialog.component.scss @@ -0,0 +1,45 @@ +@use '../../../../../styles/colors'; + +.return-application-modal { + width: 80vw; + max-width: 845px; + color: colors.$black; +} + +.step-controls { + display: flex; + padding: 0 16px; + justify-content: flex-end; + + button { + margin-left: 24px !important; + width: 113px; + } +} + +.step-body { + margin-top: 32px; + margin-bottom: 32px; +} + +.step-controls { + padding: 0; +} + +::ng-deep { + .return-application-modal { + .mdc-button .mdc-button__label { + width: 100%; + } + } +} + +.comment-input { + resize: none; + margin-top: 4px; + border: 1px solid rgba(0, 0, 0, 0.42); + border-radius: 4px; + padding: 4px 8px; + height: 120px; + width: 100%; +} diff --git a/alcs-frontend/src/app/features/application/lfng-info/return-application-dialog/return-application-dialog.component.spec.ts b/alcs-frontend/src/app/features/application/lfng-info/return-application-dialog/return-application-dialog.component.spec.ts new file mode 100644 index 0000000000..ed2bba17f3 --- /dev/null +++ b/alcs-frontend/src/app/features/application/lfng-info/return-application-dialog/return-application-dialog.component.spec.ts @@ -0,0 +1,40 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { MAT_DIALOG_DATA, MatDialogModule, MatDialogRef } from '@angular/material/dialog'; +import { MatRadioModule } from '@angular/material/radio'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { ApplicationSubmissionService } from '../../../../services/application/application-submission/application-submission.service'; +import { ReturnApplicationDialogComponent } from './return-application-dialog.component'; + +describe('ReturnApplicationDialogComponent', () => { + let component: ReturnApplicationDialogComponent; + let fixture: ComponentFixture<ReturnApplicationDialogComponent>; + let mockAppReviewService: DeepMocked<ApplicationSubmissionService>; + + beforeEach(async () => { + mockAppReviewService = createMock(); + + await TestBed.configureTestingModule({ + imports: [MatDialogModule, MatRadioModule], + providers: [ + { provide: MatDialogRef, useValue: {} }, + { + provide: ApplicationSubmissionService, + useValue: mockAppReviewService, + }, + { provide: MAT_DIALOG_DATA, useValue: { fileNumber: 'fake' } }, + ], + declarations: [ReturnApplicationDialogComponent], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(ReturnApplicationDialogComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/alcs-frontend/src/app/features/application/lfng-info/return-application-dialog/return-application-dialog.component.ts b/alcs-frontend/src/app/features/application/lfng-info/return-application-dialog/return-application-dialog.component.ts new file mode 100644 index 0000000000..ff1291b25b --- /dev/null +++ b/alcs-frontend/src/app/features/application/lfng-info/return-application-dialog/return-application-dialog.component.ts @@ -0,0 +1,44 @@ +import { Component, Inject } from '@angular/core'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; +import { ApplicationSubmissionService } from '../../../../services/application/application-submission/application-submission.service'; + +export enum ReturnApplicationStepEnum { + comment = 0, + confirmation = 1, +} + +@Component({ + selector: 'app-return-application-dialog', + templateUrl: './return-application-dialog.component.html', + styleUrls: ['./return-application-dialog.component.scss'], +}) +export class ReturnApplicationDialogComponent { + fileNumber: string; + + commentStep = ReturnApplicationStepEnum.comment; + confirmationStep = ReturnApplicationStepEnum.confirmation; + + stepIdx = 0; + commentForLfng = ''; + + constructor( + private dialogRef: MatDialogRef<ReturnApplicationDialogComponent>, + private applicationSubmissionService: ApplicationSubmissionService, + @Inject(MAT_DIALOG_DATA) public data: ReturnApplicationDialogComponent, + ) { + this.fileNumber = data.fileNumber; + } + + async onSubmit() { + await this.applicationSubmissionService.returnToLfng(this.fileNumber, this.commentForLfng); + this.dialogRef.close(true); + } + + async next() { + this.stepIdx += 1; + } + + async back() { + this.stepIdx -= 1; + } +} diff --git a/alcs-frontend/src/app/services/application/application-submission/application-submission.service.ts b/alcs-frontend/src/app/services/application/application-submission/application-submission.service.ts index 0b7f412714..cf6527bdc5 100644 --- a/alcs-frontend/src/app/services/application/application-submission/application-submission.service.ts +++ b/alcs-frontend/src/app/services/application/application-submission/application-submission.service.ts @@ -12,7 +12,10 @@ import { ApplicationSubmissionDto, CovenantTransfereeDto, UpdateApplicationSubmi export class ApplicationSubmissionService { private baseUrl = `${environment.apiUrl}/application-submission`; - constructor(private http: HttpClient, private toastService: ToastService) {} + constructor( + private http: HttpClient, + private toastService: ToastService, + ) {} async fetchSubmission(fileNumber: string): Promise<ApplicationSubmissionDto> { try { @@ -28,7 +31,7 @@ export class ApplicationSubmissionService { return firstValueFrom( this.http.patch<ApplicationSubmissionDto>(`${this.baseUrl}/${fileNumber}/update-status`, { statusCode, - }) + }), ); } catch (e) { this.toastService.showErrorToast('Failed to update Application Submission Status'); @@ -53,4 +56,17 @@ export class ApplicationSubmissionService { throw e; } } + + returnToLfng(fileNumber: string, returnComment: string) { + try { + return firstValueFrom( + this.http.post<ApplicationSubmissionDto>(`${this.baseUrl}/${fileNumber}/return`, { + returnComment, + }), + ); + } catch (e) { + this.toastService.showErrorToast('Failed to return Application Submission'); + throw e; + } + } } diff --git a/portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.html b/portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.html index 71d72cd504..7d8d1d9b30 100644 --- a/portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.html +++ b/portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.html @@ -125,7 +125,10 @@ <h2>Applicant Submission</h2> <button (click)="onReview(application.fileNumber)" mat-button> <div> <span - *ngIf="application.status.code === SUBMISSION_STATUS.IN_REVIEW_BY_LG" + *ngIf=" + application.status.code === SUBMISSION_STATUS.IN_REVIEW_BY_LG || + application.status.code === SUBMISSION_STATUS.RETURNED_TO_LG + " (click)="onReview(application.fileNumber)" class="subheading2" >Continue Application Review</span diff --git a/portal-frontend/src/app/services/application-submission/application-submission.dto.ts b/portal-frontend/src/app/services/application-submission/application-submission.dto.ts index 4cd8a84584..fccc6c9335 100644 --- a/portal-frontend/src/app/services/application-submission/application-submission.dto.ts +++ b/portal-frontend/src/app/services/application-submission/application-submission.dto.ts @@ -14,6 +14,7 @@ export enum SUBMISSION_STATUS { IN_REVIEW_BY_ALC = 'REVA', //new Under Review by ALC ALC_DECISION = 'ALCD', // Decision Released REFUSED_TO_FORWARD_LG = 'RFFG', //new L/FNG Refused to Forward + RETURNED_TO_LG = 'INCG', //Returned to L/FNG from ALC CANCELLED = 'CANC', } diff --git a/services/apps/alcs/src/alcs/application/application-submission-status/submission-status.dto.ts b/services/apps/alcs/src/alcs/application/application-submission-status/submission-status.dto.ts index 19f7f2f88c..1208828eed 100644 --- a/services/apps/alcs/src/alcs/application/application-submission-status/submission-status.dto.ts +++ b/services/apps/alcs/src/alcs/application/application-submission-status/submission-status.dto.ts @@ -13,6 +13,7 @@ export enum SUBMISSION_STATUS { IN_REVIEW_BY_ALC = 'REVA', //Under Review by ALC ALC_DECISION = 'ALCD', // Decision Released REFUSED_TO_FORWARD_LG = 'RFFG', //L/FNG Refused to Forward + RETURNED_TO_LG = 'INCG', //Returned to L/FNG from ALC CANCELLED = 'CANC', } diff --git a/services/apps/alcs/src/alcs/application/application-submission/application-submission.controller.spec.ts b/services/apps/alcs/src/alcs/application/application-submission/application-submission.controller.spec.ts index af2a50ec23..e6d0431a91 100644 --- a/services/apps/alcs/src/alcs/application/application-submission/application-submission.controller.spec.ts +++ b/services/apps/alcs/src/alcs/application/application-submission/application-submission.controller.spec.ts @@ -4,9 +4,11 @@ import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { ClsService } from 'nestjs-cls'; import { mockKeyCloakProviders } from '../../../../test/mocks/mockTypes'; -import { Document } from '../../../document/document.entity'; import { DocumentService } from '../../../document/document.service'; import { ApplicationSubmission } from '../../../portal/application-submission/application-submission.entity'; +import { ApplicationSubmissionStatusService } from '../application-submission-status/application-submission-status.service'; +import { SUBMISSION_STATUS } from '../application-submission-status/submission-status.dto'; +import { ApplicationSubmissionToSubmissionStatus } from '../application-submission-status/submission-status.entity'; import { AlcsApplicationSubmissionDto } from '../application.dto'; import { ApplicationSubmissionController } from './application-submission.controller'; import { ApplicationSubmissionService } from './application-submission.service'; @@ -15,10 +17,12 @@ describe('ApplicationSubmissionController', () => { let controller: ApplicationSubmissionController; let mockApplicationSubmissionService: DeepMocked<ApplicationSubmissionService>; let mockDocumentService: DeepMocked<DocumentService>; + let mockAppSubStatusService: DeepMocked<ApplicationSubmissionStatusService>; beforeEach(async () => { mockApplicationSubmissionService = createMock(); mockDocumentService = createMock(); + mockAppSubStatusService = createMock(); const module: TestingModule = await Test.createTestingModule({ imports: [ @@ -36,6 +40,10 @@ describe('ApplicationSubmissionController', () => { provide: DocumentService, useValue: mockDocumentService, }, + { + provide: ApplicationSubmissionStatusService, + useValue: mockAppSubStatusService, + }, { provide: ClsService, useValue: {}, @@ -83,4 +91,46 @@ describe('ApplicationSubmissionController', () => { ); expect(result).toEqual([]); }); + + it('should update status correctly when returning to lfng', async () => { + const fakeFileNumber = 'fake'; + const fakeUuid = 'fake-uuid'; + mockApplicationSubmissionService.update.mockResolvedValue(); + mockApplicationSubmissionService.get.mockResolvedValue( + new ApplicationSubmission({ + uuid: fakeUuid, + }), + ); + mockAppSubStatusService.setStatusDate.mockResolvedValue( + new ApplicationSubmissionToSubmissionStatus(), + ); + mockApplicationSubmissionService.mapToDto.mockResolvedValue({} as any); + const mockDto = { + returnComment: 'returned comment', + }; + + await controller.returnToLfng(fakeFileNumber, mockDto); + + expect(mockApplicationSubmissionService.update).toHaveBeenCalledTimes(1); + expect(mockApplicationSubmissionService.update).toHaveBeenCalledWith( + fakeFileNumber, + mockDto, + ); + expect(mockApplicationSubmissionService.get).toHaveBeenCalledTimes(2); + expect(mockAppSubStatusService.setStatusDate).toBeCalledTimes(3); + expect(mockAppSubStatusService.setStatusDate).toBeCalledWith( + fakeUuid, + SUBMISSION_STATUS.RETURNED_TO_LG, + ); + expect(mockAppSubStatusService.setStatusDate).toBeCalledWith( + fakeUuid, + SUBMISSION_STATUS.SUBMITTED_TO_ALC, + null, + ); + expect(mockAppSubStatusService.setStatusDate).toBeCalledWith( + fakeUuid, + SUBMISSION_STATUS.REFUSED_TO_FORWARD_LG, + null, + ); + }); }); diff --git a/services/apps/alcs/src/alcs/application/application-submission/application-submission.controller.ts b/services/apps/alcs/src/alcs/application/application-submission/application-submission.controller.ts index d9deb72994..18caccc0bc 100644 --- a/services/apps/alcs/src/alcs/application/application-submission/application-submission.controller.ts +++ b/services/apps/alcs/src/alcs/application/application-submission/application-submission.controller.ts @@ -1,7 +1,15 @@ +import { + Body, + Controller, + Get, + Param, + Patch, + Post, + UseGuards, +} from '@nestjs/common'; +import { ApiOAuth2 } from '@nestjs/swagger'; import { Mapper } from 'automapper-core'; import { InjectMapper } from 'automapper-nestjs'; -import { Body, Controller, Get, Param, Patch, UseGuards } from '@nestjs/common'; -import { ApiOAuth2 } from '@nestjs/swagger'; import * as config from 'config'; import { ServiceValidationException } from '../../../../../../libs/common/src/exceptions/base.exception'; import { ANY_AUTH_ROLE } from '../../../common/authorization/roles'; @@ -10,6 +18,7 @@ import { UserRoles } from '../../../common/authorization/roles.decorator'; import { DocumentService } from '../../../document/document.service'; import { CovenantTransfereeDto } from '../../../portal/application-submission/covenant-transferee/covenant-transferee.dto'; import { CovenantTransferee } from '../../../portal/application-submission/covenant-transferee/covenant-transferee.entity'; +import { ApplicationSubmissionStatusService } from '../application-submission-status/application-submission-status.service'; import { SUBMISSION_STATUS } from '../application-submission-status/submission-status.dto'; import { AlcsApplicationSubmissionUpdateDto } from './application-submission.dto'; import { ApplicationSubmissionService } from './application-submission.service'; @@ -20,6 +29,7 @@ import { ApplicationSubmissionService } from './application-submission.service'; export class ApplicationSubmissionController { constructor( private applicationSubmissionService: ApplicationSubmissionService, + private applicationSubmissionStatusService: ApplicationSubmissionStatusService, private documentService: DocumentService, @InjectMapper() private mapper: Mapper, ) {} @@ -82,4 +92,39 @@ export class ApplicationSubmissionController { await this.applicationSubmissionService.update(fileNumber, updateDto); return this.get(fileNumber); } + + @UserRoles(...ANY_AUTH_ROLE) + @Post('/:fileNumber/return') + async returnToLfng( + @Param('fileNumber') fileNumber: string, + @Body() dto: AlcsApplicationSubmissionUpdateDto, + ) { + //Set Comment + await this.applicationSubmissionService.update(fileNumber, { + returnComment: dto.returnComment, + }); + + const submission = await this.applicationSubmissionService.get(fileNumber); + + //Set Status + await this.applicationSubmissionStatusService.setStatusDate( + submission.uuid, + SUBMISSION_STATUS.RETURNED_TO_LG, + ); + + //Clear Other Statuses + await this.applicationSubmissionStatusService.setStatusDate( + submission.uuid, + SUBMISSION_STATUS.SUBMITTED_TO_ALC, + null, + ); + await this.applicationSubmissionStatusService.setStatusDate( + submission.uuid, + SUBMISSION_STATUS.REFUSED_TO_FORWARD_LG, + null, + ); + + //Return Updated Version + return this.get(fileNumber); + } } diff --git a/services/apps/alcs/src/alcs/application/application-submission/application-submission.dto.ts b/services/apps/alcs/src/alcs/application/application-submission/application-submission.dto.ts index 8473d4c30f..fe1f3728b7 100644 --- a/services/apps/alcs/src/alcs/application/application-submission/application-submission.dto.ts +++ b/services/apps/alcs/src/alcs/application/application-submission/application-submission.dto.ts @@ -1,8 +1,12 @@ -import { IsArray, IsOptional } from 'class-validator'; +import { IsArray, IsOptional, IsString } from 'class-validator'; import { ProposedLot } from '../../../portal/application-submission/application-submission.entity'; export class AlcsApplicationSubmissionUpdateDto { @IsArray() @IsOptional() subProposedLots?: ProposedLot[]; + + @IsString() + @IsOptional() + returnComment?: string; } diff --git a/services/apps/alcs/src/alcs/application/application-submission/application-submission.service.ts b/services/apps/alcs/src/alcs/application/application-submission/application-submission.service.ts index 4b10eebee0..ae9f17f2dd 100644 --- a/services/apps/alcs/src/alcs/application/application-submission/application-submission.service.ts +++ b/services/apps/alcs/src/alcs/application/application-submission/application-submission.service.ts @@ -103,6 +103,10 @@ export class ApplicationSubmissionService { updateDto.subProposedLots, submission.subdProposedLots, ); + submission.returnedToLfngComment = filterUndefined( + updateDto.returnComment, + submission.returnedToLfngComment, + ); await this.applicationSubmissionRepository.save(submission); } diff --git a/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.spec.ts b/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.spec.ts index 982feff4c8..1feaa185b7 100644 --- a/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.spec.ts +++ b/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.spec.ts @@ -558,7 +558,7 @@ describe('ApplicationSubmissionReviewController', () => { }); expect( mockApplicationSubmissionStatusService.setStatusDate, - ).toHaveBeenCalledTimes(2); + ).toHaveBeenCalledTimes(3); expect( mockStatusEmailService.sendApplicationStatusEmail, ).toHaveBeenCalledTimes(1); diff --git a/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.ts b/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.ts index d4e1ed6d98..c7aef83c40 100644 --- a/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.ts +++ b/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.ts @@ -272,7 +272,8 @@ export class ApplicationSubmissionReviewController { } if ( - application.status.statusTypeCode === SUBMISSION_STATUS.IN_REVIEW_BY_LG + application.status.statusTypeCode === SUBMISSION_STATUS.IN_REVIEW_BY_LG || + application.status.statusTypeCode === SUBMISSION_STATUS.RETURNED_TO_LG ) { await this.applicationSubmissionService.submitToAlcs( validationResult.submission, @@ -351,7 +352,9 @@ export class ApplicationSubmissionReviewController { if ( applicationSubmission.status.statusTypeCode === - SUBMISSION_STATUS.IN_REVIEW_BY_LG + SUBMISSION_STATUS.IN_REVIEW_BY_LG || + applicationSubmission.status.statusTypeCode === + SUBMISSION_STATUS.RETURNED_TO_LG ) { const documents = await this.applicationDocumentService.list( applicationSubmission.fileNumber, @@ -365,6 +368,12 @@ export class ApplicationSubmissionReviewController { await this.applicationSubmissionReviewService.delete(applicationReview); + await this.applicationSubmissionStatusService.setStatusDate( + applicationSubmission.uuid, + SUBMISSION_STATUS.RETURNED_TO_LG, + null, + ); + await this.applicationSubmissionStatusService.setStatusDate( applicationSubmission.uuid, SUBMISSION_STATUS.SUBMITTED_TO_LG, diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts b/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts index ca004f4813..e0e3929b07 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts @@ -75,6 +75,15 @@ export class ApplicationSubmission extends Base { }) returnedComment?: string | null; + @AutoMap(() => String) + @Column({ + type: 'text', + comment: + 'Used to store comments when an Application is returned to the L/FNG by ALC Staff', + nullable: true, + }) + returnedToLfngComment?: string | null; + @AutoMap(() => String) @Column({ type: 'text', diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.service.ts b/services/apps/alcs/src/portal/application-submission/application-submission.service.ts index 92d536f50d..d5fdfb2f5d 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.service.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.service.ts @@ -612,6 +612,7 @@ export class ApplicationSubmissionService { [ SUBMISSION_STATUS.SUBMITTED_TO_LG, SUBMISSION_STATUS.IN_REVIEW_BY_LG, + SUBMISSION_STATUS.RETURNED_TO_LG, ].includes(app.status.statusTypeCode as SUBMISSION_STATUS) && !!userGovernment && userGovernment.uuid === app.localGovernmentUuid, @@ -648,6 +649,7 @@ export class ApplicationSubmissionService { [ SUBMISSION_STATUS.SUBMITTED_TO_LG, SUBMISSION_STATUS.IN_REVIEW_BY_LG, + SUBMISSION_STATUS.RETURNED_TO_LG, ].includes(application.status.statusTypeCode as SUBMISSION_STATUS) && !!userGovernment && userGovernment.uuid === application.localGovernmentUuid, diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1699559177504-add_comments.ts b/services/apps/alcs/src/providers/typeorm/migrations/1699559177504-add_comments.ts new file mode 100644 index 0000000000..987ee730c0 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1699559177504-add_comments.ts @@ -0,0 +1,41 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class AddComments1699559177504 implements MigrationInterface { + name = 'AddComments1699559177504'; + + public async up(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" ADD "returned_to_lfng_comment" text`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."application_submission"."returned_to_lfng_comment" IS 'Used to store comments when an Application is returned to the L/FNG by ALC Staff'`, + ); + + await queryRunner.query(` + INSERT INTO "alcs"."application_submission_status_type" + ("audit_deleted_date_at", "audit_created_at", "audit_updated_at", "audit_created_by", "audit_updated_by", "label", "code", "description", "weight", "alcs_background_color", "alcs_color", "portal_background_color", "portal_color") VALUES + (NULL, NOW(), NULL, 'migration_seed', NULL, 'ALC Returned to L/FNG', 'INCG', 'Application was returned to L/FNG from ALC Staff', 4, '#A7C7E8', '#002447', '#f8c0a3', '#83360D'); + `); + + await queryRunner.query(` + UPDATE "alcs"."application_submission_status_type" SET "weight" = 11 WHERE "code" = 'CANC'; + UPDATE "alcs"."application_submission_status_type" SET "weight" = 10 WHERE "code" = 'RFFG'; + UPDATE "alcs"."application_submission_status_type" SET "weight" = 9 WHERE "code" = 'ALCD'; + UPDATE "alcs"."application_submission_status_type" SET "weight" = 8 WHERE "code" = 'REVA'; + UPDATE "alcs"."application_submission_status_type" SET "weight" = 7 WHERE "code" = 'RECA'; + UPDATE "alcs"."application_submission_status_type" SET "weight" = 6 WHERE "code" = 'SUIN'; + UPDATE "alcs"."application_submission_status_type" SET "weight" = 5 WHERE "code" = 'SUBM'; + `); + + await queryRunner.query(` + INSERT INTO "alcs"."application_submission_to_submission_status" ("submission_uuid", "status_type_code") + (SELECT DISTINCT "submission_uuid", 'INCG' from "alcs"."application_submission_to_submission_status") + `); + } + + public async down(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" DROP COLUMN "returned_to_lfng_comment"`, + ); + } +} From 569219147a1567a9faad6b6e23f8653d2c4e4118 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Tue, 14 Nov 2023 10:18:23 -0800 Subject: [PATCH 632/954] Show returned comments Show returned comments in ALCS/Portal --- .../applicant-info.component.html | 5 +++++ .../applicant-info.component.scss | 18 ++++++++++++++- .../applicant-info.component.ts | 4 +++- .../application/application.component.ts | 6 +++-- .../application/application.module.ts | 3 ++- .../lfng-info/lfng-info.component.html | 11 +++++----- .../lfng-info/lfng-info.component.scss | 5 +++-- .../lfng-info/lfng-info.component.ts | 3 --- .../services/application/application.dto.ts | 2 ++ .../lfng-review/lfng-review.component.html | 22 +++++++++---------- .../lfng-review/lfng-review.component.scss | 14 ------------ ...view-application-submission.component.html | 11 ++++++++++ ...view-application-submission.component.scss | 14 ++++++++++++ .../application-submission.dto.ts | 1 + .../application-submission.dto.ts | 3 +++ 15 files changed, 81 insertions(+), 41 deletions(-) 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 index 3bcbdddc5c..31cb4b6283 100644 --- 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,5 +1,10 @@ <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" 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 index 89b0d01c78..b7d0259c4e 100644 --- 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,9 +1,25 @@ +@use '../../../../styles/colors'; + .applicant-info { & > div { - margin: 32px 0; + margin: 12px 0; } } .subheading1 { margin-bottom: 4px !important; } + +.comment-container { + align-items: flex-start; + background-color: colors.$secondary-color-light; + border-radius: 4px; + display: flex; + flex-direction: column; + padding: 16px; + margin-bottom: 24px; + + div { + margin-bottom: 4px; + } +} diff --git a/alcs-frontend/src/app/features/application/applicant-info/applicant-info.component.ts b/alcs-frontend/src/app/features/application/applicant-info/applicant-info.component.ts index 18743a01c2..180735de07 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/applicant-info.component.ts +++ b/alcs-frontend/src/app/features/application/applicant-info/applicant-info.component.ts @@ -27,7 +27,7 @@ export class ApplicantInfoComponent implements OnInit, OnDestroy { constructor( private applicationDetailService: ApplicationDetailService, - private applicationSubmissionService: ApplicationSubmissionService + private applicationSubmissionService: ApplicationSubmissionService, ) {} ngOnInit(): void { @@ -57,4 +57,6 @@ export class ApplicantInfoComponent implements OnInit, OnDestroy { this.destroy.next(); this.destroy.complete(); } + + protected readonly undefined = undefined; } diff --git a/alcs-frontend/src/app/features/application/application.component.ts b/alcs-frontend/src/app/features/application/application.component.ts index 1c8bc34267..0fe76e4399 100644 --- a/alcs-frontend/src/app/features/application/application.component.ts +++ b/alcs-frontend/src/app/features/application/application.component.ts @@ -185,7 +185,7 @@ export class ApplicationComponent implements OnInit, OnDestroy { private modificationService: ApplicationModificationService, private route: ActivatedRoute, private titleService: Title, - public applicationStatusService: ApplicationSubmissionStatusService + public applicationStatusService: ApplicationSubmissionStatusService, ) {} ngOnInit(): void { @@ -213,13 +213,15 @@ export class ApplicationComponent implements OnInit, OnDestroy { [ SUBMISSION_STATUS.SUBMITTED_TO_LG, SUBMISSION_STATUS.IN_REVIEW_BY_LG, + SUBMISSION_STATUS.REFUSED_TO_FORWARD_LG, + SUBMISSION_STATUS.RETURNED_TO_LG, SUBMISSION_STATUS.WRONG_GOV, SUBMISSION_STATUS.INCOMPLETE, ].includes(this.submission?.status?.code); } const submittedToAlcsStatus = this.submission?.submissionStatuses.find( - (s) => s.statusTypeCode === SUBMISSION_STATUS.SUBMITTED_TO_ALC && !!s.effectiveDate + (s) => s.statusTypeCode === SUBMISSION_STATUS.SUBMITTED_TO_ALC && !!s.effectiveDate, ); this.showSubmittedToLfngMenuItems = wasSubmittedToLfng && !submittedToAlcsStatus; diff --git a/alcs-frontend/src/app/features/application/application.module.ts b/alcs-frontend/src/app/features/application/application.module.ts index c04231f087..db90c54e34 100644 --- a/alcs-frontend/src/app/features/application/application.module.ts +++ b/alcs-frontend/src/app/features/application/application.module.ts @@ -1,3 +1,4 @@ +import { NgIf } from '@angular/common'; import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; import { MTX_DATETIME_FORMATS } from '@ng-matero/extensions/core'; @@ -81,6 +82,6 @@ const routes: Routes = [ UncancelApplicationDialogComponent, ReturnApplicationDialogComponent, ], - imports: [SharedModule, RouterModule.forChild(routes), ApplicationDetailsModule, DecisionModule], + imports: [SharedModule, RouterModule.forChild(routes), ApplicationDetailsModule, DecisionModule, NgIf], }) export class ApplicationModule {} diff --git a/alcs-frontend/src/app/features/application/lfng-info/lfng-info.component.html b/alcs-frontend/src/app/features/application/lfng-info/lfng-info.component.html index f77d73a4fe..a35051cc25 100644 --- a/alcs-frontend/src/app/features/application/lfng-info/lfng-info.component.html +++ b/alcs-frontend/src/app/features/application/lfng-info/lfng-info.component.html @@ -1,4 +1,4 @@ -<div class="split"> +<div class="split header"> <h3>L/FNG Info</h3> <div matTooltip="Only enabled when Portal status is 'Submitted to ALC' or 'L/FNG Refused to Forward'." @@ -19,13 +19,12 @@ <h3>L/FNG Info</h3> <div *ngIf="!requiresReview" class="warning"> <mat-icon>info</mat-icon>Application not subjected to Local/First Nation Government Review. </div> - <div *ngIf="!applicationReview && requiresReview && !showComment" class="warning"> + <div *ngIf="!applicationReview && requiresReview" class="warning"> <mat-icon>info</mat-icon>Pending Local/First Nation Government review. </div> - <div *ngIf="showComment" class="comment-container"> - <div><strong>Comment for Applicant</strong></div> - {{ submission?.returnedComment }} - <span class="no-comment" *ngIf="!submission?.returnedComment">No comment added</span> + <div *ngIf="submission?.returnedToLfngComment" class="comment-container"> + <div><strong>Comment for L/FNG</strong></div> + {{ submission?.returnedToLfngComment }} </div> <ng-container *ngIf="applicationReview"> <h4>Government File & Contact</h4> diff --git a/alcs-frontend/src/app/features/application/lfng-info/lfng-info.component.scss b/alcs-frontend/src/app/features/application/lfng-info/lfng-info.component.scss index dfcc95d763..293958725c 100644 --- a/alcs-frontend/src/app/features/application/lfng-info/lfng-info.component.scss +++ b/alcs-frontend/src/app/features/application/lfng-info/lfng-info.component.scss @@ -1,7 +1,7 @@ @use '../../../../styles/colors'; -h3 { - margin-bottom: 16px !important; +.header { + margin-bottom: 42px; } h4 { @@ -27,6 +27,7 @@ h4 { display: flex; flex-direction: column; padding: 16px; + margin-bottom: 24px; div { margin-bottom: 4px; diff --git a/alcs-frontend/src/app/features/application/lfng-info/lfng-info.component.ts b/alcs-frontend/src/app/features/application/lfng-info/lfng-info.component.ts index 15b22e65ad..32a610bc4c 100644 --- a/alcs-frontend/src/app/features/application/lfng-info/lfng-info.component.ts +++ b/alcs-frontend/src/app/features/application/lfng-info/lfng-info.component.ts @@ -46,9 +46,6 @@ export class LfngInfoComponent implements OnInit { this.requiresReview = application.type.requiresGovernmentReview; this.applicationReview = await this.applicationReviewService.fetchReview(application.fileNumber); this.submission = await this.applicationSubmissionService.fetchSubmission(application.fileNumber); - this.showComment = [SUBMISSION_STATUS.WRONG_GOV, SUBMISSION_STATUS.INCOMPLETE].includes( - this.submission?.status.code, - ); this.hasGovernmentReview = application.type.requiresGovernmentReview && !!this.applicationReview; this.canReturnToGovernment = [ SUBMISSION_STATUS.SUBMITTED_TO_ALC, diff --git a/alcs-frontend/src/app/services/application/application.dto.ts b/alcs-frontend/src/app/services/application/application.dto.ts index 048bc02f6f..0ae200dcef 100644 --- a/alcs-frontend/src/app/services/application/application.dto.ts +++ b/alcs-frontend/src/app/services/application/application.dto.ts @@ -18,6 +18,7 @@ export enum SUBMISSION_STATUS { IN_REVIEW_BY_ALC = 'REVA', //Under Review by ALC ALC_DECISION = 'ALCD', // Decision Released REFUSED_TO_FORWARD_LG = 'RFFG', //L/FNG Refused to Forward + RETURNED_TO_LG = 'INCG', //Returned to L/FNG from ALC CANCELLED = 'CANC', //Cancelled } @@ -115,6 +116,7 @@ export interface ApplicationSubmissionDto { owners: SubmittedApplicationOwnerDto[]; hasOtherParcelsInCommunity?: boolean | null; returnedComment?: string; + returnedToLfngComment?: string; submissionStatuses: ApplicationSubmissionToSubmissionStatusDto[]; primaryContactOwnerUuid?: string; diff --git a/portal-frontend/src/app/features/applications/view-submission/lfng-review/lfng-review.component.html b/portal-frontend/src/app/features/applications/view-submission/lfng-review/lfng-review.component.html index 79477e1628..331a83df47 100644 --- a/portal-frontend/src/app/features/applications/view-submission/lfng-review/lfng-review.component.html +++ b/portal-frontend/src/app/features/applications/view-submission/lfng-review/lfng-review.component.html @@ -34,7 +34,14 @@ <h2>Local/First Nation Gov Review</h2> </button> </div> </div> - <div *ngIf="application.status.code === SUBMISSION_STATUS.IN_PROGRESS" class="warning"> + <div + *ngIf=" + application.status.code === SUBMISSION_STATUS.IN_PROGRESS || + application.status.code === SUBMISSION_STATUS.WRONG_GOV || + application.status.code === SUBMISSION_STATUS.INCOMPLETE + " + class="warning" + > <mat-icon>info</mat-icon>This section will update after the application is submitted. </div> <div *ngIf="!applicationReview && submittedToAlcStatus" class="warning"> @@ -49,16 +56,9 @@ <h2>Local/First Nation Gov Review</h2> > <mat-icon>info</mat-icon>Pending Local/First Nation Government review. </div> - <div - *ngIf=" - application.status.code === SUBMISSION_STATUS.WRONG_GOV || - application.status.code === SUBMISSION_STATUS.INCOMPLETE - " - class="comment-container" - > - <div><strong>Comment for Applicant</strong></div> - {{ application.returnedComment }} - <span class="no-comment" *ngIf="!application.returnedComment">No comment added</span> + <div *ngIf="application.status.code === SUBMISSION_STATUS.RETURNED_TO_LG" class="comment-container"> + <div><strong>Comment for L/FNG</strong></div> + {{ application.returnedToLfngComment }} </div> <div *ngIf=" diff --git a/portal-frontend/src/app/features/applications/view-submission/lfng-review/lfng-review.component.scss b/portal-frontend/src/app/features/applications/view-submission/lfng-review/lfng-review.component.scss index 8af4733989..b33599ca72 100644 --- a/portal-frontend/src/app/features/applications/view-submission/lfng-review/lfng-review.component.scss +++ b/portal-frontend/src/app/features/applications/view-submission/lfng-review/lfng-review.component.scss @@ -14,20 +14,6 @@ } } -.comment-container { - align-items: flex-start; - background-color: rgba(colors.$accent-color-light, 0.5); - border-radius: rem(4); - display: flex; - flex-direction: column; - margin-bottom: rem(24); - padding: rem(16); - - div { - margin-bottom: rem(4); - } -} - .no-comment { color: colors.$grey-dark; font-style: italic; diff --git a/portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.html b/portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.html index 7d8d1d9b30..022bcdc28b 100644 --- a/portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.html +++ b/portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.html @@ -67,6 +67,17 @@ <h2>Applicant Submission</h2> </button> </div> </div> + <div + *ngIf=" + application.status.code === SUBMISSION_STATUS.WRONG_GOV || + application.status.code === SUBMISSION_STATUS.INCOMPLETE + " + class="comment-container" + > + <div><strong>Comment for Applicant</strong></div> + {{ application.returnedComment }} + <span class="no-comment" *ngIf="!application.returnedComment">No comment added</span> + </div> <app-application-details [showEdit]="false" [showErrors]="false" diff --git a/portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.scss b/portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.scss index 5772ae5b50..500f273a20 100644 --- a/portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.scss +++ b/portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.scss @@ -51,6 +51,20 @@ } } } + + .comment-container { + align-items: flex-start; + background-color: rgba(colors.$accent-color-light, 0.5); + border-radius: rem(4); + display: flex; + flex-direction: column; + margin-bottom: rem(24); + padding: rem(16); + + div { + margin-bottom: rem(4); + } + } } .absolute { diff --git a/portal-frontend/src/app/services/application-submission/application-submission.dto.ts b/portal-frontend/src/app/services/application-submission/application-submission.dto.ts index fccc6c9335..f80d2ac436 100644 --- a/portal-frontend/src/app/services/application-submission/application-submission.dto.ts +++ b/portal-frontend/src/app/services/application-submission/application-submission.dto.ts @@ -57,6 +57,7 @@ export interface ApplicationSubmissionDto { owners: ApplicationOwnerDetailedDto[]; hasOtherParcelsInCommunity?: boolean | null; returnedComment?: string; + returnedToLfngComment?: string; submissionStatuses: ApplicationSubmissionToSubmissionStatusDto[]; } diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.dto.ts b/services/apps/alcs/src/portal/application-submission/application-submission.dto.ts index 3d06c89e7d..2fdca38134 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.dto.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.dto.ts @@ -49,6 +49,9 @@ export class ApplicationSubmissionDto { @AutoMap(() => String) returnedComment: string | null; + @AutoMap(() => String) + returnedToLfngComment: string | null; + lastStatusUpdate: number; owners: ApplicationOwnerDto[]; type: string; From 8f55d3000e3a2bec7544cb471f713845d2c0327f Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Tue, 14 Nov 2023 11:02:13 -0800 Subject: [PATCH 633/954] Send Email when returning to L/FNG --- .../applicant-info.component.ts | 2 - .../application-submission.controller.spec.ts | 22 ++++++++++ .../application-submission.controller.ts | 23 ++++++++++ .../return-to-lfng/application.template.ts | 44 +++++++++++++++++++ .../templates/emails/return-to-lfng/index.ts | 1 + 5 files changed, 90 insertions(+), 2 deletions(-) create mode 100644 services/templates/emails/return-to-lfng/application.template.ts create mode 100644 services/templates/emails/return-to-lfng/index.ts diff --git a/alcs-frontend/src/app/features/application/applicant-info/applicant-info.component.ts b/alcs-frontend/src/app/features/application/applicant-info/applicant-info.component.ts index 180735de07..2b2fabfea1 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/applicant-info.component.ts +++ b/alcs-frontend/src/app/features/application/applicant-info/applicant-info.component.ts @@ -57,6 +57,4 @@ export class ApplicantInfoComponent implements OnInit, OnDestroy { this.destroy.next(); this.destroy.complete(); } - - protected readonly undefined = undefined; } diff --git a/services/apps/alcs/src/alcs/application/application-submission/application-submission.controller.spec.ts b/services/apps/alcs/src/alcs/application/application-submission/application-submission.controller.spec.ts index e6d0431a91..8dab25e2ea 100644 --- a/services/apps/alcs/src/alcs/application/application-submission/application-submission.controller.spec.ts +++ b/services/apps/alcs/src/alcs/application/application-submission/application-submission.controller.spec.ts @@ -2,10 +2,14 @@ import { classes } from 'automapper-classes'; import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; +import { create } from 'handlebars'; import { ClsService } from 'nestjs-cls'; import { mockKeyCloakProviders } from '../../../../test/mocks/mockTypes'; import { DocumentService } from '../../../document/document.service'; +import { ApplicationOwner } from '../../../portal/application-submission/application-owner/application-owner.entity'; import { ApplicationSubmission } from '../../../portal/application-submission/application-submission.entity'; +import { StatusEmailService } from '../../../providers/email/status-email.service'; +import { LocalGovernment } from '../../local-government/local-government.entity'; import { ApplicationSubmissionStatusService } from '../application-submission-status/application-submission-status.service'; import { SUBMISSION_STATUS } from '../application-submission-status/submission-status.dto'; import { ApplicationSubmissionToSubmissionStatus } from '../application-submission-status/submission-status.entity'; @@ -18,11 +22,13 @@ describe('ApplicationSubmissionController', () => { let mockApplicationSubmissionService: DeepMocked<ApplicationSubmissionService>; let mockDocumentService: DeepMocked<DocumentService>; let mockAppSubStatusService: DeepMocked<ApplicationSubmissionStatusService>; + let mockStatusEmailService: DeepMocked<StatusEmailService>; beforeEach(async () => { mockApplicationSubmissionService = createMock(); mockDocumentService = createMock(); mockAppSubStatusService = createMock(); + mockStatusEmailService = createMock(); const module: TestingModule = await Test.createTestingModule({ imports: [ @@ -44,6 +50,10 @@ describe('ApplicationSubmissionController', () => { provide: ApplicationSubmissionStatusService, useValue: mockAppSubStatusService, }, + { + provide: StatusEmailService, + useValue: mockStatusEmailService, + }, { provide: ClsService, useValue: {}, @@ -108,6 +118,12 @@ describe('ApplicationSubmissionController', () => { const mockDto = { returnComment: 'returned comment', }; + mockStatusEmailService.getApplicationEmailData.mockResolvedValue({ + submissionGovernment: new LocalGovernment(), + applicationSubmission: new ApplicationSubmission(), + primaryContact: new ApplicationOwner(), + }); + mockStatusEmailService.sendApplicationStatusEmail.mockResolvedValue(); await controller.returnToLfng(fakeFileNumber, mockDto); @@ -132,5 +148,11 @@ describe('ApplicationSubmissionController', () => { SUBMISSION_STATUS.REFUSED_TO_FORWARD_LG, null, ); + expect( + mockStatusEmailService.getApplicationEmailData, + ).toHaveBeenCalledTimes(1); + expect( + mockStatusEmailService.sendApplicationStatusEmail, + ).toHaveBeenCalledTimes(1); }); }); diff --git a/services/apps/alcs/src/alcs/application/application-submission/application-submission.controller.ts b/services/apps/alcs/src/alcs/application/application-submission/application-submission.controller.ts index 18caccc0bc..e2c9218671 100644 --- a/services/apps/alcs/src/alcs/application/application-submission/application-submission.controller.ts +++ b/services/apps/alcs/src/alcs/application/application-submission/application-submission.controller.ts @@ -12,12 +12,15 @@ import { Mapper } from 'automapper-core'; import { InjectMapper } from 'automapper-nestjs'; import * as config from 'config'; import { ServiceValidationException } from '../../../../../../libs/common/src/exceptions/base.exception'; +import { generateINCGApplicationHtml } from '../../../../../../templates/emails/return-to-lfng'; import { ANY_AUTH_ROLE } from '../../../common/authorization/roles'; import { RolesGuard } from '../../../common/authorization/roles-guard.service'; import { UserRoles } from '../../../common/authorization/roles.decorator'; import { DocumentService } from '../../../document/document.service'; import { CovenantTransfereeDto } from '../../../portal/application-submission/covenant-transferee/covenant-transferee.dto'; import { CovenantTransferee } from '../../../portal/application-submission/covenant-transferee/covenant-transferee.entity'; +import { StatusEmailService } from '../../../providers/email/status-email.service'; +import { PARENT_TYPE } from '../../card/card-subtask/card-subtask.dto'; import { ApplicationSubmissionStatusService } from '../application-submission-status/application-submission-status.service'; import { SUBMISSION_STATUS } from '../application-submission-status/submission-status.dto'; import { AlcsApplicationSubmissionUpdateDto } from './application-submission.dto'; @@ -31,6 +34,7 @@ export class ApplicationSubmissionController { private applicationSubmissionService: ApplicationSubmissionService, private applicationSubmissionStatusService: ApplicationSubmissionStatusService, private documentService: DocumentService, + private statusEmailService: StatusEmailService, @InjectMapper() private mapper: Mapper, ) {} @@ -124,6 +128,25 @@ export class ApplicationSubmissionController { null, ); + const { primaryContact, submissionGovernment } = + await this.statusEmailService.getApplicationEmailData( + submission.fileNumber, + submission, + ); + + //Send Email + if (primaryContact && submissionGovernment) { + await this.statusEmailService.sendApplicationStatusEmail({ + generateStatusHtml: generateINCGApplicationHtml, + status: SUBMISSION_STATUS.RETURNED_TO_LG, + applicationSubmission: submission, + government: submissionGovernment, + parentType: PARENT_TYPE.APPLICATION, + primaryContact, + ccGovernment: true, + }); + } + //Return Updated Version return this.get(fileNumber); } diff --git a/services/templates/emails/return-to-lfng/application.template.ts b/services/templates/emails/return-to-lfng/application.template.ts new file mode 100644 index 0000000000..800af14794 --- /dev/null +++ b/services/templates/emails/return-to-lfng/application.template.ts @@ -0,0 +1,44 @@ +import { MJMLParseResults } from 'mjml-core'; +import { StatusUpdateEmail } from '../../../apps/alcs/src/providers/email/status-email.service'; +import { EmailTemplateService } from '../../../libs/common/src/email-template-service/email-template.service'; +import { header, footer, notificationOnly, portalButton } from '../partials'; + +const template = `<mjml> + <mj-head> + <mj-style> + .line-height div { + line-height: 24px !important; + } + + .align-left { + float: left !important; + } + </mj-style> + </mj-head> + <mj-body width="600px"> + ${header} + + <mj-section background-color="white" padding="48px 0px 48px 0px"> + <mj-column width="600px" css-class='line-height'> + <mj-text font-size='16px'> + This email is to advise that the {{ governmentName }}'s review of the above noted {{ childType }} application requires further attention. The ALC has returned the application to the {{ governmentName }} for their action. + </mj-text> + <mj-text font-size='16px'> + Please login to the ALC Portal to view the ALC's comments for the {{ governmentName }}. + </mj-text> + ${notificationOnly} + </mj-column> + </mj-section> + + ${portalButton} + + ${footer} + </mj-body> +</mjml> +`; + +export const generateINCGApplicationHtml = ( + data: StatusUpdateEmail, +): MJMLParseResults => { + return new EmailTemplateService().generateEmailBase(template, data); +}; diff --git a/services/templates/emails/return-to-lfng/index.ts b/services/templates/emails/return-to-lfng/index.ts new file mode 100644 index 0000000000..ca6d3dd119 --- /dev/null +++ b/services/templates/emails/return-to-lfng/index.ts @@ -0,0 +1 @@ +export * from './application.template'; From 6b75bf0b6b03d1d8293b2c54c1714a3cc0717b0b Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Tue, 14 Nov 2023 13:45:36 -0800 Subject: [PATCH 634/954] Import owners and link them to parcels (#1152) import noi owners oats_person_organization_id to notice_of_intent_owners for further linking parcels to the owners link them to parcels --- bin/migrate-oats-data/common/__init__.py | 2 +- ...e_codes.py => oats_to_alcs_parcel_enum.py} | 6 + .../noi/notice_of_intent_migration.py | 13 ++ .../parcels/owners/__init__.py | 9 ++ .../parcels/owners/notice_of_intent_owners.py | 153 ++++++++++++++++++ .../owners/notice_of_intent_parcel_owners.py | 131 +++++++++++++++ .../parcels/owners/notice_of_intent_owner.sql | 22 +++ .../owners/notice_of_intent_owner_count.sql | 7 + ...er_return_reused_person_org_id_in_oats.sql | 42 +++++ .../notice_of_intent_parcel_owner_linking.sql | 12 ++ ...e_of_intent_parcel_owner_linking_count.sql | 8 + .../notice-of-intent-owner.entity.ts | 9 ++ ...ats_person_organization_id_to_noi_owner.ts | 25 +++ 13 files changed, 438 insertions(+), 1 deletion(-) rename bin/migrate-oats-data/common/{oats_to_alcs_ownership_type_codes.py => oats_to_alcs_parcel_enum.py} (76%) create mode 100644 bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/owners/__init__.py create mode 100644 bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/owners/notice_of_intent_owners.py create mode 100644 bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/owners/notice_of_intent_parcel_owners.py create mode 100644 bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/owners/notice_of_intent_owner.sql create mode 100644 bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/owners/notice_of_intent_owner_count.sql create mode 100644 bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/owners/notice_of_intent_owner_return_reused_person_org_id_in_oats.sql create mode 100644 bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/owners/notice_of_intent_parcel_owner_linking.sql create mode 100644 bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/owners/notice_of_intent_parcel_owner_linking_count.sql create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1699547676891-add_oats_person_organization_id_to_noi_owner.ts diff --git a/bin/migrate-oats-data/common/__init__.py b/bin/migrate-oats-data/common/__init__.py index 9c5e0712c3..744dcfc2c7 100644 --- a/bin/migrate-oats-data/common/__init__.py +++ b/bin/migrate-oats-data/common/__init__.py @@ -8,4 +8,4 @@ from .date_time_helper import * from .oats_to_alcs_naru_code_enum import * from .oats_temp_tables import * -from .oats_to_alcs_ownership_type_codes import * +from .oats_to_alcs_parcel_enum import * diff --git a/bin/migrate-oats-data/common/oats_to_alcs_ownership_type_codes.py b/bin/migrate-oats-data/common/oats_to_alcs_parcel_enum.py similarity index 76% rename from bin/migrate-oats-data/common/oats_to_alcs_ownership_type_codes.py rename to bin/migrate-oats-data/common/oats_to_alcs_parcel_enum.py index bc137cd65b..bb7d4c32ed 100644 --- a/bin/migrate-oats-data/common/oats_to_alcs_ownership_type_codes.py +++ b/bin/migrate-oats-data/common/oats_to_alcs_parcel_enum.py @@ -10,3 +10,9 @@ class OatsToAlcsOwnershipType(Enum): FEE = ALCSOwnershipType.FeeSimple.value CROWN = ALCSOwnershipType.Crown.value FIRST = ALCSOwnershipType.FeeSimple.value + + +class ALCSOwnerType(Enum): + INDV = "INDV" + ORGZ = "ORGZ" + CRWN = "CRWN" diff --git a/bin/migrate-oats-data/noi/notice_of_intent_migration.py b/bin/migrate-oats-data/noi/notice_of_intent_migration.py index b0335b7545..39b1ee9a06 100644 --- a/bin/migrate-oats-data/noi/notice_of_intent_migration.py +++ b/bin/migrate-oats-data/noi/notice_of_intent_migration.py @@ -32,12 +32,21 @@ process_notice_of_intent_certificate_of_title, ) +from .notice_of_intent_submissions.parcels.owners import ( + init_notice_of_intent_parcel_owners, + clean_owners, + link_notice_of_intent_owners_to_parcels, + clean_parcel_owners, +) + def init_notice_of_intent(batch_size): init_notice_of_intents(batch_size=batch_size) def clean_notice_of_intent(): + clean_parcel_owners() + clean_owners() clean_parcels() clean_notice_of_intent_submission_statuses() clean_notice_of_intent_submissions() @@ -83,5 +92,9 @@ def process_notice_of_intent(batch_size): process_notice_of_intent_certificate_of_title(batch_size) + init_notice_of_intent_parcel_owners(batch_size) + + link_notice_of_intent_owners_to_parcels(batch_size) + # this script must be the last one process_notice_of_intent_submission_status_emails() diff --git a/bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/owners/__init__.py b/bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/owners/__init__.py new file mode 100644 index 0000000000..edeb3c57de --- /dev/null +++ b/bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/owners/__init__.py @@ -0,0 +1,9 @@ +from .notice_of_intent_owners import ( + init_notice_of_intent_parcel_owners, + clean_owners, +) + +from .notice_of_intent_parcel_owners import ( + link_notice_of_intent_owners_to_parcels, + clean_parcel_owners, +) diff --git a/bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/owners/notice_of_intent_owners.py b/bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/owners/notice_of_intent_owners.py new file mode 100644 index 0000000000..550d9e8236 --- /dev/null +++ b/bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/owners/notice_of_intent_owners.py @@ -0,0 +1,153 @@ +from common import ( + setup_and_get_logger, + BATCH_UPLOAD_SIZE, + OATS_ETL_USER, + ALCSOwnershipType, + ALCSOwnerType, +) +from db import inject_conn_pool +from psycopg2.extras import RealDictCursor + +etl_name = "process_notice_of_intent_parcel_owners" +logger = setup_and_get_logger(etl_name) + + +@inject_conn_pool +def init_notice_of_intent_parcel_owners(conn=None, batch_size=BATCH_UPLOAD_SIZE): + logger.info(f"Start {etl_name}") + with conn.cursor(cursor_factory=RealDictCursor) as cursor: + with open( + "noi/sql/notice_of_intent_submission/parcels/owners/notice_of_intent_owner_count.sql", + "r", + encoding="utf-8", + ) as sql_file: + count_query = sql_file.read() + cursor.execute(count_query) + count_total = dict(cursor.fetchone())["count"] + logger.info(f"Total Notice of Intents data to insert: {count_total}") + + failed_inserts = 0 + successful_updates_count = 0 + last_subject_property = 0 + last_person_organization_id = 0 + + with open( + "noi/sql/notice_of_intent_submission/parcels/owners/notice_of_intent_owner.sql", + "r", + encoding="utf-8", + ) as sql_file: + application_sql = sql_file.read() + while True: + cursor.execute( + f"{application_sql} WHERE osp.subject_property_id > {last_subject_property} AND opo.person_organization_id > {last_person_organization_id} ORDER BY osp.subject_property_id, opo.person_organization_id;" + ) + + rows = cursor.fetchmany(batch_size) + + if not rows: + break + try: + records_to_be_inserted_count = len(rows) + + _insert_records(conn, cursor, rows) + + successful_updates_count = ( + successful_updates_count + records_to_be_inserted_count + ) + + last_record = dict(rows[-1]) + last_subject_property = last_record["subject_property_id"] + last_person_organization_id = last_record["person_organization_id"] + + logger.debug( + f"retrieved/updated items count: {records_to_be_inserted_count}; total successfully insert notice of intents owners so far {successful_updates_count}; last updated {last_subject_property} {last_person_organization_id}" + ) + except Exception as err: + logger.exception(err) + conn.rollback() + failed_inserts = count_total - successful_updates_count + last_person_organization_id = last_person_organization_id + 1 + + logger.info( + f"Finished {etl_name}: total amount of successful inserts {successful_updates_count}, total failed inserts {failed_inserts}" + ) + + +def _insert_records(conn, cursor, rows): + number_of_rows_to_insert = len(rows) + + if number_of_rows_to_insert > 0: + insert_query = _compile_owner_insert_query(number_of_rows_to_insert) + rows_to_insert = _prepare_data_to_insert(rows) + cursor.execute(insert_query, rows_to_insert) + conn.commit() + + +def _compile_owner_insert_query(number_of_rows_to_insert): + owners_to_insert = ",".join(["%s"] * number_of_rows_to_insert) + return f""" + INSERT INTO alcs.notice_of_intent_owner( + first_name, + last_name, + organization_name, + notice_of_intent_submission_uuid, + email, + phone_number, + type_code, + oats_person_organization_id, + audit_created_by + ) + VALUES{owners_to_insert} + ON CONFLICT DO NOTHING; + """ + + +def _prepare_data_to_insert(rows): + row_without_last_element = [] + for row in rows: + mapped_row = _map_data(row) + row_without_last_element.append(tuple(mapped_row.values())) + + return row_without_last_element + + +def _map_data(row): + return { + "first_name": _get_name(row), + "last_name": row["last_name"], + "organization_name": row["organization_name"], + "notice_of_intent_submission_uuid": row["notice_of_intent_submission_uuid"], + "email": row["email_address"], + "phone_number": row.get("phone_number", "cell_phone_number"), + "type_code": _map_owner_type(row), + "oats_person_organization_id": row["person_organization_id"], + "audit_created_by": OATS_ETL_USER, + } + + +def _get_name(row): + first_name = row.get("first_name", "") + middle_name = row.get("middle_name", "") + return f"{first_name} {middle_name}".strip() + + +def _map_owner_type(owner_record): + if owner_record["ownership_type_code"] == ALCSOwnershipType.FeeSimple.value: + if owner_record["person_id"] and not owner_record["organization_id"]: + return ALCSOwnerType.INDV.value + elif owner_record["organization_id"]: + return ALCSOwnerType.ORGZ.value + elif owner_record["ownership_type_code"] == ALCSOwnershipType.Crown.value: + return ALCSOwnerType.CRWN.value + + +@inject_conn_pool +def clean_owners(conn=None): + logger.info("Start notice of intent owner cleaning") + with conn.cursor() as cursor: + cursor.execute( + f"DELETE FROM alcs.notice_of_intent_owner noio WHERE noio.audit_created_by = '{OATS_ETL_USER}'" + ) + logger.info(f"Deleted items count = {cursor.rowcount}") + conn.commit() + logger.info("Done notice of intent owner cleaning") diff --git a/bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/owners/notice_of_intent_parcel_owners.py b/bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/owners/notice_of_intent_parcel_owners.py new file mode 100644 index 0000000000..ce7136c2cb --- /dev/null +++ b/bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/owners/notice_of_intent_parcel_owners.py @@ -0,0 +1,131 @@ +from common import ( + setup_and_get_logger, + BATCH_UPLOAD_SIZE, + OATS_ETL_USER, +) +from db import inject_conn_pool +from psycopg2.extras import RealDictCursor + +etl_name = "link_notice_of_intent_owners_to_parcels" +logger = setup_and_get_logger(etl_name) + + +@inject_conn_pool +def link_notice_of_intent_owners_to_parcels(conn=None, batch_size=BATCH_UPLOAD_SIZE): + logger.info(f"Start {etl_name}") + with conn.cursor(cursor_factory=RealDictCursor) as cursor: + with open( + "noi/sql/notice_of_intent_submission/parcels/owners/notice_of_intent_parcel_owner_linking_count.sql", + "r", + encoding="utf-8", + ) as sql_file: + count_query = sql_file.read() + cursor.execute(count_query) + count_total = dict(cursor.fetchone())["count"] + logger.info(f"Total Notice of Intents data to insert: {count_total}") + + failed_inserts = 0 + successful_inserts_count = 0 + last_parcel_uuid = "00000000-0000-0000-0000-000000000000" + last_owner_uuid = "00000000-0000-0000-0000-000000000000" + + with open( + "noi/sql/notice_of_intent_submission/parcels/owners/notice_of_intent_parcel_owner_linking.sql", + "r", + encoding="utf-8", + ) as sql_file: + application_sql = sql_file.read() + while True: + cursor.execute( + f"{application_sql} AND noip.\"uuid\" > '{last_parcel_uuid}' AND noio.\"uuid\" > '{last_owner_uuid}' ORDER BY parcel_uuid, owner_uuid;" + ) + + rows = cursor.fetchmany(batch_size) + + if not rows: + break + try: + records_to_be_inserted_count = len(rows) + + _insert_records(conn, cursor, rows) + + successful_inserts_count = ( + successful_inserts_count + records_to_be_inserted_count + ) + + last_record = dict(rows[-1]) + last_parcel_uuid = last_record["parcel_uuid"] + last_owner_uuid = last_record["owner_uuid"] + + logger.debug( + f"retrieved/updated items count: {records_to_be_inserted_count}; total successfully inserted notice of intents parcel_owners so far {successful_inserts_count}; last inserted {last_parcel_uuid} {last_owner_uuid}" + ) + except Exception as err: + logger.exception(err) + conn.rollback() + failed_inserts = count_total - successful_inserts_count + last_owner_uuid = last_owner_uuid + 1 + + logger.info( + f"Finished {etl_name}: total amount of successful inserts {successful_inserts_count}, total failed inserts {failed_inserts}" + ) + + +def _insert_records(conn, cursor, rows): + number_of_rows_to_insert = len(rows) + + if number_of_rows_to_insert > 0: + insert_query = _compile_parcel_owner_insert_query(number_of_rows_to_insert) + rows_to_insert = _prepare_data_to_insert(rows) + cursor.execute(insert_query, rows_to_insert) + conn.commit() + + +def _compile_parcel_owner_insert_query(number_of_rows_to_insert): + owners_to_insert = ",".join(["%s"] * number_of_rows_to_insert) + return f""" + INSERT INTO alcs.notice_of_intent_parcel_owners_notice_of_intent_owner(notice_of_intent_parcel_uuid, notice_of_intent_owner_uuid) + VALUES{owners_to_insert} + ON CONFLICT DO NOTHING; + """ + + +def _prepare_data_to_insert(rows): + row_without_last_element = [] + for row in rows: + mapped_row = _map_data(row) + row_without_last_element.append(tuple(mapped_row.values())) + + return row_without_last_element + + +def _map_data(row): + return { + "notice_of_intent_parcel_uuid": row["parcel_uuid"], + "notice_of_intent_owner_uuid": row["owner_uuid"], + } + + +@inject_conn_pool +def clean_parcel_owners(conn=None): + logger.info("Start notice of intent parcel to owner cleaning") + with conn.cursor() as cursor: + cursor.execute( + f""" + DELETE FROM alcs.notice_of_intent_parcel_owners_notice_of_intent_owner AS noipo + USING alcs.notice_of_intent_parcel noip + WHERE noip."uuid" = noipo.notice_of_intent_parcel_uuid AND noip.audit_created_by = '{OATS_ETL_USER}';""" + ) + conn.commit() + deleted_items_total = cursor.rowcount + cursor.execute( + f""" + DELETE FROM alcs.notice_of_intent_parcel_owners_notice_of_intent_owner AS noipo + USING alcs.notice_of_intent_owner noio + WHERE noio."uuid" = noipo.notice_of_intent_parcel_uuid AND noio.audit_created_by = '{OATS_ETL_USER}';""" + ) + conn.commit() + deleted_items_total += cursor.rowcount + logger.info(f"Deleted items count = {deleted_items_total}") + + logger.info("Done notice of intent owner cleaning") diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/owners/notice_of_intent_owner.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/owners/notice_of_intent_owner.sql new file mode 100644 index 0000000000..d11b653b32 --- /dev/null +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/owners/notice_of_intent_owner.sql @@ -0,0 +1,22 @@ +-- retrieve owners per parcel +SELECT osp.subject_property_id, + opo.person_organization_id, + op.person_id, + op.first_name, + op.last_name, + op.middle_name, + oo.organization_id, + oo.organization_name, + opo.phone_number, + opo.cell_phone_number, + opo.email_address, + noip.ownership_type_code, + opi.prin_type, + opi.active_ind, + noip.notice_of_intent_submission_uuid +FROM oats.OATS_PROPERTY_INTERESTS opi + JOIN oats.OATS_SUBJECT_PROPERTIES osp ON osp.SUBJECT_PROPERTY_ID = opi.SUBJECT_PROPERTY_ID + JOIN alcs.notice_of_intent_parcel noip ON noip.oats_subject_property_id = osp.subject_property_id -- ensure GET records only for parcels imported into ALCS + JOIN oats.OATS_PERSON_ORGANIZATIONS opo ON opo.PERSON_ORGANIZATION_ID = opi.PERSON_ORGANIZATION_ID + LEFT JOIN oats.OATS_PERSONS op ON op.PERSON_ID = opo.PERSON_ID + LEFT JOIN oats.oats_organizations oo ON oo.organization_id = opo.organization_id \ No newline at end of file diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/owners/notice_of_intent_owner_count.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/owners/notice_of_intent_owner_count.sql new file mode 100644 index 0000000000..75e28f566c --- /dev/null +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/owners/notice_of_intent_owner_count.sql @@ -0,0 +1,7 @@ +SELECT count(*) +FROM oats.OATS_PROPERTY_INTERESTS opi + JOIN oats.OATS_SUBJECT_PROPERTIES osp ON osp.SUBJECT_PROPERTY_ID = opi.SUBJECT_PROPERTY_ID + JOIN alcs.notice_of_intent_parcel noip ON noip.oats_subject_property_id = osp.subject_property_id -- ensure GET records only for parcels imported into ALCS + JOIN oats.OATS_PERSON_ORGANIZATIONS opo ON opo.PERSON_ORGANIZATION_ID = opi.PERSON_ORGANIZATION_ID + LEFT JOIN oats.OATS_PERSONS op ON op.PERSON_ID = opo.PERSON_ID + LEFT JOIN oats.oats_organizations oo ON oo.organization_id = opo.organization_id; \ No newline at end of file diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/owners/notice_of_intent_owner_return_reused_person_org_id_in_oats.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/owners/notice_of_intent_owner_return_reused_person_org_id_in_oats.sql new file mode 100644 index 0000000000..558de2c7e8 --- /dev/null +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/owners/notice_of_intent_owner_return_reused_person_org_id_in_oats.sql @@ -0,0 +1,42 @@ +-- finds and returns person_organization_ids reused in alr_applications of class NOI +WITH oats_joined_with_alcs_owners_with_parcels AS ( + SELECT noip.oats_subject_property_id, + opo.person_organization_id + FROM oats.OATS_SUBJECT_PROPERTIES osp + LEFT JOIN oats.OATS_PROPERTY_INTERESTS opi ON osp.SUBJECT_PROPERTY_ID = opi.SUBJECT_PROPERTY_ID + JOIN alcs.notice_of_intent_parcel noip ON noip.oats_subject_property_id = osp.subject_property_id + LEFT JOIN oats.OATS_PERSON_ORGANIZATIONS opo ON opo.PERSON_ORGANIZATION_ID = opi.PERSON_ORGANIZATION_ID + WHERE opi.person_organization_id IS NOT NULL + AND opo.person_organization_id IS NOT NULL + GROUP BY noip.oats_subject_property_id, + opo.person_organization_id + ORDER BY oats_subject_property_id, + person_organization_id +), +person_organization_ids_with_count AS ( + SELECT count(*), + oatsp.person_organization_id + FROM oats_joined_with_alcs_owners_with_parcels oatsp + LEFT JOIN alcs.notice_of_intent_owner noio ON noio.oats_person_organization_id = oatsp.person_organization_id + GROUP BY oatsp.person_organization_id + HAVING count(*) > 1 + ORDER BY count(*) DESC +), +oats_owners_with_parcels AS ( + SELECT opo.person_organization_id + FROM oats.OATS_SUBJECT_PROPERTIES osp + LEFT JOIN oats.OATS_PROPERTY_INTERESTS opi ON osp.SUBJECT_PROPERTY_ID = opi.SUBJECT_PROPERTY_ID + LEFT JOIN oats.OATS_PERSON_ORGANIZATIONS opo ON opo.PERSON_ORGANIZATION_ID = opi.PERSON_ORGANIZATION_ID + WHERE opi.person_organization_id IS NOT NULL + AND opo.person_organization_id IS NOT NULL + GROUP BY opo.person_organization_id + ORDER BY person_organization_id +) +SELECT count(*), + oatsp.person_organization_id +FROM oats_owners_with_parcels oatsp + LEFT JOIN alcs.notice_of_intent_owner noio ON noio.oats_person_organization_id = oatsp.person_organization_id + JOIN person_organization_ids_with_count poidc ON poidc.person_organization_id = oatsp.person_organization_id +GROUP BY oatsp.person_organization_id +HAVING power(count(*), 2) != max(poidc."count") -- this will provide all person_organization_ids reused for multiple alr_application_ids of class NOI. max will not affect anything since it is only 1 record per person_organization_id +ORDER BY count(*) DESC; \ No newline at end of file diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/owners/notice_of_intent_parcel_owner_linking.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/owners/notice_of_intent_parcel_owner_linking.sql new file mode 100644 index 0000000000..6bf2a22067 --- /dev/null +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/owners/notice_of_intent_parcel_owner_linking.sql @@ -0,0 +1,12 @@ +SELECT nois.file_number, + noip."uuid" AS parcel_uuid, + noip.oats_subject_property_id, + noio."uuid" AS owner_uuid, + noio.oats_person_organization_id +FROM oats.OATS_PROPERTY_INTERESTS opi + JOIN oats.OATS_SUBJECT_PROPERTIES osp ON osp.SUBJECT_PROPERTY_ID = opi.SUBJECT_PROPERTY_ID + JOIN alcs.notice_of_intent_parcel noip ON noip.oats_subject_property_id = osp.subject_property_id + JOIN alcs.notice_of_intent_owner noio ON noio.oats_person_organization_id = opi.PERSON_ORGANIZATION_ID + LEFT JOIN alcs.notice_of_intent_submission nois ON nois."uuid" = noip.notice_of_intent_submission_uuid +WHERE noip.audit_created_by = 'oats_etl' + AND noio.audit_created_by = 'oats_etl' \ No newline at end of file diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/owners/notice_of_intent_parcel_owner_linking_count.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/owners/notice_of_intent_parcel_owner_linking_count.sql new file mode 100644 index 0000000000..1e78d52777 --- /dev/null +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/owners/notice_of_intent_parcel_owner_linking_count.sql @@ -0,0 +1,8 @@ +SELECT count(*) +FROM oats.OATS_PROPERTY_INTERESTS opi + JOIN oats.OATS_SUBJECT_PROPERTIES osp ON osp.SUBJECT_PROPERTY_ID = opi.SUBJECT_PROPERTY_ID + JOIN alcs.notice_of_intent_parcel noip ON noip.oats_subject_property_id = osp.subject_property_id + JOIN alcs.notice_of_intent_owner noio ON noio.oats_person_organization_id = opi.PERSON_ORGANIZATION_ID + LEFT JOIN alcs.notice_of_intent_submission nois ON nois."uuid" = noip.notice_of_intent_submission_uuid +WHERE noip.audit_created_by = 'oats_etl' + AND noio.audit_created_by = 'oats_etl' \ No newline at end of file diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.entity.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.entity.ts index 952f159054..2ecd9526fa 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.entity.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.entity.ts @@ -51,6 +51,15 @@ export class NoticeOfIntentOwner extends Base { }) email?: string | null; + @Column({ + select: false, + nullable: true, + type: 'int8', + comment: + 'This column is NOT related to any functionality in ALCS. It is only used for ETL and backtracking of imported data from OATS. It links oats.oats_person_organization to alcs.notice_of_intent_owner. Note that this id is unique only in scope of parcel.', + }) + oatsPersonOrganizationId: number; + @AutoMap(() => NoticeOfIntentDocumentDto) @ManyToOne(() => NoticeOfIntentDocument, { onDelete: 'SET NULL', diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1699547676891-add_oats_person_organization_id_to_noi_owner.ts b/services/apps/alcs/src/providers/typeorm/migrations/1699547676891-add_oats_person_organization_id_to_noi_owner.ts new file mode 100644 index 0000000000..bbf3c8bb50 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1699547676891-add_oats_person_organization_id_to_noi_owner.ts @@ -0,0 +1,25 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class AddOatsPersonOrganizationIdToNoiOwner1699547676891 + implements MigrationInterface +{ + name = 'AddOatsPersonOrganizationIdToNoiOwner1699547676891'; + + public async up(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_owner" ADD "oats_person_organization_id" bigint`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."notice_of_intent_owner"."oats_person_organization_id" IS 'This column is NOT related to any functionality in ALCS. It is only used for ETL and backtracking of imported data from OATS. It links oats.oats_person_organization to alcs.notice_of_intent_owner. Note that this id is unique only in scope of parcel.'`, + ); + } + + public async down(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."notice_of_intent_owner"."oats_person_organization_id" IS 'This column is NOT related to any functionality in ALCS. It is only used for ETL and backtracking of imported data from OATS. It links oats.oats_person_organization to alcs.notice_of_intent_owner. Note that this id is unique only in scope of parcel.'`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_owner" DROP COLUMN "oats_person_organization_id"`, + ); + } +} From 3af75729ab582dd255e0bb10e0b61b9fcf55f0bd Mon Sep 17 00:00:00 2001 From: Mekhti <mekhti.huseinov.ssi@gmail.com> Date: Tue, 14 Nov 2023 16:29:56 -0800 Subject: [PATCH 635/954] prioritize agents over applicants --- .../noi/notice_of_intent_migration.py | 4 +- .../parcels/primary_contacts/__init__.py | 2 +- ...ce_of_intent_submission_primary_contact.py | 4 +- .../notice_of_intent_primary_contact.sql | 64 ++++++++++++------- ...notice_of_intent_primary_contact_count.sql | 50 ++++++++++++--- 5 files changed, 89 insertions(+), 35 deletions(-) diff --git a/bin/migrate-oats-data/noi/notice_of_intent_migration.py b/bin/migrate-oats-data/noi/notice_of_intent_migration.py index 6faca0bdf8..f5d1319771 100644 --- a/bin/migrate-oats-data/noi/notice_of_intent_migration.py +++ b/bin/migrate-oats-data/noi/notice_of_intent_migration.py @@ -42,7 +42,7 @@ from .notice_of_intent_submissions.parcels.primary_contacts import ( init_notice_of_intent_primary_contacts, clean_primary_contacts, - link_notice_of_intent_owners_to_parcels, + link_notice_of_intent_primary_contacts, ) @@ -105,7 +105,7 @@ def process_notice_of_intent(batch_size): init_notice_of_intent_primary_contacts(batch_size) - link_notice_of_intent_owners_to_parcels(batch_size) + link_notice_of_intent_primary_contacts(batch_size) # this script must be the last one process_notice_of_intent_submission_status_emails() diff --git a/bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/primary_contacts/__init__.py b/bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/primary_contacts/__init__.py index 8214822c28..906eaa0149 100644 --- a/bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/primary_contacts/__init__.py +++ b/bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/primary_contacts/__init__.py @@ -4,5 +4,5 @@ ) from .notice_of_intent_submission_primary_contact import ( - link_notice_of_intent_owners_to_parcels, + link_notice_of_intent_primary_contacts, ) diff --git a/bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/primary_contacts/notice_of_intent_submission_primary_contact.py b/bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/primary_contacts/notice_of_intent_submission_primary_contact.py index 01c38fe540..94e3eed17b 100644 --- a/bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/primary_contacts/notice_of_intent_submission_primary_contact.py +++ b/bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/primary_contacts/notice_of_intent_submission_primary_contact.py @@ -5,12 +5,12 @@ from db import inject_conn_pool from psycopg2.extras import RealDictCursor, execute_batch -etl_name = "link_notice_of_intent_owners_to_parcels" +etl_name = "link_notice_of_intent_primary_contacts" logger = setup_and_get_logger(etl_name) @inject_conn_pool -def link_notice_of_intent_owners_to_parcels(conn=None, batch_size=BATCH_UPLOAD_SIZE): +def link_notice_of_intent_primary_contacts(conn=None, batch_size=BATCH_UPLOAD_SIZE): logger.info(f"Start {etl_name}") with conn.cursor(cursor_factory=RealDictCursor) as cursor: with open( diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/primary_contact/notice_of_intent_primary_contact.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/primary_contact/notice_of_intent_primary_contact.sql index a36c73d6c3..d35bdbb168 100644 --- a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/primary_contact/notice_of_intent_primary_contact.sql +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/primary_contact/notice_of_intent_primary_contact.sql @@ -15,33 +15,53 @@ WITH ordered_parties AS ( ROW_NUMBER() OVER ( PARTITION BY oaap.ALR_APPLICATION_ID ORDER BY CASE - WHEN oaap.expiry_date > CURRENT_DATE THEN 1 - WHEN oaap.expiry_date IS NULL THEN 2 - ELSE 3 + WHEN oaap.alr_appl_role_code = 'AGENT' + AND oaap.expiry_date > CURRENT_DATE THEN 1 + WHEN oaap.alr_appl_role_code = 'AGENT' + AND oaap.expiry_date IS NULL THEN 2 + WHEN oaap.alr_appl_role_code = 'AGENT' THEN 3 + WHEN oaap.alr_appl_role_code = 'APPL' + AND oaap.expiry_date > CURRENT_DATE THEN 4 + WHEN oaap.alr_appl_role_code = 'APPL' + AND oaap.expiry_date IS NULL THEN 5 + WHEN oaap.alr_appl_role_code = 'APPL' THEN 6 + ELSE 7 END, - oaap.expiry_date DESC, - oaap.person_organization_id + oaap.expiry_date DESC ) row_num FROM oats.oats_alr_application_parties oaap JOIN oats.oats_person_organizations opo ON oaap.person_organization_id = opo.person_organization_id LEFT JOIN oats.oats_persons op ON opo.PERSON_ID = op.person_id LEFT JOIN oats.oats_organizations oo ON oo.organization_id = opo.organization_id WHERE oaap.alr_appl_role_code <> 'LG' +), +parties_with_submission_uuid as ( + SELECT ALR_APPLICATION_ID, + person_organization_id, + person_id, + first_name, + last_name, + organization_id, + organization_name, + phone_number, + cell_phone_number, + email_address, + alr_appl_role_code, + expiry_date, + nois."uuid" AS notice_of_intent_submission_uuid, + alr_application_party_id, + row_num + FROM ordered_parties + JOIN alcs.notice_of_intent_submission nois ON nois.file_number::bigint = ALR_APPLICATION_ID +), +parties_ordered_by_priority as ( + SELECT *, + ROW_NUMBER() OVER( + PARTITION BY ALR_APPLICATION_ID + ORDER BY row_num + ) priority + FROM parties_with_submission_uuid ) -SELECT alr_application_id, - person_organization_id, - person_id, - first_name, - last_name, - organization_id, - organization_name, - phone_number, - cell_phone_number, - email_address, - alr_appl_role_code, - "expiry_date", - nois."uuid" as notice_of_intent_submission_uuid, - alr_application_party_id -FROM ordered_parties - JOIN alcs.notice_of_intent_submission nois ON nois.file_number::bigint = ALR_APPLICATION_ID -WHERE row_num = 1 \ No newline at end of file +SELECT * +FROM parties_ordered_by_priority +WHERE priority = 1 \ No newline at end of file diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/primary_contact/notice_of_intent_primary_contact_count.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/primary_contact/notice_of_intent_primary_contact_count.sql index 11f45068ce..26bd67e91d 100644 --- a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/primary_contact/notice_of_intent_primary_contact_count.sql +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/primary_contact/notice_of_intent_primary_contact_count.sql @@ -11,23 +11,57 @@ WITH ordered_parties AS ( opo.email_address, oaap.alr_appl_role_code, oaap.expiry_date, + oaap.alr_application_party_id, ROW_NUMBER() OVER ( PARTITION BY oaap.ALR_APPLICATION_ID ORDER BY CASE - WHEN oaap.expiry_date > CURRENT_DATE THEN 1 - WHEN oaap.expiry_date IS NULL THEN 2 - ELSE 3 + WHEN oaap.alr_appl_role_code = 'AGENT' + AND oaap.expiry_date > CURRENT_DATE THEN 1 + WHEN oaap.alr_appl_role_code = 'AGENT' + AND oaap.expiry_date IS NULL THEN 2 + WHEN oaap.alr_appl_role_code = 'AGENT' THEN 3 + WHEN oaap.alr_appl_role_code = 'APPL' + AND oaap.expiry_date > CURRENT_DATE THEN 4 + WHEN oaap.alr_appl_role_code = 'APPL' + AND oaap.expiry_date IS NULL THEN 5 + WHEN oaap.alr_appl_role_code = 'APPL' THEN 6 + ELSE 7 END, - oaap.expiry_date DESC, - oaap.person_organization_id + oaap.expiry_date DESC ) row_num FROM oats.oats_alr_application_parties oaap JOIN oats.oats_person_organizations opo ON oaap.person_organization_id = opo.person_organization_id LEFT JOIN oats.oats_persons op ON opo.PERSON_ID = op.person_id LEFT JOIN oats.oats_organizations oo ON oo.organization_id = opo.organization_id WHERE oaap.alr_appl_role_code <> 'LG' +), +parties_with_submission_uuid as ( + SELECT ALR_APPLICATION_ID, + person_organization_id, + person_id, + first_name, + last_name, + organization_id, + organization_name, + phone_number, + cell_phone_number, + email_address, + alr_appl_role_code, + expiry_date, + nois."uuid" AS notice_of_intent_submission_uuid, + alr_application_party_id, + row_num + FROM ordered_parties + JOIN alcs.notice_of_intent_submission nois ON nois.file_number::bigint = ALR_APPLICATION_ID +), +parties_ordered_by_priority as ( + SELECT *, + ROW_NUMBER() OVER( + PARTITION BY ALR_APPLICATION_ID + ORDER BY row_num + ) priority + FROM parties_with_submission_uuid ) SELECT count(*) -FROM ordered_parties - JOIN alcs.notice_of_intent_submission nois ON nois.file_number::bigint = ALR_APPLICATION_ID -WHERE row_num = 1; \ No newline at end of file +FROM parties_ordered_by_priority +WHERE priority = 1; \ No newline at end of file From 9b3ea36afdc8931b69f27d0ca32c50f9c576fef2 Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Wed, 15 Nov 2023 08:32:33 -0800 Subject: [PATCH 636/954] styling fixes --- .../submission/nfu-details/nfu-details.component.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/portal-frontend/src/app/features/public/application/submission/nfu-details/nfu-details.component.scss b/portal-frontend/src/app/features/public/application/submission/nfu-details/nfu-details.component.scss index 3ffe1603d5..4f39e7710a 100644 --- a/portal-frontend/src/app/features/public/application/submission/nfu-details/nfu-details.component.scss +++ b/portal-frontend/src/app/features/public/application/submission/nfu-details/nfu-details.component.scss @@ -5,7 +5,7 @@ overflow-x: auto; grid-column-gap: rem(36); grid-row-gap: rem(12); - grid-template-columns: max-content max-content max-content; + grid-template-columns: max-content max-content; @media screen and (min-width: $tabletBreakpoint) { grid-template-columns: 0.55fr 1fr; From 4f3d9e8dafbb69b6b60c67a20b0a4af577f6b2dc Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Wed, 15 Nov 2023 09:08:38 -0800 Subject: [PATCH 637/954] styling fixes --- .../naru-details/naru-details.component.html | 32 +++--- .../nfu-details/nfu-details.component.html | 31 ++++-- .../pfrs-details/pfrs-details.component.html | 104 +++++++++++------- .../pfrs-details/pfrs-details.component.scss | 11 +- .../pofo-details/pofo-details.component.html | 33 +++--- .../roso-details/roso-details.component.html | 31 +++--- .../pfrs-details/pfrs-details.component.html | 32 +++--- .../pofo-details/pofo-details.component.html | 31 +++--- .../roso-details/roso-details.component.html | 31 +++--- 9 files changed, 205 insertions(+), 131 deletions(-) diff --git a/portal-frontend/src/app/features/public/application/submission/naru-details/naru-details.component.html b/portal-frontend/src/app/features/public/application/submission/naru-details/naru-details.component.html index 19397070d6..22cf7785d8 100644 --- a/portal-frontend/src/app/features/public/application/submission/naru-details/naru-details.component.html +++ b/portal-frontend/src/app/features/public/application/submission/naru-details/naru-details.component.html @@ -163,6 +163,25 @@ {{ applicationSubmission.naruFillOrigin }} <app-no-data *ngIf="!applicationSubmission.naruFillOrigin"></app-no-data> </div> + + <div class="subheading2 grid-1">Project Duration</div> + <div class="grid-double"> + <div *ngIf="applicationSubmission.soilProjectDurationAmount && applicationSubmission.soilProjectDurationUnit"> + {{ applicationSubmission.soilProjectDurationAmount }} + <ng-container [ngPlural]="applicationSubmission.soilProjectDurationAmount"> + <ng-template ngPluralCase="=1"> + {{ applicationSubmission.soilProjectDurationUnit.slice(0, -1) | titlecase }} + </ng-template> + <ng-template ngPluralCase="other"> + {{ applicationSubmission.soilProjectDurationUnit | titlecase }} + </ng-template> + </ng-container> + </div> + <app-no-data + *ngIf="!applicationSubmission.soilProjectDurationAmount || !applicationSubmission.soilProjectDurationUnit" + ></app-no-data> + </div> + <div class="grid-1"></div> <div class="subheading2 grid-double">Fill to be Placed</div> @@ -194,18 +213,5 @@ *ngIf="applicationSubmission.naruToPlaceAverageDepth === null" ></app-no-data> </div> - - <div class="grid-1"></div> - <div class="subheading2 grid-double">Project Duration</div> - <div class="subheading2 grid-1">Duration</div> - <div class="grid-double"> - {{ applicationSubmission.naruProjectDurationUnit }} - <app-no-data *ngIf="!applicationSubmission.naruProjectDurationUnit"></app-no-data> - </div> - <div class="subheading2 grid-1">Length</div> - <div class="grid-double"> - {{ applicationSubmission.naruProjectDurationAmount }} - <app-no-data *ngIf="!applicationSubmission.naruProjectDurationAmount"></app-no-data> - </div> </ng-container> </div> diff --git a/portal-frontend/src/app/features/public/application/submission/nfu-details/nfu-details.component.html b/portal-frontend/src/app/features/public/application/submission/nfu-details/nfu-details.component.html index 0839a99585..1e8994880c 100644 --- a/portal-frontend/src/app/features/public/application/submission/nfu-details/nfu-details.component.html +++ b/portal-frontend/src/app/features/public/application/submission/nfu-details/nfu-details.component.html @@ -52,6 +52,25 @@ <h4>Soil and Fill Components</h4> {{ applicationSubmission.nfuFillOriginDescription }} <app-no-data *ngIf="!applicationSubmission.nfuFillOriginDescription"></app-no-data> </div> + + <div class="subheading2 grid-1">Project Duration</div> + <div class="grid-double"> + <div *ngIf="applicationSubmission.soilProjectDurationAmount && applicationSubmission.soilProjectDurationUnit"> + {{ applicationSubmission.soilProjectDurationAmount }} + <ng-container [ngPlural]="applicationSubmission.soilProjectDurationAmount"> + <ng-template ngPluralCase="=1"> + {{ applicationSubmission.soilProjectDurationUnit.slice(0, -1) | titlecase }} + </ng-template> + <ng-template ngPluralCase="other"> + {{ applicationSubmission.soilProjectDurationUnit | titlecase }} + </ng-template> + </ng-container> + </div> + <app-no-data + *ngIf="!applicationSubmission.soilProjectDurationAmount || !applicationSubmission.soilProjectDurationUnit" + ></app-no-data> + </div> + <div class="grid-1"></div> <div class="subheading2 grid-double">Fill to be Placed</div> @@ -83,17 +102,5 @@ <h4>Soil and Fill Components</h4> *ngIf="applicationSubmission.nfuAverageFillDepth === null" ></app-no-data> </div> - <div class="grid-1"></div> - <div class="subheading2 grid-double">Project Duration</div> - <div class="subheading2 grid-1">Duration</div> - <div class="grid-double"> - {{ applicationSubmission.nfuProjectDurationUnit }} - <app-no-data *ngIf="!applicationSubmission.nfuProjectDurationUnit"></app-no-data> - </div> - <div class="subheading2 grid-1">Length</div> - <div class="grid-double"> - {{ applicationSubmission.nfuProjectDurationAmount }} - <app-no-data *ngIf="!applicationSubmission.nfuProjectDurationAmount"></app-no-data> - </div> </ng-container> </div> diff --git a/portal-frontend/src/app/features/public/application/submission/pfrs-details/pfrs-details.component.html b/portal-frontend/src/app/features/public/application/submission/pfrs-details/pfrs-details.component.html index 71c70b13b9..bc6e324d59 100644 --- a/portal-frontend/src/app/features/public/application/submission/pfrs-details/pfrs-details.component.html +++ b/portal-frontend/src/app/features/public/application/submission/pfrs-details/pfrs-details.component.html @@ -21,12 +21,30 @@ <app-no-data *ngIf="!applicationSubmission.purpose"></app-no-data> </div> + <div class="subheading2 grid-1">Project Duration</div> + <div class="grid-double"> + <div *ngIf="applicationSubmission.soilProjectDurationAmount && applicationSubmission.soilProjectDurationUnit"> + {{ applicationSubmission.soilProjectDurationAmount }} + <ng-container [ngPlural]="applicationSubmission.soilProjectDurationAmount"> + <ng-template ngPluralCase="=1"> + {{ applicationSubmission.soilProjectDurationUnit.slice(0, -1) | titlecase }} + </ng-template> + <ng-template ngPluralCase="other"> + {{ applicationSubmission.soilProjectDurationUnit | titlecase }} + </ng-template> + </ng-container> + </div> + <app-no-data + *ngIf="!applicationSubmission.soilProjectDurationAmount || !applicationSubmission.soilProjectDurationUnit" + ></app-no-data> + </div> + <div class="full-width soil-table"> <div></div> - <div><strong>Soil to be Removed</strong></div> - <div><strong>Fill to be Placed</strong></div> + <div class="subheading2">Soil to be Removed</div> + <div class="subheading2">Fill to be Placed</div> - <div><strong>Volume</strong></div> + <div class="subheading2">Volume</div> <div> {{ applicationSubmission.soilToRemoveVolume }} <span *ngIf="applicationSubmission.soilToRemoveVolume !== null">m<sup>3</sup></span> @@ -38,7 +56,7 @@ <app-no-data *ngIf="applicationSubmission.soilToPlaceVolume === null"></app-no-data> </div> - <div><strong>Area</strong></div> + <div class="subheading2">Area</div> <div> {{ applicationSubmission.soilToRemoveArea }} <span *ngIf="applicationSubmission.soilToRemoveArea !== null">m<sup>2</sup></span> @@ -50,99 +68,109 @@ <app-no-data *ngIf="applicationSubmission.soilToPlaceArea === null"></app-no-data> </div> - <div><strong>Maximum Depth</strong></div> + <div class="subheading2">Maximum Depth</div> <div> {{ applicationSubmission.soilToRemoveMaximumDepth }} <span *ngIf="applicationSubmission.soilToRemoveMaximumDepth !== null">m</span> - <app-no-data *ngIf="applicationSubmission.soilToRemoveMaximumDepth === null"></app-no-data> + <app-no-data + *ngIf="applicationSubmission.soilToRemoveMaximumDepth === null" + ></app-no-data> </div> <div> {{ applicationSubmission.soilToPlaceMaximumDepth }} <span *ngIf="applicationSubmission.soilToPlaceMaximumDepth !== null">m</span> - <app-no-data *ngIf="applicationSubmission.soilToPlaceMaximumDepth === null"></app-no-data> + <app-no-data + *ngIf="applicationSubmission.soilToPlaceMaximumDepth === null" + ></app-no-data> </div> - <div><strong>Average Depth</strong></div> + <div class="subheading2">Average Depth</div> <div> {{ applicationSubmission.soilToRemoveAverageDepth }} <span *ngIf="applicationSubmission.soilToRemoveAverageDepth !== null">m</span> - <app-no-data *ngIf="applicationSubmission.soilToRemoveAverageDepth === null"></app-no-data> + <app-no-data + *ngIf="applicationSubmission.soilToRemoveAverageDepth === null" + ></app-no-data> </div> <div> {{ applicationSubmission.soilToPlaceAverageDepth }} <span *ngIf="applicationSubmission.soilToPlaceAverageDepth !== null">m</span> - <app-no-data *ngIf="applicationSubmission.soilToPlaceAverageDepth === null"></app-no-data> + <app-no-data + *ngIf="applicationSubmission.soilToPlaceAverageDepth === null" + ></app-no-data> </div> <div class="spacer-row"></div> <div></div> - <div><strong>Soil already Removed</strong></div> - <div><strong>Fill already Placed</strong></div> + <div class="subheading2">Soil already Removed</div> + <div class="subheading2">Fill already Placed</div> - <div><strong>Volume</strong></div> + <div class="subheading2">Volume</div> <div> {{ applicationSubmission.soilAlreadyRemovedVolume }} <span *ngIf="applicationSubmission.soilAlreadyRemovedVolume !== null">m<sup>3</sup></span> - <app-no-data *ngIf="applicationSubmission.soilAlreadyRemovedVolume === null"></app-no-data> + <app-no-data + *ngIf="applicationSubmission.soilAlreadyRemovedVolume === null" + ></app-no-data> </div> <div> {{ applicationSubmission.soilAlreadyPlacedVolume }} <span *ngIf="applicationSubmission.soilAlreadyPlacedVolume !== null">m<sup>3</sup></span> - <app-no-data *ngIf="applicationSubmission.soilAlreadyPlacedVolume === null"></app-no-data> + <app-no-data + *ngIf="applicationSubmission.soilAlreadyPlacedVolume === null" + ></app-no-data> </div> - <div><strong>Area</strong></div> + <div class="subheading2">Area</div> <div> {{ applicationSubmission.soilAlreadyRemovedArea }} <span *ngIf="applicationSubmission.soilAlreadyRemovedArea !== null">m<sup>2</sup></span> - <app-no-data *ngIf="applicationSubmission.soilAlreadyRemovedArea === null"></app-no-data> + <app-no-data + *ngIf="applicationSubmission.soilAlreadyRemovedArea === null" + ></app-no-data> </div> <div> {{ applicationSubmission.soilAlreadyPlacedArea }} <span *ngIf="applicationSubmission.soilAlreadyPlacedArea !== null">m<sup>2</sup></span> - <app-no-data *ngIf="applicationSubmission.soilAlreadyPlacedArea === null"></app-no-data> + <app-no-data + *ngIf="applicationSubmission.soilAlreadyPlacedArea === null" + ></app-no-data> </div> - <div><strong>Maximum Depth</strong></div> + <div class="subheading2">Maximum Depth</div> <div> {{ applicationSubmission.soilAlreadyRemovedMaximumDepth }} <span *ngIf="applicationSubmission.soilAlreadyRemovedMaximumDepth !== null">m</span> - <app-no-data *ngIf="applicationSubmission.soilAlreadyRemovedMaximumDepth === null"></app-no-data> + <app-no-data + *ngIf="applicationSubmission.soilAlreadyRemovedMaximumDepth === null" + ></app-no-data> </div> <div> {{ applicationSubmission.soilAlreadyPlacedMaximumDepth }} <span *ngIf="applicationSubmission.soilAlreadyPlacedMaximumDepth !== null">m</span> - <app-no-data *ngIf="applicationSubmission.soilAlreadyPlacedMaximumDepth === null"></app-no-data> + <app-no-data + *ngIf="applicationSubmission.soilAlreadyPlacedMaximumDepth === null" + ></app-no-data> </div> - <div><strong>Average Depth</strong></div> + <div class="subheading2">Average Depth</div> <div> {{ applicationSubmission.soilAlreadyRemovedAverageDepth }} <span *ngIf="applicationSubmission.soilAlreadyRemovedAverageDepth !== null">m</span> - <app-no-data *ngIf="applicationSubmission.soilAlreadyRemovedAverageDepth === null"></app-no-data> + <app-no-data + *ngIf="applicationSubmission.soilAlreadyRemovedAverageDepth === null" + ></app-no-data> </div> <div> {{ applicationSubmission.soilAlreadyPlacedAverageDepth }} <span *ngIf="applicationSubmission.soilAlreadyPlacedAverageDepth !== null">m</span> - <app-no-data *ngIf="applicationSubmission.soilAlreadyPlacedAverageDepth === null"></app-no-data> + <app-no-data + *ngIf="applicationSubmission.soilAlreadyPlacedAverageDepth === null" + ></app-no-data> </div> </div> - <div class="full-width"> - <span class="subheading1">Project Duration</span> - </div> - <div class="subheading2 grid-1">Duration</div> - <div class="grid-double"> - {{ applicationSubmission.soilProjectDurationUnit }} - <app-no-data *ngIf="!applicationSubmission.soilProjectDurationUnit"></app-no-data> - </div> - <div class="subheading2 grid-1">Length</div> - <div class="grid-double"> - {{ applicationSubmission.soilProjectDurationAmount }} - <app-no-data *ngIf="!applicationSubmission.soilProjectDurationAmount"></app-no-data> - </div> - <div class="subheading2 grid-1">Describe the type, origin and quality of fill proposed to be placed.</div> <div class="grid-double"> {{ applicationSubmission.soilFillTypeToPlace }} diff --git a/portal-frontend/src/app/features/public/application/submission/pfrs-details/pfrs-details.component.scss b/portal-frontend/src/app/features/public/application/submission/pfrs-details/pfrs-details.component.scss index 7fa4e7417f..2b1178a6be 100644 --- a/portal-frontend/src/app/features/public/application/submission/pfrs-details/pfrs-details.component.scss +++ b/portal-frontend/src/app/features/public/application/submission/pfrs-details/pfrs-details.component.scss @@ -7,8 +7,17 @@ grid-column-gap: rem(36); grid-row-gap: rem(12); + @media screen and (min-width: $tabletBreakpoint) { + grid-template-columns: 0.55fr 1fr 1fr; + } + + @media screen and (min-width: $midBreakpoint) { + grid-template-columns: 0.95fr 1fr 2fr; + grid-column-gap: rem(16); + } + .spacer-row { grid-column: 1/4; height: rem(16); } -} +} \ No newline at end of file diff --git a/portal-frontend/src/app/features/public/application/submission/pofo-details/pofo-details.component.html b/portal-frontend/src/app/features/public/application/submission/pofo-details/pofo-details.component.html index a6e929b5fe..7b416406e8 100644 --- a/portal-frontend/src/app/features/public/application/submission/pofo-details/pofo-details.component.html +++ b/portal-frontend/src/app/features/public/application/submission/pofo-details/pofo-details.component.html @@ -21,6 +21,24 @@ <app-no-data *ngIf="!applicationSubmission.purpose"></app-no-data> </div> + <div class="subheading2 grid-1">Project Duration</div> + <div class="grid-double"> + <div *ngIf="applicationSubmission.soilProjectDurationAmount && applicationSubmission.soilProjectDurationUnit"> + {{ applicationSubmission.soilProjectDurationAmount }} + <ng-container [ngPlural]="applicationSubmission.soilProjectDurationAmount"> + <ng-template ngPluralCase="=1"> + {{ applicationSubmission.soilProjectDurationUnit.slice(0, -1) | titlecase }} + </ng-template> + <ng-template ngPluralCase="other"> + {{ applicationSubmission.soilProjectDurationUnit | titlecase }} + </ng-template> + </ng-container> + </div> + <app-no-data + *ngIf="!applicationSubmission.soilProjectDurationAmount || !applicationSubmission.soilProjectDurationUnit" + ></app-no-data> + </div> + <div class="subheading1 full-width">Fill to be Placed</div> <div class="full-width soil-table"> <div class="grid-1"><strong>Volume</strong></div> @@ -76,20 +94,7 @@ <app-no-data *ngIf="applicationSubmission.soilAlreadyPlacedAverageDepth === null"></app-no-data> </div> </div> - - <div class="grid-1"></div> - <div class="subheading2 grid-double">Project Duration</div> - <div class="subheading2 grid-1">Duration</div> - <div class="grid-double"> - {{ applicationSubmission.soilProjectDurationUnit }} - <app-no-data *ngIf="!applicationSubmission.soilProjectDurationUnit"></app-no-data> - </div> - <div class="subheading2 grid-1">Length</div> - <div class="grid-double"> - {{ applicationSubmission.soilProjectDurationAmount }} - <app-no-data *ngIf="!applicationSubmission.soilProjectDurationAmount"></app-no-data> - </div> - + <div class="subheading2 grid-1"> What alternative measures have you considered or attempted before proposing to place fill? </div> diff --git a/portal-frontend/src/app/features/public/application/submission/roso-details/roso-details.component.html b/portal-frontend/src/app/features/public/application/submission/roso-details/roso-details.component.html index a044f353e7..3a1a4dfe4b 100644 --- a/portal-frontend/src/app/features/public/application/submission/roso-details/roso-details.component.html +++ b/portal-frontend/src/app/features/public/application/submission/roso-details/roso-details.component.html @@ -21,6 +21,24 @@ <app-no-data *ngIf="!applicationSubmission.purpose"></app-no-data> </div> + <div class="subheading2 grid-1">Project Duration</div> + <div class="grid-double"> + <div *ngIf="applicationSubmission.soilProjectDurationAmount && applicationSubmission.soilProjectDurationUnit"> + {{ applicationSubmission.soilProjectDurationAmount }} + <ng-container [ngPlural]="applicationSubmission.soilProjectDurationAmount"> + <ng-template ngPluralCase="=1"> + {{ applicationSubmission.soilProjectDurationUnit.slice(0, -1) | titlecase }} + </ng-template> + <ng-template ngPluralCase="other"> + {{ applicationSubmission.soilProjectDurationUnit | titlecase }} + </ng-template> + </ng-container> + </div> + <app-no-data + *ngIf="!applicationSubmission.soilProjectDurationAmount || !applicationSubmission.soilProjectDurationUnit" + ></app-no-data> + </div> + <div class="subheading1 full-width">Soil to be Removed</div> <div class="full-width soil-table"> <div class="grid-1"><strong>Volume</strong></div> @@ -76,19 +94,6 @@ </div> </div> - <div class="grid-1"></div> - <div class="subheading2 grid-double">Project Duration</div> - <div class="subheading2 grid-1">Duration</div> - <div class="grid-double"> - {{ applicationSubmission.soilProjectDurationUnit }} - <app-no-data *ngIf="!applicationSubmission.soilProjectDurationUnit"></app-no-data> - </div> - <div class="subheading2 grid-1">Length</div> - <div class="grid-double"> - {{ applicationSubmission.soilProjectDurationAmount }} - <app-no-data *ngIf="!applicationSubmission.soilProjectDurationAmount"></app-no-data> - </div> - <div class="subheading2 grid-1">Describe the type of soil proposed to be removed.</div> <div class="grid-double"> {{ applicationSubmission.soilTypeRemoved }} diff --git a/portal-frontend/src/app/features/public/notice-of-intent/submission/pfrs-details/pfrs-details.component.html b/portal-frontend/src/app/features/public/notice-of-intent/submission/pfrs-details/pfrs-details.component.html index 6694941059..5b736893b2 100644 --- a/portal-frontend/src/app/features/public/notice-of-intent/submission/pfrs-details/pfrs-details.component.html +++ b/portal-frontend/src/app/features/public/notice-of-intent/submission/pfrs-details/pfrs-details.component.html @@ -33,6 +33,24 @@ <app-no-data *ngIf="!noiSubmission.soilFillTypeToPlace"></app-no-data> </div> + <div class="subheading2 grid-1">Project Duration</div> + <div class="grid-double"> + <div *ngIf="noiSubmission.soilProjectDurationAmount && noiSubmission.soilProjectDurationUnit"> + {{ noiSubmission.soilProjectDurationAmount }} + <ng-container [ngPlural]="noiSubmission.soilProjectDurationAmount"> + <ng-template ngPluralCase="=1"> + {{ noiSubmission.soilProjectDurationUnit.slice(0, -1) | titlecase }} + </ng-template> + <ng-template ngPluralCase="other"> + {{ noiSubmission.soilProjectDurationUnit | titlecase }} + </ng-template> + </ng-container> + </div> + <app-no-data + *ngIf="!noiSubmission.soilProjectDurationAmount || !noiSubmission.soilProjectDurationUnit" + ></app-no-data> + </div> + <div *ngIf="noiSubmission" class="full-width soil-table"> <div></div> <div> @@ -149,20 +167,6 @@ </div> </div> - <div class="full-width"> - <h4>Project Duration</h4> - </div> - <div class="subheading2 grid-1">Duration</div> - <div class="grid-double"> - {{ noiSubmission.soilProjectDurationUnit }} - <app-no-data *ngIf="!noiSubmission.soilProjectDurationUnit"></app-no-data> - </div> - <div class="subheading2 grid-1">Length</div> - <div class="grid-double"> - {{ noiSubmission.soilProjectDurationAmount }} - <app-no-data *ngIf="!noiSubmission.soilProjectDurationAmount"></app-no-data> - </div> - <div class="subheading2 grid-1">Proposal Map / Site Plan</div> <div class="grid-double"> <a *ngFor="let map of proposalMap" (click)="openFile(map.uuid)"> diff --git a/portal-frontend/src/app/features/public/notice-of-intent/submission/pofo-details/pofo-details.component.html b/portal-frontend/src/app/features/public/notice-of-intent/submission/pofo-details/pofo-details.component.html index 491d13b233..9cec4e175a 100644 --- a/portal-frontend/src/app/features/public/notice-of-intent/submission/pofo-details/pofo-details.component.html +++ b/portal-frontend/src/app/features/public/notice-of-intent/submission/pofo-details/pofo-details.component.html @@ -27,6 +27,24 @@ <app-no-data *ngIf="!noiSubmission.soilFillTypeToPlace"></app-no-data> </div> + <div class="subheading2 grid-1">Project Duration</div> + <div class="grid-double"> + <div *ngIf="noiSubmission.soilProjectDurationAmount && noiSubmission.soilProjectDurationUnit"> + {{ noiSubmission.soilProjectDurationAmount }} + <ng-container [ngPlural]="noiSubmission.soilProjectDurationAmount"> + <ng-template ngPluralCase="=1"> + {{ noiSubmission.soilProjectDurationUnit.slice(0, -1) | titlecase }} + </ng-template> + <ng-template ngPluralCase="other"> + {{ noiSubmission.soilProjectDurationUnit | titlecase }} + </ng-template> + </ng-container> + </div> + <app-no-data + *ngIf="!noiSubmission.soilProjectDurationAmount || !noiSubmission.soilProjectDurationUnit" + ></app-no-data> + </div> + <div class="grid-1"></div> <div class="grid-double"> <strong> Fill to be Placed</strong> @@ -84,19 +102,6 @@ <app-no-data *ngIf="noiSubmission.soilAlreadyPlacedAverageDepth === null"></app-no-data> </div> - <div class="grid-1"></div> - <div class="subheading2 grid-double">Project Duration</div> - <div class="subheading2 grid-1">Duration</div> - <div class="grid-double"> - {{ noiSubmission.soilProjectDurationUnit }} - <app-no-data *ngIf="!noiSubmission.soilProjectDurationUnit"></app-no-data> - </div> - <div class="subheading2 grid-1">Length</div> - <div class="grid-double"> - {{ noiSubmission.soilProjectDurationAmount }} - <app-no-data *ngIf="!noiSubmission.soilProjectDurationAmount"></app-no-data> - </div> - <div class="subheading2 grid-1">Proposal Map / Site Plan</div> <div class="grid-double"> <a *ngFor="let map of proposalMap" (click)="openFile(map.uuid)"> diff --git a/portal-frontend/src/app/features/public/notice-of-intent/submission/roso-details/roso-details.component.html b/portal-frontend/src/app/features/public/notice-of-intent/submission/roso-details/roso-details.component.html index 9ff67519af..17854e2c9d 100644 --- a/portal-frontend/src/app/features/public/notice-of-intent/submission/roso-details/roso-details.component.html +++ b/portal-frontend/src/app/features/public/notice-of-intent/submission/roso-details/roso-details.component.html @@ -27,6 +27,24 @@ <app-no-data *ngIf="!noiSubmission.soilTypeRemoved"></app-no-data> </div> + <div class="subheading2 grid-1">Project Duration</div> + <div class="grid-double"> + <div *ngIf="noiSubmission.soilProjectDurationAmount && noiSubmission.soilProjectDurationUnit"> + {{ noiSubmission.soilProjectDurationAmount }} + <ng-container [ngPlural]="noiSubmission.soilProjectDurationAmount"> + <ng-template ngPluralCase="=1"> + {{ noiSubmission.soilProjectDurationUnit.slice(0, -1) | titlecase }} + </ng-template> + <ng-template ngPluralCase="other"> + {{ noiSubmission.soilProjectDurationUnit | titlecase }} + </ng-template> + </ng-container> + </div> + <app-no-data + *ngIf="!noiSubmission.soilProjectDurationAmount || !noiSubmission.soilProjectDurationUnit" + ></app-no-data> + </div> + <div class="grid-1"></div> <div class="grid-2"> <strong>Soil to be Removed</strong> @@ -84,19 +102,6 @@ <app-no-data *ngIf="noiSubmission.soilAlreadyRemovedAverageDepth === null"></app-no-data> </div> - <div class="grid-1"></div> - <div class="subheading2 grid-double">Project Duration</div> - <div class="subheading2 grid-1">Duration</div> - <div class="grid-double"> - {{ noiSubmission.soilProjectDurationUnit }} - <app-no-data *ngIf="!noiSubmission.soilProjectDurationUnit"></app-no-data> - </div> - <div class="subheading2 grid-1">Length</div> - <div class="grid-double"> - {{ noiSubmission.soilProjectDurationAmount }} - <app-no-data *ngIf="!noiSubmission.soilProjectDurationAmount"></app-no-data> - </div> - <div class="subheading2 grid-1">Proposal Map / Site Plan</div> <div class="grid-double"> <a *ngFor="let map of proposalMap" (click)="openFile(map.uuid)"> From bf9e3887d5046ee876a52203b5f8277e6a78d172 Mon Sep 17 00:00:00 2001 From: "to. sandra" <76515860+sandratoh@users.noreply.github.com> Date: Wed, 15 Nov 2023 09:36:09 -0800 Subject: [PATCH 638/954] Add inline chair outcome and update fields in decision v2 (#1156) * Add inline selector for chair review outcome * Change nfu and pfrs use end date to optional --- .../nfup/nfup.component.html | 12 ++--- .../decision-component.component.ts | 8 +-- .../decision-components.component.ts | 7 ++- .../decision-v2/decision-v2.component.html | 6 ++- .../decision-v2/decision-v2.component.ts | 10 +++- ...inline-chair-review-outcome.component.html | 28 +++++++++++ ...inline-chair-review-outcome.component.scss | 46 +++++++++++++++++ ...ine-chair-review-outcome.component.spec.ts | 25 ++++++++++ .../inline-chair-review-outcome.component.ts | 49 +++++++++++++++++++ alcs-frontend/src/app/shared/shared.module.ts | 3 ++ 10 files changed, 177 insertions(+), 17 deletions(-) create mode 100644 alcs-frontend/src/app/shared/inline-editors/inline-chair-review-outcome/inline-chair-review-outcome.component.html create mode 100644 alcs-frontend/src/app/shared/inline-editors/inline-chair-review-outcome/inline-chair-review-outcome.component.scss create mode 100644 alcs-frontend/src/app/shared/inline-editors/inline-chair-review-outcome/inline-chair-review-outcome.component.spec.ts create mode 100644 alcs-frontend/src/app/shared/inline-editors/inline-chair-review-outcome/inline-chair-review-outcome.component.ts diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/nfup/nfup.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/nfup/nfup.component.html index b689abbefd..16ccee771d 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/nfup/nfup.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/nfup/nfup.component.html @@ -1,16 +1,16 @@ <ng-content></ng-content> <div> - <div class='subheading2'>Non-Farm Use Type</div> + <div class="subheading2">Non-Farm Use Type</div> {{ component.nfuType }} - <app-no-data *ngIf='component.nfuType === null || component.nfuType === undefined'></app-no-data> + <app-no-data *ngIf="component.nfuType === null || component.nfuType === undefined"></app-no-data> </div> <div> - <div class='subheading2'>Non-Farm Use Sub-Type</div> + <div class="subheading2">Non-Farm Use Sub-Type</div> {{ component.nfuSubType }} - <app-no-data *ngIf='component.nfuSubType === null || component.nfuSubType === undefined'></app-no-data> + <app-no-data *ngIf="component.nfuSubType === null || component.nfuSubType === undefined"></app-no-data> </div> <div> - <div class='subheading2'>Use End Date</div> + <div class="subheading2">Use End Date</div> {{ component.endDate | date }} - <app-no-data *ngIf='component.endDate === null || component.endDate === undefined'></app-no-data> + <app-no-data *ngIf="component.endDate === null || component.endDate === undefined"></app-no-data> </div> diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.ts index fafb72f034..0c4463001c 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.ts @@ -40,7 +40,7 @@ export class DecisionComponentComponent implements OnInit { // nfu nfuType = new FormControl<string | null>(null, [Validators.required]); nfuSubType = new FormControl<string | null>(null, [Validators.required]); - endDate = new FormControl<Date | null>(null, [Validators.required]); + endDate = new FormControl<Date | null>(null); // turp & cove expiryDate = new FormControl<Date | null>(null); @@ -53,7 +53,7 @@ export class DecisionComponentComponent implements OnInit { averageDepthToPlace = new FormControl<number | null>(null, [Validators.required]); //pfrs - endDate2 = new FormControl<Date | null>(null, [Validators.required]); + endDate2 = new FormControl<Date | null>(null); // roso, pfrs soilTypeRemoved = new FormControl<string | null>(null, [Validators.required]); @@ -151,7 +151,7 @@ export class DecisionComponentComponent implements OnInit { agCapConsultant: this.agCapConsultant.value ? this.agCapConsultant.value : null, applicationDecisionComponentTypeCode: this.data.applicationDecisionComponentTypeCode, applicationDecisionComponentType: this.codes.decisionComponentTypes.find( - (e) => e.code === this.data.applicationDecisionComponentTypeCode + (e) => e.code === this.data.applicationDecisionComponentTypeCode, )!, applicationDecisionUuid: this.data.uuid, uuid: this.data.uuid, @@ -349,7 +349,7 @@ export class DecisionComponentComponent implements OnInit { } private getSubdDataChange(): SubdDecisionComponentDto { - const update = this.subdApprovedLots.value?.map((e) => ({ ...e } as ProposedDecisionLotDto)); + const update = this.subdApprovedLots.value?.map((e) => ({ ...e }) as ProposedDecisionLotDto); return { lots: update ?? undefined, }; diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-components.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-components.component.ts index 356ce27b9c..906e2910f0 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-components.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-components.component.ts @@ -51,7 +51,7 @@ export class DecisionComponentsComponent implements OnInit, OnDestroy, AfterView private toastService: ToastService, private applicationDetailService: ApplicationDetailService, private submissionService: ApplicationSubmissionService, - private confirmationDialogService: ConfirmationDialogService + private confirmationDialogService: ConfirmationDialogService, ) {} ngOnInit(): void { @@ -81,7 +81,6 @@ export class DecisionComponentsComponent implements OnInit, OnDestroy, AfterView } onAddNewComponent(uiCode: string, typeCode: string) { - debugger; switch (uiCode) { case 'COPY': const component: ApplicationDecisionComponentDto = { @@ -94,7 +93,7 @@ export class DecisionComponentsComponent implements OnInit, OnDestroy, AfterView agCapMap: this.application.agCapMap, agCapConsultant: this.application.agCapConsultant, applicationDecisionComponentType: this.decisionComponentTypes.find( - (e) => e.code === typeCode && e.uiCode !== 'COPY' + (e) => e.code === typeCode && e.uiCode !== 'COPY', ), lots: this.application.submittedApplication?.subdProposedLots.map((lot, index) => ({ ...lot, @@ -152,7 +151,7 @@ export class DecisionComponentsComponent implements OnInit, OnDestroy, AfterView this.components.unshift({ applicationDecisionComponentTypeCode: typeCode, applicationDecisionComponentType: this.decisionComponentTypes.find( - (e) => e.code === typeCode && e.uiCode !== 'COPY' + (e) => e.code === typeCode && e.uiCode !== 'COPY', ), } as ApplicationDecisionComponentDto); break; diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.html index 53f8bcf3d5..beb0537564 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.html @@ -340,8 +340,10 @@ <h4>Audit and Chair Review</h4> </div> <div *ngIf="decision.chairReviewRequired"> <div class="subheading2">Chair Review Outcome</div> - <span *ngIf="decision.chairReviewOutcome !== null">{{ decision.chairReviewOutcome.label }}</span> - <app-no-data *ngIf="decision.chairReviewOutcome === null"></app-no-data> + <app-inline-chair-review-outcome + [selectedValue]="decision.chairReviewOutcome?.code" + (save)="onSaveChairReviewOutcome(decision.uuid, $event)" + ></app-inline-chair-review-outcome> </div> </div> </section> diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.ts index 0f5edc40c8..8b06ca2309 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.ts @@ -63,7 +63,7 @@ export class DecisionV2Component implements OnInit, OnDestroy { private applicationDecisionComponentService: ApplicationDecisionComponentService, private router: Router, private activatedRouter: ActivatedRoute, - private elementRef: ElementRef + private elementRef: ElementRef, ) {} ngOnInit(): void { @@ -185,6 +185,14 @@ export class DecisionV2Component implements OnInit, OnDestroy { await this.loadDecisions(this.fileNumber); } + async onSaveChairReviewOutcome(decisionUuid: string, chairReviewOutcomeCode: string) { + await this.decisionService.update(decisionUuid, { + chairReviewOutcomeCode, + isDraft: this.decisions.find((e) => e.uuid === decisionUuid)?.isDraft, + }); + await this.loadDecisions(this.fileNumber); + } + async onSaveAuditDate(decisionUuid: string, auditReviewDate: number) { await this.decisionService.update(decisionUuid, { auditDate: formatDateForApi(auditReviewDate), diff --git a/alcs-frontend/src/app/shared/inline-editors/inline-chair-review-outcome/inline-chair-review-outcome.component.html b/alcs-frontend/src/app/shared/inline-editors/inline-chair-review-outcome/inline-chair-review-outcome.component.html new file mode 100644 index 0000000000..5433ebdb09 --- /dev/null +++ b/alcs-frontend/src/app/shared/inline-editors/inline-chair-review-outcome/inline-chair-review-outcome.component.html @@ -0,0 +1,28 @@ +<div class="inline-number-wrapper"> + <span class="left" *ngIf="!isEditing"> + <a (click)="toggleEdit()" class="add" *ngIf="!selectedValue"> Select Outcome </a> + <span> + {{ formattedAnswer }} + </span> + <button *ngIf="selectedValue" class="edit-button" mat-icon-button (click)="startEdit()"> + <mat-icon class="edit-icon">edit</mat-icon> + </button> + </span> + <div + class="editing" + [ngClass]="{ + hidden: !isEditing + }" + > + <form [formGroup]="form"> + <mat-button-toggle-group id="chairReviewOutcome" formControlName="chairReviewOutcome" name="chairReviewOutcome"> + <mat-button-toggle value="REC">Reconsider</mat-button-toggle> + <mat-button-toggle value="STAY">Stay</mat-button-toggle> + </mat-button-toggle-group> + </form> + <div class="button-container"> + <button mat-button (click)="toggleEdit()">CANCEL</button> + <button mat-button class="save" (click)="onSave()">SAVE</button> + </div> + </div> +</div> diff --git a/alcs-frontend/src/app/shared/inline-editors/inline-chair-review-outcome/inline-chair-review-outcome.component.scss b/alcs-frontend/src/app/shared/inline-editors/inline-chair-review-outcome/inline-chair-review-outcome.component.scss new file mode 100644 index 0000000000..57efeeb7b7 --- /dev/null +++ b/alcs-frontend/src/app/shared/inline-editors/inline-chair-review-outcome/inline-chair-review-outcome.component.scss @@ -0,0 +1,46 @@ +@use '../../../../styles/colors'; + +.inline-number-wrapper { + padding-top: 4px; +} + +.editing.hidden { + display: none; +} + +.button-container { + button:not(:last-child) { + margin-right: 2px !important; + } + + .save { + color: colors.$primary-color; + } +} + +.edit-button { + height: 24px; + width: 24px; + display: flex; + align-items: center; +} + +.edit-icon { + font-size: inherit; + line-height: 22px; +} + +:host::ng-deep { + .mat-form-field-wrapper { + padding: 0 !important; + margin: 0 !important; + } + + button mat-icon { + overflow: visible; + } + + .mat-mdc-icon-button.mat-mdc-button-base { + padding: 0 !important; + } +} diff --git a/alcs-frontend/src/app/shared/inline-editors/inline-chair-review-outcome/inline-chair-review-outcome.component.spec.ts b/alcs-frontend/src/app/shared/inline-editors/inline-chair-review-outcome/inline-chair-review-outcome.component.spec.ts new file mode 100644 index 0000000000..4bb6650674 --- /dev/null +++ b/alcs-frontend/src/app/shared/inline-editors/inline-chair-review-outcome/inline-chair-review-outcome.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { FormsModule, ReactiveFormsModule } from '@angular/forms'; +import { MatButtonToggleModule } from '@angular/material/button-toggle'; +import { SharedModule } from '../../shared.module'; +import { InlineChairReviewOutcomeComponent } from './inline-chair-review-outcome.component'; + +describe('InlineChairReviewOutcomeComponent', () => { + let component: InlineChairReviewOutcomeComponent; + let fixture: ComponentFixture<InlineChairReviewOutcomeComponent>; + + beforeEach(() => { + TestBed.configureTestingModule({ + imports: [SharedModule, FormsModule, ReactiveFormsModule, MatButtonToggleModule], + declarations: [InlineChairReviewOutcomeComponent], + providers: [], + }); + fixture = TestBed.createComponent(InlineChairReviewOutcomeComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/alcs-frontend/src/app/shared/inline-editors/inline-chair-review-outcome/inline-chair-review-outcome.component.ts b/alcs-frontend/src/app/shared/inline-editors/inline-chair-review-outcome/inline-chair-review-outcome.component.ts new file mode 100644 index 0000000000..295cf9a7e0 --- /dev/null +++ b/alcs-frontend/src/app/shared/inline-editors/inline-chair-review-outcome/inline-chair-review-outcome.component.ts @@ -0,0 +1,49 @@ +import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; +import { FormBuilder, FormGroup } from '@angular/forms'; + +@Component({ + selector: 'app-inline-chair-review-outcome', + templateUrl: './inline-chair-review-outcome.component.html', + styleUrls: ['./inline-chair-review-outcome.component.scss'] +}) +export class InlineChairReviewOutcomeComponent implements OnInit { + @Input() selectedValue?: string | null; + + @Output() save = new EventEmitter<string>(); + + form!: FormGroup; + isEditing = false; + pendingChairReviewOutcome?: string | null; + formattedAnswer = ''; + + constructor(private fb: FormBuilder) { + this.pendingChairReviewOutcome = this.selectedValue; + } + + ngOnInit(): void { + if(this.selectedValue !== null) { + this.formattedAnswer = this.selectedValue === 'REC' ? 'Reconsider' : 'Stay'; + } + this.form = this.fb.group({ + chairReviewOutcome: this.selectedValue, + }); + + } + + startEdit() { + this.isEditing = true; + this.pendingChairReviewOutcome = this.selectedValue; + } + + toggleEdit() { + this.isEditing = !this.isEditing; + this.form = this.fb.group({ + chairReviewOutcome: this.selectedValue, + }); + } + + onSave() { + this.save.emit(this.form.get('chairReviewOutcome')!.value); + this.isEditing = false; + } +} diff --git a/alcs-frontend/src/app/shared/shared.module.ts b/alcs-frontend/src/app/shared/shared.module.ts index 098804ec82..7797fe503f 100644 --- a/alcs-frontend/src/app/shared/shared.module.ts +++ b/alcs-frontend/src/app/shared/shared.module.ts @@ -43,6 +43,7 @@ import { ErrorMessageComponent } from './error-message/error-message.component'; import { FavoriteButtonComponent } from './favorite-button/favorite-button.component'; import { InlineApplicantTypeComponent } from './inline-applicant-type/inline-applicant-type.component'; import { InlineBooleanComponent } from './inline-editors/inline-boolean/inline-boolean.component'; +import { InlineChairReviewOutcomeComponent } from './inline-editors/inline-chair-review-outcome/inline-chair-review-outcome.component'; import { InlineDatepickerComponent } from './inline-editors/inline-datepicker/inline-datepicker.component'; import { InlineDropdownComponent } from './inline-editors/inline-dropdown/inline-dropdown.component'; import { InlineNgSelectComponent } from './inline-editors/inline-ng-select/inline-ng-select.component'; @@ -106,6 +107,7 @@ import { WarningBannerComponent } from './warning-banner/warning-banner.componen InlineNgSelectComponent, ApplicationLegacyIdComponent, TableColumnNoDataPipe, + InlineChairReviewOutcomeComponent, ], imports: [ CommonModule, @@ -199,6 +201,7 @@ import { WarningBannerComponent } from './warning-banner/warning-banner.componen LotsTableFormComponent, ApplicationLegacyIdComponent, TableColumnNoDataPipe, + InlineChairReviewOutcomeComponent ], }) export class SharedModule { From 62302e981699809c67a5a81d529e5a8cbcf7d4ce Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Wed, 15 Nov 2023 10:34:28 -0800 Subject: [PATCH 639/954] fixes --- .../pofo-details/pofo-details.component.html | 105 +++++++++--------- .../roso-details/roso-details.component.html | 104 ++++++++--------- .../pfrs-details/pfrs-details.component.scss | 11 ++ 3 files changed, 117 insertions(+), 103 deletions(-) diff --git a/portal-frontend/src/app/features/public/application/submission/pofo-details/pofo-details.component.html b/portal-frontend/src/app/features/public/application/submission/pofo-details/pofo-details.component.html index 7b416406e8..114496661d 100644 --- a/portal-frontend/src/app/features/public/application/submission/pofo-details/pofo-details.component.html +++ b/portal-frontend/src/app/features/public/application/submission/pofo-details/pofo-details.component.html @@ -39,60 +39,61 @@ ></app-no-data> </div> - <div class="subheading1 full-width">Fill to be Placed</div> - <div class="full-width soil-table"> - <div class="grid-1"><strong>Volume</strong></div> - <div class="grid-2"> - {{ applicationSubmission.soilToPlaceVolume }} - <span *ngIf="applicationSubmission.soilToPlaceVolume">m<sup>3</sup></span> - <app-no-data *ngIf="!applicationSubmission.soilToPlaceVolume"></app-no-data> - </div> - <div class="grid-1"><strong>Area</strong></div> - <div class="grid-2"> - {{ applicationSubmission.soilToPlaceArea }} - <span *ngIf="applicationSubmission.soilToPlaceArea">m<sup>2</sup></span> - <app-no-data *ngIf="!applicationSubmission.soilToPlaceArea"></app-no-data> - </div> - <div class="grid-1"><strong>Maximum Depth</strong></div> - <div class="grid-2"> - {{ applicationSubmission.soilToPlaceMaximumDepth }} - <span *ngIf="applicationSubmission.soilToPlaceMaximumDepth">m</span> - <app-no-data *ngIf="!applicationSubmission.soilToPlaceMaximumDepth"></app-no-data> - </div> - <div class="grid-1"><strong>Average Depth</strong></div> - <div class="grid-2"> - {{ applicationSubmission.soilToPlaceAverageDepth }} - <span *ngIf="applicationSubmission.soilToPlaceAverageDepth">m</span> - <app-no-data *ngIf="!applicationSubmission.soilToPlaceAverageDepth"></app-no-data> - </div> + <div class="grid-1"></div> + <div class="grid-double"> + <strong> Fill to be Placed</strong> + </div> + <div class="grid-1"><strong>Volume</strong></div> + <div class="grid-double"> + {{ applicationSubmission.soilToPlaceVolume }} + <span *ngIf="applicationSubmission.soilToPlaceVolume">m<sup>3</sup></span> + <app-no-data *ngIf="!applicationSubmission.soilToPlaceVolume"></app-no-data> + </div> + <div class="grid-1"><strong>Area</strong></div> + <div class="grid-double"> + {{ applicationSubmission.soilToPlaceArea }} <span *ngIf="applicationSubmission.soilToPlaceArea">m<sup>2</sup></span> + <app-no-data *ngIf="!applicationSubmission.soilToPlaceArea"></app-no-data> + </div> + <div class="grid-1"><strong>Maximum Depth</strong></div> + <div class="grid-double"> + {{ applicationSubmission.soilToPlaceMaximumDepth }} + <span *ngIf="applicationSubmission.soilToPlaceMaximumDepth">m</span> + <app-no-data *ngIf="!applicationSubmission.soilToPlaceMaximumDepth"></app-no-data> + </div> + <div class="grid-1"><strong>Average Depth</strong></div> + <div class="grid-double"> + {{ applicationSubmission.soilToPlaceAverageDepth }} + <span *ngIf="applicationSubmission.soilToPlaceAverageDepth">m</span> + <app-no-data *ngIf="!applicationSubmission.soilToPlaceAverageDepth"></app-no-data> </div> - <div class="subheading1 full-width">Fill already Placed</div> - <div class="full-width soil-table"> - <div class="grid-1"><strong>Volume</strong></div> - <div class="grid-2"> - {{ applicationSubmission.soilAlreadyPlacedVolume }} - <span *ngIf="applicationSubmission.soilAlreadyPlacedVolume !== null">m<sup>3</sup></span> - <app-no-data *ngIf="applicationSubmission.soilAlreadyPlacedVolume === null"></app-no-data> - </div> - <div class="grid-1"><strong>Area</strong></div> - <div class="grid-2"> - {{ applicationSubmission.soilAlreadyPlacedArea }} - <span *ngIf="applicationSubmission.soilAlreadyPlacedArea !== null">m<sup>2</sup></span> - <app-no-data *ngIf="applicationSubmission.soilAlreadyPlacedArea === null"></app-no-data> - </div> - <div class="grid-1"><strong>Maximum Depth</strong></div> - <div class="grid-2"> - {{ applicationSubmission.soilAlreadyPlacedMaximumDepth }} - <span *ngIf="applicationSubmission.soilAlreadyPlacedMaximumDepth !== null">m</span> - <app-no-data *ngIf="applicationSubmission.soilAlreadyPlacedMaximumDepth === null"></app-no-data> - </div> - <div class="grid-1"><strong>Average Depth</strong></div> - <div class="grid-2"> - {{ applicationSubmission.soilAlreadyPlacedAverageDepth }} - <span *ngIf="applicationSubmission.soilAlreadyPlacedAverageDepth !== null">m</span> - <app-no-data *ngIf="applicationSubmission.soilAlreadyPlacedAverageDepth === null"></app-no-data> - </div> + <div class="grid-1"></div> + <div class="grid-double"> + <strong> Fill already Placed</strong> + </div> + <div class="grid-1"><strong>Volume</strong></div> + <div class="grid-double"> + {{ applicationSubmission.soilAlreadyPlacedVolume }} + <span *ngIf="applicationSubmission.soilAlreadyPlacedVolume !== null">m<sup>3</sup></span> + <app-no-data *ngIf="applicationSubmission.soilAlreadyPlacedVolume === null"></app-no-data> + </div> + <div class="grid-1"><strong>Area</strong></div> + <div class="grid-double"> + {{ applicationSubmission.soilAlreadyPlacedArea }} + <span *ngIf="applicationSubmission.soilAlreadyPlacedArea !== null">m<sup>2</sup></span> + <app-no-data *ngIf="applicationSubmission.soilAlreadyPlacedArea === null"></app-no-data> + </div> + <div class="grid-1"><strong>Maximum Depth</strong></div> + <div class="grid-double"> + {{ applicationSubmission.soilAlreadyPlacedMaximumDepth }} + <span *ngIf="applicationSubmission.soilAlreadyPlacedMaximumDepth !== null">m</span> + <app-no-data *ngIf="applicationSubmission.soilAlreadyPlacedMaximumDepth === null"></app-no-data> + </div> + <div class="grid-1"><strong>Average Depth</strong></div> + <div class="grid-double"> + {{ applicationSubmission.soilAlreadyPlacedAverageDepth }} + <span *ngIf="applicationSubmission.soilAlreadyPlacedAverageDepth !== null">m</span> + <app-no-data *ngIf="applicationSubmission.soilAlreadyPlacedAverageDepth === null"></app-no-data> </div> <div class="subheading2 grid-1"> diff --git a/portal-frontend/src/app/features/public/application/submission/roso-details/roso-details.component.html b/portal-frontend/src/app/features/public/application/submission/roso-details/roso-details.component.html index 3a1a4dfe4b..4fd364489f 100644 --- a/portal-frontend/src/app/features/public/application/submission/roso-details/roso-details.component.html +++ b/portal-frontend/src/app/features/public/application/submission/roso-details/roso-details.component.html @@ -39,59 +39,61 @@ ></app-no-data> </div> - <div class="subheading1 full-width">Soil to be Removed</div> - <div class="full-width soil-table"> - <div class="grid-1"><strong>Volume</strong></div> - <div class="grid-2"> - {{ applicationSubmission.soilToRemoveVolume }} - <span *ngIf="applicationSubmission.soilToRemoveVolume">m<sup>3</sup></span> - <app-no-data *ngIf="!applicationSubmission.soilToRemoveVolume"></app-no-data> - </div> - <div class="grid-1"><strong>Area</strong></div> - <div class="grid-2"> - {{ applicationSubmission.soilToRemoveArea }} <span *ngIf="applicationSubmission.soilToRemoveArea">ha</span> - <app-no-data *ngIf="!applicationSubmission.soilToRemoveArea"></app-no-data> - </div> - <div class="grid-1"><strong>Maximum Depth</strong></div> - <div class="grid-2"> - {{ applicationSubmission.soilToRemoveMaximumDepth }} - <span *ngIf="applicationSubmission.soilToRemoveMaximumDepth">m</span> - <app-no-data *ngIf="!applicationSubmission.soilToRemoveMaximumDepth"></app-no-data> - </div> - <div class="grid-1"><strong>Average Depth</strong></div> - <div class="grid-2"> - {{ applicationSubmission.soilToRemoveAverageDepth }} - <span *ngIf="applicationSubmission.soilToRemoveAverageDepth">m</span> - <app-no-data *ngIf="!applicationSubmission.soilToRemoveAverageDepth"></app-no-data> - </div> + <div class="grid-1"></div> + <div class="grid-2"> + <strong>Soil to be Removed</strong> + </div> + <div class="grid-1"><strong>Volume</strong></div> + <div class="grid-2"> + {{ applicationSubmission.soilToRemoveVolume }} + <span *ngIf="applicationSubmission.soilToRemoveVolume">m<sup>3</sup></span> + <app-no-data *ngIf="!applicationSubmission.soilToRemoveVolume"></app-no-data> + </div> + <div class="grid-1"><strong>Area</strong></div> + <div class="grid-2"> + {{ applicationSubmission.soilToRemoveArea }} <span *ngIf="applicationSubmission.soilToRemoveArea">ha</span> + <app-no-data *ngIf="!applicationSubmission.soilToRemoveArea"></app-no-data> + </div> + <div class="grid-1"><strong>Maximum Depth</strong></div> + <div class="grid-2"> + {{ applicationSubmission.soilToRemoveMaximumDepth }} + <span *ngIf="applicationSubmission.soilToRemoveMaximumDepth">m</span> + <app-no-data *ngIf="!applicationSubmission.soilToRemoveMaximumDepth"></app-no-data> + </div> + <div class="grid-1"><strong>Average Depth</strong></div> + <div class="grid-2"> + {{ applicationSubmission.soilToRemoveAverageDepth }} + <span *ngIf="applicationSubmission.soilToRemoveAverageDepth">m</span> + <app-no-data *ngIf="!applicationSubmission.soilToRemoveAverageDepth"></app-no-data> </div> - <div class="subheading1 full-width">Soil already Removed</div> - <div class="full-width soil-table"> - <div class="grid-1"><strong>Volume</strong></div> - <div class="grid-2"> - {{ applicationSubmission.soilAlreadyRemovedVolume }} - <span *ngIf="applicationSubmission.soilAlreadyRemovedVolume !== null">m<sup>3</sup></span> - <app-no-data *ngIf="applicationSubmission.soilAlreadyRemovedVolume === null"></app-no-data> - </div> - <div class="grid-1"><strong>Area</strong></div> - <div class="grid-2"> - {{ applicationSubmission.soilAlreadyRemovedArea }} - <span *ngIf="applicationSubmission.soilAlreadyRemovedArea !== null">ha</span> - <app-no-data *ngIf="applicationSubmission.soilAlreadyRemovedArea === null"></app-no-data> - </div> - <div class="grid-1"><strong>Maximum Depth</strong></div> - <div class="grid-2"> - {{ applicationSubmission.soilAlreadyRemovedMaximumDepth }} - <span *ngIf="applicationSubmission.soilAlreadyRemovedMaximumDepth !== null">m</span> - <app-no-data *ngIf="applicationSubmission.soilAlreadyRemovedMaximumDepth === null"></app-no-data> - </div> - <div class="grid-1"><strong>Average Depth</strong></div> - <div class="grid-2"> - {{ applicationSubmission.soilAlreadyRemovedAverageDepth }} - <span *ngIf="applicationSubmission.soilAlreadyRemovedAverageDepth !== null">m</span> - <app-no-data *ngIf="applicationSubmission.soilAlreadyRemovedAverageDepth === null"></app-no-data> - </div> + <div class="grid-1"></div> + <div class="grid-2"> + <strong>Soil already Removed</strong> + </div> + <div class="grid-1"><strong>Volume</strong></div> + <div class="grid-2"> + {{ applicationSubmission.soilAlreadyRemovedVolume }} + <span *ngIf="applicationSubmission.soilAlreadyRemovedVolume !== null">m<sup>3</sup></span> + <app-no-data *ngIf="applicationSubmission.soilAlreadyRemovedVolume === null"></app-no-data> + </div> + <div class="grid-1"><strong>Area</strong></div> + <div class="grid-2"> + {{ applicationSubmission.soilAlreadyRemovedArea }} + <span *ngIf="applicationSubmission.soilAlreadyRemovedArea !== null">ha</span> + <app-no-data *ngIf="applicationSubmission.soilAlreadyRemovedArea === null"></app-no-data> + </div> + <div class="grid-1"><strong>Maximum Depth</strong></div> + <div class="grid-2"> + {{ applicationSubmission.soilAlreadyRemovedMaximumDepth }} + <span *ngIf="applicationSubmission.soilAlreadyRemovedMaximumDepth !== null">m</span> + <app-no-data *ngIf="applicationSubmission.soilAlreadyRemovedMaximumDepth === null"></app-no-data> + </div> + <div class="grid-1"><strong>Average Depth</strong></div> + <div class="grid-2"> + {{ applicationSubmission.soilAlreadyRemovedAverageDepth }} + <span *ngIf="applicationSubmission.soilAlreadyRemovedAverageDepth !== null">m</span> + <app-no-data *ngIf="applicationSubmission.soilAlreadyRemovedAverageDepth === null"></app-no-data> </div> <div class="subheading2 grid-1">Describe the type of soil proposed to be removed.</div> diff --git a/portal-frontend/src/app/features/public/notice-of-intent/submission/pfrs-details/pfrs-details.component.scss b/portal-frontend/src/app/features/public/notice-of-intent/submission/pfrs-details/pfrs-details.component.scss index 5458025bf8..4654c9069c 100644 --- a/portal-frontend/src/app/features/public/notice-of-intent/submission/pfrs-details/pfrs-details.component.scss +++ b/portal-frontend/src/app/features/public/notice-of-intent/submission/pfrs-details/pfrs-details.component.scss @@ -1,3 +1,5 @@ +@use '../../../../../../styles/functions' as *; + .soil-table { display: grid; grid-template-columns: max-content max-content max-content; @@ -6,6 +8,15 @@ grid-column-gap: rem(36); grid-row-gap: rem(12); + @media screen and (min-width: $tabletBreakpoint) { + grid-template-columns: 0.55fr 1fr 1fr; + } + + @media screen and (min-width: $midBreakpoint) { + grid-template-columns: 0.95fr 1fr 2fr; + grid-column-gap: rem(16); + } + .spacer-row { grid-column: 1/4; height: rem(16); From f8527cce211f5826030a8bdb1423eb4316ee5f93 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Wed, 15 Nov 2023 12:50:59 -0800 Subject: [PATCH 640/954] Remove old migrations and add new to recreate serach views * Fix bug with alrArea having wrong precision --- .../alcs/application/application.entity.ts | 2 +- ...1699394945369-add_outcome_public_search.ts | 51 ----------- ...461885734-add_outcome_public_search_noi.ts | 16 ---- .../1700081096766-add_outcome_to_public.ts | 87 +++++++++++++++++++ 4 files changed, 88 insertions(+), 68 deletions(-) delete mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1699394945369-add_outcome_public_search.ts delete mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1699461885734-add_outcome_public_search_noi.ts create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1700081096766-add_outcome_to_public.ts diff --git a/services/apps/alcs/src/alcs/application/application.entity.ts b/services/apps/alcs/src/alcs/application/application.entity.ts index fefc600490..6470847100 100644 --- a/services/apps/alcs/src/alcs/application/application.entity.ts +++ b/services/apps/alcs/src/alcs/application/application.entity.ts @@ -162,7 +162,7 @@ export class Application extends Base { @Column({ type: 'decimal', nullable: true, - precision: 12, + precision: 15, scale: 5, transformer: new ColumnNumericTransformer(), comment: 'Area in hectares of ALR impacted by the proposal', diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1699394945369-add_outcome_public_search.ts b/services/apps/alcs/src/providers/typeorm/migrations/1699394945369-add_outcome_public_search.ts deleted file mode 100644 index 7fb815b9cc..0000000000 --- a/services/apps/alcs/src/providers/typeorm/migrations/1699394945369-add_outcome_public_search.ts +++ /dev/null @@ -1,51 +0,0 @@ -import { MigrationInterface, QueryRunner } from 'typeorm'; - -export class addOutcomePublicSearch1699031687624 implements MigrationInterface { - name = 'addOutcomePublicSearch1699031687624'; - - public async up(queryRunner: QueryRunner): Promise<void> { - await queryRunner.query( - `DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, - ['VIEW', 'public_application_submission_search_view', 'alcs'], - ); - await queryRunner.query( - `DROP VIEW "alcs"."public_application_submission_search_view"`, - ); - await queryRunner.query( - `CREATE VIEW "alcs"."public_application_submission_search_view" AS SELECT "app_sub"."uuid" AS "uuid", "app_sub"."applicant" AS "applicant", "app"."uuid" AS "application_uuid", "applicationType"."audit_deleted_date_at" AS "applicationType_audit_deleted_date_at", "applicationType"."audit_created_at" AS "applicationType_audit_created_at", "applicationType"."audit_updated_at" AS "applicationType_audit_updated_at", "applicationType"."audit_created_by" AS "applicationType_audit_created_by", "applicationType"."audit_updated_by" AS "applicationType_audit_updated_by", "applicationType"."label" AS "applicationType_label", "applicationType"."code" AS "applicationType_code", "applicationType"."description" AS "applicationType_description", "applicationType"."short_label" AS "applicationType_short_label", "applicationType"."background_color" AS "applicationType_background_color", "applicationType"."text_color" AS "applicationType_text_color", "applicationType"."html_description" AS "applicationType_html_description", "applicationType"."portal_label" AS "applicationType_portal_label", "applicationType"."portal_order" AS "applicationType_portal_order", "applicationType"."requires_government_review" AS "applicationType_requires_government_review", "localGovernment"."name" AS "local_government_name", "app_sub"."file_number" AS "file_number", "app_sub"."local_government_uuid" AS "local_government_uuid", "app_sub"."type_code" AS "application_type_code", "app"."date_submitted_to_alc" AS "date_submitted_to_alc", "app"."decision_date" AS "decision_date", decision_date.outcome AS "outcome", "app"."region_code" AS "application_region_code", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid") AS "status" FROM "alcs"."application_submission" "app_sub" INNER JOIN "alcs"."application" "app" ON "app"."file_number" = "app_sub"."file_number" AND "app"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."application_type" "applicationType" ON "app_sub"."type_code" = "applicationType"."code" AND "applicationType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "app_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."application_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "app_sub"."uuid" LEFT JOIN (SELECT MAX("date") AS "date", outcome_code AS "outcome", application_uuid AS "application_uuid" FROM "alcs"."application_decision" "decision_date" WHERE "decision_date"."audit_deleted_date_at" IS NULL GROUP BY application_uuid, outcome) "decision_date" ON decision_date."application_uuid" = "app"."uuid" WHERE ( "app_sub"."is_draft" = FALSE AND ("app"."date_received_all_items" IS NOT NULL AND "app"."date_received_all_items" <= NOW()) AND alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid")->>'status_type_code' != 'CNCL' ) AND ( "app_sub"."audit_deleted_date_at" IS NULL )`, - ); - await queryRunner.query( - `INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, - [ - 'alcs', - 'VIEW', - 'public_application_submission_search_view', - 'SELECT "app_sub"."uuid" AS "uuid", "app_sub"."applicant" AS "applicant", "app"."uuid" AS "application_uuid", "applicationType"."audit_deleted_date_at" AS "applicationType_audit_deleted_date_at", "applicationType"."audit_created_at" AS "applicationType_audit_created_at", "applicationType"."audit_updated_at" AS "applicationType_audit_updated_at", "applicationType"."audit_created_by" AS "applicationType_audit_created_by", "applicationType"."audit_updated_by" AS "applicationType_audit_updated_by", "applicationType"."label" AS "applicationType_label", "applicationType"."code" AS "applicationType_code", "applicationType"."description" AS "applicationType_description", "applicationType"."short_label" AS "applicationType_short_label", "applicationType"."background_color" AS "applicationType_background_color", "applicationType"."text_color" AS "applicationType_text_color", "applicationType"."html_description" AS "applicationType_html_description", "applicationType"."portal_label" AS "applicationType_portal_label", "applicationType"."portal_order" AS "applicationType_portal_order", "applicationType"."requires_government_review" AS "applicationType_requires_government_review", "localGovernment"."name" AS "local_government_name", "app_sub"."file_number" AS "file_number", "app_sub"."local_government_uuid" AS "local_government_uuid", "app_sub"."type_code" AS "application_type_code", "app"."date_submitted_to_alc" AS "date_submitted_to_alc", "app"."decision_date" AS "decision_date", decision_date.outcome AS "outcome", "app"."region_code" AS "application_region_code", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid") AS "status" FROM "alcs"."application_submission" "app_sub" INNER JOIN "alcs"."application" "app" ON "app"."file_number" = "app_sub"."file_number" AND "app"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."application_type" "applicationType" ON "app_sub"."type_code" = "applicationType"."code" AND "applicationType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "app_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."application_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "app_sub"."uuid" LEFT JOIN (SELECT MAX("date") AS "date", outcome_code AS "outcome", application_uuid AS "application_uuid" FROM "alcs"."application_decision" "decision_date" WHERE "decision_date"."audit_deleted_date_at" IS NULL GROUP BY application_uuid, outcome) "decision_date" ON decision_date."application_uuid" = "app"."uuid" WHERE ( "app_sub"."is_draft" = FALSE AND ("app"."date_received_all_items" IS NOT NULL AND "app"."date_received_all_items" <= NOW()) AND alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid")->>\'status_type_code\' != \'CNCL\' ) AND ( "app_sub"."audit_deleted_date_at" IS NULL )', - ], - ); - } - - public async down(queryRunner: QueryRunner): Promise<void> { - await queryRunner.query( - `DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, - ['VIEW', 'public_application_submission_search_view', 'alcs'], - ); - await queryRunner.query( - `DROP VIEW "alcs"."public_application_submission_search_view"`, - ); - await queryRunner.query( - `CREATE VIEW "alcs"."public_application_submission_search_view" AS SELECT "app_sub"."uuid" AS "uuid", "app_sub"."applicant" AS "applicant", "app"."uuid" AS "application_uuid", "applicationType"."audit_deleted_date_at" AS "applicationType_audit_deleted_date_at", "applicationType"."audit_created_at" AS "applicationType_audit_created_at", "applicationType"."audit_updated_at" AS "applicationType_audit_updated_at", "applicationType"."audit_created_by" AS "applicationType_audit_created_by", "applicationType"."audit_updated_by" AS "applicationType_audit_updated_by", "applicationType"."label" AS "applicationType_label", "applicationType"."code" AS "applicationType_code", "applicationType"."description" AS "applicationType_description", "applicationType"."short_label" AS "applicationType_short_label", "applicationType"."background_color" AS "applicationType_background_color", "applicationType"."text_color" AS "applicationType_text_color", "applicationType"."html_description" AS "applicationType_html_description", "applicationType"."portal_label" AS "applicationType_portal_label", "applicationType"."portal_order" AS "applicationType_portal_order", "applicationType"."requires_government_review" AS "applicationType_requires_government_review", "localGovernment"."name" AS "local_government_name", "app_sub"."file_number" AS "file_number", "app_sub"."local_government_uuid" AS "local_government_uuid", "app_sub"."type_code" AS "application_type_code", "app"."date_submitted_to_alc" AS "date_submitted_to_alc", "app"."decision_date" AS "decision_date", "app"."region_code" AS "application_region_code", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid") AS "status" FROM "alcs"."application_submission" "app_sub" INNER JOIN "alcs"."application" "app" ON "app"."file_number" = "app_sub"."file_number" AND "app"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."application_type" "applicationType" ON "app_sub"."type_code" = "applicationType"."code" AND "applicationType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "app_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."application_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "app_sub"."uuid" LEFT JOIN (SELECT MAX("date") AS "date", outcome_code AS "outcome", application_uuid AS "application_uuid" FROM "alcs"."application_decision" "decision_date" WHERE "decision_date"."audit_deleted_date_at" IS NULL GROUP BY application_uuid, outcome) "decision_date" ON decision_date."application_uuid" = "app"."uuid" WHERE ( "app_sub"."is_draft" = FALSE AND ("app"."date_received_all_items" IS NOT NULL AND "app"."date_received_all_items" <= NOW()) AND alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid")->>'status_type_code' != 'CNCL' ) AND ( "app_sub"."audit_deleted_date_at" IS NULL )`, - ); - await queryRunner.query( - `INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, - [ - 'alcs', - 'VIEW', - 'public_application_submission_search_view', - 'SELECT "app_sub"."uuid" AS "uuid", "app_sub"."applicant" AS "applicant", "app"."uuid" AS "application_uuid", "applicationType"."audit_deleted_date_at" AS "applicationType_audit_deleted_date_at", "applicationType"."audit_created_at" AS "applicationType_audit_created_at", "applicationType"."audit_updated_at" AS "applicationType_audit_updated_at", "applicationType"."audit_created_by" AS "applicationType_audit_created_by", "applicationType"."audit_updated_by" AS "applicationType_audit_updated_by", "applicationType"."label" AS "applicationType_label", "applicationType"."code" AS "applicationType_code", "applicationType"."description" AS "applicationType_description", "applicationType"."short_label" AS "applicationType_short_label", "applicationType"."background_color" AS "applicationType_background_color", "applicationType"."text_color" AS "applicationType_text_color", "applicationType"."html_description" AS "applicationType_html_description", "applicationType"."portal_label" AS "applicationType_portal_label", "applicationType"."portal_order" AS "applicationType_portal_order", "applicationType"."requires_government_review" AS "applicationType_requires_government_review", "localGovernment"."name" AS "local_government_name", "app_sub"."file_number" AS "file_number", "app_sub"."local_government_uuid" AS "local_government_uuid", "app_sub"."type_code" AS "application_type_code", "app"."date_submitted_to_alc" AS "date_submitted_to_alc", "app"."decision_date" AS "decision_date", "app"."region_code" AS "application_region_code", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid") AS "status" FROM "alcs"."application_submission" "app_sub" INNER JOIN "alcs"."application" "app" ON "app"."file_number" = "app_sub"."file_number" AND "app"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."application_type" "applicationType" ON "app_sub"."type_code" = "applicationType"."code" AND "applicationType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "app_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."application_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "app_sub"."uuid" LEFT JOIN (SELECT MAX("date") AS "date", outcome_code AS "outcome", application_uuid AS "application_uuid" FROM "alcs"."application_decision" "decision_date" WHERE "decision_date"."audit_deleted_date_at" IS NULL GROUP BY application_uuid, outcome) "decision_date" ON decision_date."application_uuid" = "app"."uuid" WHERE ( "app_sub"."is_draft" = FALSE AND ("app"."date_received_all_items" IS NOT NULL AND "app"."date_received_all_items" <= NOW()) AND alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid")->>\'status_type_code\' != \'CNCL\' ) AND ( "app_sub"."audit_deleted_date_at" IS NULL )', - ], - ); - } -} - - diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1699461885734-add_outcome_public_search_noi.ts b/services/apps/alcs/src/providers/typeorm/migrations/1699461885734-add_outcome_public_search_noi.ts deleted file mode 100644 index 27e851148e..0000000000 --- a/services/apps/alcs/src/providers/typeorm/migrations/1699461885734-add_outcome_public_search_noi.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { MigrationInterface, QueryRunner } from "typeorm"; - -export class addOutcomePublicSearchNoi1699461885734 implements MigrationInterface { - name = 'addOutcomePublicSearchNoi1699461885734' - - public async up(queryRunner: QueryRunner): Promise<void> { - await queryRunner.query(`CREATE VIEW "alcs"."public_notice_of_intent_submission_search_view" AS SELECT "noi_sub"."uuid" AS "uuid", "noi_sub"."applicant" AS "applicant", "noi"."uuid" AS "notice_of_intent_uuid", "noticeOfIntentType"."audit_deleted_date_at" AS "noticeOfIntentType_audit_deleted_date_at", "noticeOfIntentType"."audit_created_at" AS "noticeOfIntentType_audit_created_at", "noticeOfIntentType"."audit_updated_at" AS "noticeOfIntentType_audit_updated_at", "noticeOfIntentType"."audit_created_by" AS "noticeOfIntentType_audit_created_by", "noticeOfIntentType"."audit_updated_by" AS "noticeOfIntentType_audit_updated_by", "noticeOfIntentType"."label" AS "noticeOfIntentType_label", "noticeOfIntentType"."code" AS "noticeOfIntentType_code", "noticeOfIntentType"."description" AS "noticeOfIntentType_description", "noticeOfIntentType"."short_label" AS "noticeOfIntentType_short_label", "noticeOfIntentType"."background_color" AS "noticeOfIntentType_background_color", "noticeOfIntentType"."text_color" AS "noticeOfIntentType_text_color", "noticeOfIntentType"."html_description" AS "noticeOfIntentType_html_description", "noticeOfIntentType"."portal_label" AS "noticeOfIntentType_portal_label", "localGovernment"."name" AS "local_government_name", "noi_sub"."file_number" AS "file_number", "noi_sub"."local_government_uuid" AS "local_government_uuid", "noi_sub"."type_code" AS "notice_of_intent_type_code", "noi"."date_submitted_to_alc" AS "date_submitted_to_alc", "noi"."decision_date" AS "decision_date", decision_date.outcome AS "outcome", "noi"."region_code" AS "notice_of_intent_region_code", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid") AS "status" FROM "alcs"."notice_of_intent_submission" "noi_sub" INNER JOIN "alcs"."notice_of_intent" "noi" ON "noi"."file_number" = "noi_sub"."file_number" AND "noi"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."notice_of_intent_type" "noticeOfIntentType" ON "noi_sub"."type_code" = "noticeOfIntentType"."code" AND "noticeOfIntentType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "noi_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."notice_of_intent_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "noi_sub"."uuid" LEFT JOIN (SELECT MAX("date") AS "date", outcome_code AS "outcome", notice_of_intent_uuid AS "notice_of_intent_uuid" FROM "alcs"."notice_of_intent_decision" "decision_date" WHERE "decision_date"."audit_deleted_date_at" IS NULL GROUP BY notice_of_intent_uuid, outcome) "decision_date" ON decision_date."notice_of_intent_uuid" = "noi"."uuid" WHERE ( "noi_sub"."is_draft" = FALSE AND ("noi"."date_received_all_items" IS NOT NULL AND "noi"."date_received_all_items" <= NOW()) AND alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid")->>'status_type_code' != 'CNCL' ) AND ( "noi_sub"."audit_deleted_date_at" IS NULL )`); - await queryRunner.query(`INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, ["alcs","VIEW","public_notice_of_intent_submission_search_view","SELECT \"noi_sub\".\"uuid\" AS \"uuid\", \"noi_sub\".\"applicant\" AS \"applicant\", \"noi\".\"uuid\" AS \"notice_of_intent_uuid\", \"noticeOfIntentType\".\"audit_deleted_date_at\" AS \"noticeOfIntentType_audit_deleted_date_at\", \"noticeOfIntentType\".\"audit_created_at\" AS \"noticeOfIntentType_audit_created_at\", \"noticeOfIntentType\".\"audit_updated_at\" AS \"noticeOfIntentType_audit_updated_at\", \"noticeOfIntentType\".\"audit_created_by\" AS \"noticeOfIntentType_audit_created_by\", \"noticeOfIntentType\".\"audit_updated_by\" AS \"noticeOfIntentType_audit_updated_by\", \"noticeOfIntentType\".\"label\" AS \"noticeOfIntentType_label\", \"noticeOfIntentType\".\"code\" AS \"noticeOfIntentType_code\", \"noticeOfIntentType\".\"description\" AS \"noticeOfIntentType_description\", \"noticeOfIntentType\".\"short_label\" AS \"noticeOfIntentType_short_label\", \"noticeOfIntentType\".\"background_color\" AS \"noticeOfIntentType_background_color\", \"noticeOfIntentType\".\"text_color\" AS \"noticeOfIntentType_text_color\", \"noticeOfIntentType\".\"html_description\" AS \"noticeOfIntentType_html_description\", \"noticeOfIntentType\".\"portal_label\" AS \"noticeOfIntentType_portal_label\", \"localGovernment\".\"name\" AS \"local_government_name\", \"noi_sub\".\"file_number\" AS \"file_number\", \"noi_sub\".\"local_government_uuid\" AS \"local_government_uuid\", \"noi_sub\".\"type_code\" AS \"notice_of_intent_type_code\", \"noi\".\"date_submitted_to_alc\" AS \"date_submitted_to_alc\", \"noi\".\"decision_date\" AS \"decision_date\", decision_date.outcome AS \"outcome\", \"noi\".\"region_code\" AS \"notice_of_intent_region_code\", GREATEST(status_link.effective_date, decision_date.date) AS \"last_update\", alcs.get_current_status_for_notice_of_intent_submission_by_uuid(\"noi_sub\".\"uuid\") AS \"status\" FROM \"alcs\".\"notice_of_intent_submission\" \"noi_sub\" INNER JOIN \"alcs\".\"notice_of_intent\" \"noi\" ON \"noi\".\"file_number\" = \"noi_sub\".\"file_number\" AND \"noi\".\"audit_deleted_date_at\" IS NULL INNER JOIN \"alcs\".\"notice_of_intent_type\" \"noticeOfIntentType\" ON \"noi_sub\".\"type_code\" = \"noticeOfIntentType\".\"code\" AND \"noticeOfIntentType\".\"audit_deleted_date_at\" IS NULL LEFT JOIN \"alcs\".\"local_government\" \"localGovernment\" ON \"noi_sub\".\"local_government_uuid\" = \"localGovernment\".\"uuid\" AND \"localGovernment\".\"audit_deleted_date_at\" IS NULL LEFT JOIN (SELECT MAX(\"effective_date\") AS \"effective_date\", submission_uuid AS \"submission_uuid\" FROM \"alcs\".\"notice_of_intent_submission_to_submission_status\" \"status_link\" GROUP BY submission_uuid) \"status_link\" ON status_link.\"submission_uuid\" = \"noi_sub\".\"uuid\" LEFT JOIN (SELECT MAX(\"date\") AS \"date\", outcome_code AS \"outcome\", notice_of_intent_uuid AS \"notice_of_intent_uuid\" FROM \"alcs\".\"notice_of_intent_decision\" \"decision_date\" WHERE \"decision_date\".\"audit_deleted_date_at\" IS NULL GROUP BY notice_of_intent_uuid, outcome) \"decision_date\" ON decision_date.\"notice_of_intent_uuid\" = \"noi\".\"uuid\" WHERE ( \"noi_sub\".\"is_draft\" = FALSE AND (\"noi\".\"date_received_all_items\" IS NOT NULL AND \"noi\".\"date_received_all_items\" <= NOW()) AND alcs.get_current_status_for_notice_of_intent_submission_by_uuid(\"noi_sub\".\"uuid\")->>'status_type_code' != 'CNCL' ) AND ( \"noi_sub\".\"audit_deleted_date_at\" IS NULL )"]); - } - - public async down(queryRunner: QueryRunner): Promise<void> { - await queryRunner.query(`DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, ["VIEW","public_notice_of_intent_submission_search_view","alcs"]); - await queryRunner.query(`DROP VIEW "alcs"."public_notice_of_intent_submission_search_view"`); - } - -} diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1700081096766-add_outcome_to_public.ts b/services/apps/alcs/src/providers/typeorm/migrations/1700081096766-add_outcome_to_public.ts new file mode 100644 index 0000000000..3acb2a2e58 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1700081096766-add_outcome_to_public.ts @@ -0,0 +1,87 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class AddOutcomeToPublic1700081096766 implements MigrationInterface { + name = 'AddOutcomeToPublic1700081096766'; + + public async up(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, + ['VIEW', 'public_notice_of_intent_submission_search_view', 'alcs'], + ); + await queryRunner.query( + `DROP VIEW "alcs"."public_notice_of_intent_submission_search_view"`, + ); + await queryRunner.query( + `DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, + ['VIEW', 'public_application_submission_search_view', 'alcs'], + ); + await queryRunner.query( + `DROP VIEW "alcs"."public_application_submission_search_view"`, + ); + await queryRunner.query( + `CREATE VIEW "alcs"."public_application_submission_search_view" AS SELECT "app_sub"."uuid" AS "uuid", "app_sub"."applicant" AS "applicant", "app"."uuid" AS "application_uuid", "applicationType"."audit_deleted_date_at" AS "applicationType_audit_deleted_date_at", "applicationType"."audit_created_at" AS "applicationType_audit_created_at", "applicationType"."audit_updated_at" AS "applicationType_audit_updated_at", "applicationType"."audit_created_by" AS "applicationType_audit_created_by", "applicationType"."audit_updated_by" AS "applicationType_audit_updated_by", "applicationType"."label" AS "applicationType_label", "applicationType"."code" AS "applicationType_code", "applicationType"."description" AS "applicationType_description", "applicationType"."short_label" AS "applicationType_short_label", "applicationType"."background_color" AS "applicationType_background_color", "applicationType"."text_color" AS "applicationType_text_color", "applicationType"."html_description" AS "applicationType_html_description", "applicationType"."portal_label" AS "applicationType_portal_label", "applicationType"."portal_order" AS "applicationType_portal_order", "applicationType"."requires_government_review" AS "applicationType_requires_government_review", "localGovernment"."name" AS "local_government_name", "app_sub"."file_number" AS "file_number", "app_sub"."local_government_uuid" AS "local_government_uuid", "app_sub"."type_code" AS "application_type_code", "app"."date_submitted_to_alc" AS "date_submitted_to_alc", "app"."decision_date" AS "decision_date", decision_date.outcome AS "outcome", "app"."region_code" AS "application_region_code", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid") AS "status" FROM "alcs"."application_submission" "app_sub" INNER JOIN "alcs"."application" "app" ON "app"."file_number" = "app_sub"."file_number" AND "app"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."application_type" "applicationType" ON "app_sub"."type_code" = "applicationType"."code" AND "applicationType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "app_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."application_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "app_sub"."uuid" LEFT JOIN (SELECT MAX("date") AS "date", outcome_code AS "outcome", application_uuid AS "application_uuid" FROM "alcs"."application_decision" "decision_date" WHERE "decision_date"."audit_deleted_date_at" IS NULL GROUP BY application_uuid, outcome) "decision_date" ON decision_date."application_uuid" = "app"."uuid" WHERE ( "app_sub"."is_draft" = FALSE AND ("app"."date_received_all_items" IS NOT NULL AND "app"."date_received_all_items" <= NOW()) AND alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid")->>'status_type_code' != 'CNCL' ) AND ( "app_sub"."audit_deleted_date_at" IS NULL )`, + ); + await queryRunner.query( + `INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, + [ + 'alcs', + 'VIEW', + 'public_application_submission_search_view', + 'SELECT "app_sub"."uuid" AS "uuid", "app_sub"."applicant" AS "applicant", "app"."uuid" AS "application_uuid", "applicationType"."audit_deleted_date_at" AS "applicationType_audit_deleted_date_at", "applicationType"."audit_created_at" AS "applicationType_audit_created_at", "applicationType"."audit_updated_at" AS "applicationType_audit_updated_at", "applicationType"."audit_created_by" AS "applicationType_audit_created_by", "applicationType"."audit_updated_by" AS "applicationType_audit_updated_by", "applicationType"."label" AS "applicationType_label", "applicationType"."code" AS "applicationType_code", "applicationType"."description" AS "applicationType_description", "applicationType"."short_label" AS "applicationType_short_label", "applicationType"."background_color" AS "applicationType_background_color", "applicationType"."text_color" AS "applicationType_text_color", "applicationType"."html_description" AS "applicationType_html_description", "applicationType"."portal_label" AS "applicationType_portal_label", "applicationType"."portal_order" AS "applicationType_portal_order", "applicationType"."requires_government_review" AS "applicationType_requires_government_review", "localGovernment"."name" AS "local_government_name", "app_sub"."file_number" AS "file_number", "app_sub"."local_government_uuid" AS "local_government_uuid", "app_sub"."type_code" AS "application_type_code", "app"."date_submitted_to_alc" AS "date_submitted_to_alc", "app"."decision_date" AS "decision_date", decision_date.outcome AS "outcome", "app"."region_code" AS "application_region_code", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid") AS "status" FROM "alcs"."application_submission" "app_sub" INNER JOIN "alcs"."application" "app" ON "app"."file_number" = "app_sub"."file_number" AND "app"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."application_type" "applicationType" ON "app_sub"."type_code" = "applicationType"."code" AND "applicationType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "app_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."application_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "app_sub"."uuid" LEFT JOIN (SELECT MAX("date") AS "date", outcome_code AS "outcome", application_uuid AS "application_uuid" FROM "alcs"."application_decision" "decision_date" WHERE "decision_date"."audit_deleted_date_at" IS NULL GROUP BY application_uuid, outcome) "decision_date" ON decision_date."application_uuid" = "app"."uuid" WHERE ( "app_sub"."is_draft" = FALSE AND ("app"."date_received_all_items" IS NOT NULL AND "app"."date_received_all_items" <= NOW()) AND alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid")->>\'status_type_code\' != \'CNCL\' ) AND ( "app_sub"."audit_deleted_date_at" IS NULL )', + ], + ); + await queryRunner.query( + `CREATE VIEW "alcs"."public_notice_of_intent_submission_search_view" AS SELECT "noi_sub"."uuid" AS "uuid", "noi_sub"."applicant" AS "applicant", "noi"."uuid" AS "notice_of_intent_uuid", "noticeOfIntentType"."audit_deleted_date_at" AS "noticeOfIntentType_audit_deleted_date_at", "noticeOfIntentType"."audit_created_at" AS "noticeOfIntentType_audit_created_at", "noticeOfIntentType"."audit_updated_at" AS "noticeOfIntentType_audit_updated_at", "noticeOfIntentType"."audit_created_by" AS "noticeOfIntentType_audit_created_by", "noticeOfIntentType"."audit_updated_by" AS "noticeOfIntentType_audit_updated_by", "noticeOfIntentType"."label" AS "noticeOfIntentType_label", "noticeOfIntentType"."code" AS "noticeOfIntentType_code", "noticeOfIntentType"."description" AS "noticeOfIntentType_description", "noticeOfIntentType"."short_label" AS "noticeOfIntentType_short_label", "noticeOfIntentType"."background_color" AS "noticeOfIntentType_background_color", "noticeOfIntentType"."text_color" AS "noticeOfIntentType_text_color", "noticeOfIntentType"."html_description" AS "noticeOfIntentType_html_description", "noticeOfIntentType"."portal_label" AS "noticeOfIntentType_portal_label", "localGovernment"."name" AS "local_government_name", "noi_sub"."file_number" AS "file_number", "noi_sub"."local_government_uuid" AS "local_government_uuid", "noi_sub"."type_code" AS "notice_of_intent_type_code", "noi"."date_submitted_to_alc" AS "date_submitted_to_alc", "noi"."decision_date" AS "decision_date", decision_date.outcome AS "outcome", "noi"."region_code" AS "notice_of_intent_region_code", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid") AS "status" FROM "alcs"."notice_of_intent_submission" "noi_sub" INNER JOIN "alcs"."notice_of_intent" "noi" ON "noi"."file_number" = "noi_sub"."file_number" AND "noi"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."notice_of_intent_type" "noticeOfIntentType" ON "noi_sub"."type_code" = "noticeOfIntentType"."code" AND "noticeOfIntentType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "noi_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."notice_of_intent_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "noi_sub"."uuid" LEFT JOIN (SELECT MAX("date") AS "date", outcome_code AS "outcome", notice_of_intent_uuid AS "notice_of_intent_uuid" FROM "alcs"."notice_of_intent_decision" "decision_date" WHERE "decision_date"."audit_deleted_date_at" IS NULL GROUP BY notice_of_intent_uuid, outcome) "decision_date" ON decision_date."notice_of_intent_uuid" = "noi"."uuid" WHERE ( "noi_sub"."is_draft" = FALSE AND ("noi"."date_received_all_items" IS NOT NULL AND "noi"."date_received_all_items" <= NOW()) AND alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid")->>'status_type_code' != 'CNCL' ) AND ( "noi_sub"."audit_deleted_date_at" IS NULL )`, + ); + await queryRunner.query( + `INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, + [ + 'alcs', + 'VIEW', + 'public_notice_of_intent_submission_search_view', + 'SELECT "noi_sub"."uuid" AS "uuid", "noi_sub"."applicant" AS "applicant", "noi"."uuid" AS "notice_of_intent_uuid", "noticeOfIntentType"."audit_deleted_date_at" AS "noticeOfIntentType_audit_deleted_date_at", "noticeOfIntentType"."audit_created_at" AS "noticeOfIntentType_audit_created_at", "noticeOfIntentType"."audit_updated_at" AS "noticeOfIntentType_audit_updated_at", "noticeOfIntentType"."audit_created_by" AS "noticeOfIntentType_audit_created_by", "noticeOfIntentType"."audit_updated_by" AS "noticeOfIntentType_audit_updated_by", "noticeOfIntentType"."label" AS "noticeOfIntentType_label", "noticeOfIntentType"."code" AS "noticeOfIntentType_code", "noticeOfIntentType"."description" AS "noticeOfIntentType_description", "noticeOfIntentType"."short_label" AS "noticeOfIntentType_short_label", "noticeOfIntentType"."background_color" AS "noticeOfIntentType_background_color", "noticeOfIntentType"."text_color" AS "noticeOfIntentType_text_color", "noticeOfIntentType"."html_description" AS "noticeOfIntentType_html_description", "noticeOfIntentType"."portal_label" AS "noticeOfIntentType_portal_label", "localGovernment"."name" AS "local_government_name", "noi_sub"."file_number" AS "file_number", "noi_sub"."local_government_uuid" AS "local_government_uuid", "noi_sub"."type_code" AS "notice_of_intent_type_code", "noi"."date_submitted_to_alc" AS "date_submitted_to_alc", "noi"."decision_date" AS "decision_date", decision_date.outcome AS "outcome", "noi"."region_code" AS "notice_of_intent_region_code", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid") AS "status" FROM "alcs"."notice_of_intent_submission" "noi_sub" INNER JOIN "alcs"."notice_of_intent" "noi" ON "noi"."file_number" = "noi_sub"."file_number" AND "noi"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."notice_of_intent_type" "noticeOfIntentType" ON "noi_sub"."type_code" = "noticeOfIntentType"."code" AND "noticeOfIntentType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "noi_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."notice_of_intent_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "noi_sub"."uuid" LEFT JOIN (SELECT MAX("date") AS "date", outcome_code AS "outcome", notice_of_intent_uuid AS "notice_of_intent_uuid" FROM "alcs"."notice_of_intent_decision" "decision_date" WHERE "decision_date"."audit_deleted_date_at" IS NULL GROUP BY notice_of_intent_uuid, outcome) "decision_date" ON decision_date."notice_of_intent_uuid" = "noi"."uuid" WHERE ( "noi_sub"."is_draft" = FALSE AND ("noi"."date_received_all_items" IS NOT NULL AND "noi"."date_received_all_items" <= NOW()) AND alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid")->>\'status_type_code\' != \'CNCL\' ) AND ( "noi_sub"."audit_deleted_date_at" IS NULL )', + ], + ); + } + + public async down(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, + ['VIEW', 'public_notice_of_intent_submission_search_view', 'alcs'], + ); + await queryRunner.query( + `DROP VIEW "alcs"."public_notice_of_intent_submission_search_view"`, + ); + await queryRunner.query( + `DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, + ['VIEW', 'public_application_submission_search_view', 'alcs'], + ); + await queryRunner.query( + `DROP VIEW "alcs"."public_application_submission_search_view"`, + ); + await queryRunner.query( + `CREATE VIEW "alcs"."public_application_submission_search_view" AS SELECT "app_sub"."uuid" AS "uuid", "app_sub"."applicant" AS "applicant", "app"."uuid" AS "application_uuid", "applicationType"."audit_deleted_date_at" AS "applicationType_audit_deleted_date_at", "applicationType"."audit_created_at" AS "applicationType_audit_created_at", "applicationType"."audit_updated_at" AS "applicationType_audit_updated_at", "applicationType"."audit_created_by" AS "applicationType_audit_created_by", "applicationType"."audit_updated_by" AS "applicationType_audit_updated_by", "applicationType"."label" AS "applicationType_label", "applicationType"."code" AS "applicationType_code", "applicationType"."description" AS "applicationType_description", "applicationType"."short_label" AS "applicationType_short_label", "applicationType"."background_color" AS "applicationType_background_color", "applicationType"."text_color" AS "applicationType_text_color", "applicationType"."html_description" AS "applicationType_html_description", "applicationType"."portal_label" AS "applicationType_portal_label", "localGovernment"."name" AS "local_government_name", "app_sub"."file_number" AS "file_number", "app_sub"."local_government_uuid" AS "local_government_uuid", "app_sub"."type_code" AS "application_type_code", "app"."date_submitted_to_alc" AS "date_submitted_to_alc", "app"."decision_date" AS "decision_date", "app"."region_code" AS "application_region_code", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid") AS "status" FROM "alcs"."application_submission" "app_sub" INNER JOIN "alcs"."application" "app" ON "app"."file_number" = "app_sub"."file_number" AND "app"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."application_type" "applicationType" ON "app_sub"."type_code" = "applicationType"."code" AND "applicationType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "app_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."application_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "app_sub"."uuid" LEFT JOIN (SELECT MAX("date") AS "date", application_uuid AS "application_uuid" FROM "alcs"."application_decision" "decision_date" WHERE "decision_date"."audit_deleted_date_at" IS NULL GROUP BY application_uuid) "decision_date" ON decision_date."application_uuid" = "app"."uuid" WHERE ( "app_sub"."is_draft" = FALSE AND ("app"."date_received_all_items" IS NOT NULL AND "app"."date_received_all_items" <= NOW()) AND alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid")->>'status_type_code' != 'CNCL' ) AND ( "app_sub"."audit_deleted_date_at" IS NULL )`, + ); + await queryRunner.query( + `INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, + [ + 'alcs', + 'VIEW', + 'public_application_submission_search_view', + 'SELECT "app_sub"."uuid" AS "uuid", "app_sub"."applicant" AS "applicant", "app"."uuid" AS "application_uuid", "applicationType"."audit_deleted_date_at" AS "applicationType_audit_deleted_date_at", "applicationType"."audit_created_at" AS "applicationType_audit_created_at", "applicationType"."audit_updated_at" AS "applicationType_audit_updated_at", "applicationType"."audit_created_by" AS "applicationType_audit_created_by", "applicationType"."audit_updated_by" AS "applicationType_audit_updated_by", "applicationType"."label" AS "applicationType_label", "applicationType"."code" AS "applicationType_code", "applicationType"."description" AS "applicationType_description", "applicationType"."short_label" AS "applicationType_short_label", "applicationType"."background_color" AS "applicationType_background_color", "applicationType"."text_color" AS "applicationType_text_color", "applicationType"."html_description" AS "applicationType_html_description", "applicationType"."portal_label" AS "applicationType_portal_label", "localGovernment"."name" AS "local_government_name", "app_sub"."file_number" AS "file_number", "app_sub"."local_government_uuid" AS "local_government_uuid", "app_sub"."type_code" AS "application_type_code", "app"."date_submitted_to_alc" AS "date_submitted_to_alc", "app"."decision_date" AS "decision_date", "app"."region_code" AS "application_region_code", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid") AS "status" FROM "alcs"."application_submission" "app_sub" INNER JOIN "alcs"."application" "app" ON "app"."file_number" = "app_sub"."file_number" AND "app"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."application_type" "applicationType" ON "app_sub"."type_code" = "applicationType"."code" AND "applicationType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "app_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."application_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "app_sub"."uuid" LEFT JOIN (SELECT MAX("date") AS "date", application_uuid AS "application_uuid" FROM "alcs"."application_decision" "decision_date" WHERE "decision_date"."audit_deleted_date_at" IS NULL GROUP BY application_uuid) "decision_date" ON decision_date."application_uuid" = "app"."uuid" WHERE ( "app_sub"."is_draft" = FALSE AND ("app"."date_received_all_items" IS NOT NULL AND "app"."date_received_all_items" <= NOW()) AND alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid")->>\'status_type_code\' != \'CNCL\' ) AND ( "app_sub"."audit_deleted_date_at" IS NULL )', + ], + ); + await queryRunner.query( + `CREATE VIEW "alcs"."public_notice_of_intent_submission_search_view" AS SELECT "noi_sub"."uuid" AS "uuid", "noi_sub"."applicant" AS "applicant", "noi"."uuid" AS "notice_of_intent_uuid", "noticeOfIntentType"."audit_deleted_date_at" AS "noticeOfIntentType_audit_deleted_date_at", "noticeOfIntentType"."audit_created_at" AS "noticeOfIntentType_audit_created_at", "noticeOfIntentType"."audit_updated_at" AS "noticeOfIntentType_audit_updated_at", "noticeOfIntentType"."audit_created_by" AS "noticeOfIntentType_audit_created_by", "noticeOfIntentType"."audit_updated_by" AS "noticeOfIntentType_audit_updated_by", "noticeOfIntentType"."label" AS "noticeOfIntentType_label", "noticeOfIntentType"."code" AS "noticeOfIntentType_code", "noticeOfIntentType"."description" AS "noticeOfIntentType_description", "noticeOfIntentType"."short_label" AS "noticeOfIntentType_short_label", "noticeOfIntentType"."background_color" AS "noticeOfIntentType_background_color", "noticeOfIntentType"."text_color" AS "noticeOfIntentType_text_color", "noticeOfIntentType"."html_description" AS "noticeOfIntentType_html_description", "noticeOfIntentType"."portal_label" AS "noticeOfIntentType_portal_label", "localGovernment"."name" AS "local_government_name", "noi_sub"."file_number" AS "file_number", "noi_sub"."local_government_uuid" AS "local_government_uuid", "noi_sub"."type_code" AS "notice_of_intent_type_code", "noi"."date_submitted_to_alc" AS "date_submitted_to_alc", "noi"."decision_date" AS "decision_date", "noi"."region_code" AS "notice_of_intent_region_code", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid") AS "status" FROM "alcs"."notice_of_intent_submission" "noi_sub" INNER JOIN "alcs"."notice_of_intent" "noi" ON "noi"."file_number" = "noi_sub"."file_number" AND "noi"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."notice_of_intent_type" "noticeOfIntentType" ON "noi_sub"."type_code" = "noticeOfIntentType"."code" AND "noticeOfIntentType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "noi_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."notice_of_intent_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "noi_sub"."uuid" LEFT JOIN (SELECT MAX("date") AS "date", notice_of_intent_uuid AS "notice_of_intent_uuid" FROM "alcs"."notice_of_intent_decision" "decision_date" WHERE "decision_date"."audit_deleted_date_at" IS NULL GROUP BY notice_of_intent_uuid) "decision_date" ON decision_date."notice_of_intent_uuid" = "noi"."uuid" WHERE ( "noi_sub"."is_draft" = FALSE AND ("noi"."date_received_all_items" IS NOT NULL AND "noi"."date_received_all_items" <= NOW()) AND alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid")->>'status_type_code' != 'CNCL' ) AND ( "noi_sub"."audit_deleted_date_at" IS NULL )`, + ); + await queryRunner.query( + `INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, + [ + 'alcs', + 'VIEW', + 'public_notice_of_intent_submission_search_view', + 'SELECT "noi_sub"."uuid" AS "uuid", "noi_sub"."applicant" AS "applicant", "noi"."uuid" AS "notice_of_intent_uuid", "noticeOfIntentType"."audit_deleted_date_at" AS "noticeOfIntentType_audit_deleted_date_at", "noticeOfIntentType"."audit_created_at" AS "noticeOfIntentType_audit_created_at", "noticeOfIntentType"."audit_updated_at" AS "noticeOfIntentType_audit_updated_at", "noticeOfIntentType"."audit_created_by" AS "noticeOfIntentType_audit_created_by", "noticeOfIntentType"."audit_updated_by" AS "noticeOfIntentType_audit_updated_by", "noticeOfIntentType"."label" AS "noticeOfIntentType_label", "noticeOfIntentType"."code" AS "noticeOfIntentType_code", "noticeOfIntentType"."description" AS "noticeOfIntentType_description", "noticeOfIntentType"."short_label" AS "noticeOfIntentType_short_label", "noticeOfIntentType"."background_color" AS "noticeOfIntentType_background_color", "noticeOfIntentType"."text_color" AS "noticeOfIntentType_text_color", "noticeOfIntentType"."html_description" AS "noticeOfIntentType_html_description", "noticeOfIntentType"."portal_label" AS "noticeOfIntentType_portal_label", "localGovernment"."name" AS "local_government_name", "noi_sub"."file_number" AS "file_number", "noi_sub"."local_government_uuid" AS "local_government_uuid", "noi_sub"."type_code" AS "notice_of_intent_type_code", "noi"."date_submitted_to_alc" AS "date_submitted_to_alc", "noi"."decision_date" AS "decision_date", "noi"."region_code" AS "notice_of_intent_region_code", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid") AS "status" FROM "alcs"."notice_of_intent_submission" "noi_sub" INNER JOIN "alcs"."notice_of_intent" "noi" ON "noi"."file_number" = "noi_sub"."file_number" AND "noi"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."notice_of_intent_type" "noticeOfIntentType" ON "noi_sub"."type_code" = "noticeOfIntentType"."code" AND "noticeOfIntentType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "noi_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."notice_of_intent_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "noi_sub"."uuid" LEFT JOIN (SELECT MAX("date") AS "date", notice_of_intent_uuid AS "notice_of_intent_uuid" FROM "alcs"."notice_of_intent_decision" "decision_date" WHERE "decision_date"."audit_deleted_date_at" IS NULL GROUP BY notice_of_intent_uuid) "decision_date" ON decision_date."notice_of_intent_uuid" = "noi"."uuid" WHERE ( "noi_sub"."is_draft" = FALSE AND ("noi"."date_received_all_items" IS NOT NULL AND "noi"."date_received_all_items" <= NOW()) AND alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid")->>\'status_type_code\' != \'CNCL\' ) AND ( "noi_sub"."audit_deleted_date_at" IS NULL )', + ], + ); + } +} From 709d436d7039bf9660e0a348ea81350a82aefd92 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Wed, 15 Nov 2023 13:40:03 -0800 Subject: [PATCH 641/954] Add returned to LG to Visible Government Statuses * LGs should be applications assigned to them in the returned to LFNG status --- .../application-submission/application-submission.service.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.service.ts b/services/apps/alcs/src/portal/application-submission/application-submission.service.ts index e8edc6484b..315b9f1ca6 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.service.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.service.ts @@ -46,6 +46,7 @@ const LG_VISIBLE_STATUSES = [ SUBMISSION_STATUS.IN_REVIEW_BY_ALC, SUBMISSION_STATUS.ALC_DECISION, SUBMISSION_STATUS.REFUSED_TO_FORWARD_LG, + SUBMISSION_STATUS.RETURNED_TO_LG, SUBMISSION_STATUS.CANCELLED, ]; From d60ece1a199e2409e85154712e075d35b1f12f87 Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Thu, 16 Nov 2023 08:40:14 -0800 Subject: [PATCH 642/954] Disambiguate modification permitted card types --- .../1700095432841-update_noi_mod_label.ts | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1700095432841-update_noi_mod_label.ts diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1700095432841-update_noi_mod_label.ts b/services/apps/alcs/src/providers/typeorm/migrations/1700095432841-update_noi_mod_label.ts new file mode 100644 index 0000000000..94000b0da3 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1700095432841-update_noi_mod_label.ts @@ -0,0 +1,13 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class UpdateNoiModLabel1700095432841 implements MigrationInterface { + public async up(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `UPDATE "alcs"."card_type" SET "label" = 'NOI Modification' WHERE "code" = 'NOIM'`, + ); + } + + public async down(queryRunner: QueryRunner): Promise<void> { + // Nope + } +} From 741947742adb3dbeef69a0f90fbb274a2c758d24 Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Thu, 16 Nov 2023 09:27:43 -0800 Subject: [PATCH 643/954] fixes, mobile search view --- .../src/app/features/public/search/public-search.component.ts | 2 +- .../public/search/search-list/search-list.component.html | 1 + .../src/app/features/public/search/search.interface.ts | 1 + portal-frontend/src/app/services/search/search.dto.ts | 3 ++- 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/portal-frontend/src/app/features/public/search/public-search.component.ts b/portal-frontend/src/app/features/public/search/public-search.component.ts index 882f06ec5f..f0560fb802 100644 --- a/portal-frontend/src/app/features/public/search/public-search.component.ts +++ b/portal-frontend/src/app/features/public/search/public-search.component.ts @@ -390,7 +390,7 @@ export class PublicSearchComponent implements OnInit, OnDestroy { this.notifications = searchResult.notifications; this.notificationTotal = searchResult.totalNotifications; - this.outcome = searchResult.outcome; + this.outcome = searchResult.outcome || '-'; } private setActiveTab() { diff --git a/portal-frontend/src/app/features/public/search/search-list/search-list.component.html b/portal-frontend/src/app/features/public/search/search-list/search-list.component.html index bcbafa4825..f93e5600c5 100644 --- a/portal-frontend/src/app/features/public/search/search-list/search-list.component.html +++ b/portal-frontend/src/app/features/public/search/search-list/search-list.component.html @@ -3,6 +3,7 @@ <div class="subheading2">{{ result.fileNumber }} - {{ result.ownerName }}</div> <div [title]="result.type">{{ result.type }}</div> <div [title]="result.localGovernmentName">{{ result.localGovernmentName }}</div> + <div>Outcome: {{ result?.outcome }}</div> <div>Last Updated: {{ result.lastUpdate | momentFormat }}</div> <div *ngIf="result.status" diff --git a/portal-frontend/src/app/features/public/search/search.interface.ts b/portal-frontend/src/app/features/public/search/search.interface.ts index c79a6e04aa..aca7c4286c 100644 --- a/portal-frontend/src/app/features/public/search/search.interface.ts +++ b/portal-frontend/src/app/features/public/search/search.interface.ts @@ -20,5 +20,6 @@ export interface SearchResult { portalStatus?: string; referenceId: string; class: string; + outcome?: string; status?: ApplicationStatusDto | NoticeOfIntentSubmissionStatusDto | NotificationSubmissionStatusDto; } diff --git a/portal-frontend/src/app/services/search/search.dto.ts b/portal-frontend/src/app/services/search/search.dto.ts index 218dd2a3bc..c140ae3627 100644 --- a/portal-frontend/src/app/services/search/search.dto.ts +++ b/portal-frontend/src/app/services/search/search.dto.ts @@ -6,6 +6,7 @@ export interface BaseSearchResultDto { localGovernmentName: string; boardCode?: string; ownerName: string; + outcome?: string; dateSubmitted: number; lastUpdate: number; status?: string; @@ -23,7 +24,7 @@ export interface SearchResponseDto { totalApplications: number; totalNoticeOfIntents: number; totalNotifications: number; - outcome: string; + outcome?: string; } export interface AdvancedSearchEntityResponseDto<T> { From 1f4974a1d7a7bfb90b7b5f858b2cfa84126abbdc Mon Sep 17 00:00:00 2001 From: "to. sandra" <76515860+sandratoh@users.noreply.github.com> Date: Thu, 16 Nov 2023 09:39:23 -0800 Subject: [PATCH 644/954] Change noi end date to optional and fix duplicate document upload (#1159) --- .../decision-component/decision-component.component.ts | 6 +++--- .../decision-document-upload-dialog.component.ts | 5 ++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.ts b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.ts index 44ea906cce..59558a6b64 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.ts @@ -44,10 +44,10 @@ export class DecisionComponentComponent implements OnInit { averageDepthToRemove = new FormControl<number | null>(null, [Validators.required]); //pfrs - endDate2 = new FormControl<Date | null>(null, [Validators.required]); + endDate2 = new FormControl<Date | null>(null); // general - endDate = new FormControl<Date | null>(null, [Validators.required]); + endDate = new FormControl<Date | null>(null); alrArea = new FormControl<number | null>(null, [Validators.required]); agCap = new FormControl<string | null>(null, [Validators.required]); agCapSource = new FormControl<string | null>(null, [Validators.required]); @@ -101,7 +101,7 @@ export class DecisionComponentComponent implements OnInit { agCapConsultant: this.agCapConsultant.value ? this.agCapConsultant.value : null, noticeOfIntentDecisionComponentTypeCode: this.data.noticeOfIntentDecisionComponentTypeCode, noticeOfIntentDecisionComponentType: this.codes.decisionComponentTypes.find( - (e) => e.code === this.data.noticeOfIntentDecisionComponentTypeCode + (e) => e.code === this.data.noticeOfIntentDecisionComponentTypeCode, )!, noticeOfIntentDecisionUuid: this.data.uuid, uuid: this.data.uuid, diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-file-upload-dialog/decision-document-upload-dialog.component.ts b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-file-upload-dialog/decision-document-upload-dialog.component.ts index b6945f20bc..cf968253e6 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-file-upload-dialog/decision-document-upload-dialog.component.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-file-upload-dialog/decision-document-upload-dialog.component.ts @@ -45,7 +45,7 @@ export class DecisionDocumentUploadDialogComponent implements OnInit { public data: { fileId: string; decisionUuid: string; existingDocument?: NoticeOfIntentDecisionDocumentDto }, protected dialog: MatDialogRef<any>, private decisionService: NoticeOfIntentDecisionV2Service, - private toastService: ToastService + private toastService: ToastService, ) {} ngOnInit(): void { @@ -67,7 +67,6 @@ export class DecisionDocumentUploadDialogComponent implements OnInit { if (this.data.existingDocument) { await this.decisionService.deleteFile(this.data.decisionUuid, this.data.existingDocument.uuid); } - await this.decisionService.uploadFile(this.data.decisionUuid, renamedFile); try { await this.decisionService.uploadFile(this.data.decisionUuid, renamedFile); @@ -119,7 +118,7 @@ export class DecisionDocumentUploadDialogComponent implements OnInit { await this.decisionService.downloadFile( this.data.decisionUuid, this.data.existingDocument.uuid, - this.data.existingDocument.fileName + this.data.existingDocument.fileName, ); } } From 20427b0e118306dda5df824081d023df0430d3c2 Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Thu, 16 Nov 2023 11:40:51 -0800 Subject: [PATCH 645/954] Use correct JSON property for owner name on mobile --- .../features/home/inbox/inbox-list/inbox-list.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/portal-frontend/src/app/features/home/inbox/inbox-list/inbox-list.component.html b/portal-frontend/src/app/features/home/inbox/inbox-list/inbox-list.component.html index 50a5f4f673..8dd761e24e 100644 --- a/portal-frontend/src/app/features/home/inbox/inbox-list/inbox-list.component.html +++ b/portal-frontend/src/app/features/home/inbox/inbox-list/inbox-list.component.html @@ -7,7 +7,7 @@ hoverable: result.routerLink }" > - <div class="subheading2">{{ result.fileNumber }} - {{ result.applicant ?? '(Unknown)' }}</div> + <div class="subheading2">{{ result.fileNumber }} - {{ result.ownerName ?? '(Unknown)' }}</div> <div>Created: {{ result.createdAt | momentFormat }}</div> <div [title]="result.type">{{ result.type }}</div> <div From ce1ae09c590b1942870dce85622fe3c5bb25bcad Mon Sep 17 00:00:00 2001 From: Liam Stoddard <lstodd@protonmail.com> Date: Thu, 16 Nov 2023 11:56:19 -0800 Subject: [PATCH 646/954] db issues --- .../applications/app_rx_items.py | 129 ++++++++++++++++++ .../applications/migrate_application.py | 2 + .../sql/application-prep/app_rx_all_items.sql | 9 ++ .../app_rx_all_items_count.sql | 9 ++ 4 files changed, 149 insertions(+) create mode 100644 bin/migrate-oats-data/applications/app_rx_items.py create mode 100644 bin/migrate-oats-data/applications/sql/application-prep/app_rx_all_items.sql create mode 100644 bin/migrate-oats-data/applications/sql/application-prep/app_rx_all_items_count.sql diff --git a/bin/migrate-oats-data/applications/app_rx_items.py b/bin/migrate-oats-data/applications/app_rx_items.py new file mode 100644 index 0000000000..05529cc296 --- /dev/null +++ b/bin/migrate-oats-data/applications/app_rx_items.py @@ -0,0 +1,129 @@ +from common import ( + BATCH_UPLOAD_SIZE, + setup_and_get_logger, + add_timezone_and_keep_date_part, + set_time, +) +from db import inject_conn_pool +from psycopg2.extras import RealDictCursor, execute_batch + +etl_name = "update_application_date_rx_all_items" +logger = setup_and_get_logger(etl_name) + + +@inject_conn_pool +def update_application_date_rx_all_items(conn=None, batch_size=BATCH_UPLOAD_SIZE): + """ + This function is responsible for populating date_received_all_items in application in ALCS. + + Args: + conn (psycopg2.extensions.connection): PostgreSQL database connection. Provided by the decorator. + batch_size (int): The number of items to process at once. Defaults to BATCH_UPLOAD_SIZE. + """ + + logger.info("Start update_application_date_rx_all_items") + with conn.cursor(cursor_factory=RealDictCursor) as cursor: + with open( + "applications/sql/application-prep/app_rx_all_items_count.sql", + "r", + encoding="utf-8", + ) as sql_file: + count_query = sql_file.read() + cursor.execute(count_query) + count_total = dict(cursor.fetchone())["count"] + logger.info(f"Total Application data to update: {count_total}") + + failed_inserts = 0 + successful_updates_count = 0 + last_application_id = 0 + + with open( + "applications/sql/application-prep/app_rx_all_items.sql", + "r", + encoding="utf-8", + ) as sql_file: + application_sql = sql_file.read() + while True: + cursor.execute( + f"{application_sql} AND alr_application_id > {last_application_id} ORDER BY alr_application_id;" + ) + + rows = cursor.fetchmany(batch_size) + + if not rows: + break + try: + records_to_be_updated_count = len(rows) + + _update_fee_fields_records(conn, batch_size, cursor, rows) + + successful_updates_count = ( + successful_updates_count + records_to_be_updated_count + ) + last_application_id = dict(rows[-1])["alr_application_id"] + + logger.debug( + f"Retrieved/updated items count: {records_to_be_updated_count}; total successfully updated applications so far {successful_updates_count}; last updated alr_application_id: {last_application_id}" + ) + except Exception as err: + # this is NOT going to be caused by actual data update failure. This code is only executed when the code error appears or connection to DB is lost + logger.exception() + conn.rollback() + failed_inserts = count_total - successful_updates_count + last_application_id = last_application_id + 1 + + logger.info( + f"Finished {etl_name}: total amount of successful updates {successful_updates_count}, total failed updates {failed_inserts}" + ) + + +def _update_fee_fields_records(conn, batch_size, cursor, rows): + parsed_data_list = _prepare_oats_alr_applications_data(rows) + + execute_batch( + cursor, + _rx_items_query, + parsed_data_list, + page_size=batch_size, + ) + + conn.commit() + + +_rx_items_query = """ + UPDATE alcs.application + SET date_received_all_items = %(date_to_insert)s + WHERE alcs.application.file_number = %(alr_application_id)s::text +""" + + +def _prepare_oats_alr_applications_data(row_data_list): + mapped_data_list = [] + for row in row_data_list: + data = dict(row) + # print(data) + # print("data before mapping") + data = _map_rx_date(data) + # print("data after mapping") + # print(data) + mapped_data_list.append(data) + return mapped_data_list + + +def _map_rx_date(data): + completion_date = data.get("completion_date", "") + accomplishment_code = data.get("accomplishment_code", "") + # rx_date = data.get("date_received_all_items", "") + + # if rx_date: + # data["date_to_insert"] = set_time(rx_date) + if accomplishment_code == "AKC" and completion_date: + date = add_timezone_and_keep_date_part(completion_date) + data["date_to_insert"] = set_time(date) + elif accomplishment_code == "SAL" and completion_date: + date = add_timezone_and_keep_date_part(completion_date) + data["date_to_insert"] = set_time(date) + else: + data["date_to_insert"] = "" + + return data diff --git a/bin/migrate-oats-data/applications/migrate_application.py b/bin/migrate-oats-data/applications/migrate_application.py index ad384a5988..6215482d5d 100644 --- a/bin/migrate-oats-data/applications/migrate_application.py +++ b/bin/migrate-oats-data/applications/migrate_application.py @@ -7,6 +7,7 @@ ) from .base_applications import process_applications, clean_applications from .app_prep import process_alcs_application_prep_fields +from .app_rx_items import update_application_date_rx_all_items from .application_submission_status_email import ( process_application_submission_status_emails, clean_application_submission_status_emails, @@ -15,6 +16,7 @@ def process_application_etl(batch_size): process_alcs_application_prep_fields(batch_size) + update_application_date_rx_all_items(batch_size) process_alcs_app_submissions(batch_size) process_application_statuses(batch_size) process_application_parcels(batch_size) diff --git a/bin/migrate-oats-data/applications/sql/application-prep/app_rx_all_items.sql b/bin/migrate-oats-data/applications/sql/application-prep/app_rx_all_items.sql new file mode 100644 index 0000000000..d6e9d9bb70 --- /dev/null +++ b/bin/migrate-oats-data/applications/sql/application-prep/app_rx_all_items.sql @@ -0,0 +1,9 @@ +SELECT + oa.completion_date, + oa.accomplishment_code, + oa.alr_application_id +FROM + alcs.application aa + JOIN oats.oats_accomplishments oa ON oa.alr_application_id::TEXT = aa.file_number + WHERE oa.accomplishment_code IN ('AKC','SAL') AND aa.date_received_all_items IS NULL + \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/sql/application-prep/app_rx_all_items_count.sql b/bin/migrate-oats-data/applications/sql/application-prep/app_rx_all_items_count.sql new file mode 100644 index 0000000000..a4df38cebb --- /dev/null +++ b/bin/migrate-oats-data/applications/sql/application-prep/app_rx_all_items_count.sql @@ -0,0 +1,9 @@ +SELECT + count(*) +FROM + alcs.application aa + JOIN oats.oats_accomplishments oa ON oa.alr_application_id::TEXT = aa.file_number +WHERE + oa.accomplishment_code IN ('AKC', 'SAL') + AND aa.date_received_all_items IS NULL + \ No newline at end of file From 731e131599667214a7be2f04d94e12b5c36a47b4 Mon Sep 17 00:00:00 2001 From: Liam Stoddard <lstodd@protonmail.com> Date: Thu, 16 Nov 2023 16:39:06 -0800 Subject: [PATCH 647/954] fix db issues, count is correct --- .../applications/app_rx_items.py | 41 +++++++++++-------- .../applications/base_applications.py | 6 ++- .../app_rx_all_items_count.sql | 20 ++++++--- 3 files changed, 43 insertions(+), 24 deletions(-) diff --git a/bin/migrate-oats-data/applications/app_rx_items.py b/bin/migrate-oats-data/applications/app_rx_items.py index 05529cc296..80d080a7fa 100644 --- a/bin/migrate-oats-data/applications/app_rx_items.py +++ b/bin/migrate-oats-data/applications/app_rx_items.py @@ -53,9 +53,11 @@ def update_application_date_rx_all_items(conn=None, batch_size=BATCH_UPLOAD_SIZE if not rows: break try: - records_to_be_updated_count = len(rows) + # records_to_be_updated_count = len(rows) - _update_fee_fields_records(conn, batch_size, cursor, rows) + records_to_be_updated_count = _update_fee_fields_records( + conn, batch_size, cursor, rows + ) successful_updates_count = ( successful_updates_count + records_to_be_updated_count @@ -63,7 +65,7 @@ def update_application_date_rx_all_items(conn=None, batch_size=BATCH_UPLOAD_SIZE last_application_id = dict(rows[-1])["alr_application_id"] logger.debug( - f"Retrieved/updated items count: {records_to_be_updated_count}; total successfully updated applications so far {successful_updates_count}; last updated alr_application_id: {last_application_id}" + f"Retrieved/updated items count: {records_to_be_updated_count}; total successfully updated applications so far {successful_updates_count}; last updated application_id: {last_application_id}" ) except Exception as err: # this is NOT going to be caused by actual data update failure. This code is only executed when the code error appears or connection to DB is lost @@ -79,7 +81,7 @@ def update_application_date_rx_all_items(conn=None, batch_size=BATCH_UPLOAD_SIZE def _update_fee_fields_records(conn, batch_size, cursor, rows): parsed_data_list = _prepare_oats_alr_applications_data(rows) - + actual_inserts = len(parsed_data_list) execute_batch( cursor, _rx_items_query, @@ -88,6 +90,7 @@ def _update_fee_fields_records(conn, batch_size, cursor, rows): ) conn.commit() + return actual_inserts _rx_items_query = """ @@ -101,29 +104,33 @@ def _prepare_oats_alr_applications_data(row_data_list): mapped_data_list = [] for row in row_data_list: data = dict(row) - # print(data) - # print("data before mapping") data = _map_rx_date(data) - # print("data after mapping") - # print(data) mapped_data_list.append(data) - return mapped_data_list + filtered_data = [ + item + for item in mapped_data_list + if item["accomplishment_code"] == "AKC" + or not any( + entry["accomplishment_code"] == "AKC" + for entry in mapped_data_list + if entry["alr_application_id"] == item["alr_application_id"] + ) + ] + return filtered_data def _map_rx_date(data): completion_date = data.get("completion_date", "") accomplishment_code = data.get("accomplishment_code", "") - # rx_date = data.get("date_received_all_items", "") - # if rx_date: - # data["date_to_insert"] = set_time(rx_date) if accomplishment_code == "AKC" and completion_date: date = add_timezone_and_keep_date_part(completion_date) data["date_to_insert"] = set_time(date) - elif accomplishment_code == "SAL" and completion_date: - date = add_timezone_and_keep_date_part(completion_date) - data["date_to_insert"] = set_time(date) - else: - data["date_to_insert"] = "" + elif data.get("date_to_insert") is None: + if accomplishment_code == "SAL" and completion_date: + date = add_timezone_and_keep_date_part(completion_date) + data["date_to_insert"] = set_time(date) + else: + data["date_to_insert"] = None return data diff --git a/bin/migrate-oats-data/applications/base_applications.py b/bin/migrate-oats-data/applications/base_applications.py index fd2b788d7a..30c515de6c 100644 --- a/bin/migrate-oats-data/applications/base_applications.py +++ b/bin/migrate-oats-data/applications/base_applications.py @@ -85,11 +85,15 @@ def clean_applications(conn=None): logger.info("Start applications cleaning") with conn.cursor() as cursor: logger.debug("Start applications cleaning") + cursor.execute("DROP INDEX IF EXISTS alcs.idx_audit_created_by") + cursor.execute( + "CREATE INDEX idx_audit_created_by ON alcs.application(audit_created_by)" + ) cursor.execute( "DELETE FROM alcs.application a WHERE a.audit_created_by = 'oats_etl'" ) logger.info(f"Deleted items count = {cursor.rowcount}") - + cursor.execute("DROP INDEX IF EXISTS alcs.idx_audit_created_by") cursor.execute("DROP TABLE IF EXISTS oats.alcs_etl_application_exclude") cursor.execute("DROP TABLE IF EXISTS oats.alcs_etl_application_duplicate") logger.info(f"Temporary tables dropped") diff --git a/bin/migrate-oats-data/applications/sql/application-prep/app_rx_all_items_count.sql b/bin/migrate-oats-data/applications/sql/application-prep/app_rx_all_items_count.sql index a4df38cebb..d7ff1fe416 100644 --- a/bin/migrate-oats-data/applications/sql/application-prep/app_rx_all_items_count.sql +++ b/bin/migrate-oats-data/applications/sql/application-prep/app_rx_all_items_count.sql @@ -1,9 +1,17 @@ +WITH + insert_count AS ( + SELECT + aa.file_number + FROM + alcs.application aa + JOIN oats.oats_accomplishments oa ON oa.alr_application_id::TEXT = aa.file_number + WHERE + oa.accomplishment_code IN ('AKC', 'SAL') + AND aa.date_received_all_items IS NULL + GROUP BY + aa.file_number + ) SELECT count(*) FROM - alcs.application aa - JOIN oats.oats_accomplishments oa ON oa.alr_application_id::TEXT = aa.file_number -WHERE - oa.accomplishment_code IN ('AKC', 'SAL') - AND aa.date_received_all_items IS NULL - \ No newline at end of file + insert_count \ No newline at end of file From 55db7f38472d9a714e49330e80f55d73c2e324f5 Mon Sep 17 00:00:00 2001 From: Liam Stoddard <lstodd@protonmail.com> Date: Thu, 16 Nov 2023 17:37:46 -0800 Subject: [PATCH 648/954] rx noi --- .../noi/notice_of_intent_migration.py | 5 + .../__init__.py | 1 + .../notice_of_intent_rx_all_items.py | 134 ++++++++++++++++++ .../notice_of_intent_rx_all_items.sql | 9 ++ .../notice_of_intent_rx_all_items_count.sql | 17 +++ 5 files changed, 166 insertions(+) create mode 100644 bin/migrate-oats-data/noi/oats_to_alcs_notice_of_intent_table_etl/notice_of_intent_rx_all_items.py create mode 100644 bin/migrate-oats-data/noi/sql/notice_of_intent_base/notice_of_intent_rx_all_items.sql create mode 100644 bin/migrate-oats-data/noi/sql/notice_of_intent_base/notice_of_intent_rx_all_items_count.sql diff --git a/bin/migrate-oats-data/noi/notice_of_intent_migration.py b/bin/migrate-oats-data/noi/notice_of_intent_migration.py index 47ced0f7e8..2accb2cb6d 100644 --- a/bin/migrate-oats-data/noi/notice_of_intent_migration.py +++ b/bin/migrate-oats-data/noi/notice_of_intent_migration.py @@ -24,6 +24,9 @@ from .oats_to_alcs_notice_of_intent_table_etl.oats_to_alcs_notice_of_intent_table_etl import ( process_alcs_notice_of_intent_base_fields, ) +from .oats_to_alcs_notice_of_intent_table_etl.notice_of_intent_rx_all_items import ( + update_notice_of_intent_date_rx_all_items, +) from .notice_of_intent_submissions.parcels import ( init_notice_of_intent_parcels, @@ -47,6 +50,8 @@ def process_notice_of_intent(batch_size): # place the rest notice of intent processing functions here process_alcs_notice_of_intent_base_fields(batch_size) + update_notice_of_intent_date_rx_all_items(batch_size) + process_alcs_notice_of_intent_decision_date(batch_size) init_notice_of_intent_submissions(batch_size) diff --git a/bin/migrate-oats-data/noi/oats_to_alcs_notice_of_intent_table_etl/__init__.py b/bin/migrate-oats-data/noi/oats_to_alcs_notice_of_intent_table_etl/__init__.py index c47d9f3610..3de24653c3 100644 --- a/bin/migrate-oats-data/noi/oats_to_alcs_notice_of_intent_table_etl/__init__.py +++ b/bin/migrate-oats-data/noi/oats_to_alcs_notice_of_intent_table_etl/__init__.py @@ -1,3 +1,4 @@ from .oats_to_alcs_notice_of_intent_table_etl import ( process_alcs_notice_of_intent_base_fields, ) +from .notice_of_intent_rx_all_items import update_notice_of_intent_date_rx_all_items diff --git a/bin/migrate-oats-data/noi/oats_to_alcs_notice_of_intent_table_etl/notice_of_intent_rx_all_items.py b/bin/migrate-oats-data/noi/oats_to_alcs_notice_of_intent_table_etl/notice_of_intent_rx_all_items.py new file mode 100644 index 0000000000..c18bf7f61b --- /dev/null +++ b/bin/migrate-oats-data/noi/oats_to_alcs_notice_of_intent_table_etl/notice_of_intent_rx_all_items.py @@ -0,0 +1,134 @@ +from common import ( + BATCH_UPLOAD_SIZE, + setup_and_get_logger, + add_timezone_and_keep_date_part, + set_time, +) +from db import inject_conn_pool +from psycopg2.extras import RealDictCursor, execute_batch + +etl_name = "update_notice_of_intent_date_rx_all_items" +logger = setup_and_get_logger(etl_name) + + +@inject_conn_pool +def update_notice_of_intent_date_rx_all_items(conn=None, batch_size=BATCH_UPLOAD_SIZE): + """ + This function is responsible for populating date_received_all_items in application in ALCS. + + Args: + conn (psycopg2.extensions.connection): PostgreSQL database connection. Provided by the decorator. + batch_size (int): The number of items to process at once. Defaults to BATCH_UPLOAD_SIZE. + """ + + logger.info("Start update_noi_date_rx_all_items") + with conn.cursor(cursor_factory=RealDictCursor) as cursor: + with open( + "noi/sql/notice_of_intent_base/notice_of_intent_rx_all_items_count.sql", + "r", + encoding="utf-8", + ) as sql_file: + count_query = sql_file.read() + cursor.execute(count_query) + count_total = dict(cursor.fetchone())["count"] + logger.info(f"Total NOI data to update: {count_total}") + + failed_inserts = 0 + successful_updates_count = 0 + last_application_id = 0 + + with open( + "noi/sql/notice_of_intent_base/notice_of_intent_rx_all_items.sql", + "r", + encoding="utf-8", + ) as sql_file: + application_sql = sql_file.read() + while True: + cursor.execute( + f"{application_sql} AND alr_application_id > {last_application_id} ORDER BY alr_application_id;" + ) + + rows = cursor.fetchmany(batch_size) + + if not rows: + break + try: + records_to_be_updated_count = _update_fee_fields_records( + conn, batch_size, cursor, rows + ) + + successful_updates_count = ( + successful_updates_count + records_to_be_updated_count + ) + last_application_id = dict(rows[-1])["alr_application_id"] + + logger.debug( + f"Retrieved/updated items count: {records_to_be_updated_count}; total successfully updated notice_of_intents so far {successful_updates_count}; last updated application_id: {last_application_id}" + ) + except Exception as err: + # this is NOT going to be caused by actual data update failure. This code is only executed when the code error appears or connection to DB is lost + logger.exception() + conn.rollback() + failed_inserts = count_total - successful_updates_count + last_application_id = last_application_id + 1 + + logger.info( + f"Finished {etl_name}: total amount of successful updates {successful_updates_count}, total failed updates {failed_inserts}" + ) + + +def _update_fee_fields_records(conn, batch_size, cursor, rows): + parsed_data_list = _prepare_oats_noi_data(rows) + actual_inserts = len(parsed_data_list) + execute_batch( + cursor, + _rx_items_query, + parsed_data_list, + page_size=batch_size, + ) + + conn.commit() + return actual_inserts + + +_rx_items_query = """ + UPDATE alcs.notice_of_intent + SET date_received_all_items = %(date_to_insert)s + WHERE alcs.notice_of_intent.file_number = %(alr_application_id)s::text +""" + + +def _prepare_oats_noi_data(row_data_list): + mapped_data_list = [] + for row in row_data_list: + data = dict(row) + data = _map_rx_date(data) + mapped_data_list.append(data) + filtered_data = [ + item + for item in mapped_data_list + if item["accomplishment_code"] == "AKC" + or not any( + entry["accomplishment_code"] == "AKC" + for entry in mapped_data_list + if entry["alr_application_id"] == item["alr_application_id"] + ) + ] + return filtered_data + + +def _map_rx_date(data): + completion_date = data.get("completion_date", "") + accomplishment_code = data.get("accomplishment_code", "") + + if accomplishment_code == "AKC" and completion_date: + date = add_timezone_and_keep_date_part(completion_date) + data["date_to_insert"] = set_time(date) + elif data.get("date_to_insert") is None: + if accomplishment_code == "SAL" and completion_date: + date = add_timezone_and_keep_date_part(completion_date) + data["date_to_insert"] = set_time(date) + else: + data["date_to_insert"] = None + + return data diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_base/notice_of_intent_rx_all_items.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_base/notice_of_intent_rx_all_items.sql new file mode 100644 index 0000000000..363ec85892 --- /dev/null +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_base/notice_of_intent_rx_all_items.sql @@ -0,0 +1,9 @@ +SELECT + oa.completion_date, + oa.accomplishment_code, + oa.alr_application_id +FROM + alcs.notice_of_intent noi + JOIN oats.oats_accomplishments oa ON oa.alr_application_id::TEXT = noi.file_number + WHERE oa.accomplishment_code IN ('AKC','SAL') AND noi.date_received_all_items IS NULL + \ No newline at end of file diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_base/notice_of_intent_rx_all_items_count.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_base/notice_of_intent_rx_all_items_count.sql new file mode 100644 index 0000000000..5dd9803d24 --- /dev/null +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_base/notice_of_intent_rx_all_items_count.sql @@ -0,0 +1,17 @@ +WITH + insert_count AS ( + SELECT + noi.file_number + FROM + alcs.notice_of_intent noi + JOIN oats.oats_accomplishments oa ON oa.alr_application_id::TEXT = noi.file_number + WHERE + oa.accomplishment_code IN ('AKC', 'SAL') + AND noi.date_received_all_items IS NULL + GROUP BY + noi.file_number + ) +SELECT + count(*) +FROM + insert_count \ No newline at end of file From 84f89ffe2be49e4ce5bbebcca558c963b6c53844 Mon Sep 17 00:00:00 2001 From: Liam Stoddard <lstodd@protonmail.com> Date: Thu, 16 Nov 2023 18:11:52 -0800 Subject: [PATCH 649/954] added proxy filter --- bin/migrate-oats-data/applications/app_rx_items.py | 4 +--- .../applications/sql/application-prep/app_rx_all_items.sql | 2 ++ .../sql/application-prep/app_rx_all_items_count.sql | 2 ++ .../notice_of_intent_rx_all_items.py | 4 ++-- .../notice_of_intent_base/notice_of_intent_rx_all_items.sql | 2 ++ .../notice_of_intent_rx_all_items_count.sql | 2 ++ 6 files changed, 11 insertions(+), 5 deletions(-) diff --git a/bin/migrate-oats-data/applications/app_rx_items.py b/bin/migrate-oats-data/applications/app_rx_items.py index 80d080a7fa..d0add7c5ff 100644 --- a/bin/migrate-oats-data/applications/app_rx_items.py +++ b/bin/migrate-oats-data/applications/app_rx_items.py @@ -45,7 +45,7 @@ def update_application_date_rx_all_items(conn=None, batch_size=BATCH_UPLOAD_SIZE application_sql = sql_file.read() while True: cursor.execute( - f"{application_sql} AND alr_application_id > {last_application_id} ORDER BY alr_application_id;" + f"{application_sql} AND oa.alr_application_id > {last_application_id} ORDER BY oa.alr_application_id;" ) rows = cursor.fetchmany(batch_size) @@ -53,8 +53,6 @@ def update_application_date_rx_all_items(conn=None, batch_size=BATCH_UPLOAD_SIZE if not rows: break try: - # records_to_be_updated_count = len(rows) - records_to_be_updated_count = _update_fee_fields_records( conn, batch_size, cursor, rows ) diff --git a/bin/migrate-oats-data/applications/sql/application-prep/app_rx_all_items.sql b/bin/migrate-oats-data/applications/sql/application-prep/app_rx_all_items.sql index d6e9d9bb70..9dcf15d060 100644 --- a/bin/migrate-oats-data/applications/sql/application-prep/app_rx_all_items.sql +++ b/bin/migrate-oats-data/applications/sql/application-prep/app_rx_all_items.sql @@ -5,5 +5,7 @@ SELECT FROM alcs.application aa JOIN oats.oats_accomplishments oa ON oa.alr_application_id::TEXT = aa.file_number + JOIN oats.oats_alr_applications oaa ON aa.file_number = oaa.alr_application_id::TEXT WHERE oa.accomplishment_code IN ('AKC','SAL') AND aa.date_received_all_items IS NULL + AND oaa.who_created IN ('PROXY_OATS_LOCGOV','PROXY_OATS_APPLICANT') \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/sql/application-prep/app_rx_all_items_count.sql b/bin/migrate-oats-data/applications/sql/application-prep/app_rx_all_items_count.sql index d7ff1fe416..e2bc65f123 100644 --- a/bin/migrate-oats-data/applications/sql/application-prep/app_rx_all_items_count.sql +++ b/bin/migrate-oats-data/applications/sql/application-prep/app_rx_all_items_count.sql @@ -5,9 +5,11 @@ WITH FROM alcs.application aa JOIN oats.oats_accomplishments oa ON oa.alr_application_id::TEXT = aa.file_number + JOIN oats.oats_alr_applications oaa ON aa.file_number = oaa.alr_application_id::TEXT WHERE oa.accomplishment_code IN ('AKC', 'SAL') AND aa.date_received_all_items IS NULL + AND oaa.who_created IN ('PROXY_OATS_LOCGOV','PROXY_OATS_APPLICANT') GROUP BY aa.file_number ) diff --git a/bin/migrate-oats-data/noi/oats_to_alcs_notice_of_intent_table_etl/notice_of_intent_rx_all_items.py b/bin/migrate-oats-data/noi/oats_to_alcs_notice_of_intent_table_etl/notice_of_intent_rx_all_items.py index c18bf7f61b..9ac5409e75 100644 --- a/bin/migrate-oats-data/noi/oats_to_alcs_notice_of_intent_table_etl/notice_of_intent_rx_all_items.py +++ b/bin/migrate-oats-data/noi/oats_to_alcs_notice_of_intent_table_etl/notice_of_intent_rx_all_items.py @@ -14,7 +14,7 @@ @inject_conn_pool def update_notice_of_intent_date_rx_all_items(conn=None, batch_size=BATCH_UPLOAD_SIZE): """ - This function is responsible for populating date_received_all_items in application in ALCS. + This function is responsible for populating date_received_all_items in notice_of_intent in ALCS. Args: conn (psycopg2.extensions.connection): PostgreSQL database connection. Provided by the decorator. @@ -45,7 +45,7 @@ def update_notice_of_intent_date_rx_all_items(conn=None, batch_size=BATCH_UPLOAD application_sql = sql_file.read() while True: cursor.execute( - f"{application_sql} AND alr_application_id > {last_application_id} ORDER BY alr_application_id;" + f"{application_sql} AND oa.alr_application_id > {last_application_id} ORDER BY oa.alr_application_id;" ) rows = cursor.fetchmany(batch_size) diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_base/notice_of_intent_rx_all_items.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_base/notice_of_intent_rx_all_items.sql index 363ec85892..d45d2dd1b3 100644 --- a/bin/migrate-oats-data/noi/sql/notice_of_intent_base/notice_of_intent_rx_all_items.sql +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_base/notice_of_intent_rx_all_items.sql @@ -5,5 +5,7 @@ SELECT FROM alcs.notice_of_intent noi JOIN oats.oats_accomplishments oa ON oa.alr_application_id::TEXT = noi.file_number + JOIN oats.oats_alr_applications oaa ON noi.file_number = oaa.alr_application_id::TEXT WHERE oa.accomplishment_code IN ('AKC','SAL') AND noi.date_received_all_items IS NULL + AND oaa.who_created IN ('PROXY_OATS_LOCGOV','PROXY_OATS_APPLICANT') \ No newline at end of file diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_base/notice_of_intent_rx_all_items_count.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_base/notice_of_intent_rx_all_items_count.sql index 5dd9803d24..f827310d14 100644 --- a/bin/migrate-oats-data/noi/sql/notice_of_intent_base/notice_of_intent_rx_all_items_count.sql +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_base/notice_of_intent_rx_all_items_count.sql @@ -5,9 +5,11 @@ WITH FROM alcs.notice_of_intent noi JOIN oats.oats_accomplishments oa ON oa.alr_application_id::TEXT = noi.file_number + JOIN oats.oats_alr_applications oaa ON noi.file_number = oaa.alr_application_id::TEXT WHERE oa.accomplishment_code IN ('AKC', 'SAL') AND noi.date_received_all_items IS NULL + AND oaa.who_created IN ('PROXY_OATS_LOCGOV','PROXY_OATS_APPLICANT') GROUP BY noi.file_number ) From f105e94fe5c17278fe9e5308f92d1cb7587918a9 Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Fri, 17 Nov 2023 08:50:39 -0800 Subject: [PATCH 650/954] fixes --- .../application-search-table.component.ts | 11 ++++------- .../notice-of-intent-search-table.component.ts | 10 ++++------ .../features/public/search/public-search.component.ts | 5 +---- portal-frontend/src/app/services/search/search.dto.ts | 10 +++++++++- .../portal/public/search/public-search.controller.ts | 3 +-- .../src/portal/public/search/public-search.dto.ts | 2 +- 6 files changed, 20 insertions(+), 21 deletions(-) diff --git a/portal-frontend/src/app/features/public/search/application-search-table/application-search-table.component.ts b/portal-frontend/src/app/features/public/search/application-search-table/application-search-table.component.ts index ee12d3f1d3..daf41dc4f0 100644 --- a/portal-frontend/src/app/features/public/search/application-search-table/application-search-table.component.ts +++ b/portal-frontend/src/app/features/public/search/application-search-table/application-search-table.component.ts @@ -5,7 +5,7 @@ import { MatTableDataSource } from '@angular/material/table'; import { Router } from '@angular/router'; import { Subject, takeUntil } from 'rxjs'; import { ApplicationStatusDto } from '../../../../services/application-submission/application-submission.dto'; -import { ApplicationSearchResultDto } from '../../../../services/search/search.dto'; +import { ApplicationSearchResultDto, displayedColumns, outcomeMapping } from '../../../../services/search/search.dto'; import { SearchResult, TableChange } from '../search.interface'; @Component({ @@ -36,12 +36,9 @@ export class ApplicationSearchTableComponent implements OnDestroy { @Input() statuses: ApplicationStatusDto[] = []; @Output() tableChange = new EventEmitter<TableChange>(); - displayedColumns = ['fileId', 'ownerName', 'type', 'portalStatus', 'outcome', 'lastUpdate', 'government']; - outcomeMapping: Record<string, string> = { - 'APPR': "Approved", - 'REFU': "Refused", - 'RESC': "Rescinded", - } + displayedColumns = displayedColumns; + outcomeMapping = outcomeMapping; + dataSource = new MatTableDataSource<SearchResult>(); pageIndex = 0; itemsPerPage = 20; diff --git a/portal-frontend/src/app/features/public/search/notice-of-intent-search-table/notice-of-intent-search-table.component.ts b/portal-frontend/src/app/features/public/search/notice-of-intent-search-table/notice-of-intent-search-table.component.ts index fe343c1e0b..af5b631ad8 100644 --- a/portal-frontend/src/app/features/public/search/notice-of-intent-search-table/notice-of-intent-search-table.component.ts +++ b/portal-frontend/src/app/features/public/search/notice-of-intent-search-table/notice-of-intent-search-table.component.ts @@ -5,7 +5,7 @@ import { MatTableDataSource } from '@angular/material/table'; import { Router } from '@angular/router'; import { Subject, takeUntil } from 'rxjs'; import { ApplicationStatusDto } from '../../../../services/application-submission/application-submission.dto'; -import { NoticeOfIntentSearchResultDto } from '../../../../services/search/search.dto'; +import { NoticeOfIntentSearchResultDto, displayedColumns, outcomeMapping } from '../../../../services/search/search.dto'; import { SearchResult, TableChange } from '../search.interface'; @Component({ @@ -34,11 +34,9 @@ export class NoticeOfIntentSearchTableComponent implements OnDestroy { @Input() statuses: ApplicationStatusDto[] = []; @Output() tableChange = new EventEmitter<TableChange>(); - displayedColumns = ['fileId', 'ownerName', 'type', 'portalStatus', 'outcome', 'lastUpdate', 'government']; - outcomeMapping: Record<string, string> = { - 'APPR': "Approved", - 'ONTP': "Ordered not to Proceed (NOI)", - } + displayedColumns = displayedColumns; + outcomeMapping = outcomeMapping; + dataSource = new MatTableDataSource<SearchResult>(); pageIndex = 0; itemsPerPage = 20; diff --git a/portal-frontend/src/app/features/public/search/public-search.component.ts b/portal-frontend/src/app/features/public/search/public-search.component.ts index f0560fb802..bc19670a65 100644 --- a/portal-frontend/src/app/features/public/search/public-search.component.ts +++ b/portal-frontend/src/app/features/public/search/public-search.component.ts @@ -60,7 +60,6 @@ export class PublicSearchComponent implements OnInit, OnDestroy { notifications: NotificationSearchResultDto[] = []; notificationTotal = 0; - outcome = ''; pageIndex = 0; itemsPerPage = 20; @@ -377,8 +376,7 @@ export class PublicSearchComponent implements OnInit, OnDestroy { notifications: [], totalApplications: 0, totalNoticeOfIntents: 0, - totalNotifications: 0, - outcome: '' + totalNotifications: 0 }; } @@ -390,7 +388,6 @@ export class PublicSearchComponent implements OnInit, OnDestroy { this.notifications = searchResult.notifications; this.notificationTotal = searchResult.totalNotifications; - this.outcome = searchResult.outcome || '-'; } private setActiveTab() { diff --git a/portal-frontend/src/app/services/search/search.dto.ts b/portal-frontend/src/app/services/search/search.dto.ts index c140ae3627..b007c9a07c 100644 --- a/portal-frontend/src/app/services/search/search.dto.ts +++ b/portal-frontend/src/app/services/search/search.dto.ts @@ -24,7 +24,6 @@ export interface SearchResponseDto { totalApplications: number; totalNoticeOfIntents: number; totalNotifications: number; - outcome?: string; } export interface AdvancedSearchEntityResponseDto<T> { @@ -53,3 +52,12 @@ export interface SearchRequestDto extends PagingRequestDto { fileTypes: string[]; decisionOutcome?: string[]; } + +export const displayedColumns = ['fileId', 'ownerName', 'type', 'portalStatus', 'outcome', 'lastUpdate', 'government']; + +export const outcomeMapping: Record<string, string> = { + 'APPR': "Approved", + 'REFU': "Refused", + 'RESC': "Rescinded", + 'ONTP': "Ordered not to Proceed (NOI)" +} \ No newline at end of file diff --git a/services/apps/alcs/src/portal/public/search/public-search.controller.ts b/services/apps/alcs/src/portal/public/search/public-search.controller.ts index f29e268ae8..e5042fd095 100644 --- a/services/apps/alcs/src/portal/public/search/public-search.controller.ts +++ b/services/apps/alcs/src/portal/public/search/public-search.controller.ts @@ -249,8 +249,7 @@ export class PublicSearchController { localGovernmentName: notification.localGovernmentName, ownerName: notification.applicant, class: 'NOTI', - status: notification.status.status_type_code, - outcome: null + status: notification.status.status_type_code }; } } diff --git a/services/apps/alcs/src/portal/public/search/public-search.dto.ts b/services/apps/alcs/src/portal/public/search/public-search.dto.ts index aff7534588..f47564d166 100644 --- a/services/apps/alcs/src/portal/public/search/public-search.dto.ts +++ b/services/apps/alcs/src/portal/public/search/public-search.dto.ts @@ -19,7 +19,7 @@ export class BaseSearchResultDto { status: string; dateSubmitted?: number; lastUpdate?: number; - outcome: string | null; + outcome?: string; class: SearchEntityClass; } From f7002c83ce05f3c0b21eded95f3143f7334e78f5 Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Fri, 17 Nov 2023 08:53:35 -0800 Subject: [PATCH 651/954] foxes --- .../alcs/src/portal/public/search/public-search.controller.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/apps/alcs/src/portal/public/search/public-search.controller.ts b/services/apps/alcs/src/portal/public/search/public-search.controller.ts index e5042fd095..956ba07d4e 100644 --- a/services/apps/alcs/src/portal/public/search/public-search.controller.ts +++ b/services/apps/alcs/src/portal/public/search/public-search.controller.ts @@ -216,7 +216,7 @@ export class PublicSearchController { ownerName: application.applicant, class: 'APP', status: application.status.status_type_code, - outcome: application.outcome + outcome: application.outcome ?? undefined }; } @@ -233,7 +233,7 @@ export class PublicSearchController { ownerName: noi.applicant, class: 'NOI', status: noi.status.status_type_code, - outcome: noi.outcome + outcome: noi.outcome ?? undefined }; } From 43f74de6e9d6963d7507ae303fa2d6a2c530ac80 Mon Sep 17 00:00:00 2001 From: Liam Stoddard <lstodd@protonmail.com> Date: Fri, 17 Nov 2023 11:16:11 -0800 Subject: [PATCH 652/954] added guid and othe missing app sub fields --- .../submissions/data_insert/insert_query.py | 24 ++++++++++++------- .../submissions/sql/app_submission.sql | 5 ++-- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/bin/migrate-oats-data/applications/submissions/data_insert/insert_query.py b/bin/migrate-oats-data/applications/submissions/data_insert/insert_query.py index 6793b1c9f2..1fb565f880 100644 --- a/bin/migrate-oats-data/applications/submissions/data_insert/insert_query.py +++ b/bin/migrate-oats-data/applications/submissions/data_insert/insert_query.py @@ -120,7 +120,8 @@ def get_insert_query(unique_fields, unique_values): purpose, parcels_agriculture_improvement_description, parcels_agriculture_description, - parcels_non_agriculture_use_description + parcels_non_agriculture_use_description, + created_by_uuid {unique_fields} ) VALUES ( @@ -142,7 +143,8 @@ def get_insert_query(unique_fields, unique_values): %(proposal_summary_desc)s, %(agricultural_improvement_desc)s, %(current_land_use_desc)s, - %(non_agricultural_uses_desc)s + %(non_agricultural_uses_desc)s, + %(created_guid)s {unique_values} ) """ @@ -159,7 +161,8 @@ def get_insert_query_for_nfu(): nfu_fill_origin_description, nfu_project_duration_unit, nfu_total_fill_area, - nfu_agriculture_support + nfu_agriculture_support, + nfu_outside_lands """ unique_values = """, %(alr_area)s, %(import_fill)s, @@ -170,7 +173,8 @@ def get_insert_query_for_nfu(): %(fill_origin)s, %(duration_unit)s, %(fill_area)s, - %(support_desc)s + %(support_desc)s, + %(proposal_background_desc)s """ return get_insert_query(unique_fields, unique_values) @@ -269,7 +273,8 @@ def get_insert_query_for_soil(): soil_to_place_maximum_depth, soil_to_place_average_depth, soil_is_follow_up, - soil_follow_up_ids + soil_follow_up_ids, + soil_has_submitted_notice """ unique_values = """, %(remove_type)s, %(impact_reduction_desc)s, @@ -286,7 +291,8 @@ def get_insert_query_for_soil(): %(max_fill_depth)s, %(max_fill_depth)s, %(followup_noi_ind)s, - %(followup_noi_number)s + %(followup_noi_number)s, + %(ministry_notice_ind)s """ return get_insert_query(unique_fields, unique_values) @@ -309,7 +315,8 @@ def get_insert_query_for_pfrs(): soil_to_place_maximum_depth, soil_to_place_average_depth, soil_is_follow_up, - soil_follow_up_ids + soil_follow_up_ids, + soil_has_submitted_notice """ unique_values = """, %(remove_type)s, %(impact_reduction_desc)s, @@ -328,7 +335,8 @@ def get_insert_query_for_pfrs(): %(max_fill_depth)s, %(max_fill_depth)s, %(followup_noi_ind)s, - %(followup_noi_number)s + %(followup_noi_number)s, + %(ministry_notice_ind)s """ return get_insert_query(unique_fields, unique_values) diff --git a/bin/migrate-oats-data/applications/submissions/sql/app_submission.sql b/bin/migrate-oats-data/applications/submissions/sql/app_submission.sql index 35c73c224f..050283f015 100644 --- a/bin/migrate-oats-data/applications/submissions/sql/app_submission.sql +++ b/bin/migrate-oats-data/applications/submissions/sql/app_submission.sql @@ -40,8 +40,9 @@ SELECT oa.non_agricultural_uses_desc, oa.agricultural_improvement_desc, oa.followup_noi_ind, - oa.followup_noi_number - + oa.followup_noi_number, + oa.created_guid, + oa.ministry_notice_ind FROM appl_components_grouped acg LEFT JOIN alcs.application aa ON aa.file_number = acg.alr_application_id::TEXT From 945aa961f32cfca2b6e4c11184b971edf764a3ff Mon Sep 17 00:00:00 2001 From: Liam Stoddard <lstodd@protonmail.com> Date: Fri, 17 Nov 2023 15:41:37 -0800 Subject: [PATCH 653/954] noi guid->uuid --- .../notice_of_intent_proposal_fields.py | 3 ++- .../proposal_fields/notice_of_intent_proposal_fields.sql | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_proposal_fields.py b/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_proposal_fields.py index 0703736f9e..61a93fe56b 100644 --- a/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_proposal_fields.py +++ b/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_proposal_fields.py @@ -101,7 +101,8 @@ def _update_records(conn, batch_size, cursor, rows): soil_has_submitted_notice= %(soil_has_submitted_notice)s, soil_is_extraction_or_mining = FALSE, soil_is_removing_soil_for_new_structure = FALSE, - soil_is_area_wide_filling = FALSE + soil_is_area_wide_filling = FALSE, + created_by_uuid = %(created_guid)s WHERE alcs.notice_of_intent_submission.file_number = %(alr_application_id)s::TEXT """ diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/proposal_fields/notice_of_intent_proposal_fields.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/proposal_fields/notice_of_intent_proposal_fields.sql index 4b45145401..02de277cd4 100644 --- a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/proposal_fields/notice_of_intent_proposal_fields.sql +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/proposal_fields/notice_of_intent_proposal_fields.sql @@ -5,6 +5,7 @@ SELECT oaa.alr_application_id, oaa.agricultural_improvement_desc, oaa.non_agricultural_uses_desc, oaa.followup_noi_number, - oaa.ministry_notice_ref_no + oaa.ministry_notice_ref_no, + oaa.created_guid FROM oats.oats_alr_applications oaa JOIN alcs.notice_of_intent_submission nois ON nois.file_number = oaa.alr_application_id::TEXT \ No newline at end of file From 1c4fc7d168e7d15bf269fb55b947288194ac5748 Mon Sep 17 00:00:00 2001 From: Liam Stoddard <lstodd@protonmail.com> Date: Fri, 17 Nov 2023 16:47:01 -0800 Subject: [PATCH 654/954] inital commit --- bin/migrate-oats-data/common/__init__.py | 1 + .../common/alcs_init_users.py | 125 ++++++++++++++++++ .../sql/common/init_users.sql | 11 ++ .../sql/common/init_users_count.sql | 13 ++ 4 files changed, 150 insertions(+) create mode 100644 bin/migrate-oats-data/common/alcs_init_users.py create mode 100644 bin/migrate-oats-data/sql/common/init_users.sql create mode 100644 bin/migrate-oats-data/sql/common/init_users_count.sql diff --git a/bin/migrate-oats-data/common/__init__.py b/bin/migrate-oats-data/common/__init__.py index 744dcfc2c7..9363975918 100644 --- a/bin/migrate-oats-data/common/__init__.py +++ b/bin/migrate-oats-data/common/__init__.py @@ -9,3 +9,4 @@ from .oats_to_alcs_naru_code_enum import * from .oats_temp_tables import * from .oats_to_alcs_parcel_enum import * +from .alcs_init_users import * diff --git a/bin/migrate-oats-data/common/alcs_init_users.py b/bin/migrate-oats-data/common/alcs_init_users.py new file mode 100644 index 0000000000..0e64a71964 --- /dev/null +++ b/bin/migrate-oats-data/common/alcs_init_users.py @@ -0,0 +1,125 @@ +from common import BATCH_UPLOAD_SIZE, OATS_ETL_USER, setup_and_get_logger +from db import inject_conn_pool +from psycopg2.extras import RealDictCursor, execute_batch + +etl_name = "init_alcs_users" +logger = setup_and_get_logger(etl_name) + + +@inject_conn_pool +def init_alcs_users(conn=None, batch_size=BATCH_UPLOAD_SIZE): + """ + This function is responsible for initializing the users table in ALCS. + + Args: + conn (psycopg2.extensions.connection): PostgreSQL database connection. Provided by the decorator. + batch_size (int): The number of items to process at once. Defaults to BATCH_UPLOAD_SIZE. + """ + + logger.info(f"Start {etl_name}") + with conn.cursor(cursor_factory=RealDictCursor) as cursor: + with open( + "sql/common/init_users_count.sql", + "r", + encoding="utf-8", + ) as sql_file: + count_query = sql_file.read() + cursor.execute(count_query) + count_total = dict(cursor.fetchone())["count"] + logger.info(f"Total users data to insert: {count_total}") + + failed_inserts = 0 + successful_inserts_count = 0 + last_submission_id = 0 + + with open( + "sql/common/init_users.sql", + "r", + encoding="utf-8", + ) as sql_file: + submission_sql = sql_file.read() + while True: + cursor.execute( + f"{submission_sql} WHERE oas.alc_staff_id > {last_submission_id} ORDER BY oas.alc_staff_id;" + ) + + rows = cursor.fetchmany(batch_size) + + if not rows: + break + try: + users_to_be_inserted_count = len(rows) + + _insert_users(conn, batch_size, cursor, rows) + + successful_inserts_count = ( + successful_inserts_count + users_to_be_inserted_count + ) + last_submission_id = dict(rows[-1])["alc_staff_id"] + + logger.debug( + f"retrieved/inserted items count: {users_to_be_inserted_count}; total successfully inserted users so far {successful_inserts_count}; last inserted alr_application_id: {last_submission_id}" + ) + except Exception as err: + logger.exception() + conn.rollback() + failed_inserts = count_total - successful_inserts_count + last_submission_id = last_submission_id + 1 + + logger.info( + f"Finished {etl_name}: total amount of successful inserts {successful_inserts_count}, total failed inserts {failed_inserts}" + ) + + +def _insert_users(conn, batch_size, cursor, rows): + """ """ + query = _get_insert_query() + parsed_data_list = _prepare_users_data(rows) + + if len(parsed_data_list) > 0: + execute_batch(cursor, query, parsed_data_list, page_size=batch_size) + + conn.commit() + + +def _get_insert_query(): + query = f""" + INSERT INTO alcs.users ( + display_name, + identity_provider, + preferred_username, + given_name, + family_name, + email, + audit_created_by + ) + VALUES ( + %(login)s, + %(local_government_uuid)s, + %(login)s, + %(first_name)s, + %(last_name)s, + %(email)s, + '{OATS_ETL_USER}' + ) + """ + return query + + +def _prepare_users_data(row_data_list): + data_list = [] + for row in row_data_list: + data_list.append(dict(row)) + return data_list + + +@inject_conn_pool +def clean_users(conn=None): + logger.info("Start users cleaning") + with conn.cursor() as cursor: + cursor.execute( + f"DELETE FROM alcs.users alu WHERE alu.audit_created_by = '{OATS_ETL_USER}'" + ) + logger.info(f"Deleted items count = {cursor.rowcount}") + + conn.commit() diff --git a/bin/migrate-oats-data/sql/common/init_users.sql b/bin/migrate-oats-data/sql/common/init_users.sql new file mode 100644 index 0000000000..d8e904680b --- /dev/null +++ b/bin/migrate-oats-data/sql/common/init_users.sql @@ -0,0 +1,11 @@ +SELECT + oas.login, + oas.alc_staff_id, + oas.email, + oas.first_name, + oas.last_name +FROM + oats.oats_alc_staffs oas +GROUP BY + oas.login, + oas.alc_staff_id \ No newline at end of file diff --git a/bin/migrate-oats-data/sql/common/init_users_count.sql b/bin/migrate-oats-data/sql/common/init_users_count.sql new file mode 100644 index 0000000000..7e10c9e1c5 --- /dev/null +++ b/bin/migrate-oats-data/sql/common/init_users_count.sql @@ -0,0 +1,13 @@ +WITH + insert_count AS ( + SELECT + oas.alc_staff_id + FROM + oats.oats_alc_staffs oas + GROUP BY + oas.alc_staff_id + ) +SELECT + count(*) +FROM + insert_count \ No newline at end of file From 19e54f18dde9783d5ecd6088ff3b3f05f8e49a3f Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Fri, 17 Nov 2023 17:00:01 -0800 Subject: [PATCH 655/954] Add View Tracking for Sensitive Data * Add new view track entity to track views * Store User ID and FIle ID * Add to calls for loading the detailed objects by file ID for al ALCS * Add to Portal only if user is L/FNG --- .../application.controller.spec.ts | 31 +++++++++---- .../application/application.controller.ts | 8 +++- .../commissioner.controller.spec.ts | 29 ++++++++++-- .../commissioner/commissioner.controller.ts | 6 ++- .../notice-of-intent.controller.spec.ts | 20 +++++++-- .../notice-of-intent.controller.ts | 15 ++++++- .../notification.controller.spec.ts | 15 ++++++- .../notification/notification.controller.ts | 10 ++--- .../src/common/tracking/file-viewed.entity.ts | 39 ++++++++++++++++ .../src/common/tracking/tracking.module.ts | 12 +++++ .../src/common/tracking/tracking.service.ts | 21 +++++++++ services/apps/alcs/src/main.module.ts | 6 ++- .../application-submission.controller.spec.ts | 45 ++++++++++++++++--- .../application-submission.controller.ts | 8 ++-- ...ce-of-intent-submission.controller.spec.ts | 7 +++ .../notice-of-intent-submission.controller.ts | 12 +++++ ...notification-submission.controller.spec.ts | 20 ++++++--- .../notification-submission.controller.ts | 13 +++++- .../1700180573212-add_file_tracking.ts | 15 +++++++ 19 files changed, 290 insertions(+), 42 deletions(-) create mode 100644 services/apps/alcs/src/common/tracking/file-viewed.entity.ts create mode 100644 services/apps/alcs/src/common/tracking/tracking.module.ts create mode 100644 services/apps/alcs/src/common/tracking/tracking.service.ts create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1700180573212-add_file_tracking.ts diff --git a/services/apps/alcs/src/alcs/application/application.controller.spec.ts b/services/apps/alcs/src/alcs/application/application.controller.spec.ts index 647684a772..bb542f212d 100644 --- a/services/apps/alcs/src/alcs/application/application.controller.spec.ts +++ b/services/apps/alcs/src/alcs/application/application.controller.spec.ts @@ -1,9 +1,10 @@ import { ConfigModule } from '@app/common/config/config.module'; -import { classes } from 'automapper-classes'; -import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { ClsService } from 'nestjs-cls'; +import { generateCANCApplicationHtml } from '../../../../../templates/emails/cancelled'; import { initApplicationMockEntity, initMockAssigneeDto, @@ -11,23 +12,23 @@ import { import { mockKeyCloakProviders } from '../../../test/mocks/mockTypes'; import { ApplicationProfile } from '../../common/automapper/application.automapper.profile'; import { UserProfile } from '../../common/automapper/user.automapper.profile'; +import { TrackingService } from '../../common/tracking/tracking.service'; +import { ApplicationOwner } from '../../portal/application-submission/application-owner/application-owner.entity'; +import { ApplicationSubmission } from '../../portal/application-submission/application-submission.entity'; import { StatusEmailService } from '../../providers/email/status-email.service'; +import { User } from '../../user/user.entity'; import { CardStatusDto } from '../card/card-status/card-status.dto'; import { CardDto } from '../card/card.dto'; import { Card } from '../card/card.entity'; import { CardService } from '../card/card.service'; +import { LocalGovernment } from '../local-government/local-government.entity'; import { MessageService } from '../message/message.service'; +import { SUBMISSION_STATUS } from './application-submission-status/submission-status.dto'; import { ApplicationTimeData } from './application-time-tracking.service'; import { ApplicationController } from './application.controller'; import { ApplicationDto, UpdateApplicationDto } from './application.dto'; import { Application } from './application.entity'; import { ApplicationService } from './application.service'; -import { EmailService } from '../../providers/email/email.service'; -import { ApplicationSubmission } from '../../portal/application-submission/application-submission.entity'; -import { ApplicationOwner } from '../../portal/application-submission/application-owner/application-owner.entity'; -import { LocalGovernment } from '../local-government/local-government.entity'; -import { generateCANCApplicationHtml } from '../../../../../templates/emails/cancelled'; -import { SUBMISSION_STATUS } from './application-submission-status/submission-status.dto'; describe('ApplicationController', () => { let controller: ApplicationController; @@ -35,6 +36,7 @@ describe('ApplicationController', () => { let notificationService: DeepMocked<MessageService>; let cardService: DeepMocked<CardService>; let statusEmailService: DeepMocked<StatusEmailService>; + let mockTrackingService: DeepMocked<TrackingService>; const mockApplicationEntity = initApplicationMockEntity(); @@ -76,6 +78,7 @@ describe('ApplicationController', () => { notificationService = createMock(); cardService = createMock(); statusEmailService = createMock(); + mockTrackingService = createMock(); const module: TestingModule = await Test.createTestingModule({ controllers: [ApplicationController], @@ -98,6 +101,10 @@ describe('ApplicationController', () => { provide: StatusEmailService, useValue: statusEmailService, }, + { + provide: TrackingService, + useValue: mockTrackingService, + }, { provide: ClsService, useValue: {}, @@ -374,11 +381,17 @@ describe('ApplicationController', () => { }); it('should call through for get', async () => { + mockTrackingService.trackView.mockResolvedValue(); applicationService.getOrFail.mockResolvedValue(mockApplicationEntity); - await controller.get(mockApplicationEntity.uuid); + await controller.get(mockApplicationEntity.uuid, { + user: { + entity: new User(), + }, + }); expect(applicationService.getOrFail).toBeCalledTimes(1); expect(applicationService.mapToDtos).toBeCalledTimes(1); + expect(mockTrackingService.trackView).toHaveBeenCalledTimes(1); }); it('should call through for cancel', async () => { diff --git a/services/apps/alcs/src/alcs/application/application.controller.ts b/services/apps/alcs/src/alcs/application/application.controller.ts index 3fd5ee8378..c43fc090be 100644 --- a/services/apps/alcs/src/alcs/application/application.controller.ts +++ b/services/apps/alcs/src/alcs/application/application.controller.ts @@ -22,6 +22,7 @@ import { generateCANCApplicationHtml } from '../../../../../templates/emails/can import { ROLES_ALLOWED_APPLICATIONS } from '../../common/authorization/roles'; import { RolesGuard } from '../../common/authorization/roles-guard.service'; import { UserRoles } from '../../common/authorization/roles.decorator'; +import { TrackingService } from '../../common/tracking/tracking.service'; import { StatusEmailService } from '../../providers/email/status-email.service'; import { formatIncomingDate } from '../../utils/incoming-date.formatter'; import { SUBMISSION_STATUS } from '../application/application-submission-status/submission-status.dto'; @@ -42,16 +43,21 @@ export class ApplicationController { private applicationService: ApplicationService, private cardService: CardService, private statusEmailService: StatusEmailService, + private trackingService: TrackingService, @Inject(CONFIG_TOKEN) private config: config.IConfig, ) {} @Get('/:fileNumber') @UserRoles(...ROLES_ALLOWED_APPLICATIONS) - async get(@Param('fileNumber') fileNumber): Promise<ApplicationDto> { + async get( + @Param('fileNumber') fileNumber, + @Req() req, + ): Promise<ApplicationDto> { const application = await this.applicationService.getOrFail(fileNumber); const mappedApplication = await this.applicationService.mapToDtos([ application, ]); + await this.trackingService.trackView(req.user.entity, fileNumber); return mappedApplication[0]; } diff --git a/services/apps/alcs/src/alcs/commissioner/commissioner.controller.spec.ts b/services/apps/alcs/src/alcs/commissioner/commissioner.controller.spec.ts index 47b891e83a..aedd5145b2 100644 --- a/services/apps/alcs/src/alcs/commissioner/commissioner.controller.spec.ts +++ b/services/apps/alcs/src/alcs/commissioner/commissioner.controller.spec.ts @@ -5,6 +5,8 @@ import { Test, TestingModule } from '@nestjs/testing'; import { ClsService } from 'nestjs-cls'; import { initApplicationMockEntity } from '../../../test/mocks/mockEntities'; import { mockKeyCloakProviders } from '../../../test/mocks/mockTypes'; +import { TrackingService } from '../../common/tracking/tracking.service'; +import { User } from '../../user/user.entity'; import { ApplicationDto } from '../application/application.dto'; import { ApplicationService } from '../application/application.service'; import { CommissionerProfile } from '../../common/automapper/commissioner.automapper.profile'; @@ -17,6 +19,8 @@ describe('CommissionerController', () => { let mockApplicationService: DeepMocked<ApplicationService>; let mockReconsiderationService: DeepMocked<ApplicationReconsiderationService>; let mockModificationService: DeepMocked<ApplicationModificationService>; + let mockTrackingService: DeepMocked<TrackingService>; + let mockRequest; const fileNumber = 'fake-file'; @@ -24,6 +28,7 @@ describe('CommissionerController', () => { mockApplicationService = createMock(); mockReconsiderationService = createMock(); mockModificationService = createMock(); + mockTrackingService = createMock(); const module: TestingModule = await Test.createTestingModule({ imports: [ @@ -45,6 +50,10 @@ describe('CommissionerController', () => { provide: ApplicationReconsiderationService, useValue: mockReconsiderationService, }, + { + provide: TrackingService, + useValue: mockTrackingService, + }, { provide: ClsService, useValue: {}, @@ -62,6 +71,13 @@ describe('CommissionerController', () => { mockApplicationService.mapToDtos.mockResolvedValue([]); mockModificationService.getByApplication.mockResolvedValue([]); mockReconsiderationService.getByApplication.mockResolvedValue([]); + mockTrackingService.trackView.mockResolvedValue(); + + mockRequest = { + user: { + entity: new User(), + }, + }; }); it('should be defined', () => { @@ -69,7 +85,7 @@ describe('CommissionerController', () => { }); it('should call through to application service for fetch', async () => { - const res = await controller.get('fake-file'); + const res = await controller.get('fake-file', mockRequest); expect(mockApplicationService.getOrFail).toHaveBeenCalledTimes(1); expect(mockModificationService.getByApplication).toHaveBeenCalledTimes(1); @@ -81,6 +97,7 @@ describe('CommissionerController', () => { ); expect(res.hasRecons).toBeFalsy(); expect(res.hasModifications).toBeFalsy(); + expect(mockTrackingService.trackView).toHaveBeenCalledTimes(1); }); it('should set recon and modification flags if they exist', async () => { @@ -91,7 +108,7 @@ describe('CommissionerController', () => { ]); mockReconsiderationService.getByApplication.mockResolvedValue([{} as any]); - const res = await controller.get(fileNumber); + const res = await controller.get(fileNumber, mockRequest); expect(mockModificationService.getByApplication).toHaveBeenCalledTimes(1); expect(mockReconsiderationService.getByApplication).toHaveBeenCalledTimes( @@ -99,6 +116,7 @@ describe('CommissionerController', () => { ); expect(res.hasRecons).toBeTruthy(); expect(res.hasModifications).toBeTruthy(); + expect(mockTrackingService.trackView).toHaveBeenCalledTimes(1); }); it('should set modification flag to REF if it was not approved', async () => { @@ -111,13 +129,15 @@ describe('CommissionerController', () => { ]); mockReconsiderationService.getByApplication.mockResolvedValue([{} as any]); - const res = await controller.get(fileNumber); + const res = await controller.get(fileNumber, mockRequest); expect(mockModificationService.getByApplication).toHaveBeenCalledTimes(1); expect(res.hasModifications).toBeFalsy(); + expect(mockTrackingService.trackView).toHaveBeenCalledTimes(1); }); it('should map to the dto correctly', async () => { + mockTrackingService.trackView.mockResolvedValue(); const mockDto: ApplicationDto = { fileNumber, summary: 'fake-summary', @@ -130,10 +150,11 @@ describe('CommissionerController', () => { } as any; mockApplicationService.mapToDtos.mockResolvedValue([mockDto]); - const mappedApp = await controller.get(fileNumber); + const mappedApp = await controller.get(fileNumber, mockRequest); expect(mappedApp.localGovernment).toEqual(mockDto.localGovernment); expect('summary' in mappedApp).toBeFalsy(); expect(mappedApp.fileNumber).toEqual(fileNumber); + expect(mockTrackingService.trackView).toHaveBeenCalledTimes(1); }); }); diff --git a/services/apps/alcs/src/alcs/commissioner/commissioner.controller.ts b/services/apps/alcs/src/alcs/commissioner/commissioner.controller.ts index 825c5a8238..a77785180d 100644 --- a/services/apps/alcs/src/alcs/commissioner/commissioner.controller.ts +++ b/services/apps/alcs/src/alcs/commissioner/commissioner.controller.ts @@ -1,8 +1,9 @@ import { Mapper } from 'automapper-core'; import { InjectMapper } from 'automapper-nestjs'; -import { Controller, Get, Param, UseGuards } from '@nestjs/common'; +import { Controller, Get, Param, Req, UseGuards } from '@nestjs/common'; import { ApiOAuth2 } from '@nestjs/swagger'; import * as config from 'config'; +import { TrackingService } from '../../common/tracking/tracking.service'; import { ApplicationDto } from '../application/application.dto'; import { ApplicationService } from '../application/application.service'; import { AUTH_ROLE } from '../../common/authorization/roles'; @@ -20,6 +21,7 @@ export class CommissionerController { private applicationService: ApplicationService, private modificationService: ApplicationModificationService, private reconsiderationService: ApplicationReconsiderationService, + private trackingService: TrackingService, @InjectMapper() private mapper: Mapper, ) {} @@ -27,6 +29,7 @@ export class CommissionerController { @UserRoles(AUTH_ROLE.COMMISSIONER) async get( @Param('fileNumber') fileNumber, + @Req() req, ): Promise<CommissionerApplicationDto> { const application = await this.applicationService.getOrFail(fileNumber); const firstMap = await this.applicationService.mapToDtos([application]); @@ -48,6 +51,7 @@ export class CommissionerController { false, ); const mappedRecords = finalMap[0]; + await this.trackingService.trackView(req.user.entity, fileNumber); return { ...mappedRecords, hasModifications: hasApprovedOrPendingModification, diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.controller.spec.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.controller.spec.ts index 1b8ec920fd..6ca80c4659 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.controller.spec.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.controller.spec.ts @@ -4,6 +4,8 @@ import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { ClsService } from 'nestjs-cls'; import { mockKeyCloakProviders } from '../../../test/mocks/mockTypes'; +import { TrackingService } from '../../common/tracking/tracking.service'; +import { User } from '../../user/user.entity'; import { Board } from '../board/board.entity'; import { BoardService } from '../board/board.service'; import { NOI_SUBMISSION_STATUS } from './notice-of-intent-submission-status/notice-of-intent-status.dto'; @@ -17,11 +19,13 @@ describe('NoticeOfIntentController', () => { let mockService: DeepMocked<NoticeOfIntentService>; let mockBoardService: DeepMocked<BoardService>; let mockSubmissionStatusService: DeepMocked<NoticeOfIntentSubmissionStatusService>; + let mockTrackingService: DeepMocked<TrackingService>; beforeEach(async () => { - mockService = createMock<NoticeOfIntentService>(); - mockBoardService = createMock<BoardService>(); + mockService = createMock(); + mockBoardService = createMock(); mockSubmissionStatusService = createMock(); + mockTrackingService = createMock(); const module: TestingModule = await Test.createTestingModule({ imports: [ @@ -43,6 +47,10 @@ describe('NoticeOfIntentController', () => { provide: NoticeOfIntentSubmissionStatusService, useValue: mockSubmissionStatusService, }, + { + provide: TrackingService, + useValue: mockTrackingService, + }, { provide: ClsService, useValue: {}, @@ -79,13 +87,19 @@ describe('NoticeOfIntentController', () => { }); it('should call through to service for get', async () => { + mockTrackingService.trackView.mockResolvedValue(); mockService.getByFileNumber.mockResolvedValue(new NoticeOfIntent()); mockService.mapToDtos.mockResolvedValue([]); - await controller.get('fileNumber'); + await controller.get('fileNumber', { + user: { + entity: new User(), + }, + }); expect(mockService.getByFileNumber).toHaveBeenCalledTimes(1); expect(mockService.mapToDtos).toHaveBeenCalledTimes(1); + expect(mockTrackingService.trackView).toHaveBeenCalledTimes(1); }); it('should call through to service for search', async () => { diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.controller.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.controller.ts index b80102d804..87a1bd88b1 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.controller.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.controller.ts @@ -1,6 +1,14 @@ import { Mapper } from 'automapper-core'; import { InjectMapper } from 'automapper-nestjs'; -import { Body, Controller, Get, Param, Post, UseGuards } from '@nestjs/common'; +import { + Body, + Controller, + Get, + Param, + Post, + Req, + UseGuards, +} from '@nestjs/common'; import { ApiOAuth2 } from '@nestjs/swagger'; import * as config from 'config'; import { @@ -9,6 +17,7 @@ import { } from '../../common/authorization/roles'; import { RolesGuard } from '../../common/authorization/roles-guard.service'; import { UserRoles } from '../../common/authorization/roles.decorator'; +import { TrackingService } from '../../common/tracking/tracking.service'; import { formatIncomingDate } from '../../utils/incoming-date.formatter'; import { BoardService } from '../board/board.service'; import { NOI_SUBMISSION_STATUS } from './notice-of-intent-submission-status/notice-of-intent-status.dto'; @@ -29,15 +38,17 @@ export class NoticeOfIntentController { private noticeOfIntentService: NoticeOfIntentService, private noticeOfIntentSubmissionStatusService: NoticeOfIntentSubmissionStatusService, private boardService: BoardService, + private trackingService: TrackingService, @InjectMapper() private mapper: Mapper, ) {} @Get('/:fileNumber') @UserRoles(...ROLES_ALLOWED_BOARDS) - async get(@Param('fileNumber') fileNumber: string) { + async get(@Param('fileNumber') fileNumber: string, @Req() req) { const noticeOfIntent = await this.noticeOfIntentService.getByFileNumber(fileNumber); const mapped = await this.noticeOfIntentService.mapToDtos([noticeOfIntent]); + await this.trackingService.trackView(req.user.entity, fileNumber); return mapped[0]; } diff --git a/services/apps/alcs/src/alcs/notification/notification.controller.spec.ts b/services/apps/alcs/src/alcs/notification/notification.controller.spec.ts index b8d00590b0..486b2402fc 100644 --- a/services/apps/alcs/src/alcs/notification/notification.controller.spec.ts +++ b/services/apps/alcs/src/alcs/notification/notification.controller.spec.ts @@ -4,6 +4,7 @@ import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { ClsService } from 'nestjs-cls'; import { mockKeyCloakProviders } from '../../../test/mocks/mockTypes'; +import { TrackingService } from '../../common/tracking/tracking.service'; import { NotificationSubmissionService } from '../../portal/notification-submission/notification-submission.service'; import { User } from '../../user/user.entity'; import { NotificationDocumentService } from './notification-document/notification-document.service'; @@ -19,12 +20,14 @@ describe('NotificationController', () => { let mockSubmissionStatusService: DeepMocked<NotificationSubmissionStatusService>; let mockSubmissionService: DeepMocked<NotificationSubmissionService>; let mockDocumentService: DeepMocked<NotificationDocumentService>; + let mockTrackingService: DeepMocked<TrackingService>; beforeEach(async () => { mockService = createMock(); mockSubmissionStatusService = createMock(); mockSubmissionService = createMock(); mockDocumentService = createMock(); + mockTrackingService = createMock(); const module: TestingModule = await Test.createTestingModule({ imports: [ @@ -50,6 +53,10 @@ describe('NotificationController', () => { provide: NotificationSubmissionService, useValue: mockSubmissionService, }, + { + provide: TrackingService, + useValue: mockTrackingService, + }, { provide: ClsService, useValue: {}, @@ -68,11 +75,17 @@ describe('NotificationController', () => { it('should call through to service for get', async () => { mockService.getByFileNumber.mockResolvedValue(new Notification()); mockService.mapToDtos.mockResolvedValue([]); + mockTrackingService.trackView.mockResolvedValue(); - await controller.get('fileNumber'); + await controller.get('fileNumber', { + user: { + entity: new User(), + }, + }); expect(mockService.getByFileNumber).toHaveBeenCalledTimes(1); expect(mockService.mapToDtos).toHaveBeenCalledTimes(1); + expect(mockTrackingService.trackView).toHaveBeenCalledTimes(1); }); it('should call through to service for search', async () => { diff --git a/services/apps/alcs/src/alcs/notification/notification.controller.ts b/services/apps/alcs/src/alcs/notification/notification.controller.ts index b5cb797479..6e51749531 100644 --- a/services/apps/alcs/src/alcs/notification/notification.controller.ts +++ b/services/apps/alcs/src/alcs/notification/notification.controller.ts @@ -1,6 +1,4 @@ import { ServiceNotFoundException } from '@app/common/exceptions/base.exception'; -import { Mapper } from 'automapper-core'; -import { InjectMapper } from 'automapper-nestjs'; import { Body, Controller, @@ -18,6 +16,7 @@ import { } from '../../common/authorization/roles'; import { RolesGuard } from '../../common/authorization/roles-guard.service'; import { UserRoles } from '../../common/authorization/roles.decorator'; +import { TrackingService } from '../../common/tracking/tracking.service'; import { DOCUMENT_TYPE } from '../../document/document-code.entity'; import { NotificationSubmissionService } from '../../portal/notification-submission/notification-submission.service'; import { NotificationDocumentService } from './notification-document/notification-document.service'; @@ -35,15 +34,16 @@ export class NotificationController { private notificationSubmissionStatusService: NotificationSubmissionStatusService, private notificationSubmissionService: NotificationSubmissionService, private notificationDocumentService: NotificationDocumentService, - @InjectMapper() private mapper: Mapper, + private trackingService: TrackingService, ) {} @Get('/:fileNumber') @UserRoles(...ROLES_ALLOWED_BOARDS) - async get(@Param('fileNumber') fileNumber: string) { + async get(@Param('fileNumber') fileNumber: string, @Req() req) { const notification = await this.notificationService.getByFileNumber(fileNumber); const mapped = await this.notificationService.mapToDtos([notification]); + await this.trackingService.trackView(req.user.entity, fileNumber); return mapped[0]; } @@ -131,7 +131,7 @@ export class NotificationController { ); } - return this.get(fileNumber); + return this.get(fileNumber, req.user.entity); } @Get('/search/:fileNumber') diff --git a/services/apps/alcs/src/common/tracking/file-viewed.entity.ts b/services/apps/alcs/src/common/tracking/file-viewed.entity.ts new file mode 100644 index 0000000000..2e97002478 --- /dev/null +++ b/services/apps/alcs/src/common/tracking/file-viewed.entity.ts @@ -0,0 +1,39 @@ +import { AutoMap } from 'automapper-classes'; +import { + BaseEntity, + Column, + CreateDateColumn, + Entity, + PrimaryGeneratedColumn, +} from 'typeorm'; + +@Entity() +export class FileViewed extends BaseEntity { + constructor(data?: Partial<FileViewed>) { + super(); + if (data) { + Object.assign(this, data); + } + } + + @AutoMap() + @PrimaryGeneratedColumn('uuid') + uuid: string; + + @Column({ + nullable: false, + }) + fileNumber: string; + + @Column({ + nullable: false, + }) + userUuid: string; + + @CreateDateColumn({ + type: 'timestamptz', + nullable: false, + update: false, + }) + viewedAt: Date; +} diff --git a/services/apps/alcs/src/common/tracking/tracking.module.ts b/services/apps/alcs/src/common/tracking/tracking.module.ts new file mode 100644 index 0000000000..76f26b260e --- /dev/null +++ b/services/apps/alcs/src/common/tracking/tracking.module.ts @@ -0,0 +1,12 @@ +import { Global, Module } from '@nestjs/common'; +import { TypeOrmModule } from '@nestjs/typeorm'; +import { FileViewed } from './file-viewed.entity'; +import { TrackingService } from './tracking.service'; + +@Global() +@Module({ + imports: [TypeOrmModule.forFeature([FileViewed])], + providers: [TrackingService], + exports: [TrackingService], +}) +export class TrackingModule {} diff --git a/services/apps/alcs/src/common/tracking/tracking.service.ts b/services/apps/alcs/src/common/tracking/tracking.service.ts new file mode 100644 index 0000000000..0ecaa1237a --- /dev/null +++ b/services/apps/alcs/src/common/tracking/tracking.service.ts @@ -0,0 +1,21 @@ +import { Injectable } from '@nestjs/common'; +import { InjectRepository } from '@nestjs/typeorm'; +import { Repository } from 'typeorm'; +import { User } from '../../user/user.entity'; +import { FileViewed } from './file-viewed.entity'; + +@Injectable() +export class TrackingService { + constructor( + @InjectRepository(FileViewed) + private repository: Repository<FileViewed>, + ) {} + + async trackView(user: User, fileNumber: string) { + const view = new FileViewed({ + userUuid: user.uuid, + fileNumber, + }); + await this.repository.insert(view); + } +} diff --git a/services/apps/alcs/src/main.module.ts b/services/apps/alcs/src/main.module.ts index aa4741e23f..15f03446a2 100644 --- a/services/apps/alcs/src/main.module.ts +++ b/services/apps/alcs/src/main.module.ts @@ -1,10 +1,10 @@ import { ConfigModule } from '@app/common/config/config.module'; import { RedisModule } from '@app/common/redis/redis.module'; -import { classes } from 'automapper-classes'; -import { AutomapperModule } from 'automapper-nestjs'; import { Module } from '@nestjs/common'; import { APP_FILTER, APP_GUARD } from '@nestjs/core'; import { TypeOrmModule } from '@nestjs/typeorm'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import * as config from 'config'; import { AuthGuard } from 'nest-keycloak-connect'; import { ClsModule } from 'nestjs-cls'; @@ -14,6 +14,7 @@ import { AlcsModule } from './alcs/alcs.module'; import { AuthorizationFilter } from './common/authorization/authorization.filter'; import { AuthorizationModule } from './common/authorization/authorization.module'; import { AuditSubscriber } from './common/entities/audit.subscriber'; +import { TrackingModule } from './common/tracking/tracking.module'; import { DocumentModule } from './document/document.module'; import { FileNumberModule } from './file-number/file-number.module'; import { HealthCheck } from './healthcheck/healthcheck.entity'; @@ -65,6 +66,7 @@ import { UserModule } from './user/user.module'; UserModule, FileNumberModule, NoticeOfIntentSubmissionModule, + TrackingModule, SchedulerModule, // this will init BullMQ ], controllers: [MainController, LogoutController], diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.controller.spec.ts b/services/apps/alcs/src/portal/application-submission/application-submission.controller.spec.ts index eec9911dcf..d67eaef6cc 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.controller.spec.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.controller.spec.ts @@ -1,14 +1,14 @@ -import { classes } from 'automapper-classes'; -import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { BadRequestException } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { ClsService } from 'nestjs-cls'; import { ServiceValidationException } from '../../../../../libs/common/src/exceptions/base.exception'; import { generateCANCApplicationHtml } from '../../../../../templates/emails/cancelled'; import { - generateSUBGTurApplicantHtml, generateSUBGNoReviewGovernmentTemplateEmail, + generateSUBGTurApplicantHtml, } from '../../../../../templates/emails/submitted-to-alc'; import { generateSUBGApplicantHtml, @@ -25,6 +25,7 @@ import { ApplicationType } from '../../alcs/code/application-code/application-ty import { LocalGovernment } from '../../alcs/local-government/local-government.entity'; import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; import { ApplicationProfile } from '../../common/automapper/application.automapper.profile'; +import { TrackingService } from '../../common/tracking/tracking.service'; import { StatusEmailService } from '../../providers/email/status-email.service'; import { User } from '../../user/user.entity'; import { ApplicationOwner } from './application-owner/application-owner.entity'; @@ -48,6 +49,7 @@ describe('ApplicationSubmissionController', () => { let mockAppValidationService: DeepMocked<ApplicationSubmissionValidatorService>; let mockStatusEmailService: DeepMocked<StatusEmailService>; let mockApplicationService: DeepMocked<ApplicationService>; + let mockTrackingService: DeepMocked<TrackingService>; const localGovernmentUuid = 'local-government'; const primaryContactOwnerUuid = 'primary-contact'; @@ -61,6 +63,7 @@ describe('ApplicationSubmissionController', () => { mockAppValidationService = createMock(); mockStatusEmailService = createMock(); mockApplicationService = createMock(); + mockTrackingService = createMock(); const module: TestingModule = await Test.createTestingModule({ controllers: [ApplicationSubmissionController], @@ -90,6 +93,10 @@ describe('ApplicationSubmissionController', () => { provide: ApplicationService, useValue: mockApplicationService, }, + { + provide: TrackingService, + useValue: mockTrackingService, + }, { provide: ClsService, useValue: {}, @@ -272,7 +279,7 @@ describe('ApplicationSubmissionController', () => { {} as ApplicationSubmissionDetailedDto, ); - const application = controller.getSubmission( + const application = await controller.getSubmission( { user: { entity: new User(), @@ -285,6 +292,33 @@ describe('ApplicationSubmissionController', () => { expect(mockAppSubmissionService.verifyAccessByUuid).toHaveBeenCalledTimes( 1, ); + expect(mockAppSubmissionService.mapToDetailedDTO).toHaveBeenCalledTimes(1); + }); + + it('should call out to service and track view when fetching a submission by file id', async () => { + mockTrackingService.trackView.mockResolvedValue(); + mockAppSubmissionService.mapToDetailedDTO.mockResolvedValue( + {} as ApplicationSubmissionDetailedDto, + ); + mockLgService.getByGuid.mockResolvedValue(new LocalGovernment()); + + const application = await controller.getSubmissionByFileId( + { + user: { + entity: new User({ + bceidBusinessGuid: 'cats', + }), + }, + }, + '', + ); + + expect(application).toBeDefined(); + expect(mockAppSubmissionService.verifyAccessByFileId).toHaveBeenCalledTimes( + 1, + ); + expect(mockAppSubmissionService.mapToDetailedDTO).toHaveBeenCalledTimes(1); + expect(mockTrackingService.trackView).toHaveBeenCalledTimes(1); }); it('should fetch application by bceid if user has same guid as a local government', async () => { @@ -296,8 +330,9 @@ describe('ApplicationSubmissionController', () => { localGovernmentUuid: '', }), ); + mockLgService.getByGuid.mockResolvedValue(new LocalGovernment()); - const application = controller.getSubmission( + const application = await controller.getSubmission( { user: { entity: new User({ diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.controller.ts b/services/apps/alcs/src/portal/application-submission/application-submission.controller.ts index 1b5da076a0..a3431d8960 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.controller.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.controller.ts @@ -30,6 +30,7 @@ import { PARENT_TYPE } from '../../alcs/card/card-subtask/card-subtask.dto'; import { LocalGovernment } from '../../alcs/local-government/local-government.entity'; import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; import { PortalAuthGuard } from '../../common/authorization/portal-auth-guard.service'; +import { TrackingService } from '../../common/tracking/tracking.service'; import { StatusEmailService } from '../../providers/email/status-email.service'; import { User } from '../../user/user.entity'; import { APPLICATION_SUBMISSION_TYPES } from '../pdf-generation/generate-submission-document.service'; @@ -54,6 +55,7 @@ export class ApplicationSubmissionController { private applicationSubmissionValidatorService: ApplicationSubmissionValidatorService, private statusEmailService: StatusEmailService, private applicationService: ApplicationService, + private trackingService: TrackingService, ) {} @Get() @@ -79,9 +81,8 @@ export class ApplicationSubmissionController { } } - const applications = await this.applicationSubmissionService.getByUser( - user, - ); + const applications = + await this.applicationSubmissionService.getByUser(user); return this.applicationSubmissionService.mapToDTOs(applications, user); } @@ -103,6 +104,7 @@ export class ApplicationSubmissionController { localGovernment && submission.localGovernmentUuid === localGovernment.uuid ) { + await this.trackingService.trackView(user, fileId); return await this.applicationSubmissionService.mapToDetailedDTO( submission, localGovernment, diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.controller.spec.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.controller.spec.ts index 3712713701..8563d53e63 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.controller.spec.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.controller.spec.ts @@ -18,6 +18,7 @@ import { NOI_SUBMISSION_STATUS } from '../../alcs/notice-of-intent/notice-of-int import { NoticeOfIntentSubmissionToSubmissionStatus } from '../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status.entity'; import { NoticeOfIntent } from '../../alcs/notice-of-intent/notice-of-intent.entity'; import { NoticeOfIntentSubmissionProfile } from '../../common/automapper/notice-of-intent-submission.automapper.profile'; +import { TrackingService } from '../../common/tracking/tracking.service'; import { StatusEmailService } from '../../providers/email/status-email.service'; import { User } from '../../user/user.entity'; import { NoticeOfIntentOwner } from './notice-of-intent-owner/notice-of-intent-owner.entity'; @@ -40,6 +41,7 @@ describe('NoticeOfIntentSubmissionController', () => { let mockLgService: DeepMocked<LocalGovernmentService>; let mockNoiValidatorService: DeepMocked<NoticeOfIntentSubmissionValidatorService>; let mockStatusEmailService: DeepMocked<StatusEmailService>; + let mockTrackingService: DeepMocked<TrackingService>; const primaryContactOwnerUuid = 'primary-contact'; const localGovernmentUuid = 'local-government'; @@ -52,6 +54,7 @@ describe('NoticeOfIntentSubmissionController', () => { mockLgService = createMock(); mockNoiValidatorService = createMock(); mockStatusEmailService = createMock(); + mockTrackingService = createMock(); const module: TestingModule = await Test.createTestingModule({ controllers: [NoticeOfIntentSubmissionController], @@ -77,6 +80,10 @@ describe('NoticeOfIntentSubmissionController', () => { provide: StatusEmailService, useValue: mockStatusEmailService, }, + { + provide: TrackingService, + useValue: mockTrackingService, + }, { provide: ClsService, useValue: {}, diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.controller.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.controller.ts index a4a78b2e24..3672193f25 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.controller.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.controller.ts @@ -16,9 +16,11 @@ import { generateSUBMNoiGovernmentHtml, } from '../../../../../templates/emails/submitted-to-alc'; import { PARENT_TYPE } from '../../alcs/card/card-subtask/card-subtask.dto'; +import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; import { NOI_SUBMISSION_STATUS } from '../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status.dto'; import { PortalAuthGuard } from '../../common/authorization/portal-auth-guard.service'; import { ROLES_ALLOWED_APPLICATIONS } from '../../common/authorization/roles'; +import { TrackingService } from '../../common/tracking/tracking.service'; import { StatusEmailService } from '../../providers/email/status-email.service'; import { User } from '../../user/user.entity'; import { NoticeOfIntentSubmissionValidatorService } from './notice-of-intent-submission-validator.service'; @@ -37,6 +39,8 @@ export class NoticeOfIntentSubmissionController { private noticeOfIntentSubmissionService: NoticeOfIntentSubmissionService, private noticeOfIntentValidatorService: NoticeOfIntentSubmissionValidatorService, private statusEmailService: StatusEmailService, + private localGovernmentService: LocalGovernmentService, + private trackingService: TrackingService, ) {} @Get() @@ -55,6 +59,14 @@ export class NoticeOfIntentSubmissionController { const submission = await this.noticeOfIntentSubmissionService.getByFileNumber(fileId, user); + if (user && user.bceidBusinessGuid) { + const matchingLocalGovernment = + await this.localGovernmentService.getByGuid(user.bceidBusinessGuid); + if (matchingLocalGovernment) { + await this.trackingService.trackView(user, fileId); + } + } + return await this.noticeOfIntentSubmissionService.mapToDetailedDTO( submission, user, diff --git a/services/apps/alcs/src/portal/notification-submission/notification-submission.controller.spec.ts b/services/apps/alcs/src/portal/notification-submission/notification-submission.controller.spec.ts index cebdc4fca2..971b56e85c 100644 --- a/services/apps/alcs/src/portal/notification-submission/notification-submission.controller.spec.ts +++ b/services/apps/alcs/src/portal/notification-submission/notification-submission.controller.spec.ts @@ -1,18 +1,17 @@ -import { classes } from 'automapper-classes'; -import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { BadRequestException } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { ClsService } from 'nestjs-cls'; import { mockKeyCloakProviders } from '../../../test/mocks/mockTypes'; -import { LocalGovernment } from '../../alcs/local-government/local-government.entity'; import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; -import { NoticeOfIntentDocumentService } from '../../alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.service'; import { NotificationDocument } from '../../alcs/notification/notification-document/notification-document.entity'; import { NOTIFICATION_STATUS } from '../../alcs/notification/notification-submission-status/notification-status.dto'; import { NotificationSubmissionToSubmissionStatus } from '../../alcs/notification/notification-submission-status/notification-status.entity'; import { Notification } from '../../alcs/notification/notification.entity'; import { NotificationSubmissionProfile } from '../../common/automapper/notification-submission.automapper.profile'; +import { TrackingService } from '../../common/tracking/tracking.service'; import { User } from '../../user/user.entity'; import { GenerateSrwDocumentService } from '../pdf-generation/generate-srw-document.service'; import { @@ -33,16 +32,19 @@ describe('NotificationSubmissionController', () => { let mockNotificationSubmissionService: DeepMocked<NotificationSubmissionService>; let mockNotificationValidationService: DeepMocked<NotificationSubmissionValidatorService>; let mockSrwDocumentService: DeepMocked<GenerateSrwDocumentService>; + let mockLGService: DeepMocked<LocalGovernmentService>; + let mockTrackingService: DeepMocked<TrackingService>; const primaryContactOwnerUuid = 'primary-contact'; const localGovernmentUuid = 'local-government'; const applicant = 'fake-applicant'; - const bceidBusinessGuid = 'business-guid'; beforeEach(async () => { mockNotificationSubmissionService = createMock(); mockNotificationValidationService = createMock(); mockSrwDocumentService = createMock(); + mockLGService = createMock(); + mockTrackingService = createMock(); const module: TestingModule = await Test.createTestingModule({ controllers: [NotificationSubmissionController], @@ -60,6 +62,14 @@ describe('NotificationSubmissionController', () => { provide: GenerateSrwDocumentService, useValue: mockSrwDocumentService, }, + { + provide: LocalGovernmentService, + useValue: mockLGService, + }, + { + provide: TrackingService, + useValue: mockTrackingService, + }, { provide: ClsService, useValue: {}, diff --git a/services/apps/alcs/src/portal/notification-submission/notification-submission.controller.ts b/services/apps/alcs/src/portal/notification-submission/notification-submission.controller.ts index 5d236be7ed..bc98b4f124 100644 --- a/services/apps/alcs/src/portal/notification-submission/notification-submission.controller.ts +++ b/services/apps/alcs/src/portal/notification-submission/notification-submission.controller.ts @@ -10,9 +10,10 @@ import { Req, UseGuards, } from '@nestjs/common'; +import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; import { NOTIFICATION_STATUS } from '../../alcs/notification/notification-submission-status/notification-status.dto'; import { PortalAuthGuard } from '../../common/authorization/portal-auth-guard.service'; -import { EmailService } from '../../providers/email/email.service'; +import { TrackingService } from '../../common/tracking/tracking.service'; import { User } from '../../user/user.entity'; import { GenerateSrwDocumentService } from '../pdf-generation/generate-srw-document.service'; import { NotificationSubmissionValidatorService } from './notification-submission-validator.service'; @@ -29,6 +30,8 @@ export class NotificationSubmissionController { private notificationSubmissionService: NotificationSubmissionService, private notificationValidationService: NotificationSubmissionValidatorService, private generateSrwDocumentService: GenerateSrwDocumentService, + private localGovernmentService: LocalGovernmentService, + private trackingService: TrackingService, ) {} @Get() @@ -52,6 +55,14 @@ export class NotificationSubmissionController { user, ); + if (user && user.bceidBusinessGuid) { + const matchingLocalGovernment = + await this.localGovernmentService.getByGuid(user.bceidBusinessGuid); + if (matchingLocalGovernment) { + await this.trackingService.trackView(user, fileId); + } + } + return await this.notificationSubmissionService.mapToDetailedDTO( submission, user, diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1700180573212-add_file_tracking.ts b/services/apps/alcs/src/providers/typeorm/migrations/1700180573212-add_file_tracking.ts new file mode 100644 index 0000000000..9399633d6b --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1700180573212-add_file_tracking.ts @@ -0,0 +1,15 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class AddFileTracking1700180573212 implements MigrationInterface { + name = 'AddFileTracking1700180573212'; + + public async up(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `CREATE TABLE "alcs"."file_viewed" ("uuid" uuid NOT NULL DEFAULT gen_random_uuid(), "file_number" character varying NOT NULL, "user_uuid" character varying NOT NULL, "viewed_at" TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now(), CONSTRAINT "PK_f1265be167cb82e9e3828df45d1" PRIMARY KEY ("uuid"))`, + ); + } + + public async down(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query(`DROP TABLE "alcs"."file_viewed"`); + } +} From df19e6906683815f0a66eab3ed6f2631a0c11c2b Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Mon, 20 Nov 2023 10:49:58 -0800 Subject: [PATCH 656/954] LFNG Return Fixes * Clear submission date when returning to applicant * Clean up logic for banners and show ALC banner when return to LFNG * Remove old applicant field and mark owner optional --- .../alc-review/alc-review.component.html | 21 ++--------- .../alc-review/alc-review.component.ts | 28 ++++++++++++++- .../src/app/services/inbox/inbox.dto.ts | 3 +- ...ation-submission-review.controller.spec.ts | 4 +++ ...pplication-submission-review.controller.ts | 35 ++++++++++--------- .../application-submission.service.ts | 5 ++- 6 files changed, 56 insertions(+), 40 deletions(-) diff --git a/portal-frontend/src/app/features/applications/view-submission/alc-review/alc-review.component.html b/portal-frontend/src/app/features/applications/view-submission/alc-review/alc-review.component.html index 987b7f6981..8f30224899 100644 --- a/portal-frontend/src/app/features/applications/view-submission/alc-review/alc-review.component.html +++ b/portal-frontend/src/app/features/applications/view-submission/alc-review/alc-review.component.html @@ -15,30 +15,13 @@ <h2>ALC Review and Decision</h2> </button> </div> </div> - <div - *ngIf=" - application.status.code === SUBMISSION_STATUS.IN_PROGRESS || - application.status.code === SUBMISSION_STATUS.IN_REVIEW_BY_LG || - application.status.code === SUBMISSION_STATUS.INCOMPLETE || - application.status.code === SUBMISSION_STATUS.WRONG_GOV || - application.status.code === SUBMISSION_STATUS.SUBMITTED_TO_LG - " - class="warning" - > + <div *ngIf="showUpdateAfterSubmitLabel" class="warning"> This section will update after the application is submitted to the ALC. </div> <div *ngIf="application.status.code === SUBMISSION_STATUS.REFUSED_TO_FORWARD_LG" class="warning"> Application not subject to Agricultural Land Commission review. </div> - <div - *ngIf=" - application.status.code === SUBMISSION_STATUS.SUBMITTED_TO_ALC || - application.status.code === SUBMISSION_STATUS.SUBMITTED_TO_ALC_INCOMPLETE || - application.status.code === SUBMISSION_STATUS.RECEIVED_BY_ALC || - application.status.code === SUBMISSION_STATUS.IN_REVIEW_BY_ALC || - application.status.code === SUBMISSION_STATUS.ALC_DECISION - " - > + <div *ngIf="showALCSection"> <app-decisions [fileNumber]="application.fileNumber"></app-decisions> <app-submission-documents [$applicationDocuments]="$applicationDocuments"></app-submission-documents> </div> diff --git a/portal-frontend/src/app/features/applications/view-submission/alc-review/alc-review.component.ts b/portal-frontend/src/app/features/applications/view-submission/alc-review/alc-review.component.ts index ced2da29b9..768d3bf852 100644 --- a/portal-frontend/src/app/features/applications/view-submission/alc-review/alc-review.component.ts +++ b/portal-frontend/src/app/features/applications/view-submission/alc-review/alc-review.component.ts @@ -21,12 +21,38 @@ export class AlcReviewComponent implements OnInit, OnDestroy { application: ApplicationSubmissionDetailedDto | undefined; SUBMISSION_STATUS = SUBMISSION_STATUS; + showUpdateAfterSubmitLabel = false; + showALCSection = false; - constructor(private applicationReviewService: ApplicationSubmissionReviewService, private router: Router) {} + constructor( + private applicationReviewService: ApplicationSubmissionReviewService, + private router: Router, + ) {} ngOnInit(): void { this.$application.pipe(takeUntil(this.$destroy)).subscribe((application) => { this.application = application; + + this.showUpdateAfterSubmitLabel = + !!application?.status.code && + [ + SUBMISSION_STATUS.IN_PROGRESS, + SUBMISSION_STATUS.IN_REVIEW_BY_LG, + SUBMISSION_STATUS.INCOMPLETE, + SUBMISSION_STATUS.WRONG_GOV, + SUBMISSION_STATUS.SUBMITTED_TO_LG, + SUBMISSION_STATUS.RETURNED_TO_LG, + ].includes(application?.status.code); + + this.showALCSection = + !!application?.status.code && + [ + SUBMISSION_STATUS.SUBMITTED_TO_ALC, + SUBMISSION_STATUS.SUBMITTED_TO_ALC_INCOMPLETE, + SUBMISSION_STATUS.RECEIVED_BY_ALC, + SUBMISSION_STATUS.IN_REVIEW_BY_ALC, + SUBMISSION_STATUS.ALC_DECISION, + ].includes(application?.status.code); }); } diff --git a/portal-frontend/src/app/services/inbox/inbox.dto.ts b/portal-frontend/src/app/services/inbox/inbox.dto.ts index 3e8a0a4ffa..e1045fc15d 100644 --- a/portal-frontend/src/app/services/inbox/inbox.dto.ts +++ b/portal-frontend/src/app/services/inbox/inbox.dto.ts @@ -2,8 +2,7 @@ export interface BaseInboxResultDto { fileNumber: string; type: string; referenceId: string; - applicant?: string; - ownerName: string; + ownerName?: string; createdAt: number; lastUpdate: number; status: string; diff --git a/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.spec.ts b/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.spec.ts index 1feaa185b7..b4180fb038 100644 --- a/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.spec.ts +++ b/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.spec.ts @@ -475,6 +475,7 @@ describe('ApplicationSubmissionReviewController', () => { it('should update the status, delete documents, and update the application for return', async () => { mockLGService.getByGuid.mockResolvedValue(mockLG); + mockAppService.updateByFileNumber.mockResolvedValue(new Application()); const mockOwner = new ApplicationOwner({ uuid: '1234' }); const mockSubmission = new ApplicationSubmission({ @@ -549,6 +550,7 @@ describe('ApplicationSubmissionReviewController', () => { expect(mockAppSubmissionService.updateStatus.mock.calls[0][1]).toEqual( SUBMISSION_STATUS.WRONG_GOV, ); + expect(mockAppService.updateByFileNumber).toHaveBeenCalledTimes(1); expect(mockAppSubmissionService.update).toHaveBeenCalledTimes(1); expect(mockAppSubmissionService.update.mock.calls[0][0]).toEqual( 'submission-uuid', @@ -577,6 +579,7 @@ describe('ApplicationSubmissionReviewController', () => { it('should send the correct email template for wrong government return', async () => { mockLGService.getByGuid.mockResolvedValue(mockLG); + mockAppService.updateByFileNumber.mockResolvedValue(new Application()); const mockOwner = new ApplicationOwner({ uuid: '1234' }); const mockSubmission = new ApplicationSubmission({ @@ -650,6 +653,7 @@ describe('ApplicationSubmissionReviewController', () => { parentType: 'application', primaryContact: mockOwner, }); + expect(mockAppService.updateByFileNumber).toHaveBeenCalledTimes(1); }); it('should throw an exception when trying to return an application not in review', async () => { diff --git a/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.ts b/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.ts index c7aef83c40..041fcf051f 100644 --- a/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.ts +++ b/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.ts @@ -20,6 +20,7 @@ import { generateWRNGHtml } from '../../../../../templates/emails/wrong-lfng.tem import { ApplicationDocumentService } from '../../alcs/application/application-document/application-document.service'; import { ApplicationSubmissionStatusService } from '../../alcs/application/application-submission-status/application-submission-status.service'; import { SUBMISSION_STATUS } from '../../alcs/application/application-submission-status/submission-status.dto'; +import { ApplicationService } from '../../alcs/application/application.service'; import { PARENT_TYPE } from '../../alcs/card/card-subtask/card-subtask.dto'; import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; import { PortalAuthGuard } from '../../common/authorization/portal-auth-guard.service'; @@ -43,6 +44,7 @@ export class ApplicationSubmissionReviewController { constructor( private applicationSubmissionService: ApplicationSubmissionService, private applicationSubmissionReviewService: ApplicationSubmissionReviewService, + private applicationService: ApplicationService, private applicationDocumentService: ApplicationDocumentService, private localGovernmentService: LocalGovernmentService, private applicationValidatorService: ApplicationSubmissionValidatorService, @@ -368,23 +370,10 @@ export class ApplicationSubmissionReviewController { await this.applicationSubmissionReviewService.delete(applicationReview); - await this.applicationSubmissionStatusService.setStatusDate( - applicationSubmission.uuid, - SUBMISSION_STATUS.RETURNED_TO_LG, - null, - ); - - await this.applicationSubmissionStatusService.setStatusDate( - applicationSubmission.uuid, - SUBMISSION_STATUS.SUBMITTED_TO_LG, - null, - ); - - await this.applicationSubmissionStatusService.setStatusDate( - applicationSubmission.uuid, - SUBMISSION_STATUS.IN_REVIEW_BY_LG, - null, - ); + //Clear Submission Date + await this.applicationService.updateByFileNumber(fileNumber, { + dateSubmittedToAlc: null, + }); if (returnDto.applicantComment) { await this.applicationSubmissionService.update( @@ -395,6 +384,18 @@ export class ApplicationSubmissionReviewController { ); } + // Clear future statuses + for (const status of [ + SUBMISSION_STATUS.RETURNED_TO_LG, + SUBMISSION_STATUS.SUBMITTED_TO_LG, + SUBMISSION_STATUS.IN_REVIEW_BY_LG, + ]) { + await this.applicationSubmissionStatusService.setStatusDate( + applicationSubmission.uuid, + status, + null, + ); + } await this.setReturnedStatus(returnDto, applicationSubmission); const primaryContact = applicationSubmission.owners?.find( diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.service.ts b/services/apps/alcs/src/portal/application-submission/application-submission.service.ts index 315b9f1ca6..aeed05d228 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.service.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.service.ts @@ -359,7 +359,10 @@ export class ApplicationSubmissionService { return submissions; } - async getForGovernmentByUuid(uuid: string, localGovernment: LocalGovernment) { + private async getForGovernmentByUuid( + uuid: string, + localGovernment: LocalGovernment, + ) { if (!localGovernment.bceidBusinessGuid) { throw new Error("Cannot load by governments that don't have guids"); } From 770477848c268b09106561e4c9b618311c9cb3c2 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Mon, 20 Nov 2023 11:18:03 -0800 Subject: [PATCH 657/954] Code Review Feedback * Clear submitted date when we clear the status --- .../application-submission.controller.spec.ts | 14 +++++++++++++- .../application-submission.controller.ts | 7 +++++++ ...pplication-submission-review.controller.spec.ts | 12 ------------ .../application-submission-review.controller.ts | 6 ------ 4 files changed, 20 insertions(+), 19 deletions(-) diff --git a/services/apps/alcs/src/alcs/application/application-submission/application-submission.controller.spec.ts b/services/apps/alcs/src/alcs/application/application-submission/application-submission.controller.spec.ts index 8dab25e2ea..a2ca938622 100644 --- a/services/apps/alcs/src/alcs/application/application-submission/application-submission.controller.spec.ts +++ b/services/apps/alcs/src/alcs/application/application-submission/application-submission.controller.spec.ts @@ -14,6 +14,8 @@ import { ApplicationSubmissionStatusService } from '../application-submission-st import { SUBMISSION_STATUS } from '../application-submission-status/submission-status.dto'; import { ApplicationSubmissionToSubmissionStatus } from '../application-submission-status/submission-status.entity'; import { AlcsApplicationSubmissionDto } from '../application.dto'; +import { Application } from '../application.entity'; +import { ApplicationService } from '../application.service'; import { ApplicationSubmissionController } from './application-submission.controller'; import { ApplicationSubmissionService } from './application-submission.service'; @@ -23,12 +25,14 @@ describe('ApplicationSubmissionController', () => { let mockDocumentService: DeepMocked<DocumentService>; let mockAppSubStatusService: DeepMocked<ApplicationSubmissionStatusService>; let mockStatusEmailService: DeepMocked<StatusEmailService>; + let mockAppService: DeepMocked<ApplicationService>; beforeEach(async () => { mockApplicationSubmissionService = createMock(); mockDocumentService = createMock(); mockAppSubStatusService = createMock(); mockStatusEmailService = createMock(); + mockAppService = createMock(); const module: TestingModule = await Test.createTestingModule({ imports: [ @@ -54,6 +58,10 @@ describe('ApplicationSubmissionController', () => { provide: StatusEmailService, useValue: mockStatusEmailService, }, + { + provide: ApplicationService, + useValue: mockAppService, + }, { provide: ClsService, useValue: {}, @@ -102,7 +110,7 @@ describe('ApplicationSubmissionController', () => { expect(result).toEqual([]); }); - it('should update status correctly when returning to lfng', async () => { + it('should update status and clear submitted date when returning to lfng', async () => { const fakeFileNumber = 'fake'; const fakeUuid = 'fake-uuid'; mockApplicationSubmissionService.update.mockResolvedValue(); @@ -124,6 +132,7 @@ describe('ApplicationSubmissionController', () => { primaryContact: new ApplicationOwner(), }); mockStatusEmailService.sendApplicationStatusEmail.mockResolvedValue(); + mockAppService.updateByFileNumber.mockResolvedValue(new Application()); await controller.returnToLfng(fakeFileNumber, mockDto); @@ -148,6 +157,9 @@ describe('ApplicationSubmissionController', () => { SUBMISSION_STATUS.REFUSED_TO_FORWARD_LG, null, ); + expect(mockAppService.updateByFileNumber).toBeCalledWith(fakeFileNumber, { + dateSubmittedToAlc: null, + }); expect( mockStatusEmailService.getApplicationEmailData, ).toHaveBeenCalledTimes(1); diff --git a/services/apps/alcs/src/alcs/application/application-submission/application-submission.controller.ts b/services/apps/alcs/src/alcs/application/application-submission/application-submission.controller.ts index e2c9218671..6d73795091 100644 --- a/services/apps/alcs/src/alcs/application/application-submission/application-submission.controller.ts +++ b/services/apps/alcs/src/alcs/application/application-submission/application-submission.controller.ts @@ -23,6 +23,7 @@ import { StatusEmailService } from '../../../providers/email/status-email.servic import { PARENT_TYPE } from '../../card/card-subtask/card-subtask.dto'; import { ApplicationSubmissionStatusService } from '../application-submission-status/application-submission-status.service'; import { SUBMISSION_STATUS } from '../application-submission-status/submission-status.dto'; +import { ApplicationService } from '../application.service'; import { AlcsApplicationSubmissionUpdateDto } from './application-submission.dto'; import { ApplicationSubmissionService } from './application-submission.service'; @@ -33,6 +34,7 @@ export class ApplicationSubmissionController { constructor( private applicationSubmissionService: ApplicationSubmissionService, private applicationSubmissionStatusService: ApplicationSubmissionStatusService, + private applicationService: ApplicationService, private documentService: DocumentService, private statusEmailService: StatusEmailService, @InjectMapper() private mapper: Mapper, @@ -128,6 +130,11 @@ export class ApplicationSubmissionController { null, ); + //Clear Submission Date + await this.applicationService.updateByFileNumber(fileNumber, { + dateSubmittedToAlc: null, + }); + const { primaryContact, submissionGovernment } = await this.statusEmailService.getApplicationEmailData( submission.fileNumber, diff --git a/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.spec.ts b/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.spec.ts index b4180fb038..4f66a9e73a 100644 --- a/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.spec.ts +++ b/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.spec.ts @@ -14,7 +14,6 @@ import { ApplicationSubmissionStatusType } from '../../alcs/application/applicat import { SUBMISSION_STATUS } from '../../alcs/application/application-submission-status/submission-status.dto'; import { ApplicationSubmissionToSubmissionStatus } from '../../alcs/application/application-submission-status/submission-status.entity'; import { Application } from '../../alcs/application/application.entity'; -import { ApplicationService } from '../../alcs/application/application.service'; import { LocalGovernment } from '../../alcs/local-government/local-government.entity'; import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; import { OwnerType } from '../../common/owner-type/owner-type.entity'; @@ -45,7 +44,6 @@ describe('ApplicationSubmissionReviewController', () => { let mockLGService: DeepMocked<LocalGovernmentService>; let mockAppDocService: DeepMocked<ApplicationDocumentService>; let mockAppValidatorService: DeepMocked<ApplicationSubmissionValidatorService>; - let mockAppService: DeepMocked<ApplicationService>; let mockStatusEmailService: DeepMocked<StatusEmailService>; let mockApplicationSubmissionStatusService: DeepMocked<ApplicationSubmissionStatusService>; @@ -66,7 +64,6 @@ describe('ApplicationSubmissionReviewController', () => { mockLGService = createMock(); mockAppDocService = createMock(); mockAppValidatorService = createMock(); - mockAppService = createMock(); mockStatusEmailService = createMock(); applicationReview = new ApplicationSubmissionReview({ @@ -101,10 +98,6 @@ describe('ApplicationSubmissionReviewController', () => { provide: ApplicationSubmissionValidatorService, useValue: mockAppValidatorService, }, - { - provide: ApplicationService, - useValue: mockAppService, - }, { provide: StatusEmailService, useValue: mockStatusEmailService, @@ -237,7 +230,6 @@ describe('ApplicationSubmissionReviewController', () => { }), ); mockAppSubmissionService.updateStatus.mockResolvedValue({} as any); - mockAppService.fetchApplicationTypes.mockResolvedValue([]); mockAppSubmissionService.getStatus.mockResolvedValue( new ApplicationSubmissionStatusType({ label: '', @@ -475,7 +467,6 @@ describe('ApplicationSubmissionReviewController', () => { it('should update the status, delete documents, and update the application for return', async () => { mockLGService.getByGuid.mockResolvedValue(mockLG); - mockAppService.updateByFileNumber.mockResolvedValue(new Application()); const mockOwner = new ApplicationOwner({ uuid: '1234' }); const mockSubmission = new ApplicationSubmission({ @@ -550,7 +541,6 @@ describe('ApplicationSubmissionReviewController', () => { expect(mockAppSubmissionService.updateStatus.mock.calls[0][1]).toEqual( SUBMISSION_STATUS.WRONG_GOV, ); - expect(mockAppService.updateByFileNumber).toHaveBeenCalledTimes(1); expect(mockAppSubmissionService.update).toHaveBeenCalledTimes(1); expect(mockAppSubmissionService.update.mock.calls[0][0]).toEqual( 'submission-uuid', @@ -579,7 +569,6 @@ describe('ApplicationSubmissionReviewController', () => { it('should send the correct email template for wrong government return', async () => { mockLGService.getByGuid.mockResolvedValue(mockLG); - mockAppService.updateByFileNumber.mockResolvedValue(new Application()); const mockOwner = new ApplicationOwner({ uuid: '1234' }); const mockSubmission = new ApplicationSubmission({ @@ -653,7 +642,6 @@ describe('ApplicationSubmissionReviewController', () => { parentType: 'application', primaryContact: mockOwner, }); - expect(mockAppService.updateByFileNumber).toHaveBeenCalledTimes(1); }); it('should throw an exception when trying to return an application not in review', async () => { diff --git a/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.ts b/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.ts index 041fcf051f..b9f766fa7e 100644 --- a/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.ts +++ b/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.ts @@ -44,7 +44,6 @@ export class ApplicationSubmissionReviewController { constructor( private applicationSubmissionService: ApplicationSubmissionService, private applicationSubmissionReviewService: ApplicationSubmissionReviewService, - private applicationService: ApplicationService, private applicationDocumentService: ApplicationDocumentService, private localGovernmentService: LocalGovernmentService, private applicationValidatorService: ApplicationSubmissionValidatorService, @@ -370,11 +369,6 @@ export class ApplicationSubmissionReviewController { await this.applicationSubmissionReviewService.delete(applicationReview); - //Clear Submission Date - await this.applicationService.updateByFileNumber(fileNumber, { - dateSubmittedToAlc: null, - }); - if (returnDto.applicantComment) { await this.applicationSubmissionService.update( applicationSubmission.uuid, From d11a9b52b1fcf1d5759dc9cacae54ad909786f76 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Mon, 20 Nov 2023 11:38:14 -0800 Subject: [PATCH 658/954] Change filed viewed user to correct uuid * Was text --- .../src/common/tracking/file-viewed.entity.ts | 1 + ...7032-convert_user_uuid_to_uuid_tracking.ts | 27 +++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1700508807032-convert_user_uuid_to_uuid_tracking.ts diff --git a/services/apps/alcs/src/common/tracking/file-viewed.entity.ts b/services/apps/alcs/src/common/tracking/file-viewed.entity.ts index 2e97002478..8798b877cb 100644 --- a/services/apps/alcs/src/common/tracking/file-viewed.entity.ts +++ b/services/apps/alcs/src/common/tracking/file-viewed.entity.ts @@ -27,6 +27,7 @@ export class FileViewed extends BaseEntity { @Column({ nullable: false, + type: 'uuid', }) userUuid: string; diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1700508807032-convert_user_uuid_to_uuid_tracking.ts b/services/apps/alcs/src/providers/typeorm/migrations/1700508807032-convert_user_uuid_to_uuid_tracking.ts new file mode 100644 index 0000000000..f0f6255e00 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1700508807032-convert_user_uuid_to_uuid_tracking.ts @@ -0,0 +1,27 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class ConvertUserUuidToUuidTracking1700508807032 + implements MigrationInterface +{ + name = 'ConvertUserUuidToUuidTracking1700508807032'; + + public async up(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query(`TRUNCATE TABLE "alcs"."file_viewed"`); + await queryRunner.query( + `ALTER TABLE "alcs"."file_viewed" DROP COLUMN "user_uuid"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."file_viewed" ADD "user_uuid" uuid NOT NULL`, + ); + } + + public async down(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query(`TRUNCATE TABLE "alcs"."file_viewed"`); + await queryRunner.query( + `ALTER TABLE "alcs"."file_viewed" DROP COLUMN "user_uuid"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."file_viewed" ADD "user_uuid" character varying NOT NULL`, + ); + } +} From 719f41b6b043da6bb1eb7fc804b1f5c88ca83606 Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Mon, 20 Nov 2023 13:17:16 -0800 Subject: [PATCH 659/954] adding ranking on noi --- ...lic-notice-of-intent-search-view.entity.ts | 13 +++++++++++- .../public-notice-of-intent-search.service.ts | 2 ++ .../migrations/1700511703994-add-destRank.ts | 20 +++++++++++++++++++ 3 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1700511703994-add-destRank.ts diff --git a/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search-view.entity.ts b/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search-view.entity.ts index 8f730e589f..0778a1342a 100644 --- a/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search-view.entity.ts +++ b/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search-view.entity.ts @@ -27,6 +27,7 @@ import { LinkedStatusType } from '../public-search.dto'; .addSelect('noi.date_submitted_to_alc', 'date_submitted_to_alc') .addSelect('noi.decision_date', 'decision_date') .addSelect('decision_date.outcome', 'outcome') + .addSelect('decision_date.dest_rank', 'dest_rank') .addSelect('noi.uuid', 'notice_of_intent_uuid') .addSelect('noi.region_code', 'notice_of_intent_region_code') .addSelect( @@ -65,9 +66,14 @@ import { LinkedStatusType } from '../public-search.dto'; .from(NoticeOfIntentDecision, 'decision_date') .select('MAX("date")', 'date') .addSelect('outcome_code', 'outcome') + .addSelect( + 'RANK() OVER (PARTITION BY notice_of_intent_uuid ORDER BY date DESC)', + 'dest_rank', + ) .addSelect('notice_of_intent_uuid', 'notice_of_intent_uuid') .groupBy('notice_of_intent_uuid') - .addGroupBy('outcome'), + .addGroupBy('outcome_code') + .addGroupBy('decision_date.date'), 'decision_date', 'decision_date."notice_of_intent_uuid" = noi.uuid', ) @@ -77,6 +83,9 @@ import { LinkedStatusType } from '../public-search.dto'; ) .andWhere( "alcs.get_current_status_for_notice_of_intent_submission_by_uuid(noi_sub.uuid)->>'status_type_code' != 'CNCL'", + ) + .andWhere( + "decision_date.dest_rank = 1", ), }) export class PublicNoticeOfIntentSubmissionSearchView { @@ -117,6 +126,8 @@ export class PublicNoticeOfIntentSubmissionSearchView { @ViewColumn() decisionDate: Date | null; + @ViewColumn() + destRank: number | null; @ViewColumn() outcome: string | null; diff --git a/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search.service.ts b/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search.service.ts index 26d5bcb8a3..2c1b818645 100644 --- a/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search.service.ts +++ b/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search.service.ts @@ -27,6 +27,7 @@ export class PublicNoticeOfIntentSearchService { AdvancedSearchResultDto<PublicNoticeOfIntentSubmissionSearchView[]> > { const query = await this.compileNoticeOfIntentSearchQuery(searchDto); + console.log(query.getQuery()) this.compileGroupBySearchQuery(query); @@ -89,6 +90,7 @@ export class PublicNoticeOfIntentSearchService { , "noiSearch"."date_submitted_to_alc" , "noiSearch"."decision_date" , "noiSearch"."outcome" + , "noiSearch"."dest_rank" , "noiSearch"."last_update" , "noticeOfIntentType"."audit_deleted_date_at" , "noticeOfIntentType"."audit_created_at" diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1700511703994-add-destRank.ts b/services/apps/alcs/src/providers/typeorm/migrations/1700511703994-add-destRank.ts new file mode 100644 index 0000000000..be70bff816 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1700511703994-add-destRank.ts @@ -0,0 +1,20 @@ +import { MigrationInterface, QueryRunner } from "typeorm"; + +export class AddDestRank1700511703994 implements MigrationInterface { + name = 'AddDestRank1700511703994' + + public async up(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query(`DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, ["VIEW","public_notice_of_intent_submission_search_view","alcs"]); + await queryRunner.query(`DROP VIEW "alcs"."public_notice_of_intent_submission_search_view"`); + await queryRunner.query(`CREATE VIEW "alcs"."public_notice_of_intent_submission_search_view" AS SELECT "noi_sub"."uuid" AS "uuid", "noi_sub"."applicant" AS "applicant", "noi"."uuid" AS "notice_of_intent_uuid", "noticeOfIntentType"."audit_deleted_date_at" AS "noticeOfIntentType_audit_deleted_date_at", "noticeOfIntentType"."audit_created_at" AS "noticeOfIntentType_audit_created_at", "noticeOfIntentType"."audit_updated_at" AS "noticeOfIntentType_audit_updated_at", "noticeOfIntentType"."audit_created_by" AS "noticeOfIntentType_audit_created_by", "noticeOfIntentType"."audit_updated_by" AS "noticeOfIntentType_audit_updated_by", "noticeOfIntentType"."label" AS "noticeOfIntentType_label", "noticeOfIntentType"."code" AS "noticeOfIntentType_code", "noticeOfIntentType"."description" AS "noticeOfIntentType_description", "noticeOfIntentType"."short_label" AS "noticeOfIntentType_short_label", "noticeOfIntentType"."background_color" AS "noticeOfIntentType_background_color", "noticeOfIntentType"."text_color" AS "noticeOfIntentType_text_color", "noticeOfIntentType"."html_description" AS "noticeOfIntentType_html_description", "noticeOfIntentType"."portal_label" AS "noticeOfIntentType_portal_label", "localGovernment"."name" AS "local_government_name", "noi_sub"."file_number" AS "file_number", "noi_sub"."local_government_uuid" AS "local_government_uuid", "noi_sub"."type_code" AS "notice_of_intent_type_code", "noi"."date_submitted_to_alc" AS "date_submitted_to_alc", "noi"."decision_date" AS "decision_date", decision_date.outcome AS "outcome", decision_date.dest_rank AS "dest_rank", "noi"."region_code" AS "notice_of_intent_region_code", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid") AS "status" FROM "alcs"."notice_of_intent_submission" "noi_sub" INNER JOIN "alcs"."notice_of_intent" "noi" ON "noi"."file_number" = "noi_sub"."file_number" AND "noi"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."notice_of_intent_type" "noticeOfIntentType" ON "noi_sub"."type_code" = "noticeOfIntentType"."code" AND "noticeOfIntentType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "noi_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."notice_of_intent_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "noi_sub"."uuid" LEFT JOIN (SELECT MAX("date") AS "date", outcome_code AS "outcome", RANK() OVER (PARTITION BY notice_of_intent_uuid ORDER BY date DESC) AS "dest_rank", notice_of_intent_uuid AS "notice_of_intent_uuid" FROM "alcs"."notice_of_intent_decision" "decision_date" WHERE "decision_date"."audit_deleted_date_at" IS NULL GROUP BY notice_of_intent_uuid, outcome_code, "decision_date"."date") "decision_date" ON decision_date."notice_of_intent_uuid" = "noi"."uuid" WHERE ( "noi_sub"."is_draft" = FALSE AND ("noi"."date_received_all_items" IS NOT NULL AND "noi"."date_received_all_items" <= NOW()) AND alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid")->>'status_type_code' != 'CNCL' AND decision_date.dest_rank = 1 ) AND ( "noi_sub"."audit_deleted_date_at" IS NULL )`); + await queryRunner.query(`INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, ["alcs","VIEW","public_notice_of_intent_submission_search_view","SELECT \"noi_sub\".\"uuid\" AS \"uuid\", \"noi_sub\".\"applicant\" AS \"applicant\", \"noi\".\"uuid\" AS \"notice_of_intent_uuid\", \"noticeOfIntentType\".\"audit_deleted_date_at\" AS \"noticeOfIntentType_audit_deleted_date_at\", \"noticeOfIntentType\".\"audit_created_at\" AS \"noticeOfIntentType_audit_created_at\", \"noticeOfIntentType\".\"audit_updated_at\" AS \"noticeOfIntentType_audit_updated_at\", \"noticeOfIntentType\".\"audit_created_by\" AS \"noticeOfIntentType_audit_created_by\", \"noticeOfIntentType\".\"audit_updated_by\" AS \"noticeOfIntentType_audit_updated_by\", \"noticeOfIntentType\".\"label\" AS \"noticeOfIntentType_label\", \"noticeOfIntentType\".\"code\" AS \"noticeOfIntentType_code\", \"noticeOfIntentType\".\"description\" AS \"noticeOfIntentType_description\", \"noticeOfIntentType\".\"short_label\" AS \"noticeOfIntentType_short_label\", \"noticeOfIntentType\".\"background_color\" AS \"noticeOfIntentType_background_color\", \"noticeOfIntentType\".\"text_color\" AS \"noticeOfIntentType_text_color\", \"noticeOfIntentType\".\"html_description\" AS \"noticeOfIntentType_html_description\", \"noticeOfIntentType\".\"portal_label\" AS \"noticeOfIntentType_portal_label\", \"localGovernment\".\"name\" AS \"local_government_name\", \"noi_sub\".\"file_number\" AS \"file_number\", \"noi_sub\".\"local_government_uuid\" AS \"local_government_uuid\", \"noi_sub\".\"type_code\" AS \"notice_of_intent_type_code\", \"noi\".\"date_submitted_to_alc\" AS \"date_submitted_to_alc\", \"noi\".\"decision_date\" AS \"decision_date\", decision_date.outcome AS \"outcome\", decision_date.dest_rank AS \"dest_rank\", \"noi\".\"region_code\" AS \"notice_of_intent_region_code\", GREATEST(status_link.effective_date, decision_date.date) AS \"last_update\", alcs.get_current_status_for_notice_of_intent_submission_by_uuid(\"noi_sub\".\"uuid\") AS \"status\" FROM \"alcs\".\"notice_of_intent_submission\" \"noi_sub\" INNER JOIN \"alcs\".\"notice_of_intent\" \"noi\" ON \"noi\".\"file_number\" = \"noi_sub\".\"file_number\" AND \"noi\".\"audit_deleted_date_at\" IS NULL INNER JOIN \"alcs\".\"notice_of_intent_type\" \"noticeOfIntentType\" ON \"noi_sub\".\"type_code\" = \"noticeOfIntentType\".\"code\" AND \"noticeOfIntentType\".\"audit_deleted_date_at\" IS NULL LEFT JOIN \"alcs\".\"local_government\" \"localGovernment\" ON \"noi_sub\".\"local_government_uuid\" = \"localGovernment\".\"uuid\" AND \"localGovernment\".\"audit_deleted_date_at\" IS NULL LEFT JOIN (SELECT MAX(\"effective_date\") AS \"effective_date\", submission_uuid AS \"submission_uuid\" FROM \"alcs\".\"notice_of_intent_submission_to_submission_status\" \"status_link\" GROUP BY submission_uuid) \"status_link\" ON status_link.\"submission_uuid\" = \"noi_sub\".\"uuid\" LEFT JOIN (SELECT MAX(\"date\") AS \"date\", outcome_code AS \"outcome\", RANK() OVER (PARTITION BY notice_of_intent_uuid ORDER BY date DESC) AS \"dest_rank\", notice_of_intent_uuid AS \"notice_of_intent_uuid\" FROM \"alcs\".\"notice_of_intent_decision\" \"decision_date\" WHERE \"decision_date\".\"audit_deleted_date_at\" IS NULL GROUP BY notice_of_intent_uuid, outcome_code, \"decision_date\".\"date\") \"decision_date\" ON decision_date.\"notice_of_intent_uuid\" = \"noi\".\"uuid\" WHERE ( \"noi_sub\".\"is_draft\" = FALSE AND (\"noi\".\"date_received_all_items\" IS NOT NULL AND \"noi\".\"date_received_all_items\" <= NOW()) AND alcs.get_current_status_for_notice_of_intent_submission_by_uuid(\"noi_sub\".\"uuid\")->>'status_type_code' != 'CNCL' AND decision_date.dest_rank = 1 ) AND ( \"noi_sub\".\"audit_deleted_date_at\" IS NULL )"]); + } + + public async down(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query(`DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, ["VIEW","public_notice_of_intent_submission_search_view","alcs"]); + await queryRunner.query(`DROP VIEW "alcs"."public_notice_of_intent_submission_search_view"`); + await queryRunner.query(`CREATE VIEW "alcs"."public_notice_of_intent_submission_search_view" AS SELECT "noi_sub"."uuid" AS "uuid", "noi_sub"."applicant" AS "applicant", "noi"."uuid" AS "notice_of_intent_uuid", "noticeOfIntentType"."audit_deleted_date_at" AS "noticeOfIntentType_audit_deleted_date_at", "noticeOfIntentType"."audit_created_at" AS "noticeOfIntentType_audit_created_at", "noticeOfIntentType"."audit_updated_at" AS "noticeOfIntentType_audit_updated_at", "noticeOfIntentType"."audit_created_by" AS "noticeOfIntentType_audit_created_by", "noticeOfIntentType"."audit_updated_by" AS "noticeOfIntentType_audit_updated_by", "noticeOfIntentType"."label" AS "noticeOfIntentType_label", "noticeOfIntentType"."code" AS "noticeOfIntentType_code", "noticeOfIntentType"."description" AS "noticeOfIntentType_description", "noticeOfIntentType"."short_label" AS "noticeOfIntentType_short_label", "noticeOfIntentType"."background_color" AS "noticeOfIntentType_background_color", "noticeOfIntentType"."text_color" AS "noticeOfIntentType_text_color", "noticeOfIntentType"."html_description" AS "noticeOfIntentType_html_description", "noticeOfIntentType"."portal_label" AS "noticeOfIntentType_portal_label", "localGovernment"."name" AS "local_government_name", "noi_sub"."file_number" AS "file_number", "noi_sub"."local_government_uuid" AS "local_government_uuid", "noi_sub"."type_code" AS "notice_of_intent_type_code", "noi"."date_submitted_to_alc" AS "date_submitted_to_alc", "noi"."decision_date" AS "decision_date", decision_date.outcome AS "outcome", "noi"."region_code" AS "notice_of_intent_region_code", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid") AS "status" FROM "alcs"."notice_of_intent_submission" "noi_sub" INNER JOIN "alcs"."notice_of_intent" "noi" ON "noi"."file_number" = "noi_sub"."file_number" AND "noi"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."notice_of_intent_type" "noticeOfIntentType" ON "noi_sub"."type_code" = "noticeOfIntentType"."code" AND "noticeOfIntentType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "noi_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."notice_of_intent_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "noi_sub"."uuid" LEFT JOIN (SELECT MAX("date") AS "date", outcome_code AS "outcome", notice_of_intent_uuid AS "notice_of_intent_uuid" FROM "alcs"."notice_of_intent_decision" "decision_date" WHERE "decision_date"."audit_deleted_date_at" IS NULL GROUP BY notice_of_intent_uuid, outcome) "decision_date" ON decision_date."notice_of_intent_uuid" = "noi"."uuid" WHERE ( "noi_sub"."is_draft" = FALSE AND ("noi"."date_received_all_items" IS NOT NULL AND "noi"."date_received_all_items" <= NOW()) AND alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid")->>'status_type_code' != 'CNCL' ) AND ( "noi_sub"."audit_deleted_date_at" IS NULL )`); + await queryRunner.query(`INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, ["alcs","VIEW","public_notice_of_intent_submission_search_view","SELECT \"noi_sub\".\"uuid\" AS \"uuid\", \"noi_sub\".\"applicant\" AS \"applicant\", \"noi\".\"uuid\" AS \"notice_of_intent_uuid\", \"noticeOfIntentType\".\"audit_deleted_date_at\" AS \"noticeOfIntentType_audit_deleted_date_at\", \"noticeOfIntentType\".\"audit_created_at\" AS \"noticeOfIntentType_audit_created_at\", \"noticeOfIntentType\".\"audit_updated_at\" AS \"noticeOfIntentType_audit_updated_at\", \"noticeOfIntentType\".\"audit_created_by\" AS \"noticeOfIntentType_audit_created_by\", \"noticeOfIntentType\".\"audit_updated_by\" AS \"noticeOfIntentType_audit_updated_by\", \"noticeOfIntentType\".\"label\" AS \"noticeOfIntentType_label\", \"noticeOfIntentType\".\"code\" AS \"noticeOfIntentType_code\", \"noticeOfIntentType\".\"description\" AS \"noticeOfIntentType_description\", \"noticeOfIntentType\".\"short_label\" AS \"noticeOfIntentType_short_label\", \"noticeOfIntentType\".\"background_color\" AS \"noticeOfIntentType_background_color\", \"noticeOfIntentType\".\"text_color\" AS \"noticeOfIntentType_text_color\", \"noticeOfIntentType\".\"html_description\" AS \"noticeOfIntentType_html_description\", \"noticeOfIntentType\".\"portal_label\" AS \"noticeOfIntentType_portal_label\", \"localGovernment\".\"name\" AS \"local_government_name\", \"noi_sub\".\"file_number\" AS \"file_number\", \"noi_sub\".\"local_government_uuid\" AS \"local_government_uuid\", \"noi_sub\".\"type_code\" AS \"notice_of_intent_type_code\", \"noi\".\"date_submitted_to_alc\" AS \"date_submitted_to_alc\", \"noi\".\"decision_date\" AS \"decision_date\", decision_date.outcome AS \"outcome\", \"noi\".\"region_code\" AS \"notice_of_intent_region_code\", GREATEST(status_link.effective_date, decision_date.date) AS \"last_update\", alcs.get_current_status_for_notice_of_intent_submission_by_uuid(\"noi_sub\".\"uuid\") AS \"status\" FROM \"alcs\".\"notice_of_intent_submission\" \"noi_sub\" INNER JOIN \"alcs\".\"notice_of_intent\" \"noi\" ON \"noi\".\"file_number\" = \"noi_sub\".\"file_number\" AND \"noi\".\"audit_deleted_date_at\" IS NULL INNER JOIN \"alcs\".\"notice_of_intent_type\" \"noticeOfIntentType\" ON \"noi_sub\".\"type_code\" = \"noticeOfIntentType\".\"code\" AND \"noticeOfIntentType\".\"audit_deleted_date_at\" IS NULL LEFT JOIN \"alcs\".\"local_government\" \"localGovernment\" ON \"noi_sub\".\"local_government_uuid\" = \"localGovernment\".\"uuid\" AND \"localGovernment\".\"audit_deleted_date_at\" IS NULL LEFT JOIN (SELECT MAX(\"effective_date\") AS \"effective_date\", submission_uuid AS \"submission_uuid\" FROM \"alcs\".\"notice_of_intent_submission_to_submission_status\" \"status_link\" GROUP BY submission_uuid) \"status_link\" ON status_link.\"submission_uuid\" = \"noi_sub\".\"uuid\" LEFT JOIN (SELECT MAX(\"date\") AS \"date\", outcome_code AS \"outcome\", notice_of_intent_uuid AS \"notice_of_intent_uuid\" FROM \"alcs\".\"notice_of_intent_decision\" \"decision_date\" WHERE \"decision_date\".\"audit_deleted_date_at\" IS NULL GROUP BY notice_of_intent_uuid, outcome) \"decision_date\" ON decision_date.\"notice_of_intent_uuid\" = \"noi\".\"uuid\" WHERE ( \"noi_sub\".\"is_draft\" = FALSE AND (\"noi\".\"date_received_all_items\" IS NOT NULL AND \"noi\".\"date_received_all_items\" <= NOW()) AND alcs.get_current_status_for_notice_of_intent_submission_by_uuid(\"noi_sub\".\"uuid\")->>'status_type_code' != 'CNCL' ) AND ( \"noi_sub\".\"audit_deleted_date_at\" IS NULL )"]); + } + +} From f2395b2766c0a2453648462f96ddeb4eb709c09d Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Mon, 20 Nov 2023 14:04:02 -0800 Subject: [PATCH 660/954] fixes --- ...lic-notice-of-intent-search-view.entity.ts | 4 ++-- .../migrations/1700517731442-add-destRank.ts | 20 +++++++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1700517731442-add-destRank.ts diff --git a/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search-view.entity.ts b/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search-view.entity.ts index 0778a1342a..ac24185030 100644 --- a/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search-view.entity.ts +++ b/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search-view.entity.ts @@ -64,7 +64,7 @@ import { LinkedStatusType } from '../public-search.dto'; (qb) => qb .from(NoticeOfIntentDecision, 'decision_date') - .select('MAX("date")', 'date') + .select('date', 'date') .addSelect('outcome_code', 'outcome') .addSelect( 'RANK() OVER (PARTITION BY notice_of_intent_uuid ORDER BY date DESC)', @@ -73,7 +73,7 @@ import { LinkedStatusType } from '../public-search.dto'; .addSelect('notice_of_intent_uuid', 'notice_of_intent_uuid') .groupBy('notice_of_intent_uuid') .addGroupBy('outcome_code') - .addGroupBy('decision_date.date'), + .addGroupBy('date'), 'decision_date', 'decision_date."notice_of_intent_uuid" = noi.uuid', ) diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1700517731442-add-destRank.ts b/services/apps/alcs/src/providers/typeorm/migrations/1700517731442-add-destRank.ts new file mode 100644 index 0000000000..6d7192d6fa --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1700517731442-add-destRank.ts @@ -0,0 +1,20 @@ +import { MigrationInterface, QueryRunner } from "typeorm"; + +export class AddDestRank1700517731442 implements MigrationInterface { + name = 'AddDestRank1700517731442' + + public async up(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query(`DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, ["VIEW","public_notice_of_intent_submission_search_view","alcs"]); + await queryRunner.query(`DROP VIEW "alcs"."public_notice_of_intent_submission_search_view"`); + await queryRunner.query(`CREATE VIEW "alcs"."public_notice_of_intent_submission_search_view" AS SELECT "noi_sub"."uuid" AS "uuid", "noi_sub"."applicant" AS "applicant", "noi"."uuid" AS "notice_of_intent_uuid", "noticeOfIntentType"."audit_deleted_date_at" AS "noticeOfIntentType_audit_deleted_date_at", "noticeOfIntentType"."audit_created_at" AS "noticeOfIntentType_audit_created_at", "noticeOfIntentType"."audit_updated_at" AS "noticeOfIntentType_audit_updated_at", "noticeOfIntentType"."audit_created_by" AS "noticeOfIntentType_audit_created_by", "noticeOfIntentType"."audit_updated_by" AS "noticeOfIntentType_audit_updated_by", "noticeOfIntentType"."label" AS "noticeOfIntentType_label", "noticeOfIntentType"."code" AS "noticeOfIntentType_code", "noticeOfIntentType"."description" AS "noticeOfIntentType_description", "noticeOfIntentType"."short_label" AS "noticeOfIntentType_short_label", "noticeOfIntentType"."background_color" AS "noticeOfIntentType_background_color", "noticeOfIntentType"."text_color" AS "noticeOfIntentType_text_color", "noticeOfIntentType"."html_description" AS "noticeOfIntentType_html_description", "noticeOfIntentType"."portal_label" AS "noticeOfIntentType_portal_label", "localGovernment"."name" AS "local_government_name", "noi_sub"."file_number" AS "file_number", "noi_sub"."local_government_uuid" AS "local_government_uuid", "noi_sub"."type_code" AS "notice_of_intent_type_code", "noi"."date_submitted_to_alc" AS "date_submitted_to_alc", "noi"."decision_date" AS "decision_date", decision_date.outcome AS "outcome", decision_date.dest_rank AS "dest_rank", "noi"."region_code" AS "notice_of_intent_region_code", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid") AS "status" FROM "alcs"."notice_of_intent_submission" "noi_sub" INNER JOIN "alcs"."notice_of_intent" "noi" ON "noi"."file_number" = "noi_sub"."file_number" AND "noi"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."notice_of_intent_type" "noticeOfIntentType" ON "noi_sub"."type_code" = "noticeOfIntentType"."code" AND "noticeOfIntentType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "noi_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."notice_of_intent_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "noi_sub"."uuid" LEFT JOIN (SELECT date AS "date", outcome_code AS "outcome", RANK() OVER (PARTITION BY notice_of_intent_uuid ORDER BY date DESC) AS "dest_rank", notice_of_intent_uuid AS "notice_of_intent_uuid" FROM "alcs"."notice_of_intent_decision" "decision_date" WHERE "decision_date"."audit_deleted_date_at" IS NULL GROUP BY notice_of_intent_uuid, outcome_code, date) "decision_date" ON decision_date."notice_of_intent_uuid" = "noi"."uuid" WHERE ( "noi_sub"."is_draft" = FALSE AND ("noi"."date_received_all_items" IS NOT NULL AND "noi"."date_received_all_items" <= NOW()) AND alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid")->>'status_type_code' != 'CNCL' AND decision_date.dest_rank = 1 ) AND ( "noi_sub"."audit_deleted_date_at" IS NULL )`); + await queryRunner.query(`INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, ["alcs","VIEW","public_notice_of_intent_submission_search_view","SELECT \"noi_sub\".\"uuid\" AS \"uuid\", \"noi_sub\".\"applicant\" AS \"applicant\", \"noi\".\"uuid\" AS \"notice_of_intent_uuid\", \"noticeOfIntentType\".\"audit_deleted_date_at\" AS \"noticeOfIntentType_audit_deleted_date_at\", \"noticeOfIntentType\".\"audit_created_at\" AS \"noticeOfIntentType_audit_created_at\", \"noticeOfIntentType\".\"audit_updated_at\" AS \"noticeOfIntentType_audit_updated_at\", \"noticeOfIntentType\".\"audit_created_by\" AS \"noticeOfIntentType_audit_created_by\", \"noticeOfIntentType\".\"audit_updated_by\" AS \"noticeOfIntentType_audit_updated_by\", \"noticeOfIntentType\".\"label\" AS \"noticeOfIntentType_label\", \"noticeOfIntentType\".\"code\" AS \"noticeOfIntentType_code\", \"noticeOfIntentType\".\"description\" AS \"noticeOfIntentType_description\", \"noticeOfIntentType\".\"short_label\" AS \"noticeOfIntentType_short_label\", \"noticeOfIntentType\".\"background_color\" AS \"noticeOfIntentType_background_color\", \"noticeOfIntentType\".\"text_color\" AS \"noticeOfIntentType_text_color\", \"noticeOfIntentType\".\"html_description\" AS \"noticeOfIntentType_html_description\", \"noticeOfIntentType\".\"portal_label\" AS \"noticeOfIntentType_portal_label\", \"localGovernment\".\"name\" AS \"local_government_name\", \"noi_sub\".\"file_number\" AS \"file_number\", \"noi_sub\".\"local_government_uuid\" AS \"local_government_uuid\", \"noi_sub\".\"type_code\" AS \"notice_of_intent_type_code\", \"noi\".\"date_submitted_to_alc\" AS \"date_submitted_to_alc\", \"noi\".\"decision_date\" AS \"decision_date\", decision_date.outcome AS \"outcome\", decision_date.dest_rank AS \"dest_rank\", \"noi\".\"region_code\" AS \"notice_of_intent_region_code\", GREATEST(status_link.effective_date, decision_date.date) AS \"last_update\", alcs.get_current_status_for_notice_of_intent_submission_by_uuid(\"noi_sub\".\"uuid\") AS \"status\" FROM \"alcs\".\"notice_of_intent_submission\" \"noi_sub\" INNER JOIN \"alcs\".\"notice_of_intent\" \"noi\" ON \"noi\".\"file_number\" = \"noi_sub\".\"file_number\" AND \"noi\".\"audit_deleted_date_at\" IS NULL INNER JOIN \"alcs\".\"notice_of_intent_type\" \"noticeOfIntentType\" ON \"noi_sub\".\"type_code\" = \"noticeOfIntentType\".\"code\" AND \"noticeOfIntentType\".\"audit_deleted_date_at\" IS NULL LEFT JOIN \"alcs\".\"local_government\" \"localGovernment\" ON \"noi_sub\".\"local_government_uuid\" = \"localGovernment\".\"uuid\" AND \"localGovernment\".\"audit_deleted_date_at\" IS NULL LEFT JOIN (SELECT MAX(\"effective_date\") AS \"effective_date\", submission_uuid AS \"submission_uuid\" FROM \"alcs\".\"notice_of_intent_submission_to_submission_status\" \"status_link\" GROUP BY submission_uuid) \"status_link\" ON status_link.\"submission_uuid\" = \"noi_sub\".\"uuid\" LEFT JOIN (SELECT date AS \"date\", outcome_code AS \"outcome\", RANK() OVER (PARTITION BY notice_of_intent_uuid ORDER BY date DESC) AS \"dest_rank\", notice_of_intent_uuid AS \"notice_of_intent_uuid\" FROM \"alcs\".\"notice_of_intent_decision\" \"decision_date\" WHERE \"decision_date\".\"audit_deleted_date_at\" IS NULL GROUP BY notice_of_intent_uuid, outcome_code, date) \"decision_date\" ON decision_date.\"notice_of_intent_uuid\" = \"noi\".\"uuid\" WHERE ( \"noi_sub\".\"is_draft\" = FALSE AND (\"noi\".\"date_received_all_items\" IS NOT NULL AND \"noi\".\"date_received_all_items\" <= NOW()) AND alcs.get_current_status_for_notice_of_intent_submission_by_uuid(\"noi_sub\".\"uuid\")->>'status_type_code' != 'CNCL' AND decision_date.dest_rank = 1 ) AND ( \"noi_sub\".\"audit_deleted_date_at\" IS NULL )"]); + } + + public async down(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query(`DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, ["VIEW","public_notice_of_intent_submission_search_view","alcs"]); + await queryRunner.query(`DROP VIEW "alcs"."public_notice_of_intent_submission_search_view"`); + await queryRunner.query(`CREATE VIEW "alcs"."public_notice_of_intent_submission_search_view" AS SELECT "noi_sub"."uuid" AS "uuid", "noi_sub"."applicant" AS "applicant", "noi"."uuid" AS "notice_of_intent_uuid", "noticeOfIntentType"."audit_deleted_date_at" AS "noticeOfIntentType_audit_deleted_date_at", "noticeOfIntentType"."audit_created_at" AS "noticeOfIntentType_audit_created_at", "noticeOfIntentType"."audit_updated_at" AS "noticeOfIntentType_audit_updated_at", "noticeOfIntentType"."audit_created_by" AS "noticeOfIntentType_audit_created_by", "noticeOfIntentType"."audit_updated_by" AS "noticeOfIntentType_audit_updated_by", "noticeOfIntentType"."label" AS "noticeOfIntentType_label", "noticeOfIntentType"."code" AS "noticeOfIntentType_code", "noticeOfIntentType"."description" AS "noticeOfIntentType_description", "noticeOfIntentType"."short_label" AS "noticeOfIntentType_short_label", "noticeOfIntentType"."background_color" AS "noticeOfIntentType_background_color", "noticeOfIntentType"."text_color" AS "noticeOfIntentType_text_color", "noticeOfIntentType"."html_description" AS "noticeOfIntentType_html_description", "noticeOfIntentType"."portal_label" AS "noticeOfIntentType_portal_label", "localGovernment"."name" AS "local_government_name", "noi_sub"."file_number" AS "file_number", "noi_sub"."local_government_uuid" AS "local_government_uuid", "noi_sub"."type_code" AS "notice_of_intent_type_code", "noi"."date_submitted_to_alc" AS "date_submitted_to_alc", "noi"."decision_date" AS "decision_date", decision_date.outcome AS "outcome", "noi"."region_code" AS "notice_of_intent_region_code", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid") AS "status" FROM "alcs"."notice_of_intent_submission" "noi_sub" INNER JOIN "alcs"."notice_of_intent" "noi" ON "noi"."file_number" = "noi_sub"."file_number" AND "noi"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."notice_of_intent_type" "noticeOfIntentType" ON "noi_sub"."type_code" = "noticeOfIntentType"."code" AND "noticeOfIntentType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "noi_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."notice_of_intent_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "noi_sub"."uuid" LEFT JOIN (SELECT MAX("date") AS "date", outcome_code AS "outcome", notice_of_intent_uuid AS "notice_of_intent_uuid" FROM "alcs"."notice_of_intent_decision" "decision_date" WHERE "decision_date"."audit_deleted_date_at" IS NULL GROUP BY notice_of_intent_uuid, outcome) "decision_date" ON decision_date."notice_of_intent_uuid" = "noi"."uuid" WHERE ( "noi_sub"."is_draft" = FALSE AND ("noi"."date_received_all_items" IS NOT NULL AND "noi"."date_received_all_items" <= NOW()) AND alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid")->>'status_type_code' != 'CNCL' ) AND ( "noi_sub"."audit_deleted_date_at" IS NULL )`); + await queryRunner.query(`INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, ["alcs","VIEW","public_notice_of_intent_submission_search_view","SELECT \"noi_sub\".\"uuid\" AS \"uuid\", \"noi_sub\".\"applicant\" AS \"applicant\", \"noi\".\"uuid\" AS \"notice_of_intent_uuid\", \"noticeOfIntentType\".\"audit_deleted_date_at\" AS \"noticeOfIntentType_audit_deleted_date_at\", \"noticeOfIntentType\".\"audit_created_at\" AS \"noticeOfIntentType_audit_created_at\", \"noticeOfIntentType\".\"audit_updated_at\" AS \"noticeOfIntentType_audit_updated_at\", \"noticeOfIntentType\".\"audit_created_by\" AS \"noticeOfIntentType_audit_created_by\", \"noticeOfIntentType\".\"audit_updated_by\" AS \"noticeOfIntentType_audit_updated_by\", \"noticeOfIntentType\".\"label\" AS \"noticeOfIntentType_label\", \"noticeOfIntentType\".\"code\" AS \"noticeOfIntentType_code\", \"noticeOfIntentType\".\"description\" AS \"noticeOfIntentType_description\", \"noticeOfIntentType\".\"short_label\" AS \"noticeOfIntentType_short_label\", \"noticeOfIntentType\".\"background_color\" AS \"noticeOfIntentType_background_color\", \"noticeOfIntentType\".\"text_color\" AS \"noticeOfIntentType_text_color\", \"noticeOfIntentType\".\"html_description\" AS \"noticeOfIntentType_html_description\", \"noticeOfIntentType\".\"portal_label\" AS \"noticeOfIntentType_portal_label\", \"localGovernment\".\"name\" AS \"local_government_name\", \"noi_sub\".\"file_number\" AS \"file_number\", \"noi_sub\".\"local_government_uuid\" AS \"local_government_uuid\", \"noi_sub\".\"type_code\" AS \"notice_of_intent_type_code\", \"noi\".\"date_submitted_to_alc\" AS \"date_submitted_to_alc\", \"noi\".\"decision_date\" AS \"decision_date\", decision_date.outcome AS \"outcome\", \"noi\".\"region_code\" AS \"notice_of_intent_region_code\", GREATEST(status_link.effective_date, decision_date.date) AS \"last_update\", alcs.get_current_status_for_notice_of_intent_submission_by_uuid(\"noi_sub\".\"uuid\") AS \"status\" FROM \"alcs\".\"notice_of_intent_submission\" \"noi_sub\" INNER JOIN \"alcs\".\"notice_of_intent\" \"noi\" ON \"noi\".\"file_number\" = \"noi_sub\".\"file_number\" AND \"noi\".\"audit_deleted_date_at\" IS NULL INNER JOIN \"alcs\".\"notice_of_intent_type\" \"noticeOfIntentType\" ON \"noi_sub\".\"type_code\" = \"noticeOfIntentType\".\"code\" AND \"noticeOfIntentType\".\"audit_deleted_date_at\" IS NULL LEFT JOIN \"alcs\".\"local_government\" \"localGovernment\" ON \"noi_sub\".\"local_government_uuid\" = \"localGovernment\".\"uuid\" AND \"localGovernment\".\"audit_deleted_date_at\" IS NULL LEFT JOIN (SELECT MAX(\"effective_date\") AS \"effective_date\", submission_uuid AS \"submission_uuid\" FROM \"alcs\".\"notice_of_intent_submission_to_submission_status\" \"status_link\" GROUP BY submission_uuid) \"status_link\" ON status_link.\"submission_uuid\" = \"noi_sub\".\"uuid\" LEFT JOIN (SELECT MAX(\"date\") AS \"date\", outcome_code AS \"outcome\", notice_of_intent_uuid AS \"notice_of_intent_uuid\" FROM \"alcs\".\"notice_of_intent_decision\" \"decision_date\" WHERE \"decision_date\".\"audit_deleted_date_at\" IS NULL GROUP BY notice_of_intent_uuid, outcome) \"decision_date\" ON decision_date.\"notice_of_intent_uuid\" = \"noi\".\"uuid\" WHERE ( \"noi_sub\".\"is_draft\" = FALSE AND (\"noi\".\"date_received_all_items\" IS NOT NULL AND \"noi\".\"date_received_all_items\" <= NOW()) AND alcs.get_current_status_for_notice_of_intent_submission_by_uuid(\"noi_sub\".\"uuid\")->>'status_type_code' != 'CNCL' ) AND ( \"noi_sub\".\"audit_deleted_date_at\" IS NULL )"]); + } + +} From f9a4f9f74151cab3cc0f9dadfb2eabde722b85e2 Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Mon, 20 Nov 2023 14:36:22 -0800 Subject: [PATCH 661/954] add to applications --- .../public-application-search-view.entity.ts | 16 +++++++++++++-- .../1700519694287-add-destRank-application.ts | 20 +++++++++++++++++++ 2 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1700519694287-add-destRank-application.ts diff --git a/services/apps/alcs/src/portal/public/search/application/public-application-search-view.entity.ts b/services/apps/alcs/src/portal/public/search/application/public-application-search-view.entity.ts index 23f1dd97c6..023b94b3c9 100644 --- a/services/apps/alcs/src/portal/public/search/application/public-application-search-view.entity.ts +++ b/services/apps/alcs/src/portal/public/search/application/public-application-search-view.entity.ts @@ -27,6 +27,7 @@ import { LinkedStatusType } from '../public-search.dto'; .addSelect('app.date_submitted_to_alc', 'date_submitted_to_alc') .addSelect('app.decision_date', 'decision_date') .addSelect('decision_date.outcome', 'outcome') + .addSelect('decision_date.dest_rank', 'dest_rank') .addSelect('app.uuid', 'application_uuid') .addSelect('app.region_code', 'application_region_code') .addSelect( @@ -63,11 +64,16 @@ import { LinkedStatusType } from '../public-search.dto'; (qb) => qb .from(ApplicationDecision, 'decision_date') - .select('MAX("date")', 'date') + .select('date', 'date') .addSelect('outcome_code', 'outcome') + .addSelect( + 'RANK() OVER (PARTITION BY application_uuid ORDER BY date DESC)', + 'dest_rank', + ) .addSelect('application_uuid', 'application_uuid') .groupBy('application_uuid') - .addGroupBy('outcome'), + .addGroupBy('outcome_code') + .addGroupBy('date'), 'decision_date', 'decision_date."application_uuid" = app.uuid', ) @@ -77,6 +83,9 @@ import { LinkedStatusType } from '../public-search.dto'; ) .andWhere( "alcs.get_current_status_for_application_submission_by_uuid(app_sub.uuid)->>'status_type_code' != 'CNCL'", + ) + .andWhere( + "decision_date.dest_rank = 1", ), }) export class PublicApplicationSubmissionSearchView { @@ -117,6 +126,9 @@ export class PublicApplicationSubmissionSearchView { @ViewColumn() decisionDate: Date | null; + @ViewColumn() + destRank: number | null; + @ViewColumn() outcome: string | null; diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1700519694287-add-destRank-application.ts b/services/apps/alcs/src/providers/typeorm/migrations/1700519694287-add-destRank-application.ts new file mode 100644 index 0000000000..73286479f0 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1700519694287-add-destRank-application.ts @@ -0,0 +1,20 @@ +import { MigrationInterface, QueryRunner } from "typeorm"; + +export class AddDestRankApplication1700519694287 implements MigrationInterface { + name = 'AddDestRankApplication1700519694287' + + public async up(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query(`DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, ["VIEW","public_application_submission_search_view","alcs"]); + await queryRunner.query(`DROP VIEW "alcs"."public_application_submission_search_view"`); + await queryRunner.query(`CREATE VIEW "alcs"."public_application_submission_search_view" AS SELECT "app_sub"."uuid" AS "uuid", "app_sub"."applicant" AS "applicant", "app"."uuid" AS "application_uuid", "applicationType"."audit_deleted_date_at" AS "applicationType_audit_deleted_date_at", "applicationType"."audit_created_at" AS "applicationType_audit_created_at", "applicationType"."audit_updated_at" AS "applicationType_audit_updated_at", "applicationType"."audit_created_by" AS "applicationType_audit_created_by", "applicationType"."audit_updated_by" AS "applicationType_audit_updated_by", "applicationType"."label" AS "applicationType_label", "applicationType"."code" AS "applicationType_code", "applicationType"."description" AS "applicationType_description", "applicationType"."short_label" AS "applicationType_short_label", "applicationType"."background_color" AS "applicationType_background_color", "applicationType"."text_color" AS "applicationType_text_color", "applicationType"."html_description" AS "applicationType_html_description", "applicationType"."portal_label" AS "applicationType_portal_label", "applicationType"."portal_order" AS "applicationType_portal_order", "applicationType"."requires_government_review" AS "applicationType_requires_government_review", "localGovernment"."name" AS "local_government_name", "app_sub"."file_number" AS "file_number", "app_sub"."local_government_uuid" AS "local_government_uuid", "app_sub"."type_code" AS "application_type_code", "app"."date_submitted_to_alc" AS "date_submitted_to_alc", "app"."decision_date" AS "decision_date", decision_date.outcome AS "outcome", decision_date.dest_rank AS "dest_rank", "app"."region_code" AS "application_region_code", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid") AS "status" FROM "alcs"."application_submission" "app_sub" INNER JOIN "alcs"."application" "app" ON "app"."file_number" = "app_sub"."file_number" AND "app"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."application_type" "applicationType" ON "app_sub"."type_code" = "applicationType"."code" AND "applicationType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "app_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."application_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "app_sub"."uuid" LEFT JOIN (SELECT date AS "date", outcome_code AS "outcome", RANK() OVER (PARTITION BY application_uuid ORDER BY date DESC) AS "dest_rank", application_uuid AS "application_uuid" FROM "alcs"."application_decision" "decision_date" WHERE "decision_date"."audit_deleted_date_at" IS NULL GROUP BY application_uuid, outcome_code, date) "decision_date" ON decision_date."application_uuid" = "app"."uuid" WHERE ( "app_sub"."is_draft" = FALSE AND ("app"."date_received_all_items" IS NOT NULL AND "app"."date_received_all_items" <= NOW()) AND alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid")->>'status_type_code' != 'CNCL' AND decision_date.dest_rank = 1 ) AND ( "app_sub"."audit_deleted_date_at" IS NULL )`); + await queryRunner.query(`INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, ["alcs","VIEW","public_application_submission_search_view","SELECT \"app_sub\".\"uuid\" AS \"uuid\", \"app_sub\".\"applicant\" AS \"applicant\", \"app\".\"uuid\" AS \"application_uuid\", \"applicationType\".\"audit_deleted_date_at\" AS \"applicationType_audit_deleted_date_at\", \"applicationType\".\"audit_created_at\" AS \"applicationType_audit_created_at\", \"applicationType\".\"audit_updated_at\" AS \"applicationType_audit_updated_at\", \"applicationType\".\"audit_created_by\" AS \"applicationType_audit_created_by\", \"applicationType\".\"audit_updated_by\" AS \"applicationType_audit_updated_by\", \"applicationType\".\"label\" AS \"applicationType_label\", \"applicationType\".\"code\" AS \"applicationType_code\", \"applicationType\".\"description\" AS \"applicationType_description\", \"applicationType\".\"short_label\" AS \"applicationType_short_label\", \"applicationType\".\"background_color\" AS \"applicationType_background_color\", \"applicationType\".\"text_color\" AS \"applicationType_text_color\", \"applicationType\".\"html_description\" AS \"applicationType_html_description\", \"applicationType\".\"portal_label\" AS \"applicationType_portal_label\", \"applicationType\".\"portal_order\" AS \"applicationType_portal_order\", \"applicationType\".\"requires_government_review\" AS \"applicationType_requires_government_review\", \"localGovernment\".\"name\" AS \"local_government_name\", \"app_sub\".\"file_number\" AS \"file_number\", \"app_sub\".\"local_government_uuid\" AS \"local_government_uuid\", \"app_sub\".\"type_code\" AS \"application_type_code\", \"app\".\"date_submitted_to_alc\" AS \"date_submitted_to_alc\", \"app\".\"decision_date\" AS \"decision_date\", decision_date.outcome AS \"outcome\", decision_date.dest_rank AS \"dest_rank\", \"app\".\"region_code\" AS \"application_region_code\", GREATEST(status_link.effective_date, decision_date.date) AS \"last_update\", alcs.get_current_status_for_application_submission_by_uuid(\"app_sub\".\"uuid\") AS \"status\" FROM \"alcs\".\"application_submission\" \"app_sub\" INNER JOIN \"alcs\".\"application\" \"app\" ON \"app\".\"file_number\" = \"app_sub\".\"file_number\" AND \"app\".\"audit_deleted_date_at\" IS NULL INNER JOIN \"alcs\".\"application_type\" \"applicationType\" ON \"app_sub\".\"type_code\" = \"applicationType\".\"code\" AND \"applicationType\".\"audit_deleted_date_at\" IS NULL LEFT JOIN \"alcs\".\"local_government\" \"localGovernment\" ON \"app_sub\".\"local_government_uuid\" = \"localGovernment\".\"uuid\" AND \"localGovernment\".\"audit_deleted_date_at\" IS NULL LEFT JOIN (SELECT MAX(\"effective_date\") AS \"effective_date\", submission_uuid AS \"submission_uuid\" FROM \"alcs\".\"application_submission_to_submission_status\" \"status_link\" GROUP BY submission_uuid) \"status_link\" ON status_link.\"submission_uuid\" = \"app_sub\".\"uuid\" LEFT JOIN (SELECT date AS \"date\", outcome_code AS \"outcome\", RANK() OVER (PARTITION BY application_uuid ORDER BY date DESC) AS \"dest_rank\", application_uuid AS \"application_uuid\" FROM \"alcs\".\"application_decision\" \"decision_date\" WHERE \"decision_date\".\"audit_deleted_date_at\" IS NULL GROUP BY application_uuid, outcome_code, date) \"decision_date\" ON decision_date.\"application_uuid\" = \"app\".\"uuid\" WHERE ( \"app_sub\".\"is_draft\" = FALSE AND (\"app\".\"date_received_all_items\" IS NOT NULL AND \"app\".\"date_received_all_items\" <= NOW()) AND alcs.get_current_status_for_application_submission_by_uuid(\"app_sub\".\"uuid\")->>'status_type_code' != 'CNCL' AND decision_date.dest_rank = 1 ) AND ( \"app_sub\".\"audit_deleted_date_at\" IS NULL )"]); + } + + public async down(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query(`DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, ["VIEW","public_application_submission_search_view","alcs"]); + await queryRunner.query(`DROP VIEW "alcs"."public_application_submission_search_view"`); + await queryRunner.query(`CREATE VIEW "alcs"."public_application_submission_search_view" AS SELECT "app_sub"."uuid" AS "uuid", "app_sub"."applicant" AS "applicant", "app"."uuid" AS "application_uuid", "applicationType"."audit_deleted_date_at" AS "applicationType_audit_deleted_date_at", "applicationType"."audit_created_at" AS "applicationType_audit_created_at", "applicationType"."audit_updated_at" AS "applicationType_audit_updated_at", "applicationType"."audit_created_by" AS "applicationType_audit_created_by", "applicationType"."audit_updated_by" AS "applicationType_audit_updated_by", "applicationType"."label" AS "applicationType_label", "applicationType"."code" AS "applicationType_code", "applicationType"."description" AS "applicationType_description", "applicationType"."short_label" AS "applicationType_short_label", "applicationType"."background_color" AS "applicationType_background_color", "applicationType"."text_color" AS "applicationType_text_color", "applicationType"."html_description" AS "applicationType_html_description", "applicationType"."portal_label" AS "applicationType_portal_label", "applicationType"."portal_order" AS "applicationType_portal_order", "applicationType"."requires_government_review" AS "applicationType_requires_government_review", "localGovernment"."name" AS "local_government_name", "app_sub"."file_number" AS "file_number", "app_sub"."local_government_uuid" AS "local_government_uuid", "app_sub"."type_code" AS "application_type_code", "app"."date_submitted_to_alc" AS "date_submitted_to_alc", "app"."decision_date" AS "decision_date", decision_date.outcome AS "outcome", "app"."region_code" AS "application_region_code", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid") AS "status" FROM "alcs"."application_submission" "app_sub" INNER JOIN "alcs"."application" "app" ON "app"."file_number" = "app_sub"."file_number" AND "app"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."application_type" "applicationType" ON "app_sub"."type_code" = "applicationType"."code" AND "applicationType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "app_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."application_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "app_sub"."uuid" LEFT JOIN (SELECT MAX("date") AS "date", outcome_code AS "outcome", application_uuid AS "application_uuid" FROM "alcs"."application_decision" "decision_date" WHERE "decision_date"."audit_deleted_date_at" IS NULL GROUP BY application_uuid, outcome) "decision_date" ON decision_date."application_uuid" = "app"."uuid" WHERE ( "app_sub"."is_draft" = FALSE AND ("app"."date_received_all_items" IS NOT NULL AND "app"."date_received_all_items" <= NOW()) AND alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid")->>'status_type_code' != 'CNCL' ) AND ( "app_sub"."audit_deleted_date_at" IS NULL )`); + await queryRunner.query(`INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, ["alcs","VIEW","public_application_submission_search_view","SELECT \"app_sub\".\"uuid\" AS \"uuid\", \"app_sub\".\"applicant\" AS \"applicant\", \"app\".\"uuid\" AS \"application_uuid\", \"applicationType\".\"audit_deleted_date_at\" AS \"applicationType_audit_deleted_date_at\", \"applicationType\".\"audit_created_at\" AS \"applicationType_audit_created_at\", \"applicationType\".\"audit_updated_at\" AS \"applicationType_audit_updated_at\", \"applicationType\".\"audit_created_by\" AS \"applicationType_audit_created_by\", \"applicationType\".\"audit_updated_by\" AS \"applicationType_audit_updated_by\", \"applicationType\".\"label\" AS \"applicationType_label\", \"applicationType\".\"code\" AS \"applicationType_code\", \"applicationType\".\"description\" AS \"applicationType_description\", \"applicationType\".\"short_label\" AS \"applicationType_short_label\", \"applicationType\".\"background_color\" AS \"applicationType_background_color\", \"applicationType\".\"text_color\" AS \"applicationType_text_color\", \"applicationType\".\"html_description\" AS \"applicationType_html_description\", \"applicationType\".\"portal_label\" AS \"applicationType_portal_label\", \"applicationType\".\"portal_order\" AS \"applicationType_portal_order\", \"applicationType\".\"requires_government_review\" AS \"applicationType_requires_government_review\", \"localGovernment\".\"name\" AS \"local_government_name\", \"app_sub\".\"file_number\" AS \"file_number\", \"app_sub\".\"local_government_uuid\" AS \"local_government_uuid\", \"app_sub\".\"type_code\" AS \"application_type_code\", \"app\".\"date_submitted_to_alc\" AS \"date_submitted_to_alc\", \"app\".\"decision_date\" AS \"decision_date\", decision_date.outcome AS \"outcome\", \"app\".\"region_code\" AS \"application_region_code\", GREATEST(status_link.effective_date, decision_date.date) AS \"last_update\", alcs.get_current_status_for_application_submission_by_uuid(\"app_sub\".\"uuid\") AS \"status\" FROM \"alcs\".\"application_submission\" \"app_sub\" INNER JOIN \"alcs\".\"application\" \"app\" ON \"app\".\"file_number\" = \"app_sub\".\"file_number\" AND \"app\".\"audit_deleted_date_at\" IS NULL INNER JOIN \"alcs\".\"application_type\" \"applicationType\" ON \"app_sub\".\"type_code\" = \"applicationType\".\"code\" AND \"applicationType\".\"audit_deleted_date_at\" IS NULL LEFT JOIN \"alcs\".\"local_government\" \"localGovernment\" ON \"app_sub\".\"local_government_uuid\" = \"localGovernment\".\"uuid\" AND \"localGovernment\".\"audit_deleted_date_at\" IS NULL LEFT JOIN (SELECT MAX(\"effective_date\") AS \"effective_date\", submission_uuid AS \"submission_uuid\" FROM \"alcs\".\"application_submission_to_submission_status\" \"status_link\" GROUP BY submission_uuid) \"status_link\" ON status_link.\"submission_uuid\" = \"app_sub\".\"uuid\" LEFT JOIN (SELECT MAX(\"date\") AS \"date\", outcome_code AS \"outcome\", application_uuid AS \"application_uuid\" FROM \"alcs\".\"application_decision\" \"decision_date\" WHERE \"decision_date\".\"audit_deleted_date_at\" IS NULL GROUP BY application_uuid, outcome) \"decision_date\" ON decision_date.\"application_uuid\" = \"app\".\"uuid\" WHERE ( \"app_sub\".\"is_draft\" = FALSE AND (\"app\".\"date_received_all_items\" IS NOT NULL AND \"app\".\"date_received_all_items\" <= NOW()) AND alcs.get_current_status_for_application_submission_by_uuid(\"app_sub\".\"uuid\")->>'status_type_code' != 'CNCL' ) AND ( \"app_sub\".\"audit_deleted_date_at\" IS NULL )"]); + } + +} From a2f6578eb2dffe04e8f9761a4f673b6b2ec338b2 Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Mon, 20 Nov 2023 14:46:13 -0800 Subject: [PATCH 662/954] fix --- .../notice-of-intent/public-notice-of-intent-search.service.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search.service.ts b/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search.service.ts index 2c1b818645..3d910ed525 100644 --- a/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search.service.ts +++ b/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search.service.ts @@ -27,7 +27,6 @@ export class PublicNoticeOfIntentSearchService { AdvancedSearchResultDto<PublicNoticeOfIntentSubmissionSearchView[]> > { const query = await this.compileNoticeOfIntentSearchQuery(searchDto); - console.log(query.getQuery()) this.compileGroupBySearchQuery(query); From 1071064e17415efa3e7b7f5d86c23d29a6143721 Mon Sep 17 00:00:00 2001 From: Liam Stoddard <lstodd@protonmail.com> Date: Mon, 20 Nov 2023 15:24:35 -0800 Subject: [PATCH 663/954] guid -> bceid guid --- .../common/alcs_init_users.py | 30 +++++++++---------- .../menu/command_parser/__init__.py | 1 + .../command_parser/user_command_parser.py | 19 ++++++++++++ .../menu/commands/__init__.py | 1 + .../menu/commands/clean_all.py | 2 ++ .../menu/commands/import_all.py | 4 +++ bin/migrate-oats-data/menu/commands/users.py | 24 +++++++++++++++ bin/migrate-oats-data/menu/menu.py | 7 ++++- bin/migrate-oats-data/migrate.py | 6 ++++ .../sql/common/init_users.sql | 15 ++++------ .../sql/common/init_users_count.sql | 10 +++---- 11 files changed, 87 insertions(+), 32 deletions(-) create mode 100644 bin/migrate-oats-data/menu/command_parser/user_command_parser.py create mode 100644 bin/migrate-oats-data/menu/commands/users.py diff --git a/bin/migrate-oats-data/common/alcs_init_users.py b/bin/migrate-oats-data/common/alcs_init_users.py index 0e64a71964..7543355618 100644 --- a/bin/migrate-oats-data/common/alcs_init_users.py +++ b/bin/migrate-oats-data/common/alcs_init_users.py @@ -1,6 +1,7 @@ from common import BATCH_UPLOAD_SIZE, OATS_ETL_USER, setup_and_get_logger from db import inject_conn_pool from psycopg2.extras import RealDictCursor, execute_batch +import uuid etl_name = "init_alcs_users" logger = setup_and_get_logger(etl_name) @@ -30,8 +31,7 @@ def init_alcs_users(conn=None, batch_size=BATCH_UPLOAD_SIZE): failed_inserts = 0 successful_inserts_count = 0 - last_submission_id = 0 - + last_submission_id = "-" with open( "sql/common/init_users.sql", "r", @@ -40,7 +40,7 @@ def init_alcs_users(conn=None, batch_size=BATCH_UPLOAD_SIZE): submission_sql = sql_file.read() while True: cursor.execute( - f"{submission_sql} WHERE oas.alc_staff_id > {last_submission_id} ORDER BY oas.alc_staff_id;" + f"{submission_sql} AND oaa.created_guid > '{last_submission_id}' ORDER BY oaa.created_guid;" ) rows = cursor.fetchmany(batch_size) @@ -55,10 +55,10 @@ def init_alcs_users(conn=None, batch_size=BATCH_UPLOAD_SIZE): successful_inserts_count = ( successful_inserts_count + users_to_be_inserted_count ) - last_submission_id = dict(rows[-1])["alc_staff_id"] + last_submission_id = dict(rows[-1])["created_guid"] logger.debug( - f"retrieved/inserted items count: {users_to_be_inserted_count}; total successfully inserted users so far {successful_inserts_count}; last inserted alr_application_id: {last_submission_id}" + f"retrieved/inserted items count: {users_to_be_inserted_count}; total successfully inserted users so far {successful_inserts_count}; last inserted guid: {last_submission_id}" ) except Exception as err: logger.exception() @@ -84,22 +84,20 @@ def _insert_users(conn, batch_size, cursor, rows): def _get_insert_query(): query = f""" - INSERT INTO alcs.users ( + INSERT INTO alcs.user ( + bceid_guid, + email, display_name, identity_provider, preferred_username, - given_name, - family_name, - email, audit_created_by ) VALUES ( - %(login)s, - %(local_government_uuid)s, - %(login)s, - %(first_name)s, - %(last_name)s, - %(email)s, + %(created_guid)s, + '11@11', + 'etl_imported_display_name', + 'bceid_etl', + 'etl_imported_username', '{OATS_ETL_USER}' ) """ @@ -118,7 +116,7 @@ def clean_users(conn=None): logger.info("Start users cleaning") with conn.cursor() as cursor: cursor.execute( - f"DELETE FROM alcs.users alu WHERE alu.audit_created_by = '{OATS_ETL_USER}'" + f"DELETE FROM alcs.user alu WHERE alu.audit_created_by = '{OATS_ETL_USER}'" ) logger.info(f"Deleted items count = {cursor.rowcount}") diff --git a/bin/migrate-oats-data/menu/command_parser/__init__.py b/bin/migrate-oats-data/menu/command_parser/__init__.py index a442dfeeef..8cb4a6d274 100644 --- a/bin/migrate-oats-data/menu/command_parser/__init__.py +++ b/bin/migrate-oats-data/menu/command_parser/__init__.py @@ -1,3 +1,4 @@ from .application_command_parser import * from .notice_of_intent_command_parser import * from .document_command_parser import * +from .user_command_parser import * diff --git a/bin/migrate-oats-data/menu/command_parser/user_command_parser.py b/bin/migrate-oats-data/menu/command_parser/user_command_parser.py new file mode 100644 index 0000000000..0ace119770 --- /dev/null +++ b/bin/migrate-oats-data/menu/command_parser/user_command_parser.py @@ -0,0 +1,19 @@ +def user_import_command_parser(import_batch_size, subparsers): + user_import_command = subparsers.add_parser( + "user-import", + help=f"Import User with specified batch size: (default: {import_batch_size})", + ) + user_import_command.add_argument( + "--batch-size", + type=int, + default=import_batch_size, + metavar="", + help=f"batch size (default: {import_batch_size})", + ) + + +def user_clean_command_parser(subparsers): + subparsers.add_parser( + "user-clean", + help="Clean User imported data:", + ) diff --git a/bin/migrate-oats-data/menu/commands/__init__.py b/bin/migrate-oats-data/menu/commands/__init__.py index f5e9bfc920..4cf57f506e 100644 --- a/bin/migrate-oats-data/menu/commands/__init__.py +++ b/bin/migrate-oats-data/menu/commands/__init__.py @@ -4,3 +4,4 @@ from .applications import * from .notice_of_intents import * from .obfuscation import * +from .users import * diff --git a/bin/migrate-oats-data/menu/commands/clean_all.py b/bin/migrate-oats-data/menu/commands/clean_all.py index bef7ec9c35..722506abac 100644 --- a/bin/migrate-oats-data/menu/commands/clean_all.py +++ b/bin/migrate-oats-data/menu/commands/clean_all.py @@ -9,6 +9,7 @@ from noi.noi_submission_status_email import ( clean_notice_of_intent_submission_status_emails, ) +from common.alcs_init_users import clean_users from documents import ( clean_application_documents, clean_documents, @@ -26,6 +27,7 @@ def clean_all(console, args): clean_application_documents() clean_noi_documents() clean_documents() + clean_users() clean_alcs_applications() clean_notice_of_intent() clean_application_submission_status_emails(), diff --git a/bin/migrate-oats-data/menu/commands/import_all.py b/bin/migrate-oats-data/menu/commands/import_all.py index 07bc9caa74..467389854e 100644 --- a/bin/migrate-oats-data/menu/commands/import_all.py +++ b/bin/migrate-oats-data/menu/commands/import_all.py @@ -12,6 +12,7 @@ from noi import ( process_notice_of_intent, ) +from common.alcs_init_users import init_alcs_users from documents import ( import_oats_noi_documents, import_oats_app_documents, @@ -54,6 +55,9 @@ def import_all(console, args): console.log("Processing notice of intents") process_notice_of_intent(batch_size=import_batch_size) + console.log("Processing Users") + init_alcs_users(batch_size=import_batch_size) + # NOTE: both process_application_submission_status_emails(), process_notice_of_intent_submission_status_emails() # must be the last ones in the migrate etl console.log("Processing submission status emails") diff --git a/bin/migrate-oats-data/menu/commands/users.py b/bin/migrate-oats-data/menu/commands/users.py new file mode 100644 index 0000000000..1c3d0de2dd --- /dev/null +++ b/bin/migrate-oats-data/menu/commands/users.py @@ -0,0 +1,24 @@ +from common import init_alcs_users, clean_users + +from common import setup_and_get_logger + +logger = setup_and_get_logger("user_import") + + +def import_users(console, args): + logger.debug("Beginning OATS -> ALCS User import process") + with console.status( + "[bold green]User import (user table update in ALCS)...\n" + ) as status: + if args.batch_size: + import_batch_size = args.batch_size + + logger.debug(f"Processing User import in batch size = {import_batch_size}") + + init_alcs_users(batch_size=import_batch_size) + + +def users_clean(console): + logger.debug("Beginning OATS -> ALCS Users import clean process") + with console.status("[bold green]Users clean imported...\n") as status: + clean_users() diff --git a/bin/migrate-oats-data/menu/menu.py b/bin/migrate-oats-data/menu/menu.py index 72bfe9b886..02666d292f 100644 --- a/bin/migrate-oats-data/menu/menu.py +++ b/bin/migrate-oats-data/menu/menu.py @@ -13,6 +13,10 @@ document_noi_import_command_parser, noi_document_import_command_parser, ) +from .command_parser.user_command_parser import ( + user_import_command_parser, + user_clean_command_parser, +) from common import BATCH_UPLOAD_SIZE import_batch_size = BATCH_UPLOAD_SIZE @@ -46,7 +50,8 @@ def setup_menu_args_parser(import_batch_size): document_noi_import_command_parser(import_batch_size, subparsers) noi_document_import_command_parser(import_batch_size, subparsers) _import_command_parser(subparsers) - + user_import_command_parser(import_batch_size, subparsers) + user_clean_command_parser(subparsers) subparsers.add_parser("clean", help="Clean all imported data") subparsers.add_parser("obfuscate", help="Obfuscate PROD data") diff --git a/bin/migrate-oats-data/migrate.py b/bin/migrate-oats-data/migrate.py index 6f9cc074c1..8e2e6c20be 100644 --- a/bin/migrate-oats-data/migrate.py +++ b/bin/migrate-oats-data/migrate.py @@ -16,6 +16,8 @@ notice_of_intent_import, notice_of_intent_clean, start_obfuscation, + import_users, + users_clean, ) from db import connection_pool from common import BATCH_UPLOAD_SIZE, setup_and_get_logger @@ -53,6 +55,10 @@ noi_document_import(console, args) case "obfuscate": start_obfuscation(console) + case "user-import": + import_users(console, args) + case "user-clean": + users_clean(console) finally: if connection_pool: diff --git a/bin/migrate-oats-data/sql/common/init_users.sql b/bin/migrate-oats-data/sql/common/init_users.sql index d8e904680b..8ea75fca0f 100644 --- a/bin/migrate-oats-data/sql/common/init_users.sql +++ b/bin/migrate-oats-data/sql/common/init_users.sql @@ -1,11 +1,6 @@ -SELECT - oas.login, - oas.alc_staff_id, - oas.email, - oas.first_name, - oas.last_name +SELECT DISTINCT + oaa.created_guid FROM - oats.oats_alc_staffs oas -GROUP BY - oas.login, - oas.alc_staff_id \ No newline at end of file + oats.oats_alr_applications oaa +WHERE + oaa.created_guid IS NOT NULL \ No newline at end of file diff --git a/bin/migrate-oats-data/sql/common/init_users_count.sql b/bin/migrate-oats-data/sql/common/init_users_count.sql index 7e10c9e1c5..6d79513dee 100644 --- a/bin/migrate-oats-data/sql/common/init_users_count.sql +++ b/bin/migrate-oats-data/sql/common/init_users_count.sql @@ -1,11 +1,11 @@ WITH insert_count AS ( - SELECT - oas.alc_staff_id + SELECT DISTINCT + oaa.created_guid FROM - oats.oats_alc_staffs oas - GROUP BY - oas.alc_staff_id + oats.oats_alr_applications oaa + WHERE + oaa.created_guid IS NOT NULL ) SELECT count(*) From f622c800b67e4acc8997791a2712e897d3eb0883 Mon Sep 17 00:00:00 2001 From: Liam Stoddard <lstodd@protonmail.com> Date: Mon, 20 Nov 2023 15:56:06 -0800 Subject: [PATCH 664/954] updates to match 1275 --- .../applications/submissions/data_insert/insert_query.py | 2 +- .../applications/submissions/sql/app_submission.sql | 5 +++-- .../notice_of_intent_proposal_fields.py | 2 +- .../proposal_fields/notice_of_intent_proposal_fields.sql | 5 +++-- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/bin/migrate-oats-data/applications/submissions/data_insert/insert_query.py b/bin/migrate-oats-data/applications/submissions/data_insert/insert_query.py index 1fb565f880..743eea17f0 100644 --- a/bin/migrate-oats-data/applications/submissions/data_insert/insert_query.py +++ b/bin/migrate-oats-data/applications/submissions/data_insert/insert_query.py @@ -144,7 +144,7 @@ def get_insert_query(unique_fields, unique_values): %(agricultural_improvement_desc)s, %(current_land_use_desc)s, %(non_agricultural_uses_desc)s, - %(created_guid)s + %(uuid)s {unique_values} ) """ diff --git a/bin/migrate-oats-data/applications/submissions/sql/app_submission.sql b/bin/migrate-oats-data/applications/submissions/sql/app_submission.sql index 050283f015..1609e08f1a 100644 --- a/bin/migrate-oats-data/applications/submissions/sql/app_submission.sql +++ b/bin/migrate-oats-data/applications/submissions/sql/app_submission.sql @@ -41,10 +41,11 @@ SELECT oa.agricultural_improvement_desc, oa.followup_noi_ind, oa.followup_noi_number, - oa.created_guid, + au."uuid", oa.ministry_notice_ind FROM appl_components_grouped acg LEFT JOIN alcs.application aa ON aa.file_number = acg.alr_application_id::TEXT JOIN oats.oats_alr_appl_components oc ON acg.alr_application_id = oc.alr_application_id - JOIN oats.oats_alr_applications oa ON acg.alr_application_id = oa.alr_application_id \ No newline at end of file + JOIN oats.oats_alr_applications oa ON acg.alr_application_id = oa.alr_application_id + LEFT JOIN alcs."user" au ON oa.created_guid = au.bceid_guid \ No newline at end of file diff --git a/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_proposal_fields.py b/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_proposal_fields.py index 61a93fe56b..1f84e11122 100644 --- a/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_proposal_fields.py +++ b/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_proposal_fields.py @@ -102,7 +102,7 @@ def _update_records(conn, batch_size, cursor, rows): soil_is_extraction_or_mining = FALSE, soil_is_removing_soil_for_new_structure = FALSE, soil_is_area_wide_filling = FALSE, - created_by_uuid = %(created_guid)s + created_by_uuid = %(uuid)s WHERE alcs.notice_of_intent_submission.file_number = %(alr_application_id)s::TEXT """ diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/proposal_fields/notice_of_intent_proposal_fields.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/proposal_fields/notice_of_intent_proposal_fields.sql index 02de277cd4..4af801ba30 100644 --- a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/proposal_fields/notice_of_intent_proposal_fields.sql +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/proposal_fields/notice_of_intent_proposal_fields.sql @@ -6,6 +6,7 @@ SELECT oaa.alr_application_id, oaa.non_agricultural_uses_desc, oaa.followup_noi_number, oaa.ministry_notice_ref_no, - oaa.created_guid + au."uuid" FROM oats.oats_alr_applications oaa - JOIN alcs.notice_of_intent_submission nois ON nois.file_number = oaa.alr_application_id::TEXT \ No newline at end of file + JOIN alcs.notice_of_intent_submission nois ON nois.file_number = oaa.alr_application_id::TEXT + LEFT JOIN alcs."user" au ON oaa.created_guid = au.bceid_guid \ No newline at end of file From 2c88552a0f5cee21b7833b300e303ac6f415689b Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Mon, 20 Nov 2023 16:32:24 -0800 Subject: [PATCH 665/954] Add INCG to L/FNG inbox statuses * Allow L/FNG to see INCG even when Submitted Date is not set. * Add !important to beat material --- .../src/app/features/home/inbox/inbox.component.scss | 2 +- .../portal/inbox/application/inbox-application.service.ts | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/portal-frontend/src/app/features/home/inbox/inbox.component.scss b/portal-frontend/src/app/features/home/inbox/inbox.component.scss index ea82628c1a..64fc01a8f7 100644 --- a/portal-frontend/src/app/features/home/inbox/inbox.component.scss +++ b/portal-frontend/src/app/features/home/inbox/inbox.component.scss @@ -30,7 +30,7 @@ a { } .mat-expansion-panel { - box-shadow: none; + box-shadow: none !important; } .mat-expansion-panel-header-title { diff --git a/services/apps/alcs/src/portal/inbox/application/inbox-application.service.ts b/services/apps/alcs/src/portal/inbox/application/inbox-application.service.ts index 77ee9d33ad..78a84cddd8 100644 --- a/services/apps/alcs/src/portal/inbox/application/inbox-application.service.ts +++ b/services/apps/alcs/src/portal/inbox/application/inbox-application.service.ts @@ -98,11 +98,12 @@ export class InboxApplicationService { where += ' OR appSearch.bceid_business_guid = :bceidBusinessGuid'; } if (governmentUuid) { - where += ` OR (appSearch.local_government_uuid = :governmentUuid AND (appSearch.date_submitted_to_alc IS NOT NULL OR appSearch.status ->> 'status_type_code' IN ('REVG', 'SUBG')))`; + where += ` OR (appSearch.local_government_uuid = :governmentUuid AND (appSearch.date_submitted_to_alc IS NOT NULL OR appSearch.status ->> 'status_type_code' IN ('REVG', 'SUBG', 'INCG')))`; } - } else { + //Prevent someone without governmentUuid from using filterBy + } else if (governmentUuid && bceidBusinessGuid) { if (searchDto.filterBy === 'submitted') { - where = `appSearch.local_government_uuid = :governmentUuid AND (appSearch.date_submitted_to_alc IS NOT NULL OR appSearch.status ->> 'status_type_code' IN ('REVG', 'SUBG'))`; + where = `appSearch.local_government_uuid = :governmentUuid AND (appSearch.date_submitted_to_alc IS NOT NULL OR appSearch.status ->> 'status_type_code' IN ('REVG', 'SUBG', 'INCG'))`; } else { where = '(appSearch.created_by_uuid = :userUuid OR appSearch.bceid_business_guid = :bceidBusinessGuid)'; From 326b6a78f1fde662841969c1182cddad839a90cb Mon Sep 17 00:00:00 2001 From: "to. sandra" <76515860+sandratoh@users.noreply.github.com> Date: Mon, 20 Nov 2023 16:56:50 -0800 Subject: [PATCH 666/954] Hide proposal fields until naru subtype is selected (#1169) --- .../naru-proposal.component.html | 304 +++++++++--------- 1 file changed, 157 insertions(+), 147 deletions(-) diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.html index 67b9c0ee3d..0846732b8c 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.html @@ -41,7 +41,7 @@ <h2>Proposal</h2> Please select a sub-type above to view proposal questions </div> - <div class="full-row"> + <div class="full-row" *ngIf="subtype.value"> <label for="purpose">What is the purpose of the proposal?</label> <div class="subtext"> Include why you are applying for non-adhering residential use, what the proposal will achieve, and any benefits @@ -397,171 +397,181 @@ <h2>Proposal</h2> </div> </ng-container> - <div class="full-row"> - <label for="existingStructures"> - Describe the total floor area (m<sup>2</sup>), type, number, and occupancy of all residential structures - currently located on the property. - </label> - <div class="subtext"> - Residential structure is defined as a structure, whether used permanently or temporarily as a residence, - agri-tourism accommodation, or tourist accommodation. - </div> - <mat-form-field appearance="outline"> - <textarea - formControlName="existingStructures" - #existingStructuresText - maxlength="4000" - id="existingStructures" - matInput - ></textarea> - </mat-form-field> - <div - *ngIf="existingStructures.invalid && (existingStructures.dirty || existingStructures.touched)" - class="field-error" - > - <mat-icon>warning</mat-icon> - <div *ngIf="existingStructures.errors?.['required']">This field is required</div> - </div> - <div class="subtext">Characters left: {{ 4000 - existingStructuresText.textLength }}</div> - </div> - - <div class="full-row"> - <mat-label class="subheading2" for="proposal-map">Proposal Map / Site Plan</mat-label> - <div class="subtext">A visual representation of your proposal.</div> - <app-file-drag-drop - id="proposal-map" - [uploadedFiles]="proposalMap" - (uploadFiles)="attachProposalMap($event)" - (deleteFile)="onDeleteFile($event)" - (openFile)="openFile($event)" - [showErrors]="showErrors" - [isRequired]="true" - [showVirusError]="showProposalMapVirus" - ></app-file-drag-drop> - </div> - - <div class="full-row"> - <mat-label for="will-import-fill"> - Do you need to import any fill to construct or conduct the proposed non-adhering residential use? - </mat-label> - <div class="subtext">Fill is any material brought onto the property, including gravel for construction.</div> - <mat-button-toggle-group - (change)="onChangeFill($event.value)" - class="input" - id="will-import-fill" - formControlName="willImportFill" - > - <mat-button-toggle - value="true" - [ngClass]="{ 'error-outline': willImportFill.invalid && (willImportFill.dirty || willImportFill.touched) }" - >Yes</mat-button-toggle - > - <mat-button-toggle - value="false" - [ngClass]="{ 'error-outline': willImportFill.invalid && (willImportFill.dirty || willImportFill.touched) }" - >No</mat-button-toggle - > - </mat-button-toggle-group> - <div *ngIf="willImportFill.invalid && (willImportFill.dirty || willImportFill.touched)" class="field-error"> - <mat-icon>warning</mat-icon> - <div *ngIf="willImportFill.errors?.['required']">This field is required</div> - </div> - </div> - </div> - - <section> - <h3>Soil & Fill Components</h3> - <div class="form-row"> + <ng-container *ngIf="subtype.value"> <div class="full-row"> - <label for="fillType">Describe the type and amount of fill proposed to be placed.</label> - <div class="subtext">The Commission must approve any proposed fill. List all proposed types of fill.</div> - <mat-form-field appearance="outline"> - <textarea formControlName="fillType" #fillTypeToPlaceText maxlength="4000" id="fillType" matInput></textarea> - </mat-form-field> - <div *ngIf="fillType.invalid && (fillType.dirty || fillType.touched)" class="field-error"> - <mat-icon>warning</mat-icon> - <div *ngIf="fillType.errors?.['required']">This field is required</div> + <label for="existingStructures"> + Describe the total floor area (m<sup>2</sup>), type, number, and occupancy of all residential structures + currently located on the property. + </label> + <div class="subtext"> + Residential structure is defined as a structure, whether used permanently or temporarily as a residence, + agri-tourism accommodation, or tourist accommodation. </div> - <mat-hint class="subtext">Example: Aggregate, topsoil, structural fill, sand, gravel, etc</mat-hint> - <div class="subtext">Characters left: {{ 4000 - fillTypeToPlaceText.textLength }}</div> - </div> - </div> - - <div class="form-row"> - <div class="full-row"> - <label for="fillOrigin">Briefly describe the origin and quality of fill.</label> <mat-form-field appearance="outline"> <textarea - formControlName="fillOrigin" - #fillOriginToPlaceText + formControlName="existingStructures" + #existingStructuresText maxlength="4000" - id="fillOrigin" + id="existingStructures" matInput ></textarea> </mat-form-field> - <div *ngIf="fillOrigin.invalid && (fillOrigin.dirty || fillOrigin.touched)" class="field-error"> + <div + *ngIf="existingStructures.invalid && (existingStructures.dirty || existingStructures.touched)" + class="field-error" + > <mat-icon>warning</mat-icon> - <div *ngIf="fillOrigin.errors?.['required']">This field is required</div> + <div *ngIf="existingStructures.errors?.['required']">This field is required</div> </div> - <div class="subtext">Characters left: {{ 4000 - fillOriginToPlaceText.textLength }}</div> + <div class="subtext">Characters left: {{ 4000 - existingStructuresText.textLength }}</div> </div> - </div> - <app-soil-table - [disabled]="willImportFill.value === 'false'" - tableHeader="Fill to be Placed" - [(data)]="fillTableData" - (dataChange)="markDirty()" - ></app-soil-table> - </section> + <div class="full-row"> + <mat-label class="subheading2" for="proposal-map">Proposal Map / Site Plan</mat-label> + <div class="subtext">A visual representation of your proposal.</div> + <app-file-drag-drop + id="proposal-map" + [uploadedFiles]="proposalMap" + (uploadFiles)="attachProposalMap($event)" + (deleteFile)="onDeleteFile($event)" + (openFile)="openFile($event)" + [showErrors]="showErrors" + [isRequired]="true" + [showVirusError]="showProposalMapVirus" + ></app-file-drag-drop> + </div> - <section> - <h4>Project Duration</h4> - <div class="subtext">Estimated duration of the project</div> - <div class="form-row"> - <div> - <mat-label for="projectDurationUnit">Duration</mat-label> - <div class="subtext">Days, Months, or Years</div> - <mat-form-field appearance="outline"> - <mat-select placeholder="Select one" id="projectDurationUnit" formControlName="projectDurationUnit"> - <mat-option value="days">Days</mat-option> - <mat-option value="months">Months</mat-option> - <mat-option value="years">Years</mat-option> - </mat-select> - </mat-form-field> - <div - *ngIf="projectDurationUnit.invalid && (projectDurationUnit.dirty || projectDurationUnit.touched)" - class="field-error" + <div class="full-row"> + <mat-label for="will-import-fill"> + Do you need to import any fill to construct or conduct the proposed non-adhering residential use? + </mat-label> + <div class="subtext">Fill is any material brought onto the property, including gravel for construction.</div> + <mat-button-toggle-group + (change)="onChangeFill($event.value)" + class="input" + id="will-import-fill" + formControlName="willImportFill" > + <mat-button-toggle + value="true" + [ngClass]="{ 'error-outline': willImportFill.invalid && (willImportFill.dirty || willImportFill.touched) }" + >Yes</mat-button-toggle + > + <mat-button-toggle + value="false" + [ngClass]="{ 'error-outline': willImportFill.invalid && (willImportFill.dirty || willImportFill.touched) }" + >No</mat-button-toggle + > + </mat-button-toggle-group> + <div *ngIf="willImportFill.invalid && (willImportFill.dirty || willImportFill.touched)" class="field-error"> <mat-icon>warning</mat-icon> - <div *ngIf="projectDurationUnit.errors?.['required']">This field is required</div> + <div *ngIf="willImportFill.errors?.['required']">This field is required</div> </div> </div> - <div> - <label for="projectDurationAmount">Length</label> - <div class="subtext">Decimals can be used - e.g. 3.5 months or 1.5 years</div> - <mat-form-field appearance="outline"> - <input - id="projectDurationAmount" - mask="separator.2" - thousandSeparator="," - separatorLimit="9999999999" - min="0.01" - matInput - formControlName="projectDurationAmount" - placeholder="Type length" - /> - </mat-form-field> - <div - *ngIf="projectDurationAmount.invalid && (projectDurationAmount.dirty || projectDurationAmount.touched)" - class="field-error" - > - <mat-icon>warning</mat-icon> - <div *ngIf="projectDurationAmount.errors?.['required']">This field is required</div> + </ng-container> + </div> + + <ng-container *ngIf="subtype.value"> + <section> + <h3>Soil & Fill Components</h3> + <div class="form-row"> + <div class="full-row"> + <label for="fillType">Describe the type and amount of fill proposed to be placed.</label> + <div class="subtext">The Commission must approve any proposed fill. List all proposed types of fill.</div> + <mat-form-field appearance="outline"> + <textarea + formControlName="fillType" + #fillTypeToPlaceText + maxlength="4000" + id="fillType" + matInput + ></textarea> + </mat-form-field> + <div *ngIf="fillType.invalid && (fillType.dirty || fillType.touched)" class="field-error"> + <mat-icon>warning</mat-icon> + <div *ngIf="fillType.errors?.['required']">This field is required</div> + </div> + <mat-hint class="subtext">Example: Aggregate, topsoil, structural fill, sand, gravel, etc</mat-hint> + <div class="subtext">Characters left: {{ 4000 - fillTypeToPlaceText.textLength }}</div> </div> </div> - </div> - </section> + + <div class="form-row"> + <div class="full-row"> + <label for="fillOrigin">Briefly describe the origin and quality of fill.</label> + <mat-form-field appearance="outline"> + <textarea + formControlName="fillOrigin" + #fillOriginToPlaceText + maxlength="4000" + id="fillOrigin" + matInput + ></textarea> + </mat-form-field> + <div *ngIf="fillOrigin.invalid && (fillOrigin.dirty || fillOrigin.touched)" class="field-error"> + <mat-icon>warning</mat-icon> + <div *ngIf="fillOrigin.errors?.['required']">This field is required</div> + </div> + <div class="subtext">Characters left: {{ 4000 - fillOriginToPlaceText.textLength }}</div> + </div> + </div> + + <app-soil-table + [disabled]="willImportFill.value === 'false'" + tableHeader="Fill to be Placed" + [(data)]="fillTableData" + (dataChange)="markDirty()" + ></app-soil-table> + </section> + + <section> + <h4>Project Duration</h4> + <div class="subtext">Estimated duration of the project</div> + <div class="form-row"> + <div> + <mat-label for="projectDurationUnit">Duration</mat-label> + <div class="subtext">Days, Months, or Years</div> + <mat-form-field appearance="outline"> + <mat-select placeholder="Select one" id="projectDurationUnit" formControlName="projectDurationUnit"> + <mat-option value="days">Days</mat-option> + <mat-option value="months">Months</mat-option> + <mat-option value="years">Years</mat-option> + </mat-select> + </mat-form-field> + <div + *ngIf="projectDurationUnit.invalid && (projectDurationUnit.dirty || projectDurationUnit.touched)" + class="field-error" + > + <mat-icon>warning</mat-icon> + <div *ngIf="projectDurationUnit.errors?.['required']">This field is required</div> + </div> + </div> + <div> + <label for="projectDurationAmount">Length</label> + <div class="subtext">Decimals can be used - e.g. 3.5 months or 1.5 years</div> + <mat-form-field appearance="outline"> + <input + id="projectDurationAmount" + mask="separator.2" + thousandSeparator="," + separatorLimit="9999999999" + min="0.01" + matInput + formControlName="projectDurationAmount" + placeholder="Type length" + /> + </mat-form-field> + <div + *ngIf="projectDurationAmount.invalid && (projectDurationAmount.dirty || projectDurationAmount.touched)" + class="field-error" + > + <mat-icon>warning</mat-icon> + <div *ngIf="projectDurationAmount.errors?.['required']">This field is required</div> + </div> + </div> + </div> + </section> + </ng-container> </form> <div class="button-container"> <button *ngIf="!draftMode" (click)="onSaveExit()" mat-stroked-button color="accent">Save and Exit</button> From 3a994878c516fff2147fbc5ff215ac049d3a068e Mon Sep 17 00:00:00 2001 From: Liam Stoddard <lstodd@protonmail.com> Date: Mon, 20 Nov 2023 17:34:13 -0800 Subject: [PATCH 667/954] MR feedback, left emails as is for now --- bin/migrate-oats-data/common/alcs_init_users.py | 9 ++++----- bin/migrate-oats-data/menu/commands/applications.py | 2 ++ bin/migrate-oats-data/menu/commands/clean_all.py | 2 +- bin/migrate-oats-data/menu/commands/import_all.py | 6 +++--- bin/migrate-oats-data/menu/commands/notice_of_intents.py | 3 ++- 5 files changed, 12 insertions(+), 10 deletions(-) diff --git a/bin/migrate-oats-data/common/alcs_init_users.py b/bin/migrate-oats-data/common/alcs_init_users.py index 7543355618..00d0354370 100644 --- a/bin/migrate-oats-data/common/alcs_init_users.py +++ b/bin/migrate-oats-data/common/alcs_init_users.py @@ -1,7 +1,6 @@ from common import BATCH_UPLOAD_SIZE, OATS_ETL_USER, setup_and_get_logger from db import inject_conn_pool from psycopg2.extras import RealDictCursor, execute_batch -import uuid etl_name = "init_alcs_users" logger = setup_and_get_logger(etl_name) @@ -31,7 +30,7 @@ def init_alcs_users(conn=None, batch_size=BATCH_UPLOAD_SIZE): failed_inserts = 0 successful_inserts_count = 0 - last_submission_id = "-" + last_user_guid = "-" with open( "sql/common/init_users.sql", "r", @@ -40,7 +39,7 @@ def init_alcs_users(conn=None, batch_size=BATCH_UPLOAD_SIZE): submission_sql = sql_file.read() while True: cursor.execute( - f"{submission_sql} AND oaa.created_guid > '{last_submission_id}' ORDER BY oaa.created_guid;" + f"{submission_sql} AND oaa.created_guid > '{last_user_guid}' ORDER BY oaa.created_guid;" ) rows = cursor.fetchmany(batch_size) @@ -55,10 +54,10 @@ def init_alcs_users(conn=None, batch_size=BATCH_UPLOAD_SIZE): successful_inserts_count = ( successful_inserts_count + users_to_be_inserted_count ) - last_submission_id = dict(rows[-1])["created_guid"] + last_user_guid = dict(rows[-1])["created_guid"] logger.debug( - f"retrieved/inserted items count: {users_to_be_inserted_count}; total successfully inserted users so far {successful_inserts_count}; last inserted guid: {last_submission_id}" + f"retrieved/inserted items count: {users_to_be_inserted_count}; total successfully inserted users so far {successful_inserts_count}; last inserted guid: {last_user_guid}" ) except Exception as err: logger.exception() diff --git a/bin/migrate-oats-data/menu/commands/applications.py b/bin/migrate-oats-data/menu/commands/applications.py index d2d98bdaaa..d9a8df3981 100644 --- a/bin/migrate-oats-data/menu/commands/applications.py +++ b/bin/migrate-oats-data/menu/commands/applications.py @@ -3,6 +3,7 @@ clean_alcs_applications, init_applications, ) +from common.alcs_init_users import init_alcs_users def application_import(console, args): @@ -18,6 +19,7 @@ def application_import(console, args): ) init_applications(batch_size=import_batch_size) + init_alcs_users(batch_size=import_batch_size) process_application_etl(batch_size=import_batch_size) diff --git a/bin/migrate-oats-data/menu/commands/clean_all.py b/bin/migrate-oats-data/menu/commands/clean_all.py index 722506abac..31d65a9431 100644 --- a/bin/migrate-oats-data/menu/commands/clean_all.py +++ b/bin/migrate-oats-data/menu/commands/clean_all.py @@ -27,9 +27,9 @@ def clean_all(console, args): clean_application_documents() clean_noi_documents() clean_documents() - clean_users() clean_alcs_applications() clean_notice_of_intent() + clean_users() clean_application_submission_status_emails(), clean_notice_of_intent_submission_status_emails(), diff --git a/bin/migrate-oats-data/menu/commands/import_all.py b/bin/migrate-oats-data/menu/commands/import_all.py index 467389854e..af298a4355 100644 --- a/bin/migrate-oats-data/menu/commands/import_all.py +++ b/bin/migrate-oats-data/menu/commands/import_all.py @@ -49,15 +49,15 @@ def import_all(console, args): console.log("Processing ALCS NOI documents:") link_alcs_docs_to_noi_docs(batch_size=import_batch_size) + console.log("Processing Users:") + init_alcs_users(batch_size=import_batch_size) + console.log("Processing Applications:") process_application_etl(batch_size=import_batch_size) console.log("Processing notice of intents") process_notice_of_intent(batch_size=import_batch_size) - console.log("Processing Users") - init_alcs_users(batch_size=import_batch_size) - # NOTE: both process_application_submission_status_emails(), process_notice_of_intent_submission_status_emails() # must be the last ones in the migrate etl console.log("Processing submission status emails") diff --git a/bin/migrate-oats-data/menu/commands/notice_of_intents.py b/bin/migrate-oats-data/menu/commands/notice_of_intents.py index 7cd3bb7dc5..b982c5690a 100644 --- a/bin/migrate-oats-data/menu/commands/notice_of_intents.py +++ b/bin/migrate-oats-data/menu/commands/notice_of_intents.py @@ -3,7 +3,7 @@ process_notice_of_intent, clean_notice_of_intent, ) -from common import setup_and_get_logger +from common import setup_and_get_logger, init_alcs_users logger = setup_and_get_logger("noi_import") @@ -19,6 +19,7 @@ def notice_of_intent_import(console, args): logger.debug(f"Processing NOI import in batch size = {import_batch_size}") init_notice_of_intents(batch_size=import_batch_size) + init_alcs_users(batch_size=import_batch_size) process_notice_of_intent(batch_size=import_batch_size) From d593de9e45718257f213f819a404ca619a6c31fa Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Mon, 20 Nov 2023 17:37:11 -0800 Subject: [PATCH 668/954] fixes --- .../public-application-search-view.entity.ts | 31 ++++++++----- ...lic-notice-of-intent-search-view.entity.ts | 28 ++++++++---- .../migrations/1700511703994-add-destRank.ts | 20 --------- .../migrations/1700517731442-add-destRank.ts | 20 --------- .../1700519694287-add-destRank-application.ts | 20 --------- .../migrations/1700530518881-add-destRank.ts | 44 +++++++++++++++++++ 6 files changed, 82 insertions(+), 81 deletions(-) delete mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1700511703994-add-destRank.ts delete mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1700517731442-add-destRank.ts delete mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1700519694287-add-destRank-application.ts create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1700530518881-add-destRank.ts diff --git a/services/apps/alcs/src/portal/public/search/application/public-application-search-view.entity.ts b/services/apps/alcs/src/portal/public/search/application/public-application-search-view.entity.ts index 023b94b3c9..d35b400a4d 100644 --- a/services/apps/alcs/src/portal/public/search/application/public-application-search-view.entity.ts +++ b/services/apps/alcs/src/portal/public/search/application/public-application-search-view.entity.ts @@ -64,16 +64,26 @@ import { LinkedStatusType } from '../public-search.dto'; (qb) => qb .from(ApplicationDecision, 'decision_date') - .select('date', 'date') - .addSelect('outcome_code', 'outcome') - .addSelect( - 'RANK() OVER (PARTITION BY application_uuid ORDER BY date DESC)', - 'dest_rank', + .select('decisiondate', 'date') + .addSelect('outcome', 'outcome') + .addSelect('dest_rank', 'dest_rank') + .distinctOn(['application_uuid']) + .addSelect('applicationuuid', 'application_uuid') + .from( + qb + .subQuery() + .select('outcome_code', 'outcome') + .addSelect('date', 'decisiondate') + .addSelect('application_uuid', 'applicationuuid') + .addSelect( + 'RANK() OVER (PARTITION BY application_uuid ORDER BY date DESC, audit_created_at DESC)', + 'dest_rank', + ) + .from(ApplicationDecision, 'decision') + .getQuery(), + 'decisions', ) - .addSelect('application_uuid', 'application_uuid') - .groupBy('application_uuid') - .addGroupBy('outcome_code') - .addGroupBy('date'), + .where('dest_rank = 1'), 'decision_date', 'decision_date."application_uuid" = app.uuid', ) @@ -83,9 +93,6 @@ import { LinkedStatusType } from '../public-search.dto'; ) .andWhere( "alcs.get_current_status_for_application_submission_by_uuid(app_sub.uuid)->>'status_type_code' != 'CNCL'", - ) - .andWhere( - "decision_date.dest_rank = 1", ), }) export class PublicApplicationSubmissionSearchView { diff --git a/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search-view.entity.ts b/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search-view.entity.ts index ac24185030..5b19ebd28c 100644 --- a/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search-view.entity.ts +++ b/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search-view.entity.ts @@ -64,16 +64,26 @@ import { LinkedStatusType } from '../public-search.dto'; (qb) => qb .from(NoticeOfIntentDecision, 'decision_date') - .select('date', 'date') - .addSelect('outcome_code', 'outcome') - .addSelect( - 'RANK() OVER (PARTITION BY notice_of_intent_uuid ORDER BY date DESC)', - 'dest_rank', + .select('decisiondate', 'date') + .addSelect('outcome', 'outcome') + .addSelect('dest_rank', 'dest_rank') + .distinctOn(['notice_of_intentuuid']) + .addSelect('notice_of_intentuuid', 'notice_of_intent_uuid') + .from( + qb + .subQuery() + .select('outcome_code', 'outcome') + .addSelect('date', 'decisiondate') + .addSelect('notice_of_intent_uuid', 'notice_of_intentuuid') + .addSelect( + 'RANK() OVER (PARTITION BY notice_of_intent_uuid ORDER BY date DESC, audit_created_at DESC)', + 'dest_rank', + ) + .from(NoticeOfIntentDecision, 'decision') + .getQuery(), + 'decisions', ) - .addSelect('notice_of_intent_uuid', 'notice_of_intent_uuid') - .groupBy('notice_of_intent_uuid') - .addGroupBy('outcome_code') - .addGroupBy('date'), + .where('dest_rank = 1'), 'decision_date', 'decision_date."notice_of_intent_uuid" = noi.uuid', ) diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1700511703994-add-destRank.ts b/services/apps/alcs/src/providers/typeorm/migrations/1700511703994-add-destRank.ts deleted file mode 100644 index be70bff816..0000000000 --- a/services/apps/alcs/src/providers/typeorm/migrations/1700511703994-add-destRank.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { MigrationInterface, QueryRunner } from "typeorm"; - -export class AddDestRank1700511703994 implements MigrationInterface { - name = 'AddDestRank1700511703994' - - public async up(queryRunner: QueryRunner): Promise<void> { - await queryRunner.query(`DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, ["VIEW","public_notice_of_intent_submission_search_view","alcs"]); - await queryRunner.query(`DROP VIEW "alcs"."public_notice_of_intent_submission_search_view"`); - await queryRunner.query(`CREATE VIEW "alcs"."public_notice_of_intent_submission_search_view" AS SELECT "noi_sub"."uuid" AS "uuid", "noi_sub"."applicant" AS "applicant", "noi"."uuid" AS "notice_of_intent_uuid", "noticeOfIntentType"."audit_deleted_date_at" AS "noticeOfIntentType_audit_deleted_date_at", "noticeOfIntentType"."audit_created_at" AS "noticeOfIntentType_audit_created_at", "noticeOfIntentType"."audit_updated_at" AS "noticeOfIntentType_audit_updated_at", "noticeOfIntentType"."audit_created_by" AS "noticeOfIntentType_audit_created_by", "noticeOfIntentType"."audit_updated_by" AS "noticeOfIntentType_audit_updated_by", "noticeOfIntentType"."label" AS "noticeOfIntentType_label", "noticeOfIntentType"."code" AS "noticeOfIntentType_code", "noticeOfIntentType"."description" AS "noticeOfIntentType_description", "noticeOfIntentType"."short_label" AS "noticeOfIntentType_short_label", "noticeOfIntentType"."background_color" AS "noticeOfIntentType_background_color", "noticeOfIntentType"."text_color" AS "noticeOfIntentType_text_color", "noticeOfIntentType"."html_description" AS "noticeOfIntentType_html_description", "noticeOfIntentType"."portal_label" AS "noticeOfIntentType_portal_label", "localGovernment"."name" AS "local_government_name", "noi_sub"."file_number" AS "file_number", "noi_sub"."local_government_uuid" AS "local_government_uuid", "noi_sub"."type_code" AS "notice_of_intent_type_code", "noi"."date_submitted_to_alc" AS "date_submitted_to_alc", "noi"."decision_date" AS "decision_date", decision_date.outcome AS "outcome", decision_date.dest_rank AS "dest_rank", "noi"."region_code" AS "notice_of_intent_region_code", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid") AS "status" FROM "alcs"."notice_of_intent_submission" "noi_sub" INNER JOIN "alcs"."notice_of_intent" "noi" ON "noi"."file_number" = "noi_sub"."file_number" AND "noi"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."notice_of_intent_type" "noticeOfIntentType" ON "noi_sub"."type_code" = "noticeOfIntentType"."code" AND "noticeOfIntentType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "noi_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."notice_of_intent_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "noi_sub"."uuid" LEFT JOIN (SELECT MAX("date") AS "date", outcome_code AS "outcome", RANK() OVER (PARTITION BY notice_of_intent_uuid ORDER BY date DESC) AS "dest_rank", notice_of_intent_uuid AS "notice_of_intent_uuid" FROM "alcs"."notice_of_intent_decision" "decision_date" WHERE "decision_date"."audit_deleted_date_at" IS NULL GROUP BY notice_of_intent_uuid, outcome_code, "decision_date"."date") "decision_date" ON decision_date."notice_of_intent_uuid" = "noi"."uuid" WHERE ( "noi_sub"."is_draft" = FALSE AND ("noi"."date_received_all_items" IS NOT NULL AND "noi"."date_received_all_items" <= NOW()) AND alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid")->>'status_type_code' != 'CNCL' AND decision_date.dest_rank = 1 ) AND ( "noi_sub"."audit_deleted_date_at" IS NULL )`); - await queryRunner.query(`INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, ["alcs","VIEW","public_notice_of_intent_submission_search_view","SELECT \"noi_sub\".\"uuid\" AS \"uuid\", \"noi_sub\".\"applicant\" AS \"applicant\", \"noi\".\"uuid\" AS \"notice_of_intent_uuid\", \"noticeOfIntentType\".\"audit_deleted_date_at\" AS \"noticeOfIntentType_audit_deleted_date_at\", \"noticeOfIntentType\".\"audit_created_at\" AS \"noticeOfIntentType_audit_created_at\", \"noticeOfIntentType\".\"audit_updated_at\" AS \"noticeOfIntentType_audit_updated_at\", \"noticeOfIntentType\".\"audit_created_by\" AS \"noticeOfIntentType_audit_created_by\", \"noticeOfIntentType\".\"audit_updated_by\" AS \"noticeOfIntentType_audit_updated_by\", \"noticeOfIntentType\".\"label\" AS \"noticeOfIntentType_label\", \"noticeOfIntentType\".\"code\" AS \"noticeOfIntentType_code\", \"noticeOfIntentType\".\"description\" AS \"noticeOfIntentType_description\", \"noticeOfIntentType\".\"short_label\" AS \"noticeOfIntentType_short_label\", \"noticeOfIntentType\".\"background_color\" AS \"noticeOfIntentType_background_color\", \"noticeOfIntentType\".\"text_color\" AS \"noticeOfIntentType_text_color\", \"noticeOfIntentType\".\"html_description\" AS \"noticeOfIntentType_html_description\", \"noticeOfIntentType\".\"portal_label\" AS \"noticeOfIntentType_portal_label\", \"localGovernment\".\"name\" AS \"local_government_name\", \"noi_sub\".\"file_number\" AS \"file_number\", \"noi_sub\".\"local_government_uuid\" AS \"local_government_uuid\", \"noi_sub\".\"type_code\" AS \"notice_of_intent_type_code\", \"noi\".\"date_submitted_to_alc\" AS \"date_submitted_to_alc\", \"noi\".\"decision_date\" AS \"decision_date\", decision_date.outcome AS \"outcome\", decision_date.dest_rank AS \"dest_rank\", \"noi\".\"region_code\" AS \"notice_of_intent_region_code\", GREATEST(status_link.effective_date, decision_date.date) AS \"last_update\", alcs.get_current_status_for_notice_of_intent_submission_by_uuid(\"noi_sub\".\"uuid\") AS \"status\" FROM \"alcs\".\"notice_of_intent_submission\" \"noi_sub\" INNER JOIN \"alcs\".\"notice_of_intent\" \"noi\" ON \"noi\".\"file_number\" = \"noi_sub\".\"file_number\" AND \"noi\".\"audit_deleted_date_at\" IS NULL INNER JOIN \"alcs\".\"notice_of_intent_type\" \"noticeOfIntentType\" ON \"noi_sub\".\"type_code\" = \"noticeOfIntentType\".\"code\" AND \"noticeOfIntentType\".\"audit_deleted_date_at\" IS NULL LEFT JOIN \"alcs\".\"local_government\" \"localGovernment\" ON \"noi_sub\".\"local_government_uuid\" = \"localGovernment\".\"uuid\" AND \"localGovernment\".\"audit_deleted_date_at\" IS NULL LEFT JOIN (SELECT MAX(\"effective_date\") AS \"effective_date\", submission_uuid AS \"submission_uuid\" FROM \"alcs\".\"notice_of_intent_submission_to_submission_status\" \"status_link\" GROUP BY submission_uuid) \"status_link\" ON status_link.\"submission_uuid\" = \"noi_sub\".\"uuid\" LEFT JOIN (SELECT MAX(\"date\") AS \"date\", outcome_code AS \"outcome\", RANK() OVER (PARTITION BY notice_of_intent_uuid ORDER BY date DESC) AS \"dest_rank\", notice_of_intent_uuid AS \"notice_of_intent_uuid\" FROM \"alcs\".\"notice_of_intent_decision\" \"decision_date\" WHERE \"decision_date\".\"audit_deleted_date_at\" IS NULL GROUP BY notice_of_intent_uuid, outcome_code, \"decision_date\".\"date\") \"decision_date\" ON decision_date.\"notice_of_intent_uuid\" = \"noi\".\"uuid\" WHERE ( \"noi_sub\".\"is_draft\" = FALSE AND (\"noi\".\"date_received_all_items\" IS NOT NULL AND \"noi\".\"date_received_all_items\" <= NOW()) AND alcs.get_current_status_for_notice_of_intent_submission_by_uuid(\"noi_sub\".\"uuid\")->>'status_type_code' != 'CNCL' AND decision_date.dest_rank = 1 ) AND ( \"noi_sub\".\"audit_deleted_date_at\" IS NULL )"]); - } - - public async down(queryRunner: QueryRunner): Promise<void> { - await queryRunner.query(`DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, ["VIEW","public_notice_of_intent_submission_search_view","alcs"]); - await queryRunner.query(`DROP VIEW "alcs"."public_notice_of_intent_submission_search_view"`); - await queryRunner.query(`CREATE VIEW "alcs"."public_notice_of_intent_submission_search_view" AS SELECT "noi_sub"."uuid" AS "uuid", "noi_sub"."applicant" AS "applicant", "noi"."uuid" AS "notice_of_intent_uuid", "noticeOfIntentType"."audit_deleted_date_at" AS "noticeOfIntentType_audit_deleted_date_at", "noticeOfIntentType"."audit_created_at" AS "noticeOfIntentType_audit_created_at", "noticeOfIntentType"."audit_updated_at" AS "noticeOfIntentType_audit_updated_at", "noticeOfIntentType"."audit_created_by" AS "noticeOfIntentType_audit_created_by", "noticeOfIntentType"."audit_updated_by" AS "noticeOfIntentType_audit_updated_by", "noticeOfIntentType"."label" AS "noticeOfIntentType_label", "noticeOfIntentType"."code" AS "noticeOfIntentType_code", "noticeOfIntentType"."description" AS "noticeOfIntentType_description", "noticeOfIntentType"."short_label" AS "noticeOfIntentType_short_label", "noticeOfIntentType"."background_color" AS "noticeOfIntentType_background_color", "noticeOfIntentType"."text_color" AS "noticeOfIntentType_text_color", "noticeOfIntentType"."html_description" AS "noticeOfIntentType_html_description", "noticeOfIntentType"."portal_label" AS "noticeOfIntentType_portal_label", "localGovernment"."name" AS "local_government_name", "noi_sub"."file_number" AS "file_number", "noi_sub"."local_government_uuid" AS "local_government_uuid", "noi_sub"."type_code" AS "notice_of_intent_type_code", "noi"."date_submitted_to_alc" AS "date_submitted_to_alc", "noi"."decision_date" AS "decision_date", decision_date.outcome AS "outcome", "noi"."region_code" AS "notice_of_intent_region_code", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid") AS "status" FROM "alcs"."notice_of_intent_submission" "noi_sub" INNER JOIN "alcs"."notice_of_intent" "noi" ON "noi"."file_number" = "noi_sub"."file_number" AND "noi"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."notice_of_intent_type" "noticeOfIntentType" ON "noi_sub"."type_code" = "noticeOfIntentType"."code" AND "noticeOfIntentType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "noi_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."notice_of_intent_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "noi_sub"."uuid" LEFT JOIN (SELECT MAX("date") AS "date", outcome_code AS "outcome", notice_of_intent_uuid AS "notice_of_intent_uuid" FROM "alcs"."notice_of_intent_decision" "decision_date" WHERE "decision_date"."audit_deleted_date_at" IS NULL GROUP BY notice_of_intent_uuid, outcome) "decision_date" ON decision_date."notice_of_intent_uuid" = "noi"."uuid" WHERE ( "noi_sub"."is_draft" = FALSE AND ("noi"."date_received_all_items" IS NOT NULL AND "noi"."date_received_all_items" <= NOW()) AND alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid")->>'status_type_code' != 'CNCL' ) AND ( "noi_sub"."audit_deleted_date_at" IS NULL )`); - await queryRunner.query(`INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, ["alcs","VIEW","public_notice_of_intent_submission_search_view","SELECT \"noi_sub\".\"uuid\" AS \"uuid\", \"noi_sub\".\"applicant\" AS \"applicant\", \"noi\".\"uuid\" AS \"notice_of_intent_uuid\", \"noticeOfIntentType\".\"audit_deleted_date_at\" AS \"noticeOfIntentType_audit_deleted_date_at\", \"noticeOfIntentType\".\"audit_created_at\" AS \"noticeOfIntentType_audit_created_at\", \"noticeOfIntentType\".\"audit_updated_at\" AS \"noticeOfIntentType_audit_updated_at\", \"noticeOfIntentType\".\"audit_created_by\" AS \"noticeOfIntentType_audit_created_by\", \"noticeOfIntentType\".\"audit_updated_by\" AS \"noticeOfIntentType_audit_updated_by\", \"noticeOfIntentType\".\"label\" AS \"noticeOfIntentType_label\", \"noticeOfIntentType\".\"code\" AS \"noticeOfIntentType_code\", \"noticeOfIntentType\".\"description\" AS \"noticeOfIntentType_description\", \"noticeOfIntentType\".\"short_label\" AS \"noticeOfIntentType_short_label\", \"noticeOfIntentType\".\"background_color\" AS \"noticeOfIntentType_background_color\", \"noticeOfIntentType\".\"text_color\" AS \"noticeOfIntentType_text_color\", \"noticeOfIntentType\".\"html_description\" AS \"noticeOfIntentType_html_description\", \"noticeOfIntentType\".\"portal_label\" AS \"noticeOfIntentType_portal_label\", \"localGovernment\".\"name\" AS \"local_government_name\", \"noi_sub\".\"file_number\" AS \"file_number\", \"noi_sub\".\"local_government_uuid\" AS \"local_government_uuid\", \"noi_sub\".\"type_code\" AS \"notice_of_intent_type_code\", \"noi\".\"date_submitted_to_alc\" AS \"date_submitted_to_alc\", \"noi\".\"decision_date\" AS \"decision_date\", decision_date.outcome AS \"outcome\", \"noi\".\"region_code\" AS \"notice_of_intent_region_code\", GREATEST(status_link.effective_date, decision_date.date) AS \"last_update\", alcs.get_current_status_for_notice_of_intent_submission_by_uuid(\"noi_sub\".\"uuid\") AS \"status\" FROM \"alcs\".\"notice_of_intent_submission\" \"noi_sub\" INNER JOIN \"alcs\".\"notice_of_intent\" \"noi\" ON \"noi\".\"file_number\" = \"noi_sub\".\"file_number\" AND \"noi\".\"audit_deleted_date_at\" IS NULL INNER JOIN \"alcs\".\"notice_of_intent_type\" \"noticeOfIntentType\" ON \"noi_sub\".\"type_code\" = \"noticeOfIntentType\".\"code\" AND \"noticeOfIntentType\".\"audit_deleted_date_at\" IS NULL LEFT JOIN \"alcs\".\"local_government\" \"localGovernment\" ON \"noi_sub\".\"local_government_uuid\" = \"localGovernment\".\"uuid\" AND \"localGovernment\".\"audit_deleted_date_at\" IS NULL LEFT JOIN (SELECT MAX(\"effective_date\") AS \"effective_date\", submission_uuid AS \"submission_uuid\" FROM \"alcs\".\"notice_of_intent_submission_to_submission_status\" \"status_link\" GROUP BY submission_uuid) \"status_link\" ON status_link.\"submission_uuid\" = \"noi_sub\".\"uuid\" LEFT JOIN (SELECT MAX(\"date\") AS \"date\", outcome_code AS \"outcome\", notice_of_intent_uuid AS \"notice_of_intent_uuid\" FROM \"alcs\".\"notice_of_intent_decision\" \"decision_date\" WHERE \"decision_date\".\"audit_deleted_date_at\" IS NULL GROUP BY notice_of_intent_uuid, outcome) \"decision_date\" ON decision_date.\"notice_of_intent_uuid\" = \"noi\".\"uuid\" WHERE ( \"noi_sub\".\"is_draft\" = FALSE AND (\"noi\".\"date_received_all_items\" IS NOT NULL AND \"noi\".\"date_received_all_items\" <= NOW()) AND alcs.get_current_status_for_notice_of_intent_submission_by_uuid(\"noi_sub\".\"uuid\")->>'status_type_code' != 'CNCL' ) AND ( \"noi_sub\".\"audit_deleted_date_at\" IS NULL )"]); - } - -} diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1700517731442-add-destRank.ts b/services/apps/alcs/src/providers/typeorm/migrations/1700517731442-add-destRank.ts deleted file mode 100644 index 6d7192d6fa..0000000000 --- a/services/apps/alcs/src/providers/typeorm/migrations/1700517731442-add-destRank.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { MigrationInterface, QueryRunner } from "typeorm"; - -export class AddDestRank1700517731442 implements MigrationInterface { - name = 'AddDestRank1700517731442' - - public async up(queryRunner: QueryRunner): Promise<void> { - await queryRunner.query(`DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, ["VIEW","public_notice_of_intent_submission_search_view","alcs"]); - await queryRunner.query(`DROP VIEW "alcs"."public_notice_of_intent_submission_search_view"`); - await queryRunner.query(`CREATE VIEW "alcs"."public_notice_of_intent_submission_search_view" AS SELECT "noi_sub"."uuid" AS "uuid", "noi_sub"."applicant" AS "applicant", "noi"."uuid" AS "notice_of_intent_uuid", "noticeOfIntentType"."audit_deleted_date_at" AS "noticeOfIntentType_audit_deleted_date_at", "noticeOfIntentType"."audit_created_at" AS "noticeOfIntentType_audit_created_at", "noticeOfIntentType"."audit_updated_at" AS "noticeOfIntentType_audit_updated_at", "noticeOfIntentType"."audit_created_by" AS "noticeOfIntentType_audit_created_by", "noticeOfIntentType"."audit_updated_by" AS "noticeOfIntentType_audit_updated_by", "noticeOfIntentType"."label" AS "noticeOfIntentType_label", "noticeOfIntentType"."code" AS "noticeOfIntentType_code", "noticeOfIntentType"."description" AS "noticeOfIntentType_description", "noticeOfIntentType"."short_label" AS "noticeOfIntentType_short_label", "noticeOfIntentType"."background_color" AS "noticeOfIntentType_background_color", "noticeOfIntentType"."text_color" AS "noticeOfIntentType_text_color", "noticeOfIntentType"."html_description" AS "noticeOfIntentType_html_description", "noticeOfIntentType"."portal_label" AS "noticeOfIntentType_portal_label", "localGovernment"."name" AS "local_government_name", "noi_sub"."file_number" AS "file_number", "noi_sub"."local_government_uuid" AS "local_government_uuid", "noi_sub"."type_code" AS "notice_of_intent_type_code", "noi"."date_submitted_to_alc" AS "date_submitted_to_alc", "noi"."decision_date" AS "decision_date", decision_date.outcome AS "outcome", decision_date.dest_rank AS "dest_rank", "noi"."region_code" AS "notice_of_intent_region_code", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid") AS "status" FROM "alcs"."notice_of_intent_submission" "noi_sub" INNER JOIN "alcs"."notice_of_intent" "noi" ON "noi"."file_number" = "noi_sub"."file_number" AND "noi"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."notice_of_intent_type" "noticeOfIntentType" ON "noi_sub"."type_code" = "noticeOfIntentType"."code" AND "noticeOfIntentType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "noi_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."notice_of_intent_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "noi_sub"."uuid" LEFT JOIN (SELECT date AS "date", outcome_code AS "outcome", RANK() OVER (PARTITION BY notice_of_intent_uuid ORDER BY date DESC) AS "dest_rank", notice_of_intent_uuid AS "notice_of_intent_uuid" FROM "alcs"."notice_of_intent_decision" "decision_date" WHERE "decision_date"."audit_deleted_date_at" IS NULL GROUP BY notice_of_intent_uuid, outcome_code, date) "decision_date" ON decision_date."notice_of_intent_uuid" = "noi"."uuid" WHERE ( "noi_sub"."is_draft" = FALSE AND ("noi"."date_received_all_items" IS NOT NULL AND "noi"."date_received_all_items" <= NOW()) AND alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid")->>'status_type_code' != 'CNCL' AND decision_date.dest_rank = 1 ) AND ( "noi_sub"."audit_deleted_date_at" IS NULL )`); - await queryRunner.query(`INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, ["alcs","VIEW","public_notice_of_intent_submission_search_view","SELECT \"noi_sub\".\"uuid\" AS \"uuid\", \"noi_sub\".\"applicant\" AS \"applicant\", \"noi\".\"uuid\" AS \"notice_of_intent_uuid\", \"noticeOfIntentType\".\"audit_deleted_date_at\" AS \"noticeOfIntentType_audit_deleted_date_at\", \"noticeOfIntentType\".\"audit_created_at\" AS \"noticeOfIntentType_audit_created_at\", \"noticeOfIntentType\".\"audit_updated_at\" AS \"noticeOfIntentType_audit_updated_at\", \"noticeOfIntentType\".\"audit_created_by\" AS \"noticeOfIntentType_audit_created_by\", \"noticeOfIntentType\".\"audit_updated_by\" AS \"noticeOfIntentType_audit_updated_by\", \"noticeOfIntentType\".\"label\" AS \"noticeOfIntentType_label\", \"noticeOfIntentType\".\"code\" AS \"noticeOfIntentType_code\", \"noticeOfIntentType\".\"description\" AS \"noticeOfIntentType_description\", \"noticeOfIntentType\".\"short_label\" AS \"noticeOfIntentType_short_label\", \"noticeOfIntentType\".\"background_color\" AS \"noticeOfIntentType_background_color\", \"noticeOfIntentType\".\"text_color\" AS \"noticeOfIntentType_text_color\", \"noticeOfIntentType\".\"html_description\" AS \"noticeOfIntentType_html_description\", \"noticeOfIntentType\".\"portal_label\" AS \"noticeOfIntentType_portal_label\", \"localGovernment\".\"name\" AS \"local_government_name\", \"noi_sub\".\"file_number\" AS \"file_number\", \"noi_sub\".\"local_government_uuid\" AS \"local_government_uuid\", \"noi_sub\".\"type_code\" AS \"notice_of_intent_type_code\", \"noi\".\"date_submitted_to_alc\" AS \"date_submitted_to_alc\", \"noi\".\"decision_date\" AS \"decision_date\", decision_date.outcome AS \"outcome\", decision_date.dest_rank AS \"dest_rank\", \"noi\".\"region_code\" AS \"notice_of_intent_region_code\", GREATEST(status_link.effective_date, decision_date.date) AS \"last_update\", alcs.get_current_status_for_notice_of_intent_submission_by_uuid(\"noi_sub\".\"uuid\") AS \"status\" FROM \"alcs\".\"notice_of_intent_submission\" \"noi_sub\" INNER JOIN \"alcs\".\"notice_of_intent\" \"noi\" ON \"noi\".\"file_number\" = \"noi_sub\".\"file_number\" AND \"noi\".\"audit_deleted_date_at\" IS NULL INNER JOIN \"alcs\".\"notice_of_intent_type\" \"noticeOfIntentType\" ON \"noi_sub\".\"type_code\" = \"noticeOfIntentType\".\"code\" AND \"noticeOfIntentType\".\"audit_deleted_date_at\" IS NULL LEFT JOIN \"alcs\".\"local_government\" \"localGovernment\" ON \"noi_sub\".\"local_government_uuid\" = \"localGovernment\".\"uuid\" AND \"localGovernment\".\"audit_deleted_date_at\" IS NULL LEFT JOIN (SELECT MAX(\"effective_date\") AS \"effective_date\", submission_uuid AS \"submission_uuid\" FROM \"alcs\".\"notice_of_intent_submission_to_submission_status\" \"status_link\" GROUP BY submission_uuid) \"status_link\" ON status_link.\"submission_uuid\" = \"noi_sub\".\"uuid\" LEFT JOIN (SELECT date AS \"date\", outcome_code AS \"outcome\", RANK() OVER (PARTITION BY notice_of_intent_uuid ORDER BY date DESC) AS \"dest_rank\", notice_of_intent_uuid AS \"notice_of_intent_uuid\" FROM \"alcs\".\"notice_of_intent_decision\" \"decision_date\" WHERE \"decision_date\".\"audit_deleted_date_at\" IS NULL GROUP BY notice_of_intent_uuid, outcome_code, date) \"decision_date\" ON decision_date.\"notice_of_intent_uuid\" = \"noi\".\"uuid\" WHERE ( \"noi_sub\".\"is_draft\" = FALSE AND (\"noi\".\"date_received_all_items\" IS NOT NULL AND \"noi\".\"date_received_all_items\" <= NOW()) AND alcs.get_current_status_for_notice_of_intent_submission_by_uuid(\"noi_sub\".\"uuid\")->>'status_type_code' != 'CNCL' AND decision_date.dest_rank = 1 ) AND ( \"noi_sub\".\"audit_deleted_date_at\" IS NULL )"]); - } - - public async down(queryRunner: QueryRunner): Promise<void> { - await queryRunner.query(`DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, ["VIEW","public_notice_of_intent_submission_search_view","alcs"]); - await queryRunner.query(`DROP VIEW "alcs"."public_notice_of_intent_submission_search_view"`); - await queryRunner.query(`CREATE VIEW "alcs"."public_notice_of_intent_submission_search_view" AS SELECT "noi_sub"."uuid" AS "uuid", "noi_sub"."applicant" AS "applicant", "noi"."uuid" AS "notice_of_intent_uuid", "noticeOfIntentType"."audit_deleted_date_at" AS "noticeOfIntentType_audit_deleted_date_at", "noticeOfIntentType"."audit_created_at" AS "noticeOfIntentType_audit_created_at", "noticeOfIntentType"."audit_updated_at" AS "noticeOfIntentType_audit_updated_at", "noticeOfIntentType"."audit_created_by" AS "noticeOfIntentType_audit_created_by", "noticeOfIntentType"."audit_updated_by" AS "noticeOfIntentType_audit_updated_by", "noticeOfIntentType"."label" AS "noticeOfIntentType_label", "noticeOfIntentType"."code" AS "noticeOfIntentType_code", "noticeOfIntentType"."description" AS "noticeOfIntentType_description", "noticeOfIntentType"."short_label" AS "noticeOfIntentType_short_label", "noticeOfIntentType"."background_color" AS "noticeOfIntentType_background_color", "noticeOfIntentType"."text_color" AS "noticeOfIntentType_text_color", "noticeOfIntentType"."html_description" AS "noticeOfIntentType_html_description", "noticeOfIntentType"."portal_label" AS "noticeOfIntentType_portal_label", "localGovernment"."name" AS "local_government_name", "noi_sub"."file_number" AS "file_number", "noi_sub"."local_government_uuid" AS "local_government_uuid", "noi_sub"."type_code" AS "notice_of_intent_type_code", "noi"."date_submitted_to_alc" AS "date_submitted_to_alc", "noi"."decision_date" AS "decision_date", decision_date.outcome AS "outcome", "noi"."region_code" AS "notice_of_intent_region_code", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid") AS "status" FROM "alcs"."notice_of_intent_submission" "noi_sub" INNER JOIN "alcs"."notice_of_intent" "noi" ON "noi"."file_number" = "noi_sub"."file_number" AND "noi"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."notice_of_intent_type" "noticeOfIntentType" ON "noi_sub"."type_code" = "noticeOfIntentType"."code" AND "noticeOfIntentType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "noi_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."notice_of_intent_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "noi_sub"."uuid" LEFT JOIN (SELECT MAX("date") AS "date", outcome_code AS "outcome", notice_of_intent_uuid AS "notice_of_intent_uuid" FROM "alcs"."notice_of_intent_decision" "decision_date" WHERE "decision_date"."audit_deleted_date_at" IS NULL GROUP BY notice_of_intent_uuid, outcome) "decision_date" ON decision_date."notice_of_intent_uuid" = "noi"."uuid" WHERE ( "noi_sub"."is_draft" = FALSE AND ("noi"."date_received_all_items" IS NOT NULL AND "noi"."date_received_all_items" <= NOW()) AND alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid")->>'status_type_code' != 'CNCL' ) AND ( "noi_sub"."audit_deleted_date_at" IS NULL )`); - await queryRunner.query(`INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, ["alcs","VIEW","public_notice_of_intent_submission_search_view","SELECT \"noi_sub\".\"uuid\" AS \"uuid\", \"noi_sub\".\"applicant\" AS \"applicant\", \"noi\".\"uuid\" AS \"notice_of_intent_uuid\", \"noticeOfIntentType\".\"audit_deleted_date_at\" AS \"noticeOfIntentType_audit_deleted_date_at\", \"noticeOfIntentType\".\"audit_created_at\" AS \"noticeOfIntentType_audit_created_at\", \"noticeOfIntentType\".\"audit_updated_at\" AS \"noticeOfIntentType_audit_updated_at\", \"noticeOfIntentType\".\"audit_created_by\" AS \"noticeOfIntentType_audit_created_by\", \"noticeOfIntentType\".\"audit_updated_by\" AS \"noticeOfIntentType_audit_updated_by\", \"noticeOfIntentType\".\"label\" AS \"noticeOfIntentType_label\", \"noticeOfIntentType\".\"code\" AS \"noticeOfIntentType_code\", \"noticeOfIntentType\".\"description\" AS \"noticeOfIntentType_description\", \"noticeOfIntentType\".\"short_label\" AS \"noticeOfIntentType_short_label\", \"noticeOfIntentType\".\"background_color\" AS \"noticeOfIntentType_background_color\", \"noticeOfIntentType\".\"text_color\" AS \"noticeOfIntentType_text_color\", \"noticeOfIntentType\".\"html_description\" AS \"noticeOfIntentType_html_description\", \"noticeOfIntentType\".\"portal_label\" AS \"noticeOfIntentType_portal_label\", \"localGovernment\".\"name\" AS \"local_government_name\", \"noi_sub\".\"file_number\" AS \"file_number\", \"noi_sub\".\"local_government_uuid\" AS \"local_government_uuid\", \"noi_sub\".\"type_code\" AS \"notice_of_intent_type_code\", \"noi\".\"date_submitted_to_alc\" AS \"date_submitted_to_alc\", \"noi\".\"decision_date\" AS \"decision_date\", decision_date.outcome AS \"outcome\", \"noi\".\"region_code\" AS \"notice_of_intent_region_code\", GREATEST(status_link.effective_date, decision_date.date) AS \"last_update\", alcs.get_current_status_for_notice_of_intent_submission_by_uuid(\"noi_sub\".\"uuid\") AS \"status\" FROM \"alcs\".\"notice_of_intent_submission\" \"noi_sub\" INNER JOIN \"alcs\".\"notice_of_intent\" \"noi\" ON \"noi\".\"file_number\" = \"noi_sub\".\"file_number\" AND \"noi\".\"audit_deleted_date_at\" IS NULL INNER JOIN \"alcs\".\"notice_of_intent_type\" \"noticeOfIntentType\" ON \"noi_sub\".\"type_code\" = \"noticeOfIntentType\".\"code\" AND \"noticeOfIntentType\".\"audit_deleted_date_at\" IS NULL LEFT JOIN \"alcs\".\"local_government\" \"localGovernment\" ON \"noi_sub\".\"local_government_uuid\" = \"localGovernment\".\"uuid\" AND \"localGovernment\".\"audit_deleted_date_at\" IS NULL LEFT JOIN (SELECT MAX(\"effective_date\") AS \"effective_date\", submission_uuid AS \"submission_uuid\" FROM \"alcs\".\"notice_of_intent_submission_to_submission_status\" \"status_link\" GROUP BY submission_uuid) \"status_link\" ON status_link.\"submission_uuid\" = \"noi_sub\".\"uuid\" LEFT JOIN (SELECT MAX(\"date\") AS \"date\", outcome_code AS \"outcome\", notice_of_intent_uuid AS \"notice_of_intent_uuid\" FROM \"alcs\".\"notice_of_intent_decision\" \"decision_date\" WHERE \"decision_date\".\"audit_deleted_date_at\" IS NULL GROUP BY notice_of_intent_uuid, outcome) \"decision_date\" ON decision_date.\"notice_of_intent_uuid\" = \"noi\".\"uuid\" WHERE ( \"noi_sub\".\"is_draft\" = FALSE AND (\"noi\".\"date_received_all_items\" IS NOT NULL AND \"noi\".\"date_received_all_items\" <= NOW()) AND alcs.get_current_status_for_notice_of_intent_submission_by_uuid(\"noi_sub\".\"uuid\")->>'status_type_code' != 'CNCL' ) AND ( \"noi_sub\".\"audit_deleted_date_at\" IS NULL )"]); - } - -} diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1700519694287-add-destRank-application.ts b/services/apps/alcs/src/providers/typeorm/migrations/1700519694287-add-destRank-application.ts deleted file mode 100644 index 73286479f0..0000000000 --- a/services/apps/alcs/src/providers/typeorm/migrations/1700519694287-add-destRank-application.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { MigrationInterface, QueryRunner } from "typeorm"; - -export class AddDestRankApplication1700519694287 implements MigrationInterface { - name = 'AddDestRankApplication1700519694287' - - public async up(queryRunner: QueryRunner): Promise<void> { - await queryRunner.query(`DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, ["VIEW","public_application_submission_search_view","alcs"]); - await queryRunner.query(`DROP VIEW "alcs"."public_application_submission_search_view"`); - await queryRunner.query(`CREATE VIEW "alcs"."public_application_submission_search_view" AS SELECT "app_sub"."uuid" AS "uuid", "app_sub"."applicant" AS "applicant", "app"."uuid" AS "application_uuid", "applicationType"."audit_deleted_date_at" AS "applicationType_audit_deleted_date_at", "applicationType"."audit_created_at" AS "applicationType_audit_created_at", "applicationType"."audit_updated_at" AS "applicationType_audit_updated_at", "applicationType"."audit_created_by" AS "applicationType_audit_created_by", "applicationType"."audit_updated_by" AS "applicationType_audit_updated_by", "applicationType"."label" AS "applicationType_label", "applicationType"."code" AS "applicationType_code", "applicationType"."description" AS "applicationType_description", "applicationType"."short_label" AS "applicationType_short_label", "applicationType"."background_color" AS "applicationType_background_color", "applicationType"."text_color" AS "applicationType_text_color", "applicationType"."html_description" AS "applicationType_html_description", "applicationType"."portal_label" AS "applicationType_portal_label", "applicationType"."portal_order" AS "applicationType_portal_order", "applicationType"."requires_government_review" AS "applicationType_requires_government_review", "localGovernment"."name" AS "local_government_name", "app_sub"."file_number" AS "file_number", "app_sub"."local_government_uuid" AS "local_government_uuid", "app_sub"."type_code" AS "application_type_code", "app"."date_submitted_to_alc" AS "date_submitted_to_alc", "app"."decision_date" AS "decision_date", decision_date.outcome AS "outcome", decision_date.dest_rank AS "dest_rank", "app"."region_code" AS "application_region_code", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid") AS "status" FROM "alcs"."application_submission" "app_sub" INNER JOIN "alcs"."application" "app" ON "app"."file_number" = "app_sub"."file_number" AND "app"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."application_type" "applicationType" ON "app_sub"."type_code" = "applicationType"."code" AND "applicationType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "app_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."application_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "app_sub"."uuid" LEFT JOIN (SELECT date AS "date", outcome_code AS "outcome", RANK() OVER (PARTITION BY application_uuid ORDER BY date DESC) AS "dest_rank", application_uuid AS "application_uuid" FROM "alcs"."application_decision" "decision_date" WHERE "decision_date"."audit_deleted_date_at" IS NULL GROUP BY application_uuid, outcome_code, date) "decision_date" ON decision_date."application_uuid" = "app"."uuid" WHERE ( "app_sub"."is_draft" = FALSE AND ("app"."date_received_all_items" IS NOT NULL AND "app"."date_received_all_items" <= NOW()) AND alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid")->>'status_type_code' != 'CNCL' AND decision_date.dest_rank = 1 ) AND ( "app_sub"."audit_deleted_date_at" IS NULL )`); - await queryRunner.query(`INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, ["alcs","VIEW","public_application_submission_search_view","SELECT \"app_sub\".\"uuid\" AS \"uuid\", \"app_sub\".\"applicant\" AS \"applicant\", \"app\".\"uuid\" AS \"application_uuid\", \"applicationType\".\"audit_deleted_date_at\" AS \"applicationType_audit_deleted_date_at\", \"applicationType\".\"audit_created_at\" AS \"applicationType_audit_created_at\", \"applicationType\".\"audit_updated_at\" AS \"applicationType_audit_updated_at\", \"applicationType\".\"audit_created_by\" AS \"applicationType_audit_created_by\", \"applicationType\".\"audit_updated_by\" AS \"applicationType_audit_updated_by\", \"applicationType\".\"label\" AS \"applicationType_label\", \"applicationType\".\"code\" AS \"applicationType_code\", \"applicationType\".\"description\" AS \"applicationType_description\", \"applicationType\".\"short_label\" AS \"applicationType_short_label\", \"applicationType\".\"background_color\" AS \"applicationType_background_color\", \"applicationType\".\"text_color\" AS \"applicationType_text_color\", \"applicationType\".\"html_description\" AS \"applicationType_html_description\", \"applicationType\".\"portal_label\" AS \"applicationType_portal_label\", \"applicationType\".\"portal_order\" AS \"applicationType_portal_order\", \"applicationType\".\"requires_government_review\" AS \"applicationType_requires_government_review\", \"localGovernment\".\"name\" AS \"local_government_name\", \"app_sub\".\"file_number\" AS \"file_number\", \"app_sub\".\"local_government_uuid\" AS \"local_government_uuid\", \"app_sub\".\"type_code\" AS \"application_type_code\", \"app\".\"date_submitted_to_alc\" AS \"date_submitted_to_alc\", \"app\".\"decision_date\" AS \"decision_date\", decision_date.outcome AS \"outcome\", decision_date.dest_rank AS \"dest_rank\", \"app\".\"region_code\" AS \"application_region_code\", GREATEST(status_link.effective_date, decision_date.date) AS \"last_update\", alcs.get_current_status_for_application_submission_by_uuid(\"app_sub\".\"uuid\") AS \"status\" FROM \"alcs\".\"application_submission\" \"app_sub\" INNER JOIN \"alcs\".\"application\" \"app\" ON \"app\".\"file_number\" = \"app_sub\".\"file_number\" AND \"app\".\"audit_deleted_date_at\" IS NULL INNER JOIN \"alcs\".\"application_type\" \"applicationType\" ON \"app_sub\".\"type_code\" = \"applicationType\".\"code\" AND \"applicationType\".\"audit_deleted_date_at\" IS NULL LEFT JOIN \"alcs\".\"local_government\" \"localGovernment\" ON \"app_sub\".\"local_government_uuid\" = \"localGovernment\".\"uuid\" AND \"localGovernment\".\"audit_deleted_date_at\" IS NULL LEFT JOIN (SELECT MAX(\"effective_date\") AS \"effective_date\", submission_uuid AS \"submission_uuid\" FROM \"alcs\".\"application_submission_to_submission_status\" \"status_link\" GROUP BY submission_uuid) \"status_link\" ON status_link.\"submission_uuid\" = \"app_sub\".\"uuid\" LEFT JOIN (SELECT date AS \"date\", outcome_code AS \"outcome\", RANK() OVER (PARTITION BY application_uuid ORDER BY date DESC) AS \"dest_rank\", application_uuid AS \"application_uuid\" FROM \"alcs\".\"application_decision\" \"decision_date\" WHERE \"decision_date\".\"audit_deleted_date_at\" IS NULL GROUP BY application_uuid, outcome_code, date) \"decision_date\" ON decision_date.\"application_uuid\" = \"app\".\"uuid\" WHERE ( \"app_sub\".\"is_draft\" = FALSE AND (\"app\".\"date_received_all_items\" IS NOT NULL AND \"app\".\"date_received_all_items\" <= NOW()) AND alcs.get_current_status_for_application_submission_by_uuid(\"app_sub\".\"uuid\")->>'status_type_code' != 'CNCL' AND decision_date.dest_rank = 1 ) AND ( \"app_sub\".\"audit_deleted_date_at\" IS NULL )"]); - } - - public async down(queryRunner: QueryRunner): Promise<void> { - await queryRunner.query(`DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, ["VIEW","public_application_submission_search_view","alcs"]); - await queryRunner.query(`DROP VIEW "alcs"."public_application_submission_search_view"`); - await queryRunner.query(`CREATE VIEW "alcs"."public_application_submission_search_view" AS SELECT "app_sub"."uuid" AS "uuid", "app_sub"."applicant" AS "applicant", "app"."uuid" AS "application_uuid", "applicationType"."audit_deleted_date_at" AS "applicationType_audit_deleted_date_at", "applicationType"."audit_created_at" AS "applicationType_audit_created_at", "applicationType"."audit_updated_at" AS "applicationType_audit_updated_at", "applicationType"."audit_created_by" AS "applicationType_audit_created_by", "applicationType"."audit_updated_by" AS "applicationType_audit_updated_by", "applicationType"."label" AS "applicationType_label", "applicationType"."code" AS "applicationType_code", "applicationType"."description" AS "applicationType_description", "applicationType"."short_label" AS "applicationType_short_label", "applicationType"."background_color" AS "applicationType_background_color", "applicationType"."text_color" AS "applicationType_text_color", "applicationType"."html_description" AS "applicationType_html_description", "applicationType"."portal_label" AS "applicationType_portal_label", "applicationType"."portal_order" AS "applicationType_portal_order", "applicationType"."requires_government_review" AS "applicationType_requires_government_review", "localGovernment"."name" AS "local_government_name", "app_sub"."file_number" AS "file_number", "app_sub"."local_government_uuid" AS "local_government_uuid", "app_sub"."type_code" AS "application_type_code", "app"."date_submitted_to_alc" AS "date_submitted_to_alc", "app"."decision_date" AS "decision_date", decision_date.outcome AS "outcome", "app"."region_code" AS "application_region_code", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid") AS "status" FROM "alcs"."application_submission" "app_sub" INNER JOIN "alcs"."application" "app" ON "app"."file_number" = "app_sub"."file_number" AND "app"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."application_type" "applicationType" ON "app_sub"."type_code" = "applicationType"."code" AND "applicationType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "app_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."application_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "app_sub"."uuid" LEFT JOIN (SELECT MAX("date") AS "date", outcome_code AS "outcome", application_uuid AS "application_uuid" FROM "alcs"."application_decision" "decision_date" WHERE "decision_date"."audit_deleted_date_at" IS NULL GROUP BY application_uuid, outcome) "decision_date" ON decision_date."application_uuid" = "app"."uuid" WHERE ( "app_sub"."is_draft" = FALSE AND ("app"."date_received_all_items" IS NOT NULL AND "app"."date_received_all_items" <= NOW()) AND alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid")->>'status_type_code' != 'CNCL' ) AND ( "app_sub"."audit_deleted_date_at" IS NULL )`); - await queryRunner.query(`INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, ["alcs","VIEW","public_application_submission_search_view","SELECT \"app_sub\".\"uuid\" AS \"uuid\", \"app_sub\".\"applicant\" AS \"applicant\", \"app\".\"uuid\" AS \"application_uuid\", \"applicationType\".\"audit_deleted_date_at\" AS \"applicationType_audit_deleted_date_at\", \"applicationType\".\"audit_created_at\" AS \"applicationType_audit_created_at\", \"applicationType\".\"audit_updated_at\" AS \"applicationType_audit_updated_at\", \"applicationType\".\"audit_created_by\" AS \"applicationType_audit_created_by\", \"applicationType\".\"audit_updated_by\" AS \"applicationType_audit_updated_by\", \"applicationType\".\"label\" AS \"applicationType_label\", \"applicationType\".\"code\" AS \"applicationType_code\", \"applicationType\".\"description\" AS \"applicationType_description\", \"applicationType\".\"short_label\" AS \"applicationType_short_label\", \"applicationType\".\"background_color\" AS \"applicationType_background_color\", \"applicationType\".\"text_color\" AS \"applicationType_text_color\", \"applicationType\".\"html_description\" AS \"applicationType_html_description\", \"applicationType\".\"portal_label\" AS \"applicationType_portal_label\", \"applicationType\".\"portal_order\" AS \"applicationType_portal_order\", \"applicationType\".\"requires_government_review\" AS \"applicationType_requires_government_review\", \"localGovernment\".\"name\" AS \"local_government_name\", \"app_sub\".\"file_number\" AS \"file_number\", \"app_sub\".\"local_government_uuid\" AS \"local_government_uuid\", \"app_sub\".\"type_code\" AS \"application_type_code\", \"app\".\"date_submitted_to_alc\" AS \"date_submitted_to_alc\", \"app\".\"decision_date\" AS \"decision_date\", decision_date.outcome AS \"outcome\", \"app\".\"region_code\" AS \"application_region_code\", GREATEST(status_link.effective_date, decision_date.date) AS \"last_update\", alcs.get_current_status_for_application_submission_by_uuid(\"app_sub\".\"uuid\") AS \"status\" FROM \"alcs\".\"application_submission\" \"app_sub\" INNER JOIN \"alcs\".\"application\" \"app\" ON \"app\".\"file_number\" = \"app_sub\".\"file_number\" AND \"app\".\"audit_deleted_date_at\" IS NULL INNER JOIN \"alcs\".\"application_type\" \"applicationType\" ON \"app_sub\".\"type_code\" = \"applicationType\".\"code\" AND \"applicationType\".\"audit_deleted_date_at\" IS NULL LEFT JOIN \"alcs\".\"local_government\" \"localGovernment\" ON \"app_sub\".\"local_government_uuid\" = \"localGovernment\".\"uuid\" AND \"localGovernment\".\"audit_deleted_date_at\" IS NULL LEFT JOIN (SELECT MAX(\"effective_date\") AS \"effective_date\", submission_uuid AS \"submission_uuid\" FROM \"alcs\".\"application_submission_to_submission_status\" \"status_link\" GROUP BY submission_uuid) \"status_link\" ON status_link.\"submission_uuid\" = \"app_sub\".\"uuid\" LEFT JOIN (SELECT MAX(\"date\") AS \"date\", outcome_code AS \"outcome\", application_uuid AS \"application_uuid\" FROM \"alcs\".\"application_decision\" \"decision_date\" WHERE \"decision_date\".\"audit_deleted_date_at\" IS NULL GROUP BY application_uuid, outcome) \"decision_date\" ON decision_date.\"application_uuid\" = \"app\".\"uuid\" WHERE ( \"app_sub\".\"is_draft\" = FALSE AND (\"app\".\"date_received_all_items\" IS NOT NULL AND \"app\".\"date_received_all_items\" <= NOW()) AND alcs.get_current_status_for_application_submission_by_uuid(\"app_sub\".\"uuid\")->>'status_type_code' != 'CNCL' ) AND ( \"app_sub\".\"audit_deleted_date_at\" IS NULL )"]); - } - -} diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1700530518881-add-destRank.ts b/services/apps/alcs/src/providers/typeorm/migrations/1700530518881-add-destRank.ts new file mode 100644 index 0000000000..f293266ebc --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1700530518881-add-destRank.ts @@ -0,0 +1,44 @@ +import { MigrationInterface, QueryRunner } from "typeorm"; + +export class AddDestRank1700530518881 implements MigrationInterface { + name = 'AddDestRank1700530518881' + + public async up(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query(`DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, ["VIEW","public_notice_of_intent_submission_search_view","alcs"]); + await queryRunner.query(`DROP VIEW "alcs"."public_notice_of_intent_submission_search_view"`); + await queryRunner.query(`DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, ["VIEW","public_application_submission_search_view","alcs"]); + await queryRunner.query(`DROP VIEW "alcs"."public_application_submission_search_view"`); + await queryRunner.query(`DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, ["VIEW","application_submission_search_view","alcs"]); + await queryRunner.query(`DROP VIEW "alcs"."application_submission_search_view"`); + await queryRunner.query(`DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, ["VIEW","inbox_application_submission_view","alcs"]); + await queryRunner.query(`DROP VIEW "alcs"."inbox_application_submission_view"`); + await queryRunner.query(`CREATE VIEW "alcs"."application_submission_search_view" AS SELECT "as2"."uuid" AS "uuid", "as2"."applicant" AS "applicant", "a"."uuid" AS "application_uuid", "applicationType"."audit_deleted_date_at" AS "applicationType_audit_deleted_date_at", "applicationType"."audit_created_at" AS "applicationType_audit_created_at", "applicationType"."audit_updated_at" AS "applicationType_audit_updated_at", "applicationType"."audit_created_by" AS "applicationType_audit_created_by", "applicationType"."audit_updated_by" AS "applicationType_audit_updated_by", "applicationType"."label" AS "applicationType_label", "applicationType"."code" AS "applicationType_code", "applicationType"."description" AS "applicationType_description", "applicationType"."short_label" AS "applicationType_short_label", "applicationType"."background_color" AS "applicationType_background_color", "applicationType"."text_color" AS "applicationType_text_color", "applicationType"."html_description" AS "applicationType_html_description", "applicationType"."portal_label" AS "applicationType_portal_label", "applicationType"."portal_order" AS "applicationType_portal_order", "applicationType"."requires_government_review" AS "applicationType_requires_government_review", "localGovernment"."name" AS "local_government_name", "as2"."file_number" AS "file_number", "as2"."local_government_uuid" AS "local_government_uuid", "as2"."type_code" AS "application_type_code", "as2"."is_draft" AS "is_draft", "a"."legacy_id" AS "legacy_id", "a"."date_submitted_to_alc" AS "date_submitted_to_alc", "a"."decision_date" AS "decision_date", "a"."region_code" AS "application_region_code", alcs.get_current_status_for_application_submission_by_uuid("as2"."uuid") AS "status" FROM "alcs"."application_submission" "as2" INNER JOIN "alcs"."application" "a" ON "a"."file_number" = "as2"."file_number" AND "a"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."application_type" "applicationType" ON "as2"."type_code" = "applicationType"."code" AND "applicationType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "as2"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL WHERE "as2"."audit_deleted_date_at" IS NULL`); + await queryRunner.query(`INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, ["alcs","VIEW","application_submission_search_view","SELECT \"as2\".\"uuid\" AS \"uuid\", \"as2\".\"applicant\" AS \"applicant\", \"a\".\"uuid\" AS \"application_uuid\", \"applicationType\".\"audit_deleted_date_at\" AS \"applicationType_audit_deleted_date_at\", \"applicationType\".\"audit_created_at\" AS \"applicationType_audit_created_at\", \"applicationType\".\"audit_updated_at\" AS \"applicationType_audit_updated_at\", \"applicationType\".\"audit_created_by\" AS \"applicationType_audit_created_by\", \"applicationType\".\"audit_updated_by\" AS \"applicationType_audit_updated_by\", \"applicationType\".\"label\" AS \"applicationType_label\", \"applicationType\".\"code\" AS \"applicationType_code\", \"applicationType\".\"description\" AS \"applicationType_description\", \"applicationType\".\"short_label\" AS \"applicationType_short_label\", \"applicationType\".\"background_color\" AS \"applicationType_background_color\", \"applicationType\".\"text_color\" AS \"applicationType_text_color\", \"applicationType\".\"html_description\" AS \"applicationType_html_description\", \"applicationType\".\"portal_label\" AS \"applicationType_portal_label\", \"applicationType\".\"portal_order\" AS \"applicationType_portal_order\", \"applicationType\".\"requires_government_review\" AS \"applicationType_requires_government_review\", \"localGovernment\".\"name\" AS \"local_government_name\", \"as2\".\"file_number\" AS \"file_number\", \"as2\".\"local_government_uuid\" AS \"local_government_uuid\", \"as2\".\"type_code\" AS \"application_type_code\", \"as2\".\"is_draft\" AS \"is_draft\", \"a\".\"legacy_id\" AS \"legacy_id\", \"a\".\"date_submitted_to_alc\" AS \"date_submitted_to_alc\", \"a\".\"decision_date\" AS \"decision_date\", \"a\".\"region_code\" AS \"application_region_code\", alcs.get_current_status_for_application_submission_by_uuid(\"as2\".\"uuid\") AS \"status\" FROM \"alcs\".\"application_submission\" \"as2\" INNER JOIN \"alcs\".\"application\" \"a\" ON \"a\".\"file_number\" = \"as2\".\"file_number\" AND \"a\".\"audit_deleted_date_at\" IS NULL INNER JOIN \"alcs\".\"application_type\" \"applicationType\" ON \"as2\".\"type_code\" = \"applicationType\".\"code\" AND \"applicationType\".\"audit_deleted_date_at\" IS NULL LEFT JOIN \"alcs\".\"local_government\" \"localGovernment\" ON \"as2\".\"local_government_uuid\" = \"localGovernment\".\"uuid\" AND \"localGovernment\".\"audit_deleted_date_at\" IS NULL WHERE \"as2\".\"audit_deleted_date_at\" IS NULL"]); + await queryRunner.query(`CREATE VIEW "alcs"."inbox_application_submission_view" AS SELECT "app_sub"."uuid" AS "uuid", "app_sub"."applicant" AS "applicant", "app"."uuid" AS "application_uuid", "applicationType"."audit_deleted_date_at" AS "applicationType_audit_deleted_date_at", "applicationType"."audit_created_at" AS "applicationType_audit_created_at", "applicationType"."audit_updated_at" AS "applicationType_audit_updated_at", "applicationType"."audit_created_by" AS "applicationType_audit_created_by", "applicationType"."audit_updated_by" AS "applicationType_audit_updated_by", "applicationType"."label" AS "applicationType_label", "applicationType"."code" AS "applicationType_code", "applicationType"."description" AS "applicationType_description", "applicationType"."short_label" AS "applicationType_short_label", "applicationType"."background_color" AS "applicationType_background_color", "applicationType"."text_color" AS "applicationType_text_color", "applicationType"."html_description" AS "applicationType_html_description", "applicationType"."portal_label" AS "applicationType_portal_label", "applicationType"."portal_order" AS "applicationType_portal_order", "applicationType"."requires_government_review" AS "applicationType_requires_government_review", "localGovernment"."name" AS "local_government_name", "app_sub"."file_number" AS "file_number", "app_sub"."created_by_uuid" AS "created_by_uuid", "app_sub"."local_government_uuid" AS "local_government_uuid", "app_sub"."audit_created_at" AS "created_at", "user"."bceid_business_guid" AS "bceid_business_guid", "app_sub"."type_code" AS "application_type_code", "app"."date_submitted_to_alc" AS "date_submitted_to_alc", "app_rev"."local_government_file_number" AS "local_government_file_number", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid") AS "status" FROM "alcs"."application_submission" "app_sub" INNER JOIN "alcs"."application" "app" ON "app"."file_number" = "app_sub"."file_number" AND "app"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."user" "user" ON "user"."uuid" = "app_sub"."created_by_uuid" AND "user"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."application_submission_review" "app_rev" ON "app"."file_number" = "app_rev"."application_file_number" AND "app_rev"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."application_type" "applicationType" ON "app_sub"."type_code" = "applicationType"."code" AND "applicationType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "app_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."application_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "app_sub"."uuid" LEFT JOIN (SELECT MAX("date") AS "date", application_uuid AS "application_uuid" FROM "alcs"."application_decision" "decision_date" WHERE "decision_date"."audit_deleted_date_at" IS NULL GROUP BY application_uuid) "decision_date" ON decision_date."application_uuid" = "app"."uuid" WHERE ( "app_sub"."is_draft" = FALSE ) AND ( "app_sub"."audit_deleted_date_at" IS NULL )`); + await queryRunner.query(`INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, ["alcs","VIEW","inbox_application_submission_view","SELECT \"app_sub\".\"uuid\" AS \"uuid\", \"app_sub\".\"applicant\" AS \"applicant\", \"app\".\"uuid\" AS \"application_uuid\", \"applicationType\".\"audit_deleted_date_at\" AS \"applicationType_audit_deleted_date_at\", \"applicationType\".\"audit_created_at\" AS \"applicationType_audit_created_at\", \"applicationType\".\"audit_updated_at\" AS \"applicationType_audit_updated_at\", \"applicationType\".\"audit_created_by\" AS \"applicationType_audit_created_by\", \"applicationType\".\"audit_updated_by\" AS \"applicationType_audit_updated_by\", \"applicationType\".\"label\" AS \"applicationType_label\", \"applicationType\".\"code\" AS \"applicationType_code\", \"applicationType\".\"description\" AS \"applicationType_description\", \"applicationType\".\"short_label\" AS \"applicationType_short_label\", \"applicationType\".\"background_color\" AS \"applicationType_background_color\", \"applicationType\".\"text_color\" AS \"applicationType_text_color\", \"applicationType\".\"html_description\" AS \"applicationType_html_description\", \"applicationType\".\"portal_label\" AS \"applicationType_portal_label\", \"applicationType\".\"portal_order\" AS \"applicationType_portal_order\", \"applicationType\".\"requires_government_review\" AS \"applicationType_requires_government_review\", \"localGovernment\".\"name\" AS \"local_government_name\", \"app_sub\".\"file_number\" AS \"file_number\", \"app_sub\".\"created_by_uuid\" AS \"created_by_uuid\", \"app_sub\".\"local_government_uuid\" AS \"local_government_uuid\", \"app_sub\".\"audit_created_at\" AS \"created_at\", \"user\".\"bceid_business_guid\" AS \"bceid_business_guid\", \"app_sub\".\"type_code\" AS \"application_type_code\", \"app\".\"date_submitted_to_alc\" AS \"date_submitted_to_alc\", \"app_rev\".\"local_government_file_number\" AS \"local_government_file_number\", GREATEST(status_link.effective_date, decision_date.date) AS \"last_update\", alcs.get_current_status_for_application_submission_by_uuid(\"app_sub\".\"uuid\") AS \"status\" FROM \"alcs\".\"application_submission\" \"app_sub\" INNER JOIN \"alcs\".\"application\" \"app\" ON \"app\".\"file_number\" = \"app_sub\".\"file_number\" AND \"app\".\"audit_deleted_date_at\" IS NULL LEFT JOIN \"alcs\".\"user\" \"user\" ON \"user\".\"uuid\" = \"app_sub\".\"created_by_uuid\" AND \"user\".\"audit_deleted_date_at\" IS NULL LEFT JOIN \"alcs\".\"application_submission_review\" \"app_rev\" ON \"app\".\"file_number\" = \"app_rev\".\"application_file_number\" AND \"app_rev\".\"audit_deleted_date_at\" IS NULL INNER JOIN \"alcs\".\"application_type\" \"applicationType\" ON \"app_sub\".\"type_code\" = \"applicationType\".\"code\" AND \"applicationType\".\"audit_deleted_date_at\" IS NULL LEFT JOIN \"alcs\".\"local_government\" \"localGovernment\" ON \"app_sub\".\"local_government_uuid\" = \"localGovernment\".\"uuid\" AND \"localGovernment\".\"audit_deleted_date_at\" IS NULL LEFT JOIN (SELECT MAX(\"effective_date\") AS \"effective_date\", submission_uuid AS \"submission_uuid\" FROM \"alcs\".\"application_submission_to_submission_status\" \"status_link\" GROUP BY submission_uuid) \"status_link\" ON status_link.\"submission_uuid\" = \"app_sub\".\"uuid\" LEFT JOIN (SELECT MAX(\"date\") AS \"date\", application_uuid AS \"application_uuid\" FROM \"alcs\".\"application_decision\" \"decision_date\" WHERE \"decision_date\".\"audit_deleted_date_at\" IS NULL GROUP BY application_uuid) \"decision_date\" ON decision_date.\"application_uuid\" = \"app\".\"uuid\" WHERE ( \"app_sub\".\"is_draft\" = FALSE ) AND ( \"app_sub\".\"audit_deleted_date_at\" IS NULL )"]); + await queryRunner.query(`CREATE VIEW "alcs"."public_application_submission_search_view" AS SELECT "app_sub"."uuid" AS "uuid", "app_sub"."applicant" AS "applicant", "app"."uuid" AS "application_uuid", "applicationType"."audit_deleted_date_at" AS "applicationType_audit_deleted_date_at", "applicationType"."audit_created_at" AS "applicationType_audit_created_at", "applicationType"."audit_updated_at" AS "applicationType_audit_updated_at", "applicationType"."audit_created_by" AS "applicationType_audit_created_by", "applicationType"."audit_updated_by" AS "applicationType_audit_updated_by", "applicationType"."label" AS "applicationType_label", "applicationType"."code" AS "applicationType_code", "applicationType"."description" AS "applicationType_description", "applicationType"."short_label" AS "applicationType_short_label", "applicationType"."background_color" AS "applicationType_background_color", "applicationType"."text_color" AS "applicationType_text_color", "applicationType"."html_description" AS "applicationType_html_description", "applicationType"."portal_label" AS "applicationType_portal_label", "applicationType"."portal_order" AS "applicationType_portal_order", "applicationType"."requires_government_review" AS "applicationType_requires_government_review", "localGovernment"."name" AS "local_government_name", "app_sub"."file_number" AS "file_number", "app_sub"."local_government_uuid" AS "local_government_uuid", "app_sub"."type_code" AS "application_type_code", "app"."date_submitted_to_alc" AS "date_submitted_to_alc", "app"."decision_date" AS "decision_date", decision_date.outcome AS "outcome", decision_date.dest_rank AS "dest_rank", "app"."region_code" AS "application_region_code", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid") AS "status" FROM "alcs"."application_submission" "app_sub" INNER JOIN "alcs"."application" "app" ON "app"."file_number" = "app_sub"."file_number" AND "app"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."application_type" "applicationType" ON "app_sub"."type_code" = "applicationType"."code" AND "applicationType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "app_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."application_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "app_sub"."uuid" LEFT JOIN (SELECT DISTINCT ON (application_uuid) decisiondate AS "date", outcome AS "outcome", dest_rank AS "dest_rank", applicationuuid AS "application_uuid" FROM "alcs"."application_decision" "decision_date", (SELECT outcome_code AS "outcome", date AS "decisiondate", application_uuid AS "applicationuuid", RANK() OVER (PARTITION BY application_uuid ORDER BY date DESC, audit_created_at DESC) AS "dest_rank" FROM "alcs"."application_decision" "decision" WHERE "decision"."audit_deleted_date_at" IS NULL) "decisions" WHERE dest_rank = 1) "decision_date" ON decision_date."application_uuid" = "app"."uuid" WHERE ( "app_sub"."is_draft" = FALSE AND ("app"."date_received_all_items" IS NOT NULL AND "app"."date_received_all_items" <= NOW()) AND alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid")->>'status_type_code' != 'CNCL' ) AND ( "app_sub"."audit_deleted_date_at" IS NULL )`); + await queryRunner.query(`INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, ["alcs","VIEW","public_application_submission_search_view","SELECT \"app_sub\".\"uuid\" AS \"uuid\", \"app_sub\".\"applicant\" AS \"applicant\", \"app\".\"uuid\" AS \"application_uuid\", \"applicationType\".\"audit_deleted_date_at\" AS \"applicationType_audit_deleted_date_at\", \"applicationType\".\"audit_created_at\" AS \"applicationType_audit_created_at\", \"applicationType\".\"audit_updated_at\" AS \"applicationType_audit_updated_at\", \"applicationType\".\"audit_created_by\" AS \"applicationType_audit_created_by\", \"applicationType\".\"audit_updated_by\" AS \"applicationType_audit_updated_by\", \"applicationType\".\"label\" AS \"applicationType_label\", \"applicationType\".\"code\" AS \"applicationType_code\", \"applicationType\".\"description\" AS \"applicationType_description\", \"applicationType\".\"short_label\" AS \"applicationType_short_label\", \"applicationType\".\"background_color\" AS \"applicationType_background_color\", \"applicationType\".\"text_color\" AS \"applicationType_text_color\", \"applicationType\".\"html_description\" AS \"applicationType_html_description\", \"applicationType\".\"portal_label\" AS \"applicationType_portal_label\", \"applicationType\".\"portal_order\" AS \"applicationType_portal_order\", \"applicationType\".\"requires_government_review\" AS \"applicationType_requires_government_review\", \"localGovernment\".\"name\" AS \"local_government_name\", \"app_sub\".\"file_number\" AS \"file_number\", \"app_sub\".\"local_government_uuid\" AS \"local_government_uuid\", \"app_sub\".\"type_code\" AS \"application_type_code\", \"app\".\"date_submitted_to_alc\" AS \"date_submitted_to_alc\", \"app\".\"decision_date\" AS \"decision_date\", decision_date.outcome AS \"outcome\", decision_date.dest_rank AS \"dest_rank\", \"app\".\"region_code\" AS \"application_region_code\", GREATEST(status_link.effective_date, decision_date.date) AS \"last_update\", alcs.get_current_status_for_application_submission_by_uuid(\"app_sub\".\"uuid\") AS \"status\" FROM \"alcs\".\"application_submission\" \"app_sub\" INNER JOIN \"alcs\".\"application\" \"app\" ON \"app\".\"file_number\" = \"app_sub\".\"file_number\" AND \"app\".\"audit_deleted_date_at\" IS NULL INNER JOIN \"alcs\".\"application_type\" \"applicationType\" ON \"app_sub\".\"type_code\" = \"applicationType\".\"code\" AND \"applicationType\".\"audit_deleted_date_at\" IS NULL LEFT JOIN \"alcs\".\"local_government\" \"localGovernment\" ON \"app_sub\".\"local_government_uuid\" = \"localGovernment\".\"uuid\" AND \"localGovernment\".\"audit_deleted_date_at\" IS NULL LEFT JOIN (SELECT MAX(\"effective_date\") AS \"effective_date\", submission_uuid AS \"submission_uuid\" FROM \"alcs\".\"application_submission_to_submission_status\" \"status_link\" GROUP BY submission_uuid) \"status_link\" ON status_link.\"submission_uuid\" = \"app_sub\".\"uuid\" LEFT JOIN (SELECT DISTINCT ON (application_uuid) decisiondate AS \"date\", outcome AS \"outcome\", dest_rank AS \"dest_rank\", applicationuuid AS \"application_uuid\" FROM \"alcs\".\"application_decision\" \"decision_date\", (SELECT outcome_code AS \"outcome\", date AS \"decisiondate\", application_uuid AS \"applicationuuid\", RANK() OVER (PARTITION BY application_uuid ORDER BY date DESC, audit_created_at DESC) AS \"dest_rank\" FROM \"alcs\".\"application_decision\" \"decision\" WHERE \"decision\".\"audit_deleted_date_at\" IS NULL) \"decisions\" WHERE dest_rank = 1) \"decision_date\" ON decision_date.\"application_uuid\" = \"app\".\"uuid\" WHERE ( \"app_sub\".\"is_draft\" = FALSE AND (\"app\".\"date_received_all_items\" IS NOT NULL AND \"app\".\"date_received_all_items\" <= NOW()) AND alcs.get_current_status_for_application_submission_by_uuid(\"app_sub\".\"uuid\")->>'status_type_code' != 'CNCL' ) AND ( \"app_sub\".\"audit_deleted_date_at\" IS NULL )"]); + await queryRunner.query(`CREATE VIEW "alcs"."public_notice_of_intent_submission_search_view" AS SELECT "noi_sub"."uuid" AS "uuid", "noi_sub"."applicant" AS "applicant", "noi"."uuid" AS "notice_of_intent_uuid", "noticeOfIntentType"."audit_deleted_date_at" AS "noticeOfIntentType_audit_deleted_date_at", "noticeOfIntentType"."audit_created_at" AS "noticeOfIntentType_audit_created_at", "noticeOfIntentType"."audit_updated_at" AS "noticeOfIntentType_audit_updated_at", "noticeOfIntentType"."audit_created_by" AS "noticeOfIntentType_audit_created_by", "noticeOfIntentType"."audit_updated_by" AS "noticeOfIntentType_audit_updated_by", "noticeOfIntentType"."label" AS "noticeOfIntentType_label", "noticeOfIntentType"."code" AS "noticeOfIntentType_code", "noticeOfIntentType"."description" AS "noticeOfIntentType_description", "noticeOfIntentType"."short_label" AS "noticeOfIntentType_short_label", "noticeOfIntentType"."background_color" AS "noticeOfIntentType_background_color", "noticeOfIntentType"."text_color" AS "noticeOfIntentType_text_color", "noticeOfIntentType"."html_description" AS "noticeOfIntentType_html_description", "noticeOfIntentType"."portal_label" AS "noticeOfIntentType_portal_label", "localGovernment"."name" AS "local_government_name", "noi_sub"."file_number" AS "file_number", "noi_sub"."local_government_uuid" AS "local_government_uuid", "noi_sub"."type_code" AS "notice_of_intent_type_code", "noi"."date_submitted_to_alc" AS "date_submitted_to_alc", "noi"."decision_date" AS "decision_date", decision_date.outcome AS "outcome", decision_date.dest_rank AS "dest_rank", "noi"."region_code" AS "notice_of_intent_region_code", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid") AS "status" FROM "alcs"."notice_of_intent_submission" "noi_sub" INNER JOIN "alcs"."notice_of_intent" "noi" ON "noi"."file_number" = "noi_sub"."file_number" AND "noi"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."notice_of_intent_type" "noticeOfIntentType" ON "noi_sub"."type_code" = "noticeOfIntentType"."code" AND "noticeOfIntentType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "noi_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."notice_of_intent_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "noi_sub"."uuid" LEFT JOIN (SELECT DISTINCT ON (notice_of_intentuuid) decisiondate AS "date", outcome AS "outcome", dest_rank AS "dest_rank", notice_of_intentuuid AS "notice_of_intent_uuid" FROM "alcs"."notice_of_intent_decision" "decision_date", (SELECT outcome_code AS "outcome", date AS "decisiondate", notice_of_intent_uuid AS "notice_of_intentuuid", RANK() OVER (PARTITION BY notice_of_intent_uuid ORDER BY date DESC, audit_created_at DESC) AS "dest_rank" FROM "alcs"."notice_of_intent_decision" "decision" WHERE "decision"."audit_deleted_date_at" IS NULL) "decisions" WHERE dest_rank = 1) "decision_date" ON decision_date."notice_of_intent_uuid" = "noi"."uuid" WHERE ( "noi_sub"."is_draft" = FALSE AND ("noi"."date_received_all_items" IS NOT NULL AND "noi"."date_received_all_items" <= NOW()) AND alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid")->>'status_type_code' != 'CNCL' AND decision_date.dest_rank = 1 ) AND ( "noi_sub"."audit_deleted_date_at" IS NULL )`); + await queryRunner.query(`INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, ["alcs","VIEW","public_notice_of_intent_submission_search_view","SELECT \"noi_sub\".\"uuid\" AS \"uuid\", \"noi_sub\".\"applicant\" AS \"applicant\", \"noi\".\"uuid\" AS \"notice_of_intent_uuid\", \"noticeOfIntentType\".\"audit_deleted_date_at\" AS \"noticeOfIntentType_audit_deleted_date_at\", \"noticeOfIntentType\".\"audit_created_at\" AS \"noticeOfIntentType_audit_created_at\", \"noticeOfIntentType\".\"audit_updated_at\" AS \"noticeOfIntentType_audit_updated_at\", \"noticeOfIntentType\".\"audit_created_by\" AS \"noticeOfIntentType_audit_created_by\", \"noticeOfIntentType\".\"audit_updated_by\" AS \"noticeOfIntentType_audit_updated_by\", \"noticeOfIntentType\".\"label\" AS \"noticeOfIntentType_label\", \"noticeOfIntentType\".\"code\" AS \"noticeOfIntentType_code\", \"noticeOfIntentType\".\"description\" AS \"noticeOfIntentType_description\", \"noticeOfIntentType\".\"short_label\" AS \"noticeOfIntentType_short_label\", \"noticeOfIntentType\".\"background_color\" AS \"noticeOfIntentType_background_color\", \"noticeOfIntentType\".\"text_color\" AS \"noticeOfIntentType_text_color\", \"noticeOfIntentType\".\"html_description\" AS \"noticeOfIntentType_html_description\", \"noticeOfIntentType\".\"portal_label\" AS \"noticeOfIntentType_portal_label\", \"localGovernment\".\"name\" AS \"local_government_name\", \"noi_sub\".\"file_number\" AS \"file_number\", \"noi_sub\".\"local_government_uuid\" AS \"local_government_uuid\", \"noi_sub\".\"type_code\" AS \"notice_of_intent_type_code\", \"noi\".\"date_submitted_to_alc\" AS \"date_submitted_to_alc\", \"noi\".\"decision_date\" AS \"decision_date\", decision_date.outcome AS \"outcome\", decision_date.dest_rank AS \"dest_rank\", \"noi\".\"region_code\" AS \"notice_of_intent_region_code\", GREATEST(status_link.effective_date, decision_date.date) AS \"last_update\", alcs.get_current_status_for_notice_of_intent_submission_by_uuid(\"noi_sub\".\"uuid\") AS \"status\" FROM \"alcs\".\"notice_of_intent_submission\" \"noi_sub\" INNER JOIN \"alcs\".\"notice_of_intent\" \"noi\" ON \"noi\".\"file_number\" = \"noi_sub\".\"file_number\" AND \"noi\".\"audit_deleted_date_at\" IS NULL INNER JOIN \"alcs\".\"notice_of_intent_type\" \"noticeOfIntentType\" ON \"noi_sub\".\"type_code\" = \"noticeOfIntentType\".\"code\" AND \"noticeOfIntentType\".\"audit_deleted_date_at\" IS NULL LEFT JOIN \"alcs\".\"local_government\" \"localGovernment\" ON \"noi_sub\".\"local_government_uuid\" = \"localGovernment\".\"uuid\" AND \"localGovernment\".\"audit_deleted_date_at\" IS NULL LEFT JOIN (SELECT MAX(\"effective_date\") AS \"effective_date\", submission_uuid AS \"submission_uuid\" FROM \"alcs\".\"notice_of_intent_submission_to_submission_status\" \"status_link\" GROUP BY submission_uuid) \"status_link\" ON status_link.\"submission_uuid\" = \"noi_sub\".\"uuid\" LEFT JOIN (SELECT DISTINCT ON (notice_of_intentuuid) decisiondate AS \"date\", outcome AS \"outcome\", dest_rank AS \"dest_rank\", notice_of_intentuuid AS \"notice_of_intent_uuid\" FROM \"alcs\".\"notice_of_intent_decision\" \"decision_date\", (SELECT outcome_code AS \"outcome\", date AS \"decisiondate\", notice_of_intent_uuid AS \"notice_of_intentuuid\", RANK() OVER (PARTITION BY notice_of_intent_uuid ORDER BY date DESC, audit_created_at DESC) AS \"dest_rank\" FROM \"alcs\".\"notice_of_intent_decision\" \"decision\" WHERE \"decision\".\"audit_deleted_date_at\" IS NULL) \"decisions\" WHERE dest_rank = 1) \"decision_date\" ON decision_date.\"notice_of_intent_uuid\" = \"noi\".\"uuid\" WHERE ( \"noi_sub\".\"is_draft\" = FALSE AND (\"noi\".\"date_received_all_items\" IS NOT NULL AND \"noi\".\"date_received_all_items\" <= NOW()) AND alcs.get_current_status_for_notice_of_intent_submission_by_uuid(\"noi_sub\".\"uuid\")->>'status_type_code' != 'CNCL' AND decision_date.dest_rank = 1 ) AND ( \"noi_sub\".\"audit_deleted_date_at\" IS NULL )"]); + } + + public async down(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query(`DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, ["VIEW","public_notice_of_intent_submission_search_view","alcs"]); + await queryRunner.query(`DROP VIEW "alcs"."public_notice_of_intent_submission_search_view"`); + await queryRunner.query(`DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, ["VIEW","public_application_submission_search_view","alcs"]); + await queryRunner.query(`DROP VIEW "alcs"."public_application_submission_search_view"`); + await queryRunner.query(`DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, ["VIEW","inbox_application_submission_view","alcs"]); + await queryRunner.query(`DROP VIEW "alcs"."inbox_application_submission_view"`); + await queryRunner.query(`DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, ["VIEW","application_submission_search_view","alcs"]); + await queryRunner.query(`DROP VIEW "alcs"."application_submission_search_view"`); + await queryRunner.query(`CREATE VIEW "alcs"."inbox_application_submission_view" AS SELECT "app_sub"."uuid" AS "uuid", "app_sub"."applicant" AS "applicant", "app"."uuid" AS "application_uuid", "applicationType"."audit_deleted_date_at" AS "applicationType_audit_deleted_date_at", "applicationType"."audit_created_at" AS "applicationType_audit_created_at", "applicationType"."audit_updated_at" AS "applicationType_audit_updated_at", "applicationType"."audit_created_by" AS "applicationType_audit_created_by", "applicationType"."audit_updated_by" AS "applicationType_audit_updated_by", "applicationType"."label" AS "applicationType_label", "applicationType"."code" AS "applicationType_code", "applicationType"."description" AS "applicationType_description", "applicationType"."short_label" AS "applicationType_short_label", "applicationType"."background_color" AS "applicationType_background_color", "applicationType"."text_color" AS "applicationType_text_color", "applicationType"."html_description" AS "applicationType_html_description", "applicationType"."portal_label" AS "applicationType_portal_label", "localGovernment"."name" AS "local_government_name", "app_sub"."file_number" AS "file_number", "app_sub"."created_by_uuid" AS "created_by_uuid", "app_sub"."local_government_uuid" AS "local_government_uuid", "app_sub"."audit_created_at" AS "created_at", "user"."bceid_business_guid" AS "bceid_business_guid", "app_sub"."type_code" AS "application_type_code", "app"."date_submitted_to_alc" AS "date_submitted_to_alc", "app_rev"."local_government_file_number" AS "local_government_file_number", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid") AS "status" FROM "alcs"."application_submission" "app_sub" INNER JOIN "alcs"."application" "app" ON "app"."file_number" = "app_sub"."file_number" AND "app"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."user" "user" ON "user"."uuid" = "app_sub"."created_by_uuid" AND "user"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."application_submission_review" "app_rev" ON "app"."file_number" = "app_rev"."application_file_number" AND "app_rev"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."application_type" "applicationType" ON "app_sub"."type_code" = "applicationType"."code" AND "applicationType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "app_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."application_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "app_sub"."uuid" LEFT JOIN (SELECT MAX("date") AS "date", application_uuid AS "application_uuid" FROM "alcs"."application_decision" "decision_date" WHERE "decision_date"."audit_deleted_date_at" IS NULL GROUP BY application_uuid) "decision_date" ON decision_date."application_uuid" = "app"."uuid" WHERE ( "app_sub"."is_draft" = FALSE ) AND ( "app_sub"."audit_deleted_date_at" IS NULL )`); + await queryRunner.query(`INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, ["alcs","VIEW","inbox_application_submission_view","SELECT \"app_sub\".\"uuid\" AS \"uuid\", \"app_sub\".\"applicant\" AS \"applicant\", \"app\".\"uuid\" AS \"application_uuid\", \"applicationType\".\"audit_deleted_date_at\" AS \"applicationType_audit_deleted_date_at\", \"applicationType\".\"audit_created_at\" AS \"applicationType_audit_created_at\", \"applicationType\".\"audit_updated_at\" AS \"applicationType_audit_updated_at\", \"applicationType\".\"audit_created_by\" AS \"applicationType_audit_created_by\", \"applicationType\".\"audit_updated_by\" AS \"applicationType_audit_updated_by\", \"applicationType\".\"label\" AS \"applicationType_label\", \"applicationType\".\"code\" AS \"applicationType_code\", \"applicationType\".\"description\" AS \"applicationType_description\", \"applicationType\".\"short_label\" AS \"applicationType_short_label\", \"applicationType\".\"background_color\" AS \"applicationType_background_color\", \"applicationType\".\"text_color\" AS \"applicationType_text_color\", \"applicationType\".\"html_description\" AS \"applicationType_html_description\", \"applicationType\".\"portal_label\" AS \"applicationType_portal_label\", \"localGovernment\".\"name\" AS \"local_government_name\", \"app_sub\".\"file_number\" AS \"file_number\", \"app_sub\".\"created_by_uuid\" AS \"created_by_uuid\", \"app_sub\".\"local_government_uuid\" AS \"local_government_uuid\", \"app_sub\".\"audit_created_at\" AS \"created_at\", \"user\".\"bceid_business_guid\" AS \"bceid_business_guid\", \"app_sub\".\"type_code\" AS \"application_type_code\", \"app\".\"date_submitted_to_alc\" AS \"date_submitted_to_alc\", \"app_rev\".\"local_government_file_number\" AS \"local_government_file_number\", GREATEST(status_link.effective_date, decision_date.date) AS \"last_update\", alcs.get_current_status_for_application_submission_by_uuid(\"app_sub\".\"uuid\") AS \"status\" FROM \"alcs\".\"application_submission\" \"app_sub\" INNER JOIN \"alcs\".\"application\" \"app\" ON \"app\".\"file_number\" = \"app_sub\".\"file_number\" AND \"app\".\"audit_deleted_date_at\" IS NULL LEFT JOIN \"alcs\".\"user\" \"user\" ON \"user\".\"uuid\" = \"app_sub\".\"created_by_uuid\" AND \"user\".\"audit_deleted_date_at\" IS NULL LEFT JOIN \"alcs\".\"application_submission_review\" \"app_rev\" ON \"app\".\"file_number\" = \"app_rev\".\"application_file_number\" AND \"app_rev\".\"audit_deleted_date_at\" IS NULL INNER JOIN \"alcs\".\"application_type\" \"applicationType\" ON \"app_sub\".\"type_code\" = \"applicationType\".\"code\" AND \"applicationType\".\"audit_deleted_date_at\" IS NULL LEFT JOIN \"alcs\".\"local_government\" \"localGovernment\" ON \"app_sub\".\"local_government_uuid\" = \"localGovernment\".\"uuid\" AND \"localGovernment\".\"audit_deleted_date_at\" IS NULL LEFT JOIN (SELECT MAX(\"effective_date\") AS \"effective_date\", submission_uuid AS \"submission_uuid\" FROM \"alcs\".\"application_submission_to_submission_status\" \"status_link\" GROUP BY submission_uuid) \"status_link\" ON status_link.\"submission_uuid\" = \"app_sub\".\"uuid\" LEFT JOIN (SELECT MAX(\"date\") AS \"date\", application_uuid AS \"application_uuid\" FROM \"alcs\".\"application_decision\" \"decision_date\" WHERE \"decision_date\".\"audit_deleted_date_at\" IS NULL GROUP BY application_uuid) \"decision_date\" ON decision_date.\"application_uuid\" = \"app\".\"uuid\" WHERE ( \"app_sub\".\"is_draft\" = FALSE ) AND ( \"app_sub\".\"audit_deleted_date_at\" IS NULL )"]); + await queryRunner.query(`CREATE VIEW "alcs"."application_submission_search_view" AS SELECT "as2"."uuid" AS "uuid", "as2"."applicant" AS "applicant", "a"."uuid" AS "application_uuid", "applicationType"."audit_deleted_date_at" AS "applicationType_audit_deleted_date_at", "applicationType"."audit_created_at" AS "applicationType_audit_created_at", "applicationType"."audit_updated_at" AS "applicationType_audit_updated_at", "applicationType"."audit_created_by" AS "applicationType_audit_created_by", "applicationType"."audit_updated_by" AS "applicationType_audit_updated_by", "applicationType"."label" AS "applicationType_label", "applicationType"."code" AS "applicationType_code", "applicationType"."description" AS "applicationType_description", "applicationType"."short_label" AS "applicationType_short_label", "applicationType"."background_color" AS "applicationType_background_color", "applicationType"."text_color" AS "applicationType_text_color", "applicationType"."html_description" AS "applicationType_html_description", "applicationType"."portal_label" AS "applicationType_portal_label", "localGovernment"."name" AS "local_government_name", "as2"."file_number" AS "file_number", "as2"."local_government_uuid" AS "local_government_uuid", "as2"."type_code" AS "application_type_code", "as2"."is_draft" AS "is_draft", "a"."legacy_id" AS "legacy_id", "a"."date_submitted_to_alc" AS "date_submitted_to_alc", "a"."decision_date" AS "decision_date", "a"."region_code" AS "application_region_code", alcs.get_current_status_for_application_submission_by_uuid("as2"."uuid") AS "status" FROM "alcs"."application_submission" "as2" INNER JOIN "alcs"."application" "a" ON "a"."file_number" = "as2"."file_number" AND "a"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."application_type" "applicationType" ON "as2"."type_code" = "applicationType"."code" AND "applicationType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "as2"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL WHERE "as2"."audit_deleted_date_at" IS NULL`); + await queryRunner.query(`INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, ["alcs","VIEW","application_submission_search_view","SELECT \"as2\".\"uuid\" AS \"uuid\", \"as2\".\"applicant\" AS \"applicant\", \"a\".\"uuid\" AS \"application_uuid\", \"applicationType\".\"audit_deleted_date_at\" AS \"applicationType_audit_deleted_date_at\", \"applicationType\".\"audit_created_at\" AS \"applicationType_audit_created_at\", \"applicationType\".\"audit_updated_at\" AS \"applicationType_audit_updated_at\", \"applicationType\".\"audit_created_by\" AS \"applicationType_audit_created_by\", \"applicationType\".\"audit_updated_by\" AS \"applicationType_audit_updated_by\", \"applicationType\".\"label\" AS \"applicationType_label\", \"applicationType\".\"code\" AS \"applicationType_code\", \"applicationType\".\"description\" AS \"applicationType_description\", \"applicationType\".\"short_label\" AS \"applicationType_short_label\", \"applicationType\".\"background_color\" AS \"applicationType_background_color\", \"applicationType\".\"text_color\" AS \"applicationType_text_color\", \"applicationType\".\"html_description\" AS \"applicationType_html_description\", \"applicationType\".\"portal_label\" AS \"applicationType_portal_label\", \"localGovernment\".\"name\" AS \"local_government_name\", \"as2\".\"file_number\" AS \"file_number\", \"as2\".\"local_government_uuid\" AS \"local_government_uuid\", \"as2\".\"type_code\" AS \"application_type_code\", \"as2\".\"is_draft\" AS \"is_draft\", \"a\".\"legacy_id\" AS \"legacy_id\", \"a\".\"date_submitted_to_alc\" AS \"date_submitted_to_alc\", \"a\".\"decision_date\" AS \"decision_date\", \"a\".\"region_code\" AS \"application_region_code\", alcs.get_current_status_for_application_submission_by_uuid(\"as2\".\"uuid\") AS \"status\" FROM \"alcs\".\"application_submission\" \"as2\" INNER JOIN \"alcs\".\"application\" \"a\" ON \"a\".\"file_number\" = \"as2\".\"file_number\" AND \"a\".\"audit_deleted_date_at\" IS NULL INNER JOIN \"alcs\".\"application_type\" \"applicationType\" ON \"as2\".\"type_code\" = \"applicationType\".\"code\" AND \"applicationType\".\"audit_deleted_date_at\" IS NULL LEFT JOIN \"alcs\".\"local_government\" \"localGovernment\" ON \"as2\".\"local_government_uuid\" = \"localGovernment\".\"uuid\" AND \"localGovernment\".\"audit_deleted_date_at\" IS NULL WHERE \"as2\".\"audit_deleted_date_at\" IS NULL"]); + await queryRunner.query(`CREATE VIEW "alcs"."public_application_submission_search_view" AS SELECT "app_sub"."uuid" AS "uuid", "app_sub"."applicant" AS "applicant", "app"."uuid" AS "application_uuid", "applicationType"."audit_deleted_date_at" AS "applicationType_audit_deleted_date_at", "applicationType"."audit_created_at" AS "applicationType_audit_created_at", "applicationType"."audit_updated_at" AS "applicationType_audit_updated_at", "applicationType"."audit_created_by" AS "applicationType_audit_created_by", "applicationType"."audit_updated_by" AS "applicationType_audit_updated_by", "applicationType"."label" AS "applicationType_label", "applicationType"."code" AS "applicationType_code", "applicationType"."description" AS "applicationType_description", "applicationType"."short_label" AS "applicationType_short_label", "applicationType"."background_color" AS "applicationType_background_color", "applicationType"."text_color" AS "applicationType_text_color", "applicationType"."html_description" AS "applicationType_html_description", "applicationType"."portal_label" AS "applicationType_portal_label", "applicationType"."portal_order" AS "applicationType_portal_order", "applicationType"."requires_government_review" AS "applicationType_requires_government_review", "localGovernment"."name" AS "local_government_name", "app_sub"."file_number" AS "file_number", "app_sub"."local_government_uuid" AS "local_government_uuid", "app_sub"."type_code" AS "application_type_code", "app"."date_submitted_to_alc" AS "date_submitted_to_alc", "app"."decision_date" AS "decision_date", decision_date.outcome AS "outcome", "app"."region_code" AS "application_region_code", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid") AS "status" FROM "alcs"."application_submission" "app_sub" INNER JOIN "alcs"."application" "app" ON "app"."file_number" = "app_sub"."file_number" AND "app"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."application_type" "applicationType" ON "app_sub"."type_code" = "applicationType"."code" AND "applicationType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "app_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."application_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "app_sub"."uuid" LEFT JOIN (SELECT MAX("date") AS "date", outcome_code AS "outcome", application_uuid AS "application_uuid" FROM "alcs"."application_decision" "decision_date" WHERE "decision_date"."audit_deleted_date_at" IS NULL GROUP BY application_uuid, outcome) "decision_date" ON decision_date."application_uuid" = "app"."uuid" WHERE ( "app_sub"."is_draft" = FALSE AND ("app"."date_received_all_items" IS NOT NULL AND "app"."date_received_all_items" <= NOW()) AND alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid")->>'status_type_code' != 'CNCL' ) AND ( "app_sub"."audit_deleted_date_at" IS NULL )`); + await queryRunner.query(`INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, ["alcs","VIEW","public_application_submission_search_view","SELECT \"app_sub\".\"uuid\" AS \"uuid\", \"app_sub\".\"applicant\" AS \"applicant\", \"app\".\"uuid\" AS \"application_uuid\", \"applicationType\".\"audit_deleted_date_at\" AS \"applicationType_audit_deleted_date_at\", \"applicationType\".\"audit_created_at\" AS \"applicationType_audit_created_at\", \"applicationType\".\"audit_updated_at\" AS \"applicationType_audit_updated_at\", \"applicationType\".\"audit_created_by\" AS \"applicationType_audit_created_by\", \"applicationType\".\"audit_updated_by\" AS \"applicationType_audit_updated_by\", \"applicationType\".\"label\" AS \"applicationType_label\", \"applicationType\".\"code\" AS \"applicationType_code\", \"applicationType\".\"description\" AS \"applicationType_description\", \"applicationType\".\"short_label\" AS \"applicationType_short_label\", \"applicationType\".\"background_color\" AS \"applicationType_background_color\", \"applicationType\".\"text_color\" AS \"applicationType_text_color\", \"applicationType\".\"html_description\" AS \"applicationType_html_description\", \"applicationType\".\"portal_label\" AS \"applicationType_portal_label\", \"applicationType\".\"portal_order\" AS \"applicationType_portal_order\", \"applicationType\".\"requires_government_review\" AS \"applicationType_requires_government_review\", \"localGovernment\".\"name\" AS \"local_government_name\", \"app_sub\".\"file_number\" AS \"file_number\", \"app_sub\".\"local_government_uuid\" AS \"local_government_uuid\", \"app_sub\".\"type_code\" AS \"application_type_code\", \"app\".\"date_submitted_to_alc\" AS \"date_submitted_to_alc\", \"app\".\"decision_date\" AS \"decision_date\", decision_date.outcome AS \"outcome\", \"app\".\"region_code\" AS \"application_region_code\", GREATEST(status_link.effective_date, decision_date.date) AS \"last_update\", alcs.get_current_status_for_application_submission_by_uuid(\"app_sub\".\"uuid\") AS \"status\" FROM \"alcs\".\"application_submission\" \"app_sub\" INNER JOIN \"alcs\".\"application\" \"app\" ON \"app\".\"file_number\" = \"app_sub\".\"file_number\" AND \"app\".\"audit_deleted_date_at\" IS NULL INNER JOIN \"alcs\".\"application_type\" \"applicationType\" ON \"app_sub\".\"type_code\" = \"applicationType\".\"code\" AND \"applicationType\".\"audit_deleted_date_at\" IS NULL LEFT JOIN \"alcs\".\"local_government\" \"localGovernment\" ON \"app_sub\".\"local_government_uuid\" = \"localGovernment\".\"uuid\" AND \"localGovernment\".\"audit_deleted_date_at\" IS NULL LEFT JOIN (SELECT MAX(\"effective_date\") AS \"effective_date\", submission_uuid AS \"submission_uuid\" FROM \"alcs\".\"application_submission_to_submission_status\" \"status_link\" GROUP BY submission_uuid) \"status_link\" ON status_link.\"submission_uuid\" = \"app_sub\".\"uuid\" LEFT JOIN (SELECT MAX(\"date\") AS \"date\", outcome_code AS \"outcome\", application_uuid AS \"application_uuid\" FROM \"alcs\".\"application_decision\" \"decision_date\" WHERE \"decision_date\".\"audit_deleted_date_at\" IS NULL GROUP BY application_uuid, outcome) \"decision_date\" ON decision_date.\"application_uuid\" = \"app\".\"uuid\" WHERE ( \"app_sub\".\"is_draft\" = FALSE AND (\"app\".\"date_received_all_items\" IS NOT NULL AND \"app\".\"date_received_all_items\" <= NOW()) AND alcs.get_current_status_for_application_submission_by_uuid(\"app_sub\".\"uuid\")->>'status_type_code' != 'CNCL' ) AND ( \"app_sub\".\"audit_deleted_date_at\" IS NULL )"]); + await queryRunner.query(`CREATE VIEW "alcs"."public_notice_of_intent_submission_search_view" AS SELECT "noi_sub"."uuid" AS "uuid", "noi_sub"."applicant" AS "applicant", "noi"."uuid" AS "notice_of_intent_uuid", "noticeOfIntentType"."audit_deleted_date_at" AS "noticeOfIntentType_audit_deleted_date_at", "noticeOfIntentType"."audit_created_at" AS "noticeOfIntentType_audit_created_at", "noticeOfIntentType"."audit_updated_at" AS "noticeOfIntentType_audit_updated_at", "noticeOfIntentType"."audit_created_by" AS "noticeOfIntentType_audit_created_by", "noticeOfIntentType"."audit_updated_by" AS "noticeOfIntentType_audit_updated_by", "noticeOfIntentType"."label" AS "noticeOfIntentType_label", "noticeOfIntentType"."code" AS "noticeOfIntentType_code", "noticeOfIntentType"."description" AS "noticeOfIntentType_description", "noticeOfIntentType"."short_label" AS "noticeOfIntentType_short_label", "noticeOfIntentType"."background_color" AS "noticeOfIntentType_background_color", "noticeOfIntentType"."text_color" AS "noticeOfIntentType_text_color", "noticeOfIntentType"."html_description" AS "noticeOfIntentType_html_description", "noticeOfIntentType"."portal_label" AS "noticeOfIntentType_portal_label", "localGovernment"."name" AS "local_government_name", "noi_sub"."file_number" AS "file_number", "noi_sub"."local_government_uuid" AS "local_government_uuid", "noi_sub"."type_code" AS "notice_of_intent_type_code", "noi"."date_submitted_to_alc" AS "date_submitted_to_alc", "noi"."decision_date" AS "decision_date", decision_date.outcome AS "outcome", "noi"."region_code" AS "notice_of_intent_region_code", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid") AS "status" FROM "alcs"."notice_of_intent_submission" "noi_sub" INNER JOIN "alcs"."notice_of_intent" "noi" ON "noi"."file_number" = "noi_sub"."file_number" AND "noi"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."notice_of_intent_type" "noticeOfIntentType" ON "noi_sub"."type_code" = "noticeOfIntentType"."code" AND "noticeOfIntentType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "noi_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."notice_of_intent_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "noi_sub"."uuid" LEFT JOIN (SELECT MAX("date") AS "date", outcome_code AS "outcome", notice_of_intent_uuid AS "notice_of_intent_uuid" FROM "alcs"."notice_of_intent_decision" "decision_date" WHERE "decision_date"."audit_deleted_date_at" IS NULL GROUP BY notice_of_intent_uuid, outcome) "decision_date" ON decision_date."notice_of_intent_uuid" = "noi"."uuid" WHERE ( "noi_sub"."is_draft" = FALSE AND ("noi"."date_received_all_items" IS NOT NULL AND "noi"."date_received_all_items" <= NOW()) AND alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid")->>'status_type_code' != 'CNCL' ) AND ( "noi_sub"."audit_deleted_date_at" IS NULL )`); + await queryRunner.query(`INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, ["alcs","VIEW","public_notice_of_intent_submission_search_view","SELECT \"noi_sub\".\"uuid\" AS \"uuid\", \"noi_sub\".\"applicant\" AS \"applicant\", \"noi\".\"uuid\" AS \"notice_of_intent_uuid\", \"noticeOfIntentType\".\"audit_deleted_date_at\" AS \"noticeOfIntentType_audit_deleted_date_at\", \"noticeOfIntentType\".\"audit_created_at\" AS \"noticeOfIntentType_audit_created_at\", \"noticeOfIntentType\".\"audit_updated_at\" AS \"noticeOfIntentType_audit_updated_at\", \"noticeOfIntentType\".\"audit_created_by\" AS \"noticeOfIntentType_audit_created_by\", \"noticeOfIntentType\".\"audit_updated_by\" AS \"noticeOfIntentType_audit_updated_by\", \"noticeOfIntentType\".\"label\" AS \"noticeOfIntentType_label\", \"noticeOfIntentType\".\"code\" AS \"noticeOfIntentType_code\", \"noticeOfIntentType\".\"description\" AS \"noticeOfIntentType_description\", \"noticeOfIntentType\".\"short_label\" AS \"noticeOfIntentType_short_label\", \"noticeOfIntentType\".\"background_color\" AS \"noticeOfIntentType_background_color\", \"noticeOfIntentType\".\"text_color\" AS \"noticeOfIntentType_text_color\", \"noticeOfIntentType\".\"html_description\" AS \"noticeOfIntentType_html_description\", \"noticeOfIntentType\".\"portal_label\" AS \"noticeOfIntentType_portal_label\", \"localGovernment\".\"name\" AS \"local_government_name\", \"noi_sub\".\"file_number\" AS \"file_number\", \"noi_sub\".\"local_government_uuid\" AS \"local_government_uuid\", \"noi_sub\".\"type_code\" AS \"notice_of_intent_type_code\", \"noi\".\"date_submitted_to_alc\" AS \"date_submitted_to_alc\", \"noi\".\"decision_date\" AS \"decision_date\", decision_date.outcome AS \"outcome\", \"noi\".\"region_code\" AS \"notice_of_intent_region_code\", GREATEST(status_link.effective_date, decision_date.date) AS \"last_update\", alcs.get_current_status_for_notice_of_intent_submission_by_uuid(\"noi_sub\".\"uuid\") AS \"status\" FROM \"alcs\".\"notice_of_intent_submission\" \"noi_sub\" INNER JOIN \"alcs\".\"notice_of_intent\" \"noi\" ON \"noi\".\"file_number\" = \"noi_sub\".\"file_number\" AND \"noi\".\"audit_deleted_date_at\" IS NULL INNER JOIN \"alcs\".\"notice_of_intent_type\" \"noticeOfIntentType\" ON \"noi_sub\".\"type_code\" = \"noticeOfIntentType\".\"code\" AND \"noticeOfIntentType\".\"audit_deleted_date_at\" IS NULL LEFT JOIN \"alcs\".\"local_government\" \"localGovernment\" ON \"noi_sub\".\"local_government_uuid\" = \"localGovernment\".\"uuid\" AND \"localGovernment\".\"audit_deleted_date_at\" IS NULL LEFT JOIN (SELECT MAX(\"effective_date\") AS \"effective_date\", submission_uuid AS \"submission_uuid\" FROM \"alcs\".\"notice_of_intent_submission_to_submission_status\" \"status_link\" GROUP BY submission_uuid) \"status_link\" ON status_link.\"submission_uuid\" = \"noi_sub\".\"uuid\" LEFT JOIN (SELECT MAX(\"date\") AS \"date\", outcome_code AS \"outcome\", notice_of_intent_uuid AS \"notice_of_intent_uuid\" FROM \"alcs\".\"notice_of_intent_decision\" \"decision_date\" WHERE \"decision_date\".\"audit_deleted_date_at\" IS NULL GROUP BY notice_of_intent_uuid, outcome) \"decision_date\" ON decision_date.\"notice_of_intent_uuid\" = \"noi\".\"uuid\" WHERE ( \"noi_sub\".\"is_draft\" = FALSE AND (\"noi\".\"date_received_all_items\" IS NOT NULL AND \"noi\".\"date_received_all_items\" <= NOW()) AND alcs.get_current_status_for_notice_of_intent_submission_by_uuid(\"noi_sub\".\"uuid\")->>'status_type_code' != 'CNCL' ) AND ( \"noi_sub\".\"audit_deleted_date_at\" IS NULL )"]); + } + +} From c76b794a003ca4576dc1a38fdd7d7e78074db9df Mon Sep 17 00:00:00 2001 From: Liam Stoddard <lstodd@protonmail.com> Date: Mon, 20 Nov 2023 18:06:23 -0800 Subject: [PATCH 669/954] prevention for duplicate user guids --- bin/migrate-oats-data/sql/common/init_users.sql | 4 +++- bin/migrate-oats-data/sql/common/init_users_count.sql | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/bin/migrate-oats-data/sql/common/init_users.sql b/bin/migrate-oats-data/sql/common/init_users.sql index 8ea75fca0f..43de92c03f 100644 --- a/bin/migrate-oats-data/sql/common/init_users.sql +++ b/bin/migrate-oats-data/sql/common/init_users.sql @@ -2,5 +2,7 @@ SELECT DISTINCT oaa.created_guid FROM oats.oats_alr_applications oaa + LEFT JOIN alcs."user" u ON oaa.created_guid = u.bceid_guid WHERE - oaa.created_guid IS NOT NULL \ No newline at end of file + oaa.created_guid IS NOT NULL + AND u.bceid_guid IS NULL \ No newline at end of file diff --git a/bin/migrate-oats-data/sql/common/init_users_count.sql b/bin/migrate-oats-data/sql/common/init_users_count.sql index 6d79513dee..ffce2449e4 100644 --- a/bin/migrate-oats-data/sql/common/init_users_count.sql +++ b/bin/migrate-oats-data/sql/common/init_users_count.sql @@ -4,8 +4,10 @@ WITH oaa.created_guid FROM oats.oats_alr_applications oaa + LEFT JOIN alcs."user" u ON oaa.created_guid = u.bceid_guid WHERE oaa.created_guid IS NOT NULL + AND u.bceid_guid IS NULL ) SELECT count(*) From 7b8def590ce96bf34fc55594f526dcb75466d80b Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Tue, 21 Nov 2023 09:13:01 -0800 Subject: [PATCH 670/954] fixes --- .../src/portal/public/search/public-search.controller.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/services/apps/alcs/src/portal/public/search/public-search.controller.ts b/services/apps/alcs/src/portal/public/search/public-search.controller.ts index 956ba07d4e..1e22af64bb 100644 --- a/services/apps/alcs/src/portal/public/search/public-search.controller.ts +++ b/services/apps/alcs/src/portal/public/search/public-search.controller.ts @@ -216,7 +216,7 @@ export class PublicSearchController { ownerName: application.applicant, class: 'APP', status: application.status.status_type_code, - outcome: application.outcome ?? undefined + outcome: application.outcome ?? undefined, }; } @@ -233,7 +233,7 @@ export class PublicSearchController { ownerName: noi.applicant, class: 'NOI', status: noi.status.status_type_code, - outcome: noi.outcome ?? undefined + outcome: noi.outcome ?? undefined, }; } @@ -249,7 +249,7 @@ export class PublicSearchController { localGovernmentName: notification.localGovernmentName, ownerName: notification.applicant, class: 'NOTI', - status: notification.status.status_type_code + status: notification.status.status_type_code, }; } } From aa825237f459ba729afdc57ced57f5b253c536bf Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Tue, 21 Nov 2023 09:21:17 -0800 Subject: [PATCH 671/954] delete outcome migration --- .../1700081096766-add_outcome_to_public.ts | 87 ------------------- 1 file changed, 87 deletions(-) delete mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1700081096766-add_outcome_to_public.ts diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1700081096766-add_outcome_to_public.ts b/services/apps/alcs/src/providers/typeorm/migrations/1700081096766-add_outcome_to_public.ts deleted file mode 100644 index 3acb2a2e58..0000000000 --- a/services/apps/alcs/src/providers/typeorm/migrations/1700081096766-add_outcome_to_public.ts +++ /dev/null @@ -1,87 +0,0 @@ -import { MigrationInterface, QueryRunner } from 'typeorm'; - -export class AddOutcomeToPublic1700081096766 implements MigrationInterface { - name = 'AddOutcomeToPublic1700081096766'; - - public async up(queryRunner: QueryRunner): Promise<void> { - await queryRunner.query( - `DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, - ['VIEW', 'public_notice_of_intent_submission_search_view', 'alcs'], - ); - await queryRunner.query( - `DROP VIEW "alcs"."public_notice_of_intent_submission_search_view"`, - ); - await queryRunner.query( - `DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, - ['VIEW', 'public_application_submission_search_view', 'alcs'], - ); - await queryRunner.query( - `DROP VIEW "alcs"."public_application_submission_search_view"`, - ); - await queryRunner.query( - `CREATE VIEW "alcs"."public_application_submission_search_view" AS SELECT "app_sub"."uuid" AS "uuid", "app_sub"."applicant" AS "applicant", "app"."uuid" AS "application_uuid", "applicationType"."audit_deleted_date_at" AS "applicationType_audit_deleted_date_at", "applicationType"."audit_created_at" AS "applicationType_audit_created_at", "applicationType"."audit_updated_at" AS "applicationType_audit_updated_at", "applicationType"."audit_created_by" AS "applicationType_audit_created_by", "applicationType"."audit_updated_by" AS "applicationType_audit_updated_by", "applicationType"."label" AS "applicationType_label", "applicationType"."code" AS "applicationType_code", "applicationType"."description" AS "applicationType_description", "applicationType"."short_label" AS "applicationType_short_label", "applicationType"."background_color" AS "applicationType_background_color", "applicationType"."text_color" AS "applicationType_text_color", "applicationType"."html_description" AS "applicationType_html_description", "applicationType"."portal_label" AS "applicationType_portal_label", "applicationType"."portal_order" AS "applicationType_portal_order", "applicationType"."requires_government_review" AS "applicationType_requires_government_review", "localGovernment"."name" AS "local_government_name", "app_sub"."file_number" AS "file_number", "app_sub"."local_government_uuid" AS "local_government_uuid", "app_sub"."type_code" AS "application_type_code", "app"."date_submitted_to_alc" AS "date_submitted_to_alc", "app"."decision_date" AS "decision_date", decision_date.outcome AS "outcome", "app"."region_code" AS "application_region_code", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid") AS "status" FROM "alcs"."application_submission" "app_sub" INNER JOIN "alcs"."application" "app" ON "app"."file_number" = "app_sub"."file_number" AND "app"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."application_type" "applicationType" ON "app_sub"."type_code" = "applicationType"."code" AND "applicationType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "app_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."application_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "app_sub"."uuid" LEFT JOIN (SELECT MAX("date") AS "date", outcome_code AS "outcome", application_uuid AS "application_uuid" FROM "alcs"."application_decision" "decision_date" WHERE "decision_date"."audit_deleted_date_at" IS NULL GROUP BY application_uuid, outcome) "decision_date" ON decision_date."application_uuid" = "app"."uuid" WHERE ( "app_sub"."is_draft" = FALSE AND ("app"."date_received_all_items" IS NOT NULL AND "app"."date_received_all_items" <= NOW()) AND alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid")->>'status_type_code' != 'CNCL' ) AND ( "app_sub"."audit_deleted_date_at" IS NULL )`, - ); - await queryRunner.query( - `INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, - [ - 'alcs', - 'VIEW', - 'public_application_submission_search_view', - 'SELECT "app_sub"."uuid" AS "uuid", "app_sub"."applicant" AS "applicant", "app"."uuid" AS "application_uuid", "applicationType"."audit_deleted_date_at" AS "applicationType_audit_deleted_date_at", "applicationType"."audit_created_at" AS "applicationType_audit_created_at", "applicationType"."audit_updated_at" AS "applicationType_audit_updated_at", "applicationType"."audit_created_by" AS "applicationType_audit_created_by", "applicationType"."audit_updated_by" AS "applicationType_audit_updated_by", "applicationType"."label" AS "applicationType_label", "applicationType"."code" AS "applicationType_code", "applicationType"."description" AS "applicationType_description", "applicationType"."short_label" AS "applicationType_short_label", "applicationType"."background_color" AS "applicationType_background_color", "applicationType"."text_color" AS "applicationType_text_color", "applicationType"."html_description" AS "applicationType_html_description", "applicationType"."portal_label" AS "applicationType_portal_label", "applicationType"."portal_order" AS "applicationType_portal_order", "applicationType"."requires_government_review" AS "applicationType_requires_government_review", "localGovernment"."name" AS "local_government_name", "app_sub"."file_number" AS "file_number", "app_sub"."local_government_uuid" AS "local_government_uuid", "app_sub"."type_code" AS "application_type_code", "app"."date_submitted_to_alc" AS "date_submitted_to_alc", "app"."decision_date" AS "decision_date", decision_date.outcome AS "outcome", "app"."region_code" AS "application_region_code", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid") AS "status" FROM "alcs"."application_submission" "app_sub" INNER JOIN "alcs"."application" "app" ON "app"."file_number" = "app_sub"."file_number" AND "app"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."application_type" "applicationType" ON "app_sub"."type_code" = "applicationType"."code" AND "applicationType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "app_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."application_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "app_sub"."uuid" LEFT JOIN (SELECT MAX("date") AS "date", outcome_code AS "outcome", application_uuid AS "application_uuid" FROM "alcs"."application_decision" "decision_date" WHERE "decision_date"."audit_deleted_date_at" IS NULL GROUP BY application_uuid, outcome) "decision_date" ON decision_date."application_uuid" = "app"."uuid" WHERE ( "app_sub"."is_draft" = FALSE AND ("app"."date_received_all_items" IS NOT NULL AND "app"."date_received_all_items" <= NOW()) AND alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid")->>\'status_type_code\' != \'CNCL\' ) AND ( "app_sub"."audit_deleted_date_at" IS NULL )', - ], - ); - await queryRunner.query( - `CREATE VIEW "alcs"."public_notice_of_intent_submission_search_view" AS SELECT "noi_sub"."uuid" AS "uuid", "noi_sub"."applicant" AS "applicant", "noi"."uuid" AS "notice_of_intent_uuid", "noticeOfIntentType"."audit_deleted_date_at" AS "noticeOfIntentType_audit_deleted_date_at", "noticeOfIntentType"."audit_created_at" AS "noticeOfIntentType_audit_created_at", "noticeOfIntentType"."audit_updated_at" AS "noticeOfIntentType_audit_updated_at", "noticeOfIntentType"."audit_created_by" AS "noticeOfIntentType_audit_created_by", "noticeOfIntentType"."audit_updated_by" AS "noticeOfIntentType_audit_updated_by", "noticeOfIntentType"."label" AS "noticeOfIntentType_label", "noticeOfIntentType"."code" AS "noticeOfIntentType_code", "noticeOfIntentType"."description" AS "noticeOfIntentType_description", "noticeOfIntentType"."short_label" AS "noticeOfIntentType_short_label", "noticeOfIntentType"."background_color" AS "noticeOfIntentType_background_color", "noticeOfIntentType"."text_color" AS "noticeOfIntentType_text_color", "noticeOfIntentType"."html_description" AS "noticeOfIntentType_html_description", "noticeOfIntentType"."portal_label" AS "noticeOfIntentType_portal_label", "localGovernment"."name" AS "local_government_name", "noi_sub"."file_number" AS "file_number", "noi_sub"."local_government_uuid" AS "local_government_uuid", "noi_sub"."type_code" AS "notice_of_intent_type_code", "noi"."date_submitted_to_alc" AS "date_submitted_to_alc", "noi"."decision_date" AS "decision_date", decision_date.outcome AS "outcome", "noi"."region_code" AS "notice_of_intent_region_code", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid") AS "status" FROM "alcs"."notice_of_intent_submission" "noi_sub" INNER JOIN "alcs"."notice_of_intent" "noi" ON "noi"."file_number" = "noi_sub"."file_number" AND "noi"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."notice_of_intent_type" "noticeOfIntentType" ON "noi_sub"."type_code" = "noticeOfIntentType"."code" AND "noticeOfIntentType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "noi_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."notice_of_intent_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "noi_sub"."uuid" LEFT JOIN (SELECT MAX("date") AS "date", outcome_code AS "outcome", notice_of_intent_uuid AS "notice_of_intent_uuid" FROM "alcs"."notice_of_intent_decision" "decision_date" WHERE "decision_date"."audit_deleted_date_at" IS NULL GROUP BY notice_of_intent_uuid, outcome) "decision_date" ON decision_date."notice_of_intent_uuid" = "noi"."uuid" WHERE ( "noi_sub"."is_draft" = FALSE AND ("noi"."date_received_all_items" IS NOT NULL AND "noi"."date_received_all_items" <= NOW()) AND alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid")->>'status_type_code' != 'CNCL' ) AND ( "noi_sub"."audit_deleted_date_at" IS NULL )`, - ); - await queryRunner.query( - `INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, - [ - 'alcs', - 'VIEW', - 'public_notice_of_intent_submission_search_view', - 'SELECT "noi_sub"."uuid" AS "uuid", "noi_sub"."applicant" AS "applicant", "noi"."uuid" AS "notice_of_intent_uuid", "noticeOfIntentType"."audit_deleted_date_at" AS "noticeOfIntentType_audit_deleted_date_at", "noticeOfIntentType"."audit_created_at" AS "noticeOfIntentType_audit_created_at", "noticeOfIntentType"."audit_updated_at" AS "noticeOfIntentType_audit_updated_at", "noticeOfIntentType"."audit_created_by" AS "noticeOfIntentType_audit_created_by", "noticeOfIntentType"."audit_updated_by" AS "noticeOfIntentType_audit_updated_by", "noticeOfIntentType"."label" AS "noticeOfIntentType_label", "noticeOfIntentType"."code" AS "noticeOfIntentType_code", "noticeOfIntentType"."description" AS "noticeOfIntentType_description", "noticeOfIntentType"."short_label" AS "noticeOfIntentType_short_label", "noticeOfIntentType"."background_color" AS "noticeOfIntentType_background_color", "noticeOfIntentType"."text_color" AS "noticeOfIntentType_text_color", "noticeOfIntentType"."html_description" AS "noticeOfIntentType_html_description", "noticeOfIntentType"."portal_label" AS "noticeOfIntentType_portal_label", "localGovernment"."name" AS "local_government_name", "noi_sub"."file_number" AS "file_number", "noi_sub"."local_government_uuid" AS "local_government_uuid", "noi_sub"."type_code" AS "notice_of_intent_type_code", "noi"."date_submitted_to_alc" AS "date_submitted_to_alc", "noi"."decision_date" AS "decision_date", decision_date.outcome AS "outcome", "noi"."region_code" AS "notice_of_intent_region_code", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid") AS "status" FROM "alcs"."notice_of_intent_submission" "noi_sub" INNER JOIN "alcs"."notice_of_intent" "noi" ON "noi"."file_number" = "noi_sub"."file_number" AND "noi"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."notice_of_intent_type" "noticeOfIntentType" ON "noi_sub"."type_code" = "noticeOfIntentType"."code" AND "noticeOfIntentType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "noi_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."notice_of_intent_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "noi_sub"."uuid" LEFT JOIN (SELECT MAX("date") AS "date", outcome_code AS "outcome", notice_of_intent_uuid AS "notice_of_intent_uuid" FROM "alcs"."notice_of_intent_decision" "decision_date" WHERE "decision_date"."audit_deleted_date_at" IS NULL GROUP BY notice_of_intent_uuid, outcome) "decision_date" ON decision_date."notice_of_intent_uuid" = "noi"."uuid" WHERE ( "noi_sub"."is_draft" = FALSE AND ("noi"."date_received_all_items" IS NOT NULL AND "noi"."date_received_all_items" <= NOW()) AND alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid")->>\'status_type_code\' != \'CNCL\' ) AND ( "noi_sub"."audit_deleted_date_at" IS NULL )', - ], - ); - } - - public async down(queryRunner: QueryRunner): Promise<void> { - await queryRunner.query( - `DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, - ['VIEW', 'public_notice_of_intent_submission_search_view', 'alcs'], - ); - await queryRunner.query( - `DROP VIEW "alcs"."public_notice_of_intent_submission_search_view"`, - ); - await queryRunner.query( - `DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, - ['VIEW', 'public_application_submission_search_view', 'alcs'], - ); - await queryRunner.query( - `DROP VIEW "alcs"."public_application_submission_search_view"`, - ); - await queryRunner.query( - `CREATE VIEW "alcs"."public_application_submission_search_view" AS SELECT "app_sub"."uuid" AS "uuid", "app_sub"."applicant" AS "applicant", "app"."uuid" AS "application_uuid", "applicationType"."audit_deleted_date_at" AS "applicationType_audit_deleted_date_at", "applicationType"."audit_created_at" AS "applicationType_audit_created_at", "applicationType"."audit_updated_at" AS "applicationType_audit_updated_at", "applicationType"."audit_created_by" AS "applicationType_audit_created_by", "applicationType"."audit_updated_by" AS "applicationType_audit_updated_by", "applicationType"."label" AS "applicationType_label", "applicationType"."code" AS "applicationType_code", "applicationType"."description" AS "applicationType_description", "applicationType"."short_label" AS "applicationType_short_label", "applicationType"."background_color" AS "applicationType_background_color", "applicationType"."text_color" AS "applicationType_text_color", "applicationType"."html_description" AS "applicationType_html_description", "applicationType"."portal_label" AS "applicationType_portal_label", "localGovernment"."name" AS "local_government_name", "app_sub"."file_number" AS "file_number", "app_sub"."local_government_uuid" AS "local_government_uuid", "app_sub"."type_code" AS "application_type_code", "app"."date_submitted_to_alc" AS "date_submitted_to_alc", "app"."decision_date" AS "decision_date", "app"."region_code" AS "application_region_code", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid") AS "status" FROM "alcs"."application_submission" "app_sub" INNER JOIN "alcs"."application" "app" ON "app"."file_number" = "app_sub"."file_number" AND "app"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."application_type" "applicationType" ON "app_sub"."type_code" = "applicationType"."code" AND "applicationType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "app_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."application_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "app_sub"."uuid" LEFT JOIN (SELECT MAX("date") AS "date", application_uuid AS "application_uuid" FROM "alcs"."application_decision" "decision_date" WHERE "decision_date"."audit_deleted_date_at" IS NULL GROUP BY application_uuid) "decision_date" ON decision_date."application_uuid" = "app"."uuid" WHERE ( "app_sub"."is_draft" = FALSE AND ("app"."date_received_all_items" IS NOT NULL AND "app"."date_received_all_items" <= NOW()) AND alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid")->>'status_type_code' != 'CNCL' ) AND ( "app_sub"."audit_deleted_date_at" IS NULL )`, - ); - await queryRunner.query( - `INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, - [ - 'alcs', - 'VIEW', - 'public_application_submission_search_view', - 'SELECT "app_sub"."uuid" AS "uuid", "app_sub"."applicant" AS "applicant", "app"."uuid" AS "application_uuid", "applicationType"."audit_deleted_date_at" AS "applicationType_audit_deleted_date_at", "applicationType"."audit_created_at" AS "applicationType_audit_created_at", "applicationType"."audit_updated_at" AS "applicationType_audit_updated_at", "applicationType"."audit_created_by" AS "applicationType_audit_created_by", "applicationType"."audit_updated_by" AS "applicationType_audit_updated_by", "applicationType"."label" AS "applicationType_label", "applicationType"."code" AS "applicationType_code", "applicationType"."description" AS "applicationType_description", "applicationType"."short_label" AS "applicationType_short_label", "applicationType"."background_color" AS "applicationType_background_color", "applicationType"."text_color" AS "applicationType_text_color", "applicationType"."html_description" AS "applicationType_html_description", "applicationType"."portal_label" AS "applicationType_portal_label", "localGovernment"."name" AS "local_government_name", "app_sub"."file_number" AS "file_number", "app_sub"."local_government_uuid" AS "local_government_uuid", "app_sub"."type_code" AS "application_type_code", "app"."date_submitted_to_alc" AS "date_submitted_to_alc", "app"."decision_date" AS "decision_date", "app"."region_code" AS "application_region_code", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid") AS "status" FROM "alcs"."application_submission" "app_sub" INNER JOIN "alcs"."application" "app" ON "app"."file_number" = "app_sub"."file_number" AND "app"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."application_type" "applicationType" ON "app_sub"."type_code" = "applicationType"."code" AND "applicationType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "app_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."application_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "app_sub"."uuid" LEFT JOIN (SELECT MAX("date") AS "date", application_uuid AS "application_uuid" FROM "alcs"."application_decision" "decision_date" WHERE "decision_date"."audit_deleted_date_at" IS NULL GROUP BY application_uuid) "decision_date" ON decision_date."application_uuid" = "app"."uuid" WHERE ( "app_sub"."is_draft" = FALSE AND ("app"."date_received_all_items" IS NOT NULL AND "app"."date_received_all_items" <= NOW()) AND alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid")->>\'status_type_code\' != \'CNCL\' ) AND ( "app_sub"."audit_deleted_date_at" IS NULL )', - ], - ); - await queryRunner.query( - `CREATE VIEW "alcs"."public_notice_of_intent_submission_search_view" AS SELECT "noi_sub"."uuid" AS "uuid", "noi_sub"."applicant" AS "applicant", "noi"."uuid" AS "notice_of_intent_uuid", "noticeOfIntentType"."audit_deleted_date_at" AS "noticeOfIntentType_audit_deleted_date_at", "noticeOfIntentType"."audit_created_at" AS "noticeOfIntentType_audit_created_at", "noticeOfIntentType"."audit_updated_at" AS "noticeOfIntentType_audit_updated_at", "noticeOfIntentType"."audit_created_by" AS "noticeOfIntentType_audit_created_by", "noticeOfIntentType"."audit_updated_by" AS "noticeOfIntentType_audit_updated_by", "noticeOfIntentType"."label" AS "noticeOfIntentType_label", "noticeOfIntentType"."code" AS "noticeOfIntentType_code", "noticeOfIntentType"."description" AS "noticeOfIntentType_description", "noticeOfIntentType"."short_label" AS "noticeOfIntentType_short_label", "noticeOfIntentType"."background_color" AS "noticeOfIntentType_background_color", "noticeOfIntentType"."text_color" AS "noticeOfIntentType_text_color", "noticeOfIntentType"."html_description" AS "noticeOfIntentType_html_description", "noticeOfIntentType"."portal_label" AS "noticeOfIntentType_portal_label", "localGovernment"."name" AS "local_government_name", "noi_sub"."file_number" AS "file_number", "noi_sub"."local_government_uuid" AS "local_government_uuid", "noi_sub"."type_code" AS "notice_of_intent_type_code", "noi"."date_submitted_to_alc" AS "date_submitted_to_alc", "noi"."decision_date" AS "decision_date", "noi"."region_code" AS "notice_of_intent_region_code", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid") AS "status" FROM "alcs"."notice_of_intent_submission" "noi_sub" INNER JOIN "alcs"."notice_of_intent" "noi" ON "noi"."file_number" = "noi_sub"."file_number" AND "noi"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."notice_of_intent_type" "noticeOfIntentType" ON "noi_sub"."type_code" = "noticeOfIntentType"."code" AND "noticeOfIntentType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "noi_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."notice_of_intent_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "noi_sub"."uuid" LEFT JOIN (SELECT MAX("date") AS "date", notice_of_intent_uuid AS "notice_of_intent_uuid" FROM "alcs"."notice_of_intent_decision" "decision_date" WHERE "decision_date"."audit_deleted_date_at" IS NULL GROUP BY notice_of_intent_uuid) "decision_date" ON decision_date."notice_of_intent_uuid" = "noi"."uuid" WHERE ( "noi_sub"."is_draft" = FALSE AND ("noi"."date_received_all_items" IS NOT NULL AND "noi"."date_received_all_items" <= NOW()) AND alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid")->>'status_type_code' != 'CNCL' ) AND ( "noi_sub"."audit_deleted_date_at" IS NULL )`, - ); - await queryRunner.query( - `INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, - [ - 'alcs', - 'VIEW', - 'public_notice_of_intent_submission_search_view', - 'SELECT "noi_sub"."uuid" AS "uuid", "noi_sub"."applicant" AS "applicant", "noi"."uuid" AS "notice_of_intent_uuid", "noticeOfIntentType"."audit_deleted_date_at" AS "noticeOfIntentType_audit_deleted_date_at", "noticeOfIntentType"."audit_created_at" AS "noticeOfIntentType_audit_created_at", "noticeOfIntentType"."audit_updated_at" AS "noticeOfIntentType_audit_updated_at", "noticeOfIntentType"."audit_created_by" AS "noticeOfIntentType_audit_created_by", "noticeOfIntentType"."audit_updated_by" AS "noticeOfIntentType_audit_updated_by", "noticeOfIntentType"."label" AS "noticeOfIntentType_label", "noticeOfIntentType"."code" AS "noticeOfIntentType_code", "noticeOfIntentType"."description" AS "noticeOfIntentType_description", "noticeOfIntentType"."short_label" AS "noticeOfIntentType_short_label", "noticeOfIntentType"."background_color" AS "noticeOfIntentType_background_color", "noticeOfIntentType"."text_color" AS "noticeOfIntentType_text_color", "noticeOfIntentType"."html_description" AS "noticeOfIntentType_html_description", "noticeOfIntentType"."portal_label" AS "noticeOfIntentType_portal_label", "localGovernment"."name" AS "local_government_name", "noi_sub"."file_number" AS "file_number", "noi_sub"."local_government_uuid" AS "local_government_uuid", "noi_sub"."type_code" AS "notice_of_intent_type_code", "noi"."date_submitted_to_alc" AS "date_submitted_to_alc", "noi"."decision_date" AS "decision_date", "noi"."region_code" AS "notice_of_intent_region_code", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid") AS "status" FROM "alcs"."notice_of_intent_submission" "noi_sub" INNER JOIN "alcs"."notice_of_intent" "noi" ON "noi"."file_number" = "noi_sub"."file_number" AND "noi"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."notice_of_intent_type" "noticeOfIntentType" ON "noi_sub"."type_code" = "noticeOfIntentType"."code" AND "noticeOfIntentType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "noi_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."notice_of_intent_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "noi_sub"."uuid" LEFT JOIN (SELECT MAX("date") AS "date", notice_of_intent_uuid AS "notice_of_intent_uuid" FROM "alcs"."notice_of_intent_decision" "decision_date" WHERE "decision_date"."audit_deleted_date_at" IS NULL GROUP BY notice_of_intent_uuid) "decision_date" ON decision_date."notice_of_intent_uuid" = "noi"."uuid" WHERE ( "noi_sub"."is_draft" = FALSE AND ("noi"."date_received_all_items" IS NOT NULL AND "noi"."date_received_all_items" <= NOW()) AND alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid")->>\'status_type_code\' != \'CNCL\' ) AND ( "noi_sub"."audit_deleted_date_at" IS NULL )', - ], - ); - } -} From aaec684769c97d925170d2c060750b2236dcb682 Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Tue, 21 Nov 2023 10:37:01 -0800 Subject: [PATCH 672/954] fixes --- .../public-application-search-view.entity.ts | 3 +++ .../public-application-search.service.ts | 1 + .../1700591131475-add-destRank-application.ts | 20 +++++++++++++++++++ 3 files changed, 24 insertions(+) create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1700591131475-add-destRank-application.ts diff --git a/services/apps/alcs/src/portal/public/search/application/public-application-search-view.entity.ts b/services/apps/alcs/src/portal/public/search/application/public-application-search-view.entity.ts index d35b400a4d..85cad3018f 100644 --- a/services/apps/alcs/src/portal/public/search/application/public-application-search-view.entity.ts +++ b/services/apps/alcs/src/portal/public/search/application/public-application-search-view.entity.ts @@ -93,6 +93,9 @@ import { LinkedStatusType } from '../public-search.dto'; ) .andWhere( "alcs.get_current_status_for_application_submission_by_uuid(app_sub.uuid)->>'status_type_code' != 'CNCL'", + ) + .andWhere( + "decision_date.dest_rank = 1", ), }) export class PublicApplicationSubmissionSearchView { diff --git a/services/apps/alcs/src/portal/public/search/application/public-application-search.service.ts b/services/apps/alcs/src/portal/public/search/application/public-application-search.service.ts index 2a7b8f7a32..3b62d6370c 100644 --- a/services/apps/alcs/src/portal/public/search/application/public-application-search.service.ts +++ b/services/apps/alcs/src/portal/public/search/application/public-application-search.service.ts @@ -85,6 +85,7 @@ export class PublicApplicationSearchService { , "appSearch"."application_type_code" , "appSearch"."status" , "appSearch"."outcome" + , "appSearch"."dest_rank" , "appSearch"."date_submitted_to_alc" , "appSearch"."decision_date" , "appSearch"."last_update" diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1700591131475-add-destRank-application.ts b/services/apps/alcs/src/providers/typeorm/migrations/1700591131475-add-destRank-application.ts new file mode 100644 index 0000000000..635fdee20b --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1700591131475-add-destRank-application.ts @@ -0,0 +1,20 @@ +import { MigrationInterface, QueryRunner } from "typeorm"; + +export class AddDestRankApplication1700591131475 implements MigrationInterface { + name = 'AddDestRankApplication1700591131475' + + public async up(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query(`DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, ["VIEW","public_application_submission_search_view","alcs"]); + await queryRunner.query(`DROP VIEW "alcs"."public_application_submission_search_view"`); + await queryRunner.query(`CREATE VIEW "alcs"."public_application_submission_search_view" AS SELECT "app_sub"."uuid" AS "uuid", "app_sub"."applicant" AS "applicant", "app"."uuid" AS "application_uuid", "applicationType"."audit_deleted_date_at" AS "applicationType_audit_deleted_date_at", "applicationType"."audit_created_at" AS "applicationType_audit_created_at", "applicationType"."audit_updated_at" AS "applicationType_audit_updated_at", "applicationType"."audit_created_by" AS "applicationType_audit_created_by", "applicationType"."audit_updated_by" AS "applicationType_audit_updated_by", "applicationType"."label" AS "applicationType_label", "applicationType"."code" AS "applicationType_code", "applicationType"."description" AS "applicationType_description", "applicationType"."short_label" AS "applicationType_short_label", "applicationType"."background_color" AS "applicationType_background_color", "applicationType"."text_color" AS "applicationType_text_color", "applicationType"."html_description" AS "applicationType_html_description", "applicationType"."portal_label" AS "applicationType_portal_label", "applicationType"."portal_order" AS "applicationType_portal_order", "applicationType"."requires_government_review" AS "applicationType_requires_government_review", "localGovernment"."name" AS "local_government_name", "app_sub"."file_number" AS "file_number", "app_sub"."local_government_uuid" AS "local_government_uuid", "app_sub"."type_code" AS "application_type_code", "app"."date_submitted_to_alc" AS "date_submitted_to_alc", "app"."decision_date" AS "decision_date", decision_date.outcome AS "outcome", decision_date.dest_rank AS "dest_rank", "app"."region_code" AS "application_region_code", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid") AS "status" FROM "alcs"."application_submission" "app_sub" INNER JOIN "alcs"."application" "app" ON "app"."file_number" = "app_sub"."file_number" AND "app"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."application_type" "applicationType" ON "app_sub"."type_code" = "applicationType"."code" AND "applicationType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "app_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."application_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "app_sub"."uuid" LEFT JOIN (SELECT DISTINCT ON (application_uuid) decisiondate AS "date", outcome AS "outcome", dest_rank AS "dest_rank", applicationuuid AS "application_uuid" FROM "alcs"."application_decision" "decision_date", (SELECT outcome_code AS "outcome", date AS "decisiondate", application_uuid AS "applicationuuid", RANK() OVER (PARTITION BY application_uuid ORDER BY date DESC, audit_created_at DESC) AS "dest_rank" FROM "alcs"."application_decision" "decision" WHERE "decision"."audit_deleted_date_at" IS NULL) "decisions" WHERE dest_rank = 1) "decision_date" ON decision_date."application_uuid" = "app"."uuid" WHERE ( "app_sub"."is_draft" = FALSE AND ("app"."date_received_all_items" IS NOT NULL AND "app"."date_received_all_items" <= NOW()) AND alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid")->>'status_type_code' != 'CNCL' AND decision_date.dest_rank = 1 ) AND ( "app_sub"."audit_deleted_date_at" IS NULL )`); + await queryRunner.query(`INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, ["alcs","VIEW","public_application_submission_search_view","SELECT \"app_sub\".\"uuid\" AS \"uuid\", \"app_sub\".\"applicant\" AS \"applicant\", \"app\".\"uuid\" AS \"application_uuid\", \"applicationType\".\"audit_deleted_date_at\" AS \"applicationType_audit_deleted_date_at\", \"applicationType\".\"audit_created_at\" AS \"applicationType_audit_created_at\", \"applicationType\".\"audit_updated_at\" AS \"applicationType_audit_updated_at\", \"applicationType\".\"audit_created_by\" AS \"applicationType_audit_created_by\", \"applicationType\".\"audit_updated_by\" AS \"applicationType_audit_updated_by\", \"applicationType\".\"label\" AS \"applicationType_label\", \"applicationType\".\"code\" AS \"applicationType_code\", \"applicationType\".\"description\" AS \"applicationType_description\", \"applicationType\".\"short_label\" AS \"applicationType_short_label\", \"applicationType\".\"background_color\" AS \"applicationType_background_color\", \"applicationType\".\"text_color\" AS \"applicationType_text_color\", \"applicationType\".\"html_description\" AS \"applicationType_html_description\", \"applicationType\".\"portal_label\" AS \"applicationType_portal_label\", \"applicationType\".\"portal_order\" AS \"applicationType_portal_order\", \"applicationType\".\"requires_government_review\" AS \"applicationType_requires_government_review\", \"localGovernment\".\"name\" AS \"local_government_name\", \"app_sub\".\"file_number\" AS \"file_number\", \"app_sub\".\"local_government_uuid\" AS \"local_government_uuid\", \"app_sub\".\"type_code\" AS \"application_type_code\", \"app\".\"date_submitted_to_alc\" AS \"date_submitted_to_alc\", \"app\".\"decision_date\" AS \"decision_date\", decision_date.outcome AS \"outcome\", decision_date.dest_rank AS \"dest_rank\", \"app\".\"region_code\" AS \"application_region_code\", GREATEST(status_link.effective_date, decision_date.date) AS \"last_update\", alcs.get_current_status_for_application_submission_by_uuid(\"app_sub\".\"uuid\") AS \"status\" FROM \"alcs\".\"application_submission\" \"app_sub\" INNER JOIN \"alcs\".\"application\" \"app\" ON \"app\".\"file_number\" = \"app_sub\".\"file_number\" AND \"app\".\"audit_deleted_date_at\" IS NULL INNER JOIN \"alcs\".\"application_type\" \"applicationType\" ON \"app_sub\".\"type_code\" = \"applicationType\".\"code\" AND \"applicationType\".\"audit_deleted_date_at\" IS NULL LEFT JOIN \"alcs\".\"local_government\" \"localGovernment\" ON \"app_sub\".\"local_government_uuid\" = \"localGovernment\".\"uuid\" AND \"localGovernment\".\"audit_deleted_date_at\" IS NULL LEFT JOIN (SELECT MAX(\"effective_date\") AS \"effective_date\", submission_uuid AS \"submission_uuid\" FROM \"alcs\".\"application_submission_to_submission_status\" \"status_link\" GROUP BY submission_uuid) \"status_link\" ON status_link.\"submission_uuid\" = \"app_sub\".\"uuid\" LEFT JOIN (SELECT DISTINCT ON (application_uuid) decisiondate AS \"date\", outcome AS \"outcome\", dest_rank AS \"dest_rank\", applicationuuid AS \"application_uuid\" FROM \"alcs\".\"application_decision\" \"decision_date\", (SELECT outcome_code AS \"outcome\", date AS \"decisiondate\", application_uuid AS \"applicationuuid\", RANK() OVER (PARTITION BY application_uuid ORDER BY date DESC, audit_created_at DESC) AS \"dest_rank\" FROM \"alcs\".\"application_decision\" \"decision\" WHERE \"decision\".\"audit_deleted_date_at\" IS NULL) \"decisions\" WHERE dest_rank = 1) \"decision_date\" ON decision_date.\"application_uuid\" = \"app\".\"uuid\" WHERE ( \"app_sub\".\"is_draft\" = FALSE AND (\"app\".\"date_received_all_items\" IS NOT NULL AND \"app\".\"date_received_all_items\" <= NOW()) AND alcs.get_current_status_for_application_submission_by_uuid(\"app_sub\".\"uuid\")->>'status_type_code' != 'CNCL' AND decision_date.dest_rank = 1 ) AND ( \"app_sub\".\"audit_deleted_date_at\" IS NULL )"]); + } + + public async down(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query(`DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, ["VIEW","public_application_submission_search_view","alcs"]); + await queryRunner.query(`DROP VIEW "alcs"."public_application_submission_search_view"`); + await queryRunner.query(`CREATE VIEW "alcs"."public_application_submission_search_view" AS SELECT "app_sub"."uuid" AS "uuid", "app_sub"."applicant" AS "applicant", "app"."uuid" AS "application_uuid", "applicationType"."audit_deleted_date_at" AS "applicationType_audit_deleted_date_at", "applicationType"."audit_created_at" AS "applicationType_audit_created_at", "applicationType"."audit_updated_at" AS "applicationType_audit_updated_at", "applicationType"."audit_created_by" AS "applicationType_audit_created_by", "applicationType"."audit_updated_by" AS "applicationType_audit_updated_by", "applicationType"."label" AS "applicationType_label", "applicationType"."code" AS "applicationType_code", "applicationType"."description" AS "applicationType_description", "applicationType"."short_label" AS "applicationType_short_label", "applicationType"."background_color" AS "applicationType_background_color", "applicationType"."text_color" AS "applicationType_text_color", "applicationType"."html_description" AS "applicationType_html_description", "applicationType"."portal_label" AS "applicationType_portal_label", "applicationType"."portal_order" AS "applicationType_portal_order", "applicationType"."requires_government_review" AS "applicationType_requires_government_review", "localGovernment"."name" AS "local_government_name", "app_sub"."file_number" AS "file_number", "app_sub"."local_government_uuid" AS "local_government_uuid", "app_sub"."type_code" AS "application_type_code", "app"."date_submitted_to_alc" AS "date_submitted_to_alc", "app"."decision_date" AS "decision_date", decision_date.outcome AS "outcome", decision_date.dest_rank AS "dest_rank", "app"."region_code" AS "application_region_code", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid") AS "status" FROM "alcs"."application_submission" "app_sub" INNER JOIN "alcs"."application" "app" ON "app"."file_number" = "app_sub"."file_number" AND "app"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."application_type" "applicationType" ON "app_sub"."type_code" = "applicationType"."code" AND "applicationType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "app_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."application_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "app_sub"."uuid" LEFT JOIN (SELECT DISTINCT ON (application_uuid) decisiondate AS "date", outcome AS "outcome", dest_rank AS "dest_rank", applicationuuid AS "application_uuid" FROM "alcs"."application_decision" "decision_date", (SELECT outcome_code AS "outcome", date AS "decisiondate", application_uuid AS "applicationuuid", RANK() OVER (PARTITION BY application_uuid ORDER BY date DESC, audit_created_at DESC) AS "dest_rank" FROM "alcs"."application_decision" "decision" WHERE "decision"."audit_deleted_date_at" IS NULL) "decisions" WHERE dest_rank = 1) "decision_date" ON decision_date."application_uuid" = "app"."uuid" WHERE ( "app_sub"."is_draft" = FALSE AND ("app"."date_received_all_items" IS NOT NULL AND "app"."date_received_all_items" <= NOW()) AND alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid")->>'status_type_code' != 'CNCL' ) AND ( "app_sub"."audit_deleted_date_at" IS NULL )`); + await queryRunner.query(`INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, ["alcs","VIEW","public_application_submission_search_view","SELECT \"app_sub\".\"uuid\" AS \"uuid\", \"app_sub\".\"applicant\" AS \"applicant\", \"app\".\"uuid\" AS \"application_uuid\", \"applicationType\".\"audit_deleted_date_at\" AS \"applicationType_audit_deleted_date_at\", \"applicationType\".\"audit_created_at\" AS \"applicationType_audit_created_at\", \"applicationType\".\"audit_updated_at\" AS \"applicationType_audit_updated_at\", \"applicationType\".\"audit_created_by\" AS \"applicationType_audit_created_by\", \"applicationType\".\"audit_updated_by\" AS \"applicationType_audit_updated_by\", \"applicationType\".\"label\" AS \"applicationType_label\", \"applicationType\".\"code\" AS \"applicationType_code\", \"applicationType\".\"description\" AS \"applicationType_description\", \"applicationType\".\"short_label\" AS \"applicationType_short_label\", \"applicationType\".\"background_color\" AS \"applicationType_background_color\", \"applicationType\".\"text_color\" AS \"applicationType_text_color\", \"applicationType\".\"html_description\" AS \"applicationType_html_description\", \"applicationType\".\"portal_label\" AS \"applicationType_portal_label\", \"applicationType\".\"portal_order\" AS \"applicationType_portal_order\", \"applicationType\".\"requires_government_review\" AS \"applicationType_requires_government_review\", \"localGovernment\".\"name\" AS \"local_government_name\", \"app_sub\".\"file_number\" AS \"file_number\", \"app_sub\".\"local_government_uuid\" AS \"local_government_uuid\", \"app_sub\".\"type_code\" AS \"application_type_code\", \"app\".\"date_submitted_to_alc\" AS \"date_submitted_to_alc\", \"app\".\"decision_date\" AS \"decision_date\", decision_date.outcome AS \"outcome\", decision_date.dest_rank AS \"dest_rank\", \"app\".\"region_code\" AS \"application_region_code\", GREATEST(status_link.effective_date, decision_date.date) AS \"last_update\", alcs.get_current_status_for_application_submission_by_uuid(\"app_sub\".\"uuid\") AS \"status\" FROM \"alcs\".\"application_submission\" \"app_sub\" INNER JOIN \"alcs\".\"application\" \"app\" ON \"app\".\"file_number\" = \"app_sub\".\"file_number\" AND \"app\".\"audit_deleted_date_at\" IS NULL INNER JOIN \"alcs\".\"application_type\" \"applicationType\" ON \"app_sub\".\"type_code\" = \"applicationType\".\"code\" AND \"applicationType\".\"audit_deleted_date_at\" IS NULL LEFT JOIN \"alcs\".\"local_government\" \"localGovernment\" ON \"app_sub\".\"local_government_uuid\" = \"localGovernment\".\"uuid\" AND \"localGovernment\".\"audit_deleted_date_at\" IS NULL LEFT JOIN (SELECT MAX(\"effective_date\") AS \"effective_date\", submission_uuid AS \"submission_uuid\" FROM \"alcs\".\"application_submission_to_submission_status\" \"status_link\" GROUP BY submission_uuid) \"status_link\" ON status_link.\"submission_uuid\" = \"app_sub\".\"uuid\" LEFT JOIN (SELECT DISTINCT ON (application_uuid) decisiondate AS \"date\", outcome AS \"outcome\", dest_rank AS \"dest_rank\", applicationuuid AS \"application_uuid\" FROM \"alcs\".\"application_decision\" \"decision_date\", (SELECT outcome_code AS \"outcome\", date AS \"decisiondate\", application_uuid AS \"applicationuuid\", RANK() OVER (PARTITION BY application_uuid ORDER BY date DESC, audit_created_at DESC) AS \"dest_rank\" FROM \"alcs\".\"application_decision\" \"decision\" WHERE \"decision\".\"audit_deleted_date_at\" IS NULL) \"decisions\" WHERE dest_rank = 1) \"decision_date\" ON decision_date.\"application_uuid\" = \"app\".\"uuid\" WHERE ( \"app_sub\".\"is_draft\" = FALSE AND (\"app\".\"date_received_all_items\" IS NOT NULL AND \"app\".\"date_received_all_items\" <= NOW()) AND alcs.get_current_status_for_application_submission_by_uuid(\"app_sub\".\"uuid\")->>'status_type_code' != 'CNCL' ) AND ( \"app_sub\".\"audit_deleted_date_at\" IS NULL )"]); + } + +} From 87fca60a4a43f8473d869bbc85ece1d79de4ca33 Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Tue, 21 Nov 2023 10:45:16 -0800 Subject: [PATCH 673/954] roso fix for styling --- .../roso-details/roso-details.component.html | 70 ++++++++++++------- 1 file changed, 43 insertions(+), 27 deletions(-) diff --git a/portal-frontend/src/app/features/public/application/submission/roso-details/roso-details.component.html b/portal-frontend/src/app/features/public/application/submission/roso-details/roso-details.component.html index 4fd364489f..ecfcb8c7ee 100644 --- a/portal-frontend/src/app/features/public/application/submission/roso-details/roso-details.component.html +++ b/portal-frontend/src/app/features/public/application/submission/roso-details/roso-details.component.html @@ -38,62 +38,78 @@ *ngIf="!applicationSubmission.soilProjectDurationAmount || !applicationSubmission.soilProjectDurationUnit" ></app-no-data> </div> - + <div class="grid-1"></div> - <div class="grid-2"> - <strong>Soil to be Removed</strong> - </div> - <div class="grid-1"><strong>Volume</strong></div> - <div class="grid-2"> + <div class="subheading2 grid-double">Soil to be Removed</div> + + <div class="subheading2 grid-1">Volume</div> + <div class="grid-double"> {{ applicationSubmission.soilToRemoveVolume }} <span *ngIf="applicationSubmission.soilToRemoveVolume">m<sup>3</sup></span> <app-no-data *ngIf="!applicationSubmission.soilToRemoveVolume"></app-no-data> </div> - <div class="grid-1"><strong>Area</strong></div> - <div class="grid-2"> + + <div class="subheading2 grid-1">Area</div> + <div class="grid-double"> {{ applicationSubmission.soilToRemoveArea }} <span *ngIf="applicationSubmission.soilToRemoveArea">ha</span> <app-no-data *ngIf="!applicationSubmission.soilToRemoveArea"></app-no-data> </div> - <div class="grid-1"><strong>Maximum Depth</strong></div> - <div class="grid-2"> + + <div class="subheading2 grid-1">Maximum Depth</div> + <div class="grid-double"> {{ applicationSubmission.soilToRemoveMaximumDepth }} <span *ngIf="applicationSubmission.soilToRemoveMaximumDepth">m</span> <app-no-data *ngIf="!applicationSubmission.soilToRemoveMaximumDepth"></app-no-data> </div> - <div class="grid-1"><strong>Average Depth</strong></div> - <div class="grid-2"> + + <div class="subheading2 grid-1">Average Depth</div> + <div class="grid-double"> {{ applicationSubmission.soilToRemoveAverageDepth }} <span *ngIf="applicationSubmission.soilToRemoveAverageDepth">m</span> <app-no-data *ngIf="!applicationSubmission.soilToRemoveAverageDepth"></app-no-data> </div> <div class="grid-1"></div> - <div class="grid-2"> - <strong>Soil already Removed</strong> - </div> - <div class="grid-1"><strong>Volume</strong></div> - <div class="grid-2"> + <div class="subheading2 grid-double">Soil already Removed</div> + + <div class="subheading2 grid-1">Volume</div> + <div class="grid-double"> {{ applicationSubmission.soilAlreadyRemovedVolume }} <span *ngIf="applicationSubmission.soilAlreadyRemovedVolume !== null">m<sup>3</sup></span> - <app-no-data *ngIf="applicationSubmission.soilAlreadyRemovedVolume === null"></app-no-data> + <app-no-data + + *ngIf="applicationSubmission.soilAlreadyRemovedVolume === null" + ></app-no-data> </div> - <div class="grid-1"><strong>Area</strong></div> - <div class="grid-2"> + + <div class="subheading2 grid-1">Area</div> + <div class="grid-double"> {{ applicationSubmission.soilAlreadyRemovedArea }} <span *ngIf="applicationSubmission.soilAlreadyRemovedArea !== null">ha</span> - <app-no-data *ngIf="applicationSubmission.soilAlreadyRemovedArea === null"></app-no-data> + <app-no-data + + *ngIf="applicationSubmission.soilAlreadyRemovedArea === null" + ></app-no-data> </div> - <div class="grid-1"><strong>Maximum Depth</strong></div> - <div class="grid-2"> + + <div class="subheading2 grid-1">Maximum Depth</div> + <div class="grid-double"> {{ applicationSubmission.soilAlreadyRemovedMaximumDepth }} <span *ngIf="applicationSubmission.soilAlreadyRemovedMaximumDepth !== null">m</span> - <app-no-data *ngIf="applicationSubmission.soilAlreadyRemovedMaximumDepth === null"></app-no-data> + <app-no-data + + *ngIf="applicationSubmission.soilAlreadyRemovedMaximumDepth === null" + ></app-no-data> </div> - <div class="grid-1"><strong>Average Depth</strong></div> - <div class="grid-2"> + + <div class="subheading2 grid-1">Average Depth</div> + <div class="grid-double"> {{ applicationSubmission.soilAlreadyRemovedAverageDepth }} <span *ngIf="applicationSubmission.soilAlreadyRemovedAverageDepth !== null">m</span> - <app-no-data *ngIf="applicationSubmission.soilAlreadyRemovedAverageDepth === null"></app-no-data> + <app-no-data + + *ngIf="applicationSubmission.soilAlreadyRemovedAverageDepth === null" + ></app-no-data> </div> <div class="subheading2 grid-1">Describe the type of soil proposed to be removed.</div> From 833cf7d7b355d37de43d7d5710afccb663a7379c Mon Sep 17 00:00:00 2001 From: Liam Stoddard <lstodd@protonmail.com> Date: Tue, 21 Nov 2023 11:13:13 -0800 Subject: [PATCH 674/954] added mining flag --- .../applications/submissions/data_insert/insert_query.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/bin/migrate-oats-data/applications/submissions/data_insert/insert_query.py b/bin/migrate-oats-data/applications/submissions/data_insert/insert_query.py index 743eea17f0..30a9a5f2de 100644 --- a/bin/migrate-oats-data/applications/submissions/data_insert/insert_query.py +++ b/bin/migrate-oats-data/applications/submissions/data_insert/insert_query.py @@ -274,7 +274,8 @@ def get_insert_query_for_soil(): soil_to_place_average_depth, soil_is_follow_up, soil_follow_up_ids, - soil_has_submitted_notice + soil_has_submitted_notice, + soil_is_extraction_or_mining """ unique_values = """, %(remove_type)s, %(impact_reduction_desc)s, @@ -292,6 +293,7 @@ def get_insert_query_for_soil(): %(max_fill_depth)s, %(followup_noi_ind)s, %(followup_noi_number)s, + %(ministry_notice_ind)s, %(ministry_notice_ind)s """ return get_insert_query(unique_fields, unique_values) @@ -316,7 +318,8 @@ def get_insert_query_for_pfrs(): soil_to_place_average_depth, soil_is_follow_up, soil_follow_up_ids, - soil_has_submitted_notice + soil_has_submitted_notice, + soil_is_extraction_or_mining """ unique_values = """, %(remove_type)s, %(impact_reduction_desc)s, @@ -336,6 +339,7 @@ def get_insert_query_for_pfrs(): %(max_fill_depth)s, %(followup_noi_ind)s, %(followup_noi_number)s, + %(ministry_notice_ind)s, %(ministry_notice_ind)s """ return get_insert_query(unique_fields, unique_values) From 635ffe7a988916142f92bd28005261ee61c17f1a Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Tue, 21 Nov 2023 13:09:38 -0800 Subject: [PATCH 675/954] Show review to L/FNG when status is returned to LG --- .../lfng-review/lfng-review.component.html | 6 +----- .../lfng-review/lfng-review.component.ts | 11 ++++++----- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/portal-frontend/src/app/features/applications/view-submission/lfng-review/lfng-review.component.html b/portal-frontend/src/app/features/applications/view-submission/lfng-review/lfng-review.component.html index 331a83df47..bff8503b47 100644 --- a/portal-frontend/src/app/features/applications/view-submission/lfng-review/lfng-review.component.html +++ b/portal-frontend/src/app/features/applications/view-submission/lfng-review/lfng-review.component.html @@ -60,11 +60,7 @@ <h2>Local/First Nation Gov Review</h2> <div><strong>Comment for L/FNG</strong></div> {{ application.returnedToLfngComment }} </div> - <div - *ngIf=" - applicationReview && (application.canReview || application.status.code !== SUBMISSION_STATUS.IN_REVIEW_BY_LG) - " - > + <div *ngIf="applicationReview"> <section> <h4>Contact Information</h4> <div class="review-table"> diff --git a/portal-frontend/src/app/features/applications/view-submission/lfng-review/lfng-review.component.ts b/portal-frontend/src/app/features/applications/view-submission/lfng-review/lfng-review.component.ts index 68ad28bdcd..1c93cb7606 100644 --- a/portal-frontend/src/app/features/applications/view-submission/lfng-review/lfng-review.component.ts +++ b/portal-frontend/src/app/features/applications/view-submission/lfng-review/lfng-review.component.ts @@ -39,7 +39,7 @@ export class LfngReviewComponent implements OnInit, OnDestroy { private applicationReviewService: ApplicationSubmissionReviewService, private pdfGenerationService: PdfGenerationService, private applicationDocumentService: ApplicationDocumentService, - private router: Router + private router: Router, ) {} ngOnInit(): void { @@ -68,7 +68,7 @@ export class LfngReviewComponent implements OnInit, OnDestroy { this.$application.pipe(takeUntil(this.$destroy)).subscribe((application) => { this.application = application; this.submittedToAlcStatus = !!this.application?.submissionStatuses.find( - (s) => s.statusTypeCode === SUBMISSION_STATUS.SUBMITTED_TO_ALC && !!s.effectiveDate + (s) => s.statusTypeCode === SUBMISSION_STATUS.SUBMITTED_TO_ALC && !!s.effectiveDate, ); this.loadReview(); }); @@ -76,10 +76,10 @@ export class LfngReviewComponent implements OnInit, OnDestroy { this.$applicationDocuments.subscribe((documents) => { this.staffReport = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.STAFF_REPORT); this.resolutionDocument = documents.filter( - (document) => document.type?.code === DOCUMENT_TYPE.RESOLUTION_DOCUMENT + (document) => document.type?.code === DOCUMENT_TYPE.RESOLUTION_DOCUMENT, ); this.governmentOtherAttachments = documents.filter( - (document) => document.type?.code === DOCUMENT_TYPE.OTHER && document.source === DOCUMENT_SOURCE.LFNG + (document) => document.type?.code === DOCUMENT_TYPE.OTHER && document.source === DOCUMENT_SOURCE.LFNG, ); }); } @@ -95,7 +95,8 @@ export class LfngReviewComponent implements OnInit, OnDestroy { this.application && this.application.requiresGovernmentReview && (this.submittedToAlcStatus || - (this.application.status.code === SUBMISSION_STATUS.IN_REVIEW_BY_LG && this.application.canReview)) + ([SUBMISSION_STATUS.IN_REVIEW_BY_LG, SUBMISSION_STATUS.RETURNED_TO_LG].includes(this.application.status.code) && + this.application.canReview)) ) { await this.applicationReviewService.getByFileId(this.application.fileNumber); } else { From 3836a10d4aaff39c8c3936ca344d7b74ee5bab68 Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Wed, 22 Nov 2023 10:59:57 -0800 Subject: [PATCH 676/954] remove outcome from ui and rescinded option --- .../application-search-table.component.html | 7 ------- .../application-search-table.component.ts | 3 +-- .../notice-of-intent-search-table.component.html | 7 ------- .../notice-of-intent-search-table.component.ts | 3 +-- .../features/public/search/public-search.component.ts | 1 - .../search/search-list/search-list.component.html | 1 - .../src/app/features/public/search/search.interface.ts | 1 - portal-frontend/src/app/services/search/search.dto.ts | 10 +--------- .../portal/public/search/public-search.controller.ts | 2 -- .../alcs/src/portal/public/search/public-search.dto.ts | 1 - 10 files changed, 3 insertions(+), 33 deletions(-) diff --git a/portal-frontend/src/app/features/public/search/application-search-table/application-search-table.component.html b/portal-frontend/src/app/features/public/search/application-search-table/application-search-table.component.html index 0fa3b6d633..251efa1ad2 100644 --- a/portal-frontend/src/app/features/public/search/application-search-table/application-search-table.component.html +++ b/portal-frontend/src/app/features/public/search/application-search-table/application-search-table.component.html @@ -43,13 +43,6 @@ </td> </ng-container> - <ng-container matColumnDef="outcome"> - <th class="type-cell" mat-header-cell *matHeaderCellDef mat-sort-header>Outcome</th> - <td mat-cell *matCellDef="let element"> - {{ outcomeMapping[element.outcome] | emptyColumn }} - </td> - </ng-container> - <ng-container matColumnDef="lastUpdate"> <th mat-header-cell *matHeaderCellDef mat-sort-header>Last Update</th> <td mat-cell *matCellDef="let element"> diff --git a/portal-frontend/src/app/features/public/search/application-search-table/application-search-table.component.ts b/portal-frontend/src/app/features/public/search/application-search-table/application-search-table.component.ts index daf41dc4f0..641747ecb4 100644 --- a/portal-frontend/src/app/features/public/search/application-search-table/application-search-table.component.ts +++ b/portal-frontend/src/app/features/public/search/application-search-table/application-search-table.component.ts @@ -5,7 +5,7 @@ import { MatTableDataSource } from '@angular/material/table'; import { Router } from '@angular/router'; import { Subject, takeUntil } from 'rxjs'; import { ApplicationStatusDto } from '../../../../services/application-submission/application-submission.dto'; -import { ApplicationSearchResultDto, displayedColumns, outcomeMapping } from '../../../../services/search/search.dto'; +import { ApplicationSearchResultDto, displayedColumns } from '../../../../services/search/search.dto'; import { SearchResult, TableChange } from '../search.interface'; @Component({ @@ -37,7 +37,6 @@ export class ApplicationSearchTableComponent implements OnDestroy { @Output() tableChange = new EventEmitter<TableChange>(); displayedColumns = displayedColumns; - outcomeMapping = outcomeMapping; dataSource = new MatTableDataSource<SearchResult>(); pageIndex = 0; diff --git a/portal-frontend/src/app/features/public/search/notice-of-intent-search-table/notice-of-intent-search-table.component.html b/portal-frontend/src/app/features/public/search/notice-of-intent-search-table/notice-of-intent-search-table.component.html index 5d8a294e30..e668f63da1 100644 --- a/portal-frontend/src/app/features/public/search/notice-of-intent-search-table/notice-of-intent-search-table.component.html +++ b/portal-frontend/src/app/features/public/search/notice-of-intent-search-table/notice-of-intent-search-table.component.html @@ -42,13 +42,6 @@ </div> </td> </ng-container> - - <ng-container matColumnDef="outcome"> - <th class="type-cell" mat-header-cell *matHeaderCellDef mat-sort-header>Outcome</th> - <td mat-cell *matCellDef="let element"> - {{ outcomeMapping[element.outcome] | emptyColumn }} - </td> - </ng-container> <ng-container matColumnDef="lastUpdate"> <th mat-header-cell *matHeaderCellDef mat-sort-header>Last Update</th> diff --git a/portal-frontend/src/app/features/public/search/notice-of-intent-search-table/notice-of-intent-search-table.component.ts b/portal-frontend/src/app/features/public/search/notice-of-intent-search-table/notice-of-intent-search-table.component.ts index af5b631ad8..2ecf8b3657 100644 --- a/portal-frontend/src/app/features/public/search/notice-of-intent-search-table/notice-of-intent-search-table.component.ts +++ b/portal-frontend/src/app/features/public/search/notice-of-intent-search-table/notice-of-intent-search-table.component.ts @@ -5,7 +5,7 @@ import { MatTableDataSource } from '@angular/material/table'; import { Router } from '@angular/router'; import { Subject, takeUntil } from 'rxjs'; import { ApplicationStatusDto } from '../../../../services/application-submission/application-submission.dto'; -import { NoticeOfIntentSearchResultDto, displayedColumns, outcomeMapping } from '../../../../services/search/search.dto'; +import { NoticeOfIntentSearchResultDto, displayedColumns } from '../../../../services/search/search.dto'; import { SearchResult, TableChange } from '../search.interface'; @Component({ @@ -35,7 +35,6 @@ export class NoticeOfIntentSearchTableComponent implements OnDestroy { @Output() tableChange = new EventEmitter<TableChange>(); displayedColumns = displayedColumns; - outcomeMapping = outcomeMapping; dataSource = new MatTableDataSource<SearchResult>(); pageIndex = 0; diff --git a/portal-frontend/src/app/features/public/search/public-search.component.ts b/portal-frontend/src/app/features/public/search/public-search.component.ts index bc19670a65..a7a0248f5c 100644 --- a/portal-frontend/src/app/features/public/search/public-search.component.ts +++ b/portal-frontend/src/app/features/public/search/public-search.component.ts @@ -33,7 +33,6 @@ const STATUS_MAP = { const DECISION_MAP = { 'Approved': 'APPR', 'Refused': 'REFU', - 'Rescinded': 'RESC', 'Ordered not to Proceed (NOI)': 'ONTP', }; diff --git a/portal-frontend/src/app/features/public/search/search-list/search-list.component.html b/portal-frontend/src/app/features/public/search/search-list/search-list.component.html index f93e5600c5..bcbafa4825 100644 --- a/portal-frontend/src/app/features/public/search/search-list/search-list.component.html +++ b/portal-frontend/src/app/features/public/search/search-list/search-list.component.html @@ -3,7 +3,6 @@ <div class="subheading2">{{ result.fileNumber }} - {{ result.ownerName }}</div> <div [title]="result.type">{{ result.type }}</div> <div [title]="result.localGovernmentName">{{ result.localGovernmentName }}</div> - <div>Outcome: {{ result?.outcome }}</div> <div>Last Updated: {{ result.lastUpdate | momentFormat }}</div> <div *ngIf="result.status" diff --git a/portal-frontend/src/app/features/public/search/search.interface.ts b/portal-frontend/src/app/features/public/search/search.interface.ts index aca7c4286c..c79a6e04aa 100644 --- a/portal-frontend/src/app/features/public/search/search.interface.ts +++ b/portal-frontend/src/app/features/public/search/search.interface.ts @@ -20,6 +20,5 @@ export interface SearchResult { portalStatus?: string; referenceId: string; class: string; - outcome?: string; status?: ApplicationStatusDto | NoticeOfIntentSubmissionStatusDto | NotificationSubmissionStatusDto; } diff --git a/portal-frontend/src/app/services/search/search.dto.ts b/portal-frontend/src/app/services/search/search.dto.ts index b007c9a07c..97ef646f4f 100644 --- a/portal-frontend/src/app/services/search/search.dto.ts +++ b/portal-frontend/src/app/services/search/search.dto.ts @@ -6,7 +6,6 @@ export interface BaseSearchResultDto { localGovernmentName: string; boardCode?: string; ownerName: string; - outcome?: string; dateSubmitted: number; lastUpdate: number; status?: string; @@ -53,11 +52,4 @@ export interface SearchRequestDto extends PagingRequestDto { decisionOutcome?: string[]; } -export const displayedColumns = ['fileId', 'ownerName', 'type', 'portalStatus', 'outcome', 'lastUpdate', 'government']; - -export const outcomeMapping: Record<string, string> = { - 'APPR': "Approved", - 'REFU': "Refused", - 'RESC': "Rescinded", - 'ONTP': "Ordered not to Proceed (NOI)" -} \ No newline at end of file +export const displayedColumns = ['fileId', 'ownerName', 'type', 'portalStatus', 'lastUpdate', 'government']; \ No newline at end of file diff --git a/services/apps/alcs/src/portal/public/search/public-search.controller.ts b/services/apps/alcs/src/portal/public/search/public-search.controller.ts index 1e22af64bb..ae23f34db3 100644 --- a/services/apps/alcs/src/portal/public/search/public-search.controller.ts +++ b/services/apps/alcs/src/portal/public/search/public-search.controller.ts @@ -216,7 +216,6 @@ export class PublicSearchController { ownerName: application.applicant, class: 'APP', status: application.status.status_type_code, - outcome: application.outcome ?? undefined, }; } @@ -233,7 +232,6 @@ export class PublicSearchController { ownerName: noi.applicant, class: 'NOI', status: noi.status.status_type_code, - outcome: noi.outcome ?? undefined, }; } diff --git a/services/apps/alcs/src/portal/public/search/public-search.dto.ts b/services/apps/alcs/src/portal/public/search/public-search.dto.ts index f47564d166..a812c313eb 100644 --- a/services/apps/alcs/src/portal/public/search/public-search.dto.ts +++ b/services/apps/alcs/src/portal/public/search/public-search.dto.ts @@ -19,7 +19,6 @@ export class BaseSearchResultDto { status: string; dateSubmitted?: number; lastUpdate?: number; - outcome?: string; class: SearchEntityClass; } From 3a4e0d0df5d707e201a3855fecaeec409619620a Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Wed, 22 Nov 2023 12:06:58 -0800 Subject: [PATCH 677/954] show local parcel data on delete --- .../edit-submission/parcel-details/parcel-details.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-details.component.ts b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-details.component.ts index da9e95e9e5..934eb587a9 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-details.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-details.component.ts @@ -156,7 +156,7 @@ export class ParcelDetailsComponent extends StepComponent implements OnInit, Aft .beforeClosed() .subscribe((result) => { if (result) { - this.loadParcels(); + this.parcels = this.parcels.filter(parcel => parcel.uuid !== parcelUuid); } }); } From f56f64d0c8852fdb35619b8f5421d8e41fb3bdc9 Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Wed, 22 Nov 2023 12:20:26 -0800 Subject: [PATCH 678/954] add on noi --- .../edit-submission/parcels/parcel-details.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-details.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-details.component.ts index 5ad3957ae1..f15dddc8bb 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-details.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-details.component.ts @@ -152,7 +152,7 @@ export class ParcelDetailsComponent extends StepComponent implements OnInit, Aft .beforeClosed() .subscribe((result) => { if (result) { - this.loadParcels(); + this.parcels = this.parcels.filter(parcel => parcel.uuid !== parcelUuid); } }); } From 9ccd482718d24ac10b5aff77c1134799f8a39a41 Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Wed, 22 Nov 2023 13:51:53 -0800 Subject: [PATCH 679/954] Get first added parcel rather than last --- .../application-owner/application-owner.service.ts | 2 +- .../notice-of-intent-owner/notice-of-intent-owner.service.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.service.ts b/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.service.ts index 49392f6cd4..79962e0822 100644 --- a/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.service.ts +++ b/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.service.ts @@ -259,7 +259,7 @@ export class ApplicationOwnerService { if (applicationParcels.length > 0) { const firstParcel = parcels .filter((parcel) => parcel.parcelType === PARCEL_TYPE.APPLICATION) - .reduce((a, b) => (a.auditCreatedAt > b.auditCreatedAt ? a : b)); + .reduce((a, b) => (a.auditCreatedAt < b.auditCreatedAt ? a : b)); const ownerCount = applicationParcels.reduce((count, parcel) => { return count + parcel.owners.length; diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.service.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.service.ts index 0081fb4d38..0306276aff 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.service.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.service.ts @@ -277,7 +277,7 @@ export class NoticeOfIntentOwnerService { if (parcels.length > 0) { const firstParcel = parcels.reduce((a, b) => - a.auditCreatedAt > b.auditCreatedAt ? a : b, + a.auditCreatedAt < b.auditCreatedAt ? a : b, ); const ownerCount = parcels.reduce((count, parcel) => { From 1b8014b5c9c2f4de97d31a9920fb508c5bbb390f Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Wed, 22 Nov 2023 14:25:48 -0800 Subject: [PATCH 680/954] Fix tests for previous commit --- .../application-owner/application-owner.service.spec.ts | 2 +- .../notice-of-intent-owner.service.spec.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.service.spec.ts b/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.service.spec.ts index 28141f8979..5e10f37e71 100644 --- a/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.service.spec.ts +++ b/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.service.spec.ts @@ -351,7 +351,7 @@ describe('ApplicationOwnerService', () => { expect(mockApplicationSubmissionservice.update).toHaveBeenCalledTimes(1); expect( mockApplicationSubmissionservice.update.mock.calls[0][1].applicant, - ).toEqual('A et al.'); + ).toEqual('C et al.'); expect( mockApplicationSubmissionservice.getFileNumber, ).toHaveBeenCalledTimes(1); diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.service.spec.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.service.spec.ts index e95afb4044..e5662dd28f 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.service.spec.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.service.spec.ts @@ -347,7 +347,7 @@ describe('NoticeOfIntentOwnerService', () => { expect(mockNoiSubmissionService.update).toHaveBeenCalledTimes(1); expect(mockNoiSubmissionService.update.mock.calls[0][1].applicant).toEqual( - 'A et al.', + 'C et al.', ); expect(mockNoiSubmissionService.getFileNumber).toHaveBeenCalledTimes(1); expect(mockNoiService.updateApplicant).toHaveBeenCalledTimes(1); From 39e5248296aff908ccb67a567c31a299f4b381dd Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Wed, 22 Nov 2023 15:11:21 -0800 Subject: [PATCH 681/954] Confirm parcel ownership type change on all data --- .../parcel-details/parcel-entry/parcel-entry.component.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts index 4f3367434d..fa02db940a 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts @@ -198,8 +198,9 @@ export class ParcelEntryComponent implements OnInit { this.pin.value || this.purchaseDate.value || this.isFarm.value || - this.civicAddress.value; - + this.civicAddress.value || + this.parcel.owners.length > 0; + const changeParcelType = () => { if ($event.value === this.PARCEL_OWNERSHIP_TYPES.CROWN) { this.searchBy.setValue(null); From 68b83cff0a1e050318b0e4de6eb980d97ab913f4 Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Thu, 23 Nov 2023 13:53:04 -0800 Subject: [PATCH 682/954] Add routes for submission types '/home' redirects to '/home/applications' --- portal-frontend/src/app/features/home/home.module.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/portal-frontend/src/app/features/home/home.module.ts b/portal-frontend/src/app/features/home/home.module.ts index e60c93f57e..a9a564595a 100644 --- a/portal-frontend/src/app/features/home/home.module.ts +++ b/portal-frontend/src/app/features/home/home.module.ts @@ -13,8 +13,9 @@ import { InboxListComponent } from './inbox/inbox-list/inbox-list.component'; import { InboxComponent } from './inbox/inbox.component'; const routes: Routes = [ + { path: '', redirectTo: 'applications', pathMatch: 'full' }, { - path: '', + path: ':submissionType', component: HomeComponent, }, ]; From e2a8b291bcd540e740d24a43d36a041714adbcc5 Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Mon, 27 Nov 2023 09:44:01 -0800 Subject: [PATCH 683/954] add parcel interaction UX update --- portal-frontend/src/app/app.module.ts | 4 + .../parcel-entry/parcel-entry.component.html | 85 +++++++++---------- .../parcel-entry/parcel-entry.component.scss | 4 + .../parcel-entry/parcel-entry.component.ts | 33 +++---- .../parcel-entry/parcel-entry.component.html | 83 +++++++++--------- .../parcel-entry/parcel-entry.component.scss | 6 +- .../parcel-entry/parcel-entry.component.ts | 34 +++----- .../owner-dialog/owner-dialog.component.html | 12 ++- .../owner-dialog/owner-dialog.component.scss | 17 ++++ .../owner-dialog/owner-dialog.component.ts | 17 +++- .../parcel-owners.component.html | 24 ++++-- .../parcel-owners/parcel-owners.component.ts | 23 ++++- 12 files changed, 196 insertions(+), 146 deletions(-) diff --git a/portal-frontend/src/app/app.module.ts b/portal-frontend/src/app/app.module.ts index fd8c6cff4d..e3e82475e1 100644 --- a/portal-frontend/src/app/app.module.ts +++ b/portal-frontend/src/app/app.module.ts @@ -17,6 +17,7 @@ import { ConfirmationDialogService } from './shared/confirmation-dialog/confirma import { FooterComponent } from './shared/footer/footer.component'; import { HeaderComponent } from './shared/header/header.component'; import { SharedModule } from './shared/shared.module'; +import { WarningBannerComponent } from './shared/warning-banner/warning-banner.component'; @NgModule({ declarations: [ @@ -36,6 +37,9 @@ import { SharedModule } from './shared/shared.module'; MatPaginatorModule, MatToolbarModule, ], + exports: [ + WarningBannerComponent, + ], providers: [ ConfirmationDialogService, { provide: HTTP_INTERCEPTORS, useClass: AuthInterceptorService, multi: true }, diff --git a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html index 44347c0ae3..b78a5eaa12 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html @@ -27,7 +27,6 @@ <div *ngIf="parcelType.errors?.['required']">This field is required</div> </div> </div> - <h5>Parcel Lookup</h5> <div class="form-row"> <div class="full-row pmbc-search"> @@ -203,10 +202,35 @@ <h5>Parcel Lookup</h5> </div> <section *ngIf="enableOwners" class="container"> - <h6>Owner Information</h6> + <h6>Parcel Owners</h6> <ng-container *ngIf="!isCrownLand"> - <p>Provide the following information for all owners listed on the parcel's Certificate of Title</p> - <label for="owner-search">Add Owner to Parcel</label> + <p>Add an owner for every organization or individual listed on the parcel's Certification of Title</p> + <div> + <app-parcel-owners + [isDraft]="isDraft" + [fileId]="fileId" + [submissionUuid]="submissionUuid" + [parcelUuid]="parcel.uuid" + [owners]="parcel.owners" + (onOwnersUpdated)="onOwnersUpdated.emit()" + (onOwnerRemoved)="onOwnerRemoved($event)" + [documentService]="applicationDocumentService" + [ownerService]="applicationOwnerService" + [disabled]="_disabled" + ></app-parcel-owners> + </div> + <button + class="new-owner" + *ngIf="enableAddNewOwner" + mat-flat-button + (click)="onAddNewOwner()" + color="primary" + [disabled]="!parcelType.getRawValue() || _disabled" + > + Add new owner + </button> + <h6 class="owner-search-option">OR</h6> + <label for="owner-search">Select from Existing Owners</label> <mat-form-field class="full-width-input" appearance="outline"> <input [ngClass]="{ 'error-outline': ownerInput.errors && ownerInput.errors['required'] && !ownerInput.disabled }" @@ -221,56 +245,32 @@ <h6>Owner Information</h6> /> <mat-autocomplete #auto="matAutocomplete"> <mat-option - (click)="onSelectOwner(option, option.isSelected)" + (click)="onSelectOwner($event, option, option.isSelected)" *ngFor="let option of filteredOwners" - [disabled]="option.isSelected" > - <div class="owner-option"> - <div>{{ option.displayName }}</div> - <button mat-flat-button color="primary" [disabled]="option.isSelected"> - {{ option.isSelected ? 'Added' : 'Add' }} - </button> - </div> + <mat-checkbox + class="owner-checkbox" + [checked]="option.isSelected" + color="primary" + > + <div class="owner-option"> + <div>{{ option.displayName }}</div> + </div> + </mat-checkbox> </mat-option> <mat-option class="option" *ngIf="filteredOwners.length === 0 && enableAddNewOwner" (click)="onAddNewOwner()"> <div class="owner-option"> - <div>No owner matching search</div> + <div *ngIf="owners.length != 0">No owner matching search</div> + <div *ngIf="owners.length === 0">No owners added</div> <button mat-flat-button color="primary">Add new owner</button> </div> </mat-option> - <mat-option class="option" *ngIf="owners.length > 0" (click)="onSeeAllOwners()"> - <span class="link-text">See all Owners</span> - </mat-option> </mat-autocomplete> </mat-form-field> <div *ngIf="ownerInput.errors && ownerInput.errors['required'] && !ownerInput.disabled" class="field-error"> <mat-icon>warning</mat-icon> <div *ngIf="ownerInput.errors?.['required']">This field is required</div> </div> - <button - class="new-owner" - *ngIf="enableAddNewOwner" - (click)="onAddNewOwner()" - mat-stroked-button - color="primary" - [disabled]="_disabled" - > - Add new owner - </button> - <div> - <app-parcel-owners - [isDraft]="isDraft" - [fileId]="fileId" - [submissionUuid]="submissionUuid" - [parcelUuid]="parcel.uuid" - [owners]="parcel.owners" - (onOwnersUpdated)="onOwnersUpdated.emit()" - (onOwnerRemoved)="onOwnerRemoved($event)" - [documentService]="applicationDocumentService" - [ownerService]="applicationOwnerService" - [disabled]="_disabled" - ></app-parcel-owners> - </div> </ng-container> <ng-container *ngIf="isCrownLand"> <mat-label for="crown-owner-type">Select owner:</mat-label> @@ -300,7 +300,7 @@ <h6>Owner Information</h6> /> <mat-autocomplete #auto="matAutocomplete"> <mat-option - (click)="onSelectOwner(option, option.isSelected)" + (click)="onSelectOwner($event, option, option.isSelected)" *ngFor="let option of filteredOwners" [disabled]="option.isSelected" > @@ -321,9 +321,6 @@ <h6>Owner Information</h6> <button mat-flat-button color="primary">Add new government contact</button> </div> </mat-option> - <mat-option class="option" *ngIf="owners.length > 0" (click)="onSeeAllOwners()"> - <span class="link-text">See all Owners</span> - </mat-option> </mat-autocomplete> </mat-form-field> <div *ngIf="ownerInput.errors && ownerInput.errors['required']" class="field-error"> diff --git a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.scss b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.scss index 223b120fa2..837f498a38 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.scss +++ b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.scss @@ -11,6 +11,10 @@ margin: rem(8) 0 !important; } +.owner-search-option { + margin: rem(8) 0 !important; +} + .link-text { color: colors.$link-color; text-decoration: underline; diff --git a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts index 4f3367434d..0a14a457fd 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts @@ -331,10 +331,18 @@ export class ParcelEntryComponent implements OnInit { }); } - async onSelectOwner(owner: ApplicationOwnerDto, isSelected: boolean) { + private isOwnerInParcel(owner: ApplicationOwnerDto): boolean { + return this.parcel.owners.some(existingOwner => existingOwner.uuid === owner.uuid); + } + + async onSelectOwner(event: Event, owner: ApplicationOwnerDto, isSelected: boolean) { if (!isSelected) { - const selectedOwners = [...this.parcel.owners, owner]; - this.updateParcelOwners(selectedOwners); + if (!this.isOwnerInParcel(owner)) { + const selectedOwners = [...this.parcel.owners, owner]; + this.updateParcelOwners(selectedOwners); + } + } else { + event.preventDefault() } } @@ -379,25 +387,6 @@ export class ParcelEntryComponent implements OnInit { }); } - onSeeAllOwners() { - this.dialog - .open(AllOwnersDialogComponent, { - data: { - owners: this.owners, - fileId: this.fileId, - submissionUuid: this.submissionUuid, - ownerService: this.applicationOwnerService, - documentService: this.applicationDocumentService, - }, - }) - .beforeClosed() - .subscribe((isDirty) => { - if (isDirty) { - this.onOwnersUpdated.emit(); - } - }); - } - private setupForm() { this.parcelForm.patchValue({ legalDescription: this.parcel.legalDescription, diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.html index ec07417739..6f889e1428 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.html @@ -205,10 +205,35 @@ <h5>Parcel Lookup</h5> </div> <section *ngIf="enableOwners" class="container"> - <h6>Owner Information</h6> + <h6>Parcel Owners</h6> <ng-container *ngIf="!isCrownLand"> - <p>Provide the following information for all owners listed on the parcel's Certificate of Title</p> - <label for="owner-search">Add Owner to Parcel</label> + <p>Add an owner for every organization or individual listed on the parcel's Certification of Title</p> + <div> + <app-parcel-owners + [isDraft]="isDraft" + [fileId]="fileId" + [submissionUuid]="submissionUuid" + [parcelUuid]="parcel.uuid" + [owners]="parcel.owners" + (onOwnersUpdated)="onOwnersUpdated.emit()" + (onOwnerRemoved)="onOwnerRemoved($event)" + [ownerService]="noticeOfIntentOwnerService" + [documentService]="noticeOfIntentDocumentService" + [disabled]="_disabled" + ></app-parcel-owners> + </div> + <button + class="new-owner" + *ngIf="enableAddNewOwner" + (click)="onAddNewOwner()" + mat-flat-button + color="primary" + [disabled]="!parcelType.getRawValue() || _disabled" + > + Add new owner + </button> + <h6 class="owner-search-option">OR</h6> + <label for="owner-search">Select from Existing Owners</label> <mat-form-field class="full-width-input" appearance="outline"> <input [ngClass]="{ 'error-outline': ownerInput.errors && ownerInput.errors['required'] && !ownerInput.disabled }" @@ -223,56 +248,31 @@ <h6>Owner Information</h6> /> <mat-autocomplete #auto="matAutocomplete"> <mat-option - (click)="onSelectOwner(option, option.isSelected)" + (click)="onSelectOwner($event, option, option.isSelected)" *ngFor="let option of filteredOwners" - [disabled]="option.isSelected" > - <div class="owner-option"> - <div>{{ option.displayName }}</div> - <button mat-flat-button color="primary" [disabled]="option.isSelected"> - {{ option.isSelected ? 'Added' : 'Add' }} - </button> - </div> + <mat-checkbox + [checked]="option.isSelected" + color="primary" + > + <div class="owner-option"> + <div>{{ option.displayName }}</div> + </div> + </mat-checkbox> </mat-option> <mat-option class="option" *ngIf="filteredOwners.length === 0 && enableAddNewOwner" (click)="onAddNewOwner()"> <div class="owner-option"> - <div>No owner matching search</div> + <div *ngIf="owners.length != 0">No owner matching search</div> + <div *ngIf="owners.length === 0">No owners added</div> <button mat-flat-button color="primary">Add new owner</button> </div> </mat-option> - <mat-option class="option" *ngIf="owners.length > 0" (click)="onSeeAllOwners()"> - <span class="link-text">See all Owners</span> - </mat-option> </mat-autocomplete> </mat-form-field> <div *ngIf="ownerInput.errors && ownerInput.errors['required'] && !ownerInput.disabled" class="field-error"> <mat-icon>warning</mat-icon> <div *ngIf="ownerInput.errors?.['required']">This field is required</div> </div> - <button - class="new-owner" - *ngIf="enableAddNewOwner" - (click)="onAddNewOwner()" - mat-stroked-button - color="primary" - [disabled]="_disabled" - > - Add new owner - </button> - <div> - <app-parcel-owners - [isDraft]="isDraft" - [fileId]="fileId" - [submissionUuid]="submissionUuid" - [parcelUuid]="parcel.uuid" - [owners]="parcel.owners" - (onOwnersUpdated)="onOwnersUpdated.emit()" - (onOwnerRemoved)="onOwnerRemoved($event)" - [ownerService]="noticeOfIntentOwnerService" - [documentService]="noticeOfIntentDocumentService" - [disabled]="_disabled" - ></app-parcel-owners> - </div> </ng-container> <ng-container *ngIf="isCrownLand"> <div> @@ -304,7 +304,7 @@ <h6>Owner Information</h6> /> <mat-autocomplete #auto="matAutocomplete"> <mat-option - (click)="onSelectOwner(option, option.isSelected)" + (click)="onSelectOwner($event, option, option.isSelected)" *ngFor="let option of filteredOwners" [disabled]="option.isSelected" > @@ -325,9 +325,6 @@ <h6>Owner Information</h6> <button mat-flat-button color="primary">Add new government contact</button> </div> </mat-option> - <mat-option class="option" *ngIf="owners.length > 0" (click)="onSeeAllOwners()"> - <span class="link-text">See all Owners</span> - </mat-option> </mat-autocomplete> </mat-form-field> <div *ngIf="ownerInput.errors && ownerInput.errors['required']" class="field-error"> diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.scss b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.scss index 223b120fa2..7f8d33f206 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.scss +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.scss @@ -11,6 +11,10 @@ margin: rem(8) 0 !important; } +.owner-search-option { + margin: rem(8) 0 !important; +} + .link-text { color: colors.$link-color; text-decoration: underline; @@ -93,4 +97,4 @@ mat-button-toggle-group#isFarm { align-items: center; height: 100%; } -} +} \ No newline at end of file diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.ts index c3fdda61fd..d85bc37bb0 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.ts @@ -16,7 +16,6 @@ import { OWNER_TYPE } from '../../../../../shared/dto/owner.dto'; import { FileHandle } from '../../../../../shared/file-drag-drop/drag-drop.directive'; import { CrownOwnerDialogComponent } from '../../../../../shared/owner-dialogs/crown-owner-dialog/crown-owner-dialog.component'; import { OwnerDialogComponent } from '../../../../../shared/owner-dialogs/owner-dialog/owner-dialog.component'; -import { AllOwnersDialogComponent } from '../../../../../shared/owner-dialogs/owners-dialog/all-owners-dialog.component'; import { formatBooleanToString } from '../../../../../shared/utils/boolean-helper'; import { RemoveFileConfirmationDialogComponent } from '../../../../applications/alcs-edit-submission/remove-file-confirmation-dialog/remove-file-confirmation-dialog.component'; import { ParcelEntryConfirmationDialogComponent } from './parcel-entry-confirmation-dialog/parcel-entry-confirmation-dialog.component'; @@ -327,10 +326,18 @@ export class ParcelEntryComponent implements OnInit { }); } - async onSelectOwner(owner: NoticeOfIntentOwnerDto, isSelected: boolean) { + private isOwnerInParcel(owner: NoticeOfIntentOwnerDto): boolean { + return this.parcel.owners.some(existingOwner => existingOwner.uuid === owner.uuid); + } + + async onSelectOwner(event: Event, owner: NoticeOfIntentOwnerDto, isSelected: boolean) { if (!isSelected) { - const selectedOwners = [...this.parcel.owners, owner]; - this.updateParcelOwners(selectedOwners); + if (!this.isOwnerInParcel(owner)) { + const selectedOwners = [...this.parcel.owners, owner]; + this.updateParcelOwners(selectedOwners); + } + } else { + event.preventDefault() } } @@ -365,25 +372,6 @@ export class ParcelEntryComponent implements OnInit { }); } - onSeeAllOwners() { - this.dialog - .open(AllOwnersDialogComponent, { - data: { - owners: this.owners, - fileId: this.fileId, - submissionUuid: this.submissionUuid, - ownerService: this.noticeOfIntentOwnerService, - documentService: this.noticeOfIntentDocumentService, - }, - }) - .beforeClosed() - .subscribe((isDirty) => { - if (isDirty) { - this.onOwnersUpdated.emit(); - } - }); - } - private setupForm() { this.parcelForm.patchValue({ legalDescription: this.parcel.legalDescription, diff --git a/portal-frontend/src/app/shared/owner-dialogs/owner-dialog/owner-dialog.component.html b/portal-frontend/src/app/shared/owner-dialogs/owner-dialog/owner-dialog.component.html index ae366b2f71..5afc730206 100644 --- a/portal-frontend/src/app/shared/owner-dialogs/owner-dialog/owner-dialog.component.html +++ b/portal-frontend/src/app/shared/owner-dialogs/owner-dialog/owner-dialog.component.html @@ -4,6 +4,9 @@ <h2 *ngIf="isEdit">Edit Owner</h2> </div> <div mat-dialog-content> <form [formGroup]="form"> + <app-warning-banner *ngIf="isEdit" class="full-row error" class="changes-banner"> + The changes made to this owner will be reflected across the submission. + </app-warning-banner> <div class="form-row"> <div class="full-row"> <mat-label for="type">Owner Type</mat-label> @@ -102,7 +105,10 @@ <h4 class="full-row" *ngIf="type.getRawValue() === OWNER_TYPE.ORGANIZATION">Orga </form> </div> <div mat-dialog-actions class="actions"> - <button mat-stroked-button (click)="onClose()">Cancel</button> - <button mat-flat-button color="primary" *ngIf="!isEdit" (click)="onCreate()">Add</button> - <button mat-flat-button color="primary" *ngIf="isEdit" (click)="onSave()">Save</button> + <button *ngIf="isEdit" mat-stroked-button color="warn" style="margin-right: auto;" class="delete-btn" (click)="onDelete()">Delete Owner</button> + <div class="btn-group"> + <button mat-stroked-button (click)="onClose()" style="margin-left: auto;">Cancel</button> + <button mat-flat-button color="primary" *ngIf="!isEdit" (click)="onCreate()">Add</button> + <button mat-flat-button color="primary" *ngIf="isEdit" (click)="onSave()">Save</button> + </div> </div> diff --git a/portal-frontend/src/app/shared/owner-dialogs/owner-dialog/owner-dialog.component.scss b/portal-frontend/src/app/shared/owner-dialogs/owner-dialog/owner-dialog.component.scss index a31d29d504..86203f8e51 100644 --- a/portal-frontend/src/app/shared/owner-dialogs/owner-dialog/owner-dialog.component.scss +++ b/portal-frontend/src/app/shared/owner-dialogs/owner-dialog/owner-dialog.component.scss @@ -2,11 +2,24 @@ @use '../../../../styles/colors'; .actions { + display: flex; + justify-content: space-between; button:not(:last-child) { margin-right: rem(8) !important; } } +:host::ng-deep { + .warning-banner { + padding: 0.5rem !important; + } +} + + +.mat-button-toggle-checked.mat-button-toggle-appearance-standard { + background-color: colors.$primary-color-light; +} + :host::ng-deep { .field-error { color: colors.$error-color; @@ -17,3 +30,7 @@ margin-top: rem(4); } } + +.delete-btn { + order: -1; +} diff --git a/portal-frontend/src/app/shared/owner-dialogs/owner-dialog/owner-dialog.component.ts b/portal-frontend/src/app/shared/owner-dialogs/owner-dialog/owner-dialog.component.ts index e41b95fa02..60fef113f0 100644 --- a/portal-frontend/src/app/shared/owner-dialogs/owner-dialog/owner-dialog.component.ts +++ b/portal-frontend/src/app/shared/owner-dialogs/owner-dialog/owner-dialog.component.ts @@ -1,4 +1,4 @@ -import { Component, Inject } from '@angular/core'; +import { Component, Inject, Input } from '@angular/core'; import { FormControl, FormGroup, Validators } from '@angular/forms'; import { MatButtonToggleChange } from '@angular/material/button-toggle'; import { MAT_DIALOG_DATA, MatDialog, MatDialogRef } from '@angular/material/dialog'; @@ -12,6 +12,7 @@ import { import { ApplicationOwnerService } from '../../../services/application-owner/application-owner.service'; import { CodeService } from '../../../services/code/code.service'; import { NoticeOfIntentDocumentService } from '../../../services/notice-of-intent-document/notice-of-intent-document.service'; +import { ConfirmationDialogService } from '../../confirmation-dialog/confirmation-dialog.service'; import { NoticeOfIntentOwnerCreateDto } from '../../../services/notice-of-intent-owner/notice-of-intent-owner.dto'; import { NoticeOfIntentOwnerService } from '../../../services/notice-of-intent-owner/notice-of-intent-owner.service'; import { DOCUMENT_SOURCE, DOCUMENT_TYPE, DocumentTypeDto } from '../../dto/document.dto'; @@ -56,6 +57,7 @@ export class OwnerDialogComponent { private dialogRef: MatDialogRef<OwnerDialogComponent>, private codeService: CodeService, private dialog: MatDialog, + private confDialogService: ConfirmationDialogService, @Inject(MAT_DIALOG_DATA) public data: { fileId: string; @@ -137,6 +139,19 @@ export class OwnerDialogComponent { this.dialogRef.close(); } + async onDelete() { + this.confDialogService + .openDialog({ + body: `This action will remove ${this.firstName.value} ${this.lastName.value} and its usage from the entire application. Are you sure you want to remove this owner? `, + }) + .subscribe(async (didConfirm) => { + if (didConfirm) { + await this.data.ownerService.delete(this.existingUuid ?? ''); + this.dialogRef.close({ ownerDeleted: true, deletedOwnerId: this.existingUuid}); + } + }); + } + async onSave() { if (this.form.valid) { const document = await this.uploadPendingFile(this.pendingFile); diff --git a/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.html b/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.html index aee1ab6652..cdc5869db9 100644 --- a/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.html +++ b/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.html @@ -1,18 +1,14 @@ <div class="owner-table-wrapper"> <table class="owner-table" mat-table [dataSource]="dataSource"> - <ng-container matColumnDef="type"> - <th mat-header-cell [hidden]="isCrown" *matHeaderCellDef>Type</th> - <td mat-cell [hidden]="isCrown" *matCellDef="let element">{{ element.type.label }}</td> - </ng-container> <ng-container matColumnDef="displayName"> - <th mat-header-cell *matHeaderCellDef>Full Name</th> + <th mat-header-cell *matHeaderCellDef>Land Owners</th> <td mat-cell *matCellDef="let element">{{ element.displayName }}</td> </ng-container> <ng-container *ngIf="!isCrown" matColumnDef="organizationName"> <ng-container *ngIf="!isShowAllOwners"> - <th mat-header-cell *matHeaderCellDef>Organization Name</th> + <th mat-header-cell *matHeaderCellDef>Organization</th> </ng-container> <ng-container *ngIf="isShowAllOwners"> <th mat-header-cell *matHeaderCellDef>Organization Name / Ministry / Department</th> @@ -39,10 +35,24 @@ <td mat-cell *matCellDef="let element">{{ element.email }}</td> </ng-container> + <ng-container matColumnDef="corporateSummary"> + <th mat-header-cell *matHeaderCellDef>Corporate Summary</th> + <td mat-cell *matCellDef="let element"> + <div *ngIf="element.ownershipTypeCode !== PARCEL_OWNERSHIP_TYPES.CROWN"> + <a *ngIf="element.corporateSummary" (click)="onOpenFile(element.corporateSummary.uuid)">{{ + element.corporateSummary.fileName + }}</a> + <div class="no-data" *ngIf="!element.corporateSummary"> + <div class="text">Not Applicable</div> + </div> + </div> + </td> + </ng-container> + <ng-container matColumnDef="actions"> <th mat-header-cell *matHeaderCellDef>Actions</th> <td mat-cell class="actions" *matCellDef="let element"> - <button [disabled]="_disabled" (click)="onEdit(element)" mat-flat-button color="primary">Edit</button> + <button [disabled]="_disabled" (click)="onEdit(element)" mat-stroked-button color="primary">Edit</button> <button [disabled]="_disabled" *ngIf="parcelUuid" diff --git a/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.ts b/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.ts index e0e3dd05fd..fc3f1941a2 100644 --- a/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.ts +++ b/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.ts @@ -2,6 +2,7 @@ import { Component, EventEmitter, Input, Output } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; import { MatTableDataSource } from '@angular/material/table'; import { ApplicationDocumentService } from '../../../services/application-document/application-document.service'; +import { PARCEL_OWNERSHIP_TYPE } from 'src/app/services/application-parcel/application-parcel.dto'; import { ApplicationOwnerDto } from '../../../services/application-owner/application-owner.dto'; import { ApplicationOwnerService } from '../../../services/application-owner/application-owner.service'; import { NoticeOfIntentDocumentService } from '../../../services/notice-of-intent-document/notice-of-intent-document.service'; @@ -20,6 +21,8 @@ import { OwnerDialogComponent } from '../owner-dialog/owner-dialog.component'; export class ParcelOwnersComponent { @Output() onOwnersUpdated = new EventEmitter<void>(); @Output() onOwnerRemoved = new EventEmitter<string>(); + + PARCEL_OWNERSHIP_TYPES = PARCEL_OWNERSHIP_TYPE; @Input() ownerService!: ApplicationOwnerService | NoticeOfIntentOwnerService; @Input() documentService!: ApplicationDocumentService | NoticeOfIntentDocumentService; @@ -55,9 +58,13 @@ export class ParcelOwnersComponent { @Input() isShowAllOwners = false; _disabled = false; - displayedColumns = ['type', 'displayName', 'organizationName', 'phone', 'email', 'actions']; + displayedColumns = ['displayName', 'organizationName', 'phone', 'email', 'corporateSummary', 'actions']; - constructor(private dialog: MatDialog, private confDialogService: ConfirmationDialogService) {} + constructor( + private dialog: MatDialog, + private confDialogService: ConfirmationDialogService, + private applicationDocumentService: ApplicationDocumentService + ) {} onEdit(owner: ApplicationOwnerDto) { let dialog; @@ -89,12 +96,24 @@ export class ParcelOwnersComponent { this.onOwnersUpdated.emit(); } }); + dialog.afterClosed().subscribe((result) => { + if (result.ownerDeleted) { + this.dataSource.data = this.dataSource.data.filter((owner: ApplicationOwnerDto | NoticeOfIntentOwnerDto) => owner.uuid !== result.deletedOwnerId); + } + }); } async onRemove(uuid: string) { this.onOwnerRemoved.emit(uuid); } + async onOpenFile(uuid: string) { + const res = await this.applicationDocumentService.openFile(uuid); + if (res) { + window.open(res.url, '_blank'); + } + } + async onDelete(owner: ApplicationOwnerDto | NoticeOfIntentOwnerDto) { this.confDialogService .openDialog({ From 11dda5e58f3a2cfb758cbe59f824f50296c5077b Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Mon, 27 Nov 2023 09:55:48 -0800 Subject: [PATCH 684/954] fix --- .../owner-dialogs/parcel-owners/parcel-owners.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.ts b/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.ts index fc3f1941a2..df4f04b8bc 100644 --- a/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.ts +++ b/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.ts @@ -2,7 +2,7 @@ import { Component, EventEmitter, Input, Output } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; import { MatTableDataSource } from '@angular/material/table'; import { ApplicationDocumentService } from '../../../services/application-document/application-document.service'; -import { PARCEL_OWNERSHIP_TYPE } from 'src/app/services/application-parcel/application-parcel.dto'; +import { PARCEL_OWNERSHIP_TYPE } from '../../../services/application-parcel/application-parcel.dto'; import { ApplicationOwnerDto } from '../../../services/application-owner/application-owner.dto'; import { ApplicationOwnerService } from '../../../services/application-owner/application-owner.service'; import { NoticeOfIntentDocumentService } from '../../../services/notice-of-intent-document/notice-of-intent-document.service'; From ed56e3a7a857cafa328ca740ff4f3e6d2064ff78 Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Mon, 27 Nov 2023 10:15:19 -0800 Subject: [PATCH 685/954] fixes --- .../parcel-owners.component.spec.ts | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.spec.ts b/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.spec.ts index 1707807c8b..25b04c4bb0 100644 --- a/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.spec.ts +++ b/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.spec.ts @@ -1,6 +1,8 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MatDialog } from '@angular/material/dialog'; +import { MatSnackBarModule } from '@angular/material/snack-bar'; +import { HttpClientTestingModule } from '@angular/common/http/testing'; import { ApplicationOwnerService } from '../../../services/application-owner/application-owner.service'; import { ConfirmationDialogService } from '../../confirmation-dialog/confirmation-dialog.service'; @@ -12,19 +14,11 @@ describe('ParcelOwnersComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ + imports: [HttpClientTestingModule, MatSnackBarModule], providers: [ - { - provide: MatDialog, - useValue: {}, - }, - { - provide: ApplicationOwnerService, - useValue: {}, - }, - { - provide: ConfirmationDialogService, - useValue: {}, - }, + { provide: MatDialog, useValue: {} }, + { provide: ApplicationOwnerService, useValue: {} }, + { provide: ConfirmationDialogService, useValue: {} }, ], declarations: [ParcelOwnersComponent], schemas: [NO_ERRORS_SCHEMA], From 24f53e0e20e7d9e8daac35f5dddf8590da78b4d0 Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Mon, 27 Nov 2023 13:28:25 -0800 Subject: [PATCH 686/954] show only released decisions --- .../public-application-search-view.entity.ts | 1 + ...701120360085-show-released-outcome-only.ts | 20 +++++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1701120360085-show-released-outcome-only.ts diff --git a/services/apps/alcs/src/portal/public/search/application/public-application-search-view.entity.ts b/services/apps/alcs/src/portal/public/search/application/public-application-search-view.entity.ts index 85cad3018f..b4165055b0 100644 --- a/services/apps/alcs/src/portal/public/search/application/public-application-search-view.entity.ts +++ b/services/apps/alcs/src/portal/public/search/application/public-application-search-view.entity.ts @@ -79,6 +79,7 @@ import { LinkedStatusType } from '../public-search.dto'; 'RANK() OVER (PARTITION BY application_uuid ORDER BY date DESC, audit_created_at DESC)', 'dest_rank', ) + .where('is_draft = FALSE') .from(ApplicationDecision, 'decision') .getQuery(), 'decisions', diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1701120360085-show-released-outcome-only.ts b/services/apps/alcs/src/providers/typeorm/migrations/1701120360085-show-released-outcome-only.ts new file mode 100644 index 0000000000..2ea6480bd5 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1701120360085-show-released-outcome-only.ts @@ -0,0 +1,20 @@ +import { MigrationInterface, QueryRunner } from "typeorm"; + +export class ShowReleasedOutcomeOnly1701120360085 implements MigrationInterface { + name = 'ShowReleasedOutcomeOnly1701120360085' + + public async up(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query(`DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, ["VIEW","public_application_submission_search_view","alcs"]); + await queryRunner.query(`DROP VIEW "alcs"."public_application_submission_search_view"`); + await queryRunner.query(`CREATE VIEW "alcs"."public_application_submission_search_view" AS SELECT "app_sub"."uuid" AS "uuid", "app_sub"."applicant" AS "applicant", "app"."uuid" AS "application_uuid", "applicationType"."audit_deleted_date_at" AS "applicationType_audit_deleted_date_at", "applicationType"."audit_created_at" AS "applicationType_audit_created_at", "applicationType"."audit_updated_at" AS "applicationType_audit_updated_at", "applicationType"."audit_created_by" AS "applicationType_audit_created_by", "applicationType"."audit_updated_by" AS "applicationType_audit_updated_by", "applicationType"."label" AS "applicationType_label", "applicationType"."code" AS "applicationType_code", "applicationType"."description" AS "applicationType_description", "applicationType"."short_label" AS "applicationType_short_label", "applicationType"."background_color" AS "applicationType_background_color", "applicationType"."text_color" AS "applicationType_text_color", "applicationType"."html_description" AS "applicationType_html_description", "applicationType"."portal_label" AS "applicationType_portal_label", "applicationType"."portal_order" AS "applicationType_portal_order", "applicationType"."requires_government_review" AS "applicationType_requires_government_review", "localGovernment"."name" AS "local_government_name", "app_sub"."file_number" AS "file_number", "app_sub"."local_government_uuid" AS "local_government_uuid", "app_sub"."type_code" AS "application_type_code", "app"."date_submitted_to_alc" AS "date_submitted_to_alc", "app"."decision_date" AS "decision_date", decision_date.outcome AS "outcome", decision_date.dest_rank AS "dest_rank", "app"."region_code" AS "application_region_code", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid") AS "status" FROM "alcs"."application_submission" "app_sub" INNER JOIN "alcs"."application" "app" ON "app"."file_number" = "app_sub"."file_number" AND "app"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."application_type" "applicationType" ON "app_sub"."type_code" = "applicationType"."code" AND "applicationType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "app_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."application_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "app_sub"."uuid" LEFT JOIN (SELECT DISTINCT ON (application_uuid) decisiondate AS "date", outcome AS "outcome", dest_rank AS "dest_rank", applicationuuid AS "application_uuid" FROM "alcs"."application_decision" "decision_date", (SELECT outcome_code AS "outcome", date AS "decisiondate", application_uuid AS "applicationuuid", RANK() OVER (PARTITION BY application_uuid ORDER BY date DESC, audit_created_at DESC) AS "dest_rank" FROM "alcs"."application_decision" "decision" WHERE ( is_draft = FALSE ) AND ( "decision"."audit_deleted_date_at" IS NULL )) "decisions" WHERE dest_rank = 1) "decision_date" ON decision_date."application_uuid" = "app"."uuid" WHERE ( "app_sub"."is_draft" = FALSE AND ("app"."date_received_all_items" IS NOT NULL AND "app"."date_received_all_items" <= NOW()) AND alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid")->>'status_type_code' != 'CNCL' AND decision_date.dest_rank = 1 ) AND ( "app_sub"."audit_deleted_date_at" IS NULL )`); + await queryRunner.query(`INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, ["alcs","VIEW","public_application_submission_search_view","SELECT \"app_sub\".\"uuid\" AS \"uuid\", \"app_sub\".\"applicant\" AS \"applicant\", \"app\".\"uuid\" AS \"application_uuid\", \"applicationType\".\"audit_deleted_date_at\" AS \"applicationType_audit_deleted_date_at\", \"applicationType\".\"audit_created_at\" AS \"applicationType_audit_created_at\", \"applicationType\".\"audit_updated_at\" AS \"applicationType_audit_updated_at\", \"applicationType\".\"audit_created_by\" AS \"applicationType_audit_created_by\", \"applicationType\".\"audit_updated_by\" AS \"applicationType_audit_updated_by\", \"applicationType\".\"label\" AS \"applicationType_label\", \"applicationType\".\"code\" AS \"applicationType_code\", \"applicationType\".\"description\" AS \"applicationType_description\", \"applicationType\".\"short_label\" AS \"applicationType_short_label\", \"applicationType\".\"background_color\" AS \"applicationType_background_color\", \"applicationType\".\"text_color\" AS \"applicationType_text_color\", \"applicationType\".\"html_description\" AS \"applicationType_html_description\", \"applicationType\".\"portal_label\" AS \"applicationType_portal_label\", \"applicationType\".\"portal_order\" AS \"applicationType_portal_order\", \"applicationType\".\"requires_government_review\" AS \"applicationType_requires_government_review\", \"localGovernment\".\"name\" AS \"local_government_name\", \"app_sub\".\"file_number\" AS \"file_number\", \"app_sub\".\"local_government_uuid\" AS \"local_government_uuid\", \"app_sub\".\"type_code\" AS \"application_type_code\", \"app\".\"date_submitted_to_alc\" AS \"date_submitted_to_alc\", \"app\".\"decision_date\" AS \"decision_date\", decision_date.outcome AS \"outcome\", decision_date.dest_rank AS \"dest_rank\", \"app\".\"region_code\" AS \"application_region_code\", GREATEST(status_link.effective_date, decision_date.date) AS \"last_update\", alcs.get_current_status_for_application_submission_by_uuid(\"app_sub\".\"uuid\") AS \"status\" FROM \"alcs\".\"application_submission\" \"app_sub\" INNER JOIN \"alcs\".\"application\" \"app\" ON \"app\".\"file_number\" = \"app_sub\".\"file_number\" AND \"app\".\"audit_deleted_date_at\" IS NULL INNER JOIN \"alcs\".\"application_type\" \"applicationType\" ON \"app_sub\".\"type_code\" = \"applicationType\".\"code\" AND \"applicationType\".\"audit_deleted_date_at\" IS NULL LEFT JOIN \"alcs\".\"local_government\" \"localGovernment\" ON \"app_sub\".\"local_government_uuid\" = \"localGovernment\".\"uuid\" AND \"localGovernment\".\"audit_deleted_date_at\" IS NULL LEFT JOIN (SELECT MAX(\"effective_date\") AS \"effective_date\", submission_uuid AS \"submission_uuid\" FROM \"alcs\".\"application_submission_to_submission_status\" \"status_link\" GROUP BY submission_uuid) \"status_link\" ON status_link.\"submission_uuid\" = \"app_sub\".\"uuid\" LEFT JOIN (SELECT DISTINCT ON (application_uuid) decisiondate AS \"date\", outcome AS \"outcome\", dest_rank AS \"dest_rank\", applicationuuid AS \"application_uuid\" FROM \"alcs\".\"application_decision\" \"decision_date\", (SELECT outcome_code AS \"outcome\", date AS \"decisiondate\", application_uuid AS \"applicationuuid\", RANK() OVER (PARTITION BY application_uuid ORDER BY date DESC, audit_created_at DESC) AS \"dest_rank\" FROM \"alcs\".\"application_decision\" \"decision\" WHERE ( is_draft = FALSE ) AND ( \"decision\".\"audit_deleted_date_at\" IS NULL )) \"decisions\" WHERE dest_rank = 1) \"decision_date\" ON decision_date.\"application_uuid\" = \"app\".\"uuid\" WHERE ( \"app_sub\".\"is_draft\" = FALSE AND (\"app\".\"date_received_all_items\" IS NOT NULL AND \"app\".\"date_received_all_items\" <= NOW()) AND alcs.get_current_status_for_application_submission_by_uuid(\"app_sub\".\"uuid\")->>'status_type_code' != 'CNCL' AND decision_date.dest_rank = 1 ) AND ( \"app_sub\".\"audit_deleted_date_at\" IS NULL )"]); + } + + public async down(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query(`DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, ["VIEW","public_application_submission_search_view","alcs"]); + await queryRunner.query(`DROP VIEW "alcs"."public_application_submission_search_view"`); + await queryRunner.query(`CREATE VIEW "alcs"."public_application_submission_search_view" AS SELECT "app_sub"."uuid" AS "uuid", "app_sub"."applicant" AS "applicant", "app"."uuid" AS "application_uuid", "applicationType"."audit_deleted_date_at" AS "applicationType_audit_deleted_date_at", "applicationType"."audit_created_at" AS "applicationType_audit_created_at", "applicationType"."audit_updated_at" AS "applicationType_audit_updated_at", "applicationType"."audit_created_by" AS "applicationType_audit_created_by", "applicationType"."audit_updated_by" AS "applicationType_audit_updated_by", "applicationType"."label" AS "applicationType_label", "applicationType"."code" AS "applicationType_code", "applicationType"."description" AS "applicationType_description", "applicationType"."short_label" AS "applicationType_short_label", "applicationType"."background_color" AS "applicationType_background_color", "applicationType"."text_color" AS "applicationType_text_color", "applicationType"."html_description" AS "applicationType_html_description", "applicationType"."portal_label" AS "applicationType_portal_label", "applicationType"."portal_order" AS "applicationType_portal_order", "applicationType"."requires_government_review" AS "applicationType_requires_government_review", "localGovernment"."name" AS "local_government_name", "app_sub"."file_number" AS "file_number", "app_sub"."local_government_uuid" AS "local_government_uuid", "app_sub"."type_code" AS "application_type_code", "app"."date_submitted_to_alc" AS "date_submitted_to_alc", "app"."decision_date" AS "decision_date", decision_date.outcome AS "outcome", decision_date.dest_rank AS "dest_rank", "app"."region_code" AS "application_region_code", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid") AS "status" FROM "alcs"."application_submission" "app_sub" INNER JOIN "alcs"."application" "app" ON "app"."file_number" = "app_sub"."file_number" AND "app"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."application_type" "applicationType" ON "app_sub"."type_code" = "applicationType"."code" AND "applicationType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "app_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."application_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "app_sub"."uuid" LEFT JOIN (SELECT DISTINCT ON (application_uuid) decisiondate AS "date", outcome AS "outcome", dest_rank AS "dest_rank", applicationuuid AS "application_uuid" FROM "alcs"."application_decision" "decision_date", (SELECT outcome_code AS "outcome", date AS "decisiondate", application_uuid AS "applicationuuid", RANK() OVER (PARTITION BY application_uuid ORDER BY date DESC, audit_created_at DESC, CASE WHEN is_draft = FALSE THEN 1 ELSE 0 END) AS "dest_rank" FROM "alcs"."application_decision" "decision" WHERE "decision"."audit_deleted_date_at" IS NULL) "decisions" WHERE dest_rank = 1) "decision_date" ON decision_date."application_uuid" = "app"."uuid" WHERE ( "app_sub"."is_draft" = FALSE AND ("app"."date_received_all_items" IS NOT NULL AND "app"."date_received_all_items" <= NOW()) AND alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid")->>'status_type_code' != 'CNCL' AND decision_date.dest_rank = 1 ) AND ( "app_sub"."audit_deleted_date_at" IS NULL )`); + await queryRunner.query(`INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, ["alcs","VIEW","public_application_submission_search_view","SELECT \"app_sub\".\"uuid\" AS \"uuid\", \"app_sub\".\"applicant\" AS \"applicant\", \"app\".\"uuid\" AS \"application_uuid\", \"applicationType\".\"audit_deleted_date_at\" AS \"applicationType_audit_deleted_date_at\", \"applicationType\".\"audit_created_at\" AS \"applicationType_audit_created_at\", \"applicationType\".\"audit_updated_at\" AS \"applicationType_audit_updated_at\", \"applicationType\".\"audit_created_by\" AS \"applicationType_audit_created_by\", \"applicationType\".\"audit_updated_by\" AS \"applicationType_audit_updated_by\", \"applicationType\".\"label\" AS \"applicationType_label\", \"applicationType\".\"code\" AS \"applicationType_code\", \"applicationType\".\"description\" AS \"applicationType_description\", \"applicationType\".\"short_label\" AS \"applicationType_short_label\", \"applicationType\".\"background_color\" AS \"applicationType_background_color\", \"applicationType\".\"text_color\" AS \"applicationType_text_color\", \"applicationType\".\"html_description\" AS \"applicationType_html_description\", \"applicationType\".\"portal_label\" AS \"applicationType_portal_label\", \"applicationType\".\"portal_order\" AS \"applicationType_portal_order\", \"applicationType\".\"requires_government_review\" AS \"applicationType_requires_government_review\", \"localGovernment\".\"name\" AS \"local_government_name\", \"app_sub\".\"file_number\" AS \"file_number\", \"app_sub\".\"local_government_uuid\" AS \"local_government_uuid\", \"app_sub\".\"type_code\" AS \"application_type_code\", \"app\".\"date_submitted_to_alc\" AS \"date_submitted_to_alc\", \"app\".\"decision_date\" AS \"decision_date\", decision_date.outcome AS \"outcome\", decision_date.dest_rank AS \"dest_rank\", \"app\".\"region_code\" AS \"application_region_code\", GREATEST(status_link.effective_date, decision_date.date) AS \"last_update\", alcs.get_current_status_for_application_submission_by_uuid(\"app_sub\".\"uuid\") AS \"status\" FROM \"alcs\".\"application_submission\" \"app_sub\" INNER JOIN \"alcs\".\"application\" \"app\" ON \"app\".\"file_number\" = \"app_sub\".\"file_number\" AND \"app\".\"audit_deleted_date_at\" IS NULL INNER JOIN \"alcs\".\"application_type\" \"applicationType\" ON \"app_sub\".\"type_code\" = \"applicationType\".\"code\" AND \"applicationType\".\"audit_deleted_date_at\" IS NULL LEFT JOIN \"alcs\".\"local_government\" \"localGovernment\" ON \"app_sub\".\"local_government_uuid\" = \"localGovernment\".\"uuid\" AND \"localGovernment\".\"audit_deleted_date_at\" IS NULL LEFT JOIN (SELECT MAX(\"effective_date\") AS \"effective_date\", submission_uuid AS \"submission_uuid\" FROM \"alcs\".\"application_submission_to_submission_status\" \"status_link\" GROUP BY submission_uuid) \"status_link\" ON status_link.\"submission_uuid\" = \"app_sub\".\"uuid\" LEFT JOIN (SELECT DISTINCT ON (application_uuid) decisiondate AS \"date\", outcome AS \"outcome\", dest_rank AS \"dest_rank\", applicationuuid AS \"application_uuid\" FROM \"alcs\".\"application_decision\" \"decision_date\", (SELECT outcome_code AS \"outcome\", date AS \"decisiondate\", application_uuid AS \"applicationuuid\", RANK() OVER (PARTITION BY application_uuid ORDER BY date DESC, audit_created_at DESC, CASE WHEN is_draft = FALSE THEN 1 ELSE 0 END) AS \"dest_rank\" FROM \"alcs\".\"application_decision\" \"decision\" WHERE \"decision\".\"audit_deleted_date_at\" IS NULL) \"decisions\" WHERE dest_rank = 1) \"decision_date\" ON decision_date.\"application_uuid\" = \"app\".\"uuid\" WHERE ( \"app_sub\".\"is_draft\" = FALSE AND (\"app\".\"date_received_all_items\" IS NOT NULL AND \"app\".\"date_received_all_items\" <= NOW()) AND alcs.get_current_status_for_application_submission_by_uuid(\"app_sub\".\"uuid\")->>'status_type_code' != 'CNCL' AND decision_date.dest_rank = 1 ) AND ( \"app_sub\".\"audit_deleted_date_at\" IS NULL )"]); + } + +} From 46ac34f01edd1b8cf7f7d9dd57ee6b646ef0d776 Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Mon, 27 Nov 2023 16:19:14 -0800 Subject: [PATCH 687/954] parcel owner ux changes --- .../parcel-details/parcel-entry/parcel-entry.component.scss | 2 +- .../parcel-details/parcel-entry/parcel-entry.component.ts | 2 +- .../parcels/parcel-entry/parcel-entry.component.scss | 2 +- .../owner-dialogs/parcel-owners/parcel-owners.component.scss | 4 ++++ 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.scss b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.scss index 837f498a38..cb3f2324a3 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.scss +++ b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.scss @@ -12,7 +12,7 @@ } .owner-search-option { - margin: rem(8) 0 !important; + margin: rem(12) 0 rem(20)!important; } .link-text { diff --git a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts index 0a14a457fd..87d36d3214 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts @@ -342,7 +342,7 @@ export class ParcelEntryComponent implements OnInit { this.updateParcelOwners(selectedOwners); } } else { - event.preventDefault() + this.onOwnerRemoved(owner.uuid); } } diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.scss b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.scss index 7f8d33f206..8082c43284 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.scss +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.scss @@ -12,7 +12,7 @@ } .owner-search-option { - margin: rem(8) 0 !important; + margin: rem(12) 0 rem(20)!important; } .link-text { diff --git a/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.scss b/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.scss index 82fd102c0d..58aa760552 100644 --- a/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.scss +++ b/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.scss @@ -12,3 +12,7 @@ color: colors.$grey-dark; padding-top: rem(12); } + +.text { + color: colors.$grey-dark; +} From 9e860b9e34b03c8049412148eba5cb79b2f495d9 Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Tue, 28 Nov 2023 09:25:17 -0800 Subject: [PATCH 688/954] Set current tab name for home component from URL --- .../src/app/features/home/home.component.ts | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/portal-frontend/src/app/features/home/home.component.ts b/portal-frontend/src/app/features/home/home.component.ts index 82c85cad12..719d83a874 100644 --- a/portal-frontend/src/app/features/home/home.component.ts +++ b/portal-frontend/src/app/features/home/home.component.ts @@ -5,6 +5,7 @@ import { UserDto } from '../../services/authentication/authentication.dto'; import { AuthenticationService } from '../../services/authentication/authentication.service'; import { MOBILE_BREAKPOINT } from '../../shared/utils/breakpoints'; import { CreateSubmissionDialogComponent } from '../create-submission-dialog/create-submission-dialog.component'; +import { ActivatedRoute, Router } from '@angular/router'; @Component({ selector: 'app-home', @@ -17,13 +18,23 @@ export class HomeComponent implements OnInit, OnDestroy { this.isMobile = window.innerWidth <= MOBILE_BREAKPOINT; } + currentTabName: string = ''; + $destroy = new Subject<void>(); isMobile = false; profile: UserDto | undefined; - constructor(private authenticationService: AuthenticationService, private dialog: MatDialog) {} + constructor( + private authenticationService: AuthenticationService, + private dialog: MatDialog, + private route: ActivatedRoute + ) {} ngOnInit(): void { + this.route.params.subscribe((params) => { + this.currentTabName = params['submissionType']; + }); + this.authenticationService.$currentProfile.pipe(takeUntil(this.$destroy)).subscribe((profile) => { this.profile = profile; }); From 6cefeb2f4852be4c5bbc4482e6cd3e1afcdcc35c Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Tue, 28 Nov 2023 09:26:45 -0800 Subject: [PATCH 689/954] Pass current tab name from home to inbox --- portal-frontend/src/app/features/home/home.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/portal-frontend/src/app/features/home/home.component.html b/portal-frontend/src/app/features/home/home.component.html index cf97b93b89..330e0e2531 100644 --- a/portal-frontend/src/app/features/home/home.component.html +++ b/portal-frontend/src/app/features/home/home.component.html @@ -14,6 +14,6 @@ <h3>Portal Inbox</h3> </div> </div> <div class="navigation"> - <app-inbox></app-inbox> + <app-inbox [currentTab]="currentTab"></app-inbox> </div> </div> From 3ca1d20f91bcf04b889730dc78b938d8c5f7a859 Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Tue, 28 Nov 2023 09:27:23 -0800 Subject: [PATCH 690/954] Assign each inbox tab component text labels --- .../src/app/features/home/inbox/inbox.component.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/portal-frontend/src/app/features/home/inbox/inbox.component.html b/portal-frontend/src/app/features/home/inbox/inbox.component.html index bacc090743..c846c4948f 100644 --- a/portal-frontend/src/app/features/home/inbox/inbox.component.html +++ b/portal-frontend/src/app/features/home/inbox/inbox.component.html @@ -103,7 +103,7 @@ <mat-spinner></mat-spinner> </div> <mat-tab-group *ngIf="!isLoading" mat-align-tabs="start" mat-stretch-tabs #searchResultTabs> - <mat-tab> + <mat-tab label="applications"> <ng-template mat-tab-label> Applications: {{ applicationTotal }} </ng-template> <app-inbox-list *ngIf="isMobile" @@ -122,7 +122,7 @@ ></app-inbox-table> </mat-tab> - <mat-tab> + <mat-tab label="nois"> <ng-template mat-tab-label> Notice of Intent: {{ noticeOfIntentTotal }} </ng-template> <app-inbox-list *ngIf="isMobile" @@ -141,7 +141,7 @@ ></app-inbox-table> </mat-tab> - <mat-tab> + <mat-tab label="srws"> <ng-template mat-tab-label> Notification of SRW: {{ notificationTotal }} </ng-template> <app-inbox-list *ngIf="isMobile" From 0f72316cdb7d3d3a27b312e992c9b8ef00ef93cb Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Tue, 28 Nov 2023 10:24:58 -0800 Subject: [PATCH 691/954] Fix tab name property in home template --- portal-frontend/src/app/features/home/home.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/portal-frontend/src/app/features/home/home.component.html b/portal-frontend/src/app/features/home/home.component.html index 330e0e2531..d1de2693db 100644 --- a/portal-frontend/src/app/features/home/home.component.html +++ b/portal-frontend/src/app/features/home/home.component.html @@ -14,6 +14,6 @@ <h3>Portal Inbox</h3> </div> </div> <div class="navigation"> - <app-inbox [currentTab]="currentTab"></app-inbox> + <app-inbox [currentTabName]="currentTabName"></app-inbox> </div> </div> From bf7da878ac65e1997b3111bae03e8af3d69f1328 Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Tue, 28 Nov 2023 10:29:18 -0800 Subject: [PATCH 692/954] Hijack tab click to change URL No longer changes current tab. Control has been delegated to routing. --- .../features/home/inbox/inbox.component.ts | 21 ++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/portal-frontend/src/app/features/home/inbox/inbox.component.ts b/portal-frontend/src/app/features/home/inbox/inbox.component.ts index f6da2d3a31..6426405932 100644 --- a/portal-frontend/src/app/features/home/inbox/inbox.component.ts +++ b/portal-frontend/src/app/features/home/inbox/inbox.component.ts @@ -1,4 +1,4 @@ -import { Component, HostListener, OnDestroy, OnInit, ViewChild } from '@angular/core'; +import { Component, HostListener, OnDestroy, OnInit, ViewChild, Input } from '@angular/core'; import { FormControl, FormGroup } from '@angular/forms'; import { MatPaginator } from '@angular/material/paginator'; import { MatSort } from '@angular/material/sort'; @@ -17,6 +17,7 @@ import { ToastService } from '../../../services/toast/toast.service'; import { MOBILE_BREAKPOINT } from '../../../shared/utils/breakpoints'; import { FileTypeFilterDropDownComponent } from '../../public/search/file-type-filter-drop-down/file-type-filter-drop-down.component'; import { TableChange } from '../../public/search/search.interface'; +import { Router } from '@angular/router'; export interface InboxResultDto extends BaseInboxResultDto { statusType: ApplicationStatusDto; @@ -37,11 +38,24 @@ const CLASS_TO_URL_MAP: Record<string, string> = { export class InboxComponent implements OnInit, OnDestroy { $destroy = new Subject<void>(); + tabGroup!: MatTabGroup; + @ViewChild(MatPaginator) paginator!: MatPaginator; @ViewChild(MatSort) sort?: MatSort; - @ViewChild('searchResultTabs') tabGroup!: MatTabGroup; + @ViewChild(MatTabGroup) + set tab(tabGroup: MatTabGroup) { + if (tabGroup) { + // Override click handler to change URL + tabGroup._handleClick = (_tab, _tabHeader, index) => { + this.router.navigateByUrl(`/home/${_tab.textLabel}`); + }; + } + this.tabGroup = tabGroup; + } @ViewChild('fileTypeDropDown') fileTypeFilterDropDownComponent!: FileTypeFilterDropDownComponent; + @Input() currentTabName: string = ''; + applications: InboxResultDto[] = []; applicationTotal = 0; @@ -106,7 +120,8 @@ export class InboxComponent implements OnInit, OnDestroy { private inboxService: InboxService, private toastService: ToastService, private titleService: Title, - private authenticationService: AuthenticationService + private authenticationService: AuthenticationService, + private router: Router ) { this.titleService.setTitle('ALC Portal | Inbox'); } From 652295c5b452a06fd420194008c12e59aecf0984 Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Tue, 28 Nov 2023 10:31:30 -0800 Subject: [PATCH 693/954] Update current tab from URL --- .../features/home/inbox/inbox.component.ts | 37 ++++++++++++++----- 1 file changed, 27 insertions(+), 10 deletions(-) diff --git a/portal-frontend/src/app/features/home/inbox/inbox.component.ts b/portal-frontend/src/app/features/home/inbox/inbox.component.ts index 6426405932..99a8e3f454 100644 --- a/portal-frontend/src/app/features/home/inbox/inbox.component.ts +++ b/portal-frontend/src/app/features/home/inbox/inbox.component.ts @@ -1,4 +1,4 @@ -import { Component, HostListener, OnDestroy, OnInit, ViewChild, Input } from '@angular/core'; +import { Component, HostListener, OnDestroy, OnInit, ViewChild, Input, SimpleChanges } from '@angular/core'; import { FormControl, FormGroup } from '@angular/forms'; import { MatPaginator } from '@angular/material/paginator'; import { MatSort } from '@angular/material/sort'; @@ -148,6 +148,23 @@ export class InboxComponent implements OnInit, OnDestroy { }); } + ngOnChanges(changes: SimpleChanges) { + this.currentTabName = changes['currentTabName'].currentValue; + this.tabGroup.selectedIndex = this.tabIndexFromName(this.currentTabName); + } + + tabIndexFromName(tabName: string) { + // Default to 'application' tab + if (!this.tabGroup) return 0; + + return this.tabGroup._tabs + .map((a) => a.textLabel) + .reduce((iPrev, b, i) => { + if (b == tabName) return i; + return iPrev; + }, 0); + } + private async setup() { await this.loadStatuses(); await this.onSubmit(); @@ -159,6 +176,15 @@ export class InboxComponent implements OnInit, OnDestroy { } async onSubmit() { + await this.populateTable(); + + // push tab activation to next render cycle, after the tabGroup is rendered + setTimeout(() => { + this.tabGroup.selectedIndex = this.tabIndexFromName(this.currentTabName); + }); + } + + async populateTable() { const searchParams = this.getSearchParams(); this.isLoading = true; @@ -168,8 +194,6 @@ export class InboxComponent implements OnInit, OnDestroy { // push tab activation to next render cycle, after the tabGroup is rendered setTimeout(() => { this.mapSearchResults(result); - - this.setActiveTab(); }); } @@ -328,13 +352,6 @@ export class InboxComponent implements OnInit, OnDestroy { this.notifications = this.hydrateResult(searchResult.notifications); } - private setActiveTab() { - //Keep this in Tab Order - const searchCounts = [this.applicationTotal, this.noticeOfIntentTotal, this.notificationTotal]; - - this.tabGroup.selectedIndex = searchCounts.indexOf(Math.max(...searchCounts)); - } - private formatStringSearchParam(value: string | undefined | null) { if (value === undefined || value === null) { return undefined; From aad155c29cf33b8156cc3ee21cd07e02577f8ae5 Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Tue, 28 Nov 2023 10:39:03 -0800 Subject: [PATCH 694/954] Fix trying to set current tab before rendered --- .../src/app/features/home/inbox/inbox.component.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/portal-frontend/src/app/features/home/inbox/inbox.component.ts b/portal-frontend/src/app/features/home/inbox/inbox.component.ts index 99a8e3f454..28084b94f8 100644 --- a/portal-frontend/src/app/features/home/inbox/inbox.component.ts +++ b/portal-frontend/src/app/features/home/inbox/inbox.component.ts @@ -150,7 +150,9 @@ export class InboxComponent implements OnInit, OnDestroy { ngOnChanges(changes: SimpleChanges) { this.currentTabName = changes['currentTabName'].currentValue; - this.tabGroup.selectedIndex = this.tabIndexFromName(this.currentTabName); + setTimeout(() => { + this.tabGroup.selectedIndex = this.tabIndexFromName(this.currentTabName); + }); } tabIndexFromName(tabName: string) { From a64f97542f4516003f72c1e7c7e8fffda41c83b7 Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Tue, 28 Nov 2023 10:46:51 -0800 Subject: [PATCH 695/954] change date format desktop view --- .../features/home/inbox/inbox-table/inbox-table.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.html b/portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.html index 2aa190cf59..1ccd171cad 100644 --- a/portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.html +++ b/portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.html @@ -43,7 +43,7 @@ <ng-container matColumnDef="lastUpdated"> <th mat-header-cell *matHeaderCellDef>Last Updated</th> - <td mat-cell *matCellDef="let row">{{ row.lastUpdate | date }}</td> + <td mat-cell *matCellDef="let row">{{ row.lastUpdate | momentFormat }}</td> </ng-container> <ng-container matColumnDef="actions"> From 473da347c6340d43c8dd517366ce8ed7c7414738 Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Tue, 28 Nov 2023 13:21:53 -0800 Subject: [PATCH 696/954] Reimplement select tab with most results --- .../features/home/inbox/inbox.component.ts | 31 ++++++++++++++++--- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/portal-frontend/src/app/features/home/inbox/inbox.component.ts b/portal-frontend/src/app/features/home/inbox/inbox.component.ts index 28084b94f8..4f29dfe759 100644 --- a/portal-frontend/src/app/features/home/inbox/inbox.component.ts +++ b/portal-frontend/src/app/features/home/inbox/inbox.component.ts @@ -110,7 +110,12 @@ export class InboxComponent implements OnInit, OnDestroy { this.itemsPerPage = 20; this.pageIndex = 0; } - this.onSubmit(); + this.populateTable(); + + // push tab activation to next render cycle, after the tabGroup is rendered + setTimeout(() => { + this.tabGroup.selectedIndex = this.tabIndexFromName(this.currentTabName); + }); } this.isMobile = isMobile; @@ -150,6 +155,7 @@ export class InboxComponent implements OnInit, OnDestroy { ngOnChanges(changes: SimpleChanges) { this.currentTabName = changes['currentTabName'].currentValue; + setTimeout(() => { this.tabGroup.selectedIndex = this.tabIndexFromName(this.currentTabName); }); @@ -169,7 +175,12 @@ export class InboxComponent implements OnInit, OnDestroy { private async setup() { await this.loadStatuses(); - await this.onSubmit(); + await this.populateTable(); + + // push tab activation to next render cycle, after the tabGroup is rendered + setTimeout(() => { + this.tabGroup.selectedIndex = this.tabIndexFromName(this.currentTabName); + }); } ngOnDestroy(): void { @@ -182,7 +193,12 @@ export class InboxComponent implements OnInit, OnDestroy { // push tab activation to next render cycle, after the tabGroup is rendered setTimeout(() => { - this.tabGroup.selectedIndex = this.tabIndexFromName(this.currentTabName); + //Keep this in Tab Order + const searchCounts = [this.applicationTotal, this.noticeOfIntentTotal, this.notificationTotal]; + const index = searchCounts.indexOf(Math.max(...searchCounts)); + const newTabName: string = this.tabGroup._tabs.get(index)?.textLabel ?? 'applications'; + + this.router.navigateByUrl(`/home/${newTabName}`); }); } @@ -199,9 +215,14 @@ export class InboxComponent implements OnInit, OnDestroy { }); } - onClear() { + async onClear() { this.searchForm.reset(); - this.onSubmit(); + await this.populateTable(); + + // push tab activation to next render cycle, after the tabGroup is rendered + setTimeout(() => { + this.tabGroup.selectedIndex = this.tabIndexFromName(this.currentTabName); + }); if (this.fileTypeFilterDropDownComponent) { this.fileTypeFilterDropDownComponent.reset(); From 80acaa0afc49dfd1dbd4b539772908f59b76f172 Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Tue, 28 Nov 2023 13:24:57 -0800 Subject: [PATCH 697/954] Make 'Return to Inbox' go to corresponding tab I.e., when clicking 'Return to Inbox' from viewing an application, user is returned to application tab. --- .../view-submission/view-application-submission.component.ts | 2 +- .../view-notice-of-intent-submission.component.ts | 2 +- .../view-submission/view-notification-submission.component.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.ts b/portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.ts index 6a33a35a96..6e77111eb5 100644 --- a/portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.ts +++ b/portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.ts @@ -101,7 +101,7 @@ export class ViewApplicationSubmissionComponent implements OnInit, OnDestroy { } async onNavigateHome() { - await this.router.navigateByUrl(`home`); + await this.router.navigateByUrl(`home/applications`); } private async loadApplicationDocuments(fileId: string) { diff --git a/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.ts b/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.ts index 7f5c45ccc9..483050f3d7 100644 --- a/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.ts @@ -60,7 +60,7 @@ export class ViewNoticeOfIntentSubmissionComponent implements OnInit, OnDestroy } async onNavigateHome() { - await this.router.navigateByUrl(`home`); + await this.router.navigateByUrl(`home/nois`); } async onCancel(uuid: string) { diff --git a/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.ts b/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.ts index 851f63bdfb..868a0bc446 100644 --- a/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.ts +++ b/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.ts @@ -62,7 +62,7 @@ export class ViewNotificationSubmissionComponent implements OnInit, OnDestroy { } async onNavigateHome() { - await this.router.navigateByUrl(`home`); + await this.router.navigateByUrl(`home/srws`); } async onCancel(uuid: string) { From 1cac4225bf5d2dbc4dff52aae94876d839e22824 Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Tue, 28 Nov 2023 13:48:18 -0800 Subject: [PATCH 698/954] for cov and tur show different banner --- .../lfng-review/lfng-review.component.html | 16 ++++++++++++++-- .../lfng-review/lfng-review.component.ts | 2 ++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/portal-frontend/src/app/features/applications/view-submission/lfng-review/lfng-review.component.html b/portal-frontend/src/app/features/applications/view-submission/lfng-review/lfng-review.component.html index bff8503b47..51c557647a 100644 --- a/portal-frontend/src/app/features/applications/view-submission/lfng-review/lfng-review.component.html +++ b/portal-frontend/src/app/features/applications/view-submission/lfng-review/lfng-review.component.html @@ -36,14 +36,26 @@ <h2>Local/First Nation Gov Review</h2> </div> <div *ngIf=" - application.status.code === SUBMISSION_STATUS.IN_PROGRESS || + (application.status.code === SUBMISSION_STATUS.IN_PROGRESS || application.status.code === SUBMISSION_STATUS.WRONG_GOV || - application.status.code === SUBMISSION_STATUS.INCOMPLETE + application.status.code === SUBMISSION_STATUS.INCOMPLETE) && + !isTurOrCov " class="warning" > <mat-icon>info</mat-icon>This section will update after the application is submitted. </div> + <div + *ngIf=" + (application.status.code === SUBMISSION_STATUS.IN_PROGRESS || + application.status.code === SUBMISSION_STATUS.WRONG_GOV || + application.status.code === SUBMISSION_STATUS.INCOMPLETE ) && + isTurOrCov + " + class="warning" + > + <mat-icon>info</mat-icon>Application not subject to Local/First Nation Government review. + </div> <div *ngIf="!applicationReview && submittedToAlcStatus" class="warning"> <mat-icon>info</mat-icon>Application not subject to Local/First Nation Government review. </div> diff --git a/portal-frontend/src/app/features/applications/view-submission/lfng-review/lfng-review.component.ts b/portal-frontend/src/app/features/applications/view-submission/lfng-review/lfng-review.component.ts index 1c93cb7606..a7b09050cb 100644 --- a/portal-frontend/src/app/features/applications/view-submission/lfng-review/lfng-review.component.ts +++ b/portal-frontend/src/app/features/applications/view-submission/lfng-review/lfng-review.component.ts @@ -34,6 +34,7 @@ export class LfngReviewComponent implements OnInit, OnDestroy { hasCompletedStepsBeforeResolution = false; hasCompletedStepsBeforeDocuments = false; submittedToAlcStatus = false; + isTurOrCov = false; constructor( private applicationReviewService: ApplicationSubmissionReviewService, @@ -70,6 +71,7 @@ export class LfngReviewComponent implements OnInit, OnDestroy { this.submittedToAlcStatus = !!this.application?.submissionStatuses.find( (s) => s.statusTypeCode === SUBMISSION_STATUS.SUBMITTED_TO_ALC && !!s.effectiveDate, ); + this.isTurOrCov = this.application?.typeCode === 'COVE' || this.application?.typeCode === 'TURP'; this.loadReview(); }); From fc5039990ab015e09cb6defecf1c2f434cfd6417 Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Wed, 29 Nov 2023 13:56:03 -0800 Subject: [PATCH 699/954] items per page change fix --- .../features/home/inbox/inbox-table/inbox-table.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.ts b/portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.ts index 9dd9d328ce..abd281ac0f 100644 --- a/portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.ts +++ b/portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.ts @@ -60,7 +60,7 @@ export class InboxTableComponent implements OnDestroy { itemsPerPage: this.itemsPerPage, sortDirection: this.sortDirection, sortField: this.sortField, - tableType: 'APP', + tableType: this.type === 'Notices of Intent' ? 'NOI' : this.type === 'Notifications' ? 'NOTI' : 'APP', }); } From 6038825d08aadc2b1800242fd085dd42d23d2103 Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Thu, 30 Nov 2023 09:47:23 -0800 Subject: [PATCH 700/954] Fix CSS variable being used instead of SCSS one --- .../features/home/inbox/inbox-list/inbox-list.component.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/portal-frontend/src/app/features/home/inbox/inbox-list/inbox-list.component.scss b/portal-frontend/src/app/features/home/inbox/inbox-list/inbox-list.component.scss index bfacdbf409..5f254f8cc8 100644 --- a/portal-frontend/src/app/features/home/inbox/inbox-list/inbox-list.component.scss +++ b/portal-frontend/src/app/features/home/inbox/inbox-list/inbox-list.component.scss @@ -7,7 +7,7 @@ .result { border-radius: rem(4); - border: 2px solid var(--portal-grey-light, #efefef); + border: 2px solid colors.$grey-light; margin: rem(4) rem(4) rem(20); //BOX SHADOWS padding: rem(12) rem(8); font-size: rem(14) !important; From 24fde583584fc61e08124a5464e92908ca42b361 Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Thu, 30 Nov 2023 09:48:40 -0800 Subject: [PATCH 701/954] Make file ID clickable --- .../home/inbox/inbox-table/inbox-table.component.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.html b/portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.html index 1ccd171cad..9ad3bfe4e9 100644 --- a/portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.html +++ b/portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.html @@ -11,7 +11,9 @@ <ng-container matColumnDef="fileNumber"> <th mat-header-cell *matHeaderCellDef>{{ type }} ID</th> - <td mat-cell *matCellDef="let row">{{ row.fileNumber }}</td> + <td mat-cell *matCellDef="let row"> + <a [routerLink]="row.routerLink" *ngIf="row.routerLink">{{ row.fileNumber }}</a> + </td> </ng-container> <ng-container matColumnDef="dateCreated"> From 4f0d680f056c11e62091e86ea5c408a3452fc7c7 Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Thu, 30 Nov 2023 09:49:09 -0800 Subject: [PATCH 702/954] Remove actions bar from inbox rows --- .../home/inbox/inbox-table/inbox-table.component.html | 7 ------- 1 file changed, 7 deletions(-) diff --git a/portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.html b/portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.html index 9ad3bfe4e9..60ed2ee191 100644 --- a/portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.html +++ b/portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.html @@ -47,13 +47,6 @@ <th mat-header-cell *matHeaderCellDef>Last Updated</th> <td mat-cell *matCellDef="let row">{{ row.lastUpdate | momentFormat }}</td> </ng-container> - - <ng-container matColumnDef="actions"> - <th mat-header-cell *matHeaderCellDef>Actions</th> - <td mat-cell *matCellDef="let row"> - <button [routerLink]="row.routerLink" *ngIf="row.routerLink" mat-flat-button color="primary">View</button> - </td> - </ng-container> </table> <mat-paginator [length]="_totalCount" From 52349fdc0527fea16423d63f361e732ca2311c96 Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Thu, 30 Nov 2023 09:50:40 -0800 Subject: [PATCH 703/954] Fix component looking for missing inbox column --- .../home/inbox/inbox-table/inbox-table.component.ts | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.ts b/portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.ts index 9dd9d328ce..5315e87683 100644 --- a/portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.ts +++ b/portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.ts @@ -34,15 +34,7 @@ export class InboxTableComponent implements OnDestroy { @Input() type = 'Applications'; @Output() tableChange = new EventEmitter<TableChange>(); - displayedColumns: string[] = [ - 'fileNumber', - 'dateCreated', - 'applicant', - 'applicationType', - 'status', - 'lastUpdated', - 'actions', - ]; + displayedColumns: string[] = ['fileNumber', 'dateCreated', 'applicant', 'applicationType', 'status', 'lastUpdated']; dataSource = new MatTableDataSource<InboxResultDto>(); pageIndex = 0; itemsPerPage = 10; From 43be1343911fe65f6f3fa0b8171304b1530c5040 Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Thu, 30 Nov 2023 10:01:54 -0800 Subject: [PATCH 704/954] Make whole row clickable Has same behaviour as clicking the file ID. --- .../home/inbox/inbox-table/inbox-table.component.html | 2 +- .../home/inbox/inbox-table/inbox-table.component.scss | 6 ++++++ .../home/inbox/inbox-table/inbox-table.component.ts | 6 ++++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.html b/portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.html index 60ed2ee191..6edaed9fc7 100644 --- a/portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.html +++ b/portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.html @@ -2,7 +2,7 @@ <div class="table-container"> <table mat-table [dataSource]="dataSource"> <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr> - <tr mat-row *matRowDef="let row; columns: displayedColumns"></tr> + <tr mat-row *matRowDef="let row; columns: displayedColumns" (click)="onRowClick($event)"></tr> <!-- Row shown when there is no matching data. --> <tr class="mat-row" *matNoDataRow> diff --git a/portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.scss b/portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.scss index e69de29bb2..2558db4290 100644 --- a/portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.scss +++ b/portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.scss @@ -0,0 +1,6 @@ +@use '../../../../../styles/colors'; + +.mat-mdc-row:hover { + background-color: colors.$grey-light !important; + cursor: pointer; +} diff --git a/portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.ts b/portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.ts index 5315e87683..61c1ddb99a 100644 --- a/portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.ts +++ b/portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.ts @@ -88,4 +88,10 @@ export class InboxTableComponent implements OnDestroy { } }); } + + onRowClick(event: Event) { + if (event.currentTarget instanceof HTMLElement) { + console.log(event.currentTarget.querySelector<HTMLElement>('td > a')!.click()); + } + } } From 1ef77d22d0a11f3f7132204bfc1a1845acae43ea Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Thu, 30 Nov 2023 11:16:42 -0800 Subject: [PATCH 705/954] search pagination from 0 --- .../application-search-table.component.ts | 5 +++-- .../notice-of-intent-search-table.component.ts | 2 +- .../notification-search-table.component.ts | 2 +- .../app/features/public/search/public-search.component.html | 3 +++ .../app/features/public/search/public-search.component.ts | 1 + .../public/search/search-list/search-list.component.ts | 1 + 6 files changed, 10 insertions(+), 4 deletions(-) diff --git a/portal-frontend/src/app/features/public/search/application-search-table/application-search-table.component.ts b/portal-frontend/src/app/features/public/search/application-search-table/application-search-table.component.ts index 641747ecb4..8a1f1cbd38 100644 --- a/portal-frontend/src/app/features/public/search/application-search-table/application-search-table.component.ts +++ b/portal-frontend/src/app/features/public/search/application-search-table/application-search-table.component.ts @@ -20,6 +20,8 @@ export class ApplicationSearchTableComponent implements OnDestroy { @ViewChild(MatSort) sort?: MatSort; _applications: ApplicationSearchResultDto[] = []; + @Input() pageIndex: number = 0; + @Input() set applications(applications: ApplicationSearchResultDto[]) { this._applications = applications; this.dataSource = new MatTableDataSource<SearchResult>(this.mapApplications(applications)); @@ -39,8 +41,7 @@ export class ApplicationSearchTableComponent implements OnDestroy { displayedColumns = displayedColumns; dataSource = new MatTableDataSource<SearchResult>(); - pageIndex = 0; - itemsPerPage = 20; + itemsPerPage = 1; total = 0; sortDirection = 'DESC'; sortField = 'lastUpdate'; diff --git a/portal-frontend/src/app/features/public/search/notice-of-intent-search-table/notice-of-intent-search-table.component.ts b/portal-frontend/src/app/features/public/search/notice-of-intent-search-table/notice-of-intent-search-table.component.ts index 2ecf8b3657..7d7c219f6d 100644 --- a/portal-frontend/src/app/features/public/search/notice-of-intent-search-table/notice-of-intent-search-table.component.ts +++ b/portal-frontend/src/app/features/public/search/notice-of-intent-search-table/notice-of-intent-search-table.component.ts @@ -26,6 +26,7 @@ export class NoticeOfIntentSearchTableComponent implements OnDestroy { } _totalCount = 0; + @Input() pageIndex: number = 0; @Input() set totalCount(count: number) { this._totalCount = count; this.initSorting(); @@ -37,7 +38,6 @@ export class NoticeOfIntentSearchTableComponent implements OnDestroy { displayedColumns = displayedColumns; dataSource = new MatTableDataSource<SearchResult>(); - pageIndex = 0; itemsPerPage = 20; total = 0; sortDirection = 'DESC'; diff --git a/portal-frontend/src/app/features/public/search/notification-search-table/notification-search-table.component.ts b/portal-frontend/src/app/features/public/search/notification-search-table/notification-search-table.component.ts index 8682840657..3648a9ca98 100644 --- a/portal-frontend/src/app/features/public/search/notification-search-table/notification-search-table.component.ts +++ b/portal-frontend/src/app/features/public/search/notification-search-table/notification-search-table.component.ts @@ -33,11 +33,11 @@ export class NotificationSearchTableComponent implements OnDestroy { this._totalCount = count; this.initSorting(); } + @Input() pageIndex: number = 0; @Output() tableChange = new EventEmitter<TableChange>(); displayedColumns = ['fileId', 'ownerName', 'type', 'portalStatus', 'lastUpdate', 'government']; dataSource = new MatTableDataSource<SearchResult>(); - pageIndex = 0; itemsPerPage = 20; total = 0; sortDirection = 'DESC'; diff --git a/portal-frontend/src/app/features/public/search/public-search.component.html b/portal-frontend/src/app/features/public/search/public-search.component.html index ab99f94e1e..fc9b17a43d 100644 --- a/portal-frontend/src/app/features/public/search/public-search.component.html +++ b/portal-frontend/src/app/features/public/search/public-search.component.html @@ -145,6 +145,7 @@ <h3 class="search-title">Search Results</h3> [results]="applications" [totalCount]="applicationTotal" [statuses]="statuses" + [pageIndex]="pageIndex" (loadMore)="onLoadMore('APP')" > </app-search-list> @@ -163,6 +164,7 @@ <h3 class="search-title">Search Results</h3> *ngIf="isMobile" type="notices of intent" [results]="noticeOfIntents" + [pageIndex]="pageIndex" [totalCount]="noticeOfIntentTotal" [statuses]="statuses" (loadMore)="onLoadMore('NOI')" @@ -183,6 +185,7 @@ <h3 class="search-title">Search Results</h3> *ngIf="isMobile" type="notifications" [results]="notifications" + [pageIndex]="pageIndex" [totalCount]="notificationTotal" [statuses]="statuses" (loadMore)="onLoadMore('NOTI')" diff --git a/portal-frontend/src/app/features/public/search/public-search.component.ts b/portal-frontend/src/app/features/public/search/public-search.component.ts index a7a0248f5c..7f9854ab9b 100644 --- a/portal-frontend/src/app/features/public/search/public-search.component.ts +++ b/portal-frontend/src/app/features/public/search/public-search.component.ts @@ -186,6 +186,7 @@ export class PublicSearchComponent implements OnInit, OnDestroy { } async onSubmit() { + this.pageIndex = 0; const searchParams = this.getSearchParams(); const searchDto = JSON.stringify(searchParams); diff --git a/portal-frontend/src/app/features/public/search/search-list/search-list.component.ts b/portal-frontend/src/app/features/public/search/search-list/search-list.component.ts index 4c87da581b..4b177f952f 100644 --- a/portal-frontend/src/app/features/public/search/search-list/search-list.component.ts +++ b/portal-frontend/src/app/features/public/search/search-list/search-list.component.ts @@ -21,6 +21,7 @@ export class SearchListComponent implements OnDestroy { @Input() totalCount = 0; @Input() statuses: ApplicationStatusDto[] = []; + @Input() pageIndex: number = 0; @Input() type = ''; _results: SearchResult[] = []; From 99c55a25433f1053663d62dcb48cc8917acd95aa Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Thu, 30 Nov 2023 11:54:26 -0800 Subject: [PATCH 706/954] Remove edit buttons from submission review tabs --- .../alc-review/alc-review.component.html | 8 -------- .../lfng-review/lfng-review.component.html | 8 -------- .../view-application-submission.component.html | 8 -------- .../alc-review/alc-review.component.html | 10 ---------- ...-notice-of-intent-submission.component.html | 8 -------- .../alc-review/alc-review.component.html | 10 ---------- ...view-notification-submission.component.html | 18 ------------------ 7 files changed, 70 deletions(-) diff --git a/portal-frontend/src/app/features/applications/view-submission/alc-review/alc-review.component.html b/portal-frontend/src/app/features/applications/view-submission/alc-review/alc-review.component.html index 8f30224899..5a96c114b8 100644 --- a/portal-frontend/src/app/features/applications/view-submission/alc-review/alc-review.component.html +++ b/portal-frontend/src/app/features/applications/view-submission/alc-review/alc-review.component.html @@ -2,14 +2,6 @@ <div class="header"> <h2>ALC Review and Decision</h2> <div> - <button - [routerLink]="'/application/' + application.fileNumber + '/edit'" - *ngIf="application.canEdit" - mat-flat-button - color="primary" - > - Edit Application - </button> <button *ngIf="application.canReview" (click)="onReview(application.fileNumber)" mat-flat-button color="primary"> Review Application </button> diff --git a/portal-frontend/src/app/features/applications/view-submission/lfng-review/lfng-review.component.html b/portal-frontend/src/app/features/applications/view-submission/lfng-review/lfng-review.component.html index bff8503b47..cc5ec7e27f 100644 --- a/portal-frontend/src/app/features/applications/view-submission/lfng-review/lfng-review.component.html +++ b/portal-frontend/src/app/features/applications/view-submission/lfng-review/lfng-review.component.html @@ -10,14 +10,6 @@ <h2>Local/First Nation Gov Review</h2> > Cancel Application </button> - <button - [routerLink]="'/application/' + application.fileNumber + '/edit'" - *ngIf="application.canEdit" - mat-flat-button - color="primary" - > - Edit Application - </button> <button *ngIf="application.canReview" (click)="onReview(application.fileNumber)" mat-flat-button color="primary"> Review Application </button> diff --git a/portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.html b/portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.html index 13fde0f7f5..7671f332a6 100644 --- a/portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.html +++ b/portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.html @@ -46,14 +46,6 @@ <h2>Applicant Submission</h2> > Cancel Application </button> - <button - [routerLink]="'/application/' + application.fileNumber + '/edit'" - *ngIf="application.canEdit" - mat-flat-button - color="primary" - > - Edit Application - </button> <button *ngIf="application.canReview" (click)="onReview(application.fileNumber)" diff --git a/portal-frontend/src/app/features/notice-of-intents/view-submission/alc-review/alc-review.component.html b/portal-frontend/src/app/features/notice-of-intents/view-submission/alc-review/alc-review.component.html index 9a520595ea..6b87e36470 100644 --- a/portal-frontend/src/app/features/notice-of-intents/view-submission/alc-review/alc-review.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/view-submission/alc-review/alc-review.component.html @@ -1,16 +1,6 @@ <div *ngIf="noiSubmission"> <div class="header"> <h2>ALC Review and Decision</h2> - <div> - <button - [routerLink]="'/notice-of-intent/' + noiSubmission.fileNumber + '/edit'" - *ngIf="noiSubmission.canEdit" - mat-flat-button - color="primary" - > - Edit NOI - </button> - </div> </div> <div *ngIf="noiSubmission.status.code === NOI_SUBMISSION_STATUS.IN_PROGRESS" class="warning"> This section will update after the Notice of Intent is submitted to the ALC. diff --git a/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.html b/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.html index 65c8720cc2..c49d513bed 100644 --- a/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.html @@ -41,14 +41,6 @@ <h2>Applicant Submission</h2> <button *ngIf="submission.canEdit" mat-stroked-button color="warn" (click)="onCancel(submission.uuid)"> Cancel NOI </button> - <button - [routerLink]="'/notice-of-intent/' + submission.fileNumber + '/edit'" - *ngIf="submission.canEdit" - mat-flat-button - color="primary" - > - Edit NOI - </button> <button mat-flat-button color="accent" (click)="onDownloadSubmissionPdf(submission.fileNumber)"> Download PDF </button> diff --git a/portal-frontend/src/app/features/notifications/view-submission/alc-review/alc-review.component.html b/portal-frontend/src/app/features/notifications/view-submission/alc-review/alc-review.component.html index 3194abed39..f81e68cc27 100644 --- a/portal-frontend/src/app/features/notifications/view-submission/alc-review/alc-review.component.html +++ b/portal-frontend/src/app/features/notifications/view-submission/alc-review/alc-review.component.html @@ -1,16 +1,6 @@ <div *ngIf="notificationSubmission"> <div class="header"> <h3>ALC Review and Response</h3> - <div> - <button - [routerLink]="'/notice-of-intent/' + notificationSubmission.fileNumber + '/edit'" - *ngIf="notificationSubmission.canEdit" - mat-flat-button - color="primary" - > - Edit SRW - </button> - </div> </div> <div *ngIf="notificationSubmission.status.code === NOTIFICATION_STATUS.IN_PROGRESS" class="warning"> This section will update after the notification is submitted to the ALC. diff --git a/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.html b/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.html index d3c27267c7..149ff87a9d 100644 --- a/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.html +++ b/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.html @@ -41,14 +41,6 @@ <h2>Applicant Submission</h2> <button *ngIf="submission.canEdit" mat-stroked-button color="warn" (click)="onCancel(submission.uuid)"> Cancel SRW </button> - <button - [routerLink]="'/notification/' + submission.fileNumber + '/edit'" - *ngIf="submission.canEdit" - mat-flat-button - color="primary" - > - Edit SRW - </button> </div> </div> <div> @@ -67,16 +59,6 @@ <h2>Applicant Submission</h2> Cancel SRW </button> </div> - <div> - <button - [routerLink]="'/notification/' + submission.fileNumber + '/edit'" - *ngIf="submission.canEdit" - mat-flat-button - color="primary" - > - Edit SRW - </button> - </div> </div> </mat-tab> <mat-tab label="ALC Review and Response"> From f91447fec7478a497a09d8bb08bb3c1dd2a057c1 Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Thu, 30 Nov 2023 12:52:52 -0800 Subject: [PATCH 707/954] Remove review buttons from view submission pages --- .../alc-review/alc-review.component.html | 5 ----- .../lfng-review/lfng-review.component.html | 3 --- .../view-application-submission.component.html | 16 ---------------- 3 files changed, 24 deletions(-) diff --git a/portal-frontend/src/app/features/applications/view-submission/alc-review/alc-review.component.html b/portal-frontend/src/app/features/applications/view-submission/alc-review/alc-review.component.html index 5a96c114b8..c5e00a552d 100644 --- a/portal-frontend/src/app/features/applications/view-submission/alc-review/alc-review.component.html +++ b/portal-frontend/src/app/features/applications/view-submission/alc-review/alc-review.component.html @@ -1,11 +1,6 @@ <div *ngIf="application"> <div class="header"> <h2>ALC Review and Decision</h2> - <div> - <button *ngIf="application.canReview" (click)="onReview(application.fileNumber)" mat-flat-button color="primary"> - Review Application - </button> - </div> </div> <div *ngIf="showUpdateAfterSubmitLabel" class="warning"> This section will update after the application is submitted to the ALC. diff --git a/portal-frontend/src/app/features/applications/view-submission/lfng-review/lfng-review.component.html b/portal-frontend/src/app/features/applications/view-submission/lfng-review/lfng-review.component.html index cc5ec7e27f..55ec263d9b 100644 --- a/portal-frontend/src/app/features/applications/view-submission/lfng-review/lfng-review.component.html +++ b/portal-frontend/src/app/features/applications/view-submission/lfng-review/lfng-review.component.html @@ -10,9 +10,6 @@ <h2>Local/First Nation Gov Review</h2> > Cancel Application </button> - <button *ngIf="application.canReview" (click)="onReview(application.fileNumber)" mat-flat-button color="primary"> - Review Application - </button> <button [disabled]=" !applicationReview || diff --git a/portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.html b/portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.html index 7671f332a6..672fd3e348 100644 --- a/portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.html +++ b/portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.html @@ -46,14 +46,6 @@ <h2>Applicant Submission</h2> > Cancel Application </button> - <button - *ngIf="application.canReview" - (click)="onReview(application.fileNumber)" - mat-flat-button - color="primary" - > - Review Application - </button> <button mat-flat-button color="accent" (click)="onDownloadSubmissionPdf(application.fileNumber)"> Download PDF </button> @@ -93,14 +85,6 @@ <h2>Applicant Submission</h2> > Edit Application </button> - <button - *ngIf="application.canReview" - (click)="onReview(application.fileNumber)" - mat-flat-button - color="primary" - > - Review Application - </button> </div> </div> </mat-tab> From 24c5f71042b7d138b53981ff47625a8fd8a3a8fc Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Thu, 30 Nov 2023 13:41:50 -0800 Subject: [PATCH 708/954] Replace 'srws' home route with 'notifications' --- .../src/app/features/home/inbox/inbox.component.html | 2 +- .../view-submission/view-notification-submission.component.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/portal-frontend/src/app/features/home/inbox/inbox.component.html b/portal-frontend/src/app/features/home/inbox/inbox.component.html index c846c4948f..51f18ee371 100644 --- a/portal-frontend/src/app/features/home/inbox/inbox.component.html +++ b/portal-frontend/src/app/features/home/inbox/inbox.component.html @@ -141,7 +141,7 @@ ></app-inbox-table> </mat-tab> - <mat-tab label="srws"> + <mat-tab label="notifications"> <ng-template mat-tab-label> Notification of SRW: {{ notificationTotal }} </ng-template> <app-inbox-list *ngIf="isMobile" diff --git a/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.ts b/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.ts index 868a0bc446..70b8df22eb 100644 --- a/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.ts +++ b/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.ts @@ -62,7 +62,7 @@ export class ViewNotificationSubmissionComponent implements OnInit, OnDestroy { } async onNavigateHome() { - await this.router.navigateByUrl(`home/srws`); + await this.router.navigateByUrl(`home/notifications`); } async onCancel(uuid: string) { From 752749b11f56dc8e408579c273cd84588eff60f2 Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Thu, 30 Nov 2023 14:26:20 -0800 Subject: [PATCH 709/954] Move view submission action bar up in HTML --- ...view-application-submission.component.html | 60 +++++++++---------- ...notice-of-intent-submission.component.html | 16 ++--- ...iew-notification-submission.component.html | 16 ++--- 3 files changed, 46 insertions(+), 46 deletions(-) diff --git a/portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.html b/portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.html index 672fd3e348..1c3076b74e 100644 --- a/portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.html +++ b/portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.html @@ -1,3 +1,33 @@ +<div *ngIf="application && application.canReview" class="action-bar"> + <button (click)="onReview(application.fileNumber)" mat-button> + <div> + <span + *ngIf=" + application.status.code === SUBMISSION_STATUS.IN_REVIEW_BY_LG || + application.status.code === SUBMISSION_STATUS.RETURNED_TO_LG + " + (click)="onReview(application.fileNumber)" + class="subheading2" + >Continue Application Review</span + > + <span + *ngIf="application.status.code === SUBMISSION_STATUS.SUBMITTED_TO_LG" + (click)="onReview(application.fileNumber)" + class="subheading2" + >Start Application Review</span + > + <mat-icon>keyboard_double_arrow_right</mat-icon> + </div> + </button> +</div> +<div *ngIf="application && application.canEdit" class="action-bar"> + <button [routerLink]="'/application/' + application.fileNumber + '/edit'" mat-button> + <div> + <span class="subheading2">Continue Application </span> + <mat-icon>keyboard_double_arrow_right</mat-icon> + </div> + </button> +</div> <div aria-hidden="true" class="banner absolute"> <div> <h4 *ngIf="application">Application ID: {{ application.fileNumber }} | {{ application.type }}</h4> @@ -108,33 +138,3 @@ <h2>Applicant Submission</h2> </mat-tab-group> </div> </div> -<div *ngIf="application && application.canReview" class="action-bar"> - <button (click)="onReview(application.fileNumber)" mat-button> - <div> - <span - *ngIf=" - application.status.code === SUBMISSION_STATUS.IN_REVIEW_BY_LG || - application.status.code === SUBMISSION_STATUS.RETURNED_TO_LG - " - (click)="onReview(application.fileNumber)" - class="subheading2" - >Continue Application Review</span - > - <span - *ngIf="application.status.code === SUBMISSION_STATUS.SUBMITTED_TO_LG" - (click)="onReview(application.fileNumber)" - class="subheading2" - >Start Application Review</span - > - <mat-icon>keyboard_double_arrow_right</mat-icon> - </div> - </button> -</div> -<div *ngIf="application && application.canEdit" class="action-bar"> - <button [routerLink]="'/application/' + application.fileNumber + '/edit'" mat-button> - <div> - <span class="subheading2">Continue Application </span> - <mat-icon>keyboard_double_arrow_right</mat-icon> - </div> - </button> -</div> diff --git a/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.html b/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.html index c49d513bed..89a4ada19b 100644 --- a/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.html @@ -1,3 +1,11 @@ +<div *ngIf="submission && submission.canEdit" class="action-bar"> + <button [routerLink]="'/notice-of-intent/' + submission.fileNumber + '/edit'" mat-button> + <div> + <span class="subheading2">Continue NOI </span> + <mat-icon>keyboard_double_arrow_right</mat-icon> + </div> + </button> +</div> <div aria-hidden="true" class="banner absolute"> <div> <h4 *ngIf="submission">NOI ID: {{ submission.fileNumber }} | {{ submission.type }}</h4> @@ -83,11 +91,3 @@ <h2>Applicant Submission</h2> </mat-tab-group> </div> </div> -<div *ngIf="submission && submission.canEdit" class="action-bar"> - <button [routerLink]="'/notice-of-intent/' + submission.fileNumber + '/edit'" mat-button> - <div> - <span class="subheading2">Continue NOI </span> - <mat-icon>keyboard_double_arrow_right</mat-icon> - </div> - </button> -</div> diff --git a/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.html b/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.html index 149ff87a9d..2d6144a06e 100644 --- a/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.html +++ b/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.html @@ -1,3 +1,11 @@ +<div *ngIf="submission && submission.canEdit" class="action-bar"> + <button [routerLink]="'/notification/' + submission.fileNumber + '/edit'" mat-button> + <div> + <span class="subheading2">Continue SRW </span> + <mat-icon>keyboard_double_arrow_right</mat-icon> + </div> + </button> +</div> <div aria-hidden="true" class="banner absolute"> <div> <h4 *ngIf="submission">Notification ID: {{ submission.fileNumber }} | {{ submission.type }}</h4> @@ -72,11 +80,3 @@ <h2>Applicant Submission</h2> </mat-tab-group> </div> </div> -<div *ngIf="submission && submission.canEdit" class="action-bar"> - <button [routerLink]="'/notification/' + submission.fileNumber + '/edit'" mat-button> - <div> - <span class="subheading2">Continue SRW </span> - <mat-icon>keyboard_double_arrow_right</mat-icon> - </div> - </button> -</div> From 40c977fcedb7c386323347eec939a65f955a5c58 Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Thu, 30 Nov 2023 15:11:58 -0800 Subject: [PATCH 710/954] some ui fixes --- .../application-details/parcel/parcel.component.html | 4 +++- .../application-details/parcel/parcel.component.scss | 4 ++++ .../notice-of-intent-details/parcel/parcel.component.html | 4 +++- .../notice-of-intent-details/parcel/parcel.component.scss | 4 ++++ .../application-details/parcel/parcel.component.html | 4 +++- .../application-details/parcel/parcel.component.scss | 5 +++++ .../parcel-details/parcel-entry/parcel-entry.component.html | 2 +- .../parcels/parcel-entry/parcel-entry.component.html | 2 +- .../owner-dialogs/parcel-owners/parcel-owners.component.html | 2 +- .../owner-dialogs/parcel-owners/parcel-owners.component.scss | 2 +- 10 files changed, 26 insertions(+), 7 deletions(-) diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/parcel/parcel.component.html b/alcs-frontend/src/app/features/application/applicant-info/application-details/parcel/parcel.component.html index db3cc3fb93..a7349b67f0 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/application-details/parcel/parcel.component.html +++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/parcel/parcel.component.html @@ -98,7 +98,9 @@ <h4 [id]="parcel.uuid">Parcel {{ parcelInd + 1 }}: Parcel and Owner Information< <a *ngIf="owner.corporateSummary" (click)="openFile(owner.corporateSummary)">{{ owner.corporateSummary.fileName }}</a> - <app-no-data *ngIf="!owner.corporateSummary"></app-no-data> + <div class="no-data" *ngIf="!owner.corporateSummary"> + <div class="no-data-text">Not Applicable</div> + </div> </div> </ng-container> </div> diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/parcel/parcel.component.scss b/alcs-frontend/src/app/features/application/applicant-info/application-details/parcel/parcel.component.scss index f1dc4cd6e1..35798cc694 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/application-details/parcel/parcel.component.scss +++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/parcel/parcel.component.scss @@ -16,3 +16,7 @@ .crown-land { text-transform: capitalize; } + +.no-data-text { + color: colors.$grey-dark; +} \ No newline at end of file diff --git a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/parcel/parcel.component.html b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/parcel/parcel.component.html index 4b5afb0b50..f8c2ee84d3 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/parcel/parcel.component.html +++ b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/parcel/parcel.component.html @@ -89,7 +89,9 @@ <h4 [id]="parcel.uuid">Parcel {{ parcelInd + 1 }}: Parcel and Owner Information< <a *ngIf="owner.corporateSummary" (click)="onOpenFile(owner.corporateSummary.uuid)">{{ owner.corporateSummary.fileName }}</a> - <app-no-data *ngIf="!owner.corporateSummary"></app-no-data> + <div class="no-data" *ngIf="!owner.corporateSummary"> + <div class="no-data-text">Not Applicable</div> + </div> </div> </ng-container> </div> diff --git a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/parcel/parcel.component.scss b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/parcel/parcel.component.scss index 7cb2d56dd5..e58c3c08c6 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/parcel/parcel.component.scss +++ b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/parcel/parcel.component.scss @@ -18,3 +18,7 @@ .crown-land { text-transform: capitalize; } + +.no-data-text { + color: colors.$grey-dark; +} \ No newline at end of file diff --git a/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.html b/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.html index a2effb6487..e041d40752 100644 --- a/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.html +++ b/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.html @@ -143,7 +143,9 @@ <h4> <a *ngIf="owner.corporateSummary" (click)="onOpenFile(owner.corporateSummary.uuid)">{{ owner.corporateSummary.fileName }}</a> - <app-no-data [showRequired]="false" *ngIf="!owner.corporateSummary"></app-no-data> + <div class="no-data" *ngIf="!owner.corporateSummary"> + <div class="no-data-text">Not Applicable</div> + </div> </div> </ng-container> <div class="full-width"> diff --git a/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.scss b/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.scss index ffe631e662..913d496e56 100644 --- a/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.scss +++ b/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.scss @@ -1,4 +1,5 @@ @use '../../../../../styles/functions' as *; +@use '../../../../../styles/colors'; .parcel-header { display: flex; @@ -41,3 +42,7 @@ .crown-land { text-transform: capitalize; } + +.no-data-text { + color: colors.$grey-dark; +} \ No newline at end of file diff --git a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html index b78a5eaa12..eee65ba4e5 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html @@ -204,7 +204,7 @@ <h5>Parcel Lookup</h5> <section *ngIf="enableOwners" class="container"> <h6>Parcel Owners</h6> <ng-container *ngIf="!isCrownLand"> - <p>Add an owner for every organization or individual listed on the parcel's Certification of Title</p> + <p>Add an owner for every organization or individual listed on the parcel's Certificate of Title</p> <div> <app-parcel-owners [isDraft]="isDraft" diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.html index 6f889e1428..9bc5c05237 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.html @@ -207,7 +207,7 @@ <h5>Parcel Lookup</h5> <section *ngIf="enableOwners" class="container"> <h6>Parcel Owners</h6> <ng-container *ngIf="!isCrownLand"> - <p>Add an owner for every organization or individual listed on the parcel's Certification of Title</p> + <p>Add an owner for every organization or individual listed on the parcel's Certificate of Title</p> <div> <app-parcel-owners [isDraft]="isDraft" diff --git a/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.html b/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.html index cdc5869db9..75d53437ed 100644 --- a/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.html +++ b/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.html @@ -43,7 +43,7 @@ element.corporateSummary.fileName }}</a> <div class="no-data" *ngIf="!element.corporateSummary"> - <div class="text">Not Applicable</div> + <div class="no-data-text">Not Applicable</div> </div> </div> </td> diff --git a/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.scss b/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.scss index 58aa760552..90a3d76d0c 100644 --- a/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.scss +++ b/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.scss @@ -13,6 +13,6 @@ padding-top: rem(12); } -.text { +.no-data-text { color: colors.$grey-dark; } From 2d5f1f09fd91495ae6c7974aa476a2981e8b4ac5 Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Thu, 30 Nov 2023 15:25:37 -0800 Subject: [PATCH 711/954] fixes --- .../application-details/parcel/parcel.component.html | 4 +--- .../application-details/parcel/parcel.component.scss | 4 ---- .../notice-of-intent-details/parcel/parcel.component.html | 4 +--- .../notice-of-intent-details/parcel/parcel.component.scss | 4 ---- .../application-details/parcel/parcel.component.scss | 2 ++ 5 files changed, 4 insertions(+), 14 deletions(-) diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/parcel/parcel.component.html b/alcs-frontend/src/app/features/application/applicant-info/application-details/parcel/parcel.component.html index a7349b67f0..db3cc3fb93 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/application-details/parcel/parcel.component.html +++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/parcel/parcel.component.html @@ -98,9 +98,7 @@ <h4 [id]="parcel.uuid">Parcel {{ parcelInd + 1 }}: Parcel and Owner Information< <a *ngIf="owner.corporateSummary" (click)="openFile(owner.corporateSummary)">{{ owner.corporateSummary.fileName }}</a> - <div class="no-data" *ngIf="!owner.corporateSummary"> - <div class="no-data-text">Not Applicable</div> - </div> + <app-no-data *ngIf="!owner.corporateSummary"></app-no-data> </div> </ng-container> </div> diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/parcel/parcel.component.scss b/alcs-frontend/src/app/features/application/applicant-info/application-details/parcel/parcel.component.scss index 35798cc694..690cf69d87 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/application-details/parcel/parcel.component.scss +++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/parcel/parcel.component.scss @@ -15,8 +15,4 @@ .crown-land { text-transform: capitalize; -} - -.no-data-text { - color: colors.$grey-dark; } \ No newline at end of file diff --git a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/parcel/parcel.component.html b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/parcel/parcel.component.html index f8c2ee84d3..4b5afb0b50 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/parcel/parcel.component.html +++ b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/parcel/parcel.component.html @@ -89,9 +89,7 @@ <h4 [id]="parcel.uuid">Parcel {{ parcelInd + 1 }}: Parcel and Owner Information< <a *ngIf="owner.corporateSummary" (click)="onOpenFile(owner.corporateSummary.uuid)">{{ owner.corporateSummary.fileName }}</a> - <div class="no-data" *ngIf="!owner.corporateSummary"> - <div class="no-data-text">Not Applicable</div> - </div> + <app-no-data *ngIf="!owner.corporateSummary"></app-no-data> </div> </ng-container> </div> diff --git a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/parcel/parcel.component.scss b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/parcel/parcel.component.scss index e58c3c08c6..018792dbb2 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/parcel/parcel.component.scss +++ b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/parcel/parcel.component.scss @@ -17,8 +17,4 @@ .crown-land { text-transform: capitalize; -} - -.no-data-text { - color: colors.$grey-dark; } \ No newline at end of file diff --git a/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.scss b/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.scss index 913d496e56..dab5b65b86 100644 --- a/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.scss +++ b/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.scss @@ -45,4 +45,6 @@ .no-data-text { color: colors.$grey-dark; + text-align: left; + padding-top: 0; } \ No newline at end of file From c140b7a1289445f4ff5a5e9b9fb107b9a2804657 Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Thu, 30 Nov 2023 15:40:14 -0800 Subject: [PATCH 712/954] fixes --- .../owner-dialogs/parcel-owners/parcel-owners.component.scss | 2 ++ 1 file changed, 2 insertions(+) diff --git a/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.scss b/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.scss index 90a3d76d0c..3450e216d4 100644 --- a/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.scss +++ b/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.scss @@ -15,4 +15,6 @@ .no-data-text { color: colors.$grey-dark; + text-align: left; + padding-top: 0; } From 14163b7b8516a63857c623af3ec7dd6acf090d97 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Fri, 1 Dec 2023 13:18:01 -0800 Subject: [PATCH 713/954] Use correct cancelled code for public search --- .../public-application-search-view.entity.ts | 7 +- ...lic-notice-of-intent-search-view.entity.ts | 7 +- ...4933579-fix_public_search_cancel_status.ts | 89 +++++++++++++++++++ 3 files changed, 95 insertions(+), 8 deletions(-) create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1701464933579-fix_public_search_cancel_status.ts diff --git a/services/apps/alcs/src/portal/public/search/application/public-application-search-view.entity.ts b/services/apps/alcs/src/portal/public/search/application/public-application-search-view.entity.ts index b4165055b0..0c5bb729b3 100644 --- a/services/apps/alcs/src/portal/public/search/application/public-application-search-view.entity.ts +++ b/services/apps/alcs/src/portal/public/search/application/public-application-search-view.entity.ts @@ -7,6 +7,7 @@ import { ViewEntity, } from 'typeorm'; import { ApplicationDecision } from '../../../../alcs/application-decision/application-decision.entity'; +import { SUBMISSION_STATUS } from '../../../../alcs/application/application-submission-status/submission-status.dto'; import { ApplicationSubmissionToSubmissionStatus } from '../../../../alcs/application/application-submission-status/submission-status.entity'; import { Application } from '../../../../alcs/application/application.entity'; import { ApplicationType } from '../../../../alcs/code/application-code/application-type/application-type.entity'; @@ -93,11 +94,9 @@ import { LinkedStatusType } from '../public-search.dto'; '(app.date_received_all_items IS NOT NULL AND app.date_received_all_items <= NOW())', ) .andWhere( - "alcs.get_current_status_for_application_submission_by_uuid(app_sub.uuid)->>'status_type_code' != 'CNCL'", + `alcs.get_current_status_for_application_submission_by_uuid(app_sub.uuid)->>'status_type_code' != '${SUBMISSION_STATUS.CANCELLED}'`, ) - .andWhere( - "decision_date.dest_rank = 1", - ), + .andWhere('decision_date.dest_rank = 1'), }) export class PublicApplicationSubmissionSearchView { @ViewColumn() diff --git a/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search-view.entity.ts b/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search-view.entity.ts index 5b19ebd28c..ab13ef7244 100644 --- a/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search-view.entity.ts +++ b/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search-view.entity.ts @@ -8,6 +8,7 @@ import { } from 'typeorm'; import { LocalGovernment } from '../../../../alcs/local-government/local-government.entity'; import { NoticeOfIntentDecision } from '../../../../alcs/notice-of-intent-decision/notice-of-intent-decision.entity'; +import { NOI_SUBMISSION_STATUS } from '../../../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status.dto'; import { NoticeOfIntentSubmissionToSubmissionStatus } from '../../../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status.entity'; import { NoticeOfIntentType } from '../../../../alcs/notice-of-intent/notice-of-intent-type/notice-of-intent-type.entity'; import { NoticeOfIntent } from '../../../../alcs/notice-of-intent/notice-of-intent.entity'; @@ -92,11 +93,9 @@ import { LinkedStatusType } from '../public-search.dto'; '(noi.date_received_all_items IS NOT NULL AND noi.date_received_all_items <= NOW())', ) .andWhere( - "alcs.get_current_status_for_notice_of_intent_submission_by_uuid(noi_sub.uuid)->>'status_type_code' != 'CNCL'", + `alcs.get_current_status_for_notice_of_intent_submission_by_uuid(noi_sub.uuid)->>'status_type_code' != '${NOI_SUBMISSION_STATUS.CANCELLED}'`, ) - .andWhere( - "decision_date.dest_rank = 1", - ), + .andWhere('decision_date.dest_rank = 1'), }) export class PublicNoticeOfIntentSubmissionSearchView { @ViewColumn() diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1701464933579-fix_public_search_cancel_status.ts b/services/apps/alcs/src/providers/typeorm/migrations/1701464933579-fix_public_search_cancel_status.ts new file mode 100644 index 0000000000..242d4bef69 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1701464933579-fix_public_search_cancel_status.ts @@ -0,0 +1,89 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class FixPublicSearchCancelStatus1701464933579 + implements MigrationInterface +{ + name = 'FixPublicSearchCancelStatus1701464933579'; + + public async up(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, + ['VIEW', 'public_application_submission_search_view', 'alcs'], + ); + await queryRunner.query( + `DROP VIEW "alcs"."public_application_submission_search_view"`, + ); + await queryRunner.query( + `DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, + ['VIEW', 'public_notice_of_intent_submission_search_view', 'alcs'], + ); + await queryRunner.query( + `DROP VIEW "alcs"."public_notice_of_intent_submission_search_view"`, + ); + await queryRunner.query( + `CREATE VIEW "alcs"."public_notice_of_intent_submission_search_view" AS SELECT "noi_sub"."uuid" AS "uuid", "noi_sub"."applicant" AS "applicant", "noi"."uuid" AS "notice_of_intent_uuid", "noticeOfIntentType"."audit_deleted_date_at" AS "noticeOfIntentType_audit_deleted_date_at", "noticeOfIntentType"."audit_created_at" AS "noticeOfIntentType_audit_created_at", "noticeOfIntentType"."audit_updated_at" AS "noticeOfIntentType_audit_updated_at", "noticeOfIntentType"."audit_created_by" AS "noticeOfIntentType_audit_created_by", "noticeOfIntentType"."audit_updated_by" AS "noticeOfIntentType_audit_updated_by", "noticeOfIntentType"."label" AS "noticeOfIntentType_label", "noticeOfIntentType"."code" AS "noticeOfIntentType_code", "noticeOfIntentType"."description" AS "noticeOfIntentType_description", "noticeOfIntentType"."short_label" AS "noticeOfIntentType_short_label", "noticeOfIntentType"."background_color" AS "noticeOfIntentType_background_color", "noticeOfIntentType"."text_color" AS "noticeOfIntentType_text_color", "noticeOfIntentType"."html_description" AS "noticeOfIntentType_html_description", "noticeOfIntentType"."portal_label" AS "noticeOfIntentType_portal_label", "localGovernment"."name" AS "local_government_name", "noi_sub"."file_number" AS "file_number", "noi_sub"."local_government_uuid" AS "local_government_uuid", "noi_sub"."type_code" AS "notice_of_intent_type_code", "noi"."date_submitted_to_alc" AS "date_submitted_to_alc", "noi"."decision_date" AS "decision_date", decision_date.outcome AS "outcome", decision_date.dest_rank AS "dest_rank", "noi"."region_code" AS "notice_of_intent_region_code", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid") AS "status" FROM "alcs"."notice_of_intent_submission" "noi_sub" INNER JOIN "alcs"."notice_of_intent" "noi" ON "noi"."file_number" = "noi_sub"."file_number" AND "noi"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."notice_of_intent_type" "noticeOfIntentType" ON "noi_sub"."type_code" = "noticeOfIntentType"."code" AND "noticeOfIntentType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "noi_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."notice_of_intent_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "noi_sub"."uuid" LEFT JOIN (SELECT DISTINCT ON (notice_of_intentuuid) decisiondate AS "date", outcome AS "outcome", dest_rank AS "dest_rank", notice_of_intentuuid AS "notice_of_intent_uuid" FROM "alcs"."notice_of_intent_decision" "decision_date", (SELECT outcome_code AS "outcome", date AS "decisiondate", notice_of_intent_uuid AS "notice_of_intentuuid", RANK() OVER (PARTITION BY notice_of_intent_uuid ORDER BY date DESC, audit_created_at DESC) AS "dest_rank" FROM "alcs"."notice_of_intent_decision" "decision" WHERE "decision"."audit_deleted_date_at" IS NULL) "decisions" WHERE dest_rank = 1) "decision_date" ON decision_date."notice_of_intent_uuid" = "noi"."uuid" WHERE ( "noi_sub"."is_draft" = FALSE AND ("noi"."date_received_all_items" IS NOT NULL AND "noi"."date_received_all_items" <= NOW()) AND alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid")->>'status_type_code' != 'CANC' AND decision_date.dest_rank = 1 ) AND ( "noi_sub"."audit_deleted_date_at" IS NULL )`, + ); + await queryRunner.query( + `INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, + [ + 'alcs', + 'VIEW', + 'public_notice_of_intent_submission_search_view', + 'SELECT "noi_sub"."uuid" AS "uuid", "noi_sub"."applicant" AS "applicant", "noi"."uuid" AS "notice_of_intent_uuid", "noticeOfIntentType"."audit_deleted_date_at" AS "noticeOfIntentType_audit_deleted_date_at", "noticeOfIntentType"."audit_created_at" AS "noticeOfIntentType_audit_created_at", "noticeOfIntentType"."audit_updated_at" AS "noticeOfIntentType_audit_updated_at", "noticeOfIntentType"."audit_created_by" AS "noticeOfIntentType_audit_created_by", "noticeOfIntentType"."audit_updated_by" AS "noticeOfIntentType_audit_updated_by", "noticeOfIntentType"."label" AS "noticeOfIntentType_label", "noticeOfIntentType"."code" AS "noticeOfIntentType_code", "noticeOfIntentType"."description" AS "noticeOfIntentType_description", "noticeOfIntentType"."short_label" AS "noticeOfIntentType_short_label", "noticeOfIntentType"."background_color" AS "noticeOfIntentType_background_color", "noticeOfIntentType"."text_color" AS "noticeOfIntentType_text_color", "noticeOfIntentType"."html_description" AS "noticeOfIntentType_html_description", "noticeOfIntentType"."portal_label" AS "noticeOfIntentType_portal_label", "localGovernment"."name" AS "local_government_name", "noi_sub"."file_number" AS "file_number", "noi_sub"."local_government_uuid" AS "local_government_uuid", "noi_sub"."type_code" AS "notice_of_intent_type_code", "noi"."date_submitted_to_alc" AS "date_submitted_to_alc", "noi"."decision_date" AS "decision_date", decision_date.outcome AS "outcome", decision_date.dest_rank AS "dest_rank", "noi"."region_code" AS "notice_of_intent_region_code", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid") AS "status" FROM "alcs"."notice_of_intent_submission" "noi_sub" INNER JOIN "alcs"."notice_of_intent" "noi" ON "noi"."file_number" = "noi_sub"."file_number" AND "noi"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."notice_of_intent_type" "noticeOfIntentType" ON "noi_sub"."type_code" = "noticeOfIntentType"."code" AND "noticeOfIntentType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "noi_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."notice_of_intent_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "noi_sub"."uuid" LEFT JOIN (SELECT DISTINCT ON (notice_of_intentuuid) decisiondate AS "date", outcome AS "outcome", dest_rank AS "dest_rank", notice_of_intentuuid AS "notice_of_intent_uuid" FROM "alcs"."notice_of_intent_decision" "decision_date", (SELECT outcome_code AS "outcome", date AS "decisiondate", notice_of_intent_uuid AS "notice_of_intentuuid", RANK() OVER (PARTITION BY notice_of_intent_uuid ORDER BY date DESC, audit_created_at DESC) AS "dest_rank" FROM "alcs"."notice_of_intent_decision" "decision" WHERE "decision"."audit_deleted_date_at" IS NULL) "decisions" WHERE dest_rank = 1) "decision_date" ON decision_date."notice_of_intent_uuid" = "noi"."uuid" WHERE ( "noi_sub"."is_draft" = FALSE AND ("noi"."date_received_all_items" IS NOT NULL AND "noi"."date_received_all_items" <= NOW()) AND alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid")->>\'status_type_code\' != \'CANC\' AND decision_date.dest_rank = 1 ) AND ( "noi_sub"."audit_deleted_date_at" IS NULL )', + ], + ); + await queryRunner.query( + `CREATE VIEW "alcs"."public_application_submission_search_view" AS SELECT "app_sub"."uuid" AS "uuid", "app_sub"."applicant" AS "applicant", "app"."uuid" AS "application_uuid", "applicationType"."audit_deleted_date_at" AS "applicationType_audit_deleted_date_at", "applicationType"."audit_created_at" AS "applicationType_audit_created_at", "applicationType"."audit_updated_at" AS "applicationType_audit_updated_at", "applicationType"."audit_created_by" AS "applicationType_audit_created_by", "applicationType"."audit_updated_by" AS "applicationType_audit_updated_by", "applicationType"."label" AS "applicationType_label", "applicationType"."code" AS "applicationType_code", "applicationType"."description" AS "applicationType_description", "applicationType"."short_label" AS "applicationType_short_label", "applicationType"."background_color" AS "applicationType_background_color", "applicationType"."text_color" AS "applicationType_text_color", "applicationType"."html_description" AS "applicationType_html_description", "applicationType"."portal_label" AS "applicationType_portal_label", "applicationType"."portal_order" AS "applicationType_portal_order", "applicationType"."requires_government_review" AS "applicationType_requires_government_review", "localGovernment"."name" AS "local_government_name", "app_sub"."file_number" AS "file_number", "app_sub"."local_government_uuid" AS "local_government_uuid", "app_sub"."type_code" AS "application_type_code", "app"."date_submitted_to_alc" AS "date_submitted_to_alc", "app"."decision_date" AS "decision_date", decision_date.outcome AS "outcome", decision_date.dest_rank AS "dest_rank", "app"."region_code" AS "application_region_code", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid") AS "status" FROM "alcs"."application_submission" "app_sub" INNER JOIN "alcs"."application" "app" ON "app"."file_number" = "app_sub"."file_number" AND "app"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."application_type" "applicationType" ON "app_sub"."type_code" = "applicationType"."code" AND "applicationType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "app_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."application_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "app_sub"."uuid" LEFT JOIN (SELECT DISTINCT ON (application_uuid) decisiondate AS "date", outcome AS "outcome", dest_rank AS "dest_rank", applicationuuid AS "application_uuid" FROM "alcs"."application_decision" "decision_date", (SELECT outcome_code AS "outcome", date AS "decisiondate", application_uuid AS "applicationuuid", RANK() OVER (PARTITION BY application_uuid ORDER BY date DESC, audit_created_at DESC) AS "dest_rank" FROM "alcs"."application_decision" "decision" WHERE ( is_draft = FALSE ) AND ( "decision"."audit_deleted_date_at" IS NULL )) "decisions" WHERE dest_rank = 1) "decision_date" ON decision_date."application_uuid" = "app"."uuid" WHERE ( "app_sub"."is_draft" = FALSE AND ("app"."date_received_all_items" IS NOT NULL AND "app"."date_received_all_items" <= NOW()) AND alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid")->>'status_type_code' != 'CANC' AND decision_date.dest_rank = 1 ) AND ( "app_sub"."audit_deleted_date_at" IS NULL )`, + ); + await queryRunner.query( + `INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, + [ + 'alcs', + 'VIEW', + 'public_application_submission_search_view', + 'SELECT "app_sub"."uuid" AS "uuid", "app_sub"."applicant" AS "applicant", "app"."uuid" AS "application_uuid", "applicationType"."audit_deleted_date_at" AS "applicationType_audit_deleted_date_at", "applicationType"."audit_created_at" AS "applicationType_audit_created_at", "applicationType"."audit_updated_at" AS "applicationType_audit_updated_at", "applicationType"."audit_created_by" AS "applicationType_audit_created_by", "applicationType"."audit_updated_by" AS "applicationType_audit_updated_by", "applicationType"."label" AS "applicationType_label", "applicationType"."code" AS "applicationType_code", "applicationType"."description" AS "applicationType_description", "applicationType"."short_label" AS "applicationType_short_label", "applicationType"."background_color" AS "applicationType_background_color", "applicationType"."text_color" AS "applicationType_text_color", "applicationType"."html_description" AS "applicationType_html_description", "applicationType"."portal_label" AS "applicationType_portal_label", "applicationType"."portal_order" AS "applicationType_portal_order", "applicationType"."requires_government_review" AS "applicationType_requires_government_review", "localGovernment"."name" AS "local_government_name", "app_sub"."file_number" AS "file_number", "app_sub"."local_government_uuid" AS "local_government_uuid", "app_sub"."type_code" AS "application_type_code", "app"."date_submitted_to_alc" AS "date_submitted_to_alc", "app"."decision_date" AS "decision_date", decision_date.outcome AS "outcome", decision_date.dest_rank AS "dest_rank", "app"."region_code" AS "application_region_code", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid") AS "status" FROM "alcs"."application_submission" "app_sub" INNER JOIN "alcs"."application" "app" ON "app"."file_number" = "app_sub"."file_number" AND "app"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."application_type" "applicationType" ON "app_sub"."type_code" = "applicationType"."code" AND "applicationType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "app_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."application_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "app_sub"."uuid" LEFT JOIN (SELECT DISTINCT ON (application_uuid) decisiondate AS "date", outcome AS "outcome", dest_rank AS "dest_rank", applicationuuid AS "application_uuid" FROM "alcs"."application_decision" "decision_date", (SELECT outcome_code AS "outcome", date AS "decisiondate", application_uuid AS "applicationuuid", RANK() OVER (PARTITION BY application_uuid ORDER BY date DESC, audit_created_at DESC) AS "dest_rank" FROM "alcs"."application_decision" "decision" WHERE ( is_draft = FALSE ) AND ( "decision"."audit_deleted_date_at" IS NULL )) "decisions" WHERE dest_rank = 1) "decision_date" ON decision_date."application_uuid" = "app"."uuid" WHERE ( "app_sub"."is_draft" = FALSE AND ("app"."date_received_all_items" IS NOT NULL AND "app"."date_received_all_items" <= NOW()) AND alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid")->>\'status_type_code\' != \'CANC\' AND decision_date.dest_rank = 1 ) AND ( "app_sub"."audit_deleted_date_at" IS NULL )', + ], + ); + } + + public async down(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, + ['VIEW', 'public_application_submission_search_view', 'alcs'], + ); + await queryRunner.query( + `DROP VIEW "alcs"."public_application_submission_search_view"`, + ); + await queryRunner.query( + `DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, + ['VIEW', 'public_notice_of_intent_submission_search_view', 'alcs'], + ); + await queryRunner.query( + `DROP VIEW "alcs"."public_notice_of_intent_submission_search_view"`, + ); + await queryRunner.query( + `CREATE VIEW "alcs"."public_notice_of_intent_submission_search_view" AS SELECT "noi_sub"."uuid" AS "uuid", "noi_sub"."applicant" AS "applicant", "noi"."uuid" AS "notice_of_intent_uuid", "noticeOfIntentType"."audit_deleted_date_at" AS "noticeOfIntentType_audit_deleted_date_at", "noticeOfIntentType"."audit_created_at" AS "noticeOfIntentType_audit_created_at", "noticeOfIntentType"."audit_updated_at" AS "noticeOfIntentType_audit_updated_at", "noticeOfIntentType"."audit_created_by" AS "noticeOfIntentType_audit_created_by", "noticeOfIntentType"."audit_updated_by" AS "noticeOfIntentType_audit_updated_by", "noticeOfIntentType"."label" AS "noticeOfIntentType_label", "noticeOfIntentType"."code" AS "noticeOfIntentType_code", "noticeOfIntentType"."description" AS "noticeOfIntentType_description", "noticeOfIntentType"."short_label" AS "noticeOfIntentType_short_label", "noticeOfIntentType"."background_color" AS "noticeOfIntentType_background_color", "noticeOfIntentType"."text_color" AS "noticeOfIntentType_text_color", "noticeOfIntentType"."html_description" AS "noticeOfIntentType_html_description", "noticeOfIntentType"."portal_label" AS "noticeOfIntentType_portal_label", "localGovernment"."name" AS "local_government_name", "noi_sub"."file_number" AS "file_number", "noi_sub"."local_government_uuid" AS "local_government_uuid", "noi_sub"."type_code" AS "notice_of_intent_type_code", "noi"."date_submitted_to_alc" AS "date_submitted_to_alc", "noi"."decision_date" AS "decision_date", decision_date.outcome AS "outcome", decision_date.dest_rank AS "dest_rank", "noi"."region_code" AS "notice_of_intent_region_code", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid") AS "status" FROM "alcs"."notice_of_intent_submission" "noi_sub" INNER JOIN "alcs"."notice_of_intent" "noi" ON "noi"."file_number" = "noi_sub"."file_number" AND "noi"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."notice_of_intent_type" "noticeOfIntentType" ON "noi_sub"."type_code" = "noticeOfIntentType"."code" AND "noticeOfIntentType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "noi_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."notice_of_intent_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "noi_sub"."uuid" LEFT JOIN (SELECT DISTINCT ON (notice_of_intentuuid) decisiondate AS "date", outcome AS "outcome", dest_rank AS "dest_rank", notice_of_intentuuid AS "notice_of_intent_uuid" FROM "alcs"."notice_of_intent_decision" "decision_date", (SELECT outcome_code AS "outcome", date AS "decisiondate", notice_of_intent_uuid AS "notice_of_intentuuid", RANK() OVER (PARTITION BY notice_of_intent_uuid ORDER BY date DESC, audit_created_at DESC) AS "dest_rank" FROM "alcs"."notice_of_intent_decision" "decision" WHERE "decision"."audit_deleted_date_at" IS NULL) "decisions" WHERE dest_rank = 1) "decision_date" ON decision_date."notice_of_intent_uuid" = "noi"."uuid" WHERE ( "noi_sub"."is_draft" = FALSE AND ("noi"."date_received_all_items" IS NOT NULL AND "noi"."date_received_all_items" <= NOW()) AND alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid")->>'status_type_code' != 'CNCL' AND decision_date.dest_rank = 1 ) AND ( "noi_sub"."audit_deleted_date_at" IS NULL )`, + ); + await queryRunner.query( + `INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, + [ + 'alcs', + 'VIEW', + 'public_notice_of_intent_submission_search_view', + 'SELECT "noi_sub"."uuid" AS "uuid", "noi_sub"."applicant" AS "applicant", "noi"."uuid" AS "notice_of_intent_uuid", "noticeOfIntentType"."audit_deleted_date_at" AS "noticeOfIntentType_audit_deleted_date_at", "noticeOfIntentType"."audit_created_at" AS "noticeOfIntentType_audit_created_at", "noticeOfIntentType"."audit_updated_at" AS "noticeOfIntentType_audit_updated_at", "noticeOfIntentType"."audit_created_by" AS "noticeOfIntentType_audit_created_by", "noticeOfIntentType"."audit_updated_by" AS "noticeOfIntentType_audit_updated_by", "noticeOfIntentType"."label" AS "noticeOfIntentType_label", "noticeOfIntentType"."code" AS "noticeOfIntentType_code", "noticeOfIntentType"."description" AS "noticeOfIntentType_description", "noticeOfIntentType"."short_label" AS "noticeOfIntentType_short_label", "noticeOfIntentType"."background_color" AS "noticeOfIntentType_background_color", "noticeOfIntentType"."text_color" AS "noticeOfIntentType_text_color", "noticeOfIntentType"."html_description" AS "noticeOfIntentType_html_description", "noticeOfIntentType"."portal_label" AS "noticeOfIntentType_portal_label", "localGovernment"."name" AS "local_government_name", "noi_sub"."file_number" AS "file_number", "noi_sub"."local_government_uuid" AS "local_government_uuid", "noi_sub"."type_code" AS "notice_of_intent_type_code", "noi"."date_submitted_to_alc" AS "date_submitted_to_alc", "noi"."decision_date" AS "decision_date", decision_date.outcome AS "outcome", decision_date.dest_rank AS "dest_rank", "noi"."region_code" AS "notice_of_intent_region_code", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid") AS "status" FROM "alcs"."notice_of_intent_submission" "noi_sub" INNER JOIN "alcs"."notice_of_intent" "noi" ON "noi"."file_number" = "noi_sub"."file_number" AND "noi"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."notice_of_intent_type" "noticeOfIntentType" ON "noi_sub"."type_code" = "noticeOfIntentType"."code" AND "noticeOfIntentType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "noi_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."notice_of_intent_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "noi_sub"."uuid" LEFT JOIN (SELECT DISTINCT ON (notice_of_intentuuid) decisiondate AS "date", outcome AS "outcome", dest_rank AS "dest_rank", notice_of_intentuuid AS "notice_of_intent_uuid" FROM "alcs"."notice_of_intent_decision" "decision_date", (SELECT outcome_code AS "outcome", date AS "decisiondate", notice_of_intent_uuid AS "notice_of_intentuuid", RANK() OVER (PARTITION BY notice_of_intent_uuid ORDER BY date DESC, audit_created_at DESC) AS "dest_rank" FROM "alcs"."notice_of_intent_decision" "decision" WHERE "decision"."audit_deleted_date_at" IS NULL) "decisions" WHERE dest_rank = 1) "decision_date" ON decision_date."notice_of_intent_uuid" = "noi"."uuid" WHERE ( "noi_sub"."is_draft" = FALSE AND ("noi"."date_received_all_items" IS NOT NULL AND "noi"."date_received_all_items" <= NOW()) AND alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid")->>\'status_type_code\' != \'CNCL\' AND decision_date.dest_rank = 1 ) AND ( "noi_sub"."audit_deleted_date_at" IS NULL )', + ], + ); + await queryRunner.query( + `CREATE VIEW "alcs"."public_application_submission_search_view" AS SELECT "app_sub"."uuid" AS "uuid", "app_sub"."applicant" AS "applicant", "app"."uuid" AS "application_uuid", "applicationType"."audit_deleted_date_at" AS "applicationType_audit_deleted_date_at", "applicationType"."audit_created_at" AS "applicationType_audit_created_at", "applicationType"."audit_updated_at" AS "applicationType_audit_updated_at", "applicationType"."audit_created_by" AS "applicationType_audit_created_by", "applicationType"."audit_updated_by" AS "applicationType_audit_updated_by", "applicationType"."label" AS "applicationType_label", "applicationType"."code" AS "applicationType_code", "applicationType"."description" AS "applicationType_description", "applicationType"."short_label" AS "applicationType_short_label", "applicationType"."background_color" AS "applicationType_background_color", "applicationType"."text_color" AS "applicationType_text_color", "applicationType"."html_description" AS "applicationType_html_description", "applicationType"."portal_label" AS "applicationType_portal_label", "applicationType"."portal_order" AS "applicationType_portal_order", "applicationType"."requires_government_review" AS "applicationType_requires_government_review", "localGovernment"."name" AS "local_government_name", "app_sub"."file_number" AS "file_number", "app_sub"."local_government_uuid" AS "local_government_uuid", "app_sub"."type_code" AS "application_type_code", "app"."date_submitted_to_alc" AS "date_submitted_to_alc", "app"."decision_date" AS "decision_date", decision_date.outcome AS "outcome", decision_date.dest_rank AS "dest_rank", "app"."region_code" AS "application_region_code", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid") AS "status" FROM "alcs"."application_submission" "app_sub" INNER JOIN "alcs"."application" "app" ON "app"."file_number" = "app_sub"."file_number" AND "app"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."application_type" "applicationType" ON "app_sub"."type_code" = "applicationType"."code" AND "applicationType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "app_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."application_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "app_sub"."uuid" LEFT JOIN (SELECT DISTINCT ON (application_uuid) decisiondate AS "date", outcome AS "outcome", dest_rank AS "dest_rank", applicationuuid AS "application_uuid" FROM "alcs"."application_decision" "decision_date", (SELECT outcome_code AS "outcome", date AS "decisiondate", application_uuid AS "applicationuuid", RANK() OVER (PARTITION BY application_uuid ORDER BY date DESC, audit_created_at DESC) AS "dest_rank" FROM "alcs"."application_decision" "decision" WHERE ( is_draft = FALSE ) AND ( "decision"."audit_deleted_date_at" IS NULL )) "decisions" WHERE dest_rank = 1) "decision_date" ON decision_date."application_uuid" = "app"."uuid" WHERE ( "app_sub"."is_draft" = FALSE AND ("app"."date_received_all_items" IS NOT NULL AND "app"."date_received_all_items" <= NOW()) AND alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid")->>'status_type_code' != 'CNCL' AND decision_date.dest_rank = 1 ) AND ( "app_sub"."audit_deleted_date_at" IS NULL )`, + ); + await queryRunner.query( + `INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, + [ + 'alcs', + 'VIEW', + 'public_application_submission_search_view', + 'SELECT "app_sub"."uuid" AS "uuid", "app_sub"."applicant" AS "applicant", "app"."uuid" AS "application_uuid", "applicationType"."audit_deleted_date_at" AS "applicationType_audit_deleted_date_at", "applicationType"."audit_created_at" AS "applicationType_audit_created_at", "applicationType"."audit_updated_at" AS "applicationType_audit_updated_at", "applicationType"."audit_created_by" AS "applicationType_audit_created_by", "applicationType"."audit_updated_by" AS "applicationType_audit_updated_by", "applicationType"."label" AS "applicationType_label", "applicationType"."code" AS "applicationType_code", "applicationType"."description" AS "applicationType_description", "applicationType"."short_label" AS "applicationType_short_label", "applicationType"."background_color" AS "applicationType_background_color", "applicationType"."text_color" AS "applicationType_text_color", "applicationType"."html_description" AS "applicationType_html_description", "applicationType"."portal_label" AS "applicationType_portal_label", "applicationType"."portal_order" AS "applicationType_portal_order", "applicationType"."requires_government_review" AS "applicationType_requires_government_review", "localGovernment"."name" AS "local_government_name", "app_sub"."file_number" AS "file_number", "app_sub"."local_government_uuid" AS "local_government_uuid", "app_sub"."type_code" AS "application_type_code", "app"."date_submitted_to_alc" AS "date_submitted_to_alc", "app"."decision_date" AS "decision_date", decision_date.outcome AS "outcome", decision_date.dest_rank AS "dest_rank", "app"."region_code" AS "application_region_code", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid") AS "status" FROM "alcs"."application_submission" "app_sub" INNER JOIN "alcs"."application" "app" ON "app"."file_number" = "app_sub"."file_number" AND "app"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."application_type" "applicationType" ON "app_sub"."type_code" = "applicationType"."code" AND "applicationType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "app_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."application_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "app_sub"."uuid" LEFT JOIN (SELECT DISTINCT ON (application_uuid) decisiondate AS "date", outcome AS "outcome", dest_rank AS "dest_rank", applicationuuid AS "application_uuid" FROM "alcs"."application_decision" "decision_date", (SELECT outcome_code AS "outcome", date AS "decisiondate", application_uuid AS "applicationuuid", RANK() OVER (PARTITION BY application_uuid ORDER BY date DESC, audit_created_at DESC) AS "dest_rank" FROM "alcs"."application_decision" "decision" WHERE ( is_draft = FALSE ) AND ( "decision"."audit_deleted_date_at" IS NULL )) "decisions" WHERE dest_rank = 1) "decision_date" ON decision_date."application_uuid" = "app"."uuid" WHERE ( "app_sub"."is_draft" = FALSE AND ("app"."date_received_all_items" IS NOT NULL AND "app"."date_received_all_items" <= NOW()) AND alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid")->>\'status_type_code\' != \'CNCL\' AND decision_date.dest_rank = 1 ) AND ( "app_sub"."audit_deleted_date_at" IS NULL )', + ], + ); + } +} From 52e9943f7adffc8cebc70a318ead077bbfb1d377 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Fri, 1 Dec 2023 13:58:04 -0800 Subject: [PATCH 714/954] Decision Fixes * Run component validation against the updateDtos outcome if it has one * Update the requires components field when the outcome is changed --- .../decision-input-v2.component.ts | 14 +++++----- .../application-decision-v2.service.ts | 26 +++++++------------ 2 files changed, 18 insertions(+), 22 deletions(-) diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.ts index 7c8e545841..71c8e8896a 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.ts @@ -110,7 +110,7 @@ export class DecisionInputV2Component implements OnInit, OnDestroy { private route: ActivatedRoute, private toastService: ToastService, private applicationService: ApplicationDetailService, - public dialog: MatDialog + public dialog: MatDialog, ) {} ngOnInit(): void { @@ -177,8 +177,8 @@ export class DecisionInputV2Component implements OnInit, OnDestroy { combineLatestWith( this.modificationService.$modifications, this.reconsiderationService.$reconsiderations, - this.decisionService.$decisions - ) + this.decisionService.$decisions, + ), ) .subscribe(([decision, modifications, reconsiderations, decisions]) => { if (decision) { @@ -238,13 +238,13 @@ export class DecisionInputV2Component implements OnInit, OnDestroy { private mapPostDecisionsToControls( modifications: ApplicationModificationDto[], reconsiderations: ApplicationReconsiderationDto[], - existingDecision?: ApplicationDecisionDto + existingDecision?: ApplicationDecisionDto, ) { const mappedModifications = modifications .filter( (modification) => (existingDecision && existingDecision.modifies?.uuid === modification.uuid) || - (modification.reviewOutcome.code === 'PRC' && !modification.resultingDecision) + (modification.reviewOutcome.code === 'PRC' && !modification.resultingDecision), ) .map((modification, index) => ({ label: `Modification Request #${modifications.length - index} - ${modification.modifiesDecisions @@ -259,7 +259,7 @@ export class DecisionInputV2Component implements OnInit, OnDestroy { (reconsideration) => (existingDecision && existingDecision.reconsiders?.uuid === reconsideration.uuid) || (reconsideration.reviewOutcome?.code === 'PRC' && !reconsideration.resultingDecision) || - (reconsideration.type.code === RECONSIDERATION_TYPE.T_33_1 && !reconsideration.resultingDecision) + (reconsideration.type.code === RECONSIDERATION_TYPE.T_33_1 && !reconsideration.resultingDecision), ) .map((reconsideration, index) => ({ label: `Reconsideration Request #${reconsiderations.length - index} - ${reconsideration.reconsidersDecisions @@ -594,6 +594,8 @@ export class DecisionInputV2Component implements OnInit, OnDestroy { } onChangeDecisionOutcome(selectedOutcome: DecisionOutcomeCodeDto) { + this.requireComponents = selectedOutcome.code === 'APPR'; + if (['APPR', 'RESC'].includes(selectedOutcome.code)) { if (this.form.controls.isSubjectToConditions.disabled) { this.showComponents = true; diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service.ts index f45be8946d..c298a9973f 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service.ts @@ -230,9 +230,8 @@ export class ApplicationDecisionV2Service { modifies: ApplicationModification | undefined | null, reconsiders: ApplicationReconsideration | undefined | null, ) { - const existingDecision: Partial<ApplicationDecision> = await this.getOrFail( - uuid, - ); + const existingDecision: Partial<ApplicationDecision> = + await this.getOrFail(uuid); await this.validateDecisionChanges(updateDto); @@ -305,9 +304,8 @@ export class ApplicationDecisionV2Service { //Must be called after update components await this.updateConditions(updateDto, existingDecision); - const updatedDecision = await this.appDecisionRepository.save( - existingDecision, - ); + const updatedDecision = + await this.appDecisionRepository.save(existingDecision); if (dateHasChanged || isChangingDraftStatus) { await this.updateApplicationDecisionDates(updatedDecision); @@ -522,18 +520,16 @@ export class ApplicationDecisionV2Service { } async deleteDocument(decisionDocumentUuid: string) { - const decisionDocument = await this.getDecisionDocumentOrFail( - decisionDocumentUuid, - ); + const decisionDocument = + await this.getDecisionDocumentOrFail(decisionDocumentUuid); await this.decisionDocumentRepository.softRemove(decisionDocument); return decisionDocument; } async getDownloadUrl(decisionDocumentUuid: string, openInline = false) { - const decisionDocument = await this.getDecisionDocumentOrFail( - decisionDocumentUuid, - ); + const decisionDocument = + await this.getDecisionDocumentOrFail(decisionDocumentUuid); return this.documentService.getDownloadUrl( decisionDocument.document, @@ -622,11 +618,9 @@ export class ApplicationDecisionV2Service { updateDto: UpdateApplicationDecisionDto, existingDecision: Partial<ApplicationDecision>, ) { + const outcomeCode = updateDto.outcomeCode ?? existingDecision.outcomeCode; if (updateDto.decisionComponents) { - if ( - existingDecision.outcomeCode && - ['APPA', 'APPR'].includes(existingDecision.outcomeCode) - ) { + if (outcomeCode && outcomeCode === 'APPR') { this.decisionComponentService.validate( updateDto.decisionComponents, updateDto.isDraft, From 95415dfe673288554e26aa37b2ef3795f8856067 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Fri, 1 Dec 2023 15:16:10 -0800 Subject: [PATCH 715/954] Update not setup government message * Remove a banner from step 5 --- .../application-details.component.html | 9 +++++---- .../edit-submission/land-use/land-use.component.html | 9 --------- .../select-government.component.html | 6 ++++-- .../edit-submission/land-use/land-use.component.html | 9 --------- .../select-government.component.html | 6 ++++-- .../notice-of-intent-details.component.html | 9 +++++---- .../select-government.component.html | 6 ++++-- .../notification-details.component.html | 11 ++++++----- 8 files changed, 28 insertions(+), 37 deletions(-) diff --git a/portal-frontend/src/app/features/applications/application-details/application-details.component.html b/portal-frontend/src/app/features/applications/application-details/application-details.component.html index 6541fce08a..ece92d80bf 100644 --- a/portal-frontend/src/app/features/applications/application-details/application-details.component.html +++ b/portal-frontend/src/app/features/applications/application-details/application-details.component.html @@ -91,10 +91,11 @@ <h3>4. Government</h3> {{ localGovernment?.name }} <app-no-data [showRequired]="showErrors" *ngIf="!localGovernment"></app-no-data> <app-warning-banner *ngIf="showErrors && localGovernment && !localGovernment.hasGuid" class="full-row error"> - This Local/First Nation Government has not yet been set up with the ALC Portal to receive applications. To - submit, you will need to 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> + This local/First Nation government is not set up with the ALC Portal to receive submissions. You can continue to + fill out the form but you will be unable to submit. Please contact the ALC directly as soon as possible: +  <a href="mailto:ALC.Portal@gov.bc.ca">ALC.Portal@gov.bc.ca</a> / <a href="tel:236-468-3342" + >236-468-3342</a + > </app-warning-banner> <app-warning-banner *ngIf=" diff --git a/portal-frontend/src/app/features/applications/edit-submission/land-use/land-use.component.html b/portal-frontend/src/app/features/applications/edit-submission/land-use/land-use.component.html index 6bde767ad1..be8178c220 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/land-use/land-use.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/land-use/land-use.component.html @@ -4,15 +4,6 @@ <h2>Land Use</h2> <p>Current land use of parcel(s) under application and adjacent parcels.</p> <p>*All fields are required unless stated optional.</p> </div> - <app-warning-banner> - Please consult the - <a - href="https://www.alc.gov.bc.ca/application-and-notice-process/applications/what-the-commission-considers/" - target="_blank" - >'What the Commission Considers'</a - > - page of the ALC website for more information. - </app-warning-banner> <form [formGroup]="landUseForm" class="land-use-form"> <h5>Land Use of Parcel(s) under Application</h5> <div class="form-row"> diff --git a/portal-frontend/src/app/features/applications/edit-submission/select-government/select-government.component.html b/portal-frontend/src/app/features/applications/edit-submission/select-government/select-government.component.html index 6ba310a3c0..d1e7c5a9fc 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/select-government/select-government.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/select-government/select-government.component.html @@ -41,8 +41,10 @@ <h2>Government</h2> </div> </form> <app-warning-banner *ngIf="showWarning" class="full-row"> - This Local/First Nation Government has not yet been set up with the ALC Portal to receive applications. To submit, you - will need to contact the ALC directly:  <a href="mailto:ALC.Portal@gov.bc.ca">ALC.Portal@gov.bc.ca</a + This local/First Nation government is not set up with the ALC Portal to receive submissions. You can continue to fill + out the form but you will be unable to submit. Please contact the ALC directly as soon as possible:  <a + href="mailto:ALC.Portal@gov.bc.ca" + >ALC.Portal@gov.bc.ca</a > / <a href="tel:236-468-3342">236-468-3342</a> </app-warning-banner> <app-warning-banner *ngIf="selectedOwnGovernment && requiresGovernmentReview" class="full-row"> diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/land-use/land-use.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/land-use/land-use.component.html index 92251939e7..cb1d9a7ab1 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/land-use/land-use.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/land-use/land-use.component.html @@ -4,15 +4,6 @@ <h2>Land Use</h2> <p>Current land use of parcel(s) under notice of intent and adjacent parcels.</p> <p>*All fields are required unless stated optional.</p> </div> - <app-warning-banner> - Please consult the - <a - href="https://www.alc.gov.bc.ca/application-and-notice-process/applications/what-the-commission-considers/" - target="_blank" - >'What the Commission Considers'</a - > - page of the ALC website for more information. - </app-warning-banner> <form [formGroup]="landUseForm" class="land-use-form"> <h5>Land Use of Parcel(s) under Notice of Intent</h5> <div class="form-row"> diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/select-government/select-government.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/select-government/select-government.component.html index 3428d17d01..f946b3d551 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/select-government/select-government.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/select-government/select-government.component.html @@ -41,8 +41,10 @@ <h2>Government</h2> </div> </form> <app-warning-banner *ngIf="showWarning" class="full-row"> - This Local/First Nation Government has not yet been set up with the ALC Portal to receive notice of intents. To - submit, you will need to contact the ALC directly:  <a href="mailto:ALC.Portal@gov.bc.ca">ALC.Portal@gov.bc.ca</a + This local/First Nation government is not set up with the ALC Portal to receive submissions. You can continue to fill + out the form but you will be unable to submit. Please contact the ALC directly as soon as possible:  <a + href="mailto:ALC.Portal@gov.bc.ca" + >ALC.Portal@gov.bc.ca</a > / <a href="tel:236-468-3342">236-468-3342</a> </app-warning-banner> <p> diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.html b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.html index 4226a9c871..197f693eff 100644 --- a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.html @@ -82,10 +82,11 @@ <h3>3. Government</h3> {{ localGovernment?.name }} <app-no-data [showRequired]="showErrors" *ngIf="!localGovernment"></app-no-data> <app-warning-banner *ngIf="showErrors && localGovernment && !localGovernment.hasGuid" class="full-row error"> - This Local/First Nation Government has not yet been set up with the ALC Portal to receive notice of intents. To - submit, you will need to 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> + This local/First Nation government is not set up with the ALC Portal to receive submissions. You can continue to + fill out the form but you will be unable to submit. Please contact the ALC directly as soon as possible: +  <a href="mailto:ALC.Portal@gov.bc.ca">ALC.Portal@gov.bc.ca</a> / <a href="tel:236-468-3342" + >236-468-3342</a + > </app-warning-banner> </div> <div *ngIf="showEdit" class="edit-button"> diff --git a/portal-frontend/src/app/features/notifications/edit-submission/select-government/select-government.component.html b/portal-frontend/src/app/features/notifications/edit-submission/select-government/select-government.component.html index 0f12565ff4..0fe372ae8a 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/select-government/select-government.component.html +++ b/portal-frontend/src/app/features/notifications/edit-submission/select-government/select-government.component.html @@ -41,8 +41,10 @@ <h2>Government</h2> </div> </form> <app-warning-banner *ngIf="showWarning" class="full-row"> - This Local/First Nation Government has not yet been set up with the ALC Portal to receive applications. To submit, you - will need to contact the ALC directly:  <a href="mailto:ALC.Portal@gov.bc.ca">ALC.Portal@gov.bc.ca</a + This local/First Nation government is not set up with the ALC Portal to receive submissions. You can continue to fill + out the form but you will be unable to submit. Please contact the ALC directly as soon as possible:  <a + href="mailto:ALC.Portal@gov.bc.ca" + >ALC.Portal@gov.bc.ca</a > / <a href="tel:236-468-3342">236-468-3342</a> </app-warning-banner> <p> diff --git a/portal-frontend/src/app/features/notifications/notification-details/notification-details.component.html b/portal-frontend/src/app/features/notifications/notification-details/notification-details.component.html index 4f79cc8ae3..b081124a7d 100644 --- a/portal-frontend/src/app/features/notifications/notification-details/notification-details.component.html +++ b/portal-frontend/src/app/features/notifications/notification-details/notification-details.component.html @@ -23,7 +23,7 @@ <h3>2. Identify Transferee(s)</h3> <app-no-data [showRequired]="false" *ngIf="!transferee.organizationName"></app-no-data> </div> <div> - <span *ngIf="transferee.phoneNumber">{{ transferee.phoneNumber | mask : '(000) 000-0000' }}</span> + <span *ngIf="transferee.phoneNumber">{{ transferee.phoneNumber | mask: '(000) 000-0000' }}</span> </div> <div>{{ transferee.email }}</div> </ng-container> @@ -91,10 +91,11 @@ <h3>4. Government</h3> {{ localGovernment?.name }} <app-no-data [showRequired]="showErrors" *ngIf="!localGovernment"></app-no-data> <app-warning-banner *ngIf="showErrors && localGovernment && !localGovernment.hasGuid" class="full-row error"> - This Local/First Nation Government has not yet been set up with the ALC Portal to receive notice of intents. To - submit, you will need to 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> + This local/First Nation government is not set up with the ALC Portal to receive submissions. You can continue to + fill out the form but you will be unable to submit. Please contact the ALC directly as soon as possible: +  <a href="mailto:ALC.Portal@gov.bc.ca">ALC.Portal@gov.bc.ca</a> / <a href="tel:236-468-3342" + >236-468-3342</a + > </app-warning-banner> </div> <div *ngIf="showEdit" class="edit-button"> From e6b298002938f46fe0058dc4af1d7120159a3c3e Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Fri, 1 Dec 2023 16:11:18 -0800 Subject: [PATCH 716/954] Create / Change Dialog Improvements * Update App Change Type sorting to match create * Add cursor effect when hovering labels (can be clicked) * Update HTML descriptions for main types --- ...nge-application-type-dialog.component.html | 2 +- ...hange-application-type-dialog.component.ts | 4 ++-- .../create-submission-dialog.component.html | 14 +++++------ .../create-submission-dialog.component.scss | 4 ++++ .../change-noi-type-dialog.component.html | 2 +- ...701473272368-update_portal_descriptions.ts | 24 +++++++++++++++++++ 6 files changed, 39 insertions(+), 11 deletions(-) create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1701473272368-update_portal_descriptions.ts diff --git a/portal-frontend/src/app/features/applications/edit-submission/change-application-type-dialog/change-application-type-dialog.component.html b/portal-frontend/src/app/features/applications/edit-submission/change-application-type-dialog/change-application-type-dialog.component.html index f15c960c87..938a7b1cec 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/change-application-type-dialog/change-application-type-dialog.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/change-application-type-dialog/change-application-type-dialog.component.html @@ -14,7 +14,7 @@ <h4>Change Application Type</h4> </div> <div [ngClass]="{ 'display-none': stepIdx !== applicationTypeStep }"> - <div class="step-description">Select an option to learn more about the application type.</div> + <div class="subheading2 step-description">Select an option to learn more about the application type.</div> <mat-radio-group class="app-type-radio-group" (change)="onAppTypeSelected($event)" color="primary" required> <mat-radio-button *ngFor="let appType of applicationTypes" [value]="appType.code" class="radio-option"> {{ appType.portalLabel }} diff --git a/portal-frontend/src/app/features/applications/edit-submission/change-application-type-dialog/change-application-type-dialog.component.ts b/portal-frontend/src/app/features/applications/edit-submission/change-application-type-dialog/change-application-type-dialog.component.ts index 88577ac71f..52b4197e98 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/change-application-type-dialog/change-application-type-dialog.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/change-application-type-dialog/change-application-type-dialog.component.ts @@ -40,7 +40,7 @@ export class ChangeApplicationTypeDialogComponent implements OnInit, AfterViewCh private dialogRef: MatDialogRef<ChangeApplicationTypeDialogComponent>, private applicationSubmissionService: ApplicationSubmissionService, private codeService: CodeService, - @Inject(MAT_DIALOG_DATA) public data: ChangeApplicationTypeDialogComponent + @Inject(MAT_DIALOG_DATA) public data: ChangeApplicationTypeDialogComponent, ) { this.submissionUuid = data.submissionUuid; this.submissionTypeCode = data.submissionTypeCode; @@ -59,7 +59,7 @@ export class ChangeApplicationTypeDialogComponent implements OnInit, AfterViewCh const codes = await this.codeService.loadCodes(); this.applicationTypes = codes.applicationTypes .filter((type) => !!type.portalLabel) - .sort((a, b) => (a.portalLabel > b.portalLabel ? 1 : -1)); + .sort((a, b) => a.portalOrder - b.portalOrder); } async closeDialog(dialogResult: boolean = false) { diff --git a/portal-frontend/src/app/features/create-submission-dialog/create-submission-dialog.component.html b/portal-frontend/src/app/features/create-submission-dialog/create-submission-dialog.component.html index 0581e52eac..b9275c72b1 100644 --- a/portal-frontend/src/app/features/create-submission-dialog/create-submission-dialog.component.html +++ b/portal-frontend/src/app/features/create-submission-dialog/create-submission-dialog.component.html @@ -8,7 +8,7 @@ <h4 *ngIf="currentStep === steps.prescribedBody"> <div mat-dialog-content class="steps" [ngClass]="{ 'app-type-dialog': currentStep === steps.applicationType }"> <ng-container *ngIf="currentStep === steps.submissionType"> - <div class="step-description">Select an option to learn more about the submission type.</div> + <div class="subheading2 step-description">Select an option to learn more about the submission type.</div> <div class="step-submission-type"> <mat-radio-group [value]="selectedSubmissionType?.code" @@ -25,7 +25,7 @@ <h4 *ngIf="currentStep === steps.prescribedBody"> </mat-radio-button> </mat-radio-group> </div> - <div id="warningBanner" class="warning-banner" *ngIf="selectedSubmissionType"> + <div class="warning-banner" *ngIf="selectedSubmissionType"> <div> <b class="sub-type-label">{{ selectedSubmissionType.label }}</b> <div @@ -44,7 +44,7 @@ <h4 *ngIf="currentStep === steps.prescribedBody"> > </ng-container> <ng-container *ngIf="currentStep === steps.applicationType"> - <div class="step-description">Select an option to learn more about the application type.</div> + <div class="subheading2 step-description">Select an option to learn more about the application type.</div> <div class="step-application-type"> <mat-radio-group [value]="selectedAppType?.code" @@ -59,7 +59,7 @@ <h4 *ngIf="currentStep === steps.prescribedBody"> </mat-radio-group> </div> - <div id="warningBanner" class="warning-banner" *ngIf="selectedAppType"> + <div class="warning-banner" *ngIf="selectedAppType"> <div> <b class="app-type-label radio-option">{{ selectedAppType.portalLabel }}</b> </div> @@ -74,7 +74,7 @@ <h4 *ngIf="currentStep === steps.prescribedBody"> </div> </ng-container> <ng-container *ngIf="currentStep === steps.noticeOfIntentType"> - <div class="step-description">Select an option to learn more about the notice of intent type.</div> + <div class="subheading2 step-description">Select an option to learn more about the notice of intent type.</div> <div class="step-noi-type"> <mat-radio-group class="app-type-radio-group" (change)="onNoiTypeSelected($event)" color="primary" required> <mat-radio-button *ngFor="let type of noticeOfIntentTypes" class="radio-option" [value]="type.code"> @@ -83,7 +83,7 @@ <h4 *ngIf="currentStep === steps.prescribedBody"> </mat-radio-group> </div> - <div id="warningBanner" class="warning-banner" *ngIf="selectedNoiType"> + <div class="warning-banner" *ngIf="selectedNoiType"> <div> <b class="app-type-label radio-option">{{ selectedNoiType.portalLabel }}</b> </div> @@ -109,7 +109,7 @@ <h4 *ngIf="currentStep === steps.prescribedBody"> >s. 218 of the Land Title Act.</a > </div> - <div id="warningBanner" class="warning-banner"> + <div class="warning-banner"> <div> <b class="app-type-label radio-option">Before you create a notification of SRW:</b> </div> diff --git a/portal-frontend/src/app/features/create-submission-dialog/create-submission-dialog.component.scss b/portal-frontend/src/app/features/create-submission-dialog/create-submission-dialog.component.scss index 0c33e790ba..5eefdcbdd3 100644 --- a/portal-frontend/src/app/features/create-submission-dialog/create-submission-dialog.component.scss +++ b/portal-frontend/src/app/features/create-submission-dialog/create-submission-dialog.component.scss @@ -13,6 +13,10 @@ .radio-option { display: block !important; + + & .mdc-label { + cursor: pointer !important; + } } .dialog-content-wrapper { diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/change-noi-type-dialog/change-noi-type-dialog.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/change-noi-type-dialog/change-noi-type-dialog.component.html index 60592892dc..c928bd0fcc 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/change-noi-type-dialog/change-noi-type-dialog.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/change-noi-type-dialog/change-noi-type-dialog.component.html @@ -14,7 +14,7 @@ <h4>Change NOI Type</h4> </div> <div [ngClass]="{ 'display-none': stepIdx !== applicationTypeStep }"> - <div class="step-description">Select an option to learn more about the notice of intent type.</div> + <div class="subheading2 step-description">Select an option to learn more about the notice of intent type.</div> <mat-radio-group class="app-type-radio-group" (change)="onTypeSelected($event)" color="primary" required> <mat-radio-button *ngFor="let appType of noiTypes" [value]="appType.code" class="radio-option"> {{ appType.portalLabel }} diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1701473272368-update_portal_descriptions.ts b/services/apps/alcs/src/providers/typeorm/migrations/1701473272368-update_portal_descriptions.ts new file mode 100644 index 0000000000..b78e9bc182 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1701473272368-update_portal_descriptions.ts @@ -0,0 +1,24 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class UpdatePortalDescriptions1701473272368 + implements MigrationInterface +{ + public async up(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query(` + UPDATE "alcs"."card_type" SET "portal_html_description" = + 'Choose this option if you are proposing to exclude, include, subdivide, conduct a non-farm use activity, conduct a residential use, conduct a transportation/utility use, conduct a soil or fill use, or register a restrictive covenant. Please visit the <a href="https://www.alc.gov.bc.ca/application-and-notice-process/applications/" target="_blank">Application</a> and <a href="https://www.alc.gov.bc.ca/application-and-notice-process/applications/fees-and-payment/" target="_blank">Fees and Payment sections of the ALC website for more information.' WHERE "code" = 'APP'; + `); + await queryRunner.query(` + UPDATE "alcs"."card_type" SET "portal_html_description" = + 'Choose this option if you are proposing to remove soil and/or place fill that does not qualify for exemption under <a href="https://www.bclaws.gov.bc.ca/civix/document/id/complete/statreg/30_2019#section35" target="_blank">Section 35 of the Agricultural Land Reserve Use Regulation</a>. All Notices of Intent are subject to a $150 fee. Please visit the <a href="https://www.alc.gov.bc.ca/application-and-notice-process/soil-and-fill-notice-of-intent/" target="_blank">Notice of Intent</a> section of the ALC website for more information.' WHERE "code" = 'NOI'; + `); + await queryRunner.query(` + UPDATE "alcs"."card_type" SET "portal_html_description" = + 'Choose this option if you plan to register a SRW under <a href="https://www.bclaws.gov.bc.ca/civix/document/id/complete/statreg/96250_15#section218" target="_blank">s. 218 of the Land Title Act</a> in the ALR. There is no fee associated. Please visit the <a href="https://www.alc.gov.bc.ca/application-and-notice-process/statutory-right-of-way-notice/" target="_blank">Notification of Statutory Right of Way</a> section of the ALC website for more information.' WHERE "code" = 'NOTI'; + `); + } + + public async down(): Promise<void> { + //No + } +} From 8a3ea3456b81a4876115d673fa98aaf81c9d0fff Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Mon, 4 Dec 2023 09:15:37 -0800 Subject: [PATCH 717/954] owner deleting fix --- .../parcel-entry/parcel-entry.component.html | 1 + .../parcels/parcel-entry/parcel-entry.component.html | 1 + .../parcel-owners/parcel-owners.component.ts | 11 ++++++++--- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html index eee65ba4e5..68c839c55d 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html @@ -214,6 +214,7 @@ <h6>Parcel Owners</h6> [owners]="parcel.owners" (onOwnersUpdated)="onOwnersUpdated.emit()" (onOwnerRemoved)="onOwnerRemoved($event)" + (onOwnersDeleted)="onOwnerRemoved($event)" [documentService]="applicationDocumentService" [ownerService]="applicationOwnerService" [disabled]="_disabled" diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.html index 9bc5c05237..4cd0e605b1 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.html @@ -349,6 +349,7 @@ <h6 class="owner-search-option">OR</h6> [owners]="parcel.owners" (onOwnersUpdated)="onOwnersUpdated.emit()" (onOwnerRemoved)="onOwnerRemoved($event)" + (onOwnersDeleted)="onOwnerRemoved($event)" [disabled]="_disabled" [isCrown]="true" [ownerService]="noticeOfIntentOwnerService" diff --git a/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.ts b/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.ts index df4f04b8bc..8600ad5352 100644 --- a/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.ts +++ b/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.ts @@ -20,6 +20,7 @@ import { OwnerDialogComponent } from '../owner-dialog/owner-dialog.component'; }) export class ParcelOwnersComponent { @Output() onOwnersUpdated = new EventEmitter<void>(); + @Output() onOwnersDeleted = new EventEmitter<string>(); @Output() onOwnerRemoved = new EventEmitter<string>(); PARCEL_OWNERSHIP_TYPES = PARCEL_OWNERSHIP_TYPE; @@ -92,13 +93,17 @@ export class ParcelOwnersComponent { }); } dialog.beforeClosed().subscribe((updatedUuid) => { - if (updatedUuid) { + if (updatedUuid?.ownerDeleted) { + this.onOwnersDeleted.emit(updatedUuid.deletedOwnerId); + } + else if (updatedUuid) { this.onOwnersUpdated.emit(); } }); dialog.afterClosed().subscribe((result) => { if (result.ownerDeleted) { - this.dataSource.data = this.dataSource.data.filter((owner: ApplicationOwnerDto | NoticeOfIntentOwnerDto) => owner.uuid !== result.deletedOwnerId); + const updatedOwners = this.dataSource.data.filter((o: ApplicationOwnerDto | NoticeOfIntentOwnerDto) => o.uuid !== result.deletedOwnerId); + this.dataSource = new MatTableDataSource(updatedOwners); } }); } @@ -122,7 +127,7 @@ export class ParcelOwnersComponent { .subscribe(async (didConfirm) => { if (didConfirm) { await this.ownerService.delete(owner.uuid); - this.onOwnersUpdated.emit(); + this.onOwnersDeleted.emit(owner.uuid); } }); } From 571d22e0f7718139219a88276231581941ac555c Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Mon, 4 Dec 2023 10:48:07 -0800 Subject: [PATCH 718/954] items per page fix --- .../application-search-table.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/portal-frontend/src/app/features/public/search/application-search-table/application-search-table.component.ts b/portal-frontend/src/app/features/public/search/application-search-table/application-search-table.component.ts index 8a1f1cbd38..b96e5c5a26 100644 --- a/portal-frontend/src/app/features/public/search/application-search-table/application-search-table.component.ts +++ b/portal-frontend/src/app/features/public/search/application-search-table/application-search-table.component.ts @@ -41,7 +41,7 @@ export class ApplicationSearchTableComponent implements OnDestroy { displayedColumns = displayedColumns; dataSource = new MatTableDataSource<SearchResult>(); - itemsPerPage = 1; + itemsPerPage = 20; total = 0; sortDirection = 'DESC'; sortField = 'lastUpdate'; From 341e8ac2dc3742e35843f5a24616f60318ffb7c8 Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Mon, 4 Dec 2023 11:06:45 -0800 Subject: [PATCH 719/954] Select L/FNG review tab if refused by L/FNG --- .../view-submission/view-application-submission.component.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.ts b/portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.ts index 6e77111eb5..83a64af5ef 100644 --- a/portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.ts +++ b/portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.ts @@ -54,6 +54,8 @@ export class ViewApplicationSubmissionComponent implements OnInit, OnDestroy { if (this.application?.status.code === SUBMISSION_STATUS.ALC_DECISION) { this.selectedIndex = 2; + } else if (this.application?.status.code === SUBMISSION_STATUS.REFUSED_TO_FORWARD_LG) { + this.selectedIndex = 1; } this.loadApplicationDocuments(fileId); } From cbf9e9f42f6f0945949c1c9bcb8afefc1fe79c96 Mon Sep 17 00:00:00 2001 From: Liam Stoddard <lstodd@protonmail.com> Date: Mon, 4 Dec 2023 11:08:09 -0800 Subject: [PATCH 720/954] adding app owners --- .../applications/migrate_application.py | 6 +- .../applications/submissions/__init__.py | 6 +- .../migrate_application_parcels.py | 9 +- .../submissions/parcels/__init__.py | 1 + .../submissions/parcels/owners/__init__.py | 5 + .../parcels/owners/application_owners.py | 153 ++++++++++++++++++ .../owners/application_parcel_owners.py | 131 +++++++++++++++ .../sql/parcels/owners/application_owner.sql | 22 +++ .../owners/application_owner_count.sql | 7 + ...application_owner_reused_person_org_id.sql | 42 +++++ .../application_parcel_owner_linking.sql | 12 ++ ...application_parcel_owner_linking_count.sql | 8 + ...086656-add_oats_person_id_to_app_owners.ts | 23 +++ 13 files changed, 421 insertions(+), 4 deletions(-) create mode 100644 bin/migrate-oats-data/applications/submissions/parcels/owners/__init__.py create mode 100644 bin/migrate-oats-data/applications/submissions/parcels/owners/application_owners.py create mode 100644 bin/migrate-oats-data/applications/submissions/parcels/owners/application_parcel_owners.py create mode 100644 bin/migrate-oats-data/applications/submissions/sql/parcels/owners/application_owner.sql create mode 100644 bin/migrate-oats-data/applications/submissions/sql/parcels/owners/application_owner_count.sql create mode 100644 bin/migrate-oats-data/applications/submissions/sql/parcels/owners/application_owner_reused_person_org_id.sql create mode 100644 bin/migrate-oats-data/applications/submissions/sql/parcels/owners/application_parcel_owner_linking.sql create mode 100644 bin/migrate-oats-data/applications/submissions/sql/parcels/owners/application_parcel_owner_linking_count.sql create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1701716086656-add_oats_person_id_to_app_owners.ts diff --git a/bin/migrate-oats-data/applications/migrate_application.py b/bin/migrate-oats-data/applications/migrate_application.py index 6215482d5d..29aabeba02 100644 --- a/bin/migrate-oats-data/applications/migrate_application.py +++ b/bin/migrate-oats-data/applications/migrate_application.py @@ -4,6 +4,8 @@ process_alcs_app_submissions, clean_parcels, process_application_parcels, + clean_owners, + clean_parcel_owners, ) from .base_applications import process_applications, clean_applications from .app_prep import process_alcs_application_prep_fields @@ -25,7 +27,7 @@ def process_application_etl(batch_size): def clean_alcs_applications(): clean_application_submission_status_emails() - clean_parcels() + clean_application_parcels() clean_app_submissions() clean_applications() @@ -35,4 +37,6 @@ def init_applications(batch_size): def clean_application_parcels(): + clean_parcel_owners() + clean_owners() clean_parcels() diff --git a/bin/migrate-oats-data/applications/submissions/__init__.py b/bin/migrate-oats-data/applications/submissions/__init__.py index 84e2e834f5..bf5f204a5b 100644 --- a/bin/migrate-oats-data/applications/submissions/__init__.py +++ b/bin/migrate-oats-data/applications/submissions/__init__.py @@ -3,5 +3,7 @@ process_application_statuses, clean_app_submissions, ) -from .parcels import clean_parcels -from .migrate_application_parcels import process_application_parcels +from .parcels import clean_parcels, clean_parcel_owners, clean_owners +from .migrate_application_parcels import ( + process_application_parcels, +) diff --git a/bin/migrate-oats-data/applications/submissions/migrate_application_parcels.py b/bin/migrate-oats-data/applications/submissions/migrate_application_parcels.py index 28b3cc10a5..a5b5f02341 100644 --- a/bin/migrate-oats-data/applications/submissions/migrate_application_parcels.py +++ b/bin/migrate-oats-data/applications/submissions/migrate_application_parcels.py @@ -1,6 +1,13 @@ -from .parcels import init_application_parcels, process_application_certificate_of_title +from .parcels import ( + init_application_parcels, + process_application_certificate_of_title, + init_application_parcel_owners, + link_application_owners_to_parcels, +) def process_application_parcels(batch_size): init_application_parcels(batch_size) process_application_certificate_of_title(batch_size) + init_application_parcel_owners(batch_size) + link_application_owners_to_parcels(batch_size) diff --git a/bin/migrate-oats-data/applications/submissions/parcels/__init__.py b/bin/migrate-oats-data/applications/submissions/parcels/__init__.py index f62cc3cb63..aba1f2a4a7 100644 --- a/bin/migrate-oats-data/applications/submissions/parcels/__init__.py +++ b/bin/migrate-oats-data/applications/submissions/parcels/__init__.py @@ -1,2 +1,3 @@ from .application_certificate_of_title import process_application_certificate_of_title from .application_parcel_insert import init_application_parcels, clean_parcels +from .owners import * diff --git a/bin/migrate-oats-data/applications/submissions/parcels/owners/__init__.py b/bin/migrate-oats-data/applications/submissions/parcels/owners/__init__.py new file mode 100644 index 0000000000..5f12dd8c67 --- /dev/null +++ b/bin/migrate-oats-data/applications/submissions/parcels/owners/__init__.py @@ -0,0 +1,5 @@ +from .application_owners import init_application_parcel_owners, clean_owners +from .application_parcel_owners import ( + clean_parcel_owners, + link_application_owners_to_parcels, +) diff --git a/bin/migrate-oats-data/applications/submissions/parcels/owners/application_owners.py b/bin/migrate-oats-data/applications/submissions/parcels/owners/application_owners.py new file mode 100644 index 0000000000..91560665b7 --- /dev/null +++ b/bin/migrate-oats-data/applications/submissions/parcels/owners/application_owners.py @@ -0,0 +1,153 @@ +from common import ( + setup_and_get_logger, + BATCH_UPLOAD_SIZE, + OATS_ETL_USER, + ALCSOwnershipType, + ALCSOwnerType, +) +from db import inject_conn_pool +from psycopg2.extras import RealDictCursor + +etl_name = "process_application_parcel_owners" +logger = setup_and_get_logger(etl_name) + + +@inject_conn_pool +def init_application_parcel_owners(conn=None, batch_size=BATCH_UPLOAD_SIZE): + logger.info(f"Start {etl_name}") + with conn.cursor(cursor_factory=RealDictCursor) as cursor: + with open( + "applications/submissions/sql/parcels/owners/application_owner_count.sql", + "r", + encoding="utf-8", + ) as sql_file: + count_query = sql_file.read() + cursor.execute(count_query) + count_total = dict(cursor.fetchone())["count"] + logger.info(f"Total applications data to insert: {count_total}") + + failed_inserts = 0 + successful_updates_count = 0 + last_subject_property = 0 + last_person_organization_id = 0 + + with open( + "applications/submissions/sql/parcels/owners/application_owner.sql", + "r", + encoding="utf-8", + ) as sql_file: + application_sql = sql_file.read() + while True: + cursor.execute( + f"{application_sql} WHERE osp.subject_property_id > {last_subject_property} AND opo.person_organization_id > {last_person_organization_id} ORDER BY osp.subject_property_id, opo.person_organization_id;" + ) + + rows = cursor.fetchmany(batch_size) + + if not rows: + break + try: + records_to_be_inserted_count = len(rows) + + _insert_records(conn, cursor, rows) + + successful_updates_count = ( + successful_updates_count + records_to_be_inserted_count + ) + + last_record = dict(rows[-1]) + last_subject_property = last_record["subject_property_id"] + last_person_organization_id = last_record["person_organization_id"] + + logger.debug( + f"retrieved/updated items count: {records_to_be_inserted_count}; total successfully insert applications owners so far {successful_updates_count}; last updated {last_subject_property} {last_person_organization_id}" + ) + except Exception as err: + logger.exception(err) + conn.rollback() + failed_inserts = count_total - successful_updates_count + last_person_organization_id = last_person_organization_id + 1 + + logger.info( + f"Finished {etl_name}: total amount of successful inserts {successful_updates_count}, total failed inserts {failed_inserts}" + ) + + +def _insert_records(conn, cursor, rows): + number_of_rows_to_insert = len(rows) + + if number_of_rows_to_insert > 0: + insert_query = _compile_owner_insert_query(number_of_rows_to_insert) + rows_to_insert = _prepare_data_to_insert(rows) + cursor.execute(insert_query, rows_to_insert) + conn.commit() + + +def _compile_owner_insert_query(number_of_rows_to_insert): + owners_to_insert = ",".join(["%s"] * number_of_rows_to_insert) + return f""" + INSERT INTO alcs.application_owner( + first_name, + last_name, + organization_name, + application_submission_uuid, + email, + phone_number, + type_code, + oats_person_organization_id, + audit_created_by + ) + VALUES{owners_to_insert} + ON CONFLICT DO NOTHING; + """ + + +def _prepare_data_to_insert(rows): + row_without_last_element = [] + for row in rows: + mapped_row = _map_data(row) + row_without_last_element.append(tuple(mapped_row.values())) + + return row_without_last_element + + +def _map_data(row): + return { + "first_name": _get_name(row), + "last_name": row["last_name"], + "organization_name": row["organization_name"], + "application_submission_uuid": row["application_submission_uuid"], + "email": row["email_address"], + "phone_number": row.get("phone_number", "cell_phone_number"), + "type_code": _map_owner_type(row), + "oats_person_organization_id": row["person_organization_id"], + "audit_created_by": OATS_ETL_USER, + } + + +def _get_name(row): + first_name = row.get("first_name", "") + middle_name = row.get("middle_name", "") + return f"{first_name} {middle_name}".strip() + + +def _map_owner_type(owner_record): + if owner_record["ownership_type_code"] == ALCSOwnershipType.FeeSimple.value: + if owner_record["person_id"] and not owner_record["organization_id"]: + return ALCSOwnerType.INDV.value + elif owner_record["organization_id"]: + return ALCSOwnerType.ORGZ.value + elif owner_record["ownership_type_code"] == ALCSOwnershipType.Crown.value: + return ALCSOwnerType.CRWN.value + + +@inject_conn_pool +def clean_owners(conn=None): + logger.info("Start application owner cleaning") + with conn.cursor() as cursor: + cursor.execute( + f"DELETE FROM alcs.application_owner appo WHERE appo.audit_created_by = '{OATS_ETL_USER}'" + ) + logger.info(f"Deleted items count = {cursor.rowcount}") + conn.commit() + logger.info("Done application owner cleaning") diff --git a/bin/migrate-oats-data/applications/submissions/parcels/owners/application_parcel_owners.py b/bin/migrate-oats-data/applications/submissions/parcels/owners/application_parcel_owners.py new file mode 100644 index 0000000000..d73afaffd9 --- /dev/null +++ b/bin/migrate-oats-data/applications/submissions/parcels/owners/application_parcel_owners.py @@ -0,0 +1,131 @@ +from common import ( + setup_and_get_logger, + BATCH_UPLOAD_SIZE, + OATS_ETL_USER, +) +from db import inject_conn_pool +from psycopg2.extras import RealDictCursor + +etl_name = "link_application_owners_to_parcels" +logger = setup_and_get_logger(etl_name) + + +@inject_conn_pool +def link_application_owners_to_parcels(conn=None, batch_size=BATCH_UPLOAD_SIZE): + logger.info(f"Start {etl_name}") + with conn.cursor(cursor_factory=RealDictCursor) as cursor: + with open( + "applications/submissions/sql/parcels/owners/application_parcel_owner_linking_count.sql", + "r", + encoding="utf-8", + ) as sql_file: + count_query = sql_file.read() + cursor.execute(count_query) + count_total = dict(cursor.fetchone())["count"] + logger.info(f"Total applications data to insert: {count_total}") + + failed_inserts = 0 + successful_inserts_count = 0 + last_parcel_uuid = "00000000-0000-0000-0000-000000000000" + last_owner_uuid = "00000000-0000-0000-0000-000000000000" + + with open( + "applications/submissions/sql/parcels/owners/application_parcel_owner_linking.sql", + "r", + encoding="utf-8", + ) as sql_file: + application_sql = sql_file.read() + while True: + cursor.execute( + f"{application_sql} AND appp.\"uuid\" > '{last_parcel_uuid}' AND appo.\"uuid\" > '{last_owner_uuid}' ORDER BY parcel_uuid, owner_uuid;" + ) + + rows = cursor.fetchmany(batch_size) + + if not rows: + break + try: + records_to_be_inserted_count = len(rows) + + _insert_records(conn, cursor, rows) + + successful_inserts_count = ( + successful_inserts_count + records_to_be_inserted_count + ) + + last_record = dict(rows[-1]) + last_parcel_uuid = last_record["parcel_uuid"] + last_owner_uuid = last_record["owner_uuid"] + + logger.debug( + f"retrieved/updated items count: {records_to_be_inserted_count}; total successfully inserted applications parcel_owners so far {successful_inserts_count}; last inserted {last_parcel_uuid} {last_owner_uuid}" + ) + except Exception as err: + logger.exception(err) + conn.rollback() + failed_inserts = count_total - successful_inserts_count + last_owner_uuid = last_owner_uuid + 1 + + logger.info( + f"Finished {etl_name}: total amount of successful inserts {successful_inserts_count}, total failed inserts {failed_inserts}" + ) + + +def _insert_records(conn, cursor, rows): + number_of_rows_to_insert = len(rows) + + if number_of_rows_to_insert > 0: + insert_query = _compile_parcel_owner_insert_query(number_of_rows_to_insert) + rows_to_insert = _prepare_data_to_insert(rows) + cursor.execute(insert_query, rows_to_insert) + conn.commit() + + +def _compile_parcel_owner_insert_query(number_of_rows_to_insert): + owners_to_insert = ",".join(["%s"] * number_of_rows_to_insert) + return f""" + INSERT INTO alcs.application_parcel_owners_application_owner(application_parcel_uuid, application_owner_uuid) + VALUES{owners_to_insert} + ON CONFLICT DO NOTHING; + """ + + +def _prepare_data_to_insert(rows): + row_without_last_element = [] + for row in rows: + mapped_row = _map_data(row) + row_without_last_element.append(tuple(mapped_row.values())) + + return row_without_last_element + + +def _map_data(row): + return { + "application_parcel_uuid": row["parcel_uuid"], + "application_owner_uuid": row["owner_uuid"], + } + + +@inject_conn_pool +def clean_parcel_owners(conn=None): + logger.info("Start application parcel to owner cleaning") + with conn.cursor() as cursor: + cursor.execute( + f""" + DELETE FROM alcs.application_parcel_owners_application_owner AS apppo + USING alcs.application_parcel appp + WHERE appp."uuid" = apppo.application_parcel_uuid AND appp.audit_created_by = '{OATS_ETL_USER}';""" + ) + conn.commit() + deleted_items_total = cursor.rowcount + cursor.execute( + f""" + DELETE FROM alcs.application_parcel_owners_application_owner AS apppo + USING alcs.application_owner appo + WHERE appo."uuid" = apppo.application_parcel_uuid AND appo.audit_created_by = '{OATS_ETL_USER}';""" + ) + conn.commit() + deleted_items_total += cursor.rowcount + logger.info(f"Deleted items count = {deleted_items_total}") + + logger.info("Done application owner cleaning") diff --git a/bin/migrate-oats-data/applications/submissions/sql/parcels/owners/application_owner.sql b/bin/migrate-oats-data/applications/submissions/sql/parcels/owners/application_owner.sql new file mode 100644 index 0000000000..d11b653b32 --- /dev/null +++ b/bin/migrate-oats-data/applications/submissions/sql/parcels/owners/application_owner.sql @@ -0,0 +1,22 @@ +-- retrieve owners per parcel +SELECT osp.subject_property_id, + opo.person_organization_id, + op.person_id, + op.first_name, + op.last_name, + op.middle_name, + oo.organization_id, + oo.organization_name, + opo.phone_number, + opo.cell_phone_number, + opo.email_address, + noip.ownership_type_code, + opi.prin_type, + opi.active_ind, + noip.notice_of_intent_submission_uuid +FROM oats.OATS_PROPERTY_INTERESTS opi + JOIN oats.OATS_SUBJECT_PROPERTIES osp ON osp.SUBJECT_PROPERTY_ID = opi.SUBJECT_PROPERTY_ID + JOIN alcs.notice_of_intent_parcel noip ON noip.oats_subject_property_id = osp.subject_property_id -- ensure GET records only for parcels imported into ALCS + JOIN oats.OATS_PERSON_ORGANIZATIONS opo ON opo.PERSON_ORGANIZATION_ID = opi.PERSON_ORGANIZATION_ID + LEFT JOIN oats.OATS_PERSONS op ON op.PERSON_ID = opo.PERSON_ID + LEFT JOIN oats.oats_organizations oo ON oo.organization_id = opo.organization_id \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/submissions/sql/parcels/owners/application_owner_count.sql b/bin/migrate-oats-data/applications/submissions/sql/parcels/owners/application_owner_count.sql new file mode 100644 index 0000000000..75e28f566c --- /dev/null +++ b/bin/migrate-oats-data/applications/submissions/sql/parcels/owners/application_owner_count.sql @@ -0,0 +1,7 @@ +SELECT count(*) +FROM oats.OATS_PROPERTY_INTERESTS opi + JOIN oats.OATS_SUBJECT_PROPERTIES osp ON osp.SUBJECT_PROPERTY_ID = opi.SUBJECT_PROPERTY_ID + JOIN alcs.notice_of_intent_parcel noip ON noip.oats_subject_property_id = osp.subject_property_id -- ensure GET records only for parcels imported into ALCS + JOIN oats.OATS_PERSON_ORGANIZATIONS opo ON opo.PERSON_ORGANIZATION_ID = opi.PERSON_ORGANIZATION_ID + LEFT JOIN oats.OATS_PERSONS op ON op.PERSON_ID = opo.PERSON_ID + LEFT JOIN oats.oats_organizations oo ON oo.organization_id = opo.organization_id; \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/submissions/sql/parcels/owners/application_owner_reused_person_org_id.sql b/bin/migrate-oats-data/applications/submissions/sql/parcels/owners/application_owner_reused_person_org_id.sql new file mode 100644 index 0000000000..28b20bdf38 --- /dev/null +++ b/bin/migrate-oats-data/applications/submissions/sql/parcels/owners/application_owner_reused_person_org_id.sql @@ -0,0 +1,42 @@ +-- finds and returns person_organization_ids reused in alr_applications of class app +WITH oats_joined_with_alcs_owners_with_parcels AS ( + SELECT noip.oats_subject_property_id, + opo.person_organization_id + FROM oats.OATS_SUBJECT_PROPERTIES osp + LEFT JOIN oats.OATS_PROPERTY_INTERESTS opi ON osp.SUBJECT_PROPERTY_ID = opi.SUBJECT_PROPERTY_ID + JOIN alcs.application_parcel appp ON appp.oats_subject_property_id = osp.subject_property_id + LEFT JOIN oats.OATS_PERSON_ORGANIZATIONS opo ON opo.PERSON_ORGANIZATION_ID = opi.PERSON_ORGANIZATION_ID + WHERE opi.person_organization_id IS NOT NULL + AND opo.person_organization_id IS NOT NULL + GROUP BY appp.oats_subject_property_id, + opo.person_organization_id + ORDER BY oats_subject_property_id, + person_organization_id +), +person_organization_ids_with_count AS ( + SELECT count(*), + oatsp.person_organization_id + FROM oats_joined_with_alcs_owners_with_parcels oatsp + LEFT JOIN alcs.application_owner appo ON appo.oats_person_organization_id = oatsp.person_organization_id + GROUP BY oatsp.person_organization_id + HAVING count(*) > 1 + ORDER BY count(*) DESC +), +oats_owners_with_parcels AS ( + SELECT opo.person_organization_id + FROM oats.OATS_SUBJECT_PROPERTIES osp + LEFT JOIN oats.OATS_PROPERTY_INTERESTS opi ON osp.SUBJECT_PROPERTY_ID = opi.SUBJECT_PROPERTY_ID + LEFT JOIN oats.OATS_PERSON_ORGANIZATIONS opo ON opo.PERSON_ORGANIZATION_ID = opi.PERSON_ORGANIZATION_ID + WHERE opi.person_organization_id IS NOT NULL + AND opo.person_organization_id IS NOT NULL + GROUP BY opo.person_organization_id + ORDER BY person_organization_id +) +SELECT count(*), + oatsp.person_organization_id +FROM oats_owners_with_parcels oatsp + LEFT JOIN alcs.application_owner appo ON appo.oats_person_organization_id = oatsp.person_organization_id + JOIN person_organization_ids_with_count poidc ON poidc.person_organization_id = oatsp.person_organization_id +GROUP BY oatsp.person_organization_id +HAVING power(count(*), 2) != max(poidc."count") -- this will provide all person_organization_ids reused for multiple alr_application_ids of class app. max will not affect anything since it is only 1 record per person_organization_id +ORDER BY count(*) DESC; \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/submissions/sql/parcels/owners/application_parcel_owner_linking.sql b/bin/migrate-oats-data/applications/submissions/sql/parcels/owners/application_parcel_owner_linking.sql new file mode 100644 index 0000000000..ccd216f790 --- /dev/null +++ b/bin/migrate-oats-data/applications/submissions/sql/parcels/owners/application_parcel_owner_linking.sql @@ -0,0 +1,12 @@ +SELECT apps.file_number, + appp."uuid" AS parcel_uuid, + appp.oats_subject_property_id, + appo."uuid" AS owner_uuid, + appo.oats_person_organization_id +FROM oats.OATS_PROPERTY_INTERESTS opi + JOIN oats.OATS_SUBJECT_PROPERTIES osp ON osp.SUBJECT_PROPERTY_ID = opi.SUBJECT_PROPERTY_ID + JOIN alcs.application_parcel appp ON appp.oats_subject_property_id = osp.subject_property_id + JOIN alcs.application_owner appo ON appo.oats_person_organization_id = opi.PERSON_ORGANIZATION_ID + LEFT JOIN alcs.application_submission apps ON apps."uuid" = appp.application_submission_uuid +WHERE appp.audit_created_by = 'oats_etl' + AND appo.audit_created_by = 'oats_etl' \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/submissions/sql/parcels/owners/application_parcel_owner_linking_count.sql b/bin/migrate-oats-data/applications/submissions/sql/parcels/owners/application_parcel_owner_linking_count.sql new file mode 100644 index 0000000000..40c4f1e55a --- /dev/null +++ b/bin/migrate-oats-data/applications/submissions/sql/parcels/owners/application_parcel_owner_linking_count.sql @@ -0,0 +1,8 @@ +SELECT count(*) +FROM oats.OATS_PROPERTY_INTERESTS opi + JOIN oats.OATS_SUBJECT_PROPERTIES osp ON osp.SUBJECT_PROPERTY_ID = opi.SUBJECT_PROPERTY_ID + JOIN alcs.application_parcel appp ON appp.oats_subject_property_id = osp.subject_property_id + JOIN alcs.application_owner appo ON appo.oats_person_organization_id = opi.PERSON_ORGANIZATION_ID + LEFT JOIN alcs.application_submission apps ON apps."uuid" = appp.application_submission_uuid +WHERE appp.audit_created_by = 'oats_etl' + AND appo.audit_created_by = 'oats_etl' \ No newline at end of file diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1701716086656-add_oats_person_id_to_app_owners.ts b/services/apps/alcs/src/providers/typeorm/migrations/1701716086656-add_oats_person_id_to_app_owners.ts new file mode 100644 index 0000000000..52044dad05 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1701716086656-add_oats_person_id_to_app_owners.ts @@ -0,0 +1,23 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class AddOatsPersonIdToAppOwners1701716086656 + implements MigrationInterface +{ + public async up(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `ALTER TABLE "alcs"."application_owner" ADD "oats_person_organization_id" bigint`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."application_owner"."oats_person_organization_id" IS 'This column is NOT related to any functionality in ALCS. It is only used for ETL and backtracking of imported data from OATS. It links oats.oats_person_organization to alcs.application_owner. Note that this id is unique only in scope of parcel.'`, + ); + } + + public async down(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."application_owner"."oats_person_organization_id" IS 'This column is NOT related to any functionality in ALCS. It is only used for ETL and backtracking of imported data from OATS. It links oats.oats_person_organization to alcs.application_owner. Note that this id is unique only in scope of parcel.'`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_owner" DROP COLUMN "oats_person_organization_id"`, + ); + } +} From 1385f9849cf9fd2368a7b5c4aacef4f085c77961 Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Mon, 4 Dec 2023 11:11:30 -0800 Subject: [PATCH 721/954] inbox search and advanced search pagination --- .../application-search-table.component.ts | 2 +- .../non-application-search-table.component.ts | 2 +- .../notice-of-intent-search-table.component.ts | 2 +- .../notification-search-table.component.ts | 2 +- alcs-frontend/src/app/features/search/search.component.html | 4 ++++ alcs-frontend/src/app/features/search/search.component.ts | 1 + .../features/home/inbox/inbox-table/inbox-table.component.ts | 2 +- .../src/app/features/home/inbox/inbox.component.html | 1 + .../src/app/features/home/inbox/inbox.component.ts | 1 + 9 files changed, 12 insertions(+), 5 deletions(-) diff --git a/alcs-frontend/src/app/features/search/application-search-table/application-search-table.component.ts b/alcs-frontend/src/app/features/search/application-search-table/application-search-table.component.ts index f3f98d0ce3..666e91d941 100644 --- a/alcs-frontend/src/app/features/search/application-search-table/application-search-table.component.ts +++ b/alcs-frontend/src/app/features/search/application-search-table/application-search-table.component.ts @@ -39,6 +39,7 @@ export class ApplicationSearchTableComponent implements OnDestroy { this._applications = applications; this.dataSource = this.mapApplications(applications); } + @Input() pageIndex: number = 0; _totalCount = 0; @Input() set totalCount(count: number) { @@ -55,7 +56,6 @@ export class ApplicationSearchTableComponent implements OnDestroy { displayedColumns = ['fileId', 'dateSubmitted', 'ownerName', 'type', 'government', 'portalStatus']; dataSource: SearchResult[] = []; - pageIndex = 0; itemsPerPage = 20; total = 0; sortDirection = 'DESC'; diff --git a/alcs-frontend/src/app/features/search/non-application-search-table/non-application-search-table.component.ts b/alcs-frontend/src/app/features/search/non-application-search-table/non-application-search-table.component.ts index fb2228b377..f6e3577fd9 100644 --- a/alcs-frontend/src/app/features/search/non-application-search-table/non-application-search-table.component.ts +++ b/alcs-frontend/src/app/features/search/non-application-search-table/non-application-search-table.component.ts @@ -46,7 +46,7 @@ export class NonApplicationSearchTableComponent implements OnDestroy { displayedColumns = ['fileId', 'type', 'applicant', 'government']; dataSource: NonApplicationSearchResultDto[] = []; - pageIndex = 0; + @Input() pageIndex: number = 0; itemsPerPage = 20; total = 0; sortDirection = 'DESC'; diff --git a/alcs-frontend/src/app/features/search/notice-of-intent-search-table/notice-of-intent-search-table.component.ts b/alcs-frontend/src/app/features/search/notice-of-intent-search-table/notice-of-intent-search-table.component.ts index 1b031a983f..6403da4d12 100644 --- a/alcs-frontend/src/app/features/search/notice-of-intent-search-table/notice-of-intent-search-table.component.ts +++ b/alcs-frontend/src/app/features/search/notice-of-intent-search-table/notice-of-intent-search-table.component.ts @@ -54,7 +54,7 @@ export class NoticeOfIntentSearchTableComponent implements OnDestroy { displayedColumns = ['fileId', 'dateSubmitted', 'ownerName', 'type', 'government', 'portalStatus']; dataSource: SearchResult[] = []; - pageIndex = 0; + @Input() pageIndex: number = 0; itemsPerPage = 20; total = 0; sortDirection = 'DESC'; diff --git a/alcs-frontend/src/app/features/search/notification-search-table/notification-search-table.component.ts b/alcs-frontend/src/app/features/search/notification-search-table/notification-search-table.component.ts index fbbed978b1..31f2bc893d 100644 --- a/alcs-frontend/src/app/features/search/notification-search-table/notification-search-table.component.ts +++ b/alcs-frontend/src/app/features/search/notification-search-table/notification-search-table.component.ts @@ -53,7 +53,7 @@ export class NotificationSearchTableComponent implements OnDestroy { displayedColumns = ['fileId', 'dateSubmitted', 'ownerName', 'type', 'government', 'portalStatus']; dataSource: SearchResult[] = []; - pageIndex = 0; + @Input() pageIndex: number = 0; itemsPerPage = 20; total = 0; sortDirection = 'DESC'; diff --git a/alcs-frontend/src/app/features/search/search.component.html b/alcs-frontend/src/app/features/search/search.component.html index 90a93d178c..473c9e36e1 100644 --- a/alcs-frontend/src/app/features/search/search.component.html +++ b/alcs-frontend/src/app/features/search/search.component.html @@ -255,6 +255,7 @@ <h2 class="search-title">Search Results:</h2> [applications]="applications" [totalCount]="applicationTotal" [statuses]="applicationStatuses" + [pageIndex]="pageIndex" [regions]="regions" (tableChange)="onTableChange($event)" ></app-application-search-table> @@ -267,6 +268,7 @@ <h2 class="search-title">Search Results:</h2> *ngIf="!isLoading" [noticeOfIntents]="noticeOfIntents" [totalCount]="noticeOfIntentTotal" + [pageIndex]="pageIndex" [statuses]="noiStatuses" [regions]="regions" (tableChange)="onTableChange($event)" @@ -280,6 +282,7 @@ <h2 class="search-title">Search Results:</h2> *ngIf="!isLoading" [nonApplications]="nonApplications" [totalCount]="nonApplicationsTotal" + [pageIndex]="pageIndex" (tableChange)="onTableChange($event)" > </app-non-application-search-table> @@ -292,6 +295,7 @@ <h2 class="search-title">Search Results:</h2> [statuses]="notificationStatuses" [notifications]="notifications" [totalCount]="notificationTotal" + [pageIndex]="pageIndex" (tableChange)="onTableChange($event)" > </app-notification-search-table> diff --git a/alcs-frontend/src/app/features/search/search.component.ts b/alcs-frontend/src/app/features/search/search.component.ts index 6c0d29a7da..83b3650478 100644 --- a/alcs-frontend/src/app/features/search/search.component.ts +++ b/alcs-frontend/src/app/features/search/search.component.ts @@ -181,6 +181,7 @@ export class SearchComponent implements OnInit, OnDestroy { } async onSubmit() { + this.pageIndex = 0; const searchParams = this.getSearchParams(); this.isLoading = true; const result = await this.searchService.advancedSearchFetch(searchParams); diff --git a/portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.ts b/portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.ts index 9dd9d328ce..c1cc4e9c76 100644 --- a/portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.ts +++ b/portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.ts @@ -44,7 +44,7 @@ export class InboxTableComponent implements OnDestroy { 'actions', ]; dataSource = new MatTableDataSource<InboxResultDto>(); - pageIndex = 0; + @Input() pageIndex: number = 0; itemsPerPage = 10; total = 0; sortDirection = 'DESC'; diff --git a/portal-frontend/src/app/features/home/inbox/inbox.component.html b/portal-frontend/src/app/features/home/inbox/inbox.component.html index bacc090743..73e616e7a8 100644 --- a/portal-frontend/src/app/features/home/inbox/inbox.component.html +++ b/portal-frontend/src/app/features/home/inbox/inbox.component.html @@ -118,6 +118,7 @@ [items]="applications" [totalCount]="applicationTotal" (tableChange)="onTableChange($event)" + [pageIndex]="pageIndex" type="Applications" ></app-inbox-table> </mat-tab> diff --git a/portal-frontend/src/app/features/home/inbox/inbox.component.ts b/portal-frontend/src/app/features/home/inbox/inbox.component.ts index f6da2d3a31..44a181e0a4 100644 --- a/portal-frontend/src/app/features/home/inbox/inbox.component.ts +++ b/portal-frontend/src/app/features/home/inbox/inbox.component.ts @@ -144,6 +144,7 @@ export class InboxComponent implements OnInit, OnDestroy { } async onSubmit() { + this.pageIndex = 0; const searchParams = this.getSearchParams(); this.isLoading = true; From 2eadb97d83cd37bfcc0c61731055e16ba083aeae Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Mon, 4 Dec 2023 11:20:26 -0800 Subject: [PATCH 722/954] Confirm cancellation of NOI's --- ...view-notice-of-intent-submission.component.ts | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.ts b/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.ts index 483050f3d7..f319b06ffa 100644 --- a/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.ts @@ -1,6 +1,7 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; import { BehaviorSubject, Subject, takeUntil } from 'rxjs'; +import { ConfirmationDialogService } from '../../../shared/confirmation-dialog/confirmation-dialog.service'; import { NoticeOfIntentDocumentDto } from '../../../services/notice-of-intent-document/notice-of-intent-document.dto'; import { NoticeOfIntentDocumentService } from '../../../services/notice-of-intent-document/notice-of-intent-document.service'; import { @@ -24,6 +25,7 @@ export class ViewNoticeOfIntentSubmissionComponent implements OnInit, OnDestroy constructor( private noiSubmissionService: NoticeOfIntentSubmissionService, private noiDocumentService: NoticeOfIntentDocumentService, + private confirmationDialogService: ConfirmationDialogService, private route: ActivatedRoute, private router: Router ) {} @@ -64,8 +66,18 @@ export class ViewNoticeOfIntentSubmissionComponent implements OnInit, OnDestroy } async onCancel(uuid: string) { - await this.noiSubmissionService.cancel(uuid); - await this.router.navigateByUrl(`home`); + const dialog = this.confirmationDialogService.openDialog({ + body: 'Are you sure you want to cancel the application? A cancelled application cannot be edited or submitted to the ALC. This cannot be undone.', + confirmAction: 'Confirm', + cancelAction: 'Return', + }); + + dialog.subscribe(async (isConfirmed) => { + if (isConfirmed) { + await this.noiSubmissionService.cancel(uuid); + await this.router.navigateByUrl(`/home`); + } + }); } onDownloadSubmissionPdf(fileNumber: string) { From 37ce943b96e4a71433f27c4d6f9ce1bb0355baaa Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Mon, 4 Dec 2023 11:47:55 -0800 Subject: [PATCH 723/954] Update LFNG Review * Make new menu template and use for all steps except last * Small UI tweaks and updates --- portal-frontend/src/app/app.component.scss | 1 + .../review-attachments.component.html | 20 ++--------- .../review-attachments.component.spec.ts | 6 ---- .../review-attachments.component.ts | 11 ------ .../review-contact-information.component.html | 12 ------- ...view-contact-information.component.spec.ts | 10 +----- .../review-contact-information.component.ts | 12 +------ .../review-ocp/review-ocp.component.html | 14 -------- .../review-ocp/review-ocp.component.spec.ts | 10 +----- .../review-ocp/review-ocp.component.ts | 12 +------ .../review-resolution.component.html | 14 -------- .../review-resolution.component.spec.ts | 10 +----- .../review-resolution.component.ts | 12 +------ .../review-submission.component.html | 36 ++++++++++++++++++- .../review-submission.component.scss | 19 +++++++++- .../review-submission.component.ts | 18 +++++----- .../review-submit-fng.component.html | 2 +- .../review-submit.component.html | 2 +- .../review-zoning.component.html | 15 +------- .../review-zoning/review-zoning.component.ts | 12 +------ 20 files changed, 77 insertions(+), 171 deletions(-) diff --git a/portal-frontend/src/app/app.component.scss b/portal-frontend/src/app/app.component.scss index 7ec5ce8039..742acf2eb4 100644 --- a/portal-frontend/src/app/app.component.scss +++ b/portal-frontend/src/app/app.component.scss @@ -4,6 +4,7 @@ :host { width: 100%; height: 100%; + position: relative; } .site-layout { diff --git a/portal-frontend/src/app/features/applications/review-submission/review-attachments/review-attachments.component.html b/portal-frontend/src/app/features/applications/review-submission/review-attachments/review-attachments.component.html index 5b58c4d46b..a5f08ac19b 100644 --- a/portal-frontend/src/app/features/applications/review-submission/review-attachments/review-attachments.component.html +++ b/portal-frontend/src/app/features/applications/review-submission/review-attachments/review-attachments.component.html @@ -2,9 +2,6 @@ <h2>Attachments</h2> <div> <div class="description"> <div>Provide mandatory and optional attachments</div> - <div> - <button class="save-button" mat-flat-button color="primary">Save Progress</button> - </div> </div> <div *ngIf="!hasCompletedPreviousSteps"> Please complete Step 2 Plans & Bylaws: OCP, Step 3 Plans & Bylaws: Zoning and Step 4 Resolution to continue with @@ -12,7 +9,7 @@ <h2>Attachments</h2> </div> <div *ngIf="hasCompletedPreviousSteps"> <section *ngIf="showMandatoryUploads"> - <label for="resolution-document">Resolution Document</label> + <label class="subheading2" for="resolution-document">Resolution Document</label> <app-file-drag-drop id="resolution-document" [uploadedFiles]="resolutionDocument" @@ -25,7 +22,7 @@ <h2>Attachments</h2> ></app-file-drag-drop> </section> <section *ngIf="!isFirstNationGovernment && showMandatoryUploads"> - <label for="staff-report">Staff Report <span *ngIf="!isAuthorized">(optional)</span></label> + <label class="subheading2" for="staff-report">Staff Report <span *ngIf="!isAuthorized">(optional)</span></label> <app-file-drag-drop id="staff-report" [uploadedFiles]="staffReport" @@ -38,7 +35,7 @@ <h2>Attachments</h2> ></app-file-drag-drop> </section> <section> - <label for="other-document">Other Attachments (optional)</label> + <label class="subheading2" for="other-document">Other Attachments (optional)</label> <app-file-drag-drop id="other-document" [uploadedFiles]="otherAttachments" @@ -50,15 +47,4 @@ <h2>Attachments</h2> ></app-file-drag-drop> </section> </div> - <div class="button-container"> - <button (click)="onExit()" mat-stroked-button color="accent">Save and Exit</button> - <div> - <button mat-stroked-button color="primary" (click)="onNavigateToStep(currentStep - 1)"> - Previous<span class="mobile-hidden"> Step</span> - </button> - <button mat-flat-button color="primary" (click)="onNavigateToStep(currentStep + 1)"> - Next<span class="mobile-hidden"> Step</span> - </button> - </div> - </div> </div> diff --git a/portal-frontend/src/app/features/applications/review-submission/review-attachments/review-attachments.component.spec.ts b/portal-frontend/src/app/features/applications/review-submission/review-attachments/review-attachments.component.spec.ts index d0cd20dd9c..5917c29a30 100644 --- a/portal-frontend/src/app/features/applications/review-submission/review-attachments/review-attachments.component.spec.ts +++ b/portal-frontend/src/app/features/applications/review-submission/review-attachments/review-attachments.component.spec.ts @@ -16,12 +16,10 @@ describe('ReviewAttachmentsComponent', () => { let fixture: ComponentFixture<ReviewAttachmentsComponent>; let mockAppReviewService: DeepMocked<ApplicationSubmissionReviewService>; let mockAppDocumentService: DeepMocked<ApplicationDocumentService>; - let mockRouter: DeepMocked<Router>; let applicationDocumentPipe = new BehaviorSubject<ApplicationDocumentDto[]>([]); beforeEach(async () => { mockAppReviewService = createMock(); - mockRouter = createMock(); mockAppDocumentService = createMock(); mockAppReviewService.$applicationReview = new BehaviorSubject<ApplicationSubmissionReviewDto | undefined>( undefined @@ -34,10 +32,6 @@ describe('ReviewAttachmentsComponent', () => { provide: ApplicationSubmissionReviewService, useValue: mockAppReviewService, }, - { - provide: Router, - useValue: mockRouter, - }, { provide: ApplicationDocumentService, useValue: mockAppDocumentService, diff --git a/portal-frontend/src/app/features/applications/review-submission/review-attachments/review-attachments.component.ts b/portal-frontend/src/app/features/applications/review-submission/review-attachments/review-attachments.component.ts index f0db408194..86777d905d 100644 --- a/portal-frontend/src/app/features/applications/review-submission/review-attachments/review-attachments.component.ts +++ b/portal-frontend/src/app/features/applications/review-submission/review-attachments/review-attachments.component.ts @@ -37,7 +37,6 @@ export class ReviewAttachmentsComponent implements OnInit, OnDestroy { showOtherVirusError = false; constructor( - private router: Router, private applicationReviewService: ApplicationSubmissionReviewService, private applicationDocumentService: ApplicationDocumentService, private toastService: ToastService @@ -79,12 +78,6 @@ export class ReviewAttachmentsComponent implements OnInit, OnDestroy { }); } - async onExit() { - if (this.fileId) { - await this.router.navigateByUrl(`/application/${this.fileId}`); - } - } - async loadApplicationDocuments(fileId: string) { const documents = await this.applicationDocumentService.getByFileId(fileId); if (documents) { @@ -143,8 +136,4 @@ export class ReviewAttachmentsComponent implements OnInit, OnDestroy { this.$destroy.next(); this.$destroy.complete(); } - - onNavigateToStep(step: number) { - this.navigateToStep.emit(step); - } } diff --git a/portal-frontend/src/app/features/applications/review-submission/review-contact-information/review-contact-information.component.html b/portal-frontend/src/app/features/applications/review-submission/review-contact-information/review-contact-information.component.html index fc0977ce8c..8ac1ae5b32 100644 --- a/portal-frontend/src/app/features/applications/review-submission/review-contact-information/review-contact-information.component.html +++ b/portal-frontend/src/app/features/applications/review-submission/review-contact-information/review-contact-information.component.html @@ -4,9 +4,6 @@ <h2>Contact Information</h2> <div class="description"> <div *ngIf="isFirstNationGovernment">Provide contact information for First Nation government staff</div> <div *ngIf="!isFirstNationGovernment">Provide contact information for Local government staff</div> - <div> - <button class="save-button" (click)="onSave()" mat-flat-button color="primary">Save Progress</button> - </div> </div> <form [formGroup]="contactForm"> <div class="form-row"> @@ -92,14 +89,5 @@ <h2>Contact Information</h2> </div> </div> </form> - <div class="button-container"> - <button mat-stroked-button color="accent" (click)="onExit()">Save and Exit</button> - <div> - <div><!--this is required for correct responsive view --></div> - <button mat-flat-button color="primary" (click)="onNavigateToStep(currentStep + 1)"> - Next<span class="mobile-hidden"> Step</span> - </button> - </div> - </div> </div> </div> diff --git a/portal-frontend/src/app/features/applications/review-submission/review-contact-information/review-contact-information.component.spec.ts b/portal-frontend/src/app/features/applications/review-submission/review-contact-information/review-contact-information.component.spec.ts index 006ffafea8..441c881d8c 100644 --- a/portal-frontend/src/app/features/applications/review-submission/review-contact-information/review-contact-information.component.spec.ts +++ b/portal-frontend/src/app/features/applications/review-submission/review-contact-information/review-contact-information.component.spec.ts @@ -1,7 +1,6 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { Router } from '@angular/router'; -import { DeepMocked, createMock } from '@golevelup/ts-jest'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { BehaviorSubject } from 'rxjs'; import { ApplicationSubmissionReviewDto } from '../../../../services/application-submission-review/application-submission-review.dto'; import { ApplicationSubmissionReviewService } from '../../../../services/application-submission-review/application-submission-review.service'; @@ -12,7 +11,6 @@ describe('ReviewContactInformationComponent', () => { let component: ReviewContactInformationComponent; let fixture: ComponentFixture<ReviewContactInformationComponent>; let mockAppReviewService: DeepMocked<ApplicationSubmissionReviewService>; - let mockRouter: DeepMocked<Router>; beforeEach(async () => { mockAppReviewService = createMock(); @@ -20,8 +18,6 @@ describe('ReviewContactInformationComponent', () => { undefined ); - mockRouter = createMock(); - await TestBed.configureTestingModule({ declarations: [ReviewContactInformationComponent], providers: [ @@ -29,10 +25,6 @@ describe('ReviewContactInformationComponent', () => { provide: ApplicationSubmissionReviewService, useValue: mockAppReviewService, }, - { - provide: Router, - useValue: mockRouter, - }, ], schemas: [NO_ERRORS_SCHEMA], }).compileComponents(); diff --git a/portal-frontend/src/app/features/applications/review-submission/review-contact-information/review-contact-information.component.ts b/portal-frontend/src/app/features/applications/review-submission/review-contact-information/review-contact-information.component.ts index 657196a7bd..26e84bc7d5 100644 --- a/portal-frontend/src/app/features/applications/review-submission/review-contact-information/review-contact-information.component.ts +++ b/portal-frontend/src/app/features/applications/review-submission/review-contact-information/review-contact-information.component.ts @@ -36,7 +36,7 @@ export class ReviewContactInformationComponent implements OnInit, OnDestroy { }); private fileId: string | undefined; - constructor(private applicationReviewService: ApplicationSubmissionReviewService, private router: Router) {} + constructor(private applicationReviewService: ApplicationSubmissionReviewService) {} ngOnInit(): void { this.applicationReviewService.$applicationReview.pipe(takeUntil(this.$destroy)).subscribe((applicationReview) => { @@ -63,12 +63,6 @@ export class ReviewContactInformationComponent implements OnInit, OnDestroy { await this.saveProgress(); } - async onExit() { - if (this.fileId) { - await this.router.navigateByUrl(`/application/${this.fileId}`); - } - } - private async saveProgress() { if (this.fileId && this.contactForm.dirty) { await this.applicationReviewService.update(this.fileId, { @@ -87,8 +81,4 @@ export class ReviewContactInformationComponent implements OnInit, OnDestroy { this.$destroy.next(); this.$destroy.complete(); } - - onNavigateToStep(step: number) { - this.navigateToStep.emit(step); - } } diff --git a/portal-frontend/src/app/features/applications/review-submission/review-ocp/review-ocp.component.html b/portal-frontend/src/app/features/applications/review-submission/review-ocp/review-ocp.component.html index a53f368559..b0786611ae 100644 --- a/portal-frontend/src/app/features/applications/review-submission/review-ocp/review-ocp.component.html +++ b/portal-frontend/src/app/features/applications/review-submission/review-ocp/review-ocp.component.html @@ -2,9 +2,6 @@ <h2>Plans & Bylaws: OCP</h2> <div> <div class="description"> <div>Provide information about applicable Official Community Plan (OCP)</div> - <div> - <button class="save-button" (click)="onSave()" mat-flat-button color="primary">Save Progress</button> - </div> </div> <form [formGroup]="ocpForm"> <div class="form-row"> @@ -77,15 +74,4 @@ <h2>Plans & Bylaws: OCP</h2> </div> </div> </form> - <div class="button-container"> - <button (click)="onExit()" mat-stroked-button color="accent">Save and Exit</button> - <div> - <button mat-stroked-button color="primary" (click)="onNavigateToStep(currentStep - 1)"> - Previous<span class="mobile-hidden"> Step</span> - </button> - <button mat-flat-button color="primary" (click)="onNavigateToStep(currentStep + 1)"> - Next<span class="mobile-hidden"> Step</span> - </button> - </div> - </div> </div> diff --git a/portal-frontend/src/app/features/applications/review-submission/review-ocp/review-ocp.component.spec.ts b/portal-frontend/src/app/features/applications/review-submission/review-ocp/review-ocp.component.spec.ts index b66188e8d8..6eaf7431d6 100644 --- a/portal-frontend/src/app/features/applications/review-submission/review-ocp/review-ocp.component.spec.ts +++ b/portal-frontend/src/app/features/applications/review-submission/review-ocp/review-ocp.component.spec.ts @@ -1,7 +1,6 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { Router } from '@angular/router'; -import { DeepMocked, createMock } from '@golevelup/ts-jest'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { BehaviorSubject } from 'rxjs'; import { ApplicationSubmissionReviewDto } from '../../../../services/application-submission-review/application-submission-review.dto'; import { ApplicationSubmissionReviewService } from '../../../../services/application-submission-review/application-submission-review.service'; @@ -12,7 +11,6 @@ describe('ReviewOcpComponent', () => { let component: ReviewOcpComponent; let fixture: ComponentFixture<ReviewOcpComponent>; let mockAppReviewService: DeepMocked<ApplicationSubmissionReviewService>; - let mockRouter: DeepMocked<Router>; beforeEach(async () => { mockAppReviewService = createMock(); @@ -20,8 +18,6 @@ describe('ReviewOcpComponent', () => { undefined ); - mockRouter = createMock(); - await TestBed.configureTestingModule({ declarations: [ReviewOcpComponent], providers: [ @@ -29,10 +25,6 @@ describe('ReviewOcpComponent', () => { provide: ApplicationSubmissionReviewService, useValue: mockAppReviewService, }, - { - provide: Router, - useValue: mockRouter, - }, ], schemas: [NO_ERRORS_SCHEMA], }).compileComponents(); diff --git a/portal-frontend/src/app/features/applications/review-submission/review-ocp/review-ocp.component.ts b/portal-frontend/src/app/features/applications/review-submission/review-ocp/review-ocp.component.ts index 043b41b517..b8ef368cea 100644 --- a/portal-frontend/src/app/features/applications/review-submission/review-ocp/review-ocp.component.ts +++ b/portal-frontend/src/app/features/applications/review-submission/review-ocp/review-ocp.component.ts @@ -30,7 +30,7 @@ export class ReviewOcpComponent implements OnInit, OnDestroy { }); private fileId: string | undefined; - constructor(private applicationReviewService: ApplicationSubmissionReviewService, private router: Router) {} + constructor(private applicationReviewService: ApplicationSubmissionReviewService) {} ngOnInit(): void { this.applicationReviewService.$applicationReview.pipe(takeUntil(this.$destroy)).subscribe((applicationReview) => { @@ -62,12 +62,6 @@ export class ReviewOcpComponent implements OnInit, OnDestroy { await this.saveProgress(); } - async onExit() { - if (this.fileId) { - await this.router.navigateByUrl(`/application/${this.fileId}`); - } - } - private async saveProgress() { if (this.fileId && this.ocpForm.dirty) { const ocpDesignation = this.isOCPDesignation.getRawValue(); @@ -110,8 +104,4 @@ export class ReviewOcpComponent implements OnInit, OnDestroy { this.isOCPConsistent.disable(); } } - - onNavigateToStep(step: number) { - this.navigateToStep.emit(step); - } } diff --git a/portal-frontend/src/app/features/applications/review-submission/review-resolution/review-resolution.component.html b/portal-frontend/src/app/features/applications/review-submission/review-resolution/review-resolution.component.html index f9ac8b93bd..c165c20ad6 100644 --- a/portal-frontend/src/app/features/applications/review-submission/review-resolution/review-resolution.component.html +++ b/portal-frontend/src/app/features/applications/review-submission/review-resolution/review-resolution.component.html @@ -3,9 +3,6 @@ <h2>Resolution</h2> <div class="description"> <div *ngIf="isFirstNationGovernment">Provide First Nation government authorizing resolution</div> <div *ngIf="!isFirstNationGovernment">Provide Local government authorizing resolution</div> - <div> - <button class="save-button" (click)="onSave()" mat-flat-button color="primary">Save Progress</button> - </div> </div> <div *ngIf="!isFirstNationGovernment && (this.isOCPDesignation === null || this.isSubjectToZoning === null)"> Please complete both Step 2 Plans & Bylaws: OCP and Step 3 Plans & Bylaws: Zoning to continue with this step. @@ -42,15 +39,4 @@ <h2>Resolution</h2> </div> </div> </form> - <div class="button-container"> - <button (click)="onExit()" mat-stroked-button color="accent">Save and Exit</button> - <div> - <button mat-stroked-button color="primary" (click)="onNavigateToStep(currentStep - 1)"> - Previous<span class="mobile-hidden"> Step</span> - </button> - <button mat-flat-button color="primary" (click)="onNavigateToStep(currentStep + 1)"> - Next<span class="mobile-hidden"> Step</span> - </button> - </div> - </div> </div> diff --git a/portal-frontend/src/app/features/applications/review-submission/review-resolution/review-resolution.component.spec.ts b/portal-frontend/src/app/features/applications/review-submission/review-resolution/review-resolution.component.spec.ts index bafadbc900..d56385a07e 100644 --- a/portal-frontend/src/app/features/applications/review-submission/review-resolution/review-resolution.component.spec.ts +++ b/portal-frontend/src/app/features/applications/review-submission/review-resolution/review-resolution.component.spec.ts @@ -1,7 +1,6 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { Router } from '@angular/router'; -import { DeepMocked, createMock } from '@golevelup/ts-jest'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { BehaviorSubject } from 'rxjs'; import { ApplicationSubmissionReviewDto } from '../../../../services/application-submission-review/application-submission-review.dto'; import { ApplicationSubmissionReviewService } from '../../../../services/application-submission-review/application-submission-review.service'; @@ -12,7 +11,6 @@ describe('ReviewResolutionComponent', () => { let component: ReviewResolutionComponent; let fixture: ComponentFixture<ReviewResolutionComponent>; let mockAppReviewService: DeepMocked<ApplicationSubmissionReviewService>; - let mockRouter: DeepMocked<Router>; beforeEach(async () => { mockAppReviewService = createMock(); @@ -20,18 +18,12 @@ describe('ReviewResolutionComponent', () => { undefined ); - mockRouter = createMock(); - await TestBed.configureTestingModule({ providers: [ { provide: ApplicationSubmissionReviewService, useValue: mockAppReviewService, }, - { - provide: Router, - useValue: mockRouter, - }, ], declarations: [ReviewResolutionComponent], schemas: [NO_ERRORS_SCHEMA], diff --git a/portal-frontend/src/app/features/applications/review-submission/review-resolution/review-resolution.component.ts b/portal-frontend/src/app/features/applications/review-submission/review-resolution/review-resolution.component.ts index ecf6b13591..ba04f56729 100644 --- a/portal-frontend/src/app/features/applications/review-submission/review-resolution/review-resolution.component.ts +++ b/portal-frontend/src/app/features/applications/review-submission/review-resolution/review-resolution.component.ts @@ -26,7 +26,7 @@ export class ReviewResolutionComponent implements OnInit, OnDestroy { isSubjectToZoning: boolean | null = null; isFirstNationGovernment = false; - constructor(private applicationReviewService: ApplicationSubmissionReviewService, private router: Router) {} + constructor(private applicationReviewService: ApplicationSubmissionReviewService) {} ngOnInit(): void { this.applicationReviewService.$applicationReview.pipe(takeUntil(this.$destroy)).subscribe((applicationReview) => { @@ -54,12 +54,6 @@ export class ReviewResolutionComponent implements OnInit, OnDestroy { await this.saveProgress(); } - async onExit() { - if (this.fileId) { - await this.router.navigateByUrl(`/application/${this.fileId}`); - } - } - private async saveProgress() { if (this.fileId && this.resolutionForm.dirty) { if (this.isAuthorized.getRawValue() !== null) { @@ -80,8 +74,4 @@ export class ReviewResolutionComponent implements OnInit, OnDestroy { this.$destroy.next(); this.$destroy.complete(); } - - onNavigateToStep(step: number) { - this.navigateToStep.emit(step); - } } diff --git a/portal-frontend/src/app/features/applications/review-submission/review-submission.component.html b/portal-frontend/src/app/features/applications/review-submission/review-submission.component.html index 493c975114..76e929189f 100644 --- a/portal-frontend/src/app/features/applications/review-submission/review-submission.component.html +++ b/portal-frontend/src/app/features/applications/review-submission/review-submission.component.html @@ -3,7 +3,33 @@ <h6 *ngIf="application">Application ID: {{ application.fileNumber }} | {{ application.type }}</h6> <div> <button (click)="onReturnApplication()" mat-flat-button color="accent">Return Application</button> - <button *ngIf="showDownloadPdf" (click)="onDownloadPdf()" mat-flat-button color="primary">Download PDF</button> + <button *ngIf="isOnLastStep" (click)="onDownloadPdf()" mat-flat-button color="primary">Download PDF</button> + </div> + </div> +</ng-template> + +<ng-template #menu let-stepper="stepper"> + <div class="menu"> + <button (click)="onSaveExit()" mat-stroked-button color="accent">Save and Exit</button> + <div> + <div *ngIf="stepper.selectedIndex === 0"></div> + <button + *ngIf="stepper.selectedIndex > 0" + mat-stroked-button + color="primary" + (click)="onNavigateToStep(stepper.selectedIndex - 1)" + > + Previous<span class="mobile-hidden"> Step</span> + </button> + <button + class="next-step" + *ngIf="!isOnLastStep" + mat-flat-button + color="primary" + (click)="onNavigateToStep(stepper.selectedIndex + 1)" + > + Next<span class="mobile-hidden"> Step</span> + </button> </div> </div> </ng-template> @@ -23,6 +49,7 @@ <h6 *ngIf="application">Application ID: {{ application.fileNumber }} | {{ applic [showErrors]="showValidationErrors" ></app-review-contact-information> </div> + <ng-container *ngTemplateOutlet="menu; context: { stepper: cdkStepper }"></ng-container> </cdk-step> <cdk-step label="Plans & Bylaws: OCP"> <ng-container *ngTemplateOutlet="header"></ng-container> @@ -32,6 +59,7 @@ <h6 *ngIf="application">Application ID: {{ application.fileNumber }} | {{ applic [showErrors]="showValidationErrors" ></app-review-ocp> </div> + <ng-container *ngTemplateOutlet="menu; context: { stepper: cdkStepper }"></ng-container> </cdk-step> <cdk-step label="Plans & Bylaws: Zoning"> <ng-container *ngTemplateOutlet="header"></ng-container> @@ -41,6 +69,7 @@ <h6 *ngIf="application">Application ID: {{ application.fileNumber }} | {{ applic [showErrors]="showValidationErrors" ></app-review-zoning> </div> + <ng-container *ngTemplateOutlet="menu; context: { stepper: cdkStepper }"></ng-container> </cdk-step> <cdk-step label="Resolution"> <ng-container *ngTemplateOutlet="header"></ng-container> @@ -50,6 +79,7 @@ <h6 *ngIf="application">Application ID: {{ application.fileNumber }} | {{ applic [showErrors]="showValidationErrors" ></app-review-resolution> </div> + <ng-container *ngTemplateOutlet="menu; context: { stepper: cdkStepper }"></ng-container> </cdk-step> <cdk-step label="Attachments"> <ng-container *ngTemplateOutlet="header"></ng-container> @@ -59,6 +89,7 @@ <h6 *ngIf="application">Application ID: {{ application.fileNumber }} | {{ applic [showErrors]="showValidationErrors" (navigateToStep)="onBeforeSwitchStep($event)" ></app-review-attachments> + <ng-container *ngTemplateOutlet="menu; context: { stepper: cdkStepper }"></ng-container> </div> </cdk-step> <cdk-step label="Review & Submit"> @@ -89,6 +120,7 @@ <h6 *ngIf="application">Application ID: {{ application.fileNumber }} | {{ applic [showErrors]="showValidationErrors" ></app-review-contact-information> </div> + <ng-container *ngTemplateOutlet="menu; context: { stepper: cdkStepper }"></ng-container> </cdk-step> <cdk-step label="Resolution"> <ng-container *ngTemplateOutlet="header"></ng-container> @@ -98,6 +130,7 @@ <h6 *ngIf="application">Application ID: {{ application.fileNumber }} | {{ applic [showErrors]="showValidationErrors" ></app-review-resolution> </div> + <ng-container *ngTemplateOutlet="menu; context: { stepper: cdkStepper }"></ng-container> </cdk-step> <cdk-step label="Attachments"> <ng-container *ngTemplateOutlet="header"></ng-container> @@ -108,6 +141,7 @@ <h6 *ngIf="application">Application ID: {{ application.fileNumber }} | {{ applic (navigateToStep)="onBeforeSwitchStep($event)" ></app-review-attachments> </div> + <ng-container *ngTemplateOutlet="menu; context: { stepper: cdkStepper }"></ng-container> </cdk-step> <cdk-step label="Review & Submit"> <ng-container *ngTemplateOutlet="header"></ng-container> diff --git a/portal-frontend/src/app/features/applications/review-submission/review-submission.component.scss b/portal-frontend/src/app/features/applications/review-submission/review-submission.component.scss index 99408b2af6..64aa96c56c 100644 --- a/portal-frontend/src/app/features/applications/review-submission/review-submission.component.scss +++ b/portal-frontend/src/app/features/applications/review-submission/review-submission.component.scss @@ -21,6 +21,18 @@ } } +.menu { + position: sticky; + bottom: 0; + background-color: colors.$white; + padding: rem(16) 0; + + .next-step { + align-self: flex-end; + margin-left: rem(32) !important; + } +} + :host::ng-deep { .field-error { color: colors.$error-color; @@ -123,11 +135,16 @@ } } - .button-container { + .menu { + position: sticky; + bottom: 0; margin-top: rem(40); + background-color: colors.$white; display: flex; + padding: rem(16) 0; flex-direction: column-reverse; justify-content: space-between; + z-index: 2; @media screen and (min-width: $tabletBreakpoint) { flex-direction: row; diff --git a/portal-frontend/src/app/features/applications/review-submission/review-submission.component.ts b/portal-frontend/src/app/features/applications/review-submission/review-submission.component.ts index ed80bdfbb2..a23202f9f8 100644 --- a/portal-frontend/src/app/features/applications/review-submission/review-submission.component.ts +++ b/portal-frontend/src/app/features/applications/review-submission/review-submission.component.ts @@ -1,4 +1,3 @@ -import { StepperSelectionEvent } from '@angular/cdk/stepper'; import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; import { ActivatedRoute, Router } from '@angular/router'; @@ -34,11 +33,6 @@ export enum ReviewApplicationFngSteps { ReviewAndSubmitFng = 3, } -export class NavigateToStep { - from!: number; - to!: number; -} - @Component({ selector: 'app-review-application', templateUrl: './review-submission.component.html', @@ -56,7 +50,7 @@ export class ReviewSubmissionComponent implements OnInit, OnDestroy { reviewAppFngSteps = ReviewApplicationFngSteps; doNotSaveAppReview = false; showValidationErrors = false; - showDownloadPdf = false; + isOnLastStep = false; @ViewChild('cdkStepper') public customStepper!: CustomStepperComponent; @@ -102,7 +96,7 @@ export class ReviewSubmissionComponent implements OnInit, OnDestroy { const stepInt = parseInt(stepInd); this.customStepper.navigateToStep(stepInt, true); - this.showDownloadPdf = this.isFirstNationGovernment + this.isOnLastStep = this.isFirstNationGovernment ? stepInt === ReviewApplicationFngSteps.ReviewAndSubmitFng : stepInt === ReviewApplicationSteps.ReviewAndSubmit; }); @@ -223,4 +217,12 @@ export class ReviewSubmissionComponent implements OnInit, OnDestroy { await this.pdfGenerationService.generateReview(this.fileId); } } + + async onSaveExit() { + await this.router.navigateByUrl(`application/${this.fileId}`); + } + + async onNavigateToStep(number: number) { + await this.router.navigateByUrl(`application/${this.fileId}/review/${number}`); + } } diff --git a/portal-frontend/src/app/features/applications/review-submission/review-submit-fng/review-submit-fng.component.html b/portal-frontend/src/app/features/applications/review-submission/review-submit-fng/review-submit-fng.component.html index 09e34d76da..7c54ccb98c 100644 --- a/portal-frontend/src/app/features/applications/review-submission/review-submit-fng/review-submit-fng.component.html +++ b/portal-frontend/src/app/features/applications/review-submission/review-submit-fng/review-submit-fng.component.html @@ -220,7 +220,7 @@ <h4>3. Attachments</h4> <div> <button (click)="onDownloadPdf()" mat-flat-button color="primary">Download PDF</button> </div> - <div class="button-container"> + <div class="menu"> <button (click)="onExit()" mat-stroked-button color="accent">Save and Exit</button> <div> <button mat-stroked-button color="primary" (click)="onNavigateToStep(currentStep - 1)"> diff --git a/portal-frontend/src/app/features/applications/review-submission/review-submit/review-submit.component.html b/portal-frontend/src/app/features/applications/review-submission/review-submit/review-submit.component.html index 70f9d717a5..79f42f0fa3 100644 --- a/portal-frontend/src/app/features/applications/review-submission/review-submit/review-submit.component.html +++ b/portal-frontend/src/app/features/applications/review-submission/review-submit/review-submit.component.html @@ -502,7 +502,7 @@ <h4>5. Attachments</h4> <div> <button (click)="onDownloadPdf()" mat-flat-button color="primary">Download PDF</button> </div> - <div class="button-container"> + <div class="menu"> <button (click)="onExit()" mat-stroked-button color="accent">Save and Exit</button> <div> <button mat-stroked-button color="primary" (click)="onNavigateToStep(currentStep - 1)"> diff --git a/portal-frontend/src/app/features/applications/review-submission/review-zoning/review-zoning.component.html b/portal-frontend/src/app/features/applications/review-submission/review-zoning/review-zoning.component.html index cc53ed4dfb..327517674f 100644 --- a/portal-frontend/src/app/features/applications/review-submission/review-zoning/review-zoning.component.html +++ b/portal-frontend/src/app/features/applications/review-submission/review-zoning/review-zoning.component.html @@ -2,9 +2,6 @@ <h2>Plans & Bylaws: Zoning</h2> <div> <div class="description"> <div>Provide information about applicable zoning</div> - <div> - <button class="save-button" (click)="onSave()" mat-flat-button color="primary">Save Progress</button> - </div> </div> <form [formGroup]="zoningForm"> <div class="form-row"> @@ -64,6 +61,7 @@ <h2>Plans & Bylaws: Zoning</h2> placeholder="Type minimum lot size or N/A" formControlName="zoningMinimumLotSize" /> + <span matTextSuffix>ha</span> </mat-form-field> <div *ngIf="zoningMinimumLotSize.invalid && (zoningMinimumLotSize.dirty || zoningMinimumLotSize.touched)" @@ -90,15 +88,4 @@ <h2>Plans & Bylaws: Zoning</h2> </div> </div> </form> - <div class="button-container"> - <button (click)="onExit()" mat-stroked-button color="accent">Save and Exit</button> - <div> - <button mat-stroked-button color="primary" (click)="onNavigateToStep(currentStep - 1)"> - Previous<span class="mobile-hidden"> Step</span> - </button> - <button mat-flat-button color="primary" (click)="onNavigateToStep(currentStep + 1)"> - Next<span class="mobile-hidden"> Step</span> - </button> - </div> - </div> </div> diff --git a/portal-frontend/src/app/features/applications/review-submission/review-zoning/review-zoning.component.ts b/portal-frontend/src/app/features/applications/review-submission/review-zoning/review-zoning.component.ts index dd84e353e9..919baeee81 100644 --- a/portal-frontend/src/app/features/applications/review-submission/review-zoning/review-zoning.component.ts +++ b/portal-frontend/src/app/features/applications/review-submission/review-zoning/review-zoning.component.ts @@ -32,7 +32,7 @@ export class ReviewZoningComponent implements OnInit, OnDestroy { }); private fileId: string | undefined; - constructor(private applicationReviewService: ApplicationSubmissionReviewService, private router: Router) {} + constructor(private applicationReviewService: ApplicationSubmissionReviewService) {} ngOnInit(): void { this.applicationReviewService.$applicationReview.pipe(takeUntil(this.$destroy)).subscribe((applicationReview) => { @@ -66,12 +66,6 @@ export class ReviewZoningComponent implements OnInit, OnDestroy { await this.saveProgress(); } - async onExit() { - if (this.fileId) { - await this.router.navigateByUrl(`/application/${this.fileId}`); - } - } - private async saveProgress() { if (this.fileId && this.zoningForm.dirty) { const isSubjectToZoning = this.isSubjectToZoning.getRawValue(); @@ -118,8 +112,4 @@ export class ReviewZoningComponent implements OnInit, OnDestroy { this.zoningDesignation.disable(); } } - - onNavigateToStep(step: number) { - this.navigateToStep.emit(step); - } } From 488f377f8b40506e3a5efba57e4f959c9f074dc3 Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Mon, 4 Dec 2023 11:48:23 -0800 Subject: [PATCH 724/954] Fix NOI view component failing 'should create' Was NOI view mock was missing needed dialog provider. --- .../view-notice-of-intent-submission.component.spec.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.spec.ts b/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.spec.ts index 60ca1796e4..05314f9cdf 100644 --- a/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.spec.ts +++ b/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.spec.ts @@ -2,6 +2,7 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ActivatedRoute } from '@angular/router'; import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { ConfirmationDialogService } from '../../../shared/confirmation-dialog/confirmation-dialog.service'; import { BehaviorSubject } from 'rxjs'; import { NoticeOfIntentDocumentService } from '../../../services/notice-of-intent-document/notice-of-intent-document.service'; import { NoticeOfIntentSubmissionService } from '../../../services/notice-of-intent-submission/notice-of-intent-submission.service'; @@ -15,6 +16,7 @@ describe('ViewNoticeOfIntentSubmissionComponent', () => { let mockNoiSubmissionService: DeepMocked<NoticeOfIntentSubmissionService>; let mockNoiDocumentService: DeepMocked<NoticeOfIntentDocumentService>; let mockActivatedRoute: DeepMocked<any>; + let mockDialogService: DeepMocked<ConfirmationDialogService>; beforeEach(async () => { mockNoiSubmissionService = createMock(); @@ -38,6 +40,10 @@ describe('ViewNoticeOfIntentSubmissionComponent', () => { provide: ActivatedRoute, useValue: mockActivatedRoute, }, + { + provide: ConfirmationDialogService, + useValue: mockDialogService, + }, ], schemas: [NO_ERRORS_SCHEMA], }).compileComponents(); From 9410b18e5198626a809324e92ec580ce1e162b33 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Mon, 4 Dec 2023 13:14:49 -0800 Subject: [PATCH 725/954] Only send request access email if user is from ALCS --- .../authorization/authorization.controller.ts | 9 +++++---- .../authorization/authorization.service.spec.ts | 17 ++++++++++++----- .../authorization/authorization.service.ts | 11 +++++------ 3 files changed, 22 insertions(+), 15 deletions(-) diff --git a/services/apps/alcs/src/common/authorization/authorization.controller.ts b/services/apps/alcs/src/common/authorization/authorization.controller.ts index f449e224c6..99c965d465 100644 --- a/services/apps/alcs/src/common/authorization/authorization.controller.ts +++ b/services/apps/alcs/src/common/authorization/authorization.controller.ts @@ -34,10 +34,6 @@ export class AuthorizationController { @Res() res: FastifyReply, ) { try { - const token = await this.authorizationService.exchangeCodeForToken( - authCode, - ); - const redis = this.redisService.getClient(); const sessionData = await redis.get(`session_${sessionId}`); @@ -47,6 +43,11 @@ export class AuthorizationController { isPortal = parsedSession.source === 'portal'; } + const token = await this.authorizationService.exchangeCodeForToken( + authCode, + isPortal, + ); + const frontEndUrl = isPortal ? this.config.get('PORTAL.FRONTEND_ROOT') : this.config.get('ALCS.FRONTEND_ROOT'); diff --git a/services/apps/alcs/src/common/authorization/authorization.service.spec.ts b/services/apps/alcs/src/common/authorization/authorization.service.spec.ts index 11fc7e1e51..331db5ef25 100644 --- a/services/apps/alcs/src/common/authorization/authorization.service.spec.ts +++ b/services/apps/alcs/src/common/authorization/authorization.service.spec.ts @@ -79,7 +79,7 @@ describe('AuthorizationService', () => { }); it('should call out to keycloak when exchanging a code for token', async () => { - const token = await service.exchangeCodeForToken('fake-code'); + const token = await service.exchangeCodeForToken('fake-code', false); expect(token).toEqual({ id_token: fakeToken }); expect(mockHttpService.post).toHaveBeenCalledTimes(1); @@ -92,19 +92,26 @@ describe('AuthorizationService', () => { expect(mockHttpService.post).toHaveBeenCalledTimes(1); }); - it('should call out CreateUser and SendEmail on receiving token if user is not registered', async () => { - await service.exchangeCodeForToken('fake-code'); + it('should call out CreateUser and SendEmail on receiving token if user is not registered and from ALCS', async () => { + await service.exchangeCodeForToken('fake-code', false); expect(mockUserService.create).toBeCalledTimes(1); expect(mockUserService.sendNewUserRequestEmail).toBeCalledTimes(1); }); + it('should call out CreateUser and NOT SendEmail on receiving token if user is not registered and from Portal', async () => { + await service.exchangeCodeForToken('fake-code', true); + + expect(mockUserService.create).toBeCalledTimes(1); + expect(mockUserService.sendNewUserRequestEmail).toBeCalledTimes(0); + }); + it('should call out CreateUser but not SendEmail on receiving token if user is not registered but has CSS roles assigned', async () => { mockUserService.create.mockResolvedValue({ clientRoles: ['fake-role'], } as User); - await service.exchangeCodeForToken('fake-code'); + await service.exchangeCodeForToken('fake-code', false); expect(mockUserService.create).toBeCalledTimes(1); expect(mockUserService.sendNewUserRequestEmail).toBeCalledTimes(0); @@ -113,7 +120,7 @@ describe('AuthorizationService', () => { it('should not call out CreateUser on receiving token if user is registered', async () => { mockUserService.getByGuid.mockResolvedValue(createMock<User>({} as User)); mockUserService.update.mockResolvedValue(createMock<User>({} as User)); - await service.exchangeCodeForToken('fake-code'); + await service.exchangeCodeForToken('fake-code', false); expect(mockUserService.create).toBeCalledTimes(0); expect(mockUserService.sendNewUserRequestEmail).toBeCalledTimes(0); }); diff --git a/services/apps/alcs/src/common/authorization/authorization.service.ts b/services/apps/alcs/src/common/authorization/authorization.service.ts index 7ad77b3172..4f7b9c86dc 100644 --- a/services/apps/alcs/src/common/authorization/authorization.service.ts +++ b/services/apps/alcs/src/common/authorization/authorization.service.ts @@ -66,14 +66,14 @@ export class AuthorizationService { const baseUrl = this.config.get('KEYCLOAK.AUTH_SERVER_URL'); const realm = this.config.get('KEYCLOAK.REALM'); const res = await firstValueFrom( - await this.httpService.get( + this.httpService.get( `${baseUrl}/realms/${realm}/protocol/openid-connect/certs`, ), ); this.jwks = await JWK.asKeyStore(res.data); } - async exchangeCodeForToken(code: string) { + async exchangeCodeForToken(code: string, isPortal: boolean) { const baseUrl = this.config.get<string>('ALCS.BASE_URL'); const secret = this.config.get<string>('KEYCLOAK.SECRET'); const clientId = this.config.get<string>('KEYCLOAK.CLIENT_ID'); @@ -98,7 +98,7 @@ export class AuthorizationService { const decodedToken = await this.decodeToken(token.id_token); if (decodedToken) { this.logger.debug(decodedToken); - await this.registerOrUpdateUser(decodedToken); + await this.registerOrUpdateUser(decodedToken, isPortal); return res.data; } else { @@ -179,7 +179,7 @@ export class AuthorizationService { ); } - private async registerOrUpdateUser(payload: BaseToken) { + private async registerOrUpdateUser(payload: BaseToken, isPortal: boolean) { const bceidGuid = payload['bceid_user_guid']; const idirUserGuid = payload['idir_user_guid']; const existingUser = await this.userService.getByGuid({ @@ -197,8 +197,7 @@ export class AuthorizationService { this.mapUserFromTokenToCreateDto(payload), ); - //TODO: Only send if they are trying to load ALCS - if (user.clientRoles.length === 0) { + if (user.clientRoles.length === 0 && !isPortal) { await this.userService.sendNewUserRequestEmail( user.email, user.bceidGuid ?? user.displayName, From db7134efc79ea96f4257baae138eaed8f6666b6c Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Mon, 4 Dec 2023 15:09:01 -0800 Subject: [PATCH 726/954] delete owner fix --- .../parcel-entry/parcel-entry.component.html | 1 - .../parcel-entry/parcel-entry.component.ts | 18 ++++++++---------- .../parcel-entry/parcel-entry.component.html | 1 - .../parcel-owners/parcel-owners.component.ts | 17 +++++------------ 4 files changed, 13 insertions(+), 24 deletions(-) diff --git a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html index 68c839c55d..eee65ba4e5 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html @@ -214,7 +214,6 @@ <h6>Parcel Owners</h6> [owners]="parcel.owners" (onOwnersUpdated)="onOwnersUpdated.emit()" (onOwnerRemoved)="onOwnerRemoved($event)" - (onOwnersDeleted)="onOwnerRemoved($event)" [documentService]="applicationDocumentService" [ownerService]="applicationOwnerService" [disabled]="_disabled" diff --git a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts index 4ea4c2121b..e1c10d50bb 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts @@ -125,14 +125,12 @@ export class ParcelEntryComponent implements OnInit { this.$owners.subscribe((owners) => { this.owners = owners; this.filteredOwners = this.mapOwners(owners); - this.parcel.owners = this.parcel.owners.map((owner) => { - const updatedOwner = owners.find((updatedOwner) => updatedOwner.uuid === owner.uuid)!; - if (!updatedOwner) { - console.warn('Failed to find user in array'); - return owner; - } - return updatedOwner; - }); + this.parcel.owners = this.parcel.owners + .filter((owner) => owners.some((updatedOwner) => updatedOwner.uuid === owner.uuid)) + .map((owner) => { + const updatedOwner = owners.find((uOwner) => uOwner.uuid === owner.uuid); + return updatedOwner || owner; + }); }); } @@ -200,7 +198,7 @@ export class ParcelEntryComponent implements OnInit { this.isFarm.value || this.civicAddress.value || this.parcel.owners.length > 0; - + const changeParcelType = () => { if ($event.value === this.PARCEL_OWNERSHIP_TYPES.CROWN) { this.searchBy.setValue(null); @@ -333,7 +331,7 @@ export class ParcelEntryComponent implements OnInit { } private isOwnerInParcel(owner: ApplicationOwnerDto): boolean { - return this.parcel.owners.some(existingOwner => existingOwner.uuid === owner.uuid); + return this.parcel.owners.some((existingOwner) => existingOwner.uuid === owner.uuid); } async onSelectOwner(event: Event, owner: ApplicationOwnerDto, isSelected: boolean) { diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.html index 4cd0e605b1..9bc5c05237 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.html @@ -349,7 +349,6 @@ <h6 class="owner-search-option">OR</h6> [owners]="parcel.owners" (onOwnersUpdated)="onOwnersUpdated.emit()" (onOwnerRemoved)="onOwnerRemoved($event)" - (onOwnersDeleted)="onOwnerRemoved($event)" [disabled]="_disabled" [isCrown]="true" [ownerService]="noticeOfIntentOwnerService" diff --git a/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.ts b/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.ts index 8600ad5352..8bccd66b53 100644 --- a/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.ts +++ b/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.ts @@ -20,7 +20,6 @@ import { OwnerDialogComponent } from '../owner-dialog/owner-dialog.component'; }) export class ParcelOwnersComponent { @Output() onOwnersUpdated = new EventEmitter<void>(); - @Output() onOwnersDeleted = new EventEmitter<string>(); @Output() onOwnerRemoved = new EventEmitter<string>(); PARCEL_OWNERSHIP_TYPES = PARCEL_OWNERSHIP_TYPE; @@ -92,18 +91,12 @@ export class ParcelOwnersComponent { }, }); } - dialog.beforeClosed().subscribe((updatedUuid) => { - if (updatedUuid?.ownerDeleted) { - this.onOwnersDeleted.emit(updatedUuid.deletedOwnerId); - } - else if (updatedUuid) { + dialog.afterClosed().subscribe((result) => { + if (result) { this.onOwnersUpdated.emit(); } - }); - dialog.afterClosed().subscribe((result) => { - if (result.ownerDeleted) { - const updatedOwners = this.dataSource.data.filter((o: ApplicationOwnerDto | NoticeOfIntentOwnerDto) => o.uuid !== result.deletedOwnerId); - this.dataSource = new MatTableDataSource(updatedOwners); + if (result.ownerDeleted) { + this.dataSource.data = this.dataSource.data.filter((owner: ApplicationOwnerDto | NoticeOfIntentOwnerDto) => owner.uuid !== result.deletedOwnerId); } }); } @@ -127,7 +120,7 @@ export class ParcelOwnersComponent { .subscribe(async (didConfirm) => { if (didConfirm) { await this.ownerService.delete(owner.uuid); - this.onOwnersDeleted.emit(owner.uuid); + this.onOwnersUpdated.emit(); } }); } From b52b92d507facb75b50014a4429580e275bde994 Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Mon, 4 Dec 2023 15:16:47 -0800 Subject: [PATCH 727/954] fixes --- .../owner-dialogs/parcel-owners/parcel-owners.component.ts | 3 --- 1 file changed, 3 deletions(-) diff --git a/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.ts b/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.ts index 8bccd66b53..ef33bdf6b5 100644 --- a/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.ts +++ b/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.ts @@ -95,9 +95,6 @@ export class ParcelOwnersComponent { if (result) { this.onOwnersUpdated.emit(); } - if (result.ownerDeleted) { - this.dataSource.data = this.dataSource.data.filter((owner: ApplicationOwnerDto | NoticeOfIntentOwnerDto) => owner.uuid !== result.deletedOwnerId); - } }); } From 8cc4f481598b29aa0f8fc1f16749225beeddd219 Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Mon, 4 Dec 2023 15:24:09 -0800 Subject: [PATCH 728/954] fixes --- .../owner-dialogs/owner-dialog/owner-dialog.component.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/portal-frontend/src/app/shared/owner-dialogs/owner-dialog/owner-dialog.component.ts b/portal-frontend/src/app/shared/owner-dialogs/owner-dialog/owner-dialog.component.ts index 60fef113f0..5bd056da43 100644 --- a/portal-frontend/src/app/shared/owner-dialogs/owner-dialog/owner-dialog.component.ts +++ b/portal-frontend/src/app/shared/owner-dialogs/owner-dialog/owner-dialog.component.ts @@ -146,8 +146,8 @@ export class OwnerDialogComponent { }) .subscribe(async (didConfirm) => { if (didConfirm) { - await this.data.ownerService.delete(this.existingUuid ?? ''); - this.dialogRef.close({ ownerDeleted: true, deletedOwnerId: this.existingUuid}); + const res = await this.data.ownerService.delete(this.existingUuid ?? ''); + this.dialogRef.close(res); } }); } From e4e3595dee02efb5905bab4520ae3e776dd23802 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Mon, 4 Dec 2023 16:27:01 -0800 Subject: [PATCH 729/954] Remove Other Parcels * Update step to be text question instead * Remove type from parcels * Add new field to store text field --- .../application-details.component.html | 29 +- .../parcel/parcel.component.html | 10 +- .../parcel/parcel.component.ts | 13 +- .../document-upload-dialog.component.ts | 16 +- .../parcel-prep/parcel-prep.component.ts | 19 +- .../services/application/application.dto.ts | 2 +- .../alcs-edit-submission.component.html | 2 +- .../application-details.component.html | 31 ++- .../application-details.component.ts | 2 - .../parcel/parcel.component.html | 22 +- .../parcel/parcel.component.ts | 19 +- .../subd-details/subd-details.component.ts | 2 - .../edit-submission-base.module.ts | 3 - .../edit-submission.component.html | 2 +- ...-parcel-confirmation-dialog.component.html | 35 --- ...-parcel-confirmation-dialog.component.scss | 24 -- ...rcel-confirmation-dialog.component.spec.ts | 35 --- ...er-parcel-confirmation-dialog.component.ts | 33 --- .../other-parcels.component.html | 128 +++------ .../other-parcels.component.spec.ts | 30 +- .../other-parcels/other-parcels.component.ts | 263 +++--------------- .../parcel-details.component.ts | 8 +- .../parcel-entry.component.spec.ts | 1 - .../parcel-entry/parcel-entry.component.ts | 5 +- .../subd-proposal/subd-proposal.component.ts | 2 - .../notice-of-intent-details.component.ts | 2 - .../parcel/parcel.component.ts | 5 - .../notification-details.component.ts | 2 - .../submission-details.component.ts | 2 - .../submission-details.component.ts | 2 - .../submission-details.component.ts | 4 - .../application-parcel.dto.ts | 6 - .../application-parcel.service.ts | 5 +- .../application-submission.dto.ts | 2 + .../src/app/services/public/public.dto.ts | 1 - .../shared/utils/number-to-letter-helper.ts | 22 -- .../application-advanced-search.service.ts | 22 +- .../application-submission-draft.service.ts | 6 +- .../application-owner.service.spec.ts | 6 - .../application-owner.service.ts | 15 +- .../application-parcel.controller.spec.ts | 1 - .../application-parcel.controller.ts | 5 +- .../application-parcel.dto.ts | 12 - .../application-parcel.entity.ts | 10 - .../application-parcel.service.ts | 3 +- ...ation-submission-validator.service.spec.ts | 35 --- ...pplication-submission-validator.service.ts | 22 +- .../application-submission.dto.ts | 8 +- .../application-submission.entity.ts | 9 + .../application-submission.service.ts | 4 + .../application/inbox-application.service.ts | 18 +- ...notice-of-intent-parcel.controller.spec.ts | 3 +- .../notice-of-intent-parcel.dto.ts | 7 - .../notification-parcel.dto.ts | 7 - .../generate-submission-document.service.ts | 8 +- .../apps/alcs/src/portal/public/public.dto.ts | 3 - .../public-application-search.service.ts | 27 +- .../1701731117179-delete_parcel_type.ts | 30 ++ ...733437922-add_other_parcels_description.ts | 22 ++ services/templates/README.md | 2 - 60 files changed, 277 insertions(+), 797 deletions(-) delete mode 100644 portal-frontend/src/app/features/applications/edit-submission/other-parcels/other-parcel-confirmation-dialog/other-parcel-confirmation-dialog.component.html delete mode 100644 portal-frontend/src/app/features/applications/edit-submission/other-parcels/other-parcel-confirmation-dialog/other-parcel-confirmation-dialog.component.scss delete mode 100644 portal-frontend/src/app/features/applications/edit-submission/other-parcels/other-parcel-confirmation-dialog/other-parcel-confirmation-dialog.component.spec.ts delete mode 100644 portal-frontend/src/app/features/applications/edit-submission/other-parcels/other-parcel-confirmation-dialog/other-parcel-confirmation-dialog.component.ts delete mode 100644 portal-frontend/src/app/shared/utils/number-to-letter-helper.ts create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1701731117179-delete_parcel_type.ts create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1701733437922-add_other_parcels_description.ts diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.html b/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.html index 2eb0f5a12e..d4c2e48100 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.html +++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.html @@ -1,10 +1,5 @@ <section> - <app-parcel - *ngIf="files && submission" - [files]="files" - [application]="submission" - parcelType="application" - ></app-parcel> + <app-parcel *ngIf="files && submission" [files]="files" [application]="submission"></app-parcel> <div class="review-table edit-section"> <div class="full-width center"> <button *ngIf="showEdit" [disabled]="disableEdit" (click)="onEdit(0)" mat-flat-button color="accent"> @@ -14,7 +9,27 @@ </div> </section> <section> - <app-parcel *ngIf="files && submission" [files]="files" [application]="submission" parcelType="other"></app-parcel> + <h3>Other Owned Parcels</h3> + <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? + </div> + <div class="grid-double"> + <span *ngIf="submission.hasOtherParcelsInCommunity !== null">{{ + submission.hasOtherParcelsInCommunity ? 'Yes' : 'No' + }}</span> + <app-no-data *ngIf="submission.hasOtherParcelsInCommunity === null"></app-no-data> + </div> + <ng-container *ngIf="submission.hasOtherParcelsInCommunity"> + <div class="subheading2 grid-1"> + Describe the other parcels including their location, who owns or leases them, and their use. + </div> + <div class="grid-double"> + {{ submission.otherParcelsDescription }} + <app-no-data *ngIf="!submission.otherParcelsDescription"></app-no-data> + </div> + </ng-container> + </div> <div class="review-table edit-section"> <div class="full-width center"> <button *ngIf="showEdit" [disabled]="disableEdit" (click)="onEdit(1)" mat-flat-button color="accent"> diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/parcel/parcel.component.html b/alcs-frontend/src/app/features/application/applicant-info/application-details/parcel/parcel.component.html index db3cc3fb93..f4d689b74a 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/application-details/parcel/parcel.component.html +++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/parcel/parcel.component.html @@ -3,14 +3,6 @@ <h3 class="flex-item"> </h3> <div class="review-table"> - <div class="subheading2 grid-1" *ngIf="parcelType === 'other'"> - Does any of the parcel owners hold an interest (ownership or lease) in any other land (ALR or non-ALR) within the - community where the application parcel(s) is located? - </div> - <div class="grid-double" *ngIf="parcelType === 'other'"> - {{ application.hasOtherParcelsInCommunity ? 'Yes' : 'No' }} - </div> - <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 }}: Parcel and Owner Information</h4> @@ -34,7 +26,7 @@ <h4 [id]="parcel.uuid">Parcel {{ parcelInd + 1 }}: Parcel and Owner Information< PID {{ parcel.ownershipType?.code === PARCEL_OWNERSHIP_TYPES.CROWN ? '(optional)' : '' }} </div> <div class="grid-double"> - <span *ngIf="parcel.pid">{{ parcel.pid | mask : '000-000-000' }}</span> + <span *ngIf="parcel.pid">{{ parcel.pid | mask: '000-000-000' }}</span> <app-no-data *ngIf="!parcel.pid"></app-no-data> </div> <ng-container *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN"> diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/parcel/parcel.component.ts b/alcs-frontend/src/app/features/application/applicant-info/application-details/parcel/parcel.component.ts index d8567b3ce0..6ae63f2400 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/application-details/parcel/parcel.component.ts +++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/parcel/parcel.component.ts @@ -1,5 +1,5 @@ import { AfterContentChecked, Component, Input, OnChanges, OnDestroy, OnInit, SimpleChanges } from '@angular/core'; -import { ActivatedRoute, Router } from '@angular/router'; +import { ActivatedRoute } from '@angular/router'; import { Subject, takeUntil } from 'rxjs'; import { ApplicationDocumentDto } from '../../../../../services/application/application-document/application-document.dto'; import { ApplicationDocumentService } from '../../../../../services/application/application-document/application-document.service'; @@ -17,7 +17,6 @@ export class ParcelComponent implements OnInit, OnChanges, OnDestroy, AfterConte @Input() application!: ApplicationSubmissionDto; @Input() files: ApplicationDocumentDto[] = []; - @Input() parcelType!: string; pageTitle: string = 'Application Parcels'; showCertificateOfTitle: boolean = true; @@ -31,15 +30,10 @@ export class ParcelComponent implements OnInit, OnChanges, OnDestroy, AfterConte constructor( private applicationDocumentService: ApplicationDocumentService, private parcelService: ApplicationParcelService, - private route: ActivatedRoute + private route: ActivatedRoute, ) {} ngOnInit(): void { - if (this.parcelType === 'other') { - this.pageTitle = 'Other Parcels in the Community'; - this.showCertificateOfTitle = false; - } - this.route.fragment.pipe(takeUntil(this.$destroy)).subscribe((fragment) => { if (fragment) { this.anchorededParcelUuid = fragment; @@ -52,8 +46,7 @@ export class ParcelComponent implements OnInit, OnChanges, OnDestroy, AfterConte } async loadParcels(fileNumber: string) { - const parcels = await this.parcelService.fetchParcels(fileNumber); - this.parcels = parcels.filter((e) => e.parcelType === this.parcelType); + this.parcels = await this.parcelService.fetchParcels(fileNumber); } ngOnChanges(changes: SimpleChanges): void { diff --git a/alcs-frontend/src/app/features/application/documents/document-upload-dialog/document-upload-dialog.component.ts b/alcs-frontend/src/app/features/application/documents/document-upload-dialog/document-upload-dialog.component.ts index b7f8e78d6f..655cb8ebd4 100644 --- a/alcs-frontend/src/app/features/application/documents/document-upload-dialog/document-upload-dialog.component.ts +++ b/alcs-frontend/src/app/features/application/documents/document-upload-dialog/document-upload-dialog.component.ts @@ -70,7 +70,7 @@ export class DocumentUploadDialogComponent implements OnInit, OnDestroy { private applicationDocumentService: ApplicationDocumentService, private parcelService: ApplicationParcelService, private submissionService: ApplicationSubmissionService, - private toastService: ToastService + private toastService: ToastService, ) {} ngOnInit(): void { @@ -178,13 +178,11 @@ export class DocumentUploadDialogComponent implements OnInit, OnDestroy { this.showSupersededWarning = true; } - this.selectableParcels = parcels - .filter((parcel) => parcel.parcelType === 'application') - .map((parcel, index) => ({ - uuid: parcel.uuid, - pid: parcel.pid, - index: index, - })); + this.selectableParcels = parcels.map((parcel, index) => ({ + uuid: parcel.uuid, + pid: parcel.pid, + index: index, + })); } } @@ -264,7 +262,7 @@ export class DocumentUploadDialogComponent implements OnInit, OnDestroy { if (this.data.existingDocument) { await this.applicationDocumentService.download( this.data.existingDocument.uuid, - this.data.existingDocument.fileName + this.data.existingDocument.fileName, ); } } diff --git a/alcs-frontend/src/app/features/application/proposal/parcel-prep/parcel-prep.component.ts b/alcs-frontend/src/app/features/application/proposal/parcel-prep/parcel-prep.component.ts index 335c6ec886..0828bab1f5 100644 --- a/alcs-frontend/src/app/features/application/proposal/parcel-prep/parcel-prep.component.ts +++ b/alcs-frontend/src/app/features/application/proposal/parcel-prep/parcel-prep.component.ts @@ -22,18 +22,19 @@ export class ParcelPrepComponent implements OnChanges { uuid: string; }[] = []; - constructor(private parcelService: ApplicationParcelService, private router: Router) {} + constructor( + private parcelService: ApplicationParcelService, + private router: Router, + ) {} async loadParcels(fileNumber: string) { const parcels = await this.parcelService.fetchParcels(fileNumber); - this.parcels = parcels - .filter((parcel) => parcel.parcelType === 'application') - .map((parcel) => ({ - ...parcel, - owners: `${parcel.owners[0].displayName} ${parcel.owners.length > 1 ? ' et al.' : ''}`, - fullOwners: parcel.owners.map((owner) => owner.displayName).join(', '), - hasManyOwners: parcel.owners.length > 1, - })); + this.parcels = parcels.map((parcel) => ({ + ...parcel, + owners: `${parcel.owners[0].displayName} ${parcel.owners.length > 1 ? ' et al.' : ''}`, + fullOwners: parcel.owners.map((owner) => owner.displayName).join(', '), + hasManyOwners: parcel.owners.length > 1, + })); } async saveParcel(uuid: string, alrArea: string | null) { diff --git a/alcs-frontend/src/app/services/application/application.dto.ts b/alcs-frontend/src/app/services/application/application.dto.ts index 0ae200dcef..c9fa75cbc6 100644 --- a/alcs-frontend/src/app/services/application/application.dto.ts +++ b/alcs-frontend/src/app/services/application/application.dto.ts @@ -90,7 +90,6 @@ export interface ApplicationParcelDto { isFarm?: boolean; ownershipType?: string; crownLandOwnerType?: string; - parcelType?: string; certificateOfTitleUuid?: string; owners: SubmittedApplicationOwnerDto[]; alrArea: number; @@ -115,6 +114,7 @@ export interface ApplicationSubmissionDto { canView: boolean; owners: SubmittedApplicationOwnerDto[]; hasOtherParcelsInCommunity?: boolean | null; + otherParcelsDescription?: string | null; returnedComment?: string; returnedToLfngComment?: string; submissionStatuses: ApplicationSubmissionToSubmissionStatusDto[]; diff --git a/portal-frontend/src/app/features/applications/alcs-edit-submission/alcs-edit-submission.component.html b/portal-frontend/src/app/features/applications/alcs-edit-submission/alcs-edit-submission.component.html index 786daf15c5..8dd0f56693 100644 --- a/portal-frontend/src/app/features/applications/alcs-edit-submission/alcs-edit-submission.component.html +++ b/portal-frontend/src/app/features/applications/alcs-edit-submission/alcs-edit-submission.component.html @@ -25,7 +25,7 @@ <h6 *ngIf="applicationSubmission"> ></app-parcel-details> </div> </cdk-step> - <cdk-step label="Other Parcels in the Community"> + <cdk-step label="Other Owned Parcels"> <ng-container *ngTemplateOutlet="header"></ng-container> <div *ngIf="cdkStepper.selectedIndex === editAppSteps.OtherParcel"> <app-other-parcels diff --git a/portal-frontend/src/app/features/applications/application-details/application-details.component.html b/portal-frontend/src/app/features/applications/application-details/application-details.component.html index ece92d80bf..b27f1f7379 100644 --- a/portal-frontend/src/app/features/applications/application-details/application-details.component.html +++ b/portal-frontend/src/app/features/applications/application-details/application-details.component.html @@ -8,13 +8,30 @@ <h2 *ngIf="showEdit" class="page-title">Review & Submit</h2> ></app-parcel> </section> <section> - <app-parcel - [$applicationSubmission]="$application" - [showErrors]="showErrors" - [showEdit]="showEdit" - [parcelType]="parcelType.OTHER" - [draftMode]="draftMode" - ></app-parcel> + <h3>2. Other Owned Parcels</h3> + <div *ngIf="applicationSubmission" 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? + </div> + <div class="grid-double"> + <span *ngIf="applicationSubmission.hasOtherParcelsInCommunity !== null">{{ + applicationSubmission.hasOtherParcelsInCommunity ? 'Yes' : 'No' + }}</span> + <app-no-data + [showRequired]="showErrors" + *ngIf="applicationSubmission.hasOtherParcelsInCommunity === null" + ></app-no-data> + </div> + <ng-container *ngIf="applicationSubmission.hasOtherParcelsInCommunity"> + <div class="subheading2 grid-1"> + Describe the other parcels including their location, who owns or leases them, and their use. + </div> + <div class="grid-double"> + {{ applicationSubmission.otherParcelsDescription }} + <app-no-data [showRequired]="showErrors" *ngIf="!applicationSubmission.otherParcelsDescription"></app-no-data> + </div> + </ng-container> + </div> </section> <section> <h3>3. Primary Contact</h3> diff --git a/portal-frontend/src/app/features/applications/application-details/application-details.component.ts b/portal-frontend/src/app/features/applications/application-details/application-details.component.ts index caee7943f2..44fd729bfb 100644 --- a/portal-frontend/src/app/features/applications/application-details/application-details.component.ts +++ b/portal-frontend/src/app/features/applications/application-details/application-details.component.ts @@ -4,7 +4,6 @@ import { BehaviorSubject, Subject, takeUntil } from 'rxjs'; import { ApplicationDocumentDto } from '../../../services/application-document/application-document.dto'; import { ApplicationDocumentService } from '../../../services/application-document/application-document.service'; import { ApplicationOwnerDetailedDto } from '../../../services/application-owner/application-owner.dto'; -import { PARCEL_TYPE } from '../../../services/application-parcel/application-parcel.dto'; import { ApplicationSubmissionDetailedDto } from '../../../services/application-submission/application-submission.dto'; import { LocalGovernmentDto } from '../../../services/code/code.dto'; import { CodeService } from '../../../services/code/code.service'; @@ -25,7 +24,6 @@ export class ApplicationDetailsComponent implements OnInit, OnDestroy { @Input() showEdit = true; @Input() draftMode = false; - parcelType = PARCEL_TYPE; applicationSubmission: ApplicationSubmissionDetailedDto | undefined; primaryContact: ApplicationOwnerDetailedDto | undefined; localGovernment: LocalGovernmentDto | undefined; diff --git a/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.html b/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.html index e041d40752..4b403d7c05 100644 --- a/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.html +++ b/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.html @@ -1,22 +1,8 @@ <h3 class="flex-item">{{ pageTitle }}</h3> <div class="review-table"> - <div class="subheading2 grid-1" *ngIf="parcelType === PARCEL_TYPES.OTHER"> - Does any of the parcel owners hold an interest (ownership or lease) in any other land (ALR or non-ALR) within the - community where the application parcel(s) is located? - </div> - <div class="grid-double" *ngIf="parcelType === PARCEL_TYPES.OTHER"> - <span *ngIf="application.hasOtherParcelsInCommunity !== null">{{ - application.hasOtherParcelsInCommunity ? 'Yes' : 'No' - }}</span> - <app-no-data [showRequired]="showErrors" *ngIf="application.hasOtherParcelsInCommunity === null"></app-no-data> - </div> - <ng-container *ngFor="let parcel of parcels; let parcelInd = index"> <div class="full-width parcel-header"> - <h4> - Parcel {{ parcelType === PARCEL_TYPES.OTHER ? getLetterIndex(parcelInd) : parcelInd + 1 }}: Parcel and Owner - Information - </h4> + <h4>Parcel {{ parcelInd + 1 }}: Parcel and Owner Information</h4> <div> <button *ngIf="showEdit" @@ -25,7 +11,7 @@ <h4> color="accent" (click)="onEditParcelClick(parcel.uuid)" > - Edit Parcel {{ parcelType === PARCEL_TYPES.OTHER ? getLetterIndex(parcelInd) : parcelInd + 1 }} + Edit Parcel {{ parcelInd + 1 }} </button> <button *ngIf="showEdit" @@ -152,10 +138,10 @@ <h4> <app-no-data [showRequired]="showErrors" *ngIf="parcel.owners.length === 0"></app-no-data> </div> </div> - <div class="subheading2 grid-1" *ngIf="parcelType !== PARCEL_TYPES.OTHER"> + <div class="subheading2 grid-1"> I confirm that the owner information provided above matches the current Certificate of Title </div> - <div class="grid-double" *ngIf="parcelType !== PARCEL_TYPES.OTHER"> + <div class="grid-double"> <span *ngIf="parcel.isConfirmedByApplicant">Yes</span> <app-no-data [showRequired]="showErrors" *ngIf="!parcel.isConfirmedByApplicant"></app-no-data> </div> diff --git a/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.ts b/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.ts index d7eb413003..4d8fdd5859 100644 --- a/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.ts +++ b/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.ts @@ -9,13 +9,11 @@ import { ApplicationParcelDto, ApplicationParcelUpdateDto, PARCEL_OWNERSHIP_TYPE, - PARCEL_TYPE, } from '../../../../services/application-parcel/application-parcel.dto'; import { ApplicationParcelService } from '../../../../services/application-parcel/application-parcel.service'; import { ApplicationSubmissionDetailedDto } from '../../../../services/application-submission/application-submission.dto'; import { BaseCodeDto } from '../../../../shared/dto/base.dto'; import { formatBooleanToYesNoString } from '../../../../shared/utils/boolean-helper'; -import { getLetterCombinations } from '../../../../shared/utils/number-to-letter-helper'; export class ApplicationParcelBasicValidation { // indicates general validity check state, including owner related information @@ -35,7 +33,6 @@ export class ApplicationParcelBasicValidation { } interface ApplicationParcelExtended extends Omit<ApplicationParcelUpdateDto, 'ownerUuids'> { - parcelType: string; isFarmText?: string; ownershipType?: BaseCodeDto; validation?: ApplicationParcelBasicValidation; @@ -55,9 +52,7 @@ export class ParcelComponent { @Input() showErrors = true; @Input() showEdit = true; @Input() draftMode = false; - @Input() parcelType: PARCEL_TYPE = PARCEL_TYPE.APPLICATION; - PARCEL_TYPES = PARCEL_TYPE; PARCEL_OWNERSHIP_TYPES = PARCEL_OWNERSHIP_TYPE; pageTitle: string = '1. Identify Parcel(s) Under Application'; @@ -85,12 +80,6 @@ export class ParcelComponent { this.loadParcels().then(async () => await this.validateParcelDetails()); } }); - - if (this.parcelType === PARCEL_TYPE.OTHER) { - this.pageTitle = '2. Other Parcels in the Community'; - this.showCertificateOfTitle = false; - this.navigationStepInd = 1; - } } ngOnDestroy(): void { @@ -100,9 +89,7 @@ export class ParcelComponent { async loadParcels() { const parcels = (await this.applicationParcelService.fetchBySubmissionUuid(this.submissionUuid)) || []; - this.parcels = parcels - .filter((p) => p.parcelType === this.parcelType) - .map((p) => ({ ...p, isFarmText: formatBooleanToYesNoString(p.isFarm) })); + this.parcels = parcels.map((p) => ({ ...p, isFarmText: formatBooleanToYesNoString(p.isFarm) })); } private async validateParcelDetails() { @@ -202,8 +189,4 @@ export class ParcelComponent { ); } } - - getLetterIndex(num: number) { - return getLetterCombinations(num); - } } diff --git a/portal-frontend/src/app/features/applications/application-details/subd-details/subd-details.component.ts b/portal-frontend/src/app/features/applications/application-details/subd-details/subd-details.component.ts index 915e07f996..62703a504e 100644 --- a/portal-frontend/src/app/features/applications/application-details/subd-details/subd-details.component.ts +++ b/portal-frontend/src/app/features/applications/application-details/subd-details/subd-details.component.ts @@ -2,7 +2,6 @@ import { Component, Input } from '@angular/core'; import { Router } from '@angular/router'; import { ApplicationDocumentDto } from '../../../../services/application-document/application-document.dto'; import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; -import { PARCEL_TYPE } from '../../../../services/application-parcel/application-parcel.dto'; import { ApplicationParcelService } from '../../../../services/application-parcel/application-parcel.service'; import { ApplicationSubmissionDetailedDto } from '../../../../services/application-submission/application-submission.dto'; import { DOCUMENT_TYPE } from '../../../../shared/dto/document.dto'; @@ -66,7 +65,6 @@ export class SubdDetailsComponent { const parcels = await this.applicationParcelService.fetchBySubmissionUuid(this._applicationSubmission?.uuid); if (parcels) { this.totalTargetAcres = parcels - .filter((parcel) => parcel.parcelType === PARCEL_TYPE.APPLICATION) .reduce((total, parcel) => total + (parcel.mapAreaHectares ? parseFloat(parcel.mapAreaHectares) : 0), 0) .toFixed(2); } diff --git a/portal-frontend/src/app/features/applications/edit-submission/edit-submission-base.module.ts b/portal-frontend/src/app/features/applications/edit-submission/edit-submission-base.module.ts index 5468887371..59f00bc136 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/edit-submission-base.module.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/edit-submission-base.module.ts @@ -13,7 +13,6 @@ import { ChangeApplicationTypeDialogComponent } from './change-application-type- import { EditSubmissionComponent } from './edit-submission.component'; import { LandUseComponent } from './land-use/land-use.component'; import { OtherAttachmentsComponent } from './other-attachments/other-attachments.component'; -import { OtherParcelConfirmationDialogComponent } from './other-parcels/other-parcel-confirmation-dialog/other-parcel-confirmation-dialog.component'; import { OtherParcelsComponent } from './other-parcels/other-parcels.component'; import { DeleteParcelDialogComponent } from './parcel-details/delete-parcel/delete-parcel-dialog.component'; import { ParcelDetailsComponent } from './parcel-details/parcel-details.component'; @@ -51,7 +50,6 @@ import { SelectGovernmentComponent } from './select-government/select-government PrimaryContactComponent, ReviewAndSubmitComponent, SubmitConfirmationDialogComponent, - OtherParcelConfirmationDialogComponent, NfuProposalComponent, TurProposalComponent, SubdProposalComponent, @@ -91,7 +89,6 @@ import { SelectGovernmentComponent } from './select-government/select-government OtherAttachmentsComponent, PrimaryContactComponent, ReviewAndSubmitComponent, - OtherParcelConfirmationDialogComponent, NfuProposalComponent, TurProposalComponent, SubdProposalComponent, diff --git a/portal-frontend/src/app/features/applications/edit-submission/edit-submission.component.html b/portal-frontend/src/app/features/applications/edit-submission/edit-submission.component.html index ba478a8db4..94dcf4e188 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/edit-submission.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/edit-submission.component.html @@ -45,7 +45,7 @@ <h6 *ngIf="applicationSubmission"> ></app-parcel-details> </div> </cdk-step> - <cdk-step label="Other Parcels in the Community"> + <cdk-step label="Other Owned Parcels"> <ng-container *ngTemplateOutlet="header"></ng-container> <div *ngIf="cdkStepper.selectedIndex === editAppSteps.OtherParcel"> <app-other-parcels diff --git a/portal-frontend/src/app/features/applications/edit-submission/other-parcels/other-parcel-confirmation-dialog/other-parcel-confirmation-dialog.component.html b/portal-frontend/src/app/features/applications/edit-submission/other-parcels/other-parcel-confirmation-dialog/other-parcel-confirmation-dialog.component.html deleted file mode 100644 index 82f1a49cee..0000000000 --- a/portal-frontend/src/app/features/applications/edit-submission/other-parcels/other-parcel-confirmation-dialog/other-parcel-confirmation-dialog.component.html +++ /dev/null @@ -1,35 +0,0 @@ -<ng-template #startStepControls> - <button mat-stroked-button color="primary" (click)="onCancel()">cancel</button> - <button mat-flat-button color="primary" (click)="next()">continue</button> -</ng-template> - -<ng-template #lastStepControls> - <button mat-stroked-button color="primary" (click)="back()">back</button> - <button mat-flat-button color="primary" (click)="onDelete()">confirm</button> -</ng-template> - -<div mat-dialog-title> - <h4>Discard Other Parcels in the Community</h4> -</div> - -<div mat-dialog-content class="content"> - <div *ngIf="stepIdx === warningStep"> - <app-warning-banner> - <b>Warning:</b> All information relevant to 'Other Parcels in the Community' will be deleted. - </app-warning-banner> - - <div class="step-controls"> - <ng-container *ngTemplateOutlet="startStepControls"></ng-container> - </div> - </div> - - <div *ngIf="stepIdx === confirmationStep"> - <div class="confirm-content"> - <h5>Are you sure you want to discard 'Other Parcels in the Community'? This action cannot be undone.</h5> - </div> - - <div class="step-controls"> - <ng-container *ngTemplateOutlet="lastStepControls"></ng-container> - </div> - </div> -</div> diff --git a/portal-frontend/src/app/features/applications/edit-submission/other-parcels/other-parcel-confirmation-dialog/other-parcel-confirmation-dialog.component.scss b/portal-frontend/src/app/features/applications/edit-submission/other-parcels/other-parcel-confirmation-dialog/other-parcel-confirmation-dialog.component.scss deleted file mode 100644 index 1f78db7f1e..0000000000 --- a/portal-frontend/src/app/features/applications/edit-submission/other-parcels/other-parcel-confirmation-dialog/other-parcel-confirmation-dialog.component.scss +++ /dev/null @@ -1,24 +0,0 @@ -@use '../../../../../../styles/functions' as *; - -.margin-bottom-1 { - margin-bottom: rem(16); -} - -.step-controls { - display: flex; - justify-content: space-between; -} - -.confirm-content { - margin: rem(24) 0; -} - -@media screen and (min-width: $desktopBreakpoint) { - .step-controls { - justify-content: flex-end; - - button { - margin-left: rem(25) !important; - } - } -} diff --git a/portal-frontend/src/app/features/applications/edit-submission/other-parcels/other-parcel-confirmation-dialog/other-parcel-confirmation-dialog.component.spec.ts b/portal-frontend/src/app/features/applications/edit-submission/other-parcels/other-parcel-confirmation-dialog/other-parcel-confirmation-dialog.component.spec.ts deleted file mode 100644 index 667f8b7f40..0000000000 --- a/portal-frontend/src/app/features/applications/edit-submission/other-parcels/other-parcel-confirmation-dialog/other-parcel-confirmation-dialog.component.spec.ts +++ /dev/null @@ -1,35 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { NO_ERRORS_SCHEMA } from '@angular/core'; -import { MatDialog, MatDialogRef } from '@angular/material/dialog'; -import { OtherParcelConfirmationDialogComponent } from './other-parcel-confirmation-dialog.component'; - -describe('OtherParcelConfirmationDialogComponent', () => { - let component: OtherParcelConfirmationDialogComponent; - let fixture: ComponentFixture<OtherParcelConfirmationDialogComponent>; - - beforeEach(async () => { - await TestBed.configureTestingModule({ - declarations: [OtherParcelConfirmationDialogComponent], - providers: [ - { - provide: MatDialog, - useValue: {}, - }, - { - provide: MatDialogRef, - useValue: {}, - }, - ], - schemas: [NO_ERRORS_SCHEMA], - }).compileComponents(); - - fixture = TestBed.createComponent(OtherParcelConfirmationDialogComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/portal-frontend/src/app/features/applications/edit-submission/other-parcels/other-parcel-confirmation-dialog/other-parcel-confirmation-dialog.component.ts b/portal-frontend/src/app/features/applications/edit-submission/other-parcels/other-parcel-confirmation-dialog/other-parcel-confirmation-dialog.component.ts deleted file mode 100644 index 999afa9762..0000000000 --- a/portal-frontend/src/app/features/applications/edit-submission/other-parcels/other-parcel-confirmation-dialog/other-parcel-confirmation-dialog.component.ts +++ /dev/null @@ -1,33 +0,0 @@ -import { Component } from '@angular/core'; -import { MatDialogRef } from '@angular/material/dialog'; -import { ApplicationParcelDeleteStepsEnum } from '../../parcel-details/delete-parcel/delete-parcel-dialog.component'; - -@Component({ - selector: 'app-other-parcel-confirmation-dialog', - templateUrl: './other-parcel-confirmation-dialog.component.html', - styleUrls: ['./other-parcel-confirmation-dialog.component.scss'], -}) -export class OtherParcelConfirmationDialogComponent { - stepIdx = 0; - - warningStep = ApplicationParcelDeleteStepsEnum.warning; - confirmationStep = ApplicationParcelDeleteStepsEnum.confirmation; - - constructor(private dialogRef: MatDialogRef<OtherParcelConfirmationDialogComponent>) {} - - async next() { - this.stepIdx += 1; - } - - async back() { - this.stepIdx -= 1; - } - - async onCancel(dialogResult: boolean = false) { - this.dialogRef.close(dialogResult); - } - - async onDelete() { - this.onCancel(true); - } -} diff --git a/portal-frontend/src/app/features/applications/edit-submission/other-parcels/other-parcels.component.html b/portal-frontend/src/app/features/applications/edit-submission/other-parcels/other-parcels.component.html index a0907a1dcf..5727f45fb1 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/other-parcels/other-parcels.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/other-parcels/other-parcels.component.html @@ -1,120 +1,74 @@ <section> - <h2>Other Parcels in the Community</h2> + <h2>Other Owned Parcels</h2> <div class="step-description"> <div> - <p> - Identify all ownerships or leases of other lands (ALR or non-ALR) within the community where the parcel(s) under - application are located and owned by the following owners: - </p> - <ul> - <li *ngIf="owners.length === 0">No owners found</li> - <li *ngFor="let owner of owners">{{ owner.displayName }}</li> - </ul> <p>*All fields are required unless stated optional.</p> </div> </div> - - <p *ngIf="hasCrownLandParcels"> - For applications involving Crown Land, it is not required to indicate other parcel(s) owned by the Crown.<br /> - However we encourage applicants to use the proposal section of this application to indicate their interest - (ownership or lease) in any other land in the community where the application parcel(s) is located. - </p> - <form [formGroup]="otherParcelsForm" class="other-parcels-form"> <div class="full-row"> - <div for="hasOtherParcelsInCommunity"> - <b> - Does any of the parcel owners hold an interest (ownership or lease) in any other land (ALR or non-ALR) within - the <em>community</em> where the application parcel(s) is located? - </b> - </div> + <mat-label for="has-other-parcels"> + Do any of the land owners added previously own or lease other parcels that might inform this application + process? + </mat-label> <mat-button-toggle-group class="input" - id="hasOtherParcelsInCommunity" - formControlName="hasOtherParcelsInCommunity" - (change)="onHasOtherParcelsInCommunityChange($event)" + id="has-other-parcels" + [formControl]="hasOtherParcelsInCommunity" + (change)="onChangeOtherParcels($event)" > <mat-button-toggle - value="true" + class="toggle-button" [ngClass]="{ 'error-outline': hasOtherParcelsInCommunity.invalid && (hasOtherParcelsInCommunity.dirty || hasOtherParcelsInCommunity.touched) }" - >Yes</mat-button-toggle - > + value="true" + >Yes + </mat-button-toggle> <mat-button-toggle - value="false" + class="toggle-button" [ngClass]="{ 'error-outline': hasOtherParcelsInCommunity.invalid && (hasOtherParcelsInCommunity.dirty || hasOtherParcelsInCommunity.touched) }" - >No</mat-button-toggle - > + value="false" + >No + </mat-button-toggle> </mat-button-toggle-group> + </div> + <div class="full-row"> + <label for="otherParcelsDescription"> + Describe the other parcels including their location, who owns or leases them, and their use. + </label> + <div class="subtext">Be specific and provide the civic address or PID where possible.</div> + <mat-form-field class="display-block" appearance="outline"> + <textarea + #otherParcelsDescriptionText + id="otherParcelsDescription" + matInput + [formControl]="otherParcelsDescription" + rows="4" + maxlength="4000" + ></textarea> + </mat-form-field> <div - *ngIf=" - hasOtherParcelsInCommunity.invalid && (hasOtherParcelsInCommunity.dirty || hasOtherParcelsInCommunity.touched) - " + *ngIf="otherParcelsDescription.invalid && (otherParcelsDescription.dirty || otherParcelsDescription.touched)" class="field-error" > <mat-icon>warning</mat-icon> - <div *ngIf="hasOtherParcelsInCommunity.errors?.['required']">This field is required</div> + <div *ngIf="otherParcelsDescription.errors?.['required']">This field is required</div> </div> - </div> - <div class="full-row"> - <mat-expansion-panel - *ngFor="let parcel of otherParcels; let parcelInd = index" - [expanded]=" - hasOtherParcelsInCommunity.value !== 'false' && - (otherParcels.length < 2 || (newParcelAdded && parcelInd === otherParcels.length - 1)) - " - > - <mat-expansion-panel-header> - <mat-panel-title> Other Parcel {{ getLetterIndex(parcelInd) }} Details</mat-panel-title> - </mat-expansion-panel-header> - <app-parcel-entry - [parcel]="parcel" - [$owners]="$owners" - [fileId]="fileId" - [submissionUuid]="submissionUuid" - [enableOwners]="true" - [enableCertificateOfTitleUpload]="false" - [enableUserSignOff]="false" - [enableAddNewOwner]="false" - [showErrors]="showErrors" - [disabled]="formDisabled" - (onFormGroupChange)="onParcelFormChange($event)" - ></app-parcel-entry> - <div> - <div class="flex-evenly-wrap parcel-buttons-wrappers"> - <button - class="margin-top-1-half" - mat-stroked-button - color="primary" - (click)="onSave()" - [disabled]="formDisabled" - > - Save Parcel {{ getLetterIndex(parcelInd) }} Details - </button> - <button - class="margin-top-1-half" - *ngIf="otherParcels.length > 1" - mat-stroked-button - color="accent" - (click)="onDelete(parcel.uuid, parcelInd + 1)" - > - Delete Parcel {{ getLetterIndex(parcelInd) }} Details - </button> - </div> - </div> - </mat-expansion-panel> - <div> - <button mat-stroked-button color="primary" [disabled]="formDisabled" (click)="onAddParcel()"> - Add another parcel - </button> + <div class="subtext"> + Example 1: PID 112-345-678 in Kelowna partially owned by Jane Doe, used for temporary farm worker housing. + </div> + <div class="subtext"> + Example 2: One parcel in Cranbrook fully owned by John Doe for haying and one parcel in the Regional District of + East Kootenay leased by 12345 BC LTD for grazing. </div> + <div class="subtext">Characters left: {{ 4000 - otherParcelsDescriptionText.textLength }}</div> </div> </form> </section> diff --git a/portal-frontend/src/app/features/applications/edit-submission/other-parcels/other-parcels.component.spec.ts b/portal-frontend/src/app/features/applications/edit-submission/other-parcels/other-parcels.component.spec.ts index 1153e907eb..7cd2ffe377 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/other-parcels/other-parcels.component.spec.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/other-parcels/other-parcels.component.spec.ts @@ -1,13 +1,9 @@ -import { HttpClient } from '@angular/common/http'; import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { MatDialog } from '@angular/material/dialog'; -import { DeepMocked, createMock } from '@golevelup/ts-jest'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { BehaviorSubject } from 'rxjs'; -import { ApplicationParcelService } from '../../../../services/application-parcel/application-parcel.service'; import { ApplicationSubmissionDetailedDto } from '../../../../services/application-submission/application-submission.dto'; import { ApplicationSubmissionService } from '../../../../services/application-submission/application-submission.service'; -import { ToastService } from '../../../../services/toast/toast.service'; import { OtherParcelsComponent } from './other-parcels.component'; @@ -15,18 +11,10 @@ describe('OtherParcelsComponent', () => { let component: OtherParcelsComponent; let fixture: ComponentFixture<OtherParcelsComponent>; let mockApplicationService: DeepMocked<ApplicationSubmissionService>; - let mockApplicationParcelService: DeepMocked<ApplicationParcelService>; - let mockToastService: DeepMocked<ToastService>; - let mockHttpClient: DeepMocked<HttpClient>; - let mockMatDialog: DeepMocked<MatDialog>; let applicationPipe = new BehaviorSubject<ApplicationSubmissionDetailedDto | undefined>(undefined); beforeEach(async () => { mockApplicationService = createMock(); - mockApplicationParcelService = createMock(); - mockToastService = createMock(); - mockHttpClient = createMock(); - mockMatDialog = createMock(); await TestBed.configureTestingModule({ declarations: [OtherParcelsComponent], @@ -35,22 +23,6 @@ describe('OtherParcelsComponent', () => { provide: ApplicationSubmissionService, useValue: mockApplicationService, }, - { - provide: ApplicationParcelService, - useValue: mockApplicationParcelService, - }, - { - provide: ToastService, - useValue: mockToastService, - }, - { - provide: HttpClient, - useValue: mockHttpClient, - }, - { - provide: MatDialog, - useValue: mockMatDialog, - }, ], schemas: [NO_ERRORS_SCHEMA], }).compileComponents(); diff --git a/portal-frontend/src/app/features/applications/edit-submission/other-parcels/other-parcels.component.ts b/portal-frontend/src/app/features/applications/edit-submission/other-parcels/other-parcels.component.ts index e9476cdbc2..da80c30696 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/other-parcels/other-parcels.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/other-parcels/other-parcels.component.ts @@ -7,26 +7,14 @@ import { ApplicationOwnerDetailedDto, ApplicationOwnerDto, } from '../../../../services/application-owner/application-owner.dto'; -import { - ApplicationParcelDto, - ApplicationParcelUpdateDto, - PARCEL_TYPE, -} from '../../../../services/application-parcel/application-parcel.dto'; import { ApplicationParcelService } from '../../../../services/application-parcel/application-parcel.service'; import { ApplicationSubmissionDetailedDto } from '../../../../services/application-submission/application-submission.dto'; import { ApplicationSubmissionService } from '../../../../services/application-submission/application-submission.service'; import { ToastService } from '../../../../services/toast/toast.service'; -import { OWNER_TYPE } from '../../../../shared/dto/owner.dto'; import { formatBooleanToString } from '../../../../shared/utils/boolean-helper'; -import { getLetterCombinations } from '../../../../shared/utils/number-to-letter-helper'; import { parseStringToBoolean } from '../../../../shared/utils/string-helper'; import { EditApplicationSteps } from '../edit-submission.component'; -import { DeleteParcelDialogComponent } from '../parcel-details/delete-parcel/delete-parcel-dialog.component'; -import { ParcelEntryFormData } from '../parcel-details/parcel-entry/parcel-entry.component'; import { StepComponent } from '../step.partial'; -import { OtherParcelConfirmationDialogComponent } from './other-parcel-confirmation-dialog/other-parcel-confirmation-dialog.component'; - -const PLACE_HOLDER_UUID_FOR_INITIAL_PARCEL = 'placeHolderUuidForInitialParcel'; @Component({ selector: 'app-other-parcels', @@ -35,31 +23,25 @@ const PLACE_HOLDER_UUID_FOR_INITIAL_PARCEL = 'placeHolderUuidForInitialParcel'; }) export class OtherParcelsComponent extends StepComponent implements OnInit, OnDestroy { currentStep = EditApplicationSteps.OtherParcel; - fileId = ''; submissionUuid = ''; - owners: ApplicationOwnerDetailedDto[] = []; - PARCEL_TYPE = PARCEL_TYPE; hasOtherParcelsInCommunity = new FormControl<string | null>(null, [Validators.required]); + otherParcelsDescription = new FormControl<string | null>( + { + value: null, + disabled: true, + }, + [] + ); otherParcelsForm = new FormGroup({ hasOtherParcelsInCommunity: this.hasOtherParcelsInCommunity, + otherParcelsDescription: this.otherParcelsDescription, }); - otherParcels: ApplicationParcelDto[] = []; - $owners = new BehaviorSubject<ApplicationOwnerDto[]>([]); application?: ApplicationSubmissionDetailedDto; - formDisabled = true; - newParcelAdded = false; - hasCrownLandParcels = false; - parcelEntryChanged = false; - constructor( - private applicationParcelService: ApplicationParcelService, - private applicationService: ApplicationSubmissionService, - private toastService: ToastService, - private dialog: MatDialog - ) { + constructor(private applicationService: ApplicationSubmissionService) { super(); } @@ -67,222 +49,51 @@ export class OtherParcelsComponent extends StepComponent implements OnInit, OnDe this.$applicationSubmission.pipe(takeUntil(this.$destroy)).subscribe((application) => { if (application) { this.application = application; - this.fileId = application.fileNumber; this.submissionUuid = application.uuid; - const nonAgentOwners = application.owners.filter( - (owner) => ![OWNER_TYPE.AGENT, OWNER_TYPE.GOVERNMENT].includes(owner.type.code) - ); - this.owners = nonAgentOwners.map((o) => ({ - ...o, - parcels: o.parcels.filter((p) => p.parcelType === PARCEL_TYPE.OTHER), - })); - this.$owners.next(nonAgentOwners); - - this.hasCrownLandParcels = application.owners.reduce((hasCrownLand, owner) => { - return hasCrownLand || owner.parcels.some((parcel) => parcel.ownershipTypeCode === 'CRWN'); - }, false); - - this.setupOtherParcelsData(); - this.setupOtherParcelsForm(); - } - }); - - this.newParcelAdded = false; - } - async onParcelFormChange(formData: Partial<ParcelEntryFormData>) { - const parcel = this.otherParcels.find((e) => e.uuid === formData.uuid); - if (!parcel) { - this.toastService.showErrorToast('Error updating the parcel. Please refresh page and try again.'); - return; - } - - this.parcelEntryChanged = true; - - parcel.pid = formData.pid !== undefined ? formData.pid : parcel.pid; - parcel.pin = formData.pid !== undefined ? formData.pin : parcel.pin; - parcel.legalDescription = - formData.legalDescription !== undefined ? formData.legalDescription : parcel.legalDescription; - parcel.civicAddress = formData.civicAddress !== undefined ? formData.civicAddress : parcel.civicAddress; - parcel.mapAreaHectares = formData.mapArea !== undefined ? formData.mapArea : parcel.mapAreaHectares; - parcel.ownershipTypeCode = formData.parcelType !== undefined ? formData.parcelType : parcel.ownershipTypeCode; - parcel.isFarm = formData.isFarm !== undefined ? parseStringToBoolean(formData.isFarm) : parcel.isFarm; - parcel.purchasedDate = - formData.purchaseDate !== undefined ? formData.purchaseDate?.getTime() : parcel.purchasedDate; - parcel.isConfirmedByApplicant = formData.isConfirmedByApplicant || false; - parcel.crownLandOwnerType = - formData.crownLandOwnerType !== undefined ? formData.crownLandOwnerType : parcel.crownLandOwnerType; - if (formData.owners) { - parcel.owners = formData.owners; - } - } - - private async reloadApplication() { - const application = await this.applicationService.getByUuid(this.submissionUuid); - this.$applicationSubmission.next(application); - } - - private async saveProgress() { - const parcelsToUpdate: ApplicationParcelUpdateDto[] = []; - - // replace placeholder uuid with the real one before saving - await this.replacePlaceholderParcel(); + this.otherParcelsForm.patchValue({ + hasOtherParcelsInCommunity: formatBooleanToString(application.hasOtherParcelsInCommunity), + otherParcelsDescription: application.otherParcelsDescription ?? null, + }); - if (this.parcelEntryChanged) { - // delete all OTHER parcels if user answered 'NO' on 'Is there other parcels in the community' - if (!parseStringToBoolean(this.hasOtherParcelsInCommunity.getRawValue())) { - if (this.otherParcels.some((e) => e.uuid !== PLACE_HOLDER_UUID_FOR_INITIAL_PARCEL)) { - await this.applicationParcelService.deleteMany( - this.otherParcels.filter((e) => e.uuid !== PLACE_HOLDER_UUID_FOR_INITIAL_PARCEL).map((e) => e.uuid) - ); + if (application.hasOtherParcelsInCommunity) { + this.otherParcelsDescription.enable(); + this.otherParcelsDescription.setValidators([Validators.required]); } - return; - } - - for (const parcel of this.otherParcels) { - parcelsToUpdate.push({ - uuid: parcel.uuid, - pid: parcel.pid?.toString() || null, - pin: parcel.pin?.toString() || null, - legalDescription: parcel.legalDescription, - civicAddress: parcel.civicAddress, - isFarm: parcel.isFarm, - purchasedDate: parcel.purchasedDate, - mapAreaHectares: parcel.mapAreaHectares, - ownershipTypeCode: parcel.ownershipTypeCode, - crownLandOwnerType: parcel.crownLandOwnerType, - isConfirmedByApplicant: false, - ownerUuids: parcel.owners.map((owner) => owner.uuid), - }); + if (this.showErrors) { + this.otherParcelsForm.markAllAsTouched(); + } } - - await this.applicationParcelService.update(parcelsToUpdate); - } - } - - async onSave() { - await this.saveProgress(); - } - - async onAddParcel() { - const parcel = await this.applicationParcelService.create(this.submissionUuid, PARCEL_TYPE.OTHER); - - if (parcel) { - await this.replacePlaceholderParcel(); - - this.otherParcels.push({ - uuid: parcel!.uuid, - parcelType: PARCEL_TYPE.OTHER, - owners: [], - isConfirmedByApplicant: false, - }); - - this.newParcelAdded = true; - } else { - this.toastService.showErrorToast('Error adding new parcel. Please refresh the page and try again.'); - } - } - - addPlaceHolderParcel() { - this.otherParcels.push({ - uuid: PLACE_HOLDER_UUID_FOR_INITIAL_PARCEL, - parcelType: PARCEL_TYPE.OTHER, - owners: [], - isConfirmedByApplicant: false, }); } - async onDelete(parcelUuid: string, parcelNumber: number) { - this.dialog - .open(DeleteParcelDialogComponent, { - panelClass: 'no-padding', - disableClose: true, - data: { - parcelUuid, - parcelNumber, - }, - }) - .beforeClosed() - .subscribe(async (result) => { - if (result) { - await this.reloadApplication(); - } + async saveProgress() { + if (this.otherParcelsForm.dirty) { + const formValues = this.otherParcelsForm.getRawValue(); + const updatedSubmission = await this.applicationService.updatePending(this.submissionUuid, { + hasOtherParcelsInCommunity: parseStringToBoolean(formValues.hasOtherParcelsInCommunity), + otherParcelsDescription: formValues.otherParcelsDescription, }); - } - - setupOtherParcelsForm() { - if (this.application) { - this.formDisabled = !this.application.hasOtherParcelsInCommunity ?? true; - - this.otherParcelsForm.patchValue({ - hasOtherParcelsInCommunity: formatBooleanToString(this.application.hasOtherParcelsInCommunity), - }); - - if (this.showErrors) { - this.otherParcelsForm.markAllAsTouched(); + if (updatedSubmission) { + this.$applicationSubmission.next(updatedSubmission); } } } - async setupOtherParcelsData() { - const parcels = (await this.applicationParcelService.fetchBySubmissionUuid(this.submissionUuid)) || []; - this.otherParcels = parcels.filter((p) => p.parcelType === PARCEL_TYPE.OTHER); - if (!this.otherParcels || this.otherParcels.length === 0) { - this.addPlaceHolderParcel(); - } + async onSave() { + await this.saveProgress(); } - async onHasOtherParcelsInCommunityChange($event: MatButtonToggleChange) { - const parsedHasParcels = parseStringToBoolean($event.value); - - if ( - parsedHasParcels === false && - (this.otherParcels.some((e) => e.uuid !== PLACE_HOLDER_UUID_FOR_INITIAL_PARCEL) || this.parcelEntryChanged) - ) { - this.dialog - .open(OtherParcelConfirmationDialogComponent, { - panelClass: 'no-padding', - disableClose: true, - }) - .beforeClosed() - .subscribe(async (result) => { - if (result) { - this.hasOtherParcelsInCommunity.patchValue('false'); - this.formDisabled = true; - await this.setHasOtherParcelsInCommunity(false); - await this.saveProgress(); - await this.reloadApplication(); - this.parcelEntryChanged = false; - } else { - this.hasOtherParcelsInCommunity.patchValue('true'); - this.formDisabled = false; - } - }); + onChangeOtherParcels($event: MatButtonToggleChange) { + if ($event.value === 'true') { + this.otherParcelsDescription.enable(); + this.otherParcelsDescription.setValidators([Validators.required]); } else { - this.formDisabled = !parsedHasParcels ?? true; - await this.setHasOtherParcelsInCommunity(parsedHasParcels); - } - } - - private async setHasOtherParcelsInCommunity(value?: boolean | null) { - await this.applicationService.updatePending(this.submissionUuid, { - hasOtherParcelsInCommunity: value, - }); - await this.reloadApplication(); - } - - async replacePlaceholderParcel() { - const placeHolderParcel = this.otherParcels.find((p) => p.uuid === PLACE_HOLDER_UUID_FOR_INITIAL_PARCEL); - - if (placeHolderParcel && parseStringToBoolean(this.hasOtherParcelsInCommunity.getRawValue())) { - const parcel = await this.applicationParcelService.create(this.submissionUuid, PARCEL_TYPE.OTHER); - if (parcel) { - placeHolderParcel.uuid = parcel.uuid; - } + this.otherParcelsDescription.setValue(null); + this.otherParcelsDescription.disable(); + this.otherParcelsDescription.setValidators([]); } - } - getLetterIndex(num: number) { - return getLetterCombinations(num); + this.otherParcelsForm.updateValueAndValidity(); } } diff --git a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-details.component.ts b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-details.component.ts index 934eb587a9..e517e33776 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-details.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-details.component.ts @@ -7,7 +7,6 @@ import { ApplicationOwnerService } from '../../../../services/application-owner/ import { ApplicationParcelDto, ApplicationParcelUpdateDto, - PARCEL_TYPE, } from '../../../../services/application-parcel/application-parcel.dto'; import { ApplicationParcelService } from '../../../../services/application-parcel/application-parcel.service'; import { ToastService } from '../../../../services/toast/toast.service'; @@ -65,8 +64,7 @@ export class ParcelDetailsComponent extends StepComponent implements OnInit, Aft } async loadParcels() { - const parcels = (await this.applicationParcelService.fetchBySubmissionUuid(this.submissionUuid)) || []; - this.parcels = parcels.filter((p) => p.parcelType === PARCEL_TYPE.APPLICATION); + this.parcels = (await this.applicationParcelService.fetchBySubmissionUuid(this.submissionUuid)) || []; if (!this.parcels || this.parcels.length === 0) { await this.onAddParcel(); } @@ -78,7 +76,6 @@ export class ParcelDetailsComponent extends StepComponent implements OnInit, Aft if (parcel) { this.parcels.push({ uuid: parcel!.uuid, - parcelType: PARCEL_TYPE.APPLICATION, owners: [], isConfirmedByApplicant: false, }); @@ -103,7 +100,6 @@ export class ParcelDetailsComponent extends StepComponent implements OnInit, Aft formData.legalDescription !== undefined ? formData.legalDescription : parcel.legalDescription; parcel.mapAreaHectares = formData.mapArea !== undefined ? formData.mapArea : parcel.mapAreaHectares; - parcel.ownershipTypeCode = formData.parcelType !== undefined ? formData.parcelType : parcel.ownershipTypeCode; parcel.isFarm = formData.isFarm !== undefined ? parseStringToBoolean(formData.isFarm) : parcel.isFarm; parcel.purchasedDate = formData.purchaseDate !== undefined ? formData.purchaseDate?.getTime() : parcel.purchasedDate; @@ -156,7 +152,7 @@ export class ParcelDetailsComponent extends StepComponent implements OnInit, Aft .beforeClosed() .subscribe((result) => { if (result) { - this.parcels = this.parcels.filter(parcel => parcel.uuid !== parcelUuid); + this.parcels = this.parcels.filter((parcel) => parcel.uuid !== parcelUuid); } }); } diff --git a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.spec.ts b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.spec.ts index 6a60718b05..e372791f7d 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.spec.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.spec.ts @@ -25,7 +25,6 @@ describe('ParcelEntryComponent', () => { let mockParcel: ApplicationParcelDto = { isConfirmedByApplicant: false, - parcelType: '', uuid: '', owners: [], }; diff --git a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts index 4ea4c2121b..832d2b3e84 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts @@ -106,7 +106,6 @@ export class ParcelEntryComponent implements OnInit { ownerInput = new FormControl<string | null>(null); - DOCUMENT_TYPES = DOCUMENT_TYPE; PARCEL_OWNERSHIP_TYPES = PARCEL_OWNERSHIP_TYPE; maxPurchasedDate = new Date(); @@ -200,7 +199,7 @@ export class ParcelEntryComponent implements OnInit { this.isFarm.value || this.civicAddress.value || this.parcel.owners.length > 0; - + const changeParcelType = () => { if ($event.value === this.PARCEL_OWNERSHIP_TYPES.CROWN) { this.searchBy.setValue(null); @@ -333,7 +332,7 @@ export class ParcelEntryComponent implements OnInit { } private isOwnerInParcel(owner: ApplicationOwnerDto): boolean { - return this.parcel.owners.some(existingOwner => existingOwner.uuid === owner.uuid); + return this.parcel.owners.some((existingOwner) => existingOwner.uuid === owner.uuid); } async onSelectOwner(event: Event, owner: ApplicationOwnerDto, isSelected: boolean) { diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.ts index 4466365e89..8149f2a71a 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.ts @@ -6,7 +6,6 @@ import { Router } from '@angular/router'; import { takeUntil } from 'rxjs'; import { ApplicationDocumentDto } from '../../../../../services/application-document/application-document.dto'; import { ApplicationDocumentService } from '../../../../../services/application-document/application-document.service'; -import { PARCEL_TYPE } from '../../../../../services/application-parcel/application-parcel.dto'; import { ApplicationParcelService } from '../../../../../services/application-parcel/application-parcel.service'; import { ApplicationSubmissionUpdateDto, @@ -204,7 +203,6 @@ export class SubdProposalComponent extends FilesStepComponent implements OnInit, const parcels = await this.parcelService.fetchBySubmissionUuid(submissionUuid); if (parcels) { this.totalTargetAcres = parcels - .filter((parcel) => parcel.parcelType === PARCEL_TYPE.APPLICATION) .reduce((total, parcel) => total + (parcel.mapAreaHectares ? parseFloat(parcel.mapAreaHectares) : 0), 0) .toFixed(5); } diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.ts b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.ts index e4105b04ac..7ef8d9e5e8 100644 --- a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.ts @@ -1,7 +1,6 @@ import { Component, Input, OnDestroy, OnInit } from '@angular/core'; import { Router } from '@angular/router'; import { BehaviorSubject, Subject, takeUntil } from 'rxjs'; -import { PARCEL_TYPE } from '../../../services/application-parcel/application-parcel.dto'; import { LocalGovernmentDto } from '../../../services/code/code.dto'; import { CodeService } from '../../../services/code/code.service'; import { NoticeOfIntentDocumentDto } from '../../../services/notice-of-intent-document/notice-of-intent-document.dto'; @@ -25,7 +24,6 @@ export class NoticeOfIntentDetailsComponent implements OnInit, OnDestroy { @Input() showEdit = true; @Input() draftMode = false; - parcelType = PARCEL_TYPE; noiSubmission: NoticeOfIntentSubmissionDetailedDto | undefined; primaryContact: NoticeOfIntentOwnerDto | undefined; localGovernment: LocalGovernmentDto | undefined; diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/parcel/parcel.component.ts b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/parcel/parcel.component.ts index c4d761e41e..accce22e7d 100644 --- a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/parcel/parcel.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/parcel/parcel.component.ts @@ -14,7 +14,6 @@ import { NoticeOfIntentParcelService } from '../../../../services/notice-of-inte import { NoticeOfIntentSubmissionDetailedDto } from '../../../../services/notice-of-intent-submission/notice-of-intent-submission.dto'; import { BaseCodeDto } from '../../../../shared/dto/base.dto'; import { formatBooleanToYesNoString } from '../../../../shared/utils/boolean-helper'; -import { getLetterCombinations } from '../../../../shared/utils/number-to-letter-helper'; export class NoticeOfIntentParcelBasicValidation { // indicates general validity check state, including owner related information @@ -182,8 +181,4 @@ export class ParcelComponent { await this.router.navigateByUrl(`notice-of-intent/${this.fileId}/edit/0?parcelUuid=${uuid}&errors=t`); } } - - getLetterIndex(num: number) { - return getLetterCombinations(num); - } } diff --git a/portal-frontend/src/app/features/notifications/notification-details/notification-details.component.ts b/portal-frontend/src/app/features/notifications/notification-details/notification-details.component.ts index ff6fdc05f1..f21c0a467d 100644 --- a/portal-frontend/src/app/features/notifications/notification-details/notification-details.component.ts +++ b/portal-frontend/src/app/features/notifications/notification-details/notification-details.component.ts @@ -1,7 +1,6 @@ import { Component, Input, OnDestroy, OnInit } from '@angular/core'; import { Router } from '@angular/router'; import { BehaviorSubject, Subject, takeUntil } from 'rxjs'; -import { PARCEL_TYPE } from '../../../services/application-parcel/application-parcel.dto'; import { LocalGovernmentDto } from '../../../services/code/code.dto'; import { CodeService } from '../../../services/code/code.service'; import { NotificationDocumentDto } from '../../../services/notification-document/notification-document.dto'; @@ -23,7 +22,6 @@ export class NotificationDetailsComponent implements OnInit, OnDestroy { @Input() showErrors = true; @Input() showEdit = true; - parcelType = PARCEL_TYPE; notificationSubmission: NotificationSubmissionDetailedDto | undefined; localGovernment: LocalGovernmentDto | undefined; otherFiles: NotificationDocumentDto[] = []; diff --git a/portal-frontend/src/app/features/public/application/submission/submission-details.component.ts b/portal-frontend/src/app/features/public/application/submission/submission-details.component.ts index 7362fd5649..764a5a8260 100644 --- a/portal-frontend/src/app/features/public/application/submission/submission-details.component.ts +++ b/portal-frontend/src/app/features/public/application/submission/submission-details.component.ts @@ -1,6 +1,5 @@ import { Component, Input, OnDestroy, OnInit } from '@angular/core'; import { Subject } from 'rxjs'; -import { PARCEL_TYPE } from '../../../../services/application-parcel/application-parcel.dto'; import { LocalGovernmentDto } from '../../../../services/code/code.dto'; import { CodeService } from '../../../../services/code/code.service'; import { PublicApplicationSubmissionDto } from '../../../../services/public/public-application.dto'; @@ -20,7 +19,6 @@ export class SubmissionDetailsComponent implements OnInit, OnDestroy { @Input() applicationParcels: PublicParcelDto[] = []; @Input() transferees: PublicOwnerDto[] = []; - parcelType = PARCEL_TYPE; primaryContact: PublicOwnerDto | undefined; localGovernment: LocalGovernmentDto | undefined; OWNER_TYPE = OWNER_TYPE; diff --git a/portal-frontend/src/app/features/public/notice-of-intent/submission/submission-details.component.ts b/portal-frontend/src/app/features/public/notice-of-intent/submission/submission-details.component.ts index 1d21cf83fc..ca1191f0a1 100644 --- a/portal-frontend/src/app/features/public/notice-of-intent/submission/submission-details.component.ts +++ b/portal-frontend/src/app/features/public/notice-of-intent/submission/submission-details.component.ts @@ -1,6 +1,5 @@ import { Component, Input, OnDestroy, OnInit } from '@angular/core'; import { Subject } from 'rxjs'; -import { PARCEL_TYPE } from '../../../../services/application-parcel/application-parcel.dto'; import { LocalGovernmentDto } from '../../../../services/code/code.dto'; import { CodeService } from '../../../../services/code/code.service'; import { PublicNoticeOfIntentSubmissionDto } from '../../../../services/public/public-notice-of-intent.dto'; @@ -19,7 +18,6 @@ export class SubmissionDetailsComponent implements OnInit, OnDestroy { @Input() documents: PublicDocumentDto[] = []; @Input() parcels: PublicParcelDto[] = []; - parcelType = PARCEL_TYPE; primaryContact: PublicOwnerDto | undefined; localGovernment: LocalGovernmentDto | undefined; OWNER_TYPE = OWNER_TYPE; diff --git a/portal-frontend/src/app/features/public/notification/submission/submission-details.component.ts b/portal-frontend/src/app/features/public/notification/submission/submission-details.component.ts index d678595191..411240fd63 100644 --- a/portal-frontend/src/app/features/public/notification/submission/submission-details.component.ts +++ b/portal-frontend/src/app/features/public/notification/submission/submission-details.component.ts @@ -1,12 +1,9 @@ import { Component, Input, OnDestroy, OnInit } from '@angular/core'; import { Subject } from 'rxjs'; -import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; -import { PARCEL_TYPE } from '../../../../services/application-parcel/application-parcel.dto'; import { LocalGovernmentDto } from '../../../../services/code/code.dto'; import { CodeService } from '../../../../services/code/code.service'; import { PublicNotificationSubmissionDto } from '../../../../services/public/public-notification.dto'; import { PublicDocumentDto, PublicOwnerDto, PublicParcelDto } from '../../../../services/public/public.dto'; -import { PublicService } from '../../../../services/public/public.service'; import { OWNER_TYPE } from '../../../../shared/dto/owner.dto'; @Component({ @@ -21,7 +18,6 @@ export class SubmissionDetailsComponent implements OnInit, OnDestroy { @Input() documents: PublicDocumentDto[] = []; @Input() parcels: PublicParcelDto[] = []; - parcelType = PARCEL_TYPE; primaryContact: PublicOwnerDto | undefined; localGovernment: LocalGovernmentDto | undefined; OWNER_TYPE = OWNER_TYPE; diff --git a/portal-frontend/src/app/services/application-parcel/application-parcel.dto.ts b/portal-frontend/src/app/services/application-parcel/application-parcel.dto.ts index 731ebf9fd3..40037112d0 100644 --- a/portal-frontend/src/app/services/application-parcel/application-parcel.dto.ts +++ b/portal-frontend/src/app/services/application-parcel/application-parcel.dto.ts @@ -18,17 +18,11 @@ export interface ApplicationParcelUpdateDto { } export interface ApplicationParcelDto extends Omit<ApplicationParcelUpdateDto, 'ownerUuids'> { - parcelType: string; ownershipType?: BaseCodeDto; owners: ApplicationOwnerDto[]; certificateOfTitle?: ApplicationDocumentDto; } -export enum PARCEL_TYPE { - APPLICATION = 'application', - OTHER = 'other', -} - export enum PARCEL_OWNERSHIP_TYPE { FEE_SIMPLE = 'SMPL', CROWN = 'CRWN', diff --git a/portal-frontend/src/app/services/application-parcel/application-parcel.service.ts b/portal-frontend/src/app/services/application-parcel/application-parcel.service.ts index 1f11350c22..7d2ce90835 100644 --- a/portal-frontend/src/app/services/application-parcel/application-parcel.service.ts +++ b/portal-frontend/src/app/services/application-parcel/application-parcel.service.ts @@ -7,7 +7,7 @@ import { OverlaySpinnerService } from '../../shared/overlay-spinner/overlay-spin import { ApplicationDocumentDto } from '../application-document/application-document.dto'; import { DocumentService } from '../document/document.service'; import { ToastService } from '../toast/toast.service'; -import { ApplicationParcelDto, ApplicationParcelUpdateDto, PARCEL_TYPE } from './application-parcel.dto'; +import { ApplicationParcelDto, ApplicationParcelUpdateDto } from './application-parcel.dto'; @Injectable({ providedIn: 'root', @@ -34,12 +34,11 @@ export class ApplicationParcelService { return undefined; } - async create(applicationSubmissionUuid: string, parcelType?: PARCEL_TYPE, ownerUuid?: string) { + async create(applicationSubmissionUuid: string, ownerUuid?: string) { try { return await firstValueFrom( this.httpClient.post<ApplicationParcelDto>(`${this.serviceUrl}`, { applicationSubmissionUuid, - parcelType, ownerUuid, }) ); diff --git a/portal-frontend/src/app/services/application-submission/application-submission.dto.ts b/portal-frontend/src/app/services/application-submission/application-submission.dto.ts index f80d2ac436..d731d21389 100644 --- a/portal-frontend/src/app/services/application-submission/application-submission.dto.ts +++ b/portal-frontend/src/app/services/application-submission/application-submission.dto.ts @@ -63,6 +63,7 @@ export interface ApplicationSubmissionDto { export interface ApplicationSubmissionDetailedDto extends ApplicationSubmissionDto { primaryContactOwnerUuid?: string; + otherParcelsDescription?: string | null; parcelsAgricultureDescription?: string | null; parcelsAgricultureImprovementDescription?: string | null; @@ -174,6 +175,7 @@ export interface ApplicationSubmissionUpdateDto { typeCode?: string; primaryContactOwnerUuid?: string; hasOtherParcelsInCommunity?: boolean | null; + otherParcelsDescription?: string | null; //Land use fields parcelsAgricultureDescription?: string | null; diff --git a/portal-frontend/src/app/services/public/public.dto.ts b/portal-frontend/src/app/services/public/public.dto.ts index 25f4aa3f8d..edb3eda78a 100644 --- a/portal-frontend/src/app/services/public/public.dto.ts +++ b/portal-frontend/src/app/services/public/public.dto.ts @@ -35,7 +35,6 @@ export interface PublicParcelDto { ownershipTypeCode?: string | null; crownLandOwnerType?: string | null; ownershipType?: BaseCodeDto; - parcelType: string; alrArea: number | null; owners: PublicOwnerDto[]; } diff --git a/portal-frontend/src/app/shared/utils/number-to-letter-helper.ts b/portal-frontend/src/app/shared/utils/number-to-letter-helper.ts deleted file mode 100644 index 4ee2c715f8..0000000000 --- a/portal-frontend/src/app/shared/utils/number-to-letter-helper.ts +++ /dev/null @@ -1,22 +0,0 @@ -// A B C D E F G H I J K L M N O P Q R S T U V W X Y Z -// AA AB AC AD AE .... - -export const getLetterCombinations = (num: number): string => { - let result = ''; - let quotient = num + 1; - - while (quotient > 0) { - let remainder = quotient % 26; - - let letter = String.fromCharCode(remainder + 64); - if (remainder === 0) { - letter = 'Z'; - quotient--; - } - - result = letter + result; - quotient = Math.floor((quotient - 1) / 26); - } - - return result; -}; diff --git a/services/apps/alcs/src/alcs/search/application/application-advanced-search.service.ts b/services/apps/alcs/src/alcs/search/application/application-advanced-search.service.ts index 60bac78e15..9b8533ef8d 100644 --- a/services/apps/alcs/src/alcs/search/application/application-advanced-search.service.ts +++ b/services/apps/alcs/src/alcs/search/application/application-advanced-search.service.ts @@ -166,13 +166,9 @@ export class ApplicationAdvancedSearchService { } query = this.compileApplicationSearchByNameQuery(searchDto, query); - query = this.compileApplicationParcelSearchQuery(searchDto, query); - query = this.compileApplicationDecisionSearchQuery(searchDto, query); - query = this.compileApplicationFileTypeSearchQuery(searchDto, query); - query = this.compileApplicationDateRangeSearchQuery(searchDto, query); return query; @@ -265,19 +261,11 @@ export class ApplicationAdvancedSearchService { searchDto: SearchRequestDto, query: SelectQueryBuilder<ApplicationSubmissionSearchView>, ) { - if (searchDto.pid || searchDto.civicAddress) { - query = query.leftJoin( - ApplicationParcel, - 'parcel', - "parcel.application_submission_uuid = appSearch.uuid AND parcel.parcel_type IN ('application', 'other')", - ); - } else { - query = query.leftJoin( - ApplicationParcel, - 'parcel', - "parcel.application_submission_uuid = appSearch.uuid AND parcel.parcel_type = 'application'", - ); - } + query = query.leftJoin( + ApplicationParcel, + 'parcel', + 'parcel.application_submission_uuid = appSearch.uuid', + ); if (searchDto.pid) { query = query.andWhere('parcel.pid = :pid', { pid: searchDto.pid }); diff --git a/services/apps/alcs/src/portal/application-submission-draft/application-submission-draft.service.ts b/services/apps/alcs/src/portal/application-submission-draft/application-submission-draft.service.ts index 61468ad253..ab62cb9f1d 100644 --- a/services/apps/alcs/src/portal/application-submission-draft/application-submission-draft.service.ts +++ b/services/apps/alcs/src/portal/application-submission-draft/application-submission-draft.service.ts @@ -96,9 +96,8 @@ export class ApplicationSubmissionDraftService { parcels: [], owners: [], }); - const savedSubmission = await this.applicationSubmissionRepository.save( - newSubmission, - ); + const savedSubmission = + await this.applicationSubmissionRepository.save(newSubmission); const statuses = await this.applicationSubmissionStatusService.getCopiedStatuses( originalSubmission.uuid, @@ -135,7 +134,6 @@ export class ApplicationSubmissionDraftService { for (const parcel of originalSubmission.parcels) { const savedParcel = await this.applicationParcelService.create( savedSubmission.uuid, - parcel.parcelType, ); updateDtos.push({ ...parcel, diff --git a/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.service.spec.ts b/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.service.spec.ts index 5e10f37e71..88afbeb092 100644 --- a/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.service.spec.ts +++ b/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.service.spec.ts @@ -6,7 +6,6 @@ import { ApplicationDocument } from '../../../alcs/application/application-docum import { ApplicationDocumentService } from '../../../alcs/application/application-document/application-document.service'; import { ApplicationService } from '../../../alcs/application/application.service'; import { OwnerType } from '../../../common/owner-type/owner-type.entity'; -import { PARCEL_TYPE } from '../application-parcel/application-parcel.dto'; import { ApplicationParcel } from '../application-parcel/application-parcel.entity'; import { ApplicationParcelService } from '../application-parcel/application-parcel.service'; import { ApplicationSubmission } from '../application-submission.entity'; @@ -232,7 +231,6 @@ describe('ApplicationOwnerService', () => { mockParcelService.fetchByApplicationSubmissionUuid.mockResolvedValue([ new ApplicationParcel({ owners, - parcelType: PARCEL_TYPE.APPLICATION, }), ]); @@ -271,7 +269,6 @@ describe('ApplicationOwnerService', () => { mockParcelService.fetchByApplicationSubmissionUuid.mockResolvedValue([ new ApplicationParcel({ owners, - parcelType: PARCEL_TYPE.APPLICATION, }), ]); @@ -303,7 +300,6 @@ describe('ApplicationOwnerService', () => { mockParcelService.fetchByApplicationSubmissionUuid.mockResolvedValue([ new ApplicationParcel({ owners, - parcelType: PARCEL_TYPE.APPLICATION, }), ]); @@ -337,12 +333,10 @@ describe('ApplicationOwnerService', () => { new ApplicationParcel({ owners: owners1, auditCreatedAt: new Date(1), - parcelType: PARCEL_TYPE.APPLICATION, }), new ApplicationParcel({ owners: owners2, auditCreatedAt: new Date(100), - parcelType: PARCEL_TYPE.APPLICATION, }), ]); diff --git a/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.service.ts b/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.service.ts index 79962e0822..677a51fca5 100644 --- a/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.service.ts +++ b/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.service.ts @@ -8,7 +8,6 @@ import { OwnerType, } from '../../../common/owner-type/owner-type.entity'; import { FALLBACK_APPLICANT_NAME } from '../../../utils/owner.constants'; -import { PARCEL_TYPE } from '../application-parcel/application-parcel.dto'; import { ApplicationParcelService } from '../application-parcel/application-parcel.service'; import { ApplicationSubmission } from '../application-submission.entity'; import { ApplicationSubmissionService } from '../application-submission.service'; @@ -252,16 +251,12 @@ export class ApplicationOwnerService { submissionUuid, ); - const applicationParcels = parcels.filter( - (parcel) => parcel.parcelType === PARCEL_TYPE.APPLICATION, - ); - - if (applicationParcels.length > 0) { - const firstParcel = parcels - .filter((parcel) => parcel.parcelType === PARCEL_TYPE.APPLICATION) - .reduce((a, b) => (a.auditCreatedAt < b.auditCreatedAt ? a : b)); + if (parcels.length > 0) { + const firstParcel = parcels.reduce((a, b) => + a.auditCreatedAt < b.auditCreatedAt ? a : b, + ); - const ownerCount = applicationParcels.reduce((count, parcel) => { + const ownerCount = parcels.reduce((count, parcel) => { return count + parcel.owners.length; }, 0); diff --git a/services/apps/alcs/src/portal/application-submission/application-parcel/application-parcel.controller.spec.ts b/services/apps/alcs/src/portal/application-submission/application-parcel/application-parcel.controller.spec.ts index 390d1c68b1..6f06c76a62 100644 --- a/services/apps/alcs/src/portal/application-submission/application-parcel/application-parcel.controller.spec.ts +++ b/services/apps/alcs/src/portal/application-submission/application-parcel/application-parcel.controller.spec.ts @@ -123,7 +123,6 @@ describe('ApplicationParcelController', () => { controller.create({ applicationSubmissionUuid: 'fake', ownerUuid: 'fake_uuid', - parcelType: 'other', }), ).rejects.toMatchObject(mockError); diff --git a/services/apps/alcs/src/portal/application-submission/application-parcel/application-parcel.controller.ts b/services/apps/alcs/src/portal/application-submission/application-parcel/application-parcel.controller.ts index 54194dd427..32e2346aa4 100644 --- a/services/apps/alcs/src/portal/application-submission/application-parcel/application-parcel.controller.ts +++ b/services/apps/alcs/src/portal/application-submission/application-parcel/application-parcel.controller.ts @@ -67,10 +67,7 @@ export class ApplicationParcelController { const application = await this.applicationSubmissionService.getOrFailByUuid( createDto.applicationSubmissionUuid, ); - const parcel = await this.parcelService.create( - application.uuid, - createDto.parcelType, - ); + const parcel = await this.parcelService.create(application.uuid); try { if (createDto.ownerUuid) { diff --git a/services/apps/alcs/src/portal/application-submission/application-parcel/application-parcel.dto.ts b/services/apps/alcs/src/portal/application-submission/application-parcel/application-parcel.dto.ts index 1c7db97284..70af647022 100644 --- a/services/apps/alcs/src/portal/application-submission/application-parcel/application-parcel.dto.ts +++ b/services/apps/alcs/src/portal/application-submission/application-parcel/application-parcel.dto.ts @@ -55,9 +55,6 @@ export class ApplicationParcelDto { ownershipType?: ApplicationParcelOwnershipTypeDto; - @AutoMap(() => String) - parcelType: string; - @AutoMap(() => Number) alrArea: number | null; @@ -70,10 +67,6 @@ export class ApplicationParcelCreateDto { @IsString() applicationSubmissionUuid: string; - @IsOptional() - @IsString() - parcelType?: string; - @IsOptional() @IsString() ownerUuid?: string; @@ -132,11 +125,6 @@ export class ApplicationParcelUpdateDto { alrArea?: number | null; } -export enum PARCEL_TYPE { - APPLICATION = 'application', - OTHER = 'other', -} - export class AttachCertificateOfTitleDto { @IsString() mimeType: string; diff --git a/services/apps/alcs/src/portal/application-submission/application-parcel/application-parcel.entity.ts b/services/apps/alcs/src/portal/application-submission/application-parcel/application-parcel.entity.ts index 51c1ec3d8f..53feeb284f 100644 --- a/services/apps/alcs/src/portal/application-submission/application-parcel/application-parcel.entity.ts +++ b/services/apps/alcs/src/portal/application-submission/application-parcel/application-parcel.entity.ts @@ -94,16 +94,6 @@ export class ApplicationParcel extends Base { }) isConfirmedByApplicant: boolean; - @AutoMap(() => String) - @Column({ - type: 'varchar', - comment: - 'The Parcels type, "other" means parcels not related to application but related to the owner', - nullable: false, - default: 'application', - }) - parcelType?: string; - @AutoMap() @ManyToOne(() => ApplicationSubmission) applicationSubmission: ApplicationSubmission; diff --git a/services/apps/alcs/src/portal/application-submission/application-parcel/application-parcel.service.ts b/services/apps/alcs/src/portal/application-submission/application-parcel/application-parcel.service.ts index 1ecad9f688..8300d6843e 100644 --- a/services/apps/alcs/src/portal/application-submission/application-parcel/application-parcel.service.ts +++ b/services/apps/alcs/src/portal/application-submission/application-parcel/application-parcel.service.ts @@ -52,10 +52,9 @@ export class ApplicationParcelService { }); } - async create(applicationSubmissionUuid: string, parcelType?: string) { + async create(applicationSubmissionUuid: string) { const parcel = new ApplicationParcel({ applicationSubmissionUuid, - parcelType, }); return this.parcelRepository.save(parcel); diff --git a/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.spec.ts b/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.spec.ts index 937831ced7..02c99cbdd1 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.spec.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.spec.ts @@ -16,7 +16,6 @@ import { OwnerType, } from '../../common/owner-type/owner-type.entity'; import { ApplicationOwner } from './application-owner/application-owner.entity'; -import { PARCEL_TYPE } from './application-parcel/application-parcel.dto'; import { ApplicationParcel } from './application-parcel/application-parcel.entity'; import { ApplicationParcelService } from './application-parcel/application-parcel.service'; import { ApplicationSubmissionValidatorService } from './application-submission-validator.service'; @@ -117,7 +116,6 @@ describe('ApplicationSubmissionValidatorService', () => { const parcel = new ApplicationParcel({ uuid: 'parcel-1', owners: [], - parcelType: PARCEL_TYPE.APPLICATION, ownershipTypeCode: 'SMPL', }); @@ -163,7 +161,6 @@ describe('ApplicationSubmissionValidatorService', () => { const parcel = new ApplicationParcel({ uuid: 'parcel-1', owners: [], - parcelType: PARCEL_TYPE.APPLICATION, ownershipTypeCode: 'SMPL', pid: '1251251', }); @@ -193,7 +190,6 @@ describe('ApplicationSubmissionValidatorService', () => { const parcel = new ApplicationParcel({ uuid: 'parcel-1', owners: [], - parcelType: PARCEL_TYPE.APPLICATION, ownershipTypeCode: 'CRWN', pid: '12512', }); @@ -216,37 +212,6 @@ describe('ApplicationSubmissionValidatorService', () => { ).toBe(true); }); - it('should not require certificate of title for other parcels', async () => { - const applicationSubmission = new ApplicationSubmission({ - owners: [], - }); - const parcel = new ApplicationParcel({ - uuid: 'parcel-1', - owners: [], - parcelType: PARCEL_TYPE.OTHER, - }); - - mockAppParcelService.fetchByApplicationFileId.mockResolvedValue([parcel]); - - const res = await service.validateSubmission(applicationSubmission); - - expect( - includesError(res.errors, new Error(`Invalid Parcel ${parcel.uuid}`)), - ).toBe(false); - expect( - includesError( - res.errors, - new Error(`Parcel has no Owners ${parcel.uuid}`), - ), - ).toBe(true); - expect( - includesError( - res.errors, - new Error(`Parcel is missing certificate of title ${parcel.uuid}`), - ), - ).toBe(false); - }); - it('should return an error for no primary contact', async () => { const applicationSubmission = new ApplicationSubmission({ owners: [], diff --git a/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.ts b/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.ts index d0fd4028ad..e18032c81a 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.ts @@ -6,7 +6,6 @@ import { LocalGovernmentService } from '../../alcs/local-government/local-govern import { OWNER_TYPE } from '../../common/owner-type/owner-type.entity'; import { DOCUMENT_TYPE } from '../../document/document-code.entity'; import { ApplicationOwner } from './application-owner/application-owner.entity'; -import { PARCEL_TYPE } from './application-parcel/application-parcel.dto'; import { ApplicationParcel } from './application-parcel/application-parcel.entity'; import { ApplicationParcelService } from './application-parcel/application-parcel.service'; import { ApplicationSubmission } from './application-submission.entity'; @@ -16,7 +15,6 @@ export class ValidatedApplicationSubmission extends ApplicationSubmission { applicant: string; localGovernmentUuid: string; parcels: ApplicationParcel[]; - otherParcels: ApplicationParcel[]; primaryContact: ApplicationOwner; parcelsAgricultureDescription: string; parcelsAgricultureImprovementDescription: string; @@ -157,12 +155,7 @@ export class ApplicationSubmissionValidatorService { ? ({ ...applicationSubmission, primaryContact: validatedPrimaryContact, - parcels: validatedParcels.filter( - (parcel) => parcel.parcelType === PARCEL_TYPE.APPLICATION, - ), - otherParcels: validatedParcels.filter( - (parcel) => parcel.parcelType === PARCEL_TYPE.OTHER, - ), + parcels: validatedParcels, } as ValidatedApplicationSubmission) : undefined; @@ -187,6 +180,15 @@ export class ApplicationSubmissionValidatorService { ); } + if ( + applicationSubmission.hasOtherParcelsInCommunity && + !applicationSubmission.otherParcelsDescription + ) { + errors.push( + new ServiceValidationException(`Missing other parcels description`), + ); + } + for (const parcel of parcels) { if ( parcel.ownershipTypeCode === null || @@ -194,8 +196,7 @@ export class ApplicationSubmissionValidatorService { parcel.mapAreaHectares === null || parcel.civicAddress === null || parcel.isFarm === null || - (!parcel.isConfirmedByApplicant && - parcel.parcelType === PARCEL_TYPE.APPLICATION) + !parcel.isConfirmedByApplicant ) { errors.push( new ServiceValidationException(`Invalid Parcel ${parcel.uuid}`), @@ -241,7 +242,6 @@ export class ApplicationSubmissionValidatorService { } if ( - parcel.parcelType === PARCEL_TYPE.APPLICATION && !parcel.certificateOfTitle && (parcel.ownershipTypeCode === 'SMPL' || parcel.pid) ) { diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.dto.ts b/services/apps/alcs/src/portal/application-submission/application-submission.dto.ts index 2fdca38134..bbf1a71c0a 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.dto.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.dto.ts @@ -16,7 +16,6 @@ import { import { BaseCodeDto } from '../../common/dtos/base.dto'; import { ApplicationOwnerDto } from './application-owner/application-owner.dto'; import { ProposedLot } from './application-submission.entity'; -import { CovenantTransfereeDto } from './covenant-transferee/covenant-transferee.dto'; export const MAX_DESCRIPTION_FIELD_LENGTH = 4000; @@ -68,6 +67,8 @@ export class ApplicationSubmissionDto { export class ApplicationSubmissionDetailedDto extends ApplicationSubmissionDto { @AutoMap(() => String) purpose: string | null; + @AutoMap(() => String) + otherParcelsDescription?: string | null; @AutoMap() parcelsAgricultureDescription: string; @AutoMap() @@ -352,6 +353,11 @@ export class ApplicationSubmissionUpdateDto { @MaxLength(MAX_DESCRIPTION_FIELD_LENGTH) purpose?: string; + @IsString() + @IsOptional() + @MaxLength(MAX_DESCRIPTION_FIELD_LENGTH) + otherParcelsDescription?: string | null; + @IsUUID() @IsOptional() localGovernmentUuid?: string; diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts b/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts index e0e3929b07..d019f133c6 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts @@ -212,6 +212,15 @@ export class ApplicationSubmission extends Base { }) hasOtherParcelsInCommunity?: boolean | null; + @AutoMap(() => String) + @Column({ + type: 'text', + comment: + 'Stores the data user entered about other parcels in their community', + nullable: true, + }) + otherParcelsDescription?: string; + //NFU Specific Fields @AutoMap(() => Number) @Column({ diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.service.ts b/services/apps/alcs/src/portal/application-submission/application-submission.service.ts index aeed05d228..9071193351 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.service.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.service.ts @@ -183,6 +183,10 @@ export class ApplicationSubmissionService { updateDto.prescribedBody, updateDto.prescribedBody, ); + applicationSubmission.otherParcelsDescription = filterUndefined( + updateDto.otherParcelsDescription, + applicationSubmission.otherParcelsDescription, + ); this.setLandUseFields(applicationSubmission, updateDto); this.setNFUFields(applicationSubmission, updateDto); diff --git a/services/apps/alcs/src/portal/inbox/application/inbox-application.service.ts b/services/apps/alcs/src/portal/inbox/application/inbox-application.service.ts index 78a84cddd8..719e14204e 100644 --- a/services/apps/alcs/src/portal/inbox/application/inbox-application.service.ts +++ b/services/apps/alcs/src/portal/inbox/application/inbox-application.service.ts @@ -157,19 +157,11 @@ export class InboxApplicationService { } private compileParcelSearchQuery(searchDto: InboxRequestDto, query) { - if (searchDto.pid || searchDto.civicAddress) { - query = query.leftJoin( - ApplicationParcel, - 'parcel', - "parcel.application_submission_uuid = appSearch.uuid AND parcel.parcel_type IN ('application', 'other')", - ); - } else { - query = query.leftJoin( - ApplicationParcel, - 'parcel', - "parcel.application_submission_uuid = appSearch.uuid AND parcel.parcel_type = 'application'", - ); - } + query = query.leftJoin( + ApplicationParcel, + 'parcel', + 'parcel.application_submission_uuid = appSearch.uuid', + ); if (searchDto.pid) { query = query.andWhere('parcel.pid = :pid', { pid: searchDto.pid }); diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.controller.spec.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.controller.spec.ts index 60176a872f..5eefadf6f1 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.controller.spec.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.controller.spec.ts @@ -115,7 +115,7 @@ describe('NoticeOfIntentParcelController', () => { expect(parcel).toBeDefined(); }); - it('should revert newly created "other" parcel if failed to link', async () => { + it('should revert newly created parcel if failed to link', async () => { const mockError = new Error('mock error'); mockNOIService.getByUuid.mockResolvedValue(mockNoticeOfIntentSubmission); mockNOIParcelService.create.mockResolvedValue({} as NoticeOfIntentParcel); @@ -127,7 +127,6 @@ describe('NoticeOfIntentParcelController', () => { { noticeOfIntentSubmissionUuid: 'fake', ownerUuid: 'fake_uuid', - parcelType: 'other', }, { user: { diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.dto.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.dto.ts index 7df5bc6ca8..1ef69aa948 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.dto.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.dto.ts @@ -53,9 +53,6 @@ export class NoticeOfIntentParcelDto { ownershipType?: ParcelOwnershipTypeDto; - @AutoMap(() => String) - parcelType: string; - @AutoMap(() => Number) alrArea: number | null; @@ -68,10 +65,6 @@ export class NoticeOfIntentParcelCreateDto { @IsString() noticeOfIntentSubmissionUuid: string; - @IsOptional() - @IsString() - parcelType?: string; - @IsOptional() @IsString() ownerUuid?: string; diff --git a/services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.dto.ts b/services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.dto.ts index 6c85e6da7a..36813aae11 100644 --- a/services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.dto.ts +++ b/services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.dto.ts @@ -33,9 +33,6 @@ export class NotificationParcelDto { @AutoMap(() => Boolean) isConfirmedByApplicant?: boolean; - @AutoMap(() => String) - parcelType: string; - @AutoMap(() => Number) alrArea: number | null; @@ -49,10 +46,6 @@ export class NotificationParcelCreateDto { @IsNotEmpty() @IsString() notificationSubmissionUuid: string; - - @IsOptional() - @IsString() - parcelType?: string; } export class NotificationParcelUpdateDto { diff --git a/services/apps/alcs/src/portal/pdf-generation/generate-submission-document.service.ts b/services/apps/alcs/src/portal/pdf-generation/generate-submission-document.service.ts index 18bd8cab45..2578d09cf4 100644 --- a/services/apps/alcs/src/portal/pdf-generation/generate-submission-document.service.ts +++ b/services/apps/alcs/src/portal/pdf-generation/generate-submission-document.service.ts @@ -21,7 +21,6 @@ import { DOCUMENT_SOURCE, DOCUMENT_SYSTEM } from '../../document/document.dto'; import { User } from '../../user/user.entity'; import { formatBooleanToYesNoString } from '../../utils/boolean-formatter'; import { ApplicationOwnerService } from '../application-submission/application-owner/application-owner.service'; -import { PARCEL_TYPE } from '../application-submission/application-parcel/application-parcel.dto'; import { ApplicationParcel } from '../application-submission/application-parcel/application-parcel.entity'; import { ApplicationParcelService } from '../application-submission/application-parcel/application-parcel.service'; import { ApplicationSubmission } from '../application-submission/application-submission.entity'; @@ -266,12 +265,7 @@ export class GenerateSubmissionDocumentService { })), applicationTypePortalLabel: application?.type.portalLabel, - parcels: this.mapParcelsWithOwners( - parcels.filter((e) => e.parcelType === PARCEL_TYPE.APPLICATION), - ), - otherParcels: this.mapParcelsWithOwners( - parcels.filter((e) => e.parcelType === PARCEL_TYPE.OTHER), - ), + parcels: this.mapParcelsWithOwners(parcels), }; return data; diff --git a/services/apps/alcs/src/portal/public/public.dto.ts b/services/apps/alcs/src/portal/public/public.dto.ts index 46bcf7f7c1..f0c609416c 100644 --- a/services/apps/alcs/src/portal/public/public.dto.ts +++ b/services/apps/alcs/src/portal/public/public.dto.ts @@ -36,9 +36,6 @@ export class PublicParcelDto { ownershipType?: ApplicationParcelOwnershipTypeDto; - @AutoMap(() => String) - parcelType: string; - @AutoMap(() => Number) alrArea: number | null; diff --git a/services/apps/alcs/src/portal/public/search/application/public-application-search.service.ts b/services/apps/alcs/src/portal/public/search/application/public-application-search.service.ts index 3b62d6370c..4f3be86d82 100644 --- a/services/apps/alcs/src/portal/public/search/application/public-application-search.service.ts +++ b/services/apps/alcs/src/portal/public/search/application/public-application-search.service.ts @@ -200,28 +200,23 @@ export class PublicApplicationSearchService { } private compileParcelSearchQuery(searchDto: SearchRequestDto, query) { - if (searchDto.pid || searchDto.civicAddress) { - query = query.leftJoin( - ApplicationParcel, - 'parcel', - "parcel.application_submission_uuid = appSearch.uuid AND parcel.parcel_type IN ('application', 'other')", - ); - } else { - query = query.leftJoin( - ApplicationParcel, - 'parcel', - "parcel.application_submission_uuid = appSearch.uuid AND parcel.parcel_type = 'application'", - ); - } + query = query.leftJoin( + ApplicationParcel, + 'parcel', + 'parcel.application_submission_uuid = appSearch.uuid', + ); if (searchDto.pid) { query = query.andWhere('parcel.pid = :pid', { pid: searchDto.pid }); } if (searchDto.civicAddress) { - query = query.andWhere('LOWER(parcel.civic_address) like LOWER(:civic_address)', { - civic_address: `%${searchDto.civicAddress}%`.toLowerCase(), - }); + query = query.andWhere( + 'LOWER(parcel.civic_address) like LOWER(:civic_address)', + { + civic_address: `%${searchDto.civicAddress}%`.toLowerCase(), + }, + ); } return query; } diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1701731117179-delete_parcel_type.ts b/services/apps/alcs/src/providers/typeorm/migrations/1701731117179-delete_parcel_type.ts new file mode 100644 index 0000000000..11d532f829 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1701731117179-delete_parcel_type.ts @@ -0,0 +1,30 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class DeleteParcelType1701731117179 implements MigrationInterface { + name = 'DeleteParcelType1701731117179'; + + public async up(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `DELETE FROM "alcs"."application_parcel_owners_application_owner" + WHERE "application_parcel_uuid" IN( + SELECT + uuid FROM "alcs"."application_parcel" + WHERE + "parcel_type" = 'other');`, + ); + + await queryRunner.query( + `DELETE FROM "alcs"."application_parcel" WHERE "parcel_type" = 'other'`, + ); + + await queryRunner.query( + `ALTER TABLE "alcs"."application_parcel" DROP COLUMN "parcel_type"`, + ); + } + + public async down(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `ALTER TABLE "alcs"."application_parcel" ADD "parcel_type" character varying NOT NULL DEFAULT 'application'`, + ); + } +} diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1701733437922-add_other_parcels_description.ts b/services/apps/alcs/src/providers/typeorm/migrations/1701733437922-add_other_parcels_description.ts new file mode 100644 index 0000000000..b67807383c --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1701733437922-add_other_parcels_description.ts @@ -0,0 +1,22 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class AddOtherParcelsDescription1701733437922 + implements MigrationInterface +{ + name = 'AddOtherParcelsDescription1701733437922'; + + public async up(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" ADD "other_parcels_description" text`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."application_submission"."other_parcels_description" IS 'Stores the data user entered about other parcels in their community'`, + ); + } + + public async down(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" DROP COLUMN "other_parcels_description"`, + ); + } +} diff --git a/services/templates/README.md b/services/templates/README.md index 915ef667b3..affa40905e 100644 --- a/services/templates/README.md +++ b/services/templates/README.md @@ -52,7 +52,6 @@ Example of Body "legalDescription": "some legal description", "mapAreaHectares": 0.05, "isFarm": true, - "parcelType": "application", "ownershipType": "Fee Simple", "purchasedDate": "2023-01-01", "documents": [], @@ -86,7 +85,6 @@ Example of Body "mapAreaHectares": 0.04, "isConfirmedByApplicant": false, "crownLandOwnerType": null, - "parcelType": "application", "ownershipType": "Fee Simple", "documents": [], "owners": [] From cac3fa32d20261e2234a05a7d56f2a5d0d2a092b Mon Sep 17 00:00:00 2001 From: Liam Stoddard <lstodd@protonmail.com> Date: Mon, 4 Dec 2023 16:35:54 -0800 Subject: [PATCH 730/954] fixed double AND logic for uuids --- bin/migrate-oats-data/.gitignore | 5 ++++- bin/migrate-oats-data/applications/migrate_application.py | 2 ++ bin/migrate-oats-data/applications/submissions/__init__.py | 1 + .../applications/submissions/migrate_application_owners.py | 6 ++++++ .../applications/submissions/migrate_application_parcels.py | 2 -- .../submissions/parcels/owners/application_owners.py | 5 +++++ .../submissions/parcels/owners/application_parcel_owners.py | 3 ++- .../submissions/sql/parcels/owners/application_owner.sql | 6 +++--- .../sql/parcels/owners/application_owner_count.sql | 2 +- .../owners/application_owner_reused_person_org_id.sql | 2 +- 10 files changed, 25 insertions(+), 9 deletions(-) create mode 100644 bin/migrate-oats-data/applications/submissions/migrate_application_owners.py diff --git a/bin/migrate-oats-data/.gitignore b/bin/migrate-oats-data/.gitignore index 6769e21d99..3b316dd5ce 100644 --- a/bin/migrate-oats-data/.gitignore +++ b/bin/migrate-oats-data/.gitignore @@ -157,4 +157,7 @@ cython_debug/ # be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore # and can be added to the global gitignore or merged into this file. For a more nuclear # option (not recommended) you can uncomment the following to ignore the entire idea folder. -#.idea/ \ No newline at end of file +#.idea/ + +# mac DS_STORE +.DS_Store \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/migrate_application.py b/bin/migrate-oats-data/applications/migrate_application.py index 29aabeba02..4ab74f467d 100644 --- a/bin/migrate-oats-data/applications/migrate_application.py +++ b/bin/migrate-oats-data/applications/migrate_application.py @@ -6,6 +6,7 @@ process_application_parcels, clean_owners, clean_parcel_owners, + process_application_owners, ) from .base_applications import process_applications, clean_applications from .app_prep import process_alcs_application_prep_fields @@ -22,6 +23,7 @@ def process_application_etl(batch_size): process_alcs_app_submissions(batch_size) process_application_statuses(batch_size) process_application_parcels(batch_size) + process_application_owners(batch_size) process_application_submission_status_emails() diff --git a/bin/migrate-oats-data/applications/submissions/__init__.py b/bin/migrate-oats-data/applications/submissions/__init__.py index bf5f204a5b..799fbcad29 100644 --- a/bin/migrate-oats-data/applications/submissions/__init__.py +++ b/bin/migrate-oats-data/applications/submissions/__init__.py @@ -7,3 +7,4 @@ from .migrate_application_parcels import ( process_application_parcels, ) +from .migrate_application_owners import process_application_owners diff --git a/bin/migrate-oats-data/applications/submissions/migrate_application_owners.py b/bin/migrate-oats-data/applications/submissions/migrate_application_owners.py new file mode 100644 index 0000000000..22499f8ac6 --- /dev/null +++ b/bin/migrate-oats-data/applications/submissions/migrate_application_owners.py @@ -0,0 +1,6 @@ +from .parcels import init_application_parcel_owners, link_application_owners_to_parcels + + +def process_application_owners(batch_size): + init_application_parcel_owners(batch_size) + link_application_owners_to_parcels(batch_size) diff --git a/bin/migrate-oats-data/applications/submissions/migrate_application_parcels.py b/bin/migrate-oats-data/applications/submissions/migrate_application_parcels.py index a5b5f02341..ac56ba8186 100644 --- a/bin/migrate-oats-data/applications/submissions/migrate_application_parcels.py +++ b/bin/migrate-oats-data/applications/submissions/migrate_application_parcels.py @@ -9,5 +9,3 @@ def process_application_parcels(batch_size): init_application_parcels(batch_size) process_application_certificate_of_title(batch_size) - init_application_parcel_owners(batch_size) - link_application_owners_to_parcels(batch_size) diff --git a/bin/migrate-oats-data/applications/submissions/parcels/owners/application_owners.py b/bin/migrate-oats-data/applications/submissions/parcels/owners/application_owners.py index 91560665b7..d217f724de 100644 --- a/bin/migrate-oats-data/applications/submissions/parcels/owners/application_owners.py +++ b/bin/migrate-oats-data/applications/submissions/parcels/owners/application_owners.py @@ -132,6 +132,11 @@ def _get_name(row): def _map_owner_type(owner_record): + # default to fee simple + # need to check what to do with null values + if owner_record["ownership_type_code"] == None: + owner_record["ownership_type_code"] = ALCSOwnershipType.FeeSimple.value + if owner_record["ownership_type_code"] == ALCSOwnershipType.FeeSimple.value: if owner_record["person_id"] and not owner_record["organization_id"]: return ALCSOwnerType.INDV.value diff --git a/bin/migrate-oats-data/applications/submissions/parcels/owners/application_parcel_owners.py b/bin/migrate-oats-data/applications/submissions/parcels/owners/application_parcel_owners.py index d73afaffd9..20e701c8d5 100644 --- a/bin/migrate-oats-data/applications/submissions/parcels/owners/application_parcel_owners.py +++ b/bin/migrate-oats-data/applications/submissions/parcels/owners/application_parcel_owners.py @@ -37,7 +37,7 @@ def link_application_owners_to_parcels(conn=None, batch_size=BATCH_UPLOAD_SIZE): application_sql = sql_file.read() while True: cursor.execute( - f"{application_sql} AND appp.\"uuid\" > '{last_parcel_uuid}' AND appo.\"uuid\" > '{last_owner_uuid}' ORDER BY parcel_uuid, owner_uuid;" + f"{application_sql} AND ((appp.\"uuid\" = '{last_parcel_uuid}' AND appo.\"uuid\" > '{last_owner_uuid}') OR appp.\"uuid\" > '{last_parcel_uuid}') ORDER BY parcel_uuid, owner_uuid;" ) rows = cursor.fetchmany(batch_size) @@ -47,6 +47,7 @@ def link_application_owners_to_parcels(conn=None, batch_size=BATCH_UPLOAD_SIZE): try: records_to_be_inserted_count = len(rows) + logger.info(records_to_be_inserted_count) _insert_records(conn, cursor, rows) successful_inserts_count = ( diff --git a/bin/migrate-oats-data/applications/submissions/sql/parcels/owners/application_owner.sql b/bin/migrate-oats-data/applications/submissions/sql/parcels/owners/application_owner.sql index d11b653b32..b24afb53fc 100644 --- a/bin/migrate-oats-data/applications/submissions/sql/parcels/owners/application_owner.sql +++ b/bin/migrate-oats-data/applications/submissions/sql/parcels/owners/application_owner.sql @@ -10,13 +10,13 @@ SELECT osp.subject_property_id, opo.phone_number, opo.cell_phone_number, opo.email_address, - noip.ownership_type_code, + appp.ownership_type_code, opi.prin_type, opi.active_ind, - noip.notice_of_intent_submission_uuid + appp.application_submission_uuid FROM oats.OATS_PROPERTY_INTERESTS opi JOIN oats.OATS_SUBJECT_PROPERTIES osp ON osp.SUBJECT_PROPERTY_ID = opi.SUBJECT_PROPERTY_ID - JOIN alcs.notice_of_intent_parcel noip ON noip.oats_subject_property_id = osp.subject_property_id -- ensure GET records only for parcels imported into ALCS + JOIN alcs.application_parcel appp ON appp.oats_subject_property_id = osp.subject_property_id -- ensure GET records only for parcels imported into ALCS JOIN oats.OATS_PERSON_ORGANIZATIONS opo ON opo.PERSON_ORGANIZATION_ID = opi.PERSON_ORGANIZATION_ID LEFT JOIN oats.OATS_PERSONS op ON op.PERSON_ID = opo.PERSON_ID LEFT JOIN oats.oats_organizations oo ON oo.organization_id = opo.organization_id \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/submissions/sql/parcels/owners/application_owner_count.sql b/bin/migrate-oats-data/applications/submissions/sql/parcels/owners/application_owner_count.sql index 75e28f566c..95c4aac867 100644 --- a/bin/migrate-oats-data/applications/submissions/sql/parcels/owners/application_owner_count.sql +++ b/bin/migrate-oats-data/applications/submissions/sql/parcels/owners/application_owner_count.sql @@ -1,7 +1,7 @@ SELECT count(*) FROM oats.OATS_PROPERTY_INTERESTS opi JOIN oats.OATS_SUBJECT_PROPERTIES osp ON osp.SUBJECT_PROPERTY_ID = opi.SUBJECT_PROPERTY_ID - JOIN alcs.notice_of_intent_parcel noip ON noip.oats_subject_property_id = osp.subject_property_id -- ensure GET records only for parcels imported into ALCS + JOIN alcs.application_parcel appp ON appp.oats_subject_property_id = osp.subject_property_id -- ensure GET records only for parcels imported into ALCS JOIN oats.OATS_PERSON_ORGANIZATIONS opo ON opo.PERSON_ORGANIZATION_ID = opi.PERSON_ORGANIZATION_ID LEFT JOIN oats.OATS_PERSONS op ON op.PERSON_ID = opo.PERSON_ID LEFT JOIN oats.oats_organizations oo ON oo.organization_id = opo.organization_id; \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/submissions/sql/parcels/owners/application_owner_reused_person_org_id.sql b/bin/migrate-oats-data/applications/submissions/sql/parcels/owners/application_owner_reused_person_org_id.sql index 28b20bdf38..04331635f4 100644 --- a/bin/migrate-oats-data/applications/submissions/sql/parcels/owners/application_owner_reused_person_org_id.sql +++ b/bin/migrate-oats-data/applications/submissions/sql/parcels/owners/application_owner_reused_person_org_id.sql @@ -1,6 +1,6 @@ -- finds and returns person_organization_ids reused in alr_applications of class app WITH oats_joined_with_alcs_owners_with_parcels AS ( - SELECT noip.oats_subject_property_id, + SELECT appp.oats_subject_property_id, opo.person_organization_id FROM oats.OATS_SUBJECT_PROPERTIES osp LEFT JOIN oats.OATS_PROPERTY_INTERESTS opi ON osp.SUBJECT_PROPERTY_ID = opi.SUBJECT_PROPERTY_ID From 27e21dd0a8aa08d5f7276cc736639607daf7aea2 Mon Sep 17 00:00:00 2001 From: Liam Stoddard <lstodd@protonmail.com> Date: Tue, 5 Dec 2023 10:45:33 -0800 Subject: [PATCH 731/954] updated comments --- .../submissions/parcels/owners/application_owners.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/bin/migrate-oats-data/applications/submissions/parcels/owners/application_owners.py b/bin/migrate-oats-data/applications/submissions/parcels/owners/application_owners.py index d217f724de..fe9a684d0e 100644 --- a/bin/migrate-oats-data/applications/submissions/parcels/owners/application_owners.py +++ b/bin/migrate-oats-data/applications/submissions/parcels/owners/application_owners.py @@ -132,10 +132,9 @@ def _get_name(row): def _map_owner_type(owner_record): - # default to fee simple - # need to check what to do with null values + # Default to fee simple for missing owner type if owner_record["ownership_type_code"] == None: - owner_record["ownership_type_code"] = ALCSOwnershipType.FeeSimple.value + return ALCSOwnerType.INDV.value if owner_record["ownership_type_code"] == ALCSOwnershipType.FeeSimple.value: if owner_record["person_id"] and not owner_record["organization_id"]: From 5861797eede083cebf5fb16a9ee751bf30ef2376 Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Tue, 5 Dec 2023 11:06:17 -0800 Subject: [PATCH 732/954] show non decision apps/nois too --- .../public-application-search-view.entity.ts | 3 +- ...lic-notice-of-intent-search-view.entity.ts | 3 +- ...701802956617-show-non-decision-outcomes.ts | 89 +++++++++++++++++++ 3 files changed, 91 insertions(+), 4 deletions(-) create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1701802956617-show-non-decision-outcomes.ts diff --git a/services/apps/alcs/src/portal/public/search/application/public-application-search-view.entity.ts b/services/apps/alcs/src/portal/public/search/application/public-application-search-view.entity.ts index 0c5bb729b3..1af7c99237 100644 --- a/services/apps/alcs/src/portal/public/search/application/public-application-search-view.entity.ts +++ b/services/apps/alcs/src/portal/public/search/application/public-application-search-view.entity.ts @@ -95,8 +95,7 @@ import { LinkedStatusType } from '../public-search.dto'; ) .andWhere( `alcs.get_current_status_for_application_submission_by_uuid(app_sub.uuid)->>'status_type_code' != '${SUBMISSION_STATUS.CANCELLED}'`, - ) - .andWhere('decision_date.dest_rank = 1'), + ), }) export class PublicApplicationSubmissionSearchView { @ViewColumn() diff --git a/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search-view.entity.ts b/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search-view.entity.ts index ab13ef7244..4e41bba4d8 100644 --- a/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search-view.entity.ts +++ b/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search-view.entity.ts @@ -94,8 +94,7 @@ import { LinkedStatusType } from '../public-search.dto'; ) .andWhere( `alcs.get_current_status_for_notice_of_intent_submission_by_uuid(noi_sub.uuid)->>'status_type_code' != '${NOI_SUBMISSION_STATUS.CANCELLED}'`, - ) - .andWhere('decision_date.dest_rank = 1'), + ), }) export class PublicNoticeOfIntentSubmissionSearchView { @ViewColumn() diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1701802956617-show-non-decision-outcomes.ts b/services/apps/alcs/src/providers/typeorm/migrations/1701802956617-show-non-decision-outcomes.ts new file mode 100644 index 0000000000..ce19cd851b --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1701802956617-show-non-decision-outcomes.ts @@ -0,0 +1,89 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class ShowNonDecisionOutcomes1701802956617 + implements MigrationInterface +{ + name = 'ShowNonDecisionOutcomes1701802956617'; + + public async up(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, + ['VIEW', 'public_application_submission_search_view', 'alcs'], + ); + await queryRunner.query( + `DROP VIEW "alcs"."public_application_submission_search_view"`, + ); + await queryRunner.query( + `DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, + ['VIEW', 'public_notice_of_intent_submission_search_view', 'alcs'], + ); + await queryRunner.query( + `DROP VIEW "alcs"."public_notice_of_intent_submission_search_view"`, + ); + await queryRunner.query( + `CREATE VIEW "alcs"."public_notice_of_intent_submission_search_view" AS SELECT "noi_sub"."uuid" AS "uuid", "noi_sub"."applicant" AS "applicant", "noi"."uuid" AS "notice_of_intent_uuid", "noticeOfIntentType"."audit_deleted_date_at" AS "noticeOfIntentType_audit_deleted_date_at", "noticeOfIntentType"."audit_created_at" AS "noticeOfIntentType_audit_created_at", "noticeOfIntentType"."audit_updated_at" AS "noticeOfIntentType_audit_updated_at", "noticeOfIntentType"."audit_created_by" AS "noticeOfIntentType_audit_created_by", "noticeOfIntentType"."audit_updated_by" AS "noticeOfIntentType_audit_updated_by", "noticeOfIntentType"."label" AS "noticeOfIntentType_label", "noticeOfIntentType"."code" AS "noticeOfIntentType_code", "noticeOfIntentType"."description" AS "noticeOfIntentType_description", "noticeOfIntentType"."short_label" AS "noticeOfIntentType_short_label", "noticeOfIntentType"."background_color" AS "noticeOfIntentType_background_color", "noticeOfIntentType"."text_color" AS "noticeOfIntentType_text_color", "noticeOfIntentType"."html_description" AS "noticeOfIntentType_html_description", "noticeOfIntentType"."portal_label" AS "noticeOfIntentType_portal_label", "localGovernment"."name" AS "local_government_name", "noi_sub"."file_number" AS "file_number", "noi_sub"."local_government_uuid" AS "local_government_uuid", "noi_sub"."type_code" AS "notice_of_intent_type_code", "noi"."date_submitted_to_alc" AS "date_submitted_to_alc", "noi"."decision_date" AS "decision_date", decision_date.outcome AS "outcome", decision_date.dest_rank AS "dest_rank", "noi"."region_code" AS "notice_of_intent_region_code", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid") AS "status" FROM "alcs"."notice_of_intent_submission" "noi_sub" INNER JOIN "alcs"."notice_of_intent" "noi" ON "noi"."file_number" = "noi_sub"."file_number" AND "noi"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."notice_of_intent_type" "noticeOfIntentType" ON "noi_sub"."type_code" = "noticeOfIntentType"."code" AND "noticeOfIntentType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "noi_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."notice_of_intent_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "noi_sub"."uuid" LEFT JOIN (SELECT DISTINCT ON (notice_of_intentuuid) decisiondate AS "date", outcome AS "outcome", dest_rank AS "dest_rank", notice_of_intentuuid AS "notice_of_intent_uuid" FROM "alcs"."notice_of_intent_decision" "decision_date", (SELECT outcome_code AS "outcome", date AS "decisiondate", notice_of_intent_uuid AS "notice_of_intentuuid", RANK() OVER (PARTITION BY notice_of_intent_uuid ORDER BY date DESC, audit_created_at DESC) AS "dest_rank" FROM "alcs"."notice_of_intent_decision" "decision" WHERE "decision"."audit_deleted_date_at" IS NULL) "decisions" WHERE dest_rank = 1) "decision_date" ON decision_date."notice_of_intent_uuid" = "noi"."uuid" WHERE ( "noi_sub"."is_draft" = FALSE AND ("noi"."date_received_all_items" IS NOT NULL AND "noi"."date_received_all_items" <= NOW()) AND alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid")->>'status_type_code' != 'CANC' ) AND ( "noi_sub"."audit_deleted_date_at" IS NULL )`, + ); + await queryRunner.query( + `INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, + [ + 'alcs', + 'VIEW', + 'public_notice_of_intent_submission_search_view', + 'SELECT "noi_sub"."uuid" AS "uuid", "noi_sub"."applicant" AS "applicant", "noi"."uuid" AS "notice_of_intent_uuid", "noticeOfIntentType"."audit_deleted_date_at" AS "noticeOfIntentType_audit_deleted_date_at", "noticeOfIntentType"."audit_created_at" AS "noticeOfIntentType_audit_created_at", "noticeOfIntentType"."audit_updated_at" AS "noticeOfIntentType_audit_updated_at", "noticeOfIntentType"."audit_created_by" AS "noticeOfIntentType_audit_created_by", "noticeOfIntentType"."audit_updated_by" AS "noticeOfIntentType_audit_updated_by", "noticeOfIntentType"."label" AS "noticeOfIntentType_label", "noticeOfIntentType"."code" AS "noticeOfIntentType_code", "noticeOfIntentType"."description" AS "noticeOfIntentType_description", "noticeOfIntentType"."short_label" AS "noticeOfIntentType_short_label", "noticeOfIntentType"."background_color" AS "noticeOfIntentType_background_color", "noticeOfIntentType"."text_color" AS "noticeOfIntentType_text_color", "noticeOfIntentType"."html_description" AS "noticeOfIntentType_html_description", "noticeOfIntentType"."portal_label" AS "noticeOfIntentType_portal_label", "localGovernment"."name" AS "local_government_name", "noi_sub"."file_number" AS "file_number", "noi_sub"."local_government_uuid" AS "local_government_uuid", "noi_sub"."type_code" AS "notice_of_intent_type_code", "noi"."date_submitted_to_alc" AS "date_submitted_to_alc", "noi"."decision_date" AS "decision_date", decision_date.outcome AS "outcome", decision_date.dest_rank AS "dest_rank", "noi"."region_code" AS "notice_of_intent_region_code", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid") AS "status" FROM "alcs"."notice_of_intent_submission" "noi_sub" INNER JOIN "alcs"."notice_of_intent" "noi" ON "noi"."file_number" = "noi_sub"."file_number" AND "noi"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."notice_of_intent_type" "noticeOfIntentType" ON "noi_sub"."type_code" = "noticeOfIntentType"."code" AND "noticeOfIntentType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "noi_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."notice_of_intent_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "noi_sub"."uuid" LEFT JOIN (SELECT DISTINCT ON (notice_of_intentuuid) decisiondate AS "date", outcome AS "outcome", dest_rank AS "dest_rank", notice_of_intentuuid AS "notice_of_intent_uuid" FROM "alcs"."notice_of_intent_decision" "decision_date", (SELECT outcome_code AS "outcome", date AS "decisiondate", notice_of_intent_uuid AS "notice_of_intentuuid", RANK() OVER (PARTITION BY notice_of_intent_uuid ORDER BY date DESC, audit_created_at DESC) AS "dest_rank" FROM "alcs"."notice_of_intent_decision" "decision" WHERE "decision"."audit_deleted_date_at" IS NULL) "decisions" WHERE dest_rank = 1) "decision_date" ON decision_date."notice_of_intent_uuid" = "noi"."uuid" WHERE ( "noi_sub"."is_draft" = FALSE AND ("noi"."date_received_all_items" IS NOT NULL AND "noi"."date_received_all_items" <= NOW()) AND alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid")->>\'status_type_code\' != \'CANC\' ) AND ( "noi_sub"."audit_deleted_date_at" IS NULL )', + ], + ); + await queryRunner.query( + `CREATE VIEW "alcs"."public_application_submission_search_view" AS SELECT "app_sub"."uuid" AS "uuid", "app_sub"."applicant" AS "applicant", "app"."uuid" AS "application_uuid", "applicationType"."audit_deleted_date_at" AS "applicationType_audit_deleted_date_at", "applicationType"."audit_created_at" AS "applicationType_audit_created_at", "applicationType"."audit_updated_at" AS "applicationType_audit_updated_at", "applicationType"."audit_created_by" AS "applicationType_audit_created_by", "applicationType"."audit_updated_by" AS "applicationType_audit_updated_by", "applicationType"."label" AS "applicationType_label", "applicationType"."code" AS "applicationType_code", "applicationType"."description" AS "applicationType_description", "applicationType"."short_label" AS "applicationType_short_label", "applicationType"."background_color" AS "applicationType_background_color", "applicationType"."text_color" AS "applicationType_text_color", "applicationType"."html_description" AS "applicationType_html_description", "applicationType"."portal_label" AS "applicationType_portal_label", "applicationType"."portal_order" AS "applicationType_portal_order", "applicationType"."requires_government_review" AS "applicationType_requires_government_review", "localGovernment"."name" AS "local_government_name", "app_sub"."file_number" AS "file_number", "app_sub"."local_government_uuid" AS "local_government_uuid", "app_sub"."type_code" AS "application_type_code", "app"."date_submitted_to_alc" AS "date_submitted_to_alc", "app"."decision_date" AS "decision_date", decision_date.outcome AS "outcome", decision_date.dest_rank AS "dest_rank", "app"."region_code" AS "application_region_code", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid") AS "status" FROM "alcs"."application_submission" "app_sub" INNER JOIN "alcs"."application" "app" ON "app"."file_number" = "app_sub"."file_number" AND "app"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."application_type" "applicationType" ON "app_sub"."type_code" = "applicationType"."code" AND "applicationType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "app_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."application_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "app_sub"."uuid" LEFT JOIN (SELECT DISTINCT ON (application_uuid) decisiondate AS "date", outcome AS "outcome", dest_rank AS "dest_rank", applicationuuid AS "application_uuid" FROM "alcs"."application_decision" "decision_date", (SELECT outcome_code AS "outcome", date AS "decisiondate", application_uuid AS "applicationuuid", RANK() OVER (PARTITION BY application_uuid ORDER BY date DESC, audit_created_at DESC) AS "dest_rank" FROM "alcs"."application_decision" "decision" WHERE ( is_draft = FALSE ) AND ( "decision"."audit_deleted_date_at" IS NULL )) "decisions" WHERE dest_rank = 1) "decision_date" ON decision_date."application_uuid" = "app"."uuid" WHERE ( "app_sub"."is_draft" = FALSE AND ("app"."date_received_all_items" IS NOT NULL AND "app"."date_received_all_items" <= NOW()) AND alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid")->>'status_type_code' != 'CANC' ) AND ( "app_sub"."audit_deleted_date_at" IS NULL )`, + ); + await queryRunner.query( + `INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, + [ + 'alcs', + 'VIEW', + 'public_application_submission_search_view', + 'SELECT "app_sub"."uuid" AS "uuid", "app_sub"."applicant" AS "applicant", "app"."uuid" AS "application_uuid", "applicationType"."audit_deleted_date_at" AS "applicationType_audit_deleted_date_at", "applicationType"."audit_created_at" AS "applicationType_audit_created_at", "applicationType"."audit_updated_at" AS "applicationType_audit_updated_at", "applicationType"."audit_created_by" AS "applicationType_audit_created_by", "applicationType"."audit_updated_by" AS "applicationType_audit_updated_by", "applicationType"."label" AS "applicationType_label", "applicationType"."code" AS "applicationType_code", "applicationType"."description" AS "applicationType_description", "applicationType"."short_label" AS "applicationType_short_label", "applicationType"."background_color" AS "applicationType_background_color", "applicationType"."text_color" AS "applicationType_text_color", "applicationType"."html_description" AS "applicationType_html_description", "applicationType"."portal_label" AS "applicationType_portal_label", "applicationType"."portal_order" AS "applicationType_portal_order", "applicationType"."requires_government_review" AS "applicationType_requires_government_review", "localGovernment"."name" AS "local_government_name", "app_sub"."file_number" AS "file_number", "app_sub"."local_government_uuid" AS "local_government_uuid", "app_sub"."type_code" AS "application_type_code", "app"."date_submitted_to_alc" AS "date_submitted_to_alc", "app"."decision_date" AS "decision_date", decision_date.outcome AS "outcome", decision_date.dest_rank AS "dest_rank", "app"."region_code" AS "application_region_code", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid") AS "status" FROM "alcs"."application_submission" "app_sub" INNER JOIN "alcs"."application" "app" ON "app"."file_number" = "app_sub"."file_number" AND "app"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."application_type" "applicationType" ON "app_sub"."type_code" = "applicationType"."code" AND "applicationType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "app_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."application_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "app_sub"."uuid" LEFT JOIN (SELECT DISTINCT ON (application_uuid) decisiondate AS "date", outcome AS "outcome", dest_rank AS "dest_rank", applicationuuid AS "application_uuid" FROM "alcs"."application_decision" "decision_date", (SELECT outcome_code AS "outcome", date AS "decisiondate", application_uuid AS "applicationuuid", RANK() OVER (PARTITION BY application_uuid ORDER BY date DESC, audit_created_at DESC) AS "dest_rank" FROM "alcs"."application_decision" "decision" WHERE ( is_draft = FALSE ) AND ( "decision"."audit_deleted_date_at" IS NULL )) "decisions" WHERE dest_rank = 1) "decision_date" ON decision_date."application_uuid" = "app"."uuid" WHERE ( "app_sub"."is_draft" = FALSE AND ("app"."date_received_all_items" IS NOT NULL AND "app"."date_received_all_items" <= NOW()) AND alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid")->>\'status_type_code\' != \'CANC\' ) AND ( "app_sub"."audit_deleted_date_at" IS NULL )', + ], + ); + } + + public async down(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, + ['VIEW', 'public_application_submission_search_view', 'alcs'], + ); + await queryRunner.query( + `DROP VIEW "alcs"."public_application_submission_search_view"`, + ); + await queryRunner.query( + `DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, + ['VIEW', 'public_notice_of_intent_submission_search_view', 'alcs'], + ); + await queryRunner.query( + `DROP VIEW "alcs"."public_notice_of_intent_submission_search_view"`, + ); + await queryRunner.query( + `CREATE VIEW "alcs"."public_notice_of_intent_submission_search_view" AS SELECT "noi_sub"."uuid" AS "uuid", "noi_sub"."applicant" AS "applicant", "noi"."uuid" AS "notice_of_intent_uuid", "noticeOfIntentType"."audit_deleted_date_at" AS "noticeOfIntentType_audit_deleted_date_at", "noticeOfIntentType"."audit_created_at" AS "noticeOfIntentType_audit_created_at", "noticeOfIntentType"."audit_updated_at" AS "noticeOfIntentType_audit_updated_at", "noticeOfIntentType"."audit_created_by" AS "noticeOfIntentType_audit_created_by", "noticeOfIntentType"."audit_updated_by" AS "noticeOfIntentType_audit_updated_by", "noticeOfIntentType"."label" AS "noticeOfIntentType_label", "noticeOfIntentType"."code" AS "noticeOfIntentType_code", "noticeOfIntentType"."description" AS "noticeOfIntentType_description", "noticeOfIntentType"."short_label" AS "noticeOfIntentType_short_label", "noticeOfIntentType"."background_color" AS "noticeOfIntentType_background_color", "noticeOfIntentType"."text_color" AS "noticeOfIntentType_text_color", "noticeOfIntentType"."html_description" AS "noticeOfIntentType_html_description", "noticeOfIntentType"."portal_label" AS "noticeOfIntentType_portal_label", "localGovernment"."name" AS "local_government_name", "noi_sub"."file_number" AS "file_number", "noi_sub"."local_government_uuid" AS "local_government_uuid", "noi_sub"."type_code" AS "notice_of_intent_type_code", "noi"."date_submitted_to_alc" AS "date_submitted_to_alc", "noi"."decision_date" AS "decision_date", decision_date.outcome AS "outcome", decision_date.dest_rank AS "dest_rank", "noi"."region_code" AS "notice_of_intent_region_code", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid") AS "status" FROM "alcs"."notice_of_intent_submission" "noi_sub" INNER JOIN "alcs"."notice_of_intent" "noi" ON "noi"."file_number" = "noi_sub"."file_number" AND "noi"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."notice_of_intent_type" "noticeOfIntentType" ON "noi_sub"."type_code" = "noticeOfIntentType"."code" AND "noticeOfIntentType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "noi_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."notice_of_intent_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "noi_sub"."uuid" LEFT JOIN (SELECT DISTINCT ON (notice_of_intentuuid) decisiondate AS "date", outcome AS "outcome", dest_rank AS "dest_rank", notice_of_intentuuid AS "notice_of_intent_uuid" FROM "alcs"."notice_of_intent_decision" "decision_date", (SELECT outcome_code AS "outcome", date AS "decisiondate", notice_of_intent_uuid AS "notice_of_intentuuid", RANK() OVER (PARTITION BY notice_of_intent_uuid ORDER BY date DESC, audit_created_at DESC) AS "dest_rank" FROM "alcs"."notice_of_intent_decision" "decision" WHERE "decision"."audit_deleted_date_at" IS NULL) "decisions" WHERE dest_rank = 1) "decision_date" ON decision_date."notice_of_intent_uuid" = "noi"."uuid" WHERE ( "noi_sub"."is_draft" = FALSE AND ("noi"."date_received_all_items" IS NOT NULL AND "noi"."date_received_all_items" <= NOW()) AND alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid")->>'status_type_code' != 'CNCL' AND decision_date.dest_rank = 1 ) AND ( "noi_sub"."audit_deleted_date_at" IS NULL )`, + ); + await queryRunner.query( + `INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, + [ + 'alcs', + 'VIEW', + 'public_notice_of_intent_submission_search_view', + 'SELECT "noi_sub"."uuid" AS "uuid", "noi_sub"."applicant" AS "applicant", "noi"."uuid" AS "notice_of_intent_uuid", "noticeOfIntentType"."audit_deleted_date_at" AS "noticeOfIntentType_audit_deleted_date_at", "noticeOfIntentType"."audit_created_at" AS "noticeOfIntentType_audit_created_at", "noticeOfIntentType"."audit_updated_at" AS "noticeOfIntentType_audit_updated_at", "noticeOfIntentType"."audit_created_by" AS "noticeOfIntentType_audit_created_by", "noticeOfIntentType"."audit_updated_by" AS "noticeOfIntentType_audit_updated_by", "noticeOfIntentType"."label" AS "noticeOfIntentType_label", "noticeOfIntentType"."code" AS "noticeOfIntentType_code", "noticeOfIntentType"."description" AS "noticeOfIntentType_description", "noticeOfIntentType"."short_label" AS "noticeOfIntentType_short_label", "noticeOfIntentType"."background_color" AS "noticeOfIntentType_background_color", "noticeOfIntentType"."text_color" AS "noticeOfIntentType_text_color", "noticeOfIntentType"."html_description" AS "noticeOfIntentType_html_description", "noticeOfIntentType"."portal_label" AS "noticeOfIntentType_portal_label", "localGovernment"."name" AS "local_government_name", "noi_sub"."file_number" AS "file_number", "noi_sub"."local_government_uuid" AS "local_government_uuid", "noi_sub"."type_code" AS "notice_of_intent_type_code", "noi"."date_submitted_to_alc" AS "date_submitted_to_alc", "noi"."decision_date" AS "decision_date", decision_date.outcome AS "outcome", decision_date.dest_rank AS "dest_rank", "noi"."region_code" AS "notice_of_intent_region_code", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid") AS "status" FROM "alcs"."notice_of_intent_submission" "noi_sub" INNER JOIN "alcs"."notice_of_intent" "noi" ON "noi"."file_number" = "noi_sub"."file_number" AND "noi"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."notice_of_intent_type" "noticeOfIntentType" ON "noi_sub"."type_code" = "noticeOfIntentType"."code" AND "noticeOfIntentType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "noi_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."notice_of_intent_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "noi_sub"."uuid" LEFT JOIN (SELECT DISTINCT ON (notice_of_intentuuid) decisiondate AS "date", outcome AS "outcome", dest_rank AS "dest_rank", notice_of_intentuuid AS "notice_of_intent_uuid" FROM "alcs"."notice_of_intent_decision" "decision_date", (SELECT outcome_code AS "outcome", date AS "decisiondate", notice_of_intent_uuid AS "notice_of_intentuuid", RANK() OVER (PARTITION BY notice_of_intent_uuid ORDER BY date DESC, audit_created_at DESC) AS "dest_rank" FROM "alcs"."notice_of_intent_decision" "decision" WHERE "decision"."audit_deleted_date_at" IS NULL) "decisions" WHERE dest_rank = 1) "decision_date" ON decision_date."notice_of_intent_uuid" = "noi"."uuid" WHERE ( "noi_sub"."is_draft" = FALSE AND ("noi"."date_received_all_items" IS NOT NULL AND "noi"."date_received_all_items" <= NOW()) AND alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid")->>\'status_type_code\' != \'CNCL\' AND decision_date.dest_rank = 1 ) AND ( "noi_sub"."audit_deleted_date_at" IS NULL )', + ], + ); + await queryRunner.query( + `CREATE VIEW "alcs"."public_application_submission_search_view" AS SELECT "app_sub"."uuid" AS "uuid", "app_sub"."applicant" AS "applicant", "app"."uuid" AS "application_uuid", "applicationType"."audit_deleted_date_at" AS "applicationType_audit_deleted_date_at", "applicationType"."audit_created_at" AS "applicationType_audit_created_at", "applicationType"."audit_updated_at" AS "applicationType_audit_updated_at", "applicationType"."audit_created_by" AS "applicationType_audit_created_by", "applicationType"."audit_updated_by" AS "applicationType_audit_updated_by", "applicationType"."label" AS "applicationType_label", "applicationType"."code" AS "applicationType_code", "applicationType"."description" AS "applicationType_description", "applicationType"."short_label" AS "applicationType_short_label", "applicationType"."background_color" AS "applicationType_background_color", "applicationType"."text_color" AS "applicationType_text_color", "applicationType"."html_description" AS "applicationType_html_description", "applicationType"."portal_label" AS "applicationType_portal_label", "applicationType"."portal_order" AS "applicationType_portal_order", "applicationType"."requires_government_review" AS "applicationType_requires_government_review", "localGovernment"."name" AS "local_government_name", "app_sub"."file_number" AS "file_number", "app_sub"."local_government_uuid" AS "local_government_uuid", "app_sub"."type_code" AS "application_type_code", "app"."date_submitted_to_alc" AS "date_submitted_to_alc", "app"."decision_date" AS "decision_date", decision_date.outcome AS "outcome", decision_date.dest_rank AS "dest_rank", "app"."region_code" AS "application_region_code", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid") AS "status" FROM "alcs"."application_submission" "app_sub" INNER JOIN "alcs"."application" "app" ON "app"."file_number" = "app_sub"."file_number" AND "app"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."application_type" "applicationType" ON "app_sub"."type_code" = "applicationType"."code" AND "applicationType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "app_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."application_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "app_sub"."uuid" LEFT JOIN (SELECT DISTINCT ON (application_uuid) decisiondate AS "date", outcome AS "outcome", dest_rank AS "dest_rank", applicationuuid AS "application_uuid" FROM "alcs"."application_decision" "decision_date", (SELECT outcome_code AS "outcome", date AS "decisiondate", application_uuid AS "applicationuuid", RANK() OVER (PARTITION BY application_uuid ORDER BY date DESC, audit_created_at DESC) AS "dest_rank" FROM "alcs"."application_decision" "decision" WHERE ( is_draft = FALSE ) AND ( "decision"."audit_deleted_date_at" IS NULL )) "decisions" WHERE dest_rank = 1) "decision_date" ON decision_date."application_uuid" = "app"."uuid" WHERE ( "app_sub"."is_draft" = FALSE AND ("app"."date_received_all_items" IS NOT NULL AND "app"."date_received_all_items" <= NOW()) AND alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid")->>'status_type_code' != 'CNCL' AND decision_date.dest_rank = 1 ) AND ( "app_sub"."audit_deleted_date_at" IS NULL )`, + ); + await queryRunner.query( + `INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, + [ + 'alcs', + 'VIEW', + 'public_application_submission_search_view', + 'SELECT "app_sub"."uuid" AS "uuid", "app_sub"."applicant" AS "applicant", "app"."uuid" AS "application_uuid", "applicationType"."audit_deleted_date_at" AS "applicationType_audit_deleted_date_at", "applicationType"."audit_created_at" AS "applicationType_audit_created_at", "applicationType"."audit_updated_at" AS "applicationType_audit_updated_at", "applicationType"."audit_created_by" AS "applicationType_audit_created_by", "applicationType"."audit_updated_by" AS "applicationType_audit_updated_by", "applicationType"."label" AS "applicationType_label", "applicationType"."code" AS "applicationType_code", "applicationType"."description" AS "applicationType_description", "applicationType"."short_label" AS "applicationType_short_label", "applicationType"."background_color" AS "applicationType_background_color", "applicationType"."text_color" AS "applicationType_text_color", "applicationType"."html_description" AS "applicationType_html_description", "applicationType"."portal_label" AS "applicationType_portal_label", "applicationType"."portal_order" AS "applicationType_portal_order", "applicationType"."requires_government_review" AS "applicationType_requires_government_review", "localGovernment"."name" AS "local_government_name", "app_sub"."file_number" AS "file_number", "app_sub"."local_government_uuid" AS "local_government_uuid", "app_sub"."type_code" AS "application_type_code", "app"."date_submitted_to_alc" AS "date_submitted_to_alc", "app"."decision_date" AS "decision_date", decision_date.outcome AS "outcome", decision_date.dest_rank AS "dest_rank", "app"."region_code" AS "application_region_code", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid") AS "status" FROM "alcs"."application_submission" "app_sub" INNER JOIN "alcs"."application" "app" ON "app"."file_number" = "app_sub"."file_number" AND "app"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."application_type" "applicationType" ON "app_sub"."type_code" = "applicationType"."code" AND "applicationType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "app_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."application_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "app_sub"."uuid" LEFT JOIN (SELECT DISTINCT ON (application_uuid) decisiondate AS "date", outcome AS "outcome", dest_rank AS "dest_rank", applicationuuid AS "application_uuid" FROM "alcs"."application_decision" "decision_date", (SELECT outcome_code AS "outcome", date AS "decisiondate", application_uuid AS "applicationuuid", RANK() OVER (PARTITION BY application_uuid ORDER BY date DESC, audit_created_at DESC) AS "dest_rank" FROM "alcs"."application_decision" "decision" WHERE ( is_draft = FALSE ) AND ( "decision"."audit_deleted_date_at" IS NULL )) "decisions" WHERE dest_rank = 1) "decision_date" ON decision_date."application_uuid" = "app"."uuid" WHERE ( "app_sub"."is_draft" = FALSE AND ("app"."date_received_all_items" IS NOT NULL AND "app"."date_received_all_items" <= NOW()) AND alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid")->>\'status_type_code\' != \'CNCL\' AND decision_date.dest_rank = 1 ) AND ( "app_sub"."audit_deleted_date_at" IS NULL )', + ], + ); + } +} From c7be73fbca1e8367e41923432c9d082cbe565e91 Mon Sep 17 00:00:00 2001 From: Liam Stoddard <lstodd@protonmail.com> Date: Tue, 5 Dec 2023 12:04:53 -0800 Subject: [PATCH 733/954] MR feedback --- .../applications/submissions/parcels/__init__.py | 7 ++++++- .../submissions/parcels/owners/application_owners.py | 2 +- .../parcels/owners/application_parcel_owners.py | 3 ++- .../parcels/owners/notice_of_intent_owners.py | 2 +- .../parcels/owners/notice_of_intent_parcel_owners.py | 2 +- .../application-owner/application-owner.entity.ts | 9 +++++++++ 6 files changed, 20 insertions(+), 5 deletions(-) diff --git a/bin/migrate-oats-data/applications/submissions/parcels/__init__.py b/bin/migrate-oats-data/applications/submissions/parcels/__init__.py index aba1f2a4a7..86099b7070 100644 --- a/bin/migrate-oats-data/applications/submissions/parcels/__init__.py +++ b/bin/migrate-oats-data/applications/submissions/parcels/__init__.py @@ -1,3 +1,8 @@ from .application_certificate_of_title import process_application_certificate_of_title from .application_parcel_insert import init_application_parcels, clean_parcels -from .owners import * +from .owners import ( + clean_owners, + clean_parcel_owners, + init_application_parcel_owners, + link_application_owners_to_parcels, +) diff --git a/bin/migrate-oats-data/applications/submissions/parcels/owners/application_owners.py b/bin/migrate-oats-data/applications/submissions/parcels/owners/application_owners.py index fe9a684d0e..abe23b7eca 100644 --- a/bin/migrate-oats-data/applications/submissions/parcels/owners/application_owners.py +++ b/bin/migrate-oats-data/applications/submissions/parcels/owners/application_owners.py @@ -39,7 +39,7 @@ def init_application_parcel_owners(conn=None, batch_size=BATCH_UPLOAD_SIZE): application_sql = sql_file.read() while True: cursor.execute( - f"{application_sql} WHERE osp.subject_property_id > {last_subject_property} AND opo.person_organization_id > {last_person_organization_id} ORDER BY osp.subject_property_id, opo.person_organization_id;" + f"{application_sql} WHERE (osp.subject_property_id = {last_subject_property} AND opo.person_organization_id > {last_person_organization_id}) OR osp.subject_property_id > {last_subject_property} ORDER BY osp.subject_property_id, opo.person_organization_id;" ) rows = cursor.fetchmany(batch_size) diff --git a/bin/migrate-oats-data/applications/submissions/parcels/owners/application_parcel_owners.py b/bin/migrate-oats-data/applications/submissions/parcels/owners/application_parcel_owners.py index 20e701c8d5..ac7c246c15 100644 --- a/bin/migrate-oats-data/applications/submissions/parcels/owners/application_parcel_owners.py +++ b/bin/migrate-oats-data/applications/submissions/parcels/owners/application_parcel_owners.py @@ -65,7 +65,8 @@ def link_application_owners_to_parcels(conn=None, batch_size=BATCH_UPLOAD_SIZE): logger.exception(err) conn.rollback() failed_inserts = count_total - successful_inserts_count - last_owner_uuid = last_owner_uuid + 1 + last_owner_uuid = rows[1]["parcel_uuid"] + last_parcel_uuid = rows[1]["owner_uuid"] logger.info( f"Finished {etl_name}: total amount of successful inserts {successful_inserts_count}, total failed inserts {failed_inserts}" diff --git a/bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/owners/notice_of_intent_owners.py b/bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/owners/notice_of_intent_owners.py index 550d9e8236..aae90b417b 100644 --- a/bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/owners/notice_of_intent_owners.py +++ b/bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/owners/notice_of_intent_owners.py @@ -39,7 +39,7 @@ def init_notice_of_intent_parcel_owners(conn=None, batch_size=BATCH_UPLOAD_SIZE) application_sql = sql_file.read() while True: cursor.execute( - f"{application_sql} WHERE osp.subject_property_id > {last_subject_property} AND opo.person_organization_id > {last_person_organization_id} ORDER BY osp.subject_property_id, opo.person_organization_id;" + f"{application_sql} WHERE (osp.subject_property_id = {last_subject_property} AND opo.person_organization_id > {last_person_organization_id}) OR osp.subject_property_id > {last_subject_property} ORDER BY osp.subject_property_id, opo.person_organization_id;" ) rows = cursor.fetchmany(batch_size) diff --git a/bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/owners/notice_of_intent_parcel_owners.py b/bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/owners/notice_of_intent_parcel_owners.py index ce7136c2cb..7ceb29e1ad 100644 --- a/bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/owners/notice_of_intent_parcel_owners.py +++ b/bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/owners/notice_of_intent_parcel_owners.py @@ -37,7 +37,7 @@ def link_notice_of_intent_owners_to_parcels(conn=None, batch_size=BATCH_UPLOAD_S application_sql = sql_file.read() while True: cursor.execute( - f"{application_sql} AND noip.\"uuid\" > '{last_parcel_uuid}' AND noio.\"uuid\" > '{last_owner_uuid}' ORDER BY parcel_uuid, owner_uuid;" + f"{application_sql} AND ((noip.\"uuid\" = '{last_parcel_uuid}' AND noio.\"uuid\" > '{last_owner_uuid}') OR noip.\"uuid\" > '{last_parcel_uuid}') ORDER BY parcel_uuid, owner_uuid;" ) rows = cursor.fetchmany(batch_size) diff --git a/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.entity.ts b/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.entity.ts index e23e26edce..6eb625c510 100644 --- a/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.entity.ts +++ b/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.entity.ts @@ -51,6 +51,15 @@ export class ApplicationOwner extends Base { }) email?: string | null; + @Column({ + select: false, + nullable: true, + type: 'int8', + comment: + 'This column is NOT related to any functionality in ALCS. It is only used for ETL and backtracking of imported data from OATS. It links oats.oats_person_organization to alcs.application_owner. Note that this id is unique only in scope of parcel.', + }) + oatsPersonOrganizationId: number; + @AutoMap(() => ApplicationDocumentDto) @ManyToOne(() => ApplicationDocument, { onDelete: 'SET NULL', From b182a1f7f9aa7ee8d84cea0516b8edc83de1905e Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Tue, 5 Dec 2023 13:22:06 -0800 Subject: [PATCH 734/954] Add ha to minimum lot size --- .../features/application/lfng-info/lfng-info.component.html | 2 +- .../review-submit/review-submit.component.html | 4 ++-- .../view-submission/lfng-review/lfng-review.component.html | 2 +- .../public/application/lfng-review/lfng-review.component.html | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/alcs-frontend/src/app/features/application/lfng-info/lfng-info.component.html b/alcs-frontend/src/app/features/application/lfng-info/lfng-info.component.html index a35051cc25..dab29f62da 100644 --- a/alcs-frontend/src/app/features/application/lfng-info/lfng-info.component.html +++ b/alcs-frontend/src/app/features/application/lfng-info/lfng-info.component.html @@ -145,7 +145,7 @@ <h4>Plans & Bylaws: Zoning</h4> </div> <div> <div class="subheading2">Minimum Lot Size (hectares)</div> - <div>{{ applicationReview.zoningMinimumLotSize }}</div> + <div>{{ applicationReview.zoningMinimumLotSize }}<span *ngIf="applicationReview.zoningMinimumLotSize"> ha</span></div> <app-no-data *ngIf="!applicationReview.zoningMinimumLotSize"></app-no-data> </div> <div> diff --git a/portal-frontend/src/app/features/applications/review-submission/review-submit/review-submit.component.html b/portal-frontend/src/app/features/applications/review-submission/review-submit/review-submit.component.html index 79f42f0fa3..0e24422f18 100644 --- a/portal-frontend/src/app/features/applications/review-submission/review-submit/review-submit.component.html +++ b/portal-frontend/src/app/features/applications/review-submission/review-submit/review-submit.component.html @@ -140,7 +140,7 @@ <h4>3. Plans & Bylaws: Zoning</h4> <div *ngIf="_applicationReview.isSubjectToZoning"> <div class="subheading2">Minimum Lot Size (hectares)</div> <div> - {{ _applicationReview.zoningMinimumLotSize }} + {{ _applicationReview.zoningMinimumLotSize }}<span *ngIf="_applicationReview.zoningMinimumLotSize"> ha</span> <app-no-data [showRequired]="showErrors" *ngIf="!_applicationReview.zoningMinimumLotSize"></app-no-data> </div> </div> @@ -384,7 +384,7 @@ <h4>2. Plans & Bylaws: OCP</h4> </div> </div> <div *ngIf="_applicationReview.isSubjectToZoning"> - <div class="subheading2">Minimum Lot Size (hectares)</div> + <div class="subheading2">Minimum Lot Size (hectares)<span *ngIf="_applicationReview.zoningMinimumLotSize"> ha</span></div> <div> {{ _applicationReview.zoningMinimumLotSize }} <app-no-data [showRequired]="showErrors" *ngIf="!_applicationReview.zoningMinimumLotSize"></app-no-data> diff --git a/portal-frontend/src/app/features/applications/view-submission/lfng-review/lfng-review.component.html b/portal-frontend/src/app/features/applications/view-submission/lfng-review/lfng-review.component.html index 0f53e2a75e..b4d35d3487 100644 --- a/portal-frontend/src/app/features/applications/view-submission/lfng-review/lfng-review.component.html +++ b/portal-frontend/src/app/features/applications/view-submission/lfng-review/lfng-review.component.html @@ -182,7 +182,7 @@ <h4>Plans & Bylaws: Zoning</h4> <div *ngIf="applicationReview.isSubjectToZoning"> <div class="subheading2">Minimum Lot Size (hectares)</div> <div> - {{ applicationReview.zoningMinimumLotSize }} + {{ applicationReview.zoningMinimumLotSize }}<span *ngIf="applicationReview.zoningMinimumLotSize"> ha</span> <app-no-data *ngIf="!applicationReview.zoningMinimumLotSize"></app-no-data> </div> </div> diff --git a/portal-frontend/src/app/features/public/application/lfng-review/lfng-review.component.html b/portal-frontend/src/app/features/public/application/lfng-review/lfng-review.component.html index 82be39e6a5..35782730eb 100644 --- a/portal-frontend/src/app/features/public/application/lfng-review/lfng-review.component.html +++ b/portal-frontend/src/app/features/public/application/lfng-review/lfng-review.component.html @@ -110,7 +110,7 @@ <h4>Plans & Bylaws: Zoning</h4> <div *ngIf="applicationReview.isSubjectToZoning"> <div class="subheading2">Minimum Lot Size (hectares)</div> <div> - {{ applicationReview.zoningMinimumLotSize }} + {{ applicationReview.zoningMinimumLotSize }}<span *ngIf="applicationReview.zoningMinimumLotSize"> ha</span> <app-no-data *ngIf="!applicationReview.zoningMinimumLotSize"></app-no-data> </div> </div> From 44baeca445aebe15853001a046c811bf6b320bf1 Mon Sep 17 00:00:00 2001 From: Liam Stoddard <lstodd@protonmail.com> Date: Tue, 5 Dec 2023 13:30:32 -0800 Subject: [PATCH 735/954] mr feedback & typo fix --- .../submissions/parcels/owners/application_parcel_owners.py | 4 ++-- .../parcels/owners/notice_of_intent_parcel_owners.py | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/bin/migrate-oats-data/applications/submissions/parcels/owners/application_parcel_owners.py b/bin/migrate-oats-data/applications/submissions/parcels/owners/application_parcel_owners.py index ac7c246c15..36cd67f1bc 100644 --- a/bin/migrate-oats-data/applications/submissions/parcels/owners/application_parcel_owners.py +++ b/bin/migrate-oats-data/applications/submissions/parcels/owners/application_parcel_owners.py @@ -65,8 +65,8 @@ def link_application_owners_to_parcels(conn=None, batch_size=BATCH_UPLOAD_SIZE): logger.exception(err) conn.rollback() failed_inserts = count_total - successful_inserts_count - last_owner_uuid = rows[1]["parcel_uuid"] - last_parcel_uuid = rows[1]["owner_uuid"] + last_owner_uuid = rows[1]["owner_uuid"] + last_parcel_uuid = rows[1]["parcel_uuid"] logger.info( f"Finished {etl_name}: total amount of successful inserts {successful_inserts_count}, total failed inserts {failed_inserts}" diff --git a/bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/owners/notice_of_intent_parcel_owners.py b/bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/owners/notice_of_intent_parcel_owners.py index 7ceb29e1ad..5d9111255b 100644 --- a/bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/owners/notice_of_intent_parcel_owners.py +++ b/bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/owners/notice_of_intent_parcel_owners.py @@ -64,7 +64,8 @@ def link_notice_of_intent_owners_to_parcels(conn=None, batch_size=BATCH_UPLOAD_S logger.exception(err) conn.rollback() failed_inserts = count_total - successful_inserts_count - last_owner_uuid = last_owner_uuid + 1 + last_owner_uuid = rows[1]["owner_uuid"] + last_parcel_uuid = rows[1]["parcel_uuid"] logger.info( f"Finished {etl_name}: total amount of successful inserts {successful_inserts_count}, total failed inserts {failed_inserts}" From fec46dc3fb3b1f85f67c6d5e32f6f458f5ac8377 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Tue, 5 Dec 2023 15:55:51 -0800 Subject: [PATCH 736/954] Other Parcels Fixes * Add missing required message * Add missing Edit Section Button --- .../application-details.component.html | 3 +++ .../other-parcels/other-parcels.component.html | 9 +++++++++ .../primary-contact/primary-contact.component.ts | 1 - 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/portal-frontend/src/app/features/applications/application-details/application-details.component.html b/portal-frontend/src/app/features/applications/application-details/application-details.component.html index b27f1f7379..c5ab3c914e 100644 --- a/portal-frontend/src/app/features/applications/application-details/application-details.component.html +++ b/portal-frontend/src/app/features/applications/application-details/application-details.component.html @@ -31,6 +31,9 @@ <h3>2. Other Owned Parcels</h3> <app-no-data [showRequired]="showErrors" *ngIf="!applicationSubmission.otherParcelsDescription"></app-no-data> </div> </ng-container> + <div *ngIf="showEdit" class="edit-button"> + <button mat-flat-button (click)="onNavigateToStep(1)" color="accent">Edit Section</button> + </div> </div> </section> <section> diff --git a/portal-frontend/src/app/features/applications/edit-submission/other-parcels/other-parcels.component.html b/portal-frontend/src/app/features/applications/edit-submission/other-parcels/other-parcels.component.html index 5727f45fb1..f064478cb0 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/other-parcels/other-parcels.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/other-parcels/other-parcels.component.html @@ -38,6 +38,15 @@ <h2>Other Owned Parcels</h2> >No </mat-button-toggle> </mat-button-toggle-group> + <div + *ngIf=" + hasOtherParcelsInCommunity.invalid && (hasOtherParcelsInCommunity.dirty || hasOtherParcelsInCommunity.touched) + " + class="field-error" + > + <mat-icon>warning</mat-icon> + <div *ngIf="hasOtherParcelsInCommunity.errors?.['required']">This field is required</div> + </div> </div> <div class="full-row"> <label for="otherParcelsDescription"> diff --git a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts index d64cde9953..61b6139185 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts @@ -55,7 +55,6 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni private submissionUuid = ''; constructor( - private router: Router, private applicationService: ApplicationSubmissionService, private applicationOwnerService: ApplicationOwnerService, private authenticationService: AuthenticationService, From 96a1d2f1678e0e5e21fcc4c05d71b62f5d61e849 Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Tue, 5 Dec 2023 16:00:25 -0800 Subject: [PATCH 737/954] UI changes for parcel owner --- .../parcel/parcel.component.html | 7 ++-- .../parcel-details.component.html | 6 ++-- .../parcel-entry/parcel-entry.component.html | 29 +++++++++-------- .../parcels/parcel-details.component.html | 6 ++-- .../parcel-entry/parcel-entry.component.html | 28 ++++++++-------- .../parcel/parcel.component.html | 7 ++-- .../parcels/parcel-details.component.html | 4 +-- .../parcel-entry/parcel-entry.component.html | 25 ++++++++------- .../parcel/parcel.component.html | 7 ++-- .../submission/parcel/parcel.component.html | 7 ++-- .../submission/parcel/parcel.component.html | 7 ++-- .../submission/parcel/parcel.component.html | 7 ++-- .../NFU_submission_creation.spec.ts | 32 +++++++++---------- .../TUR_submission_creation.spec.ts | 10 +++--- 14 files changed, 98 insertions(+), 84 deletions(-) diff --git a/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.html b/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.html index 4b403d7c05..857fd6cdb8 100644 --- a/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.html +++ b/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.html @@ -2,7 +2,7 @@ <h3 class="flex-item">{{ pageTitle }}</h3> <div class="review-table"> <ng-container *ngFor="let parcel of parcels; let parcelInd = index"> <div class="full-width parcel-header"> - <h4>Parcel {{ parcelInd + 1 }}: Parcel and Owner Information</h4> + <h4>Parcel {{ parcelInd + 1 }}</h4> <div> <button *ngIf="showEdit" @@ -24,7 +24,7 @@ <h4>Parcel {{ parcelInd + 1 }}: Parcel and Owner Information</h4> </button> </div> </div> - <div class="subheading2 grid-1">Ownership Type</div> + <div class="subheading2 grid-1">Parcel Type</div> <div class="grid-double"> {{ parcel.ownershipType?.label }} <app-no-data [showRequired]="showErrors" *ngIf="!parcel.ownershipType"></app-no-data> @@ -37,9 +37,10 @@ <h4>Parcel {{ parcelInd + 1 }}: Parcel and Owner Information</h4> *ngIf="parcel.validation?.isLegalDescriptionRequired || false" ></app-no-data> </div> - <div class="subheading2 grid-1">Area (Hectares)</div> + <div class="subheading2 grid-1">Approx. Map Area</div> <div class="grid-double"> {{ parcel.mapAreaHectares }} + <span *ngIf="parcel.mapAreaHectares !== null">ha</span> <app-no-data [showRequired]="showErrors" *ngIf="parcel.validation?.isMapAreaHectaresRequired || false" diff --git a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-details.component.html b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-details.component.html index 6abf7b181a..7b67d257ae 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-details.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-details.component.html @@ -19,7 +19,7 @@ <h6>Documents needed for this step:</h6> (opened)="openParcel(parcel.uuid)" > <mat-expansion-panel-header> - <mat-panel-title> Parcel #{{ parcelInd + 1 }} Details & Owner Information </mat-panel-title> + <mat-panel-title> Parcel #{{ parcelInd + 1 }}</mat-panel-title> </mat-expansion-panel-header> <app-parcel-entry @@ -36,7 +36,7 @@ <h6>Documents needed for this step:</h6> <div> <div class="flex-evenly-wrap parcel-buttons-wrappers"> <button class="margin-top-1-half" mat-stroked-button color="primary" (click)="onSave()"> - Save Parcel #{{ parcelInd + 1 }} Details & Owner Information + Save Parcel #{{ parcelInd + 1 }} </button> <button class="margin-top-1-half" @@ -45,7 +45,7 @@ <h6>Documents needed for this step:</h6> color="accent" (click)="onDelete(parcel.uuid, parcelInd + 1)" > - Delete Parcel #{{ parcelInd + 1 }} Details + Delete Parcel #{{ parcelInd + 1 }} </button> </div> </div> diff --git a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html index eee65ba4e5..976fe2e473 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html @@ -1,9 +1,8 @@ <form [formGroup]="parcelForm" (keydown.enter)="$event.preventDefault()"> <div class="type"> - <mat-label for="parcelType">Select ownership type:</mat-label> + <mat-label for="parcelType">Select parcel type:</mat-label> <div class="warning"> - The answer to the following question will change the rest of the application form. Do not change this answer once - selected. + Fee simple includes privately-owned parcels and parcels within First Nation treaty lands. Crown land includes crown leases. </div> <mat-button-toggle-group class="input" @@ -27,7 +26,6 @@ <div *ngIf="parcelType.errors?.['required']">This field is required</div> </div> </div> - <h5>Parcel Lookup</h5> <div class="form-row"> <div class="full-row pmbc-search"> <label *ngIf="!isCrownLand" for="lookup-pid">Enter PID to auto-fill parcel details</label> @@ -42,7 +40,7 @@ <h5>Parcel Lookup</h5> </mat-select> </mat-form-field> <mat-form-field class="lookup-input" appearance="outline"> - <input id="lookup-pid" matInput [placeholder]="pidPinPlaceholder" formControlName="pidPin" /> + <input id="lookup-pid" matInput [placeholder]="pidPinPlaceholder" maxlength="11" mask="000-000-000" formControlName="pidPin" /> </mat-form-field> <button class="lookup-search-button" @@ -58,7 +56,11 @@ <h5>Parcel Lookup</h5> <button class="reset-button" mat-stroked-button color="accent" (click)="onReset()" [disabled]="_disabled"> Reset </button> - <span class="float-right">Powered by PMBC!</span> + <span class="float-right"> + <a class="subtext" href=" https://ltsa.ca/products-services/parcelmap-bc/" target="_blank" rel="noreferrer"> + Powered by PMBC! + </a> + </span> </div> </div> </div> @@ -70,7 +72,7 @@ <h5>Parcel Lookup</h5> <input id="legal-description" matInput - placeholder="Enter legal description" + placeholder="Type legal description" formControlName="legalDescription" /> </mat-form-field> @@ -81,7 +83,7 @@ <h5>Parcel Lookup</h5> </div> <div> - <label for="map-area">Approx. Map Area (Hectares)</label> + <label for="map-area">Approx. Map Area</label> <div class="subtext">The area of the entire parcel in hectares, not just the area under application.</div> <mat-form-field class="full-width-input" appearance="outline"> <input @@ -90,9 +92,10 @@ <h5>Parcel Lookup</h5> thousandSeparator="," separatorLimit="9999999999" matInput - placeholder="Enter parcel size" + placeholder="Type parcel size" formControlName="mapArea" /> + <span matTextSuffix>ha</span> </mat-form-field> <div *ngIf="mapArea.invalid && (mapArea.dirty || mapArea.touched)" class="field-error"> <mat-icon>warning</mat-icon> @@ -104,7 +107,7 @@ <h5>Parcel Lookup</h5> <label for="pid">PID <span *ngIf="isCrownLand">(optional)</span></label> <div class="subtext">A unique nine-digit number found on the parcel's Certificate of Title</div> <mat-form-field class="full-width-input" appearance="outline"> - <input id="pid" matInput placeholder="Enter PID" formControlName="pid" maxlength="11" mask="000-000-000" /> + <input id="pid" matInput placeholder="Type PID" formControlName="pid" maxlength="11" mask="000-000-000" /> </mat-form-field> <div *ngIf="pid.invalid && (pid.dirty || pid.touched)" class="field-error"> <mat-icon>warning</mat-icon> @@ -117,7 +120,7 @@ <h5>Parcel Lookup</h5> <label for="pin">PIN (optional)</label> <div class="subtext">Unique numeric identifier for Crown land parcels</div> <mat-form-field class="full-width-input" appearance="outline"> - <input id="pin" matInput placeholder="Enter PIN" formControlName="pin" /> + <input id="pin" matInput placeholder="Type PIN" formControlName="pin" /> </mat-form-field> </div> @@ -149,7 +152,7 @@ <h5>Parcel Lookup</h5> <mat-label for="isFarm">Farm Classification</mat-label> <div class="subtext"> As determined by - <a class="subtext" href="https://www.bcassessment.ca/" target="_blank" rel="noreferrer">BC Assessment</a> + <a class="subtext" href="https://info.bcassessment.ca/Services-products/property-classes-and-exemptions/farm-land-assessment/about-farm-land-assessment" target="_blank" rel="noreferrer">BC Assessment</a> </div> <mat-button-toggle-group class="input" id="isFarm" formControlName="isFarm"> <mat-button-toggle @@ -172,7 +175,7 @@ <h5>Parcel Lookup</h5> <div class="full-row"> <label for="civicAddress">Civic Address</label> <mat-form-field class="full-width-input" appearance="outline"> - <input id="civicAddress" matInput placeholder="Enter Address" formControlName="civicAddress" /> + <input id="civicAddress" matInput placeholder="Type Address" formControlName="civicAddress" /> </mat-form-field> <div *ngIf="civicAddress.invalid && (civicAddress.dirty || civicAddress.touched)" class="field-error"> <mat-icon>warning</mat-icon> diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-details.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-details.component.html index d8cbefcb0f..d608ed2639 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-details.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-details.component.html @@ -19,7 +19,7 @@ <h6>Documents needed for this step:</h6> (opened)="openParcel(parcel.uuid)" > <mat-expansion-panel-header> - <mat-panel-title> Parcel #{{ parcelInd + 1 }} Details & Owner Information </mat-panel-title> + <mat-panel-title> Parcel #{{ parcelInd + 1 }}</mat-panel-title> </mat-expansion-panel-header> <app-noi-parcel-entry @@ -36,7 +36,7 @@ <h6>Documents needed for this step:</h6> <div> <div class="flex-evenly-wrap parcel-buttons-wrappers"> <button class="margin-top-1-half" mat-stroked-button color="primary" (click)="onSave()"> - Save Parcel #{{ parcelInd + 1 }} Details & Owner Information + Save Parcel #{{ parcelInd + 1 }} </button> <button class="margin-top-1-half" @@ -45,7 +45,7 @@ <h6>Documents needed for this step:</h6> color="accent" (click)="onDelete(parcel.uuid, parcelInd + 1)" > - Delete Parcel #{{ parcelInd + 1 }} Details + Delete Parcel #{{ parcelInd + 1 }} </button> </div> </div> diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.html index 9bc5c05237..0bfe036423 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.html @@ -1,9 +1,8 @@ <form [formGroup]="parcelForm" (keydown.enter)="$event.preventDefault()"> <div class="type"> - <mat-label for="parcelType">Select ownership type:</mat-label> + <mat-label for="parcelType">Select parcel type:</mat-label> <div class="warning"> - The answer to the following question will change the rest of the notice of intent form. Do not change this answer - once selected. + Fee simple includes privately-owned parcels and parcels within First Nation treaty lands. Crown land includes crown leases. </div> <mat-button-toggle-group class="input" @@ -27,8 +26,6 @@ <div *ngIf="parcelType.errors?.['required']">This field is required</div> </div> </div> - - <h5>Parcel Lookup</h5> <div class="form-row"> <div class="full-row pmbc-search"> <label *ngIf="!isCrownLand" for="lookup-pid">Enter PID to auto-fill parcel details</label> @@ -59,7 +56,11 @@ <h5>Parcel Lookup</h5> <button class="reset-button" mat-stroked-button color="accent" (click)="onReset()" [disabled]="_disabled"> Reset </button> - <span class="float-right">Powered by PMBC!</span> + <span class="float-right"> + <a class="subtext" href=" https://ltsa.ca/products-services/parcelmap-bc/" target="_blank" rel="noreferrer"> + Powered by PMBC! + </a> + </span> </div> </div> </div> @@ -71,7 +72,7 @@ <h5>Parcel Lookup</h5> <input id="legal-description" matInput - placeholder="Enter legal description" + placeholder="Type legal description" formControlName="legalDescription" /> </mat-form-field> @@ -82,7 +83,7 @@ <h5>Parcel Lookup</h5> </div> <div> - <label for="map-area">Approx. Map Area (Hectares)</label> + <label for="map-area">Approx. Map Area</label> <div class="subtext">The area of the entire parcel in hectares, not just the area under application.</div> <mat-form-field class="full-width-input" appearance="outline"> <input @@ -91,9 +92,10 @@ <h5>Parcel Lookup</h5> thousandSeparator="," separatorLimit="9999999999" matInput - placeholder="Enter parcel size" + placeholder="Type parcel size" formControlName="mapArea" /> + <span matTextSuffix>ha</span> </mat-form-field> <div *ngIf="mapArea.invalid && (mapArea.dirty || mapArea.touched)" class="field-error"> <mat-icon>warning</mat-icon> @@ -105,7 +107,7 @@ <h5>Parcel Lookup</h5> <label for="pid">PID <span *ngIf="isCrownLand">(optional)</span></label> <div class="subtext">A unique nine-digit number found on the parcel's Certificate of Title</div> <mat-form-field appearance="outline"> - <input id="pid" matInput placeholder="Enter PID" formControlName="pid" maxlength="11" mask="000-000-000" /> + <input id="pid" matInput placeholder="Type PID" formControlName="pid" maxlength="11" mask="000-000-000" /> </mat-form-field> <div *ngIf="pid.invalid && (pid.dirty || pid.touched)" class="field-error"> <mat-icon>warning</mat-icon> @@ -118,7 +120,7 @@ <h5>Parcel Lookup</h5> <label for="pin">PIN (optional)</label> <div class="subtext">Unique numeric identifier for Crown land parcels</div> <mat-form-field appearance="outline"> - <input id="pin" matInput placeholder="Enter PIN" formControlName="pin" /> + <input id="pin" matInput placeholder="Type PIN" formControlName="pin" /> </mat-form-field> </div> @@ -150,7 +152,7 @@ <h5>Parcel Lookup</h5> <mat-label for="isFarm">Farm Classification</mat-label> <div class="subtext"> As determined by - <a class="subtext" href="https://www.bcassessment.ca/" target="_blank" rel="noreferrer">BC Assessment</a> + <a class="subtext" href="https://info.bcassessment.ca/Services-products/property-classes-and-exemptions/farm-land-assessment/about-farm-land-assessment" target="_blank" rel="noreferrer">BC Assessment</a> </div> <mat-button-toggle-group class="input" id="isFarm" formControlName="isFarm"> <mat-button-toggle @@ -173,7 +175,7 @@ <h5>Parcel Lookup</h5> <div class="full-row"> <label for="civicAddress">Civic Address</label> <mat-form-field class="full-width-input" appearance="outline"> - <input id="civicAddress" matInput placeholder="Enter Address" formControlName="civicAddress" /> + <input id="civicAddress" matInput placeholder="Type Address" formControlName="civicAddress" /> </mat-form-field> <div *ngIf="civicAddress.invalid && (civicAddress.dirty || civicAddress.touched)" class="field-error"> <mat-icon>warning</mat-icon> diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/parcel/parcel.component.html b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/parcel/parcel.component.html index 23105b5ded..3250a97f0f 100644 --- a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/parcel/parcel.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/parcel/parcel.component.html @@ -2,7 +2,7 @@ <h3 class="flex-item">1. Identify Parcel(s) Under Application</h3> <div class="review-table"> <ng-container *ngFor="let parcel of parcels; let parcelInd = index"> <div class="full-width parcel-header"> - <h4>Parcel {{ parcelInd + 1 }}: Parcel and Owner Information</h4> + <h4>Parcel {{ parcelInd + 1 }}</h4> <div> <button *ngIf="showEdit" @@ -24,7 +24,7 @@ <h4>Parcel {{ parcelInd + 1 }}: Parcel and Owner Information</h4> </button> </div> </div> - <div class="subheading2 grid-1">Ownership Type</div> + <div class="subheading2 grid-1">Parcel Type</div> <div class="grid-double"> {{ parcel.ownershipType?.label }} <app-no-data [showRequired]="showErrors" *ngIf="!parcel.ownershipType"></app-no-data> @@ -37,9 +37,10 @@ <h4>Parcel {{ parcelInd + 1 }}: Parcel and Owner Information</h4> *ngIf="parcel.validation?.isLegalDescriptionRequired || false" ></app-no-data> </div> - <div class="subheading2 grid-1">Area (Hectares)</div> + <div class="subheading2 grid-1">Approx. Map Area</div> <div class="grid-double"> {{ parcel.mapAreaHectares }} + <span *ngIf="parcel.mapAreaHectares !== null">ha</span> <app-no-data [showRequired]="showErrors" *ngIf="parcel.validation?.isMapAreaHectaresRequired || false" diff --git a/portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-details.component.html b/portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-details.component.html index f09f0d590e..fcf0f944a6 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-details.component.html +++ b/portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-details.component.html @@ -28,7 +28,7 @@ <h3>Identify Parcel(s) Under the Statutory Right of Way</h3> <div> <div class="flex-evenly-wrap parcel-buttons-wrappers"> <button class="margin-top-1-half" mat-stroked-button color="primary" (click)="onSave()"> - Save Parcel #{{ parcelInd + 1 }} Details + Save Parcel #{{ parcelInd + 1 }} </button> <button class="margin-top-1-half" @@ -37,7 +37,7 @@ <h3>Identify Parcel(s) Under the Statutory Right of Way</h3> color="accent" (click)="onDelete(parcel.uuid, parcelInd + 1)" > - Delete Parcel #{{ parcelInd + 1 }} Details + Delete Parcel #{{ parcelInd + 1 }} </button> </div> </div> diff --git a/portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-entry/parcel-entry.component.html b/portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-entry/parcel-entry.component.html index 9f1b6422a5..a8870f988c 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-entry/parcel-entry.component.html +++ b/portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-entry/parcel-entry.component.html @@ -1,8 +1,8 @@ <form [formGroup]="parcelForm" (keydown.enter)="$event.preventDefault()"> <div class="type"> - <mat-label>Select ownership type:</mat-label> + <mat-label>Select parcel type:</mat-label> <div class="subtext"> - The answer to the following question will change the rest of the form. Do not change this answer once selected. + Fee simple includes privately-owned parcels and parcels within First Nation treaty lands. Crown land includes crown leases. </div> <mat-button-toggle-group class="input" @@ -26,8 +26,6 @@ <div *ngIf="parcelType.errors?.['required']">This field is required</div> </div> </div> - - <h5>Parcel Lookup</h5> <div class="form-row"> <div class="full-row pmbc-search"> <label *ngIf="!isCrownLand" for="lookup-pid">Enter PID to auto-fill parcel details</label> @@ -58,7 +56,11 @@ <h5>Parcel Lookup</h5> <button class="reset-button" mat-stroked-button color="accent" (click)="onReset()" [disabled]="_disabled"> Reset </button> - <span class="float-right">Powered by PMBC!</span> + <span class="float-right"> + <a class="subtext" href=" https://ltsa.ca/products-services/parcelmap-bc/" target="_blank" rel="noreferrer"> + Powered by PMBC! + </a> + </span> </div> </div> </div> @@ -70,7 +72,7 @@ <h5>Parcel Lookup</h5> <input id="legal-description" matInput - placeholder="Enter legal description" + placeholder="Type legal description" formControlName="legalDescription" /> </mat-form-field> @@ -81,7 +83,7 @@ <h5>Parcel Lookup</h5> </div> <div> - <label for="map-area">Approx. Map Area (Hectares)</label> + <label for="map-area">Approx. Map Area</label> <div class="subtext">The area of the entire parcel in hectares, not just the area under application.</div> <mat-form-field class="full-width-input" appearance="outline"> <input @@ -90,9 +92,10 @@ <h5>Parcel Lookup</h5> thousandSeparator="," separatorLimit="9999999999" matInput - placeholder="Enter parcel size" + placeholder="Type parcel size" formControlName="mapArea" /> + <span matTextSuffix>ha</span> </mat-form-field> <div *ngIf="mapArea.invalid && (mapArea.dirty || mapArea.touched)" class="field-error"> <mat-icon>warning</mat-icon> @@ -104,7 +107,7 @@ <h5>Parcel Lookup</h5> <label for="pid">PID <span *ngIf="isCrownLand">(optional)</span></label> <div class="subtext">A unique nine-digit number found on the parcel's Certificate of Title</div> <mat-form-field appearance="outline"> - <input id="pid" matInput placeholder="Enter PID" formControlName="pid" maxlength="11" mask="000-000-000" /> + <input id="pid" matInput placeholder="Type PID" formControlName="pid" maxlength="11" mask="000-000-000" /> </mat-form-field> <div *ngIf="pid.invalid && (pid.dirty || pid.touched)" class="field-error"> <mat-icon>warning</mat-icon> @@ -117,14 +120,14 @@ <h5>Parcel Lookup</h5> <label for="pin">PIN (optional)</label> <div class="subtext">Unique numeric identifier for Crown land parcels</div> <mat-form-field appearance="outline"> - <input id="pin" matInput placeholder="Enter PIN" formControlName="pin" /> + <input id="pin" matInput placeholder="Type PIN" formControlName="pin" /> </mat-form-field> </div> <div class="full-row"> <label for="civicAddress">Civic Address</label> <mat-form-field class="full-width-input" appearance="outline"> - <input id="civicAddress" matInput placeholder="Enter Address" formControlName="civicAddress" /> + <input id="civicAddress" matInput placeholder="Type Address" formControlName="civicAddress" /> </mat-form-field> <div *ngIf="civicAddress.invalid && (civicAddress.dirty || civicAddress.touched)" class="field-error"> <mat-icon>warning</mat-icon> diff --git a/portal-frontend/src/app/features/notifications/notification-details/parcel/parcel.component.html b/portal-frontend/src/app/features/notifications/notification-details/parcel/parcel.component.html index f171479412..f3519092e4 100644 --- a/portal-frontend/src/app/features/notifications/notification-details/parcel/parcel.component.html +++ b/portal-frontend/src/app/features/notifications/notification-details/parcel/parcel.component.html @@ -2,7 +2,7 @@ <h3 class="flex-item">1. Identify Parcel(s) Under The Statutory Right of Way</h3 <div class="review-table"> <ng-container *ngFor="let parcel of parcels; let parcelInd = index"> <div class="full-width parcel-header"> - <h4>Parcel {{ parcelInd + 1 }} Information</h4> + <h4>Parcel {{ parcelInd + 1 }}</h4> <div> <button *ngIf="showEdit" @@ -24,7 +24,7 @@ <h4>Parcel {{ parcelInd + 1 }} Information</h4> </button> </div> </div> - <div class="subheading2 grid-1">Ownership Type</div> + <div class="subheading2 grid-1">Parcel Type</div> <div class="grid-double"> {{ parcel.ownershipType?.label }} <app-no-data [showRequired]="showErrors" *ngIf="!parcel.ownershipType"></app-no-data> @@ -34,9 +34,10 @@ <h4>Parcel {{ parcelInd + 1 }} Information</h4> {{ parcel.legalDescription }} <app-no-data [showRequired]="showErrors" *ngIf="!parcel.legalDescription"></app-no-data> </div> - <div class="subheading2 grid-1">Approx. Map Area (Hectares)</div> + <div class="subheading2 grid-1">Approx. Map Area</div> <div class="grid-double"> {{ parcel.mapAreaHectares }} + <span *ngIf="parcel.mapAreaHectares !== null">ha</span> <app-no-data [showRequired]="showErrors" *ngIf="!parcel.mapAreaHectares"></app-no-data> </div> <div class="subheading2 grid-1"> diff --git a/portal-frontend/src/app/features/public/application/submission/parcel/parcel.component.html b/portal-frontend/src/app/features/public/application/submission/parcel/parcel.component.html index 1dfb696075..806c4bb2eb 100644 --- a/portal-frontend/src/app/features/public/application/submission/parcel/parcel.component.html +++ b/portal-frontend/src/app/features/public/application/submission/parcel/parcel.component.html @@ -4,9 +4,9 @@ <h3 class="flex-item"> <div class="review-table"> <ng-container *ngFor="let parcel of parcels; let parcelInd = index"> <div class="full-width flex-space-between-wrap"> - <h4>Parcel {{ parcelInd + 1 }}: Parcel and Owner Information</h4> + <h4>Parcel {{ parcelInd + 1 }}</h4> </div> - <div class="subheading2 grid-1">Ownership Type</div> + <div class="subheading2 grid-1">Parcel Type</div> <div class="grid-double"> {{ parcel.ownershipType?.label }} <app-no-data *ngIf="!parcel.ownershipType"></app-no-data> @@ -15,9 +15,10 @@ <h4>Parcel {{ parcelInd + 1 }}: Parcel and Owner Information</h4> <div class="grid-double"> {{ parcel.legalDescription }} </div> - <div class="subheading2 grid-1">Area (Hectares)</div> + <div class="subheading2 grid-1">Approx. Map Area</div> <div class="grid-double"> {{ parcel.mapAreaHectares }} + <span *ngIf="parcel.mapAreaHectares !== null">ha</span> </div> <div class="subheading2 grid-1"> PID {{ parcel.ownershipType?.code === PARCEL_OWNERSHIP_TYPES.CROWN ? '(optional)' : '' }} diff --git a/portal-frontend/src/app/features/public/notice-of-intent/submission/parcel/parcel.component.html b/portal-frontend/src/app/features/public/notice-of-intent/submission/parcel/parcel.component.html index 1dfb696075..806c4bb2eb 100644 --- a/portal-frontend/src/app/features/public/notice-of-intent/submission/parcel/parcel.component.html +++ b/portal-frontend/src/app/features/public/notice-of-intent/submission/parcel/parcel.component.html @@ -4,9 +4,9 @@ <h3 class="flex-item"> <div class="review-table"> <ng-container *ngFor="let parcel of parcels; let parcelInd = index"> <div class="full-width flex-space-between-wrap"> - <h4>Parcel {{ parcelInd + 1 }}: Parcel and Owner Information</h4> + <h4>Parcel {{ parcelInd + 1 }}</h4> </div> - <div class="subheading2 grid-1">Ownership Type</div> + <div class="subheading2 grid-1">Parcel Type</div> <div class="grid-double"> {{ parcel.ownershipType?.label }} <app-no-data *ngIf="!parcel.ownershipType"></app-no-data> @@ -15,9 +15,10 @@ <h4>Parcel {{ parcelInd + 1 }}: Parcel and Owner Information</h4> <div class="grid-double"> {{ parcel.legalDescription }} </div> - <div class="subheading2 grid-1">Area (Hectares)</div> + <div class="subheading2 grid-1">Approx. Map Area</div> <div class="grid-double"> {{ parcel.mapAreaHectares }} + <span *ngIf="parcel.mapAreaHectares !== null">ha</span> </div> <div class="subheading2 grid-1"> PID {{ parcel.ownershipType?.code === PARCEL_OWNERSHIP_TYPES.CROWN ? '(optional)' : '' }} diff --git a/portal-frontend/src/app/features/public/notification/submission/parcel/parcel.component.html b/portal-frontend/src/app/features/public/notification/submission/parcel/parcel.component.html index 26c2dd4dd4..2e4020737c 100644 --- a/portal-frontend/src/app/features/public/notification/submission/parcel/parcel.component.html +++ b/portal-frontend/src/app/features/public/notification/submission/parcel/parcel.component.html @@ -4,9 +4,9 @@ <h3 class="flex-item"> <div class="review-table"> <ng-container *ngFor="let parcel of parcels; let parcelInd = index"> <div class="full-width flex-space-between-wrap"> - <h4>Parcel {{ parcelInd + 1 }}: Parcel and Owner Information</h4> + <h4>Parcel {{ parcelInd + 1 }}</h4> </div> - <div class="subheading2 grid-1">Ownership Type</div> + <div class="subheading2 grid-1">Parcel Type</div> <div class="grid-double"> {{ parcel.ownershipType?.label }} <app-no-data *ngIf="!parcel.ownershipType"></app-no-data> @@ -15,9 +15,10 @@ <h4>Parcel {{ parcelInd + 1 }}: Parcel and Owner Information</h4> <div class="grid-double"> {{ parcel.legalDescription }} </div> - <div class="subheading2 grid-1">Area (Hectares)</div> + <div class="subheading2 grid-1">Approx. Map Area</div> <div class="grid-double"> {{ parcel.mapAreaHectares }} + <span *ngIf="parcel.mapAreaHectares !== null">ha</span> </div> <div class="subheading2 grid-1"> PID {{ parcel.ownershipType?.code === PARCEL_OWNERSHIP_TYPES.CROWN ? '(optional)' : '' }} diff --git a/portal-frontend/test/tests/submissions/NFU_submission_creation.spec.ts b/portal-frontend/test/tests/submissions/NFU_submission_creation.spec.ts index 70ed47fc46..79b6c68164 100644 --- a/portal-frontend/test/tests/submissions/NFU_submission_creation.spec.ts +++ b/portal-frontend/test/tests/submissions/NFU_submission_creation.spec.ts @@ -21,12 +21,12 @@ test('test', async ({ page }) => { .getByRole('button', { name: 'Edit Application' }) .click(); await page.getByRole('button', { name: 'Fee Simple' }).click(); - await page.getByPlaceholder('Enter legal description').click(); - await page.getByPlaceholder('Enter legal description').fill('some description here'); - await page.getByPlaceholder('Enter parcel size').click(); - await page.getByPlaceholder('Enter parcel size').fill('11'); - await page.getByPlaceholder('Enter PID').click(); - await page.getByPlaceholder('Enter PID').fill('111-111-111'); + await page.getByPlaceholder('Type legal description').click(); + await page.getByPlaceholder('Type legal description').fill('some description here'); + await page.getByPlaceholder('Type parcel size').click(); + await page.getByPlaceholder('Type parcel size').fill('11'); + await page.getByPlaceholder('Type PID').click(); + await page.getByPlaceholder('Type PID').fill('111-111-111'); await page.getByPlaceholder('YYYY-MMM-DD').click(); await page.getByPlaceholder('YYYY-MMM-DD').fill('2023-Mar-12'); await page.getByRole('button', { name: 'Yes' }).click(); @@ -58,10 +58,10 @@ test('test', async ({ page }) => { .getByRole('button', { name: 'Crown' }) .click(); await page.getByRole('button', { name: 'Crown' }).click(); - await page.getByRole('textbox', { name: 'Enter legal description' }).click(); - await page.getByRole('textbox', { name: 'Enter legal description' }).fill('another description'); - await page.getByRole('textbox', { name: 'Enter parcel size' }).click(); - await page.getByRole('textbox', { name: 'Enter parcel size' }).fill('22'); + await page.getByRole('textbox', { name: 'Type legal description' }).click(); + await page.getByRole('textbox', { name: 'Type legal description' }).fill('another description'); + await page.getByRole('textbox', { name: 'Type parcel size' }).click(); + await page.getByRole('textbox', { name: 'Type parcel size' }).fill('22'); await page.getByRole('button', { name: 'No', exact: true }).click(); await page.getByLabel('Provincial Crown').check(); await page.getByRole('button', { name: 'Add new government contact' }).click(); @@ -85,12 +85,12 @@ test('test', async ({ page }) => { await page.getByRole('button', { name: 'Next Step' }).click(); await page.locator('#mat-button-toggle-16-button').click(); await page.getByRole('button', { name: 'Fee Simple' }).click(); - await page.getByPlaceholder('Enter legal description').click(); - await page.getByPlaceholder('Enter legal description').fill('other parcels description'); - await page.getByPlaceholder('Enter parcel size').click(); - await page.getByPlaceholder('Enter parcel size').fill('45'); - await page.getByPlaceholder('Enter PID').click(); - await page.getByPlaceholder('Enter PID').fill('444-444-444'); + await page.getByPlaceholder('Type legal description').click(); + await page.getByPlaceholder('Type legal description').fill('other parcels description'); + await page.getByPlaceholder('Type parcel size').click(); + await page.getByPlaceholder('Type parcel size').fill('45'); + await page.getByPlaceholder('Type PID').click(); + await page.getByPlaceholder('Type PID').fill('444-444-444'); await page.getByRole('region', { name: 'Parcel A Details' }).getByRole('button', { name: 'No' }).click(); await page.getByPlaceholder('Type owner name').click(); await page.getByRole('option', { name: 'Test Individual Add' }).getByText('Test Individual').click(); diff --git a/portal-frontend/test/tests/submissions/TUR_submission_creation.spec.ts b/portal-frontend/test/tests/submissions/TUR_submission_creation.spec.ts index c64e7d1209..013ef67ba4 100644 --- a/portal-frontend/test/tests/submissions/TUR_submission_creation.spec.ts +++ b/portal-frontend/test/tests/submissions/TUR_submission_creation.spec.ts @@ -19,16 +19,16 @@ test('test', async ({ page }) => { // await page.locator('.btns-wrapper > button:nth-child(1)').click(); await page.getByRole('button', { name: 'Fee Simple' }).click(); - await page.getByPlaceholder('Enter legal description').click(); - await page.getByPlaceholder('Enter legal description').fill('1'); + await page.getByPlaceholder('Type legal description').click(); + await page.getByPlaceholder('Type legal description').fill('1'); await page .locator( 'div:nth-child(3) > .mat-mdc-form-field > .mat-mdc-text-field-wrapper > .mat-mdc-form-field-flex > .mat-mdc-form-field-infix' ) .click(); - await page.getByPlaceholder('Enter parcel size').fill('1'); - await page.getByPlaceholder('Enter PID').click(); - await page.getByPlaceholder('Enter PID').fill('111-111-111'); + await page.getByPlaceholder('Type parcel size').fill('1'); + await page.getByPlaceholder('Type PID').click(); + await page.getByPlaceholder('Type PID').fill('111-111-111'); await page.getByRole('button', { name: 'Open calendar' }).click(); await page.locator('td:nth-child(3) > .mat-calendar-body-cell').first().click(); await page.getByRole('button', { name: 'March 23, 2023' }).click(); From 83488640932fec4d5fd6925d885e0a4a40eaf2fa Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Tue, 5 Dec 2023 17:26:02 -0800 Subject: [PATCH 738/954] public search srw fix --- .../alcs/src/portal/public/search/public-search.controller.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/services/apps/alcs/src/portal/public/search/public-search.controller.ts b/services/apps/alcs/src/portal/public/search/public-search.controller.ts index ae23f34db3..e6a5da7637 100644 --- a/services/apps/alcs/src/portal/public/search/public-search.controller.ts +++ b/services/apps/alcs/src/portal/public/search/public-search.controller.ts @@ -143,8 +143,9 @@ export class PublicSearchController { !searchDto.dateDecidedFrom && !searchDto.dateDecidedTo && !searchDto.decisionMakerCode && - !searchDto.decisionOutcome && + !(searchDto.decisionOutcome && searchDto.decisionOutcome.length > 0) && !isStringSetAndNotEmpty(searchDto.civicAddress); + console.log(searchDto.decisionOutcome) return { searchApplications, From 960702eba893bdafd7cfac0df243f9100d365f79 Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Wed, 6 Dec 2023 09:49:16 -0800 Subject: [PATCH 739/954] Show correct submission type for NOI cancel dialog Was saying application instead of noitce of intent --- .../view-notice-of-intent-submission.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.ts b/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.ts index f319b06ffa..1e4fabe145 100644 --- a/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.ts @@ -67,7 +67,7 @@ export class ViewNoticeOfIntentSubmissionComponent implements OnInit, OnDestroy async onCancel(uuid: string) { const dialog = this.confirmationDialogService.openDialog({ - body: 'Are you sure you want to cancel the application? A cancelled application cannot be edited or submitted to the ALC. This cannot be undone.', + body: 'Are you sure you want to cancel the notice of intent? A cancelled application cannot be edited or submitted to the ALC. This cannot be undone.', confirmAction: 'Confirm', cancelAction: 'Return', }); From 300d3cd5af0246a5fa9fcfcb8f28ff514f5981c2 Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Wed, 6 Dec 2023 09:50:38 -0800 Subject: [PATCH 740/954] Remove all missed cancel and edit buttons --- ...view-application-submission.component.html | 10 ---------- ...notice-of-intent-submission.component.html | 20 ------------------- 2 files changed, 30 deletions(-) diff --git a/portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.html b/portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.html index 1c3076b74e..630fd1f229 100644 --- a/portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.html +++ b/portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.html @@ -106,16 +106,6 @@ <h2>Applicant Submission</h2> Cancel Application </button> </div> - <div> - <button - [routerLink]="'/application/' + application.fileNumber + '/edit'" - *ngIf="application.canEdit" - mat-flat-button - color="primary" - > - Edit Application - </button> - </div> </div> </mat-tab> <mat-tab label="Local/First Nation Gov Review"> diff --git a/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.html b/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.html index 89a4ada19b..d22ac5eee2 100644 --- a/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.html @@ -46,9 +46,6 @@ <h4 *ngIf="submission">NOI ID: {{ submission.fileNumber }}</h4> <div class="header"> <h2>Applicant Submission</h2> <div class="btns-wrapper"> - <button *ngIf="submission.canEdit" mat-stroked-button color="warn" (click)="onCancel(submission.uuid)"> - Cancel NOI - </button> <button mat-flat-button color="accent" (click)="onDownloadSubmissionPdf(submission.fileNumber)"> Download PDF </button> @@ -65,23 +62,6 @@ <h2>Applicant Submission</h2> </div> </section> </div> - <div class="buttons" *ngIf="submission"> - <div> - <button *ngIf="submission.canEdit" mat-stroked-button color="warn" (click)="onCancel(submission.uuid)"> - Cancel NOI - </button> - </div> - <div> - <button - [routerLink]="'/notice-of-intent/' + submission.fileNumber + '/edit'" - *ngIf="submission.canEdit" - mat-flat-button - color="primary" - > - Edit NOI - </button> - </div> - </div> </mat-tab> <mat-tab label="ALC Review and Decision"> <div class="content"> From fc69a9bc5a126a99c3288c9fe36b84935f4f33ff Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Wed, 6 Dec 2023 10:34:12 -0800 Subject: [PATCH 741/954] fix --- .../alcs/src/portal/public/search/public-search.controller.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/services/apps/alcs/src/portal/public/search/public-search.controller.ts b/services/apps/alcs/src/portal/public/search/public-search.controller.ts index e6a5da7637..dfaed85a7b 100644 --- a/services/apps/alcs/src/portal/public/search/public-search.controller.ts +++ b/services/apps/alcs/src/portal/public/search/public-search.controller.ts @@ -145,7 +145,6 @@ export class PublicSearchController { !searchDto.decisionMakerCode && !(searchDto.decisionOutcome && searchDto.decisionOutcome.length > 0) && !isStringSetAndNotEmpty(searchDto.civicAddress); - console.log(searchDto.decisionOutcome) return { searchApplications, From aac35cf05bca70ed4f74108745736e2a7233a939 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Tue, 5 Dec 2023 11:48:15 -0800 Subject: [PATCH 742/954] Primary Contact Updates * Hide authorization letter section if its not required and nothing is uploaded * Only consider owners who are linked to a parcel --- .../application-details.component.spec.ts | 18 +++----- .../application-details.component.ts | 33 +++++++++++---- .../parcel-details.component.ts | 1 + .../primary-contact.component.html | 2 +- .../primary-contact.component.spec.ts | 7 ++++ .../primary-contact.component.ts | 41 +++++++++++++------ .../primary-contact.component.html | 2 +- .../primary-contact.component.spec.ts | 7 ++++ .../primary-contact.component.ts | 40 ++++++++++++------ ...notice-of-intent-details.component.spec.ts | 18 +++----- .../notice-of-intent-details.component.ts | 30 ++++++++++---- 11 files changed, 132 insertions(+), 67 deletions(-) diff --git a/portal-frontend/src/app/features/applications/application-details/application-details.component.spec.ts b/portal-frontend/src/app/features/applications/application-details/application-details.component.spec.ts index 2b7e88ab0b..90e35cc0b4 100644 --- a/portal-frontend/src/app/features/applications/application-details/application-details.component.spec.ts +++ b/portal-frontend/src/app/features/applications/application-details/application-details.component.spec.ts @@ -1,14 +1,13 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { Router } from '@angular/router'; -import { DeepMocked, createMock } from '@golevelup/ts-jest'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { BehaviorSubject } from 'rxjs'; import { ApplicationDocumentDto } from '../../../services/application-document/application-document.dto'; import { ApplicationDocumentService } from '../../../services/application-document/application-document.service'; +import { ApplicationParcelService } from '../../../services/application-parcel/application-parcel.service'; import { ApplicationSubmissionDetailedDto } from '../../../services/application-submission/application-submission.dto'; -import { ApplicationSubmissionService } from '../../../services/application-submission/application-submission.service'; import { CodeService } from '../../../services/code/code.service'; -import { ToastService } from '../../../services/toast/toast.service'; import { ApplicationDetailsComponent } from './application-details.component'; @@ -18,8 +17,7 @@ describe('ApplicationDetailsComponent', () => { let mockCodeService: DeepMocked<CodeService>; let mockAppDocumentService: DeepMocked<ApplicationDocumentService>; let mockRouter: DeepMocked<Router>; - let mockToastService: DeepMocked<ToastService>; - let mockApplicationService: DeepMocked<ApplicationSubmissionService>; + let mockParcelService: DeepMocked<ApplicationParcelService>; let applicationDocumentPipe = new BehaviorSubject<ApplicationDocumentDto[]>([]); @@ -27,7 +25,7 @@ describe('ApplicationDetailsComponent', () => { mockCodeService = createMock(); mockAppDocumentService = createMock(); mockRouter = createMock(); - mockApplicationService = createMock(); + mockParcelService = createMock(); await TestBed.configureTestingModule({ providers: [ @@ -44,12 +42,8 @@ describe('ApplicationDetailsComponent', () => { useValue: mockRouter, }, { - provide: ToastService, - useValue: mockToastService, - }, - { - provide: ApplicationSubmissionService, - useValue: mockApplicationService, + provide: ApplicationParcelService, + useValue: mockParcelService, }, ], declarations: [ApplicationDetailsComponent], diff --git a/portal-frontend/src/app/features/applications/application-details/application-details.component.ts b/portal-frontend/src/app/features/applications/application-details/application-details.component.ts index 44fd729bfb..605fba86de 100644 --- a/portal-frontend/src/app/features/applications/application-details/application-details.component.ts +++ b/portal-frontend/src/app/features/applications/application-details/application-details.component.ts @@ -3,7 +3,12 @@ import { Router } from '@angular/router'; import { BehaviorSubject, Subject, takeUntil } from 'rxjs'; import { ApplicationDocumentDto } from '../../../services/application-document/application-document.dto'; import { ApplicationDocumentService } from '../../../services/application-document/application-document.service'; -import { ApplicationOwnerDetailedDto } from '../../../services/application-owner/application-owner.dto'; +import { + ApplicationOwnerDetailedDto, + ApplicationOwnerDto, +} from '../../../services/application-owner/application-owner.dto'; +import { PARCEL_OWNERSHIP_TYPE } from '../../../services/application-parcel/application-parcel.dto'; +import { ApplicationParcelService } from '../../../services/application-parcel/application-parcel.service'; import { ApplicationSubmissionDetailedDto } from '../../../services/application-submission/application-submission.dto'; import { LocalGovernmentDto } from '../../../services/code/code.dto'; import { CodeService } from '../../../services/code/code.service'; @@ -39,6 +44,7 @@ export class ApplicationDetailsComponent implements OnInit, OnDestroy { constructor( private codeService: CodeService, private applicationDocumentService: ApplicationDocumentService, + private applicationParcelService: ApplicationParcelService, private router: Router ) {} @@ -49,13 +55,7 @@ export class ApplicationDetailsComponent implements OnInit, OnDestroy { if (app) { this.primaryContact = app.owners.find((owner) => owner.uuid === app.primaryContactOwnerUuid); this.populateLocalGovernment(app.localGovernmentUuid); - - this.needsAuthorizationLetter = - !(this.primaryContact?.type.code === OWNER_TYPE.GOVERNMENT) && - !( - app.owners.length === 1 && - (app.owners[0].type.code === OWNER_TYPE.INDIVIDUAL || app.owners[0].type.code === OWNER_TYPE.GOVERNMENT) - ); + this.calculateAuthorizationLetterRequired(app.uuid); } }); @@ -112,4 +112,21 @@ export class ApplicationDetailsComponent implements OnInit, OnDestroy { this.localGovernment = lg; } } + + private async calculateAuthorizationLetterRequired(submissionUuid: string) { + //Map Owners from Parcels to only count linked ones + const parcels = await this.applicationParcelService.fetchBySubmissionUuid(submissionUuid); + if (parcels) { + const uniqueOwnerMap = parcels + .flatMap((parcel) => parcel.owners) + .reduce((map, owner) => { + return map.set(owner.uuid, owner); + }, new Map<string, ApplicationOwnerDto>()); + const owners = [...uniqueOwnerMap.values()]; + + const isSelfApplicant = owners.length === 1 && this.primaryContact?.type.code === OWNER_TYPE.INDIVIDUAL; + const isGovernmentContact = this.primaryContact?.type.code === OWNER_TYPE.GOVERNMENT; + this.needsAuthorizationLetter = !isGovernmentContact && !isSelfApplicant; + } + } } diff --git a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-details.component.ts b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-details.component.ts index e517e33776..68f8b0784b 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-details.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-details.component.ts @@ -100,6 +100,7 @@ export class ParcelDetailsComponent extends StepComponent implements OnInit, Aft formData.legalDescription !== undefined ? formData.legalDescription : parcel.legalDescription; parcel.mapAreaHectares = formData.mapArea !== undefined ? formData.mapArea : parcel.mapAreaHectares; + parcel.ownershipTypeCode = formData.parcelType !== undefined ? formData.parcelType : parcel.ownershipTypeCode; parcel.isFarm = formData.isFarm !== undefined ? parseStringToBoolean(formData.isFarm) : parcel.isFarm; parcel.purchasedDate = formData.purchaseDate !== undefined ? formData.purchaseDate?.getTime() : parcel.purchasedDate; diff --git a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html index d78b355212..d740e4e230 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html @@ -130,7 +130,7 @@ <h4>Primary Contact Information</h4> </form> </div> </section> -<section> +<section *ngIf="needsAuthorizationLetter || files.length > 0"> <h4>Primary Contact Authorization Letters</h4> <div> <ng-container *ngIf="!isGovernmentUser"> diff --git a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.spec.ts b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.spec.ts index 7e23d17e75..3e1d41f822 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.spec.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.spec.ts @@ -6,6 +6,7 @@ import { BehaviorSubject } from 'rxjs'; import { ApplicationDocumentDto } from '../../../../services/application-document/application-document.dto'; import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; import { ApplicationOwnerService } from '../../../../services/application-owner/application-owner.service'; +import { ApplicationParcelService } from '../../../../services/application-parcel/application-parcel.service'; import { ApplicationSubmissionDetailedDto } from '../../../../services/application-submission/application-submission.dto'; import { ApplicationSubmissionService } from '../../../../services/application-submission/application-submission.service'; import { UserDto } from '../../../../services/authentication/authentication.dto'; @@ -21,6 +22,7 @@ describe('PrimaryContactComponent', () => { let mockAppDocumentService: DeepMocked<ApplicationDocumentService>; let mockAppOwnerService: DeepMocked<ApplicationOwnerService>; let mockAuthService: DeepMocked<AuthenticationService>; + let mockParcelService: DeepMocked<ApplicationParcelService>; let applicationDocumentPipe = new BehaviorSubject<ApplicationDocumentDto[]>([]); @@ -29,6 +31,7 @@ describe('PrimaryContactComponent', () => { mockAppDocumentService = createMock(); mockAppOwnerService = createMock(); mockAuthService = createMock(); + mockParcelService = createMock(); mockAuthService.$currentProfile = new BehaviorSubject<UserDto | undefined>(undefined); @@ -46,6 +49,10 @@ describe('PrimaryContactComponent', () => { provide: ApplicationOwnerService, useValue: mockAppOwnerService, }, + { + provide: ApplicationParcelService, + useValue: mockParcelService, + }, { provide: MatDialog, useValue: {}, diff --git a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts index 61b6139185..2aa786d1e8 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts @@ -1,12 +1,13 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; import { FormControl, FormGroup, Validators } from '@angular/forms'; import { MatDialog } from '@angular/material/dialog'; -import { Router } from '@angular/router'; import { takeUntil } from 'rxjs'; import { ApplicationDocumentDto } from '../../../../services/application-document/application-document.dto'; import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; import { ApplicationOwnerDto } from '../../../../services/application-owner/application-owner.dto'; import { ApplicationOwnerService } from '../../../../services/application-owner/application-owner.service'; +import { PARCEL_OWNERSHIP_TYPE } from '../../../../services/application-parcel/application-parcel.dto'; +import { ApplicationParcelService } from '../../../../services/application-parcel/application-parcel.service'; import { ApplicationSubmissionService } from '../../../../services/application-submission/application-submission.service'; import { AuthenticationService } from '../../../../services/authentication/authentication.service'; import { ToastService } from '../../../../services/toast/toast.service'; @@ -37,6 +38,7 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni governmentName: string | undefined; isDirty = false; showVirusError = false; + hasCrownParcels = false; firstName = new FormControl<string | null>('', [Validators.required]); lastName = new FormControl<string | null>('', [Validators.required]); @@ -57,6 +59,7 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni constructor( private applicationService: ApplicationSubmissionService, private applicationOwnerService: ApplicationOwnerService, + private applicationParcelService: ApplicationParcelService, private authenticationService: AuthenticationService, applicationDocumentService: ApplicationDocumentService, dialog: MatDialog, @@ -155,16 +158,10 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni if (this.selectedLocalGovernment) { this.needsAuthorizationLetter = false; } else { - const isSelfApplicant = this.owners.length > 0 && this.owners[0].type.code === OWNER_TYPE.INDIVIDUAL; - this.needsAuthorizationLetter = - this.selectedThirdPartyAgent || - !( - isSelfApplicant && - (this.owners.length === 1 || - (this.owners.length === 2 && - this.owners[1].type.code === OWNER_TYPE.AGENT && - !this.selectedThirdPartyAgent)) - ); + const isSelfApplicant = + this.parcelOwners.length === 1 && this.parcelOwners[0].type.code === OWNER_TYPE.INDIVIDUAL; + debugger; + this.needsAuthorizationLetter = this.selectedThirdPartyAgent || this.hasCrownParcels || !isSelfApplicant; } this.files = this.files.map((file) => ({ @@ -208,12 +205,30 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni } private async loadOwners(submissionUuid: string, primaryContactOwnerUuid?: string) { - const owners = await this.applicationOwnerService.fetchBySubmissionId(submissionUuid); - if (owners) { + //Map Owners from Parcels to only count linked ones + const parcels = await this.applicationParcelService.fetchBySubmissionUuid(submissionUuid); + const allOwners = await this.applicationOwnerService.fetchBySubmissionId(submissionUuid); + if (parcels && allOwners) { + this.hasCrownParcels = + !!parcels && parcels.some((parcel) => parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPE.CROWN); + + const uniqueParcelOwners = parcels + .flatMap((parcel) => parcel.owners) + .reduce((map, owner) => { + return map.set(owner.uuid, owner); + }, new Map<string, ApplicationOwnerDto>()); + const nonParcelOwners = allOwners.filter((owner) => + [OWNER_TYPE.AGENT, OWNER_TYPE.GOVERNMENT].includes(owner.type.code) + ); + const parcelOwners = [...uniqueParcelOwners.values()]; + const owners = [...parcelOwners, ...nonParcelOwners]; + const selectedOwner = owners.find((owner) => owner.uuid === primaryContactOwnerUuid); this.parcelOwners = owners.filter( (owner) => ![OWNER_TYPE.AGENT, OWNER_TYPE.GOVERNMENT].includes(owner.type.code) ); + + this.parcelOwners = parcelOwners; this.owners = owners; if (selectedOwner) { diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html index 77ff44fd0f..9711ec9512 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html @@ -130,7 +130,7 @@ <h4>Primary Contact Information</h4> </form> </div> </section> -<section> +<section *ngIf="needsAuthorizationLetter || hasCrownParcels || files.length > 0"> <h4>Primary Contact Authorization Letters</h4> <div> <ng-container *ngIf="!isGovernmentUser"> diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.spec.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.spec.ts index 3eae1438a6..ab3be4a0d1 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.spec.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.spec.ts @@ -8,6 +8,7 @@ import { AuthenticationService } from '../../../../services/authentication/authe import { NoticeOfIntentDocumentDto } from '../../../../services/notice-of-intent-document/notice-of-intent-document.dto'; import { NoticeOfIntentDocumentService } from '../../../../services/notice-of-intent-document/notice-of-intent-document.service'; import { NoticeOfIntentOwnerService } from '../../../../services/notice-of-intent-owner/notice-of-intent-owner.service'; +import { NoticeOfIntentParcelService } from '../../../../services/notice-of-intent-parcel/notice-of-intent-parcel.service'; import { NoticeOfIntentSubmissionDetailedDto } from '../../../../services/notice-of-intent-submission/notice-of-intent-submission.dto'; import { NoticeOfIntentSubmissionService } from '../../../../services/notice-of-intent-submission/notice-of-intent-submission.service'; import { ToastService } from '../../../../services/toast/toast.service'; @@ -21,6 +22,7 @@ describe('PrimaryContactComponent', () => { let mockAppDocumentService: DeepMocked<NoticeOfIntentDocumentService>; let mockAppOwnerService: DeepMocked<NoticeOfIntentOwnerService>; let mockAuthService: DeepMocked<AuthenticationService>; + let mockParcelService: DeepMocked<NoticeOfIntentParcelService>; let noiDocumentPipe = new BehaviorSubject<NoticeOfIntentDocumentDto[]>([]); @@ -29,6 +31,7 @@ describe('PrimaryContactComponent', () => { mockAppDocumentService = createMock(); mockAppOwnerService = createMock(); mockAuthService = createMock(); + mockParcelService = createMock(); mockAuthService.$currentProfile = new BehaviorSubject<UserDto | undefined>(undefined); @@ -46,6 +49,10 @@ describe('PrimaryContactComponent', () => { provide: NoticeOfIntentOwnerService, useValue: mockAppOwnerService, }, + { + provide: NoticeOfIntentParcelService, + useValue: mockParcelService, + }, { provide: MatDialog, useValue: {}, diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts index b22c0f27ec..eaa2c64f9c 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts @@ -3,11 +3,14 @@ import { FormControl, FormGroup, Validators } from '@angular/forms'; import { MatDialog } from '@angular/material/dialog'; import { Router } from '@angular/router'; import { takeUntil } from 'rxjs'; +import { ApplicationOwnerDto } from '../../../../services/application-owner/application-owner.dto'; +import { PARCEL_OWNERSHIP_TYPE } from '../../../../services/application-parcel/application-parcel.dto'; import { AuthenticationService } from '../../../../services/authentication/authentication.service'; import { NoticeOfIntentDocumentDto } from '../../../../services/notice-of-intent-document/notice-of-intent-document.dto'; import { NoticeOfIntentDocumentService } from '../../../../services/notice-of-intent-document/notice-of-intent-document.service'; import { NoticeOfIntentOwnerDto } from '../../../../services/notice-of-intent-owner/notice-of-intent-owner.dto'; import { NoticeOfIntentOwnerService } from '../../../../services/notice-of-intent-owner/notice-of-intent-owner.service'; +import { NoticeOfIntentParcelService } from '../../../../services/notice-of-intent-parcel/notice-of-intent-parcel.service'; import { NoticeOfIntentSubmissionService } from '../../../../services/notice-of-intent-submission/notice-of-intent-submission.service'; import { ToastService } from '../../../../services/toast/toast.service'; import { DOCUMENT_TYPE } from '../../../../shared/dto/document.dto'; @@ -37,6 +40,7 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni isGovernmentUser = false; governmentName: string | undefined; isDirty = false; + hasCrownParcels = false; firstName = new FormControl<string | null>('', [Validators.required]); lastName = new FormControl<string | null>('', [Validators.required]); @@ -60,6 +64,7 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni noticeOfIntentDocumentService: NoticeOfIntentDocumentService, private noticeOfIntentOwnerService: NoticeOfIntentOwnerService, private authenticationService: AuthenticationService, + private parcelService: NoticeOfIntentParcelService, dialog: MatDialog, toastService: ToastService ) { @@ -156,16 +161,9 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni if (this.selectedLocalGovernment) { this.needsAuthorizationLetter = false; } else { - const isSelfApplicant = this.owners.length > 0 && this.owners[0].type.code === OWNER_TYPE.INDIVIDUAL; - this.needsAuthorizationLetter = - this.selectedThirdPartyAgent || - !( - isSelfApplicant && - (this.owners.length === 1 || - (this.owners.length === 2 && - this.owners[1].type.code === OWNER_TYPE.AGENT && - !this.selectedThirdPartyAgent)) - ); + const isSelfApplicant = + this.parcelOwners.length === 1 && this.parcelOwners[0].type.code === OWNER_TYPE.INDIVIDUAL; + this.needsAuthorizationLetter = this.selectedThirdPartyAgent || this.hasCrownParcels || !isSelfApplicant; } this.files = this.files.map((file) => ({ @@ -209,12 +207,30 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni } private async loadOwners(submissionUuid: string, primaryContactOwnerUuid?: string | null) { - const owners = await this.noticeOfIntentOwnerService.fetchBySubmissionId(submissionUuid); - if (owners) { + //Map Owners from Parcels to only count linked ones + const parcels = await this.parcelService.fetchBySubmissionUuid(submissionUuid); + const allOwners = await this.noticeOfIntentOwnerService.fetchBySubmissionId(submissionUuid); + if (parcels && allOwners) { + this.hasCrownParcels = + !!parcels && parcels.some((parcel) => parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPE.CROWN); + + const uniqueParcelOwners = parcels + .flatMap((parcel) => parcel.owners) + .reduce((map, owner) => { + return map.set(owner.uuid, owner); + }, new Map<string, NoticeOfIntentOwnerDto>()); + const nonParcelOwners = allOwners.filter((owner) => + [OWNER_TYPE.AGENT, OWNER_TYPE.GOVERNMENT].includes(owner.type.code) + ); + const parcelOwners = [...uniqueParcelOwners.values()]; + const owners = [...parcelOwners, ...nonParcelOwners]; + const selectedOwner = owners.find((owner) => owner.uuid === primaryContactOwnerUuid); this.parcelOwners = owners.filter( (owner) => ![OWNER_TYPE.AGENT, OWNER_TYPE.GOVERNMENT].includes(owner.type.code) ); + + this.parcelOwners = parcelOwners; this.owners = owners; if (selectedOwner) { diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.spec.ts b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.spec.ts index f1984f6d56..a2287f5398 100644 --- a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.spec.ts +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.spec.ts @@ -1,14 +1,13 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { Router } from '@angular/router'; -import { DeepMocked, createMock } from '@golevelup/ts-jest'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { BehaviorSubject } from 'rxjs'; import { CodeService } from '../../../services/code/code.service'; import { NoticeOfIntentDocumentDto } from '../../../services/notice-of-intent-document/notice-of-intent-document.dto'; import { NoticeOfIntentDocumentService } from '../../../services/notice-of-intent-document/notice-of-intent-document.service'; +import { NoticeOfIntentParcelService } from '../../../services/notice-of-intent-parcel/notice-of-intent-parcel.service'; import { NoticeOfIntentSubmissionDetailedDto } from '../../../services/notice-of-intent-submission/notice-of-intent-submission.dto'; -import { NoticeOfIntentSubmissionService } from '../../../services/notice-of-intent-submission/notice-of-intent-submission.service'; -import { ToastService } from '../../../services/toast/toast.service'; import { NoticeOfIntentDetailsComponent } from './notice-of-intent-details.component'; @@ -18,8 +17,7 @@ describe('NoticeOfIntentDetailsComponent', () => { let mockCodeService: DeepMocked<CodeService>; let mockNoiDocumentService: DeepMocked<NoticeOfIntentDocumentService>; let mockRouter: DeepMocked<Router>; - let mockToastService: DeepMocked<ToastService>; - let mockNoiSubmissionService: DeepMocked<NoticeOfIntentSubmissionService>; + let mockNoiParcelService: DeepMocked<NoticeOfIntentParcelService>; let noiDocumentPipe = new BehaviorSubject<NoticeOfIntentDocumentDto[]>([]); @@ -27,7 +25,7 @@ describe('NoticeOfIntentDetailsComponent', () => { mockCodeService = createMock(); mockNoiDocumentService = createMock(); mockRouter = createMock(); - mockNoiSubmissionService = createMock(); + mockNoiParcelService = createMock(); await TestBed.configureTestingModule({ providers: [ @@ -44,12 +42,8 @@ describe('NoticeOfIntentDetailsComponent', () => { useValue: mockRouter, }, { - provide: ToastService, - useValue: mockToastService, - }, - { - provide: NoticeOfIntentSubmissionService, - useValue: mockNoiSubmissionService, + provide: NoticeOfIntentParcelService, + useValue: mockNoiParcelService, }, ], declarations: [NoticeOfIntentDetailsComponent], diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.ts b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.ts index 7ef8d9e5e8..2714dda3b9 100644 --- a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.ts @@ -1,11 +1,14 @@ import { Component, Input, OnDestroy, OnInit } from '@angular/core'; import { Router } from '@angular/router'; import { BehaviorSubject, Subject, takeUntil } from 'rxjs'; +import { ApplicationOwnerDto } from '../../../services/application-owner/application-owner.dto'; +import { PARCEL_OWNERSHIP_TYPE } from '../../../services/application-parcel/application-parcel.dto'; import { LocalGovernmentDto } from '../../../services/code/code.dto'; import { CodeService } from '../../../services/code/code.service'; import { NoticeOfIntentDocumentDto } from '../../../services/notice-of-intent-document/notice-of-intent-document.dto'; import { NoticeOfIntentDocumentService } from '../../../services/notice-of-intent-document/notice-of-intent-document.service'; import { NoticeOfIntentOwnerDto } from '../../../services/notice-of-intent-owner/notice-of-intent-owner.dto'; +import { NoticeOfIntentParcelService } from '../../../services/notice-of-intent-parcel/notice-of-intent-parcel.service'; import { NoticeOfIntentSubmissionDetailedDto } from '../../../services/notice-of-intent-submission/notice-of-intent-submission.dto'; import { DOCUMENT_SOURCE, DOCUMENT_TYPE } from '../../../shared/dto/document.dto'; import { OWNER_TYPE } from '../../../shared/dto/owner.dto'; @@ -39,6 +42,7 @@ export class NoticeOfIntentDetailsComponent implements OnInit, OnDestroy { constructor( private codeService: CodeService, private noticeOfIntentDocumentService: NoticeOfIntentDocumentService, + private noticeOfIntentParcelService: NoticeOfIntentParcelService, private router: Router ) {} @@ -51,14 +55,7 @@ export class NoticeOfIntentDetailsComponent implements OnInit, OnDestroy { (owner) => owner.uuid === noiSubmission.primaryContactOwnerUuid ); this.populateLocalGovernment(noiSubmission.localGovernmentUuid); - - this.needsAuthorizationLetter = - this.primaryContact?.type.code !== OWNER_TYPE.GOVERNMENT && - !( - noiSubmission.owners.length === 1 && - (noiSubmission.owners[0].type.code === OWNER_TYPE.INDIVIDUAL || - noiSubmission.owners[0].type.code === OWNER_TYPE.GOVERNMENT) - ); + this.calculateAuthorizationLetterRequired(noiSubmission.uuid); } }); @@ -113,4 +110,21 @@ export class NoticeOfIntentDetailsComponent implements OnInit, OnDestroy { this.localGovernment = lg; } } + + private async calculateAuthorizationLetterRequired(submissionUuid: string) { + //Map Owners from Parcels to only count linked ones + const parcels = await this.noticeOfIntentParcelService.fetchBySubmissionUuid(submissionUuid); + if (parcels) { + const uniqueOwnerMap = parcels + .flatMap((parcel) => parcel.owners) + .reduce((map, owner) => { + return map.set(owner.uuid, owner); + }, new Map<string, NoticeOfIntentOwnerDto>()); + const owners = [...uniqueOwnerMap.values()]; + + const isSelfApplicant = owners.length === 1 && this.primaryContact?.type.code === OWNER_TYPE.INDIVIDUAL; + const isGovernmentContact = this.primaryContact?.type.code === OWNER_TYPE.GOVERNMENT; + this.needsAuthorizationLetter = !isGovernmentContact && !isSelfApplicant; + } + } } From a875ac25148a752b2f1c452ddbfb5293096ebf3c Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Wed, 6 Dec 2023 11:24:15 -0800 Subject: [PATCH 743/954] Update Government Step label --- .../select-government/select-government.component.html | 5 +---- .../select-government/select-government.component.html | 5 +---- .../select-government/select-government.component.html | 5 +---- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/portal-frontend/src/app/features/applications/edit-submission/select-government/select-government.component.html b/portal-frontend/src/app/features/applications/edit-submission/select-government/select-government.component.html index d1e7c5a9fc..519a8a3032 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/select-government/select-government.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/select-government/select-government.component.html @@ -1,9 +1,6 @@ <div class="step-description"> <h2>Government</h2> - <p> - Please indicate the local government in which the parcel(s) under application is located. If the property is located - within the Islands Trust, please select 'Islands Trust' and not a specific island. - </p> + <p>Please indicate the local or First Nation government in which the parcel(s) are located.</p> <p>*All fields are required unless stated optional.</p> </div> <form [formGroup]="form"> diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/select-government/select-government.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/select-government/select-government.component.html index f946b3d551..94fba280c3 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/select-government/select-government.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/select-government/select-government.component.html @@ -1,9 +1,6 @@ <div class="step-description"> <h2>Government</h2> - <p> - Please indicate the local government in which the parcel(s) under the notice of intent are located. If the property - is located within the Islands Trust, please select 'Islands Trust' and not a specific island. - </p> + <p>Please indicate the local or First Nation government in which the parcel(s) are located.</p> <p>*All fields are required unless stated optional.</p> </div> <form [formGroup]="form"> diff --git a/portal-frontend/src/app/features/notifications/edit-submission/select-government/select-government.component.html b/portal-frontend/src/app/features/notifications/edit-submission/select-government/select-government.component.html index 0fe372ae8a..1df07ee559 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/select-government/select-government.component.html +++ b/portal-frontend/src/app/features/notifications/edit-submission/select-government/select-government.component.html @@ -1,9 +1,6 @@ <div class="step-description"> <h2>Government</h2> - <p> - Please indicate the local government in which the parcel(s) under Notification of SRW is located. If the property is - located within the Islands Trust, please select 'Islands Trust' and not a specific island. - </p> + <p>Please indicate the local or First Nation government in which the parcel(s) are located.</p> <p>*All fields are required unless stated optional.</p> </div> <form [formGroup]="form"> From 3668d7dd5d0fd55cc91fda2f357a38abb606be4f Mon Sep 17 00:00:00 2001 From: Liam Stoddard <lstodd@protonmail.com> Date: Wed, 6 Dec 2023 12:48:13 -0800 Subject: [PATCH 744/954] initial commit --- .../applications/app_staff_journal.py | 132 ++++++++++++++++++ .../app_staff_journal/app_staff_journal.sql | 3 + .../app_staff_journal_count.sql | 3 + 3 files changed, 138 insertions(+) create mode 100644 bin/migrate-oats-data/applications/app_staff_journal.py create mode 100644 bin/migrate-oats-data/applications/sql/app_staff_journal/app_staff_journal.sql create mode 100644 bin/migrate-oats-data/applications/sql/app_staff_journal/app_staff_journal_count.sql diff --git a/bin/migrate-oats-data/applications/app_staff_journal.py b/bin/migrate-oats-data/applications/app_staff_journal.py new file mode 100644 index 0000000000..1548864011 --- /dev/null +++ b/bin/migrate-oats-data/applications/app_staff_journal.py @@ -0,0 +1,132 @@ +from common import BATCH_UPLOAD_SIZE, OATS_ETL_USER, setup_and_get_logger +from db import inject_conn_pool +from psycopg2.extras import RealDictCursor, execute_batch + +etl_name = "app_staff_journal" +logger = setup_and_get_logger(etl_name) + + +@inject_conn_pool +def process_app_staff_journal(conn=None, batch_size=BATCH_UPLOAD_SIZE): + """ + This function is responsible for initializing the users table in ALCS. + + Args: + conn (psycopg2.extensions.connection): PostgreSQL database connection. Provided by the decorator. + batch_size (int): The number of items to process at once. Defaults to BATCH_UPLOAD_SIZE. + """ + + logger.info(f"Start {etl_name}") + with conn.cursor(cursor_factory=RealDictCursor) as cursor: + with open( + "applications/sql/app_staff_journal/app_staff_journal_count.sql", + "r", + encoding="utf-8", + ) as sql_file: + count_query = sql_file.read() + cursor.execute(count_query) + count_total = dict(cursor.fetchone())["count"] + logger.info(f"Total staff journal entry data to insert: {count_total}") + + failed_inserts = 0 + successful_inserts_count = 0 + last_entry_id = "-" + with open( + "applications/sql/app_staff_journal/app_staff_journal.sql", + "r", + encoding="utf-8", + ) as sql_file: + submission_sql = sql_file.read() + while True: + cursor.execute( + f"{submission_sql} WHERE osj.staff_journal_entry_id > '{last_entry_id}' ORDER BY osj.staff_journal_entry_id;" + ) + + rows = cursor.fetchmany(batch_size) + + if not rows: + break + try: + users_to_be_inserted_count = len(rows) + + _insert_users(conn, batch_size, cursor, rows) + + successful_inserts_count = ( + successful_inserts_count + users_to_be_inserted_count + ) + last_entry_id = dict(rows[-1])["staff_journal_entry_id"] + + logger.debug( + f"retrieved/inserted items count: {users_to_be_inserted_count}; total successfully inserted entries so far {successful_inserts_count}; last inserted journal_id: {last_entry_id}" + ) + except Exception as err: + logger.exception() + conn.rollback() + failed_inserts = count_total - successful_inserts_count + last_submission_id = last_submission_id + 1 + + logger.info( + f"Finished {etl_name}: total amount of successful inserts {successful_inserts_count}, total failed inserts {failed_inserts}" + ) + + +def _insert_users(conn, batch_size, cursor, rows): + """ """ + query = _get_insert_query() + parsed_data_list = _prepare_journal_data(rows) + + if len(parsed_data_list) > 0: + execute_batch(cursor, query, parsed_data_list, page_size=batch_size) + + conn.commit() + + +def _get_insert_query(): + query = f""" + INSERT INTO alcs.staff_journal ( + body, + edited, + application_uuid, + created_at, + audit_created_by + ) + VALUES ( + %(journal_text)s, + %(edit)s, + %(uuid)s, + %(journal_date)s, + '{OATS_ETL_USER}' + ) + ON CONFLICT DO NOTHING; + """ + return query + + +def _prepare_journal_data(row_data_list): + data_list = [] + for row in row_data_list: + data = dict(row) + data = _map_revision(data) + data_list.append(dict(row)) + return data_list + + +def _map_revision(data): + revision = data.get("revision_count", "") + # check if edited + if revision == 0: + data["edit"] = False + else: + data["edit"] = True + + +@inject_conn_pool +def clean_staff_journal(conn=None): + logger.info("Start staff journal cleaning") + with conn.cursor() as cursor: + cursor.execute( + f"DELETE FROM alcs.staff_journal asj WHERE asj.audit_created_by = '{OATS_ETL_USER}'" + ) + logger.info(f"Deleted items count = {cursor.rowcount}") + + conn.commit() diff --git a/bin/migrate-oats-data/applications/sql/app_staff_journal/app_staff_journal.sql b/bin/migrate-oats-data/applications/sql/app_staff_journal/app_staff_journal.sql new file mode 100644 index 0000000000..5a9cccc7f0 --- /dev/null +++ b/bin/migrate-oats-data/applications/sql/app_staff_journal/app_staff_journal.sql @@ -0,0 +1,3 @@ +SELECT osj.journal_date, osj.journal_text, osj.revision_count, osj.staff_journal_entry_id, aa."uuid" +FROM oats.oats_staff_journal_entries osj +JOIN alcs.application aa ON aa.file_number = osj.alr_application_id::TEXT \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/sql/app_staff_journal/app_staff_journal_count.sql b/bin/migrate-oats-data/applications/sql/app_staff_journal/app_staff_journal_count.sql new file mode 100644 index 0000000000..f3f86fbf93 --- /dev/null +++ b/bin/migrate-oats-data/applications/sql/app_staff_journal/app_staff_journal_count.sql @@ -0,0 +1,3 @@ +SELECT count (*) +FROM oats.oats_staff_journal_entries osj +JOIN alcs.application aa ON aa.file_number = osj.alr_application_id::TEXT \ No newline at end of file From 0dd900a91c470fc7c4523f0e6e5a8554fb41b370 Mon Sep 17 00:00:00 2001 From: Liam Stoddard <lstodd@protonmail.com> Date: Wed, 6 Dec 2023 13:05:27 -0800 Subject: [PATCH 745/954] code for testing. note imports and cleans commented out --- .../applications/app_staff_journal.py | 5 ++-- .../applications/migrate_application.py | 25 +++++++++++-------- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/bin/migrate-oats-data/applications/app_staff_journal.py b/bin/migrate-oats-data/applications/app_staff_journal.py index 1548864011..21cb98466c 100644 --- a/bin/migrate-oats-data/applications/app_staff_journal.py +++ b/bin/migrate-oats-data/applications/app_staff_journal.py @@ -30,7 +30,7 @@ def process_app_staff_journal(conn=None, batch_size=BATCH_UPLOAD_SIZE): failed_inserts = 0 successful_inserts_count = 0 - last_entry_id = "-" + last_entry_id = 0 with open( "applications/sql/app_staff_journal/app_staff_journal.sql", "r", @@ -107,7 +107,7 @@ def _prepare_journal_data(row_data_list): for row in row_data_list: data = dict(row) data = _map_revision(data) - data_list.append(dict(row)) + data_list.append(dict(data)) return data_list @@ -118,6 +118,7 @@ def _map_revision(data): data["edit"] = False else: data["edit"] = True + return data @inject_conn_pool diff --git a/bin/migrate-oats-data/applications/migrate_application.py b/bin/migrate-oats-data/applications/migrate_application.py index 4ab74f467d..b476f0544c 100644 --- a/bin/migrate-oats-data/applications/migrate_application.py +++ b/bin/migrate-oats-data/applications/migrate_application.py @@ -15,23 +15,26 @@ process_application_submission_status_emails, clean_application_submission_status_emails, ) +from .app_staff_journal import process_app_staff_journal, clean_staff_journal def process_application_etl(batch_size): - process_alcs_application_prep_fields(batch_size) - update_application_date_rx_all_items(batch_size) - process_alcs_app_submissions(batch_size) - process_application_statuses(batch_size) - process_application_parcels(batch_size) - process_application_owners(batch_size) - process_application_submission_status_emails() + # process_alcs_application_prep_fields(batch_size) + # update_application_date_rx_all_items(batch_size) + # process_alcs_app_submissions(batch_size) + # process_application_statuses(batch_size) + # process_application_parcels(batch_size) + # process_application_owners(batch_size) + process_app_staff_journal(batch_size) + # process_application_submission_status_emails() def clean_alcs_applications(): - clean_application_submission_status_emails() - clean_application_parcels() - clean_app_submissions() - clean_applications() + # clean_application_submission_status_emails() + clean_staff_journal() + # clean_application_parcels() + # clean_app_submissions() + # clean_applications() def init_applications(batch_size): From 965d1aa5b83bc6742954ba0a463b488c01af9b74 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Wed, 6 Dec 2023 14:12:49 -0800 Subject: [PATCH 746/954] Move Cancel to higher weight than Decision Released --- .../1701900373356-adjust_noi_weights.ts | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1701900373356-adjust_noi_weights.ts diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1701900373356-adjust_noi_weights.ts b/services/apps/alcs/src/providers/typeorm/migrations/1701900373356-adjust_noi_weights.ts new file mode 100644 index 0000000000..3bfc8121f7 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1701900373356-adjust_noi_weights.ts @@ -0,0 +1,16 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class AdjustNoiWeights1701900373356 implements MigrationInterface { + public async up(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query(` + UPDATE "alcs"."notice_of_intent_submission_status_type" SET "weight" = 5 WHERE "code" = 'CANC'; + `); + await queryRunner.query(` + UPDATE "alcs"."notice_of_intent_submission_status_type" SET "weight" = 4 WHERE "code" = 'ALCD'; + `); + } + + public async down(): Promise<void> { + //No + } +} From 8a5d232f45154242e8f14f2bc9b4b5c6b6ad1e2d Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Wed, 6 Dec 2023 15:16:27 -0800 Subject: [PATCH 747/954] Update Hamburger menu to new designs * Use hamburger in tablet size now * Fix inbox to remove set timeouts and use a variable in the component --- .../features/home/inbox/inbox.component.html | 2 +- .../features/home/inbox/inbox.component.ts | 36 +++++++--------- .../app/shared/header/header.component.html | 11 +++-- .../app/shared/header/header.component.scss | 41 +++++++++++-------- 4 files changed, 46 insertions(+), 44 deletions(-) diff --git a/portal-frontend/src/app/features/home/inbox/inbox.component.html b/portal-frontend/src/app/features/home/inbox/inbox.component.html index a68dd85744..17da66b43c 100644 --- a/portal-frontend/src/app/features/home/inbox/inbox.component.html +++ b/portal-frontend/src/app/features/home/inbox/inbox.component.html @@ -102,7 +102,7 @@ <div *ngIf="isLoading" class="center"> <mat-spinner></mat-spinner> </div> - <mat-tab-group *ngIf="!isLoading" mat-align-tabs="start" mat-stretch-tabs #searchResultTabs> + <mat-tab-group [selectedIndex]="tabIndex" *ngIf="!isLoading" mat-align-tabs="start" mat-stretch-tabs #searchResultTabs> <mat-tab label="applications"> <ng-template mat-tab-label> Applications: {{ applicationTotal }} </ng-template> <app-inbox-list diff --git a/portal-frontend/src/app/features/home/inbox/inbox.component.ts b/portal-frontend/src/app/features/home/inbox/inbox.component.ts index 58805f9f8b..2c68f7b3d5 100644 --- a/portal-frontend/src/app/features/home/inbox/inbox.component.ts +++ b/portal-frontend/src/app/features/home/inbox/inbox.component.ts @@ -67,6 +67,7 @@ export class InboxComponent implements OnInit, OnDestroy { pageIndex = 0; itemsPerPage = 10; + tabIndex = 0; governmentFileNumber = new FormControl<string | undefined>(undefined); portalStatusControl = new FormControl<string[]>([]); @@ -111,11 +112,7 @@ export class InboxComponent implements OnInit, OnDestroy { this.pageIndex = 0; } this.populateTable(); - - // push tab activation to next render cycle, after the tabGroup is rendered - setTimeout(() => { - this.tabGroup.selectedIndex = this.tabIndexFromName(this.currentTabName); - }); + this.tabIndex = this.tabIndexFromName(this.currentTabName); } this.isMobile = isMobile; @@ -154,21 +151,24 @@ export class InboxComponent implements OnInit, OnDestroy { } ngOnChanges(changes: SimpleChanges) { - this.currentTabName = changes['currentTabName'].currentValue; - - setTimeout(() => { - this.tabGroup.selectedIndex = this.tabIndexFromName(this.currentTabName); - }); + if (changes['currentTabName']) { + this.currentTabName = changes['currentTabName'].currentValue; + this.tabIndex = this.tabIndexFromName(this.currentTabName); + } } tabIndexFromName(tabName: string) { // Default to 'application' tab - if (!this.tabGroup) return 0; + if (!this.tabGroup) { + return 0; + } return this.tabGroup._tabs .map((a) => a.textLabel) .reduce((iPrev, b, i) => { - if (b == tabName) return i; + if (b == tabName) { + return i; + } return iPrev; }, 0); } @@ -177,10 +177,7 @@ export class InboxComponent implements OnInit, OnDestroy { await this.loadStatuses(); await this.populateTable(); - // push tab activation to next render cycle, after the tabGroup is rendered - setTimeout(() => { - this.tabGroup.selectedIndex = this.tabIndexFromName(this.currentTabName); - }); + this.tabIndex = this.tabIndexFromName(this.currentTabName); } ngOnDestroy(): void { @@ -219,12 +216,7 @@ export class InboxComponent implements OnInit, OnDestroy { async onClear() { this.searchForm.reset(); await this.populateTable(); - - // push tab activation to next render cycle, after the tabGroup is rendered - setTimeout(() => { - this.tabGroup.selectedIndex = this.tabIndexFromName(this.currentTabName); - }); - + this.tabIndex = this.tabIndexFromName(this.currentTabName); if (this.fileTypeFilterDropDownComponent) { this.fileTypeFilterDropDownComponent.reset(); } diff --git a/portal-frontend/src/app/shared/header/header.component.html b/portal-frontend/src/app/shared/header/header.component.html index 510df05dc2..ed493c1bc9 100644 --- a/portal-frontend/src/app/shared/header/header.component.html +++ b/portal-frontend/src/app/shared/header/header.component.html @@ -20,7 +20,9 @@ <h5 class="center"> <span *ngIf="!isOnPublicPage">Provincial Agricultural Land Commission Portal</span> </h5> <div *ngIf="isAuthenticated" class="burger-menu"> - <mat-icon (click)="onMenuToggle()">{{ isMenuOpen ? 'close' : 'menu' }}</mat-icon> + <button (click)="onMenuToggle()" mat-icon-button> + <mat-icon>{{ isMenuOpen ? 'close' : 'menu' }}</mat-icon> + </button> </div> </div> @@ -37,8 +39,11 @@ <h5 class="center"> </div> <div *ngIf="isMenuOpen" class="mobile-menu-wrapper"> - <h1 (click)="onMenuClicked('/home')">Portal Inbox</h1> - <h1 (click)="onLogout()">Log Out</h1> + <div class="subheading2 username item">{{ user?.name }}</div> + <div>User ID: {{ user?.bceidUserName }}</div> + <div>Business: {{ user?.government || user?.businessName }}</div> + <div>Type: {{ user?.businessName ? 'BCeID Business' : 'BCeID Basic' }}</div> + <button class="mobile-logout" mat-stroked-button color="primary" (click)="onLogout()">Log Out</button> </div> </div> </header> diff --git a/portal-frontend/src/app/shared/header/header.component.scss b/portal-frontend/src/app/shared/header/header.component.scss index 73be56498a..d03ba9d46b 100644 --- a/portal-frontend/src/app/shared/header/header.component.scss +++ b/portal-frontend/src/app/shared/header/header.component.scss @@ -74,12 +74,7 @@ header { } .mobile-menu-wrapper { - width: 100%; - position: fixed; - top: 50%; - left: 50%; - transform: translate(-50%, -30%); - margin-left: rem(24); + margin: rem(24) 0; line-height: rem(50); h1 { @@ -88,9 +83,17 @@ header { } } - @media screen and (min-width: $tabletBreakpoint) { + @media screen and (min-width: $desktopBreakpoint) { justify-content: space-between; + .title-wrapper { + margin: rem(18) rem(80) !important; + } + + .user-menu { + margin-left: rem(4); + } + .burger-menu { display: none; } @@ -114,7 +117,8 @@ header { padding: rem(14) rem(27) rem(14) rem(27) !important; } - display: inline-block; + display: block; + flex-shrink: 0; } .title { @@ -129,19 +133,20 @@ header { } } } - - @media screen and (min-width: $desktopBreakpoint) { - .title-wrapper { - margin: rem(18) rem(80) !important; - } - - .user-menu { - margin-left: rem(4); - } - } } .item { padding: rem(12) rem(16); min-width: rem(212); } + +.username { + color: colors.$primary-color; + text-transform: uppercase; + padding: 0; +} + +.mobile-logout { + margin-top: rem(8); + width: 100%; +} From afcc134cbff9345c95695f86b452093438cab92d Mon Sep 17 00:00:00 2001 From: Liam Stoddard <lstodd@protonmail.com> Date: Wed, 6 Dec 2023 15:29:03 -0800 Subject: [PATCH 748/954] added timezone conversion --- .../applications/app_staff_journal.py | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/bin/migrate-oats-data/applications/app_staff_journal.py b/bin/migrate-oats-data/applications/app_staff_journal.py index 21cb98466c..957348e101 100644 --- a/bin/migrate-oats-data/applications/app_staff_journal.py +++ b/bin/migrate-oats-data/applications/app_staff_journal.py @@ -1,4 +1,9 @@ -from common import BATCH_UPLOAD_SIZE, OATS_ETL_USER, setup_and_get_logger +from common import ( + BATCH_UPLOAD_SIZE, + OATS_ETL_USER, + setup_and_get_logger, + add_timezone_and_keep_date_part, +) from db import inject_conn_pool from psycopg2.extras import RealDictCursor, execute_batch @@ -107,6 +112,7 @@ def _prepare_journal_data(row_data_list): for row in row_data_list: data = dict(row) data = _map_revision(data) + data = _map_timezone(data) data_list.append(dict(data)) return data_list @@ -121,6 +127,13 @@ def _map_revision(data): return data +def _map_timezone(data): + date = data.get("journal_date", "") + journal_date = add_timezone_and_keep_date_part(date) + data["journal_date"] = journal_date + return data + + @inject_conn_pool def clean_staff_journal(conn=None): logger.info("Start staff journal cleaning") From c6d0a53cfe7aaec41ceb4f863d999d38296937ca Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Thu, 7 Dec 2023 15:29:55 -0800 Subject: [PATCH 749/954] Add a broken migration to test alerting --- .../typeorm/migrations/1701991744799-broken_migration.ts | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1701991744799-broken_migration.ts diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1701991744799-broken_migration.ts b/services/apps/alcs/src/providers/typeorm/migrations/1701991744799-broken_migration.ts new file mode 100644 index 0000000000..e31a77c485 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1701991744799-broken_migration.ts @@ -0,0 +1,9 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class BrokenMigration1701991744799 implements MigrationInterface { + public async up(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query(`SELECT * FROM nonexistingtable`); + } + + public async down(): Promise<void> {} +} From 31d345f1832e54bca6b37155c31a90fceeee73d9 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Thu, 7 Dec 2023 17:31:16 -0800 Subject: [PATCH 750/954] Revert "Add a broken migration to test alerting" This reverts commit c6d0a53cfe7aaec41ceb4f863d999d38296937ca. --- .../typeorm/migrations/1701991744799-broken_migration.ts | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1701991744799-broken_migration.ts diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1701991744799-broken_migration.ts b/services/apps/alcs/src/providers/typeorm/migrations/1701991744799-broken_migration.ts deleted file mode 100644 index e31a77c485..0000000000 --- a/services/apps/alcs/src/providers/typeorm/migrations/1701991744799-broken_migration.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { MigrationInterface, QueryRunner } from 'typeorm'; - -export class BrokenMigration1701991744799 implements MigrationInterface { - public async up(queryRunner: QueryRunner): Promise<void> { - await queryRunner.query(`SELECT * FROM nonexistingtable`); - } - - public async down(): Promise<void> {} -} From 41eb7692b89784953e3a0f083dd76b030a960229 Mon Sep 17 00:00:00 2001 From: Liam Stoddard <lstodd@protonmail.com> Date: Fri, 8 Dec 2023 11:21:16 -0800 Subject: [PATCH 751/954] verification script --- .../staff_journal_verification.sql | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 bin/migrate-oats-data/applications/sql/app_staff_journal/staff_journal_verification.sql diff --git a/bin/migrate-oats-data/applications/sql/app_staff_journal/staff_journal_verification.sql b/bin/migrate-oats-data/applications/sql/app_staff_journal/staff_journal_verification.sql new file mode 100644 index 0000000000..44d99cc2aa --- /dev/null +++ b/bin/migrate-oats-data/applications/sql/app_staff_journal/staff_journal_verification.sql @@ -0,0 +1,16 @@ +WITH alcs_rows AS ( + SELECT sj.application_uuid, aa.file_number, sj.body + FROM alcs.staff_journal sj + JOIN alcs.application aa on sj.application_uuid = aa."uuid" + WHERE sj.audit_created_by = 'oats_etl' + ), + oats_rows AS ( + SELECT osje.alr_application_id, osje.journal_text + FROM oats.oats_staff_journal_entries osje + JOIN oats.oats_alr_applications oaa ON osje.alr_application_id = oaa.alr_application_id + WHERE oaa.application_class_code IN ('LOA', 'BLK') +) +select oar.journal_text, oar.alr_application_id, ar.file_number +FROM oats_rows oar +JOIN alcs_rows ar ON oar.journal_text = ar.body +WHERE ar.file_number <> oar.alr_application_id::TEXT; \ No newline at end of file From 9596a9c8d8708ce5b1ee917253c44618c5c10b79 Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Mon, 11 Dec 2023 08:53:50 -0800 Subject: [PATCH 752/954] Write SQL --- .../noi/sql/noi_staff_journal/noi_staff_journal.sql | 3 +++ .../noi/sql/noi_staff_journal/noi_staff_journal_count.sql | 3 +++ 2 files changed, 6 insertions(+) create mode 100644 bin/migrate-oats-data/noi/sql/noi_staff_journal/noi_staff_journal.sql create mode 100644 bin/migrate-oats-data/noi/sql/noi_staff_journal/noi_staff_journal_count.sql diff --git a/bin/migrate-oats-data/noi/sql/noi_staff_journal/noi_staff_journal.sql b/bin/migrate-oats-data/noi/sql/noi_staff_journal/noi_staff_journal.sql new file mode 100644 index 0000000000..b8bde89995 --- /dev/null +++ b/bin/migrate-oats-data/noi/sql/noi_staff_journal/noi_staff_journal.sql @@ -0,0 +1,3 @@ +SELECT osj.journal_date, osj.journal_text, osj.revision_count, osj.staff_journal_entry_id, anoi."uuid" +FROM oats.oats_staff_journal_entries AS osj +JOIN alcs.notice_of_intent AS anoi ON anoi.file_number = osj.alr_application_id::TEXT \ No newline at end of file diff --git a/bin/migrate-oats-data/noi/sql/noi_staff_journal/noi_staff_journal_count.sql b/bin/migrate-oats-data/noi/sql/noi_staff_journal/noi_staff_journal_count.sql new file mode 100644 index 0000000000..013e568e00 --- /dev/null +++ b/bin/migrate-oats-data/noi/sql/noi_staff_journal/noi_staff_journal_count.sql @@ -0,0 +1,3 @@ +SELECT count (*) +FROM oats.oats_staff_journal_entries AS osj +JOIN alcs.notice_of_intent AS anoi ON anoi.file_number = osj.alr_application_id::TEXT \ No newline at end of file From 3fb747b986bf24f95364837588e3e5fcbe34de62 Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Mon, 11 Dec 2023 09:10:32 -0800 Subject: [PATCH 753/954] Write Python script --- .../noi/notice_of_intent_staff_journal.py | 150 ++++++++++++++++++ 1 file changed, 150 insertions(+) create mode 100644 bin/migrate-oats-data/noi/notice_of_intent_staff_journal.py diff --git a/bin/migrate-oats-data/noi/notice_of_intent_staff_journal.py b/bin/migrate-oats-data/noi/notice_of_intent_staff_journal.py new file mode 100644 index 0000000000..c3deb28493 --- /dev/null +++ b/bin/migrate-oats-data/noi/notice_of_intent_staff_journal.py @@ -0,0 +1,150 @@ +from common import ( + BATCH_UPLOAD_SIZE, + OATS_ETL_USER, + setup_and_get_logger, + add_timezone_and_keep_date_part, +) +from db import inject_conn_pool +from psycopg2.extras import RealDictCursor, execute_batch + +etl_name = "noi_staff_journal" +logger = setup_and_get_logger(etl_name) + + +@inject_conn_pool +def process_noi_staff_journal(conn=None, batch_size=BATCH_UPLOAD_SIZE): + """ + Process notice of intent staff journal entries + + Args: + conn (psycopg2.extensions.connection): PostgreSQL database connection. Provided by the decorator. + batch_size (int): The number of items to process at once. Defaults to BATCH_UPLOAD_SIZE. + """ + + logger.info(f"Start {etl_name}") + with conn.cursor(cursor_factory=RealDictCursor) as cursor: + with open( + "noi/sql/noi_staff_journal/noi_staff_journal_count.sql", + "r", + encoding="utf-8", + ) as sql_file: + count_query = sql_file.read() + cursor.execute(count_query) + count_total = dict(cursor.fetchone())["count"] + logger.info(f"Total staff journal entry data to insert: {count_total}") + + failed_inserts = 0 + successful_inserts_count = 0 + last_entry_id = 0 + with open( + "noi/sql/noi_staff_journal/noi_staff_journal.sql", + "r", + encoding="utf-8", + ) as sql_file: + submission_sql = sql_file.read() + while True: + cursor.execute( + f"{submission_sql} WHERE osj.staff_journal_entry_id > '{last_entry_id}' ORDER BY osj.staff_journal_entry_id;" + ) + + rows = cursor.fetchmany(batch_size) + + if not rows: + break + try: + users_to_be_inserted_count = len(rows) + + _insert_users(conn, batch_size, cursor, rows) + + successful_inserts_count = ( + successful_inserts_count + users_to_be_inserted_count + ) + last_entry_id = dict(rows[-1])["staff_journal_entry_id"] + + logger.debug( + f"retrieved/inserted items count: {users_to_be_inserted_count}; total successfully inserted entries so far {successful_inserts_count}; last inserted journal_id: {last_entry_id}" + ) + except Exception as err: + logger.exception(err) + conn.rollback() + failed_inserts = count_total - successful_inserts_count + last_submission_id = last_submission_id + 1 + + logger.info( + f"Finished {etl_name}: total amount of successful inserts {successful_inserts_count}, total failed inserts {failed_inserts}" + ) + + +def _insert_users(conn, batch_size, cursor, rows): + """Get insertion query, process data, and run query""" + + query = _get_insert_query() + parsed_data_list = _prepare_journal_data(rows) + + if len(parsed_data_list) > 0: + execute_batch(cursor, query, parsed_data_list, page_size=batch_size) + + conn.commit() + + +def _get_insert_query(): + query = f""" + INSERT INTO alcs.staff_journal ( + body, + edited, + notice_of_intent_uuid, + created_at, + audit_created_by + ) + VALUES ( + %(journal_text)s, + %(edit)s, + %(uuid)s, + %(journal_date)s, + '{OATS_ETL_USER}' + ) + ON CONFLICT DO NOTHING; + """ + return query + + +def _prepare_journal_data(row_data_list): + """Processes data from OATS into the correct format for ALCS""" + + data_list = [] + for row in row_data_list: + data = dict(row) + data = _map_revision(data) + data = _map_timezone(data) + data_list.append(dict(data)) + + return data_list + + +def _map_revision(data): + revision = data.get("revision_count", "") + # check if edited + if revision == 0: + data["edit"] = False + else: + data["edit"] = True + return data + + +def _map_timezone(data): + date = data.get("journal_date", "") + journal_date = add_timezone_and_keep_date_part(date) + data["journal_date"] = journal_date + return data + + +@inject_conn_pool +def clean_staff_journal(conn=None): + logger.info("Start staff journal cleaning") + with conn.cursor() as cursor: + cursor.execute( + f"DELETE FROM alcs.staff_journal asj WHERE asj.audit_created_by = '{OATS_ETL_USER}'" + ) + logger.info(f"Deleted items count = {cursor.rowcount}") + + conn.commit() From 8290a6008e2ab9dbaf147f8e8f8219f60ecab005 Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Mon, 11 Dec 2023 10:37:17 -0800 Subject: [PATCH 754/954] Fix wrong last ID variable being used in exception --- bin/migrate-oats-data/noi/notice_of_intent_staff_journal.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/migrate-oats-data/noi/notice_of_intent_staff_journal.py b/bin/migrate-oats-data/noi/notice_of_intent_staff_journal.py index c3deb28493..eb232c9715 100644 --- a/bin/migrate-oats-data/noi/notice_of_intent_staff_journal.py +++ b/bin/migrate-oats-data/noi/notice_of_intent_staff_journal.py @@ -68,7 +68,7 @@ def process_noi_staff_journal(conn=None, batch_size=BATCH_UPLOAD_SIZE): logger.exception(err) conn.rollback() failed_inserts = count_total - successful_inserts_count - last_submission_id = last_submission_id + 1 + last_entry_id = last_entry_id + 1 logger.info( f"Finished {etl_name}: total amount of successful inserts {successful_inserts_count}, total failed inserts {failed_inserts}" From eebd014cde2aea8b3b27b9f9e8d64169b25d12b4 Mon Sep 17 00:00:00 2001 From: Liam Stoddard <lstodd@protonmail.com> Date: Mon, 11 Dec 2023 11:15:33 -0800 Subject: [PATCH 755/954] ready for MR --- .../applications/app_staff_journal.py | 5 ++-- .../applications/migrate_application.py | 29 ++++++++++--------- .../staff_journal_verification.sql | 2 +- 3 files changed, 20 insertions(+), 16 deletions(-) diff --git a/bin/migrate-oats-data/applications/app_staff_journal.py b/bin/migrate-oats-data/applications/app_staff_journal.py index 957348e101..31cddf0b37 100644 --- a/bin/migrate-oats-data/applications/app_staff_journal.py +++ b/bin/migrate-oats-data/applications/app_staff_journal.py @@ -135,11 +135,12 @@ def _map_timezone(data): @inject_conn_pool -def clean_staff_journal(conn=None): +def clean_application_staff_journal(conn=None): logger.info("Start staff journal cleaning") + # Only clean applications with conn.cursor() as cursor: cursor.execute( - f"DELETE FROM alcs.staff_journal asj WHERE asj.audit_created_by = '{OATS_ETL_USER}'" + f"DELETE FROM alcs.staff_journal asj WHERE asj.audit_created_by = '{OATS_ETL_USER}' AND asj.application_uuid IS NOT NULL" ) logger.info(f"Deleted items count = {cursor.rowcount}") diff --git a/bin/migrate-oats-data/applications/migrate_application.py b/bin/migrate-oats-data/applications/migrate_application.py index b476f0544c..fa75d982ac 100644 --- a/bin/migrate-oats-data/applications/migrate_application.py +++ b/bin/migrate-oats-data/applications/migrate_application.py @@ -15,26 +15,29 @@ process_application_submission_status_emails, clean_application_submission_status_emails, ) -from .app_staff_journal import process_app_staff_journal, clean_staff_journal +from .app_staff_journal import ( + process_app_staff_journal, + clean_application_staff_journal, +) def process_application_etl(batch_size): - # process_alcs_application_prep_fields(batch_size) - # update_application_date_rx_all_items(batch_size) - # process_alcs_app_submissions(batch_size) - # process_application_statuses(batch_size) - # process_application_parcels(batch_size) - # process_application_owners(batch_size) + process_alcs_application_prep_fields(batch_size) + update_application_date_rx_all_items(batch_size) + process_alcs_app_submissions(batch_size) + process_application_statuses(batch_size) + process_application_parcels(batch_size) + process_application_owners(batch_size) process_app_staff_journal(batch_size) - # process_application_submission_status_emails() + process_application_submission_status_emails() def clean_alcs_applications(): - # clean_application_submission_status_emails() - clean_staff_journal() - # clean_application_parcels() - # clean_app_submissions() - # clean_applications() + clean_application_submission_status_emails() + clean_application_staff_journal() + clean_application_parcels() + clean_app_submissions() + clean_applications() def init_applications(batch_size): diff --git a/bin/migrate-oats-data/applications/sql/app_staff_journal/staff_journal_verification.sql b/bin/migrate-oats-data/applications/sql/app_staff_journal/staff_journal_verification.sql index 44d99cc2aa..c5a2d34bf1 100644 --- a/bin/migrate-oats-data/applications/sql/app_staff_journal/staff_journal_verification.sql +++ b/bin/migrate-oats-data/applications/sql/app_staff_journal/staff_journal_verification.sql @@ -10,7 +10,7 @@ WITH alcs_rows AS ( JOIN oats.oats_alr_applications oaa ON osje.alr_application_id = oaa.alr_application_id WHERE oaa.application_class_code IN ('LOA', 'BLK') ) -select oar.journal_text, oar.alr_application_id, ar.file_number +SELECT oar.journal_text, oar.alr_application_id, ar.file_number FROM oats_rows oar JOIN alcs_rows ar ON oar.journal_text = ar.body WHERE ar.file_number <> oar.alr_application_id::TEXT; \ No newline at end of file From 0b4eb5b5994b335fda2d0557d2f21ec10ad00360 Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Mon, 11 Dec 2023 11:22:00 -0800 Subject: [PATCH 756/954] Specialize NOI staff journal clean function --- bin/migrate-oats-data/noi/notice_of_intent_staff_journal.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/migrate-oats-data/noi/notice_of_intent_staff_journal.py b/bin/migrate-oats-data/noi/notice_of_intent_staff_journal.py index eb232c9715..27280adc3f 100644 --- a/bin/migrate-oats-data/noi/notice_of_intent_staff_journal.py +++ b/bin/migrate-oats-data/noi/notice_of_intent_staff_journal.py @@ -139,11 +139,11 @@ def _map_timezone(data): @inject_conn_pool -def clean_staff_journal(conn=None): +def clean_noi_staff_journal(conn=None): logger.info("Start staff journal cleaning") with conn.cursor() as cursor: cursor.execute( - f"DELETE FROM alcs.staff_journal asj WHERE asj.audit_created_by = '{OATS_ETL_USER}'" + f"DELETE FROM alcs.staff_journal AS asj WHERE asj.audit_created_by = '{OATS_ETL_USER}' AND asj.notice_of_intent_uuid IS NOT NULL" ) logger.info(f"Deleted items count = {cursor.rowcount}") From 73a067958d8e2dc8b10eb6d64e602a6296c0f516 Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Mon, 11 Dec 2023 11:23:31 -0800 Subject: [PATCH 757/954] Add NOI import and clean functions to pipeline --- bin/migrate-oats-data/noi/notice_of_intent_migration.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/bin/migrate-oats-data/noi/notice_of_intent_migration.py b/bin/migrate-oats-data/noi/notice_of_intent_migration.py index baae10076e..9ba0465794 100644 --- a/bin/migrate-oats-data/noi/notice_of_intent_migration.py +++ b/bin/migrate-oats-data/noi/notice_of_intent_migration.py @@ -48,12 +48,18 @@ link_notice_of_intent_primary_contacts, ) +from noi.notice_of_intent_staff_journal import ( + process_noi_staff_journal, + clean_noi_staff_journal, +) + def init_notice_of_intent(batch_size): init_notice_of_intents(batch_size=batch_size) def clean_notice_of_intent(): + clean_noi_staff_journal() clean_primary_contacts() clean_parcel_owners() clean_owners() @@ -112,5 +118,7 @@ def process_notice_of_intent(batch_size): link_notice_of_intent_primary_contacts(batch_size) + process_noi_staff_journal(batch_size) + # this script must be the last one process_notice_of_intent_submission_status_emails() From b8aac10ab566dc1b7802955614b6b0a552967ec9 Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Mon, 11 Dec 2023 13:03:22 -0800 Subject: [PATCH 758/954] Write NOI staff journal verification script --- .../noi_staff_journal_verification.sql | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 bin/migrate-oats-data/noi/sql/noi_staff_journal/noi_staff_journal_verification.sql diff --git a/bin/migrate-oats-data/noi/sql/noi_staff_journal/noi_staff_journal_verification.sql b/bin/migrate-oats-data/noi/sql/noi_staff_journal/noi_staff_journal_verification.sql new file mode 100644 index 0000000000..1444e3f0b4 --- /dev/null +++ b/bin/migrate-oats-data/noi/sql/noi_staff_journal/noi_staff_journal_verification.sql @@ -0,0 +1,16 @@ +WITH alcs_rows AS ( + SELECT asj.application_uuid, anoi.file_number, asj.body + FROM alcs.staff_journal AS asj + JOIN alcs.notice_of_intent AS anoi on asj.notice_of_intent_uuid = anoi."uuid" + WHERE asj.audit_created_by = 'oats_etl' + ), + oats_rows AS ( + SELECT osje.alr_application_id, osje.journal_text + FROM oats.oats_staff_journal_entries AS osje + JOIN oats.oats_alr_applications AS oaa ON osje.alr_application_id = oaa.alr_application_id + WHERE oaa.application_class_code = 'NOI' +) +SELECT oar.journal_text, oar.alr_application_id, ar.file_number +FROM oats_rows AS oar +JOIN alcs_rows AS ar ON oar.journal_text = ar.body +WHERE ar.file_number <> oar.alr_application_id::TEXT; \ No newline at end of file From d6c790496f1bf65cfe6befddf5205c4d934373d3 Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Mon, 11 Dec 2023 14:09:15 -0800 Subject: [PATCH 759/954] properly link owners to parcels (#1215) added indexes to speed up etl insert and delete for applications added SOURCE set to APPLICANT for applications imported with ETL relinked application owners to parcels relinked noi owners to parcels --- .../applications/base_applications.py | 2 +- .../sql/insert-batch-application.sql | 3 +- .../parcels/application_parcel_insert.py | 4 +- .../parcels/owners/application_owners.py | 2 + .../parcels/application_parcels_insert.sql | 3 +- .../sql/parcels/owners/application_owner.sql | 1 + .../application_parcel_owner_linking.sql | 2 + ...application_parcel_owner_linking_count.sql | 2 + .../parcels/notice_of_intent_parcel_insert.py | 4 +- .../parcels/owners/notice_of_intent_owners.py | 2 + .../notice_of_intent_parcels_insert.sql | 3 +- .../parcels/owners/notice_of_intent_owner.sql | 3 +- .../notice_of_intent_parcel_owner_linking.sql | 2 + ...e_of_intent_parcel_owner_linking_count.sql | 2 + .../application-decision-meeting.entity.ts | 3 +- .../application-document.entity.ts | 4 +- .../application-meeting.entity.ts | 10 ++++- .../application/application-paused.entity.ts | 3 +- .../alcs/application/application.entity.ts | 1 + .../application-owner.entity.ts | 11 ++++- .../application-parcel.entity.ts | 9 ++++ .../notice-of-intent-owner.entity.ts | 9 ++++ .../notice-of-intent-parcel.entity.ts | 9 ++++ ...92253115-add_oats_property_id_to_parcel.ts | 25 +++++++++++ ...roperty_interes_id_to_application_owner.ts | 25 +++++++++++ .../1702317710836-application_indexes.ts | 41 +++++++++++++++++++ ...0-add_oats_columns_to_noi_parcel_owners.ts | 37 +++++++++++++++++ 27 files changed, 210 insertions(+), 12 deletions(-) create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1701992253115-add_oats_property_id_to_parcel.ts create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1701993162234-add_oats_property_interes_id_to_application_owner.ts create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1702317710836-application_indexes.ts create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1702320761790-add_oats_columns_to_noi_parcel_owners.ts diff --git a/bin/migrate-oats-data/applications/base_applications.py b/bin/migrate-oats-data/applications/base_applications.py index 30c515de6c..af8e6e86b8 100644 --- a/bin/migrate-oats-data/applications/base_applications.py +++ b/bin/migrate-oats-data/applications/base_applications.py @@ -109,7 +109,7 @@ def _compile_application_insert_query(number_of_rows_to_insert): applications_to_insert = ",".join(["%s"] * number_of_rows_to_insert) return f""" INSERT INTO alcs.application (file_number, type_code, - applicant, region_code, local_government_uuid, audit_created_by) + applicant, region_code, local_government_uuid, audit_created_by, source) VALUES{applications_to_insert} ON CONFLICT (file_number) DO UPDATE SET diff --git a/bin/migrate-oats-data/applications/sql/insert-batch-application.sql b/bin/migrate-oats-data/applications/sql/insert-batch-application.sql index 37a1ea29e2..47cd062a2c 100644 --- a/bin/migrate-oats-data/applications/sql/insert-batch-application.sql +++ b/bin/migrate-oats-data/applications/sql/insert-batch-application.sql @@ -153,7 +153,8 @@ SELECT END AS applicant, ar.code AS region_code, alcs_gov.gov_uuid AS local_government_uuid, - 'oats_etl' + 'oats_etl', + 'APPLICANT' as source FROM oats.oats_alr_applications AS oa JOIN oats.alcs_etl_application_duplicate AS ae ON oa.alr_application_id = ae.application_id AND ae.duplicated IS false diff --git a/bin/migrate-oats-data/applications/submissions/parcels/application_parcel_insert.py b/bin/migrate-oats-data/applications/submissions/parcels/application_parcel_insert.py index 88c3e5d8f3..824ac00e84 100644 --- a/bin/migrate-oats-data/applications/submissions/parcels/application_parcel_insert.py +++ b/bin/migrate-oats-data/applications/submissions/parcels/application_parcel_insert.py @@ -107,6 +107,7 @@ def _map_data(row): "pin": row["pin"], "purchased_date": _map_purchased_date(row["purchase_date"]), "oats_subject_property_id": row["subject_property_id"], + "oats_property_id": row["property_id"], } @@ -143,7 +144,8 @@ def _compile_application_insert_query(number_of_rows_to_insert): pid, pin, purchased_date, - oats_subject_property_id + oats_subject_property_id, + oats_property_id ) VALUES{parcels_to_insert} ON CONFLICT DO NOTHING diff --git a/bin/migrate-oats-data/applications/submissions/parcels/owners/application_owners.py b/bin/migrate-oats-data/applications/submissions/parcels/owners/application_owners.py index abe23b7eca..b734011326 100644 --- a/bin/migrate-oats-data/applications/submissions/parcels/owners/application_owners.py +++ b/bin/migrate-oats-data/applications/submissions/parcels/owners/application_owners.py @@ -95,6 +95,7 @@ def _compile_owner_insert_query(number_of_rows_to_insert): phone_number, type_code, oats_person_organization_id, + oats_property_interest_id, audit_created_by ) VALUES{owners_to_insert} @@ -121,6 +122,7 @@ def _map_data(row): "phone_number": row.get("phone_number", "cell_phone_number"), "type_code": _map_owner_type(row), "oats_person_organization_id": row["person_organization_id"], + "oats_property_interest_id": row["property_interest_id"], "audit_created_by": OATS_ETL_USER, } diff --git a/bin/migrate-oats-data/applications/submissions/sql/parcels/application_parcels_insert.sql b/bin/migrate-oats-data/applications/submissions/sql/parcels/application_parcels_insert.sql index 8d041179cf..56bbe34bc5 100644 --- a/bin/migrate-oats-data/applications/submissions/sql/parcels/application_parcels_insert.sql +++ b/bin/migrate-oats-data/applications/submissions/sql/parcels/application_parcels_insert.sql @@ -22,7 +22,8 @@ SELECT uuid AS application_submission_uuid, op.pin, osp.purchase_date, gopi.property_owner_type_code, - osp.subject_property_id + osp.subject_property_id, + op.property_id FROM parcels_to_insert pti JOIN oats.oats_subject_properties osp ON osp.subject_property_id = pti.subject_property_id JOIN oats.oats_properties op ON op.property_id = osp.property_id diff --git a/bin/migrate-oats-data/applications/submissions/sql/parcels/owners/application_owner.sql b/bin/migrate-oats-data/applications/submissions/sql/parcels/owners/application_owner.sql index b24afb53fc..00d57d26cb 100644 --- a/bin/migrate-oats-data/applications/submissions/sql/parcels/owners/application_owner.sql +++ b/bin/migrate-oats-data/applications/submissions/sql/parcels/owners/application_owner.sql @@ -1,6 +1,7 @@ -- retrieve owners per parcel SELECT osp.subject_property_id, opo.person_organization_id, + opi.property_interest_id, op.person_id, op.first_name, op.last_name, diff --git a/bin/migrate-oats-data/applications/submissions/sql/parcels/owners/application_parcel_owner_linking.sql b/bin/migrate-oats-data/applications/submissions/sql/parcels/owners/application_parcel_owner_linking.sql index ccd216f790..f3c3a6f5de 100644 --- a/bin/migrate-oats-data/applications/submissions/sql/parcels/owners/application_parcel_owner_linking.sql +++ b/bin/migrate-oats-data/applications/submissions/sql/parcels/owners/application_parcel_owner_linking.sql @@ -6,7 +6,9 @@ SELECT apps.file_number, FROM oats.OATS_PROPERTY_INTERESTS opi JOIN oats.OATS_SUBJECT_PROPERTIES osp ON osp.SUBJECT_PROPERTY_ID = opi.SUBJECT_PROPERTY_ID JOIN alcs.application_parcel appp ON appp.oats_subject_property_id = osp.subject_property_id + AND appp.oats_property_id = osp.property_id JOIN alcs.application_owner appo ON appo.oats_person_organization_id = opi.PERSON_ORGANIZATION_ID + AND appo.oats_property_interest_id = opi.property_interest_id LEFT JOIN alcs.application_submission apps ON apps."uuid" = appp.application_submission_uuid WHERE appp.audit_created_by = 'oats_etl' AND appo.audit_created_by = 'oats_etl' \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/submissions/sql/parcels/owners/application_parcel_owner_linking_count.sql b/bin/migrate-oats-data/applications/submissions/sql/parcels/owners/application_parcel_owner_linking_count.sql index 40c4f1e55a..16ed67bec8 100644 --- a/bin/migrate-oats-data/applications/submissions/sql/parcels/owners/application_parcel_owner_linking_count.sql +++ b/bin/migrate-oats-data/applications/submissions/sql/parcels/owners/application_parcel_owner_linking_count.sql @@ -2,7 +2,9 @@ SELECT count(*) FROM oats.OATS_PROPERTY_INTERESTS opi JOIN oats.OATS_SUBJECT_PROPERTIES osp ON osp.SUBJECT_PROPERTY_ID = opi.SUBJECT_PROPERTY_ID JOIN alcs.application_parcel appp ON appp.oats_subject_property_id = osp.subject_property_id + AND appp.oats_property_id = osp.property_id JOIN alcs.application_owner appo ON appo.oats_person_organization_id = opi.PERSON_ORGANIZATION_ID + AND appo.oats_property_interest_id = opi.property_interest_id LEFT JOIN alcs.application_submission apps ON apps."uuid" = appp.application_submission_uuid WHERE appp.audit_created_by = 'oats_etl' AND appo.audit_created_by = 'oats_etl' \ No newline at end of file diff --git a/bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/notice_of_intent_parcel_insert.py b/bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/notice_of_intent_parcel_insert.py index 35be625254..3357e94dae 100644 --- a/bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/notice_of_intent_parcel_insert.py +++ b/bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/notice_of_intent_parcel_insert.py @@ -107,6 +107,7 @@ def _map_data(row): "pin": row["pin"], "purchased_date": _map_purchased_date(row["purchase_date"]), "oats_subject_property_id": row["subject_property_id"], + "oats_property_id": row["property_id"], } @@ -143,7 +144,8 @@ def _compile_application_insert_query(number_of_rows_to_insert): pid, pin, purchased_date, - oats_subject_property_id + oats_subject_property_id, + oats_property_id ) VALUES{parcels_to_insert} ON CONFLICT DO NOTHING diff --git a/bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/owners/notice_of_intent_owners.py b/bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/owners/notice_of_intent_owners.py index aae90b417b..bdeaf0d20a 100644 --- a/bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/owners/notice_of_intent_owners.py +++ b/bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/owners/notice_of_intent_owners.py @@ -95,6 +95,7 @@ def _compile_owner_insert_query(number_of_rows_to_insert): phone_number, type_code, oats_person_organization_id, + oats_property_interest_id, audit_created_by ) VALUES{owners_to_insert} @@ -121,6 +122,7 @@ def _map_data(row): "phone_number": row.get("phone_number", "cell_phone_number"), "type_code": _map_owner_type(row), "oats_person_organization_id": row["person_organization_id"], + "oats_property_interest_id": row["property_interest_id"], "audit_created_by": OATS_ETL_USER, } diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/notice_of_intent_parcels_insert.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/notice_of_intent_parcels_insert.sql index 999f6cd68b..4046b089fe 100644 --- a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/notice_of_intent_parcels_insert.sql +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/notice_of_intent_parcels_insert.sql @@ -22,7 +22,8 @@ SELECT uuid AS notice_of_intent_submission_uuid, op.pin, osp.purchase_date, gopi.property_owner_type_code, - osp.subject_property_id + osp.subject_property_id, + op.property_id FROM parcels_to_insert pti JOIN oats.oats_subject_properties osp ON osp.subject_property_id = pti.subject_property_id JOIN oats.oats_properties op ON op.property_id = osp.property_id diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/owners/notice_of_intent_owner.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/owners/notice_of_intent_owner.sql index d11b653b32..500af26313 100644 --- a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/owners/notice_of_intent_owner.sql +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/owners/notice_of_intent_owner.sql @@ -13,7 +13,8 @@ SELECT osp.subject_property_id, noip.ownership_type_code, opi.prin_type, opi.active_ind, - noip.notice_of_intent_submission_uuid + noip.notice_of_intent_submission_uuid, + opi.property_interest_id FROM oats.OATS_PROPERTY_INTERESTS opi JOIN oats.OATS_SUBJECT_PROPERTIES osp ON osp.SUBJECT_PROPERTY_ID = opi.SUBJECT_PROPERTY_ID JOIN alcs.notice_of_intent_parcel noip ON noip.oats_subject_property_id = osp.subject_property_id -- ensure GET records only for parcels imported into ALCS diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/owners/notice_of_intent_parcel_owner_linking.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/owners/notice_of_intent_parcel_owner_linking.sql index 6bf2a22067..de84e91998 100644 --- a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/owners/notice_of_intent_parcel_owner_linking.sql +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/owners/notice_of_intent_parcel_owner_linking.sql @@ -6,7 +6,9 @@ SELECT nois.file_number, FROM oats.OATS_PROPERTY_INTERESTS opi JOIN oats.OATS_SUBJECT_PROPERTIES osp ON osp.SUBJECT_PROPERTY_ID = opi.SUBJECT_PROPERTY_ID JOIN alcs.notice_of_intent_parcel noip ON noip.oats_subject_property_id = osp.subject_property_id + AND noip.oats_property_id = osp.property_id JOIN alcs.notice_of_intent_owner noio ON noio.oats_person_organization_id = opi.PERSON_ORGANIZATION_ID + AND noio.oats_property_interest_id = opi.property_interest_id LEFT JOIN alcs.notice_of_intent_submission nois ON nois."uuid" = noip.notice_of_intent_submission_uuid WHERE noip.audit_created_by = 'oats_etl' AND noio.audit_created_by = 'oats_etl' \ No newline at end of file diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/owners/notice_of_intent_parcel_owner_linking_count.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/owners/notice_of_intent_parcel_owner_linking_count.sql index 1e78d52777..c80278b428 100644 --- a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/owners/notice_of_intent_parcel_owner_linking_count.sql +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/owners/notice_of_intent_parcel_owner_linking_count.sql @@ -2,7 +2,9 @@ SELECT count(*) FROM oats.OATS_PROPERTY_INTERESTS opi JOIN oats.OATS_SUBJECT_PROPERTIES osp ON osp.SUBJECT_PROPERTY_ID = opi.SUBJECT_PROPERTY_ID JOIN alcs.notice_of_intent_parcel noip ON noip.oats_subject_property_id = osp.subject_property_id + AND noip.oats_property_id = osp.property_id JOIN alcs.notice_of_intent_owner noio ON noio.oats_person_organization_id = opi.PERSON_ORGANIZATION_ID + AND noio.oats_property_interest_id = opi.property_interest_id LEFT JOIN alcs.notice_of_intent_submission nois ON nois."uuid" = noip.notice_of_intent_submission_uuid WHERE noip.audit_created_by = 'oats_etl' AND noio.audit_created_by = 'oats_etl' \ No newline at end of file diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v1/application-decision-meeting/application-decision-meeting.entity.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v1/application-decision-meeting/application-decision-meeting.entity.ts index 9dbe5b9ebf..0544fe63e9 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v1/application-decision-meeting/application-decision-meeting.entity.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v1/application-decision-meeting/application-decision-meeting.entity.ts @@ -1,5 +1,5 @@ import { AutoMap } from 'automapper-classes'; -import { Column, Entity, ManyToOne } from 'typeorm'; +import { Column, Entity, Index, ManyToOne } from 'typeorm'; import { Base } from '../../../../common/entities/base.entity'; import { Application } from '../../../application/application.entity'; @@ -17,6 +17,7 @@ export class ApplicationDecisionMeeting extends Base { date: Date; @AutoMap() + @Index() @Column() applicationUuid: string; diff --git a/services/apps/alcs/src/alcs/application/application-document/application-document.entity.ts b/services/apps/alcs/src/alcs/application/application-document/application-document.entity.ts index adaf0817b1..f067b28b95 100644 --- a/services/apps/alcs/src/alcs/application/application-document/application-document.entity.ts +++ b/services/apps/alcs/src/alcs/application/application-document/application-document.entity.ts @@ -3,15 +3,16 @@ import { BaseEntity, Column, Entity, + Index, JoinColumn, ManyToOne, OneToOne, PrimaryGeneratedColumn, Unique, } from 'typeorm'; +import { DocumentCode } from '../../../document/document-code.entity'; import { Document } from '../../../document/document.entity'; import { Application } from '../application.entity'; -import { DocumentCode } from '../../../document/document-code.entity'; export enum VISIBILITY_FLAG { APPLICANT = 'A', @@ -47,6 +48,7 @@ export class ApplicationDocument extends BaseEntity { application: Application; @Column() + @Index() applicationUuid: string; @Column({ nullable: true, type: 'uuid' }) diff --git a/services/apps/alcs/src/alcs/application/application-meeting/application-meeting.entity.ts b/services/apps/alcs/src/alcs/application/application-meeting/application-meeting.entity.ts index 20cc8e38ae..a2458e018c 100644 --- a/services/apps/alcs/src/alcs/application/application-meeting/application-meeting.entity.ts +++ b/services/apps/alcs/src/alcs/application/application-meeting/application-meeting.entity.ts @@ -1,6 +1,13 @@ import { AutoMap } from 'automapper-classes'; import { Type } from 'class-transformer'; -import { Column, Entity, JoinColumn, ManyToOne, OneToOne } from 'typeorm'; +import { + Column, + Entity, + Index, + JoinColumn, + ManyToOne, + OneToOne, +} from 'typeorm'; import { Base } from '../../../common/entities/base.entity'; import { ApplicationMeetingType } from '../../code/application-code/application-meeting-type/application-meeting-type.entity'; import { ApplicationPaused } from '../application-paused.entity'; @@ -29,6 +36,7 @@ export class ApplicationMeeting extends Base { @AutoMap() @Column() + @Index() applicationUuid: string; @AutoMap() diff --git a/services/apps/alcs/src/alcs/application/application-paused.entity.ts b/services/apps/alcs/src/alcs/application/application-paused.entity.ts index deb16719f2..7b3a89ea1a 100644 --- a/services/apps/alcs/src/alcs/application/application-paused.entity.ts +++ b/services/apps/alcs/src/alcs/application/application-paused.entity.ts @@ -1,4 +1,4 @@ -import { Column, Entity, ManyToOne } from 'typeorm'; +import { Column, Entity, Index, ManyToOne } from 'typeorm'; import { Base } from '../../common/entities/base.entity'; import { Application } from './application.entity'; @@ -29,5 +29,6 @@ export class ApplicationPaused extends Base { application: Application; @Column() + @Index() applicationUuid: string; } diff --git a/services/apps/alcs/src/alcs/application/application.entity.ts b/services/apps/alcs/src/alcs/application/application.entity.ts index 6470847100..4930b9e378 100644 --- a/services/apps/alcs/src/alcs/application/application.entity.ts +++ b/services/apps/alcs/src/alcs/application/application.entity.ts @@ -292,6 +292,7 @@ export class Application extends Base { card: Card | null; @AutoMap() + @Index() @Column({ type: 'uuid', nullable: true, diff --git a/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.entity.ts b/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.entity.ts index 6eb625c510..556cca154d 100644 --- a/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.entity.ts +++ b/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.entity.ts @@ -3,9 +3,9 @@ import { Column, Entity, JoinColumn, ManyToMany, ManyToOne } from 'typeorm'; import { ApplicationDocumentDto } from '../../../alcs/application/application-document/application-document.dto'; import { ApplicationDocument } from '../../../alcs/application/application-document/application-document.entity'; import { Base } from '../../../common/entities/base.entity'; +import { OwnerType } from '../../../common/owner-type/owner-type.entity'; import { ApplicationParcel } from '../application-parcel/application-parcel.entity'; import { ApplicationSubmission } from '../application-submission.entity'; -import { OwnerType } from '../../../common/owner-type/owner-type.entity'; @Entity() export class ApplicationOwner extends Base { @@ -60,6 +60,15 @@ export class ApplicationOwner extends Base { }) oatsPersonOrganizationId: number; + @Column({ + select: false, + nullable: true, + type: 'int8', + comment: + 'This column is NOT related to any functionality in ALCS. It is only used for ETL and backtracking of imported data from OATS. It links oats.oats_property_interest to alcs.application_owner. Note that this id is unique only in scope of parcel.', + }) + oatsPropertyInterestId: number; + @AutoMap(() => ApplicationDocumentDto) @ManyToOne(() => ApplicationDocument, { onDelete: 'SET NULL', diff --git a/services/apps/alcs/src/portal/application-submission/application-parcel/application-parcel.entity.ts b/services/apps/alcs/src/portal/application-submission/application-parcel/application-parcel.entity.ts index 53feeb284f..0af3654168 100644 --- a/services/apps/alcs/src/portal/application-submission/application-parcel/application-parcel.entity.ts +++ b/services/apps/alcs/src/portal/application-submission/application-parcel/application-parcel.entity.ts @@ -153,4 +153,13 @@ export class ApplicationParcel extends Base { 'This column is NOT related to any functionality in ALCS. It is only used for ETL and backtracking of imported data from OATS. It links oats.oats_subject_properties to alcs.application_parcel.', }) oatsSubjectPropertyId: number; + + @Column({ + select: false, + nullable: true, + type: 'int8', + comment: + 'This column is NOT related to any functionality in ALCS. It is only used for ETL and backtracking of imported data from OATS. It links oats.oats_properties to alcs.application_parcel.', + }) + oatsPropertyId: number; } diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.entity.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.entity.ts index e153bee759..d79625dc04 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.entity.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.entity.ts @@ -69,6 +69,15 @@ export class NoticeOfIntentOwner extends Base { }) oatsApplicationPartyId: number; + @Column({ + select: false, + nullable: true, + type: 'int8', + comment: + 'This column is NOT related to any functionality in ALCS. It is only used for ETL and backtracking of imported data from OATS. It links oats.oats_property_interest to alcs.notice_of_intent_owner.', + }) + oatsPropertyInterestId: number; + @AutoMap(() => NoticeOfIntentDocumentDto) @ManyToOne(() => NoticeOfIntentDocument, { onDelete: 'SET NULL', diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.entity.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.entity.ts index 1357c1364a..c742f73e3b 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.entity.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.entity.ts @@ -153,4 +153,13 @@ export class NoticeOfIntentParcel extends Base { 'This column is NOT related to any functionality in ALCS. It is only used for ETL and backtracking of imported data from OATS. It links oats.oats_subject_properties to alcs.notice_of_intent_parcel.', }) oatsSubjectPropertyId: number; + + @Column({ + select: false, + nullable: true, + type: 'int8', + comment: + 'This column is NOT related to any functionality in ALCS. It is only used for ETL and backtracking of imported data from OATS. It links oats.oats_properties to alcs.notice_of_intent_parcel.', + }) + oatsPropertyId: number; } diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1701992253115-add_oats_property_id_to_parcel.ts b/services/apps/alcs/src/providers/typeorm/migrations/1701992253115-add_oats_property_id_to_parcel.ts new file mode 100644 index 0000000000..6c221b69b5 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1701992253115-add_oats_property_id_to_parcel.ts @@ -0,0 +1,25 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class AddOatsPropertyIdToParcel1701992253115 + implements MigrationInterface +{ + name = 'AddOatsPropertyIdToParcel1701992253115'; + + public async up(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `ALTER TABLE "alcs"."application_parcel" ADD "oats_property_id" bigint`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."application_parcel"."oats_property_id" IS 'This column is NOT related to any functionality in ALCS. It is only used for ETL and backtracking of imported data from OATS. It links oats.oats_properties to alcs.application_parcel.'`, + ); + } + + public async down(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."application_parcel"."oats_property_id" IS 'This column is NOT related to any functionality in ALCS. It is only used for ETL and backtracking of imported data from OATS. It links oats.oats_properties to alcs.application_parcel.'`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_parcel" DROP COLUMN "oats_property_id"`, + ); + } +} diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1701993162234-add_oats_property_interes_id_to_application_owner.ts b/services/apps/alcs/src/providers/typeorm/migrations/1701993162234-add_oats_property_interes_id_to_application_owner.ts new file mode 100644 index 0000000000..15a914316b --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1701993162234-add_oats_property_interes_id_to_application_owner.ts @@ -0,0 +1,25 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class AddOatsPropertyInteresIdToApplicationOwner1701993162234 + implements MigrationInterface +{ + name = 'AddOatsPropertyInteresIdToApplicationOwner1701993162234'; + + public async up(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `ALTER TABLE "alcs"."application_owner" ADD "oats_property_interest_id" bigint`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."application_owner"."oats_property_interest_id" IS 'This column is NOT related to any functionality in ALCS. It is only used for ETL and backtracking of imported data from OATS. It links oats.oats_property_interest to alcs.application_owner. Note that this id is unique only in scope of parcel.'`, + ); + } + + public async down(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."application_owner"."oats_property_interest_id" IS 'This column is NOT related to any functionality in ALCS. It is only used for ETL and backtracking of imported data from OATS. It links oats.oats_property_interest to alcs.application_owner. Note that this id is unique only in scope of parcel.'`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_owner" DROP COLUMN "oats_property_interest_id"`, + ); + } +} diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1702317710836-application_indexes.ts b/services/apps/alcs/src/providers/typeorm/migrations/1702317710836-application_indexes.ts new file mode 100644 index 0000000000..6273cb588c --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1702317710836-application_indexes.ts @@ -0,0 +1,41 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class ApplicationIndexes1702317710836 implements MigrationInterface { + name = 'ApplicationIndexes1702317710836'; + + public async up(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `CREATE INDEX "IDX_8629d5787d89267d417dcbb369" ON "alcs"."application_decision_meeting" ("application_uuid") `, + ); + await queryRunner.query( + `CREATE INDEX "IDX_6c496454f95f229c63679bf191" ON "alcs"."application_document" ("application_uuid") `, + ); + await queryRunner.query( + `CREATE INDEX "IDX_57e39f7c811d07c646fc04e8bd" ON "alcs"."application_paused" ("application_uuid") `, + ); + await queryRunner.query( + `CREATE INDEX "IDX_4a7e09569765e147304194b63f" ON "alcs"."application_meeting" ("application_uuid") `, + ); + await queryRunner.query( + `CREATE INDEX "IDX_21eddf92cb75ff3cc0c99b80d8" ON "alcs"."application" ("card_uuid") `, + ); + } + + public async down(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `DROP INDEX "alcs"."IDX_21eddf92cb75ff3cc0c99b80d8"`, + ); + await queryRunner.query( + `DROP INDEX "alcs"."IDX_4a7e09569765e147304194b63f"`, + ); + await queryRunner.query( + `DROP INDEX "alcs"."IDX_57e39f7c811d07c646fc04e8bd"`, + ); + await queryRunner.query( + `DROP INDEX "alcs"."IDX_6c496454f95f229c63679bf191"`, + ); + await queryRunner.query( + `DROP INDEX "alcs"."IDX_8629d5787d89267d417dcbb369"`, + ); + } +} diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1702320761790-add_oats_columns_to_noi_parcel_owners.ts b/services/apps/alcs/src/providers/typeorm/migrations/1702320761790-add_oats_columns_to_noi_parcel_owners.ts new file mode 100644 index 0000000000..7717c51324 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1702320761790-add_oats_columns_to_noi_parcel_owners.ts @@ -0,0 +1,37 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class AddOatsColumnsToNoiParcelOwners1702320761790 + implements MigrationInterface +{ + name = 'AddOatsColumnsToNoiParcelOwners1702320761790'; + + public async up(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_parcel" ADD "oats_property_id" bigint`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."notice_of_intent_parcel"."oats_property_id" IS 'This column is NOT related to any functionality in ALCS. It is only used for ETL and backtracking of imported data from OATS. It links oats.oats_properties to alcs.notice_of_intent_parcel.'`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_owner" ADD "oats_property_interest_id" bigint`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."notice_of_intent_owner"."oats_property_interest_id" IS 'This column is NOT related to any functionality in ALCS. It is only used for ETL and backtracking of imported data from OATS. It links oats.oats_property_interest to alcs.notice_of_intent_owner.'`, + ); + } + + public async down(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."notice_of_intent_owner"."oats_property_interest_id" IS 'This column is NOT related to any functionality in ALCS. It is only used for ETL and backtracking of imported data from OATS. It links oats.oats_property_interest to alcs.notice_of_intent_owner.'`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_owner" DROP COLUMN "oats_property_interest_id"`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."notice_of_intent_parcel"."oats_property_id" IS 'This column is NOT related to any functionality in ALCS. It is only used for ETL and backtracking of imported data from OATS. It links oats.oats_properties to alcs.notice_of_intent_parcel.'`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_parcel" DROP COLUMN "oats_property_id"`, + ); + } +} From 8dd981248288c89185e64e7a9e36598991798ada Mon Sep 17 00:00:00 2001 From: Liam Stoddard <lstodd@protonmail.com> Date: Mon, 11 Dec 2023 14:12:11 -0800 Subject: [PATCH 760/954] fixed exception bug --- bin/migrate-oats-data/applications/app_staff_journal.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/migrate-oats-data/applications/app_staff_journal.py b/bin/migrate-oats-data/applications/app_staff_journal.py index 31cddf0b37..ac8d5e57ee 100644 --- a/bin/migrate-oats-data/applications/app_staff_journal.py +++ b/bin/migrate-oats-data/applications/app_staff_journal.py @@ -68,7 +68,7 @@ def process_app_staff_journal(conn=None, batch_size=BATCH_UPLOAD_SIZE): logger.exception() conn.rollback() failed_inserts = count_total - successful_inserts_count - last_submission_id = last_submission_id + 1 + last_entry_id = last_entry_id + 1 logger.info( f"Finished {etl_name}: total amount of successful inserts {successful_inserts_count}, total failed inserts {failed_inserts}" From 19326ac1472288477a5cfac8d7b5e2c7e9db8396 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Mon, 11 Dec 2023 15:24:56 -0800 Subject: [PATCH 761/954] Add Success page for App & Noi Submissions * Add app fees into the DB * Fix bug with backend validation counting unlinked owners --- .../edit-submission-base.module.ts | 5 + .../edit-submission.component.ts | 2 +- .../edit-submission/edit-submission.module.ts | 5 + .../primary-contact.component.ts | 1 - .../review-and-submit.component.spec.ts | 4 +- .../review-and-submit.component.ts | 5 - .../success/success.component.html | 54 +++++++++++ .../success/success.component.scss | 24 +++++ .../success/success.component.spec.ts | 67 ++++++++++++++ .../success/success.component.ts | 91 +++++++++++++++++++ .../edit-submission-base.module.ts | 5 + .../edit-submission.component.ts | 3 +- .../edit-submission/edit-submission.module.ts | 5 + .../success/success.component.html | 29 ++++++ .../success/success.component.scss | 24 +++++ .../success/success.component.spec.ts | 68 ++++++++++++++ .../success/success.component.ts | 71 +++++++++++++++ .../src/app/services/code/code.dto.ts | 4 + .../alcs/application/application.service.ts | 2 + .../application-type/application-type.dto.ts | 6 ++ .../application-type.entity.ts | 23 +++++ .../notice-of-intent-type.entity.ts | 23 +++++ ...ation-submission-validator.service.spec.ts | 5 + ...pplication-submission-validator.service.ts | 14 ++- ...ntent-submission-validator.service.spec.ts | 11 ++- ...-of-intent-submission-validator.service.ts | 24 +++-- .../1702318414883-add_app_type_fees.ts | 35 +++++++ .../1702322475280-seed_app_type_fees.ts | 22 +++++ .../status-emails.consumer.ts | 2 +- 29 files changed, 609 insertions(+), 25 deletions(-) create mode 100644 portal-frontend/src/app/features/applications/edit-submission/success/success.component.html create mode 100644 portal-frontend/src/app/features/applications/edit-submission/success/success.component.scss create mode 100644 portal-frontend/src/app/features/applications/edit-submission/success/success.component.spec.ts create mode 100644 portal-frontend/src/app/features/applications/edit-submission/success/success.component.ts create mode 100644 portal-frontend/src/app/features/notice-of-intents/edit-submission/success/success.component.html create mode 100644 portal-frontend/src/app/features/notice-of-intents/edit-submission/success/success.component.scss create mode 100644 portal-frontend/src/app/features/notice-of-intents/edit-submission/success/success.component.spec.ts create mode 100644 portal-frontend/src/app/features/notice-of-intents/edit-submission/success/success.component.ts create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1702318414883-add_app_type_fees.ts create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1702322475280-seed_app_type_fees.ts diff --git a/portal-frontend/src/app/features/applications/edit-submission/edit-submission-base.module.ts b/portal-frontend/src/app/features/applications/edit-submission/edit-submission-base.module.ts index 59f00bc136..022e838f23 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/edit-submission-base.module.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/edit-submission-base.module.ts @@ -6,6 +6,7 @@ import { MatFormFieldModule } from '@angular/material/form-field'; import { MatInputModule } from '@angular/material/input'; import { MatSelectModule } from '@angular/material/select'; import { MatTableModule } from '@angular/material/table'; +import { RouterLink } from '@angular/router'; import { NgxMaskDirective, NgxMaskPipe } from 'ngx-mask'; import { SharedModule } from '../../../shared/shared.module'; import { ApplicationDetailsModule } from '../application-details/application-details.module'; @@ -34,6 +35,7 @@ import { TurProposalComponent } from './proposal/tur-proposal/tur-proposal.compo import { ReviewAndSubmitComponent } from './review-and-submit/review-and-submit.component'; import { SubmitConfirmationDialogComponent } from './review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component'; import { SelectGovernmentComponent } from './select-government/select-government.component'; +import { SuccessComponent } from './success/success.component'; @NgModule({ declarations: [ @@ -62,6 +64,7 @@ import { SelectGovernmentComponent } from './select-government/select-government InclProposalComponent, CoveProposalComponent, CovenantTransfereeDialogComponent, + SuccessComponent, ], imports: [ CommonModule, @@ -75,6 +78,7 @@ import { SelectGovernmentComponent } from './select-government/select-government MatOptionModule, MatSelectModule, MatTableModule, + RouterLink, ], exports: [ ParcelDetailsComponent, @@ -100,6 +104,7 @@ import { SelectGovernmentComponent } from './select-government/select-government InclProposalComponent, CoveProposalComponent, CovenantTransfereeDialogComponent, + SuccessComponent, ], }) export class EditSubmissionBaseModule {} diff --git a/portal-frontend/src/app/features/applications/edit-submission/edit-submission.component.ts b/portal-frontend/src/app/features/applications/edit-submission/edit-submission.component.ts index 315f8ce8c3..e27a254af9 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/edit-submission.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/edit-submission.component.ts @@ -321,7 +321,7 @@ export class EditSubmissionComponent implements OnInit, OnDestroy, AfterViewInit await this.router.navigateByUrl(`/application/${submission?.fileNumber}/review`); } } else { - await this.router.navigateByUrl(`/application/${submission?.fileNumber}`); + await this.router.navigateByUrl(`/application/${submission?.fileNumber}/edit/success`); } } } diff --git a/portal-frontend/src/app/features/applications/edit-submission/edit-submission.module.ts b/portal-frontend/src/app/features/applications/edit-submission/edit-submission.module.ts index bc02d6b043..7805828905 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/edit-submission.module.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/edit-submission.module.ts @@ -6,8 +6,13 @@ import { SharedModule } from '../../../shared/shared.module'; import { EditSubmissionBaseModule } from './edit-submission-base.module'; import { EditSubmissionComponent } from './edit-submission.component'; import { StepComponent } from './step.partial'; +import { SuccessComponent } from './success/success.component'; const routes: Routes = [ + { + path: 'success', + component: SuccessComponent, + }, { path: '', component: EditSubmissionComponent, diff --git a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts index 2aa786d1e8..889c413d60 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts @@ -160,7 +160,6 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni } else { const isSelfApplicant = this.parcelOwners.length === 1 && this.parcelOwners[0].type.code === OWNER_TYPE.INDIVIDUAL; - debugger; this.needsAuthorizationLetter = this.selectedThirdPartyAgent || this.hasCrownParcels || !isSelfApplicant; } diff --git a/portal-frontend/src/app/features/applications/edit-submission/review-and-submit/review-and-submit.component.spec.ts b/portal-frontend/src/app/features/applications/edit-submission/review-and-submit/review-and-submit.component.spec.ts index a4199f8aca..b956fdad4e 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/review-and-submit/review-and-submit.component.spec.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/review-and-submit/review-and-submit.component.spec.ts @@ -1,12 +1,10 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { MatDialog } from '@angular/material/dialog'; import { Router } from '@angular/router'; -import { DeepMocked, createMock } from '@golevelup/ts-jest'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { BehaviorSubject } from 'rxjs'; import { ApplicationSubmissionDetailedDto } from '../../../../services/application-submission/application-submission.dto'; import { ApplicationSubmissionService } from '../../../../services/application-submission/application-submission.service'; -import { CodeService } from '../../../../services/code/code.service'; import { PdfGenerationService } from '../../../../services/pdf-generation/pdf-generation.service'; import { ToastService } from '../../../../services/toast/toast.service'; diff --git a/portal-frontend/src/app/features/applications/edit-submission/review-and-submit/review-and-submit.component.ts b/portal-frontend/src/app/features/applications/edit-submission/review-and-submit/review-and-submit.component.ts index f197ac6b73..d8195e4445 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/review-and-submit/review-and-submit.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/review-and-submit/review-and-submit.component.ts @@ -1,15 +1,11 @@ import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core'; -import { MatDialog } from '@angular/material/dialog'; import { Router } from '@angular/router'; import { BehaviorSubject, takeUntil } from 'rxjs'; import { ApplicationDocumentDto } from '../../../../services/application-document/application-document.dto'; import { ApplicationSubmissionDetailedDto } from '../../../../services/application-submission/application-submission.dto'; -import { ApplicationSubmissionService } from '../../../../services/application-submission/application-submission.service'; -import { CodeService } from '../../../../services/code/code.service'; import { PdfGenerationService } from '../../../../services/pdf-generation/pdf-generation.service'; import { ToastService } from '../../../../services/toast/toast.service'; import { StepComponent } from '../step.partial'; -import { SubmitConfirmationDialogComponent } from './submit-confirmation-dialog/submit-confirmation-dialog.component'; @Component({ selector: 'app-review-and-submit', @@ -26,7 +22,6 @@ export class ReviewAndSubmitComponent extends StepComponent implements OnInit, O constructor( private router: Router, private toastService: ToastService, - private applicationService: ApplicationSubmissionService, private pdfGenerationService: PdfGenerationService ) { super(); diff --git a/portal-frontend/src/app/features/applications/edit-submission/success/success.component.html b/portal-frontend/src/app/features/applications/edit-submission/success/success.component.html new file mode 100644 index 0000000000..d5f2e13b4c --- /dev/null +++ b/portal-frontend/src/app/features/applications/edit-submission/success/success.component.html @@ -0,0 +1,54 @@ +<h2 class="heading">Application ID: {{ fileId }} Submitted!</h2> +<p> + <ng-container *ngIf="requiresGovernmentReview"> + <span class="subheading1" + >You have submitted a <strong>{{ appLabel }}</strong> application to the + <strong>{{ localGovernmentName }}</strong> for their review and decision.</span + ><br /><br /><br /> + + <span *ngIf="governmentFee"> + The {{ localGovernmentName }} portion of the fee is <strong>${{ governmentFee }}</strong + ><br /><br /> + </span> + <span *ngIf="localGovernmentName && !governmentFee"> + There is no application fee to for an {{ appLabel }} application.<br /><br /> + </span> + Please contact the {{ localGovernmentName }} to determine the preferred form of payment.<br /><br /> + Until the {{ localGovernmentName }} resolves to forward your application to the ALC, the ALC cannot view your + submission. Any updates to your submission must be provided to the {{ localGovernmentName }}. + </ng-container> + <ng-container *ngIf="!requiresGovernmentReview"> + <span class="subheading1"> + You have submitted a <strong>{{ appLabel }}</strong> application to the + <strong>Agricultural Land Commission</strong> for their review and decision. </span + ><br /><br /><br /> + + <ng-container *ngIf="alcFee"> + Application Fee is <strong>${{ alcFee }}</strong + ><br /><br /> + This fee can be paid:<br /> + 1. Cheque: Made payable to the Minister of Finance c/o the ALC<br /> + 2. Credit card: Over the phone or in-person<br /><br /> + Please include your assigned Application ID with your payment.<br /><br /> + <strong>Mailing address:</strong><br /> + Agricultural Land Commission<br /> + 201-4940 Canada Way, Burnaby, BC, Canada, V5G 4K6<br /><br /> + <strong>Paying via telephone:</strong><br /> + Tel: 604-660-7000<br /> + If you are making a long-distance call to a provincial government agency, you can place your call through Enquiry + BC free of charge:<br /> + In Victoria call: 250-387-6121<br /> + Elsewhere in BC call: 1-800-663-7867 + </ng-container> + <ng-container *ngIf="!alcFee"> + There is no application fee to register a {{ appLabel }} on ALR land. An ALC Land Use Planner will reach out if + further information is required. + </ng-container> + </ng-container> + <br /><br /> + The Primary Contact will be emailed this information and all future correspondence. +</p> +<div class="buttons"> + <button routerLink="/home" mat-flat-button color="primary">View Submission</button> + <button [routerLink]="'/application/' + fileId" mat-stroked-button color="primary">Return to inbox</button> +</div> diff --git a/portal-frontend/src/app/features/applications/edit-submission/success/success.component.scss b/portal-frontend/src/app/features/applications/edit-submission/success/success.component.scss new file mode 100644 index 0000000000..3b5a90b084 --- /dev/null +++ b/portal-frontend/src/app/features/applications/edit-submission/success/success.component.scss @@ -0,0 +1,24 @@ +@use '../../../../../styles/functions' as *; +@use '../../../../../styles/colors'; + +.heading { + color: colors.$primary-color; + margin-bottom: rem(12) !important; +} + +.buttons { + display: grid; + grid-template-columns: 1fr; + grid-column-gap: rem(24); + margin-top: rem(48); + + button { + margin-bottom: rem(20) !important; + } + + @media screen and (min-width: $tabletBreakpoint) { + display: flex; + flex-direction: row-reverse; + justify-content: left; + } +} diff --git a/portal-frontend/src/app/features/applications/edit-submission/success/success.component.spec.ts b/portal-frontend/src/app/features/applications/edit-submission/success/success.component.spec.ts new file mode 100644 index 0000000000..78845be64e --- /dev/null +++ b/portal-frontend/src/app/features/applications/edit-submission/success/success.component.spec.ts @@ -0,0 +1,67 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { ActivatedRoute, ParamMap } from '@angular/router'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { Observable } from 'rxjs'; +import { ApplicationSubmissionService } from '../../../../services/application-submission/application-submission.service'; +import { CodeService } from '../../../../services/code/code.service'; +import { OverlaySpinnerService } from '../../../../shared/overlay-spinner/overlay-spinner.service'; + +import { SuccessComponent } from './success.component'; + +describe('SuccessComponent', () => { + let component: SuccessComponent; + let fixture: ComponentFixture<SuccessComponent>; + let applicationSubmissionService: DeepMocked<ApplicationSubmissionService>; + let activatedRoute: DeepMocked<ActivatedRoute>; + let overlayService: DeepMocked<OverlaySpinnerService>; + let codeService: DeepMocked<CodeService>; + + beforeEach(() => { + applicationSubmissionService = createMock(); + activatedRoute = createMock(); + overlayService = createMock(); + codeService = createMock(); + + Object.assign(activatedRoute, { paramMap: new Observable<ParamMap>() }); + + codeService.loadCodes.mockResolvedValue({ + applicationTypes: [], + decisionMakers: [], + documentTypes: [], + localGovernments: [], + naruSubtypes: [], + noticeOfIntentTypes: [], + regions: [], + submissionTypes: [], + }); + + TestBed.configureTestingModule({ + declarations: [SuccessComponent], + providers: [ + { + provide: ApplicationSubmissionService, + useValue: applicationSubmissionService, + }, + { + provide: ActivatedRoute, + useValue: activatedRoute, + }, + { + provide: OverlaySpinnerService, + useValue: overlayService, + }, + { + provide: CodeService, + useValue: codeService, + }, + ], + }); + fixture = TestBed.createComponent(SuccessComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/applications/edit-submission/success/success.component.ts b/portal-frontend/src/app/features/applications/edit-submission/success/success.component.ts new file mode 100644 index 0000000000..37ec2ec8d1 --- /dev/null +++ b/portal-frontend/src/app/features/applications/edit-submission/success/success.component.ts @@ -0,0 +1,91 @@ +import { Component, OnDestroy, OnInit } from '@angular/core'; +import { ActivatedRoute } from '@angular/router'; +import { Subject, takeUntil } from 'rxjs'; +import { ApplicationSubmissionService } from '../../../../services/application-submission/application-submission.service'; +import { ApplicationTypeDto, LocalGovernmentDto } from '../../../../services/code/code.dto'; +import { CodeService } from '../../../../services/code/code.service'; +import { OverlaySpinnerService } from '../../../../shared/overlay-spinner/overlay-spinner.service'; + +@Component({ + selector: 'app-success', + templateUrl: './success.component.html', + styleUrls: ['./success.component.scss'], +}) +export class SuccessComponent implements OnInit, OnDestroy { + $destroy = new Subject<void>(); + + localGovernmentName = ''; + fileId = ''; + appLabel = ''; + governmentFee?: number | null; + alcFee?: number | null; + requiresGovernmentReview = false; + private localGovernments: LocalGovernmentDto[] = []; + private localGovernmentUuid: string | undefined; + private applicationTypes: ApplicationTypeDto[] = []; + private appType: string | undefined; + + constructor( + private applicationSubmissionService: ApplicationSubmissionService, + private activatedRoute: ActivatedRoute, + private overlayService: OverlaySpinnerService, + private codeService: CodeService + ) {} + + ngOnInit() { + this.loadCodes(); + this.activatedRoute.paramMap.pipe(takeUntil(this.$destroy)).subscribe((paramMap) => { + const fileId = paramMap.get('fileId'); + if (fileId) { + this.loadApplication(fileId); + } + }); + } + + ngOnDestroy() { + this.$destroy.next(); + this.$destroy.complete(); + } + + private async loadApplication(fileId: string) { + this.overlayService.showSpinner(); + const appSubmission = await this.applicationSubmissionService.getByFileId(fileId); + if (appSubmission) { + this.fileId = fileId; + this.appType = appSubmission.typeCode; + this.appLabel = appSubmission.type; + this.localGovernmentUuid = appSubmission.localGovernmentUuid; + this.populateLocalGovernment(appSubmission.localGovernmentUuid); + this.populateFees(appSubmission.typeCode); + this.requiresGovernmentReview = appSubmission.requiresGovernmentReview; + } + this.overlayService.hideSpinner(); + } + + private async loadCodes() { + const codes = await this.codeService.loadCodes(); + this.localGovernments = codes.localGovernments.sort((a, b) => (a.name > b.name ? 1 : -1)); + this.applicationTypes = codes.applicationTypes.filter((type) => !!type.portalLabel); + if (this.localGovernmentUuid) { + this.populateLocalGovernment(this.localGovernmentUuid); + } + if (this.appType) { + this.populateFees(this.appType); + } + } + + private populateLocalGovernment(governmentUuid: string) { + const lg = this.localGovernments.find((lg) => lg.uuid === governmentUuid); + if (lg) { + this.localGovernmentName = lg.name; + } + } + + private populateFees(typeCode: string) { + const appType = this.applicationTypes.find((type) => type.code === typeCode); + if (appType) { + this.governmentFee = appType.governmentFeeAmount; + this.alcFee = appType.alcFeeAmount; + } + } +} diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission-base.module.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission-base.module.ts index ae5dceb75f..7ba209c27a 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission-base.module.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission-base.module.ts @@ -6,6 +6,7 @@ import { MatFormFieldModule } from '@angular/material/form-field'; import { MatInputModule } from '@angular/material/input'; import { MatSelectModule } from '@angular/material/select'; import { MatTableModule } from '@angular/material/table'; +import { RouterLink } from '@angular/router'; import { NgxMaskDirective, NgxMaskPipe } from 'ngx-mask'; import { SharedModule } from '../../../shared/shared.module'; import { AdditionalInformationComponent } from './additional-information/additional-information.component'; @@ -27,6 +28,7 @@ import { RosoProposalComponent } from './proposal/roso/roso-proposal.component'; import { ReviewAndSubmitComponent } from './review-and-submit/review-and-submit.component'; import { SubmitConfirmationDialogComponent } from './review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component'; import { SelectGovernmentComponent } from './select-government/select-government.component'; +import { SuccessComponent } from './success/success.component'; @NgModule({ imports: [ @@ -41,6 +43,7 @@ import { SelectGovernmentComponent } from './select-government/select-government MatSelectModule, MatTableModule, NoticeOfIntentDetailsModule, + RouterLink, ], declarations: [ EditSubmissionComponent, @@ -61,6 +64,7 @@ import { SelectGovernmentComponent } from './select-government/select-government ReviewAndSubmitComponent, SubmitConfirmationDialogComponent, ChangeNoiTypeDialogComponent, + SuccessComponent, ], exports: [ EditSubmissionComponent, @@ -79,6 +83,7 @@ import { SelectGovernmentComponent } from './select-government/select-government ReviewAndSubmitComponent, SubmitConfirmationDialogComponent, ChangeNoiTypeDialogComponent, + SuccessComponent, ], }) export class EditSubmissionBaseModule {} diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.ts index 897d58983c..935cd2dff0 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.ts @@ -1,4 +1,3 @@ -import { StepperSelectionEvent } from '@angular/cdk/stepper'; import { AfterViewInit, Component, OnDestroy, ViewChild } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; import { ActivatedRoute, Router } from '@angular/router'; @@ -225,7 +224,7 @@ export class EditSubmissionComponent implements OnDestroy, AfterViewInit { if (submission) { const didSubmit = await this.noticeOfIntentSubmissionService.submitToAlcs(submission.uuid); if (didSubmit) { - await this.router.navigateByUrl(`/notice-of-intent/${submission?.fileNumber}`); + await this.router.navigateByUrl(`/notice-of-intent/${submission?.fileNumber}/edit/success`); } } } diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.module.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.module.ts index 6fac8c054b..6ca8cbae63 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.module.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.module.ts @@ -6,8 +6,13 @@ import { SharedModule } from '../../../shared/shared.module'; import { EditSubmissionBaseModule } from './edit-submission-base.module'; import { EditSubmissionComponent } from './edit-submission.component'; import { StepComponent } from './step.partial'; +import { SuccessComponent } from './success/success.component'; const routes: Routes = [ + { + path: 'success', + component: SuccessComponent, + }, { path: '', component: EditSubmissionComponent, diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/success/success.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/success/success.component.html new file mode 100644 index 0000000000..aaa22158f8 --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/success/success.component.html @@ -0,0 +1,29 @@ +<h2 class="heading">NOI ID: {{ fileId }} Submitted!</h2> +<p> + <span class="subheading1"> + You have submitted a <strong>{{ appLabel }}</strong> application to the + <strong>Agricultural Land Commission</strong> for their review and decision. </span + ><br /><br /><br /> + + Notice of Intent Fee is <strong>${{ alcFee }}</strong + ><br /><br /> + This fee can be paid:<br /> + 1. Cheque: Made payable to the Minister of Finance c/o the ALC<br /> + 2. Credit card: Over the phone or in-person<br /><br /> + Please include your assigned Application ID with your payment.<br /><br /> + <strong>Mailing address:</strong><br /> + Agricultural Land Commission<br /> + 201-4940 Canada Way, Burnaby, BC, Canada, V5G 4K6<br /><br /> + <strong>Paying via telephone:</strong><br /> + Tel: 604-660-7000<br /> + If you are making a long-distance call to a provincial government agency, you can place your call through Enquiry BC + free of charge:<br /> + In Victoria call: 250-387-6121<br /> + Elsewhere in BC call: 1-800-663-7867 + <br /><br /> + The Primary Contact will be emailed this information and all future correspondence. +</p> +<div class="buttons"> + <button [routerLink]="'/notice-of-intent/' + fileId" mat-flat-button color="primary">View Submission</button> + <button routerLink="/home" mat-stroked-button color="primary">Return to inbox</button> +</div> diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/success/success.component.scss b/portal-frontend/src/app/features/notice-of-intents/edit-submission/success/success.component.scss new file mode 100644 index 0000000000..3b5a90b084 --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/success/success.component.scss @@ -0,0 +1,24 @@ +@use '../../../../../styles/functions' as *; +@use '../../../../../styles/colors'; + +.heading { + color: colors.$primary-color; + margin-bottom: rem(12) !important; +} + +.buttons { + display: grid; + grid-template-columns: 1fr; + grid-column-gap: rem(24); + margin-top: rem(48); + + button { + margin-bottom: rem(20) !important; + } + + @media screen and (min-width: $tabletBreakpoint) { + display: flex; + flex-direction: row-reverse; + justify-content: left; + } +} diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/success/success.component.spec.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/success/success.component.spec.ts new file mode 100644 index 0000000000..2da5c35ae8 --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/success/success.component.spec.ts @@ -0,0 +1,68 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { ActivatedRoute, ParamMap } from '@angular/router'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { Observable } from 'rxjs'; +import { ApplicationSubmissionService } from '../../../../services/application-submission/application-submission.service'; +import { CodeService } from '../../../../services/code/code.service'; +import { NoticeOfIntentSubmissionService } from '../../../../services/notice-of-intent-submission/notice-of-intent-submission.service'; +import { OverlaySpinnerService } from '../../../../shared/overlay-spinner/overlay-spinner.service'; + +import { SuccessComponent } from './success.component'; + +describe('SuccessComponent', () => { + let component: SuccessComponent; + let fixture: ComponentFixture<SuccessComponent>; + let noiSubmissionService: DeepMocked<NoticeOfIntentSubmissionService>; + let activatedRoute: DeepMocked<ActivatedRoute>; + let overlayService: DeepMocked<OverlaySpinnerService>; + let codeService: DeepMocked<CodeService>; + + beforeEach(() => { + noiSubmissionService = createMock(); + activatedRoute = createMock(); + overlayService = createMock(); + codeService = createMock(); + + Object.assign(activatedRoute, { paramMap: new Observable<ParamMap>() }); + + codeService.loadCodes.mockResolvedValue({ + applicationTypes: [], + decisionMakers: [], + documentTypes: [], + localGovernments: [], + naruSubtypes: [], + noticeOfIntentTypes: [], + regions: [], + submissionTypes: [], + }); + + TestBed.configureTestingModule({ + declarations: [SuccessComponent], + providers: [ + { + provide: NoticeOfIntentSubmissionService, + useValue: noiSubmissionService, + }, + { + provide: ActivatedRoute, + useValue: activatedRoute, + }, + { + provide: OverlaySpinnerService, + useValue: overlayService, + }, + { + provide: CodeService, + useValue: codeService, + }, + ], + }); + fixture = TestBed.createComponent(SuccessComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/success/success.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/success/success.component.ts new file mode 100644 index 0000000000..ca4a4d2b28 --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/success/success.component.ts @@ -0,0 +1,71 @@ +import { Component, OnDestroy, OnInit } from '@angular/core'; +import { ActivatedRoute } from '@angular/router'; +import { Subject, takeUntil } from 'rxjs'; +import { NoticeOfIntentTypeDto } from '../../../../services/code/code.dto'; +import { CodeService } from '../../../../services/code/code.service'; +import { NoticeOfIntentSubmissionService } from '../../../../services/notice-of-intent-submission/notice-of-intent-submission.service'; +import { OverlaySpinnerService } from '../../../../shared/overlay-spinner/overlay-spinner.service'; + +@Component({ + selector: 'app-success', + templateUrl: './success.component.html', + styleUrls: ['./success.component.scss'], +}) +export class SuccessComponent implements OnInit, OnDestroy { + $destroy = new Subject<void>(); + + fileId = ''; + appLabel = ''; + alcFee?: number | null; + private noiTypes: NoticeOfIntentTypeDto[] = []; + private appType: string | undefined; + + constructor( + private noiSubmissionService: NoticeOfIntentSubmissionService, + private activatedRoute: ActivatedRoute, + private overlayService: OverlaySpinnerService, + private codeService: CodeService + ) {} + + ngOnInit() { + this.loadCodes(); + this.activatedRoute.paramMap.pipe(takeUntil(this.$destroy)).subscribe((paramMap) => { + const fileId = paramMap.get('fileId'); + if (fileId) { + this.loadApplication(fileId); + } + }); + } + + ngOnDestroy() { + this.$destroy.next(); + this.$destroy.complete(); + } + + private async loadApplication(fileId: string) { + this.overlayService.showSpinner(); + const noiSubmission = await this.noiSubmissionService.getByFileId(fileId); + if (noiSubmission) { + this.fileId = fileId; + this.appType = noiSubmission.typeCode; + this.appLabel = noiSubmission.type; + this.populateFees(noiSubmission.typeCode); + } + this.overlayService.hideSpinner(); + } + + private async loadCodes() { + const codes = await this.codeService.loadCodes(); + this.noiTypes = codes.noticeOfIntentTypes.filter((type) => !!type.portalLabel); + if (this.appType) { + this.populateFees(this.appType); + } + } + + private populateFees(typeCode: string) { + const appType = this.noiTypes.find((type) => type.code === typeCode); + if (appType) { + this.alcFee = appType.alcFeeAmount; + } + } +} diff --git a/portal-frontend/src/app/services/code/code.dto.ts b/portal-frontend/src/app/services/code/code.dto.ts index 1bcb551b6a..31d1617960 100644 --- a/portal-frontend/src/app/services/code/code.dto.ts +++ b/portal-frontend/src/app/services/code/code.dto.ts @@ -19,10 +19,14 @@ export interface ApplicationTypeDto { portalLabel: string; htmlDescription: string; portalOrder: number; + alcFeeAmount?: number | null; + governmentFeeAmount?: number | null; } export interface NoticeOfIntentTypeDto { code: string; portalLabel: string; htmlDescription: string; + alcFeeAmount?: number | null; + governmentFeeAmount?: number | null; } diff --git a/services/apps/alcs/src/alcs/application/application.service.ts b/services/apps/alcs/src/alcs/application/application.service.ts index 43a2007fec..ec0812f613 100644 --- a/services/apps/alcs/src/alcs/application/application.service.ts +++ b/services/apps/alcs/src/alcs/application/application.service.ts @@ -419,6 +419,8 @@ export class ApplicationService { label: true, requiresGovernmentReview: true, portalOrder: true, + alcFeeAmount: true, + governmentFeeAmount: true, }, }); } diff --git a/services/apps/alcs/src/alcs/code/application-code/application-type/application-type.dto.ts b/services/apps/alcs/src/alcs/code/application-code/application-type/application-type.dto.ts index 067c46876f..cb2913928f 100644 --- a/services/apps/alcs/src/alcs/code/application-code/application-type/application-type.dto.ts +++ b/services/apps/alcs/src/alcs/code/application-code/application-type/application-type.dto.ts @@ -16,4 +16,10 @@ export class ApplicationTypeDto extends BaseCodeDto { @AutoMap() portalOrder: number; + + @AutoMap() + alcFeeAmount?: number | null; + + @AutoMap() + governmentFeeAmount?: number | null; } diff --git a/services/apps/alcs/src/alcs/code/application-code/application-type/application-type.entity.ts b/services/apps/alcs/src/alcs/code/application-code/application-type/application-type.entity.ts index 3cb5ebb404..5f30b1375c 100644 --- a/services/apps/alcs/src/alcs/code/application-code/application-type/application-type.entity.ts +++ b/services/apps/alcs/src/alcs/code/application-code/application-type/application-type.entity.ts @@ -1,6 +1,7 @@ import { AutoMap } from 'automapper-classes'; import { Column, Entity } from 'typeorm'; import { BaseCodeEntity } from '../../../../common/entities/base.code.entity'; +import { ColumnNumericTransformer } from '../../../../utils/column-numeric-transform'; @Entity() export class ApplicationType extends BaseCodeEntity { @@ -38,4 +39,26 @@ export class ApplicationType extends BaseCodeEntity { @AutoMap() @Column({ default: true }) requiresGovernmentReview: boolean; + + @AutoMap() + @AutoMap(() => Number) + @Column({ + type: 'decimal', + nullable: true, + precision: 12, + scale: 2, + transformer: new ColumnNumericTransformer(), + }) + alcFeeAmount?: number; + + @AutoMap() + @AutoMap(() => Number) + @Column({ + type: 'decimal', + nullable: true, + precision: 12, + scale: 2, + transformer: new ColumnNumericTransformer(), + }) + governmentFeeAmount?: number; } diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-type/notice-of-intent-type.entity.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-type/notice-of-intent-type.entity.ts index ab5b07cb9d..bfa5597cf5 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-type/notice-of-intent-type.entity.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-type/notice-of-intent-type.entity.ts @@ -1,6 +1,7 @@ import { AutoMap } from 'automapper-classes'; import { Column, Entity } from 'typeorm'; import { BaseCodeEntity } from '../../../common/entities/base.code.entity'; +import { ColumnNumericTransformer } from '../../../utils/column-numeric-transform'; @Entity() export class NoticeOfIntentType extends BaseCodeEntity { @@ -30,4 +31,26 @@ export class NoticeOfIntentType extends BaseCodeEntity { @AutoMap() @Column({ type: 'text', default: '' }) portalLabel: string; + + @AutoMap() + @AutoMap(() => Number) + @Column({ + type: 'decimal', + nullable: true, + precision: 12, + scale: 2, + transformer: new ColumnNumericTransformer(), + }) + alcFeeAmount?: number; + + @AutoMap() + @AutoMap(() => Number) + @Column({ + type: 'decimal', + nullable: true, + precision: 12, + scale: 2, + transformer: new ColumnNumericTransformer(), + }) + governmentFeeAmount?: number; } diff --git a/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.spec.ts b/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.spec.ts index 02c99cbdd1..c3a39a0ed9 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.spec.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.spec.ts @@ -288,6 +288,11 @@ describe('ApplicationSubmissionValidatorService', () => { owners: [mockOwner], primaryContactOwnerUuid: mockOwner.uuid, }); + mockAppParcelService.fetchByApplicationFileId.mockResolvedValue([ + new ApplicationParcel({ + owners: [mockOwner], + }), + ]); const res = await service.validateSubmission(applicationSubmission); diff --git a/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.ts b/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.ts index e18032c81a..4a398dcc78 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.ts @@ -70,6 +70,7 @@ export class ApplicationSubmissionValidatorService { const validatedPrimaryContact = await this.validatePrimaryContact( applicationSubmission, + parcels, applicantDocuments, errors, ); @@ -260,6 +261,7 @@ export class ApplicationSubmissionValidatorService { private async validatePrimaryContact( applicationSubmission: ApplicationSubmission, + parcels: ApplicationParcel[], documents: ApplicationDocument[], errors: Error[], ): Promise<ApplicationOwner | undefined> { @@ -274,9 +276,17 @@ export class ApplicationSubmissionValidatorService { return; } + const linkedOwnerUuids = parcels + .flatMap((parcel) => parcel.owners) + .map((owner) => owner.uuid); + + const linkedOwners = applicationSubmission.owners.filter((owner) => + linkedOwnerUuids.includes(owner.uuid), + ); + const onlyHasIndividualOwner = - applicationSubmission.owners.length === 1 && - applicationSubmission.owners[0].type.code === OWNER_TYPE.INDIVIDUAL; + linkedOwners.length === 1 && + linkedOwners[0].type.code === OWNER_TYPE.INDIVIDUAL; const isGovernmentContact = primaryOwner.type.code === OWNER_TYPE.GOVERNMENT; diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission-validator.service.spec.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission-validator.service.spec.ts index 2134822760..c4ccf1d043 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission-validator.service.spec.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission-validator.service.spec.ts @@ -6,12 +6,12 @@ import { LocalGovernmentService } from '../../alcs/local-government/local-govern import { NoticeOfIntentDocument } from '../../alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.entity'; import { NoticeOfIntentDocumentService } from '../../alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.service'; import { - OwnerType, OWNER_TYPE, + OwnerType, } from '../../common/owner-type/owner-type.entity'; import { - DocumentCode, DOCUMENT_TYPE, + DocumentCode, } from '../../document/document-code.entity'; import { DOCUMENT_SOURCE } from '../../document/document.dto'; import { Document } from '../../document/document.entity'; @@ -285,6 +285,13 @@ describe('NoticeOfIntentSubmissionValidatorService', () => { firstName: 'Bruce', lastName: 'Wayne', }); + + mockNoiParcelService.fetchByFileId.mockResolvedValue([ + new NoticeOfIntentParcel({ + owners: [mockOwner], + }), + ]); + const noticeOfIntentSubmission = new NoticeOfIntentSubmission({ owners: [mockOwner], primaryContactOwnerUuid: mockOwner.uuid, diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission-validator.service.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission-validator.service.ts index 474f9d78fe..a5c17690ea 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission-validator.service.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission-validator.service.ts @@ -51,7 +51,11 @@ export class NoticeOfIntentSubmissionValidatorService { errors.push(new ServiceValidationException('Missing purpose')); } - await this.validateParcels(noticeOfIntentSubmission, errors); + const parcels = await this.noiParcelService.fetchByFileId( + noticeOfIntentSubmission.fileNumber, + ); + + await this.validateParcels(parcels, errors); const applicantDocuments = await this.noiDocumentService.getApplicantDocuments( @@ -61,6 +65,7 @@ export class NoticeOfIntentSubmissionValidatorService { await this.validatePrimaryContact( noticeOfIntentSubmission, applicantDocuments, + parcels, errors, ); @@ -115,13 +120,9 @@ export class NoticeOfIntentSubmissionValidatorService { } private async validateParcels( - noticeOfIntentSubmission: NoticeOfIntentSubmission, + parcels: NoticeOfIntentParcel[], errors: Error[], ) { - const parcels = await this.noiParcelService.fetchByFileId( - noticeOfIntentSubmission.fileNumber, - ); - if (parcels.length === 0) { errors.push( new ServiceValidationException(`Notice of Intent has no parcels`), @@ -200,6 +201,7 @@ export class NoticeOfIntentSubmissionValidatorService { private async validatePrimaryContact( noticeOfIntentSubmission: NoticeOfIntentSubmission, documents: NoticeOfIntentDocument[], + parcels: NoticeOfIntentParcel[], errors: Error[], ): Promise<NoticeOfIntentOwner | undefined> { const primaryOwner = noticeOfIntentSubmission.owners.find( @@ -215,10 +217,16 @@ export class NoticeOfIntentSubmissionValidatorService { ); return; } + const parcelOwnerUuids = parcels + .flatMap((parcel) => parcel.owners) + .map((owner) => owner.uuid); + const linkedOwners = noticeOfIntentSubmission.owners.filter((owner) => + parcelOwnerUuids.includes(owner.uuid), + ); const onlyHasIndividualOwner = - noticeOfIntentSubmission.owners.length === 1 && - noticeOfIntentSubmission.owners[0].type.code === OWNER_TYPE.INDIVIDUAL; + linkedOwners.length === 1 && + linkedOwners[0].type.code === OWNER_TYPE.INDIVIDUAL; const isGovernmentContact = primaryOwner.type.code === OWNER_TYPE.GOVERNMENT; diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1702318414883-add_app_type_fees.ts b/services/apps/alcs/src/providers/typeorm/migrations/1702318414883-add_app_type_fees.ts new file mode 100644 index 0000000000..382b06dae5 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1702318414883-add_app_type_fees.ts @@ -0,0 +1,35 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class AddAppTypeFees1702318414883 implements MigrationInterface { + name = 'AddAppTypeFees1702318414883'; + + public async up(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `ALTER TABLE "alcs"."application_type" ADD "alc_fee_amount" numeric(12,2)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_type" ADD "government_fee_amount" numeric(12,2)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_type" ADD "alc_fee_amount" numeric(12,2)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_type" ADD "government_fee_amount" numeric(12,2)`, + ); + } + + public async down(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_type" DROP COLUMN "government_fee_amount"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_type" DROP COLUMN "alc_fee_amount"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_type" DROP COLUMN "government_fee_amount"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_type" DROP COLUMN "alc_fee_amount"`, + ); + } +} diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1702322475280-seed_app_type_fees.ts b/services/apps/alcs/src/providers/typeorm/migrations/1702322475280-seed_app_type_fees.ts new file mode 100644 index 0000000000..7ba37c4837 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1702322475280-seed_app_type_fees.ts @@ -0,0 +1,22 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class SeedAppTypeFees1702322475280 implements MigrationInterface { + name = 'SeedAppTypeFees1702322475280'; + + public async up(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query(` + UPDATE "alcs"."application_type" SET "alc_fee_amount" = 1500 WHERE "code" = 'TURP'; + UPDATE "alcs"."application_type" SET "alc_fee_amount" = 750, "government_fee_amount" = 750 WHERE "code" = 'SUBD'; + UPDATE "alcs"."application_type" SET "alc_fee_amount" = 750, "government_fee_amount" = 750 WHERE "code" = 'ROSO'; + UPDATE "alcs"."application_type" SET "alc_fee_amount" = 750, "government_fee_amount" = 750 WHERE "code" = 'POFO'; + UPDATE "alcs"."application_type" SET "alc_fee_amount" = 750, "government_fee_amount" = 750 WHERE "code" = 'PFRS'; + UPDATE "alcs"."application_type" SET "alc_fee_amount" = 450, "government_fee_amount" = 450 WHERE "code" = 'NARU'; + UPDATE "alcs"."application_type" SET "alc_fee_amount" = 750, "government_fee_amount" = 750 WHERE "code" = 'NFUP'; + UPDATE "alcs"."application_type" SET "alc_fee_amount" = 750, "government_fee_amount" = 750 WHERE "code" = 'EXCL'; + `); + } + + public async down(): Promise<void> { + //No + } +} diff --git a/services/apps/alcs/src/queues/scheduler/notice-of-intent/status-emails.consumer.ts b/services/apps/alcs/src/queues/scheduler/notice-of-intent/status-emails.consumer.ts index a8bab0bc6a..758de9843c 100644 --- a/services/apps/alcs/src/queues/scheduler/notice-of-intent/status-emails.consumer.ts +++ b/services/apps/alcs/src/queues/scheduler/notice-of-intent/status-emails.consumer.ts @@ -58,7 +58,7 @@ export class NoticeOfIntentSubmissionStatusEmailConsumer extends WorkerHost { await this.updateSubmissionStatus(submissionStatus); this.logger.debug( - `Status email sent for NOI {submissionStatus.submissionUuid}`, + `Status email sent for NOI ${submissionStatus.submissionUuid}`, ); } } catch (e) { From da50c3e22003f60ec4944ed0601764b65b0caa4e Mon Sep 17 00:00:00 2001 From: Liam Stoddard <lstodd@protonmail.com> Date: Mon, 11 Dec 2023 15:39:17 -0800 Subject: [PATCH 762/954] MR feedback --- bin/migrate-oats-data/applications/app_staff_journal.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/migrate-oats-data/applications/app_staff_journal.py b/bin/migrate-oats-data/applications/app_staff_journal.py index ac8d5e57ee..c6fa794807 100644 --- a/bin/migrate-oats-data/applications/app_staff_journal.py +++ b/bin/migrate-oats-data/applications/app_staff_journal.py @@ -14,7 +14,7 @@ @inject_conn_pool def process_app_staff_journal(conn=None, batch_size=BATCH_UPLOAD_SIZE): """ - This function is responsible for initializing the users table in ALCS. + This function is responsible for initializing applications in the staff_journal table in ALCS. Args: conn (psycopg2.extensions.connection): PostgreSQL database connection. Provided by the decorator. From 33618f075257a01b3d818033390db42a89cb2723 Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Mon, 11 Dec 2023 16:16:52 -0800 Subject: [PATCH 763/954] Add back erroneously removed NOI cancel button --- .../view-notice-of-intent-submission.component.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.html b/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.html index d22ac5eee2..b311290174 100644 --- a/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.html @@ -45,6 +45,9 @@ <h4 *ngIf="submission">NOI ID: {{ submission.fileNumber }}</h4> <section> <div class="header"> <h2>Applicant Submission</h2> + <button *ngIf="submission.canEdit" mat-stroked-button color="warn" (click)="onCancel(submission.uuid)"> + Cancel NOI + </button> <div class="btns-wrapper"> <button mat-flat-button color="accent" (click)="onDownloadSubmissionPdf(submission.fileNumber)"> Download PDF From 1cc11cf70dfc18616982fe9d7495a74f43b50d9c Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Mon, 11 Dec 2023 16:24:01 -0800 Subject: [PATCH 764/954] Success Page for Notifications --- .../success/success.component.spec.ts | 1 - .../edit-submission.component.ts | 2 +- .../edit-submission/edit-submission.module.ts | 6 ++ .../success/success.component.html | 16 +++++ .../success/success.component.scss | 24 +++++++ .../success/success.component.spec.ts | 67 +++++++++++++++++ .../success/success.component.ts | 71 +++++++++++++++++++ 7 files changed, 185 insertions(+), 2 deletions(-) create mode 100644 portal-frontend/src/app/features/notifications/edit-submission/success/success.component.html create mode 100644 portal-frontend/src/app/features/notifications/edit-submission/success/success.component.scss create mode 100644 portal-frontend/src/app/features/notifications/edit-submission/success/success.component.spec.ts create mode 100644 portal-frontend/src/app/features/notifications/edit-submission/success/success.component.ts diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/success/success.component.spec.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/success/success.component.spec.ts index 2da5c35ae8..8492828986 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/success/success.component.spec.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/success/success.component.spec.ts @@ -2,7 +2,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ActivatedRoute, ParamMap } from '@angular/router'; import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { Observable } from 'rxjs'; -import { ApplicationSubmissionService } from '../../../../services/application-submission/application-submission.service'; import { CodeService } from '../../../../services/code/code.service'; import { NoticeOfIntentSubmissionService } from '../../../../services/notice-of-intent-submission/notice-of-intent-submission.service'; import { OverlaySpinnerService } from '../../../../shared/overlay-spinner/overlay-spinner.service'; diff --git a/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.component.ts b/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.component.ts index 60f898ee76..d9991517cc 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.component.ts +++ b/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.component.ts @@ -191,7 +191,7 @@ export class EditSubmissionComponent implements OnDestroy, AfterViewInit { if (submission) { const didSubmit = await this.notificationSubmissionService.submitToAlcs(submission.uuid); if (didSubmit) { - await this.router.navigateByUrl(`/notification/${submission?.fileNumber}`); + await this.router.navigateByUrl(`/notification/${submission?.fileNumber}/edit/success`); } } } diff --git a/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.module.ts b/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.module.ts index cc8724ab2c..886c5f8283 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.module.ts +++ b/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.module.ts @@ -21,10 +21,15 @@ import { ReviewAndSubmitComponent } from './review-and-submit/review-and-submit. import { SubmitConfirmationDialogComponent } from './review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component'; import { SelectGovernmentComponent } from './select-government/select-government.component'; import { StepComponent } from './step.partial'; +import { SuccessComponent } from './success/success.component'; import { TransfereeDialogComponent } from './transferees/transferee-dialog/transferee-dialog.component'; import { TransfereesComponent } from './transferees/transferees.component'; const routes: Routes = [ + { + path: 'success', + component: SuccessComponent, + }, { path: '', component: EditSubmissionComponent, @@ -54,6 +59,7 @@ const routes: Routes = [ ReviewAndSubmitComponent, SubmitConfirmationDialogComponent, ChangeSurveyPlanConfirmationDialogComponent, + SuccessComponent, ], imports: [ CommonModule, diff --git a/portal-frontend/src/app/features/notifications/edit-submission/success/success.component.html b/portal-frontend/src/app/features/notifications/edit-submission/success/success.component.html new file mode 100644 index 0000000000..c90373d892 --- /dev/null +++ b/portal-frontend/src/app/features/notifications/edit-submission/success/success.component.html @@ -0,0 +1,16 @@ +<h2 class="heading">Notification ID: {{ fileId }} Submitted!</h2> +<p> + <span class="subheading1"> + You have submitted a <strong>{{ appLabel }}</strong> application to the + <strong>Agricultural Land Commission</strong> for their review and response.</span + > + <br /><br /><br /> + The Primary Contact will receive an automated email shortly containing an attached PDF response which must be appended + as an additional document to the LTSA SRW application package.<br /><br /> + If the email is not received within an hour, please email your SRW ID to + <a href="mailto:ALC.Portal@gov.bc.ca">ALC.Portal@gov.bc.ca</a> request assistance. +</p> +<div class="buttons"> + <button [routerLink]="'/notification/' + fileId" mat-flat-button color="primary">View Submission</button> + <button routerLink="/home" mat-stroked-button color="primary">Return to inbox</button> +</div> diff --git a/portal-frontend/src/app/features/notifications/edit-submission/success/success.component.scss b/portal-frontend/src/app/features/notifications/edit-submission/success/success.component.scss new file mode 100644 index 0000000000..3b5a90b084 --- /dev/null +++ b/portal-frontend/src/app/features/notifications/edit-submission/success/success.component.scss @@ -0,0 +1,24 @@ +@use '../../../../../styles/functions' as *; +@use '../../../../../styles/colors'; + +.heading { + color: colors.$primary-color; + margin-bottom: rem(12) !important; +} + +.buttons { + display: grid; + grid-template-columns: 1fr; + grid-column-gap: rem(24); + margin-top: rem(48); + + button { + margin-bottom: rem(20) !important; + } + + @media screen and (min-width: $tabletBreakpoint) { + display: flex; + flex-direction: row-reverse; + justify-content: left; + } +} diff --git a/portal-frontend/src/app/features/notifications/edit-submission/success/success.component.spec.ts b/portal-frontend/src/app/features/notifications/edit-submission/success/success.component.spec.ts new file mode 100644 index 0000000000..f89355769b --- /dev/null +++ b/portal-frontend/src/app/features/notifications/edit-submission/success/success.component.spec.ts @@ -0,0 +1,67 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { ActivatedRoute, ParamMap } from '@angular/router'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { Observable } from 'rxjs'; +import { CodeService } from '../../../../services/code/code.service'; +import { NotificationSubmissionService } from '../../../../services/notification-submission/notification-submission.service'; +import { OverlaySpinnerService } from '../../../../shared/overlay-spinner/overlay-spinner.service'; + +import { SuccessComponent } from './success.component'; + +describe('SuccessComponent', () => { + let component: SuccessComponent; + let fixture: ComponentFixture<SuccessComponent>; + let notificationSubmissionService: DeepMocked<NotificationSubmissionService>; + let activatedRoute: DeepMocked<ActivatedRoute>; + let overlayService: DeepMocked<OverlaySpinnerService>; + let codeService: DeepMocked<CodeService>; + + beforeEach(() => { + notificationSubmissionService = createMock(); + activatedRoute = createMock(); + overlayService = createMock(); + codeService = createMock(); + + Object.assign(activatedRoute, { paramMap: new Observable<ParamMap>() }); + + codeService.loadCodes.mockResolvedValue({ + applicationTypes: [], + decisionMakers: [], + documentTypes: [], + localGovernments: [], + naruSubtypes: [], + noticeOfIntentTypes: [], + regions: [], + submissionTypes: [], + }); + + TestBed.configureTestingModule({ + declarations: [SuccessComponent], + providers: [ + { + provide: NotificationSubmissionService, + useValue: notificationSubmissionService, + }, + { + provide: ActivatedRoute, + useValue: activatedRoute, + }, + { + provide: OverlaySpinnerService, + useValue: overlayService, + }, + { + provide: CodeService, + useValue: codeService, + }, + ], + }); + fixture = TestBed.createComponent(SuccessComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/notifications/edit-submission/success/success.component.ts b/portal-frontend/src/app/features/notifications/edit-submission/success/success.component.ts new file mode 100644 index 0000000000..7265c5cc1b --- /dev/null +++ b/portal-frontend/src/app/features/notifications/edit-submission/success/success.component.ts @@ -0,0 +1,71 @@ +import { Component, OnDestroy, OnInit } from '@angular/core'; +import { ActivatedRoute } from '@angular/router'; +import { Subject, takeUntil } from 'rxjs'; +import { NoticeOfIntentTypeDto } from '../../../../services/code/code.dto'; +import { CodeService } from '../../../../services/code/code.service'; +import { NotificationSubmissionService } from '../../../../services/notification-submission/notification-submission.service'; +import { OverlaySpinnerService } from '../../../../shared/overlay-spinner/overlay-spinner.service'; + +@Component({ + selector: 'app-success', + templateUrl: './success.component.html', + styleUrls: ['./success.component.scss'], +}) +export class SuccessComponent implements OnInit, OnDestroy { + $destroy = new Subject<void>(); + + fileId = ''; + appLabel = ''; + alcFee?: number | null; + private noiTypes: NoticeOfIntentTypeDto[] = []; + private appType: string | undefined; + + constructor( + private notificationSubmissionService: NotificationSubmissionService, + private activatedRoute: ActivatedRoute, + private overlayService: OverlaySpinnerService, + private codeService: CodeService + ) {} + + ngOnInit() { + this.loadCodes(); + this.activatedRoute.paramMap.pipe(takeUntil(this.$destroy)).subscribe((paramMap) => { + const fileId = paramMap.get('fileId'); + if (fileId) { + this.loadApplication(fileId); + } + }); + } + + ngOnDestroy() { + this.$destroy.next(); + this.$destroy.complete(); + } + + private async loadApplication(fileId: string) { + this.overlayService.showSpinner(); + const noiSubmission = await this.notificationSubmissionService.getByFileId(fileId); + if (noiSubmission) { + this.fileId = fileId; + this.appType = noiSubmission.typeCode; + this.appLabel = noiSubmission.type; + this.populateFees(noiSubmission.typeCode); + } + this.overlayService.hideSpinner(); + } + + private async loadCodes() { + const codes = await this.codeService.loadCodes(); + this.noiTypes = codes.noticeOfIntentTypes.filter((type) => !!type.portalLabel); + if (this.appType) { + this.populateFees(this.appType); + } + } + + private populateFees(typeCode: string) { + const appType = this.noiTypes.find((type) => type.code === typeCode); + if (appType) { + this.alcFee = appType.alcFeeAmount; + } + } +} From c695929c5ded47c8ae21f474fccc1367388b7c74 Mon Sep 17 00:00:00 2001 From: Liam Stoddard <lstodd@protonmail.com> Date: Mon, 11 Dec 2023 16:51:23 -0800 Subject: [PATCH 765/954] init app primary contact --- .../parcels/primary_contact/__init__.py | 0 .../application_primary_contact.py | 139 ++++++++++++++++++ .../application_submission_primary_contact.py | 98 ++++++++++++ .../application_primary_contact.sql | 67 +++++++++ .../application_primary_contact_count.sql | 67 +++++++++ ...application_submission_primary_contact.sql | 6 + ...ation_submission_primary_contact_count.sql | 4 + 7 files changed, 381 insertions(+) create mode 100644 bin/migrate-oats-data/applications/submissions/parcels/primary_contact/__init__.py create mode 100644 bin/migrate-oats-data/applications/submissions/parcels/primary_contact/application_primary_contact.py create mode 100644 bin/migrate-oats-data/applications/submissions/parcels/primary_contact/application_submission_primary_contact.py create mode 100644 bin/migrate-oats-data/applications/submissions/sql/parcels/primary_contact/application_primary_contact.sql create mode 100644 bin/migrate-oats-data/applications/submissions/sql/parcels/primary_contact/application_primary_contact_count.sql create mode 100644 bin/migrate-oats-data/applications/submissions/sql/parcels/primary_contact/application_submission_primary_contact.sql create mode 100644 bin/migrate-oats-data/applications/submissions/sql/parcels/primary_contact/application_submission_primary_contact_count.sql diff --git a/bin/migrate-oats-data/applications/submissions/parcels/primary_contact/__init__.py b/bin/migrate-oats-data/applications/submissions/parcels/primary_contact/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/bin/migrate-oats-data/applications/submissions/parcels/primary_contact/application_primary_contact.py b/bin/migrate-oats-data/applications/submissions/parcels/primary_contact/application_primary_contact.py new file mode 100644 index 0000000000..f9f33fd268 --- /dev/null +++ b/bin/migrate-oats-data/applications/submissions/parcels/primary_contact/application_primary_contact.py @@ -0,0 +1,139 @@ +from common import ( + setup_and_get_logger, + BATCH_UPLOAD_SIZE, + OATS_ETL_USER, + ALCSOwnerType, +) +from db import inject_conn_pool +from psycopg2.extras import RealDictCursor + +etl_name = "init_application_primary_contacts" +logger = setup_and_get_logger(etl_name) + + +@inject_conn_pool +def init_application_primary_contacts(conn=None, batch_size=BATCH_UPLOAD_SIZE): + logger.info(f"Start {etl_name}") + with conn.cursor(cursor_factory=RealDictCursor) as cursor: + with open( + "noi/sql/notice_of_intent_submission/primary_contact/notice_of_intent_primary_contact_count.sql", + "r", + encoding="utf-8", + ) as sql_file: + count_query = sql_file.read() + cursor.execute(count_query) + count_total = dict(cursor.fetchone())["count"] + logger.info(f"Total Notice of Intents data to insert: {count_total}") + + failed_inserts = 0 + successful_updates_count = 0 + last_file_number = 0 + + with open( + "noi/sql/notice_of_intent_submission/primary_contact/notice_of_intent_primary_contact.sql", + "r", + encoding="utf-8", + ) as sql_file: + application_sql = sql_file.read() + while True: + cursor.execute( + f"{application_sql} AND alr_application_id > {last_file_number} ORDER BY alr_application_id;" + ) + + rows = cursor.fetchmany(batch_size) + + if not rows: + break + try: + records_to_be_inserted_count = len(rows) + + _insert_records(conn, cursor, rows) + + successful_updates_count = ( + successful_updates_count + records_to_be_inserted_count + ) + + last_file_number = dict(rows[-1])["alr_application_id"] + + logger.debug( + f"retrieved/updated items count: {records_to_be_inserted_count}; total successfully insert notice of intents owners so far {successful_updates_count}; last updated {last_file_number}" + ) + except Exception as err: + logger.exception(err) + conn.rollback() + failed_inserts = count_total - successful_updates_count + last_file_number += 1 + + logger.info( + f"Finished {etl_name}: total amount of successful inserts {successful_updates_count}, total failed inserts {failed_inserts}" + ) + + +def _insert_records(conn, cursor, rows): + number_of_rows_to_insert = len(rows) + + if number_of_rows_to_insert > 0: + insert_query = _compile_owner_insert_query(number_of_rows_to_insert) + rows_to_insert = _prepare_data_to_insert(rows) + cursor.execute(insert_query, rows_to_insert) + conn.commit() + + +def _compile_owner_insert_query(number_of_rows_to_insert): + owners_to_insert = ",".join(["%s"] * number_of_rows_to_insert) + return f""" + INSERT INTO alcs.application_owner( + first_name, + last_name, + organization_name, + application_submission_uuid, + email, + phone_number, + type_code, + oats_application_party_id, + audit_created_by + ) + VALUES{owners_to_insert} + ON CONFLICT DO NOTHING; + """ + + +def _prepare_data_to_insert(rows): + row_without_last_element = [] + for row in rows: + mapped_row = _map_data(row) + row_without_last_element.append(tuple(mapped_row.values())) + + return row_without_last_element + + +def _map_data(row): + return { + "first_name": _get_name(row), + "last_name": row["last_name"], + "organization_name": row["organization_name"], + "application_submission_uuid": row["application_submission_uuid"], + "email": row["email_address"], + "phone_number": row.get("phone_number", "cell_phone_number"), + "type_code": ALCSOwnerType.AGEN.value, + "oats_application_party_id": row["alr_application_party_id"], + "audit_created_by": OATS_ETL_USER, + } + + +def _get_name(row): + first_name = row.get("first_name", "") + middle_name = row.get("middle_name", "") + return f"{first_name} {middle_name}".strip() + + +@inject_conn_pool +def clean_primary_contacts(conn=None): + logger.info("Start notice of intent primary contact cleaning") + with conn.cursor() as cursor: + cursor.execute( + f"UPDATE alcs.application_submission SET primary_contact_owner_uuid = NULL WHERE audit_created_by = '{OATS_ETL_USER}'" + ) + logger.info(f"Unassigned items count = {cursor.rowcount}") + conn.commit() + logger.info("Done notice of intent primary contact cleaning") diff --git a/bin/migrate-oats-data/applications/submissions/parcels/primary_contact/application_submission_primary_contact.py b/bin/migrate-oats-data/applications/submissions/parcels/primary_contact/application_submission_primary_contact.py new file mode 100644 index 0000000000..3d255a101e --- /dev/null +++ b/bin/migrate-oats-data/applications/submissions/parcels/primary_contact/application_submission_primary_contact.py @@ -0,0 +1,98 @@ +from common import ( + setup_and_get_logger, + BATCH_UPLOAD_SIZE, +) +from db import inject_conn_pool +from psycopg2.extras import RealDictCursor, execute_batch + +etl_name = "link_application_primary_contacts" +logger = setup_and_get_logger(etl_name) + + +@inject_conn_pool +def link_application_primary_contacts(conn=None, batch_size=BATCH_UPLOAD_SIZE): + logger.info(f"Start {etl_name}") + with conn.cursor(cursor_factory=RealDictCursor) as cursor: + with open( + "noi/sql/notice_of_intent_submission/primary_contact/notice_of_intent_submission_primary_contact_count.sql", + "r", + encoding="utf-8", + ) as sql_file: + count_query = sql_file.read() + cursor.execute(count_query) + count_total = dict(cursor.fetchone())["count"] + logger.info(f"Total Notice of Intents data to update: {count_total}") + + failed_updates = 0 + successful_updates_count = 0 + last_file_number = 0 + + with open( + "noi/sql/notice_of_intent_submission/primary_contact/notice_of_intent_submission_primary_contact.sql", + "r", + encoding="utf-8", + ) as sql_file: + application_sql = sql_file.read() + while True: + cursor.execute( + f"{application_sql} WHERE apps.file_number::bigint > '{last_file_number}' ORDER BY apps.file_number::bigint;" + ) + + rows = cursor.fetchmany(batch_size) + + if not rows: + break + try: + records_to_be_updated_count = len(rows) + + _update_records(conn, batch_size, cursor, rows) + + successful_updates_count = ( + successful_updates_count + records_to_be_updated_count + ) + + last_record = dict(rows[-1]) + last_file_number = last_record["file_number"] + + logger.debug( + f"retrieved/updated items count: {records_to_be_updated_count}; total successfully set notice of intents primary contacts so far {successful_updates_count}; last set {last_file_number}" + ) + except Exception as err: + logger.exception(err) + conn.rollback() + failed_updates = count_total - successful_updates_count + last_file_number = last_file_number + 1 + + logger.info( + f"Finished {etl_name}: total amount of successful updates {successful_updates_count}, total failed updates {failed_updates}" + ) + + +def _update_records(conn, batch_size, cursor, rows): + parsed_data_list = _prepare_oats_data(rows) + + if len(parsed_data_list) > 0: + execute_batch( + cursor, + _update_query, + parsed_data_list, + page_size=batch_size, + ) + + conn.commit() + + +_update_query = """ + UPDATE alcs.application_submission + SET + primary_contact_owner_uuid = %(owner_uuid)s + WHERE + alcs.application_submission.file_number = %(file_number)s::TEXT +""" + + +def _prepare_oats_data(row_data_list): + data_list = [] + for row in row_data_list: + data_list.append(dict(row)) + return data_list diff --git a/bin/migrate-oats-data/applications/submissions/sql/parcels/primary_contact/application_primary_contact.sql b/bin/migrate-oats-data/applications/submissions/sql/parcels/primary_contact/application_primary_contact.sql new file mode 100644 index 0000000000..b9231edc4e --- /dev/null +++ b/bin/migrate-oats-data/applications/submissions/sql/parcels/primary_contact/application_primary_contact.sql @@ -0,0 +1,67 @@ +WITH ordered_parties AS ( + SELECT oaap.ALR_APPLICATION_ID, + oaap.person_organization_id, + op.person_id, + op.first_name, + op.last_name, + oo.organization_id, + oo.organization_name, + opo.phone_number, + opo.cell_phone_number, + opo.email_address, + oaap.alr_appl_role_code, + oaap.expiry_date, + oaap.alr_application_party_id, + ROW_NUMBER() OVER ( + PARTITION BY oaap.ALR_APPLICATION_ID + ORDER BY CASE + WHEN oaap.alr_appl_role_code = 'AGENT' + AND oaap.expiry_date > CURRENT_DATE THEN 1 + WHEN oaap.alr_appl_role_code = 'AGENT' + AND oaap.expiry_date IS NULL THEN 2 + WHEN oaap.alr_appl_role_code = 'AGENT' THEN 3 + WHEN oaap.alr_appl_role_code = 'APPL' + AND oaap.expiry_date > CURRENT_DATE THEN 4 + WHEN oaap.alr_appl_role_code = 'APPL' + AND oaap.expiry_date IS NULL THEN 5 + WHEN oaap.alr_appl_role_code = 'APPL' THEN 6 + ELSE 7 + END, + oaap.expiry_date DESC + ) row_num + FROM oats.oats_alr_application_parties oaap + JOIN oats.oats_person_organizations opo ON oaap.person_organization_id = opo.person_organization_id + LEFT JOIN oats.oats_persons op ON opo.PERSON_ID = op.person_id + LEFT JOIN oats.oats_organizations oo ON oo.organization_id = opo.organization_id + WHERE oaap.alr_appl_role_code <> 'LG' +), +parties_with_submission_uuid as ( + SELECT ALR_APPLICATION_ID, + person_organization_id, + person_id, + first_name, + last_name, + organization_id, + organization_name, + phone_number, + cell_phone_number, + email_address, + alr_appl_role_code, + expiry_date, + apps."uuid" AS application_submission_uuid, + alr_application_party_id, + row_num + FROM ordered_parties + JOIN alcs.application_submission apps ON apps.file_number::bigint = ALR_APPLICATION_ID +), +parties_ordered_by_priority as ( + SELECT *, + ROW_NUMBER() OVER( + PARTITION BY ALR_APPLICATION_ID + ORDER BY row_num + ) priority + FROM parties_with_submission_uuid +) +SELECT * +FROM parties_ordered_by_priority +WHERE priority = 1 \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/submissions/sql/parcels/primary_contact/application_primary_contact_count.sql b/bin/migrate-oats-data/applications/submissions/sql/parcels/primary_contact/application_primary_contact_count.sql new file mode 100644 index 0000000000..da9b0d1cd8 --- /dev/null +++ b/bin/migrate-oats-data/applications/submissions/sql/parcels/primary_contact/application_primary_contact_count.sql @@ -0,0 +1,67 @@ +WITH ordered_parties AS ( + SELECT oaap.ALR_APPLICATION_ID, + oaap.person_organization_id, + op.person_id, + op.first_name, + op.last_name, + oo.organization_id, + oo.organization_name, + opo.phone_number, + opo.cell_phone_number, + opo.email_address, + oaap.alr_appl_role_code, + oaap.expiry_date, + oaap.alr_application_party_id, + ROW_NUMBER() OVER ( + PARTITION BY oaap.ALR_APPLICATION_ID + ORDER BY CASE + WHEN oaap.alr_appl_role_code = 'AGENT' + AND oaap.expiry_date > CURRENT_DATE THEN 1 + WHEN oaap.alr_appl_role_code = 'AGENT' + AND oaap.expiry_date IS NULL THEN 2 + WHEN oaap.alr_appl_role_code = 'AGENT' THEN 3 + WHEN oaap.alr_appl_role_code = 'APPL' + AND oaap.expiry_date > CURRENT_DATE THEN 4 + WHEN oaap.alr_appl_role_code = 'APPL' + AND oaap.expiry_date IS NULL THEN 5 + WHEN oaap.alr_appl_role_code = 'APPL' THEN 6 + ELSE 7 + END, + oaap.expiry_date DESC + ) row_num + FROM oats.oats_alr_application_parties oaap + JOIN oats.oats_person_organizations opo ON oaap.person_organization_id = opo.person_organization_id + LEFT JOIN oats.oats_persons op ON opo.PERSON_ID = op.person_id + LEFT JOIN oats.oats_organizations oo ON oo.organization_id = opo.organization_id + WHERE oaap.alr_appl_role_code <> 'LG' +), +parties_with_submission_uuid as ( + SELECT ALR_APPLICATION_ID, + person_organization_id, + person_id, + first_name, + last_name, + organization_id, + organization_name, + phone_number, + cell_phone_number, + email_address, + alr_appl_role_code, + expiry_date, + apps."uuid" AS application_submission_uuid, + alr_application_party_id, + row_num + FROM ordered_parties + JOIN alcs.application_submission apps ON apps.file_number::bigint = ALR_APPLICATION_ID +), +parties_ordered_by_priority as ( + SELECT *, + ROW_NUMBER() OVER( + PARTITION BY ALR_APPLICATION_ID + ORDER BY row_num + ) priority + FROM parties_with_submission_uuid +) +SELECT count(*) +FROM parties_ordered_by_priority +WHERE priority = 1; \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/submissions/sql/parcels/primary_contact/application_submission_primary_contact.sql b/bin/migrate-oats-data/applications/submissions/sql/parcels/primary_contact/application_submission_primary_contact.sql new file mode 100644 index 0000000000..01e0f0460f --- /dev/null +++ b/bin/migrate-oats-data/applications/submissions/sql/parcels/primary_contact/application_submission_primary_contact.sql @@ -0,0 +1,6 @@ +SELECT apps."uuid" AS submission_uuid, + appo."uuid" AS owner_uuid, + apps.file_number::bigint +FROM oats.oats_alr_application_parties oaap + JOIN alcs.application_submission apps ON apps.file_number::bigint = oaap.alr_application_id + JOIN alcs.application_owner appo ON appo.oats_application_party_id = oaap.alr_application_party_id \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/submissions/sql/parcels/primary_contact/application_submission_primary_contact_count.sql b/bin/migrate-oats-data/applications/submissions/sql/parcels/primary_contact/application_submission_primary_contact_count.sql new file mode 100644 index 0000000000..de91ec4819 --- /dev/null +++ b/bin/migrate-oats-data/applications/submissions/sql/parcels/primary_contact/application_submission_primary_contact_count.sql @@ -0,0 +1,4 @@ +SELECT count(*) +FROM oats.oats_alr_application_parties oaap + JOIN alcs.application_submission apps ON apps.file_number::bigint = oaap.alr_application_id + JOIN alcs.application_owner appo ON appo.oats_application_party_id = oaap.alr_application_party_id; \ No newline at end of file From 67c2df45a57d2e24f9ca7c596d6d9cd01c5eaaf0 Mon Sep 17 00:00:00 2001 From: Liam Stoddard <lstodd@protonmail.com> Date: Mon, 11 Dec 2023 16:53:17 -0800 Subject: [PATCH 766/954] fixed wording to make sense --- bin/migrate-oats-data/applications/app_staff_journal.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/migrate-oats-data/applications/app_staff_journal.py b/bin/migrate-oats-data/applications/app_staff_journal.py index c6fa794807..2bef63a1a7 100644 --- a/bin/migrate-oats-data/applications/app_staff_journal.py +++ b/bin/migrate-oats-data/applications/app_staff_journal.py @@ -14,7 +14,7 @@ @inject_conn_pool def process_app_staff_journal(conn=None, batch_size=BATCH_UPLOAD_SIZE): """ - This function is responsible for initializing applications in the staff_journal table in ALCS. + This function is responsible for initializing entries for applications in staff_journal table in ALCS. Args: conn (psycopg2.extensions.connection): PostgreSQL database connection. Provided by the decorator. From f7d427f94ffea235589faec3e0310e78e080f09c Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Tue, 12 Dec 2023 10:41:13 -0800 Subject: [PATCH 767/954] Bug Fixes * Add missed seeds for NOI fees * Switch button links --- .../edit-submission/success/success.component.html | 4 ++-- .../edit-submission/success/success.component.html | 2 +- .../migrations/1702405814005-seed_noi_type_fees.ts | 13 +++++++++++++ 3 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1702405814005-seed_noi_type_fees.ts diff --git a/portal-frontend/src/app/features/applications/edit-submission/success/success.component.html b/portal-frontend/src/app/features/applications/edit-submission/success/success.component.html index d5f2e13b4c..1bcdb43ead 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/success/success.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/success/success.component.html @@ -49,6 +49,6 @@ <h2 class="heading">Application ID: {{ fileId }} Submitted!</h2> The Primary Contact will be emailed this information and all future correspondence. </p> <div class="buttons"> - <button routerLink="/home" mat-flat-button color="primary">View Submission</button> - <button [routerLink]="'/application/' + fileId" mat-stroked-button color="primary">Return to inbox</button> + <button [routerLink]="'/application/' + fileId" mat-flat-button color="primary">View Submission</button> + <button routerLink="/home" mat-stroked-button color="primary">Return to inbox</button> </div> diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/success/success.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/success/success.component.html index aaa22158f8..d40bf3e9af 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/success/success.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/success/success.component.html @@ -10,7 +10,7 @@ <h2 class="heading">NOI ID: {{ fileId }} Submitted!</h2> This fee can be paid:<br /> 1. Cheque: Made payable to the Minister of Finance c/o the ALC<br /> 2. Credit card: Over the phone or in-person<br /><br /> - Please include your assigned Application ID with your payment.<br /><br /> + Please include your assigned Notice of Intent ID with your payment.<br /><br /> <strong>Mailing address:</strong><br /> Agricultural Land Commission<br /> 201-4940 Canada Way, Burnaby, BC, Canada, V5G 4K6<br /><br /> diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1702405814005-seed_noi_type_fees.ts b/services/apps/alcs/src/providers/typeorm/migrations/1702405814005-seed_noi_type_fees.ts new file mode 100644 index 0000000000..820c693bdc --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1702405814005-seed_noi_type_fees.ts @@ -0,0 +1,13 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class SeedNoiTypeFees1702405814005 implements MigrationInterface { + public async up(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query(` + UPDATE "alcs"."notice_of_intent_type" SET "alc_fee_amount" = 150 WHERE "code" = 'ROSO'; + UPDATE "alcs"."notice_of_intent_type" SET "alc_fee_amount" = 150 WHERE "code" = 'POFO'; + UPDATE "alcs"."notice_of_intent_type" SET "alc_fee_amount" = 150 WHERE "code" = 'PFRS'; + `); + } + + public async down(): Promise<void> {} +} From 7797136c8c2c76782d40a9dddeac482e76a1f2f2 Mon Sep 17 00:00:00 2001 From: Liam Stoddard <lstodd@protonmail.com> Date: Tue, 12 Dec 2023 11:51:09 -0800 Subject: [PATCH 768/954] waiting for staff journal to avoid merge conflict --- .../submissions/parcels/primary_contact/__init__.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/bin/migrate-oats-data/applications/submissions/parcels/primary_contact/__init__.py b/bin/migrate-oats-data/applications/submissions/parcels/primary_contact/__init__.py index e69de29bb2..0380d12d5d 100644 --- a/bin/migrate-oats-data/applications/submissions/parcels/primary_contact/__init__.py +++ b/bin/migrate-oats-data/applications/submissions/parcels/primary_contact/__init__.py @@ -0,0 +1,5 @@ +from .application_primary_contact import ( + init_application_primary_contacts, + clean_primary_contacts, +) +from .application_submission_primary_contact import link_application_primary_contacts From 3922dc4264355cd2553172ee145be2e2594973fd Mon Sep 17 00:00:00 2001 From: Liam Stoddard <lstodd@protonmail.com> Date: Tue, 12 Dec 2023 21:43:27 -0800 Subject: [PATCH 769/954] appears to be running correctly --- .../applications/migrate_application.py | 2 ++ .../applications/submissions/__init__.py | 7 +++++- .../submissions/migrate_application_owners.py | 9 ++++++- .../submissions/parcels/__init__.py | 5 ++++ .../application_primary_contact.py | 12 +++++----- .../application_submission_primary_contact.py | 8 +++---- .../application-owner.entity.ts | 9 +++++++ ..._oats_application_party_id_to_app_owner.ts | 24 +++++++++++++++++++ 8 files changed, 64 insertions(+), 12 deletions(-) create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1702443718070-add_oats_application_party_id_to_app_owner.ts diff --git a/bin/migrate-oats-data/applications/migrate_application.py b/bin/migrate-oats-data/applications/migrate_application.py index 4ab74f467d..8d298e5f36 100644 --- a/bin/migrate-oats-data/applications/migrate_application.py +++ b/bin/migrate-oats-data/applications/migrate_application.py @@ -7,6 +7,7 @@ clean_owners, clean_parcel_owners, process_application_owners, + clean_primary_contacts, ) from .base_applications import process_applications, clean_applications from .app_prep import process_alcs_application_prep_fields @@ -39,6 +40,7 @@ def init_applications(batch_size): def clean_application_parcels(): + clean_primary_contacts() clean_parcel_owners() clean_owners() clean_parcels() diff --git a/bin/migrate-oats-data/applications/submissions/__init__.py b/bin/migrate-oats-data/applications/submissions/__init__.py index 799fbcad29..806ea15f92 100644 --- a/bin/migrate-oats-data/applications/submissions/__init__.py +++ b/bin/migrate-oats-data/applications/submissions/__init__.py @@ -3,7 +3,12 @@ process_application_statuses, clean_app_submissions, ) -from .parcels import clean_parcels, clean_parcel_owners, clean_owners +from .parcels import ( + clean_parcels, + clean_parcel_owners, + clean_owners, + clean_primary_contacts, +) from .migrate_application_parcels import ( process_application_parcels, ) diff --git a/bin/migrate-oats-data/applications/submissions/migrate_application_owners.py b/bin/migrate-oats-data/applications/submissions/migrate_application_owners.py index 22499f8ac6..cc7a7d7a83 100644 --- a/bin/migrate-oats-data/applications/submissions/migrate_application_owners.py +++ b/bin/migrate-oats-data/applications/submissions/migrate_application_owners.py @@ -1,6 +1,13 @@ -from .parcels import init_application_parcel_owners, link_application_owners_to_parcels +from .parcels import ( + init_application_parcel_owners, + link_application_owners_to_parcels, + init_application_primary_contacts, + link_application_primary_contacts, +) def process_application_owners(batch_size): init_application_parcel_owners(batch_size) link_application_owners_to_parcels(batch_size) + init_application_primary_contacts(batch_size) + link_application_primary_contacts(batch_size) diff --git a/bin/migrate-oats-data/applications/submissions/parcels/__init__.py b/bin/migrate-oats-data/applications/submissions/parcels/__init__.py index 86099b7070..b478a2013d 100644 --- a/bin/migrate-oats-data/applications/submissions/parcels/__init__.py +++ b/bin/migrate-oats-data/applications/submissions/parcels/__init__.py @@ -6,3 +6,8 @@ init_application_parcel_owners, link_application_owners_to_parcels, ) +from .primary_contact import ( + clean_primary_contacts, + init_application_primary_contacts, + link_application_primary_contacts, +) diff --git a/bin/migrate-oats-data/applications/submissions/parcels/primary_contact/application_primary_contact.py b/bin/migrate-oats-data/applications/submissions/parcels/primary_contact/application_primary_contact.py index f9f33fd268..abec433713 100644 --- a/bin/migrate-oats-data/applications/submissions/parcels/primary_contact/application_primary_contact.py +++ b/bin/migrate-oats-data/applications/submissions/parcels/primary_contact/application_primary_contact.py @@ -16,21 +16,21 @@ def init_application_primary_contacts(conn=None, batch_size=BATCH_UPLOAD_SIZE): logger.info(f"Start {etl_name}") with conn.cursor(cursor_factory=RealDictCursor) as cursor: with open( - "noi/sql/notice_of_intent_submission/primary_contact/notice_of_intent_primary_contact_count.sql", + "applications/submissions/sql/parcels/primary_contact/application_primary_contact_count.sql", "r", encoding="utf-8", ) as sql_file: count_query = sql_file.read() cursor.execute(count_query) count_total = dict(cursor.fetchone())["count"] - logger.info(f"Total Notice of Intents data to insert: {count_total}") + logger.info(f"Total Application data to insert: {count_total}") failed_inserts = 0 successful_updates_count = 0 last_file_number = 0 with open( - "noi/sql/notice_of_intent_submission/primary_contact/notice_of_intent_primary_contact.sql", + "applications/submissions/sql/parcels/primary_contact/application_primary_contact.sql", "r", encoding="utf-8", ) as sql_file: @@ -56,7 +56,7 @@ def init_application_primary_contacts(conn=None, batch_size=BATCH_UPLOAD_SIZE): last_file_number = dict(rows[-1])["alr_application_id"] logger.debug( - f"retrieved/updated items count: {records_to_be_inserted_count}; total successfully insert notice of intents owners so far {successful_updates_count}; last updated {last_file_number}" + f"retrieved/updated items count: {records_to_be_inserted_count}; total successfully insert application owners so far {successful_updates_count}; last updated {last_file_number}" ) except Exception as err: logger.exception(err) @@ -129,11 +129,11 @@ def _get_name(row): @inject_conn_pool def clean_primary_contacts(conn=None): - logger.info("Start notice of intent primary contact cleaning") + logger.info("Start application primary contact cleaning") with conn.cursor() as cursor: cursor.execute( f"UPDATE alcs.application_submission SET primary_contact_owner_uuid = NULL WHERE audit_created_by = '{OATS_ETL_USER}'" ) logger.info(f"Unassigned items count = {cursor.rowcount}") conn.commit() - logger.info("Done notice of intent primary contact cleaning") + logger.info("Done application primary contact cleaning") diff --git a/bin/migrate-oats-data/applications/submissions/parcels/primary_contact/application_submission_primary_contact.py b/bin/migrate-oats-data/applications/submissions/parcels/primary_contact/application_submission_primary_contact.py index 3d255a101e..440002eca2 100644 --- a/bin/migrate-oats-data/applications/submissions/parcels/primary_contact/application_submission_primary_contact.py +++ b/bin/migrate-oats-data/applications/submissions/parcels/primary_contact/application_submission_primary_contact.py @@ -14,21 +14,21 @@ def link_application_primary_contacts(conn=None, batch_size=BATCH_UPLOAD_SIZE): logger.info(f"Start {etl_name}") with conn.cursor(cursor_factory=RealDictCursor) as cursor: with open( - "noi/sql/notice_of_intent_submission/primary_contact/notice_of_intent_submission_primary_contact_count.sql", + "applications/submissions/sql/parcels/primary_contact/application_submission_primary_contact_count.sql", "r", encoding="utf-8", ) as sql_file: count_query = sql_file.read() cursor.execute(count_query) count_total = dict(cursor.fetchone())["count"] - logger.info(f"Total Notice of Intents data to update: {count_total}") + logger.info(f"Total Application data to update: {count_total}") failed_updates = 0 successful_updates_count = 0 last_file_number = 0 with open( - "noi/sql/notice_of_intent_submission/primary_contact/notice_of_intent_submission_primary_contact.sql", + "applications/submissions/sql/parcels/primary_contact/application_submission_primary_contact.sql", "r", encoding="utf-8", ) as sql_file: @@ -55,7 +55,7 @@ def link_application_primary_contacts(conn=None, batch_size=BATCH_UPLOAD_SIZE): last_file_number = last_record["file_number"] logger.debug( - f"retrieved/updated items count: {records_to_be_updated_count}; total successfully set notice of intents primary contacts so far {successful_updates_count}; last set {last_file_number}" + f"retrieved/updated items count: {records_to_be_updated_count}; total successfully set application primary contacts so far {successful_updates_count}; last set {last_file_number}" ) except Exception as err: logger.exception(err) diff --git a/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.entity.ts b/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.entity.ts index 6eb625c510..ef38049c32 100644 --- a/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.entity.ts +++ b/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.entity.ts @@ -60,6 +60,15 @@ export class ApplicationOwner extends Base { }) oatsPersonOrganizationId: number; + @Column({ + select: false, + nullable: true, + type: 'int8', + comment: + 'This column is NOT related to any functionality in ALCS. It is only used for ETL and backtracking of imported data from OATS. It links oats.oats_alr_application_parties to alcs.application_owner.', + }) + oatsApplicationPartyId: number; + @AutoMap(() => ApplicationDocumentDto) @ManyToOne(() => ApplicationDocument, { onDelete: 'SET NULL', diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1702443718070-add_oats_application_party_id_to_app_owner.ts b/services/apps/alcs/src/providers/typeorm/migrations/1702443718070-add_oats_application_party_id_to_app_owner.ts new file mode 100644 index 0000000000..8ba9224215 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1702443718070-add_oats_application_party_id_to_app_owner.ts @@ -0,0 +1,24 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class AddOatsApplicationPartyIdToAppOwner1702443718070 + implements MigrationInterface +{ + name = 'AddOatsApplicationPartyIdToAppOwner1702443718070'; + public async up(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `ALTER TABLE "alcs"."application_owner" ADD "oats_application_party_id" bigint`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."application_owner"."oats_application_party_id" IS 'This column is NOT related to any functionality in ALCS. It is only used for ETL and backtracking of imported data from OATS. It links oats.oats_alr_application_parties to alcs.application_owner.'`, + ); + } + + public async down(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."application_owner"."oats_application_party_id" IS 'This column is NOT related to any functionality in ALCS. It is only used for ETL and backtracking of imported data from OATS. It links oats.oats_alr_application_parties to alcs.application_owner.'`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_owner" DROP COLUMN "oats_application_party_id"`, + ); + } +} From 968b88a0d7561470f9a1d500bbed530ec312019b Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Wed, 13 Dec 2023 11:06:43 -0800 Subject: [PATCH 770/954] Fix cancel NOI confirm text --- .../view-notice-of-intent-submission.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.ts b/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.ts index 1e4fabe145..94f8c28728 100644 --- a/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.ts @@ -67,7 +67,7 @@ export class ViewNoticeOfIntentSubmissionComponent implements OnInit, OnDestroy async onCancel(uuid: string) { const dialog = this.confirmationDialogService.openDialog({ - body: 'Are you sure you want to cancel the notice of intent? A cancelled application cannot be edited or submitted to the ALC. This cannot be undone.', + body: 'Are you sure you want to cancel the notice of intent? A cancelled notice of intent cannot be edited or submitted to the ALC. This cannot be undone.', confirmAction: 'Confirm', cancelAction: 'Return', }); From ae20063e60b9523be386087777ec8bc376b5f3df Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Wed, 13 Dec 2023 11:08:33 -0800 Subject: [PATCH 771/954] fix etl owner name mapping (#1221) * fix etl owner name mapping * noi owner --- .../submissions/parcels/owners/application_owners.py | 9 ++++++--- .../parcels/owners/notice_of_intent_owners.py | 9 ++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/bin/migrate-oats-data/applications/submissions/parcels/owners/application_owners.py b/bin/migrate-oats-data/applications/submissions/parcels/owners/application_owners.py index b734011326..1d0a9c24db 100644 --- a/bin/migrate-oats-data/applications/submissions/parcels/owners/application_owners.py +++ b/bin/migrate-oats-data/applications/submissions/parcels/owners/application_owners.py @@ -128,9 +128,12 @@ def _map_data(row): def _get_name(row): - first_name = row.get("first_name", "") - middle_name = row.get("middle_name", "") - return f"{first_name} {middle_name}".strip() + first_name = row.get("first_name", None) + middle_name = row.get("middle_name", None) + + return " ".join( + [name for name in (first_name, middle_name) if name is not None] + ).strip() def _map_owner_type(owner_record): diff --git a/bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/owners/notice_of_intent_owners.py b/bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/owners/notice_of_intent_owners.py index bdeaf0d20a..ae873870ba 100644 --- a/bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/owners/notice_of_intent_owners.py +++ b/bin/migrate-oats-data/noi/notice_of_intent_submissions/parcels/owners/notice_of_intent_owners.py @@ -128,9 +128,12 @@ def _map_data(row): def _get_name(row): - first_name = row.get("first_name", "") - middle_name = row.get("middle_name", "") - return f"{first_name} {middle_name}".strip() + first_name = row.get("first_name", None) + middle_name = row.get("middle_name", None) + + return " ".join( + [name for name in (first_name, middle_name) if name is not None] + ).strip() def _map_owner_type(owner_record): From ada2f3098267e334402ca8a219b701eb89756469 Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Thu, 14 Dec 2023 09:07:44 -0800 Subject: [PATCH 772/954] update add govt interaction --- .../parcel/parcel.component.html | 43 +++++- .../parcel-entry/parcel-entry.component.html | 133 ++++++++--------- .../parcel-entry/parcel-entry.component.scss | 36 +++++ .../parcel-entry/parcel-entry.component.ts | 36 ++++- .../parcel-entry/parcel-entry.component.html | 137 +++++++++--------- .../parcel-entry/parcel-entry.component.scss | 35 +++++ .../parcel-entry/parcel-entry.component.ts | 41 +++++- .../parcel/parcel.component.html | 43 +++++- .../application-owner.dto.ts | 2 + .../notice-of-intent-owner.dto.ts | 2 + .../crown-owner-dialog.component.html | 20 ++- .../crown-owner-dialog.component.scss | 12 ++ .../crown-owner-dialog.component.ts | 32 +++- .../application-owner.controller.ts | 2 + .../application-owner.dto.ts | 11 ++ .../application-owner.entity.ts | 7 + .../application-owner.service.ts | 4 + ...pplication-submission-validator.service.ts | 9 -- .../application-submission.entity.ts | 8 + .../notice-of-intent-owner.controller.ts | 2 + .../notice-of-intent-owner.dto.ts | 11 ++ .../notice-of-intent-owner.entity.ts | 7 + .../notice-of-intent-owner.service.ts | 4 + ...-of-intent-submission-validator.service.ts | 9 -- .../notice-of-intent-submission.entity.ts | 8 + ...702486285892-add-crownlandtype-to-owner.ts | 37 +++++ 26 files changed, 505 insertions(+), 186 deletions(-) create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1702486285892-add-crownlandtype-to-owner.ts diff --git a/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.html b/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.html index 857fd6cdb8..6cec01bd1f 100644 --- a/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.html +++ b/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.html @@ -87,13 +87,6 @@ <h4>Parcel {{ parcelInd + 1 }}</h4> {{ parcel.civicAddress }} <app-no-data [showRequired]="showErrors" *ngIf="!parcel.civicAddress"></app-no-data> </div> - <ng-container *ngIf="parcel.validation?.isCrownSelectionMandatory"> - <div class="subheading2 grid-1">Crown Selection</div> - <div class="grid-double"> - <span class="crown-land" *ngIf="parcel.crownLandOwnerType !== null">{{ parcel.crownLandOwnerType }}</span> - <app-no-data [showRequired]="showErrors" *ngIf="parcel.crownLandOwnerType === null"></app-no-data> - </div> - </ng-container> <div *ngIf="showCertificateOfTitle" class="subheading2 grid-1">Certificate Of Title</div> <div *ngIf="showCertificateOfTitle" class="grid-double"> <div *ngIf="parcel.certificateOfTitle"> @@ -105,9 +98,45 @@ <h4>Parcel {{ parcelInd + 1 }}</h4> ></app-no-data> </div> + <ng-container *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN"> + <h4 *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">Government Parcel Contact</h4> + <div class="subheading2 grid-1">First Name</div> + <div class="grid-double"> + {{ parcel.owners[0].firstName }} + <app-no-data [showRequired]="showErrors" *ngIf="!parcel.owners[0].firstName"></app-no-data> + </div> + <div class="subheading2 grid-1" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">Last Name</div> + <div class="grid-double"> + {{ parcel.owners[0].lastName }} + <app-no-data [showRequired]="showErrors" *ngIf="!parcel.owners[0].lastName"></app-no-data> + </div> + <div class="subheading2 grid-1" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">Ministry or Department</div> + <div class="grid-double"> + {{ parcel.owners[0].organizationName }} + <app-no-data [showRequired]="showErrors" *ngIf="!parcel.owners[0].organizationName"></app-no-data> + </div> + <div class="subheading2 grid-1" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">Phone</div> + <div class="grid-double"> + {{ parcel.owners[0].phoneNumber }} + <app-no-data [showRequired]="showErrors" *ngIf="!parcel.owners[0].phoneNumber"></app-no-data> + </div> + <div class="subheading2 grid-1" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">Email</div> + <div class="grid-double"> + {{ parcel.owners[0].email }} + <app-no-data [showRequired]="showErrors" *ngIf="!parcel.owners[0].email"></app-no-data> + </div> + <div class="subheading2 grid-1" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">Crown Type</div> + <div class="grid-double"> + {{ parcel.owners[0].crownLandOwnerType === 'provincial' ? 'Provincial Crown' : ''}} + {{ parcel.owners[0].crownLandOwnerType === 'federal' ? 'Federal Crown' : ''}} + <app-no-data [showRequired]="showErrors" *ngIf="!parcel.owners[0].crownLandOwnerType"></app-no-data> + </div> + </ng-container> + <div class="full-width owner-information" [ngClass]="{ 'crown-owner-information': parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN }" + *ngIf="parcel.ownershipTypeCode !== PARCEL_OWNERSHIP_TYPES.CROWN" > <div class="subheading2" *ngIf="parcel.ownershipTypeCode !== PARCEL_OWNERSHIP_TYPES.CROWN">Land Owner(s)</div> <div class="subheading2" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">Crown Contact(s)</div> diff --git a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html index 976fe2e473..f0fcc580ba 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html @@ -186,11 +186,16 @@ <div class="section" *ngIf="enableCertificateOfTitleUpload"> <mat-label for="certificate-of-title-upload">Upload Certificate of Title</mat-label> - <div class="subtext"> + <div class="subtext" *ngIf="!isCrownLand"> Visit <a href="https://ltsa.ca/property-owners/how-can-i/search-for-a-title/" target="_blank">BC Land Title & Survey</a> to obtain a recent copy (not older than 1 year) of the Certificate of Title </div> + <div class="subtext" *ngIf="isCrownLand"> + Only required for surveyed Crown land with a PID. Visit + <a href="https://ltsa.ca/property-owners/how-can-i/search-for-a-title/" target="_blank">BC Land Title & Survey</a> + to obtain a recent copy (not older than 1 year) of the Certificate of Title + </div> <app-file-drag-drop id="certificate-of-title-upload" [uploadedFiles]="parcel.certificateOfTitle ? [parcel.certificateOfTitle] : []" @@ -205,7 +210,8 @@ </div> <section *ngIf="enableOwners" class="container"> - <h6>Parcel Owners</h6> + <h6 *ngIf="!isCrownLand">Parcel Owners</h6> + <h6 *ngIf="isCrownLand">Government Parcel Contact</h6> <ng-container *ngIf="!isCrownLand"> <p>Add an owner for every organization or individual listed on the parcel's Certificate of Title</p> <div> @@ -276,83 +282,70 @@ <h6 class="owner-search-option">OR</h6> </div> </ng-container> <ng-container *ngIf="isCrownLand"> - <mat-label for="crown-owner-type">Select owner:</mat-label> - <mat-radio-group - formControlName="crownLandOwnerType" - class="crown-owner-type" - id="crown-owner-type" - aria-label="Select an Owner" - > - <mat-radio-button value="provincial">Provincial Crown</mat-radio-button> - <mat-radio-button value="federal">Federal Crown</mat-radio-button> - <div *ngIf="showErrors && !crownLandOwnerType.getRawValue()" class="field-error"> - <mat-icon>warning</mat-icon> - <div>This field is required</div> - </div> - </mat-radio-group> - <mat-form-field class="full-width-input" appearance="outline"> - <input - id="government-search" - type="text" - aria-label="Text" - matInput - placeholder="Search by Ministry or Department" - [matAutocomplete]="auto" - (input)="onTypeOwner($event)" - [formControl]="ownerInput" - /> - <mat-autocomplete #auto="matAutocomplete"> - <mat-option - (click)="onSelectOwner($event, option, option.isSelected)" - *ngFor="let option of filteredOwners" - [disabled]="option.isSelected" - > - <div class="owner-option"> - <div>{{ option.displayName }}</div> - <button mat-flat-button color="primary" [disabled]="option.isSelected"> - {{ option.isSelected ? 'Added' : 'Add' }} - </button> - </div> - </mat-option> - <mat-option - class="option" - *ngIf="filteredOwners.length === 0 && enableAddNewOwner" - (click)="onAddNewGovernmentContact()" - > - <div class="owner-option"> - <div>No owner matching search</div> - <button mat-flat-button color="primary">Add new government contact</button> - </div> - </mat-option> - </mat-autocomplete> - </mat-form-field> - <div *ngIf="ownerInput.errors && ownerInput.errors['required']" class="field-error"> - <mat-icon>warning</mat-icon> - <div *ngIf="ownerInput.errors?.['required']">This field is required</div> - </div> + <p>Add the contact information of an employee who works in the department or ministry for the Crown parcel</p> <button class="new-owner" *ngIf="enableAddNewOwner" (click)="onAddNewGovernmentContact()" - mat-stroked-button + mat-flat-button color="primary" [disabled]="_disabled || parcel.owners.length > 0" > - Add new government contact + Add new gov contact </button> + <h6 class="owner-search-option" *ngIf="filteredOwners.length">OR</h6> + <label for="owner-search" *ngIf="filteredOwners.length">Select from Existing Government</label> <div> - <app-parcel-owners - [fileId]="fileId" - [submissionUuid]="submissionUuid" - [parcelUuid]="parcel.uuid" - [owners]="parcel.owners" - (onOwnersUpdated)="onOwnersUpdated.emit()" - (onOwnerRemoved)="onOwnerRemoved($event)" - [ownerService]="applicationOwnerService" - [documentService]="applicationDocumentService" - [disabled]="_disabled" - [isCrown]="true" - ></app-parcel-owners> + <mat-radio-group + color="primary" + [value]="selectedOwner?.uuid" required + > + <mat-radio-button + *ngFor="let owner of filteredOwners" + [value]="owner.uuid" + class="radio-option" + (click)="onCrownOwnerSelected($event, owner, owner.isSelected)" + required + > + {{ owner.firstName + ' ' + owner.lastName }} + </mat-radio-button> + </mat-radio-group> + + <div class="warning-banner" *ngIf="selectedOwner"> + <div class="owner-details"> + <div class="row"> + <div class="key"><strong>First Name:</strong> </div> + <div class="value">{{ selectedOwner.firstName }}</div> + </div> + <div class="row"> + <div class="key"><strong>Last Name:</strong> </div> + <div class="value">{{ selectedOwner.lastName }}</div> + </div> + <div class="row"> + <div class="key"><strong>Ministry/ Department:</strong> </div> + <div class="value">{{ selectedOwner.organizationName }}</div> + </div> + <div class="row"> + <div class="key"><strong>Phone Number:</strong> </div> + <div class="value">{{ selectedOwner.phoneNumber }}</div> + </div> + <div class="row"> + <div class="key"><strong>Email:</strong> </div> + <div class="value">{{ selectedOwner.email }}</div> + </div> + <div class="row"> + <div class="key"><strong>Crown Type:</strong> </div> + <div class="value">{{ selectedOwner.crownLandOwnerType }}</div> + </div> + <div class="row"> + <button [disabled]="_disabled" (click)="onEdit(selectedOwner)" mat-stroked-button>Edit information</button> + </div> + </div> + </div> + </div> + <div *ngIf="ownerInput.errors && ownerInput.errors['required']" class="field-error"> + <mat-icon>warning</mat-icon> + <div *ngIf="ownerInput.errors?.['required']">This field is required</div> </div> </ng-container> </section> diff --git a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.scss b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.scss index cb3f2324a3..3e5cfbb6b9 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.scss +++ b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.scss @@ -98,3 +98,39 @@ mat-button-toggle-group#isFarm { height: 100%; } } + +.radio-option { + display: block !important; + + & .mdc-label { + cursor: pointer !important; + } +} + +.warning-banner { + margin-top: rem(8); + background-color: rgba(colors.$accent-color-light, 0.5); + padding: rem(16); + + .owner-details { + display: flex; + flex-direction: column; + } + + .row { + display: flex; + margin-bottom: rem(10); + } + + .key { + font-weight: bold; + margin-right: rem(5); + width: rem(300); + } + + .value { + flex-grow: 1; + overflow: hidden; + text-overflow: ellipsis; + } +} \ No newline at end of file diff --git a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts index 320c9e66d6..8ed80ecd53 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts @@ -103,6 +103,7 @@ export class ParcelEntryComponent implements OnInit { searchBy: this.searchBy, }); pidPinPlaceholder = ''; + selectedOwner?: ApplicationOwnerDto = undefined; ownerInput = new FormControl<string | null>(null); @@ -124,6 +125,11 @@ export class ParcelEntryComponent implements OnInit { this.$owners.subscribe((owners) => { this.owners = owners; this.filteredOwners = this.mapOwners(owners); + const selectedOwner = this.parcel.owners.length > 0 + ? this.filteredOwners.find((owner) => owner.uuid === this.parcel.owners[0].uuid) + : undefined; + + this.selectedOwner = selectedOwner; this.parcel.owners = this.parcel.owners .filter((owner) => owners.some((updatedOwner) => updatedOwner.uuid === owner.uuid)) .map((owner) => { @@ -320,7 +326,7 @@ export class ParcelEntryComponent implements OnInit { ownerService: this.applicationOwnerService, }, }); - dialog.beforeClosed().subscribe((createdDto) => { + dialog.afterClosed().subscribe((createdDto) => { if (createdDto) { this.onOwnersUpdated.emit(); const updatedArray = [...this.parcel.owners, createdDto]; @@ -344,6 +350,33 @@ export class ParcelEntryComponent implements OnInit { } } + async onCrownOwnerSelected(event: Event, owner: ApplicationOwnerDto, isSelected: boolean) { + this.selectedOwner = owner; + const selectedOwners = [owner]; + this.updateParcelOwners(selectedOwners); + } + + onEdit(owner: ApplicationOwnerDto) { + let dialog; + dialog = this.dialog.open(CrownOwnerDialogComponent, { + data: { + isDraft: this.isDraft, + parcelUuid: this.parcel.uuid, + existingOwner: owner, + submissionUuid: this.submissionUuid, + ownerService: this.applicationOwnerService, + }, + }); + dialog.afterClosed().subscribe((result) => { + if (result) { + this.onOwnersUpdated.emit(); + if(result.type === 'delete') { + this.onOwnerRemoved(result.uuid) + } + } + }); + } + async onOwnerRemoved(uuid: string) { const updatedArray = this.parcel.owners.filter((existingOwner) => existingOwner.uuid !== uuid); this.updateParcelOwners(updatedArray); @@ -395,7 +428,6 @@ export class ParcelEntryComponent implements OnInit { parcelType: this.parcel.ownershipTypeCode, isFarm: formatBooleanToString(this.parcel.isFarm), purchaseDate: this.parcel.purchasedDate ? new Date(this.parcel.purchasedDate) : null, - crownLandOwnerType: this.parcel.crownLandOwnerType, isConfirmedByApplicant: this.enableUserSignOff ? this.parcel.isConfirmedByApplicant : false, }); diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.html index 0bfe036423..883a6139b6 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.html @@ -186,13 +186,20 @@ <div class="section" *ngIf="enableCertificateOfTitleUpload"> <mat-label for="certificate-of-title-upload">Upload Certificate of Title</mat-label> - <div class="subtext"> + <div class="subtext" *ngIf="!isCrownLand"> Visit <a class="subtext" href="https://ltsa.ca/property-owners/how-can-i/search-for-a-title/" target="_blank" >BC Land Title & Survey</a > to obtain a recent copy (not older than 1 year) of the Certificate of Title </div> + <div class="subtext" *ngIf="isCrownLand"> + Only required for surveyed Crown land with a PID. Visit + <a class="subtext" href="https://ltsa.ca/property-owners/how-can-i/search-for-a-title/" target="_blank" + >BC Land Title & Survey</a + > + to obtain a recent copy (not older than 1 year) of the Certificate of Title + </div> <app-file-drag-drop id="certificate-of-title-upload" [uploadedFiles]="parcel.certificateOfTitle ? [parcel.certificateOfTitle] : []" @@ -207,7 +214,8 @@ </div> <section *ngIf="enableOwners" class="container"> - <h6>Parcel Owners</h6> + <h6 *ngIf="!isCrownLand">Parcel Owners</h6> + <h6 *ngIf="isCrownLand">Government Parcel Contact</h6> <ng-container *ngIf="!isCrownLand"> <p>Add an owner for every organization or individual listed on the parcel's Certificate of Title</p> <div> @@ -277,85 +285,70 @@ <h6 class="owner-search-option">OR</h6> </div> </ng-container> <ng-container *ngIf="isCrownLand"> - <div> - <mat-label for="crown-owner-type">Select owner:</mat-label> - </div> - <mat-radio-group - formControlName="crownLandOwnerType" - class="crown-owner-type" - id="crown-owner-type" - aria-label="Select an Owner" - > - <mat-radio-button value="provincial">Provincial Crown</mat-radio-button> - <mat-radio-button value="federal">Federal Crown</mat-radio-button> - <div *ngIf="showErrors && !crownLandOwnerType.getRawValue()" class="field-error"> - <mat-icon>warning</mat-icon> - <div>This field is required</div> - </div> - </mat-radio-group> - <mat-form-field class="full-width-input" appearance="outline"> - <input - id="government-search" - type="text" - aria-label="Text" - matInput - placeholder="Search by Ministry or Department" - [matAutocomplete]="auto" - (input)="onTypeOwner($event)" - [formControl]="ownerInput" - /> - <mat-autocomplete #auto="matAutocomplete"> - <mat-option - (click)="onSelectOwner($event, option, option.isSelected)" - *ngFor="let option of filteredOwners" - [disabled]="option.isSelected" - > - <div class="owner-option"> - <div>{{ option.displayName }}</div> - <button mat-flat-button color="primary" [disabled]="option.isSelected"> - {{ option.isSelected ? 'Added' : 'Add' }} - </button> - </div> - </mat-option> - <mat-option - class="option" - *ngIf="filteredOwners.length === 0 && enableAddNewOwner" - (click)="onAddNewGovernmentContact()" - > - <div class="owner-option"> - <div>No owner matching search</div> - <button mat-flat-button color="primary">Add new government contact</button> - </div> - </mat-option> - </mat-autocomplete> - </mat-form-field> - <div *ngIf="ownerInput.errors && ownerInput.errors['required']" class="field-error"> - <mat-icon>warning</mat-icon> - <div *ngIf="ownerInput.errors?.['required']">This field is required</div> - </div> + <p>Add the contact information of an employee who works in the department or ministry for the Crown parcel</p> <button class="new-owner" *ngIf="enableAddNewOwner" (click)="onAddNewGovernmentContact()" - mat-stroked-button + mat-flat-button color="primary" [disabled]="_disabled || parcel.owners.length > 0" > - Add new government contact + Add new gov contact </button> + <h6 class="owner-search-option" *ngIf="filteredOwners.length">OR</h6> + <label for="owner-search" *ngIf="filteredOwners.length">Select from Existing Government</label> <div> - <app-parcel-owners - [fileId]="fileId" - [submissionUuid]="submissionUuid" - [parcelUuid]="parcel.uuid" - [owners]="parcel.owners" - (onOwnersUpdated)="onOwnersUpdated.emit()" - (onOwnerRemoved)="onOwnerRemoved($event)" - [disabled]="_disabled" - [isCrown]="true" - [ownerService]="noticeOfIntentOwnerService" - [documentService]="noticeOfIntentDocumentService" - ></app-parcel-owners> + <mat-radio-group + color="primary" + [value]="selectedOwner?.uuid" required + > + <mat-radio-button + *ngFor="let owner of filteredOwners" + [value]="owner.uuid" + class="radio-option" + (click)="onCrownOwnerSelected($event, owner, owner.isSelected)" + required + > + {{ owner.firstName + ' ' + owner.lastName }} + </mat-radio-button> + </mat-radio-group> + + <div class="warning-banner" *ngIf="selectedOwner"> + <div class="owner-details"> + <div class="row"> + <div class="key"><strong>First Name:</strong> </div> + <div class="value">{{ selectedOwner.firstName }}</div> + </div> + <div class="row"> + <div class="key"><strong>Last Name:</strong> </div> + <div class="value">{{ selectedOwner.lastName }}</div> + </div> + <div class="row"> + <div class="key"><strong>Ministry/ Department:</strong> </div> + <div class="value">{{ selectedOwner.organizationName }}</div> + </div> + <div class="row"> + <div class="key"><strong>Phone Number:</strong> </div> + <div class="value">{{ selectedOwner.phoneNumber }}</div> + </div> + <div class="row"> + <div class="key"><strong>Email:</strong> </div> + <div class="value">{{ selectedOwner.email }}</div> + </div> + <div class="row"> + <div class="key"><strong>Crown Type:</strong> </div> + <div class="value">{{ selectedOwner.crownLandOwnerType }}</div> + </div> + <div class="row"> + <button [disabled]="_disabled" (click)="onEdit(selectedOwner)" mat-stroked-button>Edit information</button> + </div> + </div> + </div> + <div *ngIf="ownerInput.errors && ownerInput.errors['required']" class="field-error"> + <mat-icon>warning</mat-icon> + <div *ngIf="ownerInput.errors?.['required']">This field is required</div> + </div> </div> </ng-container> </section> diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.scss b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.scss index 8082c43284..247764fecc 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.scss +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.scss @@ -97,4 +97,39 @@ mat-button-toggle-group#isFarm { align-items: center; height: 100%; } +} +.radio-option { + display: block !important; + + & .mdc-label { + cursor: pointer !important; + } +} + +.warning-banner { + margin-top: rem(8); + background-color: rgba(colors.$accent-color-light, 0.5); + padding: rem(16); + + .owner-details { + display: flex; + flex-direction: column; + } + + .row { + display: flex; + margin-bottom: rem(10); + } + + .key { + font-weight: bold; + margin-right: rem(5); + width: rem(300); + } + + .value { + flex-grow: 1; + overflow: hidden; + text-overflow: ellipsis; + } } \ No newline at end of file diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.ts index d85bc37bb0..ab1c73a0cb 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.ts @@ -98,6 +98,7 @@ export class ParcelEntryComponent implements OnInit { searchBy: this.searchBy, }); pidPinPlaceholder = ''; + selectedOwner?: NoticeOfIntentOwnerDto = undefined; ownerInput = new FormControl<string | null>(null); @@ -119,6 +120,11 @@ export class ParcelEntryComponent implements OnInit { this.$owners.subscribe((owners) => { this.owners = owners; this.filteredOwners = this.mapOwners(owners); + const selectedOwner = this.parcel.owners.length > 0 + ? this.filteredOwners.find((owner) => owner.uuid === this.parcel.owners[0].uuid) + : undefined; + + this.selectedOwner = selectedOwner; this.parcel.owners = this.parcel.owners.map((owner) => { const updatedOwner = owners.find((updatedOwner) => updatedOwner.uuid === owner.uuid)!; if (!updatedOwner) { @@ -299,7 +305,7 @@ export class ParcelEntryComponent implements OnInit { documentService: this.noticeOfIntentDocumentService, }, }); - dialog.beforeClosed().subscribe((createdDto) => { + dialog.afterClosed().subscribe((createdDto) => { if (createdDto) { this.onOwnersUpdated.emit(); const updatedArray = [...this.parcel.owners, createdDto]; @@ -317,11 +323,39 @@ export class ParcelEntryComponent implements OnInit { ownerService: this.noticeOfIntentOwnerService, }, }); - dialog.beforeClosed().subscribe((createdDto) => { + dialog.afterClosed().subscribe((createdDto) => { if (createdDto) { this.onOwnersUpdated.emit(); const updatedArray = [...this.parcel.owners, createdDto]; this.updateParcelOwners(updatedArray); + this.selectedOwner = createdDto; + } + }); + } + + async onCrownOwnerSelected(event: Event, owner: NoticeOfIntentOwnerDto, isSelected: boolean) { + this.selectedOwner = owner; + const selectedOwners = [owner]; + this.updateParcelOwners(selectedOwners); + } + + onEdit(owner: NoticeOfIntentOwnerDto) { + let dialog; + dialog = this.dialog.open(CrownOwnerDialogComponent, { + data: { + isDraft: this.isDraft, + parcelUuid: this.parcel.uuid, + existingOwner: owner, + submissionUuid: this.submissionUuid, + ownerService: this.noticeOfIntentOwnerService, + }, + }); + dialog.afterClosed().subscribe((result) => { + if (result) { + if(result.type === 'delete') { + this.onOwnerRemoved(result.uuid) + } + this.onOwnersUpdated.emit(); } }); } @@ -337,7 +371,7 @@ export class ParcelEntryComponent implements OnInit { this.updateParcelOwners(selectedOwners); } } else { - event.preventDefault() + this.onOwnerRemoved(owner.uuid); } } @@ -382,7 +416,6 @@ export class ParcelEntryComponent implements OnInit { parcelType: this.parcel.ownershipTypeCode, isFarm: formatBooleanToString(this.parcel.isFarm), purchaseDate: this.parcel.purchasedDate ? new Date(this.parcel.purchasedDate) : null, - crownLandOwnerType: this.parcel.crownLandOwnerType, isConfirmedByApplicant: this.enableUserSignOff ? this.parcel.isConfirmedByApplicant : false, }); diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/parcel/parcel.component.html b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/parcel/parcel.component.html index 3250a97f0f..46d0208429 100644 --- a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/parcel/parcel.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/parcel/parcel.component.html @@ -87,13 +87,6 @@ <h4>Parcel {{ parcelInd + 1 }}</h4> {{ parcel.civicAddress }} <app-no-data [showRequired]="showErrors" *ngIf="!parcel.civicAddress"></app-no-data> </div> - <ng-container *ngIf="parcel.validation?.isCrownSelectionMandatory"> - <div class="subheading2 grid-1">Crown Selection</div> - <div class="grid-double"> - <span class="crown-land" *ngIf="parcel.crownLandOwnerType !== null">{{ parcel.crownLandOwnerType }}</span> - <app-no-data [showRequired]="showErrors" *ngIf="parcel.crownLandOwnerType === null"></app-no-data> - </div> - </ng-container> <div class="subheading2 grid-1">Certificate Of Title</div> <div class="grid-double"> <div *ngIf="parcel.certificateOfTitle"> @@ -105,9 +98,45 @@ <h4>Parcel {{ parcelInd + 1 }}</h4> ></app-no-data> </div> + <ng-container *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN"> + <h4 *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">Government Parcel Contact</h4> + <div class="subheading2 grid-1">First Name</div> + <div class="grid-double"> + {{ parcel.owners[0].firstName }} + <app-no-data [showRequired]="showErrors" *ngIf="!parcel.owners[0].firstName"></app-no-data> + </div> + <div class="subheading2 grid-1" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">Last Name</div> + <div class="grid-double"> + {{ parcel.owners[0].lastName }} + <app-no-data [showRequired]="showErrors" *ngIf="!parcel.owners[0].lastName"></app-no-data> + </div> + <div class="subheading2 grid-1" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">Ministry or Department</div> + <div class="grid-double"> + {{ parcel.owners[0].organizationName }} + <app-no-data [showRequired]="showErrors" *ngIf="!parcel.owners[0].organizationName"></app-no-data> + </div> + <div class="subheading2 grid-1" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">Phone</div> + <div class="grid-double"> + {{ parcel.owners[0].phoneNumber }} + <app-no-data [showRequired]="showErrors" *ngIf="!parcel.owners[0].phoneNumber"></app-no-data> + </div> + <div class="subheading2 grid-1" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">Email</div> + <div class="grid-double"> + {{ parcel.owners[0].email }} + <app-no-data [showRequired]="showErrors" *ngIf="!parcel.owners[0].email"></app-no-data> + </div> + <div class="subheading2 grid-1" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">Crown Type</div> + <div class="grid-double"> + {{ parcel.owners[0].crownLandOwnerType === 'provincial' ? 'Provincial Crown' : ''}} + {{ parcel.owners[0].crownLandOwnerType === 'federal' ? 'Federal Crown' : ''}} + <app-no-data [showRequired]="showErrors" *ngIf="!parcel.owners[0].crownLandOwnerType"></app-no-data> + </div> + </ng-container> + <div class="full-width owner-information" [ngClass]="{ 'crown-owner-information': parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN }" + *ngIf="parcel.ownershipTypeCode !== PARCEL_OWNERSHIP_TYPES.CROWN" > <div class="subheading2" *ngIf="parcel.ownershipTypeCode !== PARCEL_OWNERSHIP_TYPES.CROWN">Land Owner(s)</div> <div class="subheading2" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">Crown Contact(s)</div> diff --git a/portal-frontend/src/app/services/application-owner/application-owner.dto.ts b/portal-frontend/src/app/services/application-owner/application-owner.dto.ts index c37d003247..e364244360 100644 --- a/portal-frontend/src/app/services/application-owner/application-owner.dto.ts +++ b/portal-frontend/src/app/services/application-owner/application-owner.dto.ts @@ -14,6 +14,7 @@ export interface ApplicationOwnerDto { email: string | null; type: OwnerTypeDto; corporateSummary?: ApplicationDocumentDto; + crownLandOwnerType?: string | null; } export interface ApplicationOwnerDetailedDto extends ApplicationOwnerDto { @@ -28,6 +29,7 @@ export interface ApplicationOwnerUpdateDto { email: string; typeCode: string; corporateSummaryUuid?: string | null; + crownLandOwnerType?: string | null; } export interface ApplicationOwnerCreateDto extends ApplicationOwnerUpdateDto { diff --git a/portal-frontend/src/app/services/notice-of-intent-owner/notice-of-intent-owner.dto.ts b/portal-frontend/src/app/services/notice-of-intent-owner/notice-of-intent-owner.dto.ts index 48cf7cee32..6f818ddbe6 100644 --- a/portal-frontend/src/app/services/notice-of-intent-owner/notice-of-intent-owner.dto.ts +++ b/portal-frontend/src/app/services/notice-of-intent-owner/notice-of-intent-owner.dto.ts @@ -25,6 +25,7 @@ export interface NoticeOfIntentOwnerDto { email: string | null; type: OwnerTypeDto; corporateSummary?: NoticeOfIntentDocumentDto; + crownLandOwnerType?: string | null; } export interface NoticeOfIntentOwnerDetailedDto extends NoticeOfIntentOwnerDto { @@ -39,6 +40,7 @@ export interface NoticeOfIntentOwnerUpdateDto { email: string; typeCode: string; corporateSummaryUuid?: string | null; + crownLandOwnerType?: string | null; } export interface NoticeOfIntentOwnerCreateDto extends NoticeOfIntentOwnerUpdateDto { diff --git a/portal-frontend/src/app/shared/owner-dialogs/crown-owner-dialog/crown-owner-dialog.component.html b/portal-frontend/src/app/shared/owner-dialogs/crown-owner-dialog/crown-owner-dialog.component.html index 52a1dd41f9..082cf292dc 100644 --- a/portal-frontend/src/app/shared/owner-dialogs/crown-owner-dialog/crown-owner-dialog.component.html +++ b/portal-frontend/src/app/shared/owner-dialogs/crown-owner-dialog/crown-owner-dialog.component.html @@ -4,6 +4,9 @@ <h2 *ngIf="isEdit">Edit Government Contact</h2> </div> <div mat-dialog-content> <form [formGroup]="form"> + <app-warning-banner *ngIf="isEdit" class="full-row error" class="changes-banner"> + The changes made to this crown will be reflected across the submission. + </app-warning-banner> <div class="form-row"> <div class="full-row"> <label for="ministryName">Ministry or Department Responsible</label> @@ -71,11 +74,22 @@ <h2 *ngIf="isEdit">Edit Government Contact</h2> <div *ngIf="email.errors?.['email']">Invalid format</div> </div> </div> + <div class="full-row"> + <mat-label for="type">Crown Type</mat-label> + <mat-button-toggle-group formControlName="crownLandOwnerType" (change)="onChangeType($event)" class="input" id="crownLandOwnerType"> + <mat-button-toggle value="provincial">Provincial Crown</mat-button-toggle> + <mat-button-toggle value="federal">Federal Crown</mat-button-toggle> + </mat-button-toggle-group> + </div> </div> </form> </div> + <div mat-dialog-actions class="actions"> - <button mat-stroked-button (click)="onClose()">Cancel</button> - <button mat-flat-button color="primary" [disabled]="form.invalid" *ngIf="!isEdit" (click)="onCreate()">Add</button> - <button mat-flat-button color="primary" [disabled]="form.invalid" *ngIf="isEdit" (click)="onSave()">Save</button> + <button *ngIf="isEdit" mat-stroked-button color="warn" style="margin-right: auto;" class="delete-btn" (click)="onDelete()">Delete Contact</button> + <div class="btn-group"> + <button mat-stroked-button (click)="onClose()" style="margin-left: auto;">Cancel</button> + <button mat-flat-button color="primary" *ngIf="!isEdit" (click)="onCreate()">Add</button> + <button mat-flat-button color="primary" *ngIf="isEdit" (click)="onSave()">Save</button> + </div> </div> diff --git a/portal-frontend/src/app/shared/owner-dialogs/crown-owner-dialog/crown-owner-dialog.component.scss b/portal-frontend/src/app/shared/owner-dialogs/crown-owner-dialog/crown-owner-dialog.component.scss index f9fa4857b8..d784180b73 100644 --- a/portal-frontend/src/app/shared/owner-dialogs/crown-owner-dialog/crown-owner-dialog.component.scss +++ b/portal-frontend/src/app/shared/owner-dialogs/crown-owner-dialog/crown-owner-dialog.component.scss @@ -2,6 +2,9 @@ @use '../../../../styles/colors'; .actions { + display: flex; + justify-content: space-between; + padding: 10px 24px 10px 24px; button:not(:last-child) { margin-right: rem(8) !important; } @@ -15,3 +18,12 @@ align-items: center; margin-top: rem(4); } + +.mat-button-toggle-checked.mat-button-toggle-appearance-standard { + background-color: colors.$primary-color-light; +} +:host::ng-deep { + .warning-banner { + padding: 0 !important; + } +} \ No newline at end of file diff --git a/portal-frontend/src/app/shared/owner-dialogs/crown-owner-dialog/crown-owner-dialog.component.ts b/portal-frontend/src/app/shared/owner-dialogs/crown-owner-dialog/crown-owner-dialog.component.ts index 4d4e80f488..988cb94a5f 100644 --- a/portal-frontend/src/app/shared/owner-dialogs/crown-owner-dialog/crown-owner-dialog.component.ts +++ b/portal-frontend/src/app/shared/owner-dialogs/crown-owner-dialog/crown-owner-dialog.component.ts @@ -1,4 +1,4 @@ -import { Component, Inject } from '@angular/core'; +import { Component, EventEmitter, Inject, Output } from '@angular/core'; import { FormControl, FormGroup, Validators } from '@angular/forms'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { @@ -14,6 +14,8 @@ import { } from '../../../services/notice-of-intent-owner/notice-of-intent-owner.dto'; import { NoticeOfIntentOwnerService } from '../../../services/notice-of-intent-owner/notice-of-intent-owner.service'; import { OWNER_TYPE } from '../../dto/owner.dto'; +import { MatButtonToggleChange } from '@angular/material/button-toggle'; +import { ConfirmationDialogService } from '../../confirmation-dialog/confirmation-dialog.service'; @Component({ selector: 'app-crown-owner-dialog', @@ -26,6 +28,8 @@ export class CrownOwnerDialogComponent { lastName = new FormControl<string | null>('', [Validators.required]); phoneNumber = new FormControl<string | null>('', [Validators.required]); email = new FormControl<string | null>('', [Validators.required, Validators.email]); + crownLandOwnerType = new FormControl<string | null>('', [Validators.required]); + @Output() crownlandOwnerChanged = new EventEmitter<string | null>(); isEdit = false; existingUuid: string | undefined; @@ -36,10 +40,12 @@ export class CrownOwnerDialogComponent { lastName: this.lastName, phoneNumber: this.phoneNumber, email: this.email, + crownLandOwnerType: this.crownLandOwnerType, }); constructor( private dialogRef: MatDialogRef<CrownOwnerDialogComponent>, + private confDialogService: ConfirmationDialogService, @Inject(MAT_DIALOG_DATA) public data: { submissionUuid: string; @@ -57,6 +63,7 @@ export class CrownOwnerDialogComponent { this.phoneNumber.setValue(data.existingOwner.phoneNumber); this.email.setValue(data.existingOwner.email); this.existingUuid = data.existingOwner.uuid; + this.crownLandOwnerType.setValue(data.existingOwner.crownLandOwnerType ?? ''); } } @@ -70,16 +77,34 @@ export class CrownOwnerDialogComponent { typeCode: OWNER_TYPE.CROWN, applicationSubmissionUuid: this.data.submissionUuid, noticeOfIntentSubmissionUuid: this.data.submissionUuid, + crownLandOwnerType: this.crownLandOwnerType.getRawValue(), }; const res = await this.data.ownerService.create(createDto); - this.dialogRef.close(res); + this.dialogRef.close({ ...res}); } async onClose() { this.dialogRef.close(); } + async onChangeType($event: MatButtonToggleChange) { + this.crownlandOwnerChanged.emit($event.value); + } + + async onDelete() { + this.confDialogService + .openDialog({ + body: `This action will remove ${this.firstName.value} ${this.lastName.value} and its usage from the entire application. Are you sure you want to remove this owner? `, + }) + .subscribe(async (didConfirm) => { + if (didConfirm) { + const res = await this.data.ownerService.delete(this.existingUuid ?? ''); + this.dialogRef.close({...res, type:'delete' }); + } + }); + } + async onSave() { const updateDto: ApplicationOwnerUpdateDto & NoticeOfIntentOwnerUpdateDto = { organizationName: this.ministryName.getRawValue(), @@ -88,10 +113,11 @@ export class CrownOwnerDialogComponent { email: this.email.getRawValue()!, phoneNumber: this.phoneNumber.getRawValue()!, typeCode: OWNER_TYPE.CROWN, + crownLandOwnerType: this.crownLandOwnerType.getRawValue(), }; if (this.existingUuid) { const res = await this.data.ownerService.update(this.existingUuid, updateDto); - this.dialogRef.close(res); + this.dialogRef.close({...res, type:'update'}); } } } diff --git a/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.controller.ts b/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.controller.ts index 4028c29fc6..2fdb2b3ad4 100644 --- a/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.controller.ts +++ b/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.controller.ts @@ -168,6 +168,7 @@ export class ApplicationOwnerController { phoneNumber: data.phoneNumber, organizationName: data.organization, applicationSubmissionUuid: data.applicationSubmissionUuid, + crownLandOwnerType: data.crownLandOwnerType, }, applicationSubmission, ); @@ -192,6 +193,7 @@ export class ApplicationOwnerController { firstName: data.firstName, phoneNumber: data.phoneNumber, organizationName: data.organization, + crownLandOwnerType: data.crownLandOwnerType, }); } else { //Delete Non parcel owners if we aren't using one diff --git a/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.dto.ts b/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.dto.ts index 7336adeb3a..a10b348178 100644 --- a/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.dto.ts +++ b/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.dto.ts @@ -47,6 +47,9 @@ export class ApplicationOwnerDto { @AutoMap(() => ApplicationDocumentDto) corporateSummary?: ApplicationDocumentDto; + + @AutoMap(() => String) + crownLandOwnerType?: string | null; } export class ApplicationOwnerDetailedDto extends ApplicationOwnerDto { @@ -74,6 +77,10 @@ export class ApplicationOwnerUpdateDto { @IsOptional() email?: string; + @IsString() + @IsOptional() + crownLandOwnerType?: string; + @IsString() @IsOptional() typeCode?: string; @@ -119,6 +126,10 @@ export class SetPrimaryContactDto { @IsString() applicationSubmissionUuid: string; + + @IsString() + @IsOptional() + crownLandOwnerType?: string; } export class AttachCorporateSummaryDto { diff --git a/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.entity.ts b/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.entity.ts index 6eb625c510..3b1810ccb1 100644 --- a/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.entity.ts +++ b/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.entity.ts @@ -83,4 +83,11 @@ export class ApplicationOwner extends Base { @ManyToMany(() => ApplicationParcel, (appParcel) => appParcel.owners) parcels: ApplicationParcel[]; + + @Column({ + type: 'varchar', + nullable: true, + default: null + }) + crownLandOwnerType?: string | null; } diff --git a/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.service.ts b/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.service.ts index 677a51fca5..0029821998 100644 --- a/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.service.ts +++ b/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.service.ts @@ -66,6 +66,7 @@ export class ApplicationOwnerService { phoneNumber: createDto.phoneNumber, corporateSummaryUuid: createDto.corporateSummaryUuid, applicationSubmission: applicationSubmission, + crownLandOwnerType: createDto.crownLandOwnerType, type, }); @@ -176,6 +177,9 @@ export class ApplicationOwnerService { existingOwner.email = updateDto.email !== undefined ? updateDto.email : existingOwner.email; + existingOwner.crownLandOwnerType = + updateDto.crownLandOwnerType !== undefined ? updateDto.crownLandOwnerType : existingOwner.crownLandOwnerType; + const result = await this.repository.save(existingOwner); //Save owner before updating diff --git a/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.ts b/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.ts index e18032c81a..c81f9808ed 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.ts @@ -191,7 +191,6 @@ export class ApplicationSubmissionValidatorService { for (const parcel of parcels) { if ( - parcel.ownershipTypeCode === null || parcel.legalDescription === null || parcel.mapAreaHectares === null || parcel.civicAddress === null || @@ -227,14 +226,6 @@ export class ApplicationSubmissionValidatorService { ); } - if (parcel.ownershipTypeCode === 'CRWN' && !parcel.crownLandOwnerType) { - errors.push( - new ServiceValidationException( - `Crown Parcel ${parcel.uuid} has no ownership type`, - ), - ); - } - if (parcel.owners.length === 0) { errors.push( new ServiceValidationException(`Parcel has no Owners ${parcel.uuid}`), diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts b/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts index d019f133c6..efea59cc51 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts @@ -199,6 +199,14 @@ export class ApplicationSubmission extends Base { }) typeCode: string; + @AutoMap() + @Column({ + type: 'varchar', + nullable: true, + default: null + }) + crownLandOwnerType?: string | null; + @AutoMap(() => [ApplicationOwner]) @OneToMany(() => ApplicationOwner, (owner) => owner.applicationSubmission) owners: ApplicationOwner[]; diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.controller.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.controller.ts index 3a1ba449e3..4355536003 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.controller.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.controller.ts @@ -188,6 +188,7 @@ export class NoticeOfIntentOwnerController { phoneNumber: data.phoneNumber, organizationName: data.organization, noticeOfIntentSubmissionUuid: data.noticeOfIntentSubmissionUuid, + crownLandOwnerType: data.crownLandOwnerType, }, applicationSubmission, req.user.entity, @@ -216,6 +217,7 @@ export class NoticeOfIntentOwnerController { firstName: data.firstName, phoneNumber: data.phoneNumber, organizationName: data.organization, + crownLandOwnerType: data.crownLandOwnerType, }, user, ); diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.dto.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.dto.ts index a6a94cbc5c..5d67fa462d 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.dto.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.dto.ts @@ -46,6 +46,9 @@ export class NoticeOfIntentOwnerDto { @AutoMap(() => NoticeOfIntentDocumentDto) corporateSummary?: NoticeOfIntentDocumentDto; + + @AutoMap(() => String) + crownLandOwnerType?: string | null; } export class NoticeOfIntentOwnerDetailedDto extends NoticeOfIntentOwnerDto { @@ -72,6 +75,10 @@ export class NoticeOfIntentOwnerUpdateDto { @Matches(emailRegex) @IsOptional() email?: string; + + @IsString() + @IsOptional() + crownLandOwnerType?: string; @IsString() @IsOptional() @@ -118,6 +125,10 @@ export class SetPrimaryContactDto { @IsString() noticeOfIntentSubmissionUuid: string; + + @IsString() + @IsOptional() + crownLandOwnerType?: string; } export class AttachCorporateSummaryDto { diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.entity.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.entity.ts index e153bee759..328a53abec 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.entity.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.entity.ts @@ -92,4 +92,11 @@ export class NoticeOfIntentOwner extends Base { @ManyToMany(() => NoticeOfIntentParcel, (appParcel) => appParcel.owners) parcels: NoticeOfIntentParcel[]; + + @Column({ + type: 'varchar', + nullable: true, + default: null + }) + crownLandOwnerType?: string | null; } diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.service.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.service.ts index 0306276aff..72fcc9811a 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.service.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.service.ts @@ -68,6 +68,7 @@ export class NoticeOfIntentOwnerService { phoneNumber: createDto.phoneNumber, corporateSummaryUuid: createDto.corporateSummaryUuid, noticeOfIntentSubmission, + crownLandOwnerType: createDto.crownLandOwnerType, type, }); @@ -192,6 +193,9 @@ export class NoticeOfIntentOwnerService { existingOwner.email = updateDto.email !== undefined ? updateDto.email : existingOwner.email; + existingOwner.crownLandOwnerType = + updateDto.crownLandOwnerType !== undefined ? updateDto.crownLandOwnerType : existingOwner.crownLandOwnerType; + const savedOwner = await this.repository.save(existingOwner); await this.updateSubmissionApplicant( diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission-validator.service.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission-validator.service.ts index 474f9d78fe..230c2154f6 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission-validator.service.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission-validator.service.ts @@ -130,7 +130,6 @@ export class NoticeOfIntentSubmissionValidatorService { for (const parcel of parcels) { if ( - parcel.ownershipTypeCode === null || parcel.legalDescription === null || parcel.mapAreaHectares === null || parcel.civicAddress === null || @@ -166,14 +165,6 @@ export class NoticeOfIntentSubmissionValidatorService { ); } - if (parcel.ownershipTypeCode === 'CRWN' && !parcel.crownLandOwnerType) { - errors.push( - new ServiceValidationException( - `Crown Parcel ${parcel.uuid} has no ownership type`, - ), - ); - } - if (parcel.owners.length === 0) { errors.push( new ServiceValidationException(`Parcel has no Owners ${parcel.uuid}`), diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.entity.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.entity.ts index e26d5939ce..e15f87ee7e 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.entity.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.entity.ts @@ -194,6 +194,14 @@ export class NoticeOfIntentSubmission extends Base { }) typeCode: string; + @AutoMap() + @Column({ + type: 'varchar', + nullable: true, + default: null + }) + crownLandOwnerType?: string | null; + //Soil & Fill @AutoMap(() => Boolean) @Column({ type: 'boolean', nullable: true }) diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1702486285892-add-crownlandtype-to-owner.ts b/services/apps/alcs/src/providers/typeorm/migrations/1702486285892-add-crownlandtype-to-owner.ts new file mode 100644 index 0000000000..9ff18f1f8e --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1702486285892-add-crownlandtype-to-owner.ts @@ -0,0 +1,37 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class AddCrownlandtypeToOwner1702486285892 + implements MigrationInterface +{ + name = 'AddCrownlandtypeToOwner1702486285892'; + + public async up(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `ALTER TABLE "alcs"."application_owner" ADD "crown_land_owner_type" character varying`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" ADD "crown_land_owner_type" character varying`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_owner" ADD "crown_land_owner_type" character varying`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" ADD "crown_land_owner_type" character varying`, + ); + } + + public async down(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_submission" DROP COLUMN "crown_land_owner_type"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_owner" DROP COLUMN "crown_land_owner_type"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" DROP COLUMN "crown_land_owner_type"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_owner" DROP COLUMN "crown_land_owner_type"`, + ); + } +} From d4816d113ae2da5ff77815a1ab1f16aeada21067 Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Thu, 14 Dec 2023 09:24:15 -0800 Subject: [PATCH 773/954] fixes --- .../crown-owner-dialog/crown-owner-dialog.component.html | 2 +- .../crown-owner-dialog/crown-owner-dialog.component.ts | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/portal-frontend/src/app/shared/owner-dialogs/crown-owner-dialog/crown-owner-dialog.component.html b/portal-frontend/src/app/shared/owner-dialogs/crown-owner-dialog/crown-owner-dialog.component.html index 082cf292dc..225e97d97f 100644 --- a/portal-frontend/src/app/shared/owner-dialogs/crown-owner-dialog/crown-owner-dialog.component.html +++ b/portal-frontend/src/app/shared/owner-dialogs/crown-owner-dialog/crown-owner-dialog.component.html @@ -76,7 +76,7 @@ <h2 *ngIf="isEdit">Edit Government Contact</h2> </div> <div class="full-row"> <mat-label for="type">Crown Type</mat-label> - <mat-button-toggle-group formControlName="crownLandOwnerType" (change)="onChangeType($event)" class="input" id="crownLandOwnerType"> + <mat-button-toggle-group formControlName="crownLandOwnerType" class="input" id="crownLandOwnerType"> <mat-button-toggle value="provincial">Provincial Crown</mat-button-toggle> <mat-button-toggle value="federal">Federal Crown</mat-button-toggle> </mat-button-toggle-group> diff --git a/portal-frontend/src/app/shared/owner-dialogs/crown-owner-dialog/crown-owner-dialog.component.ts b/portal-frontend/src/app/shared/owner-dialogs/crown-owner-dialog/crown-owner-dialog.component.ts index 988cb94a5f..d865a0450f 100644 --- a/portal-frontend/src/app/shared/owner-dialogs/crown-owner-dialog/crown-owner-dialog.component.ts +++ b/portal-frontend/src/app/shared/owner-dialogs/crown-owner-dialog/crown-owner-dialog.component.ts @@ -1,4 +1,4 @@ -import { Component, EventEmitter, Inject, Output } from '@angular/core'; +import { Component, Inject } from '@angular/core'; import { FormControl, FormGroup, Validators } from '@angular/forms'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { @@ -14,7 +14,6 @@ import { } from '../../../services/notice-of-intent-owner/notice-of-intent-owner.dto'; import { NoticeOfIntentOwnerService } from '../../../services/notice-of-intent-owner/notice-of-intent-owner.service'; import { OWNER_TYPE } from '../../dto/owner.dto'; -import { MatButtonToggleChange } from '@angular/material/button-toggle'; import { ConfirmationDialogService } from '../../confirmation-dialog/confirmation-dialog.service'; @Component({ @@ -29,7 +28,6 @@ export class CrownOwnerDialogComponent { phoneNumber = new FormControl<string | null>('', [Validators.required]); email = new FormControl<string | null>('', [Validators.required, Validators.email]); crownLandOwnerType = new FormControl<string | null>('', [Validators.required]); - @Output() crownlandOwnerChanged = new EventEmitter<string | null>(); isEdit = false; existingUuid: string | undefined; @@ -88,10 +86,6 @@ export class CrownOwnerDialogComponent { this.dialogRef.close(); } - async onChangeType($event: MatButtonToggleChange) { - this.crownlandOwnerChanged.emit($event.value); - } - async onDelete() { this.confDialogService .openDialog({ From 6ebf33c69fa189ca461fe18a9e4b3cabb6be9de9 Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Thu, 14 Dec 2023 09:27:42 -0800 Subject: [PATCH 774/954] fixes --- .../application-submission-validator.service.spec.ts | 6 ------ .../notice-of-intent-submission-validator.service.spec.ts | 6 ------ 2 files changed, 12 deletions(-) diff --git a/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.spec.ts b/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.spec.ts index 02c99cbdd1..ae6c15ccf0 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.spec.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.spec.ts @@ -198,12 +198,6 @@ describe('ApplicationSubmissionValidatorService', () => { const res = await service.validateSubmission(applicationSubmission); - expect( - includesError( - res.errors, - new Error(`Crown Parcel ${parcel.uuid} has no ownership type`), - ), - ).toBe(true); expect( includesError( res.errors, diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission-validator.service.spec.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission-validator.service.spec.ts index 2134822760..34031e68d7 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission-validator.service.spec.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission-validator.service.spec.ts @@ -196,12 +196,6 @@ describe('NoticeOfIntentSubmissionValidatorService', () => { const res = await service.validateSubmission(noticeOfIntentSubmission); - expect( - includesError( - res.errors, - new Error(`Crown Parcel ${parcel.uuid} has no ownership type`), - ), - ).toBe(true); expect( includesError( res.errors, From bc7328886d6ac14c0b3ba68e93ed0219f19af207 Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Thu, 14 Dec 2023 09:41:04 -0800 Subject: [PATCH 775/954] fixes --- .../crown-owner-dialog/crown-owner-dialog.component.spec.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/portal-frontend/src/app/shared/owner-dialogs/crown-owner-dialog/crown-owner-dialog.component.spec.ts b/portal-frontend/src/app/shared/owner-dialogs/crown-owner-dialog/crown-owner-dialog.component.spec.ts index c51f7e8bb3..622fc8c9be 100644 --- a/portal-frontend/src/app/shared/owner-dialogs/crown-owner-dialog/crown-owner-dialog.component.spec.ts +++ b/portal-frontend/src/app/shared/owner-dialogs/crown-owner-dialog/crown-owner-dialog.component.spec.ts @@ -1,6 +1,6 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; +import { MAT_DIALOG_DATA, MatDialogRef, MatDialog } from '@angular/material/dialog'; import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { ApplicationOwnerService } from '../../../services/application-owner/application-owner.service'; @@ -28,6 +28,10 @@ describe('ApplicationCrownOwnerDialogComponent', () => { provide: MAT_DIALOG_DATA, useValue: {}, }, + { + provide: MatDialog, + useValue: {}, + } ], declarations: [CrownOwnerDialogComponent], schemas: [NO_ERRORS_SCHEMA], From 274c19bfd9103d06e015ac77bc68d981ac3f56f4 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Thu, 14 Dec 2023 09:41:16 -0800 Subject: [PATCH 776/954] Add confirmation dialogs and success pages to government review --- .../review-submission.module.ts | 8 ++ .../review-submit-fng.component.spec.ts | 12 +++ .../review-submit-fng.component.ts | 41 ++++++++-- .../review-submit.component.spec.ts | 12 +++ .../review-submit/review-submit.component.ts | 42 ++++++++-- .../submit-confirmation-dialog.component.html | 58 +++++++++++++ .../submit-confirmation-dialog.component.scss | 22 +++++ ...bmit-confirmation-dialog.component.spec.ts | 39 +++++++++ .../submit-confirmation-dialog.component.ts | 17 ++++ .../success/success.component.html | 25 ++++++ .../success/success.component.scss | 24 ++++++ .../success/success.component.spec.ts | 79 ++++++++++++++++++ .../success/success.component.ts | 81 +++++++++++++++++++ 13 files changed, 449 insertions(+), 11 deletions(-) create mode 100644 portal-frontend/src/app/features/applications/review-submission/submit-confirmation-dialog/submit-confirmation-dialog.component.html create mode 100644 portal-frontend/src/app/features/applications/review-submission/submit-confirmation-dialog/submit-confirmation-dialog.component.scss create mode 100644 portal-frontend/src/app/features/applications/review-submission/submit-confirmation-dialog/submit-confirmation-dialog.component.spec.ts create mode 100644 portal-frontend/src/app/features/applications/review-submission/submit-confirmation-dialog/submit-confirmation-dialog.component.ts create mode 100644 portal-frontend/src/app/features/applications/review-submission/success/success.component.html create mode 100644 portal-frontend/src/app/features/applications/review-submission/success/success.component.scss create mode 100644 portal-frontend/src/app/features/applications/review-submission/success/success.component.spec.ts create mode 100644 portal-frontend/src/app/features/applications/review-submission/success/success.component.ts diff --git a/portal-frontend/src/app/features/applications/review-submission/review-submission.module.ts b/portal-frontend/src/app/features/applications/review-submission/review-submission.module.ts index 729ec1b3f8..7d4485fea4 100644 --- a/portal-frontend/src/app/features/applications/review-submission/review-submission.module.ts +++ b/portal-frontend/src/app/features/applications/review-submission/review-submission.module.ts @@ -12,9 +12,15 @@ import { ReviewOcpComponent } from './review-ocp/review-ocp.component'; import { ReviewResolutionComponent } from './review-resolution/review-resolution.component'; import { ReviewSubmitFngComponent } from './review-submit-fng/review-submit-fng.component'; import { ReviewSubmitComponent } from './review-submit/review-submit.component'; +import { SubmitConfirmationDialogComponent } from './submit-confirmation-dialog/submit-confirmation-dialog.component'; import { ReviewZoningComponent } from './review-zoning/review-zoning.component'; +import { SuccessComponent } from './success/success.component'; const routes: Routes = [ + { + path: 'success', + component: SuccessComponent, + }, { path: '', component: ReviewSubmissionComponent, @@ -38,6 +44,8 @@ const routes: Routes = [ ReviewSubmitComponent, ReviewSubmitFngComponent, ReturnApplicationDialogComponent, + SuccessComponent, + SubmitConfirmationDialogComponent, ], imports: [CommonModule, SharedModule, RouterModule.forChild(routes), NgxMaskDirective, NgxMaskPipe], }) diff --git a/portal-frontend/src/app/features/applications/review-submission/review-submit-fng/review-submit-fng.component.spec.ts b/portal-frontend/src/app/features/applications/review-submission/review-submit-fng/review-submit-fng.component.spec.ts index b860ebee32..b838618341 100644 --- a/portal-frontend/src/app/features/applications/review-submission/review-submit-fng/review-submit-fng.component.spec.ts +++ b/portal-frontend/src/app/features/applications/review-submission/review-submit-fng/review-submit-fng.component.spec.ts @@ -1,5 +1,6 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { MatDialog } from '@angular/material/dialog'; import { DeepMocked, createMock } from '@golevelup/ts-jest'; import { BehaviorSubject } from 'rxjs'; import { ApplicationDocumentDto } from '../../../../services/application-document/application-document.dto'; @@ -8,6 +9,7 @@ import { ApplicationSubmissionReviewDto } from '../../../../services/application import { ApplicationSubmissionReviewService } from '../../../../services/application-submission-review/application-submission-review.service'; import { ApplicationSubmissionDto } from '../../../../services/application-submission/application-submission.dto'; import { ApplicationSubmissionService } from '../../../../services/application-submission/application-submission.service'; +import { CodeService } from '../../../../services/code/code.service'; import { PdfGenerationService } from '../../../../services/pdf-generation/pdf-generation.service'; import { ReviewSubmitFngComponent } from './review-submit-fng.component'; @@ -21,6 +23,7 @@ describe('ReviewSubmitFngComponent', () => { let mockAppDocumentService: DeepMocked<ApplicationDocumentService>; let mockToastService: DeepMocked<ToastService>; let mockPdfGenerationService: DeepMocked<PdfGenerationService>; + let mockCodeService: DeepMocked<CodeService>; let applicationPipe = new BehaviorSubject<ApplicationSubmissionDto | undefined>(undefined); let applicationDocumentPipe = new BehaviorSubject<ApplicationDocumentDto[]>([]); @@ -34,6 +37,7 @@ describe('ReviewSubmitFngComponent', () => { mockToastService = createMock(); mockPdfGenerationService = createMock(); mockAppSubmissionService = createMock(); + mockCodeService = createMock(); await TestBed.configureTestingModule({ providers: [ @@ -57,6 +61,14 @@ describe('ReviewSubmitFngComponent', () => { provide: ToastService, useValue: mockToastService, }, + { + provide: CodeService, + useValue: mockCodeService, + }, + { + provide: MatDialog, + useValue: {}, + }, ], declarations: [ReviewSubmitFngComponent], schemas: [NO_ERRORS_SCHEMA], diff --git a/portal-frontend/src/app/features/applications/review-submission/review-submit-fng/review-submit-fng.component.ts b/portal-frontend/src/app/features/applications/review-submission/review-submit-fng/review-submit-fng.component.ts index b2d992c0cf..6af4257ee4 100644 --- a/portal-frontend/src/app/features/applications/review-submission/review-submit-fng/review-submit-fng.component.ts +++ b/portal-frontend/src/app/features/applications/review-submission/review-submit-fng/review-submit-fng.component.ts @@ -1,4 +1,5 @@ import { Component, EventEmitter, HostListener, Input, OnDestroy, OnInit, Output, ViewChild } from '@angular/core'; +import { MatDialog } from '@angular/material/dialog'; import { MatExpansionPanel } from '@angular/material/expansion'; import { Router } from '@angular/router'; import { BehaviorSubject, Subject, takeUntil } from 'rxjs'; @@ -7,12 +8,14 @@ import { ApplicationDocumentService } from '../../../../services/application-doc import { ApplicationSubmissionReviewDto } from '../../../../services/application-submission-review/application-submission-review.dto'; import { ApplicationSubmissionReviewService } from '../../../../services/application-submission-review/application-submission-review.service'; import { ApplicationSubmissionDto } from '../../../../services/application-submission/application-submission.dto'; +import { CodeService } from '../../../../services/code/code.service'; import { PdfGenerationService } from '../../../../services/pdf-generation/pdf-generation.service'; import { CustomStepperComponent } from '../../../../shared/custom-stepper/custom-stepper.component'; import { DOCUMENT_TYPE } from '../../../../shared/dto/document.dto'; import { MOBILE_BREAKPOINT } from '../../../../shared/utils/breakpoints'; import { ReviewApplicationFngSteps } from '../review-submission.component'; import { ToastService } from '../../../../services/toast/toast.service'; +import { SubmitConfirmationDialogComponent } from '../submit-confirmation-dialog/submit-confirmation-dialog.component'; @Component({ selector: 'app-review-submit-fng[stepper]', @@ -38,13 +41,16 @@ export class ReviewSubmitFngComponent implements OnInit, OnDestroy { resolutionDocument: ApplicationDocumentDto[] = []; otherAttachments: ApplicationDocumentDto[] = []; private fileId: string | undefined; + private localGovernmentUuid = ''; constructor( private router: Router, private applicationReviewService: ApplicationSubmissionReviewService, private applicationDocumentService: ApplicationDocumentService, private toastService: ToastService, - private pdfGenerationService: PdfGenerationService + private pdfGenerationService: PdfGenerationService, + private codeService: CodeService, + private dialog: MatDialog ) {} @HostListener('window:resize', ['$event']) @@ -71,6 +77,7 @@ export class ReviewSubmitFngComponent implements OnInit, OnDestroy { this.$application.pipe(takeUntil(this.$destroy)).subscribe((application) => { if (application) { this.fileId = application.fileNumber; + this.localGovernmentUuid = application.localGovernmentUuid; } }); } @@ -89,8 +96,23 @@ export class ReviewSubmitFngComponent implements OnInit, OnDestroy { async onSubmit() { const isValid = this.runValidation(); if (isValid && this.fileId) { - await this.applicationReviewService.complete(this.fileId); - await this.router.navigateByUrl(`/application/${this.fileId}`); + const government = await this.loadGovernment(this.localGovernmentUuid); + const governmentName = government?.name ?? 'selected local / first nation government'; + + this.dialog + .open(SubmitConfirmationDialogComponent, { + data: { + governmentName, + isAuthorizing: this._applicationReview?.isAuthorized ?? true, + }, + }) + .beforeClosed() + .subscribe(async (didConfirm) => { + if (didConfirm) { + await this.applicationReviewService.complete(this.fileId!); + await this.router.navigateByUrl(`/application/${this.fileId}/review/success`); + } + }); } } @@ -130,11 +152,11 @@ export class ReviewSubmitFngComponent implements OnInit, OnDestroy { behavior: 'smooth', block: 'center', }); + + this.toastService.showErrorToast('Please correct all errors before submitting the form'); } }, 5); - this.toastService.showErrorToast('Please correct all errors before submitting the form'); - return contactInfoValid && resolutionValid && attachmentsValid; } @@ -174,4 +196,13 @@ export class ReviewSubmitFngComponent implements OnInit, OnDestroy { await this.pdfGenerationService.generateReview(this.fileId); } } + + private async loadGovernment(uuid: string) { + const codes = await this.codeService.loadCodes(); + const localGovernment = codes.localGovernments.find((a) => a.uuid === uuid); + if (localGovernment) { + return localGovernment; + } + return; + } } diff --git a/portal-frontend/src/app/features/applications/review-submission/review-submit/review-submit.component.spec.ts b/portal-frontend/src/app/features/applications/review-submission/review-submit/review-submit.component.spec.ts index 6baabb88a1..c401441422 100644 --- a/portal-frontend/src/app/features/applications/review-submission/review-submit/review-submit.component.spec.ts +++ b/portal-frontend/src/app/features/applications/review-submission/review-submit/review-submit.component.spec.ts @@ -1,5 +1,6 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { MatDialog } from '@angular/material/dialog'; import { DeepMocked, createMock } from '@golevelup/ts-jest'; import { BehaviorSubject } from 'rxjs'; import { ApplicationDocumentDto } from '../../../../services/application-document/application-document.dto'; @@ -7,6 +8,7 @@ import { ApplicationDocumentService } from '../../../../services/application-doc import { ApplicationSubmissionReviewDto } from '../../../../services/application-submission-review/application-submission-review.dto'; import { ApplicationSubmissionReviewService } from '../../../../services/application-submission-review/application-submission-review.service'; import { ApplicationSubmissionDto } from '../../../../services/application-submission/application-submission.dto'; +import { CodeService } from '../../../../services/code/code.service'; import { PdfGenerationService } from '../../../../services/pdf-generation/pdf-generation.service'; import { ReviewSubmitComponent } from './review-submit.component'; @@ -19,6 +21,7 @@ describe('ReviewSubmitComponent', () => { let mockAppDocumentService: DeepMocked<ApplicationDocumentService>; let mockToastService: DeepMocked<ToastService>; let mockPdfGenerationService: DeepMocked<PdfGenerationService>; + let codeService: DeepMocked<CodeService>; let applicationPipe = new BehaviorSubject<ApplicationSubmissionDto | undefined>(undefined); let applicationDocumentPipe = new BehaviorSubject<ApplicationDocumentDto[]>([]); @@ -32,6 +35,7 @@ describe('ReviewSubmitComponent', () => { mockAppDocumentService = createMock(); mockToastService = createMock(); mockPdfGenerationService = createMock(); + codeService = createMock(); await TestBed.configureTestingModule({ providers: [ @@ -44,6 +48,10 @@ describe('ReviewSubmitComponent', () => { provide: ApplicationDocumentService, useValue: mockAppDocumentService, }, + { + provide: CodeService, + useValue: codeService, + }, { provide: ToastService, useValue: mockToastService, @@ -52,6 +60,10 @@ describe('ReviewSubmitComponent', () => { provide: PdfGenerationService, useValue: mockPdfGenerationService, }, + { + provide: MatDialog, + useValue: {}, + }, ], declarations: [ReviewSubmitComponent], schemas: [NO_ERRORS_SCHEMA], diff --git a/portal-frontend/src/app/features/applications/review-submission/review-submit/review-submit.component.ts b/portal-frontend/src/app/features/applications/review-submission/review-submit/review-submit.component.ts index b6a47e87fb..f114bc3dc1 100644 --- a/portal-frontend/src/app/features/applications/review-submission/review-submit/review-submit.component.ts +++ b/portal-frontend/src/app/features/applications/review-submission/review-submit/review-submit.component.ts @@ -1,4 +1,5 @@ import { Component, EventEmitter, HostListener, Input, OnDestroy, OnInit, Output, ViewChild } from '@angular/core'; +import { MatDialog } from '@angular/material/dialog'; import { MatExpansionPanel } from '@angular/material/expansion'; import { Router } from '@angular/router'; import { BehaviorSubject, Subject, takeUntil } from 'rxjs'; @@ -7,12 +8,14 @@ import { ApplicationDocumentService } from '../../../../services/application-doc import { ApplicationSubmissionReviewDto } from '../../../../services/application-submission-review/application-submission-review.dto'; import { ApplicationSubmissionReviewService } from '../../../../services/application-submission-review/application-submission-review.service'; import { ApplicationSubmissionDto } from '../../../../services/application-submission/application-submission.dto'; +import { CodeService } from '../../../../services/code/code.service'; import { PdfGenerationService } from '../../../../services/pdf-generation/pdf-generation.service'; import { CustomStepperComponent } from '../../../../shared/custom-stepper/custom-stepper.component'; import { DOCUMENT_TYPE } from '../../../../shared/dto/document.dto'; import { MOBILE_BREAKPOINT } from '../../../../shared/utils/breakpoints'; import { ReviewApplicationSteps } from '../review-submission.component'; import { ToastService } from '../../../../services/toast/toast.service'; +import { SubmitConfirmationDialogComponent } from '../submit-confirmation-dialog/submit-confirmation-dialog.component'; @Component({ selector: 'app-review-submit[stepper]', @@ -42,13 +45,16 @@ export class ReviewSubmitComponent implements OnInit, OnDestroy { staffReport: ApplicationDocumentDto[] = []; otherAttachments: ApplicationDocumentDto[] = []; private fileId: string | undefined; + private localGovernmentUuid = ''; constructor( private router: Router, private applicationReviewService: ApplicationSubmissionReviewService, private applicationDocumentService: ApplicationDocumentService, private toastService: ToastService, - private pdfGenerationService: PdfGenerationService + private pdfGenerationService: PdfGenerationService, + private codeService: CodeService, + private dialog: MatDialog ) {} @HostListener('window:resize', ['$event']) @@ -84,6 +90,7 @@ export class ReviewSubmitComponent implements OnInit, OnDestroy { this.$application.pipe(takeUntil(this.$destroy)).subscribe((application) => { if (application) { this.fileId = application.fileNumber; + this.localGovernmentUuid = application.localGovernmentUuid; } }); } @@ -102,8 +109,23 @@ export class ReviewSubmitComponent implements OnInit, OnDestroy { async onSubmit() { const isValid = this.runValidation(); if (isValid && this.fileId) { - await this.applicationReviewService.complete(this.fileId); - await this.router.navigateByUrl(`/application/${this.fileId}`); + const government = await this.loadGovernment(this.localGovernmentUuid); + const governmentName = government?.name ?? 'selected local / first nation government'; + + this.dialog + .open(SubmitConfirmationDialogComponent, { + data: { + governmentName, + isAuthorizing: this._applicationReview?.isAuthorized ?? true, + }, + }) + .beforeClosed() + .subscribe(async (didConfirm) => { + if (didConfirm) { + await this.applicationReviewService.complete(this.fileId!); + await this.router.navigateByUrl(`/application/${this.fileId}/review/success`); + } + }); } } @@ -158,10 +180,9 @@ export class ReviewSubmitComponent implements OnInit, OnDestroy { behavior: 'smooth', block: 'center', }); - } - - this.toastService.showErrorToast('Please correct all errors before submitting the form'); + this.toastService.showErrorToast('Please correct all errors before submitting the form'); + } return contactInfoValid && ocpValid && zoningValid && authorizationValid && attachmentsValid; } return false; @@ -227,4 +248,13 @@ export class ReviewSubmitComponent implements OnInit, OnDestroy { await this.pdfGenerationService.generateReview(this.fileId); } } + + private async loadGovernment(uuid: string) { + const codes = await this.codeService.loadCodes(); + const localGovernment = codes.localGovernments.find((a) => a.uuid === uuid); + if (localGovernment) { + return localGovernment; + } + return; + } } diff --git a/portal-frontend/src/app/features/applications/review-submission/submit-confirmation-dialog/submit-confirmation-dialog.component.html b/portal-frontend/src/app/features/applications/review-submission/submit-confirmation-dialog/submit-confirmation-dialog.component.html new file mode 100644 index 0000000000..670eb843e4 --- /dev/null +++ b/portal-frontend/src/app/features/applications/review-submission/submit-confirmation-dialog/submit-confirmation-dialog.component.html @@ -0,0 +1,58 @@ +<div mat-dialog-title> + <h4>Submit Local/First Nation Government Review</h4> +</div> + +<div mat-dialog-content class="content"> + <ng-container *ngIf="data.isAuthorizing"> + <div> + <div class="subheading2">Terms and Conditions:</div> + <mat-checkbox #checkbox1 color="primary" class="checkbox"> + I/we understand that {{ data.governmentName }} is forwarding this application to the ALC. + </mat-checkbox> + <mat-checkbox #checkbox2 color="primary" class="checkbox"> + I/we understand that the submission will be visible to the public after ALC confirms receipt. + </mat-checkbox> + </div> + <p> + {{ data.governmentName }} will be cc'd on the email notifying the applicant that the application has been + forwarded to the ALC.<br /><br /> + Any updates should be emailed to the ALC. Visit the + <a target="_blank" href="https://www.alc.gov.bc.ca/contact/">Contact Us</a> page on the ALC Website for more + information. + </p> + <div> + <div class="step-controls"> + <button mat-stroked-button color="primary" [mat-dialog-close]="false">cancel</button> + <button + mat-flat-button + color="primary" + [disabled]="!checkbox1.checked || !checkbox2.checked" + [mat-dialog-close]="true" + > + submit + </button> + </div> + </div> + </ng-container> + <ng-container *ngIf="!data.isAuthorizing"> + <div> + <div class="subheading2">Terms and Conditions:</div> + <mat-checkbox #checkbox1 color="primary" class="checkbox"> + I/we understand that {{ data.governmentName }} is refusing this application. It will not be forwarded to the + ALC. + </mat-checkbox> + </div> + <p> + {{ data.governmentName }} will be cc'd on the email notifying the applicant that the application has not been + forwarded to the ALC. + </p> + <div> + <div class="step-controls"> + <button mat-stroked-button color="primary" [mat-dialog-close]="false">cancel</button> + <button mat-flat-button color="primary" [disabled]="!checkbox1.checked" [mat-dialog-close]="true"> + submit + </button> + </div> + </div> + </ng-container> +</div> diff --git a/portal-frontend/src/app/features/applications/review-submission/submit-confirmation-dialog/submit-confirmation-dialog.component.scss b/portal-frontend/src/app/features/applications/review-submission/submit-confirmation-dialog/submit-confirmation-dialog.component.scss new file mode 100644 index 0000000000..6e3db34e0e --- /dev/null +++ b/portal-frontend/src/app/features/applications/review-submission/submit-confirmation-dialog/submit-confirmation-dialog.component.scss @@ -0,0 +1,22 @@ +@use '../../../../../styles/functions' as *; + +.checkbox { + margin: rem(10) 0; +} + +h4 { + margin-bottom: rem(16) !important; +} + +p { + margin: rem(28) 0 !important; +} + +.step-controls { + display: flex; + justify-content: flex-end; + + button:not(:last-child) { + margin-right: rem(16) !important; + } +} diff --git a/portal-frontend/src/app/features/applications/review-submission/submit-confirmation-dialog/submit-confirmation-dialog.component.spec.ts b/portal-frontend/src/app/features/applications/review-submission/submit-confirmation-dialog/submit-confirmation-dialog.component.spec.ts new file mode 100644 index 0000000000..7d6d06ed68 --- /dev/null +++ b/portal-frontend/src/app/features/applications/review-submission/submit-confirmation-dialog/submit-confirmation-dialog.component.spec.ts @@ -0,0 +1,39 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { MAT_DIALOG_DATA, MatDialog, MatDialogRef } from '@angular/material/dialog'; +import { SubmitConfirmationDialogComponent } from './submit-confirmation-dialog.component'; + +describe('SubmitConfirmationDialogComponent', () => { + let component: SubmitConfirmationDialogComponent; + let fixture: ComponentFixture<SubmitConfirmationDialogComponent>; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [SubmitConfirmationDialogComponent], + providers: [ + { + provide: MatDialog, + useValue: {}, + }, + { + provide: MatDialogRef, + useValue: {}, + }, + { + provide: MAT_DIALOG_DATA, + useValue: {}, + }, + ], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(SubmitConfirmationDialogComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/applications/review-submission/submit-confirmation-dialog/submit-confirmation-dialog.component.ts b/portal-frontend/src/app/features/applications/review-submission/submit-confirmation-dialog/submit-confirmation-dialog.component.ts new file mode 100644 index 0000000000..a4b2577891 --- /dev/null +++ b/portal-frontend/src/app/features/applications/review-submission/submit-confirmation-dialog/submit-confirmation-dialog.component.ts @@ -0,0 +1,17 @@ +import { Component, Inject } from '@angular/core'; +import { MAT_DIALOG_DATA } from '@angular/material/dialog'; + +@Component({ + selector: 'app-submit-confirmation-dialog', + templateUrl: './submit-confirmation-dialog.component.html', + styleUrls: ['./submit-confirmation-dialog.component.scss'], +}) +export class SubmitConfirmationDialogComponent { + constructor( + @Inject(MAT_DIALOG_DATA) + protected data: { + governmentName: string; + isAuthorizing: boolean; + } + ) {} +} diff --git a/portal-frontend/src/app/features/applications/review-submission/success/success.component.html b/portal-frontend/src/app/features/applications/review-submission/success/success.component.html new file mode 100644 index 0000000000..d2e4238e7a --- /dev/null +++ b/portal-frontend/src/app/features/applications/review-submission/success/success.component.html @@ -0,0 +1,25 @@ +<ng-container *ngIf="didAuthorize"> + <h2 class="heading">Application ID: {{ fileId }} Forwarded!</h2> + <p> + <span class="subheading1" + ><strong + >The application and the local/First Nation government review have been submitted to the ALC</strong + ></span + ><br /><br /><br /> + {{ localGovernmentName }} will be cc'd on the email notifying the applicant that the application has been forwarded + to the ALC.<br /><br />ALC Staff may contact you with application related inquiries prior to the Commission review. + </p> +</ng-container> +<ng-container *ngIf="!didAuthorize"> + <h2 class="heading">Application ID: {{ fileId }} has been refused by the {{ localGovernmentName }}.</h2> + <p> + <span class="subheading1"><strong>Your review and decision has been submitted to the ALC.</strong></span + ><br /><br /><br /> + {{ localGovernmentName }} will be cc'd on the email notifying the applicant that the application has not been + forwarded to the ALC. + </p> +</ng-container> + +<div class="buttons"> + <button routerLink="/home" mat-stroked-button color="primary">Return to inbox</button> +</div> diff --git a/portal-frontend/src/app/features/applications/review-submission/success/success.component.scss b/portal-frontend/src/app/features/applications/review-submission/success/success.component.scss new file mode 100644 index 0000000000..3b5a90b084 --- /dev/null +++ b/portal-frontend/src/app/features/applications/review-submission/success/success.component.scss @@ -0,0 +1,24 @@ +@use '../../../../../styles/functions' as *; +@use '../../../../../styles/colors'; + +.heading { + color: colors.$primary-color; + margin-bottom: rem(12) !important; +} + +.buttons { + display: grid; + grid-template-columns: 1fr; + grid-column-gap: rem(24); + margin-top: rem(48); + + button { + margin-bottom: rem(20) !important; + } + + @media screen and (min-width: $tabletBreakpoint) { + display: flex; + flex-direction: row-reverse; + justify-content: left; + } +} diff --git a/portal-frontend/src/app/features/applications/review-submission/success/success.component.spec.ts b/portal-frontend/src/app/features/applications/review-submission/success/success.component.spec.ts new file mode 100644 index 0000000000..da90252ad6 --- /dev/null +++ b/portal-frontend/src/app/features/applications/review-submission/success/success.component.spec.ts @@ -0,0 +1,79 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { ActivatedRoute, ParamMap } from '@angular/router'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { BehaviorSubject, Observable } from 'rxjs'; +import { ApplicationSubmissionReviewDto } from '../../../../services/application-submission-review/application-submission-review.dto'; +import { ApplicationSubmissionReviewService } from '../../../../services/application-submission-review/application-submission-review.service'; +import { ApplicationSubmissionService } from '../../../../services/application-submission/application-submission.service'; +import { CodeService } from '../../../../services/code/code.service'; +import { OverlaySpinnerService } from '../../../../shared/overlay-spinner/overlay-spinner.service'; + +import { SuccessComponent } from './success.component'; + +describe('SuccessComponent', () => { + let component: SuccessComponent; + let fixture: ComponentFixture<SuccessComponent>; + let applicationSubmissionService: DeepMocked<ApplicationSubmissionService>; + let appSubmissionReviewService: DeepMocked<ApplicationSubmissionReviewService>; + let activatedRoute: DeepMocked<ActivatedRoute>; + let overlayService: DeepMocked<OverlaySpinnerService>; + let codeService: DeepMocked<CodeService>; + + beforeEach(() => { + applicationSubmissionService = createMock(); + activatedRoute = createMock(); + overlayService = createMock(); + codeService = createMock(); + appSubmissionReviewService = createMock(); + + appSubmissionReviewService.$applicationReview = new BehaviorSubject<ApplicationSubmissionReviewDto | undefined>( + undefined + ); + + Object.assign(activatedRoute, { paramMap: new Observable<ParamMap>() }); + + codeService.loadCodes.mockResolvedValue({ + applicationTypes: [], + decisionMakers: [], + documentTypes: [], + localGovernments: [], + naruSubtypes: [], + noticeOfIntentTypes: [], + regions: [], + submissionTypes: [], + }); + + TestBed.configureTestingModule({ + declarations: [SuccessComponent], + providers: [ + { + provide: ApplicationSubmissionService, + useValue: applicationSubmissionService, + }, + { + provide: ApplicationSubmissionReviewService, + useValue: appSubmissionReviewService, + }, + { + provide: ActivatedRoute, + useValue: activatedRoute, + }, + { + provide: OverlaySpinnerService, + useValue: overlayService, + }, + { + provide: CodeService, + useValue: codeService, + }, + ], + }); + fixture = TestBed.createComponent(SuccessComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/applications/review-submission/success/success.component.ts b/portal-frontend/src/app/features/applications/review-submission/success/success.component.ts new file mode 100644 index 0000000000..7f4e3bd962 --- /dev/null +++ b/portal-frontend/src/app/features/applications/review-submission/success/success.component.ts @@ -0,0 +1,81 @@ +import { Component, OnDestroy, OnInit } from '@angular/core'; +import { ActivatedRoute } from '@angular/router'; +import { Subject, takeUntil } from 'rxjs'; +import { ApplicationSubmissionReviewService } from '../../../../services/application-submission-review/application-submission-review.service'; +import { ApplicationSubmissionService } from '../../../../services/application-submission/application-submission.service'; +import { ApplicationTypeDto, LocalGovernmentDto } from '../../../../services/code/code.dto'; +import { CodeService } from '../../../../services/code/code.service'; +import { OverlaySpinnerService } from '../../../../shared/overlay-spinner/overlay-spinner.service'; + +@Component({ + selector: 'app-success', + templateUrl: './success.component.html', + styleUrls: ['./success.component.scss'], +}) +export class SuccessComponent implements OnInit, OnDestroy { + $destroy = new Subject<void>(); + + localGovernmentName = ''; + fileId = ''; + appLabel = ''; + didAuthorize = false; + private localGovernments: LocalGovernmentDto[] = []; + private localGovernmentUuid: string | undefined; + + constructor( + private applicationSubmissionService: ApplicationSubmissionService, + private applicationReviewService: ApplicationSubmissionReviewService, + private activatedRoute: ActivatedRoute, + private overlayService: OverlaySpinnerService, + private codeService: CodeService + ) {} + + ngOnInit() { + this.loadCodes(); + this.activatedRoute.paramMap.pipe(takeUntil(this.$destroy)).subscribe((paramMap) => { + const fileId = paramMap.get('fileId'); + if (fileId) { + this.loadApplication(fileId); + } + }); + + this.applicationReviewService.$applicationReview.pipe(takeUntil(this.$destroy)).subscribe((applicationReview) => { + if (applicationReview) { + this.didAuthorize = applicationReview.isAuthorized ?? true; + } + }); + } + + ngOnDestroy() { + this.$destroy.next(); + this.$destroy.complete(); + } + + private async loadApplication(fileId: string) { + this.overlayService.showSpinner(); + const appSubmission = await this.applicationSubmissionService.getByFileId(fileId); + if (appSubmission) { + this.fileId = fileId; + this.applicationReviewService.getByFileId(fileId); + this.appLabel = appSubmission.type; + this.localGovernmentUuid = appSubmission.localGovernmentUuid; + this.populateLocalGovernment(appSubmission.localGovernmentUuid); + } + this.overlayService.hideSpinner(); + } + + private async loadCodes() { + const codes = await this.codeService.loadCodes(); + this.localGovernments = codes.localGovernments.sort((a, b) => (a.name > b.name ? 1 : -1)); + if (this.localGovernmentUuid) { + this.populateLocalGovernment(this.localGovernmentUuid); + } + } + + private populateLocalGovernment(governmentUuid: string) { + const lg = this.localGovernments.find((lg) => lg.uuid === governmentUuid); + if (lg) { + this.localGovernmentName = lg.name; + } + } +} From f8f3026a2eb86c50000fb34b7b4e7fec18f30bd1 Mon Sep 17 00:00:00 2001 From: "to. sandra" <76515860+sandratoh@users.noreply.github.com> Date: Thu, 14 Dec 2023 10:38:59 -0800 Subject: [PATCH 777/954] Attach document links to decision released emails (#1225) * Add decision document links to ALCD status emails * Refactor to improve readability and multi decisions * Send noi document links with decision released emails * Clean up and update unit tests * Update noi email template copy and add comments for bug * Clean up imports and add controller unit tests --- ...application-decision-v2.controller.spec.ts | 7 -- .../application-decision-v2.controller.ts | 2 - .../application-decision-v2.service.ts | 2 +- ...e-of-intent-decision-v2.controller.spec.ts | 14 --- ...notice-of-intent-decision-v2.controller.ts | 4 - .../notice-of-intent-decision-v2.service.ts | 22 ++-- .../authorization.controller.spec.ts | 1 - .../application-decision.controller.spec.ts | 13 +++ .../application-decision.controller.ts | 11 +- ...tice-of-intent-decision.controller.spec.ts | 25 +++-- .../notice-of-intent-decision.controller.ts | 13 ++- .../alcs/src/providers/email/email.module.ts | 4 + .../email/status-email.service.spec.ts | 104 +++++++++++++++++- .../providers/email/status-email.service.ts | 53 +++++++++ .../status-emails.consumer.spec.ts | 9 ++ .../status-emails/status-emails.consumer.ts | 10 ++ .../status-emails.consumer.spec.ts | 15 +++ .../status-emails.consumer.ts | 11 ++ .../decision-released/application.template.ts | 21 +++- .../notice-of-intent.template.ts | 23 +++- 20 files changed, 294 insertions(+), 70 deletions(-) diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.controller.spec.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.controller.spec.ts index 5a7217b8d6..f97b33d709 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.controller.spec.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.controller.spec.ts @@ -11,7 +11,6 @@ import { mockKeyCloakProviders } from '../../../../../test/mocks/mockTypes'; import { ApplicationDecisionProfile } from '../../../../common/automapper/application-decision-v2.automapper.profile'; import { ApplicationProfile } from '../../../../common/automapper/application.automapper.profile'; import { UserProfile } from '../../../../common/automapper/user.automapper.profile'; -import { EmailService } from '../../../../providers/email/email.service'; import { ApplicationService } from '../../../application/application.service'; import { CodeService } from '../../../code/code.service'; import { ApplicationDecisionOutcomeCode } from '../../application-decision-outcome.entity'; @@ -32,7 +31,6 @@ describe('ApplicationDecisionV2Controller', () => { let mockCodeService: DeepMocked<CodeService>; let mockModificationService: DeepMocked<ApplicationModificationService>; let mockReconService: DeepMocked<ApplicationReconsiderationService>; - let mockEmailService: DeepMocked<EmailService>; let mockApplication; let mockDecision; @@ -43,7 +41,6 @@ describe('ApplicationDecisionV2Controller', () => { mockCodeService = createMock(); mockModificationService = createMock(); mockReconService = createMock(); - mockEmailService = createMock(); mockApplication = initApplicationMockEntity(); mockDecision = initApplicationDecisionMock(mockApplication); @@ -79,10 +76,6 @@ describe('ApplicationDecisionV2Controller', () => { provide: ApplicationReconsiderationService, useValue: mockReconService, }, - { - provide: EmailService, - useValue: mockEmailService, - }, { provide: ClsService, useValue: {}, diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.controller.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.controller.ts index a38334f2e1..63f9a90429 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.controller.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.controller.ts @@ -19,7 +19,6 @@ import { RolesGuard } from '../../../../common/authorization/roles-guard.service import { UserRoles } from '../../../../common/authorization/roles.decorator'; import { NaruSubtypeDto } from '../../../../portal/application-submission/application-submission.dto'; import { NaruSubtype } from '../../../../portal/application-submission/naru-subtype/naru-subtype.entity'; -import { EmailService } from '../../../../providers/email/email.service'; import { ApplicationService } from '../../../application/application.service'; import { ApplicationCeoCriterionCode } from '../../application-ceo-criterion/application-ceo-criterion.entity'; import { ApplicationDecisionConditionType } from '../../application-decision-condition/application-decision-condition-code.entity'; @@ -48,7 +47,6 @@ export class ApplicationDecisionV2Controller { constructor( private appDecisionService: ApplicationDecisionV2Service, private applicationService: ApplicationService, - private emailService: EmailService, private modificationService: ApplicationModificationService, private reconsiderationService: ApplicationReconsiderationService, @InjectMapper() private mapper: Mapper, diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service.ts index c298a9973f..76cb60d994 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service.ts @@ -553,7 +553,7 @@ export class ApplicationDecisionV2Service { if (decisionDocument) { return this.documentService.getDownloadUrl( decisionDocument.document, - false, + true, // FIXME: Document does not open inline despite flag being true ); } throw new ServiceNotFoundException('Failed to find document'); diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.controller.spec.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.controller.spec.ts index 684889c5f7..c128521025 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.controller.spec.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.controller.spec.ts @@ -7,8 +7,6 @@ import { mockKeyCloakProviders } from '../../../../test/mocks/mockTypes'; import { NoticeOfIntentDecisionProfile } from '../../../common/automapper/notice-of-intent-decision.automapper.profile'; import { NoticeOfIntentProfile } from '../../../common/automapper/notice-of-intent.automapper.profile'; import { UserProfile } from '../../../common/automapper/user.automapper.profile'; -import { NoticeOfIntentSubmissionService } from '../../../portal/notice-of-intent-submission/notice-of-intent-submission.service'; -import { EmailService } from '../../../providers/email/email.service'; import { CodeService } from '../../code/code.service'; import { NoticeOfIntent } from '../../notice-of-intent/notice-of-intent.entity'; import { NoticeOfIntentService } from '../../notice-of-intent/notice-of-intent.service'; @@ -28,8 +26,6 @@ describe('NoticeOfIntentDecisionV2Controller', () => { let mockNoticeOfIntentService: DeepMocked<NoticeOfIntentService>; let mockCodeService: DeepMocked<CodeService>; let mockModificationService: DeepMocked<NoticeOfIntentModificationService>; - let mockNoticeOfIntentSubmissionService: DeepMocked<NoticeOfIntentSubmissionService>; - let mockEmailService: DeepMocked<EmailService>; let mockNoticeOfintent; let mockDecision; @@ -39,8 +35,6 @@ describe('NoticeOfIntentDecisionV2Controller', () => { mockNoticeOfIntentService = createMock(); mockCodeService = createMock(); mockModificationService = createMock(); - mockNoticeOfIntentSubmissionService = createMock(); - mockEmailService = createMock(); mockNoticeOfintent = new NoticeOfIntent(); mockDecision = new NoticeOfIntentDecision({ @@ -74,14 +68,6 @@ describe('NoticeOfIntentDecisionV2Controller', () => { provide: NoticeOfIntentModificationService, useValue: mockModificationService, }, - { - provide: NoticeOfIntentSubmissionService, - useValue: mockNoticeOfIntentSubmissionService, - }, - { - provide: EmailService, - useValue: mockEmailService, - }, { provide: ClsService, useValue: {}, diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.controller.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.controller.ts index 292976820e..239e70a3bf 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.controller.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.controller.ts @@ -17,8 +17,6 @@ import * as config from 'config'; import { ANY_AUTH_ROLE } from '../../../common/authorization/roles'; import { RolesGuard } from '../../../common/authorization/roles-guard.service'; import { UserRoles } from '../../../common/authorization/roles.decorator'; -import { NoticeOfIntentSubmissionService } from '../../../portal/notice-of-intent-submission/notice-of-intent-submission.service'; -import { EmailService } from '../../../providers/email/email.service'; import { NoticeOfIntentService } from '../../notice-of-intent/notice-of-intent.service'; import { NoticeOfIntentDecisionComponentType } from '../notice-of-intent-decision-component/notice-of-intent-decision-component-type.entity'; import { NoticeOfIntentDecisionComponentTypeDto } from '../notice-of-intent-decision-component/notice-of-intent-decision-component.dto'; @@ -42,8 +40,6 @@ export class NoticeOfIntentDecisionV2Controller { constructor( private noticeOfIntentDecisionV2Service: NoticeOfIntentDecisionV2Service, private noticeOfIntentService: NoticeOfIntentService, - private noticeOfIntentSubmissionService: NoticeOfIntentSubmissionService, - private emailService: EmailService, private modificationService: NoticeOfIntentModificationService, @InjectMapper() private mapper: Mapper, ) {} diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.service.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.service.ts index c66c9da4b3..c1d38e2179 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.service.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.service.ts @@ -236,9 +236,8 @@ export class NoticeOfIntentDecisionV2Service { //Must be called after update components await this.updateConditions(updateDto, existingDecision); - const updatedDecision = await this.noticeOfIntentDecisionRepository.save( - existingDecision, - ); + const updatedDecision = + await this.noticeOfIntentDecisionRepository.save(existingDecision); if (dateHasChanged || isChangingDraftStatus) { await this.updateDecisionDates(updatedDecision); @@ -345,9 +344,8 @@ export class NoticeOfIntentDecisionV2Service { conditions: [], }), ); - const savedDecision = await this.noticeOfIntentDecisionRepository.save( - decision, - ); + const savedDecision = + await this.noticeOfIntentDecisionRepository.save(decision); savedDecision.conditions = existingDecision.conditions.map((condition) => { const conditionsComponents = condition.components?.map( @@ -448,18 +446,16 @@ export class NoticeOfIntentDecisionV2Service { } async deleteDocument(decisionDocumentUuid: string) { - const decisionDocument = await this.getDecisionDocumentOrFail( - decisionDocumentUuid, - ); + const decisionDocument = + await this.getDecisionDocumentOrFail(decisionDocumentUuid); await this.decisionDocumentRepository.softRemove(decisionDocument); return decisionDocument; } async getDownloadUrl(decisionDocumentUuid: string, openInline = false) { - const decisionDocument = await this.getDecisionDocumentOrFail( - decisionDocumentUuid, - ); + const decisionDocument = + await this.getDecisionDocumentOrFail(decisionDocumentUuid); return this.documentService.getDownloadUrl( decisionDocument.document, @@ -483,7 +479,7 @@ export class NoticeOfIntentDecisionV2Service { if (decisionDocument) { return this.documentService.getDownloadUrl( decisionDocument.document, - true, + true, // FIXME: Document does not open inline despite flag being true ); } diff --git a/services/apps/alcs/src/common/authorization/authorization.controller.spec.ts b/services/apps/alcs/src/common/authorization/authorization.controller.spec.ts index fff78e03a4..681120b3c9 100644 --- a/services/apps/alcs/src/common/authorization/authorization.controller.spec.ts +++ b/services/apps/alcs/src/common/authorization/authorization.controller.spec.ts @@ -5,7 +5,6 @@ import { Test, TestingModule } from '@nestjs/testing'; import * as config from 'config'; import { FastifyReply } from 'fastify'; import { ClsService } from 'nestjs-cls'; -import { RedisClientType } from 'redis'; import { mockKeyCloakProviders } from '../../../test/mocks/mockTypes'; import { AuthorizationController } from './authorization.controller'; import { AuthorizationService } from './authorization.service'; diff --git a/services/apps/alcs/src/portal/public/application/application-decision.controller.spec.ts b/services/apps/alcs/src/portal/public/application/application-decision.controller.spec.ts index f7286fcc25..b7baabdf4e 100644 --- a/services/apps/alcs/src/portal/public/application/application-decision.controller.spec.ts +++ b/services/apps/alcs/src/portal/public/application/application-decision.controller.spec.ts @@ -1,5 +1,6 @@ import { classes } from 'automapper-classes'; import { AutomapperModule } from 'automapper-nestjs'; +import { FastifyReply } from 'fastify'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { ClsService } from 'nestjs-cls'; @@ -64,4 +65,16 @@ describe('ApplicationDecisionController', () => { expect(res.url).toBeTruthy(); expect(mockDecisionService.getDownloadForPortal).toHaveBeenCalledTimes(1); }); + + it('should redirect for emailed files', async () => { + const res = createMock<FastifyReply>(); + + mockDecisionService.getDownloadForPortal.mockResolvedValue('Mock Url'); + + await controller.emailFile('', res); + + expect(res.status).toHaveBeenCalledWith(302); + expect(res.redirect).toHaveBeenCalledWith('Mock Url'); + expect(mockDecisionService.getDownloadForPortal).toHaveBeenCalledTimes(1); + }); }); diff --git a/services/apps/alcs/src/portal/public/application/application-decision.controller.ts b/services/apps/alcs/src/portal/public/application/application-decision.controller.ts index 10e0fad520..853f4cb2c0 100644 --- a/services/apps/alcs/src/portal/public/application/application-decision.controller.ts +++ b/services/apps/alcs/src/portal/public/application/application-decision.controller.ts @@ -1,6 +1,7 @@ import { Mapper } from 'automapper-core'; import { InjectMapper } from 'automapper-nestjs'; -import { Controller, Get, Param } from '@nestjs/common'; +import { FastifyReply } from 'fastify'; +import { Controller, Get, Param, Res } from '@nestjs/common'; import { Public } from 'nest-keycloak-connect'; import { ApplicationDecisionV2Service } from '../../../alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service'; import { ApplicationDecision } from '../../../alcs/application-decision/application-decision.entity'; @@ -33,4 +34,12 @@ export class ApplicationDecisionController { return { url }; } + + @Get('/:uuid/email') + async emailFile(@Param('uuid') fileUuid: string, @Res() res: FastifyReply) { + const url = await this.decisionService.getDownloadForPortal(fileUuid); + + res.status(302); + res.redirect(url); + } } diff --git a/services/apps/alcs/src/portal/public/notice-of-intent/notice-of-intent-decision.controller.spec.ts b/services/apps/alcs/src/portal/public/notice-of-intent/notice-of-intent-decision.controller.spec.ts index a8fc747905..1a213133cb 100644 --- a/services/apps/alcs/src/portal/public/notice-of-intent/notice-of-intent-decision.controller.spec.ts +++ b/services/apps/alcs/src/portal/public/notice-of-intent/notice-of-intent-decision.controller.spec.ts @@ -1,5 +1,6 @@ import { classes } from 'automapper-classes'; import { AutomapperModule } from 'automapper-nestjs'; +import { FastifyReply } from 'fastify'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { ClsService } from 'nestjs-cls'; @@ -7,17 +8,13 @@ import { mockKeyCloakProviders } from '../../../../test/mocks/mockTypes'; import { NoticeOfIntentDecisionV2Service } from '../../../alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.service'; import { NoticeOfIntentDecision } from '../../../alcs/notice-of-intent-decision/notice-of-intent-decision.entity'; import { NoticeOfIntentDecisionProfile } from '../../../common/automapper/notice-of-intent-decision.automapper.profile'; -import { NoticeOfIntentSubmission } from '../../notice-of-intent-submission/notice-of-intent-submission.entity'; -import { NoticeOfIntentSubmissionService } from '../../notice-of-intent-submission/notice-of-intent-submission.service'; import { NoticeOfIntentDecisionController } from './notice-of-intent-decision.controller'; describe('NoticeOfIntentDecisionController', () => { let controller: NoticeOfIntentDecisionController; - let mockNOISubmissionService: DeepMocked<NoticeOfIntentSubmissionService>; let mockDecisionService: DeepMocked<NoticeOfIntentDecisionV2Service>; beforeEach(async () => { - mockNOISubmissionService = createMock(); mockDecisionService = createMock(); const module: TestingModule = await Test.createTestingModule({ @@ -29,10 +26,6 @@ describe('NoticeOfIntentDecisionController', () => { controllers: [NoticeOfIntentDecisionController], providers: [ NoticeOfIntentDecisionProfile, - { - provide: NoticeOfIntentSubmissionService, - useValue: mockNOISubmissionService, - }, { provide: NoticeOfIntentDecisionV2Service, useValue: mockDecisionService, @@ -47,10 +40,6 @@ describe('NoticeOfIntentDecisionController', () => { controller = module.get<NoticeOfIntentDecisionController>( NoticeOfIntentDecisionController, ); - - mockNOISubmissionService.getByFileNumber.mockResolvedValue( - new NoticeOfIntentSubmission(), - ); }); it('should be defined', () => { @@ -76,4 +65,16 @@ describe('NoticeOfIntentDecisionController', () => { expect(res.url).toBeTruthy(); expect(mockDecisionService.getDownloadForPortal).toHaveBeenCalledTimes(1); }); + + it('should redirect for emailed files', async () => { + const res = createMock<FastifyReply>(); + + mockDecisionService.getDownloadForPortal.mockResolvedValue('Mock Url'); + + await controller.emailFile('', res); + + expect(res.status).toHaveBeenCalledWith(302); + expect(res.redirect).toHaveBeenCalledWith('Mock Url'); + expect(mockDecisionService.getDownloadForPortal).toHaveBeenCalledTimes(1); + }); }); diff --git a/services/apps/alcs/src/portal/public/notice-of-intent/notice-of-intent-decision.controller.ts b/services/apps/alcs/src/portal/public/notice-of-intent/notice-of-intent-decision.controller.ts index b4804f9fda..3397b33809 100644 --- a/services/apps/alcs/src/portal/public/notice-of-intent/notice-of-intent-decision.controller.ts +++ b/services/apps/alcs/src/portal/public/notice-of-intent/notice-of-intent-decision.controller.ts @@ -1,17 +1,16 @@ import { Mapper } from 'automapper-core'; import { InjectMapper } from 'automapper-nestjs'; -import { Controller, Get, Param } from '@nestjs/common'; +import { FastifyReply } from 'fastify'; +import { Controller, Get, Param, Res } from '@nestjs/common'; import { Public } from 'nest-keycloak-connect'; import { NoticeOfIntentDecisionV2Service } from '../../../alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.service'; import { NoticeOfIntentDecision } from '../../../alcs/notice-of-intent-decision/notice-of-intent-decision.entity'; -import { NoticeOfIntentSubmissionService } from '../../notice-of-intent-submission/notice-of-intent-submission.service'; import { NoticeOfIntentPortalDecisionDto } from './notice-of-intent-decision.dto'; @Public() @Controller('public/notice-of-intent/decision') export class NoticeOfIntentDecisionController { constructor( - private noticeOfIntentSubmissionService: NoticeOfIntentSubmissionService, private decisionService: NoticeOfIntentDecisionV2Service, @InjectMapper() private mapper: Mapper, ) {} @@ -35,4 +34,12 @@ export class NoticeOfIntentDecisionController { return { url }; } + + @Get('/:uuid/email') + async emailFile(@Param('uuid') fileUuid: string, @Res() res: FastifyReply) { + const url = await this.decisionService.getDownloadForPortal(fileUuid); + + res.status(302); + res.redirect(url); + } } diff --git a/services/apps/alcs/src/providers/email/email.module.ts b/services/apps/alcs/src/providers/email/email.module.ts index a62d8c5b60..7c7958816a 100644 --- a/services/apps/alcs/src/providers/email/email.module.ts +++ b/services/apps/alcs/src/providers/email/email.module.ts @@ -9,6 +9,8 @@ import { ApplicationModule } from '../../alcs/application/application.module'; import { NoticeOfIntentModule } from '../../alcs/notice-of-intent/notice-of-intent.module'; import { NoticeOfIntentSubmissionModule } from '../../portal/notice-of-intent-submission/notice-of-intent-submission.module'; import { StatusEmailService } from './status-email.service'; +import { ApplicationDecisionV2Module } from '../../alcs/application-decision/application-decision-v2/application-decision-v2.module'; +import { NoticeOfIntentDecisionModule } from '../../alcs/notice-of-intent-decision/notice-of-intent-decision.module'; @Module({ imports: [ @@ -19,6 +21,8 @@ import { StatusEmailService } from './status-email.service'; forwardRef(() => ApplicationSubmissionModule), forwardRef(() => NoticeOfIntentModule), forwardRef(() => NoticeOfIntentSubmissionModule), + forwardRef(() => ApplicationDecisionV2Module), + forwardRef(() => NoticeOfIntentDecisionModule), ], providers: [EmailService, StatusEmailService], exports: [EmailService, StatusEmailService], diff --git a/services/apps/alcs/src/providers/email/status-email.service.spec.ts b/services/apps/alcs/src/providers/email/status-email.service.spec.ts index 1e86e41e6e..b45784a7be 100644 --- a/services/apps/alcs/src/providers/email/status-email.service.spec.ts +++ b/services/apps/alcs/src/providers/email/status-email.service.spec.ts @@ -1,7 +1,8 @@ -import { ConfigModule } from '@app/common/config/config.module'; +import { CONFIG_TOKEN, ConfigModule } from '@app/common/config/config.module'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { MJMLParseResults } from 'mjml-core'; +import * as config from 'config'; import { ApplicationSubmissionStatusType } from '../../alcs/application/application-submission-status/submission-status-type.entity'; import { SUBMISSION_STATUS } from '../../alcs/application/application-submission-status/submission-status.dto'; import { ApplicationService } from '../../alcs/application/application.service'; @@ -19,6 +20,13 @@ import { NoticeOfIntentSubmission } from '../../portal/notice-of-intent-submissi import { NoticeOfIntentSubmissionService } from '../../portal/notice-of-intent-submission/notice-of-intent-submission.service'; import { EmailService } from './email.service'; import { StatusEmailService } from './status-email.service'; +import { ApplicationDecisionV2Service } from '../../alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service'; +import { NoticeOfIntentDecisionV2Service } from '../../alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.service'; +import { ApplicationDecision } from '../../alcs/application-decision/application-decision.entity'; +import { ApplicationDecisionDocument } from '../../alcs/application-decision/application-decision-document/application-decision-document.entity'; +import { Document } from '../../document/document.entity'; +import { NoticeOfIntentDecisionDocument } from '../../alcs/notice-of-intent-decision/notice-of-intent-decision-document/notice-of-intent-decision-document.entity'; +import { NoticeOfIntentDecision } from '../../alcs/notice-of-intent-decision/notice-of-intent-decision.entity'; describe('StatusEmailService', () => { let service: StatusEmailService; @@ -28,6 +36,8 @@ describe('StatusEmailService', () => { let mockNoticeOfIntentSubmissionService: DeepMocked<NoticeOfIntentSubmissionService>; let mockNoticeOfIntentService: DeepMocked<NoticeOfIntentService>; let mockEmailService: DeepMocked<EmailService>; + let mockApplicationDecisionService: DeepMocked<ApplicationDecisionV2Service>; + let mockNoticeOfIntentDecisionService: DeepMocked<NoticeOfIntentDecisionV2Service>; beforeEach(async () => { mockEmailService = createMock(); @@ -36,11 +46,17 @@ describe('StatusEmailService', () => { mockApplicationService = createMock(); mockNoticeOfIntentSubmissionService = createMock(); mockNoticeOfIntentService = createMock(); + mockApplicationDecisionService = createMock(); + mockNoticeOfIntentDecisionService = createMock(); const module: TestingModule = await Test.createTestingModule({ imports: [ConfigModule], providers: [ StatusEmailService, + { + provide: CONFIG_TOKEN, + useValue: config, + }, { provide: EmailService, useValue: mockEmailService, @@ -65,6 +81,14 @@ describe('StatusEmailService', () => { provide: NoticeOfIntentService, useValue: mockNoticeOfIntentService, }, + { + provide: ApplicationDecisionV2Service, + useValue: mockApplicationDecisionService, + }, + { + provide: NoticeOfIntentDecisionV2Service, + useValue: mockNoticeOfIntentDecisionService, + }, ], }).compile(); @@ -129,9 +153,83 @@ describe('StatusEmailService', () => { }); }); + it('should call through services and return application documents', async () => { + const mockDocument1 = new ApplicationDecisionDocument({ + uuid: 'fake-uuid-1', + document: new Document({ fileName: 'document-1' }), + }); + const mockDocument2 = new ApplicationDecisionDocument({ + uuid: 'fake-uuid-2', + document: new Document({ fileName: 'document-2' }), + }); + const mockDecision = new ApplicationDecision({ + documents: [mockDocument1, mockDocument2], + }); + + mockApplicationDecisionService.getByAppFileNumber.mockResolvedValue([ + mockDecision, + ]); + + const res = await service.getApplicationDocumentEmailData('file-number'); + + expect(mockApplicationDecisionService.getByAppFileNumber).toBeCalledTimes( + 1, + ); + + const baseUrl = config.get('ALCS.BASE_URL'); + + expect(res).toStrictEqual([ + { + name: 'document-1', + url: `${baseUrl}/public/application/decision/${mockDocument1.uuid}/email`, + }, + { + name: 'document-2', + url: `${baseUrl}/public/application/decision/${mockDocument2.uuid}/email`, + }, + ]); + }); + + it('should call through services and return notice of intent documents', async () => { + const mockDocument1 = new NoticeOfIntentDecisionDocument({ + uuid: 'fake-uuid-1', + document: new Document({ fileName: 'document-1' }), + }); + const mockDocument2 = new NoticeOfIntentDecisionDocument({ + uuid: 'fake-uuid-2', + document: new Document({ fileName: 'document-2' }), + }); + const mockDecision = new NoticeOfIntentDecision({ + documents: [mockDocument1, mockDocument2], + }); + + mockNoticeOfIntentDecisionService.getByFileNumber.mockResolvedValue([ + mockDecision, + ]); + + const res = await service.getNoticeOfIntentDocumentEmailData('file-number'); + + expect(mockNoticeOfIntentDecisionService.getByFileNumber).toBeCalledTimes( + 1, + ); + + const baseUrl = config.get('ALCS.BASE_URL'); + + expect(res).toStrictEqual([ + { + name: 'document-1', + url: `${baseUrl}/public/notice-of-intent/decision/${mockDocument1.uuid}/email`, + }, + { + name: 'document-2', + url: `${baseUrl}/public/notice-of-intent/decision/${mockDocument2.uuid}/email`, + }, + ]); + }); + it('should call through services to set application email template', async () => { const mockData = { - generateStatusHtml: () => ({} as MJMLParseResults), + generateStatusHtml: () => ({}) as MJMLParseResults, status: SUBMISSION_STATUS.IN_REVIEW_BY_LG, applicationSubmission: new ApplicationSubmission({ typeCode: 'TURP' }), parentType: 'application' as PARENT_TYPE, @@ -156,7 +254,7 @@ describe('StatusEmailService', () => { it('should call through services to set notice of intent email template', async () => { const mockData = { - generateStatusHtml: () => ({} as MJMLParseResults), + generateStatusHtml: () => ({}) as MJMLParseResults, status: NOI_SUBMISSION_STATUS.SUBMITTED_TO_ALC, noticeOfIntentSubmission: new NoticeOfIntentSubmission(), parentType: 'notice-of-intent' as PARENT_TYPE, diff --git a/services/apps/alcs/src/providers/email/status-email.service.ts b/services/apps/alcs/src/providers/email/status-email.service.ts index 442a45721d..71ee679a83 100644 --- a/services/apps/alcs/src/providers/email/status-email.service.ts +++ b/services/apps/alcs/src/providers/email/status-email.service.ts @@ -16,6 +16,10 @@ import { NoticeOfIntentSubmission } from '../../portal/notice-of-intent-submissi import { NoticeOfIntentSubmissionService } from '../../portal/notice-of-intent-submission/notice-of-intent-submission.service'; import { FALLBACK_APPLICANT_NAME } from '../../utils/owner.constants'; import { EmailService } from './email.service'; +import { ApplicationDecisionV2Service } from '../../alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service'; +import { NoticeOfIntentDecisionV2Service } from '../../alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.service'; +import { ApplicationDecision } from '../../alcs/application-decision/application-decision.entity'; +import { NoticeOfIntentDecision } from '../../alcs/notice-of-intent-decision/notice-of-intent-decision.entity'; export interface StatusUpdateEmail { fileNumber: string; @@ -26,11 +30,17 @@ export interface StatusUpdateEmail { parentType: PARENT_TYPE; } +export type DocumentEmailData = { + name: string; + url: string; +}; + type BaseStatusEmailData = { generateStatusHtml: MJMLParseResults; government: LocalGovernment | null; parentType: PARENT_TYPE; ccGovernment?: boolean; + documents?: DocumentEmailData[]; }; type ApplicationEmailData = BaseStatusEmailData & { @@ -65,6 +75,8 @@ export class StatusEmailService { private noticeOfIntentService: NoticeOfIntentService, private noticeOfIntentSubmissionService: NoticeOfIntentSubmissionService, private emailService: EmailService, + private applicationDecisionService: ApplicationDecisionV2Service, + private noticeOfIntentDecisionService: NoticeOfIntentDecisionV2Service, ) {} async getSubmissionGovernmentOrFail( @@ -121,6 +133,45 @@ export class StatusEmailService { return { primaryContact, submissionGovernment }; } + async getApplicationDocumentEmailData(fileNumber: string) { + const decisions = + await this.applicationDecisionService.getByAppFileNumber(fileNumber); + + return this.sortAndMapDecisionDocuments(decisions, PARENT_TYPE.APPLICATION); + } + + async getNoticeOfIntentDocumentEmailData(fileNumber: string) { + const decisions = + await this.noticeOfIntentDecisionService.getByFileNumber(fileNumber); + + return this.sortAndMapDecisionDocuments( + decisions, + PARENT_TYPE.NOTICE_OF_INTENT, + ); + } + + private sortAndMapDecisionDocuments( + decisions: ApplicationDecision[] | NoticeOfIntentDecision[], + type: PARENT_TYPE, + ): DocumentEmailData[] { + return decisions + .sort( + (a, b) => new Date(b.date!).valueOf() - new Date(a.date!).valueOf(), + )[0] + .documents.map((doc) => { + const baseUrl = this.config.get<string>('ALCS.BASE_URL'); + const controller = `public/${type}/decision`; + const endpoint = 'email'; + + const url = `${baseUrl}/${controller}/${doc.uuid}/${endpoint}`; + + return { + name: doc.document.fileName, + url, + }; + }); + } + private async getApplicationEmailTemplate(data: ApplicationEmailData) { const status = await this.applicationSubmissionService.getStatus( data.status, @@ -146,6 +197,7 @@ export class StatusEmailService { governmentName: data.government?.name, status: status.label, parentTypeLabel: parentTypeLabel[data.parentType], + documents: data.documents, }); const parentId = await this.applicationService.getUuid(fileNumber); @@ -185,6 +237,7 @@ export class StatusEmailService { governmentName: data.government?.name, status: status.label, parentTypeLabel: parentTypeLabel[data.parentType], + documents: data.documents, }); const parentId = await this.noticeOfIntentService.getUuid(fileNumber); diff --git a/services/apps/alcs/src/queues/scheduler/application/status-emails/status-emails.consumer.spec.ts b/services/apps/alcs/src/queues/scheduler/application/status-emails/status-emails.consumer.spec.ts index 7d74caf467..dd002b10fa 100644 --- a/services/apps/alcs/src/queues/scheduler/application/status-emails/status-emails.consumer.spec.ts +++ b/services/apps/alcs/src/queues/scheduler/application/status-emails/status-emails.consumer.spec.ts @@ -92,6 +92,7 @@ describe('ApplicationSubmissionStatusEmailConsumer', () => { ccGovernment: true, generateStatusHtml: generateREVAHtml, status: SUBMISSION_STATUS.IN_REVIEW_BY_ALC, + documents: [], }); }); @@ -99,6 +100,7 @@ describe('ApplicationSubmissionStatusEmailConsumer', () => { const mockSubmission = new ApplicationSubmission({ fileNumber: 'fake' }); const mockPrimaryContact = new ApplicationOwner(); const mockLocalGovernment = new LocalGovernment(); + const mockDocuments = [{ name: 'fake-document', url: 'fake-url' }]; mockApplicationSubmissionStatusService.getSubmissionToSubmissionStatusForSendingEmails.mockResolvedValue( [ @@ -117,6 +119,9 @@ describe('ApplicationSubmissionStatusEmailConsumer', () => { primaryContact: mockPrimaryContact, submissionGovernment: mockLocalGovernment, }); + mockStatusEmailService.getApplicationDocumentEmailData.mockResolvedValue( + mockDocuments, + ); mockStatusEmailService.sendApplicationStatusEmail.mockResolvedValue(); await consumer.process(); @@ -132,6 +137,9 @@ describe('ApplicationSubmissionStatusEmailConsumer', () => { 'fake', ); expect(mockStatusEmailService.getApplicationEmailData).toBeCalledTimes(1); + expect( + mockStatusEmailService.getApplicationDocumentEmailData, + ).toBeCalledTimes(1); expect(mockStatusEmailService.sendApplicationStatusEmail).toBeCalledTimes( 1, ); @@ -143,6 +151,7 @@ describe('ApplicationSubmissionStatusEmailConsumer', () => { ccGovernment: true, generateStatusHtml: generateALCDApplicationHtml, status: SUBMISSION_STATUS.ALC_DECISION, + documents: mockDocuments, }); }); diff --git a/services/apps/alcs/src/queues/scheduler/application/status-emails/status-emails.consumer.ts b/services/apps/alcs/src/queues/scheduler/application/status-emails/status-emails.consumer.ts index 0d6b734878..ebda8d3760 100644 --- a/services/apps/alcs/src/queues/scheduler/application/status-emails/status-emails.consumer.ts +++ b/services/apps/alcs/src/queues/scheduler/application/status-emails/status-emails.consumer.ts @@ -96,6 +96,11 @@ export class ApplicationSubmissionStatusEmailConsumer extends WorkerHost { ? generateALCDApplicationHtml : generateREVAHtml; + const documents = + submissionStatus.statusTypeCode === SUBMISSION_STATUS.ALC_DECISION + ? await this.getDecisionDocuments(applicationSubmission.fileNumber) + : []; + await this.statusEmailService.sendApplicationStatusEmail({ applicationSubmission, government: submissionGovernment, @@ -104,6 +109,7 @@ export class ApplicationSubmissionStatusEmailConsumer extends WorkerHost { ccGovernment: true, generateStatusHtml, status: <SUBMISSION_STATUS>submissionStatus.statusTypeCode, + documents, }); await this.updateSubmissionStatus(submissionStatus); @@ -126,4 +132,8 @@ export class ApplicationSubmissionStatusEmailConsumer extends WorkerHost { submissionStatus, ); } + + private async getDecisionDocuments(fileNumber: string) { + return this.statusEmailService.getApplicationDocumentEmailData(fileNumber); + } } diff --git a/services/apps/alcs/src/queues/scheduler/notice-of-intent/status-emails.consumer.spec.ts b/services/apps/alcs/src/queues/scheduler/notice-of-intent/status-emails.consumer.spec.ts index 53499d2771..35aad396fa 100644 --- a/services/apps/alcs/src/queues/scheduler/notice-of-intent/status-emails.consumer.spec.ts +++ b/services/apps/alcs/src/queues/scheduler/notice-of-intent/status-emails.consumer.spec.ts @@ -47,6 +47,7 @@ describe('NoticeOfIntentSubmissionStatusEmailConsumer', () => { const mockSubmission = new NoticeOfIntentSubmission({ fileNumber: 'fake' }); const mockPrimaryContact = new NoticeOfIntentOwner(); const mockLocalGovernment = new LocalGovernment(); + const mockDocuments = [{ name: 'fake-document', url: 'fake-url' }]; mockNoticeOfIntentSubmissionStatusService.getSubmissionToSubmissionStatusForSendingEmails.mockResolvedValue( [ @@ -64,6 +65,9 @@ describe('NoticeOfIntentSubmissionStatusEmailConsumer', () => { primaryContact: mockPrimaryContact, submissionGovernment: mockLocalGovernment, }); + mockStatusEmailService.getNoticeOfIntentDocumentEmailData.mockResolvedValue( + mockDocuments, + ); mockStatusEmailService.sendNoticeOfIntentStatusEmail.mockResolvedValue(); await consumer.process(); @@ -81,6 +85,9 @@ describe('NoticeOfIntentSubmissionStatusEmailConsumer', () => { expect(mockStatusEmailService.getNoticeOfIntentEmailData).toBeCalledTimes( 1, ); + expect( + mockStatusEmailService.getNoticeOfIntentDocumentEmailData, + ).toBeCalledTimes(1); expect( mockStatusEmailService.sendNoticeOfIntentStatusEmail, ).toBeCalledTimes(1); @@ -93,6 +100,7 @@ describe('NoticeOfIntentSubmissionStatusEmailConsumer', () => { ccGovernment: true, generateStatusHtml: generateALCDNoticeOfIntentHtml, status: NOI_SUBMISSION_STATUS.ALC_DECISION, + documents: mockDocuments, }, ); }); @@ -100,6 +108,7 @@ describe('NoticeOfIntentSubmissionStatusEmailConsumer', () => { it('should not send email if no primary contact', async () => { const mockSubmission = new NoticeOfIntentSubmission({ fileNumber: 'fake' }); const mockLocalGovernment = new LocalGovernment(); + const mockDocuments = [{ name: 'fake-document', url: 'fake-url' }]; mockNoticeOfIntentSubmissionStatusService.getSubmissionToSubmissionStatusForSendingEmails.mockResolvedValue( [ @@ -117,6 +126,9 @@ describe('NoticeOfIntentSubmissionStatusEmailConsumer', () => { primaryContact: undefined, submissionGovernment: mockLocalGovernment, }); + mockStatusEmailService.getNoticeOfIntentDocumentEmailData.mockResolvedValue( + mockDocuments, + ); mockStatusEmailService.sendNoticeOfIntentStatusEmail.mockResolvedValue(); await consumer.process(); @@ -134,6 +146,9 @@ describe('NoticeOfIntentSubmissionStatusEmailConsumer', () => { expect(mockStatusEmailService.getNoticeOfIntentEmailData).toBeCalledTimes( 1, ); + expect( + mockStatusEmailService.getNoticeOfIntentDocumentEmailData, + ).toBeCalledTimes(1); expect( mockStatusEmailService.sendNoticeOfIntentStatusEmail, ).toBeCalledTimes(0); diff --git a/services/apps/alcs/src/queues/scheduler/notice-of-intent/status-emails.consumer.ts b/services/apps/alcs/src/queues/scheduler/notice-of-intent/status-emails.consumer.ts index 758de9843c..939e187f0a 100644 --- a/services/apps/alcs/src/queues/scheduler/notice-of-intent/status-emails.consumer.ts +++ b/services/apps/alcs/src/queues/scheduler/notice-of-intent/status-emails.consumer.ts @@ -45,6 +45,10 @@ export class NoticeOfIntentSubmissionStatusEmailConsumer extends WorkerHost { submissionStatus.submission, ); + const documents = await this.getDecisionDocuments( + submissionStatus.submission.fileNumber, + ); + if (primaryContact) { await this.statusEmailService.sendNoticeOfIntentStatusEmail({ generateStatusHtml: generateALCDNoticeOfIntentHtml, @@ -54,6 +58,7 @@ export class NoticeOfIntentSubmissionStatusEmailConsumer extends WorkerHost { parentType: PARENT_TYPE.NOTICE_OF_INTENT, primaryContact, ccGovernment: true, + documents, }); await this.updateSubmissionStatus(submissionStatus); @@ -90,4 +95,10 @@ export class NoticeOfIntentSubmissionStatusEmailConsumer extends WorkerHost { submissionStatus, ); } + + private async getDecisionDocuments(fileNumber: string) { + return this.statusEmailService.getNoticeOfIntentDocumentEmailData( + fileNumber, + ); + } } diff --git a/services/templates/emails/decision-released/application.template.ts b/services/templates/emails/decision-released/application.template.ts index cd289aada1..9d62aec8ad 100644 --- a/services/templates/emails/decision-released/application.template.ts +++ b/services/templates/emails/decision-released/application.template.ts @@ -1,10 +1,13 @@ import { MJMLParseResults } from 'mjml-core'; -import { StatusUpdateEmail } from '../../../apps/alcs/src/providers/email/status-email.service'; +import { + DocumentEmailData, + StatusUpdateEmail, +} from '../../../apps/alcs/src/providers/email/status-email.service'; import { EmailTemplateService } from '../../../libs/common/src/email-template-service/email-template.service'; import { header, footer, notificationOnly, portalButton } from '../partials'; type DecisionReleasedStatusEmail = StatusUpdateEmail & { - decisionDate: number; + documents: DocumentEmailData[]; }; const template = `<mjml> @@ -28,13 +31,23 @@ const template = `<mjml> This email is to advise that the Reasons for Decision for the above noted application has been released. </mj-text> <mj-text font-size='16px'> - Please log into the ALC Portal to view the Reasons for Decision. The document can be found by clicking 'View' from the Inbox table and then navigating to the 'ALC Review and Decision' tab. The Reasons for Decision will also be available to the public. + You can access the decision document by clicking the link(s) below: + </mj-text> + <mj-text font-size='16px'> + <ul style="list-style-position: inside; padding: 0; margin: 0;"> + {{#each documents}} + <li><a href={{url}}>{{name}}</a></li> + {{/each}} + </ul> + </mj-text> + <mj-text font-size='16px'> + The decision can also be accessed via the ALC Portal and Public Search tool. </mj-text> <mj-text font-size='16px'> Further correspondence with respect to this application should be directed to the ALC Land Use Planner for your region, found on the ALC website <a href="https://www.alc.gov.bc.ca/contact#land-use-planner" target="_blank">Contact Us</a> page. </mj-text> <mj-text font-size='16px'> - If you are an agent acting on behalf of the applicant(s)/landowner(s), it is your responsibility to advise your client(s) of this, and any future, correspondence. + If you are an agent acting on behalf of the applicant(s)/landowner(s), it is your responsibility to advise them of this, and any future, correspondence. </mj-text> ${notificationOnly} </mj-column> diff --git a/services/templates/emails/decision-released/notice-of-intent.template.ts b/services/templates/emails/decision-released/notice-of-intent.template.ts index 5a5cf36907..9d51ed1eb8 100644 --- a/services/templates/emails/decision-released/notice-of-intent.template.ts +++ b/services/templates/emails/decision-released/notice-of-intent.template.ts @@ -1,10 +1,13 @@ import { MJMLParseResults } from 'mjml-core'; -import { StatusUpdateEmail } from '../../../apps/alcs/src/providers/email/status-email.service'; +import { + DocumentEmailData, + StatusUpdateEmail, +} from '../../../apps/alcs/src/providers/email/status-email.service'; import { EmailTemplateService } from '../../../libs/common/src/email-template-service/email-template.service'; import { footer, header, notificationOnly, portalButton } from '../partials'; type DecisionReleasedStatusEmail = StatusUpdateEmail & { - decisionDate: number; + documents: DocumentEmailData[]; }; const template = `<mjml> @@ -25,16 +28,26 @@ const template = `<mjml> <mj-section background-color="white" padding="48px 0px 48px 0px"> <mj-column width="600px" css-class='line-height'> <mj-text font-size='16px'> - The decision for the above noted Notice of Intent (NOI) has been released on the the ALC Portal. + This email is to advise that the Reasons for Decision for the above noted Notice of Intent (NOI) has been released. </mj-text> <mj-text font-size='16px'> - The decision document can be found by clicking 'View' from the NOI Inbox table in the ALC Portal, and then navigating to the 'ALC Review and Decision' tab. The decision will also be available to the public. + You can access the decision document by clicking the link(s) below: + </mj-text> + <mj-text font-size='16px'> + <ul style="list-style-position: inside; padding: 0; margin: 0;"> + {{#each documents}} + <li><a href={{url}}>{{name}}</a></li> + {{/each}} + </ul> + </mj-text> + <mj-text font-size='16px'> + The decision can also be accessed via the ALC Portal and Public Search tool. </mj-text> <mj-text font-size='16px'> Further correspondence with respect to this NOI should be directed to <a href="mailto:ALC.Soil@gov.bc.ca">ALC.Soil@gov.bc.ca</a>. </mj-text> <mj-text font-size='16px'> - If you are an agent acting on behalf of the applicant(s)/landowner(s), it is your responsibility to advise your client(s) of this, and any future, correspondence. + If you are an agent acting on behalf of the applicant(s)/landowner(s), it is your responsibility to advise them of this, and any future, correspondence. </mj-text> ${notificationOnly} </mj-column> From 77b5227003c8efd1c28754f64624eb30bf60bcfb Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Thu, 14 Dec 2023 10:50:39 -0800 Subject: [PATCH 778/954] Add public search hack for OATS data to docs --- bin/migrate-oats-data/README.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/bin/migrate-oats-data/README.md b/bin/migrate-oats-data/README.md index 609d72f20d..cea57bfa50 100644 --- a/bin/migrate-oats-data/README.md +++ b/bin/migrate-oats-data/README.md @@ -55,3 +55,13 @@ Prerequisites: - activate virtual env, the same way you would do it for starting etl, - install python requirements `pip install -r requirements.txt` - run data obfuscation `python migrate.py obfuscate` + +## Fixing Public Visibility Issue + +Applications imported from OATS will not properly display in the public search. The following hack can circumvent this issue: + +```sql +UPDATE alcs.application a +SET date_received_all_items = CURRENT_TIMESTAMP +WHERE a.audit_created_by = 'oats_etl'; +``` From 4cc4e89897669fcf0270582ac7e2102c776f6395 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <dhaselhan@gmail.com> Date: Thu, 14 Dec 2023 11:12:36 -0800 Subject: [PATCH 779/954] Apply suggestions from code review Co-authored-by: to. sandra <76515860+sandratoh@users.noreply.github.com> --- .../review-submit-fng/review-submit-fng.component.ts | 2 +- .../review-submission/review-submit/review-submit.component.ts | 2 +- .../review-submission/success/success.component.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/portal-frontend/src/app/features/applications/review-submission/review-submit-fng/review-submit-fng.component.ts b/portal-frontend/src/app/features/applications/review-submission/review-submit-fng/review-submit-fng.component.ts index 6af4257ee4..b484fdc1d5 100644 --- a/portal-frontend/src/app/features/applications/review-submission/review-submit-fng/review-submit-fng.component.ts +++ b/portal-frontend/src/app/features/applications/review-submission/review-submit-fng/review-submit-fng.component.ts @@ -97,7 +97,7 @@ export class ReviewSubmitFngComponent implements OnInit, OnDestroy { const isValid = this.runValidation(); if (isValid && this.fileId) { const government = await this.loadGovernment(this.localGovernmentUuid); - const governmentName = government?.name ?? 'selected local / first nation government'; + const governmentName = government?.name ?? 'selected local / First Nation government'; this.dialog .open(SubmitConfirmationDialogComponent, { diff --git a/portal-frontend/src/app/features/applications/review-submission/review-submit/review-submit.component.ts b/portal-frontend/src/app/features/applications/review-submission/review-submit/review-submit.component.ts index f114bc3dc1..d0cb407568 100644 --- a/portal-frontend/src/app/features/applications/review-submission/review-submit/review-submit.component.ts +++ b/portal-frontend/src/app/features/applications/review-submission/review-submit/review-submit.component.ts @@ -110,7 +110,7 @@ export class ReviewSubmitComponent implements OnInit, OnDestroy { const isValid = this.runValidation(); if (isValid && this.fileId) { const government = await this.loadGovernment(this.localGovernmentUuid); - const governmentName = government?.name ?? 'selected local / first nation government'; + const governmentName = government?.name ?? 'selected local / First Nation government'; this.dialog .open(SubmitConfirmationDialogComponent, { diff --git a/portal-frontend/src/app/features/applications/review-submission/success/success.component.html b/portal-frontend/src/app/features/applications/review-submission/success/success.component.html index d2e4238e7a..681c06fb22 100644 --- a/portal-frontend/src/app/features/applications/review-submission/success/success.component.html +++ b/portal-frontend/src/app/features/applications/review-submission/success/success.component.html @@ -13,7 +13,7 @@ <h2 class="heading">Application ID: {{ fileId }} Forwarded!</h2> <ng-container *ngIf="!didAuthorize"> <h2 class="heading">Application ID: {{ fileId }} has been refused by the {{ localGovernmentName }}.</h2> <p> - <span class="subheading1"><strong>Your review and decision has been submitted to the ALC.</strong></span + <span class="subheading1"><strong>Your review and decision have been submitted to the ALC.</strong></span ><br /><br /><br /> {{ localGovernmentName }} will be cc'd on the email notifying the applicant that the application has not been forwarded to the ALC. From 659c7cf15ef86470ec1045c657e4bf356c2674a4 Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Thu, 14 Dec 2023 11:42:00 -0800 Subject: [PATCH 780/954] pacel # format --- .../application-details/parcel/parcel.component.html | 2 +- .../notice-of-intent-details/parcel/parcel.component.html | 2 +- .../application-details/parcel/parcel.component.html | 2 +- .../notice-of-intent-details/parcel/parcel.component.html | 2 +- .../public/application/submission/parcel/parcel.component.html | 2 +- .../notice-of-intent/submission/parcel/parcel.component.html | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/parcel/parcel.component.html b/alcs-frontend/src/app/features/application/applicant-info/application-details/parcel/parcel.component.html index f4d689b74a..3fa53d3359 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/application-details/parcel/parcel.component.html +++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/parcel/parcel.component.html @@ -5,7 +5,7 @@ <h3 class="flex-item"> <div class="review-table"> <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 }}: Parcel and Owner Information</h4> + <h4 [id]="parcel.uuid">Parcel #{{ parcelInd + 1 }}: Parcel and Owner Information</h4> </div> <div class="subheading2 grid-1">Ownership Type</div> <div class="grid-double"> diff --git a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/parcel/parcel.component.html b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/parcel/parcel.component.html index 4b5afb0b50..02fa6b94ad 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/parcel/parcel.component.html +++ b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/parcel/parcel.component.html @@ -3,7 +3,7 @@ <h3 class="flex-item">Notice of Intent Parcels</h3> <div class="review-table"> <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 }}: Parcel and Owner Information</h4> + <h4 [id]="parcel.uuid">Parcel #{{ parcelInd + 1 }}: Parcel and Owner Information</h4> </div> <div class="subheading2 grid-1">Ownership Type</div> <div class="grid-double"> diff --git a/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.html b/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.html index 6cec01bd1f..97ec54f4bb 100644 --- a/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.html +++ b/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.html @@ -2,7 +2,7 @@ <h3 class="flex-item">{{ pageTitle }}</h3> <div class="review-table"> <ng-container *ngFor="let parcel of parcels; let parcelInd = index"> <div class="full-width parcel-header"> - <h4>Parcel {{ parcelInd + 1 }}</h4> + <h4>Parcel #{{ parcelInd + 1 }}</h4> <div> <button *ngIf="showEdit" diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/parcel/parcel.component.html b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/parcel/parcel.component.html index 46d0208429..3686e7b877 100644 --- a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/parcel/parcel.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/parcel/parcel.component.html @@ -2,7 +2,7 @@ <h3 class="flex-item">1. Identify Parcel(s) Under Application</h3> <div class="review-table"> <ng-container *ngFor="let parcel of parcels; let parcelInd = index"> <div class="full-width parcel-header"> - <h4>Parcel {{ parcelInd + 1 }}</h4> + <h4>Parcel #{{ parcelInd + 1 }}</h4> <div> <button *ngIf="showEdit" diff --git a/portal-frontend/src/app/features/public/application/submission/parcel/parcel.component.html b/portal-frontend/src/app/features/public/application/submission/parcel/parcel.component.html index 806c4bb2eb..eec1e4bc7a 100644 --- a/portal-frontend/src/app/features/public/application/submission/parcel/parcel.component.html +++ b/portal-frontend/src/app/features/public/application/submission/parcel/parcel.component.html @@ -4,7 +4,7 @@ <h3 class="flex-item"> <div class="review-table"> <ng-container *ngFor="let parcel of parcels; let parcelInd = index"> <div class="full-width flex-space-between-wrap"> - <h4>Parcel {{ parcelInd + 1 }}</h4> + <h4>Parcel #{{ parcelInd + 1 }}</h4> </div> <div class="subheading2 grid-1">Parcel Type</div> <div class="grid-double"> diff --git a/portal-frontend/src/app/features/public/notice-of-intent/submission/parcel/parcel.component.html b/portal-frontend/src/app/features/public/notice-of-intent/submission/parcel/parcel.component.html index 806c4bb2eb..eec1e4bc7a 100644 --- a/portal-frontend/src/app/features/public/notice-of-intent/submission/parcel/parcel.component.html +++ b/portal-frontend/src/app/features/public/notice-of-intent/submission/parcel/parcel.component.html @@ -4,7 +4,7 @@ <h3 class="flex-item"> <div class="review-table"> <ng-container *ngFor="let parcel of parcels; let parcelInd = index"> <div class="full-width flex-space-between-wrap"> - <h4>Parcel {{ parcelInd + 1 }}</h4> + <h4>Parcel #{{ parcelInd + 1 }}</h4> </div> <div class="subheading2 grid-1">Parcel Type</div> <div class="grid-double"> From 9ac993417525dd198ec9e1e7653bf4ce3352624a Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Thu, 14 Dec 2023 11:36:45 -0800 Subject: [PATCH 781/954] Change app -> noi for noi success page --- .../edit-submission/success/success.component.html | 2 +- .../edit-submission/success/success.component.html | 4 ++-- .../edit-submission/success/success.component.ts | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/success/success.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/success/success.component.html index d40bf3e9af..2a2c0e12ca 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/success/success.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/success/success.component.html @@ -1,7 +1,7 @@ <h2 class="heading">NOI ID: {{ fileId }} Submitted!</h2> <p> <span class="subheading1"> - You have submitted a <strong>{{ appLabel }}</strong> application to the + You have submitted a <strong>{{ appLabel }}</strong> notice of intent to the <strong>Agricultural Land Commission</strong> for their review and decision. </span ><br /><br /><br /> diff --git a/portal-frontend/src/app/features/notifications/edit-submission/success/success.component.html b/portal-frontend/src/app/features/notifications/edit-submission/success/success.component.html index c90373d892..52f7d97bba 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/success/success.component.html +++ b/portal-frontend/src/app/features/notifications/edit-submission/success/success.component.html @@ -1,8 +1,8 @@ <h2 class="heading">Notification ID: {{ fileId }} Submitted!</h2> <p> <span class="subheading1"> - You have submitted a <strong>{{ appLabel }}</strong> application to the - <strong>Agricultural Land Commission</strong> for their review and response.</span + You have submitted a <strong>Notification of {{ appLabel }}</strong> to the <strong>Agricultural Land Commission</strong> for their + review and response.</span > <br /><br /><br /> The Primary Contact will receive an automated email shortly containing an attached PDF response which must be appended diff --git a/portal-frontend/src/app/features/notifications/edit-submission/success/success.component.ts b/portal-frontend/src/app/features/notifications/edit-submission/success/success.component.ts index 7265c5cc1b..37854cf025 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/success/success.component.ts +++ b/portal-frontend/src/app/features/notifications/edit-submission/success/success.component.ts @@ -44,12 +44,12 @@ export class SuccessComponent implements OnInit, OnDestroy { private async loadApplication(fileId: string) { this.overlayService.showSpinner(); - const noiSubmission = await this.notificationSubmissionService.getByFileId(fileId); - if (noiSubmission) { + const notiSubmission = await this.notificationSubmissionService.getByFileId(fileId); + if (notiSubmission) { this.fileId = fileId; - this.appType = noiSubmission.typeCode; - this.appLabel = noiSubmission.type; - this.populateFees(noiSubmission.typeCode); + this.appType = notiSubmission.typeCode; + this.appLabel = notiSubmission.type; + this.populateFees(notiSubmission.typeCode); } this.overlayService.hideSpinner(); } From 87af9aaecdd623b97265870f9268c15b0a2a9264 Mon Sep 17 00:00:00 2001 From: Liam Stoddard <lstodd@protonmail.com> Date: Thu, 14 Dec 2023 13:06:01 -0800 Subject: [PATCH 782/954] ensure proper noi cleaning, added NFU end date as proposal end date --- bin/migrate-oats-data/noi/notice_of_intent_init.py | 2 +- .../oats_to_alcs_notice_of_intent_table_etl.py | 8 ++++++++ .../sql/notice_of_intent_base/notice_of_intent_base.sql | 3 ++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/bin/migrate-oats-data/noi/notice_of_intent_init.py b/bin/migrate-oats-data/noi/notice_of_intent_init.py index cb12880026..f6be7cea28 100644 --- a/bin/migrate-oats-data/noi/notice_of_intent_init.py +++ b/bin/migrate-oats-data/noi/notice_of_intent_init.py @@ -67,7 +67,7 @@ def clean_notice_of_intents(conn=None): logger.info("Start NOI cleaning") with conn.cursor() as cursor: cursor.execute( - f"DELETE FROM alcs.notice_of_intent WHERE audit_created_by = '{OATS_ETL_USER}' AND audit_updated_by = null" + f"DELETE FROM alcs.notice_of_intent WHERE audit_created_by = '{OATS_ETL_USER}' AND audit_updated_by IS NULL" ) logger.info(f"Deleted items count = {cursor.rowcount}") diff --git a/bin/migrate-oats-data/noi/oats_to_alcs_notice_of_intent_table_etl/oats_to_alcs_notice_of_intent_table_etl.py b/bin/migrate-oats-data/noi/oats_to_alcs_notice_of_intent_table_etl/oats_to_alcs_notice_of_intent_table_etl.py index 9f6e990e3e..8b4c38fabd 100644 --- a/bin/migrate-oats-data/noi/oats_to_alcs_notice_of_intent_table_etl/oats_to_alcs_notice_of_intent_table_etl.py +++ b/bin/migrate-oats-data/noi/oats_to_alcs_notice_of_intent_table_etl/oats_to_alcs_notice_of_intent_table_etl.py @@ -5,6 +5,7 @@ AlcsAgCap, AlcsAgCapSource, setup_and_get_logger, + add_timezone_and_keep_date_part, ) from db import inject_conn_pool from psycopg2.extras import RealDictCursor, execute_batch @@ -114,6 +115,7 @@ def _get_update_query_from_oats_alr_applications_fields(): ag_cap_consultant = COALESCE(%(agri_cap_consultant)s, ag_cap_consultant), ag_cap = COALESCE(%(agri_capability_code)s, ag_cap), legacy_id= COALESCE(%(legacy_application_nbr)s, legacy_id), + proposal_end_date = %(proposal_end_date)s, source = 'APPLICANT' WHERE alcs.notice_of_intent.file_number = %(alr_application_id)s::TEXT; @@ -139,4 +141,10 @@ def map_basic_field(data): data["agri_capability_code"] = str( OatsToAlcsAgCap[data["agri_capability_code"]].value ) + date = data.get("nonfarm_use_end_date", "") + if date is None: + data["proposal_end_date"] = None + return data + proposal_end = add_timezone_and_keep_date_part(date) + data["proposal_end_date"] = proposal_end return data diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_base/notice_of_intent_base.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_base/notice_of_intent_base.sql index 2b8cc68e8a..167d4c5bb6 100644 --- a/bin/migrate-oats-data/noi/sql/notice_of_intent_base/notice_of_intent_base.sql +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_base/notice_of_intent_base.sql @@ -18,7 +18,8 @@ SELECT oaa.fee_waived_ind, oaac.agri_cap_map, oaac.agri_cap_consultant, oaac.agri_capability_code, - oaa.legacy_application_nbr + oaa.legacy_application_nbr, + oaac.nonfarm_use_end_date FROM alcs.notice_of_intent noi JOIN nois_with_one_or_zero_component_only oats_noi ON oats_noi.alr_application_id::TEXT = noi.file_number JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oats_noi.alr_application_id From a8e722335383bff1c9e89b30203e098ca046e27a Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Thu, 14 Dec 2023 13:25:35 -0800 Subject: [PATCH 783/954] Use token expiry time * Our backend requires a valid token to use the refresh token, since the token expires first it should be checked instead * Add logging --- .../services/authentication/authentication.service.ts | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/portal-frontend/src/app/services/authentication/authentication.service.ts b/portal-frontend/src/app/services/authentication/authentication.service.ts index f531c799c1..24b7f9a519 100644 --- a/portal-frontend/src/app/services/authentication/authentication.service.ts +++ b/portal-frontend/src/app/services/authentication/authentication.service.ts @@ -44,6 +44,11 @@ export class AuthenticationService { this.expires = decodedToken.exp! * 1000; this.currentUser = decodedToken as ICurrentUser; this.$currentTokenUser.next(this.currentUser); + + console.debug( + `Token Successfully Refreshed, Expires at: ${new Date(this.expires)} Refresh at: ${new Date(this.refreshExpires)}` + ); + this.loadUser(); } @@ -74,7 +79,7 @@ export class AuthenticationService { async refreshTokens(redirect = true) { if (this.refreshToken) { - if (this.refreshExpires && this.refreshExpires < Date.now()) { + if (this.expires && this.expires < Date.now()) { if (redirect) { await this.router.navigateByUrl('/login'); } @@ -128,13 +133,12 @@ export class AuthenticationService { } private async getNewTokens(refreshToken: string) { - const res = await firstValueFrom( + return await firstValueFrom( this.http.get<{ refresh_token: string; token: string; }>(`${environment.authUrl}/authorize/refresh?r=${refreshToken}`) ); - return res; } private async getLogoutUrl() { From 4f98b8e5408633a638f58ed0b596d94696beb81c Mon Sep 17 00:00:00 2001 From: Liam Stoddard <lstodd@protonmail.com> Date: Thu, 14 Dec 2023 14:21:06 -0800 Subject: [PATCH 784/954] MR feedback --- .../oats_to_alcs_notice_of_intent_table_etl.py | 16 ++++++++++++---- .../notice_of_intent_base.sql | 3 ++- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/bin/migrate-oats-data/noi/oats_to_alcs_notice_of_intent_table_etl/oats_to_alcs_notice_of_intent_table_etl.py b/bin/migrate-oats-data/noi/oats_to_alcs_notice_of_intent_table_etl/oats_to_alcs_notice_of_intent_table_etl.py index 8b4c38fabd..d116a74e17 100644 --- a/bin/migrate-oats-data/noi/oats_to_alcs_notice_of_intent_table_etl/oats_to_alcs_notice_of_intent_table_etl.py +++ b/bin/migrate-oats-data/noi/oats_to_alcs_notice_of_intent_table_etl/oats_to_alcs_notice_of_intent_table_etl.py @@ -128,6 +128,7 @@ def _prepare_oats_alr_applications_data(row_data_list): for row in row_data_list: data = dict(row) data = map_basic_field(data) + data = map_prop_end_date(data) data_list.append(data) return data_list @@ -141,10 +142,17 @@ def map_basic_field(data): data["agri_capability_code"] = str( OatsToAlcsAgCap[data["agri_capability_code"]].value ) + return data + + +def map_prop_end_date(data): date = data.get("nonfarm_use_end_date", "") - if date is None: - data["proposal_end_date"] = None + alcs_date = data.get("proposal_end_date", "") + if date is None and alcs_date is None: + return data + elif date is None: return data - proposal_end = add_timezone_and_keep_date_part(date) - data["proposal_end_date"] = proposal_end + else: + proposal_end = add_timezone_and_keep_date_part(date) + data["proposal_end_date"] = proposal_end return data diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_base/notice_of_intent_base.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_base/notice_of_intent_base.sql index 167d4c5bb6..2845703548 100644 --- a/bin/migrate-oats-data/noi/sql/notice_of_intent_base/notice_of_intent_base.sql +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_base/notice_of_intent_base.sql @@ -19,7 +19,8 @@ SELECT oaa.fee_waived_ind, oaac.agri_cap_consultant, oaac.agri_capability_code, oaa.legacy_application_nbr, - oaac.nonfarm_use_end_date + oaac.nonfarm_use_end_date, + noi.proposal_end_date FROM alcs.notice_of_intent noi JOIN nois_with_one_or_zero_component_only oats_noi ON oats_noi.alr_application_id::TEXT = noi.file_number JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oats_noi.alr_application_id From 25d5858c08ce2e01586a157ae33ef0d9c27a7379 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Thu, 14 Dec 2023 15:06:33 -0800 Subject: [PATCH 785/954] Inbox Table Fixes * Only add hover class to rows with a link * Clean up link code to not log undefined and not use .click --- .../home/inbox/inbox-table/inbox-table.component.html | 9 ++++++++- .../home/inbox/inbox-table/inbox-table.component.scss | 6 +++--- .../home/inbox/inbox-table/inbox-table.component.ts | 9 +++++---- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.html b/portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.html index 6edaed9fc7..b846113803 100644 --- a/portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.html +++ b/portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.html @@ -2,7 +2,14 @@ <div class="table-container"> <table mat-table [dataSource]="dataSource"> <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr> - <tr mat-row *matRowDef="let row; columns: displayedColumns" (click)="onRowClick($event)"></tr> + <tr + mat-row + [ngClass]="{ + link: !!row.routerLink + }" + *matRowDef="let row; columns: displayedColumns" + (click)="onRowClick(row.routerLink)" + ></tr> <!-- Row shown when there is no matching data. --> <tr class="mat-row" *matNoDataRow> diff --git a/portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.scss b/portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.scss index 2558db4290..fc0ea8343d 100644 --- a/portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.scss +++ b/portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.scss @@ -1,6 +1,6 @@ @use '../../../../../styles/colors'; -.mat-mdc-row:hover { - background-color: colors.$grey-light !important; - cursor: pointer; +.link:hover { + background-color: colors.$grey-light !important; + cursor: pointer; } diff --git a/portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.ts b/portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.ts index dd746e7403..f727fb9469 100644 --- a/portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.ts +++ b/portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.ts @@ -2,6 +2,7 @@ import { Component, EventEmitter, Input, OnDestroy, Output, ViewChild } from '@a import { MatPaginator, PageEvent } from '@angular/material/paginator'; import { MatSort } from '@angular/material/sort'; import { MatTableDataSource } from '@angular/material/table'; +import { Router } from '@angular/router'; import { Subject, takeUntil } from 'rxjs'; import { TableChange } from '../../../public/search/search.interface'; import { InboxResultDto } from '../inbox.component'; @@ -44,7 +45,7 @@ export class InboxTableComponent implements OnDestroy { private subscribedToSort = false; - constructor() {} + constructor(private router: Router) {} async onTableChange() { this.tableChange.emit({ @@ -89,9 +90,9 @@ export class InboxTableComponent implements OnDestroy { }); } - onRowClick(event: Event) { - if (event.currentTarget instanceof HTMLElement) { - console.log(event.currentTarget.querySelector<HTMLElement>('td > a')!.click()); + async onRowClick(link: string) { + if (link) { + await this.router.navigateByUrl(link); } } } From 2cea7012e06df416359bdba744e5dc6d9e92f889 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Fri, 15 Dec 2023 14:06:47 -0800 Subject: [PATCH 786/954] Refresh Application when Owners are Deleted * If deleting an owner that is the primary contact, we need to refresh the whole application. --- .../parcel-details.component.html | 1 + .../parcel-details.component.ts | 10 ++- .../parcel-entry/parcel-entry.component.html | 71 ++++++++++--------- .../parcel-entry/parcel-entry.component.ts | 30 ++++---- .../parcels/parcel-details.component.html | 1 + .../parcels/parcel-details.component.ts | 12 +++- .../parcel-entry/parcel-entry.component.html | 17 ++--- .../parcel-entry/parcel-entry.component.ts | 22 +++--- .../owner-dialog/owner-dialog.component.ts | 36 ++++++---- .../all-owners-dialog.component.html | 19 ----- .../all-owners-dialog.component.scss | 0 .../all-owners-dialog.component.spec.ts | 39 ---------- .../all-owners-dialog.component.ts | 47 ------------ .../parcel-owners.component.html | 5 +- .../parcel-owners/parcel-owners.component.ts | 24 +++---- .../src/app/shared/shared.module.ts | 3 - services/README.md | 3 +- .../application-owner.service.ts | 6 +- 18 files changed, 135 insertions(+), 211 deletions(-) delete mode 100644 portal-frontend/src/app/shared/owner-dialogs/owners-dialog/all-owners-dialog.component.html delete mode 100644 portal-frontend/src/app/shared/owner-dialogs/owners-dialog/all-owners-dialog.component.scss delete mode 100644 portal-frontend/src/app/shared/owner-dialogs/owners-dialog/all-owners-dialog.component.spec.ts delete mode 100644 portal-frontend/src/app/shared/owner-dialogs/owners-dialog/all-owners-dialog.component.ts diff --git a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-details.component.html b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-details.component.html index 7b67d257ae..e98529424c 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-details.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-details.component.html @@ -31,6 +31,7 @@ <h6>Documents needed for this step:</h6> [showErrors]="showErrors" (onFormGroupChange)="onParcelFormChange($event)" (onOwnersUpdated)="onOwnersUpdated()" + (onOwnersDeleted)="reloadApplication()" ></app-parcel-entry> <div> diff --git a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-details.component.ts b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-details.component.ts index 68f8b0784b..69d90d3cfb 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-details.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-details.component.ts @@ -1,4 +1,4 @@ -import { AfterViewInit, Component, EventEmitter, OnInit, Output } from '@angular/core'; +import { AfterViewInit, Component, EventEmitter, OnInit, Output, signal } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; import { Router } from '@angular/router'; import { BehaviorSubject, takeUntil } from 'rxjs'; @@ -9,6 +9,7 @@ import { ApplicationParcelUpdateDto, } from '../../../../services/application-parcel/application-parcel.dto'; import { ApplicationParcelService } from '../../../../services/application-parcel/application-parcel.service'; +import { ApplicationSubmissionService } from '../../../../services/application-submission/application-submission.service'; import { ToastService } from '../../../../services/toast/toast.service'; import { OWNER_TYPE } from '../../../../shared/dto/owner.dto'; import { parseStringToBoolean } from '../../../../shared/utils/string-helper'; @@ -35,6 +36,7 @@ export class ParcelDetailsComponent extends StepComponent implements OnInit, Aft constructor( private router: Router, + private applicationSubmissionService: ApplicationSubmissionService, private applicationParcelService: ApplicationParcelService, private applicationOwnerService: ApplicationOwnerService, private toastService: ToastService, @@ -168,8 +170,12 @@ export class ParcelDetailsComponent extends StepComponent implements OnInit, Aft } } - expandedParcel: string = ''; + async reloadApplication() { + const updatedApp = await this.applicationSubmissionService.getByUuid(this.submissionUuid); + this.$applicationSubmission.next(updatedApp); + } + expandedParcel: string = ''; openParcel(index: string) { this.expandedParcel = index; } diff --git a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html index f0fcc580ba..fb0965241a 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html @@ -2,7 +2,8 @@ <div class="type"> <mat-label for="parcelType">Select parcel type:</mat-label> <div class="warning"> - Fee simple includes privately-owned parcels and parcels within First Nation treaty lands. Crown land includes crown leases. + Fee simple includes privately-owned parcels and parcels within First Nation treaty lands. Crown land includes + crown leases. </div> <mat-button-toggle-group class="input" @@ -40,7 +41,14 @@ </mat-select> </mat-form-field> <mat-form-field class="lookup-input" appearance="outline"> - <input id="lookup-pid" matInput [placeholder]="pidPinPlaceholder" maxlength="11" mask="000-000-000" formControlName="pidPin" /> + <input + id="lookup-pid" + matInput + [placeholder]="pidPinPlaceholder" + maxlength="11" + mask="000-000-000" + formControlName="pidPin" + /> </mat-form-field> <button class="lookup-search-button" @@ -152,7 +160,13 @@ <mat-label for="isFarm">Farm Classification</mat-label> <div class="subtext"> As determined by - <a class="subtext" href="https://info.bcassessment.ca/Services-products/property-classes-and-exemptions/farm-land-assessment/about-farm-land-assessment" target="_blank" rel="noreferrer">BC Assessment</a> + <a + class="subtext" + href="https://info.bcassessment.ca/Services-products/property-classes-and-exemptions/farm-land-assessment/about-farm-land-assessment" + target="_blank" + rel="noreferrer" + >BC Assessment</a + > </div> <mat-button-toggle-group class="input" id="isFarm" formControlName="isFarm"> <mat-button-toggle @@ -222,7 +236,8 @@ <h6 *ngIf="isCrownLand">Government Parcel Contact</h6> [parcelUuid]="parcel.uuid" [owners]="parcel.owners" (onOwnersUpdated)="onOwnersUpdated.emit()" - (onOwnerRemoved)="onOwnerRemoved($event)" + (onOwnerRemoved)="onRemoveOwner($event)" + (onOwnersDeleted)="onDeleteOwner()" [documentService]="applicationDocumentService" [ownerService]="applicationOwnerService" [disabled]="_disabled" @@ -253,15 +268,8 @@ <h6 class="owner-search-option">OR</h6> [formControl]="ownerInput" /> <mat-autocomplete #auto="matAutocomplete"> - <mat-option - (click)="onSelectOwner($event, option, option.isSelected)" - *ngFor="let option of filteredOwners" - > - <mat-checkbox - class="owner-checkbox" - [checked]="option.isSelected" - color="primary" - > + <mat-option (click)="onSelectOwner($event, option, option.isSelected)" *ngFor="let option of filteredOwners"> + <mat-checkbox class="owner-checkbox" [checked]="option.isSelected" color="primary"> <div class="owner-option"> <div>{{ option.displayName }}</div> </div> @@ -296,10 +304,7 @@ <h6 class="owner-search-option">OR</h6> <h6 class="owner-search-option" *ngIf="filteredOwners.length">OR</h6> <label for="owner-search" *ngIf="filteredOwners.length">Select from Existing Government</label> <div> - <mat-radio-group - color="primary" - [value]="selectedOwner?.uuid" required - > + <mat-radio-group color="primary" [value]="selectedOwner?.uuid" required> <mat-radio-button *ngFor="let owner of filteredOwners" [value]="owner.uuid" @@ -307,38 +312,40 @@ <h6 class="owner-search-option" *ngIf="filteredOwners.length">OR</h6> (click)="onCrownOwnerSelected($event, owner, owner.isSelected)" required > - {{ owner.firstName + ' ' + owner.lastName }} + {{ owner.firstName + ' ' + owner.lastName }} </mat-radio-button> </mat-radio-group> <div class="warning-banner" *ngIf="selectedOwner"> <div class="owner-details"> - <div class="row"> - <div class="key"><strong>First Name:</strong> </div> + <div class="row"> + <div class="key"><strong>First Name:</strong></div> <div class="value">{{ selectedOwner.firstName }}</div> </div> - <div class="row"> - <div class="key"><strong>Last Name:</strong> </div> + <div class="row"> + <div class="key"><strong>Last Name:</strong></div> <div class="value">{{ selectedOwner.lastName }}</div> </div> - <div class="row"> - <div class="key"><strong>Ministry/ Department:</strong> </div> + <div class="row"> + <div class="key"><strong>Ministry/ Department:</strong></div> <div class="value">{{ selectedOwner.organizationName }}</div> </div> - <div class="row"> - <div class="key"><strong>Phone Number:</strong> </div> + <div class="row"> + <div class="key"><strong>Phone Number:</strong></div> <div class="value">{{ selectedOwner.phoneNumber }}</div> </div> - <div class="row"> - <div class="key"><strong>Email:</strong> </div> + <div class="row"> + <div class="key"><strong>Email:</strong></div> <div class="value">{{ selectedOwner.email }}</div> </div> - <div class="row"> - <div class="key"><strong>Crown Type:</strong> </div> + <div class="row"> + <div class="key"><strong>Crown Type:</strong></div> <div class="value">{{ selectedOwner.crownLandOwnerType }}</div> </div> - <div class="row"> - <button [disabled]="_disabled" (click)="onEdit(selectedOwner)" mat-stroked-button>Edit information</button> + <div class="row"> + <button [disabled]="_disabled" (click)="onEditCrownOwner(selectedOwner)" mat-stroked-button> + Edit information + </button> </div> </div> </div> diff --git a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts index 8ed80ecd53..a16e64d839 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts @@ -14,14 +14,12 @@ import { import { ApplicationParcelService } from '../../../../../services/application-parcel/application-parcel.service'; import { ParcelService } from '../../../../../services/parcel/parcel.service'; import { ToastService } from '../../../../../services/toast/toast.service'; -import { DOCUMENT_TYPE } from '../../../../../shared/dto/document.dto'; import { OWNER_TYPE } from '../../../../../shared/dto/owner.dto'; import { FileHandle } from '../../../../../shared/file-drag-drop/drag-drop.directive'; -import { formatBooleanToString } from '../../../../../shared/utils/boolean-helper'; -import { RemoveFileConfirmationDialogComponent } from '../../../alcs-edit-submission/remove-file-confirmation-dialog/remove-file-confirmation-dialog.component'; import { CrownOwnerDialogComponent } from '../../../../../shared/owner-dialogs/crown-owner-dialog/crown-owner-dialog.component'; import { OwnerDialogComponent } from '../../../../../shared/owner-dialogs/owner-dialog/owner-dialog.component'; -import { AllOwnersDialogComponent } from '../../../../../shared/owner-dialogs/owners-dialog/all-owners-dialog.component'; +import { formatBooleanToString } from '../../../../../shared/utils/boolean-helper'; +import { RemoveFileConfirmationDialogComponent } from '../../../alcs-edit-submission/remove-file-confirmation-dialog/remove-file-confirmation-dialog.component'; import { ParcelEntryConfirmationDialogComponent } from './parcel-entry-confirmation-dialog/parcel-entry-confirmation-dialog.component'; export interface ParcelEntryFormData { @@ -69,6 +67,7 @@ export class ParcelEntryComponent implements OnInit { @Output() private onFormGroupChange = new EventEmitter<Partial<ParcelEntryFormData>>(); @Output() private onSaveProgress = new EventEmitter<void>(); @Output() onOwnersUpdated = new EventEmitter<void>(); + @Output() onOwnersDeleted = new EventEmitter<void>(); owners: ApplicationOwnerDto[] = []; filteredOwners: (ApplicationOwnerDto & { isSelected: boolean })[] = []; @@ -125,9 +124,10 @@ export class ParcelEntryComponent implements OnInit { this.$owners.subscribe((owners) => { this.owners = owners; this.filteredOwners = this.mapOwners(owners); - const selectedOwner = this.parcel.owners.length > 0 - ? this.filteredOwners.find((owner) => owner.uuid === this.parcel.owners[0].uuid) - : undefined; + const selectedOwner = + this.parcel.owners.length > 0 + ? this.filteredOwners.find((owner) => owner.uuid === this.parcel.owners[0].uuid) + : undefined; this.selectedOwner = selectedOwner; this.parcel.owners = this.parcel.owners @@ -346,17 +346,17 @@ export class ParcelEntryComponent implements OnInit { this.updateParcelOwners(selectedOwners); } } else { - this.onOwnerRemoved(owner.uuid); + await this.onRemoveOwner(owner.uuid); } } - async onCrownOwnerSelected(event: Event, owner: ApplicationOwnerDto, isSelected: boolean) { + async onCrownOwnerSelected(event: Event, owner: ApplicationOwnerDto, isSelected: boolean) { this.selectedOwner = owner; const selectedOwners = [owner]; this.updateParcelOwners(selectedOwners); } - onEdit(owner: ApplicationOwnerDto) { + onEditCrownOwner(owner: ApplicationOwnerDto) { let dialog; dialog = this.dialog.open(CrownOwnerDialogComponent, { data: { @@ -370,18 +370,22 @@ export class ParcelEntryComponent implements OnInit { dialog.afterClosed().subscribe((result) => { if (result) { this.onOwnersUpdated.emit(); - if(result.type === 'delete') { - this.onOwnerRemoved(result.uuid) + if (result.type === 'delete') { + this.onRemoveOwner(result.uuid); } } }); } - async onOwnerRemoved(uuid: string) { + async onRemoveOwner(uuid: string) { const updatedArray = this.parcel.owners.filter((existingOwner) => existingOwner.uuid !== uuid); this.updateParcelOwners(updatedArray); } + async onDeleteOwner() { + this.onOwnersDeleted.emit(); + } + mapOwners(owners: ApplicationOwnerDto[]) { return owners .filter((owner) => { diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-details.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-details.component.html index d608ed2639..d1d5696e26 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-details.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-details.component.html @@ -31,6 +31,7 @@ <h6>Documents needed for this step:</h6> [showErrors]="showErrors" (onFormGroupChange)="onParcelFormChange($event)" (onOwnersUpdated)="onOwnersUpdated()" + (onOwnersDeleted)="reloadSubmission()" ></app-noi-parcel-entry> <div> diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-details.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-details.component.ts index f15dddc8bb..665439de02 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-details.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-details.component.ts @@ -1,4 +1,4 @@ -import { AfterViewInit, Component, EventEmitter, OnInit, Output } from '@angular/core'; +import { AfterViewInit, Component, EventEmitter, OnInit, Output, signal } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; import { Router } from '@angular/router'; import { BehaviorSubject, takeUntil } from 'rxjs'; @@ -9,6 +9,7 @@ import { NoticeOfIntentParcelUpdateDto, } from '../../../../services/notice-of-intent-parcel/notice-of-intent-parcel.dto'; import { NoticeOfIntentParcelService } from '../../../../services/notice-of-intent-parcel/notice-of-intent-parcel.service'; +import { NoticeOfIntentSubmissionService } from '../../../../services/notice-of-intent-submission/notice-of-intent-submission.service'; import { ToastService } from '../../../../services/toast/toast.service'; import { OWNER_TYPE } from '../../../../shared/dto/owner.dto'; import { parseStringToBoolean } from '../../../../shared/utils/string-helper'; @@ -34,7 +35,7 @@ export class ParcelDetailsComponent extends StepComponent implements OnInit, Aft isDirty = false; constructor( - private router: Router, + private noiSubmissionService: NoticeOfIntentSubmissionService, private noiParcelService: NoticeOfIntentParcelService, private noticeOfIntentOwnerService: NoticeOfIntentOwnerService, private toastService: ToastService, @@ -152,7 +153,7 @@ export class ParcelDetailsComponent extends StepComponent implements OnInit, Aft .beforeClosed() .subscribe((result) => { if (result) { - this.parcels = this.parcels.filter(parcel => parcel.uuid !== parcelUuid); + this.parcels = this.parcels.filter((parcel) => parcel.uuid !== parcelUuid); } }); } @@ -167,6 +168,11 @@ export class ParcelDetailsComponent extends StepComponent implements OnInit, Aft } } + async reloadSubmission() { + const updatedNoi = await this.noiSubmissionService.getByUuid(this.submissionUuid); + this.$noiSubmission.next(updatedNoi); + } + expandedParcel: string = ''; openParcel(index: string) { diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.html index 883a6139b6..d89b3b817b 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.html @@ -227,6 +227,7 @@ <h6 *ngIf="isCrownLand">Government Parcel Contact</h6> [owners]="parcel.owners" (onOwnersUpdated)="onOwnersUpdated.emit()" (onOwnerRemoved)="onOwnerRemoved($event)" + (onOwnersDeleted)="onDeleteOwner()" [ownerService]="noticeOfIntentOwnerService" [documentService]="noticeOfIntentDocumentService" [disabled]="_disabled" @@ -316,32 +317,32 @@ <h6 class="owner-search-option" *ngIf="filteredOwners.length">OR</h6> <div class="warning-banner" *ngIf="selectedOwner"> <div class="owner-details"> - <div class="row"> + <div class="row"> <div class="key"><strong>First Name:</strong> </div> <div class="value">{{ selectedOwner.firstName }}</div> </div> - <div class="row"> + <div class="row"> <div class="key"><strong>Last Name:</strong> </div> <div class="value">{{ selectedOwner.lastName }}</div> </div> - <div class="row"> + <div class="row"> <div class="key"><strong>Ministry/ Department:</strong> </div> <div class="value">{{ selectedOwner.organizationName }}</div> </div> - <div class="row"> + <div class="row"> <div class="key"><strong>Phone Number:</strong> </div> <div class="value">{{ selectedOwner.phoneNumber }}</div> </div> - <div class="row"> + <div class="row"> <div class="key"><strong>Email:</strong> </div> <div class="value">{{ selectedOwner.email }}</div> </div> - <div class="row"> + <div class="row"> <div class="key"><strong>Crown Type:</strong> </div> <div class="value">{{ selectedOwner.crownLandOwnerType }}</div> </div> - <div class="row"> - <button [disabled]="_disabled" (click)="onEdit(selectedOwner)" mat-stroked-button>Edit information</button> + <div class="row"> + <button [disabled]="_disabled" (click)="onEditCrownOwner(selectedOwner)" mat-stroked-button>Edit information</button> </div> </div> </div> diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.ts index ab1c73a0cb..da14cb4dec 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.ts @@ -63,6 +63,7 @@ export class ParcelEntryComponent implements OnInit { @Output() private onFormGroupChange = new EventEmitter<Partial<ParcelEntryFormData>>(); @Output() private onSaveProgress = new EventEmitter<void>(); @Output() onOwnersUpdated = new EventEmitter<void>(); + @Output() onOwnersDeleted = new EventEmitter<void>(); owners: NoticeOfIntentOwnerDto[] = []; filteredOwners: (NoticeOfIntentOwnerDto & { isSelected: boolean })[] = []; @@ -120,9 +121,10 @@ export class ParcelEntryComponent implements OnInit { this.$owners.subscribe((owners) => { this.owners = owners; this.filteredOwners = this.mapOwners(owners); - const selectedOwner = this.parcel.owners.length > 0 - ? this.filteredOwners.find((owner) => owner.uuid === this.parcel.owners[0].uuid) - : undefined; + const selectedOwner = + this.parcel.owners.length > 0 + ? this.filteredOwners.find((owner) => owner.uuid === this.parcel.owners[0].uuid) + : undefined; this.selectedOwner = selectedOwner; this.parcel.owners = this.parcel.owners.map((owner) => { @@ -333,13 +335,13 @@ export class ParcelEntryComponent implements OnInit { }); } - async onCrownOwnerSelected(event: Event, owner: NoticeOfIntentOwnerDto, isSelected: boolean) { + async onCrownOwnerSelected(event: Event, owner: NoticeOfIntentOwnerDto, isSelected: boolean) { this.selectedOwner = owner; const selectedOwners = [owner]; this.updateParcelOwners(selectedOwners); } - onEdit(owner: NoticeOfIntentOwnerDto) { + onEditCrownOwner(owner: NoticeOfIntentOwnerDto) { let dialog; dialog = this.dialog.open(CrownOwnerDialogComponent, { data: { @@ -352,8 +354,8 @@ export class ParcelEntryComponent implements OnInit { }); dialog.afterClosed().subscribe((result) => { if (result) { - if(result.type === 'delete') { - this.onOwnerRemoved(result.uuid) + if (result.type === 'delete') { + this.onOwnersDeleted.emit(); } this.onOwnersUpdated.emit(); } @@ -361,7 +363,7 @@ export class ParcelEntryComponent implements OnInit { } private isOwnerInParcel(owner: NoticeOfIntentOwnerDto): boolean { - return this.parcel.owners.some(existingOwner => existingOwner.uuid === owner.uuid); + return this.parcel.owners.some((existingOwner) => existingOwner.uuid === owner.uuid); } async onSelectOwner(event: Event, owner: NoticeOfIntentOwnerDto, isSelected: boolean) { @@ -380,6 +382,10 @@ export class ParcelEntryComponent implements OnInit { this.updateParcelOwners(updatedArray); } + async onDeleteOwner() { + this.onOwnersDeleted.emit(); + } + mapOwners(owners: NoticeOfIntentOwnerDto[]) { return owners .filter((owner) => { diff --git a/portal-frontend/src/app/shared/owner-dialogs/owner-dialog/owner-dialog.component.ts b/portal-frontend/src/app/shared/owner-dialogs/owner-dialog/owner-dialog.component.ts index 5bd056da43..9f93aac2e1 100644 --- a/portal-frontend/src/app/shared/owner-dialogs/owner-dialog/owner-dialog.component.ts +++ b/portal-frontend/src/app/shared/owner-dialogs/owner-dialog/owner-dialog.component.ts @@ -39,7 +39,7 @@ export class OwnerDialogComponent { showVirusError = false; existingUuid: string | undefined; files: ApplicationDocumentDto[] = []; - showFileErrors = false + showFileErrors = false; form = new FormGroup({ type: this.type, @@ -128,10 +128,13 @@ export class OwnerDialogComponent { }; const res = await this.data.ownerService.create(createDto); - this.dialogRef.close(res); + this.dialogRef.close({ + ...res, + action: 'create', + }); } else { - this.form.markAllAsTouched() - this.showFileErrors = true + this.form.markAllAsTouched(); + this.showFileErrors = true; } } @@ -141,15 +144,17 @@ export class OwnerDialogComponent { async onDelete() { this.confDialogService - .openDialog({ - body: `This action will remove ${this.firstName.value} ${this.lastName.value} and its usage from the entire application. Are you sure you want to remove this owner? `, - }) - .subscribe(async (didConfirm) => { - if (didConfirm) { - const res = await this.data.ownerService.delete(this.existingUuid ?? ''); - this.dialogRef.close(res); - } - }); + .openDialog({ + body: `This action will remove ${this.firstName.value} ${this.lastName.value} and its usage from the entire application. Are you sure you want to remove this owner? `, + }) + .subscribe(async (didConfirm) => { + if (didConfirm) { + const res = await this.data.ownerService.delete(this.existingUuid ?? ''); + this.dialogRef.close({ + action: 'delete', + }); + } + }); } async onSave() { @@ -166,7 +171,10 @@ export class OwnerDialogComponent { }; if (this.existingUuid) { const res = await this.data.ownerService.update(this.existingUuid, updateDto); - this.dialogRef.close(res); + this.dialogRef.close({ + ...res, + action: 'edit', + }); } } else { this.form.markAllAsTouched(); diff --git a/portal-frontend/src/app/shared/owner-dialogs/owners-dialog/all-owners-dialog.component.html b/portal-frontend/src/app/shared/owner-dialogs/owners-dialog/all-owners-dialog.component.html deleted file mode 100644 index 261a10027b..0000000000 --- a/portal-frontend/src/app/shared/owner-dialogs/owners-dialog/all-owners-dialog.component.html +++ /dev/null @@ -1,19 +0,0 @@ -<div mat-dialog-title> - <h2>All Owners</h2> -</div> -<div mat-dialog-content> - <div> - <app-parcel-owners - (onOwnersUpdated)="onUpdated()" - [submissionUuid]="submissionUuid" - [owners]="owners" - [fileId]="fileId" - [isShowAllOwners]="true" - [documentService]="data.documentService" - [ownerService]="data.ownerService" - ></app-parcel-owners> - </div> -</div> -<div mat-dialog-actions> - <button mat-stroked-button [mat-dialog-close]="this.isDirty">Close</button> -</div> diff --git a/portal-frontend/src/app/shared/owner-dialogs/owners-dialog/all-owners-dialog.component.scss b/portal-frontend/src/app/shared/owner-dialogs/owners-dialog/all-owners-dialog.component.scss deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/portal-frontend/src/app/shared/owner-dialogs/owners-dialog/all-owners-dialog.component.spec.ts b/portal-frontend/src/app/shared/owner-dialogs/owners-dialog/all-owners-dialog.component.spec.ts deleted file mode 100644 index 3dc13aead7..0000000000 --- a/portal-frontend/src/app/shared/owner-dialogs/owners-dialog/all-owners-dialog.component.spec.ts +++ /dev/null @@ -1,39 +0,0 @@ -import { NO_ERRORS_SCHEMA } from '@angular/core'; -import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { MAT_DIALOG_DATA } from '@angular/material/dialog'; -import { createMock, DeepMocked } from '@golevelup/ts-jest'; -import { ApplicationOwnerService } from '../../../services/application-owner/application-owner.service'; -import { AllOwnersDialogComponent } from './all-owners-dialog.component'; - -describe('ApplicationOwnersDialogComponent', () => { - let component: AllOwnersDialogComponent; - let fixture: ComponentFixture<AllOwnersDialogComponent>; - let mockAppOwnerService: DeepMocked<ApplicationOwnerService>; - - beforeEach(async () => { - mockAppOwnerService = createMock(); - - await TestBed.configureTestingModule({ - providers: [ - { - provide: ApplicationOwnerService, - useValue: mockAppOwnerService, - }, - { - provide: MAT_DIALOG_DATA, - useValue: {}, - }, - ], - declarations: [AllOwnersDialogComponent], - schemas: [NO_ERRORS_SCHEMA], - }).compileComponents(); - - fixture = TestBed.createComponent(AllOwnersDialogComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/portal-frontend/src/app/shared/owner-dialogs/owners-dialog/all-owners-dialog.component.ts b/portal-frontend/src/app/shared/owner-dialogs/owners-dialog/all-owners-dialog.component.ts deleted file mode 100644 index 445d22530c..0000000000 --- a/portal-frontend/src/app/shared/owner-dialogs/owners-dialog/all-owners-dialog.component.ts +++ /dev/null @@ -1,47 +0,0 @@ -import { Component, Inject } from '@angular/core'; -import { MAT_DIALOG_DATA } from '@angular/material/dialog'; -import { ApplicationDocumentService } from '../../../services/application-document/application-document.service'; -import { ApplicationOwnerDto } from '../../../services/application-owner/application-owner.dto'; -import { ApplicationOwnerService } from '../../../services/application-owner/application-owner.service'; -import { NoticeOfIntentDocumentService } from '../../../services/notice-of-intent-document/notice-of-intent-document.service'; -import { NoticeOfIntentOwnerDto } from '../../../services/notice-of-intent-owner/notice-of-intent-owner.dto'; -import { NoticeOfIntentOwnerService } from '../../../services/notice-of-intent-owner/notice-of-intent-owner.service'; -import { OWNER_TYPE } from '../../dto/owner.dto'; - -@Component({ - selector: 'app-all-owners-dialog', - templateUrl: './all-owners-dialog.component.html', - styleUrls: ['./all-owners-dialog.component.scss'], -}) -export class AllOwnersDialogComponent { - isDirty = false; - owners: ApplicationOwnerDto[] | NoticeOfIntentOwnerDto[] = []; - fileId: string; - submissionUuid: string; - - constructor( - @Inject(MAT_DIALOG_DATA) - public data: { - owners: ApplicationOwnerDto[] | NoticeOfIntentOwnerDto[]; - fileId: string; - submissionUuid: string; - ownerService: ApplicationOwnerService | NoticeOfIntentOwnerService; - documentService: ApplicationDocumentService | NoticeOfIntentDocumentService; - } - ) { - this.fileId = data.fileId; - this.submissionUuid = data.submissionUuid; - this.owners = data.owners; - } - - async onUpdated() { - const updatedOwners = await this.data.ownerService.fetchBySubmissionId(this.submissionUuid); - if (updatedOwners) { - // @ts-ignore Bug with Typescript https://github.com/microsoft/TypeScript/issues/44373 - this.owners = updatedOwners.filter( - (owner: { type: { code: OWNER_TYPE } }) => ![OWNER_TYPE.AGENT, OWNER_TYPE.GOVERNMENT].includes(owner.type.code) - ); - this.isDirty = true; - } - } -} diff --git a/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.html b/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.html index 75d53437ed..5c0205f462 100644 --- a/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.html +++ b/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.html @@ -44,7 +44,7 @@ }}</a> <div class="no-data" *ngIf="!element.corporateSummary"> <div class="no-data-text">Not Applicable</div> - </div> + </div> </div> </td> </ng-container> @@ -62,9 +62,6 @@ > Remove </button> - <button [disabled]="_disabled" *ngIf="!parcelUuid" (click)="onDelete(element)" mat-stroked-button color="warn"> - Delete - </button> </td> </ng-container> diff --git a/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.ts b/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.ts index ef33bdf6b5..883fcd8e08 100644 --- a/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.ts +++ b/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.ts @@ -21,7 +21,8 @@ import { OwnerDialogComponent } from '../owner-dialog/owner-dialog.component'; export class ParcelOwnersComponent { @Output() onOwnersUpdated = new EventEmitter<void>(); @Output() onOwnerRemoved = new EventEmitter<string>(); - + @Output() onOwnersDeleted = new EventEmitter<string>(); + PARCEL_OWNERSHIP_TYPES = PARCEL_OWNERSHIP_TYPE; @Input() ownerService!: ApplicationOwnerService | NoticeOfIntentOwnerService; @@ -61,7 +62,7 @@ export class ParcelOwnersComponent { displayedColumns = ['displayName', 'organizationName', 'phone', 'email', 'corporateSummary', 'actions']; constructor( - private dialog: MatDialog, + private dialog: MatDialog, private confDialogService: ConfirmationDialogService, private applicationDocumentService: ApplicationDocumentService ) {} @@ -93,7 +94,11 @@ export class ParcelOwnersComponent { } dialog.afterClosed().subscribe((result) => { if (result) { - this.onOwnersUpdated.emit(); + if (result.action === 'delete') { + this.onOwnersDeleted.emit(); + } else { + this.onOwnersUpdated.emit(); + } } }); } @@ -108,17 +113,4 @@ export class ParcelOwnersComponent { window.open(res.url, '_blank'); } } - - async onDelete(owner: ApplicationOwnerDto | NoticeOfIntentOwnerDto) { - this.confDialogService - .openDialog({ - body: `This action will remove ${owner.displayName} and its usage from the entire application. Are you sure you want to remove this owner? `, - }) - .subscribe(async (didConfirm) => { - if (didConfirm) { - await this.ownerService.delete(owner.uuid); - this.onOwnersUpdated.emit(); - } - }); - } } diff --git a/portal-frontend/src/app/shared/shared.module.ts b/portal-frontend/src/app/shared/shared.module.ts index 5f1ae97bf5..38e87a5d6d 100644 --- a/portal-frontend/src/app/shared/shared.module.ts +++ b/portal-frontend/src/app/shared/shared.module.ts @@ -36,7 +36,6 @@ import { NoDataComponent } from './no-data/no-data.component'; import { FileOverlaySpinnerComponent } from './overlay-spinner/file-overlay-spinner/file-overlay-spinner.component'; import { CrownOwnerDialogComponent } from './owner-dialogs/crown-owner-dialog/crown-owner-dialog.component'; import { OwnerDialogComponent } from './owner-dialogs/owner-dialog/owner-dialog.component'; -import { AllOwnersDialogComponent } from './owner-dialogs/owners-dialog/all-owners-dialog.component'; import { ParcelOwnersComponent } from './owner-dialogs/parcel-owners/parcel-owners.component'; import { EmailValidPipe } from './pipes/emailValid.pipe'; import { FileSizePipe } from './pipes/fileSize.pipe'; @@ -95,7 +94,6 @@ import { WarningBannerComponent } from './warning-banner/warning-banner.componen PrescribedBodyComponent, OwnerDialogComponent, CrownOwnerDialogComponent, - AllOwnersDialogComponent, ParcelOwnersComponent, SoilTableComponent, TableColumnNoDataPipe, @@ -144,7 +142,6 @@ import { WarningBannerComponent } from './warning-banner/warning-banner.componen PrescribedBodyComponent, OwnerDialogComponent, CrownOwnerDialogComponent, - AllOwnersDialogComponent, ParcelOwnersComponent, SoilTableComponent, TableColumnNoDataPipe, diff --git a/services/README.md b/services/README.md index 9818aad3fb..ac8c21f044 100644 --- a/services/README.md +++ b/services/README.md @@ -88,11 +88,12 @@ TS implementation of \*.proto files can be provided manually or generated using ### Backup - Install & add open shift to path - Login to with token from silver cluster +- Set preferred project ```oc project NAMESPACE``` - Forward port, usually 5432 ```bash oc port-forward service/alcs-patroni 5432:5432 ``` -- Add new connection to app with preffered DB tool (DBeaver, TablePlus) +- Add new connection to app with preferred DB tool (DBeaver, TablePlus) - Backup DB & save dump file. ensure postgresql 12.x is selected - Stop port forwarding diff --git a/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.service.ts b/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.service.ts index 0029821998..127ff70a5d 100644 --- a/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.service.ts +++ b/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.service.ts @@ -177,8 +177,10 @@ export class ApplicationOwnerService { existingOwner.email = updateDto.email !== undefined ? updateDto.email : existingOwner.email; - existingOwner.crownLandOwnerType = - updateDto.crownLandOwnerType !== undefined ? updateDto.crownLandOwnerType : existingOwner.crownLandOwnerType; + existingOwner.crownLandOwnerType = + updateDto.crownLandOwnerType !== undefined + ? updateDto.crownLandOwnerType + : existingOwner.crownLandOwnerType; const result = await this.repository.save(existingOwner); From 6df6aa1b178c854ff484910e977d658e5f3cb01b Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Fri, 15 Dec 2023 14:11:09 -0800 Subject: [PATCH 787/954] Show file number for apps without a link --- .../features/home/inbox/inbox-table/inbox-table.component.html | 1 + 1 file changed, 1 insertion(+) diff --git a/portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.html b/portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.html index b846113803..4ba5311898 100644 --- a/portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.html +++ b/portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.html @@ -20,6 +20,7 @@ <th mat-header-cell *matHeaderCellDef>{{ type }} ID</th> <td mat-cell *matCellDef="let row"> <a [routerLink]="row.routerLink" *ngIf="row.routerLink">{{ row.fileNumber }}</a> + <span *ngIf="!row.routerLink">{{ row.fileNumber }}</span> </td> </ng-container> From 4e36becc7ed4127c44feee67ea2552790b682388 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Fri, 15 Dec 2023 14:56:35 -0800 Subject: [PATCH 788/954] Update L/FNG Review Form Labels --- .../lfng-info/lfng-info.component.html | 4 ++-- .../authentication/authentication.service.ts | 11 ++++++---- .../review-contact-information.component.html | 3 +-- .../review-contact-information.component.ts | 2 ++ .../review-resolution.component.html | 13 ++++++------ .../review-resolution.component.ts | 5 ++++- .../review-submission.component.scss | 8 +++++--- .../review-submit-fng.component.html | 12 +++++------ .../review-submit.component.html | 19 ++++++++++-------- .../review-submit.component.spec.ts | 11 ++-------- .../review-submit/review-submit.component.ts | 18 ++--------------- .../lfng-review/lfng-review.component.html | 4 ++-- .../lfng-review/lfng-review.component.html | 4 ++-- .../application-submission-review.dto.ts | 1 + portal-frontend/src/styles/form-controls.scss | 9 +++++++++ .../application-submission-review.dto.ts | 1 + .../application-submission-review.service.ts | 1 + .../generate-review-document.service.ts | 4 ++-- .../pdf/submission-fng-review-template.docx | Bin 28832 -> 28839 bytes .../pdf/submission-lg-review-template.docx | Bin 29163 -> 29165 bytes 20 files changed, 66 insertions(+), 64 deletions(-) diff --git a/alcs-frontend/src/app/features/application/lfng-info/lfng-info.component.html b/alcs-frontend/src/app/features/application/lfng-info/lfng-info.component.html index dab29f62da..5a8b22094b 100644 --- a/alcs-frontend/src/app/features/application/lfng-info/lfng-info.component.html +++ b/alcs-frontend/src/app/features/application/lfng-info/lfng-info.component.html @@ -185,9 +185,9 @@ <h4>Resolution</h4> </div> <div class="full-row" *ngIf="hasCompletedStepsBeforeResolution"> - <div class="subheading2">Resolution for Application to Proceed to the ALC</div> + <div class="subheading2">What is the outcome of the Board/Council resolution?</div> <div *ngIf="applicationReview.isAuthorized !== null"> - {{ applicationReview.isAuthorized ? 'Authorized' : 'Refused to Authorize' }} + {{ applicationReview.isAuthorized ? 'Forward for ALC decision' : 'Refuse to forward to ALC' }} </div> <app-no-data *ngIf="applicationReview.isAuthorized === null"></app-no-data> </div> diff --git a/alcs-frontend/src/app/services/authentication/authentication.service.ts b/alcs-frontend/src/app/services/authentication/authentication.service.ts index d36793e0d7..267467cf11 100644 --- a/alcs-frontend/src/app/services/authentication/authentication.service.ts +++ b/alcs-frontend/src/app/services/authentication/authentication.service.ts @@ -39,7 +39,10 @@ export class AuthenticationService { $currentUser = new BehaviorSubject<ICurrentUser | undefined>(undefined); currentUser: ICurrentUser | undefined; - constructor(private http: HttpClient, private router: Router) {} + constructor( + private http: HttpClient, + private router: Router, + ) {} async setTokens(token: string, refreshToken: string) { this.token = token; @@ -80,7 +83,7 @@ export class AuthenticationService { async refreshTokens() { if (this.refreshToken) { - if (this.refreshExpires && this.refreshExpires < Date.now()) { + if (this.expires && this.expires < Date.now()) { await this.router.navigateByUrl('/login'); return; } @@ -116,7 +119,7 @@ export class AuthenticationService { headers: { Authorization: `Bearer ${token}`, }, - }) + }), ); return true; } catch (e) { @@ -137,7 +140,7 @@ export class AuthenticationService { this.http.get<{ refresh_token: string; token: string; - }>(`${environment.authUrl}/authorize/refresh?r=${refreshToken}`) + }>(`${environment.authUrl}/authorize/refresh?r=${refreshToken}`), ); return res; } diff --git a/portal-frontend/src/app/features/applications/review-submission/review-contact-information/review-contact-information.component.html b/portal-frontend/src/app/features/applications/review-submission/review-contact-information/review-contact-information.component.html index 8ac1ae5b32..c679102c18 100644 --- a/portal-frontend/src/app/features/applications/review-submission/review-contact-information/review-contact-information.component.html +++ b/portal-frontend/src/app/features/applications/review-submission/review-contact-information/review-contact-information.component.html @@ -2,8 +2,7 @@ <h2>Contact Information</h2> <div> <div class="description"> - <div *ngIf="isFirstNationGovernment">Provide contact information for First Nation government staff</div> - <div *ngIf="!isFirstNationGovernment">Provide contact information for Local government staff</div> + <div>Provide contact information for {{ governmentName }} staff</div> </div> <form [formGroup]="contactForm"> <div class="form-row"> diff --git a/portal-frontend/src/app/features/applications/review-submission/review-contact-information/review-contact-information.component.ts b/portal-frontend/src/app/features/applications/review-submission/review-contact-information/review-contact-information.component.ts index 26e84bc7d5..f70ff1da25 100644 --- a/portal-frontend/src/app/features/applications/review-submission/review-contact-information/review-contact-information.component.ts +++ b/portal-frontend/src/app/features/applications/review-submission/review-contact-information/review-contact-information.component.ts @@ -24,6 +24,7 @@ export class ReviewContactInformationComponent implements OnInit, OnDestroy { phoneNumber = new FormControl<string | null>('', [Validators.required]); email = new FormControl<string | null>('', [Validators.required, Validators.email]); isFirstNationGovernment = false; + governmentName = ''; contactForm = new FormGroup({ lgFileNumber: this.lgFileNumber, @@ -51,6 +52,7 @@ export class ReviewContactInformationComponent implements OnInit, OnDestroy { this.phoneNumber.setValue(applicationReview.phoneNumber); this.email.setValue(applicationReview.email); this.isFirstNationGovernment = applicationReview.isFirstNationGovernment; + this.governmentName = applicationReview.governmentName; if (this.showErrors) { this.contactForm.markAllAsTouched(); diff --git a/portal-frontend/src/app/features/applications/review-submission/review-resolution/review-resolution.component.html b/portal-frontend/src/app/features/applications/review-submission/review-resolution/review-resolution.component.html index c165c20ad6..79629ca9ef 100644 --- a/portal-frontend/src/app/features/applications/review-submission/review-resolution/review-resolution.component.html +++ b/portal-frontend/src/app/features/applications/review-submission/review-resolution/review-resolution.component.html @@ -1,8 +1,7 @@ <h2>Resolution</h2> <div> <div class="description"> - <div *ngIf="isFirstNationGovernment">Provide First Nation government authorizing resolution</div> - <div *ngIf="!isFirstNationGovernment">Provide Local government authorizing resolution</div> + <div>Provide the {{ governmentName }} resolution</div> </div> <div *ngIf="!isFirstNationGovernment && (this.isOCPDesignation === null || this.isSubjectToZoning === null)"> Please complete both Step 2 Plans & Bylaws: OCP and Step 3 Plans & Bylaws: Zoning to continue with this step. @@ -23,14 +22,14 @@ <h2>Resolution</h2> this.isFirstNationGovernment " > - <label for="is-consistent">Resolution for Application to Proceed to the ALC</label> + <label for="is-consistent">What is the outcome of the Board/Council resolution?</label> <mat-button-toggle-group class="input" id="is-consistent" formControlName="isAuthorized"> <mat-button-toggle value="true" [ngClass]="{ 'error-outline': isAuthorized.invalid && showErrors }" - >Authorize</mat-button-toggle - > + >Forward for ALC decision + </mat-button-toggle> <mat-button-toggle value="false" [ngClass]="{ 'error-outline': isAuthorized.invalid && showErrors }" - >Refuse to Authorize</mat-button-toggle - > + >Refuse to forward to ALC + </mat-button-toggle> </mat-button-toggle-group> <div *ngIf="isAuthorized.invalid && showErrors" class="field-error"> <mat-icon>warning</mat-icon> diff --git a/portal-frontend/src/app/features/applications/review-submission/review-resolution/review-resolution.component.ts b/portal-frontend/src/app/features/applications/review-submission/review-resolution/review-resolution.component.ts index ba04f56729..be560f2510 100644 --- a/portal-frontend/src/app/features/applications/review-submission/review-resolution/review-resolution.component.ts +++ b/portal-frontend/src/app/features/applications/review-submission/review-resolution/review-resolution.component.ts @@ -1,8 +1,8 @@ import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core'; import { FormControl, FormGroup, Validators } from '@angular/forms'; -import { Router } from '@angular/router'; import { Subject, takeUntil } from 'rxjs'; import { ApplicationSubmissionReviewService } from '../../../../services/application-submission-review/application-submission-review.service'; +import { CodeService } from '../../../../services/code/code.service'; import { ReviewApplicationFngSteps, ReviewApplicationSteps } from '../review-submission.component'; @Component({ @@ -25,6 +25,7 @@ export class ReviewResolutionComponent implements OnInit, OnDestroy { isOCPDesignation: boolean | null = null; isSubjectToZoning: boolean | null = null; isFirstNationGovernment = false; + governmentName = ''; constructor(private applicationReviewService: ApplicationSubmissionReviewService) {} @@ -35,9 +36,11 @@ export class ReviewResolutionComponent implements OnInit, OnDestroy { this.isOCPDesignation = applicationReview.isOCPDesignation; this.isSubjectToZoning = applicationReview.isSubjectToZoning; this.isFirstNationGovernment = applicationReview.isFirstNationGovernment; + this.governmentName = applicationReview.governmentName; if (this.isFirstNationGovernment) { this.currentStep = ReviewApplicationFngSteps.Resolution; } + applicationReview.isFirstNationGovernment; if (applicationReview.isAuthorized !== null) { this.isAuthorized.setValue(applicationReview.isAuthorized ? 'true' : 'false'); diff --git a/portal-frontend/src/app/features/applications/review-submission/review-submission.component.scss b/portal-frontend/src/app/features/applications/review-submission/review-submission.component.scss index 64aa96c56c..5ca22e79b5 100644 --- a/portal-frontend/src/app/features/applications/review-submission/review-submission.component.scss +++ b/portal-frontend/src/app/features/applications/review-submission/review-submission.component.scss @@ -27,9 +27,11 @@ background-color: colors.$white; padding: rem(16) 0; - .next-step { - align-self: flex-end; - margin-left: rem(32) !important; + @media screen and (min-width: $tabletBreakpoint) { + .next-step { + align-self: flex-end; + margin-left: rem(32) !important; + } } } diff --git a/portal-frontend/src/app/features/applications/review-submission/review-submit-fng/review-submit-fng.component.html b/portal-frontend/src/app/features/applications/review-submission/review-submit-fng/review-submit-fng.component.html index 7c54ccb98c..ed76f16450 100644 --- a/portal-frontend/src/app/features/applications/review-submission/review-submit-fng/review-submit-fng.component.html +++ b/portal-frontend/src/app/features/applications/review-submission/review-submit-fng/review-submit-fng.component.html @@ -1,7 +1,7 @@ <h2>Review & Submit</h2> <div> - <div class="description"> - <div>Complete First Nation government review and submit to ALC</div> + <div *ngIf="_applicationReview" class="description"> + <div>Complete {{ _applicationReview.governmentName }} review and submit to ALC</div> </div> <div *ngIf="_applicationReview && !isMobile"> <section> @@ -66,10 +66,10 @@ <h4>1. Contact Information</h4> <h4>2. Resolution</h4> <div class="review-table"> <div class="full-width"> - <div class="subheading2">Resolution for Application to Proceed to the ALC</div> + <div class="subheading2">What is the outcome of the Board/Council resolution?</div> <div> <span *ngIf="_applicationReview.isAuthorized !== null">{{ - _applicationReview.isAuthorized ? 'Authorized' : 'Refuse to Authorize' + _applicationReview.isAuthorized ? 'Forward for ALC decision' : 'Refuse to forward to ALC' }}</span> <app-no-data [showRequired]="showErrors" *ngIf="_applicationReview.isAuthorized === null"></app-no-data> </div> @@ -175,10 +175,10 @@ <h4>2. Resolution</h4> </mat-expansion-panel-header> <div class="review-table"> <div class="full-width"> - <div class="subheading2">Resolution for Application to Proceed to the ALC</div> + <div class="subheading2">What is the outcome of the Board/Council resolution?</div> <div> <span *ngIf="_applicationReview.isAuthorized !== null">{{ - _applicationReview.isAuthorized ? 'Yes' : 'No' + _applicationReview.isAuthorized ? 'Forward for ALC decision' : 'Refuse to forward to ALC' }}</span> <app-no-data [showRequired]="showErrors" *ngIf="_applicationReview.isAuthorized === null"></app-no-data> </div> diff --git a/portal-frontend/src/app/features/applications/review-submission/review-submit/review-submit.component.html b/portal-frontend/src/app/features/applications/review-submission/review-submit/review-submit.component.html index 0e24422f18..5a06728df8 100644 --- a/portal-frontend/src/app/features/applications/review-submission/review-submit/review-submit.component.html +++ b/portal-frontend/src/app/features/applications/review-submission/review-submit/review-submit.component.html @@ -1,7 +1,7 @@ <h2>Review & Submit</h2> <div> - <div class="description"> - <div>Complete Local government review and submit to ALC</div> + <div *ngIf="_applicationReview" class="description"> + <div>Complete {{ _applicationReview.governmentName }} review and submit to ALC</div> </div> <div *ngIf="_applicationReview && !isMobile" class="mobile-hidden"> <section> @@ -140,7 +140,8 @@ <h4>3. Plans & Bylaws: Zoning</h4> <div *ngIf="_applicationReview.isSubjectToZoning"> <div class="subheading2">Minimum Lot Size (hectares)</div> <div> - {{ _applicationReview.zoningMinimumLotSize }}<span *ngIf="_applicationReview.zoningMinimumLotSize"> ha</span> + {{ _applicationReview.zoningMinimumLotSize + }}<span *ngIf="_applicationReview.zoningMinimumLotSize"> ha</span> <app-no-data [showRequired]="showErrors" *ngIf="!_applicationReview.zoningMinimumLotSize"></app-no-data> </div> </div> @@ -186,10 +187,10 @@ <h4>4. Resolution</h4> " class="full-width" > - <div class="subheading2">Resolution for Application to Proceed to the ALC</div> + <div class="subheading2">What is the outcome of the Board/Council resolution?</div> <div> <span *ngIf="_applicationReview.isAuthorized !== null">{{ - _applicationReview.isAuthorized ? 'Authorized' : 'Refuse to Authorize' + _applicationReview.isAuthorized ? 'Forward for ALC decision' : 'Refuse to forward to ALC' }}</span> <app-no-data [showRequired]="showErrors" *ngIf="_applicationReview.isAuthorized === null"></app-no-data> </div> @@ -384,7 +385,9 @@ <h4>2. Plans & Bylaws: OCP</h4> </div> </div> <div *ngIf="_applicationReview.isSubjectToZoning"> - <div class="subheading2">Minimum Lot Size (hectares)<span *ngIf="_applicationReview.zoningMinimumLotSize"> ha</span></div> + <div class="subheading2"> + Minimum Lot Size (hectares)<span *ngIf="_applicationReview.zoningMinimumLotSize"> ha</span> + </div> <div> {{ _applicationReview.zoningMinimumLotSize }} <app-no-data [showRequired]="showErrors" *ngIf="!_applicationReview.zoningMinimumLotSize"></app-no-data> @@ -434,10 +437,10 @@ <h4>4. Resolution</h4> " class="full-width" > - <div class="subheading2">Resolution for Application to Proceed to the ALC</div> + <div class="subheading2">What is the outcome of the Board/Council resolution?</div> <div> <span *ngIf="_applicationReview.isAuthorized !== null">{{ - _applicationReview.isAuthorized ? 'Authorized' : 'Refuse to Authorize' + _applicationReview.isAuthorized ? 'Forward for ALC decision' : 'Refuse to forward to ALC' }}</span> <app-no-data [showRequired]="showErrors" *ngIf="_applicationReview.isAuthorized === null"></app-no-data> </div> diff --git a/portal-frontend/src/app/features/applications/review-submission/review-submit/review-submit.component.spec.ts b/portal-frontend/src/app/features/applications/review-submission/review-submit/review-submit.component.spec.ts index c401441422..d11a82816f 100644 --- a/portal-frontend/src/app/features/applications/review-submission/review-submit/review-submit.component.spec.ts +++ b/portal-frontend/src/app/features/applications/review-submission/review-submit/review-submit.component.spec.ts @@ -1,18 +1,17 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MatDialog } from '@angular/material/dialog'; -import { DeepMocked, createMock } from '@golevelup/ts-jest'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { BehaviorSubject } from 'rxjs'; import { ApplicationDocumentDto } from '../../../../services/application-document/application-document.dto'; import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; import { ApplicationSubmissionReviewDto } from '../../../../services/application-submission-review/application-submission-review.dto'; import { ApplicationSubmissionReviewService } from '../../../../services/application-submission-review/application-submission-review.service'; import { ApplicationSubmissionDto } from '../../../../services/application-submission/application-submission.dto'; -import { CodeService } from '../../../../services/code/code.service'; import { PdfGenerationService } from '../../../../services/pdf-generation/pdf-generation.service'; +import { ToastService } from '../../../../services/toast/toast.service'; import { ReviewSubmitComponent } from './review-submit.component'; -import { ToastService } from '../../../../services/toast/toast.service'; describe('ReviewSubmitComponent', () => { let component: ReviewSubmitComponent; @@ -21,7 +20,6 @@ describe('ReviewSubmitComponent', () => { let mockAppDocumentService: DeepMocked<ApplicationDocumentService>; let mockToastService: DeepMocked<ToastService>; let mockPdfGenerationService: DeepMocked<PdfGenerationService>; - let codeService: DeepMocked<CodeService>; let applicationPipe = new BehaviorSubject<ApplicationSubmissionDto | undefined>(undefined); let applicationDocumentPipe = new BehaviorSubject<ApplicationDocumentDto[]>([]); @@ -35,7 +33,6 @@ describe('ReviewSubmitComponent', () => { mockAppDocumentService = createMock(); mockToastService = createMock(); mockPdfGenerationService = createMock(); - codeService = createMock(); await TestBed.configureTestingModule({ providers: [ @@ -48,10 +45,6 @@ describe('ReviewSubmitComponent', () => { provide: ApplicationDocumentService, useValue: mockAppDocumentService, }, - { - provide: CodeService, - useValue: codeService, - }, { provide: ToastService, useValue: mockToastService, diff --git a/portal-frontend/src/app/features/applications/review-submission/review-submit/review-submit.component.ts b/portal-frontend/src/app/features/applications/review-submission/review-submit/review-submit.component.ts index d0cb407568..8acd011147 100644 --- a/portal-frontend/src/app/features/applications/review-submission/review-submit/review-submit.component.ts +++ b/portal-frontend/src/app/features/applications/review-submission/review-submit/review-submit.component.ts @@ -8,13 +8,12 @@ import { ApplicationDocumentService } from '../../../../services/application-doc import { ApplicationSubmissionReviewDto } from '../../../../services/application-submission-review/application-submission-review.dto'; import { ApplicationSubmissionReviewService } from '../../../../services/application-submission-review/application-submission-review.service'; import { ApplicationSubmissionDto } from '../../../../services/application-submission/application-submission.dto'; -import { CodeService } from '../../../../services/code/code.service'; import { PdfGenerationService } from '../../../../services/pdf-generation/pdf-generation.service'; +import { ToastService } from '../../../../services/toast/toast.service'; import { CustomStepperComponent } from '../../../../shared/custom-stepper/custom-stepper.component'; import { DOCUMENT_TYPE } from '../../../../shared/dto/document.dto'; import { MOBILE_BREAKPOINT } from '../../../../shared/utils/breakpoints'; import { ReviewApplicationSteps } from '../review-submission.component'; -import { ToastService } from '../../../../services/toast/toast.service'; import { SubmitConfirmationDialogComponent } from '../submit-confirmation-dialog/submit-confirmation-dialog.component'; @Component({ @@ -45,7 +44,6 @@ export class ReviewSubmitComponent implements OnInit, OnDestroy { staffReport: ApplicationDocumentDto[] = []; otherAttachments: ApplicationDocumentDto[] = []; private fileId: string | undefined; - private localGovernmentUuid = ''; constructor( private router: Router, @@ -53,7 +51,6 @@ export class ReviewSubmitComponent implements OnInit, OnDestroy { private applicationDocumentService: ApplicationDocumentService, private toastService: ToastService, private pdfGenerationService: PdfGenerationService, - private codeService: CodeService, private dialog: MatDialog ) {} @@ -90,7 +87,6 @@ export class ReviewSubmitComponent implements OnInit, OnDestroy { this.$application.pipe(takeUntil(this.$destroy)).subscribe((application) => { if (application) { this.fileId = application.fileNumber; - this.localGovernmentUuid = application.localGovernmentUuid; } }); } @@ -109,8 +105,7 @@ export class ReviewSubmitComponent implements OnInit, OnDestroy { async onSubmit() { const isValid = this.runValidation(); if (isValid && this.fileId) { - const government = await this.loadGovernment(this.localGovernmentUuid); - const governmentName = government?.name ?? 'selected local / First Nation government'; + const governmentName = this._applicationReview?.governmentName ?? 'selected local / First Nation government'; this.dialog .open(SubmitConfirmationDialogComponent, { @@ -248,13 +243,4 @@ export class ReviewSubmitComponent implements OnInit, OnDestroy { await this.pdfGenerationService.generateReview(this.fileId); } } - - private async loadGovernment(uuid: string) { - const codes = await this.codeService.loadCodes(); - const localGovernment = codes.localGovernments.find((a) => a.uuid === uuid); - if (localGovernment) { - return localGovernment; - } - return; - } } diff --git a/portal-frontend/src/app/features/applications/view-submission/lfng-review/lfng-review.component.html b/portal-frontend/src/app/features/applications/view-submission/lfng-review/lfng-review.component.html index b4d35d3487..4ecfa4adb7 100644 --- a/portal-frontend/src/app/features/applications/view-submission/lfng-review/lfng-review.component.html +++ b/portal-frontend/src/app/features/applications/view-submission/lfng-review/lfng-review.component.html @@ -222,10 +222,10 @@ <h4>Resolution</h4> The only option available is to forward this application on to the ALC. </div> <div *ngIf="hasCompletedStepsBeforeResolution" class="full-width"> - <div class="subheading2">Resolution for Application to Proceed to the ALC</div> + <div class="subheading2">What is the outcome of the Board/Council resolution?</div> <div> <span *ngIf="applicationReview.isAuthorized !== null">{{ - applicationReview.isAuthorized ? 'Authorized' : 'Refuse to Authorize' + applicationReview.isAuthorized ? 'Forward for ALC decision' : 'Refuse to forward to ALC' }}</span> <app-no-data *ngIf="applicationReview.isAuthorized === null"></app-no-data> </div> diff --git a/portal-frontend/src/app/features/public/application/lfng-review/lfng-review.component.html b/portal-frontend/src/app/features/public/application/lfng-review/lfng-review.component.html index 35782730eb..de4aafdf39 100644 --- a/portal-frontend/src/app/features/public/application/lfng-review/lfng-review.component.html +++ b/portal-frontend/src/app/features/public/application/lfng-review/lfng-review.component.html @@ -132,9 +132,9 @@ <h4>Resolution</h4> Parcels not subject to OCP or Zoning do not require local government authorization </div> <div *ngIf="applicationReview.isAuthorized !== null" class="full-width"> - <div class="subheading2">Resolution for Application to Proceed to the ALC</div> + <div class="subheading2">What is the outcome of the Board/Council resolution?</div> <div> - <span>{{ applicationReview.isAuthorized ? 'Authorized' : 'Refuse to Authorize' }}</span> + <span>{{ applicationReview.isAuthorized ? 'Forward for ALC decision' : 'Refuse to forward to ALC' }}</span> </div> </div> </div> diff --git a/portal-frontend/src/app/services/application-submission-review/application-submission-review.dto.ts b/portal-frontend/src/app/services/application-submission-review/application-submission-review.dto.ts index 9b6a86197f..6692aeee09 100644 --- a/portal-frontend/src/app/services/application-submission-review/application-submission-review.dto.ts +++ b/portal-frontend/src/app/services/application-submission-review/application-submission-review.dto.ts @@ -18,6 +18,7 @@ export interface ApplicationSubmissionReviewDto { isZoningConsistent: boolean | null; isAuthorized: boolean | null; isFirstNationGovernment: boolean; + governmentName: string; } export interface UpdateApplicationSubmissionReviewDto { diff --git a/portal-frontend/src/styles/form-controls.scss b/portal-frontend/src/styles/form-controls.scss index 87688c3f41..d8a380dc1f 100644 --- a/portal-frontend/src/styles/form-controls.scss +++ b/portal-frontend/src/styles/form-controls.scss @@ -143,6 +143,15 @@ form { .mat-button-toggle { width: 100%; + text-wrap: initial; + + .mat-button-toggle-label-content { + line-height: rem(24) !important; + + @media screen and (min-width: $tabletBreakpoint) { + line-height: rem(36) !important; + } + } } .mat-button-toggle-disabled { diff --git a/services/apps/alcs/src/portal/application-submission-review/application-submission-review.dto.ts b/services/apps/alcs/src/portal/application-submission-review/application-submission-review.dto.ts index cbd503fac9..0e0c18f483 100644 --- a/services/apps/alcs/src/portal/application-submission-review/application-submission-review.dto.ts +++ b/services/apps/alcs/src/portal/application-submission-review/application-submission-review.dto.ts @@ -57,6 +57,7 @@ export class ApplicationSubmissionReviewDto { isAuthorized: boolean | null; isFirstNationGovernment: boolean; + governmentName: string; } export class UpdateApplicationSubmissionReviewDto { diff --git a/services/apps/alcs/src/portal/application-submission-review/application-submission-review.service.ts b/services/apps/alcs/src/portal/application-submission-review/application-submission-review.service.ts index c9fd1f1724..c4b3c60fd7 100644 --- a/services/apps/alcs/src/portal/application-submission-review/application-submission-review.service.ts +++ b/services/apps/alcs/src/portal/application-submission-review/application-submission-review.service.ts @@ -253,6 +253,7 @@ export class ApplicationSubmissionReviewService { return { ...mappedReview, isFirstNationGovernment: localGovernment.isFirstNation, + governmentName: localGovernment.name, }; } diff --git a/services/apps/alcs/src/portal/pdf-generation/generate-review-document.service.ts b/services/apps/alcs/src/portal/pdf-generation/generate-review-document.service.ts index f207ab4b63..d60ca052a1 100644 --- a/services/apps/alcs/src/portal/pdf-generation/generate-review-document.service.ts +++ b/services/apps/alcs/src/portal/pdf-generation/generate-review-document.service.ts @@ -160,9 +160,9 @@ export class GenerateReviewDocumentService { private mapAuthorizationValueToStr(isAuthorized: boolean | null) { switch (isAuthorized) { case true: - return 'Authorize'; + return 'Forward for ALC decision'; case false: - return 'Refuse to Authorize'; + return 'Refuse to forward to ALC'; default: return NO_DATA; } diff --git a/services/templates/pdf/submission-fng-review-template.docx b/services/templates/pdf/submission-fng-review-template.docx index e10e9dbb8645cb8ce6297b540e620b9bf323fa34..d54cbbfdb0c5f0bd588956fae10894bf48fe9447 100644 GIT binary patch delta 4007 zcmZ`+cT^Ki`wb8h6r=`_&>{3DU1`z@ptR6MMXHp99zcXun)DXwU679Ss&oMbq=qg{ z5EK+dkzRhN@9+D3|M+Ilob%kByED7@nK^r(oF#(7B?59iZ6YuXL_$IWYOjwqsUl}4 z0RIYbA_Sa3zfRW`%2z*V<F~?>3zqKH73UQ3@U!cKKiGXiJ0h9-v5bd%S2b~TMZqgw zn*%=B$&I&PN(BR%FAE4rsv#ouK@ld(B@ZLAOd`L*i6=z4O!fIvp2?d^^b2!apzbjE zNF+j*5mW7qeA-P}&!Rojteg)ZT6UZjdRZ1G1vY~~A$M=uwr&y;OZPUHaEE9IQ&;r8 zBB+LECG24({uZhh5@^kv1O6z;P1T`MPK27Np*LSuHPdRCbTyvA1s(SHDVa`s8S<3l z_jJE)d|xVNmV8>`%TLam&IHeW5At9mbWwciF8?E8V9SK`Y4itu>Yh`Ja-{ND3isPt z@L4mka2e}nTOBITtw3kl6hCvoj9sB<Un52xOkDSY@MkR4ClELqn_byR3i#}F;R9w% ze$dii<0HY53qtIoW;2I%T8zUD9rg7~Gkp+j^?@IQrprt<(eMtsVT-l>wlqF&e@fFt z5xTdO&6?^@q^AufiL8j<M-zZRbA%v}o;KOvnZZpHasrsn^L*^l>f;66s9g!)h$<Tz zQIr>HU2I|RosKgMM^6g}E=;oXe;h{n&rCB6`Lx)$t($L=%t#p61i*q@p@IF?R8Izg zAyy64f_PGRLY;x)YIesy=>v^Bb%r@;q8<<OPMZL9c^apU&n0H@$9W;v{Kc|%%y=lG zv}EZUz;<8)?R<8Xj0Vg@`YhNz|3&EO;??UjXK6_Zdt2hO$7LC;T-Q8HZ0UHF+H8e| zoPHD#!Mm?|4$$JB8=$*Vy|R_F)0Mjp69Pv;P&dkjwkxgk55FY$H;kjiwlN4l>0Tb! z$Zw6jc5fxDYHSihQ%p4B%VsG(`extwLahu!frkTDftaqtm9LeT;7e?tYaIKZ<4v$2 zmAUd<HrZlrl`#e-6*XhYv8Y>xh5E32ff%^-%8RO>>Z0T=W!a~?eccY&;Tz+jI<Bk_ zLdY$o)!PVusSX3ytx@NyYy4LIZ_z=2H5w2I=LzoqeL89yFKGXBPIAmS0E=17tPGuh zb_L}Q-bzm!E9~`tnJ#=RpJ0@U^KC6fkZ%rO-v_1$JUgH4XUj(iPY${c5~dMc(>hOI zYi3MfjB-RP(vLdpq(u?}j$9MPT$J;l1@4_-1$N{+tHO9$_fFbwv$T9Z%o+{T2)m$j zcq*xX`eY9{K+i;i2T`4M02J1^9^RU*J&(G|&S&6a5b<1(W5T5p>BkYn$K4%!cPGyO z`iRU1vC>E}msn@6FrAnhyxN_qQTR!>sS*#FH<9M$(e?_h`vqE#xTBuz{4!_h+jjWk zIDKwnZmq{02CF?csXo%CVjF|oLv_YEZ`rLNpM8EG7a7IW+{d8i1w`6(tCLRg*4h_? zTChGr^J;-&VtG;lEOpj=-^=ooKG^2pj6dcais})o{1hfuQc=DrUNAE|w7gz0n5FK5 zIj!|((a1qjA>FoY20~OhAxJ_UInFF7>|_sA6d(5Dor~QW+4Ga8;mIhUv3YP+D`02X zd)!`MKqb_#VzQ$PSkPUeb~52+X7)ui8tX;F3Tn4l$zGAZCXgGuQ#~|pabf3T1V*Vl z^r0}HEBzpO+`xmdWmTk$Ds>-cdwqO+WYK7{(Rz+nrg5=Hx`D*I%M2H7J#H*sN3JA% zGG93irXZ=2*`~C%I+VRC9SZV8FL=aQD=SdR=y)z{?I&eM0MEQ_k8UT!-#tjx!#Aes z8ZB`0jkd-T_oFtG(E+j6YCA{et}ht_2Y%SvPQ;tB9e#w2kZDRJ@oHm6=jLXbV%O<s zGb|jIqeb5gJ2dQJ8x*O@p4B!q``wx|V59B@Z^XVRN8##$=O?mh;R?h$!lwiA!JnaT zwR0$FNZ*R;1I_md*)4hH;btG*pLUihXpW>P3Ugc}(p+$JWSkM+cXoGH&EH2VLs1bA zmYWh#SBm&6L$ek|GjXd{acm0QNBl%?mw?C1E3Mnvvg=I6D*5rr+J|5RhHjZ;aFJ3; zvXQgW`ZRvu23gK^17cVe{IevfMkfX=#&peTZeq6#Kx&EJB#AI|2v+0o5UN*?veS4f zDjulmSFJG`-_a-+PG&`9f>}>YQeA$Hu>Ryuo(HX0GNKYpkhn&y^N#W6^+*zgdK2A* zt4Y<3cOpJpj2IBZ{kh0e%L#d$7AsBs18xFAB8?=uw2YF#hHA}@j6Qz(c3{>DL;Y@T zjtn~pj5Sa66+$M|ptfK3FAyO)@BQamT1Om%Noh!O(7kd)sL8PE3oqFP@tLZ&W`&na z*DK9tQg?Tba$z)mqG|)PtlAMCkbc!S85}IWMDYcNshsRvz}Z2CH=HSx*>BB8`7NGu zq+ej_3!L2Y?#lxlGS+k(Rpj~_XjR^GSXj8wHLN!}$soupUbdA)CX@N?jaT{x&F$Qh zQ~ah?X-UeR_@WYtTeCxNqD88$_A}wic5nPjG?bl8^XBIi(=L6_{Mo@F-to*lhAa98 zb%But<$(S)rcFq%UhmaWeT#IS=`KFT(1G~&p!t{6q^1gwd?(Lvir}a)Lm;Ln+CtPU zIinE;5C05Wje{jxhf$$c27SxLf;(yyKZmvNM!|N~tGFwx99^!<ooK}DD3)WflQdE} z^Fw0lRq|#(b;$iBkrZ}PMRmb-t3&qTtY5>Tm``czET3o(x=&r~2NuxjmZ4b?mFsjW z$vOQHwT(~?iJCakVLfCt!1gJI#7VF2MN#uGa;>CewE3Q<*~?nfpe!$ST`F8722_gy zDJMGIKi>XPIw_wR_PLafe)ZFt7g4cS2)?*IjCh_ZQOnOB)8sA4t?K^csa8;pR~Li$ zZkqV;*zhVj-=@g{k$pjW#fSz=IhMt@7CtX${(Se<KvC{+Vv}(_pj#N?^qgMYdq!wz zk@VizOjmC{imcq-H#?ilud!2KCz#(#u7yXgh0kH;d_Qc?Z~hpfdAvj6)vf&?e7w6h znIg$!iK>(PQ+K9~JeL8SrsBQaYO0(y<)W^TZJwmNYy;7IeJ{iPIl81vcE;hU?zX83 z5cX0fq_c!0Y=+H>6QFX7fGd_s+2lYd7^9xt+y3TF^klp}_hCxw<1Y2ir8pa;W6dra zR0UU5O;l$@IwKIF;fwDS{JQl!Kh;i~xm@8_C<v>Dke5Ct6774~G5hrHHg)dU_rY*# z!G?;)$s)HI3zlQYWN4`eja^TRERFe8)7~a&Jk^I!bFKMdEdWYyN1aM@ImDsaIs00h zwv$hZKo>8{i=9U;>eBi~rKPelvf&KVQyjuL>0+y7|5A{lsJoh;R4$#Zc3b2wO}>1I zTqY$2C|2!aTh%)j5=5RQn|lo351Wsv3KF88lA=#bPAqtoM_mx+C*mYd92-{0j)bSj zOjC}&N9LRvDL@O>za4ly-L|Mt-Ygq*#iB{zp=A^y=svfcX;hb1LQijUMdxJXkiPs7 z-z2Y<gwOEU#1Ch>W+=E|Y<>Th6<%h+b-|$0R|p-RxH!1GtMg8)QZQgpYk2g&)TY2} zV|s&RR^_S>gSg!IMu2yDlRbK~Maus}2VPgc?JlNC8leArs&h6XHsc|pC%1dqR>ki4 zK}pN8Pp)6__oKN$=^WqIpQkez%O72^HvUDyn%I-#Jt_6OtiE4k0DsT#u7#2|hq8=f zxl~mzJM4lcoQEg4>7*HJ?*;@-kiYcv8tepp=1_TMsBC|G?PP$)>I!GPQ-h)m%^h%m z=C~l14hHOB9jeT_Hwx~NHMtsL`Smb0wu{<V$BN@ZuZ`4Q%_#Q*f8E`pqy3GfWdxnF z$YgHgk=Qub8WUblb=iu;ZaLD0*mTA(w<TSRtz}GzHY1wd!1v?LPMs;yoB2l%c69vu zS9+T2)!in^j8j_Au>CFeLIY0<WjD2^w$Y(8^@)IRigJK=1^la^t_X93TS+uB#n|N9 zYDi};tQn#Q&zH$xwXRvcx#E7nCZh2IPWP2tb$$XyqJE9RAUb*qb1jet(IIas_R^Ry zn)WFxABA1^8E^*taz<6gX<6MQAdrgXFF*RfoKcM?u@m@@FM^WZ)cF(TS#uHoiH_`t z|KpWtYtUvQ|DYiU+L|R>x_?+h4u1dK*KxW6sFB?^G*Yu1>8-X^noO+Xd5u1fL-QW{ z_i6_7gD-1+5=(8`d%wLRnpS3;Sk^9+Ym`M^qm=f@Dvh-6&Dh?w_L)LvlwaO-&m-+h zlO{Q#7HNv$tHy!(!ebDa@kKP(Pag;R*Lu5Z^okg0kZfn|_ne0d&{$8o2Z4dY0@-pE zz&5r^%{NU>%AX*y5TBxTWxeW#a^jb9v!eG@OIq8Ro+nafp?%H0iJgt<UEn-ASrB`d z&C+Q=cj4ocgyu(S(sCGqs|b|ii9q6%qCzJEvEh^Dk9aYScU*QAqN`qp0>Sin{~&eC zmPcb@_x%<0=tC?Yv1o@Ukaa3~EUr}p)1$sZB0bVlJe_TIAHUi)K&DPvZ@n04%cZ}` z{NB|DGPvYTz%ylxpyf~NI=D&v;s_S)0uy;ms<rOznxZzp7Q`Jg!Sbc@h#kKCiIPh% zfHuIIX@T7*Hqgnr$}2`)Px~4)vV6{d%3MPQhRhuC{rN=K{#f&V`7C7%RWb0AW100= z`k8Oj97LTP<LA&{=_eqBf&N=5;#km<7k*WWziSqp1zL*r7y8>vQ~u?iL7;cIDm3eF z&e8<vQS$lN_IW>d)qk}+xGgjX+pl@zc{vM+&zEKbpZC8QAdnO>4uj$UP5OI#QvHh* z0>R0+u>K|~AsT8F&S$Zv1A!?1MGB|DiDH<4Z&F+a22Kcuo&T#i|KQs$a6%(1oUaSZ zA3S@G18i`6|Bn~W`382lBMj@G@$~cYG<#fw3)}BcEWc#OdHwwL{fI#z>VGZz7AN7# W{+si+y8o5|iSu;jhR~vaJ@|jO#U~{I delta 4026 zcmZvfcQh6L|HrSr=QVC*Mm85$Dv}k~wIzFXWhM8zMpj&-u63_<C4^jL%ibk><U`23 zlD(3ZLPmXCzw@cz_xt|q^?sl8e2?er{W|CIDwrq9o+n{6(j_Bj15i^_13WRkW|fRQ zB;-E=ybQ@Xw6S3Xm^tLYJfTHny?5nK=rx!9C03v;*X-@aO7Z0UP0aBD2k6dwR=mpF z;Ms}otw0>7{f+faHE!d6@<e`3UZ~xwItNYQpxM{60o`(G)m148*<_#^XgU0uXt{#& zd#kWIQtT==k6<J0>Ry%u;%<2mlh!JhcTTbPS*mXlTDk&$f@cpExp}dJ-6BQ4-_w1q zWSE6V%3H;%I8$0FBEwOXK<dVDo}^8rjKVf8mh<w8o+V9?k*D$HgxsV4DC0?p{*Y$o z=x4*7jidP@?lI1)U~xuKTs+R`S(s(-6&KZGFS0#WsqJcZn8>`)M-9Jc@~p#d(A+ht z?w4EjXiTupMvaqUbgVbnhR$h*G3X=J+{dIo_$se5#kveqsgJt0L^7??z5Wv}^ki#J zS=vEEdyM7SFE5R6uzCk$K!fX@f<~yBTXxvhpk;*L1eo6?C$<c1osu<dMsfi;t#9hC z%?q6DoqK~c(xsxFyvOz0odf`wAq4<_q=ok1yx^xv&!Lg+{Gb=x=8%DBDI+O$T%D5E zcZoUCnSt`y5TdjcvxC;R(;??)tEj;3Aen6vKHH3A>5E~NWl4L?+9*&cTQOo8#T#N; zj+dh^U94KkOae2>ICM}1WlQ8jKoj8%_rh!TDo_TmnX7WbvZj0cM<l460=JYEwDTAv z&01qw(X&^ekx3T^Su%Kfx!y;&P+>F{J}iCZwvs@-crs(kxw!`_%bwuzYZX0;c<A-K zgvbjrfPQ$WRA6Z3S2j0@rVVnx${>l9DvYWsj7sY9lTO)~2{B(eR;JU6dx7req>hXc z(nnF=f@NbDa}2r&qS39FbaYvPan~%9!+|l~XxoW}feLzz4%@M}{K?>23}0K-{Tz~^ zGPzo(uH+n&;Z+Q`bjE=^mL}g70*am<S8yMou<>wGsly4`yBrRC&RC=*y02#jdf9`H zNq!h!rOa~Q;Je{kzYYJ_Z@?b|_&vUbbTq<;lDGb>jp|2Ce&oL*O$yy#^-|5srf=|T z&B0mocMUl>v*QaX8PK*fi0O+QEwcs8K4WlWU9W{vRL>b913V>EUMp$SMshzqUo=)J zxllk%X&oLG5E;-BoOFdvc*-ETGdgp8t3p*W=4#|><m{!B#L*`qEjp?40_rAN`!m_g z&5Sy-Om3IAn!h!u1Wfqy6d7>|c3&UyLq_|cRSu^O-`Mq{vd{^pmsABFUU}!|owzR) zrxU)^d>`H>96ze`51uz(Fh(Z;)z6W$-3@cP@>+ts)?dp+G`0bn5N<8IuZLf(k}2Oj z4$9)E7n?KhhTz$2`y5XVS<S{COTXDjjs*kH0>#u=Xyi}NN98M|wc4vY=ocUorQUdp z4*5Lmzor$ZKaa-dJlC#r&ZW4MOq3`Dyl8!?u`RB3Ce4_;Tx-*GN4ca>*#C?hP$;Bd zzO0g7@^TKgcv^ku%=Nad+cq;}Q~hfLxF^|r%A}j=s^LK{i^+5lc&N}^=kUTM)!{1u zRh++nNx9{&JX_Z?Y({QDF9_IqwDrJ@$NNRj1qQc=+mF$u=tc2}L};4w&9x|CmN-op z6b?Jy8g6Y=7YlVE#xh;M^oXqNc~zQuwSbv0#a8<yNs=Yg(~B$ZXA)EM1stq(=kA*p zZ(Q~@Eg0MwbxKTv^nuQJS-zExL!Tq)<XC5wRQsq}5P(#&-32d0y&b75I2+<nXMrE1 zhft+Qh-tLcWRciq#cR#euv|--#iZNjdqs#KLH`jyS(kvMrW={|IZ#&LipA}_!3hB> z<xL8=IHE!tH6R+KIEq&b%{~WrFUK37nwW|x!h#&><!T}v&`2twHhx&eo0-{lGtxv+ zL5pCBFD~75S0ZM1SnrdVr`PA8ICA={P&=|<kOdlwjW%^+rzX*uAF41y#IS<KTxhs} z4Rq0+sv`;+9PF{@58+<L*YXZERmn1A0~Z@JyupQ%l^DA@SsdQr3%}NS>e*NHont2f z7<|u>eeJ|0lOCvm2<In?Jh_+~($q!~rZOc{;iIocNBR;tQic?>V}wi1Co&Y|gc4SI zEzlb+buO0bJ8pVLq7vsMO?I~`72psh0(PC(hsbgz2@C1&vMglTNV{h%{g9uw=kggf zyzbhJg!m}MJ3*abk+z~sx$7>x;hm!9&%tl?g;;|rwu5^Z_!-KyQOg7AF6zbC+kx65 zp-yv!{PE{ktCq@&P2@zXt(bPqM^m{q_s|E<<lL*44dcXuzz4DW#gn^al*|%@heI$| z;Tl#enhBA4k<?UG00aG=TUIJ8S$~q}CgFo*=|`fIy>G<k$Y4zYBPQI?HAW0RIB#K; zA)k7_ec%#I!=)8}ANE3c>0~?pYNq%0(!yw?5D=E19%W_M7C7cfzCqmN)4bjJ3awkz z&T`D2Zg`C7ISAI*nQ;aa{;3GGkaP7(!Q@ZbJl>%kTVCxFuak~hW1!hke^GOa)%&I_ z(Yy^|9<fz1QC@(xo&7vdt1gqkCwah;w#zZ*CGJ{?2bZ>!xL{r(c3L#2)c4;VJD{~H zZx_)Qy`nAVs+~MB^Lsg%h!_%9K`#gjsdI7pZM|x1T58Q4Nid`WW5~;SH14MgF~zy3 z3D9RzcxjWTxa8F+#;}DwxKVNZX@@Vs`z2Z9JK1-778=Lkeo$A}*JAIxZ{1s)6{|IK zuh2gJ>c4;ZZVNg+fAuEac;k{_Bt_-nc1PW=GpGtmBp0%c(2`2Iz@Y2uEP(dN7T}~+ z1MspqSJqBVHkm+|M+9%bVHT!qu1W10T5&AI8WvT7i4YKh2!R|Oei@j~!hZRrFR^?C zohzdlcP87&aO_lGy-!<|K_^e5ybKgHIi-)iHl0tvxdjcJS#wI2w+6+RoJ8}CZBDGo zE80!Je(V2v8}WPuuBcx^K#x9D@sZB5-BX0g1b!fw(q5#yxt#HIrI%M(V-fSd<1sF5 zcJqSA<kU=e*GxB}-mM;mL?b`XXz`!g+U_RV!Jnq?+p4eFB;22)A<7=x$V5LP4!J8P zg&+(cQyk)TEpJC;ygmi{nIMHis&(?O4IU+4ACLpWQB}MdnpU}1XaWbPH8$4!*3HUy zJ7JRIb-e5y9}`h@F`q+o0?B8?;jwBcJvpJ|ETFYTDHX@fGGjWd6lFJfrO5U{`6ak( zCeim`+;Pz{T(mmdf=M*WY(*lg`Gh^5n<%xK1ReaiaN`T5g2AS2hy7;i&0vIjd;=4w z%`W^y@S(b9l*y-gw2@J#3bZ#+BszPz9c)`SaHZaW`=a}+4pF@Ryoef>A-x~$Vl(P5 z^K}MiNheZcUxM97Jd{s}4JhXbsZ(>^baF=Ygt>12bCrs&j_<vpe1eh44ZVzxy)azP zMs$uT?~3?Jc!==)(G&AYW=qa<sSIEC932Xl&x$|rEH!^OfEM`1uJtWk@zVRdlr1ms zDjsU`2?K`o{3|SIy>+-U?OyKAN~?I+rfVRKI$d}29(k--8v4dl(-(Z+t=BBqZ<(*` z%MNbyh;DRn@vDCW<}9r;Pov|2d>{=Opz}ZN?xAz$EqBB|I(oOAr?lrYm>XFl^S1Pe z&~vn*f4U+#dlkL@(#k4mMHst^D8AFzFsoN<{zMZZ;}+6f?M0V9R(5dE+P=~(7Gm3K z>8yXOQSM#SqLPm*`8F`z_Xc+%VI6s=Hx-j-afaBHZd>Z1Cs`M(&}{MeI&#kM;PKf= z%CQ@m5g7ZXepl;15^(T&7H&n$ra1%Z>rX!G-Q!?8RF*+krU_i9>Z5W|N^)=_uD^cG ziqa7jgvRvUd7ebQtk)Q~X1o_L#nYkF*=Y4lEr2&aR$}nF(H=9dKP(kj-jd=#vwynq zk2uDsz*_7gx5lVfF%T0sJAUK-7ZqQT$zi`m8+I+(9;OH2;Dgh+0LRB0hSv21H!J6@ z{c5e*(pzcK2SLZaNX`H+j|Lp;(`)TDDhtCh!i*H=4523cW3ppUs>gc#$4u32;`L<p z=6oBTmy0oD^KU`f$Kj8QXyOt92cdl*8lK9fC`w(8*c$j65f<@{><2#?Gv(}bQUd@_ z9ex4p|K=y=YEL+b^cNcyx=8$vu(yVOlhcG-&~IKca|fdzf|?48#anaYo%+L{NjMs^ z*6(W65q1uEL|BTMnMDb@a^BmG@^{rQ*!GKCh54$Npp;>eDDoILX;ay_*;SdoVC78u zsxRH4u@&ZxD4ReeFEy%^T*tPUL9}#<2z$R<AQeUU5X+&8i0n{mulbmLZy`ckxi5>q zp#PQjYj^a$x1Pql+VT4KsyN5ndcvU37Uv1D{r8flTTz}*4-J~~^iy)Gwop&OTPxtU zLO2!wtyD?n+44h3g}n)<(H>@_E?fhWJO0unnqldjp881E>Xi0E`atOg#`rGvz<aye z{%V;Z2<ZkzhL+~WUfAW=6l9+)V99yR90Orb`km3btF_NTvy&Or-^NpbtBULmv2AU1 zMf4dR=GV>K7N?_;(&OWl)87`8#$0J^j7(-vjfuOwJa&Bk@nrUnVP)Q{XJ0;=K;HMb zW<t2^y<`<sk^9vV(w%v)HkqzMbp2}Ec$2&)O|rcc4Q`hvGE}*#@axX{2NleC6N79o z^tAq*(wCoTTu^Nqjr)$qPpN*SmV}fI@NaVQ!X64Vp5L3qpA8G%(c=Q&kJ+Cz&HM*H z0|5Q_1`ocU9{@k?!9`+@-}eyY{~=Kms;^cd2LK#7005@HBr+8EHU!Tv%~=E&X)z7{ zB0~J9XyD=#2}T0|K+Y5ZVE;?>g%;1x#>xC&_az{?NMV-v7f8OJ8~pigS^nA}$qG-P z1WNw@4c5G1$s6CzfY1N{f4}UZBVG;3`|Fx>-%n|A!k-}df1Z-GZKIR&U4;4mzQ0AA nE_n3+iTFLaNZRm9o&rBD{L}RxZO6Yu6(8hzo|4hy$I5>IW+E%o diff --git a/services/templates/pdf/submission-lg-review-template.docx b/services/templates/pdf/submission-lg-review-template.docx index 74a0c330c0293d6ad4b2d902c89b0be22a4629bf..7eb66496020b0e2104df58c0e0a75d317a06b4ba 100644 GIT binary patch delta 4398 zcmZu!2UHW=77e|Lh(zgNq)Aaa(xgcVMWjnn=_Ql|5CjrJ5JGRk5F|8d5mb6pN(AX3 zT{==DND&Zu6b1Cd)BpZ^Z~Z%K%{q5x_L+0fp1Wr6brRVIiR`SAJ_RKZKub#t7_Lpa zQ*oA?jPf+VijxVTS|rYe?B5YX^4?>og>*za1U_zSV^4t9DCN{Yyk*07glI@$G&_$~ z`GA}o-`a%VTBfn0L`YbqxJPzf(jdEXe_6xJWktXy(iCXfY1SWW^7ah(+q@t+*85fv zWWGCvBc8>M0#+cl1dpukhs0Ja*<gClHfjX<-s9-byxm8Q^5|%qp#CBe3$38+^j&5v zWxP3~l!tZhN9Yr!wHz@I&QO7k`W>V$9TfZ96%gUM_SaHOUgt-?98UZ^N+SxlH#ZL# zffl?$h0R$c4fGY|8tt0;s6l+)(Y_SD>O6rIQ>p7|<AK|ltHz4)kv?qSq`Sceoy-ZO zeafHpww$#nAINa}4I!2Ox4wMUJ4&A2yrBaO&*YST&I=cL`;3F(MfaWG7TbIylu>=$ z*V*!+T3385^tmayOM;&iAHNc)N$PF~XQ`V`Hs2pXi3^Y*rnNL{Z#FhbEU!JH)>wFz z7U<m;t{v_0y@wg;)6nKdzr%Wx0RS`P0KlKD(EUXVc8dHm>K*iikH&q`yrMgcjVu^R z4Ks755;cK{Sq#aO$K1iDHg0~)Lye#?UYM1&-8&V>T9_M<nBymO@PScz&OcPz*uN3q zz}vpVAHeN(rOZuSzIR62EkK>;i#8oyk6#Y=dh_lFuY_c2w2X&+&Qz7mD}$>eY6%f9 z)bmP}sBed%kW9^t^hi}LZ>eU{BEhfFm02!VogLfvdgbqe;de3#yL_)h)%QjKZ&%91 z(7DJVMzydj{bCO~1BIREB;7w3V#Z6&%HKT8>D6x>WZ<2<VgplUdbf1ACXkSo{LyZ1 zo2oa5U*sJmoyIS{1OK#Kv9HBx&DGurCw4n0Ui7IJN~X<?>!I%KOs#rY+s;NEeF!4( zCg&i3%ZkN3(Fj*-vi?AH`voCZ%26D1DTyUsJAt`w%b)?5VuiKi&~luNt_+Hmi|w(% z%G4Fi=2GqBl6g<Np8AJyxyeb_!T;_0Urh)6ZLk0U*Z|7*Ket9z1D*cwO_FcThl0VT z8<|l}x782Y2OZp;lu+rfZ(H*lVyVHVeBIV|t@j6k&f7s(jQNC>RweA_?B~3nI_a1^ z-q6&|($w8ZVRY9|2~?h)+1d=OUYb+6E6A1b+{~b$p`_osA;L{hvuk(=x?aW_1*^3I zLoy@N;!-wiON-o*fj<l91c^o%lydHKZ8ebjjf&|W=P6VEXLJ^@^V$VQmxp1|VEE-& zw%m4`mn)zEn~E_jaoSizkIVVOcjM3o<&mZe^mm_xI~3<kLt#{peTyI2UZ^s_jdTPg zs2T<a%{e6-3u#2+foKt`Fz{>6>u<$My8NaX3?>Gj!=2*dx%8Cr?7rE_D2f0dJ>!{6 zRuvW0p1|QMv(Wp6$b{LTcxgp~9Gt6$PxxzbK`KVeCByEUPBwdtbIuTmWMDfPa~r?r zshs$7T?)ZQWItT>oJ~@Dbs2-1-M(_+Jd?sDI(c;$IPI0%S&E#<%Z*Z7cqBXc@L_40 zycTwrZD(feIWsqmY7cr5Rar^gNDmQmrYKB)=ruf)9Cdk={+go}+qBol{*ZzpnKJf% z<C7Qoiz^p^Ghwle-z-h$uVwPgORO)Xv}xpl60A7LYx~X^b)~#1O5A&yk6l~o<q=MG z$~=p%biIpFbz3>RjqBR=nJWCyLuudN{*gicdLkJj>!NR>qk*ci94dAf`f|GRvl(!R zun}OcC$sLXAxUyqF-I~Hzz=OSzbNb4EZwlp0~;TQ5Q!BtkqQH~xWdF<uA#E=Xcx=H z<Tk6|tj)3S%lFKhrlwa3a<gg8T=iM~{bP!~=w>s;^=YN`=_Rxq&^S-E9+8z+jl}Kw z%V&M3lvnuankbNl;^n#zKuU;->6oo9UZf?Xh_Q5w$XKK-{x1KPkKPqzP6@8%D%{ha zj>t?*>IJeZqzt~TUYvD%wnPbhL0`N;6KL?Mz;r0dM==i}628jugS@l*9!d4#2)hZ5 zrDKZz9>9d1Pw@$`=&iB%%Zadj9aH^I3Kv;>Lp30STUq@B)KqtJb0lA3Nyc!toUX8- zWP7d%PU5z}>$hW=s?Qi7sJ28Wc+X8rhV4mbuDa*^RG&XVV3c1jirG&ge24;Z(;t*3 z1nCFL%gSU1Uj+5CeX_P}zo#uFxiwELt0VKw@fRu$gX|lKAT_nZddbSqa9Mo~49=sU z?XjU>HnZqPk^Pufa*21_`(Rc6AbYIFLPfUxn&K75PKGm=LL&cn^!0sV;TJrorj+<i z=JtnM@k!rmx?5^U<(}&o9nHBd^cAt$A*vXMUXvCH9Ry!DxF2*2jb+J<EE0c=7B)Sv z@$+y1HKgku2uJs?qz%P@@>p5Rtz<v9qUs;+CV-iOwk@K)yPDMZyP+OcGf+;w?;_!7 zDZcM}c=bY(jNgpQcl49j^&t*-Dn<#>_lC>s-BN3xR&d%nwSUQwMfYL??()!=fOLq* z)R2o^ukJG~<LQ>$efh22&b}>fc{88bqy5S2QDxn7$*Zg^;r7bHhXs09SBBkV5U8sI zZ~8E$$pVwCQUxXo9OM1;j`s$=g~WhZl?e<G=NK(<=MRep3wFVIs~mr@eULT-k_0xj zwDgw?@%(X9r@kz`W)t2*J%X_6V6VWL`vniaREJB9s+R~B%h_fNhSc&&!4K}drWU;m zPj5A`{BihjhSKzpz%$2p&)f?YyMc;LWz-6M0m{#LgyFb3$ZfJ|TvJ@6IBxl=#}P7F zUQm30?6uB-RDNN!?(;o>wH#nUPgd;v!MD-%?AZ2?qt+q@t3PX^Mk+PdG|%-?_;nQw zuZ$27It~WT?ka>upIT3OlD4fhJ)CXoZt@~D`Dczx{rB@kS4a(FVA%Z-4ng52;dtho zAknH4Pt~lk`yzF0)2qdxaB%|}MZ=kA%7Kwnk5@OA+6)nhhEo1d>oGgKZ5tc)@WrwI zG17XB+V{fxMJl4^1Idlm@FjylbUB@`53V>$Q!jt9W7JUv>k1@4dLH3dtqJ|)5~@_J z7cr1(3GbDO!An&c6zPDaQM57fnh9z*E?b;u7Mh^Qo5Vc2!DGS36u#Ix$8)x?Irm6{ z7}cuRvJmQG>5e^wtI1GAmp?9wYSYtjI2SikR>hfkUi(>yGqI)UAkD7h23Ptc3fY$6 zmYEa>7JFpKt1@k|oKNW%mtSL?50_KFi5h%IOiq<pKLgg=sHRTsNTZBnhPLW^r|kn6 z8Re_<RZ0AasJ$}z>>{4;!@MIC^KDy=2U$;S1;)5V3mjuzRK7-EDilg-GAT>$iE1*< zOTI{(&xw!;<=MGvC#UDt#H8XN$0CU*@8&U}TCeKDX{J7kVw8EqKXXZ5?S)0r8!_T= zbD9r~hdlw*N|RvT8Hu{pnWljU;*BscX0j|C5;%Zfoe=cke=;m&cRRKqMBt%q{TD*q zQ%KVKE+MWd2FSKI%3w=8SZZBreZe|+H8l7r_%V4$9m{cqH?&76Uo_@gp|b7Cul`d1 z{()jgTxgWIvof<vu&m=K^H)4UteXY=Mn=(fP8fdSrbVcLIjZc2Svpz|<c6tYuF`p@ zm$!7kMztw8sAVZG?(={NMdqvhC$__132&yoV2+Gg#sYy*R9)NnUa(i0uC2S+=FIcK zmZ{l>GP6ke_N_hs)}ySjXV+u(F81M9^N=o!94{B1mnO^?LsiuU(sn|QYwC!RwZ{QB zn9>lK4nG=)e3Z+{$)10JX3spWdRu(Xp_uuBvl&2{nXXZ1&(GG5of?^3i1y(Z9r(zS z&~ZM2c(+qSqlZWCryE`X|B~t8)pYYR$JBcc?8ImA2+fgD`45Gp$|m9@>=kD~geqG; z0FZ6SBa^BT*_W3ecV}aKC#e&jX<EwMMs72?tDHfFYF43o;GWn-rCqYa7(fX70U<Fs zg=KJZX2|00CXdn#28X{yBzMsBErS}Fx)idt8JTwL2d>HP(-M>dHh3%#5JP*%eyg(v z)rU%lo$1Nhh-;h3clx3Z+wX+;zFvpSRDFF4+aC>I-kv(t?`&Nzq<bSgFJ^WD)$PH_ zSC#}pZN#F2oW7C_^}GI%7L{@V)x1=1QrlsuCd9OdJlcCFKB%~{k)`NrAL^IAPz}@w zu-XV&qoXTI?jh)745{crGZ4W^Jj?vCa;tBoE(;s1&l@N(wJY89?bZ@|LQ#Qmt|@}R z++PO;O*(E~C&rb5wKP`R6@dubW#8@~dIuEGys>@s<jN6(EVbWodh=GhcVpc>dU;Ou z0*xiZ7MBJOXodROe#P}=&lHcBz*l{CLRHi7hRqO_n@(z_>$Pa^IhP_v#1NIK{M^)Y zZKXaeL#J1Yo3ud7ixRG#%!5b3dTJvM7yss7SagQCYRYPOBU}ADOm)V&AX5_w$<!Oe zWbfMyrU`uf9p^t#<i7X9nOHrtS8S}LS<;w4{z-PKF<q>0ZZgsX034COmHl5Dvr3IB zfby5Bq-VHg_$%6U5+MH-X+s8oDa|SyE6v{#tE=emyBr>f-#QfUDS^^DbI;6N%WkN% z(ph~RS0U8qb%gP{a)j*EMT=0f>8(iN>-Ilvf0RrwcE%MqE9RPKpRH0)4|PaqsOfsY zKdJvyB`Y40KiLtgUw)@f`6}@`6I$LPtl-*vYM=$Zm%wfygtg6RPm5IzN)xWsQvEe2 zc#bB?PZ=H-c1`rDav5s-VXIb9y0RRS3|BakrYEshVW5HgJZe?+fq6l1JIn7_&MLB} zz7yB-I-`{`|DqBA)atbGBc#3X(edN@(DdudP*Hh)Q}<(0+=QA+3qSvQU^bG!baKR< z<bCyGC5Z-wW*tF>Yugb+-$%P4Rg738>_U0;V;-MrQGYQ1sS-6g9CTH@<GP$sOH<9# zhRZAJi66W+r9(}*thcy7cso(|F9eVYO<3?>5J_+Sc8jX?5SRc1ia%n|TMO_`)0+Jh zE*LS!^SS&G#6em)CtwtEA;ghu4iuOa=HXf4pQvr5uRs%5GUGa7t#cCy&Ke5Zjk@i6 zr0Z5PeU8Zd9My1{^rxNRzQ^({{=`lYXiljnBL@QhXRfgjs4VTNxjuDz*k{n|jHi>o z3<!1&D)}evSY8+h*<Gw6?DDT^7L0>jh6-B;6S;H>`1{wy{5OvR0EAOxE38?tY2Igk z0qstJ1Lv^8Fz!EreezF5&l&;%Qf2_ag?|9`E?_CV`B10X3vOE5te-4Eh7JHY_m77% z907m;n6Hz#3k>Gx>??UK(984ROMJX_S2y(p9ZC6bber>Uw41ZN)Bi`4-NA}@bC9RG zVzs?_ZBL7#CCDypounJ*0szkcqnLTO-|3+KUJlN_5UA__E2o6fg-`VakD&TDo(YTc b0r8%`<L``}*u1}uL~N6fAhiwj^wNI-=~eVK delta 4424 zcmZu!2UJtrwhf(7qLfgi6DiWWRFP)rA|Mb%Is#HcKoA5BO%O1Egeo<3kft;NQ3FVk zD!mAyNs$tY)QEn#`tQ5<{eRBbW2}9~o_p@S)>&iBxw%NRzDNWz(jy^d1W-~^0-Phe z%wB;wh)B-^v^WtTGF;-~<3sa=cN%M68FC-;qyxR9qopt5?l-;?N-EmyIKYcaOpNgH z2frb_tHRCfUm7@Yn%}(6cB`B8IkzUKwzZS`GVl>h^atA#YmZ|`jIMeZ$aYYqC8ja& z?a+3CFxeE9M7DHdq<3;IsxHRf{fJ!m9&vF(oRxW#<5;0$Co*P7JcWew$vkPQEv!SN z4TY&9hd!w7J+dvWZ*rlPio=A^7s#fOlIGMhJ#ZDXc1f3Zy0W2$)pETF`qn}hUR}AK z8)sR%o-^0*b<szuOx$tLl-=kO7aPWkq$VMtKg93rqh;9_s^v_A98dDQF3hA?YHN1# zpz;n`el_7({E&#k;YbxevHlNUqDj6=8(mx>J=FYr6@lA~1*-4e_((>|U)y$w%?ynb zzb1t5y$RXpNQQ3Up7THUuc3mkr5Sk#%NfH5&Bm%3`fz&P{!=L&Aw}?-(<4&PW=v%J zN3#iH#Wxpz{pkA6W~4_!S?nSH*_{Xgm>~uL{;CS_@3Nq$h<TBpJzKdMgK_3Eeb%BM zbz{jTds0+9KDQeNOFy&rNM)jw$VaNyrmye$H?3s1DKLxO$!wNW4E05s?Xd{BvWF%% z-5)`4B9p2hm!SRBx1-I3(>j^GcEVJvlSj$R;UBcHYK;L_f$)2j3NQ@;D|#1jT6lfd zHqjJhC`tn|uZ8TvgOZ?&GJSNJDkW59&l}k~S{65!ez{q?24oF*e2N7=&P*OmH}jvP zIZZA+$P>)~$@lYX*>0t&unx-^A8lXxQE^;b{kAZdH~q4f)Z-v#@5b59hcdVov`g+p zlygw%_YxLo)@(pJeXgseX}U6Fl6EHgSz;2Uh^ty5Hw}`urV^X+n3WxUnRbQ$X!BLF zeAptZMliO1%1lhVlV+bUu<{9bD2kfhB!=~p4Ea+1&i)i7tNyl34#<f_XbFa>Z5@eQ zS$gp(is;ML4&+&mDJVNUEAJYe<sACIIsZH5fPXv;XR#wXkhJZu)~K1e_>lB>q)w*y zyIpE5zy^lD8|OJWxTe`z{7)M_Cx;*r@aZPHU&x%WZ7z*iOv+|^>Eg8p?M!~!grXbh zeIm943WHlrIJBlp;%hXB<bdOV_E5*~GT)?O(nxgjNdH7$y=HXh;>_t*9Mt^eYujyh z%oT9rj^m)q)jPDB46VT_`sAqh)|~IxWD`u~cM$CiiY`_rlSkV>Z@%w6xh8;w=`%bD zQRgKD4R&b`rCu(OOo7|qAWc;^f>Xv5lqp#-$L0_`4>`)Hv=$!_P|SbRm3W+3%)Wfi zR9|`es~}g;daY$(b}pUShbkJF5cU0GLPt)=Ed<Uz`IfWQQR!TSE->sVM9K3R%sA1t z!7Q!1$mBrVoOP1fzg}WV3W9_lEM(@r)q3ri4|HD|k~R&oZuSkI)p}~8SS$yNpNgJ? zSsKN53)P@r9jWNmwHptvrfKQl&4?aIzmKo%95qN+iJJ{Ot!=&l8N32)FF-2ly!o(5 znLwJ!t)fE8$c85}a@ew2$BzU(i#TpF8mH5$`N;?k?`UMYJF?w7(~ET03ha?Py%7`n zl>AdYP!Gz!r>XPi8K0f|pgemXbtb_7-sv{?b86ASo}T6aJ~sQi#&crjoO2SJixCl4 zxstT71(N!GnuLLZCXskhPkznr>Pv-05krXL!ceAG<`2W*z^7FKMTTe|)HD5yalF?E z#QmbJAuWC+uujRs96@A8#Qnil85$)%tp`pgcbVx82v<_|n_t{?!Z~0U)xx(0W6?Jd z1F75zrY$(v%>zq`m5=ocBZ)BHlTGr^jMU0>^0e@wnd!Az=zd0Hmi3iQ6tEXF?1{&3 ze$c1XFKii}#;t)F^3<+JpSa-b?2VUA(gt>dzDdt5EyUAMOCVL{-;$o#T3G0pm>!E> zB)&l`iKD!Vm9*G*eI~%zA0z}!aJMk*Llsdg<Ycd2k@6PF4fp(b+O6KhDrmZF(H6g* zHl`yG#IoS1e!-Dyc=Sg=3YySi^KgXB7;0gc1U#TLz5)?qU@XDjQWc#H%dact8>W+f zF(|+t1FkinRY2k$b!_{dkB)h`4rD~k)g;*4FzH$pEzH=vvA_DBruCdtjSKR*c*nxQ zD)Z#ht89<)@j`mj=SE!QgI|T8ZKbn)qMnt~3FgO^Vs<v95A8bSO}+?j30-{klN=x1 zMr%u35s3KO*IcY##_-9Z;6jMgTvtNpuyp#K*_T9Vfnj4LXnWwxD_hOjm9emjJ(<e7 z@1@y@&(?HG*0unI^n<_Oa(HA8w`3?_s=ikM<_@?2EYl<jd*k<w*&{2c{B@h3j`Nr~ z9vXHNrp^*Kh}D!x)JouQ?PfI$l37CZ7Ki~czkU)_S9_JNsjAtmC4Elk&og7Lww7f_ zwl?_@P}->cAHvM@@+aV?0dkb*%h92v5nn2xlkUijbhu%0G`v~#`%aZtz-e!}eUBbd zbKc{CTjCz74ocT<?#(xYBfcjbT5<Xmazk4P<QV3zht`KF={qSOy?N8BE?~=l@WhKG z&m2s%JL&ZW!lwy7F<LjBbikHIPe$pH1X$*2)Ac6xl%)jf94c4WFY-MoU#+$*$((^m zTaB>PIGzvB3m#6@=}Qs~5LY-*^+>;1XQPN|Z7pjdIP7r+Qs-#Es!-+(V}sYUho91! z*k~0)PpRGp`WTpgYg_&Pb#2kP8B!62JTb6X8QP;^YG1H<xZaWB(8c4*knjMAr1!O$ zk`bA2jI0g2VI@dI<gX8js_5$&d(tX|2Hnbt6m<PQ^o%`Hj!PpTNH;0`a}ky@wagCN zIZ$PN=+xz0^#VA4hq#KPT8_=aIdiT{qf=k|NxuiNe`~Sn<&&!-Adig5dhK;LHMRJ* zOi{Zp;=5d?rVTcE7ewCraa#C$AZJA0N|_i8+jlt?Ud`%*k6W_wF?%R&@(&%gYGQ`l zJtxDROGHX$@4CA;JZdQm%X%p%X3iGaQg(lF_UG)$=nd{ule;@H*7g-?2PW#v>Io5Z zz@b;Zm7VQ+6{}Op1;~ctQQ{xn$uf0n{VRTHN@CQ}11XM*OC#}_ygkoK+mJdc^1xcn zy6YTb^(@TJ6WF}j?NAP(dQNcu4}nDx<9<lq5%3+!N2c(Fr$rWmSqw@RBP7)ClS)WB zm`EHLciSsk-Qrj*i#%sq_9u>59GDc0Mo6g2o*YLI#E$*i`iH)Bg6&J)**?XXwL-*V z4z{v?X0Q<s^Xg3Md#^k=c#IV3UUAN2teCEW)%O`Ppm<%N$PUB_h{GD{&rewG@iMhb zm2QA99(eqGpEp;kDOBJxAC*KYg;dWs-<3_AJi4mOXv}W+z%7bGqTpAKWX9zp90jx9 zdUT<Fm}C5Mm@jOZX;Ck{os`4;QzacQ_ic!&dH-XgZ3{175LexN8<H#`HS{7nS2Efd zYa+%&0%2Fw+dIl(HNoiMwD}|Sy0aN?wi$0!_RfD|&$ySbH0l)heutFBFBxRM<`wz? zrQ7+C1i}o<DVRXmX(78SYP`F@F*)>>4T6>LM@8>nuUy^<yT0&=^JWCS`LRE%{BbWm zle1)j1J&JXJYx$L5Ax=RuutP4314D<W|=Nn?4;ejSjoNI`<Odp%JZ)~ZX7$8UJ|== z+9U4Ys6IDS-!QFdQ@V8P-fY!^5VCUDyjXmc>2NDk*wY<9b5$rPbM7HU*!*f%MA6km zDkhQiwX$H(CkAF%*ljkf>u7fPGXx{;%PP@LXl-v!h5~lTK?S+o%-9S*8?uW53UA?U z1$C+E%^akYjFv(EysM83a4Q<Y!6haM;WZdN*>AeCAStjnQE9WyFAYyQ$4ap!oCnDa zzoHQp+6aH!H0p;y^-n&y_ryBrPQ}#B+=Y%VqL39d1&S}hp=NGr_xAe!Zg|s}PZv1M z!tQ1B3+EP6q<n#`;r>oTYsu|*^Y0u7Rlvbdtg4%vrz^V1VwZir)im0`+V{m0Ry#>m zdH4J;IVq1F{=7Un300hFetFnsKNnlSU#xe^#EZjCs=ly%bkN;$K~&BodInxJ5qr2g zB|uQcZIzSsolFt*rm@S#z;|ME<)#p1_d2_1RlLqu<Ts>`<L;s%Ti17KVJXLJvceh- z7Cy0csOXQLua=qIs24mM9uaQGX@q~{{iwqe(_dt7y9EXcqGM2cDg6q&Jo}{rJ23jW zwzuu~BK0{g<9pA<(Wir9yh!naFl|XL5aSbANYu|edOdGoL#cc3mnYb((ri5eAGOv) zwgP;L42TeD<S9bO;uS2W2%<I4;8sL~Ii-Bo^%3=tAdQC6&kboI6waF*!E)V6w_;`< zOQ2b0X16BBgSHvFd^hgB`g-R=otxOy2db4o!dI6SSdeQYt$ks!rbXk&{2WJBdaK(2 zU2J(=+GC2Q*$!c2AVQ%&l_zw3ez(5B)?Ngo3@Lh=U2kBZ{gmtth5E|0=#$sVeYHpr zP>dFq@QdhNhCZbKI!8kV08B;xk^X<n(3(;QKH}eEbIV2ePc-B-_(yhfxCQ<Znwjnr z$YhqLk}{zWdGSs?VU@xTH|ZO8H0m+iha3WQWfw0BV)UeZ@Qu=b>T-8`ge*gS)n6i% zb)yiZF|J~!l5w~d@$O*dESlHH9U-yR=8XueM{rI`L^-L>-7;Fi@}()=Z#%`JPca*@ zOxHc5+LT&rcXNXl!lBCD+1$lFpP&P7$e=G?w>Y8k1~%7G4)^u>SoSUWF}ereL`=7y zdKDfSHWe78<h|ZP6iRF@OJGavDYzZeM3iw=M>5qm#>_^0k?Zwg8Z!A~?~S8rmmvD; zL)j~n(1jO$<#M3-kLr(tcA)-hSu8Td>tvZXG}re+6$i*jzFX)f6<lQM3(e`dhtylC zd&`2G$fW!=mcp=d75pX^i={55$!s$>F>_s<j)sekjge3PT1*^u0a_Uu<4$i)?Qn8f zbNR=U*f@k%_^hzMPaTIxcxV}86n&N~1FQ3YI>>Zn1=S@{R|~GGV#k`KHGxSsPC(QS zFe*g3spRMO+QzlWu_ju{F749>h|=+2)hw<tjYgfBib9I>Y7!AM0{&yL(Qclyl;;Nf z-0h)DJg?H8PyV(c=nYTF-!_5=eu>ButqkY=Jza-iB9<aUQ+RQ3p97u?LW;=FDA-BQ z#y^}208jx$8<BCMGvPFUE$oxe5e69o08*v^0Qg@Ee^8+{y&yK{yTK02MS*9#Va^8K zzZMz50Dy;ZZ%1(-rw0#QJ)M2T{5{<N`%eG-d;bkjwnTTqxqjck&Fd2JoFh8QixYXy zNm(d6k3ZuZKRZ7Czc_);e>gpTJ?x#l&shII(nP$KPRbcR@+<=v|Am)#{eyRLvU7Cu wmi#|x&NKQ7+ItYyGk74`f78>TLlHb&=STc!9nUS`f1X%07Qs&r^F06ZKNsoweE<Le From 36ce369d90cb17dce88e82d35e5b812c23e0d6c9 Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Fri, 15 Dec 2023 17:00:21 -0800 Subject: [PATCH 789/954] ui changes and remove crown type from submission --- .../parcel/parcel.component.html | 66 ++++++++++--------- .../parcel-entry/parcel-entry.component.html | 9 +-- .../parcel-entry/parcel-entry.component.scss | 6 ++ .../parcel-entry/parcel-entry.component.ts | 2 +- .../parcel-entry/parcel-entry.component.html | 6 +- .../parcel/parcel.component.html | 2 +- .../submission/parcel/parcel.component.html | 2 +- .../submission/parcel/parcel.component.html | 2 +- .../parcel-owners.component.html | 2 +- .../application-submission.entity.ts | 8 --- .../notice-of-intent-submission.entity.ts | 8 --- ...84-remove-crownlandtype-from-submission.ts | 16 +++++ 12 files changed, 69 insertions(+), 60 deletions(-) create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1702658459584-remove-crownlandtype-from-submission.ts diff --git a/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.html b/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.html index 6cec01bd1f..89c295e0ab 100644 --- a/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.html +++ b/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.html @@ -99,38 +99,40 @@ <h4>Parcel {{ parcelInd + 1 }}</h4> </div> <ng-container *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN"> - <h4 *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">Government Parcel Contact</h4> - <div class="subheading2 grid-1">First Name</div> - <div class="grid-double"> - {{ parcel.owners[0].firstName }} - <app-no-data [showRequired]="showErrors" *ngIf="!parcel.owners[0].firstName"></app-no-data> - </div> - <div class="subheading2 grid-1" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">Last Name</div> - <div class="grid-double"> - {{ parcel.owners[0].lastName }} - <app-no-data [showRequired]="showErrors" *ngIf="!parcel.owners[0].lastName"></app-no-data> - </div> - <div class="subheading2 grid-1" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">Ministry or Department</div> - <div class="grid-double"> - {{ parcel.owners[0].organizationName }} - <app-no-data [showRequired]="showErrors" *ngIf="!parcel.owners[0].organizationName"></app-no-data> - </div> - <div class="subheading2 grid-1" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">Phone</div> - <div class="grid-double"> - {{ parcel.owners[0].phoneNumber }} - <app-no-data [showRequired]="showErrors" *ngIf="!parcel.owners[0].phoneNumber"></app-no-data> - </div> - <div class="subheading2 grid-1" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">Email</div> - <div class="grid-double"> - {{ parcel.owners[0].email }} - <app-no-data [showRequired]="showErrors" *ngIf="!parcel.owners[0].email"></app-no-data> - </div> - <div class="subheading2 grid-1" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">Crown Type</div> - <div class="grid-double"> - {{ parcel.owners[0].crownLandOwnerType === 'provincial' ? 'Provincial Crown' : ''}} - {{ parcel.owners[0].crownLandOwnerType === 'federal' ? 'Federal Crown' : ''}} - <app-no-data [showRequired]="showErrors" *ngIf="!parcel.owners[0].crownLandOwnerType"></app-no-data> - </div> + <h5 *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">Government Parcel Contact</h5> + <ng-container *ngIf="parcel.owners[0]"> + <div class="subheading2 grid-1">First Name</div> + <div class="grid-double"> + {{ parcel.owners[0].firstName }} + </div> + <div class="subheading2 grid-1" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">Last Name</div> + <div class="grid-double"> + {{ parcel.owners[0].lastName }} + <app-no-data [showRequired]="showErrors" *ngIf="!parcel.owners[0].lastName"></app-no-data> + </div> + <div class="subheading2 grid-1" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">Ministry or Department</div> + <div class="grid-double"> + {{ parcel.owners[0].organizationName }} + <app-no-data [showRequired]="showErrors" *ngIf="!parcel.owners[0].organizationName"></app-no-data> + </div> + <div class="subheading2 grid-1" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">Phone</div> + <div class="grid-double"> + {{ parcel.owners[0].phoneNumber }} + <app-no-data [showRequired]="showErrors" *ngIf="!parcel.owners[0].phoneNumber"></app-no-data> + </div> + <div class="subheading2 grid-1" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">Email</div> + <div class="grid-double"> + {{ parcel.owners[0].email }} + <app-no-data [showRequired]="showErrors" *ngIf="!parcel.owners[0].email"></app-no-data> + </div> + <div class="subheading2 grid-1" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">Crown Type</div> + <div class="grid-double"> + {{ parcel.owners[0].crownLandOwnerType === 'provincial' ? 'Provincial Crown' : ''}} + {{ parcel.owners[0].crownLandOwnerType === 'federal' ? 'Federal Crown' : ''}} + <app-no-data [showRequired]="showErrors" *ngIf="!parcel.owners[0].crownLandOwnerType"></app-no-data> + </div> + </ng-container> + <app-no-data [showRequired]="showErrors" *ngIf="!parcel.owners[0]"></app-no-data> </ng-container> <div diff --git a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html index f0fcc580ba..bb2ae2b203 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html @@ -289,16 +289,17 @@ <h6 class="owner-search-option">OR</h6> (click)="onAddNewGovernmentContact()" mat-flat-button color="primary" - [disabled]="_disabled || parcel.owners.length > 0" > Add new gov contact </button> <h6 class="owner-search-option" *ngIf="filteredOwners.length">OR</h6> - <label for="owner-search" *ngIf="filteredOwners.length">Select from Existing Government</label> + <label for="owner-search" *ngIf="filteredOwners.length">Select from Existing Government Contacts</label> <div> <mat-radio-group color="primary" [value]="selectedOwner?.uuid" required + [ngClass]="{ 'error': ownerInput.errors && ownerInput.errors['required'] }" + formControlName="selectedOwnerVal" > <mat-radio-button *ngFor="let owner of filteredOwners" @@ -322,7 +323,7 @@ <h6 class="owner-search-option" *ngIf="filteredOwners.length">OR</h6> <div class="value">{{ selectedOwner.lastName }}</div> </div> <div class="row"> - <div class="key"><strong>Ministry/ Department:</strong> </div> + <div class="key"><strong>Ministry or Department:</strong> </div> <div class="value">{{ selectedOwner.organizationName }}</div> </div> <div class="row"> @@ -338,7 +339,7 @@ <h6 class="owner-search-option" *ngIf="filteredOwners.length">OR</h6> <div class="value">{{ selectedOwner.crownLandOwnerType }}</div> </div> <div class="row"> - <button [disabled]="_disabled" (click)="onEdit(selectedOwner)" mat-stroked-button>Edit information</button> + <button [disabled]="_disabled" (click)="onEdit(selectedOwner)" mat-flat-button>Edit information</button> </div> </div> </div> diff --git a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.scss b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.scss index 3e5cfbb6b9..d18726b3b0 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.scss +++ b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.scss @@ -107,6 +107,12 @@ mat-button-toggle-group#isFarm { } } +:host::ng-deep { + .mat-mdc-radio-group.error .mdc-radio__outer-circle { + border-color: colors.$error-color !important; + } +} + .warning-banner { margin-top: rem(8); background-color: rgba(colors.$accent-color-light, 0.5); diff --git a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts index 8ed80ecd53..a72519ca9d 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts @@ -100,7 +100,7 @@ export class ParcelEntryComponent implements OnInit { purchaseDate: this.purchaseDate, crownLandOwnerType: this.crownLandOwnerType, isConfirmedByApplicant: this.isConfirmedByApplicant, - searchBy: this.searchBy, + searchBy: this.searchBy }); pidPinPlaceholder = ''; selectedOwner?: ApplicationOwnerDto = undefined; diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.html index 883a6139b6..554b7bc307 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.html @@ -297,7 +297,7 @@ <h6 class="owner-search-option">OR</h6> Add new gov contact </button> <h6 class="owner-search-option" *ngIf="filteredOwners.length">OR</h6> - <label for="owner-search" *ngIf="filteredOwners.length">Select from Existing Government</label> + <label for="owner-search" *ngIf="filteredOwners.length">Select from Existing Government Contacts</label> <div> <mat-radio-group color="primary" @@ -325,7 +325,7 @@ <h6 class="owner-search-option" *ngIf="filteredOwners.length">OR</h6> <div class="value">{{ selectedOwner.lastName }}</div> </div> <div class="row"> - <div class="key"><strong>Ministry/ Department:</strong> </div> + <div class="key"><strong>Ministry or Department:</strong> </div> <div class="value">{{ selectedOwner.organizationName }}</div> </div> <div class="row"> @@ -341,7 +341,7 @@ <h6 class="owner-search-option" *ngIf="filteredOwners.length">OR</h6> <div class="value">{{ selectedOwner.crownLandOwnerType }}</div> </div> <div class="row"> - <button [disabled]="_disabled" (click)="onEdit(selectedOwner)" mat-stroked-button>Edit information</button> + <button [disabled]="_disabled" (click)="onEdit(selectedOwner)" mat-flat-button>Edit information</button> </div> </div> </div> diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/parcel/parcel.component.html b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/parcel/parcel.component.html index 46d0208429..06153e3ecb 100644 --- a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/parcel/parcel.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/parcel/parcel.component.html @@ -99,7 +99,7 @@ <h4>Parcel {{ parcelInd + 1 }}</h4> </div> <ng-container *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN"> - <h4 *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">Government Parcel Contact</h4> + <h5 *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">Government Parcel Contact</h5> <div class="subheading2 grid-1">First Name</div> <div class="grid-double"> {{ parcel.owners[0].firstName }} diff --git a/portal-frontend/src/app/features/public/application/submission/parcel/parcel.component.html b/portal-frontend/src/app/features/public/application/submission/parcel/parcel.component.html index 806c4bb2eb..f67369d218 100644 --- a/portal-frontend/src/app/features/public/application/submission/parcel/parcel.component.html +++ b/portal-frontend/src/app/features/public/application/submission/parcel/parcel.component.html @@ -62,7 +62,7 @@ <h4>Parcel {{ parcelInd + 1 }}</h4> <div class="subheading2">Land Owner(s)</div> <div class="subheading2" *ngIf="parcel.ownershipTypeCode !== PARCEL_OWNERSHIP_TYPES.CROWN">Organization</div> <div class="subheading2" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN"> - Ministry/ Department + Ministry or Department </div> <ng-container *ngFor="let owner of parcel.owners"> <div>{{ owner.displayName }}</div> diff --git a/portal-frontend/src/app/features/public/notice-of-intent/submission/parcel/parcel.component.html b/portal-frontend/src/app/features/public/notice-of-intent/submission/parcel/parcel.component.html index 806c4bb2eb..f67369d218 100644 --- a/portal-frontend/src/app/features/public/notice-of-intent/submission/parcel/parcel.component.html +++ b/portal-frontend/src/app/features/public/notice-of-intent/submission/parcel/parcel.component.html @@ -62,7 +62,7 @@ <h4>Parcel {{ parcelInd + 1 }}</h4> <div class="subheading2">Land Owner(s)</div> <div class="subheading2" *ngIf="parcel.ownershipTypeCode !== PARCEL_OWNERSHIP_TYPES.CROWN">Organization</div> <div class="subheading2" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN"> - Ministry/ Department + Ministry or Department </div> <ng-container *ngFor="let owner of parcel.owners"> <div>{{ owner.displayName }}</div> diff --git a/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.html b/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.html index 75d53437ed..660383ee96 100644 --- a/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.html +++ b/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.html @@ -21,7 +21,7 @@ </ng-container> <ng-container *ngIf="isCrown" matColumnDef="organizationName"> - <th mat-header-cell *matHeaderCellDef>Ministry/ Department</th> + <th mat-header-cell *matHeaderCellDef>Ministry or Department</th> <td mat-cell *matCellDef="let element">{{ element.organizationName }}</td> </ng-container> diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts b/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts index efea59cc51..d019f133c6 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts @@ -199,14 +199,6 @@ export class ApplicationSubmission extends Base { }) typeCode: string; - @AutoMap() - @Column({ - type: 'varchar', - nullable: true, - default: null - }) - crownLandOwnerType?: string | null; - @AutoMap(() => [ApplicationOwner]) @OneToMany(() => ApplicationOwner, (owner) => owner.applicationSubmission) owners: ApplicationOwner[]; diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.entity.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.entity.ts index e15f87ee7e..e26d5939ce 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.entity.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.entity.ts @@ -194,14 +194,6 @@ export class NoticeOfIntentSubmission extends Base { }) typeCode: string; - @AutoMap() - @Column({ - type: 'varchar', - nullable: true, - default: null - }) - crownLandOwnerType?: string | null; - //Soil & Fill @AutoMap(() => Boolean) @Column({ type: 'boolean', nullable: true }) diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1702658459584-remove-crownlandtype-from-submission.ts b/services/apps/alcs/src/providers/typeorm/migrations/1702658459584-remove-crownlandtype-from-submission.ts new file mode 100644 index 0000000000..47599f5988 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1702658459584-remove-crownlandtype-from-submission.ts @@ -0,0 +1,16 @@ +import { MigrationInterface, QueryRunner } from "typeorm"; + +export class RemoveCrownlandtypeFromSubmission1702658459584 implements MigrationInterface { + name = 'RemoveCrownlandtypeFromSubmission1702658459584' + + public async up(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query(`ALTER TABLE "alcs"."application_submission" DROP COLUMN "crown_land_owner_type"`); + await queryRunner.query(`ALTER TABLE "alcs"."notice_of_intent_submission" DROP COLUMN "crown_land_owner_type"`); + } + + public async down(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query(`ALTER TABLE "alcs"."notice_of_intent_submission" ADD "crown_land_owner_type" character varying`); + await queryRunner.query(`ALTER TABLE "alcs"."application_submission" ADD "crown_land_owner_type" character varying`); + } + +} From ee1e86f6368b9d69b4b1394b5397ea35f1c56616 Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Fri, 15 Dec 2023 17:05:47 -0800 Subject: [PATCH 790/954] fixes --- .../parcel-details/parcel-details.component.ts | 2 +- .../parcel-details/parcel-entry/parcel-entry.component.html | 6 ++++-- .../edit-submission/parcels/parcel-details.component.ts | 2 +- .../parcels/parcel-entry/parcel-entry.component.html | 4 ++-- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-details.component.ts b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-details.component.ts index 69d90d3cfb..c29a696a28 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-details.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-details.component.ts @@ -1,4 +1,4 @@ -import { AfterViewInit, Component, EventEmitter, OnInit, Output, signal } from '@angular/core'; +import { AfterViewInit, Component, EventEmitter, OnInit, Output } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; import { Router } from '@angular/router'; import { BehaviorSubject, takeUntil } from 'rxjs'; diff --git a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html index e1bd185e7e..17c8e2389f 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html @@ -346,8 +346,10 @@ <h6 class="owner-search-option" *ngIf="filteredOwners.length">OR</h6> <div class="key"><strong>Crown Type:</strong></div> <div class="value">{{ selectedOwner.crownLandOwnerType }}</div> </div> - <div class="row"> - <button [disabled]="_disabled" (click)="onEdit(selectedOwner)" mat-flat-button>Edit information</button> + <div class="row"> + <button [disabled]="_disabled" (click)="onEditCrownOwner(selectedOwner)" mat-flat-button> + Edit information + </button> </div> </div> </div> diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-details.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-details.component.ts index 665439de02..f79cf6b425 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-details.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-details.component.ts @@ -1,4 +1,4 @@ -import { AfterViewInit, Component, EventEmitter, OnInit, Output, signal } from '@angular/core'; +import { AfterViewInit, Component, EventEmitter, OnInit, Output } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; import { Router } from '@angular/router'; import { BehaviorSubject, takeUntil } from 'rxjs'; diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.html index e7611cff1a..ab96463af2 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.html @@ -341,8 +341,8 @@ <h6 class="owner-search-option" *ngIf="filteredOwners.length">OR</h6> <div class="key"><strong>Crown Type:</strong> </div> <div class="value">{{ selectedOwner.crownLandOwnerType }}</div> </div> - <div class="row"> - <button [disabled]="_disabled" (click)="onEdit(selectedOwner)" mat-flat-button>Edit information</button> + <div class="row"> + <button [disabled]="_disabled" (click)="onEditCrownOwner(selectedOwner)" mat-flat-button>Edit information</button> </div> </div> </div> From 6045a1c0c995ebc8116a965fa3fa72125a9d880c Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Mon, 18 Dec 2023 10:58:16 -0800 Subject: [PATCH 791/954] fixes --- .../parcel/parcel.component.html | 1 + .../parcel-entry/parcel-entry.component.scss | 6 -- .../parcel-entry/parcel-entry.component.html | 2 + .../parcel/parcel.component.html | 65 ++++++++++--------- portal-frontend/src/styles/form-controls.scss | 4 ++ 5 files changed, 41 insertions(+), 37 deletions(-) diff --git a/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.html b/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.html index 9e44813428..07fbe6ca70 100644 --- a/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.html +++ b/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.html @@ -104,6 +104,7 @@ <h5 *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">Government <div class="subheading2 grid-1">First Name</div> <div class="grid-double"> {{ parcel.owners[0].firstName }} + <app-no-data [showRequired]="showErrors" *ngIf="!parcel.owners[0].firstName"></app-no-data> </div> <div class="subheading2 grid-1" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">Last Name</div> <div class="grid-double"> diff --git a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.scss b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.scss index d18726b3b0..3e5cfbb6b9 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.scss +++ b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.scss @@ -107,12 +107,6 @@ mat-button-toggle-group#isFarm { } } -:host::ng-deep { - .mat-mdc-radio-group.error .mdc-radio__outer-circle { - border-color: colors.$error-color !important; - } -} - .warning-banner { margin-top: rem(8); background-color: rgba(colors.$accent-color-light, 0.5); diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.html index ab96463af2..8aee760726 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.html @@ -303,6 +303,8 @@ <h6 class="owner-search-option" *ngIf="filteredOwners.length">OR</h6> <mat-radio-group color="primary" [value]="selectedOwner?.uuid" required + [ngClass]="{ 'error': ownerInput.errors && ownerInput.errors['required'] }" + formControlName="selectedOwnerVal" > <mat-radio-button *ngFor="let owner of filteredOwners" diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/parcel/parcel.component.html b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/parcel/parcel.component.html index e6062514d2..28bbdfb721 100644 --- a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/parcel/parcel.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/parcel/parcel.component.html @@ -100,37 +100,40 @@ <h4>Parcel #{{ parcelInd + 1 }}</h4> <ng-container *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN"> <h5 *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">Government Parcel Contact</h5> - <div class="subheading2 grid-1">First Name</div> - <div class="grid-double"> - {{ parcel.owners[0].firstName }} - <app-no-data [showRequired]="showErrors" *ngIf="!parcel.owners[0].firstName"></app-no-data> - </div> - <div class="subheading2 grid-1" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">Last Name</div> - <div class="grid-double"> - {{ parcel.owners[0].lastName }} - <app-no-data [showRequired]="showErrors" *ngIf="!parcel.owners[0].lastName"></app-no-data> - </div> - <div class="subheading2 grid-1" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">Ministry or Department</div> - <div class="grid-double"> - {{ parcel.owners[0].organizationName }} - <app-no-data [showRequired]="showErrors" *ngIf="!parcel.owners[0].organizationName"></app-no-data> - </div> - <div class="subheading2 grid-1" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">Phone</div> - <div class="grid-double"> - {{ parcel.owners[0].phoneNumber }} - <app-no-data [showRequired]="showErrors" *ngIf="!parcel.owners[0].phoneNumber"></app-no-data> - </div> - <div class="subheading2 grid-1" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">Email</div> - <div class="grid-double"> - {{ parcel.owners[0].email }} - <app-no-data [showRequired]="showErrors" *ngIf="!parcel.owners[0].email"></app-no-data> - </div> - <div class="subheading2 grid-1" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">Crown Type</div> - <div class="grid-double"> - {{ parcel.owners[0].crownLandOwnerType === 'provincial' ? 'Provincial Crown' : ''}} - {{ parcel.owners[0].crownLandOwnerType === 'federal' ? 'Federal Crown' : ''}} - <app-no-data [showRequired]="showErrors" *ngIf="!parcel.owners[0].crownLandOwnerType"></app-no-data> - </div> + <ng-container *ngIf="parcel.owners[0]"> + <div class="subheading2 grid-1">First Name</div> + <div class="grid-double"> + {{ parcel.owners[0].firstName }} + <app-no-data [showRequired]="showErrors" *ngIf="!parcel.owners[0].firstName"></app-no-data> + </div> + <div class="subheading2 grid-1" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">Last Name</div> + <div class="grid-double"> + {{ parcel.owners[0].lastName }} + <app-no-data [showRequired]="showErrors" *ngIf="!parcel.owners[0].lastName"></app-no-data> + </div> + <div class="subheading2 grid-1" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">Ministry or Department</div> + <div class="grid-double"> + {{ parcel.owners[0].organizationName }} + <app-no-data [showRequired]="showErrors" *ngIf="!parcel.owners[0].organizationName"></app-no-data> + </div> + <div class="subheading2 grid-1" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">Phone</div> + <div class="grid-double"> + {{ parcel.owners[0].phoneNumber }} + <app-no-data [showRequired]="showErrors" *ngIf="!parcel.owners[0].phoneNumber"></app-no-data> + </div> + <div class="subheading2 grid-1" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">Email</div> + <div class="grid-double"> + {{ parcel.owners[0].email }} + <app-no-data [showRequired]="showErrors" *ngIf="!parcel.owners[0].email"></app-no-data> + </div> + <div class="subheading2 grid-1" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">Crown Type</div> + <div class="grid-double"> + {{ parcel.owners[0].crownLandOwnerType === 'provincial' ? 'Provincial Crown' : ''}} + {{ parcel.owners[0].crownLandOwnerType === 'federal' ? 'Federal Crown' : ''}} + <app-no-data [showRequired]="showErrors" *ngIf="!parcel.owners[0].crownLandOwnerType"></app-no-data> + </div> + </ng-container> + <app-no-data [showRequired]="showErrors" *ngIf="!parcel.owners[0]"></app-no-data> </ng-container> <div diff --git a/portal-frontend/src/styles/form-controls.scss b/portal-frontend/src/styles/form-controls.scss index d8a380dc1f..e567c57c4d 100644 --- a/portal-frontend/src/styles/form-controls.scss +++ b/portal-frontend/src/styles/form-controls.scss @@ -199,3 +199,7 @@ form { } } } + +.mat-mdc-radio-group.error .mdc-radio__outer-circle { + border-color: colors.$error-color !important; +} From 2bf9d8112818d076e0853e1f071152e9fce29f04 Mon Sep 17 00:00:00 2001 From: "to. sandra" <76515860+sandratoh@users.noreply.github.com> Date: Mon, 18 Dec 2023 14:59:02 -0800 Subject: [PATCH 792/954] Vertically align checkboxs for all viewport width and update description (#1238) --- .../submit-confirmation-dialog.component.scss | 1 + .../review-resolution/review-resolution.component.html | 2 +- .../submit-confirmation-dialog.component.scss | 1 + .../submit-confirmation-dialog.component.scss | 1 + .../submit-confirmation-dialog.component.scss | 1 + 5 files changed, 5 insertions(+), 1 deletion(-) diff --git a/portal-frontend/src/app/features/applications/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.scss b/portal-frontend/src/app/features/applications/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.scss index 93f22cbbcb..fa173368db 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.scss +++ b/portal-frontend/src/app/features/applications/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.scss @@ -2,6 +2,7 @@ .checkbox { margin: rem(10) 0; + width: 100%; } p { diff --git a/portal-frontend/src/app/features/applications/review-submission/review-resolution/review-resolution.component.html b/portal-frontend/src/app/features/applications/review-submission/review-resolution/review-resolution.component.html index 79629ca9ef..cc3864700d 100644 --- a/portal-frontend/src/app/features/applications/review-submission/review-resolution/review-resolution.component.html +++ b/portal-frontend/src/app/features/applications/review-submission/review-resolution/review-resolution.component.html @@ -1,7 +1,7 @@ <h2>Resolution</h2> <div> <div class="description"> - <div>Provide the {{ governmentName }} resolution</div> + <div>Provide the {{ governmentName }} resolution outcome</div> </div> <div *ngIf="!isFirstNationGovernment && (this.isOCPDesignation === null || this.isSubjectToZoning === null)"> Please complete both Step 2 Plans & Bylaws: OCP and Step 3 Plans & Bylaws: Zoning to continue with this step. diff --git a/portal-frontend/src/app/features/applications/review-submission/submit-confirmation-dialog/submit-confirmation-dialog.component.scss b/portal-frontend/src/app/features/applications/review-submission/submit-confirmation-dialog/submit-confirmation-dialog.component.scss index 6e3db34e0e..44f94371f0 100644 --- a/portal-frontend/src/app/features/applications/review-submission/submit-confirmation-dialog/submit-confirmation-dialog.component.scss +++ b/portal-frontend/src/app/features/applications/review-submission/submit-confirmation-dialog/submit-confirmation-dialog.component.scss @@ -2,6 +2,7 @@ .checkbox { margin: rem(10) 0; + width: 100%; } h4 { diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.scss b/portal-frontend/src/app/features/notice-of-intents/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.scss index 93f22cbbcb..fa173368db 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.scss +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.scss @@ -2,6 +2,7 @@ .checkbox { margin: rem(10) 0; + width: 100%; } p { diff --git a/portal-frontend/src/app/features/notifications/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.scss b/portal-frontend/src/app/features/notifications/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.scss index 93f22cbbcb..fa173368db 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.scss +++ b/portal-frontend/src/app/features/notifications/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.scss @@ -2,6 +2,7 @@ .checkbox { margin: rem(10) 0; + width: 100%; } p { From 24e38c408155ba8fefa9467a71aa02234e626a30 Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Mon, 18 Dec 2023 15:59:56 -0800 Subject: [PATCH 793/954] ui fixes for gov contact --- .../parcel-entry/parcel-entry.component.html | 1 + .../parcel-entry/parcel-entry.component.scss | 14 +++- .../parcel-entry/parcel-entry.component.html | 2 +- .../parcel-entry/parcel-entry.component.scss | 14 +++- .../crown-owner-dialog.component.html | 14 +++- .../crown-owner-dialog.component.ts | 74 ++++++++++--------- 6 files changed, 80 insertions(+), 39 deletions(-) diff --git a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html index 17c8e2389f..dfe1c1ed2d 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html @@ -295,6 +295,7 @@ <h6 class="owner-search-option">OR</h6> class="new-owner" *ngIf="enableAddNewOwner" (click)="onAddNewGovernmentContact()" + [ngClass]="{ 'mat-error': ownerInput.errors && ownerInput.errors['required'] }" mat-flat-button color="primary" > diff --git a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.scss b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.scss index 3e5cfbb6b9..7e90e0ddb4 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.scss +++ b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.scss @@ -132,5 +132,17 @@ mat-button-toggle-group#isFarm { flex-grow: 1; overflow: hidden; text-overflow: ellipsis; - } + } + + @media screen and (max-width: $tabletBreakpoint) { + .row { + flex-direction: column; + align-items: flex-start; + } + + .key { + width: auto; + margin-bottom: rem(5); + } + } } \ No newline at end of file diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.html index 8aee760726..02adef5ae1 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.html @@ -293,7 +293,7 @@ <h6 class="owner-search-option">OR</h6> (click)="onAddNewGovernmentContact()" mat-flat-button color="primary" - [disabled]="_disabled || parcel.owners.length > 0" + [ngClass]="{ 'mat-error': ownerInput.errors && ownerInput.errors['required'] }" > Add new gov contact </button> diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.scss b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.scss index 247764fecc..0fa73d7427 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.scss +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.scss @@ -131,5 +131,17 @@ mat-button-toggle-group#isFarm { flex-grow: 1; overflow: hidden; text-overflow: ellipsis; - } + } + + @media screen and (max-width: $tabletBreakpoint) { + .row { + flex-direction: column; + align-items: flex-start; + } + + .key { + width: auto; + margin-bottom: rem(5); + } + } } \ No newline at end of file diff --git a/portal-frontend/src/app/shared/owner-dialogs/crown-owner-dialog/crown-owner-dialog.component.html b/portal-frontend/src/app/shared/owner-dialogs/crown-owner-dialog/crown-owner-dialog.component.html index 225e97d97f..becc51af4f 100644 --- a/portal-frontend/src/app/shared/owner-dialogs/crown-owner-dialog/crown-owner-dialog.component.html +++ b/portal-frontend/src/app/shared/owner-dialogs/crown-owner-dialog/crown-owner-dialog.component.html @@ -77,9 +77,19 @@ <h2 *ngIf="isEdit">Edit Government Contact</h2> <div class="full-row"> <mat-label for="type">Crown Type</mat-label> <mat-button-toggle-group formControlName="crownLandOwnerType" class="input" id="crownLandOwnerType"> - <mat-button-toggle value="provincial">Provincial Crown</mat-button-toggle> - <mat-button-toggle value="federal">Federal Crown</mat-button-toggle> + <mat-button-toggle value="provincial" + [ngClass]="{ 'error-outline': crownLandOwnerType.touched && crownLandOwnerType.errors?.['required'] }"> + Provincial Crown + </mat-button-toggle> + <mat-button-toggle value="federal" + [ngClass]="{ 'error-outline': crownLandOwnerType.touched && crownLandOwnerType.errors?.['required'] }"> + Federal Crown + </mat-button-toggle> </mat-button-toggle-group> + <div *ngIf="crownLandOwnerType.touched && crownLandOwnerType.errors?.['required']" class="field-error"> + <mat-icon>warning</mat-icon> + <div *ngIf="crownLandOwnerType.errors?.['required']">This field is required</div> + </div> </div> </div> </form> diff --git a/portal-frontend/src/app/shared/owner-dialogs/crown-owner-dialog/crown-owner-dialog.component.ts b/portal-frontend/src/app/shared/owner-dialogs/crown-owner-dialog/crown-owner-dialog.component.ts index d865a0450f..c207324a0e 100644 --- a/portal-frontend/src/app/shared/owner-dialogs/crown-owner-dialog/crown-owner-dialog.component.ts +++ b/portal-frontend/src/app/shared/owner-dialogs/crown-owner-dialog/crown-owner-dialog.component.ts @@ -66,20 +66,23 @@ export class CrownOwnerDialogComponent { } async onCreate() { - const createDto: ApplicationOwnerCreateDto & NoticeOfIntentOwnerCreateDto = { - organizationName: this.ministryName.getRawValue() || undefined, - firstName: this.firstName.getRawValue() || undefined, - lastName: this.lastName.getRawValue() || undefined, - email: this.email.getRawValue()!, - phoneNumber: this.phoneNumber.getRawValue()!, - typeCode: OWNER_TYPE.CROWN, - applicationSubmissionUuid: this.data.submissionUuid, - noticeOfIntentSubmissionUuid: this.data.submissionUuid, - crownLandOwnerType: this.crownLandOwnerType.getRawValue(), - }; + this.form.markAllAsTouched(); + if (this.form.valid) { + const createDto: ApplicationOwnerCreateDto & NoticeOfIntentOwnerCreateDto = { + organizationName: this.ministryName.getRawValue() || undefined, + firstName: this.firstName.getRawValue() || undefined, + lastName: this.lastName.getRawValue() || undefined, + email: this.email.getRawValue()!, + phoneNumber: this.phoneNumber.getRawValue()!, + typeCode: OWNER_TYPE.CROWN, + applicationSubmissionUuid: this.data.submissionUuid, + noticeOfIntentSubmissionUuid: this.data.submissionUuid, + crownLandOwnerType: this.crownLandOwnerType.getRawValue() || undefined, + }; - const res = await this.data.ownerService.create(createDto); - this.dialogRef.close({ ...res}); + const res = await this.data.ownerService.create(createDto); + this.dialogRef.close({ ...res }); + } } async onClose() { @@ -88,30 +91,33 @@ export class CrownOwnerDialogComponent { async onDelete() { this.confDialogService - .openDialog({ - body: `This action will remove ${this.firstName.value} ${this.lastName.value} and its usage from the entire application. Are you sure you want to remove this owner? `, - }) - .subscribe(async (didConfirm) => { - if (didConfirm) { - const res = await this.data.ownerService.delete(this.existingUuid ?? ''); - this.dialogRef.close({...res, type:'delete' }); - } - }); + .openDialog({ + body: `This action will remove ${this.firstName.value} ${this.lastName.value} and its usage from the entire application. Are you sure you want to remove this owner? `, + }) + .subscribe(async (didConfirm) => { + if (didConfirm) { + const res = await this.data.ownerService.delete(this.existingUuid ?? ''); + this.dialogRef.close({ ...res, type: 'delete' }); + } + }); } async onSave() { - const updateDto: ApplicationOwnerUpdateDto & NoticeOfIntentOwnerUpdateDto = { - organizationName: this.ministryName.getRawValue(), - firstName: this.firstName.getRawValue(), - lastName: this.lastName.getRawValue(), - email: this.email.getRawValue()!, - phoneNumber: this.phoneNumber.getRawValue()!, - typeCode: OWNER_TYPE.CROWN, - crownLandOwnerType: this.crownLandOwnerType.getRawValue(), - }; - if (this.existingUuid) { - const res = await this.data.ownerService.update(this.existingUuid, updateDto); - this.dialogRef.close({...res, type:'update'}); + this.form.markAllAsTouched(); + if (this.form.valid) { + const updateDto: ApplicationOwnerUpdateDto & NoticeOfIntentOwnerUpdateDto = { + organizationName: this.ministryName.getRawValue(), + firstName: this.firstName.getRawValue(), + lastName: this.lastName.getRawValue(), + email: this.email.getRawValue()!, + phoneNumber: this.phoneNumber.getRawValue()!, + typeCode: OWNER_TYPE.CROWN, + crownLandOwnerType: this.crownLandOwnerType.getRawValue(), + }; + if (this.existingUuid) { + const res = await this.data.ownerService.update(this.existingUuid, updateDto); + this.dialogRef.close({ ...res, type: 'update' }); + } } } } From 3bb585a37327953b86990bc0d6094da61a11e95e Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Mon, 18 Dec 2023 16:50:35 -0800 Subject: [PATCH 794/954] Feature/alcs 1209 map decisions (#1237) import notice of intent decisions from oats to alcs update timezone function so it properly handles None values --- bin/migrate-oats-data/common/__init__.py | 1 + .../common/date_time_helper.py | 2 + .../common/oats_decision_enum.py | 7 + .../noi/noi_decisions/__init__.py | 4 + .../notice_of_intent_decisions_init.py | 196 ++++++++++++++++++ .../noi/notice_of_intent_migration.py | 16 ++ .../notice_of_intent_decision_insert.sql | 34 +++ ...notice_of_intent_decision_insert_count.sql | 12 ++ .../notice-of-intent-decision.entity.ts | 9 + .../1702683299770-add_oats_decision_column.ts | 23 ++ 10 files changed, 304 insertions(+) create mode 100644 bin/migrate-oats-data/common/oats_decision_enum.py create mode 100644 bin/migrate-oats-data/noi/noi_decisions/__init__.py create mode 100644 bin/migrate-oats-data/noi/noi_decisions/notice_of_intent_decisions_init.py create mode 100644 bin/migrate-oats-data/noi/sql/notice_of_intent_decisions/notice_of_intent_decision_insert.sql create mode 100644 bin/migrate-oats-data/noi/sql/notice_of_intent_decisions/notice_of_intent_decision_insert_count.sql create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1702683299770-add_oats_decision_column.ts diff --git a/bin/migrate-oats-data/common/__init__.py b/bin/migrate-oats-data/common/__init__.py index 9363975918..044f23f84a 100644 --- a/bin/migrate-oats-data/common/__init__.py +++ b/bin/migrate-oats-data/common/__init__.py @@ -10,3 +10,4 @@ from .oats_temp_tables import * from .oats_to_alcs_parcel_enum import * from .alcs_init_users import * +from .oats_decision_enum import * diff --git a/bin/migrate-oats-data/common/date_time_helper.py b/bin/migrate-oats-data/common/date_time_helper.py index b9fa85e9dd..61a7ebcd06 100644 --- a/bin/migrate-oats-data/common/date_time_helper.py +++ b/bin/migrate-oats-data/common/date_time_helper.py @@ -21,6 +21,8 @@ def convert_timezone(date_str, timezone_str="America/Vancouver"): def add_timezone_and_keep_date_part(date_str, timezone_str="America/Vancouver"): + if date_str is None: + return None # Convert the string to a datetime object if it's a string if isinstance(date_str, str): naive_dt = datetime.strptime(date_str, "%Y-%m-%d %H:%M:%S.%f") diff --git a/bin/migrate-oats-data/common/oats_decision_enum.py b/bin/migrate-oats-data/common/oats_decision_enum.py new file mode 100644 index 0000000000..d6d370955f --- /dev/null +++ b/bin/migrate-oats-data/common/oats_decision_enum.py @@ -0,0 +1,7 @@ +from enum import Enum + + +class AlcsDecisionOutcomeCodeEnum(Enum): + RESCINDED = "RESC" + REFUSED = "REFU" + APPROVED = "APPR" diff --git a/bin/migrate-oats-data/noi/noi_decisions/__init__.py b/bin/migrate-oats-data/noi/noi_decisions/__init__.py new file mode 100644 index 0000000000..ff1ae0f463 --- /dev/null +++ b/bin/migrate-oats-data/noi/noi_decisions/__init__.py @@ -0,0 +1,4 @@ +from .notice_of_intent_decisions_init import ( + init_notice_of_intent_decisions, + clean_notice_of_intents, +) diff --git a/bin/migrate-oats-data/noi/noi_decisions/notice_of_intent_decisions_init.py b/bin/migrate-oats-data/noi/noi_decisions/notice_of_intent_decisions_init.py new file mode 100644 index 0000000000..b0ea4ba961 --- /dev/null +++ b/bin/migrate-oats-data/noi/noi_decisions/notice_of_intent_decisions_init.py @@ -0,0 +1,196 @@ +from common import ( + OATS_ETL_USER, + setup_and_get_logger, + add_timezone_and_keep_date_part, +) +from db import inject_conn_pool +from psycopg2.extras import RealDictCursor, execute_batch + +etl_name = "init_notice_of_intent_decision" +logger = setup_and_get_logger(etl_name) + + +@inject_conn_pool +def init_notice_of_intent_decisions(conn=None, batch_size=1000): + """ + This function is responsible for initializing the notice_of_intent_decisions in ALCS. + + Args: + conn (psycopg2.extensions.connection): PostgreSQL database connection. Provided by the decorator. + batch_size (int): The number of items to process at once. Defaults to BATCH_UPLOAD_SIZE. + """ + + logger.info(f"Start {etl_name}") + with conn.cursor(cursor_factory=RealDictCursor) as cursor: + with open( + "noi/sql/notice_of_intent_decisions/notice_of_intent_decision_insert_count.sql", + "r", + encoding="utf-8", + ) as sql_file: + count_query = sql_file.read() + cursor.execute(count_query) + count_total = dict(cursor.fetchone())["count"] + logger.info(f"Total Notice of Intent Decisions data to insert: {count_total}") + + failed_inserts = 0 + successful_inserts_count = 0 + last_decision_id = 0 + + with open( + "noi/sql/notice_of_intent_decisions/notice_of_intent_decision_insert.sql", + "r", + encoding="utf-8", + ) as sql_file: + query = sql_file.read() + while True: + cursor.execute( + f"{query} WHERE decisions.alr_appl_decision_id > {last_decision_id} ORDER BY decisions.alr_appl_decision_id;" + ) + + rows = cursor.fetchmany(batch_size) + + if not rows: + break + try: + decisions_to_be_inserted_count = len(rows) + + _insert_notice_of_intent_decisions(conn, batch_size, cursor, rows) + + successful_inserts_count = ( + successful_inserts_count + decisions_to_be_inserted_count + ) + last_decision_id = dict(rows[-1])["alr_appl_decision_id"] + + logger.debug( + f"retrieved/inserted items count: {decisions_to_be_inserted_count}; total successfully inserted decisions so far {successful_inserts_count}; last inserted alr_appl_decision_id: {last_decision_id}" + ) + except Exception as err: + logger.exception(err) + conn.rollback() + failed_inserts = count_total - successful_inserts_count + last_decision_id = last_decision_id + 1 + + logger.info( + f"Finished {etl_name}: total amount of successful inserts {successful_inserts_count}, total failed inserts {failed_inserts}" + ) + + +def _insert_notice_of_intent_decisions(conn, batch_size, cursor, rows): + """ """ + query = _get_insert_query() + parsed_data_list = _prepare_oats_alr_applications_data(rows) + + if len(parsed_data_list) > 0: + execute_batch(cursor, query, parsed_data_list, page_size=batch_size) + + conn.commit() + + +def _get_insert_query(): + query = f""" + INSERT INTO alcs.notice_of_intent_decision ( + audit_created_by, + created_at, + date, + decision_description, + decision_maker, + is_draft, + outcome_code, + rescinded_comment, + rescinded_date, + resolution_number, + resolution_year, + was_released, + notice_of_intent_uuid, + is_subject_to_conditions, + oats_alr_appl_decision_id + ) + VALUES ( + %(audit_created_by)s, + %(created_at)s, + %(date)s, + %(decision_description)s, + 'CEO', + false, + %(outcome_code)s, + %(rescinded_comment)s, + %(rescinded_date)s, + %(resolution_number)s, + %(resolution_year)s, + true, + %(notice_of_intent_uuid)s, + %(is_subject_to_conditions)s, + %(oats_alr_appl_decision_id)s + ) + ON CONFLICT ("resolution_number", "resolution_year") + WHERE "audit_deleted_date_at" is null and "resolution_number" is not NULL + DO UPDATE SET + date = COALESCE(EXCLUDED.date, alcs.notice_of_intent_decision.date), + decision_maker = COALESCE(EXCLUDED.decision_maker, alcs.notice_of_intent_decision.decision_maker), + outcome_code = COALESCE(EXCLUDED.outcome_code, alcs.notice_of_intent_decision.outcome_code), + decision_description = COALESCE(EXCLUDED.decision_description, alcs.notice_of_intent_decision.decision_description), + rescinded_comment = COALESCE(EXCLUDED.rescinded_comment, alcs.notice_of_intent_decision.rescinded_comment), + rescinded_date = COALESCE(EXCLUDED.rescinded_date, alcs.notice_of_intent_decision.rescinded_date), + is_subject_to_conditions = COALESCE(EXCLUDED.is_subject_to_conditions, alcs.notice_of_intent_decision.is_subject_to_conditions), + oats_alr_appl_decision_id = EXCLUDED.oats_alr_appl_decision_id; + """ + return query + + +def _prepare_oats_alr_applications_data(row_data_list): + data_list = [] + for row in row_data_list: + resolution_number, year = _map_resolution_number_and_year(row) + mapped_row = { + "audit_created_by": OATS_ETL_USER, + "created_at": add_timezone_and_keep_date_part(row.get("when_created")), + "date": add_timezone_and_keep_date_part(row.get("decision_date")), + "decision_description": row.get("decision_desc"), + "decision_maker": "CEO", + "is_draft": False, + "outcome_code": _map_outcome_code(row), + "rescinded_comment": row.get("rescinded_comments"), + "rescinded_date": add_timezone_and_keep_date_part( + row.get("rescinded_date") + ), + "resolution_number": resolution_number, + "resolution_year": year, + "was_released": True, + "notice_of_intent_uuid": row.get("noi_uuid"), + "is_subject_to_conditions": _map_is_subject_to_conditions(row), + "oats_alr_appl_decision_id": row.get("alr_appl_decision_id"), + } + data_list.append(mapped_row) + + return data_list + + +def _map_outcome_code(row): + if row.get("outright_refusal_ind", None) == "N": + return "APPR" + elif row.get("outright_refusal_ind", None) == "Y": + return "ONTP" + return None + + +def _map_resolution_number_and_year(row): + year_and_number = str(row["resolution_number"]) + resolution_number = int(year_and_number[:-4]) + year = int(year_and_number[-4:]) + return resolution_number, year + + +def _map_is_subject_to_conditions(row): + return row.get("is_subject_to_conditions", "False") == True + + +@inject_conn_pool +def clean_notice_of_intents(conn=None): + logger.info("Start notice_of_intent_decisions cleaning") + with conn.cursor() as cursor: + cursor.execute( + f"DELETE FROM alcs.notice_of_intent_decision WHERE audit_created_by = '{OATS_ETL_USER}' AND audit_updated_by is NULL" + ) + logger.info(f"Deleted items count = {cursor.rowcount}") + + conn.commit() diff --git a/bin/migrate-oats-data/noi/notice_of_intent_migration.py b/bin/migrate-oats-data/noi/notice_of_intent_migration.py index 9ba0465794..dbee82a944 100644 --- a/bin/migrate-oats-data/noi/notice_of_intent_migration.py +++ b/bin/migrate-oats-data/noi/notice_of_intent_migration.py @@ -53,6 +53,11 @@ clean_noi_staff_journal, ) +from noi.noi_decisions.notice_of_intent_decisions_init import ( + init_notice_of_intent_decisions, + clean_notice_of_intents, +) + def init_notice_of_intent(batch_size): init_notice_of_intents(batch_size=batch_size) @@ -66,6 +71,7 @@ def clean_notice_of_intent(): clean_parcels() clean_notice_of_intent_submission_statuses() clean_notice_of_intent_submissions() + clean_notice_of_intent_decisions() clean_notice_of_intents() @@ -74,6 +80,14 @@ def process_notice_of_intent_soil(batch_size): update_alcs_notice_of_intent_soil_fill_fields(batch_size) +def process_notice_of_intent_decisions(batch_size): + init_notice_of_intent_decisions(batch_size) + + +def clean_notice_of_intent_decisions(): + clean_notice_of_intents() + + def process_notice_of_intent(batch_size): # place the rest notice of intent processing functions here process_alcs_notice_of_intent_base_fields(batch_size) @@ -120,5 +134,7 @@ def process_notice_of_intent(batch_size): process_noi_staff_journal(batch_size) + process_notice_of_intent_decisions(batch_size) + # this script must be the last one process_notice_of_intent_submission_status_emails() diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_decisions/notice_of_intent_decision_insert.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_decisions/notice_of_intent_decision_insert.sql new file mode 100644 index 0000000000..aa9de5d23f --- /dev/null +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_decisions/notice_of_intent_decision_insert.sql @@ -0,0 +1,34 @@ +WITH oats_decision_ids_with_app_id AS ( + SELECT oaad.alr_appl_decision_id, + CASE + WHEN oaad.alr_application_id IS NOT NULL THEN oaad.alr_application_id + ELSE orr.alr_application_id + END AS application_id + FROM oats.oats_alr_appl_decisions oaad + LEFT JOIN oats.oats_reconsideration_requests orr ON orr.reconsideration_request_id = oaad.reconsideration_request_id +), +oats_conditions AS ( + SELECT oaac.alr_appl_decision_id + FROM oats.oats_conditions oc + JOIN oats.oats_alr_appl_components oaac ON oc.alr_appl_component_id = oaac.alr_appl_component_id + AND oaac.alr_appl_decision_id IS NOT null + GROUP BY oaac.alr_appl_decision_id +) +SELECT decisions.alr_appl_decision_id, + decisions.application_id, + noi."uuid" AS noi_uuid, + oaad2.when_created, + oaad2.decision_date, + oaad2.decision_desc, + oaad2.outright_refusal_ind, + oaad2.rescinded_comments, + oaad2.rescinded_date, + oaad2.resolution_number, + CASE + WHEN oats_conditions.alr_appl_decision_id IS NOT NULL THEN TRUE + ELSE FALSE + END AS is_subject_to_conditions +FROM oats_decision_ids_with_app_id AS decisions + JOIN alcs.notice_of_intent noi ON noi.file_number = decisions.application_id::TEXT + JOIN oats.oats_alr_appl_decisions oaad2 ON oaad2.alr_appl_decision_id = decisions.alr_appl_decision_id + LEFT JOIN oats_conditions ON oats_conditions.alr_appl_decision_id = oaad2.alr_appl_decision_id \ No newline at end of file diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_decisions/notice_of_intent_decision_insert_count.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_decisions/notice_of_intent_decision_insert_count.sql new file mode 100644 index 0000000000..9ca1a4b6c8 --- /dev/null +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_decisions/notice_of_intent_decision_insert_count.sql @@ -0,0 +1,12 @@ +WITH oats_decision_ids_with_app_id AS ( + SELECT oaad.alr_appl_decision_id, + CASE + WHEN oaad.alr_application_id IS NOT NULL THEN oaad.alr_application_id + ELSE orr.alr_application_id + END AS application_id + FROM oats.oats_alr_appl_decisions oaad + LEFT JOIN oats.oats_reconsideration_requests orr ON orr.reconsideration_request_id = oaad.reconsideration_request_id +) +SELECT count(*) +FROM oats_decision_ids_with_app_id AS decisions + JOIN alcs.notice_of_intent noi ON noi.file_number = decisions.application_id::TEXT; \ No newline at end of file diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.entity.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.entity.ts index 81937ab487..52a8dcf72c 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.entity.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.entity.ts @@ -160,4 +160,13 @@ export class NoticeOfIntentDecision extends Base { { cascade: ['insert', 'update'] }, ) conditions: NoticeOfIntentDecisionCondition[]; + + @Column({ + select: false, + nullable: true, + type: 'int8', + comment: + 'This column is NOT related to any functionality in ALCS. It is only used for ETL and backtracking of imported data from OATS. It links oats.oats_alr_appl_decisions to alcs.notice_of_intent_decisions.', + }) + oatsAlrApplDecisionId: number; } diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1702683299770-add_oats_decision_column.ts b/services/apps/alcs/src/providers/typeorm/migrations/1702683299770-add_oats_decision_column.ts new file mode 100644 index 0000000000..0bcc63a6fc --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1702683299770-add_oats_decision_column.ts @@ -0,0 +1,23 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class AddOatsDecisionColumn1702683299770 implements MigrationInterface { + name = 'AddOatsDecisionColumn1702683299770'; + + public async up(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_decision" ADD "oats_alr_appl_decision_id" bigint`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."notice_of_intent_decision"."oats_alr_appl_decision_id" IS 'This column is NOT related to any functionality in ALCS. It is only used for ETL and backtracking of imported data from OATS. It links oats.oats_alr_appl_decisions to alcs.notice_of_intent_decisions.'`, + ); + } + + public async down(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."notice_of_intent_decision"."oats_alr_appl_decision_id" IS 'This column is NOT related to any functionality in ALCS. It is only used for ETL and backtracking of imported data from OATS. It links oats.oats_alr_appl_decisions to alcs.notice_of_intent_decisions.'`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_decision" DROP COLUMN "oats_alr_appl_decision_id"`, + ); + } +} From 03b8fd23135dc1a1e5eda0041be38b6b0075ed15 Mon Sep 17 00:00:00 2001 From: Liam Stoddard <lstodd@protonmail.com> Date: Mon, 18 Dec 2023 17:04:43 -0800 Subject: [PATCH 795/954] Refuse to forward --- .../submissions/migrate_application_status.py | 2 + .../application_refused_to_forward.sql | 25 ++++ .../application_refused_to_forward_count.sql | 20 +++ .../submissions/statuses/__init__.py | 1 + .../statuses/application_status_refused.py | 123 ++++++++++++++++++ 5 files changed, 171 insertions(+) create mode 100644 bin/migrate-oats-data/applications/submissions/sql/statuses/application_refused_to_forward.sql create mode 100644 bin/migrate-oats-data/applications/submissions/sql/statuses/application_refused_to_forward_count.sql create mode 100644 bin/migrate-oats-data/applications/submissions/statuses/application_status_refused.py diff --git a/bin/migrate-oats-data/applications/submissions/migrate_application_status.py b/bin/migrate-oats-data/applications/submissions/migrate_application_status.py index 2633f9bcce..5d937be745 100644 --- a/bin/migrate-oats-data/applications/submissions/migrate_application_status.py +++ b/bin/migrate-oats-data/applications/submissions/migrate_application_status.py @@ -12,6 +12,7 @@ process_alcs_application_wrong_lfng_status, process_alcs_application_returned_incomplete_lfng_status, process_alcs_application_submitted_lfng_status, + process_alcs_application_status_refused, ) @@ -32,3 +33,4 @@ def process_application_statuses(batch_size): process_alcs_application_wrong_lfng_status(batch_size) process_alcs_application_returned_incomplete_lfng_status(batch_size) process_alcs_application_submitted_lfng_status(batch_size) + process_alcs_application_status_refused(batch_size) diff --git a/bin/migrate-oats-data/applications/submissions/sql/statuses/application_refused_to_forward.sql b/bin/migrate-oats-data/applications/submissions/sql/statuses/application_refused_to_forward.sql new file mode 100644 index 0000000000..e621c7d28c --- /dev/null +++ b/bin/migrate-oats-data/applications/submissions/sql/statuses/application_refused_to_forward.sql @@ -0,0 +1,25 @@ +WITH reject_refuse AS ( + SELECT + oa.rejected_by_lg_date, + oa2.accomplishment_code, + oa2.completion_date, + oa.alr_application_id, + apps.uuid, + ROW_NUMBER() OVER (PARTITION BY oa.alr_application_id ORDER BY oa.rejected_by_lg_date) AS rn + FROM alcs.application_submission_to_submission_status apstss + JOIN alcs.application_submission apps ON apps.uuid = apstss.submission_uuid + JOIN oats.oats_alr_applications oa ON apps.file_number = oa.alr_application_ID::TEXT + JOIN oats.oats_accomplishments oa2 ON oa.alr_application_id = oa2.alr_application_id + WHERE + oa.rejected_by_lg_date IS NOT NULL OR oa2.accomplishment_code = 'LRF' +) +SELECT + rejected_by_lg_date, + accomplishment_code, + completion_date, + alr_application_id, + uuid +FROM + reject_refuse +WHERE + rn = 1 \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/submissions/sql/statuses/application_refused_to_forward_count.sql b/bin/migrate-oats-data/applications/submissions/sql/statuses/application_refused_to_forward_count.sql new file mode 100644 index 0000000000..005181b56d --- /dev/null +++ b/bin/migrate-oats-data/applications/submissions/sql/statuses/application_refused_to_forward_count.sql @@ -0,0 +1,20 @@ +WITH reject_refuse AS ( + SELECT + oa.rejected_by_lg_date, + oa2.accomplishment_code, + oa2.completion_date, + oa.alr_application_id, + ROW_NUMBER() OVER (PARTITION BY oa.alr_application_id ORDER BY oa.rejected_by_lg_date) AS rn + FROM alcs.application_submission_to_submission_status apstss + JOIN alcs.application_submission apps ON apps.uuid = apstss.submission_uuid + JOIN oats.oats_alr_applications oa ON apps.file_number = oa.alr_application_ID::TEXT + JOIN oats.oats_accomplishments oa2 ON oa.alr_application_id = oa2.alr_application_id + WHERE + oa.rejected_by_lg_date IS NOT NULL OR oa2.accomplishment_code = 'LRF' +) +SELECT + count (*) +FROM + reject_refuse +WHERE + rn = 1; \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/submissions/statuses/__init__.py b/bin/migrate-oats-data/applications/submissions/statuses/__init__.py index ea8e31ece8..6407f034ce 100644 --- a/bin/migrate-oats-data/applications/submissions/statuses/__init__.py +++ b/bin/migrate-oats-data/applications/submissions/statuses/__init__.py @@ -22,3 +22,4 @@ from .application_status_submitted_lfng import ( process_alcs_application_submitted_lfng_status, ) +from .application_status_refused import process_alcs_application_status_refused diff --git a/bin/migrate-oats-data/applications/submissions/statuses/application_status_refused.py b/bin/migrate-oats-data/applications/submissions/statuses/application_status_refused.py new file mode 100644 index 0000000000..44a9777b7d --- /dev/null +++ b/bin/migrate-oats-data/applications/submissions/statuses/application_status_refused.py @@ -0,0 +1,123 @@ +from common import ( + BATCH_UPLOAD_SIZE, + setup_and_get_logger, + add_timezone_and_keep_date_part, + set_time, +) +from db import inject_conn_pool +from psycopg2.extras import RealDictCursor, execute_batch + +etl_name = "process_alcs_application_status_refused" +logger = setup_and_get_logger(etl_name) + + +@inject_conn_pool +def process_alcs_application_status_refused(conn=None, batch_size=BATCH_UPLOAD_SIZE): + """ + This function is responsible for populating LFNG Refused to Forward status of Applications in ALCS. + + Args: + conn (psycopg2.extensions.connection): PostgreSQL database connection. Provided by the decorator. + batch_size (int): The number of items to process at once. Defaults to BATCH_UPLOAD_SIZE. + """ + + logger.info(f"Start {etl_name}") + with conn.cursor(cursor_factory=RealDictCursor) as cursor: + with open( + "applications/submissions/sql/statuses/application_refused_to_forward_count.sql", + "r", + encoding="utf-8", + ) as sql_file: + count_query = sql_file.read() + cursor.execute(count_query) + count_total = dict(cursor.fetchone())["count"] + logger.info(f"Total Applications data to update: {count_total}") + + failed_updates = 0 + successful_updates_count = 0 + last_application_id = 0 + + with open( + "applications/submissions/sql/statuses/application_refused_to_forward.sql", + "r", + encoding="utf-8", + ) as sql_file: + application_sql = sql_file.read() + while True: + cursor.execute( + f"{application_sql} AND alr_application_id > {last_application_id} ORDER BY alr_application_id;" + ) + + rows = cursor.fetchmany(batch_size) + + if not rows: + break + try: + records_to_be_updated_count = len(rows) + + _update_records(conn, batch_size, cursor, rows) + + successful_updates_count = ( + successful_updates_count + records_to_be_updated_count + ) + last_application_id = dict(rows[-1])["alr_application_id"] + + logger.debug( + f"retrieved/updated items count: {records_to_be_updated_count}; total successfully updated applications so far {successful_updates_count}; last updated alr_application_id: {last_application_id}" + ) + except Exception as err: + # this is NOT going to be caused by actual data update failure. This code is only executed when the code error appears or connection to DB is lost + logger.exception() + conn.rollback() + failed_updates = count_total - successful_updates_count + last_application_id = last_application_id + 1 + + logger.info( + f"Finished {etl_name}: total amount of successful updates {successful_updates_count}, total failed updates {failed_updates}" + ) + + +def _update_records(conn, batch_size, cursor, rows): + parsed_data_list = _prepare_oats_data(rows) + + if len(parsed_data_list) > 0: + execute_batch( + cursor, + _update_query, + parsed_data_list, + page_size=batch_size, + ) + + conn.commit() + + +_update_query = """ + UPDATE alcs.application_submission_to_submission_status + SET effective_date = %(date)s + WHERE submission_uuid = %(uuid)s AND status_type_code = 'RFFG' +""" + + +def _prepare_oats_data(row_data_list): + data_list = [] + for row in row_data_list: + data = _map_fields(dict(row)) + data_list.append(data) + return data_list + + +def _map_fields(data): + status_effective_date = None + data["date"] = None + # check for rejected date, if none then accomplishment code must be LRF, use LRF completion date + if data and data.get("rejected_by_lg_date", None): + status_effective_date = data["rejected_by_lg_date"] + + elif data and data.get("completion_date", None): + status_effective_date = data["completion_date"] + + if status_effective_date: + date = add_timezone_and_keep_date_part(status_effective_date) + data["date"] = date + + return data From 8e8a609d4d42f2842174f473d1062522a19b541f Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Tue, 19 Dec 2023 14:13:51 -0800 Subject: [PATCH 796/954] Create primary contact confirmation dialog --- ...contact-confirmation-dialog.component.html | 17 +++++++++ ...contact-confirmation-dialog.component.scss | 24 +++++++++++++ ...tact-confirmation-dialog.component.spec.ts | 35 +++++++++++++++++++ ...y-contact-confirmation-dialog.component.ts | 15 ++++++++ 4 files changed, 91 insertions(+) create mode 100644 portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact-confirmation-dialog/primary-contact-confirmation-dialog.component.html create mode 100644 portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact-confirmation-dialog/primary-contact-confirmation-dialog.component.scss create mode 100644 portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact-confirmation-dialog/primary-contact-confirmation-dialog.component.spec.ts create mode 100644 portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact-confirmation-dialog/primary-contact-confirmation-dialog.component.ts diff --git a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact-confirmation-dialog/primary-contact-confirmation-dialog.component.html b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact-confirmation-dialog/primary-contact-confirmation-dialog.component.html new file mode 100644 index 0000000000..3bc69e0d4a --- /dev/null +++ b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact-confirmation-dialog/primary-contact-confirmation-dialog.component.html @@ -0,0 +1,17 @@ +<div mat-dialog-title> + <h4>Will one of the landowners or government contacts added previously be the primary contact?</h4> +</div> + +<div mat-dialog-content class="content"> + <!-- <app-warning-banner> --> + <div> + Changing the answer to this question will remove content already saved to this page. Do you want to continue? + </div> + <br /> + <!-- </app-warning-banner> --> + + <div class="step-controls"> + <button mat-stroked-button color="primary" (click)="onDecide(false)">cancel</button> + <button mat-flat-button color="primary" (click)="onDecide(true)">confirm</button> + </div> +</div> diff --git a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact-confirmation-dialog/primary-contact-confirmation-dialog.component.scss b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact-confirmation-dialog/primary-contact-confirmation-dialog.component.scss new file mode 100644 index 0000000000..1f78db7f1e --- /dev/null +++ b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact-confirmation-dialog/primary-contact-confirmation-dialog.component.scss @@ -0,0 +1,24 @@ +@use '../../../../../../styles/functions' as *; + +.margin-bottom-1 { + margin-bottom: rem(16); +} + +.step-controls { + display: flex; + justify-content: space-between; +} + +.confirm-content { + margin: rem(24) 0; +} + +@media screen and (min-width: $desktopBreakpoint) { + .step-controls { + justify-content: flex-end; + + button { + margin-left: rem(25) !important; + } + } +} diff --git a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact-confirmation-dialog/primary-contact-confirmation-dialog.component.spec.ts b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact-confirmation-dialog/primary-contact-confirmation-dialog.component.spec.ts new file mode 100644 index 0000000000..ce0667a304 --- /dev/null +++ b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact-confirmation-dialog/primary-contact-confirmation-dialog.component.spec.ts @@ -0,0 +1,35 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { MatDialog, MatDialogRef } from '@angular/material/dialog'; +import { PrimaryContactConfirmationDialogComponent } from './primary-contact-confirmation-dialog.component'; + +describe('OtherParcelConfirmationDialogComponent', () => { + let component: PrimaryContactConfirmationDialogComponent; + let fixture: ComponentFixture<PrimaryContactConfirmationDialogComponent>; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [PrimaryContactConfirmationDialogComponent], + providers: [ + { + provide: MatDialog, + useValue: {}, + }, + { + provide: MatDialogRef, + useValue: {}, + }, + ], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(PrimaryContactConfirmationDialogComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact-confirmation-dialog/primary-contact-confirmation-dialog.component.ts b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact-confirmation-dialog/primary-contact-confirmation-dialog.component.ts new file mode 100644 index 0000000000..5e4ccda57e --- /dev/null +++ b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact-confirmation-dialog/primary-contact-confirmation-dialog.component.ts @@ -0,0 +1,15 @@ +import { Component } from '@angular/core'; +import { MatDialogRef } from '@angular/material/dialog'; + +@Component({ + selector: 'app-primary-contact-confirmation-dialog', + templateUrl: './primary-contact-confirmation-dialog.component.html', + styleUrls: ['./primary-contact-confirmation-dialog.component.scss'], +}) +export class PrimaryContactConfirmationDialogComponent { + constructor(private dialogRef: MatDialogRef<PrimaryContactConfirmationDialogComponent>) {} + + async onDecide(decision: boolean = false) { + this.dialogRef.close(decision); + } +} From c186d5628a1e23f5499144b3318bb3e2cca37445 Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Tue, 19 Dec 2023 15:56:21 -0800 Subject: [PATCH 797/954] Fix confirmation styling --- .../edit-submission/edit-submission-base.module.ts | 3 +++ .../primary-contact-confirmation-dialog.component.html | 7 ++----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/portal-frontend/src/app/features/applications/edit-submission/edit-submission-base.module.ts b/portal-frontend/src/app/features/applications/edit-submission/edit-submission-base.module.ts index 022e838f23..708e9b1476 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/edit-submission-base.module.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/edit-submission-base.module.ts @@ -36,6 +36,7 @@ import { ReviewAndSubmitComponent } from './review-and-submit/review-and-submit. import { SubmitConfirmationDialogComponent } from './review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component'; import { SelectGovernmentComponent } from './select-government/select-government.component'; import { SuccessComponent } from './success/success.component'; +import { PrimaryContactConfirmationDialogComponent } from './primary-contact/primary-contact-confirmation-dialog/primary-contact-confirmation-dialog.component'; @NgModule({ declarations: [ @@ -50,6 +51,7 @@ import { SuccessComponent } from './success/success.component'; OtherParcelsComponent, OtherAttachmentsComponent, PrimaryContactComponent, + PrimaryContactConfirmationDialogComponent, ReviewAndSubmitComponent, SubmitConfirmationDialogComponent, NfuProposalComponent, @@ -92,6 +94,7 @@ import { SuccessComponent } from './success/success.component'; OtherParcelsComponent, OtherAttachmentsComponent, PrimaryContactComponent, + PrimaryContactConfirmationDialogComponent, ReviewAndSubmitComponent, NfuProposalComponent, TurProposalComponent, diff --git a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact-confirmation-dialog/primary-contact-confirmation-dialog.component.html b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact-confirmation-dialog/primary-contact-confirmation-dialog.component.html index 3bc69e0d4a..045dd6ded5 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact-confirmation-dialog/primary-contact-confirmation-dialog.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact-confirmation-dialog/primary-contact-confirmation-dialog.component.html @@ -3,12 +3,9 @@ <h4>Will one of the landowners or government contacts added previously be the pr </div> <div mat-dialog-content class="content"> - <!-- <app-warning-banner> --> - <div> + <app-warning-banner> Changing the answer to this question will remove content already saved to this page. Do you want to continue? - </div> - <br /> - <!-- </app-warning-banner> --> + </app-warning-banner> <div class="step-controls"> <button mat-stroked-button color="primary" (click)="onDecide(false)">cancel</button> From 49fef499be0980027dbd62a05540bef6e7a840e5 Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Tue, 19 Dec 2023 16:36:54 -0800 Subject: [PATCH 798/954] Implement new application contact selection - No edit - No confirm --- .../primary-contact.component.html | 157 +++++++++--------- .../primary-contact.component.scss | 36 ++++ .../primary-contact.component.ts | 14 ++ 3 files changed, 130 insertions(+), 77 deletions(-) diff --git a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html index d740e4e230..fcf2543308 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html @@ -1,67 +1,83 @@ <div class="step-description"> <h2>Primary Contact</h2> - <p *ngIf="!isGovernmentUser">Select from the listed parcel owners or identify a third party agent</p> - <p *ngIf="isGovernmentUser"> - Identify staff from the local or first nation government listed below or a third-party agent to act as the primary - contact. + <p> + The primary contact becomes the single point of contact and must ensure that landowners are notified of all + information exchanged between the primary contact, local or First Nation government, and the ALC. </p> <p>*All fields are required unless stated optional.</p> - <div class="step-documents"> - <h6>Documents needed for this step:</h6> - <ul> - <li>Authorization Letters (if applicable)</li> - </ul> - </div> </div> -<section> - <div class="contacts"> - <ng-container *ngFor="let owner of parcelOwners"> - <h5>{{ owner.displayName }}</h5> - <button - (click)="onSelectOwner(owner.uuid)" - *ngIf="owner.uuid !== selectedOwnerUuid" - color="primary" - [ngClass]="{ 'mat-error': !selectedOwnerUuid && showErrors }" - mat-stroked-button - > - Make Primary Contact - </button> - <div class="selected" *ngIf="owner.uuid === selectedOwnerUuid"><mat-icon>check</mat-icon>Primary Contact</div> - </ng-container> - <ng-container *ngIf="isGovernmentUser || selectedLocalGovernment"> - <h5>{{ governmentName ?? 'Local / First Nation Government' }} Staff</h5> - <button - (click)="onSelectGovernment()" - *ngIf="!selectedLocalGovernment" - color="primary" - [ngClass]="{ 'mat-error': !selectedOwnerUuid && showErrors }" - mat-stroked-button - > - Make Primary Contact - </button> - <div class="selected" *ngIf="selectedLocalGovernment"><mat-icon>check</mat-icon>Primary Contact</div> - </ng-container> - <h5>Third-Party Agent</h5> - <button - *ngIf="!selectedThirdPartyAgent" - color="primary" - (click)="onSelectAgent()" - [ngClass]="{ 'mat-error': !selectedOwnerUuid && showErrors }" - mat-stroked-button - > - Make Primary Contact - </button> - <div class="selected" *ngIf="selectedThirdPartyAgent"><mat-icon>check</mat-icon>Primary Contact</div> - <div><!--this is required for correct responsive view --></div> - <app-validation-error *ngIf="!selectedOwnerUuid && showErrors"> - Please select a primary contact - </app-validation-error> - </div> +<section> <div class="agent-form"> <h4>Primary Contact Information</h4> <form [formGroup]="form"> - <div class="form-row"> + <div class="full-row"> + <p *ngIf="isGovernmentUser"> + <strong>Will {{ governmentName ?? 'Local / First Nation Government' }} staff be the primary contact?</strong> + </p> + <p *ngIf="!isGovernmentUser"> + <strong>Will one of the landowners or government contacts added previously be the primary contact?</strong> + </p> + <mat-button-toggle-group + class="input" + [formControl]="primaryContactType" + (change)="onSelectPrimaryContactType(!primaryContactType.value)" + > + <mat-button-toggle [value]="true">Yes</mat-button-toggle> + <mat-button-toggle [value]="false">No</mat-button-toggle> + </mat-button-toggle-group> + </div> + + <!-- Owner --> + <div *ngIf="selectedThirdPartyAgent === false"> + <label *ngIf="owners.length" + >Select a Primary Contact from the listed land owners and government contacts</label + > + + <mat-radio-group color="primary" [value]="selectedOwnerUuid" required> + <mat-radio-button + *ngFor="let owner of parcelOwners" + [value]="owner.uuid" + class="radio-option" + (click)="onSelectOwner(owner.uuid)" + required + > + {{ owner.firstName }} {{ owner.lastName }} + </mat-radio-button> + </mat-radio-group> + + <div class="warning-banner" *ngIf="selectedOwnerUuid && !selectedLocalGovernment"> + <div class="owner-details"> + <div class="row"> + <div class="key"><strong>First Name:</strong></div> + <div class="value">{{ firstName.value }}</div> + </div> + <div class="row"> + <div class="key"><strong>Last Name:</strong></div> + <div class="value">{{ lastName.value }}</div> + </div> + <div class="row"> + <div class="key"><strong>Organization:</strong></div> + <div class="value">{{ organizationName.value }}</div> + </div> + <div class="row"> + <div class="key"><strong>Phone Number:</strong></div> + <div class="value">{{ phoneNumber.value }}</div> + </div> + <div class="row"> + <div class="key"><strong>Email:</strong></div> + <div class="value">{{ email.value }}</div> + </div> + <div class="row"> + <button mat-stroked-button>Edit information</button> + </div> + </div> + </div> + </div> + <!-- /Owner --> + + <!-- Third-Part Agent/Government --> + <div *ngIf="selectedThirdPartyAgent || selectedLocalGovernment" class="form-row"> <div> <label for="firstName">First Name</label> <mat-form-field appearance="outline"> @@ -127,32 +143,18 @@ <h4>Primary Contact Information</h4> </div> </div> </div> + <!-- /Third-Part Agent/Government --> </form> </div> </section> + <section *ngIf="needsAuthorizationLetter || files.length > 0"> - <h4>Primary Contact Authorization Letters</h4> - <div> - <ng-container *ngIf="!isGovernmentUser"> - An authorization letter must be provided if: - <ol> - <li>the parcel under application is owned by more than one person;</li> - <li>the parcel(s) is owned by an organization; or</li> - <li>the parcel(s) is owned by a corporation (private, Crown, local government, First Nations); or</li> - <li>the application is being submitted by a third-party agent on behalf of the land owner(s)</li> - </ol> - <p> - The authorization letter must be signed by all individual land owners and the majority of directors in - organization land owners listed in Step 1. Please consult the Supporting Documentation page of ALC website for - further instruction and an Authorization Letter template. - </p> - </ng-container> - <ng-container *ngIf="isGovernmentUser"> - An authorization letter must be provided only if the application is being submitted by a third-party agent. Please - consult the Supporting Documentation page of the <a>TODO: FIX THIS: ALC website</a> for further instruction. - </ng-container> - </div> - <h6>Authorization Letters (if applicable)</h6> + <h6>Authorization Letters</h6> + <p class="subtext"> + For privately owned Fee Simple parcels, the letter must be signed by all individual landowners and the majority of + directors within the organization.For Crown parcels or Fee Simple parcels owned by a government, the letter must be + signed by senior level staff. + </p> <div class="uploader"> <app-file-drag-drop [allowMultiple]="true" @@ -166,6 +168,7 @@ <h6>Authorization Letters (if applicable)</h6> ></app-file-drag-drop> </div> </section> + <div class="button-container"> <button *ngIf="!draftMode" (click)="onSaveExit()" mat-stroked-button color="accent">Save and Exit</button> <button *ngIf="draftMode" (click)="onSaveExit()" mat-stroked-button color="accent">Discard all Changes</button> diff --git a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.scss b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.scss index ba5b4f2a09..3e5b079ec8 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.scss +++ b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.scss @@ -56,3 +56,39 @@ section { margin-right: rem(8); } } + +.radio-option { + display: block !important; + + & .mdc-label { + cursor: pointer !important; + } +} + +.warning-banner { + margin-top: rem(8); + background-color: rgba(colors.$accent-color-light, 0.5); + padding: rem(16); + + .owner-details { + display: flex; + flex-direction: column; + } + + .row { + display: flex; + margin-bottom: rem(10); + } + + .key { + font-weight: bold; + margin-right: rem(5); + width: rem(300); + } + + .value { + flex-grow: 1; + overflow: hidden; + text-overflow: ellipsis; + } +} diff --git a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts index 889c413d60..4a22bf59fe 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts @@ -40,6 +40,8 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni showVirusError = false; hasCrownParcels = false; + primaryContactType = new FormControl<boolean | null>(null, [Validators.required]); + firstName = new FormControl<string | null>('', [Validators.required]); lastName = new FormControl<string | null>('', [Validators.required]); organizationName = new FormControl<string | null>(''); @@ -235,6 +237,8 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni this.selectedLocalGovernment = selectedOwner.type.code === OWNER_TYPE.GOVERNMENT; } + this.primaryContactType.setValue(!this.selectedThirdPartyAgent); + if (this.selectedLocalGovernment) { this.organizationName.setValidators([Validators.required]); } else { @@ -275,4 +279,14 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni private prepareGovernmentOwners() { this.parcelOwners = []; } + + async onSelectPrimaryContactType(selectedThirdPartyAgent: boolean | null) { + if (selectedThirdPartyAgent) { + this.onSelectAgent(); + } else if (this.isGovernmentUser) { + this.onSelectGovernment(); + } else { + this.selectedThirdPartyAgent = false; + } + } } From b46b26916656a5b649f60f60692be943abe043d1 Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Wed, 20 Dec 2023 09:34:19 -0800 Subject: [PATCH 799/954] Add application contact change confirmation --- .../primary-contact.component.ts | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts index 4a22bf59fe..8952dfc7cf 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts @@ -16,6 +16,7 @@ import { OWNER_TYPE } from '../../../../shared/dto/owner.dto'; import { FileHandle } from '../../../../shared/file-drag-drop/drag-drop.directive'; import { EditApplicationSteps } from '../edit-submission.component'; import { FilesStepComponent } from '../files-step.partial'; +import { PrimaryContactConfirmationDialogComponent } from './primary-contact-confirmation-dialog/primary-contact-confirmation-dialog.component'; @Component({ selector: 'app-primary-contact', @@ -281,6 +282,27 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni } async onSelectPrimaryContactType(selectedThirdPartyAgent: boolean | null) { + if (this.form.dirty || (this.selectedOwnerUuid !== 'agent' && this.selectedOwnerUuid !== 'government')) { + await this.dialog + .open(PrimaryContactConfirmationDialogComponent, { + panelClass: 'no-padding', + disableClose: true, + }) + .beforeClosed() + .subscribe(async (confirmed) => { + if (confirmed) { + this.switchPrimaryContactType(selectedThirdPartyAgent); + } else { + console.log(selectedThirdPartyAgent); + this.primaryContactType.setValue(selectedThirdPartyAgent); + } + }); + } else { + this.switchPrimaryContactType(selectedThirdPartyAgent); + } + } + + switchPrimaryContactType(selectedThirdPartyAgent: boolean | null) { if (selectedThirdPartyAgent) { this.onSelectAgent(); } else if (this.isGovernmentUser) { From f17bd5c41293539c388c6e9f618858dde456e589 Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Wed, 20 Dec 2023 10:10:54 -0800 Subject: [PATCH 800/954] Make selected contact editable --- .../primary-contact.component.html | 2 +- .../primary-contact.component.ts | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html index fcf2543308..3d8102e170 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html @@ -69,7 +69,7 @@ <h4>Primary Contact Information</h4> <div class="value">{{ email.value }}</div> </div> <div class="row"> - <button mat-stroked-button>Edit information</button> + <button mat-stroked-button (click)="onEdit(selectedOwnerUuid)">Edit information</button> </div> </div> </div> diff --git a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts index 8952dfc7cf..abde52b766 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts @@ -17,6 +17,7 @@ import { FileHandle } from '../../../../shared/file-drag-drop/drag-drop.directiv import { EditApplicationSteps } from '../edit-submission.component'; import { FilesStepComponent } from '../files-step.partial'; import { PrimaryContactConfirmationDialogComponent } from './primary-contact-confirmation-dialog/primary-contact-confirmation-dialog.component'; +import { OwnerDialogComponent } from 'src/app/shared/owner-dialogs/owner-dialog/owner-dialog.component'; @Component({ selector: 'app-primary-contact', @@ -311,4 +312,27 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni this.selectedThirdPartyAgent = false; } } + + onEdit(selectedOwnerUuid: string) { + const selectedOwner = this.parcelOwners.find((owner) => owner.uuid === selectedOwnerUuid); + + const dialog = this.dialog.open(OwnerDialogComponent, { + data: { + existingOwner: selectedOwner, + submissionUuid: this.submissionUuid, + ownerService: this.applicationOwnerService, + }, + }); + + dialog.afterClosed().subscribe(async (updatedContact) => { + console.log(updatedContact); + if (updatedContact && this.selectedOwnerUuid !== undefined) { + this.firstName.setValue(updatedContact.firstName); + this.lastName.setValue(updatedContact.lastName); + this.organizationName.setValue(updatedContact.organizationName); + this.phoneNumber.setValue(updatedContact.phoneNumber); + this.email.setValue(updatedContact.email); + } + }); + } } From 3f1a511da582d9266fe8a559661fb3a48eb18869 Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Wed, 20 Dec 2023 10:12:56 -0800 Subject: [PATCH 801/954] Remove unused import --- .../edit-submission/primary-contact/primary-contact.component.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts index eaa2c64f9c..6fe0f2e34b 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts @@ -3,7 +3,6 @@ import { FormControl, FormGroup, Validators } from '@angular/forms'; import { MatDialog } from '@angular/material/dialog'; import { Router } from '@angular/router'; import { takeUntil } from 'rxjs'; -import { ApplicationOwnerDto } from '../../../../services/application-owner/application-owner.dto'; import { PARCEL_OWNERSHIP_TYPE } from '../../../../services/application-parcel/application-parcel.dto'; import { AuthenticationService } from '../../../../services/authentication/authentication.service'; import { NoticeOfIntentDocumentDto } from '../../../../services/notice-of-intent-document/notice-of-intent-document.dto'; From 5033f2ae3601fb285a9ff5219b7507a1ca2ed8f3 Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Wed, 20 Dec 2023 10:39:42 -0800 Subject: [PATCH 802/954] Add info icon on revie and decision tab --- .../view-submission/alc-review/alc-review.component.html | 2 +- .../view-submission/alc-review/alc-review.component.scss | 7 +++++++ .../view-submission/alc-review/alc-review.component.html | 2 +- .../view-submission/alc-review/alc-review.component.scss | 7 +++++++ .../view-submission/alc-review/alc-review.component.html | 2 +- .../view-submission/alc-review/alc-review.component.scss | 7 +++++++ 6 files changed, 24 insertions(+), 3 deletions(-) diff --git a/portal-frontend/src/app/features/applications/view-submission/alc-review/alc-review.component.html b/portal-frontend/src/app/features/applications/view-submission/alc-review/alc-review.component.html index c5e00a552d..f8a2672da2 100644 --- a/portal-frontend/src/app/features/applications/view-submission/alc-review/alc-review.component.html +++ b/portal-frontend/src/app/features/applications/view-submission/alc-review/alc-review.component.html @@ -3,7 +3,7 @@ <h2>ALC Review and Decision</h2> </div> <div *ngIf="showUpdateAfterSubmitLabel" class="warning"> - This section will update after the application is submitted to the ALC. + <mat-icon>info</mat-icon>This section will update after the application is submitted to the ALC. </div> <div *ngIf="application.status.code === SUBMISSION_STATUS.REFUSED_TO_FORWARD_LG" class="warning"> Application not subject to Agricultural Land Commission review. diff --git a/portal-frontend/src/app/features/applications/view-submission/alc-review/alc-review.component.scss b/portal-frontend/src/app/features/applications/view-submission/alc-review/alc-review.component.scss index 7ca8d1c637..be9b0c4908 100644 --- a/portal-frontend/src/app/features/applications/view-submission/alc-review/alc-review.component.scss +++ b/portal-frontend/src/app/features/applications/view-submission/alc-review/alc-review.component.scss @@ -5,4 +5,11 @@ background-color: rgba(colors.$accent-color-light, 0.5); padding: rem(16); margin-bottom: rem(24); + border-radius: 4px; + display: flex; + align-items: center; + + mat-icon { + margin-right: 12px; + } } diff --git a/portal-frontend/src/app/features/notice-of-intents/view-submission/alc-review/alc-review.component.html b/portal-frontend/src/app/features/notice-of-intents/view-submission/alc-review/alc-review.component.html index 6b87e36470..0436064bbe 100644 --- a/portal-frontend/src/app/features/notice-of-intents/view-submission/alc-review/alc-review.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/view-submission/alc-review/alc-review.component.html @@ -3,7 +3,7 @@ <h2>ALC Review and Decision</h2> </div> <div *ngIf="noiSubmission.status.code === NOI_SUBMISSION_STATUS.IN_PROGRESS" class="warning"> - This section will update after the Notice of Intent is submitted to the ALC. + <mat-icon>info</mat-icon>This section will update after the Notice of Intent is submitted to the ALC. </div> <div *ngIf="noiSubmission.status.code !== NOI_SUBMISSION_STATUS.IN_PROGRESS"> <app-decisions [fileNumber]="noiSubmission.fileNumber"></app-decisions> diff --git a/portal-frontend/src/app/features/notice-of-intents/view-submission/alc-review/alc-review.component.scss b/portal-frontend/src/app/features/notice-of-intents/view-submission/alc-review/alc-review.component.scss index 7ca8d1c637..be9b0c4908 100644 --- a/portal-frontend/src/app/features/notice-of-intents/view-submission/alc-review/alc-review.component.scss +++ b/portal-frontend/src/app/features/notice-of-intents/view-submission/alc-review/alc-review.component.scss @@ -5,4 +5,11 @@ background-color: rgba(colors.$accent-color-light, 0.5); padding: rem(16); margin-bottom: rem(24); + border-radius: 4px; + display: flex; + align-items: center; + + mat-icon { + margin-right: 12px; + } } diff --git a/portal-frontend/src/app/features/notifications/view-submission/alc-review/alc-review.component.html b/portal-frontend/src/app/features/notifications/view-submission/alc-review/alc-review.component.html index f81e68cc27..5d314daff1 100644 --- a/portal-frontend/src/app/features/notifications/view-submission/alc-review/alc-review.component.html +++ b/portal-frontend/src/app/features/notifications/view-submission/alc-review/alc-review.component.html @@ -3,7 +3,7 @@ <h3>ALC Review and Response</h3> </div> <div *ngIf="notificationSubmission.status.code === NOTIFICATION_STATUS.IN_PROGRESS" class="warning"> - This section will update after the notification is submitted to the ALC. + <mat-icon>info</mat-icon>This section will update after the notification is submitted to the ALC. </div> <div *ngIf=" diff --git a/portal-frontend/src/app/features/notifications/view-submission/alc-review/alc-review.component.scss b/portal-frontend/src/app/features/notifications/view-submission/alc-review/alc-review.component.scss index 7ca8d1c637..be9b0c4908 100644 --- a/portal-frontend/src/app/features/notifications/view-submission/alc-review/alc-review.component.scss +++ b/portal-frontend/src/app/features/notifications/view-submission/alc-review/alc-review.component.scss @@ -5,4 +5,11 @@ background-color: rgba(colors.$accent-color-light, 0.5); padding: rem(16); margin-bottom: rem(24); + border-radius: 4px; + display: flex; + align-items: center; + + mat-icon { + margin-right: 12px; + } } From 6dec5ae17129fab8f3a7e01dff417896783066ec Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Wed, 20 Dec 2023 11:11:55 -0800 Subject: [PATCH 803/954] Add new NOI contact selection --- .../edit-submission-base.module.ts | 2 + ...contact-confirmation-dialog.component.html | 14 ++ ...contact-confirmation-dialog.component.scss | 24 +++ ...tact-confirmation-dialog.component.spec.ts | 35 ++++ ...y-contact-confirmation-dialog.component.ts | 15 ++ .../primary-contact.component.html | 163 +++++++++--------- .../primary-contact.component.scss | 36 ++++ .../primary-contact.component.ts | 60 +++++++ 8 files changed, 271 insertions(+), 78 deletions(-) create mode 100644 portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact-confirmation-dialog/primary-contact-confirmation-dialog.component.html create mode 100644 portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact-confirmation-dialog/primary-contact-confirmation-dialog.component.scss create mode 100644 portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact-confirmation-dialog/primary-contact-confirmation-dialog.component.spec.ts create mode 100644 portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact-confirmation-dialog/primary-contact-confirmation-dialog.component.ts diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission-base.module.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission-base.module.ts index 7ba209c27a..bd0f83d46b 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission-base.module.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission-base.module.ts @@ -29,6 +29,7 @@ import { ReviewAndSubmitComponent } from './review-and-submit/review-and-submit. import { SubmitConfirmationDialogComponent } from './review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component'; import { SelectGovernmentComponent } from './select-government/select-government.component'; import { SuccessComponent } from './success/success.component'; +import { PrimaryContactConfirmationDialogComponent } from './primary-contact/primary-contact-confirmation-dialog/primary-contact-confirmation-dialog.component'; @NgModule({ imports: [ @@ -52,6 +53,7 @@ import { SuccessComponent } from './success/success.component'; ParcelEntryConfirmationDialogComponent, DeleteParcelDialogComponent, PrimaryContactComponent, + PrimaryContactConfirmationDialogComponent, SelectGovernmentComponent, LandUseComponent, OtherAttachmentsComponent, diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact-confirmation-dialog/primary-contact-confirmation-dialog.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact-confirmation-dialog/primary-contact-confirmation-dialog.component.html new file mode 100644 index 0000000000..045dd6ded5 --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact-confirmation-dialog/primary-contact-confirmation-dialog.component.html @@ -0,0 +1,14 @@ +<div mat-dialog-title> + <h4>Will one of the landowners or government contacts added previously be the primary contact?</h4> +</div> + +<div mat-dialog-content class="content"> + <app-warning-banner> + Changing the answer to this question will remove content already saved to this page. Do you want to continue? + </app-warning-banner> + + <div class="step-controls"> + <button mat-stroked-button color="primary" (click)="onDecide(false)">cancel</button> + <button mat-flat-button color="primary" (click)="onDecide(true)">confirm</button> + </div> +</div> diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact-confirmation-dialog/primary-contact-confirmation-dialog.component.scss b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact-confirmation-dialog/primary-contact-confirmation-dialog.component.scss new file mode 100644 index 0000000000..1f78db7f1e --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact-confirmation-dialog/primary-contact-confirmation-dialog.component.scss @@ -0,0 +1,24 @@ +@use '../../../../../../styles/functions' as *; + +.margin-bottom-1 { + margin-bottom: rem(16); +} + +.step-controls { + display: flex; + justify-content: space-between; +} + +.confirm-content { + margin: rem(24) 0; +} + +@media screen and (min-width: $desktopBreakpoint) { + .step-controls { + justify-content: flex-end; + + button { + margin-left: rem(25) !important; + } + } +} diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact-confirmation-dialog/primary-contact-confirmation-dialog.component.spec.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact-confirmation-dialog/primary-contact-confirmation-dialog.component.spec.ts new file mode 100644 index 0000000000..ce0667a304 --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact-confirmation-dialog/primary-contact-confirmation-dialog.component.spec.ts @@ -0,0 +1,35 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { MatDialog, MatDialogRef } from '@angular/material/dialog'; +import { PrimaryContactConfirmationDialogComponent } from './primary-contact-confirmation-dialog.component'; + +describe('OtherParcelConfirmationDialogComponent', () => { + let component: PrimaryContactConfirmationDialogComponent; + let fixture: ComponentFixture<PrimaryContactConfirmationDialogComponent>; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [PrimaryContactConfirmationDialogComponent], + providers: [ + { + provide: MatDialog, + useValue: {}, + }, + { + provide: MatDialogRef, + useValue: {}, + }, + ], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(PrimaryContactConfirmationDialogComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact-confirmation-dialog/primary-contact-confirmation-dialog.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact-confirmation-dialog/primary-contact-confirmation-dialog.component.ts new file mode 100644 index 0000000000..5e4ccda57e --- /dev/null +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact-confirmation-dialog/primary-contact-confirmation-dialog.component.ts @@ -0,0 +1,15 @@ +import { Component } from '@angular/core'; +import { MatDialogRef } from '@angular/material/dialog'; + +@Component({ + selector: 'app-primary-contact-confirmation-dialog', + templateUrl: './primary-contact-confirmation-dialog.component.html', + styleUrls: ['./primary-contact-confirmation-dialog.component.scss'], +}) +export class PrimaryContactConfirmationDialogComponent { + constructor(private dialogRef: MatDialogRef<PrimaryContactConfirmationDialogComponent>) {} + + async onDecide(decision: boolean = false) { + this.dialogRef.close(decision); + } +} diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html index 9711ec9512..f506de0540 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html @@ -1,67 +1,90 @@ <div class="step-description"> <h2>Primary Contact</h2> - <p *ngIf="!isGovernmentUser">Select from the listed parcel owners or identify a third party agent</p> - <p *ngIf="isGovernmentUser"> - Identify staff from the local or first nation government listed below or a third-party agent to act as the primary - contact. + <p> + The primary contact becomes the single point of contact and must ensure that landowners are notified of all + information exchanged between the primary contact, local or First Nation government, and the ALC. </p> <p>*All fields are required unless stated optional.</p> - <div class="step-documents"> - <h6>Documents needed for this step:</h6> - <ul> - <li>Authorization Letters (if applicable)</li> - </ul> - </div> </div> -<section> - <div class="contacts"> - <ng-container *ngFor="let owner of parcelOwners"> - <h5>{{ owner.displayName }}</h5> - <button - (click)="onSelectOwner(owner.uuid)" - *ngIf="owner.uuid !== selectedOwnerUuid" - color="primary" - [ngClass]="{ 'mat-error': !selectedOwnerUuid && showErrors }" - mat-stroked-button - > - Make Primary Contact - </button> - <div class="selected" *ngIf="owner.uuid === selectedOwnerUuid"><mat-icon>check</mat-icon>Primary Contact</div> - </ng-container> - <ng-container *ngIf="isGovernmentUser || selectedLocalGovernment"> - <h5>{{ governmentName ?? 'Local / First Nation Government' }} Staff</h5> - <button - (click)="onSelectGovernment()" - *ngIf="!selectedLocalGovernment" - color="primary" - [ngClass]="{ 'mat-error': !selectedOwnerUuid && showErrors }" - mat-stroked-button - > - Make Primary Contact - </button> - <div class="selected" *ngIf="selectedLocalGovernment"><mat-icon>check</mat-icon>Primary Contact</div> - </ng-container> - <h5>Third-Party Agent</h5> - <button - *ngIf="!selectedThirdPartyAgent" - color="primary" - (click)="onSelectAgent()" - [ngClass]="{ 'mat-error': !selectedOwnerUuid && showErrors }" - mat-stroked-button - > - Make Primary Contact - </button> - <div class="selected" *ngIf="selectedThirdPartyAgent"><mat-icon>check</mat-icon>Primary Contact</div> - <div><!--this is required for correct responsive view --></div> - <app-validation-error *ngIf="!selectedOwnerUuid && showErrors"> - Please select a primary contact - </app-validation-error> - </div> +<section> <div class="agent-form"> <h4>Primary Contact Information</h4> <form [formGroup]="form"> - <div class="form-row"> + <div class="full-row"> + <p *ngIf="isGovernmentUser"> + <strong>Will {{ governmentName ?? 'Local / First Nation Government' }} staff be the primary contact?</strong> + </p> + <p *ngIf="!isGovernmentUser"> + <strong>Will one of the landowners or government contacts added previously be the primary contact?</strong> + </p> + + <mat-button-toggle-group + class="input" + [formControl]="primaryContactType" + (change)="onSelectPrimaryContactType(!primaryContactType.value)" + > + <mat-button-toggle [value]="true">Yes</mat-button-toggle> + <mat-button-toggle [value]="false">No</mat-button-toggle> + </mat-button-toggle-group> + </div> + + <!-- Owner --> + <div *ngIf="selectedThirdPartyAgent === false && parcelOwners.length > 0"> + <label *ngIf="owners.length" + >Select a Primary Contact from the listed land owners and government contacts</label + > + + <mat-radio-group color="primary" [value]="selectedOwnerUuid" required> + <mat-radio-button + *ngFor="let owner of parcelOwners" + [value]="owner.uuid" + class="radio-option" + (click)="onSelectOwner(owner.uuid)" + required + > + {{ owner.firstName }} {{ owner.lastName }} + </mat-radio-button> + </mat-radio-group> + + <div + class="warning-banner" + *ngIf="selectedOwnerUuid && selectedOwnerUuid !== 'agent' && !selectedLocalGovernment" + > + <div class="owner-details"> + <div class="row"> + <div class="key"><strong>First Name:</strong></div> + <div class="value">{{ firstName.value }}</div> + </div> + <div class="row"> + <div class="key"><strong>Last Name:</strong></div> + <div class="value">{{ lastName.value }}</div> + </div> + <div class="row"> + <div class="key"><strong>Organization:</strong></div> + <div class="value">{{ organizationName.value }}</div> + </div> + <div class="row"> + <div class="key"><strong>Phone Number:</strong></div> + <div class="value">{{ phoneNumber.value }}</div> + </div> + <div class="row"> + <div class="key"><strong>Email:</strong></div> + <div class="value">{{ email.value }}</div> + </div> + <div class="row"> + <button mat-stroked-button (click)="onEdit(selectedOwnerUuid)">Edit information</button> + </div> + </div> + </div> + </div> + <div *ngIf="selectedThirdPartyAgent === false && parcelOwners.length === 0"> + No landowners or government contacts are added. Please go back to Step 1 to add information. + </div> + <!-- /Owner --> + + <!-- Third-Part Agent/Government --> + <div *ngIf="selectedThirdPartyAgent || selectedLocalGovernment" class="form-row"> <div> <label for="firstName">First Name</label> <mat-form-field appearance="outline"> @@ -127,33 +150,17 @@ <h4>Primary Contact Information</h4> </div> </div> </div> + <!-- /Third-Part Agent/Government --> </form> </div> </section> <section *ngIf="needsAuthorizationLetter || hasCrownParcels || files.length > 0"> - <h4>Primary Contact Authorization Letters</h4> - <div> - <ng-container *ngIf="!isGovernmentUser"> - An authorization letter must be provided if: - <ol> - <li>the parcel under notice of intent is owned by more than one person;</li> - <li>the parcel(s) is owned by an organization; or</li> - <li>the parcel(s) is owned by a corporation (private, Crown, local government, First Nations); or</li> - <li>the notice of intent is being submitted by a third-party agent on behalf of the land owner(s)</li> - </ol> - <p> - The authorization letter must be signed by all individual land owners and the majority of directors in - organization land owners listed in Step 1. Please consult the Supporting Documentation page of ALC website for - further instruction and an Authorization Letter template. - </p> - </ng-container> - <ng-container *ngIf="isGovernmentUser"> - An authorization letter must be provided only if the notice of intent is being submitted by a third-party agent. - Please consult the Supporting Documentation page of the <a>TODO: FIX THIS: ALC website</a> for further - instruction. - </ng-container> - </div> - <h6>Authorization Letters (if applicable)</h6> + <h6>Authorization Letters</h6> + <p class="subtext"> + For privately owned Fee Simple parcels, the letter must be signed by all individual landowners and the majority of + directors within the organization.For Crown parcels or Fee Simple parcels owned by a government, the letter must be + signed by senior level staff. + </p> <div class="uploader"> <app-file-drag-drop [allowMultiple]="true" diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.scss b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.scss index ba5b4f2a09..3e5b079ec8 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.scss +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.scss @@ -56,3 +56,39 @@ section { margin-right: rem(8); } } + +.radio-option { + display: block !important; + + & .mdc-label { + cursor: pointer !important; + } +} + +.warning-banner { + margin-top: rem(8); + background-color: rgba(colors.$accent-color-light, 0.5); + padding: rem(16); + + .owner-details { + display: flex; + flex-direction: column; + } + + .row { + display: flex; + margin-bottom: rem(10); + } + + .key { + font-weight: bold; + margin-right: rem(5); + width: rem(300); + } + + .value { + flex-grow: 1; + overflow: hidden; + text-overflow: ellipsis; + } +} diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts index 6fe0f2e34b..d80adc79cd 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts @@ -17,6 +17,8 @@ import { OWNER_TYPE } from '../../../../shared/dto/owner.dto'; import { FileHandle } from '../../../../shared/file-drag-drop/drag-drop.directive'; import { EditNoiSteps } from '../edit-submission.component'; import { FilesStepComponent } from '../files-step.partial'; +import { OwnerDialogComponent } from 'src/app/shared/owner-dialogs/owner-dialog/owner-dialog.component'; +import { PrimaryContactConfirmationDialogComponent } from './primary-contact-confirmation-dialog/primary-contact-confirmation-dialog.component'; @Component({ selector: 'app-primary-contact', @@ -41,6 +43,8 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni isDirty = false; hasCrownParcels = false; + primaryContactType = new FormControl<boolean | null>(null, [Validators.required]); + firstName = new FormControl<string | null>('', [Validators.required]); lastName = new FormControl<string | null>('', [Validators.required]); organizationName = new FormControl<string | null>(''); @@ -237,6 +241,8 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni this.selectedLocalGovernment = selectedOwner.type.code === OWNER_TYPE.GOVERNMENT; } + this.primaryContactType.setValue(!this.selectedThirdPartyAgent); + if (this.selectedLocalGovernment) { this.organizationName.setValidators([Validators.required]); } else { @@ -277,4 +283,58 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni private prepareGovernmentOwners() { this.parcelOwners = []; } + + async onSelectPrimaryContactType(selectedThirdPartyAgent: boolean | null) { + if (this.form.dirty || (this.selectedOwnerUuid !== 'agent' && this.selectedOwnerUuid !== 'government')) { + await this.dialog + .open(PrimaryContactConfirmationDialogComponent, { + panelClass: 'no-padding', + disableClose: true, + }) + .beforeClosed() + .subscribe(async (confirmed) => { + if (confirmed) { + this.switchPrimaryContactType(selectedThirdPartyAgent); + } else { + console.log(selectedThirdPartyAgent); + this.primaryContactType.setValue(selectedThirdPartyAgent); + } + }); + } else { + this.switchPrimaryContactType(selectedThirdPartyAgent); + } + } + + switchPrimaryContactType(selectedThirdPartyAgent: boolean | null) { + if (selectedThirdPartyAgent) { + this.onSelectAgent(); + } else if (this.isGovernmentUser) { + this.onSelectGovernment(); + } else { + this.selectedThirdPartyAgent = false; + } + } + + onEdit(selectedOwnerUuid: string) { + const selectedOwner = this.parcelOwners.find((owner) => owner.uuid === selectedOwnerUuid); + + const dialog = this.dialog.open(OwnerDialogComponent, { + data: { + existingOwner: selectedOwner, + submissionUuid: this.submissionUuid, + ownerService: this.noticeOfIntentOwnerService, + }, + }); + + dialog.afterClosed().subscribe(async (updatedContact) => { + console.log(updatedContact); + if (updatedContact && this.selectedOwnerUuid !== undefined) { + this.firstName.setValue(updatedContact.firstName); + this.lastName.setValue(updatedContact.lastName); + this.organizationName.setValue(updatedContact.organizationName); + this.phoneNumber.setValue(updatedContact.phoneNumber); + this.email.setValue(updatedContact.email); + } + }); + } } From e1cce8188a91cfb8afe353770241bf3134f15892 Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Wed, 20 Dec 2023 12:20:37 -0800 Subject: [PATCH 804/954] Strip logging --- .../primary-contact/primary-contact.component.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts index d80adc79cd..4bd8f0d86d 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts @@ -296,7 +296,6 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni if (confirmed) { this.switchPrimaryContactType(selectedThirdPartyAgent); } else { - console.log(selectedThirdPartyAgent); this.primaryContactType.setValue(selectedThirdPartyAgent); } }); @@ -327,7 +326,6 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni }); dialog.afterClosed().subscribe(async (updatedContact) => { - console.log(updatedContact); if (updatedContact && this.selectedOwnerUuid !== undefined) { this.firstName.setValue(updatedContact.firstName); this.lastName.setValue(updatedContact.lastName); From 1c0bf2c571f91d373c9cce80c650ae148abb23ca Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Wed, 20 Dec 2023 12:25:40 -0800 Subject: [PATCH 805/954] Feature/alcs 1210 noi modifications (#1241) import notice of intent modifications update existing modifications in ALCS link modifications to notice of intents in ALCS --- .../common/oats_decision_enum.py | 6 + .../noi/noi_decisions/__init__.py | 7 +- .../noi_modifications/__init__.py | 10 ++ .../notice_of_intent_modifications_init.py | 149 ++++++++++++++++++ .../notice_of_intent_modifications_link.py | 128 +++++++++++++++ .../notice_of_intent_modifications_update.py | 127 +++++++++++++++ .../notice_of_intent_decisions_init.py | 2 +- .../noi/notice_of_intent_migration.py | 20 ++- .../notice_of_intent_modification_insert.sql | 22 +++ ...ce_of_intent_modification_insert_count.sql | 18 +++ ..._intent_modification_link_to_decisions.sql | 8 + ...t_modification_link_to_decisions_count.sql | 6 + .../notice_of_intent_modification_update.sql | 24 +++ ...ce_of_intent_modification_update_count.sql | 19 +++ .../unarchive-card/unarchive-card.service.ts | 27 ++-- .../notice-of-intent-modification.entity.ts | 13 +- ...ice-of-intent-modification.service.spec.ts | 27 +++- .../notice-of-intent-modification.service.ts | 9 +- .../1702925001694-nullable_cardUuid_on_noi.ts | 28 ++++ ...8-add_oats_recon_id_to_noi_modification.ts | 25 +++ 20 files changed, 643 insertions(+), 32 deletions(-) create mode 100644 bin/migrate-oats-data/noi/noi_decisions/noi_modifications/__init__.py create mode 100644 bin/migrate-oats-data/noi/noi_decisions/noi_modifications/notice_of_intent_modifications_init.py create mode 100644 bin/migrate-oats-data/noi/noi_decisions/noi_modifications/notice_of_intent_modifications_link.py create mode 100644 bin/migrate-oats-data/noi/noi_decisions/noi_modifications/notice_of_intent_modifications_update.py create mode 100644 bin/migrate-oats-data/noi/sql/notice_of_intent_decisions/modifications/notice_of_intent_modification_insert.sql create mode 100644 bin/migrate-oats-data/noi/sql/notice_of_intent_decisions/modifications/notice_of_intent_modification_insert_count.sql create mode 100644 bin/migrate-oats-data/noi/sql/notice_of_intent_decisions/modifications/notice_of_intent_modification_link_to_decisions.sql create mode 100644 bin/migrate-oats-data/noi/sql/notice_of_intent_decisions/modifications/notice_of_intent_modification_link_to_decisions_count.sql create mode 100644 bin/migrate-oats-data/noi/sql/notice_of_intent_decisions/modifications/notice_of_intent_modification_update.sql create mode 100644 bin/migrate-oats-data/noi/sql/notice_of_intent_decisions/modifications/notice_of_intent_modification_update_count.sql create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1702925001694-nullable_cardUuid_on_noi.ts create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1703011394918-add_oats_recon_id_to_noi_modification.ts diff --git a/bin/migrate-oats-data/common/oats_decision_enum.py b/bin/migrate-oats-data/common/oats_decision_enum.py index d6d370955f..4c34108bd7 100644 --- a/bin/migrate-oats-data/common/oats_decision_enum.py +++ b/bin/migrate-oats-data/common/oats_decision_enum.py @@ -5,3 +5,9 @@ class AlcsDecisionOutcomeCodeEnum(Enum): RESCINDED = "RESC" REFUSED = "REFU" APPROVED = "APPR" + + +class AlcsNoiModificationOutcomeCodeEnum(Enum): + PENDING = "PEN" + PROCEED_TO_MODIFY = "PRC" + REFUSE_TO_MODIFY = "REF" diff --git a/bin/migrate-oats-data/noi/noi_decisions/__init__.py b/bin/migrate-oats-data/noi/noi_decisions/__init__.py index ff1ae0f463..1187389427 100644 --- a/bin/migrate-oats-data/noi/noi_decisions/__init__.py +++ b/bin/migrate-oats-data/noi/noi_decisions/__init__.py @@ -1,4 +1,9 @@ from .notice_of_intent_decisions_init import ( init_notice_of_intent_decisions, - clean_notice_of_intents, + clean_notice_of_intent_decisions, +) + +from .noi_modifications.notice_of_intent_modifications_init import ( + init_notice_of_intent_modifications, + clean_notice_of_intent_modifications, ) diff --git a/bin/migrate-oats-data/noi/noi_decisions/noi_modifications/__init__.py b/bin/migrate-oats-data/noi/noi_decisions/noi_modifications/__init__.py new file mode 100644 index 0000000000..a9cf86ab98 --- /dev/null +++ b/bin/migrate-oats-data/noi/noi_decisions/noi_modifications/__init__.py @@ -0,0 +1,10 @@ +from .notice_of_intent_modifications_init import ( + init_notice_of_intent_modifications, + clean_notice_of_intent_modifications, +) + +from .notice_of_intent_modifications_update import update_notice_of_intent_modifications +from .notice_of_intent_modifications_link import ( + link_notice_of_intent_modifications, + unlink_etl_modifications, +) diff --git a/bin/migrate-oats-data/noi/noi_decisions/noi_modifications/notice_of_intent_modifications_init.py b/bin/migrate-oats-data/noi/noi_decisions/noi_modifications/notice_of_intent_modifications_init.py new file mode 100644 index 0000000000..0242c7f67c --- /dev/null +++ b/bin/migrate-oats-data/noi/noi_decisions/noi_modifications/notice_of_intent_modifications_init.py @@ -0,0 +1,149 @@ +from common import ( + OATS_ETL_USER, + setup_and_get_logger, + add_timezone_and_keep_date_part, + AlcsNoiModificationOutcomeCodeEnum, +) +from db import inject_conn_pool +from psycopg2.extras import RealDictCursor, execute_batch + +etl_name = "init_notice_of_intent_modifications" +logger = setup_and_get_logger(etl_name) + + +@inject_conn_pool +def init_notice_of_intent_modifications(conn=None, batch_size=1000): + """ + This function is responsible for initializing the notice_of_intent_modification in ALCS. + + Args: + conn (psycopg2.extensions.connection): PostgreSQL database connection. Provided by the decorator. + batch_size (int): The number of items to process at once. Defaults to BATCH_UPLOAD_SIZE. + """ + + logger.info(f"Start {etl_name}") + with conn.cursor(cursor_factory=RealDictCursor) as cursor: + with open( + "noi/sql/notice_of_intent_decisions/modifications/notice_of_intent_modification_insert_count.sql", + "r", + encoding="utf-8", + ) as sql_file: + count_query = sql_file.read() + cursor.execute(count_query) + count_total = dict(cursor.fetchone())["count"] + logger.info( + f"Total Notice of Intent Modifications data to insert: {count_total}" + ) + + failed_inserts = 0 + successful_inserts_count = 0 + last_modification_id = 0 + + with open( + "noi/sql/notice_of_intent_decisions/modifications/notice_of_intent_modification_insert.sql", + "r", + encoding="utf-8", + ) as sql_file: + query = sql_file.read() + while True: + cursor.execute( + f"{query} and orr.reconsideration_request_id > {last_modification_id} ORDER BY orr.reconsideration_request_id;" + ) + + rows = cursor.fetchmany(batch_size) + + if not rows: + break + try: + modifications_to_be_inserted_count = len(rows) + + _insert_notice_of_intent_modifications( + conn, batch_size, cursor, rows + ) + + successful_inserts_count = ( + successful_inserts_count + modifications_to_be_inserted_count + ) + last_modification_id = dict(rows[-1])["reconsideration_request_id"] + + logger.debug( + f"retrieved/inserted items count: {modifications_to_be_inserted_count}; total successfully inserted modifications so far {successful_inserts_count}; last inserted reconsideration_request_id: {last_modification_id}" + ) + except Exception as err: + logger.exception(err) + conn.rollback() + failed_inserts = count_total - successful_inserts_count + last_modification_id = last_modification_id + 1 + + logger.info( + f"Finished {etl_name}: total amount of successful inserts {successful_inserts_count}, total failed inserts {failed_inserts}" + ) + + +def _insert_notice_of_intent_modifications(conn, batch_size, cursor, rows): + """ """ + query = _get_insert_query() + parsed_data_list = _prepare_oats_alr_applications_data(rows) + + if len(parsed_data_list) > 0: + execute_batch(cursor, query, parsed_data_list, page_size=batch_size) + + conn.commit() + + +def _get_insert_query(): + query = f""" + INSERT INTO alcs.notice_of_intent_modification ( + audit_created_by, + submitted_date, + review_outcome_code, + notice_of_intent_uuid, + description, + oats_reconsideration_request_id + ) + VALUES ( + %(audit_created_by)s, + %(submitted_date)s, + %(review_outcome_code)s, + %(notice_of_intent_uuid)s, + %(description)s, + %(oats_reconsideration_request_id)s + ) + ON CONFLICT DO NOTHING; + """ + return query + + +def _prepare_oats_alr_applications_data(row_data_list): + data_list = [] + for row in row_data_list: + mapped_row = { + "audit_created_by": OATS_ETL_USER, + "submitted_date": add_timezone_and_keep_date_part(row.get("received_date")), + "review_outcome_code": _map_outcome_code(row), + "notice_of_intent_uuid": row.get("noi_uuid"), + "description": row.get("description"), + "oats_reconsideration_request_id": row.get("reconsideration_request_id"), + } + data_list.append(mapped_row) + + return data_list + + +def _map_outcome_code(row): + if row.get("approved_date", None) is not None: + return AlcsNoiModificationOutcomeCodeEnum.PROCEED_TO_MODIFY.value + else: + return AlcsNoiModificationOutcomeCodeEnum.PENDING.value + + +@inject_conn_pool +def clean_notice_of_intent_modifications(conn=None): + logger.info("Start notice_of_intent_modification cleaning") + with conn.cursor() as cursor: + cursor.execute( + f"DELETE FROM alcs.notice_of_intent_modification WHERE audit_created_by = '{OATS_ETL_USER}'" + ) + logger.info(f"Deleted items count = {cursor.rowcount}") + + conn.commit() diff --git a/bin/migrate-oats-data/noi/noi_decisions/noi_modifications/notice_of_intent_modifications_link.py b/bin/migrate-oats-data/noi/noi_decisions/noi_modifications/notice_of_intent_modifications_link.py new file mode 100644 index 0000000000..1db028025a --- /dev/null +++ b/bin/migrate-oats-data/noi/noi_decisions/noi_modifications/notice_of_intent_modifications_link.py @@ -0,0 +1,128 @@ +from common import ( + OATS_ETL_USER, + setup_and_get_logger, +) +from db import inject_conn_pool +from psycopg2.extras import RealDictCursor, execute_batch + +etl_name = "link_notice_of_intent_modifications" +logger = setup_and_get_logger(etl_name) + + +@inject_conn_pool +def link_notice_of_intent_modifications(conn=None, batch_size=1000): + """ + This function is responsible for linking notice_of_intent_modification to notice_of_intent_decisions in ALCS. + + Args: + conn (psycopg2.extensions.connection): PostgreSQL database connection. Provided by the decorator. + batch_size (int): The number of items to process at once. Defaults to BATCH_UPLOAD_SIZE. + """ + + logger.info(f"Start {etl_name}") + with conn.cursor(cursor_factory=RealDictCursor) as cursor: + with open( + "noi/sql/notice_of_intent_decisions/modifications/notice_of_intent_modification_link_to_decisions_count.sql", + "r", + encoding="utf-8", + ) as sql_file: + count_query = sql_file.read() + cursor.execute(count_query) + count_total = dict(cursor.fetchone())["count"] + logger.info(f"Total Notice of Intent Modifications data to link: {count_total}") + + failed_updates = 0 + successful_updates_count = 0 + last_modification_id = 0 + + with open( + "noi/sql/notice_of_intent_decisions/modifications/notice_of_intent_modification_link_to_decisions.sql", + "r", + encoding="utf-8", + ) as sql_file: + query = sql_file.read() + while True: + cursor.execute( + f"{query} and orr.reconsideration_request_id > {last_modification_id} ORDER BY orr.reconsideration_request_id;" + ) + + rows = cursor.fetchmany(batch_size) + + if not rows: + break + try: + modifications_to_be_updated_count = len(rows) + + _update_notice_of_intent_modifications( + conn, batch_size, cursor, rows + ) + + successful_updates_count = ( + successful_updates_count + modifications_to_be_updated_count + ) + last_modification_id = dict(rows[-1])["reconsideration_request_id"] + + logger.debug( + f"retrieved/linked items count: {modifications_to_be_updated_count}; total successfully linked modifications so far {successful_updates_count}; last updated reconsideration_request_id: {last_modification_id}" + ) + except Exception as err: + logger.exception(err) + conn.rollback() + failed_updates = count_total - successful_updates_count + last_modification_id = last_modification_id + 1 + + logger.info( + f"Finished {etl_name}: total amount of successful linked {successful_updates_count}, total failed updates {failed_updates}" + ) + + +def _update_notice_of_intent_modifications(conn, batch_size, cursor, rows): + data = _prepare_oats_alr_applications_data(rows) + + if len(data) > 0: + execute_batch( + cursor, + _get_update_query(), + data, + page_size=batch_size, + ) + + conn.commit() + + +def _get_update_query(): + query = f""" + UPDATE alcs.notice_of_intent_decision + SET modifies_uuid = %(modification_uuid)s + WHERE alcs.notice_of_intent_decision."uuid" = %(decision_uuid)s + """ + return query + + +def _prepare_oats_alr_applications_data(row_data_list): + data_list = [] + for row in row_data_list: + mapped_row = { + "modification_uuid": row["modification_uuid"], + "decision_uuid": row["decision_uuid"], + "reconsideration_request_id": row["reconsideration_request_id"], + } + data_list.append(mapped_row) + + return data_list + + +@inject_conn_pool +def unlink_etl_modifications(conn=None): + logger.info("Start notice_of_intent_modification link cleaning") + with conn.cursor() as cursor: + cursor.execute( + f"""UPDATE alcs.notice_of_intent_decision + SET modifies_uuid = NULL + FROM alcs.notice_of_intent_modification + WHERE alcs.notice_of_intent_decision.modifies_uuid = notice_of_intent_modification.uuid + AND alcs.notice_of_intent_modification.audit_created_by = '{OATS_ETL_USER}';""" + ) + logger.info(f"Unlinked items count = {cursor.rowcount}") + + conn.commit() diff --git a/bin/migrate-oats-data/noi/noi_decisions/noi_modifications/notice_of_intent_modifications_update.py b/bin/migrate-oats-data/noi/noi_decisions/noi_modifications/notice_of_intent_modifications_update.py new file mode 100644 index 0000000000..1c67187d62 --- /dev/null +++ b/bin/migrate-oats-data/noi/noi_decisions/noi_modifications/notice_of_intent_modifications_update.py @@ -0,0 +1,127 @@ +from common import ( + setup_and_get_logger, + add_timezone_and_keep_date_part, + AlcsNoiModificationOutcomeCodeEnum, +) +from db import inject_conn_pool +from psycopg2.extras import RealDictCursor, execute_batch + +etl_name = "update_notice_of_intent_modifications" +logger = setup_and_get_logger(etl_name) + + +@inject_conn_pool +def update_notice_of_intent_modifications(conn=None, batch_size=1000): + """ + This function is responsible for updating existing the notice_of_intent_modification in ALCS. + + Args: + conn (psycopg2.extensions.connection): PostgreSQL database connection. Provided by the decorator. + batch_size (int): The number of items to process at once. Defaults to BATCH_UPLOAD_SIZE. + """ + + logger.info(f"Start {etl_name}") + with conn.cursor(cursor_factory=RealDictCursor) as cursor: + with open( + "noi/sql/notice_of_intent_decisions/modifications/notice_of_intent_modification_update_count.sql", + "r", + encoding="utf-8", + ) as sql_file: + count_query = sql_file.read() + cursor.execute(count_query) + count_total = dict(cursor.fetchone())["count"] + logger.info( + f"Total Notice of Intent Modifications data to updated: {count_total}" + ) + + failed_updates = 0 + successful_updates_count = 0 + last_modification_id = 0 + + with open( + "noi/sql/notice_of_intent_decisions/modifications/notice_of_intent_modification_update.sql", + "r", + encoding="utf-8", + ) as sql_file: + query = sql_file.read() + while True: + cursor.execute( + f"{query} and orr.reconsideration_request_id > {last_modification_id} ORDER BY orr.reconsideration_request_id;" + ) + + rows = cursor.fetchmany(batch_size) + + if not rows: + break + try: + modifications_to_be_updated_count = len(rows) + + _update_notice_of_intent_modifications( + conn, batch_size, cursor, rows + ) + + successful_updates_count = ( + successful_updates_count + modifications_to_be_updated_count + ) + last_modification_id = dict(rows[-1])["reconsideration_request_id"] + + logger.debug( + f"retrieved/updated items count: {modifications_to_be_updated_count}; total successfully update modifications so far {successful_updates_count}; last updated reconsideration_request_id: {last_modification_id}" + ) + except Exception as err: + logger.exception(err) + conn.rollback() + failed_updates = count_total - successful_updates_count + last_modification_id = last_modification_id + 1 + + logger.info( + f"Finished {etl_name}: total amount of successful updates {successful_updates_count}, total failed updates {failed_updates}" + ) + + +def _update_notice_of_intent_modifications(conn, batch_size, cursor, rows): + data = _prepare_oats_alr_applications_data(rows) + + if len(data) > 0: + execute_batch( + cursor, + _get_update_query(), + data, + page_size=batch_size, + ) + + conn.commit() + + +def _get_update_query(): + query = f""" + UPDATE alcs.notice_of_intent_modification + SET submitted_date = %(submitted_date)s + , review_outcome_code = %(review_outcome_code)s + , description = %(description)s + , oats_reconsideration_request_id = %(oats_reconsideration_request_id)s + WHERE alcs.notice_of_intent_modification."uuid" = %(modification_uuid)s + """ + return query + + +def _prepare_oats_alr_applications_data(row_data_list): + data_list = [] + for row in row_data_list: + mapped_row = { + "submitted_date": add_timezone_and_keep_date_part(row.get("received_date")), + "review_outcome_code": _map_outcome_code(row), + "modification_uuid": row.get("modification_uuid"), + "description": row.get("description"), + "oats_reconsideration_request_id": row.get("reconsideration_request_id"), + } + data_list.append(mapped_row) + + return data_list + + +def _map_outcome_code(row): + if row.get("approved_date", None) is not None: + return AlcsNoiModificationOutcomeCodeEnum.PROCEED_TO_MODIFY.value + else: + return AlcsNoiModificationOutcomeCodeEnum.PENDING.value diff --git a/bin/migrate-oats-data/noi/noi_decisions/notice_of_intent_decisions_init.py b/bin/migrate-oats-data/noi/noi_decisions/notice_of_intent_decisions_init.py index b0ea4ba961..547b09d7d5 100644 --- a/bin/migrate-oats-data/noi/noi_decisions/notice_of_intent_decisions_init.py +++ b/bin/migrate-oats-data/noi/noi_decisions/notice_of_intent_decisions_init.py @@ -185,7 +185,7 @@ def _map_is_subject_to_conditions(row): @inject_conn_pool -def clean_notice_of_intents(conn=None): +def clean_notice_of_intent_decisions(conn=None): logger.info("Start notice_of_intent_decisions cleaning") with conn.cursor() as cursor: cursor.execute( diff --git a/bin/migrate-oats-data/noi/notice_of_intent_migration.py b/bin/migrate-oats-data/noi/notice_of_intent_migration.py index dbee82a944..75c3ad25b9 100644 --- a/bin/migrate-oats-data/noi/notice_of_intent_migration.py +++ b/bin/migrate-oats-data/noi/notice_of_intent_migration.py @@ -55,7 +55,14 @@ from noi.noi_decisions.notice_of_intent_decisions_init import ( init_notice_of_intent_decisions, - clean_notice_of_intents, + clean_notice_of_intent_decisions, +) +from .noi_decisions.noi_modifications import ( + init_notice_of_intent_modifications, + clean_notice_of_intent_modifications, + update_notice_of_intent_modifications, + link_notice_of_intent_modifications, + unlink_etl_modifications, ) @@ -71,7 +78,7 @@ def clean_notice_of_intent(): clean_parcels() clean_notice_of_intent_submission_statuses() clean_notice_of_intent_submissions() - clean_notice_of_intent_decisions() + clean_notice_of_intent_decision() clean_notice_of_intents() @@ -82,10 +89,15 @@ def process_notice_of_intent_soil(batch_size): def process_notice_of_intent_decisions(batch_size): init_notice_of_intent_decisions(batch_size) + update_notice_of_intent_modifications(batch_size) + init_notice_of_intent_modifications(batch_size) + link_notice_of_intent_modifications(batch_size) -def clean_notice_of_intent_decisions(): - clean_notice_of_intents() +def clean_notice_of_intent_decision(): + unlink_etl_modifications() + clean_notice_of_intent_modifications() + clean_notice_of_intent_decisions() def process_notice_of_intent(batch_size): diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_decisions/modifications/notice_of_intent_modification_insert.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_decisions/modifications/notice_of_intent_modification_insert.sql new file mode 100644 index 0000000000..fb8be58c04 --- /dev/null +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_decisions/modifications/notice_of_intent_modification_insert.sql @@ -0,0 +1,22 @@ +WITH alcs_modifications_resulting_decisions AS ( + SELECT noim."uuid", + noim.submitted_date::DATE AS submitted_date, + noid.resolution_number, + noid.resolution_year, + noid.oats_alr_appl_decision_id + FROM alcs.notice_of_intent_modification noim + JOIN alcs.notice_of_intent_decision noid ON noid.modifies_uuid = noim."uuid" + JOIN alcs.notice_of_intent noi ON noi."uuid" = noim.notice_of_intent_uuid +) +SELECT orr.reconsideration_request_id, + orr.received_date, + orr.approved_date, + noi."uuid" AS noi_uuid, + orr.description +FROM oats.oats_reconsideration_requests orr + JOIN oats.oats_alr_appl_decisions oaad ON oaad.reconsideration_request_id = orr.reconsideration_request_id + JOIN alcs.notice_of_intent noi ON noi.file_number = oaad.alr_application_id::TEXT + OR noi.file_number = orr.alr_application_id::TEXT -- this IS required to get oats_recons only for nois + LEFT JOIN alcs_modifications_resulting_decisions AS amrd ON amrd.oats_alr_appl_decision_id = oaad.alr_appl_decision_id + AND amrd.submitted_date = orr.received_date::DATE +WHERE amrd."uuid" IS NULL \ No newline at end of file diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_decisions/modifications/notice_of_intent_modification_insert_count.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_decisions/modifications/notice_of_intent_modification_insert_count.sql new file mode 100644 index 0000000000..728919e50f --- /dev/null +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_decisions/modifications/notice_of_intent_modification_insert_count.sql @@ -0,0 +1,18 @@ +WITH alcs_modifications_resulting_decisions AS ( + SELECT noim."uuid", + noim.submitted_date::DATE AS submitted_date, + noid.resolution_number, + noid.resolution_year, + noid.oats_alr_appl_decision_id + FROM alcs.notice_of_intent_modification noim + JOIN alcs.notice_of_intent_decision noid ON noid.modifies_uuid = noim."uuid" + JOIN alcs.notice_of_intent noi ON noi."uuid" = noim.notice_of_intent_uuid +) +SELECT count(*) +FROM oats.oats_reconsideration_requests orr + JOIN oats.oats_alr_appl_decisions oaad ON oaad.reconsideration_request_id = orr.reconsideration_request_id + JOIN alcs.notice_of_intent noi ON noi.file_number = oaad.alr_application_id::TEXT + OR noi.file_number = orr.alr_application_id::TEXT -- this IS required to get oats_recons only for nois + LEFT JOIN alcs_modifications_resulting_decisions AS amrd ON amrd.oats_alr_appl_decision_id = oaad.alr_appl_decision_id + AND amrd.submitted_date = orr.received_date::DATE +WHERE amrd."uuid" IS NULL; \ No newline at end of file diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_decisions/modifications/notice_of_intent_modification_link_to_decisions.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_decisions/modifications/notice_of_intent_modification_link_to_decisions.sql new file mode 100644 index 0000000000..fb74fe3a01 --- /dev/null +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_decisions/modifications/notice_of_intent_modification_link_to_decisions.sql @@ -0,0 +1,8 @@ +SELECT noim."uuid" as modification_uuid, + noid."uuid" as decision_uuid, + orr.reconsideration_request_id +FROM oats.oats_reconsideration_requests orr + JOIN oats.oats_alr_appl_decisions oaad ON oaad.reconsideration_request_id = orr.reconsideration_request_id + JOIN alcs.notice_of_intent_decision noid ON noid.oats_alr_appl_decision_id = oaad.alr_appl_decision_id + JOIN alcs.notice_of_intent_modification noim ON noim.oats_reconsideration_request_id = orr.reconsideration_request_id +WHERE noid.modifies_uuid IS NULL \ No newline at end of file diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_decisions/modifications/notice_of_intent_modification_link_to_decisions_count.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_decisions/modifications/notice_of_intent_modification_link_to_decisions_count.sql new file mode 100644 index 0000000000..81431a5826 --- /dev/null +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_decisions/modifications/notice_of_intent_modification_link_to_decisions_count.sql @@ -0,0 +1,6 @@ +SELECT count(*) +FROM oats.oats_reconsideration_requests orr + JOIN oats.oats_alr_appl_decisions oaad ON oaad.reconsideration_request_id = orr.reconsideration_request_id + JOIN alcs.notice_of_intent_decision noid ON noid.oats_alr_appl_decision_id = oaad.alr_appl_decision_id + JOIN alcs.notice_of_intent_modification noim ON noim.oats_reconsideration_request_id = orr.reconsideration_request_id +WHERE noid.modifies_uuid IS NULL; \ No newline at end of file diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_decisions/modifications/notice_of_intent_modification_update.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_decisions/modifications/notice_of_intent_modification_update.sql new file mode 100644 index 0000000000..d0c23db0be --- /dev/null +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_decisions/modifications/notice_of_intent_modification_update.sql @@ -0,0 +1,24 @@ +WITH alcs_modifications_resulting_decisions AS ( + SELECT noim."uuid" AS modification_uuid, + noim.submitted_date::DATE AS submitted_date, + noid.resolution_number, + noid.resolution_year, + noid.oats_alr_appl_decision_id, + noim.audit_created_by + FROM alcs.notice_of_intent_modification noim + JOIN alcs.notice_of_intent_decision noid ON noid.modifies_uuid = noim."uuid" + JOIN alcs.notice_of_intent noi ON noi."uuid" = noim.notice_of_intent_uuid +) +SELECT orr.reconsideration_request_id, + orr.received_date, + orr.approved_date, + noi."uuid" AS noi_uuid, + orr.description, + amrd.modification_uuid +FROM oats.oats_reconsideration_requests orr + JOIN oats.oats_alr_appl_decisions oaad ON oaad.reconsideration_request_id = orr.reconsideration_request_id + JOIN alcs.notice_of_intent noi ON noi.file_number = oaad.alr_application_id::TEXT + OR noi.file_number = orr.alr_application_id::TEXT -- this is required to get oats_recons only for nois + JOIN alcs_modifications_resulting_decisions AS amrd ON amrd.oats_alr_appl_decision_id = oaad.alr_appl_decision_id + AND amrd.submitted_date = orr.received_date::DATE -- this will make sure that only modifications that exist in oats will be selected +WHERE amrd.audit_created_by <> 'oats_etl' \ No newline at end of file diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_decisions/modifications/notice_of_intent_modification_update_count.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_decisions/modifications/notice_of_intent_modification_update_count.sql new file mode 100644 index 0000000000..63432d9eb3 --- /dev/null +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_decisions/modifications/notice_of_intent_modification_update_count.sql @@ -0,0 +1,19 @@ +WITH alcs_modifications_resulting_decisions AS ( + SELECT noim."uuid" AS modification_uuid, + noim.submitted_date::DATE AS submitted_date, + noid.resolution_number, + noid.resolution_year, + noid.oats_alr_appl_decision_id, + noim.audit_created_by + FROM alcs.notice_of_intent_modification noim + JOIN alcs.notice_of_intent_decision noid ON noid.modifies_uuid = noim."uuid" + JOIN alcs.notice_of_intent noi ON noi."uuid" = noim.notice_of_intent_uuid +) +SELECT count(*) +FROM oats.oats_reconsideration_requests orr + JOIN oats.oats_alr_appl_decisions oaad ON oaad.reconsideration_request_id = orr.reconsideration_request_id + JOIN alcs.notice_of_intent noi ON noi.file_number = oaad.alr_application_id::TEXT + OR noi.file_number = orr.alr_application_id::TEXT -- this is required to get oats_recons only for nois + JOIN alcs_modifications_resulting_decisions AS amrd ON amrd.oats_alr_appl_decision_id = oaad.alr_appl_decision_id + AND amrd.submitted_date = orr.received_date::DATE -- this will make sure that only modifications that exist in oats will be selected +WHERE amrd.audit_created_by <> 'oats_etl' \ No newline at end of file diff --git a/services/apps/alcs/src/alcs/admin/unarchive-card/unarchive-card.service.ts b/services/apps/alcs/src/alcs/admin/unarchive-card/unarchive-card.service.ts index b5ff9d52b7..e62ce00fe2 100644 --- a/services/apps/alcs/src/alcs/admin/unarchive-card/unarchive-card.service.ts +++ b/services/apps/alcs/src/alcs/admin/unarchive-card/unarchive-card.service.ts @@ -77,9 +77,8 @@ export class UnarchiveCardService { createdAt: number; }[], ) { - const modifications = await this.modificationService.getDeletedCards( - fileId, - ); + const modifications = + await this.modificationService.getDeletedCards(fileId); for (const modification of modifications) { result.push({ cardUuid: modification.cardUuid, @@ -99,9 +98,8 @@ export class UnarchiveCardService { createdAt: number; }[], ) { - const planningReviews = await this.planningReviewService.getDeletedCards( - fileId, - ); + const planningReviews = + await this.planningReviewService.getDeletedCards(fileId); for (const planningReview of planningReviews) { result.push({ cardUuid: planningReview.cardUuid, @@ -121,9 +119,8 @@ export class UnarchiveCardService { createdAt: number; }[], ) { - const reconsiderations = await this.reconsiderationService.getDeletedCards( - fileId, - ); + const reconsiderations = + await this.reconsiderationService.getDeletedCards(fileId); for (const reconsideration of reconsiderations) { result.push({ cardUuid: reconsideration.cardUuid, @@ -143,9 +140,8 @@ export class UnarchiveCardService { createdAt: number; }[], ) { - const noticeOfIntents = await this.noticeOfIntentService.getDeletedCards( - fileId, - ); + const noticeOfIntents = + await this.noticeOfIntentService.getDeletedCards(fileId); for (const noi of noticeOfIntents) { result.push({ cardUuid: noi.cardUuid, @@ -160,7 +156,7 @@ export class UnarchiveCardService { for (const noi of modificationNOIs) { result.push({ - cardUuid: noi.cardUuid, + cardUuid: noi.cardUuid ?? '', createdAt: noi.auditCreatedAt.getTime(), type: 'NOI MODI', status: noi.card!.status.label, @@ -177,9 +173,8 @@ export class UnarchiveCardService { createdAt: number; }[], ) { - const notifications = await this.notificationService.getDeletedCards( - fileId, - ); + const notifications = + await this.notificationService.getDeletedCards(fileId); for (const notification of notifications) { result.push({ cardUuid: notification.cardUuid, diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-modification/notice-of-intent-modification.entity.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-modification/notice-of-intent-modification.entity.ts index 1b6c463b4a..64eb281b48 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-modification/notice-of-intent-modification.entity.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-modification/notice-of-intent-modification.entity.ts @@ -60,8 +60,8 @@ export class NoticeOfIntentModification extends Base { card: Card | null; @AutoMap() - @Column({ type: 'uuid' }) - cardUuid: string; + @Column({ type: 'uuid', nullable: true }) + cardUuid: string | null; @ManyToMany(() => NoticeOfIntentDecision, (decision) => decision.modifiedBy) @JoinTable({ @@ -71,4 +71,13 @@ export class NoticeOfIntentModification extends Base { @OneToOne(() => NoticeOfIntentDecision, (dec) => dec.modifies) resultingDecision?: NoticeOfIntentDecision; + + @Column({ + select: false, + nullable: true, + type: 'int8', + comment: + 'This column is NOT related to any functionality in ALCS. It is only used for ETL and backtracking of imported data from OATS. It links oats.oats_reconsideration_requests to alcs.notice_of_intent_modification.', + }) + oatsReconsiderationRequestId: number; } diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-modification/notice-of-intent-modification.service.spec.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-modification/notice-of-intent-modification.service.spec.ts index 206c1f8fa5..95c8835eff 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-modification/notice-of-intent-modification.service.spec.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-modification/notice-of-intent-modification.service.spec.ts @@ -1,9 +1,9 @@ import { ServiceNotFoundException } from '@app/common/exceptions/base.exception'; -import { classes } from 'automapper-classes'; -import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { FindOptionsRelations, IsNull, Repository } from 'typeorm'; import { ModificationProfile } from '../../../common/automapper/modification.automapper.profile'; import { Board } from '../../board/board.entity'; @@ -12,8 +12,8 @@ import { Card } from '../../card/card.entity'; import { CardService } from '../../card/card.service'; import { NoticeOfIntent } from '../../notice-of-intent/notice-of-intent.entity'; import { NoticeOfIntentService } from '../../notice-of-intent/notice-of-intent.service'; -import { NoticeOfIntentDecision } from '../notice-of-intent-decision.entity'; import { NoticeOfIntentDecisionV1Service } from '../notice-of-intent-decision-v1/notice-of-intent-decision-v1.service'; +import { NoticeOfIntentDecision } from '../notice-of-intent-decision.entity'; import { NoticeOfIntentModificationCreateDto, NoticeOfIntentModificationUpdateDto, @@ -97,7 +97,7 @@ describe('NoticeOfIntentModificationService', () => { NoticeOfIntentModificationService, ); - mockModification = new NoticeOfIntentModification(); + mockModification = new NoticeOfIntentModification({ cardUuid: 'mockUuid' }); modificationRepoMock.findOneOrFail.mockResolvedValue(mockModification); modificationRepoMock.findOneBy.mockResolvedValue(mockModification); modificationRepoMock.find.mockResolvedValue([mockModification]); @@ -219,13 +219,30 @@ describe('NoticeOfIntentModificationService', () => { await service.delete(uuid); - expect(modificationRepoMock.findOneBy).toBeCalledWith({ + expect(modificationRepoMock.findOneBy).toHaveBeenCalledWith({ uuid, }); expect(modificationRepoMock.softRemove).toHaveBeenCalledTimes(1); expect(cardServiceMock.archive).toHaveBeenCalledTimes(1); }); + it('should not call archive card if modification does not have card attached (only modifications imported from OATS) on delete', async () => { + const uuid = 'fake'; + modificationRepoMock.findOneBy.mockResolvedValue( + new NoticeOfIntentModification(), + ); + modificationRepoMock.softRemove.mockResolvedValue({} as any); + cardServiceMock.archive.mockResolvedValue(); + + await service.delete(uuid); + + expect(modificationRepoMock.findOneBy).toHaveBeenCalledWith({ + uuid, + }); + expect(modificationRepoMock.softRemove).toHaveBeenCalledTimes(1); + expect(cardServiceMock.archive).toHaveBeenCalledTimes(0); + }); + it('should fail on delete if modification does not exist', async () => { const uuid = 'fake'; modificationRepoMock.findOneBy.mockResolvedValue(null); diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-modification/notice-of-intent-modification.service.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-modification/notice-of-intent-modification.service.ts index 39eb816959..945f2346b6 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-modification/notice-of-intent-modification.service.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-modification/notice-of-intent-modification.service.ts @@ -1,8 +1,8 @@ import { ServiceNotFoundException } from '@app/common/exceptions/base.exception'; -import { Mapper } from 'automapper-core'; -import { InjectMapper } from 'automapper-nestjs'; import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; +import { Mapper } from 'automapper-core'; +import { InjectMapper } from 'automapper-nestjs'; import { FindOptionsRelations, FindOptionsWhere, @@ -160,7 +160,10 @@ export class NoticeOfIntentModificationService { async delete(uuid: string) { const modification = await this.getByUuidOrFail(uuid); - await this.cardService.archive(modification.cardUuid); + if (modification.cardUuid) { + await this.cardService.archive(modification.cardUuid); + } + return this.modificationRepository.softRemove([modification]); } diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1702925001694-nullable_cardUuid_on_noi.ts b/services/apps/alcs/src/providers/typeorm/migrations/1702925001694-nullable_cardUuid_on_noi.ts new file mode 100644 index 0000000000..4124bc787e --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1702925001694-nullable_cardUuid_on_noi.ts @@ -0,0 +1,28 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class NullableCardUuidOnNoi1702925001694 implements MigrationInterface { + name = 'NullableCardUuidOnNoi1702925001694'; + public async up(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_modification" DROP CONSTRAINT "FK_bf0ebc2212d34996113c9de2284"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_modification" ALTER COLUMN "card_uuid" DROP NOT NULL`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_modification" ADD CONSTRAINT "FK_bf0ebc2212d34996113c9de2284" FOREIGN KEY ("card_uuid") REFERENCES "alcs"."card"("uuid") ON DELETE NO ACTION ON UPDATE NO ACTION`, + ); + } + + public async down(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_modification" DROP CONSTRAINT "FK_bf0ebc2212d34996113c9de2284"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_modification" ALTER COLUMN "card_uuid" SET NOT NULL`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_modification" ADD CONSTRAINT "FK_bf0ebc2212d34996113c9de2284" FOREIGN KEY ("card_uuid") REFERENCES "alcs"."card"("uuid") ON DELETE NO ACTION ON UPDATE NO ACTION`, + ); + } +} diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1703011394918-add_oats_recon_id_to_noi_modification.ts b/services/apps/alcs/src/providers/typeorm/migrations/1703011394918-add_oats_recon_id_to_noi_modification.ts new file mode 100644 index 0000000000..492bba79d4 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1703011394918-add_oats_recon_id_to_noi_modification.ts @@ -0,0 +1,25 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class AddOatsReconIdToNoiModification1703011394918 + implements MigrationInterface +{ + name = 'AddOatsReconIdToNoiModification1703011394918'; + + public async up(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_modification" ADD "oats_reconsideration_request_id" bigint`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."notice_of_intent_modification"."oats_reconsideration_request_id" IS 'This column is NOT related to any functionality in ALCS. It is only used for ETL and backtracking of imported data from OATS. It links oats.oats_reconsideration_requests to alcs.notice_of_intent_modification.'`, + ); + } + + public async down(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."notice_of_intent_modification"."oats_reconsideration_request_id" IS 'This column is NOT related to any functionality in ALCS. It is only used for ETL and backtracking of imported data from OATS. It links oats.oats_reconsideration_requests to alcs.notice_of_intent_modification.'`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_modification" DROP COLUMN "oats_reconsideration_request_id"`, + ); + } +} From 398db074c38a6b5b455211201b7521e0d8aa19cc Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Wed, 20 Dec 2023 12:30:09 -0800 Subject: [PATCH 806/954] Fix wording and logic for gov/basic forms --- .../primary-contact.component.html | 28 +++++++++++++++---- .../primary-contact.component.html | 20 ++++++++++--- 2 files changed, 39 insertions(+), 9 deletions(-) diff --git a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html index 3d8102e170..f2bb2eac34 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html @@ -29,7 +29,7 @@ <h4>Primary Contact Information</h4> </div> <!-- Owner --> - <div *ngIf="selectedThirdPartyAgent === false"> + <div *ngIf="selectedThirdPartyAgent === false && parcelOwners.length > 0"> <label *ngIf="owners.length" >Select a Primary Contact from the listed land owners and government contacts</label > @@ -46,7 +46,10 @@ <h4>Primary Contact Information</h4> </mat-radio-button> </mat-radio-group> - <div class="warning-banner" *ngIf="selectedOwnerUuid && !selectedLocalGovernment"> + <div + class="warning-banner" + *ngIf="selectedOwnerUuid && selectedOwnerUuid !== 'agent' && !selectedLocalGovernment" + > <div class="owner-details"> <div class="row"> <div class="key"><strong>First Name:</strong></div> @@ -74,6 +77,9 @@ <h4>Primary Contact Information</h4> </div> </div> </div> + <div *ngIf="selectedThirdPartyAgent === false && parcelOwners.length === 0"> + No landowners or government contacts are added. Please go back to Step 1 to add information. + </div> <!-- /Owner --> <!-- Third-Part Agent/Government --> @@ -99,11 +105,23 @@ <h4>Primary Contact Information</h4> </div> </div> <div class="full-row"> - <label *ngIf="!isCrownOwner && !selectedLocalGovernment" for="orgName">Organization Name (optional)</label> - <label *ngIf="isCrownOwner" for="orgName">Ministry or Department</label> + <label *ngIf="!selectedLocalGovernment" for="orgName">Organization Name (optional)</label> <label *ngIf="selectedLocalGovernment" for="orgName">Department</label> <mat-form-field appearance="outline"> - <input id="orgName" matInput placeholder="Enter Organization Name" formControlName="organizationName" /> + <input + *ngIf="!selectedLocalGovernment" + id="orgName" + matInput + placeholder="Enter Organization Name" + formControlName="organizationName" + /> + <input + *ngIf="selectedLocalGovernment" + id="orgName" + matInput + placeholder="Enter Department Name" + formControlName="organizationName" + /> </mat-form-field> <div *ngIf="organizationName.invalid && (organizationName.dirty || organizationName.touched)" diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html index f506de0540..81b7f65103 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html @@ -78,7 +78,7 @@ <h4>Primary Contact Information</h4> </div> </div> </div> - <div *ngIf="selectedThirdPartyAgent === false && parcelOwners.length === 0"> + <div *ngIf="selectedThirdPartyAgent === false && parcelOwners.length === 0 && !isGovernmentUser"> No landowners or government contacts are added. Please go back to Step 1 to add information. </div> <!-- /Owner --> @@ -106,11 +106,23 @@ <h4>Primary Contact Information</h4> </div> </div> <div class="full-row"> - <label *ngIf="!isCrownOwner && !selectedLocalGovernment" for="orgName">Organization Name (optional)</label> - <label *ngIf="isCrownOwner" for="orgName">Ministry or Department</label> + <label *ngIf="!selectedLocalGovernment" for="orgName">Organization Name (optional)</label> <label *ngIf="selectedLocalGovernment" for="orgName">Department</label> <mat-form-field appearance="outline"> - <input id="orgName" matInput placeholder="Enter Organization Name" formControlName="organizationName" /> + <input + *ngIf="!selectedLocalGovernment" + id="orgName" + matInput + placeholder="Enter Organization Name" + formControlName="organizationName" + /> + <input + *ngIf="selectedLocalGovernment" + id="orgName" + matInput + placeholder="Enter Department Name" + formControlName="organizationName" + /> </mat-form-field> <div *ngIf="organizationName.invalid && (organizationName.dirty || organizationName.touched)" From 602c549ce95435e799c76e389aa0515372f76d6f Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Wed, 20 Dec 2023 12:30:51 -0800 Subject: [PATCH 807/954] Use crown edit dialog for crown owners --- .../primary-contact.component.ts | 27 ++++++++++++++----- .../primary-contact.component.ts | 27 ++++++++++++++----- 2 files changed, 40 insertions(+), 14 deletions(-) diff --git a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts index abde52b766..5a816f72a5 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts @@ -18,6 +18,7 @@ import { EditApplicationSteps } from '../edit-submission.component'; import { FilesStepComponent } from '../files-step.partial'; import { PrimaryContactConfirmationDialogComponent } from './primary-contact-confirmation-dialog/primary-contact-confirmation-dialog.component'; import { OwnerDialogComponent } from 'src/app/shared/owner-dialogs/owner-dialog/owner-dialog.component'; +import { CrownOwnerDialogComponent } from 'src/app/shared/owner-dialogs/crown-owner-dialog/crown-owner-dialog.component'; @Component({ selector: 'app-primary-contact', @@ -316,13 +317,25 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni onEdit(selectedOwnerUuid: string) { const selectedOwner = this.parcelOwners.find((owner) => owner.uuid === selectedOwnerUuid); - const dialog = this.dialog.open(OwnerDialogComponent, { - data: { - existingOwner: selectedOwner, - submissionUuid: this.submissionUuid, - ownerService: this.applicationOwnerService, - }, - }); + let dialog; + + if (this.isCrownOwner) { + dialog = this.dialog.open(CrownOwnerDialogComponent, { + data: { + existingOwner: selectedOwner, + submissionUuid: this.submissionUuid, + ownerService: this.applicationOwnerService, + }, + }); + } else { + dialog = this.dialog.open(OwnerDialogComponent, { + data: { + existingOwner: selectedOwner, + submissionUuid: this.submissionUuid, + ownerService: this.applicationOwnerService, + }, + }); + } dialog.afterClosed().subscribe(async (updatedContact) => { console.log(updatedContact); diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts index 4bd8f0d86d..0ba20bd836 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts @@ -19,6 +19,7 @@ import { EditNoiSteps } from '../edit-submission.component'; import { FilesStepComponent } from '../files-step.partial'; import { OwnerDialogComponent } from 'src/app/shared/owner-dialogs/owner-dialog/owner-dialog.component'; import { PrimaryContactConfirmationDialogComponent } from './primary-contact-confirmation-dialog/primary-contact-confirmation-dialog.component'; +import { CrownOwnerDialogComponent } from 'src/app/shared/owner-dialogs/crown-owner-dialog/crown-owner-dialog.component'; @Component({ selector: 'app-primary-contact', @@ -317,13 +318,25 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni onEdit(selectedOwnerUuid: string) { const selectedOwner = this.parcelOwners.find((owner) => owner.uuid === selectedOwnerUuid); - const dialog = this.dialog.open(OwnerDialogComponent, { - data: { - existingOwner: selectedOwner, - submissionUuid: this.submissionUuid, - ownerService: this.noticeOfIntentOwnerService, - }, - }); + let dialog; + + if (this.isCrownOwner) { + dialog = this.dialog.open(CrownOwnerDialogComponent, { + data: { + existingOwner: selectedOwner, + submissionUuid: this.submissionUuid, + ownerService: this.noticeOfIntentOwnerService, + }, + }); + } else { + dialog = this.dialog.open(OwnerDialogComponent, { + data: { + existingOwner: selectedOwner, + submissionUuid: this.submissionUuid, + ownerService: this.noticeOfIntentOwnerService, + }, + }); + } dialog.afterClosed().subscribe(async (updatedContact) => { if (updatedContact && this.selectedOwnerUuid !== undefined) { From 2127b78f2d5507817a0f9b3b01276b09bb7fe680 Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Wed, 20 Dec 2023 12:33:55 -0800 Subject: [PATCH 808/954] Strip logging --- .../primary-contact/primary-contact.component.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts index 5a816f72a5..d11f573d7f 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts @@ -295,7 +295,6 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni if (confirmed) { this.switchPrimaryContactType(selectedThirdPartyAgent); } else { - console.log(selectedThirdPartyAgent); this.primaryContactType.setValue(selectedThirdPartyAgent); } }); @@ -338,7 +337,6 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni } dialog.afterClosed().subscribe(async (updatedContact) => { - console.log(updatedContact); if (updatedContact && this.selectedOwnerUuid !== undefined) { this.firstName.setValue(updatedContact.firstName); this.lastName.setValue(updatedContact.lastName); From 32252df3b95cd3d522c83bb908e7dbf3287a8411 Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Wed, 20 Dec 2023 12:43:40 -0800 Subject: [PATCH 809/954] Change organization field based on owner type --- .../primary-contact/primary-contact.component.html | 5 +++-- .../primary-contact/primary-contact.component.html | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html index f2bb2eac34..8bb2a109b2 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html @@ -59,8 +59,9 @@ <h4>Primary Contact Information</h4> <div class="key"><strong>Last Name:</strong></div> <div class="value">{{ lastName.value }}</div> </div> - <div class="row"> - <div class="key"><strong>Organization:</strong></div> + <div *ngIf="organizationName.value" class="row"> + <div *ngIf="!isCrownOwner && !isGovernmentUser" class="key"><strong>Organization:</strong></div> + <div *ngIf="isCrownOwner" class="key"><strong>Ministry/Department:</strong></div> <div class="value">{{ organizationName.value }}</div> </div> <div class="row"> diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html index 81b7f65103..d1f460b296 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html @@ -60,8 +60,9 @@ <h4>Primary Contact Information</h4> <div class="key"><strong>Last Name:</strong></div> <div class="value">{{ lastName.value }}</div> </div> - <div class="row"> - <div class="key"><strong>Organization:</strong></div> + <div *ngIf="organizationName.value" class="row"> + <div *ngIf="!isCrownOwner && !isGovernmentUser" class="key"><strong>Organization:</strong></div> + <div *ngIf="isCrownOwner" class="key"><strong>Ministry/Department:</strong></div> <div class="value">{{ organizationName.value }}</div> </div> <div class="row"> From 94dbcb89374270f38bf84960f4009a42253c7142 Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Wed, 20 Dec 2023 12:56:57 -0800 Subject: [PATCH 810/954] Scroll user to owner info upon selection --- .../primary-contact/primary-contact.component.html | 1 + .../primary-contact/primary-contact.component.ts | 5 +++++ .../primary-contact/primary-contact.component.html | 1 + .../primary-contact/primary-contact.component.ts | 5 +++++ 4 files changed, 12 insertions(+) diff --git a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html index 8bb2a109b2..1f689863a6 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html @@ -47,6 +47,7 @@ <h4>Primary Contact Information</h4> </mat-radio-group> <div + id="owner-info" class="warning-banner" *ngIf="selectedOwnerUuid && selectedOwnerUuid !== 'agent' && !selectedLocalGovernment" > diff --git a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts index d11f573d7f..54f7766998 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts @@ -19,6 +19,7 @@ import { FilesStepComponent } from '../files-step.partial'; import { PrimaryContactConfirmationDialogComponent } from './primary-contact-confirmation-dialog/primary-contact-confirmation-dialog.component'; import { OwnerDialogComponent } from 'src/app/shared/owner-dialogs/owner-dialog/owner-dialog.component'; import { CrownOwnerDialogComponent } from 'src/app/shared/owner-dialogs/crown-owner-dialog/crown-owner-dialog.component'; +import { scrollToElement } from 'src/app/shared/utils/scroll-helper'; @Component({ selector: 'app-primary-contact', @@ -157,6 +158,10 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni } } this.calculateLetterRequired(); + + setTimeout(() => { + scrollToElement({ id: 'owner-info', center: false }); + }); } private calculateLetterRequired() { diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html index d1f460b296..eddd4050a6 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html @@ -48,6 +48,7 @@ <h4>Primary Contact Information</h4> </mat-radio-group> <div + id="owner-info" class="warning-banner" *ngIf="selectedOwnerUuid && selectedOwnerUuid !== 'agent' && !selectedLocalGovernment" > diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts index 0ba20bd836..a8294c2aa0 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts @@ -20,6 +20,7 @@ import { FilesStepComponent } from '../files-step.partial'; import { OwnerDialogComponent } from 'src/app/shared/owner-dialogs/owner-dialog/owner-dialog.component'; import { PrimaryContactConfirmationDialogComponent } from './primary-contact-confirmation-dialog/primary-contact-confirmation-dialog.component'; import { CrownOwnerDialogComponent } from 'src/app/shared/owner-dialogs/crown-owner-dialog/crown-owner-dialog.component'; +import { scrollToElement } from 'src/app/shared/utils/scroll-helper'; @Component({ selector: 'app-primary-contact', @@ -159,6 +160,10 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni } } this.calculateLetterRequired(); + + setTimeout(() => { + scrollToElement({ id: 'owner-info', center: false }); + }); } private calculateLetterRequired() { From cd9ff97a2ade27c36d9dbb03bffab208a1be12f4 Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Wed, 20 Dec 2023 13:06:21 -0800 Subject: [PATCH 811/954] Auto-select contact when only one --- .../primary-contact/primary-contact.component.ts | 6 ++++++ .../primary-contact/primary-contact.component.ts | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts index 54f7766998..b56ae91faa 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts @@ -313,8 +313,14 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni this.onSelectAgent(); } else if (this.isGovernmentUser) { this.onSelectGovernment(); + if (this.parcelOwners.length == 1) { + this.onSelectOwner(this.parcelOwners[0].uuid); + } } else { this.selectedThirdPartyAgent = false; + if (this.parcelOwners.length == 1) { + this.onSelectOwner(this.parcelOwners[0].uuid); + } } } diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts index a8294c2aa0..34c021b85d 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts @@ -315,8 +315,14 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni this.onSelectAgent(); } else if (this.isGovernmentUser) { this.onSelectGovernment(); + if (this.parcelOwners.length == 1) { + this.onSelectOwner(this.parcelOwners[0].uuid); + } } else { this.selectedThirdPartyAgent = false; + if (this.parcelOwners.length == 1) { + this.onSelectOwner(this.parcelOwners[0].uuid); + } } } From 840b28e6c740230dde8aba19afd92e7fb2996f5b Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Wed, 20 Dec 2023 13:17:48 -0800 Subject: [PATCH 812/954] Format no owners message as warning --- .../primary-contact/primary-contact.component.html | 4 ++-- .../primary-contact/primary-contact.component.html | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html index 1f689863a6..11f738df98 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html @@ -79,9 +79,9 @@ <h4>Primary Contact Information</h4> </div> </div> </div> - <div *ngIf="selectedThirdPartyAgent === false && parcelOwners.length === 0"> + <app-warning-banner *ngIf="selectedThirdPartyAgent === false && parcelOwners.length === 0"> No landowners or government contacts are added. Please go back to Step 1 to add information. - </div> + </app-warning-banner> <!-- /Owner --> <!-- Third-Part Agent/Government --> diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html index eddd4050a6..df6f4f7c53 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html @@ -80,9 +80,9 @@ <h4>Primary Contact Information</h4> </div> </div> </div> - <div *ngIf="selectedThirdPartyAgent === false && parcelOwners.length === 0 && !isGovernmentUser"> + <app-warning-banner *ngIf="selectedThirdPartyAgent === false && parcelOwners.length === 0 && !isGovernmentUser"> No landowners or government contacts are added. Please go back to Step 1 to add information. - </div> + </app-warning-banner> <!-- /Owner --> <!-- Third-Part Agent/Government --> From 75833997173a3812db5142fb1d1c3a709b1d5976 Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Wed, 20 Dec 2023 13:18:13 -0800 Subject: [PATCH 813/954] Add link to ALC website --- .../primary-contact/primary-contact.component.html | 1 + .../primary-contact/primary-contact.component.scss | 4 ++++ .../primary-contact/primary-contact.component.html | 1 + .../primary-contact/primary-contact.component.scss | 4 ++++ 4 files changed, 10 insertions(+) diff --git a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html index 11f738df98..8d3ec79651 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html @@ -175,6 +175,7 @@ <h6>Authorization Letters</h6> directors within the organization.For Crown parcels or Fee Simple parcels owned by a government, the letter must be signed by senior level staff. </p> + <p class="alc-link">Visit the <a href="https://www.alc.gov.bc.ca/" target="_blank">ALC website</a> for a template.</p> <div class="uploader"> <app-file-drag-drop [allowMultiple]="true" diff --git a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.scss b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.scss index 3e5b079ec8..f1d67335c7 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.scss +++ b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.scss @@ -92,3 +92,7 @@ section { text-overflow: ellipsis; } } + +.alc-link { + background-color: colors.$secondary-color-light; +} diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html index df6f4f7c53..4d59e2c8e3 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html @@ -175,6 +175,7 @@ <h6>Authorization Letters</h6> directors within the organization.For Crown parcels or Fee Simple parcels owned by a government, the letter must be signed by senior level staff. </p> + <p class="alc-link">Visit the <a href="https://www.alc.gov.bc.ca/" target="_blank">ALC website</a> for a template.</p> <div class="uploader"> <app-file-drag-drop [allowMultiple]="true" diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.scss b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.scss index 3e5b079ec8..f1d67335c7 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.scss +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.scss @@ -92,3 +92,7 @@ section { text-overflow: ellipsis; } } + +.alc-link { + background-color: colors.$secondary-color-light; +} From 28dcc99e0a6939b9e1a377e670b9026bf3d71c91 Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Wed, 20 Dec 2023 13:26:44 -0800 Subject: [PATCH 814/954] Hide no owner warning if gov user --- .../primary-contact/primary-contact.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html index 8d3ec79651..09b1342da2 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html @@ -79,7 +79,7 @@ <h4>Primary Contact Information</h4> </div> </div> </div> - <app-warning-banner *ngIf="selectedThirdPartyAgent === false && parcelOwners.length === 0"> + <app-warning-banner *ngIf="selectedThirdPartyAgent === false && parcelOwners.length === 0 && !isGovernmentUser"> No landowners or government contacts are added. Please go back to Step 1 to add information. </app-warning-banner> <!-- /Owner --> From 1c089d31162ef42b71af518324dc9122a2d53168 Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Wed, 20 Dec 2023 13:50:20 -0800 Subject: [PATCH 815/954] Only mention gov owners when crown parcel exists --- .../primary-contact/primary-contact.component.html | 9 +++++++-- .../primary-contact/primary-contact.component.html | 9 +++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html index 09b1342da2..33fab9ebd5 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html @@ -16,7 +16,11 @@ <h4>Primary Contact Information</h4> <strong>Will {{ governmentName ?? 'Local / First Nation Government' }} staff be the primary contact?</strong> </p> <p *ngIf="!isGovernmentUser"> - <strong>Will one of the landowners or government contacts added previously be the primary contact?</strong> + <strong + >Will one of the landowners + <ng-container *ngIf="hasCrownParcels">or government contacts</ng-container> added previously be the primary + contact?</strong + > </p> <mat-button-toggle-group class="input" @@ -31,7 +35,8 @@ <h4>Primary Contact Information</h4> <!-- Owner --> <div *ngIf="selectedThirdPartyAgent === false && parcelOwners.length > 0"> <label *ngIf="owners.length" - >Select a Primary Contact from the listed land owners and government contacts</label + >Select a Primary Contact from the listed land owners + <ng-container *ngIf="hasCrownParcels">and government contacts</ng-container></label > <mat-radio-group color="primary" [value]="selectedOwnerUuid" required> diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html index 4d59e2c8e3..a8508bb469 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html @@ -16,7 +16,11 @@ <h4>Primary Contact Information</h4> <strong>Will {{ governmentName ?? 'Local / First Nation Government' }} staff be the primary contact?</strong> </p> <p *ngIf="!isGovernmentUser"> - <strong>Will one of the landowners or government contacts added previously be the primary contact?</strong> + <strong + >Will one of the landowners + <ng-container *ngIf="hasCrownParcels">or government contacts</ng-container> added previously be the primary + contact?</strong + > </p> <mat-button-toggle-group @@ -32,7 +36,8 @@ <h4>Primary Contact Information</h4> <!-- Owner --> <div *ngIf="selectedThirdPartyAgent === false && parcelOwners.length > 0"> <label *ngIf="owners.length" - >Select a Primary Contact from the listed land owners and government contacts</label + >Select a Primary Contact from the listed land owners + <ng-container *ngIf="hasCrownParcels">and government contacts</ng-container></label > <mat-radio-group color="primary" [value]="selectedOwnerUuid" required> From 640021b242b75319fda778f62cd7dba836159738 Mon Sep 17 00:00:00 2001 From: "to. sandra" <76515860+sandratoh@users.noreply.github.com> Date: Wed, 20 Dec 2023 13:52:43 -0800 Subject: [PATCH 816/954] Update file uploader, step description and app pfrs label (#1243) * Apply portal-wide UI updates with uploader and step description * Apply application-wide UI updates * Update application PFRS table label --- .../alcs-edit-submission.component.scss | 8 ++++++-- .../edit-submission/edit-submission.component.scss | 8 ++++++-- .../edit-submission/land-use/land-use.component.html | 2 +- .../other-attachments/other-attachments.component.html | 2 +- .../other-attachments/other-attachments.component.scss | 4 ++-- .../other-parcels/other-parcels.component.html | 2 +- .../parcel-details/parcel-details.component.html | 2 +- .../primary-contact/primary-contact.component.html | 2 +- .../proposal/cove-proposal/cove-proposal.component.html | 2 +- .../proposal/excl-proposal/excl-proposal.component.html | 2 +- .../proposal/incl-proposal/incl-proposal.component.html | 2 +- .../proposal/naru-proposal/naru-proposal.component.html | 2 +- .../proposal/nfu-proposal/nfu-proposal.component.html | 2 +- .../proposal/pfrs-proposal/pfrs-proposal.component.html | 7 +++---- .../proposal/pofo-proposal/pofo-proposal.component.html | 2 +- .../proposal/roso-proposal/roso-proposal.component.html | 2 +- .../proposal/subd-proposal/subd-proposal.component.html | 2 +- .../proposal/tur-proposal/tur-proposal.component.html | 2 +- .../select-government/select-government.component.html | 2 +- .../additional-information.component.html | 2 +- .../edit-submission/land-use/land-use.component.html | 2 +- .../edit-submission/parcels/parcel-details.component.html | 2 +- .../primary-contact/primary-contact.component.html | 2 +- .../proposal/pfrs/pfrs-proposal.component.html | 2 +- .../proposal/pofo/pofo-proposal.component.html | 2 +- .../proposal/roso/roso-proposal.component.html | 2 +- .../select-government/select-government.component.html | 2 +- .../edit-submission/parcels/parcel-details.component.html | 4 ++-- .../primary-contact/primary-contact.component.html | 2 +- .../edit-submission/proposal/proposal.component.html | 2 +- .../select-government/select-government.component.html | 2 +- .../transferees/transferees.component.html | 2 +- .../shared/file-drag-drop/file-drag-drop.component.html | 1 + .../shared/file-drag-drop/file-drag-drop.component.scss | 2 ++ 34 files changed, 49 insertions(+), 39 deletions(-) diff --git a/portal-frontend/src/app/features/applications/alcs-edit-submission/alcs-edit-submission.component.scss b/portal-frontend/src/app/features/applications/alcs-edit-submission/alcs-edit-submission.component.scss index 680d1f6272..14215ecc8b 100644 --- a/portal-frontend/src/app/features/applications/alcs-edit-submission/alcs-edit-submission.component.scss +++ b/portal-frontend/src/app/features/applications/alcs-edit-submission/alcs-edit-submission.component.scss @@ -75,7 +75,7 @@ display: grid; grid-template-columns: 1fr; grid-row-gap: rem(24); - margin-bottom: rem(32); + margin-bottom: rem(16); } .mat-icon.mat-icon-inline { @@ -194,11 +194,15 @@ } .button-container { + position: sticky; + bottom: 0; margin-top: rem(40); - margin-bottom: rem(24); + background-color: colors.$white; display: flex; + padding: rem(16) 0; flex-direction: column-reverse; justify-content: space-between; + z-index: 2; @media screen and (min-width: $tabletBreakpoint) { flex-direction: row; diff --git a/portal-frontend/src/app/features/applications/edit-submission/edit-submission.component.scss b/portal-frontend/src/app/features/applications/edit-submission/edit-submission.component.scss index e745545965..6f1f2ddba2 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/edit-submission.component.scss +++ b/portal-frontend/src/app/features/applications/edit-submission/edit-submission.component.scss @@ -77,7 +77,7 @@ display: grid; grid-template-columns: 1fr; grid-row-gap: rem(24); - margin-bottom: rem(32); + margin-bottom: rem(16); } .step-documents { @@ -207,11 +207,15 @@ } .button-container { + position: sticky; + bottom: 0; margin-top: rem(40); - margin-bottom: rem(24); + background-color: colors.$white; display: flex; + padding: rem(16) 0; flex-direction: column-reverse; justify-content: space-between; + z-index: 2; @media screen and (min-width: $tabletBreakpoint) { flex-direction: row; diff --git a/portal-frontend/src/app/features/applications/edit-submission/land-use/land-use.component.html b/portal-frontend/src/app/features/applications/edit-submission/land-use/land-use.component.html index be8178c220..934da56e0f 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/land-use/land-use.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/land-use/land-use.component.html @@ -2,7 +2,7 @@ <div class="step-description"> <h2>Land Use</h2> <p>Current land use of parcel(s) under application and adjacent parcels.</p> - <p>*All fields are required unless stated optional.</p> + <p>*All fields are required unless stated optional or disabled.</p> </div> <form [formGroup]="landUseForm" class="land-use-form"> <h5>Land Use of Parcel(s) under Application</h5> diff --git a/portal-frontend/src/app/features/applications/edit-submission/other-attachments/other-attachments.component.html b/portal-frontend/src/app/features/applications/edit-submission/other-attachments/other-attachments.component.html index 8f3399724d..dbe84e3bf2 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/other-attachments/other-attachments.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/other-attachments/other-attachments.component.html @@ -8,7 +8,7 @@ <h2>Optional Attachments</h2> include confidential material within your application. </p> <section> - <div class="subheading2">Optional Attachments (Max. 100 MB per attachment)</div> + <div class="subheading2">Optional Attachments</div> <div class="uploader"> <app-file-drag-drop (uploadFiles)="attachDocument($event)" [showVirusError]="showVirusError"></app-file-drag-drop> </div> diff --git a/portal-frontend/src/app/features/applications/edit-submission/other-attachments/other-attachments.component.scss b/portal-frontend/src/app/features/applications/edit-submission/other-attachments/other-attachments.component.scss index abca50e46d..b72205d587 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/other-attachments/other-attachments.component.scss +++ b/portal-frontend/src/app/features/applications/edit-submission/other-attachments/other-attachments.component.scss @@ -2,11 +2,11 @@ @use '../../../../../styles/colors'; section { - margin-top: rem(32); + margin-top: rem(16); } .uploader { - margin-top: rem(12); + margin: rem(12) 0; } h4 { diff --git a/portal-frontend/src/app/features/applications/edit-submission/other-parcels/other-parcels.component.html b/portal-frontend/src/app/features/applications/edit-submission/other-parcels/other-parcels.component.html index f064478cb0..65f1c3c882 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/other-parcels/other-parcels.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/other-parcels/other-parcels.component.html @@ -2,7 +2,7 @@ <h2>Other Owned Parcels</h2> <div class="step-description"> <div> - <p>*All fields are required unless stated optional.</p> + <p>*All fields are required unless stated optional or disabled.</p> </div> </div> <form [formGroup]="otherParcelsForm" class="other-parcels-form"> diff --git a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-details.component.html b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-details.component.html index e98529424c..594d2b4b77 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-details.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-details.component.html @@ -2,7 +2,7 @@ <div class="step-description"> <h2>Identify Parcels Under Application</h2> <p>Provide parcel identification and registered ownership information for each parcel under application.</p> - <p>*All fields are required unless stated optional.</p> + <p>*All fields are required unless stated optional or disabled.</p> <div class="step-documents"> <h6>Documents needed for this step:</h6> <ul> diff --git a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html index d740e4e230..c8ef73126d 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html @@ -5,7 +5,7 @@ <h2>Primary Contact</h2> Identify staff from the local or first nation government listed below or a third-party agent to act as the primary contact. </p> - <p>*All fields are required unless stated optional.</p> + <p>*All fields are required unless stated optional or disabled.</p> <div class="step-documents"> <h6>Documents needed for this step:</h6> <ul> diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/cove-proposal/cove-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/cove-proposal/cove-proposal.component.html index 65f47ab6ba..717a8b8163 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/cove-proposal/cove-proposal.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/cove-proposal/cove-proposal.component.html @@ -4,7 +4,7 @@ <h2>Proposal</h2> Considerations are subject to <a> Section 6 of the ALC Act. </a> </p> - <p>*All fields are required unless stated optional.</p> + <p>*All fields are required unless stated optional or disabled.</p> </div> <app-warning-banner> Please consult the ' diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/excl-proposal/excl-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/excl-proposal/excl-proposal.component.html index 3f5b5d9ea5..9c2c6988cd 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/excl-proposal/excl-proposal.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/excl-proposal/excl-proposal.component.html @@ -4,7 +4,7 @@ <h2>Proposal</h2> Considerations are subject to <a> Section 6 of the ALC Act. </a> </p> - <p>*All fields are required unless stated optional.</p> + <p>*All fields are required unless stated optional or disabled.</p> </div> <app-warning-banner> Please consult the ' diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/incl-proposal/incl-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/incl-proposal/incl-proposal.component.html index de7fb74560..2a2b027a9e 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/incl-proposal/incl-proposal.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/incl-proposal/incl-proposal.component.html @@ -4,7 +4,7 @@ <h2>Proposal</h2> Considerations are subject to <a> Section 6 of the ALC Act. </a> </p> - <p>*All fields are required unless stated optional.</p> + <p>*All fields are required unless stated optional or disabled.</p> </div> <app-warning-banner> Please consult the ' diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.html index 0846732b8c..0225b186e0 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.html @@ -4,7 +4,7 @@ <h2>Proposal</h2> Considerations are subject to <a> Section 6 of the ALC Act. </a> </p> - <p>*All fields are required unless stated optional.</p> + <p>*All fields are required unless stated optional or disabled.</p> </div> <app-warning-banner> Please consult the ' diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/nfu-proposal/nfu-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/nfu-proposal/nfu-proposal.component.html index 89cc5a3fdd..f0dc10485f 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/nfu-proposal/nfu-proposal.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/nfu-proposal/nfu-proposal.component.html @@ -4,7 +4,7 @@ <h2>Proposal</h2> Considerations are subject to <a> Section 6 of the ALC Act. </a> </p> - <p>*All fields are required unless stated optional.</p> + <p>*All fields are required unless stated optional or disabled.</p> </div> <app-warning-banner> Please consult the ' diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.html index 2614bf90e7..228e5746e5 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.html @@ -4,7 +4,7 @@ <h2>Proposal</h2> Considerations are subject to <a> Section 6 of the ALC Act. </a> </p> - <p>All fields are required unless stated optional.</p> + <p>All fields are required unless stated optional or disabled.</p> </div> <app-warning-banner> In order to complete this step, please consult the following pages on the ALC website: @@ -121,10 +121,9 @@ <h2>Proposal</h2> </div> <div class="full-row"> <mat-label - >Of the proposed totals provided above, please input the dimensions of soil that has already been - removed.</mat-label + >Of the proposed totals provided above, please input the dimensions of soil that has already been removed or + fill already placed.</mat-label > - <div class="subtext">If no proposed soil has already been removed, please leave 0 in the fields below</div> <app-soil-table *ngIf="!isMobile" tableHeader="Soil already Removed" diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.html index d0cc372080..4c385c0155 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.html @@ -4,7 +4,7 @@ <h2>Proposal</h2> Considerations are subject to <a> Section 6 of the ALC Act. </a> </p> - <p>All fields are required unless stated optional.</p> + <p>All fields are required unless stated optional or disabled.</p> </div> <app-warning-banner> In order to complete this step, please consult the following pages on the ALC website: diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.html index f147af8fa3..4fd4e8d51d 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.html @@ -4,7 +4,7 @@ <h2>Proposal</h2> Considerations are subject to <a> Section 6 of the ALC Act. </a> </p> - <p>All fields are required unless stated optional.</p> + <p>All fields are required unless stated optional or disabled.</p> </div> <app-warning-banner> In order to complete this step, please consult the following pages on the ALC website: diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.html index f4bd8890db..22d5a3629e 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.html @@ -4,7 +4,7 @@ <h2>Proposal</h2> Considerations are subject to <a> Section 6 of the ALC Act. </a> </p> - <p>*All fields are required unless stated optional.</p> + <p>*All fields are required unless stated optional or disabled.</p> <div class="step-documents"> <h6>Documents needed for this step:</h6> <ul> diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/tur-proposal/tur-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/tur-proposal/tur-proposal.component.html index 33c734af74..9dcfa9d1ad 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/tur-proposal/tur-proposal.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/tur-proposal/tur-proposal.component.html @@ -4,7 +4,7 @@ <h2>Proposal</h2> Considerations are subject to <a> Section 6 of the ALC Act. </a> </p> - <p>*All fields are required unless stated optional.</p> + <p>*All fields are required unless stated optional or disabled.</p> <div class="step-documents"> <h6>Documents needed for this step:</h6> <ul> diff --git a/portal-frontend/src/app/features/applications/edit-submission/select-government/select-government.component.html b/portal-frontend/src/app/features/applications/edit-submission/select-government/select-government.component.html index 519a8a3032..1869412bb1 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/select-government/select-government.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/select-government/select-government.component.html @@ -1,7 +1,7 @@ <div class="step-description"> <h2>Government</h2> <p>Please indicate the local or First Nation government in which the parcel(s) are located.</p> - <p>*All fields are required unless stated optional.</p> + <p>*All fields are required unless stated optional or disabled.</p> </div> <form [formGroup]="form"> <div class="form-row"> diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component.html index 70b4f6ce4c..b85dedb61c 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component.html @@ -4,7 +4,7 @@ <h2>Additional Proposal Information</h2> Considerations are subject to <a>FIXME: Section 6 of the ALC Act. </a> </p> - <p>All fields are required unless stated optional.</p> + <p>All fields are required unless stated optional or disabled.</p> </div> <app-warning-banner> In order to complete this step, please consult the following pages on the ALC website: diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/land-use/land-use.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/land-use/land-use.component.html index cb1d9a7ab1..9f8dcfb945 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/land-use/land-use.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/land-use/land-use.component.html @@ -2,7 +2,7 @@ <div class="step-description"> <h2>Land Use</h2> <p>Current land use of parcel(s) under notice of intent and adjacent parcels.</p> - <p>*All fields are required unless stated optional.</p> + <p>*All fields are required unless stated optional or disabled.</p> </div> <form [formGroup]="landUseForm" class="land-use-form"> <h5>Land Use of Parcel(s) under Notice of Intent</h5> diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-details.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-details.component.html index d1d5696e26..0a38ecf9de 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-details.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-details.component.html @@ -2,7 +2,7 @@ <div class="step-description"> <h2>Identify Parcels Under Notice of Intent</h2> <p>Provide parcel identification and registered ownership information for each parcel.</p> - <p>*All fields are required unless stated optional.</p> + <p>*All fields are required unless stated optional or disabled.</p> <div class="step-documents"> <h6>Documents needed for this step:</h6> <ul> diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html index 9711ec9512..ea24db2343 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html @@ -5,7 +5,7 @@ <h2>Primary Contact</h2> Identify staff from the local or first nation government listed below or a third-party agent to act as the primary contact. </p> - <p>*All fields are required unless stated optional.</p> + <p>*All fields are required unless stated optional or disabled.</p> <div class="step-documents"> <h6>Documents needed for this step:</h6> <ul> diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pfrs/pfrs-proposal.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pfrs/pfrs-proposal.component.html index 15ffba8151..ef06eb3be1 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pfrs/pfrs-proposal.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pfrs/pfrs-proposal.component.html @@ -4,7 +4,7 @@ <h2>Proposal</h2> Considerations are subject to <a>FIXME: Section 6 of the ALC Act. </a> </p> - <p>All fields are required unless stated optional.</p> + <p>All fields are required unless stated optional or disabled.</p> </div> <app-warning-banner> In order to complete this step, please consult the following pages on the ALC website: diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pofo/pofo-proposal.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pofo/pofo-proposal.component.html index 219e2ec669..8c63c6cab2 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pofo/pofo-proposal.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pofo/pofo-proposal.component.html @@ -4,7 +4,7 @@ <h2>Proposal</h2> Considerations are subject to <a>FIXME: Section 6 of the ALC Act. </a> </p> - <p>All fields are required unless stated optional.</p> + <p>All fields are required unless stated optional or disabled.</p> </div> <app-warning-banner> In order to complete this step, please consult the following pages on the ALC website: diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.html index aff80ecc62..6a3ef42c4c 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.html @@ -4,7 +4,7 @@ <h2>Proposal</h2> Considerations are subject to <a>FIXME: Section 6 of the ALC Act. </a> </p> - <p>All fields are required unless stated optional.</p> + <p>All fields are required unless stated optional or disabled.</p> </div> <app-warning-banner> In order to complete this step, please consult the following pages on the ALC website: diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/select-government/select-government.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/select-government/select-government.component.html index 94fba280c3..c06c49dd51 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/select-government/select-government.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/select-government/select-government.component.html @@ -1,7 +1,7 @@ <div class="step-description"> <h2>Government</h2> <p>Please indicate the local or First Nation government in which the parcel(s) are located.</p> - <p>*All fields are required unless stated optional.</p> + <p>*All fields are required unless stated optional or disabled.</p> </div> <form [formGroup]="form"> <div class="form-row"> diff --git a/portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-details.component.html b/portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-details.component.html index fcf0f944a6..36a2c77bc7 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-details.component.html +++ b/portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-details.component.html @@ -2,7 +2,7 @@ <div class="step-description"> <h3>Identify Parcel(s) Under the Statutory Right of Way</h3> <p>Provide parcel identification information for each parcel under the SRW.</p> - <p>*All fields are required unless stated optional.</p> + <p>*All fields are required unless stated optional or disabled.</p> </div> <mat-expansion-panel *ngFor="let parcel of parcels; let parcelInd = index" @@ -13,7 +13,7 @@ <h3>Identify Parcel(s) Under the Statutory Right of Way</h3> > <mat-expansion-panel-header> <mat-panel-title> - <span class='subheading1'>Parcel #{{ parcelInd + 1 }} Details</span> + <span class="subheading1">Parcel #{{ parcelInd + 1 }} Details</span> </mat-panel-title> </mat-expansion-panel-header> diff --git a/portal-frontend/src/app/features/notifications/edit-submission/primary-contact/primary-contact.component.html b/portal-frontend/src/app/features/notifications/edit-submission/primary-contact/primary-contact.component.html index 91bf70a022..2b1e0abe40 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/primary-contact/primary-contact.component.html +++ b/portal-frontend/src/app/features/notifications/edit-submission/primary-contact/primary-contact.component.html @@ -3,7 +3,7 @@ <h2>Primary Contact</h2> <p> Enter the contact information for the person who is submitting the SRW package to the Land Title Survey Authority. </p> - <p>*All fields are required unless stated optional.</p> + <p>*All fields are required unless stated optional or disabled.</p> </div> <section> <div class="form"> diff --git a/portal-frontend/src/app/features/notifications/edit-submission/proposal/proposal.component.html b/portal-frontend/src/app/features/notifications/edit-submission/proposal/proposal.component.html index 72b7d61af2..803a2e7840 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/proposal/proposal.component.html +++ b/portal-frontend/src/app/features/notifications/edit-submission/proposal/proposal.component.html @@ -1,6 +1,6 @@ <div class="step-description"> <h2>Purpose of SRW</h2> - <p>* All fields are required unless stated optional.</p> + <p>* All fields are required unless stated optional or disabled.</p> </div> <app-warning-banner> The information entered below will be reflected in the automatically generated notification response and must match diff --git a/portal-frontend/src/app/features/notifications/edit-submission/select-government/select-government.component.html b/portal-frontend/src/app/features/notifications/edit-submission/select-government/select-government.component.html index 1df07ee559..b4c99f5560 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/select-government/select-government.component.html +++ b/portal-frontend/src/app/features/notifications/edit-submission/select-government/select-government.component.html @@ -1,7 +1,7 @@ <div class="step-description"> <h2>Government</h2> <p>Please indicate the local or First Nation government in which the parcel(s) are located.</p> - <p>*All fields are required unless stated optional.</p> + <p>*All fields are required unless stated optional or disabled.</p> </div> <form [formGroup]="form"> <div class="form-row"> diff --git a/portal-frontend/src/app/features/notifications/edit-submission/transferees/transferees.component.html b/portal-frontend/src/app/features/notifications/edit-submission/transferees/transferees.component.html index 7f3c754ec4..d2a9e56643 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/transferees/transferees.component.html +++ b/portal-frontend/src/app/features/notifications/edit-submission/transferees/transferees.component.html @@ -1,7 +1,7 @@ <div class="step-description"> <h2>Identify Transferee(s)</h2> <p>Provide the name and contact information for all transferees who will be registered owners of the SRW.</p> - <p>*All fields are required unless stated optional.</p> + <p>*All fields are required unless stated optional or disabled.</p> </div> <section> <div class="split"> diff --git a/portal-frontend/src/app/shared/file-drag-drop/file-drag-drop.component.html b/portal-frontend/src/app/shared/file-drag-drop/file-drag-drop.component.html index 13e51ac7ba..b1e5905ec3 100644 --- a/portal-frontend/src/app/shared/file-drag-drop/file-drag-drop.component.html +++ b/portal-frontend/src/app/shared/file-drag-drop/file-drag-drop.component.html @@ -58,3 +58,4 @@ <app-validation-error *ngIf="!disabled && showVirusError" errorClass="field-error"> A virus was detected in the file. Choose another file and try again. </app-validation-error> +<mat-hint class="subtext">Maximum file size: 100 MB</mat-hint> diff --git a/portal-frontend/src/app/shared/file-drag-drop/file-drag-drop.component.scss b/portal-frontend/src/app/shared/file-drag-drop/file-drag-drop.component.scss index 8c1aa994a1..ad793932de 100644 --- a/portal-frontend/src/app/shared/file-drag-drop/file-drag-drop.component.scss +++ b/portal-frontend/src/app/shared/file-drag-drop/file-drag-drop.component.scss @@ -8,6 +8,7 @@ .desktop-file-drag-drop { display: none; margin-top: rem(5); + margin-bottom: rem(5); width: 100%; border-radius: rem(4); @@ -27,6 +28,7 @@ .mobile-file-drag-drop { width: 100%; + margin-bottom: rem(2) !important; } a { From 9c8cd7703831f9dbee7f9e5361b0f123b7893a3d Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Wed, 20 Dec 2023 14:14:29 -0800 Subject: [PATCH 817/954] Use relative imports --- .../primary-contact/primary-contact.component.ts | 6 +++--- .../primary-contact/primary-contact.component.ts | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts index b56ae91faa..6a53fba0ec 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts @@ -17,9 +17,9 @@ import { FileHandle } from '../../../../shared/file-drag-drop/drag-drop.directiv import { EditApplicationSteps } from '../edit-submission.component'; import { FilesStepComponent } from '../files-step.partial'; import { PrimaryContactConfirmationDialogComponent } from './primary-contact-confirmation-dialog/primary-contact-confirmation-dialog.component'; -import { OwnerDialogComponent } from 'src/app/shared/owner-dialogs/owner-dialog/owner-dialog.component'; -import { CrownOwnerDialogComponent } from 'src/app/shared/owner-dialogs/crown-owner-dialog/crown-owner-dialog.component'; -import { scrollToElement } from 'src/app/shared/utils/scroll-helper'; +import { OwnerDialogComponent } from '../../../../shared/owner-dialogs/owner-dialog/owner-dialog.component'; +import { CrownOwnerDialogComponent } from '../../../../shared/owner-dialogs/crown-owner-dialog/crown-owner-dialog.component'; +import { scrollToElement } from '../../../../shared/utils/scroll-helper'; @Component({ selector: 'app-primary-contact', diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts index 34c021b85d..b8e75f12d0 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts @@ -17,10 +17,10 @@ import { OWNER_TYPE } from '../../../../shared/dto/owner.dto'; import { FileHandle } from '../../../../shared/file-drag-drop/drag-drop.directive'; import { EditNoiSteps } from '../edit-submission.component'; import { FilesStepComponent } from '../files-step.partial'; -import { OwnerDialogComponent } from 'src/app/shared/owner-dialogs/owner-dialog/owner-dialog.component'; +import { OwnerDialogComponent } from '../../../../shared/owner-dialogs/owner-dialog/owner-dialog.component'; import { PrimaryContactConfirmationDialogComponent } from './primary-contact-confirmation-dialog/primary-contact-confirmation-dialog.component'; -import { CrownOwnerDialogComponent } from 'src/app/shared/owner-dialogs/crown-owner-dialog/crown-owner-dialog.component'; -import { scrollToElement } from 'src/app/shared/utils/scroll-helper'; +import { CrownOwnerDialogComponent } from '../../../../shared/owner-dialogs/crown-owner-dialog/crown-owner-dialog.component'; +import { scrollToElement } from '../../../../shared/utils/scroll-helper'; @Component({ selector: 'app-primary-contact', From 81dc5537e9f25080f29717459eded29dad4e744d Mon Sep 17 00:00:00 2001 From: Liam Stoddard <lstodd@protonmail.com> Date: Wed, 20 Dec 2023 14:21:52 -0800 Subject: [PATCH 818/954] init application decisions --- .../applications/decisions/__init__.py | 4 + .../decisions/application_decisions_init.py | 202 ++++++++++++++++++ .../sql/application_decision_insert.sql | 34 +++ .../sql/application_decision_insert_count.sql | 12 ++ .../applications/migrate_application.py | 7 + .../application-decision.entity.ts | 9 + ...add_oats_decision_column_to_application.ts | 23 ++ 7 files changed, 291 insertions(+) create mode 100644 bin/migrate-oats-data/applications/decisions/__init__.py create mode 100644 bin/migrate-oats-data/applications/decisions/application_decisions_init.py create mode 100644 bin/migrate-oats-data/applications/decisions/sql/application_decision_insert.sql create mode 100644 bin/migrate-oats-data/applications/decisions/sql/application_decision_insert_count.sql create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1703018725688-add_oats_decision_column_to_application.ts diff --git a/bin/migrate-oats-data/applications/decisions/__init__.py b/bin/migrate-oats-data/applications/decisions/__init__.py new file mode 100644 index 0000000000..274ac8ea52 --- /dev/null +++ b/bin/migrate-oats-data/applications/decisions/__init__.py @@ -0,0 +1,4 @@ +from .application_decisions_init import ( + init_application_decisions, + clean_application_decisions, +) diff --git a/bin/migrate-oats-data/applications/decisions/application_decisions_init.py b/bin/migrate-oats-data/applications/decisions/application_decisions_init.py new file mode 100644 index 0000000000..2965eea7d0 --- /dev/null +++ b/bin/migrate-oats-data/applications/decisions/application_decisions_init.py @@ -0,0 +1,202 @@ +from common import ( + OATS_ETL_USER, + setup_and_get_logger, + add_timezone_and_keep_date_part, +) +from db import inject_conn_pool +from psycopg2.extras import RealDictCursor, execute_batch + +etl_name = "init_application_decision" +logger = setup_and_get_logger(etl_name) + + +@inject_conn_pool +def init_application_decisions(conn=None, batch_size=1000): + """ + This function is responsible for initializing the application_decisions in ALCS. + + Args: + conn (psycopg2.extensions.connection): PostgreSQL database connection. Provided by the decorator. + batch_size (int): The number of items to process at once. Defaults to BATCH_UPLOAD_SIZE. + """ + + logger.info(f"Start {etl_name}") + with conn.cursor(cursor_factory=RealDictCursor) as cursor: + with open( + "applications/decisions/sql/application_decision_insert_count.sql", + "r", + encoding="utf-8", + ) as sql_file: + count_query = sql_file.read() + cursor.execute(count_query) + count_total = dict(cursor.fetchone())["count"] + logger.info(f"Total Application Decisions data to insert: {count_total}") + + failed_inserts = 0 + successful_inserts_count = 0 + last_decision_id = 0 + + with open( + "applications/decisions/sql/application_decision_insert.sql", + "r", + encoding="utf-8", + ) as sql_file: + query = sql_file.read() + while True: + cursor.execute( + f"{query} WHERE decisions.alr_appl_decision_id > {last_decision_id} ORDER BY decisions.alr_appl_decision_id;" + ) + + rows = cursor.fetchmany(batch_size) + + if not rows: + break + try: + decisions_to_be_inserted_count = len(rows) + + _insert_application_decisions(conn, batch_size, cursor, rows) + + successful_inserts_count = ( + successful_inserts_count + decisions_to_be_inserted_count + ) + last_decision_id = dict(rows[-1])["alr_appl_decision_id"] + + logger.debug( + f"retrieved/inserted items count: {decisions_to_be_inserted_count}; total successfully inserted decisions so far {successful_inserts_count}; last inserted alr_appl_decision_id: {last_decision_id}" + ) + except Exception as err: + logger.exception(err) + conn.rollback() + failed_inserts = count_total - successful_inserts_count + last_decision_id = last_decision_id + 1 + + logger.info( + f"Finished {etl_name}: total amount of successful inserts {successful_inserts_count}, total failed inserts {failed_inserts}" + ) + + +def _insert_application_decisions(conn, batch_size, cursor, rows): + """ """ + query = _get_insert_query() + parsed_data_list = _prepare_oats_alr_applications_data(rows) + + if len(parsed_data_list) > 0: + execute_batch(cursor, query, parsed_data_list, page_size=batch_size) + + conn.commit() + + +def _get_insert_query(): + query = f""" + INSERT INTO alcs.application_decision ( + audit_created_by, + created_at, + date, + decision_description, + chair_review_required, + is_draft, + outcome_code, + rescinded_comment, + rescinded_date, + resolution_number, + resolution_year, + was_released, + application_uuid, + is_subject_to_conditions, + oats_alr_appl_decision_id + ) + VALUES ( + %(audit_created_by)s, + %(created_at)s, + %(date)s, + %(decision_description)s, + false, + false, + %(outcome_code)s, + %(rescinded_comment)s, + %(rescinded_date)s, + %(resolution_number)s, + %(resolution_year)s, + true, + %(application_uuid)s, + %(is_subject_to_conditions)s, + %(oats_alr_appl_decision_id)s + ) + ON CONFLICT ("resolution_number", "resolution_year") + WHERE "audit_deleted_date_at" is null and "resolution_number" is not NULL + DO UPDATE SET + date = COALESCE(EXCLUDED.date, alcs.application_decision.date), + outcome_code = COALESCE(EXCLUDED.outcome_code, alcs.application_decision.outcome_code), + decision_description = COALESCE(EXCLUDED.decision_description, alcs.application_decision.decision_description), + rescinded_comment = COALESCE(EXCLUDED.rescinded_comment, alcs.application_decision.rescinded_comment), + rescinded_date = COALESCE(EXCLUDED.rescinded_date, alcs.application_decision.rescinded_date), + is_subject_to_conditions = COALESCE(EXCLUDED.is_subject_to_conditions, alcs.application_decision.is_subject_to_conditions), + oats_alr_appl_decision_id = EXCLUDED.oats_alr_appl_decision_id; + """ + return query + + +def _prepare_oats_alr_applications_data(row_data_list): + data_list = [] + for row in row_data_list: + resolution_number, year = _map_resolution_number_and_year(row) + mapped_row = { + "audit_created_by": OATS_ETL_USER, + "created_at": add_timezone_and_keep_date_part(row.get("when_created")), + "date": add_timezone_and_keep_date_part(row.get("decision_date")), + "decision_description": row.get("decision_desc"), + "decision_maker": "CEO", + "is_draft": False, + "outcome_code": _map_outcome_code(row), + "rescinded_comment": row.get("rescinded_comments"), + "rescinded_date": add_timezone_and_keep_date_part( + row.get("rescinded_date") + ), + "resolution_number": resolution_number, + "resolution_year": year, + "was_released": True, + "application_uuid": row.get("app_uuid"), + "is_subject_to_conditions": _map_is_subject_to_conditions(row), + "oats_alr_appl_decision_id": row.get("alr_appl_decision_id"), + } + data_list.append(mapped_row) + + return data_list + + +def _map_outcome_code(row): + if row.get("rescinded_date", None): + return "RESC" + elif row.get("outright_refusal_ind", None) == "N": + return "APPR" + elif row.get("outright_refusal_ind", None) == "Y": + return "REFU" + return None + + +def _map_resolution_number_and_year(row): + year_and_number = str(row["resolution_number"]) + # some data appears to only have a year, if this is the case the number will be set to 0 + year_and_number_length = len(year_and_number) + if year_and_number_length == 4: + resolution_number = 0 + else: + resolution_number = int(year_and_number[:-4]) + year = int(year_and_number[-4:]) + return resolution_number, year + + +def _map_is_subject_to_conditions(row): + return row.get("is_subject_to_conditions", "False") == True + + +@inject_conn_pool +def clean_application_decisions(conn=None): + logger.info("Start application_decisions cleaning") + with conn.cursor() as cursor: + cursor.execute( + f"DELETE FROM alcs.application_decision WHERE audit_created_by = '{OATS_ETL_USER}' AND audit_updated_by is NULL" + ) + logger.info(f"Deleted items count = {cursor.rowcount}") + + conn.commit() diff --git a/bin/migrate-oats-data/applications/decisions/sql/application_decision_insert.sql b/bin/migrate-oats-data/applications/decisions/sql/application_decision_insert.sql new file mode 100644 index 0000000000..a33b8ae4fb --- /dev/null +++ b/bin/migrate-oats-data/applications/decisions/sql/application_decision_insert.sql @@ -0,0 +1,34 @@ +WITH oats_decision_ids_with_app_id AS ( + SELECT oaad.alr_appl_decision_id, + CASE + WHEN oaad.alr_application_id IS NOT NULL THEN oaad.alr_application_id + ELSE orr.alr_application_id + END AS application_id + FROM oats.oats_alr_appl_decisions oaad + LEFT JOIN oats.oats_reconsideration_requests orr ON orr.reconsideration_request_id = oaad.reconsideration_request_id +), +oats_conditions AS ( + SELECT oaac.alr_appl_decision_id + FROM oats.oats_conditions oc + JOIN oats.oats_alr_appl_components oaac ON oc.alr_appl_component_id = oaac.alr_appl_component_id + AND oaac.alr_appl_decision_id IS NOT null + GROUP BY oaac.alr_appl_decision_id +) +SELECT decisions.alr_appl_decision_id, + decisions.application_id, + app."uuid" AS app_uuid, + oaad2.when_created, + oaad2.decision_date, + oaad2.decision_desc, + oaad2.outright_refusal_ind, + oaad2.rescinded_comments, + oaad2.rescinded_date, + oaad2.resolution_number, + CASE + WHEN oats_conditions.alr_appl_decision_id IS NOT NULL THEN TRUE + ELSE FALSE + END AS is_subject_to_conditions +FROM oats_decision_ids_with_app_id AS decisions + JOIN alcs.application app ON app.file_number = decisions.application_id::TEXT + JOIN oats.oats_alr_appl_decisions oaad2 ON oaad2.alr_appl_decision_id = decisions.alr_appl_decision_id + LEFT JOIN oats_conditions ON oats_conditions.alr_appl_decision_id = oaad2.alr_appl_decision_id \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/decisions/sql/application_decision_insert_count.sql b/bin/migrate-oats-data/applications/decisions/sql/application_decision_insert_count.sql new file mode 100644 index 0000000000..885a7583b0 --- /dev/null +++ b/bin/migrate-oats-data/applications/decisions/sql/application_decision_insert_count.sql @@ -0,0 +1,12 @@ +WITH oats_decision_ids_with_app_id AS ( + SELECT oaad.alr_appl_decision_id, + CASE + WHEN oaad.alr_application_id IS NOT NULL THEN oaad.alr_application_id + ELSE orr.alr_application_id + END AS application_id + FROM oats.oats_alr_appl_decisions oaad + LEFT JOIN oats.oats_reconsideration_requests orr ON orr.reconsideration_request_id = oaad.reconsideration_request_id +) +SELECT count(*) +FROM oats_decision_ids_with_app_id AS decisions + JOIN alcs.application app ON app.file_number = decisions.application_id::TEXT; \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/migrate_application.py b/bin/migrate-oats-data/applications/migrate_application.py index 2f02f28e8e..3718acbbf6 100644 --- a/bin/migrate-oats-data/applications/migrate_application.py +++ b/bin/migrate-oats-data/applications/migrate_application.py @@ -20,6 +20,7 @@ process_app_staff_journal, clean_application_staff_journal, ) +from .decisions import clean_application_decisions, init_application_decisions def process_application_etl(batch_size): @@ -30,6 +31,7 @@ def process_application_etl(batch_size): process_application_parcels(batch_size) process_application_owners(batch_size) process_app_staff_journal(batch_size) + process_application_decisions(batch_size) process_application_submission_status_emails() @@ -37,6 +39,7 @@ def clean_alcs_applications(): clean_application_submission_status_emails() clean_application_staff_journal() clean_application_parcels() + clean_application_decisions() clean_app_submissions() clean_applications() @@ -45,6 +48,10 @@ def init_applications(batch_size): process_applications(batch_size) +def process_application_decisions(batch_size): + init_application_decisions(batch_size) + + def clean_application_parcels(): clean_primary_contacts() clean_parcel_owners() diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision.entity.ts b/services/apps/alcs/src/alcs/application-decision/application-decision.entity.ts index cf3b4ec259..de28aac917 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision.entity.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision.entity.ts @@ -216,4 +216,13 @@ export class ApplicationDecision extends Base { { cascade: ['insert', 'update'] }, ) conditions: ApplicationDecisionCondition[]; + + @Column({ + select: false, + nullable: true, + type: 'int8', + comment: + 'This column is NOT related to any functionality in ALCS. It is only used for ETL and backtracking of imported data from OATS. It links oats.oats_alr_appl_decisions to alcs.application_decisions.', + }) + oatsAlrApplDecisionId: number; } diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1703018725688-add_oats_decision_column_to_application.ts b/services/apps/alcs/src/providers/typeorm/migrations/1703018725688-add_oats_decision_column_to_application.ts new file mode 100644 index 0000000000..4167634b7b --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1703018725688-add_oats_decision_column_to_application.ts @@ -0,0 +1,23 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class AddOatsDecisionColumnToApplication1703018725688 + implements MigrationInterface +{ + public async up(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `ALTER TABLE "alcs"."application_decision" ADD "oats_alr_appl_decision_id" bigint`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."application_decision"."oats_alr_appl_decision_id" IS 'This column is NOT related to any functionality in ALCS. It is only used for ETL and backtracking of imported data from OATS. It links oats.oats_alr_appl_decisions to alcs.application_decisions.'`, + ); + } + + public async down(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."application_decision"."oats_alr_appl_decision_id" IS 'This column is NOT related to any functionality in ALCS. It is only used for ETL and backtracking of imported data from OATS. It links oats.oats_alr_appl_decisions to alcs.application_decisions.'`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_decision" DROP COLUMN "oats_alr_appl_decision_id"`, + ); + } +} From 5b6b25a681862081297a15b25bcdfd8a9917d03b Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Wed, 20 Dec 2023 14:39:40 -0800 Subject: [PATCH 819/954] noi UI update pfrs table and proposal drawer --- .../pfrs/pfrs-proposal.component.html | 24 ++++++++++++++++--- .../pfrs/pfrs-proposal.component.scss | 23 ++++++++++++++++++ .../pofo/pofo-proposal.component.html | 19 +++++++++++++++ .../pofo/pofo-proposal.component.scss | 23 ++++++++++++++++++ .../roso/roso-proposal.component.html | 19 +++++++++++++++ .../roso/roso-proposal.component.scss | 23 ++++++++++++++++++ 6 files changed, 128 insertions(+), 3 deletions(-) diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pfrs/pfrs-proposal.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pfrs/pfrs-proposal.component.html index ef06eb3be1..6dc87377e1 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pfrs/pfrs-proposal.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pfrs/pfrs-proposal.component.html @@ -5,6 +5,25 @@ <h2>Proposal</h2> <a>FIXME: Section 6 of the ALC Act. </a> </p> <p>All fields are required unless stated optional or disabled.</p> + <mat-expansion-panel #panel [expanded]="true"> + <mat-expansion-panel-header class="porposal-toggle"> + <mat-panel-title><strong>READ FIRST: Purposes of the commission </strong>(Section 6 of the ALC Act)</mat-panel-title> + </mat-expansion-panel-header> + <div class="proposal-toggle-content"> + <div class="section-header">6 (1) The following are the purposes of the commission:</div> + <ul class="list-item"> + <li>to preserve the agricultural land reserve;</li> + <li>to encourage farming of land within the agricultural land reserve in collaboration with other communities of interest;</li> + <li>to encourage local governments, first nations, the government and its agents to enable and accommodate farm use of land within the agricultural land reserve and uses compatible with agriculture in their plans, bylaws and policies.</li> + </ul> + + <div class="section-header">6 (2) The commission, to fulfill its purposes under subsection (1), must give priority to protecting and enhancing all of the following in exercising its powers and performing its duties under this Act:</div> + <ul class="list-item"> + <li>the size, integrity and continuity of the land base of the agricultural land reserve;</li> + <li>the use of the agricultural land reserve for farm use.</li> + </ul> + </div> + </mat-expansion-panel> </div> <app-warning-banner> In order to complete this step, please consult the following pages on the ALC website: @@ -178,10 +197,9 @@ <h2>Proposal</h2> </div> <div class="full-row"> <mat-label - >Of the proposed totals provided above, please input the dimensions of soil that has already been - removed.</mat-label + >Of the proposed totals provided above, please input the dimensions of soil that has already been removed or + fill already placed.</mat-label > - <div class="subtext">If no proposed soil has already been removed, please leave 0 in the fields below</div> <app-soil-table *ngIf="!isMobile" tableHeader="Soil already Removed" diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pfrs/pfrs-proposal.component.scss b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pfrs/pfrs-proposal.component.scss index 56caa68a82..f5e22627b7 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pfrs/pfrs-proposal.component.scss +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pfrs/pfrs-proposal.component.scss @@ -3,3 +3,26 @@ section { margin-top: rem(36); } + +.proposal-toggle-content { + margin-bottom: 20px; + padding: 15px; +} + +.section-header { + margin-bottom: 10px; +} + +.list-item { + counter-reset: listCounter; +} + +.list-item li { + list-style-type: none; + margin-bottom: 5px; +} + +.list-item li:before { + content: "(" counter(listCounter, lower-alpha) ") "; + counter-increment: listCounter; +} diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pofo/pofo-proposal.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pofo/pofo-proposal.component.html index 8c63c6cab2..fe1b06eeba 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pofo/pofo-proposal.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pofo/pofo-proposal.component.html @@ -5,6 +5,25 @@ <h2>Proposal</h2> <a>FIXME: Section 6 of the ALC Act. </a> </p> <p>All fields are required unless stated optional or disabled.</p> + <mat-expansion-panel #panel [expanded]="true"> + <mat-expansion-panel-header class="porposal-toggle"> + <mat-panel-title><strong>READ FIRST: Purposes of the commission </strong>(Section 6 of the ALC Act)</mat-panel-title> + </mat-expansion-panel-header> + <div class="proposal-toggle-content"> + <div class="section-header">6 (1) The following are the purposes of the commission:</div> + <ul class="list-item"> + <li>to preserve the agricultural land reserve;</li> + <li>to encourage farming of land within the agricultural land reserve in collaboration with other communities of interest;</li> + <li>to encourage local governments, first nations, the government and its agents to enable and accommodate farm use of land within the agricultural land reserve and uses compatible with agriculture in their plans, bylaws and policies.</li> + </ul> + + <div class="section-header">6 (2) The commission, to fulfill its purposes under subsection (1), must give priority to protecting and enhancing all of the following in exercising its powers and performing its duties under this Act:</div> + <ul class="list-item"> + <li>the size, integrity and continuity of the land base of the agricultural land reserve;</li> + <li>the use of the agricultural land reserve for farm use.</li> + </ul> + </div> + </mat-expansion-panel> </div> <app-warning-banner> In order to complete this step, please consult the following pages on the ALC website: diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pofo/pofo-proposal.component.scss b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pofo/pofo-proposal.component.scss index 56caa68a82..93b1171cb2 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pofo/pofo-proposal.component.scss +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pofo/pofo-proposal.component.scss @@ -3,3 +3,26 @@ section { margin-top: rem(36); } + +.proposal-toggle-content { + margin-bottom: 20px; + padding: 15px; +} + +.section-header { + margin-bottom: 10px; +} + +.list-item { + counter-reset: listCounter; +} + +.list-item li { + list-style-type: none; + margin-bottom: 5px; +} + +.list-item li:before { + content: "(" counter(listCounter, lower-alpha) ") "; + counter-increment: listCounter; +} \ No newline at end of file diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.html index 6a3ef42c4c..8e8628118d 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.html @@ -5,6 +5,25 @@ <h2>Proposal</h2> <a>FIXME: Section 6 of the ALC Act. </a> </p> <p>All fields are required unless stated optional or disabled.</p> + <mat-expansion-panel #panel [expanded]="true"> + <mat-expansion-panel-header class="porposal-toggle"> + <mat-panel-title><strong>READ FIRST: Purposes of the commission </strong>(Section 6 of the ALC Act)</mat-panel-title> + </mat-expansion-panel-header> + <div class="proposal-toggle-content"> + <div class="section-header">6 (1) The following are the purposes of the commission:</div> + <ul class="list-item"> + <li>to preserve the agricultural land reserve;</li> + <li>to encourage farming of land within the agricultural land reserve in collaboration with other communities of interest;</li> + <li>to encourage local governments, first nations, the government and its agents to enable and accommodate farm use of land within the agricultural land reserve and uses compatible with agriculture in their plans, bylaws and policies.</li> + </ul> + + <div class="section-header">6 (2) The commission, to fulfill its purposes under subsection (1), must give priority to protecting and enhancing all of the following in exercising its powers and performing its duties under this Act:</div> + <ul class="list-item"> + <li>the size, integrity and continuity of the land base of the agricultural land reserve;</li> + <li>the use of the agricultural land reserve for farm use.</li> + </ul> + </div> + </mat-expansion-panel> </div> <app-warning-banner> In order to complete this step, please consult the following pages on the ALC website: diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.scss b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.scss index 56caa68a82..f5e22627b7 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.scss +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.scss @@ -3,3 +3,26 @@ section { margin-top: rem(36); } + +.proposal-toggle-content { + margin-bottom: 20px; + padding: 15px; +} + +.section-header { + margin-bottom: 10px; +} + +.list-item { + counter-reset: listCounter; +} + +.list-item li { + list-style-type: none; + margin-bottom: 5px; +} + +.list-item li:before { + content: "(" counter(listCounter, lower-alpha) ") "; + counter-increment: listCounter; +} From 77c1fc581cd6dd089421d9780f436da606bc7981 Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Wed, 20 Dec 2023 15:17:19 -0800 Subject: [PATCH 820/954] confirmation modal changes --- .../submit-confirmation-dialog.component.html | 14 +++++++++----- .../submit-confirmation-dialog.component.scss | 19 +++++++++++++++++++ 2 files changed, 28 insertions(+), 5 deletions(-) diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.html index 814f281721..8a8b779b6f 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.html @@ -3,7 +3,7 @@ <h4>Submit Notice of Intent</h4> </div> <div mat-dialog-content class="content"> - <p>Your notice of intent will be submitted to the ALC.</p> + <p>Your Notice of Intent will be submitted to the ALC.</p> <div> <div class="subheading2">Terms and Conditions:</div> <mat-checkbox #checkbox1 color="primary" class="checkbox"> @@ -12,17 +12,21 @@ <h4>Submit Notice of Intent</h4> Regulation, and the Agricultural Land Reserve Use Regulation. </mat-checkbox> <mat-checkbox #checkbox2 color="primary" class="checkbox"> - I/we declare that the information provided in the notice of intent and all the supporting documents are, to the + I/we declare that the information provided in the Notice of Intent and all the supporting documents are, to the best of my/our knowledge, true and correct. </mat-checkbox> <mat-checkbox #checkbox3 color="primary" class="checkbox"> I/we understand that the Agricultural Land Commission will take the steps necessary to confirm the accuracy of the - information and documents provided. This information will be available for review by any member of the public. + information and documents provided. This information, excluding phone numbers and emails, will be available for review + by any member of the public once received by the ALC. </mat-checkbox> </div> <p> - If you have any questions about the collection or use of this information, please contact the Agricultural Land - Commission. + If you have any questions about the collection or use of this information, please + <a + href="https://www.alc.gov.bc.ca/contact/" + target="_blank" + >contact the Agricultural Land Commission.</a> </p> <div> <div class="step-controls"> diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.scss b/portal-frontend/src/app/features/notice-of-intents/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.scss index fa173368db..3b1a8d3fb8 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.scss +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.scss @@ -17,3 +17,22 @@ p { margin-right: rem(16) !important; } } + +.step-controls { + display: flex; + flex-direction: column-reverse; + + button { + width: 100%; + margin-top: rem(12) !important; + } + + @media screen and (min-width: $tabletBreakpoint) { + flex-direction: row; + justify-content: space-between; + + button { + width: unset; + } + } +} From 4a3d97fc3bd7d0d35a26c136eb2f1b870a29def7 Mon Sep 17 00:00:00 2001 From: Liam Stoddard <lstodd@protonmail.com> Date: Wed, 20 Dec 2023 16:01:19 -0800 Subject: [PATCH 821/954] MR feedback --- .../decisions/application_decisions_init.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/bin/migrate-oats-data/applications/decisions/application_decisions_init.py b/bin/migrate-oats-data/applications/decisions/application_decisions_init.py index 2965eea7d0..0f37e128b9 100644 --- a/bin/migrate-oats-data/applications/decisions/application_decisions_init.py +++ b/bin/migrate-oats-data/applications/decisions/application_decisions_init.py @@ -2,6 +2,7 @@ OATS_ETL_USER, setup_and_get_logger, add_timezone_and_keep_date_part, + AlcsDecisionOutcomeCodeEnum, ) from db import inject_conn_pool from psycopg2.extras import RealDictCursor, execute_batch @@ -166,19 +167,18 @@ def _prepare_oats_alr_applications_data(row_data_list): def _map_outcome_code(row): if row.get("rescinded_date", None): - return "RESC" + return AlcsDecisionOutcomeCodeEnum.RESCINDED.value elif row.get("outright_refusal_ind", None) == "N": - return "APPR" + return AlcsDecisionOutcomeCodeEnum.APPROVED.value elif row.get("outright_refusal_ind", None) == "Y": - return "REFU" + return AlcsDecisionOutcomeCodeEnum.REFUSED.value return None def _map_resolution_number_and_year(row): year_and_number = str(row["resolution_number"]) # some data appears to only have a year, if this is the case the number will be set to 0 - year_and_number_length = len(year_and_number) - if year_and_number_length == 4: + if len(year_and_number) == 4: resolution_number = 0 else: resolution_number = int(year_and_number[:-4]) From 775d2e677b7d897b5148659c2dece68ad4c75c0a Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Thu, 21 Dec 2023 08:47:34 -0800 Subject: [PATCH 822/954] Clean up code - Rename contact type toggle to better reflect value - Clean up contact type switching logic - Ensure strict comparisons where appropriate - Rename and reverse meaning of args to contact type switching functions - Add missing 'or disabled' --- .../primary-contact.component.html | 6 ++--- .../primary-contact.component.ts | 24 ++++++++----------- .../primary-contact.component.html | 6 ++--- .../primary-contact.component.ts | 24 ++++++++----------- 4 files changed, 26 insertions(+), 34 deletions(-) diff --git a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html index 33fab9ebd5..c216e3c860 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html @@ -4,7 +4,7 @@ <h2>Primary Contact</h2> The primary contact becomes the single point of contact and must ensure that landowners are notified of all information exchanged between the primary contact, local or First Nation government, and the ALC. </p> - <p>*All fields are required unless stated optional.</p> + <p>*All fields are required unless stated optional or disabled.</p> </div> <section> @@ -24,8 +24,8 @@ <h4>Primary Contact Information</h4> </p> <mat-button-toggle-group class="input" - [formControl]="primaryContactType" - (change)="onSelectPrimaryContactType(!primaryContactType.value)" + [formControl]="isExistingOwner" + (change)="onSelectPrimaryContactType(isExistingOwner.value)" > <mat-button-toggle [value]="true">Yes</mat-button-toggle> <mat-button-toggle [value]="false">No</mat-button-toggle> diff --git a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts index 6a53fba0ec..2dcb09cd21 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts @@ -44,7 +44,7 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni showVirusError = false; hasCrownParcels = false; - primaryContactType = new FormControl<boolean | null>(null, [Validators.required]); + isExistingOwner = new FormControl<boolean | null>(null, [Validators.required]); firstName = new FormControl<string | null>('', [Validators.required]); lastName = new FormControl<string | null>('', [Validators.required]); @@ -245,7 +245,7 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni this.selectedLocalGovernment = selectedOwner.type.code === OWNER_TYPE.GOVERNMENT; } - this.primaryContactType.setValue(!this.selectedThirdPartyAgent); + this.isExistingOwner.setValue(!this.selectedThirdPartyAgent); if (this.selectedLocalGovernment) { this.organizationName.setValidators([Validators.required]); @@ -288,7 +288,7 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni this.parcelOwners = []; } - async onSelectPrimaryContactType(selectedThirdPartyAgent: boolean | null) { + async onSelectPrimaryContactType(isExistingOwner: boolean | null) { if (this.form.dirty || (this.selectedOwnerUuid !== 'agent' && this.selectedOwnerUuid !== 'government')) { await this.dialog .open(PrimaryContactConfirmationDialogComponent, { @@ -298,29 +298,25 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni .beforeClosed() .subscribe(async (confirmed) => { if (confirmed) { - this.switchPrimaryContactType(selectedThirdPartyAgent); + this.switchPrimaryContactType(isExistingOwner); } else { - this.primaryContactType.setValue(selectedThirdPartyAgent); + this.isExistingOwner.setValue(!isExistingOwner); } }); } else { - this.switchPrimaryContactType(selectedThirdPartyAgent); + this.switchPrimaryContactType(isExistingOwner); } } - switchPrimaryContactType(selectedThirdPartyAgent: boolean | null) { - if (selectedThirdPartyAgent) { + switchPrimaryContactType(isExistingOwner: boolean | null) { + if (!isExistingOwner) { this.onSelectAgent(); + } else if (this.parcelOwners.length == 1) { + this.onSelectOwner(this.parcelOwners[0].uuid); } else if (this.isGovernmentUser) { this.onSelectGovernment(); - if (this.parcelOwners.length == 1) { - this.onSelectOwner(this.parcelOwners[0].uuid); - } } else { this.selectedThirdPartyAgent = false; - if (this.parcelOwners.length == 1) { - this.onSelectOwner(this.parcelOwners[0].uuid); - } } } diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html index a8508bb469..1becffb832 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html @@ -4,7 +4,7 @@ <h2>Primary Contact</h2> The primary contact becomes the single point of contact and must ensure that landowners are notified of all information exchanged between the primary contact, local or First Nation government, and the ALC. </p> - <p>*All fields are required unless stated optional.</p> + <p>*All fields are required unless stated optional or disabled.</p> </div> <section> @@ -25,8 +25,8 @@ <h4>Primary Contact Information</h4> <mat-button-toggle-group class="input" - [formControl]="primaryContactType" - (change)="onSelectPrimaryContactType(!primaryContactType.value)" + [formControl]="isExistingOwner" + (change)="onSelectPrimaryContactType(isExistingOwner.value)" > <mat-button-toggle [value]="true">Yes</mat-button-toggle> <mat-button-toggle [value]="false">No</mat-button-toggle> diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts index b8e75f12d0..505b29da4a 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts @@ -45,7 +45,7 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni isDirty = false; hasCrownParcels = false; - primaryContactType = new FormControl<boolean | null>(null, [Validators.required]); + isExistingOwner = new FormControl<boolean | null>(null, [Validators.required]); firstName = new FormControl<string | null>('', [Validators.required]); lastName = new FormControl<string | null>('', [Validators.required]); @@ -247,7 +247,7 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni this.selectedLocalGovernment = selectedOwner.type.code === OWNER_TYPE.GOVERNMENT; } - this.primaryContactType.setValue(!this.selectedThirdPartyAgent); + this.isExistingOwner.setValue(!this.selectedThirdPartyAgent); if (this.selectedLocalGovernment) { this.organizationName.setValidators([Validators.required]); @@ -290,7 +290,7 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni this.parcelOwners = []; } - async onSelectPrimaryContactType(selectedThirdPartyAgent: boolean | null) { + async onSelectPrimaryContactType(isExistingOwner: boolean | null) { if (this.form.dirty || (this.selectedOwnerUuid !== 'agent' && this.selectedOwnerUuid !== 'government')) { await this.dialog .open(PrimaryContactConfirmationDialogComponent, { @@ -300,29 +300,25 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni .beforeClosed() .subscribe(async (confirmed) => { if (confirmed) { - this.switchPrimaryContactType(selectedThirdPartyAgent); + this.switchPrimaryContactType(isExistingOwner); } else { - this.primaryContactType.setValue(selectedThirdPartyAgent); + this.isExistingOwner.setValue(!isExistingOwner); } }); } else { - this.switchPrimaryContactType(selectedThirdPartyAgent); + this.switchPrimaryContactType(isExistingOwner); } } - switchPrimaryContactType(selectedThirdPartyAgent: boolean | null) { - if (selectedThirdPartyAgent) { + private switchPrimaryContactType(isExistingOwner: boolean | null) { + if (!isExistingOwner) { this.onSelectAgent(); + } else if (this.parcelOwners.length == 1) { + this.onSelectOwner(this.parcelOwners[0].uuid); } else if (this.isGovernmentUser) { this.onSelectGovernment(); - if (this.parcelOwners.length == 1) { - this.onSelectOwner(this.parcelOwners[0].uuid); - } } else { this.selectedThirdPartyAgent = false; - if (this.parcelOwners.length == 1) { - this.onSelectOwner(this.parcelOwners[0].uuid); - } } } From 247899c7fce67ef11144058df5d04d440d2f30b6 Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Thu, 21 Dec 2023 10:44:10 -0800 Subject: [PATCH 823/954] Only set contact type toggle if owner selected --- .../primary-contact/primary-contact.component.ts | 4 ++-- .../primary-contact/primary-contact.component.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts index 2dcb09cd21..fc7e3c0726 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts @@ -243,9 +243,9 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni if (selectedOwner) { this.selectedThirdPartyAgent = selectedOwner.type.code === OWNER_TYPE.AGENT; this.selectedLocalGovernment = selectedOwner.type.code === OWNER_TYPE.GOVERNMENT; - } - this.isExistingOwner.setValue(!this.selectedThirdPartyAgent); + this.isExistingOwner.setValue(!this.selectedThirdPartyAgent); + } if (this.selectedLocalGovernment) { this.organizationName.setValidators([Validators.required]); diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts index 505b29da4a..bbc1ba84bc 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts @@ -245,9 +245,9 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni if (selectedOwner) { this.selectedThirdPartyAgent = selectedOwner.type.code === OWNER_TYPE.AGENT; this.selectedLocalGovernment = selectedOwner.type.code === OWNER_TYPE.GOVERNMENT; - } - this.isExistingOwner.setValue(!this.selectedThirdPartyAgent); + this.isExistingOwner.setValue(!this.selectedThirdPartyAgent); + } if (this.selectedLocalGovernment) { this.organizationName.setValidators([Validators.required]); From 75a1fd22f9584bc046ee7ed0ed4fdb5b4081a4fe Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Thu, 21 Dec 2023 10:44:53 -0800 Subject: [PATCH 824/954] Use strict inqualities --- .../primary-contact/primary-contact.component.ts | 2 +- .../primary-contact/primary-contact.component.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts index fc7e3c0726..f90a1ec873 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts @@ -311,7 +311,7 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni switchPrimaryContactType(isExistingOwner: boolean | null) { if (!isExistingOwner) { this.onSelectAgent(); - } else if (this.parcelOwners.length == 1) { + } else if (this.parcelOwners.length === 1) { this.onSelectOwner(this.parcelOwners[0].uuid); } else if (this.isGovernmentUser) { this.onSelectGovernment(); diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts index bbc1ba84bc..f9c3056fa7 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts @@ -313,7 +313,7 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni private switchPrimaryContactType(isExistingOwner: boolean | null) { if (!isExistingOwner) { this.onSelectAgent(); - } else if (this.parcelOwners.length == 1) { + } else if (this.parcelOwners.length === 1) { this.onSelectOwner(this.parcelOwners[0].uuid); } else if (this.isGovernmentUser) { this.onSelectGovernment(); From c36e1a2b3399d14762217813ac83073ef06b9a1b Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Thu, 21 Dec 2023 11:15:27 -0800 Subject: [PATCH 825/954] Fix contact switch logic --- .../primary-contact/primary-contact.component.ts | 4 ++-- .../primary-contact/primary-contact.component.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts index f90a1ec873..4a24fd668a 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts @@ -311,10 +311,10 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni switchPrimaryContactType(isExistingOwner: boolean | null) { if (!isExistingOwner) { this.onSelectAgent(); - } else if (this.parcelOwners.length === 1) { - this.onSelectOwner(this.parcelOwners[0].uuid); } else if (this.isGovernmentUser) { this.onSelectGovernment(); + } else if (this.parcelOwners.length === 1) { + this.onSelectOwner(this.parcelOwners[0].uuid); } else { this.selectedThirdPartyAgent = false; } diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts index f9c3056fa7..50915c10ef 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts @@ -313,10 +313,10 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni private switchPrimaryContactType(isExistingOwner: boolean | null) { if (!isExistingOwner) { this.onSelectAgent(); - } else if (this.parcelOwners.length === 1) { - this.onSelectOwner(this.parcelOwners[0].uuid); } else if (this.isGovernmentUser) { this.onSelectGovernment(); + } else if (this.parcelOwners.length === 1) { + this.onSelectOwner(this.parcelOwners[0].uuid); } else { this.selectedThirdPartyAgent = false; } From b8747fe0db72c987f8adab17d762f5bd4b53d5d3 Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Thu, 21 Dec 2023 11:52:37 -0800 Subject: [PATCH 826/954] Fix radio label was checking wrong owner list --- .../primary-contact/primary-contact.component.html | 2 +- .../primary-contact/primary-contact.component.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html index c216e3c860..0d44d44418 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html @@ -34,7 +34,7 @@ <h4>Primary Contact Information</h4> <!-- Owner --> <div *ngIf="selectedThirdPartyAgent === false && parcelOwners.length > 0"> - <label *ngIf="owners.length" + <label *ngIf="parcelOwners.length" >Select a Primary Contact from the listed land owners <ng-container *ngIf="hasCrownParcels">and government contacts</ng-container></label > diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html index 1becffb832..16a5b10f1a 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html @@ -35,7 +35,7 @@ <h4>Primary Contact Information</h4> <!-- Owner --> <div *ngIf="selectedThirdPartyAgent === false && parcelOwners.length > 0"> - <label *ngIf="owners.length" + <label *ngIf="parcelOwners.length" >Select a Primary Contact from the listed land owners <ng-container *ngIf="hasCrownParcels">and government contacts</ng-container></label > From efd2b2aeef1cf70381f5c97bb2fffc1f0609d028 Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Thu, 21 Dec 2023 13:29:11 -0800 Subject: [PATCH 827/954] sticky buttons, review and submit step changes, --- .../alcs-edit-submission.component.scss | 8 ++++++-- .../edit-submission/edit-submission.component.scss | 8 ++++++-- .../additional-information.component.html | 2 +- .../notice-of-intent-details/parcel/parcel.component.html | 2 +- .../additional-information.component.html | 2 +- 5 files changed, 15 insertions(+), 7 deletions(-) diff --git a/portal-frontend/src/app/features/notice-of-intents/alcs-edit-submission/alcs-edit-submission.component.scss b/portal-frontend/src/app/features/notice-of-intents/alcs-edit-submission/alcs-edit-submission.component.scss index 680d1f6272..14215ecc8b 100644 --- a/portal-frontend/src/app/features/notice-of-intents/alcs-edit-submission/alcs-edit-submission.component.scss +++ b/portal-frontend/src/app/features/notice-of-intents/alcs-edit-submission/alcs-edit-submission.component.scss @@ -75,7 +75,7 @@ display: grid; grid-template-columns: 1fr; grid-row-gap: rem(24); - margin-bottom: rem(32); + margin-bottom: rem(16); } .mat-icon.mat-icon-inline { @@ -194,11 +194,15 @@ } .button-container { + position: sticky; + bottom: 0; margin-top: rem(40); - margin-bottom: rem(24); + background-color: colors.$white; display: flex; + padding: rem(16) 0; flex-direction: column-reverse; justify-content: space-between; + z-index: 2; @media screen and (min-width: $tabletBreakpoint) { flex-direction: row; diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.scss b/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.scss index ce7f3f5be7..96333416e3 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.scss +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.scss @@ -78,7 +78,7 @@ display: grid; grid-template-columns: 1fr; grid-row-gap: rem(24); - margin-bottom: rem(32); + margin-bottom: rem(16); } .step-documents { @@ -208,11 +208,15 @@ } .button-container { + position: sticky; + bottom: 0; margin-top: rem(40); - margin-bottom: rem(24); + background-color: colors.$white; display: flex; + padding: rem(16) 0; flex-direction: column-reverse; justify-content: space-between; + z-index: 2; @media screen and (min-width: $tabletBreakpoint) { flex-direction: row; diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/additional-information/additional-information.component.html b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/additional-information/additional-information.component.html index 7ad018c322..ef34c2f133 100644 --- a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/additional-information/additional-information.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/additional-information/additional-information.component.html @@ -27,7 +27,7 @@ <app-no-data [showRequired]="showErrors" *ngIf="!structure.type"></app-no-data> </div> <div class="grid-3"> - {{ structure.area }} + {{ structure.area }} <span *ngIf="structure.area">m<sup>2</sup></span> <app-no-data [showRequired]="showErrors" *ngIf="!structure.area"></app-no-data> </div> </ng-container> diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/parcel/parcel.component.html b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/parcel/parcel.component.html index 28bbdfb721..6daaa8ffa1 100644 --- a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/parcel/parcel.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/parcel/parcel.component.html @@ -5,7 +5,7 @@ <h3 class="flex-item">1. Identify Parcel(s) Under Application</h3> <h4>Parcel #{{ parcelInd + 1 }}</h4> <div> <button - *ngIf="showEdit" + *ngIf="showEdit && parcels.length > 1" class="mobile-hidden" mat-flat-button color="accent" diff --git a/portal-frontend/src/app/features/public/notice-of-intent/submission/additional-information/additional-information.component.html b/portal-frontend/src/app/features/public/notice-of-intent/submission/additional-information/additional-information.component.html index dcc15e93fa..6a8258029b 100644 --- a/portal-frontend/src/app/features/public/notice-of-intent/submission/additional-information/additional-information.component.html +++ b/portal-frontend/src/app/features/public/notice-of-intent/submission/additional-information/additional-information.component.html @@ -24,7 +24,7 @@ <app-no-data *ngIf="!structure.type"></app-no-data> </div> <div class="grid-3"> - {{ structure.area }} + {{ structure.area }} <span *ngIf="structure.area">m<sup>2</sup></span> <app-no-data *ngIf="!structure.area"></app-no-data> </div> </ng-container> From 8137859a169bcc3b328c5c06d8dc96a7f7be47fe Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Thu, 21 Dec 2023 13:51:39 -0800 Subject: [PATCH 828/954] Scroll to owner info on owner select (parcel step) This was missed from ALCS-1270. --- .../parcel-entry/parcel-entry.component.html | 11 +++-- .../parcel-entry/parcel-entry.component.ts | 7 ++- .../parcel-entry/parcel-entry.component.html | 48 ++++++++++--------- .../parcel-entry/parcel-entry.component.ts | 5 ++ 4 files changed, 43 insertions(+), 28 deletions(-) diff --git a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html index dfe1c1ed2d..cd66e697db 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html @@ -306,8 +306,9 @@ <h6 class="owner-search-option" *ngIf="filteredOwners.length">OR</h6> <div> <mat-radio-group color="primary" - [value]="selectedOwner?.uuid" required - [ngClass]="{ 'error': ownerInput.errors && ownerInput.errors['required'] }" + [value]="selectedOwner?.uuid" + required + [ngClass]="{ error: ownerInput.errors && ownerInput.errors['required'] }" formControlName="selectedOwnerVal" > <mat-radio-button @@ -321,7 +322,7 @@ <h6 class="owner-search-option" *ngIf="filteredOwners.length">OR</h6> </mat-radio-button> </mat-radio-group> - <div class="warning-banner" *ngIf="selectedOwner"> + <div id="owner-info" class="warning-banner" *ngIf="selectedOwner"> <div class="owner-details"> <div class="row"> <div class="key"><strong>First Name:</strong></div> @@ -331,8 +332,8 @@ <h6 class="owner-search-option" *ngIf="filteredOwners.length">OR</h6> <div class="key"><strong>Last Name:</strong></div> <div class="value">{{ selectedOwner.lastName }}</div> </div> - <div class="row"> - <div class="key"><strong>Ministry or Department:</strong> </div> + <div class="row"> + <div class="key"><strong>Ministry or Department:</strong></div> <div class="value">{{ selectedOwner.organizationName }}</div> </div> <div class="row"> diff --git a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts index 46fbfebcc5..3a976910bd 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts @@ -21,6 +21,7 @@ import { OwnerDialogComponent } from '../../../../../shared/owner-dialogs/owner- import { formatBooleanToString } from '../../../../../shared/utils/boolean-helper'; import { RemoveFileConfirmationDialogComponent } from '../../../alcs-edit-submission/remove-file-confirmation-dialog/remove-file-confirmation-dialog.component'; import { ParcelEntryConfirmationDialogComponent } from './parcel-entry-confirmation-dialog/parcel-entry-confirmation-dialog.component'; +import { scrollToElement } from '../../../../../shared/utils/scroll-helper'; export interface ParcelEntryFormData { uuid: string; @@ -99,7 +100,7 @@ export class ParcelEntryComponent implements OnInit { purchaseDate: this.purchaseDate, crownLandOwnerType: this.crownLandOwnerType, isConfirmedByApplicant: this.isConfirmedByApplicant, - searchBy: this.searchBy + searchBy: this.searchBy, }); pidPinPlaceholder = ''; selectedOwner?: ApplicationOwnerDto = undefined; @@ -354,6 +355,10 @@ export class ParcelEntryComponent implements OnInit { this.selectedOwner = owner; const selectedOwners = [owner]; this.updateParcelOwners(selectedOwners); + + setTimeout(() => { + scrollToElement({ id: 'owner-info', center: false }); + }); } onEditCrownOwner(owner: ApplicationOwnerDto) { diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.html index 02adef5ae1..c746649042 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.html @@ -2,7 +2,8 @@ <div class="type"> <mat-label for="parcelType">Select parcel type:</mat-label> <div class="warning"> - Fee simple includes privately-owned parcels and parcels within First Nation treaty lands. Crown land includes crown leases. + Fee simple includes privately-owned parcels and parcels within First Nation treaty lands. Crown land includes + crown leases. </div> <mat-button-toggle-group class="input" @@ -152,7 +153,13 @@ <mat-label for="isFarm">Farm Classification</mat-label> <div class="subtext"> As determined by - <a class="subtext" href="https://info.bcassessment.ca/Services-products/property-classes-and-exemptions/farm-land-assessment/about-farm-land-assessment" target="_blank" rel="noreferrer">BC Assessment</a> + <a + class="subtext" + href="https://info.bcassessment.ca/Services-products/property-classes-and-exemptions/farm-land-assessment/about-farm-land-assessment" + target="_blank" + rel="noreferrer" + >BC Assessment</a + > </div> <mat-button-toggle-group class="input" id="isFarm" formControlName="isFarm"> <mat-button-toggle @@ -258,14 +265,8 @@ <h6 class="owner-search-option">OR</h6> [formControl]="ownerInput" /> <mat-autocomplete #auto="matAutocomplete"> - <mat-option - (click)="onSelectOwner($event, option, option.isSelected)" - *ngFor="let option of filteredOwners" - > - <mat-checkbox - [checked]="option.isSelected" - color="primary" - > + <mat-option (click)="onSelectOwner($event, option, option.isSelected)" *ngFor="let option of filteredOwners"> + <mat-checkbox [checked]="option.isSelected" color="primary"> <div class="owner-option"> <div>{{ option.displayName }}</div> </div> @@ -302,8 +303,9 @@ <h6 class="owner-search-option" *ngIf="filteredOwners.length">OR</h6> <div> <mat-radio-group color="primary" - [value]="selectedOwner?.uuid" required - [ngClass]="{ 'error': ownerInput.errors && ownerInput.errors['required'] }" + [value]="selectedOwner?.uuid" + required + [ngClass]="{ error: ownerInput.errors && ownerInput.errors['required'] }" formControlName="selectedOwnerVal" > <mat-radio-button @@ -313,38 +315,40 @@ <h6 class="owner-search-option" *ngIf="filteredOwners.length">OR</h6> (click)="onCrownOwnerSelected($event, owner, owner.isSelected)" required > - {{ owner.firstName + ' ' + owner.lastName }} + {{ owner.firstName + ' ' + owner.lastName }} </mat-radio-button> </mat-radio-group> - <div class="warning-banner" *ngIf="selectedOwner"> + <div id="owner-info" class="warning-banner" *ngIf="selectedOwner"> <div class="owner-details"> <div class="row"> - <div class="key"><strong>First Name:</strong> </div> + <div class="key"><strong>First Name:</strong></div> <div class="value">{{ selectedOwner.firstName }}</div> </div> <div class="row"> - <div class="key"><strong>Last Name:</strong> </div> + <div class="key"><strong>Last Name:</strong></div> <div class="value">{{ selectedOwner.lastName }}</div> </div> - <div class="row"> - <div class="key"><strong>Ministry or Department:</strong> </div> + <div class="row"> + <div class="key"><strong>Ministry or Department:</strong></div> <div class="value">{{ selectedOwner.organizationName }}</div> </div> <div class="row"> - <div class="key"><strong>Phone Number:</strong> </div> + <div class="key"><strong>Phone Number:</strong></div> <div class="value">{{ selectedOwner.phoneNumber }}</div> </div> <div class="row"> - <div class="key"><strong>Email:</strong> </div> + <div class="key"><strong>Email:</strong></div> <div class="value">{{ selectedOwner.email }}</div> </div> <div class="row"> - <div class="key"><strong>Crown Type:</strong> </div> + <div class="key"><strong>Crown Type:</strong></div> <div class="value">{{ selectedOwner.crownLandOwnerType }}</div> </div> <div class="row"> - <button [disabled]="_disabled" (click)="onEditCrownOwner(selectedOwner)" mat-flat-button>Edit information</button> + <button [disabled]="_disabled" (click)="onEditCrownOwner(selectedOwner)" mat-flat-button> + Edit information + </button> </div> </div> </div> diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.ts index da14cb4dec..b09180a2a2 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.ts @@ -19,6 +19,7 @@ import { OwnerDialogComponent } from '../../../../../shared/owner-dialogs/owner- import { formatBooleanToString } from '../../../../../shared/utils/boolean-helper'; import { RemoveFileConfirmationDialogComponent } from '../../../../applications/alcs-edit-submission/remove-file-confirmation-dialog/remove-file-confirmation-dialog.component'; import { ParcelEntryConfirmationDialogComponent } from './parcel-entry-confirmation-dialog/parcel-entry-confirmation-dialog.component'; +import { scrollToElement } from '../../../../../shared/utils/scroll-helper'; export interface ParcelEntryFormData { uuid: string; @@ -339,6 +340,10 @@ export class ParcelEntryComponent implements OnInit { this.selectedOwner = owner; const selectedOwners = [owner]; this.updateParcelOwners(selectedOwners); + + setTimeout(() => { + scrollToElement({ id: 'owner-info', center: false }); + }); } onEditCrownOwner(owner: NoticeOfIntentOwnerDto) { From 799c480d8b3e21eeb739ef76e0aed3e972639417 Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Thu, 21 Dec 2023 16:02:15 -0800 Subject: [PATCH 829/954] project duration changes --- .../pfrs-details/pfrs-details.component.html | 28 +--- .../pofo-details/pofo-details.component.html | 16 +- .../roso-details/roso-details.component.html | 11 +- ...otice-of-intent-submission.service.spec.ts | 6 +- .../notice-of-intent/notice-of-intent.dto.ts | 15 +- .../pfrs/pfrs-proposal.component.html | 149 +++++------------- .../proposal/pfrs/pfrs-proposal.component.ts | 28 +--- .../pofo/pofo-proposal.component.html | 72 +++------ .../proposal/pofo/pofo-proposal.component.ts | 14 +- .../roso/roso-proposal.component.html | 73 +++------ .../proposal/roso/roso-proposal.component.ts | 14 +- .../pfrs-details/pfrs-details.component.html | 29 ++-- .../pofo-details/pofo-details.component.html | 17 +- .../roso-details/roso-details.component.html | 17 +- .../pfrs-details/pfrs-details.component.html | 30 +--- .../pofo-details/pofo-details.component.html | 18 +-- .../roso-details/roso-details.component.html | 16 +- .../notice-of-intent-submission.dto.ts | 12 +- .../public/public-notice-of-intent.dto.ts | 6 +- ...-of-intent-submission-validator.service.ts | 3 +- .../notice-of-intent-submission.dto.ts | 22 +-- .../notice-of-intent-submission.entity.ts | 24 +-- .../notice-of-intent-submission.service.ts | 20 +-- .../public-notice-of-intent.dto.ts | 10 +- ...03199373532-update-noi-project-duration.ts | 23 +++ 25 files changed, 210 insertions(+), 463 deletions(-) create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1703199373532-update-noi-project-duration.ts diff --git a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/pfrs-details/pfrs-details.component.html b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/pfrs-details/pfrs-details.component.html index b8aa3510cd..c66db1e684 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/pfrs-details/pfrs-details.component.html +++ b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/pfrs-details/pfrs-details.component.html @@ -16,37 +16,21 @@ <div class="subheading2 grid-1">Placement of Fill Project Duration</div> <div class="grid-double"> - <div *ngIf="_noiSubmission.fillProjectDurationAmount && _noiSubmission.fillProjectDurationUnit"> - {{ _noiSubmission.fillProjectDurationAmount }} - <ng-container [ngPlural]="_noiSubmission.fillProjectDurationAmount"> - <ng-template ngPluralCase="=1"> - {{ _noiSubmission.fillProjectDurationUnit.slice(0, -1) | titlecase }} - </ng-template> - <ng-template ngPluralCase="other"> - {{ _noiSubmission.fillProjectDurationUnit | titlecase }} - </ng-template> - </ng-container> + <div *ngIf="_noiSubmission.fillProjectDuration"> + {{ _noiSubmission.fillProjectDuration }} </div> <app-no-data - *ngIf="!_noiSubmission.fillProjectDurationAmount || !_noiSubmission.fillProjectDurationUnit" + *ngIf="!_noiSubmission.fillProjectDuration" ></app-no-data> </div> <div class="subheading2 grid-1">Removal of Soil Project Duration</div> <div class="grid-double"> - <div *ngIf="_noiSubmission.soilProjectDurationAmount && _noiSubmission.soilProjectDurationUnit"> - {{ _noiSubmission.soilProjectDurationAmount }} - <ng-container [ngPlural]="_noiSubmission.soilProjectDurationAmount"> - <ng-template ngPluralCase="=1"> - {{ _noiSubmission.soilProjectDurationUnit.slice(0, -1) | titlecase }} - </ng-template> - <ng-template ngPluralCase="other"> - {{ _noiSubmission.soilProjectDurationUnit | titlecase }} - </ng-template> - </ng-container> + <div *ngIf="_noiSubmission.soilProjectDuration"> + {{ _noiSubmission.soilProjectDuration }} </div> <app-no-data - *ngIf="!_noiSubmission.soilProjectDurationAmount || !_noiSubmission.soilProjectDurationUnit" + *ngIf="!_noiSubmission.soilProjectDuration" ></app-no-data> </div> diff --git a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/pofo-details/pofo-details.component.html b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/pofo-details/pofo-details.component.html index e0402fd64c..5423020bab 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/pofo-details/pofo-details.component.html +++ b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/pofo-details/pofo-details.component.html @@ -14,21 +14,13 @@ <span>{{ _noiSubmission.purpose }}</span> </div> - <div class="subheading2 grid-1">Project Duration</div> + <div class="subheading2 grid-1">Placement of Fill Project Duration</div> <div class="grid-double"> - <div *ngIf="_noiSubmission.soilProjectDurationAmount && _noiSubmission.soilProjectDurationUnit"> - {{ _noiSubmission.soilProjectDurationAmount }} - <ng-container [ngPlural]="_noiSubmission.soilProjectDurationAmount"> - <ng-template ngPluralCase="=1"> - {{ _noiSubmission.soilProjectDurationUnit.slice(0, -1) | titlecase }} - </ng-template> - <ng-template ngPluralCase="other"> - {{ _noiSubmission.soilProjectDurationUnit | titlecase }} - </ng-template> - </ng-container> + <div *ngIf="_noiSubmission.soilProjectDuration"> + {{ _noiSubmission.soilProjectDuration }} </div> <app-no-data - *ngIf="!_noiSubmission.soilProjectDurationAmount || !_noiSubmission.soilProjectDurationUnit" + *ngIf="!_noiSubmission.soilProjectDuration" ></app-no-data> </div> diff --git a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/roso-details/roso-details.component.html b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/roso-details/roso-details.component.html index 0d047a5312..743d07b68d 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/roso-details/roso-details.component.html +++ b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/roso-details/roso-details.component.html @@ -78,16 +78,9 @@ </div> </div> - <div class="full-width"> - <h4>Project Duration</h4> - </div> - <div class="subheading2 grid-1">Duration</div> - <div class="grid-double"> - {{ _noiSubmission.soilProjectDurationUnit }} - </div> - <div class="subheading2 grid-1">Length</div> + <div class="subheading2 grid-1">Removal of Soil Project Duration</div> <div class="grid-double"> - {{ _noiSubmission.soilProjectDurationAmount }} + {{ _noiSubmission.soilProjectDuration }} </div> <div class="subheading2 grid-1">Proposal Map / Site Plan</div> diff --git a/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts b/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts index 109701f0d9..e7b55b063d 100644 --- a/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts +++ b/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts @@ -67,12 +67,10 @@ describe('NoticeOfIntentSubmissionService', () => { soilAlreadyPlacedArea: null, soilAlreadyPlacedMaximumDepth: null, soilAlreadyPlacedAverageDepth: null, - soilProjectDurationAmount: null, - soilProjectDurationUnit: null, + soilProjectDuration: null, soilIsRemovingSoilForNewStructure: null, soilProposedStructures: [], - fillProjectDurationAmount: null, - fillProjectDurationUnit: null, + fillProjectDuration: null, }; beforeEach(() => { diff --git a/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent.dto.ts b/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent.dto.ts index 42086498b2..703739e394 100644 --- a/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent.dto.ts +++ b/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent.dto.ts @@ -152,10 +152,8 @@ export interface NoticeOfIntentSubmissionDto { soilAlreadyPlacedArea: number | null; soilAlreadyPlacedMaximumDepth: number | null; soilAlreadyPlacedAverageDepth: number | null; - soilProjectDurationAmount: number | null; - soilProjectDurationUnit: string | null; - fillProjectDurationAmount: number | null; - fillProjectDurationUnit: string | null; + soilProjectDuration: string | null; + fillProjectDuration: string | null; soilFillTypeToPlace?: string | null; soilIsExtractionOrMining?: boolean; soilHasSubmittedNotice?: boolean; @@ -205,10 +203,8 @@ export interface NoticeOfIntentSubmissionDetailedDto extends NoticeOfIntentSubmi soilAlreadyPlacedArea: number | null; soilAlreadyPlacedMaximumDepth: number | null; soilAlreadyPlacedAverageDepth: number | null; - soilProjectDurationAmount: number | null; - soilProjectDurationUnit: string | null; - fillProjectDurationAmount: number | null; - fillProjectDurationUnit: string | null; + soilProjectDuration: string | null; + fillProjectDuration: string | null; soilFillTypeToPlace?: string | null; soilIsExtractionOrMining?: boolean; soilHasSubmittedNotice?: boolean; @@ -258,8 +254,7 @@ export interface NoticeOfIntentSubmissionUpdateDto { soilAlreadyPlacedArea?: number | null; soilAlreadyPlacedMaximumDepth?: number | null; soilAlreadyPlacedAverageDepth?: number | null; - soilProjectDurationAmount?: number | null; - soilProjectDurationUnit?: string | null; + soilProjectDuration?: string | null; soilFillTypeToPlace?: string | null; soilIsExtractionOrMining?: boolean | null; soilHasSubmittedNotice?: boolean | null; diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pfrs/pfrs-proposal.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pfrs/pfrs-proposal.component.html index 6dc87377e1..dce7fc54d5 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pfrs/pfrs-proposal.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pfrs/pfrs-proposal.component.html @@ -165,6 +165,49 @@ <h2>Proposal</h2> <div class="subtext">Characters left: {{ 4000 - fillTypeToPlaceText.textLength }}</div> </div> + <div class="form-row full-row"> + <div> + <label for="projectDuration">Placement of Fill Project Duration</label> + <div class="subtext">Length of time you anticipate it would take to complete the project</div> + <mat-form-field appearance="outline"> + <input + id="fillProjectDuration" + matInput + [formControl]="fillProjectDuration" + placeholder="Type project duration" + /> + </mat-form-field> + <div + *ngIf="fillProjectDuration.invalid && (fillProjectDuration.dirty || fillProjectDuration.touched)" + class="field-error" + > + <mat-icon>warning</mat-icon> + <div *ngIf="fillProjectDuration.errors?.['required']">This field is required</div> + </div> + <mat-hint class="subtext">Example: 30 years; or 3 months; or 5 days</mat-hint> + </div> + <div> + <label for="soilProjectDuration">Removal of Soil Project Duration</label> + <div class="subtext">Length of time you anticipate it would take to complete the project</div> + <mat-form-field appearance="outline"> + <input + id="soilProjectDuration" + matInput + [formControl]="soilProjectDuration" + placeholder="Type project duration" + /> + </mat-form-field> + <div + *ngIf="soilProjectDuration.invalid && (soilProjectDuration.dirty || soilProjectDuration.touched)" + class="field-error" + > + <mat-icon>warning</mat-icon> + <div *ngIf="soilProjectDuration.errors?.['required']">This field is required</div> + </div> + <mat-hint class="subtext">Example: 30 years; or 3 months; or 5 days</mat-hint> + </div> + </div> + <div class="full-row"> <mat-label>Proposal Dimensions</mat-label> <div class="subtext"> @@ -223,112 +266,6 @@ <h2>Proposal</h2> ></app-soil-table> </div> - <div class="full-row"> - <h4>Placement of Fill Project Duration</h4> - <div class="subtext">Estimated duration of the project</div> - <div class="form-row"> - <div> - <label for="fillProjectDurationUnit">Duration</label> - <div class="subtext">Days, Months, or Years</div> - <mat-form-field appearance="outline"> - <mat-select placeholder="Select one" id="fillProjectDurationUnit" formControlName="fillProjectDurationUnit"> - <mat-option value="days">Days</mat-option> - <mat-option value="months">Months</mat-option> - <mat-option value="years">Years</mat-option> - </mat-select> - </mat-form-field> - <div - *ngIf=" - fillProjectDurationUnit.invalid && (fillProjectDurationUnit.dirty || fillProjectDurationUnit.touched) - " - class="field-error" - > - <mat-icon>warning</mat-icon> - <div *ngIf="fillProjectDurationUnit.errors?.['required']">This field is required</div> - </div> - </div> - <div> - <label for="fillProjectDurationUnit">Length</label> - <div class="subtext">Decimals can be used - e.g. 3.5 months or 1.5 years</div> - <mat-form-field appearance="outline"> - <input - id="fillProjectDurationAmount" - mask="separator.2" - thousandSeparator="," - separatorLimit="9999999999" - min="0.01" - matInput - formControlName="fillProjectDurationAmount" - placeholder="Type length" - /> - </mat-form-field> - <div - *ngIf=" - fillProjectDurationAmount.invalid && - (fillProjectDurationAmount.dirty || fillProjectDurationAmount.touched) - " - class="field-error" - > - <mat-icon>warning</mat-icon> - <div *ngIf="fillProjectDurationAmount.errors?.['required']">This field is required</div> - </div> - </div> - </div> - </div> - - <div class="full-row"> - <h4>Removal of Soil Project Duration</h4> - <div class="subtext">Estimated duration of the project</div> - <div class="form-row"> - <div> - <mat-label for="soilProjectDurationUnit">Duration</mat-label> - <div class="subtext">Days, Months, or Years</div> - <mat-form-field appearance="outline"> - <mat-select placeholder="Select one" id="soilProjectDurationUnit" formControlName="soilProjectDurationUnit"> - <mat-option value="days">Days</mat-option> - <mat-option value="months">Months</mat-option> - <mat-option value="years">Years</mat-option> - </mat-select> - </mat-form-field> - <div - *ngIf=" - soilProjectDurationUnit.invalid && (soilProjectDurationUnit.dirty || soilProjectDurationUnit.touched) - " - class="field-error" - > - <mat-icon>warning</mat-icon> - <div *ngIf="soilProjectDurationUnit.errors?.['required']">This field is required</div> - </div> - </div> - <div> - <label for="soilProjectDurationUnit">Length</label> - <div class="subtext">Decimals can be used - e.g. 3.5 months or 1.5 years</div> - <mat-form-field appearance="outline"> - <input - id="soilProjectDurationAmount" - mask="separator.2" - thousandSeparator="," - separatorLimit="9999999999" - min="0.01" - matInput - formControlName="soilProjectDurationAmount" - placeholder="Type length" - /> - </mat-form-field> - <div - *ngIf=" - soilProjectDurationAmount.invalid && - (soilProjectDurationAmount.dirty || soilProjectDurationAmount.touched) - " - class="field-error" - > - <mat-icon>warning</mat-icon> - <div *ngIf="soilProjectDurationAmount.errors?.['required']">This field is required</div> - </div> - </div> - </div> - </div> - <div class="full-row"> <mat-label class="subheading2" for="proposal-map">Proposal Map / Site Plan</mat-label> <div class="subtext">A visual representation of your proposal.</div> diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pfrs/pfrs-proposal.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pfrs/pfrs-proposal.component.ts index 6c6c1d9bb7..dc2ab961cd 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pfrs/pfrs-proposal.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pfrs/pfrs-proposal.component.ts @@ -49,10 +49,8 @@ export class PfrsProposalComponent extends FilesStepComponent implements OnInit, purpose = new FormControl<string | null>(null, [Validators.required]); soilTypeRemoved = new FormControl<string | null>(null, [Validators.required]); fillTypeToPlace = new FormControl<string | null>(null, [Validators.required]); - soilProjectDurationAmount = new FormControl<string | null>(null, [Validators.required]); - soilProjectDurationUnit = new FormControl<string | null>(null, [Validators.required]); - fillProjectDurationAmount = new FormControl<string | null>(null, [Validators.required]); - fillProjectDurationUnit = new FormControl<string | null>(null, [Validators.required]); + soilProjectDuration = new FormControl<string | null>(null, [Validators.required]); + fillProjectDuration = new FormControl<string | null>(null, [Validators.required]); areComponentsDirty = false; isAreaWideFilling = new FormControl<string | null>(null, [Validators.required]); isExtractionOrMining = new FormControl<string | null>(null, [Validators.required]); @@ -64,10 +62,8 @@ export class PfrsProposalComponent extends FilesStepComponent implements OnInit, purpose: this.purpose, soilTypeRemoved: this.soilTypeRemoved, fillTypeToPlace: this.fillTypeToPlace, - soilProjectDurationAmount: this.soilProjectDurationAmount, - soilProjectDurationUnit: this.soilProjectDurationUnit, - fillProjectDurationAmount: this.fillProjectDurationAmount, - fillProjectDurationUnit: this.fillProjectDurationUnit, + soilProjectDuration: this.soilProjectDuration, + fillProjectDuration: this.fillProjectDuration, isAreaWideFilling: this.isAreaWideFilling, isExtractionOrMining: this.isExtractionOrMining, hasSubmittedNotice: this.hasSubmittedNotice, @@ -145,10 +141,8 @@ export class PfrsProposalComponent extends FilesStepComponent implements OnInit, purpose: noiSubmission.purpose, soilTypeRemoved: noiSubmission.soilTypeRemoved, fillTypeToPlace: noiSubmission.soilFillTypeToPlace, - soilProjectDurationAmount: noiSubmission.soilProjectDurationAmount?.toString() ?? null, - soilProjectDurationUnit: noiSubmission.soilProjectDurationUnit, - fillProjectDurationAmount: noiSubmission.fillProjectDurationAmount?.toString() ?? null, - fillProjectDurationUnit: noiSubmission.fillProjectDurationUnit, + soilProjectDuration: noiSubmission.soilProjectDuration?.toString() ?? null, + fillProjectDuration: noiSubmission.fillProjectDuration?.toString() ?? null, isAreaWideFilling: formatBooleanToString(noiSubmission.soilIsAreaWideFilling), isExtractionOrMining: formatBooleanToString(noiSubmission.soilIsExtractionOrMining), hasSubmittedNotice: formatBooleanToString(noiSubmission.soilHasSubmittedNotice), @@ -224,14 +218,8 @@ export class PfrsProposalComponent extends FilesStepComponent implements OnInit, soilAlreadyRemovedArea: this.alreadyRemovedTableData?.area ?? null, soilAlreadyRemovedMaximumDepth: this.alreadyRemovedTableData?.maximumDepth ?? null, soilAlreadyRemovedAverageDepth: this.alreadyRemovedTableData?.averageDepth ?? null, - soilProjectDurationAmount: this.soilProjectDurationAmount.value - ? parseFloat(this.soilProjectDurationAmount.value) - : null, - soilProjectDurationUnit: this.soilProjectDurationUnit.value, - fillProjectDurationAmount: this.fillProjectDurationAmount.value - ? parseFloat(this.fillProjectDurationAmount.value) - : null, - fillProjectDurationUnit: this.fillProjectDurationUnit.value, + soilProjectDuration: this.soilProjectDuration.value ?? null, + fillProjectDuration: this.fillProjectDuration.value ?? null, soilIsAreaWideFilling: parseStringToBoolean(isAreaWideFilling), soilIsExtractionOrMining: parseStringToBoolean(isExtractionOrMining), soilHasSubmittedNotice: parseStringToBoolean(hasSubmittedNotice), diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pofo/pofo-proposal.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pofo/pofo-proposal.component.html index fe1b06eeba..c6c37ef605 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pofo/pofo-proposal.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pofo/pofo-proposal.component.html @@ -145,6 +145,30 @@ <h2>Proposal</h2> <mat-hint class="subtext">Example: Aggregate, Extraction, Placer Mining, Peat Extraction, Soil etc.</mat-hint> <div class="subtext">Characters left: {{ 4000 - soilTypeRemovedText.textLength }}</div> </div> + + <div class="form-row"> + <div class="full-row"> + <label for="projectDuration">Placement of Fill Project Duration</label> + <div class="subtext">Length of time you anticipate it would take to complete the project</div> + <mat-form-field appearance="outline"> + <input + id="projectDuration" + matInput + [formControl]="projectDuration" + placeholder="Type project duration" + /> + </mat-form-field> + <div + *ngIf="projectDuration.invalid && (projectDuration.dirty || projectDuration.touched)" + class="field-error" + > + <mat-icon>warning</mat-icon> + <div *ngIf="projectDuration.errors?.['required']">This field is required</div> + </div> + <mat-hint class="subtext">Example: 30 years; or 3 months; or 5 days</mat-hint> + </div> + </div> + <div class="full-row"> <mat-label>Proposal Dimensions</mat-label> <div class="subtext"> @@ -170,54 +194,6 @@ <h2>Proposal</h2> ></app-soil-table> </div> - <section> - <h4>Project Duration</h4> - <div class="subtext">Estimated duration of the project</div> - <div class="form-row"> - <div> - <mat-label for="projectDurationUnit">Duration</mat-label> - <div class="subtext">Days, Months, or Years</div> - <mat-form-field appearance="outline"> - <mat-select placeholder="Select one" id="projectDurationUnit" [formControl]="projectDurationUnit"> - <mat-option value="days">Days</mat-option> - <mat-option value="months">Months</mat-option> - <mat-option value="years">Years</mat-option> - </mat-select> - </mat-form-field> - <div - *ngIf="projectDurationUnit.invalid && (projectDurationUnit.dirty || projectDurationUnit.touched)" - class="field-error" - > - <mat-icon>warning</mat-icon> - <div *ngIf="projectDurationUnit.errors?.['required']">This field is required</div> - </div> - </div> - <div> - <label for="projectDurationAmount">Length</label> - <div class="subtext">Decimals can be used - e.g. 3.5 months or 1.5 years</div> - <mat-form-field appearance="outline"> - <input - id="projectDurationAmount" - mask="separator.2" - thousandSeparator="," - separatorLimit="9999999999" - min="0.01" - matInput - [formControl]="projectDurationAmount" - placeholder="Type length" - /> - </mat-form-field> - <div - *ngIf="projectDurationAmount.invalid && (projectDurationAmount.dirty || projectDurationAmount.touched)" - class="field-error" - > - <mat-icon>warning</mat-icon> - <div *ngIf="projectDurationAmount.errors?.['required']">This field is required</div> - </div> - </div> - </div> - </section> - <div class="full-row"> <mat-label class="subheading2" for="proposal-map">Proposal Map / Site Plan</mat-label> <div class="subtext">A visual representation of your proposal.</div> diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pofo/pofo-proposal.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pofo/pofo-proposal.component.ts index 2f4bdf42d9..fd6e37ddf6 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pofo/pofo-proposal.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pofo/pofo-proposal.component.ts @@ -39,8 +39,7 @@ export class PofoProposalComponent extends FilesStepComponent implements OnInit, followUpIds = new FormControl<string | null>({ value: null, disabled: true }, [Validators.required]); purpose = new FormControl<string | null>(null, [Validators.required]); soilFillTypeToPlace = new FormControl<string | null>(null, [Validators.required]); - projectDurationAmount = new FormControl<string | null>(null, [Validators.required]); - projectDurationUnit = new FormControl<string | null>(null, [Validators.required]); + projectDuration = new FormControl<string | null>(null, [Validators.required]); areComponentsDirty = false; isAreaWideFilling = new FormControl<string | null>(null, [Validators.required]); @@ -49,8 +48,7 @@ export class PofoProposalComponent extends FilesStepComponent implements OnInit, followUpIds: this.followUpIds, purpose: this.purpose, soilFillTypeToPlace: this.soilFillTypeToPlace, - projectDurationAmount: this.projectDurationAmount, - projectDurationUnit: this.projectDurationUnit, + projectDuration: this.projectDuration, isAreaWideFilling: this.isAreaWideFilling, }); @@ -98,8 +96,7 @@ export class PofoProposalComponent extends FilesStepComponent implements OnInit, followUpIds: noiSubmission.soilFollowUpIDs, purpose: noiSubmission.purpose, soilFillTypeToPlace: noiSubmission.soilFillTypeToPlace, - projectDurationAmount: noiSubmission.soilProjectDurationAmount?.toString() ?? null, - projectDurationUnit: noiSubmission.soilProjectDurationUnit, + projectDuration: noiSubmission.soilProjectDuration?.toString() ?? null, isAreaWideFilling: formatBooleanToString(noiSubmission.soilIsAreaWideFilling), }); if (this.showErrors) { @@ -155,10 +152,7 @@ export class PofoProposalComponent extends FilesStepComponent implements OnInit, soilAlreadyPlacedArea: this.fillAlreadyPlacedTableData?.area ?? null, soilAlreadyPlacedMaximumDepth: this.fillAlreadyPlacedTableData?.maximumDepth ?? null, soilAlreadyPlacedAverageDepth: this.fillAlreadyPlacedTableData?.averageDepth ?? null, - soilProjectDurationAmount: this.projectDurationAmount.value - ? parseFloat(this.projectDurationAmount.value) - : null, - soilProjectDurationUnit: this.projectDurationUnit.value, + soilProjectDuration: this.projectDuration.value ?? null, soilIsAreaWideFilling: parseStringToBoolean(isAreaWideFilling), }; diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.html index 8e8628118d..5a34a75195 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.html @@ -128,6 +128,31 @@ <h2>Proposal</h2> <mat-hint class="subtext">Example: Aggregate, Extraction, Placer Mining, Peat Extraction, Soil etc.</mat-hint> <div class="subtext">Characters left: {{ 4000 - soilTypeRemovedText.textLength }}</div> </div> + + + <div class="form-row"> + <div class="full-row"> + <label for="projectDuration">Placement of Fill Project Duration</label> + <div class="subtext">Length of time you anticipate it would take to complete the project</div> + <mat-form-field appearance="outline"> + <input + id="projectDuration" + matInput + [formControl]="projectDuration" + placeholder="Type project duration" + /> + </mat-form-field> + <div + *ngIf="projectDuration.invalid && (projectDuration.dirty || projectDuration.touched)" + class="field-error" + > + <mat-icon>warning</mat-icon> + <div *ngIf="projectDuration.errors?.['required']">This field is required</div> + </div> + <mat-hint class="subtext">Example: 30 years; or 3 months; or 5 days</mat-hint> + </div> + </div> + <div class="full-row"> <mat-label>Proposal Dimensions</mat-label> <div class="subtext"> @@ -155,54 +180,6 @@ <h2>Proposal</h2> ></app-soil-table> </div> - <section> - <h4>Project Duration</h4> - <div class="subtext">Estimated duration of the project</div> - <div class="form-row"> - <div> - <mat-label for="projectDurationUnit">Duration</mat-label> - <div class="subtext">Days, Months, or Years</div> - <mat-form-field appearance="outline"> - <mat-select placeholder="Select one" id="projectDurationUnit" formControlName="projectDurationUnit"> - <mat-option value="days">Days</mat-option> - <mat-option value="months">Months</mat-option> - <mat-option value="years">Years</mat-option> - </mat-select> - </mat-form-field> - <div - *ngIf="projectDurationUnit.invalid && (projectDurationUnit.dirty || projectDurationUnit.touched)" - class="field-error" - > - <mat-icon>warning</mat-icon> - <div *ngIf="projectDurationUnit.errors?.['required']">This field is required</div> - </div> - </div> - <div> - <label for="projectDurationAmount">Length</label> - <div class="subtext">Decimals can be used - e.g. 3.5 months or 1.5 years</div> - <mat-form-field appearance="outline"> - <input - id="projectDurationAmount" - mask="separator.2" - thousandSeparator="," - separatorLimit="9999999999" - min="0.01" - matInput - formControlName="projectDurationAmount" - placeholder="Type length" - /> - </mat-form-field> - <div - *ngIf="projectDurationAmount.invalid && (projectDurationAmount.dirty || projectDurationAmount.touched)" - class="field-error" - > - <mat-icon>warning</mat-icon> - <div *ngIf="projectDurationAmount.errors?.['required']">This field is required</div> - </div> - </div> - </div> - </section> - <div class="full-row"> <mat-label class="subheading2" for="proposal-map">Proposal Map / Site Plan</mat-label> <div class="subtext">A visual representation of your proposal.</div> diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.ts index 8f2d8a6b93..766da5a5bc 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.ts @@ -42,8 +42,7 @@ export class RosoProposalComponent extends FilesStepComponent implements OnInit, followUpIds = new FormControl<string | null>({ value: null, disabled: true }, [Validators.required]); purpose = new FormControl<string | null>(null, [Validators.required]); soilTypeRemoved = new FormControl<string | null>(null, [Validators.required]); - projectDurationAmount = new FormControl<string | null>(null, [Validators.required]); - projectDurationUnit = new FormControl<string | null>(null, [Validators.required]); + projectDuration = new FormControl<string | null>(null, [Validators.required]); areComponentsDirty = false; isExtractionOrMining = new FormControl<string | null>(null, [Validators.required]); hasSubmittedNotice = new FormControl<string | null>(null, [Validators.required]); @@ -53,8 +52,7 @@ export class RosoProposalComponent extends FilesStepComponent implements OnInit, followUpIds: this.followUpIds, purpose: this.purpose, soilTypeRemoved: this.soilTypeRemoved, - projectDurationAmount: this.projectDurationAmount, - projectDurationUnit: this.projectDurationUnit, + projectDuration: this.projectDuration, isExtractionOrMining: this.isExtractionOrMining, hasSubmittedNotice: this.hasSubmittedNotice, }); @@ -111,8 +109,7 @@ export class RosoProposalComponent extends FilesStepComponent implements OnInit, followUpIds: noiSubmission.soilFollowUpIDs, purpose: noiSubmission.purpose, soilTypeRemoved: noiSubmission.soilTypeRemoved, - projectDurationAmount: noiSubmission.soilProjectDurationAmount?.toString() ?? null, - projectDurationUnit: noiSubmission.soilProjectDurationUnit, + projectDuration: noiSubmission.soilProjectDuration?.toString() ?? null, isExtractionOrMining: formatBooleanToString(noiSubmission.soilIsExtractionOrMining), hasSubmittedNotice: formatBooleanToString(noiSubmission.soilHasSubmittedNotice), }); @@ -176,10 +173,7 @@ export class RosoProposalComponent extends FilesStepComponent implements OnInit, soilAlreadyRemovedArea: this.alreadyRemovedTableData?.area ?? null, soilAlreadyRemovedMaximumDepth: this.alreadyRemovedTableData?.maximumDepth ?? null, soilAlreadyRemovedAverageDepth: this.alreadyRemovedTableData?.averageDepth ?? null, - soilProjectDurationAmount: this.projectDurationAmount.value - ? parseFloat(this.projectDurationAmount.value) - : null, - soilProjectDurationUnit: this.projectDurationUnit.value, + soilProjectDuration: this.projectDuration.value ?? null, soilIsExtractionOrMining: parseStringToBoolean(isExtractionOrMining), soilHasSubmittedNotice: parseStringToBoolean(hasSubmittedNotice), }; diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pfrs-details/pfrs-details.component.html b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pfrs-details/pfrs-details.component.html index 2f67f151ce..d0f53b6a5f 100644 --- a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pfrs-details/pfrs-details.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pfrs-details/pfrs-details.component.html @@ -35,39 +35,28 @@ <div class="subheading2 grid-1">Placement of Fill Project Duration</div> <div class="grid-double"> - <div *ngIf="_noiSubmission.fillProjectDurationAmount && _noiSubmission.fillProjectDurationUnit"> - {{ _noiSubmission.fillProjectDurationAmount }} - <ng-container [ngPlural]="_noiSubmission.fillProjectDurationAmount"> - <ng-template ngPluralCase="=1"> - {{ _noiSubmission.fillProjectDurationUnit.slice(0, -1) | titlecase }} - </ng-template> - <ng-template ngPluralCase="other"> - {{ _noiSubmission.fillProjectDurationUnit | titlecase }} - </ng-template> - </ng-container> + <div *ngIf="_noiSubmission.fillProjectDuration"> + {{ _noiSubmission.fillProjectDuration }} </div> <app-no-data [showRequired]="showErrors" - *ngIf="!_noiSubmission.fillProjectDurationAmount || !_noiSubmission.fillProjectDurationUnit" + *ngIf="!_noiSubmission.fillProjectDuration" ></app-no-data> </div> <div class="subheading2 grid-1">Removal of Soil Project Duration</div> <div class="grid-double"> - <div *ngIf="_noiSubmission.soilProjectDurationAmount && _noiSubmission.soilProjectDurationUnit"> - {{ _noiSubmission.soilProjectDurationAmount }} - <ng-container [ngPlural]="_noiSubmission.soilProjectDurationAmount"> - <ng-template ngPluralCase="=1"> - {{ _noiSubmission.soilProjectDurationUnit.slice(0, -1) | titlecase }} - </ng-template> - <ng-template ngPluralCase="other"> - {{ _noiSubmission.soilProjectDurationUnit | titlecase }} + <div *ngIf="_noiSubmission.soilProjectDuration"> + {{ _noiSubmission.soilProjectDuration }} + <ng-container> + <ng-template> + {{ _noiSubmission.soilProjectDuration | titlecase }} </ng-template> </ng-container> </div> <app-no-data [showRequired]="showErrors" - *ngIf="!_noiSubmission.soilProjectDurationAmount || !_noiSubmission.soilProjectDurationUnit" + *ngIf="!_noiSubmission.soilProjectDuration" ></app-no-data> </div> diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pofo-details/pofo-details.component.html b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pofo-details/pofo-details.component.html index 8310b41e94..3c4350679e 100644 --- a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pofo-details/pofo-details.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pofo-details/pofo-details.component.html @@ -27,22 +27,19 @@ <app-no-data [showRequired]="showErrors" *ngIf="!_noiSubmission.soilFillTypeToPlace"></app-no-data> </div> - <div class="subheading2 grid-1">Project Duration</div> + <div class="subheading2 grid-1">Placement of Fill Project Duration</div> <div class="grid-double"> - <div *ngIf="_noiSubmission.soilProjectDurationAmount && _noiSubmission.soilProjectDurationUnit"> - {{ _noiSubmission.soilProjectDurationAmount }} - <ng-container [ngPlural]="_noiSubmission.soilProjectDurationAmount"> - <ng-template ngPluralCase="=1"> - {{ _noiSubmission.soilProjectDurationUnit.slice(0, -1) | titlecase }} - </ng-template> - <ng-template ngPluralCase="other"> - {{ _noiSubmission.soilProjectDurationUnit | titlecase }} + <div *ngIf="_noiSubmission.soilProjectDuration"> + {{ _noiSubmission.soilProjectDuration }} + <ng-container> + <ng-template> + {{ _noiSubmission.soilProjectDuration | titlecase }} </ng-template> </ng-container> </div> <app-no-data [showRequired]="showErrors" - *ngIf="!_noiSubmission.soilProjectDurationAmount || !_noiSubmission.soilProjectDurationUnit" + *ngIf="!_noiSubmission.soilProjectDuration" ></app-no-data> </div> diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/roso-details/roso-details.component.html b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/roso-details/roso-details.component.html index 283cce4cbe..70e22816ed 100644 --- a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/roso-details/roso-details.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/roso-details/roso-details.component.html @@ -27,22 +27,19 @@ <app-no-data [showRequired]="showErrors" *ngIf="!_noiSubmission.soilTypeRemoved"></app-no-data> </div> - <div class="subheading2 grid-1">Project Duration</div> + <div class="subheading2 grid-1">Removal of Soil Project Duration</div> <div class="grid-double"> - <div *ngIf="_noiSubmission.soilProjectDurationAmount && _noiSubmission.soilProjectDurationUnit"> - {{ _noiSubmission.soilProjectDurationAmount }} - <ng-container [ngPlural]="_noiSubmission.soilProjectDurationAmount"> - <ng-template ngPluralCase="=1"> - {{ _noiSubmission.soilProjectDurationUnit.slice(0, -1) | titlecase }} - </ng-template> - <ng-template ngPluralCase="other"> - {{ _noiSubmission.soilProjectDurationUnit | titlecase }} + <div *ngIf="_noiSubmission.soilProjectDuration"> + {{ _noiSubmission.soilProjectDuration }} + <ng-container> + <ng-template> + {{ _noiSubmission.soilProjectDuration | titlecase }} </ng-template> </ng-container> </div> <app-no-data [showRequired]="showErrors" - *ngIf="!_noiSubmission.soilProjectDurationAmount || !_noiSubmission.soilProjectDurationUnit" + *ngIf="!_noiSubmission.soilProjectDuration" ></app-no-data> </div> diff --git a/portal-frontend/src/app/features/public/notice-of-intent/submission/pfrs-details/pfrs-details.component.html b/portal-frontend/src/app/features/public/notice-of-intent/submission/pfrs-details/pfrs-details.component.html index 5dd310207d..1ee5bf4c1c 100644 --- a/portal-frontend/src/app/features/public/notice-of-intent/submission/pfrs-details/pfrs-details.component.html +++ b/portal-frontend/src/app/features/public/notice-of-intent/submission/pfrs-details/pfrs-details.component.html @@ -35,37 +35,21 @@ <div class="subheading2 grid-1">Placement of Fill Project Duration</div> <div class="grid-double"> - <div *ngIf="noiSubmission.fillProjectDurationAmount && noiSubmission.fillProjectDurationAmount"> - {{ noiSubmission.fillProjectDurationAmount }} - <ng-container [ngPlural]="noiSubmission.fillProjectDurationAmount"> - <ng-template ngPluralCase="=1"> - {{ noiSubmission.fillProjectDurationUnit?.slice(0, -1) | titlecase }} - </ng-template> - <ng-template ngPluralCase="other"> - {{ noiSubmission.fillProjectDurationUnit | titlecase }} - </ng-template> - </ng-container> + <div *ngIf="noiSubmission.fillProjectDuration"> + {{ noiSubmission.fillProjectDuration }} </div> <app-no-data - *ngIf="!noiSubmission.fillProjectDurationAmount || !noiSubmission.fillProjectDurationUnit" + *ngIf="!noiSubmission.fillProjectDuration" ></app-no-data> </div> - <div class="subheading2 grid-1">Removal of Fill Project Duration</div> + <div class="subheading2 grid-1">Removal of Soil Project Duration</div> <div class="grid-double"> - <div *ngIf="noiSubmission.soilProjectDurationAmount && noiSubmission.soilProjectDurationAmount"> - {{ noiSubmission.soilProjectDurationAmount }} - <ng-container [ngPlural]="noiSubmission.soilProjectDurationAmount"> - <ng-template ngPluralCase="=1"> - {{ noiSubmission.soilProjectDurationUnit?.slice(0, -1) | titlecase }} - </ng-template> - <ng-template ngPluralCase="other"> - {{ noiSubmission.soilProjectDurationUnit | titlecase }} - </ng-template> - </ng-container> + <div *ngIf="noiSubmission.soilProjectDuration"> + {{ noiSubmission.soilProjectDuration }} </div> <app-no-data - *ngIf="!noiSubmission.soilProjectDurationAmount || !noiSubmission.soilProjectDurationUnit" + *ngIf="!noiSubmission.soilProjectDuration" ></app-no-data> </div> diff --git a/portal-frontend/src/app/features/public/notice-of-intent/submission/pofo-details/pofo-details.component.html b/portal-frontend/src/app/features/public/notice-of-intent/submission/pofo-details/pofo-details.component.html index 9cec4e175a..43a1308645 100644 --- a/portal-frontend/src/app/features/public/notice-of-intent/submission/pofo-details/pofo-details.component.html +++ b/portal-frontend/src/app/features/public/notice-of-intent/submission/pofo-details/pofo-details.component.html @@ -27,21 +27,13 @@ <app-no-data *ngIf="!noiSubmission.soilFillTypeToPlace"></app-no-data> </div> - <div class="subheading2 grid-1">Project Duration</div> - <div class="grid-double"> - <div *ngIf="noiSubmission.soilProjectDurationAmount && noiSubmission.soilProjectDurationUnit"> - {{ noiSubmission.soilProjectDurationAmount }} - <ng-container [ngPlural]="noiSubmission.soilProjectDurationAmount"> - <ng-template ngPluralCase="=1"> - {{ noiSubmission.soilProjectDurationUnit.slice(0, -1) | titlecase }} - </ng-template> - <ng-template ngPluralCase="other"> - {{ noiSubmission.soilProjectDurationUnit | titlecase }} - </ng-template> - </ng-container> + <div class="subheading2 grid-1">Placement of Fill Project Duration</div> + <div class="grid-double"> + <div *ngIf="noiSubmission.soilProjectDuration"> + {{ noiSubmission.soilProjectDuration }} </div> <app-no-data - *ngIf="!noiSubmission.soilProjectDurationAmount || !noiSubmission.soilProjectDurationUnit" + *ngIf="!noiSubmission.soilProjectDuration" ></app-no-data> </div> diff --git a/portal-frontend/src/app/features/public/notice-of-intent/submission/roso-details/roso-details.component.html b/portal-frontend/src/app/features/public/notice-of-intent/submission/roso-details/roso-details.component.html index 17854e2c9d..9cbaeb3fce 100644 --- a/portal-frontend/src/app/features/public/notice-of-intent/submission/roso-details/roso-details.component.html +++ b/portal-frontend/src/app/features/public/notice-of-intent/submission/roso-details/roso-details.component.html @@ -27,21 +27,13 @@ <app-no-data *ngIf="!noiSubmission.soilTypeRemoved"></app-no-data> </div> - <div class="subheading2 grid-1">Project Duration</div> + <div class="subheading2 grid-1">Removal of Soil Project Duration</div> <div class="grid-double"> - <div *ngIf="noiSubmission.soilProjectDurationAmount && noiSubmission.soilProjectDurationUnit"> - {{ noiSubmission.soilProjectDurationAmount }} - <ng-container [ngPlural]="noiSubmission.soilProjectDurationAmount"> - <ng-template ngPluralCase="=1"> - {{ noiSubmission.soilProjectDurationUnit.slice(0, -1) | titlecase }} - </ng-template> - <ng-template ngPluralCase="other"> - {{ noiSubmission.soilProjectDurationUnit | titlecase }} - </ng-template> - </ng-container> + <div *ngIf="noiSubmission.soilProjectDuration"> + {{ noiSubmission.soilProjectDuration }} </div> <app-no-data - *ngIf="!noiSubmission.soilProjectDurationAmount || !noiSubmission.soilProjectDurationUnit" + *ngIf="!noiSubmission.soilProjectDuration" ></app-no-data> </div> diff --git a/portal-frontend/src/app/services/notice-of-intent-submission/notice-of-intent-submission.dto.ts b/portal-frontend/src/app/services/notice-of-intent-submission/notice-of-intent-submission.dto.ts index d329531f43..e1b90c34bb 100644 --- a/portal-frontend/src/app/services/notice-of-intent-submission/notice-of-intent-submission.dto.ts +++ b/portal-frontend/src/app/services/notice-of-intent-submission/notice-of-intent-submission.dto.ts @@ -76,10 +76,8 @@ export interface NoticeOfIntentSubmissionDetailedDto extends NoticeOfIntentSubmi soilAlreadyPlacedArea: number | null; soilAlreadyPlacedMaximumDepth: number | null; soilAlreadyPlacedAverageDepth: number | null; - soilProjectDurationAmount: number | null; - soilProjectDurationUnit: string | null; - fillProjectDurationAmount: number | null; - fillProjectDurationUnit: string | null; + soilProjectDuration: string | null; + fillProjectDuration: string | null; soilFillTypeToPlace: string | null; soilIsExtractionOrMining: boolean | null; soilIsAreaWideFilling: boolean | null; @@ -130,10 +128,8 @@ export interface NoticeOfIntentSubmissionUpdateDto { soilAlreadyPlacedArea?: number | null; soilAlreadyPlacedMaximumDepth?: number | null; soilAlreadyPlacedAverageDepth?: number | null; - soilProjectDurationAmount?: number | null; - soilProjectDurationUnit?: string | null; - fillProjectDurationAmount?: number | null; - fillProjectDurationUnit?: string | null; + soilProjectDuration?: string | null; + fillProjectDuration?: string | null; soilFillTypeToPlace?: string | null; soilIsExtractionOrMining?: boolean | null; soilIsAreaWideFilling?: boolean | null; diff --git a/portal-frontend/src/app/services/public/public-notice-of-intent.dto.ts b/portal-frontend/src/app/services/public/public-notice-of-intent.dto.ts index 6d3422c15e..d1ef6e638c 100644 --- a/portal-frontend/src/app/services/public/public-notice-of-intent.dto.ts +++ b/portal-frontend/src/app/services/public/public-notice-of-intent.dto.ts @@ -59,10 +59,8 @@ export interface PublicNoticeOfIntentSubmissionDto { soilAlreadyPlacedArea: number | null; soilAlreadyPlacedMaximumDepth: number | null; soilAlreadyPlacedAverageDepth: number | null; - soilProjectDurationAmount: number | null; - soilProjectDurationUnit?: string | null; - fillProjectDurationAmount: number | null; - fillProjectDurationUnit: string | null; + soilProjectDuration?: string | null; + fillProjectDuration: string | null; soilFillTypeToPlace?: string | null; soilIsExtractionOrMining?: boolean; soilIsAreaWideFilling?: boolean; diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission-validator.service.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission-validator.service.ts index c9898c5418..18153d934e 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission-validator.service.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission-validator.service.ts @@ -474,8 +474,7 @@ export class NoticeOfIntentSubmissionValidatorService { ) { if ( noticeOfIntentSubmission.soilIsFollowUp === null || - noticeOfIntentSubmission.soilProjectDurationAmount === null || - noticeOfIntentSubmission.soilProjectDurationUnit === null + noticeOfIntentSubmission.soilProjectDuration === null ) { errors.push( new ServiceValidationException( diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.dto.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.dto.ts index 7fd430fdaa..39d63a9d7b 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.dto.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.dto.ts @@ -134,17 +134,11 @@ export class NoticeOfIntentSubmissionDetailedDto extends NoticeOfIntentSubmissio @AutoMap(() => Number) soilAlreadyPlacedAverageDepth: number | null; - @AutoMap(() => Number) - soilProjectDurationAmount: number | null; - @AutoMap(() => String) - soilProjectDurationUnit?: string | null; - - @AutoMap(() => Number) - fillProjectDurationAmount: number | null; + soilProjectDuration?: string | null; @AutoMap(() => String) - fillProjectDurationUnit: string | null; + fillProjectDuration: string | null; @AutoMap(() => String) soilFillTypeToPlace?: string | null; @@ -334,21 +328,13 @@ export class NoticeOfIntentSubmissionUpdateDto { @IsOptional() soilAlreadyPlacedAverageDepth?: number | null; - @IsNumber() - @IsOptional() - soilProjectDurationAmount?: number | null; - @IsString() @IsOptional() - soilProjectDurationUnit?: string | null; - - @IsNumber() - @IsOptional() - fillProjectDurationAmount?: number | null; + soilProjectDuration?: string | null; @IsString() @IsOptional() - fillProjectDurationUnit?: string | null; + fillProjectDuration?: string | null; @IsString() @IsOptional() diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.entity.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.entity.ts index e26d5939ce..a3eb93c876 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.entity.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.entity.ts @@ -367,33 +367,13 @@ export class NoticeOfIntentSubmission extends Base { }) soilAlreadyPlacedAverageDepth: number | null; - @AutoMap(() => Number) - @Column({ - type: 'decimal', - nullable: true, - precision: 12, - scale: 2, - transformer: new ColumnNumericTransformer(), - }) - soilProjectDurationAmount: number | null; - @AutoMap(() => String) @Column({ type: 'text', nullable: true }) - soilProjectDurationUnit: string | null; - - @AutoMap(() => Number) - @Column({ - type: 'decimal', - nullable: true, - precision: 12, - scale: 2, - transformer: new ColumnNumericTransformer(), - }) - fillProjectDurationAmount: number | null; + soilProjectDuration: string | null; @AutoMap(() => String) @Column({ type: 'text', nullable: true }) - fillProjectDurationUnit: string | null; + fillProjectDuration: string | null; @AutoMap(() => String) @Column({ type: 'text', nullable: true }) diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts index 3db3992421..3831d7c01c 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts @@ -522,21 +522,13 @@ export class NoticeOfIntentSubmissionService { updateDto.soilAlreadyPlacedAverageDepth, noticeOfIntentSubmission.soilAlreadyPlacedAverageDepth, ); - noticeOfIntentSubmission.soilProjectDurationAmount = filterUndefined( - updateDto.soilProjectDurationAmount, - noticeOfIntentSubmission.soilProjectDurationAmount, + noticeOfIntentSubmission.soilProjectDuration = filterUndefined( + updateDto.soilProjectDuration, + noticeOfIntentSubmission.soilProjectDuration, ); - noticeOfIntentSubmission.soilProjectDurationUnit = filterUndefined( - updateDto.soilProjectDurationUnit, - noticeOfIntentSubmission.soilProjectDurationUnit, - ); - noticeOfIntentSubmission.fillProjectDurationAmount = filterUndefined( - updateDto.fillProjectDurationAmount, - noticeOfIntentSubmission.fillProjectDurationAmount, - ); - noticeOfIntentSubmission.fillProjectDurationUnit = filterUndefined( - updateDto.fillProjectDurationUnit, - noticeOfIntentSubmission.fillProjectDurationUnit, + noticeOfIntentSubmission.fillProjectDuration = filterUndefined( + updateDto.fillProjectDuration, + noticeOfIntentSubmission.fillProjectDuration, ); noticeOfIntentSubmission.soilFillTypeToPlace = filterUndefined( updateDto.soilFillTypeToPlace, diff --git a/services/apps/alcs/src/portal/public/notice-of-intent/public-notice-of-intent.dto.ts b/services/apps/alcs/src/portal/public/notice-of-intent/public-notice-of-intent.dto.ts index 64af27cdf9..748a445cf8 100644 --- a/services/apps/alcs/src/portal/public/notice-of-intent/public-notice-of-intent.dto.ts +++ b/services/apps/alcs/src/portal/public/notice-of-intent/public-notice-of-intent.dto.ts @@ -133,17 +133,11 @@ export class PublicNoticeOfIntentSubmissionDto { @AutoMap(() => Number) soilAlreadyPlacedAverageDepth: number | null; - @AutoMap(() => Number) - soilProjectDurationAmount: number | null; - @AutoMap(() => String) - soilProjectDurationUnit?: string | null; - - @AutoMap(() => Number) - fillProjectDurationAmount: number | null; + soilProjectDuration?: string | null; @AutoMap(() => String) - fillProjectDurationUnit?: string | null; + fillProjectDuration?: string | null; @AutoMap(() => String) soilFillTypeToPlace?: string | null; diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1703199373532-update-noi-project-duration.ts b/services/apps/alcs/src/providers/typeorm/migrations/1703199373532-update-noi-project-duration.ts new file mode 100644 index 0000000000..2e9cb6fcaa --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1703199373532-update-noi-project-duration.ts @@ -0,0 +1,23 @@ +import { MigrationInterface, QueryRunner } from "typeorm"; + +export class UpdateNoiProjectDuration1703199373532 implements MigrationInterface { + name = 'UpdateNoiProjectDuration1703199373532' + + public async up(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query(`ALTER TABLE "alcs"."notice_of_intent_submission" DROP COLUMN "soil_project_duration_amount"`); + await queryRunner.query(`ALTER TABLE "alcs"."notice_of_intent_submission" DROP COLUMN "soil_project_duration_unit"`); + await queryRunner.query(`ALTER TABLE "alcs"."notice_of_intent_submission" DROP COLUMN "fill_project_duration_amount"`); + await queryRunner.query(`ALTER TABLE "alcs"."notice_of_intent_submission" DROP COLUMN "fill_project_duration_unit"`); + await queryRunner.query(`ALTER TABLE "alcs"."notice_of_intent_submission" ADD "soil_project_duration" text`); + await queryRunner.query(`ALTER TABLE "alcs"."notice_of_intent_submission" ADD "fill_project_duration" text`); + } + + public async down(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query(`ALTER TABLE "alcs"."notice_of_intent_submission" DROP COLUMN "fill_project_duration"`); + await queryRunner.query(`ALTER TABLE "alcs"."notice_of_intent_submission" DROP COLUMN "soil_project_duration"`); + await queryRunner.query(`ALTER TABLE "alcs"."notice_of_intent_submission" ADD "fill_project_duration_unit" text`); + await queryRunner.query(`ALTER TABLE "alcs"."notice_of_intent_submission" ADD "fill_project_duration_amount" numeric(12,2)`); + await queryRunner.query(`ALTER TABLE "alcs"."notice_of_intent_submission" ADD "soil_project_duration_unit" text`); + await queryRunner.query(`ALTER TABLE "alcs"."notice_of_intent_submission" ADD "soil_project_duration_amount" numeric(12,2)`); + } +} From 3e7b55ea47e2ebfc497c59b037191b455f6001e6 Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Thu, 21 Dec 2023 16:10:22 -0800 Subject: [PATCH 830/954] fixes --- .../notice-of-intent-details.component.spec.ts | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/notice-of-intent-details.component.spec.ts b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/notice-of-intent-details.component.spec.ts index ef5e1665b5..ef07b76cd5 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/notice-of-intent-details.component.spec.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/notice-of-intent-details.component.spec.ts @@ -105,10 +105,8 @@ describe('NoticeOfIntentDetailsComponent', () => { soilAlreadyPlacedArea: null, soilAlreadyPlacedMaximumDepth: null, soilAlreadyPlacedAverageDepth: null, - soilProjectDurationAmount: null, - soilProjectDurationUnit: null, - fillProjectDurationUnit: null, - fillProjectDurationAmount: null, + soilProjectDuration: null, + fillProjectDuration: null, soilFillTypeToPlace: null, soilProposedStructures: [], }; From 994bf00dd48c67c50d0be908e09b719eb4fd7141 Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Thu, 21 Dec 2023 16:55:23 -0800 Subject: [PATCH 831/954] changes --- .../roso-details/roso-details.component.html | 10 +++++----- .../proposal/pofo/pofo-proposal.component.ts | 6 +++--- .../proposal/roso/roso-proposal.component.html | 2 +- .../proposal/roso/roso-proposal.component.ts | 2 +- .../pfrs-details/pfrs-details.component.html | 5 ----- .../pofo-details/pofo-details.component.html | 5 ----- .../roso-details/roso-details.component.html | 5 ----- 7 files changed, 10 insertions(+), 25 deletions(-) diff --git a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/roso-details/roso-details.component.html b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/roso-details/roso-details.component.html index 743d07b68d..6d18c33b0e 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/roso-details/roso-details.component.html +++ b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/roso-details/roso-details.component.html @@ -23,6 +23,11 @@ {{ _noiSubmission.soilTypeRemoved }} </div> + <div class="subheading2 grid-1">Removal of Soil Project Duration</div> + <div class="grid-double"> + {{ _noiSubmission.soilProjectDuration }} + </div> + <div class="subheading1 full-width"></div> <div class="full-width soil-table"> <div class="grid-1"></div> @@ -78,11 +83,6 @@ </div> </div> - <div class="subheading2 grid-1">Removal of Soil Project Duration</div> - <div class="grid-double"> - {{ _noiSubmission.soilProjectDuration }} - </div> - <div class="subheading2 grid-1">Proposal Map / Site Plan</div> <div class="grid-double multiple-documents"> <a *ngFor="let map of proposalMap" (click)="openFile(map)"> diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pofo/pofo-proposal.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pofo/pofo-proposal.component.ts index fd6e37ddf6..724d446beb 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pofo/pofo-proposal.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pofo/pofo-proposal.component.ts @@ -96,7 +96,7 @@ export class PofoProposalComponent extends FilesStepComponent implements OnInit, followUpIds: noiSubmission.soilFollowUpIDs, purpose: noiSubmission.purpose, soilFillTypeToPlace: noiSubmission.soilFillTypeToPlace, - projectDuration: noiSubmission.soilProjectDuration?.toString() ?? null, + projectDuration: noiSubmission.soilProjectDuration ?? null, isAreaWideFilling: formatBooleanToString(noiSubmission.soilIsAreaWideFilling), }); if (this.showErrors) { @@ -137,11 +137,13 @@ export class PofoProposalComponent extends FilesStepComponent implements OnInit, const soilFollowUpIDs = this.followUpIds.getRawValue(); const purpose = this.purpose.getRawValue(); const soilFillTypeToPlace = this.soilFillTypeToPlace.getRawValue(); + const soilProjectDuration = this.projectDuration.getRawValue(); const isAreaWideFilling = this.isAreaWideFilling.getRawValue(); const updateDto: NoticeOfIntentSubmissionUpdateDto = { purpose, soilFillTypeToPlace, + soilProjectDuration, soilIsFollowUp: parseStringToBoolean(isNOIFollowUp), soilFollowUpIDs, soilToPlaceVolume: this.fillToPlaceTableData?.volume ?? null, @@ -151,8 +153,6 @@ export class PofoProposalComponent extends FilesStepComponent implements OnInit, soilAlreadyPlacedVolume: this.fillAlreadyPlacedTableData?.volume ?? null, soilAlreadyPlacedArea: this.fillAlreadyPlacedTableData?.area ?? null, soilAlreadyPlacedMaximumDepth: this.fillAlreadyPlacedTableData?.maximumDepth ?? null, - soilAlreadyPlacedAverageDepth: this.fillAlreadyPlacedTableData?.averageDepth ?? null, - soilProjectDuration: this.projectDuration.value ?? null, soilIsAreaWideFilling: parseStringToBoolean(isAreaWideFilling), }; diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.html index 5a34a75195..a089cfa3ff 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.html @@ -132,7 +132,7 @@ <h2>Proposal</h2> <div class="form-row"> <div class="full-row"> - <label for="projectDuration">Placement of Fill Project Duration</label> + <label for="projectDuration">Removal of Soil Project Duration</label> <div class="subtext">Length of time you anticipate it would take to complete the project</div> <mat-form-field appearance="outline"> <input diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.ts index 766da5a5bc..bbc916447f 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.ts @@ -109,7 +109,7 @@ export class RosoProposalComponent extends FilesStepComponent implements OnInit, followUpIds: noiSubmission.soilFollowUpIDs, purpose: noiSubmission.purpose, soilTypeRemoved: noiSubmission.soilTypeRemoved, - projectDuration: noiSubmission.soilProjectDuration?.toString() ?? null, + projectDuration: noiSubmission.soilProjectDuration ?? null, isExtractionOrMining: formatBooleanToString(noiSubmission.soilIsExtractionOrMining), hasSubmittedNotice: formatBooleanToString(noiSubmission.soilHasSubmittedNotice), }); diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pfrs-details/pfrs-details.component.html b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pfrs-details/pfrs-details.component.html index d0f53b6a5f..e2d188b19d 100644 --- a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pfrs-details/pfrs-details.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pfrs-details/pfrs-details.component.html @@ -48,11 +48,6 @@ <div class="grid-double"> <div *ngIf="_noiSubmission.soilProjectDuration"> {{ _noiSubmission.soilProjectDuration }} - <ng-container> - <ng-template> - {{ _noiSubmission.soilProjectDuration | titlecase }} - </ng-template> - </ng-container> </div> <app-no-data [showRequired]="showErrors" diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pofo-details/pofo-details.component.html b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pofo-details/pofo-details.component.html index 3c4350679e..bf2435d15b 100644 --- a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pofo-details/pofo-details.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pofo-details/pofo-details.component.html @@ -31,11 +31,6 @@ <div class="grid-double"> <div *ngIf="_noiSubmission.soilProjectDuration"> {{ _noiSubmission.soilProjectDuration }} - <ng-container> - <ng-template> - {{ _noiSubmission.soilProjectDuration | titlecase }} - </ng-template> - </ng-container> </div> <app-no-data [showRequired]="showErrors" diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/roso-details/roso-details.component.html b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/roso-details/roso-details.component.html index 70e22816ed..c515e9d409 100644 --- a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/roso-details/roso-details.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/roso-details/roso-details.component.html @@ -31,11 +31,6 @@ <div class="grid-double"> <div *ngIf="_noiSubmission.soilProjectDuration"> {{ _noiSubmission.soilProjectDuration }} - <ng-container> - <ng-template> - {{ _noiSubmission.soilProjectDuration | titlecase }} - </ng-template> - </ng-container> </div> <app-no-data [showRequired]="showErrors" From fbd48a83df0a33786e1c7c0f953141f92fc19d9a Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Fri, 22 Dec 2023 10:14:54 -0800 Subject: [PATCH 832/954] Feature/alcs 1364 (#1249) implement ELT for notice_of_intent_decision_component added oatsAlrApplComponentId to notice_of_intent_decision_component removed partial index on notice_of_intent_decision_component to allow multiple components of the same type on back-end move ag_cap and ag_cap_source mapping into common fix material description mapping for noi --- .../applications/app_prep.py | 18 +- .../common/oats_decision_enum.py | 15 ++ .../noi_decisions/noi_components/__init__.py | 8 + ...tice_of_intent_decision_components_init.py | 199 ++++++++++++++++++ ...decision_components_soil_details_update.py | 146 +++++++++++++ .../noi/notice_of_intent_migration.py | 10 + .../notice_of_intent_soil_fields.py | 2 +- ...e_of_intent_decision_components_insert.sql | 14 ++ ...ntent_decision_components_insert_count.sql | 4 + ...ecision_components_soil_details_update.sql | 11 + ...n_components_soil_details_update_count.sql | 3 + .../application-decision-component.entity.ts | 13 +- ...ice-of-intent-decision-component.entity.ts | 9 + ...300592-remove_component_type_constraint.ts | 19 ++ ...omponent_id_into_noi_decision_component.ts | 25 +++ 15 files changed, 467 insertions(+), 29 deletions(-) create mode 100644 bin/migrate-oats-data/noi/noi_decisions/noi_components/__init__.py create mode 100644 bin/migrate-oats-data/noi/noi_decisions/noi_components/notice_of_intent_decision_components_init.py create mode 100644 bin/migrate-oats-data/noi/noi_decisions/noi_components/notice_of_intent_decision_components_soil_details_update.py create mode 100644 bin/migrate-oats-data/noi/sql/notice_of_intent_decisions/components/notice_of_intent_decision_components_insert.sql create mode 100644 bin/migrate-oats-data/noi/sql/notice_of_intent_decisions/components/notice_of_intent_decision_components_insert_count.sql create mode 100644 bin/migrate-oats-data/noi/sql/notice_of_intent_decisions/components/notice_of_intent_decision_components_soil_details_update.sql create mode 100644 bin/migrate-oats-data/noi/sql/notice_of_intent_decisions/components/notice_of_intent_decision_components_soil_details_update_count.sql create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1702500300592-remove_component_type_constraint.ts create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1703182504703-add_oats_component_id_into_noi_decision_component.ts diff --git a/bin/migrate-oats-data/applications/app_prep.py b/bin/migrate-oats-data/applications/app_prep.py index 6ce26cf599..dcbecfdeba 100644 --- a/bin/migrate-oats-data/applications/app_prep.py +++ b/bin/migrate-oats-data/applications/app_prep.py @@ -2,12 +2,12 @@ ALRChangeCode, AlcsNfuTypeCode, OATS_NFU_SUBTYPES, - AlcsAgCap, - AlcsAgCapSource, OatsLegislationCodes, AlcsApplicantType, setup_and_get_logger, BATCH_UPLOAD_SIZE, + OatsToAlcsAgCapSource, + OatsToAlcsAgCap, ) from db import inject_conn_pool from psycopg2.extras import execute_batch, RealDictCursor @@ -26,20 +26,6 @@ class OatsToAlcsNfuTypes(Enum): UNU = AlcsNfuTypeCode.Unused.value -class OatsToAlcsAgCapSource(Enum): - BCLI = AlcsAgCapSource.BCLI.value - CLI = AlcsAgCapSource.CLI.value - ONSI = AlcsAgCapSource.On_site.value - - -class OatsToAlcsAgCap(Enum): - P = AlcsAgCap.Prime.value - PD = AlcsAgCap.Prime_Dominant.value - MIX = AlcsAgCap.Mixed_Prime_Secondary.value - S = AlcsAgCap.Secondary.value - U = AlcsAgCap.Unclassified.value - - class OatsLegislationCodes(Enum): SEC_30_1 = AlcsApplicantType.Land_owner.value SEC_29_1 = AlcsApplicantType.LFNG.value diff --git a/bin/migrate-oats-data/common/oats_decision_enum.py b/bin/migrate-oats-data/common/oats_decision_enum.py index 4c34108bd7..daf45d70b9 100644 --- a/bin/migrate-oats-data/common/oats_decision_enum.py +++ b/bin/migrate-oats-data/common/oats_decision_enum.py @@ -1,4 +1,5 @@ from enum import Enum +from .alcs_application_enum import AlcsAgCapSource, AlcsAgCap class AlcsDecisionOutcomeCodeEnum(Enum): @@ -11,3 +12,17 @@ class AlcsNoiModificationOutcomeCodeEnum(Enum): PENDING = "PEN" PROCEED_TO_MODIFY = "PRC" REFUSE_TO_MODIFY = "REF" + + +class OatsToAlcsAgCapSource(Enum): + BCLI = AlcsAgCapSource.BCLI.value + CLI = AlcsAgCapSource.CLI.value + ONSI = AlcsAgCapSource.On_site.value + + +class OatsToAlcsAgCap(Enum): + P = AlcsAgCap.Prime.value + PD = AlcsAgCap.Prime_Dominant.value + MIX = AlcsAgCap.Mixed_Prime_Secondary.value + S = AlcsAgCap.Secondary.value + U = AlcsAgCap.Unclassified.value diff --git a/bin/migrate-oats-data/noi/noi_decisions/noi_components/__init__.py b/bin/migrate-oats-data/noi/noi_decisions/noi_components/__init__.py new file mode 100644 index 0000000000..29d3b53b39 --- /dev/null +++ b/bin/migrate-oats-data/noi/noi_decisions/noi_components/__init__.py @@ -0,0 +1,8 @@ +from .notice_of_intent_decision_components_init import ( + init_notice_of_intent_decision_components, + clean_notice_of_intent_decision_components, +) + +from .notice_of_intent_decision_components_soil_details_update import ( + update_notice_of_intent_decision_component_soil_details, +) diff --git a/bin/migrate-oats-data/noi/noi_decisions/noi_components/notice_of_intent_decision_components_init.py b/bin/migrate-oats-data/noi/noi_decisions/noi_components/notice_of_intent_decision_components_init.py new file mode 100644 index 0000000000..50d9f4cf78 --- /dev/null +++ b/bin/migrate-oats-data/noi/noi_decisions/noi_components/notice_of_intent_decision_components_init.py @@ -0,0 +1,199 @@ +from common import ( + OATS_ETL_USER, + setup_and_get_logger, + add_timezone_and_keep_date_part, + ALRChangeCode, + OatsToAlcsAgCap, + OatsToAlcsAgCapSource, +) +from db import inject_conn_pool +from psycopg2.extras import RealDictCursor, execute_batch + +etl_name = "init_notice_of_intent_decision_components" +logger = setup_and_get_logger(etl_name) + + +@inject_conn_pool +def init_notice_of_intent_decision_components(conn=None, batch_size=1000): + """ + This function is responsible for initializing the notice_of_intent_decision_components in ALCS. + + Args: + conn (psycopg2.extensions.connection): PostgreSQL database connection. Provided by the decorator. + batch_size (int): The number of items to process at once. Defaults to BATCH_UPLOAD_SIZE. + """ + + logger.info(f"Start {etl_name}") + with conn.cursor(cursor_factory=RealDictCursor) as cursor: + with open( + "noi/sql/notice_of_intent_decisions/components/notice_of_intent_decision_components_insert_count.sql", + "r", + encoding="utf-8", + ) as sql_file: + count_query = sql_file.read() + cursor.execute(count_query) + count_total = dict(cursor.fetchone())["count"] + logger.info( + f"Total Notice of Intent Decision Components data to insert: {count_total}" + ) + + failed_inserts = 0 + successful_inserts_count = 0 + last_decision_component_id = 0 + + tmp_counter = 0 + + with open( + "noi/sql/notice_of_intent_decisions/components/notice_of_intent_decision_components_insert.sql", + "r", + encoding="utf-8", + ) as sql_file: + query = sql_file.read() + + while True: + cursor.execute( + f"""{query} + WHERE oaac.alr_appl_component_id > {last_decision_component_id} ORDER BY oaac.alr_appl_component_id;""" + ) + + rows = cursor.fetchmany(batch_size) + + if not rows: + break + try: + decision_components_to_be_inserted_count = len(rows) + + _insert_notice_of_intent_decision_components( + conn, batch_size, cursor, rows + ) + + successful_inserts_count = ( + successful_inserts_count + + decision_components_to_be_inserted_count + ) + last_decision_component_id = rows[-1]["component_id"] + + logger.info( + f"retrieved/inserted items count: {decision_components_to_be_inserted_count}; total successfully inserted decision components so far {successful_inserts_count}; last inserted alr_appl_component_id: {last_decision_component_id}" + ) + except Exception as err: + logger.exception(err) + conn.rollback() + failed_inserts = count_total - successful_inserts_count + last_decision_component_id = last_decision_component_id + 1 + + logger.info( + f"Finished {etl_name}: total amount of successful inserts {successful_inserts_count}, total failed inserts {failed_inserts}" + ) + + +def _insert_notice_of_intent_decision_components(conn, batch_size, cursor, rows): + query = _get_insert_query() + parsed_data_list = _prepare_oats_alr_applications_data(rows) + + if len(parsed_data_list) > 0: + execute_batch(cursor, query, parsed_data_list, page_size=batch_size) + + conn.commit() + + +def _get_insert_query(): + query = f""" + INSERT INTO alcs.notice_of_intent_decision_component ( + ag_cap, + ag_cap_consultant, + ag_cap_map, + ag_cap_source, + alr_area, + audit_created_by, + end_date, + end_date2, + expiry_date, + notice_of_intent_decision_component_type_code, + notice_of_intent_decision_uuid, + oats_alr_appl_component_id + ) + VALUES ( + %(ag_cap)s, + %(ag_cap_consultant)s, + %(ag_cap_map)s, + %(ag_cap_source)s, + %(alr_area)s, + %(audit_created_by)s, + %(end_date)s, + %(end_date2)s, + %(expiry_date)s, + %(notice_of_intent_decision_component_type_code)s, + %(notice_of_intent_decision_uuid)s, + %(alr_appl_component_id)s + ) + ON CONFLICT DO NOTHING; -- there are no components on prod + """ + return query + + +def _prepare_oats_alr_applications_data(row_data_list): + data_list = [] + for row in row_data_list: + if row.get("alr_change_code", None) in [ + ALRChangeCode.SCH.value, + ALRChangeCode.FILL.value, + ALRChangeCode.EXT.value, + ]: + mapped_row = { + "ag_cap": str(OatsToAlcsAgCap[row["agri_capability_code"]].value) + if row.get("agri_capability_code") + else None, + "ag_cap_consultant": row.get("agri_cap_consultant"), + "ag_cap_map": row.get("agri_cap_map"), + "ag_cap_source": str( + OatsToAlcsAgCapSource[row["capability_source_code"]].value + ) + if row.get("capability_source_code") + else None, + "alr_area": row.get("component_area"), + "audit_created_by": OATS_ETL_USER, + "end_date": add_timezone_and_keep_date_part( + row.get("nonfarm_use_end_date") + ), + "end_date2": add_timezone_and_keep_date_part( + row.get("nonfarm_use_end_date") + ), + "expiry_date": add_timezone_and_keep_date_part( + row.get("decision_expiry_date") + ), + "notice_of_intent_decision_component_type_code": _map_component_type_code( + row + ), + "notice_of_intent_decision_uuid": row.get("decision_uuid"), + "alr_appl_component_id": row.get("component_id"), + } + data_list.append(mapped_row) + + return data_list + + +def _map_component_type_code(row): + alr_change_code = row.get("alr_change_code") + if alr_change_code == ALRChangeCode.SCH.value: + return "PFRS" + + if alr_change_code == ALRChangeCode.EXT.value: + return "ROSO" + + if alr_change_code == ALRChangeCode.FILL.value: + return "POFO" + + return None + + +@inject_conn_pool +def clean_notice_of_intent_decision_components(conn=None): + logger.info("Start notice_of_intent_decision_component cleaning") + with conn.cursor() as cursor: + cursor.execute( + f"DELETE FROM alcs.notice_of_intent_decision_component WHERE audit_created_by = '{OATS_ETL_USER}' AND audit_updated_by is NULL" + ) + logger.info(f"Deleted items count = {cursor.rowcount}") + + conn.commit() diff --git a/bin/migrate-oats-data/noi/noi_decisions/noi_components/notice_of_intent_decision_components_soil_details_update.py b/bin/migrate-oats-data/noi/noi_decisions/noi_components/notice_of_intent_decision_components_soil_details_update.py new file mode 100644 index 0000000000..1b1dd061b4 --- /dev/null +++ b/bin/migrate-oats-data/noi/noi_decisions/noi_components/notice_of_intent_decision_components_soil_details_update.py @@ -0,0 +1,146 @@ +from common import setup_and_get_logger, SoilChangeCode, NO_DATA_IN_OATS +from db import inject_conn_pool +from psycopg2.extras import RealDictCursor, execute_batch + +etl_name = "update_notice_of_intent_decision_component_soil_details" +logger = setup_and_get_logger(etl_name) + + +@inject_conn_pool +def update_notice_of_intent_decision_component_soil_details(conn=None, batch_size=1000): + """ + This function is responsible for updating existing the notice_of_intent_decision_component in ALCS. + + Args: + conn (psycopg2.extensions.connection): PostgreSQL database connection. Provided by the decorator. + batch_size (int): The number of items to process at once. Defaults to BATCH_UPLOAD_SIZE. + """ + + logger.info(f"Start {etl_name}") + with conn.cursor(cursor_factory=RealDictCursor) as cursor: + with open( + "noi/sql/notice_of_intent_decisions/components/notice_of_intent_decision_components_soil_details_update_count.sql", + "r", + encoding="utf-8", + ) as sql_file: + count_query = sql_file.read() + cursor.execute(count_query) + count_total = dict(cursor.fetchone())["count"] + logger.info( + f"Total Notice of Intent Decision Component data to updated: {count_total}" + ) + + failed_updates = 0 + successful_updates_count = 0 + last_component_id = 0 + + with open( + "noi/sql/notice_of_intent_decisions/components/notice_of_intent_decision_components_soil_details_update.sql", + "r", + encoding="utf-8", + ) as sql_file: + query = sql_file.read() + while True: + cursor.execute( + f"""{query} + WHERE noidc.oats_alr_appl_component_id > {last_component_id} ORDER BY noidc.oats_alr_appl_component_id;""" + ) + + rows = cursor.fetchmany(batch_size) + + if not rows: + break + try: + components_to_be_updated_count = len(rows) + + _update_soil_fields(conn, batch_size, cursor, rows) + + successful_updates_count = ( + successful_updates_count + components_to_be_updated_count + ) + last_component_id = dict(rows[-1])["oats_alr_appl_component_id"] + + logger.debug( + f"retrieved/updated items count: {components_to_be_updated_count}; total successfully update notice_of_intent_decision_components so far {successful_updates_count}; last updated oats_alr_appl_component_id: {last_component_id}" + ) + except Exception as err: + logger.exception(err) + conn.rollback() + failed_updates = count_total - successful_updates_count + last_component_id = last_component_id + 1 + + logger.info( + f"Finished {etl_name}: total amount of successful updates {successful_updates_count}, total failed updates {failed_updates}" + ) + + +_soil_fill_query = """ + UPDATE alcs.notice_of_intent_decision_component + SET soil_to_place_volume = %(volume)s + , soil_to_place_area = %(project_area)s + , soil_to_place_maximum_depth = %(depth)s + , soil_to_place_average_depth = %(depth)s + , soil_fill_type_to_place = %(type)s + WHERE alcs.notice_of_intent_decision_component.oats_alr_appl_component_id = %(oats_alr_appl_component_id)s +""" + +_soil_remove_query = """ + UPDATE alcs.notice_of_intent_decision_component + SET soil_to_remove_volume = %(volume)s + , soil_to_remove_area = %(project_area)s + , soil_to_remove_maximum_depth = %(depth)s + , soil_to_remove_average_depth = %(depth)s + , soil_type_removed = %(type)s + WHERE alcs.notice_of_intent_decision_component.oats_alr_appl_component_id = %(oats_alr_appl_component_id)s +""" + + +def _update_soil_fields(conn, batch_size, cursor, rows): + parsed_data_list = _prepare_oats_alr_decision_component_data(rows) + + if len(parsed_data_list[SoilChangeCode.REMOVE.value]) > 0: + execute_batch( + cursor, + _soil_remove_query, + parsed_data_list[SoilChangeCode.REMOVE.value], + page_size=batch_size, + ) + + if len(parsed_data_list[SoilChangeCode.ADD.value]) > 0: + execute_batch( + cursor, + _soil_fill_query, + parsed_data_list[SoilChangeCode.ADD.value], + page_size=batch_size, + ) + + conn.commit() + + +def _prepare_oats_alr_decision_component_data(row_data_list): + data_list = {SoilChangeCode.REMOVE.value: [], SoilChangeCode.ADD.value: []} + for row in row_data_list: + data = map_soil_fields(row) + + if data["soil_change_code"] == SoilChangeCode.ADD.value: + data_list[SoilChangeCode.ADD.value].append(data) + elif data["soil_change_code"] == SoilChangeCode.REMOVE.value: + data_list[SoilChangeCode.REMOVE.value].append(data) + + return data_list + + +def map_soil_fields(data): + soil_type = data.get("material_desc", "") + soil_origin = data.get("material_origin_desc", "") + + if not soil_type and not soil_origin: + data["type"] = NO_DATA_IN_OATS + else: + data["type"] = f"{soil_type} {soil_origin}" + + data["volume"] = data.get("volume", 0) + data["project_area"] = data.get("project_area", 0) + data["depth"] = data.get("depth", 0) + + return data diff --git a/bin/migrate-oats-data/noi/notice_of_intent_migration.py b/bin/migrate-oats-data/noi/notice_of_intent_migration.py index 75c3ad25b9..42448e8f66 100644 --- a/bin/migrate-oats-data/noi/notice_of_intent_migration.py +++ b/bin/migrate-oats-data/noi/notice_of_intent_migration.py @@ -57,6 +57,7 @@ init_notice_of_intent_decisions, clean_notice_of_intent_decisions, ) + from .noi_decisions.noi_modifications import ( init_notice_of_intent_modifications, clean_notice_of_intent_modifications, @@ -65,6 +66,12 @@ unlink_etl_modifications, ) +from .noi_decisions.noi_components import ( + init_notice_of_intent_decision_components, + clean_notice_of_intent_decision_components, + update_notice_of_intent_decision_component_soil_details, +) + def init_notice_of_intent(batch_size): init_notice_of_intents(batch_size=batch_size) @@ -92,9 +99,12 @@ def process_notice_of_intent_decisions(batch_size): update_notice_of_intent_modifications(batch_size) init_notice_of_intent_modifications(batch_size) link_notice_of_intent_modifications(batch_size) + init_notice_of_intent_decision_components(batch_size) + update_notice_of_intent_decision_component_soil_details(batch_size) def clean_notice_of_intent_decision(): + clean_notice_of_intent_decision_components() unlink_etl_modifications() clean_notice_of_intent_modifications() clean_notice_of_intent_decisions() diff --git a/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_soil_fields.py b/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_soil_fields.py index 3050676071..2ebadb91de 100644 --- a/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_soil_fields.py +++ b/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_soil_fields.py @@ -149,7 +149,7 @@ def _prepare_oats_alr_applications_data(row_data_list): def map_soil_fields(data): - soil_type = data.get("material_description", "") + soil_type = data.get("material_desc", "") soil_origin = data.get("material_origin_desc", "") if not soil_type and not soil_origin: diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_decisions/components/notice_of_intent_decision_components_insert.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_decisions/components/notice_of_intent_decision_components_insert.sql new file mode 100644 index 0000000000..6c018f0a95 --- /dev/null +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_decisions/components/notice_of_intent_decision_components_insert.sql @@ -0,0 +1,14 @@ +SELECT noid."uuid" AS decision_uuid, + oaac.alr_appl_component_id AS component_id, + oaac.agri_capability_code, + oaac.agri_cap_consultant, + oaac.agri_cap_map, + oaac.capability_source_code, + oaac.component_area, + oaac.rsdntl_use_end_date, + oaac.nonfarm_use_end_date, + oaac.decision_expiry_date, + oaac.alr_change_code +FROM oats.oats_alr_appl_decisions oaad + JOIN oats.oats_alr_appl_components oaac ON oaac.alr_appl_decision_id = oaad.alr_appl_decision_id + JOIN alcs.notice_of_intent_decision noid ON noid.oats_alr_appl_decision_id = oaad.alr_appl_decision_id -- ONLY GET components OF decisions that imported INTO ALCS \ No newline at end of file diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_decisions/components/notice_of_intent_decision_components_insert_count.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_decisions/components/notice_of_intent_decision_components_insert_count.sql new file mode 100644 index 0000000000..c792d984a3 --- /dev/null +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_decisions/components/notice_of_intent_decision_components_insert_count.sql @@ -0,0 +1,4 @@ +SELECT count(*) +FROM oats.oats_alr_appl_decisions oaad + JOIN oats.oats_alr_appl_components oaac ON oaac.alr_appl_decision_id = oaad.alr_appl_decision_id + JOIN alcs.notice_of_intent_decision noid ON noid.oats_alr_appl_decision_id = oaad.alr_appl_decision_id -- ONLY GET components OF decisions that imported INTO ALCS \ No newline at end of file diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_decisions/components/notice_of_intent_decision_components_soil_details_update.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_decisions/components/notice_of_intent_decision_components_soil_details_update.sql new file mode 100644 index 0000000000..14e006ac62 --- /dev/null +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_decisions/components/notice_of_intent_decision_components_soil_details_update.sql @@ -0,0 +1,11 @@ +SELECT noidc.oats_alr_appl_component_id, + osce.soil_change_code, + osce.material_desc, + osce.material_origin_desc, + osce.volume, + osce.project_area, + osce."depth", + osce.project_duration, + osce.soil_change_element_id +FROM oats.oats_soil_change_elements osce + JOIN alcs.notice_of_intent_decision_component noidc ON noidc.oats_alr_appl_component_id = osce.alr_appl_component_id \ No newline at end of file diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_decisions/components/notice_of_intent_decision_components_soil_details_update_count.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_decisions/components/notice_of_intent_decision_components_soil_details_update_count.sql new file mode 100644 index 0000000000..ee722dd132 --- /dev/null +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_decisions/components/notice_of_intent_decision_components_soil_details_update_count.sql @@ -0,0 +1,3 @@ +SELECT count(*) +FROM oats.oats_soil_change_elements osce + JOIN alcs.notice_of_intent_decision_component noidc ON noidc.oats_alr_appl_component_id = osce.alr_appl_component_id \ No newline at end of file diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.entity.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.entity.ts index 33ef8e7d1d..b03d06ed22 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.entity.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.entity.ts @@ -1,12 +1,5 @@ import { AutoMap } from 'automapper-classes'; -import { - Column, - Entity, - Index, - ManyToMany, - ManyToOne, - OneToMany, -} from 'typeorm'; +import { Column, Entity, ManyToMany, ManyToOne, OneToMany } from 'typeorm'; import { Base } from '../../../../../common/entities/base.entity'; import { NaruSubtype } from '../../../../../portal/application-submission/naru-subtype/naru-subtype.entity'; import { ColumnNumericTransformer } from '../../../../../utils/column-numeric-transform'; @@ -17,10 +10,6 @@ import { ApplicationDecision } from '../../../application-decision.entity'; import { ApplicationDecisionComponentType } from './application-decision-component-type.entity'; @Entity() -@Index(['applicationDecisionComponentTypeCode', 'applicationDecisionUuid'], { - unique: true, - where: '"audit_deleted_date_at" is null', -}) export class ApplicationDecisionComponent extends Base { constructor(data?: Partial<ApplicationDecisionComponent>) { super(); diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-component/notice-of-intent-decision-component.entity.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-component/notice-of-intent-decision-component.entity.ts index 2788f1d2f9..746f8afe8a 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-component/notice-of-intent-decision-component.entity.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-component/notice-of-intent-decision-component.entity.ts @@ -194,4 +194,13 @@ export class NoticeOfIntentDecisionComponent extends Base { (condition) => condition.components, ) conditions: NoticeOfIntentDecisionCondition[]; + + @Column({ + select: false, + nullable: true, + type: 'int8', + comment: + 'This column is NOT related to any functionality in ALCS. It is only used for ETL and backtracking of imported data from OATS. It links oats.oats_alr_appl_components to alcs.notice_of_intent_decision_component.', + }) + oatsAlrApplComponentId: number; } diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1702500300592-remove_component_type_constraint.ts b/services/apps/alcs/src/providers/typeorm/migrations/1702500300592-remove_component_type_constraint.ts new file mode 100644 index 0000000000..da488e6f07 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1702500300592-remove_component_type_constraint.ts @@ -0,0 +1,19 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class RemoveComponentTypeConstraint1702500300592 + implements MigrationInterface +{ + name = 'RemoveComponentTypeConstraint1702500300592'; + + public async up(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `DROP INDEX IF EXISTS "alcs"."IDX_d300a86af8c22c1d9a55fbc28b"`, + ); + } + + public async down(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `CREATE UNIQUE INDEX "IDX_d300a86af8c22c1d9a55fbc28b" ON "alcs"."application_decision_component" ("application_decision_component_type_code", "application_decision_uuid") WHERE (audit_deleted_date_at IS NULL)`, + ); + } +} diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1703182504703-add_oats_component_id_into_noi_decision_component.ts b/services/apps/alcs/src/providers/typeorm/migrations/1703182504703-add_oats_component_id_into_noi_decision_component.ts new file mode 100644 index 0000000000..cfcb8c3f26 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1703182504703-add_oats_component_id_into_noi_decision_component.ts @@ -0,0 +1,25 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class AddOatsComponentIdIntoNoiDecisionComponent1703182504703 + implements MigrationInterface +{ + name = 'AddOatsComponentIdIntoNoiDecisionComponent1703182504703'; + + public async up(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_decision_component" ADD "oats_alr_appl_component_id" bigint`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."notice_of_intent_decision_component"."oats_alr_appl_component_id" IS 'This column is NOT related to any functionality in ALCS. It is only used for ETL and backtracking of imported data from OATS. It links oats.oats_alr_appl_components to alcs.notice_of_intent_decision_component.'`, + ); + } + + public async down(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."notice_of_intent_decision_component"."oats_alr_appl_component_id" IS 'This column is NOT related to any functionality in ALCS. It is only used for ETL and backtracking of imported data from OATS. It links oats.oats_alr_appl_components to alcs.notice_of_intent_decision_component.'`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_decision_component" DROP COLUMN "oats_alr_appl_component_id"`, + ); + } +} From f4f625d1fbe4931016ff4a6b4cf0aeb238e13366 Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Wed, 27 Dec 2023 09:01:04 -0800 Subject: [PATCH 833/954] fixes --- .../edit-submission/proposal/pofo/pofo-proposal.component.ts | 3 ++- .../edit-submission/proposal/roso/roso-proposal.component.ts | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pofo/pofo-proposal.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pofo/pofo-proposal.component.ts index 724d446beb..27e2cf0784 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pofo/pofo-proposal.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pofo/pofo-proposal.component.ts @@ -96,7 +96,7 @@ export class PofoProposalComponent extends FilesStepComponent implements OnInit, followUpIds: noiSubmission.soilFollowUpIDs, purpose: noiSubmission.purpose, soilFillTypeToPlace: noiSubmission.soilFillTypeToPlace, - projectDuration: noiSubmission.soilProjectDuration ?? null, + projectDuration: noiSubmission.soilProjectDuration, isAreaWideFilling: formatBooleanToString(noiSubmission.soilIsAreaWideFilling), }); if (this.showErrors) { @@ -153,6 +153,7 @@ export class PofoProposalComponent extends FilesStepComponent implements OnInit, soilAlreadyPlacedVolume: this.fillAlreadyPlacedTableData?.volume ?? null, soilAlreadyPlacedArea: this.fillAlreadyPlacedTableData?.area ?? null, soilAlreadyPlacedMaximumDepth: this.fillAlreadyPlacedTableData?.maximumDepth ?? null, + soilAlreadyPlacedAverageDepth: this.fillAlreadyPlacedTableData?.averageDepth ?? null, soilIsAreaWideFilling: parseStringToBoolean(isAreaWideFilling), }; diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.ts index bbc916447f..47d43e6330 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.ts @@ -109,7 +109,7 @@ export class RosoProposalComponent extends FilesStepComponent implements OnInit, followUpIds: noiSubmission.soilFollowUpIDs, purpose: noiSubmission.purpose, soilTypeRemoved: noiSubmission.soilTypeRemoved, - projectDuration: noiSubmission.soilProjectDuration ?? null, + projectDuration: noiSubmission.soilProjectDuration, isExtractionOrMining: formatBooleanToString(noiSubmission.soilIsExtractionOrMining), hasSubmittedNotice: formatBooleanToString(noiSubmission.soilHasSubmittedNotice), }); From 1a1401d4e3d6baa92e07063a95c2b1708870ba37 Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Wed, 27 Dec 2023 11:37:26 -0800 Subject: [PATCH 834/954] Make save and step buttons sticky --- .../edit-submission/edit-submission.component.scss | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.component.scss b/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.component.scss index 8125565891..fa18e59115 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.component.scss +++ b/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.component.scss @@ -78,7 +78,7 @@ display: grid; grid-template-columns: 1fr; grid-row-gap: rem(24); - margin-bottom: rem(32); + margin-bottom: rem(16); } .step-documents { @@ -208,11 +208,16 @@ } .button-container { + position: sticky; + bottom: 0; margin-top: rem(40); - margin-bottom: rem(24); + background-color: colors.$white; display: flex; + padding: rem(16) 0; flex-direction: column-reverse; justify-content: space-between; + z-index: 2; + box-shadow: -3px 0 colors.$white, 3px 0 colors.$white; @media screen and (min-width: $tabletBreakpoint) { flex-direction: row; From d1d2d37632fc44b39b39a0c237df773296b49eb2 Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Wed, 27 Dec 2023 12:11:00 -0800 Subject: [PATCH 835/954] Remove redundant max file size notices --- .../other-attachments/other-attachments.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/portal-frontend/src/app/features/notifications/edit-submission/other-attachments/other-attachments.component.html b/portal-frontend/src/app/features/notifications/edit-submission/other-attachments/other-attachments.component.html index 648f52492f..0d30b120a3 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/other-attachments/other-attachments.component.html +++ b/portal-frontend/src/app/features/notifications/edit-submission/other-attachments/other-attachments.component.html @@ -6,7 +6,7 @@ <h2>Optional Attachments</h2> </p> </div> <section> - <span class="subheading2">Upload Optional Attachments (Max. 100 MB per attachment)</span> + <span class="subheading2">Upload Optional Attachments</span> <div class="uploader"> <app-file-drag-drop (uploadFiles)="attachDocument($event)" [showVirusError]="showVirusError"></app-file-drag-drop> </div> From 32189543263409f6172f423d835112fe25460b2c Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Wed, 27 Dec 2023 12:49:31 -0800 Subject: [PATCH 836/954] Remove space to align with others --- .../edit-submission/proposal/proposal.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/portal-frontend/src/app/features/notifications/edit-submission/proposal/proposal.component.html b/portal-frontend/src/app/features/notifications/edit-submission/proposal/proposal.component.html index 803a2e7840..bda82ea373 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/proposal/proposal.component.html +++ b/portal-frontend/src/app/features/notifications/edit-submission/proposal/proposal.component.html @@ -1,6 +1,6 @@ <div class="step-description"> <h2>Purpose of SRW</h2> - <p>* All fields are required unless stated optional or disabled.</p> + <p>*All fields are required unless stated optional or disabled.</p> </div> <app-warning-banner> The information entered below will be reflected in the automatically generated notification response and must match From 154cd0457f728716052619c3446555d58d6371cb Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Wed, 27 Dec 2023 13:14:06 -0800 Subject: [PATCH 837/954] Only show edit button when parcels > 1 - Review step --- .../notification-details/parcel/parcel.component.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/portal-frontend/src/app/features/notifications/notification-details/parcel/parcel.component.html b/portal-frontend/src/app/features/notifications/notification-details/parcel/parcel.component.html index f3519092e4..7961173c62 100644 --- a/portal-frontend/src/app/features/notifications/notification-details/parcel/parcel.component.html +++ b/portal-frontend/src/app/features/notifications/notification-details/parcel/parcel.component.html @@ -5,7 +5,7 @@ <h3 class="flex-item">1. Identify Parcel(s) Under The Statutory Right of Way</h3 <h4>Parcel {{ parcelInd + 1 }}</h4> <div> <button - *ngIf="showEdit" + *ngIf="showEdit && parcels.length > 1" class="mobile-hidden" mat-flat-button color="accent" @@ -14,7 +14,7 @@ <h4>Parcel {{ parcelInd + 1 }}</h4> Edit Parcel {{ parcelInd + 1 }} </button> <button - *ngIf="showEdit" + *ngIf="showEdit && parcels.length > 1" class="tablet-hidden" mat-icon-button color="accent" From 350e60c60d685f5f966606a29cb52058463a4931 Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Wed, 27 Dec 2023 13:28:27 -0800 Subject: [PATCH 838/954] Show units for total area of SR - Review stepW --- .../proposal-details/proposal-details.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/portal-frontend/src/app/features/notifications/notification-details/proposal-details/proposal-details.component.html b/portal-frontend/src/app/features/notifications/notification-details/proposal-details/proposal-details.component.html index 3d77b4f75e..f1b7f0f1f3 100644 --- a/portal-frontend/src/app/features/notifications/notification-details/proposal-details/proposal-details.component.html +++ b/portal-frontend/src/app/features/notifications/notification-details/proposal-details/proposal-details.component.html @@ -13,7 +13,7 @@ <div class="subheading2 grid-1">Total area of the SRW</div> <div class="grid-double"> - {{ _notificationSubmission.totalArea }} + {{ _notificationSubmission.totalArea }} <ng-container *ngIf="_notificationSubmission.totalArea">ha</ng-container> <app-no-data [showRequired]="showErrors" *ngIf="!_notificationSubmission.totalArea"></app-no-data> </div> From 1aa5a05058d669668929a6119bdc7b2567ee8b12 Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Wed, 27 Dec 2023 13:48:53 -0800 Subject: [PATCH 839/954] Expand submit confirmation text --- .../submit-confirmation-dialog.component.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/portal-frontend/src/app/features/notifications/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.html b/portal-frontend/src/app/features/notifications/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.html index 865e3302a1..4c04abae1d 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.html +++ b/portal-frontend/src/app/features/notifications/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.html @@ -20,9 +20,9 @@ <h4>Submit Notification of SRW</h4> best of my/our knowledge, true and correct. </mat-checkbox> <mat-checkbox #checkbox4 color="primary" class="checkbox"> - I/we understand that the Agricultural Land Commission will take the steps necessary to confirm the - accuracy of the information and documents provided. This information will be available for review by any member of - the public. + I/we understand that the Agricultural Land Commission will take the steps necessary to confirm the accuracy of the + information and documents provided. This information, excluding phone numbers and emails, will be available for + review by any member of the public once received by the ALC. </mat-checkbox> </div> <p> From 2b95ab6ea644db60aedb6b73209288a7c177ae95 Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Wed, 27 Dec 2023 13:49:49 -0800 Subject: [PATCH 840/954] Add contact link to submit confirmation --- .../submit-confirmation-dialog.component.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/portal-frontend/src/app/features/notifications/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.html b/portal-frontend/src/app/features/notifications/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.html index 4c04abae1d..00b99ecd1d 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.html +++ b/portal-frontend/src/app/features/notifications/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.html @@ -26,8 +26,8 @@ <h4>Submit Notification of SRW</h4> </mat-checkbox> </div> <p> - If you have any questions about the collection or use of this information, please contact the Agricultural Land - Commission. + If you have any questions about the collection or use of this information, please + <a target="_blank" href="https://www.alc.gov.bc.ca/contact/">contact the Agricultural Land Commission.</a> </p> <div> <div class="step-controls"> From d9edfec17b11542b2d6c64488bddbb1c8de67d26 Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Wed, 27 Dec 2023 13:50:08 -0800 Subject: [PATCH 841/954] Fix submit confirmation mobile button layout --- .../submit-confirmation-dialog.component.scss | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/portal-frontend/src/app/features/notifications/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.scss b/portal-frontend/src/app/features/notifications/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.scss index fa173368db..8c7b956d55 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.scss +++ b/portal-frontend/src/app/features/notifications/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.scss @@ -11,9 +11,19 @@ p { .step-controls { display: flex; - justify-content: flex-end; + flex-direction: column-reverse; - button:not(:last-child) { - margin-right: rem(16) !important; + button { + width: 100%; + margin-top: rem(12) !important; + } + + @media screen and (min-width: $tabletBreakpoint) { + flex-direction: row; + justify-content: space-between; + + button { + width: unset; + } } } From b984bf8ccf273b24171033dbd98ec4bd52c1caf1 Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Wed, 27 Dec 2023 15:31:52 -0800 Subject: [PATCH 842/954] Add link to proof of serving notice template --- .../proposal/tur-proposal/tur-proposal.component.html | 1 + .../proposal/tur-proposal/tur-proposal.component.scss | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/tur-proposal/tur-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/tur-proposal/tur-proposal.component.html index 9dcfa9d1ad..6bec5e33ec 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/tur-proposal/tur-proposal.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/tur-proposal/tur-proposal.component.html @@ -165,6 +165,7 @@ <h6>Documents needed for this step:</h6> <div class="section"> <mat-label class="subheading2" for="proof-of-serving">Proof of Serving Notice</mat-label> <div class="subtext">Proof that all affected property owners with land in the ALR were notified as required.</div> + <div class="subtext template-link-container">Visit the <a href="">FIXME:ALC website</a> for more information</div> <app-file-drag-drop id="proof-of-serving" [uploadedFiles]="servingNotice" diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/tur-proposal/tur-proposal.component.scss b/portal-frontend/src/app/features/applications/edit-submission/proposal/tur-proposal/tur-proposal.component.scss index fd01b5a150..d270b0b476 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/tur-proposal/tur-proposal.component.scss +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/tur-proposal/tur-proposal.component.scss @@ -1,4 +1,5 @@ @use '../../../../../../styles/functions' as *; +@use '../../../../../../styles/colors'; section { margin-top: rem(36); @@ -7,3 +8,7 @@ section { .affected-area { margin-top: rem(36); } + +.template-link-container { + background-color: colors.$secondary-color-light; +} From 6cc8b525917cf883b6d4bbe42ed57106b9ae5580 Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Wed, 27 Dec 2023 15:47:09 -0800 Subject: [PATCH 843/954] Change/add label/sublabel for proposal map field --- .../tur-details/tur-details.component.html | 2 +- .../tur-details/tur-details.component.html | 14 ++++---------- .../tur-proposal/tur-proposal.component.html | 3 ++- .../tur-details/tur-details.component.html | 2 +- 4 files changed, 8 insertions(+), 13 deletions(-) diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/tur-details/tur-details.component.html b/alcs-frontend/src/app/features/application/applicant-info/application-details/tur-details/tur-details.component.html index f71a0bd172..c934fe0d68 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/application-details/tur-details/tur-details.component.html +++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/tur-details/tur-details.component.html @@ -30,7 +30,7 @@ {{ notice.fileName }} </a> </div> - <div class="subheading2 grid-1">Proposal Map / Sketch Plan</div> + <div class="subheading2 grid-1">Proposal Map / Site Plan</div> <div class="grid-double"> <a *ngFor="let file of proposalMap" (click)="openFile(file)"> {{ file.fileName }} diff --git a/portal-frontend/src/app/features/applications/application-details/tur-details/tur-details.component.html b/portal-frontend/src/app/features/applications/application-details/tur-details/tur-details.component.html index 0a08355179..5e7f5840e5 100644 --- a/portal-frontend/src/app/features/applications/application-details/tur-details/tur-details.component.html +++ b/portal-frontend/src/app/features/applications/application-details/tur-details/tur-details.component.html @@ -1,7 +1,5 @@ <div *ngIf="_applicationSubmission" class="review-table"> - <div class="subheading2 grid-1"> - What is the purpose of the proposal? - </div> + <div class="subheading2 grid-1">What is the purpose of the proposal?</div> <div class="grid-double"> {{ _applicationSubmission.purpose }} <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.purpose"></app-no-data> @@ -21,16 +19,12 @@ {{ _applicationSubmission.turReduceNegativeImpacts }} <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.turReduceNegativeImpacts"></app-no-data> </div> - <div class="subheading2 grid-1"> - Could this proposal be accommodated on lands outside of the ALR? - </div> + <div class="subheading2 grid-1">Could this proposal be accommodated on lands outside of the ALR?</div> <div class="grid-double"> {{ _applicationSubmission.turOutsideLands }} <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.turOutsideLands"></app-no-data> </div> - <div class="subheading2 grid-1"> - Total area of corridor - </div> + <div class="subheading2 grid-1">Total area of corridor</div> <div class="grid-double"> <span *ngIf="_applicationSubmission.turTotalCorridorArea !== null">{{ _applicationSubmission.turTotalCorridorArea @@ -44,7 +38,7 @@ </a> <app-no-data [showRequired]="showErrors" *ngIf="servingNotice.length === 0"></app-no-data> </div> - <div class="subheading2 grid-1">Proposal Map / Sketch Plan</div> + <div class="subheading2 grid-1">Proposal Map / Site Plan</div> <div class="grid-double"> <a *ngFor="let file of proposalMap" (click)="openFile(file.uuid)"> {{ file.fileName }} diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/tur-proposal/tur-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/tur-proposal/tur-proposal.component.html index 6bec5e33ec..4a8b3e3b96 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/tur-proposal/tur-proposal.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/tur-proposal/tur-proposal.component.html @@ -178,7 +178,8 @@ <h6>Documents needed for this step:</h6> ></app-file-drag-drop> </div> <div class="section"> - <mat-label class="subheading2" for="proposal-map">Proposal Map / Sketch Plan</mat-label> + <mat-label class="subheading2" for="proposal-map">Proposal Map / Site Plan</mat-label> + <div class="subtext">A visual representation of your proposal.</div> <app-file-drag-drop id="proposal-map" [uploadedFiles]="proposalMap" diff --git a/portal-frontend/src/app/features/public/application/submission/tur-details/tur-details.component.html b/portal-frontend/src/app/features/public/application/submission/tur-details/tur-details.component.html index 5eb61b005b..3e3449e326 100644 --- a/portal-frontend/src/app/features/public/application/submission/tur-details/tur-details.component.html +++ b/portal-frontend/src/app/features/public/application/submission/tur-details/tur-details.component.html @@ -31,7 +31,7 @@ }}</span> <app-no-data *ngIf="applicationSubmission.turTotalCorridorArea === null"></app-no-data> </div> - <div class="subheading2 grid-1">Proposal Map / Sketch Plan</div> + <div class="subheading2 grid-1">Proposal Map / Site Plan</div> <div class="grid-double"> <a *ngFor="let file of proposalMap" (click)="openFile(file.uuid)"> {{ file.fileName }} From b297716dbb84d5fc73086c03a2104760caec42e8 Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Thu, 28 Dec 2023 09:22:21 -0800 Subject: [PATCH 844/954] fixing ui inconsistencies --- .../naru-details/naru-details.component.html | 69 +++++---- .../naru-details/naru-details.component.scss | 11 +- .../nfu-details/nfu-details.component.html | 63 ++++---- .../nfu-details/nfu-details.component.scss | 18 +++ .../pofo-details/pofo-details.component.html | 138 +++++++++--------- .../pofo-details/pofo-details.component.scss | 18 +++ .../roso-details/roso-details.component.html | 137 +++++++++-------- .../roso-details/roso-details.component.scss | 18 +++ .../pofo-details/pofo-details.component.html | 131 +++++++++-------- .../pofo-details/pofo-details.component.scss | 18 +++ .../roso-details/roso-details.component.html | 134 +++++++++-------- .../roso-details/roso-details.component.scss | 18 +++ .../naru-details/naru-details.component.html | 37 +++++ .../naru-details/naru-details.component.scss | 25 +++- .../nfu-details/nfu-details.component.html | 65 +++++---- .../pofo-details/pofo-details.component.html | 127 +++++++++------- .../pofo-details/pofo-details.component.scss | 25 +++- .../roso-details/roso-details.component.html | 129 ++++++++-------- .../roso-details/roso-details.component.scss | 25 +++- .../pofo-details/pofo-details.component.html | 127 +++++++++------- .../pofo-details/pofo-details.component.scss | 24 +++ .../roso-details/roso-details.component.html | 129 +++++++++------- .../roso-details/roso-details.component.scss | 24 +++ 23 files changed, 925 insertions(+), 585 deletions(-) diff --git a/portal-frontend/src/app/features/applications/application-details/naru-details/naru-details.component.html b/portal-frontend/src/app/features/applications/application-details/naru-details/naru-details.component.html index 91988d357e..7996e4cb36 100644 --- a/portal-frontend/src/app/features/applications/application-details/naru-details/naru-details.component.html +++ b/portal-frontend/src/app/features/applications/application-details/naru-details/naru-details.component.html @@ -183,38 +183,43 @@ ></app-no-data> </div> - <div class="grid-1"></div> - <div class="subheading2 grid-double">Fill to be Placed</div> - - <div class="subheading2 grid-1">Volume</div> - <div class="grid-double"> - {{ _applicationSubmission.naruToPlaceVolume }} - <span *ngIf="_applicationSubmission.naruToPlaceVolume !== null">m<sup>3</sup></span> - <app-no-data [showRequired]="showErrors" *ngIf="_applicationSubmission.naruToPlaceVolume === null"></app-no-data> - </div> - <div class="subheading2 grid-1">Area</div> - <div class="grid-double"> - {{ _applicationSubmission.naruToPlaceArea }} - <span *ngIf="_applicationSubmission.naruToPlaceArea !== null">m<sup>2</sup></span> - <app-no-data [showRequired]="showErrors" *ngIf="_applicationSubmission.naruToPlaceArea === null"></app-no-data> - </div> - <div class="subheading2 grid-1">Maximum Depth</div> - <div class="grid-double"> - {{ _applicationSubmission.naruToPlaceMaximumDepth }} - <span *ngIf="_applicationSubmission.naruToPlaceMaximumDepth !== null">m</span> - <app-no-data - [showRequired]="showErrors" - *ngIf="_applicationSubmission.naruToPlaceMaximumDepth === null" - ></app-no-data> - </div> - <div class="subheading2 grid-1">Average Depth</div> - <div class="grid-double"> - {{ _applicationSubmission.naruToPlaceAverageDepth }} - <span *ngIf="_applicationSubmission.naruToPlaceAverageDepth !== null">m</span> - <app-no-data - [showRequired]="showErrors" - *ngIf="_applicationSubmission.naruToPlaceAverageDepth === null" - ></app-no-data> + <div class="full-width soil-table"> + <div></div> + <div class="subheading2">Fill to be Placed</div> + + <div class="subheading2">Volume</div> + <div> + {{ _applicationSubmission.naruToPlaceVolume }} + <span *ngIf="_applicationSubmission.naruToPlaceVolume !== null">m<sup>3</sup></span> + <app-no-data [showRequired]="showErrors" *ngIf="_applicationSubmission.naruToPlaceVolume === null"></app-no-data> + </div> + + <div class="subheading2">Area</div> + <div> + {{ _applicationSubmission.naruToPlaceArea }} + <span *ngIf="_applicationSubmission.naruToPlaceArea !== null">m<sup>2</sup></span> + <app-no-data [showRequired]="showErrors" *ngIf="_applicationSubmission.naruToPlaceArea === null"></app-no-data> + </div> + + <div class="subheading2">Maximum Depth</div> + <div> + {{ _applicationSubmission.naruToPlaceMaximumDepth }} + <span *ngIf="_applicationSubmission.naruToPlaceMaximumDepth !== null">m</span> + <app-no-data + [showRequired]="showErrors" + *ngIf="_applicationSubmission.naruToPlaceMaximumDepth === null" + ></app-no-data> + </div> + + <div class="subheading2">Average Depth</div> + <div> + {{ _applicationSubmission.naruToPlaceAverageDepth }} + <span *ngIf="_applicationSubmission.naruToPlaceAverageDepth !== null">m</span> + <app-no-data + [showRequired]="showErrors" + *ngIf="_applicationSubmission.naruToPlaceAverageDepth === null" + ></app-no-data> + </div> </div> </ng-container> diff --git a/portal-frontend/src/app/features/applications/application-details/naru-details/naru-details.component.scss b/portal-frontend/src/app/features/applications/application-details/naru-details/naru-details.component.scss index 36aafed7e7..beea863aef 100644 --- a/portal-frontend/src/app/features/applications/application-details/naru-details/naru-details.component.scss +++ b/portal-frontend/src/app/features/applications/application-details/naru-details/naru-details.component.scss @@ -5,19 +5,14 @@ overflow-x: auto; grid-column-gap: rem(36); grid-row-gap: rem(12); - grid-template-columns: max-content max-content max-content; + grid-template-columns: max-content max-content; @media screen and (min-width: $tabletBreakpoint) { - grid-template-columns: 0.55fr 1fr 1fr; + grid-template-columns: 0.55fr 1fr; } @media screen and (min-width: $midBreakpoint) { - grid-template-columns: 0.95fr 1fr 2fr; + grid-template-columns: 0.95fr 1fr; grid-column-gap: rem(16); } - - .spacer-row { - grid-column: 1/4; - height: rem(16); - } } diff --git a/portal-frontend/src/app/features/applications/application-details/nfu-details/nfu-details.component.html b/portal-frontend/src/app/features/applications/application-details/nfu-details/nfu-details.component.html index a1994a03c5..fd7b90879c 100644 --- a/portal-frontend/src/app/features/applications/application-details/nfu-details/nfu-details.component.html +++ b/portal-frontend/src/app/features/applications/application-details/nfu-details/nfu-details.component.html @@ -72,32 +72,43 @@ <h4>Soil and Fill Components</h4> ></app-no-data> </div> - <div class="grid-1"></div> - <div class="subheading2 grid-double">Fill to be Placed</div> - - <div class="subheading2 grid-1">Volume</div> - <div class="grid-double"> - {{ applicationSubmission.nfuFillVolume }} - <span *ngIf="applicationSubmission.nfuFillVolume !== null">m<sup>3</sup></span> - <app-no-data [showRequired]="showErrors" *ngIf="applicationSubmission.nfuFillVolume === null"></app-no-data> - </div> - <div class="subheading2 grid-1">Area=</div> - <div class="grid-double"> - {{ applicationSubmission.nfuTotalFillArea }} - <span *ngIf="applicationSubmission.nfuTotalFillArea !== null">m<sup>2</sup></span> - <app-no-data [showRequired]="showErrors" *ngIf="applicationSubmission.nfuTotalFillArea === null"></app-no-data> - </div> - <div class="subheading2 grid-1">Maximum Depth</div> - <div class="grid-double"> - {{ applicationSubmission.nfuMaxFillDepth }} - <span *ngIf="applicationSubmission.nfuMaxFillDepth !== null">m</span> - <app-no-data [showRequired]="showErrors" *ngIf="applicationSubmission.nfuMaxFillDepth === null"></app-no-data> - </div> - <div class="subheading2 grid-1">Average Depth</div> - <div class="grid-double"> - {{ applicationSubmission.nfuAverageFillDepth }} - <span *ngIf="applicationSubmission.nfuAverageFillDepth !== null">m</span> - <app-no-data [showRequired]="showErrors" *ngIf="applicationSubmission.nfuAverageFillDepth === null"></app-no-data> + <div class="full-width soil-table"> + <div></div> + <div class="subheading2">Fill to be Placed</div> + + <div class="subheading2">Volume</div> + <div> + {{ applicationSubmission.nfuFillVolume }} + <span *ngIf="applicationSubmission.nfuFillVolume !== null">m<sup>3</sup></span> + <app-no-data [showRequired]="showErrors" *ngIf="applicationSubmission.nfuFillVolume === null"></app-no-data> + </div> + + <div class="subheading2">Area</div> + <div> + {{ applicationSubmission.nfuTotalFillArea }} + <span *ngIf="applicationSubmission.nfuTotalFillArea !== null">m<sup>2</sup></span> + <app-no-data [showRequired]="showErrors" *ngIf="applicationSubmission.nfuTotalFillArea === null"></app-no-data> + </div> + + <div class="subheading2">Maximum Depth</div> + <div> + {{ applicationSubmission.nfuMaxFillDepth }} + <span *ngIf="applicationSubmission.nfuMaxFillDepth !== null">m</span> + <app-no-data + [showRequired]="showErrors" + *ngIf="applicationSubmission.nfuMaxFillDepth === null" + ></app-no-data> + </div> + + <div class="subheading2">Average Depth</div> + <div> + {{ applicationSubmission.nfuAverageFillDepth }} + <span *ngIf="applicationSubmission.nfuAverageFillDepth !== null">m</span> + <app-no-data + [showRequired]="showErrors" + *ngIf="applicationSubmission.nfuAverageFillDepth === null" + ></app-no-data> + </div> </div> </ng-container> <div *ngIf="showEdit" class="edit-button"> diff --git a/portal-frontend/src/app/features/applications/application-details/nfu-details/nfu-details.component.scss b/portal-frontend/src/app/features/applications/application-details/nfu-details/nfu-details.component.scss index e69de29bb2..beea863aef 100644 --- a/portal-frontend/src/app/features/applications/application-details/nfu-details/nfu-details.component.scss +++ b/portal-frontend/src/app/features/applications/application-details/nfu-details/nfu-details.component.scss @@ -0,0 +1,18 @@ +@use '../../../../../styles/functions' as *; + +.soil-table { + display: grid; + overflow-x: auto; + grid-column-gap: rem(36); + grid-row-gap: rem(12); + grid-template-columns: max-content max-content; + + @media screen and (min-width: $tabletBreakpoint) { + grid-template-columns: 0.55fr 1fr; + } + + @media screen and (min-width: $midBreakpoint) { + grid-template-columns: 0.95fr 1fr; + grid-column-gap: rem(16); + } +} diff --git a/portal-frontend/src/app/features/applications/application-details/pofo-details/pofo-details.component.html b/portal-frontend/src/app/features/applications/application-details/pofo-details/pofo-details.component.html index e6c6146782..e011536922 100644 --- a/portal-frontend/src/app/features/applications/application-details/pofo-details/pofo-details.component.html +++ b/portal-frontend/src/app/features/applications/application-details/pofo-details/pofo-details.component.html @@ -40,78 +40,86 @@ ></app-no-data> </div> - <div class="grid-1"></div> - <div class="subheading2 grid-double">Fill to be Placed</div> - - <div class="subheading2 grid-1">Volume</div> - <div class="grid-double"> - {{ _applicationSubmission.soilToPlaceVolume }} - <span *ngIf="_applicationSubmission.soilToPlaceVolume">m<sup>3</sup></span> - <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.soilToPlaceVolume"></app-no-data> - </div> - - <div class="subheading2 grid-1">Area</div> - <div class="grid-double"> - {{ _applicationSubmission.soilToPlaceArea }} - <span *ngIf="_applicationSubmission.soilToPlaceArea">m<sup>2</sup></span> - <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.soilToPlaceArea"></app-no-data> - </div> + <div class="full-width soil-table"> + <div></div> + <div class="subheading2">Fill to be Placed</div> + + <div class="subheading2">Volume</div> + <div> + {{ _applicationSubmission.soilToPlaceVolume }} + <span *ngIf="_applicationSubmission.soilToPlaceVolume !== null">m<sup>3</sup></span> + <app-no-data [showRequired]="showErrors" *ngIf="_applicationSubmission.soilToPlaceVolume === null"></app-no-data> + </div> - <div class="subheading2 grid-1">Maximum Depth</div> - <div class="grid-double"> - {{ _applicationSubmission.soilToPlaceMaximumDepth }} - <span *ngIf="_applicationSubmission.soilToPlaceMaximumDepth">m</span> - <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.soilToPlaceMaximumDepth"></app-no-data> - </div> + <div class="subheading2">Area</div> + <div> + {{ _applicationSubmission.soilToPlaceArea }} + <span *ngIf="_applicationSubmission.soilToPlaceArea !== null">m<sup>2</sup></span> + <app-no-data [showRequired]="showErrors" *ngIf="_applicationSubmission.soilToPlaceArea === null"></app-no-data> + </div> - <div class="subheading2 grid-1">Average Depth</div> - <div class="grid-double"> - {{ _applicationSubmission.soilToPlaceAverageDepth }} - <span *ngIf="_applicationSubmission.soilToPlaceAverageDepth">m</span> - <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.soilToPlaceAverageDepth"></app-no-data> - </div> + <div class="subheading2">Maximum Depth</div> + <div> + {{ _applicationSubmission.soilToPlaceMaximumDepth }} + <span *ngIf="_applicationSubmission.soilToPlaceMaximumDepth !== null">m</span> + <app-no-data + [showRequired]="showErrors" + *ngIf="_applicationSubmission.soilToPlaceMaximumDepth === null" + ></app-no-data> + </div> - <div class="grid-1"></div> - <div class="subheading2 grid-double">Fill already Placed</div> + <div class="subheading2">Average Depth</div> + <div> + {{ _applicationSubmission.soilToPlaceAverageDepth }} + <span *ngIf="_applicationSubmission.soilToPlaceAverageDepth !== null">m</span> + <app-no-data + [showRequired]="showErrors" + *ngIf="_applicationSubmission.soilToPlaceAverageDepth === null" + ></app-no-data> + </div> - <div class="subheading2 grid-1">Volume</div> - <div class="grid-double"> - {{ _applicationSubmission.soilAlreadyPlacedVolume }} - <span *ngIf="_applicationSubmission.soilAlreadyPlacedVolume !== null">m<sup>3</sup></span> - <app-no-data - [showRequired]="showErrors" - *ngIf="_applicationSubmission.soilAlreadyPlacedVolume === null" - ></app-no-data> - </div> + <div></div> + <div class="subheading2">Fill already Placed</div> + + <div class="subheading2">Volume</div> + <div> + {{ _applicationSubmission.soilAlreadyPlacedVolume }} + <span *ngIf="_applicationSubmission.soilAlreadyPlacedVolume !== null">m<sup>3</sup></span> + <app-no-data + [showRequired]="showErrors" + *ngIf="_applicationSubmission.soilAlreadyPlacedVolume === null" + ></app-no-data> + </div> - <div class="subheading2 grid-1">Area</div> - <div class="grid-double"> - {{ _applicationSubmission.soilAlreadyPlacedArea }} - <span *ngIf="_applicationSubmission.soilAlreadyPlacedArea !== null">m<sup>2</sup></span> - <app-no-data - [showRequired]="showErrors" - *ngIf="_applicationSubmission.soilAlreadyPlacedArea === null" - ></app-no-data> - </div> + <div class="subheading2">Area</div> + <div> + {{ _applicationSubmission.soilAlreadyPlacedArea }} + <span *ngIf="_applicationSubmission.soilAlreadyPlacedArea !== null">m<sup>2</sup></span> + <app-no-data + [showRequired]="showErrors" + *ngIf="_applicationSubmission.soilAlreadyPlacedArea === null" + ></app-no-data> + </div> - <div class="subheading2 grid-1">Maximum Depth</div> - <div class="grid-double"> - {{ _applicationSubmission.soilAlreadyPlacedMaximumDepth }} - <span *ngIf="_applicationSubmission.soilAlreadyPlacedMaximumDepth !== null">m</span> - <app-no-data - [showRequired]="showErrors" - *ngIf="_applicationSubmission.soilAlreadyPlacedMaximumDepth === null" - ></app-no-data> - </div> + <div class="subheading2">Maximum Depth</div> + <div> + {{ _applicationSubmission.soilAlreadyPlacedMaximumDepth }} + <span *ngIf="_applicationSubmission.soilAlreadyPlacedMaximumDepth !== null">m</span> + <app-no-data + [showRequired]="showErrors" + *ngIf="_applicationSubmission.soilAlreadyPlacedMaximumDepth === null" + ></app-no-data> + </div> - <div class="subheading2 grid-1">Average Depth</div> - <div class="grid-double"> - {{ _applicationSubmission.soilAlreadyPlacedAverageDepth }} - <span *ngIf="_applicationSubmission.soilAlreadyPlacedAverageDepth !== null">m</span> - <app-no-data - [showRequired]="showErrors" - *ngIf="_applicationSubmission.soilAlreadyPlacedAverageDepth === null" - ></app-no-data> + <div class="subheading2">Average Depth</div> + <div> + {{ _applicationSubmission.soilAlreadyPlacedAverageDepth }} + <span *ngIf="_applicationSubmission.soilAlreadyPlacedAverageDepth !== null">m</span> + <app-no-data + [showRequired]="showErrors" + *ngIf="_applicationSubmission.soilAlreadyPlacedAverageDepth === null" + ></app-no-data> + </div> </div> <div class="subheading2 grid-1"> diff --git a/portal-frontend/src/app/features/applications/application-details/pofo-details/pofo-details.component.scss b/portal-frontend/src/app/features/applications/application-details/pofo-details/pofo-details.component.scss index e69de29bb2..beea863aef 100644 --- a/portal-frontend/src/app/features/applications/application-details/pofo-details/pofo-details.component.scss +++ b/portal-frontend/src/app/features/applications/application-details/pofo-details/pofo-details.component.scss @@ -0,0 +1,18 @@ +@use '../../../../../styles/functions' as *; + +.soil-table { + display: grid; + overflow-x: auto; + grid-column-gap: rem(36); + grid-row-gap: rem(12); + grid-template-columns: max-content max-content; + + @media screen and (min-width: $tabletBreakpoint) { + grid-template-columns: 0.55fr 1fr; + } + + @media screen and (min-width: $midBreakpoint) { + grid-template-columns: 0.95fr 1fr; + grid-column-gap: rem(16); + } +} diff --git a/portal-frontend/src/app/features/applications/application-details/roso-details/roso-details.component.html b/portal-frontend/src/app/features/applications/application-details/roso-details/roso-details.component.html index bd4a7980f2..42dfd0b98d 100644 --- a/portal-frontend/src/app/features/applications/application-details/roso-details/roso-details.component.html +++ b/portal-frontend/src/app/features/applications/application-details/roso-details/roso-details.component.html @@ -40,77 +40,86 @@ ></app-no-data> </div> - <div class="grid-1"></div> - <div class="subheading2 grid-double">Soil to be Removed</div> - - <div class="subheading2 grid-1">Volume</div> - <div class="grid-double"> - {{ _applicationSubmission.soilToRemoveVolume }} - <span *ngIf="_applicationSubmission.soilToRemoveVolume">m<sup>3</sup></span> - <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.soilToRemoveVolume"></app-no-data> - </div> - - <div class="subheading2 grid-1">Area</div> - <div class="grid-double"> - {{ _applicationSubmission.soilToRemoveArea }} <span *ngIf="_applicationSubmission.soilToRemoveArea">ha</span> - <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.soilToRemoveArea"></app-no-data> - </div> + <div class="full-width soil-table"> + <div></div> + <div class="subheading2">Soil to be Removed</div> + + <div class="subheading2">Volume</div> + <div> + {{ _applicationSubmission.soilToRemoveVolume }} + <span *ngIf="_applicationSubmission.soilToRemoveVolume !== null">m<sup>3</sup></span> + <app-no-data [showRequired]="showErrors" *ngIf="_applicationSubmission.soilToRemoveVolume === null"></app-no-data> + </div> - <div class="subheading2 grid-1">Maximum Depth</div> - <div class="grid-double"> - {{ _applicationSubmission.soilToRemoveMaximumDepth }} - <span *ngIf="_applicationSubmission.soilToRemoveMaximumDepth">m</span> - <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.soilToRemoveMaximumDepth"></app-no-data> - </div> + <div class="subheading2">Area</div> + <div> + {{ _applicationSubmission.soilToRemoveArea }} + <span *ngIf="_applicationSubmission.soilToRemoveArea !== null">m<sup>2</sup></span> + <app-no-data [showRequired]="showErrors" *ngIf="_applicationSubmission.soilToRemoveArea === null"></app-no-data> + </div> - <div class="subheading2 grid-1">Average Depth</div> - <div class="grid-double"> - {{ _applicationSubmission.soilToRemoveAverageDepth }} - <span *ngIf="_applicationSubmission.soilToRemoveAverageDepth">m</span> - <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.soilToRemoveAverageDepth"></app-no-data> - </div> + <div class="subheading2">Maximum Depth</div> + <div> + {{ _applicationSubmission.soilToRemoveMaximumDepth }} + <span *ngIf="_applicationSubmission.soilToRemoveMaximumDepth !== null">m</span> + <app-no-data + [showRequired]="showErrors" + *ngIf="_applicationSubmission.soilToRemoveMaximumDepth === null" + ></app-no-data> + </div> - <div class="grid-1"></div> - <div class="subheading2 grid-double">Soil already Removed</div> + <div class="subheading2">Average Depth</div> + <div> + {{ _applicationSubmission.soilToRemoveAverageDepth }} + <span *ngIf="_applicationSubmission.soilToRemoveAverageDepth !== null">m</span> + <app-no-data + [showRequired]="showErrors" + *ngIf="_applicationSubmission.soilToRemoveAverageDepth === null" + ></app-no-data> + </div> - <div class="subheading2 grid-1">Volume</div> - <div class="grid-double"> - {{ _applicationSubmission.soilAlreadyRemovedVolume }} - <span *ngIf="_applicationSubmission.soilAlreadyRemovedVolume !== null">m<sup>3</sup></span> - <app-no-data - [showRequired]="showErrors" - *ngIf="_applicationSubmission.soilAlreadyRemovedVolume === null" - ></app-no-data> - </div> + <div></div> + <div class="subheading2">Soil already Removed</div> + + <div class="subheading2">Volume</div> + <div> + {{ _applicationSubmission.soilAlreadyRemovedVolume }} + <span *ngIf="_applicationSubmission.soilAlreadyRemovedVolume !== null">m<sup>3</sup></span> + <app-no-data + [showRequired]="showErrors" + *ngIf="_applicationSubmission.soilAlreadyRemovedVolume === null" + ></app-no-data> + </div> - <div class="subheading2 grid-1">Area</div> - <div class="grid-double"> - {{ _applicationSubmission.soilAlreadyRemovedArea }} - <span *ngIf="_applicationSubmission.soilAlreadyRemovedArea !== null">ha</span> - <app-no-data - [showRequired]="showErrors" - *ngIf="_applicationSubmission.soilAlreadyRemovedArea === null" - ></app-no-data> - </div> + <div class="subheading2">Area</div> + <div> + {{ _applicationSubmission.soilAlreadyRemovedArea }} + <span *ngIf="_applicationSubmission.soilAlreadyRemovedArea !== null">m<sup>2</sup></span> + <app-no-data + [showRequired]="showErrors" + *ngIf="_applicationSubmission.soilAlreadyRemovedArea === null" + ></app-no-data> + </div> - <div class="subheading2 grid-1">Maximum Depth</div> - <div class="grid-double"> - {{ _applicationSubmission.soilAlreadyRemovedMaximumDepth }} - <span *ngIf="_applicationSubmission.soilAlreadyRemovedMaximumDepth !== null">m</span> - <app-no-data - [showRequired]="showErrors" - *ngIf="_applicationSubmission.soilAlreadyRemovedMaximumDepth === null" - ></app-no-data> - </div> + <div class="subheading2">Maximum Depth</div> + <div> + {{ _applicationSubmission.soilAlreadyRemovedMaximumDepth }} + <span *ngIf="_applicationSubmission.soilAlreadyRemovedMaximumDepth !== null">m</span> + <app-no-data + [showRequired]="showErrors" + *ngIf="_applicationSubmission.soilAlreadyRemovedMaximumDepth === null" + ></app-no-data> + </div> - <div class="subheading2 grid-1">Average Depth</div> - <div class="grid-double"> - {{ _applicationSubmission.soilAlreadyRemovedAverageDepth }} - <span *ngIf="_applicationSubmission.soilAlreadyRemovedAverageDepth !== null">m</span> - <app-no-data - [showRequired]="showErrors" - *ngIf="_applicationSubmission.soilAlreadyRemovedAverageDepth === null" - ></app-no-data> + <div class="subheading2">Average Depth</div> + <div> + {{ _applicationSubmission.soilAlreadyRemovedAverageDepth }} + <span *ngIf="_applicationSubmission.soilAlreadyRemovedAverageDepth !== null">m</span> + <app-no-data + [showRequired]="showErrors" + *ngIf="_applicationSubmission.soilAlreadyRemovedAverageDepth === null" + ></app-no-data> + </div> </div> <div class="subheading2 grid-1">Describe the type of soil proposed to be removed.</div> diff --git a/portal-frontend/src/app/features/applications/application-details/roso-details/roso-details.component.scss b/portal-frontend/src/app/features/applications/application-details/roso-details/roso-details.component.scss index e69de29bb2..beea863aef 100644 --- a/portal-frontend/src/app/features/applications/application-details/roso-details/roso-details.component.scss +++ b/portal-frontend/src/app/features/applications/application-details/roso-details/roso-details.component.scss @@ -0,0 +1,18 @@ +@use '../../../../../styles/functions' as *; + +.soil-table { + display: grid; + overflow-x: auto; + grid-column-gap: rem(36); + grid-row-gap: rem(12); + grid-template-columns: max-content max-content; + + @media screen and (min-width: $tabletBreakpoint) { + grid-template-columns: 0.55fr 1fr; + } + + @media screen and (min-width: $midBreakpoint) { + grid-template-columns: 0.95fr 1fr; + grid-column-gap: rem(16); + } +} diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pofo-details/pofo-details.component.html b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pofo-details/pofo-details.component.html index 8310b41e94..949a0f558c 100644 --- a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pofo-details/pofo-details.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pofo-details/pofo-details.component.html @@ -46,71 +46,86 @@ ></app-no-data> </div> - <div class="grid-1"></div> - <div class="subheading2 grid-double">Fill to be Placed</div> - - <div class="subheading2 grid-1">Volume</div> - <div class="grid-double"> - {{ _noiSubmission.soilToPlaceVolume }} - <span *ngIf="_noiSubmission.soilToPlaceVolume">m<sup>3</sup></span> - <app-no-data [showRequired]="showErrors" *ngIf="!_noiSubmission.soilToPlaceVolume"></app-no-data> - </div> - - <div class="subheading2 grid-1">Area</div> - <div class="grid-double"> - {{ _noiSubmission.soilToPlaceArea }} <span *ngIf="_noiSubmission.soilToPlaceArea">m<sup>2</sup></span> - <app-no-data [showRequired]="showErrors" *ngIf="!_noiSubmission.soilToPlaceArea"></app-no-data> - </div> + <div class="full-width soil-table"> + <div></div> + <div class="subheading2">Fill to be Placed</div> + + <div class="subheading2">Volume</div> + <div> + {{ _noiSubmission.soilToPlaceVolume }} + <span *ngIf="_noiSubmission.soilToPlaceVolume !== null">m<sup>3</sup></span> + <app-no-data [showRequired]="showErrors" *ngIf="_noiSubmission.soilToPlaceVolume === null"></app-no-data> + </div> - <div class="subheading2 grid-1">Maximum Depth</div> - <div class="grid-double"> - {{ _noiSubmission.soilToPlaceMaximumDepth }} - <span *ngIf="_noiSubmission.soilToPlaceMaximumDepth">m</span> - <app-no-data [showRequired]="showErrors" *ngIf="!_noiSubmission.soilToPlaceMaximumDepth"></app-no-data> - </div> + <div class="subheading2">Area</div> + <div> + {{ _noiSubmission.soilToPlaceArea }} + <span *ngIf="_noiSubmission.soilToPlaceArea !== null">m<sup>2</sup></span> + <app-no-data [showRequired]="showErrors" *ngIf="_noiSubmission.soilToPlaceArea === null"></app-no-data> + </div> - <div class="subheading2 grid-1">Average Depth</div> - <div class="grid-double"> - {{ _noiSubmission.soilToPlaceAverageDepth }} - <span *ngIf="_noiSubmission.soilToPlaceAverageDepth">m</span> - <app-no-data [showRequired]="showErrors" *ngIf="!_noiSubmission.soilToPlaceAverageDepth"></app-no-data> - </div> + <div class="subheading2">Maximum Depth</div> + <div> + {{ _noiSubmission.soilToPlaceMaximumDepth }} + <span *ngIf="_noiSubmission.soilToPlaceMaximumDepth !== null">m</span> + <app-no-data + [showRequired]="showErrors" + *ngIf="_noiSubmission.soilToPlaceMaximumDepth === null" + ></app-no-data> + </div> - <div class="grid-1"></div> - <div class="subheading2 grid-double">Fill already Placed</div> + <div class="subheading2">Average Depth</div> + <div> + {{ _noiSubmission.soilToPlaceAverageDepth }} + <span *ngIf="_noiSubmission.soilToPlaceAverageDepth !== null">m</span> + <app-no-data + [showRequired]="showErrors" + *ngIf="_noiSubmission.soilToPlaceAverageDepth === null" + ></app-no-data> + </div> - <div class="subheading2 grid-1">Volume</div> - <div class="grid-double"> - {{ _noiSubmission.soilAlreadyPlacedVolume }} - <span *ngIf="_noiSubmission.soilAlreadyPlacedVolume !== null">m<sup>3</sup></span> - <app-no-data [showRequired]="showErrors" *ngIf="_noiSubmission.soilAlreadyPlacedVolume === null"></app-no-data> - </div> + <div></div> + <div class="subheading2">Fill already Placed</div> + + <div class="subheading2">Volume</div> + <div> + {{ _noiSubmission.soilAlreadyPlacedVolume }} + <span *ngIf="_noiSubmission.soilAlreadyPlacedVolume !== null">m<sup>3</sup></span> + <app-no-data + [showRequired]="showErrors" + *ngIf="_noiSubmission.soilAlreadyPlacedVolume === null" + ></app-no-data> + </div> - <div class="subheading2 grid-1">Area</div> - <div class="grid-double"> - {{ _noiSubmission.soilAlreadyPlacedArea }} - <span *ngIf="_noiSubmission.soilAlreadyPlacedArea !== null">m<sup>2</sup></span> - <app-no-data [showRequired]="showErrors" *ngIf="_noiSubmission.soilAlreadyPlacedArea === null"></app-no-data> - </div> + <div class="subheading2">Area</div> + <div> + {{ _noiSubmission.soilAlreadyPlacedArea }} + <span *ngIf="_noiSubmission.soilAlreadyPlacedArea !== null">m<sup>2</sup></span> + <app-no-data + [showRequired]="showErrors" + *ngIf="_noiSubmission.soilAlreadyPlacedArea === null" + ></app-no-data> + </div> - <div class="subheading2 grid-1">Maximum Depth</div> - <div class="grid-double"> - {{ _noiSubmission.soilAlreadyPlacedMaximumDepth }} - <span *ngIf="_noiSubmission.soilAlreadyPlacedMaximumDepth !== null">m</span> - <app-no-data - [showRequired]="showErrors" - *ngIf="_noiSubmission.soilAlreadyPlacedMaximumDepth === null" - ></app-no-data> - </div> + <div class="subheading2">Maximum Depth</div> + <div> + {{ _noiSubmission.soilAlreadyPlacedMaximumDepth }} + <span *ngIf="_noiSubmission.soilAlreadyPlacedMaximumDepth !== null">m</span> + <app-no-data + [showRequired]="showErrors" + *ngIf="_noiSubmission.soilAlreadyPlacedMaximumDepth === null" + ></app-no-data> + </div> - <div class="subheading2 grid-1">Average Depth</div> - <div class="grid-double"> - {{ _noiSubmission.soilAlreadyPlacedAverageDepth }} - <span *ngIf="_noiSubmission.soilAlreadyPlacedAverageDepth !== null">m</span> - <app-no-data - [showRequired]="showErrors" - *ngIf="_noiSubmission.soilAlreadyPlacedAverageDepth === null" - ></app-no-data> + <div class="subheading2">Average Depth</div> + <div> + {{ _noiSubmission.soilAlreadyPlacedAverageDepth }} + <span *ngIf="_noiSubmission.soilAlreadyPlacedAverageDepth !== null">m</span> + <app-no-data + [showRequired]="showErrors" + *ngIf="_noiSubmission.soilAlreadyPlacedAverageDepth === null" + ></app-no-data> + </div> </div> <div class="subheading2 grid-1">Proposal Map / Site Plan</div> diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pofo-details/pofo-details.component.scss b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pofo-details/pofo-details.component.scss index e69de29bb2..beea863aef 100644 --- a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pofo-details/pofo-details.component.scss +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pofo-details/pofo-details.component.scss @@ -0,0 +1,18 @@ +@use '../../../../../styles/functions' as *; + +.soil-table { + display: grid; + overflow-x: auto; + grid-column-gap: rem(36); + grid-row-gap: rem(12); + grid-template-columns: max-content max-content; + + @media screen and (min-width: $tabletBreakpoint) { + grid-template-columns: 0.55fr 1fr; + } + + @media screen and (min-width: $midBreakpoint) { + grid-template-columns: 0.95fr 1fr; + grid-column-gap: rem(16); + } +} diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/roso-details/roso-details.component.html b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/roso-details/roso-details.component.html index 283cce4cbe..dc1ba8d5fb 100644 --- a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/roso-details/roso-details.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/roso-details/roso-details.component.html @@ -46,75 +46,87 @@ ></app-no-data> </div> - <div class="grid-1"></div> - <div class="subheading2 grid-double">Soil to be Removed</div> - - <div class="subheading2 grid-1">Volume</div> - <div class="grid-double"> - {{ _noiSubmission.soilToRemoveVolume }} - <span *ngIf="_noiSubmission.soilToRemoveVolume">m<sup>3</sup></span> - <app-no-data [showRequired]="showErrors" *ngIf="!_noiSubmission.soilToRemoveVolume"></app-no-data> - </div> - - <div class="subheading2 grid-1">Area</div> - <div class="grid-double"> - {{ _noiSubmission.soilToRemoveArea }} <span *ngIf="_noiSubmission.soilToRemoveArea">ha</span> - <app-no-data [showRequired]="showErrors" *ngIf="!_noiSubmission.soilToRemoveArea"></app-no-data> - </div> - - <div class="subheading2 grid-1">Maximum Depth</div> - <div class="grid-double"> - {{ _noiSubmission.soilToRemoveMaximumDepth }} - <span *ngIf="_noiSubmission.soilToRemoveMaximumDepth">m</span> - <app-no-data [showRequired]="showErrors" *ngIf="!_noiSubmission.soilToRemoveMaximumDepth"></app-no-data> - </div> + <div class="full-width soil-table"> + <div></div> + <div class="subheading2">Soil to be Removed</div> + + <div class="subheading2">Volume</div> + <div> + {{ _noiSubmission.soilToRemoveVolume }} + <span *ngIf="_noiSubmission.soilToRemoveVolume !== null">m<sup>3</sup></span> + <app-no-data [showRequired]="showErrors" *ngIf="_noiSubmission.soilToRemoveVolume === null"></app-no-data> + </div> - <div class="subheading2 grid-1">Average Depth</div> - <div class="grid-double"> - {{ _noiSubmission.soilToRemoveAverageDepth }} - <span *ngIf="_noiSubmission.soilToRemoveAverageDepth">m</span> - <app-no-data [showRequired]="showErrors" *ngIf="!_noiSubmission.soilToRemoveAverageDepth"></app-no-data> - </div> + <div class="subheading2">Area</div> + <div> + {{ _noiSubmission.soilToRemoveArea }} + <span *ngIf="_noiSubmission.soilToRemoveArea !== null">m<sup>2</sup></span> + <app-no-data [showRequired]="showErrors" *ngIf="_noiSubmission.soilToRemoveArea === null"></app-no-data> + </div> - <div class="subheading1 full-width"></div> + <div class="subheading2">Maximum Depth</div> + <div> + {{ _noiSubmission.soilToRemoveMaximumDepth }} + <span *ngIf="_noiSubmission.soilToRemoveMaximumDepth !== null">m</span> + <app-no-data + [showRequired]="showErrors" + *ngIf="_noiSubmission.soilToRemoveMaximumDepth === null" + ></app-no-data> + </div> - <div class="grid-1"></div> - <div class="subheading2 grid-double">Soil already Removed</div> + <div class="subheading2">Average Depth</div> + <div> + {{ _noiSubmission.soilToRemoveAverageDepth }} + <span *ngIf="_noiSubmission.soilToRemoveAverageDepth !== null">m</span> + <app-no-data + [showRequired]="showErrors" + *ngIf="_noiSubmission.soilToRemoveAverageDepth === null" + ></app-no-data> + </div> - <div class="subheading2 grid-1">Volume</div> - <div class="grid-double"> - {{ _noiSubmission.soilAlreadyRemovedVolume }} - <span *ngIf="_noiSubmission.soilAlreadyRemovedVolume !== null">m<sup>3</sup></span> - <app-no-data [showRequired]="showErrors" *ngIf="_noiSubmission.soilAlreadyRemovedVolume === null"></app-no-data> - </div> + <div></div> + <div class="subheading2">Soil already Removed</div> + + <div class="subheading2">Volume</div> + <div> + {{ _noiSubmission.soilAlreadyRemovedVolume }} + <span *ngIf="_noiSubmission.soilAlreadyRemovedVolume !== null">m<sup>3</sup></span> + <app-no-data + [showRequired]="showErrors" + *ngIf="_noiSubmission.soilAlreadyRemovedVolume === null" + ></app-no-data> + </div> - <div class="subheading2 grid-1">Area</div> - <div class="grid-double"> - {{ _noiSubmission.soilAlreadyRemovedArea }} - <span *ngIf="_noiSubmission.soilAlreadyRemovedArea !== null">ha</span> - <app-no-data [showRequired]="showErrors" *ngIf="_noiSubmission.soilAlreadyRemovedArea === null"></app-no-data> - </div> + <div class="subheading2">Area</div> + <div> + {{ _noiSubmission.soilAlreadyRemovedArea }} + <span *ngIf="_noiSubmission.soilAlreadyRemovedArea !== null">m<sup>2</sup></span> + <app-no-data + [showRequired]="showErrors" + *ngIf="_noiSubmission.soilAlreadyRemovedArea === null" + ></app-no-data> + </div> - <div class="subheading2 grid-1">Maximum Depth</div> - <div class="grid-double"> - {{ _noiSubmission.soilAlreadyRemovedMaximumDepth }} - <span *ngIf="_noiSubmission.soilAlreadyRemovedMaximumDepth !== null">m</span> - <app-no-data - [showRequired]="showErrors" - *ngIf="_noiSubmission.soilAlreadyRemovedMaximumDepth === null" - ></app-no-data> - </div> + <div class="subheading2">Maximum Depth</div> + <div> + {{ _noiSubmission.soilAlreadyRemovedMaximumDepth }} + <span *ngIf="_noiSubmission.soilAlreadyRemovedMaximumDepth !== null">m</span> + <app-no-data + [showRequired]="showErrors" + *ngIf="_noiSubmission.soilAlreadyRemovedMaximumDepth === null" + ></app-no-data> + </div> - <div class="subheading2 grid-1">Average Depth</div> - <div class="grid-double"> - {{ _noiSubmission.soilAlreadyRemovedAverageDepth }} - <span *ngIf="_noiSubmission.soilAlreadyRemovedAverageDepth !== null">m</span> - <app-no-data - [showRequired]="showErrors" - *ngIf="_noiSubmission.soilAlreadyRemovedAverageDepth === null" - ></app-no-data> + <div class="subheading2">Average Depth</div> + <div> + {{ _noiSubmission.soilAlreadyRemovedAverageDepth }} + <span *ngIf="_noiSubmission.soilAlreadyRemovedAverageDepth !== null">m</span> + <app-no-data + [showRequired]="showErrors" + *ngIf="_noiSubmission.soilAlreadyRemovedAverageDepth === null" + ></app-no-data> + </div> </div> - <div class="subheading2 grid-1">Proposal Map / Site Plan</div> <div class="grid-double"> <a *ngFor="let map of proposalMap" (click)="openFile(map.uuid)"> diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/roso-details/roso-details.component.scss b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/roso-details/roso-details.component.scss index e69de29bb2..beea863aef 100644 --- a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/roso-details/roso-details.component.scss +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/roso-details/roso-details.component.scss @@ -0,0 +1,18 @@ +@use '../../../../../styles/functions' as *; + +.soil-table { + display: grid; + overflow-x: auto; + grid-column-gap: rem(36); + grid-row-gap: rem(12); + grid-template-columns: max-content max-content; + + @media screen and (min-width: $tabletBreakpoint) { + grid-template-columns: 0.55fr 1fr; + } + + @media screen and (min-width: $midBreakpoint) { + grid-template-columns: 0.95fr 1fr; + grid-column-gap: rem(16); + } +} diff --git a/portal-frontend/src/app/features/public/application/submission/naru-details/naru-details.component.html b/portal-frontend/src/app/features/public/application/submission/naru-details/naru-details.component.html index 22cf7785d8..5f3698b9ed 100644 --- a/portal-frontend/src/app/features/public/application/submission/naru-details/naru-details.component.html +++ b/portal-frontend/src/app/features/public/application/submission/naru-details/naru-details.component.html @@ -213,5 +213,42 @@ *ngIf="applicationSubmission.naruToPlaceAverageDepth === null" ></app-no-data> </div> + + <div class="full-width soil-table"> + <div></div> + <div class="subheading2">Fill to be Placed</div> + + <div class="subheading2">Volume</div> + <div> + {{ applicationSubmission.naruToPlaceVolume }} + <span *ngIf="applicationSubmission.naruToPlaceVolume !== null">m<sup>3</sup></span> + <app-no-data *ngIf="applicationSubmission.naruToPlaceVolume === null"></app-no-data> + </div> + + <div class="subheading2">Area</div> + <div> + {{ applicationSubmission.naruToPlaceArea }} + <span *ngIf="applicationSubmission.naruToPlaceArea !== null">m<sup>2</sup></span> + <app-no-data *ngIf="applicationSubmission.naruToPlaceArea === null"></app-no-data> + </div> + + <div class="subheading2">Maximum Depth</div> + <div> + {{ applicationSubmission.naruToPlaceMaximumDepth }} + <span *ngIf="applicationSubmission.naruToPlaceMaximumDepth !== null">m</span> + <app-no-data + *ngIf="applicationSubmission.naruToPlaceMaximumDepth === null" + ></app-no-data> + </div> + + <div class="subheading2">Average Depth</div> + <div> + {{ applicationSubmission.naruToPlaceAverageDepth }} + <span *ngIf="applicationSubmission.naruToPlaceAverageDepth !== null">m</span> + <app-no-data + *ngIf="applicationSubmission.naruToPlaceAverageDepth === null" + ></app-no-data> + </div> + </div> </ng-container> </div> diff --git a/portal-frontend/src/app/features/public/application/submission/naru-details/naru-details.component.scss b/portal-frontend/src/app/features/public/application/submission/naru-details/naru-details.component.scss index 75917bf09c..abb441e3b9 100644 --- a/portal-frontend/src/app/features/public/application/submission/naru-details/naru-details.component.scss +++ b/portal-frontend/src/app/features/public/application/submission/naru-details/naru-details.component.scss @@ -1,9 +1,24 @@ @use '../../../../../../styles/functions' as *; .soil-table { - display: grid; - grid-template-columns: max-content max-content; - overflow-x: auto; - grid-column-gap: rem(36); - grid-row-gap: rem(12); + display: grid; + overflow-x: auto; + grid-column-gap: rem(36); + grid-row-gap: rem(12); + grid-template-columns: max-content max-content; + + @media screen and (min-width: $tabletBreakpoint) { + grid-template-columns: 0.55fr 1fr; + } + + @media screen and (min-width: $midBreakpoint) { + grid-template-columns: 0.95fr 1fr; + grid-column-gap: rem(16); + } + + .spacer-row { + grid-column: 1/4; + height: rem(16); + } } + \ No newline at end of file diff --git a/portal-frontend/src/app/features/public/application/submission/nfu-details/nfu-details.component.html b/portal-frontend/src/app/features/public/application/submission/nfu-details/nfu-details.component.html index 1e8994880c..0a096fc75a 100644 --- a/portal-frontend/src/app/features/public/application/submission/nfu-details/nfu-details.component.html +++ b/portal-frontend/src/app/features/public/application/submission/nfu-details/nfu-details.component.html @@ -71,36 +71,41 @@ <h4>Soil and Fill Components</h4> ></app-no-data> </div> - <div class="grid-1"></div> - <div class="subheading2 grid-double">Fill to be Placed</div> - - <div class="subheading2 grid-1">Volume</div> - <div class="grid-double"> - {{ applicationSubmission.nfuFillVolume }} - <span *ngIf="applicationSubmission.nfuFillVolume !== null">m<sup>3</sup></span> - <app-no-data *ngIf="applicationSubmission.nfuFillVolume === null"></app-no-data> - </div> - <div class="subheading2 grid-1">Area</div> - <div class="grid-double"> - {{ applicationSubmission.nfuTotalFillArea }} - <span *ngIf="applicationSubmission.nfuTotalFillArea !== null">m<sup>2</sup></span> - <app-no-data *ngIf="applicationSubmission.nfuTotalFillArea === null"></app-no-data> - </div> - <div class="subheading2 grid-1">Maximum Depth</div> - <div class="grid-double"> - {{ applicationSubmission.nfuMaxFillDepth }} - <span *ngIf="applicationSubmission.nfuMaxFillDepth !== null">m</span> - <app-no-data - *ngIf="applicationSubmission.nfuMaxFillDepth === null" - ></app-no-data> - </div> - <div class="subheading2 grid-1">Average Depth</div> - <div class="grid-double"> - {{ applicationSubmission.nfuAverageFillDepth }} - <span *ngIf="applicationSubmission.nfuAverageFillDepth !== null">m</span> - <app-no-data - *ngIf="applicationSubmission.nfuAverageFillDepth === null" - ></app-no-data> + <div class="full-width soil-table"> + <div></div> + <div class="subheading2">Fill to be Placed</div> + + <div class="subheading2">Volume</div> + <div> + {{ applicationSubmission.nfuFillVolume }} + <span *ngIf="applicationSubmission.nfuFillVolume !== null">m<sup>3</sup></span> + <app-no-data *ngIf="applicationSubmission.nfuFillVolume === null"></app-no-data> + </div> + + <div class="subheading2">Area</div> + <div> + {{ applicationSubmission.nfuTotalFillArea }} + <span *ngIf="applicationSubmission.nfuTotalFillArea !== null">m<sup>2</sup></span> + <app-no-data *ngIf="applicationSubmission.nfuTotalFillArea === null"></app-no-data> + </div> + + <div class="subheading2">Maximum Depth</div> + <div> + {{ applicationSubmission.nfuMaxFillDepth }} + <span *ngIf="applicationSubmission.nfuMaxFillDepth !== null">m</span> + <app-no-data + *ngIf="applicationSubmission.nfuMaxFillDepth === null" + ></app-no-data> + </div> + + <div class="subheading2">Average Depth</div> + <div> + {{ applicationSubmission.nfuAverageFillDepth }} + <span *ngIf="applicationSubmission.nfuAverageFillDepth !== null">m</span> + <app-no-data + *ngIf="applicationSubmission.nfuAverageFillDepth === null" + ></app-no-data> + </div> </div> </ng-container> </div> diff --git a/portal-frontend/src/app/features/public/application/submission/pofo-details/pofo-details.component.html b/portal-frontend/src/app/features/public/application/submission/pofo-details/pofo-details.component.html index 114496661d..bc4d6f86c1 100644 --- a/portal-frontend/src/app/features/public/application/submission/pofo-details/pofo-details.component.html +++ b/portal-frontend/src/app/features/public/application/submission/pofo-details/pofo-details.component.html @@ -39,61 +39,80 @@ ></app-no-data> </div> - <div class="grid-1"></div> - <div class="grid-double"> - <strong> Fill to be Placed</strong> - </div> - <div class="grid-1"><strong>Volume</strong></div> - <div class="grid-double"> - {{ applicationSubmission.soilToPlaceVolume }} - <span *ngIf="applicationSubmission.soilToPlaceVolume">m<sup>3</sup></span> - <app-no-data *ngIf="!applicationSubmission.soilToPlaceVolume"></app-no-data> - </div> - <div class="grid-1"><strong>Area</strong></div> - <div class="grid-double"> - {{ applicationSubmission.soilToPlaceArea }} <span *ngIf="applicationSubmission.soilToPlaceArea">m<sup>2</sup></span> - <app-no-data *ngIf="!applicationSubmission.soilToPlaceArea"></app-no-data> - </div> - <div class="grid-1"><strong>Maximum Depth</strong></div> - <div class="grid-double"> - {{ applicationSubmission.soilToPlaceMaximumDepth }} - <span *ngIf="applicationSubmission.soilToPlaceMaximumDepth">m</span> - <app-no-data *ngIf="!applicationSubmission.soilToPlaceMaximumDepth"></app-no-data> - </div> - <div class="grid-1"><strong>Average Depth</strong></div> - <div class="grid-double"> - {{ applicationSubmission.soilToPlaceAverageDepth }} - <span *ngIf="applicationSubmission.soilToPlaceAverageDepth">m</span> - <app-no-data *ngIf="!applicationSubmission.soilToPlaceAverageDepth"></app-no-data> - </div> + <div *ngIf="applicationSubmission" class="full-width soil-table"> + <div></div> + <div class="subheading2">Fill to be Placed</div> - <div class="grid-1"></div> - <div class="grid-double"> - <strong> Fill already Placed</strong> - </div> - <div class="grid-1"><strong>Volume</strong></div> - <div class="grid-double"> - {{ applicationSubmission.soilAlreadyPlacedVolume }} - <span *ngIf="applicationSubmission.soilAlreadyPlacedVolume !== null">m<sup>3</sup></span> - <app-no-data *ngIf="applicationSubmission.soilAlreadyPlacedVolume === null"></app-no-data> - </div> - <div class="grid-1"><strong>Area</strong></div> - <div class="grid-double"> - {{ applicationSubmission.soilAlreadyPlacedArea }} - <span *ngIf="applicationSubmission.soilAlreadyPlacedArea !== null">m<sup>2</sup></span> - <app-no-data *ngIf="applicationSubmission.soilAlreadyPlacedArea === null"></app-no-data> - </div> - <div class="grid-1"><strong>Maximum Depth</strong></div> - <div class="grid-double"> - {{ applicationSubmission.soilAlreadyPlacedMaximumDepth }} - <span *ngIf="applicationSubmission.soilAlreadyPlacedMaximumDepth !== null">m</span> - <app-no-data *ngIf="applicationSubmission.soilAlreadyPlacedMaximumDepth === null"></app-no-data> - </div> - <div class="grid-1"><strong>Average Depth</strong></div> - <div class="grid-double"> - {{ applicationSubmission.soilAlreadyPlacedAverageDepth }} - <span *ngIf="applicationSubmission.soilAlreadyPlacedAverageDepth !== null">m</span> - <app-no-data *ngIf="applicationSubmission.soilAlreadyPlacedAverageDepth === null"></app-no-data> + <div class="subheading2">Volume</div> + <div> + {{ applicationSubmission.soilToPlaceVolume }} + <span *ngIf="applicationSubmission.soilToPlaceVolume !== null">m<sup>3</sup></span> + <app-no-data *ngIf="applicationSubmission.soilToPlaceVolume === null"></app-no-data> + </div> + + <div class="subheading2">Area</div> + <div> + {{ applicationSubmission.soilToPlaceArea }} + <span *ngIf="applicationSubmission.soilToPlaceArea !== null">m<sup>2</sup></span> + <app-no-data *ngIf="applicationSubmission.soilToPlaceArea === null"></app-no-data> + </div> + + <div class="subheading2">Maximum Depth</div> + <div> + {{ applicationSubmission.soilToPlaceMaximumDepth }} + <span *ngIf="applicationSubmission.soilToPlaceMaximumDepth !== null">m</span> + <app-no-data + *ngIf="applicationSubmission.soilToPlaceMaximumDepth === null" + ></app-no-data> + </div> + + <div class="subheading2">Average Depth</div> + <div> + {{ applicationSubmission.soilToPlaceAverageDepth }} + <span *ngIf="applicationSubmission.soilToPlaceAverageDepth !== null">m</span> + <app-no-data + *ngIf="applicationSubmission.soilToPlaceAverageDepth === null" + ></app-no-data> + </div> + + <div></div> + <div class="subheading2">Fill already Placed</div> + + <div class="subheading2">Volume</div> + <div> + {{ applicationSubmission.soilAlreadyPlacedVolume }} + <span *ngIf="applicationSubmission.soilAlreadyPlacedVolume !== null">m<sup>3</sup></span> + <app-no-data + *ngIf="applicationSubmission.soilAlreadyPlacedVolume === null" + ></app-no-data> + </div> + + <div class="subheading2">Area</div> + <div> + {{ applicationSubmission.soilAlreadyPlacedArea }} + <span *ngIf="applicationSubmission.soilAlreadyPlacedArea !== null">m<sup>2</sup></span> + <app-no-data + *ngIf="applicationSubmission.soilAlreadyPlacedArea === null" + ></app-no-data> + </div> + + <div class="subheading2">Maximum Depth</div> + <div> + {{ applicationSubmission.soilAlreadyPlacedMaximumDepth }} + <span *ngIf="applicationSubmission.soilAlreadyPlacedMaximumDepth !== null">m</span> + <app-no-data + *ngIf="applicationSubmission.soilAlreadyPlacedMaximumDepth === null" + ></app-no-data> + </div> + + <div class="subheading2">Average Depth</div> + <div> + {{ applicationSubmission.soilAlreadyPlacedAverageDepth }} + <span *ngIf="applicationSubmission.soilAlreadyPlacedAverageDepth !== null">m</span> + <app-no-data + *ngIf="applicationSubmission.soilAlreadyPlacedAverageDepth === null" + ></app-no-data> + </div> </div> <div class="subheading2 grid-1"> diff --git a/portal-frontend/src/app/features/public/application/submission/pofo-details/pofo-details.component.scss b/portal-frontend/src/app/features/public/application/submission/pofo-details/pofo-details.component.scss index 75917bf09c..abb441e3b9 100644 --- a/portal-frontend/src/app/features/public/application/submission/pofo-details/pofo-details.component.scss +++ b/portal-frontend/src/app/features/public/application/submission/pofo-details/pofo-details.component.scss @@ -1,9 +1,24 @@ @use '../../../../../../styles/functions' as *; .soil-table { - display: grid; - grid-template-columns: max-content max-content; - overflow-x: auto; - grid-column-gap: rem(36); - grid-row-gap: rem(12); + display: grid; + overflow-x: auto; + grid-column-gap: rem(36); + grid-row-gap: rem(12); + grid-template-columns: max-content max-content; + + @media screen and (min-width: $tabletBreakpoint) { + grid-template-columns: 0.55fr 1fr; + } + + @media screen and (min-width: $midBreakpoint) { + grid-template-columns: 0.95fr 1fr; + grid-column-gap: rem(16); + } + + .spacer-row { + grid-column: 1/4; + height: rem(16); + } } + \ No newline at end of file diff --git a/portal-frontend/src/app/features/public/application/submission/roso-details/roso-details.component.html b/portal-frontend/src/app/features/public/application/submission/roso-details/roso-details.component.html index ecfcb8c7ee..afb7572f7c 100644 --- a/portal-frontend/src/app/features/public/application/submission/roso-details/roso-details.component.html +++ b/portal-frontend/src/app/features/public/application/submission/roso-details/roso-details.component.html @@ -39,77 +39,80 @@ ></app-no-data> </div> - <div class="grid-1"></div> - <div class="subheading2 grid-double">Soil to be Removed</div> - - <div class="subheading2 grid-1">Volume</div> - <div class="grid-double"> - {{ applicationSubmission.soilToRemoveVolume }} - <span *ngIf="applicationSubmission.soilToRemoveVolume">m<sup>3</sup></span> - <app-no-data *ngIf="!applicationSubmission.soilToRemoveVolume"></app-no-data> - </div> + <div class="full-width soil-table"> + <div></div> + <div class="subheading2">Soil to be Removed</div> + + <div class="subheading2">Volume</div> + <div> + {{ applicationSubmission.soilToRemoveVolume }} + <span *ngIf="applicationSubmission.soilToRemoveVolume !== null">m<sup>3</sup></span> + <app-no-data [*ngIf="applicationSubmission.soilToRemoveVolume === null"></app-no-data> + </div> - <div class="subheading2 grid-1">Area</div> - <div class="grid-double"> - {{ applicationSubmission.soilToRemoveArea }} <span *ngIf="applicationSubmission.soilToRemoveArea">ha</span> - <app-no-data *ngIf="!applicationSubmission.soilToRemoveArea"></app-no-data> - </div> + <div class="subheading2">Area</div> + <div> + {{ applicationSubmission.soilToRemoveArea }} + <span *ngIf="applicationSubmission.soilToRemoveArea !== null">m<sup>2</sup></span> + <app-no-data [*ngIf="applicationSubmission.soilToRemoveArea === null"></app-no-data> + </div> - <div class="subheading2 grid-1">Maximum Depth</div> - <div class="grid-double"> - {{ applicationSubmission.soilToRemoveMaximumDepth }} - <span *ngIf="applicationSubmission.soilToRemoveMaximumDepth">m</span> - <app-no-data *ngIf="!applicationSubmission.soilToRemoveMaximumDepth"></app-no-data> - </div> + <div class="subheading2">Maximum Depth</div> + <div> + {{ applicationSubmission.soilToRemoveMaximumDepth }} + <span *ngIf="applicationSubmission.soilToRemoveMaximumDepth !== null">m</span> + <app-no-data + *ngIf="applicationSubmission.soilToRemoveMaximumDepth === null" + ></app-no-data> + </div> - <div class="subheading2 grid-1">Average Depth</div> - <div class="grid-double"> - {{ applicationSubmission.soilToRemoveAverageDepth }} - <span *ngIf="applicationSubmission.soilToRemoveAverageDepth">m</span> - <app-no-data *ngIf="!applicationSubmission.soilToRemoveAverageDepth"></app-no-data> - </div> + <div class="subheading2">Average Depth</div> + <div> + {{ applicationSubmission.soilToRemoveAverageDepth }} + <span *ngIf="applicationSubmission.soilToRemoveAverageDepth !== null">m</span> + <app-no-data + *ngIf="applicationSubmission.soilToRemoveAverageDepth === null" + ></app-no-data> + </div> - <div class="grid-1"></div> - <div class="subheading2 grid-double">Soil already Removed</div> + <div></div> + <div class="subheading2">Soil already Removed</div> - <div class="subheading2 grid-1">Volume</div> - <div class="grid-double"> - {{ applicationSubmission.soilAlreadyRemovedVolume }} - <span *ngIf="applicationSubmission.soilAlreadyRemovedVolume !== null">m<sup>3</sup></span> - <app-no-data - - *ngIf="applicationSubmission.soilAlreadyRemovedVolume === null" - ></app-no-data> - </div> + <div class="subheading2">Volume</div> + <div> + {{ applicationSubmission.soilAlreadyRemovedVolume }} + <span *ngIf="applicationSubmission.soilAlreadyRemovedVolume !== null">m<sup>3</sup></span> + <app-no-data + *ngIf="applicationSubmission.soilAlreadyRemovedVolume === null" + ></app-no-data> + </div> - <div class="subheading2 grid-1">Area</div> - <div class="grid-double"> - {{ applicationSubmission.soilAlreadyRemovedArea }} - <span *ngIf="applicationSubmission.soilAlreadyRemovedArea !== null">ha</span> - <app-no-data - - *ngIf="applicationSubmission.soilAlreadyRemovedArea === null" - ></app-no-data> - </div> + <div class="subheading2">Area</div> + <div> + {{ applicationSubmission.soilAlreadyRemovedArea }} + <span *ngIf="applicationSubmission.soilAlreadyRemovedArea !== null">m<sup>2</sup></span> + <app-no-data + *ngIf="applicationSubmission.soilAlreadyRemovedArea === null" + ></app-no-data> + </div> - <div class="subheading2 grid-1">Maximum Depth</div> - <div class="grid-double"> - {{ applicationSubmission.soilAlreadyRemovedMaximumDepth }} - <span *ngIf="applicationSubmission.soilAlreadyRemovedMaximumDepth !== null">m</span> - <app-no-data - - *ngIf="applicationSubmission.soilAlreadyRemovedMaximumDepth === null" - ></app-no-data> - </div> + <div class="subheading2">Maximum Depth</div> + <div> + {{ applicationSubmission.soilAlreadyRemovedMaximumDepth }} + <span *ngIf="applicationSubmission.soilAlreadyRemovedMaximumDepth !== null">m</span> + <app-no-data + *ngIf="applicationSubmission.soilAlreadyRemovedMaximumDepth === null" + ></app-no-data> + </div> - <div class="subheading2 grid-1">Average Depth</div> - <div class="grid-double"> - {{ applicationSubmission.soilAlreadyRemovedAverageDepth }} - <span *ngIf="applicationSubmission.soilAlreadyRemovedAverageDepth !== null">m</span> - <app-no-data - - *ngIf="applicationSubmission.soilAlreadyRemovedAverageDepth === null" - ></app-no-data> + <div class="subheading2">Average Depth</div> + <div> + {{ applicationSubmission.soilAlreadyRemovedAverageDepth }} + <span *ngIf="applicationSubmission.soilAlreadyRemovedAverageDepth !== null">m</span> + <app-no-data + *ngIf="applicationSubmission.soilAlreadyRemovedAverageDepth === null" + ></app-no-data> + </div> </div> <div class="subheading2 grid-1">Describe the type of soil proposed to be removed.</div> diff --git a/portal-frontend/src/app/features/public/application/submission/roso-details/roso-details.component.scss b/portal-frontend/src/app/features/public/application/submission/roso-details/roso-details.component.scss index 75917bf09c..abb441e3b9 100644 --- a/portal-frontend/src/app/features/public/application/submission/roso-details/roso-details.component.scss +++ b/portal-frontend/src/app/features/public/application/submission/roso-details/roso-details.component.scss @@ -1,9 +1,24 @@ @use '../../../../../../styles/functions' as *; .soil-table { - display: grid; - grid-template-columns: max-content max-content; - overflow-x: auto; - grid-column-gap: rem(36); - grid-row-gap: rem(12); + display: grid; + overflow-x: auto; + grid-column-gap: rem(36); + grid-row-gap: rem(12); + grid-template-columns: max-content max-content; + + @media screen and (min-width: $tabletBreakpoint) { + grid-template-columns: 0.55fr 1fr; + } + + @media screen and (min-width: $midBreakpoint) { + grid-template-columns: 0.95fr 1fr; + grid-column-gap: rem(16); + } + + .spacer-row { + grid-column: 1/4; + height: rem(16); + } } + \ No newline at end of file diff --git a/portal-frontend/src/app/features/public/notice-of-intent/submission/pofo-details/pofo-details.component.html b/portal-frontend/src/app/features/public/notice-of-intent/submission/pofo-details/pofo-details.component.html index 9cec4e175a..e41d229da6 100644 --- a/portal-frontend/src/app/features/public/notice-of-intent/submission/pofo-details/pofo-details.component.html +++ b/portal-frontend/src/app/features/public/notice-of-intent/submission/pofo-details/pofo-details.component.html @@ -45,61 +45,80 @@ ></app-no-data> </div> - <div class="grid-1"></div> - <div class="grid-double"> - <strong> Fill to be Placed</strong> - </div> - <div class="grid-1"><strong>Volume</strong></div> - <div class="grid-double"> - {{ noiSubmission.soilToPlaceVolume }} - <span *ngIf="noiSubmission.soilToPlaceVolume">m<sup>3</sup></span> - <app-no-data *ngIf="!noiSubmission.soilToPlaceVolume"></app-no-data> - </div> - <div class="grid-1"><strong>Area</strong></div> - <div class="grid-double"> - {{ noiSubmission.soilToPlaceArea }} <span *ngIf="noiSubmission.soilToPlaceArea">m<sup>2</sup></span> - <app-no-data *ngIf="!noiSubmission.soilToPlaceArea"></app-no-data> - </div> - <div class="grid-1"><strong>Maximum Depth</strong></div> - <div class="grid-double"> - {{ noiSubmission.soilToPlaceMaximumDepth }} - <span *ngIf="noiSubmission.soilToPlaceMaximumDepth">m</span> - <app-no-data *ngIf="!noiSubmission.soilToPlaceMaximumDepth"></app-no-data> - </div> - <div class="grid-1"><strong>Average Depth</strong></div> - <div class="grid-double"> - {{ noiSubmission.soilToPlaceAverageDepth }} - <span *ngIf="noiSubmission.soilToPlaceAverageDepth">m</span> - <app-no-data *ngIf="!noiSubmission.soilToPlaceAverageDepth"></app-no-data> - </div> + <div *ngIf="noiSubmission" class="full-width soil-table"> + <div></div> + <div class="subheading2">Fill to be Placed</div> - <div class="grid-1"></div> - <div class="grid-double"> - <strong> Fill already Placed</strong> - </div> - <div class="grid-1"><strong>Volume</strong></div> - <div class="grid-double"> - {{ noiSubmission.soilAlreadyPlacedVolume }} - <span *ngIf="noiSubmission.soilAlreadyPlacedVolume !== null">m<sup>3</sup></span> - <app-no-data *ngIf="noiSubmission.soilAlreadyPlacedVolume === null"></app-no-data> - </div> - <div class="grid-1"><strong>Area</strong></div> - <div class="grid-double"> - {{ noiSubmission.soilAlreadyPlacedArea }} - <span *ngIf="noiSubmission.soilAlreadyPlacedArea !== null">m<sup>2</sup></span> - <app-no-data *ngIf="noiSubmission.soilAlreadyPlacedArea === null"></app-no-data> - </div> - <div class="grid-1"><strong>Maximum Depth</strong></div> - <div class="grid-double"> - {{ noiSubmission.soilAlreadyPlacedMaximumDepth }} - <span *ngIf="noiSubmission.soilAlreadyPlacedMaximumDepth !== null">m</span> - <app-no-data *ngIf="noiSubmission.soilAlreadyPlacedMaximumDepth === null"></app-no-data> - </div> - <div class="grid-1"><strong>Average Depth</strong></div> - <div class="grid-double"> - {{ noiSubmission.soilAlreadyPlacedAverageDepth }} - <span *ngIf="noiSubmission.soilAlreadyPlacedAverageDepth !== null">m</span> - <app-no-data *ngIf="noiSubmission.soilAlreadyPlacedAverageDepth === null"></app-no-data> + <div class="subheading2">Volume</div> + <div> + {{ noiSubmission.soilToPlaceVolume }} + <span *ngIf="noiSubmission.soilToPlaceVolume !== null">m<sup>3</sup></span> + <app-no-data *ngIf="noiSubmission.soilToPlaceVolume === null"></app-no-data> + </div> + + <div class="subheading2">Area</div> + <div> + {{ noiSubmission.soilToPlaceArea }} + <span *ngIf="noiSubmission.soilToPlaceArea !== null">m<sup>2</sup></span> + <app-no-data *ngIf="noiSubmission.soilToPlaceArea === null"></app-no-data> + </div> + + <div class="subheading2">Maximum Depth</div> + <div> + {{ noiSubmission.soilToPlaceMaximumDepth }} + <span *ngIf="noiSubmission.soilToPlaceMaximumDepth !== null">m</span> + <app-no-data + *ngIf="noiSubmission.soilToPlaceMaximumDepth === null" + ></app-no-data> + </div> + + <div class="subheading2">Average Depth</div> + <div> + {{ noiSubmission.soilToPlaceAverageDepth }} + <span *ngIf="noiSubmission.soilToPlaceAverageDepth !== null">m</span> + <app-no-data + *ngIf="noiSubmission.soilToPlaceAverageDepth === null" + ></app-no-data> + </div> + + <div></div> + <div class="subheading2">Fill already Placed</div> + + <div class="subheading2">Volume</div> + <div> + {{ noiSubmission.soilAlreadyPlacedVolume }} + <span *ngIf="noiSubmission.soilAlreadyPlacedVolume !== null">m<sup>3</sup></span> + <app-no-data + *ngIf="noiSubmission.soilAlreadyPlacedVolume === null" + ></app-no-data> + </div> + + <div class="subheading2">Area</div> + <div> + {{ noiSubmission.soilAlreadyPlacedArea }} + <span *ngIf="noiSubmission.soilAlreadyPlacedArea !== null">m<sup>2</sup></span> + <app-no-data + *ngIf="noiSubmission.soilAlreadyPlacedArea === null" + ></app-no-data> + </div> + + <div class="subheading2">Maximum Depth</div> + <div> + {{ noiSubmission.soilAlreadyPlacedMaximumDepth }} + <span *ngIf="noiSubmission.soilAlreadyPlacedMaximumDepth !== null">m</span> + <app-no-data + *ngIf="noiSubmission.soilAlreadyPlacedMaximumDepth === null" + ></app-no-data> + </div> + + <div class="subheading2">Average Depth</div> + <div> + {{ noiSubmission.soilAlreadyPlacedAverageDepth }} + <span *ngIf="noiSubmission.soilAlreadyPlacedAverageDepth !== null">m</span> + <app-no-data + *ngIf="noiSubmission.soilAlreadyPlacedAverageDepth === null" + ></app-no-data> + </div> </div> <div class="subheading2 grid-1">Proposal Map / Site Plan</div> diff --git a/portal-frontend/src/app/features/public/notice-of-intent/submission/pofo-details/pofo-details.component.scss b/portal-frontend/src/app/features/public/notice-of-intent/submission/pofo-details/pofo-details.component.scss index e69de29bb2..abb441e3b9 100644 --- a/portal-frontend/src/app/features/public/notice-of-intent/submission/pofo-details/pofo-details.component.scss +++ b/portal-frontend/src/app/features/public/notice-of-intent/submission/pofo-details/pofo-details.component.scss @@ -0,0 +1,24 @@ +@use '../../../../../../styles/functions' as *; + +.soil-table { + display: grid; + overflow-x: auto; + grid-column-gap: rem(36); + grid-row-gap: rem(12); + grid-template-columns: max-content max-content; + + @media screen and (min-width: $tabletBreakpoint) { + grid-template-columns: 0.55fr 1fr; + } + + @media screen and (min-width: $midBreakpoint) { + grid-template-columns: 0.95fr 1fr; + grid-column-gap: rem(16); + } + + .spacer-row { + grid-column: 1/4; + height: rem(16); + } +} + \ No newline at end of file diff --git a/portal-frontend/src/app/features/public/notice-of-intent/submission/roso-details/roso-details.component.html b/portal-frontend/src/app/features/public/notice-of-intent/submission/roso-details/roso-details.component.html index 17854e2c9d..9c3cf9e16b 100644 --- a/portal-frontend/src/app/features/public/notice-of-intent/submission/roso-details/roso-details.component.html +++ b/portal-frontend/src/app/features/public/notice-of-intent/submission/roso-details/roso-details.component.html @@ -45,63 +45,82 @@ ></app-no-data> </div> - <div class="grid-1"></div> - <div class="grid-2"> - <strong>Soil to be Removed</strong> - </div> - <div class="grid-1"><strong>Volume</strong></div> - <div class="grid-2"> - {{ noiSubmission.soilToRemoveVolume }} - <span *ngIf="noiSubmission.soilToRemoveVolume">m<sup>3</sup></span> - <app-no-data *ngIf="!noiSubmission.soilToRemoveVolume"></app-no-data> - </div> - <div class="grid-1"><strong>Area</strong></div> - <div class="grid-2"> - {{ noiSubmission.soilToRemoveArea }} <span *ngIf="noiSubmission.soilToRemoveArea">ha</span> - <app-no-data *ngIf="!noiSubmission.soilToRemoveArea"></app-no-data> - </div> - <div class="grid-1"><strong>Maximum Depth</strong></div> - <div class="grid-2"> - {{ noiSubmission.soilToRemoveMaximumDepth }} - <span *ngIf="noiSubmission.soilToRemoveMaximumDepth">m</span> - <app-no-data *ngIf="!noiSubmission.soilToRemoveMaximumDepth"></app-no-data> - </div> - <div class="grid-1"><strong>Average Depth</strong></div> - <div class="grid-2"> - {{ noiSubmission.soilToRemoveAverageDepth }} - <span *ngIf="noiSubmission.soilToRemoveAverageDepth">m</span> - <app-no-data *ngIf="!noiSubmission.soilToRemoveAverageDepth"></app-no-data> - </div> + <div class="full-width soil-table"> + <div></div> + <div class="subheading2">Soil to be Removed</div> - <div class="grid-1"></div> - <div class="grid-2"> - <strong>Soil already Removed</strong> - </div> - <div class="grid-1"><strong>Volume</strong></div> - <div class="grid-2"> - {{ noiSubmission.soilAlreadyRemovedVolume }} - <span *ngIf="noiSubmission.soilAlreadyRemovedVolume !== null">m<sup>3</sup></span> - <app-no-data *ngIf="noiSubmission.soilAlreadyRemovedVolume === null"></app-no-data> - </div> - <div class="grid-1"><strong>Area</strong></div> - <div class="grid-2"> - {{ noiSubmission.soilAlreadyRemovedArea }} - <span *ngIf="noiSubmission.soilAlreadyRemovedArea !== null">ha</span> - <app-no-data *ngIf="noiSubmission.soilAlreadyRemovedArea === null"></app-no-data> - </div> - <div class="grid-1"><strong>Maximum Depth</strong></div> - <div class="grid-2"> - {{ noiSubmission.soilAlreadyRemovedMaximumDepth }} - <span *ngIf="noiSubmission.soilAlreadyRemovedMaximumDepth !== null">m</span> - <app-no-data *ngIf="noiSubmission.soilAlreadyRemovedMaximumDepth === null"></app-no-data> - </div> - <div class="grid-1"><strong>Average Depth</strong></div> - <div class="grid-2"> - {{ noiSubmission.soilAlreadyRemovedAverageDepth }} - <span *ngIf="noiSubmission.soilAlreadyRemovedAverageDepth !== null">m</span> - <app-no-data *ngIf="noiSubmission.soilAlreadyRemovedAverageDepth === null"></app-no-data> - </div> + <div class="subheading2">Volume</div> + <div> + {{ noiSubmission.soilToRemoveVolume }} + <span *ngIf="noiSubmission.soilToRemoveVolume !== null">m<sup>3</sup></span> + <app-no-data [*ngIf="noiSubmission.soilToRemoveVolume === null"></app-no-data> + </div> + + <div class="subheading2">Area</div> + <div> + {{ noiSubmission.soilToRemoveArea }} + <span *ngIf="noiSubmission.soilToRemoveArea !== null">m<sup>2</sup></span> + <app-no-data [*ngIf="noiSubmission.soilToRemoveArea === null"></app-no-data> + </div> + <div class="subheading2">Maximum Depth</div> + <div> + {{ noiSubmission.soilToRemoveMaximumDepth }} + <span *ngIf="noiSubmission.soilToRemoveMaximumDepth !== null">m</span> + <app-no-data + *ngIf="noiSubmission.soilToRemoveMaximumDepth === null" + ></app-no-data> + </div> + + <div class="subheading2">Average Depth</div> + <div> + {{ noiSubmission.soilToRemoveAverageDepth }} + <span *ngIf="noiSubmission.soilToRemoveAverageDepth !== null">m</span> + <app-no-data + *ngIf="noiSubmission.soilToRemoveAverageDepth === null" + ></app-no-data> + </div> + + <div></div> + <div class="subheading2">Soil already Removed</div> + + <div class="subheading2">Volume</div> + <div> + {{ noiSubmission.soilAlreadyRemovedVolume }} + <span *ngIf="noiSubmission.soilAlreadyRemovedVolume !== null">m<sup>3</sup></span> + <app-no-data + *ngIf="noiSubmission.soilAlreadyRemovedVolume === null" + ></app-no-data> + </div> + + <div class="subheading2">Area</div> + <div> + {{ noiSubmission.soilAlreadyRemovedArea }} + <span *ngIf="noiSubmission.soilAlreadyRemovedArea !== null">m<sup>2</sup></span> + <app-no-data + *ngIf="noiSubmission.soilAlreadyRemovedArea === null" + ></app-no-data> + </div> + + <div class="subheading2">Maximum Depth</div> + <div> + {{ noiSubmission.soilAlreadyRemovedMaximumDepth }} + <span *ngIf="noiSubmission.soilAlreadyRemovedMaximumDepth !== null">m</span> + <app-no-data + *ngIf="noiSubmission.soilAlreadyRemovedMaximumDepth === null" + ></app-no-data> + </div> + + <div class="subheading2">Average Depth</div> + <div> + {{ noiSubmission.soilAlreadyRemovedAverageDepth }} + <span *ngIf="noiSubmission.soilAlreadyRemovedAverageDepth !== null">m</span> + <app-no-data + *ngIf="noiSubmission.soilAlreadyRemovedAverageDepth === null" + ></app-no-data> + </div> + </div> + <div class="subheading2 grid-1">Proposal Map / Site Plan</div> <div class="grid-double"> <a *ngFor="let map of proposalMap" (click)="openFile(map.uuid)"> diff --git a/portal-frontend/src/app/features/public/notice-of-intent/submission/roso-details/roso-details.component.scss b/portal-frontend/src/app/features/public/notice-of-intent/submission/roso-details/roso-details.component.scss index e69de29bb2..abb441e3b9 100644 --- a/portal-frontend/src/app/features/public/notice-of-intent/submission/roso-details/roso-details.component.scss +++ b/portal-frontend/src/app/features/public/notice-of-intent/submission/roso-details/roso-details.component.scss @@ -0,0 +1,24 @@ +@use '../../../../../../styles/functions' as *; + +.soil-table { + display: grid; + overflow-x: auto; + grid-column-gap: rem(36); + grid-row-gap: rem(12); + grid-template-columns: max-content max-content; + + @media screen and (min-width: $tabletBreakpoint) { + grid-template-columns: 0.55fr 1fr; + } + + @media screen and (min-width: $midBreakpoint) { + grid-template-columns: 0.95fr 1fr; + grid-column-gap: rem(16); + } + + .spacer-row { + grid-column: 1/4; + height: rem(16); + } +} + \ No newline at end of file From 89eaefe9e9d485763c7489767d79c58ac9491104 Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Thu, 28 Dec 2023 14:09:43 -0800 Subject: [PATCH 845/954] covenenant email template update --- .../emails/submitted-to-alc/cove-applicant.template.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/services/templates/emails/submitted-to-alc/cove-applicant.template.ts b/services/templates/emails/submitted-to-alc/cove-applicant.template.ts index a4cd371325..728e6f8f97 100644 --- a/services/templates/emails/submitted-to-alc/cove-applicant.template.ts +++ b/services/templates/emails/submitted-to-alc/cove-applicant.template.ts @@ -26,6 +26,9 @@ const template = `<mjml> <mj-text font-size='16px'> There is no application fee associated with registering a Restrictive Covenant. </mj-text> + <mj-text font-size='16px'> + Please be advised that the status of the application in the ALC Portal will update and a notification email will be sent out as the application moves through each stage of the application review process. Should the ALC Land Use Planner require any additional information or clarification regarding the application, they will contact you. Further information about the application process can be obtained from the ALC website. + </mj-text> <mj-text font-size='16px'> If you are an agent acting on behalf of the applicant(s) / landowner(s), it is your responsibility to advise them of this, and any future, correspondence. </mj-text> From f64d79b3d6d453f4ca383ee1ecf3c081ecc26d37 Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Thu, 28 Dec 2023 14:14:29 -0800 Subject: [PATCH 846/954] public search disclaimer change --- .../app/features/public/search/public-search.component.html | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/portal-frontend/src/app/features/public/search/public-search.component.html b/portal-frontend/src/app/features/public/search/public-search.component.html index fc9b17a43d..5204581f98 100644 --- a/portal-frontend/src/app/features/public/search/public-search.component.html +++ b/portal-frontend/src/app/features/public/search/public-search.component.html @@ -1,8 +1,9 @@ <section> <h1>Welcome to the ALC Public Search</h1> <app-warning-banner> - This search returns only publicly available information. Applicants and local or First Nation governments should - <a routerLink="/login">log in</a> to view their detailed submissions. + This search returns only publicly available information from submissions created as of July 2015. To view older decisions, visit the + <a routerLink="https://www.alc.gov.bc.ca/application-decision-search/">Applications and Decisions</a> section of the ALC website. + Applicants and local or First Nation governments should <a routerLink="/login">log in to the Portal</a> to view their detailed submissions. </app-warning-banner> <h3>Search by one or more of the following fields:</h3> From b508de09bf7151aa09c0bbe246831ec45b7dcfed Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Thu, 28 Dec 2023 15:03:53 -0800 Subject: [PATCH 847/954] fix --- .../src/app/features/public/search/public-search.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/portal-frontend/src/app/features/public/search/public-search.component.html b/portal-frontend/src/app/features/public/search/public-search.component.html index 5204581f98..73ebfe44cd 100644 --- a/portal-frontend/src/app/features/public/search/public-search.component.html +++ b/portal-frontend/src/app/features/public/search/public-search.component.html @@ -2,7 +2,7 @@ <h1>Welcome to the ALC Public Search</h1> <app-warning-banner> This search returns only publicly available information from submissions created as of July 2015. To view older decisions, visit the - <a routerLink="https://www.alc.gov.bc.ca/application-decision-search/">Applications and Decisions</a> section of the ALC website. + <a href="https://www.alc.gov.bc.ca/application-decision-search/">Applications and Decisions</a> section of the ALC website. Applicants and local or First Nation governments should <a routerLink="/login">log in to the Portal</a> to view their detailed submissions. </app-warning-banner> From 3560e168813a16a165507f29f9e74e28b5b5efa6 Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Tue, 2 Jan 2024 12:00:38 -0800 Subject: [PATCH 848/954] release decision text change --- .../decision-v2/release-dialog/release-dialog.component.html | 4 ++-- .../decision-v2/release-dialog/release-dialog.component.html | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/release-dialog/release-dialog.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/release-dialog/release-dialog.component.html index 5b21922caa..a53ef66038 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/release-dialog/release-dialog.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/release-dialog/release-dialog.component.html @@ -13,8 +13,8 @@ <h2 class="card-title">Confirm Release Decision</h2> </p> <app-warning-banner> If there is more than one decision, the status will not change</app-warning-banner> <p *ngIf="wasReleased"> - The Applicant and Local/First Nation Government will not receive an auto-email notification. Please complete any - notification manually. + If this decision is being released for the first time, the Applicant and Local/First Nation Government will receive + an auto-email containing a link to the decision document(s). Otherwise an auto-email will not be sent. </p> <p *ngIf="!wasReleased">The Applicant and Local/First Nation Government will receive an auto-email notification.</p> </div> diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/release-dialog/release-dialog.component.html b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/release-dialog/release-dialog.component.html index 5b21922caa..a53ef66038 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/release-dialog/release-dialog.component.html +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/release-dialog/release-dialog.component.html @@ -13,8 +13,8 @@ <h2 class="card-title">Confirm Release Decision</h2> </p> <app-warning-banner> If there is more than one decision, the status will not change</app-warning-banner> <p *ngIf="wasReleased"> - The Applicant and Local/First Nation Government will not receive an auto-email notification. Please complete any - notification manually. + If this decision is being released for the first time, the Applicant and Local/First Nation Government will receive + an auto-email containing a link to the decision document(s). Otherwise an auto-email will not be sent. </p> <p *ngIf="!wasReleased">The Applicant and Local/First Nation Government will receive an auto-email notification.</p> </div> From 6db5aa9f9410cb94851ef22658bf7a744a8dcbf7 Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Tue, 2 Jan 2024 14:45:51 -0800 Subject: [PATCH 849/954] Remove extraneous 'primary contact information' --- .../primary-contact/primary-contact.component.html | 1 - .../primary-contact/primary-contact.component.html | 1 - 2 files changed, 2 deletions(-) diff --git a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html index 0d44d44418..a37c84c2b8 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html @@ -9,7 +9,6 @@ <h2>Primary Contact</h2> <section> <div class="agent-form"> - <h4>Primary Contact Information</h4> <form [formGroup]="form"> <div class="full-row"> <p *ngIf="isGovernmentUser"> diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html index 16a5b10f1a..ea324e97ab 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html @@ -9,7 +9,6 @@ <h2>Primary Contact</h2> <section> <div class="agent-form"> - <h4>Primary Contact Information</h4> <form [formGroup]="form"> <div class="full-row"> <p *ngIf="isGovernmentUser"> From cbfde0036b98540319f2721e3e801b9488deeff0 Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Tue, 2 Jan 2024 14:46:30 -0800 Subject: [PATCH 850/954] Make 'edit information' button white --- .../primary-contact/primary-contact.component.html | 2 +- .../primary-contact/primary-contact.component.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html index a37c84c2b8..4aae8b1348 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html @@ -78,7 +78,7 @@ <h2>Primary Contact</h2> <div class="value">{{ email.value }}</div> </div> <div class="row"> - <button mat-stroked-button (click)="onEdit(selectedOwnerUuid)">Edit information</button> + <button mat-flat-button (click)="onEdit(selectedOwnerUuid)">Edit information</button> </div> </div> </div> diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html index ea324e97ab..a297a01162 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html @@ -79,7 +79,7 @@ <h2>Primary Contact</h2> <div class="value">{{ email.value }}</div> </div> <div class="row"> - <button mat-stroked-button (click)="onEdit(selectedOwnerUuid)">Edit information</button> + <button mat-flat-button (click)="onEdit(selectedOwnerUuid)">Edit information</button> </div> </div> </div> From 94483738c8771c7496385e5dea940aed8a2b1876 Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Tue, 2 Jan 2024 14:47:43 -0800 Subject: [PATCH 851/954] Improve authorization letter input - Make label correct size and element - Use proper component for web link - Move field into form --- .../primary-contact.component.html | 49 ++++++++++--------- .../primary-contact.component.scss | 4 -- .../primary-contact.component.html | 49 +++++++++++-------- .../primary-contact.component.scss | 4 -- 4 files changed, 55 insertions(+), 51 deletions(-) diff --git a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html index 4aae8b1348..15a2776fea 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html @@ -168,29 +168,34 @@ <h2>Primary Contact</h2> </div> </div> <!-- /Third-Part Agent/Government --> - </form> - </div> -</section> -<section *ngIf="needsAuthorizationLetter || files.length > 0"> - <h6>Authorization Letters</h6> - <p class="subtext"> - For privately owned Fee Simple parcels, the letter must be signed by all individual landowners and the majority of - directors within the organization.For Crown parcels or Fee Simple parcels owned by a government, the letter must be - signed by senior level staff. - </p> - <p class="alc-link">Visit the <a href="https://www.alc.gov.bc.ca/" target="_blank">ALC website</a> for a template.</p> - <div class="uploader"> - <app-file-drag-drop - [allowMultiple]="true" - [uploadedFiles]="files" - (uploadFiles)="attachAuthorizationLetter($event)" - (deleteFile)="onDeleteFile($event)" - (openFile)="openFile($event)" - [showErrors]="showErrors" - [isRequired]="needsAuthorizationLetter" - [showVirusError]="showVirusError" - ></app-file-drag-drop> + <div class="form-row" *ngIf="needsAuthorizationLetter || files.length > 0"> + <div class="full-row"> + <label for="authorization-letter" class="subheading2">Authorization Letters</label> + <p class="subtext"> + For privately owned Fee Simple parcels, the letter must be signed by all individual landowners and the + majority of directors within the organization.For Crown parcels or Fee Simple parcels owned by a government, + the letter must be signed by senior level staff. + </p> + <app-info-banner> + Visit the <a href="https://www.alc.gov.bc.ca/" target="_blank">ALC website</a> for a template. + </app-info-banner> + <div class="uploader"> + <app-file-drag-drop + id="authorization-letter" + [allowMultiple]="true" + [uploadedFiles]="files" + (uploadFiles)="attachAuthorizationLetter($event)" + (deleteFile)="onDeleteFile($event)" + (openFile)="openFile($event)" + [showErrors]="showErrors" + [isRequired]="needsAuthorizationLetter" + [showVirusError]="showVirusError" + ></app-file-drag-drop> + </div> + </div> + </div> + </form> </div> </section> diff --git a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.scss b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.scss index f1d67335c7..3e5b079ec8 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.scss +++ b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.scss @@ -92,7 +92,3 @@ section { text-overflow: ellipsis; } } - -.alc-link { - background-color: colors.$secondary-color-light; -} diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html index a297a01162..93f655d3d4 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html @@ -169,30 +169,37 @@ <h2>Primary Contact</h2> </div> </div> <!-- /Third-Part Agent/Government --> + + <div class="form-row" *ngIf="needsAuthorizationLetter || hasCrownParcels || files.length > 0"> + <div class="full-row"> + <label for="authorization-letter" class="subheading2">Authorization Letters</label> + <p class="subtext"> + For privately owned Fee Simple parcels, the letter must be signed by all individual landowners and the + majority of directors within the organization.For Crown parcels or Fee Simple parcels owned by a government, + the letter must be signed by senior level staff. + </p> + <app-info-banner> + Visit the <a href="https://www.alc.gov.bc.ca/" target="_blank">ALC website</a> for a template. + </app-info-banner> + <div class="uploader"> + <app-file-drag-drop + id="authorization-letter" + [allowMultiple]="true" + [uploadedFiles]="files" + (uploadFiles)="attachAuthorizationLetter($event)" + (deleteFile)="onDeleteFile($event)" + (openFile)="openFile($event)" + [showErrors]="showErrors" + [isRequired]="needsAuthorizationLetter" + [showVirusError]="showVirusError" + ></app-file-drag-drop> + </div> + </div> + </div> </form> </div> </section> -<section *ngIf="needsAuthorizationLetter || hasCrownParcels || files.length > 0"> - <h6>Authorization Letters</h6> - <p class="subtext"> - For privately owned Fee Simple parcels, the letter must be signed by all individual landowners and the majority of - directors within the organization.For Crown parcels or Fee Simple parcels owned by a government, the letter must be - signed by senior level staff. - </p> - <p class="alc-link">Visit the <a href="https://www.alc.gov.bc.ca/" target="_blank">ALC website</a> for a template.</p> - <div class="uploader"> - <app-file-drag-drop - [allowMultiple]="true" - [uploadedFiles]="files" - (uploadFiles)="attachAuthorizationLetter($event)" - (deleteFile)="onDeleteFile($event)" - (openFile)="openFile($event)" - [showErrors]="showErrors" - [isRequired]="needsAuthorizationLetter" - [showVirusError]="showVirusError" - ></app-file-drag-drop> - </div> -</section> + <div class="button-container"> <button *ngIf="!draftMode" (click)="onSaveExit()" mat-stroked-button color="accent">Save and Exit</button> <button *ngIf="draftMode" (click)="onSaveExit()" mat-stroked-button color="accent">Discard all Changes</button> diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.scss b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.scss index f1d67335c7..3e5b079ec8 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.scss +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.scss @@ -92,7 +92,3 @@ section { text-overflow: ellipsis; } } - -.alc-link { - background-color: colors.$secondary-color-light; -} From 45dc8ab9afd16654cd348f82dc61e86b5926dd28 Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Tue, 2 Jan 2024 15:13:51 -0800 Subject: [PATCH 852/954] Show L/FNG-specific text in confirmation dialog --- ...ary-contact-confirmation-dialog.component.html | 9 ++++++++- ...imary-contact-confirmation-dialog.component.ts | 15 ++++++++++++--- .../primary-contact/primary-contact.component.ts | 4 ++++ ...ary-contact-confirmation-dialog.component.html | 9 ++++++++- ...imary-contact-confirmation-dialog.component.ts | 15 ++++++++++++--- .../primary-contact/primary-contact.component.ts | 4 ++++ 6 files changed, 48 insertions(+), 8 deletions(-) diff --git a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact-confirmation-dialog/primary-contact-confirmation-dialog.component.html b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact-confirmation-dialog/primary-contact-confirmation-dialog.component.html index 045dd6ded5..0bf2ba7a70 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact-confirmation-dialog/primary-contact-confirmation-dialog.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact-confirmation-dialog/primary-contact-confirmation-dialog.component.html @@ -1,5 +1,12 @@ <div mat-dialog-title> - <h4>Will one of the landowners or government contacts added previously be the primary contact?</h4> + <h4> + <ng-container *ngIf="isGovernmentUser"> + Will {{ governmentName ?? 'Local / First Nation Government' }} staff be the primary contact? + </ng-container> + <ng-container *ngIf="!isGovernmentUser"> + Will one of the landowners or government contacts added previously be the primary contact? + </ng-container> + </h4> </div> <div mat-dialog-content class="content"> diff --git a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact-confirmation-dialog/primary-contact-confirmation-dialog.component.ts b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact-confirmation-dialog/primary-contact-confirmation-dialog.component.ts index 5e4ccda57e..7566eb7dac 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact-confirmation-dialog/primary-contact-confirmation-dialog.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact-confirmation-dialog/primary-contact-confirmation-dialog.component.ts @@ -1,5 +1,5 @@ -import { Component } from '@angular/core'; -import { MatDialogRef } from '@angular/material/dialog'; +import { Component, Inject } from '@angular/core'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; @Component({ selector: 'app-primary-contact-confirmation-dialog', @@ -7,7 +7,16 @@ import { MatDialogRef } from '@angular/material/dialog'; styleUrls: ['./primary-contact-confirmation-dialog.component.scss'], }) export class PrimaryContactConfirmationDialogComponent { - constructor(private dialogRef: MatDialogRef<PrimaryContactConfirmationDialogComponent>) {} + public isGovernmentUser: boolean; + public governmentName: boolean; + + constructor( + private dialogRef: MatDialogRef<PrimaryContactConfirmationDialogComponent>, + @Inject(MAT_DIALOG_DATA) public data: PrimaryContactConfirmationDialogComponent + ) { + this.isGovernmentUser = data.isGovernmentUser; + this.governmentName = data.governmentName; + } async onDecide(decision: boolean = false) { this.dialogRef.close(decision); diff --git a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts index 4a24fd668a..078c52a7fc 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts @@ -294,6 +294,10 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni .open(PrimaryContactConfirmationDialogComponent, { panelClass: 'no-padding', disableClose: true, + data: { + isGovernmentUser: this.isGovernmentUser, + governmentName: this.governmentName, + }, }) .beforeClosed() .subscribe(async (confirmed) => { diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact-confirmation-dialog/primary-contact-confirmation-dialog.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact-confirmation-dialog/primary-contact-confirmation-dialog.component.html index 045dd6ded5..0bf2ba7a70 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact-confirmation-dialog/primary-contact-confirmation-dialog.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact-confirmation-dialog/primary-contact-confirmation-dialog.component.html @@ -1,5 +1,12 @@ <div mat-dialog-title> - <h4>Will one of the landowners or government contacts added previously be the primary contact?</h4> + <h4> + <ng-container *ngIf="isGovernmentUser"> + Will {{ governmentName ?? 'Local / First Nation Government' }} staff be the primary contact? + </ng-container> + <ng-container *ngIf="!isGovernmentUser"> + Will one of the landowners or government contacts added previously be the primary contact? + </ng-container> + </h4> </div> <div mat-dialog-content class="content"> diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact-confirmation-dialog/primary-contact-confirmation-dialog.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact-confirmation-dialog/primary-contact-confirmation-dialog.component.ts index 5e4ccda57e..7566eb7dac 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact-confirmation-dialog/primary-contact-confirmation-dialog.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact-confirmation-dialog/primary-contact-confirmation-dialog.component.ts @@ -1,5 +1,5 @@ -import { Component } from '@angular/core'; -import { MatDialogRef } from '@angular/material/dialog'; +import { Component, Inject } from '@angular/core'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; @Component({ selector: 'app-primary-contact-confirmation-dialog', @@ -7,7 +7,16 @@ import { MatDialogRef } from '@angular/material/dialog'; styleUrls: ['./primary-contact-confirmation-dialog.component.scss'], }) export class PrimaryContactConfirmationDialogComponent { - constructor(private dialogRef: MatDialogRef<PrimaryContactConfirmationDialogComponent>) {} + public isGovernmentUser: boolean; + public governmentName: boolean; + + constructor( + private dialogRef: MatDialogRef<PrimaryContactConfirmationDialogComponent>, + @Inject(MAT_DIALOG_DATA) public data: PrimaryContactConfirmationDialogComponent + ) { + this.isGovernmentUser = data.isGovernmentUser; + this.governmentName = data.governmentName; + } async onDecide(decision: boolean = false) { this.dialogRef.close(decision); diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts index 50915c10ef..b00aef100f 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts @@ -296,6 +296,10 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni .open(PrimaryContactConfirmationDialogComponent, { panelClass: 'no-padding', disableClose: true, + data: { + isGovernmentUser: this.isGovernmentUser, + governmentName: this.governmentName, + }, }) .beforeClosed() .subscribe(async (confirmed) => { From 9c51f22aeb5717a3cbfb09e510dff226e80724a3 Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Tue, 2 Jan 2024 16:07:29 -0800 Subject: [PATCH 853/954] Only show authorization letter on toggle selection --- .../primary-contact/primary-contact.component.html | 2 +- .../primary-contact/primary-contact.component.html | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html index 15a2776fea..8721caf611 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html @@ -169,7 +169,7 @@ <h2>Primary Contact</h2> </div> <!-- /Third-Part Agent/Government --> - <div class="form-row" *ngIf="needsAuthorizationLetter || files.length > 0"> + <div class="form-row" *ngIf="isExistingOwner.value !== null && (needsAuthorizationLetter || files.length > 0)"> <div class="full-row"> <label for="authorization-letter" class="subheading2">Authorization Letters</label> <p class="subtext"> diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html index 93f655d3d4..44d4e2ecfc 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html @@ -170,7 +170,10 @@ <h2>Primary Contact</h2> </div> <!-- /Third-Part Agent/Government --> - <div class="form-row" *ngIf="needsAuthorizationLetter || hasCrownParcels || files.length > 0"> + <div + class="form-row" + *ngIf="isExistingOwner.value !== null && (needsAuthorizationLetter || hasCrownParcels || files.length > 0)" + > <div class="full-row"> <label for="authorization-letter" class="subheading2">Authorization Letters</label> <p class="subtext"> From 17f326344c726d600ac1bb08a0401776c3367407 Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Wed, 3 Jan 2024 09:33:57 -0800 Subject: [PATCH 854/954] fixes --- .../edit-submission/proposal/roso/roso-proposal.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.ts index 47d43e6330..356fe65147 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.ts @@ -173,7 +173,7 @@ export class RosoProposalComponent extends FilesStepComponent implements OnInit, soilAlreadyRemovedArea: this.alreadyRemovedTableData?.area ?? null, soilAlreadyRemovedMaximumDepth: this.alreadyRemovedTableData?.maximumDepth ?? null, soilAlreadyRemovedAverageDepth: this.alreadyRemovedTableData?.averageDepth ?? null, - soilProjectDuration: this.projectDuration.value ?? null, + soilProjectDuration: this.projectDuration.value, soilIsExtractionOrMining: parseStringToBoolean(isExtractionOrMining), soilHasSubmittedNotice: parseStringToBoolean(hasSubmittedNotice), }; From edb1e5efb56fe28fe242d513fa896b7d3869aa66 Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Wed, 3 Jan 2024 11:51:39 -0800 Subject: [PATCH 855/954] removed sublabels pofo and roso --- .../edit-submission/proposal/pofo/pofo-proposal.component.html | 1 - .../edit-submission/proposal/roso/roso-proposal.component.html | 1 - 2 files changed, 2 deletions(-) diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pofo/pofo-proposal.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pofo/pofo-proposal.component.html index c6c37ef605..a0e3784d1d 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pofo/pofo-proposal.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pofo/pofo-proposal.component.html @@ -186,7 +186,6 @@ <h2>Proposal</h2> <mat-label> Of the proposed totals indicated above, please provide the dimensions of soil if already placed. </mat-label> - <div class="subtext">If no proposed material has already been placed, please leave 0 in the fields below</div> <app-soil-table tableHeader="Fill already placed" [(data)]="fillAlreadyPlacedTableData" diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.html index a089cfa3ff..b62f9122ca 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.html @@ -172,7 +172,6 @@ <h2>Proposal</h2> >Of the proposed totals provided above, please input the dimensions of soil that has already been removed.</mat-label > - <div class="subtext">If no proposed soil has already been removed, please leave 0 in the fields below</div> <app-soil-table tableHeader="Soil already Removed" [(data)]="alreadyRemovedTableData" From e90e3abe13bf4685701b04baf425c39f6861ecd3 Mon Sep 17 00:00:00 2001 From: "to. sandra" <76515860+sandratoh@users.noreply.github.com> Date: Wed, 3 Jan 2024 14:00:00 -0800 Subject: [PATCH 856/954] Update application project duration fields from two to one input (#1251) * Update application naru project duration to single input field * Update nfu project duration to single line input * Update naru and nfu labels * Update soil project duration in application * Update fill project duration in application * Consolidate app project duration migrations to one * Remove subtext for roso table * Update field label --- .../application-details.component.spec.ts | 12 +- .../naru-details/naru-details.component.html | 17 +- .../nfu-details/nfu-details.component.html | 21 +-- .../pfrs-details/pfrs-details.component.html | 34 +--- .../pofo-details/pofo-details.component.html | 20 +-- .../roso-details/roso-details.component.html | 16 +- .../application-submission.service.spec.ts | 12 +- .../services/application/application.dto.ts | 12 +- .../naru-details/naru-details.component.html | 21 +-- .../nfu-details/nfu-details.component.html | 19 +-- .../pfrs-details/pfrs-details.component.html | 34 +--- .../pofo-details/pofo-details.component.html | 19 +-- .../roso-details/roso-details.component.html | 19 +-- .../naru-proposal.component.html | 57 ++----- .../naru-proposal/naru-proposal.component.ts | 26 +-- .../nfu-proposal/nfu-proposal.component.html | 61 ++----- .../nfu-proposal/nfu-proposal.component.ts | 24 +-- .../pfrs-proposal.component.html | 151 ++++++------------ .../pfrs-proposal/pfrs-proposal.component.ts | 28 +--- .../pofo-proposal.component.html | 63 ++------ .../pofo-proposal/pofo-proposal.component.ts | 14 +- .../roso-proposal.component.html | 64 ++------ .../roso-proposal/roso-proposal.component.ts | 14 +- .../naru-details/naru-details.component.html | 24 +-- .../nfu-details/nfu-details.component.html | 26 +-- .../pfrs-details/pfrs-details.component.html | 80 +++------- .../pofo-details/pofo-details.component.html | 18 +-- .../roso-details/roso-details.component.html | 40 ++--- .../application-submission.dto.ts | 25 +-- .../services/public/public-application.dto.ts | 12 +- ...ation-submission-validator.service.spec.ts | 6 +- ...pplication-submission-validator.service.ts | 3 +- .../application-submission.dto.ts | 44 +---- .../application-submission.entity.ts | 48 +----- .../application-submission.service.ts | 40 ++--- .../generate-submission-document.service.ts | 3 +- .../application/public-application.dto.ts | 20 +-- ...03232741494-update-app-project-duration.ts | 85 ++++++++++ 38 files changed, 365 insertions(+), 867 deletions(-) create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1703232741494-update-app-project-duration.ts diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.spec.ts b/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.spec.ts index 5e51ee5931..fe141f2d2f 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.spec.ts +++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.spec.ts @@ -52,8 +52,7 @@ describe('ApplicationDetailsComponent', () => { soilToPlaceVolume: null, soilToRemoveAverageDepth: null, soilToRemoveMaximumDepth: null, - fillProjectDurationAmount: null, - fillProjectDurationUnit: null, + fillProjectDuration: null, status: {} as ApplicationStatus, type: '', uuid: '', @@ -63,8 +62,7 @@ describe('ApplicationDetailsComponent', () => { naruFloorArea: null, naruInfrastructure: null, naruLocationRationale: null, - naruProjectDurationAmount: null, - naruProjectDurationUnit: null, + naruProjectDuration: null, naruResidenceNecessity: null, naruSubtype: null, naruToPlaceArea: null, @@ -82,8 +80,7 @@ describe('ApplicationDetailsComponent', () => { nfuMaxFillDepth: null, nfuAverageFillDepth: null, nfuOutsideLands: null, - nfuProjectDurationAmount: null, - nfuProjectDurationUnit: null, + nfuProjectDuration: null, nfuTotalFillArea: null, nfuWillImportFill: null, soilAlreadyPlacedArea: null, @@ -96,8 +93,7 @@ describe('ApplicationDetailsComponent', () => { soilIsExtractionOrMining: null, soilIsFollowUp: null, soilFollowUpIDs: null, - soilProjectDurationAmount: null, - soilProjectDurationUnit: null, + soilProjectDuration: null, soilReduceNegativeImpacts: null, soilToPlaceAverageDepth: null, soilToPlaceMaximumDepth: null, diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/naru-details/naru-details.component.html b/alcs-frontend/src/app/features/application/applicant-info/application-details/naru-details/naru-details.component.html index da70e959f5..146ce575e0 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/application-details/naru-details/naru-details.component.html +++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/naru-details/naru-details.component.html @@ -126,6 +126,11 @@ {{ _applicationSubmission.naruFillOrigin }} </div> + <div class="subheading2 grid-1">Placement of Fill Project Duration</div> + <div class="grid-double"> + {{ _applicationSubmission.naruProjectDuration }} + </div> + <div class="subheading1 full-width">Fill to be Placed</div> <div class="full-width soil-table"> <div class="grid-1"><strong>Volume</strong></div> @@ -137,17 +142,5 @@ <div class="grid-1"><strong>Average Depth</strong></div> <div class="grid-2">{{ _applicationSubmission.naruToPlaceAverageDepth }} m</div> </div> - - <div class="full-width"> - <span class="subheading1">Project Duration</span> - </div> - <div class="subheading2 grid-1">Duration</div> - <div class="grid-double"> - {{ _applicationSubmission.naruProjectDurationUnit }} - </div> - <div class="subheading2 grid-1">Length</div> - <div class="grid-double"> - {{ _applicationSubmission.naruProjectDurationAmount }} - </div> </ng-container> </div> diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/nfu-details/nfu-details.component.html b/alcs-frontend/src/app/features/application/applicant-info/application-details/nfu-details/nfu-details.component.html index 7468db234f..68b735a5f5 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/application-details/nfu-details/nfu-details.component.html +++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/nfu-details/nfu-details.component.html @@ -7,9 +7,7 @@ <div class="grid-double"> {{ applicationSubmission.purpose }} </div> - <div class="subheading2 grid-1"> - Could this proposal be accommodated on lands outside of the ALR? - </div> + <div class="subheading2 grid-1">Could this proposal be accommodated on lands outside of the ALR?</div> <div class="grid-double"> {{ applicationSubmission.nfuOutsideLands }} </div> @@ -49,6 +47,11 @@ <h4>Soil and Fill Components</h4> {{ applicationSubmission.nfuFillOriginDescription }} </div> + <div class="subheading2 grid-1">Placement of Fill Project Duration</div> + <div class="grid-double"> + {{ applicationSubmission.nfuProjectDuration }} + </div> + <div class="subheading1 full-width">Fill to be Placed</div> <div class="full-width soil-table"> <div class="grid-1"><strong>Volume</strong></div> @@ -60,17 +63,5 @@ <h4>Soil and Fill Components</h4> <div class="grid-1"><strong>Average Depth</strong></div> <div class="grid-2">{{ applicationSubmission.nfuAverageFillDepth }} m</div> </div> - - <div class="full-width"> - <span class="subheading1">Project Duration</span> - </div> - <div class="subheading2 grid-1">Duration</div> - <div class="grid-double"> - {{ applicationSubmission.nfuProjectDurationUnit }} - </div> - <div class="subheading2 grid-1">Length</div> - <div class="grid-double"> - {{ applicationSubmission.nfuProjectDurationAmount }} - </div> </ng-container> </div> diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/pfrs-details/pfrs-details.component.html b/alcs-frontend/src/app/features/application/applicant-info/application-details/pfrs-details/pfrs-details.component.html index 4a8bd04ddb..aae60b9ec3 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/application-details/pfrs-details/pfrs-details.component.html +++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/pfrs-details/pfrs-details.component.html @@ -16,38 +16,16 @@ <div class="subheading2 grid-1">Placement of Fill Project Duration</div> <div class="grid-double"> - <div *ngIf="_applicationSubmission.fillProjectDurationAmount && _applicationSubmission.fillProjectDurationUnit"> - {{ _applicationSubmission.fillProjectDurationAmount }} - <ng-container [ngPlural]="_applicationSubmission.fillProjectDurationAmount"> - <ng-template ngPluralCase="=1"> - {{ _applicationSubmission.fillProjectDurationUnit.slice(0, -1) | titlecase }} - </ng-template> - <ng-template ngPluralCase="other"> - {{ _applicationSubmission.fillProjectDurationUnit | titlecase }} - </ng-template> - </ng-container> - </div> - <app-no-data - *ngIf="!_applicationSubmission.fillProjectDurationAmount || !_applicationSubmission.fillProjectDurationUnit" - ></app-no-data> + <div *ngIf="_applicationSubmission.fillProjectDuration"> + {{ _applicationSubmission.fillProjectDuration }} + </div> + <app-no-data *ngIf="!_applicationSubmission.fillProjectDuration"></app-no-data> </div> <div class="subheading2 grid-1">Remove of Soil Project Duration</div> <div class="grid-double"> - <div *ngIf="_applicationSubmission.soilProjectDurationAmount && _applicationSubmission.soilProjectDurationUnit"> - {{ _applicationSubmission.soilProjectDurationAmount }} - <ng-container [ngPlural]="_applicationSubmission.soilProjectDurationAmount"> - <ng-template ngPluralCase="=1"> - {{ _applicationSubmission.soilProjectDurationUnit.slice(0, -1) | titlecase }} - </ng-template> - <ng-template ngPluralCase="other"> - {{ _applicationSubmission.soilProjectDurationUnit | titlecase }} - </ng-template> - </ng-container> - </div> - <app-no-data - *ngIf="!_applicationSubmission.soilProjectDurationAmount || !_applicationSubmission.soilProjectDurationUnit" - ></app-no-data> + {{ _applicationSubmission.soilProjectDuration }} + <app-no-data *ngIf="!_applicationSubmission.soilProjectDuration"></app-no-data> </div> <div class="full-width soil-table"> diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/pofo-details/pofo-details.component.html b/alcs-frontend/src/app/features/application/applicant-info/application-details/pofo-details/pofo-details.component.html index 0a21b8d3a6..0d22a0273f 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/application-details/pofo-details/pofo-details.component.html +++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/pofo-details/pofo-details.component.html @@ -14,22 +14,12 @@ <span>{{ _applicationSubmission.purpose }}</span> </div> - <div class="subheading2 grid-1">Project Duration</div> - <div class="grid-double"> - <div *ngIf="_applicationSubmission.soilProjectDurationAmount && _applicationSubmission.soilProjectDurationUnit"> - {{ _applicationSubmission.soilProjectDurationAmount }} - <ng-container [ngPlural]="_applicationSubmission.soilProjectDurationAmount"> - <ng-template ngPluralCase="=1"> - {{ _applicationSubmission.soilProjectDurationUnit.slice(0, -1) | titlecase }} - </ng-template> - <ng-template ngPluralCase="other"> - {{ _applicationSubmission.soilProjectDurationUnit | titlecase }} - </ng-template> - </ng-container> + <div class="subheading2 grid-1">Placement of Fill Project Duration</div> + <div class="grid-double"> + <div *ngIf="_applicationSubmission.soilProjectDuration"> + {{ _applicationSubmission.soilProjectDuration }} </div> - <app-no-data - *ngIf="!_applicationSubmission.soilProjectDurationAmount || !_applicationSubmission.soilProjectDurationUnit" - ></app-no-data> + <app-no-data *ngIf="!_applicationSubmission.soilProjectDuration"></app-no-data> </div> <div class="grid-1"></div> diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/roso-details/roso-details.component.html b/alcs-frontend/src/app/features/application/applicant-info/application-details/roso-details/roso-details.component.html index 20864c54a0..4f1fa8616b 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/application-details/roso-details/roso-details.component.html +++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/roso-details/roso-details.component.html @@ -14,21 +14,13 @@ <span>{{ _applicationSubmission.purpose }}</span> </div> - <div class="subheading2 grid-1">Project Duration</div> + <div class="subheading2 grid-1">Removal of Soil Project Duration</div> <div class="grid-double"> - <div *ngIf="_applicationSubmission.soilProjectDurationAmount && _applicationSubmission.soilProjectDurationUnit"> - {{ _applicationSubmission.soilProjectDurationAmount }} - <ng-container [ngPlural]="_applicationSubmission.soilProjectDurationAmount"> - <ng-template ngPluralCase="=1"> - {{ _applicationSubmission.soilProjectDurationUnit.slice(0, -1) | titlecase }} - </ng-template> - <ng-template ngPluralCase="other"> - {{ _applicationSubmission.soilProjectDurationUnit | titlecase }} - </ng-template> - </ng-container> + <div *ngIf="_applicationSubmission.soilProjectDuration"> + {{ _applicationSubmission.soilProjectDuration }} </div> <app-no-data - *ngIf="!_applicationSubmission.soilProjectDurationAmount || !_applicationSubmission.soilProjectDurationUnit" + *ngIf="!_applicationSubmission.soilProjectDuration || !_applicationSubmission.soilProjectDuration" ></app-no-data> </div> diff --git a/alcs-frontend/src/app/services/application/application-submission/application-submission.service.spec.ts b/alcs-frontend/src/app/services/application/application-submission/application-submission.service.spec.ts index 25cafafd38..6093edbf74 100644 --- a/alcs-frontend/src/app/services/application/application-submission/application-submission.service.spec.ts +++ b/alcs-frontend/src/app/services/application/application-submission/application-submission.service.spec.ts @@ -38,8 +38,7 @@ describe('ApplicationSubmissionService', () => { naruFloorArea: null, naruInfrastructure: null, naruLocationRationale: null, - naruProjectDurationAmount: null, - naruProjectDurationUnit: null, + naruProjectDuration: null, naruResidenceNecessity: null, naruSubtype: null, naruToPlaceArea: null, @@ -72,8 +71,7 @@ describe('ApplicationSubmissionService', () => { nfuMaxFillDepth: null, nfuAverageFillDepth: null, nfuOutsideLands: null, - nfuProjectDurationAmount: null, - nfuProjectDurationUnit: null, + nfuProjectDuration: null, purpose: '', nfuTotalFillArea: null, nfuWillImportFill: null, @@ -86,10 +84,8 @@ describe('ApplicationSubmissionService', () => { soilIsExtractionOrMining: null, soilIsFollowUp: null, soilFollowUpIDs: null, - soilProjectDurationAmount: null, - soilProjectDurationUnit: null, - fillProjectDurationAmount: null, - fillProjectDurationUnit: null, + soilProjectDuration: null, + fillProjectDuration: null, soilReduceNegativeImpacts: null, soilToPlaceAverageDepth: null, soilToPlaceMaximumDepth: null, diff --git a/alcs-frontend/src/app/services/application/application.dto.ts b/alcs-frontend/src/app/services/application/application.dto.ts index c9fa75cbc6..9f1802a48a 100644 --- a/alcs-frontend/src/app/services/application/application.dto.ts +++ b/alcs-frontend/src/app/services/application/application.dto.ts @@ -143,8 +143,7 @@ export interface ApplicationSubmissionDto { nfuMaxFillDepth: number | null; nfuAverageFillDepth: number | null; nfuFillVolume: number | null; - nfuProjectDurationAmount: number | null; - nfuProjectDurationUnit: string | null; + nfuProjectDuration: string | null; nfuFillTypeDescription: string | null; nfuFillOriginDescription: string | null; @@ -182,10 +181,8 @@ export interface ApplicationSubmissionDto { soilAlreadyPlacedArea: number | null; soilAlreadyPlacedMaximumDepth: number | null; soilAlreadyPlacedAverageDepth: number | null; - soilProjectDurationAmount: number | null; - soilProjectDurationUnit: string | null; - fillProjectDurationAmount: number | null; - fillProjectDurationUnit: string | null; + soilProjectDuration: string | null; + fillProjectDuration: string | null; soilFillTypeToPlace: string | null; soilAlternativeMeasures: string | null; soilIsExtractionOrMining: boolean | null; @@ -201,8 +198,7 @@ export interface ApplicationSubmissionDto { naruWillImportFill: boolean | null; naruFillType: string | null; naruFillOrigin: string | null; - naruProjectDurationAmount: number | null; - naruProjectDurationUnit: string | null; + naruProjectDuration: string | null; naruToPlaceVolume: number | null; naruToPlaceArea: number | null; naruToPlaceMaximumDepth: number | null; diff --git a/portal-frontend/src/app/features/applications/application-details/naru-details/naru-details.component.html b/portal-frontend/src/app/features/applications/application-details/naru-details/naru-details.component.html index 91988d357e..bc3c576e3e 100644 --- a/portal-frontend/src/app/features/applications/application-details/naru-details/naru-details.component.html +++ b/portal-frontend/src/app/features/applications/application-details/naru-details/naru-details.component.html @@ -164,23 +164,10 @@ <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.naruFillOrigin"></app-no-data> </div> - <div class="subheading2 grid-1">Fill Project Duration</div> - <div class="grid-double"> - <div *ngIf="_applicationSubmission.naruProjectDurationAmount && _applicationSubmission.naruProjectDurationUnit"> - {{ _applicationSubmission.naruProjectDurationAmount }} - <ng-container [ngPlural]="_applicationSubmission.naruProjectDurationAmount"> - <ng-template ngPluralCase="=1"> - {{ _applicationSubmission.naruProjectDurationUnit.slice(0, -1) | titlecase }} - </ng-template> - <ng-template ngPluralCase="other"> - {{ _applicationSubmission.naruProjectDurationUnit | titlecase }} - </ng-template> - </ng-container> - </div> - <app-no-data - [showRequired]="showErrors" - *ngIf="!_applicationSubmission.naruProjectDurationAmount || !_applicationSubmission.naruProjectDurationUnit" - ></app-no-data> + <div class="subheading2 grid-1">Placement of Fill Project Duration</div> + <div class="grid-double"> + <div *ngIf="_applicationSubmission.naruProjectDuration">{{ _applicationSubmission.naruProjectDuration }}</div> + <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.naruProjectDuration"></app-no-data> </div> <div class="grid-1"></div> diff --git a/portal-frontend/src/app/features/applications/application-details/nfu-details/nfu-details.component.html b/portal-frontend/src/app/features/applications/application-details/nfu-details/nfu-details.component.html index a1994a03c5..9ebfad34cb 100644 --- a/portal-frontend/src/app/features/applications/application-details/nfu-details/nfu-details.component.html +++ b/portal-frontend/src/app/features/applications/application-details/nfu-details/nfu-details.component.html @@ -53,23 +53,10 @@ <h4>Soil and Fill Components</h4> <app-no-data [showRequired]="showErrors" *ngIf="!applicationSubmission.nfuFillOriginDescription"></app-no-data> </div> - <div class="subheading2 grid-1">Fill Project Duration</div> + <div class="subheading2 grid-1">Placement of Fill Project Duration</div> <div class="grid-double"> - <div *ngIf="applicationSubmission.nfuProjectDurationAmount && applicationSubmission.nfuProjectDurationUnit"> - {{ applicationSubmission.nfuProjectDurationAmount }} - <ng-container [ngPlural]="applicationSubmission.nfuProjectDurationAmount"> - <ng-template ngPluralCase="=1"> - {{ applicationSubmission.nfuProjectDurationUnit.slice(0, -1) | titlecase }} - </ng-template> - <ng-template ngPluralCase="other"> - {{ applicationSubmission.nfuProjectDurationUnit | titlecase }} - </ng-template> - </ng-container> - </div> - <app-no-data - [showRequired]="showErrors" - *ngIf="!applicationSubmission.nfuProjectDurationAmount || !applicationSubmission.nfuProjectDurationUnit" - ></app-no-data> + <div *ngIf="applicationSubmission.nfuProjectDuration">{{ applicationSubmission.nfuProjectDuration }}</div> + <app-no-data [showRequired]="showErrors" *ngIf="!applicationSubmission.nfuProjectDuration"></app-no-data> </div> <div class="grid-1"></div> diff --git a/portal-frontend/src/app/features/applications/application-details/pfrs-details/pfrs-details.component.html b/portal-frontend/src/app/features/applications/application-details/pfrs-details/pfrs-details.component.html index 2f3556aeb1..747c34d3db 100644 --- a/portal-frontend/src/app/features/applications/application-details/pfrs-details/pfrs-details.component.html +++ b/portal-frontend/src/app/features/applications/application-details/pfrs-details/pfrs-details.component.html @@ -23,40 +23,18 @@ <div class="subheading2 grid-1">Placement of Fill Project Duration</div> <div class="grid-double"> - <div *ngIf="_applicationSubmission.fillProjectDurationAmount && _applicationSubmission.fillProjectDurationUnit"> - {{ _applicationSubmission.fillProjectDurationAmount }} - <ng-container [ngPlural]="_applicationSubmission.fillProjectDurationAmount"> - <ng-template ngPluralCase="=1"> - {{ _applicationSubmission.fillProjectDurationUnit.slice(0, -1) | titlecase }} - </ng-template> - <ng-template ngPluralCase="other"> - {{ _applicationSubmission.fillProjectDurationUnit | titlecase }} - </ng-template> - </ng-container> + <div *ngIf="_applicationSubmission.fillProjectDuration"> + {{ _applicationSubmission.fillProjectDuration }} </div> - <app-no-data - [showRequired]="showErrors" - *ngIf="!_applicationSubmission.fillProjectDurationAmount || !_applicationSubmission.fillProjectDurationUnit" - ></app-no-data> + <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.fillProjectDuration"></app-no-data> </div> <div class="subheading2 grid-1">Removal of Soil Project Duration</div> <div class="grid-double"> - <div *ngIf="_applicationSubmission.soilProjectDurationAmount && _applicationSubmission.soilProjectDurationUnit"> - {{ _applicationSubmission.soilProjectDurationAmount }} - <ng-container [ngPlural]="_applicationSubmission.soilProjectDurationAmount"> - <ng-template ngPluralCase="=1"> - {{ _applicationSubmission.soilProjectDurationUnit.slice(0, -1) | titlecase }} - </ng-template> - <ng-template ngPluralCase="other"> - {{ _applicationSubmission.soilProjectDurationUnit | titlecase }} - </ng-template> - </ng-container> + <div *ngIf="_applicationSubmission.soilProjectDuration"> + {{ _applicationSubmission.soilProjectDuration }} </div> - <app-no-data - [showRequired]="showErrors" - *ngIf="!_applicationSubmission.soilProjectDurationAmount || !_applicationSubmission.soilProjectDurationUnit" - ></app-no-data> + <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.soilProjectDuration"></app-no-data> </div> <div class="full-width soil-table"> diff --git a/portal-frontend/src/app/features/applications/application-details/pofo-details/pofo-details.component.html b/portal-frontend/src/app/features/applications/application-details/pofo-details/pofo-details.component.html index e6c6146782..9ab3a5ecd2 100644 --- a/portal-frontend/src/app/features/applications/application-details/pofo-details/pofo-details.component.html +++ b/portal-frontend/src/app/features/applications/application-details/pofo-details/pofo-details.component.html @@ -21,23 +21,12 @@ <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.purpose"></app-no-data> </div> - <div class="subheading2 grid-1">Project Duration</div> + <div class="subheading2 grid-1">Placement of Fill Project Duration</div> <div class="grid-double"> - <div *ngIf="_applicationSubmission.soilProjectDurationAmount && _applicationSubmission.soilProjectDurationUnit"> - {{ _applicationSubmission.soilProjectDurationAmount }} - <ng-container [ngPlural]="_applicationSubmission.soilProjectDurationAmount"> - <ng-template ngPluralCase="=1"> - {{ _applicationSubmission.soilProjectDurationUnit.slice(0, -1) | titlecase }} - </ng-template> - <ng-template ngPluralCase="other"> - {{ _applicationSubmission.soilProjectDurationUnit | titlecase }} - </ng-template> - </ng-container> + <div *ngIf="_applicationSubmission.soilProjectDuration"> + {{ _applicationSubmission.soilProjectDuration }} </div> - <app-no-data - [showRequired]="showErrors" - *ngIf="!_applicationSubmission.soilProjectDurationAmount || !_applicationSubmission.soilProjectDurationUnit" - ></app-no-data> + <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.soilProjectDuration"></app-no-data> </div> <div class="grid-1"></div> diff --git a/portal-frontend/src/app/features/applications/application-details/roso-details/roso-details.component.html b/portal-frontend/src/app/features/applications/application-details/roso-details/roso-details.component.html index bd4a7980f2..6a37bda82f 100644 --- a/portal-frontend/src/app/features/applications/application-details/roso-details/roso-details.component.html +++ b/portal-frontend/src/app/features/applications/application-details/roso-details/roso-details.component.html @@ -21,23 +21,12 @@ <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.purpose"></app-no-data> </div> - <div class="subheading2 grid-1">Project Duration</div> + <div class="subheading2 grid-1">Removal of Soil Project Duration</div> <div class="grid-double"> - <div *ngIf="_applicationSubmission.soilProjectDurationAmount && _applicationSubmission.soilProjectDurationUnit"> - {{ _applicationSubmission.soilProjectDurationAmount }} - <ng-container [ngPlural]="_applicationSubmission.soilProjectDurationAmount"> - <ng-template ngPluralCase="=1"> - {{ _applicationSubmission.soilProjectDurationUnit.slice(0, -1) | titlecase }} - </ng-template> - <ng-template ngPluralCase="other"> - {{ _applicationSubmission.soilProjectDurationUnit | titlecase }} - </ng-template> - </ng-container> + <div *ngIf="_applicationSubmission.soilProjectDuration"> + {{ _applicationSubmission.soilProjectDuration }} </div> - <app-no-data - [showRequired]="showErrors" - *ngIf="!_applicationSubmission.soilProjectDurationAmount || !_applicationSubmission.soilProjectDurationUnit" - ></app-no-data> + <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.soilProjectDuration"></app-no-data> </div> <div class="grid-1"></div> diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.html index 0225b186e0..fed2bbf1ca 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.html @@ -516,60 +516,35 @@ <h3>Soil & Fill Components</h3> </div> </div> - <app-soil-table - [disabled]="willImportFill.value === 'false'" - tableHeader="Fill to be Placed" - [(data)]="fillTableData" - (dataChange)="markDirty()" - ></app-soil-table> - </section> - - <section> - <h4>Project Duration</h4> - <div class="subtext">Estimated duration of the project</div> <div class="form-row"> - <div> - <mat-label for="projectDurationUnit">Duration</mat-label> - <div class="subtext">Days, Months, or Years</div> - <mat-form-field appearance="outline"> - <mat-select placeholder="Select one" id="projectDurationUnit" formControlName="projectDurationUnit"> - <mat-option value="days">Days</mat-option> - <mat-option value="months">Months</mat-option> - <mat-option value="years">Years</mat-option> - </mat-select> - </mat-form-field> - <div - *ngIf="projectDurationUnit.invalid && (projectDurationUnit.dirty || projectDurationUnit.touched)" - class="field-error" - > - <mat-icon>warning</mat-icon> - <div *ngIf="projectDurationUnit.errors?.['required']">This field is required</div> - </div> - </div> - <div> - <label for="projectDurationAmount">Length</label> - <div class="subtext">Decimals can be used - e.g. 3.5 months or 1.5 years</div> + <div class="full-row"> + <label for="projectDuration">Placement of Fill Project Duration</label> + <div class="subtext">Length of time you anticipate it would take to complete the project</div> <mat-form-field appearance="outline"> <input - id="projectDurationAmount" - mask="separator.2" - thousandSeparator="," - separatorLimit="9999999999" - min="0.01" + id="projectDuration" matInput - formControlName="projectDurationAmount" - placeholder="Type length" + formControlName="projectDuration" + placeholder="Type project duration" /> </mat-form-field> <div - *ngIf="projectDurationAmount.invalid && (projectDurationAmount.dirty || projectDurationAmount.touched)" + *ngIf="projectDuration.invalid && (projectDuration.dirty || projectDuration.touched)" class="field-error" > <mat-icon>warning</mat-icon> - <div *ngIf="projectDurationAmount.errors?.['required']">This field is required</div> + <div *ngIf="projectDuration.errors?.['required']">This field is required</div> </div> + <mat-hint class="subtext">Example: 30 years; or 3 months; or 5 days</mat-hint> </div> </div> + + <app-soil-table + [disabled]="willImportFill.value === 'false'" + tableHeader="Fill to be Placed" + [(data)]="fillTableData" + (dataChange)="markDirty()" + ></app-soil-table> </section> </ng-container> </form> diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.ts index d408796b80..a163e8a7ee 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.ts @@ -42,8 +42,7 @@ export class NaruProposalComponent extends FilesStepComponent implements OnInit, willImportFill = new FormControl<string | null>(null, [Validators.required]); fillType = new FormControl<string | null>(null, [Validators.required]); fillOrigin = new FormControl<string | null>(null, [Validators.required]); - projectDurationAmount = new FormControl<string | null>(null, [Validators.required]); - projectDurationUnit = new FormControl<string | null>(null, [Validators.required]); + projectDuration = new FormControl<string | null>(null, [Validators.required]); sleepingUnits = new FormControl<string | null>(null, [Validators.required]); agriTourism = new FormControl<string | null>(null, [Validators.required]); @@ -61,8 +60,7 @@ export class NaruProposalComponent extends FilesStepComponent implements OnInit, willImportFill: this.willImportFill, fillType: this.fillType, fillOrigin: this.fillOrigin, - projectDurationAmount: this.projectDurationAmount, - projectDurationUnit: this.projectDurationUnit, + projectDuration: this.projectDuration, sleepingUnits: this.sleepingUnits, agriTourism: this.agriTourism, }); @@ -97,10 +95,7 @@ export class NaruProposalComponent extends FilesStepComponent implements OnInit, floorArea: applicationSubmission.naruFloorArea ? applicationSubmission.naruFloorArea.toString() : null, infrastructure: applicationSubmission.naruInfrastructure, locationRationale: applicationSubmission.naruLocationRationale, - projectDurationAmount: applicationSubmission.naruProjectDurationAmount - ? applicationSubmission.naruProjectDurationAmount.toString() - : null, - projectDurationUnit: applicationSubmission.naruProjectDurationUnit, + projectDuration: applicationSubmission.naruProjectDuration, purpose: applicationSubmission.purpose, residenceNecessity: applicationSubmission.naruResidenceNecessity, agriTourism: applicationSubmission.naruAgriTourism, @@ -164,18 +159,15 @@ export class NaruProposalComponent extends FilesStepComponent implements OnInit, onChangeFill(value: string) { if (value === 'true') { - this.projectDurationAmount.enable(); - this.projectDurationUnit.enable(); + this.projectDuration.enable(); this.fillOrigin.enable(); this.fillType.enable(); } else { - this.projectDurationAmount.disable(); - this.projectDurationUnit.disable(); + this.projectDuration.disable(); this.fillOrigin.disable(); this.fillType.disable(); - this.projectDurationAmount.setValue(null); - this.projectDurationUnit.setValue(null); + this.projectDuration.setValue(null); this.fillOrigin.setValue(null); this.fillType.setValue(null); } @@ -191,8 +183,7 @@ export class NaruProposalComponent extends FilesStepComponent implements OnInit, floorArea, infrastructure, locationRationale, - projectDurationAmount, - projectDurationUnit, + projectDuration, purpose, residenceNecessity, subtype, @@ -212,8 +203,7 @@ export class NaruProposalComponent extends FilesStepComponent implements OnInit, naruFloorArea: floorArea ? parseFloat(floorArea) : null, naruInfrastructure: infrastructure, naruLocationRationale: locationRationale, - naruProjectDurationAmount: projectDurationAmount ? parseFloat(projectDurationAmount) : null, - naruProjectDurationUnit: projectDurationUnit, + naruProjectDuration: projectDuration, purpose: purpose, naruResidenceNecessity: residenceNecessity, naruSubtypeCode: subtype, diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/nfu-proposal/nfu-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/nfu-proposal/nfu-proposal.component.html index f0dc10485f..cfe02c2dc9 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/nfu-proposal/nfu-proposal.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/nfu-proposal/nfu-proposal.component.html @@ -193,60 +193,27 @@ <h3>Soil & Fill Components</h3> </div> </div> - <app-soil-table - [disabled]="willImportFill.value === 'false'" - tableHeader="Fill to be Placed" - [(data)]="fillTableData" - (dataChange)="markDirty()" - ></app-soil-table> - </section> - - <section> - <h4>Project Duration</h4> - <div class="subtext">Estimated duration of the project</div> <div class="form-row"> - <div> - <mat-label for="projectDurationUnit">Duration</mat-label> - <div class="subtext">Days, Months, or Years</div> - <mat-form-field appearance="outline"> - <mat-select placeholder="Select one" id="projectDurationUnit" formControlName="projectDurationUnit"> - <mat-option value="days">Days</mat-option> - <mat-option value="months">Months</mat-option> - <mat-option value="years">Years</mat-option> - </mat-select> - </mat-form-field> - <div - *ngIf="projectDurationUnit.invalid && (projectDurationUnit.dirty || projectDurationUnit.touched)" - class="field-error" - > - <mat-icon>warning</mat-icon> - <div *ngIf="projectDurationUnit.errors?.['required']">This field is required</div> - </div> - </div> - <div> - <label for="projectDurationAmount">Length</label> - <div class="subtext">Decimals can be used - e.g. 3.5 months or 1.5 years</div> + <div class="full-row"> + <label for="projectDuration">Placement of Fill Project Duration</label> + <div class="subtext">Length of time you anticipate it would take to complete the project</div> <mat-form-field appearance="outline"> - <input - id="projectDurationAmount" - mask="separator.2" - thousandSeparator="," - separatorLimit="9999999999" - min="0.01" - matInput - formControlName="projectDurationAmount" - placeholder="Type length" - /> + <input id="projectDuration" matInput formControlName="projectDuration" placeholder="Type project duration" /> </mat-form-field> - <div - *ngIf="projectDurationAmount.invalid && (projectDurationAmount.dirty || projectDurationAmount.touched)" - class="field-error" - > + <div *ngIf="projectDuration.invalid && (projectDuration.dirty || projectDuration.touched)" class="field-error"> <mat-icon>warning</mat-icon> - <div *ngIf="projectDurationAmount.errors?.['required']">This field is required</div> + <div *ngIf="projectDuration.errors?.['required']">This field is required</div> </div> + <mat-hint class="subtext">Example: 30 years; or 3 months; or 5 days</mat-hint> </div> </div> + + <app-soil-table + [disabled]="willImportFill.value === 'false'" + tableHeader="Fill to be Placed" + [(data)]="fillTableData" + (dataChange)="markDirty()" + ></app-soil-table> </section> </form> <div class="button-container"> diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/nfu-proposal/nfu-proposal.component.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/nfu-proposal/nfu-proposal.component.ts index 8c6902a55b..f81dd0cb92 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/nfu-proposal/nfu-proposal.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/nfu-proposal/nfu-proposal.component.ts @@ -31,8 +31,7 @@ export class NfuProposalComponent extends FilesStepComponent implements OnInit, outsideLands = new FormControl<string | null>(null, [Validators.required]); agricultureSupport = new FormControl<string | null>(null, [Validators.required]); willImportFill = new FormControl<string | null>(null, [Validators.required]); - projectDurationAmount = new FormControl<string | null>(null, [Validators.required]); - projectDurationUnit = new FormControl<string | null>(null, [Validators.required]); + projectDuration = new FormControl<string | null>(null, [Validators.required]); fillTypeDescription = new FormControl<string | null>(null, [Validators.required]); fillOriginDescription = new FormControl<string | null>(null, [Validators.required]); @@ -42,8 +41,7 @@ export class NfuProposalComponent extends FilesStepComponent implements OnInit, outsideLands: this.outsideLands, agricultureSupport: this.agricultureSupport, willImportFill: this.willImportFill, - projectDurationAmount: this.projectDurationAmount, - projectDurationUnit: this.projectDurationUnit, + projectDuration: this.projectDuration, fillTypeDescription: this.fillTypeDescription, fillOriginDescription: this.fillOriginDescription, }); @@ -71,8 +69,7 @@ export class NfuProposalComponent extends FilesStepComponent implements OnInit, purpose: applicationSubmission.purpose, outsideLands: applicationSubmission.nfuOutsideLands, agricultureSupport: applicationSubmission.nfuAgricultureSupport, - projectDurationAmount: applicationSubmission.nfuProjectDurationAmount?.toString(), - projectDurationUnit: applicationSubmission.nfuProjectDurationUnit, + projectDuration: applicationSubmission.nfuProjectDuration, fillTypeDescription: applicationSubmission.nfuFillTypeDescription, fillOriginDescription: applicationSubmission.nfuFillOriginDescription, }); @@ -116,8 +113,7 @@ export class NfuProposalComponent extends FilesStepComponent implements OnInit, const nfuOutsideLands = this.outsideLands.getRawValue(); const nfuAgricultureSupport = this.agricultureSupport.getRawValue(); const nfuWillImportFill = this.willImportFill.getRawValue(); - const nfuProjectDurationAmount = this.projectDurationAmount.getRawValue(); - const nfuProjectDurationUnit = this.projectDurationUnit.getRawValue(); + const nfuProjectDuration = this.projectDuration.getRawValue(); const nfuFillTypeDescription = this.fillTypeDescription.getRawValue(); const nfuFillOriginDescription = this.fillOriginDescription.getRawValue(); @@ -131,8 +127,7 @@ export class NfuProposalComponent extends FilesStepComponent implements OnInit, nfuMaxFillDepth: this.fillTableData.maximumDepth ?? null, nfuAverageFillDepth: this.fillTableData.averageDepth ?? null, nfuFillVolume: this.fillTableData.volume ?? null, - nfuProjectDurationAmount: nfuProjectDurationAmount ? parseFloat(nfuProjectDurationAmount) : null, - nfuProjectDurationUnit, + nfuProjectDuration, nfuFillTypeDescription, nfuFillOriginDescription, }; @@ -144,18 +139,15 @@ export class NfuProposalComponent extends FilesStepComponent implements OnInit, onChangeFill(value: string) { if (value === 'true') { - this.projectDurationAmount.enable(); - this.projectDurationUnit.enable(); + this.projectDuration.enable(); this.fillTypeDescription.enable(); this.fillOriginDescription.enable(); } else { - this.projectDurationAmount.disable(); - this.projectDurationUnit.disable(); + this.projectDuration.disable(); this.fillTypeDescription.disable(); this.fillOriginDescription.disable(); - this.projectDurationAmount.setValue(null); - this.projectDurationUnit.setValue(null); + this.projectDuration.setValue(null); this.fillTypeDescription.setValue(null); this.fillOriginDescription.setValue(null); } diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.html index 228e5746e5..ebd2e0c895 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.html @@ -89,6 +89,51 @@ <h2>Proposal</h2> <div *ngIf="purpose.errors?.['required']">This field is required</div> </div> </div> + + <div class="form-row full-row"> + <div> + <mat-label for="soilProjectDuration">Placement of Fill Project Duration</mat-label> + <div class="subtext">Length of time you anticipate it would take to complete the project</div> + <mat-form-field appearance="outline"> + <input + id="fillProjectDuration" + matInput + formControlName="fillProjectDuration" + placeholder="Type project duration" + /> + </mat-form-field> + <div + *ngIf="fillProjectDuration.invalid && (fillProjectDuration.dirty || fillProjectDuration.touched)" + class="field-error" + > + <mat-icon>warning</mat-icon> + <div *ngIf="fillProjectDuration.errors?.['required']">This field is required</div> + <mat-hint class="subtext">Example: 30 years; or 3 months; or 5 days</mat-hint> + </div> + </div> + + <div> + <mat-label for="soilProjectDuration">Removal of Soil Project Duration</mat-label> + <div class="subtext">Length of time you anticipate it would take to complete the project</div> + <mat-form-field appearance="outline"> + <input + id="soilProjectDuration" + matInput + formControlName="soilProjectDuration" + placeholder="Type project duration" + /> + </mat-form-field> + <div + *ngIf="soilProjectDuration.invalid && (soilProjectDuration.dirty || soilProjectDuration.touched)" + class="field-error" + > + <mat-icon>warning</mat-icon> + <div *ngIf="soilProjectDuration.errors?.['required']">This field is required</div> + <mat-hint class="subtext">Example: 30 years; or 3 months; or 5 days</mat-hint> + </div> + </div> + </div> + <div class="full-row"> <mat-label>Proposal Dimensions</mat-label> <div class="subtext"> @@ -147,112 +192,6 @@ <h2>Proposal</h2> ></app-soil-table> </div> - <div class="full-row"> - <h4>Placement of Fill Project Duration</h4> - <div class="subtext">Estimated duration of the project</div> - <div class="form-row"> - <div> - <label for="fillProjectDurationUnit">Duration</label> - <div class="subtext">Days, Months, or Years</div> - <mat-form-field appearance="outline"> - <mat-select placeholder="Select one" id="fillProjectDurationUnit" formControlName="fillProjectDurationUnit"> - <mat-option value="days">Days</mat-option> - <mat-option value="months">Months</mat-option> - <mat-option value="years">Years</mat-option> - </mat-select> - </mat-form-field> - <div - *ngIf=" - fillProjectDurationUnit.invalid && (fillProjectDurationUnit.dirty || fillProjectDurationUnit.touched) - " - class="field-error" - > - <mat-icon>warning</mat-icon> - <div *ngIf="fillProjectDurationUnit.errors?.['required']">This field is required</div> - </div> - </div> - <div> - <label for="fillProjectDurationUnit">Length</label> - <div class="subtext">Decimals can be used - e.g. 3.5 months or 1.5 years</div> - <mat-form-field appearance="outline"> - <input - id="fillProjectDurationAmount" - mask="separator.2" - thousandSeparator="," - separatorLimit="9999999999" - min="0.01" - matInput - formControlName="fillProjectDurationAmount" - placeholder="Type length" - /> - </mat-form-field> - <div - *ngIf=" - fillProjectDurationAmount.invalid && - (fillProjectDurationAmount.dirty || fillProjectDurationAmount.touched) - " - class="field-error" - > - <mat-icon>warning</mat-icon> - <div *ngIf="fillProjectDurationAmount.errors?.['required']">This field is required</div> - </div> - </div> - </div> - </div> - - <div class="full-row"> - <h4>Removal of Soil Project Duration</h4> - <div class="subtext">Estimated duration of the project</div> - <div class="form-row"> - <div> - <mat-label for="soilProjectDurationUnit">Duration</mat-label> - <div class="subtext">Days, Months, or Years</div> - <mat-form-field appearance="outline"> - <mat-select placeholder="Select one" id="soilProjectDurationUnit" formControlName="soilProjectDurationUnit"> - <mat-option value="days">Days</mat-option> - <mat-option value="months">Months</mat-option> - <mat-option value="years">Years</mat-option> - </mat-select> - </mat-form-field> - <div - *ngIf=" - soilProjectDurationUnit.invalid && (soilProjectDurationUnit.dirty || soilProjectDurationUnit.touched) - " - class="field-error" - > - <mat-icon>warning</mat-icon> - <div *ngIf="soilProjectDurationUnit.errors?.['required']">This field is required</div> - </div> - </div> - <div> - <label for="soilProjectDurationUnit">Length</label> - <div class="subtext">Decimals can be used - e.g. 3.5 months or 1.5 years</div> - <mat-form-field appearance="outline"> - <input - id="soilProjectDurationAmount" - mask="separator.2" - thousandSeparator="," - separatorLimit="9999999999" - min="0.01" - matInput - formControlName="soilProjectDurationAmount" - placeholder="Type length" - /> - </mat-form-field> - <div - *ngIf=" - soilProjectDurationAmount.invalid && - (soilProjectDurationAmount.dirty || soilProjectDurationAmount.touched) - " - class="field-error" - > - <mat-icon>warning</mat-icon> - <div *ngIf="soilProjectDurationAmount.errors?.['required']">This field is required</div> - </div> - </div> - </div> - </div> - <div class="full-row"> <label for="fillTypeToPlace">Describe the type, origin and quality of fill proposed to be placed.</label> <div class="subtext"> diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.ts index c899933dfc..90860ec51c 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.ts @@ -48,10 +48,8 @@ export class PfrsProposalComponent extends FilesStepComponent implements OnInit, purpose = new FormControl<string | null>(null, [Validators.required]); soilTypeRemoved = new FormControl<string | null>(null, [Validators.required]); reduceNegativeImpacts = new FormControl<string | null>(null, [Validators.required]); - soilProjectDurationAmount = new FormControl<string | null>(null, [Validators.required]); - soilProjectDurationUnit = new FormControl<string | null>(null, [Validators.required]); - fillProjectDurationAmount = new FormControl<string | null>(null, [Validators.required]); - fillProjectDurationUnit = new FormControl<string | null>(null, [Validators.required]); + soilProjectDuration = new FormControl<string | null>(null, [Validators.required]); + fillProjectDuration = new FormControl<string | null>(null, [Validators.required]); fillTypeToPlace = new FormControl<string | null>(null, [Validators.required]); alternativeMeasures = new FormControl<string | null>(null, [Validators.required]); isExtractionOrMining = new FormControl<string | null>(null, [Validators.required]); @@ -63,10 +61,8 @@ export class PfrsProposalComponent extends FilesStepComponent implements OnInit, purpose: this.purpose, soilTypeRemoved: this.soilTypeRemoved, reduceNegativeImpacts: this.reduceNegativeImpacts, - soilProjectDurationAmount: this.soilProjectDurationAmount, - soilProjectDurationUnit: this.soilProjectDurationUnit, - fillProjectDurationAmount: this.fillProjectDurationAmount, - fillProjectDurationUnit: this.fillProjectDurationUnit, + soilProjectDuration: this.soilProjectDuration, + fillProjectDuration: this.fillProjectDuration, fillTypeToPlace: this.fillTypeToPlace, alternativeMeasures: this.alternativeMeasures, isExtractionOrMining: this.isExtractionOrMining, @@ -146,10 +142,8 @@ export class PfrsProposalComponent extends FilesStepComponent implements OnInit, reduceNegativeImpacts: applicationSubmission.soilReduceNegativeImpacts, alternativeMeasures: applicationSubmission.soilAlternativeMeasures, fillTypeToPlace: applicationSubmission.soilFillTypeToPlace, - soilProjectDurationAmount: applicationSubmission.soilProjectDurationAmount?.toString() ?? null, - soilProjectDurationUnit: applicationSubmission.soilProjectDurationUnit, - fillProjectDurationAmount: applicationSubmission.fillProjectDurationAmount?.toString() ?? null, - fillProjectDurationUnit: applicationSubmission.fillProjectDurationUnit, + soilProjectDuration: applicationSubmission.soilProjectDuration, + fillProjectDuration: applicationSubmission.fillProjectDuration, isExtractionOrMining: formatBooleanToString(applicationSubmission.soilIsExtractionOrMining), hasSubmittedNotice: formatBooleanToString(applicationSubmission.soilHasSubmittedNotice), }); @@ -225,14 +219,8 @@ export class PfrsProposalComponent extends FilesStepComponent implements OnInit, soilAlreadyPlacedArea: this.alreadyFilledTableData?.area ?? null, soilAlreadyPlacedMaximumDepth: this.alreadyFilledTableData?.maximumDepth ?? null, soilAlreadyPlacedAverageDepth: this.alreadyFilledTableData?.averageDepth ?? null, - soilProjectDurationAmount: this.soilProjectDurationAmount.value - ? parseFloat(this.soilProjectDurationAmount.value) - : null, - soilProjectDurationUnit: this.soilProjectDurationUnit.value, - fillProjectDurationAmount: this.fillProjectDurationAmount.value - ? parseFloat(this.fillProjectDurationAmount.value) - : null, - fillProjectDurationUnit: this.fillProjectDurationUnit.value, + soilProjectDuration: this.soilProjectDuration.value, + fillProjectDuration: this.fillProjectDuration.value, soilHasSubmittedNotice: parseStringToBoolean(this.hasSubmittedNotice.getRawValue()), soilIsExtractionOrMining: parseStringToBoolean(this.isExtractionOrMining.getRawValue()), }; diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.html index 4c385c0155..46e1668702 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.html @@ -88,6 +88,20 @@ <h2>Proposal</h2> </div> <div class="subtext">Characters left: {{ 4000 - purposeText.textLength }}</div> </div> + + <div class="full-row"> + <label for="projectDuration">Placement of Fill Project Duration</label> + <div class="subtext">Length of time you anticipate it would take to complete the project</div> + <mat-form-field appearance="outline"> + <input id="projectDuration" matInput formControlName="projectDuration" placeholder="Type project duration" /> + </mat-form-field> + <div *ngIf="projectDuration.invalid && (projectDuration.dirty || projectDuration.touched)" class="field-error"> + <mat-icon>warning</mat-icon> + <div *ngIf="projectDuration.errors?.['required']">This field is required</div> + </div> + <mat-hint class="subtext">Example: 30 years; or 3 months; or 5 days</mat-hint> + </div> + <div class="full-row"> <mat-label>Proposal Dimensions</mat-label> <div class="subtext"> @@ -107,7 +121,6 @@ <h2>Proposal</h2> >Of the proposed totals provided above, please input the dimensions of fill that has already been place.</mat-label > - <div class="subtext">If no proposed fill has already been placed, please leave 0 in the fields below</div> <app-soil-table tableHeader="Fill already Placed" [(data)]="alreadyFilledTableData" @@ -115,54 +128,6 @@ <h2>Proposal</h2> ></app-soil-table> </div> - <section> - <h4>Project Duration</h4> - <div class="subtext">Estimated duration of the project</div> - <div class="form-row"> - <div> - <mat-label for="projectDurationUnit">Duration</mat-label> - <div class="subtext">Days, Months, or Years</div> - <mat-form-field appearance="outline"> - <mat-select placeholder="Select one" id="projectDurationUnit" formControlName="projectDurationUnit"> - <mat-option value="days">Days</mat-option> - <mat-option value="months">Months</mat-option> - <mat-option value="years">Years</mat-option> - </mat-select> - </mat-form-field> - <div - *ngIf="projectDurationUnit.invalid && (projectDurationUnit.dirty || projectDurationUnit.touched)" - class="field-error" - > - <mat-icon>warning</mat-icon> - <div *ngIf="projectDurationUnit.errors?.['required']">This field is required</div> - </div> - </div> - <div> - <label for="projectDurationAmount">Length</label> - <div class="subtext">Decimals can be used - e.g. 3.5 months or 1.5 years</div> - <mat-form-field appearance="outline"> - <input - id="projectDurationAmount" - mask="separator.2" - thousandSeparator="," - separatorLimit="9999999999" - min="0.01" - matInput - formControlName="projectDurationAmount" - placeholder="Type length" - /> - </mat-form-field> - <div - *ngIf="projectDurationAmount.invalid && (projectDurationAmount.dirty || projectDurationAmount.touched)" - class="field-error" - > - <mat-icon>warning</mat-icon> - <div *ngIf="projectDurationAmount.errors?.['required']">This field is required</div> - </div> - </div> - </div> - </section> - <div class="full-row"> <label for="fillTypeToPlace">Describe the type, origin and quality of fill proposed to be placed.</label> <div class="subtext"> diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.ts index 924961c07b..ff2b8cff28 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.ts @@ -39,8 +39,7 @@ export class PofoProposalComponent extends FilesStepComponent implements OnInit, fillTypeToPlace = new FormControl<string | null>(null, [Validators.required]); reduceNegativeImpacts = new FormControl<string | null>(null, [Validators.required]); alternativeMeasures = new FormControl<string | null>(null, [Validators.required]); - projectDurationAmount = new FormControl<string | null>(null, [Validators.required]); - projectDurationUnit = new FormControl<string | null>(null, [Validators.required]); + projectDuration = new FormControl<string | null>(null, [Validators.required]); form = new FormGroup({ isFollowUp: this.isFollowUp, @@ -49,8 +48,7 @@ export class PofoProposalComponent extends FilesStepComponent implements OnInit, fillTypeToPlace: this.fillTypeToPlace, alternativeMeasures: this.alternativeMeasures, reduceNegativeImpacts: this.reduceNegativeImpacts, - projectDurationAmount: this.projectDurationAmount, - projectDurationUnit: this.projectDurationUnit, + projectDuration: this.projectDuration, }); private submissionUuid = ''; @@ -99,8 +97,7 @@ export class PofoProposalComponent extends FilesStepComponent implements OnInit, fillTypeToPlace: applicationSubmission.soilFillTypeToPlace, alternativeMeasures: applicationSubmission.soilAlternativeMeasures, reduceNegativeImpacts: applicationSubmission.soilReduceNegativeImpacts, - projectDurationAmount: applicationSubmission.soilProjectDurationAmount?.toString() ?? null, - projectDurationUnit: applicationSubmission.soilProjectDurationUnit, + projectDuration: applicationSubmission.soilProjectDuration, }); if (this.showErrors) { this.form.markAllAsTouched(); @@ -158,10 +155,7 @@ export class PofoProposalComponent extends FilesStepComponent implements OnInit, soilAlreadyPlacedArea: this.alreadyFilledTableData?.area ?? null, soilAlreadyPlacedMaximumDepth: this.alreadyFilledTableData?.maximumDepth ?? null, soilAlreadyPlacedAverageDepth: this.alreadyFilledTableData?.averageDepth ?? null, - soilProjectDurationAmount: this.projectDurationAmount.value - ? parseFloat(this.projectDurationAmount.value) - : null, - soilProjectDurationUnit: this.projectDurationUnit.value, + soilProjectDuration: this.projectDuration.value, }; const updatedApp = await this.applicationService.updatePending(this.submissionUuid, updateDto); diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.html index 4fd4e8d51d..26c694dc81 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.html @@ -89,6 +89,20 @@ <h2>Proposal</h2> </div> <div class="subtext">Characters left: {{ 4000 - purposeText.textLength }}</div> </div> + + <div class="full-row"> + <label for="projectDuration">Removal of Soil Project Duration</label> + <div class="subtext">Length of time you anticipate it would take to complete the project</div> + <mat-form-field appearance="outline"> + <input id="projectDuration" matInput formControlName="projectDuration" placeholder="Type project duration" /> + </mat-form-field> + <div *ngIf="projectDuration.invalid && (projectDuration.dirty || projectDuration.touched)" class="field-error"> + <mat-icon>warning</mat-icon> + <div *ngIf="projectDuration.errors?.['required']">This field is required</div> + </div> + <mat-hint class="subtext">Example: 30 years; or 3 months; or 5 days</mat-hint> + </div> + <div class="full-row"> <mat-label>Proposal Dimensions</mat-label> <div class="subtext"> @@ -108,62 +122,12 @@ <h2>Proposal</h2> >Of the proposed totals provided above, please input the dimensions of soil that has already been removed.</mat-label > - <div class="subtext">If no proposed soil has already been removed, please leave 0 in the fields below</div> <app-soil-table tableHeader="Soil already Removed" [(data)]="alreadyRemovedTableData" (dataChange)="markDirty()" ></app-soil-table> </div> - - <section> - <h4>Project Duration</h4> - <div class="subtext">Estimated duration of the project</div> - <div class="form-row"> - <div> - <mat-label for="projectDurationUnit">Duration</mat-label> - <div class="subtext">Days, Months, or Years</div> - <mat-form-field appearance="outline"> - <mat-select placeholder="Select one" id="projectDurationUnit" formControlName="projectDurationUnit"> - <mat-option value="days">Days</mat-option> - <mat-option value="months">Months</mat-option> - <mat-option value="years">Years</mat-option> - </mat-select> - </mat-form-field> - <div - *ngIf="projectDurationUnit.invalid && (projectDurationUnit.dirty || projectDurationUnit.touched)" - class="field-error" - > - <mat-icon>warning</mat-icon> - <div *ngIf="projectDurationUnit.errors?.['required']">This field is required</div> - </div> - </div> - <div> - <label for="projectDurationAmount">Length</label> - <div class="subtext">Decimals can be used - e.g. 3.5 months or 1.5 years</div> - <mat-form-field appearance="outline"> - <input - id="projectDurationAmount" - mask="separator.2" - thousandSeparator="," - separatorLimit="9999999999" - min="0.01" - matInput - formControlName="projectDurationAmount" - placeholder="Type length" - /> - </mat-form-field> - <div - *ngIf="projectDurationAmount.invalid && (projectDurationAmount.dirty || projectDurationAmount.touched)" - class="field-error" - > - <mat-icon>warning</mat-icon> - <div *ngIf="projectDurationAmount.errors?.['required']">This field is required</div> - </div> - </div> - </div> - </section> - <div class="full-row"> <label for="soilTypeRemoved">Describe the type of soil proposed to be removed.</label> <div class="subtext">List all proposed soil types to be removed.</div> diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.ts index 0ab956b170..b7eb501e6f 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.ts @@ -39,8 +39,7 @@ export class RosoProposalComponent extends FilesStepComponent implements OnInit, purpose = new FormControl<string | null>(null, [Validators.required]); soilTypeRemoved = new FormControl<string | null>(null, [Validators.required]); reduceNegativeImpacts = new FormControl<string | null>(null, [Validators.required]); - projectDurationAmount = new FormControl<string | null>(null, [Validators.required]); - projectDurationUnit = new FormControl<string | null>(null, [Validators.required]); + projectDuration = new FormControl<string | null>(null, [Validators.required]); areComponentsDirty = false; form = new FormGroup({ @@ -49,8 +48,7 @@ export class RosoProposalComponent extends FilesStepComponent implements OnInit, purpose: this.purpose, soilTypeRemoved: this.soilTypeRemoved, reduceNegativeImpacts: this.reduceNegativeImpacts, - projectDurationAmount: this.projectDurationAmount, - projectDurationUnit: this.projectDurationUnit, + projectDuration: this.projectDuration, }); private submissionUuid = ''; @@ -97,8 +95,7 @@ export class RosoProposalComponent extends FilesStepComponent implements OnInit, purpose: applicationSubmission.purpose, soilTypeRemoved: applicationSubmission.soilTypeRemoved, reduceNegativeImpacts: applicationSubmission.soilReduceNegativeImpacts, - projectDurationAmount: applicationSubmission.soilProjectDurationAmount?.toString() ?? null, - projectDurationUnit: applicationSubmission.soilProjectDurationUnit, + projectDuration: applicationSubmission.soilProjectDuration, }); if (this.showErrors) { this.form.markAllAsTouched(); @@ -154,10 +151,7 @@ export class RosoProposalComponent extends FilesStepComponent implements OnInit, soilAlreadyRemovedArea: this.alreadyRemovedTableData?.area ?? null, soilAlreadyRemovedMaximumDepth: this.alreadyRemovedTableData?.maximumDepth ?? null, soilAlreadyRemovedAverageDepth: this.alreadyRemovedTableData?.averageDepth ?? null, - soilProjectDurationAmount: this.projectDurationAmount.value - ? parseFloat(this.projectDurationAmount.value) - : null, - soilProjectDurationUnit: this.projectDurationUnit.value, + soilProjectDuration: this.projectDuration.value, }; const updatedApp = await this.applicationService.updatePending(this.submissionUuid, updateDto); diff --git a/portal-frontend/src/app/features/public/application/submission/naru-details/naru-details.component.html b/portal-frontend/src/app/features/public/application/submission/naru-details/naru-details.component.html index 22cf7785d8..ddf5f0cac6 100644 --- a/portal-frontend/src/app/features/public/application/submission/naru-details/naru-details.component.html +++ b/portal-frontend/src/app/features/public/application/submission/naru-details/naru-details.component.html @@ -166,20 +166,10 @@ <div class="subheading2 grid-1">Project Duration</div> <div class="grid-double"> - <div *ngIf="applicationSubmission.soilProjectDurationAmount && applicationSubmission.soilProjectDurationUnit"> - {{ applicationSubmission.soilProjectDurationAmount }} - <ng-container [ngPlural]="applicationSubmission.soilProjectDurationAmount"> - <ng-template ngPluralCase="=1"> - {{ applicationSubmission.soilProjectDurationUnit.slice(0, -1) | titlecase }} - </ng-template> - <ng-template ngPluralCase="other"> - {{ applicationSubmission.soilProjectDurationUnit | titlecase }} - </ng-template> - </ng-container> + <div *ngIf="applicationSubmission.naruProjectDuration"> + {{ applicationSubmission.naruProjectDuration }} </div> - <app-no-data - *ngIf="!applicationSubmission.soilProjectDurationAmount || !applicationSubmission.soilProjectDurationUnit" - ></app-no-data> + <app-no-data *ngIf="!applicationSubmission.naruProjectDuration"></app-no-data> </div> <div class="grid-1"></div> @@ -201,17 +191,13 @@ <div class="grid-double"> {{ applicationSubmission.naruToPlaceMaximumDepth }} <span *ngIf="applicationSubmission.naruToPlaceMaximumDepth !== null">m</span> - <app-no-data - *ngIf="applicationSubmission.naruToPlaceMaximumDepth === null" - ></app-no-data> + <app-no-data *ngIf="applicationSubmission.naruToPlaceMaximumDepth === null"></app-no-data> </div> <div class="subheading2 grid-1">Average Depth</div> <div class="grid-double"> {{ applicationSubmission.naruToPlaceAverageDepth }} <span *ngIf="applicationSubmission.naruToPlaceAverageDepth !== null">m</span> - <app-no-data - *ngIf="applicationSubmission.naruToPlaceAverageDepth === null" - ></app-no-data> + <app-no-data *ngIf="applicationSubmission.naruToPlaceAverageDepth === null"></app-no-data> </div> </ng-container> </div> diff --git a/portal-frontend/src/app/features/public/application/submission/nfu-details/nfu-details.component.html b/portal-frontend/src/app/features/public/application/submission/nfu-details/nfu-details.component.html index 1e8994880c..c95067115e 100644 --- a/portal-frontend/src/app/features/public/application/submission/nfu-details/nfu-details.component.html +++ b/portal-frontend/src/app/features/public/application/submission/nfu-details/nfu-details.component.html @@ -53,22 +53,12 @@ <h4>Soil and Fill Components</h4> <app-no-data *ngIf="!applicationSubmission.nfuFillOriginDescription"></app-no-data> </div> - <div class="subheading2 grid-1">Project Duration</div> + <div class="subheading2 grid-1">Placement of Fill Project Duration</div> <div class="grid-double"> - <div *ngIf="applicationSubmission.soilProjectDurationAmount && applicationSubmission.soilProjectDurationUnit"> - {{ applicationSubmission.soilProjectDurationAmount }} - <ng-container [ngPlural]="applicationSubmission.soilProjectDurationAmount"> - <ng-template ngPluralCase="=1"> - {{ applicationSubmission.soilProjectDurationUnit.slice(0, -1) | titlecase }} - </ng-template> - <ng-template ngPluralCase="other"> - {{ applicationSubmission.soilProjectDurationUnit | titlecase }} - </ng-template> - </ng-container> + <div *ngIf="applicationSubmission.nfuProjectDuration"> + {{ applicationSubmission.nfuProjectDuration }} </div> - <app-no-data - *ngIf="!applicationSubmission.soilProjectDurationAmount || !applicationSubmission.soilProjectDurationUnit" - ></app-no-data> + <app-no-data *ngIf="!applicationSubmission.nfuProjectDuration"></app-no-data> </div> <div class="grid-1"></div> @@ -90,17 +80,13 @@ <h4>Soil and Fill Components</h4> <div class="grid-double"> {{ applicationSubmission.nfuMaxFillDepth }} <span *ngIf="applicationSubmission.nfuMaxFillDepth !== null">m</span> - <app-no-data - *ngIf="applicationSubmission.nfuMaxFillDepth === null" - ></app-no-data> + <app-no-data *ngIf="applicationSubmission.nfuMaxFillDepth === null"></app-no-data> </div> <div class="subheading2 grid-1">Average Depth</div> <div class="grid-double"> {{ applicationSubmission.nfuAverageFillDepth }} <span *ngIf="applicationSubmission.nfuAverageFillDepth !== null">m</span> - <app-no-data - *ngIf="applicationSubmission.nfuAverageFillDepth === null" - ></app-no-data> + <app-no-data *ngIf="applicationSubmission.nfuAverageFillDepth === null"></app-no-data> </div> </ng-container> </div> diff --git a/portal-frontend/src/app/features/public/application/submission/pfrs-details/pfrs-details.component.html b/portal-frontend/src/app/features/public/application/submission/pfrs-details/pfrs-details.component.html index 3f4b10324a..d8b9ad3cc9 100644 --- a/portal-frontend/src/app/features/public/application/submission/pfrs-details/pfrs-details.component.html +++ b/portal-frontend/src/app/features/public/application/submission/pfrs-details/pfrs-details.component.html @@ -23,38 +23,18 @@ <div class="subheading2 grid-1">Placement of Fill Project Duration</div> <div class="grid-double"> - <div *ngIf="applicationSubmission.fillProjectDurationAmount && applicationSubmission.fillProjectDurationUnit"> - {{ applicationSubmission.fillProjectDurationAmount }} - <ng-container [ngPlural]="applicationSubmission.fillProjectDurationAmount"> - <ng-template ngPluralCase="=1"> - {{ applicationSubmission.fillProjectDurationUnit.slice(0, -1) | titlecase }} - </ng-template> - <ng-template ngPluralCase="other"> - {{ applicationSubmission.fillProjectDurationUnit | titlecase }} - </ng-template> - </ng-container> + <div *ngIf="applicationSubmission.fillProjectDuration"> + {{ applicationSubmission.fillProjectDuration }} </div> - <app-no-data - *ngIf="!applicationSubmission.fillProjectDurationAmount || !applicationSubmission.fillProjectDurationUnit" - ></app-no-data> + <app-no-data *ngIf="!applicationSubmission.fillProjectDuration"></app-no-data> </div> <div class="subheading2 grid-1">Removal of Soil Project Duration</div> <div class="grid-double"> - <div *ngIf="applicationSubmission.soilProjectDurationAmount && applicationSubmission.soilProjectDurationUnit"> - {{ applicationSubmission.soilProjectDurationAmount }} - <ng-container [ngPlural]="applicationSubmission.soilProjectDurationAmount"> - <ng-template ngPluralCase="=1"> - {{ applicationSubmission.soilProjectDurationUnit.slice(0, -1) | titlecase }} - </ng-template> - <ng-template ngPluralCase="other"> - {{ applicationSubmission.soilProjectDurationUnit | titlecase }} - </ng-template> - </ng-container> + <div *ngIf="applicationSubmission.soilProjectDuration"> + {{ applicationSubmission.soilProjectDuration }} </div> - <app-no-data - *ngIf="!applicationSubmission.soilProjectDurationAmount || !applicationSubmission.soilProjectDurationUnit" - ></app-no-data> + <app-no-data *ngIf="!applicationSubmission.soilProjectDuration"></app-no-data> </div> <div class="full-width soil-table"> @@ -90,32 +70,24 @@ <div> {{ applicationSubmission.soilToRemoveMaximumDepth }} <span *ngIf="applicationSubmission.soilToRemoveMaximumDepth !== null">m</span> - <app-no-data - *ngIf="applicationSubmission.soilToRemoveMaximumDepth === null" - ></app-no-data> + <app-no-data *ngIf="applicationSubmission.soilToRemoveMaximumDepth === null"></app-no-data> </div> <div> {{ applicationSubmission.soilToPlaceMaximumDepth }} <span *ngIf="applicationSubmission.soilToPlaceMaximumDepth !== null">m</span> - <app-no-data - *ngIf="applicationSubmission.soilToPlaceMaximumDepth === null" - ></app-no-data> + <app-no-data *ngIf="applicationSubmission.soilToPlaceMaximumDepth === null"></app-no-data> </div> <div class="subheading2">Average Depth</div> <div> {{ applicationSubmission.soilToRemoveAverageDepth }} <span *ngIf="applicationSubmission.soilToRemoveAverageDepth !== null">m</span> - <app-no-data - *ngIf="applicationSubmission.soilToRemoveAverageDepth === null" - ></app-no-data> + <app-no-data *ngIf="applicationSubmission.soilToRemoveAverageDepth === null"></app-no-data> </div> <div> {{ applicationSubmission.soilToPlaceAverageDepth }} <span *ngIf="applicationSubmission.soilToPlaceAverageDepth !== null">m</span> - <app-no-data - *ngIf="applicationSubmission.soilToPlaceAverageDepth === null" - ></app-no-data> + <app-no-data *ngIf="applicationSubmission.soilToPlaceAverageDepth === null"></app-no-data> </div> <div class="spacer-row"></div> @@ -128,64 +100,48 @@ <div> {{ applicationSubmission.soilAlreadyRemovedVolume }} <span *ngIf="applicationSubmission.soilAlreadyRemovedVolume !== null">m<sup>3</sup></span> - <app-no-data - *ngIf="applicationSubmission.soilAlreadyRemovedVolume === null" - ></app-no-data> + <app-no-data *ngIf="applicationSubmission.soilAlreadyRemovedVolume === null"></app-no-data> </div> <div> {{ applicationSubmission.soilAlreadyPlacedVolume }} <span *ngIf="applicationSubmission.soilAlreadyPlacedVolume !== null">m<sup>3</sup></span> - <app-no-data - *ngIf="applicationSubmission.soilAlreadyPlacedVolume === null" - ></app-no-data> + <app-no-data *ngIf="applicationSubmission.soilAlreadyPlacedVolume === null"></app-no-data> </div> <div class="subheading2">Area</div> <div> {{ applicationSubmission.soilAlreadyRemovedArea }} <span *ngIf="applicationSubmission.soilAlreadyRemovedArea !== null">m<sup>2</sup></span> - <app-no-data - *ngIf="applicationSubmission.soilAlreadyRemovedArea === null" - ></app-no-data> + <app-no-data *ngIf="applicationSubmission.soilAlreadyRemovedArea === null"></app-no-data> </div> <div> {{ applicationSubmission.soilAlreadyPlacedArea }} <span *ngIf="applicationSubmission.soilAlreadyPlacedArea !== null">m<sup>2</sup></span> - <app-no-data - *ngIf="applicationSubmission.soilAlreadyPlacedArea === null" - ></app-no-data> + <app-no-data *ngIf="applicationSubmission.soilAlreadyPlacedArea === null"></app-no-data> </div> <div class="subheading2">Maximum Depth</div> <div> {{ applicationSubmission.soilAlreadyRemovedMaximumDepth }} <span *ngIf="applicationSubmission.soilAlreadyRemovedMaximumDepth !== null">m</span> - <app-no-data - *ngIf="applicationSubmission.soilAlreadyRemovedMaximumDepth === null" - ></app-no-data> + <app-no-data *ngIf="applicationSubmission.soilAlreadyRemovedMaximumDepth === null"></app-no-data> </div> <div> {{ applicationSubmission.soilAlreadyPlacedMaximumDepth }} <span *ngIf="applicationSubmission.soilAlreadyPlacedMaximumDepth !== null">m</span> - <app-no-data - *ngIf="applicationSubmission.soilAlreadyPlacedMaximumDepth === null" - ></app-no-data> + <app-no-data *ngIf="applicationSubmission.soilAlreadyPlacedMaximumDepth === null"></app-no-data> </div> <div class="subheading2">Average Depth</div> <div> {{ applicationSubmission.soilAlreadyRemovedAverageDepth }} <span *ngIf="applicationSubmission.soilAlreadyRemovedAverageDepth !== null">m</span> - <app-no-data - *ngIf="applicationSubmission.soilAlreadyRemovedAverageDepth === null" - ></app-no-data> + <app-no-data *ngIf="applicationSubmission.soilAlreadyRemovedAverageDepth === null"></app-no-data> </div> <div> {{ applicationSubmission.soilAlreadyPlacedAverageDepth }} <span *ngIf="applicationSubmission.soilAlreadyPlacedAverageDepth !== null">m</span> - <app-no-data - *ngIf="applicationSubmission.soilAlreadyPlacedAverageDepth === null" - ></app-no-data> + <app-no-data *ngIf="applicationSubmission.soilAlreadyPlacedAverageDepth === null"></app-no-data> </div> </div> diff --git a/portal-frontend/src/app/features/public/application/submission/pofo-details/pofo-details.component.html b/portal-frontend/src/app/features/public/application/submission/pofo-details/pofo-details.component.html index 114496661d..bfef5f513e 100644 --- a/portal-frontend/src/app/features/public/application/submission/pofo-details/pofo-details.component.html +++ b/portal-frontend/src/app/features/public/application/submission/pofo-details/pofo-details.component.html @@ -23,20 +23,10 @@ <div class="subheading2 grid-1">Project Duration</div> <div class="grid-double"> - <div *ngIf="applicationSubmission.soilProjectDurationAmount && applicationSubmission.soilProjectDurationUnit"> - {{ applicationSubmission.soilProjectDurationAmount }} - <ng-container [ngPlural]="applicationSubmission.soilProjectDurationAmount"> - <ng-template ngPluralCase="=1"> - {{ applicationSubmission.soilProjectDurationUnit.slice(0, -1) | titlecase }} - </ng-template> - <ng-template ngPluralCase="other"> - {{ applicationSubmission.soilProjectDurationUnit | titlecase }} - </ng-template> - </ng-container> + <div *ngIf="applicationSubmission.soilProjectDuration"> + {{ applicationSubmission.soilProjectDuration }} </div> - <app-no-data - *ngIf="!applicationSubmission.soilProjectDurationAmount || !applicationSubmission.soilProjectDurationUnit" - ></app-no-data> + <app-no-data *ngIf="!applicationSubmission.soilProjectDuration"></app-no-data> </div> <div class="grid-1"></div> @@ -95,7 +85,7 @@ <span *ngIf="applicationSubmission.soilAlreadyPlacedAverageDepth !== null">m</span> <app-no-data *ngIf="applicationSubmission.soilAlreadyPlacedAverageDepth === null"></app-no-data> </div> - + <div class="subheading2 grid-1"> What alternative measures have you considered or attempted before proposing to place fill? </div> diff --git a/portal-frontend/src/app/features/public/application/submission/roso-details/roso-details.component.html b/portal-frontend/src/app/features/public/application/submission/roso-details/roso-details.component.html index ecfcb8c7ee..d0f7c12431 100644 --- a/portal-frontend/src/app/features/public/application/submission/roso-details/roso-details.component.html +++ b/portal-frontend/src/app/features/public/application/submission/roso-details/roso-details.component.html @@ -21,24 +21,14 @@ <app-no-data *ngIf="!applicationSubmission.purpose"></app-no-data> </div> - <div class="subheading2 grid-1">Project Duration</div> + <div class="subheading2 grid-1">Removal of Soil Project Duration</div> <div class="grid-double"> - <div *ngIf="applicationSubmission.soilProjectDurationAmount && applicationSubmission.soilProjectDurationUnit"> - {{ applicationSubmission.soilProjectDurationAmount }} - <ng-container [ngPlural]="applicationSubmission.soilProjectDurationAmount"> - <ng-template ngPluralCase="=1"> - {{ applicationSubmission.soilProjectDurationUnit.slice(0, -1) | titlecase }} - </ng-template> - <ng-template ngPluralCase="other"> - {{ applicationSubmission.soilProjectDurationUnit | titlecase }} - </ng-template> - </ng-container> + <div *ngIf="applicationSubmission.soilProjectDuration"> + {{ applicationSubmission.soilProjectDuration }} </div> - <app-no-data - *ngIf="!applicationSubmission.soilProjectDurationAmount || !applicationSubmission.soilProjectDurationUnit" - ></app-no-data> + <app-no-data *ngIf="!applicationSubmission.soilProjectDuration"></app-no-data> </div> - + <div class="grid-1"></div> <div class="subheading2 grid-double">Soil to be Removed</div> @@ -76,40 +66,28 @@ <div class="grid-double"> {{ applicationSubmission.soilAlreadyRemovedVolume }} <span *ngIf="applicationSubmission.soilAlreadyRemovedVolume !== null">m<sup>3</sup></span> - <app-no-data - - *ngIf="applicationSubmission.soilAlreadyRemovedVolume === null" - ></app-no-data> + <app-no-data *ngIf="applicationSubmission.soilAlreadyRemovedVolume === null"></app-no-data> </div> <div class="subheading2 grid-1">Area</div> <div class="grid-double"> {{ applicationSubmission.soilAlreadyRemovedArea }} <span *ngIf="applicationSubmission.soilAlreadyRemovedArea !== null">ha</span> - <app-no-data - - *ngIf="applicationSubmission.soilAlreadyRemovedArea === null" - ></app-no-data> + <app-no-data *ngIf="applicationSubmission.soilAlreadyRemovedArea === null"></app-no-data> </div> <div class="subheading2 grid-1">Maximum Depth</div> <div class="grid-double"> {{ applicationSubmission.soilAlreadyRemovedMaximumDepth }} <span *ngIf="applicationSubmission.soilAlreadyRemovedMaximumDepth !== null">m</span> - <app-no-data - - *ngIf="applicationSubmission.soilAlreadyRemovedMaximumDepth === null" - ></app-no-data> + <app-no-data *ngIf="applicationSubmission.soilAlreadyRemovedMaximumDepth === null"></app-no-data> </div> <div class="subheading2 grid-1">Average Depth</div> <div class="grid-double"> {{ applicationSubmission.soilAlreadyRemovedAverageDepth }} <span *ngIf="applicationSubmission.soilAlreadyRemovedAverageDepth !== null">m</span> - <app-no-data - - *ngIf="applicationSubmission.soilAlreadyRemovedAverageDepth === null" - ></app-no-data> + <app-no-data *ngIf="applicationSubmission.soilAlreadyRemovedAverageDepth === null"></app-no-data> </div> <div class="subheading2 grid-1">Describe the type of soil proposed to be removed.</div> diff --git a/portal-frontend/src/app/services/application-submission/application-submission.dto.ts b/portal-frontend/src/app/services/application-submission/application-submission.dto.ts index d731d21389..63f1bc4f12 100644 --- a/portal-frontend/src/app/services/application-submission/application-submission.dto.ts +++ b/portal-frontend/src/app/services/application-submission/application-submission.dto.ts @@ -1,6 +1,5 @@ import { BaseCodeDto } from '../../shared/dto/base.dto'; import { ApplicationOwnerDetailedDto } from '../application-owner/application-owner.dto'; -import { CovenantTransfereeDto } from '../covenant-transferee/covenant-transferee.dto'; export enum SUBMISSION_STATUS { IN_PROGRESS = 'PROG', @@ -86,8 +85,7 @@ export interface ApplicationSubmissionDetailedDto extends ApplicationSubmissionD nfuMaxFillDepth: number | null; nfuAverageFillDepth: number | null; nfuFillVolume: number | null; - nfuProjectDurationAmount: number | null; - nfuProjectDurationUnit: string | null; + nfuProjectDuration: string | null; nfuFillTypeDescription: string | null; nfuFillOriginDescription: string | null; @@ -125,10 +123,8 @@ export interface ApplicationSubmissionDetailedDto extends ApplicationSubmissionD soilAlreadyPlacedArea: number | null; soilAlreadyPlacedMaximumDepth: number | null; soilAlreadyPlacedAverageDepth: number | null; - soilProjectDurationAmount: number | null; - soilProjectDurationUnit: string | null; - fillProjectDurationAmount: number | null; - fillProjectDurationUnit: string | null; + soilProjectDuration: string | null; + fillProjectDuration: string | null; soilFillTypeToPlace: string | null; soilAlternativeMeasures: string | null; soilIsExtractionOrMining: boolean; @@ -144,8 +140,7 @@ export interface ApplicationSubmissionDetailedDto extends ApplicationSubmissionD naruWillImportFill: boolean | null; naruFillType: string | null; naruFillOrigin: string | null; - naruProjectDurationAmount: number | null; - naruProjectDurationUnit: string | null; + naruProjectDuration: string | null; naruToPlaceVolume: number | null; naruToPlaceArea: number | null; naruToPlaceMaximumDepth: number | null; @@ -199,8 +194,7 @@ export interface ApplicationSubmissionUpdateDto { nfuMaxFillDepth?: number | null; nfuAverageFillDepth?: number | null; nfuFillVolume?: number | null; - nfuProjectDurationAmount?: number | null; - nfuProjectDurationUnit?: string | null; + nfuProjectDuration?: string | null; nfuFillTypeDescription?: string | null; nfuFillOriginDescription?: string | null; @@ -238,10 +232,8 @@ export interface ApplicationSubmissionUpdateDto { soilAlreadyPlacedArea?: number | null; soilAlreadyPlacedMaximumDepth?: number | null; soilAlreadyPlacedAverageDepth?: number | null; - soilProjectDurationAmount?: number | null; - soilProjectDurationUnit?: string | null; - fillProjectDurationAmount?: number | null; - fillProjectDurationUnit?: string | null; + soilProjectDuration?: string | null; + fillProjectDuration?: string | null; soilFillTypeToPlace?: string | null; soilAlternativeMeasures?: string | null; soilIsExtractionOrMining?: boolean | null; @@ -257,8 +249,7 @@ export interface ApplicationSubmissionUpdateDto { naruWillImportFill?: boolean | null; naruFillType?: string | null; naruFillOrigin?: string | null; - naruProjectDurationAmount?: number | null; - naruProjectDurationUnit?: string | null; + naruProjectDuration?: string | null; naruToPlaceVolume?: number | null; naruToPlaceArea?: number | null; naruToPlaceMaximumDepth?: number | null; diff --git a/portal-frontend/src/app/services/public/public-application.dto.ts b/portal-frontend/src/app/services/public/public-application.dto.ts index 3e70cb8a1d..cd597b65d6 100644 --- a/portal-frontend/src/app/services/public/public-application.dto.ts +++ b/portal-frontend/src/app/services/public/public-application.dto.ts @@ -50,8 +50,7 @@ export interface PublicApplicationSubmissionDto { nfuMaxFillDepth?: number | null; nfuAverageFillDepth?: number | null; nfuFillVolume?: number | null; - nfuProjectDurationAmount?: number | null; - nfuProjectDurationUnit?: string | null; + nfuProjectDuration?: string | null; nfuFillTypeDescription?: string | null; nfuFillOriginDescription?: string | null; @@ -89,10 +88,8 @@ export interface PublicApplicationSubmissionDto { soilAlreadyPlacedArea: number | null; soilAlreadyPlacedMaximumDepth: number | null; soilAlreadyPlacedAverageDepth: number | null; - soilProjectDurationAmount: number | null; - soilProjectDurationUnit?: string | null; - fillProjectDurationAmount: number | null; - fillProjectDurationUnit: string | null; + soilProjectDuration?: string | null; + fillProjectDuration: string | null; soilFillTypeToPlace?: string | null; soilAlternativeMeasures?: string | null; soilIsExtractionOrMining?: boolean; @@ -108,8 +105,7 @@ export interface PublicApplicationSubmissionDto { naruWillImportFill: boolean | null; naruFillType: string | null; naruFillOrigin: string | null; - naruProjectDurationAmount: number | null; - naruProjectDurationUnit: string | null; + naruProjectDuration: string | null; naruToPlaceVolume: number | null; naruToPlaceArea: number | null; naruToPlaceMaximumDepth: number | null; diff --git a/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.spec.ts b/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.spec.ts index bd251bab61..68e3558018 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.spec.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.spec.ts @@ -525,8 +525,7 @@ describe('ApplicationSubmissionValidatorService', () => { nfuMaxFillDepth: 1.5125, nfuAverageFillDepth: 1261.21, nfuFillVolume: 742.1, - nfuProjectDurationAmount: 12, - nfuProjectDurationUnit: 'VALID', + nfuProjectDuration: '1 day', }); const res = await service.validateSubmission(application); @@ -574,8 +573,7 @@ describe('ApplicationSubmissionValidatorService', () => { nfuMaxFillDepth: 1.5125, nfuAverageFillDepth: 121, nfuFillVolume: 742.1, - nfuProjectDurationAmount: 12, - nfuProjectDurationUnit: 'VALID', + nfuProjectDuration: '1 day', typeCode: 'NFUP', }); diff --git a/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.ts b/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.ts index d02906fa82..b180f6708c 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.ts @@ -430,8 +430,7 @@ export class ApplicationSubmissionValidatorService { applicationSubmission.nfuMaxFillDepth === null || applicationSubmission.nfuAverageFillDepth === null || applicationSubmission.nfuFillVolume === null || - applicationSubmission.nfuProjectDurationAmount === null || - !applicationSubmission.nfuProjectDurationUnit + !applicationSubmission.nfuProjectDuration ) { errors.push( new ServiceValidationException(`NFU Fill Section incomplete`), diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.dto.ts b/services/apps/alcs/src/portal/application-submission/application-submission.dto.ts index bbf1a71c0a..04231aadfa 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.dto.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.dto.ts @@ -119,11 +119,8 @@ export class ApplicationSubmissionDetailedDto extends ApplicationSubmissionDto { @AutoMap(() => Number) nfuFillVolume?: number | null; - @AutoMap(() => Number) - nfuProjectDurationAmount?: number | null; - @AutoMap(() => String) - nfuProjectDurationUnit?: string | null; + nfuProjectDuration?: string | null; @AutoMap(() => String) nfuFillTypeDescription?: string | null; @@ -221,17 +218,11 @@ export class ApplicationSubmissionDetailedDto extends ApplicationSubmissionDto { @AutoMap(() => Number) soilAlreadyPlacedAverageDepth: number | null; - @AutoMap(() => Number) - soilProjectDurationAmount: number | null; - @AutoMap(() => String) - soilProjectDurationUnit?: string | null; - - @AutoMap(() => Number) - fillProjectDurationAmount: number | null; + soilProjectDuration?: string | null; @AutoMap(() => String) - fillProjectDurationUnit: string | null; + fillProjectDuration: string | null; @AutoMap(() => String) soilFillTypeToPlace?: string | null; @@ -273,11 +264,8 @@ export class ApplicationSubmissionDetailedDto extends ApplicationSubmissionDto { @AutoMap(() => String) naruFillOrigin: string | null; - @AutoMap(() => Number) - naruProjectDurationAmount: number | null; - @AutoMap(() => String) - naruProjectDurationUnit: string | null; + naruProjectDuration: string | null; @AutoMap(() => Number) naruToPlaceVolume: number | null; @@ -456,13 +444,9 @@ export class ApplicationSubmissionUpdateDto { @IsOptional() nfuFillVolume?: number | null; - @IsNumber() - @IsOptional() - nfuProjectDurationAmount?: number | null; - @IsString() @IsOptional() - nfuProjectDurationUnit?: string | null; + nfuProjectDuration?: string | null; @IsString() @MaxLength(MAX_DESCRIPTION_FIELD_LENGTH) @@ -600,21 +584,13 @@ export class ApplicationSubmissionUpdateDto { @IsOptional() soilAlreadyPlacedAverageDepth?: number | null; - @IsNumber() - @IsOptional() - soilProjectDurationAmount?: number | null; - @IsString() @IsOptional() - soilProjectDurationUnit?: string | null; - - @IsNumber() - @IsOptional() - fillProjectDurationAmount?: number | null; + soilProjectDuration?: string | null; @IsString() @IsOptional() - fillProjectDurationUnit?: string | null; + fillProjectDuration?: string | null; @IsString() @IsOptional() @@ -669,13 +645,9 @@ export class ApplicationSubmissionUpdateDto { @IsOptional() naruFillOrigin?: string | null; - @IsNumber() - @IsOptional() - naruProjectDurationAmount?: number | null; - @IsString() @IsOptional() - naruProjectDurationUnit?: string | null; + naruProjectDuration?: string | null; @IsNumber() @IsOptional() diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts b/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts index d019f133c6..9f97d1eebc 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts @@ -288,19 +288,9 @@ export class ApplicationSubmission extends Base { }) nfuFillVolume: number | null; - @AutoMap(() => Number) - @Column({ - type: 'decimal', - nullable: true, - precision: 12, - scale: 2, - transformer: new ColumnNumericTransformer(), - }) - nfuProjectDurationAmount: number | null; - @AutoMap(() => String) @Column({ type: 'text', nullable: true }) - nfuProjectDurationUnit: string | null; + nfuProjectDuration: string | null; @AutoMap(() => String) @Column({ type: 'text', nullable: true }) @@ -539,33 +529,13 @@ export class ApplicationSubmission extends Base { }) soilAlreadyPlacedAverageDepth: number | null; - @AutoMap(() => Number) - @Column({ - type: 'decimal', - nullable: true, - precision: 12, - scale: 2, - transformer: new ColumnNumericTransformer(), - }) - soilProjectDurationAmount: number | null; - @AutoMap(() => String) @Column({ type: 'text', nullable: true }) - soilProjectDurationUnit: string | null; - - @AutoMap(() => Number) - @Column({ - type: 'decimal', - nullable: true, - precision: 12, - scale: 2, - transformer: new ColumnNumericTransformer(), - }) - fillProjectDurationAmount: number | null; + soilProjectDuration: string | null; @AutoMap(() => String) @Column({ type: 'text', nullable: true }) - fillProjectDurationUnit: string | null; + fillProjectDuration: string | null; @AutoMap(() => String) @Column({ type: 'text', nullable: true }) @@ -630,19 +600,9 @@ export class ApplicationSubmission extends Base { @Column({ type: 'text', nullable: true }) naruFillOrigin: string | null; - @AutoMap(() => Number) - @Column({ - type: 'decimal', - nullable: true, - precision: 12, - scale: 2, - transformer: new ColumnNumericTransformer(), - }) - naruProjectDurationAmount: number | null; - @AutoMap(() => String) @Column({ type: 'text', nullable: true }) - naruProjectDurationUnit: string | null; + naruProjectDuration: string | null; @AutoMap(() => Number) @Column({ diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.service.ts b/services/apps/alcs/src/portal/application-submission/application-submission.service.ts index 9071193351..1983931b79 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.service.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.service.ts @@ -726,13 +726,9 @@ export class ApplicationSubmissionService { updateDto.nfuFillVolume, application.nfuFillVolume, ); - application.nfuProjectDurationUnit = filterUndefined( - updateDto.nfuProjectDurationUnit, - application.nfuProjectDurationUnit, - ); - application.nfuProjectDurationAmount = filterUndefined( - updateDto.nfuProjectDurationAmount, - application.nfuProjectDurationAmount, + application.nfuProjectDuration = filterUndefined( + updateDto.nfuProjectDuration, + application.nfuProjectDuration, ); application.nfuFillTypeDescription = filterUndefined( updateDto.nfuFillTypeDescription, @@ -888,21 +884,13 @@ export class ApplicationSubmissionService { updateDto.soilAlreadyPlacedAverageDepth, applicationSubmission.soilAlreadyPlacedAverageDepth, ); - applicationSubmission.soilProjectDurationAmount = filterUndefined( - updateDto.soilProjectDurationAmount, - applicationSubmission.soilProjectDurationAmount, - ); - applicationSubmission.soilProjectDurationUnit = filterUndefined( - updateDto.soilProjectDurationUnit, - applicationSubmission.soilProjectDurationUnit, + applicationSubmission.soilProjectDuration = filterUndefined( + updateDto.soilProjectDuration, + applicationSubmission.soilProjectDuration, ); - applicationSubmission.fillProjectDurationUnit = filterUndefined( - updateDto.fillProjectDurationUnit, - applicationSubmission.fillProjectDurationUnit, - ); - applicationSubmission.fillProjectDurationAmount = filterUndefined( - updateDto.fillProjectDurationAmount, - applicationSubmission.fillProjectDurationAmount, + applicationSubmission.fillProjectDuration = filterUndefined( + updateDto.fillProjectDuration, + applicationSubmission.fillProjectDuration, ); applicationSubmission.soilFillTypeToPlace = filterUndefined( updateDto.soilFillTypeToPlace, @@ -978,13 +966,9 @@ export class ApplicationSubmissionService { updateDto.naruFillOrigin, applicationSubmission.naruFillOrigin, ); - applicationSubmission.naruProjectDurationAmount = filterUndefined( - updateDto.naruProjectDurationAmount, - applicationSubmission.naruProjectDurationAmount, - ); - applicationSubmission.naruProjectDurationUnit = filterUndefined( - updateDto.naruProjectDurationUnit, - applicationSubmission.naruProjectDurationUnit, + applicationSubmission.naruProjectDuration = filterUndefined( + updateDto.naruProjectDuration, + applicationSubmission.naruProjectDuration, ); applicationSubmission.naruToPlaceVolume = filterUndefined( updateDto.naruToPlaceVolume, diff --git a/services/apps/alcs/src/portal/pdf-generation/generate-submission-document.service.ts b/services/apps/alcs/src/portal/pdf-generation/generate-submission-document.service.ts index 2578d09cf4..cf96bfebc1 100644 --- a/services/apps/alcs/src/portal/pdf-generation/generate-submission-document.service.ts +++ b/services/apps/alcs/src/portal/pdf-generation/generate-submission-document.service.ts @@ -307,8 +307,7 @@ export class GenerateSubmissionDocumentService { nfuMaxFillDepth: submission.nfuMaxFillDepth, nfuAverageFillDepth: submission.nfuAverageFillDepth, nfuFillVolume: submission.nfuFillVolume, - nfuProjectDurationAmount: submission.nfuProjectDurationAmount, - nfuProjectDurationUnit: submission.nfuProjectDurationUnit, + nfuProjectDuration: submission.nfuProjectDuration, }; } diff --git a/services/apps/alcs/src/portal/public/application/public-application.dto.ts b/services/apps/alcs/src/portal/public/application/public-application.dto.ts index 8750c3c281..1e0648d59c 100644 --- a/services/apps/alcs/src/portal/public/application/public-application.dto.ts +++ b/services/apps/alcs/src/portal/public/application/public-application.dto.ts @@ -102,11 +102,8 @@ export class PublicApplicationSubmissionDto { @AutoMap(() => Number) nfuFillVolume?: number | null; - @AutoMap(() => Number) - nfuProjectDurationAmount?: number | null; - @AutoMap(() => String) - nfuProjectDurationUnit?: string | null; + nfuProjectDuration?: string | null; @AutoMap(() => String) nfuFillTypeDescription?: string | null; @@ -204,17 +201,11 @@ export class PublicApplicationSubmissionDto { @AutoMap(() => Number) soilAlreadyPlacedAverageDepth: number | null; - @AutoMap(() => Number) - soilProjectDurationAmount: number | null; - @AutoMap(() => String) - soilProjectDurationUnit?: string | null; - - @AutoMap(() => Number) - fillProjectDurationAmount: number | null; + soilProjectDuration?: string | null; @AutoMap(() => String) - fillProjectDurationUnit?: string | null; + fillProjectDuration?: string | null; @AutoMap(() => String) soilFillTypeToPlace?: string | null; @@ -256,11 +247,8 @@ export class PublicApplicationSubmissionDto { @AutoMap(() => String) naruFillOrigin: string | null; - @AutoMap(() => Number) - naruProjectDurationAmount: number | null; - @AutoMap(() => String) - naruProjectDurationUnit: string | null; + naruProjectDuration: string | null; @AutoMap(() => Number) naruToPlaceVolume: number | null; diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1703232741494-update-app-project-duration.ts b/services/apps/alcs/src/providers/typeorm/migrations/1703232741494-update-app-project-duration.ts new file mode 100644 index 0000000000..b385c9d060 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1703232741494-update-app-project-duration.ts @@ -0,0 +1,85 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class UpdateAppProjectDuration1703232741494 + implements MigrationInterface +{ + name = 'UpdateAppProjectDuration1703232741494'; + + public async up(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" DROP COLUMN "naru_project_duration_amount"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" DROP COLUMN "naru_project_duration_unit"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" ADD "naru_project_duration" text`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" DROP COLUMN "nfu_project_duration_amount"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" DROP COLUMN "nfu_project_duration_unit"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" ADD "nfu_project_duration" text`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" DROP COLUMN "soil_project_duration_amount"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" DROP COLUMN "soil_project_duration_unit"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" ADD "soil_project_duration" text`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" DROP COLUMN "fill_project_duration_amount"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" DROP COLUMN "fill_project_duration_unit"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" ADD "fill_project_duration" text`, + ); + } + + public async down(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" DROP COLUMN "fill_project_duration"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" ADD "fill_project_duration_unit" text`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" ADD "fill_project_duration_amount" numeric(12,2)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" DROP COLUMN "soil_project_duration"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" ADD "soil_project_duration_unit" text`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" ADD "soil_project_duration_amount" numeric(12,2)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" DROP COLUMN "nfu_project_duration"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" ADD "nfu_project_duration_unit" text`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" ADD "nfu_project_duration_amount" numeric(12,2)`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" DROP COLUMN "naru_project_duration"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" ADD "naru_project_duration_unit" text`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_submission" ADD "naru_project_duration_amount" numeric(12,2)`, + ); + } +} From e64d143f11fedd5cf4b7d306823054eab81bd189 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Wed, 3 Jan 2024 16:00:39 -0800 Subject: [PATCH 857/954] Hide OCP / Zoning Questions from PDF if Answer is No --- .../pdf/submission-lg-review-template.docx | Bin 29165 -> 29319 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/services/templates/pdf/submission-lg-review-template.docx b/services/templates/pdf/submission-lg-review-template.docx index 7eb66496020b0e2104df58c0e0a75d317a06b4ba..829ff3574783a7fbcd35cbf7c2182952d3bb4b1e 100644 GIT binary patch delta 4161 zcmZXX2T+sC7RQsANbgPQRa&H1ks>HYLKl%PRVflWcxj=RP&HJ=AjKd}dW}>OkWK(8 zA<{bt7X?Hq56irFz3<!EnX^0RclPZ0W@r9qYXKO&1f<r7p93=jNJ&WnW-WXs71SI+ z@DBqm4&*@w8CvRvOE3l<+)ZxQ5LS4=YCW8(+|Y47zO&BklL?d7i0{4AkDzcJOYLv& z+lmD%9|;8e+A>i$im4b)Yz&xZS8W$dTd6$^Z{Bfx`~ZrE6tj{EUkSNZwJ9=(+SPoE zMld>xwmuqwvG&|SefS`Ps+e<ml}VPRe#LWa^{FW`eVtykv&Do=f&49-MYsc`in1=M znU!OBxN<h{<<x4Cw2(p+xpVRdYkJy1yxCAq!=oI#fs~qZ5(vx7bBaX=n(^&K1k2{U z?)o>uudat*rxVsGCRLb7QUtm*g~nT<j2P(`K@FjQC9KdKf*cGkybE3(kP(!89wC!B z!*H~L40f65N*FNPPpPj5ysgpyuvIRI1c;SoK;=KRNhhBiy++6D<9bjRao+HIWI~^4 z1{Oea-bP#%r#Bn-HRiEB?;~^(Yy4N(oFrC7TqaQa+Ya_xjg@>u`>t|a*{!asqZ#!R z<mT6CXy&rHGK0?P!%0YKW^}H)0s#Ob2mtukzd=ud#E|@pvFv=;@9Yhc8yT)rDGsO` z3e-B_NKcy2kIJlktFDs9m<IfPH0?J)mV$tYPq%)yBvD}S=}n6KZlIzkH9j1*`_wl~ zW6nwq=d~L$t_9P_LbgmuUQ^UbY7WriOF}WugZODFk{o|$sL@S+>gcpKwDpX#d${_H z9&HxY4w7{}mYtG_TiCQeaWSLteXi%$8&@3+P9N$`WaYkaocdCtT9m*Elh7$hyC`7= zo2-dv{Vu#%Q_5I^5Ek0A75~!SCEsKGZ1C9j@8-Z;ybt&%34Vb<X(5d99gID&A1$<J z=L^G23>?c)uA>|zjSRM`gsCK1qb<>O2d>H7_WOYWh_D$>s}Vj&+kz&RM}kJBw~|dK zn>u=<M0(<z)Y^q;Bv@rN7hlWvYZ~6y*|az`k;{FE$-Q~QA@7zyoZ|)LZBIANk4l4j z<9iLyDh)fU^q-Fa?F=6M`3S1iA@JYN;qiGsB+--5NY}i5+xpRPMFGR@CrDdS1F2ee zC5#8VtS{P0sVPJa)}hGX26|y%Fp}A<F;lLGho~8<VqHzsI7Hgsv&VvCmTdi6i0{If zXPR3Q`DAj{r7+%amW|(P$nadXeqX+DytKYJ)*PMRek+6zGnDA3@$%q=$n`Oi02DMu zYBNNJsPhuuEI9Bw!RhfAdhbf|g~3(y%Se+5ffCjc%lE8Q)V<&67gle5KYVc+g9m>* zZ_#1WR(Ro?Z?{LVc*~gM=3$to39v=Vz7YB<;S=suC=s>M88_|IcO#ix_f-maj6&r> zf+So^s=pJ&@WH!>ZjINE8qBFj^h|q<v?D0y2)R9mPELU2Jl8IYsFh7-<oR8kPtkov zm94pDv;)2T>Ye@L$xf3a%u6#{VaMu0UM!-oLr`1R57RmJrY|i|-a)mW*hS}<3bw_o zuwAm44F<zNy2%($5bC26z$lwU{+p64m$FT>*qF}s;d<qEgD%`qZrs%wi+&K&xLW?< zh+Dp6%&OX?oXuJc14f99XhPq4<)Z<M<vh4m8W9~Go8=s85UkQCK1r)50QuCu4x}ED z(}i_I)<=>BfY#=N0El)`@$TxYt5?L6nlt#`&&%X0i}jm!yx*27kNz6<U>&-K@9qZA z3C%AI&Q9}EPPq7YUrD4phD{<Rj5x}cF8XSrR;S`|!u(HbZ;NI6%5wEq2!?fWB<%>r zF_hIWf41f>^sggMOuDsZ6%bIj;rF9f#}#vhnI8$cvkr_92_Ku1*6(^LHW^Q`F=S{I zPhOoML}k)uXn6&kS_iab&~i`;8E|dZ7;E<gl7F7e)()b~vN(}`3+hACP?v?MTwrF_ z5V;df77>C`gG#jPxKkPjF)#2$R)uJR_?3GL8-^%(Sn_Tw-_X<rQx28ZD`z<?l0^2f zyF4OGa(eFFj^ojd`l64Ou<XxvQ*78i(QDdZEVL_;=mDFD8TG{UfFaKAqq^|g+12-> zPYjYS>Z~%*z5`8(mSrI+EBVWpyPY>`s|9t`cRXMo+!O+RhJU+Nj3t@)x97rUu5s}V zV?FNKS!6+2E1F%$j}6I+V6SLMBo-;AiSjHd94F9QL6_PJb56c8&{%gW+@2Qt<j-w; zO!YBffXbSxG{9p?FRDPj=ys1?K23<jY<F^3o>%5)V~Z!!f+L1V>YbJb+nyNgU@63W z#mT~D?RL;Y?lG_LQ3SA~f9Su%-ADR}G?olJgmqAPZyP`tr#U=rpR)}Wnld|V>H%&D zJohkf+8|T0C9_dbkJe~|F<*O1D!8IRrk~y=iEiYNI625Z&GkB6oM#Nm;nVDT8e?YB z>Oba=1aD03$@7jS?Uq?Y9Ivuba{0X>YUbq#7d~U8?@4)udvHE{;7Kd>GgbzRh04?E z65HO_KpghkWMO)3c6pPk-e<zLF)hCCO#yB&HH>}l6Gem-_srz>pwz-3YRRZvjVsI) zV##SLqSQaG*mM8sft5VXCC0eNJx@fcUyv6IAor^jzRTTcR8L!si3=fja_W1&)Y<rA zF445L%d(uO4c;Zu`Z(WjszzH9I0z~YBJY)cy1_=n7#VrTYsKdCwmIIi!EEF8rIKqw z8CW_#Y$a+Sk-!8y5WMngG-7ypuppLeE2f(Bgy~@$dAgN-IV1CFv$^~USeaTwm09C1 zHxeG5+n7VDCzH=Kx}a`D+8D&DXf(!jC!M@l`wDc73XWfO5cOOwl=k1vND(4=(Fi0> zFR}@z$(EBNNG&cTltygePqE=fmOMTKWQl>^?GZ++?bv{V!0R`1vkg5IirEHuOUr~I zm!sv(^Xu;|(u``4-^)#cmez8bnz{C+BaJf))14$2EAfP$<+W<f(#2fYf`&+$W(k8; zXvMSL*^44@tY13AvxMX0q9<9!f&(8I4i1XfV*^M6^vVQ5Yh3FnmM`?haZZC=(1Lcp z2%Y4(Qv1sc!ZoP7uQ`vkF~+1jf-HE0gz14TfS+L+`8{ZbcZR9JeN>+mmYSy+d97Ow zZbUK4V|$s-BawsKm`$qu?OWD`oOIQrt=V!`1xA_?C4~|J_CzOCB)*~ST!%A&E`{DF z*#r*zqK>Ke*+=C?q!pT*mPv}JbY$G1rY;UWH`X55NlXc3unF+3D^rKQSV0-L^NFGM ziOR>~@@v~ST#6rN>N{>JLu=BJ4{{mv2tJuLZ$B`v-xx|fiCOqUb)_+O$E0?61>x3t zK6_E;e#)cj7J{qHa_U5hzO7doNJbmv(q&X>6BftRl`Sv!^?rcQk(d)kFEcahln%mI zm@``ZW_V(&twFi|p1_788Wzc@qkM$2_POa;%_IM~?^}yOZt^^7o;l73Ia~5&CY<Ht zdQ<OnW3<wp$j}E`d1=gJc1N39o8#{$Bj-1x`Cr+kG~HfBzVxi>f7e<1slR=F+)6-f z&!aF29%Qk;V3^GU4`QzjhE~d4)vkG`oL-^s9%7WBPprD=LKQE3u$){WWncfI;?so0 z+6A-_)72&V-OKGZ<uWZd6_NKvWZtvBk8mfOsNyX&M-iDYADgewt<AB*tR@SsDsajz zPQq??w-1jK1Y6yyiX}Ql#I|fdqs--yx&Ha0!4322qQPUb1hdy)_lOF@>A}kI<6>UM zdd5BoAu`PMx%{cfOO@2afj!)oYC5oivfDvT?40Mt<l^PmJdGv0(@3$|9-wVd5`pwc zcy?|dlugEkP;w{I?Zyf~2W(-@jE(j)!c(L?qOG8`cxsX22rV(k<SOPWjb5|dC4*-x zh{N6ZUKX}V;-zo!yY9$HGg}>sH>s)D4@}yt<9%y~SVaCx$s9-H@WrA{ucbzv;sU(d znB;2@mPMI>x;xJ_kZtZ?G}T8$Z$a4lGS+hKuy|_Yw%d2u+MH5FQzR2}5k52V(#{#D z%OllJT@rf~WJ-0GDXsyvZ(KMol^*xj(Ta9FOl1S;J))dB=jGo~L3$)MNZ-!OuQj;1 z+nTx*8l6er5W;k4$u1yCZy$?PZNB8?13X2rO%T<iwQT6ukyLr>A*YldkT-P?=o^mM z0Xz1)FDmRc1m_CwvL%=~%zZxG>)jkv%~HbMMX3lgOcN(3OS{2w%LVpfQJp>E#4__b zyxWvH@5&=iS?Gq(Jqzc3WwHZAk(g=vap9R{!8a8;9{BAiUB0aReHYhdeEOkdenWUa z1g)Jt!7|^BoL;U!*FREoP=F2Zr(rlM3aRS8vR`0DfF4Hsi;JS8Nyd`bSd8tvLC(hE zh|pzb$C}u8h|v9B@u8;)$KfImazec`=ksaRi(mVy{v81xh27Yq&!<QP!TgNTn|-7^ z9+(`AjUh>=k~I6R*vbWURNFxF5RgfR$J@5dJERH;`wLcWI`nskY4T~r_Ykj|iIBi; zxF1WFAonsS=W<jAwRp>lwG*dI-$x_TF5LIXkP)8iB1W71n{sB~=ouDgOBzZCqcWwm zDhQPKr8u_tYJ+ad>4jSKBFM~}_ey=W3#hQ)BxA#O5iF*G4h<X~T6(eNo}xEfC~F1l zivTHi!%R7(fl_10XNLJS^F?kr9;b1h-P(L>TWF3lHU?9xa}yQ=sV7kvB#1;-2KIZq z+fkz;TXCm98;iQ|OlmAS0C4*J-*UH#Nb3jwrFTu3baa1Ng?0j<Ul!hB=)W46sS5W% z{MV}LlcVTw4-S`r-+NgPdw=`7AY{pY^pQXN8FV2+j_b$jpPHK%@XxOweS+Znc_5m{ zjTLB#zUs!y{R4R{#D|5P$#iz`+59H~kcFW2A)M$eH_D%}|9L^WKO7^_U2fdJVsE&y zf}H5kB<>tPnSO<AQEFWPK*|UJVEThuL~FS7|6*L+SwXV)=xBFN<d1}&Y+Kw)J4-0) zETKQ|V09k=@N@ID7k6~9v3Ky46no_QP#+EiF#`VAV4EJ4TqZlCbI#_USxPznro9}z zy`2yby#61z<TD|CDLc1)#*UxWg8q+;{hfaE2p?Bl2hXzz{~v(Qq?GDDpXwPO0Qomx lhz|AO`B`!fONPVvGoP0v006@uX9&5X+dTx%?;(Ed{s&fcX=MNa delta 3866 zcmZ8k2QVDW7r)a>5OEPbE?R_yXwiE)Ty#Q+UQRtky~C-ea~z^ayO8L;_ufmCAW8@! zg5XnvB>%LT@5_I8X6L<qzj<%p+u7OQ3*P|lt^+Bx)bR;G01^@sz*JrQqe@C<Ai+-o z%LfFb!gRDXyZEmLoIc|9zxjlo#J(@W(kHQ}hdvfwE0NRW_0X8^64@L}p?3`{{nmeF zZhsH)aFf`G0LgEV<bWPvl?UE7-IRB>-QqAt>w*mX^~R!fI<GKy=J_J9t`B|fR|k_A zVrb0q;RU=K2z1?;eN^R!F=m9aMc&u_3Bw>NQ*)Hav9J9N(P#cBmr8<u_f5Jo3WX(! zJgm(aQoU7B$qMuI3L!*m%u;~$ti;p2pcRp8aW6@yAs<~l758a|m<M5@uOD*9rJxNJ zykZbPK3bHkb*$?qYwzw5>W)7m$Kr#(kg}6H=W~F$t1TXbcBA_uI0%9EQ^&5K5`0HB znK9P6*-xcQaY>JLy0g_BNjMGO3>+taAtLd8mAlB*Z4QDcGPUU}G5&%pCwzaZvhPN? zBc90hsXbwUpM5<hX3Ix$eXtjjC8s;zVLFZC<5;)Xtt0-}w!61Z)8H8Xk>;kvJ2Ke2 zdzVLSui;wi#3Z>9!&oOE0I-Ay0BBMCbv4*UynCn?8q9rpJ$<TDS&pz}%(@eczNK+p z^y<E&EKY2$Fe~d|WFh)SVXk*vjtAG-TMEe)&p<(K&z7|2o4rTu-ptOo%VB(?BTIrX zZ#kCF%A}-29y!cA9mj8-V-o~Jg&Zw%7OI8np?9ZcW5Zs_<&{YgX$JdKbx@G`%P6@D zbnu{xI1gR6mYM8Sj?7-GRSf$f9%bT=*%|`nPNo5!Tjji=x&D(Bvcb2<c%SzBaNDfh zclcC@nJd$)XnT<}qTVt=eskrvF<gdfc;n(DM{HKYd-Ih8!jT;IJHz(r#2)E=Y0oRf zN4u;)+F58N^J?bA@H|%%>VYwNsV*<o$p!aVAMG}h1t5JC7$?}fwhUHVwUX;}cAoMa zyuw8ZSn*+4<7r})W2qbWq0PxjMp$zOC9C;}D&HuPs38NaP-DSzF5zi%!p)zRPWgws zLgz=NAwMhqccC2#rhmPGY6U{|Kd(U+b{$(tM2UjK7h9-N?V56Dy%Ux&YY9|(gXUv) z4J;8vmu>K|dAI2V$mYQJwl*8L#5TYAip7fSb88iy#9c+zEJfAbBnk)hBp=D;rTsmh znvE4{6HcbsmwM2G=F+jp&0#P##eu0wm!0w(;qW?Rh<zqHH9BdpuB^zx-{*Vb3TLYp z1|^yMQdt(PFIBlXWV4{l{({s1eoeVR>(&%J0)n^|MVH%aT)YMLHm;mC;v<RDaJ-ez zZ4w;{tw8IFk(oRTu`J11bb%8lx|al*U9W~FPxpDp%4qobu2?5%bIGIAK%sXCgCPx! z4?1~E2Rs(Yp>HN$BCMlhnA9ZG=-smuQ25?%YT8SzMwOLBPN1o3y+G4K|JY^U7(sEI z2!g4Wjr*{qAO)jjn_>P%C7V9dCT9}74mF#P)J*&6BpFw{BY>o9rN7vAT8@{kzlFgp zAKbovjY^D_R8-CuL2|op89xVot3_Zx&7U4};Z;^Hs)SvpJ6f83NzDu=JaM5#RaLd_ zrU!7@;1?!%IZsU{gx{JWyJw|Dx9GfkIw__Bl*F30JbRT!yLBD36dXnI#ZYJUUM9;b z|IWLl9{D_QtPulV-RKpqfuy#gxRc_1?8mJU7VZ@5Ov=zII}?lyY>V<BdEnS>q44bx zfyG$wdvehSaX@4it$UmmR7P6_6?N=Vyjb-~4>XC}_10Gt+Od(pzwRKd?@xt;co{2x zmQ*#~kTT1IXnzf8ZLM5Fi;dSM7sib+O_t9^*cz@S^ceYN?aiKVKGADmSlq^mET?ub zHD!&B&5DnNcIb)kEK2MwZiK=>+Iccf$gI>F|Kt--(X4X<QL*oKaU7|rn@pwve|}zG z6}{~>S`r|Bq#-OUV~wEXT(pyo%nqzi0I6dtJW*Z@%Z!U30nv*kO?1|*EyG@H5P)8h zmAoVNfqp2^os4%A&qLk`*=G2L*FX4VUB+vgUWeGwDoOnWphM3l{tQ&qsm)jXCOBV3 zSG^zKR@g#A7DNs!Z+ePa7)<CuvlW(ROl6Cxa&zAA&ApS%ugTHSIg6?OgmH6G=I@7` zzyyTop7rO-Ijt^?dg3@{*hRvrJ;XvL@sSFi;8ZUAF_5URP^KR(c!ci5W5eDj$^!TI zS6j;)flfJ|TxG%br_ek8ib}yFz=|tOMu$Frd1T8&#$=m%27@Tzw?zrt7}&{Mql%~5 zv$Y1&!WH+#Z(H?~UttYE|2s!VKhv;tUX_)I`y!<I_F+u?m)gOu+Vu*j9a<}WW&?F` zY<7SQ#&Sfbi(duFHV7F5KMcjvWTK1s5<|IlugQPE7)MR2y80kO$F@=@Bf)t$Zd4cv zf9ggxc^$_>sC*9$B3uXB<xU4(9IKaH7}d`2goFyPou8!16|M_;EZLriK5J+SuzXZG zgNt}FRnY`Xse4|@XlC8}IYT&f1mkVOLRJb^Y5huMPdiX=O0}6ry4mZ_ZUm$3Ea_@n zjT=(_;2c!dxLI1CmBrm#Rp?cqc6V#aArgtYJKi>mDNEp(zadbdBgQZ{MrQS7!j+2` zgq41S0VP{S@IU&;pxJ<)bJZxv6Jp`3Ozyu9(KR&m6bW$prl8VPo?g3$=pvd%8uigv zChL3nO%%%^_-EuwIZH&$vN;3l*aQ$~j~a-0Oc3eaI)>jayp{-b|M9u<)#S>PKwc?S zR0@TX&ns|#P7sDcVS-s_PrJ6HNPN!l!;qEzd__Tt>1>0_xIlhkgzC!^z+(}>J2he6 z^Rq8AJK0ga?`Iz0fo^}V4WF)(|EPF%1m9zzU}|d`hg7kI+Bit#*4*lxMAwzg1j!I| z3nmF`E(zarY@5!nwc6R&BFCp3E)e#p<atCIwE~!@y3|P~Yu5BmBi-V52{?ogDkQG4 z^g_}Hy^y%QyV0Y8L^hYPf7ppUI_}xsZ9=Tgj?J#`M9Q8QHmwo1Dn7lxyB)Ft^$D#Y zb$3fH30G9hU+bH(lE&JB@Gf75dDJMne6S6aC{YU=PccM{2t}p|R6~nYAc828$QZ>~ zS*cqF*QmMP;OEU_f}~gs=%_;0x>r~zM>}#a`CG%g)w<pV+8R1wFA%aq_z@L}Md3Ya z@|IVlr^~Au<E|;c2(W4GDmqIw?~`Im55gDj^6OekvZS%_52!C!=FRz#Zg8ssV{@^Y z@`VR_j+|d8ef$E{WGs`ia3qM*j-1?Y8d<dPrl1h5$(LDYM~0u2i)I(GoKM}HezV%M z-*T4q%#34}nWw-i%2xU?g0+w<sa>Z$VJN&^H!p#fB%cu}6v%RP*IY!+xt&VdQiSGy z8r~oalyIkdAXzabD4as5jeUt#RQ8oYQ5$dTR7a{CoP|CX+)W&--;YK;>`#?X1EpzU z;MBmZWPi|j==K{<NA_n^T;`fl1pyphW=)@Q(a-JUcaCw<?U5k5lNoZe*0YW7jqX=B zR_+G+UHT>B^)=Fb4RduF;>zcVyjLh`_Tz(R9XmY}?~4u$=d+Qdmi802nxQ^S!|@K% zK-z@F?N+!E*A)x`IrLHGQhMp3YG4?qnz~wLSS@eEv{t6w&$nwMI{MSN4t{3+=`*vb zLtNXUGu(<IOPj;T1=ZLycjD(<u4?AMySMamqHAHfxm*t|+Pi<k-hG)B{Nh2B8trJ> zcAmfO8bk5Bmu0c5B`z{@9H~bEUuzp%(RE+FrKnPom_83;%Y2mWkHvz0ocKgPwdR0t z#j=F@sf`{$lA5$d<;26xoSw)(p)k~qooD<#O>Ez_*jAH%dHEq0k?*iHj<jN`v--u3 zO@@Wn4A?iHAk)N`TovEM;;Y(Q=i&8?-eEFy`2aw+28&RNJbE-QKl;(`+);c#B2%}F zx(CmA{#Y`D5Y-_~_|ze;olv>-h{78e{LOxy+&VaekugI!&3yhc6*@8XIV_=%jBOL# zLNy?ktxQ36+%$eq_>=@E;l0aZc!r!j`RcK~46V74xadz$$VT4V^B-2{u{;>&J~@0~ zzf^tr9DX_zvU#v@q2AxUSxDN(y~?Y19X064$W|V2kJ^nw`C1>YYp4(WBgi9Q3$87e zYnMGDufaw31_Yf9^G%5F?q-SGSp<4yzpDYsdmHTrd?Y0;N*KbaV>AfKz)SX=^Jz4z zUnRTU(W*3b@KIL~$HK8-`<I6s^sz+++_}0)9Q9bE3wYjY??G#HIYdc*t5+O^G~09^ z^d+-Iv8-xaM9gnpB7rGm8jE`mdtF-^pOA?%$`#0OXmr^&JGxZLQI3i4Y&s=57K7?X z&AF-<5zTu6(hAnHWjl4D%qzA<6v#<JUD1_=m&y{OSn_`7B$yya*Q-*dqs+4)P!o|B zgRN)B2s|Q#PbO(Qq=l|&7*msR)mK-C|9*<p6!3KqbP>nK-goUSe(r1MWF4a*3-OjJ z;tl!Luit?`iKXphg*^%~0DuAg|HQJ|o7$V;H?usv{!rr&$F%0a`z<-yPW)z@)v_?f zKT?D}&mU{OBl6Fli1Y9tR!RsLCjHs0{puR93UCpUpW07miw%O)0!Of^@SDGUW1Ha& zKojgN{MK*v63&1pM2OWUWZ}_L2jYPM|8{`?Jw7$yzas=|;mXSTGlCp@eYG?J0ANK6 z08srG0vNxF&2?q|1sWB7&O@mI00`&-0N4Klsa;Q`y}|qcfeREK8}Ixe<U*tXz}3I- z8CF=Z8_O@JiTft1DL+8yAJP8?_1Iv|+*p367v#o(muiR2a{H5g#}9oKhJEYC`pcf^ d&H$vsGP;9*qh;M0@Zy}XChi<W#x6et{||@c95Da@ From 55da612ec9b31aa64ac1bc5e6f08f7ba3f8eb608 Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Wed, 3 Jan 2024 16:45:25 -0800 Subject: [PATCH 858/954] Align conditional container with other instances --- .../proposal-details/proposal-details.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/portal-frontend/src/app/features/notifications/notification-details/proposal-details/proposal-details.component.html b/portal-frontend/src/app/features/notifications/notification-details/proposal-details/proposal-details.component.html index f1b7f0f1f3..2d8b725fd6 100644 --- a/portal-frontend/src/app/features/notifications/notification-details/proposal-details/proposal-details.component.html +++ b/portal-frontend/src/app/features/notifications/notification-details/proposal-details/proposal-details.component.html @@ -13,7 +13,7 @@ <div class="subheading2 grid-1">Total area of the SRW</div> <div class="grid-double"> - {{ _notificationSubmission.totalArea }} <ng-container *ngIf="_notificationSubmission.totalArea">ha</ng-container> + {{ _notificationSubmission.totalArea }} <span *ngIf="_notificationSubmission.totalArea">ha</span> <app-no-data [showRequired]="showErrors" *ngIf="!_notificationSubmission.totalArea"></app-no-data> </div> From 3a9ad8a7442d61f1e24225c6bf89520a3edf115e Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Wed, 3 Jan 2024 16:19:26 -0800 Subject: [PATCH 859/954] Remove Dead Entity * Was added at some point but never used --- ...ication-reconsideration-outcome-type.entity.ts | 5 ----- .../reconsideration.automapper.profile.ts | 13 +------------ .../1704327423575-remove_dead_entity.ts | 15 +++++++++++++++ 3 files changed, 16 insertions(+), 17 deletions(-) delete mode 100644 services/apps/alcs/src/alcs/application-decision/application-reconsideration/reconsideration-decision-outcome-type/application-reconsideration-outcome-type.entity.ts create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1704327423575-remove_dead_entity.ts diff --git a/services/apps/alcs/src/alcs/application-decision/application-reconsideration/reconsideration-decision-outcome-type/application-reconsideration-outcome-type.entity.ts b/services/apps/alcs/src/alcs/application-decision/application-reconsideration/reconsideration-decision-outcome-type/application-reconsideration-outcome-type.entity.ts deleted file mode 100644 index b679a87418..0000000000 --- a/services/apps/alcs/src/alcs/application-decision/application-reconsideration/reconsideration-decision-outcome-type/application-reconsideration-outcome-type.entity.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { Entity } from 'typeorm'; -import { BaseCodeEntity } from '../../../../common/entities/base.code.entity'; - -@Entity() -export class ApplicationReconsiderationDecisionOutcomeType extends BaseCodeEntity {} diff --git a/services/apps/alcs/src/common/automapper/reconsideration.automapper.profile.ts b/services/apps/alcs/src/common/automapper/reconsideration.automapper.profile.ts index 8833d711ef..05290d4070 100644 --- a/services/apps/alcs/src/common/automapper/reconsideration.automapper.profile.ts +++ b/services/apps/alcs/src/common/automapper/reconsideration.automapper.profile.ts @@ -1,10 +1,8 @@ +import { Injectable } from '@nestjs/common'; import { createMap, forMember, mapFrom, Mapper } from 'automapper-core'; import { AutomapperProfile, InjectMapper } from 'automapper-nestjs'; -import { Injectable } from '@nestjs/common'; import { ApplicationDecisionMeetingDto } from '../../alcs/application-decision/application-decision-v1/application-decision-meeting/application-decision-meeting.dto'; import { ApplicationDecisionMeeting } from '../../alcs/application-decision/application-decision-v1/application-decision-meeting/application-decision-meeting.entity'; -import { ApplicationDecisionDto } from '../../alcs/application-decision/application-decision-v1/application-decision/application-decision.dto'; -import { ApplicationDecision } from '../../alcs/application-decision/application-decision.entity'; import { ApplicationForReconsiderationDto, ApplicationReconsiderationCreateDto, @@ -14,12 +12,9 @@ import { ReconsiderationTypeDto, } from '../../alcs/application-decision/application-reconsideration/application-reconsideration.dto'; import { ApplicationReconsideration } from '../../alcs/application-decision/application-reconsideration/application-reconsideration.entity'; -import { ApplicationReconsiderationDecisionOutcomeType } from '../../alcs/application-decision/application-reconsideration/reconsideration-decision-outcome-type/application-reconsideration-outcome-type.entity'; import { ApplicationReconsiderationOutcomeType } from '../../alcs/application-decision/application-reconsideration/reconsideration-outcome-type/application-reconsideration-outcome-type.entity'; import { ApplicationReconsiderationType } from '../../alcs/application-decision/application-reconsideration/reconsideration-type/application-reconsideration-type.entity'; import { Application } from '../../alcs/application/application.entity'; -import { CardDto } from '../../alcs/card/card.dto'; -import { Card } from '../../alcs/card/card.entity'; @Injectable() export class ReconsiderationProfile extends AutomapperProfile { @@ -93,12 +88,6 @@ export class ReconsiderationProfile extends AutomapperProfile { ApplicationReconsiderationOutcomeCodeDto, ); - createMap( - mapper, - ApplicationReconsiderationDecisionOutcomeType, - ApplicationReconsiderationOutcomeCodeDto, - ); - createMap( mapper, ApplicationReconsideration, diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1704327423575-remove_dead_entity.ts b/services/apps/alcs/src/providers/typeorm/migrations/1704327423575-remove_dead_entity.ts new file mode 100644 index 0000000000..c42b2ab0cd --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1704327423575-remove_dead_entity.ts @@ -0,0 +1,15 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class RemoveDeadEntity1704327423575 implements MigrationInterface { + public async up(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `DROP TABLE "alcs"."application_reconsideration_decision_outcome_type"`, + ); + } + + public async down(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `CREATE TABLE "alcs"."application_reconsideration_decision_outcome_type" ("audit_deleted_date_at" TIMESTAMP WITH TIME ZONE, "audit_created_at" TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now(), "audit_updated_at" TIMESTAMP WITH TIME ZONE DEFAULT now(), "audit_created_by" character varying NOT NULL, "audit_updated_by" character varying, "label" character varying NOT NULL, "code" text NOT NULL, "description" text NOT NULL, CONSTRAINT "UQ_cbc26f96619063caff5e504b1a6" UNIQUE ("description"), CONSTRAINT "PK_7bbc4f41af4ccdf91600ab2213b" PRIMARY KEY ("code"))`, + ); + } +} From 6fedb603fbe727e0e0bfc487bdf238ef74ef22d8 Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Thu, 4 Jan 2024 09:05:22 -0800 Subject: [PATCH 860/954] Improve scroll to owner method to remove repeat ID --- .../parcel-entry/parcel-entry.component.html | 4 ++-- .../parcel-entry/parcel-entry.component.ts | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html index cd66e697db..c99a9ad83c 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html @@ -315,14 +315,14 @@ <h6 class="owner-search-option" *ngIf="filteredOwners.length">OR</h6> *ngFor="let owner of filteredOwners" [value]="owner.uuid" class="radio-option" - (click)="onCrownOwnerSelected($event, owner, owner.isSelected)" + (click)="onCrownOwnerSelected(owner, owner.isSelected)" required > {{ owner.firstName + ' ' + owner.lastName }} </mat-radio-button> </mat-radio-group> - <div id="owner-info" class="warning-banner" *ngIf="selectedOwner"> + <div #ownerInfo class="warning-banner" *ngIf="selectedOwner"> <div class="owner-details"> <div class="row"> <div class="key"><strong>First Name:</strong></div> diff --git a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts index 3a976910bd..af46f4d5d7 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts @@ -1,4 +1,4 @@ -import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; +import { Component, ElementRef, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core'; import { FormControl, FormGroup, Validators } from '@angular/forms'; import { MatButtonToggleChange } from '@angular/material/button-toggle'; import { MatDialog } from '@angular/material/dialog'; @@ -21,7 +21,6 @@ import { OwnerDialogComponent } from '../../../../../shared/owner-dialogs/owner- import { formatBooleanToString } from '../../../../../shared/utils/boolean-helper'; import { RemoveFileConfirmationDialogComponent } from '../../../alcs-edit-submission/remove-file-confirmation-dialog/remove-file-confirmation-dialog.component'; import { ParcelEntryConfirmationDialogComponent } from './parcel-entry-confirmation-dialog/parcel-entry-confirmation-dialog.component'; -import { scrollToElement } from '../../../../../shared/utils/scroll-helper'; export interface ParcelEntryFormData { uuid: string; @@ -70,6 +69,8 @@ export class ParcelEntryComponent implements OnInit { @Output() onOwnersUpdated = new EventEmitter<void>(); @Output() onOwnersDeleted = new EventEmitter<void>(); + @ViewChild('ownerInfo') ownerInfo!: ElementRef<HTMLElement>; + owners: ApplicationOwnerDto[] = []; filteredOwners: (ApplicationOwnerDto & { isSelected: boolean })[] = []; @@ -351,13 +352,13 @@ export class ParcelEntryComponent implements OnInit { } } - async onCrownOwnerSelected(event: Event, owner: ApplicationOwnerDto, isSelected: boolean) { + async onCrownOwnerSelected(owner: ApplicationOwnerDto, isSelected: boolean) { this.selectedOwner = owner; const selectedOwners = [owner]; this.updateParcelOwners(selectedOwners); setTimeout(() => { - scrollToElement({ id: 'owner-info', center: false }); + this.ownerInfo.nativeElement.scrollIntoView({ behavior: 'smooth' }); }); } From 06633b28ac968994c66a573b399d677cd88c31de Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Thu, 4 Jan 2024 09:23:54 -0800 Subject: [PATCH 861/954] Feature/alcs 1365 (#1252) import noi conditions ETL link conditions to components additional oats_condition_id column in ALCS --- .../common/oats_decision_enum.py | 31 ++++ .../noi_decisions/noi_conditions/__init__.py | 11 ++ .../notice_of_intent_conditions_init.py | 152 ++++++++++++++++++ .../notice_of_intent_conditions_link.py | 130 +++++++++++++++ .../notice_of_intent_conditions_update.py | 109 +++++++++++++ .../noi/notice_of_intent_migration.py | 13 ++ ...e_of_intent_decision_conditions_insert.sql | 9 ++ ...ntent_decision_conditions_insert_count.sql | 3 + ...ice_of_intent_decision_conditions_link.sql | 6 + ..._intent_decision_conditions_link_count.sql | 4 + ...e_of_intent_decision_conditions_update.sql | 7 + ...ntent_decision_conditions_update_count.sql | 5 + ...ice-of-intent-decision-condition.entity.ts | 9 ++ ..._condition_id_to_noi_decision_condition.ts | 25 +++ 14 files changed, 514 insertions(+) create mode 100644 bin/migrate-oats-data/noi/noi_decisions/noi_conditions/__init__.py create mode 100644 bin/migrate-oats-data/noi/noi_decisions/noi_conditions/notice_of_intent_conditions_init.py create mode 100644 bin/migrate-oats-data/noi/noi_decisions/noi_conditions/notice_of_intent_conditions_link.py create mode 100644 bin/migrate-oats-data/noi/noi_decisions/noi_conditions/notice_of_intent_conditions_update.py create mode 100644 bin/migrate-oats-data/noi/sql/notice_of_intent_decisions/conditions/notice_of_intent_decision_conditions_insert.sql create mode 100644 bin/migrate-oats-data/noi/sql/notice_of_intent_decisions/conditions/notice_of_intent_decision_conditions_insert_count.sql create mode 100644 bin/migrate-oats-data/noi/sql/notice_of_intent_decisions/conditions/notice_of_intent_decision_conditions_link.sql create mode 100644 bin/migrate-oats-data/noi/sql/notice_of_intent_decisions/conditions/notice_of_intent_decision_conditions_link_count.sql create mode 100644 bin/migrate-oats-data/noi/sql/notice_of_intent_decisions/conditions/notice_of_intent_decision_conditions_update.sql create mode 100644 bin/migrate-oats-data/noi/sql/notice_of_intent_decisions/conditions/notice_of_intent_decision_conditions_update_count.sql create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1703269710872-add_oats_condition_id_to_noi_decision_condition.ts diff --git a/bin/migrate-oats-data/common/oats_decision_enum.py b/bin/migrate-oats-data/common/oats_decision_enum.py index daf45d70b9..77bceab5c7 100644 --- a/bin/migrate-oats-data/common/oats_decision_enum.py +++ b/bin/migrate-oats-data/common/oats_decision_enum.py @@ -26,3 +26,34 @@ class OatsToAlcsAgCap(Enum): MIX = AlcsAgCap.Mixed_Prime_Secondary.value S = AlcsAgCap.Secondary.value U = AlcsAgCap.Unclassified.value + + +class OatsToAlcsConditionTypeMapping(Enum): + ADO = "ACBO" + ACC = "ACCE" + ADF = "AFEE" + BON = "BOND" + BAG = "BTOA" + BUF = "BUFF" + CON = "CONS" + RCV = "COVE" + FEN = "FENC" + RPF = "FRPT" + HOS = "HOME" + INC = "INCL" + LEP = "LEAS" + MON = "MBRP" + NEX = "NOEX" + NHS = "NOHS" + # NONT no mapping for this one in OATS + OTH = "OTHR" + RHB = "RERC" + RFR = "ROFR" + PLN = "RSPL" + SRP = "SCAR" + SCO = "SCSP" + STA = "SRPT" + SIT = "SSDP" + SRC = "STRC" + TIM = "TIME" + VGS = "VEGS" diff --git a/bin/migrate-oats-data/noi/noi_decisions/noi_conditions/__init__.py b/bin/migrate-oats-data/noi/noi_decisions/noi_conditions/__init__.py new file mode 100644 index 0000000000..96872ebf1a --- /dev/null +++ b/bin/migrate-oats-data/noi/noi_decisions/noi_conditions/__init__.py @@ -0,0 +1,11 @@ +from .notice_of_intent_conditions_init import ( + init_notice_of_intent_conditions, + clean_notice_of_intent_conditions, +) + +from .notice_of_intent_conditions_update import update_notice_of_intent_conditions + +from .notice_of_intent_conditions_link import ( + link_notice_of_intent_conditions, + clean_notice_of_intent_conditions_to_components, +) diff --git a/bin/migrate-oats-data/noi/noi_decisions/noi_conditions/notice_of_intent_conditions_init.py b/bin/migrate-oats-data/noi/noi_decisions/noi_conditions/notice_of_intent_conditions_init.py new file mode 100644 index 0000000000..cfd32d7fd4 --- /dev/null +++ b/bin/migrate-oats-data/noi/noi_decisions/noi_conditions/notice_of_intent_conditions_init.py @@ -0,0 +1,152 @@ +from common import ( + OATS_ETL_USER, + setup_and_get_logger, + add_timezone_and_keep_date_part, + OatsToAlcsConditionTypeMapping, +) +from db import inject_conn_pool +from psycopg2.extras import RealDictCursor, execute_batch + +etl_name = "init_notice_of_intent_conditions" +logger = setup_and_get_logger(etl_name) + + +@inject_conn_pool +def init_notice_of_intent_conditions(conn=None, batch_size=1000): + """ + This function is responsible for initializing the notice_of_intent_conditions in ALCS. + + Args: + conn (psycopg2.extensions.connection): PostgreSQL database connection. Provided by the decorator. + batch_size (int): The number of items to process at once. Defaults to BATCH_UPLOAD_SIZE. + """ + + logger.info(f"Start {etl_name}") + with conn.cursor(cursor_factory=RealDictCursor) as cursor: + with open( + "noi/sql/notice_of_intent_decisions/conditions/notice_of_intent_decision_conditions_insert_count.sql", + "r", + encoding="utf-8", + ) as sql_file: + count_query = sql_file.read() + cursor.execute(count_query) + count_total = dict(cursor.fetchone())["count"] + logger.info(f"Total Notice of Intent Conditions data to insert: {count_total}") + + failed_inserts = 0 + successful_inserts_count = 0 + last_condition_id = 0 + + with open( + "noi/sql/notice_of_intent_decisions/conditions/notice_of_intent_decision_conditions_insert.sql", + "r", + encoding="utf-8", + ) as sql_file: + query = sql_file.read() + while True: + cursor.execute( + f"""{query} + WHERE oc.condition_id > {last_condition_id} ORDER BY oc.condition_id;""" + ) + + rows = cursor.fetchmany(batch_size) + + if not rows: + break + try: + conditions_to_be_inserted_count = len(rows) + + _insert_notice_of_intent_conditions(conn, batch_size, cursor, rows) + + successful_inserts_count = ( + successful_inserts_count + conditions_to_be_inserted_count + ) + last_condition_id = dict(rows[-1])["condition_id"] + + logger.debug( + f"retrieved/inserted items count: {conditions_to_be_inserted_count}; total successfully inserted conditions so far {successful_inserts_count}; last inserted condition: {last_condition_id}" + ) + except Exception as err: + logger.exception(err) + conn.rollback() + failed_inserts = count_total - successful_inserts_count + last_condition_id = last_condition_id + 1 + + logger.info( + f"Finished {etl_name}: total amount of successful inserts {successful_inserts_count}, total failed inserts {failed_inserts}" + ) + + +def _insert_notice_of_intent_conditions(conn, batch_size, cursor, rows): + query = _get_insert_query() + parsed_data_list = _prepare_oats_conditions_data(rows) + + if len(parsed_data_list) > 0: + execute_batch(cursor, query, parsed_data_list, page_size=batch_size) + + conn.commit() + + +def _get_insert_query(): + query = f""" + INSERT INTO alcs.notice_of_intent_decision_condition ( + administrative_fee, + approval_dependant, + audit_created_by, + completion_date, + decision_uuid, + "description", + type_code, + oats_condition_id + ) + VALUES ( + %(administrative_fee)s, + %(approval_dependant)s, + %(audit_created_by)s, + %(completion_date)s, + %(decision_uuid)s, + %(description)s, + %(type_code)s, + %(oats_condition_id)s + ) + ON CONFLICT DO NOTHING; + """ + return query + + +def _prepare_oats_conditions_data(row_data_list): + data_list = [] + for row in row_data_list: + mapped_row = { + "administrative_fee": row.get("admin_fee"), + "approval_dependant": row.get("approval_dependant_ind"), + "audit_created_by": OATS_ETL_USER, + "completion_date": add_timezone_and_keep_date_part( + row.get("completion_date") + ), + "decision_uuid": row.get("decision_uuid"), + "description": row.get("description"), + "type_code": _map_condition_type_code(row), + "oats_condition_id": row.get("condition_id"), + } + data_list.append(mapped_row) + + return data_list + + +def _map_condition_type_code(row): + type_code = row.get("condition_code") + if type_code is not None: + return OatsToAlcsConditionTypeMapping[type_code].value + + +@inject_conn_pool +def clean_notice_of_intent_conditions(conn=None): + logger.info("Start notice_of_intent_decision_condition cleaning") + with conn.cursor() as cursor: + cursor.execute( + f"DELETE FROM alcs.notice_of_intent_decision_condition WHERE audit_created_by = '{OATS_ETL_USER}' AND audit_updated_by is NULL " + ) + logger.info(f"Deleted items count = {cursor.rowcount}") + + conn.commit() diff --git a/bin/migrate-oats-data/noi/noi_decisions/noi_conditions/notice_of_intent_conditions_link.py b/bin/migrate-oats-data/noi/noi_decisions/noi_conditions/notice_of_intent_conditions_link.py new file mode 100644 index 0000000000..ea70045fd9 --- /dev/null +++ b/bin/migrate-oats-data/noi/noi_decisions/noi_conditions/notice_of_intent_conditions_link.py @@ -0,0 +1,130 @@ +from common import ( + OATS_ETL_USER, + setup_and_get_logger, +) +from db import inject_conn_pool +from psycopg2.extras import RealDictCursor, execute_batch + +etl_name = "link_notice_of_intent_conditions" +logger = setup_and_get_logger(etl_name) + + +@inject_conn_pool +def link_notice_of_intent_conditions(conn=None, batch_size=1000): + """ + This function is responsible for initializing the notice_of_intent_decision_condition_component in ALCS. + + Args: + conn (psycopg2.extensions.connection): PostgreSQL database connection. Provided by the decorator. + batch_size (int): The number of items to process at once. Defaults to BATCH_UPLOAD_SIZE. + """ + + logger.info(f"Start {etl_name}") + with conn.cursor(cursor_factory=RealDictCursor) as cursor: + with open( + "noi/sql/notice_of_intent_decisions/conditions/notice_of_intent_decision_conditions_link_count.sql", + "r", + encoding="utf-8", + ) as sql_file: + count_query = sql_file.read() + cursor.execute(count_query) + count_total = dict(cursor.fetchone())["count"] + logger.info( + f"Total Notice of Intent Conditions To Components data to insert: {count_total}" + ) + + failed_inserts = 0 + successful_inserts_count = 0 + last_condition_id = 0 + + with open( + "noi/sql/notice_of_intent_decisions/conditions/notice_of_intent_decision_conditions_link.sql", + "r", + encoding="utf-8", + ) as sql_file: + query = sql_file.read() + while True: + cursor.execute( + f"""{query} + WHERE noidc.oats_condition_id > {last_condition_id} ORDER BY noidc.oats_condition_id;""" + ) + + rows = cursor.fetchmany(batch_size) + + if not rows: + break + try: + conditions_to_be_inserted_count = len(rows) + + _insert_notice_of_intent_conditions(conn, batch_size, cursor, rows) + + successful_inserts_count = ( + successful_inserts_count + conditions_to_be_inserted_count + ) + last_condition_id = dict(rows[-1])["oats_condition_id"] + + logger.debug( + f"retrieved/inserted items count: {conditions_to_be_inserted_count}; total successfully linked conditions so far {successful_inserts_count}; last inserted condition: {last_condition_id}" + ) + except Exception as err: + logger.exception(err) + conn.rollback() + failed_inserts = count_total - successful_inserts_count + last_condition_id = last_condition_id + 1 + + logger.info( + f"Finished {etl_name}: total amount of successful inserts {successful_inserts_count}, total failed inserts {failed_inserts}" + ) + + +def _insert_notice_of_intent_conditions(conn, batch_size, cursor, rows): + query = _get_insert_query() + parsed_data_list = _prepare_oats_conditions_data(rows) + + if len(parsed_data_list) > 0: + execute_batch(cursor, query, parsed_data_list, page_size=batch_size) + + conn.commit() + + +def _get_insert_query(): + query = f""" + INSERT INTO alcs.notice_of_intent_decision_condition_component ( + notice_of_intent_decision_condition_uuid, + notice_of_intent_decision_component_uuid + ) + VALUES ( + %(condition_uuid)s, + %(component_uuid)s + ) + ON CONFLICT DO NOTHING; + """ + return query + + +def _prepare_oats_conditions_data(row_data_list): + data_list = [] + for row in row_data_list: + mapped_row = { + "condition_uuid": row.get("condition_uuid"), + "component_uuid": row.get("component_uuid"), + } + data_list.append(mapped_row) + + return data_list + + +@inject_conn_pool +def clean_notice_of_intent_conditions_to_components(conn=None): + logger.info("Start notice_of_intent_decision_condition_component cleaning") + with conn.cursor() as cursor: + cursor.execute( + f""" + DELETE FROM alcs.notice_of_intent_decision_condition_component cc + USING alcs.notice_of_intent_decision_condition dc + WHERE cc.notice_of_intent_decision_condition_uuid = dc."uuid" AND dc.audit_created_by = '{OATS_ETL_USER}' AND dc.audit_updated_by IS NULL; + """ + ) + logger.info(f"Deleted items count = {cursor.rowcount}") + + conn.commit() diff --git a/bin/migrate-oats-data/noi/noi_decisions/noi_conditions/notice_of_intent_conditions_update.py b/bin/migrate-oats-data/noi/noi_decisions/noi_conditions/notice_of_intent_conditions_update.py new file mode 100644 index 0000000000..8931b4fd53 --- /dev/null +++ b/bin/migrate-oats-data/noi/noi_decisions/noi_conditions/notice_of_intent_conditions_update.py @@ -0,0 +1,109 @@ +from common import ( + setup_and_get_logger, +) +from db import inject_conn_pool +from psycopg2.extras import RealDictCursor, execute_batch + +etl_name = "update_notice_of_intent_conditions" +logger = setup_and_get_logger(etl_name) + + +@inject_conn_pool +def update_notice_of_intent_conditions(conn=None, batch_size=1000): + """ + This function is responsible for updating existing the notice_of_intent_decision_condition in ALCS. + + Args: + conn (psycopg2.extensions.connection): PostgreSQL database connection. Provided by the decorator. + batch_size (int): The number of items to process at once. Defaults to BATCH_UPLOAD_SIZE. + """ + + logger.info(f"Start {etl_name}") + with conn.cursor(cursor_factory=RealDictCursor) as cursor: + with open( + "noi/sql/notice_of_intent_decisions/conditions/notice_of_intent_decision_conditions_update_count.sql", + "r", + encoding="utf-8", + ) as sql_file: + count_query = sql_file.read() + cursor.execute(count_query) + count_total = dict(cursor.fetchone())["count"] + logger.info(f"Total Notice of Intent Conditions data to updated: {count_total}") + + failed_updates = 0 + successful_updates_count = 0 + last_condition_id = 0 + + with open( + "noi/sql/notice_of_intent_decisions/conditions/notice_of_intent_decision_conditions_update.sql", + "r", + encoding="utf-8", + ) as sql_file: + query = sql_file.read() + while True: + cursor.execute( + f"""{query} + WHERE oc.condition_id > {last_condition_id} ORDER BY oc.condition_id;""" + ) + + rows = cursor.fetchmany(batch_size) + + if not rows: + break + try: + conditions_to_be_updated_count = len(rows) + + _update_notice_of_intent_conditions(conn, batch_size, cursor, rows) + + successful_updates_count = ( + successful_updates_count + conditions_to_be_updated_count + ) + last_condition_id = dict(rows[-1])["condition_id"] + + logger.debug( + f"retrieved/updated items count: {conditions_to_be_updated_count}; total successfully update conditions so far {successful_updates_count}; last updated condition: {last_condition_id}" + ) + except Exception as err: + logger.exception(err) + conn.rollback() + failed_updates = count_total - successful_updates_count + last_condition_id = last_condition_id + 1 + + logger.info( + f"Finished {etl_name}: total amount of successful updates {successful_updates_count}, total failed updates {failed_updates}" + ) + + +def _update_notice_of_intent_conditions(conn, batch_size, cursor, rows): + data = _prepare_oats_alr_applications_data(rows) + + if len(data) > 0: + execute_batch( + cursor, + _get_update_query(), + data, + page_size=batch_size, + ) + + conn.commit() + + +def _get_update_query(): + query = f""" + UPDATE alcs.notice_of_intent_decision_condition + SET security_amount = %(security_amt)s + WHERE alcs.notice_of_intent_decision_condition."uuid" = %(condition_uuid)s; + """ + return query + + +def _prepare_oats_alr_applications_data(row_data_list): + data_list = [] + for row in row_data_list: + mapped_row = { + "security_amt": row.get("security_amt"), + "condition_uuid": row.get("condition_uuid"), + } + data_list.append(mapped_row) + + return data_list diff --git a/bin/migrate-oats-data/noi/notice_of_intent_migration.py b/bin/migrate-oats-data/noi/notice_of_intent_migration.py index 42448e8f66..0096549518 100644 --- a/bin/migrate-oats-data/noi/notice_of_intent_migration.py +++ b/bin/migrate-oats-data/noi/notice_of_intent_migration.py @@ -72,6 +72,14 @@ update_notice_of_intent_decision_component_soil_details, ) +from .noi_decisions.noi_conditions import ( + init_notice_of_intent_conditions, + clean_notice_of_intent_conditions, + update_notice_of_intent_conditions, + link_notice_of_intent_conditions, + clean_notice_of_intent_conditions_to_components, +) + def init_notice_of_intent(batch_size): init_notice_of_intents(batch_size=batch_size) @@ -101,9 +109,14 @@ def process_notice_of_intent_decisions(batch_size): link_notice_of_intent_modifications(batch_size) init_notice_of_intent_decision_components(batch_size) update_notice_of_intent_decision_component_soil_details(batch_size) + init_notice_of_intent_conditions(batch_size) + update_notice_of_intent_conditions(batch_size) + link_notice_of_intent_conditions(batch_size) def clean_notice_of_intent_decision(): + clean_notice_of_intent_conditions_to_components() + clean_notice_of_intent_conditions() clean_notice_of_intent_decision_components() unlink_etl_modifications() clean_notice_of_intent_modifications() diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_decisions/conditions/notice_of_intent_decision_conditions_insert.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_decisions/conditions/notice_of_intent_decision_conditions_insert.sql new file mode 100644 index 0000000000..a7557686ae --- /dev/null +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_decisions/conditions/notice_of_intent_decision_conditions_insert.sql @@ -0,0 +1,9 @@ +SELECT oc.condition_id, + admin_fee, + approval_dependant_ind, + completion_date, + noidc.notice_of_intent_decision_uuid AS decision_uuid, + "description", + condition_code +FROM oats.oats_conditions oc + JOIN alcs.notice_of_intent_decision_component noidc ON noidc.oats_alr_appl_component_id = oc.alr_appl_component_id -- ensure to select only conditions for imported OATS components diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_decisions/conditions/notice_of_intent_decision_conditions_insert_count.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_decisions/conditions/notice_of_intent_decision_conditions_insert_count.sql new file mode 100644 index 0000000000..c8b25705fd --- /dev/null +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_decisions/conditions/notice_of_intent_decision_conditions_insert_count.sql @@ -0,0 +1,3 @@ +SELECT count(*) +FROM oats.oats_conditions oc + JOIN alcs.notice_of_intent_decision_component noidc ON noidc.oats_alr_appl_component_id = oc.alr_appl_component_id -- ensure to select only conditions for imported OATS components \ No newline at end of file diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_decisions/conditions/notice_of_intent_decision_conditions_link.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_decisions/conditions/notice_of_intent_decision_conditions_link.sql new file mode 100644 index 0000000000..efcc83d1b9 --- /dev/null +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_decisions/conditions/notice_of_intent_decision_conditions_link.sql @@ -0,0 +1,6 @@ +SELECT noidc."uuid" AS condition_uuid, + noidc2."uuid" AS component_uuid, + noidc.oats_condition_id +FROM alcs.notice_of_intent_decision_condition noidc + JOIN oats.oats_conditions oc ON oc.condition_id = noidc.oats_condition_id + JOIN alcs.notice_of_intent_decision_component noidc2 ON noidc2.oats_alr_appl_component_id = oc.alr_appl_component_id \ No newline at end of file diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_decisions/conditions/notice_of_intent_decision_conditions_link_count.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_decisions/conditions/notice_of_intent_decision_conditions_link_count.sql new file mode 100644 index 0000000000..fa182b484e --- /dev/null +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_decisions/conditions/notice_of_intent_decision_conditions_link_count.sql @@ -0,0 +1,4 @@ +SELECT count(*) +FROM alcs.notice_of_intent_decision_condition noidc + JOIN oats.oats_conditions oc ON oc.condition_id = noidc.oats_condition_id + JOIN alcs.notice_of_intent_decision_component noidc2 ON noidc2.oats_alr_appl_component_id = oc.alr_appl_component_id \ No newline at end of file diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_decisions/conditions/notice_of_intent_decision_conditions_update.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_decisions/conditions/notice_of_intent_decision_conditions_update.sql new file mode 100644 index 0000000000..1b65c8dd67 --- /dev/null +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_decisions/conditions/notice_of_intent_decision_conditions_update.sql @@ -0,0 +1,7 @@ +SELECT noidc."uuid" AS condition_uuid, + oaad.security_amt, + oc.condition_id +FROM oats.oats_conditions oc + JOIN alcs.notice_of_intent_decision_condition noidc ON noidc.oats_condition_id = oc.condition_id -- only retrieve conditions that were imported into ALCS + JOIN oats.oats_alr_appl_components oaac ON oaac.alr_appl_component_id = oc.alr_appl_component_id + JOIN oats.oats_alr_appl_decisions oaad ON oaad.alr_appl_decision_id = oaac.alr_appl_decision_id \ No newline at end of file diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_decisions/conditions/notice_of_intent_decision_conditions_update_count.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_decisions/conditions/notice_of_intent_decision_conditions_update_count.sql new file mode 100644 index 0000000000..2bb911563b --- /dev/null +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_decisions/conditions/notice_of_intent_decision_conditions_update_count.sql @@ -0,0 +1,5 @@ +SELECT count(*) +FROM oats.oats_conditions oc + JOIN alcs.notice_of_intent_decision_condition noidc ON noidc.oats_condition_id = oc.condition_id -- only retrieve conditions that were imported into ALCS + JOIN oats.oats_alr_appl_components oaac ON oaac.alr_appl_component_id = oc.alr_appl_component_id + JOIN oats.oats_alr_appl_decisions oaad ON oaad.alr_appl_decision_id = oaac.alr_appl_decision_id \ No newline at end of file diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-condition/notice-of-intent-decision-condition.entity.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-condition/notice-of-intent-decision-condition.entity.ts index 565f71cc33..08cb17bb90 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-condition/notice-of-intent-decision-condition.entity.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-condition/notice-of-intent-decision-condition.entity.ts @@ -82,4 +82,13 @@ export class NoticeOfIntentDecisionCondition extends Base { name: 'notice_of_intent_decision_condition_component', }) components: NoticeOfIntentDecisionComponent[] | null; + + @Column({ + select: false, + nullable: true, + type: 'int8', + comment: + 'This column is NOT related to any functionality in ALCS. It is only used for ETL and backtracking of imported data from OATS. It links oats.oats_conditions to alcs.notice_of_intent_decision_condition.', + }) + oatsConditionId: number; } diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1703269710872-add_oats_condition_id_to_noi_decision_condition.ts b/services/apps/alcs/src/providers/typeorm/migrations/1703269710872-add_oats_condition_id_to_noi_decision_condition.ts new file mode 100644 index 0000000000..9965858849 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1703269710872-add_oats_condition_id_to_noi_decision_condition.ts @@ -0,0 +1,25 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class AddOatsConditionIdToNoiDecisionCondition1703269710872 + implements MigrationInterface +{ + name = 'AddOatsConditionIdToNoiDecisionCondition1703269710872'; + + public async up(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_decision_condition" ADD "oats_condition_id" bigint`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."notice_of_intent_decision_condition"."oats_condition_id" IS 'This column is NOT related to any functionality in ALCS. It is only used for ETL and backtracking of imported data from OATS. It links oats.oats_conditions to alcs.notice_of_intent_decision_condition.'`, + ); + } + + public async down(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."notice_of_intent_decision_condition"."oats_condition_id" IS 'This column is NOT related to any functionality in ALCS. It is only used for ETL and backtracking of imported data from OATS. It links oats.oats_conditions to alcs.notice_of_intent_decision_condition.'`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_decision_condition" DROP COLUMN "oats_condition_id"`, + ); + } +} From 87930ebbef2e085769afad1908b77e1d047adac3 Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Thu, 4 Jan 2024 10:23:43 -0800 Subject: [PATCH 862/954] Only show no owner warning if 'yes' selected --- .../primary-contact/primary-contact.component.html | 2 +- .../primary-contact/primary-contact.component.ts | 4 +++- .../primary-contact/primary-contact.component.html | 2 +- .../primary-contact/primary-contact.component.ts | 4 +++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html index 8721caf611..379b7add56 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html @@ -83,7 +83,7 @@ <h2>Primary Contact</h2> </div> </div> </div> - <app-warning-banner *ngIf="selectedThirdPartyAgent === false && parcelOwners.length === 0 && !isGovernmentUser"> + <app-warning-banner *ngIf="showNoOwnersWarning"> No landowners or government contacts are added. Please go back to Step 1 to add information. </app-warning-banner> <!-- /Owner --> diff --git a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts index 078c52a7fc..32c66bce3b 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts @@ -43,9 +43,9 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni isDirty = false; showVirusError = false; hasCrownParcels = false; + showNoOwnersWarning = false; isExistingOwner = new FormControl<boolean | null>(null, [Validators.required]); - firstName = new FormControl<string | null>('', [Validators.required]); lastName = new FormControl<string | null>('', [Validators.required]); organizationName = new FormControl<string | null>(''); @@ -322,6 +322,8 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni } else { this.selectedThirdPartyAgent = false; } + + this.showNoOwnersWarning = isExistingOwner === true && this.parcelOwners.length === 0 && !this.isGovernmentUser; } onEdit(selectedOwnerUuid: string) { diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html index 44d4e2ecfc..e539e15a70 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html @@ -84,7 +84,7 @@ <h2>Primary Contact</h2> </div> </div> </div> - <app-warning-banner *ngIf="selectedThirdPartyAgent === false && parcelOwners.length === 0 && !isGovernmentUser"> + <app-warning-banner *ngIf="showNoOwnersWarning"> No landowners or government contacts are added. Please go back to Step 1 to add information. </app-warning-banner> <!-- /Owner --> diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts index b00aef100f..3b4e8c2265 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts @@ -44,9 +44,9 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni governmentName: string | undefined; isDirty = false; hasCrownParcels = false; + showNoOwnersWarning = false; isExistingOwner = new FormControl<boolean | null>(null, [Validators.required]); - firstName = new FormControl<string | null>('', [Validators.required]); lastName = new FormControl<string | null>('', [Validators.required]); organizationName = new FormControl<string | null>(''); @@ -324,6 +324,8 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni } else { this.selectedThirdPartyAgent = false; } + + this.showNoOwnersWarning = isExistingOwner === true && this.parcelOwners.length === 0 && !this.isGovernmentUser; } onEdit(selectedOwnerUuid: string) { From 97364717aec8490b1a95f2aef70c2d9362e1a5e1 Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Thu, 4 Jan 2024 11:00:18 -0800 Subject: [PATCH 863/954] Fix confirmation showing when it shouldn't --- .../primary-contact/primary-contact.component.ts | 7 ++++++- .../primary-contact/primary-contact.component.ts | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts index 32c66bce3b..ebe3e7e24e 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts @@ -289,7 +289,7 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni } async onSelectPrimaryContactType(isExistingOwner: boolean | null) { - if (this.form.dirty || (this.selectedOwnerUuid !== 'agent' && this.selectedOwnerUuid !== 'government')) { + if (this.form.dirty || (this.selectedOwnerUuid && this.selectedOwnerUuid !== 'agent')) { await this.dialog .open(PrimaryContactConfirmationDialogComponent, { panelClass: 'no-padding', @@ -303,6 +303,11 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni .subscribe(async (confirmed) => { if (confirmed) { this.switchPrimaryContactType(isExistingOwner); + + // Ensure form is cleared after switching to existing user + if (this.selectedOwnerUuid === 'agent') { + this.form.reset(); + } } else { this.isExistingOwner.setValue(!isExistingOwner); } diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts index 3b4e8c2265..f071590340 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts @@ -291,7 +291,7 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni } async onSelectPrimaryContactType(isExistingOwner: boolean | null) { - if (this.form.dirty || (this.selectedOwnerUuid !== 'agent' && this.selectedOwnerUuid !== 'government')) { + if (this.form.dirty || (this.selectedOwnerUuid && this.selectedOwnerUuid !== 'agent')) { await this.dialog .open(PrimaryContactConfirmationDialogComponent, { panelClass: 'no-padding', @@ -305,6 +305,11 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni .subscribe(async (confirmed) => { if (confirmed) { this.switchPrimaryContactType(isExistingOwner); + + // Ensure form is cleared after switching to existing user + if (this.selectedOwnerUuid === 'agent') { + this.form.reset(); + } } else { this.isExistingOwner.setValue(!isExistingOwner); } From b3899351e54f9134834f2547987604e0a4ca5b05 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Thu, 4 Jan 2024 11:56:30 -0800 Subject: [PATCH 864/954] Add hideFromPortal Flag * Remove hideFromPortal = false from inbox and public search results * Prevent public from loading at all * Add UI to App/NOI detail page to change toggle --- .../application/application.component.ts | 2 +- .../application/application.module.ts | 3 +- .../overview/overview.component.html | 6 + .../overview/overview.component.scss | 6 + .../overview/overview.component.ts | 37 +++- .../application-dialog.component.spec.ts | 1 + .../notice-of-intent-dialog.component.spec.ts | 1 + .../overview/overview.component.html | 6 + .../overview/overview.component.ts | 38 +++- .../services/application/application.dto.ts | 2 + .../application/application.service.spec.ts | 9 +- .../notice-of-intent/notice-of-intent.dto.ts | 2 + alcs-frontend/src/app/shared/shared.module.ts | 5 +- .../application.controller.spec.ts | 1 + .../application/application.controller.ts | 1 + .../src/alcs/application/application.dto.ts | 8 + .../alcs/application/application.entity.ts | 7 + .../notice-of-intent/notice-of-intent.dto.ts | 7 + .../notice-of-intent.entity.ts | 7 + .../notice-of-intent.service.ts | 5 + services/apps/alcs/src/main.ts | 1 + .../inbox-application-view.entity.ts | 6 +- .../inbox-notice-of-intent-view.entity.ts | 6 +- .../application/public-application.service.ts | 6 +- .../public-notice-of-intent.service.ts | 6 +- .../public-application-search-view.entity.ts | 6 +- ...lic-notice-of-intent-search-view.entity.ts | 6 +- .../migrations/1704328408031-add_hide_flag.ts | 23 +++ ...8830-refresh_views_for_hide_from_public.ts | 165 ++++++++++++++++++ 29 files changed, 361 insertions(+), 18 deletions(-) create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1704328408031-add_hide_flag.ts create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1704396938830-refresh_views_for_hide_from_public.ts diff --git a/alcs-frontend/src/app/features/application/application.component.ts b/alcs-frontend/src/app/features/application/application.component.ts index 0fe76e4399..38d973a9ec 100644 --- a/alcs-frontend/src/app/features/application/application.component.ts +++ b/alcs-frontend/src/app/features/application/application.component.ts @@ -202,7 +202,7 @@ export class ApplicationComponent implements OnInit, OnDestroy { this.reconsiderationService.fetchByApplication(application.fileNumber); this.modificationService.fetchByApplication(application.fileNumber); - this.isApplicantSubmission = application.source === SYSTEM_SOURCE_TYPES.APPLICANT; + this.isApplicantSubmission = application.source !== SYSTEM_SOURCE_TYPES.ALCS; let wasSubmittedToLfng = false; if (this.isApplicantSubmission) { diff --git a/alcs-frontend/src/app/features/application/application.module.ts b/alcs-frontend/src/app/features/application/application.module.ts index db90c54e34..049b6ce44a 100644 --- a/alcs-frontend/src/app/features/application/application.module.ts +++ b/alcs-frontend/src/app/features/application/application.module.ts @@ -1,5 +1,6 @@ import { NgIf } from '@angular/common'; import { NgModule } from '@angular/core'; +import { MatSlideToggleModule } from '@angular/material/slide-toggle'; import { RouterModule, Routes } from '@angular/router'; import { MTX_DATETIME_FORMATS } from '@ng-matero/extensions/core'; import { ApplicationDetailService } from '../../services/application/application-detail.service'; @@ -82,6 +83,6 @@ const routes: Routes = [ UncancelApplicationDialogComponent, ReturnApplicationDialogComponent, ], - imports: [SharedModule, RouterModule.forChild(routes), ApplicationDetailsModule, DecisionModule, NgIf], + imports: [SharedModule, RouterModule.forChild(routes), ApplicationDetailsModule, DecisionModule], }) export class ApplicationModule {} diff --git a/alcs-frontend/src/app/features/application/overview/overview.component.html b/alcs-frontend/src/app/features/application/overview/overview.component.html index 939a9f5ed1..99ee613b85 100644 --- a/alcs-frontend/src/app/features/application/overview/overview.component.html +++ b/alcs-frontend/src/app/features/application/overview/overview.component.html @@ -24,3 +24,9 @@ <h5>Proposal Summary</h5> <h5>Application Event Timeline</h5> <app-timeline [events]="events"></app-timeline> </section> +<section> + <h5>Portal Access</h5> + <mat-slide-toggle class="toggle" [(ngModel)]="isHiddenFromPortal" (change)="onTogglePortalVisible()"> + Restrict Access for the Local/First Nation Government and Public + </mat-slide-toggle> +</section> diff --git a/alcs-frontend/src/app/features/application/overview/overview.component.scss b/alcs-frontend/src/app/features/application/overview/overview.component.scss index 439e3e77c2..6b639eeb37 100644 --- a/alcs-frontend/src/app/features/application/overview/overview.component.scss +++ b/alcs-frontend/src/app/features/application/overview/overview.component.scss @@ -5,3 +5,9 @@ h5 { section { margin: 32px 0; } + +:host::ng-deep { + .toggle .mdc-label { + font-size: 16px; + } +} diff --git a/alcs-frontend/src/app/features/application/overview/overview.component.ts b/alcs-frontend/src/app/features/application/overview/overview.component.ts index b9919ed795..cc2e81f47e 100644 --- a/alcs-frontend/src/app/features/application/overview/overview.component.ts +++ b/alcs-frontend/src/app/features/application/overview/overview.component.ts @@ -1,5 +1,6 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; +import { MatSlideToggleChange } from '@angular/material/slide-toggle'; import { Subject, takeUntil } from 'rxjs'; import { ApplicationDetailService } from '../../../services/application/application-detail.service'; import { ApplicationSubmissionToSubmissionStatusDto } from '../../../services/application/application-submission-status/application-submission-status.dto'; @@ -21,13 +22,14 @@ export class OverviewComponent implements OnInit, OnDestroy { events: TimelineEventDto[] = []; summary = ''; isCancelled = false; + isHiddenFromPortal = false; constructor( private applicationDetailService: ApplicationDetailService, private confirmationDialogService: ConfirmationDialogService, private applicationSubmissionStatusService: ApplicationSubmissionStatusService, private applicationTimelineService: ApplicationTimelineService, - private dialog: MatDialog + private dialog: MatDialog, ) {} ngOnInit(): void { @@ -37,6 +39,7 @@ export class OverviewComponent implements OnInit, OnDestroy { this.summary = application.summary ?? ''; this.events = await this.applicationTimelineService.fetchByFileNumber(application.fileNumber); this.loadStatusHistory(this.application.fileNumber); + this.isHiddenFromPortal = application.hideFromPortal; } }); } @@ -92,7 +95,7 @@ export class OverviewComponent implements OnInit, OnDestroy { try { statusHistory = await this.applicationSubmissionStatusService.fetchSubmissionStatusesByFileNumber( fileNumber, - false + false, ); } catch (e) { console.warn(`No statuses for ${fileNumber}. Is it a manually created submission?`); @@ -102,4 +105,34 @@ export class OverviewComponent implements OnInit, OnDestroy { statusHistory.filter((status) => status.effectiveDate && status.statusTypeCode === SUBMISSION_STATUS.CANCELLED) .length > 0; } + + onTogglePortalVisible() { + if (this.isHiddenFromPortal) { + this.confirmationDialogService + .openDialog({ + body: 'Are you sure you want to remove the access restriction for the L/FNG and public? If you continue, this File ID could return search results for the L/FNG and the public. Standard rules for showing/hiding content will apply.', + }) + .subscribe((didConfirm) => { + this.isHiddenFromPortal = didConfirm; + if (didConfirm && this.application) { + this.applicationDetailService.updateApplication(this.application.fileNumber, { + hideFromPortal: true, + }); + } + }); + } else { + this.confirmationDialogService + .openDialog({ + body: 'If you continue, this File ID will not return any search results for the L/FNG and the public. Please add a journal note to explain why this file is restricted.', + }) + .subscribe((didConfirm) => { + this.isHiddenFromPortal = !didConfirm; + if (didConfirm && this.application) { + this.applicationDetailService.updateApplication(this.application.fileNumber, { + hideFromPortal: false, + }); + } + }); + } + } } diff --git a/alcs-frontend/src/app/features/board/dialogs/application/application-dialog.component.spec.ts b/alcs-frontend/src/app/features/board/dialogs/application/application-dialog.component.spec.ts index afe56ea4d2..56386e0ab0 100644 --- a/alcs-frontend/src/app/features/board/dialogs/application/application-dialog.component.spec.ts +++ b/alcs-frontend/src/app/features/board/dialogs/application/application-dialog.component.spec.ts @@ -48,6 +48,7 @@ describe('ApplicationDialogComponent', () => { const mockApplication: ApplicationDto = { uuid: '', + hideFromPortal: false, type: mockApplicationType, region: mockApplicationRegion, fileNumber: '1111', diff --git a/alcs-frontend/src/app/features/board/dialogs/notice-of-intent/notice-of-intent-dialog.component.spec.ts b/alcs-frontend/src/app/features/board/dialogs/notice-of-intent/notice-of-intent-dialog.component.spec.ts index 1ee6418877..602d978e4d 100644 --- a/alcs-frontend/src/app/features/board/dialogs/notice-of-intent/notice-of-intent-dialog.component.spec.ts +++ b/alcs-frontend/src/app/features/board/dialogs/notice-of-intent/notice-of-intent-dialog.component.spec.ts @@ -32,6 +32,7 @@ describe('NoticeOfIntentDialogComponent', () => { const mockDto: NoticeOfIntentDto = { applicant: 'fake-type', + hideFromPortal: false, region: { code: 'region-code', label: 'region', diff --git a/alcs-frontend/src/app/features/notice-of-intent/overview/overview.component.html b/alcs-frontend/src/app/features/notice-of-intent/overview/overview.component.html index 2bf8466262..8e8960fa3e 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/overview/overview.component.html +++ b/alcs-frontend/src/app/features/notice-of-intent/overview/overview.component.html @@ -26,3 +26,9 @@ <h5>Proposal Summary</h5> <h5>Notice of Intent Event Timeline</h5> <app-timeline [events]="events"></app-timeline> </section> +<section> + <h5>Portal Access</h5> + <mat-slide-toggle class="toggle" [(ngModel)]="isHiddenFromPortal" (change)="onTogglePortalVisible()"> + Restrict Access for the Local/First Nation Government and Public + </mat-slide-toggle> +</section> diff --git a/alcs-frontend/src/app/features/notice-of-intent/overview/overview.component.ts b/alcs-frontend/src/app/features/notice-of-intent/overview/overview.component.ts index 6fde98c3aa..33c2aef78b 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/overview/overview.component.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/overview/overview.component.ts @@ -24,13 +24,14 @@ export class OverviewComponent implements OnInit, OnDestroy { events: TimelineEventDto[] = []; summary = ''; isCancelled = false; + isHiddenFromPortal = false; constructor( private noticeOfIntentDetailService: NoticeOfIntentDetailService, private noticeOfIntentSubmissionStatusService: NoticeOfIntentSubmissionStatusService, private noticeOfIntentTimelineService: NoticeOfIntentTimelineService, private confirmationDialogService: ConfirmationDialogService, - private dialog: MatDialog + private dialog: MatDialog, ) {} ngOnInit(): void { @@ -39,6 +40,7 @@ export class OverviewComponent implements OnInit, OnDestroy { .subscribe(async (noticeOfIntent) => { if (noticeOfIntent) { this.noticeOfIntent = noticeOfIntent; + this.isHiddenFromPortal = noticeOfIntent.hideFromPortal; this.summary = noticeOfIntent.summary ?? ''; this.events = await this.noticeOfIntentTimelineService.fetchByFileNumber(noticeOfIntent.fileNumber); this.loadStatusHistory(this.noticeOfIntent.fileNumber); @@ -64,7 +66,7 @@ export class OverviewComponent implements OnInit, OnDestroy { try { statusHistory = await this.noticeOfIntentSubmissionStatusService.fetchSubmissionStatusesByFileNumber( fileNumber, - false + false, ); } catch (e) { console.warn(`No statuses for ${fileNumber}. Is it a manually created submission?`); @@ -72,7 +74,7 @@ export class OverviewComponent implements OnInit, OnDestroy { this.isCancelled = statusHistory.filter( - (status) => status.effectiveDate && status.statusTypeCode === NOI_SUBMISSION_STATUS.CANCELLED + (status) => status.effectiveDate && status.statusTypeCode === NOI_SUBMISSION_STATUS.CANCELLED, ).length > 0; } @@ -108,4 +110,34 @@ export class OverviewComponent implements OnInit, OnDestroy { }); } } + + onTogglePortalVisible() { + if (this.isHiddenFromPortal) { + this.confirmationDialogService + .openDialog({ + body: 'Are you sure you want to remove the access restriction for the L/FNG and public? If you continue, this File ID could return search results for the L/FNG and the public. Standard rules for showing/hiding content will apply.', + }) + .subscribe((didConfirm) => { + this.isHiddenFromPortal = didConfirm; + if (didConfirm && this.noticeOfIntent) { + this.noticeOfIntentDetailService.update(this.noticeOfIntent.fileNumber, { + hideFromPortal: true, + }); + } + }); + } else { + this.confirmationDialogService + .openDialog({ + body: 'If you continue, this File ID will not return any search results for the L/FNG and the public. Please add a journal note to explain why this file is restricted.', + }) + .subscribe((didConfirm) => { + this.isHiddenFromPortal = !didConfirm; + if (didConfirm && this.noticeOfIntent) { + this.noticeOfIntentDetailService.update(this.noticeOfIntent.fileNumber, { + hideFromPortal: false, + }); + } + }); + } + } } diff --git a/alcs-frontend/src/app/services/application/application.dto.ts b/alcs-frontend/src/app/services/application/application.dto.ts index 9f1802a48a..95ae1a71db 100644 --- a/alcs-frontend/src/app/services/application/application.dto.ts +++ b/alcs-frontend/src/app/services/application/application.dto.ts @@ -226,6 +226,7 @@ export interface ApplicationDto { fileNumber: string; applicant: string; summary?: string; + hideFromPortal: boolean; type: ApplicationTypeDto; dateSubmittedToAlc: number; feePaidDate?: number; @@ -264,6 +265,7 @@ export interface ApplicationDto { export interface UpdateApplicationDto { dateSubmittedToAlc?: number; applicant?: string; + hideFromPortal?: boolean; statusCode?: string; regionCode?: string; summary?: string; diff --git a/alcs-frontend/src/app/services/application/application.service.spec.ts b/alcs-frontend/src/app/services/application/application.service.spec.ts index 248d526c27..f69f395673 100644 --- a/alcs-frontend/src/app/services/application/application.service.spec.ts +++ b/alcs-frontend/src/app/services/application/application.service.spec.ts @@ -15,6 +15,7 @@ describe('ApplicationService', () => { const mockApplication: ApplicationDto = { uuid: '', + hideFromPortal: false, activeDays: 0, applicant: '', dateSubmittedToAlc: 0, @@ -80,7 +81,7 @@ describe('ApplicationService', () => { code: 'region', }, ], - }) + }), ); }); @@ -136,7 +137,7 @@ describe('ApplicationService', () => { httpClient.post.mockReturnValueOnce( throwError(() => { new Error(''); - }) + }), ); try { @@ -168,7 +169,7 @@ describe('ApplicationService', () => { httpClient.patch.mockReturnValueOnce( throwError(() => { new Error(''); - }) + }), ); try { @@ -195,7 +196,7 @@ describe('ApplicationService', () => { httpClient.patch.mockReturnValueOnce( throwError(() => { new Error(''); - }) + }), ); const res = await service.updateApplicationCard('1', {}); diff --git a/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent.dto.ts b/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent.dto.ts index 703739e394..17f20ad556 100644 --- a/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent.dto.ts +++ b/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent.dto.ts @@ -27,6 +27,7 @@ export interface NoticeOfIntentTypeDto extends BaseCodeDto { export interface NoticeOfIntentDto { uuid: string; fileNumber: string; + hideFromPortal: boolean; card: CardDto; localGovernment: ApplicationLocalGovernmentDto; region: ApplicationRegionDto; @@ -64,6 +65,7 @@ export interface NoticeOfIntentDto { export interface UpdateNoticeOfIntentDto { dateSubmittedToAlc?: number; + hideFromPortal?: boolean; feePaidDate?: number; feeWaived?: boolean | null; feeSplitWithLg?: boolean | null; diff --git a/alcs-frontend/src/app/shared/shared.module.ts b/alcs-frontend/src/app/shared/shared.module.ts index 7797fe503f..3cbdc88bc4 100644 --- a/alcs-frontend/src/app/shared/shared.module.ts +++ b/alcs-frontend/src/app/shared/shared.module.ts @@ -21,6 +21,7 @@ import { MatMenuModule } from '@angular/material/menu'; import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; import { MatRadioModule } from '@angular/material/radio'; import { MatSelectModule } from '@angular/material/select'; +import { MatSlideToggleModule } from '@angular/material/slide-toggle'; import { MatSnackBarModule } from '@angular/material/snack-bar'; import { MatSortModule } from '@angular/material/sort'; import { MatTableModule } from '@angular/material/table'; @@ -132,6 +133,7 @@ import { WarningBannerComponent } from './warning-banner/warning-banner.componen MatDatepickerModule, MatDialogModule, NgSelectModule, + MatSlideToggleModule, ], exports: [ CommonModule, @@ -201,7 +203,8 @@ import { WarningBannerComponent } from './warning-banner/warning-banner.componen LotsTableFormComponent, ApplicationLegacyIdComponent, TableColumnNoDataPipe, - InlineChairReviewOutcomeComponent + InlineChairReviewOutcomeComponent, + MatSlideToggleModule, ], }) export class SharedModule { diff --git a/services/apps/alcs/src/alcs/application/application.controller.spec.ts b/services/apps/alcs/src/alcs/application/application.controller.spec.ts index bb542f212d..ae9cb60c9c 100644 --- a/services/apps/alcs/src/alcs/application/application.controller.spec.ts +++ b/services/apps/alcs/src/alcs/application/application.controller.spec.ts @@ -43,6 +43,7 @@ describe('ApplicationController', () => { const mockApplicationDto: ApplicationDto = { uuid: 'fake', summary: 'summary', + hideFromPortal: false, fileNumber: mockApplicationEntity.fileNumber, applicant: mockApplicationEntity.applicant, type: mockApplicationEntity.type, diff --git a/services/apps/alcs/src/alcs/application/application.controller.ts b/services/apps/alcs/src/alcs/application/application.controller.ts index c43fc090be..cc6dff5bc0 100644 --- a/services/apps/alcs/src/alcs/application/application.controller.ts +++ b/services/apps/alcs/src/alcs/application/application.controller.ts @@ -116,6 +116,7 @@ export class ApplicationController { nfuUseType: updates.nfuUseType, inclExclApplicantType: updates.inclExclApplicantType, staffObservations: updates.staffObservations, + hideFromPortal: updates.hideFromPortal, }, ); diff --git a/services/apps/alcs/src/alcs/application/application.dto.ts b/services/apps/alcs/src/alcs/application/application.dto.ts index a1f67c6a25..15480d869d 100644 --- a/services/apps/alcs/src/alcs/application/application.dto.ts +++ b/services/apps/alcs/src/alcs/application/application.dto.ts @@ -55,6 +55,10 @@ export class UpdateApplicationDto { @IsString() applicant?: string; + @IsOptional() + @IsBoolean() + hideFromPortal?: boolean; + @IsOptional() @IsString() typeCode?: string; @@ -174,6 +178,9 @@ export class ApplicationDto { @AutoMap() applicant: string; + @AutoMap() + hideFromPortal: boolean; + activeDays: number; pausedDays: number; @@ -267,6 +274,7 @@ export class ApplicationDto { export class ApplicationUpdateServiceDto { dateSubmittedToAlc?: Date | null | undefined; applicant?: string; + hideFromPortal?: boolean; typeCode?: string; regionCode?: string; feePaidDate?: Date | null; diff --git a/services/apps/alcs/src/alcs/application/application.entity.ts b/services/apps/alcs/src/alcs/application/application.entity.ts index 4930b9e378..b80137f257 100644 --- a/services/apps/alcs/src/alcs/application/application.entity.ts +++ b/services/apps/alcs/src/alcs/application/application.entity.ts @@ -53,6 +53,13 @@ export class Application extends Base { @Column({ type: 'text', nullable: true }) summary: string | null; + @AutoMap(() => Boolean) + @Column({ + type: 'boolean', + default: false, + }) + hideFromPortal?: boolean; + @AutoMap() @Column({ type: 'timestamptz', diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.dto.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.dto.ts index 513d2af76d..cdc4904c80 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.dto.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.dto.ts @@ -58,6 +58,9 @@ export class NoticeOfIntentDto { @AutoMap() uuid: string; + @AutoMap() + hideFromPortal: boolean; + @AutoMap() fileNumber: string; @@ -138,6 +141,10 @@ export class UpdateNoticeOfIntentDto { @IsNumber() dateSubmittedToAlc?: number; + @IsOptional() + @IsBoolean() + hideFromPortal?: boolean; + @IsOptional() @IsNumber() feePaidDate?: number; diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.entity.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.entity.ts index 1ce25e0f82..c399a24e97 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.entity.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.entity.ts @@ -36,6 +36,13 @@ export class NoticeOfIntent extends Base { @Column() applicant: string; + @AutoMap(() => Boolean) + @Column({ + type: 'boolean', + default: false, + }) + hideFromPortal?: boolean; + @Column({ type: 'uuid', nullable: true }) cardUuid: string; diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.ts index 3cb2b8d98e..25ec97f494 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.ts @@ -328,6 +328,11 @@ export class NoticeOfIntentService { noticeOfIntent.proposalEndDate2, ); + noticeOfIntent.hideFromPortal = filterUndefined( + updateDto.hideFromPortal, + noticeOfIntent.hideFromPortal, + ); + await this.repository.save(noticeOfIntent); await this.updateStatus(updateDto, noticeOfIntent); diff --git a/services/apps/alcs/src/main.ts b/services/apps/alcs/src/main.ts index 5da3fc6e70..425fe16a78 100644 --- a/services/apps/alcs/src/main.ts +++ b/services/apps/alcs/src/main.ts @@ -60,6 +60,7 @@ const registerGlobalFilters = (app: NestFastifyApplication) => { const registerCors = (app: NestFastifyApplication) => { app.enableCors({ + maxAge: 3600, origin: [ config.get<string>('ALCS.BASE_URL'), config.get<string>('KEYCLOAK.AUTH_SERVER'), diff --git a/services/apps/alcs/src/portal/inbox/application/inbox-application-view.entity.ts b/services/apps/alcs/src/portal/inbox/application/inbox-application-view.entity.ts index 7f0f371001..4e0594b768 100644 --- a/services/apps/alcs/src/portal/inbox/application/inbox-application-view.entity.ts +++ b/services/apps/alcs/src/portal/inbox/application/inbox-application-view.entity.ts @@ -44,7 +44,11 @@ import { LinkedStatusType } from '../inbox.dto'; 'status', ) .from(ApplicationSubmission, 'app_sub') - .innerJoin(Application, 'app', 'app.file_number = app_sub.file_number') + .innerJoin( + Application, + 'app', + 'app.file_number = app_sub.file_number AND app.hide_from_portal = FALSE', + ) .leftJoin(User, 'user', 'user.uuid = app_sub.created_by_uuid') .leftJoin( ApplicationSubmissionReview, diff --git a/services/apps/alcs/src/portal/inbox/notice-of-intent/inbox-notice-of-intent-view.entity.ts b/services/apps/alcs/src/portal/inbox/notice-of-intent/inbox-notice-of-intent-view.entity.ts index b28628176b..8ee31c781c 100644 --- a/services/apps/alcs/src/portal/inbox/notice-of-intent/inbox-notice-of-intent-view.entity.ts +++ b/services/apps/alcs/src/portal/inbox/notice-of-intent/inbox-notice-of-intent-view.entity.ts @@ -38,7 +38,11 @@ import { LinkedStatusType } from '../inbox.dto'; 'status', ) .from(NoticeOfIntentSubmission, 'noi_sub') - .innerJoin(NoticeOfIntent, 'noi', 'noi.file_number = noi_sub.file_number') + .innerJoin( + NoticeOfIntent, + 'noi', + 'noi.file_number = noi_sub.file_number AND noi.hide_from_portal = false', + ) .leftJoin(User, 'user', 'user.uuid = noi_sub.created_by_uuid') .innerJoinAndSelect( NoticeOfIntentType, diff --git a/services/apps/alcs/src/portal/public/application/public-application.service.ts b/services/apps/alcs/src/portal/public/application/public-application.service.ts index 7a276d5406..de67bbbdee 100644 --- a/services/apps/alcs/src/portal/public/application/public-application.service.ts +++ b/services/apps/alcs/src/portal/public/application/public-application.service.ts @@ -47,7 +47,11 @@ export class PublicApplicationService { const application = await this.applicationService.get(fileNumber); //Easy way to check if its public - if (!application?.dateReceivedAllItems) { + if ( + !application || + !application.dateReceivedAllItems || + application.hideFromPortal + ) { throw new ServiceNotFoundException( `Failed to find application with File ID ${fileNumber}`, ); diff --git a/services/apps/alcs/src/portal/public/notice-of-intent/public-notice-of-intent.service.ts b/services/apps/alcs/src/portal/public/notice-of-intent/public-notice-of-intent.service.ts index c5c5e883a8..46538b48d5 100644 --- a/services/apps/alcs/src/portal/public/notice-of-intent/public-notice-of-intent.service.ts +++ b/services/apps/alcs/src/portal/public/notice-of-intent/public-notice-of-intent.service.ts @@ -32,7 +32,11 @@ export class PublicNoticeOfIntentService { await this.noticeOfIntentService.getByFileNumber(fileNumber); //Easy way to check if its public - if (!noticeOfIntent?.dateReceivedAllItems) { + if ( + !noticeOfIntent || + !noticeOfIntent.dateReceivedAllItems || + noticeOfIntent.hideFromPortal + ) { throw new ServiceNotFoundException( `Failed to find application with File ID ${fileNumber}`, ); diff --git a/services/apps/alcs/src/portal/public/search/application/public-application-search-view.entity.ts b/services/apps/alcs/src/portal/public/search/application/public-application-search-view.entity.ts index 1af7c99237..36e8231b72 100644 --- a/services/apps/alcs/src/portal/public/search/application/public-application-search-view.entity.ts +++ b/services/apps/alcs/src/portal/public/search/application/public-application-search-view.entity.ts @@ -40,7 +40,11 @@ import { LinkedStatusType } from '../public-search.dto'; 'status', ) .from(ApplicationSubmission, 'app_sub') - .innerJoin(Application, 'app', 'app.file_number = app_sub.file_number') + .innerJoin( + Application, + 'app', + 'app.file_number = app_sub.file_number AND app.hide_from_portal = FALSE', + ) .innerJoinAndSelect( ApplicationType, 'applicationType', diff --git a/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search-view.entity.ts b/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search-view.entity.ts index 4e41bba4d8..bb20e03786 100644 --- a/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search-view.entity.ts +++ b/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search-view.entity.ts @@ -40,7 +40,11 @@ import { LinkedStatusType } from '../public-search.dto'; 'status', ) .from(NoticeOfIntentSubmission, 'noi_sub') - .innerJoin(NoticeOfIntent, 'noi', 'noi.file_number = noi_sub.file_number') + .innerJoin( + NoticeOfIntent, + 'noi', + 'noi.file_number = noi_sub.file_number AND noi.hide_from_portal = FALSE', + ) .innerJoinAndSelect( NoticeOfIntentType, 'noticeOfIntentType', diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1704328408031-add_hide_flag.ts b/services/apps/alcs/src/providers/typeorm/migrations/1704328408031-add_hide_flag.ts new file mode 100644 index 0000000000..40db05259a --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1704328408031-add_hide_flag.ts @@ -0,0 +1,23 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class AddHideFlag1704328408031 implements MigrationInterface { + name = 'AddHideFlag1704328408031'; + + public async up(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `ALTER TABLE "alcs"."application" ADD "hide_from_portal" boolean NOT NULL DEFAULT false`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent" ADD "hide_from_portal" boolean NOT NULL DEFAULT false`, + ); + } + + public async down(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent" DROP COLUMN "hide_from_portal"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application" DROP COLUMN "hide_from_portal"`, + ); + } +} diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1704396938830-refresh_views_for_hide_from_public.ts b/services/apps/alcs/src/providers/typeorm/migrations/1704396938830-refresh_views_for_hide_from_public.ts new file mode 100644 index 0000000000..26cc25b9a8 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1704396938830-refresh_views_for_hide_from_public.ts @@ -0,0 +1,165 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class RefreshViewsForHideFromPublic1704396938830 + implements MigrationInterface +{ + name = 'RefreshViewsForHideFromPublic1704396938830'; + + public async up(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, + ['VIEW', 'public_application_submission_search_view', 'alcs'], + ); + await queryRunner.query( + `DROP VIEW "alcs"."public_application_submission_search_view"`, + ); + await queryRunner.query( + `DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, + ['VIEW', 'public_notice_of_intent_submission_search_view', 'alcs'], + ); + await queryRunner.query( + `DROP VIEW "alcs"."public_notice_of_intent_submission_search_view"`, + ); + await queryRunner.query( + `DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, + ['VIEW', 'inbox_application_submission_view', 'alcs'], + ); + await queryRunner.query( + `DROP VIEW "alcs"."inbox_application_submission_view"`, + ); + await queryRunner.query( + `DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, + ['VIEW', 'inbox_notice_of_intent_submission_view', 'alcs'], + ); + await queryRunner.query( + `DROP VIEW "alcs"."inbox_notice_of_intent_submission_view"`, + ); + await queryRunner.query( + `CREATE VIEW "alcs"."inbox_notice_of_intent_submission_view" AS SELECT "noi_sub"."uuid" AS "uuid", "noi_sub"."applicant" AS "applicant", "noi"."uuid" AS "notice_of_intent_uuid", "noticeOfIntentType"."audit_deleted_date_at" AS "noticeOfIntentType_audit_deleted_date_at", "noticeOfIntentType"."audit_created_at" AS "noticeOfIntentType_audit_created_at", "noticeOfIntentType"."audit_updated_at" AS "noticeOfIntentType_audit_updated_at", "noticeOfIntentType"."audit_created_by" AS "noticeOfIntentType_audit_created_by", "noticeOfIntentType"."audit_updated_by" AS "noticeOfIntentType_audit_updated_by", "noticeOfIntentType"."label" AS "noticeOfIntentType_label", "noticeOfIntentType"."code" AS "noticeOfIntentType_code", "noticeOfIntentType"."description" AS "noticeOfIntentType_description", "noticeOfIntentType"."short_label" AS "noticeOfIntentType_short_label", "noticeOfIntentType"."background_color" AS "noticeOfIntentType_background_color", "noticeOfIntentType"."text_color" AS "noticeOfIntentType_text_color", "noticeOfIntentType"."html_description" AS "noticeOfIntentType_html_description", "noticeOfIntentType"."portal_label" AS "noticeOfIntentType_portal_label", "noticeOfIntentType"."alc_fee_amount" AS "noticeOfIntentType_alc_fee_amount", "noticeOfIntentType"."government_fee_amount" AS "noticeOfIntentType_government_fee_amount", "noi_sub"."file_number" AS "file_number", "noi_sub"."audit_created_at" AS "created_at", "noi_sub"."created_by_uuid" AS "created_by_uuid", "noi_sub"."local_government_uuid" AS "local_government_uuid", "user"."bceid_business_guid" AS "bceid_business_guid", "noi_sub"."type_code" AS "notice_of_intent_type_code", "noi"."date_submitted_to_alc" AS "date_submitted_to_alc", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid") AS "status" FROM "alcs"."notice_of_intent_submission" "noi_sub" INNER JOIN "alcs"."notice_of_intent" "noi" ON "noi"."file_number" = "noi_sub"."file_number" AND "noi"."hide_from_portal" = false AND "noi"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."user" "user" ON "user"."uuid" = "noi_sub"."created_by_uuid" AND "user"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."notice_of_intent_type" "noticeOfIntentType" ON "noi_sub"."type_code" = "noticeOfIntentType"."code" AND "noticeOfIntentType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "noi_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."notice_of_intent_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "noi_sub"."uuid" LEFT JOIN (SELECT MAX("date") AS "date", notice_of_intent_uuid AS "notice_of_intent_uuid" FROM "alcs"."notice_of_intent_decision" "decision_date" WHERE "decision_date"."audit_deleted_date_at" IS NULL GROUP BY notice_of_intent_uuid) "decision_date" ON decision_date."notice_of_intent_uuid" = "noi"."uuid" WHERE ( "noi_sub"."is_draft" = FALSE ) AND ( "noi_sub"."audit_deleted_date_at" IS NULL )`, + ); + await queryRunner.query( + `INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, + [ + 'alcs', + 'VIEW', + 'inbox_notice_of_intent_submission_view', + 'SELECT "noi_sub"."uuid" AS "uuid", "noi_sub"."applicant" AS "applicant", "noi"."uuid" AS "notice_of_intent_uuid", "noticeOfIntentType"."audit_deleted_date_at" AS "noticeOfIntentType_audit_deleted_date_at", "noticeOfIntentType"."audit_created_at" AS "noticeOfIntentType_audit_created_at", "noticeOfIntentType"."audit_updated_at" AS "noticeOfIntentType_audit_updated_at", "noticeOfIntentType"."audit_created_by" AS "noticeOfIntentType_audit_created_by", "noticeOfIntentType"."audit_updated_by" AS "noticeOfIntentType_audit_updated_by", "noticeOfIntentType"."label" AS "noticeOfIntentType_label", "noticeOfIntentType"."code" AS "noticeOfIntentType_code", "noticeOfIntentType"."description" AS "noticeOfIntentType_description", "noticeOfIntentType"."short_label" AS "noticeOfIntentType_short_label", "noticeOfIntentType"."background_color" AS "noticeOfIntentType_background_color", "noticeOfIntentType"."text_color" AS "noticeOfIntentType_text_color", "noticeOfIntentType"."html_description" AS "noticeOfIntentType_html_description", "noticeOfIntentType"."portal_label" AS "noticeOfIntentType_portal_label", "noticeOfIntentType"."alc_fee_amount" AS "noticeOfIntentType_alc_fee_amount", "noticeOfIntentType"."government_fee_amount" AS "noticeOfIntentType_government_fee_amount", "noi_sub"."file_number" AS "file_number", "noi_sub"."audit_created_at" AS "created_at", "noi_sub"."created_by_uuid" AS "created_by_uuid", "noi_sub"."local_government_uuid" AS "local_government_uuid", "user"."bceid_business_guid" AS "bceid_business_guid", "noi_sub"."type_code" AS "notice_of_intent_type_code", "noi"."date_submitted_to_alc" AS "date_submitted_to_alc", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid") AS "status" FROM "alcs"."notice_of_intent_submission" "noi_sub" INNER JOIN "alcs"."notice_of_intent" "noi" ON "noi"."file_number" = "noi_sub"."file_number" AND "noi"."hide_from_portal" = false AND "noi"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."user" "user" ON "user"."uuid" = "noi_sub"."created_by_uuid" AND "user"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."notice_of_intent_type" "noticeOfIntentType" ON "noi_sub"."type_code" = "noticeOfIntentType"."code" AND "noticeOfIntentType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "noi_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."notice_of_intent_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "noi_sub"."uuid" LEFT JOIN (SELECT MAX("date") AS "date", notice_of_intent_uuid AS "notice_of_intent_uuid" FROM "alcs"."notice_of_intent_decision" "decision_date" WHERE "decision_date"."audit_deleted_date_at" IS NULL GROUP BY notice_of_intent_uuid) "decision_date" ON decision_date."notice_of_intent_uuid" = "noi"."uuid" WHERE ( "noi_sub"."is_draft" = FALSE ) AND ( "noi_sub"."audit_deleted_date_at" IS NULL )', + ], + ); + await queryRunner.query( + `CREATE VIEW "alcs"."inbox_application_submission_view" AS SELECT "app_sub"."uuid" AS "uuid", "app_sub"."applicant" AS "applicant", "app"."uuid" AS "application_uuid", "applicationType"."audit_deleted_date_at" AS "applicationType_audit_deleted_date_at", "applicationType"."audit_created_at" AS "applicationType_audit_created_at", "applicationType"."audit_updated_at" AS "applicationType_audit_updated_at", "applicationType"."audit_created_by" AS "applicationType_audit_created_by", "applicationType"."audit_updated_by" AS "applicationType_audit_updated_by", "applicationType"."label" AS "applicationType_label", "applicationType"."code" AS "applicationType_code", "applicationType"."description" AS "applicationType_description", "applicationType"."short_label" AS "applicationType_short_label", "applicationType"."background_color" AS "applicationType_background_color", "applicationType"."text_color" AS "applicationType_text_color", "applicationType"."html_description" AS "applicationType_html_description", "applicationType"."portal_label" AS "applicationType_portal_label", "applicationType"."portal_order" AS "applicationType_portal_order", "applicationType"."requires_government_review" AS "applicationType_requires_government_review", "applicationType"."alc_fee_amount" AS "applicationType_alc_fee_amount", "applicationType"."government_fee_amount" AS "applicationType_government_fee_amount", "localGovernment"."name" AS "local_government_name", "app_sub"."file_number" AS "file_number", "app_sub"."created_by_uuid" AS "created_by_uuid", "app_sub"."local_government_uuid" AS "local_government_uuid", "app_sub"."audit_created_at" AS "created_at", "user"."bceid_business_guid" AS "bceid_business_guid", "app_sub"."type_code" AS "application_type_code", "app"."date_submitted_to_alc" AS "date_submitted_to_alc", "app_rev"."local_government_file_number" AS "local_government_file_number", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid") AS "status" FROM "alcs"."application_submission" "app_sub" INNER JOIN "alcs"."application" "app" ON "app"."file_number" = "app_sub"."file_number" AND "app"."hide_from_portal" = FALSE AND "app"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."user" "user" ON "user"."uuid" = "app_sub"."created_by_uuid" AND "user"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."application_submission_review" "app_rev" ON "app"."file_number" = "app_rev"."application_file_number" AND "app_rev"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."application_type" "applicationType" ON "app_sub"."type_code" = "applicationType"."code" AND "applicationType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "app_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."application_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "app_sub"."uuid" LEFT JOIN (SELECT MAX("date") AS "date", application_uuid AS "application_uuid" FROM "alcs"."application_decision" "decision_date" WHERE "decision_date"."audit_deleted_date_at" IS NULL GROUP BY application_uuid) "decision_date" ON decision_date."application_uuid" = "app"."uuid" WHERE ( "app_sub"."is_draft" = FALSE ) AND ( "app_sub"."audit_deleted_date_at" IS NULL )`, + ); + await queryRunner.query( + `INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, + [ + 'alcs', + 'VIEW', + 'inbox_application_submission_view', + 'SELECT "app_sub"."uuid" AS "uuid", "app_sub"."applicant" AS "applicant", "app"."uuid" AS "application_uuid", "applicationType"."audit_deleted_date_at" AS "applicationType_audit_deleted_date_at", "applicationType"."audit_created_at" AS "applicationType_audit_created_at", "applicationType"."audit_updated_at" AS "applicationType_audit_updated_at", "applicationType"."audit_created_by" AS "applicationType_audit_created_by", "applicationType"."audit_updated_by" AS "applicationType_audit_updated_by", "applicationType"."label" AS "applicationType_label", "applicationType"."code" AS "applicationType_code", "applicationType"."description" AS "applicationType_description", "applicationType"."short_label" AS "applicationType_short_label", "applicationType"."background_color" AS "applicationType_background_color", "applicationType"."text_color" AS "applicationType_text_color", "applicationType"."html_description" AS "applicationType_html_description", "applicationType"."portal_label" AS "applicationType_portal_label", "applicationType"."portal_order" AS "applicationType_portal_order", "applicationType"."requires_government_review" AS "applicationType_requires_government_review", "applicationType"."alc_fee_amount" AS "applicationType_alc_fee_amount", "applicationType"."government_fee_amount" AS "applicationType_government_fee_amount", "localGovernment"."name" AS "local_government_name", "app_sub"."file_number" AS "file_number", "app_sub"."created_by_uuid" AS "created_by_uuid", "app_sub"."local_government_uuid" AS "local_government_uuid", "app_sub"."audit_created_at" AS "created_at", "user"."bceid_business_guid" AS "bceid_business_guid", "app_sub"."type_code" AS "application_type_code", "app"."date_submitted_to_alc" AS "date_submitted_to_alc", "app_rev"."local_government_file_number" AS "local_government_file_number", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid") AS "status" FROM "alcs"."application_submission" "app_sub" INNER JOIN "alcs"."application" "app" ON "app"."file_number" = "app_sub"."file_number" AND "app"."hide_from_portal" = FALSE AND "app"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."user" "user" ON "user"."uuid" = "app_sub"."created_by_uuid" AND "user"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."application_submission_review" "app_rev" ON "app"."file_number" = "app_rev"."application_file_number" AND "app_rev"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."application_type" "applicationType" ON "app_sub"."type_code" = "applicationType"."code" AND "applicationType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "app_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."application_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "app_sub"."uuid" LEFT JOIN (SELECT MAX("date") AS "date", application_uuid AS "application_uuid" FROM "alcs"."application_decision" "decision_date" WHERE "decision_date"."audit_deleted_date_at" IS NULL GROUP BY application_uuid) "decision_date" ON decision_date."application_uuid" = "app"."uuid" WHERE ( "app_sub"."is_draft" = FALSE ) AND ( "app_sub"."audit_deleted_date_at" IS NULL )', + ], + ); + await queryRunner.query( + `CREATE VIEW "alcs"."public_application_submission_search_view" AS SELECT "app_sub"."uuid" AS "uuid", "app_sub"."applicant" AS "applicant", "app"."uuid" AS "application_uuid", "applicationType"."audit_deleted_date_at" AS "applicationType_audit_deleted_date_at", "applicationType"."audit_created_at" AS "applicationType_audit_created_at", "applicationType"."audit_updated_at" AS "applicationType_audit_updated_at", "applicationType"."audit_created_by" AS "applicationType_audit_created_by", "applicationType"."audit_updated_by" AS "applicationType_audit_updated_by", "applicationType"."label" AS "applicationType_label", "applicationType"."code" AS "applicationType_code", "applicationType"."description" AS "applicationType_description", "applicationType"."short_label" AS "applicationType_short_label", "applicationType"."background_color" AS "applicationType_background_color", "applicationType"."text_color" AS "applicationType_text_color", "applicationType"."html_description" AS "applicationType_html_description", "applicationType"."portal_label" AS "applicationType_portal_label", "applicationType"."portal_order" AS "applicationType_portal_order", "applicationType"."requires_government_review" AS "applicationType_requires_government_review", "applicationType"."alc_fee_amount" AS "applicationType_alc_fee_amount", "applicationType"."government_fee_amount" AS "applicationType_government_fee_amount", "localGovernment"."name" AS "local_government_name", "app_sub"."file_number" AS "file_number", "app_sub"."local_government_uuid" AS "local_government_uuid", "app_sub"."type_code" AS "application_type_code", "app"."date_submitted_to_alc" AS "date_submitted_to_alc", "app"."decision_date" AS "decision_date", decision_date.outcome AS "outcome", decision_date.dest_rank AS "dest_rank", "app"."region_code" AS "application_region_code", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid") AS "status" FROM "alcs"."application_submission" "app_sub" INNER JOIN "alcs"."application" "app" ON "app"."file_number" = "app_sub"."file_number" AND "app"."hide_from_portal" = FALSE AND "app"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."application_type" "applicationType" ON "app_sub"."type_code" = "applicationType"."code" AND "applicationType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "app_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."application_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "app_sub"."uuid" LEFT JOIN (SELECT DISTINCT ON (application_uuid) decisiondate AS "date", outcome AS "outcome", dest_rank AS "dest_rank", applicationuuid AS "application_uuid" FROM "alcs"."application_decision" "decision_date", (SELECT outcome_code AS "outcome", date AS "decisiondate", application_uuid AS "applicationuuid", RANK() OVER (PARTITION BY application_uuid ORDER BY date DESC, audit_created_at DESC) AS "dest_rank" FROM "alcs"."application_decision" "decision" WHERE ( is_draft = FALSE ) AND ( "decision"."audit_deleted_date_at" IS NULL )) "decisions" WHERE dest_rank = 1) "decision_date" ON decision_date."application_uuid" = "app"."uuid" WHERE ( "app_sub"."is_draft" = FALSE AND ("app"."date_received_all_items" IS NOT NULL AND "app"."date_received_all_items" <= NOW()) AND alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid")->>'status_type_code' != 'CANC' ) AND ( "app_sub"."audit_deleted_date_at" IS NULL )`, + ); + await queryRunner.query( + `INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, + [ + 'alcs', + 'VIEW', + 'public_application_submission_search_view', + 'SELECT "app_sub"."uuid" AS "uuid", "app_sub"."applicant" AS "applicant", "app"."uuid" AS "application_uuid", "applicationType"."audit_deleted_date_at" AS "applicationType_audit_deleted_date_at", "applicationType"."audit_created_at" AS "applicationType_audit_created_at", "applicationType"."audit_updated_at" AS "applicationType_audit_updated_at", "applicationType"."audit_created_by" AS "applicationType_audit_created_by", "applicationType"."audit_updated_by" AS "applicationType_audit_updated_by", "applicationType"."label" AS "applicationType_label", "applicationType"."code" AS "applicationType_code", "applicationType"."description" AS "applicationType_description", "applicationType"."short_label" AS "applicationType_short_label", "applicationType"."background_color" AS "applicationType_background_color", "applicationType"."text_color" AS "applicationType_text_color", "applicationType"."html_description" AS "applicationType_html_description", "applicationType"."portal_label" AS "applicationType_portal_label", "applicationType"."portal_order" AS "applicationType_portal_order", "applicationType"."requires_government_review" AS "applicationType_requires_government_review", "applicationType"."alc_fee_amount" AS "applicationType_alc_fee_amount", "applicationType"."government_fee_amount" AS "applicationType_government_fee_amount", "localGovernment"."name" AS "local_government_name", "app_sub"."file_number" AS "file_number", "app_sub"."local_government_uuid" AS "local_government_uuid", "app_sub"."type_code" AS "application_type_code", "app"."date_submitted_to_alc" AS "date_submitted_to_alc", "app"."decision_date" AS "decision_date", decision_date.outcome AS "outcome", decision_date.dest_rank AS "dest_rank", "app"."region_code" AS "application_region_code", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid") AS "status" FROM "alcs"."application_submission" "app_sub" INNER JOIN "alcs"."application" "app" ON "app"."file_number" = "app_sub"."file_number" AND "app"."hide_from_portal" = FALSE AND "app"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."application_type" "applicationType" ON "app_sub"."type_code" = "applicationType"."code" AND "applicationType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "app_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."application_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "app_sub"."uuid" LEFT JOIN (SELECT DISTINCT ON (application_uuid) decisiondate AS "date", outcome AS "outcome", dest_rank AS "dest_rank", applicationuuid AS "application_uuid" FROM "alcs"."application_decision" "decision_date", (SELECT outcome_code AS "outcome", date AS "decisiondate", application_uuid AS "applicationuuid", RANK() OVER (PARTITION BY application_uuid ORDER BY date DESC, audit_created_at DESC) AS "dest_rank" FROM "alcs"."application_decision" "decision" WHERE ( is_draft = FALSE ) AND ( "decision"."audit_deleted_date_at" IS NULL )) "decisions" WHERE dest_rank = 1) "decision_date" ON decision_date."application_uuid" = "app"."uuid" WHERE ( "app_sub"."is_draft" = FALSE AND ("app"."date_received_all_items" IS NOT NULL AND "app"."date_received_all_items" <= NOW()) AND alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid")->>\'status_type_code\' != \'CANC\' ) AND ( "app_sub"."audit_deleted_date_at" IS NULL )', + ], + ); + await queryRunner.query( + `CREATE VIEW "alcs"."public_notice_of_intent_submission_search_view" AS SELECT "noi_sub"."uuid" AS "uuid", "noi_sub"."applicant" AS "applicant", "noi"."uuid" AS "notice_of_intent_uuid", "noticeOfIntentType"."audit_deleted_date_at" AS "noticeOfIntentType_audit_deleted_date_at", "noticeOfIntentType"."audit_created_at" AS "noticeOfIntentType_audit_created_at", "noticeOfIntentType"."audit_updated_at" AS "noticeOfIntentType_audit_updated_at", "noticeOfIntentType"."audit_created_by" AS "noticeOfIntentType_audit_created_by", "noticeOfIntentType"."audit_updated_by" AS "noticeOfIntentType_audit_updated_by", "noticeOfIntentType"."label" AS "noticeOfIntentType_label", "noticeOfIntentType"."code" AS "noticeOfIntentType_code", "noticeOfIntentType"."description" AS "noticeOfIntentType_description", "noticeOfIntentType"."short_label" AS "noticeOfIntentType_short_label", "noticeOfIntentType"."background_color" AS "noticeOfIntentType_background_color", "noticeOfIntentType"."text_color" AS "noticeOfIntentType_text_color", "noticeOfIntentType"."html_description" AS "noticeOfIntentType_html_description", "noticeOfIntentType"."portal_label" AS "noticeOfIntentType_portal_label", "noticeOfIntentType"."alc_fee_amount" AS "noticeOfIntentType_alc_fee_amount", "noticeOfIntentType"."government_fee_amount" AS "noticeOfIntentType_government_fee_amount", "localGovernment"."name" AS "local_government_name", "noi_sub"."file_number" AS "file_number", "noi_sub"."local_government_uuid" AS "local_government_uuid", "noi_sub"."type_code" AS "notice_of_intent_type_code", "noi"."date_submitted_to_alc" AS "date_submitted_to_alc", "noi"."decision_date" AS "decision_date", decision_date.outcome AS "outcome", decision_date.dest_rank AS "dest_rank", "noi"."region_code" AS "notice_of_intent_region_code", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid") AS "status" FROM "alcs"."notice_of_intent_submission" "noi_sub" INNER JOIN "alcs"."notice_of_intent" "noi" ON "noi"."file_number" = "noi_sub"."file_number" AND "noi"."hide_from_portal" = FALSE AND "noi"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."notice_of_intent_type" "noticeOfIntentType" ON "noi_sub"."type_code" = "noticeOfIntentType"."code" AND "noticeOfIntentType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "noi_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."notice_of_intent_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "noi_sub"."uuid" LEFT JOIN (SELECT DISTINCT ON (notice_of_intentuuid) decisiondate AS "date", outcome AS "outcome", dest_rank AS "dest_rank", notice_of_intentuuid AS "notice_of_intent_uuid" FROM "alcs"."notice_of_intent_decision" "decision_date", (SELECT outcome_code AS "outcome", date AS "decisiondate", notice_of_intent_uuid AS "notice_of_intentuuid", RANK() OVER (PARTITION BY notice_of_intent_uuid ORDER BY date DESC, audit_created_at DESC) AS "dest_rank" FROM "alcs"."notice_of_intent_decision" "decision" WHERE "decision"."audit_deleted_date_at" IS NULL) "decisions" WHERE dest_rank = 1) "decision_date" ON decision_date."notice_of_intent_uuid" = "noi"."uuid" WHERE ( "noi_sub"."is_draft" = FALSE AND ("noi"."date_received_all_items" IS NOT NULL AND "noi"."date_received_all_items" <= NOW()) AND alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid")->>'status_type_code' != 'CANC' ) AND ( "noi_sub"."audit_deleted_date_at" IS NULL )`, + ); + await queryRunner.query( + `INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, + [ + 'alcs', + 'VIEW', + 'public_notice_of_intent_submission_search_view', + 'SELECT "noi_sub"."uuid" AS "uuid", "noi_sub"."applicant" AS "applicant", "noi"."uuid" AS "notice_of_intent_uuid", "noticeOfIntentType"."audit_deleted_date_at" AS "noticeOfIntentType_audit_deleted_date_at", "noticeOfIntentType"."audit_created_at" AS "noticeOfIntentType_audit_created_at", "noticeOfIntentType"."audit_updated_at" AS "noticeOfIntentType_audit_updated_at", "noticeOfIntentType"."audit_created_by" AS "noticeOfIntentType_audit_created_by", "noticeOfIntentType"."audit_updated_by" AS "noticeOfIntentType_audit_updated_by", "noticeOfIntentType"."label" AS "noticeOfIntentType_label", "noticeOfIntentType"."code" AS "noticeOfIntentType_code", "noticeOfIntentType"."description" AS "noticeOfIntentType_description", "noticeOfIntentType"."short_label" AS "noticeOfIntentType_short_label", "noticeOfIntentType"."background_color" AS "noticeOfIntentType_background_color", "noticeOfIntentType"."text_color" AS "noticeOfIntentType_text_color", "noticeOfIntentType"."html_description" AS "noticeOfIntentType_html_description", "noticeOfIntentType"."portal_label" AS "noticeOfIntentType_portal_label", "noticeOfIntentType"."alc_fee_amount" AS "noticeOfIntentType_alc_fee_amount", "noticeOfIntentType"."government_fee_amount" AS "noticeOfIntentType_government_fee_amount", "localGovernment"."name" AS "local_government_name", "noi_sub"."file_number" AS "file_number", "noi_sub"."local_government_uuid" AS "local_government_uuid", "noi_sub"."type_code" AS "notice_of_intent_type_code", "noi"."date_submitted_to_alc" AS "date_submitted_to_alc", "noi"."decision_date" AS "decision_date", decision_date.outcome AS "outcome", decision_date.dest_rank AS "dest_rank", "noi"."region_code" AS "notice_of_intent_region_code", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid") AS "status" FROM "alcs"."notice_of_intent_submission" "noi_sub" INNER JOIN "alcs"."notice_of_intent" "noi" ON "noi"."file_number" = "noi_sub"."file_number" AND "noi"."hide_from_portal" = FALSE AND "noi"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."notice_of_intent_type" "noticeOfIntentType" ON "noi_sub"."type_code" = "noticeOfIntentType"."code" AND "noticeOfIntentType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "noi_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."notice_of_intent_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "noi_sub"."uuid" LEFT JOIN (SELECT DISTINCT ON (notice_of_intentuuid) decisiondate AS "date", outcome AS "outcome", dest_rank AS "dest_rank", notice_of_intentuuid AS "notice_of_intent_uuid" FROM "alcs"."notice_of_intent_decision" "decision_date", (SELECT outcome_code AS "outcome", date AS "decisiondate", notice_of_intent_uuid AS "notice_of_intentuuid", RANK() OVER (PARTITION BY notice_of_intent_uuid ORDER BY date DESC, audit_created_at DESC) AS "dest_rank" FROM "alcs"."notice_of_intent_decision" "decision" WHERE "decision"."audit_deleted_date_at" IS NULL) "decisions" WHERE dest_rank = 1) "decision_date" ON decision_date."notice_of_intent_uuid" = "noi"."uuid" WHERE ( "noi_sub"."is_draft" = FALSE AND ("noi"."date_received_all_items" IS NOT NULL AND "noi"."date_received_all_items" <= NOW()) AND alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid")->>\'status_type_code\' != \'CANC\' ) AND ( "noi_sub"."audit_deleted_date_at" IS NULL )', + ], + ); + } + + public async down(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, + ['VIEW', 'public_notice_of_intent_submission_search_view', 'alcs'], + ); + await queryRunner.query( + `DROP VIEW "alcs"."public_notice_of_intent_submission_search_view"`, + ); + await queryRunner.query( + `DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, + ['VIEW', 'public_application_submission_search_view', 'alcs'], + ); + await queryRunner.query( + `DROP VIEW "alcs"."public_application_submission_search_view"`, + ); + await queryRunner.query( + `DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, + ['VIEW', 'inbox_application_submission_view', 'alcs'], + ); + await queryRunner.query( + `DROP VIEW "alcs"."inbox_application_submission_view"`, + ); + await queryRunner.query( + `DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, + ['VIEW', 'inbox_notice_of_intent_submission_view', 'alcs'], + ); + await queryRunner.query( + `DROP VIEW "alcs"."inbox_notice_of_intent_submission_view"`, + ); + await queryRunner.query( + `CREATE VIEW "alcs"."inbox_notice_of_intent_submission_view" AS SELECT "noi_sub"."uuid" AS "uuid", "noi_sub"."applicant" AS "applicant", "noi"."uuid" AS "notice_of_intent_uuid", "noticeOfIntentType"."audit_deleted_date_at" AS "noticeOfIntentType_audit_deleted_date_at", "noticeOfIntentType"."audit_created_at" AS "noticeOfIntentType_audit_created_at", "noticeOfIntentType"."audit_updated_at" AS "noticeOfIntentType_audit_updated_at", "noticeOfIntentType"."audit_created_by" AS "noticeOfIntentType_audit_created_by", "noticeOfIntentType"."audit_updated_by" AS "noticeOfIntentType_audit_updated_by", "noticeOfIntentType"."label" AS "noticeOfIntentType_label", "noticeOfIntentType"."code" AS "noticeOfIntentType_code", "noticeOfIntentType"."description" AS "noticeOfIntentType_description", "noticeOfIntentType"."short_label" AS "noticeOfIntentType_short_label", "noticeOfIntentType"."background_color" AS "noticeOfIntentType_background_color", "noticeOfIntentType"."text_color" AS "noticeOfIntentType_text_color", "noticeOfIntentType"."html_description" AS "noticeOfIntentType_html_description", "noticeOfIntentType"."portal_label" AS "noticeOfIntentType_portal_label", "noi_sub"."file_number" AS "file_number", "noi_sub"."audit_created_at" AS "created_at", "noi_sub"."created_by_uuid" AS "created_by_uuid", "noi_sub"."local_government_uuid" AS "local_government_uuid", "user"."bceid_business_guid" AS "bceid_business_guid", "noi_sub"."type_code" AS "notice_of_intent_type_code", "noi"."date_submitted_to_alc" AS "date_submitted_to_alc", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid") AS "status" FROM "alcs"."notice_of_intent_submission" "noi_sub" INNER JOIN "alcs"."notice_of_intent" "noi" ON "noi"."file_number" = "noi_sub"."file_number" AND "noi"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."user" "user" ON "user"."uuid" = "noi_sub"."created_by_uuid" AND "user"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."notice_of_intent_type" "noticeOfIntentType" ON "noi_sub"."type_code" = "noticeOfIntentType"."code" AND "noticeOfIntentType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "noi_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."notice_of_intent_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "noi_sub"."uuid" LEFT JOIN (SELECT MAX("date") AS "date", notice_of_intent_uuid AS "notice_of_intent_uuid" FROM "alcs"."notice_of_intent_decision" "decision_date" WHERE "decision_date"."audit_deleted_date_at" IS NULL GROUP BY notice_of_intent_uuid) "decision_date" ON decision_date."notice_of_intent_uuid" = "noi"."uuid" WHERE ( "noi_sub"."is_draft" = FALSE ) AND ( "noi_sub"."audit_deleted_date_at" IS NULL )`, + ); + await queryRunner.query( + `INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, + [ + 'alcs', + 'VIEW', + 'inbox_notice_of_intent_submission_view', + 'SELECT "noi_sub"."uuid" AS "uuid", "noi_sub"."applicant" AS "applicant", "noi"."uuid" AS "notice_of_intent_uuid", "noticeOfIntentType"."audit_deleted_date_at" AS "noticeOfIntentType_audit_deleted_date_at", "noticeOfIntentType"."audit_created_at" AS "noticeOfIntentType_audit_created_at", "noticeOfIntentType"."audit_updated_at" AS "noticeOfIntentType_audit_updated_at", "noticeOfIntentType"."audit_created_by" AS "noticeOfIntentType_audit_created_by", "noticeOfIntentType"."audit_updated_by" AS "noticeOfIntentType_audit_updated_by", "noticeOfIntentType"."label" AS "noticeOfIntentType_label", "noticeOfIntentType"."code" AS "noticeOfIntentType_code", "noticeOfIntentType"."description" AS "noticeOfIntentType_description", "noticeOfIntentType"."short_label" AS "noticeOfIntentType_short_label", "noticeOfIntentType"."background_color" AS "noticeOfIntentType_background_color", "noticeOfIntentType"."text_color" AS "noticeOfIntentType_text_color", "noticeOfIntentType"."html_description" AS "noticeOfIntentType_html_description", "noticeOfIntentType"."portal_label" AS "noticeOfIntentType_portal_label", "noi_sub"."file_number" AS "file_number", "noi_sub"."audit_created_at" AS "created_at", "noi_sub"."created_by_uuid" AS "created_by_uuid", "noi_sub"."local_government_uuid" AS "local_government_uuid", "user"."bceid_business_guid" AS "bceid_business_guid", "noi_sub"."type_code" AS "notice_of_intent_type_code", "noi"."date_submitted_to_alc" AS "date_submitted_to_alc", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid") AS "status" FROM "alcs"."notice_of_intent_submission" "noi_sub" INNER JOIN "alcs"."notice_of_intent" "noi" ON "noi"."file_number" = "noi_sub"."file_number" AND "noi"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."user" "user" ON "user"."uuid" = "noi_sub"."created_by_uuid" AND "user"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."notice_of_intent_type" "noticeOfIntentType" ON "noi_sub"."type_code" = "noticeOfIntentType"."code" AND "noticeOfIntentType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "noi_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."notice_of_intent_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "noi_sub"."uuid" LEFT JOIN (SELECT MAX("date") AS "date", notice_of_intent_uuid AS "notice_of_intent_uuid" FROM "alcs"."notice_of_intent_decision" "decision_date" WHERE "decision_date"."audit_deleted_date_at" IS NULL GROUP BY notice_of_intent_uuid) "decision_date" ON decision_date."notice_of_intent_uuid" = "noi"."uuid" WHERE ( "noi_sub"."is_draft" = FALSE ) AND ( "noi_sub"."audit_deleted_date_at" IS NULL )', + ], + ); + await queryRunner.query( + `CREATE VIEW "alcs"."inbox_application_submission_view" AS SELECT "app_sub"."uuid" AS "uuid", "app_sub"."applicant" AS "applicant", "app"."uuid" AS "application_uuid", "applicationType"."audit_deleted_date_at" AS "applicationType_audit_deleted_date_at", "applicationType"."audit_created_at" AS "applicationType_audit_created_at", "applicationType"."audit_updated_at" AS "applicationType_audit_updated_at", "applicationType"."audit_created_by" AS "applicationType_audit_created_by", "applicationType"."audit_updated_by" AS "applicationType_audit_updated_by", "applicationType"."label" AS "applicationType_label", "applicationType"."code" AS "applicationType_code", "applicationType"."description" AS "applicationType_description", "applicationType"."short_label" AS "applicationType_short_label", "applicationType"."background_color" AS "applicationType_background_color", "applicationType"."text_color" AS "applicationType_text_color", "applicationType"."html_description" AS "applicationType_html_description", "applicationType"."portal_label" AS "applicationType_portal_label", "applicationType"."portal_order" AS "applicationType_portal_order", "applicationType"."requires_government_review" AS "applicationType_requires_government_review", "localGovernment"."name" AS "local_government_name", "app_sub"."file_number" AS "file_number", "app_sub"."created_by_uuid" AS "created_by_uuid", "app_sub"."local_government_uuid" AS "local_government_uuid", "app_sub"."audit_created_at" AS "created_at", "user"."bceid_business_guid" AS "bceid_business_guid", "app_sub"."type_code" AS "application_type_code", "app"."date_submitted_to_alc" AS "date_submitted_to_alc", "app_rev"."local_government_file_number" AS "local_government_file_number", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid") AS "status" FROM "alcs"."application_submission" "app_sub" INNER JOIN "alcs"."application" "app" ON "app"."file_number" = "app_sub"."file_number" AND "app"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."user" "user" ON "user"."uuid" = "app_sub"."created_by_uuid" AND "user"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."application_submission_review" "app_rev" ON "app"."file_number" = "app_rev"."application_file_number" AND "app_rev"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."application_type" "applicationType" ON "app_sub"."type_code" = "applicationType"."code" AND "applicationType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "app_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."application_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "app_sub"."uuid" LEFT JOIN (SELECT MAX("date") AS "date", application_uuid AS "application_uuid" FROM "alcs"."application_decision" "decision_date" WHERE "decision_date"."audit_deleted_date_at" IS NULL GROUP BY application_uuid) "decision_date" ON decision_date."application_uuid" = "app"."uuid" WHERE ( "app_sub"."is_draft" = FALSE ) AND ( "app_sub"."audit_deleted_date_at" IS NULL )`, + ); + await queryRunner.query( + `INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, + [ + 'alcs', + 'VIEW', + 'inbox_application_submission_view', + 'SELECT "app_sub"."uuid" AS "uuid", "app_sub"."applicant" AS "applicant", "app"."uuid" AS "application_uuid", "applicationType"."audit_deleted_date_at" AS "applicationType_audit_deleted_date_at", "applicationType"."audit_created_at" AS "applicationType_audit_created_at", "applicationType"."audit_updated_at" AS "applicationType_audit_updated_at", "applicationType"."audit_created_by" AS "applicationType_audit_created_by", "applicationType"."audit_updated_by" AS "applicationType_audit_updated_by", "applicationType"."label" AS "applicationType_label", "applicationType"."code" AS "applicationType_code", "applicationType"."description" AS "applicationType_description", "applicationType"."short_label" AS "applicationType_short_label", "applicationType"."background_color" AS "applicationType_background_color", "applicationType"."text_color" AS "applicationType_text_color", "applicationType"."html_description" AS "applicationType_html_description", "applicationType"."portal_label" AS "applicationType_portal_label", "applicationType"."portal_order" AS "applicationType_portal_order", "applicationType"."requires_government_review" AS "applicationType_requires_government_review", "localGovernment"."name" AS "local_government_name", "app_sub"."file_number" AS "file_number", "app_sub"."created_by_uuid" AS "created_by_uuid", "app_sub"."local_government_uuid" AS "local_government_uuid", "app_sub"."audit_created_at" AS "created_at", "user"."bceid_business_guid" AS "bceid_business_guid", "app_sub"."type_code" AS "application_type_code", "app"."date_submitted_to_alc" AS "date_submitted_to_alc", "app_rev"."local_government_file_number" AS "local_government_file_number", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid") AS "status" FROM "alcs"."application_submission" "app_sub" INNER JOIN "alcs"."application" "app" ON "app"."file_number" = "app_sub"."file_number" AND "app"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."user" "user" ON "user"."uuid" = "app_sub"."created_by_uuid" AND "user"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."application_submission_review" "app_rev" ON "app"."file_number" = "app_rev"."application_file_number" AND "app_rev"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."application_type" "applicationType" ON "app_sub"."type_code" = "applicationType"."code" AND "applicationType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "app_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."application_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "app_sub"."uuid" LEFT JOIN (SELECT MAX("date") AS "date", application_uuid AS "application_uuid" FROM "alcs"."application_decision" "decision_date" WHERE "decision_date"."audit_deleted_date_at" IS NULL GROUP BY application_uuid) "decision_date" ON decision_date."application_uuid" = "app"."uuid" WHERE ( "app_sub"."is_draft" = FALSE ) AND ( "app_sub"."audit_deleted_date_at" IS NULL )', + ], + ); + await queryRunner.query( + `CREATE VIEW "alcs"."public_notice_of_intent_submission_search_view" AS SELECT "noi_sub"."uuid" AS "uuid", "noi_sub"."applicant" AS "applicant", "noi"."uuid" AS "notice_of_intent_uuid", "noticeOfIntentType"."audit_deleted_date_at" AS "noticeOfIntentType_audit_deleted_date_at", "noticeOfIntentType"."audit_created_at" AS "noticeOfIntentType_audit_created_at", "noticeOfIntentType"."audit_updated_at" AS "noticeOfIntentType_audit_updated_at", "noticeOfIntentType"."audit_created_by" AS "noticeOfIntentType_audit_created_by", "noticeOfIntentType"."audit_updated_by" AS "noticeOfIntentType_audit_updated_by", "noticeOfIntentType"."label" AS "noticeOfIntentType_label", "noticeOfIntentType"."code" AS "noticeOfIntentType_code", "noticeOfIntentType"."description" AS "noticeOfIntentType_description", "noticeOfIntentType"."short_label" AS "noticeOfIntentType_short_label", "noticeOfIntentType"."background_color" AS "noticeOfIntentType_background_color", "noticeOfIntentType"."text_color" AS "noticeOfIntentType_text_color", "noticeOfIntentType"."html_description" AS "noticeOfIntentType_html_description", "noticeOfIntentType"."portal_label" AS "noticeOfIntentType_portal_label", "localGovernment"."name" AS "local_government_name", "noi_sub"."file_number" AS "file_number", "noi_sub"."local_government_uuid" AS "local_government_uuid", "noi_sub"."type_code" AS "notice_of_intent_type_code", "noi"."date_submitted_to_alc" AS "date_submitted_to_alc", "noi"."decision_date" AS "decision_date", decision_date.outcome AS "outcome", decision_date.dest_rank AS "dest_rank", "noi"."region_code" AS "notice_of_intent_region_code", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid") AS "status" FROM "alcs"."notice_of_intent_submission" "noi_sub" INNER JOIN "alcs"."notice_of_intent" "noi" ON "noi"."file_number" = "noi_sub"."file_number" AND "noi"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."notice_of_intent_type" "noticeOfIntentType" ON "noi_sub"."type_code" = "noticeOfIntentType"."code" AND "noticeOfIntentType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "noi_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."notice_of_intent_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "noi_sub"."uuid" LEFT JOIN (SELECT DISTINCT ON (notice_of_intentuuid) decisiondate AS "date", outcome AS "outcome", dest_rank AS "dest_rank", notice_of_intentuuid AS "notice_of_intent_uuid" FROM "alcs"."notice_of_intent_decision" "decision_date", (SELECT outcome_code AS "outcome", date AS "decisiondate", notice_of_intent_uuid AS "notice_of_intentuuid", RANK() OVER (PARTITION BY notice_of_intent_uuid ORDER BY date DESC, audit_created_at DESC) AS "dest_rank" FROM "alcs"."notice_of_intent_decision" "decision" WHERE "decision"."audit_deleted_date_at" IS NULL) "decisions" WHERE dest_rank = 1) "decision_date" ON decision_date."notice_of_intent_uuid" = "noi"."uuid" WHERE ( "noi_sub"."is_draft" = FALSE AND ("noi"."date_received_all_items" IS NOT NULL AND "noi"."date_received_all_items" <= NOW()) AND alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid")->>'status_type_code' != 'CANC' ) AND ( "noi_sub"."audit_deleted_date_at" IS NULL )`, + ); + await queryRunner.query( + `INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, + [ + 'alcs', + 'VIEW', + 'public_notice_of_intent_submission_search_view', + 'SELECT "noi_sub"."uuid" AS "uuid", "noi_sub"."applicant" AS "applicant", "noi"."uuid" AS "notice_of_intent_uuid", "noticeOfIntentType"."audit_deleted_date_at" AS "noticeOfIntentType_audit_deleted_date_at", "noticeOfIntentType"."audit_created_at" AS "noticeOfIntentType_audit_created_at", "noticeOfIntentType"."audit_updated_at" AS "noticeOfIntentType_audit_updated_at", "noticeOfIntentType"."audit_created_by" AS "noticeOfIntentType_audit_created_by", "noticeOfIntentType"."audit_updated_by" AS "noticeOfIntentType_audit_updated_by", "noticeOfIntentType"."label" AS "noticeOfIntentType_label", "noticeOfIntentType"."code" AS "noticeOfIntentType_code", "noticeOfIntentType"."description" AS "noticeOfIntentType_description", "noticeOfIntentType"."short_label" AS "noticeOfIntentType_short_label", "noticeOfIntentType"."background_color" AS "noticeOfIntentType_background_color", "noticeOfIntentType"."text_color" AS "noticeOfIntentType_text_color", "noticeOfIntentType"."html_description" AS "noticeOfIntentType_html_description", "noticeOfIntentType"."portal_label" AS "noticeOfIntentType_portal_label", "localGovernment"."name" AS "local_government_name", "noi_sub"."file_number" AS "file_number", "noi_sub"."local_government_uuid" AS "local_government_uuid", "noi_sub"."type_code" AS "notice_of_intent_type_code", "noi"."date_submitted_to_alc" AS "date_submitted_to_alc", "noi"."decision_date" AS "decision_date", decision_date.outcome AS "outcome", decision_date.dest_rank AS "dest_rank", "noi"."region_code" AS "notice_of_intent_region_code", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid") AS "status" FROM "alcs"."notice_of_intent_submission" "noi_sub" INNER JOIN "alcs"."notice_of_intent" "noi" ON "noi"."file_number" = "noi_sub"."file_number" AND "noi"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."notice_of_intent_type" "noticeOfIntentType" ON "noi_sub"."type_code" = "noticeOfIntentType"."code" AND "noticeOfIntentType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "noi_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."notice_of_intent_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "noi_sub"."uuid" LEFT JOIN (SELECT DISTINCT ON (notice_of_intentuuid) decisiondate AS "date", outcome AS "outcome", dest_rank AS "dest_rank", notice_of_intentuuid AS "notice_of_intent_uuid" FROM "alcs"."notice_of_intent_decision" "decision_date", (SELECT outcome_code AS "outcome", date AS "decisiondate", notice_of_intent_uuid AS "notice_of_intentuuid", RANK() OVER (PARTITION BY notice_of_intent_uuid ORDER BY date DESC, audit_created_at DESC) AS "dest_rank" FROM "alcs"."notice_of_intent_decision" "decision" WHERE "decision"."audit_deleted_date_at" IS NULL) "decisions" WHERE dest_rank = 1) "decision_date" ON decision_date."notice_of_intent_uuid" = "noi"."uuid" WHERE ( "noi_sub"."is_draft" = FALSE AND ("noi"."date_received_all_items" IS NOT NULL AND "noi"."date_received_all_items" <= NOW()) AND alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid")->>\'status_type_code\' != \'CANC\' ) AND ( "noi_sub"."audit_deleted_date_at" IS NULL )', + ], + ); + await queryRunner.query( + `CREATE VIEW "alcs"."public_application_submission_search_view" AS SELECT "app_sub"."uuid" AS "uuid", "app_sub"."applicant" AS "applicant", "app"."uuid" AS "application_uuid", "applicationType"."audit_deleted_date_at" AS "applicationType_audit_deleted_date_at", "applicationType"."audit_created_at" AS "applicationType_audit_created_at", "applicationType"."audit_updated_at" AS "applicationType_audit_updated_at", "applicationType"."audit_created_by" AS "applicationType_audit_created_by", "applicationType"."audit_updated_by" AS "applicationType_audit_updated_by", "applicationType"."label" AS "applicationType_label", "applicationType"."code" AS "applicationType_code", "applicationType"."description" AS "applicationType_description", "applicationType"."short_label" AS "applicationType_short_label", "applicationType"."background_color" AS "applicationType_background_color", "applicationType"."text_color" AS "applicationType_text_color", "applicationType"."html_description" AS "applicationType_html_description", "applicationType"."portal_label" AS "applicationType_portal_label", "applicationType"."portal_order" AS "applicationType_portal_order", "applicationType"."requires_government_review" AS "applicationType_requires_government_review", "localGovernment"."name" AS "local_government_name", "app_sub"."file_number" AS "file_number", "app_sub"."local_government_uuid" AS "local_government_uuid", "app_sub"."type_code" AS "application_type_code", "app"."date_submitted_to_alc" AS "date_submitted_to_alc", "app"."decision_date" AS "decision_date", decision_date.outcome AS "outcome", decision_date.dest_rank AS "dest_rank", "app"."region_code" AS "application_region_code", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid") AS "status" FROM "alcs"."application_submission" "app_sub" INNER JOIN "alcs"."application" "app" ON "app"."file_number" = "app_sub"."file_number" AND "app"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."application_type" "applicationType" ON "app_sub"."type_code" = "applicationType"."code" AND "applicationType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "app_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."application_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "app_sub"."uuid" LEFT JOIN (SELECT DISTINCT ON (application_uuid) decisiondate AS "date", outcome AS "outcome", dest_rank AS "dest_rank", applicationuuid AS "application_uuid" FROM "alcs"."application_decision" "decision_date", (SELECT outcome_code AS "outcome", date AS "decisiondate", application_uuid AS "applicationuuid", RANK() OVER (PARTITION BY application_uuid ORDER BY date DESC, audit_created_at DESC) AS "dest_rank" FROM "alcs"."application_decision" "decision" WHERE ( is_draft = FALSE ) AND ( "decision"."audit_deleted_date_at" IS NULL )) "decisions" WHERE dest_rank = 1) "decision_date" ON decision_date."application_uuid" = "app"."uuid" WHERE ( "app_sub"."is_draft" = FALSE AND ("app"."date_received_all_items" IS NOT NULL AND "app"."date_received_all_items" <= NOW()) AND alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid")->>'status_type_code' != 'CANC' ) AND ( "app_sub"."audit_deleted_date_at" IS NULL )`, + ); + await queryRunner.query( + `INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, + [ + 'alcs', + 'VIEW', + 'public_application_submission_search_view', + 'SELECT "app_sub"."uuid" AS "uuid", "app_sub"."applicant" AS "applicant", "app"."uuid" AS "application_uuid", "applicationType"."audit_deleted_date_at" AS "applicationType_audit_deleted_date_at", "applicationType"."audit_created_at" AS "applicationType_audit_created_at", "applicationType"."audit_updated_at" AS "applicationType_audit_updated_at", "applicationType"."audit_created_by" AS "applicationType_audit_created_by", "applicationType"."audit_updated_by" AS "applicationType_audit_updated_by", "applicationType"."label" AS "applicationType_label", "applicationType"."code" AS "applicationType_code", "applicationType"."description" AS "applicationType_description", "applicationType"."short_label" AS "applicationType_short_label", "applicationType"."background_color" AS "applicationType_background_color", "applicationType"."text_color" AS "applicationType_text_color", "applicationType"."html_description" AS "applicationType_html_description", "applicationType"."portal_label" AS "applicationType_portal_label", "applicationType"."portal_order" AS "applicationType_portal_order", "applicationType"."requires_government_review" AS "applicationType_requires_government_review", "localGovernment"."name" AS "local_government_name", "app_sub"."file_number" AS "file_number", "app_sub"."local_government_uuid" AS "local_government_uuid", "app_sub"."type_code" AS "application_type_code", "app"."date_submitted_to_alc" AS "date_submitted_to_alc", "app"."decision_date" AS "decision_date", decision_date.outcome AS "outcome", decision_date.dest_rank AS "dest_rank", "app"."region_code" AS "application_region_code", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid") AS "status" FROM "alcs"."application_submission" "app_sub" INNER JOIN "alcs"."application" "app" ON "app"."file_number" = "app_sub"."file_number" AND "app"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."application_type" "applicationType" ON "app_sub"."type_code" = "applicationType"."code" AND "applicationType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "app_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."application_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "app_sub"."uuid" LEFT JOIN (SELECT DISTINCT ON (application_uuid) decisiondate AS "date", outcome AS "outcome", dest_rank AS "dest_rank", applicationuuid AS "application_uuid" FROM "alcs"."application_decision" "decision_date", (SELECT outcome_code AS "outcome", date AS "decisiondate", application_uuid AS "applicationuuid", RANK() OVER (PARTITION BY application_uuid ORDER BY date DESC, audit_created_at DESC) AS "dest_rank" FROM "alcs"."application_decision" "decision" WHERE ( is_draft = FALSE ) AND ( "decision"."audit_deleted_date_at" IS NULL )) "decisions" WHERE dest_rank = 1) "decision_date" ON decision_date."application_uuid" = "app"."uuid" WHERE ( "app_sub"."is_draft" = FALSE AND ("app"."date_received_all_items" IS NOT NULL AND "app"."date_received_all_items" <= NOW()) AND alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid")->>\'status_type_code\' != \'CANC\' ) AND ( "app_sub"."audit_deleted_date_at" IS NULL )', + ], + ); + } +} From 2304fec3db1476a7ab9ce90b236259a7a337d6c9 Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Thu, 4 Jan 2024 12:18:21 -0800 Subject: [PATCH 865/954] Fix confirm dialog still showing when it shouldn't --- .../primary-contact/primary-contact.component.ts | 13 +++++++------ .../primary-contact/primary-contact.component.ts | 13 +++++++------ 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts index ebe3e7e24e..f00c2e150c 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts @@ -289,7 +289,7 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni } async onSelectPrimaryContactType(isExistingOwner: boolean | null) { - if (this.form.dirty || (this.selectedOwnerUuid && this.selectedOwnerUuid !== 'agent')) { + if (this.form.dirty || (!isExistingOwner && this.selectedOwnerUuid && !this.isGovernmentUser)) { await this.dialog .open(PrimaryContactConfirmationDialogComponent, { panelClass: 'no-padding', @@ -303,11 +303,6 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni .subscribe(async (confirmed) => { if (confirmed) { this.switchPrimaryContactType(isExistingOwner); - - // Ensure form is cleared after switching to existing user - if (this.selectedOwnerUuid === 'agent') { - this.form.reset(); - } } else { this.isExistingOwner.setValue(!isExistingOwner); } @@ -326,6 +321,12 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni this.onSelectOwner(this.parcelOwners[0].uuid); } else { this.selectedThirdPartyAgent = false; + this.selectedOwnerUuid = undefined; + } + + // Ensure form is cleared to avoid erroneous confirmation dialogs + if (this.selectedThirdPartyAgent || this.selectedLocalGovernment) { + this.form.reset(); } this.showNoOwnersWarning = isExistingOwner === true && this.parcelOwners.length === 0 && !this.isGovernmentUser; diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts index f071590340..47e4994d16 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts @@ -291,7 +291,7 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni } async onSelectPrimaryContactType(isExistingOwner: boolean | null) { - if (this.form.dirty || (this.selectedOwnerUuid && this.selectedOwnerUuid !== 'agent')) { + if (this.form.dirty || (!isExistingOwner && this.selectedOwnerUuid && !this.isGovernmentUser)) { await this.dialog .open(PrimaryContactConfirmationDialogComponent, { panelClass: 'no-padding', @@ -305,11 +305,6 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni .subscribe(async (confirmed) => { if (confirmed) { this.switchPrimaryContactType(isExistingOwner); - - // Ensure form is cleared after switching to existing user - if (this.selectedOwnerUuid === 'agent') { - this.form.reset(); - } } else { this.isExistingOwner.setValue(!isExistingOwner); } @@ -328,6 +323,12 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni this.onSelectOwner(this.parcelOwners[0].uuid); } else { this.selectedThirdPartyAgent = false; + this.selectedOwnerUuid = undefined; + } + + // Ensure form is cleared to avoid erroneous confirmation dialogs + if (this.selectedThirdPartyAgent || this.selectedLocalGovernment) { + this.form.reset(); } this.showNoOwnersWarning = isExistingOwner === true && this.parcelOwners.length === 0 && !this.isGovernmentUser; From 65caf79c9f1a0a92cdd5a3581aaf1cd7a8dca066 Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Thu, 4 Jan 2024 12:20:55 -0800 Subject: [PATCH 866/954] Add clarifying comments to owner switch branches --- .../primary-contact/primary-contact.component.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts index f00c2e150c..faa57ab9ba 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts @@ -314,12 +314,16 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni switchPrimaryContactType(isExistingOwner: boolean | null) { if (!isExistingOwner) { + // '3rd-party agent this.onSelectAgent(); } else if (this.isGovernmentUser) { + // L/FNG contact this.onSelectGovernment(); } else if (this.parcelOwners.length === 1) { + // Only 1 existing user this.onSelectOwner(this.parcelOwners[0].uuid); } else { + // = 0 or > 1 existing owners this.selectedThirdPartyAgent = false; this.selectedOwnerUuid = undefined; } From b44b97e5b0575bd281567d8c73fadbea37a06fff Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Thu, 4 Jan 2024 14:03:19 -0800 Subject: [PATCH 867/954] Code Review Feedback --- .../app/features/application/overview/overview.component.ts | 4 ++-- .../features/notice-of-intent/overview/overview.component.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/alcs-frontend/src/app/features/application/overview/overview.component.ts b/alcs-frontend/src/app/features/application/overview/overview.component.ts index cc2e81f47e..31912d8df6 100644 --- a/alcs-frontend/src/app/features/application/overview/overview.component.ts +++ b/alcs-frontend/src/app/features/application/overview/overview.component.ts @@ -110,7 +110,7 @@ export class OverviewComponent implements OnInit, OnDestroy { if (this.isHiddenFromPortal) { this.confirmationDialogService .openDialog({ - body: 'Are you sure you want to remove the access restriction for the L/FNG and public? If you continue, this File ID could return search results for the L/FNG and the public. Standard rules for showing/hiding content will apply.', + body: 'If you continue, this File ID will not return any search results for the L/FNG and the public. Please add a journal note to explain why this file is restricted.', }) .subscribe((didConfirm) => { this.isHiddenFromPortal = didConfirm; @@ -123,7 +123,7 @@ export class OverviewComponent implements OnInit, OnDestroy { } else { this.confirmationDialogService .openDialog({ - body: 'If you continue, this File ID will not return any search results for the L/FNG and the public. Please add a journal note to explain why this file is restricted.', + body: 'Are you sure you want to remove the access restriction for the L/FNG and public? If you continue, this File ID could return search results for the L/FNG and the public. Standard rules for showing/hiding content will apply.', }) .subscribe((didConfirm) => { this.isHiddenFromPortal = !didConfirm; diff --git a/alcs-frontend/src/app/features/notice-of-intent/overview/overview.component.ts b/alcs-frontend/src/app/features/notice-of-intent/overview/overview.component.ts index 33c2aef78b..4d1ee3b44a 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/overview/overview.component.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/overview/overview.component.ts @@ -115,7 +115,7 @@ export class OverviewComponent implements OnInit, OnDestroy { if (this.isHiddenFromPortal) { this.confirmationDialogService .openDialog({ - body: 'Are you sure you want to remove the access restriction for the L/FNG and public? If you continue, this File ID could return search results for the L/FNG and the public. Standard rules for showing/hiding content will apply.', + body: 'If you continue, this File ID will not return any search results for the L/FNG and the public. Please add a journal note to explain why this file is restricted.', }) .subscribe((didConfirm) => { this.isHiddenFromPortal = didConfirm; @@ -128,7 +128,7 @@ export class OverviewComponent implements OnInit, OnDestroy { } else { this.confirmationDialogService .openDialog({ - body: 'If you continue, this File ID will not return any search results for the L/FNG and the public. Please add a journal note to explain why this file is restricted.', + body: 'Are you sure you want to remove the access restriction for the L/FNG and public? If you continue, this File ID could return search results for the L/FNG and the public. Standard rules for showing/hiding content will apply.', }) .subscribe((didConfirm) => { this.isHiddenFromPortal = !didConfirm; From e43badeeead5734418ae082c4e9d218106dceac4 Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Thu, 4 Jan 2024 15:00:21 -0800 Subject: [PATCH 868/954] proposal end dates for noi and applications (#1261) set proposal_end_date and proposal_end_date2 on NOI set proposal_end_date and proposal_end_date2 on Application update NOI decision component to properly map end_date and end_date2 fix inconsistencies with dates for application proposal --- .../applications/app_prep.py | 65 ++++++++++++++++++- ...tice_of_intent_decision_components_init.py | 22 +++++-- ...oats_to_alcs_notice_of_intent_table_etl.py | 25 ++++--- 3 files changed, 96 insertions(+), 16 deletions(-) diff --git a/bin/migrate-oats-data/applications/app_prep.py b/bin/migrate-oats-data/applications/app_prep.py index dcbecfdeba..942814371d 100644 --- a/bin/migrate-oats-data/applications/app_prep.py +++ b/bin/migrate-oats-data/applications/app_prep.py @@ -8,6 +8,7 @@ BATCH_UPLOAD_SIZE, OatsToAlcsAgCapSource, OatsToAlcsAgCap, + add_timezone_and_keep_date_part, ) from db import inject_conn_pool from psycopg2.extras import execute_batch, RealDictCursor @@ -121,6 +122,7 @@ def _update_app_prep_records(conn, batch_size, cursor, rows): other_data_list, exc_data_list, inc_data_list, + pofo_roso_pfrs_data_list, ) = _prepare_app_prep_data(rows) if len(nfu_data_list) > 0: @@ -155,6 +157,14 @@ def _update_app_prep_records(conn, batch_size, cursor, rows): page_size=batch_size, ) + if len(pofo_roso_pfrs_data_list) > 0: + execute_batch( + cursor, + _get_update_query_for_soil(), + pofo_roso_pfrs_data_list, + page_size=batch_size, + ) + if len(other_data_list) > 0: execute_batch( cursor, @@ -183,6 +193,7 @@ def _prepare_app_prep_data(app_prep_raw_data_list): nar_data_list = [] exc_data_list = [] inc_data_list = [] + pofo_roso_pfrs_data_list = [] other_data_list = [] for row in app_prep_raw_data_list: @@ -193,6 +204,7 @@ def _prepare_app_prep_data(app_prep_raw_data_list): data = _mapOatsToAlcsAppPrep(data) nfu_data_list.append(data) elif data["alr_change_code"] == ALRChangeCode.NAR.value: + data = _mapOatsResidentialEndDateToAlcs(data) nar_data_list.append(data) elif data["alr_change_code"] == ALRChangeCode.EXC.value: data = _mapOatsToAlcsLegislationCode(data) @@ -200,10 +212,24 @@ def _prepare_app_prep_data(app_prep_raw_data_list): elif data["alr_change_code"] == ALRChangeCode.INC.value: data = _mapOatsToAlcsLegislationCode(data) inc_data_list.append(data) + elif data["alr_change_code"] in [ + ALRChangeCode.SCH.value, + ALRChangeCode.EXT.value, + ALRChangeCode.FILL.value, + ]: + data = _mapProposalEndDatesForSoilComponents(data) + pofo_roso_pfrs_data_list.append(data) else: other_data_list.append(data) - return nfu_data_list, nar_data_list, other_data_list, exc_data_list, inc_data_list + return ( + nfu_data_list, + nar_data_list, + other_data_list, + exc_data_list, + inc_data_list, + pofo_roso_pfrs_data_list, + ) def _mapOatsToAlcsAppPrep(data): @@ -219,6 +245,18 @@ def _mapOatsToAlcsAppPrep(data): oats_type_code, oats_subtype_code ) + data["nonfarm_use_end_date"] = add_timezone_and_keep_date_part( + data.get("nonfarm_use_end_date", None) + ) + + return data + + +def _mapOatsResidentialEndDateToAlcs(data): + data["rsdntl_use_end_date"] = add_timezone_and_keep_date_part( + data.get("rsdntl_use_end_date", None) + ) + return data @@ -231,6 +269,24 @@ def _mapOatsToAlcsLegislationCode(data): return data +def _mapProposalEndDatesForSoilComponents(data): + data["proposal_end_date"] = None + data["proposal_end_date2"] = None + date = data.get("nonfarm_use_end_date", None) + noi_type = data.get("alr_change_code", None) + + if date is not None: + proposal_end = add_timezone_and_keep_date_part(date) + + if noi_type == ALRChangeCode.SCH.value: + data["proposal_end_date"] = proposal_end + data["proposal_end_date2"] = proposal_end + elif noi_type in [ALRChangeCode.FILL.value, ALRChangeCode.EXT.value]: + data["proposal_end_date"] = proposal_end + + return data + + def _get_update_query(unique_fields): # unique_fields takes input from called function and appends to query query = """ @@ -288,6 +344,13 @@ def _get_update_query_for_other(): return _get_update_query(unique_fields) +def _get_update_query_for_soil(): + unique_fields = """, + proposal_end_date = %(proposal_end_date)s, + proposal_end_date2 = %(proposal_end_date2)s""" + return _get_update_query(unique_fields) + + def _map_oats_to_alcs_nfu_subtypes(nfu_type_code, nfu_subtype_code): for dict_obj in OATS_NFU_SUBTYPES: if str(dict_obj["type_key"]) == str(nfu_type_code) and str( diff --git a/bin/migrate-oats-data/noi/noi_decisions/noi_components/notice_of_intent_decision_components_init.py b/bin/migrate-oats-data/noi/noi_decisions/noi_components/notice_of_intent_decision_components_init.py index 50d9f4cf78..44d65aa7c4 100644 --- a/bin/migrate-oats-data/noi/noi_decisions/noi_components/notice_of_intent_decision_components_init.py +++ b/bin/migrate-oats-data/noi/noi_decisions/noi_components/notice_of_intent_decision_components_init.py @@ -140,6 +140,7 @@ def _prepare_oats_alr_applications_data(row_data_list): ALRChangeCode.FILL.value, ALRChangeCode.EXT.value, ]: + end_date, end_date2 = _map_end_date(row) mapped_row = { "ag_cap": str(OatsToAlcsAgCap[row["agri_capability_code"]].value) if row.get("agri_capability_code") @@ -153,12 +154,8 @@ def _prepare_oats_alr_applications_data(row_data_list): else None, "alr_area": row.get("component_area"), "audit_created_by": OATS_ETL_USER, - "end_date": add_timezone_and_keep_date_part( - row.get("nonfarm_use_end_date") - ), - "end_date2": add_timezone_and_keep_date_part( - row.get("nonfarm_use_end_date") - ), + "end_date": end_date, + "end_date2": end_date2, "expiry_date": add_timezone_and_keep_date_part( row.get("decision_expiry_date") ), @@ -187,6 +184,19 @@ def _map_component_type_code(row): return None +def _map_end_date(row): + alr_change_code = row.get("alr_change_code") + date = add_timezone_and_keep_date_part(row.get("nonfarm_use_end_date")) + + if alr_change_code in [ + ALRChangeCode.SCH.value, + ALRChangeCode.EXT.value, + ALRChangeCode.FILL.value, + ]: + return date, date if alr_change_code == ALRChangeCode.SCH.value else None + return None, None + + @inject_conn_pool def clean_notice_of_intent_decision_components(conn=None): logger.info("Start notice_of_intent_decision_component cleaning") diff --git a/bin/migrate-oats-data/noi/oats_to_alcs_notice_of_intent_table_etl/oats_to_alcs_notice_of_intent_table_etl.py b/bin/migrate-oats-data/noi/oats_to_alcs_notice_of_intent_table_etl/oats_to_alcs_notice_of_intent_table_etl.py index d116a74e17..9be971cedf 100644 --- a/bin/migrate-oats-data/noi/oats_to_alcs_notice_of_intent_table_etl/oats_to_alcs_notice_of_intent_table_etl.py +++ b/bin/migrate-oats-data/noi/oats_to_alcs_notice_of_intent_table_etl/oats_to_alcs_notice_of_intent_table_etl.py @@ -6,6 +6,7 @@ AlcsAgCapSource, setup_and_get_logger, add_timezone_and_keep_date_part, + ALRChangeCode, ) from db import inject_conn_pool from psycopg2.extras import RealDictCursor, execute_batch @@ -80,7 +81,7 @@ def process_alcs_notice_of_intent_base_fields(conn=None, batch_size=BATCH_UPLOAD ) except Exception as err: # this is NOT going to be caused by actual data update failure. This code is only executed when the code error appears or connection to DB is lost - logger.exception() + logger.exception(err) conn.rollback() failed_inserts = count_total - successful_updates_count last_application_id = last_application_id + 1 @@ -116,6 +117,7 @@ def _get_update_query_from_oats_alr_applications_fields(): ag_cap = COALESCE(%(agri_capability_code)s, ag_cap), legacy_id= COALESCE(%(legacy_application_nbr)s, legacy_id), proposal_end_date = %(proposal_end_date)s, + proposal_end_date2 = %(proposal_end_date2)s, source = 'APPLICANT' WHERE alcs.notice_of_intent.file_number = %(alr_application_id)s::TEXT; @@ -146,13 +148,18 @@ def map_basic_field(data): def map_prop_end_date(data): - date = data.get("nonfarm_use_end_date", "") - alcs_date = data.get("proposal_end_date", "") - if date is None and alcs_date is None: - return data - elif date is None: - return data - else: + data["proposal_end_date"] = None + data["proposal_end_date2"] = None + date = data.get("nonfarm_use_end_date", None) + noi_type = data.get("alr_change_code", None) + + if date is not None: proposal_end = add_timezone_and_keep_date_part(date) - data["proposal_end_date"] = proposal_end + + if noi_type == ALRChangeCode.SCH.value: + data["proposal_end_date"] = proposal_end + data["proposal_end_date2"] = proposal_end + elif noi_type in [ALRChangeCode.FILL.value, ALRChangeCode.EXT.value]: + data["proposal_end_date"] = proposal_end + return data From 1a21fa3d4d0ed14c5ad4eb9be2a2872a9a2b6639 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Thu, 4 Jan 2024 15:03:33 -0800 Subject: [PATCH 869/954] Disable revert to draft if decision has duplicate components --- .../decision-v2/decision-v2.component.html | 6 ++-- .../decision-v2/decision-v2.component.ts | 29 +++++++++++++++---- .../application-decision-v2.service.ts | 15 ++++++++++ 3 files changed, 42 insertions(+), 8 deletions(-) diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.html index beb0537564..e3787441fd 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.html @@ -89,14 +89,14 @@ <h5>Res #{{ decision.resolutionNumber }}/{{ decision.resolutionYear }}</h5> <div *ngIf="!decision.isDraft" - matTooltip="{{ disabledCreateBtnTooltip }}" - [matTooltipDisabled]="!isPaused && !isDraftExists" + [matTooltip]="decision.disabledMessage" + [matTooltipDisabled]="!isPaused && !isDraftExists && !decision.hasDuplicateComponents" > <button mat-stroked-button color="primary" (click)="onRevertToDraft(decision.uuid)" - [disabled]="isDraftExists" + [disabled]="isDraftExists || decision.hasDuplicateComponents" > Revert to draft </button> diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.ts index 8b06ca2309..d52fe2cfd1 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.ts @@ -26,6 +26,8 @@ import { RevertToDraftDialogComponent } from './revert-to-draft-dialog/revert-to type LoadingDecision = ApplicationDecisionWithLinkedResolutionDto & { loading: boolean; + hasDuplicateComponents: boolean; + disabledMessage: string; }; @Component({ @@ -85,15 +87,32 @@ export class DecisionV2Component implements OnInit, OnDestroy { this.ceoCriterion = codes.ceoCriterion; this.decisionService.loadDecisions(fileNumber); + this.isDraftExists = this.decisions.some((d) => d.isDraft); + this.decisionService.$decisions.pipe(takeUntil(this.$destroy)).subscribe((decisions) => { - this.decisions = decisions.map((decision) => ({ - ...decision, - loading: false, - })); + this.decisions = decisions.map((decision) => { + const componentCodes = decision.components.map((component) => component.applicationDecisionComponentTypeCode); + const duplicateComponentCodes = componentCodes.filter((item, index) => componentCodes.indexOf(item) !== index); + + let disabledMessage = + 'An application can only have one decision draft at a time. Please release or delete the existing decision draft to continue.'; + if (this.isPaused) { + disabledMessage = 'This application is currently paused. Only active applications can have decisions.'; + } + if (duplicateComponentCodes.length > 0) { + disabledMessage = 'Editing disabled - contact admin'; + } + + return { + ...decision, + loading: false, + hasDuplicateComponents: duplicateComponentCodes.length > 0, + disabledMessage, + }; + }); this.scrollToDecision(); - this.isDraftExists = this.decisions.some((d) => d.isDraft); this.disabledCreateBtnTooltip = this.isPaused ? 'This application is currently paused. Only active applications can have decisions.' : 'An application can only have one decision draft at a time. Please release or delete the existing decision draft to continue.'; diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service.ts index 76cb60d994..0156bd7e59 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service.ts @@ -233,6 +233,21 @@ export class ApplicationDecisionV2Service { const existingDecision: Partial<ApplicationDecision> = await this.getOrFail(uuid); + const componentCodes = existingDecision.components + ? existingDecision.components.map( + (component) => component.applicationDecisionComponentTypeCode, + ) + : []; + const duplicateComponentCodes = componentCodes.filter( + (item, index) => componentCodes.indexOf(item) !== index, + ); + + if (duplicateComponentCodes.length > 0) { + throw new ServiceValidationException( + 'Cannot revert to Draft Decisions with Duplicate Component Codes', + ); + } + await this.validateDecisionChanges(updateDto); // resolution number is int64 in postgres, which means it is a string in JS From 45a8d165abbe65fac0c855b93407655ae256d6fc Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Thu, 4 Jan 2024 15:18:53 -0800 Subject: [PATCH 870/954] application modification etl (#1264) application modification import etl application modification link to decision etl use batch_size constant instead of the hardcoded value --- .../applications/base_applications.py | 3 +- .../decisions/app_modifications/__init__.py | 11 ++ .../application_modifications_init.py | 149 ++++++++++++++++++ .../application_modifications_link.py | 123 +++++++++++++++ .../application_modifications_update.py | 124 +++++++++++++++ .../decisions/application_decisions_init.py | 3 +- .../application_modification_insert.sql | 22 +++ .../application_modification_insert_count.sql | 18 +++ ...ication_modification_link_to_decisions.sql | 8 + ...n_modification_link_to_decisions_count.sql | 6 + .../application_modification_update.sql | 24 +++ .../application_modification_update_count.sql | 19 +++ .../applications/migrate_application.py | 18 ++- .../alcs_documents_to_app_documents.py | 3 +- .../alcs_documents_to_noi_documents.py | 3 +- .../oats_documents_to_alcs_documents_app.py | 3 +- .../oats_documents_to_alcs_documents_noi.py | 3 +- ...tice_of_intent_decision_components_init.py | 3 +- ...decision_components_soil_details_update.py | 11 +- .../notice_of_intent_conditions_init.py | 3 +- .../notice_of_intent_conditions_link.py | 3 +- .../notice_of_intent_conditions_update.py | 3 +- .../notice_of_intent_modifications_init.py | 3 +- .../notice_of_intent_modifications_link.py | 3 +- .../notice_of_intent_modifications_update.py | 3 +- .../notice_of_intent_decisions_init.py | 3 +- .../noi/notice_of_intent_init.py | 3 +- .../unarchive-card/unarchive-card.service.ts | 2 +- .../application-modification.entity.ts | 13 +- .../application-modification.service.spec.ts | 23 ++- .../application-modification.service.ts | 9 +- ...add_oats_id_to_application_modification.ts | 25 +++ ...card_uuid_nullable_for_app_modification.ts | 31 ++++ services/apps/alcs/test/mocks/mockEntities.ts | 8 +- 34 files changed, 658 insertions(+), 31 deletions(-) create mode 100644 bin/migrate-oats-data/applications/decisions/app_modifications/__init__.py create mode 100644 bin/migrate-oats-data/applications/decisions/app_modifications/application_modifications_init.py create mode 100644 bin/migrate-oats-data/applications/decisions/app_modifications/application_modifications_link.py create mode 100644 bin/migrate-oats-data/applications/decisions/app_modifications/application_modifications_update.py create mode 100644 bin/migrate-oats-data/applications/decisions/sql/modifications/application_modification_insert.sql create mode 100644 bin/migrate-oats-data/applications/decisions/sql/modifications/application_modification_insert_count.sql create mode 100644 bin/migrate-oats-data/applications/decisions/sql/modifications/application_modification_link_to_decisions.sql create mode 100644 bin/migrate-oats-data/applications/decisions/sql/modifications/application_modification_link_to_decisions_count.sql create mode 100644 bin/migrate-oats-data/applications/decisions/sql/modifications/application_modification_update.sql create mode 100644 bin/migrate-oats-data/applications/decisions/sql/modifications/application_modification_update_count.sql create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1704394923698-add_oats_id_to_application_modification.ts create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1704395559610-make_card_uuid_nullable_for_app_modification.ts diff --git a/bin/migrate-oats-data/applications/base_applications.py b/bin/migrate-oats-data/applications/base_applications.py index af8e6e86b8..7aa2c0ad5a 100644 --- a/bin/migrate-oats-data/applications/base_applications.py +++ b/bin/migrate-oats-data/applications/base_applications.py @@ -3,6 +3,7 @@ setup_and_get_logger, exclusion_table_create, exclusion_table_count, + BATCH_UPLOAD_SIZE ) etl_name = "process_applications" @@ -10,7 +11,7 @@ @inject_conn_pool -def process_applications(conn=None, batch_size=10000): +def process_applications(conn=None, batch_size=BATCH_UPLOAD_SIZE): """ function uses a decorator pattern @inject_conn_pool to inject a database connection pool to the function. It fetches the total count of non duplicate applications and prints it to the console. Then, it fetches the applications to insert in batches using application IDs / file_number, constructs an insert query, and processes them. """ diff --git a/bin/migrate-oats-data/applications/decisions/app_modifications/__init__.py b/bin/migrate-oats-data/applications/decisions/app_modifications/__init__.py new file mode 100644 index 0000000000..a05e63fbaa --- /dev/null +++ b/bin/migrate-oats-data/applications/decisions/app_modifications/__init__.py @@ -0,0 +1,11 @@ +from .application_modifications_init import ( + init_application_modifications, + clean_application_modifications, +) + +from .application_modifications_update import update_application_modifications + +from .application_modifications_link import ( + link_application_modifications, + unlink_application_modifications, +) diff --git a/bin/migrate-oats-data/applications/decisions/app_modifications/application_modifications_init.py b/bin/migrate-oats-data/applications/decisions/app_modifications/application_modifications_init.py new file mode 100644 index 0000000000..5cb8d17764 --- /dev/null +++ b/bin/migrate-oats-data/applications/decisions/app_modifications/application_modifications_init.py @@ -0,0 +1,149 @@ +from common import ( + OATS_ETL_USER, + setup_and_get_logger, + add_timezone_and_keep_date_part, + AlcsNoiModificationOutcomeCodeEnum, + BATCH_UPLOAD_SIZE, +) +from db import inject_conn_pool +from psycopg2.extras import RealDictCursor, execute_batch + +etl_name = "init_application_modifications" +logger = setup_and_get_logger(etl_name) + + +@inject_conn_pool +def init_application_modifications(conn=None, batch_size=BATCH_UPLOAD_SIZE): + """ + This function is responsible for initializing the application_modification in ALCS. + + Args: + conn (psycopg2.extensions.connection): PostgreSQL database connection. Provided by the decorator. + batch_size (int): The number of items to process at once. Defaults to BATCH_UPLOAD_SIZE. + """ + + logger.info(f"Start {etl_name}") + with conn.cursor(cursor_factory=RealDictCursor) as cursor: + with open( + "applications/decisions/sql/modifications/application_modification_insert_count.sql", + "r", + encoding="utf-8", + ) as sql_file: + count_query = sql_file.read() + cursor.execute(count_query) + count_total = dict(cursor.fetchone())["count"] + logger.info(f"Total Application Modifications data to insert: {count_total}") + + failed_inserts_count = 0 + successful_inserts_count = 0 + last_modification_id = 0 + + with open( + "applications/decisions/sql/modifications/application_modification_insert.sql", + "r", + encoding="utf-8", + ) as sql_file: + query = sql_file.read() + while True: + cursor.execute( + f"{query} and orr.reconsideration_request_id > {last_modification_id} ORDER BY orr.reconsideration_request_id;" + ) + + rows = cursor.fetchmany(batch_size) + + if not rows: + break + try: + modifications_to_be_inserted_count = len(rows) + + _insert_application_modifications(conn, batch_size, cursor, rows) + + successful_inserts_count = ( + successful_inserts_count + modifications_to_be_inserted_count + ) + last_modification_id = dict(rows[-1])["reconsideration_request_id"] + + logger.debug( + f"retrieved/inserted items count: {modifications_to_be_inserted_count}; total successfully inserted modifications so far {successful_inserts_count}; last inserted reconsideration_request_id: {last_modification_id}" + ) + except Exception as err: + logger.exception(err) + conn.rollback() + failed_inserts_count = count_total - successful_inserts_count + last_modification_id = last_modification_id + 1 + + logger.info( + f"Finished {etl_name}: total amount of successful inserts {successful_inserts_count}, total failed inserts {failed_inserts_count}" + ) + + +def _insert_application_modifications(conn, batch_size, cursor, rows): + """ """ + query = _get_insert_query() + parsed_data_list = _prepare_oats_alr_applications_data(rows) + + if len(parsed_data_list) > 0: + execute_batch(cursor, query, parsed_data_list, page_size=batch_size) + + conn.commit() + + +def _get_insert_query(): + query = f""" + INSERT INTO alcs.application_modification ( + audit_created_by, + submitted_date, + review_outcome_code, + application_uuid, + description, + oats_reconsideration_request_id, + is_time_extension + ) + VALUES ( + %(audit_created_by)s, + %(submitted_date)s, + %(review_outcome_code)s, + %(application_uuid)s, + %(description)s, + %(oats_reconsideration_request_id)s, + %(is_time_extension)s + ) + ON CONFLICT DO NOTHING; + """ + return query + + +def _prepare_oats_alr_applications_data(row_data_list): + data_list = [] + for row in row_data_list: + mapped_row = { + "audit_created_by": OATS_ETL_USER, + "submitted_date": add_timezone_and_keep_date_part(row.get("received_date")), + "review_outcome_code": _map_outcome_code(row), + "application_uuid": row.get("app_uuid"), + "description": row.get("description"), + "oats_reconsideration_request_id": row.get("reconsideration_request_id"), + "is_time_extension": False, + } + data_list.append(mapped_row) + + return data_list + + +def _map_outcome_code(row): + if row.get("approved_date", None) is not None: + return AlcsNoiModificationOutcomeCodeEnum.PROCEED_TO_MODIFY.value + else: + return AlcsNoiModificationOutcomeCodeEnum.PENDING.value + + +@inject_conn_pool +def clean_application_modifications(conn=None): + logger.info("Start application_modification cleaning") + with conn.cursor() as cursor: + cursor.execute( + f"DELETE FROM alcs.application_modification WHERE audit_created_by = '{OATS_ETL_USER}' AND audit_updated_by is NULL" + ) + logger.info(f"Deleted items count = {cursor.rowcount}") + + conn.commit() diff --git a/bin/migrate-oats-data/applications/decisions/app_modifications/application_modifications_link.py b/bin/migrate-oats-data/applications/decisions/app_modifications/application_modifications_link.py new file mode 100644 index 0000000000..7c25891526 --- /dev/null +++ b/bin/migrate-oats-data/applications/decisions/app_modifications/application_modifications_link.py @@ -0,0 +1,123 @@ +from common import OATS_ETL_USER, setup_and_get_logger, BATCH_UPLOAD_SIZE +from db import inject_conn_pool +from psycopg2.extras import RealDictCursor, execute_batch + +etl_name = "link_application_modifications" +logger = setup_and_get_logger(etl_name) + + +@inject_conn_pool +def link_application_modifications(conn=None, batch_size=BATCH_UPLOAD_SIZE): + """ + This function is responsible for linking application_modification to application_decisions in ALCS. + + Args: + conn (psycopg2.extensions.connection): PostgreSQL database connection. Provided by the decorator. + batch_size (int): The number of items to process at once. Defaults to BATCH_UPLOAD_SIZE. + """ + + logger.info(f"Start {etl_name}") + with conn.cursor(cursor_factory=RealDictCursor) as cursor: + with open( + "applications/decisions/sql/modifications/application_modification_link_to_decisions_count.sql", + "r", + encoding="utf-8", + ) as sql_file: + count_query = sql_file.read() + cursor.execute(count_query) + count_total = dict(cursor.fetchone())["count"] + logger.info(f"Total Application Modifications data to link: {count_total}") + + failed_updates = 0 + successful_updates_count = 0 + last_modification_id = 0 + + with open( + "applications/decisions/sql/modifications/application_modification_link_to_decisions.sql", + "r", + encoding="utf-8", + ) as sql_file: + query = sql_file.read() + while True: + cursor.execute( + f"{query} and orr.reconsideration_request_id > {last_modification_id} ORDER BY orr.reconsideration_request_id;" + ) + + rows = cursor.fetchmany(batch_size) + + if not rows: + break + try: + modifications_to_be_updated_count = len(rows) + + _update_application_modifications(conn, batch_size, cursor, rows) + + successful_updates_count = ( + successful_updates_count + modifications_to_be_updated_count + ) + last_modification_id = dict(rows[-1])["reconsideration_request_id"] + + logger.debug( + f"retrieved/linked items count: {modifications_to_be_updated_count}; total successfully linked modifications so far {successful_updates_count}; last updated reconsideration_request_id: {last_modification_id}" + ) + except Exception as err: + logger.exception(err) + conn.rollback() + failed_updates = count_total - successful_updates_count + last_modification_id = last_modification_id + 1 + + logger.info( + f"Finished {etl_name}: total amount of successful linked {successful_updates_count}, total failed updates {failed_updates}" + ) + + +def _update_application_modifications(conn, batch_size, cursor, rows): + data = _prepare_oats_alr_applications_data(rows) + + if len(data) > 0: + execute_batch( + cursor, + _get_update_query(), + data, + page_size=batch_size, + ) + + conn.commit() + + +def _get_update_query(): + query = f""" + UPDATE alcs.application_decision + SET modifies_uuid = %(modification_uuid)s + WHERE alcs.application_decision."uuid" = %(decision_uuid)s + """ + return query + + +def _prepare_oats_alr_applications_data(row_data_list): + data_list = [] + for row in row_data_list: + mapped_row = { + "modification_uuid": row["modification_uuid"], + "decision_uuid": row["decision_uuid"], + "reconsideration_request_id": row["reconsideration_request_id"], + } + data_list.append(mapped_row) + + return data_list + + +@inject_conn_pool +def unlink_application_modifications(conn=None): + logger.info("Start application_modification link cleaning") + with conn.cursor() as cursor: + cursor.execute( + f"""UPDATE alcs.application_decision + SET modifies_uuid = NULL + FROM alcs.application_modification + WHERE alcs.application_decision.modifies_uuid = application_modification.uuid + AND alcs.application_modification.audit_created_by = '{OATS_ETL_USER}';""" + ) + logger.info(f"Unlinked items count = {cursor.rowcount}") + + conn.commit() diff --git a/bin/migrate-oats-data/applications/decisions/app_modifications/application_modifications_update.py b/bin/migrate-oats-data/applications/decisions/app_modifications/application_modifications_update.py new file mode 100644 index 0000000000..11760f8b37 --- /dev/null +++ b/bin/migrate-oats-data/applications/decisions/app_modifications/application_modifications_update.py @@ -0,0 +1,124 @@ +from common import ( + setup_and_get_logger, + add_timezone_and_keep_date_part, + AlcsNoiModificationOutcomeCodeEnum, + BATCH_UPLOAD_SIZE, +) +from db import inject_conn_pool +from psycopg2.extras import RealDictCursor, execute_batch + +etl_name = "update_application_modifications" +logger = setup_and_get_logger(etl_name) + + +@inject_conn_pool +def update_application_modifications(conn=None, batch_size=BATCH_UPLOAD_SIZE): + """ + This function is responsible for updating existing application_modification in ALCS. + + Args: + conn (psycopg2.extensions.connection): PostgreSQL database connection. Provided by the decorator. + batch_size (int): The number of items to process at once. Defaults to BATCH_UPLOAD_SIZE. + """ + + logger.info(f"Start {etl_name}") + with conn.cursor(cursor_factory=RealDictCursor) as cursor: + with open( + "applications/decisions/sql/modifications/application_modification_update_count.sql", + "r", + encoding="utf-8", + ) as sql_file: + count_query = sql_file.read() + cursor.execute(count_query) + count_total = dict(cursor.fetchone())["count"] + logger.info(f"Total Application Modifications data to updated: {count_total}") + + failed_updates = 0 + successful_updates_count = 0 + last_modification_id = 0 + + with open( + "applications/decisions/sql/modifications/application_modification_update.sql", + "r", + encoding="utf-8", + ) as sql_file: + query = sql_file.read() + while True: + cursor.execute( + f"{query} and orr.reconsideration_request_id > {last_modification_id} ORDER BY orr.reconsideration_request_id;" + ) + + rows = cursor.fetchmany(batch_size) + + if not rows: + break + try: + modifications_to_be_updated_count = len(rows) + + _update_application_modifications(conn, batch_size, cursor, rows) + + successful_updates_count = ( + successful_updates_count + modifications_to_be_updated_count + ) + last_modification_id = dict(rows[-1])["reconsideration_request_id"] + + logger.debug( + f"retrieved/updated items count: {modifications_to_be_updated_count}; total successfully update modifications so far {successful_updates_count}; last updated reconsideration_request_id: {last_modification_id}" + ) + except Exception as err: + logger.exception(err) + conn.rollback() + failed_updates = count_total - successful_updates_count + last_modification_id = last_modification_id + 1 + + logger.info( + f"Finished {etl_name}: total amount of successful updates {successful_updates_count}, total failed updates {failed_updates}" + ) + + +def _update_application_modifications(conn, batch_size, cursor, rows): + data = _prepare_oats_alr_applications_data(rows) + + if len(data) > 0: + execute_batch( + cursor, + _get_update_query(), + data, + page_size=batch_size, + ) + + conn.commit() + + +def _get_update_query(): + query = f""" + UPDATE alcs.application_modification + SET submitted_date = %(submitted_date)s + , review_outcome_code = %(review_outcome_code)s + , description = %(description)s + , oats_reconsideration_request_id = %(oats_reconsideration_request_id)s + WHERE alcs.application_modification."uuid" = %(modification_uuid)s + """ + return query + + +def _prepare_oats_alr_applications_data(row_data_list): + data_list = [] + for row in row_data_list: + mapped_row = { + "submitted_date": add_timezone_and_keep_date_part(row.get("received_date")), + "review_outcome_code": _map_outcome_code(row), + "modification_uuid": row.get("modification_uuid"), + "description": row.get("description"), + "oats_reconsideration_request_id": row.get("reconsideration_request_id"), + } + data_list.append(mapped_row) + + return data_list + + +def _map_outcome_code(row): + if row.get("approved_date", None) is not None: + return AlcsNoiModificationOutcomeCodeEnum.PROCEED_TO_MODIFY.value + else: + return AlcsNoiModificationOutcomeCodeEnum.PENDING.value diff --git a/bin/migrate-oats-data/applications/decisions/application_decisions_init.py b/bin/migrate-oats-data/applications/decisions/application_decisions_init.py index 0f37e128b9..b9d2e86268 100644 --- a/bin/migrate-oats-data/applications/decisions/application_decisions_init.py +++ b/bin/migrate-oats-data/applications/decisions/application_decisions_init.py @@ -3,6 +3,7 @@ setup_and_get_logger, add_timezone_and_keep_date_part, AlcsDecisionOutcomeCodeEnum, + BATCH_UPLOAD_SIZE, ) from db import inject_conn_pool from psycopg2.extras import RealDictCursor, execute_batch @@ -12,7 +13,7 @@ @inject_conn_pool -def init_application_decisions(conn=None, batch_size=1000): +def init_application_decisions(conn=None, batch_size=BATCH_UPLOAD_SIZE): """ This function is responsible for initializing the application_decisions in ALCS. diff --git a/bin/migrate-oats-data/applications/decisions/sql/modifications/application_modification_insert.sql b/bin/migrate-oats-data/applications/decisions/sql/modifications/application_modification_insert.sql new file mode 100644 index 0000000000..643b538293 --- /dev/null +++ b/bin/migrate-oats-data/applications/decisions/sql/modifications/application_modification_insert.sql @@ -0,0 +1,22 @@ +WITH alcs_modifications_resulting_decisions AS ( + SELECT appm."uuid", + appm.submitted_date::DATE AS submitted_date, + appd.resolution_number, + appd.resolution_year, + appd.oats_alr_appl_decision_id + FROM alcs.application_modification appm + JOIN alcs.application_decision appd ON appd.modifies_uuid = appm."uuid" + JOIN alcs.application app ON app."uuid" = appm.application_uuid +) +SELECT orr.reconsideration_request_id, + orr.received_date, + orr.approved_date, + app."uuid" AS app_uuid, + orr.description +FROM oats.oats_reconsideration_requests orr + JOIN oats.oats_alr_appl_decisions oaad ON oaad.reconsideration_request_id = orr.reconsideration_request_id + JOIN alcs.application app ON app.file_number = oaad.alr_application_id::TEXT + OR app.file_number = orr.alr_application_id::TEXT -- this IS required to get oats_recons only for apps + LEFT JOIN alcs_modifications_resulting_decisions AS amrd ON amrd.oats_alr_appl_decision_id = oaad.alr_appl_decision_id + AND amrd.submitted_date = orr.received_date::DATE +WHERE amrd."uuid" IS NULL \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/decisions/sql/modifications/application_modification_insert_count.sql b/bin/migrate-oats-data/applications/decisions/sql/modifications/application_modification_insert_count.sql new file mode 100644 index 0000000000..849e352b56 --- /dev/null +++ b/bin/migrate-oats-data/applications/decisions/sql/modifications/application_modification_insert_count.sql @@ -0,0 +1,18 @@ +WITH alcs_modifications_resulting_decisions AS ( + SELECT appm."uuid", + appm.submitted_date::DATE AS submitted_date, + appd.resolution_number, + appd.resolution_year, + appd.oats_alr_appl_decision_id + FROM alcs.application_modification appm + JOIN alcs.application_decision appd ON appd.modifies_uuid = appm."uuid" + JOIN alcs.application app ON app."uuid" = appm.application_uuid +) +SELECT count(*) +FROM oats.oats_reconsideration_requests orr + JOIN oats.oats_alr_appl_decisions oaad ON oaad.reconsideration_request_id = orr.reconsideration_request_id + JOIN alcs.application app ON app.file_number = oaad.alr_application_id::TEXT + OR app.file_number = orr.alr_application_id::TEXT -- this IS required to get oats_recons only for apps + LEFT JOIN alcs_modifications_resulting_decisions AS amrd ON amrd.oats_alr_appl_decision_id = oaad.alr_appl_decision_id + AND amrd.submitted_date = orr.received_date::DATE +WHERE amrd."uuid" IS NULL; \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/decisions/sql/modifications/application_modification_link_to_decisions.sql b/bin/migrate-oats-data/applications/decisions/sql/modifications/application_modification_link_to_decisions.sql new file mode 100644 index 0000000000..253b49731a --- /dev/null +++ b/bin/migrate-oats-data/applications/decisions/sql/modifications/application_modification_link_to_decisions.sql @@ -0,0 +1,8 @@ +SELECT appm."uuid" as modification_uuid, + appd."uuid" as decision_uuid, + orr.reconsideration_request_id +FROM oats.oats_reconsideration_requests orr + JOIN oats.oats_alr_appl_decisions oaad ON oaad.reconsideration_request_id = orr.reconsideration_request_id + JOIN alcs.application_decision appd ON appd.oats_alr_appl_decision_id = oaad.alr_appl_decision_id + JOIN alcs.application_modification appm ON appm.oats_reconsideration_request_id = orr.reconsideration_request_id +WHERE appd.modifies_uuid IS NULL \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/decisions/sql/modifications/application_modification_link_to_decisions_count.sql b/bin/migrate-oats-data/applications/decisions/sql/modifications/application_modification_link_to_decisions_count.sql new file mode 100644 index 0000000000..65256c8334 --- /dev/null +++ b/bin/migrate-oats-data/applications/decisions/sql/modifications/application_modification_link_to_decisions_count.sql @@ -0,0 +1,6 @@ +SELECT count(*) +FROM oats.oats_reconsideration_requests orr + JOIN oats.oats_alr_appl_decisions oaad ON oaad.reconsideration_request_id = orr.reconsideration_request_id + JOIN alcs.application_decision appd ON appd.oats_alr_appl_decision_id = oaad.alr_appl_decision_id + JOIN alcs.application_modification appm ON appm.oats_reconsideration_request_id = orr.reconsideration_request_id +WHERE appd.modifies_uuid IS NULL \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/decisions/sql/modifications/application_modification_update.sql b/bin/migrate-oats-data/applications/decisions/sql/modifications/application_modification_update.sql new file mode 100644 index 0000000000..b269962746 --- /dev/null +++ b/bin/migrate-oats-data/applications/decisions/sql/modifications/application_modification_update.sql @@ -0,0 +1,24 @@ +WITH alcs_modifications_resulting_decisions AS ( + SELECT appm."uuid" AS modification_uuid, + appm.submitted_date::DATE AS submitted_date, + appd.resolution_number, + appd.resolution_year, + appd.oats_alr_appl_decision_id, + appm.audit_created_by + FROM alcs.application_modification appm + JOIN alcs.application_decision appd ON appd.modifies_uuid = appm."uuid" + JOIN alcs.application app ON app."uuid" = appm.application_uuid +) +SELECT orr.reconsideration_request_id, + orr.received_date, + orr.approved_date, + app."uuid" AS app_uuid, + orr.description, + amrd.modification_uuid +FROM oats.oats_reconsideration_requests orr + JOIN oats.oats_alr_appl_decisions oaad ON oaad.reconsideration_request_id = orr.reconsideration_request_id + JOIN alcs.application app ON app.file_number = oaad.alr_application_id::TEXT + OR app.file_number = orr.alr_application_id::TEXT -- this is required to get oats_recons only for apps + JOIN alcs_modifications_resulting_decisions AS amrd ON amrd.oats_alr_appl_decision_id = oaad.alr_appl_decision_id + AND amrd.submitted_date = orr.received_date::DATE -- this will make sure that only modifications that exist in oats will be selected +WHERE amrd.audit_created_by <> 'oats_etl' \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/decisions/sql/modifications/application_modification_update_count.sql b/bin/migrate-oats-data/applications/decisions/sql/modifications/application_modification_update_count.sql new file mode 100644 index 0000000000..218adbf277 --- /dev/null +++ b/bin/migrate-oats-data/applications/decisions/sql/modifications/application_modification_update_count.sql @@ -0,0 +1,19 @@ +WITH alcs_modifications_resulting_decisions AS ( + SELECT appm."uuid" AS modification_uuid, + appm.submitted_date::DATE AS submitted_date, + appd.resolution_number, + appd.resolution_year, + appd.oats_alr_appl_decision_id, + appm.audit_created_by + FROM alcs.application_modification appm + JOIN alcs.application_decision appd ON appd.modifies_uuid = appm."uuid" + JOIN alcs.application app ON app."uuid" = appm.application_uuid +) +SELECT count(*) +FROM oats.oats_reconsideration_requests orr + JOIN oats.oats_alr_appl_decisions oaad ON oaad.reconsideration_request_id = orr.reconsideration_request_id + JOIN alcs.application app ON app.file_number = oaad.alr_application_id::TEXT + OR app.file_number = orr.alr_application_id::TEXT -- this is required to get oats_recons only for apps + JOIN alcs_modifications_resulting_decisions AS amrd ON amrd.oats_alr_appl_decision_id = oaad.alr_appl_decision_id + AND amrd.submitted_date = orr.received_date::DATE -- this will make sure that only modifications that exist in oats will be selected +WHERE amrd.audit_created_by <> 'oats_etl' \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/migrate_application.py b/bin/migrate-oats-data/applications/migrate_application.py index 3718acbbf6..5318e6c987 100644 --- a/bin/migrate-oats-data/applications/migrate_application.py +++ b/bin/migrate-oats-data/applications/migrate_application.py @@ -21,6 +21,13 @@ clean_application_staff_journal, ) from .decisions import clean_application_decisions, init_application_decisions +from .decisions.app_modifications import ( + init_application_modifications, + clean_application_modifications, + update_application_modifications, + link_application_modifications, + unlink_application_modifications, +) def process_application_etl(batch_size): @@ -39,7 +46,7 @@ def clean_alcs_applications(): clean_application_submission_status_emails() clean_application_staff_journal() clean_application_parcels() - clean_application_decisions() + clean_application_decisions_etl() clean_app_submissions() clean_applications() @@ -50,6 +57,15 @@ def init_applications(batch_size): def process_application_decisions(batch_size): init_application_decisions(batch_size) + init_application_modifications(batch_size) + update_application_modifications(batch_size) + link_application_modifications(batch_size) + + +def clean_application_decisions_etl(): + unlink_application_modifications() + clean_application_modifications() + clean_application_decisions() def clean_application_parcels(): diff --git a/bin/migrate-oats-data/documents/alcs_documents_to_app_documents.py b/bin/migrate-oats-data/documents/alcs_documents_to_app_documents.py index 127f7791ce..eeb7a65efa 100644 --- a/bin/migrate-oats-data/documents/alcs_documents_to_app_documents.py +++ b/bin/migrate-oats-data/documents/alcs_documents_to_app_documents.py @@ -1,4 +1,5 @@ from db import inject_conn_pool +from common import BATCH_UPLOAD_SIZE """ This script links data from ALCS documents table to ALCS application_documents table based on data from OATS. @@ -32,7 +33,7 @@ def compile_document_insert_query(number_of_rows_to_insert): @inject_conn_pool -def link_alcs_docs_to_app_docs(conn=None, batch_size=10000): +def link_alcs_docs_to_app_docs(conn=None, batch_size=BATCH_UPLOAD_SIZE): """ function uses a decorator pattern @inject_conn_pool to inject a database connection pool to the function. It fetches the total count of documents and prints it to the console. Then, it fetches the documents to insert in batches using document IDs, constructs an insert query, and processes them. """ diff --git a/bin/migrate-oats-data/documents/alcs_documents_to_noi_documents.py b/bin/migrate-oats-data/documents/alcs_documents_to_noi_documents.py index 55f777969b..5b0d8367e4 100644 --- a/bin/migrate-oats-data/documents/alcs_documents_to_noi_documents.py +++ b/bin/migrate-oats-data/documents/alcs_documents_to_noi_documents.py @@ -1,4 +1,5 @@ from db import inject_conn_pool +from common import BATCH_UPLOAD_SIZE """ This script links data from ALCS documents table to ALCS notice_of_intent_document table based on data from OATS. @@ -32,7 +33,7 @@ def compile_document_insert_query(number_of_rows_to_insert): @inject_conn_pool -def link_alcs_docs_to_noi_docs(conn=None, batch_size=10000): +def link_alcs_docs_to_noi_docs(conn=None, batch_size=BATCH_UPLOAD_SIZE): """ function uses a decorator pattern @inject_conn_pool to inject a database connection pool to the function. It fetches the total count of documents and prints it to the console. Then, it fetches the documents to insert in batches using document IDs, constructs an insert query, and processes them. """ diff --git a/bin/migrate-oats-data/documents/oats_documents_to_alcs_documents_app.py b/bin/migrate-oats-data/documents/oats_documents_to_alcs_documents_app.py index 585f8804c3..fa267972b9 100644 --- a/bin/migrate-oats-data/documents/oats_documents_to_alcs_documents_app.py +++ b/bin/migrate-oats-data/documents/oats_documents_to_alcs_documents_app.py @@ -1,4 +1,5 @@ from db import inject_conn_pool +from common import BATCH_UPLOAD_SIZE """ This script connects to postgress version of OATS DB and transfers data from OATS documents table to ALCS documents table. @@ -31,7 +32,7 @@ def compile_document_insert_query(number_of_rows_to_insert): @inject_conn_pool -def import_oats_app_documents(conn=None, batch_size=10000): +def import_oats_app_documents(conn=None, batch_size=BATCH_UPLOAD_SIZE): """ function uses a decorator pattern @inject_conn_pool to inject a database connection pool to the function. It fetches the total count of documents and prints it to the console. Then, it fetches the documents to insert in batches using document IDs, constructs an insert query, and processes them. """ diff --git a/bin/migrate-oats-data/documents/oats_documents_to_alcs_documents_noi.py b/bin/migrate-oats-data/documents/oats_documents_to_alcs_documents_noi.py index f3bc36088e..0439a3b25d 100644 --- a/bin/migrate-oats-data/documents/oats_documents_to_alcs_documents_noi.py +++ b/bin/migrate-oats-data/documents/oats_documents_to_alcs_documents_noi.py @@ -1,4 +1,5 @@ from db import inject_conn_pool +from common import BATCH_UPLOAD_SIZE """ This script connects to postgress version of OATS DB and transfers data from OATS documents table to ALCS document table. @@ -31,7 +32,7 @@ def compile_document_insert_query(number_of_rows_to_insert): @inject_conn_pool -def import_oats_noi_documents(conn=None, batch_size=10000): +def import_oats_noi_documents(conn=None, batch_size=BATCH_UPLOAD_SIZE): """ function uses a decorator pattern @inject_conn_pool to inject a database connection pool to the function. It fetches the total count of documents and prints it to the console. Then, it fetches the documents to insert in batches using document IDs, constructs an insert query, and processes them. """ diff --git a/bin/migrate-oats-data/noi/noi_decisions/noi_components/notice_of_intent_decision_components_init.py b/bin/migrate-oats-data/noi/noi_decisions/noi_components/notice_of_intent_decision_components_init.py index 44d65aa7c4..b01d694816 100644 --- a/bin/migrate-oats-data/noi/noi_decisions/noi_components/notice_of_intent_decision_components_init.py +++ b/bin/migrate-oats-data/noi/noi_decisions/noi_components/notice_of_intent_decision_components_init.py @@ -5,6 +5,7 @@ ALRChangeCode, OatsToAlcsAgCap, OatsToAlcsAgCapSource, + BATCH_UPLOAD_SIZE ) from db import inject_conn_pool from psycopg2.extras import RealDictCursor, execute_batch @@ -14,7 +15,7 @@ @inject_conn_pool -def init_notice_of_intent_decision_components(conn=None, batch_size=1000): +def init_notice_of_intent_decision_components(conn=None, batch_size=BATCH_UPLOAD_SIZE): """ This function is responsible for initializing the notice_of_intent_decision_components in ALCS. diff --git a/bin/migrate-oats-data/noi/noi_decisions/noi_components/notice_of_intent_decision_components_soil_details_update.py b/bin/migrate-oats-data/noi/noi_decisions/noi_components/notice_of_intent_decision_components_soil_details_update.py index 1b1dd061b4..94ae0ba4c8 100644 --- a/bin/migrate-oats-data/noi/noi_decisions/noi_components/notice_of_intent_decision_components_soil_details_update.py +++ b/bin/migrate-oats-data/noi/noi_decisions/noi_components/notice_of_intent_decision_components_soil_details_update.py @@ -1,4 +1,9 @@ -from common import setup_and_get_logger, SoilChangeCode, NO_DATA_IN_OATS +from common import ( + setup_and_get_logger, + SoilChangeCode, + NO_DATA_IN_OATS, + BATCH_UPLOAD_SIZE, +) from db import inject_conn_pool from psycopg2.extras import RealDictCursor, execute_batch @@ -7,7 +12,9 @@ @inject_conn_pool -def update_notice_of_intent_decision_component_soil_details(conn=None, batch_size=1000): +def update_notice_of_intent_decision_component_soil_details( + conn=None, batch_size=BATCH_UPLOAD_SIZE +): """ This function is responsible for updating existing the notice_of_intent_decision_component in ALCS. diff --git a/bin/migrate-oats-data/noi/noi_decisions/noi_conditions/notice_of_intent_conditions_init.py b/bin/migrate-oats-data/noi/noi_decisions/noi_conditions/notice_of_intent_conditions_init.py index cfd32d7fd4..6ce4b61adc 100644 --- a/bin/migrate-oats-data/noi/noi_decisions/noi_conditions/notice_of_intent_conditions_init.py +++ b/bin/migrate-oats-data/noi/noi_decisions/noi_conditions/notice_of_intent_conditions_init.py @@ -3,6 +3,7 @@ setup_and_get_logger, add_timezone_and_keep_date_part, OatsToAlcsConditionTypeMapping, + BATCH_UPLOAD_SIZE ) from db import inject_conn_pool from psycopg2.extras import RealDictCursor, execute_batch @@ -12,7 +13,7 @@ @inject_conn_pool -def init_notice_of_intent_conditions(conn=None, batch_size=1000): +def init_notice_of_intent_conditions(conn=None, batch_size=BATCH_UPLOAD_SIZE): """ This function is responsible for initializing the notice_of_intent_conditions in ALCS. diff --git a/bin/migrate-oats-data/noi/noi_decisions/noi_conditions/notice_of_intent_conditions_link.py b/bin/migrate-oats-data/noi/noi_decisions/noi_conditions/notice_of_intent_conditions_link.py index ea70045fd9..79801559c6 100644 --- a/bin/migrate-oats-data/noi/noi_decisions/noi_conditions/notice_of_intent_conditions_link.py +++ b/bin/migrate-oats-data/noi/noi_decisions/noi_conditions/notice_of_intent_conditions_link.py @@ -1,6 +1,7 @@ from common import ( OATS_ETL_USER, setup_and_get_logger, + BATCH_UPLOAD_SIZE ) from db import inject_conn_pool from psycopg2.extras import RealDictCursor, execute_batch @@ -10,7 +11,7 @@ @inject_conn_pool -def link_notice_of_intent_conditions(conn=None, batch_size=1000): +def link_notice_of_intent_conditions(conn=None, batch_size=BATCH_UPLOAD_SIZE): """ This function is responsible for initializing the notice_of_intent_decision_condition_component in ALCS. diff --git a/bin/migrate-oats-data/noi/noi_decisions/noi_conditions/notice_of_intent_conditions_update.py b/bin/migrate-oats-data/noi/noi_decisions/noi_conditions/notice_of_intent_conditions_update.py index 8931b4fd53..6dbd95768d 100644 --- a/bin/migrate-oats-data/noi/noi_decisions/noi_conditions/notice_of_intent_conditions_update.py +++ b/bin/migrate-oats-data/noi/noi_decisions/noi_conditions/notice_of_intent_conditions_update.py @@ -1,5 +1,6 @@ from common import ( setup_and_get_logger, + BATCH_UPLOAD_SIZE ) from db import inject_conn_pool from psycopg2.extras import RealDictCursor, execute_batch @@ -9,7 +10,7 @@ @inject_conn_pool -def update_notice_of_intent_conditions(conn=None, batch_size=1000): +def update_notice_of_intent_conditions(conn=None, batch_size=BATCH_UPLOAD_SIZE): """ This function is responsible for updating existing the notice_of_intent_decision_condition in ALCS. diff --git a/bin/migrate-oats-data/noi/noi_decisions/noi_modifications/notice_of_intent_modifications_init.py b/bin/migrate-oats-data/noi/noi_decisions/noi_modifications/notice_of_intent_modifications_init.py index 0242c7f67c..3e0e9317fb 100644 --- a/bin/migrate-oats-data/noi/noi_decisions/noi_modifications/notice_of_intent_modifications_init.py +++ b/bin/migrate-oats-data/noi/noi_decisions/noi_modifications/notice_of_intent_modifications_init.py @@ -3,6 +3,7 @@ setup_and_get_logger, add_timezone_and_keep_date_part, AlcsNoiModificationOutcomeCodeEnum, + BATCH_UPLOAD_SIZE, ) from db import inject_conn_pool from psycopg2.extras import RealDictCursor, execute_batch @@ -12,7 +13,7 @@ @inject_conn_pool -def init_notice_of_intent_modifications(conn=None, batch_size=1000): +def init_notice_of_intent_modifications(conn=None, batch_size=BATCH_UPLOAD_SIZE): """ This function is responsible for initializing the notice_of_intent_modification in ALCS. diff --git a/bin/migrate-oats-data/noi/noi_decisions/noi_modifications/notice_of_intent_modifications_link.py b/bin/migrate-oats-data/noi/noi_decisions/noi_modifications/notice_of_intent_modifications_link.py index 1db028025a..83638277cd 100644 --- a/bin/migrate-oats-data/noi/noi_decisions/noi_modifications/notice_of_intent_modifications_link.py +++ b/bin/migrate-oats-data/noi/noi_decisions/noi_modifications/notice_of_intent_modifications_link.py @@ -1,6 +1,7 @@ from common import ( OATS_ETL_USER, setup_and_get_logger, + BATCH_UPLOAD_SIZE ) from db import inject_conn_pool from psycopg2.extras import RealDictCursor, execute_batch @@ -10,7 +11,7 @@ @inject_conn_pool -def link_notice_of_intent_modifications(conn=None, batch_size=1000): +def link_notice_of_intent_modifications(conn=None, batch_size=BATCH_UPLOAD_SIZE): """ This function is responsible for linking notice_of_intent_modification to notice_of_intent_decisions in ALCS. diff --git a/bin/migrate-oats-data/noi/noi_decisions/noi_modifications/notice_of_intent_modifications_update.py b/bin/migrate-oats-data/noi/noi_decisions/noi_modifications/notice_of_intent_modifications_update.py index 1c67187d62..0cadcbd1f2 100644 --- a/bin/migrate-oats-data/noi/noi_decisions/noi_modifications/notice_of_intent_modifications_update.py +++ b/bin/migrate-oats-data/noi/noi_decisions/noi_modifications/notice_of_intent_modifications_update.py @@ -2,6 +2,7 @@ setup_and_get_logger, add_timezone_and_keep_date_part, AlcsNoiModificationOutcomeCodeEnum, + BATCH_UPLOAD_SIZE, ) from db import inject_conn_pool from psycopg2.extras import RealDictCursor, execute_batch @@ -11,7 +12,7 @@ @inject_conn_pool -def update_notice_of_intent_modifications(conn=None, batch_size=1000): +def update_notice_of_intent_modifications(conn=None, batch_size=BATCH_UPLOAD_SIZE): """ This function is responsible for updating existing the notice_of_intent_modification in ALCS. diff --git a/bin/migrate-oats-data/noi/noi_decisions/notice_of_intent_decisions_init.py b/bin/migrate-oats-data/noi/noi_decisions/notice_of_intent_decisions_init.py index 547b09d7d5..f6252e78d6 100644 --- a/bin/migrate-oats-data/noi/noi_decisions/notice_of_intent_decisions_init.py +++ b/bin/migrate-oats-data/noi/noi_decisions/notice_of_intent_decisions_init.py @@ -2,6 +2,7 @@ OATS_ETL_USER, setup_and_get_logger, add_timezone_and_keep_date_part, + BATCH_UPLOAD_SIZE ) from db import inject_conn_pool from psycopg2.extras import RealDictCursor, execute_batch @@ -11,7 +12,7 @@ @inject_conn_pool -def init_notice_of_intent_decisions(conn=None, batch_size=1000): +def init_notice_of_intent_decisions(conn=None, batch_size=BATCH_UPLOAD_SIZE): """ This function is responsible for initializing the notice_of_intent_decisions in ALCS. diff --git a/bin/migrate-oats-data/noi/notice_of_intent_init.py b/bin/migrate-oats-data/noi/notice_of_intent_init.py index f6be7cea28..facb47c93d 100644 --- a/bin/migrate-oats-data/noi/notice_of_intent_init.py +++ b/bin/migrate-oats-data/noi/notice_of_intent_init.py @@ -3,6 +3,7 @@ setup_and_get_logger, exclusion_table_create, exclusion_table_count, + BATCH_UPLOAD_SIZE ) from db import inject_conn_pool @@ -11,7 +12,7 @@ @inject_conn_pool -def init_notice_of_intents(conn=None, batch_size=10000): +def init_notice_of_intents(conn=None, batch_size=BATCH_UPLOAD_SIZE): logger.info(f"Start {etl_name}") with conn.cursor() as cursor: exclusion_table_create(cursor, conn) diff --git a/services/apps/alcs/src/alcs/admin/unarchive-card/unarchive-card.service.ts b/services/apps/alcs/src/alcs/admin/unarchive-card/unarchive-card.service.ts index e62ce00fe2..083ca4d862 100644 --- a/services/apps/alcs/src/alcs/admin/unarchive-card/unarchive-card.service.ts +++ b/services/apps/alcs/src/alcs/admin/unarchive-card/unarchive-card.service.ts @@ -81,7 +81,7 @@ export class UnarchiveCardService { await this.modificationService.getDeletedCards(fileId); for (const modification of modifications) { result.push({ - cardUuid: modification.cardUuid, + cardUuid: modification.cardUuid ?? '', createdAt: modification.auditCreatedAt.getTime(), type: 'Modification', status: modification.card!.status.label, diff --git a/services/apps/alcs/src/alcs/application-decision/application-modification/application-modification.entity.ts b/services/apps/alcs/src/alcs/application-decision/application-modification/application-modification.entity.ts index 2f8b6f3c4f..b324a7972a 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-modification/application-modification.entity.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-modification/application-modification.entity.ts @@ -65,8 +65,8 @@ export class ApplicationModification extends Base { card: Card | null; @AutoMap() - @Column({ type: 'uuid' }) - cardUuid: string; + @Column({ type: 'uuid', nullable: true }) + cardUuid: string | null; @ManyToMany(() => ApplicationDecision, (decision) => decision.modifiedBy) @JoinTable({ @@ -76,4 +76,13 @@ export class ApplicationModification extends Base { @OneToOne(() => ApplicationDecision, (dec) => dec.modifies) resultingDecision?: ApplicationDecision; + + @Column({ + select: false, + nullable: true, + type: 'int8', + comment: + 'This column is NOT related to any functionality in ALCS. It is only used for ETL and backtracking of imported data from OATS. It links oats.oats_reconsideration_requests to alcs.application_modification.', + }) + oatsReconsiderationRequestId: number; } diff --git a/services/apps/alcs/src/alcs/application-decision/application-modification/application-modification.service.spec.ts b/services/apps/alcs/src/alcs/application-decision/application-modification/application-modification.service.spec.ts index d13cff36f5..bbd87ae758 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-modification/application-modification.service.spec.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-modification/application-modification.service.spec.ts @@ -1,9 +1,9 @@ import { ServiceNotFoundException } from '@app/common/exceptions/base.exception'; -import { classes } from 'automapper-classes'; -import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { FindOptionsRelations, IsNull, Repository } from 'typeorm'; import { initApplicationMockEntity, @@ -249,13 +249,30 @@ describe('ApplicationModificationService', () => { await service.delete(uuid); - expect(modificationRepoMock.findOneBy).toBeCalledWith({ + expect(modificationRepoMock.findOneBy).toHaveBeenCalledWith({ uuid, }); expect(modificationRepoMock.softRemove).toHaveBeenCalledTimes(1); expect(cardServiceMock.archive).toHaveBeenCalledTimes(1); }); + it('should not call archive card if modification does not have card attached (only modifications imported from OATS) on delete', async () => { + const uuid = 'fake'; + modificationRepoMock.findOneBy.mockResolvedValue( + new ApplicationModification(), + ); + modificationRepoMock.softRemove.mockResolvedValue({} as any); + cardServiceMock.archive.mockResolvedValue(); + + await service.delete(uuid); + + expect(modificationRepoMock.findOneBy).toHaveBeenCalledWith({ + uuid, + }); + expect(modificationRepoMock.softRemove).toHaveBeenCalledTimes(1); + expect(cardServiceMock.archive).toHaveBeenCalledTimes(0); + }); + it('should fail on delete if modification does not exist', async () => { const uuid = 'fake'; modificationRepoMock.findOneBy.mockResolvedValue(null); diff --git a/services/apps/alcs/src/alcs/application-decision/application-modification/application-modification.service.ts b/services/apps/alcs/src/alcs/application-decision/application-modification/application-modification.service.ts index 7d055f44c4..505901956e 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-modification/application-modification.service.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-modification/application-modification.service.ts @@ -1,8 +1,8 @@ import { ServiceNotFoundException } from '@app/common/exceptions/base.exception'; -import { Mapper } from 'automapper-core'; -import { InjectMapper } from 'automapper-nestjs'; import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; +import { Mapper } from 'automapper-core'; +import { InjectMapper } from 'automapper-nestjs'; import { FindOptionsRelations, FindOptionsWhere, @@ -196,7 +196,10 @@ export class ApplicationModificationService { async delete(uuid: string) { const modification = await this.getByUuidOrFail(uuid); - await this.cardService.archive(modification.cardUuid); + if (modification.cardUuid) { + await this.cardService.archive(modification.cardUuid); + } + return this.modificationRepository.softRemove([modification]); } diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1704394923698-add_oats_id_to_application_modification.ts b/services/apps/alcs/src/providers/typeorm/migrations/1704394923698-add_oats_id_to_application_modification.ts new file mode 100644 index 0000000000..836cfd72e3 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1704394923698-add_oats_id_to_application_modification.ts @@ -0,0 +1,25 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class AddOatsIdToApplicationModification1704394923698 + implements MigrationInterface +{ + name = 'AddOatsIdToApplicationModification1704394923698'; + + public async up(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `ALTER TABLE "alcs"."application_modification" ADD "oats_reconsideration_request_id" bigint`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."application_modification"."oats_reconsideration_request_id" IS 'This column is NOT related to any functionality in ALCS. It is only used for ETL and backtracking of imported data from OATS. It links oats.oats_reconsideration_requests to alcs.application_modification.'`, + ); + } + + public async down(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."application_modification"."oats_reconsideration_request_id" IS 'This column is NOT related to any functionality in ALCS. It is only used for ETL and backtracking of imported data from OATS. It links oats.oats_reconsideration_requests to alcs.application_modification.'`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_modification" DROP COLUMN "oats_reconsideration_request_id"`, + ); + } +} diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1704395559610-make_card_uuid_nullable_for_app_modification.ts b/services/apps/alcs/src/providers/typeorm/migrations/1704395559610-make_card_uuid_nullable_for_app_modification.ts new file mode 100644 index 0000000000..38e0a6b826 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1704395559610-make_card_uuid_nullable_for_app_modification.ts @@ -0,0 +1,31 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class MakeCardUuidNullableForAppModification1704395559610 + implements MigrationInterface +{ + name = 'MakeCardUuidNullableForAppModification1704395559610'; + + public async up(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `ALTER TABLE "alcs"."application_modification" DROP CONSTRAINT "FK_cd2e34439334004189a8767b960"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_modification" ALTER COLUMN "card_uuid" DROP NOT NULL`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_modification" ADD CONSTRAINT "FK_cd2e34439334004189a8767b960" FOREIGN KEY ("card_uuid") REFERENCES "alcs"."card"("uuid") ON DELETE NO ACTION ON UPDATE NO ACTION`, + ); + } + + public async down(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `ALTER TABLE "alcs"."application_modification" DROP CONSTRAINT "FK_cd2e34439334004189a8767b960"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_modification" ALTER COLUMN "card_uuid" SET NOT NULL`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_modification" ADD CONSTRAINT "FK_cd2e34439334004189a8767b960" FOREIGN KEY ("card_uuid") REFERENCES "alcs"."card"("uuid") ON DELETE NO ACTION ON UPDATE NO ACTION`, + ); + } +} diff --git a/services/apps/alcs/test/mocks/mockEntities.ts b/services/apps/alcs/test/mocks/mockEntities.ts index 78e86191f5..9de8fb094f 100644 --- a/services/apps/alcs/test/mocks/mockEntities.ts +++ b/services/apps/alcs/test/mocks/mockEntities.ts @@ -147,7 +147,7 @@ const initApplicationModificationMockEntity = ( card?: Card, ): ApplicationModification => { const app = application ?? initApplicationMockEntity(); - const reconsideration = new ApplicationModification({ + const modification = new ApplicationModification({ application: app, applicationUuid: app.uuid, auditCreatedAt: new Date(1, 1, 1, 1, 1, 1, 1), @@ -161,10 +161,10 @@ const initApplicationModificationMockEntity = ( }); const cardEntity = card ?? initCardMockEntity('222'); - reconsideration.card = cardEntity; - reconsideration.cardUuid = cardEntity.uuid; + modification.card = cardEntity; + modification.cardUuid = cardEntity.uuid; - return reconsideration; + return modification; }; const initApplicationMockEntity = (fileNumber?: string): Application => { From f742aa51e10cd9440f1d323cc7225cb42012f3cf Mon Sep 17 00:00:00 2001 From: Liam Stoddard <lstodd@protonmail.com> Date: Thu, 4 Jan 2024 16:18:01 -0800 Subject: [PATCH 871/954] init LG app submission review --- .../applications/migrate_application.py | 4 + .../applications/submissions/__init__.py | 1 + .../submissions/review/__init__.py | 1 + .../review/lg_submission_review.py | 191 ++++++++++++++++++ .../sql/review/app_submission_review.sql | 21 ++ .../review/app_submission_review_count.sql | 7 + 6 files changed, 225 insertions(+) create mode 100644 bin/migrate-oats-data/applications/submissions/review/__init__.py create mode 100644 bin/migrate-oats-data/applications/submissions/review/lg_submission_review.py create mode 100644 bin/migrate-oats-data/applications/submissions/sql/review/app_submission_review.sql create mode 100644 bin/migrate-oats-data/applications/submissions/sql/review/app_submission_review_count.sql diff --git a/bin/migrate-oats-data/applications/migrate_application.py b/bin/migrate-oats-data/applications/migrate_application.py index 3718acbbf6..8380155e9b 100644 --- a/bin/migrate-oats-data/applications/migrate_application.py +++ b/bin/migrate-oats-data/applications/migrate_application.py @@ -8,6 +8,8 @@ clean_parcel_owners, process_application_owners, clean_primary_contacts, + insert_application_submission_review, + clean_reviews ) from .base_applications import process_applications, clean_applications from .app_prep import process_alcs_application_prep_fields @@ -32,11 +34,13 @@ def process_application_etl(batch_size): process_application_owners(batch_size) process_app_staff_journal(batch_size) process_application_decisions(batch_size) + insert_application_submission_review(batch_size) process_application_submission_status_emails() def clean_alcs_applications(): clean_application_submission_status_emails() + clean_reviews() clean_application_staff_journal() clean_application_parcels() clean_application_decisions() diff --git a/bin/migrate-oats-data/applications/submissions/__init__.py b/bin/migrate-oats-data/applications/submissions/__init__.py index 806ea15f92..92e9420006 100644 --- a/bin/migrate-oats-data/applications/submissions/__init__.py +++ b/bin/migrate-oats-data/applications/submissions/__init__.py @@ -13,3 +13,4 @@ process_application_parcels, ) from .migrate_application_owners import process_application_owners +from .review import insert_application_submission_review, clean_reviews \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/submissions/review/__init__.py b/bin/migrate-oats-data/applications/submissions/review/__init__.py new file mode 100644 index 0000000000..4aa6988f4b --- /dev/null +++ b/bin/migrate-oats-data/applications/submissions/review/__init__.py @@ -0,0 +1 @@ +from .lg_submission_review import insert_application_submission_review, clean_reviews \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/submissions/review/lg_submission_review.py b/bin/migrate-oats-data/applications/submissions/review/lg_submission_review.py new file mode 100644 index 0000000000..1fd497cc83 --- /dev/null +++ b/bin/migrate-oats-data/applications/submissions/review/lg_submission_review.py @@ -0,0 +1,191 @@ +from common import ( + setup_and_get_logger, + BATCH_UPLOAD_SIZE, + OATS_ETL_USER, + +) +from db import inject_conn_pool +from psycopg2.extras import RealDictCursor + +etl_name = "process_application_submission_lg_review" +logger = setup_and_get_logger(etl_name) + + +@inject_conn_pool +def insert_application_submission_review(conn=None, batch_size=BATCH_UPLOAD_SIZE): + logger.info(f"Start {etl_name}") + with conn.cursor(cursor_factory=RealDictCursor) as cursor: + with open( + "applications/submissions/sql/review/app_submission_review_count.sql", + "r", + encoding="utf-8", + ) as sql_file: + count_query = sql_file.read() + cursor.execute(count_query) + count_total = dict(cursor.fetchone())["count"] + logger.info(f"Total applications data to insert: {count_total}") + + failed_inserts = 0 + successful_updates_count = 0 + last_application_id = 0 + + with open( + "applications/submissions/sql/review/app_submission_review.sql", + "r", + encoding="utf-8", + ) as sql_file: + application_sql = sql_file.read() + while True: + cursor.execute( + f"{application_sql} WHERE olgr.alr_application_id > {last_application_id} ORDER BY olgr.alr_application_id;" + ) + + rows = cursor.fetchmany(batch_size) + + if not rows: + break + try: + records_to_be_inserted_count = len(rows) + + _insert_records(conn, cursor, rows) + + successful_updates_count = ( + successful_updates_count + records_to_be_inserted_count + ) + + last_record = dict(rows[-1]) + last_application_id = last_record["alr_application_id"] + + logger.debug( + f"retrieved/updated items count: {records_to_be_inserted_count}; total successfully insert applications owners so far {successful_updates_count}; last updated {last_application_id}" + ) + except Exception as err: + logger.exception(err) + conn.rollback() + failed_inserts = count_total - successful_updates_count + last_application_id = last_application_id + 1 + + logger.info( + f"Finished {etl_name}: total amount of successful inserts {successful_updates_count}, total failed inserts {failed_inserts}" + ) + + +def _insert_records(conn, cursor, rows): + number_of_rows_to_insert = len(rows) + + if number_of_rows_to_insert > 0: + insert_query = _compile_review_insert_query(number_of_rows_to_insert) + rows_to_insert = _prepare_data_to_insert(rows) + cursor.execute(insert_query, rows_to_insert) + conn.commit() + + +def _compile_review_insert_query(number_of_rows_to_insert): + reviews_to_insert = ",".join(["%s"] * number_of_rows_to_insert) + return f""" + INSERT INTO alcs.application_submission_review( + first_name, + last_name, + department, + position, + email, + phone_number, + is_ocp_designation, + ocp_bylaw_name, + ocp_designation, + ocp_consistent, + is_subject_to_zoning, + zoning_bylaw_name, + zoning_designation, + zoning_minimum_lot_size, + is_zoning_consistent, + application_file_number, + local_government_file_number, + audit_created_by + ) + VALUES{reviews_to_insert} + ON CONFLICT DO NOTHING; + """ + + +def _prepare_data_to_insert(rows): + row_without_last_element = [] + for row in rows: + mapped_row = _map_data(row) + row_without_last_element.append(tuple(mapped_row.values())) + + return row_without_last_element + + +def _map_data(row): + return { + "first_name": row["first_name"], + "last_name": row["last_name"], + "department": row["contact_department"], + "position": row["title"], + "email": row["email_address"], + "phone_number": row["phone_number"], + "is_ocp_designation": _map_ocp_designation(row), + "ocp_bylaw_name": row["community_pln_bylaw_name"], + "ocp_designation": row["community_pln_designation"], + "ocp_consistent": _map_ocp_consistency(row), + "is_subject_to_zoning": _map_zoning(row), + "zoning_bylaw_name": row["zoning_bylaw_name"], + "zoning_designation": row["zoning_designation"], + "zoning_minimum_lot_size": row["minimum_lot_hectares"], + "is_zoning_consistent": _map_zoning_consistency(row), + "application_file_number": row["alr_application_id"], + "local_government_file_number": row["local_gov_file_number"], + "audit_created_by": OATS_ETL_USER, + } + + + + +def _map_ocp_designation(ocp_value): + + if ocp_value["community_pln_compliance_ind"] == 'X': + return False + elif ocp_value["community_pln_compliance_ind"] == 'N': + return True + else: + return None + +def _map_ocp_consistency(ocp_value): + + if ocp_value["community_pln_compliance_ind"] == 'N': + return False + elif ocp_value["community_pln_compliance_ind"] == 'Y': + return True + else: + return None + +def _map_zoning(zoning_value): + + if zoning_value["zoning_compliance_ind"] == 'X': + return False + elif zoning_value["zoning_compliance_ind"] == 'N': + return True + else: + return None + +def _map_zoning_consistency(zoning_value): + + if zoning_value["zoning_compliance_ind"] == 'N': + return False + elif zoning_value["zoning_compliance_ind"] == 'Y': + return True + else: + return None + + +@inject_conn_pool +def clean_reviews(conn=None): + logger.info("Start application review cleaning") + with conn.cursor() as cursor: + cursor.execute( + f"DELETE FROM alcs.application_submission_review asr WHERE asr.audit_created_by = '{OATS_ETL_USER}'" + ) + logger.info(f"Deleted items count = {cursor.rowcount}") + conn.commit() + logger.info("Done application review cleaning") diff --git a/bin/migrate-oats-data/applications/submissions/sql/review/app_submission_review.sql b/bin/migrate-oats-data/applications/submissions/sql/review/app_submission_review.sql new file mode 100644 index 0000000000..80c4607e10 --- /dev/null +++ b/bin/migrate-oats-data/applications/submissions/sql/review/app_submission_review.sql @@ -0,0 +1,21 @@ +SELECT + olgr.local_gov_file_number, + olgr.alr_application_id, + olgr.zoning_compliance_ind, + olgr.zoning_bylaw_name, + olgr.zoning_designation, + olgr.minimum_lot_hectares, + olgr.community_pln_compliance_ind, + olgr.community_pln_bylaw_name, + olgr.community_pln_designation, + olgr.contact_department, + op.first_name, + op.last_name, + op.title, + opo.phone_number, + opo.email_address +FROM + alcs.application_submission as2 + JOIN oats.oats_local_government_reports olgr ON as2.file_number = olgr.alr_application_id::TEXT + LEFT JOIN oats.oats_person_organizations opo ON olgr.person_organization_id = opo.person_organization_id + LEFT JOIN oats.oats_persons op ON opo.person_id = op.person_id diff --git a/bin/migrate-oats-data/applications/submissions/sql/review/app_submission_review_count.sql b/bin/migrate-oats-data/applications/submissions/sql/review/app_submission_review_count.sql new file mode 100644 index 0000000000..0329ccf809 --- /dev/null +++ b/bin/migrate-oats-data/applications/submissions/sql/review/app_submission_review_count.sql @@ -0,0 +1,7 @@ +SELECT + COUNT(*) +FROM + alcs.application_submission as2 + JOIN oats.oats_local_government_reports olgr ON as2.file_number = olgr.alr_application_id::TEXT + LEFT JOIN oats.oats_person_organizations opo ON olgr.person_organization_id = opo.person_organization_id + LEFT JOIN oats.oats_persons op ON opo.person_id = op.person_id; \ No newline at end of file From cb8e8ecdcc1fff4872525574415a99bed232f860 Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Thu, 4 Jan 2024 16:18:54 -0800 Subject: [PATCH 872/954] Remove redundant owner list condition --- .../primary-contact/primary-contact.component.html | 2 +- .../primary-contact/primary-contact.component.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html index 379b7add56..73a8b73316 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html @@ -33,7 +33,7 @@ <h2>Primary Contact</h2> <!-- Owner --> <div *ngIf="selectedThirdPartyAgent === false && parcelOwners.length > 0"> - <label *ngIf="parcelOwners.length" + <label >Select a Primary Contact from the listed land owners <ng-container *ngIf="hasCrownParcels">and government contacts</ng-container></label > diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html index e539e15a70..b197fe5e3e 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html @@ -34,7 +34,7 @@ <h2>Primary Contact</h2> <!-- Owner --> <div *ngIf="selectedThirdPartyAgent === false && parcelOwners.length > 0"> - <label *ngIf="parcelOwners.length" + <label >Select a Primary Contact from the listed land owners <ng-container *ngIf="hasCrownParcels">and government contacts</ng-container></label > From a165d5aae401e0d614cae8736bd47d0fee7c49eb Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Thu, 4 Jan 2024 16:21:47 -0800 Subject: [PATCH 873/954] Only show owner list once selection is made --- .../primary-contact/primary-contact.component.html | 2 +- .../primary-contact/primary-contact.component.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html index 73a8b73316..d701e5c05e 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html @@ -32,7 +32,7 @@ <h2>Primary Contact</h2> </div> <!-- Owner --> - <div *ngIf="selectedThirdPartyAgent === false && parcelOwners.length > 0"> + <div *ngIf="isExistingOwner.value !== null && selectedThirdPartyAgent === false && parcelOwners.length > 0"> <label >Select a Primary Contact from the listed land owners <ng-container *ngIf="hasCrownParcels">and government contacts</ng-container></label diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html index b197fe5e3e..f87954a15b 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html @@ -33,7 +33,7 @@ <h2>Primary Contact</h2> </div> <!-- Owner --> - <div *ngIf="selectedThirdPartyAgent === false && parcelOwners.length > 0"> + <div *ngIf="isExistingOwner.value !== null && selectedThirdPartyAgent === false && parcelOwners.length > 0"> <label >Select a Primary Contact from the listed land owners <ng-container *ngIf="hasCrownParcels">and government contacts</ng-container></label From bbafef43eeaa70b4688ff0302e73115ea4a4cab0 Mon Sep 17 00:00:00 2001 From: Liam Stoddard <lstodd@protonmail.com> Date: Thu, 4 Jan 2024 16:37:05 -0800 Subject: [PATCH 874/954] fix typo --- .../applications/submissions/review/lg_submission_review.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/migrate-oats-data/applications/submissions/review/lg_submission_review.py b/bin/migrate-oats-data/applications/submissions/review/lg_submission_review.py index 1fd497cc83..c4eccb88f2 100644 --- a/bin/migrate-oats-data/applications/submissions/review/lg_submission_review.py +++ b/bin/migrate-oats-data/applications/submissions/review/lg_submission_review.py @@ -57,7 +57,7 @@ def insert_application_submission_review(conn=None, batch_size=BATCH_UPLOAD_SIZE last_application_id = last_record["alr_application_id"] logger.debug( - f"retrieved/updated items count: {records_to_be_inserted_count}; total successfully insert applications owners so far {successful_updates_count}; last updated {last_application_id}" + f"retrieved/updated items count: {records_to_be_inserted_count}; total successfully insert applications reviews so far {successful_updates_count}; last updated {last_application_id}" ) except Exception as err: logger.exception(err) From 0b5509d9e95bf213f0fc061f093bc49627bc804e Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Thu, 4 Jan 2024 17:27:28 -0800 Subject: [PATCH 875/954] fix styling for desktop --- .../naru-details/naru-details.component.scss | 2 +- .../application-details/nfu-details/nfu-details.component.scss | 2 +- .../pofo-details/pofo-details.component.scss | 2 +- .../roso-details/roso-details.component.scss | 2 +- .../pofo-details/pofo-details.component.scss | 2 +- .../roso-details/roso-details.component.scss | 2 +- .../submission/naru-details/naru-details.component.scss | 2 +- .../submission/nfu-details/nfu-details.component.scss | 2 +- .../submission/pofo-details/pofo-details.component.scss | 2 +- .../submission/roso-details/roso-details.component.scss | 2 +- .../submission/pofo-details/pofo-details.component.scss | 2 +- .../submission/roso-details/roso-details.component.scss | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/portal-frontend/src/app/features/applications/application-details/naru-details/naru-details.component.scss b/portal-frontend/src/app/features/applications/application-details/naru-details/naru-details.component.scss index beea863aef..63cfeaa16b 100644 --- a/portal-frontend/src/app/features/applications/application-details/naru-details/naru-details.component.scss +++ b/portal-frontend/src/app/features/applications/application-details/naru-details/naru-details.component.scss @@ -12,7 +12,7 @@ } @media screen and (min-width: $midBreakpoint) { - grid-template-columns: 0.95fr 1fr; + grid-template-columns: 0.95fr 3fr; grid-column-gap: rem(16); } } diff --git a/portal-frontend/src/app/features/applications/application-details/nfu-details/nfu-details.component.scss b/portal-frontend/src/app/features/applications/application-details/nfu-details/nfu-details.component.scss index beea863aef..63cfeaa16b 100644 --- a/portal-frontend/src/app/features/applications/application-details/nfu-details/nfu-details.component.scss +++ b/portal-frontend/src/app/features/applications/application-details/nfu-details/nfu-details.component.scss @@ -12,7 +12,7 @@ } @media screen and (min-width: $midBreakpoint) { - grid-template-columns: 0.95fr 1fr; + grid-template-columns: 0.95fr 3fr; grid-column-gap: rem(16); } } diff --git a/portal-frontend/src/app/features/applications/application-details/pofo-details/pofo-details.component.scss b/portal-frontend/src/app/features/applications/application-details/pofo-details/pofo-details.component.scss index beea863aef..63cfeaa16b 100644 --- a/portal-frontend/src/app/features/applications/application-details/pofo-details/pofo-details.component.scss +++ b/portal-frontend/src/app/features/applications/application-details/pofo-details/pofo-details.component.scss @@ -12,7 +12,7 @@ } @media screen and (min-width: $midBreakpoint) { - grid-template-columns: 0.95fr 1fr; + grid-template-columns: 0.95fr 3fr; grid-column-gap: rem(16); } } diff --git a/portal-frontend/src/app/features/applications/application-details/roso-details/roso-details.component.scss b/portal-frontend/src/app/features/applications/application-details/roso-details/roso-details.component.scss index beea863aef..63cfeaa16b 100644 --- a/portal-frontend/src/app/features/applications/application-details/roso-details/roso-details.component.scss +++ b/portal-frontend/src/app/features/applications/application-details/roso-details/roso-details.component.scss @@ -12,7 +12,7 @@ } @media screen and (min-width: $midBreakpoint) { - grid-template-columns: 0.95fr 1fr; + grid-template-columns: 0.95fr 3fr; grid-column-gap: rem(16); } } diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pofo-details/pofo-details.component.scss b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pofo-details/pofo-details.component.scss index beea863aef..63cfeaa16b 100644 --- a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pofo-details/pofo-details.component.scss +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pofo-details/pofo-details.component.scss @@ -12,7 +12,7 @@ } @media screen and (min-width: $midBreakpoint) { - grid-template-columns: 0.95fr 1fr; + grid-template-columns: 0.95fr 3fr; grid-column-gap: rem(16); } } diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/roso-details/roso-details.component.scss b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/roso-details/roso-details.component.scss index beea863aef..63cfeaa16b 100644 --- a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/roso-details/roso-details.component.scss +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/roso-details/roso-details.component.scss @@ -12,7 +12,7 @@ } @media screen and (min-width: $midBreakpoint) { - grid-template-columns: 0.95fr 1fr; + grid-template-columns: 0.95fr 3fr; grid-column-gap: rem(16); } } diff --git a/portal-frontend/src/app/features/public/application/submission/naru-details/naru-details.component.scss b/portal-frontend/src/app/features/public/application/submission/naru-details/naru-details.component.scss index abb441e3b9..9999107edd 100644 --- a/portal-frontend/src/app/features/public/application/submission/naru-details/naru-details.component.scss +++ b/portal-frontend/src/app/features/public/application/submission/naru-details/naru-details.component.scss @@ -12,7 +12,7 @@ } @media screen and (min-width: $midBreakpoint) { - grid-template-columns: 0.95fr 1fr; + grid-template-columns: 0.95fr 3fr; grid-column-gap: rem(16); } diff --git a/portal-frontend/src/app/features/public/application/submission/nfu-details/nfu-details.component.scss b/portal-frontend/src/app/features/public/application/submission/nfu-details/nfu-details.component.scss index 4f39e7710a..2a7bb35915 100644 --- a/portal-frontend/src/app/features/public/application/submission/nfu-details/nfu-details.component.scss +++ b/portal-frontend/src/app/features/public/application/submission/nfu-details/nfu-details.component.scss @@ -12,7 +12,7 @@ } @media screen and (min-width: $midBreakpoint) { - grid-template-columns: 0.95fr 1fr; + grid-template-columns: 0.95fr 3fr; grid-column-gap: rem(16); } diff --git a/portal-frontend/src/app/features/public/application/submission/pofo-details/pofo-details.component.scss b/portal-frontend/src/app/features/public/application/submission/pofo-details/pofo-details.component.scss index abb441e3b9..9999107edd 100644 --- a/portal-frontend/src/app/features/public/application/submission/pofo-details/pofo-details.component.scss +++ b/portal-frontend/src/app/features/public/application/submission/pofo-details/pofo-details.component.scss @@ -12,7 +12,7 @@ } @media screen and (min-width: $midBreakpoint) { - grid-template-columns: 0.95fr 1fr; + grid-template-columns: 0.95fr 3fr; grid-column-gap: rem(16); } diff --git a/portal-frontend/src/app/features/public/application/submission/roso-details/roso-details.component.scss b/portal-frontend/src/app/features/public/application/submission/roso-details/roso-details.component.scss index abb441e3b9..9999107edd 100644 --- a/portal-frontend/src/app/features/public/application/submission/roso-details/roso-details.component.scss +++ b/portal-frontend/src/app/features/public/application/submission/roso-details/roso-details.component.scss @@ -12,7 +12,7 @@ } @media screen and (min-width: $midBreakpoint) { - grid-template-columns: 0.95fr 1fr; + grid-template-columns: 0.95fr 3fr; grid-column-gap: rem(16); } diff --git a/portal-frontend/src/app/features/public/notice-of-intent/submission/pofo-details/pofo-details.component.scss b/portal-frontend/src/app/features/public/notice-of-intent/submission/pofo-details/pofo-details.component.scss index abb441e3b9..9999107edd 100644 --- a/portal-frontend/src/app/features/public/notice-of-intent/submission/pofo-details/pofo-details.component.scss +++ b/portal-frontend/src/app/features/public/notice-of-intent/submission/pofo-details/pofo-details.component.scss @@ -12,7 +12,7 @@ } @media screen and (min-width: $midBreakpoint) { - grid-template-columns: 0.95fr 1fr; + grid-template-columns: 0.95fr 3fr; grid-column-gap: rem(16); } diff --git a/portal-frontend/src/app/features/public/notice-of-intent/submission/roso-details/roso-details.component.scss b/portal-frontend/src/app/features/public/notice-of-intent/submission/roso-details/roso-details.component.scss index abb441e3b9..9999107edd 100644 --- a/portal-frontend/src/app/features/public/notice-of-intent/submission/roso-details/roso-details.component.scss +++ b/portal-frontend/src/app/features/public/notice-of-intent/submission/roso-details/roso-details.component.scss @@ -12,7 +12,7 @@ } @media screen and (min-width: $midBreakpoint) { - grid-template-columns: 0.95fr 1fr; + grid-template-columns: 0.95fr 3fr; grid-column-gap: rem(16); } From 59fa48e93ae7407a2ae68a335fbbc3df528be6cb Mon Sep 17 00:00:00 2001 From: Liam Stoddard <lstodd@protonmail.com> Date: Thu, 4 Jan 2024 20:30:30 -0800 Subject: [PATCH 876/954] MR Feedback --- bin/migrate-oats-data/applications/migrate_application.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/migrate-oats-data/applications/migrate_application.py b/bin/migrate-oats-data/applications/migrate_application.py index 8380155e9b..d63ecfb1ca 100644 --- a/bin/migrate-oats-data/applications/migrate_application.py +++ b/bin/migrate-oats-data/applications/migrate_application.py @@ -29,12 +29,12 @@ def process_application_etl(batch_size): process_alcs_application_prep_fields(batch_size) update_application_date_rx_all_items(batch_size) process_alcs_app_submissions(batch_size) + insert_application_submission_review(batch_size) process_application_statuses(batch_size) process_application_parcels(batch_size) process_application_owners(batch_size) process_app_staff_journal(batch_size) process_application_decisions(batch_size) - insert_application_submission_review(batch_size) process_application_submission_status_emails() From ce13385018a042e0f2222d7a515536e3357f7388 Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Thu, 4 Jan 2024 16:36:19 -0800 Subject: [PATCH 877/954] Update owner list on owner delete --- .../primary-contact/primary-contact.component.ts | 8 ++++++++ .../primary-contact/primary-contact.component.ts | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts index faa57ab9ba..278ae29bde 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts @@ -367,6 +367,14 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni this.phoneNumber.setValue(updatedContact.phoneNumber); this.email.setValue(updatedContact.email); } + + if (updatedContact['action'] === 'delete') { + this.parcelOwners = this.parcelOwners.filter((owner) => owner.uuid !== this.selectedOwnerUuid); + this.selectedOwnerUuid = undefined; + + this.showNoOwnersWarning = + this.isExistingOwner.value === true && this.parcelOwners.length === 0 && !this.isGovernmentUser; + } }); } } diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts index 47e4994d16..35e7344bc8 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts @@ -365,6 +365,14 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni this.phoneNumber.setValue(updatedContact.phoneNumber); this.email.setValue(updatedContact.email); } + + if (updatedContact['action'] === 'delete') { + this.parcelOwners = this.parcelOwners.filter((owner) => owner.uuid !== this.selectedOwnerUuid); + this.selectedOwnerUuid = undefined; + + this.showNoOwnersWarning = + this.isExistingOwner.value === true && this.parcelOwners.length === 0 && !this.isGovernmentUser; + } }); } } From a903d9f889695ce4a2835bb06cd1ced2f645c03f Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Fri, 5 Jan 2024 11:41:37 -0800 Subject: [PATCH 878/954] Allow unsetting primary contact --- .../application-owner.controller.ts | 30 +++++++++++-------- .../application-owner.service.ts | 7 +++-- .../application-submission.service.ts | 5 +++- 3 files changed, 26 insertions(+), 16 deletions(-) diff --git a/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.controller.ts b/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.controller.ts index 2fdb2b3ad4..13b165e168 100644 --- a/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.controller.ts +++ b/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.controller.ts @@ -159,19 +159,23 @@ export class ApplicationOwnerController { //Create Owner if (!data.ownerUuid) { await this.ownerService.deleteNonParcelOwners(applicationSubmission.uuid); - const newOwner = await this.ownerService.create( - { - email: data.email, - typeCode: data.type, - lastName: data.lastName, - firstName: data.firstName, - phoneNumber: data.phoneNumber, - organizationName: data.organization, - applicationSubmissionUuid: data.applicationSubmissionUuid, - crownLandOwnerType: data.crownLandOwnerType, - }, - applicationSubmission, - ); + const newOwner = + data.type === OWNER_TYPE.AGENT || data.type == OWNER_TYPE.GOVERNMENT + ? await this.ownerService.create( + { + email: data.email, + typeCode: data.type, + lastName: data.lastName, + firstName: data.firstName, + phoneNumber: data.phoneNumber, + organizationName: data.organization, + applicationSubmissionUuid: data.applicationSubmissionUuid, + crownLandOwnerType: data.crownLandOwnerType, + }, + applicationSubmission, + ) + : undefined; + await this.ownerService.setPrimaryContact( applicationSubmission.uuid, newOwner, diff --git a/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.service.ts b/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.service.ts index 127ff70a5d..931f2368ac 100644 --- a/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.service.ts +++ b/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.service.ts @@ -198,10 +198,13 @@ export class ApplicationOwnerService { return res; } - async setPrimaryContact(submissionUuid: string, owner: ApplicationOwner) { + async setPrimaryContact( + submissionUuid: string, + owner: ApplicationOwner | undefined, + ) { await this.applicationSubmissionService.setPrimaryContact( submissionUuid, - owner.uuid, + owner?.uuid ?? null, ); } diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.service.ts b/services/apps/alcs/src/portal/application-submission/application-submission.service.ts index 9071193351..45d09eff5b 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.service.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.service.ts @@ -211,7 +211,10 @@ export class ApplicationSubmissionService { return this.getOrFailByUuid(submissionUuid, this.DEFAULT_RELATIONS); } - async setPrimaryContact(submissionUuid: string, primaryContactUuid: string) { + async setPrimaryContact( + submissionUuid: string, + primaryContactUuid: string | null, + ) { const applicationSubmission = await this.getOrFailByUuid(submissionUuid); applicationSubmission.primaryContactOwnerUuid = primaryContactUuid; await this.applicationSubmissionRepository.save(applicationSubmission); From 02fc1bad480e811234c8c8d896c7d26d85fb13c8 Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Fri, 5 Jan 2024 11:43:51 -0800 Subject: [PATCH 879/954] Fix various control flow issues - No owner warning not always showing up - Confirmation dialgo not always showing up - 'Yes' state not being saved if no owner selected - Government fields could become disabled --- .../primary-contact.component.html | 4 +- .../primary-contact.component.ts | 48 ++++++------------- 2 files changed, 17 insertions(+), 35 deletions(-) diff --git a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html index d701e5c05e..b32b0c58fa 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html @@ -83,7 +83,9 @@ <h2>Primary Contact</h2> </div> </div> </div> - <app-warning-banner *ngIf="showNoOwnersWarning"> + <app-warning-banner + *ngIf="this.isExistingOwner.value === true && this.parcelOwners.length === 0 && !this.isGovernmentUser" + > No landowners or government contacts are added. Please go back to Step 1 to add information. </app-warning-banner> <!-- /Owner --> diff --git a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts index 278ae29bde..375746b705 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts @@ -43,7 +43,6 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni isDirty = false; showVirusError = false; hasCrownParcels = false; - showNoOwnersWarning = false; isExistingOwner = new FormControl<boolean | null>(null, [Validators.required]); firstName = new FormControl<string | null>('', [Validators.required]); @@ -133,19 +132,8 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni } if (this.selectedThirdPartyAgent || this.selectedLocalGovernment) { - this.firstName.enable(); - this.lastName.enable(); - this.organizationName.enable(); - this.email.enable(); - this.phoneNumber.enable(); this.isCrownOwner = false; } else { - this.firstName.disable(); - this.lastName.disable(); - this.organizationName.disable(); - this.email.disable(); - this.phoneNumber.disable(); - if (selectedOwner) { this.form.patchValue({ firstName: selectedOwner.firstName, @@ -182,7 +170,7 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni } protected async save() { - if (this.isDirty || this.form.dirty) { + if (this.isDirty || this.form.dirty || this.isExistingOwner.value) { let selectedOwner: ApplicationOwnerDto | undefined = this.owners.find( (owner) => owner.uuid === this.selectedOwnerUuid ); @@ -198,10 +186,10 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni ownerUuid: selectedOwner?.uuid, type: this.selectedThirdPartyAgent ? OWNER_TYPE.AGENT : OWNER_TYPE.GOVERNMENT, }); - } else if (selectedOwner) { + } else { await this.applicationOwnerService.setPrimaryContact({ applicationSubmissionUuid: this.submissionUuid, - ownerUuid: selectedOwner.uuid, + ownerUuid: selectedOwner?.uuid, }); } await this.reloadApplication(); @@ -243,9 +231,9 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni if (selectedOwner) { this.selectedThirdPartyAgent = selectedOwner.type.code === OWNER_TYPE.AGENT; this.selectedLocalGovernment = selectedOwner.type.code === OWNER_TYPE.GOVERNMENT; - - this.isExistingOwner.setValue(!this.selectedThirdPartyAgent); } + this.isExistingOwner.setValue(!this.selectedThirdPartyAgent); + this.switchPrimaryContactType(!this.selectedThirdPartyAgent); if (this.selectedLocalGovernment) { this.organizationName.setValidators([Validators.required]); @@ -264,12 +252,6 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni }); } else if (selectedOwner) { this.onSelectOwner(selectedOwner.uuid); - } else { - this.firstName.disable(); - this.lastName.disable(); - this.organizationName.disable(); - this.email.disable(); - this.phoneNumber.disable(); } if (this.isGovernmentUser || this.selectedLocalGovernment) { @@ -289,7 +271,14 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni } async onSelectPrimaryContactType(isExistingOwner: boolean | null) { - if (this.form.dirty || (!isExistingOwner && this.selectedOwnerUuid && !this.isGovernmentUser)) { + const isDirty = + this.firstName.value || + this.lastName.value || + this.organizationName.value || + this.phoneNumber.value || + this.email.value; + + if (isDirty) { await this.dialog .open(PrimaryContactConfirmationDialogComponent, { panelClass: 'no-padding', @@ -302,6 +291,7 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni .beforeClosed() .subscribe(async (confirmed) => { if (confirmed) { + this.form.reset(); this.switchPrimaryContactType(isExistingOwner); } else { this.isExistingOwner.setValue(!isExistingOwner); @@ -327,13 +317,6 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni this.selectedThirdPartyAgent = false; this.selectedOwnerUuid = undefined; } - - // Ensure form is cleared to avoid erroneous confirmation dialogs - if (this.selectedThirdPartyAgent || this.selectedLocalGovernment) { - this.form.reset(); - } - - this.showNoOwnersWarning = isExistingOwner === true && this.parcelOwners.length === 0 && !this.isGovernmentUser; } onEdit(selectedOwnerUuid: string) { @@ -371,9 +354,6 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni if (updatedContact['action'] === 'delete') { this.parcelOwners = this.parcelOwners.filter((owner) => owner.uuid !== this.selectedOwnerUuid); this.selectedOwnerUuid = undefined; - - this.showNoOwnersWarning = - this.isExistingOwner.value === true && this.parcelOwners.length === 0 && !this.isGovernmentUser; } }); } From f4f177b8bff80e3f7e0a54b84a378a7f3283eee2 Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Fri, 5 Jan 2024 13:04:21 -0800 Subject: [PATCH 880/954] Fix trying to read edit action when undefined --- .../primary-contact/primary-contact.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts index 375746b705..e9731dd660 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts @@ -351,7 +351,7 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni this.email.setValue(updatedContact.email); } - if (updatedContact['action'] === 'delete') { + if (updatedContact?.action === 'delete') { this.parcelOwners = this.parcelOwners.filter((owner) => owner.uuid !== this.selectedOwnerUuid); this.selectedOwnerUuid = undefined; } From fef7fa83310a9f2caa126d20301055ea822b8427 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Fri, 5 Jan 2024 15:47:28 -0800 Subject: [PATCH 881/954] Add Portal Maintenance Mode * Add new entity for configurations * Add service and controller * Add UI for fetching and setting maintenance mode * Update tests * Add guard that throws 503s when maintenance mode is on * Add interceptor to redirect to maintenance page on 503 * Add new maintenance page * Add /portal/token to trigger 503s on loading the portal --- .../src/app/features/admin/admin.component.ts | 7 + .../src/app/features/admin/admin.module.ts | 2 + .../configuration.component.html | 29 ++++ .../configuration.component.scss | 18 +++ .../configuration.component.spec.ts | 37 +++++ .../configuration/configuration.component.ts | 39 +++++ .../admin-configuration.service.spec.ts | 77 ++++++++++ .../admin-configuration.service.ts | 46 ++++++ portal-frontend/src/app/app-routing.module.ts | 5 + portal-frontend/src/app/app.module.ts | 8 +- .../maintenance/maintenance.component.html | 9 ++ .../maintenance/maintenance.component.scss | 17 ++ .../maintenance/maintenance.component.spec.ts | 21 +++ .../maintenance/maintenance.component.ts | 10 ++ .../authentication/authentication.service.ts | 2 +- .../src/app/services/status/status.service.ts | 8 +- .../maintenance-interceptor.service.spec.ts | 22 +++ .../maintenance-interceptor.service.ts | 23 +++ .../apps/alcs/src/alcs/admin/admin.module.ts | 6 + .../configuration.controller.spec.ts | 74 +++++++++ .../configuration/configuration.controller.ts | 50 ++++++ .../configuration.service.spec.ts | 63 ++++++++ .../configuration/configuration.service.ts | 34 ++++ .../portal-auth-guard.service.ts | 1 - .../authorization/roles-guard.service.ts | 1 - .../common/entities/configuration.entity.ts | 23 +++ services/apps/alcs/src/main.controller.ts | 5 +- services/apps/alcs/src/main.module.ts | 8 +- .../portal/guards/maintenance.guard.spec.ts | 145 ++++++++++++++++++ .../src/portal/guards/maintenance.guard.ts | 51 ++++++ .../1704411968891-add_config_table.ts | 19 +++ 31 files changed, 848 insertions(+), 12 deletions(-) create mode 100644 alcs-frontend/src/app/features/admin/configuration/configuration.component.html create mode 100644 alcs-frontend/src/app/features/admin/configuration/configuration.component.scss create mode 100644 alcs-frontend/src/app/features/admin/configuration/configuration.component.spec.ts create mode 100644 alcs-frontend/src/app/features/admin/configuration/configuration.component.ts create mode 100644 alcs-frontend/src/app/services/admin-configuration/admin-configuration.service.spec.ts create mode 100644 alcs-frontend/src/app/services/admin-configuration/admin-configuration.service.ts create mode 100644 portal-frontend/src/app/features/maintenance/maintenance.component.html create mode 100644 portal-frontend/src/app/features/maintenance/maintenance.component.scss create mode 100644 portal-frontend/src/app/features/maintenance/maintenance.component.spec.ts create mode 100644 portal-frontend/src/app/features/maintenance/maintenance.component.ts create mode 100644 portal-frontend/src/app/shared/maintenance/maintenance-interceptor.service.spec.ts create mode 100644 portal-frontend/src/app/shared/maintenance/maintenance-interceptor.service.ts create mode 100644 services/apps/alcs/src/alcs/admin/configuration/configuration.controller.spec.ts create mode 100644 services/apps/alcs/src/alcs/admin/configuration/configuration.controller.ts create mode 100644 services/apps/alcs/src/alcs/admin/configuration/configuration.service.spec.ts create mode 100644 services/apps/alcs/src/alcs/admin/configuration/configuration.service.ts create mode 100644 services/apps/alcs/src/common/entities/configuration.entity.ts create mode 100644 services/apps/alcs/src/portal/guards/maintenance.guard.spec.ts create mode 100644 services/apps/alcs/src/portal/guards/maintenance.guard.ts create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1704411968891-add_config_table.ts diff --git a/alcs-frontend/src/app/features/admin/admin.component.ts b/alcs-frontend/src/app/features/admin/admin.component.ts index 90568adfc6..4870e0872d 100644 --- a/alcs-frontend/src/app/features/admin/admin.component.ts +++ b/alcs-frontend/src/app/features/admin/admin.component.ts @@ -3,6 +3,7 @@ import { ActivatedRoute } from '@angular/router'; import { BoardManagementComponent } from './board-management/board-management.component'; import { CardStatusComponent } from './card-status/card-status.component'; import { CeoCriterionComponent } from './ceo-criterion/ceo-criterion.component'; +import { ConfigurationComponent } from './configuration/configuration.component'; import { DecisionConditionTypesComponent } from './decision-condition-types/decision-condition-types.component'; import { DecisionMakerComponent } from './decision-maker/decision-maker.component'; import { HolidayComponent } from './holiday/holiday.component'; @@ -65,6 +66,12 @@ export const childRoutes = [ icon: 'view_week', component: CardStatusComponent, }, + { + path: 'configuration', + menuTitle: 'Portal Maintenance', + icon: 'settings_configuration', + component: ConfigurationComponent, + }, ]; @Component({ diff --git a/alcs-frontend/src/app/features/admin/admin.module.ts b/alcs-frontend/src/app/features/admin/admin.module.ts index 137c8fa1da..0a11a00ca6 100644 --- a/alcs-frontend/src/app/features/admin/admin.module.ts +++ b/alcs-frontend/src/app/features/admin/admin.module.ts @@ -11,6 +11,7 @@ import { CardStatusDialogComponent } from './card-status/card-status-dialog/card import { CardStatusComponent } from './card-status/card-status.component'; import { CeoCriterionDialogComponent } from './ceo-criterion/ceo-criterion-dialog/ceo-criterion-dialog.component'; import { CeoCriterionComponent } from './ceo-criterion/ceo-criterion.component'; +import { ConfigurationComponent } from './configuration/configuration.component'; import { DecisionConditionTypesDialogComponent } from './decision-condition-types/decision-condition-types-dialog/decision-condition-types-dialog.component'; import { DecisionConditionTypesComponent } from './decision-condition-types/decision-condition-types.component'; import { DecisionMakerDialogComponent } from './decision-maker/decision-maker-dialog/decision-maker-dialog.component'; @@ -50,6 +51,7 @@ const routes: Routes = [ CardStatusDialogComponent, BoardManagementComponent, BoardManagementDialogComponent, + ConfigurationComponent, ], imports: [CommonModule, SharedModule.forRoot(), RouterModule.forChild(routes), MatPaginatorModule, DragDropModule], }) diff --git a/alcs-frontend/src/app/features/admin/configuration/configuration.component.html b/alcs-frontend/src/app/features/admin/configuration/configuration.component.html new file mode 100644 index 0000000000..688d10b2f6 --- /dev/null +++ b/alcs-frontend/src/app/features/admin/configuration/configuration.component.html @@ -0,0 +1,29 @@ +<div class="container"> + <h2>Portal Maintenance</h2> + <div> + <div class="subheading2">Maintenance Mode</div> + <div> + <span class="value" *ngIf="!isEditing"> + {{ maintenanceMode === 'true' ? 'On' : 'Off' }} + <button class="edit-button" mat-icon-button (click)="toggleEdit()"> + <mat-icon class="edit-icon">edit</mat-icon> + </button> + </span> + <div + class="editing" + [ngClass]="{ + hidden: !isEditing + }" + > + <mat-button-toggle-group [(value)]="maintenanceMode"> + <mat-button-toggle value="true">On</mat-button-toggle> + <mat-button-toggle value="false">Off</mat-button-toggle> + </mat-button-toggle-group> + <div class="button-container"> + <button mat-button (click)="toggleEdit()">CANCEL</button> + <button mat-button color="primary" (click)="onSave()">SAVE</button> + </div> + </div> + </div> + </div> +</div> diff --git a/alcs-frontend/src/app/features/admin/configuration/configuration.component.scss b/alcs-frontend/src/app/features/admin/configuration/configuration.component.scss new file mode 100644 index 0000000000..74e9f8d3e1 --- /dev/null +++ b/alcs-frontend/src/app/features/admin/configuration/configuration.component.scss @@ -0,0 +1,18 @@ +@use '../../../../styles/colors'; + +.value { + display: flex; + align-items: center; +} + +.subheading2 { + margin-top: 36px !important; +} + +.editing { + max-width: 600px; + + &.hidden { + display: none; + } +} diff --git a/alcs-frontend/src/app/features/admin/configuration/configuration.component.spec.ts b/alcs-frontend/src/app/features/admin/configuration/configuration.component.spec.ts new file mode 100644 index 0000000000..09bcb6b4da --- /dev/null +++ b/alcs-frontend/src/app/features/admin/configuration/configuration.component.spec.ts @@ -0,0 +1,37 @@ +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { AdminConfigurationService } from '../../../services/admin-configuration/admin-configuration.service'; +import { UnarchiveCardService } from '../../../services/unarchive-card/unarchive-card.service'; +import { ConfirmationDialogService } from '../../../shared/confirmation-dialog/confirmation-dialog.service'; + +import { ConfigurationComponent } from './configuration.component'; + +describe('ConfigurationComponent', () => { + let component: ConfigurationComponent; + let fixture: ComponentFixture<ConfigurationComponent>; + let mockConfigurationService: DeepMocked<AdminConfigurationService>; + + beforeEach(async () => { + mockConfigurationService = createMock(); + + await TestBed.configureTestingModule({ + declarations: [ConfigurationComponent], + providers: [ + { + provide: AdminConfigurationService, + useValue: mockConfigurationService, + }, + ], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + + fixture = TestBed.createComponent(ConfigurationComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/alcs-frontend/src/app/features/admin/configuration/configuration.component.ts b/alcs-frontend/src/app/features/admin/configuration/configuration.component.ts new file mode 100644 index 0000000000..7aefb733bb --- /dev/null +++ b/alcs-frontend/src/app/features/admin/configuration/configuration.component.ts @@ -0,0 +1,39 @@ +import { Component, OnInit } from '@angular/core'; +import { + AdminConfigurationService, + CONFIG_VALUE, +} from '../../../services/admin-configuration/admin-configuration.service'; + +@Component({ + selector: 'app-configuration', + templateUrl: './configuration.component.html', + styleUrls: ['./configuration.component.scss'], +}) +export class ConfigurationComponent implements OnInit { + maintenanceMode = 'false'; + isEditing = false; + + constructor(private adminConfigurationService: AdminConfigurationService) {} + + ngOnInit(): void { + this.loadConfigs(); + } + + toggleEdit() { + this.isEditing = !this.isEditing; + } + + async onSave() { + await this.adminConfigurationService.setConfiguration(CONFIG_VALUE.PORTAL_MAINTENANCE_MODE, this.maintenanceMode); + this.loadConfigs(); + this.isEditing = false; + } + + private async loadConfigs() { + const configs = await this.adminConfigurationService.listConfigurations(); + if (configs) { + const maintenanceConfig = configs.find((config) => config.name === CONFIG_VALUE.PORTAL_MAINTENANCE_MODE); + this.maintenanceMode = maintenanceConfig!.value; + } + } +} diff --git a/alcs-frontend/src/app/services/admin-configuration/admin-configuration.service.spec.ts b/alcs-frontend/src/app/services/admin-configuration/admin-configuration.service.spec.ts new file mode 100644 index 0000000000..facea4351c --- /dev/null +++ b/alcs-frontend/src/app/services/admin-configuration/admin-configuration.service.spec.ts @@ -0,0 +1,77 @@ +import { HttpClient } from '@angular/common/http'; +import { TestBed } from '@angular/core/testing'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { of, throwError } from 'rxjs'; +import { ToastService } from '../toast/toast.service'; +import { AdminConfigurationService, CONFIG_VALUE } from './admin-configuration.service'; + +describe('AdminBoardManagementService', () => { + let service: AdminConfigurationService; + let mockHttpClient: DeepMocked<HttpClient>; + let mockToastService: DeepMocked<ToastService>; + + beforeEach(() => { + mockHttpClient = createMock(); + mockToastService = createMock(); + + TestBed.configureTestingModule({ + providers: [ + { + provide: HttpClient, + useValue: mockHttpClient, + }, + { + provide: ToastService, + useValue: mockToastService, + }, + ], + }); + service = TestBed.inject(AdminConfigurationService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); + + it('should call get on list', async () => { + mockHttpClient.get.mockReturnValue(of([])); + + await service.listConfigurations(); + + expect(mockHttpClient.get).toHaveBeenCalledTimes(1); + }); + + it('should show toast if list fails', async () => { + mockHttpClient.get.mockReturnValue( + throwError(() => { + new Error(''); + }), + ); + + await service.listConfigurations(); + + expect(mockHttpClient.get).toHaveBeenCalledTimes(1); + expect(mockToastService.showErrorToast).toHaveBeenCalledTimes(1); + }); + + it('should call post on update', async () => { + mockHttpClient.post.mockReturnValue(of({ success: true })); + + await service.setConfiguration(CONFIG_VALUE.PORTAL_MAINTENANCE_MODE, 'mock-value'); + + expect(mockHttpClient.post).toHaveBeenCalledTimes(1); + }); + + it('should show toast if update fails', async () => { + mockHttpClient.post.mockReturnValue( + throwError(() => { + new Error(''); + }), + ); + + await service.setConfiguration(CONFIG_VALUE.PORTAL_MAINTENANCE_MODE, 'mock-value'); + + expect(mockHttpClient.post).toHaveBeenCalledTimes(1); + expect(mockToastService.showErrorToast).toHaveBeenCalledTimes(1); + }); +}); diff --git a/alcs-frontend/src/app/services/admin-configuration/admin-configuration.service.ts b/alcs-frontend/src/app/services/admin-configuration/admin-configuration.service.ts new file mode 100644 index 0000000000..7df32c13bd --- /dev/null +++ b/alcs-frontend/src/app/services/admin-configuration/admin-configuration.service.ts @@ -0,0 +1,46 @@ +import { HttpClient } from '@angular/common/http'; +import { Injectable } from '@angular/core'; +import { firstValueFrom } from 'rxjs'; +import { environment } from '../../../environments/environment'; +import { BaseCodeDto } from '../../shared/dto/base.dto'; +import { ToastService } from '../toast/toast.service'; + +export enum CONFIG_VALUE { + PORTAL_MAINTENANCE_MODE = 'portal_maintenance_mode', +} + +@Injectable({ + providedIn: 'root', +}) +export class AdminConfigurationService { + private url = `${environment.apiUrl}/configuration`; + + constructor( + private http: HttpClient, + private toastService: ToastService, + ) {} + + async listConfigurations() { + try { + return await firstValueFrom(this.http.get<Array<{ name: CONFIG_VALUE; value: string }>>(`${this.url}`)); + } catch (e) { + this.toastService.showErrorToast('Failed to fetch the system configuration'); + console.log(e); + } + return; + } + + async setConfiguration(name: CONFIG_VALUE, value: string) { + try { + return await firstValueFrom( + this.http.post<void>(`${this.url}/${name}`, { + value, + }), + ); + } catch (e) { + this.toastService.showErrorToast('Failed to update configuration'); + console.log(e); + } + return; + } +} diff --git a/portal-frontend/src/app/app-routing.module.ts b/portal-frontend/src/app/app-routing.module.ts index 1f14a65f5d..ad02edb86f 100644 --- a/portal-frontend/src/app/app-routing.module.ts +++ b/portal-frontend/src/app/app-routing.module.ts @@ -2,6 +2,7 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; import { AuthorizationComponent } from './features/authorization/authorization.component'; import { LoginComponent } from './features/login/login.component'; +import { MaintenanceComponent } from './features/maintenance/maintenance.component'; import { AlcsAuthGuard } from './services/authentication/alcs-auth.guard'; import { AuthGuard } from './services/authentication/auth.guard'; @@ -15,6 +16,10 @@ const routes: Routes = [ path: 'authorized', component: AuthorizationComponent, }, + { + path: 'maintenance', + component: MaintenanceComponent, + }, { title: 'Home', path: 'home', diff --git a/portal-frontend/src/app/app.module.ts b/portal-frontend/src/app/app.module.ts index e3e82475e1..1dcfcee683 100644 --- a/portal-frontend/src/app/app.module.ts +++ b/portal-frontend/src/app/app.module.ts @@ -16,8 +16,10 @@ import { ConfirmationDialogComponent } from './shared/confirmation-dialog/confir import { ConfirmationDialogService } from './shared/confirmation-dialog/confirmation-dialog.service'; import { FooterComponent } from './shared/footer/footer.component'; import { HeaderComponent } from './shared/header/header.component'; +import { MaintenanceInterceptorService } from './shared/maintenance/maintenance-interceptor.service'; import { SharedModule } from './shared/shared.module'; import { WarningBannerComponent } from './shared/warning-banner/warning-banner.component'; +import { MaintenanceComponent } from './features/maintenance/maintenance.component'; @NgModule({ declarations: [ @@ -27,6 +29,7 @@ import { WarningBannerComponent } from './shared/warning-banner/warning-banner.c LoginComponent, AuthorizationComponent, ConfirmationDialogComponent, + MaintenanceComponent, ], imports: [ BrowserModule, @@ -37,12 +40,11 @@ import { WarningBannerComponent } from './shared/warning-banner/warning-banner.c MatPaginatorModule, MatToolbarModule, ], - exports: [ - WarningBannerComponent, - ], + exports: [WarningBannerComponent], providers: [ ConfirmationDialogService, { provide: HTTP_INTERCEPTORS, useClass: AuthInterceptorService, multi: true }, + { provide: HTTP_INTERCEPTORS, useClass: MaintenanceInterceptorService, multi: true }, { provide: APP_INITIALIZER, useFactory: (service: TokenRefreshService) => () => { diff --git a/portal-frontend/src/app/features/maintenance/maintenance.component.html b/portal-frontend/src/app/features/maintenance/maintenance.component.html new file mode 100644 index 0000000000..658d3d8a8c --- /dev/null +++ b/portal-frontend/src/app/features/maintenance/maintenance.component.html @@ -0,0 +1,9 @@ +<section> + <h1>ALC Portal and Public Search is currently down for maintenance.</h1> + <p>We’re sorry for the inconvenience. Please check back after a while.</p> + <div> + <a href="https://www.alc.gov.bc.ca/"> + <button mat-flat-button color="primary">Go to ALC Website</button> + </a> + </div> +</section> diff --git a/portal-frontend/src/app/features/maintenance/maintenance.component.scss b/portal-frontend/src/app/features/maintenance/maintenance.component.scss new file mode 100644 index 0000000000..50b02022cb --- /dev/null +++ b/portal-frontend/src/app/features/maintenance/maintenance.component.scss @@ -0,0 +1,17 @@ +@use '../../../styles/functions' as *; +@use '../../../styles/colors'; + +section { + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + text-align: center; + height: 100%; + background-color: #fbe0d1; + min-height: calc(100vh - 200px); + + & > * { + margin-bottom: rem(36) !important; + } +} diff --git a/portal-frontend/src/app/features/maintenance/maintenance.component.spec.ts b/portal-frontend/src/app/features/maintenance/maintenance.component.spec.ts new file mode 100644 index 0000000000..9b9bec6e9f --- /dev/null +++ b/portal-frontend/src/app/features/maintenance/maintenance.component.spec.ts @@ -0,0 +1,21 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { MaintenanceComponent } from './maintenance.component'; + +describe('MaintenanceComponent', () => { + let component: MaintenanceComponent; + let fixture: ComponentFixture<MaintenanceComponent>; + + beforeEach(() => { + TestBed.configureTestingModule({ + declarations: [MaintenanceComponent] + }); + fixture = TestBed.createComponent(MaintenanceComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/features/maintenance/maintenance.component.ts b/portal-frontend/src/app/features/maintenance/maintenance.component.ts new file mode 100644 index 0000000000..443fb6aa58 --- /dev/null +++ b/portal-frontend/src/app/features/maintenance/maintenance.component.ts @@ -0,0 +1,10 @@ +import { Component } from '@angular/core'; + +@Component({ + selector: 'app-maintenance', + templateUrl: './maintenance.component.html', + styleUrls: ['./maintenance.component.scss'] +}) +export class MaintenanceComponent { + +} diff --git a/portal-frontend/src/app/services/authentication/authentication.service.ts b/portal-frontend/src/app/services/authentication/authentication.service.ts index 24b7f9a519..dac5582900 100644 --- a/portal-frontend/src/app/services/authentication/authentication.service.ts +++ b/portal-frontend/src/app/services/authentication/authentication.service.ts @@ -116,7 +116,7 @@ export class AuthenticationService { private async isTokenValid(token: string) { try { await firstValueFrom( - this.http.get(`${environment.authUrl}/token`, { + this.http.get(`${environment.authUrl}/portal/token`, { responseType: 'text', headers: { Authorization: `Bearer ${token}`, diff --git a/portal-frontend/src/app/services/status/status.service.ts b/portal-frontend/src/app/services/status/status.service.ts index 9f3ddc5536..dd1bfd5c5c 100644 --- a/portal-frontend/src/app/services/status/status.service.ts +++ b/portal-frontend/src/app/services/status/status.service.ts @@ -16,9 +16,11 @@ export class StatusService { async getStatuses() { try { return await firstValueFrom(this.http.get<ApplicationStatusDto[]>(`${this.baseUrl}`)); - } catch (e) { - console.error(e); - this.toastService.showErrorToast(`Failed to load Statuses. Please refresh the page and try again`); + } catch (e: any) { + if (e.status && e.status !== 503) { + console.error(e); + this.toastService.showErrorToast(`Failed to load Statuses. Please refresh the page and try again`); + } return undefined; } } diff --git a/portal-frontend/src/app/shared/maintenance/maintenance-interceptor.service.spec.ts b/portal-frontend/src/app/shared/maintenance/maintenance-interceptor.service.spec.ts new file mode 100644 index 0000000000..54f697228f --- /dev/null +++ b/portal-frontend/src/app/shared/maintenance/maintenance-interceptor.service.spec.ts @@ -0,0 +1,22 @@ +import { HttpClientTestingModule } from '@angular/common/http/testing'; +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { TestBed } from '@angular/core/testing'; + +import { MaintenanceInterceptorService } from './maintenance-interceptor.service'; + +describe('MaintenanceInterceptorService', () => { + let service: MaintenanceInterceptorService; + + beforeEach(() => { + TestBed.configureTestingModule({ + providers: [MaintenanceInterceptorService], + imports: [HttpClientTestingModule], + schemas: [NO_ERRORS_SCHEMA], + }); + service = TestBed.inject(MaintenanceInterceptorService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/shared/maintenance/maintenance-interceptor.service.ts b/portal-frontend/src/app/shared/maintenance/maintenance-interceptor.service.ts new file mode 100644 index 0000000000..160423d115 --- /dev/null +++ b/portal-frontend/src/app/shared/maintenance/maintenance-interceptor.service.ts @@ -0,0 +1,23 @@ +import { HttpErrorResponse, HttpHandler, HttpInterceptor, HttpRequest } from '@angular/common/http'; +import { Injectable } from '@angular/core'; +import { Router } from '@angular/router'; +import { catchError, EMPTY, throwError } from 'rxjs'; + +@Injectable({ + providedIn: 'root', +}) +export class MaintenanceInterceptorService implements HttpInterceptor { + constructor(private router: Router) {} + + intercept(request: HttpRequest<any>, next: HttpHandler) { + return next.handle(request).pipe( + catchError((error: HttpErrorResponse) => { + if (error.status === 503) { + this.router.navigate(['/maintenance']); + return EMPTY; + } + return throwError(() => error); + }) + ); + } +} diff --git a/services/apps/alcs/src/alcs/admin/admin.module.ts b/services/apps/alcs/src/alcs/admin/admin.module.ts index c0942a8d9a..ee8fb0b2d6 100644 --- a/services/apps/alcs/src/alcs/admin/admin.module.ts +++ b/services/apps/alcs/src/alcs/admin/admin.module.ts @@ -1,5 +1,6 @@ import { forwardRef, Module } from '@nestjs/common'; import { TypeOrmModule } from '@nestjs/typeorm'; +import { Configuration } from '../../common/entities/configuration.entity'; import { ApplicationDecisionConditionType } from '../application-decision/application-decision-condition/application-decision-condition-code.entity'; import { ApplicationDecisionMakerCode } from '../application-decision/application-decision-maker/application-decision-maker.entity'; import { ApplicationModule } from '../application/application.module'; @@ -21,6 +22,8 @@ import { ApplicationDecisionMakerController } from './application-decision-maker import { ApplicationDecisionMakerService } from './application-decision-maker/application-decision-maker.service'; import { BoardManagementController } from './board-management/board-management.controller'; import { CardStatusController } from './card-status/card-status.controller'; +import { ConfigurationController } from './configuration/configuration.controller'; +import { ConfigurationService } from './configuration/configuration.service'; import { HolidayController } from './holiday/holiday.controller'; import { HolidayEntity } from './holiday/holiday.entity'; import { HolidayService } from './holiday/holiday.service'; @@ -38,6 +41,7 @@ import { UnarchiveCardService } from './unarchive-card/unarchive-card.service'; ApplicationDecisionMakerCode, NoticeOfIntentSubtype, ApplicationDecisionConditionType, + Configuration, ]), ApplicationModule, NoticeOfIntentModule, @@ -61,6 +65,7 @@ import { UnarchiveCardService } from './unarchive-card/unarchive-card.service'; ApplicationDecisionConditionTypesController, CardStatusController, BoardManagementController, + ConfigurationController, ], providers: [ HolidayService, @@ -69,6 +74,7 @@ import { UnarchiveCardService } from './unarchive-card/unarchive-card.service'; UnarchiveCardService, NoiSubtypeService, ApplicationDecisionConditionTypesService, + ConfigurationService, ], }) export class AdminModule {} diff --git a/services/apps/alcs/src/alcs/admin/configuration/configuration.controller.spec.ts b/services/apps/alcs/src/alcs/admin/configuration/configuration.controller.spec.ts new file mode 100644 index 0000000000..afc921175c --- /dev/null +++ b/services/apps/alcs/src/alcs/admin/configuration/configuration.controller.spec.ts @@ -0,0 +1,74 @@ +import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; +import { BadRequestException } from '@nestjs/common'; +import { ConfigModule } from '@nestjs/config'; +import { Test, TestingModule } from '@nestjs/testing'; +import { ClsService } from 'nestjs-cls'; +import { mockKeyCloakProviders } from '../../../../test/mocks/mockTypes'; +import { CONFIG_VALUE } from '../../../common/entities/configuration.entity'; +import { ConfigurationController } from './configuration.controller'; +import { ConfigurationService } from './configuration.service'; + +describe('ConfigurationController', () => { + let controller: ConfigurationController; + let mockConfigurationService: DeepMocked<ConfigurationService>; + + beforeEach(async () => { + mockConfigurationService = createMock(); + + const module: TestingModule = await Test.createTestingModule({ + controllers: [ConfigurationController], + providers: [ + { + provide: ConfigurationService, + useValue: mockConfigurationService, + }, + { + provide: ClsService, + useValue: {}, + }, + ...mockKeyCloakProviders, + ], + imports: [ConfigModule], + }).compile(); + + controller = module.get<ConfigurationController>(ConfigurationController); + }); + + it('should be defined', () => { + expect(controller).toBeDefined(); + }); + + it('should call through for list', async () => { + mockConfigurationService.list.mockResolvedValue([]); + + await controller.listConfigs(); + + expect(mockConfigurationService.list).toHaveBeenCalledTimes(1); + }); + + it('should call through for a valid set config', async () => { + mockConfigurationService.setConfigurationValue.mockResolvedValue({} as any); + + await controller.setConfiguration(CONFIG_VALUE.PORTAL_MAINTENANCE_MODE, { + value: 'true', + }); + + expect( + mockConfigurationService.setConfigurationValue, + ).toHaveBeenCalledTimes(1); + }); + + it('should throw an exception for an invalid config', async () => { + const promise = controller.setConfiguration('BAD_VALUE', { + value: 'true', + }); + + await expect(promise).rejects.toMatchObject( + new BadRequestException('Unable to set config that is not programmed'), + ); + + expect( + mockConfigurationService.setConfigurationValue, + ).toHaveBeenCalledTimes(0); + }); +}); diff --git a/services/apps/alcs/src/alcs/admin/configuration/configuration.controller.ts b/services/apps/alcs/src/alcs/admin/configuration/configuration.controller.ts new file mode 100644 index 0000000000..d7a6761c33 --- /dev/null +++ b/services/apps/alcs/src/alcs/admin/configuration/configuration.controller.ts @@ -0,0 +1,50 @@ +import { + BadRequestException, + Body, + Controller, + Get, + Param, + Post, + UseGuards, +} from '@nestjs/common'; +import { ApiOAuth2 } from '@nestjs/swagger'; +import * as config from 'config'; +import { AUTH_ROLE } from '../../../common/authorization/roles'; +import { RolesGuard } from '../../../common/authorization/roles-guard.service'; +import { UserRoles } from '../../../common/authorization/roles.decorator'; +import { CONFIG_VALUE } from '../../../common/entities/configuration.entity'; +import { ConfigurationService } from './configuration.service'; + +@Controller('configuration') +@ApiOAuth2(config.get<string[]>('KEYCLOAK.SCOPES')) +@UseGuards(RolesGuard) +export class ConfigurationController { + constructor(private configurationService: ConfigurationService) {} + + @Get('') + @UserRoles(AUTH_ROLE.ADMIN) + async listConfigs() { + return await this.configurationService.list(); + } + + @Post('/:name') + @UserRoles(AUTH_ROLE.ADMIN) + async setConfiguration( + @Param('name') name: string, + @Body() body: { value: string }, + ) { + const castName = name as CONFIG_VALUE; + if (Object.values(CONFIG_VALUE).includes(castName)) { + await this.configurationService.setConfigurationValue( + castName, + body.value, + ); + return { + success: true, + }; + } + throw new BadRequestException( + 'Unable to set config that is not programmed', + ); + } +} diff --git a/services/apps/alcs/src/alcs/admin/configuration/configuration.service.spec.ts b/services/apps/alcs/src/alcs/admin/configuration/configuration.service.spec.ts new file mode 100644 index 0000000000..d542902b19 --- /dev/null +++ b/services/apps/alcs/src/alcs/admin/configuration/configuration.service.spec.ts @@ -0,0 +1,63 @@ +import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; +import { Test, TestingModule } from '@nestjs/testing'; +import { getRepositoryToken } from '@nestjs/typeorm'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; +import { Repository } from 'typeorm'; +import { + CONFIG_VALUE, + Configuration, +} from '../../../common/entities/configuration.entity'; +import { ConfigurationService } from './configuration.service'; + +describe('ConfigurationService', () => { + let service: ConfigurationService; + + let mockConfigRepo: DeepMocked<Repository<Configuration>>; + + beforeEach(async () => { + mockConfigRepo = createMock(); + + const module: TestingModule = await Test.createTestingModule({ + imports: [ + AutomapperModule.forRoot({ + strategyInitializer: classes(), + }), + ], + providers: [ + ConfigurationService, + { + provide: getRepositoryToken(Configuration), + useValue: mockConfigRepo, + }, + ], + }).compile(); + + service = module.get<ConfigurationService>(ConfigurationService); + }); + + it('should be defined', () => { + expect(service).toBeDefined(); + }); + + it('should call the repo for list', async () => { + mockConfigRepo.find.mockResolvedValue([new Configuration({})]); + + const res = await service.list(); + + expect(res.length).toEqual(1); + expect(mockConfigRepo.find).toHaveBeenCalledTimes(1); + }); + + it('should call upsert for save', async () => { + mockConfigRepo.upsert.mockResolvedValue({} as any); + + const res = await service.setConfigurationValue( + CONFIG_VALUE.PORTAL_MAINTENANCE_MODE, + 'value', + ); + + expect(res).toBeDefined(); + expect(mockConfigRepo.upsert).toHaveBeenCalledTimes(1); + }); +}); diff --git a/services/apps/alcs/src/alcs/admin/configuration/configuration.service.ts b/services/apps/alcs/src/alcs/admin/configuration/configuration.service.ts new file mode 100644 index 0000000000..c2460e94eb --- /dev/null +++ b/services/apps/alcs/src/alcs/admin/configuration/configuration.service.ts @@ -0,0 +1,34 @@ +import { Injectable } from '@nestjs/common'; +import { InjectRepository } from '@nestjs/typeorm'; +import { Repository } from 'typeorm'; +import { + CONFIG_VALUE, + Configuration, +} from '../../../common/entities/configuration.entity'; + +@Injectable() +export class ConfigurationService { + constructor( + @InjectRepository(Configuration) + private configurationRepository: Repository<Configuration>, + ) {} + + async setConfigurationValue(name: CONFIG_VALUE, value: string) { + return await this.configurationRepository.upsert( + new Configuration({ + name, + value, + }), + ['name'], + ); + } + + list() { + return this.configurationRepository.find({ + select: { + name: true, + value: true, + }, + }); + } +} diff --git a/services/apps/alcs/src/common/authorization/portal-auth-guard.service.ts b/services/apps/alcs/src/common/authorization/portal-auth-guard.service.ts index b828e0e7f9..4ef97ce9c8 100644 --- a/services/apps/alcs/src/common/authorization/portal-auth-guard.service.ts +++ b/services/apps/alcs/src/common/authorization/portal-auth-guard.service.ts @@ -11,7 +11,6 @@ import { KEYCLOAK_CONNECT_OPTIONS, KEYCLOAK_INSTANCE, KEYCLOAK_LOGGER, - KEYCLOAK_MULTITENANT_SERVICE, RoleGuard as KeyCloakRoleGuard, } from 'nest-keycloak-connect'; import { KeycloakConnectConfig } from 'nest-keycloak-connect/interface/keycloak-connect-options.interface'; diff --git a/services/apps/alcs/src/common/authorization/roles-guard.service.ts b/services/apps/alcs/src/common/authorization/roles-guard.service.ts index 3db140df64..d8fad2d4b1 100644 --- a/services/apps/alcs/src/common/authorization/roles-guard.service.ts +++ b/services/apps/alcs/src/common/authorization/roles-guard.service.ts @@ -11,7 +11,6 @@ import { KEYCLOAK_CONNECT_OPTIONS, KEYCLOAK_INSTANCE, KEYCLOAK_LOGGER, - KEYCLOAK_MULTITENANT_SERVICE, KeycloakConnectConfig, RoleGuard as KeyCloakRoleGuard, } from 'nest-keycloak-connect'; diff --git a/services/apps/alcs/src/common/entities/configuration.entity.ts b/services/apps/alcs/src/common/entities/configuration.entity.ts new file mode 100644 index 0000000000..e4779b6250 --- /dev/null +++ b/services/apps/alcs/src/common/entities/configuration.entity.ts @@ -0,0 +1,23 @@ +import { BaseEntity, Column, Entity, PrimaryColumn } from 'typeorm'; + +export enum CONFIG_VALUE { + PORTAL_MAINTENANCE_MODE = 'portal_maintenance_mode', +} + +@Entity() +export class Configuration extends BaseEntity { + constructor(data?: Partial<Configuration>) { + super(); + if (data) { + Object.assign(this, data); + } + } + + @PrimaryColumn() + name: string; + + @Column({ + nullable: false, + }) + value: string; +} diff --git a/services/apps/alcs/src/main.controller.ts b/services/apps/alcs/src/main.controller.ts index b40f2e8aff..952b5304a0 100644 --- a/services/apps/alcs/src/main.controller.ts +++ b/services/apps/alcs/src/main.controller.ts @@ -15,9 +15,10 @@ export class MainController { return await this.appService.getHealthStatus(); } - @Get('token') + // Portal/token is used by Portal and triggers maintenance mode, /token does not + @Get(['token', '/portal/token']) @ApiOAuth2(config.get<string[]>('KEYCLOAK.SCOPES')) - //One place this should be RoleGuard as this is used by users without any roles + // The one place RoleGuard is used to handle users without roles @UseGuards(RoleGuard) adminRoute(): string { return 'Admin!'; diff --git a/services/apps/alcs/src/main.module.ts b/services/apps/alcs/src/main.module.ts index 15f03446a2..2983653d97 100644 --- a/services/apps/alcs/src/main.module.ts +++ b/services/apps/alcs/src/main.module.ts @@ -14,6 +14,7 @@ import { AlcsModule } from './alcs/alcs.module'; import { AuthorizationFilter } from './common/authorization/authorization.filter'; import { AuthorizationModule } from './common/authorization/authorization.module'; import { AuditSubscriber } from './common/entities/audit.subscriber'; +import { Configuration } from './common/entities/configuration.entity'; import { TrackingModule } from './common/tracking/tracking.module'; import { DocumentModule } from './document/document.module'; import { FileNumberModule } from './file-number/file-number.module'; @@ -21,6 +22,7 @@ import { HealthCheck } from './healthcheck/healthcheck.entity'; import { LogoutController } from './logout/logout.controller'; import { MainController } from './main.controller'; import { MainService } from './main.service'; +import { MaintenanceGuard } from './portal/guards/maintenance.guard'; import { NoticeOfIntentSubmissionModule } from './portal/notice-of-intent-submission/notice-of-intent-submission.module'; import { PortalModule } from './portal/portal.module'; import { TypeormConfigService } from './providers/typeorm/typeorm.service'; @@ -31,7 +33,7 @@ import { UserModule } from './user/user.module'; imports: [ ConfigModule, TypeOrmModule.forRootAsync({ useClass: TypeormConfigService }), - TypeOrmModule.forFeature([HealthCheck]), + TypeOrmModule.forFeature([HealthCheck, Configuration]), AutomapperModule.forRoot({ strategyInitializer: classes(), }), @@ -73,6 +75,10 @@ import { UserModule } from './user/user.module'; providers: [ MainService, AuditSubscriber, + { + provide: APP_GUARD, + useClass: MaintenanceGuard, //Should come before AuthGuard + }, { provide: APP_GUARD, useClass: AuthGuard, diff --git a/services/apps/alcs/src/portal/guards/maintenance.guard.spec.ts b/services/apps/alcs/src/portal/guards/maintenance.guard.spec.ts new file mode 100644 index 0000000000..1898932303 --- /dev/null +++ b/services/apps/alcs/src/portal/guards/maintenance.guard.spec.ts @@ -0,0 +1,145 @@ +import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; +import { ExecutionContext, HttpException, HttpStatus } from '@nestjs/common'; +import { Test, TestingModule } from '@nestjs/testing'; +import { getRepositoryToken } from '@nestjs/typeorm'; +import { Repository } from 'typeorm'; +import { + CONFIG_VALUE, + Configuration, +} from '../../common/entities/configuration.entity'; +import { MaintenanceGuard } from './maintenance.guard'; + +describe('MaintenanceGuard', () => { + let guard: MaintenanceGuard; + let mockContext: DeepMocked<ExecutionContext>; + let mockRepo: DeepMocked<Repository<Configuration>>; + + const mockHttpContext = { + getRequest: () => ({}), + } as any; + + beforeEach(async () => { + mockRepo = createMock(); + mockContext = createMock<ExecutionContext>(); + mockContext.switchToHttp.mockReturnValue(mockHttpContext); + + const module: TestingModule = await Test.createTestingModule({ + providers: [ + MaintenanceGuard, + { + provide: getRepositoryToken(Configuration), + useValue: mockRepo, + }, + ], + }).compile(); + + guard = module.get<MaintenanceGuard>(MaintenanceGuard); + }); + + it('should be defined', () => { + expect(guard).toBeDefined(); + }); + + it('should accept if request is not for portal or public', async () => { + mockContext.switchToHttp.mockReturnValue({ + getRequest: () => ({ + routeOptions: { + url: '/alcs/whatever', + }, + }), + } as any); + + const isAllowed = await guard.canActivate(mockContext); + expect(isAllowed).toEqual(true); + }); + + it('should accept if request is for portal and maintenance mode is off', async () => { + mockContext.switchToHttp.mockReturnValue({ + getRequest: () => ({ + routeOptions: { + url: '/portal/whatever', + }, + }), + } as any); + + mockRepo.findOne.mockResolvedValue( + new Configuration({ + value: 'false', + name: CONFIG_VALUE.PORTAL_MAINTENANCE_MODE, + }), + ); + + const isAllowed = await guard.canActivate(mockContext); + expect(isAllowed).toEqual(true); + }); + + it('should reject if request is for portal and maintenance mode is on', async () => { + mockContext.switchToHttp.mockReturnValue({ + getRequest: () => ({ + routeOptions: { + url: '/portal/whatever', + }, + }), + } as any); + + mockRepo.findOne.mockResolvedValue( + new Configuration({ + value: 'true', + name: CONFIG_VALUE.PORTAL_MAINTENANCE_MODE, + }), + ); + + const promise = guard.canActivate(mockContext); + await expect(promise).rejects.toMatchObject( + new HttpException( + 'Portal is in Maintenance Mode', + HttpStatus.SERVICE_UNAVAILABLE, + ), + ); + }); + + it('should accept if request is for public and maintenance mode is off', async () => { + mockContext.switchToHttp.mockReturnValue({ + getRequest: () => ({ + routeOptions: { + url: '/public/whatever', + }, + }), + } as any); + + mockRepo.findOne.mockResolvedValue( + new Configuration({ + value: 'false', + name: CONFIG_VALUE.PORTAL_MAINTENANCE_MODE, + }), + ); + + const isAllowed = await guard.canActivate(mockContext); + expect(isAllowed).toEqual(true); + }); + + it('should reject if request is for public and maintenance mode is on', async () => { + mockContext.switchToHttp.mockReturnValue({ + getRequest: () => ({ + routeOptions: { + url: '/public/whatever', + }, + }), + } as any); + + mockRepo.findOne.mockResolvedValue( + new Configuration({ + value: 'true', + name: CONFIG_VALUE.PORTAL_MAINTENANCE_MODE, + }), + ); + + const promise = guard.canActivate(mockContext); + await expect(promise).rejects.toMatchObject( + new HttpException( + 'Portal is in Maintenance Mode', + HttpStatus.SERVICE_UNAVAILABLE, + ), + ); + }); +}); diff --git a/services/apps/alcs/src/portal/guards/maintenance.guard.ts b/services/apps/alcs/src/portal/guards/maintenance.guard.ts new file mode 100644 index 0000000000..6c28b7b296 --- /dev/null +++ b/services/apps/alcs/src/portal/guards/maintenance.guard.ts @@ -0,0 +1,51 @@ +import { + CanActivate, + ExecutionContext, + HttpException, + HttpStatus, + Injectable, +} from '@nestjs/common'; +import { InjectRepository } from '@nestjs/typeorm'; +import { Repository } from 'typeorm'; +import { + CONFIG_VALUE, + Configuration, +} from '../../common/entities/configuration.entity'; +import { FastifyRequest } from 'fastify'; + +@Injectable() +export class MaintenanceGuard implements CanActivate { + constructor( + @InjectRepository(Configuration) + private configurationRepository: Repository<Configuration>, + ) {} + + async canActivate(context: ExecutionContext): Promise<boolean> { + const req: FastifyRequest = context.switchToHttp().getRequest(); + + //Don't fire for CORS requests + if (req.method === 'OPTIONS') { + return true; + } + + if ( + req.routeOptions.url.startsWith('/portal') || + req.routeOptions.url.startsWith('/public') + ) { + const maintenanceMode = await this.configurationRepository.findOne({ + where: { + name: CONFIG_VALUE.PORTAL_MAINTENANCE_MODE, + }, + }); + + if (maintenanceMode && maintenanceMode.value === 'true') { + throw new HttpException( + 'Portal is in Maintenance Mode', + HttpStatus.SERVICE_UNAVAILABLE, + ); + } + } + + return true; + } +} diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1704411968891-add_config_table.ts b/services/apps/alcs/src/providers/typeorm/migrations/1704411968891-add_config_table.ts new file mode 100644 index 0000000000..ddde7f993e --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1704411968891-add_config_table.ts @@ -0,0 +1,19 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class AddConfigTable1704411968891 implements MigrationInterface { + name = 'AddConfigTable1704411968891'; + + public async up(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `CREATE TABLE "alcs"."configuration" ("name" character varying NOT NULL, "value" character varying NOT NULL, CONSTRAINT "PK_28ac27674364374c342e83cba9d" PRIMARY KEY ("name"))`, + ); + + await queryRunner.query(` + INSERT INTO "alcs"."configuration" ("name", "value") VALUES ('portal_maintenance_mode', 'false'); + `); + } + + public async down(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query(`DROP TABLE "alcs"."configuration"`); + } +} From 1684cd97b75fdecbf29ca51ae2c0919e8ca03baf Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Mon, 8 Jan 2024 08:49:13 -0800 Subject: [PATCH 882/954] Heavily refactor This refactoring is to address various drawing issues. --- .../primary-contact.component.html | 36 ++-- .../primary-contact.component.ts | 156 +++++++++--------- 2 files changed, 93 insertions(+), 99 deletions(-) diff --git a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html index b32b0c58fa..bccfd47502 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html @@ -23,8 +23,8 @@ <h2>Primary Contact</h2> </p> <mat-button-toggle-group class="input" - [formControl]="isExistingOwner" - (change)="onSelectPrimaryContactType(isExistingOwner.value)" + [value]="!selectedThirdPartyAgent" + (change)="onSelectPrimaryContactType($event)" > <mat-button-toggle [value]="true">Yes</mat-button-toggle> <mat-button-toggle [value]="false">No</mat-button-toggle> @@ -32,28 +32,32 @@ <h2>Primary Contact</h2> </div> <!-- Owner --> - <div *ngIf="isExistingOwner.value !== null && selectedThirdPartyAgent === false && parcelOwners.length > 0"> - <label + <div *ngIf="selectedThirdPartyAgent === false"> + <label *ngIf="selectedThirdPartyAgent === false && parcelOwners.length > 0" >Select a Primary Contact from the listed land owners <ng-container *ngIf="hasCrownParcels">and government contacts</ng-container></label > - <mat-radio-group color="primary" [value]="selectedOwnerUuid" required> - <mat-radio-button - *ngFor="let owner of parcelOwners" - [value]="owner.uuid" - class="radio-option" - (click)="onSelectOwner(owner.uuid)" - required - > + <mat-radio-group + [formControl]="ownersList" + color="primary" + [value]="selectedOwnerUuid" + (change)="onSelectOwner($event.value)" + required + > + <mat-radio-button *ngFor="let owner of parcelOwners" [value]="owner.uuid" class="radio-option" required> {{ owner.firstName }} {{ owner.lastName }} </mat-radio-button> </mat-radio-group> + <div *ngIf="ownersList.invalid && (ownersList.dirty || ownersList.touched)" class="field-error"> + <mat-icon>warning</mat-icon> + <div *ngIf="ownersList.errors?.['required']">This field is required</div> + </div> <div id="owner-info" class="warning-banner" - *ngIf="selectedOwnerUuid && selectedOwnerUuid !== 'agent' && !selectedLocalGovernment" + *ngIf="selectedOwnerUuid && !selectedThirdPartyAgent && !selectedLocalGovernment" > <div class="owner-details"> <div class="row"> @@ -83,9 +87,7 @@ <h2>Primary Contact</h2> </div> </div> </div> - <app-warning-banner - *ngIf="this.isExistingOwner.value === true && this.parcelOwners.length === 0 && !this.isGovernmentUser" - > + <app-warning-banner *ngIf="parcelOwners.length === 0 && !selectedThirdPartyAgent && !isGovernmentUser"> No landowners or government contacts are added. Please go back to Step 1 to add information. </app-warning-banner> <!-- /Owner --> @@ -171,7 +173,7 @@ <h2>Primary Contact</h2> </div> <!-- /Third-Part Agent/Government --> - <div class="form-row" *ngIf="isExistingOwner.value !== null && (needsAuthorizationLetter || files.length > 0)"> + <div class="form-row" *ngIf="needsAuthorizationLetter || files.length > 0"> <div class="full-row"> <label for="authorization-letter" class="subheading2">Authorization Letters</label> <p class="subtext"> diff --git a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts index e9731dd660..83e0ecabf9 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts @@ -1,7 +1,7 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; import { FormControl, FormGroup, Validators } from '@angular/forms'; import { MatDialog } from '@angular/material/dialog'; -import { takeUntil } from 'rxjs'; +import { distinct, first, takeUntil } from 'rxjs'; import { ApplicationDocumentDto } from '../../../../services/application-document/application-document.dto'; import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; import { ApplicationOwnerDto } from '../../../../services/application-owner/application-owner.dto'; @@ -20,6 +20,7 @@ import { PrimaryContactConfirmationDialogComponent } from './primary-contact-con import { OwnerDialogComponent } from '../../../../shared/owner-dialogs/owner-dialog/owner-dialog.component'; import { CrownOwnerDialogComponent } from '../../../../shared/owner-dialogs/crown-owner-dialog/crown-owner-dialog.component'; import { scrollToElement } from '../../../../shared/utils/scroll-helper'; +import { MatButtonToggleChange } from '@angular/material/button-toggle'; @Component({ selector: 'app-primary-contact', @@ -44,7 +45,7 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni showVirusError = false; hasCrownParcels = false; - isExistingOwner = new FormControl<boolean | null>(null, [Validators.required]); + ownersList = new FormControl<string | null>(null, [Validators.required]); firstName = new FormControl<string | null>('', [Validators.required]); lastName = new FormControl<string | null>('', [Validators.required]); organizationName = new FormControl<string | null>(''); @@ -114,16 +115,15 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni onSelectOwner(uuid: string) { this.isDirty = true; - this.selectedOwnerUuid = uuid; - const selectedOwner = this.parcelOwners.find((owner) => owner.uuid === uuid); + + const selectedOwner = this.owners.find((owner) => owner.uuid === uuid); this.parcelOwners = this.parcelOwners.map((owner) => ({ ...owner, isSelected: owner.uuid === uuid, })); - this.selectedThirdPartyAgent = (selectedOwner && selectedOwner.type.code === OWNER_TYPE.AGENT) || uuid == 'agent'; - this.selectedLocalGovernment = - (selectedOwner && selectedOwner.type.code === OWNER_TYPE.GOVERNMENT) || uuid == 'government'; - this.form.reset(); + + this.selectedThirdPartyAgent = selectedOwner?.type.code === OWNER_TYPE.AGENT || uuid == 'agent'; + this.selectedLocalGovernment = selectedOwner?.type.code === OWNER_TYPE.GOVERNMENT || uuid == 'government'; if (this.selectedLocalGovernment) { this.organizationName.setValidators([Validators.required]); @@ -131,23 +131,21 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni this.organizationName.setValidators([]); } - if (this.selectedThirdPartyAgent || this.selectedLocalGovernment) { - this.isCrownOwner = false; - } else { - if (selectedOwner) { - this.form.patchValue({ - firstName: selectedOwner.firstName, - lastName: selectedOwner.lastName, - organizationName: selectedOwner.organizationName, - phoneNumber: selectedOwner.phoneNumber, - email: selectedOwner.email, - }); - this.isCrownOwner = selectedOwner.type.code === OWNER_TYPE.CROWN; - } + if (selectedOwner) { + this.form.patchValue({ + firstName: selectedOwner.firstName, + lastName: selectedOwner.lastName, + organizationName: selectedOwner.organizationName, + phoneNumber: selectedOwner.phoneNumber, + email: selectedOwner.email, + }); + this.isCrownOwner = selectedOwner.type.code === OWNER_TYPE.CROWN; } + this.calculateLetterRequired(); setTimeout(() => { + this.selectedOwnerUuid = uuid; scrollToElement({ id: 'owner-info', center: false }); }); } @@ -170,7 +168,7 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni } protected async save() { - if (this.isDirty || this.form.dirty || this.isExistingOwner.value) { + if (this.isDirty || this.form.dirty || !this.selectedThirdPartyAgent) { let selectedOwner: ApplicationOwnerDto | undefined = this.owners.find( (owner) => owner.uuid === this.selectedOwnerUuid ); @@ -205,72 +203,61 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni //Map Owners from Parcels to only count linked ones const parcels = await this.applicationParcelService.fetchBySubmissionUuid(submissionUuid); const allOwners = await this.applicationOwnerService.fetchBySubmissionId(submissionUuid); - if (parcels && allOwners) { - this.hasCrownParcels = - !!parcels && parcels.some((parcel) => parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPE.CROWN); - - const uniqueParcelOwners = parcels - .flatMap((parcel) => parcel.owners) - .reduce((map, owner) => { - return map.set(owner.uuid, owner); - }, new Map<string, ApplicationOwnerDto>()); - const nonParcelOwners = allOwners.filter((owner) => - [OWNER_TYPE.AGENT, OWNER_TYPE.GOVERNMENT].includes(owner.type.code) - ); - const parcelOwners = [...uniqueParcelOwners.values()]; - const owners = [...parcelOwners, ...nonParcelOwners]; - const selectedOwner = owners.find((owner) => owner.uuid === primaryContactOwnerUuid); - this.parcelOwners = owners.filter( - (owner) => ![OWNER_TYPE.AGENT, OWNER_TYPE.GOVERNMENT].includes(owner.type.code) - ); - - this.parcelOwners = parcelOwners; - this.owners = owners; - - if (selectedOwner) { - this.selectedThirdPartyAgent = selectedOwner.type.code === OWNER_TYPE.AGENT; - this.selectedLocalGovernment = selectedOwner.type.code === OWNER_TYPE.GOVERNMENT; - } - this.isExistingOwner.setValue(!this.selectedThirdPartyAgent); - this.switchPrimaryContactType(!this.selectedThirdPartyAgent); - - if (this.selectedLocalGovernment) { - this.organizationName.setValidators([Validators.required]); - } else { - this.organizationName.setValidators([]); - } + if (!parcels || !allOwners) { + return; + } - if (selectedOwner && (this.selectedThirdPartyAgent || this.selectedLocalGovernment)) { - this.selectedOwnerUuid = selectedOwner.uuid; - this.form.patchValue({ - firstName: selectedOwner.firstName, - lastName: selectedOwner.lastName, - organizationName: selectedOwner.organizationName, - phoneNumber: selectedOwner.phoneNumber, - email: selectedOwner.email, - }); - } else if (selectedOwner) { - this.onSelectOwner(selectedOwner.uuid); - } + this.hasCrownParcels = + !!parcels && parcels.some((parcel) => parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPE.CROWN); + + const uniqueParcelOwners = parcels + .flatMap((parcel) => parcel.owners) + .reduce((map, owner) => { + return map.set(owner.uuid, owner); + }, new Map<string, ApplicationOwnerDto>()); + const nonParcelOwners = allOwners.filter((owner) => + [OWNER_TYPE.AGENT, OWNER_TYPE.GOVERNMENT].includes(owner.type.code) + ); + const parcelOwners = [...uniqueParcelOwners.values()]; + const owners = [...parcelOwners, ...nonParcelOwners]; + + this.parcelOwners = parcelOwners; + this.owners = owners; + + const selectedOwner = owners.find((owner) => owner.uuid === primaryContactOwnerUuid); + + // onSelectOwner only not called on first load of page + if (selectedOwner) { + this.onSelectOwner(selectedOwner.uuid); + } else if (parcelOwners.length === 1) { + this.onSelectOwner(parcelOwners[0].uuid); + } - if (this.isGovernmentUser || this.selectedLocalGovernment) { - this.prepareGovernmentOwners(); - } + // Needed for L/FNG user on first load + this.selectedLocalGovernment = selectedOwner?.type.code === OWNER_TYPE.GOVERNMENT; + if (this.isGovernmentUser && this.selectedLocalGovernment) { + this.organizationName.setValidators([Validators.required]); + this.prepareGovernmentOwners(); + } else { + this.organizationName.setValidators([]); + } - if (this.showErrors) { - this.form.markAllAsTouched(); - } - this.isDirty = false; - this.calculateLetterRequired(); + if (this.showErrors) { + this.form.markAllAsTouched(); + this.ownersList.markAsTouched(); } + this.isDirty = false; + this.calculateLetterRequired(); } private prepareGovernmentOwners() { this.parcelOwners = []; } - async onSelectPrimaryContactType(isExistingOwner: boolean | null) { + async onSelectPrimaryContactType(event: MatButtonToggleChange) { + const isExistingOwner = event.value; + const isDirty = this.firstName.value || this.lastName.value || @@ -293,8 +280,6 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni if (confirmed) { this.form.reset(); this.switchPrimaryContactType(isExistingOwner); - } else { - this.isExistingOwner.setValue(!isExistingOwner); } }); } else { @@ -314,8 +299,10 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni this.onSelectOwner(this.parcelOwners[0].uuid); } else { // = 0 or > 1 existing owners - this.selectedThirdPartyAgent = false; - this.selectedOwnerUuid = undefined; + if (this.selectedThirdPartyAgent) { + this.selectedOwnerUuid = undefined; + this.selectedThirdPartyAgent = false; + } } } @@ -353,7 +340,12 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni if (updatedContact?.action === 'delete') { this.parcelOwners = this.parcelOwners.filter((owner) => owner.uuid !== this.selectedOwnerUuid); - this.selectedOwnerUuid = undefined; + + if (this.parcelOwners.length === 1) { + this.onSelectOwner(this.parcelOwners[0].uuid); + } else { + this.selectedOwnerUuid = undefined; + } } }); } From 8a74808bc26a564238ec4f7ab61aedf8e76f7eee Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Mon, 8 Jan 2024 08:52:31 -0800 Subject: [PATCH 883/954] Address console warnings --- .../primary-contact-confirmation-dialog.component.html | 2 +- .../primary-contact-confirmation-dialog.component.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact-confirmation-dialog/primary-contact-confirmation-dialog.component.html b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact-confirmation-dialog/primary-contact-confirmation-dialog.component.html index 0bf2ba7a70..cd56059381 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact-confirmation-dialog/primary-contact-confirmation-dialog.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact-confirmation-dialog/primary-contact-confirmation-dialog.component.html @@ -1,7 +1,7 @@ <div mat-dialog-title> <h4> <ng-container *ngIf="isGovernmentUser"> - Will {{ governmentName ?? 'Local / First Nation Government' }} staff be the primary contact? + Will {{ governmentName || 'Local / First Nation Government' }} staff be the primary contact? </ng-container> <ng-container *ngIf="!isGovernmentUser"> Will one of the landowners or government contacts added previously be the primary contact? diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact-confirmation-dialog/primary-contact-confirmation-dialog.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact-confirmation-dialog/primary-contact-confirmation-dialog.component.html index 0bf2ba7a70..cd56059381 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact-confirmation-dialog/primary-contact-confirmation-dialog.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact-confirmation-dialog/primary-contact-confirmation-dialog.component.html @@ -1,7 +1,7 @@ <div mat-dialog-title> <h4> <ng-container *ngIf="isGovernmentUser"> - Will {{ governmentName ?? 'Local / First Nation Government' }} staff be the primary contact? + Will {{ governmentName || 'Local / First Nation Government' }} staff be the primary contact? </ng-container> <ng-container *ngIf="!isGovernmentUser"> Will one of the landowners or government contacts added previously be the primary contact? From e7be4feb4097aacca01a9912cc15cb8107687a11 Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Mon, 8 Jan 2024 09:00:07 -0800 Subject: [PATCH 884/954] Allow NOI primary contact to be unset --- .../notice-of-intent-owner.controller.ts | 31 ++++++++++--------- .../notice-of-intent-owner.service.ts | 15 ++++----- 2 files changed, 25 insertions(+), 21 deletions(-) diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.controller.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.controller.ts index 4355536003..65a6a566cb 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.controller.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.controller.ts @@ -179,20 +179,23 @@ export class NoticeOfIntentOwnerController { //Create Owner if (!data.ownerUuid) { await this.ownerService.deleteNonParcelOwners(applicationSubmission.uuid); - const newOwner = await this.ownerService.create( - { - email: data.email, - typeCode: data.type, - lastName: data.lastName, - firstName: data.firstName, - phoneNumber: data.phoneNumber, - organizationName: data.organization, - noticeOfIntentSubmissionUuid: data.noticeOfIntentSubmissionUuid, - crownLandOwnerType: data.crownLandOwnerType, - }, - applicationSubmission, - req.user.entity, - ); + const newOwner = + data.type === OWNER_TYPE.AGENT || data.type == OWNER_TYPE.GOVERNMENT + ? await this.ownerService.create( + { + email: data.email, + typeCode: data.type, + lastName: data.lastName, + firstName: data.firstName, + phoneNumber: data.phoneNumber, + organizationName: data.organization, + noticeOfIntentSubmissionUuid: data.noticeOfIntentSubmissionUuid, + crownLandOwnerType: data.crownLandOwnerType, + }, + applicationSubmission, + req.user.entity, + ) + : undefined; await this.ownerService.setPrimaryContact( applicationSubmission.uuid, newOwner, diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.service.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.service.ts index 72fcc9811a..e429b762db 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.service.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.service.ts @@ -92,9 +92,8 @@ export class NoticeOfIntentOwnerService { }, }); - const parcel = await this.noticeOfIntentParcelService.getOneOrFail( - parcelUuid, - ); + const parcel = + await this.noticeOfIntentParcelService.getOneOrFail(parcelUuid); existingOwner.parcels.push(parcel); await this.repository.save(existingOwner); @@ -193,8 +192,10 @@ export class NoticeOfIntentOwnerService { existingOwner.email = updateDto.email !== undefined ? updateDto.email : existingOwner.email; - existingOwner.crownLandOwnerType = - updateDto.crownLandOwnerType !== undefined ? updateDto.crownLandOwnerType : existingOwner.crownLandOwnerType; + existingOwner.crownLandOwnerType = + updateDto.crownLandOwnerType !== undefined + ? updateDto.crownLandOwnerType + : existingOwner.crownLandOwnerType; const savedOwner = await this.repository.save(existingOwner); @@ -217,12 +218,12 @@ export class NoticeOfIntentOwnerService { async setPrimaryContact( submissionUuid: string, - owner: NoticeOfIntentOwner, + owner: NoticeOfIntentOwner | undefined, user: User, ) { await this.noticeOfIntentSubmissionService.setPrimaryContact( submissionUuid, - owner.uuid, + owner?.uuid ?? null, user, ); } From 436d05a18cb9a3c1226997388b9c804372fb238b Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Mon, 8 Jan 2024 09:01:02 -0800 Subject: [PATCH 885/954] Clean up unused imports --- .../primary-contact/primary-contact.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts index 83e0ecabf9..75edb8789c 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts @@ -1,7 +1,7 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; import { FormControl, FormGroup, Validators } from '@angular/forms'; import { MatDialog } from '@angular/material/dialog'; -import { distinct, first, takeUntil } from 'rxjs'; +import { takeUntil } from 'rxjs'; import { ApplicationDocumentDto } from '../../../../services/application-document/application-document.dto'; import { ApplicationDocumentService } from '../../../../services/application-document/application-document.service'; import { ApplicationOwnerDto } from '../../../../services/application-owner/application-owner.dto'; From d21846603224f539e5605879ede9c3439405fb99 Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Mon, 8 Jan 2024 09:16:06 -0800 Subject: [PATCH 886/954] Catch NOI's up to applications --- .../primary-contact.component.html | 35 ++-- .../primary-contact.component.ts | 196 ++++++++---------- 2 files changed, 103 insertions(+), 128 deletions(-) diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html index f87954a15b..e21171f08a 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html @@ -24,8 +24,8 @@ <h2>Primary Contact</h2> <mat-button-toggle-group class="input" - [formControl]="isExistingOwner" - (change)="onSelectPrimaryContactType(isExistingOwner.value)" + [value]="!selectedThirdPartyAgent" + (change)="onSelectPrimaryContactType($event)" > <mat-button-toggle [value]="true">Yes</mat-button-toggle> <mat-button-toggle [value]="false">No</mat-button-toggle> @@ -33,23 +33,27 @@ <h2>Primary Contact</h2> </div> <!-- Owner --> - <div *ngIf="isExistingOwner.value !== null && selectedThirdPartyAgent === false && parcelOwners.length > 0"> - <label + <div *ngIf="selectedThirdPartyAgent === false"> + <label *ngIf="selectedThirdPartyAgent === false && parcelOwners.length > 0" >Select a Primary Contact from the listed land owners <ng-container *ngIf="hasCrownParcels">and government contacts</ng-container></label > - <mat-radio-group color="primary" [value]="selectedOwnerUuid" required> - <mat-radio-button - *ngFor="let owner of parcelOwners" - [value]="owner.uuid" - class="radio-option" - (click)="onSelectOwner(owner.uuid)" - required - > + <mat-radio-group + [formControl]="ownersList" + color="primary" + [value]="selectedOwnerUuid" + (change)="onSelectOwner($event.value)" + required + > + <mat-radio-button *ngFor="let owner of parcelOwners" [value]="owner.uuid" class="radio-option" required> {{ owner.firstName }} {{ owner.lastName }} </mat-radio-button> </mat-radio-group> + <div *ngIf="ownersList.invalid && (ownersList.dirty || ownersList.touched)" class="field-error"> + <mat-icon>warning</mat-icon> + <div *ngIf="ownersList.errors?.['required']">This field is required</div> + </div> <div id="owner-info" @@ -84,7 +88,7 @@ <h2>Primary Contact</h2> </div> </div> </div> - <app-warning-banner *ngIf="showNoOwnersWarning"> + <app-warning-banner *ngIf="parcelOwners.length === 0 && !isGovernmentUser && !selectedThirdPartyAgent"> No landowners or government contacts are added. Please go back to Step 1 to add information. </app-warning-banner> <!-- /Owner --> @@ -170,10 +174,7 @@ <h2>Primary Contact</h2> </div> <!-- /Third-Part Agent/Government --> - <div - class="form-row" - *ngIf="isExistingOwner.value !== null && (needsAuthorizationLetter || hasCrownParcels || files.length > 0)" - > + <div class="form-row" *ngIf="needsAuthorizationLetter || hasCrownParcels || files.length > 0"> <div class="full-row"> <label for="authorization-letter" class="subheading2">Authorization Letters</label> <p class="subtext"> diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts index 35e7344bc8..169b8b7c1b 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts @@ -21,6 +21,7 @@ import { OwnerDialogComponent } from '../../../../shared/owner-dialogs/owner-dia import { PrimaryContactConfirmationDialogComponent } from './primary-contact-confirmation-dialog/primary-contact-confirmation-dialog.component'; import { CrownOwnerDialogComponent } from '../../../../shared/owner-dialogs/crown-owner-dialog/crown-owner-dialog.component'; import { scrollToElement } from '../../../../shared/utils/scroll-helper'; +import { MatButtonToggleChange } from '@angular/material/button-toggle'; @Component({ selector: 'app-primary-contact', @@ -44,9 +45,8 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni governmentName: string | undefined; isDirty = false; hasCrownParcels = false; - showNoOwnersWarning = false; - isExistingOwner = new FormControl<boolean | null>(null, [Validators.required]); + ownersList = new FormControl<string | null>(null, [Validators.required]); firstName = new FormControl<string | null>('', [Validators.required]); lastName = new FormControl<string | null>('', [Validators.required]); organizationName = new FormControl<string | null>(''); @@ -117,16 +117,15 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni onSelectOwner(uuid: string) { this.isDirty = true; - this.selectedOwnerUuid = uuid; + const selectedOwner = this.parcelOwners.find((owner) => owner.uuid === uuid); this.parcelOwners = this.parcelOwners.map((owner) => ({ ...owner, isSelected: owner.uuid === uuid, })); - this.selectedThirdPartyAgent = (selectedOwner && selectedOwner.type.code === OWNER_TYPE.AGENT) || uuid == 'agent'; - this.selectedLocalGovernment = - (selectedOwner && selectedOwner.type.code === OWNER_TYPE.GOVERNMENT) || uuid == 'government'; - this.form.reset(); + + this.selectedThirdPartyAgent = selectedOwner?.type.code === OWNER_TYPE.AGENT || uuid == 'agent'; + this.selectedLocalGovernment = selectedOwner?.type.code === OWNER_TYPE.GOVERNMENT || uuid == 'government'; if (this.selectedLocalGovernment) { this.organizationName.setValidators([Validators.required]); @@ -134,34 +133,21 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni this.organizationName.setValidators([]); } - if (this.selectedThirdPartyAgent || this.selectedLocalGovernment) { - this.firstName.enable(); - this.lastName.enable(); - this.organizationName.enable(); - this.email.enable(); - this.phoneNumber.enable(); - this.isCrownOwner = false; - } else { - this.firstName.disable(); - this.lastName.disable(); - this.organizationName.disable(); - this.email.disable(); - this.phoneNumber.disable(); - - if (selectedOwner) { - this.form.patchValue({ - firstName: selectedOwner.firstName, - lastName: selectedOwner.lastName, - organizationName: selectedOwner.organizationName, - phoneNumber: selectedOwner.phoneNumber, - email: selectedOwner.email, - }); - this.isCrownOwner = selectedOwner.type.code === OWNER_TYPE.CROWN; - } + if (selectedOwner) { + this.form.patchValue({ + firstName: selectedOwner.firstName, + lastName: selectedOwner.lastName, + organizationName: selectedOwner.organizationName, + phoneNumber: selectedOwner.phoneNumber, + email: selectedOwner.email, + }); + this.isCrownOwner = selectedOwner.type.code === OWNER_TYPE.CROWN; } + this.calculateLetterRequired(); setTimeout(() => { + this.selectedOwnerUuid = uuid; scrollToElement({ id: 'owner-info', center: false }); }); } @@ -184,7 +170,7 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni } protected async save() { - if (this.isDirty || this.form.dirty) { + if (this.isDirty || this.form.dirty || !this.selectedThirdPartyAgent) { let selectedOwner: NoticeOfIntentOwnerDto | undefined = this.owners.find( (owner) => owner.uuid === this.selectedOwnerUuid ); @@ -200,10 +186,10 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni ownerUuid: selectedOwner?.uuid, type: this.selectedThirdPartyAgent ? OWNER_TYPE.AGENT : OWNER_TYPE.GOVERNMENT, }); - } else if (selectedOwner) { + } else { await this.noticeOfIntentOwnerService.setPrimaryContact({ noticeOfIntentSubmissionUuid: this.submissionUuid, - ownerUuid: selectedOwner.uuid, + ownerUuid: selectedOwner?.uuid, }); } await this.reloadSubmission(); @@ -219,79 +205,69 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni //Map Owners from Parcels to only count linked ones const parcels = await this.parcelService.fetchBySubmissionUuid(submissionUuid); const allOwners = await this.noticeOfIntentOwnerService.fetchBySubmissionId(submissionUuid); - if (parcels && allOwners) { - this.hasCrownParcels = - !!parcels && parcels.some((parcel) => parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPE.CROWN); - - const uniqueParcelOwners = parcels - .flatMap((parcel) => parcel.owners) - .reduce((map, owner) => { - return map.set(owner.uuid, owner); - }, new Map<string, NoticeOfIntentOwnerDto>()); - const nonParcelOwners = allOwners.filter((owner) => - [OWNER_TYPE.AGENT, OWNER_TYPE.GOVERNMENT].includes(owner.type.code) - ); - const parcelOwners = [...uniqueParcelOwners.values()]; - const owners = [...parcelOwners, ...nonParcelOwners]; - const selectedOwner = owners.find((owner) => owner.uuid === primaryContactOwnerUuid); - this.parcelOwners = owners.filter( - (owner) => ![OWNER_TYPE.AGENT, OWNER_TYPE.GOVERNMENT].includes(owner.type.code) - ); - - this.parcelOwners = parcelOwners; - this.owners = owners; - - if (selectedOwner) { - this.selectedThirdPartyAgent = selectedOwner.type.code === OWNER_TYPE.AGENT; - this.selectedLocalGovernment = selectedOwner.type.code === OWNER_TYPE.GOVERNMENT; - - this.isExistingOwner.setValue(!this.selectedThirdPartyAgent); - } - - if (this.selectedLocalGovernment) { - this.organizationName.setValidators([Validators.required]); - } else { - this.organizationName.setValidators([]); - } + if (!parcels || !allOwners) { + return; + } - if (selectedOwner && (this.selectedThirdPartyAgent || this.selectedLocalGovernment)) { - this.selectedOwnerUuid = selectedOwner.uuid; - this.form.patchValue({ - firstName: selectedOwner.firstName, - lastName: selectedOwner.lastName, - organizationName: selectedOwner.organizationName, - phoneNumber: selectedOwner.phoneNumber, - email: selectedOwner.email, - }); - } else if (selectedOwner) { - this.onSelectOwner(selectedOwner.uuid); - } else { - this.firstName.disable(); - this.lastName.disable(); - this.organizationName.disable(); - this.email.disable(); - this.phoneNumber.disable(); - } + this.hasCrownParcels = + !!parcels && parcels.some((parcel) => parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPE.CROWN); + + const uniqueParcelOwners = parcels + .flatMap((parcel) => parcel.owners) + .reduce((map, owner) => { + return map.set(owner.uuid, owner); + }, new Map<string, NoticeOfIntentOwnerDto>()); + const nonParcelOwners = allOwners.filter((owner) => + [OWNER_TYPE.AGENT, OWNER_TYPE.GOVERNMENT].includes(owner.type.code) + ); + const parcelOwners = [...uniqueParcelOwners.values()]; + const owners = [...parcelOwners, ...nonParcelOwners]; + + const selectedOwner = owners.find((owner) => owner.uuid === primaryContactOwnerUuid); + this.parcelOwners = owners.filter((owner) => ![OWNER_TYPE.AGENT, OWNER_TYPE.GOVERNMENT].includes(owner.type.code)); + + this.parcelOwners = parcelOwners; + this.owners = owners; + + // onSelectOwner only not called on first load of page + if (selectedOwner) { + this.onSelectOwner(selectedOwner.uuid); + } else if (parcelOwners.length === 1) { + this.onSelectOwner(parcelOwners[0].uuid); + } - if (this.isGovernmentUser || this.selectedLocalGovernment) { - this.prepareGovernmentOwners(); - } + // Needed for L/FNG user on first load + this.selectedLocalGovernment = selectedOwner?.type.code === OWNER_TYPE.GOVERNMENT; + if (this.selectedLocalGovernment) { + this.organizationName.setValidators([Validators.required]); + this.prepareGovernmentOwners(); + } else { + this.organizationName.setValidators([]); + } - if (this.showErrors) { - this.form.markAllAsTouched(); - } - this.isDirty = false; - this.calculateLetterRequired(); + if (this.showErrors) { + this.form.markAllAsTouched(); } + this.isDirty = false; + this.calculateLetterRequired(); } private prepareGovernmentOwners() { this.parcelOwners = []; } - async onSelectPrimaryContactType(isExistingOwner: boolean | null) { - if (this.form.dirty || (!isExistingOwner && this.selectedOwnerUuid && !this.isGovernmentUser)) { + async onSelectPrimaryContactType(event: MatButtonToggleChange) { + const isExistingOwner = event.value; + + const isDirty = + this.firstName.value || + this.lastName.value || + this.organizationName.value || + this.phoneNumber.value || + this.email.value; + + if (isDirty) { await this.dialog .open(PrimaryContactConfirmationDialogComponent, { panelClass: 'no-padding', @@ -304,9 +280,8 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni .beforeClosed() .subscribe(async (confirmed) => { if (confirmed) { + this.form.reset(); this.switchPrimaryContactType(isExistingOwner); - } else { - this.isExistingOwner.setValue(!isExistingOwner); } }); } else { @@ -316,22 +291,19 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni private switchPrimaryContactType(isExistingOwner: boolean | null) { if (!isExistingOwner) { + // '3rd-party agent this.onSelectAgent(); } else if (this.isGovernmentUser) { + // L/FNG contact this.onSelectGovernment(); } else if (this.parcelOwners.length === 1) { + // Only 1 existing user this.onSelectOwner(this.parcelOwners[0].uuid); - } else { - this.selectedThirdPartyAgent = false; + } else if (this.selectedThirdPartyAgent) { + // = 0 or > 1 existing owners this.selectedOwnerUuid = undefined; + this.selectedThirdPartyAgent = false; } - - // Ensure form is cleared to avoid erroneous confirmation dialogs - if (this.selectedThirdPartyAgent || this.selectedLocalGovernment) { - this.form.reset(); - } - - this.showNoOwnersWarning = isExistingOwner === true && this.parcelOwners.length === 0 && !this.isGovernmentUser; } onEdit(selectedOwnerUuid: string) { @@ -366,12 +338,14 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni this.email.setValue(updatedContact.email); } - if (updatedContact['action'] === 'delete') { + if (updatedContact?.action === 'delete') { this.parcelOwners = this.parcelOwners.filter((owner) => owner.uuid !== this.selectedOwnerUuid); - this.selectedOwnerUuid = undefined; - this.showNoOwnersWarning = - this.isExistingOwner.value === true && this.parcelOwners.length === 0 && !this.isGovernmentUser; + if (this.parcelOwners.length === 1) { + this.onSelectOwner(this.parcelOwners[0].uuid); + } else { + this.selectedOwnerUuid = undefined; + } } }); } From a7c5e8fecc07f62e092b6fb7c8f187ea242a5278 Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Mon, 8 Jan 2024 09:17:21 -0800 Subject: [PATCH 887/954] Simplify/clarify control flow --- .../primary-contact/primary-contact.component.ts | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts index 75edb8789c..3ba80ce52b 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts @@ -297,12 +297,10 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni } else if (this.parcelOwners.length === 1) { // Only 1 existing user this.onSelectOwner(this.parcelOwners[0].uuid); - } else { + } else if (this.selectedThirdPartyAgent) { // = 0 or > 1 existing owners - if (this.selectedThirdPartyAgent) { - this.selectedOwnerUuid = undefined; - this.selectedThirdPartyAgent = false; - } + this.selectedOwnerUuid = undefined; + this.selectedThirdPartyAgent = false; } } From 105bd1f656a21a35fcc18f2e5553a35935dc59c2 Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Mon, 8 Jan 2024 09:58:00 -0800 Subject: [PATCH 888/954] fixes --- .../decision-v2/release-dialog/release-dialog.component.html | 5 ++++- .../decision-v2/release-dialog/release-dialog.component.html | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/release-dialog/release-dialog.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/release-dialog/release-dialog.component.html index a53ef66038..4b627f2d46 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/release-dialog/release-dialog.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/release-dialog/release-dialog.component.html @@ -16,7 +16,10 @@ <h2 class="card-title">Confirm Release Decision</h2> If this decision is being released for the first time, the Applicant and Local/First Nation Government will receive an auto-email containing a link to the decision document(s). Otherwise an auto-email will not be sent. </p> - <p *ngIf="!wasReleased">The Applicant and Local/First Nation Government will receive an auto-email notification.</p> + <p *ngIf="!wasReleased"> + If this decision is being released for the first time, the Applicant and Local/First Nation Government will receive + an auto-email containing a link to the decision document(s). Otherwise an auto-email will not be sent. + </p> </div> </mat-dialog-content> diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/release-dialog/release-dialog.component.html b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/release-dialog/release-dialog.component.html index a53ef66038..4b627f2d46 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/release-dialog/release-dialog.component.html +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/release-dialog/release-dialog.component.html @@ -16,7 +16,10 @@ <h2 class="card-title">Confirm Release Decision</h2> If this decision is being released for the first time, the Applicant and Local/First Nation Government will receive an auto-email containing a link to the decision document(s). Otherwise an auto-email will not be sent. </p> - <p *ngIf="!wasReleased">The Applicant and Local/First Nation Government will receive an auto-email notification.</p> + <p *ngIf="!wasReleased"> + If this decision is being released for the first time, the Applicant and Local/First Nation Government will receive + an auto-email containing a link to the decision document(s). Otherwise an auto-email will not be sent. + </p> </div> </mat-dialog-content> From a745fa3905433cb19457b5edcc19995cdcf2c0f0 Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Mon, 8 Jan 2024 10:03:19 -0800 Subject: [PATCH 889/954] update elt to support 1 project duration field instead of 2 (#1266) update application related etls to map one project duration field instead of two update notice of intent related etls to map one project duration field instead of two --- .../submissions/data_insert/insert_query.py | 20 +++++-------------- .../data_insert/submap/soil_elements.py | 5 ++--- .../notice_of_intent_fill_fields_update.py | 12 +++++------ .../notice_of_intent_soil_fields.py | 15 +++++++------- .../notice_of_intent_soil_fields_update.sql | 12 +++++------ ...ice_of_intent_soil_fields_update_count.sql | 11 ++++------ 6 files changed, 29 insertions(+), 46 deletions(-) diff --git a/bin/migrate-oats-data/applications/submissions/data_insert/insert_query.py b/bin/migrate-oats-data/applications/submissions/data_insert/insert_query.py index 30a9a5f2de..fa1b49fa3c 100644 --- a/bin/migrate-oats-data/applications/submissions/data_insert/insert_query.py +++ b/bin/migrate-oats-data/applications/submissions/data_insert/insert_query.py @@ -156,10 +156,9 @@ def get_insert_query_for_nfu(): nfu_will_import_fill, nfu_fill_volume, nfu_max_fill_depth, - nfu_project_duration_amount, + nfu_project_duration, nfu_fill_type_description, nfu_fill_origin_description, - nfu_project_duration_unit, nfu_total_fill_area, nfu_agriculture_support, nfu_outside_lands @@ -171,7 +170,6 @@ def get_insert_query_for_nfu(): %(fill_duration)s, %(fill_type)s, %(fill_origin)s, - %(duration_unit)s, %(fill_area)s, %(support_desc)s, %(proposal_background_desc)s @@ -185,10 +183,9 @@ def get_insert_query_for_naru(): naru_to_place_volume, naru_to_place_maximum_depth, naru_to_place_average_depth, - naru_project_duration_amount, + naru_project_duration, naru_fill_type, naru_fill_origin, - naru_project_duration_unit, naru_to_place_area, naru_subtype_code, naru_infrastructure, @@ -207,7 +204,6 @@ def get_insert_query_for_naru(): %(fill_duration)s, %(fill_type)s, %(fill_origin)s, - %(duration_unit)s, %(fill_area)s, %(rsdntl_use_type_code)s, %(infra_desc)s, @@ -264,8 +260,7 @@ def get_insert_query_for_soil(): soil_to_remove_area, soil_to_remove_maximum_depth, soil_to_remove_average_depth, - soil_project_duration_amount, - soil_project_duration_unit, + soil_project_duration, soil_fill_type_to_place, soil_alternative_measures, soil_to_place_volume, @@ -284,7 +279,6 @@ def get_insert_query_for_soil(): %(max_remove_depth)s, %(max_remove_depth)s, %(duration)s, - %(duration_unit)s, %(fill_type)s, %(alternative_measures_desc)s, %(total_fill)s, @@ -306,10 +300,8 @@ def get_insert_query_for_pfrs(): soil_to_remove_area, soil_to_remove_maximum_depth, soil_to_remove_average_depth, - soil_project_duration_amount, - fill_project_duration_amount, - soil_project_duration_unit, - fill_project_duration_unit, + soil_project_duration, + fill_project_duration, soil_fill_type_to_place, soil_alternative_measures, soil_to_place_volume, @@ -329,8 +321,6 @@ def get_insert_query_for_pfrs(): %(max_remove_depth)s, %(remove_duration)s, %(fill_duration)s, - %(duration_unit)s, - %(duration_unit)s, %(fill_type)s, %(alternative_measures_desc)s, %(total_fill)s, diff --git a/bin/migrate-oats-data/applications/submissions/data_insert/submap/soil_elements.py b/bin/migrate-oats-data/applications/submissions/data_insert/submap/soil_elements.py index 7dacf968b4..7c0a6ac288 100644 --- a/bin/migrate-oats-data/applications/submissions/data_insert/submap/soil_elements.py +++ b/bin/migrate-oats-data/applications/submissions/data_insert/submap/soil_elements.py @@ -85,7 +85,6 @@ def map_soil_data(data, soil_data): data["import_fill"] = soil_data.get(data[app_component_id], {}).get( "import_fill", None ) - data["duration_unit"] = "months" data["remove_type"] = soil_data.get(data[app_component_id], {}).get( "remove_type", None ) @@ -101,7 +100,8 @@ def map_soil_data(data, soil_data): data["remove_duration"] = soil_data.get(data[app_component_id], {}).get( "remove_duration", None ) - data["duration"] = soil_data.get(data[app_component_id], {}).get("duration", None) + duration = soil_data.get(data[app_component_id], {}).get("duration") + data["duration"] = f"{duration} months" if duration is not None else None data["remove_area"] = soil_data.get(data[app_component_id], {}).get( "remove_area", None ) @@ -127,7 +127,6 @@ def add_soil_field(data): data["remove_duration"] = None data["duration"] = None data["remove_area"] = None - data["duration_unit"] = None data["alternative_measures_desc"] = None return data diff --git a/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_fill_fields_update.py b/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_fill_fields_update.py index fcb7775482..e6fcd59780 100644 --- a/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_fill_fields_update.py +++ b/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_fill_fields_update.py @@ -25,7 +25,7 @@ def update_alcs_notice_of_intent_soil_fill_fields( count_total = dict(cursor.fetchone())["count"] logger.info(f"Total Notice of Intents data to update: {count_total}") - failed_inserts = 0 + failed_inserts_count = 0 successful_updates_count = 0 last_document_id = 0 @@ -61,11 +61,11 @@ def update_alcs_notice_of_intent_soil_fill_fields( # this is NOT going to be caused by actual data update failure. This code is only executed when the code error appears or connection to DB is lost logger.exception() conn.rollback() - failed_inserts = count_total - successful_updates_count + failed_inserts_count = count_total - successful_updates_count last_document_id = last_document_id + 1 logger.info( - f"Finished {etl_name}: total amount of successful updates {successful_updates_count}, total failed updates {failed_inserts}" + f"Finished {etl_name}: total amount of successful updates {successful_updates_count}, total failed updates {failed_inserts_count}" ) @@ -83,9 +83,7 @@ def _update_records(conn, batch_size, cursor, rows): _update_query = """ UPDATE alcs.notice_of_intent_submission - SET soil_project_duration_amount = %(fill_project_duration_amount)s, - soil_project_duration_unit = %(fill_project_duration_unit)s, - fill_project_duration_amount = NULL, - fill_project_duration_unit = NULL + SET soil_project_duration = %(fill_project_duration)s, + fill_project_duration = NULL WHERE file_number = %(file_number)s """ diff --git a/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_soil_fields.py b/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_soil_fields.py index 2ebadb91de..d3ebb24b68 100644 --- a/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_soil_fields.py +++ b/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_soil_fields.py @@ -33,7 +33,7 @@ def process_alcs_notice_of_intent_soil_fields(conn=None, batch_size=BATCH_UPLOAD count_total = dict(cursor.fetchone())["count"] logger.info(f"Total Notice of Intents data to update: {count_total}") - failed_inserts = 0 + failed_inserts_count = 0 successful_updates_count = 0 last_soil_change_element_id = 0 @@ -71,11 +71,11 @@ def process_alcs_notice_of_intent_soil_fields(conn=None, batch_size=BATCH_UPLOAD # this is NOT going to be caused by actual data update failure. This code is only executed when the code error appears or connection to DB is lost logger.exception() conn.rollback() - failed_inserts = count_total - successful_updates_count + failed_inserts_count = count_total - successful_updates_count last_soil_change_element_id = last_soil_change_element_id + 1 logger.info( - f"Finished {etl_name}: total amount of successful updates {successful_updates_count}, total failed updates {failed_inserts}" + f"Finished {etl_name}: total amount of successful updates {successful_updates_count}, total failed updates {failed_inserts_count}" ) @@ -108,8 +108,7 @@ def _update_fee_fields_records(conn, batch_size, cursor, rows): , soil_to_place_maximum_depth = %(depth)s , soil_to_place_average_depth = %(depth)s , soil_fill_type_to_place = %(type)s - , fill_project_duration_amount = %(project_duration)s - , fill_project_duration_unit = CASE WHEN %(project_duration)s is NOT NULL THEN 'months' ELSE NULL END + , fill_project_duration = %(project_duration)s , soil_already_placed_volume = 0 , soil_already_placed_area = 0 , soil_already_placed_maximum_depth = 0 @@ -124,8 +123,7 @@ def _update_fee_fields_records(conn, batch_size, cursor, rows): , soil_to_remove_maximum_depth = %(depth)s , soil_to_remove_average_depth = %(depth)s , soil_type_removed = %(type)s - , soil_project_duration_amount = %(project_duration)s - , soil_project_duration_unit = CASE WHEN %(project_duration)s is NOT NULL THEN 'months' ELSE NULL END + , soil_project_duration = %(project_duration)s , soil_already_removed_volume = 0 , soil_already_removed_area = 0 , soil_already_removed_maximum_depth = 0 @@ -161,4 +159,7 @@ def map_soil_fields(data): data["project_area"] = data.get("project_area", 0) data["depth"] = data.get("depth", 0) + duration = data.get("project_duration", None) + data["project_duration"] = f"{duration} months" if duration else None + return data diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/soil_fields/notice_of_intent_soil_fields_update.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/soil_fields/notice_of_intent_soil_fields_update.sql index 656953c59a..4551729e09 100644 --- a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/soil_fields/notice_of_intent_soil_fields_update.sql +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/soil_fields/notice_of_intent_soil_fields_update.sql @@ -1,9 +1,7 @@ -SELECT - nois.fill_project_duration_unit, - nois.fill_project_duration_amount, +SELECT nois.fill_project_duration, nois.file_number, nois.file_number::BIGINT AS file_id -FROM - alcs.notice_of_intent_submission nois -WHERE - nois.type_code IN ('POFO', 'ROSO') AND nois.audit_created_by = 'oats_etl' AND nois.fill_project_duration_amount IS NOT NULL \ No newline at end of file +FROM alcs.notice_of_intent_submission nois +WHERE nois.type_code IN ('POFO', 'ROSO') + AND nois.audit_created_by = 'oats_etl' + AND nois.fill_project_duration IS NOT NULL \ No newline at end of file diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/soil_fields/notice_of_intent_soil_fields_update_count.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/soil_fields/notice_of_intent_soil_fields_update_count.sql index b2db503d14..ea1b773e82 100644 --- a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/soil_fields/notice_of_intent_soil_fields_update_count.sql +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/soil_fields/notice_of_intent_soil_fields_update_count.sql @@ -1,8 +1,5 @@ -SELECT - count(*) -FROM - alcs.notice_of_intent_submission nois -WHERE - nois.type_code IN ('POFO', 'ROSO') - AND nois.fill_project_duration_amount IS NOT NULL +SELECT count(*) +FROM alcs.notice_of_intent_submission nois +WHERE nois.type_code IN ('POFO', 'ROSO') + AND nois.fill_project_duration IS NOT NULL AND nois.audit_created_by = 'oats_etl' \ No newline at end of file From 3e722c69238f757401594bd8acca1fd2dc1ce657 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Mon, 8 Jan 2024 10:05:16 -0800 Subject: [PATCH 890/954] Code Review Feedback --- .../typeorm/migrations/1704411968891-add_config_table.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1704411968891-add_config_table.ts b/services/apps/alcs/src/providers/typeorm/migrations/1704411968891-add_config_table.ts index ddde7f993e..74f4a42b1a 100644 --- a/services/apps/alcs/src/providers/typeorm/migrations/1704411968891-add_config_table.ts +++ b/services/apps/alcs/src/providers/typeorm/migrations/1704411968891-add_config_table.ts @@ -8,6 +8,10 @@ export class AddConfigTable1704411968891 implements MigrationInterface { `CREATE TABLE "alcs"."configuration" ("name" character varying NOT NULL, "value" character varying NOT NULL, CONSTRAINT "PK_28ac27674364374c342e83cba9d" PRIMARY KEY ("name"))`, ); + await queryRunner.query( + `COMMENT ON TABLE "alcs"."configuration" IS 'Stores real time config values editable by ALCS Admin.'`, + ); + await queryRunner.query(` INSERT INTO "alcs"."configuration" ("name", "value") VALUES ('portal_maintenance_mode', 'false'); `); From 6d517b45a2a669f5e31e9173ee84d08395108534 Mon Sep 17 00:00:00 2001 From: "to. sandra" <76515860+sandratoh@users.noreply.github.com> Date: Mon, 8 Jan 2024 10:26:12 -0800 Subject: [PATCH 891/954] Update application proposals, reviews, and dialog (#1263) * Create shared purposes panel and add to soil applications * Update app confirmation dialog text and styling * Add units to application proposal review questions * Replace repeated code with shared panel component * Update condition for 0 lot size --- .../excl-details/excl-details.component.html | 4 +-- .../incl-details/incl-details.component.html | 4 +-- .../naru-details/naru-details.component.html | 6 ++-- .../nfu-details/nfu-details.component.html | 4 +-- .../subd-details/subd-details.component.html | 4 +-- .../tur-details/tur-details.component.html | 2 +- .../excl-details/excl-details.component.html | 18 +++------- .../incl-details/incl-details.component.html | 14 +++----- .../naru-details/naru-details.component.html | 19 ++++++----- .../nfu-details/nfu-details.component.html | 17 ++++------ .../subd-details/subd-details.component.html | 22 ++++-------- .../tur-details/tur-details.component.html | 6 ++-- .../pfrs-proposal.component.html | 1 + .../pofo-proposal.component.html | 1 + .../roso-proposal.component.html | 1 + .../submit-confirmation-dialog.component.html | 7 ++-- .../submit-confirmation-dialog.component.scss | 13 +++++-- .../pfrs/pfrs-proposal.component.html | 22 ++---------- .../pfrs/pfrs-proposal.component.scss | 23 ------------- .../pofo/pofo-proposal.component.html | 34 +++---------------- .../pofo/pofo-proposal.component.scss | 23 ------------- .../roso/roso-proposal.component.html | 33 ++---------------- .../roso/roso-proposal.component.scss | 23 ------------- .../excl-details/excl-details.component.html | 4 +-- .../incl-details/incl-details.component.html | 4 +-- .../naru-details/naru-details.component.html | 22 +++++------- .../nfu-details/nfu-details.component.html | 20 +++++------ .../subd-details/subd-details.component.html | 2 +- .../tur-details/tur-details.component.html | 6 ++-- .../commission-purposes-panel.component.html | 31 +++++++++++++++++ .../commission-purposes-panel.component.scss | 12 +++++++ ...ommission-purposes-panel.component.spec.ts | 21 ++++++++++++ .../commission-purposes-panel.component.ts | 8 +++++ .../src/app/shared/shared.module.ts | 4 +++ 34 files changed, 175 insertions(+), 260 deletions(-) create mode 100644 portal-frontend/src/app/shared/commission-purposes-panel/commission-purposes-panel.component.html create mode 100644 portal-frontend/src/app/shared/commission-purposes-panel/commission-purposes-panel.component.scss create mode 100644 portal-frontend/src/app/shared/commission-purposes-panel/commission-purposes-panel.component.spec.ts create mode 100644 portal-frontend/src/app/shared/commission-purposes-panel/commission-purposes-panel.component.ts diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/excl-details/excl-details.component.html b/alcs-frontend/src/app/features/application/applicant-info/application-details/excl-details/excl-details.component.html index 79822f070f..8bb6c08ef0 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/application-details/excl-details/excl-details.component.html +++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/excl-details/excl-details.component.html @@ -4,9 +4,9 @@ {{ _applicationSubmission.prescribedBody }} </div> - <div class="subheading2 grid-1">How many hectares are you proposing to exclude? (hectares)</div> + <div class="subheading2 grid-1">How many hectares are you proposing to exclude?</div> <div class="grid-double"> - {{ _applicationSubmission.inclExclHectares }} + {{ _applicationSubmission.inclExclHectares }} <span *ngIf="_applicationSubmission.inclExclHectares">ha</span> </div> <div class="subheading2 grid-1"> diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/incl-details/incl-details.component.html b/alcs-frontend/src/app/features/application/applicant-info/application-details/incl-details/incl-details.component.html index b7981005d7..4087197729 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/application-details/incl-details/incl-details.component.html +++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/incl-details/incl-details.component.html @@ -1,7 +1,7 @@ <div *ngIf="_applicationSubmission" class="review-table"> - <div class="subheading2 grid-1">How many hectares are you proposing to include? (hectares)</div> + <div class="subheading2 grid-1">How many hectares are you proposing to include?</div> <div class="grid-double"> - {{ _applicationSubmission.inclExclHectares }} + {{ _applicationSubmission.inclExclHectares }} <span *ngIf="_applicationSubmission.inclExclHectares">ha</span> </div> <div class="subheading2 grid-1">What is the purpose of the proposal?</div> diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/naru-details/naru-details.component.html b/alcs-frontend/src/app/features/application/applicant-info/application-details/naru-details/naru-details.component.html index 146ce575e0..e32a308c52 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/application-details/naru-details/naru-details.component.html +++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/naru-details/naru-details.component.html @@ -12,7 +12,7 @@ What is the total floor area (m<sup>2</sup>) of the proposed additional residence? </div> <div class="grid-double"> - {{ _applicationSubmission.naruFloorArea }} + {{ _applicationSubmission.naruFloorArea }} <span *ngIf="_applicationSubmission.naruFloorArea">m<sup>2</sup></span> </div> <div class="subheading2 grid-1"> Describe the necessity for an additional residence for farm use and how it will support agriculture in the short @@ -38,7 +38,7 @@ What is the total floor area (m<sup>2</sup>) of the proposed principal residence? </div> <div class="grid-double"> - {{ _applicationSubmission.naruFloorArea }} + {{ _applicationSubmission.naruFloorArea }} <span *ngIf="_applicationSubmission.naruFloorArea">m<sup>2</sup></span> </div> <div class="subheading2 grid-1"> Describe how the proposal for a principal residence more than 500 m<sup>2</sup> will support agriculture in the @@ -63,7 +63,7 @@ <ng-container *ngIf="_applicationSubmission.naruSubtype?.code === 'TOUR'"> <div class="subheading2 grid-1">What is the total floor area (m<sup>2</sup>) of the proposed accommodation?</div> <div class="grid-double"> - {{ _applicationSubmission.naruFloorArea }} + {{ _applicationSubmission.naruFloorArea }} <span *ngIf="_applicationSubmission.naruFloorArea">m<sup>2</sup></span> </div> <div class="subheading2 grid-1">How many "sleeping units" in total are proposed?</div> <div class="grid-double"> diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/nfu-details/nfu-details.component.html b/alcs-frontend/src/app/features/application/applicant-info/application-details/nfu-details/nfu-details.component.html index 68b735a5f5..570dbce906 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/application-details/nfu-details/nfu-details.component.html +++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/nfu-details/nfu-details.component.html @@ -1,7 +1,7 @@ <div *ngIf="applicationSubmission" class="review-table"> - <div class="subheading2 grid-1">How many hectares are proposed for non-farm use? (hectares)</div> + <div class="subheading2 grid-1">How many hectares are proposed for non-farm use?</div> <div class="grid-double"> - {{ applicationSubmission.nfuHectares }} + {{ applicationSubmission.nfuHectares }} <span *ngIf="applicationSubmission.nfuHectares">ha</span> </div> <div class="subheading2 grid-1">What is the purpose of the proposal?</div> <div class="grid-double"> diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/subd-details/subd-details.component.html b/alcs-frontend/src/app/features/application/applicant-info/application-details/subd-details/subd-details.component.html index 0582f92c8c..1e0d6fe8e6 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/application-details/subd-details/subd-details.component.html +++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/subd-details/subd-details.component.html @@ -11,9 +11,7 @@ <div class="grid-2"> {{ lot.type }} </div> - <div class="grid-3"> - {{ lot.size }} - </div> + <div class="grid-3">{{ lot.size }} <span *ngIf="lot.size !== null">ha</span></div> </ng-container> </div> <div class="subheading2 grid-1">What is the purpose of the proposal?</div> diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/tur-details/tur-details.component.html b/alcs-frontend/src/app/features/application/applicant-info/application-details/tur-details/tur-details.component.html index c934fe0d68..c463469f5d 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/application-details/tur-details/tur-details.component.html +++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/tur-details/tur-details.component.html @@ -22,7 +22,7 @@ </div> <div class="subheading2 grid-1">Total area of corridor</div> <div class="grid-double"> - <span>{{ _application.turTotalCorridorArea }}</span> + {{ _application.turTotalCorridorArea }}<span *ngIf="_application.turTotalCorridorArea">ha</span> </div> <div class="subheading2 grid-1">Proof of Serving Notice</div> <div class="grid-double"> diff --git a/portal-frontend/src/app/features/applications/application-details/excl-details/excl-details.component.html b/portal-frontend/src/app/features/applications/application-details/excl-details/excl-details.component.html index 93239ba778..95e668cbfd 100644 --- a/portal-frontend/src/app/features/applications/application-details/excl-details/excl-details.component.html +++ b/portal-frontend/src/app/features/applications/application-details/excl-details/excl-details.component.html @@ -1,16 +1,12 @@ <div *ngIf="_applicationSubmission" class="review-table"> - <div class="subheading2 grid-1"> - The governmental or prescribed public body that is applying to exclude land - </div> + <div class="subheading2 grid-1">The governmental or prescribed public body that is applying to exclude land</div> <div class="grid-double"> {{ _applicationSubmission.prescribedBody }} </div> - <div class="subheading2 grid-1"> - How many hectares are you proposing to exclude? (hectares) - </div> + <div class="subheading2 grid-1">How many hectares are you proposing to exclude?</div> <div class="grid-double"> - {{ _applicationSubmission.inclExclHectares }} + {{ _applicationSubmission.inclExclHectares }} <span *ngIf="_applicationSubmission.inclExclHectares">ha</span> <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.inclExclHectares"></app-no-data> </div> @@ -27,17 +23,13 @@ ></app-no-data> </div> - <div class="subheading2 grid-1"> - What is the purpose of the proposal? - </div> + <div class="subheading2 grid-1">What is the purpose of the proposal?</div> <div class="grid-double"> {{ _applicationSubmission.purpose }} <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.purpose"></app-no-data> </div> - <div class="subheading2 grid-1"> - Explain why you believe that the parcel(s) should be excluded from the ALR - </div> + <div class="subheading2 grid-1">Explain why you believe that the parcel(s) should be excluded from the ALR</div> <div class="grid-double"> {{ _applicationSubmission.exclWhyLand }} <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.exclWhyLand"></app-no-data> diff --git a/portal-frontend/src/app/features/applications/application-details/incl-details/incl-details.component.html b/portal-frontend/src/app/features/applications/application-details/incl-details/incl-details.component.html index c09495adf7..2cab8ce8a9 100644 --- a/portal-frontend/src/app/features/applications/application-details/incl-details/incl-details.component.html +++ b/portal-frontend/src/app/features/applications/application-details/incl-details/incl-details.component.html @@ -1,23 +1,17 @@ <div *ngIf="_applicationSubmission" class="review-table"> - <div class="subheading2 grid-1"> - How many hectares are you proposing to include? (hectares) - </div> + <div class="subheading2 grid-1">How many hectares are you proposing to include?</div> <div class="grid-double"> - {{ _applicationSubmission.inclExclHectares }} + {{ _applicationSubmission.inclExclHectares }} <span *ngIf="_applicationSubmission.inclExclHectares">ha</span> <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.inclExclHectares"></app-no-data> </div> - <div class="subheading2 grid-1"> - What is the purpose of the proposal? - </div> + <div class="subheading2 grid-1">What is the purpose of the proposal?</div> <div class="grid-double"> {{ _applicationSubmission.purpose }} <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.purpose"></app-no-data> </div> - <div class="subheading2 grid-1"> - Does the proposal support agriculture in the short or long term? - </div> + <div class="subheading2 grid-1">Does the proposal support agriculture in the short or long term?</div> <div class="grid-double"> {{ _applicationSubmission.inclAgricultureSupport }} <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.inclAgricultureSupport"></app-no-data> diff --git a/portal-frontend/src/app/features/applications/application-details/naru-details/naru-details.component.html b/portal-frontend/src/app/features/applications/application-details/naru-details/naru-details.component.html index 34ca0fecc4..41de0307fe 100644 --- a/portal-frontend/src/app/features/applications/application-details/naru-details/naru-details.component.html +++ b/portal-frontend/src/app/features/applications/application-details/naru-details/naru-details.component.html @@ -18,7 +18,7 @@ What is the total floor area (m<sup>2</sup>) of the proposed additional residence? </div> <div class="grid-double"> - {{ _applicationSubmission.naruFloorArea }} + {{ _applicationSubmission.naruFloorArea }} <span *ngIf="_applicationSubmission.naruFloorArea">m<sup>2</sup></span> <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.naruFloorArea"></app-no-data> </div> @@ -52,7 +52,7 @@ What is the total floor area (m<sup>2</sup>) of the proposed principal residence? </div> <div class="grid-double"> - {{ _applicationSubmission.naruFloorArea }} + {{ _applicationSubmission.naruFloorArea }} <span *ngIf="_applicationSubmission.naruFloorArea">m<sup>2</sup></span> <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.naruFloorArea"></app-no-data> </div> @@ -84,7 +84,7 @@ <ng-container *ngIf="_applicationSubmission.naruSubtype?.code === 'TOUR'"> <div class="subheading2 grid-1">What is the total floor area (m<sup>2</sup>) of the proposed accommodation?</div> <div class="grid-double"> - {{ _applicationSubmission.naruFloorArea }} + {{ _applicationSubmission.naruFloorArea }} <span *ngIf="_applicationSubmission.naruFloorArea">m<sup>2</sup></span> <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.naruFloorArea"></app-no-data> </div> @@ -173,21 +173,24 @@ <div class="full-width soil-table"> <div></div> <div class="subheading2">Fill to be Placed</div> - + <div class="subheading2">Volume</div> <div> {{ _applicationSubmission.naruToPlaceVolume }} <span *ngIf="_applicationSubmission.naruToPlaceVolume !== null">m<sup>3</sup></span> - <app-no-data [showRequired]="showErrors" *ngIf="_applicationSubmission.naruToPlaceVolume === null"></app-no-data> + <app-no-data + [showRequired]="showErrors" + *ngIf="_applicationSubmission.naruToPlaceVolume === null" + ></app-no-data> </div> - + <div class="subheading2">Area</div> <div> {{ _applicationSubmission.naruToPlaceArea }} <span *ngIf="_applicationSubmission.naruToPlaceArea !== null">m<sup>2</sup></span> <app-no-data [showRequired]="showErrors" *ngIf="_applicationSubmission.naruToPlaceArea === null"></app-no-data> </div> - + <div class="subheading2">Maximum Depth</div> <div> {{ _applicationSubmission.naruToPlaceMaximumDepth }} @@ -197,7 +200,7 @@ *ngIf="_applicationSubmission.naruToPlaceMaximumDepth === null" ></app-no-data> </div> - + <div class="subheading2">Average Depth</div> <div> {{ _applicationSubmission.naruToPlaceAverageDepth }} diff --git a/portal-frontend/src/app/features/applications/application-details/nfu-details/nfu-details.component.html b/portal-frontend/src/app/features/applications/application-details/nfu-details/nfu-details.component.html index c5d8ba0b30..93f04f18ee 100644 --- a/portal-frontend/src/app/features/applications/application-details/nfu-details/nfu-details.component.html +++ b/portal-frontend/src/app/features/applications/application-details/nfu-details/nfu-details.component.html @@ -1,7 +1,7 @@ <div *ngIf="applicationSubmission" class="review-table"> - <div class="subheading2 grid-1">How many hectares are proposed for non-farm use? (hectares)</div> + <div class="subheading2 grid-1">How many hectares are proposed for non-farm use?</div> <div class="grid-double"> - {{ applicationSubmission.nfuHectares }} + {{ applicationSubmission.nfuHectares }} <span *ngIf="applicationSubmission.nfuHectares">ha</span> </div> <div class="subheading2 grid-1">What is the purpose of the proposal?</div> <div class="grid-double"> @@ -62,31 +62,28 @@ <h4>Soil and Fill Components</h4> <div class="full-width soil-table"> <div></div> <div class="subheading2">Fill to be Placed</div> - + <div class="subheading2">Volume</div> <div> {{ applicationSubmission.nfuFillVolume }} <span *ngIf="applicationSubmission.nfuFillVolume !== null">m<sup>3</sup></span> <app-no-data [showRequired]="showErrors" *ngIf="applicationSubmission.nfuFillVolume === null"></app-no-data> </div> - + <div class="subheading2">Area</div> <div> {{ applicationSubmission.nfuTotalFillArea }} <span *ngIf="applicationSubmission.nfuTotalFillArea !== null">m<sup>2</sup></span> <app-no-data [showRequired]="showErrors" *ngIf="applicationSubmission.nfuTotalFillArea === null"></app-no-data> </div> - + <div class="subheading2">Maximum Depth</div> <div> {{ applicationSubmission.nfuMaxFillDepth }} <span *ngIf="applicationSubmission.nfuMaxFillDepth !== null">m</span> - <app-no-data - [showRequired]="showErrors" - *ngIf="applicationSubmission.nfuMaxFillDepth === null" - ></app-no-data> + <app-no-data [showRequired]="showErrors" *ngIf="applicationSubmission.nfuMaxFillDepth === null"></app-no-data> </div> - + <div class="subheading2">Average Depth</div> <div> {{ applicationSubmission.nfuAverageFillDepth }} diff --git a/portal-frontend/src/app/features/applications/application-details/subd-details/subd-details.component.html b/portal-frontend/src/app/features/applications/application-details/subd-details/subd-details.component.html index 935ff64df6..d53d60491d 100644 --- a/portal-frontend/src/app/features/applications/application-details/subd-details/subd-details.component.html +++ b/portal-frontend/src/app/features/applications/application-details/subd-details/subd-details.component.html @@ -1,7 +1,5 @@ <div *ngIf="_applicationSubmission" class="review-table"> - <div class="subheading2 full-width"> - Proposed Lot Areas - </div> + <div class="subheading2 full-width">Proposed Lot Areas</div> <div class="full-width parcel-table"> <div class="grid-1 subheading2">#</div> <div class="grid-2 subheading2">Type</div> @@ -15,7 +13,7 @@ <app-no-data [showRequired]="showErrors" *ngIf="!lot.type"></app-no-data> </div> <div class="grid-3"> - {{ lot.size }} + {{ lot.size }} <span *ngIf="lot.size !== null">ha</span> <app-no-data [showRequired]="showErrors" *ngIf="!lot.size"></app-no-data> </div> </ng-container> @@ -27,23 +25,17 @@ <div>The total lot area proposed must match {{ totalTargetAcres }} hectares as provided in Step 1</div> </div> </div> - <div class="subheading2 grid-1"> - What is the purpose of the proposal? - </div> + <div class="subheading2 grid-1">What is the purpose of the proposal?</div> <div class="grid-double"> {{ _applicationSubmission.purpose }} <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.purpose"></app-no-data> </div> - <div class="subheading2 grid-1"> - Why do you believe this parcel is suitable for subdivision? - </div> + <div class="subheading2 grid-1">Why do you believe this parcel is suitable for subdivision?</div> <div class="grid-double"> {{ _applicationSubmission.subdSuitability }} <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.subdSuitability"></app-no-data> </div> - <div class="subheading2 grid-1"> - Does the proposal support agriculture in the short or long term? - </div> + <div class="subheading2 grid-1">Does the proposal support agriculture in the short or long term?</div> <div class="grid-double"> {{ _applicationSubmission.subdAgricultureSupport }} <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.subdAgricultureSupport"></app-no-data> @@ -55,9 +47,7 @@ </a> <app-no-data [showRequired]="showErrors" *ngIf="proposalMap.length === 0"></app-no-data> </div> - <div class="subheading2 grid-1"> - Are you applying for subdivision pursuant to the ALC Homesite Severance Policy? - </div> + <div class="subheading2 grid-1">Are you applying for subdivision pursuant to the ALC Homesite Severance Policy?</div> <div class="grid-double"> <span *ngIf="_applicationSubmission.subdIsHomeSiteSeverance !== null"> {{ _applicationSubmission.subdIsHomeSiteSeverance ? 'Yes' : 'No' }} diff --git a/portal-frontend/src/app/features/applications/application-details/tur-details/tur-details.component.html b/portal-frontend/src/app/features/applications/application-details/tur-details/tur-details.component.html index 5e7f5840e5..d81b4a14c9 100644 --- a/portal-frontend/src/app/features/applications/application-details/tur-details/tur-details.component.html +++ b/portal-frontend/src/app/features/applications/application-details/tur-details/tur-details.component.html @@ -26,9 +26,9 @@ </div> <div class="subheading2 grid-1">Total area of corridor</div> <div class="grid-double"> - <span *ngIf="_applicationSubmission.turTotalCorridorArea !== null">{{ - _applicationSubmission.turTotalCorridorArea - }}</span> + <span *ngIf="_applicationSubmission.turTotalCorridorArea !== null" + >{{ _applicationSubmission.turTotalCorridorArea }} ha</span + > <app-no-data [showRequired]="showErrors" *ngIf="_applicationSubmission.turTotalCorridorArea === null"></app-no-data> </div> <div class="subheading2 grid-1">Proof of Serving Notice</div> diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.html index ebd2e0c895..8f07c394b9 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.html @@ -5,6 +5,7 @@ <h2>Proposal</h2> <a> Section 6 of the ALC Act. </a> </p> <p>All fields are required unless stated optional or disabled.</p> + <app-commission-purposes-panel></app-commission-purposes-panel> </div> <app-warning-banner> In order to complete this step, please consult the following pages on the ALC website: diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.html index 46e1668702..af509cb5d5 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.html @@ -5,6 +5,7 @@ <h2>Proposal</h2> <a> Section 6 of the ALC Act. </a> </p> <p>All fields are required unless stated optional or disabled.</p> + <app-commission-purposes-panel></app-commission-purposes-panel> </div> <app-warning-banner> In order to complete this step, please consult the following pages on the ALC website: diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.html index 26c694dc81..c081ed2460 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.html @@ -5,6 +5,7 @@ <h2>Proposal</h2> <a> Section 6 of the ALC Act. </a> </p> <p>All fields are required unless stated optional or disabled.</p> + <app-commission-purposes-panel></app-commission-purposes-panel> </div> <app-warning-banner> In order to complete this step, please consult the following pages on the ALC website: diff --git a/portal-frontend/src/app/features/applications/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.html b/portal-frontend/src/app/features/applications/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.html index 493c5eb5d2..8a01a6f6fd 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.html @@ -23,12 +23,13 @@ <h4>Submit Application</h4> </mat-checkbox> <mat-checkbox #checkbox3 color="primary" class="checkbox"> I/we understand that the Agricultural Land Commission will take the steps necessary to confirm the accuracy of the - information and documents provided. This information will be available for review by any member of the public. + information and documents provided. This information, excluding phone numbers and emails, will be available for + review by any member of the public once received by the ALC. </mat-checkbox> </div> <p> - If you have any questions about the collection or use of this information, please contact the Agricultural Land - Commission. + If you have any questions about the collection or use of this information, please + <a href="https://www.alc.gov.bc.ca/contact/" target="_blank">contact the Agricultural Land Commission.</a> </p> <div> <div class="step-controls"> diff --git a/portal-frontend/src/app/features/applications/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.scss b/portal-frontend/src/app/features/applications/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.scss index fa173368db..d2f7d1dd7e 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.scss +++ b/portal-frontend/src/app/features/applications/edit-submission/review-and-submit/submit-confirmation-dialog/submit-confirmation-dialog.component.scss @@ -12,8 +12,17 @@ p { .step-controls { display: flex; justify-content: flex-end; + flex-direction: column-reverse; - button:not(:last-child) { - margin-right: rem(16) !important; + button { + margin-top: rem(12) !important; + } + + @media screen and (min-width: $tabletBreakpoint) { + flex-direction: row; + + button:not(:last-child) { + margin-right: rem(16) !important; + } } } diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pfrs/pfrs-proposal.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pfrs/pfrs-proposal.component.html index dce7fc54d5..6c764eea62 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pfrs/pfrs-proposal.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pfrs/pfrs-proposal.component.html @@ -5,25 +5,7 @@ <h2>Proposal</h2> <a>FIXME: Section 6 of the ALC Act. </a> </p> <p>All fields are required unless stated optional or disabled.</p> - <mat-expansion-panel #panel [expanded]="true"> - <mat-expansion-panel-header class="porposal-toggle"> - <mat-panel-title><strong>READ FIRST: Purposes of the commission </strong>(Section 6 of the ALC Act)</mat-panel-title> - </mat-expansion-panel-header> - <div class="proposal-toggle-content"> - <div class="section-header">6 (1) The following are the purposes of the commission:</div> - <ul class="list-item"> - <li>to preserve the agricultural land reserve;</li> - <li>to encourage farming of land within the agricultural land reserve in collaboration with other communities of interest;</li> - <li>to encourage local governments, first nations, the government and its agents to enable and accommodate farm use of land within the agricultural land reserve and uses compatible with agriculture in their plans, bylaws and policies.</li> - </ul> - - <div class="section-header">6 (2) The commission, to fulfill its purposes under subsection (1), must give priority to protecting and enhancing all of the following in exercising its powers and performing its duties under this Act:</div> - <ul class="list-item"> - <li>the size, integrity and continuity of the land base of the agricultural land reserve;</li> - <li>the use of the agricultural land reserve for farm use.</li> - </ul> - </div> - </mat-expansion-panel> + <app-commission-purposes-panel></app-commission-purposes-panel> </div> <app-warning-banner> In order to complete this step, please consult the following pages on the ALC website: @@ -207,7 +189,7 @@ <h2>Proposal</h2> <mat-hint class="subtext">Example: 30 years; or 3 months; or 5 days</mat-hint> </div> </div> - + <div class="full-row"> <mat-label>Proposal Dimensions</mat-label> <div class="subtext"> diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pfrs/pfrs-proposal.component.scss b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pfrs/pfrs-proposal.component.scss index f5e22627b7..56caa68a82 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pfrs/pfrs-proposal.component.scss +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pfrs/pfrs-proposal.component.scss @@ -3,26 +3,3 @@ section { margin-top: rem(36); } - -.proposal-toggle-content { - margin-bottom: 20px; - padding: 15px; -} - -.section-header { - margin-bottom: 10px; -} - -.list-item { - counter-reset: listCounter; -} - -.list-item li { - list-style-type: none; - margin-bottom: 5px; -} - -.list-item li:before { - content: "(" counter(listCounter, lower-alpha) ") "; - counter-increment: listCounter; -} diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pofo/pofo-proposal.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pofo/pofo-proposal.component.html index a0e3784d1d..84c42a472b 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pofo/pofo-proposal.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pofo/pofo-proposal.component.html @@ -5,25 +5,7 @@ <h2>Proposal</h2> <a>FIXME: Section 6 of the ALC Act. </a> </p> <p>All fields are required unless stated optional or disabled.</p> - <mat-expansion-panel #panel [expanded]="true"> - <mat-expansion-panel-header class="porposal-toggle"> - <mat-panel-title><strong>READ FIRST: Purposes of the commission </strong>(Section 6 of the ALC Act)</mat-panel-title> - </mat-expansion-panel-header> - <div class="proposal-toggle-content"> - <div class="section-header">6 (1) The following are the purposes of the commission:</div> - <ul class="list-item"> - <li>to preserve the agricultural land reserve;</li> - <li>to encourage farming of land within the agricultural land reserve in collaboration with other communities of interest;</li> - <li>to encourage local governments, first nations, the government and its agents to enable and accommodate farm use of land within the agricultural land reserve and uses compatible with agriculture in their plans, bylaws and policies.</li> - </ul> - - <div class="section-header">6 (2) The commission, to fulfill its purposes under subsection (1), must give priority to protecting and enhancing all of the following in exercising its powers and performing its duties under this Act:</div> - <ul class="list-item"> - <li>the size, integrity and continuity of the land base of the agricultural land reserve;</li> - <li>the use of the agricultural land reserve for farm use.</li> - </ul> - </div> - </mat-expansion-panel> + <app-commission-purposes-panel></app-commission-purposes-panel> </div> <app-warning-banner> In order to complete this step, please consult the following pages on the ALC website: @@ -151,24 +133,16 @@ <h2>Proposal</h2> <label for="projectDuration">Placement of Fill Project Duration</label> <div class="subtext">Length of time you anticipate it would take to complete the project</div> <mat-form-field appearance="outline"> - <input - id="projectDuration" - matInput - [formControl]="projectDuration" - placeholder="Type project duration" - /> + <input id="projectDuration" matInput [formControl]="projectDuration" placeholder="Type project duration" /> </mat-form-field> - <div - *ngIf="projectDuration.invalid && (projectDuration.dirty || projectDuration.touched)" - class="field-error" - > + <div *ngIf="projectDuration.invalid && (projectDuration.dirty || projectDuration.touched)" class="field-error"> <mat-icon>warning</mat-icon> <div *ngIf="projectDuration.errors?.['required']">This field is required</div> </div> <mat-hint class="subtext">Example: 30 years; or 3 months; or 5 days</mat-hint> </div> </div> - + <div class="full-row"> <mat-label>Proposal Dimensions</mat-label> <div class="subtext"> diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pofo/pofo-proposal.component.scss b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pofo/pofo-proposal.component.scss index 93b1171cb2..56caa68a82 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pofo/pofo-proposal.component.scss +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pofo/pofo-proposal.component.scss @@ -3,26 +3,3 @@ section { margin-top: rem(36); } - -.proposal-toggle-content { - margin-bottom: 20px; - padding: 15px; -} - -.section-header { - margin-bottom: 10px; -} - -.list-item { - counter-reset: listCounter; -} - -.list-item li { - list-style-type: none; - margin-bottom: 5px; -} - -.list-item li:before { - content: "(" counter(listCounter, lower-alpha) ") "; - counter-increment: listCounter; -} \ No newline at end of file diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.html index b62f9122ca..f5f5500d97 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.html @@ -5,25 +5,7 @@ <h2>Proposal</h2> <a>FIXME: Section 6 of the ALC Act. </a> </p> <p>All fields are required unless stated optional or disabled.</p> - <mat-expansion-panel #panel [expanded]="true"> - <mat-expansion-panel-header class="porposal-toggle"> - <mat-panel-title><strong>READ FIRST: Purposes of the commission </strong>(Section 6 of the ALC Act)</mat-panel-title> - </mat-expansion-panel-header> - <div class="proposal-toggle-content"> - <div class="section-header">6 (1) The following are the purposes of the commission:</div> - <ul class="list-item"> - <li>to preserve the agricultural land reserve;</li> - <li>to encourage farming of land within the agricultural land reserve in collaboration with other communities of interest;</li> - <li>to encourage local governments, first nations, the government and its agents to enable and accommodate farm use of land within the agricultural land reserve and uses compatible with agriculture in their plans, bylaws and policies.</li> - </ul> - - <div class="section-header">6 (2) The commission, to fulfill its purposes under subsection (1), must give priority to protecting and enhancing all of the following in exercising its powers and performing its duties under this Act:</div> - <ul class="list-item"> - <li>the size, integrity and continuity of the land base of the agricultural land reserve;</li> - <li>the use of the agricultural land reserve for farm use.</li> - </ul> - </div> - </mat-expansion-panel> + <app-commission-purposes-panel></app-commission-purposes-panel> </div> <app-warning-banner> In order to complete this step, please consult the following pages on the ALC website: @@ -129,23 +111,14 @@ <h2>Proposal</h2> <div class="subtext">Characters left: {{ 4000 - soilTypeRemovedText.textLength }}</div> </div> - <div class="form-row"> <div class="full-row"> <label for="projectDuration">Removal of Soil Project Duration</label> <div class="subtext">Length of time you anticipate it would take to complete the project</div> <mat-form-field appearance="outline"> - <input - id="projectDuration" - matInput - [formControl]="projectDuration" - placeholder="Type project duration" - /> + <input id="projectDuration" matInput [formControl]="projectDuration" placeholder="Type project duration" /> </mat-form-field> - <div - *ngIf="projectDuration.invalid && (projectDuration.dirty || projectDuration.touched)" - class="field-error" - > + <div *ngIf="projectDuration.invalid && (projectDuration.dirty || projectDuration.touched)" class="field-error"> <mat-icon>warning</mat-icon> <div *ngIf="projectDuration.errors?.['required']">This field is required</div> </div> diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.scss b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.scss index f5e22627b7..56caa68a82 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.scss +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.scss @@ -3,26 +3,3 @@ section { margin-top: rem(36); } - -.proposal-toggle-content { - margin-bottom: 20px; - padding: 15px; -} - -.section-header { - margin-bottom: 10px; -} - -.list-item { - counter-reset: listCounter; -} - -.list-item li { - list-style-type: none; - margin-bottom: 5px; -} - -.list-item li:before { - content: "(" counter(listCounter, lower-alpha) ") "; - counter-increment: listCounter; -} diff --git a/portal-frontend/src/app/features/public/application/submission/excl-details/excl-details.component.html b/portal-frontend/src/app/features/public/application/submission/excl-details/excl-details.component.html index f05b0ed16f..244752b806 100644 --- a/portal-frontend/src/app/features/public/application/submission/excl-details/excl-details.component.html +++ b/portal-frontend/src/app/features/public/application/submission/excl-details/excl-details.component.html @@ -4,9 +4,9 @@ {{ applicationSubmission.prescribedBody }} </div> - <div class="subheading2 grid-1">How many hectares are you proposing to exclude? (hectares)</div> + <div class="subheading2 grid-1">How many hectares are you proposing to exclude?</div> <div class="grid-double"> - {{ applicationSubmission.inclExclHectares }} + {{ applicationSubmission.inclExclHectares }} <span *ngIf="applicationSubmission.inclExclHectares">ha</span> <app-no-data *ngIf="!applicationSubmission.inclExclHectares"></app-no-data> </div> diff --git a/portal-frontend/src/app/features/public/application/submission/incl-details/incl-details.component.html b/portal-frontend/src/app/features/public/application/submission/incl-details/incl-details.component.html index 557efad2b4..7ea70a788a 100644 --- a/portal-frontend/src/app/features/public/application/submission/incl-details/incl-details.component.html +++ b/portal-frontend/src/app/features/public/application/submission/incl-details/incl-details.component.html @@ -1,7 +1,7 @@ <div *ngIf="applicationSubmission" class="review-table"> - <div class="subheading2 grid-1">How many hectares are you proposing to include? (hectares)</div> + <div class="subheading2 grid-1">How many hectares are you proposing to include?</div> <div class="grid-double"> - {{ applicationSubmission.inclExclHectares }} + {{ applicationSubmission.inclExclHectares }} <span *ngIf="applicationSubmission.inclExclHectares">ha</span> <app-no-data *ngIf="!applicationSubmission.inclExclHectares"></app-no-data> </div> diff --git a/portal-frontend/src/app/features/public/application/submission/naru-details/naru-details.component.html b/portal-frontend/src/app/features/public/application/submission/naru-details/naru-details.component.html index 48cb578b64..6c7539fe04 100644 --- a/portal-frontend/src/app/features/public/application/submission/naru-details/naru-details.component.html +++ b/portal-frontend/src/app/features/public/application/submission/naru-details/naru-details.component.html @@ -18,7 +18,7 @@ What is the total floor area (m<sup>2</sup>) of the proposed additional residence? </div> <div class="grid-double"> - {{ applicationSubmission.naruFloorArea }} + {{ applicationSubmission.naruFloorArea }} <span *ngIf="applicationSubmission.naruFloorArea">m<sup>2</sup></span> <app-no-data *ngIf="!applicationSubmission.naruFloorArea"></app-no-data> </div> @@ -52,7 +52,7 @@ What is the total floor area (m<sup>2</sup>) of the proposed principal residence? </div> <div class="grid-double"> - {{ applicationSubmission.naruFloorArea }} + {{ applicationSubmission.naruFloorArea }} <span *ngIf="applicationSubmission.naruFloorArea">m<sup>2</sup></span> <app-no-data *ngIf="!applicationSubmission.naruFloorArea"></app-no-data> </div> @@ -84,7 +84,7 @@ <ng-container *ngIf="applicationSubmission.naruSubtype?.code === 'TOUR'"> <div class="subheading2 grid-1">What is the total floor area (m<sup>2</sup>) of the proposed accommodation?</div> <div class="grid-double"> - {{ applicationSubmission.naruFloorArea }} + {{ applicationSubmission.naruFloorArea }} <span *ngIf="applicationSubmission.naruFloorArea">m<sup>2</sup></span> <app-no-data *ngIf="!applicationSubmission.naruFloorArea"></app-no-data> </div> @@ -203,37 +203,33 @@ <div class="full-width soil-table"> <div></div> <div class="subheading2">Fill to be Placed</div> - + <div class="subheading2">Volume</div> <div> {{ applicationSubmission.naruToPlaceVolume }} <span *ngIf="applicationSubmission.naruToPlaceVolume !== null">m<sup>3</sup></span> <app-no-data *ngIf="applicationSubmission.naruToPlaceVolume === null"></app-no-data> </div> - + <div class="subheading2">Area</div> <div> {{ applicationSubmission.naruToPlaceArea }} <span *ngIf="applicationSubmission.naruToPlaceArea !== null">m<sup>2</sup></span> <app-no-data *ngIf="applicationSubmission.naruToPlaceArea === null"></app-no-data> </div> - + <div class="subheading2">Maximum Depth</div> <div> {{ applicationSubmission.naruToPlaceMaximumDepth }} <span *ngIf="applicationSubmission.naruToPlaceMaximumDepth !== null">m</span> - <app-no-data - *ngIf="applicationSubmission.naruToPlaceMaximumDepth === null" - ></app-no-data> + <app-no-data *ngIf="applicationSubmission.naruToPlaceMaximumDepth === null"></app-no-data> </div> - + <div class="subheading2">Average Depth</div> <div> {{ applicationSubmission.naruToPlaceAverageDepth }} <span *ngIf="applicationSubmission.naruToPlaceAverageDepth !== null">m</span> - <app-no-data - *ngIf="applicationSubmission.naruToPlaceAverageDepth === null" - ></app-no-data> + <app-no-data *ngIf="applicationSubmission.naruToPlaceAverageDepth === null"></app-no-data> </div> </div> </ng-container> diff --git a/portal-frontend/src/app/features/public/application/submission/nfu-details/nfu-details.component.html b/portal-frontend/src/app/features/public/application/submission/nfu-details/nfu-details.component.html index 924bc0b703..c693cae4c8 100644 --- a/portal-frontend/src/app/features/public/application/submission/nfu-details/nfu-details.component.html +++ b/portal-frontend/src/app/features/public/application/submission/nfu-details/nfu-details.component.html @@ -1,7 +1,7 @@ <div *ngIf="applicationSubmission" class="review-table"> - <div class="subheading2 grid-1">How many hectares are proposed for non-farm use? (hectares)</div> + <div class="subheading2 grid-1">How many hectares are proposed for non-farm use?</div> <div class="grid-double"> - {{ applicationSubmission.nfuHectares }} + {{ applicationSubmission.nfuHectares }} <span *ngIf="applicationSubmission.nfuHectares">ha</span> </div> <div class="subheading2 grid-1">What is the purpose of the proposal?</div> <div class="grid-double"> @@ -64,37 +64,33 @@ <h4>Soil and Fill Components</h4> <div class="full-width soil-table"> <div></div> <div class="subheading2">Fill to be Placed</div> - + <div class="subheading2">Volume</div> <div> {{ applicationSubmission.nfuFillVolume }} <span *ngIf="applicationSubmission.nfuFillVolume !== null">m<sup>3</sup></span> <app-no-data *ngIf="applicationSubmission.nfuFillVolume === null"></app-no-data> </div> - + <div class="subheading2">Area</div> <div> {{ applicationSubmission.nfuTotalFillArea }} <span *ngIf="applicationSubmission.nfuTotalFillArea !== null">m<sup>2</sup></span> <app-no-data *ngIf="applicationSubmission.nfuTotalFillArea === null"></app-no-data> </div> - + <div class="subheading2">Maximum Depth</div> <div> {{ applicationSubmission.nfuMaxFillDepth }} <span *ngIf="applicationSubmission.nfuMaxFillDepth !== null">m</span> - <app-no-data - *ngIf="applicationSubmission.nfuMaxFillDepth === null" - ></app-no-data> + <app-no-data *ngIf="applicationSubmission.nfuMaxFillDepth === null"></app-no-data> </div> - + <div class="subheading2">Average Depth</div> <div> {{ applicationSubmission.nfuAverageFillDepth }} <span *ngIf="applicationSubmission.nfuAverageFillDepth !== null">m</span> - <app-no-data - *ngIf="applicationSubmission.nfuAverageFillDepth === null" - ></app-no-data> + <app-no-data *ngIf="applicationSubmission.nfuAverageFillDepth === null"></app-no-data> </div> </div> </ng-container> diff --git a/portal-frontend/src/app/features/public/application/submission/subd-details/subd-details.component.html b/portal-frontend/src/app/features/public/application/submission/subd-details/subd-details.component.html index 2bcdcaaf9f..cb8fbe2991 100644 --- a/portal-frontend/src/app/features/public/application/submission/subd-details/subd-details.component.html +++ b/portal-frontend/src/app/features/public/application/submission/subd-details/subd-details.component.html @@ -13,7 +13,7 @@ <app-no-data *ngIf="!lot.type"></app-no-data> </div> <div class="grid-3"> - {{ lot.size }} + {{ lot.size }} <span *ngIf="lot.size !== null">ha</span> <app-no-data *ngIf="!lot.size"></app-no-data> </div> </ng-container> diff --git a/portal-frontend/src/app/features/public/application/submission/tur-details/tur-details.component.html b/portal-frontend/src/app/features/public/application/submission/tur-details/tur-details.component.html index 3e3449e326..1c51ac5f19 100644 --- a/portal-frontend/src/app/features/public/application/submission/tur-details/tur-details.component.html +++ b/portal-frontend/src/app/features/public/application/submission/tur-details/tur-details.component.html @@ -26,9 +26,9 @@ </div> <div class="subheading2 grid-1">Total area of corridor</div> <div class="grid-double"> - <span *ngIf="applicationSubmission.turTotalCorridorArea !== null">{{ - applicationSubmission.turTotalCorridorArea - }}</span> + <span *ngIf="applicationSubmission.turTotalCorridorArea !== null" + >{{ applicationSubmission.turTotalCorridorArea }} ha</span + > <app-no-data *ngIf="applicationSubmission.turTotalCorridorArea === null"></app-no-data> </div> <div class="subheading2 grid-1">Proposal Map / Site Plan</div> diff --git a/portal-frontend/src/app/shared/commission-purposes-panel/commission-purposes-panel.component.html b/portal-frontend/src/app/shared/commission-purposes-panel/commission-purposes-panel.component.html new file mode 100644 index 0000000000..c550b83062 --- /dev/null +++ b/portal-frontend/src/app/shared/commission-purposes-panel/commission-purposes-panel.component.html @@ -0,0 +1,31 @@ +<mat-expansion-panel #panel [expanded]="true"> + <mat-expansion-panel-header class="porposal-toggle"> + <mat-panel-title> + <span><strong>READ FIRST: Purposes of the commission </strong>(Section 6 of the ALC Act)</span> + </mat-panel-title> + </mat-expansion-panel-header> + <div> + <span>6 (1) The following are the purposes of the commission:</span> + <ul class="list-item"> + <li>to preserve the agricultural land reserve;</li> + <li> + to encourage farming of land within the agricultural land reserve in collaboration with other communities of + interest; + </li> + <li> + to encourage local governments, first nations, the government and its agents to enable and accommodate farm use + of land within the agricultural land reserve and uses compatible with agriculture in their plans, bylaws and + policies. + </li> + </ul> + + <span> + 6 (2) The commission, to fulfill its purposes under subsection (1), must give priority to protecting and enhancing + all of the following in exercising its powers and performing its duties under this Act: + </span> + <ul class="list-item"> + <li>the size, integrity and continuity of the land base of the agricultural land reserve;</li> + <li>the use of the agricultural land reserve for farm use.</li> + </ul> + </div> +</mat-expansion-panel> diff --git a/portal-frontend/src/app/shared/commission-purposes-panel/commission-purposes-panel.component.scss b/portal-frontend/src/app/shared/commission-purposes-panel/commission-purposes-panel.component.scss new file mode 100644 index 0000000000..989f109ff8 --- /dev/null +++ b/portal-frontend/src/app/shared/commission-purposes-panel/commission-purposes-panel.component.scss @@ -0,0 +1,12 @@ +.list-item { + counter-reset: listCounter; +} + +.list-item li { + list-style-type: none; +} + +.list-item li:before { + content: '(' counter(listCounter, lower-alpha) ') '; + counter-increment: listCounter; +} diff --git a/portal-frontend/src/app/shared/commission-purposes-panel/commission-purposes-panel.component.spec.ts b/portal-frontend/src/app/shared/commission-purposes-panel/commission-purposes-panel.component.spec.ts new file mode 100644 index 0000000000..095da6cb2d --- /dev/null +++ b/portal-frontend/src/app/shared/commission-purposes-panel/commission-purposes-panel.component.spec.ts @@ -0,0 +1,21 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { CommissionPurposesPanelComponent } from './commission-purposes-panel.component'; + +describe('CommissionPurposesPanelComponent', () => { + let component: CommissionPurposesPanelComponent; + let fixture: ComponentFixture<CommissionPurposesPanelComponent>; + + beforeEach(() => { + TestBed.configureTestingModule({ + declarations: [CommissionPurposesPanelComponent] + }); + fixture = TestBed.createComponent(CommissionPurposesPanelComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/portal-frontend/src/app/shared/commission-purposes-panel/commission-purposes-panel.component.ts b/portal-frontend/src/app/shared/commission-purposes-panel/commission-purposes-panel.component.ts new file mode 100644 index 0000000000..928811974d --- /dev/null +++ b/portal-frontend/src/app/shared/commission-purposes-panel/commission-purposes-panel.component.ts @@ -0,0 +1,8 @@ +import { Component } from '@angular/core'; + +@Component({ + selector: 'app-commission-purposes-panel', + templateUrl: './commission-purposes-panel.component.html', + styleUrls: ['./commission-purposes-panel.component.scss'], +}) +export class CommissionPurposesPanelComponent {} diff --git a/portal-frontend/src/app/shared/shared.module.ts b/portal-frontend/src/app/shared/shared.module.ts index 38e87a5d6d..4e95fd1a2f 100644 --- a/portal-frontend/src/app/shared/shared.module.ts +++ b/portal-frontend/src/app/shared/shared.module.ts @@ -47,6 +47,7 @@ import { SoilTableComponent } from './soil-table/soil-table.component'; import { DATE_FORMATS } from './utils/date-format'; import { ValidationErrorComponent } from './validation-error/validation-error.component'; import { WarningBannerComponent } from './warning-banner/warning-banner.component'; +import { CommissionPurposesPanelComponent } from './commission-purposes-panel/commission-purposes-panel.component'; @NgModule({ providers: [ @@ -78,6 +79,7 @@ import { WarningBannerComponent } from './warning-banner/warning-banner.componen MatAutocompleteModule, MatTreeModule, MatProgressSpinnerModule, + MatExpansionModule, ], declarations: [ FileDragDropComponent, @@ -99,6 +101,7 @@ import { WarningBannerComponent } from './warning-banner/warning-banner.componen TableColumnNoDataPipe, FileTypeFilterDropDownComponent, FileOverlaySpinnerComponent, + CommissionPurposesPanelComponent, ], exports: [ CommonModule, @@ -146,6 +149,7 @@ import { WarningBannerComponent } from './warning-banner/warning-banner.componen SoilTableComponent, TableColumnNoDataPipe, FileTypeFilterDropDownComponent, + CommissionPurposesPanelComponent, ], }) export class SharedModule { From e2f9e5f5d321d42487485d148b4846644241ccb4 Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Mon, 8 Jan 2024 10:39:57 -0800 Subject: [PATCH 892/954] Test only for agent creation requests, as specified --- .../application-owner/application-owner.controller.spec.ts | 5 ++++- .../notice-of-intent-owner.controller.spec.ts | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.controller.spec.ts b/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.controller.spec.ts index fe87f6cf95..69c3c8315e 100644 --- a/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.controller.spec.ts +++ b/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.controller.spec.ts @@ -265,7 +265,10 @@ describe('ApplicationOwnerController', () => { ); await controller.setPrimaryContact( - { applicationSubmissionUuid: '' }, + { + applicationSubmissionUuid: '', + type: OWNER_TYPE.AGENT, + }, { user: { entity: {}, diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.controller.spec.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.controller.spec.ts index 3b3e25ba82..8ecfd0c570 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.controller.spec.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.controller.spec.ts @@ -237,7 +237,10 @@ describe('NoticeOfIntentOwnerController', () => { ); await controller.setPrimaryContact( - { noticeOfIntentSubmissionUuid: '' }, + { + noticeOfIntentSubmissionUuid: '', + type: OWNER_TYPE.AGENT, + }, { user: { entity: {}, From 7468951220a118baf3ed1811598e4384e4518475 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Mon, 8 Jan 2024 10:56:37 -0800 Subject: [PATCH 893/954] Add More Decision Makers --- .../1704739982580-add_decision_makers.ts | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1704739982580-add_decision_makers.ts diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1704739982580-add_decision_makers.ts b/services/apps/alcs/src/providers/typeorm/migrations/1704739982580-add_decision_makers.ts new file mode 100644 index 0000000000..f649063a21 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1704739982580-add_decision_makers.ts @@ -0,0 +1,18 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class AddDecisionMakers1704739982580 implements MigrationInterface { + public async up(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query(` + INSERT INTO "alcs"."application_decision_maker_code" + ("audit_deleted_date_at", "audit_created_at", "audit_updated_at", "audit_created_by", "audit_updated_by", "label", "code", "description", "is_active") VALUES + (NULL, NOW(), NULL, 'migration_seed', NULL, 'BC Government', 'BCGO', 'BC Government', 't'), + (NULL, NOW(), NULL, 'migration_seed', NULL, 'BC Energy Regulator (formally OGC)', 'BCER', 'BC Energy Regulator (formally OGC)', 't'), + (NULL, NOW(), NULL, 'migration_seed', NULL, 'Local Government (Historical)', 'LGOV', 'Local Government (Historical)', 't'), + (NULL, NOW(), NULL, 'migration_seed', NULL, 'Agricultural Land Commission', 'ALCS', 'Agricultural Land Commission', 't'); + `); + } + + public async down(): Promise<void> { + //No + } +} From 3536e5dc7851b90170b7829f8f3ec7d994a673ae Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Mon, 8 Jan 2024 11:05:20 -0800 Subject: [PATCH 894/954] Update Portal Favicon --- portal-frontend/src/favicon.ico | Bin 948 -> 608 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/portal-frontend/src/favicon.ico b/portal-frontend/src/favicon.ico index 997406ad22c29aae95893fb3d666c30258a09537..6c5ea9a184b5794c9638c941ccf6a6aac463699d 100644 GIT binary patch literal 608 zcmZQzU<5)32L>Riz~IHiz#zuJz|a}s=g!L|#RX*YdV0770coHL1_usiAUSt?;~OBw zSRCZ;#CY?hPCbyrS>O>_%)r1c48n{Iv*t(u1-k-#LR^6~PmB&vqz-SSE|3H<qI5YT z3<LrUcz`0&x;zm&+>yFKB$I5ZmFs3%5#rgDkUqV-b<MQ0g&kA3E#7>3@5Ki<9=v|~ z|Ns9FUq3B5xZ(ZRj}KlwU2<T9XH%kfuA6kSrAJfZp{u7Ndh%M=OuhKv`k`y5wDQ~@ zzIxiWW*SeF4$umL1cSPLpDTc_(JKk^3ubVbaR2}L`3eI4{TCM82O5kUoOckgvOD+| z=wW$J7srr_Id7*&79Ua&X<gr;rl+dOw6)aJXZ5wW|Nq+>zGRvhI8A)+L!0Nn&z<Bp z7I#?Iyz7SL-a01VOO4idQ)XQIb7J~*Z9TU4|EicBgbpR&X)K(<;HdBOfhp1ESfBta z5Y;hFdb)nfrA{Gj$7#XGj^6%qcfxI^Nx^!{<kddxQ%E;XUOH7F`A~>;e241%fGCmF z$aS;)d7HZ8P0!m;fAd=W;$^XrJ)wIite9xRd7^6Z;W_t`ZZ~DEUY}N;80v5%Y%#a? zFMo$?ujWUW{pT);5&2f4d*S2F?ZSGjIm@^0eiXFef%Nu|;Z1wl|JCRRiMTk5*larR z_(@1HgNWLT!-hTz=kG7z^oU!xyy0+ui2Ql=_q-Z^cix}8@pzY>Roo5ZME}@|xP~)Y Qz(8j3boFyt=akR{00|ZessI20 literal 948 zcmV;l155mgP)<h;3K|Lk000e1NJLTq000~S0015c1^@s6KgE8Z00009a7bBm000XT z000XT0n*)m`~Uz0W=TXrR7i=HS4&J2Q53!N>CBYU7IjCFmI-B}4sMJt3^s9NVg!P0 z6hDQy(L`XWMkB@zOLgN$4KYz;j0zZxq9KKdpZE#5@k0crP^5f9KO};h)ZDQ%ybhht z%t<DF^WJ^$%)N8(nOiE8$$(XeL8%@9luMqDd3cT+XIb_^YH{kU)iX>9#h|nu0K(bJ ztIkhEr!*UyrZWQ1k2+YkGqDi8Z<|mIN&$kzpKl{cNP=OQzXHz>vn+c)F)zO|Bou>E z2|-d_=qY#Y+yOu1a}XI?cU}%04)zz%anD(XZC{#~WreV!a$7k2Ug`?&CUEc0EtrkZ zL49MB)h!_K{H(*l_93D5tO0;BUnvYlo+;yss%n^&qjt6fZOa+}+FDO(<Bkhw>~2>G z2dx@=JZ?DHP^;b7*Y1as5^uphBsh*s*z&MBd?e@I>-9kU>63PjP&^#5YTOb&x^6Cf z?674rmSHB5Fk!{Gv7rv!?qX#ei_L(XtwVqLX3L}$MI|kJ*w(rhx~tc&L&xP#?cQow zX_|gx$wMr3pRZIIr_;;O|8fAjd;1`nOeu5K(pCu7>^3E&D2OBBq?sY<UH^*#NTt${ zNF)_f745C&UQ!hOL6J5wC>a(%S?GwG&_0-s%_v$L@R!5H_fc)lOb9ZoOO#p`Nn`KU z3LTTBtjwo`7(<AJG9luHgaE%Npo+H`lp+AIM{k6MKJszc@DM%lod&8TCER*o(XXcC z8&nVTCXT+)%}_`PXo^}PJ?sF0i+ZEcPp`Gw`||ahk}N7#R#vq!${S`X0z(`KO6v$+ zMMZ<lOR*4Z^w4CXBMvpS<Pee{U^01BA?Uh&H@~OZ--v#JEQN=UdUMG1z|8D<@>HA6 z7gmO$yTR!5L>Bsg!X8616{JUngg_<CkvB3~uoT|Ddv8jJB0!diUI=K4ehj*vX2h(Q zAz{=+<pcIMznABWNDpCr>@&85%>W=<KFI{w!MTfFH&rswzr*pd&s_k3#Fq-Gj~P%^ zungQTS7mB(`UGii*a&Ca#w!4DJm0!eNS%W4gXg%tYFns>mChTR;x4`P=?PJ~oPuy5 zU-L`C@_!34D21{fD~Y8NVnR3t;aqZI3fIhmgmx}$oc-dKDC6Ap$Gy>a!`A*x2L1v0 WcZ@i?LyX}70000<MNUMnLSTXxWwRmx From 8504c8b542870116390061c81c669450a8e84efa Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Mon, 8 Jan 2024 11:10:39 -0800 Subject: [PATCH 895/954] Fix confirmation tests --- .../primary-contact-confirmation-dialog.component.spec.ts | 6 +++++- .../primary-contact-confirmation-dialog.component.spec.ts | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact-confirmation-dialog/primary-contact-confirmation-dialog.component.spec.ts b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact-confirmation-dialog/primary-contact-confirmation-dialog.component.spec.ts index ce0667a304..498fb8167d 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact-confirmation-dialog/primary-contact-confirmation-dialog.component.spec.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact-confirmation-dialog/primary-contact-confirmation-dialog.component.spec.ts @@ -1,7 +1,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { NO_ERRORS_SCHEMA } from '@angular/core'; -import { MatDialog, MatDialogRef } from '@angular/material/dialog'; +import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { PrimaryContactConfirmationDialogComponent } from './primary-contact-confirmation-dialog.component'; describe('OtherParcelConfirmationDialogComponent', () => { @@ -20,6 +20,10 @@ describe('OtherParcelConfirmationDialogComponent', () => { provide: MatDialogRef, useValue: {}, }, + { + provide: MAT_DIALOG_DATA, + useValue: {}, + }, ], schemas: [NO_ERRORS_SCHEMA], }).compileComponents(); diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact-confirmation-dialog/primary-contact-confirmation-dialog.component.spec.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact-confirmation-dialog/primary-contact-confirmation-dialog.component.spec.ts index ce0667a304..498fb8167d 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact-confirmation-dialog/primary-contact-confirmation-dialog.component.spec.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact-confirmation-dialog/primary-contact-confirmation-dialog.component.spec.ts @@ -1,7 +1,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { NO_ERRORS_SCHEMA } from '@angular/core'; -import { MatDialog, MatDialogRef } from '@angular/material/dialog'; +import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { PrimaryContactConfirmationDialogComponent } from './primary-contact-confirmation-dialog.component'; describe('OtherParcelConfirmationDialogComponent', () => { @@ -20,6 +20,10 @@ describe('OtherParcelConfirmationDialogComponent', () => { provide: MatDialogRef, useValue: {}, }, + { + provide: MAT_DIALOG_DATA, + useValue: {}, + }, ], schemas: [NO_ERRORS_SCHEMA], }).compileComponents(); From c6005bb20b1a1ddd1f187552787a447df35b2ae9 Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Mon, 8 Jan 2024 11:41:46 -0800 Subject: [PATCH 896/954] Fix crown owners not being removed from list --- .../primary-contact/primary-contact.component.ts | 2 +- .../primary-contact/primary-contact.component.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts index 3ba80ce52b..e5321b4c24 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts @@ -336,7 +336,7 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni this.email.setValue(updatedContact.email); } - if (updatedContact?.action === 'delete') { + if (updatedContact?.action === 'delete' || updatedContact?.type === 'delete') { this.parcelOwners = this.parcelOwners.filter((owner) => owner.uuid !== this.selectedOwnerUuid); if (this.parcelOwners.length === 1) { diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts index 169b8b7c1b..d7fb848fdc 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts @@ -338,7 +338,7 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni this.email.setValue(updatedContact.email); } - if (updatedContact?.action === 'delete') { + if (updatedContact?.action === 'delete' || updatedContact?.type === 'delete') { this.parcelOwners = this.parcelOwners.filter((owner) => owner.uuid !== this.selectedOwnerUuid); if (this.parcelOwners.length === 1) { From 2bae22cd76731616b402734748cb32aa2c1b3634 Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Mon, 8 Jan 2024 12:56:06 -0800 Subject: [PATCH 897/954] Fix value conflict issue for owners radio list --- .../primary-contact/primary-contact.component.html | 8 +------- .../primary-contact/primary-contact.component.ts | 12 +++++++++++- .../primary-contact/primary-contact.component.html | 8 +------- .../primary-contact/primary-contact.component.ts | 12 +++++++++++- 4 files changed, 24 insertions(+), 16 deletions(-) diff --git a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html index bccfd47502..0466b01cc1 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html @@ -38,13 +38,7 @@ <h2>Primary Contact</h2> <ng-container *ngIf="hasCrownParcels">and government contacts</ng-container></label > - <mat-radio-group - [formControl]="ownersList" - color="primary" - [value]="selectedOwnerUuid" - (change)="onSelectOwner($event.value)" - required - > + <mat-radio-group [formControl]="ownersList" color="primary" (change)="onSelectOwner($event.value)" required> <mat-radio-button *ngFor="let owner of parcelOwners" [value]="owner.uuid" class="radio-option" required> {{ owner.firstName }} {{ owner.lastName }} </mat-radio-button> diff --git a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts index e5321b4c24..ba248f095f 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts @@ -37,7 +37,7 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni needsAuthorizationLetter = false; selectedThirdPartyAgent = false; selectedLocalGovernment = false; - selectedOwnerUuid: string | undefined = undefined; + _selectedOwnerUuid: string | undefined = undefined; isCrownOwner = false; isGovernmentUser = false; governmentName: string | undefined; @@ -105,6 +105,16 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni this.showVirusError = !res; } + set selectedOwnerUuid(value: string | undefined) { + this._selectedOwnerUuid = value; + // Input expects null instead of undefined + this.ownersList.setValue(value ?? null); + } + + get selectedOwnerUuid() { + return this._selectedOwnerUuid; + } + onSelectAgent() { this.onSelectOwner('agent'); } diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html index e21171f08a..0a80eb1792 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html @@ -39,13 +39,7 @@ <h2>Primary Contact</h2> <ng-container *ngIf="hasCrownParcels">and government contacts</ng-container></label > - <mat-radio-group - [formControl]="ownersList" - color="primary" - [value]="selectedOwnerUuid" - (change)="onSelectOwner($event.value)" - required - > + <mat-radio-group [formControl]="ownersList" color="primary" (change)="onSelectOwner($event.value)" required> <mat-radio-button *ngFor="let owner of parcelOwners" [value]="owner.uuid" class="radio-option" required> {{ owner.firstName }} {{ owner.lastName }} </mat-radio-button> diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts index d7fb848fdc..304f65c6b8 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts @@ -39,7 +39,7 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni showVirusError = false; selectedThirdPartyAgent = false; selectedLocalGovernment = false; - selectedOwnerUuid: string | undefined = undefined; + _selectedOwnerUuid: string | undefined = undefined; isCrownOwner = false; isGovernmentUser = false; governmentName: string | undefined; @@ -107,6 +107,16 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni this.showVirusError = !res; } + set selectedOwnerUuid(value: string | undefined) { + this._selectedOwnerUuid = value; + // Input expects null instead of undefined + this.ownersList.setValue(value ?? null); + } + + get selectedOwnerUuid() { + return this._selectedOwnerUuid; + } + onSelectAgent() { this.onSelectOwner('agent'); } From 3af02e58a8d1bfae03684476d0c68735ec043e23 Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Mon, 8 Jan 2024 13:15:47 -0800 Subject: [PATCH 898/954] Clean up/clarify form value checker --- .../primary-contact/primary-contact.component.ts | 10 ++-------- .../primary-contact/primary-contact.component.ts | 10 ++-------- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts index ba248f095f..f60a811a3b 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts @@ -267,15 +267,9 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni async onSelectPrimaryContactType(event: MatButtonToggleChange) { const isExistingOwner = event.value; + const hasValues = Object.values(this.form.value).some((value) => value); - const isDirty = - this.firstName.value || - this.lastName.value || - this.organizationName.value || - this.phoneNumber.value || - this.email.value; - - if (isDirty) { + if (hasValues) { await this.dialog .open(PrimaryContactConfirmationDialogComponent, { panelClass: 'no-padding', diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts index 304f65c6b8..7686924fb8 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts @@ -269,15 +269,9 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni async onSelectPrimaryContactType(event: MatButtonToggleChange) { const isExistingOwner = event.value; + const hasValues = Object.values(this.form.value).some((value) => value); - const isDirty = - this.firstName.value || - this.lastName.value || - this.organizationName.value || - this.phoneNumber.value || - this.email.value; - - if (isDirty) { + if (hasValues) { await this.dialog .open(PrimaryContactConfirmationDialogComponent, { panelClass: 'no-padding', From bb0acaf296e4840ce28ada6d93858d95c8c355d0 Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Mon, 8 Jan 2024 16:28:37 -0800 Subject: [PATCH 899/954] Remove redundant conditional on owners list label --- .../primary-contact/primary-contact.component.html | 2 +- .../primary-contact/primary-contact.component.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html index 0466b01cc1..4fa76de9b9 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html @@ -33,7 +33,7 @@ <h2>Primary Contact</h2> <!-- Owner --> <div *ngIf="selectedThirdPartyAgent === false"> - <label *ngIf="selectedThirdPartyAgent === false && parcelOwners.length > 0" + <label *ngIf="parcelOwners.length > 0" >Select a Primary Contact from the listed land owners <ng-container *ngIf="hasCrownParcels">and government contacts</ng-container></label > diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html index 0a80eb1792..014bae2623 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html @@ -34,7 +34,7 @@ <h2>Primary Contact</h2> <!-- Owner --> <div *ngIf="selectedThirdPartyAgent === false"> - <label *ngIf="selectedThirdPartyAgent === false && parcelOwners.length > 0" + <label *ngIf="parcelOwners.length > 0" >Select a Primary Contact from the listed land owners <ng-container *ngIf="hasCrownParcels">and government contacts</ng-container></label > From 6bab40b391cfb08af29612fb550a7e5fc7223d10 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Tue, 9 Jan 2024 10:17:02 -0800 Subject: [PATCH 900/954] Fixes for Portal Maintenance Mode * Add new route for auth controller so that it triggers maintenance guard for portal * Add logic to prevent deactivate from infinite looping when navigating to the maintenance page. Save fails triggering a redirect which triggers canDeactivate which calls save again. --- .../alcs-edit-submission.component.ts | 14 +++++++++++++- .../edit-submission/edit-submission.component.ts | 14 ++++++++++++-- .../review-submission.component.ts | 12 ++++++++++-- .../alcs-edit-submission.component.ts | 14 +++++++++++++- .../edit-submission/edit-submission.component.ts | 13 ++++++++++++- .../edit-submission/edit-submission.component.ts | 13 ++++++++++++- .../app/services/authentication/alcs-auth.guard.ts | 4 ++-- .../app/services/authentication/auth.guard.spec.ts | 4 ++-- .../src/app/services/authentication/auth.guard.ts | 4 ++-- .../authentication/authentication.service.ts | 6 +++--- .../src/app/shared/guard/can-deactivate.guard.ts | 6 +----- .../authorization/authorization.controller.ts | 3 ++- 12 files changed, 84 insertions(+), 23 deletions(-) diff --git a/portal-frontend/src/app/features/applications/alcs-edit-submission/alcs-edit-submission.component.ts b/portal-frontend/src/app/features/applications/alcs-edit-submission/alcs-edit-submission.component.ts index 6f3644bd85..9ff766ee3a 100644 --- a/portal-frontend/src/app/features/applications/alcs-edit-submission/alcs-edit-submission.component.ts +++ b/portal-frontend/src/app/features/applications/alcs-edit-submission/alcs-edit-submission.component.ts @@ -50,6 +50,7 @@ export class AlcsEditSubmissionComponent implements OnInit, OnDestroy, AfterView expandedParcelUuid?: string; showValidationErrors = false; + isDeactivating = false; @ViewChild('cdkStepper') public customStepper!: CustomStepperComponent; @@ -89,6 +90,8 @@ export class AlcsEditSubmissionComponent implements OnInit, OnDestroy, AfterView combineLatest([this.activatedRoute.queryParamMap, this.activatedRoute.paramMap]) .pipe(takeUntil(this.$destroy)) .subscribe(([queryParamMap, paramMap]) => { + this.isDeactivating = false; + const fileId = paramMap.get('fileId'); if (fileId) { this.loadDraftSubmission(fileId).then(() => { @@ -143,7 +146,16 @@ export class AlcsEditSubmissionComponent implements OnInit, OnDestroy, AfterView // this gets fired whenever applicant navigates away from edit page async canDeactivate(): Promise<Observable<boolean>> { - await this.saveApplication(this.customStepper.selectedIndex); + if (!this.isDeactivating) { + this.isDeactivating = true; + + try { + await this.saveApplication(this.customStepper.selectedIndex); + } catch (e) { + console.error('Failed to save application'); + } + } + return of(true); } diff --git a/portal-frontend/src/app/features/applications/edit-submission/edit-submission.component.ts b/portal-frontend/src/app/features/applications/edit-submission/edit-submission.component.ts index e27a254af9..eb88423a7b 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/edit-submission.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/edit-submission.component.ts @@ -1,4 +1,3 @@ -import { StepperSelectionEvent } from '@angular/cdk/stepper'; import { AfterViewInit, Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; import { ActivatedRoute, Router } from '@angular/router'; @@ -65,6 +64,7 @@ export class EditSubmissionComponent implements OnInit, OnDestroy, AfterViewInit expandedParcelUuid?: string; showValidationErrors = false; + isDeactivating = false; @ViewChild('cdkStepper') public customStepper!: CustomStepperComponent; @@ -119,6 +119,8 @@ export class EditSubmissionComponent implements OnInit, OnDestroy, AfterViewInit combineLatest([this.activatedRoute.queryParamMap, this.activatedRoute.paramMap]) .pipe(takeUntil(this.$destroy)) .subscribe(([queryParamMap, paramMap]) => { + this.isDeactivating = false; + const fileId = paramMap.get('fileId'); if (fileId) { this.loadApplication(fileId).then(() => { @@ -190,7 +192,15 @@ export class EditSubmissionComponent implements OnInit, OnDestroy, AfterViewInit // this gets fired whenever applicant navigates away from edit page async canDeactivate(): Promise<Observable<boolean>> { - await this.saveApplication(this.customStepper.selectedIndex); + if (!this.isDeactivating) { + this.isDeactivating = true; + + try { + await this.saveApplication(this.customStepper.selectedIndex); + } catch (e) { + console.error('Failed to save application'); + } + } return of(true); } diff --git a/portal-frontend/src/app/features/applications/review-submission/review-submission.component.ts b/portal-frontend/src/app/features/applications/review-submission/review-submission.component.ts index a23202f9f8..4a890c3e1d 100644 --- a/portal-frontend/src/app/features/applications/review-submission/review-submission.component.ts +++ b/portal-frontend/src/app/features/applications/review-submission/review-submission.component.ts @@ -51,6 +51,7 @@ export class ReviewSubmissionComponent implements OnInit, OnDestroy { doNotSaveAppReview = false; showValidationErrors = false; isOnLastStep = false; + isDeactivating = false; @ViewChild('cdkStepper') public customStepper!: CustomStepperComponent; @@ -74,6 +75,8 @@ export class ReviewSubmissionComponent implements OnInit, OnDestroy { combineLatest([this.activatedRoute.queryParamMap, this.activatedRoute.paramMap]) .pipe(takeUntil(this.$destroy)) .subscribe(([queryParamMap, paramMap]) => { + this.isDeactivating = false; + const fileId = paramMap.get('fileId'); if (fileId) { if (this.fileId !== fileId) { @@ -185,11 +188,16 @@ export class ReviewSubmissionComponent implements OnInit, OnDestroy { // this gets fired whenever applicant navigates away from edit page async canDeactivate(): Promise<Observable<boolean>> { - if (this.doNotSaveAppReview) { + if (this.doNotSaveAppReview || this.isDeactivating) { return of(true); } + this.isDeactivating = true; - await this.saveApplicationReview(this.customStepper.selectedIndex); + try { + await this.saveApplicationReview(this.customStepper.selectedIndex); + } catch (e) { + console.error('Failed to save application'); + } return of(true); } diff --git a/portal-frontend/src/app/features/notice-of-intents/alcs-edit-submission/alcs-edit-submission.component.ts b/portal-frontend/src/app/features/notice-of-intents/alcs-edit-submission/alcs-edit-submission.component.ts index 585584afbc..15714dc0b3 100644 --- a/portal-frontend/src/app/features/notice-of-intents/alcs-edit-submission/alcs-edit-submission.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/alcs-edit-submission/alcs-edit-submission.component.ts @@ -43,6 +43,7 @@ export class AlcsEditSubmissionComponent implements OnInit, OnDestroy, AfterView expandedParcelUuid?: string; showValidationErrors = false; + isDeactivating = false; @ViewChild('cdkStepper') public customStepper!: CustomStepperComponent; @@ -81,6 +82,8 @@ export class AlcsEditSubmissionComponent implements OnInit, OnDestroy, AfterView combineLatest([this.activatedRoute.queryParamMap, this.activatedRoute.paramMap]) .pipe(takeUntil(this.$destroy)) .subscribe(([queryParamMap, paramMap]) => { + this.isDeactivating = false; + const fileId = paramMap.get('fileId'); if (fileId) { this.loadDraftSubmission(fileId).then(() => { @@ -127,7 +130,16 @@ export class AlcsEditSubmissionComponent implements OnInit, OnDestroy, AfterView // this gets fired whenever applicant navigates away from edit page async canDeactivate(): Promise<Observable<boolean>> { - await this.saveSubmission(this.customStepper.selectedIndex); + if (!this.isDeactivating) { + this.isDeactivating = true; + + try { + await this.saveSubmission(this.customStepper.selectedIndex); + } catch (e) { + console.error('Failed to save application'); + } + } + return of(true); } diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.ts index 935cd2dff0..3e59b8b539 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.ts @@ -52,6 +52,7 @@ export class EditSubmissionComponent implements OnDestroy, AfterViewInit { steps = EditNoiSteps; expandedParcelUuid?: string; showValidationErrors = false; + isDeactivating = false; @ViewChild('cdkStepper') public customStepper!: CustomStepperComponent; @@ -85,6 +86,8 @@ export class EditSubmissionComponent implements OnDestroy, AfterViewInit { combineLatest([this.activatedRoute.queryParamMap, this.activatedRoute.paramMap]) .pipe(takeUntil(this.$destroy)) .subscribe(([queryParamMap, paramMap]) => { + this.isDeactivating = false; + const fileId = paramMap.get('fileId'); if (fileId) { this.loadSubmission(fileId).then(() => { @@ -121,7 +124,15 @@ export class EditSubmissionComponent implements OnDestroy, AfterViewInit { // this gets fired whenever applicant navigates away from edit page async canDeactivate(): Promise<Observable<boolean>> { - await this.saveSubmission(this.customStepper.selectedIndex); + if (!this.isDeactivating) { + this.isDeactivating = true; + + try { + await this.saveSubmission(this.customStepper.selectedIndex); + } catch (e) { + console.error('Failed to save application'); + } + } return of(true); } diff --git a/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.component.ts b/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.component.ts index d9991517cc..9c8e66b0e9 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.component.ts +++ b/portal-frontend/src/app/features/notifications/edit-submission/edit-submission.component.ts @@ -47,6 +47,7 @@ export class EditSubmissionComponent implements OnDestroy, AfterViewInit { steps = EditNotificationSteps; expandedParcelUuid?: string; showValidationErrors = false; + isDeactivating = false; @ViewChild('cdkStepper') public customStepper!: CustomStepperComponent; @ViewChild(ParcelDetailsComponent) parcelDetailsComponent!: ParcelDetailsComponent; @@ -75,6 +76,8 @@ export class EditSubmissionComponent implements OnDestroy, AfterViewInit { combineLatest([this.activatedRoute.queryParamMap, this.activatedRoute.paramMap]) .pipe(takeUntil(this.$destroy)) .subscribe(([queryParamMap, paramMap]) => { + this.isDeactivating = false; + const fileId = paramMap.get('fileId'); if (fileId) { this.loadSubmission(fileId).then(() => { @@ -111,7 +114,15 @@ export class EditSubmissionComponent implements OnDestroy, AfterViewInit { // this gets fired whenever applicant navigates away from edit page async canDeactivate(): Promise<Observable<boolean>> { - await this.saveSubmission(this.customStepper.selectedIndex); + if (!this.isDeactivating) { + this.isDeactivating = true; + + try { + await this.saveSubmission(this.customStepper.selectedIndex); + } catch (e) { + console.error('Failed to save application'); + } + } return of(true); } diff --git a/portal-frontend/src/app/services/authentication/alcs-auth.guard.ts b/portal-frontend/src/app/services/authentication/alcs-auth.guard.ts index 0c92f94a00..8d2764bcff 100644 --- a/portal-frontend/src/app/services/authentication/alcs-auth.guard.ts +++ b/portal-frontend/src/app/services/authentication/alcs-auth.guard.ts @@ -8,14 +8,14 @@ import { AuthenticationService } from './authentication.service'; export class AlcsAuthGuard implements CanActivate { constructor(private authenticationService: AuthenticationService, private router: Router) {} - async canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Promise<boolean> { + async canActivate(): Promise<boolean> { const hasToken = await this.authenticationService.getToken(false); if (hasToken) { return true; } const res = await this.authenticationService.getLoginUrl(); - if (res) { + if (res && res.loginUrl) { //Set desired return URL to current page const targetUrl = window.location.href; localStorage.setItem('targetUrl', targetUrl); diff --git a/portal-frontend/src/app/services/authentication/auth.guard.spec.ts b/portal-frontend/src/app/services/authentication/auth.guard.spec.ts index 00ac80b657..bf1a4b136c 100644 --- a/portal-frontend/src/app/services/authentication/auth.guard.spec.ts +++ b/portal-frontend/src/app/services/authentication/auth.guard.spec.ts @@ -41,13 +41,13 @@ describe('AuthGuard', () => { }); it('should allow activation when a token is present', async () => { - const canActivate = await guard.canActivate({} as ActivatedRouteSnapshot, {} as RouterStateSnapshot); + const canActivate = await guard.canActivate(); expect(canActivate).toBeTruthy(); }); it('should redirect to login when there is no token', async () => { mockAuthService.getToken.mockResolvedValue(undefined); - const canActivate = await guard.canActivate({} as ActivatedRouteSnapshot, {} as RouterStateSnapshot); + const canActivate = await guard.canActivate(); expect(canActivate).toBeFalsy(); expect(mockRouter.navigateByUrl).toHaveBeenCalledWith('/login'); }); diff --git a/portal-frontend/src/app/services/authentication/auth.guard.ts b/portal-frontend/src/app/services/authentication/auth.guard.ts index 784b7577c2..5a07aec285 100644 --- a/portal-frontend/src/app/services/authentication/auth.guard.ts +++ b/portal-frontend/src/app/services/authentication/auth.guard.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot } from '@angular/router'; +import { CanActivate, Router } from '@angular/router'; import { AuthenticationService } from './authentication.service'; @Injectable({ @@ -8,7 +8,7 @@ import { AuthenticationService } from './authentication.service'; export class AuthGuard implements CanActivate { constructor(private authenticationService: AuthenticationService, private router: Router) {} - async canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Promise<boolean> { + async canActivate(): Promise<boolean> { const hasToken = await this.authenticationService.getToken(); if (hasToken) { return true; diff --git a/portal-frontend/src/app/services/authentication/authentication.service.ts b/portal-frontend/src/app/services/authentication/authentication.service.ts index dac5582900..cb5f636e2c 100644 --- a/portal-frontend/src/app/services/authentication/authentication.service.ts +++ b/portal-frontend/src/app/services/authentication/authentication.service.ts @@ -60,7 +60,7 @@ export class AuthenticationService { } async getLoginUrl() { - return firstValueFrom(this.http.get<{ loginUrl: string }>(`${environment.authUrl}/authorize/login`)); + return firstValueFrom(this.http.get<{ loginUrl: string }>(`${environment.apiUrl}/authorize/login`)); } async getToken(redirect = true) { @@ -116,7 +116,7 @@ export class AuthenticationService { private async isTokenValid(token: string) { try { await firstValueFrom( - this.http.get(`${environment.authUrl}/portal/token`, { + this.http.get(`${environment.apiUrl}/token`, { responseType: 'text', headers: { Authorization: `Bearer ${token}`, @@ -137,7 +137,7 @@ export class AuthenticationService { this.http.get<{ refresh_token: string; token: string; - }>(`${environment.authUrl}/authorize/refresh?r=${refreshToken}`) + }>(`${environment.apiUrl}/authorize/refresh?r=${refreshToken}`) ); } diff --git a/portal-frontend/src/app/shared/guard/can-deactivate.guard.ts b/portal-frontend/src/app/shared/guard/can-deactivate.guard.ts index 3083d3de67..bea044b56c 100644 --- a/portal-frontend/src/app/shared/guard/can-deactivate.guard.ts +++ b/portal-frontend/src/app/shared/guard/can-deactivate.guard.ts @@ -12,11 +12,7 @@ export interface CanComponentDeactivate { providedIn: 'root', }) export class CanDeactivateGuard implements CanDeactivate<CanComponentDeactivate> { - canDeactivate( - component: CanComponentDeactivate, - route: ActivatedRouteSnapshot, - state: RouterStateSnapshot - ): CanDeactivateType { + canDeactivate(component: CanComponentDeactivate): CanDeactivateType { return component.canDeactivate(); } } diff --git a/services/apps/alcs/src/common/authorization/authorization.controller.ts b/services/apps/alcs/src/common/authorization/authorization.controller.ts index 99c965d465..3c6535437c 100644 --- a/services/apps/alcs/src/common/authorization/authorization.controller.ts +++ b/services/apps/alcs/src/common/authorization/authorization.controller.ts @@ -15,7 +15,8 @@ import { KEYCLOAK_INSTANCE, Public } from 'nest-keycloak-connect'; import { v4 } from 'uuid'; import { AuthorizationService } from './authorization.service'; -@Controller('/authorize') +//One for ALCS, One for Portal that triggers maintenance guard +@Controller(['/authorize', '/portal/authorize']) export class AuthorizationController { private logger = new Logger(AuthorizationController.name); From 65fdab1475063f995e99b5319ab0ac42be5d8198 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Tue, 9 Jan 2024 10:38:52 -0800 Subject: [PATCH 901/954] Add back isDraft calculation * Accidentally remove when adding in other new disabled state --- .../application/decision/decision-v2/decision-v2.component.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.ts index d52fe2cfd1..bab882683b 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.ts @@ -111,6 +111,7 @@ export class DecisionV2Component implements OnInit, OnDestroy { }; }); + this.isDraftExists = this.decisions.some((d) => d.isDraft); this.scrollToDecision(); this.disabledCreateBtnTooltip = this.isPaused From 2299c58304d6982b20777afe768e61ef09d74501 Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Tue, 9 Jan 2024 11:48:49 -0800 Subject: [PATCH 902/954] Fix L/FNG contact form not showing up on first load --- .../primary-contact/primary-contact.component.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts index f60a811a3b..35323f3f7a 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts @@ -242,10 +242,10 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni this.onSelectOwner(selectedOwner.uuid); } else if (parcelOwners.length === 1) { this.onSelectOwner(parcelOwners[0].uuid); + } else if (this.isGovernmentUser) { + this.onSelectGovernment(); } - // Needed for L/FNG user on first load - this.selectedLocalGovernment = selectedOwner?.type.code === OWNER_TYPE.GOVERNMENT; if (this.isGovernmentUser && this.selectedLocalGovernment) { this.organizationName.setValidators([Validators.required]); this.prepareGovernmentOwners(); From 5283cb56824ac7c9dc373a132bf6352727c3aac3 Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Tue, 9 Jan 2024 12:00:10 -0800 Subject: [PATCH 903/954] Fix L/FNG contact form missing on first load (NOI) --- .../primary-contact/primary-contact.component.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts index 7686924fb8..5578107a95 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts @@ -245,10 +245,10 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni this.onSelectOwner(selectedOwner.uuid); } else if (parcelOwners.length === 1) { this.onSelectOwner(parcelOwners[0].uuid); + } else if (this.isGovernmentUser) { + this.onSelectGovernment(); } - // Needed for L/FNG user on first load - this.selectedLocalGovernment = selectedOwner?.type.code === OWNER_TYPE.GOVERNMENT; if (this.selectedLocalGovernment) { this.organizationName.setValidators([Validators.required]); this.prepareGovernmentOwners(); From c184fd74a8abf6c79a9a109d6ebbe9742b4fc7fa Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Tue, 9 Jan 2024 14:20:31 -0800 Subject: [PATCH 904/954] Fix various layout issues --- .../primary-contact.component.html | 169 ++++++++++-------- .../primary-contact.component.html | 169 ++++++++++-------- 2 files changed, 184 insertions(+), 154 deletions(-) diff --git a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html index 4fa76de9b9..6827e5c6e7 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html @@ -1,93 +1,108 @@ -<div class="step-description"> - <h2>Primary Contact</h2> - <p> - The primary contact becomes the single point of contact and must ensure that landowners are notified of all - information exchanged between the primary contact, local or First Nation government, and the ALC. - </p> - <p>*All fields are required unless stated optional or disabled.</p> -</div> - <section> + <div class="step-description"> + <h2>Primary Contact</h2> + <div> + <p> + The primary contact becomes the single point of contact and must ensure that landowners are notified of all + information exchanged between the primary contact, local or First Nation government, and the ALC. + </p> + </div> + <div><p>*All fields are required unless stated optional or disabled.</p></div> + </div> + <div class="agent-form"> <form [formGroup]="form"> - <div class="full-row"> - <p *ngIf="isGovernmentUser"> - <strong>Will {{ governmentName ?? 'Local / First Nation Government' }} staff be the primary contact?</strong> - </p> - <p *ngIf="!isGovernmentUser"> - <strong - >Will one of the landowners - <ng-container *ngIf="hasCrownParcels">or government contacts</ng-container> added previously be the primary - contact?</strong + <div class="form-row"> + <div class="full-row"> + <p *ngIf="isGovernmentUser"> + <strong + >Will {{ governmentName ?? 'Local / First Nation Government' }} staff be the primary contact?</strong + > + </p> + <p *ngIf="!isGovernmentUser"> + <strong + >Will one of the landowners + <ng-container *ngIf="hasCrownParcels">or government contacts</ng-container> added previously be the + primary contact?</strong + > + </p> + <mat-button-toggle-group + class="input" + [value]="!selectedThirdPartyAgent" + (change)="onSelectPrimaryContactType($event)" > - </p> - <mat-button-toggle-group - class="input" - [value]="!selectedThirdPartyAgent" - (change)="onSelectPrimaryContactType($event)" - > - <mat-button-toggle [value]="true">Yes</mat-button-toggle> - <mat-button-toggle [value]="false">No</mat-button-toggle> - </mat-button-toggle-group> + <mat-button-toggle [value]="true">Yes</mat-button-toggle> + <mat-button-toggle [value]="false">No</mat-button-toggle> + </mat-button-toggle-group> + </div> </div> - <!-- Owner --> - <div *ngIf="selectedThirdPartyAgent === false"> - <label *ngIf="parcelOwners.length > 0" - >Select a Primary Contact from the listed land owners - <ng-container *ngIf="hasCrownParcels">and government contacts</ng-container></label - > - - <mat-radio-group [formControl]="ownersList" color="primary" (change)="onSelectOwner($event.value)" required> - <mat-radio-button *ngFor="let owner of parcelOwners" [value]="owner.uuid" class="radio-option" required> - {{ owner.firstName }} {{ owner.lastName }} - </mat-radio-button> - </mat-radio-group> - <div *ngIf="ownersList.invalid && (ownersList.dirty || ownersList.touched)" class="field-error"> - <mat-icon>warning</mat-icon> - <div *ngIf="ownersList.errors?.['required']">This field is required</div> - </div> + <!-- Existing owner --> + <div class="form-row" *ngIf="selectedThirdPartyAgent === false"> + <div class="full-row"> + <label *ngIf="parcelOwners.length > 0" + >Select a Primary Contact from the listed land owners + <ng-container *ngIf="hasCrownParcels">and government contacts</ng-container></label + > + <mat-radio-group [formControl]="ownersList" color="primary" (change)="onSelectOwner($event.value)" required> + <mat-radio-button *ngFor="let owner of parcelOwners" [value]="owner.uuid" class="radio-option" required> + {{ owner.firstName }} {{ owner.lastName }} + </mat-radio-button> + </mat-radio-group> + <div *ngIf="ownersList.invalid && (ownersList.dirty || ownersList.touched)" class="field-error"> + <mat-icon>warning</mat-icon> + <div *ngIf="ownersList.errors?.['required']">This field is required</div> + </div> - <div - id="owner-info" - class="warning-banner" - *ngIf="selectedOwnerUuid && !selectedThirdPartyAgent && !selectedLocalGovernment" - > - <div class="owner-details"> - <div class="row"> - <div class="key"><strong>First Name:</strong></div> - <div class="value">{{ firstName.value }}</div> - </div> - <div class="row"> - <div class="key"><strong>Last Name:</strong></div> - <div class="value">{{ lastName.value }}</div> - </div> - <div *ngIf="organizationName.value" class="row"> - <div *ngIf="!isCrownOwner && !isGovernmentUser" class="key"><strong>Organization:</strong></div> - <div *ngIf="isCrownOwner" class="key"><strong>Ministry/Department:</strong></div> - <div class="value">{{ organizationName.value }}</div> - </div> - <div class="row"> - <div class="key"><strong>Phone Number:</strong></div> - <div class="value">{{ phoneNumber.value }}</div> - </div> - <div class="row"> - <div class="key"><strong>Email:</strong></div> - <div class="value">{{ email.value }}</div> - </div> - <div class="row"> - <button mat-flat-button (click)="onEdit(selectedOwnerUuid)">Edit information</button> + <div + id="owner-info" + class="warning-banner" + *ngIf="selectedOwnerUuid && !selectedThirdPartyAgent && !selectedLocalGovernment" + > + <div class="owner-details"> + <div class="row"> + <div class="key"><strong>First Name:</strong></div> + <div class="value">{{ firstName.value }}</div> + </div> + <div class="row"> + <div class="key"><strong>Last Name:</strong></div> + <div class="value">{{ lastName.value }}</div> + </div> + <div *ngIf="organizationName.value" class="row"> + <div *ngIf="!isCrownOwner && !isGovernmentUser" class="key"><strong>Organization:</strong></div> + <div *ngIf="isCrownOwner" class="key"><strong>Ministry/Department:</strong></div> + <div class="value">{{ organizationName.value }}</div> + </div> + <div class="row"> + <div class="key"><strong>Phone Number:</strong></div> + <div class="value">{{ phoneNumber.value }}</div> + </div> + <div class="row"> + <div class="key"><strong>Email:</strong></div> + <div class="value">{{ email.value }}</div> + </div> + <div class="row"> + <button mat-flat-button (click)="onEdit(selectedOwnerUuid)">Edit information</button> + </div> </div> </div> + + <app-warning-banner *ngIf="parcelOwners.length === 0 && !selectedThirdPartyAgent && !isGovernmentUser"> + No landowners or government contacts are added. Please go back to Step 1 to add information. + </app-warning-banner> </div> </div> - <app-warning-banner *ngIf="parcelOwners.length === 0 && !selectedThirdPartyAgent && !isGovernmentUser"> - No landowners or government contacts are added. Please go back to Step 1 to add information. - </app-warning-banner> - <!-- /Owner --> + <!-- /Existing owners --> <!-- Third-Part Agent/Government --> - <div *ngIf="selectedThirdPartyAgent || selectedLocalGovernment" class="form-row"> + <div class="form-row" *ngIf="selectedThirdPartyAgent || selectedLocalGovernment"> + <div class="full-row"> + <h3 *ngIf="selectedThirdPartyAgent">Agent Contact Information</h3> + <h3 *ngIf="selectedLocalGovernment"> + {{ governmentName ?? 'Local / First Nation Government' }} Staff Contact Information + </h3> + </div> + <div> <label for="firstName">First Name</label> <mat-form-field appearance="outline"> diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html index 014bae2623..4c87b4ba64 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html @@ -1,94 +1,109 @@ -<div class="step-description"> - <h2>Primary Contact</h2> - <p> - The primary contact becomes the single point of contact and must ensure that landowners are notified of all - information exchanged between the primary contact, local or First Nation government, and the ALC. - </p> - <p>*All fields are required unless stated optional or disabled.</p> -</div> - <section> + <div class="step-description"> + <h2>Primary Contact</h2> + <div> + <p> + The primary contact becomes the single point of contact and must ensure that landowners are notified of all + information exchanged between the primary contact, local or First Nation government, and the ALC. + </p> + </div> + <div><p>*All fields are required unless stated optional or disabled.</p></div> + </div> + <div class="agent-form"> <form [formGroup]="form"> - <div class="full-row"> - <p *ngIf="isGovernmentUser"> - <strong>Will {{ governmentName ?? 'Local / First Nation Government' }} staff be the primary contact?</strong> - </p> - <p *ngIf="!isGovernmentUser"> - <strong - >Will one of the landowners - <ng-container *ngIf="hasCrownParcels">or government contacts</ng-container> added previously be the primary - contact?</strong - > - </p> + <div class="form-row"> + <div class="full-row"> + <p *ngIf="isGovernmentUser"> + <strong + >Will {{ governmentName ?? 'Local / First Nation Government' }} staff be the primary contact?</strong + > + </p> + <p *ngIf="!isGovernmentUser"> + <strong + >Will one of the landowners + <ng-container *ngIf="hasCrownParcels">or government contacts</ng-container> added previously be the + primary contact?</strong + > + </p> - <mat-button-toggle-group - class="input" - [value]="!selectedThirdPartyAgent" - (change)="onSelectPrimaryContactType($event)" - > - <mat-button-toggle [value]="true">Yes</mat-button-toggle> - <mat-button-toggle [value]="false">No</mat-button-toggle> - </mat-button-toggle-group> + <mat-button-toggle-group + class="input" + [value]="!selectedThirdPartyAgent" + (change)="onSelectPrimaryContactType($event)" + > + <mat-button-toggle [value]="true">Yes</mat-button-toggle> + <mat-button-toggle [value]="false">No</mat-button-toggle> + </mat-button-toggle-group> + </div> </div> - <!-- Owner --> - <div *ngIf="selectedThirdPartyAgent === false"> - <label *ngIf="parcelOwners.length > 0" - >Select a Primary Contact from the listed land owners - <ng-container *ngIf="hasCrownParcels">and government contacts</ng-container></label - > + <!-- Existing owner --> + <div class="form-row" *ngIf="selectedThirdPartyAgent === false"> + <div class="full-row"> + <label *ngIf="parcelOwners.length > 0" + >Select a Primary Contact from the listed land owners + <ng-container *ngIf="hasCrownParcels">and government contacts</ng-container></label + > - <mat-radio-group [formControl]="ownersList" color="primary" (change)="onSelectOwner($event.value)" required> - <mat-radio-button *ngFor="let owner of parcelOwners" [value]="owner.uuid" class="radio-option" required> - {{ owner.firstName }} {{ owner.lastName }} - </mat-radio-button> - </mat-radio-group> - <div *ngIf="ownersList.invalid && (ownersList.dirty || ownersList.touched)" class="field-error"> - <mat-icon>warning</mat-icon> - <div *ngIf="ownersList.errors?.['required']">This field is required</div> - </div> + <mat-radio-group [formControl]="ownersList" color="primary" (change)="onSelectOwner($event.value)" required> + <mat-radio-button *ngFor="let owner of parcelOwners" [value]="owner.uuid" class="radio-option" required> + {{ owner.firstName }} {{ owner.lastName }} + </mat-radio-button> + </mat-radio-group> + <div *ngIf="ownersList.invalid && (ownersList.dirty || ownersList.touched)" class="field-error"> + <mat-icon>warning</mat-icon> + <div *ngIf="ownersList.errors?.['required']">This field is required</div> + </div> - <div - id="owner-info" - class="warning-banner" - *ngIf="selectedOwnerUuid && selectedOwnerUuid !== 'agent' && !selectedLocalGovernment" - > - <div class="owner-details"> - <div class="row"> - <div class="key"><strong>First Name:</strong></div> - <div class="value">{{ firstName.value }}</div> - </div> - <div class="row"> - <div class="key"><strong>Last Name:</strong></div> - <div class="value">{{ lastName.value }}</div> - </div> - <div *ngIf="organizationName.value" class="row"> - <div *ngIf="!isCrownOwner && !isGovernmentUser" class="key"><strong>Organization:</strong></div> - <div *ngIf="isCrownOwner" class="key"><strong>Ministry/Department:</strong></div> - <div class="value">{{ organizationName.value }}</div> - </div> - <div class="row"> - <div class="key"><strong>Phone Number:</strong></div> - <div class="value">{{ phoneNumber.value }}</div> - </div> - <div class="row"> - <div class="key"><strong>Email:</strong></div> - <div class="value">{{ email.value }}</div> - </div> - <div class="row"> - <button mat-flat-button (click)="onEdit(selectedOwnerUuid)">Edit information</button> + <div + id="owner-info" + class="warning-banner" + *ngIf="selectedOwnerUuid && selectedOwnerUuid !== 'agent' && !selectedLocalGovernment" + > + <div class="owner-details"> + <div class="row"> + <div class="key"><strong>First Name:</strong></div> + <div class="value">{{ firstName.value }}</div> + </div> + <div class="row"> + <div class="key"><strong>Last Name:</strong></div> + <div class="value">{{ lastName.value }}</div> + </div> + <div *ngIf="organizationName.value" class="row"> + <div *ngIf="!isCrownOwner && !isGovernmentUser" class="key"><strong>Organization:</strong></div> + <div *ngIf="isCrownOwner" class="key"><strong>Ministry/Department:</strong></div> + <div class="value">{{ organizationName.value }}</div> + </div> + <div class="row"> + <div class="key"><strong>Phone Number:</strong></div> + <div class="value">{{ phoneNumber.value }}</div> + </div> + <div class="row"> + <div class="key"><strong>Email:</strong></div> + <div class="value">{{ email.value }}</div> + </div> + <div class="row"> + <button mat-flat-button (click)="onEdit(selectedOwnerUuid)">Edit information</button> + </div> </div> </div> + + <app-warning-banner *ngIf="parcelOwners.length === 0 && !isGovernmentUser && !selectedThirdPartyAgent"> + No landowners or government contacts are added. Please go back to Step 1 to add information. + </app-warning-banner> </div> </div> - <app-warning-banner *ngIf="parcelOwners.length === 0 && !isGovernmentUser && !selectedThirdPartyAgent"> - No landowners or government contacts are added. Please go back to Step 1 to add information. - </app-warning-banner> - <!-- /Owner --> + <!-- /Existing owner --> <!-- Third-Part Agent/Government --> - <div *ngIf="selectedThirdPartyAgent || selectedLocalGovernment" class="form-row"> + <div class="form-row" *ngIf="selectedThirdPartyAgent || selectedLocalGovernment"> + <div class="full-row"> + <h3 *ngIf="selectedThirdPartyAgent">Agent Contact Information</h3> + <h3 *ngIf="selectedLocalGovernment"> + {{ governmentName ?? 'Local / First Nation Government' }} Staff Contact Information + </h3> + </div> <div> <label for="firstName">First Name</label> <mat-form-field appearance="outline"> From 63f60f5f8f86b65b530b018a0c810cfc3b617453 Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Tue, 9 Jan 2024 14:49:04 -0800 Subject: [PATCH 905/954] Fix NOI saved 3rd-party agent not loading --- .../primary-contact/primary-contact.component.ts | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts index 5578107a95..7882e8524a 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts @@ -128,7 +128,7 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni onSelectOwner(uuid: string) { this.isDirty = true; - const selectedOwner = this.parcelOwners.find((owner) => owner.uuid === uuid); + const selectedOwner = this.owners.find((owner) => owner.uuid === uuid); this.parcelOwners = this.parcelOwners.map((owner) => ({ ...owner, isSelected: owner.uuid === uuid, @@ -234,12 +234,11 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni const parcelOwners = [...uniqueParcelOwners.values()]; const owners = [...parcelOwners, ...nonParcelOwners]; - const selectedOwner = owners.find((owner) => owner.uuid === primaryContactOwnerUuid); - this.parcelOwners = owners.filter((owner) => ![OWNER_TYPE.AGENT, OWNER_TYPE.GOVERNMENT].includes(owner.type.code)); - this.parcelOwners = parcelOwners; this.owners = owners; + const selectedOwner = owners.find((owner) => owner.uuid === primaryContactOwnerUuid); + // onSelectOwner only not called on first load of page if (selectedOwner) { this.onSelectOwner(selectedOwner.uuid); From 63ece27043579c0cf060ee7533cab5c1f55fa91a Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Tue, 9 Jan 2024 15:11:18 -0800 Subject: [PATCH 906/954] Change logic of disabling / showing hiding fields for App & NOI * Disable all fields on step 1 until they select Fee Simple or Crown * Remove disabled logic from parcel entry as its not used * Hide file upload on Step 8 for SUBD if not required * Disable soil and fill questions on NFU and NARU unless they answer Yes --- .../parcel/parcel.component.html | 279 +++++++++--------- .../subd-details/subd-details.component.html | 21 +- .../parcel-entry/parcel-entry.component.html | 4 +- .../parcel-entry/parcel-entry.component.ts | 85 ++++-- .../primary-contact.component.html | 3 +- .../incl-proposal/incl-proposal.component.ts | 2 +- .../naru-proposal.component.html | 2 +- .../naru-proposal/naru-proposal.component.ts | 26 +- .../nfu-proposal/nfu-proposal.component.html | 2 +- .../nfu-proposal/nfu-proposal.component.ts | 24 +- .../subd-proposal.component.html | 4 +- .../parcel-entry/parcel-entry.component.html | 18 +- .../parcel-entry/parcel-entry.component.ts | 93 ++++-- .../parcel/parcel.component.html | 68 ++--- 14 files changed, 374 insertions(+), 257 deletions(-) diff --git a/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.html b/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.html index 07fbe6ca70..ed5069d40f 100644 --- a/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.html +++ b/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.html @@ -5,7 +5,7 @@ <h3 class="flex-item">{{ pageTitle }}</h3> <h4>Parcel #{{ parcelInd + 1 }}</h4> <div> <button - *ngIf="showEdit" + *ngIf="showEdit && parcels.length > 1" class="mobile-hidden" mat-flat-button color="accent" @@ -14,7 +14,7 @@ <h4>Parcel #{{ parcelInd + 1 }}</h4> Edit Parcel {{ parcelInd + 1 }} </button> <button - *ngIf="showEdit" + *ngIf="showEdit && parcels.length > 1" class="tablet-hidden" mat-icon-button color="accent" @@ -29,155 +29,170 @@ <h4>Parcel #{{ parcelInd + 1 }}</h4> {{ parcel.ownershipType?.label }} <app-no-data [showRequired]="showErrors" *ngIf="!parcel.ownershipType"></app-no-data> </div> - <div class="subheading2 grid-1">Legal Description</div> - <div class="grid-double"> - {{ parcel.legalDescription }} - <app-no-data - [showRequired]="showErrors" - *ngIf="parcel.validation?.isLegalDescriptionRequired || false" - ></app-no-data> - </div> - <div class="subheading2 grid-1">Approx. Map Area</div> - <div class="grid-double"> - {{ parcel.mapAreaHectares }} - <span *ngIf="parcel.mapAreaHectares !== null">ha</span> - <app-no-data - [showRequired]="showErrors" - *ngIf="parcel.validation?.isMapAreaHectaresRequired || false" - ></app-no-data> - </div> - <div class="subheading2 grid-1"> - PID {{ parcel.ownershipType?.code === PARCEL_OWNERSHIP_TYPES.CROWN ? '(optional)' : '' }} - </div> - <div class="grid-double"> - <span *ngIf="parcel.pid">{{ parcel.pid | mask : '000-000-000' }}</span> - <app-no-data [showRequired]="showErrors && !!parcel.validation?.isPidRequired" *ngIf="!parcel.pid"></app-no-data> - <app-validation-error *ngIf="showErrors && parcel.pid && parcel.pid.length < 9"> - Invalid Format - </app-validation-error> - </div> - <ng-container *ngIf="parcel.ownershipType?.code === PARCEL_OWNERSHIP_TYPES.CROWN"> - <div class="subheading2 grid-1">PIN (optional)</div> + <ng-container *ngIf="parcel.ownershipType"> + <div class="subheading2 grid-1">Legal Description</div> <div class="grid-double"> - {{ parcel.pin }} + {{ parcel.legalDescription }} <app-no-data - [showRequired]="showErrors && !!parcel.validation?.isPinRequired" - *ngIf="!parcel.pin" + [showRequired]="showErrors" + *ngIf="parcel.validation?.isLegalDescriptionRequired || false" ></app-no-data> </div> - </ng-container> - <ng-container *ngIf="parcel.ownershipType?.code === PARCEL_OWNERSHIP_TYPES.FEE_SIMPLE"> - <div class="subheading2 grid-1">Purchase Date</div> + <div class="subheading2 grid-1">Approx. Map Area</div> <div class="grid-double"> - {{ parcel.purchasedDate | date }} + {{ parcel.mapAreaHectares }} + <span *ngIf="parcel.mapAreaHectares !== null">ha</span> <app-no-data - [showRequired]="showErrors && !!parcel.validation?.isPurchasedDateRequired" - *ngIf="!parcel.purchasedDate" - > - </app-no-data> + [showRequired]="showErrors" + *ngIf="parcel.validation?.isMapAreaHectaresRequired || false" + ></app-no-data> </div> - </ng-container> - <div class="subheading2 grid-1">Farm Classification</div> - <div class="grid-double"> - <span *ngIf="parcel.isFarm !== null">{{ parcel.isFarm ? 'Yes' : 'No' }}</span> - <app-no-data [showRequired]="showErrors" *ngIf="parcel.isFarm === null"></app-no-data> - </div> - <div class="subheading2 grid-1">Civic Address</div> - <div class="grid-double"> - {{ parcel.civicAddress }} - <app-no-data [showRequired]="showErrors" *ngIf="!parcel.civicAddress"></app-no-data> - </div> - <div *ngIf="showCertificateOfTitle" class="subheading2 grid-1">Certificate Of Title</div> - <div *ngIf="showCertificateOfTitle" class="grid-double"> - <div *ngIf="parcel.certificateOfTitle"> - <a (click)="onOpenFile(parcel.certificateOfTitle.uuid)">{{ parcel.certificateOfTitle.fileName }}</a> + <div class="subheading2 grid-1"> + PID {{ parcel.ownershipType.code === PARCEL_OWNERSHIP_TYPES.CROWN ? '(optional)' : '' }} </div> - <app-no-data - [showRequired]="showErrors && !!parcel.validation?.isCertificateRequired" - *ngIf="!parcel.validation?.isCertificateUploaded" - ></app-no-data> - </div> - - <ng-container *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN"> - <h5 *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">Government Parcel Contact</h5> - <ng-container *ngIf="parcel.owners[0]"> - <div class="subheading2 grid-1">First Name</div> - <div class="grid-double"> - {{ parcel.owners[0].firstName }} - <app-no-data [showRequired]="showErrors" *ngIf="!parcel.owners[0].firstName"></app-no-data> - </div> - <div class="subheading2 grid-1" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">Last Name</div> - <div class="grid-double"> - {{ parcel.owners[0].lastName }} - <app-no-data [showRequired]="showErrors" *ngIf="!parcel.owners[0].lastName"></app-no-data> - </div> - <div class="subheading2 grid-1" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">Ministry or Department</div> - <div class="grid-double"> - {{ parcel.owners[0].organizationName }} - <app-no-data [showRequired]="showErrors" *ngIf="!parcel.owners[0].organizationName"></app-no-data> - </div> - <div class="subheading2 grid-1" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">Phone</div> + <div class="grid-double"> + <span *ngIf="parcel.pid">{{ parcel.pid | mask : '000-000-000' }}</span> + <app-no-data + [showRequired]="showErrors && !!parcel.validation?.isPidRequired" + *ngIf="!parcel.pid" + ></app-no-data> + <app-validation-error *ngIf="showErrors && parcel.pid && parcel.pid.length < 9"> + Invalid Format + </app-validation-error> + </div> + <ng-container *ngIf="parcel.ownershipType?.code === PARCEL_OWNERSHIP_TYPES.CROWN"> + <div class="subheading2 grid-1">PIN (optional)</div> <div class="grid-double"> - {{ parcel.owners[0].phoneNumber }} - <app-no-data [showRequired]="showErrors" *ngIf="!parcel.owners[0].phoneNumber"></app-no-data> + {{ parcel.pin }} + <app-no-data + [showRequired]="showErrors && !!parcel.validation?.isPinRequired" + *ngIf="!parcel.pin" + ></app-no-data> </div> - <div class="subheading2 grid-1" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">Email</div> + </ng-container> + <ng-container *ngIf="parcel.ownershipType?.code === PARCEL_OWNERSHIP_TYPES.FEE_SIMPLE"> + <div class="subheading2 grid-1">Purchase Date</div> <div class="grid-double"> - {{ parcel.owners[0].email }} - <app-no-data [showRequired]="showErrors" *ngIf="!parcel.owners[0].email"></app-no-data> + {{ parcel.purchasedDate | date }} + <app-no-data + [showRequired]="showErrors && !!parcel.validation?.isPurchasedDateRequired" + *ngIf="!parcel.purchasedDate" + > + </app-no-data> </div> - <div class="subheading2 grid-1" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">Crown Type</div> - <div class="grid-double"> - {{ parcel.owners[0].crownLandOwnerType === 'provincial' ? 'Provincial Crown' : ''}} - {{ parcel.owners[0].crownLandOwnerType === 'federal' ? 'Federal Crown' : ''}} - <app-no-data [showRequired]="showErrors" *ngIf="!parcel.owners[0].crownLandOwnerType"></app-no-data> + </ng-container> + <div class="subheading2 grid-1">Farm Classification</div> + <div class="grid-double"> + <span *ngIf="parcel.isFarm !== null">{{ parcel.isFarm ? 'Yes' : 'No' }}</span> + <app-no-data [showRequired]="showErrors" *ngIf="parcel.isFarm === null"></app-no-data> + </div> + <div class="subheading2 grid-1">Civic Address</div> + <div class="grid-double"> + {{ parcel.civicAddress }} + <app-no-data [showRequired]="showErrors" *ngIf="!parcel.civicAddress"></app-no-data> + </div> + <div *ngIf="showCertificateOfTitle" class="subheading2 grid-1">Certificate Of Title</div> + <div *ngIf="showCertificateOfTitle" class="grid-double"> + <div *ngIf="parcel.certificateOfTitle"> + <a (click)="onOpenFile(parcel.certificateOfTitle.uuid)">{{ parcel.certificateOfTitle.fileName }}</a> </div> + <app-no-data + [showRequired]="showErrors && !!parcel.validation?.isCertificateRequired" + *ngIf="!parcel.validation?.isCertificateUploaded" + ></app-no-data> + </div> + + <ng-container *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN"> + <h5 *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">Government Parcel Contact</h5> + <ng-container *ngIf="parcel.owners[0]"> + <div class="subheading2 grid-1">First Name</div> + <div class="grid-double"> + {{ parcel.owners[0].firstName }} + <app-no-data [showRequired]="showErrors" *ngIf="!parcel.owners[0].firstName"></app-no-data> + </div> + <div class="subheading2 grid-1" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN"> + Last Name + </div> + <div class="grid-double"> + {{ parcel.owners[0].lastName }} + <app-no-data [showRequired]="showErrors" *ngIf="!parcel.owners[0].lastName"></app-no-data> + </div> + <div class="subheading2 grid-1" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN"> + Ministry or Department + </div> + <div class="grid-double"> + {{ parcel.owners[0].organizationName }} + <app-no-data [showRequired]="showErrors" *ngIf="!parcel.owners[0].organizationName"></app-no-data> + </div> + <div class="subheading2 grid-1" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">Phone</div> + <div class="grid-double"> + {{ parcel.owners[0].phoneNumber }} + <app-no-data [showRequired]="showErrors" *ngIf="!parcel.owners[0].phoneNumber"></app-no-data> + </div> + <div class="subheading2 grid-1" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">Email</div> + <div class="grid-double"> + {{ parcel.owners[0].email }} + <app-no-data [showRequired]="showErrors" *ngIf="!parcel.owners[0].email"></app-no-data> + </div> + <div class="subheading2 grid-1" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN"> + Crown Type + </div> + <div class="grid-double"> + {{ parcel.owners[0].crownLandOwnerType === 'provincial' ? 'Provincial Crown' : '' }} + {{ parcel.owners[0].crownLandOwnerType === 'federal' ? 'Federal Crown' : '' }} + <app-no-data [showRequired]="showErrors" *ngIf="!parcel.owners[0].crownLandOwnerType"></app-no-data> + </div> + </ng-container> + <app-no-data [showRequired]="showErrors" *ngIf="!parcel.owners[0]"></app-no-data> </ng-container> - <app-no-data [showRequired]="showErrors" *ngIf="!parcel.owners[0]"></app-no-data> - </ng-container> - <div - class="full-width owner-information" - [ngClass]="{ 'crown-owner-information': parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN }" - *ngIf="parcel.ownershipTypeCode !== PARCEL_OWNERSHIP_TYPES.CROWN" - > - <div class="subheading2" *ngIf="parcel.ownershipTypeCode !== PARCEL_OWNERSHIP_TYPES.CROWN">Land Owner(s)</div> - <div class="subheading2" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">Crown Contact(s)</div> - <div class="subheading2" *ngIf="parcel.ownershipTypeCode !== PARCEL_OWNERSHIP_TYPES.CROWN">Organization</div> - <div class="subheading2" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN"> - Ministry/Department - </div> - <div class="subheading2">Phone</div> - <div class="subheading2">Email</div> - <div class="subheading2" *ngIf="parcel.ownershipTypeCode !== PARCEL_OWNERSHIP_TYPES.CROWN">Corporate Summary</div> - <ng-container *ngFor="let owner of parcel.owners"> - <div>{{ owner.displayName }}</div> - <div> - <span *ngIf="owner.organizationName"></span>{{ owner.organizationName }} - <app-no-data [showRequired]="false" *ngIf="!owner.organizationName"></app-no-data> + <div + class="full-width owner-information" + [ngClass]="{ 'crown-owner-information': parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN }" + *ngIf="parcel.ownershipTypeCode !== PARCEL_OWNERSHIP_TYPES.CROWN" + > + <div class="subheading2" *ngIf="parcel.ownershipTypeCode !== PARCEL_OWNERSHIP_TYPES.CROWN">Land Owner(s)</div> + <div class="subheading2" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN"> + Crown Contact(s) + </div> + <div class="subheading2" *ngIf="parcel.ownershipTypeCode !== PARCEL_OWNERSHIP_TYPES.CROWN">Organization</div> + <div class="subheading2" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN"> + Ministry/Department </div> - <div>{{ owner.phoneNumber }}</div> - <div>{{ owner.email }}</div> - <div *ngIf="parcel.ownershipTypeCode !== PARCEL_OWNERSHIP_TYPES.CROWN"> - <a *ngIf="owner.corporateSummary" (click)="onOpenFile(owner.corporateSummary.uuid)">{{ - owner.corporateSummary.fileName - }}</a> - <div class="no-data" *ngIf="!owner.corporateSummary"> - <div class="no-data-text">Not Applicable</div> + <div class="subheading2">Phone</div> + <div class="subheading2">Email</div> + <div class="subheading2" *ngIf="parcel.ownershipTypeCode !== PARCEL_OWNERSHIP_TYPES.CROWN"> + Corporate Summary + </div> + <ng-container *ngFor="let owner of parcel.owners"> + <div>{{ owner.displayName }}</div> + <div> + <span *ngIf="owner.organizationName"></span>{{ owner.organizationName }} + <app-no-data [showRequired]="false" *ngIf="!owner.organizationName"></app-no-data> + </div> + <div>{{ owner.phoneNumber }}</div> + <div>{{ owner.email }}</div> + <div *ngIf="parcel.ownershipTypeCode !== PARCEL_OWNERSHIP_TYPES.CROWN"> + <a *ngIf="owner.corporateSummary" (click)="onOpenFile(owner.corporateSummary.uuid)">{{ + owner.corporateSummary.fileName + }}</a> + <div class="no-data" *ngIf="!owner.corporateSummary"> + <div class="no-data-text">Not Applicable</div> + </div> </div> + </ng-container> + <div class="full-width"> + <app-no-data [showRequired]="showErrors" *ngIf="parcel.owners.length === 0"></app-no-data> </div> - </ng-container> - <div class="full-width"> - <app-no-data [showRequired]="showErrors" *ngIf="parcel.owners.length === 0"></app-no-data> </div> - </div> - <div class="subheading2 grid-1"> - I confirm that the owner information provided above matches the current Certificate of Title - </div> - <div class="grid-double"> - <span *ngIf="parcel.isConfirmedByApplicant">Yes</span> - <app-no-data [showRequired]="showErrors" *ngIf="!parcel.isConfirmedByApplicant"></app-no-data> - </div> + <div class="subheading2 grid-1"> + I confirm that the owner information provided above matches the current Certificate of Title + </div> + <div class="grid-double"> + <span *ngIf="parcel.isConfirmedByApplicant">Yes</span> + <app-no-data [showRequired]="showErrors" *ngIf="!parcel.isConfirmedByApplicant"></app-no-data> + </div> + </ng-container> </ng-container> <div *ngIf="showEdit" class="edit-button"> <button mat-flat-button (click)="onEditParcelsClick($event)" color="accent">Edit Section</button> diff --git a/portal-frontend/src/app/features/applications/application-details/subd-details/subd-details.component.html b/portal-frontend/src/app/features/applications/application-details/subd-details/subd-details.component.html index d53d60491d..8f8daccc7f 100644 --- a/portal-frontend/src/app/features/applications/application-details/subd-details/subd-details.component.html +++ b/portal-frontend/src/app/features/applications/application-details/subd-details/subd-details.component.html @@ -57,18 +57,17 @@ *ngIf="_applicationSubmission.subdIsHomeSiteSeverance === null" ></app-no-data> </div> - <div class="subheading2 grid-1">Proof of Homesite Severance Qualification</div> - <div class="grid-double"> - <div *ngFor="let file of homesiteDocuments"> - <a (click)="openFile(file.uuid)"> - {{ file.fileName }} - </a> + <ng-container *ngIf="_applicationSubmission.subdIsHomeSiteSeverance === true"> + <div class="subheading2 grid-1">Proof of Homesite Severance Qualification</div> + <div class="grid-double"> + <div *ngFor="let file of homesiteDocuments"> + <a (click)="openFile(file.uuid)"> + {{ file.fileName }} + </a> + </div> + <app-no-data [showRequired]="showErrors" *ngIf="homesiteDocuments.length === 0"></app-no-data> </div> - <app-no-data - [showRequired]="showErrors && !!_applicationSubmission.subdIsHomeSiteSeverance" - *ngIf="homesiteDocuments.length === 0" - ></app-no-data> - </div> + </ng-container> <div *ngIf="showEdit" class="edit-button"> <button mat-flat-button (click)="onEditSection(5)" color="accent">Edit Section</button> </div> diff --git a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html index c99a9ad83c..8364019faa 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html @@ -220,6 +220,7 @@ [showErrors]="showErrors" [isRequired]="isCertificateOfTitleRequired" [showVirusError]="showVirusError" + [disabled]="parcelForm.controls.pid.disabled" ></app-file-drag-drop> </div> @@ -307,9 +308,8 @@ <h6 class="owner-search-option" *ngIf="filteredOwners.length">OR</h6> <mat-radio-group color="primary" [value]="selectedOwner?.uuid" - required + [required]="true" [ngClass]="{ error: ownerInput.errors && ownerInput.errors['required'] }" - formControlName="selectedOwnerVal" > <mat-radio-button *ngFor="let owner of filteredOwners" diff --git a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts index af46f4d5d7..bd421ba211 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts @@ -58,12 +58,6 @@ export class ParcelEntryComponent implements OnInit { showVirusError = false; - @Input() - public set disabled(disabled: boolean) { - this._disabled = disabled; - this.onFormDisabled(); - } - @Output() private onFormGroupChange = new EventEmitter<Partial<ParcelEntryFormData>>(); @Output() private onSaveProgress = new EventEmitter<void>(); @Output() onOwnersUpdated = new EventEmitter<void>(); @@ -79,16 +73,61 @@ export class ParcelEntryComponent implements OnInit { isCertificateOfTitleRequired = true; pidPin = new FormControl<string>(''); - legalDescription = new FormControl<string | null>(null, [Validators.required]); - mapArea = new FormControl<string | null>(null, [Validators.required]); - pid = new FormControl<string | null>(null, [Validators.required]); - pin = new FormControl<string | null>(null); - civicAddress = new FormControl<string | null>(null, [Validators.required]); parcelType = new FormControl<string | null>(null, [Validators.required]); - isFarm = new FormControl<string | null>(null, [Validators.required]); - purchaseDate = new FormControl<any | null>(null, [Validators.required]); + legalDescription = new FormControl<string | null>( + { + disabled: true, + value: null, + }, + [Validators.required] + ); + mapArea = new FormControl<string | null>( + { + disabled: true, + value: null, + }, + [Validators.required] + ); + pid = new FormControl<string | null>( + { + disabled: true, + value: null, + }, + [Validators.required] + ); + pin = new FormControl<string | null>({ + disabled: true, + value: null, + }); + civicAddress = new FormControl<string | null>( + { + disabled: true, + value: null, + }, + [Validators.required] + ); + isFarm = new FormControl<string | null>( + { + disabled: true, + value: null, + }, + [Validators.required] + ); + purchaseDate = new FormControl<any | null>( + { + disabled: true, + value: null, + }, + [Validators.required] + ); + isConfirmedByApplicant = new FormControl<boolean>( + { + disabled: true, + value: false, + }, + [Validators.requiredTrue] + ); crownLandOwnerType = new FormControl<string | null>(null); - isConfirmedByApplicant = new FormControl<boolean>(false, [Validators.requiredTrue]); parcelForm = new FormGroup({ pidPin: this.pidPin, legalDescription: this.legalDescription, @@ -206,6 +245,8 @@ export class ParcelEntryComponent implements OnInit { this.civicAddress.value || this.parcel.owners.length > 0; + this.parcelForm.enable(); + const changeParcelType = () => { if ($event.value === this.PARCEL_OWNERSHIP_TYPES.CROWN) { this.searchBy.setValue(null); @@ -441,6 +482,10 @@ export class ParcelEntryComponent implements OnInit { isConfirmedByApplicant: this.enableUserSignOff ? this.parcel.isConfirmedByApplicant : false, }); + if (this.parcel.ownershipTypeCode) { + this.parcelForm.enable(); + } + this.isCrownLand = this.parcelType.value ? this.parcelType.getRawValue() === this.PARCEL_OWNERSHIP_TYPES.CROWN : null; @@ -476,7 +521,7 @@ export class ParcelEntryComponent implements OnInit { return; } - if ((this.isCrownLand && !this.searchBy.getRawValue()) || this.disabled) { + if (this.isCrownLand && !this.searchBy.getRawValue()) { this.pidPin.disable({ emitEvent: false, }); @@ -538,16 +583,6 @@ export class ParcelEntryComponent implements OnInit { }); } - private onFormDisabled() { - if (this._disabled) { - this.parcelForm.disable(); - this.ownerInput.disable(); - } else { - this.parcelForm.enable(); - this.ownerInput.enable(); - } - } - onChangeSearchBy(value: string) { if (value === 'pid') { this.pidPinPlaceholder = 'Type 9 digit PID'; diff --git a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html index 4fa76de9b9..0066a990ce 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html @@ -30,9 +30,8 @@ <h2>Primary Contact</h2> <mat-button-toggle [value]="false">No</mat-button-toggle> </mat-button-toggle-group> </div> - <!-- Owner --> - <div *ngIf="selectedThirdPartyAgent === false"> + <div *ngIf="!selectedThirdPartyAgent"> <label *ngIf="parcelOwners.length > 0" >Select a Primary Contact from the listed land owners <ng-container *ngIf="hasCrownParcels">and government contacts</ng-container></label diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/incl-proposal/incl-proposal.component.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/incl-proposal/incl-proposal.component.ts index 46e930e67d..b292bcd70d 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/incl-proposal/incl-proposal.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/incl-proposal/incl-proposal.component.ts @@ -35,7 +35,7 @@ export class InclProposalComponent extends FilesStepComponent implements OnInit, private submissionUuid = ''; showGovernmentQuestions = false; governmentName? = ''; - disableNotificationFileUploads = false; + disableNotificationFileUploads = true; showProposalMapVirus = false; showProofOfAdvertisingVirus = false; diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.html index fed2bbf1ca..2f34901a94 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.html @@ -540,7 +540,7 @@ <h3>Soil & Fill Components</h3> </div> <app-soil-table - [disabled]="willImportFill.value === 'false'" + [disabled]="willImportFill.value !== 'true'" tableHeader="Fill to be Placed" [(data)]="fillTableData" (dataChange)="markDirty()" diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.ts index a163e8a7ee..7980855c95 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.ts @@ -39,12 +39,30 @@ export class NaruProposalComponent extends FilesStepComponent implements OnInit, locationRationale = new FormControl<string | null>(null, [Validators.required]); infrastructure = new FormControl<string | null>(null, [Validators.required]); existingStructures = new FormControl<string | null>(null, [Validators.required]); - willImportFill = new FormControl<string | null>(null, [Validators.required]); - fillType = new FormControl<string | null>(null, [Validators.required]); - fillOrigin = new FormControl<string | null>(null, [Validators.required]); - projectDuration = new FormControl<string | null>(null, [Validators.required]); sleepingUnits = new FormControl<string | null>(null, [Validators.required]); agriTourism = new FormControl<string | null>(null, [Validators.required]); + willImportFill = new FormControl<string | null>(null, [Validators.required]); + fillType = new FormControl<string | null>( + { + disabled: true, + value: null, + }, + [Validators.required] + ); + fillOrigin = new FormControl<string | null>( + { + disabled: true, + value: null, + }, + [Validators.required] + ); + projectDuration = new FormControl<string | null>( + { + disabled: true, + value: null, + }, + [Validators.required] + ); proposalMap: ApplicationDocumentDto[] = []; fillTableData: SoilTableData = {}; diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/nfu-proposal/nfu-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/nfu-proposal/nfu-proposal.component.html index cfe02c2dc9..4a32eca69c 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/nfu-proposal/nfu-proposal.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/nfu-proposal/nfu-proposal.component.html @@ -209,7 +209,7 @@ <h3>Soil & Fill Components</h3> </div> <app-soil-table - [disabled]="willImportFill.value === 'false'" + [disabled]="willImportFill.value !== 'true'" tableHeader="Fill to be Placed" [(data)]="fillTableData" (dataChange)="markDirty()" diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/nfu-proposal/nfu-proposal.component.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/nfu-proposal/nfu-proposal.component.ts index f81dd0cb92..dc6b316d60 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/nfu-proposal/nfu-proposal.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/nfu-proposal/nfu-proposal.component.ts @@ -31,9 +31,27 @@ export class NfuProposalComponent extends FilesStepComponent implements OnInit, outsideLands = new FormControl<string | null>(null, [Validators.required]); agricultureSupport = new FormControl<string | null>(null, [Validators.required]); willImportFill = new FormControl<string | null>(null, [Validators.required]); - projectDuration = new FormControl<string | null>(null, [Validators.required]); - fillTypeDescription = new FormControl<string | null>(null, [Validators.required]); - fillOriginDescription = new FormControl<string | null>(null, [Validators.required]); + projectDuration = new FormControl<string | null>( + { + disabled: true, + value: null, + }, + [Validators.required] + ); + fillTypeDescription = new FormControl<string | null>( + { + disabled: true, + value: null, + }, + [Validators.required] + ); + fillOriginDescription = new FormControl<string | null>( + { + disabled: true, + value: null, + }, + [Validators.required] + ); form = new FormGroup({ hectares: this.hectares, diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.html index 22d5a3629e..77efb1e674 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.html @@ -264,9 +264,9 @@ <h6>Documents needed for this step:</h6> (deleteFile)="onDeleteFile($event)" (openFile)="openFile($event)" [showErrors]="showErrors" - [isRequired]="isHomeSiteSeverance.getRawValue() !== 'false'" + [isRequired]="isHomeSiteSeverance.getRawValue() !== 'true'" [allowMultiple]="true" - [disabled]="isHomeSiteSeverance.getRawValue() === 'false'" + [disabled]="isHomeSiteSeverance.getRawValue() !== 'true'" [showVirusError]="showHomesiteSeveranceVirus" ></app-file-drag-drop> </div> diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.html index c746649042..57e4e09ec2 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.html @@ -48,15 +48,13 @@ mat-flat-button color="primary" (click)="onSearch()" - [disabled]="!parcelType.getRawValue() || _disabled || (!!isCrownLand && !searchBy.getRawValue())" + [disabled]="!parcelType.getRawValue() || (!!isCrownLand && !searchBy.getRawValue())" > Search </button> </div> <div class="lookup-bottom-row"> - <button class="reset-button" mat-stroked-button color="accent" (click)="onReset()" [disabled]="_disabled"> - Reset - </button> + <button class="reset-button" mat-stroked-button color="accent" (click)="onReset()">Reset</button> <span class="float-right"> <a class="subtext" href=" https://ltsa.ca/products-services/parcelmap-bc/" target="_blank" rel="noreferrer"> Powered by PMBC! @@ -207,6 +205,7 @@ > to obtain a recent copy (not older than 1 year) of the Certificate of Title </div> + {{ parcelForm.controls.pid.disabled }} <app-file-drag-drop id="certificate-of-title-upload" [uploadedFiles]="parcel.certificateOfTitle ? [parcel.certificateOfTitle] : []" @@ -217,6 +216,7 @@ [showErrors]="showErrors" [isRequired]="isCertificateOfTitleRequired" [showVirusError]="showVirusError" + [disabled]="parcelForm.controls.pid.disabled" ></app-file-drag-drop> </div> @@ -237,7 +237,6 @@ <h6 *ngIf="isCrownLand">Government Parcel Contact</h6> (onOwnersDeleted)="onDeleteOwner()" [ownerService]="noticeOfIntentOwnerService" [documentService]="noticeOfIntentDocumentService" - [disabled]="_disabled" ></app-parcel-owners> </div> <button @@ -246,7 +245,7 @@ <h6 *ngIf="isCrownLand">Government Parcel Contact</h6> (click)="onAddNewOwner()" mat-flat-button color="primary" - [disabled]="!parcelType.getRawValue() || _disabled" + [disabled]="!parcelType.getRawValue()" > Add new owner </button> @@ -304,9 +303,8 @@ <h6 class="owner-search-option" *ngIf="filteredOwners.length">OR</h6> <mat-radio-group color="primary" [value]="selectedOwner?.uuid" - required + [required]="true" [ngClass]="{ error: ownerInput.errors && ownerInput.errors['required'] }" - formControlName="selectedOwnerVal" > <mat-radio-button *ngFor="let owner of filteredOwners" @@ -346,9 +344,7 @@ <h6 class="owner-search-option" *ngIf="filteredOwners.length">OR</h6> <div class="value">{{ selectedOwner.crownLandOwnerType }}</div> </div> <div class="row"> - <button [disabled]="_disabled" (click)="onEditCrownOwner(selectedOwner)" mat-flat-button> - Edit information - </button> + <button (click)="onEditCrownOwner(selectedOwner)" mat-flat-button>Edit information</button> </div> </div> </div> diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.ts index b09180a2a2..1428070fe7 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.ts @@ -52,15 +52,8 @@ export class ParcelEntryComponent implements OnInit { @Input() enableUserSignOff = true; @Input() enableAddNewOwner = true; @Input() showErrors = false; - @Input() _disabled = false; @Input() isDraft = false; - @Input() - public set disabled(disabled: boolean) { - this._disabled = disabled; - this.onFormDisabled(); - } - @Output() private onFormGroupChange = new EventEmitter<Partial<ParcelEntryFormData>>(); @Output() private onSaveProgress = new EventEmitter<void>(); @Output() onOwnersUpdated = new EventEmitter<void>(); @@ -74,17 +67,63 @@ export class ParcelEntryComponent implements OnInit { isCertificateOfTitleRequired = true; showVirusError = false; - pidPin = new FormControl<string>(''); - legalDescription = new FormControl<string | null>(null, [Validators.required]); - mapArea = new FormControl<string | null>(null, [Validators.required]); - pid = new FormControl<string | null>(null, [Validators.required]); - pin = new FormControl<string | null>(null); - civicAddress = new FormControl<string | null>(null, [Validators.required]); parcelType = new FormControl<string | null>(null, [Validators.required]); - isFarm = new FormControl<string | null>(null, [Validators.required]); - purchaseDate = new FormControl<any | null>(null, [Validators.required]); + pidPin = new FormControl<string>(''); + legalDescription = new FormControl<string | null>( + { + disabled: true, + value: null, + }, + [Validators.required] + ); + mapArea = new FormControl<string | null>( + { + disabled: true, + value: null, + }, + [Validators.required] + ); + pid = new FormControl<string | null>( + { + disabled: true, + value: null, + }, + [Validators.required] + ); + pin = new FormControl<string | null>({ + disabled: true, + value: null, + }); + civicAddress = new FormControl<string | null>( + { + disabled: true, + value: null, + }, + [Validators.required] + ); + isFarm = new FormControl<string | null>( + { + disabled: true, + value: null, + }, + [Validators.required] + ); + purchaseDate = new FormControl<any | null>( + { + disabled: true, + value: null, + }, + [Validators.required] + ); + isConfirmedByApplicant = new FormControl<boolean>( + { + disabled: true, + value: false, + }, + [Validators.requiredTrue] + ); crownLandOwnerType = new FormControl<string | null>(null); - isConfirmedByApplicant = new FormControl<boolean>(false, [Validators.requiredTrue]); + parcelForm = new FormGroup({ pidPin: this.pidPin, legalDescription: this.legalDescription, @@ -194,7 +233,7 @@ export class ParcelEntryComponent implements OnInit { } onChangeParcelType($event: MatButtonToggleChange) { - const dirtyForm = + const formHasValues = this.legalDescription.value || this.mapArea.value || this.pid.value || @@ -203,6 +242,8 @@ export class ParcelEntryComponent implements OnInit { this.isFarm.value || this.civicAddress.value; + this.parcelForm.enable(); + const changeParcelType = () => { if ($event.value === this.PARCEL_OWNERSHIP_TYPES.CROWN) { this.searchBy.setValue(null); @@ -224,7 +265,7 @@ export class ParcelEntryComponent implements OnInit { this.pid.updateValueAndValidity(); }; - if (dirtyForm && this.isCrownLand !== null) { + if (formHasValues && this.isCrownLand !== null) { this.dialog .open(ParcelEntryConfirmationDialogComponent, { panelClass: 'no-padding', @@ -430,6 +471,10 @@ export class ParcelEntryComponent implements OnInit { isConfirmedByApplicant: this.enableUserSignOff ? this.parcel.isConfirmedByApplicant : false, }); + if (this.parcel.ownershipTypeCode) { + this.parcelForm.enable(); + } + this.isCrownLand = this.parcelType.value ? this.parcelType.getRawValue() === this.PARCEL_OWNERSHIP_TYPES.CROWN : null; @@ -465,7 +510,7 @@ export class ParcelEntryComponent implements OnInit { return; } - if ((this.isCrownLand && !this.searchBy.getRawValue()) || this.disabled) { + if (this.isCrownLand && !this.searchBy.getRawValue()) { this.pidPin.disable({ emitEvent: false, }); @@ -527,16 +572,6 @@ export class ParcelEntryComponent implements OnInit { }); } - private onFormDisabled() { - if (this._disabled) { - this.parcelForm.disable(); - this.ownerInput.disable(); - } else { - this.parcelForm.enable(); - this.ownerInput.enable(); - } - } - onChangeSearchBy(value: string) { if (value === 'pid') { this.pidPinPlaceholder = 'Type 9 digit PID'; diff --git a/portal-frontend/src/app/features/notifications/notification-details/parcel/parcel.component.html b/portal-frontend/src/app/features/notifications/notification-details/parcel/parcel.component.html index 7961173c62..728109b94c 100644 --- a/portal-frontend/src/app/features/notifications/notification-details/parcel/parcel.component.html +++ b/portal-frontend/src/app/features/notifications/notification-details/parcel/parcel.component.html @@ -29,42 +29,44 @@ <h4>Parcel {{ parcelInd + 1 }}</h4> {{ parcel.ownershipType?.label }} <app-no-data [showRequired]="showErrors" *ngIf="!parcel.ownershipType"></app-no-data> </div> - <div class="subheading2 grid-1">Legal Description</div> - <div class="grid-double"> - {{ parcel.legalDescription }} - <app-no-data [showRequired]="showErrors" *ngIf="!parcel.legalDescription"></app-no-data> - </div> - <div class="subheading2 grid-1">Approx. Map Area</div> - <div class="grid-double"> - {{ parcel.mapAreaHectares }} - <span *ngIf="parcel.mapAreaHectares !== null">ha</span> - <app-no-data [showRequired]="showErrors" *ngIf="!parcel.mapAreaHectares"></app-no-data> - </div> - <div class="subheading2 grid-1"> - PID {{ parcel.ownershipType?.code === PARCEL_OWNERSHIP_TYPES.CROWN ? '(optional)' : '' }} - </div> - <div class="grid-double"> - <span *ngIf="parcel.pid">{{ parcel.pid | mask : '000-000-000' }}</span> - <app-no-data - [showRequired]="showErrors && parcel.ownershipType?.code !== PARCEL_OWNERSHIP_TYPES.CROWN" - *ngIf="!parcel.pid" - ></app-no-data> - <app-validation-error *ngIf="showErrors && parcel.pid && parcel.pid.length < 9"> - Invalid Format - </app-validation-error> - </div> - <ng-container *ngIf="parcel.ownershipType?.code === PARCEL_OWNERSHIP_TYPES.CROWN"> - <div class="subheading2 grid-1">PIN (optional)</div> + <ng-container *ngIf="parcel.ownershipType"> + <div class="subheading2 grid-1">Legal Description</div> + <div class="grid-double"> + {{ parcel.legalDescription }} + <app-no-data [showRequired]="showErrors" *ngIf="!parcel.legalDescription"></app-no-data> + </div> + <div class="subheading2 grid-1">Approx. Map Area</div> + <div class="grid-double"> + {{ parcel.mapAreaHectares }} + <span *ngIf="parcel.mapAreaHectares !== null">ha</span> + <app-no-data [showRequired]="showErrors" *ngIf="!parcel.mapAreaHectares"></app-no-data> + </div> + <div class="subheading2 grid-1"> + PID {{ parcel.ownershipType.code === PARCEL_OWNERSHIP_TYPES.CROWN ? '(optional)' : '' }} + </div> <div class="grid-double"> - {{ parcel.pin }} - <app-no-data [showRequired]="false" *ngIf="!parcel.pin"></app-no-data> + <span *ngIf="parcel.pid">{{ parcel.pid | mask : '000-000-000' }}</span> + <app-no-data + [showRequired]="showErrors && parcel.ownershipType.code !== PARCEL_OWNERSHIP_TYPES.CROWN" + *ngIf="!parcel.pid" + ></app-no-data> + <app-validation-error *ngIf="showErrors && parcel.pid && parcel.pid.length < 9"> + Invalid Format + </app-validation-error> + </div> + <ng-container *ngIf="parcel.ownershipType?.code === PARCEL_OWNERSHIP_TYPES.CROWN"> + <div class="subheading2 grid-1">PIN (optional)</div> + <div class="grid-double"> + {{ parcel.pin }} + <app-no-data [showRequired]="false" *ngIf="!parcel.pin"></app-no-data> + </div> + </ng-container> + <div class="subheading2 grid-1">Civic Address</div> + <div class="grid-double"> + {{ parcel.civicAddress }} + <app-no-data [showRequired]="showErrors" *ngIf="!parcel.civicAddress"></app-no-data> </div> </ng-container> - <div class="subheading2 grid-1">Civic Address</div> - <div class="grid-double"> - {{ parcel.civicAddress }} - <app-no-data [showRequired]="showErrors" *ngIf="!parcel.civicAddress"></app-no-data> - </div> </ng-container> <div *ngIf="showEdit" class="edit-button"> <button mat-flat-button (click)="onEditParcelsClick($event)" color="accent">Edit Section</button> From 07b31926ac7109a4943cd330b369c35d61c10a5a Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Tue, 9 Jan 2024 15:30:09 -0800 Subject: [PATCH 907/954] Feature/alcs application reconsideration etl (#1274) application reconsideration ETL update application modification ETL (no need to populate new or link modifications) add coalesce where missing for modifications update ALCS API to support nullable cards on reconsideration --- .../decisions/app_modifications/__init__.py | 10 -- .../application_modifications_update.py | 2 +- .../app_reconsiderations/__init__.py | 9 ++ .../application_reconsiderations_init.py} | 87 +++++++---- .../application_reconsiderations_link.py} | 53 ++++--- .../application_reconsiderations_update.py | 146 ++++++++++++++++++ .../application_reconsideration_insert.sql | 25 +++ ...plication_reconsideration_insert_count.sql | 18 +++ ...tion_reconsideration_link_to_decisions.sql | 8 + ...econsideration_link_to_decisions_count.sql | 6 + .../application_reconsideration_update.sql | 28 ++++ ...plication_reconsideration_update_count.sql | 19 +++ .../applications/migrate_application.py | 21 ++- .../common/oats_decision_enum.py | 6 + .../unarchive-card/unarchive-card.service.ts | 2 +- .../application-reconsideration.entity.ts | 13 +- ...pplication-reconsideration.service.spec.ts | 26 +++- .../application-reconsideration.service.ts | 9 +- ...ullable_for_app_recon_add_oats_recon_id.ts | 43 ++++++ 19 files changed, 448 insertions(+), 83 deletions(-) create mode 100644 bin/migrate-oats-data/applications/decisions/app_reconsiderations/__init__.py rename bin/migrate-oats-data/applications/decisions/{app_modifications/application_modifications_init.py => app_reconsiderations/application_reconsiderations_init.py} (52%) rename bin/migrate-oats-data/applications/decisions/{app_modifications/application_modifications_link.py => app_reconsiderations/application_reconsiderations_link.py} (56%) create mode 100644 bin/migrate-oats-data/applications/decisions/app_reconsiderations/application_reconsiderations_update.py create mode 100644 bin/migrate-oats-data/applications/decisions/sql/reconsiderations/application_reconsideration_insert.sql create mode 100644 bin/migrate-oats-data/applications/decisions/sql/reconsiderations/application_reconsideration_insert_count.sql create mode 100644 bin/migrate-oats-data/applications/decisions/sql/reconsiderations/application_reconsideration_link_to_decisions.sql create mode 100644 bin/migrate-oats-data/applications/decisions/sql/reconsiderations/application_reconsideration_link_to_decisions_count.sql create mode 100644 bin/migrate-oats-data/applications/decisions/sql/reconsiderations/application_reconsideration_update.sql create mode 100644 bin/migrate-oats-data/applications/decisions/sql/reconsiderations/application_reconsideration_update_count.sql create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1704480768243-make_carduuid_nullable_for_app_recon_add_oats_recon_id.ts diff --git a/bin/migrate-oats-data/applications/decisions/app_modifications/__init__.py b/bin/migrate-oats-data/applications/decisions/app_modifications/__init__.py index a05e63fbaa..d5752a0ebe 100644 --- a/bin/migrate-oats-data/applications/decisions/app_modifications/__init__.py +++ b/bin/migrate-oats-data/applications/decisions/app_modifications/__init__.py @@ -1,11 +1 @@ -from .application_modifications_init import ( - init_application_modifications, - clean_application_modifications, -) - from .application_modifications_update import update_application_modifications - -from .application_modifications_link import ( - link_application_modifications, - unlink_application_modifications, -) diff --git a/bin/migrate-oats-data/applications/decisions/app_modifications/application_modifications_update.py b/bin/migrate-oats-data/applications/decisions/app_modifications/application_modifications_update.py index 11760f8b37..650d429cfc 100644 --- a/bin/migrate-oats-data/applications/decisions/app_modifications/application_modifications_update.py +++ b/bin/migrate-oats-data/applications/decisions/app_modifications/application_modifications_update.py @@ -95,7 +95,7 @@ def _get_update_query(): UPDATE alcs.application_modification SET submitted_date = %(submitted_date)s , review_outcome_code = %(review_outcome_code)s - , description = %(description)s + , description = COALESCE(alcs.application_modification.description, %(description)s) , oats_reconsideration_request_id = %(oats_reconsideration_request_id)s WHERE alcs.application_modification."uuid" = %(modification_uuid)s """ diff --git a/bin/migrate-oats-data/applications/decisions/app_reconsiderations/__init__.py b/bin/migrate-oats-data/applications/decisions/app_reconsiderations/__init__.py new file mode 100644 index 0000000000..d83396ea5d --- /dev/null +++ b/bin/migrate-oats-data/applications/decisions/app_reconsiderations/__init__.py @@ -0,0 +1,9 @@ +from .application_reconsiderations_init import ( + init_application_reconsiderations, + clean_application_reconsiderations, +) +from .application_reconsiderations_link import ( + link_application_reconsiderations, + unlink_application_reconsiderations, +) +from .application_reconsiderations_update import update_application_reconsiderations diff --git a/bin/migrate-oats-data/applications/decisions/app_modifications/application_modifications_init.py b/bin/migrate-oats-data/applications/decisions/app_reconsiderations/application_reconsiderations_init.py similarity index 52% rename from bin/migrate-oats-data/applications/decisions/app_modifications/application_modifications_init.py rename to bin/migrate-oats-data/applications/decisions/app_reconsiderations/application_reconsiderations_init.py index 5cb8d17764..4a9b3810d9 100644 --- a/bin/migrate-oats-data/applications/decisions/app_modifications/application_modifications_init.py +++ b/bin/migrate-oats-data/applications/decisions/app_reconsiderations/application_reconsiderations_init.py @@ -2,20 +2,20 @@ OATS_ETL_USER, setup_and_get_logger, add_timezone_and_keep_date_part, - AlcsNoiModificationOutcomeCodeEnum, BATCH_UPLOAD_SIZE, + AlcsAppReconsiderationOutcomeCodeEnum, ) from db import inject_conn_pool from psycopg2.extras import RealDictCursor, execute_batch -etl_name = "init_application_modifications" +etl_name = "init_application_reconsiderations" logger = setup_and_get_logger(etl_name) @inject_conn_pool -def init_application_modifications(conn=None, batch_size=BATCH_UPLOAD_SIZE): +def init_application_reconsiderations(conn=None, batch_size=BATCH_UPLOAD_SIZE): """ - This function is responsible for initializing the application_modification in ALCS. + This function is responsible for initializing the application_reconsideration in ALCS. Args: conn (psycopg2.extensions.connection): PostgreSQL database connection. Provided by the decorator. @@ -25,28 +25,28 @@ def init_application_modifications(conn=None, batch_size=BATCH_UPLOAD_SIZE): logger.info(f"Start {etl_name}") with conn.cursor(cursor_factory=RealDictCursor) as cursor: with open( - "applications/decisions/sql/modifications/application_modification_insert_count.sql", + "applications/decisions/sql/reconsiderations/application_reconsideration_insert_count.sql", "r", encoding="utf-8", ) as sql_file: count_query = sql_file.read() cursor.execute(count_query) count_total = dict(cursor.fetchone())["count"] - logger.info(f"Total Application Modifications data to insert: {count_total}") + logger.info(f"Total Application Reconsiderations data to insert: {count_total}") - failed_inserts_count = 0 + failed_inserts = 0 successful_inserts_count = 0 - last_modification_id = 0 + last_reconsideration_id = 0 with open( - "applications/decisions/sql/modifications/application_modification_insert.sql", + "applications/decisions/sql/reconsiderations/application_reconsideration_insert.sql", "r", encoding="utf-8", ) as sql_file: query = sql_file.read() while True: cursor.execute( - f"{query} and orr.reconsideration_request_id > {last_modification_id} ORDER BY orr.reconsideration_request_id;" + f"{query} and orr.reconsideration_request_id > {last_reconsideration_id} ORDER BY orr.reconsideration_request_id;" ) rows = cursor.fetchmany(batch_size) @@ -54,30 +54,32 @@ def init_application_modifications(conn=None, batch_size=BATCH_UPLOAD_SIZE): if not rows: break try: - modifications_to_be_inserted_count = len(rows) + reconsiderations_to_be_inserted_count = len(rows) - _insert_application_modifications(conn, batch_size, cursor, rows) + _insert_application_reconsiderations(conn, batch_size, cursor, rows) successful_inserts_count = ( - successful_inserts_count + modifications_to_be_inserted_count + successful_inserts_count + reconsiderations_to_be_inserted_count ) - last_modification_id = dict(rows[-1])["reconsideration_request_id"] + last_reconsideration_id = dict(rows[-1])[ + "reconsideration_request_id" + ] logger.debug( - f"retrieved/inserted items count: {modifications_to_be_inserted_count}; total successfully inserted modifications so far {successful_inserts_count}; last inserted reconsideration_request_id: {last_modification_id}" + f"retrieved/inserted items count: {reconsiderations_to_be_inserted_count}; total successfully inserted reconsiderations so far {successful_inserts_count}; last inserted reconsideration_request_id: {last_reconsideration_id}" ) except Exception as err: logger.exception(err) conn.rollback() - failed_inserts_count = count_total - successful_inserts_count - last_modification_id = last_modification_id + 1 + failed_inserts = count_total - successful_inserts_count + last_reconsideration_id = last_reconsideration_id + 1 logger.info( - f"Finished {etl_name}: total amount of successful inserts {successful_inserts_count}, total failed inserts {failed_inserts_count}" + f"Finished {etl_name}: total amount of successful inserts {successful_inserts_count}, total failed inserts {failed_inserts}" ) -def _insert_application_modifications(conn, batch_size, cursor, rows): +def _insert_application_reconsiderations(conn, batch_size, cursor, rows): """ """ query = _get_insert_query() parsed_data_list = _prepare_oats_alr_applications_data(rows) @@ -90,23 +92,29 @@ def _insert_application_modifications(conn, batch_size, cursor, rows): def _get_insert_query(): query = f""" - INSERT INTO alcs.application_modification ( + INSERT INTO alcs.application_reconsideration ( audit_created_by, submitted_date, - review_outcome_code, application_uuid, description, oats_reconsideration_request_id, - is_time_extension + is_incorrect_false_info, + is_new_evidence, + is_new_proposal, + type_code, + review_outcome_code ) VALUES ( %(audit_created_by)s, %(submitted_date)s, - %(review_outcome_code)s, %(application_uuid)s, %(description)s, %(oats_reconsideration_request_id)s, - %(is_time_extension)s + %(is_incorrect_false_info)s, + %(is_new_evidence)s, + %(is_new_proposal)s, + %(type_code)s, + %(review_outcome_code)s ) ON CONFLICT DO NOTHING; """ @@ -119,30 +127,45 @@ def _prepare_oats_alr_applications_data(row_data_list): mapped_row = { "audit_created_by": OATS_ETL_USER, "submitted_date": add_timezone_and_keep_date_part(row.get("received_date")), - "review_outcome_code": _map_outcome_code(row), "application_uuid": row.get("app_uuid"), "description": row.get("description"), "oats_reconsideration_request_id": row.get("reconsideration_request_id"), - "is_time_extension": False, + "is_incorrect_false_info": row.get("error_information_ind"), + "is_new_evidence": row.get("new_information_ind"), + "is_new_proposal": row.get("new_proposal_ind"), + "type_code": "33", + "review_outcome_code": _map_review_outcome_code(row), + "review_date": _map_review_date(row), } data_list.append(mapped_row) return data_list -def _map_outcome_code(row): +def _map_review_outcome_code(row): if row.get("approved_date", None) is not None: - return AlcsNoiModificationOutcomeCodeEnum.PROCEED_TO_MODIFY.value + return AlcsAppReconsiderationOutcomeCodeEnum.PROCEED_TO_RECONSIDER.value else: - return AlcsNoiModificationOutcomeCodeEnum.PENDING.value + return AlcsAppReconsiderationOutcomeCodeEnum.PENDING.value + + +def _map_review_date(row): + review_code = _map_review_outcome_code(row) + approved_date = add_timezone_and_keep_date_part(row.get("approved_date")) + return ( + approved_date + if review_code + == AlcsAppReconsiderationOutcomeCodeEnum.PROCEED_TO_RECONSIDER.value + else None + ) @inject_conn_pool -def clean_application_modifications(conn=None): - logger.info("Start application_modification cleaning") +def clean_application_reconsiderations(conn=None): + logger.info("Start application_reconsideration cleaning") with conn.cursor() as cursor: cursor.execute( - f"DELETE FROM alcs.application_modification WHERE audit_created_by = '{OATS_ETL_USER}' AND audit_updated_by is NULL" + f"DELETE FROM alcs.application_reconsideration WHERE audit_created_by = '{OATS_ETL_USER}' AND audit_updated_by is NULL" ) logger.info(f"Deleted items count = {cursor.rowcount}") diff --git a/bin/migrate-oats-data/applications/decisions/app_modifications/application_modifications_link.py b/bin/migrate-oats-data/applications/decisions/app_reconsiderations/application_reconsiderations_link.py similarity index 56% rename from bin/migrate-oats-data/applications/decisions/app_modifications/application_modifications_link.py rename to bin/migrate-oats-data/applications/decisions/app_reconsiderations/application_reconsiderations_link.py index 7c25891526..31b4c008a1 100644 --- a/bin/migrate-oats-data/applications/decisions/app_modifications/application_modifications_link.py +++ b/bin/migrate-oats-data/applications/decisions/app_reconsiderations/application_reconsiderations_link.py @@ -1,15 +1,18 @@ -from common import OATS_ETL_USER, setup_and_get_logger, BATCH_UPLOAD_SIZE +from common import ( + OATS_ETL_USER, + setup_and_get_logger, +) from db import inject_conn_pool from psycopg2.extras import RealDictCursor, execute_batch -etl_name = "link_application_modifications" +etl_name = "link_application_reconsiderations" logger = setup_and_get_logger(etl_name) @inject_conn_pool -def link_application_modifications(conn=None, batch_size=BATCH_UPLOAD_SIZE): +def link_application_reconsiderations(conn=None, batch_size=1000): """ - This function is responsible for linking application_modification to application_decisions in ALCS. + This function is responsible for linking application_reconsideration to application_decisions in ALCS. Args: conn (psycopg2.extensions.connection): PostgreSQL database connection. Provided by the decorator. @@ -19,28 +22,28 @@ def link_application_modifications(conn=None, batch_size=BATCH_UPLOAD_SIZE): logger.info(f"Start {etl_name}") with conn.cursor(cursor_factory=RealDictCursor) as cursor: with open( - "applications/decisions/sql/modifications/application_modification_link_to_decisions_count.sql", + "applications/decisions/sql/reconsiderations/application_reconsideration_link_to_decisions_count.sql", "r", encoding="utf-8", ) as sql_file: count_query = sql_file.read() cursor.execute(count_query) count_total = dict(cursor.fetchone())["count"] - logger.info(f"Total Application Modifications data to link: {count_total}") + logger.info(f"Total Application Reconsiderations data to link: {count_total}") failed_updates = 0 successful_updates_count = 0 - last_modification_id = 0 + last_reconsideration_id = 0 with open( - "applications/decisions/sql/modifications/application_modification_link_to_decisions.sql", + "applications/decisions/sql/reconsiderations/application_reconsideration_link_to_decisions.sql", "r", encoding="utf-8", ) as sql_file: query = sql_file.read() while True: cursor.execute( - f"{query} and orr.reconsideration_request_id > {last_modification_id} ORDER BY orr.reconsideration_request_id;" + f"{query} and orr.reconsideration_request_id > {last_reconsideration_id} ORDER BY orr.reconsideration_request_id;" ) rows = cursor.fetchmany(batch_size) @@ -48,30 +51,32 @@ def link_application_modifications(conn=None, batch_size=BATCH_UPLOAD_SIZE): if not rows: break try: - modifications_to_be_updated_count = len(rows) + reconsiderations_to_be_updated_count = len(rows) - _update_application_modifications(conn, batch_size, cursor, rows) + _update_application_reconsiderations(conn, batch_size, cursor, rows) successful_updates_count = ( - successful_updates_count + modifications_to_be_updated_count + successful_updates_count + reconsiderations_to_be_updated_count ) - last_modification_id = dict(rows[-1])["reconsideration_request_id"] + last_reconsideration_id = dict(rows[-1])[ + "reconsideration_request_id" + ] logger.debug( - f"retrieved/linked items count: {modifications_to_be_updated_count}; total successfully linked modifications so far {successful_updates_count}; last updated reconsideration_request_id: {last_modification_id}" + f"retrieved/linked items count: {reconsiderations_to_be_updated_count}; total successfully linked reconsiderations so far {successful_updates_count}; last updated reconsideration_request_id: {last_reconsideration_id}" ) except Exception as err: logger.exception(err) conn.rollback() failed_updates = count_total - successful_updates_count - last_modification_id = last_modification_id + 1 + last_reconsideration_id = last_reconsideration_id + 1 logger.info( f"Finished {etl_name}: total amount of successful linked {successful_updates_count}, total failed updates {failed_updates}" ) -def _update_application_modifications(conn, batch_size, cursor, rows): +def _update_application_reconsiderations(conn, batch_size, cursor, rows): data = _prepare_oats_alr_applications_data(rows) if len(data) > 0: @@ -88,7 +93,7 @@ def _update_application_modifications(conn, batch_size, cursor, rows): def _get_update_query(): query = f""" UPDATE alcs.application_decision - SET modifies_uuid = %(modification_uuid)s + SET reconsiders_uuid = %(reconsideration_uuid)s WHERE alcs.application_decision."uuid" = %(decision_uuid)s """ return query @@ -98,7 +103,7 @@ def _prepare_oats_alr_applications_data(row_data_list): data_list = [] for row in row_data_list: mapped_row = { - "modification_uuid": row["modification_uuid"], + "reconsideration_uuid": row["reconsideration_uuid"], "decision_uuid": row["decision_uuid"], "reconsideration_request_id": row["reconsideration_request_id"], } @@ -108,15 +113,15 @@ def _prepare_oats_alr_applications_data(row_data_list): @inject_conn_pool -def unlink_application_modifications(conn=None): - logger.info("Start application_modification link cleaning") +def unlink_application_reconsiderations(conn=None): + logger.info("Start application_reconsideration link cleaning") with conn.cursor() as cursor: cursor.execute( f"""UPDATE alcs.application_decision - SET modifies_uuid = NULL - FROM alcs.application_modification - WHERE alcs.application_decision.modifies_uuid = application_modification.uuid - AND alcs.application_modification.audit_created_by = '{OATS_ETL_USER}';""" + SET reconsiders_uuid = NULL + FROM alcs.application_reconsideration + WHERE alcs.application_decision.reconsiders_uuid = application_reconsideration.uuid + AND alcs.application_reconsideration.audit_created_by = '{OATS_ETL_USER}';""" ) logger.info(f"Unlinked items count = {cursor.rowcount}") diff --git a/bin/migrate-oats-data/applications/decisions/app_reconsiderations/application_reconsiderations_update.py b/bin/migrate-oats-data/applications/decisions/app_reconsiderations/application_reconsiderations_update.py new file mode 100644 index 0000000000..ce35fa5509 --- /dev/null +++ b/bin/migrate-oats-data/applications/decisions/app_reconsiderations/application_reconsiderations_update.py @@ -0,0 +1,146 @@ +from common import ( + setup_and_get_logger, + add_timezone_and_keep_date_part, + AlcsAppReconsiderationOutcomeCodeEnum, +) +from db import inject_conn_pool +from psycopg2.extras import RealDictCursor, execute_batch + +etl_name = "update_application_reconsiderations" +logger = setup_and_get_logger(etl_name) + + +@inject_conn_pool +def update_application_reconsiderations(conn=None, batch_size=1000): + """ + This function is responsible for updating existing application_reconsideration in ALCS. + + Args: + conn (psycopg2.extensions.connection): PostgreSQL database connection. Provided by the decorator. + batch_size (int): The number of items to process at once. Defaults to BATCH_UPLOAD_SIZE. + """ + + logger.info(f"Start {etl_name}") + with conn.cursor(cursor_factory=RealDictCursor) as cursor: + with open( + "applications/decisions/sql/reconsiderations/application_reconsideration_update_count.sql", + "r", + encoding="utf-8", + ) as sql_file: + count_query = sql_file.read() + cursor.execute(count_query) + count_total = dict(cursor.fetchone())["count"] + logger.info( + f"Total Application reconsiderations data to updated: {count_total}" + ) + + failed_updates = 0 + successful_updates_count = 0 + last_reconsideration_id = 0 + + with open( + "applications/decisions/sql/reconsiderations/application_reconsideration_update.sql", + "r", + encoding="utf-8", + ) as sql_file: + query = sql_file.read() + while True: + cursor.execute( + f"{query} and orr.reconsideration_request_id > {last_reconsideration_id} ORDER BY orr.reconsideration_request_id;" + ) + + rows = cursor.fetchmany(batch_size) + + if not rows: + break + try: + reconsiderations_to_be_updated_count = len(rows) + + _update_application_reconsiderations(conn, batch_size, cursor, rows) + + successful_updates_count = ( + successful_updates_count + reconsiderations_to_be_updated_count + ) + last_reconsideration_id = dict(rows[-1])[ + "reconsideration_request_id" + ] + + logger.debug( + f"retrieved/updated items count: {reconsiderations_to_be_updated_count}; total successfully update reconsiderations so far {successful_updates_count}; last updated reconsideration_request_id: {last_reconsideration_id}" + ) + except Exception as err: + logger.exception(err) + conn.rollback() + failed_updates = count_total - successful_updates_count + last_reconsideration_id = last_reconsideration_id + 1 + + logger.info( + f"Finished {etl_name}: total amount of successful updates {successful_updates_count}, total failed updates {failed_updates}" + ) + + +def _update_application_reconsiderations(conn, batch_size, cursor, rows): + data = _prepare_oats_alr_applications_data(rows) + + if len(data) > 0: + execute_batch( + cursor, + _get_update_query(), + data, + page_size=batch_size, + ) + + conn.commit() + + +def _get_update_query(): + query = f""" + UPDATE alcs.application_reconsideration + SET submitted_date = %(submitted_date)s + , description = COALESCE(alcs.application_reconsideration.description, %(description)s) + , oats_reconsideration_request_id = %(oats_reconsideration_request_id)s, + , is_new_proposal = %(is_new_proposal)s + , is_new_evidence = %(is_new_evidence)s + , is_incorrect_false_info = %(is_incorrect_false_info)s + , review_outcome_code = COALESCE(alcs.application_reconsideration.review_outcome_code, %(review_outcome_code)s) + , review_date = %(review_date)s + WHERE alcs.application_reconsideration."uuid" = %(reconsideration_uuid)s; + """ + return query + + +def _prepare_oats_alr_applications_data(row_data_list): + data_list = [] + for row in row_data_list: + mapped_row = { + "submitted_date": add_timezone_and_keep_date_part(row.get("received_date")), + "reconsideration_uuid": row.get("reconsideration_uuid"), + "description": row.get("description"), + "oats_reconsideration_request_id": row.get("reconsideration_request_id"), + "is_new_proposal": "new_proposal_ind", + "is_new_evidence": "new_information_ind", + "is_incorrect_false_info": "error_information_ind", + "review_outcome_code": _map_review_outcome_code(row), + "review_date": _map_review_date, + } + data_list.append(mapped_row) + + return data_list + + +def _map_review_outcome_code(row): + if row.get("approved_date", None) is not None: + return AlcsAppReconsiderationOutcomeCodeEnum.PROCEED_TO_RECONSIDER.value + else: + return AlcsAppReconsiderationOutcomeCodeEnum.PENDING.value + + +def _map_review_date(row): + review_code = _map_review_outcome_code(row) + approved_date = add_timezone_and_keep_date_part(row.get("approved_date")) + return ( + approved_date + if review_code + == AlcsAppReconsiderationOutcomeCodeEnum.PROCEED_TO_RECONSIDER.value + else None + ) diff --git a/bin/migrate-oats-data/applications/decisions/sql/reconsiderations/application_reconsideration_insert.sql b/bin/migrate-oats-data/applications/decisions/sql/reconsiderations/application_reconsideration_insert.sql new file mode 100644 index 0000000000..ded37943ed --- /dev/null +++ b/bin/migrate-oats-data/applications/decisions/sql/reconsiderations/application_reconsideration_insert.sql @@ -0,0 +1,25 @@ +WITH alcs_reconsiderations_resulting_decisions AS ( + SELECT appr."uuid", + appr.submitted_date::DATE AS submitted_date, + appd.resolution_number, + appd.resolution_year, + appd.oats_alr_appl_decision_id + FROM alcs.application_reconsideration appr + JOIN alcs.application_decision appd ON appd.modifies_uuid = appr."uuid" + JOIN alcs.application app ON app."uuid" = appr.application_uuid +) +SELECT orr.reconsideration_request_id, + orr.received_date, + orr.approved_date, + app."uuid" AS app_uuid, + orr.description, + orr.error_information_ind, + orr.new_information_ind, + orr.new_proposal_ind +FROM oats.oats_reconsideration_requests orr + JOIN oats.oats_alr_appl_decisions oaad ON oaad.reconsideration_request_id = orr.reconsideration_request_id + JOIN alcs.application app ON app.file_number = oaad.alr_application_id::TEXT + OR app.file_number = orr.alr_application_id::TEXT -- this IS required to get oats_recons only for apps + LEFT JOIN alcs_reconsiderations_resulting_decisions AS amrd ON amrd.oats_alr_appl_decision_id = oaad.alr_appl_decision_id + AND amrd.submitted_date = orr.received_date::DATE +WHERE amrd."uuid" IS NULL \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/decisions/sql/reconsiderations/application_reconsideration_insert_count.sql b/bin/migrate-oats-data/applications/decisions/sql/reconsiderations/application_reconsideration_insert_count.sql new file mode 100644 index 0000000000..23295c7922 --- /dev/null +++ b/bin/migrate-oats-data/applications/decisions/sql/reconsiderations/application_reconsideration_insert_count.sql @@ -0,0 +1,18 @@ +WITH alcs_reconsiderations_resulting_decisions AS ( + SELECT appr."uuid", + appr.submitted_date::DATE AS submitted_date, + appd.resolution_number, + appd.resolution_year, + appd.oats_alr_appl_decision_id + FROM alcs.application_reconsideration appr + JOIN alcs.application_decision appd ON appd.modifies_uuid = appr."uuid" + JOIN alcs.application app ON app."uuid" = appr.application_uuid +) +SELECT count(*) +FROM oats.oats_reconsideration_requests orr + JOIN oats.oats_alr_appl_decisions oaad ON oaad.reconsideration_request_id = orr.reconsideration_request_id + JOIN alcs.application app ON app.file_number = oaad.alr_application_id::TEXT + OR app.file_number = orr.alr_application_id::TEXT -- this IS required to get oats_recons only for apps + LEFT JOIN alcs_reconsiderations_resulting_decisions AS amrd ON amrd.oats_alr_appl_decision_id = oaad.alr_appl_decision_id + AND amrd.submitted_date = orr.received_date::DATE +WHERE amrd."uuid" IS NULL \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/decisions/sql/reconsiderations/application_reconsideration_link_to_decisions.sql b/bin/migrate-oats-data/applications/decisions/sql/reconsiderations/application_reconsideration_link_to_decisions.sql new file mode 100644 index 0000000000..c3fd9e8333 --- /dev/null +++ b/bin/migrate-oats-data/applications/decisions/sql/reconsiderations/application_reconsideration_link_to_decisions.sql @@ -0,0 +1,8 @@ +SELECT appr."uuid" as reconsideration_uuid, + appd."uuid" as decision_uuid, + orr.reconsideration_request_id +FROM oats.oats_reconsideration_requests orr + JOIN oats.oats_alr_appl_decisions oaad ON oaad.reconsideration_request_id = orr.reconsideration_request_id + JOIN alcs.application_decision appd ON appd.oats_alr_appl_decision_id = oaad.alr_appl_decision_id + JOIN alcs.application_reconsideration appr ON appr.oats_reconsideration_request_id = orr.reconsideration_request_id +WHERE appd.reconsiders_uuid IS NULL \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/decisions/sql/reconsiderations/application_reconsideration_link_to_decisions_count.sql b/bin/migrate-oats-data/applications/decisions/sql/reconsiderations/application_reconsideration_link_to_decisions_count.sql new file mode 100644 index 0000000000..aec1df98fa --- /dev/null +++ b/bin/migrate-oats-data/applications/decisions/sql/reconsiderations/application_reconsideration_link_to_decisions_count.sql @@ -0,0 +1,6 @@ +SELECT count(*) +FROM oats.oats_reconsideration_requests orr + JOIN oats.oats_alr_appl_decisions oaad ON oaad.reconsideration_request_id = orr.reconsideration_request_id + JOIN alcs.application_decision appd ON appd.oats_alr_appl_decision_id = oaad.alr_appl_decision_id + JOIN alcs.application_modification appm ON appm.oats_reconsideration_request_id = orr.reconsideration_request_id +WHERE appd.reconsiders_uuid IS NULL \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/decisions/sql/reconsiderations/application_reconsideration_update.sql b/bin/migrate-oats-data/applications/decisions/sql/reconsiderations/application_reconsideration_update.sql new file mode 100644 index 0000000000..5e82ab8c03 --- /dev/null +++ b/bin/migrate-oats-data/applications/decisions/sql/reconsiderations/application_reconsideration_update.sql @@ -0,0 +1,28 @@ + +WITH alcs_reconsiderations_resulting_decisions AS ( + SELECT appr."uuid" AS reconsideration_uuid, + appr.submitted_date::DATE AS submitted_date, + appd.resolution_number, + appd.resolution_year, + appd.oats_alr_appl_decision_id, + appr.audit_created_by + FROM alcs.application_reconsideration appr + JOIN alcs.application_decision appd ON appd.modifies_uuid = appr."uuid" + JOIN alcs.application app ON app."uuid" = appr.application_uuid +) +SELECT orr.reconsideration_request_id, + orr.received_date, + orr.approved_date, + app."uuid" AS app_uuid, + orr.description, + arrd.reconsideration_uuid, + orr.new_proposal_ind, + orr.new_information_ind, + orr.error_information_ind +FROM oats.oats_reconsideration_requests orr + JOIN oats.oats_alr_appl_decisions oaad ON oaad.reconsideration_request_id = orr.reconsideration_request_id + JOIN alcs.application app ON app.file_number = oaad.alr_application_id::TEXT + OR app.file_number = orr.alr_application_id::TEXT -- this is required to get oats_recons only for apps + JOIN alcs_reconsiderations_resulting_decisions AS arrd ON arrd.oats_alr_appl_decision_id = oaad.alr_appl_decision_id + AND arrd.submitted_date = orr.received_date::DATE -- this will make sure that only reconsiderations that exist in oats will be selected +WHERE arrd.audit_created_by <> 'oats_etl' \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/decisions/sql/reconsiderations/application_reconsideration_update_count.sql b/bin/migrate-oats-data/applications/decisions/sql/reconsiderations/application_reconsideration_update_count.sql new file mode 100644 index 0000000000..da6edd3277 --- /dev/null +++ b/bin/migrate-oats-data/applications/decisions/sql/reconsiderations/application_reconsideration_update_count.sql @@ -0,0 +1,19 @@ +WITH alcs_reconsiderations_resulting_decisions AS ( + SELECT appr."uuid" AS reconsideration_uuid, + appr.submitted_date::DATE AS submitted_date, + appd.resolution_number, + appd.resolution_year, + appd.oats_alr_appl_decision_id, + appr.audit_created_by + FROM alcs.application_reconsideration appr + JOIN alcs.application_decision appd ON appd.modifies_uuid = appr."uuid" + JOIN alcs.application app ON app."uuid" = appr.application_uuid +) +SELECT count(*) +FROM oats.oats_reconsideration_requests orr + JOIN oats.oats_alr_appl_decisions oaad ON oaad.reconsideration_request_id = orr.reconsideration_request_id + JOIN alcs.application app ON app.file_number = oaad.alr_application_id::TEXT + OR app.file_number = orr.alr_application_id::TEXT -- this is required to get oats_recons only for apps + JOIN alcs_reconsiderations_resulting_decisions AS arrd ON arrd.oats_alr_appl_decision_id = oaad.alr_appl_decision_id + AND arrd.submitted_date = orr.received_date::DATE -- this will make sure that only reconsiderations that exist in oats will be selected +WHERE arrd.audit_created_by <> 'oats_etl' \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/migrate_application.py b/bin/migrate-oats-data/applications/migrate_application.py index fdfe2e6cb3..9fff57e1b9 100644 --- a/bin/migrate-oats-data/applications/migrate_application.py +++ b/bin/migrate-oats-data/applications/migrate_application.py @@ -24,11 +24,14 @@ ) from .decisions import clean_application_decisions, init_application_decisions from .decisions.app_modifications import ( - init_application_modifications, - clean_application_modifications, update_application_modifications, - link_application_modifications, - unlink_application_modifications, +) +from .decisions.app_reconsiderations import ( + init_application_reconsiderations, + clean_application_reconsiderations, + link_application_reconsiderations, + unlink_application_reconsiderations, + update_application_reconsiderations, ) @@ -61,14 +64,16 @@ def init_applications(batch_size): def process_application_decisions(batch_size): init_application_decisions(batch_size) - init_application_modifications(batch_size) update_application_modifications(batch_size) - link_application_modifications(batch_size) + init_application_reconsiderations(batch_size) + link_application_reconsiderations(batch_size) + update_application_reconsiderations(batch_size) def clean_application_decisions_etl(): - unlink_application_modifications() - clean_application_modifications() + # modifications do not have clean since all of them were created in ALCS and ETL is not introducing new records. + unlink_application_reconsiderations() + clean_application_reconsiderations() clean_application_decisions() diff --git a/bin/migrate-oats-data/common/oats_decision_enum.py b/bin/migrate-oats-data/common/oats_decision_enum.py index 77bceab5c7..545eb42e8a 100644 --- a/bin/migrate-oats-data/common/oats_decision_enum.py +++ b/bin/migrate-oats-data/common/oats_decision_enum.py @@ -14,6 +14,12 @@ class AlcsNoiModificationOutcomeCodeEnum(Enum): REFUSE_TO_MODIFY = "REF" +class AlcsAppReconsiderationOutcomeCodeEnum(Enum): + PENDING = "PEN" + PROCEED_TO_RECONSIDER = "PRC" + REFUSE_TO_RECONSIDER = "REF" + + class OatsToAlcsAgCapSource(Enum): BCLI = AlcsAgCapSource.BCLI.value CLI = AlcsAgCapSource.CLI.value diff --git a/services/apps/alcs/src/alcs/admin/unarchive-card/unarchive-card.service.ts b/services/apps/alcs/src/alcs/admin/unarchive-card/unarchive-card.service.ts index 083ca4d862..734c465f43 100644 --- a/services/apps/alcs/src/alcs/admin/unarchive-card/unarchive-card.service.ts +++ b/services/apps/alcs/src/alcs/admin/unarchive-card/unarchive-card.service.ts @@ -123,7 +123,7 @@ export class UnarchiveCardService { await this.reconsiderationService.getDeletedCards(fileId); for (const reconsideration of reconsiderations) { result.push({ - cardUuid: reconsideration.cardUuid, + cardUuid: reconsideration.cardUuid ?? '', createdAt: reconsideration.auditCreatedAt.getTime(), type: 'Reconsideration', status: reconsideration.card!.status.label, diff --git a/services/apps/alcs/src/alcs/application-decision/application-reconsideration/application-reconsideration.entity.ts b/services/apps/alcs/src/alcs/application-decision/application-reconsideration/application-reconsideration.entity.ts index 187d731ee2..c389dc2185 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-reconsideration/application-reconsideration.entity.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-reconsideration/application-reconsideration.entity.ts @@ -92,8 +92,8 @@ export class ApplicationReconsideration extends Base { application: Application; @AutoMap() - @Column({ type: 'uuid' }) - cardUuid: string; + @Column({ type: 'uuid', nullable: true }) + cardUuid: string | null; @AutoMap(() => Card) @OneToOne(() => Card, { cascade: true }) @@ -111,4 +111,13 @@ export class ApplicationReconsideration extends Base { @AutoMap(() => ApplicationDecision) @OneToOne(() => ApplicationDecision, (dec) => dec.reconsiders) resultingDecision?: ApplicationDecision; + + @Column({ + select: false, + nullable: true, + type: 'int8', + comment: + 'This column is NOT related to any functionality in ALCS. It is only used for ETL and backtracking of imported data from OATS. It links oats.oats_reconsideration_requests to alcs.application_reconsideration.', + }) + oatsReconsiderationRequestId: number; } diff --git a/services/apps/alcs/src/alcs/application-decision/application-reconsideration/application-reconsideration.service.spec.ts b/services/apps/alcs/src/alcs/application-decision/application-reconsideration/application-reconsideration.service.spec.ts index 181ae3505d..1826ab37ff 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-reconsideration/application-reconsideration.service.spec.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-reconsideration/application-reconsideration.service.spec.ts @@ -1,9 +1,9 @@ import { ServiceNotFoundException } from '@app/common/exceptions/base.exception'; -import { classes } from 'automapper-classes'; -import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { FindOptionsRelations, IsNull, Repository } from 'typeorm'; import { initApplicationMockEntity, @@ -307,6 +307,28 @@ describe('ReconsiderationService', () => { expect(cardServiceMock.archive).toHaveBeenCalledTimes(1); }); + it('should not call archive card if reconsideration does not have card attached (only reconsiderations imported from OATS) on delete', async () => { + const uuid = 'fake'; + reconsiderationRepositoryMock.findOne.mockResolvedValue( + new ApplicationReconsideration(), + ); + reconsiderationRepositoryMock.softRemove.mockResolvedValue({} as any); + cardServiceMock.archive.mockResolvedValue(); + + await service.delete(uuid); + + expect(reconsiderationRepositoryMock.findOne).toHaveBeenCalledWith({ + relations: { + type: true, + }, + where: { + uuid, + }, + }); + expect(reconsiderationRepositoryMock.softRemove).toHaveBeenCalledTimes(1); + expect(cardServiceMock.archive).toHaveBeenCalledTimes(0); + }); + it('should fail on delete if reconsideration does not exist', async () => { const uuid = 'fake'; reconsiderationRepositoryMock.findOne.mockResolvedValue(null); diff --git a/services/apps/alcs/src/alcs/application-decision/application-reconsideration/application-reconsideration.service.ts b/services/apps/alcs/src/alcs/application-decision/application-reconsideration/application-reconsideration.service.ts index 92f62b0342..f48fd5c7d8 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-reconsideration/application-reconsideration.service.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-reconsideration/application-reconsideration.service.ts @@ -1,8 +1,8 @@ import { ServiceNotFoundException } from '@app/common/exceptions/base.exception'; -import { Mapper } from 'automapper-core'; -import { InjectMapper } from 'automapper-nestjs'; import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; +import { Mapper } from 'automapper-core'; +import { InjectMapper } from 'automapper-nestjs'; import { FindOptionsRelations, FindOptionsWhere, @@ -235,7 +235,10 @@ export class ApplicationReconsiderationService { async delete(uuid: string) { const reconToDelete = await this.fetchAndValidateReconsideration(uuid); - await this.cardService.archive(reconToDelete.cardUuid); + if (reconToDelete.cardUuid) { + await this.cardService.archive(reconToDelete.cardUuid); + } + return this.reconsiderationRepository.softRemove([reconToDelete]); } diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1704480768243-make_carduuid_nullable_for_app_recon_add_oats_recon_id.ts b/services/apps/alcs/src/providers/typeorm/migrations/1704480768243-make_carduuid_nullable_for_app_recon_add_oats_recon_id.ts new file mode 100644 index 0000000000..524d7532b3 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1704480768243-make_carduuid_nullable_for_app_recon_add_oats_recon_id.ts @@ -0,0 +1,43 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class MakeCarduuidNullableForAppReconAddOatsReconId1704480768243 + implements MigrationInterface +{ + name = 'MakeCarduuidNullableForAppReconAddOatsReconId1704480768243'; + + public async up(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `ALTER TABLE "alcs"."application_reconsideration" ADD "oats_reconsideration_request_id" bigint`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."application_reconsideration"."oats_reconsideration_request_id" IS 'This column is NOT related to any functionality in ALCS. It is only used for ETL and backtracking of imported data from OATS. It links oats.oats_reconsideration_requests to alcs.application_reconsideration.'`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_reconsideration" DROP CONSTRAINT "FK_6d10e08b482effb968defe55357"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_reconsideration" ALTER COLUMN "card_uuid" DROP NOT NULL`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_reconsideration" ADD CONSTRAINT "FK_6d10e08b482effb968defe55357" FOREIGN KEY ("card_uuid") REFERENCES "alcs"."card"("uuid") ON DELETE NO ACTION ON UPDATE NO ACTION`, + ); + } + + public async down(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `ALTER TABLE "alcs"."application_reconsideration" DROP CONSTRAINT "FK_6d10e08b482effb968defe55357"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_reconsideration" ALTER COLUMN "card_uuid" SET NOT NULL`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_reconsideration" ADD CONSTRAINT "FK_6d10e08b482effb968defe55357" FOREIGN KEY ("card_uuid") REFERENCES "alcs"."card"("uuid") ON DELETE NO ACTION ON UPDATE NO ACTION`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."application_reconsideration"."oats_reconsideration_request_id" IS 'This column is NOT related to any functionality in ALCS. It is only used for ETL and backtracking of imported data from OATS. It links oats.oats_reconsideration_requests to alcs.application_reconsideration.'`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_reconsideration" DROP COLUMN "oats_reconsideration_request_id"`, + ); + } +} From 2a178917ba8445b695c010e5157eeb578fc94c57 Mon Sep 17 00:00:00 2001 From: Liam Stoddard <lstodd@protonmail.com> Date: Tue, 9 Jan 2024 16:29:29 -0800 Subject: [PATCH 908/954] init app components --- .../application_decision_components_init.py | 366 ++++++++++++++++++ ...ication_decision_components_soil_update.py | 153 ++++++++ ...application_decision_components_insert.sql | 19 + ...ation_decision_components_insert_count.sql | 6 + ...cation_decision_components_soil_update.sql | 13 + ..._decision_components_soil_update_count.sql | 5 + .../common/alcs_application_enum.py | 19 + .../application-decision-component.entity.ts | 9 + ...component_id_to_app_descision_component.ts | 23 ++ 9 files changed, 613 insertions(+) create mode 100644 bin/migrate-oats-data/applications/decisions/app_components/application_decision_components_init.py create mode 100644 bin/migrate-oats-data/applications/decisions/app_components/application_decision_components_soil_update.py create mode 100644 bin/migrate-oats-data/applications/decisions/sql/components/application_decision_components_insert.sql create mode 100644 bin/migrate-oats-data/applications/decisions/sql/components/application_decision_components_insert_count.sql create mode 100644 bin/migrate-oats-data/applications/decisions/sql/components/application_decision_components_soil_update.sql create mode 100644 bin/migrate-oats-data/applications/decisions/sql/components/application_decision_components_soil_update_count.sql create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1704845866110-add_oats_component_id_to_app_descision_component.ts diff --git a/bin/migrate-oats-data/applications/decisions/app_components/application_decision_components_init.py b/bin/migrate-oats-data/applications/decisions/app_components/application_decision_components_init.py new file mode 100644 index 0000000000..97fc1d2cdf --- /dev/null +++ b/bin/migrate-oats-data/applications/decisions/app_components/application_decision_components_init.py @@ -0,0 +1,366 @@ +from common import ( + OATS_ETL_USER, + setup_and_get_logger, + add_timezone_and_keep_date_part, + ALRChangeCode, + OatsToAlcsAgCap, + OatsToAlcsAgCapSource, + OatsLegislationCodes, + OatsToAlcsNfuTypes, + OATS_NFU_SUBTYPES, + BATCH_UPLOAD_SIZE, + OatsToAlcsNaruType, +) +from db import inject_conn_pool +from psycopg2.extras import RealDictCursor, execute_batch + +etl_name = "init_application_decision_components" +logger = setup_and_get_logger(etl_name) + + +@inject_conn_pool +def init_application_decision_components(conn=None, batch_size=BATCH_UPLOAD_SIZE): + """ + This function is responsible for initializing the application_decision_components in ALCS. + + Args: + conn (psycopg2.extensions.connection): PostgreSQL database connection. Provided by the decorator. + batch_size (int): The number of items to process at once. Defaults to BATCH_UPLOAD_SIZE. + """ + + logger.info(f"Start {etl_name}") + with conn.cursor(cursor_factory=RealDictCursor) as cursor: + with open( + "applications/decisions/sql/components/application_decision_components_insert_count.sql", + "r", + encoding="utf-8", + ) as sql_file: + count_query = sql_file.read() + cursor.execute(count_query) + count_total = dict(cursor.fetchone())["count"] + logger.info( + f"Total Application Decision Components data to insert: {count_total}" + ) + + failed_inserts = 0 + successful_inserts_count = 0 + last_decision_component_id = 0 + + tmp_counter = 0 + + with open( + "applications/decisions/sql/components/application_decision_components_insert.sql", + "r", + encoding="utf-8", + ) as sql_file: + query = sql_file.read() + + while True: + cursor.execute( + f"""{query} + WHERE oaac.alr_appl_component_id > {last_decision_component_id} ORDER BY oaac.alr_appl_component_id;""" + ) + + rows = cursor.fetchmany(batch_size) + + if not rows: + break + try: + decision_components_to_be_inserted_count = len(rows) + + _insert_application_decision_components( + conn, batch_size, cursor, rows + ) + + successful_inserts_count = ( + successful_inserts_count + + decision_components_to_be_inserted_count + ) + last_decision_component_id = rows[-1]["component_id"] + + logger.info( + f"retrieved/inserted items count: {decision_components_to_be_inserted_count}; total successfully inserted decision components so far {successful_inserts_count}; last inserted alr_appl_component_id: {last_decision_component_id}" + ) + except Exception as err: + logger.exception(err) + conn.rollback() + failed_inserts = count_total - successful_inserts_count + last_decision_component_id = last_decision_component_id + 1 + + logger.info( + f"Finished {etl_name}: total amount of successful inserts {successful_inserts_count}, total failed inserts {failed_inserts}" + ) + + +def _insert_application_decision_components(conn, batch_size, cursor, rows): + query = _get_insert_query() + parsed_data_list = _prepare_oats_alr_applications_data(rows) + + if len(parsed_data_list) > 0: + execute_batch(cursor, query, parsed_data_list, page_size=batch_size) + + conn.commit() + + +def _get_insert_query(): + query = f""" + INSERT INTO alcs.application_decision_component ( + ag_cap, + ag_cap_consultant, + ag_cap_map, + ag_cap_source, + alr_area, + audit_created_by, + end_date, + end_date2, + expiry_date, + application_decision_component_type_code, + application_decision_uuid, + oats_alr_appl_component_id, + naru_subtype_code, + nfu_sub_type, + nfu_type, + incl_excl_applicant_type + ) + VALUES ( + %(ag_cap)s, + %(ag_cap_consultant)s, + %(ag_cap_map)s, + %(ag_cap_source)s, + %(alr_area)s, + %(audit_created_by)s, + %(end_date)s, + %(end_date2)s, + %(expiry_date)s, + %(application_decision_component_type_code)s, + %(application_decision_uuid)s, + %(alr_appl_component_id)s, + %(naru_type_code), + %(nfu_sub_type), + %(nfu_type), + %(applicant_type) + + ) + ON CONFLICT DO NOTHING; -- there are no components on prod + """ + return query + + +def _prepare_oats_alr_applications_data(row_data_list): + data_list = [] + for row in row_data_list: + if row.get("alr_change_code", None) in [ + ALRChangeCode.SCH.value, + ALRChangeCode.FILL.value, + ALRChangeCode.EXT.value, + ]: + end_date, end_date2 = _map_end_date(row) + mapped_row = { + "ag_cap": str(OatsToAlcsAgCap[row["agri_capability_code"]].value) + if row.get("agri_capability_code") + else None, + "ag_cap_consultant": row.get("agri_cap_consultant"), + "ag_cap_map": row.get("agri_cap_map"), + "ag_cap_source": str( + OatsToAlcsAgCapSource[row["capability_source_code"]].value + ) + if row.get("capability_source_code") + else None, + "alr_area": row.get("component_area"), + "audit_created_by": OATS_ETL_USER, + "end_date": end_date, + "end_date2": end_date2, + "expiry_date": add_timezone_and_keep_date_part( + row.get("decision_expiry_date") + ), + "application_decision_component_type_code": _map_component_type_code( + row + ), + "application_decision_uuid": row.get("decision_uuid"), + "alr_appl_component_id": row.get("component_id"), + } + data_list.append(mapped_row) + + elif row.get("alr_change_code", None) in [ + ALRChangeCode.TUR.value, + ALRChangeCode.INC.value, + ALRChangeCode.EXC.value, + ALRChangeCode.SDV.value, + ALRChangeCode.NAR.value, + ALRChangeCode.NFU.value, + ]: + nfu_type, nfu_subtype, nfu_end_date = _map_oats_to_alcs_nfu(row) + mapped_row = { + "ag_cap": str(OatsToAlcsAgCap[row["agri_capability_code"]].value) + if row.get("agri_capability_code") + else None, + "ag_cap_consultant": row.get("agri_cap_consultant"), + "ag_cap_map": row.get("agri_cap_map"), + "ag_cap_source": str( + OatsToAlcsAgCapSource[row["capability_source_code"]].value + ) + if row.get("capability_source_code") + else None, + "alr_area": row.get("component_area"), + "audit_created_by": OATS_ETL_USER, + "end_date": nfu_end_date, + "expiry_date": add_timezone_and_keep_date_part( + row.get("decision_expiry_date") + ), + "application_decision_component_type_code": _map_component_type_code( + row + ), + "application_decision_uuid": row.get("decision_uuid"), + "alr_appl_component_id": row.get("component_id"), + "naru_type_code": _map_naru_subtype(row), + "nonfarm_use_subtype_code": nfu_subtype, + "nonfarm_use_type_code": nfu_type, + "applicant_type": _map_legislation_to_applicant_type(row), + } + data_list.append(mapped_row) + + return data_list + + +def _map_component_type_code(row): + alr_change_code = row.get("alr_change_code") + if alr_change_code == ALRChangeCode.SCH.value: + return "PFRS" + + if alr_change_code == ALRChangeCode.EXT.value: + return "ROSO" + + if alr_change_code == ALRChangeCode.FILL.value: + return "POFO" + + if alr_change_code == ALRChangeCode.TUR.value: + return "TURP" + + if alr_change_code == ALRChangeCode.INC.value: + return "INCL" + + if alr_change_code == ALRChangeCode.EXC.value: + return "EXCL" + + if alr_change_code == ALRChangeCode.SDV.value: + return "SUBD" + + if alr_change_code == ALRChangeCode.NFU.value: + return "NFUP" + + if alr_change_code == ALRChangeCode.NAR.value: + return "NARU" + + return None + + +# def _map_nfu_subtype_code(row): +# nfu_subtype_code = row.get("nonfarm_use_subtype_code") +# if nfu_subtype_code == ALRChangeCode.NAR.value: +# return "NARU" + + +# def _map_nfu_type_code(row): +# nfu_code = row.get("nonfarm_use_type_code") +# if nfu_code == AlcsAdjacentLandUseType.AGR: +# return AlcsAdjacentLandUseType.AGR.value + +# if nfu_code == AlcsAdjacentLandUseType.CIV: +# return AlcsAdjacentLandUseType.CIV.value + +# if nfu_code == AlcsAdjacentLandUseType.COM: +# return AlcsAdjacentLandUseType.COM.value + +# if nfu_code == AlcsAdjacentLandUseType.IND: +# return AlcsAdjacentLandUseType.IND.value + +# if nfu_code == AlcsAdjacentLandUseType.OTH: +# return AlcsAdjacentLandUseType.OTH.value + +# if nfu_code == AlcsAdjacentLandUseType.REC: +# return AlcsAdjacentLandUseType.REC.value + +# if nfu_code == AlcsAdjacentLandUseType.RES: +# return AlcsAdjacentLandUseType.RES.value + +# if nfu_code == AlcsAdjacentLandUseType.TRA: +# return AlcsAdjacentLandUseType.TRA.value + +# if nfu_code == AlcsAdjacentLandUseType.UNU: +# return AlcsAdjacentLandUseType.UNU.value + + +def _map_oats_to_alcs_nfu(data): + oats_type_code = data["nonfarm_use_type_code"] + oats_subtype_code = data["nonfarm_use_subtype_code"] + + if data["nonfarm_use_type_code"]: + data["nonfarm_use_type_code"] = str( + OatsToAlcsNfuTypes[data["nonfarm_use_type_code"]].value + ) + if data["nonfarm_use_subtype_code"]: + data["nonfarm_use_subtype_code"] = _map_oats_to_alcs_nfu_subtypes( + oats_type_code, oats_subtype_code + ) + + data["nonfarm_use_end_date"] = add_timezone_and_keep_date_part( + data.get("nonfarm_use_end_date", None) + ) + + nfu_type = data["nonfarm_use_type_code"] + nfu_subtype = data["nonfarm_use_subtype_code"] + nfu_end_date = data["nonfarm_use_end_date"] + + return nfu_type, nfu_subtype, nfu_end_date + + +def _map_oats_to_alcs_nfu_subtypes(nfu_type_code, nfu_subtype_code): + for dict_obj in OATS_NFU_SUBTYPES: + if str(dict_obj["type_key"]) == str(nfu_type_code) and str( + dict_obj["subtype_key"] + ) == str(nfu_subtype_code): + return dict_obj["value"] + + # Return None when no matching key found + return None + + +def _map_legislation_to_applicant_type(row): + if row["legislation_code"]: + row["legislation_code"] = str( + OatsLegislationCodes[row["legislation_code"]].value + ) + + return row["legislation_code"] + + +def _map_naru_subtype(row): + row["rsdntl_use_type_code"] = str( + OatsToAlcsNaruType[row["rsdntl_use_type_code"]].value + ) + return row["rsdntl_use_type_code"] + + +def _map_end_date(row): + alr_change_code = row.get("alr_change_code") + date = add_timezone_and_keep_date_part(row.get("nonfarm_use_end_date")) + + if alr_change_code in [ + ALRChangeCode.SCH.value, + ALRChangeCode.EXT.value, + ALRChangeCode.FILL.value, + ]: + return date, date if alr_change_code == ALRChangeCode.SCH.value else None + return None, None + + +@inject_conn_pool +def clean_application_decision_components(conn=None): + logger.info("Start application_decision_component cleaning") + with conn.cursor() as cursor: + cursor.execute( + f"DELETE FROM alcs.application_decision_component WHERE audit_created_by = '{OATS_ETL_USER}' AND audit_updated_by is NULL" + ) + logger.info(f"Deleted items count = {cursor.rowcount}") + + conn.commit() diff --git a/bin/migrate-oats-data/applications/decisions/app_components/application_decision_components_soil_update.py b/bin/migrate-oats-data/applications/decisions/app_components/application_decision_components_soil_update.py new file mode 100644 index 0000000000..c9776996fd --- /dev/null +++ b/bin/migrate-oats-data/applications/decisions/app_components/application_decision_components_soil_update.py @@ -0,0 +1,153 @@ +from common import ( + setup_and_get_logger, + SoilChangeCode, + NO_DATA_IN_OATS, + BATCH_UPLOAD_SIZE, +) +from db import inject_conn_pool +from psycopg2.extras import RealDictCursor, execute_batch + +etl_name = "update_application_decision_component_soil_details" +logger = setup_and_get_logger(etl_name) + + +@inject_conn_pool +def update_application_decision_component_soil_details( + conn=None, batch_size=BATCH_UPLOAD_SIZE +): + """ + This function is responsible for updating existing the application_decision_component in ALCS. + + Args: + conn (psycopg2.extensions.connection): PostgreSQL database connection. Provided by the decorator. + batch_size (int): The number of items to process at once. Defaults to BATCH_UPLOAD_SIZE. + """ + + logger.info(f"Start {etl_name}") + with conn.cursor(cursor_factory=RealDictCursor) as cursor: + with open( + "applications/decisions/sql/components/application_decision_components_soil_update_count.sql", + "r", + encoding="utf-8", + ) as sql_file: + count_query = sql_file.read() + cursor.execute(count_query) + count_total = dict(cursor.fetchone())["count"] + logger.info( + f"Total Application Decision Component data to updated: {count_total}" + ) + + failed_updates = 0 + successful_updates_count = 0 + last_component_id = 0 + + with open( + "applications/decisions/sql/components/application_decision_components_soil_update.sql", + "r", + encoding="utf-8", + ) as sql_file: + query = sql_file.read() + while True: + cursor.execute( + f"""{query} + WHERE appdc.oats_alr_appl_component_id > {last_component_id} ORDER BY appdc.oats_alr_appl_component_id;""" + ) + + rows = cursor.fetchmany(batch_size) + + if not rows: + break + try: + components_to_be_updated_count = len(rows) + + _update_soil_fields(conn, batch_size, cursor, rows) + + successful_updates_count = ( + successful_updates_count + components_to_be_updated_count + ) + last_component_id = dict(rows[-1])["oats_alr_appl_component_id"] + + logger.debug( + f"retrieved/updated items count: {components_to_be_updated_count}; total successfully update application_decision_components so far {successful_updates_count}; last updated oats_alr_appl_component_id: {last_component_id}" + ) + except Exception as err: + logger.exception(err) + conn.rollback() + failed_updates = count_total - successful_updates_count + last_component_id = last_component_id + 1 + + logger.info( + f"Finished {etl_name}: total amount of successful updates {successful_updates_count}, total failed updates {failed_updates}" + ) + + +_soil_fill_query = """ + UPDATE alcs.application_decision_component + SET soil_to_place_volume = %(volume)s + , soil_to_place_area = %(project_area)s + , soil_to_place_maximum_depth = %(depth)s + , soil_to_place_average_depth = %(depth)s + , soil_fill_type_to_place = %(type)s + WHERE alcs.application_decision_component.oats_alr_appl_component_id = %(oats_alr_appl_component_id)s +""" + +_soil_remove_query = """ + UPDATE alcs.application_decision_component + SET soil_to_remove_volume = %(volume)s + , soil_to_remove_area = %(project_area)s + , soil_to_remove_maximum_depth = %(depth)s + , soil_to_remove_average_depth = %(depth)s + , soil_type_removed = %(type)s + WHERE alcs.application_decision_component.oats_alr_appl_component_id = %(oats_alr_appl_component_id)s +""" + + +def _update_soil_fields(conn, batch_size, cursor, rows): + parsed_data_list = _prepare_oats_alr_decision_component_data(rows) + + if len(parsed_data_list[SoilChangeCode.REMOVE.value]) > 0: + execute_batch( + cursor, + _soil_remove_query, + parsed_data_list[SoilChangeCode.REMOVE.value], + page_size=batch_size, + ) + + if len(parsed_data_list[SoilChangeCode.ADD.value]) > 0: + execute_batch( + cursor, + _soil_fill_query, + parsed_data_list[SoilChangeCode.ADD.value], + page_size=batch_size, + ) + + conn.commit() + + +def _prepare_oats_alr_decision_component_data(row_data_list): + data_list = {SoilChangeCode.REMOVE.value: [], SoilChangeCode.ADD.value: []} + for row in row_data_list: + data = map_soil_fields(row) + + if data["soil_change_code"] == SoilChangeCode.ADD.value: + data_list[SoilChangeCode.ADD.value].append(data) + elif data["soil_change_code"] == SoilChangeCode.REMOVE.value: + data_list[SoilChangeCode.REMOVE.value].append(data) + + return data_list + + +def map_soil_fields(data): + soil_type = data.get("material_desc", "") + soil_origin = data.get("material_origin_desc", "") + + if not soil_type and not soil_origin: + data["type"] = NO_DATA_IN_OATS + else: + data["type"] = f"{soil_type} {soil_origin}" + + data["volume"] = data.get("volume", 0) + data["project_area"] = data.get("project_area", 0) + data["depth"] = data.get("depth", 0) + + return data diff --git a/bin/migrate-oats-data/applications/decisions/sql/components/application_decision_components_insert.sql b/bin/migrate-oats-data/applications/decisions/sql/components/application_decision_components_insert.sql new file mode 100644 index 0000000000..62c2ab5541 --- /dev/null +++ b/bin/migrate-oats-data/applications/decisions/sql/components/application_decision_components_insert.sql @@ -0,0 +1,19 @@ +SELECT + appd."uuid" AS decision_uuid, + oaac.alr_appl_component_id AS component_id, + oaac.agri_capability_code, + oaac.agri_cap_consultant, + oaac.agri_cap_map, + oaac.capability_source_code, + oaac.component_area, + oaac.rsdntl_use_end_date, + oaac.nonfarm_use_end_date, + oaac.decision_expiry_date, + oaac.alr_change_code, + oaac.nonfarm_use_type_code, + oaac.nonfarm_use_subtype_code, + oaac.rsdntl_use_type_code +FROM + oats.oats_alr_appl_decisions oaad + JOIN oats.oats_alr_appl_components oaac ON oaac.alr_appl_decision_id = oaad.alr_appl_decision_id + JOIN alcs.application_decision appd ON appd.oats_alr_appl_decision_id = oaad.alr_appl_decision_id -- ONLY GET components OF decisions that imported INTO ALCS \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/decisions/sql/components/application_decision_components_insert_count.sql b/bin/migrate-oats-data/applications/decisions/sql/components/application_decision_components_insert_count.sql new file mode 100644 index 0000000000..72f26ccf76 --- /dev/null +++ b/bin/migrate-oats-data/applications/decisions/sql/components/application_decision_components_insert_count.sql @@ -0,0 +1,6 @@ +SELECT + count(*) +FROM + oats.oats_alr_appl_decisions oaad + JOIN oats.oats_alr_appl_components oaac ON oaac.alr_appl_decision_id = oaad.alr_appl_decision_id + JOIN alcs.application_decision appd ON appd.oats_alr_appl_decision_id = oaad.alr_appl_decision_id -- ONLY GET components OF decisions that imported INTO ALCS \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/decisions/sql/components/application_decision_components_soil_update.sql b/bin/migrate-oats-data/applications/decisions/sql/components/application_decision_components_soil_update.sql new file mode 100644 index 0000000000..7c3eef13bd --- /dev/null +++ b/bin/migrate-oats-data/applications/decisions/sql/components/application_decision_components_soil_update.sql @@ -0,0 +1,13 @@ +SELECT + appdc.oats_alr_appl_component_id, + osce.soil_change_code, + osce.material_desc, + osce.material_origin_desc, + osce.volume, + osce.project_area, + osce."depth", + osce.project_duration, + osce.soil_change_element_id +FROM + oats.oats_soil_change_elements osce + JOIN alcs.application_decision_component appdc ON appdc.oats_alr_appl_component_id = osce.alr_appl_component_id \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/decisions/sql/components/application_decision_components_soil_update_count.sql b/bin/migrate-oats-data/applications/decisions/sql/components/application_decision_components_soil_update_count.sql new file mode 100644 index 0000000000..8e131b5d75 --- /dev/null +++ b/bin/migrate-oats-data/applications/decisions/sql/components/application_decision_components_soil_update_count.sql @@ -0,0 +1,5 @@ +SELECT + count(*) +FROM + oats.oats_soil_change_elements osce + JOIN alcs.application_decision_component appdc ON appdc.oats_alr_appl_component_id = osce.alr_appl_component_id \ No newline at end of file diff --git a/bin/migrate-oats-data/common/alcs_application_enum.py b/bin/migrate-oats-data/common/alcs_application_enum.py index 18319073c0..162ab0d50c 100644 --- a/bin/migrate-oats-data/common/alcs_application_enum.py +++ b/bin/migrate-oats-data/common/alcs_application_enum.py @@ -59,3 +59,22 @@ class AlcsNaruTypeCode(Enum): Principal_Residence = "PRIN" # Principal Residence More Than 500m² Additional_Residence = "ARFU" # Additional Residence for Farm Use Tourism_Accomodation = "TOUR" # Non-Adhering Tourism Accommodation + + +class OatsToAlcsNfuTypes(Enum): + AGR = AlcsNfuTypeCode.Agricultural_Farm.value + CIV = AlcsNfuTypeCode.Civic_Institutional.value + COM = AlcsNfuTypeCode.Commercial_Retail.value + IND = AlcsNfuTypeCode.Industrial.value + OTH = AlcsNfuTypeCode.Other.value + REC = AlcsNfuTypeCode.Recreational.value + RES = AlcsNfuTypeCode.Residential.value + TRA = AlcsNfuTypeCode.Transportation_Utilities.value + UNU = AlcsNfuTypeCode.Unused.value + + +class OatsLegislationCodes(Enum): + SEC_30_1 = AlcsApplicantType.Land_owner.value + SEC_29_1 = AlcsApplicantType.LFNG.value + SEC_17_3 = AlcsApplicantType.Land_owner.value + SEC_17_1 = AlcsApplicantType.LFNG.value diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.entity.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.entity.ts index b03d06ed22..a152e39009 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.entity.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.entity.ts @@ -239,4 +239,13 @@ export class ApplicationDecisionComponent extends Base { componentToConditions: | ApplicationDecisionConditionComponentPlanNumber[] | null; + + @Column({ + select: false, + nullable: true, + type: 'int8', + comment: + 'This column is NOT related to any functionality in ALCS. It is only used for ETL and backtracking of imported data from OATS. It links oats.oats_alr_appl_components to alcs.application_decision_component.', + }) + oatsAlrApplComponentId: number; } diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1704845866110-add_oats_component_id_to_app_descision_component.ts b/services/apps/alcs/src/providers/typeorm/migrations/1704845866110-add_oats_component_id_to_app_descision_component.ts new file mode 100644 index 0000000000..284c3df173 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1704845866110-add_oats_component_id_to_app_descision_component.ts @@ -0,0 +1,23 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class AddOatsComponentIdToAppDescisionComponent1704845866110 + implements MigrationInterface +{ + public async up(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `ALTER TABLE "alcs"."application_decision_component" ADD "oats_alr_appl_component_id" bigint`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."application_decision_component"."oats_alr_appl_component_id" IS 'This column is NOT related to any functionality in ALCS. It is only used for ETL and backtracking of imported data from OATS. It links oats.oats_alr_appl_components to alcs.application_decision_component.'`, + ); + } + + public async down(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."application_decision_component"."oats_alr_appl_component_id" IS 'This column is NOT related to any functionality in ALCS. It is only used for ETL and backtracking of imported data from OATS. It links oats.oats_alr_appl_components to alcs.application_decision_component.'`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_decision_component" DROP COLUMN "oats_alr_appl_component_id"`, + ); + } +} From 3d542fe4257d33fbe77a94055283d449032a7e4e Mon Sep 17 00:00:00 2001 From: Liam Stoddard <lstodd@protonmail.com> Date: Tue, 9 Jan 2024 17:10:21 -0800 Subject: [PATCH 909/954] adding to migrate function --- .../applications/decisions/__init__.py | 5 +++++ .../decisions/app_components/__init__.py | 7 +++++++ .../applications/migrate_application.py | 13 +++++++++++-- 3 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 bin/migrate-oats-data/applications/decisions/app_components/__init__.py diff --git a/bin/migrate-oats-data/applications/decisions/__init__.py b/bin/migrate-oats-data/applications/decisions/__init__.py index 274ac8ea52..6d5f70b26a 100644 --- a/bin/migrate-oats-data/applications/decisions/__init__.py +++ b/bin/migrate-oats-data/applications/decisions/__init__.py @@ -2,3 +2,8 @@ init_application_decisions, clean_application_decisions, ) +from .app_components import ( + init_application_decision_components, + update_application_decision_component_soil_details, + clean_application_decision_components, +) diff --git a/bin/migrate-oats-data/applications/decisions/app_components/__init__.py b/bin/migrate-oats-data/applications/decisions/app_components/__init__.py new file mode 100644 index 0000000000..944d5d4d84 --- /dev/null +++ b/bin/migrate-oats-data/applications/decisions/app_components/__init__.py @@ -0,0 +1,7 @@ +from .application_decision_components_init import ( + init_application_decision_components, + clean_application_decision_components, +) +from .application_decision_components_soil_update import ( + update_application_decision_component_soil_details, +) diff --git a/bin/migrate-oats-data/applications/migrate_application.py b/bin/migrate-oats-data/applications/migrate_application.py index fdfe2e6cb3..edad7f8ccd 100644 --- a/bin/migrate-oats-data/applications/migrate_application.py +++ b/bin/migrate-oats-data/applications/migrate_application.py @@ -9,7 +9,7 @@ process_application_owners, clean_primary_contacts, insert_application_submission_review, - clean_reviews + clean_reviews, ) from .base_applications import process_applications, clean_applications from .app_prep import process_alcs_application_prep_fields @@ -22,7 +22,13 @@ process_app_staff_journal, clean_application_staff_journal, ) -from .decisions import clean_application_decisions, init_application_decisions +from .decisions import ( + clean_application_decisions, + init_application_decisions, + clean_application_decision_components, + init_application_decision_components, + update_application_decision_component_soil_details, +) from .decisions.app_modifications import ( init_application_modifications, clean_application_modifications, @@ -64,9 +70,12 @@ def process_application_decisions(batch_size): init_application_modifications(batch_size) update_application_modifications(batch_size) link_application_modifications(batch_size) + init_application_decision_components(batch_size) + update_application_decision_component_soil_details(batch_size) def clean_application_decisions_etl(): + clean_application_decision_components() unlink_application_modifications() clean_application_modifications() clean_application_decisions() From ab393d4e6cd001fc92db65f8f23932beb58124e0 Mon Sep 17 00:00:00 2001 From: Liam Stoddard <lstodd@protonmail.com> Date: Tue, 9 Jan 2024 18:56:23 -0800 Subject: [PATCH 910/954] fixed errors still chasing a single soil entry --- .../application_decision_components_init.py | 28 +++++++++++-------- 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/bin/migrate-oats-data/applications/decisions/app_components/application_decision_components_init.py b/bin/migrate-oats-data/applications/decisions/app_components/application_decision_components_init.py index 97fc1d2cdf..09c2afd8c2 100644 --- a/bin/migrate-oats-data/applications/decisions/app_components/application_decision_components_init.py +++ b/bin/migrate-oats-data/applications/decisions/app_components/application_decision_components_init.py @@ -46,8 +46,6 @@ def init_application_decision_components(conn=None, batch_size=BATCH_UPLOAD_SIZE successful_inserts_count = 0 last_decision_component_id = 0 - tmp_counter = 0 - with open( "applications/decisions/sql/components/application_decision_components_insert.sql", "r", @@ -135,10 +133,10 @@ def _get_insert_query(): %(application_decision_component_type_code)s, %(application_decision_uuid)s, %(alr_appl_component_id)s, - %(naru_type_code), - %(nfu_sub_type), - %(nfu_type), - %(applicant_type) + %(naru_type_code)s, + %(nonfarm_use_subtype_code)s, + %(nonfarm_use_type_code)s, + %(applicant_type)s ) ON CONFLICT DO NOTHING; -- there are no components on prod @@ -178,6 +176,10 @@ def _prepare_oats_alr_applications_data(row_data_list): ), "application_decision_uuid": row.get("decision_uuid"), "alr_appl_component_id": row.get("component_id"), + "naru_type_code": None, + "nonfarm_use_subtype_code": None, + "nonfarm_use_type_code": None, + "applicant_type": None, } data_list.append(mapped_row) @@ -204,6 +206,7 @@ def _prepare_oats_alr_applications_data(row_data_list): "alr_area": row.get("component_area"), "audit_created_by": OATS_ETL_USER, "end_date": nfu_end_date, + "end_date2": None, "expiry_date": add_timezone_and_keep_date_part( row.get("decision_expiry_date") ), @@ -326,19 +329,20 @@ def _map_oats_to_alcs_nfu_subtypes(nfu_type_code, nfu_subtype_code): def _map_legislation_to_applicant_type(row): - if row["legislation_code"]: + if row.get("legislation_code"): row["legislation_code"] = str( OatsLegislationCodes[row["legislation_code"]].value ) - return row["legislation_code"] + return row.get("legislation_code") def _map_naru_subtype(row): - row["rsdntl_use_type_code"] = str( - OatsToAlcsNaruType[row["rsdntl_use_type_code"]].value - ) - return row["rsdntl_use_type_code"] + if row.get("rsdntl_use_type_code"): + row["rsdntl_use_type_code"] = str( + OatsToAlcsNaruType[row["rsdntl_use_type_code"]].value + ) + return row.get("rsdntl_use_type_code") def _map_end_date(row): From 29fb4646a7ddf76523ac25cd26317e5b741dc45b Mon Sep 17 00:00:00 2001 From: Liam Stoddard <lstodd@protonmail.com> Date: Tue, 9 Jan 2024 19:04:52 -0800 Subject: [PATCH 911/954] found lost id by using soil element id instead --- .../application_decision_components_soil_update.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/migrate-oats-data/applications/decisions/app_components/application_decision_components_soil_update.py b/bin/migrate-oats-data/applications/decisions/app_components/application_decision_components_soil_update.py index c9776996fd..d2f7c9c378 100644 --- a/bin/migrate-oats-data/applications/decisions/app_components/application_decision_components_soil_update.py +++ b/bin/migrate-oats-data/applications/decisions/app_components/application_decision_components_soil_update.py @@ -50,7 +50,7 @@ def update_application_decision_component_soil_details( while True: cursor.execute( f"""{query} - WHERE appdc.oats_alr_appl_component_id > {last_component_id} ORDER BY appdc.oats_alr_appl_component_id;""" + WHERE osce.soil_change_element_id > {last_component_id} ORDER BY osce.soil_change_element_id;""" ) rows = cursor.fetchmany(batch_size) @@ -65,10 +65,10 @@ def update_application_decision_component_soil_details( successful_updates_count = ( successful_updates_count + components_to_be_updated_count ) - last_component_id = dict(rows[-1])["oats_alr_appl_component_id"] + last_component_id = dict(rows[-1])["soil_change_element_id"] logger.debug( - f"retrieved/updated items count: {components_to_be_updated_count}; total successfully update application_decision_components so far {successful_updates_count}; last updated oats_alr_appl_component_id: {last_component_id}" + f"retrieved/updated items count: {components_to_be_updated_count}; total successfully update application_decision_components so far {successful_updates_count}; last updated soil_change_element_id: {last_component_id}" ) except Exception as err: logger.exception(err) From c7f88dc1bda52f71ffe2e71d023046fe4b1b195a Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Wed, 10 Jan 2024 12:37:03 -0800 Subject: [PATCH 912/954] Fix owner list showing when L/FNG contact selected --- .../primary-contact/primary-contact.component.html | 2 +- .../primary-contact/primary-contact.component.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html index 6827e5c6e7..41e15fe1c2 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html @@ -38,7 +38,7 @@ <h2>Primary Contact</h2> </div> <!-- Existing owner --> - <div class="form-row" *ngIf="selectedThirdPartyAgent === false"> + <div class="form-row" *ngIf="!selectedThirdPartyAgent && !selectedLocalGovernment"> <div class="full-row"> <label *ngIf="parcelOwners.length > 0" >Select a Primary Contact from the listed land owners diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html index 4c87b4ba64..ff640b608d 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html @@ -39,7 +39,7 @@ <h2>Primary Contact</h2> </div> <!-- Existing owner --> - <div class="form-row" *ngIf="selectedThirdPartyAgent === false"> + <div class="form-row" *ngIf="!selectedThirdPartyAgent && !selectedLocalGovernment"> <div class="full-row"> <label *ngIf="parcelOwners.length > 0" >Select a Primary Contact from the listed land owners From 120792a402890eac014139c4f40a0bd903e5e485 Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Wed, 10 Jan 2024 12:39:32 -0800 Subject: [PATCH 913/954] Increase spacing between step description and form --- .../primary-contact/primary-contact.component.html | 2 ++ .../primary-contact/primary-contact.component.html | 2 ++ 2 files changed, 4 insertions(+) diff --git a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html index 41e15fe1c2..2acf60724f 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html @@ -9,7 +9,9 @@ <h2>Primary Contact</h2> </div> <div><p>*All fields are required unless stated optional or disabled.</p></div> </div> +</section> +<section> <div class="agent-form"> <form [formGroup]="form"> <div class="form-row"> diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html index ff640b608d..85507b2efe 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html @@ -9,7 +9,9 @@ <h2>Primary Contact</h2> </div> <div><p>*All fields are required unless stated optional or disabled.</p></div> </div> +</section> +<section> <div class="agent-form"> <form [formGroup]="form"> <div class="form-row"> From 08ebc6ff76a47b4aeb69cf83b532108813df6c2d Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Wed, 10 Jan 2024 13:10:20 -0800 Subject: [PATCH 914/954] Conditionally add error class to radio buttons --- .../primary-contact/primary-contact.component.html | 8 +++++++- .../primary-contact/primary-contact.component.html | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html index 2acf60724f..6002ef5747 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html @@ -46,7 +46,13 @@ <h2>Primary Contact</h2> >Select a Primary Contact from the listed land owners <ng-container *ngIf="hasCrownParcels">and government contacts</ng-container></label > - <mat-radio-group [formControl]="ownersList" color="primary" (change)="onSelectOwner($event.value)" required> + <mat-radio-group + [formControl]="ownersList" + color="primary" + (change)="onSelectOwner($event.value)" + required + [ngClass]="{ error: ownersList.invalid && (ownersList.dirty || ownersList.touched) }" + > <mat-radio-button *ngFor="let owner of parcelOwners" [value]="owner.uuid" class="radio-option" required> {{ owner.firstName }} {{ owner.lastName }} </mat-radio-button> diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html index 85507b2efe..58c7013cb1 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html @@ -48,7 +48,13 @@ <h2>Primary Contact</h2> <ng-container *ngIf="hasCrownParcels">and government contacts</ng-container></label > - <mat-radio-group [formControl]="ownersList" color="primary" (change)="onSelectOwner($event.value)" required> + <mat-radio-group + [formControl]="ownersList" + color="primary" + (change)="onSelectOwner($event.value)" + required + [ngClass]="{ error: ownersList.invalid && (ownersList.dirty || ownersList.touched) }" + > <mat-radio-button *ngFor="let owner of parcelOwners" [value]="owner.uuid" class="radio-option" required> {{ owner.firstName }} {{ owner.lastName }} </mat-radio-button> From 02d8149dcf59557edc0ffe26972577e3e3c1fa8f Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Wed, 10 Jan 2024 13:29:33 -0800 Subject: [PATCH 915/954] Make sure to mark owners list as touched on errors --- .../edit-submission/primary-contact/primary-contact.component.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts index 7882e8524a..e5e452d08c 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts @@ -257,6 +257,7 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni if (this.showErrors) { this.form.markAllAsTouched(); + this.ownersList.markAsTouched(); } this.isDirty = false; this.calculateLetterRequired(); From 5805f66e6afbe6aaf8062db176adda60a7f2e027 Mon Sep 17 00:00:00 2001 From: "to. sandra" <76515860+sandratoh@users.noreply.github.com> Date: Wed, 10 Jan 2024 13:46:21 -0800 Subject: [PATCH 916/954] Add read first panel to all app proposals and fix pfrs error UI (#1282) * Add commissioner purpose panel to all application proposals * Fix validation UI issue with pfrs durations --- .../proposal/cove-proposal/cove-proposal.component.html | 1 + .../proposal/excl-proposal/excl-proposal.component.html | 1 + .../proposal/incl-proposal/incl-proposal.component.html | 1 + .../proposal/naru-proposal/naru-proposal.component.html | 1 + .../proposal/nfu-proposal/nfu-proposal.component.html | 1 + .../proposal/pfrs-proposal/pfrs-proposal.component.html | 4 ++-- .../proposal/subd-proposal/subd-proposal.component.html | 1 + .../proposal/tur-proposal/tur-proposal.component.html | 1 + 8 files changed, 9 insertions(+), 2 deletions(-) diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/cove-proposal/cove-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/cove-proposal/cove-proposal.component.html index 717a8b8163..7770759a1a 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/cove-proposal/cove-proposal.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/cove-proposal/cove-proposal.component.html @@ -5,6 +5,7 @@ <h2>Proposal</h2> <a> Section 6 of the ALC Act. </a> </p> <p>*All fields are required unless stated optional or disabled.</p> + <app-commission-purposes-panel></app-commission-purposes-panel> </div> <app-warning-banner> Please consult the ' diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/excl-proposal/excl-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/excl-proposal/excl-proposal.component.html index 9c2c6988cd..bc50a90085 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/excl-proposal/excl-proposal.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/excl-proposal/excl-proposal.component.html @@ -5,6 +5,7 @@ <h2>Proposal</h2> <a> Section 6 of the ALC Act. </a> </p> <p>*All fields are required unless stated optional or disabled.</p> + <app-commission-purposes-panel></app-commission-purposes-panel> </div> <app-warning-banner> Please consult the ' diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/incl-proposal/incl-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/incl-proposal/incl-proposal.component.html index 2a2b027a9e..376614ce1f 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/incl-proposal/incl-proposal.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/incl-proposal/incl-proposal.component.html @@ -5,6 +5,7 @@ <h2>Proposal</h2> <a> Section 6 of the ALC Act. </a> </p> <p>*All fields are required unless stated optional or disabled.</p> + <app-commission-purposes-panel></app-commission-purposes-panel> </div> <app-warning-banner> Please consult the ' diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.html index 2f34901a94..85a47b4b19 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.html @@ -5,6 +5,7 @@ <h2>Proposal</h2> <a> Section 6 of the ALC Act. </a> </p> <p>*All fields are required unless stated optional or disabled.</p> + <app-commission-purposes-panel></app-commission-purposes-panel> </div> <app-warning-banner> Please consult the ' diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/nfu-proposal/nfu-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/nfu-proposal/nfu-proposal.component.html index 4a32eca69c..7c9871d8ae 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/nfu-proposal/nfu-proposal.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/nfu-proposal/nfu-proposal.component.html @@ -5,6 +5,7 @@ <h2>Proposal</h2> <a> Section 6 of the ALC Act. </a> </p> <p>*All fields are required unless stated optional or disabled.</p> + <app-commission-purposes-panel></app-commission-purposes-panel> </div> <app-warning-banner> Please consult the ' diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.html index 8f07c394b9..9d3cbcf0ef 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.html @@ -109,8 +109,8 @@ <h2>Proposal</h2> > <mat-icon>warning</mat-icon> <div *ngIf="fillProjectDuration.errors?.['required']">This field is required</div> - <mat-hint class="subtext">Example: 30 years; or 3 months; or 5 days</mat-hint> </div> + <mat-hint class="subtext">Example: 30 years; or 3 months; or 5 days</mat-hint> </div> <div> @@ -130,8 +130,8 @@ <h2>Proposal</h2> > <mat-icon>warning</mat-icon> <div *ngIf="soilProjectDuration.errors?.['required']">This field is required</div> - <mat-hint class="subtext">Example: 30 years; or 3 months; or 5 days</mat-hint> </div> + <mat-hint class="subtext">Example: 30 years; or 3 months; or 5 days</mat-hint> </div> </div> diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.html index 77efb1e674..9e11c585d4 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.html @@ -5,6 +5,7 @@ <h2>Proposal</h2> <a> Section 6 of the ALC Act. </a> </p> <p>*All fields are required unless stated optional or disabled.</p> + <app-commission-purposes-panel></app-commission-purposes-panel> <div class="step-documents"> <h6>Documents needed for this step:</h6> <ul> diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/tur-proposal/tur-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/tur-proposal/tur-proposal.component.html index 4a8b3e3b96..6ede2cbf36 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/tur-proposal/tur-proposal.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/tur-proposal/tur-proposal.component.html @@ -5,6 +5,7 @@ <h2>Proposal</h2> <a> Section 6 of the ALC Act. </a> </p> <p>*All fields are required unless stated optional or disabled.</p> + <app-commission-purposes-panel></app-commission-purposes-panel> <div class="step-documents"> <h6>Documents needed for this step:</h6> <ul> From 67e03f4a7f0ec653f8756fcbef3809ecc92571b4 Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Wed, 10 Jan 2024 13:48:42 -0800 Subject: [PATCH 917/954] Feature/alcs 1330 etl hide from portal (#1275) set hide_from_portal on notice of intent set hide_from_portal on application move users ETL into separate folder --- .../applications/__init__.py | 4 ++ .../application_reconsiderations_link.py | 7 +-- .../application_reconsiderations_update.py | 3 +- .../applications/migrate_application.py | 5 +- .../set_hide_from_portal_on_application.py | 48 +++++++++++++++++++ bin/migrate-oats-data/common/__init__.py | 1 - .../menu/commands/applications.py | 2 +- .../menu/commands/clean_all.py | 2 +- .../menu/commands/import_all.py | 2 +- .../menu/commands/notice_of_intents.py | 3 +- bin/migrate-oats-data/menu/commands/users.py | 3 +- bin/migrate-oats-data/noi/__init__.py | 1 + .../noi/notice_of_intent_migration.py | 4 ++ .../noi/set_hide_from_portal_on_noi.py | 48 +++++++++++++++++++ bin/migrate-oats-data/users/__init__.py | 1 + .../{common => users}/alcs_init_users.py | 0 16 files changed, 120 insertions(+), 14 deletions(-) create mode 100644 bin/migrate-oats-data/applications/set_hide_from_portal_on_application.py create mode 100644 bin/migrate-oats-data/noi/set_hide_from_portal_on_noi.py create mode 100644 bin/migrate-oats-data/users/__init__.py rename bin/migrate-oats-data/{common => users}/alcs_init_users.py (100%) diff --git a/bin/migrate-oats-data/applications/__init__.py b/bin/migrate-oats-data/applications/__init__.py index 4e895bc490..c4deade59c 100644 --- a/bin/migrate-oats-data/applications/__init__.py +++ b/bin/migrate-oats-data/applications/__init__.py @@ -8,3 +8,7 @@ clean_alcs_applications, init_applications, ) + +from .set_hide_from_portal_on_application import ( + set_hide_from_portal_on_application, +) diff --git a/bin/migrate-oats-data/applications/decisions/app_reconsiderations/application_reconsiderations_link.py b/bin/migrate-oats-data/applications/decisions/app_reconsiderations/application_reconsiderations_link.py index 31b4c008a1..fa11aacc27 100644 --- a/bin/migrate-oats-data/applications/decisions/app_reconsiderations/application_reconsiderations_link.py +++ b/bin/migrate-oats-data/applications/decisions/app_reconsiderations/application_reconsiderations_link.py @@ -1,7 +1,4 @@ -from common import ( - OATS_ETL_USER, - setup_and_get_logger, -) +from common import OATS_ETL_USER, setup_and_get_logger, BATCH_UPLOAD_SIZE from db import inject_conn_pool from psycopg2.extras import RealDictCursor, execute_batch @@ -10,7 +7,7 @@ @inject_conn_pool -def link_application_reconsiderations(conn=None, batch_size=1000): +def link_application_reconsiderations(conn=None, batch_size=BATCH_UPLOAD_SIZE): """ This function is responsible for linking application_reconsideration to application_decisions in ALCS. diff --git a/bin/migrate-oats-data/applications/decisions/app_reconsiderations/application_reconsiderations_update.py b/bin/migrate-oats-data/applications/decisions/app_reconsiderations/application_reconsiderations_update.py index ce35fa5509..d51f9f6981 100644 --- a/bin/migrate-oats-data/applications/decisions/app_reconsiderations/application_reconsiderations_update.py +++ b/bin/migrate-oats-data/applications/decisions/app_reconsiderations/application_reconsiderations_update.py @@ -2,6 +2,7 @@ setup_and_get_logger, add_timezone_and_keep_date_part, AlcsAppReconsiderationOutcomeCodeEnum, + BATCH_UPLOAD_SIZE, ) from db import inject_conn_pool from psycopg2.extras import RealDictCursor, execute_batch @@ -11,7 +12,7 @@ @inject_conn_pool -def update_application_reconsiderations(conn=None, batch_size=1000): +def update_application_reconsiderations(conn=None, batch_size=BATCH_UPLOAD_SIZE): """ This function is responsible for updating existing application_reconsideration in ALCS. diff --git a/bin/migrate-oats-data/applications/migrate_application.py b/bin/migrate-oats-data/applications/migrate_application.py index 9fff57e1b9..ab54783d42 100644 --- a/bin/migrate-oats-data/applications/migrate_application.py +++ b/bin/migrate-oats-data/applications/migrate_application.py @@ -9,7 +9,7 @@ process_application_owners, clean_primary_contacts, insert_application_submission_review, - clean_reviews + clean_reviews, ) from .base_applications import process_applications, clean_applications from .app_prep import process_alcs_application_prep_fields @@ -34,6 +34,8 @@ update_application_reconsiderations, ) +from .set_hide_from_portal_on_application import set_hide_from_portal_on_application + def process_application_etl(batch_size): process_alcs_application_prep_fields(batch_size) @@ -45,6 +47,7 @@ def process_application_etl(batch_size): process_application_owners(batch_size) process_app_staff_journal(batch_size) process_application_decisions(batch_size) + set_hide_from_portal_on_application() process_application_submission_status_emails() diff --git a/bin/migrate-oats-data/applications/set_hide_from_portal_on_application.py b/bin/migrate-oats-data/applications/set_hide_from_portal_on_application.py new file mode 100644 index 0000000000..60fdfc6a31 --- /dev/null +++ b/bin/migrate-oats-data/applications/set_hide_from_portal_on_application.py @@ -0,0 +1,48 @@ +from common import setup_and_get_logger +from db import inject_conn_pool +from psycopg2.extras import RealDictCursor + + +etl_name = "set_hide_from_portal_on_application" +logger = setup_and_get_logger(etl_name) + + +@inject_conn_pool +def set_hide_from_portal_on_application(conn=None): + """ + This function is responsible for setting hide_from_portal colum on application table where oats.who_create is not PROXY user + + Args: + conn (psycopg2.extensions.connection): PostgreSQL database connection. Provided by the decorator. + """ + logger.info(f"Start {etl_name}") + + try: + with conn.cursor(cursor_factory=RealDictCursor) as cursor: + count_query = f""" + SELECT count(*) FROM oats.oats_alr_applications oaa + JOIN alcs.application a ON a.file_number = oaa.alr_application_id::TEXT + WHERE oaa.who_created <> 'PROXY_OATS_APPLICANT'; + """ + cursor.execute(count_query) + count_total = dict(cursor.fetchone())["count"] + logger.info(f"Total application to set hide_from_portal: {count_total}") + + update_query = f""" + UPDATE alcs.application AS app + SET hide_from_portal = TRUE + FROM oats.oats_alr_applications AS oaa + WHERE app.file_number = oaa.alr_application_id::TEXT + AND oaa.who_created <> 'PROXY_OATS_APPLICANT'; + """ + cursor.execute(update_query) + logger.info( + f"Total hide_from_portal flag on applications updated: {cursor.rowcount}" + ) + conn.commit() + except Exception as err: + logger.exception(err) + cursor.close() + conn.close() + + logger.info(f"Finished {etl_name}") diff --git a/bin/migrate-oats-data/common/__init__.py b/bin/migrate-oats-data/common/__init__.py index 044f23f84a..ff9e006bc3 100644 --- a/bin/migrate-oats-data/common/__init__.py +++ b/bin/migrate-oats-data/common/__init__.py @@ -9,5 +9,4 @@ from .oats_to_alcs_naru_code_enum import * from .oats_temp_tables import * from .oats_to_alcs_parcel_enum import * -from .alcs_init_users import * from .oats_decision_enum import * diff --git a/bin/migrate-oats-data/menu/commands/applications.py b/bin/migrate-oats-data/menu/commands/applications.py index d9a8df3981..f8f25276b4 100644 --- a/bin/migrate-oats-data/menu/commands/applications.py +++ b/bin/migrate-oats-data/menu/commands/applications.py @@ -3,7 +3,7 @@ clean_alcs_applications, init_applications, ) -from common.alcs_init_users import init_alcs_users +from users.alcs_init_users import init_alcs_users def application_import(console, args): diff --git a/bin/migrate-oats-data/menu/commands/clean_all.py b/bin/migrate-oats-data/menu/commands/clean_all.py index 31d65a9431..2a1af6ca1a 100644 --- a/bin/migrate-oats-data/menu/commands/clean_all.py +++ b/bin/migrate-oats-data/menu/commands/clean_all.py @@ -9,7 +9,7 @@ from noi.noi_submission_status_email import ( clean_notice_of_intent_submission_status_emails, ) -from common.alcs_init_users import clean_users +from users.alcs_init_users import clean_users from documents import ( clean_application_documents, clean_documents, diff --git a/bin/migrate-oats-data/menu/commands/import_all.py b/bin/migrate-oats-data/menu/commands/import_all.py index af298a4355..3b26b71adc 100644 --- a/bin/migrate-oats-data/menu/commands/import_all.py +++ b/bin/migrate-oats-data/menu/commands/import_all.py @@ -12,7 +12,7 @@ from noi import ( process_notice_of_intent, ) -from common.alcs_init_users import init_alcs_users +from users.alcs_init_users import init_alcs_users from documents import ( import_oats_noi_documents, import_oats_app_documents, diff --git a/bin/migrate-oats-data/menu/commands/notice_of_intents.py b/bin/migrate-oats-data/menu/commands/notice_of_intents.py index b982c5690a..46fd748de8 100644 --- a/bin/migrate-oats-data/menu/commands/notice_of_intents.py +++ b/bin/migrate-oats-data/menu/commands/notice_of_intents.py @@ -3,7 +3,8 @@ process_notice_of_intent, clean_notice_of_intent, ) -from common import setup_and_get_logger, init_alcs_users +from common import setup_and_get_logger +from users import init_alcs_users logger = setup_and_get_logger("noi_import") diff --git a/bin/migrate-oats-data/menu/commands/users.py b/bin/migrate-oats-data/menu/commands/users.py index 1c3d0de2dd..ff87e6d072 100644 --- a/bin/migrate-oats-data/menu/commands/users.py +++ b/bin/migrate-oats-data/menu/commands/users.py @@ -1,6 +1,5 @@ -from common import init_alcs_users, clean_users - from common import setup_and_get_logger +from users import init_alcs_users, clean_users logger = setup_and_get_logger("user_import") diff --git a/bin/migrate-oats-data/noi/__init__.py b/bin/migrate-oats-data/noi/__init__.py index 9348bb9dcd..17d9fc895c 100644 --- a/bin/migrate-oats-data/noi/__init__.py +++ b/bin/migrate-oats-data/noi/__init__.py @@ -1,2 +1,3 @@ from .notice_of_intent_init import init_notice_of_intents, clean_notice_of_intents from .notice_of_intent_migration import process_notice_of_intent +from .set_hide_from_portal_on_noi import set_hide_from_portal_on_notice_of_intent diff --git a/bin/migrate-oats-data/noi/notice_of_intent_migration.py b/bin/migrate-oats-data/noi/notice_of_intent_migration.py index 0096549518..93cf8f3fe2 100644 --- a/bin/migrate-oats-data/noi/notice_of_intent_migration.py +++ b/bin/migrate-oats-data/noi/notice_of_intent_migration.py @@ -80,6 +80,8 @@ clean_notice_of_intent_conditions_to_components, ) +from .set_hide_from_portal_on_noi import set_hide_from_portal_on_notice_of_intent + def init_notice_of_intent(batch_size): init_notice_of_intents(batch_size=batch_size) @@ -171,5 +173,7 @@ def process_notice_of_intent(batch_size): process_notice_of_intent_decisions(batch_size) + set_hide_from_portal_on_notice_of_intent() + # this script must be the last one process_notice_of_intent_submission_status_emails() diff --git a/bin/migrate-oats-data/noi/set_hide_from_portal_on_noi.py b/bin/migrate-oats-data/noi/set_hide_from_portal_on_noi.py new file mode 100644 index 0000000000..2e45514cc7 --- /dev/null +++ b/bin/migrate-oats-data/noi/set_hide_from_portal_on_noi.py @@ -0,0 +1,48 @@ +from common import setup_and_get_logger +from db import inject_conn_pool +from psycopg2.extras import RealDictCursor + + +etl_name = "set_hide_from_portal_on_notice_of_intent" +logger = setup_and_get_logger(etl_name) + + +@inject_conn_pool +def set_hide_from_portal_on_notice_of_intent(conn=None): + """ + This function is responsible for setting hide_from_portal colum on notice_of_intent table where oats.who_create is not PROXY user + + Args: + conn (psycopg2.extensions.connection): PostgreSQL database connection. Provided by the decorator. + """ + logger.info(f"Start {etl_name}") + + try: + with conn.cursor(cursor_factory=RealDictCursor) as cursor: + count_query = f""" + SELECT count(*) FROM oats.oats_alr_applications oaa + JOIN alcs.notice_of_intent a ON a.file_number = oaa.alr_application_id::TEXT + WHERE oaa.who_created <> 'PROXY_OATS_APPLICANT'; + """ + cursor.execute(count_query) + count_total = dict(cursor.fetchone())["count"] + logger.info(f"Total application to set hide_from_portal: {count_total}") + + update_query = f""" + UPDATE alcs.notice_of_intent AS noi + SET hide_from_portal = TRUE + FROM oats.oats_alr_applications AS oaa + WHERE noi.file_number = oaa.alr_application_id::TEXT + AND oaa.who_created <> 'PROXY_OATS_APPLICANT'; + """ + cursor.execute(update_query) + logger.info( + f"Total hide_from_portal flag on notifications updated: {cursor.rowcount}" + ) + conn.commit() + except Exception as err: + logger.exception(err) + cursor.close() + conn.close() + + logger.info(f"Finished {etl_name}") diff --git a/bin/migrate-oats-data/users/__init__.py b/bin/migrate-oats-data/users/__init__.py new file mode 100644 index 0000000000..2fa131847e --- /dev/null +++ b/bin/migrate-oats-data/users/__init__.py @@ -0,0 +1 @@ +from .alcs_init_users import init_alcs_users, clean_users diff --git a/bin/migrate-oats-data/common/alcs_init_users.py b/bin/migrate-oats-data/users/alcs_init_users.py similarity index 100% rename from bin/migrate-oats-data/common/alcs_init_users.py rename to bin/migrate-oats-data/users/alcs_init_users.py From fb072971729e890d78b5c79831f64ab9b94a1905 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Wed, 10 Jan 2024 15:08:40 -0800 Subject: [PATCH 918/954] Prevent creating v1 cards * Remove App and NOI creation from all boards * Hide in Admin UI for Create --- .../board-management-dialog.component.ts | 6 ++++-- .../1704920088781-disable_v1_create_cards.ts | 13 +++++++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1704920088781-disable_v1_create_cards.ts diff --git a/alcs-frontend/src/app/features/admin/board-management/board-management-dialog/board-management-dialog.component.ts b/alcs-frontend/src/app/features/admin/board-management/board-management-dialog/board-management-dialog.component.ts index c899c75e6e..b1a283a2ec 100644 --- a/alcs-frontend/src/app/features/admin/board-management/board-management-dialog/board-management-dialog.component.ts +++ b/alcs-frontend/src/app/features/admin/board-management/board-management-dialog/board-management-dialog.component.ts @@ -11,6 +11,8 @@ import { CardStatusService } from '../../../../services/card/card-status/card-st import { CardType } from '../../../../shared/card/card.component'; import { BaseCodeDto } from '../../../../shared/dto/base.dto'; +const DISABLED_CREATE_CARD_TYPES = [CardType.APP, CardType.COV, CardType.NOI]; + @Component({ selector: 'app-decision-condition-types-dialog', templateUrl: './board-management-dialog.component.html', @@ -54,7 +56,7 @@ export class BoardManagementDialogComponent implements OnInit { private cardStatusService: CardStatusService, private adminBoardManagementService: AdminBoardManagementService, private formBuilder: FormBuilder, - private boardService: BoardService + private boardService: BoardService, ) { if (data.board) { this.isEdit = true; @@ -98,7 +100,7 @@ export class BoardManagementDialogComponent implements OnInit { this.step++; //We don't support creating Notifications this.allowedCreateCardTypes = (this.permittedCardTypes.value ?? []).filter( - (cardType) => cardType !== CardType.NOTIFICATION + (cardType) => !DISABLED_CREATE_CARD_TYPES.includes(cardType), ); } diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1704920088781-disable_v1_create_cards.ts b/services/apps/alcs/src/providers/typeorm/migrations/1704920088781-disable_v1_create_cards.ts new file mode 100644 index 0000000000..ce704e50f5 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1704920088781-disable_v1_create_cards.ts @@ -0,0 +1,13 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class DisableV1CreateCards1704920088781 implements MigrationInterface { + public async up(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query(` + DELETE FROM "alcs"."board_create_card_types_card_type" WHERE "card_type_code" IN ('NOI', 'APP'); + `); + } + + public async down(): Promise<void> { + //No + } +} From bacb223d406a0f65b69a6667a716da3e53991582 Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Wed, 10 Jan 2024 15:35:13 -0800 Subject: [PATCH 919/954] Remove extraneous divs from step description --- .../primary-contact/primary-contact.component.html | 12 +++++------- .../primary-contact/primary-contact.component.html | 12 +++++------- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html index 6002ef5747..1d148ec977 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html @@ -1,13 +1,11 @@ <section> <div class="step-description"> <h2>Primary Contact</h2> - <div> - <p> - The primary contact becomes the single point of contact and must ensure that landowners are notified of all - information exchanged between the primary contact, local or First Nation government, and the ALC. - </p> - </div> - <div><p>*All fields are required unless stated optional or disabled.</p></div> + <p> + The primary contact becomes the single point of contact and must ensure that landowners are notified of all + information exchanged between the primary contact, local or First Nation government, and the ALC. + </p> + <p>*All fields are required unless stated optional or disabled.</p> </div> </section> diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html index 58c7013cb1..a4f4b6fdff 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html @@ -1,13 +1,11 @@ <section> <div class="step-description"> <h2>Primary Contact</h2> - <div> - <p> - The primary contact becomes the single point of contact and must ensure that landowners are notified of all - information exchanged between the primary contact, local or First Nation government, and the ALC. - </p> - </div> - <div><p>*All fields are required unless stated optional or disabled.</p></div> + <p> + The primary contact becomes the single point of contact and must ensure that landowners are notified of all + information exchanged between the primary contact, local or First Nation government, and the ALC. + </p> + <p>*All fields are required unless stated optional or disabled.</p> </div> </section> From c14c8a69682f69db726b5e1fdeeacbc92ef00d9f Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Thu, 11 Jan 2024 08:36:38 -0800 Subject: [PATCH 920/954] Code review feedback --- .../board-management-dialog.component.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/alcs-frontend/src/app/features/admin/board-management/board-management-dialog/board-management-dialog.component.ts b/alcs-frontend/src/app/features/admin/board-management/board-management-dialog/board-management-dialog.component.ts index b1a283a2ec..b84363054a 100644 --- a/alcs-frontend/src/app/features/admin/board-management/board-management-dialog/board-management-dialog.component.ts +++ b/alcs-frontend/src/app/features/admin/board-management/board-management-dialog/board-management-dialog.component.ts @@ -11,7 +11,7 @@ import { CardStatusService } from '../../../../services/card/card-status/card-st import { CardType } from '../../../../shared/card/card.component'; import { BaseCodeDto } from '../../../../shared/dto/base.dto'; -const DISABLED_CREATE_CARD_TYPES = [CardType.APP, CardType.COV, CardType.NOI]; +const DISABLED_CREATE_CARD_TYPES = [CardType.APP, CardType.COV, CardType.NOI, CardType.NOTIFICATION]; @Component({ selector: 'app-decision-condition-types-dialog', @@ -98,7 +98,6 @@ export class BoardManagementDialogComponent implements OnInit { onNextStep() { this.step++; - //We don't support creating Notifications this.allowedCreateCardTypes = (this.permittedCardTypes.value ?? []).filter( (cardType) => !DISABLED_CREATE_CARD_TYPES.includes(cardType), ); From 404a6322a7b79688a192b96e64edd0744cdae9c5 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Thu, 11 Jan 2024 09:29:09 -0800 Subject: [PATCH 921/954] Update Links on all Proposal Components * Remove Fixme and put the real link in * Standardize wording of all sections * Remove consideration message * Update Step 6 of NOIs as well for the same message --- .../cove-proposal.component.html | 31 +++++++----- .../cove-proposal.component.scss | 4 ++ .../excl-proposal.component.html | 39 ++++++++++----- .../excl-proposal.component.scss | 4 ++ .../incl-proposal.component.html | 39 ++++++++++----- .../incl-proposal.component.scss | 4 ++ .../naru-proposal.component.html | 40 ++++++++++----- .../naru-proposal.component.scss | 4 ++ .../nfu-proposal/nfu-proposal.component.html | 31 +++++++----- .../nfu-proposal/nfu-proposal.component.scss | 4 ++ .../pfrs-proposal.component.html | 50 ++++++++++++++----- .../pfrs-proposal.component.scss | 4 ++ .../pofo-proposal.component.html | 38 ++++++++++---- .../pofo-proposal.component.scss | 4 ++ .../roso-proposal.component.html | 38 ++++++++++---- .../roso-proposal.component.scss | 4 ++ .../subd-proposal.component.html | 20 +++++--- .../subd-proposal.component.scss | 4 ++ .../tur-proposal/tur-proposal.component.html | 24 ++++++--- .../tur-proposal/tur-proposal.component.scss | 8 +-- .../additional-information.component.html | 12 ++--- .../additional-information.component.scss | 5 ++ .../pfrs/pfrs-proposal.component.html | 46 +++++++++++++---- .../pfrs/pfrs-proposal.component.scss | 4 ++ .../pofo/pofo-proposal.component.html | 38 ++++++++++---- .../pofo/pofo-proposal.component.scss | 4 ++ .../roso/roso-proposal.component.html | 46 +++++++++++++---- .../roso/roso-proposal.component.scss | 4 ++ 28 files changed, 407 insertions(+), 146 deletions(-) diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/cove-proposal/cove-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/cove-proposal/cove-proposal.component.html index 7770759a1a..408fe94daa 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/cove-proposal/cove-proposal.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/cove-proposal/cove-proposal.component.html @@ -1,21 +1,28 @@ <div class="step-description"> <h2>Proposal</h2> - <p> - Considerations are subject to - <a> Section 6 of the ALC Act. </a> - </p> <p>*All fields are required unless stated optional or disabled.</p> <app-commission-purposes-panel></app-commission-purposes-panel> </div> <app-warning-banner> - Please consult the ' - <a - href="https://www.alc.gov.bc.ca/application-and-notice-process/applications/what-the-commission-considers/" - target="_blank" - > - What the Commission Considers - </a> - ' page of the ALC website for more information. + In order to complete this step, please consult the following pages on the ALC website: + <ul class="steps-list"> + <li> + <a + href="https://www.alc.gov.bc.ca/application-and-notice-process/applications/what-the-commission-considers/" + target="_blank" + > + What the Commission Considers + </a> + </li> + <li> + <a + href="https://www.alc.gov.bc.ca/application-and-notice-process/applications/required-documents/#cov" + target="_blank" + > + Register a Restrictive Covenant within the ALR + </a> + </li> + </ul> </app-warning-banner> <section> <div class="split"> diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/cove-proposal/cove-proposal.component.scss b/portal-frontend/src/app/features/applications/edit-submission/proposal/cove-proposal/cove-proposal.component.scss index e9241c762a..9b4478422a 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/cove-proposal/cove-proposal.component.scss +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/cove-proposal/cove-proposal.component.scss @@ -1,6 +1,10 @@ @use '../../../../../../styles/functions' as *; @use '../../../../../../styles/colors'; +.steps-list { + margin: rem(16) 0; +} + .no-data { color: colors.$grey-dark; text-align: center; diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/excl-proposal/excl-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/excl-proposal/excl-proposal.component.html index bc50a90085..557e8c6833 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/excl-proposal/excl-proposal.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/excl-proposal/excl-proposal.component.html @@ -1,21 +1,28 @@ <div class="step-description"> <h2>Proposal</h2> - <p> - Considerations are subject to - <a> Section 6 of the ALC Act. </a> - </p> <p>*All fields are required unless stated optional or disabled.</p> <app-commission-purposes-panel></app-commission-purposes-panel> </div> <app-warning-banner> - Please consult the ' - <a - href="https://www.alc.gov.bc.ca/application-and-notice-process/applications/what-the-commission-considers/" - target="_blank" - > - What the Commission Considers - </a> - ' page of the ALC website for more information. + In order to complete this step, please consult the following pages on the ALC website: + <ul class="steps-list"> + <li> + <a + href="https://www.alc.gov.bc.ca/application-and-notice-process/applications/what-the-commission-considers/" + target="_blank" + > + What the Commission Considers + </a> + </li> + <li> + <a + href="https://www.alc.gov.bc.ca/application-and-notice-process/applications/required-documents/#exc" + target="_blank" + > + Exclusion + </a> + </li> + </ul> </app-warning-banner> <form [formGroup]="form"> <div class="form-row"> @@ -140,7 +147,13 @@ <h3>Notification and Public Hearing Requirements</h3> fields). </p> <app-info-banner> - Please refer to <a>FIXME: Exclusion</a> page on the ALC website for more information. + Please refer to + <a + target="_blank" + href="https://www.alc.gov.bc.ca/application-and-notice-process/applications/required-documents/#exc" + >Exclusion</a + > + page on the ALC website for more information. </app-info-banner> <button mat-flat-button color="accent">Download PDF</button> <app-warning-banner> diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/excl-proposal/excl-proposal.component.scss b/portal-frontend/src/app/features/applications/edit-submission/proposal/excl-proposal/excl-proposal.component.scss index 1a30448410..c319ac9045 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/excl-proposal/excl-proposal.component.scss +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/excl-proposal/excl-proposal.component.scss @@ -7,3 +7,7 @@ section { .requirement-description { margin: rem(8) 0 !important; } + +.steps-list { + margin: rem(16) 0; +} diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/incl-proposal/incl-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/incl-proposal/incl-proposal.component.html index 376614ce1f..fc4f8ff429 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/incl-proposal/incl-proposal.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/incl-proposal/incl-proposal.component.html @@ -1,21 +1,28 @@ <div class="step-description"> <h2>Proposal</h2> - <p> - Considerations are subject to - <a> Section 6 of the ALC Act. </a> - </p> <p>*All fields are required unless stated optional or disabled.</p> <app-commission-purposes-panel></app-commission-purposes-panel> </div> <app-warning-banner> - Please consult the ' - <a - href="https://www.alc.gov.bc.ca/application-and-notice-process/applications/what-the-commission-considers/" - target="_blank" - > - What the Commission Considers - </a> - ' page of the ALC website for more information. + In order to complete this step, please consult the following pages on the ALC website: + <ul class="steps-list"> + <li> + <a + href="https://www.alc.gov.bc.ca/application-and-notice-process/applications/what-the-commission-considers/" + target="_blank" + > + What the Commission Considers + </a> + </li> + <li> + <a + href="https://www.alc.gov.bc.ca/application-and-notice-process/applications/required-documents/#inc" + target="_blank" + > + Inclusion + </a> + </li> + </ul> </app-warning-banner> <form [formGroup]="form"> <div class="form-row"> @@ -131,7 +138,13 @@ <h2>Proposal</h2> inclusion application parcel(s) are owned by the {{ governmentName }}. </div> <app-info-banner> - Please refer to <a>FIXME: Inclusion</a> page on the ALC website for more information. + Please refer to + <a + href="https://www.alc.gov.bc.ca/application-and-notice-process/applications/required-documents/#inc" + target="_blank" + >Inclusion</a + > + page on the ALC website for more information. </app-info-banner> <mat-button-toggle-group (change)="onSelectLocalGovernmentParcelOwner($event)" diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/incl-proposal/incl-proposal.component.scss b/portal-frontend/src/app/features/applications/edit-submission/proposal/incl-proposal/incl-proposal.component.scss index 952b837267..398e6b3fb5 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/incl-proposal/incl-proposal.component.scss +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/incl-proposal/incl-proposal.component.scss @@ -4,6 +4,10 @@ section { margin-top: rem(32); } +.steps-list { + margin: rem(16) 0; +} + .requirement-description { margin: rem(8) 0 !important; } diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.html index 85a47b4b19..2d319ee6ca 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.html @@ -1,21 +1,28 @@ <div class="step-description"> <h2>Proposal</h2> - <p> - Considerations are subject to - <a> Section 6 of the ALC Act. </a> - </p> <p>*All fields are required unless stated optional or disabled.</p> <app-commission-purposes-panel></app-commission-purposes-panel> </div> <app-warning-banner> - Please consult the ' - <a - href="https://www.alc.gov.bc.ca/application-and-notice-process/applications/what-the-commission-considers/" - target="_blank" - > - What the Commission Considers - </a> - ' page of the ALC website for more information. + In order to complete this step, please consult the following pages on the ALC website: + <ul class="steps-list"> + <li> + <a + href="https://www.alc.gov.bc.ca/application-and-notice-process/applications/what-the-commission-considers/" + target="_blank" + > + What the Commission Considers + </a> + </li> + <li> + <a + href="https://www.alc.gov.bc.ca/application-and-notice-process/applications/required-documents/#naru" + target="_blank" + > + Non-Adhering Residential Use within the ALR</a + > + </li> + </ul> </app-warning-banner> <form [formGroup]="form"> <div class="form-row"> @@ -379,7 +386,14 @@ <h2>Proposal</h2> <label for="agriTourism"> Describe any agri-tourism that is currently taking place on the property. </label> <div class="subtext">Agri-tourism activities are defined in the Agricultural Land Reserve Use Regulation.</div> <app-info-banner> - Please refer to the <a>FIXME: Non-Adhering Residential</a> Use page on the ALC website for more information + Please refer to the + <a + href="https://www.alc.gov.bc.ca/application-and-notice-process/applications/required-documents/#naru" + target="_blank" + > + Non-Adhering Residential Use</a + > + page on the ALC website for more information </app-info-banner> <mat-form-field appearance="outline"> <textarea diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.scss b/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.scss index b3f3123a12..dafa0c82fd 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.scss +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.scss @@ -4,6 +4,10 @@ section { margin-top: rem(36); } +.steps-list { + margin: rem(16) 0; +} + .radio-group { display: flex; flex-direction: column; diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/nfu-proposal/nfu-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/nfu-proposal/nfu-proposal.component.html index 7c9871d8ae..45a39b296a 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/nfu-proposal/nfu-proposal.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/nfu-proposal/nfu-proposal.component.html @@ -1,21 +1,28 @@ <div class="step-description"> <h2>Proposal</h2> - <p> - Considerations are subject to - <a> Section 6 of the ALC Act. </a> - </p> <p>*All fields are required unless stated optional or disabled.</p> <app-commission-purposes-panel></app-commission-purposes-panel> </div> <app-warning-banner> - Please consult the ' - <a - href="https://www.alc.gov.bc.ca/application-and-notice-process/applications/what-the-commission-considers/" - target="_blank" - > - What the Commission Considers - </a> - ' page of the ALC website for more information. + In order to complete this step, please consult the following pages on the ALC website: + <ul class="steps-list"> + <li> + <a + href="https://www.alc.gov.bc.ca/application-and-notice-process/applications/what-the-commission-considers/" + target="_blank" + > + What the Commission Considers + </a> + </li> + <li> + <a + href="https://www.alc.gov.bc.ca/application-and-notice-process/applications/required-documents/#nfu" + target="_blank" + > + Non-Farm Uses within the ALR + </a> + </li> + </ul> </app-warning-banner> <form [formGroup]="form"> <div class="form-row"> diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/nfu-proposal/nfu-proposal.component.scss b/portal-frontend/src/app/features/applications/edit-submission/proposal/nfu-proposal/nfu-proposal.component.scss index 56caa68a82..a4d0e0cc50 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/nfu-proposal/nfu-proposal.component.scss +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/nfu-proposal/nfu-proposal.component.scss @@ -3,3 +3,7 @@ section { margin-top: rem(36); } + +.steps-list { + margin: rem(16) 0; +} diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.html index 9d3cbcf0ef..b0c2855a7f 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.html @@ -1,15 +1,11 @@ <div class="step-description"> <h2>Proposal</h2> - <p> - Considerations are subject to - <a> Section 6 of the ALC Act. </a> - </p> <p>All fields are required unless stated optional or disabled.</p> <app-commission-purposes-panel></app-commission-purposes-panel> </div> <app-warning-banner> In order to complete this step, please consult the following pages on the ALC website: - <ul> + <ul class="steps-list"> <li> <a href="https://www.alc.gov.bc.ca/application-and-notice-process/applications/what-the-commission-considers/" @@ -19,7 +15,11 @@ <h2>Proposal</h2> </a> </li> <li> - <a href="TODO" target="_blank">FIXME: Removal of Soil & Placement of Fill</a> + <a + href="https://www.alc.gov.bc.ca/application-and-notice-process/applications/required-documents/#pfrs" + target="_blank" + >Removal of Soil & Placement of Fill</a + > </li> </ul> </app-warning-banner> @@ -142,7 +142,15 @@ <h2>Proposal</h2> Commission will consider your proposal dimensions when determining the potential impact it will have on the agricultural capability of the land. </div> - <app-info-banner> Please refer to <a>FIXME: Contact Us</a> on the ALC website for more detail. </app-info-banner> + <app-info-banner> + Please refer to + <a + href="https://www.alc.gov.bc.ca/application-and-notice-process/applications/required-documents/#pfrs" + target="_blank" + >Removal of Soil & Placement of Fill</a + > + on the ALC website for more detail.</app-info-banner + > <app-soil-table *ngIf="!isMobile" tableHeader="Soil to be Removed" @@ -168,8 +176,8 @@ <h2>Proposal</h2> <div class="full-row"> <mat-label >Of the proposed totals provided above, please input the dimensions of soil that has already been removed or - fill already placed.</mat-label - > + fill already placed. + </mat-label> <app-soil-table *ngIf="!isMobile" tableHeader="Soil already Removed" @@ -312,7 +320,13 @@ <h2>Proposal</h2> <mat-label class="subheading2" for="cross-section">Cross Sections</mat-label> <div class="subtext">Include North-South and East-West cross sections</div> <app-info-banner> - Please refer to <a>FIXME: Removal of Soil & Placement of Fill</a> on the ALC website for more information + Please refer to + <a + href="https://www.alc.gov.bc.ca/application-and-notice-process/applications/required-documents/#pfrs" + target="_blank" + >Removal of Soil & Placement of Fill</a + > + on the ALC website for more information </app-info-banner> <app-file-drag-drop id="cross-section" @@ -333,7 +347,13 @@ <h2>Proposal</h2> agricultural capability assessment. </div> <app-info-banner> - Please refer to <a>FIXME: Removal of Soil & Placement of Fill</a> on the ALC website for more information + Please refer to + <a + href="https://www.alc.gov.bc.ca/application-and-notice-process/applications/required-documents/#pfrs" + target="_blank" + >Removal of Soil & Placement of Fill</a + > + on the ALC website for more information </app-info-banner> <app-file-drag-drop id="reclamation-plan" @@ -414,7 +434,13 @@ <h2>Proposal</h2> <div class="full-row"> <mat-label class="subheading2" for="noticeOfWork">Notice of Work</mat-label> <app-info-banner> - Please refer to <a>FIXME: Removal of Soil</a> on the ALC website for more information + Please refer to + <a + href="https://www.alc.gov.bc.ca/application-and-notice-process/applications/required-documents/#pfrs" + target="_blank" + >Removal of Soil & Placement of Fill</a + > + on the ALC website for more information </app-info-banner> <app-file-drag-drop id="noticeOfWork" diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.scss b/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.scss index 56caa68a82..a4d0e0cc50 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.scss +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.scss @@ -3,3 +3,7 @@ section { margin-top: rem(36); } + +.steps-list { + margin: rem(16) 0; +} diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.html index af509cb5d5..ed2e8b026d 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.html @@ -1,15 +1,11 @@ <div class="step-description"> <h2>Proposal</h2> - <p> - Considerations are subject to - <a> Section 6 of the ALC Act. </a> - </p> <p>All fields are required unless stated optional or disabled.</p> <app-commission-purposes-panel></app-commission-purposes-panel> </div> <app-warning-banner> In order to complete this step, please consult the following pages on the ALC website: - <ul> + <ul class="steps-list"> <li> <a href="https://www.alc.gov.bc.ca/application-and-notice-process/applications/what-the-commission-considers/" @@ -19,7 +15,11 @@ <h2>Proposal</h2> </a> </li> <li> - <a href="TODO" target="_blank">FIXME: Placement of Fill</a> + <a + href="https://www.alc.gov.bc.ca/application-and-notice-process/applications/required-documents/#pfrs" + target="_blank" + >Placement of Fill</a + > </li> </ul> </app-warning-banner> @@ -110,7 +110,15 @@ <h2>Proposal</h2> Commission will consider your proposal dimensions when determining the potential impact it will have on the agricultural capability of the land. </div> - <app-info-banner> Please refer to <a>FIXME: Contact Us</a> on the ALC website for more detail. </app-info-banner> + <app-info-banner> + Please refer to + <a + href="https://www.alc.gov.bc.ca/application-and-notice-process/applications/required-documents/#pfrs" + target="_blank" + >Placement of Fill</a + > + on the ALC website for more detail. + </app-info-banner> <app-soil-table tableHeader="Fill to be Placed" [(data)]="fillTableData" @@ -228,7 +236,13 @@ <h2>Proposal</h2> <mat-label class="subheading2" for="cross-section">Cross Sections</mat-label> <div class="subtext">Include North-South and East-West cross sections</div> <app-info-banner> - Please refer to <a>FIXME: Placement of Fill</a> on the ALC website for more information + Please refer to + <a + href="https://www.alc.gov.bc.ca/application-and-notice-process/applications/required-documents/#pfrs" + target="_blank" + >Placement of Fill</a + > + on the ALC website for more information </app-info-banner> <app-file-drag-drop id="cross-section" @@ -249,7 +263,13 @@ <h2>Proposal</h2> agricultural capability assessment. </div> <app-info-banner> - Please refer to <a>FIXME: Placement of Fill</a> on the ALC website for more information + Please refer to + <a + href="https://www.alc.gov.bc.ca/application-and-notice-process/applications/required-documents/#pfrs" + target="_blank" + >Placement of Fill</a + > + on the ALC website for more information </app-info-banner> <app-file-drag-drop id="reclamation-plan" diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.scss b/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.scss index 56caa68a82..a4d0e0cc50 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.scss +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.scss @@ -3,3 +3,7 @@ section { margin-top: rem(36); } + +.steps-list { + margin: rem(16) 0; +} diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.html index c081ed2460..b81692a4d1 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.html @@ -1,15 +1,11 @@ <div class="step-description"> <h2>Proposal</h2> - <p> - Considerations are subject to - <a> Section 6 of the ALC Act. </a> - </p> <p>All fields are required unless stated optional or disabled.</p> <app-commission-purposes-panel></app-commission-purposes-panel> </div> <app-warning-banner> In order to complete this step, please consult the following pages on the ALC website: - <ul> + <ul class="steps-list"> <li> <a href="https://www.alc.gov.bc.ca/application-and-notice-process/applications/what-the-commission-considers/" @@ -19,7 +15,11 @@ <h2>Proposal</h2> </a> </li> <li> - <a href="TODO" target="_blank">FIXME: Removal of Soil</a> + <a + href="https://www.alc.gov.bc.ca/application-and-notice-process/applications/required-documents/#pfrs" + target="_blank" + >Removal of Soil</a + > </li> </ul> </app-warning-banner> @@ -111,7 +111,15 @@ <h2>Proposal</h2> Commission will consider your proposal dimensions when determining the potential impact it will have on the agricultural capability of the land. </div> - <app-info-banner> Please refer to <a>FIXME: Contact Us</a> on the ALC website for more detail. </app-info-banner> + <app-info-banner> + Please refer to + <a + href="https://www.alc.gov.bc.ca/application-and-notice-process/applications/required-documents/#pfrs" + target="_blank" + >Removal of Soil</a + > + on the ALC website for more detail. + </app-info-banner> <app-soil-table tableHeader="Soil to be Removed" [(data)]="removalTableData" @@ -197,7 +205,13 @@ <h2>Proposal</h2> <mat-label class="subheading2" for="cross-section">Cross Sections</mat-label> <div class="subtext">Include North-South and East-West cross sections</div> <app-info-banner> - Please refer to <a>FIXME: Removal of Soil</a> on the ALC website for more information + Please refer to + <a + href="https://www.alc.gov.bc.ca/application-and-notice-process/applications/required-documents/#pfrs" + target="_blank" + >Removal of Soil</a + > + on the ALC website for more information </app-info-banner> <app-file-drag-drop id="cross-section" @@ -218,7 +232,13 @@ <h2>Proposal</h2> agricultural capability assessment. </div> <app-info-banner> - Please refer to <a>FIXME: Removal of Soil</a> on the ALC website for more information + Please refer to + <a + href="https://www.alc.gov.bc.ca/application-and-notice-process/applications/required-documents/#pfrs" + target="_blank" + >Removal of Soil</a + > + on the ALC website for more information </app-info-banner> <app-file-drag-drop id="reclamation-plan" diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.scss b/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.scss index 56caa68a82..a4d0e0cc50 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.scss +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.scss @@ -3,3 +3,7 @@ section { margin-top: rem(36); } + +.steps-list { + margin: rem(16) 0; +} diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.html index 9e11c585d4..bc6a5dce63 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.html @@ -1,9 +1,5 @@ <div class="step-description"> <h2>Proposal</h2> - <p> - Considerations are subject to - <a> Section 6 of the ALC Act. </a> - </p> <p>*All fields are required unless stated optional or disabled.</p> <app-commission-purposes-panel></app-commission-purposes-panel> <div class="step-documents"> @@ -16,7 +12,7 @@ <h6>Documents needed for this step:</h6> </div> <app-warning-banner> In order to complete this step, please consult the following pages on the ALC website: - <ul> + <ul class="steps-list"> <li> <a href="https://www.alc.gov.bc.ca/application-and-notice-process/applications/what-the-commission-considers/" @@ -26,7 +22,11 @@ <h6>Documents needed for this step:</h6> </a> </li> <li> - <a href="TODO" target="_blank">FIXME: Subdivision</a> + <a + href="https://www.alc.gov.bc.ca/application-and-notice-process/applications/required-documents/#sdv" + target="_blank" + >Subdivision</a + > </li> </ul> </app-warning-banner> @@ -231,7 +231,13 @@ <h6>Documents needed for this step:</h6> occupancy since December 21, 1972 </div> <app-info-banner - >Please refer to the <a class="subtext">FIXME: Subdivision</a> page on the ALC website for more information + >Please refer to the + <a + href="https://www.alc.gov.bc.ca/application-and-notice-process/applications/required-documents/#sdv" + class="subtext" + >Subdivide Land in the ALR</a + > + page on the ALC website for more information </app-info-banner> <mat-button-toggle-group id="home-site-severance" formControlName="isHomeSiteSeverance" class="input"> <mat-button-toggle diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.scss b/portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.scss index 1dd31dde9d..420c708d9d 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.scss +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.scss @@ -4,6 +4,10 @@ section { margin-top: rem(36); } +.steps-list { + margin: rem(16) 0; +} + .toggle-button { min-width: rem(170); } diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/tur-proposal/tur-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/tur-proposal/tur-proposal.component.html index 6ede2cbf36..c97656f356 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/tur-proposal/tur-proposal.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/tur-proposal/tur-proposal.component.html @@ -1,9 +1,5 @@ <div class="step-description"> <h2>Proposal</h2> - <p> - Considerations are subject to - <a> Section 6 of the ALC Act. </a> - </p> <p>*All fields are required unless stated optional or disabled.</p> <app-commission-purposes-panel></app-commission-purposes-panel> <div class="step-documents"> @@ -16,7 +12,7 @@ <h6>Documents needed for this step:</h6> </div> <app-warning-banner> In order to complete this step, please consult the following pages on the ALC website: - <ul> + <ul class="steps-list"> <li> <a href="https://www.alc.gov.bc.ca/application-and-notice-process/applications/what-the-commission-considers/" @@ -26,7 +22,11 @@ <h6>Documents needed for this step:</h6> </a> </li> <li> - <a href="TODO" target="_blank">FIXME: Transportation, Utility and Recreational Trail</a> + <a + href="https://www.alc.gov.bc.ca/application-and-notice-process/applications/required-documents/#tur" + target="_blank" + >Transportation, Utility and Recreational Trail</a + > </li> </ul> </app-warning-banner> @@ -166,7 +166,17 @@ <h6>Documents needed for this step:</h6> <div class="section"> <mat-label class="subheading2" for="proof-of-serving">Proof of Serving Notice</mat-label> <div class="subtext">Proof that all affected property owners with land in the ALR were notified as required.</div> - <div class="subtext template-link-container">Visit the <a href="">FIXME:ALC website</a> for more information</div> + + <app-info-banner> + Please refer to + <a + target="_blank" + href="https://www.alc.gov.bc.ca/application-and-notice-process/applications/required-documents/#tur" + >Transportation, Utility and Recreational Trail</a + > + page on the ALC website for more information. + </app-info-banner> + <app-file-drag-drop id="proof-of-serving" [uploadedFiles]="servingNotice" diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/tur-proposal/tur-proposal.component.scss b/portal-frontend/src/app/features/applications/edit-submission/proposal/tur-proposal/tur-proposal.component.scss index d270b0b476..e5bc423ce2 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/tur-proposal/tur-proposal.component.scss +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/tur-proposal/tur-proposal.component.scss @@ -5,10 +5,10 @@ section { margin-top: rem(36); } -.affected-area { - margin-top: rem(36); +.steps-list { + margin: rem(16) 0; } -.template-link-container { - background-color: colors.$secondary-color-light; +.affected-area { + margin-top: rem(36); } diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component.html index b85dedb61c..c4fb843266 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component.html @@ -1,14 +1,10 @@ <div class="step-description"> <h2>Additional Proposal Information</h2> - <p> - Considerations are subject to - <a>FIXME: Section 6 of the ALC Act. </a> - </p> <p>All fields are required unless stated optional or disabled.</p> </div> <app-warning-banner> In order to complete this step, please consult the following pages on the ALC website: - <ul> + <ul class="steps-list"> <li> <a href="https://www.alc.gov.bc.ca/application-and-notice-process/applications/what-the-commission-considers/" @@ -18,7 +14,11 @@ <h2>Additional Proposal Information</h2> </a> </li> <li> - <a href="TODO" target="_blank">FIXME: Removal of Soil</a> + <a + href="https://www.alc.gov.bc.ca/application-and-notice-process/soil-and-fill-notice-of-intent/#noi-documents" + target="_blank" + >Notice of Intent Documents</a + > </li> </ul> </app-warning-banner> diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component.scss b/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component.scss index e69de29bb2..827fede326 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component.scss +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component.scss @@ -0,0 +1,5 @@ +@use '../../../../../styles/functions' as *; + +.steps-list { + margin: rem(16) 0; +} diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pfrs/pfrs-proposal.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pfrs/pfrs-proposal.component.html index 6c764eea62..1d94352aa9 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pfrs/pfrs-proposal.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pfrs/pfrs-proposal.component.html @@ -1,15 +1,11 @@ <div class="step-description"> <h2>Proposal</h2> - <p> - Considerations are subject to - <a>FIXME: Section 6 of the ALC Act. </a> - </p> <p>All fields are required unless stated optional or disabled.</p> <app-commission-purposes-panel></app-commission-purposes-panel> </div> <app-warning-banner> In order to complete this step, please consult the following pages on the ALC website: - <ul> + <ul class="steps-list"> <li> <a href="https://www.alc.gov.bc.ca/application-and-notice-process/applications/what-the-commission-considers/" @@ -19,7 +15,11 @@ <h2>Proposal</h2> </a> </li> <li> - <a href="TODO" target="_blank">FIXME: Removal of Soil & Placement of Fill</a> + <a + href="https://www.alc.gov.bc.ca/application-and-notice-process/soil-and-fill-notice-of-intent/#noi-documents" + target="_blank" + >Removal of Soil & Placement of Fill</a + > </li> </ul> </app-warning-banner> @@ -197,7 +197,15 @@ <h2>Proposal</h2> Commission will consider your proposal dimensions when determining the potential impact it will have on the agricultural capability of the land. </div> - <app-info-banner> Please refer to <a>FIXME: Contact Us</a> on the ALC website for more detail. </app-info-banner> + <app-info-banner> + Please refer to + <a + href="https://www.alc.gov.bc.ca/application-and-notice-process/soil-and-fill-notice-of-intent/#noi-documents" + target="_blank" + >Removal of Soil & Placement of Fill</a + > + on the ALC website for more detail. + </app-info-banner> <app-soil-table *ngIf="!isMobile" tableHeader="Soil to be Removed" @@ -329,7 +337,13 @@ <h2>Proposal</h2> <mat-label class="subheading2" for="cross-section">Cross Sections</mat-label> <div class="subtext">Include North-South and East-West cross sections</div> <app-info-banner> - Please refer to <a>FIXME: Removal of Soil</a> on the ALC website for more information + Please refer to + <a + href="https://www.alc.gov.bc.ca/application-and-notice-process/soil-and-fill-notice-of-intent/#noi-documents" + target="_blank" + >Removal of Soil & Placement of Fill</a + > + on the ALC website for more information </app-info-banner> <app-file-drag-drop id="cross-section" @@ -351,7 +365,13 @@ <h2>Proposal</h2> agricultural capability assessment. </div> <app-info-banner> - Please refer to <a>FIXME: Removal of Soil</a> on the ALC website for more information + Please refer to + <a + href="https://www.alc.gov.bc.ca/application-and-notice-process/soil-and-fill-notice-of-intent/#noi-documents" + target="_blank" + >Removal of Soil & Placement of Fill</a + > + on the ALC website for more information </app-info-banner> <app-file-drag-drop id="reclamation-plan" @@ -402,7 +422,13 @@ <h2>Proposal</h2> <div class="full-row"> <mat-label class="subheading2" for="noticeOfWork">Notice of Work</mat-label> <app-info-banner> - Please refer to <a>FIXME: Removal of Soil</a> on the ALC website for more information + Please refer to + <a + href="https://www.alc.gov.bc.ca/application-and-notice-process/soil-and-fill-notice-of-intent/#noi-documents" + target="_blank" + >Removal of Soil & Placement of Fill</a + > + on the ALC website for more information </app-info-banner> <app-file-drag-drop id="noticeOfWork" diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pfrs/pfrs-proposal.component.scss b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pfrs/pfrs-proposal.component.scss index 56caa68a82..a4d0e0cc50 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pfrs/pfrs-proposal.component.scss +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pfrs/pfrs-proposal.component.scss @@ -3,3 +3,7 @@ section { margin-top: rem(36); } + +.steps-list { + margin: rem(16) 0; +} diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pofo/pofo-proposal.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pofo/pofo-proposal.component.html index 84c42a472b..1398d15443 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pofo/pofo-proposal.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pofo/pofo-proposal.component.html @@ -1,15 +1,11 @@ <div class="step-description"> <h2>Proposal</h2> - <p> - Considerations are subject to - <a>FIXME: Section 6 of the ALC Act. </a> - </p> <p>All fields are required unless stated optional or disabled.</p> <app-commission-purposes-panel></app-commission-purposes-panel> </div> <app-warning-banner> In order to complete this step, please consult the following pages on the ALC website: - <ul> + <ul class="steps-list"> <li> <a href="https://www.alc.gov.bc.ca/application-and-notice-process/applications/what-the-commission-considers/" @@ -19,7 +15,11 @@ <h2>Proposal</h2> </a> </li> <li> - <a href="TODO" target="_blank">FIXME: Placement of Fill</a> + <a + href="https://www.alc.gov.bc.ca/application-and-notice-process/soil-and-fill-notice-of-intent/#noi-documents" + target="_blank" + >Placement of Fill</a + > </li> </ul> </app-warning-banner> @@ -149,7 +149,15 @@ <h2>Proposal</h2> The Commission will consider your proposal dimensions when determining the potential impact it will have on the agricultural capability of the land. </div> - <app-info-banner> Please refer to <a>FIXME: Contact Us</a> on the ALC website for more detail.</app-info-banner> + <app-info-banner> + Please refer to + <a + href="https://www.alc.gov.bc.ca/application-and-notice-process/soil-and-fill-notice-of-intent/#noi-documents" + target="_blank" + >Placement of Fill</a + > + on the ALC website for more detail.</app-info-banner + > <app-soil-table tableHeader="Fill to be placed" [(data)]="fillToPlaceTableData" @@ -215,7 +223,13 @@ <h2>Proposal</h2> <mat-label class="subheading2" for="cross-section">Cross Sections</mat-label> <div class="subtext">Include North-South and East-West cross sections</div> <app-info-banner> - Please refer to <a>FIXME: Removal of Soil</a> on the ALC website for more information + Please refer to + <a + href="https://www.alc.gov.bc.ca/application-and-notice-process/soil-and-fill-notice-of-intent/#noi-documents" + target="_blank" + >Placement of Fill</a + > + on the ALC website for more information </app-info-banner> <app-file-drag-drop id="cross-section" @@ -237,7 +251,13 @@ <h2>Proposal</h2> agricultural capability assessment. </div> <app-info-banner> - Please refer to <a>FIXME: Removal of Soil</a> on the ALC website for more information + Please refer to + <a + href="https://www.alc.gov.bc.ca/application-and-notice-process/soil-and-fill-notice-of-intent/#noi-documents" + target="_blank" + >Placement of Fill</a + > + on the ALC website for more information </app-info-banner> <app-file-drag-drop id="reclamation-plan" diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pofo/pofo-proposal.component.scss b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pofo/pofo-proposal.component.scss index 56caa68a82..a4d0e0cc50 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pofo/pofo-proposal.component.scss +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pofo/pofo-proposal.component.scss @@ -3,3 +3,7 @@ section { margin-top: rem(36); } + +.steps-list { + margin: rem(16) 0; +} diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.html index f5f5500d97..35b874c62b 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.html @@ -1,15 +1,11 @@ <div class="step-description"> <h2>Proposal</h2> - <p> - Considerations are subject to - <a>FIXME: Section 6 of the ALC Act. </a> - </p> <p>All fields are required unless stated optional or disabled.</p> <app-commission-purposes-panel></app-commission-purposes-panel> </div> <app-warning-banner> In order to complete this step, please consult the following pages on the ALC website: - <ul> + <ul class="steps-list"> <li> <a href="https://www.alc.gov.bc.ca/application-and-notice-process/applications/what-the-commission-considers/" @@ -19,7 +15,11 @@ <h2>Proposal</h2> </a> </li> <li> - <a href="TODO" target="_blank">FIXME: Removal of Soil</a> + <a + href="https://www.alc.gov.bc.ca/application-and-notice-process/soil-and-fill-notice-of-intent/#noi-documents" + target="_blank" + >Removal of Soil</a + > </li> </ul> </app-warning-banner> @@ -133,7 +133,15 @@ <h2>Proposal</h2> Commission will consider your proposal dimensions when determining the potential impact it will have on the agricultural capability of the land. </div> - <app-info-banner> Please refer to <a>FIXME: Contact Us</a> on the ALC website for more detail.</app-info-banner> + <app-info-banner> + Please refer to + <a + href="https://www.alc.gov.bc.ca/application-and-notice-process/soil-and-fill-notice-of-intent/#noi-documents" + target="_blank" + >Removal of Soil</a + > + on the ALC website for more detail.</app-info-banner + > <app-soil-table tableHeader="Soil to be Removed" [(data)]="removalTableData" @@ -204,7 +212,13 @@ <h2>Proposal</h2> <mat-label class="subheading2" for="cross-section">Cross Sections</mat-label> <div class="subtext">Include North-South and East-West cross sections</div> <app-info-banner> - Please refer to <a>FIXME: Removal of Soil</a> on the ALC website for more information + Please refer to + <a + href="https://www.alc.gov.bc.ca/application-and-notice-process/soil-and-fill-notice-of-intent/#noi-documents" + target="_blank" + >Removal of Soil</a + > + on the ALC website for more information </app-info-banner> <app-file-drag-drop id="cross-section" @@ -226,7 +240,13 @@ <h2>Proposal</h2> agricultural capability assessment. </div> <app-info-banner> - Please refer to <a>FIXME: Removal of Soil</a> on the ALC website for more information + Please refer to + <a + href="https://www.alc.gov.bc.ca/application-and-notice-process/soil-and-fill-notice-of-intent/#noi-documents" + target="_blank" + >Removal of Soil</a + > + on the ALC website for more information </app-info-banner> <app-file-drag-drop id="reclamation-plan" @@ -277,7 +297,13 @@ <h2>Proposal</h2> <div class="full-row"> <mat-label class="subheading2" for="noticeOfWork">Notice of Work</mat-label> <app-info-banner> - Please refer to <a>FIXME: Removal of Soil</a> on the ALC website for more information + Please refer to + <a + href="https://www.alc.gov.bc.ca/application-and-notice-process/soil-and-fill-notice-of-intent/#noi-documents" + target="_blank" + >Removal of Soil</a + > + on the ALC website for more information </app-info-banner> <app-file-drag-drop id="noticeOfWork" diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.scss b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.scss index 56caa68a82..a4d0e0cc50 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.scss +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/roso/roso-proposal.component.scss @@ -3,3 +3,7 @@ section { margin-top: rem(36); } + +.steps-list { + margin: rem(16) 0; +} From b57a013cc3d44981febae6313f78778e65d91b84 Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Thu, 11 Jan 2024 09:36:51 -0800 Subject: [PATCH 922/954] populate is_authorized flag (#1278) --- .../review/lg_submission_review.py | 52 ++++++++++++------- .../sql/review/app_submission_review.sql | 11 ++-- .../review/app_submission_review_count.sql | 10 ++-- 3 files changed, 43 insertions(+), 30 deletions(-) diff --git a/bin/migrate-oats-data/applications/submissions/review/lg_submission_review.py b/bin/migrate-oats-data/applications/submissions/review/lg_submission_review.py index c4eccb88f2..66d649fa8b 100644 --- a/bin/migrate-oats-data/applications/submissions/review/lg_submission_review.py +++ b/bin/migrate-oats-data/applications/submissions/review/lg_submission_review.py @@ -2,7 +2,6 @@ setup_and_get_logger, BATCH_UPLOAD_SIZE, OATS_ETL_USER, - ) from db import inject_conn_pool from psycopg2.extras import RealDictCursor @@ -37,7 +36,8 @@ def insert_application_submission_review(conn=None, batch_size=BATCH_UPLOAD_SIZE application_sql = sql_file.read() while True: cursor.execute( - f"{application_sql} WHERE olgr.alr_application_id > {last_application_id} ORDER BY olgr.alr_application_id;" + f"""{application_sql} + WHERE olgr.alr_application_id > {last_application_id} ORDER BY olgr.alr_application_id;""" ) rows = cursor.fetchmany(batch_size) @@ -101,7 +101,8 @@ def _compile_review_insert_query(number_of_rows_to_insert): is_zoning_consistent, application_file_number, local_government_file_number, - audit_created_by + audit_created_by, + is_authorized ) VALUES{reviews_to_insert} ON CONFLICT DO NOTHING; @@ -137,43 +138,54 @@ def _map_data(row): "application_file_number": row["alr_application_id"], "local_government_file_number": row["local_gov_file_number"], "audit_created_by": OATS_ETL_USER, + "is_authorized": _map_is_authorized(row), } +def _map_ocp_designation(row): + if row["community_pln_compliance_ind"] == "X": + return False + elif row["community_pln_compliance_ind"] == "N": + return True + else: + return None -def _map_ocp_designation(ocp_value): - - if ocp_value["community_pln_compliance_ind"] == 'X': +def _map_ocp_consistency(row): + if row["community_pln_compliance_ind"] == "N": return False - elif ocp_value["community_pln_compliance_ind"] == 'N': + elif row["community_pln_compliance_ind"] == "Y": return True else: return None -def _map_ocp_consistency(ocp_value): - - if ocp_value["community_pln_compliance_ind"] == 'N': + +def _map_zoning(row): + if row["zoning_compliance_ind"] == "X": return False - elif ocp_value["community_pln_compliance_ind"] == 'Y': + elif row["zoning_compliance_ind"] == "N": return True else: return None -def _map_zoning(zoning_value): - - if zoning_value["zoning_compliance_ind"] == 'X': + +def _map_zoning_consistency(row): + if row["zoning_compliance_ind"] == "N": return False - elif zoning_value["zoning_compliance_ind"] == 'N': + elif row["zoning_compliance_ind"] == "Y": return True else: return None - -def _map_zoning_consistency(zoning_value): - - if zoning_value["zoning_compliance_ind"] == 'N': + + +def _map_is_authorized(row): + """ + LRF - Local Government Refused to Forward + SAL - Submitted to ALC + """ + if row["accomplishment_code"] == "LRF": return False - elif zoning_value["zoning_compliance_ind"] == 'Y': + elif row["accomplishment_code"] == "SAL": return True else: return None diff --git a/bin/migrate-oats-data/applications/submissions/sql/review/app_submission_review.sql b/bin/migrate-oats-data/applications/submissions/sql/review/app_submission_review.sql index 80c4607e10..8bb9ba1d2d 100644 --- a/bin/migrate-oats-data/applications/submissions/sql/review/app_submission_review.sql +++ b/bin/migrate-oats-data/applications/submissions/sql/review/app_submission_review.sql @@ -1,5 +1,4 @@ -SELECT - olgr.local_gov_file_number, +SELECT olgr.local_gov_file_number, olgr.alr_application_id, olgr.zoning_compliance_ind, olgr.zoning_bylaw_name, @@ -13,9 +12,11 @@ SELECT op.last_name, op.title, opo.phone_number, - opo.email_address -FROM - alcs.application_submission as2 + opo.email_address, + oa.accomplishment_code +FROM alcs.application_submission as2 JOIN oats.oats_local_government_reports olgr ON as2.file_number = olgr.alr_application_id::TEXT LEFT JOIN oats.oats_person_organizations opo ON olgr.person_organization_id = opo.person_organization_id LEFT JOIN oats.oats_persons op ON opo.person_id = op.person_id + LEFT JOIN oats.oats_accomplishments oa ON oa.alr_application_id = olgr.alr_application_id + AND oa.accomplishment_code IN ('LRF', 'SAL') -- LRF AND SAL self exclusive \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/submissions/sql/review/app_submission_review_count.sql b/bin/migrate-oats-data/applications/submissions/sql/review/app_submission_review_count.sql index 0329ccf809..c8a46c52cf 100644 --- a/bin/migrate-oats-data/applications/submissions/sql/review/app_submission_review_count.sql +++ b/bin/migrate-oats-data/applications/submissions/sql/review/app_submission_review_count.sql @@ -1,7 +1,7 @@ -SELECT - COUNT(*) -FROM - alcs.application_submission as2 +SELECT count(*) +FROM alcs.application_submission as2 JOIN oats.oats_local_government_reports olgr ON as2.file_number = olgr.alr_application_id::TEXT LEFT JOIN oats.oats_person_organizations opo ON olgr.person_organization_id = opo.person_organization_id - LEFT JOIN oats.oats_persons op ON opo.person_id = op.person_id; \ No newline at end of file + LEFT JOIN oats.oats_persons op ON opo.person_id = op.person_id + LEFT JOIN oats.oats_accomplishments oa ON oa.alr_application_id = olgr.alr_application_id + AND oa.accomplishment_code IN ('LRF', 'SAL') -- LRF AND SAL self exclusive \ No newline at end of file From 5a2d8cebf63bedf13be6e8b6db322db3439de919 Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Thu, 11 Jan 2024 11:07:11 -0800 Subject: [PATCH 923/954] populate application_decision_maker_code (#1280) etl application_decision_maker_code --- .../applications/decisions/__init__.py | 2 + .../decisions/application_decision_update.py | 127 ++++++++++++++++++ .../sql/application_decision_update.sql | 8 ++ .../sql/application_decision_update_count.sql | 6 + .../applications/migrate_application.py | 7 +- .../common/oats_decision_enum.py | 8 ++ 6 files changed, 157 insertions(+), 1 deletion(-) create mode 100644 bin/migrate-oats-data/applications/decisions/application_decision_update.py create mode 100644 bin/migrate-oats-data/applications/decisions/sql/application_decision_update.sql create mode 100644 bin/migrate-oats-data/applications/decisions/sql/application_decision_update_count.sql diff --git a/bin/migrate-oats-data/applications/decisions/__init__.py b/bin/migrate-oats-data/applications/decisions/__init__.py index 274ac8ea52..e7be67f9be 100644 --- a/bin/migrate-oats-data/applications/decisions/__init__.py +++ b/bin/migrate-oats-data/applications/decisions/__init__.py @@ -2,3 +2,5 @@ init_application_decisions, clean_application_decisions, ) + +from .application_decision_update import update_application_decision diff --git a/bin/migrate-oats-data/applications/decisions/application_decision_update.py b/bin/migrate-oats-data/applications/decisions/application_decision_update.py new file mode 100644 index 0000000000..b262bd984e --- /dev/null +++ b/bin/migrate-oats-data/applications/decisions/application_decision_update.py @@ -0,0 +1,127 @@ +from common import ( + setup_and_get_logger, + BATCH_UPLOAD_SIZE, + OatsToAlcsDecisionMakerCodeMappingEnum, +) +from db import inject_conn_pool +from psycopg2.extras import RealDictCursor, execute_batch + +etl_name = "update_application_decision" +logger = setup_and_get_logger(etl_name) + + +@inject_conn_pool +def update_application_decision(conn=None, batch_size=BATCH_UPLOAD_SIZE): + """ + This function is responsible for updating application_decision.decision_maker_code in ALCS. + + Args: + conn (psycopg2.extensions.connection): PostgreSQL database connection. Provided by the decorator. + batch_size (int): The number of items to process at once. Defaults to BATCH_UPLOAD_SIZE. + """ + + logger.info(f"Start {etl_name}") + with conn.cursor(cursor_factory=RealDictCursor) as cursor: + with open( + "applications/decisions/sql/application_decision_update_count.sql", + "r", + encoding="utf-8", + ) as sql_file: + count_query = sql_file.read() + cursor.execute(count_query) + count_total = dict(cursor.fetchone())["count"] + logger.info(f"Total Application decision data to updated: {count_total}") + + failed_updates = 0 + successful_updates_count = 0 + last_decision_id = 0 + + with open( + "applications/decisions/sql/application_decision_update.sql", + "r", + encoding="utf-8", + ) as sql_file: + query = sql_file.read() + while True: + cursor.execute( + f""" + {query} + and ad.oats_alr_appl_decision_id > {last_decision_id} ORDER BY ad.oats_alr_appl_decision_id;""" + ) + + rows = cursor.fetchmany(batch_size) + + if not rows: + break + try: + decisions_to_be_updated_count = len(rows) + + _update_application_decision(conn, batch_size, cursor, rows) + + successful_updates_count = ( + successful_updates_count + decisions_to_be_updated_count + ) + last_decision_id = dict(rows[-1])["oats_alr_appl_decision_id"] + + logger.debug( + f"retrieved/updated items count: {decisions_to_be_updated_count}; total successfully update decisions so far {successful_updates_count}; last updated decision_id: {last_decision_id}" + ) + except Exception as err: + logger.exception(err) + conn.rollback() + failed_updates = count_total - successful_updates_count + last_decision_id = last_decision_id + 1 + + logger.info( + f"Finished {etl_name}: total amount of successful updates {successful_updates_count}, total failed updates {failed_updates}" + ) + + +def _update_application_decision(conn, batch_size, cursor, rows): + data = _prepare_oats_alr_applications_data(rows) + + if len(data) > 0: + execute_batch( + cursor, + _get_update_query(), + data, + page_size=batch_size, + ) + + conn.commit() + + +def _get_update_query(): + query = f""" + UPDATE alcs.application_decision + SET decision_maker_code = %(decision_maker_code)s + WHERE alcs.application_decision."uuid" = %(decision_uuid)s; + """ + return query + + +def _prepare_oats_alr_applications_data(row_data_list): + data_list = [] + for row in row_data_list: + mapped_row = { + "decision_uuid": row["decision_uuid"], + "decision_maker_code": _map_decision_maker_code(row), + } + data_list.append(mapped_row) + + return data_list + + +def _map_decision_maker_code(row): + accomplishment_code = row["accomplishment_code"] + if accomplishment_code is not None: + for decision_maker_code_enum in OatsToAlcsDecisionMakerCodeMappingEnum: + if decision_maker_code_enum.name == accomplishment_code: + if ( + decision_maker_code_enum.value + == OatsToAlcsDecisionMakerCodeMappingEnum.ALD.value + ): + return OatsToAlcsDecisionMakerCodeMappingEnum.ACD.value # ALCS code + else: + return decision_maker_code_enum.value + return None diff --git a/bin/migrate-oats-data/applications/decisions/sql/application_decision_update.sql b/bin/migrate-oats-data/applications/decisions/sql/application_decision_update.sql new file mode 100644 index 0000000000..c9f8bd5d9d --- /dev/null +++ b/bin/migrate-oats-data/applications/decisions/sql/application_decision_update.sql @@ -0,0 +1,8 @@ +SELECT oa.accomplishment_code, + ad."uuid" as decision_uuid, + ad.oats_alr_appl_decision_id +FROM oats.oats_accomplishments oa + JOIN alcs.application a ON a.file_number = oa.alr_application_id::TEXT + JOIN alcs.application_decision ad ON ad.application_uuid = a."uuid" +WHERE oa.accomplishment_code IN ('ACD', 'LGD', 'OGD', 'PGD', 'ALD') + AND ad.audit_created_by = 'oats_etl' \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/decisions/sql/application_decision_update_count.sql b/bin/migrate-oats-data/applications/decisions/sql/application_decision_update_count.sql new file mode 100644 index 0000000000..6d8562082c --- /dev/null +++ b/bin/migrate-oats-data/applications/decisions/sql/application_decision_update_count.sql @@ -0,0 +1,6 @@ +SELECT count(*) +FROM oats.oats_accomplishments oa + JOIN alcs.application a ON a.file_number = oa.alr_application_id::TEXT + JOIN alcs.application_decision ad ON ad.application_uuid = a."uuid" +WHERE oa.accomplishment_code IN ('ACD', 'LGD', 'OGD', 'PGD', 'ALD') + AND ad.audit_created_by = 'oats_etl'; \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/migrate_application.py b/bin/migrate-oats-data/applications/migrate_application.py index ab54783d42..b5f654da69 100644 --- a/bin/migrate-oats-data/applications/migrate_application.py +++ b/bin/migrate-oats-data/applications/migrate_application.py @@ -22,7 +22,11 @@ process_app_staff_journal, clean_application_staff_journal, ) -from .decisions import clean_application_decisions, init_application_decisions +from .decisions import ( + clean_application_decisions, + init_application_decisions, + update_application_decision, +) from .decisions.app_modifications import ( update_application_modifications, ) @@ -67,6 +71,7 @@ def init_applications(batch_size): def process_application_decisions(batch_size): init_application_decisions(batch_size) + update_application_decision(batch_size) update_application_modifications(batch_size) init_application_reconsiderations(batch_size) link_application_reconsiderations(batch_size) diff --git a/bin/migrate-oats-data/common/oats_decision_enum.py b/bin/migrate-oats-data/common/oats_decision_enum.py index 545eb42e8a..93f694473d 100644 --- a/bin/migrate-oats-data/common/oats_decision_enum.py +++ b/bin/migrate-oats-data/common/oats_decision_enum.py @@ -63,3 +63,11 @@ class OatsToAlcsConditionTypeMapping(Enum): SRC = "STRC" TIM = "TIME" VGS = "VEGS" + + +class OatsToAlcsDecisionMakerCodeMappingEnum(Enum): + ACD = "ALCS" + ALD = "ALCS_ALD" # need to have unique value for this, later in mapping function will be replaced with proper ALCS code + LGD = "LGOV" + OGD = "BCER" + PGD = "BCGO" From 45d25b15bcdacba325443cbae43e645fc5eaabde Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Thu, 11 Jan 2024 11:38:04 -0800 Subject: [PATCH 924/954] Prevent green success toast from firing when file is too large * Green toast was replacing the yellow warning toast * Move Cancel NOI into the button container so it looks correct --- .../edit-submission/files-step.partial.ts | 11 +++++++---- .../edit-submission/files-step.partial.ts | 11 +++++++---- .../view-notice-of-intent-submission.component.html | 6 +++--- .../edit-submission/files-step.partial.ts | 13 +++++++++---- .../application-document.service.ts | 4 +++- .../notice-of-intent-document.service.ts | 4 +++- .../notification-document.service.ts | 4 +++- 7 files changed, 35 insertions(+), 18 deletions(-) diff --git a/portal-frontend/src/app/features/applications/edit-submission/files-step.partial.ts b/portal-frontend/src/app/features/applications/edit-submission/files-step.partial.ts index f937f7d1fd..47f65a2227 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/files-step.partial.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/files-step.partial.ts @@ -37,8 +37,9 @@ export abstract class FilesStepComponent extends StepComponent { await this.save(); const mappedFiles = file.file; + let res; try { - await this.applicationDocumentService.attachExternalFile(this.fileId, mappedFiles, documentType); + res = await this.applicationDocumentService.attachExternalFile(this.fileId, mappedFiles, documentType); } catch (err) { this.toastService.showErrorToast('Document upload failed'); if (err instanceof HttpErrorResponse && err.status === 403) { @@ -46,9 +47,11 @@ export abstract class FilesStepComponent extends StepComponent { } } - const documents = await this.applicationDocumentService.getByFileId(this.fileId); - if (documents) { - this.$applicationDocuments.next(documents); + if (res) { + const documents = await this.applicationDocumentService.getByFileId(this.fileId); + if (documents) { + this.$applicationDocuments.next(documents); + } } } return true; diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/files-step.partial.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/files-step.partial.ts index 279b58c06b..e177bdf537 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/files-step.partial.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/files-step.partial.ts @@ -37,8 +37,9 @@ export abstract class FilesStepComponent extends StepComponent { await this.save(); const mappedFiles = file.file; + let res; try { - await this.noticeOfIntentDocumentService.attachExternalFile(this.fileId, mappedFiles, documentType); + res = await this.noticeOfIntentDocumentService.attachExternalFile(this.fileId, mappedFiles, documentType); } catch (err) { this.toastService.showErrorToast('Document upload failed'); if (err instanceof HttpErrorResponse && err.status === 403) { @@ -46,9 +47,11 @@ export abstract class FilesStepComponent extends StepComponent { } } - const documents = await this.noticeOfIntentDocumentService.getByFileId(this.fileId); - if (documents) { - this.$noiDocuments.next(documents); + if (res) { + const documents = await this.noticeOfIntentDocumentService.getByFileId(this.fileId); + if (documents) { + this.$noiDocuments.next(documents); + } } } return true; diff --git a/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.html b/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.html index b311290174..7db5427854 100644 --- a/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.html @@ -45,10 +45,10 @@ <h4 *ngIf="submission">NOI ID: {{ submission.fileNumber }}</h4> <section> <div class="header"> <h2>Applicant Submission</h2> - <button *ngIf="submission.canEdit" mat-stroked-button color="warn" (click)="onCancel(submission.uuid)"> - Cancel NOI - </button> <div class="btns-wrapper"> + <button *ngIf="submission.canEdit" mat-stroked-button color="warn" (click)="onCancel(submission.uuid)"> + Cancel NOI + </button> <button mat-flat-button color="accent" (click)="onDownloadSubmissionPdf(submission.fileNumber)"> Download PDF </button> diff --git a/portal-frontend/src/app/features/notifications/edit-submission/files-step.partial.ts b/portal-frontend/src/app/features/notifications/edit-submission/files-step.partial.ts index 1276756a42..2a1fcd1328 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/files-step.partial.ts +++ b/portal-frontend/src/app/features/notifications/edit-submission/files-step.partial.ts @@ -36,17 +36,22 @@ export abstract class FilesStepComponent extends StepComponent { if (this.fileId) { await this.save(); const mappedFiles = file.file; + + let res; try { - await this.notificationDocumentService.attachExternalFile(this.fileId, mappedFiles, documentType); + res = await this.notificationDocumentService.attachExternalFile(this.fileId, mappedFiles, documentType); } catch (err) { this.toastService.showErrorToast('Document upload failed'); if (err instanceof HttpErrorResponse && err.status === 403) { return false; } } - const documents = await this.notificationDocumentService.getByFileId(this.fileId); - if (documents) { - this.$notificationDocuments.next(documents); + + if (res) { + const documents = await this.notificationDocumentService.getByFileId(this.fileId); + if (documents) { + this.$notificationDocuments.next(documents); + } } } return true; diff --git a/portal-frontend/src/app/services/application-document/application-document.service.ts b/portal-frontend/src/app/services/application-document/application-document.service.ts index dc2056901d..b7b69eab01 100644 --- a/portal-frontend/src/app/services/application-document/application-document.service.ts +++ b/portal-frontend/src/app/services/application-document/application-document.service.ts @@ -35,7 +35,9 @@ export class ApplicationDocumentService { source, `${this.serviceUrl}/application/${fileNumber}/attachExternal` ); - this.toastService.showSuccessToast('Document uploaded'); + if (res) { + this.toastService.showSuccessToast('Document uploaded'); + } return res; } catch (e) { if (e instanceof HttpErrorResponse && e.status === 403) { diff --git a/portal-frontend/src/app/services/notice-of-intent-document/notice-of-intent-document.service.ts b/portal-frontend/src/app/services/notice-of-intent-document/notice-of-intent-document.service.ts index f2bb77eed0..b54a6cdfeb 100644 --- a/portal-frontend/src/app/services/notice-of-intent-document/notice-of-intent-document.service.ts +++ b/portal-frontend/src/app/services/notice-of-intent-document/notice-of-intent-document.service.ts @@ -35,7 +35,9 @@ export class NoticeOfIntentDocumentService { source, `${this.serviceUrl}/notice-of-intent/${fileNumber}/attachExternal` ); - this.toastService.showSuccessToast('Document uploaded'); + if (res) { + this.toastService.showSuccessToast('Document uploaded'); + } return res; } catch (e) { if (e instanceof HttpErrorResponse && e.status === 403) { diff --git a/portal-frontend/src/app/services/notification-document/notification-document.service.ts b/portal-frontend/src/app/services/notification-document/notification-document.service.ts index 8a537b6782..698ecbae19 100644 --- a/portal-frontend/src/app/services/notification-document/notification-document.service.ts +++ b/portal-frontend/src/app/services/notification-document/notification-document.service.ts @@ -35,7 +35,9 @@ export class NotificationDocumentService { source, `${this.serviceUrl}/notification/${fileNumber}/attachExternal` ); - this.toastService.showSuccessToast('Document uploaded'); + if (res) { + this.toastService.showSuccessToast('Document uploaded'); + } return res; } catch (e) { if (e instanceof HttpErrorResponse && e.status === 403) { From a9a294492345ad0c7ed8f97965f995d7da20a614 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Thu, 11 Jan 2024 12:23:32 -0800 Subject: [PATCH 925/954] Maintenance mode to redirect to / on successful API call --- .../maintenance/maintenance.component.spec.ts | 21 ++++++++++++++++++- .../maintenance/maintenance.component.ts | 19 ++++++++++++++--- 2 files changed, 36 insertions(+), 4 deletions(-) diff --git a/portal-frontend/src/app/features/maintenance/maintenance.component.spec.ts b/portal-frontend/src/app/features/maintenance/maintenance.component.spec.ts index 9b9bec6e9f..bd0a1fc4d5 100644 --- a/portal-frontend/src/app/features/maintenance/maintenance.component.spec.ts +++ b/portal-frontend/src/app/features/maintenance/maintenance.component.spec.ts @@ -1,4 +1,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { Router } from '@angular/router'; +import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { CodeService } from '../../services/code/code.service'; import { MaintenanceComponent } from './maintenance.component'; @@ -6,9 +9,25 @@ describe('MaintenanceComponent', () => { let component: MaintenanceComponent; let fixture: ComponentFixture<MaintenanceComponent>; + let mockCodeService: DeepMocked<CodeService>; + let mockRouter: DeepMocked<Router>; + beforeEach(() => { + mockCodeService = createMock(); + mockRouter = createMock(); + TestBed.configureTestingModule({ - declarations: [MaintenanceComponent] + providers: [ + { + provide: CodeService, + useValue: mockCodeService, + }, + { + provide: Router, + useValue: mockRouter, + }, + ], + declarations: [MaintenanceComponent], }); fixture = TestBed.createComponent(MaintenanceComponent); component = fixture.componentInstance; diff --git a/portal-frontend/src/app/features/maintenance/maintenance.component.ts b/portal-frontend/src/app/features/maintenance/maintenance.component.ts index 443fb6aa58..fe26c80252 100644 --- a/portal-frontend/src/app/features/maintenance/maintenance.component.ts +++ b/portal-frontend/src/app/features/maintenance/maintenance.component.ts @@ -1,10 +1,23 @@ -import { Component } from '@angular/core'; +import { Component, OnInit } from '@angular/core'; +import { Router } from '@angular/router'; +import { CodeService } from '../../services/code/code.service'; @Component({ selector: 'app-maintenance', templateUrl: './maintenance.component.html', - styleUrls: ['./maintenance.component.scss'] + styleUrls: ['./maintenance.component.scss'], }) -export class MaintenanceComponent { +export class MaintenanceComponent implements OnInit { + constructor(private codeService: CodeService, private router: Router) {} + ngOnInit(): void { + this.checkMaintenanceMode(); + } + + private async checkMaintenanceMode() { + const res = await this.codeService.loadCodes(); + if (res) { + await this.router.navigateByUrl('/'); + } + } } From b0e0c086a50e92eb2546a4b10c5938f19de4c359 Mon Sep 17 00:00:00 2001 From: Liam Stoddard <lstodd@protonmail.com> Date: Thu, 11 Jan 2024 12:56:27 -0800 Subject: [PATCH 926/954] MR feedback + legislation/applicant type bugfix --- .../application_decision_components_init.py | 40 +------------------ ...application_decision_components_insert.sql | 3 +- bin/migrate-oats-data/common/__init__.py | 2 + .../common/alcs_application_enum.py | 19 --------- ...oats_legislation_to_alcs_applicant_enum.py | 9 +++++ .../common/oats_to_alcs_nfu_type_enum.py | 14 +++++++ 6 files changed, 29 insertions(+), 58 deletions(-) create mode 100644 bin/migrate-oats-data/common/oats_legislation_to_alcs_applicant_enum.py create mode 100644 bin/migrate-oats-data/common/oats_to_alcs_nfu_type_enum.py diff --git a/bin/migrate-oats-data/applications/decisions/app_components/application_decision_components_init.py b/bin/migrate-oats-data/applications/decisions/app_components/application_decision_components_init.py index 09c2afd8c2..2421dd7067 100644 --- a/bin/migrate-oats-data/applications/decisions/app_components/application_decision_components_init.py +++ b/bin/migrate-oats-data/applications/decisions/app_components/application_decision_components_init.py @@ -5,7 +5,7 @@ ALRChangeCode, OatsToAlcsAgCap, OatsToAlcsAgCapSource, - OatsLegislationCodes, + OatsLegislationCodesToAlcsApplicant, OatsToAlcsNfuTypes, OATS_NFU_SUBTYPES, BATCH_UPLOAD_SIZE, @@ -257,42 +257,6 @@ def _map_component_type_code(row): return None -# def _map_nfu_subtype_code(row): -# nfu_subtype_code = row.get("nonfarm_use_subtype_code") -# if nfu_subtype_code == ALRChangeCode.NAR.value: -# return "NARU" - - -# def _map_nfu_type_code(row): -# nfu_code = row.get("nonfarm_use_type_code") -# if nfu_code == AlcsAdjacentLandUseType.AGR: -# return AlcsAdjacentLandUseType.AGR.value - -# if nfu_code == AlcsAdjacentLandUseType.CIV: -# return AlcsAdjacentLandUseType.CIV.value - -# if nfu_code == AlcsAdjacentLandUseType.COM: -# return AlcsAdjacentLandUseType.COM.value - -# if nfu_code == AlcsAdjacentLandUseType.IND: -# return AlcsAdjacentLandUseType.IND.value - -# if nfu_code == AlcsAdjacentLandUseType.OTH: -# return AlcsAdjacentLandUseType.OTH.value - -# if nfu_code == AlcsAdjacentLandUseType.REC: -# return AlcsAdjacentLandUseType.REC.value - -# if nfu_code == AlcsAdjacentLandUseType.RES: -# return AlcsAdjacentLandUseType.RES.value - -# if nfu_code == AlcsAdjacentLandUseType.TRA: -# return AlcsAdjacentLandUseType.TRA.value - -# if nfu_code == AlcsAdjacentLandUseType.UNU: -# return AlcsAdjacentLandUseType.UNU.value - - def _map_oats_to_alcs_nfu(data): oats_type_code = data["nonfarm_use_type_code"] oats_subtype_code = data["nonfarm_use_subtype_code"] @@ -331,7 +295,7 @@ def _map_oats_to_alcs_nfu_subtypes(nfu_type_code, nfu_subtype_code): def _map_legislation_to_applicant_type(row): if row.get("legislation_code"): row["legislation_code"] = str( - OatsLegislationCodes[row["legislation_code"]].value + OatsLegislationCodesToAlcsApplicant[row["legislation_code"]].value ) return row.get("legislation_code") diff --git a/bin/migrate-oats-data/applications/decisions/sql/components/application_decision_components_insert.sql b/bin/migrate-oats-data/applications/decisions/sql/components/application_decision_components_insert.sql index 62c2ab5541..f0378ed086 100644 --- a/bin/migrate-oats-data/applications/decisions/sql/components/application_decision_components_insert.sql +++ b/bin/migrate-oats-data/applications/decisions/sql/components/application_decision_components_insert.sql @@ -12,7 +12,8 @@ SELECT oaac.alr_change_code, oaac.nonfarm_use_type_code, oaac.nonfarm_use_subtype_code, - oaac.rsdntl_use_type_code + oaac.rsdntl_use_type_code, + oaac.legislation_code FROM oats.oats_alr_appl_decisions oaad JOIN oats.oats_alr_appl_components oaac ON oaac.alr_appl_decision_id = oaad.alr_appl_decision_id diff --git a/bin/migrate-oats-data/common/__init__.py b/bin/migrate-oats-data/common/__init__.py index 044f23f84a..329cf0c18c 100644 --- a/bin/migrate-oats-data/common/__init__.py +++ b/bin/migrate-oats-data/common/__init__.py @@ -11,3 +11,5 @@ from .oats_to_alcs_parcel_enum import * from .alcs_init_users import * from .oats_decision_enum import * +from .oats_legislation_to_alcs_applicant_enum import * +from .oats_to_alcs_nfu_type_enum import * diff --git a/bin/migrate-oats-data/common/alcs_application_enum.py b/bin/migrate-oats-data/common/alcs_application_enum.py index 162ab0d50c..18319073c0 100644 --- a/bin/migrate-oats-data/common/alcs_application_enum.py +++ b/bin/migrate-oats-data/common/alcs_application_enum.py @@ -59,22 +59,3 @@ class AlcsNaruTypeCode(Enum): Principal_Residence = "PRIN" # Principal Residence More Than 500m² Additional_Residence = "ARFU" # Additional Residence for Farm Use Tourism_Accomodation = "TOUR" # Non-Adhering Tourism Accommodation - - -class OatsToAlcsNfuTypes(Enum): - AGR = AlcsNfuTypeCode.Agricultural_Farm.value - CIV = AlcsNfuTypeCode.Civic_Institutional.value - COM = AlcsNfuTypeCode.Commercial_Retail.value - IND = AlcsNfuTypeCode.Industrial.value - OTH = AlcsNfuTypeCode.Other.value - REC = AlcsNfuTypeCode.Recreational.value - RES = AlcsNfuTypeCode.Residential.value - TRA = AlcsNfuTypeCode.Transportation_Utilities.value - UNU = AlcsNfuTypeCode.Unused.value - - -class OatsLegislationCodes(Enum): - SEC_30_1 = AlcsApplicantType.Land_owner.value - SEC_29_1 = AlcsApplicantType.LFNG.value - SEC_17_3 = AlcsApplicantType.Land_owner.value - SEC_17_1 = AlcsApplicantType.LFNG.value diff --git a/bin/migrate-oats-data/common/oats_legislation_to_alcs_applicant_enum.py b/bin/migrate-oats-data/common/oats_legislation_to_alcs_applicant_enum.py new file mode 100644 index 0000000000..40fdaaf192 --- /dev/null +++ b/bin/migrate-oats-data/common/oats_legislation_to_alcs_applicant_enum.py @@ -0,0 +1,9 @@ +from enum import Enum +from .alcs_application_enum import AlcsApplicantType + + +class OatsLegislationCodesToAlcsApplicant(Enum): + SEC_30_1 = AlcsApplicantType.Land_owner.value + SEC_29_1 = AlcsApplicantType.LFNG.value + SEC_17_3 = AlcsApplicantType.Land_owner.value + SEC_17_1 = AlcsApplicantType.LFNG.value diff --git a/bin/migrate-oats-data/common/oats_to_alcs_nfu_type_enum.py b/bin/migrate-oats-data/common/oats_to_alcs_nfu_type_enum.py new file mode 100644 index 0000000000..6e54b45309 --- /dev/null +++ b/bin/migrate-oats-data/common/oats_to_alcs_nfu_type_enum.py @@ -0,0 +1,14 @@ +from enum import Enum +from .alcs_application_enum import AlcsNfuTypeCode + + +class OatsToAlcsNfuTypes(Enum): + AGR = AlcsNfuTypeCode.Agricultural_Farm.value + CIV = AlcsNfuTypeCode.Civic_Institutional.value + COM = AlcsNfuTypeCode.Commercial_Retail.value + IND = AlcsNfuTypeCode.Industrial.value + OTH = AlcsNfuTypeCode.Other.value + REC = AlcsNfuTypeCode.Recreational.value + RES = AlcsNfuTypeCode.Residential.value + TRA = AlcsNfuTypeCode.Transportation_Utilities.value + UNU = AlcsNfuTypeCode.Unused.value From 4d1c017de04d08d0c45dfee5db13d46f37be1f4e Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Thu, 11 Jan 2024 14:02:25 -0800 Subject: [PATCH 927/954] fix on owner details on parcel change --- .../parcel-details/parcel-entry/parcel-entry.component.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts index bd421ba211..35d9e8a8f0 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts @@ -263,8 +263,9 @@ export class ParcelEntryComponent implements OnInit { this.purchaseDate.enable(); } - this.updateParcelOwners([]); this.filteredOwners = this.mapOwners(this.owners); + this.selectedOwner = undefined; + this.updateParcelOwners([]); this.pid.updateValueAndValidity(); }; From bbff402ef18e5eaef6551814df3d69ae52d94803 Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Mon, 15 Jan 2024 09:13:12 -0800 Subject: [PATCH 928/954] Fix radio error still showing when no owners --- .../primary-contact.component.html | 100 +++++++++--------- .../primary-contact.component.html | 100 +++++++++--------- 2 files changed, 102 insertions(+), 98 deletions(-) diff --git a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html index 1d148ec977..73e0f98faa 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.html @@ -40,58 +40,60 @@ <h2>Primary Contact</h2> <!-- Existing owner --> <div class="form-row" *ngIf="!selectedThirdPartyAgent && !selectedLocalGovernment"> <div class="full-row"> - <label *ngIf="parcelOwners.length > 0" - >Select a Primary Contact from the listed land owners - <ng-container *ngIf="hasCrownParcels">and government contacts</ng-container></label - > - <mat-radio-group - [formControl]="ownersList" - color="primary" - (change)="onSelectOwner($event.value)" - required - [ngClass]="{ error: ownersList.invalid && (ownersList.dirty || ownersList.touched) }" - > - <mat-radio-button *ngFor="let owner of parcelOwners" [value]="owner.uuid" class="radio-option" required> - {{ owner.firstName }} {{ owner.lastName }} - </mat-radio-button> - </mat-radio-group> - <div *ngIf="ownersList.invalid && (ownersList.dirty || ownersList.touched)" class="field-error"> - <mat-icon>warning</mat-icon> - <div *ngIf="ownersList.errors?.['required']">This field is required</div> - </div> + <ng-container *ngIf="parcelOwners.length > 0"> + <label + >Select a Primary Contact from the listed land owners + <ng-container *ngIf="hasCrownParcels">and government contacts</ng-container></label + > + <mat-radio-group + [formControl]="ownersList" + color="primary" + (change)="onSelectOwner($event.value)" + required + [ngClass]="{ error: ownersList.invalid && (ownersList.dirty || ownersList.touched) }" + > + <mat-radio-button *ngFor="let owner of parcelOwners" [value]="owner.uuid" class="radio-option" required> + {{ owner.firstName }} {{ owner.lastName }} + </mat-radio-button> + </mat-radio-group> + <div *ngIf="ownersList.invalid && (ownersList.dirty || ownersList.touched)" class="field-error"> + <mat-icon>warning</mat-icon> + <div *ngIf="ownersList.errors?.['required']">This field is required</div> + </div> - <div - id="owner-info" - class="warning-banner" - *ngIf="selectedOwnerUuid && !selectedThirdPartyAgent && !selectedLocalGovernment" - > - <div class="owner-details"> - <div class="row"> - <div class="key"><strong>First Name:</strong></div> - <div class="value">{{ firstName.value }}</div> - </div> - <div class="row"> - <div class="key"><strong>Last Name:</strong></div> - <div class="value">{{ lastName.value }}</div> - </div> - <div *ngIf="organizationName.value" class="row"> - <div *ngIf="!isCrownOwner && !isGovernmentUser" class="key"><strong>Organization:</strong></div> - <div *ngIf="isCrownOwner" class="key"><strong>Ministry/Department:</strong></div> - <div class="value">{{ organizationName.value }}</div> - </div> - <div class="row"> - <div class="key"><strong>Phone Number:</strong></div> - <div class="value">{{ phoneNumber.value }}</div> - </div> - <div class="row"> - <div class="key"><strong>Email:</strong></div> - <div class="value">{{ email.value }}</div> - </div> - <div class="row"> - <button mat-flat-button (click)="onEdit(selectedOwnerUuid)">Edit information</button> + <div + id="owner-info" + class="warning-banner" + *ngIf="selectedOwnerUuid && !selectedThirdPartyAgent && !selectedLocalGovernment" + > + <div class="owner-details"> + <div class="row"> + <div class="key"><strong>First Name:</strong></div> + <div class="value">{{ firstName.value }}</div> + </div> + <div class="row"> + <div class="key"><strong>Last Name:</strong></div> + <div class="value">{{ lastName.value }}</div> + </div> + <div *ngIf="organizationName.value" class="row"> + <div *ngIf="!isCrownOwner && !isGovernmentUser" class="key"><strong>Organization:</strong></div> + <div *ngIf="isCrownOwner" class="key"><strong>Ministry/Department:</strong></div> + <div class="value">{{ organizationName.value }}</div> + </div> + <div class="row"> + <div class="key"><strong>Phone Number:</strong></div> + <div class="value">{{ phoneNumber.value }}</div> + </div> + <div class="row"> + <div class="key"><strong>Email:</strong></div> + <div class="value">{{ email.value }}</div> + </div> + <div class="row"> + <button mat-flat-button (click)="onEdit(selectedOwnerUuid)">Edit information</button> + </div> </div> </div> - </div> + </ng-container> <app-warning-banner *ngIf="parcelOwners.length === 0 && !selectedThirdPartyAgent && !isGovernmentUser"> No landowners or government contacts are added. Please go back to Step 1 to add information. diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html index a4f4b6fdff..41960db29a 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.html @@ -41,59 +41,61 @@ <h2>Primary Contact</h2> <!-- Existing owner --> <div class="form-row" *ngIf="!selectedThirdPartyAgent && !selectedLocalGovernment"> <div class="full-row"> - <label *ngIf="parcelOwners.length > 0" - >Select a Primary Contact from the listed land owners - <ng-container *ngIf="hasCrownParcels">and government contacts</ng-container></label - > + <ng-container *ngIf="parcelOwners.length > 0"> + <label + >Select a Primary Contact from the listed land owners + <ng-container *ngIf="hasCrownParcels">and government contacts</ng-container></label + > - <mat-radio-group - [formControl]="ownersList" - color="primary" - (change)="onSelectOwner($event.value)" - required - [ngClass]="{ error: ownersList.invalid && (ownersList.dirty || ownersList.touched) }" - > - <mat-radio-button *ngFor="let owner of parcelOwners" [value]="owner.uuid" class="radio-option" required> - {{ owner.firstName }} {{ owner.lastName }} - </mat-radio-button> - </mat-radio-group> - <div *ngIf="ownersList.invalid && (ownersList.dirty || ownersList.touched)" class="field-error"> - <mat-icon>warning</mat-icon> - <div *ngIf="ownersList.errors?.['required']">This field is required</div> - </div> + <mat-radio-group + [formControl]="ownersList" + color="primary" + (change)="onSelectOwner($event.value)" + required + [ngClass]="{ error: ownersList.invalid && (ownersList.dirty || ownersList.touched) }" + > + <mat-radio-button *ngFor="let owner of parcelOwners" [value]="owner.uuid" class="radio-option" required> + {{ owner.firstName }} {{ owner.lastName }} + </mat-radio-button> + </mat-radio-group> + <div *ngIf="ownersList.invalid && (ownersList.dirty || ownersList.touched)" class="field-error"> + <mat-icon>warning</mat-icon> + <div *ngIf="ownersList.errors?.['required']">This field is required</div> + </div> - <div - id="owner-info" - class="warning-banner" - *ngIf="selectedOwnerUuid && selectedOwnerUuid !== 'agent' && !selectedLocalGovernment" - > - <div class="owner-details"> - <div class="row"> - <div class="key"><strong>First Name:</strong></div> - <div class="value">{{ firstName.value }}</div> - </div> - <div class="row"> - <div class="key"><strong>Last Name:</strong></div> - <div class="value">{{ lastName.value }}</div> - </div> - <div *ngIf="organizationName.value" class="row"> - <div *ngIf="!isCrownOwner && !isGovernmentUser" class="key"><strong>Organization:</strong></div> - <div *ngIf="isCrownOwner" class="key"><strong>Ministry/Department:</strong></div> - <div class="value">{{ organizationName.value }}</div> - </div> - <div class="row"> - <div class="key"><strong>Phone Number:</strong></div> - <div class="value">{{ phoneNumber.value }}</div> - </div> - <div class="row"> - <div class="key"><strong>Email:</strong></div> - <div class="value">{{ email.value }}</div> - </div> - <div class="row"> - <button mat-flat-button (click)="onEdit(selectedOwnerUuid)">Edit information</button> + <div + id="owner-info" + class="warning-banner" + *ngIf="selectedOwnerUuid && selectedOwnerUuid !== 'agent' && !selectedLocalGovernment" + > + <div class="owner-details"> + <div class="row"> + <div class="key"><strong>First Name:</strong></div> + <div class="value">{{ firstName.value }}</div> + </div> + <div class="row"> + <div class="key"><strong>Last Name:</strong></div> + <div class="value">{{ lastName.value }}</div> + </div> + <div *ngIf="organizationName.value" class="row"> + <div *ngIf="!isCrownOwner && !isGovernmentUser" class="key"><strong>Organization:</strong></div> + <div *ngIf="isCrownOwner" class="key"><strong>Ministry/Department:</strong></div> + <div class="value">{{ organizationName.value }}</div> + </div> + <div class="row"> + <div class="key"><strong>Phone Number:</strong></div> + <div class="value">{{ phoneNumber.value }}</div> + </div> + <div class="row"> + <div class="key"><strong>Email:</strong></div> + <div class="value">{{ email.value }}</div> + </div> + <div class="row"> + <button mat-flat-button (click)="onEdit(selectedOwnerUuid)">Edit information</button> + </div> </div> </div> - </div> + </ng-container> <app-warning-banner *ngIf="parcelOwners.length === 0 && !isGovernmentUser && !selectedThirdPartyAgent"> No landowners or government contacts are added. Please go back to Step 1 to add information. From a4d21bd815d3f4444db9fcc7821122393f5d59c2 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Mon, 15 Jan 2024 11:19:49 -0800 Subject: [PATCH 929/954] QA Fixes for Show / Hide * Update some Step 8s for conditional rendering * Disable owner search dropdown entirely * Disable PMBC search * Apply disable/enable to SRWs --- .../cove-details/cove-details.component.html | 24 +- .../incl-details/incl-details.component.html | 2 +- .../naru-details/naru-details.component.html | 362 +++++++++--------- .../parcel/parcel.component.html | 2 +- .../parcel/parcel.component.spec.ts | 6 - .../parcel/parcel.component.ts | 2 - .../parcel-entry/parcel-entry.component.ts | 12 +- .../parcel-entry/parcel-entry.component.ts | 12 +- .../parcel/parcel.component.html | 273 ++++++------- .../parcel-entry/parcel-entry.component.html | 9 +- .../parcel-entry.component.spec.ts | 6 - .../parcel-entry/parcel-entry.component.ts | 77 ++-- 12 files changed, 414 insertions(+), 373 deletions(-) diff --git a/portal-frontend/src/app/features/applications/application-details/cove-details/cove-details.component.html b/portal-frontend/src/app/features/applications/application-details/cove-details/cove-details.component.html index 729c1af3ae..f7fde7b295 100644 --- a/portal-frontend/src/app/features/applications/application-details/cove-details/cove-details.component.html +++ b/portal-frontend/src/app/features/applications/application-details/cove-details/cove-details.component.html @@ -57,18 +57,20 @@ <app-no-data [showRequired]="showErrors" *ngIf="_applicationSubmission.coveHasDraft === null"></app-no-data> </div> - <div class="subheading2 grid-1">Draft Covenant</div> - <div class="grid-double"> - <div *ngFor="let file of srwTerms"> - <a (click)="openFile(file.uuid)"> - {{ file.fileName }} - </a> + <ng-container *ngIf="_applicationSubmission.coveHasDraft"> + <div class="subheading2 grid-1">Draft Covenant</div> + <div class="grid-double"> + <div *ngFor="let file of srwTerms"> + <a (click)="openFile(file.uuid)"> + {{ file.fileName }} + </a> + </div> + <app-no-data + [showRequired]="showErrors && !!_applicationSubmission.coveHasDraft" + *ngIf="srwTerms.length === 0" + ></app-no-data> </div> - <app-no-data - [showRequired]="showErrors && !!_applicationSubmission.coveHasDraft" - *ngIf="srwTerms.length === 0" - ></app-no-data> - </div> + </ng-container> <div *ngIf="showEdit" class="edit-button"> <button mat-flat-button (click)="onEditSection(5)" color="accent">Edit Section</button> diff --git a/portal-frontend/src/app/features/applications/application-details/incl-details/incl-details.component.html b/portal-frontend/src/app/features/applications/application-details/incl-details/incl-details.component.html index 2cab8ce8a9..128a661d79 100644 --- a/portal-frontend/src/app/features/applications/application-details/incl-details/incl-details.component.html +++ b/portal-frontend/src/app/features/applications/application-details/incl-details/incl-details.component.html @@ -75,8 +75,8 @@ <a (click)="openFile(file.uuid)"> {{ file.fileName }} </a> - <app-no-data [showRequired]="showErrors" *ngIf="reportOfPublicHearing.length === 0"></app-no-data> </div> + <app-no-data [showRequired]="showErrors" *ngIf="reportOfPublicHearing.length === 0"></app-no-data> </div> </ng-container> diff --git a/portal-frontend/src/app/features/applications/application-details/naru-details/naru-details.component.html b/portal-frontend/src/app/features/applications/application-details/naru-details/naru-details.component.html index 41de0307fe..a4e0460012 100644 --- a/portal-frontend/src/app/features/applications/application-details/naru-details/naru-details.component.html +++ b/portal-frontend/src/app/features/applications/application-details/naru-details/naru-details.component.html @@ -7,210 +7,222 @@ <app-no-data [showRequired]="showErrors" *ngIf="_applicationSubmission.naruSubtype === null"></app-no-data> </div> - <div class="subheading2 grid-1">What is the purpose of the proposal?</div> - <div class="grid-double"> - {{ _applicationSubmission.purpose }} - <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.purpose"></app-no-data> - </div> - - <ng-container *ngIf="_applicationSubmission.naruSubtype?.code === 'ARFU'"> - <div class="subheading2 grid-1"> - What is the total floor area (m<sup>2</sup>) of the proposed additional residence? - </div> + <ng-container *ngIf="_applicationSubmission.naruSubtype"> + <div class="subheading2 grid-1">What is the purpose of the proposal?</div> <div class="grid-double"> - {{ _applicationSubmission.naruFloorArea }} <span *ngIf="_applicationSubmission.naruFloorArea">m<sup>2</sup></span> - <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.naruFloorArea"></app-no-data> + {{ _applicationSubmission.purpose }} + <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.purpose"></app-no-data> </div> - <div class="subheading2 grid-1"> - Describe the necessity for an additional residence for farm use and how it will support agriculture in the short - or long term. - </div> - <div class="grid-double"> - {{ _applicationSubmission.naruResidenceNecessity }} - <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.naruResidenceNecessity"></app-no-data> - </div> + <ng-container *ngIf="_applicationSubmission.naruSubtype?.code === 'ARFU'"> + <div class="subheading2 grid-1"> + What is the total floor area (m<sup>2</sup>) of the proposed additional residence? + </div> + <div class="grid-double"> + {{ _applicationSubmission.naruFloorArea }} + <span *ngIf="_applicationSubmission.naruFloorArea">m<sup>2</sup></span> + <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.naruFloorArea"></app-no-data> + </div> - <div class="subheading2 grid-1">Describe the rationale for the proposed location of the additional residence.</div> - <div class="grid-double"> - {{ _applicationSubmission.naruLocationRationale }} - <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.naruLocationRationale"></app-no-data> - </div> + <div class="subheading2 grid-1"> + Describe the necessity for an additional residence for farm use and how it will support agriculture in the short + or long term. + </div> + <div class="grid-double"> + {{ _applicationSubmission.naruResidenceNecessity }} + <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.naruResidenceNecessity"></app-no-data> + </div> - <div class="subheading2 grid-1"> - Provide the total area (m<sup>2</sup>) and a description of infrastructure necessary to support the additional - residence. - </div> - <div class="grid-double"> - {{ _applicationSubmission.naruInfrastructure }} - <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.naruInfrastructure"></app-no-data> - </div> - </ng-container> + <div class="subheading2 grid-1"> + Describe the rationale for the proposed location of the additional residence. + </div> + <div class="grid-double"> + {{ _applicationSubmission.naruLocationRationale }} + <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.naruLocationRationale"></app-no-data> + </div> - <ng-container *ngIf="_applicationSubmission.naruSubtype?.code === 'PRIN'"> - <div class="subheading2 grid-1"> - What is the total floor area (m<sup>2</sup>) of the proposed principal residence? - </div> - <div class="grid-double"> - {{ _applicationSubmission.naruFloorArea }} <span *ngIf="_applicationSubmission.naruFloorArea">m<sup>2</sup></span> - <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.naruFloorArea"></app-no-data> - </div> + <div class="subheading2 grid-1"> + Provide the total area (m<sup>2</sup>) and a description of infrastructure necessary to support the additional + residence. + </div> + <div class="grid-double"> + {{ _applicationSubmission.naruInfrastructure }} + <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.naruInfrastructure"></app-no-data> + </div> + </ng-container> - <div class="subheading2 grid-1"> - Describe how the proposal for a principal residence more than 500 m<sup>2</sup> will support agriculture in the - short or long term. - </div> - <div class="grid-double"> - {{ _applicationSubmission.naruResidenceNecessity }} - <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.naruResidenceNecessity"></app-no-data> - </div> + <ng-container *ngIf="_applicationSubmission.naruSubtype?.code === 'PRIN'"> + <div class="subheading2 grid-1"> + What is the total floor area (m<sup>2</sup>) of the proposed principal residence? + </div> + <div class="grid-double"> + {{ _applicationSubmission.naruFloorArea }} + <span *ngIf="_applicationSubmission.naruFloorArea">m<sup>2</sup></span> + <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.naruFloorArea"></app-no-data> + </div> - <div class="subheading2 grid-1">Describe the rationale for the proposed location of the principal residence.</div> - <div class="grid-double"> - {{ _applicationSubmission.naruLocationRationale }} - <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.naruLocationRationale"></app-no-data> - </div> + <div class="subheading2 grid-1"> + Describe how the proposal for a principal residence more than 500 m<sup>2</sup> will support agriculture in the + short or long term. + </div> + <div class="grid-double"> + {{ _applicationSubmission.naruResidenceNecessity }} + <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.naruResidenceNecessity"></app-no-data> + </div> - <div class="subheading2 grid-1"> - Provide the total area (m<sup>2</sup>) and a description of infrastructure necessary to support the additional - residence. - </div> - <div class="grid-double"> - {{ _applicationSubmission.naruInfrastructure }} - <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.naruInfrastructure"></app-no-data> - </div> - </ng-container> + <div class="subheading2 grid-1">Describe the rationale for the proposed location of the principal residence.</div> + <div class="grid-double"> + {{ _applicationSubmission.naruLocationRationale }} + <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.naruLocationRationale"></app-no-data> + </div> - <ng-container *ngIf="_applicationSubmission.naruSubtype?.code === 'TOUR'"> - <div class="subheading2 grid-1">What is the total floor area (m<sup>2</sup>) of the proposed accommodation?</div> - <div class="grid-double"> - {{ _applicationSubmission.naruFloorArea }} <span *ngIf="_applicationSubmission.naruFloorArea">m<sup>2</sup></span> - <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.naruFloorArea"></app-no-data> - </div> + <div class="subheading2 grid-1"> + Provide the total area (m<sup>2</sup>) and a description of infrastructure necessary to support the additional + residence. + </div> + <div class="grid-double"> + {{ _applicationSubmission.naruInfrastructure }} + <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.naruInfrastructure"></app-no-data> + </div> + </ng-container> + + <ng-container *ngIf="_applicationSubmission.naruSubtype?.code === 'TOUR'"> + <div class="subheading2 grid-1">What is the total floor area (m<sup>2</sup>) of the proposed accommodation?</div> + <div class="grid-double"> + {{ _applicationSubmission.naruFloorArea }} + <span *ngIf="_applicationSubmission.naruFloorArea">m<sup>2</sup></span> + <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.naruFloorArea"></app-no-data> + </div> - <div class="subheading2 grid-1">How many "sleeping units" in total are proposed?</div> - <div class="grid-double"> - {{ _applicationSubmission.naruSleepingUnits }} - <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.naruSleepingUnits"></app-no-data> - </div> + <div class="subheading2 grid-1">How many "sleeping units" in total are proposed?</div> + <div class="grid-double"> + {{ _applicationSubmission.naruSleepingUnits }} + <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.naruSleepingUnits"></app-no-data> + </div> + + <div class="subheading2 grid-1"> + Describe how the proposal for tourism accommodation will support agriculture in the short or long term. + </div> + <div class="grid-double"> + {{ _applicationSubmission.naruResidenceNecessity }} + <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.naruResidenceNecessity"></app-no-data> + </div> + + <div class="subheading2 grid-1"> + Describe the rationale for the proposed location of the tourism accommodation. + </div> + <div class="grid-double"> + {{ _applicationSubmission.naruLocationRationale }} + <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.naruLocationRationale"></app-no-data> + </div> + + <div class="subheading2 grid-1"> + Provide the total area (m<sup>2</sup>) and a description of infrastructure necessary to support the tourism + accommodation. + </div> + <div class="grid-double"> + {{ _applicationSubmission.naruInfrastructure }} + <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.naruInfrastructure"></app-no-data> + </div> + + <div class="subheading2 grid-1">Describe any agri-tourism that is currently taking place on the property.</div> + <div class="grid-double"> + {{ _applicationSubmission.naruAgriTourism }} + <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.naruAgriTourism"></app-no-data> + </div> + </ng-container> <div class="subheading2 grid-1"> - Describe how the proposal for tourism accommodation will support agriculture in the short or long term. + Describe the total floor area (m<sup>2</sup>), type, number, and occupancy of all residential structures currently + located on the property. </div> <div class="grid-double"> - {{ _applicationSubmission.naruResidenceNecessity }} - <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.naruResidenceNecessity"></app-no-data> + {{ _applicationSubmission.naruExistingStructures }} + <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.naruExistingStructures"></app-no-data> </div> - <div class="subheading2 grid-1">Describe the rationale for the proposed location of the tourism accommodation.</div> + <div class="subheading2 grid-1">Proposal Map / Site Plan</div> <div class="grid-double"> - {{ _applicationSubmission.naruLocationRationale }} - <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.naruLocationRationale"></app-no-data> + <a *ngFor="let map of proposalMap" (click)="openFile(map.uuid)"> + {{ map.fileName }} + </a> + <app-no-data [showRequired]="showErrors" *ngIf="proposalMap.length === 0"></app-no-data> </div> <div class="subheading2 grid-1"> - Provide the total area (m<sup>2</sup>) and a description of infrastructure necessary to support the tourism - accommodation. + Do you need to import any fill to construct or conduct the proposed non-adhering residential use? </div> <div class="grid-double"> - {{ _applicationSubmission.naruInfrastructure }} - <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.naruInfrastructure"></app-no-data> - </div> - - <div class="subheading2 grid-1">Describe any agri-tourism that is currently taking place on the property.</div> - <div class="grid-double"> - {{ _applicationSubmission.naruAgriTourism }} - <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.naruAgriTourism"></app-no-data> + <span *ngIf="_applicationSubmission.naruWillImportFill !== null">{{ + _applicationSubmission.naruWillImportFill ? 'Yes' : 'No' + }}</span> + <app-no-data [showRequired]="showErrors" *ngIf="_applicationSubmission.naruWillImportFill === null"></app-no-data> </div> - </ng-container> - - <div class="subheading2 grid-1"> - Describe the total floor area (m<sup>2</sup>), type, number, and occupancy of all residential structures currently - located on the property. - </div> - <div class="grid-double"> - {{ _applicationSubmission.naruExistingStructures }} - <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.naruExistingStructures"></app-no-data> - </div> - - <div class="subheading2 grid-1">Proposal Map / Site Plan</div> - <div class="grid-double"> - <a *ngFor="let map of proposalMap" (click)="openFile(map.uuid)"> - {{ map.fileName }} - </a> - <app-no-data [showRequired]="showErrors" *ngIf="proposalMap.length === 0"></app-no-data> - </div> - - <div class="subheading2 grid-1"> - Do you need to import any fill to construct or conduct the proposed non-adhering residential use? - </div> - <div class="grid-double"> - <span *ngIf="_applicationSubmission.naruWillImportFill !== null">{{ - _applicationSubmission.naruWillImportFill ? 'Yes' : 'No' - }}</span> - <app-no-data [showRequired]="showErrors" *ngIf="_applicationSubmission.naruWillImportFill === null"></app-no-data> - </div> - <ng-container *ngIf="_applicationSubmission.naruWillImportFill"> - <div class="subheading2 grid-1">Describe the type and amount of fill proposed to be placed.</div> - <div class="grid-double"> - {{ _applicationSubmission.naruFillType }} - <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.naruFillType"></app-no-data> - </div> + <ng-container *ngIf="_applicationSubmission.naruWillImportFill"> + <div class="subheading2 grid-1">Describe the type and amount of fill proposed to be placed.</div> + <div class="grid-double"> + {{ _applicationSubmission.naruFillType }} + <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.naruFillType"></app-no-data> + </div> - <div class="subheading2 grid-1">Briefly describe the origin and quality of fill.</div> - <div class="grid-double"> - {{ _applicationSubmission.naruFillOrigin }} - <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.naruFillOrigin"></app-no-data> - </div> + <div class="subheading2 grid-1">Briefly describe the origin and quality of fill.</div> + <div class="grid-double"> + {{ _applicationSubmission.naruFillOrigin }} + <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.naruFillOrigin"></app-no-data> + </div> - <div class="subheading2 grid-1">Placement of Fill Project Duration</div> - <div class="grid-double"> - <div *ngIf="_applicationSubmission.naruProjectDuration">{{ _applicationSubmission.naruProjectDuration }}</div> - <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.naruProjectDuration"></app-no-data> - </div> + <div class="subheading2 grid-1">Placement of Fill Project Duration</div> + <div class="grid-double"> + <div *ngIf="_applicationSubmission.naruProjectDuration">{{ _applicationSubmission.naruProjectDuration }}</div> + <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.naruProjectDuration"></app-no-data> + </div> - <div class="full-width soil-table"> - <div></div> - <div class="subheading2">Fill to be Placed</div> - - <div class="subheading2">Volume</div> - <div> - {{ _applicationSubmission.naruToPlaceVolume }} - <span *ngIf="_applicationSubmission.naruToPlaceVolume !== null">m<sup>3</sup></span> - <app-no-data - [showRequired]="showErrors" - *ngIf="_applicationSubmission.naruToPlaceVolume === null" - ></app-no-data> - </div> - - <div class="subheading2">Area</div> - <div> - {{ _applicationSubmission.naruToPlaceArea }} - <span *ngIf="_applicationSubmission.naruToPlaceArea !== null">m<sup>2</sup></span> - <app-no-data [showRequired]="showErrors" *ngIf="_applicationSubmission.naruToPlaceArea === null"></app-no-data> - </div> - - <div class="subheading2">Maximum Depth</div> - <div> - {{ _applicationSubmission.naruToPlaceMaximumDepth }} - <span *ngIf="_applicationSubmission.naruToPlaceMaximumDepth !== null">m</span> - <app-no-data - [showRequired]="showErrors" - *ngIf="_applicationSubmission.naruToPlaceMaximumDepth === null" - ></app-no-data> - </div> - - <div class="subheading2">Average Depth</div> - <div> - {{ _applicationSubmission.naruToPlaceAverageDepth }} - <span *ngIf="_applicationSubmission.naruToPlaceAverageDepth !== null">m</span> - <app-no-data - [showRequired]="showErrors" - *ngIf="_applicationSubmission.naruToPlaceAverageDepth === null" - ></app-no-data> + <div class="full-width soil-table"> + <div></div> + <div class="subheading2">Fill to be Placed</div> + + <div class="subheading2">Volume</div> + <div> + {{ _applicationSubmission.naruToPlaceVolume }} + <span *ngIf="_applicationSubmission.naruToPlaceVolume !== null">m<sup>3</sup></span> + <app-no-data + [showRequired]="showErrors" + *ngIf="_applicationSubmission.naruToPlaceVolume === null" + ></app-no-data> + </div> + + <div class="subheading2">Area</div> + <div> + {{ _applicationSubmission.naruToPlaceArea }} + <span *ngIf="_applicationSubmission.naruToPlaceArea !== null">m<sup>2</sup></span> + <app-no-data + [showRequired]="showErrors" + *ngIf="_applicationSubmission.naruToPlaceArea === null" + ></app-no-data> + </div> + + <div class="subheading2">Maximum Depth</div> + <div> + {{ _applicationSubmission.naruToPlaceMaximumDepth }} + <span *ngIf="_applicationSubmission.naruToPlaceMaximumDepth !== null">m</span> + <app-no-data + [showRequired]="showErrors" + *ngIf="_applicationSubmission.naruToPlaceMaximumDepth === null" + ></app-no-data> + </div> + + <div class="subheading2">Average Depth</div> + <div> + {{ _applicationSubmission.naruToPlaceAverageDepth }} + <span *ngIf="_applicationSubmission.naruToPlaceAverageDepth !== null">m</span> + <app-no-data + [showRequired]="showErrors" + *ngIf="_applicationSubmission.naruToPlaceAverageDepth === null" + ></app-no-data> + </div> </div> - </div> + </ng-container> </ng-container> <div *ngIf="showEdit" class="edit-button"> diff --git a/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.html b/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.html index ed5069d40f..8aedc1a564 100644 --- a/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.html +++ b/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.html @@ -1,4 +1,4 @@ -<h3 class="flex-item">{{ pageTitle }}</h3> +<h3 class="flex-item">1. Identify Parcel(s) Under Application</h3> <div class="review-table"> <ng-container *ngFor="let parcel of parcels; let parcelInd = index"> <div class="full-width parcel-header"> diff --git a/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.spec.ts b/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.spec.ts index 72ddecbc10..f98cdec35a 100644 --- a/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.spec.ts +++ b/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.spec.ts @@ -14,12 +14,10 @@ describe('ParcelComponent', () => { let fixture: ComponentFixture<ParcelComponent>; let mockApplicationParcelService: DeepMocked<ApplicationParcelService>; - let mockAppOwnerService: DeepMocked<ApplicationOwnerService>; let mockAppDocService: DeepMocked<ApplicationDocumentService>; beforeEach(async () => { mockApplicationParcelService = createMock(); - mockAppOwnerService = createMock(); mockAppDocService = createMock(); await TestBed.configureTestingModule({ @@ -29,10 +27,6 @@ describe('ParcelComponent', () => { provide: ApplicationParcelService, useValue: mockApplicationParcelService, }, - { - provide: ApplicationOwnerService, - useValue: mockAppOwnerService, - }, { provide: ApplicationDocumentService, useValue: mockAppDocService, diff --git a/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.ts b/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.ts index 4d8fdd5859..af04c7693d 100644 --- a/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.ts +++ b/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.ts @@ -55,7 +55,6 @@ export class ParcelComponent { PARCEL_OWNERSHIP_TYPES = PARCEL_OWNERSHIP_TYPE; - pageTitle: string = '1. Identify Parcel(s) Under Application'; showCertificateOfTitle: boolean = true; navigationStepInd = 0; @@ -67,7 +66,6 @@ export class ParcelComponent { constructor( private applicationParcelService: ApplicationParcelService, private applicationDocumentService: ApplicationDocumentService, - private ownerService: ApplicationOwnerService, private router: Router ) {} diff --git a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts index bd421ba211..14fd188183 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts @@ -72,8 +72,11 @@ export class ParcelEntryComponent implements OnInit { isCrownLand: boolean | null = null; isCertificateOfTitleRequired = true; - pidPin = new FormControl<string>(''); parcelType = new FormControl<string | null>(null, [Validators.required]); + pidPin = new FormControl<string>({ + disabled: true, + value: '', + }); legalDescription = new FormControl<string | null>( { disabled: true, @@ -145,7 +148,10 @@ export class ParcelEntryComponent implements OnInit { pidPinPlaceholder = ''; selectedOwner?: ApplicationOwnerDto = undefined; - ownerInput = new FormControl<string | null>(null); + ownerInput = new FormControl<string | null>({ + disabled: true, + value: null, + }); PARCEL_OWNERSHIP_TYPES = PARCEL_OWNERSHIP_TYPE; maxPurchasedDate = new Date(); @@ -246,6 +252,7 @@ export class ParcelEntryComponent implements OnInit { this.parcel.owners.length > 0; this.parcelForm.enable(); + this.ownerInput.enable(); const changeParcelType = () => { if ($event.value === this.PARCEL_OWNERSHIP_TYPES.CROWN) { @@ -484,6 +491,7 @@ export class ParcelEntryComponent implements OnInit { if (this.parcel.ownershipTypeCode) { this.parcelForm.enable(); + this.ownerInput.enable(); } this.isCrownLand = this.parcelType.value diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.ts index 1428070fe7..487c0c00c9 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.ts @@ -68,7 +68,10 @@ export class ParcelEntryComponent implements OnInit { showVirusError = false; parcelType = new FormControl<string | null>(null, [Validators.required]); - pidPin = new FormControl<string>(''); + pidPin = new FormControl<string>({ + disabled: true, + value: '', + }); legalDescription = new FormControl<string | null>( { disabled: true, @@ -141,7 +144,10 @@ export class ParcelEntryComponent implements OnInit { pidPinPlaceholder = ''; selectedOwner?: NoticeOfIntentOwnerDto = undefined; - ownerInput = new FormControl<string | null>(null); + ownerInput = new FormControl<string | null>({ + disabled: true, + value: null, + }); PARCEL_OWNERSHIP_TYPES = PARCEL_OWNERSHIP_TYPE; maxPurchasedDate = new Date(); @@ -243,6 +249,7 @@ export class ParcelEntryComponent implements OnInit { this.civicAddress.value; this.parcelForm.enable(); + this.ownerInput.enable(); const changeParcelType = () => { if ($event.value === this.PARCEL_OWNERSHIP_TYPES.CROWN) { @@ -473,6 +480,7 @@ export class ParcelEntryComponent implements OnInit { if (this.parcel.ownershipTypeCode) { this.parcelForm.enable(); + this.ownerInput.enable(); } this.isCrownLand = this.parcelType.value diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/parcel/parcel.component.html b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/parcel/parcel.component.html index 6daaa8ffa1..e48fd75918 100644 --- a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/parcel/parcel.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/parcel/parcel.component.html @@ -29,153 +29,168 @@ <h4>Parcel #{{ parcelInd + 1 }}</h4> {{ parcel.ownershipType?.label }} <app-no-data [showRequired]="showErrors" *ngIf="!parcel.ownershipType"></app-no-data> </div> - <div class="subheading2 grid-1">Legal Description</div> - <div class="grid-double"> - {{ parcel.legalDescription }} - <app-no-data - [showRequired]="showErrors" - *ngIf="parcel.validation?.isLegalDescriptionRequired || false" - ></app-no-data> - </div> - <div class="subheading2 grid-1">Approx. Map Area</div> - <div class="grid-double"> - {{ parcel.mapAreaHectares }} - <span *ngIf="parcel.mapAreaHectares !== null">ha</span> - <app-no-data - [showRequired]="showErrors" - *ngIf="parcel.validation?.isMapAreaHectaresRequired || false" - ></app-no-data> - </div> - <div class="subheading2 grid-1"> - PID {{ parcel.ownershipType?.code === PARCEL_OWNERSHIP_TYPES.CROWN ? '(optional)' : '' }} - </div> - <div class="grid-double"> - <span *ngIf="parcel.pid">{{ parcel.pid | mask : '000-000-000' }}</span> - <app-no-data [showRequired]="showErrors && !!parcel.validation?.isPidRequired" *ngIf="!parcel.pid"></app-no-data> - <app-validation-error *ngIf="showErrors && parcel.pid && parcel.pid.length < 9"> - Invalid Format - </app-validation-error> - </div> - <ng-container *ngIf="parcel.ownershipType?.code === PARCEL_OWNERSHIP_TYPES.CROWN"> - <div class="subheading2 grid-1">PIN (optional)</div> + <ng-container *ngIf="parcel.ownershipType"> + <div class="subheading2 grid-1">Legal Description</div> <div class="grid-double"> - {{ parcel.pin }} + {{ parcel.legalDescription }} <app-no-data - [showRequired]="showErrors && !!parcel.validation?.isPinRequired" - *ngIf="!parcel.pin" + [showRequired]="showErrors" + *ngIf="parcel.validation?.isLegalDescriptionRequired || false" ></app-no-data> </div> - </ng-container> - <ng-container *ngIf="parcel.ownershipType?.code === PARCEL_OWNERSHIP_TYPES.FEE_SIMPLE"> - <div class="subheading2 grid-1">Purchase Date</div> + <div class="subheading2 grid-1">Approx. Map Area</div> <div class="grid-double"> - {{ parcel.purchasedDate | date }} + {{ parcel.mapAreaHectares }} + <span *ngIf="parcel.mapAreaHectares !== null">ha</span> <app-no-data - [showRequired]="showErrors && !!parcel.validation?.isPurchasedDateRequired" - *ngIf="!parcel.purchasedDate" - > - </app-no-data> + [showRequired]="showErrors" + *ngIf="parcel.validation?.isMapAreaHectaresRequired || false" + ></app-no-data> </div> - </ng-container> - <div class="subheading2 grid-1">Farm Classification</div> - <div class="grid-double"> - <span *ngIf="parcel.isFarm !== null">{{ parcel.isFarm ? 'Yes' : 'No' }}</span> - <app-no-data [showRequired]="showErrors" *ngIf="parcel.isFarm === null"></app-no-data> - </div> - <div class="subheading2 grid-1">Civic Address</div> - <div class="grid-double"> - {{ parcel.civicAddress }} - <app-no-data [showRequired]="showErrors" *ngIf="!parcel.civicAddress"></app-no-data> - </div> - <div class="subheading2 grid-1">Certificate Of Title</div> - <div class="grid-double"> - <div *ngIf="parcel.certificateOfTitle"> - <a (click)="onOpenFile(parcel.certificateOfTitle.uuid)">{{ parcel.certificateOfTitle.fileName }}</a> + <div class="subheading2 grid-1"> + PID {{ parcel.ownershipType.code === PARCEL_OWNERSHIP_TYPES.CROWN ? '(optional)' : '' }} </div> - <app-no-data - [showRequired]="showErrors && !!parcel.validation?.isCertificateRequired" - *ngIf="!parcel.validation?.isCertificateUploaded" - ></app-no-data> - </div> - - <ng-container *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN"> - <h5 *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">Government Parcel Contact</h5> - <ng-container *ngIf="parcel.owners[0]"> - <div class="subheading2 grid-1">First Name</div> - <div class="grid-double"> - {{ parcel.owners[0].firstName }} - <app-no-data [showRequired]="showErrors" *ngIf="!parcel.owners[0].firstName"></app-no-data> - </div> - <div class="subheading2 grid-1" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">Last Name</div> - <div class="grid-double"> - {{ parcel.owners[0].lastName }} - <app-no-data [showRequired]="showErrors" *ngIf="!parcel.owners[0].lastName"></app-no-data> - </div> - <div class="subheading2 grid-1" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">Ministry or Department</div> - <div class="grid-double"> - {{ parcel.owners[0].organizationName }} - <app-no-data [showRequired]="showErrors" *ngIf="!parcel.owners[0].organizationName"></app-no-data> - </div> - <div class="subheading2 grid-1" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">Phone</div> + <div class="grid-double"> + <span *ngIf="parcel.pid">{{ parcel.pid | mask : '000-000-000' }}</span> + <app-no-data + [showRequired]="showErrors && !!parcel.validation?.isPidRequired" + *ngIf="!parcel.pid" + ></app-no-data> + <app-validation-error *ngIf="showErrors && parcel.pid && parcel.pid.length < 9"> + Invalid Format + </app-validation-error> + </div> + <ng-container *ngIf="parcel.ownershipType.code === PARCEL_OWNERSHIP_TYPES.CROWN"> + <div class="subheading2 grid-1">PIN (optional)</div> <div class="grid-double"> - {{ parcel.owners[0].phoneNumber }} - <app-no-data [showRequired]="showErrors" *ngIf="!parcel.owners[0].phoneNumber"></app-no-data> + {{ parcel.pin }} + <app-no-data + [showRequired]="showErrors && !!parcel.validation?.isPinRequired" + *ngIf="!parcel.pin" + ></app-no-data> </div> - <div class="subheading2 grid-1" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">Email</div> + </ng-container> + <ng-container *ngIf="parcel.ownershipType.code === PARCEL_OWNERSHIP_TYPES.FEE_SIMPLE"> + <div class="subheading2 grid-1">Purchase Date</div> <div class="grid-double"> - {{ parcel.owners[0].email }} - <app-no-data [showRequired]="showErrors" *ngIf="!parcel.owners[0].email"></app-no-data> + {{ parcel.purchasedDate | date }} + <app-no-data + [showRequired]="showErrors && !!parcel.validation?.isPurchasedDateRequired" + *ngIf="!parcel.purchasedDate" + > + </app-no-data> </div> - <div class="subheading2 grid-1" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">Crown Type</div> - <div class="grid-double"> - {{ parcel.owners[0].crownLandOwnerType === 'provincial' ? 'Provincial Crown' : ''}} - {{ parcel.owners[0].crownLandOwnerType === 'federal' ? 'Federal Crown' : ''}} - <app-no-data [showRequired]="showErrors" *ngIf="!parcel.owners[0].crownLandOwnerType"></app-no-data> + </ng-container> + <div class="subheading2 grid-1">Farm Classification</div> + <div class="grid-double"> + <span *ngIf="parcel.isFarm !== null">{{ parcel.isFarm ? 'Yes' : 'No' }}</span> + <app-no-data [showRequired]="showErrors" *ngIf="parcel.isFarm === null"></app-no-data> + </div> + <div class="subheading2 grid-1">Civic Address</div> + <div class="grid-double"> + {{ parcel.civicAddress }} + <app-no-data [showRequired]="showErrors" *ngIf="!parcel.civicAddress"></app-no-data> + </div> + <div class="subheading2 grid-1">Certificate Of Title</div> + <div class="grid-double"> + <div *ngIf="parcel.certificateOfTitle"> + <a (click)="onOpenFile(parcel.certificateOfTitle.uuid)">{{ parcel.certificateOfTitle.fileName }}</a> </div> + <app-no-data + [showRequired]="showErrors && !!parcel.validation?.isCertificateRequired" + *ngIf="!parcel.validation?.isCertificateUploaded" + ></app-no-data> + </div> + + <ng-container *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN"> + <h5 *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">Government Parcel Contact</h5> + <ng-container *ngIf="parcel.owners[0]"> + <div class="subheading2 grid-1">First Name</div> + <div class="grid-double"> + {{ parcel.owners[0].firstName }} + <app-no-data [showRequired]="showErrors" *ngIf="!parcel.owners[0].firstName"></app-no-data> + </div> + <div class="subheading2 grid-1" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN"> + Last Name + </div> + <div class="grid-double"> + {{ parcel.owners[0].lastName }} + <app-no-data [showRequired]="showErrors" *ngIf="!parcel.owners[0].lastName"></app-no-data> + </div> + <div class="subheading2 grid-1" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN"> + Ministry or Department + </div> + <div class="grid-double"> + {{ parcel.owners[0].organizationName }} + <app-no-data [showRequired]="showErrors" *ngIf="!parcel.owners[0].organizationName"></app-no-data> + </div> + <div class="subheading2 grid-1" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">Phone</div> + <div class="grid-double"> + {{ parcel.owners[0].phoneNumber }} + <app-no-data [showRequired]="showErrors" *ngIf="!parcel.owners[0].phoneNumber"></app-no-data> + </div> + <div class="subheading2 grid-1" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">Email</div> + <div class="grid-double"> + {{ parcel.owners[0].email }} + <app-no-data [showRequired]="showErrors" *ngIf="!parcel.owners[0].email"></app-no-data> + </div> + <div class="subheading2 grid-1" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN"> + Crown Type + </div> + <div class="grid-double"> + {{ parcel.owners[0].crownLandOwnerType === 'provincial' ? 'Provincial Crown' : '' }} + {{ parcel.owners[0].crownLandOwnerType === 'federal' ? 'Federal Crown' : '' }} + <app-no-data [showRequired]="showErrors" *ngIf="!parcel.owners[0].crownLandOwnerType"></app-no-data> + </div> + </ng-container> + <app-no-data [showRequired]="showErrors" *ngIf="!parcel.owners[0]"></app-no-data> </ng-container> - <app-no-data [showRequired]="showErrors" *ngIf="!parcel.owners[0]"></app-no-data> - </ng-container> - <div - class="full-width owner-information" - [ngClass]="{ 'crown-owner-information': parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN }" - *ngIf="parcel.ownershipTypeCode !== PARCEL_OWNERSHIP_TYPES.CROWN" - > - <div class="subheading2" *ngIf="parcel.ownershipTypeCode !== PARCEL_OWNERSHIP_TYPES.CROWN">Land Owner(s)</div> - <div class="subheading2" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">Crown Contact(s)</div> - <div class="subheading2" *ngIf="parcel.ownershipTypeCode !== PARCEL_OWNERSHIP_TYPES.CROWN">Organization</div> - <div class="subheading2" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN"> - Ministry/Department - </div> - <div class="subheading2">Phone</div> - <div class="subheading2">Email</div> - <div class="subheading2" *ngIf="parcel.ownershipTypeCode !== PARCEL_OWNERSHIP_TYPES.CROWN">Corporate Summary</div> - <ng-container *ngFor="let owner of parcel.owners"> - <div>{{ owner.displayName }}</div> - <div> - <span *ngIf="owner.organizationName"></span>{{ owner.organizationName }} - <app-no-data [showRequired]="false" *ngIf="!owner.organizationName"></app-no-data> + <div + class="full-width owner-information" + [ngClass]="{ 'crown-owner-information': parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN }" + *ngIf="parcel.ownershipTypeCode !== PARCEL_OWNERSHIP_TYPES.CROWN" + > + <div class="subheading2" *ngIf="parcel.ownershipTypeCode !== PARCEL_OWNERSHIP_TYPES.CROWN">Land Owner(s)</div> + <div class="subheading2" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN"> + Crown Contact(s) </div> - <div>{{ owner.phoneNumber }}</div> - <div>{{ owner.email }}</div> - <div *ngIf="parcel.ownershipTypeCode !== PARCEL_OWNERSHIP_TYPES.CROWN"> - <a *ngIf="owner.corporateSummary" (click)="onOpenFile(owner.corporateSummary.uuid)">{{ - owner.corporateSummary.fileName - }}</a> - <app-no-data [showRequired]="false" *ngIf="!owner.corporateSummary"></app-no-data> + <div class="subheading2" *ngIf="parcel.ownershipTypeCode !== PARCEL_OWNERSHIP_TYPES.CROWN">Organization</div> + <div class="subheading2" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN"> + Ministry/Department + </div> + <div class="subheading2">Phone</div> + <div class="subheading2">Email</div> + <div class="subheading2" *ngIf="parcel.ownershipTypeCode !== PARCEL_OWNERSHIP_TYPES.CROWN"> + Corporate Summary + </div> + <ng-container *ngFor="let owner of parcel.owners"> + <div>{{ owner.displayName }}</div> + <div> + <span *ngIf="owner.organizationName"></span>{{ owner.organizationName }} + <app-no-data [showRequired]="false" *ngIf="!owner.organizationName"></app-no-data> + </div> + <div>{{ owner.phoneNumber }}</div> + <div>{{ owner.email }}</div> + <div *ngIf="parcel.ownershipTypeCode !== PARCEL_OWNERSHIP_TYPES.CROWN"> + <a *ngIf="owner.corporateSummary" (click)="onOpenFile(owner.corporateSummary.uuid)">{{ + owner.corporateSummary.fileName + }}</a> + <app-no-data [showRequired]="false" *ngIf="!owner.corporateSummary"></app-no-data> + </div> + </ng-container> + <div class="full-width"> + <app-no-data [showRequired]="showErrors" *ngIf="parcel.owners.length === 0"></app-no-data> </div> - </ng-container> - <div class="full-width"> - <app-no-data [showRequired]="showErrors" *ngIf="parcel.owners.length === 0"></app-no-data> </div> - </div> - <div class="subheading2 grid-1"> - I confirm that the owner information provided above matches the current Certificate of Title - </div> - <div class="grid-double"> - <span *ngIf="parcel.isConfirmedByApplicant">Yes</span> - <app-no-data [showRequired]="showErrors" *ngIf="!parcel.isConfirmedByApplicant"></app-no-data> - </div> + <div class="subheading2 grid-1"> + I confirm that the owner information provided above matches the current Certificate of Title + </div> + <div class="grid-double"> + <span *ngIf="parcel.isConfirmedByApplicant">Yes</span> + <app-no-data [showRequired]="showErrors" *ngIf="!parcel.isConfirmedByApplicant"></app-no-data> + </div> + </ng-container> </ng-container> <div *ngIf="showEdit" class="edit-button"> <button mat-flat-button (click)="onEditParcelsClick($event)" color="accent">Edit Section</button> diff --git a/portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-entry/parcel-entry.component.html b/portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-entry/parcel-entry.component.html index a8870f988c..60148b0976 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-entry/parcel-entry.component.html +++ b/portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-entry/parcel-entry.component.html @@ -2,7 +2,8 @@ <div class="type"> <mat-label>Select parcel type:</mat-label> <div class="subtext"> - Fee simple includes privately-owned parcels and parcels within First Nation treaty lands. Crown land includes crown leases. + Fee simple includes privately-owned parcels and parcels within First Nation treaty lands. Crown land includes + crown leases. </div> <mat-button-toggle-group class="input" @@ -47,15 +48,13 @@ mat-flat-button color="primary" (click)="onSearch()" - [disabled]="!parcelType.getRawValue() || _disabled || (!!isCrownLand && !searchBy.getRawValue())" + [disabled]="!parcelType.getRawValue() || (!!isCrownLand && !searchBy.getRawValue())" > Search </button> </div> <div class="lookup-bottom-row"> - <button class="reset-button" mat-stroked-button color="accent" (click)="onReset()" [disabled]="_disabled"> - Reset - </button> + <button class="reset-button" mat-stroked-button color="accent" (click)="onReset()">Reset</button> <span class="float-right"> <a class="subtext" href=" https://ltsa.ca/products-services/parcelmap-bc/" target="_blank" rel="noreferrer"> Powered by PMBC! diff --git a/portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-entry/parcel-entry.component.spec.ts b/portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-entry/parcel-entry.component.spec.ts index 304dfc245d..7e0e5ed4c6 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-entry/parcel-entry.component.spec.ts +++ b/portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-entry/parcel-entry.component.spec.ts @@ -14,7 +14,6 @@ describe('ParcelEntryComponent', () => { let fixture: ComponentFixture<ParcelEntryComponent>; let mockParcelService: DeepMocked<ParcelService>; let mockHttpClient: DeepMocked<HttpClient>; - let mockNotificationParcelService: DeepMocked<NotificationParcelService>; let mockParcel: NotificationParcelDto = { uuid: '', @@ -23,7 +22,6 @@ describe('ParcelEntryComponent', () => { beforeEach(async () => { mockParcelService = createMock(); mockHttpClient = createMock(); - mockNotificationParcelService = createMock(); await TestBed.configureTestingModule({ imports: [MatAutocompleteModule], @@ -37,10 +35,6 @@ describe('ParcelEntryComponent', () => { provide: HttpClient, useValue: mockHttpClient, }, - { - provide: NotificationParcelService, - useValue: mockNotificationParcelService, - }, { provide: MatDialog, useValue: {}, diff --git a/portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-entry/parcel-entry.component.ts b/portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-entry/parcel-entry.component.ts index 131695b1b5..c2ff1ff4c0 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-entry/parcel-entry.component.ts +++ b/portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-entry/parcel-entry.component.ts @@ -33,28 +33,50 @@ export class ParcelEntryComponent implements OnInit { @Input() submissionUuid!: string; @Input() showErrors = false; - @Input() _disabled = false; @Input() isDraft = false; - @Input() - public set disabled(disabled: boolean) { - this._disabled = disabled; - this.onFormDisabled(); - } - @Output() private onFormGroupChange = new EventEmitter<Partial<ParcelEntryFormData>>(); - @Output() private onSaveProgress = new EventEmitter<void>(); searchBy = new FormControl<string | null>(null); isCrownLand: boolean | null = null; - pidPin = new FormControl<string>(''); - legalDescription = new FormControl<string | null>(null, [Validators.required]); - mapArea = new FormControl<string | null>(null, [Validators.required]); - pid = new FormControl<string | null>(null, [Validators.required]); - pin = new FormControl<string | null>(null); - civicAddress = new FormControl<string | null>(null, [Validators.required]); parcelType = new FormControl<string | null>(null, [Validators.required]); + pidPin = new FormControl<string>({ + disabled: true, + value: '', + }); + legalDescription = new FormControl<string | null>( + { + disabled: true, + value: null, + }, + [Validators.required] + ); + mapArea = new FormControl<string | null>( + { + disabled: true, + value: null, + }, + [Validators.required] + ); + pid = new FormControl<string | null>( + { + disabled: true, + value: null, + }, + [Validators.required] + ); + pin = new FormControl<string | null>({ + disabled: true, + value: null, + }); + civicAddress = new FormControl<string | null>( + { + disabled: true, + value: null, + }, + [Validators.required] + ); parcelForm = new FormGroup({ pidPin: this.pidPin, legalDescription: this.legalDescription, @@ -67,16 +89,9 @@ export class ParcelEntryComponent implements OnInit { }); pidPinPlaceholder = ''; - ownerInput = new FormControl<string | null>(null); - PARCEL_OWNERSHIP_TYPES = PARCEL_OWNERSHIP_TYPE; - maxPurchasedDate = new Date(); - constructor( - private parcelService: ParcelService, - private notificationParcelService: NotificationParcelService, - private dialog: MatDialog - ) {} + constructor(private parcelService: ParcelService, private dialog: MatDialog) {} ngOnInit(): void { this.setupForm(); @@ -136,6 +151,8 @@ export class ParcelEntryComponent implements OnInit { const dirtyForm = this.legalDescription.value || this.mapArea.value || this.pid.value || this.pin.value || this.civicAddress.value; + this.parcelForm.enable(); + const changeParcelType = () => { if ($event.value === this.PARCEL_OWNERSHIP_TYPES.CROWN) { this.searchBy.setValue(null); @@ -189,6 +206,10 @@ export class ParcelEntryComponent implements OnInit { parcelType: this.parcel.ownershipTypeCode, }); + if (this.parcel.ownershipType) { + this.parcelForm.enable(); + } + this.isCrownLand = this.parcelType.value ? this.parcelType.getRawValue() === this.PARCEL_OWNERSHIP_TYPES.CROWN : null; @@ -210,7 +231,7 @@ export class ParcelEntryComponent implements OnInit { return; } - if ((this.isCrownLand && !this.searchBy.getRawValue()) || this.disabled) { + if (this.isCrownLand && !this.searchBy.getRawValue()) { this.pidPin.disable({ emitEvent: false, }); @@ -227,16 +248,6 @@ export class ParcelEntryComponent implements OnInit { }); } - private onFormDisabled() { - if (this._disabled) { - this.parcelForm.disable(); - this.ownerInput.disable(); - } else { - this.parcelForm.enable(); - this.ownerInput.enable(); - } - } - onChangeSearchBy(value: string) { if (value === 'pid') { this.pidPinPlaceholder = 'Type 9 digit PID'; From c749d0c3e4f1acd27cccc70513544deec6623a71 Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Mon, 15 Jan 2024 12:39:29 -0800 Subject: [PATCH 930/954] Feature/alcs 1389 ETL NAN, SCH, CSC (#1289) ETL NAN class code applications ETL SCH class code applications ETL applications of CSC type -> Covenants exclude SRW documents from document import exclude SRW from ETL data import applied date conversion to missing date fields --- bin/migrate-files/README.md | 4 +- .../application_docs_import.py | 59 +++++++--- .../applications/app_prep.py | 8 ++ .../applications/base_applications.py | 6 +- .../staff_journal_verification.sql | 23 ++-- .../sql/application-etl-table-create.sql | 5 +- .../application_prep.count.sql | 3 +- .../sql/application-prep/application_prep.sql | 3 +- .../application_prep_basic_validation.sql | 2 +- .../sql/application_exclude_count.sql | 4 - .../sql/insert-batch-application.sql | 3 +- .../sql/insert_batch_application_count.sql | 3 +- ..._oats_does_not_override_alcs_with_null.sql | 2 +- .../submissions/app_submissions.py | 5 +- .../submissions/data_insert/data_prep.py | 10 ++ .../submissions/sql/app_submission.sql | 5 +- .../submissions/sql/app_submission_count.sql | 2 +- .../sql/app_submission_validation.sql | 2 +- .../application_certificate_of_title.sql | 2 +- ...application_certificate_of_title_count.sql | 2 +- ...cation_certificate_of_title_validation.sql | 4 +- .../application_parcels_insert_validation.sql | 2 +- .../sql/statuses/application_cancelled.sql | 2 +- .../statuses/application_cancelled_count.sql | 2 +- .../sql/statuses/application_in_progress.sql | 2 +- .../application_in_progress_count.sql | 2 +- .../statuses/application_incomplete_alc.sql | 2 +- .../application_incomplete_alc_count.sql | 2 +- .../application_returned_incomplete_lfng.sql | 2 +- ...ication_returned_incomplete_lfng_count.sql | 2 +- .../statuses/application_submitted_to_alc.sql | 2 +- .../application_submitted_to_alc_count.sql | 2 +- .../application_submitted_to_lfng.sql | 2 +- .../application_submitted_to_lfng_count.sql | 2 +- .../application_under_review_lfng.sql | 2 +- .../application_under_review_lfng_count.sql | 2 +- .../sql/statuses/application_wrong_lfng.sql | 2 +- .../statuses/application_wrong_lfng_count.sql | 2 +- .../statuses/init_app_submission_status.sql | 2 +- .../init_app_submission_status_count.sql | 2 +- .../application_cancelled_validation.sql | 4 +- .../application_in_progress_validation.sql | 4 +- ...tion_return_incomplete_lfng_validation.sql | 2 +- ...lication_sub_incomplete_alc_validation.sql | 2 +- .../application_submitted_lfng_validation.sql | 4 +- ...pplication_submitted_to_alc_validation.sql | 2 +- ...plication_under_review_lfng_validation.sql | 2 +- .../application_wrong_lfng_validation.sql | 81 ++++++-------- .../notice_of_intent_decision_date.py | 12 +- ...oats_to_alcs_notice_of_intent_table_etl.py | 8 ++ .../alcs_documents_to_app_documents.sql | 43 +++----- .../sql/insert-application.sql | 104 ------------------ 52 files changed, 204 insertions(+), 259 deletions(-) delete mode 100644 bin/migrate-oats-data/sql/insert-application.sql diff --git a/bin/migrate-files/README.md b/bin/migrate-files/README.md index adf7265fbb..59b85fa8da 100644 --- a/bin/migrate-files/README.md +++ b/bin/migrate-files/README.md @@ -99,7 +99,9 @@ ORDER BY ``` ```sh -# start_document_id - starting document id of batch; end_document_id - end document id of batch; last_imported_document_id - the last successfully imported file id of batch. Could be found in [dateTime]_last_imported_application_file.txt or leave it empty and it defaults to 0. +# start_document_id - starting document id of batch; +# end_document_id - end document id of batch; +# last_imported_document_id - the last successfully imported file id of batch. Could be found in [dateTime]_last_imported_application_file.txt or leave it empty and it defaults to 0. python migrate-files.py application --start_document_id=500240 --end_document_id=505260 --last_imported_document_id=500475 diff --git a/bin/migrate-files/application_docs/application_docs_import.py b/bin/migrate-files/application_docs/application_docs_import.py index 01ce4c2fcd..022b7b1eaa 100644 --- a/bin/migrate-files/application_docs/application_docs_import.py +++ b/bin/migrate-files/application_docs/application_docs_import.py @@ -121,14 +121,22 @@ def import_application_docs( _document_query = """ - WITH documents_with_cumulative_file_size AS ( + WITH app_docs_without_srw AS ( + + SELECT document_id FROM oats.oats_documents od + LEFT JOIN oats.oats_alr_appl_components oaac ON oaac.alr_application_id = od.alr_application_id + WHERE oaac.alr_change_code <> 'SRW' + GROUP BY od.document_id + + ), + documents_with_cumulative_file_size AS ( SELECT ROW_NUMBER() OVER( - ORDER BY DOCUMENT_ID ASC + ORDER BY od.DOCUMENT_ID ASC ) row_num, dbms_lob.getLength(DOCUMENT_BLOB) file_size, - SUM(dbms_lob.getLength(DOCUMENT_BLOB)) OVER (ORDER BY DOCUMENT_ID ASC ROWS UNBOUNDED PRECEDING) AS cumulative_file_size, - DOCUMENT_ID, + SUM(dbms_lob.getLength(DOCUMENT_BLOB)) OVER (ORDER BY od.DOCUMENT_ID ASC ROWS UNBOUNDED PRECEDING) AS cumulative_file_size, + od.DOCUMENT_ID, ALR_APPLICATION_ID, FILE_NAME, DOCUMENT_BLOB, @@ -139,28 +147,29 @@ def import_application_docs( WHEN_UPDATED, REVISION_COUNT FROM - OATS.OATS_DOCUMENTS + OATS.OATS_DOCUMENTS od + JOIN app_docs_without_srw appds ON appds.document_id = od.document_id -- this will filter out all SRW related documents WHERE dbms_lob.getLength(DOCUMENT_BLOB) > 0 - AND DOCUMENT_ID > :starting_document_id - AND (:end_document_id = 0 OR DOCUMENT_ID <= :end_document_id) + AND od.DOCUMENT_ID > :starting_document_id + AND (:end_document_id = 0 OR od.DOCUMENT_ID <= :end_document_id) AND ALR_APPLICATION_ID IS NOT NULL ORDER BY DOCUMENT_ID ASC ) SELECT file_size, - DOCUMENT_ID, + docwc.DOCUMENT_ID, ALR_APPLICATION_ID, FILE_NAME, DOCUMENT_BLOB FROM - documents_with_cumulative_file_size + documents_with_cumulative_file_size docwc WHERE cumulative_file_size < :max_file_size AND row_num < :batch_size ORDER BY - DOCUMENT_ID ASC + docwc.DOCUMENT_ID ASC """ @@ -168,12 +177,21 @@ def _get_total_number_of_files(cursor, start_document_id, end_document_id): try: cursor.execute( """ + WITH app_docs_without_srw AS ( + + SELECT document_id FROM oats.oats_documents od + LEFT JOIN oats.oats_alr_appl_components oaac ON oaac.alr_application_id = od.alr_application_id + WHERE oaac.alr_change_code <> 'SRW' + GROUP BY od.document_id + + ) SELECT COUNT(*) - FROM OATS.OATS_DOCUMENTS + FROM OATS.OATS_DOCUMENTS od + JOIN app_docs_without_srw ON app_docs_without_srw.document_id = od.document_id WHERE dbms_lob.getLength(DOCUMENT_BLOB) > 0 AND ALR_APPLICATION_ID IS NOT NULL - AND (:start_document_id = 0 OR DOCUMENT_ID > :start_document_id) - AND (:end_document_id = 0 OR DOCUMENT_ID <= :end_document_id) + AND (:start_document_id = 0 OR od.DOCUMENT_ID > :start_document_id) + AND (:end_document_id = 0 OR od.DOCUMENT_ID <= :end_document_id) """, { "start_document_id": start_document_id, @@ -189,12 +207,21 @@ def _get_total_number_of_transferred_files(cursor, start_document_id, end_docume try: cursor.execute( """ + WITH app_docs_without_srw AS ( + + SELECT document_id FROM oats.oats_documents od + LEFT JOIN oats.oats_alr_appl_components oaac ON oaac.alr_application_id = od.alr_application_id + WHERE oaac.alr_change_code <> 'SRW' + GROUP BY od.document_id + + ) SELECT COUNT(*) - FROM OATS.OATS_DOCUMENTS + FROM OATS.OATS_DOCUMENTS od + JOIN app_docs_without_srw ON app_docs_without_srw.document_id = od.document_id WHERE dbms_lob.getLength(DOCUMENT_BLOB) > 0 AND ALR_APPLICATION_ID IS NOT NULL - AND DOCUMENT_ID > :start_document_id - AND (:end_document_id = 0 OR DOCUMENT_ID <= :end_document_id) + AND od.DOCUMENT_ID > :start_document_id + AND (:end_document_id = 0 OR od.DOCUMENT_ID <= :end_document_id) """, { "start_document_id": start_document_id, diff --git a/bin/migrate-oats-data/applications/app_prep.py b/bin/migrate-oats-data/applications/app_prep.py index 942814371d..8c5951238a 100644 --- a/bin/migrate-oats-data/applications/app_prep.py +++ b/bin/migrate-oats-data/applications/app_prep.py @@ -371,5 +371,13 @@ def _map_basic_field(data): data["agri_capability_code"] = str( OatsToAlcsAgCap[data["agri_capability_code"]].value ) + if data["submitted_to_alc_date"]: + data["submitted_to_alc_date"] = add_timezone_and_keep_date_part( + data.get("submitted_to_alc_date", None) + ) + if data["fee_received_date"]: + data["fee_received_date"] = add_timezone_and_keep_date_part( + data.get("fee_received_date", None) + ) return data diff --git a/bin/migrate-oats-data/applications/base_applications.py b/bin/migrate-oats-data/applications/base_applications.py index 7aa2c0ad5a..62b8761210 100644 --- a/bin/migrate-oats-data/applications/base_applications.py +++ b/bin/migrate-oats-data/applications/base_applications.py @@ -3,7 +3,7 @@ setup_and_get_logger, exclusion_table_create, exclusion_table_count, - BATCH_UPLOAD_SIZE + BATCH_UPLOAD_SIZE, ) etl_name = "process_applications" @@ -39,7 +39,9 @@ def process_applications(conn=None, batch_size=BATCH_UPLOAD_SIZE): application_sql = sql_file.read() while True: cursor.execute( - f"{application_sql} WHERE ae.application_id > {last_application_id} AND (oa.application_class_code = 'LOA' OR oa.application_class_code = 'BLK') ORDER by ae.application_id;" + f"""{application_sql} + AND ae.application_id > {last_application_id} AND (oa.application_class_code IN ('LOA', 'BLK', 'SCH', 'NAN')) ORDER by ae.application_id; + """ ) rows = cursor.fetchmany(batch_size) diff --git a/bin/migrate-oats-data/applications/sql/app_staff_journal/staff_journal_verification.sql b/bin/migrate-oats-data/applications/sql/app_staff_journal/staff_journal_verification.sql index c5a2d34bf1..5c90374ff3 100644 --- a/bin/migrate-oats-data/applications/sql/app_staff_journal/staff_journal_verification.sql +++ b/bin/migrate-oats-data/applications/sql/app_staff_journal/staff_journal_verification.sql @@ -1,16 +1,21 @@ WITH alcs_rows AS ( - SELECT sj.application_uuid, aa.file_number, sj.body + SELECT sj.application_uuid, + aa.file_number, + sj.body FROM alcs.staff_journal sj - JOIN alcs.application aa on sj.application_uuid = aa."uuid" + JOIN alcs.application aa on sj.application_uuid = aa."uuid" WHERE sj.audit_created_by = 'oats_etl' - ), - oats_rows AS ( - SELECT osje.alr_application_id, osje.journal_text +), +oats_rows AS ( + SELECT osje.alr_application_id, + osje.journal_text FROM oats.oats_staff_journal_entries osje - JOIN oats.oats_alr_applications oaa ON osje.alr_application_id = oaa.alr_application_id - WHERE oaa.application_class_code IN ('LOA', 'BLK') + JOIN oats.oats_alr_applications oaa ON osje.alr_application_id = oaa.alr_application_id + WHERE oaa.application_class_code IN ('LOA', 'BLK', 'SCH', 'NAN') ) -SELECT oar.journal_text, oar.alr_application_id, ar.file_number +SELECT oar.journal_text, + oar.alr_application_id, + ar.file_number FROM oats_rows oar -JOIN alcs_rows ar ON oar.journal_text = ar.body + JOIN alcs_rows ar ON oar.journal_text = ar.body WHERE ar.file_number <> oar.alr_application_id::TEXT; \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/sql/application-etl-table-create.sql b/bin/migrate-oats-data/applications/sql/application-etl-table-create.sql index cbb8a877d2..1e09100526 100644 --- a/bin/migrate-oats-data/applications/sql/application-etl-table-create.sql +++ b/bin/migrate-oats-data/applications/sql/application-etl-table-create.sql @@ -20,7 +20,7 @@ CREATE TABLE oats.alcs_etl_application_exclude ( component_id INT ); --- function inserts data into prevoisly created table and decipers duplication of uuids +-- function inserts data into previously created table and deciphers duplication of uuids -- application_id is copied from oats.oats_alr_applications.alr_application_id INSERT INTO oats.alcs_etl_application_duplicate (application_id, duplicated) @@ -72,7 +72,8 @@ INSERT INTO oats.alcs_etl_application_exclude (component_id) WHEN 'SDV' THEN 3 WHEN 'SCH' THEN 4 WHEN 'NFU' THEN 5 - ELSE 6 + WHEN 'CSC' THEN 6 + ELSE 7 END) AS rank FROM duplicate_ids dis ) diff --git a/bin/migrate-oats-data/applications/sql/application-prep/application_prep.count.sql b/bin/migrate-oats-data/applications/sql/application-prep/application_prep.count.sql index 539043064e..297f535012 100644 --- a/bin/migrate-oats-data/applications/sql/application-prep/application_prep.count.sql +++ b/bin/migrate-oats-data/applications/sql/application-prep/application_prep.count.sql @@ -2,7 +2,8 @@ WITH appl_components_grouped AS ( SELECT oaac.alr_application_id FROM oats.oats_alr_appl_components oaac JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id - WHERE oaa.application_class_code IN ('LOA', 'BLK') + WHERE oaa.application_class_code IN ('LOA', 'BLK', 'SCH', 'NAN') + AND oaac.alr_change_code <> 'SRW' GROUP BY oaac.alr_application_id HAVING count(oaac.alr_application_id) < 2 -- ignore all applications wit multiple components ) diff --git a/bin/migrate-oats-data/applications/sql/application-prep/application_prep.sql b/bin/migrate-oats-data/applications/sql/application-prep/application_prep.sql index 7a3d830459..951bb4a415 100644 --- a/bin/migrate-oats-data/applications/sql/application-prep/application_prep.sql +++ b/bin/migrate-oats-data/applications/sql/application-prep/application_prep.sql @@ -2,7 +2,8 @@ WITH appl_components_grouped AS ( SELECT oaac.alr_application_id FROM oats.oats_alr_appl_components oaac JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id - WHERE oaa.application_class_code IN ('LOA', 'BLK') + WHERE oaa.application_class_code IN ('LOA', 'BLK', 'SCH', 'NAN') + AND oaac.alr_change_code <> 'SRW' GROUP BY oaac.alr_application_id HAVING count(oaac.alr_application_id) < 2 -- ignore all applications wit multiple components ) diff --git a/bin/migrate-oats-data/applications/sql/application-prep/application_prep_basic_validation.sql b/bin/migrate-oats-data/applications/sql/application-prep/application_prep_basic_validation.sql index aa098468bd..d1824cedad 100644 --- a/bin/migrate-oats-data/applications/sql/application-prep/application_prep_basic_validation.sql +++ b/bin/migrate-oats-data/applications/sql/application-prep/application_prep_basic_validation.sql @@ -3,7 +3,7 @@ WITH appl_components_grouped AS ( SELECT oaac.alr_application_id FROM oats.oats_alr_appl_components oaac JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id - WHERE oaa.application_class_code IN ('LOA', 'BLK') + WHERE oaa.application_class_code IN ('LOA', 'BLK', 'SCH', 'NAN') GROUP BY oaac.alr_application_id HAVING count(oaac.alr_application_id) < 2 -- ignore all applications wit multiple components ), diff --git a/bin/migrate-oats-data/applications/sql/application_exclude_count.sql b/bin/migrate-oats-data/applications/sql/application_exclude_count.sql index 54c4a34beb..8ff5180215 100644 --- a/bin/migrate-oats-data/applications/sql/application_exclude_count.sql +++ b/bin/migrate-oats-data/applications/sql/application_exclude_count.sql @@ -1,10 +1,7 @@ with application_type_lookup AS ( SELECT oaac.alr_application_id AS application_id, - oaac.alr_change_code AS code - - FROM oats.oats_alr_appl_components AS oaac ), @@ -14,6 +11,5 @@ select count(*) as row_count, SUM(1) as sum_rows group by atl.application_id having count(application_id) > 1 ) - select count(*) as "count" from application_rows \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/sql/insert-batch-application.sql b/bin/migrate-oats-data/applications/sql/insert-batch-application.sql index 47cd062a2c..3a2a96ef86 100644 --- a/bin/migrate-oats-data/applications/sql/insert-batch-application.sql +++ b/bin/migrate-oats-data/applications/sql/insert-batch-application.sql @@ -142,8 +142,8 @@ SELECT WHEN atl.code = 'EXT' THEN 'ROSO' WHEN atl.code = 'FILL' THEN 'POFO' -- WHEN atl.code = 'SRW' THEN 'NARU' - -- WHEN atl.code = 'CSC' THEN 'NARU' WHEN atl.code = 'NAR' THEN 'NARU' + WHEN atl.code = 'CSC' THEN 'COVE' ELSE 'NARU' END AS type_code, CASE @@ -163,6 +163,7 @@ FROM LEFT JOIN application_type_lookup AS atl ON oa.alr_application_id = atl.application_id LEFT JOIN alcs.application_region ar ON panel_lookup.panel_region = ar."label" LEFT JOIN alcs_gov ON oa.alr_application_id = alcs_gov.application_id +WHERE atl.code <> 'SRW' -- filter out SRW type as it is a "notification" type diff --git a/bin/migrate-oats-data/applications/sql/insert_batch_application_count.sql b/bin/migrate-oats-data/applications/sql/insert_batch_application_count.sql index a6e4a047f4..db3cbb22cd 100644 --- a/bin/migrate-oats-data/applications/sql/insert_batch_application_count.sql +++ b/bin/migrate-oats-data/applications/sql/insert_batch_application_count.sql @@ -5,5 +5,4 @@ From JOIN oats.alcs_etl_application_duplicate AS ae ON oa.alr_application_id = ae.application_id AND ae.duplicated IS false WHERE - oa.application_class_code = 'LOA' - OR oa.application_class_code = 'BLK' \ No newline at end of file + oa.application_class_code in ('LOA','BLK', 'SCH', 'NAN') \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/sql/validate_that_oats_does_not_override_alcs_with_null.sql b/bin/migrate-oats-data/applications/sql/validate_that_oats_does_not_override_alcs_with_null.sql index e529fcb963..e2ffa49f65 100644 --- a/bin/migrate-oats-data/applications/sql/validate_that_oats_does_not_override_alcs_with_null.sql +++ b/bin/migrate-oats-data/applications/sql/validate_that_oats_does_not_override_alcs_with_null.sql @@ -4,7 +4,7 @@ WITH appl_with_one_component AS ( SELECT oaac.alr_application_id FROM oats.oats_alr_appl_components oaac JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id - WHERE oaa.application_class_code IN ('LOA', 'BLK') + WHERE oaa.application_class_code IN ('LOA', 'BLK', 'SCH', 'NAN') GROUP BY oaac.alr_application_id HAVING count(oaac.alr_application_id) < 2 -- ignore all applications wit multiple components ) diff --git a/bin/migrate-oats-data/applications/submissions/app_submissions.py b/bin/migrate-oats-data/applications/submissions/app_submissions.py index 8c6291ac6c..bec95e0d0e 100644 --- a/bin/migrate-oats-data/applications/submissions/app_submissions.py +++ b/bin/migrate-oats-data/applications/submissions/app_submissions.py @@ -50,7 +50,10 @@ def process_alcs_app_submissions(conn=None, batch_size=BATCH_UPLOAD_SIZE): submission_sql = sql_file.read() while True: cursor.execute( - f"{submission_sql} WHERE acg.alr_application_id > {last_submission_id} ORDER BY acg.alr_application_id;" + f""" + {submission_sql} + AND acg.alr_application_id > {last_submission_id} ORDER BY acg.alr_application_id; + """ ) rows = cursor.fetchmany(batch_size) diff --git a/bin/migrate-oats-data/applications/submissions/data_insert/data_prep.py b/bin/migrate-oats-data/applications/submissions/data_insert/data_prep.py index 34bda09b44..8b40b35d48 100644 --- a/bin/migrate-oats-data/applications/submissions/data_insert/data_prep.py +++ b/bin/migrate-oats-data/applications/submissions/data_insert/data_prep.py @@ -60,6 +60,7 @@ def prepare_app_sub_data(app_sub_raw_data_list, direction_data, subdiv_data, soi if data["alr_appl_component_id"] in soil_data: data = map_soil_data(data, soil_data) if data["alr_change_code"] == ALRChangeCode.NFU.value: + data = _map_duration_field(data, "fill_duration") nfu_data_list.append(data) elif ( data["alr_change_code"] == ALRChangeCode.EXC.value @@ -70,6 +71,7 @@ def prepare_app_sub_data(app_sub_raw_data_list, direction_data, subdiv_data, soi data["rsdntl_use_type_code"] = str( OatsToAlcsNaruType[data["rsdntl_use_type_code"]].value ) + data = _map_duration_field(data, "fill_duration") naru_data_list.append(data) elif data["alr_change_code"] == ALRChangeCode.TUR.value: tur_data_list.append(data) @@ -81,6 +83,8 @@ def prepare_app_sub_data(app_sub_raw_data_list, direction_data, subdiv_data, soi ): soil_data_list.append(data) elif data["alr_change_code"] == ALRChangeCode.SCH.value: + data = _map_duration_field(data, "remove_duration") + data = _map_duration_field(data, "fill_duration") pfrs_data_list.append(data) else: other_data_list.append(data) @@ -115,3 +119,9 @@ def get_soil_data(rows, cursor): soil_rows = get_soil_rows(rows, cursor) soil_data = create_soil_dict(soil_rows) return soil_data + + +def _map_duration_field(data, field_key): + duration = data.get(field_key) + data[field_key] = f"{duration} months" if duration is not None else None + return data diff --git a/bin/migrate-oats-data/applications/submissions/sql/app_submission.sql b/bin/migrate-oats-data/applications/submissions/sql/app_submission.sql index 1609e08f1a..af9f92bba5 100644 --- a/bin/migrate-oats-data/applications/submissions/sql/app_submission.sql +++ b/bin/migrate-oats-data/applications/submissions/sql/app_submission.sql @@ -6,7 +6,7 @@ WITH oats.oats_alr_appl_components oaac JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id WHERE - oaa.application_class_code IN ('LOA', 'BLK') + oaa.application_class_code IN ('LOA', 'BLK', 'SCH', 'NAN') AND oaac.alr_change_code <> 'SRW' GROUP BY oaac.alr_application_id HAVING @@ -48,4 +48,5 @@ FROM LEFT JOIN alcs.application aa ON aa.file_number = acg.alr_application_id::TEXT JOIN oats.oats_alr_appl_components oc ON acg.alr_application_id = oc.alr_application_id JOIN oats.oats_alr_applications oa ON acg.alr_application_id = oa.alr_application_id - LEFT JOIN alcs."user" au ON oa.created_guid = au.bceid_guid \ No newline at end of file + LEFT JOIN alcs."user" au ON oa.created_guid = au.bceid_guid +WHERE aa.type_code <> 'SRW' diff --git a/bin/migrate-oats-data/applications/submissions/sql/app_submission_count.sql b/bin/migrate-oats-data/applications/submissions/sql/app_submission_count.sql index 12a4a10e82..7bec4140b9 100644 --- a/bin/migrate-oats-data/applications/submissions/sql/app_submission_count.sql +++ b/bin/migrate-oats-data/applications/submissions/sql/app_submission_count.sql @@ -6,7 +6,7 @@ WITH oats.oats_alr_appl_components oaac JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id WHERE - oaa.application_class_code IN ('LOA', 'BLK') + oaa.application_class_code IN ('LOA', 'BLK', 'SCH', 'NAN') AND oaac.alr_change_code <> 'SRW' GROUP BY oaac.alr_application_id HAVING diff --git a/bin/migrate-oats-data/applications/submissions/sql/app_submission_validation.sql b/bin/migrate-oats-data/applications/submissions/sql/app_submission_validation.sql index 316820dcfd..1a8a383cc9 100644 --- a/bin/migrate-oats-data/applications/submissions/sql/app_submission_validation.sql +++ b/bin/migrate-oats-data/applications/submissions/sql/app_submission_validation.sql @@ -28,7 +28,7 @@ oats_app_data AS ( FROM alcs.application_submission app_sub JOIN apps_with_one_or_zero_component_only oats_asub ON oats_asub.alr_application_id::TEXT = app_sub.file_number JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oats_asub.alr_application_id - AND oaa.application_class_code = 'LOA' OR oaa.application_class_code = 'BLK' + AND oaa.application_class_code in ('LOA', 'BLK', 'SCH', 'NAN') AND oaac.alr_change_code <> 'SRW' JOIN oats.oats_alr_appl_components oaac ON oaac.alr_application_id = oats_asub.alr_application_id ) SELECT oats_app.alr_application_id, diff --git a/bin/migrate-oats-data/applications/submissions/sql/parcels/application_certificate_of_title.sql b/bin/migrate-oats-data/applications/submissions/sql/parcels/application_certificate_of_title.sql index 7308b49d30..ee0e7e321a 100644 --- a/bin/migrate-oats-data/applications/submissions/sql/parcels/application_certificate_of_title.sql +++ b/bin/migrate-oats-data/applications/submissions/sql/parcels/application_certificate_of_title.sql @@ -12,4 +12,4 @@ FROM oats.oats_documents od JOIN alcs.application_document appd ON appd.oats_document_id::bigint = od.document_id JOIN alcs.application_parcel appp ON appp.oats_subject_property_id = osp.subject_property_id WHERE od.document_code = 'CT' - AND oaa.application_class_code IN ('LOA', 'BLK') \ No newline at end of file + AND oaa.application_class_code IN ('LOA', 'BLK', 'SCH', 'NAN') \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/submissions/sql/parcels/application_certificate_of_title_count.sql b/bin/migrate-oats-data/applications/submissions/sql/parcels/application_certificate_of_title_count.sql index f1db5bc229..f48d389a9c 100644 --- a/bin/migrate-oats-data/applications/submissions/sql/parcels/application_certificate_of_title_count.sql +++ b/bin/migrate-oats-data/applications/submissions/sql/parcels/application_certificate_of_title_count.sql @@ -6,4 +6,4 @@ FROM oats.oats_documents od JOIN alcs.application_document appd ON appd.oats_document_id::bigint = od.document_id JOIN alcs.application_parcel appp ON appp.oats_subject_property_id = osp.subject_property_id WHERE od.document_code = 'CT' - AND oaa.application_class_code IN ('LOA', 'BLK'); \ No newline at end of file + AND oaa.application_class_code IN ('LOA', 'BLK', 'SCH', 'NAN'); \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/submissions/sql/parcels/validation/application_certificate_of_title_validation.sql b/bin/migrate-oats-data/applications/submissions/sql/parcels/validation/application_certificate_of_title_validation.sql index 66ad79f64d..dbe44e1823 100644 --- a/bin/migrate-oats-data/applications/submissions/sql/parcels/validation/application_certificate_of_title_validation.sql +++ b/bin/migrate-oats-data/applications/submissions/sql/parcels/validation/application_certificate_of_title_validation.sql @@ -3,7 +3,7 @@ WITH applications_with_one_or_zero_component_only AS ( max(oaac.alr_appl_component_id) AS alr_appl_component_id -- this IS NOT going TO effect the query since count < 2 FROM oats.oats_alr_appl_components oaac JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id - AND oaa.application_class_code IN ('LOA', 'BLK') + AND oaa.application_class_code IN ('LOA', 'BLK', 'SCH', 'NAN') AND oaac.alr_change_code <> 'SRW' GROUP BY oaac.alr_application_id HAVING count(oaac.alr_application_id) < 2 ), @@ -34,7 +34,7 @@ WITH nois_with_one_or_zero_component_only AS ( max(oaac.alr_appl_component_id) AS alr_appl_component_id -- this IS NOT going TO effect the query since count < 2 FROM oats.oats_alr_appl_components oaac JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id - AND oaa.application_class_code IN ('LOA', 'BLK') + AND oaa.application_class_code IN ('LOA', 'BLK', 'SCH', 'NAN') AND oaac.alr_change_code <> 'SRW' GROUP BY oaac.alr_application_id HAVING count(oaac.alr_application_id) < 2 ) diff --git a/bin/migrate-oats-data/applications/submissions/sql/parcels/validation/application_parcels_insert_validation.sql b/bin/migrate-oats-data/applications/submissions/sql/parcels/validation/application_parcels_insert_validation.sql index 045d458299..f655da78f7 100644 --- a/bin/migrate-oats-data/applications/submissions/sql/parcels/validation/application_parcels_insert_validation.sql +++ b/bin/migrate-oats-data/applications/submissions/sql/parcels/validation/application_parcels_insert_validation.sql @@ -7,7 +7,7 @@ WITH app_components_grouped AS ( SELECT oaac.alr_application_id FROM oats.oats_alr_appl_components oaac JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id - WHERE oaa.application_class_code IN ('LOA', 'BLK') + WHERE oaa.application_class_code IN ('LOA', 'BLK', 'SCH', 'NAN') AND oaac.alr_change_code <> 'SRW' GROUP BY oaac.alr_application_id HAVING count(oaac.alr_application_id) < 2 -- ignore applications with multiple components ) diff --git a/bin/migrate-oats-data/applications/submissions/sql/statuses/application_cancelled.sql b/bin/migrate-oats-data/applications/submissions/sql/statuses/application_cancelled.sql index 5d118dfb6f..115b4ff2a5 100644 --- a/bin/migrate-oats-data/applications/submissions/sql/statuses/application_cancelled.sql +++ b/bin/migrate-oats-data/applications/submissions/sql/statuses/application_cancelled.sql @@ -19,7 +19,7 @@ cancelled_accomplishments_for_app_only AS ( oaa.cancelled_date FROM oats.oats_alr_applications oaa LEFT JOIN first_cancelled_accomplishment_per_file_number AS first_cancelled ON first_cancelled.alr_application_id = oaa.alr_application_id - WHERE oaa.application_class_code IN ('LOA', 'BLK') + WHERE oaa.application_class_code IN ('LOA', 'BLK', 'SCH', 'NAN') ) SELECT oats_cancelled.alr_application_id, oats_cancelled.accomplishment_code, diff --git a/bin/migrate-oats-data/applications/submissions/sql/statuses/application_cancelled_count.sql b/bin/migrate-oats-data/applications/submissions/sql/statuses/application_cancelled_count.sql index 46fb27b7f0..c64f9a5e28 100644 --- a/bin/migrate-oats-data/applications/submissions/sql/statuses/application_cancelled_count.sql +++ b/bin/migrate-oats-data/applications/submissions/sql/statuses/application_cancelled_count.sql @@ -19,7 +19,7 @@ cancelled_accomplishments_for_app_only AS ( oaa.cancelled_date FROM oats.oats_alr_applications oaa LEFT JOIN first_cancelled_accomplishment_per_file_number AS first_cancelled ON first_cancelled.alr_application_id = oaa.alr_application_id - WHERE oaa.application_class_code IN ('LOA', 'BLK') + WHERE oaa.application_class_code IN ('LOA', 'BLK', 'SCH', 'NAN') ), all_apps_with_cancelled_status AS ( SELECT oats_cancelled.alr_application_id diff --git a/bin/migrate-oats-data/applications/submissions/sql/statuses/application_in_progress.sql b/bin/migrate-oats-data/applications/submissions/sql/statuses/application_in_progress.sql index e3d018c9dc..2630afddb2 100644 --- a/bin/migrate-oats-data/applications/submissions/sql/statuses/application_in_progress.sql +++ b/bin/migrate-oats-data/applications/submissions/sql/statuses/application_in_progress.sql @@ -23,7 +23,7 @@ earliest_in_progress_accomplishments_for_app_only AS ( oaa.when_created FROM oats.oats_alr_applications oaa LEFT JOIN earliest_in_progress_accomplishment_per_file_number AS earliest_in_prog ON earliest_in_prog.alr_application_id = oaa.alr_application_id - WHERE oaa.application_class_code IN ('LOA', 'BLK') + WHERE oaa.application_class_code IN ('LOA', 'BLK', 'SCH', 'NAN') ) SELECT DISTINCT ON (oats_in_prog.alr_application_id) oats_in_prog.alr_application_id, oats_in_prog.accomplishment_code, diff --git a/bin/migrate-oats-data/applications/submissions/sql/statuses/application_in_progress_count.sql b/bin/migrate-oats-data/applications/submissions/sql/statuses/application_in_progress_count.sql index 7c05118ca4..77dd23fb9a 100644 --- a/bin/migrate-oats-data/applications/submissions/sql/statuses/application_in_progress_count.sql +++ b/bin/migrate-oats-data/applications/submissions/sql/statuses/application_in_progress_count.sql @@ -23,7 +23,7 @@ latest_in_progress_accomplishments_for_app_only AS ( oaa.when_created FROM oats.oats_alr_applications oaa LEFT JOIN latest_in_progress_accomplishment_per_file_number AS latest_in_prog ON latest_in_prog.alr_application_id = oaa.alr_application_id - WHERE oaa.application_class_code IN ('LOA', 'BLK') + WHERE oaa.application_class_code IN ('LOA', 'BLK', 'SCH', 'NAN') ), submission_statuses_to_update AS ( SELECT count(*) diff --git a/bin/migrate-oats-data/applications/submissions/sql/statuses/application_incomplete_alc.sql b/bin/migrate-oats-data/applications/submissions/sql/statuses/application_incomplete_alc.sql index fd36762611..a547e0483f 100644 --- a/bin/migrate-oats-data/applications/submissions/sql/statuses/application_incomplete_alc.sql +++ b/bin/migrate-oats-data/applications/submissions/sql/statuses/application_incomplete_alc.sql @@ -2,7 +2,7 @@ WITH app_components_grouped AS ( SELECT oaac.alr_application_id FROM oats.oats_alr_appl_components oaac JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id - WHERE oaa.application_class_code IN ('LOA', 'BLK') + WHERE oaa.application_class_code IN ('LOA', 'BLK', 'SCH', 'NAN') AND oaac.alr_change_code <> 'SRW' GROUP BY oaac.alr_application_id HAVING count(oaac.alr_application_id) < 2 -- ignore applications with multiple components ) diff --git a/bin/migrate-oats-data/applications/submissions/sql/statuses/application_incomplete_alc_count.sql b/bin/migrate-oats-data/applications/submissions/sql/statuses/application_incomplete_alc_count.sql index fc71804e66..c1d6fbb61b 100644 --- a/bin/migrate-oats-data/applications/submissions/sql/statuses/application_incomplete_alc_count.sql +++ b/bin/migrate-oats-data/applications/submissions/sql/statuses/application_incomplete_alc_count.sql @@ -2,7 +2,7 @@ WITH app_components_grouped AS ( SELECT oaac.alr_application_id FROM oats.oats_alr_appl_components oaac JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id - WHERE oaa.application_class_code IN ('LOA', 'BLK') + WHERE oaa.application_class_code IN ('LOA', 'BLK', 'SCH', 'NAN') AND oaac.alr_change_code <> 'SRW' GROUP BY oaac.alr_application_id HAVING count(oaac.alr_application_id) < 2 -- ignore applications with multiple components ) diff --git a/bin/migrate-oats-data/applications/submissions/sql/statuses/application_returned_incomplete_lfng.sql b/bin/migrate-oats-data/applications/submissions/sql/statuses/application_returned_incomplete_lfng.sql index 0da08a6447..a91f0c4eb5 100644 --- a/bin/migrate-oats-data/applications/submissions/sql/statuses/application_returned_incomplete_lfng.sql +++ b/bin/migrate-oats-data/applications/submissions/sql/statuses/application_returned_incomplete_lfng.sql @@ -13,7 +13,7 @@ returned_lfng_accomplishments_for_app_only AS ( oaa.alr_application_id FROM oats.oats_alr_applications oaa LEFT JOIN last_lgi_per_file_number AS last_lgi ON last_lgi.alr_application_id = oaa.alr_application_id - WHERE oaa.application_class_code IN ('LOA', 'BLK') + WHERE oaa.application_class_code IN ('LOA', 'BLK', 'SCH', 'NAN') ) SELECT oats_lfng_return.alr_application_id, oats_lfng_return.accomplishment_code, diff --git a/bin/migrate-oats-data/applications/submissions/sql/statuses/application_returned_incomplete_lfng_count.sql b/bin/migrate-oats-data/applications/submissions/sql/statuses/application_returned_incomplete_lfng_count.sql index 3eec67616d..e26fcf2d84 100644 --- a/bin/migrate-oats-data/applications/submissions/sql/statuses/application_returned_incomplete_lfng_count.sql +++ b/bin/migrate-oats-data/applications/submissions/sql/statuses/application_returned_incomplete_lfng_count.sql @@ -13,7 +13,7 @@ returned_lfng_accomplishments_for_app_only AS ( oaa.alr_application_id FROM oats.oats_alr_applications oaa LEFT JOIN last_lgi_per_file_number AS last_lgi ON last_lgi.alr_application_id = oaa.alr_application_id - WHERE oaa.application_class_code IN ('LOA', 'BLK') + WHERE oaa.application_class_code IN ('LOA', 'BLK', 'SCH', 'NAN') ) SELECT count(*) FROM returned_lfng_accomplishments_for_app_only oats_lfng_return diff --git a/bin/migrate-oats-data/applications/submissions/sql/statuses/application_submitted_to_alc.sql b/bin/migrate-oats-data/applications/submissions/sql/statuses/application_submitted_to_alc.sql index bbe41d7bf2..11460e8b30 100644 --- a/bin/migrate-oats-data/applications/submissions/sql/statuses/application_submitted_to_alc.sql +++ b/bin/migrate-oats-data/applications/submissions/sql/statuses/application_submitted_to_alc.sql @@ -2,7 +2,7 @@ WITH app_components_grouped AS ( SELECT oaac.alr_application_id FROM oats.oats_alr_appl_components oaac JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id - WHERE oaa.application_class_code IN ('LOA', 'BLK') + WHERE oaa.application_class_code IN ('LOA', 'BLK', 'SCH', 'NAN') AND oaac.alr_change_code <> 'SRW' GROUP BY oaac.alr_application_id HAVING count(oaac.alr_application_id) < 2 -- ignore applications with multiple components ) diff --git a/bin/migrate-oats-data/applications/submissions/sql/statuses/application_submitted_to_alc_count.sql b/bin/migrate-oats-data/applications/submissions/sql/statuses/application_submitted_to_alc_count.sql index 102bd66010..29e8b98228 100644 --- a/bin/migrate-oats-data/applications/submissions/sql/statuses/application_submitted_to_alc_count.sql +++ b/bin/migrate-oats-data/applications/submissions/sql/statuses/application_submitted_to_alc_count.sql @@ -2,7 +2,7 @@ WITH app_components_grouped AS ( SELECT oaac.alr_application_id FROM oats.oats_alr_appl_components oaac JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id - WHERE oaa.application_class_code IN ('LOA', 'BLK') + WHERE oaa.application_class_code IN ('LOA', 'BLK', 'SCH', 'NAN') AND oaac.alr_change_code <> 'SRW' GROUP BY oaac.alr_application_id HAVING count(oaac.alr_application_id) < 2 -- ignore applications with multiple components ) diff --git a/bin/migrate-oats-data/applications/submissions/sql/statuses/application_submitted_to_lfng.sql b/bin/migrate-oats-data/applications/submissions/sql/statuses/application_submitted_to_lfng.sql index 28f90cc274..4fa521875d 100644 --- a/bin/migrate-oats-data/applications/submissions/sql/statuses/application_submitted_to_lfng.sql +++ b/bin/migrate-oats-data/applications/submissions/sql/statuses/application_submitted_to_lfng.sql @@ -19,7 +19,7 @@ submitted_lg_accomplishments_for_app_only AS ( oaa.submitted_to_lg_date FROM oats.oats_alr_applications oaa LEFT JOIN submitted_accomplishment_per_file_number AS last_sub ON last_sub.alr_application_id = oaa.alr_application_id - WHERE oaa.application_class_code IN ('LOA', 'BLK') + WHERE oaa.application_class_code IN ('LOA', 'BLK', 'SCH', 'NAN') ) SELECT oats_sub_lg.alr_application_id, oats_sub_lg.accomplishment_code, diff --git a/bin/migrate-oats-data/applications/submissions/sql/statuses/application_submitted_to_lfng_count.sql b/bin/migrate-oats-data/applications/submissions/sql/statuses/application_submitted_to_lfng_count.sql index 5839847500..11190885f8 100644 --- a/bin/migrate-oats-data/applications/submissions/sql/statuses/application_submitted_to_lfng_count.sql +++ b/bin/migrate-oats-data/applications/submissions/sql/statuses/application_submitted_to_lfng_count.sql @@ -19,7 +19,7 @@ submitted_lg_accomplishments_for_app_only AS ( oaa.submitted_to_lg_date FROM oats.oats_alr_applications oaa LEFT JOIN submitted_accomplishment_per_file_number AS last_sub ON last_sub.alr_application_id = oaa.alr_application_id - WHERE oaa.application_class_code IN ('LOA', 'BLK') + WHERE oaa.application_class_code IN ('LOA', 'BLK', 'SCH', 'NAN') ), rows_to_update as ( SELECT oats_sub_lg.alr_application_id, diff --git a/bin/migrate-oats-data/applications/submissions/sql/statuses/application_under_review_lfng.sql b/bin/migrate-oats-data/applications/submissions/sql/statuses/application_under_review_lfng.sql index 00126e038c..9ff9426e43 100644 --- a/bin/migrate-oats-data/applications/submissions/sql/statuses/application_under_review_lfng.sql +++ b/bin/migrate-oats-data/applications/submissions/sql/statuses/application_under_review_lfng.sql @@ -13,7 +13,7 @@ lfng_rev_accomplishments_for_app_only AS ( oaa.alr_application_id FROM oats.oats_alr_applications oaa LEFT JOIN last_review_per_file_number AS last_rev ON last_rev.alr_application_id = oaa.alr_application_id - WHERE oaa.application_class_code IN ('LOA', 'BLK') + WHERE oaa.application_class_code IN ('LOA', 'BLK', 'SCH', 'NAN') ) SELECT oats_lfng_rev.alr_application_id, oats_lfng_rev.accomplishment_code, diff --git a/bin/migrate-oats-data/applications/submissions/sql/statuses/application_under_review_lfng_count.sql b/bin/migrate-oats-data/applications/submissions/sql/statuses/application_under_review_lfng_count.sql index 412a1322d7..d8035cac1f 100644 --- a/bin/migrate-oats-data/applications/submissions/sql/statuses/application_under_review_lfng_count.sql +++ b/bin/migrate-oats-data/applications/submissions/sql/statuses/application_under_review_lfng_count.sql @@ -13,7 +13,7 @@ lfng_rev_accomplishments_for_app_only AS ( oaa.alr_application_id FROM oats.oats_alr_applications oaa LEFT JOIN last_review_per_file_number AS last_rev ON last_rev.alr_application_id = oaa.alr_application_id - WHERE oaa.application_class_code IN ('LOA', 'BLK') + WHERE oaa.application_class_code IN ('LOA', 'BLK', 'SCH', 'NAN') ) SELECT count(*) FROM lfng_rev_accomplishments_for_app_only oats_lfng_rev diff --git a/bin/migrate-oats-data/applications/submissions/sql/statuses/application_wrong_lfng.sql b/bin/migrate-oats-data/applications/submissions/sql/statuses/application_wrong_lfng.sql index 8d64f68a85..3628f4889f 100644 --- a/bin/migrate-oats-data/applications/submissions/sql/statuses/application_wrong_lfng.sql +++ b/bin/migrate-oats-data/applications/submissions/sql/statuses/application_wrong_lfng.sql @@ -13,7 +13,7 @@ wrong_lfng_accomplishments_for_app_only AS ( oaa.alr_application_id FROM oats.oats_alr_applications oaa LEFT JOIN last_wlg_per_file_number AS last_wlg ON last_wlg.alr_application_id = oaa.alr_application_id - WHERE oaa.application_class_code IN ('LOA', 'BLK') + WHERE oaa.application_class_code IN ('LOA', 'BLK', 'SCH', 'NAN') ) SELECT oats_lfng_wrong.alr_application_id, oats_lfng_wrong.accomplishment_code, diff --git a/bin/migrate-oats-data/applications/submissions/sql/statuses/application_wrong_lfng_count.sql b/bin/migrate-oats-data/applications/submissions/sql/statuses/application_wrong_lfng_count.sql index 6530124946..b0cf3aa0d2 100644 --- a/bin/migrate-oats-data/applications/submissions/sql/statuses/application_wrong_lfng_count.sql +++ b/bin/migrate-oats-data/applications/submissions/sql/statuses/application_wrong_lfng_count.sql @@ -13,7 +13,7 @@ wrong_lfng_accomplishments_for_app_only AS ( oaa.alr_application_id FROM oats.oats_alr_applications oaa LEFT JOIN last_wlg_per_file_number AS last_wlg ON last_wlg.alr_application_id = oaa.alr_application_id - WHERE oaa.application_class_code IN ('LOA', 'BLK') + WHERE oaa.application_class_code IN ('LOA', 'BLK', 'SCH', 'NAN') ) SELECT count(*) FROM wrong_lfng_accomplishments_for_app_only oats_lfng_wrong diff --git a/bin/migrate-oats-data/applications/submissions/sql/statuses/init_app_submission_status.sql b/bin/migrate-oats-data/applications/submissions/sql/statuses/init_app_submission_status.sql index 35b55c32d3..5ae2d2e921 100644 --- a/bin/migrate-oats-data/applications/submissions/sql/statuses/init_app_submission_status.sql +++ b/bin/migrate-oats-data/applications/submissions/sql/statuses/init_app_submission_status.sql @@ -3,7 +3,7 @@ INSERT INTO alcs.application_submission_to_submission_status(submission_uuid, st SELECT oaac.alr_application_id FROM oats.oats_alr_appl_components oaac JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id - WHERE oaa.application_class_code IN ('LOA', 'BLK') + WHERE oaa.application_class_code IN ('LOA', 'BLK', 'SCH', 'NAN') AND oaac.alr_change_code <> 'SRW' GROUP BY oaac.alr_application_id HAVING count(oaac.alr_application_id) < 2 -- ignore applications with multiple components ), diff --git a/bin/migrate-oats-data/applications/submissions/sql/statuses/init_app_submission_status_count.sql b/bin/migrate-oats-data/applications/submissions/sql/statuses/init_app_submission_status_count.sql index 8b00f89a8a..3414427376 100644 --- a/bin/migrate-oats-data/applications/submissions/sql/statuses/init_app_submission_status_count.sql +++ b/bin/migrate-oats-data/applications/submissions/sql/statuses/init_app_submission_status_count.sql @@ -2,7 +2,7 @@ WITH app_components_grouped AS ( SELECT oaac.alr_application_id FROM oats.oats_alr_appl_components oaac JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id - WHERE oaa.application_class_code IN ('LOA', 'BLK') + WHERE oaa.application_class_code IN ('LOA', 'BLK', 'SCH', 'NAN') AND oaac.alr_change_code <> 'SRW' GROUP BY oaac.alr_application_id HAVING count(oaac.alr_application_id) < 2 -- ignore applications with multiple components ), diff --git a/bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_cancelled_validation.sql b/bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_cancelled_validation.sql index 9aa19db23b..4f994fcd94 100644 --- a/bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_cancelled_validation.sql +++ b/bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_cancelled_validation.sql @@ -41,7 +41,7 @@ WITH oats.oats_alr_applications oaa LEFT JOIN first_cancelled_accomplishment_per_file_number AS first_cancelled ON first_cancelled.alr_application_id = oaa.alr_application_id WHERE - oaa.application_class_code IN ('LOA', 'BLK') + oaa.application_class_code IN ('LOA', 'BLK', 'SCH', 'NAN') AND ( first_cancelled.completion_date IS NOT NULL OR oaa.cancelled_date IS NOT NULL @@ -54,7 +54,7 @@ WITH FROM oats.oats_alr_appl_components oaac JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id - AND oaa.application_class_code IN ('LOA', 'BLK') + AND oaa.application_class_code IN ('LOA', 'BLK', 'SCH', 'NAN') AND oaac.alr_change_code <> 'SRW' GROUP BY oaac.alr_application_id HAVING diff --git a/bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_in_progress_validation.sql b/bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_in_progress_validation.sql index f60d8a7bb9..e827f8dd5d 100644 --- a/bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_in_progress_validation.sql +++ b/bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_in_progress_validation.sql @@ -38,7 +38,7 @@ WITH oats.oats_alr_applications oaa LEFT JOIN inp_accomplishment_per_file_number AS inp_accomplishments ON inp_accomplishments.alr_application_id = oaa.alr_application_id WHERE - oaa.application_class_code IN ('LOA', 'BLK') + oaa.application_class_code IN ('LOA', 'BLK', 'SCH', 'NAN') AND (oaa.when_created IS NOT NULL) ), apps_with_one_or_zero_component_only AS ( @@ -48,7 +48,7 @@ WITH FROM oats.oats_alr_appl_components oaac JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id - AND oaa.application_class_code IN ('LOA', 'BLK') + AND oaa.application_class_code IN ('LOA', 'BLK', 'SCH', 'NAN') AND oaac.alr_change_code <> 'SRW' GROUP BY oaac.alr_application_id HAVING diff --git a/bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_return_incomplete_lfng_validation.sql b/bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_return_incomplete_lfng_validation.sql index 91db7c4737..3ed17adef8 100644 --- a/bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_return_incomplete_lfng_validation.sql +++ b/bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_return_incomplete_lfng_validation.sql @@ -35,7 +35,7 @@ WITH oats.oats_alr_applications oaa LEFT JOIN last_return_per_file_number AS last_return ON last_return.alr_application_id = oaa.alr_application_id WHERE - oaa.application_class_code IN ('LOA', 'BLK') + oaa.application_class_code IN ('LOA', 'BLK', 'SCH', 'NAN') ), all_returned AS ( SELECT diff --git a/bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_sub_incomplete_alc_validation.sql b/bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_sub_incomplete_alc_validation.sql index 7e9af97171..31c25d61d8 100644 --- a/bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_sub_incomplete_alc_validation.sql +++ b/bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_sub_incomplete_alc_validation.sql @@ -20,7 +20,7 @@ WITH oats.oats_alr_appl_components oaac JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id WHERE - oaa.application_class_code IN ('LOA', 'BLK') + oaa.application_class_code IN ('LOA', 'BLK', 'SCH', 'NAN') AND oaac.alr_change_code <> 'SRW' GROUP BY oaac.alr_application_id HAVING diff --git a/bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_submitted_lfng_validation.sql b/bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_submitted_lfng_validation.sql index 6b330f0f64..e12318a858 100644 --- a/bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_submitted_lfng_validation.sql +++ b/bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_submitted_lfng_validation.sql @@ -41,7 +41,7 @@ WITH oats.oats_alr_applications oaa LEFT JOIN last_sub_lg_accomplishment_per_file_number AS last_sub_lg ON last_sub_lg.alr_application_id = oaa.alr_application_id WHERE - oaa.application_class_code IN ('LOA', 'BLK') + oaa.application_class_code IN ('LOA', 'BLK', 'SCH', 'NAN') AND ( last_sub_lg.completion_date IS NOT NULL OR oaa.submitted_to_lg_date IS NOT NULL @@ -54,7 +54,7 @@ WITH FROM oats.oats_alr_appl_components oaac JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id - AND oaa.application_class_code IN ('LOA', 'BLK') + AND oaa.application_class_code IN ('LOA', 'BLK', 'SCH', 'NAN') AND oaac.alr_change_code <> 'SRW' GROUP BY oaac.alr_application_id HAVING diff --git a/bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_submitted_to_alc_validation.sql b/bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_submitted_to_alc_validation.sql index 006fe0c554..710e754579 100644 --- a/bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_submitted_to_alc_validation.sql +++ b/bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_submitted_to_alc_validation.sql @@ -20,7 +20,7 @@ WITH oats.oats_alr_appl_components oaac JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id WHERE - oaa.application_class_code IN ('LOA', 'BLK') + oaa.application_class_code IN ('LOA', 'BLK', 'SCH', 'NAN') AND oaac.alr_change_code <> 'SRW' GROUP BY oaac.alr_application_id HAVING diff --git a/bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_under_review_lfng_validation.sql b/bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_under_review_lfng_validation.sql index 6e466c7b08..142a7bef5c 100644 --- a/bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_under_review_lfng_validation.sql +++ b/bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_under_review_lfng_validation.sql @@ -35,7 +35,7 @@ WITH oats.oats_alr_applications oaa LEFT JOIN last_review_per_file_number AS last_rev ON last_rev.alr_application_id = oaa.alr_application_id WHERE - oaa.application_class_code IN ('LOA', 'BLK') + oaa.application_class_code IN ('LOA', 'BLK', 'SCH', 'NAN') ), all_under_rev AS ( SELECT diff --git a/bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_wrong_lfng_validation.sql b/bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_wrong_lfng_validation.sql index 8e144a16b7..f3ae978dac 100644 --- a/bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_wrong_lfng_validation.sql +++ b/bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_wrong_lfng_validation.sql @@ -1,56 +1,39 @@ --- run it manually in IDE of your choice --- compare to numbers returned by script. -- total count of set 'WRNG' - Wrong LFNG in ALCS -SELECT - count(*) -FROM - alcs.application_submission_to_submission_status appstss +SELECT count(*) +FROM alcs.application_submission_to_submission_status appstss JOIN alcs.application_submission as2 ON as2.uuid = appstss.submission_uuid -WHERE - appstss.status_type_code = 'WRNG' +WHERE appstss.status_type_code = 'WRNG' AND effective_date IS NOT NULL AND as2.audit_created_by = 'oats_etl'; - --total count of set 'WLG' apps in OATS -WITH - last_wrong_per_file_number AS ( - SELECT - alr_application_id, - accomplishment_code, - MAX(oa.completion_date) AS completion_date - FROM - oats.oats_accomplishments oa - WHERE - accomplishment_code = 'WLG' - GROUP BY - alr_application_id, - accomplishment_code - ), - lfng_wrong_accomplishments_for_app_only AS ( - SELECT - last_wlg.accomplishment_code, - last_wlg.completion_date, - oaa.alr_application_id - FROM - oats.oats_alr_applications oaa - LEFT JOIN last_wrong_per_file_number AS last_wlg ON last_wlg.alr_application_id = oaa.alr_application_id - WHERE - oaa.application_class_code IN ('LOA', 'BLK') - ), - all_wlg AS ( - SELECT - oats_lfng_wlg.alr_application_id, - oats_lfng_wlg.accomplishment_code, - oats_lfng_wlg.completion_date AS max_date, - apps.uuid - FROM - lfng_wrong_accomplishments_for_app_only oats_lfng_wlg - JOIN alcs.application_submission apps ON apps.file_number = oats_lfng_wlg.alr_application_id::TEXT - WHERE - oats_lfng_wlg.accomplishment_code = 'WLG' - and oats_lfng_wlg.completion_date IS NOT NULL - ) -SELECT - COUNT(*) -FROM - all_wlg \ No newline at end of file +WITH last_wrong_per_file_number AS ( + SELECT alr_application_id, + accomplishment_code, + MAX(oa.completion_date) AS completion_date + FROM oats.oats_accomplishments oa + WHERE accomplishment_code = 'WLG' + GROUP BY alr_application_id, + accomplishment_code +), +lfng_wrong_accomplishments_for_app_only AS ( + SELECT last_wlg.accomplishment_code, + last_wlg.completion_date, + oaa.alr_application_id + FROM oats.oats_alr_applications oaa + LEFT JOIN last_wrong_per_file_number AS last_wlg ON last_wlg.alr_application_id = oaa.alr_application_id + WHERE oaa.application_class_code IN ('LOA', 'BLK', 'SCH', 'NAN') +), +all_wlg AS ( + SELECT oats_lfng_wlg.alr_application_id, + oats_lfng_wlg.accomplishment_code, + oats_lfng_wlg.completion_date AS max_date, + apps.uuid + FROM lfng_wrong_accomplishments_for_app_only oats_lfng_wlg + JOIN alcs.application_submission apps ON apps.file_number = oats_lfng_wlg.alr_application_id::TEXT + WHERE oats_lfng_wlg.accomplishment_code = 'WLG' + and oats_lfng_wlg.completion_date IS NOT NULL +) +SELECT COUNT(*) +FROM all_wlg \ No newline at end of file diff --git a/bin/migrate-oats-data/noi/oats_to_alcs_notice_of_intent_table_etl/notice_of_intent_decision_date.py b/bin/migrate-oats-data/noi/oats_to_alcs_notice_of_intent_table_etl/notice_of_intent_decision_date.py index b87ebc945e..97b4152883 100644 --- a/bin/migrate-oats-data/noi/oats_to_alcs_notice_of_intent_table_etl/notice_of_intent_decision_date.py +++ b/bin/migrate-oats-data/noi/oats_to_alcs_notice_of_intent_table_etl/notice_of_intent_decision_date.py @@ -1,4 +1,8 @@ -from common import BATCH_UPLOAD_SIZE, setup_and_get_logger +from common import ( + BATCH_UPLOAD_SIZE, + setup_and_get_logger, + add_timezone_and_keep_date_part, +) from db import inject_conn_pool from psycopg2.extras import RealDictCursor, execute_batch @@ -95,5 +99,9 @@ def _get_update_query_from_oats_alr_applications_fields(): def _prepare_oats_alr_applications_data(row_data_list): data_list = [] for row in row_data_list: - data_list.append(dict(row)) + data = dict(row) + data["decision_date"] = add_timezone_and_keep_date_part( + row.get("decision_date") + ) + data_list.append(data) return data_list diff --git a/bin/migrate-oats-data/noi/oats_to_alcs_notice_of_intent_table_etl/oats_to_alcs_notice_of_intent_table_etl.py b/bin/migrate-oats-data/noi/oats_to_alcs_notice_of_intent_table_etl/oats_to_alcs_notice_of_intent_table_etl.py index 9be971cedf..9ddeaad86b 100644 --- a/bin/migrate-oats-data/noi/oats_to_alcs_notice_of_intent_table_etl/oats_to_alcs_notice_of_intent_table_etl.py +++ b/bin/migrate-oats-data/noi/oats_to_alcs_notice_of_intent_table_etl/oats_to_alcs_notice_of_intent_table_etl.py @@ -144,6 +144,14 @@ def map_basic_field(data): data["agri_capability_code"] = str( OatsToAlcsAgCap[data["agri_capability_code"]].value ) + if data["submitted_to_alc_date"]: + data["submitted_to_alc_date"] = add_timezone_and_keep_date_part( + data.get("submitted_to_alc_date", None) + ) + if data["fee_received_date"]: + data["fee_received_date"] = add_timezone_and_keep_date_part( + data.get("fee_received_date", None) + ) return data diff --git a/bin/migrate-oats-data/sql/documents_app/alcs_documents_to_app_documents.sql b/bin/migrate-oats-data/sql/documents_app/alcs_documents_to_app_documents.sql index ac775c2ff8..a0233b5033 100644 --- a/bin/migrate-oats-data/sql/documents_app/alcs_documents_to_app_documents.sql +++ b/bin/migrate-oats-data/sql/documents_app/alcs_documents_to_app_documents.sql @@ -1,36 +1,29 @@ with oats_documents_to_map as ( - select - a.uuid as application_uuid, + select a.uuid as application_uuid, d.uuid as document_uuid, adc.code, publicly_viewable_ind as is_public, app_lg_viewable_ind as is_app_lg, od.document_id as oats_document_id, od.alr_application_id as oats_application_id - from oats.oats_documents od - - join alcs."document" d - on d.oats_document_id = od.document_id::text - - join alcs.document_code adc - on adc.oats_code = od.document_code - - join alcs.application a - on a.file_number = od.alr_application_id::text + from oats.oats_documents od + join alcs."document" d on d.oats_document_id = od.document_id::text + join alcs.document_code adc on adc.oats_code = od.document_code + join alcs.application a on a.file_number = od.alr_application_id::text ) -select - otm.application_uuid , - otm.document_uuid , - otm.code as type_code , - (case when is_public = 'Y' and is_app_lg = 'Y' - then '{P, A, C, G}'::text[] - when is_public = 'Y' - then '{P}'::text[] - when is_app_lg='Y' - then '{A, C, G}'::text[] - else '{}'::text[] - end) as visibility_flags, +select otm.application_uuid, + otm.document_uuid, + otm.code as type_code, + ( + case + when is_public = 'Y' + and is_app_lg = 'Y' then '{P, A, C, G}'::text [] + when is_public = 'Y' then '{P}'::text [] + when is_app_lg = 'Y' then '{A, C, G}'::text [] + else '{}'::text [] + end + ) as visibility_flags, oats_document_id, oats_application_id, - 'oats_etl' as audit_created_by + 'oats_etl' as audit_created_by from oats_documents_to_map otm \ No newline at end of file diff --git a/bin/migrate-oats-data/sql/insert-application.sql b/bin/migrate-oats-data/sql/insert-application.sql deleted file mode 100644 index dbef1d1306..0000000000 --- a/bin/migrate-oats-data/sql/insert-application.sql +++ /dev/null @@ -1,104 +0,0 @@ --- Step 1: Create helper table to lookup guids and deal with duplicates -DROP TABLE IF EXISTS application_etl; - -CREATE TEMPORARY TABLE application_etl ( - id SERIAL PRIMARY KEY, - application_id int, - card_uuid UUID NOT NULL DEFAULT gen_random_uuid(), - duplicated bool DEFAULT false -); - -INSERT INTO - application_etl (application_id, duplicated) -SELECT - DISTINCT oa.alr_application_id AS application_id, - CASE - WHEN a.uuid IS NOT NULL THEN TRUE - ELSE false - END AS duplicated -FROM - oats.oats_alr_applications AS oa - LEFT JOIN alcs.application AS a ON oa.alr_application_id :: text = a.file_number; - --- Step 2: Create associated card -INSERT INTO - alcs.card (uuid, audit_created_by) -SELECT - ae.card_uuid, - 'oats_etl' -FROM - application_etl ae -WHERE - ae.duplicated IS false; - --- Step 3: Perform a lookup to retrieve the applicant's name or organization for each application ID -WITH applicant_lookup AS ( - SELECT - DISTINCT oaap.alr_application_id AS application_id, - string_agg(DISTINCT oo.organization_name, ', ') FILTER ( - WHERE - oo.organization_name IS NOT NULL - ) AS orgs, - string_agg( - DISTINCT concat(op.first_name || ' ' || op.last_name), - ', ' - ) FILTER ( - WHERE - op.last_name IS NOT NULL - OR op.first_name IS NOT NULL - ) AS persons - FROM - oats.oats_alr_application_parties oaap - LEFT JOIN oats.oats_person_organizations opo ON oaap.person_organization_id = opo.person_organization_id - LEFT JOIN oats.oats_persons op ON op.person_id = opo.person_id - LEFT JOIN oats.oats_organizations oo ON opo.organization_id = oo.organization_id - WHERE - oaap.alr_appl_role_code = 'APPL' - GROUP BY - oaap.alr_application_id -), --- Step 4: Perform a lookup to retrieve the region code for each application ID -panel_lookup AS ( - SELECT - DISTINCT oaap.alr_application_id AS application_id, - oo2.organization_name AS panel_region - FROM - oats.oats_alr_application_parties oaap - JOIN oats.oats_person_organizations opo ON oaap.person_organization_id = opo.person_organization_id - JOIN oats.oats_organizations oo ON opo.organization_id = oo.organization_id - JOIN oats.oats_organizations oo2 ON oo.parent_organization_id = oo2.organization_id - WHERE - oo2.organization_type_cd = 'PANEL' -) -- Step 5: Insert new records into the alcs_applications table -INSERT INTO - alcs.application ( - file_number, - card_uuid, - type_code, - applicant, - region_code, - local_government_uuid, - audit_created_by - ) -SELECT - oa.alr_application_id :: text AS file_number, - ae.card_uuid AS card_uuid, - -- TODO: type code lookup - 'NARU', - CASE - WHEN applicant_lookup.orgs IS NOT NULL THEN applicant_lookup.orgs - WHEN applicant_lookup.persons IS NOT NULL THEN applicant_lookup.persons - ELSE 'Unknown' - END AS applicant, - -- TODO: panel region lookup - 'INTR', - --Peace river TODO: local government lookup - '001cfdad-bc6e-4d25-9294-1550603da980', - 'oats_etl' -FROM - oats.oats_alr_applications AS oa - JOIN application_etl AS ae ON oa.alr_application_id = ae.application_id - LEFT JOIN applicant_lookup ON oa.alr_application_id = applicant_lookup.application_id - LEFT JOIN panel_lookup ON oa.alr_application_id = panel_lookup.application_id -WHERE - ae.duplicated IS false; \ No newline at end of file From 4fb7a38b33527a1a89cae61dfa3e0de3355000a6 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Mon, 15 Jan 2024 16:00:18 -0800 Subject: [PATCH 931/954] Update NFU Template --- .../generate-submission-document.service.ts | 26 ++++++++++++------ .../pdf/nfu-submission-template.docx | Bin 32906 -> 32385 bytes 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/services/apps/alcs/src/portal/pdf-generation/generate-submission-document.service.ts b/services/apps/alcs/src/portal/pdf-generation/generate-submission-document.service.ts index cf96bfebc1..247036c2b2 100644 --- a/services/apps/alcs/src/portal/pdf-generation/generate-submission-document.service.ts +++ b/services/apps/alcs/src/portal/pdf-generation/generate-submission-document.service.ts @@ -14,6 +14,7 @@ import { } from '../../alcs/application/application-document/application-document.entity'; import { ApplicationDocumentService } from '../../alcs/application/application-document/application-document.service'; import { ApplicationService } from '../../alcs/application/application.service'; +import { LocalGovernment } from '../../alcs/local-government/local-government.entity'; import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; import { OWNER_TYPE } from '../../common/owner-type/owner-type.entity'; import { DOCUMENT_TYPE } from '../../document/document-code.entity'; @@ -73,15 +74,13 @@ export class GenerateSubmissionDocumentService { const template = await this.getPdfTemplateBySubmissionType(submission); if (template) { - const pdf = await this.documentGenerationService.generateDocument( + return await this.documentGenerationService.generateDocument( `${fileNumber}_submission_Date_Time`, `${config.get<string>('CDOGS.TEMPLATE_FOLDER')}/${ template.templateName }`, template.payload, ); - - return pdf; } return; } @@ -195,7 +194,7 @@ export class GenerateSubmissionDocumentService { submission.fileNumber, ); - let localGovernment; + let localGovernment: LocalGovernment | undefined; if (submission.localGovernmentUuid) { localGovernment = await this.localGovernmentService.getByUuid( submission.localGovernmentUuid, @@ -224,6 +223,10 @@ export class GenerateSubmissionDocumentService { ].includes((e.typeCode ?? 'undefined') as DOCUMENT_TYPE), ); + const proposalMap = documents.filter( + (document) => document.type?.code === DOCUMENT_TYPE.PROPOSAL_MAP, + ); + const data = { noData: 'No Data', generatedDateTime: dayjs @@ -235,11 +238,19 @@ export class GenerateSubmissionDocumentService { localGovernment: localGovernment?.name, status: submission.status.statusType, applicant: submission.applicant, + hasOtherParcelsInCommunity: formatBooleanToYesNoString( + submission.hasOtherParcelsInCommunity, + ), + otherParcelsDescription: submission.otherParcelsDescription, + selectedThirdPartyAgent: primaryContact?.type.code !== OWNER_TYPE.AGENT, primaryContact, + primaryContactType: primaryContact?.type?.label, organizationText: primaryContact?.type.code === OWNER_TYPE.CROWN ? 'Ministry/Department Responsible' : 'Organization (If Applicable)', + isGovernmentSetup: + !localGovernment || localGovernment.bceidBusinessGuid !== null, // Land use parcelsAgricultureDescription: submission.parcelsAgricultureDescription, @@ -256,6 +267,9 @@ export class GenerateSubmissionDocumentService { westLandUseType: submission.westLandUseType, westLandUseTypeDescription: submission.westLandUseTypeDescription, + //Common File Types + proposalMap: proposalMap.find((d) => d)?.document.fileName, + // Other attachments otherAttachments: otherDocuments.map((e) => ({ type: e.type?.description ?? '', @@ -319,9 +333,6 @@ export class GenerateSubmissionDocumentService { const servingNotice = documents.filter( (document) => document.type?.code === DOCUMENT_TYPE.SERVING_NOTICE, ); - const proposalMap = documents.filter( - (document) => document.type?.code === DOCUMENT_TYPE.PROPOSAL_MAP, - ); pdfData = { ...pdfData, @@ -332,7 +343,6 @@ export class GenerateSubmissionDocumentService { turOutsideLands: submission.turOutsideLands, turTotalCorridorArea: submission.turTotalCorridorArea, servingNotice: servingNotice.find((d) => d)?.document.fileName, - proposalMap: proposalMap.find((d) => d)?.document.fileName, }; return pdfData; diff --git a/services/templates/pdf/nfu-submission-template.docx b/services/templates/pdf/nfu-submission-template.docx index 0ccffecf2bb82864c2c4b662332fb2b9027621ab..34f570639da06d9a2e7c13b8eec3c01538975174 100644 GIT binary patch delta 9532 zcmZu%1ymi&vc>HX+%>qn6a3%=cXxM70s#&ZEI22)ySux)yGw8<Kydry-M9X~_r2e1 z&8(@Jmg?G7Ju_YVyC0O_GbD<V95f6T1OfsA#A!Q=Ruu{{B+Q=+FbgCZ$Xi8OF@P1# z=T<Yi9Y`0#G1i~W@zo_X6feTDZdD6gcIK1m<1G%J-I2+3aLf7Q!<v4@%zZn38?hCI z4IhvaAqGBnp((l#xy?-O7008WJ*lQTo)rksYL#vv-;~`t|0~xPb{UB^og+5Lg$qb% zi`}>Q>z&#ti~<>PQ@MK|s8r6~4}06N6oM%5=ezRG>QwC@U7%q^<bhSv)s%|8`x5>R z5fBku+Ljd&LCBivU|6qplFf2hb}_&|Y}$`#?kk0)@eHRZ=4X`!;V#FLfqe%x!@-*( z-b^=7yKgS<M#awfpqCQ}6BoW*L^CN91S+2dpM7M<n4!#deiG{I0G%}idFvh5nk$Be zxw7g3%-2x9Uczr)#txYrlL){bvYhb`A=H&HCRH&s{I2tTdf60UHUdh`p+AChZG|a? zWY}XTDYK?_>~gy@OG=GtmOB#q(GQ0sMOGS?e7v9<o|R0uOc?AC1qHr=e9Ru+DapYj ze2US}w}*s)Sc8Iq_z!Hr3sB^sDF=U6Ebk3Xv}#Sd_gHLs{f&%Y7qgQ--de~uApvUT zSMZ-7)yIe?j%NgKQ`22n<SYu>uOc($86<v6i5`4?-&m^aO#2jd>A`s+Xqr^0O#_Sd zf*&rNgKCzS2W79zn(m60|BKLe4vVaZ@E{41h>55sq1kd?)LX=*!;wz_B=fQsP)Umd z4Bs>pomGmOU7PISQ;53h$gkT;xF5|IVAz+EL2Nrpgq58%)RrA-u0Hka*A6Fk9WX0b zTX3;hE0|oUpRR1p&t#Mi;0+<&z%wit{(N=+xCKkIE>i7!eh1~C%wJwiq(~mWO$ktK zAJ9(SGscl}@1vnplOetYv4tTL1nI}}G}uqlz7zXg?!Q5zT?LJojN!&GsByGB2}1+3 zCR=TlXtCN1z@qt?m?>&1;-I@yioHD!vn@b64EJMX<|H%8205bI_JsI@(+2)C<R80N zlkTaiz1dyn&F=pU35dTHOt34=z`x?7rU_B*uSls8g8dBh*F6M)yux46lc_@v8gW<_ z!CJdzkgS0xoK=g%#>~qV*RK`x_v&PAuP?Y3aI@?rGu*hqj15A-pmU3fAiZ@yYZ?%$ zW~n$c7v=WVu)?01V$FrYS_oCr{&*f=)1@g}YD#Y$sDU=aq~*zV@1`wT1l&rAi*Wn6 zP)I)F8a;}VyIEMKu;y!vf5?dqB3j0@|G=8x<Vua?UvFLbjy6M%OLp&x$wG9-CFfqp z-=&KexdR3P)-}C&EU=1rc`xstP}|LYmrYeJB2;v&OQ*t*F}W!gajqx4n*yiY=>f%c zbO%PeiRY3nCWX2QSo<n+!x@w=Sz-{ebs_l^vsGdo`DC)XA!{w$AO%GpbZJ^2hx}S9 zpO<){=thO~v;KPPgG$bXqv^F;&BD*qHsPGG8Hj#C-<_$bkJe@--6?|{WOJUq6w{%% zu|=q^rHX(CCf^@ZLD+0*)~68GO6ERS%-_jJ^f7z$M}*v(oEIridS-<pVeQ=~C%Oe; zQmuE3Q7oF!*q*tm0Qs#$pkdk$jZZ8Xsr;4UdQ`?{@3wus1B@VfL}*;&A&Z9fRG-RI zr^%D{kYzx1s{|7cut~R``iuP;`=3TDF?kl9F^Bo}x}PD}2A>{ozB1_<eu0aHhp9Ef zV~5wjXmN1?UjWW$_;w)Th*Y+S;wku_omLr$Zja9_&71pzkJH`P82VmMnloRz;jV>` zcUb=T7>9en4B*Ybu8{uI$H197*kC0iEYK~M{~6{|7dNtGnu+bC!)NGeL0@`~dhRq4 z`ip7fbD{ghTIe9RwiqLo*MW@M-IC*s`AX>b*5|V6EF9yVbcWWN2~R7}r(4jLSa~J6 z7bvnmFk1`9Jeu}XYJ;(h%0K1Wr8J{$I%RdV$|k`ZeSw$tzgp5XSRK67jD}M1fFQD7 zTAc?7=G{*uW#NbDwrtYe2B%Dov>Mts2Ji9k!Rj_{nW3NVG@k>wW}0qdi^~S+Gc`qi zSQw2dEy$i)d`#D$bQ(y){uw)rJ$zHTqe_uN=0QGfIJnf$zJyn>po+mVk$zDhf$Wq$ zSCO-pwGkX@F-Ntg6DoX@m7*o>_!}fjNF3$8O{03hve4uyRP(x><}G~Rk^rf}(OJAD zcPcOp4`x<&>2AK!BENKRmdi41H|en7o`SFq3*e-BMXrY0$sY02RK;>%>m>^b_)b!= zN>7OK`wLLf)I@-3Pv?tdr|!8)L3C~{^L+tfeH^oXwcDI9KYv(A0*+l+WBUhacv=dz z6V1BPf?#=_v%0{IwIyC!xPa&67q(;JKNxzvDk0{)trIyg|AnElId+YMHuJyVpQt9- z;B`Gzkgnr0E7riqEgiX{_cuKNGM8FQp~@|*y3Q?RxO1nDom4&aX~RZnQ$-n}WV%H< z(fHU4an3<S&g!br1-q6?UJ@4H_eXT3!uKxyy#i7lB<G$KSXKdj$O$TwM1raj4m6|= z8m7uubn0lhB8XW7B}7c&Mg7KwL;fzMkJZ^wAg@3*BEq|(y`Qqh+If^&IzVcc9?I`< zWCI^F<?)kpbV4ukC8Id9bK?UK(T4`AY4NgB%u}+K?OGM?sb$8BSdZ<onW`Wi+Kl4X zHFTSA3@=>>2V_$0`7}C?i-*dLO6VApJnB;%M@qL&B+}N>y$4rPS3jY!Zx0G_?QfcS zfrN2Yep(~qLI+O5l*204DJLe9a-l~0tW9kC*h@DtcJ&zzDVs4l^$h#khmKIwrk0-H zMxKX5Ie_dJ+?7wtEFf<iKZ&$SJ=BgY;&*_{igE+BQ%d0H7~#env_DhXMs7C6HuDj| z1V6G;TWs1Ca|(UYGh%CaoweV|FSm(z0(ErLy}(6z!zy~gDtg0Cc)@nuV0&#c+)Zl! ziV@!Y8B^+^c}0mk<~k+N?r+E$<+zDEwoP~^arN}NNn?}#JA-Q?9HZa)-bRz8lDrmK z$e@q-w`F1@|LhmkuRl->jxiWNtKhA1ieUD;{NA<wg$b~C6$W@4A+}&hm80lWJ%dnm zFr_Fo9ZMgd_uO(qQfsYgYPI)r?N|4w>*GWfmP;|0m3RIU=Y$lNkD0B&UpBMr&Rnfm zkVt4wGclKK_dkp^PvqH`xTMzhC|F62H~etVkXzAM=Czj6pUe-vVlrQQ>uiogVOcS4 z5+&7<?pP@8MjRdN!Pa<TX`-?{Vb!0Z9WLC13(9AD3D<l|D!Ahi@zAwHU|{e4nZPRb zeY+4gE5a)#zBMhLcY3;EMn!5ljK%ZDddXPl%P+3^9n?RL@0dmj>UvweW~lzl@lj3Q z9yxTgBDbA0WUopg1zQ)>TA40eZ?i7KCvHwl%jos_MRpj{X3FTILPIw6PWYVPd+@%v zXxOn<k{J&Auz;c3^7AfA#C*mL&q?z(5quEi1#n!#7zc7%jKK*z6k(iae2z%keOmjn zRppbAw}p}!m9hQ-iS5RD1V|(N(UN<h-m_8yv!wtRqgH{*Z?BU|+5{0SxeF-Xt6-Q~ zv>7<Pq~zU$O$E*-_=JxW5kMSOyIy#{U-kjz?^(}0xs3ox<|=iro8fCDC0X{4e#_$e z#K(jPa5y-hqnE>;(bMeL{Ot<nH>Y(Ji}G}fU6~w^uaZ<8E&Q_H>5j4{R;$Bm5f&f{ zUOtWMy7L_y@_#$#Z&9<@Y#Ld7@#jH3N)vEjN}A-yLvG1+Fgx<N1dq+3x>PU9q!5z` zJiz@i?vHkQ7XG(Y#Q^rdj2mFe3X(w9S5ucTni{A!7hQ;}qUp7NingbH@*a@+Mh}B0 zd%&L5bh~=7!<JlX9#`7QpQWCTQX`t|YmyA88=Sdal6w_O3;&w4)bA@-so5mJ)W(DQ zjaS1zmw5&bO9RQC>iUZ{Zm-gf1g?k!e87k9+RIF@4frTG0Z)H_W`+!b3ed%;9tn?R z0d8-|xPsY4S=OVfk798rbJ~Tg=s#sI(%hc8wS$J62jaRLQ+i->a6Ukg^_cy9@#!n@ zdyZ}PP394BVBn=xwRvWUTNDxMrldUnlI~4ezBFsI?Zkvry$uighCAyWAZgU*I}>8% zEu@4SXyi*G7aEJ)E$X_tUkzHC_F!V^=i#R5?x@>6wP=7_d?D2>pX$iMl_y?xGJ_lc z`5BUCQG*hjKDp;!9=7}uE5Z?r#Sb8R^w}v<Vtqe=I&hxkr1FuBVEX`#O34S?$CPM; z>`RottzDISq@<D@AADHZn&qO76c9@~ZOY?1SkdxH#;R-utqr{h)bf6t^bbhH`k43O zZy@Et{})Kg<`keqm+kua7hy%e=_uV#RAqga^U25Kji&~B<}HHuH2Oul_mDBs-w0zj zVMR*P)Qb0%_x1$_1cn8MAU4T|^6f%%DV2nZWK*{MPe1JU@M)pEyv%&w0N#EB4Euv6 z3zi(-WAKjVb^Xe{xLO<F8F)uYiK2H><(tY$5@PlA`)mXBB6QX?8tR21ovVT%9+k#P zPV)O32e}ZAqt}rW^`c0-bK-_+0HnM0WkHNrmm&cLU5`OYoY$-w8RBdW<hD@!5e;em zmf|?LRp;yJjd2(zs+_t3TXvSTY72<@_3MV*1|duAaiTNN&M28!VbHHOUPIEE_j36& z2ASRbX(wSIr<hdz$N^RDahx3iA6^+{0U34%NmXnLYeDdL*@_vTAM2+G!Dg|`m3lTA zykXs(TpQZC^+J0cQdtgFN@U9gByp(uTVOHwn~}I9=M-!?M_C_!_z|kg1ggysZDGcp zyk}o!!D=$m<s>R}-0O6KM;y1JukXf$c~+mA;!sIIqTB0&Hwpv`&4;a$BdzlK$?J{- z4KIheJOb>|7lI@OJ;K!@NY{9P;AwFGBZpfUbe_QW`T-}J>gQR_vYi?Y4P*muItg4h zlq2?&pPl$@kq>6#(3*$!<&Z8#(Vv&*9#4+gTOMr6VXlEutE|R89;5eZjTcltMlr1j z;~|!yWf<cL(`}aTs{*BN6*D4i&a2>wZzxiixm63SeM2hZ8)KhQt;2%aq7jRW_FQjH zrN*DYK|QU5s04=}4B?<fcUm02zBZN}33#(S<I`|}4_Klw-mwh;BYUQ{-B4TLC-NS` zJkq=pk|T)KgWDALPmML_dX?1=-J&)=Ma>|AV!C{JFM&@Es~@MIM#egxW#$HoDH~qD zvubV?FrTYE$X2qFVvvC~)o`79(B0*?;TAPjynk+!DR=0R6UCWPFc*1Dd2Q)!fTq=R z$EC`JCO<nn^1AP<K+<FA_rT(DP#^lHML4li7LcpW&F$LuQF$=GRyQe7xkpk-q8Gq| zVv&j{C=}Fej*4+D`cyRYQ~_s>g`#4wO7c|@o=Yj<s4dD$X65ktnfdh9t<(r9m=<za zWA3<lu*tO`flqFFf$QW#$Zg2R0{=LRURhPyUAqr6CCxPc;fUYEPRVeaxxpYwtp#|t z;~P2GEU6)z<{X|>EdFLYYGcJK{f!Su99pYnzQ%Jd*^9)5Oc;HS!aM7GsjOM-z-<CK zo$iCI3NO0FY32)$<444)-{)HXrk9+v$<8(-N^T6NAL=Wi{RqU~Wd$h#3(00Hn+be0 zf<li(J~;mj7>qK^UT?cCtUg)_Oj%!%yBrqMGCmIfx)sHlcV^(Z|8aD^r1D(?XvAq1 zeD1*8Qs4)y3RVbC<&P=&sBpcF0nf~D+O8N#Vj$)?X^rPO+ckXM81XP<pZ3EGIqBr< zPzEKq{Z<~^$ZML{s$r#h^O8($PxoN(eymKW8DaIVrpR&iocF7bwO9Yil&=qs!;R91 zSWVvXj6j(ics|5K#te^DOBMRJ_<I59wdA;FG*|#;lI`OaQ=1=DxLUvVxAMk4k1LbU za5SJs@jKGc<r@z37ODA|eJ{a$O?i3Xj&oDc<v+*&jEL(@5amPF%%h1~=X#&sgzBtg zdQ^RpgrPmo&P8OT7~P~sDRx3DsPS2lAi5$ZLFZ<OIImhN_(3Xz)-aS3wB-vQ`zwzA z#Ne^$rT3OzebMLXJV}fHYnf-L%25oAoAdg})WEzrfs1+fAok!lb@r-KtfxcnIDmXP z#jfpD#~wh`Rt!&s@ERxP$ZA_53#qq?SVh^F_m?<UE#)dJa}|5pLoYPB$2)S>NNESE z_!x+XMHFpX5z=l1ks0W2&=)2#mC#*u>CNy{wBRl3;8;lhJEyvu6-)~5b!)hfipi%? zVXbggbOYoGqg@8a6uV;C$BPm7y=RE1zr{F=;!n|HphmZ>n-XKcnLJ^jRtZI&0<IV^ z4=yVYPaM}cKe8`X{^I=jeSHU-W4R)Q%$lJMrmxh@UX!wJfKSY=6(n2a%?4x&PNQz_ zS|wYLT$B)o|86ijd+_lLW+cqWZ95!9L)kiiY#3V*E44$1%M`48%jQ6i1XTFOtKR$j zo{T6)L}1L3?A??OTOLKxv@kj{2@Aw1c5K|_nh#3k<MA=N;plqwMtH887Fw`Jc)@+U zun@0pLxSUbea;4a0uUeWYi37Taiv_mOvN~df1xEs92%yNBEk8K*nGoo#!SSL*|rEi z6$L?Zmfqa{^Zt0TO|<pJkKL_JrJYrrV$kpL%ZxF{kZ^2^Mw6kvdqR|?yIYQO0_yf! zlF7C8kmemhWwUt8jBsO>w$)tE25&bk8bQ~`gT|S(TrE45H4vqK({bi4{sD@Pc9jX) zt1+8pmcq@OR&3nGqbC}Wph*NcUz<SHTRp{wpec$;M~3UiSmdhU@oNisf^p|KkrCUX z-SnVONZLxjJ>`IW62k9*<Lx|C*eFwUG<d&PNz4*@**7-Q)qO~V33exXW3<|0D;}{u z4{VFNuX9myKs0^uXVqHWa{Oet`y!e*zS`rAh(&;S={DHRTyCjVd}GmQe_}XnM*q58 z1Ddx8pEqbFef6Rt;cahj7TXujHk<=pMCfPwdXC8QA>D;EMU4wE!Vr&UWW$mdQlTql z{Tx&O^+iKo(TWDuhsva(pq--OVSx)8sW9rtj~rhPkf$QC+flRU95ii*U}e0jk5o@` zCX%;T8&y`WKPL0`dRit6w3}2O{CvB_LHz6$VzVI}+zNI%hCWI8yNZ|8mR$28vdN`T zowoX2;HE}%C4Ir^118-UkFqH*#L$uTE9uId({{zrA5PauP*&5HbWW3<*XT8MnDnT$ z0@bM=KvjD^%O!JVZTwz@Z@_##H+p5=|FrMak@ESm(KQ<MXr)q`4QNEsth_a48a4c| zGW-quA=}zb>I8?iID8U9!?x=PK)U7oqU;tuLdz~vm!1@g4)}gY8>9}IQ)l$MYhack zDCS)bOa)X9M?bK?ZW}~+FSLisfOiFHYT8x;3cQYsjD8N6Lfs2ex2mG++14RzIDvSV zNU70<Z?nDAx9Db+qXkPaH7_gL*r})eK~KS^k@C~XvPETQvNq46uv=$(5ut(6lpTJi z(abCcccqODoR-9=h!@iVy=S;dElOz#<3wZ(3kOgdn~Y26;$7;Un0#Y5-^H*|(7jU# zNCL`soIWj`qg9LSHI7dH<&p{Ehe=YeXeJgKEW(fK(@C*RtmvR(EMlm<#V|$~Sw9iF z6{eq5g1KR?wLKqcg4)Od0e(#<M$92e)%H+I8dVjdRb{<(r6vIl%C3;K1&e5ieKt;H z7)a7X!=L3uD6u{m2TIevM~tK86&I@_0O^N(Q(-~QPx-afpUlTwZ8BETV{HMZAOiPX zM8{*E3=(M*^?2s0mq{&W<RTo$l$xZ)wm*gw*jK(Ef^7E@EioZA8{sc8sirC8C)2GL zhi1}L?6oPAfFLd6zBGvJW@b}LbdR3T=oUamhTCe#fosWz#Euny-#^8t?D_r;4Olk| z)b<jjQYd-@LUh`KEs5<OKgqYR<P;9n{7;<$5l|Q%CQu9n0_X_H2zCmggP1W;M^M^^ zU6jr1Cx#|pnSSB^(liJqV$$SKZ$>P55pQRt;CSBe<AUOtS;tH|219OBCdKzb%iPK2 z)NC*_JI+-DBiq$HF@^{N3Ok)CK*ziez0>|wF<y*JYld@iB?stIO=OYPuKpS;4k?pe zhkG5ZkCh4#>!-D!nXtuqk!-@6Jj&Qnoa;53%k9s9(VqJjwLLdHdNiyIc$94N52UsB zl<;FSMsn<~v^r{H2A8E`8a%AhF>(5;6OX5{e@9l*7Ob$+!e*`ZJjyj408MU}bXr~S zE4VKYI9`nk+s~~A@k)<;s>J_66JL_kPS&ciIFa~Zf3<N*HTA`iW5?wF<7T-zoNB|x z!6B8H((B|s(?&`1hFJ#Ur?`q1+yv^7r#q^nHOsNN@pS!0j$54>Qaq5{BQSJ?tJ}}z zGH7W(Z})*$Dmjv2z%&Wj9Rxh*n!@EHU&UK?sCH#=H05oqH*c^b&JP)NSX%yY5`Qf# zKb>-Z)8N=&l^W<Yj)p>lM)*F@cyQ*-Zqx^%rCg;x8vJ#b{HNf-qbFU3ROR~+{J@V| z%HCmAml2%PMxBinXG(G6c%CxIxN&H%A!x$bm3R?%eg|4?+WKoEd!Xv1s7ls05wTa? zF8r%!+RRI1S96^%6T(ax2J2}U;2CC5Y|W|^^gvjxcR_}7UlgN7E9umiUQX-p;aptG z7_U;f+T1>T7`ceyR#87@zoRc<5w~NNtyo0r^`63z7N?@l*=G|fT%)0VYt<@xogKT) zh@}6OVF0^}dtSiAiV130o&YkwpLtQ+QlKL=;tdtr?&VM1HmBm2Or*8FG!bnW3PNOH z#rP5PK17O0X0-)<xBRGjx93o)&S=h-B>}}M%XnGu#y0#n;)%8JSDdvG2m#A?6ZVmE zu_zpD4m>UP#`;t8hKNOT;r&AK--Y1JEZ!xJsmOAKy}%ynJ1T={3)b_XT>U<+6t7tu zF)E#T%8BvqYPhfwk4m2tdBc63ym~mi-_}ykJim?)ad|M{^~I)bEJG5)7C~}rS?^X- zXaEd+f?BIrZ;-dkQ%|R6$E546R)@njVT)6n*WoT}U(B^)u1z)R2&J|R-3eL8(@-h3 zp?X-S?9-_buRsJ@ClE23qTKvm4t7&oErrb}RB#ls7hVuPhxB1Mal1y+a73cuZL{?# z8=`wqnF4YPJU07Xs<NRs>5}JE&etvJ?W7MEXHIODxx;=kMEb^&kyws@TXnn0%Fq$q z_{Gsi)Y4~+^6+^B^sG1?Pftd2+j?(2cJ>>Gbta+K!t)hWWFCDK=qp1RA|Au8SVWZ6 z7gdm8c@X4W^bvjtjRqy_7ACatT$M}>BfCh}4~Mb8f>8_wWmHy{KwO-LkM)={ZmHCj z<8kicD40E09e)-qB&wX*Lj7Dmq_MYucSgPbE}?XK6zN<=-Re;AJ!7;{@%WMBpxTmp zvf#5MNBKGkR9J6yla?Q#3^;X1-8dm7={Wp!dmE3Xc_77bDwW|T!Im-*3|>gaI1TI5 z8VkZmfn%w+KOPjtOk&j(4r@({T}CMw<LsqIsTc!PNxQ0BE>(um>3I^0wF=uwofI?6 z-}fB2RnxRsY-@M~T&ljEqY4Jf_@z9kl1LgolR;utehiCHYBiyuE*8%9Ja`N<=nS)I zgJ5(TXEhj_Ej_NXYFMh5G+K^H)f+k$>a3+*Fui4$d?%}-`B1cWHU5*E|BD=<i!nhn z_hlu9r&2r9HL&~%`P3X?$8@1FMFdd)U6iWUiLHwW&%{<dM=U5LAWYo3GMeTFIuZ2- z00KIvH(GRIsnf!j3rH}s19$`%^=ks@%){C*M19TmA8XJ}hpQG)+Eb<_MSfteSfVd@ znu#@9KhUym8|R@deqdGJhvjlb;aC*rEjMZG4sz$NXbI5nC$HSu3^|1^P4)N^XdNBV zi7WVPik8#Jmax8o%=y5V|6n%e_lq;*2<W?)kdg7DujXDn5%#3%rWJsHuGbd88I+ue z%~C*P&Agorsl9-<6A``)8L%?2Nm@C$at{e(K)ObaB({038OSzyJC6XAnFy0G@?C+k zj43Q80KWgV0L#vLH!lt3gL{?iglIq<gK8F}HuCLY4>y*9w$s!;{1gZDo<;;DfjT|9 zK>aus6on&j!4B)+{c_p@o@KsEXd=61+15`?K8*GcE)<AIhETB4Kox<0`$ftQg_PV* zWc$K8!X-X>?kZQ+$fDTsVtGAAv#@Wog$U7z?B7nlK5lRzRMdFg>$YZKJ$SzTNzk(< zv&01Iiy6@al8#ag*yJTzdHJ`JK^fCIiQT=_5TB|MPEAhSFezH<r%09D0qW1;66u7b z9BIY%kt=@0!S_P0Rci5wfKeB#ETA{Sk%gX<=RLMnC%Fu*B($N4()D6D5fHX9lNm!P z5-^UB&XFd7p^V4QY*}wQ^JV4-2Ku!K>Cou!q_J<0ov=7EVr<Nb%iQjSARuZu1Uw+0 zJvI_Pn}H}Br#UY+lh7RBcYQ(UT(w@a(7%3x@VWZABXkWH&HPF(f15tBUHD4~^mCCe z3gFvLj48j*bx%aBmG=_u9#^>0G95u5GL$#QZD345)KT#bSvZ6J6kp6830Jm5Nf8bs zku0`<CzG^0;PkcKe3qjH)WJo25KiX{#pKbH*{MeJ(Y?L?EIXGfreAHc-mky^fZ#?O zOIpy=>Lhg3LMcc>7;$I|2hat@9U#FSkUuM5#tO?_8U1eERTgf&hjRM61#EsZJ^`M= zo#r<|dQue=2&77c`z@?reGtf$5Wr9mU}$p<k0mZ`9uN23JIhx}P^9=idIqjKzI3Jr zW%T=Gs0W=1LN7`6`I^fHwVO@2075&|tGW7#00+CU&RN0v0W-;5$9xgut@gzjKLy7u zyr=HgK^6?@vpU+Q=lUb$FANi&t6|fG%wbr1Q6u2{3BK&Q`Jki*>z@-+R3A51^kk%F zsVo%iT_x^pU9}&NK{%UVyLXGEf<+%h#Iv?&IYzG<oz{+!aM|BdnZY$A`UXjWx$G#| zsUJKbaR%`17sGIz7F0g~g;w1m;qdi!L8{Tg;i;%=4$TLal&0+H57bo!9y_7$m!>O# zSBZN|dV32gBc9}#gq%CvAs<G?=YsD?uD3PsK3r3frhzM!KnMH>lc$H1>K$2|vu#15 zR~{MHQz;@>6+Nb~@xji^s=H^~WRT+<P~#hg39$$&^HIK}mhJ#iQdDn&6Y1pLiBw`4 z*PyBlTau6pEdk)#q?G*cKE|*<5`IgCodu^yWqAd=6YAL7&C_wpobHk;mlVA4zF2;Z zad_G<JEWP`AgW|lLcn*wWk{tmXmxx_82#;i4K-}iJV>VcUO!70@w=iQi}?5@`=q}c z@=Mtr1byv!79B3+jXMvx`UE;(2!Ij(54sFU!fw8&hWM*27lLRn8r=r|m$(F(WmXIO zFkM3UtO~J^>;lo>GC27kWyl%u3ro=&i*obfP+^_TK&gu%MtKN^L%vQJyk^;aX1)}P z+-T>@x4B&`s}6b@kfttGsIk#<)RS`4!+ucvaHyD6h`|k@UY(W0R{NC0%a~>%UIjuP zA_L=eu5;0^iXA3FP;(Uuny&<s(-0U9ZAGIp+q6F+aEf<sBFFAsoSWP=9`}p|b_#t+ z+s9m5K#@-^jkVB*NA!H09}c94d}EQRU4Q5o>!hicFT2^0H4mIWT$m>CdG`LYmg`e< z0_NqE5Th>hQ;a%pQ{bt@eC)D06l+1<>z3~i+Iap~uFrEa9WoF5ZL_x+@{JP!355mm ze?*yGmmBeeH)g=(TS^4*hamvQ_ohVr!<_jSg99w-%}x48`a7=x?N7b`Eo0ymZ_>Zm z0`1-ekcQwTZ}PuH0UrV=9$2uJ5B*>At2Y5u5FD7$hxq-UF2{H?7*G@-AlTI)Al|h5 zTY&_CvwbK)e=7Yw*Zj|MRkR@>K0CUYu~;}dx|zGMF@LeQ`_I|^J<Ive)+xIGZf#|5 zZ1(@RCe{M>T>nIP+bPd_JJA289|VM#K6uxM)aZ|fe@`f3{G(Ej!N13FaJM%xcd>S` z{Qq?Pd(Pya?R$;Eo1pjqven=B>@oi_h>$5b#uS_3KWF}T%>Su60Bqz-33u-Kr<eZ$ DmZhdK delta 9966 zcmZWv1yEee(#GB0-Q5YWxLa^voS?xS78VQc3qgXrLvT-UcMT9AxO<Rbe{%1uy7&F> zR85`ksp+0M-P1F3roZ54=;&Y=40UB#I6NpMBqS)$s3G0Y8064!e+URCG&T5x=Gfal zF09UL{G{`!>pXY^MHZ%`C?y5F;8tRrPb3yY_1{aL{j-V`QMIM6%)PAv9mk%+t1+Xi z!2+EhiK9cXe5nkKT@0)b-Zfn~C)u#2!dKfP6AK4PHaxMsi>@>5gVf;Lj`jFVDv<PQ zhYKvSgnTw9#hQnEOHJNZ)078ZEN<_QuIDs_iSKiXhSxV#S9WzcsGPwjXGaw<tf;OL z4h=CclL%@=ke3WoGek8^k0BJ^Q(<luWol(2AJ*s+1mOv&;_@jndOpkFJ3id6#T~hS z6T^p1DIJnSnv-D1%i*O8XbbjL-NUSeAKm79`!t>XNhc*yQ6YIpbl?m4tR*}Ec-;9; zEh+|;OU3=&cMSh4#LcVdQMY3X0OH})x$p>5Q)N}zXXTa~{)nxYO#p|PwER}&v&d{C zDKnjhOwE)$30nIoiC5>dzb_!Fqn>v9*0Gr~_v?G{`SjLhHzP?*%pbXw8DLm-WkjU= zxhEDoXeg-fFi=o`+=B9tUm&Y6G~h9(-rvr+V=XAt+Y0NCk{m3vU(jMrR0t+@%l=TL z^nT0>`zZijV=n7>ZgSGkn$pAfaAgy1P(X>JmoB;wsz_ajRxReD5R{$BRTn=N-J;Y> z(;0%Eb`o3@H){rj6}Ui|<>*}z5|tm0CJ}a`Ra2fKOFeA8p3X`XrXYpp1S^5OsmL=2 zUE?>mBy`nPZ>WfFqpuqtYi*1BtHnFmYgdlB4W&wr&Vn><2tSTqHoq4(n*&hi5OW30 zwmZUk2Qr^jKk(JHcjVEG7SLphb-RCFIl=T#ro3V!(jj{yGNmG8DY4763bG+mAS2Xa ziHGl@8F5u|iS?yXkc1n;1IKka4X(ZrvGr)2Y;<i3$}c^^eSENf3_43GXX~RYF2g)@ zpFk&^1e-OmjWCnY%k9*-{*-h7A!{vb7&|7Ha>x5*)ml?+stIZ!uS4t`S;qWhbVr|% zRE^(8SNM<7|FJpLzaHG*G$a77|F76+NI~$1`<s%5SN=O*8Zc2+-~L?}Z7ltt7&0@U z0k1l(a-jum=pp&3y(e5%Cu)kRF^(2}kCb==i<i;dWI(7M{r%~A$6*$Oe3s#0>~;%v z#2rI1DZI9Z@|~=`1Z$&`EgvQ`^nfRWcG7gjPYW-_C{LAlRkJ8K?Xb$VbC`OnSt4{4 zRqv~C+hy^MOhT-@7~tg{J<qIxWBU7Tn_#ZBgP^ZrA15>3AR$ZxN!8cW98$&~^w>fu z+)5vGL)>~~i2^aOSoS~_&3J?H?|*LGI2gpaPH<Pm4UXsSnN^<$SNR!_gk{<mTttQ# z<sh5KYfL8cBPOfiwjF2t%RM6QrVOr?a(mQTUV=34W1V$)VEvo7_?rFajd<%71Hmdy z$v<kV?L@4fqMT&t*J@Znx!O0Eja4~!CypS*Yuo@o@}2=1D&MDSb&_u-SIRrQ)Q-OW zytDJ?$%h=uCr+#_l|g*26BS_`jb1@~wxZ$>wz3*2HG&oiy&rTZ{lpu9kzs*t^sFUM z(R{AHg(txSg(1)cDg{0)I=CIp%HYrZv5zR|A@EhfCCa)`c6~rf5JOYvsFQNIm7n2x z?9z9MAB0V)WG6N{_@lzWzHQW|<lTwqrJ7~t3(@FiGa?>D%ZoM)zAjLUJ8WvU$RlCA z!v5<x-;2-vI>ye?t4xk?lH^?!Mtg3~jo_d8gcr(5dHj1m@ge^e#HjyTTp=?ibie0A zAs1Ho`5iNsCg*LzkMuA(`UMK@@=BeSSue`3)C`g_j#i(F0v`Fpvzp`b<2co`Sw9g^ zEpNP$`oaU;0OYS3N{;e`Sgw+`Hp9D0?Gc;w-{uajjtw^xA^Kprg_yq=m$u$e5jU=7 zY?a|v7!X!2`ue^;{*-=ypx;%$J`9Xh2hB`H(4C?V*XmP*YNLA4nMW5K8>NsU(tR9H z2FLSW&`#lf8lGAvSsIfvlR4dP8nPsAa)|-VCv#lMj`zR_5Tjxg)!xr$yuBb)r{-~# z=8<O2(=SpF*5pd<?_;2zjR<t!Q#WV6^Bv6H-TTDnzzIsS>DZU(=Vwey#Z3a|u-YsL zsq?fMnMw7q5fakkeA9AeHyeBdkNkx*$@9WPknoN*ZKo30%ER5?%*wtM&P>>hKU^t0 z+1R~d)W~n)`q-46YS-RyRoptXLVYFLTk6=qcu)H+-7WoU1qhh7-`oOCw5l4=7>%R$ zR`f*;Ogb5a@AvAwD+gJ$!})-z!R4P)RZR@hC!O$0?<v=K@z(_L0bKY1K75cZ%l)wS z#pm+PB%#g8;3~TXz>C3k7Jowdrp<&U$-TjKIzr$gfRgelE|bxxWiO+TPMQkb#DW>b zz}3Rh8MUAi9Q3PcFwxMv^<|ZnR$uyZu)6}3>is3C=b#BE`o~AJ$qMjM9o?A4<FVke z;8&Hwz@GP0TL+qNE3S<1VbO~(*A#R}51lyUDcXvP&>N@2^OKw1a+OwfXqoM#*&CB8 zi>lX3XT9*{lveUF3^z#2ZHphZS8D7P6h&sGM6|o-ivF-Tzu848QsxcK*#H(tz3+uZ zaURnM-B;}N-%Dq~UiczPE3E8|w7W)1?Hg|&<v!qc8~sR;g+5dp7Amq&ox>$BluvKe zFul(ePk&=akI{&Ar;yi(6JZ$XPp4@Z6(Jn?NT+QWCI5%lHH;ei^VT<vq9yMSz+tcM z*E5WKqymP^H5QH^if7EZ@Rashy;UB`qDU4}rFC!Dmf36k5FdliCX2BC+I=VCN|y39 ziPbdhVW<xztM39}QxEI9f9p#~z|tE&)EE9}KDl0cI0ya{S%}z8>O8PeP@5coZ;$`1 z)DSZRd`Pzu9{3S2<P3LJRuD}tyTD=E$s2Z7EQp4;SvXsQ`7*@(T<lkRBYbpYTauZ^ z>m8)=@c5IsTm!k8`XmA1Q)yOkYK?X?%l+K;^9iX9HHs0+DH|RLGkAlIqvlg5M^e&q z_!>SaMgX%Ofwp&?DT<?2HA~UPt>qgNa^D~#JV9st40vCWCvtBxw0L<iA3KTSvy$J) z>_{~<DP)ZAIg`p3n|VQ<l~QiyO!PH-X1i+-Z)wo{a7Ga+*w4)4+##$UmqA&LsdZNc z1sv@jRUlLk${4Q4q=@{1?xtk<)(-9aF;oB8tX`)MJAlk~!M737!$^EK7Eo+RdvUke zLVkTC2VPRDY&}O2r%N@?PFpz635fT;dA2eYLuk!{lG_t!Jyx&cN5_8GyK+T@{Sab3 z;yuQB(yX)QV5ZuQ+rB9-krD*3qn&aC$m%S77VkIta5p(9;fh_P3I7^6q}w|iIi0t@ z;^HAyVU<V^Va|!MziRb?LS>>!IdK-M9gLu7=SUd+`sLQ?1i#C(W!Bm1lJbw+lFxyP zAAc{1;c)-swiy$A$i6uySn}_K4gSaTfnaGJS-5%4pYv`^H_$QPu#}qxuShflO>rYx znuN4<Mkm&Zr^e$;uQ6=~pkYa`K9D8wFi$(IkbGg?dHnToYl0HL*<v<gNu4n4Cf1Q5 z;HxNBuP`OLuS#7>bPQx(#24PgUO2$j)pWs{<3G`sHa9|?9R_F3XX`-NI<zoi(+D#z zNQqgL3ooN?*7Fl=l7a{<R)Scy8nTRMqZsZsH4mCxhb^Mwd}tB7=?_p~wxiskjE31D z6#<Bo%a(%Z>|OBoxSk6Wm{@4<*>b2n1s=`Yh1=1;nbeL<n_x!GIxln(2!=l-=yF<z z=Cd1Bai!OL!fTSIA)k75-&Oxgj*H;<0fwM25c`~=dcE{i68==m`L)GnONkb)rKN}R zv-SSS+NWVG*e3UnX>Gq>O7Q(Q?dAWPR>hJFoJ!PQR>AVMAmQCuNDZr{8cxflbaVd2 z9XTU*1r`=lzA}&dc^j{nlz{OVi(#;*RHZ9GDZ&*l+Kxk;JAPxIb0h$ejaL6K7!*^d z*X9cJbEZIYt%6fDu0Ut1+F4OLx-4an%s+`CkZ_9V6X|Wd$^&hM$^%Ans7l91<)<9L zpfwi_3i$+8Q;9fBdlh=3pZW~>O1DRB+Gmk2#rJR9i&Q@r)StN)bDiyR^^{p4Qdy<5 z0XAyy`RYtH3DvK|kDEiJ`3e`mXhxy$(5gty=Inoy-^!e*62M3pkn#gv%KJ!W6Y;?u z!)M9K9A5_uPr<|9=qsfZVG&FO=Z;x}mG_%Ei8hwAkX{!*;_eILx5o7Jpq8U$_33Hp z+HJ2!Idd#7BCNh{Cok9{1JyM*o;6l3DacJIeG*_zErYAw_sPDbEjfod%4+5dyYCqK z*A>24@(pH#no>~fm=48z7TbAckW)<GA;(=JM+5=d%U&)HPsG9(+tIm)6`otDMINC4 zc&W5OJ1XwCmx>YpCjf}w(Snbiw*{JC17A^kDLHT&amBC5HYV^gtSF$9Rhl!JnFt0# zl59VbE6yit1Drm;K8hCY=+Q7XvyFLxc+&ez=%Syp-G{Gf9uji9BcOfFG+nW?7c>3i zNX(NMK@^^94qrge_j^ThDJ4m2u-KpHR)We`)Xrb_DW97;JL#;F7{Kb%MJrp4ABW4T zJ1J1h{czpXQ0Rq!#WD6aA9%D5)r&WsAp05~+mW{%|2)YT#cn{V@eD&N53j8^Qlo4e zUe|HvCz1CYfvL#vsu;55uR8tFb|)UzbJ6_*a6Uyn9MberVTPhXo4pH9kuS8*j1v-m ze?%;bJ#}quI{VVkS_&q0OEMu_D$CIpvLB@2qm`aog!#!&nsC%{Jd+;haLl2%%E+AT zqi=LDF}IpH>a6%4D<-($4zTHGCL-pfeQnmJD>_)EAAtKb2LM)uES7~#JD7UWQXd9D zCBv~(m-xfkS9QS#w-dg6eTqA+HL`nMJCyvY@a0(|bZ#Xsm;+q4aQc01zwb)U@TOFd z4M|_V^c_#Nd>~$uu1f|>!u8zBqr00tEmlrohc`ia6pl|tj;JmrzchytJ{lo2`KIMs zNzxK-@>&B$0w~dO4tC4E_)EN47iB;@Nx-jfftr9=STEL;X9A>i((Abd4=S7h;_Qa6 z7E-oYkuQWqYcODx`lYHQk4+!5T;lWF8@p<qh6&;Yh3?gT1ZkOVFE%_u>52WB2FhY2 zHHRFeWUdPI^M~0(rjm_QL5#N~)B7X!Kb9IZ%ay<Z+IA}Rr%EJu6ifb%;Co>8mzC9T z-i~sXn7^j&1vV&7rPTljO75>ar!OOQ(p7WjIWLLppL)SXr_OfZjf9T%h>vT}jQKdr zm|}q+eg%InJK-sAFfv1FO$~b_Sc?q*x{yYF%5%TRyDOR6)L48g_ZaDYeKF#Z<WETt zFjKPY5YcdhhttWZnt`FU7FLko>Xa|!5YgiHSZb`zY2InO<9u9<s^BOqp-bwN(BZ!G zpdp?|$Xx+nmKj{w9j+8a7&$SUcSGU1t2=w_-{&`?*c+y39y70O(=f|^87iv{mr1WF zekn4zgH8~?qT+Jq%8h#8aIrqz+IbV#zc}aSZfrNwxWr2-axpx0aogTy?vXEMT>MaC zrcQhJ?C?W6!LHx~{n}kT+Jq@l7bQCEeB@$-n+_#doI<%+oEsbG8afk=y?$XXf;F|t z(MNgl4Ss@4(CckHGDGH5j+=|H&q}^0U&-PrmNDfdd94df4}}Hh=ZIzL6YAT#PKrQ; z0XT+f>y>*Z<hf5i7g&HJHekn1#JlPf<3dCM)a*c`FCD2{!SWQP&_c&bXY|lzQ5U<> za$-VYLi6ENSL7tY9kzJbGYu}nv*gFBW$ohqh;Pdn=RNJ;LAtYdlDCYoS7P_*6z92% z7^HFG<%*aV>c3a?sWW1L2l2z9CGOPy#^J%Q)TVdxX~It;*YbpM!TzdqcQJ4LpUvOO z?xjuvy9o_LON1X0?8bL8mX7D*%GLU=6x}w!Ah^A&DcQtDw`stnm1D*ILF<DTaQi|r zTbI8mgyO0u?S&%n(Xrr&jIHZV>X%AIW4!zZk99W0^>K~x*?p6mS*}ky0wH>0#{pjp zbC8g!%f_tebL@I!A#u9iL}=Q#*KV=PM_}sM_5(iY%w*WQ58?2xtcd*jv8B?^Y~L*S z=I4y%_r9e3zKs_O{f-j`=mz~4Zvn?6OJXTSH_7B~m;xr{nh_jwtzoPKT?JKhm~I>B z(T}V3o~7k)@sv^=aEjTCZ(&lX@7~#3t>+W9G01tykgPwrbTzE%iq33&iwQ$UJ1H=0 zW7pT~EtJd#?P%J$L0E!v`(YtTBUX}NJ9pI;80lJM7<@?E{D(`x4(Gj&Amt4F_uA^; zC2r_U&#B7}Asmer*RPrQJ$k7Ncjw$1ZHu-a+p<Q-P8t$js!Dn!s<19E)ZLs(pe0*3 z_vfRNijT<tEQ>MbU9UtAsr{d=l(Oj!K@|O>1m&gYpJFP}8PzU4SvxL~x!-{^t02nD z8B%o>t`^Y}$`hnHNMU5nFV7=Cd<!q{9bZh|8^}J#ylO1QFdk2lPUcv)7>&$o<4%Bh zomJEte6M9qzO{`qXG?8g3_p$C@70>yIcW3LP_wgoi`6zyNI*e0EqD9iFeIAOL1s<f zhfI<jg?Mg-V%npiN}Hb_f-}K5k)ksR5)+4)%k2wh?JxUpeN`v7VRD9G`6eyV;c-DO zIbcTtl0s@X`%NHL;cM|{^;d5W=$xCvP>(goyVj|7UZSxUOSFn^Y+N&oX}9vc-N5bp zH`RU>_xD9@;x(W3r)PDI+huL8#^UM`bz?Kfs*Gy$pWeNRU%gj=?pOwE_7dY6bMd?c z1{PF(O$*C%1WHsX!@8L#m-_<xI;Hna;@e<DFX8%!H}D5B=nAd&d9V548{QGNb$Fa% z*u9sakcu5QCU@U3F`<%9o1EspONwH(+LG}TtssI<)Mzq+7O}big|Oju^!vh1@tI?3 zX=!Im{z~Mj2)<+ZVZjyrBF`f2MxkEpW8>ul{{R+x*&p4^8e1xtU+fR7NBt5Sy&S&3 zoc-WMYa+T&xV=*WzndlQl92V#9d(o+nZiMn(<2y4$QXq3kg1rB@f-^}OsoYWmO)ns zbq#TW5A_rE(uK5$S_rqYi@CM{+zU2O^$aw()K{;MA?LRXh(cgYw-6)5gy1T%VWEfH zl$Km%Q;U9dS|<#(I3ic0%c4kZ!PwR=!@a@C)nE6dv`&?KPO+`kyjyZ!VdPr2L7m28 z&XyO|7J=Q8fhO$Yg;&AUO?rd#M4EkxB+<jy+=yu9)e*JaMY_oTmI~EbiJ8G;Ve@W5 zei+GzItvcg5Kl0hf+{RrSVCIPTk6*M^^?_Hsjd-I6QeDQl@R01+}u^@7_ZpdyTjwR zmMyBZV4KXjiKb7Otnq03-gd{^1I3z@v}2WVY=UZ;5q1mi_+Lav*u{jGP4ki=dzY<E z0|krC_BMPa{C2tUmJ5;DuHWe-C7f*aktAs0S1~pTzZHYAUn|Sz#xRIi<9|4+$uRZ6 z_dH^0QsBX2k`wMr4N8%;3>f2tYhx(gVYUqvo;~nsx(|SOkWL>4=HwIMlp$ZqZgr8& zOZlMFunBOFLNq!?E!|4-kkb^gNFBEacyV0#3`lIP`5+-!B1M_4XrBe=O?iG67vvF+ zeg(n(%8vru$KlFI3|RjpDzx8*!d7o9N3+*<W`Sy>gCBbG<^ExQ^fgpSaMfFUpIZEz zxsbCVhM;*_cbNL~D50xm8HM!E!+|BD3g=zCbIPXmz3%~_`QhrFdzUq~*pXUlhK&`! zlaEm&MqV3UP_@4OsUJgy+swGI9o*k*VO#TA_BUIC4FCe**uqWJ&%QU^HOr#iN*k5Z z*C}IkOh>++4m9q>KNcR0vol|T3_Y_ZdTDz~X~BUb`_a5dqoVb1N`)ohvUKzkxF;(y zu%K-gNAq&ro%q4cqA7AYaTh9*`hGwQ@}5jZvzqQerrJ<<EQ`|59flI9h<+|zr>q!T zI-}cQB5t5(KbP~WEz=}AdJf+eOcd{Vjt+>+$?=CofwZrbgIhi!CY`X=K^1aGF~J=P z^RgFIn(<nUO6&ZV37m7(Ko_DBrU`tEKPjX0wKj7h%Gv-QiIiI-#r=?B9^w?2(CVbq za_+*)H?<A(GFRG2HGcM?(>lBOj0Ha$iVQCBofHU``QEFvobQPLj#uRC8;F`iC$8-+ z!b(z|;Hwzn<>tmjes_-8T@MN7q1MlLvWwWTUN|=El1qcAHR$7Na!Uy90%Y!vJB-pT znL-1P^3_jO`vzjMg{}=;#O;2R2w1MGpN)8kSMnu}Gojd6iAg3di$TQlMwsi-$@x8C zxG7S4%1@gSwjqVcCfUgGh}XI{<P%K{b6EwzVYFaq25(HPMrj7e4~2!0XENNayaihh z2dU+XmVm2Hx|~R1V7Sa(S-5Fz<dFX*L_ZqQ%sqG7|MDwRil1o7$%F|Fy+^7_&OCK= z?!5Wo5t{1SSmpK+fS&Mr19Nig4OBmv_PLi^b!s=ITWM{v$o@^1`5SH0@%JCv2TBeI zJ{V_}8Ra?s$Z~R3^uue6Na8V{kI2W33gU|WuCQZMVgbz=@`9r-y{TIhnJVoj8*DI_ zA7g9I+Ge9fT1-n86w(V@gP7Nag<9SAK@92a(~_SGGcVIUTV5#5&`!Qr$jZnd*q)KY z^HImMu2E~7;rt>0LB2<8r=D#4?{f?nOf`4A*P&YK0wZPJN>D~M?}t2j+G)x5?I$!r zqS2ta6<Sj>l*FAyn3h7XiD_qs5AN9Eig4~d1%0FQIE8H*fMq_s($dob&+RYDd{`wU zJVvFabst`GxT;)5a5{9Fe84l|>@3SI$;I776QI7Fxpw2pAbqat!UO2|T^GwHM*%nm zp-|xD8&5aI-jtbFi*&s2nC{sgz=8>PgZ}gz-U!L}Q(1xbSgYHRG``5oH^*LHqtzOZ z3O(cGfMH?z+CaWBaZl?lyVHfbJN)C>AYg2ZizJ3AdITcELCluXE|>~JXmiCo!u0K7 z9H2_C)iJzPX?~eFh;T?fIs5~kf%f;lqE{PUX?aG=s5deqC}MhorU*+`t~WSW2G$;# zi@NdC=7ymvL~dirnUuIiA3mKQ^8O6j3j&&&LSiUK&MzPYCr<Q_9oQ}DMcYE)O$wpw zfN8=QnL7=hy+pJra8Q<cXDaARiTNvSDzy-1nWo)Gc0WDc!7U(hoqNWkBFmT=OX{v% ziiZ`DV00sQuak@}JMu<nBNDq2HMDimuF^2&SD#Ox6~il@drhHW?XR-#0c1X2KklXS zz}0r@1K@Ofr^Db@S5L$1qUY^~#ena_PQ$qvMGJv<4^tHhm~dkR_p^}`qZ(XYST=y1 zXLxaUmaY2{o@WzB#J51NI3yd8y`>>9%CSIJ73q<liy=D|ER{|e;_E3dDO9ZYMlGUP zEmW$;6zVh$BWwjLd%!oVE8h#kEQmjFtWH9ZH(R0BEu+LHg{<w*0z-mNsmBytq1NP6 zc%_9uOJ6Py-kb8uQWmDg6J5)pK`c+L`*<C+y!?bm^1LRkeqtiYiz(^*gDvHx*Z%ST zo+*uf{UagX5JXQY0uM7afc)__Rmlk8yX#q8z~)wVvih{OZD2EzvqMN3Zxj<TT0@Nw zKlN3g1%H<vrqzRGl$&C_Lxp8@WHGcwh9z2BtcX7t91$@p=3NkndRC&D(C`f*0-M=A zVVLK%xLDVC)1bJv$3l*lU`Z>FA-OVY(+>rx_E`XGOhjispD$>F*E$K?)%e5eV3ii& zD8x7Vm_;B6Bi&3Nc|6_Z0D+vVtxl<tyQz*O>vy9^?OsoO4h@)voai9AfgyaQydy34 z^|B|h_6NS2N+v;-msy4&Erq>WKHG_g+075|hz8vUIJTQOK`#s(&|kyCmlCJdnG-B; z!<3bw-dgYe+TVy%hFTlX`HFVCThGW9(A9r}Y$XRo2~vh$gr(qs|5^-HJ3b_tvvwtY zognL-GK_IEobvrYVQo<`c(79Zy3EK04*Y6}FLyjOeL91rl5uw68u7*voUo?kgaB=^ z^TE&eT8IQVMgaoPkB;$)JCU<zYdTeWS<AVf&o?IkS&X$0Ti{mwTqw~8T!l@n`UXsf zpn!A)`syvqX5prv2EAo95OkSgp=GgMfN-%PZ<0FA8n<X>fGOc=#pd7Wuv1XL``PMD z2%IrJGT|6XK@B+S^N>iKi+Z@_tn$%WZ<8;52;>G0ZRchQARJ5;IbI9RfE)9C%(30F z@ze`ji7-0pgj9`OMxS<3|KWZ``y@pcE(x{G_V$Ov!K@haHy@ziQaAW+yCeWLY|lAa zrs&)hv3-SQcK1d0KJJ!4z1?94=b$MwToI`09@U!aNT1eaYNSMBD29fL*r(B9qxt;x zS2nRSJ^L<>+F3hyn&^r{%^q!HyYr(;1)7?JL~4&v>W^IHIKFeV$RC#;)LWvofRHH? zHclznd(3Hn#XQ`R$TJPqP8p>GQ!c8^K+EWU=${h8G_9iwfRsehc>(a~jDV)h!nbrZ z!U4V5Zj>+6a!9CUTYy-4+bB7CZMq_{;RFflas>sBq0Pe1H*}nGN;KGA8ObR!J%D81 zw#_xosO7atTPZh*C1Vo{lQz#!b2k8p{e;{MPswD)D<l6%b;d*?0iSJlX>~`*H@P?N zM$QQsZfp(DeTAL;#)#m@2*zzfeBR{~Qdg)c^S!hZF=afPL?eiRo2sN1CAtedVUK~> zx)<HK#oi^x-Ec<f1MJdn?Td@@{1P1RcwW0+ko@=LTh9bYMgb`?SKLkL1?e|V$5rYU zIXL;5nsull?0zc-4IL|2b_^;Zwh1U@GVw)N0SwCHnd`4kvhd&{x{taDDr6FiVFK|~ z4#bjymSsUH1G53)D8ubv2VIaD9!1R|v<;WRksk_tE5(0dAQB1C-#NT8F{Zez2?L0h z^!e^kE4-}7jplZq3~m$^3ZW0V)wD+Nf=%g~*(N}<*t3I&BHG~$Vz0R0h}T<1{98XE zx6yy%P3+(bBoYT3Fg|3N8yZ-kxV?02s1zXU*}YYyLI3h8vgJ85?m(P6CT(!5g}HzD zhmO<qM>sJqKCXwv!l;q1D*$$QZz&0a4|WoiHc(c=Uww@->g%_KDe<J$AdSRmaol&j zt-rc@Qhcxy<dUXK-X<uGsCwpw0?K(RYxTPcl(cgA0u=MX{ENtMN${iRKbYAYB530b zNgb8L`Q})&z({Vw*s2Fdw#)Dm$IC<qB*2bde~ihK!GlCb%@1^>&@mC}jKV`dLS)eP zpx9L=J5rJBScL&dDoKnq#qYKZf`d4_AKrYV^EtB~oxHcr3C$Rr$L`gpZ_DT^Qiu&k zb|ff_$e0fWQ%df2QgNRl&Zgc3!!LReccsK2mF8ZBoeEM-78ie}#&w!dZ>y~4!o**R z_U!J`L4ROO-}=x%xR(DgNA13?*?b;m;0yQMRJhj$#Uc~VJ53+OF)}enA087n4(FU$ zm!&G5B(suUs#{28hn|PDX2Ti=%Gw(Hv^AknpOYs9MuFaZFmYQ%M%c!8mm`9UeP?Dw z;(D(p_50)^?JF_KnRfj}zo;_mUbuSOsnf4f(QrQ{=X;$vKj8&Ov9X+{Q}I0{_&c~q z8i5o3n2cY0UR}`1?S+L8okw(@DaYC$8dtD%N`6QWR&ug<tv<^!aTMO6C++t1h+$%- z=<|{-IGKWfz1zA_vX_8`x0sptqfVThyNH$c{8lB<=~s4yB9bAf%3n^8(zl**LRU&h zIQ=9nU0aLd81_E=k`wKA_-29oxt2yjN&vIvoVFuv=q!9m>tIHgoOh3Qdw2My)kd3r zhNICbyTJ*!E$UOSQ-3_K?MjW;RbaTcs|80o_#qPmRoV(1^=8FP$0>5Ez$qVpe0a+J z@;U>3yhd|>Efz@V9(WP*_KPEs%ezy)dpVLM{R3gIaxeP0);B!W@}xrM2@a=^c@n!) zojP->J)*l<9U6OTK=s!~w$4+mUXOm0Hw7)NJcn2j?OdrD4Q8GRBfQn+OAWZ+zT8v# zgWJdBh_QYOY23x^AH5%r+~T^|NFBN^kQkSQP-ectsz$v_3#TEA(T#b<DVzbmL?&A> zvy|i*)FRlE9V3nKz@~cfK}wtUBy|;c2cP?!kR5>BYNg({MDPTU8J_7@NkfBx5n(=L zkGNrhJ2i)^*$p+)Wo)UbJBj9uPSsyiV6zygQ=^rMWzMtp=hRW@hKFYJ>`$WiARitX z*0YdcK<{zg3{Q*xDoHp0sVm!e8KW>QE=QZU4nr9pQA8CE*~=4kvtFO{$d_Zv(J?m? z*5lW`AYrC+i(XQW?K_t<x2h7_R87-D7Df4bgg~AS9@m|wMAP%RvF?jl<QF_<=>wvK zW%i|<L$4$FOF!*(XwJ{v3FuKef^oNqx1qU0M(fYwe{S*n;yfd~2%(_XwxEB5bD&}H zp#GJAeD&i;{)3wO3&8^s^%pSy!~Gjtg7q&j2^7@GZ?K7#v!%M5vx_^Yxr+;jkK_CQ zuk^<vR8ZP)smtHx5B%hxM;|inPxCiQO9Dg!!vzlkg2<`<^q9m%TLS+()j;+;Aw>3% zz;CJ&8G-|1`CBO9x6m&X2stVtqz;7kcO4*r1V-5aq8~u{m!f~882)?c$%c?M5XE1O z{+*D;`LEtOfRMBRs=pfjJN@_Hn%K=CBmsYG`gbDhzcoQyKsL?sAjbh{e;N3%TuO2v gKC~x<AdrUg&o}?uG1&h#3TcR5ARWRz=uhSU0ao9l^Z)<= From 8434fafe1a82510a9eb457671960a1172037f72e Mon Sep 17 00:00:00 2001 From: Liam Stoddard <lstodd@protonmail.com> Date: Mon, 15 Jan 2024 16:04:59 -0800 Subject: [PATCH 932/954] adding application decision conditions --- .../applications/decisions/__init__.py | 2 + .../decisions/app_conditions/__init__.py | 3 + .../application_decision_conditions_init.py | 153 ++++++++++++++++++ .../application_decision_conditions_link.py | 131 +++++++++++++++ .../application_decision_conditions_update.py | 110 +++++++++++++ .../application_decision_conditions_init.sql | 11 ++ ...ication_decision_conditions_init_count.sql | 5 + .../application_decision_conditions_link.sql | 8 + ...ication_decision_conditions_link_count.sql | 6 + ...application_decision_conditions_update.sql | 9 ++ ...ation_decision_conditions_update_count.sql | 7 + .../applications/migrate_application.py | 11 ++ .../application-decision-condition.entity.ts | 9 ++ ..._condidion_id_to_app_decision_condition.ts | 23 +++ 14 files changed, 488 insertions(+) create mode 100644 bin/migrate-oats-data/applications/decisions/app_conditions/__init__.py create mode 100644 bin/migrate-oats-data/applications/decisions/app_conditions/application_decision_conditions_init.py create mode 100644 bin/migrate-oats-data/applications/decisions/app_conditions/application_decision_conditions_link.py create mode 100644 bin/migrate-oats-data/applications/decisions/app_conditions/application_decision_conditions_update.py create mode 100644 bin/migrate-oats-data/applications/decisions/sql/conditions/application_decision_conditions_init.sql create mode 100644 bin/migrate-oats-data/applications/decisions/sql/conditions/application_decision_conditions_init_count.sql create mode 100644 bin/migrate-oats-data/applications/decisions/sql/conditions/application_decision_conditions_link.sql create mode 100644 bin/migrate-oats-data/applications/decisions/sql/conditions/application_decision_conditions_link_count.sql create mode 100644 bin/migrate-oats-data/applications/decisions/sql/conditions/application_decision_conditions_update.sql create mode 100644 bin/migrate-oats-data/applications/decisions/sql/conditions/application_decision_conditions_update_count.sql create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1705361630015-add_oats_condidion_id_to_app_decision_condition.ts diff --git a/bin/migrate-oats-data/applications/decisions/__init__.py b/bin/migrate-oats-data/applications/decisions/__init__.py index ae7ad776aa..c74b8031b7 100644 --- a/bin/migrate-oats-data/applications/decisions/__init__.py +++ b/bin/migrate-oats-data/applications/decisions/__init__.py @@ -9,3 +9,5 @@ ) from .application_decision_update import update_application_decision + +from .app_conditions import init_application_conditions, link_application_conditions, update_application_conditions, clean_application_conditions, clean_application_conditions_to_components \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/decisions/app_conditions/__init__.py b/bin/migrate-oats-data/applications/decisions/app_conditions/__init__.py new file mode 100644 index 0000000000..d1028207b4 --- /dev/null +++ b/bin/migrate-oats-data/applications/decisions/app_conditions/__init__.py @@ -0,0 +1,3 @@ +from .application_decision_conditions_init import clean_application_conditions, init_application_conditions +from .application_decision_conditions_link import link_application_conditions, clean_application_conditions_to_components +from .application_decision_conditions_update import update_application_conditions \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/decisions/app_conditions/application_decision_conditions_init.py b/bin/migrate-oats-data/applications/decisions/app_conditions/application_decision_conditions_init.py new file mode 100644 index 0000000000..048c38c0e4 --- /dev/null +++ b/bin/migrate-oats-data/applications/decisions/app_conditions/application_decision_conditions_init.py @@ -0,0 +1,153 @@ +from common import ( + OATS_ETL_USER, + setup_and_get_logger, + add_timezone_and_keep_date_part, + OatsToAlcsConditionTypeMapping, + BATCH_UPLOAD_SIZE +) +from db import inject_conn_pool +from psycopg2.extras import RealDictCursor, execute_batch + +etl_name = "init_application_conditions" +logger = setup_and_get_logger(etl_name) + + +@inject_conn_pool +def init_application_conditions(conn=None, batch_size=BATCH_UPLOAD_SIZE): + """ + This function is responsible for initializing the application_conditions in ALCS. + + Args: + conn (psycopg2.extensions.connection): PostgreSQL database connection. Provided by the decorator. + batch_size (int): The number of items to process at once. Defaults to BATCH_UPLOAD_SIZE. + """ + + logger.info(f"Start {etl_name}") + with conn.cursor(cursor_factory=RealDictCursor) as cursor: + with open( + "applications/decisions/sql/conditions/application_decision_conditions_init_count.sql", + "r", + encoding="utf-8", + ) as sql_file: + count_query = sql_file.read() + cursor.execute(count_query) + count_total = dict(cursor.fetchone())["count"] + logger.info(f"Total Application Conditions data to insert: {count_total}") + + failed_inserts = 0 + successful_inserts_count = 0 + last_condition_id = 0 + + with open( + "applications/decisions/sql/conditions/application_decision_conditions_init.sql", + "r", + encoding="utf-8", + ) as sql_file: + query = sql_file.read() + while True: + cursor.execute( + f"""{query} + WHERE oc.condition_id > {last_condition_id} ORDER BY oc.condition_id;""" + ) + + rows = cursor.fetchmany(batch_size) + + if not rows: + break + try: + conditions_to_be_inserted_count = len(rows) + + _insert_application_conditions(conn, batch_size, cursor, rows) + + successful_inserts_count = ( + successful_inserts_count + conditions_to_be_inserted_count + ) + last_condition_id = dict(rows[-1])["condition_id"] + + logger.debug( + f"retrieved/inserted items count: {conditions_to_be_inserted_count}; total successfully inserted conditions so far {successful_inserts_count}; last inserted condition: {last_condition_id}" + ) + except Exception as err: + logger.exception(err) + conn.rollback() + failed_inserts = count_total - successful_inserts_count + last_condition_id = last_condition_id + 1 + + logger.info( + f"Finished {etl_name}: total amount of successful inserts {successful_inserts_count}, total failed inserts {failed_inserts}" + ) + + +def _insert_application_conditions(conn, batch_size, cursor, rows): + query = _get_insert_query() + parsed_data_list = _prepare_oats_conditions_data(rows) + + if len(parsed_data_list) > 0: + execute_batch(cursor, query, parsed_data_list, page_size=batch_size) + + conn.commit() + + +def _get_insert_query(): + query = f""" + INSERT INTO alcs.application_decision_condition ( + administrative_fee, + approval_dependant, + audit_created_by, + completion_date, + decision_uuid, + "description", + type_code, + oats_condition_id + ) + VALUES ( + %(administrative_fee)s, + %(approval_dependant)s, + %(audit_created_by)s, + %(completion_date)s, + %(decision_uuid)s, + %(description)s, + %(type_code)s, + %(oats_condition_id)s + ) + ON CONFLICT DO NOTHING; + """ + return query + + +def _prepare_oats_conditions_data(row_data_list): + data_list = [] + for row in row_data_list: + mapped_row = { + "administrative_fee": row.get("admin_fee"), + "approval_dependant": row.get("approval_dependant_ind"), + "audit_created_by": OATS_ETL_USER, + "completion_date": add_timezone_and_keep_date_part( + row.get("completion_date") + ), + "decision_uuid": row.get("decision_uuid"), + "description": row.get("description"), + "type_code": _map_condition_type_code(row), + "oats_condition_id": row.get("condition_id"), + } + data_list.append(mapped_row) + + return data_list + + +def _map_condition_type_code(row): + type_code = row.get("condition_code") + if type_code is not None: + return OatsToAlcsConditionTypeMapping[type_code].value + + +@inject_conn_pool +def clean_application_conditions(conn=None): + logger.info("Start application_decision_condition cleaning") + with conn.cursor() as cursor: + cursor.execute( + f"DELETE FROM alcs.application_decision_condition WHERE audit_created_by = '{OATS_ETL_USER}' AND audit_updated_by is NULL " + ) + logger.info(f"Deleted items count = {cursor.rowcount}") + + conn.commit() diff --git a/bin/migrate-oats-data/applications/decisions/app_conditions/application_decision_conditions_link.py b/bin/migrate-oats-data/applications/decisions/app_conditions/application_decision_conditions_link.py new file mode 100644 index 0000000000..303fee9d6b --- /dev/null +++ b/bin/migrate-oats-data/applications/decisions/app_conditions/application_decision_conditions_link.py @@ -0,0 +1,131 @@ +from common import ( + OATS_ETL_USER, + setup_and_get_logger, + BATCH_UPLOAD_SIZE +) +from db import inject_conn_pool +from psycopg2.extras import RealDictCursor, execute_batch + +etl_name = "link_application_conditions" +logger = setup_and_get_logger(etl_name) + + +@inject_conn_pool +def link_application_conditions(conn=None, batch_size=BATCH_UPLOAD_SIZE): + """ + This function is responsible for initializing the application_decision_condition_component in ALCS. + + Args: + conn (psycopg2.extensions.connection): PostgreSQL database connection. Provided by the decorator. + batch_size (int): The number of items to process at once. Defaults to BATCH_UPLOAD_SIZE. + """ + + logger.info(f"Start {etl_name}") + with conn.cursor(cursor_factory=RealDictCursor) as cursor: + with open( + "applications/decisions/sql/conditions/application_decision_conditions_link_count.sql", + "r", + encoding="utf-8", + ) as sql_file: + count_query = sql_file.read() + cursor.execute(count_query) + count_total = dict(cursor.fetchone())["count"] + logger.info( + f"Total Application Conditions To Components data to insert: {count_total}" + ) + + failed_inserts = 0 + successful_inserts_count = 0 + last_condition_id = 0 + + with open( + "applications/decisions/sql/conditions/application_decision_conditions_link.sql", + "r", + encoding="utf-8", + ) as sql_file: + query = sql_file.read() + while True: + cursor.execute( + f"""{query} + WHERE appdc.oats_condition_id > {last_condition_id} ORDER BY appdc.oats_condition_id;""" + ) + + rows = cursor.fetchmany(batch_size) + + if not rows: + break + try: + conditions_to_be_inserted_count = len(rows) + + _insert_application_conditions(conn, batch_size, cursor, rows) + + successful_inserts_count = ( + successful_inserts_count + conditions_to_be_inserted_count + ) + last_condition_id = dict(rows[-1])["oats_condition_id"] + + logger.debug( + f"retrieved/inserted items count: {conditions_to_be_inserted_count}; total successfully linked conditions so far {successful_inserts_count}; last inserted condition: {last_condition_id}" + ) + except Exception as err: + logger.exception(err) + conn.rollback() + failed_inserts = count_total - successful_inserts_count + last_condition_id = last_condition_id + 1 + + logger.info( + f"Finished {etl_name}: total amount of successful inserts {successful_inserts_count}, total failed inserts {failed_inserts}" + ) + + +def _insert_application_conditions(conn, batch_size, cursor, rows): + query = _get_insert_query() + parsed_data_list = _prepare_oats_conditions_data(rows) + + if len(parsed_data_list) > 0: + execute_batch(cursor, query, parsed_data_list, page_size=batch_size) + + conn.commit() + + +def _get_insert_query(): + query = f""" + INSERT INTO alcs.application_decision_condition_component ( + application_decision_condition_uuid, + application_decision_component_uuid + ) + VALUES ( + %(condition_uuid)s, + %(component_uuid)s + ) + ON CONFLICT DO NOTHING; + """ + return query + + +def _prepare_oats_conditions_data(row_data_list): + data_list = [] + for row in row_data_list: + mapped_row = { + "condition_uuid": row.get("condition_uuid"), + "component_uuid": row.get("component_uuid"), + } + data_list.append(mapped_row) + + return data_list + + +@inject_conn_pool +def clean_application_conditions_to_components(conn=None): + logger.info("Start application_decision_condition_component cleaning") + with conn.cursor() as cursor: + cursor.execute( + f""" + DELETE FROM alcs.application_decision_condition_component cc + USING alcs.application_decision_condition dc + WHERE cc.application_decision_condition_uuid = dc."uuid" AND dc.audit_created_by = '{OATS_ETL_USER}' AND dc.audit_updated_by IS NULL; + """ + ) + logger.info(f"Deleted items count = {cursor.rowcount}") + + conn.commit() diff --git a/bin/migrate-oats-data/applications/decisions/app_conditions/application_decision_conditions_update.py b/bin/migrate-oats-data/applications/decisions/app_conditions/application_decision_conditions_update.py new file mode 100644 index 0000000000..7441ec3d38 --- /dev/null +++ b/bin/migrate-oats-data/applications/decisions/app_conditions/application_decision_conditions_update.py @@ -0,0 +1,110 @@ +from common import ( + setup_and_get_logger, + BATCH_UPLOAD_SIZE +) +from db import inject_conn_pool +from psycopg2.extras import RealDictCursor, execute_batch + +etl_name = "update_application_conditions" +logger = setup_and_get_logger(etl_name) + + +@inject_conn_pool +def update_application_conditions(conn=None, batch_size=BATCH_UPLOAD_SIZE): + """ + This function is responsible for updating existing the application_decision_condition in ALCS. + + Args: + conn (psycopg2.extensions.connection): PostgreSQL database connection. Provided by the decorator. + batch_size (int): The number of items to process at once. Defaults to BATCH_UPLOAD_SIZE. + """ + + logger.info(f"Start {etl_name}") + with conn.cursor(cursor_factory=RealDictCursor) as cursor: + with open( + "applications/decisions/sql/conditions/application_decision_conditions_update_count.sql", + "r", + encoding="utf-8", + ) as sql_file: + count_query = sql_file.read() + cursor.execute(count_query) + count_total = dict(cursor.fetchone())["count"] + logger.info(f"Total Application Conditions data to updated: {count_total}") + + failed_updates = 0 + successful_updates_count = 0 + last_condition_id = 0 + + with open( + "applications/decisions/sql/conditions/application_decision_conditions_update.sql", + "r", + encoding="utf-8", + ) as sql_file: + query = sql_file.read() + while True: + cursor.execute( + f"""{query} + WHERE oc.condition_id > {last_condition_id} ORDER BY oc.condition_id;""" + ) + + rows = cursor.fetchmany(batch_size) + + if not rows: + break + try: + conditions_to_be_updated_count = len(rows) + + _update_application_conditions(conn, batch_size, cursor, rows) + + successful_updates_count = ( + successful_updates_count + conditions_to_be_updated_count + ) + last_condition_id = dict(rows[-1])["condition_id"] + + logger.debug( + f"retrieved/updated items count: {conditions_to_be_updated_count}; total successfully update conditions so far {successful_updates_count}; last updated condition: {last_condition_id}" + ) + except Exception as err: + logger.exception(err) + conn.rollback() + failed_updates = count_total - successful_updates_count + last_condition_id = last_condition_id + 1 + + logger.info( + f"Finished {etl_name}: total amount of successful updates {successful_updates_count}, total failed updates {failed_updates}" + ) + + +def _update_application_conditions(conn, batch_size, cursor, rows): + data = _prepare_oats_alr_applications_data(rows) + + if len(data) > 0: + execute_batch( + cursor, + _get_update_query(), + data, + page_size=batch_size, + ) + + conn.commit() + + +def _get_update_query(): + query = f""" + UPDATE alcs.application_decision_condition + SET security_amount = %(security_amt)s + WHERE alcs.application_decision_condition."uuid" = %(condition_uuid)s; + """ + return query + + +def _prepare_oats_alr_applications_data(row_data_list): + data_list = [] + for row in row_data_list: + mapped_row = { + "security_amt": row.get("security_amt"), + "condition_uuid": row.get("condition_uuid"), + } + data_list.append(mapped_row) + + return data_list diff --git a/bin/migrate-oats-data/applications/decisions/sql/conditions/application_decision_conditions_init.sql b/bin/migrate-oats-data/applications/decisions/sql/conditions/application_decision_conditions_init.sql new file mode 100644 index 0000000000..3114226ce0 --- /dev/null +++ b/bin/migrate-oats-data/applications/decisions/sql/conditions/application_decision_conditions_init.sql @@ -0,0 +1,11 @@ +SELECT + oc.condition_id, + admin_fee, + approval_dependant_ind, + completion_date, + appdc.application_decision_uuid AS decision_uuid, + "description", + condition_code +FROM + oats.oats_conditions oc + JOIN alcs.application_decision_component appdc ON appdc.oats_alr_appl_component_id = oc.alr_appl_component_id -- ensure to select only conditions for imported OATS components \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/decisions/sql/conditions/application_decision_conditions_init_count.sql b/bin/migrate-oats-data/applications/decisions/sql/conditions/application_decision_conditions_init_count.sql new file mode 100644 index 0000000000..024f9742f5 --- /dev/null +++ b/bin/migrate-oats-data/applications/decisions/sql/conditions/application_decision_conditions_init_count.sql @@ -0,0 +1,5 @@ +SELECT + count(*) +FROM + oats.oats_conditions oc + JOIN alcs.application_decision_component appdc ON appdc.oats_alr_appl_component_id = oc.alr_appl_component_id -- ensure to select only conditions for imported OATS components \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/decisions/sql/conditions/application_decision_conditions_link.sql b/bin/migrate-oats-data/applications/decisions/sql/conditions/application_decision_conditions_link.sql new file mode 100644 index 0000000000..089d23f51d --- /dev/null +++ b/bin/migrate-oats-data/applications/decisions/sql/conditions/application_decision_conditions_link.sql @@ -0,0 +1,8 @@ +SELECT + appdc."uuid" AS condition_uuid, + appdc2."uuid" AS component_uuid, + appdc.oats_condition_id +FROM + alcs.application_decision_condition appdc + JOIN oats.oats_conditions oc ON oc.condition_id = appdc.oats_condition_id + JOIN alcs.application_decision_component appdc2 ON appdc2.oats_alr_appl_component_id = oc.alr_appl_component_id \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/decisions/sql/conditions/application_decision_conditions_link_count.sql b/bin/migrate-oats-data/applications/decisions/sql/conditions/application_decision_conditions_link_count.sql new file mode 100644 index 0000000000..f5d9864afd --- /dev/null +++ b/bin/migrate-oats-data/applications/decisions/sql/conditions/application_decision_conditions_link_count.sql @@ -0,0 +1,6 @@ +SELECT + count(*) +FROM + alcs.application_decision_condition appdc + JOIN oats.oats_conditions oc ON oc.condition_id = appdc.oats_condition_id + JOIN alcs.application_decision_component appdc2 ON appdc2.oats_alr_appl_component_id = oc.alr_appl_component_id \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/decisions/sql/conditions/application_decision_conditions_update.sql b/bin/migrate-oats-data/applications/decisions/sql/conditions/application_decision_conditions_update.sql new file mode 100644 index 0000000000..650c8357b2 --- /dev/null +++ b/bin/migrate-oats-data/applications/decisions/sql/conditions/application_decision_conditions_update.sql @@ -0,0 +1,9 @@ +SELECT + appdc."uuid" AS condition_uuid, + oaad.security_amt, + oc.condition_id +FROM + oats.oats_conditions oc + JOIN alcs.application_decision_condition appdc ON appdc.oats_condition_id = oc.condition_id -- only retrieve conditions that were imported into ALCS + JOIN oats.oats_alr_appl_components oaac ON oaac.alr_appl_component_id = oc.alr_appl_component_id + JOIN oats.oats_alr_appl_decisions oaad ON oaad.alr_appl_decision_id = oaac.alr_appl_decision_id \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/decisions/sql/conditions/application_decision_conditions_update_count.sql b/bin/migrate-oats-data/applications/decisions/sql/conditions/application_decision_conditions_update_count.sql new file mode 100644 index 0000000000..fde72516a5 --- /dev/null +++ b/bin/migrate-oats-data/applications/decisions/sql/conditions/application_decision_conditions_update_count.sql @@ -0,0 +1,7 @@ +SELECT + count(*) +FROM + oats.oats_conditions oc + JOIN alcs.application_decision_condition appdc ON appdc.oats_condition_id = oc.condition_id -- only retrieve conditions that were imported into ALCS + JOIN oats.oats_alr_appl_components oaac ON oaac.alr_appl_component_id = oc.alr_appl_component_id + JOIN oats.oats_alr_appl_decisions oaad ON oaad.alr_appl_decision_id = oaac.alr_appl_decision_id \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/migrate_application.py b/bin/migrate-oats-data/applications/migrate_application.py index 95f202c982..69fa2aae76 100644 --- a/bin/migrate-oats-data/applications/migrate_application.py +++ b/bin/migrate-oats-data/applications/migrate_application.py @@ -29,6 +29,11 @@ init_application_decision_components, update_application_decision_component_soil_details, update_application_decision, + init_application_conditions, + link_application_conditions, + update_application_conditions, + clean_application_conditions, + clean_application_conditions_to_components ) from .decisions.app_modifications import ( update_application_modifications, @@ -81,10 +86,16 @@ def process_application_decisions(batch_size): update_application_reconsiderations(batch_size) init_application_decision_components(batch_size) update_application_decision_component_soil_details(batch_size) + init_application_conditions(batch_size) + update_application_conditions(batch_size) + link_application_conditions(batch_size) + def clean_application_decisions_etl(): # modifications do not have clean since all of them were created in ALCS and ETL is not introducing new records. + clean_application_conditions_to_components() + clean_application_conditions() clean_application_decision_components() unlink_application_reconsiderations() clean_application_reconsiderations() diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-condition/application-decision-condition.entity.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-condition/application-decision-condition.entity.ts index ed50de5884..cbf673462f 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-condition/application-decision-condition.entity.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-condition/application-decision-condition.entity.ts @@ -92,6 +92,15 @@ export class ApplicationDecisionCondition extends Base { }) components: ApplicationDecisionComponent[] | null; + @Column({ + select: false, + nullable: true, + type: 'int8', + comment: + 'This column is NOT related to any functionality in ALCS. It is only used for ETL and backtracking of imported data from OATS. It links oats.oats_conditions to alcs.application_decision_condition.', + }) + oatsConditionId: number; + @OneToMany( () => ApplicationDecisionConditionComponentPlanNumber, (c) => c.condition, diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1705361630015-add_oats_condidion_id_to_app_decision_condition.ts b/services/apps/alcs/src/providers/typeorm/migrations/1705361630015-add_oats_condidion_id_to_app_decision_condition.ts new file mode 100644 index 0000000000..f95bccd164 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1705361630015-add_oats_condidion_id_to_app_decision_condition.ts @@ -0,0 +1,23 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class AddOatsCondidionIdToAppDecisionCondition1705361630015 + implements MigrationInterface +{ + public async up(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `ALTER TABLE "alcs"."application_decision_condition" ADD "oats_condition_id" bigint`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."application_decision_condition"."oats_condition_id" IS 'This column is NOT related to any functionality in ALCS. It is only used for ETL and backtracking of imported data from OATS. It links oats.oats_conditions to alcs.application_decision_condition.'`, + ); + } + + public async down(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."application_decision_condition"."oats_condition_id" IS 'This column is NOT related to any functionality in ALCS. It is only used for ETL and backtracking of imported data from OATS. It links oats.oats_conditions to alcs.application_decision_condition.'`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_decision_condition" DROP COLUMN "oats_condition_id"`, + ); + } +} From 7a336dcadeaa3624117975c8af1a815b2402edf0 Mon Sep 17 00:00:00 2001 From: Liam Stoddard <lstodd@protonmail.com> Date: Mon, 15 Jan 2024 16:24:18 -0800 Subject: [PATCH 933/954] Revert "adding application decision conditions" This reverts commit a4efd362323cc8b0fd2496c82197ac04832c11da. --- .../applications/decisions/__init__.py | 2 - .../decisions/app_conditions/__init__.py | 3 - .../application_decision_conditions_init.py | 153 ------------------ .../application_decision_conditions_link.py | 131 --------------- .../application_decision_conditions_update.py | 110 ------------- .../application_decision_conditions_init.sql | 11 -- ...ication_decision_conditions_init_count.sql | 5 - .../application_decision_conditions_link.sql | 8 - ...ication_decision_conditions_link_count.sql | 6 - ...application_decision_conditions_update.sql | 9 -- ...ation_decision_conditions_update_count.sql | 7 - .../applications/migrate_application.py | 11 -- .../application-decision-condition.entity.ts | 9 -- ..._condidion_id_to_app_decision_condition.ts | 23 --- 14 files changed, 488 deletions(-) delete mode 100644 bin/migrate-oats-data/applications/decisions/app_conditions/__init__.py delete mode 100644 bin/migrate-oats-data/applications/decisions/app_conditions/application_decision_conditions_init.py delete mode 100644 bin/migrate-oats-data/applications/decisions/app_conditions/application_decision_conditions_link.py delete mode 100644 bin/migrate-oats-data/applications/decisions/app_conditions/application_decision_conditions_update.py delete mode 100644 bin/migrate-oats-data/applications/decisions/sql/conditions/application_decision_conditions_init.sql delete mode 100644 bin/migrate-oats-data/applications/decisions/sql/conditions/application_decision_conditions_init_count.sql delete mode 100644 bin/migrate-oats-data/applications/decisions/sql/conditions/application_decision_conditions_link.sql delete mode 100644 bin/migrate-oats-data/applications/decisions/sql/conditions/application_decision_conditions_link_count.sql delete mode 100644 bin/migrate-oats-data/applications/decisions/sql/conditions/application_decision_conditions_update.sql delete mode 100644 bin/migrate-oats-data/applications/decisions/sql/conditions/application_decision_conditions_update_count.sql delete mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1705361630015-add_oats_condidion_id_to_app_decision_condition.ts diff --git a/bin/migrate-oats-data/applications/decisions/__init__.py b/bin/migrate-oats-data/applications/decisions/__init__.py index c74b8031b7..ae7ad776aa 100644 --- a/bin/migrate-oats-data/applications/decisions/__init__.py +++ b/bin/migrate-oats-data/applications/decisions/__init__.py @@ -9,5 +9,3 @@ ) from .application_decision_update import update_application_decision - -from .app_conditions import init_application_conditions, link_application_conditions, update_application_conditions, clean_application_conditions, clean_application_conditions_to_components \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/decisions/app_conditions/__init__.py b/bin/migrate-oats-data/applications/decisions/app_conditions/__init__.py deleted file mode 100644 index d1028207b4..0000000000 --- a/bin/migrate-oats-data/applications/decisions/app_conditions/__init__.py +++ /dev/null @@ -1,3 +0,0 @@ -from .application_decision_conditions_init import clean_application_conditions, init_application_conditions -from .application_decision_conditions_link import link_application_conditions, clean_application_conditions_to_components -from .application_decision_conditions_update import update_application_conditions \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/decisions/app_conditions/application_decision_conditions_init.py b/bin/migrate-oats-data/applications/decisions/app_conditions/application_decision_conditions_init.py deleted file mode 100644 index 048c38c0e4..0000000000 --- a/bin/migrate-oats-data/applications/decisions/app_conditions/application_decision_conditions_init.py +++ /dev/null @@ -1,153 +0,0 @@ -from common import ( - OATS_ETL_USER, - setup_and_get_logger, - add_timezone_and_keep_date_part, - OatsToAlcsConditionTypeMapping, - BATCH_UPLOAD_SIZE -) -from db import inject_conn_pool -from psycopg2.extras import RealDictCursor, execute_batch - -etl_name = "init_application_conditions" -logger = setup_and_get_logger(etl_name) - - -@inject_conn_pool -def init_application_conditions(conn=None, batch_size=BATCH_UPLOAD_SIZE): - """ - This function is responsible for initializing the application_conditions in ALCS. - - Args: - conn (psycopg2.extensions.connection): PostgreSQL database connection. Provided by the decorator. - batch_size (int): The number of items to process at once. Defaults to BATCH_UPLOAD_SIZE. - """ - - logger.info(f"Start {etl_name}") - with conn.cursor(cursor_factory=RealDictCursor) as cursor: - with open( - "applications/decisions/sql/conditions/application_decision_conditions_init_count.sql", - "r", - encoding="utf-8", - ) as sql_file: - count_query = sql_file.read() - cursor.execute(count_query) - count_total = dict(cursor.fetchone())["count"] - logger.info(f"Total Application Conditions data to insert: {count_total}") - - failed_inserts = 0 - successful_inserts_count = 0 - last_condition_id = 0 - - with open( - "applications/decisions/sql/conditions/application_decision_conditions_init.sql", - "r", - encoding="utf-8", - ) as sql_file: - query = sql_file.read() - while True: - cursor.execute( - f"""{query} - WHERE oc.condition_id > {last_condition_id} ORDER BY oc.condition_id;""" - ) - - rows = cursor.fetchmany(batch_size) - - if not rows: - break - try: - conditions_to_be_inserted_count = len(rows) - - _insert_application_conditions(conn, batch_size, cursor, rows) - - successful_inserts_count = ( - successful_inserts_count + conditions_to_be_inserted_count - ) - last_condition_id = dict(rows[-1])["condition_id"] - - logger.debug( - f"retrieved/inserted items count: {conditions_to_be_inserted_count}; total successfully inserted conditions so far {successful_inserts_count}; last inserted condition: {last_condition_id}" - ) - except Exception as err: - logger.exception(err) - conn.rollback() - failed_inserts = count_total - successful_inserts_count - last_condition_id = last_condition_id + 1 - - logger.info( - f"Finished {etl_name}: total amount of successful inserts {successful_inserts_count}, total failed inserts {failed_inserts}" - ) - - -def _insert_application_conditions(conn, batch_size, cursor, rows): - query = _get_insert_query() - parsed_data_list = _prepare_oats_conditions_data(rows) - - if len(parsed_data_list) > 0: - execute_batch(cursor, query, parsed_data_list, page_size=batch_size) - - conn.commit() - - -def _get_insert_query(): - query = f""" - INSERT INTO alcs.application_decision_condition ( - administrative_fee, - approval_dependant, - audit_created_by, - completion_date, - decision_uuid, - "description", - type_code, - oats_condition_id - ) - VALUES ( - %(administrative_fee)s, - %(approval_dependant)s, - %(audit_created_by)s, - %(completion_date)s, - %(decision_uuid)s, - %(description)s, - %(type_code)s, - %(oats_condition_id)s - ) - ON CONFLICT DO NOTHING; - """ - return query - - -def _prepare_oats_conditions_data(row_data_list): - data_list = [] - for row in row_data_list: - mapped_row = { - "administrative_fee": row.get("admin_fee"), - "approval_dependant": row.get("approval_dependant_ind"), - "audit_created_by": OATS_ETL_USER, - "completion_date": add_timezone_and_keep_date_part( - row.get("completion_date") - ), - "decision_uuid": row.get("decision_uuid"), - "description": row.get("description"), - "type_code": _map_condition_type_code(row), - "oats_condition_id": row.get("condition_id"), - } - data_list.append(mapped_row) - - return data_list - - -def _map_condition_type_code(row): - type_code = row.get("condition_code") - if type_code is not None: - return OatsToAlcsConditionTypeMapping[type_code].value - - -@inject_conn_pool -def clean_application_conditions(conn=None): - logger.info("Start application_decision_condition cleaning") - with conn.cursor() as cursor: - cursor.execute( - f"DELETE FROM alcs.application_decision_condition WHERE audit_created_by = '{OATS_ETL_USER}' AND audit_updated_by is NULL " - ) - logger.info(f"Deleted items count = {cursor.rowcount}") - - conn.commit() diff --git a/bin/migrate-oats-data/applications/decisions/app_conditions/application_decision_conditions_link.py b/bin/migrate-oats-data/applications/decisions/app_conditions/application_decision_conditions_link.py deleted file mode 100644 index 303fee9d6b..0000000000 --- a/bin/migrate-oats-data/applications/decisions/app_conditions/application_decision_conditions_link.py +++ /dev/null @@ -1,131 +0,0 @@ -from common import ( - OATS_ETL_USER, - setup_and_get_logger, - BATCH_UPLOAD_SIZE -) -from db import inject_conn_pool -from psycopg2.extras import RealDictCursor, execute_batch - -etl_name = "link_application_conditions" -logger = setup_and_get_logger(etl_name) - - -@inject_conn_pool -def link_application_conditions(conn=None, batch_size=BATCH_UPLOAD_SIZE): - """ - This function is responsible for initializing the application_decision_condition_component in ALCS. - - Args: - conn (psycopg2.extensions.connection): PostgreSQL database connection. Provided by the decorator. - batch_size (int): The number of items to process at once. Defaults to BATCH_UPLOAD_SIZE. - """ - - logger.info(f"Start {etl_name}") - with conn.cursor(cursor_factory=RealDictCursor) as cursor: - with open( - "applications/decisions/sql/conditions/application_decision_conditions_link_count.sql", - "r", - encoding="utf-8", - ) as sql_file: - count_query = sql_file.read() - cursor.execute(count_query) - count_total = dict(cursor.fetchone())["count"] - logger.info( - f"Total Application Conditions To Components data to insert: {count_total}" - ) - - failed_inserts = 0 - successful_inserts_count = 0 - last_condition_id = 0 - - with open( - "applications/decisions/sql/conditions/application_decision_conditions_link.sql", - "r", - encoding="utf-8", - ) as sql_file: - query = sql_file.read() - while True: - cursor.execute( - f"""{query} - WHERE appdc.oats_condition_id > {last_condition_id} ORDER BY appdc.oats_condition_id;""" - ) - - rows = cursor.fetchmany(batch_size) - - if not rows: - break - try: - conditions_to_be_inserted_count = len(rows) - - _insert_application_conditions(conn, batch_size, cursor, rows) - - successful_inserts_count = ( - successful_inserts_count + conditions_to_be_inserted_count - ) - last_condition_id = dict(rows[-1])["oats_condition_id"] - - logger.debug( - f"retrieved/inserted items count: {conditions_to_be_inserted_count}; total successfully linked conditions so far {successful_inserts_count}; last inserted condition: {last_condition_id}" - ) - except Exception as err: - logger.exception(err) - conn.rollback() - failed_inserts = count_total - successful_inserts_count - last_condition_id = last_condition_id + 1 - - logger.info( - f"Finished {etl_name}: total amount of successful inserts {successful_inserts_count}, total failed inserts {failed_inserts}" - ) - - -def _insert_application_conditions(conn, batch_size, cursor, rows): - query = _get_insert_query() - parsed_data_list = _prepare_oats_conditions_data(rows) - - if len(parsed_data_list) > 0: - execute_batch(cursor, query, parsed_data_list, page_size=batch_size) - - conn.commit() - - -def _get_insert_query(): - query = f""" - INSERT INTO alcs.application_decision_condition_component ( - application_decision_condition_uuid, - application_decision_component_uuid - ) - VALUES ( - %(condition_uuid)s, - %(component_uuid)s - ) - ON CONFLICT DO NOTHING; - """ - return query - - -def _prepare_oats_conditions_data(row_data_list): - data_list = [] - for row in row_data_list: - mapped_row = { - "condition_uuid": row.get("condition_uuid"), - "component_uuid": row.get("component_uuid"), - } - data_list.append(mapped_row) - - return data_list - - -@inject_conn_pool -def clean_application_conditions_to_components(conn=None): - logger.info("Start application_decision_condition_component cleaning") - with conn.cursor() as cursor: - cursor.execute( - f""" - DELETE FROM alcs.application_decision_condition_component cc - USING alcs.application_decision_condition dc - WHERE cc.application_decision_condition_uuid = dc."uuid" AND dc.audit_created_by = '{OATS_ETL_USER}' AND dc.audit_updated_by IS NULL; - """ - ) - logger.info(f"Deleted items count = {cursor.rowcount}") - - conn.commit() diff --git a/bin/migrate-oats-data/applications/decisions/app_conditions/application_decision_conditions_update.py b/bin/migrate-oats-data/applications/decisions/app_conditions/application_decision_conditions_update.py deleted file mode 100644 index 7441ec3d38..0000000000 --- a/bin/migrate-oats-data/applications/decisions/app_conditions/application_decision_conditions_update.py +++ /dev/null @@ -1,110 +0,0 @@ -from common import ( - setup_and_get_logger, - BATCH_UPLOAD_SIZE -) -from db import inject_conn_pool -from psycopg2.extras import RealDictCursor, execute_batch - -etl_name = "update_application_conditions" -logger = setup_and_get_logger(etl_name) - - -@inject_conn_pool -def update_application_conditions(conn=None, batch_size=BATCH_UPLOAD_SIZE): - """ - This function is responsible for updating existing the application_decision_condition in ALCS. - - Args: - conn (psycopg2.extensions.connection): PostgreSQL database connection. Provided by the decorator. - batch_size (int): The number of items to process at once. Defaults to BATCH_UPLOAD_SIZE. - """ - - logger.info(f"Start {etl_name}") - with conn.cursor(cursor_factory=RealDictCursor) as cursor: - with open( - "applications/decisions/sql/conditions/application_decision_conditions_update_count.sql", - "r", - encoding="utf-8", - ) as sql_file: - count_query = sql_file.read() - cursor.execute(count_query) - count_total = dict(cursor.fetchone())["count"] - logger.info(f"Total Application Conditions data to updated: {count_total}") - - failed_updates = 0 - successful_updates_count = 0 - last_condition_id = 0 - - with open( - "applications/decisions/sql/conditions/application_decision_conditions_update.sql", - "r", - encoding="utf-8", - ) as sql_file: - query = sql_file.read() - while True: - cursor.execute( - f"""{query} - WHERE oc.condition_id > {last_condition_id} ORDER BY oc.condition_id;""" - ) - - rows = cursor.fetchmany(batch_size) - - if not rows: - break - try: - conditions_to_be_updated_count = len(rows) - - _update_application_conditions(conn, batch_size, cursor, rows) - - successful_updates_count = ( - successful_updates_count + conditions_to_be_updated_count - ) - last_condition_id = dict(rows[-1])["condition_id"] - - logger.debug( - f"retrieved/updated items count: {conditions_to_be_updated_count}; total successfully update conditions so far {successful_updates_count}; last updated condition: {last_condition_id}" - ) - except Exception as err: - logger.exception(err) - conn.rollback() - failed_updates = count_total - successful_updates_count - last_condition_id = last_condition_id + 1 - - logger.info( - f"Finished {etl_name}: total amount of successful updates {successful_updates_count}, total failed updates {failed_updates}" - ) - - -def _update_application_conditions(conn, batch_size, cursor, rows): - data = _prepare_oats_alr_applications_data(rows) - - if len(data) > 0: - execute_batch( - cursor, - _get_update_query(), - data, - page_size=batch_size, - ) - - conn.commit() - - -def _get_update_query(): - query = f""" - UPDATE alcs.application_decision_condition - SET security_amount = %(security_amt)s - WHERE alcs.application_decision_condition."uuid" = %(condition_uuid)s; - """ - return query - - -def _prepare_oats_alr_applications_data(row_data_list): - data_list = [] - for row in row_data_list: - mapped_row = { - "security_amt": row.get("security_amt"), - "condition_uuid": row.get("condition_uuid"), - } - data_list.append(mapped_row) - - return data_list diff --git a/bin/migrate-oats-data/applications/decisions/sql/conditions/application_decision_conditions_init.sql b/bin/migrate-oats-data/applications/decisions/sql/conditions/application_decision_conditions_init.sql deleted file mode 100644 index 3114226ce0..0000000000 --- a/bin/migrate-oats-data/applications/decisions/sql/conditions/application_decision_conditions_init.sql +++ /dev/null @@ -1,11 +0,0 @@ -SELECT - oc.condition_id, - admin_fee, - approval_dependant_ind, - completion_date, - appdc.application_decision_uuid AS decision_uuid, - "description", - condition_code -FROM - oats.oats_conditions oc - JOIN alcs.application_decision_component appdc ON appdc.oats_alr_appl_component_id = oc.alr_appl_component_id -- ensure to select only conditions for imported OATS components \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/decisions/sql/conditions/application_decision_conditions_init_count.sql b/bin/migrate-oats-data/applications/decisions/sql/conditions/application_decision_conditions_init_count.sql deleted file mode 100644 index 024f9742f5..0000000000 --- a/bin/migrate-oats-data/applications/decisions/sql/conditions/application_decision_conditions_init_count.sql +++ /dev/null @@ -1,5 +0,0 @@ -SELECT - count(*) -FROM - oats.oats_conditions oc - JOIN alcs.application_decision_component appdc ON appdc.oats_alr_appl_component_id = oc.alr_appl_component_id -- ensure to select only conditions for imported OATS components \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/decisions/sql/conditions/application_decision_conditions_link.sql b/bin/migrate-oats-data/applications/decisions/sql/conditions/application_decision_conditions_link.sql deleted file mode 100644 index 089d23f51d..0000000000 --- a/bin/migrate-oats-data/applications/decisions/sql/conditions/application_decision_conditions_link.sql +++ /dev/null @@ -1,8 +0,0 @@ -SELECT - appdc."uuid" AS condition_uuid, - appdc2."uuid" AS component_uuid, - appdc.oats_condition_id -FROM - alcs.application_decision_condition appdc - JOIN oats.oats_conditions oc ON oc.condition_id = appdc.oats_condition_id - JOIN alcs.application_decision_component appdc2 ON appdc2.oats_alr_appl_component_id = oc.alr_appl_component_id \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/decisions/sql/conditions/application_decision_conditions_link_count.sql b/bin/migrate-oats-data/applications/decisions/sql/conditions/application_decision_conditions_link_count.sql deleted file mode 100644 index f5d9864afd..0000000000 --- a/bin/migrate-oats-data/applications/decisions/sql/conditions/application_decision_conditions_link_count.sql +++ /dev/null @@ -1,6 +0,0 @@ -SELECT - count(*) -FROM - alcs.application_decision_condition appdc - JOIN oats.oats_conditions oc ON oc.condition_id = appdc.oats_condition_id - JOIN alcs.application_decision_component appdc2 ON appdc2.oats_alr_appl_component_id = oc.alr_appl_component_id \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/decisions/sql/conditions/application_decision_conditions_update.sql b/bin/migrate-oats-data/applications/decisions/sql/conditions/application_decision_conditions_update.sql deleted file mode 100644 index 650c8357b2..0000000000 --- a/bin/migrate-oats-data/applications/decisions/sql/conditions/application_decision_conditions_update.sql +++ /dev/null @@ -1,9 +0,0 @@ -SELECT - appdc."uuid" AS condition_uuid, - oaad.security_amt, - oc.condition_id -FROM - oats.oats_conditions oc - JOIN alcs.application_decision_condition appdc ON appdc.oats_condition_id = oc.condition_id -- only retrieve conditions that were imported into ALCS - JOIN oats.oats_alr_appl_components oaac ON oaac.alr_appl_component_id = oc.alr_appl_component_id - JOIN oats.oats_alr_appl_decisions oaad ON oaad.alr_appl_decision_id = oaac.alr_appl_decision_id \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/decisions/sql/conditions/application_decision_conditions_update_count.sql b/bin/migrate-oats-data/applications/decisions/sql/conditions/application_decision_conditions_update_count.sql deleted file mode 100644 index fde72516a5..0000000000 --- a/bin/migrate-oats-data/applications/decisions/sql/conditions/application_decision_conditions_update_count.sql +++ /dev/null @@ -1,7 +0,0 @@ -SELECT - count(*) -FROM - oats.oats_conditions oc - JOIN alcs.application_decision_condition appdc ON appdc.oats_condition_id = oc.condition_id -- only retrieve conditions that were imported into ALCS - JOIN oats.oats_alr_appl_components oaac ON oaac.alr_appl_component_id = oc.alr_appl_component_id - JOIN oats.oats_alr_appl_decisions oaad ON oaad.alr_appl_decision_id = oaac.alr_appl_decision_id \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/migrate_application.py b/bin/migrate-oats-data/applications/migrate_application.py index 69fa2aae76..95f202c982 100644 --- a/bin/migrate-oats-data/applications/migrate_application.py +++ b/bin/migrate-oats-data/applications/migrate_application.py @@ -29,11 +29,6 @@ init_application_decision_components, update_application_decision_component_soil_details, update_application_decision, - init_application_conditions, - link_application_conditions, - update_application_conditions, - clean_application_conditions, - clean_application_conditions_to_components ) from .decisions.app_modifications import ( update_application_modifications, @@ -86,16 +81,10 @@ def process_application_decisions(batch_size): update_application_reconsiderations(batch_size) init_application_decision_components(batch_size) update_application_decision_component_soil_details(batch_size) - init_application_conditions(batch_size) - update_application_conditions(batch_size) - link_application_conditions(batch_size) - def clean_application_decisions_etl(): # modifications do not have clean since all of them were created in ALCS and ETL is not introducing new records. - clean_application_conditions_to_components() - clean_application_conditions() clean_application_decision_components() unlink_application_reconsiderations() clean_application_reconsiderations() diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-condition/application-decision-condition.entity.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-condition/application-decision-condition.entity.ts index cbf673462f..ed50de5884 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-condition/application-decision-condition.entity.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-condition/application-decision-condition.entity.ts @@ -92,15 +92,6 @@ export class ApplicationDecisionCondition extends Base { }) components: ApplicationDecisionComponent[] | null; - @Column({ - select: false, - nullable: true, - type: 'int8', - comment: - 'This column is NOT related to any functionality in ALCS. It is only used for ETL and backtracking of imported data from OATS. It links oats.oats_conditions to alcs.application_decision_condition.', - }) - oatsConditionId: number; - @OneToMany( () => ApplicationDecisionConditionComponentPlanNumber, (c) => c.condition, diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1705361630015-add_oats_condidion_id_to_app_decision_condition.ts b/services/apps/alcs/src/providers/typeorm/migrations/1705361630015-add_oats_condidion_id_to_app_decision_condition.ts deleted file mode 100644 index f95bccd164..0000000000 --- a/services/apps/alcs/src/providers/typeorm/migrations/1705361630015-add_oats_condidion_id_to_app_decision_condition.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { MigrationInterface, QueryRunner } from 'typeorm'; - -export class AddOatsCondidionIdToAppDecisionCondition1705361630015 - implements MigrationInterface -{ - public async up(queryRunner: QueryRunner): Promise<void> { - await queryRunner.query( - `ALTER TABLE "alcs"."application_decision_condition" ADD "oats_condition_id" bigint`, - ); - await queryRunner.query( - `COMMENT ON COLUMN "alcs"."application_decision_condition"."oats_condition_id" IS 'This column is NOT related to any functionality in ALCS. It is only used for ETL and backtracking of imported data from OATS. It links oats.oats_conditions to alcs.application_decision_condition.'`, - ); - } - - public async down(queryRunner: QueryRunner): Promise<void> { - await queryRunner.query( - `COMMENT ON COLUMN "alcs"."application_decision_condition"."oats_condition_id" IS 'This column is NOT related to any functionality in ALCS. It is only used for ETL and backtracking of imported data from OATS. It links oats.oats_conditions to alcs.application_decision_condition.'`, - ); - await queryRunner.query( - `ALTER TABLE "alcs"."application_decision_condition" DROP COLUMN "oats_condition_id"`, - ); - } -} From f1aa9d5284ad08ee4b7bac0fa041af594189ef54 Mon Sep 17 00:00:00 2001 From: Liam Stoddard <lstodd@protonmail.com> Date: Mon, 15 Jan 2024 16:24:43 -0800 Subject: [PATCH 934/954] Revert "Revert "adding application decision conditions"" This reverts commit 7a336dcadeaa3624117975c8af1a815b2402edf0. --- .../applications/decisions/__init__.py | 2 + .../decisions/app_conditions/__init__.py | 3 + .../application_decision_conditions_init.py | 153 ++++++++++++++++++ .../application_decision_conditions_link.py | 131 +++++++++++++++ .../application_decision_conditions_update.py | 110 +++++++++++++ .../application_decision_conditions_init.sql | 11 ++ ...ication_decision_conditions_init_count.sql | 5 + .../application_decision_conditions_link.sql | 8 + ...ication_decision_conditions_link_count.sql | 6 + ...application_decision_conditions_update.sql | 9 ++ ...ation_decision_conditions_update_count.sql | 7 + .../applications/migrate_application.py | 11 ++ .../application-decision-condition.entity.ts | 9 ++ ..._condidion_id_to_app_decision_condition.ts | 23 +++ 14 files changed, 488 insertions(+) create mode 100644 bin/migrate-oats-data/applications/decisions/app_conditions/__init__.py create mode 100644 bin/migrate-oats-data/applications/decisions/app_conditions/application_decision_conditions_init.py create mode 100644 bin/migrate-oats-data/applications/decisions/app_conditions/application_decision_conditions_link.py create mode 100644 bin/migrate-oats-data/applications/decisions/app_conditions/application_decision_conditions_update.py create mode 100644 bin/migrate-oats-data/applications/decisions/sql/conditions/application_decision_conditions_init.sql create mode 100644 bin/migrate-oats-data/applications/decisions/sql/conditions/application_decision_conditions_init_count.sql create mode 100644 bin/migrate-oats-data/applications/decisions/sql/conditions/application_decision_conditions_link.sql create mode 100644 bin/migrate-oats-data/applications/decisions/sql/conditions/application_decision_conditions_link_count.sql create mode 100644 bin/migrate-oats-data/applications/decisions/sql/conditions/application_decision_conditions_update.sql create mode 100644 bin/migrate-oats-data/applications/decisions/sql/conditions/application_decision_conditions_update_count.sql create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1705361630015-add_oats_condidion_id_to_app_decision_condition.ts diff --git a/bin/migrate-oats-data/applications/decisions/__init__.py b/bin/migrate-oats-data/applications/decisions/__init__.py index ae7ad776aa..c74b8031b7 100644 --- a/bin/migrate-oats-data/applications/decisions/__init__.py +++ b/bin/migrate-oats-data/applications/decisions/__init__.py @@ -9,3 +9,5 @@ ) from .application_decision_update import update_application_decision + +from .app_conditions import init_application_conditions, link_application_conditions, update_application_conditions, clean_application_conditions, clean_application_conditions_to_components \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/decisions/app_conditions/__init__.py b/bin/migrate-oats-data/applications/decisions/app_conditions/__init__.py new file mode 100644 index 0000000000..d1028207b4 --- /dev/null +++ b/bin/migrate-oats-data/applications/decisions/app_conditions/__init__.py @@ -0,0 +1,3 @@ +from .application_decision_conditions_init import clean_application_conditions, init_application_conditions +from .application_decision_conditions_link import link_application_conditions, clean_application_conditions_to_components +from .application_decision_conditions_update import update_application_conditions \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/decisions/app_conditions/application_decision_conditions_init.py b/bin/migrate-oats-data/applications/decisions/app_conditions/application_decision_conditions_init.py new file mode 100644 index 0000000000..048c38c0e4 --- /dev/null +++ b/bin/migrate-oats-data/applications/decisions/app_conditions/application_decision_conditions_init.py @@ -0,0 +1,153 @@ +from common import ( + OATS_ETL_USER, + setup_and_get_logger, + add_timezone_and_keep_date_part, + OatsToAlcsConditionTypeMapping, + BATCH_UPLOAD_SIZE +) +from db import inject_conn_pool +from psycopg2.extras import RealDictCursor, execute_batch + +etl_name = "init_application_conditions" +logger = setup_and_get_logger(etl_name) + + +@inject_conn_pool +def init_application_conditions(conn=None, batch_size=BATCH_UPLOAD_SIZE): + """ + This function is responsible for initializing the application_conditions in ALCS. + + Args: + conn (psycopg2.extensions.connection): PostgreSQL database connection. Provided by the decorator. + batch_size (int): The number of items to process at once. Defaults to BATCH_UPLOAD_SIZE. + """ + + logger.info(f"Start {etl_name}") + with conn.cursor(cursor_factory=RealDictCursor) as cursor: + with open( + "applications/decisions/sql/conditions/application_decision_conditions_init_count.sql", + "r", + encoding="utf-8", + ) as sql_file: + count_query = sql_file.read() + cursor.execute(count_query) + count_total = dict(cursor.fetchone())["count"] + logger.info(f"Total Application Conditions data to insert: {count_total}") + + failed_inserts = 0 + successful_inserts_count = 0 + last_condition_id = 0 + + with open( + "applications/decisions/sql/conditions/application_decision_conditions_init.sql", + "r", + encoding="utf-8", + ) as sql_file: + query = sql_file.read() + while True: + cursor.execute( + f"""{query} + WHERE oc.condition_id > {last_condition_id} ORDER BY oc.condition_id;""" + ) + + rows = cursor.fetchmany(batch_size) + + if not rows: + break + try: + conditions_to_be_inserted_count = len(rows) + + _insert_application_conditions(conn, batch_size, cursor, rows) + + successful_inserts_count = ( + successful_inserts_count + conditions_to_be_inserted_count + ) + last_condition_id = dict(rows[-1])["condition_id"] + + logger.debug( + f"retrieved/inserted items count: {conditions_to_be_inserted_count}; total successfully inserted conditions so far {successful_inserts_count}; last inserted condition: {last_condition_id}" + ) + except Exception as err: + logger.exception(err) + conn.rollback() + failed_inserts = count_total - successful_inserts_count + last_condition_id = last_condition_id + 1 + + logger.info( + f"Finished {etl_name}: total amount of successful inserts {successful_inserts_count}, total failed inserts {failed_inserts}" + ) + + +def _insert_application_conditions(conn, batch_size, cursor, rows): + query = _get_insert_query() + parsed_data_list = _prepare_oats_conditions_data(rows) + + if len(parsed_data_list) > 0: + execute_batch(cursor, query, parsed_data_list, page_size=batch_size) + + conn.commit() + + +def _get_insert_query(): + query = f""" + INSERT INTO alcs.application_decision_condition ( + administrative_fee, + approval_dependant, + audit_created_by, + completion_date, + decision_uuid, + "description", + type_code, + oats_condition_id + ) + VALUES ( + %(administrative_fee)s, + %(approval_dependant)s, + %(audit_created_by)s, + %(completion_date)s, + %(decision_uuid)s, + %(description)s, + %(type_code)s, + %(oats_condition_id)s + ) + ON CONFLICT DO NOTHING; + """ + return query + + +def _prepare_oats_conditions_data(row_data_list): + data_list = [] + for row in row_data_list: + mapped_row = { + "administrative_fee": row.get("admin_fee"), + "approval_dependant": row.get("approval_dependant_ind"), + "audit_created_by": OATS_ETL_USER, + "completion_date": add_timezone_and_keep_date_part( + row.get("completion_date") + ), + "decision_uuid": row.get("decision_uuid"), + "description": row.get("description"), + "type_code": _map_condition_type_code(row), + "oats_condition_id": row.get("condition_id"), + } + data_list.append(mapped_row) + + return data_list + + +def _map_condition_type_code(row): + type_code = row.get("condition_code") + if type_code is not None: + return OatsToAlcsConditionTypeMapping[type_code].value + + +@inject_conn_pool +def clean_application_conditions(conn=None): + logger.info("Start application_decision_condition cleaning") + with conn.cursor() as cursor: + cursor.execute( + f"DELETE FROM alcs.application_decision_condition WHERE audit_created_by = '{OATS_ETL_USER}' AND audit_updated_by is NULL " + ) + logger.info(f"Deleted items count = {cursor.rowcount}") + + conn.commit() diff --git a/bin/migrate-oats-data/applications/decisions/app_conditions/application_decision_conditions_link.py b/bin/migrate-oats-data/applications/decisions/app_conditions/application_decision_conditions_link.py new file mode 100644 index 0000000000..303fee9d6b --- /dev/null +++ b/bin/migrate-oats-data/applications/decisions/app_conditions/application_decision_conditions_link.py @@ -0,0 +1,131 @@ +from common import ( + OATS_ETL_USER, + setup_and_get_logger, + BATCH_UPLOAD_SIZE +) +from db import inject_conn_pool +from psycopg2.extras import RealDictCursor, execute_batch + +etl_name = "link_application_conditions" +logger = setup_and_get_logger(etl_name) + + +@inject_conn_pool +def link_application_conditions(conn=None, batch_size=BATCH_UPLOAD_SIZE): + """ + This function is responsible for initializing the application_decision_condition_component in ALCS. + + Args: + conn (psycopg2.extensions.connection): PostgreSQL database connection. Provided by the decorator. + batch_size (int): The number of items to process at once. Defaults to BATCH_UPLOAD_SIZE. + """ + + logger.info(f"Start {etl_name}") + with conn.cursor(cursor_factory=RealDictCursor) as cursor: + with open( + "applications/decisions/sql/conditions/application_decision_conditions_link_count.sql", + "r", + encoding="utf-8", + ) as sql_file: + count_query = sql_file.read() + cursor.execute(count_query) + count_total = dict(cursor.fetchone())["count"] + logger.info( + f"Total Application Conditions To Components data to insert: {count_total}" + ) + + failed_inserts = 0 + successful_inserts_count = 0 + last_condition_id = 0 + + with open( + "applications/decisions/sql/conditions/application_decision_conditions_link.sql", + "r", + encoding="utf-8", + ) as sql_file: + query = sql_file.read() + while True: + cursor.execute( + f"""{query} + WHERE appdc.oats_condition_id > {last_condition_id} ORDER BY appdc.oats_condition_id;""" + ) + + rows = cursor.fetchmany(batch_size) + + if not rows: + break + try: + conditions_to_be_inserted_count = len(rows) + + _insert_application_conditions(conn, batch_size, cursor, rows) + + successful_inserts_count = ( + successful_inserts_count + conditions_to_be_inserted_count + ) + last_condition_id = dict(rows[-1])["oats_condition_id"] + + logger.debug( + f"retrieved/inserted items count: {conditions_to_be_inserted_count}; total successfully linked conditions so far {successful_inserts_count}; last inserted condition: {last_condition_id}" + ) + except Exception as err: + logger.exception(err) + conn.rollback() + failed_inserts = count_total - successful_inserts_count + last_condition_id = last_condition_id + 1 + + logger.info( + f"Finished {etl_name}: total amount of successful inserts {successful_inserts_count}, total failed inserts {failed_inserts}" + ) + + +def _insert_application_conditions(conn, batch_size, cursor, rows): + query = _get_insert_query() + parsed_data_list = _prepare_oats_conditions_data(rows) + + if len(parsed_data_list) > 0: + execute_batch(cursor, query, parsed_data_list, page_size=batch_size) + + conn.commit() + + +def _get_insert_query(): + query = f""" + INSERT INTO alcs.application_decision_condition_component ( + application_decision_condition_uuid, + application_decision_component_uuid + ) + VALUES ( + %(condition_uuid)s, + %(component_uuid)s + ) + ON CONFLICT DO NOTHING; + """ + return query + + +def _prepare_oats_conditions_data(row_data_list): + data_list = [] + for row in row_data_list: + mapped_row = { + "condition_uuid": row.get("condition_uuid"), + "component_uuid": row.get("component_uuid"), + } + data_list.append(mapped_row) + + return data_list + + +@inject_conn_pool +def clean_application_conditions_to_components(conn=None): + logger.info("Start application_decision_condition_component cleaning") + with conn.cursor() as cursor: + cursor.execute( + f""" + DELETE FROM alcs.application_decision_condition_component cc + USING alcs.application_decision_condition dc + WHERE cc.application_decision_condition_uuid = dc."uuid" AND dc.audit_created_by = '{OATS_ETL_USER}' AND dc.audit_updated_by IS NULL; + """ + ) + logger.info(f"Deleted items count = {cursor.rowcount}") + + conn.commit() diff --git a/bin/migrate-oats-data/applications/decisions/app_conditions/application_decision_conditions_update.py b/bin/migrate-oats-data/applications/decisions/app_conditions/application_decision_conditions_update.py new file mode 100644 index 0000000000..7441ec3d38 --- /dev/null +++ b/bin/migrate-oats-data/applications/decisions/app_conditions/application_decision_conditions_update.py @@ -0,0 +1,110 @@ +from common import ( + setup_and_get_logger, + BATCH_UPLOAD_SIZE +) +from db import inject_conn_pool +from psycopg2.extras import RealDictCursor, execute_batch + +etl_name = "update_application_conditions" +logger = setup_and_get_logger(etl_name) + + +@inject_conn_pool +def update_application_conditions(conn=None, batch_size=BATCH_UPLOAD_SIZE): + """ + This function is responsible for updating existing the application_decision_condition in ALCS. + + Args: + conn (psycopg2.extensions.connection): PostgreSQL database connection. Provided by the decorator. + batch_size (int): The number of items to process at once. Defaults to BATCH_UPLOAD_SIZE. + """ + + logger.info(f"Start {etl_name}") + with conn.cursor(cursor_factory=RealDictCursor) as cursor: + with open( + "applications/decisions/sql/conditions/application_decision_conditions_update_count.sql", + "r", + encoding="utf-8", + ) as sql_file: + count_query = sql_file.read() + cursor.execute(count_query) + count_total = dict(cursor.fetchone())["count"] + logger.info(f"Total Application Conditions data to updated: {count_total}") + + failed_updates = 0 + successful_updates_count = 0 + last_condition_id = 0 + + with open( + "applications/decisions/sql/conditions/application_decision_conditions_update.sql", + "r", + encoding="utf-8", + ) as sql_file: + query = sql_file.read() + while True: + cursor.execute( + f"""{query} + WHERE oc.condition_id > {last_condition_id} ORDER BY oc.condition_id;""" + ) + + rows = cursor.fetchmany(batch_size) + + if not rows: + break + try: + conditions_to_be_updated_count = len(rows) + + _update_application_conditions(conn, batch_size, cursor, rows) + + successful_updates_count = ( + successful_updates_count + conditions_to_be_updated_count + ) + last_condition_id = dict(rows[-1])["condition_id"] + + logger.debug( + f"retrieved/updated items count: {conditions_to_be_updated_count}; total successfully update conditions so far {successful_updates_count}; last updated condition: {last_condition_id}" + ) + except Exception as err: + logger.exception(err) + conn.rollback() + failed_updates = count_total - successful_updates_count + last_condition_id = last_condition_id + 1 + + logger.info( + f"Finished {etl_name}: total amount of successful updates {successful_updates_count}, total failed updates {failed_updates}" + ) + + +def _update_application_conditions(conn, batch_size, cursor, rows): + data = _prepare_oats_alr_applications_data(rows) + + if len(data) > 0: + execute_batch( + cursor, + _get_update_query(), + data, + page_size=batch_size, + ) + + conn.commit() + + +def _get_update_query(): + query = f""" + UPDATE alcs.application_decision_condition + SET security_amount = %(security_amt)s + WHERE alcs.application_decision_condition."uuid" = %(condition_uuid)s; + """ + return query + + +def _prepare_oats_alr_applications_data(row_data_list): + data_list = [] + for row in row_data_list: + mapped_row = { + "security_amt": row.get("security_amt"), + "condition_uuid": row.get("condition_uuid"), + } + data_list.append(mapped_row) + + return data_list diff --git a/bin/migrate-oats-data/applications/decisions/sql/conditions/application_decision_conditions_init.sql b/bin/migrate-oats-data/applications/decisions/sql/conditions/application_decision_conditions_init.sql new file mode 100644 index 0000000000..3114226ce0 --- /dev/null +++ b/bin/migrate-oats-data/applications/decisions/sql/conditions/application_decision_conditions_init.sql @@ -0,0 +1,11 @@ +SELECT + oc.condition_id, + admin_fee, + approval_dependant_ind, + completion_date, + appdc.application_decision_uuid AS decision_uuid, + "description", + condition_code +FROM + oats.oats_conditions oc + JOIN alcs.application_decision_component appdc ON appdc.oats_alr_appl_component_id = oc.alr_appl_component_id -- ensure to select only conditions for imported OATS components \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/decisions/sql/conditions/application_decision_conditions_init_count.sql b/bin/migrate-oats-data/applications/decisions/sql/conditions/application_decision_conditions_init_count.sql new file mode 100644 index 0000000000..024f9742f5 --- /dev/null +++ b/bin/migrate-oats-data/applications/decisions/sql/conditions/application_decision_conditions_init_count.sql @@ -0,0 +1,5 @@ +SELECT + count(*) +FROM + oats.oats_conditions oc + JOIN alcs.application_decision_component appdc ON appdc.oats_alr_appl_component_id = oc.alr_appl_component_id -- ensure to select only conditions for imported OATS components \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/decisions/sql/conditions/application_decision_conditions_link.sql b/bin/migrate-oats-data/applications/decisions/sql/conditions/application_decision_conditions_link.sql new file mode 100644 index 0000000000..089d23f51d --- /dev/null +++ b/bin/migrate-oats-data/applications/decisions/sql/conditions/application_decision_conditions_link.sql @@ -0,0 +1,8 @@ +SELECT + appdc."uuid" AS condition_uuid, + appdc2."uuid" AS component_uuid, + appdc.oats_condition_id +FROM + alcs.application_decision_condition appdc + JOIN oats.oats_conditions oc ON oc.condition_id = appdc.oats_condition_id + JOIN alcs.application_decision_component appdc2 ON appdc2.oats_alr_appl_component_id = oc.alr_appl_component_id \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/decisions/sql/conditions/application_decision_conditions_link_count.sql b/bin/migrate-oats-data/applications/decisions/sql/conditions/application_decision_conditions_link_count.sql new file mode 100644 index 0000000000..f5d9864afd --- /dev/null +++ b/bin/migrate-oats-data/applications/decisions/sql/conditions/application_decision_conditions_link_count.sql @@ -0,0 +1,6 @@ +SELECT + count(*) +FROM + alcs.application_decision_condition appdc + JOIN oats.oats_conditions oc ON oc.condition_id = appdc.oats_condition_id + JOIN alcs.application_decision_component appdc2 ON appdc2.oats_alr_appl_component_id = oc.alr_appl_component_id \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/decisions/sql/conditions/application_decision_conditions_update.sql b/bin/migrate-oats-data/applications/decisions/sql/conditions/application_decision_conditions_update.sql new file mode 100644 index 0000000000..650c8357b2 --- /dev/null +++ b/bin/migrate-oats-data/applications/decisions/sql/conditions/application_decision_conditions_update.sql @@ -0,0 +1,9 @@ +SELECT + appdc."uuid" AS condition_uuid, + oaad.security_amt, + oc.condition_id +FROM + oats.oats_conditions oc + JOIN alcs.application_decision_condition appdc ON appdc.oats_condition_id = oc.condition_id -- only retrieve conditions that were imported into ALCS + JOIN oats.oats_alr_appl_components oaac ON oaac.alr_appl_component_id = oc.alr_appl_component_id + JOIN oats.oats_alr_appl_decisions oaad ON oaad.alr_appl_decision_id = oaac.alr_appl_decision_id \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/decisions/sql/conditions/application_decision_conditions_update_count.sql b/bin/migrate-oats-data/applications/decisions/sql/conditions/application_decision_conditions_update_count.sql new file mode 100644 index 0000000000..fde72516a5 --- /dev/null +++ b/bin/migrate-oats-data/applications/decisions/sql/conditions/application_decision_conditions_update_count.sql @@ -0,0 +1,7 @@ +SELECT + count(*) +FROM + oats.oats_conditions oc + JOIN alcs.application_decision_condition appdc ON appdc.oats_condition_id = oc.condition_id -- only retrieve conditions that were imported into ALCS + JOIN oats.oats_alr_appl_components oaac ON oaac.alr_appl_component_id = oc.alr_appl_component_id + JOIN oats.oats_alr_appl_decisions oaad ON oaad.alr_appl_decision_id = oaac.alr_appl_decision_id \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/migrate_application.py b/bin/migrate-oats-data/applications/migrate_application.py index 95f202c982..69fa2aae76 100644 --- a/bin/migrate-oats-data/applications/migrate_application.py +++ b/bin/migrate-oats-data/applications/migrate_application.py @@ -29,6 +29,11 @@ init_application_decision_components, update_application_decision_component_soil_details, update_application_decision, + init_application_conditions, + link_application_conditions, + update_application_conditions, + clean_application_conditions, + clean_application_conditions_to_components ) from .decisions.app_modifications import ( update_application_modifications, @@ -81,10 +86,16 @@ def process_application_decisions(batch_size): update_application_reconsiderations(batch_size) init_application_decision_components(batch_size) update_application_decision_component_soil_details(batch_size) + init_application_conditions(batch_size) + update_application_conditions(batch_size) + link_application_conditions(batch_size) + def clean_application_decisions_etl(): # modifications do not have clean since all of them were created in ALCS and ETL is not introducing new records. + clean_application_conditions_to_components() + clean_application_conditions() clean_application_decision_components() unlink_application_reconsiderations() clean_application_reconsiderations() diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-condition/application-decision-condition.entity.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-condition/application-decision-condition.entity.ts index ed50de5884..cbf673462f 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-condition/application-decision-condition.entity.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-condition/application-decision-condition.entity.ts @@ -92,6 +92,15 @@ export class ApplicationDecisionCondition extends Base { }) components: ApplicationDecisionComponent[] | null; + @Column({ + select: false, + nullable: true, + type: 'int8', + comment: + 'This column is NOT related to any functionality in ALCS. It is only used for ETL and backtracking of imported data from OATS. It links oats.oats_conditions to alcs.application_decision_condition.', + }) + oatsConditionId: number; + @OneToMany( () => ApplicationDecisionConditionComponentPlanNumber, (c) => c.condition, diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1705361630015-add_oats_condidion_id_to_app_decision_condition.ts b/services/apps/alcs/src/providers/typeorm/migrations/1705361630015-add_oats_condidion_id_to_app_decision_condition.ts new file mode 100644 index 0000000000..f95bccd164 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1705361630015-add_oats_condidion_id_to_app_decision_condition.ts @@ -0,0 +1,23 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class AddOatsCondidionIdToAppDecisionCondition1705361630015 + implements MigrationInterface +{ + public async up(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `ALTER TABLE "alcs"."application_decision_condition" ADD "oats_condition_id" bigint`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."application_decision_condition"."oats_condition_id" IS 'This column is NOT related to any functionality in ALCS. It is only used for ETL and backtracking of imported data from OATS. It links oats.oats_conditions to alcs.application_decision_condition.'`, + ); + } + + public async down(queryRunner: QueryRunner): Promise<void> { + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."application_decision_condition"."oats_condition_id" IS 'This column is NOT related to any functionality in ALCS. It is only used for ETL and backtracking of imported data from OATS. It links oats.oats_conditions to alcs.application_decision_condition.'`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_decision_condition" DROP COLUMN "oats_condition_id"`, + ); + } +} From 7f768453c2fa5da52797d8ee965919f1bf7de983 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Tue, 16 Jan 2024 09:11:50 -0800 Subject: [PATCH 935/954] QA Fixes for Links * Add one missing _blank * Remove two file blocks --- .../proposal/subd-proposal/subd-proposal.component.html | 8 +------- .../proposal/tur-proposal/tur-proposal.component.html | 9 +-------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.html index bc6a5dce63..8aa574b4ac 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/subd-proposal/subd-proposal.component.html @@ -2,13 +2,6 @@ <h2>Proposal</h2> <p>*All fields are required unless stated optional or disabled.</p> <app-commission-purposes-panel></app-commission-purposes-panel> - <div class="step-documents"> - <h6>Documents needed for this step:</h6> - <ul> - <li>Proposal Map / Site Plan</li> - <li>Proof of Homesite Severance Qualification</li> - </ul> - </div> </div> <app-warning-banner> In order to complete this step, please consult the following pages on the ALC website: @@ -233,6 +226,7 @@ <h6>Documents needed for this step:</h6> <app-info-banner >Please refer to the <a + target="_blank" href="https://www.alc.gov.bc.ca/application-and-notice-process/applications/required-documents/#sdv" class="subtext" >Subdivide Land in the ALR</a diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/tur-proposal/tur-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/tur-proposal/tur-proposal.component.html index c97656f356..e80920eeea 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/proposal/tur-proposal/tur-proposal.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/tur-proposal/tur-proposal.component.html @@ -2,13 +2,6 @@ <h2>Proposal</h2> <p>*All fields are required unless stated optional or disabled.</p> <app-commission-purposes-panel></app-commission-purposes-panel> - <div class="step-documents"> - <h6>Documents needed for this step:</h6> - <ul> - <li>Proof of Serving Notice</li> - <li>Proposal Map / Sketch Plan</li> - </ul> - </div> </div> <app-warning-banner> In order to complete this step, please consult the following pages on the ALC website: @@ -172,7 +165,7 @@ <h6>Documents needed for this step:</h6> <a target="_blank" href="https://www.alc.gov.bc.ca/application-and-notice-process/applications/required-documents/#tur" - >Transportation, Utility and Recreational Trail</a + >Transportation, Utility and Recreational Trail</a > page on the ALC website for more information. </app-info-banner> From 8a6ab3515a8a6414b65def154e4e448328448027 Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Tue, 16 Jan 2024 09:40:03 -0800 Subject: [PATCH 936/954] document import on windows (#1297) document import on windows record the last imported file on every file upload rather than at the end of batch --- bin/migrate-files/application_docs/application_docs_import.py | 3 +-- bin/migrate-files/common/log_file_helper.py | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/bin/migrate-files/application_docs/application_docs_import.py b/bin/migrate-files/application_docs/application_docs_import.py index 022b7b1eaa..ace2219d9d 100644 --- a/bin/migrate-files/application_docs/application_docs_import.py +++ b/bin/migrate-files/application_docs/application_docs_import.py @@ -94,8 +94,7 @@ def import_application_docs( documents_upload_progress_bar.update(1) last_document_id = document_id documents_processed += 1 - - log_last_imported_file(last_document_id, log_file_name) + log_last_imported_file(last_document_id, log_file_name) except Exception as error: handle_document_processing_error( diff --git a/bin/migrate-files/common/log_file_helper.py b/bin/migrate-files/common/log_file_helper.py index e87badcd1a..737277b220 100644 --- a/bin/migrate-files/common/log_file_helper.py +++ b/bin/migrate-files/common/log_file_helper.py @@ -7,7 +7,7 @@ def generate_log_file_name(file_name): def get_current_date_with_seconds(): - return datetime.now().strftime("%Y-%m-%d %H:%M:%S") + return datetime.now().strftime("%Y-%m-%d_%H-%M-%S") def log_last_imported_file(last_document_id, log_file_name): From dd32f451a1e49906c1889fee5d499fd0f9753fab Mon Sep 17 00:00:00 2001 From: Liam Stoddard <lstodd@protonmail.com> Date: Tue, 16 Jan 2024 10:20:23 -0800 Subject: [PATCH 937/954] fix typo --- .../app_conditions/application_decision_conditions_init.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/migrate-oats-data/applications/decisions/app_conditions/application_decision_conditions_init.py b/bin/migrate-oats-data/applications/decisions/app_conditions/application_decision_conditions_init.py index 048c38c0e4..580d46563f 100644 --- a/bin/migrate-oats-data/applications/decisions/app_conditions/application_decision_conditions_init.py +++ b/bin/migrate-oats-data/applications/decisions/app_conditions/application_decision_conditions_init.py @@ -15,7 +15,7 @@ @inject_conn_pool def init_application_conditions(conn=None, batch_size=BATCH_UPLOAD_SIZE): """ - This function is responsible for initializing the application_conditions in ALCS. + This function is responsible for initializing the application_decision_condition in ALCS. Args: conn (psycopg2.extensions.connection): PostgreSQL database connection. Provided by the decorator. From 51530d486b5990a763f8915219a49600750ed524 Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Tue, 16 Jan 2024 10:41:51 -0800 Subject: [PATCH 938/954] populate staff journal user (#1296) populate staff journal user --- .../menu/commands/applications.py | 6 ++ .../menu/commands/clean_all.py | 5 +- .../menu/commands/import_all.py | 4 ++ .../menu/commands/notice_of_intents.py | 6 ++ .../staff_journal_users/__init__.py | 4 ++ .../populate_staff_journal_users.py | 59 +++++++++++++++++++ 6 files changed, 81 insertions(+), 3 deletions(-) create mode 100644 bin/migrate-oats-data/staff_journal_users/__init__.py create mode 100644 bin/migrate-oats-data/staff_journal_users/populate_staff_journal_users.py diff --git a/bin/migrate-oats-data/menu/commands/applications.py b/bin/migrate-oats-data/menu/commands/applications.py index f8f25276b4..1f38a1a649 100644 --- a/bin/migrate-oats-data/menu/commands/applications.py +++ b/bin/migrate-oats-data/menu/commands/applications.py @@ -4,6 +4,10 @@ init_applications, ) from users.alcs_init_users import init_alcs_users +from staff_journal_users import ( + clean_staff_journal_users, + populate_default_staff_journal_user, +) def application_import(console, args): @@ -21,9 +25,11 @@ def application_import(console, args): init_applications(batch_size=import_batch_size) init_alcs_users(batch_size=import_batch_size) process_application_etl(batch_size=import_batch_size) + populate_default_staff_journal_user() def application_clean(console): console.log("Beginning ALCS application clean") with console.status("[bold green]Cleaning ALCS Applications...\n") as status: + clean_staff_journal_users() clean_alcs_applications() diff --git a/bin/migrate-oats-data/menu/commands/clean_all.py b/bin/migrate-oats-data/menu/commands/clean_all.py index 2a1af6ca1a..6fba518f00 100644 --- a/bin/migrate-oats-data/menu/commands/clean_all.py +++ b/bin/migrate-oats-data/menu/commands/clean_all.py @@ -15,13 +15,12 @@ clean_documents, clean_noi_documents, ) - +from staff_journal_users import clean_staff_journal_users def clean_all(console, args): with console.status("[bold green]Cleaning previous ETL...\n") as status: console.log("Cleaning data:") - # this will be enabled once application import is ready - + clean_staff_journal_users() # application parcels need to be cleaned before application documents clean_application_parcels() clean_application_documents() diff --git a/bin/migrate-oats-data/menu/commands/import_all.py b/bin/migrate-oats-data/menu/commands/import_all.py index 3b26b71adc..c5366d71a0 100644 --- a/bin/migrate-oats-data/menu/commands/import_all.py +++ b/bin/migrate-oats-data/menu/commands/import_all.py @@ -19,6 +19,7 @@ link_alcs_docs_to_noi_docs, link_alcs_docs_to_app_docs, ) +from staff_journal_users import populate_default_staff_journal_user def import_all(console, args): @@ -58,6 +59,9 @@ def import_all(console, args): console.log("Processing notice of intents") process_notice_of_intent(batch_size=import_batch_size) + console.log("Processing staff journal users") + populate_default_staff_journal_user() + # NOTE: both process_application_submission_status_emails(), process_notice_of_intent_submission_status_emails() # must be the last ones in the migrate etl console.log("Processing submission status emails") diff --git a/bin/migrate-oats-data/menu/commands/notice_of_intents.py b/bin/migrate-oats-data/menu/commands/notice_of_intents.py index 46fd748de8..bfdf67aad2 100644 --- a/bin/migrate-oats-data/menu/commands/notice_of_intents.py +++ b/bin/migrate-oats-data/menu/commands/notice_of_intents.py @@ -5,6 +5,10 @@ ) from common import setup_and_get_logger from users import init_alcs_users +from staff_journal_users import ( + clean_staff_journal_users, + populate_default_staff_journal_user, +) logger = setup_and_get_logger("noi_import") @@ -22,9 +26,11 @@ def notice_of_intent_import(console, args): init_notice_of_intents(batch_size=import_batch_size) init_alcs_users(batch_size=import_batch_size) process_notice_of_intent(batch_size=import_batch_size) + populate_default_staff_journal_user() def notice_of_intent_clean(console): logger.debug("Beginning OATS -> ALCS NOI import clean process") with console.status("[bold green]NOI clean import...\n") as status: + clean_staff_journal_users() clean_notice_of_intent() diff --git a/bin/migrate-oats-data/staff_journal_users/__init__.py b/bin/migrate-oats-data/staff_journal_users/__init__.py new file mode 100644 index 0000000000..4a75fe416c --- /dev/null +++ b/bin/migrate-oats-data/staff_journal_users/__init__.py @@ -0,0 +1,4 @@ +from .populate_staff_journal_users import ( + populate_default_staff_journal_user, + clean_staff_journal_users, +) diff --git a/bin/migrate-oats-data/staff_journal_users/populate_staff_journal_users.py b/bin/migrate-oats-data/staff_journal_users/populate_staff_journal_users.py new file mode 100644 index 0000000000..80dfbfcf23 --- /dev/null +++ b/bin/migrate-oats-data/staff_journal_users/populate_staff_journal_users.py @@ -0,0 +1,59 @@ +from common import OATS_ETL_USER, setup_and_get_logger +from db import inject_conn_pool + +etl_name = "populate_default_staff_journal_user" +logger = setup_and_get_logger(etl_name) + +_new_oats_user_uuid = "ca8e91dc-cfb0-45c3-a443-8e47e44591df" + + +@inject_conn_pool +def populate_default_staff_journal_user(conn=None): + logger.info(f"Start {etl_name}") + + insert_user_query = f""" + INSERT INTO alcs."user" (uuid, audit_created_by,email,display_name,preferred_username,"name",given_name,family_name, identity_provider) + VALUES ('{_new_oats_user_uuid}', '{OATS_ETL_USER}','11@11','Oats ETL','Oats ETL','Oats ETL','Oats','ETL', 'etl') + ON CONFLICT DO NOTHING; + """ + set_user_to_journal_records_query = f""" + UPDATE alcs.staff_journal + SET author_uuid = '{_new_oats_user_uuid}' + WHERE author_uuid IS NULL AND staff_journal.audit_created_by = '{OATS_ETL_USER}'; + """ + try: + with conn.cursor() as cursor: + cursor.execute(insert_user_query) + cursor.execute(set_user_to_journal_records_query) + conn.commit() + except Exception as err: + logger.exception() + cursor.close() + conn.close() + + logger.info(f"Finished {etl_name}") + + +@inject_conn_pool +def clean_staff_journal_users(conn=None): + logger.info(f"Start cleaning staff journal user") + update_query = f""" + UPDATE alcs.staff_journal + SET author_uuid = NULL + WHERE author_uuid IS NULL AND staff_journal.audit_created_by = '{OATS_ETL_USER}'; + """ + delete_query = f""" + DELETE FROM alcs.staff_journal + WHERE uuid='{_new_oats_user_uuid}' + """ + try: + with conn.cursor() as cursor: + cursor.execute(update_query) + cursor.execute(delete_query) + except Exception as err: + logger.exception() + cursor.close() + conn.close() + + conn.commit() + logger.info(f"Finished cleaning staff journal user") From 3c3a9b42db5085c6a7cb10e8abf19ed5fc0501b3 Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Tue, 16 Jan 2024 11:12:49 -0800 Subject: [PATCH 939/954] Add NARU to 'proposal' step save --- .../alcs-edit-submission/alcs-edit-submission.component.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/portal-frontend/src/app/features/applications/alcs-edit-submission/alcs-edit-submission.component.ts b/portal-frontend/src/app/features/applications/alcs-edit-submission/alcs-edit-submission.component.ts index 9ff766ee3a..51579bbf82 100644 --- a/portal-frontend/src/app/features/applications/alcs-edit-submission/alcs-edit-submission.component.ts +++ b/portal-frontend/src/app/features/applications/alcs-edit-submission/alcs-edit-submission.component.ts @@ -19,6 +19,7 @@ import { OtherParcelsComponent } from '../edit-submission/other-parcels/other-pa import { ParcelDetailsComponent } from '../edit-submission/parcel-details/parcel-details.component'; import { PrimaryContactComponent } from '../edit-submission/primary-contact/primary-contact.component'; import { CoveProposalComponent } from '../edit-submission/proposal/cove-proposal/cove-proposal.component'; +import { NaruProposalComponent } from '../edit-submission/proposal/naru-proposal/naru-proposal.component'; import { NfuProposalComponent } from '../edit-submission/proposal/nfu-proposal/nfu-proposal.component'; import { PfrsProposalComponent } from '../edit-submission/proposal/pfrs-proposal/pfrs-proposal.component'; import { PofoProposalComponent } from '../edit-submission/proposal/pofo-proposal/pofo-proposal.component'; @@ -65,6 +66,7 @@ export class AlcsEditSubmissionComponent implements OnInit, OnDestroy, AfterView @ViewChild(RosoProposalComponent) rosoProposalComponent?: RosoProposalComponent; @ViewChild(PofoProposalComponent) profoProposalComponent?: PofoProposalComponent; @ViewChild(PfrsProposalComponent) pfrsProposalComponent?: PfrsProposalComponent; + @ViewChild(NaruProposalComponent) naruProposalComponent?: NaruProposalComponent; @ViewChild(ExclProposalComponent) exclProposalComponent?: ExclProposalComponent; @ViewChild(InclProposalComponent) inclProposalComponent?: InclProposalComponent; @ViewChild(CoveProposalComponent) coveProposalComponent?: CoveProposalComponent; @@ -195,6 +197,7 @@ export class AlcsEditSubmissionComponent implements OnInit, OnDestroy, AfterView } private async saveProposalSteps() { + console.log('here'); if (this.nfuProposalComponent) { await this.nfuProposalComponent.onSave(); } @@ -213,6 +216,9 @@ export class AlcsEditSubmissionComponent implements OnInit, OnDestroy, AfterView if (this.pfrsProposalComponent) { await this.pfrsProposalComponent.onSave(); } + if (this.naruProposalComponent) { + await this.naruProposalComponent.onSave(); + } if (this.exclProposalComponent) { await this.exclProposalComponent.onSave(); } From 3b5e43c089069414ed54cf992f1e627c032a6fd8 Mon Sep 17 00:00:00 2001 From: Tristan Slater <hello@trslater.ca> Date: Tue, 16 Jan 2024 11:17:01 -0800 Subject: [PATCH 940/954] Clean up debug --- .../alcs-edit-submission/alcs-edit-submission.component.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/portal-frontend/src/app/features/applications/alcs-edit-submission/alcs-edit-submission.component.ts b/portal-frontend/src/app/features/applications/alcs-edit-submission/alcs-edit-submission.component.ts index 51579bbf82..11e5929c6d 100644 --- a/portal-frontend/src/app/features/applications/alcs-edit-submission/alcs-edit-submission.component.ts +++ b/portal-frontend/src/app/features/applications/alcs-edit-submission/alcs-edit-submission.component.ts @@ -197,7 +197,6 @@ export class AlcsEditSubmissionComponent implements OnInit, OnDestroy, AfterView } private async saveProposalSteps() { - console.log('here'); if (this.nfuProposalComponent) { await this.nfuProposalComponent.onSave(); } From 3c05bcfa990ae0dfafb2c474f5f2f631548dca94 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Tue, 16 Jan 2024 12:37:41 -0800 Subject: [PATCH 941/954] NFU PDF Fixes --- .../generate-submission-document.service.ts | 10 +++++----- .../pdf/nfu-submission-template.docx | Bin 32385 -> 32297 bytes 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/services/apps/alcs/src/portal/pdf-generation/generate-submission-document.service.ts b/services/apps/alcs/src/portal/pdf-generation/generate-submission-document.service.ts index 247036c2b2..b35d5604b6 100644 --- a/services/apps/alcs/src/portal/pdf-generation/generate-submission-document.service.ts +++ b/services/apps/alcs/src/portal/pdf-generation/generate-submission-document.service.ts @@ -228,7 +228,7 @@ export class GenerateSubmissionDocumentService { ); const data = { - noData: 'No Data', + noData: NO_DATA, generatedDateTime: dayjs .tz(new Date(), 'Canada/Pacific') .format('MMM DD, YYYY hh:mm:ss Z'), @@ -238,11 +238,11 @@ export class GenerateSubmissionDocumentService { localGovernment: localGovernment?.name, status: submission.status.statusType, applicant: submission.applicant, - hasOtherParcelsInCommunity: formatBooleanToYesNoString( - submission.hasOtherParcelsInCommunity, - ), + hasOtherParcelsInCommunity: + formatBooleanToYesNoString(submission.hasOtherParcelsInCommunity) ?? + NO_DATA, otherParcelsDescription: submission.otherParcelsDescription, - selectedThirdPartyAgent: primaryContact?.type.code !== OWNER_TYPE.AGENT, + selectedThirdPartyAgent: primaryContact?.type.code === OWNER_TYPE.AGENT, primaryContact, primaryContactType: primaryContact?.type?.label, organizationText: diff --git a/services/templates/pdf/nfu-submission-template.docx b/services/templates/pdf/nfu-submission-template.docx index 34f570639da06d9a2e7c13b8eec3c01538975174..d97b936b574c033470a941473a3a560d324ef85d 100644 GIT binary patch delta 7603 zcmZ8m1yEc~v&G$lYjAhB;O-vWHMl!0n&7rU77Y#?+=3HGaCevBi@QS}$@l7i-~Vpa zt(l%X(=~Ob&#j)*q0i9ePtfS<O0aOaP)JBfP)r3Jwdil5VP9Jy8#EoDhXX74R+lA+ z+?Zc_I_^#H8BKIFH}Sf?kGR)yW)sKVtv3lt+0P<OpY_}8wl<ULMU%8{j5xg1Oe(Gz zb*LEKNcBTT|3QLZtSA+hU^DAtvltAsNtQOnmXda^Gb<+aKIEEEe$6y@5gC#_p5BEE zba@*&ll*rr;5e(XQk!@H@0O_}x<En!a@vMoH|dXf^D;y^&jyw|v+{2xj_4=}`EbZX z`pU9!c?}qG4Fv2BBOpx_p9xouC1AL}OD{#mp}#hL<;<<x+49AC3mGpi*pCT=K`Aj_ z-8n>%0menV&0XX&bA<c?erS_HwPzqNE1Tv@s6gQ&chmHi<Ods|N_noP^k+Z3o^ynE z@F%i+*fYPu8UI7_cd&S4rv`&iykA*BUP@h8sUe#$8zO9GL2?&S&tg*oaq{wXg3*ki z314?UO_z!Hd^I?u>%%F&D`{jQB`$5xcW@`I`5%Awt2Sc`HDmsM8aN_RS3*SEbS<ZG zf`)=xg@J<lb12CFIThd%3^icb`Sm>7Z<!0qbT?_Xp$9l6wRJEn#c3nglC~V*>R1>y z#crHBL@9bysc{P*f*J|f$Ak8=#Uby{M$q4_dxdaoG_{YdBtH3Zd5}3Vuz#QzusVTn zXrsaO{TcyhZ7`AGwISp|Vz~`NIZC`=ep4}0sfj$RWmyhRE(51^0|931BCg?*>uOlp z=x5kN(d{Iy;ai(lFAfGM-Z^Tgm$41OaC;NO3B(kH&)r6ZOFK@OG|INMIwz#nMMnm* z@z1yyOZX^!-*7+s*An>u+9I*eTHSMN^f&FIN#?c}T=EHo=4Qyn?|lb?_so?pC$DEx z_~Cm}YOap&h%fafRTPjlg;nUb!0RXG7!Fsvx9s6?SNV&zQUXW#80t)-OcN(7WD@GU zH9v;Sl0Atg8YWIQGTGNor5^ZMA87SfW~(XL>JqmSFEyS{!augdL+M1ATI>(%ReA#7 zv|dqH_+Qlj1G*m6zaAVYU;td-A7<1`!z=%#NIek27w+!}2CAy+U(%TBQv(K_mpQOH zZkdtRoCck>a3!}Xybiv6!iPQzgi?v8Y1#~<bn3l-(EOUy8=3><hS_2V+8NEF7m?p1 z@TsG45NB?Pf!Gmh!o(a(m$8(5i(T9xp`GJQt&wDof*`PTWCRMa7tT<gj}FNSl`v~3 z?+D7<AZohKyf1bB-WcbZi2}elj&33&oL&*cftOh3nL+qGUQA5u@q%Cf<wMI<Agx4; z8R<t;*oZJewb|XC1q`R>si#Jk*4B%p^5VXqUv|wZ=f&|yjRqqQ%w>N;qv{F-eG;^C z535)qx=$L=0j^Lj(I<(-=a)``bqjslHSUmHa=Bp*8;+dp=F4<Tq=0~@Bq!P*UCdgH zHcvRlF_O(H9d~In`@_q6B6CMxzQU*D`$qyHZkQB)SKL~}i*;vo7s~RDZ_lGVH#@8j zexT2lwk+d{57~{zWQ;X<hwzkf0elH$l6R_*EvBtc+g1b|v2TLy$@{{Zg!XNJVZe+v zxa%O+8%1RV=cNd0tyuxAKbtbO;UFiF>B&~5aMXQt>*|!K332!WBuRrVA2QN<s>+_C z0_~zH02&tv$DNTuxBkWpeR+G{12xqA3+^~WLPp<L->wdf?p!AtG<TlC(cB{0b#qu@ zv~K$BY}4hL`sS%pB9>X@VVBmBPC`Cynfz*A|JKDcJt}5&TXD!d_F_8^e@(zw_FJF+ z_bZPPkz6RhGorml*Con7y#7yw0ZsMs>pKkx{t2gOW9ff>y_4qn^}8nfFn>d8(wr6` z@elLy(oTCrrF3NAW;Cy7+!?N*V;8ZMn)ok>HG@rYqL>;5wRMI@*NDbP5=t*IZF`|% zNiHHu6S){C9F~Z?n71Dv?r%&`5;ne>4O&tr4!Dc9f%yCsMC;_oMfOxEzY-oAG0x!$ zZM>P?$9b>miZ#u9q%CD`h&VL>$ezj30kX7dVZ@~qfX+yWn3M|7qp#NT6K#`2@GX`? zn6>J&ji;jNZZ|ad8{GyhqT_w35j$!3QDC;BJ)jH+Sb*Rl#IXfSestCjczYbL*-=a^ zG)I<P3NOA#^H!l&^hJ~E!3h)0=qZ=kHhlh%_lfV>ZNl?e4J$Y@>b&4JNYasyJv(nJ zA5!8!vHb!7(PxQ#Pf)#Iy1x=!E9O3Ive=QMebmy@MY(RiJFxMs9}cz6`vbh)>bW@2 zE49zz{vYu5N|r<aU`=RE16X$75=aSJuNL1o@4;KOR!DOxCey7Ru8O4&T&`;q7NUEA zrlLfirs;+j|GI*MQ=3<p_(=B1_(+=trC{u6KnqMk8`6JceU1Vn0768jNWME%Tki>3 z;Vf^CN+3Qyeji>lfFqiSAQzwKBGw_|h*kVyds<xjsLX9#d#m*JH{fPoW1heSyG|ZQ zo>J4;ZARW|MrSQ4Qo94ag+3BH=y?vuT=(j6#d1-NIzZ|z??;3FRU7Vr4~9Qk!UBRQ zrNF<mF)|^{rHkJ(g)8TRwdz9b2darL^mfWuM;~8|3Ae}N@$V1h<;Bu^EEOeWA|xJG zlP>JCmD?J{Lsf*f_yL<TokvPSnGf5JvZ~WrK-}3vn*POwkB(N2wpyWAOO=R_RkRNy zbmi#a;v4-KnlUZZ4jDxf&3ifQEaF(`$+wuzo!{W|tiT<Hth$(o6-NGA7t?D2CNRQV zaFW#ld{Gfa9Z)>T?vl#qNJR_2m?*P2FCF*s$9WDP0M1uI-vI+<0dnDmeZ}RiUnU#W zJo5JD4I#x{0r!z1*IxcAC6EC%swos_tsS@EnLAfWXFIqd?gNZOYF;n+HG7+C-u}fT z9Ux4ryj#eRW+iGD1{z2$Wn$ojlNQXTN3l!49C@GI-d17tjr=(W#zLd|4GY#9`G^`O zq(lBn-?InC5I`S+5K3qa-2#v6S-ncZ=(bYJ9*6nyp{#bgW|62=zH{;R<dQhPtyX<S zeKh^NEw2bEkvJDAg~NV(-01o-26CG-cVdn@^e%{1Oa%y1xJpNi?$e$MEjm9lZ+*<^ z@GF0@Ah%s_Ft@}Us+o4~T0Rw5c*mgF=5bf$kwFl34R{=xCZD#Qwx7DGZU6)T3lb^l z`G3oo!JUWyFq9{Uiyea25(<FJ3~^9sc46i(pp?JXmq$b!3oLmjUzfZ)BWh=Q&UPxA zMdf}9j35}%St3(57DN=+DRF3kvn-(@iw080BOK}Vsv7~jY%+m<>(vjl<wdIHB{a$H z(wdyN08c8SA_Tcr-)vR^aJGS`&nPSQE*#hb`l?S&)kG2ag-(vqAkiVfT|tqPnCsvx zX~d#-W@6nes_#=YV(5LCAYI*XPwu3f-!4hKQ_1{jP%-WF+63v%uhi<Z>yjX|z(T>S zB0(*2`y&2UEYZ&ybOw4Go!8cO!J!@G6HvTh0IzO!CUD-e{K}S2(gK5GIEgyzU5Bu) z{@R6H-AK8w5$4&tC?~D-^j<k!>Gp?muaR;UrODCu<Av`Ca7t0MKd~*4Ya{e}c2dt! z3F#(6nx;qO6f#7AhPQ1<nEzS><(V!IcJc<BM>cXFfW<C93klz+;_wDIMSI<~V<xmd z0G=ChecoLNpbwmjyR##I-;Mx!5Z`Z0M^Nh8_(r$W_Pdd~CQ8n4(Lt=!RWu(cty&4J z#1`fJyQ`BzCp9dqXYE08hmV9K-xj9Tbotvo@$VrHTBmpG`*$xb$J_}n*Z2Ipi7uH5 z+wdw~?3+iI0r1EmwXv2}9D{I~yDQi!fTvtu`+D}MvPYAFsM1N6RGIH@X}AweZO7rt zCAMs*<PGa8nj`BoA2eH@_DOZwpR@9wg;G5wjQz<Yu0Yx!h%v{wRs%FKRrW5z&rYWs zWLF3Zaj^6m`|KA=LoL)alVi#e{n2z`-_}+uBpKc;;;Ao&2YF0cPUu>I1SUFd0Pe*o zZPWf0VvxpSCP((?fP&m-ze0bIW@a*+yY~|7ME|ZdF^YB15Z+LP7T38E<6UVNy0M)% zNZi!$<?sWgohlOShr%_gx_3*>@Y=}&d{Rt`Sco}MVaX8=l)UiM;C>jIlz9rS*{E$< ztsI7;#L=Wk?5q3=C`Uwj!fF|LK$?Z0G_jy1_s{(HL1?b;kL2u4Yo4>}aZOFs=5(WL z6tV3HwdH+Odp(5`mpJK)z~KgxOZ^p2A|g3%tF%$9Wb6@a!j_Db2=}KHjM}mO8{tc4 zoc)-Z52wy6Jj#5FHD^4^32WQ%!b>h-%CF2@VHP6#hDs?*KVT?@jEZN10k`3@7|YAs znTm<<h6m{Pf-wG+T7}$^I4tY%g}~rD%)U*ft=}oDvs~thE&G1WUT-%`QUubJ%PlEN z*l*91WDd@6@n3UOJT0LV=4a~eq;goZ{G^JA6K_=46=T!byVY^Si>&0&v^GC+LX+-& z#7Iwa8Vts(DS*5H;U@Pgz)K&%RL3R{M8B0|3qLs`8-~U0*H3)<TPC}D7@(@V+e9d1 z_8HC3@soT0=;L^$PO4c&uU1;DoTZMdzQiM8Htu>rD^*_w#}B;mirlUVy)uAUvN|Uu z|1zW#g3&TA%0W?2^=K6VJeZ}M6|M{q=YfER5kDP|(e%0l5BMN}Vjr>*A=qj0aJ;Yh z2VyL9`endp)5_QkVjXYquhM`C6ojw?=~8DCrEec6sb^g1uOG9~?Zj0_EfC*|P3lOp zRu`usA}ldlX-ponqR-+!3nUcZHL0-KDJRetmhGKTJSwxqJ}%b}kxwmrd5ZMQ?4j;$ zRqMPR+u1J8_j@}CC}5+~nLH2^mI-!69I^Kn9|>}NIAn#wYZOdgOJb6R@;>SnhI5eV z7&E&@uUPejeuBIg(hP8OlTZcFbai)K^^g>W_zx@cqTESa%d5hGaZklW=wqbSm8dp` zz8jWpKzPzX5@XI!eKT2X?fuRpi^bw7Wr?4)3qx>%`$gOVM~{7@P^s%=dS4m4Y|Td1 zd-*!oQq(oNK{Fo?#|CurR@}+HG@fF$;#~)Zo#?Dvv`Ky&+53^Y<A0pm8g)2O*Qae; zsuEv1*gs$j&eD?Ty`ck{3|!hG<NR0+kumJ^d<txv^`9<I?&3AP;rF)l1+8hI5<K;a zl;VSDb^KKUm8P<qF%s3_SwEd)ThTG@be|jV*zC%s$F`h;;ZMgMo5P=gj;UUwVNV_H zGU`B^&dfKqun5LPb*q{#ih3^Z?XbQ!nt9P8@@xXq$W-cM;?yf`QLGpWxN<0m!BLY2 z91nz=Z$JM)$}07W=R_hx{UA%|oWfCb5ey%$Wan4`n8#co1ue{be8iYoaYbR}wDvWE zaUUl`mIVG}6tJ|+F4EXb`$R*`#vVe$O*g{D`Lo3Jn9#o^8mKS8?aJmtdfKwsfh%M> zxfZ}tT|XCCVI}%TrPFKp9@B~E;ou`dW)KO&{^wtx_)LP#>fgU5_PmBhQ)va$<=pFo zrlStS0L=!rsMHa2iB>t2b|~L{uXFMC*)>Q2$Z?Wd{CoW-4+Mo1j@V^{kq9!-uRWoL z*Iu!?eoTUf-HHr;;lvktK^gpc+fpl~h4<kI*4g>VOe<ed(B$hsz^LogvTM}l{A>hU z6#AKZK$n#)5Zd&8aOE69Qyd)9jWWw1;x`BMa&R*sD`~i*ac}XoR#T3Q(3x`>M|v<j z*pQ6C`^d5YpYhyB<6>2YUjnqvcYH{*j`Tps@bYmK8fxRHla~?m<I}_!6tZL4MaJiK znQX&*%l2O8Ffckw&_RXok4RE^buohqz3Ca#ZsM2v@s|YySk^lQSw2J_Q<aSAn*#x} zQ9<D+J5P}YJCC|$<0p_yK^ZS^j4A7K4{?nw2ZSJAr_PNxx&~`F9I<Ld0}*`BINDA= zXU00}_}b@7QR2LK>?DR5yi0EJCXRl5O!bEQx>~z+5=a^#GTq%%)+IS!Z`50Rdq)B! zT|M@w)}uPM00d(k#$|*dzE>4Mv<}dNyZnGxByMHmULQpSH>X|a|C1#{cyCwqU>$Vf z(FNr}?fB&>_}j~vi`X17fcm@Ih)|cbM($aFUKvArkK?A2X*=3N%olt%%NDz;%(Ps7 z7y3%xk1pVPJC{vwec6I^-MCr%UrNNX*GUt_DW_cMSq2U$&a8I_EmIPeJ^O$l=4<uU zMKOk@GFRK%Rp-f_IrGW2sN)|uZJWaZuaWQJ(Rj}c1s8rL)V!SkhWIBKqm9f!Mz$>b zM!vQphEVX>E=1z@yg+RG#VW>f<qw}@7=d^l51eU+@#VGQFYjuNM0`ID8kl#DNcjBz z^(6qpxLcQbLtL=-d*Y>|dH5RO85C?j^GWquH8Yt3dHR#DD}UAS+}#>T%%f89IqWzN zG^RO6PBMk$9}<3km>T&~^Q8(SJz>d1)Q-vDHp>V?37kW@t@o;zaTBgtH}taJeNi=^ zdB}NIon`x~^04C+HtL}Vwh_%nkt__LdVu4JgDa`dsw2<u#2ms`^6m%76odtMtX5zl z6Y9hveN7@_?rGBoPAF0*K1hCajg-QM^l_H(BOoIuGG1#TdrZZU$0Xo%I!l3B2yAHr z@pGa$l&PvtbvM4neEvmay&w(|u_3ZdL-gH-kFNC^5y3E`)I9#39QUyYD~gyqiV_|F zMILRd2$Md>iCVasnwA!@Afc=wb?y5Qd!;kcRApo6(=^z)ZL>mwDIM;8t$1{xT5B9s z1K0MTGhuqqHylcLsrwdATH0}GY;45Q4igcWp>6^WhoAGATk8YW*<hyelulN-7j<j1 znC05M949G}6RQRR-h~h==bSrQS90pHaz#HXYkId39<*}{<!JzXZJaATEL(I7Hh8rl z_T7`}wPZR+3VJ-+r~a{$yw_E@%;=5FI>%#$MfvXYhS*@nZ$y{b7lJ&omwRT3{w87~ z075SG>y9;S4V87Jehn#jAD!+}s<M3Nc|$@l#2Zp$U$$Iz(1c#rG&E{%6UHgX_t-AY zQj$VEpQcoQ!46=|L{+Ijbp{TOvBMYe_Yiqs8THPxoQ_Az!E)2*V#XM*Pevbj=9L`# z9oM7ozE?S8p4=y9?=nN7UWq%tH_%GDp6!R(v=3WCpH|35Xv#QB7N+m{K22eaLNv8u zPOTH<_TJCNEo6Z$(q{GdWA*RB18nRRMpQhxwie!#%lCllOm1a?9VR$TX-S-39)&OE zyZ&}$5eegJ1C2?<cG{>^p#D2DY9>ge5u?1MlN8%P*y5cE&CkN*Yraj59_5sv!(lkO zi2Kaz>(g#zLcAoz=4nfs=(x;G+hbd=bAol#Qf6c>wGy}8APmr4w@7{r1GM$Wbv^Ml z%F!x63t<538bI9G@wVM5F@<gsa@4iDDi*j5IXZc#Wt6NnH_VtArrI)}v%o{Y-r;0X zsP|M6)5qqp+?`V%b?Q9W5+?hFff$E<rpES!>_PO?us~eN%hhWhg~hB_w(VO72HS`X z7C6sntJUq_c&gO}secASs<yXqhrDPf_1kQuA_22;_2)5kC<tiqGaWP&(N>UFS@vXX zFg^>m%5O8XI5;!fHyp|pV%}BRwCQXu9CbB*o9e;$zt7>G4^T6b-jXJNN}Yhcs_`XM zs_~Am{3<UWv<#6jaMeLelSH+}8A+z(ljTVpz=EXg(-?0)4Fro{b_ba=jN_zJWfq|9 ze+N|B;$2-OIgFOXe6@M*MTE{>ZWJRzfhG%>?!NU{iX!y12%t)qO?1S<mm<gOTg}0R z@j;|Jc-M;_|2?>SXSL(UkHJs&BA3stBpG{paPRT4IOa!wpbizDBLyy!kylDmH&vMj z;BY72w#X%jjGi`|1V8CmnbU_NdMIHk?Q;U$8(`z@=Nw|uK7PyyO&@0YDOXoTIl#_k z{|W8nZ8)F^JU~E#+%DQW3MILHsvF5Ub=!v|)tj3xKLO=~JjQi?iuO@{qZ-x9>MTC_ zqdnRSvlQ$KEsxUvO;kSg%MgcbI)YJE-P8`#BOP5wRAhn7F9BJM$2T+9p;Dy-mK$aO zTNj@c3;o1U48GA5A_LQ(Q4uzIrIeREsmgEeESs!gXe~SSdljhObR26D5sw$TYwX+_ zE$sSUCIRT?dQtsGdE~|JQ}Rt$9Dknz#QYE3FBY(JDb$8#APGblk>P>oU(XG9nY=Vq zi_D_~4`T!zK*`jkl5Hauc4956$;Qh7LNst|I5?Op<-6K9hY_9SpRQkW>3h`gw8Mia zs183@C@&!PK64U~<^g1gUFETdCco>TfFZxc%!w!nW@KQ%Zr$Z(_9e;mOwpE<*CPdX zxopNTZ$e3Igyqa{0<5^C+5RkY>z>&x&cgM#f?Ek>N>2{dPB5Ct;2A`pj{_KmTZj0Y zI&_RLzEziTs^)*tSq6~wvs##4I+z!bEHsI=s)cuU)2c};4*#r27t6j=z;AJSm*yM2 z73CZwD;WO$$jIMjX9I_{g>cE^7_Vi-&aZ^36#UI|L?v#zX@qu(KMc`3v<W&g8wrYm z%R(OsWlVO{aofQ`i7AuFZvg;nDM090Q8lSflguX-JGVecf@|h=RaeFs+`_<Ur!HWn zPN*2fNUv@Mi@3NEzFk4Sq864<_#SIw<ZR%gM+}?TH7E}URx?CuAiXq%8I>aiDuEk6 zo;$N|4WR|G_#59{BQC%;m##EAkm-ywMZ8j;LW&3Rs?m9hS59YcD;r=4xm-Z+bFL8{ z(Ou@l%&J9)nQqX_tAnKE=8#`!Bzhk?;D(z@Cq?Wu#Riipo^)0U!LAL7i5$?~!<*7T z&Hs3cdmM)^Xq<}ybw!w^{CH}iyww+~$E#{nJk6NthbEW4M^F9vh1YxImwBzw@URgJ z?ze!Z(HqW~3nMVD2pEu|(No&5*N0@3K<R67$?6!JZS~c@a=g|GcloW)1Pi~aJ2MY@ z93P3mUj4}rIr54%$&TvSBJJr%)Q9*_3i7J@MogmE*dbbQP_D!|O?G4RzY*0`%K=eK zzhQ><p$JIB7hmO)7BlW<if|7JQ3l@!P<GA46^f8ELUZl;R3pG5U!D_jd3(qob0Q=g zg&o;pzgQpGVJifpVfAehxmSlMeC=WCOWTt{k4ec&r^r+-5ZnRiV9fA^9gvopC2_bb z?5Vs<J-x`s7oH-iX^VU7pwf}w=>K}HTb~<_`yOr9hTdel=7UevQIa9YV`SM(rwy=` zc}<Axo|(fR0|0@E5nahOy03R5S(o%}QZb2|{s+lA$B?)iUZ7n3jdR+7A_CJMG{2XN zJ&!u4TB#Za5&YoG(1UW_fF+KOSx_citAthhqa3>5uFn+OP2@yuM-nUVH&ml~``9l{ z)es8cgRkqQE%@W{O<P)yGD*+*nz@PL`9|1~ThMW%H(-R?+YxhYiOhpfzM=A01DBI| z0x=>;GnO!ASpgPOde4`))W|>0DJ`%L;D1@N#$GFFIsUYSJGiw)cm%~H&gvO@W6v<l zn66%`b)p*Deq8)5=og6cdp~dL!42<xE~B>)${~7ryF%goE>~LkEDz}B^f)vR{igFb z;Ezg6!Xq_7sf7mxMVtfus+U8<;6nYMLjK~<hxA%>(fd;y1HKF3NB(2{E!hAA19-{* zSik0=LegJLHRrD{&c8}FP*5hoi2$m<bCMaTOW<FXVA5A5nDoEq@B!ZhGXGWD#R5s7 zBY}p2Z~t0>fg~_cs6aAQ0$@!b+FvLC*733a%ZUbXIgtGCvgbhIzpZf4yT7e}kO;<~ qP5z%04eSl#`upi2hy+>yh#&mV4*w0poBwhS57Z5&K}h%iGx$HwiAHPy delta 7793 zcmZu$1yCJblYO{6+=3I_-CZ68cMt9mELals;S!t|+}%CF-JOTK1a|@i2)^X|xBmTi zYwuLet)A+--E+FnRL$wqN0@*o7<4s7ICwk&GBPsYw1d4Cog4=4b%(IQ(1C+Eu>5Xy z<2pc$;oRc`dEDNv5fOyZ&OcW5@D*l0Sv=el5IP*0PlvUhKisbwRnOdYFtwA}QhyKx z(ICeoB`h?@^`o_0D!veS4sfN`*Cla)kT`6!jFp@7+U9>1*dr{Xa%6EQgu3#ANbK?Z z7k{B^jlru>k~LR(^j9c)1c33kO)3DSAwSWpy6Q6YLk&PC(J=?MsaI1Pjvh-yJER~K zd^vj#6l5_w)`JnlHYlgfh{9q}VB~ZF>6|z9JF^)cN!-sG3*z0*<%9c9S|&p`r2;wb zUJk*o=wni6f^f^pBq<ADF5+0#i9^&+!p@YqaAs%<Tpq>xJI@+JeZhvu->p<5BHcI) zfmUl6-j_(5mkGn>$K)aihwNuU!^l6%SyF468-M@se|+8)VKW8E&S5`*3+%;d#N@dW zpftHtI}QciIpq~*^vj*e1K5WnF%m0{OMX7EjZbP8TjtCTD54_4U_Z<I*CHSxe~LFM za)bc@)?fjEzePd$cU2(Eu+-owr$7!o-wj=?I$g%Mc$|d;O)TDvd8tab)(Xw2!0*Z{ zL{AUe<D`?vGorT{S#B$e*2NuHF*(Z2GCyS{54_(tRT#K1JjPyn@?3~oq?YK@Bj7y~ zMTzHQS{4?<IvQ|fxnULkBC(&tqwFO)NJSxKC9O|xv6+|jm2mBJ78C)?Kd%MVFkpb9 zHZ3J*)naGYpq+v$u{WJXKX#Ju#)?Fk_hsc#+K*BY6rd*h3ZpG`rvU@{QDkm|mQ`8{ zuGVYC(1nKSnzo`G7P%mSaEc8=lPdAgS9cFv2=wa`b#CW>V4c*3s>(=Jsgky7fSMhH z`Wbs>1hO9e^o&~aWS3yhNEG5wqXhm&M<@fj)aR<e4RZZjIKng>cjh6Tqh%;OJ^Y$N zoo$NsY6}pL{%1;#q=kf&!Ab@G_5}R42*n8Ex6zrCoYW6!(RKDGWWpaeh@N2n!d^$Q zr>XS{yZnE{{%_Rv0RORYA)fGqf0<DaLQwjLBJ~M~U*P|Ff(}$s`G+*d`qbc2r)3Ge zwOi(Q^++VMT8a3$g$2?^-=zY5x;Q!-imyf7ZMrB;HZE`zLXmM8-Q%MvZe7lr2gT~x ztIw<?`TTWk@n@zu3gGb;BGmMi&Xel9brmWsn9M?Sux42Gym;^2_1~3(w$c-$-IW$f zs7Br5#xM#tODa{?{OySjdGNuc%eaoh97WA;bf|$1b|vTx*^0ahdylNvk~6OPckcsT zy9LlX;gJ#CvdYFoYRQ)O3hzkt-92_WH5H>HB*(koR|l}9H7B6V^+xqj6I6Y?$8a0l zf!A;5zvPThr)vg%f04N13C(&}ZXCUJ@$M&Xo6H2-3AC;;cP-C29YYy>Y0;2~_EMo- zm~x@&PK)}p;d)D0BY)D_;##YI;pb_)cz)yzU_jJ=XDU|7&a%8GeTbWK&a01lI^s5= z6w|Fj71+q?|7|K1pEJ|$6kw-j<#)yQm1@)ox36ea%)QxVk>;d#RxAd=(E~c!BMP5k zw_Ao`-HgTg#77G(Y8wWRFm&pCV#mo4s);hBHM2zD_VW!gh2fW=cT0jP9Wm5=tjd_C zO5H<~2me?lo^(P;z4bC$9LV1PG**MlzvzNHB4pU}1hY2ucz@%~YH0EWF#!qwyD1?T zlF>!0t1ILJcs?Vz14ty**dk4$7JB-)%1nBDd}d?S(jRu5<*~-p|8mlj^W1}YEq=Vi z{<pulJ%VO{uf27J`Y&4lyT2gD`ULeI21EbqrU)bHe|>qU%n0iDj1OS{>8L3)T5z{h z4+mQNIdk5sENYlt8H26GvfVbvB2vocw4A(Qe?Uy92}6#&0VW(wW8b9T`JJc0v#X8+ zM-8RPkRLk)w!NtEqFl;v!sMKya1+@NB}s(9HIij8zts$qyh9zyb0+AFs^71-uTWbB zg}E(xmtB((7?jdsR!EFGDirr_58QWFL2S7c<Z9X`0u6qFs_7F)vllF2_^v|WzhliH z8m6Z09&D=cG$SP|O-6$VG#&bo1b;aORlVgn^WrlFrdnzIaNCSpBQMW&bPiaSHX=JF zK}IAX_#C$!`GlS6xEAP8Jij^pUbVE)pv;Zc3GFIX!`V6@7u{ftBc)CoL6@W$MfCD< z!oWlD*hDD!Sg2LYdb4?S@i~wm^C(lqV<{CXM2OZ};ADB^c?lVx!*s1%lusuk7r96L z3;(wcCU&7$dK)ABANcEKEJpr?IF1z!_|SE`A?aCMHDEf{;1g|S|K)tz@kG<9v7uF~ zs3W~mslgpgd|WU|!X|=5d8Ss`p8DRt$e_rG$S`1&YPiTDqJTzCtW+U=EAUi!zgJKX z<N0~!^9JZP7&sCLc~`vT^cF{8tg!o6!Nt|uApamb4Go6jNv(ed4|%xl<L|Q#@Uz%i z^H_urj$DBTvUF@F4;A_EU~Vcg0%xD2k93O?9WE&w7C|r`a+k&NKHaLs)Qr8x<%vGC zmXs*7^)TCFNk{Y)4O^-ckhb^Ur#EJixR{FC#+-S%a+<ARwioXW#SIengyR$!{+%&O zsglrN?E)qgGjA1(W{h)sgfdSe!5`x@jA8~g^(P2+MEnHg)kWmFnBQsQQ`?C`zA9AD z_<dVHMGmt}SgtYrkS!3|!^69wU(g`7*D0IpRI5h0Tuh#bS+oU_^0*mIJaS3LS9DhJ z6G9rLtx2Zc6mE|+>k>HgR)A>9$5oMQF!HT4h8%I<O1_|vi}SBOHYZ||gC)1uMQ>Dy z7g`S6-i@{?8>Ou~4>mp@7VwL3#a)P!7x#+SNuXX60>h>u0}tHpk#L0~+v^8BSel<_ zbt`x3b#%~-`50y1aAF*Bo&4+~;*7bsl!ntiY^Z{9EsguUH1}|F#MOHLp$h&Q6uZh{ z=I1$fm)Ued>t`C@hCC5&173zVo3z+w|GFwt;a)u>!RfLJnGD8|y)39*;OHOLklq;o zjA<7c+8&2eR=VeQb1FOW2np?N8^R<$6gEMGliX=_@_uQmJQDF`e<Gsih8(cR;-GU5 zf?|57w%svXktPf8BRw;HlGCEew8Pp}_D{`p=layO58Y!oKE=+Ug5$gW1uj94POD1O zkE7$APx5nvWi*X1UpaKQirLP!?iFe{C~zntx>|2O_F{V|ZzC@1YWV)#rd01Vq#{kU zq-HDiobuT++yGB&7fi@ji9tWRI16~}Yrrt!81*6$a?>69XGVYIped%(nw#6T@2B-- zd#P(yq4kKNeTQ9)08T(HrKVQV`fybC#=2iaw@?#!=3F8v^`fR+3-DS>hs18t)Uc^X z&Ckqdt!`yR%fh!(A(-(c&O^+vMTz|ivWnfH3*oon8w)}c?1q)Km47<?*l6gdi4I2t z?sv*Z+O3R-$iG`dW;=tacxNe0ICbX;WfO=tJ20E7Uzl$Ez|wGf<@5Dkb7?;0u9V`~ zd(^(UUn>+W69#XSsTd9J6*L5}txt2F`JI(erhcF61zKG4%%-_~7*%s;J{4}LfeRp( zLeC9V1C>zD*0d1&>4ZicNeH|A3>u0x$y;x~EvY+N3Q1pIQM?=x(=$7c^4^N&DLgaw z+E*G|FRwvQ29JJRg`7JHv=#?|YQt2*GKAubl~k^`agf-AEIL#}$c?3(p>~8`v)v=t zP0{zmj+x(l&{9vlhqGxQ9k<H(rasdGwv8(-o0pVYdj<zXcjJ{}Ey$~X>Pwwh&jq~w z?0g1Jru_Zroo>{G6LbY8vP0x=kOWZ<S+YG>Z8Vr(`S%PoY|VGeZnOr@q&X(3X0+UE z@V0pmv<W0WO{i1Na5rMc3OUm=7MY9)lxq1|el5p+Nq@fQOLSK;5IQINjPk~XIM$E0 zg<lu*hud9NGp5UXi=(=WR2=;YE?!bo)wpIY8mSWoQJv4C#BtT}$?tE5$qMUa!|r9X z8B8K*z+3)E3BMAVPK+N)pZji^v={vz&r|h;yeqvTG>+oo-Cfp4rv~SxiCwLFhVX}i zwYh35@E#BO5`oH9)VuaqoqIq@dnrN*l52waBin72T-3f=G7WWqfnU;i-)UAk*lM{d z@B84WJkhB%W8|D@li~sQix~P05)?hi5;Jf;;4iFF8WFqLa+^`7SYcaqVF@roe?I=G zU%{p3Tem}0QcXLBjch}#WgMhR9_uzfrrwpxJ6?>w>pMfi{4K?8nska44?DJH*PN0N zZ2pLYSt}NM3cO;*J-DnnJaJy*QQ}&v`NgC3b$thpd$~HD(vG<uzQ4lKQJ3b&prDj{ z8(5*#mlMPqmPyyry-K+rvnV5u^wk(Td!Td%KN@N3z8wXor)ir%Hc2Q>klkT?!y0CA z%jrag3Q`Fc(C+(vM@bqlAu{evi9Yq7vyi%US{xgVoE<QRpO6S$^TUXFI6lTU8C#Fr zh$_(1!wU0^D!%Iw7Zb2=Om=>2#M4Mb3>JLzlG9mPR->3CUp>JcSYkt+h=uE?N__q- zHQ%_KJrliTxh+9NOHG`XYdE+6v_DbyA<pjN+wRt;+RiFL8Tj|aW%jspcoe>Mllk!8 z9SKJ2pIh!KV!Dp+<j}SC@Rl7>b;~51>?kvh_SFKfMqhV4dQrEBgQl6x0zC(fH871) z^Ks5C(E-ML{aSO%7c)+qT$P*GtT_3~#!hr#z))mF{|_OWw}z^Xp;OdQXXfjN1hm?) ziEC>l;t7{TiBbE~-K@}0sQPNZy%a%$GUDi<i4OiLe2ghZdcxnU<d(^OTpJr%+I|#a z#JiJy@p|nE)erby2lk~s*992)VETTfvpT&VMIp*J`x3f0{`wOvD5bz8xpst{0zTPQ zA~VUjKr%#pmcSnc#`LcYpEqu!c=4ep7wBkdk=hr}GnoTlL>uM!dyOgxqW%eQj-3!; zfhQZw&O@Lop~Y6q{W-4v>x+)Esx3XHAFX*~aR+td{Q@r>YDw(3Z~6Y*U@uiN_oEiC zIXH$+(V8SpKiS^298_PQcG}#6KwP%%^~@Z0ICt4Xr1=h+gQVFjlok_2#1;H193%27 z^y=q~)&i?xO6XF=`}T%i(56mH4O8*yJuc%H&&nwul!(#wE4iBd(+<_o!l!HG7^|5} z?@!ZQ)|hnPvl`Osg=o{>gKPJCm&@lW+l72cUJK)WZu-Kp|7rhYXZq)dCbu~7gRMqI z9<T{Rx8~M@b<9L~Wh5B?KF`iw_Jn|=ED8$HvF|<tQf&D@tGmaIGH^-!$V!dC27dj+ z5ULH6|HJfm_uwpZXgqp8d^K!7_W)?%$2OScPHYd8neYn6!lJz#9CDo)6ZaG)i@6u7 zZClIOyZxTB@dSXLLZj17^kI9af6?7EUk`zJYF<IIsmoAb*ihv|6V0d5W$T)*G=2U> zardsQQW9g+DF>n))0tTuzM2mo5cOm}ML$~%8a^RH^=RZ|%u>*BtewD_obs++i+?iy zNGUh<2wseshTeS)2g|_PPcUU>akuGFz9cd#KVPyUe=|?*lgz=xLO}jjcM6rt!HWwm z!y|(&T#RIaR|t?`Tw(o5D_Rig_Ptk$KD3<*7!=TaV#*etTIUF>rc+xjSzFonqryC> zQQZxOp?DDsrT@c6N*q+V;gQdZ5;S<iW+8G6Z&4B%1f->EiNQwU!5ZvnMd`nm2GRrt z>deQhd+n?t)TEH!i?}4*lOa-l(q69u?Mm6@>;mND_zLsPgpP+OV#k`d!!R9wlI7+U zmZL)D=5_RyLX-v#(r~Q0s(l|SWdIbVe3!;CJ#3t6DIRh2**zj?Xoy=K1c<G9F!%}L zZwICX)xF-nRs+G^8ndGuwE~vOm;{@lcuQuxH{hK?)l@n+X3?jvplDc}PIFjhVi9a) zG-L;rh#}l~*dthdlWv-p^%E0wZ`NOLe(4%Vkh1CuWwoFbKTCJ8P;)=+_w&MX&#dF7 z9z$TZX;PE=;pG3w=httru{qDxfnqweyl{qzgG#zwsKLhqPJPpXwDCSHtZOE7iRA~_ zvdxq+b#8$=D^BUq?!&##wuc%O!20R;&#d^;0;nG%n>{PJFkBjRTB;n+e=(f<m$pAO zK6o~+40@Jt3Jqqq^_C0av&3-kuCzJp;)Ydb;2PhrGP3gcYm-f6a(zWp(-*C_)x+ng z^ExW97z9JN%e!o^_f<TW2c56R#2x2WLj~kUKh+R@qfaW&@1ShcS)5F{cf8uTq@DU= z!o6dDr?gpRg{awhad1d0rS<~7W8ElE+px?=`IK1Q`X-q!{P7R%(VETp+(ed96Zh@= z845zM;sYpRl(#3q^)hs6zi{_nKsGIgdC(#i%>xWN=bd^ZNVQ71>{RE*>}(;>)L_-< zKvon!=Crgde3Epnpgf&^e$(hYP@56*aRLj29E;>_q1n*PnZuYLa%+`FLmb3=gzBg0 z!GjlLwQSAXaH0?;J$2tm+RJF3Y16Kz>NB-OX+ke~v^R-ZZsAzs_%(#le*zBlIQ5Oz zB=*2{sj)R2?GjQiZ@P)Do)~g2&D^Zscbk*s$TQnb!-LLndlTwcW#I-Rzxx(vtM|vU zShrD3ed*(|`x?c|tB&&`TcFS9Cx}yk5@j3vZT2hn5*}FxUge5)jA7p?JVjXs=A2_5 ziOMw=R&bkM>C5c+ZFUUPuWVz4-8bjOtQ@%D4)sY8%iEb}tt}Ns5>tT)vF$#glx-_o zzIQ1M_Lt_8jl-cR%p5r1;@^hLlFF~PV((TR)$R5ks{JsXvu97nu+24FHoUQq`i*j8 zC+<zKHVP22L7#MtQB1(#=5*q3bu=@YQZ_*;or@X}OZqB?Xlad}I<BF>9r=uKWaO+4 zW++}Sgmnw}v{JTaXUd{>=A|elxU1vJNj4^TPU?&34ZXTQyxZ2(&N;tM3U|FX7VyVs zXsSdN!<RsHZ(Z+EQ)vVaeu7<V&~8+ADAdlP<HBX^tJ6lrH|I>$nt#t%*|At)%l19P zyfcE%CSoUiolr-k;sfpdI!*ukYUyeeuw61Kiv`Bb@8vLewbcrQ>=G4cF-P$Q@pBkI z<`eg8R2^qjYJqlp&&pxOdyOd&pU6W?z@;W9cC!Ihe$D)kCBvPpk+Pi0tx6AsPbR3r z+}SBrM7OoKiyX|IVNGA0KS<j6jnf=HZGfLtr<0f{$#2{4%*M}t6L8EVf4BB}0he0E z9fkPI(}YXMbE%e+ruN4cC)*r^x|Av*4P((`<le$Zl$>i)YT@LSDg+R)3{<m7VPK3Y zC=g3a(+hGO^CT`+xN$$s-5-T<6=)O9Lc}E1b6V-1s)lv;_WzvGt)nMbOpl?SYiQdZ zioRuuGcB7qavsuJ(oPe7ddFS04hEMr*xqCo1*rp1Juo*;D9AexKi%FY;pra8GM~z3 zyUTE<4~9V&(r`{A`}M{{ancdl8yt^^Bym$Ybj2gvQWKUjipP2S=rF3sfwgjO+BQoy z;f#h}BvNhS4zed@Y|3}N2kv$Bt=8K*o<WzIulLyE!Ac=nPuf)SCa*NGRBZtBBCJ+@ zM1-rgO9MY4^9(lgY~~OIo8CnWo_@=ax3Ug__BoS*8>)H3s6m&zv<qRf=~nLIP_-J4 z)2}0XbPs%1Bylw(ZsEJE!SPb-V7&%aJ))gjA@5i$G^I-b8@@`?e*ehXO-g8PFP$$H z8XgoW?NSp*e*>3-c>@H4T(X+1yYaLckg7yvSh#@vqKiiLA&gd$9T$@RRz?r?*cKzT z3m6^g)9)m{;jY+VFL+r>HQC)WaBiCwVl4`DsP7~2x?ylHiVIYkH}!;i@Kv`4=?_rV z>}-ag!c}B=ehIOQi|%?O`fG}T$JCyrp^?(%z+dQKHvads3(F|@tB;te*@M6CUJ@xj z)MC>XC^Xk+59A3=OTlL^rnh6;&V$ikz}kt9T80T)8Qi3(8Cto6fj6dDqeGS2Jl753 zgx=00gXAY8Wla57;BDed%7{U4e=Q(zar~K=0|_F&yz2rqqKw0~h|-z*cXCCU$-_D5 z>K}ee1o=**08_zTp55R9f@<oLQN%E(^{)Z>?LklSUuAUB+;i<4CZYFZ149eN(lO!G zob<4z;NJl;3d7;$x08AP2+oKp4_>?Kwe<=Z4gz>S4{_{V+nnKI^b-5G(3gh|Zsh8E zpF4xLY`lA~*FOm+jx_f85F;s5CSdAOx-qA+Oq+nvRvI{aIzOeSj}Gvu4*Asl#2uHq zwPA`v%>$_Y6eW{ILcyI`))2E2Ko)i<=2okfgaRCMwao?jA|F{Be)PJ-x9y^mXLtu^ zVy<?**h30JXv$&3QHudi5Mgs?ir}ada<SPoSj>Ex`G$jiEkQ9n_B(Yv_@N7dKwgTI zEoGU{g9Hr1i~=A5i?|YEkn)&G^9WiB6LLtbi2T<V-k)nW=#~UFERa0aJ#|K`y}`1& zQY_kLO6d^)5)SuNYJdR@-ifym^1JShPO$Y|V%X!2GF@gQ?ni_5#kmcM4~ji1yP=F? zcAOH7|3l83=Tu%wz(T5kAK1kz=K(x@>9CsRZUuMpG8{xP`opq%Hs^F{(JOg$G@RuX z(8dpFK^p=F1`ddC^zr0Gy=+e+#;nysWyDd2w+MjUuzW!>d_hIC%9R`ld^K_C>uw5& z>%BD7U#$^}T8M}VjsNHdi!xDYm;+F2kngtee)R*;XaJxHPf$clJ-^KxhC+V6Kj=0u zG~gKNeeCQv+C*|WIy7-_(_ru4Pm=h&)1I%tY}C5hL<}Nvz`UAkm<)1qi0qmbogcJ( zSKwSELAKSg7$2bGoJ;uF(>BD8BX{<Lq4}xd2<;2=q}OWXGznWIo?+}L<Ze<h@5g*- zYNOrHNm*K@jTJ+A*;!g^6-PIjKlX0=5657FP4AxFQrR%cdkN{>Ee7tftEP`@N2qVO zUM1<UdU7M<RN!1*EW*?`ey}t%<o1h66hSLy0FYYm$05nc^>uNE>A~Ttq+33{FnfA) zUYsypZL#N0#M`CmYS2~6-jd<oLi(r|6)p+S4qv$NnDkuO-RSkU?jPZ6YKlxqjT-ns z=m2_p2-WV)-JER?mAvxIzMe{#xT@~8Ku8L6S=QV=+opt>*npkbC`nF0)|ij=r?Bw= zN>X6@ik!%$?M`Np$-9NtX4{j8SL=y@)}XS=zx!Dt`^klDRCX3VKBz0JIGoTWeBV5s zpvmtkuXRl)jOtGi(wRVF__9NhV+W>9(<A|Y4OoUztAx`gqJcNs-q+E>rznJBZRiWI zah3j4`fZVjsC=K|cVkfnmy@W!Bmbh)g|b=K0dK!Z*E2CFI`H0r8CBff|I~zNmHk2# z>shDAIPmffaZaV}!ajVr7!ij`0t}Z(TyQpz(1Sb`Gf_zeR#Ry~5h5mnizPT?G2FBe z*<{%NBaVP&o}i^awJIOhx%zEEH~XrSVK$6~Yb|C%oFW}mae5>Gb{`QFmlh?g5#0BF z<*>~${qQorMNB}2grC&dEQ|MC(p$CDJQQ}WT1EGT_}w%Br?I_sOn#f;CxD=A=O$+S z&ef&aL+4@7Ok}6TkD_DTwG|xm*xK|R&g6(mkVp7HZrDEojn3_xQQ7-U&8lVh50ou~ z=l2&D$%0;ezw8wIwLXFh^UKLFmxZXuoVTe7HR6@JKO9Q6V(#@Q4}@+!iT@RTy`Whz zh4`<cZyC(%I1L6C5Abj0U2oU*M*84&x&wXH<$-^vJdh?Y8syjMj^5uP9Aw9fALXy{ z&u9oj<IVez7H{ZH0%HRC;!X9BmHBG%Lz=yr4gY#d(lpkK!2<vm1ONc$-vj@>LJ<Lg z&(5xv>~8L!4pwe#UmP9&Z#Lrs*~}O!005U30Pvdde=Hb?gb$76-vIwPMZo$G4*)<z z|GxuRJ3G5uxpMwL5g>&=!v7?_?IZHfPUS0#@%PmK5yv5pzFZW4ACVd1-bKCY<%LK9 w0Pg<^BnIj5rF#3<=Rcvv{$D;oD+r|(E`gdN!s}}T02r^A4;%n+?)BIDF9x834gdfE From f893a21b78e65bcba37ec0ded09af239cd31d005 Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Tue, 16 Jan 2024 16:05:27 -0800 Subject: [PATCH 942/954] updated readme for windows (#1302) --- bin/migrate-files/README.md | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/bin/migrate-files/README.md b/bin/migrate-files/README.md index 59b85fa8da..0cc24f9f40 100644 --- a/bin/migrate-files/README.md +++ b/bin/migrate-files/README.md @@ -135,3 +135,35 @@ python3-intel64 migrate-files.py issue ``` The script will start uploading files from the Oracle database to DELL ECS. The upload progress will be displayed in a progress bar. For Planning and Issues documents the script will also save the last uploaded document id, so the upload process can be resumed from where it left off in case of any interruption. For Application documents import it is responsibility of whoever is running the process to specify "last_imported_document_id" + +## Windows + +### Prerequisites + +- python is installed and configured +- python virtual environment activated in .\bin\migrate-files folder +- navigate to migrate-files folder + +### How to run +- navigate to migrate files +```cmd +cd .\bin\migrate-files +``` + +- activate python virtual environment + +```cmd +.\venv\Scripts\activate +``` + +- install requirements if this is the first run + +```cmd +pip install -r requirements +``` + +- run import for application document (for other options refer to command line documentation of import command) + +```cmd +python migrate-files.py application +``` From 6cf33fc6dda6047aae9adf69361d3e493cdc2f24 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Wed, 17 Jan 2024 11:11:04 -0800 Subject: [PATCH 943/954] Trigger Deployment --- alcs-frontend/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/alcs-frontend/README.md b/alcs-frontend/README.md index 09764d5a88..da4a23f610 100644 --- a/alcs-frontend/README.md +++ b/alcs-frontend/README.md @@ -2,9 +2,9 @@ This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 14.0.5. +## Run alcs -## Run alcs -Run `npm install --legacy-peer-deps` +Run `npm install --legacy-peer-deps` Run `npm run start` ## Code scaffolding From 4b881011052f5008e1ac3a181727a655d2296e1b Mon Sep 17 00:00:00 2001 From: Liam Stoddard <lstodd@protonmail.com> Date: Wed, 17 Jan 2024 13:29:35 -0800 Subject: [PATCH 944/954] populate app_decision_component_lots --- .../applications/decisions/__init__.py | 2 + .../decisions/app_components/__init__.py | 1 + .../decisions/app_components/lot/__init__.py | 1 + ...plication_decision_component_lot_insert.py | 143 ++++++++++++++++++ ...lication_decision_component_lot_insert.sql | 9 ++ ...on_decision_component_lot_insert_count.sql | 6 + .../applications/migrate_application.py | 6 +- 7 files changed, 167 insertions(+), 1 deletion(-) create mode 100644 bin/migrate-oats-data/applications/decisions/app_components/lot/__init__.py create mode 100644 bin/migrate-oats-data/applications/decisions/app_components/lot/application_decision_component_lot_insert.py create mode 100644 bin/migrate-oats-data/applications/decisions/sql/components/application_decision_component_lot_insert.sql create mode 100644 bin/migrate-oats-data/applications/decisions/sql/components/application_decision_component_lot_insert_count.sql diff --git a/bin/migrate-oats-data/applications/decisions/__init__.py b/bin/migrate-oats-data/applications/decisions/__init__.py index c74b8031b7..6a4e1712ef 100644 --- a/bin/migrate-oats-data/applications/decisions/__init__.py +++ b/bin/migrate-oats-data/applications/decisions/__init__.py @@ -6,6 +6,8 @@ init_application_decision_components, update_application_decision_component_soil_details, clean_application_decision_components, + init_application_component_lots, + clean_application_component_lots ) from .application_decision_update import update_application_decision diff --git a/bin/migrate-oats-data/applications/decisions/app_components/__init__.py b/bin/migrate-oats-data/applications/decisions/app_components/__init__.py index 944d5d4d84..5089c7c2d9 100644 --- a/bin/migrate-oats-data/applications/decisions/app_components/__init__.py +++ b/bin/migrate-oats-data/applications/decisions/app_components/__init__.py @@ -5,3 +5,4 @@ from .application_decision_components_soil_update import ( update_application_decision_component_soil_details, ) +from .lot import init_application_component_lots, clean_application_component_lots \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/decisions/app_components/lot/__init__.py b/bin/migrate-oats-data/applications/decisions/app_components/lot/__init__.py new file mode 100644 index 0000000000..cfe22856c4 --- /dev/null +++ b/bin/migrate-oats-data/applications/decisions/app_components/lot/__init__.py @@ -0,0 +1 @@ +from .application_decision_component_lot_insert import init_application_component_lots, clean_application_component_lots \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/decisions/app_components/lot/application_decision_component_lot_insert.py b/bin/migrate-oats-data/applications/decisions/app_components/lot/application_decision_component_lot_insert.py new file mode 100644 index 0000000000..f6bf4ffb96 --- /dev/null +++ b/bin/migrate-oats-data/applications/decisions/app_components/lot/application_decision_component_lot_insert.py @@ -0,0 +1,143 @@ +from common import ( + OATS_ETL_USER, + setup_and_get_logger, + BATCH_UPLOAD_SIZE +) +from db import inject_conn_pool +from psycopg2.extras import RealDictCursor, execute_batch + +etl_name = "insert_application_component_lots" +logger = setup_and_get_logger(etl_name) + + +@inject_conn_pool +def init_application_component_lots(conn=None, batch_size=BATCH_UPLOAD_SIZE): + """ + This function is responsible for initializing the application_decision_component_lot in ALCS. + + Args: + conn (psycopg2.extensions.connection): PostgreSQL database connection. Provided by the decorator. + batch_size (int): The number of items to process at once. Defaults to BATCH_UPLOAD_SIZE. + """ + + logger.info(f"Start {etl_name}") + with conn.cursor(cursor_factory=RealDictCursor) as cursor: + with open( + "applications/decisions/sql/components/application_decision_component_lot_insert_count.sql", + "r", + encoding="utf-8", + ) as sql_file: + count_query = sql_file.read() + cursor.execute(count_query) + count_total = dict(cursor.fetchone())["count"] + logger.info(f"Total Application Component Lots data to insert: {count_total}") + + failed_inserts = 0 + successful_inserts_count = 0 + last_parcel_intent_id = 0 + + with open( + "applications/decisions/sql/components/application_decision_component_lot_insert.sql", + "r", + encoding="utf-8", + ) as sql_file: + query = sql_file.read() + while True: + cursor.execute( + f"""{query} + WHERE ospi.subdiv_parcel_intent_id > {last_parcel_intent_id} ORDER BY ospi.subdiv_parcel_intent_id;""" + ) + + rows = cursor.fetchmany(batch_size) + + if not rows: + break + try: + lots_to_be_inserted_count = len(rows) + + _insert_application_component_lots(conn, batch_size, cursor, rows) + + successful_inserts_count = ( + successful_inserts_count + lots_to_be_inserted_count + ) + last_parcel_intent_id = dict(rows[-1])["subdiv_parcel_intent_id"] + + logger.debug( + f"retrieved/inserted items count: {lots_to_be_inserted_count}; total successfully inserted component_lots so far {successful_inserts_count}; last inserted parcel_intent_id: {last_parcel_intent_id}" + ) + except Exception as err: + logger.exception(err) + conn.rollback() + failed_inserts = count_total - successful_inserts_count + last_parcel_intent_id = last_parcel_intent_id + 1 + + logger.info( + f"Finished {etl_name}: total amount of successful inserts {successful_inserts_count}, total failed inserts {failed_inserts}" + ) + + +def _insert_application_component_lots(conn, batch_size, cursor, rows): + query = _get_insert_query() + parsed_data_list = _prepare_oats_component_lots_data(rows) + + if len(parsed_data_list) > 0: + execute_batch(cursor, query, parsed_data_list, page_size=batch_size) + + conn.commit() + + +def _get_insert_query(): + query = f""" + INSERT INTO alcs.application_decision_component_lot ( + size, + type, + audit_created_by, + component_uuid, + index + ) + VALUES ( + %(parcel_area)s, + %(type)s, + %(audit_created_by)s, + %(decision_component_uuid)s, + %(index)s + ) + ON CONFLICT DO NOTHING; + """ + return query + + +def _prepare_oats_component_lots_data(row_data_list): + data_list = [] + component_id_counts ={} + for row in row_data_list: + mapped_row = { + "parcel_area": row.get("parcel_area"), + "decision_component_uuid": row.get("uuid"), + "audit_created_by": OATS_ETL_USER, + "index": _create_parcel_index(row, component_id_counts), + "type": "Lot", + + } + data_list.append(mapped_row) + + return data_list + + +def _create_parcel_index(row, component_id_counts): + component_id = row.get("alr_appl_component_id") + if component_id not in component_id_counts: + component_id_counts[component_id] = 0 + component_id_counts[component_id] += 1 + return component_id_counts[component_id] + +@inject_conn_pool +def clean_application_component_lots(conn=None): + logger.info("Start application_decision_component_lot cleaning") + with conn.cursor() as cursor: + cursor.execute( + f"DELETE FROM alcs.application_decision_component_lot WHERE audit_created_by = '{OATS_ETL_USER}' AND audit_updated_by is NULL " + ) + logger.info(f"Deleted items count = {cursor.rowcount}") + + conn.commit() diff --git a/bin/migrate-oats-data/applications/decisions/sql/components/application_decision_component_lot_insert.sql b/bin/migrate-oats-data/applications/decisions/sql/components/application_decision_component_lot_insert.sql new file mode 100644 index 0000000000..d451316baa --- /dev/null +++ b/bin/migrate-oats-data/applications/decisions/sql/components/application_decision_component_lot_insert.sql @@ -0,0 +1,9 @@ +SELECT + ospi.parcel_area, + oaac.alr_appl_component_id, + ospi.subdiv_parcel_intent_id, + adc."uuid" +FROM + alcs.application_decision_component adc + JOIN oats.oats_alr_appl_components oaac ON adc.oats_alr_appl_component_id = oaac.alr_appl_component_id + JOIN oats.oats_subdiv_parcel_intents ospi ON oaac.alr_appl_component_id = ospi.alr_appl_component_id \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/decisions/sql/components/application_decision_component_lot_insert_count.sql b/bin/migrate-oats-data/applications/decisions/sql/components/application_decision_component_lot_insert_count.sql new file mode 100644 index 0000000000..3aac2595f2 --- /dev/null +++ b/bin/migrate-oats-data/applications/decisions/sql/components/application_decision_component_lot_insert_count.sql @@ -0,0 +1,6 @@ +SELECT + COUNT(*) +FROM + alcs.application_decision_component adc + JOIN oats.oats_alr_appl_components oaac on adc.oats_alr_appl_component_id = oaac.alr_appl_component_id + JOIN oats.oats_subdiv_parcel_intents ospi on oaac.alr_appl_component_id = ospi.alr_appl_component_id \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/migrate_application.py b/bin/migrate-oats-data/applications/migrate_application.py index 69fa2aae76..ceebf193b4 100644 --- a/bin/migrate-oats-data/applications/migrate_application.py +++ b/bin/migrate-oats-data/applications/migrate_application.py @@ -33,7 +33,9 @@ link_application_conditions, update_application_conditions, clean_application_conditions, - clean_application_conditions_to_components + clean_application_conditions_to_components, + init_application_component_lots, + clean_application_component_lots, ) from .decisions.app_modifications import ( update_application_modifications, @@ -86,6 +88,7 @@ def process_application_decisions(batch_size): update_application_reconsiderations(batch_size) init_application_decision_components(batch_size) update_application_decision_component_soil_details(batch_size) + init_application_component_lots(batch_size) init_application_conditions(batch_size) update_application_conditions(batch_size) link_application_conditions(batch_size) @@ -96,6 +99,7 @@ def clean_application_decisions_etl(): # modifications do not have clean since all of them were created in ALCS and ETL is not introducing new records. clean_application_conditions_to_components() clean_application_conditions() + clean_application_component_lots() clean_application_decision_components() unlink_application_reconsiderations() clean_application_reconsiderations() From 4150adebb11b52f4fc12d561b729fbe3d3964790 Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Wed, 17 Jan 2024 14:00:54 -0800 Subject: [PATCH 945/954] redesign continue button --- .../lfng-review/lfng-review.component.html | 41 ++++-- .../lfng-review/lfng-review.component.scss | 5 + ...view-application-submission.component.html | 120 +++++++++++------- ...view-application-submission.component.scss | 28 ++++ ...notice-of-intent-submission.component.html | 30 +++-- ...notice-of-intent-submission.component.scss | 28 ++++ ...iew-notification-submission.component.html | 35 ++--- ...iew-notification-submission.component.scss | 27 ++++ 8 files changed, 233 insertions(+), 81 deletions(-) diff --git a/portal-frontend/src/app/features/applications/view-submission/lfng-review/lfng-review.component.html b/portal-frontend/src/app/features/applications/view-submission/lfng-review/lfng-review.component.html index 4ecfa4adb7..d6054e8245 100644 --- a/portal-frontend/src/app/features/applications/view-submission/lfng-review/lfng-review.component.html +++ b/portal-frontend/src/app/features/applications/view-submission/lfng-review/lfng-review.component.html @@ -2,14 +2,6 @@ <div class="header"> <h2>Local/First Nation Gov Review</h2> <div class="btns-wrapper"> - <button - *ngIf="application.canEdit || application.canReview" - mat-stroked-button - color="warn" - (click)="onCancelClicked(application.uuid)" - > - Cancel Application - </button> <button [disabled]=" !applicationReview || @@ -21,6 +13,39 @@ <h2>Local/First Nation Gov Review</h2> > Download PDF </button> + <button mat-flat-button color="primary" *ngIf="application && application.canEdit" + [routerLink]="'/application/' + application.fileNumber + '/edit'"> + <div class="continue-button-content"> + <span>Continue Application</span> + <mat-icon>keyboard_double_arrow_right</mat-icon> + </div> + </button> + <button (click)="onReview(application.fileNumber)" mat-flat-button color="primary" + *ngIf=" + application && application.canReview && ( + application.status.code === SUBMISSION_STATUS.IN_REVIEW_BY_LG || + application.status.code === SUBMISSION_STATUS.RETURNED_TO_LG || + application.status.code === SUBMISSION_STATUS.SUBMITTED_TO_LG) + "> + <div class="continue-button-content"> + <span + *ngIf=" + application.status.code === SUBMISSION_STATUS.IN_REVIEW_BY_LG || + application.status.code === SUBMISSION_STATUS.RETURNED_TO_LG + " + (click)="onReview(application.fileNumber)" + class="subheading2" + >Continue Application Review</span + > + <span + *ngIf="application.status.code === SUBMISSION_STATUS.SUBMITTED_TO_LG" + (click)="onReview(application.fileNumber)" + class="subheading2" + >Start Application Review</span + > + <mat-icon>keyboard_double_arrow_right</mat-icon> + </div> + </button> </div> </div> <div diff --git a/portal-frontend/src/app/features/applications/view-submission/lfng-review/lfng-review.component.scss b/portal-frontend/src/app/features/applications/view-submission/lfng-review/lfng-review.component.scss index b33599ca72..2a6e031518 100644 --- a/portal-frontend/src/app/features/applications/view-submission/lfng-review/lfng-review.component.scss +++ b/portal-frontend/src/app/features/applications/view-submission/lfng-review/lfng-review.component.scss @@ -58,3 +58,8 @@ } } } + +.continue-button-content { + display: flex; + align-items: center; +} diff --git a/portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.html b/portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.html index 630fd1f229..35ae233b9a 100644 --- a/portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.html +++ b/portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.html @@ -1,33 +1,3 @@ -<div *ngIf="application && application.canReview" class="action-bar"> - <button (click)="onReview(application.fileNumber)" mat-button> - <div> - <span - *ngIf=" - application.status.code === SUBMISSION_STATUS.IN_REVIEW_BY_LG || - application.status.code === SUBMISSION_STATUS.RETURNED_TO_LG - " - (click)="onReview(application.fileNumber)" - class="subheading2" - >Continue Application Review</span - > - <span - *ngIf="application.status.code === SUBMISSION_STATUS.SUBMITTED_TO_LG" - (click)="onReview(application.fileNumber)" - class="subheading2" - >Start Application Review</span - > - <mat-icon>keyboard_double_arrow_right</mat-icon> - </div> - </button> -</div> -<div *ngIf="application && application.canEdit" class="action-bar"> - <button [routerLink]="'/application/' + application.fileNumber + '/edit'" mat-button> - <div> - <span class="subheading2">Continue Application </span> - <mat-icon>keyboard_double_arrow_right</mat-icon> - </div> - </button> -</div> <div aria-hidden="true" class="banner absolute"> <div> <h4 *ngIf="application">Application ID: {{ application.fileNumber }} | {{ application.type }}</h4> @@ -68,17 +38,42 @@ <h4 *ngIf="application">Application ID: {{ application.fileNumber }}</h4> <div class="header"> <h2>Applicant Submission</h2> <div class="btns-wrapper"> - <button - *ngIf="application.canEdit || application.canReview" - mat-stroked-button - color="warn" - (click)="onCancel(application.uuid)" - > - Cancel Application - </button> <button mat-flat-button color="accent" (click)="onDownloadSubmissionPdf(application.fileNumber)"> Download PDF </button> + <button mat-flat-button color="primary" *ngIf="application && application.canEdit" + [routerLink]="'/application/' + application.fileNumber + '/edit'"> + <div class="continue-button-content"> + <span>Continue Application</span> + <mat-icon>keyboard_double_arrow_right</mat-icon> + </div> + </button> + <button (click)="onReview(application.fileNumber)" mat-flat-button color="primary" + *ngIf=" + application && application.canReview && ( + application.status.code === SUBMISSION_STATUS.IN_REVIEW_BY_LG || + application.status.code === SUBMISSION_STATUS.RETURNED_TO_LG || + application.status.code === SUBMISSION_STATUS.SUBMITTED_TO_LG) + "> + <div class="continue-button-content"> + <span + *ngIf=" + application.status.code === SUBMISSION_STATUS.IN_REVIEW_BY_LG || + application.status.code === SUBMISSION_STATUS.RETURNED_TO_LG + " + (click)="onReview(application.fileNumber)" + class="subheading2" + >Continue Application Review</span + > + <span + *ngIf="application.status.code === SUBMISSION_STATUS.SUBMITTED_TO_LG" + (click)="onReview(application.fileNumber)" + class="subheading2" + >Start Application Review</span + > + <mat-icon>keyboard_double_arrow_right</mat-icon> + </div> + </button> </div> </div> <div @@ -100,13 +95,6 @@ <h2>Applicant Submission</h2> ></app-application-details> </section> </div> - <div class="buttons" *ngIf="application"> - <div> - <button *ngIf="application.canEdit" mat-stroked-button color="warn" (click)="onCancel(application.uuid)"> - Cancel Application - </button> - </div> - </div> </mat-tab> <mat-tab label="Local/First Nation Gov Review"> <div class="content"> @@ -126,5 +114,47 @@ <h2>Applicant Submission</h2> </div> </mat-tab> </mat-tab-group> + <div *ngIf="application && application.canEdit" class="continue-button-container"> + <button mat-stroked-button color="warn" (click)="onCancel(application.uuid)"> + Cancel Application + </button> + <button mat-flat-button color="primary" *ngIf="application && application.canEdit" + [routerLink]="'/application/' + application.fileNumber + '/edit'"> + <div class="continue-button-content"> + <span>Continue Application</span> + <mat-icon>keyboard_double_arrow_right</mat-icon> + </div> + </button> + </div> + <div *ngIf="application && application.canReview" class="continue-button-container"> + <button mat-stroked-button color="warn" (click)="onCancel(application.uuid)"> + Cancel Application + </button> + <button (click)="onReview(application.fileNumber)" mat-flat-button color="primary" + *ngIf=" + application.status.code === SUBMISSION_STATUS.IN_REVIEW_BY_LG || + application.status.code === SUBMISSION_STATUS.RETURNED_TO_LG || + application.status.code === SUBMISSION_STATUS.SUBMITTED_TO_LG + "> + <div class="continue-button-content"> + <span + *ngIf=" + application.status.code === SUBMISSION_STATUS.IN_REVIEW_BY_LG || + application.status.code === SUBMISSION_STATUS.RETURNED_TO_LG + " + (click)="onReview(application.fileNumber)" + class="subheading2" + >Continue Application Review</span + > + <span + *ngIf="application.status.code === SUBMISSION_STATUS.SUBMITTED_TO_LG" + (click)="onReview(application.fileNumber)" + class="subheading2" + >Start Application Review</span + > + <mat-icon>keyboard_double_arrow_right</mat-icon> + </div> + </button> + </div> </div> </div> diff --git a/portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.scss b/portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.scss index 500f273a20..90e33d611d 100644 --- a/portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.scss +++ b/portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.scss @@ -186,3 +186,31 @@ section { .document { margin-bottom: rem(8); } + + +.continue-button-container { + position: sticky; + bottom: 0; + margin-top: rem(40); + background-color: colors.$white; + display: flex; + padding: rem(16) 0; + flex-direction: column-reverse; + justify-content: space-between; + z-index: 2; + box-shadow: -3px 0 colors.$white, 3px 0 colors.$white; + + @media screen and (min-width: $tabletBreakpoint) { + flex-direction: row; + justify-content: center; + } + + button { + margin-right: rem(16) !important; + } +} + +.continue-button-content { + display: flex; + align-items: center; +} \ No newline at end of file diff --git a/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.html b/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.html index 7db5427854..73f32fe833 100644 --- a/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.html @@ -1,11 +1,3 @@ -<div *ngIf="submission && submission.canEdit" class="action-bar"> - <button [routerLink]="'/notice-of-intent/' + submission.fileNumber + '/edit'" mat-button> - <div> - <span class="subheading2">Continue NOI </span> - <mat-icon>keyboard_double_arrow_right</mat-icon> - </div> - </button> -</div> <div aria-hidden="true" class="banner absolute"> <div> <h4 *ngIf="submission">NOI ID: {{ submission.fileNumber }} | {{ submission.type }}</h4> @@ -46,12 +38,16 @@ <h4 *ngIf="submission">NOI ID: {{ submission.fileNumber }}</h4> <div class="header"> <h2>Applicant Submission</h2> <div class="btns-wrapper"> - <button *ngIf="submission.canEdit" mat-stroked-button color="warn" (click)="onCancel(submission.uuid)"> - Cancel NOI - </button> <button mat-flat-button color="accent" (click)="onDownloadSubmissionPdf(submission.fileNumber)"> Download PDF </button> + <button mat-flat-button color="primary" *ngIf="submission && submission.canEdit" + [routerLink]="'/notice-of-intent/' + submission.fileNumber + '/edit'"> + <div class="continue-button-content"> + <span>Continue NOI</span> + <mat-icon>keyboard_double_arrow_right</mat-icon> + </div> + </button> </div> </div> <div> @@ -72,5 +68,17 @@ <h2>Applicant Submission</h2> </div> </mat-tab> </mat-tab-group> + <div *ngIf="submission && submission.canEdit" class="continue-button-container"> + <button mat-stroked-button color="warn" (click)="onCancel(submission.uuid)"> + Cancel NOI + </button> + <button mat-flat-button color="primary" *ngIf="submission && submission.canEdit" + [routerLink]="'/notice-of-intent/' + submission.fileNumber + '/edit'"> + <div class="continue-button-content"> + <span>Continue NOI</span> + <mat-icon>keyboard_double_arrow_right</mat-icon> + </div> + </button> + </div> </div> </div> diff --git a/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.scss b/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.scss index 2b720dbcd3..7f9e7fb430 100644 --- a/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.scss +++ b/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.scss @@ -181,3 +181,31 @@ section { .document { margin-bottom: rem(8); } + + +.continue-button-container { + position: sticky; + bottom: 0; + margin-top: rem(40); + background-color: colors.$white; + display: flex; + padding: rem(16) 0; + flex-direction: column-reverse; + justify-content: space-between; + z-index: 2; + box-shadow: -3px 0 colors.$white, 3px 0 colors.$white; + + @media screen and (min-width: $tabletBreakpoint) { + flex-direction: row; + justify-content: center; + } + + button { + margin-right: rem(16) !important; + } +} + +.continue-button-content { + display: flex; + align-items: center; +} \ No newline at end of file diff --git a/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.html b/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.html index 2d6144a06e..d068bd16fd 100644 --- a/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.html +++ b/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.html @@ -1,11 +1,3 @@ -<div *ngIf="submission && submission.canEdit" class="action-bar"> - <button [routerLink]="'/notification/' + submission.fileNumber + '/edit'" mat-button> - <div> - <span class="subheading2">Continue SRW </span> - <mat-icon>keyboard_double_arrow_right</mat-icon> - </div> - </button> -</div> <div aria-hidden="true" class="banner absolute"> <div> <h4 *ngIf="submission">Notification ID: {{ submission.fileNumber }} | {{ submission.type }}</h4> @@ -46,8 +38,12 @@ <h4 *ngIf="submission">Notification ID: {{ submission.fileNumber }}</h4> <div class="header"> <h2>Applicant Submission</h2> <div class="btns-wrapper"> - <button *ngIf="submission.canEdit" mat-stroked-button color="warn" (click)="onCancel(submission.uuid)"> - Cancel SRW + <button mat-flat-button color="primary" *ngIf="submission && submission.canEdit" + [routerLink]="'/notification/' + submission.fileNumber + '/edit'"> + <div class="continue-button-content"> + <span>Continue SRW</span> + <mat-icon>keyboard_double_arrow_right</mat-icon> + </div> </button> </div> </div> @@ -61,13 +57,6 @@ <h2>Applicant Submission</h2> </div> </section> </div> - <div class="buttons" *ngIf="submission"> - <div> - <button *ngIf="submission.canEdit" mat-stroked-button color="warn" (click)="onCancel(submission.uuid)"> - Cancel SRW - </button> - </div> - </div> </mat-tab> <mat-tab label="ALC Review and Response"> <div class="content"> @@ -78,5 +67,17 @@ <h2>Applicant Submission</h2> </div> </mat-tab> </mat-tab-group> + <div *ngIf="submission && submission.canEdit" class="continue-button-container"> + <button mat-stroked-button color="warn" (click)="onCancel(submission.uuid)"> + Cancel SRW + </button> + <button mat-flat-button color="primary" + [routerLink]="'/notification/' + submission.fileNumber + '/edit'"> + <div class="continue-button-content"> + <span>Continue SRW</span> + <mat-icon>keyboard_double_arrow_right</mat-icon> + </div> + </button> + </div> </div> </div> diff --git a/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.scss b/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.scss index 2b720dbcd3..b740b549ca 100644 --- a/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.scss +++ b/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.scss @@ -181,3 +181,30 @@ section { .document { margin-bottom: rem(8); } + +.continue-button-container { + position: sticky; + bottom: 0; + margin-top: rem(40); + background-color: colors.$white; + display: flex; + padding: rem(16) 0; + flex-direction: column-reverse; + justify-content: space-between; + z-index: 2; + box-shadow: -3px 0 colors.$white, 3px 0 colors.$white; + + @media screen and (min-width: $tabletBreakpoint) { + flex-direction: row; + justify-content: center; + } + + button { + margin-right: rem(16) !important; + } +} + +.continue-button-content { + display: flex; + align-items: center; +} \ No newline at end of file From 196492f346f0275a577a54b197e8fadaccac32ac Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Wed, 17 Jan 2024 14:02:29 -0800 Subject: [PATCH 946/954] Update NFU Submission Template * More bug fixes! * Flatten primary contact to keep the template simpler --- .../generate-submission-document.service.ts | 17 +++++++++++++++-- .../pdf/nfu-submission-template.docx | Bin 32297 -> 32404 bytes 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/services/apps/alcs/src/portal/pdf-generation/generate-submission-document.service.ts b/services/apps/alcs/src/portal/pdf-generation/generate-submission-document.service.ts index b35d5604b6..61c55d3785 100644 --- a/services/apps/alcs/src/portal/pdf-generation/generate-submission-document.service.ts +++ b/services/apps/alcs/src/portal/pdf-generation/generate-submission-document.service.ts @@ -243,11 +243,15 @@ export class GenerateSubmissionDocumentService { NO_DATA, otherParcelsDescription: submission.otherParcelsDescription, selectedThirdPartyAgent: primaryContact?.type.code === OWNER_TYPE.AGENT, - primaryContact, + primaryContactFirstName: primaryContact?.firstName, + primaryContactLastName: primaryContact?.lastName, + primaryContactOrganizationName: primaryContact?.organizationName, + primaryContactEmail: primaryContact?.email, + primaryContactPhoneNumber: primaryContact?.phoneNumber, primaryContactType: primaryContact?.type?.label, organizationText: primaryContact?.type.code === OWNER_TYPE.CROWN - ? 'Ministry/Department Responsible' + ? 'Department' : 'Organization (If Applicable)', isGovernmentSetup: !localGovernment || localGovernment.bceidBusinessGuid !== null, @@ -288,6 +292,7 @@ export class GenerateSubmissionDocumentService { private mapParcelsWithOwners(parcels: ApplicationParcel[]) { return parcels.map((e) => ({ ...e, + pid: this.formatPid(e.pid), noData: NO_DATA, purchasedDate: e.purchasedDate ? e.purchasedDate : undefined, certificateOfTitle: e.certificateOfTitle?.document.fileName, @@ -379,4 +384,12 @@ export class GenerateSubmissionDocumentService { return pdfData; } + + private formatPid(pid?: string | null) { + const matches = pid?.match(/(.{3})(.{3})(.{3})/); + if (matches) { + return matches.slice(1).join('-'); + } + return undefined; + } } diff --git a/services/templates/pdf/nfu-submission-template.docx b/services/templates/pdf/nfu-submission-template.docx index d97b936b574c033470a941473a3a560d324ef85d..04c03337638e28bdca14ae8ed73011fc8254a10b 100644 GIT binary patch delta 7830 zcmZu$1yCGKx823vArKrEcemg{7F~RC2rj|h77HF+gS&fhmyjUAEd&YfAvgqkB>$_w zzVFqWsj2BZb-Pc`>3e3n?k&FuCO-f%A&T$_1OOBi6aar6S3M>L5dQg|#0~_(MpXtl zaXQZl6HX#G>0g-_m*<r+FjK1`Y*=Q!wT&Pj^~k(BaZaS)R-?YH6XD5OxfISkwjey} zg{oCD(Wu41K|0w(nM?P)n@}7fCgd83m9~f)Zh&aZTbUug?WQ0(4LeSiK+MjBhU7!0 zCBagrp;Si+Zc^`eXIt(3i9)%s4|sM%;<~6_c%OBk!DfiA7%gG>6y#G=4L=HtS3gwn zFbamDff%j0B2mO_$cb$xjP}wU6_}PK2Xyx(Vh_3q3+rq?l!1lIPjY`OY!7G%*fMI~ zX_7&5$Vu~;0j>~))xfK5q#e49wOS&^+`%MJ%tM<|La5OYFL;&v{xAS$xA?hfSpO>d zrWG*yescVzjsXS`t4(KadF*qAtlu{$#XvenqI6p>6phgte`2j}V(`0x;ufE1i%pfJ zHslm+l&n7lklJwWF_SJvUY%@%KX_Qk<sE-_SQ8KI2q@z^t;eqkrl9B-7w3M0gD4`S zP~ac4y#)dQD{ue+L=pWT>yoqt#|Z;*QJIC7RZ!>!DWG*xfByEWVzAl%Mc>*&pn_|S zDv!uvMpGKAivKRTWTtjh8zo}?Nzji5dl}Jd@w45j!Rr`{0`qJF&g%)2dqjUKQZ_>C z@4=^8A)Kx~_1a%?xI2S#GJ1#mnNns&8)FY%4p-O;y#hb3gw!!&4Pf*Q2Q$L*$;vzO zVXj%^$1r8ZVUF_*!vO8^xI{9aIWF|%Jn?kJ(e}>cprIK?_mS+RVs*pO4EJ0q<L^=f zzdr;!#UnZ6h<9^!uLe-0j$Y3xrh0{>hWLJd;S@dXtftfm9xTxf9!S<9iJh^D*eqkc z0llMPk`}Y%k{qa0Jp0*<`Lftta&Nq8y+xM43Q2n9qkzPfdRiF$;_Wh(E}s&Q!wTYu zbuM~q2yw*SJiq>@R-QgnJk0M%iK8=B^GbYSvVt9ht8KK`*;AB%nC9_fFVK8u8vK{( ze-dqnF!x6Qjnarpf0fXfh~$Ov_X#GtippPY80pf&zB?>Q;P{{DR9%tVLo~Fsm68+j zF7pZTw%}7Q7gy(fr;dW9ySoorKuowGbx3jN4R;!kRjj|cvC+zCusxu9lDVYNR34SF z20y<ceU;5Bq&6A)S+gIlnyN&<?!xwLzad6Fd{BUebU(dDO(u1hDuZ0UPfb6&9k{?f zZNm%`{K&B6VWQ-^t3-hCb_PNU5lgd89=p{a3ohA~J#RwT4t6FEK*d4Zd8L(!ZYJ{a ztKzvp!`{J&SxM?k{E!bJO-As#ysmWk72zcB<X8>XFUWV&hfy0`9JkD91e9IEt#c)> zc*AmJD~;Z7oXW1_cgl=o98ET~<gXMMWnwAA&di!qFrKQEi_=e4-RRKPn=dy+)C(sZ z%`P<?7uJuv#0#Tm07IgITT^jLHs+Q6nO}IQ=X?ffrz5Wu%duUnRMA`50+Xl02)VLt zjsZ3hi-2?XD4J12{K1k@F}F77MbOc}tXM4KTldL{eo=%ho9zlL%QhUY2Yx#AlFnh+ z2xE`72M1o3a9xZ6ovAtIW`KW)2~a?S!8H|FK4PG8Uz0UWld*#VhBYm}oNz$Qxb`tz z9D4eCoNmhCP`62+?A{uB2j8A>dwG1V*V_FH1B8uY-N$K;)xP1my+!|mqf>P^9$wQ$ zKGGE$yLU0*T<f%4+mV~HPefUB_hi8EV%B&u@6jsz9`R2&nNKh3qCAJvIocoL{xh76 zbcq_f^}qb*qZ(<*4jV3!?<^=GOpAig(i7`l5j<A-c4>Ren_T<Zrc7eP(%1481;;{e zK8H&BHx2u-f-0q;DYe7Rd@jn4ug6JDP^#uhjlrR;gs(pCjbwJRxE9X&q%;d=X0bHo z&8aK6@J?XV!Z+mGfP%MTiwQ27+(PEsHhag0TB3^pu@5OV_b?i?Pf&(2tinB^=#fQK z>-v!VH1eYsDKHbm9_cw$bb=E@s&?0H5T!t<rgaNw6<ioE5m0&T*MUcipv<TGuzGDY zellC2X8q;Sxa5Z+eTj-f3iLqu<X7T|f%1#%q~eD|rixFPGTtH4yYB>0aiB(v1Ix$$ zm0{ushn_lX5VB{s%nmZyP@lzD@O=H7ttnHY#vP+QxW9UvGIjos0%gob{=*-h1qgQN zuql}O*rO_W^O;7{^ER<^RHS@WQ@tE5{=4S1p*6;DWVR{(QaUwhb>}u@%%j4w3IAB{ zWdB4urs1^L9%SHVrd<L^eGS3zNmg9=*7~|}!0(^FdkIdGx=!kLbD4av;lkT^_i|?g z0$RNmYN)B5f4qr9+$!RyDY%*mf4YH<)@^b#oPntl6sU2?J=CMUCUM6DZ=jv$<pUWe zqPOFw0pXWEv(&??Y~CTcvq<V;*|N0W<>OL#Wxk?A{;YFMCjuKf<4KNuS0BC>A~8^; zGWWcZkWMJMYTdhw>rN9BFxaV-9$Ja#2}j9i?!VqR`JIlmX|DH`4y|g2qz4zqer}Pr zxjxHa#p6P;mQ}=<LnkyYYiL1RE}9gjP&?<BxcUGHH&4{-f!gK@Mfdaat?8D06x->M z%de@2P%jlzq|j>o0+;9^e{#9}IDS?vKqp>3us~NQpwjCpoc0jtynLBVU!Fx}_^L>~ z${&I@XYo`1DQstgTtNKVWeXR^d-UqfNs&ik<#;9E*vxG4{-veg{)viDAFU{f@usuz zeK4YW*>|X5a?Y$+PQEW0<2H#0QfW|nd%>zLsFrW&+Ygx}bvNA2JgfmMtSsPWnIaOe zQ;NeO9#tCJEvMLTL9zCil>U5j!N2q6ex`F;QMd*$IQT`#u_mVVk(?^QvZ;=|?Y%0$ zd>v4@*5f0<|4e%;WeuZJwe{so%65+0>+p6=p0{2^&B*&;+a0sk^<zxDTxcx%J}*_w z_4^?zjrfrO_L8#J&c5BgP1cxFLC-5N?;zQ=5EioPjOdcMLGl5|j`NwJEx(5*iQaLS z$KhUG7@1bG_MyM;$q!B@7|#A>1g-d|iJ>{rS7V1q4+a^^imc@)+J1w`Twy=RK1*MJ zr)sDYg_?3Nx!f#Y3aN=P__8?e?sazCYeD8=y)2FMJnv6!-uG3}^4aJ$Mw2?urQ+_} z3P5H&!vP^;9{T;jY)q#~hEf{MPjk0+gF?C&4+X~A3I}A0F*GW!Fc6`-oNQLv?5r9C znUx|rp$eN<XCV@*e?i3?)Qcfi6{D!6UST;dy$L&Cmq=HBGMu9*g3xc8FDDx2F0H*J zMO9&vl(ehV0Xm0*J#I}y{2PbAyW_Lut@5ya4^nCm4l&PrZ)DB*!T$6F<@rB<eQ2u~ z6igfgTz7r;f2dr%gP~%YRO_K%R&aTXZb=2ukIDU(u+ZK90*a%oeVy2HkpOa~AzKLf z?U<8}SFnHnyl*?>ofY1h4a?t?UGlIug@>aH#gjtK4|S{w9Z*T8-)fM*BvW9&Qrzdz zdSR>yU;DB^JIe&;_EdV-_aa9#y4`cXWZ^2&@x3wBMl?!%8kT%@J<VeE=1Q-e@a_XP zmdM!vxm6sm6XVsSO|AyRS@M2~N{!Qx0-l{a%{|kX7g*V0`Euk{N;h|9nFjOV;nMiw znzVZm<-X6FCQ=wf(|~1TIS;#BK6i+e+<2|S<+R0*p<3mx&4ACFcRD2}eBE<}Ymp+| z<s#+_f{$Y8Nw5h@OHh$`+YgU4a5-z`Ew<B2b*66*S7yeLeUsnL>|A)o#tP5Qr*g87 zvG^G|ZGLXcKH^|5e~lq<@fod#LH3QK&(&Mz{g`$)G47vu>>Io}S#<3JI@s<E$F#0; z&U(@Z4eJ?ry5mE(ivu}Su3*K`MKzzQ8XsONV_J@;cvupPf<;{11vsrt3>iEKyauha zXf1Z_xIRSIrc~6e+?-^1UG6p=&?%JrZtb0QCgsPykK{EU2~A*$N3As9Xj1>B+EUYA zutl%#ul=~|M{TWy0&iWoM59je_7$UMkYKYkvkMM#PDF5OsK^kVc8OM+mjuXB(mV=x zxNDFb4<<qRof=(ePnsB5<|{$$C?l^>{|XK@tDbx#er*fFE#aG6<LM#trZ-IFGH`#m z)X*fMg^K?ZbSp||(ar$E4r-6=;L80*yB_4R2xs{X3wOAWH77Ni3H;?V$0^R?8++sQ z$P9_Jcglw*z9mJ8HtFUKru#PO1YN`EmLH9Eq+#khODO|hq5O)8OCDi3O*%|X908C~ z)5_SNoSqRav>sCvK?N^(`Gk{%`p#&G?@q&E44}@b0MM}EFzs1Zv{Cr?M~&sz1Yuby z&J_{+ql{$n60e?C)n67gy-|=;FNV<*zw#&=B}hz}T#-bIMLx8{HNNkp?jZp)anWL( z6T?({?&|%$=Iy(?gWcwreXO?(?%zK)SB!OYt1gXxMJdR6uPLQ;LtE~DgRg6x_LNmK zCQOPn!bmbXiLqV5e^M(_$=nBxE@gdz98R;@068x7O!apRkcrVX4P!CV6@7}7rhhz) zsf>!mu10oi;mKpal_$us_{JceuF1h)-VIxOB^I0X99PQ@$ExaM0_6^g>|KX>50~!n z)m6}X%_q~gajBG}r#FU!i)Gx6`a-`$WH|wvEW+;5dhL8M6hQ&{<!d@caiVTDFEA&a zRCG{3b|&imw6QLYN0g~;<|WX$nBm+y@+CLi#L0FEmYg`2yh?#uUbk4KtbNXxy@jDW zgS6w!55;`;vonVk;U8Yb%V@o>$eV+CW8Irzr++#MjBlU3(9s8=*}4v91Bnor7V}>? z;#MJE3J1;2)p=~Z+u9X5l|R0`<P(0veW-Z+^ui+uu7Zu_6XOp!SITT}D9Tc%I0M>i z2$&{MY9O=x$0=`Wj--miy~3b_To+94=jAs{c(k(EWP-v#p5OB1ZU^m4UjfN$6wqj< zo<dV)$UFY-r9=p%4>isCP-XHhwkTvjsL2tx9r4mH_~+XRlMbntv4w$@EuZ6*_LxI? zU9*bDnUbZMEsY<k2Rq4X^()|#w6l9A(>JY~2_|xxvAL8UA3Dg%T16Ty*7#u30~S7V zY=*zy`>L>MRaRbP>Gi}662Kd2Ri0M}kDOI3iM+D5GH@U#Ke8}%Xo+p$Xkqv^a`?gB zJfuq}!LmCY*9s14#kOGuw?n8(fR;CKPOq+g+n;Pw{4BPFL<XsBo(GZJL^5YQ-c+mC znvK~1jO+5u6d}2#h6`y(dgu~{GT^^;mma6h*@`eU<ns`CnGj3eWwHkt!>pWqqY?J` zz0}VpT1k^cD56!_`y{~w18@1@^#&j)lHYV>5a)~gF|lxYWD-=6$7z-G_5?<UKB^^J zWA1`^l<OYyD2>jVSFw)BKbZ;?wm=N((;#1r8HS%%b_cM0>z)#4ab<wjk*Cb54A{Mn z3GWl$Og0ZZ-Pv6>rSIbA*~iH(vUPA?x#1XO_(l(*7DJ7Idv1AHKeyzib)&FO!ACMg z8%crkx-vwbX}i|p8QSo^-pl4e%tv`>C|V6~;UJpzjuQ3NgH2^`LcEQgfs7@KIDvz< zPSgNY`QecTEC~P}OvLmZ07Qja%qWOJRsV9O1t-uvlQX@h|6K}SqvS@S@6Pt{BU+o~ z(5Dic$8G$j;pTV4VNUX+7#>?O1~o#vx1Lja1csKe`qO@d0eGtxlGDwtL0_rvAXV&c ztfWpodi8f&+8B6qd6Y`(W5)p&A->mFB#4ON?ulI?4_RTWFrbNTcD{fv+QQ7<DytE3 zN)I~nZ~I&^V^fILAr+fqwkXDu0oPu%%{d=tS-f9pvW=fgvXcA?2i#mU@|u<mLWb69 zlVv^fkvic%%MiP_Sp_fyszN_nJ&0t{jQ;RuBun6ig0XRX<bL|MAH=M~iKAr5^42wI zE<SIR|FEGDHZ_M^pd4uZ-UZxPjYyBPP)kKZ(>Sb*H*#phX53)=+8ioqY9)TK@3+2; zLq-M1F~2@HP+A=y6eF~$Oi&zQHi$WM*R%0H4H!ZEu?_{_QTU~L3Zg0LHQlt7nh}?F zNA4p1*9cpA>vBykdZ3n`h6#3yz(fj>EuoiL%`B-a>|{^yR3xX%@0ZxQOJjE1cY}^g zvAeS=kp8WKu<|1}AP7)L<iJw;4ymr9zu84L0mxiwNQF@eC#yYSFD-G)r=nlur{AXC z_|TmKEN!;^DNR=7EwYR;f<HQ^c7kKXbTmp<;E{`^wwp8K=c>QhLlbe2UA@-OVQ_wU zj^0-TJJ4j%S4B>s6o1|I+1Zf)^ELZQhTZ%97fM!2o~enCivZ*b<VDIJBk10D68AZF z@}>nph|Yx(`N{}zeF)7nsi|DolrwKl-;Ho%%E%JurmOIwz)(BsV&`q}@p(LxrC1hE zXbA2b(IQ?9@Ag{KM#}!0%4D{!t%L@7FIs;?SZ&xZ6e0w!!gy4c3eWo2-3hWUFNm+_ z2rCjJJf)|)xKeOjBXGpGIT_yH1noiB4fuNdot&lmpEs}P4~%&(2vaQfq^(9M3t^TI ziY&{eJ=(%|8qO;w#IT1QrPDk#lX0lcc)BQV`yiC3ksl3{jAQzN(?5<`B<xe_aGbRu z%w(w**X&T1ly~q6*T#-9KoGAeXTqi4^ayrW1d`MEQnJ*yp>M@%Hd@uOCa&W?KU1Ci zaL>)Qt={#-r^i*vBvGC^V%v}orJdj9AxUTy&HYAU4`WA@*Vblf)8zZPFhySK(?G@3 zPYTVo(9OO3HoxnPI=`Dqj63Xzp=S~e3n<J9hf0(nFC^CUed2xq*U2!<_r*}R48~*P zTPRbE356j&5Gt~&Nxs^U-w?xK^h{Bvl`Hkv3aLl#F0bN4@<XPt&jp{cD<EaJ$nN5! zsg6~<JB<I9CFp#^Y{>eXfw8$b%0D6Ofwi9FVMz&CtEq<+eX5YpSR}!cIz6%j`?AH1 z>et>z7MQL1cAaC$%4fsURxKQ>r4itp$Dh|++~{%#`o#hvW9*}6WcTER{^0%bv9#f1 zo2n|!8eF!P{$uo%?oX#y2`dRJRSO%}+<EoR5yO{O8)16Q^i{7<GZkzN^!abc-l~(P zoy`fA6%KdDkQ4|Y2#`b1o5@+sVQ3lTI%9n~9#vqg`LT+|$OE^XnJb#4K_v7>nw#x9 zo{!kw0`G8-qV9dFhrj$jSV&Rhl044&!WbjH!PZn}BPK5pbGPWbBu|Ka7@w=lO4UqC z58i!x+=V5zYoeZ}zia4<p}gqVFVuNYLZ5Xepoxv3L?a1`($rAi?)4(cff;4ziwqSP zs14&VVCBalM3x<DP;259)VKttjt$kaN?~EejM8Az6eJyygv(n<?bT*z^&7eu#Gs`h zyO%0L2(0<$CO%Az9B~A+MlVn?{EXim>(I2&^Pvqz#8XPqeF#(9HZ1-&r8>L0@z7Ec z?XyrWLd-Y0`Z(1QQh3$z0DE};k43RKjra&{>$d9Mwc~#$^4YA5Rl4uUm6=Czw-9ON zAw1o{I%ly)XxM0-R>JgEmJPRQ?azI8Djc_<cpPCUQ#B$bQ<~(3L3jwZbT2INNz`pA z^-ZkatjbdIq{}UhuVq1H5o6{T)*BNftrZv=3G732XE-w-1e4)@f<+4IXjQV}MZy?H zh)<JKLX%D35V;qPWVo8vW7493XTZ9J56@Pa<mm1s-s{8jhN6m=Q4n29*Hjt4Jw)3w zTX6FUB(f(AQMX=q2^QiUoR5%=#K1*njobi$CXSFfDUV)+-M?}k2xh8)khfkAGG<V? zR4-~ePgObk;rwVagxxg)%__`lMQ$7vNP%kEi|o;@^R)QgYBO>{&YmpqdRK!YE0mlm zEn*bQWT_6%`b_WqQ3nY5UkAdzV~*Le!qK7w(%<f^^Of{@A&8yqY{}*W^}pA3VMj{) z&PtZX7R70%_PD~=)ur^ZxGG|~>~T4LM0{^MZHLYq_92~+1GXEv12i|3j2GaxMP_!S z41x92jJ_a6=@f2PCJ60ab3`-CJE_JE3l`-d3IaOdXL$!(+hPRut`U9d{h?2b`HA?R z6bQde&+EE(6(0zE9O6VuLxR>cOm8#G`Iw;-aR)Wh#AC2s(Uy(Cg+H*y1#NZ>;PGpI z4=?#9CVhxb3ZpST!4aW~9n3;0dffYJkdlb2Q@imRh`xHsdEK<D)?LknWtzl`{_^PP zU8m2>q8I+)$q9$%r-xcA)fFWQ(lUlgzqT(cT=3m>@f_VYJr>MwUTjC$rOIFTpeCh~ z2=>!_JRgg?D(E2o*7UwFutLA=z>4*3*{kqcv&kI;`3NRBcAXJj+<*-=$x3{Obw^bu zvJ*U0St|ig1eOwe+4^2`PV`<V73d_X1<E6Sk;Ow}`O+Iyz-ewU&Kgy6I!#AMa}c&_ zpRvD^j(Q!0&YBqNXTaIywJ#P%K@9Y$Q?vk)r${ddzQ%M@rIYj=;RbZoeq1fJuZ1AK zt>ynM^Bo4m|I9`;vXiDHC&2j@#u*jTU9O0Q9=era_A<bILl(T%d<xybjG<j(dU=Zh z*Y$8(oDhQUZf<5h(WGOZF?Hr9qoU>bGd&Zhw0ewg={m;8GN>5|F`Ek!lJ|)lpCJ8x z=(jH|^Qi>9Jkxc^OHPxE#D)W6(QxJAMDOdl_!(izb5qI%C9SswMS+s036l9t?iwn2 zy+}k2eR3+`2~y?Yd~0o!ij4fA^>?t>i-j)9c<_)wnJ>Ggf%@>A@qic}%lAA7L#qgF zItq^VzeL6#RmdX8X~j5xam7m%%Tr16B3@KGOgBkr&2MJu@10L#hB?%Uj_G{k$No^y z2B!gQfxZ}a122rl2@fKQT(L#<aXcqi{4#@kFzH&>w6lSZ+qo1T1sB1iG>8i`_c3=9 zBn3_LQM#R>CW!+VZ9sSMtH$lx4h2fov{H&=<b6!scM5i6y#q6Ej?>cG;!$m{>@$ze z%(sPfnA)K@)uHE~p+hLkG1Tdew?rRhv>RYr_4B*Q_!w{FM6Gv78N5yKeDyN<vZ8gb z_X}0E9fMYNWYnYfANU?s9=^!!g2o6bQBiuC;UG@7+5Fb*^G^(_D&;-cOFck~kAdha zDc>UQ5L!({TB(9u!D3&$ey3#B&0e4hI{4JpJMZh&YZj$%3b*sE!Y@kijz!+1`Pjg; z%}+8OUMHq@E`RW2ye`tRB$OU)R12Zm-JuICNwHSBHQt7ALd?@cuHcqOY43}s&pGqF zm565B$4obrRV^MI?}duO3VY@(GH?Zf_8om5=Xc|9g*pW1fIB;k1%v~~YR3CXxMrA{ zQ_tYF#Em|xFL1=z_M#cIdxIKmI1Mw)0>PWNGN6i=H(@2d*5-z^p|qC!Y7_<q3vvgz zNYo`B)fUMKqLOi|Ax;k@FxW+Smiel0ru_`a>Z34oX?u}ayki+;r~Wpm;#g!^wMgt} z?FqNiwDPjshJFU=;HEBnUVE`;$j`ty{Hy3g1j%;|t7?D$`M9F;^;T|WQx%x)=ScNN z2wls9!(o!(+HVcy9m`i?W#e(HaXlXRx7f}OzTLAjE_;GV9dKHbU(Lg=6tpT_N3^n4 z+C;qX^GVk{G77^1xeJ<A-#s;j+ZRt6t9W|v#bS*zN1$lh(pF348SnxmM-RWA{^Zq% zk&IS*2>}4a65w;D7zjrIK>cs2GO5IeALY4H1N~DqOWN`gK>cI<E$k$LeEI%XY7Bfy zfyPN*zBGTW>}N|Lsm+(g;E$&ysHIU10RS)~0syc9|2)Ew002)%7jq6*H*b3jS9Y(r z_WuF@FE;e6U@i-m3IM>Z2>?9L?;i&+Nx~0g_y^#hMFE_DcmM$Ey8jDc>FDTY;llO* zA$UJQPz#?E<b}^u{CDs4q&`1N%0CGIOr+!f3&A_-$&c!<k7G6n*7sbRn4tpz@c!k~ zmn7y-P4#CS>y=Xp-e;`SXRLqw^qVIAFePC5zpqbjh<_XN+@Tm50Kos(p!`YQ{xp9F j{pZ^Kdvfp=Nz@kjL=Z*9XQBZBtmo4Y9sq#z{bT(P_6cOf delta 7592 zcmZ8`1ymi|vMufwT!Om=_u%dx+%>p6Y&5v;;O-LKo#3`{_uy=TyXSFo|NrmY-(%G1 zs_v>@-Lq@1u~yahSIF`gNK_ShXc%k=1Ox;Kh62_)R1!$&_cQPlBo#naxsMei;9iT# zpVWXyVlL*x;00A=BnRP^ji-qFX+|^a!@UO)QQ1Hdy64vYZAXXU+=^jJFIo&vas~x^ zlnO+YR+!3fdY@6eZDyoOvkGI2V&f<@;~Az7xweu{_6u_c)FH&$ARe_87ePs)L(akF zD^wXvX~X=_Z51)*lcfO5Sgu_oJ5=7d0>qSG+Pxq9V@=B7rQI5t9*oOdO6*XP;__h- z$8;2=U~(JLVjA&S8bRr5NS@P9s;j^dAICwm%HKX3v{m!>$`@-_mu<vc*cILkXms-N zu__LMd~{HbA{{P**BKzvE7-9eI;Fmm+{`Sh8~y^>tDGI9dm=#pr)q`8+R}kxSZ#+; zkAQIEN9YUh(RrWWq@SU2CeL+8A-H}prMt`b+$0C?y!{gVWb7|}74a%O%NrvjL&FzI zpFZv7!mZ{w{e`<0Yhr6W$!k4@IIzUA<MjdNtUdqRz_3y)CVwmXpO=vnA{BXfgdL}H zDtkx>hz%$R2o-tcfBhHWDikYV4|0S}OhXgBN`yLWGhx?`MAKBSIr`VRZG@a_wK9jm z@AM`-mMQ<kED`XR3lQq(E%!hU)#lF0_4pTWc2{D1I+m}ryyj=HjU80zUOz%%EOe*i z+<)=A5}EBmkxvjFmETo@s?-n{)XmB(63Z%5dV$7Uf=(e~Tgn(&s27-kvB*xM_K@8j z^EX>vB#&(6^Xurw0GPw+@i;;<{MTN6{MCJXbSed_I?c0>HAN@7Qn9btSF5;4+%4GO zed_Rhws(mvGB*yLn|zFVs1iAB_*OmrAUWuAa0fr9!@A{2l#@0v$o6}km71vF+Tn_S zNEXVR#VB-M=JFP{3xTOKJ6v<MeW==It`fx(IEA<nEmOnF44i?uY|oEkH)BbliiC=h z3QP2|R%`%%*8!T7NbWW#nqOmA;Uve>i26i#xyqjjPzwJ8bhS2bi~2jzvVVd8H_mo2 z3;*PQg9NO?Um`RB;k;n}UO_`vQu<2`BOOY>sKXj7M%O(f!lwPGgF3d@9+~@bUN|n~ zi64YwELHPPFuDEU<CEHt?7^UH2xs&*>-7DJOj<#iLp;xVGFuVG#wf5gz8X~2Z;3Ld zl9uR|UqsZ4Y{|7^j1gcsrmi$UewM;{^2>=aDgF{hjl_LE8B2IIr};0X4nLb>+%k{= zXs40Q#Q1aTd|0reYn=0N-=~TRsa@Z28}h!k&H7P`wi$o?W&|A?%%{9?(6@|c|2q59 z#MIt?l~7(hG>~^-T(u;EJE1=sdTb)K4T-G9>mSZ%?h;(NPVks8q6u85Sfx!6jLk2d zsn9C)>QsF|aLnO=)@wYmw_YmKDiH?)UJ~r7`+FGG=`CNd45GwZ6}ui%=8wkLv;`MW z+`R<Or;bi|1D(;yyl*(v30LYbXs#4wnn*4q+;+OmkNZ&<OWW44MaHZrqS7WCJpwt) z*a2R6l8O7(h^BKE=N;?3c9?eoHl#zr&HP7J+h|aejV_w-4f+vj0l7(h>YL^Oi|<AZ z9axBQ#M)BTNv!qXoO`-OYXfcbfJ7;f<zxElFV$JI6zK;jvVf*#{3!>-^m`wJ<)Pd| zkC9qRo@E!TF@F7@8zdVe6Z^OEx~<(8FjV&l*1fFeXze?m`+GFGMqar}<nU$YxtOK3 zA7{YfyN27XTP-~da}&b)_m#gHC*Q1=U~lob%l_!l{(0vrJc1+nPkNO1bh<|Rhr9ny zDI*=+h7P@v|IDix7P!DH1AG9uM5eQ#1Sd5LI!jmR=LYYD+{&%ZDd+c^VZ}0$9ZO%! z&m=Y6x%n(gX)EfL6E3P5P=$p<!)EqEcWZ03>a`+vd8H9ee3Y3JPnKL?VkpLT#CRmC zhgRJv%Ii}M!Xdpx5erS3_aO@Gg;o<?fb4wcU%nol8t4cuLkMLwRlfizkOsA>L1=~Z z2bY`6<DI>@-wf}ZmJz8fvhuVV{c=q3Lk*|O`w<G*s$2IUt%3^^L;`+n__bqF!k}^~ zzxLi6PM*)_salV`85R99pegx+%TPDpyt$1%rmvVfH+ol7T87(#y^l&W73ukbthTc@ zyiMRi3KcNFbXeU3sUlAVk09QEyN&S9!TfjmZ@{KZa2xgvkD&h2Zpy^@KSUHa8~eWy zQUTUnc6pQhw`xR=O!{y(EM!w0i;1;r#;c<#{nqL`1o&y5ASuWZ=csxiMSiSfVb$f< z$3GK4(?3&ZLdY7}=~4reP{wpVSX?4O@utHgk|jR;R^I9hTxTn9jff*WJ^d0=JAx$? z4<{X)>nPkMXope!b#G2Y;-t)ZN@KV5{tw`8Np%U&5VKweONLy{z<FNAd|q=iAxxtS zwT(6m)Bkl5%S7wudEIP9nbKFBgzKB`@P;La?^nG6reI%xa`B374YUj}W9dpuhCtO~ zfO>tP%}5R5mG*x5#>DfR0sh`pEbim6jErzfpP8JfWT@!VM#7bKmO@99NRT4`E)QTw zvin4yKjUf7PD*Jm6NtS~NHx5&{LRk1$x1!wX0-|)yn*r+L{pAhQGBNpMK!68+$AYT zr1mI{nMoK8IYWZp+T8-1YhKZ%$E=0^yHejr{c3L0*APlz7e=hcmpdY~s0)G<(M3$* z5}|0>3ms_z>#gfC_B7Y_E5PB#|0iIi%vU<3aHzPvJ#VH_*){iYNe^7y<NFvEc<b(? zSOOkVrkF)?P~UeBn165*bFhXP<2Xi(r{r>n-L$c+;Tm2^&;&xY%Qy%2x5`sG(ouoy z$m9K{?bV@nT#FrtrAddR4|fY|?qn`m(UzN3?wBw(NkPi!;4YaP9k)IxJpgSeToAqi zWE(8DTg?U;z4Lk<OAPwAr?R@a+7*IQneLVQvuncGjyjcfm5J2Lj@%-Ic)}cnBvzZf zDgE2$DDZvu;+YBZ*k^xcVMSoN>`f|s<dDW}P|@XuN&9nlmv{M_DXG;~qlp>%SnZrc z&)T_&>}NW;4%dfj*EGC{Tfj4Dj&#my&Sv(mrV-!^EQlwg<@qC126GwGuO~wa6Fmm0 z&hHD85ojyh>d44bKrVBuBLj~z=~wburatjtUdY<$^3%CcCWXs6Fcc4@xk{{Hzy~j) zSz_A=V^%^%90??kg*(w6RM7|aSY`mdw`!gi%8QiBOQ;e%CDhpN0d5ooMR3v^URlh% z6<NA&o)gTN2QU?;kT*lhN``X4JQ`_w-FRDH7g;$rLiXbyA469(GUDqOkiA|a;e#H7 z`Dp6L`*LQSy$^_D?Ms#>{EMmQHm5({Z70`U+?Mzo`xWwK7V)Wz*c9=!V+eguqtVs= z)qQJW9T3z-It{^90pQZA$p9{ymETy=h?%01jVDlMe(n;`(%HO{t_PKS>7!q439(U2 z%pI1)l<s{kcL$X#%Fj%6o-Y4{gOQJ*9>6q3tP9od+fTkg#;2JMY@P#2%ccnpgmnB8 zHQC-w&ox>b?dA$F32Wjwt`NTd&M)wojK$?^AL;(ki5}Pf1bA)2_WXRsi#l>C;=+RX zb1xL=O8B@Z5lXIQ=@r>YJ?#9^DPC-8mj-N+s;KrvZr+Y(F1#Y`(_51eG^1)(vtW}R z^ZOYe)UrIMti{vmhWiM%RX=~&I(m3(JLQOTynW<3h<D70+k;i?Vc9vk_Ju`ESDtL! zz|swoe7J$01-MD)c5Y=&D7ZH33dx^kikEr)k%0Ni&~X}~P-6AzoV0OEQ4O>;|5dH+ z<>;dp%WG!tD}S<^sDTe@=uNuDS3>kj_6=V(bj8D~kc;!VMyYkYLM#j&`XQU;(jZf1 zwZy1$cpnrkXp*`b*#y126&#h75P#QMvuQ2Ubl&N1OMpu;QpcQ6r7*aun8A+a)wdw$ z)w|FqT`eOK#>Hcmd3yLjf)L4~ZwzNFRGs}&pZ=k=2i3sZBVEKu@9p<ja%&|7=&yyF z6!o81TVXX4dAY?I<S^i~BZ3n{ZOOS{=PHJwsFIe**cT%9q|~$NisB~{!Z2_0D<SOQ zW$<exWdJFr-V%g-W*h_gouiQKKc7iinm64RRAQQ&DNSf5Hp!wp;p)nVC=UAyMX#|^ z<$&XjMAtg&Yy<?-9Ofw#7>Sr5O#HUAq)?ZaB(%E8;X8qAMy#W#+OOvh>zoSQE43G# z3UQlzumY=&734n{cY{p@b@b$uR{NpI`SpwE0|56SQfO;ydl_=^uzJU+k9<%*<m!bS zVOUICu!X>Y2lSyG`Q1NB8w>0v@oh)mt?nc{B}u#~3gu>GB`o)s36jT`_qgwCOB{9n zB*s_D-h^^!<NSom&@&HYr*#9P=!cCdy{pW`@6?t9SV0Mop28o`vKw`$YRG_G0D)$g zYQWnNz(~_FH=TAj+X{9DBo&Oo;XO=v{zo#aW*nfTb<m72Y5X0<+b-NCf8u$nN;BEG za!@@bTG~w0Nk{Y<KMQ-yx1D0BlC>Xasxqf%TDuG&oT$PE&c6=q2BWo239*tjP&}K5 z0*@DH76ht7LO8+c<M839lT?E)z+-MOpxBcb#1B0u5`yys_gI)|QKt;}YE%`SMyToG z@k0VIjRY5bEK%xUDBtpJhH~DK_Vzgo)mlVp!W5oFct%r<xu!S;9&VN1Ty^F*GwK5N zD{ox!L$l&1YlS%K!m`6NvS$UR=;yVDG1A%Pyq7TVj6TZ2cIEE-$^E_Jd~cFbK*1*p z&6#6i0m%R-c#w^U2*}^=={GY3P7`0^W&(p0gvZIC0F13<*QD_+YUPF-<O}!<znZVJ zv#1h)s;9T-rjMv7&}UqZ3+X|^LPiOy0{dK8kTyy}MV{i<*iXH(UtrFZbkRwNm!bL0 zPo2XKpp{|~q_X($8ij#a0mFhWfRpE;35et^V(lOFJyymODudkJn@K9Fz3KB`e@~8R z=B~RC=QW*UwBy|R1)phdnRbY^fDZeU_kB*2+arFD)DLM`l`6)Tjt-9)Rb;A*4&KqE z8;)FCA!7A!1WM`+xxM&xEcnb7C-!jZ-SK!>d!=uxBICUb3YOwlENJ>D0ji9o)S^Ud zDi*voPpyO|IZ{3EJfgFzR-Zev3&z7wyLQIIfp*F66TvTCosud*%kGR1R?u(;1oazg zj&j<LU#u~HG#R^7!*lKcQiv5BqGD94tdPv<3fQyB$15UcbXlM9)kwbgBV?Ak$Fd<1 zAb*v@cSvF_x(a{|k+-(11T3L1e@tIqa{Y!jz3zm>%x2-G59KmNj3@>ipyxF+%PLYm zObMqV{KOJS#X$pNXB#MSI>q;Civ;TMayWf*{CM8B(uK`$G_&c;TGO!TS7|QvL9yF? z{1M%r^Xd2-UWPvr+|l>#aBf3?<AyIJgl@NxD2nYBG}(_j>2ndkg8{9&R>+j0i}B{! zGuB8yy>4@Gj#yNQ0EjVS>O6<ThEI5f({`9;_+fC8knb9Q<GWUDq7xOTYP~LrTR5F3 z!zYQmWL0V|zx*Wx&LS&6kzqX#2}P#iE0l_69gAvR_CQmGX`#1~D`Z*8GQQ=|S0^?Q zirna!R)ldH0gnk_kd=cDQC`&vg=3eqy@nhFqA_7L2y<n$wIl+;dP*??UvXR}Vxkqt z-+VPp_B}slo@l3^!pg*usVYw)&s>KtP0bNrkx5Nv6&YOCXM7qzT(faEfr8SMhx9M} zazd2MrG@Ta=s`=Lau>TgjJw9?%e2+a$MiMql%ix(#{>vii0}_N+kXku-GA09n>qtu z^GUjUpv_v8yNal0+QRvB*?0f?pryNs#Tu<lFcQlBilt%id10Wbf~#@48X>}k!$PEo z#<l7kYiQ@q&CsBCq@{jPFN&a=PONos&b%tk<$-)}V`GPhpry?c(SB0@$rsK5i+&Am zjQf2PFH{fc!(MyBDH1U^bZLknfLYY2_ZeVH6F58&I^IgZa_xa|rL@a?321qnbQE4B z1W^7|2J!busODVwYM0Ta_Sx;o8+D>AN9EyuGHbK0&Pd7Oaip!{`sP^CVC}f$p(9n0 zsui<fvn@|3b(=6<oOI5PnyG7x<iPxJ+%_v()prE&XS`L}SP`aMEpxKE-*A}OUo@H7 zj5zJT>)09heb0PX*QQ5C2$+x?{?@hp4}=31XdT45l2T<^cQSRAQTTkP)`6mbmUyE( zuQt%us`@=op?G68U9slqrq(vc^FG(<3wni*>YDU`L_Pm(=lO!^59%}S2n#m<Ouu!t zj^6^@`~ytp!<BB8G7{+!=fb_5c&f)2A2!p4U90$BgHL19C)E~7iDnUe0z)o;Cx^Y& z=2fGm#;v*vSu^-pW$J^;fs07@4ekw+&H}YtdhQknZ%QWfPuZ_Z3!i={KJD8FPq=DV zSPEq!i52=%Ji&0rz?9Tv)|2LUqmSXrdkh043xa)JH!3j@@ik)*ek2eu_H}3gr{yT) zpTxd7g^6Q=huBJZ;1Chx>2K8$U1y_6qvEi-9mFe`@T{o(aI+&=6)39DwSKikecz_C zSQY^bS`wJ0z<ce%M%KB51kv=#)lUB;#(e9;h#=&MAV<Z0lR?=nLZ^+grxa+Vq^1Te ziz=v!-+Dbo-)K%ZS6k|NHjg&#S+0|zON4mb%AFi5)fxEL!gM@oP8&UPj|b6QYmvZ6 zNZ74TPJ-;L(cyt<Duxvyu#29Hn?vdKmgp&*r8AW-MZFqK#yOU6rwQ_;gi8K^&w+#r z*_U<}RczYK?2*q3Y94L)$DJJfxvBs!ONS~~vo@`QUtH>7o8B3fI%3TeS#3^@bDwB2 zuG?yCM%1P?&C|)kqI{PnJ<JOF7J}=nD?ZNX>qFysA46e506shFZPzBIs^XUXu&Ow$ zr)F;{MOnVXk{*5q*aKW^Q?^!p+>Bb*JT_rs8O+AV{oE<RRFXuvlp^17#R8zuKvrxx zcL0t~vcMMb^bvU6=npP1olk{HLvzsPphxL#%|sr%<(8a!pEe*Ld{Mk$oH-(7=`lv4 zT#q?@)KyQoT^NSiu?b#9os-RiYfd{!6rk<<IY(xIL@@iygi_Pr`HQ!ubKvr)Fw2cU z&ozHWk1;Wm=#g=xJKDI;uD<|kGB^}?_ZeW&CB(1>Ic4+84}7eNL*u5DN174{tu>G- z(uW_2DH*_F`t&kl_TryLf>$0CsRjxYZ@G6=`xKJ=e~-h^gg$26-k$d&;^QR1x6YYS zMaE=gSe;tAU*c^Ul`<l-E0;JQ_@kvS_6p`l(Lq{#+tL=<B%i4EHWdIcZvsRN?Cv}5 z<CADsz$ZN$8^V5T;FGh@>iUW5i{te1!AfmQ*~^@?TV3|1h1xHbQA3|>*Lt(dBhDR0 z+k&O?=m@b`=4-9ah@XVQ$9ZE)-frI4Q5cNcWqV%r6&03(qXiE08p`!YcW%n{{wm*r z;Of0y>@j!h8J!MG@i4$bOv7aq4H6s*?0gs1bfh`BU5X_UvjUe1Q}K_naSV(x^#@jk zN@0)cEb7!xZLIaR-a9G*kAE&<UXPK}5=cHKh9^%$-_&~H%h!6uR{fBX@m~Xr>N;tn zq=+F~VSy6KxurN$MlirhM^pwoFCzgW*S-EGbW>QV6d46bM?V2oRya2|3APg@Q9mqS z2jL-e)|!L~kRXYD=X&p5S0nJ<OnoU5rQ+={aK%Y+hBmUXp*-Pfjz15g#{LZG-QVcy z?;j1f5xjnFCrUfihWUbv!MX(MM;<G@MDSZ7Can^qY_2x(#o~y+Z<CG_oH%ba40zEr zH=zxJca=w%KVk#8G(yMPEZRn+eEXIblse8dAYETgKElFo6OM955&|fy7{Mb#>=bIB zfDqd|*9v2sy&pmlAIwRWnTGI0oMgW|NBJi6s|MNJ{315-n+?hvqd4?BHK+X1T|_?Q z+Zd}<Dx7|G{p>!&GYw5wL|B33Hm?-g^M`qhAo0=>vtPylD@V^HQ=RxAH13Hr0$rnl zh)~PiQu1rgWQ7k8X3geM)Mni}gR&GKx=z&z2&W2NRQK=omk+$I696=egUH?!oHD|X zN%=<Wc7M(R!am0?SIZbVWXj``;5dS-un@n?AD4Ou4DPB*MJADczoU3<(-SE_igkc0 zt%ci^5)IY>_$U?aAr%1>Nk5faY(bi915SB4w0$ZM8X^8<6u-Y$DlEefzOvzc%mqji zI>}&;&HU6vssL{bn-GxU%}YX6IQNzt+ms~IGDMn@-+~IPb3PeBeF!456p%K#^EGFe z`1DVZbMO34aVEBpIn25rLu#U*Mx6e18s{kLQVc*p#3Ing$hK>0g+xWtzJ}*Xa}7W= z%xr3WZEI3MwA?J*t{l?cORX#+H$KpSDxCEoi`!=ZImIh-H^L!GiZA5niN25J{x7VL zZTPFMr#NjOYwr?@(ux*0kYdbSGl+VXCm7x%s2MUW3ju<T-BbqwX;Ny(ZqL?Mo*{$4 zdl>+2#*1%PSv{jdmB=j~y||1|gl+78Q(s0O&_+jZt-@=rf-mP!Ppe`M4Zrd$WUrER zT{$=({|m-6=wjrmPZ*QX$v+nhS}jm~B(*e<5t%g!B8~$$mLp?m6Rr)uxP|+n2^(OQ zLsJ^*$8f=xBvK_qCe8_e)8sJAC9S!*n+4DVUoWE$In)Y(wAQ%MGwV>H<{Gtg>%mDm z*`&8=@g66(*day|38DMV(E-GAXWdo&(3@kzg2yzEutro6OZ_h~&r`4kO^Z?KJ)y=) z{V#3g_d5IyIMp3;=V|l9kfaiisL2C)Tpqu+P3ri^$Mu=8TYQ@*?%1NP^eeChD*$P# zeWk<NLkRkD<X)!N%y!XP=09wzrs~YG*GN34nRt|37&%d6xQTcV8_xQrNh>$Sx@w|} zH0GX>pJKyhWt4RE8H6w~1Jz+5oCvd<ttXfMz$+`210q)cK#d(i;C&2Pc`ui=8FRFf zg}90e(Rn?kXVp&MAn`lEwbotEHUUiYW!T`?_QrhBrvtN)SP*TGigkcpR{ZHy%wBDR zk1Al<AAJl%DTk7%QAwGpWEn~YeER@Rw0Z8}<Bw&=39K%%hl-z*&#&@v1!jqAJ7P#| z6}$4AeBQTpTZ`i{KO>DhP@9c5J#h)TO46h`_03voGyqnT?+fDkSH_TMUw~hHXis9T z*8AQ_$}x5Cqp)c0@RL}*U0}=|7f?F(&LL$)4vygvlE>ZAhEs)2xl|dA0Cx0k>`9@1 z#0*Q**gpfNUDQ1FSsK;*z;hPmE^IowD}kA-1zEqrCOWUV222Kg@^ZSis`z$#*O8K~ zK-71+X=12%`73zL+5fc30|27*utT3*C3fYOX{_3AWVbhoBZN;^i^fk{lZ6JCK62-- zHu21{N$_p~c-~emFgHuuPQzERM|XGePaqgXnB9WzZ0Hu~Q&mdU&y<2XPm5dpx6{dg z4s#_R-*GMF(0lMB{YEYClr3C3U{48I;7q?eKMl%7z3cu1_@~%S#3?>au8so%L6{Bs zUc7~b!iM;NEkxi4Uv7l=7K-*i-7KK8FAw5B#@~($Fy5Do^dD<`5h5@Z0s`XlU9jHe ze-A_8t}n%3pF}#!64>|J@JE<;`Co^3jT=bi$N1Mrl&Ymc=>5JKE(8SnfBA#~9sEfC zwrk@3h@c>lfyBsojQ`)8YX7@tkMUpOs=zZp(!b#t{zQ<O!1osD-vR$!wEpm45q>}$ zf3m+3vF{Q6z;b``zt+UNH2?(v9}6{r2$B~_AMl?~{5OjK{WMshO#l^Ks?R?|{11Ry BG@Jkc From 592e61ef9ea05df7a61f5c1cc8784785e53d0c7e Mon Sep 17 00:00:00 2001 From: Liam Stoddard <lstodd@protonmail.com> Date: Wed, 17 Jan 2024 14:50:08 -0800 Subject: [PATCH 947/954] MR Feedback --- .../lot/application_decision_component_lot_insert.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/migrate-oats-data/applications/decisions/app_components/lot/application_decision_component_lot_insert.py b/bin/migrate-oats-data/applications/decisions/app_components/lot/application_decision_component_lot_insert.py index f6bf4ffb96..9d38c8440f 100644 --- a/bin/migrate-oats-data/applications/decisions/app_components/lot/application_decision_component_lot_insert.py +++ b/bin/migrate-oats-data/applications/decisions/app_components/lot/application_decision_component_lot_insert.py @@ -32,7 +32,7 @@ def init_application_component_lots(conn=None, batch_size=BATCH_UPLOAD_SIZE): count_total = dict(cursor.fetchone())["count"] logger.info(f"Total Application Component Lots data to insert: {count_total}") - failed_inserts = 0 + failed_inserts_count = 0 successful_inserts_count = 0 last_parcel_intent_id = 0 @@ -68,11 +68,11 @@ def init_application_component_lots(conn=None, batch_size=BATCH_UPLOAD_SIZE): except Exception as err: logger.exception(err) conn.rollback() - failed_inserts = count_total - successful_inserts_count + failed_inserts_count = count_total - successful_inserts_count last_parcel_intent_id = last_parcel_intent_id + 1 logger.info( - f"Finished {etl_name}: total amount of successful inserts {successful_inserts_count}, total failed inserts {failed_inserts}" + f"Finished {etl_name}: total amount of successful inserts {successful_inserts_count}, total failed inserts {failed_inserts_count}" ) From 26f18f8d2f0297e061ccb1f3cd8cc961495eb699 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Wed, 17 Jan 2024 16:19:00 -0800 Subject: [PATCH 948/954] Code Review Feedback * Support PIDs that are not exactly 9 digits. --- .../pdf-generation/generate-submission-document.service.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/apps/alcs/src/portal/pdf-generation/generate-submission-document.service.ts b/services/apps/alcs/src/portal/pdf-generation/generate-submission-document.service.ts index 61c55d3785..12e520a972 100644 --- a/services/apps/alcs/src/portal/pdf-generation/generate-submission-document.service.ts +++ b/services/apps/alcs/src/portal/pdf-generation/generate-submission-document.service.ts @@ -386,9 +386,9 @@ export class GenerateSubmissionDocumentService { } private formatPid(pid?: string | null) { - const matches = pid?.match(/(.{3})(.{3})(.{3})/); + const matches = pid?.match(/(.{1,3})/g); if (matches) { - return matches.slice(1).join('-'); + return matches.join('-'); } return undefined; } From 0517840c8d82ed7137ce597b7da9236b5bed91c0 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan <daniel@bit3.ca> Date: Wed, 17 Jan 2024 16:45:17 -0800 Subject: [PATCH 949/954] More NFU PDF Fixes * Show not applicable for missing corporate summary --- .../generate-submission-document.service.ts | 3 ++- .../pdf/nfu-submission-template.docx | Bin 32404 -> 32333 bytes 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/services/apps/alcs/src/portal/pdf-generation/generate-submission-document.service.ts b/services/apps/alcs/src/portal/pdf-generation/generate-submission-document.service.ts index 12e520a972..74147fe953 100644 --- a/services/apps/alcs/src/portal/pdf-generation/generate-submission-document.service.ts +++ b/services/apps/alcs/src/portal/pdf-generation/generate-submission-document.service.ts @@ -46,6 +46,7 @@ class PdfTemplate { } const NO_DATA = 'No Data'; +const NOT_APPLICABLE = 'Not Applicable'; @Injectable() export class GenerateSubmissionDocumentService { @@ -232,7 +233,6 @@ export class GenerateSubmissionDocumentService { generatedDateTime: dayjs .tz(new Date(), 'Canada/Pacific') .format('MMM DD, YYYY hh:mm:ss Z'), - purpose: submission.purpose, fileNumber: submission.fileNumber, localGovernment: localGovernment?.name, @@ -300,6 +300,7 @@ export class GenerateSubmissionDocumentService { owners: e.owners.map((o) => ({ ...o, noData: NO_DATA, + notApplicable: NOT_APPLICABLE, name: `${o.firstName} ${o.lastName}`, organizationName: o.organizationName, corporateSummary: o.corporateSummary?.document.fileName, diff --git a/services/templates/pdf/nfu-submission-template.docx b/services/templates/pdf/nfu-submission-template.docx index 04c03337638e28bdca14ae8ed73011fc8254a10b..5ff599908f1d36373b5da9a115ff94326e1bcf20 100644 GIT binary patch delta 6985 zcmYjWWmJ`0wB^u<q|zk~2c$(B4shshB#v}<2?!qzN_QjO-61XANF0!mZjf$#SMPZ5 z-Th~-wf7!->@nw<f96Vf1dTm_uvFxckY6I8qoX4@pm5b-QG$^E!FV<h9iXZl$bsv7 ztsT=LVYFPx+m*}h?fmHzH|eT%OAR=o@TmXl<TVF;rY|4IWA*y7t<7*_p@a1+g(WRG zHJb@N7A;OYHO4c*Pz&=ns%Jk}YE5ojOg0iRk9?JJB~ulT(4L%sBVxo(M1GDwy`@P- zE-_h$e_U!8b3W~SB3r6k2{2w`{1Cq7CvC*nN3WB_IpS!tTh@(7@tRvir?i6YU0{R> zQ#P^{R#X7`mwG~1D>g&RRBkioLr6E&N*Q~<9WSuD@*ta`V&;-+t!Zn+MX;3J^jw2n zg_MdcM<1y!#&g`yeamY*ag<66Ga;%6?^MF0QX4NPJ_i4caszfv2K2I3x-M21ed{A3 zt_-fV52d(8a`fyr?Qp}%3b@$us4(?Q(<B^)7wFx+6LSX~DT%5(^3K8@MW^97w4%<m zihC(4_*s!NWc7(}4kgd8)wo*hMzF=cH!b*nL~L4Ckytlou?0~qg#x~&cmK$MhMu`i zBWwpkKv+gZKv0p#{Esg2i-@$qlzjllOP^J3+*)lb5Qwv(znRq=o|~$0Z7$b>h*_`r zgXHmEbBuiA;Jfg3MwZJD`R$^P^Qde^mcCIOq(kpl&E@Y@Cmy2LJ$X)rO;U?>7*R$a zxQPKJs=;^iD2t8ng?3(zjyjZUss}xH$hKf`taluR>}TnsxkYZSO*(%7;vU-2j8uc1 zKL0d@XsATaEKhdwD@9**7A9^c-;Or&vFu38g4*{}P~;|Ix-uiJxkvs|o)Hu-1Ex6| z^UmhWMU(T5Gu5qy*{m`FOktF(#4tON>+rt&GkOYdq@k7e4a{b!tbUTG0ETW>6nDli zi8QEeR2@^foQP~TxpoRLz)E9D>@K^q(g^9L>pIp)=@hOte?y#x>&h~yv_GtpEH+s| zHxgpiU(qJ^opl_8lm~UQvSCb$^H_mP2s^YEv~|W)_C`H2$0*6r_yq2MKfa6ehj!<d z42Z@*w9Edb{XeYhApB>&i1$Js_~VT_Nfd>@CaH@@{eb*;2OCpK>2Cqkl|cOKADAv- zU7OzEzh=TUBdp6XVE?z7Fe0qmG~E67+Jq4;Fs9nAgvg28eovryG94VqNk*7UtUL_) zg%rXy!fPd%u4J@za>R!FVmXkMZe`Jv`=s5IJFA1A#hn-)!@lVlBkOPYeep(-8kQVA z-=yY<+=(hriP<8Z^nGZyc}V^&7D{@Z@iw^JxZI^cM|;-~O(RcPN46WHuv)E(73@X< z$k4hNduT=09!l|Z7*bmGcvu#*M)spk>xGI?${@ZAvqGv=7;|=ZWlUQNlrK!~rw-@m zT@NO|sf1|b6934efQy@_YAloUnOqlH?=A{v^QvkW-C+m#C-xDlq1CYGhPUg*9?g<w z>K(8(T*zNm_C*>!70krz8twKFVm>d_KGf*$_Y_wa`f{%2Gaj;oz2=aa$-@0>$>Pwl zI~?s&A?xmN)ROFZ2yY2yYU>vt)AQfod|e+m0vS*Kh*xx%;lcNhc!nr{Jo6v%>Lg5t z|CfGt;1$H<HqP6VaW-8JtO;`dA=io-3HhB(zqnmbXDtJ+yvX+VOt@{CsEMvsuKg<0 z0d*%Ia%b9ksZvw<a_Hn^Xz1qJ8VtCjMBVjwgy_2J+svlFk)(;f<=Lm0_w5h`JTxT4 z*9Qkc;e$>`v0;nKR8JdKfsGSi>F8o5!ND>>{esi$HC4S2KKRC`Z26QH0d8A@(ZP0e zM{3deq74^VzWN99Bu!+I7X<?0viZkuBseu1MPKKut1=2!tq*z9(Xf;dSv7s3U;1g} zkBnBXsd`>{+gA^2qea|vT2SJNYf2KsPeM|pdQIPrp*$=9PSSzLerEP%qZ`i1$n9(n zI7F$vRE{Gz&#SDBoy(Gi7R*~K6?n`KaFP_vu_P~AjK}fGzrG-3whOyGkuA4j)e3XB z6x+&UzF|_YXm@T&tE@BLiyTt6`E7=A`1}QW`xTVknA`)gk1p{=et4+H=LVe5DiqtI z`>XJWmaXj_B@t9)tVJ9?zDk3GQcP<s;GE~u%Dvr+{c(AO4LP6X=#BmNwH?+t@#X%W zyo=_m)0fL@GO-qu$6q9k4?laA#dgdQn+GN<%9UV-2MR>|;5)mE$iv?IKB&DkM=vHq zaOV5r!s&x6ztEj^6f)L^-x8P6IO6uB(ns$wDqR}(Ty^{u0SF&D{HGLi69UU|17JM} zjzT*No-~9}&bwPP2=>05@;F~H(aLiYG!L-WJU6>J=C@dL8Z&|5OEny(rrT@d-WoNv zc+6;+QFbO}E}AmnKbnE3h+UR8_>Pr}ysO(p*=J#+8=Gx2i*R)_ONt}%2J9=FL3OBA z!wS{W;ZYF^%`)5RCgXj11%uTS;C$Z14ZaiG+B~Mh*p_>kS!<VrVGwQ$)0p0cStHu> z=XR7Vp@+(qvWqX#?vFC|sLRgTDvbqh6P(<w)v?iBj<<M0V0}j`@I-l(Vwsi@OiP8b zd|LO#0oCY?FdYKzohl<2u9JJSPJyHuk|bjK3_=-jVU_})YDr0+yU-|*BmmBQci||H zg?}fh*@w7`^@Y6MG`>qfny{j%LAdoBKiLJw6%@6{6dcL8u#e0mQUuBF%#Ox$h_BA$ zA7}qK1`lbkJi#3Lba8iAU1oS&+Ofic^W1@lA%4a}ocYZRi9RPRk(e=#<Y$M6XEBg? zm8FKHqi(}iMVdEn!nO%m^oZx<Xe4PyDV*J`spWf)P|9*Mt{Vv#|K9$@Nlhx+gm0Tz zq*@`7xyS)-jcuSHgZqhL<OHdRGp(hwtYv4KV%)N-3Ww4Y-M3s2m4>sI`fFpUjxZ3@ z=lF!7;&f{?6nhi-y4x{6&ix8boXfkRmACR>Y;y)PRK0F6hMfW35Ix`KtwVn)%07_5 zp3^?PKiBfi5Pj4~*WsR+XTl1BD>?Ce*u|lV7(lY?^oRg6KUV4?@}BZttkN$<v-ghr zKOA_|1vbt&wairxhZbfl3|qrK-Y>!hpFD)V0#<j1y?O?BnK!-ZtrG6RN7uR;zP_T2 z)Q>~_O@az?X1c(buit_F^5}i!&?pZ>*%o(EhlmEj$(P!$!rFNO1v9Vpvu>k<N2b0* zMXUJXO=<IHuPX=lD?8S`jMfVguHzSMwxsG7%-7~;Djw4!T)(FZ-(-uBWq@P1Y-M`c zu#r<s>LnwD`%K*4WaHhYA*Tjs7^)@+3r#Xo<ld3f5ugD}i9uBf)q-P14>j{ia`31} zZ?NHmr(%0TLaTHX+xQ~?N85;eYHfxHeSZZ$`WNhp0l=NxECK!er~SG!Q436nNj`^| zora!dQW5VlL1{K0uLSrR6SfdO%4>|K2>Eh_GHeX7*smzD%tbQCbV;8OE^A0?Rm6PI zX%Q|FUiJfecyR?fl(EQ}H6-gQOPeZOVr^e48ykP*PN3>thV2a%*-g?oKx~JtV&%8j zvYnJ#Vs;nZO+@O@dT5WTQPRw~CG-8vG3xarWW_ljjYD;IOzuY&M$ub^Y~OjObJHg( z_2$Q8VJi2U?nWAN<UO{MPPa~1lK0crx6qXc590y3d75%ZbyPFX@X|cJQDJ=BPj(kB z`7@ZLWSK*m?>z}44DQ!fF+No_P|12}p9KlcLfL!mJV@Whe&b{m&tU4i*y22nml1kg z5q~~aPP`!_b;lUcT|sM58B;E~e6;nmxv7KjbYX&Q>n%02{Akz!Vt?I<uh62X9WTrf zB47jf3iCR%JxKw2n&z++#-lBBWYq~NFg3%2|BT4Pr;Mr*AWGXj6N|<y;lj!`#91@_ zdR4Cs+#S<rk`x|l66>N{e8tH(*7>%LCgh!wxc1j-ucrVLhNts{vd=Z4<4CQ`$Le1` z(#fT6EifXbXt2L6>G&ZeR4=QnFCt`p6r~2R@|M`g8G6k_?hg)7-|5yE=REZqX9j~8 zes8sg%@uRi>7m>ON^u})FbcSxziWLHK?&;2+`OjWTSLg)gCg-{O=%(~X~%8(hqyo2 zedX0qkV8JDyq;2b;^rD`;@X3On$;F~h*>jw;-DNS`mILl7W0%&D|*v~O89#Ga<>5J z@TE+EYD$*o&jL=Ucij{mBMTtT%bdNcMuY@Ym!5VJLS$xm4$%p2IlX6Q&%TY$4|nR@ zg(QlS_SRN$3(;KItf;pUnTA+{SwY4#z5yZ0A`oGKyT!z(0Gi@_nr!jjba_X?$O4O) z?_{0$HOpEjv4TGCV`3;8(sIKke(J!Tn6T^m{o)wH;0bp5*5HYij=DxpWK|<w0v+Gl zbmKAdvg?#^B1q>RJ4Y{Wht}1h74-)}t62wmCC|J~)eKZ$I_XWJ0KZ+Su%Za`No_g9 z8QjP{d?B7CDxX4Zk4CpRUAVDxU$N~@CjB&Ly3jN>`HQPPkC5%A%v<TTMj23ck@2oG zLWcm!P_yj3RG^xZl9B!7@Z_xvTNCz`Gdop7)V99;^WkQ5ip|;H*4F`_dCs>Y_+D`A zO0oQSU1QMY#VwAcQ-M-Ow$h9Dn73=0M$IMGki{G$68_mWB;pP^VlH5+2=_YzhcjuO zdcR5kC3>#`en^UF<$Fhrh{#Le4s<|EA>lPX2}&VT%IWKW9&Ho6BrhG%Md$QvT!)O2 zcYo<DCP?a(Ack%+sDwPk;W-_9osrrLb5izHHgfID`nVzPYKOVVTb$R`j-??)a6U5B z-IT-)XA|^l#U677(qxdgOBn0C@02Ku3z{QE!mLuBjaWozm%v8Err#;By)$aW@Rf^u z4HuSgZEr_$PqZFxi(iZjLzV>nQwh}nQ{@}!N`~Ih9MfQ)LdEhk)Cil1EG)xQwUE%D zOZpJa<{a>=nZZH~F<oOAQcdQ!2G*MHuT{+m3ADV(xK5<{=&umfYMoaB^jGT)<+x(V zbVkg`p$IfedG~~fK$tB)>V_s?Q!N88pT6Tn8_fbNr!v*C#wrcy3v#bNdf%EuHq8|% z%uk(cGwyk6P`wQeO<hakN$*i#)7_>!`b-8#uD#yc7azz4U6&EG!3til*Wb^sF!l8u zYoon?$!Bq9=KVVa1*=`SYldIKp?<oeY^pu0^H<3SBJ7((fbt7F=i~yvOfqx_0V$mY z)rX%KHWl`4h$@yVaw04aqvRecX6NzCKvObWw5{v3bWn^xiYQV6HNib&I=sRIm8&h- zm!FFW%LvWXJ!5pDA^?rFE!dl%G#xrfKSzg{Y_MHhG&Sp#q?lqBc^0=VB(Jbh@#Pgi z&3T$0mcpxQpfFC8maS*Wiu+o1!u-e_wFd$3LnAi(iKt!B^Ucwv4k^{)W=4JP_HeN8 zC6^x!Dq+&pw<?PG;^BbmPi^;>IXZ@%T5T-zHfeaXF_Q(QrDou4Ic^kpaqsiiX^57; z@}`^*jR!WihwXHH^7YEemVrIx)=5v}_u=*>0b;W<AjPC$2!{O%muS9wY@vP<K}!>! zF@{T$?YxN6W2xCSxR+}8{ToP%td?J|%=1Dd+Ig|GCEO`t%kH<E3Z-skmRIO6Iit=| zYHPqNto2vMcKQ$WCzPBe!16I^bt}!_3k>~Avq<1bRZ`ZHD!040nk~K8o9O9VL;nqC zA$Or5Aa4bfN7K$C9b&=QUtdV`ySdf7&KRCS45kF#Txsuv$XJ$?wZpbi^89=q78?A} z1Y2_89@y?9?z)Q8RSqv~vqBa4&(|WT$%Sd=pr4JHCVdRb9&xXHpp7Z<Xv6q;Li-0^ zisE9`ufj;g3*V`>htofc<e4rW`A}S`k{GlM#7kcHYlx51ia%&{W$>({<!%JIXi{P3 zg{#wl#LKMZP@n-*QHKQCAkDk1rA3{h1P-y-YPb-=PskHs@2lcb$9DDetk*X@!mQL8 z_2fuBA-Ud2ca)kH%ymZ_(Uy}It)B>bd9~h_(LLbp@h*sDpsTUZ`L=Q(wtK3niBZ=9 zoOb%YWWmsPGj7)+7HSs4nIl6J?9)kX(`cC_6u>F!Tm+rMt5#C129;#5rYL*<+1}um z*re<&nAS*V`sx`KTh12n!Y6kfs|Lxv>n$mA7}WHucji@PqSk(7K$d4xAb;lZOjwwD zZ6OZfA+#4Ef>z7#73h@i^yEI_zH|?WiDnem3~U_YNNniu8p)Pjnx}&%(<AO=u6-=+ zQFpP)OsDI>3($_3-pc(2s-d92@+9=dfg9M#G7TK7ao+kZMaA9YBQ?E+;0`<K;cP_l zlOEvWx>Td3X-93pRrkO3JDw#Bb9QAXFUPq#V(N5|R=x9EoJ|ULo?#<z#VH1km>RHh z%a%4QX;zX=I+o;vj9E*J>{>R>ex=2=Og_Iiq=<BXGmO^`Qm729x-<XKm_){8LWzCh z`hl0y{%fD~j1`ehmO*tRH~{9)tL^<7)r7b^D}dcXQE5*51V^b4y+M#B9v)JwJBam> zS7tsUlrP0Tf0%uMwNjT{#daQ0h`ajzcmPbdYG62(1)up~oLmNw^p^DpF_53*tKmp0 z&_L+qG}IN%R&P)<^|NyI`U}+Z;;5B`#HrBnWf}9ui|Hf{wh&*ZM8b3fgvd#xX-VlN z85iEzD+~us!nn)41@<LL2*5b|N}<_w(>${iX%oW_?7qznHlb>ag+{=(Pbt^yK<OY9 ze1$~a$9{z^gMx)Q<r%xvC;3@u`^Kzr1gWLP_0Q#%?y0ur<@QXX&n&wMm-`8fM%zmV zO16t}3y%U^PBy-Tp0vq{M?aM`zSZ5=Rc7N2hIdN2kX-ddnu?k_TESEg6gub|6OA<q z!2%=|dF49FTvcRm=Hh|THsO_cTZ-*1)2}SIJi*2WvcJAp!exy3H*A~5F<FpMS!UYl zVlWup>FbgmD@(O>>F|FmC2-<1v0yOwerq<i*ko;fIT9QjJoX}V9VDtGwVMo!LD}!d z^VIp|r6SBq+OMzMwm3(?^sQs>!tb4<=JTXnLN=+Czz{g`luj-XQZ4`WMVsmUr$>bC z!22E*eP#VRO9jnh>?JQPw`iOeE!)y&+c}sI?#}{)`|lzqr6yH^H@=0uG`Rvb6iJR_ zv@hIc%cAi&j+LJIw;{dIOkE$3eCz9&^7g#F>30YJoyywUGjxKpMXXVIRzzA%gcO_Y zHG;w^N92y(!rYKaz^}pvzS8$C&tO02h4M5SIGM_cq`o@7i^WC$3iB7SYdun=^`cEU zPslq?mUewpED@%IX8{l3JooJG<?lbgR1co_p`sX4*uOxb-aUC6%vpRAi5C(l%%0>2 zI>yg{imzHdhxm8Cj)4R^MDQeh|GA1z{F5z5*Y5`sBI*rUFF>qM`o3jYF1d_+*YSeY z9B~J_LCkk3t&)g>-FB-tdB|>rnPvbF=ogkaz$D97IXRqT%=(srp8vF~2!A;gR;BHf z8wNdTO$l8*FV+#e_2H<Yu&lN?R>XIUXJ@{<9lQGdbU&m%pEq!~kHMqI_RM2c48~W? z-eJ{g1}+bG26`Hj2Hh*dz9*5m21!^Fr4k%5G!ZT|M0O+0Qsmz;%OkGZPo}Br4LEjX z4fMp^>VWV4p#99cyVW=WcM=AU&bI_JeiCsi3Rp`zDsDJHh#5j_HW*(;i711UhJn<R zE{@M!Uy1c|q5EDOKAxL|gYwYDQ({nPHYRyoka6pK!1i=HGnkSG@lY^vNQM_2TIm=; zx*H`IV4rA)@U@EPgxju41*K7&?6LN!^V0?)p4qv4VIEmZqo`LsWOar<8Y+JFjT@^| z;544c`G+IxDQQ36^2<nLRR5Lwi=M&m76E6@`kh4<=hUe)S7?-`!&*u@ZjoK8eEkVA z)+nMKfb~qk>{+%<xEUK02N_0PtV6|XW-D`3Bb@rR>>5t}UTS%ol2F3P8crUjgxM+C zyuzEl+<ZUCS_~vdbKi#FKY-U!h3w;If@|P_D#yzTf)s0WOVf)UQG9Zh+Z1M06%aNx zOdn;5*bjoy#b>g@muG*d7~>7~G6`IDzVcWHWL=Yf>H0@QFf`;a^25yiI%XAHw^hu9 z$6E?SaF*ZiqPFGTf`4p7xEmqw_X!V#GTHW0ZdIdi-Vby@Id6hdWOZ!ocAFs1*LJfQ zzqFqAAc8||H>|3TiaQo?U>vWaL2LAZ9yyQPeB!c1`EXRL`55f;N<Ry^p2+O2Bt8o; zm*O9~XMDuQ?!x(E=5T>`VPJ5?B}dJ*`c+y`-GELAx;_qdO3f`{JyglM%(-F$gOPZV z(qod9SIK#T4x1<aO~!e{@kO3`S(D$jW^97<*Up|*tCXPKh;PB`wEl>Wav&zYH$_-! z=eMGlo5YV2?|-wzOo0p>b4R6?XtOZ^UJ0UnN48=d=PchGB^^sI6!N!7aQKJ4avdhM zQ6q|F;u8>gHupBY5lTA`OYQZjJy;gg&^}T`<HPhbM86gbm6uCjktbd8$2fnN8D}>l zXzYk-qGCYiKdgLHKV_q;hR3e>Etp+M${k)t&Yr)$(=%Y>Mr8Cm;)VM<t?Et!y99kg zJ!_=BZ$OWk1i@7AvX54YmnQbSRc^>IyfG3xCwGtHGB%{q-DQ%U;;>`ZD(N1Y=N9E( z=njc(3H|Ipj*LWowk~^b`sF?S0!%j95#Q5P5@oti_LWUoQwgBILG)BP_CA@j1&+C= z=2F-7rlL`1_UiR<fg08I@l!PqVB4_rcFgo0jN*jKtbyRVl7nh)-q%H1)VTj@M%PCB z%O$>*HC(HZdDQ8MgZ@pprn8{5^xd~@J-~Wmsoo@P|KaE3FPnMU4-PIrunO4Xq(eF3 z1jWy+8C>8jnkC~*+HL~d$1i`~N3|buE8~DfDws!(^uWRfwt~+NE;&2vxTb8lNk+P? zcNOlVx4V?lyhR^G|D?BMv?yq91PBO7nV^5tTM*()g#Q~w#p8MNqW=@O>-?FD#4CHh z{oDM>>f@uldH;s&1KuKk5&fg|UsU@j@E4;$iv7jukAi;@*XLhU@)7#mNBRh3|9ScU sv*UQU57*x#EMGE^Ks>WA4b`6u|NS1`e`Wy)2x#%vzI3Q<UVk?K2c0MbHvj+t delta 7076 zcmY*;Wl&sOu=Nb?4#C~sHMkD$?k))$Tm}p7g9dl^;2sFUg1fs*a3?P}_p9&ScmAy2 zU0tV6t#!Kg-m8DU0Fz&VsHzIkFgO4N1OxzY9Y;MXDG>S(LRf*+;8Ep%c8tzz+{BB> z9oqMn#pQWrbc_^gFx%EyAMGPZMm;j`E?kmm_tYpJ>x8&+)@}te&#Z7ydv(<+87S3a zpj10qLm5jCy_*o6R82`VU@PrmH9i5NtskWadG?xuWHlVvl><>b6C09G7?$}<83t3G z#5jq(KVR*(^Ck)8g1=xn42tR@dSU(0(G9kMbwg<h%O@q7nrhfAEMEUo!9~v>hD1$o z!x4!fVn>2+H(`93?j+B!D&DVmBo=qvg<Du>_oWOZSbmYaxv<x-!Dmme`K(E-nnOaA zzY1_ug;@{0+k@Mu$=ImHqt6|HP{+Ks87GDs4|0RnIbTi!zz&N)nuZPTk{?<Dqp_3Y z7j<-CfJkjRW6N8go9fm}GbBc}V<bwi<wn5-nf@GYeFug26LtLJZ>nN5MTu=$c{@eh zF9Ae$?1zj*i;;I1d!R2KR<e0#D~=nYfgJ&59GCUjHNm8$-$X?@e?zG%z$1`ipRs%d z0sw1J0D!6j@_%%JEJIO&M;*WY(c_+}piF0*nwo>$BDAc6R6j@_sf*&r())^m<`3`s zHWmWq-D*_0gibP=(wLR~4@kr_wWHd|VDm46HXA-j3*U=g9ZU_}$5<6uX5+BmPnf>I z`jZo};M%SPUuK1{yY<v-|HR<z49dyq9sb6UGArB|cT6~3VK49=40>A&siQ~hN9h|5 zrq3rX@5l$cWs#hLl@x~At}~1Rw8!I<h<)ZbkdyO7(-lVBJI{g!XXxEWvLVIlMxz<- zxe_KT68%qKf}IoKTrfntIl9*aNK;4e=M+-CLQ+F~f4p;!o_0}FYy=II=mqyD>k!1v z*hTD=F+Wg$reu%=i&%4r_tz<0oj0Qr7K<N_H*K}Z@K(V|u6^YbyHigKqg{MlCD-Fo z<Z@ht{j$YDYpaSM@jTCK@V%9*&kPH71ukiHrfOc1CrpOFV_?0F>OOml>>t{>yjTk~ z|IiNlOZ$IV*9H9N!G`$2{P?Fg8l_+r|29b@1kMZQZw3unS@~~Zq9+OUw|`9Z@ESV| zhW@P!Gm`$dt0v6w8h4Ek|1Fs?qXKuSiT^7qZtBJNAW1E0m|6APSy%cSVDu7(LNnhL zp?ZJ`b_8RSfTq^S&vk-{vAEJ}ber!$Xrimn#POUAlMc&-JxsgLPmg!TNO7Ajro$E# z@k6d69T~jdAdv>S3E=}Jic0(wLxy==!A;D$Lu_qzXN(!1Q%y-T19<TCP}Xd=7KFJ& z11%=)UB)jW0!D?x%gCGc{CJzhKs@v1KqigGETid2+WSrQ!zPy@^T=2)D)?@iLnNr3 zNH>7N5HqC0AAWq%f)ACY3)UXneeNeZ2FeHK9CCNwXR~&}cGM-~+TlrK^vG$axeh$O zu*Z09HtUdl7K1AG^ac%gSfVt<vrpak)lW&W;jCL=2<jYx*EzDsTVLh7Tlt))ZDw0C zlrRkq9i-dVhhuB6#?c^~+<!!~UAq+H{v+BY%s;*IAJH0REk^!j8^?+bOeya9m{d6` zRKBjMUXGNoqB(73i}D1|GR0d;qb8~D(gu%uS~xc0ALpIypG3njoF?T#3~FXLz)`KQ z!5O~DiVxr2+A;}vI`=(HbQafhR(F`o<dK33Z{t49oec<R^;)Q*pm5nVkB8kY;-xIO zn+gB@Fj}|6Np}SzPn4$sV~}{LM|(|Tjt4&Ic3zkFXP62<j++I9-}=l_46Cqshvd$} zsfT6DP<fY+OJJ4x3J>}-&oNx^ZR?CfoOtfO{49i{BTZ%OF&C3eEV*kve2(u<6X7%5 zuaq2IOW+De$Y=a^zkTtP4!2{e|C0u(YKEW(ll9svZD(ti&W6hsOuCU(M4v+=FfL<c zMO7{giIT6K^GjNP1%z8B>G$Z`=L$rB<L24WEBPw2-y@q}Q?E*~TuhomrSS_?q7VPw z_4e!dRWTopXm$SrO&y<ducu(zYoN>OZ8B|n7P-;;BK0bNRirtqbGhGP`x7L5qW7-5 znB1rD%`b{P3M<De!8~I#v&BcZ)_zA9%07Km!UQHeE`l$?u<B(iy8OvGvm!b9zQpu< z1RijuLFw%U>-N;OJcCP{(h&7em^*oB{b*=ez@0J$IBw?@#}h2_G^9s%ktcqUc0w|L z9@*fheA)AKb{kT+06Is%2wCQ&v_67M#cc9Z?+;#;LqGfF!T0(+IM_d^9wltS<SO>Q zJdkXcsKX9#r{sCtMZ}D}FZSIr8(o`YqU8c((Jy(aB5o@uh?JtIeCW$cTKh*1M|N3b ziUmFILEHnx_X23}Dl@{%qK3)GZ2K-(M)tfOngsf1T^=Wgbz#I>$=WCWz89P93>ZhZ z5mchzCkE%J!9PtL-#qA~$tto|e^Y%kjLa4EQ$1qp`_`!vsz|D))Jq~e%acN6Y67|~ zj(?WQZj<6?9M;d$xX$zb-sb&M6)l&ITw^?`<5DW>z9$c4#4_p^z~`bp3d}}zo}??K z)cij8=rAClck^0ck}ZEstPn$~>_&~NE-RB&Han|E2PU>rAi-5;@#-vuL-a4GFh{%@ zR8cmLg7gZ?a_CPu__{{A@e*U4M&X1mX%bE}%-!00i3_WM#mT7FDFSp(_<KGz4f1ZE zJas2z$=T$g`yQv%9-p9I_ddv2@Phnlamw@0e|>4I7~oGD1KfB0@PDmbd`3hyt=31r zt>Ew$2JcD)(2mJIiCO9G4N=FF)k-C`+$2)FQ4%kNJUQj0V-*}-|JmEGxMv0TXT$Oj zWtKfYm_b9)gknh`=7&1fg!U^Z)9yCN-4e^Q-YFchX}vSigsvql(9SZ&c)XOH^}Wf_ zjBfWlDp|Noa*8$4wG)mKold^HpJuW#ztb<r1wVg5M-#g0C$Wj=cBa3Zw9D0?yGlMP zQLb^`Ea2LI);u&Lyg|zj%a<joQhazW%QTz^4VNYi*QC8rlO6eNXu^fjHT7FJmUFSn z=5vNf$d1=K-cDO>4%RAl?F9VTdDbbp;OU+#+=vwFE*G*~;C~ZAhD?xIQx}Q0ZF;1E zz~#)9kLb>8)tSCM9GMw|ADaC3XXnBzw%54!zn2q#jl<5!Y4iKE>LUu`@Yfgw6<<+l z7-l~>`P_YEJc?=mB*J-)#k$R%lSR|cr-SZJcShwV>!L4t+_05_r8hokzu2Ec?gml_ zT~za_s`23_H=$x{N`NrQTgAuUfYQoD!0?~};63#glh$I_zT0bLZAwMm+QUVL*X=>m zF^zn=@9yDMCnP^UHj>+NBs7sJ0kP6@yGi|*N=r?9!7i=3zxLaKABC+V0<>-6GNn4{ z$M^J_LHx~<jIJ2)IT69Bp+bW++9g_PUSiZv;+9dE!(9WMSYl)=6vzUHlK8+fu&)@t zleC<C{d*|Hta_5|gpFNQPBGuy8cz=)^WHF_+rXpYQX|vE7INP2y1P*Viw=gWtkmt1 z9UQq!R9itFi%`}}Xqdx&%sHvi44|POY?l}(<{wPbBQwO(J}aG=`j!+W*`-@Hm>t=r z<8%!pTYojtkyO`NPU-gw<yA;p2782IH0dxju?47(npMV~vwKFgP<c#E1QopF<`IMl z^j%TnKVOD}>8LxW0;q?LhN-TyqK(5>-ZWOFaKf?>Tq+`tM(K$Y#NPj2S0^lJGMATC zF9y@%zxOB_#Ysw;ToZ?jgFkV=G<oTy=pg_xa8RLL<E!*M*ZX_Tf9UQG27j7g^|9SG ze2IN)t{Cg)R9PPViBOOet0|%QKvnMlfURee_B*R)Oppj}gq~n>5@oM~_o7y)lCe)W zx|I1Hd^qJ!gX&qKXR5zbfOL$WSs0VCp78HTN!quQn98U~^lJD|EnIo5k8(H}R!ek} z>6&c3<=q?aMdBcTeydf-Gq8&K7+<+#5^L8<-s`P9baj<(z2<MTwsDD+)8FPs1B+#x zjRpcwAu{X$O(sG2X#IAc7}B5sgYpfXqIls?HSbU-ot1SEzjh|+pWE4%CcsM9Hgn@> z+|01=p8Ap)?O<fP28&OeiQlE@THm+Wq-^}imw7~Xq1KMKJQ49Z$_8f+D?q=#PmtD< zs>quId!xOWqNjg94NPdCywNcLAlbVOWCQVF7#8#2Ibl}8-U<fI&DD8qf8IS1x|BP+ zz2y=7jrm&f_Whkl5L5*V(|7t!C^xcfZ(W4tOi?-{DOC_<o<x6U`Q{~eYL2+F<BR-& zqimP#`Rx)aG*VeyG7h*fkn2f~<kNBc@=rkW2B~f|Lr<ZZlImyP?&Ty^)jq^DmlNg5 zkLbdxM?p<anC-B)e!=G-CrmpeTE-UoQ+9pMQrcrq<n$~m8fQwDXLdC<Q;+wP)#}$k zC23bL3})u7JBg;UnQ^&f9$z|0h+Bmktu}Zh`>lLrS&V+g`YMB2v??oavh;gm25_K_ zwJNVG1V^qamWAHi+88>Lkepf>Ikv<#u(i-FjhuXOw+!jhNwn@x$FzZhTeELi!|V{K z;-lgYoYSvs-}5J)6upWoA&`bEo9BY%G!@SoPcYN!wPnHgzv8&PGJ{EOso{VdlpMT8 z==a}!PLJ1SZ-oI54*I+X-X_LTbeSFk#!xFK%{9V)#7dkuQHh%->B8ES#X|Ux4ZY=p zw;F)dk-TOj0~kZ@XZV8Ukq}*eF6VXj#|tnG@~D<@jioE<X|8+7n<O%GUd0wH?_?@a z&<ZxFPlIGJW*B;2$sNG7)IBB2<VIIVk}{{<?;sTu-Uk-kNwy5U+&@?~qwV74I>N{; zvUhY@dte)&TcTB^5J8N9`V)EB{)yxy^`g)&L8sDq+mJvxJ!w48v;*7l3~gv%?^Vkn z#?w3`1g(aTP^y~sPGa@d15IV-A>Jk~K>CtJjKBeVX9@tK-0;W(niv2}$m}zKnjEp1 zo*xEGUQf8zf)Qw$$(~;G?Q;rGqxg1`@BZHK8&aF~;P(={w>|9T;pWf7Va{@+C?2~p zhBX2QkDgQdI7ZfS2Gf4H0a)u+;?vEoK|jf#RjXJ(F%voW=+{4MX`^7x<&i0>kDUcr zh4|jz5x~NRyC-#pyk>>115NF-^ZE3U7G@5?>&(XZDLu&WPakqcOw3emPRLmlvV~EW z4LJ^@?XG!H%M$!TlkNPJlNIIG*r4W`;Wz%=0W!2Mo2={MPt|dcm<CzBEh>N+y2`Yp z)dO%=&B(9jBUyY8r1Xt@BQMiWeySE7&TJ)v){kyMa|wB)yeAEXQ*)RFN`bbquAoM6 zH7qU0LM=G~W#h0C*2sw+i%EmMl%+1enT_c2k>A!T1~EAl+x*sCe`$3>P>jHi5>9c1 z#Q^HebI*2c8ZZL?YaIf%lOUmb3alB?J<YU)nlXoVNA4o+&j@=t+j31UTA-G`hADar z-$V+YJ+7BU%`B1I#UcNtP)?WMFOh4oYh!lXiebmC$n(_{wZWsIpwb&BAP7*0=g3t0 z8LqD4TeGW7B9O7th#aL7N=AF)gQVCakFr6HpFx{;<7;;cu(a9!T#~rRTWA$!1bcK& z?E=G?;dGR^z#|t;?I35y&&^=5hce;?y?Ude!|?j#8o96LSd-2`1wN5XRH_U7!^MdA z$35#>hC}SpJ4G8s&(x&1MF4yS{32P8vF_mtf%_aQNz;O#s?Lou$=V2TYY@p3(p0Wz z#-6uf@CkQ&%Ges?p{ww<z(^Z%v;Q&p>^gzLS|p1rGz8OJxQH9YyS<jEk?dPdWird| zZeoL+7nQ$JZP+gaJQ$9`1Vkoqg=f7~ccKj84gUQcZbedrr{q)@M+$~p1cvAyJ6-HU z(4p>@Ay4l&XBUZYe-5wLuk?AYFjGt)h+2&i7Q(Dw6_{2_d$a|gHC)zA@xibAikEpv zrsKMH<LSbf?E|`8jl4*x#B9^A?EdkLLSf%ihvRMeO_y6SEly;JxCefNG3^}a1NgCu zawc5s%}&A3MbxqyLnX_7+Xgnw7Nb=i8=^Yy^E1`CuP>Y|d+J@kdGt9d8N|v{N9-HY zb*bhLxCjy(g>#okKY&@0<g~S!+BA927p6!`eHzHQz7gr>TIuCJFU=pgAkH6T;$sdw zq3D}N2NdRn>xz}YFC^82dA@VLg6gE{=KEqOS_TqOv8|Ly#{|OQUU3ze)x_U#%WaFG z(0isRQOTD2YlYOqcb8Z3!1=+`*5`t*SmoieTVxKfkyOU2-5tlDWN<po8I72q=;)h^ zqx=)YUYYCJUY8YtwVL{H(U<c1^hIJ!sna9-L%WQKe(i0<f!Uhik6UbmHa^?d_G;m1 zEsX%*Jl?$K;zrkJ>R(K%#Pof%^sJujx|`gaUrQUlwyCI4Za`&g8N5YL>76^birI+S zs94##<<6^jju;WzY=`ML(^g4cX3E<e8t^`jeN-n(yP6XyD;(~QAt>O3;Um$#ZYE)} zM9Lu18SBgOr~=u5=f^4<Bac7r&)iW$2H=nzDIfOgxW1xy^L@rVje7B^9v*r+UPw{n z5I@TqqK}c>W@#$36OrSKd0zBgmcvCqNyyb>CT}L91s(i;I{-u4H4!h<KR0y6kllPU zDAb81pv}7C(?o|+q!g!)($rAe>-8eYG0x5x8Z0hQ8^)jmqvglLM3$XsP-tQm)VKzv zjt$l_OQ4~}j8dXf7C=r3!sV<a4r?>Cz8Sd}#2}@>yO%1c;@I-cO?;UcIb{oIjb0$9 zJ5Sgd>(I2)_n``f#ZpYsdks_EGb&!1QkmV^er>6U_E{(w!snS>f1BzEDZJ}=ef_hI zMKL*#_z3KQ^;-3x+p$;he0J*M6kj@WrRNdct%O>+a4)yfu9<9M8n#=f6;XYaWWw!Q zzvX_u6pUX`IEyfnt{Rb$E`@lZ;GTf2-3v>6lJr_ieUqwps<IS4X>v;wYMBt3L>PGm z^~d;$YWW670{f8M>8>mXK*X5eBl&f-Dw(k&!E_^F{LAE&&}1`nJoloJ3^%iSR4U{Z zI<!aV@NDHtw(d^+!#*r;T}0tBQoLKqnku7@CrG;%3!i)f@jl>&sM~J21`Dtc%ty#X zqF}-^M{WbCCr;tn$xh#ey}Wnn4`!%PC274KpwA$6tzOi0nW}Q~!`N&xdTs<-R9Mss zJvhpPiGXU^i>%SD^HkW~YBRDyE}l%Ed)I>^D->PGtYQ?(WXMmh`plmF5&Lm@r2@e# zsACSyP*li(^pE>nJSBZzFd`TGyE6GegO$22^hinHS@F`iqIk{J9yjQ^x|CifHw84; zLk{P!u(9^j4#?bLU(#{e4kGt~mPX<Ue4O@Rct$6(5b!t3(RV}$or3L3IHA28PDmDc z7uA?y!NP2KK|n|BEbm}jdz7Hw4ZNY=O#>>_@Axl7K<HIkZnwj`gh1fiAUj+doNi6S z^d6(Ej|DOwXHX+$0t(9=RoMts_$zaK&`wuB7O&<?c*&B8<OwnnrO5?`5P94{7D5sD z?eM2zN)o0{?Y0yUdHt6CzUe@%yP5&b48n~}czXJ|(}%F=oj+)D!m;`HYpspSnj$Gt z8Qr8`+t3;Zba!0>Ten@06{GpPy$FX?x%(bONGbvUH_ETqV^Mbn9r#O4v3-FR24%-K z%vY;kh4-3G?kMo5{A2eS(Zvnux~5s+q|a#2<Yhwp!84V$V$gUX2@%59Sn)aG7lBlu zv$z&@9{#&5E=p@cZ|VYeOT%&IsFKTR8XC&uu=NiaM{DVb_d&?aNuhp*>`h)rB4MQX zK#w{FD{7Jy$pwBX)K4lj;+`X%fUerF>!lxRRbfBY@;*tgfU$qDkdN%ADa!JJ**}8W zqe8mN70{4FcM~lL1KhV|K)cPCy4$ERRLcy6k0?-Gub0J%A;|8Q7Pb>jI+htzSD&Pn zwVck=Gcii5$7q)CV|=WGn&DuxIbc=uzH?&Zq{oIX4Ykat;&5|K*TFA4PcGsc^@~J9 zm51ZS)^qUEC(lhO6_m6-78C`7#my4M^BLSVl=FJw@EZDLl|d6kO2PTI+NKp5`9WKs z!BUHbuE|)?s)5o&2c>}q(Ci6-7%uBruH(UVm^K}Grw_k`#^02QBgd&k*nV*&h!x9` zi*v)?R69;LiD}L6WEmV@Pojo7)(Ma4Eb*d$sb_)GXwiK){0X!$7B4seh84PFiRxqf zW3KpR2KS)Sv}|Z+1D*DANj(Z~f=4M~7iL~!o+k(jn&zYQIzvs9`fu8R?x6RLd$k?% zWQb{{q-XF)sF<JS9mab5XUxyi(%KRb?e9Kho>^G#3Ft7i>ta-gUjNV?L|BcXNN;?^ z`zo#7pjAJAkc^G;F<#gfyiY{uZHncqpUIOIt#^M^sG{u@w5}tq9(DA}^QQbdBzr(T zhD(Ns(8~y=>TI9QYs)(Sn@&Z!ya#=`2Wa&*5Lr28DdHKX)l{gJJje|sGUWA?l2tc* zgT(LXQ&;bDq+hRDl)fX_&a)1^D0wgz`GVwQr)_zW@hX*++PV4#>_>lJq-BjOIohZe zLV2)H6IhaBtNduP2i*jlrw?DjDTmPB7fqXU<@qQU&2ogAZX}~pJTTs?D-15|nX}5k z<OhD}=<~RK9)~K_!MO%JJD@DU96MFhzf3|kgDsqU2JXck3=n;RBPRAY&C~}Eh`~nF z7FpELmaTM%qUB9sv?M8QPSrMq)^cBs!k}P&&Hz`jx}?+EB3XV!Voo*K>Hb7IhX~Iy zU-g}|^MI^AQVZ9%cS*(j)<F*HAA>5+gjQ9GL{2w;V^*3~-gev3&cGc%)Md|WFZK-j z8JdLu6n>2$SkbVl_V=HUFDl<^<y10Lw*L{S-l$5`vfy|EhVXAZX~6GWzYi-Lk6(}P z@xXpWcX9OXo|Sez<cI5k(h~n^8FnYHRpB<Gm95++<o%LQwBeCa7!Jr?(5zbV)D&!A zyri$<>U|N3GtL~*MbehEStiMV<|8<L{q_4FBX}6jc)b@F0Dvt4{xO1qP&k19Kh4tJ zgN*rbBmD8~b^jTyKoETS{x1G8{2{WwynmhgKwpu+*yk(z7m@u0|Dv3q*k6qH6Z(t8 z{}18)-~V09_zR=`^XC6Gq9KX?oMiu`NQ|%_WBz#4#qa<C_J2kQ001v!+n@4p&3``| S^Z(R9L#P6%;h=o~N&XM@%|m+t From 88af4a3df7fba1e3d645019b80d53e9269fd7faf Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Thu, 18 Jan 2024 09:19:03 -0800 Subject: [PATCH 950/954] bug fix for button-container box shadow --- .../alcs-edit-submission/alcs-edit-submission.component.scss | 1 + .../applications/edit-submission/edit-submission.component.scss | 1 + .../review-submission/review-submission.component.scss | 1 + .../alcs-edit-submission/alcs-edit-submission.component.scss | 1 + .../edit-submission/edit-submission.component.scss | 1 + 5 files changed, 5 insertions(+) diff --git a/portal-frontend/src/app/features/applications/alcs-edit-submission/alcs-edit-submission.component.scss b/portal-frontend/src/app/features/applications/alcs-edit-submission/alcs-edit-submission.component.scss index 14215ecc8b..7ec03b97c1 100644 --- a/portal-frontend/src/app/features/applications/alcs-edit-submission/alcs-edit-submission.component.scss +++ b/portal-frontend/src/app/features/applications/alcs-edit-submission/alcs-edit-submission.component.scss @@ -203,6 +203,7 @@ flex-direction: column-reverse; justify-content: space-between; z-index: 2; + box-shadow: -3px 0 colors.$white, 3px 0 colors.$white; @media screen and (min-width: $tabletBreakpoint) { flex-direction: row; diff --git a/portal-frontend/src/app/features/applications/edit-submission/edit-submission.component.scss b/portal-frontend/src/app/features/applications/edit-submission/edit-submission.component.scss index 6f1f2ddba2..a3f996c533 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/edit-submission.component.scss +++ b/portal-frontend/src/app/features/applications/edit-submission/edit-submission.component.scss @@ -216,6 +216,7 @@ flex-direction: column-reverse; justify-content: space-between; z-index: 2; + box-shadow: -3px 0 colors.$white, 3px 0 colors.$white; @media screen and (min-width: $tabletBreakpoint) { flex-direction: row; diff --git a/portal-frontend/src/app/features/applications/review-submission/review-submission.component.scss b/portal-frontend/src/app/features/applications/review-submission/review-submission.component.scss index 5ca22e79b5..0a6a9beb73 100644 --- a/portal-frontend/src/app/features/applications/review-submission/review-submission.component.scss +++ b/portal-frontend/src/app/features/applications/review-submission/review-submission.component.scss @@ -147,6 +147,7 @@ flex-direction: column-reverse; justify-content: space-between; z-index: 2; + box-shadow: -3px 0 colors.$white, 3px 0 colors.$white; @media screen and (min-width: $tabletBreakpoint) { flex-direction: row; diff --git a/portal-frontend/src/app/features/notice-of-intents/alcs-edit-submission/alcs-edit-submission.component.scss b/portal-frontend/src/app/features/notice-of-intents/alcs-edit-submission/alcs-edit-submission.component.scss index 14215ecc8b..7ec03b97c1 100644 --- a/portal-frontend/src/app/features/notice-of-intents/alcs-edit-submission/alcs-edit-submission.component.scss +++ b/portal-frontend/src/app/features/notice-of-intents/alcs-edit-submission/alcs-edit-submission.component.scss @@ -203,6 +203,7 @@ flex-direction: column-reverse; justify-content: space-between; z-index: 2; + box-shadow: -3px 0 colors.$white, 3px 0 colors.$white; @media screen and (min-width: $tabletBreakpoint) { flex-direction: row; diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.scss b/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.scss index 96333416e3..d25da6cf46 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.scss +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.scss @@ -217,6 +217,7 @@ flex-direction: column-reverse; justify-content: space-between; z-index: 2; + box-shadow: -3px 0 colors.$white, 3px 0 colors.$white; @media screen and (min-width: $tabletBreakpoint) { flex-direction: row; From a9ea1278f1ac2a1e1120a837e506ec8f0a6b1797 Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Thu, 18 Jan 2024 13:18:13 -0800 Subject: [PATCH 951/954] fix application and noi lookup in ETL (#1307) --- .../sql/application-etl-table-create.sql | 153 +++++----- .../application_prep.count.sql | 9 +- .../sql/application-prep/application_prep.sql | 9 +- .../application_prep_basic_validation.sql | 9 +- ..._oats_does_not_override_alcs_with_null.sql | 26 +- .../submissions/sql/app_submission.sql | 28 +- .../submissions/sql/app_submission_count.sql | 26 +- .../sql/app_submission_validation.sql | 11 +- ...cation_certificate_of_title_validation.sql | 24 +- .../application_parcels_insert_validation.sql | 10 +- .../statuses/application_incomplete_alc.sql | 10 +- .../application_incomplete_alc_count.sql | 10 +- .../statuses/application_submitted_to_alc.sql | 10 +- .../application_submitted_to_alc_count.sql | 10 +- .../statuses/init_app_submission_status.sql | 10 +- .../init_app_submission_status_count.sql | 10 +- .../application_cancelled_validation.sql | 107 +++---- .../application_in_progress_validation.sql | 97 +++---- ...lication_sub_incomplete_alc_validation.sql | 36 +-- .../application_submitted_lfng_validation.sql | 107 +++---- ...pplication_submitted_to_alc_validation.sql | 39 +-- bin/migrate-oats-data/noi/sql/insert_noi.sql | 267 ++++++++---------- .../noi/sql/insert_noi_count.sql | 26 +- .../notice_of_intent_base.count.sql | 8 +- .../notice_of_intent_base.sql | 8 +- .../notice_of_intent_base_validation.sql | 8 +- .../notice_of_intent_decision_date.sql | 8 +- ...ice_of_intent_decision_date_validation.sql | 8 +- ..._oats_does_not_override_alcs_with_null.sql | 8 +- .../notice_of_intent_adjacent_land_use.sql | 12 +- ...tice_of_intent_adjacent_land_use_count.sql | 12 +- .../notice_of_intent_submission_init.sql | 8 +- ...notice_of_intent_submission_init_count.sql | 8 +- ...intent_certificate_of_title_validation.sql | 24 +- ...ce_of_intent_parcels_insert_validation.sql | 8 +- .../statuses/cancelled/validation_script.sql | 12 +- .../in_progress/validation_script.sql | 12 +- ...t_notice_of_intent_submission_statuses.sql | 8 +- ...ce_of_intent_submission_statuses_count.sql | 8 +- ...tice_of_intent_status_submitted_to_alc.sql | 8 +- ...f_intent_status_submitted_to_alc_count.sql | 8 +- .../submitted_to_alc/validation_script.sql | 8 +- ...ent_status_submitted_to_alc_incomplete.sql | 8 +- ...atus_submitted_to_alc_incomplete_count.sql | 8 +- .../validation_script.sql | 8 +- 45 files changed, 525 insertions(+), 727 deletions(-) diff --git a/bin/migrate-oats-data/applications/sql/application-etl-table-create.sql b/bin/migrate-oats-data/applications/sql/application-etl-table-create.sql index 1e09100526..c29dfbbe65 100644 --- a/bin/migrate-oats-data/applications/sql/application-etl-table-create.sql +++ b/bin/migrate-oats-data/applications/sql/application-etl-table-create.sql @@ -1,87 +1,100 @@ - - - -- function creates a temporary table to be used by .sql files called later in script +-- function creates a temporary table to be used by .sql files called later in script DROP TABLE IF EXISTS oats.alcs_etl_application_duplicate; - CREATE TABLE oats.alcs_etl_application_duplicate ( id SERIAL PRIMARY KEY, - application_id INT, + application_id BIGINT, card_uuid UUID NOT NULL DEFAULT gen_random_uuid(), duplicated bool DEFAULT false ); - - - - --function creates table to contain duplicate type code app ids DROP TABLE IF EXISTS oats.alcs_etl_application_exclude; - CREATE TABLE oats.alcs_etl_application_exclude ( - component_id INT + component_id BIGINT, + application_id BIGINT +); +DROP TABLE IF EXISTS oats.alcs_etl_applications_nois; +CREATE TABLE oats.alcs_etl_applications_nois ( + alr_application_id BIGINT, + alr_appl_component_id BIGINT, + alr_change_code TEXT, + application_class_code TEXT ); - -- function inserts data into previously created table and deciphers duplication of uuids -- application_id is copied from oats.oats_alr_applications.alr_application_id -INSERT INTO - oats.alcs_etl_application_duplicate (application_id, duplicated) - SELECT - DISTINCT oa.alr_application_id AS application_id, - CASE - WHEN a.uuid IS NOT NULL THEN TRUE - ELSE false - END AS duplicated - FROM - oats.oats_alr_applications AS oa - LEFT JOIN alcs.application AS a ON oa.alr_application_id :: TEXT = a.file_number; - - +INSERT INTO oats.alcs_etl_application_duplicate (application_id, duplicated) +SELECT DISTINCT oa.alr_application_id AS application_id, + CASE + WHEN a.uuid IS NOT NULL THEN TRUE + ELSE false + END AS duplicated +FROM oats.oats_alr_applications AS oa + LEFT JOIN alcs.application AS a ON oa.alr_application_id::TEXT = a.file_number; -- Insert values from application-exclude into table -INSERT INTO oats.alcs_etl_application_exclude (component_id) - WITH application_type_lookup AS ( - SELECT - oaac.alr_application_id AS application_id, - oaac.alr_change_code AS code - - FROM - oats.oats_alr_appl_components AS oaac - ), --- Find instances of multi-component applications - multi_app AS ( - SELECT - atl.application_id AS app_id - FROM application_type_lookup atl - GROUP BY atl.application_id +INSERT INTO oats.alcs_etl_application_exclude (component_id, application_id) WITH application_type_lookup AS ( + SELECT oaac.alr_application_id AS application_id, + oaac.alr_change_code AS code + FROM oats.oats_alr_appl_components AS oaac + ), + -- Find instances of multi-component applications + multi_app AS ( + SELECT atl.application_id AS app_id + FROM application_type_lookup atl + GROUP BY atl.application_id HAVING count(application_id) > 1 -), - duplicate_ids AS ( - SELECT + ), + duplicate_ids AS ( + SELECT alr_application_id, + alr_appl_component_id, + alr_change_code + FROM oats.oats_alr_appl_components oaac + RIGHT JOIN multi_app ON oaac.alr_application_id = multi_app.app_id + ), + -- Order based on established hierarchy + ranked_rows AS ( + SELECT alr_appl_component_id, + ROW_NUMBER() OVER ( + PARTITION BY dis.alr_application_id + ORDER BY CASE + dis.alr_change_code + WHEN 'EXC' THEN 1 + WHEN 'INC' THEN 2 + WHEN 'SDV' THEN 3 + WHEN 'SCH' THEN 4 + WHEN 'NFU' THEN 5 + WHEN 'CSC' THEN 6 + ELSE 7 + END + ) AS rank, + dis.alr_application_id + FROM duplicate_ids dis + ) -- select all components that will not be inserted +SELECT rr.alr_appl_component_id, + rr.alr_application_id +FROM ranked_rows rr +WHERE rank != 1; +INSERT INTO oats.alcs_etl_applications_nois ( alr_application_id, alr_appl_component_id, - alr_change_code - FROM - oats.oats_alr_appl_components oaac - RIGHT JOIN multi_app ON oaac.alr_application_id = multi_app.app_id -), --- Order based on established hierarchy - ranked_rows AS ( - SELECT alr_appl_component_id, - ROW_NUMBER() OVER (PARTITION BY dis.alr_application_id ORDER BY - CASE dis.alr_change_code - WHEN 'EXC' THEN 1 - WHEN 'INC' THEN 2 - WHEN 'SDV' THEN 3 - WHEN 'SCH' THEN 4 - WHEN 'NFU' THEN 5 - WHEN 'CSC' THEN 6 - ELSE 7 - END) AS rank - FROM duplicate_ids dis + alr_change_code, + application_class_code + ) WITH components_minus_excluded_components AS ( + SELECT * + FROM oats.oats_alr_appl_components oaac + LEFT JOIN oats.alcs_etl_application_exclude excl ON excl.component_id = oaac.alr_appl_component_id + WHERE excl.component_id IS NULL + ), + filtered_to_single_componets_with_applications AS ( + SELECT oaa.alr_application_id, + cec.alr_appl_component_id, + cec.alr_change_code, + oaa.application_class_code + FROM components_minus_excluded_components cec + JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = cec.alr_application_id + WHERE oaa.application_class_code IN ('LOA', 'BLK', 'SCH', 'NAN', 'NOI') + AND cec.alr_change_code <> 'SRW' ) --- select all components that will not be inserted -SELECT - rr.alr_appl_component_id -FROM - ranked_rows rr -WHERE - rank != 1; - \ No newline at end of file +SELECT fsap.alr_application_id, + fsap.alr_appl_component_id, + fsap.alr_change_code, + fsap.application_class_code +FROM filtered_to_single_componets_with_applications fsap; \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/sql/application-prep/application_prep.count.sql b/bin/migrate-oats-data/applications/sql/application-prep/application_prep.count.sql index 297f535012..192fa71028 100644 --- a/bin/migrate-oats-data/applications/sql/application-prep/application_prep.count.sql +++ b/bin/migrate-oats-data/applications/sql/application-prep/application_prep.count.sql @@ -1,11 +1,8 @@ WITH appl_components_grouped AS ( - SELECT oaac.alr_application_id - FROM oats.oats_alr_appl_components oaac - JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id + SELECT oaa.alr_application_id + FROM oats.alcs_etl_applications_nois oaa WHERE oaa.application_class_code IN ('LOA', 'BLK', 'SCH', 'NAN') - AND oaac.alr_change_code <> 'SRW' - GROUP BY oaac.alr_application_id - HAVING count(oaac.alr_application_id) < 2 -- ignore all applications wit multiple components + and oaa.alr_change_code <> 'SRW' ) SELECT count(*) FROM appl_components_grouped acg \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/sql/application-prep/application_prep.sql b/bin/migrate-oats-data/applications/sql/application-prep/application_prep.sql index 951bb4a415..46902b7eb0 100644 --- a/bin/migrate-oats-data/applications/sql/application-prep/application_prep.sql +++ b/bin/migrate-oats-data/applications/sql/application-prep/application_prep.sql @@ -1,11 +1,8 @@ WITH appl_components_grouped AS ( - SELECT oaac.alr_application_id - FROM oats.oats_alr_appl_components oaac - JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id + SELECT oaa.alr_application_id + FROM oats.alcs_etl_applications_nois oaa WHERE oaa.application_class_code IN ('LOA', 'BLK', 'SCH', 'NAN') - AND oaac.alr_change_code <> 'SRW' - GROUP BY oaac.alr_application_id - HAVING count(oaac.alr_application_id) < 2 -- ignore all applications wit multiple components + and oaa.alr_change_code <> 'SRW' ) SELECT oaa.alr_application_id, oaac.agri_capability_code, diff --git a/bin/migrate-oats-data/applications/sql/application-prep/application_prep_basic_validation.sql b/bin/migrate-oats-data/applications/sql/application-prep/application_prep_basic_validation.sql index d1824cedad..c2414e727d 100644 --- a/bin/migrate-oats-data/applications/sql/application-prep/application_prep_basic_validation.sql +++ b/bin/migrate-oats-data/applications/sql/application-prep/application_prep_basic_validation.sql @@ -1,11 +1,8 @@ -- this script selects difference between fields that do not require mapping WITH appl_components_grouped AS ( - SELECT oaac.alr_application_id - FROM oats.oats_alr_appl_components oaac - JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id - WHERE oaa.application_class_code IN ('LOA', 'BLK', 'SCH', 'NAN') - GROUP BY oaac.alr_application_id - HAVING count(oaac.alr_application_id) < 2 -- ignore all applications wit multiple components + SELECT oaa.alr_application_id + FROM oats.alcs_etl_applications_nois oaa + WHERE oaa.application_class_code IN ('LOA', 'BLK', 'SCH', 'NAN') and oaa.alr_change_code <> 'SRW' ), oats_app_prep_data AS ( SELECT oaa.alr_application_id, diff --git a/bin/migrate-oats-data/applications/sql/validate_that_oats_does_not_override_alcs_with_null.sql b/bin/migrate-oats-data/applications/sql/validate_that_oats_does_not_override_alcs_with_null.sql index e2ffa49f65..2cdc87429f 100644 --- a/bin/migrate-oats-data/applications/sql/validate_that_oats_does_not_override_alcs_with_null.sql +++ b/bin/migrate-oats-data/applications/sql/validate_that_oats_does_not_override_alcs_with_null.sql @@ -1,22 +1,24 @@ -- This query checks that OATS NULL does not override fee_paid_date if it has value in ALCS. -- Run this query before ETL and after to ensure that the result is the same WITH appl_with_one_component AS ( - SELECT oaac.alr_application_id - FROM oats.oats_alr_appl_components oaac - JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id + SELECT oaa.alr_application_id + FROM oats.alcs_etl_applications_nois oaa WHERE oaa.application_class_code IN ('LOA', 'BLK', 'SCH', 'NAN') - GROUP BY oaac.alr_application_id - HAVING count(oaac.alr_application_id) < 2 -- ignore all applications wit multiple components + and oaa.alr_change_code <> 'SRW' ) -SELECT -oats_appl.alr_application_id, +SELECT oats_appl.alr_application_id, appl.fee_paid_date AT TIME ZONE 'UTC', oaa.fee_received_date, - appl.date_submitted_to_alc , - oaa.submitted_to_alc_date + appl.date_submitted_to_alc, + oaa.submitted_to_alc_date FROM alcs.application appl JOIN appl_with_one_component oats_appl ON oats_appl.alr_application_id::TEXT = appl.file_number JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oats_appl.alr_application_id -WHERE -(oaa.fee_received_date IS NULL AND appl.fee_paid_date IS NOT NULL) -OR (oaa.submitted_to_alc_date IS NULL AND appl.date_submitted_to_alc IS NOT NULL) \ No newline at end of file +WHERE ( + oaa.fee_received_date IS NULL + AND appl.fee_paid_date IS NOT NULL + ) + OR ( + oaa.submitted_to_alc_date IS NULL + AND appl.date_submitted_to_alc IS NOT NULL + ) \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/submissions/sql/app_submission.sql b/bin/migrate-oats-data/applications/submissions/sql/app_submission.sql index af9f92bba5..5158ed511f 100644 --- a/bin/migrate-oats-data/applications/submissions/sql/app_submission.sql +++ b/bin/migrate-oats-data/applications/submissions/sql/app_submission.sql @@ -1,19 +1,10 @@ -WITH - appl_components_grouped AS ( - SELECT - oaac.alr_application_id - FROM - oats.oats_alr_appl_components oaac - JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id - WHERE - oaa.application_class_code IN ('LOA', 'BLK', 'SCH', 'NAN') AND oaac.alr_change_code <> 'SRW' - GROUP BY - oaac.alr_application_id - HAVING - count(oaac.alr_application_id) < 2 -- ignore all applications wit multiple components - ) -SELECT - aa.file_number, +WITH appl_components_grouped AS ( + SELECT oaa.alr_application_id + FROM oats.alcs_etl_applications_nois oaa + WHERE oaa.application_class_code IN ('LOA', 'BLK', 'SCH', 'NAN') + and oaa.alr_change_code <> 'SRW' +) +SELECT aa.file_number, aa.type_code, aa.local_government_uuid, oc.alr_change_code, @@ -43,10 +34,9 @@ SELECT oa.followup_noi_number, au."uuid", oa.ministry_notice_ind -FROM - appl_components_grouped acg +FROM appl_components_grouped acg LEFT JOIN alcs.application aa ON aa.file_number = acg.alr_application_id::TEXT JOIN oats.oats_alr_appl_components oc ON acg.alr_application_id = oc.alr_application_id JOIN oats.oats_alr_applications oa ON acg.alr_application_id = oa.alr_application_id LEFT JOIN alcs."user" au ON oa.created_guid = au.bceid_guid -WHERE aa.type_code <> 'SRW' +WHERE aa.type_code <> 'SRW' \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/submissions/sql/app_submission_count.sql b/bin/migrate-oats-data/applications/submissions/sql/app_submission_count.sql index 7bec4140b9..192fa71028 100644 --- a/bin/migrate-oats-data/applications/submissions/sql/app_submission_count.sql +++ b/bin/migrate-oats-data/applications/submissions/sql/app_submission_count.sql @@ -1,18 +1,8 @@ -WITH - appl_components_grouped AS ( - SELECT - oaac.alr_application_id - FROM - oats.oats_alr_appl_components oaac - JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id - WHERE - oaa.application_class_code IN ('LOA', 'BLK', 'SCH', 'NAN') AND oaac.alr_change_code <> 'SRW' - GROUP BY - oaac.alr_application_id - HAVING - count(oaac.alr_application_id) < 2 -- ignore all applications wit multiple components - ) -SELECT - count(*) -FROM - appl_components_grouped acg \ No newline at end of file +WITH appl_components_grouped AS ( + SELECT oaa.alr_application_id + FROM oats.alcs_etl_applications_nois oaa + WHERE oaa.application_class_code IN ('LOA', 'BLK', 'SCH', 'NAN') + and oaa.alr_change_code <> 'SRW' +) +SELECT count(*) +FROM appl_components_grouped acg \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/submissions/sql/app_submission_validation.sql b/bin/migrate-oats-data/applications/submissions/sql/app_submission_validation.sql index 1a8a383cc9..e5a179081b 100644 --- a/bin/migrate-oats-data/applications/submissions/sql/app_submission_validation.sql +++ b/bin/migrate-oats-data/applications/submissions/sql/app_submission_validation.sql @@ -1,9 +1,9 @@ -- this script selects difference between fields that do not require mapping WITH apps_with_one_or_zero_component_only AS ( - SELECT oaac.alr_application_id - FROM oats.oats_alr_appl_components oaac - GROUP BY oaac.alr_application_id - HAVING count(oaac.alr_application_id) < 2 + SELECT oaa.alr_application_id + FROM oats.alcs_etl_applications_nois oaa + WHERE oaa.application_class_code IN ('LOA', 'BLK', 'SCH', 'NAN') + and oaa.alr_change_code <> 'SRW' ), oats_app_data AS ( SELECT oaa.alr_application_id, @@ -28,7 +28,8 @@ oats_app_data AS ( FROM alcs.application_submission app_sub JOIN apps_with_one_or_zero_component_only oats_asub ON oats_asub.alr_application_id::TEXT = app_sub.file_number JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oats_asub.alr_application_id - AND oaa.application_class_code in ('LOA', 'BLK', 'SCH', 'NAN') AND oaac.alr_change_code <> 'SRW' + AND oaa.application_class_code in ('LOA', 'BLK', 'SCH', 'NAN') + AND oaac.alr_change_code <> 'SRW' JOIN oats.oats_alr_appl_components oaac ON oaac.alr_application_id = oats_asub.alr_application_id ) SELECT oats_app.alr_application_id, diff --git a/bin/migrate-oats-data/applications/submissions/sql/parcels/validation/application_certificate_of_title_validation.sql b/bin/migrate-oats-data/applications/submissions/sql/parcels/validation/application_certificate_of_title_validation.sql index dbe44e1823..9750f1ddec 100644 --- a/bin/migrate-oats-data/applications/submissions/sql/parcels/validation/application_certificate_of_title_validation.sql +++ b/bin/migrate-oats-data/applications/submissions/sql/parcels/validation/application_certificate_of_title_validation.sql @@ -1,11 +1,9 @@ WITH applications_with_one_or_zero_component_only AS ( - SELECT oaac.alr_application_id, - max(oaac.alr_appl_component_id) AS alr_appl_component_id -- this IS NOT going TO effect the query since count < 2 - FROM oats.oats_alr_appl_components oaac - JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id - AND oaa.application_class_code IN ('LOA', 'BLK', 'SCH', 'NAN') AND oaac.alr_change_code <> 'SRW' - GROUP BY oaac.alr_application_id - HAVING count(oaac.alr_application_id) < 2 + SELECT oaa.alr_application_id, + oaa.alr_appl_component_id + FROM oats.alcs_etl_applications_nois oaa + WHERE oaa.application_class_code IN ('LOA', 'BLK', 'SCH', 'NAN') + and oaa.alr_change_code <> 'SRW' ), oats_cert_of_titles AS ( SELECT od.document_id, @@ -30,13 +28,11 @@ FROM alcs_oats_certificate_of_titles act WHERE act.oats_document_id != oct.document_id::TEXT; -- count certificates of title in oats linked to subject_properties WITH nois_with_one_or_zero_component_only AS ( - SELECT oaac.alr_application_id, - max(oaac.alr_appl_component_id) AS alr_appl_component_id -- this IS NOT going TO effect the query since count < 2 - FROM oats.oats_alr_appl_components oaac - JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id - AND oaa.application_class_code IN ('LOA', 'BLK', 'SCH', 'NAN') AND oaac.alr_change_code <> 'SRW' - GROUP BY oaac.alr_application_id - HAVING count(oaac.alr_application_id) < 2 + SELECT oaa.alr_application_id, + oaa.alr_appl_component_id + FROM oats.alcs_etl_applications_nois oaa + WHERE oaa.application_class_code IN ('LOA', 'BLK', 'SCH', 'NAN') + and oaa.alr_change_code <> 'SRW' ) SELECT count(*) FROM oats.oats_documents od diff --git a/bin/migrate-oats-data/applications/submissions/sql/parcels/validation/application_parcels_insert_validation.sql b/bin/migrate-oats-data/applications/submissions/sql/parcels/validation/application_parcels_insert_validation.sql index f655da78f7..5867790d0a 100644 --- a/bin/migrate-oats-data/applications/submissions/sql/parcels/validation/application_parcels_insert_validation.sql +++ b/bin/migrate-oats-data/applications/submissions/sql/parcels/validation/application_parcels_insert_validation.sql @@ -4,12 +4,10 @@ SELECT count(*) FROM alcs.application_parcel appp; -- Get total count of parcels in OATS WITH app_components_grouped AS ( - SELECT oaac.alr_application_id - FROM oats.oats_alr_appl_components oaac - JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id - WHERE oaa.application_class_code IN ('LOA', 'BLK', 'SCH', 'NAN') AND oaac.alr_change_code <> 'SRW' - GROUP BY oaac.alr_application_id - HAVING count(oaac.alr_application_id) < 2 -- ignore applications with multiple components + SELECT oaa.alr_application_id + FROM oats.alcs_etl_applications_nois oaa + WHERE oaa.application_class_code IN ('LOA', 'BLK', 'SCH', 'NAN') + and oaa.alr_change_code <> 'SRW' ) SELECT count(*) FROM app_components_grouped appg diff --git a/bin/migrate-oats-data/applications/submissions/sql/statuses/application_incomplete_alc.sql b/bin/migrate-oats-data/applications/submissions/sql/statuses/application_incomplete_alc.sql index a547e0483f..dae71add86 100644 --- a/bin/migrate-oats-data/applications/submissions/sql/statuses/application_incomplete_alc.sql +++ b/bin/migrate-oats-data/applications/submissions/sql/statuses/application_incomplete_alc.sql @@ -1,10 +1,8 @@ WITH app_components_grouped AS ( - SELECT oaac.alr_application_id - FROM oats.oats_alr_appl_components oaac - JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id - WHERE oaa.application_class_code IN ('LOA', 'BLK', 'SCH', 'NAN') AND oaac.alr_change_code <> 'SRW' - GROUP BY oaac.alr_application_id - HAVING count(oaac.alr_application_id) < 2 -- ignore applications with multiple components + SELECT oaa.alr_application_id + FROM oats.alcs_etl_applications_nois oaa + WHERE oaa.application_class_code IN ('LOA', 'BLK', 'SCH', 'NAN') + and oaa.alr_change_code <> 'SRW' ) SELECT oa.alr_application_id, completion_date, diff --git a/bin/migrate-oats-data/applications/submissions/sql/statuses/application_incomplete_alc_count.sql b/bin/migrate-oats-data/applications/submissions/sql/statuses/application_incomplete_alc_count.sql index c1d6fbb61b..fb4eb352ba 100644 --- a/bin/migrate-oats-data/applications/submissions/sql/statuses/application_incomplete_alc_count.sql +++ b/bin/migrate-oats-data/applications/submissions/sql/statuses/application_incomplete_alc_count.sql @@ -1,10 +1,8 @@ WITH app_components_grouped AS ( - SELECT oaac.alr_application_id - FROM oats.oats_alr_appl_components oaac - JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id - WHERE oaa.application_class_code IN ('LOA', 'BLK', 'SCH', 'NAN') AND oaac.alr_change_code <> 'SRW' - GROUP BY oaac.alr_application_id - HAVING count(oaac.alr_application_id) < 2 -- ignore applications with multiple components + SELECT oaa.alr_application_id + FROM oats.alcs_etl_applications_nois oaa + WHERE oaa.application_class_code IN ('LOA', 'BLK', 'SCH', 'NAN') + and oaa.alr_change_code <> 'SRW' ) SELECT count(*) FROM app_components_grouped acg diff --git a/bin/migrate-oats-data/applications/submissions/sql/statuses/application_submitted_to_alc.sql b/bin/migrate-oats-data/applications/submissions/sql/statuses/application_submitted_to_alc.sql index 11460e8b30..88858cd5c8 100644 --- a/bin/migrate-oats-data/applications/submissions/sql/statuses/application_submitted_to_alc.sql +++ b/bin/migrate-oats-data/applications/submissions/sql/statuses/application_submitted_to_alc.sql @@ -1,10 +1,8 @@ WITH app_components_grouped AS ( - SELECT oaac.alr_application_id - FROM oats.oats_alr_appl_components oaac - JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id - WHERE oaa.application_class_code IN ('LOA', 'BLK', 'SCH', 'NAN') AND oaac.alr_change_code <> 'SRW' - GROUP BY oaac.alr_application_id - HAVING count(oaac.alr_application_id) < 2 -- ignore applications with multiple components + SELECT oaa.alr_application_id + FROM oats.alcs_etl_applications_nois oaa + WHERE oaa.application_class_code IN ('LOA', 'BLK', 'SCH', 'NAN') + and oaa.alr_change_code <> 'SRW' ) SELECT oaa2.alr_application_id, oaa2.submitted_to_alc_date, diff --git a/bin/migrate-oats-data/applications/submissions/sql/statuses/application_submitted_to_alc_count.sql b/bin/migrate-oats-data/applications/submissions/sql/statuses/application_submitted_to_alc_count.sql index 29e8b98228..78f35ea5de 100644 --- a/bin/migrate-oats-data/applications/submissions/sql/statuses/application_submitted_to_alc_count.sql +++ b/bin/migrate-oats-data/applications/submissions/sql/statuses/application_submitted_to_alc_count.sql @@ -1,10 +1,8 @@ WITH app_components_grouped AS ( - SELECT oaac.alr_application_id - FROM oats.oats_alr_appl_components oaac - JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id - WHERE oaa.application_class_code IN ('LOA', 'BLK', 'SCH', 'NAN') AND oaac.alr_change_code <> 'SRW' - GROUP BY oaac.alr_application_id - HAVING count(oaac.alr_application_id) < 2 -- ignore applications with multiple components + SELECT oaa.alr_application_id + FROM oats.alcs_etl_applications_nois oaa + WHERE oaa.application_class_code IN ('LOA', 'BLK', 'SCH', 'NAN') + and oaa.alr_change_code <> 'SRW' ) SELECT count(*) FROM app_components_grouped diff --git a/bin/migrate-oats-data/applications/submissions/sql/statuses/init_app_submission_status.sql b/bin/migrate-oats-data/applications/submissions/sql/statuses/init_app_submission_status.sql index 5ae2d2e921..d09f210bf0 100644 --- a/bin/migrate-oats-data/applications/submissions/sql/statuses/init_app_submission_status.sql +++ b/bin/migrate-oats-data/applications/submissions/sql/statuses/init_app_submission_status.sql @@ -1,11 +1,9 @@ INSERT INTO alcs.application_submission_to_submission_status(submission_uuid, status_type_code) -- retrieve applications from OATS that have only 1 proposal component WITH application_components_grouped AS ( - SELECT oaac.alr_application_id - FROM oats.oats_alr_appl_components oaac - JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id - WHERE oaa.application_class_code IN ('LOA', 'BLK', 'SCH', 'NAN') AND oaac.alr_change_code <> 'SRW' - GROUP BY oaac.alr_application_id - HAVING count(oaac.alr_application_id) < 2 -- ignore applications with multiple components + SELECT oaa.alr_application_id + FROM oats.alcs_etl_applications_nois oaa + WHERE oaa.application_class_code IN ('LOA', 'BLK', 'SCH', 'NAN') + and oaa.alr_change_code <> 'SRW' ), -- alcs_submissions_with_statuses is required for development environment only. Production environment does not have submissions. alcs_submissions_with_statuses AS ( diff --git a/bin/migrate-oats-data/applications/submissions/sql/statuses/init_app_submission_status_count.sql b/bin/migrate-oats-data/applications/submissions/sql/statuses/init_app_submission_status_count.sql index 3414427376..e09d54e5fb 100644 --- a/bin/migrate-oats-data/applications/submissions/sql/statuses/init_app_submission_status_count.sql +++ b/bin/migrate-oats-data/applications/submissions/sql/statuses/init_app_submission_status_count.sql @@ -1,10 +1,8 @@ WITH app_components_grouped AS ( - SELECT oaac.alr_application_id - FROM oats.oats_alr_appl_components oaac - JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id - WHERE oaa.application_class_code IN ('LOA', 'BLK', 'SCH', 'NAN') AND oaac.alr_change_code <> 'SRW' - GROUP BY oaac.alr_application_id - HAVING count(oaac.alr_application_id) < 2 -- ignore applications with multiple components + SELECT oaa.alr_application_id + FROM oats.alcs_etl_applications_nois oaa + WHERE oaa.application_class_code IN ('LOA', 'BLK', 'SCH', 'NAN') + and oaa.alr_change_code <> 'SRW' ), alcs_submissions_with_statuses AS ( SELECT apps.file_number diff --git a/bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_cancelled_validation.sql b/bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_cancelled_validation.sql index 4f994fcd94..89afd38b06 100644 --- a/bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_cancelled_validation.sql +++ b/bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_cancelled_validation.sql @@ -1,75 +1,52 @@ --- run it manually in IDE of your choice --- compare to numbers returned by script. -- total count of set 'CANC' - cancelled in ALCS -SELECT - count(*) -FROM - alcs.application_submission_to_submission_status appstss +SELECT count(*) +FROM alcs.application_submission_to_submission_status appstss JOIN alcs.application_submission as2 ON as2.uuid = appstss.submission_uuid -WHERE - appstss.status_type_code = 'CANC' +WHERE appstss.status_type_code = 'CANC' AND effective_date IS NOT NULL AND as2.audit_created_by = 'oats_etl'; - --total count of set 'CAN' apps with one or zero components in OATS -WITH - first_cancelled_accomplishment_per_file_number AS ( - SELECT - alr_application_id, - accomplishment_code, - MIN(oa.completion_date) AS completion_date - FROM - oats.oats_accomplishments oa - WHERE - accomplishment_code = 'CAN' - GROUP BY - alr_application_id, - accomplishment_code - ), - cancelled_accomplishments_for_app_only AS ( - SELECT DISTINCT - ON ( - first_cancelled.accomplishment_code, - first_cancelled.completion_date, - oaa.alr_application_id, - oaa.cancelled_date - ) first_cancelled.accomplishment_code, +WITH first_cancelled_accomplishment_per_file_number AS ( + SELECT alr_application_id, + accomplishment_code, + MIN(oa.completion_date) AS completion_date + FROM oats.oats_accomplishments oa + WHERE accomplishment_code = 'CAN' + GROUP BY alr_application_id, + accomplishment_code +), +cancelled_accomplishments_for_app_only AS ( + SELECT DISTINCT ON ( + first_cancelled.accomplishment_code, first_cancelled.completion_date, oaa.alr_application_id, oaa.cancelled_date - FROM - oats.oats_alr_applications oaa - LEFT JOIN first_cancelled_accomplishment_per_file_number AS first_cancelled ON first_cancelled.alr_application_id = oaa.alr_application_id - WHERE - oaa.application_class_code IN ('LOA', 'BLK', 'SCH', 'NAN') - AND ( - first_cancelled.completion_date IS NOT NULL - OR oaa.cancelled_date IS NOT NULL - ) - ), - apps_with_one_or_zero_component_only AS ( - SELECT - oaac.alr_application_id, - max(oaac.alr_appl_component_id) AS alr_appl_component_id -- this IS NOT going TO effect the query since count < 2 - FROM - oats.oats_alr_appl_components oaac - JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id - AND oaa.application_class_code IN ('LOA', 'BLK', 'SCH', 'NAN') AND oaac.alr_change_code <> 'SRW' - GROUP BY - oaac.alr_application_id - HAVING - count(oaac.alr_application_id) < 2 - ), - all_cancelled AS ( - SELECT - cancelled.alr_application_id - FROM - cancelled_accomplishments_for_app_only AS cancelled - JOIN apps_with_one_or_zero_component_only AS apps_one_or_zero ON apps_one_or_zero.alr_application_id = cancelled.alr_application_id - GROUP BY - cancelled.alr_application_id - ) -SELECT - count(*) -FROM - all_cancelled \ No newline at end of file + ) first_cancelled.accomplishment_code, + first_cancelled.completion_date, + oaa.alr_application_id, + oaa.cancelled_date + FROM oats.oats_alr_applications oaa + LEFT JOIN first_cancelled_accomplishment_per_file_number AS first_cancelled ON first_cancelled.alr_application_id = oaa.alr_application_id + WHERE oaa.application_class_code IN ('LOA', 'BLK', 'SCH', 'NAN') + AND ( + first_cancelled.completion_date IS NOT NULL + OR oaa.cancelled_date IS NOT NULL + ) +), +apps_with_one_or_zero_component_only AS ( + SELECT oaa.alr_application_id, + oaa.alr_appl_component_id + FROM oats.alcs_etl_applications_nois oaa + WHERE oaa.application_class_code IN ('LOA', 'BLK', 'SCH', 'NAN') + and oaa.alr_change_code <> 'SRW' +), +all_cancelled AS ( + SELECT cancelled.alr_application_id + FROM cancelled_accomplishments_for_app_only AS cancelled + JOIN apps_with_one_or_zero_component_only AS apps_one_or_zero ON apps_one_or_zero.alr_application_id = cancelled.alr_application_id + GROUP BY cancelled.alr_application_id +) +SELECT count(*) +FROM all_cancelled \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_in_progress_validation.sql b/bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_in_progress_validation.sql index e827f8dd5d..ac63d74447 100644 --- a/bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_in_progress_validation.sql +++ b/bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_in_progress_validation.sql @@ -1,69 +1,46 @@ --- run it manually in IDE of your choice --- compare to numbers returned by script. They should match -- total count of set 'PROG' - In Progress in ALCS -SELECT - count(*) -FROM - alcs.application_submission_to_submission_status appstss +SELECT count(*) +FROM alcs.application_submission_to_submission_status appstss JOIN alcs.application_submission as2 ON as2.uuid = appstss.submission_uuid -WHERE - appstss.status_type_code = 'PROG' +WHERE appstss.status_type_code = 'PROG' AND effective_date IS NOT NULL AND as2.audit_created_by = 'oats_etl'; - --total count of set 'INP' - In Progress apps with one or zero components in OATS -WITH - inp_accomplishment_per_file_number AS ( - SELECT - alr_application_id, - accomplishment_code - FROM - oats.oats_accomplishments oa - WHERE - accomplishment_code = 'INP' - GROUP BY - alr_application_id, - accomplishment_code - ), - inp_accomplishments_for_app_only AS ( - SELECT DISTINCT - ON ( - inp_accomplishments.accomplishment_code, - oaa.alr_application_id, - oaa.when_created - ) inp_accomplishments.accomplishment_code, +WITH inp_accomplishment_per_file_number AS ( + SELECT alr_application_id, + accomplishment_code + FROM oats.oats_accomplishments oa + WHERE accomplishment_code = 'INP' + GROUP BY alr_application_id, + accomplishment_code +), +inp_accomplishments_for_app_only AS ( + SELECT DISTINCT ON ( + inp_accomplishments.accomplishment_code, oaa.alr_application_id, oaa.when_created - FROM - oats.oats_alr_applications oaa - LEFT JOIN inp_accomplishment_per_file_number AS inp_accomplishments ON inp_accomplishments.alr_application_id = oaa.alr_application_id - WHERE - oaa.application_class_code IN ('LOA', 'BLK', 'SCH', 'NAN') - AND (oaa.when_created IS NOT NULL) - ), - apps_with_one_or_zero_component_only AS ( - SELECT - oaac.alr_application_id, - max(oaac.alr_appl_component_id) AS alr_appl_component_id -- this IS NOT going TO effect the query since count < 2 - FROM - oats.oats_alr_appl_components oaac - JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id - AND oaa.application_class_code IN ('LOA', 'BLK', 'SCH', 'NAN') AND oaac.alr_change_code <> 'SRW' - GROUP BY - oaac.alr_application_id - HAVING - count(oaac.alr_application_id) < 2 - ), - all_in_progress AS ( - SELECT - inp.alr_application_id - FROM - inp_accomplishments_for_app_only AS inp - JOIN apps_with_one_or_zero_component_only AS apps_one_or_zero ON apps_one_or_zero.alr_application_id = inp.alr_application_id - GROUP BY - inp.alr_application_id - ) -SELECT - count(*) -FROM - all_in_progress; \ No newline at end of file + ) inp_accomplishments.accomplishment_code, + oaa.alr_application_id, + oaa.when_created + FROM oats.oats_alr_applications oaa + LEFT JOIN inp_accomplishment_per_file_number AS inp_accomplishments ON inp_accomplishments.alr_application_id = oaa.alr_application_id + WHERE oaa.application_class_code IN ('LOA', 'BLK', 'SCH', 'NAN') + AND (oaa.when_created IS NOT NULL) +), +apps_with_one_or_zero_component_only AS ( + SELECT oaa.alr_application_id, + oaa.alr_appl_component_id + FROM oats.alcs_etl_applications_nois oaa + WHERE oaa.application_class_code IN ('LOA', 'BLK', 'SCH', 'NAN') + and oaa.alr_change_code <> 'SRW' +), +all_in_progress AS ( + SELECT inp.alr_application_id + FROM inp_accomplishments_for_app_only AS inp + JOIN apps_with_one_or_zero_component_only AS apps_one_or_zero ON apps_one_or_zero.alr_application_id = inp.alr_application_id + GROUP BY inp.alr_application_id +) +SELECT count(*) +FROM all_in_progress; \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_sub_incomplete_alc_validation.sql b/bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_sub_incomplete_alc_validation.sql index 31c25d61d8..82b0310be6 100644 --- a/bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_sub_incomplete_alc_validation.sql +++ b/bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_sub_incomplete_alc_validation.sql @@ -1,35 +1,21 @@ --- run it manually in IDE of your choice --- compare to numbers returned by script. They should match -- total count of set 'SUIN' - Submitted to ALC Incomplete status in ALCS -SELECT - count(*) -FROM - alcs.application_submission_to_submission_status appstss +SELECT count(*) +FROM alcs.application_submission_to_submission_status appstss JOIN alcs.application_submission as2 ON as2.uuid = appstss.submission_uuid -WHERE - status_type_code = 'SUIN' +WHERE status_type_code = 'SUIN' AND effective_date IS NOT NULL AND as2.audit_created_by = 'oats_etl'; - -- total count of expected 'AKI' - Submitted to ALC Incomplete status -WITH - app_components_grouped AS ( - SELECT - oaac.alr_application_id - FROM - oats.oats_alr_appl_components oaac - JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id - WHERE - oaa.application_class_code IN ('LOA', 'BLK', 'SCH', 'NAN') AND oaac.alr_change_code <> 'SRW' - GROUP BY - oaac.alr_application_id - HAVING - count(oaac.alr_application_id) < 2 -- ignore applications with multiple components - ) -SELECT - count(*) -FROM - app_components_grouped ncg +WITH app_components_grouped AS ( + SELECT oaa.alr_application_id + FROM oats.alcs_etl_applications_nois oaa + WHERE oaa.application_class_code IN ('LOA', 'BLK', 'SCH', 'NAN') + and oaa.alr_change_code <> 'SRW' +) +SELECT count(*) +FROM app_components_grouped ncg JOIN oats.oats_accomplishments oa ON oa.alr_application_id = ncg.alr_application_id AND oa.accomplishment_code = 'AKI' AND oa.completion_date IS NOT NULL; \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_submitted_lfng_validation.sql b/bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_submitted_lfng_validation.sql index e12318a858..2731b8d738 100644 --- a/bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_submitted_lfng_validation.sql +++ b/bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_submitted_lfng_validation.sql @@ -1,75 +1,52 @@ --- run it manually in IDE of your choice --- compare to numbers returned by script. -- total count of set 'SUBG' - Submitted to LFNG in ALCS -SELECT - count(*) -FROM - alcs.application_submission_to_submission_status appstss +SELECT count(*) +FROM alcs.application_submission_to_submission_status appstss JOIN alcs.application_submission as2 ON as2.uuid = appstss.submission_uuid -WHERE - appstss.status_type_code = 'SUBG' +WHERE appstss.status_type_code = 'SUBG' AND effective_date IS NOT NULL AND as2.audit_created_by = 'oats_etl'; - --total count of set 'SLG' apps with one or zero components in OATS -WITH - last_sub_lg_accomplishment_per_file_number AS ( - SELECT - alr_application_id, - accomplishment_code, - MAX(oa.completion_date) AS completion_date - FROM - oats.oats_accomplishments oa - WHERE - accomplishment_code = 'SLG' - GROUP BY - alr_application_id, - accomplishment_code - ), - sub_lg_accomplishments_for_app_only AS ( - SELECT DISTINCT - ON ( - last_sub_lg.accomplishment_code, - last_sub_lg.completion_date, - oaa.alr_application_id, - oaa.submitted_to_lg_date - ) last_sub_lg.accomplishment_code, +WITH last_sub_lg_accomplishment_per_file_number AS ( + SELECT alr_application_id, + accomplishment_code, + MAX(oa.completion_date) AS completion_date + FROM oats.oats_accomplishments oa + WHERE accomplishment_code = 'SLG' + GROUP BY alr_application_id, + accomplishment_code +), +sub_lg_accomplishments_for_app_only AS ( + SELECT DISTINCT ON ( + last_sub_lg.accomplishment_code, last_sub_lg.completion_date, oaa.alr_application_id, oaa.submitted_to_lg_date - FROM - oats.oats_alr_applications oaa - LEFT JOIN last_sub_lg_accomplishment_per_file_number AS last_sub_lg ON last_sub_lg.alr_application_id = oaa.alr_application_id - WHERE - oaa.application_class_code IN ('LOA', 'BLK', 'SCH', 'NAN') - AND ( - last_sub_lg.completion_date IS NOT NULL - OR oaa.submitted_to_lg_date IS NOT NULL - ) - ), - apps_with_one_or_zero_component_only AS ( - SELECT - oaac.alr_application_id, - max(oaac.alr_appl_component_id) AS alr_appl_component_id -- this IS NOT going TO effect the query since count < 2 - FROM - oats.oats_alr_appl_components oaac - JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id - AND oaa.application_class_code IN ('LOA', 'BLK', 'SCH', 'NAN') AND oaac.alr_change_code <> 'SRW' - GROUP BY - oaac.alr_application_id - HAVING - COUNT(oaac.alr_application_id) < 2 - ), - all_sub_lg AS ( - SELECT - sub_lg.alr_application_id - FROM - sub_lg_accomplishments_for_app_only AS sub_lg - JOIN apps_with_one_or_zero_component_only AS apps_one_or_zero ON apps_one_or_zero.alr_application_id = sub_lg.alr_application_id - GROUP BY - sub_lg.alr_application_id - ) -SELECT - count(*) -FROM - all_sub_lg \ No newline at end of file + ) last_sub_lg.accomplishment_code, + last_sub_lg.completion_date, + oaa.alr_application_id, + oaa.submitted_to_lg_date + FROM oats.oats_alr_applications oaa + LEFT JOIN last_sub_lg_accomplishment_per_file_number AS last_sub_lg ON last_sub_lg.alr_application_id = oaa.alr_application_id + WHERE oaa.application_class_code IN ('LOA', 'BLK', 'SCH', 'NAN') + AND ( + last_sub_lg.completion_date IS NOT NULL + OR oaa.submitted_to_lg_date IS NOT NULL + ) +), +apps_with_one_or_zero_component_only AS ( + SELECT oaa.alr_application_id, + oaa.alr_appl_component_id + FROM oats.alcs_etl_applications_nois oaa + WHERE oaa.application_class_code IN ('LOA', 'BLK', 'SCH', 'NAN') + and oaa.alr_change_code <> 'SRW' +), +all_sub_lg AS ( + SELECT sub_lg.alr_application_id + FROM sub_lg_accomplishments_for_app_only AS sub_lg + JOIN apps_with_one_or_zero_component_only AS apps_one_or_zero ON apps_one_or_zero.alr_application_id = sub_lg.alr_application_id + GROUP BY sub_lg.alr_application_id +) +SELECT count(*) +FROM all_sub_lg \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_submitted_to_alc_validation.sql b/bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_submitted_to_alc_validation.sql index 710e754579..01293b1bb2 100644 --- a/bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_submitted_to_alc_validation.sql +++ b/bin/migrate-oats-data/applications/submissions/sql/statuses/validation/application_submitted_to_alc_validation.sql @@ -1,36 +1,21 @@ --- run it manually in IDE of your choice --- compare to numbers returned by script. They should match -- total count of set 'SUBM' - Submitted to ALC status in ALCS -SELECT - count(*) -FROM - alcs.application_submission_to_submission_status appstss +SELECT count(*) +FROM alcs.application_submission_to_submission_status appstss JOIN alcs.application_submission as2 ON as2.uuid = appstss.submission_uuid -WHERE - status_type_code = 'SUBM' +WHERE status_type_code = 'SUBM' AND effective_date IS NOT NULL AND as2.audit_created_by = 'oats_etl'; - -- total count of expected 'SUBM' - Submitted to ALC status -WITH - app_components_grouped AS ( - SELECT - oaac.alr_application_id - FROM - oats.oats_alr_appl_components oaac - JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id - WHERE - oaa.application_class_code IN ('LOA', 'BLK', 'SCH', 'NAN') AND oaac.alr_change_code <> 'SRW' - GROUP BY - oaac.alr_application_id - HAVING - count(oaac.alr_application_id) < 2 -- ignore applications with multiple components - ) -SELECT - count(*) -FROM - oats.oats_alr_applications oaa2 +WITH app_components_grouped AS ( + SELECT oaa.alr_application_id + FROM oats.alcs_etl_applications_nois oaa + WHERE oaa.application_class_code IN ('LOA', 'BLK', 'SCH', 'NAN') + and oaa.alr_change_code <> 'SRW' +) +SELECT count(*) +FROM oats.oats_alr_applications oaa2 JOIN app_components_grouped ncg ON ncg.alr_application_id = oaa2.alr_application_id JOIN alcs.application_submission apps ON apps.file_number = oaa2.alr_application_id::TEXT -WHERE - oaa2.submitted_to_alc_date IS NOT NULL; \ No newline at end of file +WHERE oaa2.submitted_to_alc_date IS NOT NULL; \ No newline at end of file diff --git a/bin/migrate-oats-data/noi/sql/insert_noi.sql b/bin/migrate-oats-data/noi/sql/insert_noi.sql index 17cace2206..ac0f399936 100644 --- a/bin/migrate-oats-data/noi/sql/insert_noi.sql +++ b/bin/migrate-oats-data/noi/sql/insert_noi.sql @@ -1,149 +1,123 @@ -WITH - -- Step 1: filter out multiple component NOIs - noi_grouped AS ( - SELECT - oaac.alr_application_id as noi_application_id - FROM - oats.oats_alr_appl_components oaac - JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id - WHERE - oaa.application_class_code = 'NOI' - GROUP BY - oaac.alr_application_id - HAVING - count(oaac.alr_application_id) < 2 - ), - -- Step 2: get noi - noi_lookup AS ( - SELECT DISTINCT - oaap.alr_application_id AS application_id, - string_agg (DISTINCT oo.organization_name, ', ') FILTER ( - WHERE - oo.organization_name IS NOT NULL - ) AS orgs, - string_agg ( - DISTINCT concat (op.first_name || ' ' || op.last_name), - ', ' - ) FILTER ( - WHERE - op.last_name IS NOT NULL - OR op.first_name IS NOT NULL - ) AS persons - FROM - oats.oats_alr_application_parties oaap - LEFT JOIN oats.oats_person_organizations opo ON oaap.person_organization_id = opo.person_organization_id - LEFT JOIN oats.oats_persons op ON op.person_id = opo.person_id - LEFT JOIN oats.oats_organizations oo ON opo.organization_id = oo.organization_id - WHERE - oaap.alr_appl_role_code IN ('APPL','AGENT') - GROUP BY - oaap.alr_application_id - ), - -- Step 3: get local gov application name & match to uuid - oats_gov AS ( - SELECT - oaap.alr_application_id AS application_id, - oo.organization_name AS oats_gov_name - FROM - oats.oats_alr_application_parties oaap - JOIN oats.oats_person_organizations opo ON oaap.person_organization_id = opo.person_organization_id - JOIN oats.oats_organizations oo ON opo.organization_id = oo.organization_id - WHERE - oo.organization_type_cd IN ('MUNI', 'FN', 'RD') - ), - alcs_gov AS ( - SELECT - oats_gov.application_id AS application_id, - alg.uuid AS gov_uuid - FROM - oats_gov - JOIN alcs.local_government alg on ( - CASE - WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Gabriola Island' THEN 'Islands Trust Gabriola Island (Historical)' - WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Galiano Island' THEN 'Islands Trust Galiano Island (Historical)' - WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Gambier Island' THEN 'Islands Trust Gambier Island (Historical)' - WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Hornby Island' THEN 'Islands Trust Hornby Island (Historical)' - WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Lasqueti Island' THEN 'Islands Trust Lasqueti Island (Historical)' - WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Mayne Island' THEN 'Islands Trust Mayne Island (Historical)' - WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Pender Island' THEN 'Islands Trust Pender Island (Historical)' - WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Quadra Island' THEN 'Islands Trust Quadra Island (Historical)' - WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Salt Spring Island' THEN 'Islands Trust Salt Spring Island (Historical)' - WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Saturna Island' THEN 'Islands Trust Saturna Island (Historical)' - WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Sidney Island' THEN 'Islands Trust Sidney Island (Historical)' - WHEN oats_gov.oats_gov_name LIKE 'Islands Trust- Comox Strathcona' THEN 'Islands Trust Comox Strathcona (Historical)' - WHEN oats_gov.oats_gov_name LIKE 'Islands Trust- Nanaimo' THEN 'Islands Trust Nanaimo (Historical)' - WHEN oats_gov.oats_gov_name LIKE 'Islands Trust-Capital' THEN 'Islands Trust Capital (Historical)' - WHEN oats_gov.oats_gov_name LIKE 'Islands Trust-Powell River' THEN 'Islands Trust Powell River (Historical)' - WHEN oats_gov.oats_gov_name LIKE 'Islands Trust-Sunshine Coast' THEN 'Islands Trust Sunshine Coast (Historical)' - WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Bowen Island' THEN 'Bowen Island (Island Municipality)' - WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Denman Island' THEN 'Islands Trust Denman Island (Historical)' - WHEN oats_gov.oats_gov_name LIKE 'Islands Trust - Cowichan Valley' THEN 'Islands Trust Cowichan Valley (Historical)' - WHEN oats_gov.oats_gov_name LIKE 'Northern Rockies' THEN 'Northern Rockies (Historical)' - WHEN oats_gov.oats_gov_name LIKE 'Sliammon%' THEN 'Tla''amin Nation' - WHEN oats_gov.oats_gov_name LIKE 'Thompson Nicola%' THEN 'Thompson Nicola Regional District' - WHEN oats_gov.oats_gov_name LIKE 'Cariboo%' THEN 'Cariboo Regional District' - WHEN oats_gov.oats_gov_name LIKE 'Fraser Valley%' THEN 'Fraser Valley Regional District' - WHEN oats_gov.oats_gov_name LIKE 'Columbia Shuswap%' THEN 'Columbia Shuswap Regional District' - WHEN oats_gov.oats_gov_name LIKE 'Central Okanagan%' THEN 'Central Okanagan Regional District' - WHEN oats_gov.oats_gov_name LIKE 'Squamish Lillooet%' THEN 'Squamish Lillooet Regional District' - WHEN oats_gov.oats_gov_name LIKE 'Alberni-Clayoquot%' THEN 'Alberni-Clayoquot Regional District' - WHEN oats_gov.oats_gov_name LIKE 'qathet%' THEN 'qathet Regional District' - WHEN oats_gov.oats_gov_name LIKE 'Peace River%' THEN 'Peace River Regional District' - WHEN oats_gov.oats_gov_name LIKE 'Okanagan Similkameen%' THEN 'Okanagan Similkameen Regional District' - WHEN oats_gov.oats_gov_name LIKE 'East Kootenay%' THEN 'East Kootenay Regional District' - WHEN oats_gov.oats_gov_name LIKE 'Bulkley-Nechako%' THEN 'Bulkley-Nechako Regional District' - WHEN oats_gov.oats_gov_name LIKE 'Sunshine Coast%' THEN 'Sunshine Coast Regional District' - WHEN oats_gov.oats_gov_name LIKE 'Nanaimo%' THEN 'Nanaimo Regional District' - WHEN oats_gov.oats_gov_name LIKE 'Kitimat Stikine%' THEN 'Kitimat Stikine Regional District' - WHEN oats_gov.oats_gov_name LIKE 'North Okanagan%' THEN 'North Okanagan Regional District' - WHEN oats_gov.oats_gov_name LIKE 'Fraser Fort George%' THEN 'Fraser Fort George Regional District' - WHEN oats_gov.oats_gov_name LIKE 'Cowichan Valley%' THEN 'Cowichan Valley Regional District' - WHEN oats_gov.oats_gov_name LIKE 'Kootenay Boundary%' THEN 'Kootenay Boundary Regional District' - WHEN oats_gov.oats_gov_name LIKE 'Comox Valley%' THEN 'Comox Valley Regional District' - WHEN oats_gov.oats_gov_name LIKE 'Central Kootenay%' THEN 'Central Kootenay Regional District' - WHEN oats_gov.oats_gov_name LIKE 'Capital%' THEN 'Capital Regional District' - WHEN oats_gov.oats_gov_name LIKE 'Metro Vancouver%' THEN 'Metro Vancouver Regional District' - WHEN oats_gov.oats_gov_name LIKE 'Central Coast%' THEN 'Central Coast Regional District' - WHEN oats_gov.oats_gov_name LIKE 'North Coast%' THEN 'North Coast Regional District' - WHEN oats_gov.oats_gov_name LIKE 'Strathcona%' THEN 'Strathcona Regional District' - WHEN oats_gov.oats_gov_name LIKE 'Mount Waddington%' THEN 'Mount Waddington Regional District' - ELSE oats_gov.oats_gov_name - END - ) = alg."name" - ), - -- Step 4: Perform a lookup to retrieve the region code for each application ID - panel_lookup AS ( - SELECT DISTINCT - oaap.alr_application_id AS application_id, +WITH -- Step 1: filter out multiple component NOIs +noi_grouped AS ( + SELECT oaa.alr_application_id as noi_application_id + FROM oats.alcs_etl_applications_nois oaa + WHERE oaa.application_class_code = 'NOI' + and oaa.alr_change_code <> 'SRW' +), +-- Step 2: get noi +noi_lookup AS ( + SELECT DISTINCT oaap.alr_application_id AS application_id, + string_agg (DISTINCT oo.organization_name, ', ') FILTER ( + WHERE oo.organization_name IS NOT NULL + ) AS orgs, + string_agg ( + DISTINCT concat (op.first_name || ' ' || op.last_name), + ', ' + ) FILTER ( + WHERE op.last_name IS NOT NULL + OR op.first_name IS NOT NULL + ) AS persons + FROM oats.oats_alr_application_parties oaap + LEFT JOIN oats.oats_person_organizations opo ON oaap.person_organization_id = opo.person_organization_id + LEFT JOIN oats.oats_persons op ON op.person_id = opo.person_id + LEFT JOIN oats.oats_organizations oo ON opo.organization_id = oo.organization_id + WHERE oaap.alr_appl_role_code IN ('APPL', 'AGENT') + GROUP BY oaap.alr_application_id +), +-- Step 3: get local gov application name & match to uuid +oats_gov AS ( + SELECT oaap.alr_application_id AS application_id, + oo.organization_name AS oats_gov_name + FROM oats.oats_alr_application_parties oaap + JOIN oats.oats_person_organizations opo ON oaap.person_organization_id = opo.person_organization_id + JOIN oats.oats_organizations oo ON opo.organization_id = oo.organization_id + WHERE oo.organization_type_cd IN ('MUNI', 'FN', 'RD') +), +alcs_gov AS ( + SELECT oats_gov.application_id AS application_id, + alg.uuid AS gov_uuid + FROM oats_gov + JOIN alcs.local_government alg on ( CASE - WHEN oo2.parent_organization_id IS NULL THEN oo2.organization_name - WHEN oo3.parent_organization_id IS NULL THEN oo3.organization_name - ELSE 'NONE' - END AS panel_region - FROM - oats.oats_alr_application_parties oaap - JOIN oats.oats_person_organizations opo ON oaap.person_organization_id = opo.person_organization_id - JOIN oats.oats_organizations oo ON opo.organization_id = oo.organization_id - LEFT JOIN oats.oats_organizations oo2 ON oo.parent_organization_id = oo2.organization_id - LEFT JOIN oats.oats_organizations oo3 ON oo2.parent_organization_id = oo3.organization_id - WHERE - oo2.organization_type_cd = 'PANEL' - OR oo3.organization_type_cd = 'PANEL' - ), - application_type_lookup AS ( - SELECT - oaac.alr_application_id AS application_id, - oacc."description" AS "description", - oaac.alr_change_code AS code - FROM - oats.oats_alr_appl_components AS oaac - JOIN oats.oats_alr_change_codes oacc ON oaac.alr_change_code = oacc.alr_change_code - LEFT JOIN oats.alcs_etl_application_exclude aee ON oaac.alr_appl_component_id = aee.component_id - WHERE - aee.component_id IS NULL - ) -SELECT - ng.noi_application_id :: text AS file_number, + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Gabriola Island' THEN 'Islands Trust Gabriola Island (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Galiano Island' THEN 'Islands Trust Galiano Island (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Gambier Island' THEN 'Islands Trust Gambier Island (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Hornby Island' THEN 'Islands Trust Hornby Island (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Lasqueti Island' THEN 'Islands Trust Lasqueti Island (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Mayne Island' THEN 'Islands Trust Mayne Island (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Pender Island' THEN 'Islands Trust Pender Island (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Quadra Island' THEN 'Islands Trust Quadra Island (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Salt Spring Island' THEN 'Islands Trust Salt Spring Island (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Saturna Island' THEN 'Islands Trust Saturna Island (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Sidney Island' THEN 'Islands Trust Sidney Island (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust- Comox Strathcona' THEN 'Islands Trust Comox Strathcona (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust- Nanaimo' THEN 'Islands Trust Nanaimo (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust-Capital' THEN 'Islands Trust Capital (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust-Powell River' THEN 'Islands Trust Powell River (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust-Sunshine Coast' THEN 'Islands Trust Sunshine Coast (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Bowen Island' THEN 'Bowen Island (Island Municipality)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Denman Island' THEN 'Islands Trust Denman Island (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Islands Trust - Cowichan Valley' THEN 'Islands Trust Cowichan Valley (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Northern Rockies' THEN 'Northern Rockies (Historical)' + WHEN oats_gov.oats_gov_name LIKE 'Sliammon%' THEN 'Tla''amin Nation' + WHEN oats_gov.oats_gov_name LIKE 'Thompson Nicola%' THEN 'Thompson Nicola Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Cariboo%' THEN 'Cariboo Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Fraser Valley%' THEN 'Fraser Valley Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Columbia Shuswap%' THEN 'Columbia Shuswap Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Central Okanagan%' THEN 'Central Okanagan Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Squamish Lillooet%' THEN 'Squamish Lillooet Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Alberni-Clayoquot%' THEN 'Alberni-Clayoquot Regional District' + WHEN oats_gov.oats_gov_name LIKE 'qathet%' THEN 'qathet Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Peace River%' THEN 'Peace River Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Okanagan Similkameen%' THEN 'Okanagan Similkameen Regional District' + WHEN oats_gov.oats_gov_name LIKE 'East Kootenay%' THEN 'East Kootenay Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Bulkley-Nechako%' THEN 'Bulkley-Nechako Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Sunshine Coast%' THEN 'Sunshine Coast Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Nanaimo%' THEN 'Nanaimo Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Kitimat Stikine%' THEN 'Kitimat Stikine Regional District' + WHEN oats_gov.oats_gov_name LIKE 'North Okanagan%' THEN 'North Okanagan Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Fraser Fort George%' THEN 'Fraser Fort George Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Cowichan Valley%' THEN 'Cowichan Valley Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Kootenay Boundary%' THEN 'Kootenay Boundary Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Comox Valley%' THEN 'Comox Valley Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Central Kootenay%' THEN 'Central Kootenay Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Capital%' THEN 'Capital Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Metro Vancouver%' THEN 'Metro Vancouver Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Central Coast%' THEN 'Central Coast Regional District' + WHEN oats_gov.oats_gov_name LIKE 'North Coast%' THEN 'North Coast Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Strathcona%' THEN 'Strathcona Regional District' + WHEN oats_gov.oats_gov_name LIKE 'Mount Waddington%' THEN 'Mount Waddington Regional District' + ELSE oats_gov.oats_gov_name + END + ) = alg."name" +), +-- Step 4: Perform a lookup to retrieve the region code for each application ID +panel_lookup AS ( + SELECT DISTINCT oaap.alr_application_id AS application_id, + CASE + WHEN oo2.parent_organization_id IS NULL THEN oo2.organization_name + WHEN oo3.parent_organization_id IS NULL THEN oo3.organization_name + ELSE 'NONE' + END AS panel_region + FROM oats.oats_alr_application_parties oaap + JOIN oats.oats_person_organizations opo ON oaap.person_organization_id = opo.person_organization_id + JOIN oats.oats_organizations oo ON opo.organization_id = oo.organization_id + LEFT JOIN oats.oats_organizations oo2 ON oo.parent_organization_id = oo2.organization_id + LEFT JOIN oats.oats_organizations oo3 ON oo2.parent_organization_id = oo3.organization_id + WHERE oo2.organization_type_cd = 'PANEL' + OR oo3.organization_type_cd = 'PANEL' +), +application_type_lookup AS ( + SELECT oaac.alr_application_id AS application_id, + oacc."description" AS "description", + oaac.alr_change_code AS code + FROM oats.oats_alr_appl_components AS oaac + JOIN oats.oats_alr_change_codes oacc ON oaac.alr_change_code = oacc.alr_change_code + LEFT JOIN oats.alcs_etl_application_exclude aee ON oaac.alr_appl_component_id = aee.component_id + WHERE aee.component_id IS NULL +) +SELECT ng.noi_application_id::text AS file_number, CASE WHEN noi_lookup.orgs IS NOT NULL THEN noi_lookup.orgs WHEN noi_lookup.persons IS NOT NULL THEN noi_lookup.persons @@ -161,8 +135,7 @@ SELECT WHEN atl.code = 'FILL' THEN 'POFO' ELSE 'POFO' -- POFO if value is null END AS type_code -FROM - noi_grouped AS ng +FROM noi_grouped AS ng LEFT JOIN noi_lookup ON ng.noi_application_id = noi_lookup.application_id LEFT JOIN panel_lookup ON ng.noi_application_id = panel_lookup.application_id LEFT JOIN alcs.application_region ar ON panel_lookup.panel_region = ar."label" diff --git a/bin/migrate-oats-data/noi/sql/insert_noi_count.sql b/bin/migrate-oats-data/noi/sql/insert_noi_count.sql index 4b25c9b119..619aaf4230 100644 --- a/bin/migrate-oats-data/noi/sql/insert_noi_count.sql +++ b/bin/migrate-oats-data/noi/sql/insert_noi_count.sql @@ -1,18 +1,8 @@ -WITH - noi_grouped AS ( - SELECT - oaac.alr_application_id as noi_application_id - FROM - oats.oats_alr_appl_components oaac - JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id - WHERE - oaa.application_class_code = 'NOI' - GROUP BY - oaac.alr_application_id - HAVING - count(oaac.alr_application_id) < 2 -- ignore all noi wit multiple components - ) -SELECT - count(*) -FROM - noi_grouped ng \ No newline at end of file +WITH noi_grouped AS ( + SELECT oaa.alr_application_id as noi_application_id + FROM oats.alcs_etl_applications_nois oaa + WHERE oaa.application_class_code = 'NOI' + and oaa.alr_change_code <> 'SRW' +) +SELECT count(*) +FROM noi_grouped ng \ No newline at end of file diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_base/notice_of_intent_base.count.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_base/notice_of_intent_base.count.sql index f294bef008..e72de79b59 100644 --- a/bin/migrate-oats-data/noi/sql/notice_of_intent_base/notice_of_intent_base.count.sql +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_base/notice_of_intent_base.count.sql @@ -1,8 +1,8 @@ WITH nois_with_one_or_zero_component_only AS ( - SELECT oaac.alr_application_id - FROM oats.oats_alr_appl_components oaac - GROUP BY oaac.alr_application_id - HAVING count(oaac.alr_application_id) < 2 + SELECT oaa.alr_application_id + FROM oats.alcs_etl_applications_nois oaa + WHERE oaa.application_class_code = 'NOI' + and oaa.alr_change_code <> 'SRW' ) SELECT count(*) FROM alcs.notice_of_intent noi diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_base/notice_of_intent_base.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_base/notice_of_intent_base.sql index 2845703548..f542e7275f 100644 --- a/bin/migrate-oats-data/noi/sql/notice_of_intent_base/notice_of_intent_base.sql +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_base/notice_of_intent_base.sql @@ -1,8 +1,8 @@ WITH nois_with_one_or_zero_component_only AS ( - SELECT oaac.alr_application_id - FROM oats.oats_alr_appl_components oaac - GROUP BY oaac.alr_application_id - HAVING count(oaac.alr_application_id) < 2 + SELECT oaa.alr_application_id + FROM oats.alcs_etl_applications_nois oaa + WHERE oaa.application_class_code = 'NOI' + and oaa.alr_change_code <> 'SRW' ) SELECT oaa.fee_waived_ind, oaa.split_fee_with_local_gov_ind, diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_base/notice_of_intent_base_validation.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_base/notice_of_intent_base_validation.sql index 97017a9cbb..16ae6fdff8 100644 --- a/bin/migrate-oats-data/noi/sql/notice_of_intent_base/notice_of_intent_base_validation.sql +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_base/notice_of_intent_base_validation.sql @@ -1,9 +1,9 @@ -- this script selects difference between fields that do not require mapping WITH nois_with_one_or_zero_component_only AS ( - SELECT oaac.alr_application_id - FROM oats.oats_alr_appl_components oaac - GROUP BY oaac.alr_application_id - HAVING count(oaac.alr_application_id) < 2 + SELECT oaa.alr_application_id + FROM oats.alcs_etl_applications_nois oaa + WHERE oaa.application_class_code = 'NOI' + and oaa.alr_change_code <> 'SRW' ), oats_noi_data AS ( SELECT oaa.alr_application_id, diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_base/notice_of_intent_decision_date/notice_of_intent_decision_date.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_base/notice_of_intent_decision_date/notice_of_intent_decision_date.sql index eb5995b3ed..b82ea08191 100644 --- a/bin/migrate-oats-data/noi/sql/notice_of_intent_base/notice_of_intent_decision_date/notice_of_intent_decision_date.sql +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_base/notice_of_intent_decision_date/notice_of_intent_decision_date.sql @@ -1,8 +1,8 @@ WITH nois_with_one_or_zero_component_only AS ( - SELECT oaac.alr_application_id - FROM oats.oats_alr_appl_components oaac - GROUP BY oaac.alr_application_id - HAVING count(oaac.alr_application_id) < 2 + SELECT oaa.alr_application_id + FROM oats.alcs_etl_applications_nois oaa + WHERE oaa.application_class_code = 'NOI' + and oaa.alr_change_code <> 'SRW' ), decision_date_for_nois AS ( SELECT oaad.alr_appl_decision_id, diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_base/notice_of_intent_decision_date/notice_of_intent_decision_date_validation.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_base/notice_of_intent_decision_date/notice_of_intent_decision_date_validation.sql index 2f4e7bf0e3..27750adef1 100644 --- a/bin/migrate-oats-data/noi/sql/notice_of_intent_base/notice_of_intent_decision_date/notice_of_intent_decision_date_validation.sql +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_base/notice_of_intent_decision_date/notice_of_intent_decision_date_validation.sql @@ -1,8 +1,8 @@ WITH nois_with_one_or_zero_component_only AS ( - SELECT oaac.alr_application_id - FROM oats.oats_alr_appl_components oaac - GROUP BY oaac.alr_application_id - HAVING count(oaac.alr_application_id) < 2 + SELECT oaa.alr_application_id + FROM oats.alcs_etl_applications_nois oaa + WHERE oaa.application_class_code = 'NOI' + and oaa.alr_change_code <> 'SRW' ), oats_decision_date_for_nois AS ( SELECT oaad.alr_appl_decision_id, diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_base/validate_that_oats_does_not_override_alcs_with_null.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_base/validate_that_oats_does_not_override_alcs_with_null.sql index 2550759287..0d950550a5 100644 --- a/bin/migrate-oats-data/noi/sql/notice_of_intent_base/validate_that_oats_does_not_override_alcs_with_null.sql +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_base/validate_that_oats_does_not_override_alcs_with_null.sql @@ -1,12 +1,10 @@ -- this query checks that OATS NULL does not override fee_paid_date if it has value in ALCS -- Run this query before ETL and after to ensure that the result is the same WITH noi_with_one_component AS ( - SELECT oaac.alr_application_id - FROM oats.oats_alr_appl_components oaac - JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id + SELECT oaa.alr_application_id + FROM oats.alcs_etl_applications_nois oaa WHERE oaa.application_class_code = 'NOI' - GROUP BY oaac.alr_application_id - HAVING count(oaac.alr_application_id) < 2 -- ignore notice of intents wit multiple components + and oaa.alr_change_code <> 'SRW' ) SELECT noi.fee_paid_date AT TIME ZONE 'UTC', oaa.fee_received_date, diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/adjacent_land_use/notice_of_intent_adjacent_land_use.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/adjacent_land_use/notice_of_intent_adjacent_land_use.sql index b60851ae89..8a1209141f 100644 --- a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/adjacent_land_use/notice_of_intent_adjacent_land_use.sql +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/adjacent_land_use/notice_of_intent_adjacent_land_use.sql @@ -1,11 +1,9 @@ WITH nois_with_one_or_zero_component_only AS ( - SELECT oaac.alr_application_id, - max(oaac.alr_appl_component_id) AS alr_appl_component_id -- this IS NOT going TO effect the query since count < 2 - FROM oats.oats_alr_appl_components oaac - JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id - AND oaa.application_class_code = 'NOI' - GROUP BY oaac.alr_application_id - HAVING count(oaac.alr_application_id) < 2 + SELECT oaa.alr_application_id, + oaa.alr_appl_component_id + FROM oats.alcs_etl_applications_nois oaa + WHERE oaa.application_class_code = 'NOI' + and oaa.alr_change_code <> 'SRW' ) SELECT * FROM oats.oats_adjacent_land_uses oalu diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/adjacent_land_use/notice_of_intent_adjacent_land_use_count.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/adjacent_land_use/notice_of_intent_adjacent_land_use_count.sql index ab22207c05..8bb22ba42f 100644 --- a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/adjacent_land_use/notice_of_intent_adjacent_land_use_count.sql +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/adjacent_land_use/notice_of_intent_adjacent_land_use_count.sql @@ -1,11 +1,9 @@ WITH nois_with_one_or_zero_component_only AS ( - SELECT oaac.alr_application_id, - max(oaac.alr_appl_component_id) AS alr_appl_component_id -- this IS NOT going TO effect the query since count < 2 - FROM oats.oats_alr_appl_components oaac - JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id - AND oaa.application_class_code = 'NOI' - GROUP BY oaac.alr_application_id - HAVING count(oaac.alr_application_id) < 2 + SELECT oaa.alr_application_id, + oaa.alr_appl_component_id + FROM oats.alcs_etl_applications_nois oaa + WHERE oaa.application_class_code = 'NOI' + and oaa.alr_change_code <> 'SRW' ) SELECT count(*) FROM oats.oats_adjacent_land_uses oalu diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/notice_of_intent_submission_init.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/notice_of_intent_submission_init.sql index 5a42405a43..114572e86a 100644 --- a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/notice_of_intent_submission_init.sql +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/notice_of_intent_submission_init.sql @@ -1,10 +1,8 @@ WITH noi_components_grouped AS ( - SELECT oaac.alr_application_id - FROM oats.oats_alr_appl_components oaac - JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id + SELECT oaa.alr_application_id + FROM oats.alcs_etl_applications_nois oaa WHERE oaa.application_class_code = 'NOI' - GROUP BY oaac.alr_application_id - HAVING count(oaac.alr_application_id) < 2 -- ignore notice of intents wit multiple components + and oaa.alr_change_code <> 'SRW' ) SELECT noi.file_number, noi.type_code, diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/notice_of_intent_submission_init_count.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/notice_of_intent_submission_init_count.sql index 185750ee23..664e883d8e 100644 --- a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/notice_of_intent_submission_init_count.sql +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/notice_of_intent_submission_init_count.sql @@ -1,10 +1,8 @@ WITH noi_components_grouped AS ( - SELECT oaac.alr_application_id - FROM oats.oats_alr_appl_components oaac - JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id + SELECT oaa.alr_application_id + FROM oats.alcs_etl_applications_nois oaa WHERE oaa.application_class_code = 'NOI' - GROUP BY oaac.alr_application_id - HAVING count(oaac.alr_application_id) < 2 -- ignore notice of intents wit multiple components + and oaa.alr_change_code <> 'SRW' ) SELECT count(*) FROM noi_components_grouped noig \ No newline at end of file diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/certificate_of_title/notice_of_intent_certificate_of_title_validation.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/certificate_of_title/notice_of_intent_certificate_of_title_validation.sql index f7d73b7d1b..119f35daf8 100644 --- a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/certificate_of_title/notice_of_intent_certificate_of_title_validation.sql +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/certificate_of_title/notice_of_intent_certificate_of_title_validation.sql @@ -1,11 +1,9 @@ WITH nois_with_one_or_zero_component_only AS ( - SELECT oaac.alr_application_id, - max(oaac.alr_appl_component_id) AS alr_appl_component_id -- this IS NOT going TO effect the query since count < 2 - FROM oats.oats_alr_appl_components oaac - JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id - AND oaa.application_class_code = 'NOI' - GROUP BY oaac.alr_application_id - HAVING count(oaac.alr_application_id) < 2 + SELECT oaa.alr_application_id, + oaa.alr_appl_component_id + FROM oats.alcs_etl_applications_nois oaa + WHERE oaa.application_class_code = 'NOI' + and oaa.alr_change_code <> 'SRW' ), oats_cert_of_titles AS ( SELECT od.document_id, @@ -30,13 +28,11 @@ FROM alcs_oats_certificate_of_titles act WHERE act.oats_document_id != oct.document_id::TEXT; -- count certificates of title in oats linked to subject_properties WITH nois_with_one_or_zero_component_only AS ( - SELECT oaac.alr_application_id, - max(oaac.alr_appl_component_id) AS alr_appl_component_id -- this IS NOT going TO effect the query since count < 2 - FROM oats.oats_alr_appl_components oaac - JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id - AND oaa.application_class_code = 'NOI' - GROUP BY oaac.alr_application_id - HAVING count(oaac.alr_application_id) < 2 + SELECT oaa.alr_application_id, + oaa.alr_appl_component_id + FROM oats.alcs_etl_applications_nois oaa + WHERE oaa.application_class_code = 'NOI' + and oaa.alr_change_code <> 'SRW' ) SELECT count(*) FROM oats.oats_documents od diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/notice_of_intent_parcels_insert_validation.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/notice_of_intent_parcels_insert_validation.sql index c954444f0a..7742eab519 100644 --- a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/notice_of_intent_parcels_insert_validation.sql +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/notice_of_intent_parcels_insert_validation.sql @@ -2,12 +2,10 @@ SELECT count(*) FROM alcs.notice_of_intent_parcel noip; -- Get total count of parcels in OATS WITH noi_components_grouped AS ( - SELECT oaac.alr_application_id - FROM oats.oats_alr_appl_components oaac - JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id + SELECT oaa.alr_application_id + FROM oats.alcs_etl_applications_nois oaa WHERE oaa.application_class_code = 'NOI' - GROUP BY oaac.alr_application_id - HAVING count(oaac.alr_application_id) < 2 -- ignore notice of intents with multiple components + and oaa.alr_change_code <> 'SRW' ) SELECT count(*) FROM noi_components_grouped noig diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/cancelled/validation_script.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/cancelled/validation_script.sql index 5d8f3005ff..23253d986a 100644 --- a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/cancelled/validation_script.sql +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/cancelled/validation_script.sql @@ -34,13 +34,11 @@ cancelled_accomplishments_for_noi_only AS ( ) ), nois_with_one_or_zero_component_only AS ( - SELECT oaac.alr_application_id, - max(oaac.alr_appl_component_id) AS alr_appl_component_id -- this IS NOT going TO effect the query since count < 2 - FROM oats.oats_alr_appl_components oaac - JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id - AND oaa.application_class_code = 'NOI' - GROUP BY oaac.alr_application_id - HAVING count(oaac.alr_application_id) < 2 + SELECT oaa.alr_application_id, + oaa.alr_appl_component_id + FROM oats.alcs_etl_applications_nois oaa + WHERE oaa.application_class_code = 'NOI' + and oaa.alr_change_code <> 'SRW' ), all_cancelled AS ( SELECT cancelled.alr_application_id diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/in_progress/validation_script.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/in_progress/validation_script.sql index 9968abf359..18a0471ca6 100644 --- a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/in_progress/validation_script.sql +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/in_progress/validation_script.sql @@ -30,13 +30,11 @@ inp_accomplishments_for_noi_only AS ( ) ), nois_with_one_or_zero_component_only AS ( - SELECT oaac.alr_application_id, - max(oaac.alr_appl_component_id) AS alr_appl_component_id -- this IS NOT going TO effect the query since count < 2 - FROM oats.oats_alr_appl_components oaac - JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id - AND oaa.application_class_code = 'NOI' - GROUP BY oaac.alr_application_id - HAVING count(oaac.alr_application_id) < 2 + SELECT oaa.alr_application_id, + oaa.alr_appl_component_id + FROM oats.alcs_etl_applications_nois oaa + WHERE oaa.application_class_code = 'NOI' + and oaa.alr_change_code <> 'SRW' ), all_in_progress AS ( SELECT cancelled.alr_application_id diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/init_notice_of_intent_submission_statuses.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/init_notice_of_intent_submission_statuses.sql index 6eebc25f2a..505834ed46 100644 --- a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/init_notice_of_intent_submission_statuses.sql +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/init_notice_of_intent_submission_statuses.sql @@ -1,11 +1,9 @@ INSERT INTO alcs.notice_of_intent_submission_to_submission_status(submission_uuid, status_type_code) -- retrieve Notice of Intents from OATS that have only 1 proposal component WITH noi_components_grouped AS ( - SELECT oaac.alr_application_id - FROM oats.oats_alr_appl_components oaac - JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id + SELECT oaa.alr_application_id + FROM oats.alcs_etl_applications_nois oaa WHERE oaa.application_class_code = 'NOI' - GROUP BY oaac.alr_application_id - HAVING count(oaac.alr_application_id) < 2 -- ignore notice of intents with multiple components + and oaa.alr_change_code <> 'SRW' ), -- alcs_submissions_with_statuses is required for development environment only. Production environment does not have submissions. alcs_submissions_with_statuses AS ( diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/init_notice_of_intent_submission_statuses_count.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/init_notice_of_intent_submission_statuses_count.sql index 7536ae4157..eda48f17f9 100644 --- a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/init_notice_of_intent_submission_statuses_count.sql +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/init_notice_of_intent_submission_statuses_count.sql @@ -1,10 +1,8 @@ WITH noi_components_grouped AS ( - SELECT oaac.alr_application_id - FROM oats.oats_alr_appl_components oaac - JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id + SELECT oaa.alr_application_id + FROM oats.alcs_etl_applications_nois oaa WHERE oaa.application_class_code = 'NOI' - GROUP BY oaac.alr_application_id - HAVING count(oaac.alr_application_id) < 2 -- ignore notice of intents with multiple components + and oaa.alr_change_code <> 'SRW' ), alcs_submissions_with_statuses AS ( SELECT nois.file_number diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/submitted_to_alc/notice_of_intent_status_submitted_to_alc.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/submitted_to_alc/notice_of_intent_status_submitted_to_alc.sql index 72d5ce47bd..fe47f41491 100644 --- a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/submitted_to_alc/notice_of_intent_status_submitted_to_alc.sql +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/submitted_to_alc/notice_of_intent_status_submitted_to_alc.sql @@ -1,10 +1,8 @@ WITH noi_components_grouped AS ( - SELECT oaac.alr_application_id - FROM oats.oats_alr_appl_components oaac - JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id + SELECT oaa.alr_application_id + FROM oats.alcs_etl_applications_nois oaa WHERE oaa.application_class_code = 'NOI' - GROUP BY oaac.alr_application_id - HAVING count(oaac.alr_application_id) < 2 -- ignore notice of intents with multiple components + and oaa.alr_change_code <> 'SRW' ) SELECT oaa2.alr_application_id, oaa2.submitted_to_alc_date, diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/submitted_to_alc/notice_of_intent_status_submitted_to_alc_count.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/submitted_to_alc/notice_of_intent_status_submitted_to_alc_count.sql index 1c57417cd0..e8c0a54b60 100644 --- a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/submitted_to_alc/notice_of_intent_status_submitted_to_alc_count.sql +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/submitted_to_alc/notice_of_intent_status_submitted_to_alc_count.sql @@ -1,10 +1,8 @@ WITH noi_components_grouped AS ( - SELECT oaac.alr_application_id - FROM oats.oats_alr_appl_components oaac - JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id + SELECT oaa.alr_application_id + FROM oats.alcs_etl_applications_nois oaa WHERE oaa.application_class_code = 'NOI' - GROUP BY oaac.alr_application_id - HAVING count(oaac.alr_application_id) < 2 -- ignore notice of intents with multiple components + and oaa.alr_change_code <> 'SRW' ) SELECT count(*) FROM noi_components_grouped diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/submitted_to_alc/validation_script.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/submitted_to_alc/validation_script.sql index 9450d8190b..727a7ad648 100644 --- a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/submitted_to_alc/validation_script.sql +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/submitted_to_alc/validation_script.sql @@ -7,12 +7,10 @@ WHERE status_type_code = 'SUBM' AND effective_date IS NOT NULL; -- total count of expected 'SUBM' - Submitted to ALC status WITH noi_components_grouped AS ( - SELECT oaac.alr_application_id - FROM oats.oats_alr_appl_components oaac - JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id + SELECT oaa.alr_application_id + FROM oats.alcs_etl_applications_nois oaa WHERE oaa.application_class_code = 'NOI' - GROUP BY oaac.alr_application_id - HAVING count(oaac.alr_application_id) < 2 -- ignore notice of intents with multiple components + and oaa.alr_change_code <> 'SRW' ) SELECT count(*) FROM oats.oats_alr_applications oaa2 diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/submitted_to_alc_incomplete/notice_of_intent_status_submitted_to_alc_incomplete.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/submitted_to_alc_incomplete/notice_of_intent_status_submitted_to_alc_incomplete.sql index c7cd37ea1b..f04edba25e 100644 --- a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/submitted_to_alc_incomplete/notice_of_intent_status_submitted_to_alc_incomplete.sql +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/submitted_to_alc_incomplete/notice_of_intent_status_submitted_to_alc_incomplete.sql @@ -1,10 +1,8 @@ WITH noi_components_grouped AS ( - SELECT oaac.alr_application_id - FROM oats.oats_alr_appl_components oaac - JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id + SELECT oaa.alr_application_id + FROM oats.alcs_etl_applications_nois oaa WHERE oaa.application_class_code = 'NOI' - GROUP BY oaac.alr_application_id - HAVING count(oaac.alr_application_id) < 2 -- ignore notice of intents with multiple components + and oaa.alr_change_code <> 'SRW' ) SELECT oa.alr_application_id, completion_date, diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/submitted_to_alc_incomplete/notice_of_intent_status_submitted_to_alc_incomplete_count.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/submitted_to_alc_incomplete/notice_of_intent_status_submitted_to_alc_incomplete_count.sql index cb11bda499..7c4ad91a0d 100644 --- a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/submitted_to_alc_incomplete/notice_of_intent_status_submitted_to_alc_incomplete_count.sql +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/submitted_to_alc_incomplete/notice_of_intent_status_submitted_to_alc_incomplete_count.sql @@ -1,10 +1,8 @@ WITH noi_components_grouped AS ( - SELECT oaac.alr_application_id - FROM oats.oats_alr_appl_components oaac - JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id + SELECT oaa.alr_application_id + FROM oats.alcs_etl_applications_nois oaa WHERE oaa.application_class_code = 'NOI' - GROUP BY oaac.alr_application_id - HAVING count(oaac.alr_application_id) < 2 -- ignore notice of intents with multiple components + and oaa.alr_change_code <> 'SRW' ) SELECT count(*) FROM noi_components_grouped ncg diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/submitted_to_alc_incomplete/validation_script.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/submitted_to_alc_incomplete/validation_script.sql index 0b8fa5d140..fc5d7e189a 100644 --- a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/submitted_to_alc_incomplete/validation_script.sql +++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/statuses/submitted_to_alc_incomplete/validation_script.sql @@ -7,12 +7,10 @@ WHERE status_type_code = 'SUIN' AND effective_date IS NOT NULL; -- total count of expected 'AKI' - Submitted to ALC Incomplete status WITH noi_components_grouped AS ( - SELECT oaac.alr_application_id - FROM oats.oats_alr_appl_components oaac - JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = oaac.alr_application_id + SELECT oaa.alr_application_id + FROM oats.alcs_etl_applications_nois oaa WHERE oaa.application_class_code = 'NOI' - GROUP BY oaac.alr_application_id - HAVING count(oaac.alr_application_id) < 2 -- ignore notice of intents with multiple components + and oaa.alr_change_code <> 'SRW' ) SELECT count(*) FROM noi_components_grouped ncg From 643732cc69af4c118b8c2b66b56d140767c45150 Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Thu, 18 Jan 2024 13:56:09 -0800 Subject: [PATCH 952/954] requiring authorization letter on lfng contact --- .../primary-contact/primary-contact.component.ts | 2 +- .../primary-contact/primary-contact.component.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts index 35323f3f7a..d1610de7e7 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts @@ -162,7 +162,7 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni private calculateLetterRequired() { if (this.selectedLocalGovernment) { - this.needsAuthorizationLetter = false; + this.needsAuthorizationLetter = true; } else { const isSelfApplicant = this.parcelOwners.length === 1 && this.parcelOwners[0].type.code === OWNER_TYPE.INDIVIDUAL; diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts index e5e452d08c..5f54cdc87f 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts @@ -164,7 +164,7 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni private calculateLetterRequired() { if (this.selectedLocalGovernment) { - this.needsAuthorizationLetter = false; + this.needsAuthorizationLetter = true; } else { const isSelfApplicant = this.parcelOwners.length === 1 && this.parcelOwners[0].type.code === OWNER_TYPE.INDIVIDUAL; From 5664bf1f576b706e397bc7f7ca8f1e9468cc2bba Mon Sep 17 00:00:00 2001 From: Urmi Kataria <urmi.kataria@gov.bc.ca> Date: Thu, 18 Jan 2024 14:14:50 -0800 Subject: [PATCH 953/954] fix styling --- .../view-application-submission.component.scss | 7 +++++++ .../view-notice-of-intent-submission.component.scss | 7 +++++++ .../view-notification-submission.component.scss | 8 ++++++++ 3 files changed, 22 insertions(+) diff --git a/portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.scss b/portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.scss index 90e33d611d..815f9b29c4 100644 --- a/portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.scss +++ b/portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.scss @@ -200,9 +200,16 @@ section { z-index: 2; box-shadow: -3px 0 colors.$white, 3px 0 colors.$white; + button:nth-child(1) { + margin-top: rem(16) !important; + } + @media screen and (min-width: $tabletBreakpoint) { flex-direction: row; justify-content: center; + button:nth-child(1) { + margin-top: 0 !important; + } } button { diff --git a/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.scss b/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.scss index 7f9e7fb430..3cc7012340 100644 --- a/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.scss +++ b/portal-frontend/src/app/features/notice-of-intents/view-submission/view-notice-of-intent-submission.component.scss @@ -195,9 +195,16 @@ section { z-index: 2; box-shadow: -3px 0 colors.$white, 3px 0 colors.$white; + button:nth-child(1) { + margin-top: rem(16) !important; + } + @media screen and (min-width: $tabletBreakpoint) { flex-direction: row; justify-content: center; + button:nth-child(1) { + margin-top: 0 !important; + } } button { diff --git a/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.scss b/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.scss index b740b549ca..8c2c2c8ff3 100644 --- a/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.scss +++ b/portal-frontend/src/app/features/notifications/view-submission/view-notification-submission.component.scss @@ -194,9 +194,17 @@ section { z-index: 2; box-shadow: -3px 0 colors.$white, 3px 0 colors.$white; + button:nth-child(1) { + margin-top: rem(16) !important; + } + @media screen and (min-width: $tabletBreakpoint) { flex-direction: row; justify-content: center; + + button:nth-child(1) { + margin-top: 0 !important; + } } button { From 131190889a6f078d2d3468c69e60a25d42ab3283 Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Thu, 18 Jan 2024 14:51:41 -0800 Subject: [PATCH 954/954] update obfuscation, update batch insert, update readme (#1310) do not obfuscate the organization name in OATS update readme file with backup and restore instructions for Postgres DB update batch insert script to correctly handle duplications of applications and NOIs if they are caused by local government duplications add filter to application batch insert --- bin/migrate-oats-data/README.md | 24 +++++++++++++++++++ .../applications/base_applications.py | 12 ++++++---- .../sql/insert-batch-application.sql | 2 +- .../noi/notice_of_intent_init.py | 21 +++++++++------- bin/migrate-oats-data/noi/sql/insert_noi.sql | 17 ++++++------- .../prod_db_obfuscation/oats/obfuscate.py | 3 ++- 6 files changed, 56 insertions(+), 23 deletions(-) diff --git a/bin/migrate-oats-data/README.md b/bin/migrate-oats-data/README.md index cea57bfa50..d3b03171bf 100644 --- a/bin/migrate-oats-data/README.md +++ b/bin/migrate-oats-data/README.md @@ -65,3 +65,27 @@ UPDATE alcs.application a SET date_received_all_items = CURRENT_TIMESTAMP WHERE a.audit_created_by = 'oats_etl'; ``` + +## Full DB backup and restore on local machine + +### Prerequisites + +- docker installed +- docker postgres container +- pg_restore and pg_dump installed locally +- IDE to browse DB + +Full db restore steps on example of ALCS DEV environment: + +- login to openshift using the oc command +- switch to dev : `oc project a5cf88-dev` +- port-forward dev : `oc port-forward service/alcs-patroni 15432:5432` +- create dev db dump: `pg_dump -U postgres -h localhost -p 15432 -W -F t app > app_back.tar` + This command will ask for DEV DB password. The app_back.tar file will be approximately 1.3GB +- disconnect from dev +- start the local docker db container. The Postgres version should be 12.4 +- make sure that you do not have db named "app" in your local postgres and + create db app: `createdb -U postgres -h localhost -p 5432 -W app` +- restore dump from dev: `pg_restore -U postgres -h localhost -p 5432 -d app -F t -C -v < app_back.tar` + NOTE: restore will finish with some warnings/errors related to the "readaccess" user that could be safely ignored. +- once restore is done check that alcs-obfuscated schema exists and the comment table has lorem ipsum in body column diff --git a/bin/migrate-oats-data/applications/base_applications.py b/bin/migrate-oats-data/applications/base_applications.py index 62b8761210..d9355213de 100644 --- a/bin/migrate-oats-data/applications/base_applications.py +++ b/bin/migrate-oats-data/applications/base_applications.py @@ -111,17 +111,21 @@ def _compile_application_insert_query(number_of_rows_to_insert): applications_to_insert = ",".join(["%s"] * number_of_rows_to_insert) return f""" + WITH cte AS ( + SELECT file_number, type_code, applicant, region_code, local_government_uuid::UUID, audit_created_by, source, + ROW_NUMBER() OVER (PARTITION BY file_number, type_code, applicant, region_code, audit_created_by, source ORDER BY local_government_uuid) AS rn + FROM (VALUES{applications_to_insert}) AS t(file_number, type_code, applicant, region_code, local_government_uuid, audit_created_by, source) + ) INSERT INTO alcs.application (file_number, type_code, applicant, region_code, local_government_uuid, audit_created_by, source) - - VALUES{applications_to_insert} + SELECT file_number, type_code, applicant, region_code, local_government_uuid, audit_created_by, source FROM cte WHERE rn = 1 ON CONFLICT (file_number) DO UPDATE SET - file_number = EXCLUDED.file_number, type_code = EXCLUDED.type_code, applicant = COALESCE((CASE WHEN EXCLUDED.applicant = 'Unknown' THEN alcs.application.applicant ELSE EXCLUDED.applicant END), EXCLUDED.applicant), region_code = COALESCE(EXCLUDED.region_code, alcs.application.region_code), local_government_uuid = COALESCE(EXCLUDED.local_government_uuid, alcs.application.local_government_uuid), - audit_created_by = EXCLUDED.audit_created_by + audit_created_by = EXCLUDED.audit_created_by, + source = EXCLUDED.source """ diff --git a/bin/migrate-oats-data/applications/sql/insert-batch-application.sql b/bin/migrate-oats-data/applications/sql/insert-batch-application.sql index 3a2a96ef86..d2882aa679 100644 --- a/bin/migrate-oats-data/applications/sql/insert-batch-application.sql +++ b/bin/migrate-oats-data/applications/sql/insert-batch-application.sql @@ -163,7 +163,7 @@ FROM LEFT JOIN application_type_lookup AS atl ON oa.alr_application_id = atl.application_id LEFT JOIN alcs.application_region ar ON panel_lookup.panel_region = ar."label" LEFT JOIN alcs_gov ON oa.alr_application_id = alcs_gov.application_id -WHERE atl.code <> 'SRW' -- filter out SRW type as it is a "notification" type +WHERE atl.code <> 'SRW' AND oa.application_class_code IN ('LOA', 'BLK', 'SCH', 'NAN') -- filter out SRW type as it is a "notification" type diff --git a/bin/migrate-oats-data/noi/notice_of_intent_init.py b/bin/migrate-oats-data/noi/notice_of_intent_init.py index facb47c93d..540b659d3f 100644 --- a/bin/migrate-oats-data/noi/notice_of_intent_init.py +++ b/bin/migrate-oats-data/noi/notice_of_intent_init.py @@ -3,7 +3,7 @@ setup_and_get_logger, exclusion_table_create, exclusion_table_count, - BATCH_UPLOAD_SIZE + BATCH_UPLOAD_SIZE, ) from db import inject_conn_pool @@ -53,7 +53,7 @@ def init_notice_of_intents(conn=None, batch_size=BATCH_UPLOAD_SIZE): f"retrieved/inserted items count: {applications_to_be_inserted_count}; total successfully inserted/updated NOIs so far {successful_inserts_count}; last inserted noi_id: {last_application_id}" ) except Exception as err: - logger.exception() + logger.exception(err) conn.rollback() failed_inserts = count_total - successful_inserts_count last_application_id = last_application_id + 1 @@ -78,15 +78,18 @@ def clean_notice_of_intents(conn=None): def _noi_insert_query(number_of_rows_to_insert): nois_to_insert = ",".join(["%s"] * number_of_rows_to_insert) return f""" - INSERT INTO alcs.notice_of_intent (file_number, - applicant, region_code, local_government_uuid, audit_created_by, type_code) - - VALUES{nois_to_insert} + WITH cte AS ( + SELECT file_number, type_code, applicant, region_code, local_government_uuid::UUID, audit_created_by, + ROW_NUMBER() OVER (PARTITION BY file_number, type_code, applicant, region_code, audit_created_by ORDER BY local_government_uuid) AS rn + FROM (VALUES{nois_to_insert}) AS t(file_number, type_code, applicant, region_code, local_government_uuid, audit_created_by) + ) + INSERT INTO alcs.notice_of_intent (file_number, type_code, + applicant, region_code, local_government_uuid, audit_created_by) + SELECT file_number, type_code, applicant, region_code, local_government_uuid, audit_created_by FROM cte WHERE rn = 1 ON CONFLICT (file_number) DO UPDATE SET - file_number = EXCLUDED.file_number, + type_code = EXCLUDED.type_code, applicant = COALESCE((CASE WHEN EXCLUDED.applicant = 'Unknown' THEN alcs.notice_of_intent.applicant ELSE EXCLUDED.applicant END), EXCLUDED.applicant), region_code = COALESCE(EXCLUDED.region_code, alcs.notice_of_intent.region_code), local_government_uuid = COALESCE(EXCLUDED.local_government_uuid, alcs.notice_of_intent.local_government_uuid), - audit_created_by = EXCLUDED.audit_created_by, - type_code = EXCLUDED.type_code + audit_created_by = EXCLUDED.audit_created_by """ diff --git a/bin/migrate-oats-data/noi/sql/insert_noi.sql b/bin/migrate-oats-data/noi/sql/insert_noi.sql index ac0f399936..5beb9b347b 100644 --- a/bin/migrate-oats-data/noi/sql/insert_noi.sql +++ b/bin/migrate-oats-data/noi/sql/insert_noi.sql @@ -117,7 +117,14 @@ application_type_lookup AS ( LEFT JOIN oats.alcs_etl_application_exclude aee ON oaac.alr_appl_component_id = aee.component_id WHERE aee.component_id IS NULL ) -SELECT ng.noi_application_id::text AS file_number, +SELECT + ng.noi_application_id::text AS file_number, + CASE + WHEN atl.code = 'SCH' THEN 'PFRS' + WHEN atl.code = 'EXT' THEN 'ROSO' + WHEN atl.code = 'FILL' THEN 'POFO' + ELSE 'POFO' -- POFO if value is null + END AS type_code, CASE WHEN noi_lookup.orgs IS NOT NULL THEN noi_lookup.orgs WHEN noi_lookup.persons IS NOT NULL THEN noi_lookup.persons @@ -128,13 +135,7 @@ SELECT ng.noi_application_id::text AS file_number, WHEN alcs_gov.gov_uuid IS NOT NULL THEN alcs_gov.gov_uuid ELSE '001cfdad-bc6e-4d25-9294-1550603da980' --Peace River if unable to find uuid END AS local_government_uuid, - 'oats_etl' AS audit_created_by, - CASE - WHEN atl.code = 'SCH' THEN 'PFRS' - WHEN atl.code = 'EXT' THEN 'ROSO' - WHEN atl.code = 'FILL' THEN 'POFO' - ELSE 'POFO' -- POFO if value is null - END AS type_code + 'oats_etl' AS audit_created_by FROM noi_grouped AS ng LEFT JOIN noi_lookup ON ng.noi_application_id = noi_lookup.application_id LEFT JOIN panel_lookup ON ng.noi_application_id = panel_lookup.application_id diff --git a/bin/migrate-oats-data/prod_db_obfuscation/oats/obfuscate.py b/bin/migrate-oats-data/prod_db_obfuscation/oats/obfuscate.py index 06cf8c5799..48007af2ee 100644 --- a/bin/migrate-oats-data/prod_db_obfuscation/oats/obfuscate.py +++ b/bin/migrate-oats-data/prod_db_obfuscation/oats/obfuscate.py @@ -21,7 +21,8 @@ def process_oats_data(): _update_term_columns() _update_with_random_oats_issues() _update_with_random_oats_documents() - _update_with_random_oats_organization() + # organization name is not 'personally identifiable information' so its not protected under Personal Information Protection Act + # _update_with_random_oats_organization() _update_with_random_oats_planning_review() _update_comment_columns() _update_with_random_oats_alr_application()